diff options
Diffstat (limited to 'scripts/route8gate.asm')
| -rwxr-xr-x | scripts/route8gate.asm | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/scripts/route8gate.asm b/scripts/route8gate.asm index 8ea12f04..28835f9d 100755 --- a/scripts/route8gate.asm +++ b/scripts/route8gate.asm @@ -1,14 +1,14 @@ -Route8GateScript: ; 1e1c7 (7:61c7) +Route8GateScript: call EnableAutoTextBoxDrawing ld hl, Route8GateScriptPointers - ld a, [W_ROUTE8GATECURSCRIPT] + ld a, [wRoute8GateCurScript] jp CallFunctionInTable -Route8GateScriptPointers: ; 1e1d3 (7:61d3) +Route8GateScriptPointers: dw Route8GateScript0 dw Route8GateScript1 -Route8GateScript_1e1d7: ; 1e1d7 (7:61d7) +Route8GateScript_1e1d7: ld hl, wd730 set 7, [hl] ld a, $10 @@ -20,51 +20,51 @@ Route8GateScript_1e1d7: ; 1e1d7 (7:61d7) ld [wOverrideSimulatedJoypadStatesMask], a ret -Route8GateScript0: ; 1e1ee (7:61ee) +Route8GateScript0: ld a, [wd728] bit 6, a ret nz ld hl, CoordsData_1e22c call ArePlayerCoordsInArray ret nc - ld a, $2 - ld [wd528], a + ld a, PLAYER_DIR_LEFT + ld [wPlayerMovingDirection], a xor a ld [hJoyHeld], a callba RemoveGuardDrink ld a, [$ffdb] and a - jr nz, .asm_1e220 ; 0x1e20e $10 + jr nz, .asm_1e220 ld a, $2 - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a call DisplayTextID call Route8GateScript_1e1d7 ld a, $1 - ld [W_ROUTE8GATECURSCRIPT], a + ld [wRoute8GateCurScript], a ret .asm_1e220 ld hl, wd728 set 6, [hl] ld a, $3 - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a jp DisplayTextID -CoordsData_1e22c: ; 1e22c (7:622c) +CoordsData_1e22c: db 3,2 db 4,2 db $ff -Route8GateScript1: ; 1e231 (7:6231) +Route8GateScript1: ld a, [wSimulatedJoypadStatesIndex] and a ret nz call Delay3 xor a ld [wJoyIgnore], a - ld [W_ROUTE8GATECURSCRIPT], a + ld [wRoute8GateCurScript], a ret -Route8GateTextPointers: ; 1e241 (7:6241) +Route8GateTextPointers: dw Route8GateText1 dw Route8GateText2 dw Route8GateText3 |