diff options
Diffstat (limited to 'scripts/route22gate.asm')
| -rwxr-xr-x | scripts/route22gate.asm | 63 |
1 files changed, 32 insertions, 31 deletions
diff --git a/scripts/route22gate.asm b/scripts/route22gate.asm index 6618d6a2..ee2e5b6b 100755 --- a/scripts/route22gate.asm +++ b/scripts/route22gate.asm @@ -1,47 +1,47 @@ -Route22GateScript: ; 1e683 (7:6683) +Route22GateScript: call EnableAutoTextBoxDrawing ld hl, Route22GateScriptPointers - ld a, [W_ROUTE22GATECURSCRIPT] + ld a, [wRoute22GateCurScript] call CallFunctionInTable - ld a, [W_YCOORD] + ld a, [wYCoord] cp $4 ld a, ROUTE_23 - jr c, .asm_1e69a ; 0x1e696 $2 + jr c, .asm_1e69a ld a, ROUTE_22 .asm_1e69a ld [wLastMap], a ret -Route22GateScriptPointers: ; 1e69e (7:669e) +Route22GateScriptPointers: dw Route22GateScript0 dw Route22GateScript1 dw Route22GateScript2 -Route22GateScript0: ; 1e6a4 (7:66a4) +Route22GateScript0: ld hl, Route22GateScriptCoords call ArePlayerCoordsInArray ret nc xor a ld [hJoyHeld], a ld a, $1 - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a jp DisplayTextID -Route22GateScriptCoords: ; 1e6b5 (7:66b5) +Route22GateScriptCoords: db 2,4 db 2,5 db $ff -Route22GateScript_1e6ba: ; 1e6ba (7:66ba) +Route22GateScript_1e6ba: ld a, $1 ld [wSimulatedJoypadStatesIndex], a - ld a, $80 + ld a, D_DOWN ld [wSimulatedJoypadStatesEnd], a ld [wSpriteStateData1 + 9], a ld [wJoyIgnore], a jp StartSimulatingJoypadStates -Route22GateScript1: ; 1e6cd (7:66cd) +Route22GateScript1: ld a, [wSimulatedJoypadStatesIndex] and a ret nz @@ -49,44 +49,45 @@ Route22GateScript1: ; 1e6cd (7:66cd) ld [wJoyIgnore], a call Delay3 ld a, $0 - ld [W_ROUTE22GATECURSCRIPT], a -Route22GateScript2: ; 1e6de (7:66de) + ld [wRoute22GateCurScript], a +Route22GateScript2: ret -Route22GateTextPointers: ; 1e6df (7:66df) +Route22GateTextPointers: dw Route22GateText1 -Route22GateText1: ; 1e6e1 (7:66e1) - db $8 - ld a, [W_OBTAINEDBADGES] +Route22GateText1: + TX_ASM + ld a, [wObtainedBadges] bit 0, a - jr nz, .asm_8a809 ; 0x1e6e7 $d + jr nz, .asm_1e6f6 ld hl, Route22GateText_1e704 call PrintText call Route22GateScript_1e6ba ld a, $1 - jr .asm_20f7e ; 0x1e6f4 $8 -.asm_8a809 ; 0x1e6f6 + jr .asm_1e6fe +.asm_1e6f6 ld hl, Route22GateText_1e71a call PrintText ld a, $2 -.asm_20f7e ; 0x1e6fe - ld [W_ROUTE22GATECURSCRIPT], a +.asm_1e6fe + ld [wRoute22GateCurScript], a jp TextScriptEnd -Route22GateText_1e704: ; 1e704 (7:6704) - TX_FAR _Route22GateText_1e704 ; 0x8cfbb - db $8 - ld a, (SFX_02_51 - SFX_Headers_02) / 3 +Route22GateText_1e704: + TX_FAR _Route22GateText_1e704 + TX_ASM + ld a, SFX_DENIED call PlaySoundWaitForCurrent call WaitForSoundToFinish - ld hl, Route22GateText_1e715 ; $6715 + ld hl, Route22GateText_1e715 ret -Route22GateText_1e715: ; 1e715 (7:6715) +Route22GateText_1e715: TX_FAR _Route22GateText_1e715 db "@" -Route22GateText_1e71a: ; 1e71a (7:671a) - TX_FAR _Route22GateText_1e71a ; 0x8d03e - db $0B, "@" +Route22GateText_1e71a: + TX_FAR _Route22GateText_1e71a + TX_SFX_ITEM_1 + db "@" |