diff options
author | dannye <corrnondacqb@yahoo.com> | 2016-06-11 15:45:24 -0500 |
---|---|---|
committer | dannye <corrnondacqb@yahoo.com> | 2016-06-11 15:45:24 -0500 |
commit | 269f2c3ba72776e975f5b00d9a1361cadbda42a7 (patch) | |
tree | 459220542fcbfbd48b9725b48597b5740ee1ec0f /scripts/pokemontower7.asm | |
parent | 2bb64d11e6015e39e934e7359697c08636645994 (diff) |
Sync with pokered
from August 29, 2015 to April 6, 2016
Diffstat (limited to 'scripts/pokemontower7.asm')
-rwxr-xr-x | scripts/pokemontower7.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/pokemontower7.asm b/scripts/pokemontower7.asm index 58e6d327..49ecd5d9 100755 --- a/scripts/pokemontower7.asm +++ b/scripts/pokemontower7.asm @@ -1,7 +1,7 @@ PokemonTower7Script: ; 60d05 (18:4d05) call EnableAutoTextBoxDrawing ld hl, PokemonTower7ScriptPointers - ld a, [W_POKEMONTOWER7CURSCRIPT] + ld a, [wPokemonTower7CurScript] call JumpTable ret @@ -9,7 +9,7 @@ PokemonTower7Script_60d01: ; 60d18 (18:4d18) xor a ld [wJoyIgnore], a PokemonTower7Script_60d05: - ld [W_POKEMONTOWER7CURSCRIPT], a + ld [wPokemonTower7CurScript], a ret PokemonTower7ScriptPointers: @@ -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: |