From f4a31b3e0b7ca89e14c4e3836f3d3ad15f38e5ce Mon Sep 17 00:00:00 2001 From: "U-Daniel-PC\\Daniel" Date: Fri, 3 Jul 2015 14:38:12 -0500 Subject: 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 --- scripts/route18gate.asm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'scripts/route18gate.asm') diff --git a/scripts/route18gate.asm b/scripts/route18gate.asm index 1500f578..fae15e7b 100755 --- a/scripts/route18gate.asm +++ b/scripts/route18gate.asm @@ -25,7 +25,7 @@ Route18GateScript0: ; 4988f (12:588f) ld [hJoyHeld], a ld a, [wWhichTrade] cp $1 - jr z, .asm_498c6 ; 0x498a9 $1b + jr z, .asm_498c6 ld a, [wWhichTrade] dec a ld [wSimulatedJoypadStatesIndex], a @@ -89,14 +89,14 @@ Route18GateTextPointers: ; 4990d (12:590d) Route18GateText1: ; 49911 (12:5911) db $08 ; asm call Route16GateScript_49755 - jr z, .asm_3c84d ; 0x49915 + jr z, .asm_3c84d ld hl, Route18GateText_4992d call PrintText - jr .asm_a8410 ; 0x4991d -.asm_3c84d ; 0x4991f + jr .asm_a8410 +.asm_3c84d ld hl, Route18GateText_49928 call PrintText -.asm_a8410 ; 0x49925 +.asm_a8410 jp TextScriptEnd Route18GateText_49928: ; 49928 (12:5928) -- cgit v1.2.3