fix asm for route 9 texts 1 through 9 inclusive

hg-commit-id: e139dfb9a032
This commit is contained in:
Bryan Bishop 2012-01-11 12:20:16 -06:00
parent cd59b24ca9
commit 167d9baac3
2 changed files with 49 additions and 28 deletions

View file

@ -7,7 +7,11 @@ import sys, os
from copy import copy, deepcopy from copy import copy, deepcopy
import subprocess import subprocess
from extract_maps import rom, assert_rom, load_rom, calculate_pointer, load_map_pointers, read_all_map_headers, map_headers from extract_maps import rom, assert_rom, load_rom, calculate_pointer, load_map_pointers, read_all_map_headers, map_headers
try:
from pretty_map_headers import map_header_pretty_printer, map_name_cleaner from pretty_map_headers import map_header_pretty_printer, map_name_cleaner
except Exception:
pass
#store each line of source code here #store each line of source code here
asm = None asm = None

View file

@ -22038,35 +22038,52 @@ Route5Text1: ; 0x556b7
INCBIN "baserom.gbc",$556bc,$55758 - $556bc INCBIN "baserom.gbc",$556bc,$55758 - $556bc
Route9Text1: ; 0x55758 Route9Text1: ; 0x55758
db $08 ; asm db $8 ; asm
ld hl, $56eb ld hl, $56eb
jr .asm_4fe87 ; 0x5575c jr asm_8be3d ; 0x5575c $2e
ld [$f721], sp
ld d, [hl] Route9Text2:
jr .asm_4fe87 ; 0x55762 db $8 ; asm
ld [$0321], sp ld hl, $56f7
ld d, a jr asm_8be3d ; 0x55762 $28
jr .asm_4fe87 ; 0x55768
ld [$0f21], sp Route9Text3:
ld d, a db $8 ; asm
jr .asm_4fe87 ; 0x5576e ld hl, $5703
ld [$1b21], sp jr asm_8be3d ; 0x55768 $22
ld d, a
jr .asm_4fe87 ; 0x55774 Route9Text4:
ld [$2721], sp db $8 ; asm
ld d, a ld hl, $570f
jr .asm_4fe87 ; 0x5577a jr asm_8be3d ; 0x5576e $1c
ld [$3321], sp
ld d, a Route9Text5:
jr .asm_4fe87 ; 0x55780 db $8 ; asm
ld [$3f21], sp ld hl, $571b
ld d, a jr asm_8be3d ; 0x55774 $16
jr .asm_4fe87 ; 0x55786
ld [$4b21], sp Route9Text6:
ld d, a db $8 ; asm
.asm_4fe87 ; 0x5578c ld hl, $5727
call LoadTrainerHeader jr asm_8be3d ; 0x5577a $10
Route9Text7:
db $8 ; asm
ld hl, $5733
jr asm_8be3d ; 0x55780 $a
Route9Text8:
db $8 ; asm
ld hl, $573f
jr asm_8be3d ; 0x55786 $4
Route9Text9:
db $8 ; asm
ld hl, $574b
asm_8be3d: ; 0x5578c
call $31cc
jp $24d7 jp $24d7
; 0x55792
INCBIN "baserom.gbc",$55792,$87 INCBIN "baserom.gbc",$55792,$87