diff options
| author | pikalaxalt <PikalaxALT@gmail.com> | 2016-06-11 20:37:15 -0400 |
|---|---|---|
| committer | pikalaxalt <PikalaxALT@gmail.com> | 2016-06-11 20:37:15 -0400 |
| commit | f5983c0f813d3d908b6016db3ed866e4ca9437dc (patch) | |
| tree | d6888723f443557ce45c9a00d873caa5e7a8930e /scripts/route6gate.asm | |
| parent | 041c4f28a3c35e31329222769534942439b70f29 (diff) | |
| parent | 401d6e7f36e86aa246a2c0591195e1f0f01e879f (diff) | |
Merge branch 'master' of github.com:pret/pokeyellow
Diffstat (limited to 'scripts/route6gate.asm')
| -rwxr-xr-x | scripts/route6gate.asm | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/scripts/route6gate.asm b/scripts/route6gate.asm index dd179e28..001a295c 100755 --- a/scripts/route6gate.asm +++ b/scripts/route6gate.asm @@ -1,15 +1,15 @@ -Route6GateScript: ; 1e03d (7:603d) +Route6GateScript: call EnableAutoTextBoxDrawing ld hl, Route6GateScriptPointers - ld a, [W_ROUTE6GATECURSCRIPT] + ld a, [wRoute6GateCurScript] call JumpTable ret -Route6GateScriptPointers: ; 1e04a (7:604a) +Route6GateScriptPointers: dw Route6GateScript0 dw Route6GateScript1 -Route6GateScript0: ; 1e04e (7:604e) +Route6GateScript0: ld a, [wd728] bit 6, a ret nz @@ -29,7 +29,7 @@ Route6GateScript0: ; 1e04e (7:604e) call DisplayTextID call Route6GateScript_1e0a1 ld a, $1 - ld [W_ROUTE6GATECURSCRIPT], a + ld [wRoute6GateCurScript], a ret .asm_1e080 ld hl, wd728 @@ -38,21 +38,21 @@ Route6GateScript0: ; 1e04e (7:604e) ld [hSpriteIndexOrTextID], a jp DisplayTextID -CoordsData_1e08c: ; 1e08c (7:608c) +CoordsData_1e08c: db $02,$03 db $02,$04,$FF -Route6GateScript1: ; 1e091 (7:6091) +Route6GateScript1: ld a, [wSimulatedJoypadStatesIndex] and a ret nz call Delay3 xor a ld [wJoyIgnore], a - ld [W_ROUTE6GATECURSCRIPT], a + ld [wRoute6GateCurScript], a ret -Route6GateScript_1e0a1: ; 1e0a1 (7:60a1) +Route6GateScript_1e0a1: ld hl, wd730 set 7, [hl] ld a, $80 @@ -64,7 +64,7 @@ Route6GateScript_1e0a1: ; 1e0a1 (7:60a1) ld [wOverrideSimulatedJoypadStatesMask], a ret -Route6GateTextPointers: ; 1e0b8 (7:60b8) +Route6GateTextPointers: dw Route6GateText1 dw Route6GateText2 dw Route6GateText3 |