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/pokemontower7.asm | |
| parent | Character dict; surfing minigame; printer debug (diff) | |
| parent | More syncing with pokered (diff) | |
| download | pokeyellow-f5983c0f813d3d908b6016db3ed866e4ca9437dc.tar.gz pokeyellow-f5983c0f813d3d908b6016db3ed866e4ca9437dc.tar.xz pokeyellow-f5983c0f813d3d908b6016db3ed866e4ca9437dc.zip | |
Merge branch 'master' of github.com:pret/pokeyellow
Diffstat (limited to 'scripts/pokemontower7.asm')
| -rwxr-xr-x | scripts/pokemontower7.asm | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/scripts/pokemontower7.asm b/scripts/pokemontower7.asm index 32050e25..9a016d84 100755 --- a/scripts/pokemontower7.asm +++ b/scripts/pokemontower7.asm @@ -1,30 +1,30 @@ -PokemonTower7Script: ; 60d05 (18:4d05) +PokemonTower7Script: call EnableAutoTextBoxDrawing ld hl, PokemonTower7ScriptPointers - ld a, [W_POKEMONTOWER7CURSCRIPT] + ld a, [wPokemonTower7CurScript] call JumpTable ret -PokemonTower7Script_60d01: ; 60d18 (18:4d18) +PokemonTower7Script_60d01: xor a ld [wJoyIgnore], a PokemonTower7Script_60d05: - ld [W_POKEMONTOWER7CURSCRIPT], a + ld [wPokemonTower7CurScript], a ret PokemonTower7ScriptPointers: - dw PokemonTower7Script0 ; $4d21 - dw PokemonTower7Script1 ; $4d7f - dw PokemonTower7Script2 ; $4d9e - dw PokemonTower7Script3 ; $4da9 - dw PokemonTower7Script4 ; $4dbf - dw PokemonTower7Script5 ; $4dde - dw PokemonTower7Script6 ; $4de9 - dw PokemonTower7Script7 ; $4e0e - dw PokemonTower7Script8 ; $4e34 - dw PokemonTower7Script9 ; $4e7a - dw PokemonTower7Script10 ; $4e9b - dw PokemonTower7Script11 ; $4ec7 + dw PokemonTower7Script0 + dw PokemonTower7Script1 + dw PokemonTower7Script2 + dw PokemonTower7Script3 + dw PokemonTower7Script4 + dw PokemonTower7Script5 + dw PokemonTower7Script6 + dw PokemonTower7Script7 + dw PokemonTower7Script8 + dw PokemonTower7Script9 + dw PokemonTower7Script10 + dw PokemonTower7Script11 PokemonTower7Script0: CheckEvent EVENT_BEAT_POKEMONTOWER_7_TRAINER_0 @@ -146,8 +146,8 @@ PokemonTower7Script7: ld hl, wd72d set 6, [hl] set 7, [hl] - ld hl, PokemonTower7JessieJamesEndBattleText ; 60f2c - ld de, PokemonTower7JessieJamesEndBattleText ; 60f2c + ld hl, PokemonTower7JessieJamesEndBattleText + ld de, PokemonTower7JessieJamesEndBattleText call SaveEndBattleTextPointers ld a, OPP_ROCKET ld [wCurOpponent], a @@ -245,7 +245,7 @@ PokemonTower7Script11: ld hl, wd72d set 3, [hl] ld a, $0 - ld [W_POKEMONTOWER7CURSCRIPT], a + ld [wPokemonTower7CurScript], a ret PokemonTower7TextPointers: @@ -307,7 +307,7 @@ PokemonTower7Text3: ld [wMissableObjectIndex], a predef ShowObject ld a, $b - ld [W_POKEMONTOWER7CURSCRIPT], a + ld [wPokemonTower7CurScript], a jp TextScriptEnd PokemonTower7Text_60f75: |