ref: 497f9b6602ddd9c218e83fac7cc01733da5e7326
parent: 024cd7f6b82bb008a59bb37eb5deebde807d536d
author: IIMarckus <iimarckus@gmail.com>
date: Tue Jan 17 19:46:27 EST 2012
The python tools should spit out tabs, not spaces. hg-commit-id: fc09f0bbe4b3
--- a/common.asm
+++ b/common.asm
@@ -2597,7 +2597,7 @@
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 @@
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 @@
dw PrizeMenuMon2Entries
dw PrizeMenuMon2Cost
-
+
dw PrizeMenuTMsEntries
dw PrizeMenuTMsCost
@@ -31955,7 +31955,7 @@
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 @@
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 @@
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)
--- 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, ""],
--- a/extras/gbz80disasm.py
+++ b/extras/gbz80disasm.py
@@ -6,7 +6,7 @@
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 ],
--- a/extras/insert_object_data.py
+++ b/extras/insert_object_data.py
@@ -8,7 +8,7 @@
import analyze_incbins
import os, sys
import subprocess
-spacing = " "
+spacing = " "
def insert_object(map_id):
map = extract_maps.map_headers[map_id]
--- a/extras/insert_texts.py
+++ b/extras/insert_texts.py
@@ -11,7 +11,7 @@
from gbz80disasm import text_asm_pretty_printer, output_bank_opcodes
import os, sys
import subprocess
-spacing = " "
+spacing = " "
tx_fars = None
failed_attempts = {}--- a/extras/map_block_dumper.py
+++ b/extras/map_block_dumper.py
@@ -9,7 +9,7 @@
import analyze_incbins
import os, sys
import subprocess
-spacing = " "
+spacing = " "
used_map_pointers = []
--- a/extras/pretty_map_headers.py
+++ b/extras/pretty_map_headers.py
@@ -11,7 +11,7 @@
import analyze_texts #hopefully not a dependency loop
base = 16
-spacing = " "
+spacing = " "
all_texts = None
#map constants
--- 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()
--- 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
"""