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/route16gate.asm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'scripts/route16gate.asm') diff --git a/scripts/route16gate.asm b/scripts/route16gate.asm index 54bca413..f631d0ec 100755 --- a/scripts/route16gate.asm +++ b/scripts/route16gate.asm @@ -25,7 +25,7 @@ Route16GateScript0: ; 496d7 (12:56d7) ld [hJoyHeld], a ld a, [wWhichTrade] cp $1 - jr z, .asm_4970e ; 0x496f1 $1b + jr z, .asm_4970e ld a, [wWhichTrade] dec a ld [wSimulatedJoypadStatesIndex], a @@ -94,14 +94,14 @@ Route16GateTextPointers: ; 4975a (12:575a) Route16GateText1: ; 49760 (12:5760) db $08 ; asm call Route16GateScript_49755 - jr z, .asm_0bdf3 ; 0x49764 + jr z, .asm_0bdf3 ld hl, Route16GateText_4977c call PrintText - jr .asm_56c9d ; 0x4976c -.asm_0bdf3 ; 0x4976e + jr .asm_56c9d +.asm_0bdf3 ld hl, Route16GateText_49777 call PrintText -.asm_56c9d ; 0x49774 +.asm_56c9d jp TextScriptEnd Route16GateText_49777: ; 49777 (12:5777) -- cgit v1.2.3