Skip to content

Commit 0f3d74e

Browse files
committed
Update 1.4.0
1 parent 8765db5 commit 0f3d74e

1 file changed

Lines changed: 7 additions & 6 deletions

File tree

src/cli.py

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import argparse
2+
import sys
23
import os
34
from config import app_name, version, author, license
45
from decoder import Decoder
@@ -107,7 +108,7 @@ def handle_extract(self):
107108
pointers_length = 4
108109
else:
109110
print("\nError: Invalid pointers format!")
110-
exit(1)
111+
sys.exit(1)
111112

112113
# Load ROM data to RAM
113114
rom_data = Decoder.read_rom(rom_file, 0, os.path.getsize(rom_file))
@@ -198,7 +199,7 @@ def handle_insert(self):
198199
end_line = Decoder.parse_end_lines(script_end_lines)
199200
except AttributeError:
200201
print('\nERROR: No detected end lines in first line and using "No_use_end_lines=False"')
201-
exit(1)
202+
sys.exit(1)
202203

203204
# Check brackets
204205
bracket_index = self.args.use_custom_brackets
@@ -215,7 +216,7 @@ def handle_insert(self):
215216
# Format Pointers
216217
if self.args.use_split_pointers is not None:
217218
original_pointers_start_offset, original_pointers_end_offset, original_pointers_size = self.args.use_split_pointers
218-
new_pointers_data_lsb, new_pointers_data_msb, new_pointers_size = Encoder.calculate_pointers_2_bytes_split(cumulative_lengths, original_text_start_offset, base)
219+
new_pointers_data_lsb, new_pointers_data_msb, new_pointers_size = Encoder.calculate_pointers_2_bytes_split(cumulative_lengths, original_text_start_offset, False, base)
219220
else:
220221
original_pointers_start_offset = self.args.pointers_offset
221222
if self.args.p == '2b':
@@ -238,15 +239,15 @@ def handle_insert(self):
238239
pointers_length = 4
239240
else:
240241
print("\nError: Invalid pointers format!")
241-
exit(1)
242+
sys.exit(1)
242243

243244
# Write ROM
244245
if new_script_size > original_text_size:
245246
print(f"\nERROR: script size has exceeded its maximum size. Remove {new_script_size - original_text_size} bytes.")
246-
exit(1)
247+
sys.exit(1)
247248
if new_pointers_size > original_pointers_size:
248249
print(f"\nERROR: table pointer size has exceeded its maximum size. Remove {(new_pointers_size - original_pointers_size)//2} lines in script.")
249-
exit(1)
250+
sys.exit(1)
250251
free_space_script = Encoder.write_rom(rom_file, original_text_start_offset, original_text_size, new_script_data, fill_free_space, fill_free_space_byte)
251252
print(f"\nScript text write to address {hex(original_text_start_offset)}, {free_space_script} bytes free.")
252253

0 commit comments

Comments
 (0)