diff options
| -rw-r--r-- | common.asm | 12 | ||||
| -rw-r--r-- | extras/extract_tileblocks.py | 2 | ||||
| -rw-r--r-- | extras/gbz80disasm.py | 2 | ||||
| -rw-r--r-- | extras/insert_object_data.py | 2 | ||||
| -rw-r--r-- | extras/insert_texts.py | 2 | ||||
| -rw-r--r-- | extras/map_block_dumper.py | 2 | ||||
| -rw-r--r-- | extras/pretty_map_headers.py | 2 | ||||
| -rw-r--r-- | extras/sprite_helper.py | 2 | ||||
| -rw-r--r-- | extras/text_pointers.py | 2 |
9 files changed, 14 insertions, 14 deletions
@@ -2597,7 +2597,7 @@ FlyWarpDataPtr: db $0F,0 dw Map0fFlyWarp db $15,0 - dw Map15FlyWarp + dw Map15FlyWarp ; Original Format: ; [Event Displacement][Y-block][X-block][Y-sub_block][X-sub_block] @@ -25806,7 +25806,7 @@ CeladonMartRoof_h: ; 0x483c9 to 0x483d5 (12 bytes) (bank=12) (id=126) db CELADON_MART_5_HEIGHT, CELADON_MART_5_WIDTH ; dimensions (y, x) dw CeladonMartRoofBlocks, CeladonMartRoofTexts, CeladonMartRoofScript ; blocks, texts, scripts db $00 ; connections - + dw CeladonMartRoofObject ; objects CeladonMartRoofScript: ; 0x483d5 @@ -31648,7 +31648,7 @@ PrizeDifferentMenuPtrs: ; 14:6843 dw PrizeMenuMon2Entries dw PrizeMenuMon2Cost - + dw PrizeMenuTMsEntries dw PrizeMenuTMsCost @@ -31955,7 +31955,7 @@ Route2_h: dw Route2Texts ;Maps text pointer dw Route2Script ;Maps script pointer db NORTH | SOUTH ;Connection Byte - + ;Connection data db PEWTER_CITY ;Map dw $4714 ;y, x Strip Starting Point @@ -31965,7 +31965,7 @@ Route2_h: db 35 ;Player's new Y-Coordinates db 10 ;Player's new X-Coordinates dw $C8BD ;New UL Block Pos (Window) - + db VIRIDIAN_CITY ;Map dw $43EE ;y, x Strip Starting Point dw $C958 ;Strip X-Offset to current map @@ -31974,7 +31974,7 @@ Route2_h: db 0 ;Player's new Y-Coordinates db 10 ;Player's new X-Coordinates dw $C703 ;New UL Block Pos (Window) - + dw Route2Object ;Object Data Pointer Route2Object: ; 0x54022 (size=72) diff --git a/extras/extract_tileblocks.py b/extras/extract_tileblocks.py index 42513411..f71506e9 100644 --- a/extras/extract_tileblocks.py +++ b/extras/extract_tileblocks.py @@ -8,7 +8,7 @@ import sys import extract_maps extract_maps.load_rom() -spacing = " " +spacing = " " tileblocks = { "Tset00_Block": [0x645E0, 0x64DE0, ""], diff --git a/extras/gbz80disasm.py b/extras/gbz80disasm.py index a1d4ee60..08115602 100644 --- a/extras/gbz80disasm.py +++ b/extras/gbz80disasm.py @@ -6,7 +6,7 @@ from copy import copy, deepcopy from pretty_map_headers import random_hash, map_name_cleaner from ctypes import c_int8 import sys -spacing = " " +spacing = " " temp_opt_table = [ [ "ADC A", 0x8f, 0 ], diff --git a/extras/insert_object_data.py b/extras/insert_object_data.py index 0e03a369..b87894a4 100644 --- a/extras/insert_object_data.py +++ b/extras/insert_object_data.py @@ -8,7 +8,7 @@ from analyze_incbins import asm, offset_to_pointer, find_incbin_to_replace_for, import analyze_incbins import os, sys import subprocess -spacing = " " +spacing = " " def insert_object(map_id): map = extract_maps.map_headers[map_id] diff --git a/extras/insert_texts.py b/extras/insert_texts.py index 6d7b7b6d..30163b4d 100644 --- a/extras/insert_texts.py +++ b/extras/insert_texts.py @@ -11,7 +11,7 @@ import analyze_incbins from gbz80disasm import text_asm_pretty_printer, output_bank_opcodes import os, sys import subprocess -spacing = " " +spacing = " " tx_fars = None failed_attempts = {} diff --git a/extras/map_block_dumper.py b/extras/map_block_dumper.py index f961dfb4..af1d8bcd 100644 --- a/extras/map_block_dumper.py +++ b/extras/map_block_dumper.py @@ -9,7 +9,7 @@ from analyze_incbins import asm, offset_to_pointer, find_incbin_to_replace_for, import analyze_incbins import os, sys import subprocess -spacing = " " +spacing = " " used_map_pointers = [] diff --git a/extras/pretty_map_headers.py b/extras/pretty_map_headers.py index 4b577e36..b76e6cf4 100644 --- a/extras/pretty_map_headers.py +++ b/extras/pretty_map_headers.py @@ -11,7 +11,7 @@ import string import analyze_texts #hopefully not a dependency loop base = 16 -spacing = " " +spacing = " " all_texts = None #map constants diff --git a/extras/sprite_helper.py b/extras/sprite_helper.py index 4dec622f..991f4919 100644 --- a/extras/sprite_helper.py +++ b/extras/sprite_helper.py @@ -1,5 +1,5 @@ from extract_maps import * -spacing = " " +spacing = " " load_rom() load_map_pointers() read_all_map_headers() diff --git a/extras/text_pointers.py b/extras/text_pointers.py index 03c1c4c5..2d16db1e 100644 --- a/extras/text_pointers.py +++ b/extras/text_pointers.py @@ -5,7 +5,7 @@ import extract_maps #rom, assert_rom, load_rom, calculate_pointer, load_map_pointers, read_all_map_headers, map_headers from pretty_map_headers import map_name_cleaner #import analyze_incbins #asm, offset_to_pointer, find_incbin_to_replace_for, split_incbin_line_into_three, generate_diff_insert, load_asm, isolate_incbins, process_incbins -spacing = " " +spacing = " " def test_first_text_pointer_bytes(range=20): #30 for viridian city, 34 for cerulean city, 36 for celadon, 48 for fuchsia city, 50 for safron """ |