mirror of
https://github.com/pret/pokered.git
synced 2024-10-23 15:08:23 +00:00
The python tools should spit out tabs, not spaces.
hg-commit-id: fc09f0bbe4b3
This commit is contained in:
parent
024cd7f6b8
commit
497f9b6602
9 changed files with 14 additions and 14 deletions
12
common.asm
12
common.asm
|
@ -2597,7 +2597,7 @@ FlyWarpDataPtr:
|
||||||
db $0F,0
|
db $0F,0
|
||||||
dw Map0fFlyWarp
|
dw Map0fFlyWarp
|
||||||
db $15,0
|
db $15,0
|
||||||
dw Map15FlyWarp
|
dw Map15FlyWarp
|
||||||
|
|
||||||
; Original Format:
|
; Original Format:
|
||||||
; [Event Displacement][Y-block][X-block][Y-sub_block][X-sub_block]
|
; [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)
|
db CELADON_MART_5_HEIGHT, CELADON_MART_5_WIDTH ; dimensions (y, x)
|
||||||
dw CeladonMartRoofBlocks, CeladonMartRoofTexts, CeladonMartRoofScript ; blocks, texts, scripts
|
dw CeladonMartRoofBlocks, CeladonMartRoofTexts, CeladonMartRoofScript ; blocks, texts, scripts
|
||||||
db $00 ; connections
|
db $00 ; connections
|
||||||
|
|
||||||
dw CeladonMartRoofObject ; objects
|
dw CeladonMartRoofObject ; objects
|
||||||
|
|
||||||
CeladonMartRoofScript: ; 0x483d5
|
CeladonMartRoofScript: ; 0x483d5
|
||||||
|
@ -31648,7 +31648,7 @@ PrizeDifferentMenuPtrs: ; 14:6843
|
||||||
|
|
||||||
dw PrizeMenuMon2Entries
|
dw PrizeMenuMon2Entries
|
||||||
dw PrizeMenuMon2Cost
|
dw PrizeMenuMon2Cost
|
||||||
|
|
||||||
dw PrizeMenuTMsEntries
|
dw PrizeMenuTMsEntries
|
||||||
dw PrizeMenuTMsCost
|
dw PrizeMenuTMsCost
|
||||||
|
|
||||||
|
@ -31955,7 +31955,7 @@ Route2_h:
|
||||||
dw Route2Texts ;Maps text pointer
|
dw Route2Texts ;Maps text pointer
|
||||||
dw Route2Script ;Maps script pointer
|
dw Route2Script ;Maps script pointer
|
||||||
db NORTH | SOUTH ;Connection Byte
|
db NORTH | SOUTH ;Connection Byte
|
||||||
|
|
||||||
;Connection data
|
;Connection data
|
||||||
db PEWTER_CITY ;Map
|
db PEWTER_CITY ;Map
|
||||||
dw $4714 ;y, x Strip Starting Point
|
dw $4714 ;y, x Strip Starting Point
|
||||||
|
@ -31965,7 +31965,7 @@ Route2_h:
|
||||||
db 35 ;Player's new Y-Coordinates
|
db 35 ;Player's new Y-Coordinates
|
||||||
db 10 ;Player's new X-Coordinates
|
db 10 ;Player's new X-Coordinates
|
||||||
dw $C8BD ;New UL Block Pos (Window)
|
dw $C8BD ;New UL Block Pos (Window)
|
||||||
|
|
||||||
db VIRIDIAN_CITY ;Map
|
db VIRIDIAN_CITY ;Map
|
||||||
dw $43EE ;y, x Strip Starting Point
|
dw $43EE ;y, x Strip Starting Point
|
||||||
dw $C958 ;Strip X-Offset to current map
|
dw $C958 ;Strip X-Offset to current map
|
||||||
|
@ -31974,7 +31974,7 @@ Route2_h:
|
||||||
db 0 ;Player's new Y-Coordinates
|
db 0 ;Player's new Y-Coordinates
|
||||||
db 10 ;Player's new X-Coordinates
|
db 10 ;Player's new X-Coordinates
|
||||||
dw $C703 ;New UL Block Pos (Window)
|
dw $C703 ;New UL Block Pos (Window)
|
||||||
|
|
||||||
dw Route2Object ;Object Data Pointer
|
dw Route2Object ;Object Data Pointer
|
||||||
|
|
||||||
Route2Object: ; 0x54022 (size=72)
|
Route2Object: ; 0x54022 (size=72)
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
import sys
|
import sys
|
||||||
import extract_maps
|
import extract_maps
|
||||||
extract_maps.load_rom()
|
extract_maps.load_rom()
|
||||||
spacing = " "
|
spacing = " "
|
||||||
|
|
||||||
tileblocks = {
|
tileblocks = {
|
||||||
"Tset00_Block": [0x645E0, 0x64DE0, ""],
|
"Tset00_Block": [0x645E0, 0x64DE0, ""],
|
||||||
|
|
|
@ -6,7 +6,7 @@ from copy import copy, deepcopy
|
||||||
from pretty_map_headers import random_hash, map_name_cleaner
|
from pretty_map_headers import random_hash, map_name_cleaner
|
||||||
from ctypes import c_int8
|
from ctypes import c_int8
|
||||||
import sys
|
import sys
|
||||||
spacing = " "
|
spacing = " "
|
||||||
|
|
||||||
temp_opt_table = [
|
temp_opt_table = [
|
||||||
[ "ADC A", 0x8f, 0 ],
|
[ "ADC A", 0x8f, 0 ],
|
||||||
|
|
|
@ -8,7 +8,7 @@ from analyze_incbins import asm, offset_to_pointer, find_incbin_to_replace_for,
|
||||||
import analyze_incbins
|
import analyze_incbins
|
||||||
import os, sys
|
import os, sys
|
||||||
import subprocess
|
import subprocess
|
||||||
spacing = " "
|
spacing = " "
|
||||||
|
|
||||||
def insert_object(map_id):
|
def insert_object(map_id):
|
||||||
map = extract_maps.map_headers[map_id]
|
map = extract_maps.map_headers[map_id]
|
||||||
|
|
|
@ -11,7 +11,7 @@ import analyze_incbins
|
||||||
from gbz80disasm import text_asm_pretty_printer, output_bank_opcodes
|
from gbz80disasm import text_asm_pretty_printer, output_bank_opcodes
|
||||||
import os, sys
|
import os, sys
|
||||||
import subprocess
|
import subprocess
|
||||||
spacing = " "
|
spacing = " "
|
||||||
tx_fars = None
|
tx_fars = None
|
||||||
failed_attempts = {}
|
failed_attempts = {}
|
||||||
|
|
||||||
|
|
|
@ -9,7 +9,7 @@ from analyze_incbins import asm, offset_to_pointer, find_incbin_to_replace_for,
|
||||||
import analyze_incbins
|
import analyze_incbins
|
||||||
import os, sys
|
import os, sys
|
||||||
import subprocess
|
import subprocess
|
||||||
spacing = " "
|
spacing = " "
|
||||||
|
|
||||||
used_map_pointers = []
|
used_map_pointers = []
|
||||||
|
|
||||||
|
|
|
@ -11,7 +11,7 @@ import string
|
||||||
import analyze_texts #hopefully not a dependency loop
|
import analyze_texts #hopefully not a dependency loop
|
||||||
|
|
||||||
base = 16
|
base = 16
|
||||||
spacing = " "
|
spacing = " "
|
||||||
all_texts = None
|
all_texts = None
|
||||||
|
|
||||||
#map constants
|
#map constants
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
from extract_maps import *
|
from extract_maps import *
|
||||||
spacing = " "
|
spacing = " "
|
||||||
load_rom()
|
load_rom()
|
||||||
load_map_pointers()
|
load_map_pointers()
|
||||||
read_all_map_headers()
|
read_all_map_headers()
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
import extract_maps #rom, assert_rom, load_rom, calculate_pointer, load_map_pointers, read_all_map_headers, map_headers
|
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
|
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
|
#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
|
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
|
||||||
"""
|
"""
|
||||||
|
|
Loading…
Reference in a new issue