diff options
| author | U-Daniel-PC\Daniel <corrnondacqb@yahoo.com> | 2015-07-03 14:38:12 -0500 |
|---|---|---|
| committer | U-Daniel-PC\Daniel <corrnondacqb@yahoo.com> | 2015-07-03 14:38:12 -0500 |
| commit | f4a31b3e0b7ca89e14c4e3836f3d3ad15f38e5ce (patch) | |
| tree | c5eb931244f739bd3a88d488586923b2a0762b74 /scripts/route12gateupstairs.asm | |
| parent | cd649184f556db777d592671a7274bfa4a8423d7 (diff) | |
Rename/organize part 2 of 4
rename functions, clean up address/wram comments, other misc
only broken up so that all changes are viewable on github
Diffstat (limited to 'scripts/route12gateupstairs.asm')
| -rwxr-xr-x | scripts/route12gateupstairs.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/scripts/route12gateupstairs.asm b/scripts/route12gateupstairs.asm index c4c05cd6..68f9cc68 100755 --- a/scripts/route12gateupstairs.asm +++ b/scripts/route12gateupstairs.asm @@ -10,7 +10,7 @@ Route12GateUpstairsText1: ; 49569 (12:5569) db $08 ; asm ld a, [wd7d7] rrca - jr c, .asm_0ad3c ; 0x4956e + jr c, .asm_0ad3c ld hl, TM39PreReceiveText call PrintText ld bc, (TM_39 << 8) | 1 @@ -20,15 +20,15 @@ Route12GateUpstairsText1: ; 49569 (12:5569) call PrintText ld hl, wd7d7 set 0, [hl] - jr .asm_4ba56 ; 0x49589 + jr .asm_4ba56 .BagFull ld hl, TM39NoRoomText call PrintText - jr .asm_4ba56 ; 0x49591 -.asm_0ad3c ; 0x49593 + jr .asm_4ba56 +.asm_0ad3c ld hl, TM39ExplanationText call PrintText -.asm_4ba56 ; 0x49599 +.asm_4ba56 jp TextScriptEnd TM39PreReceiveText: ; 4959c (12:559c) @@ -68,9 +68,9 @@ Route12GateUpstairsText_495c4: ; 495c4 (12:55c4) Route12GateUpstairsScript_495c9: ; 495c9 (12:55c9) ld a, [wSpriteStateData1 + 9] cp $4 - jr z, .asm_495d4 ; 0x495ce $4 + jr z, .asm_495d4 ld a, $1 - jr .asm_495d8 ; 0x495d2 $4 + jr .asm_495d8 .asm_495d4 call PrintText xor a |