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/pokemontower6.asm | |
| parent | 2bb64d11e6015e39e934e7359697c08636645994 (diff) | |
Sync with pokered
from August 29, 2015 to April 6, 2016
Diffstat (limited to 'scripts/pokemontower6.asm')
| -rwxr-xr-x | scripts/pokemontower6.asm | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/scripts/pokemontower6.asm b/scripts/pokemontower6.asm index 1c3b1050..7bae81ea 100755 --- a/scripts/pokemontower6.asm +++ b/scripts/pokemontower6.asm @@ -2,16 +2,16 @@ PokemonTower6Script: ; 60aef (18:4aef) call EnableAutoTextBoxDrawing ld hl, PokemonTower6TrainerHeaders ld de, PokemonTower6ScriptPointers - ld a, [W_POKEMONTOWER6CURSCRIPT] + ld a, [wPokemonTower6CurScript] call ExecuteCurMapScriptInTable - ld [W_POKEMONTOWER6CURSCRIPT], a + ld [wPokemonTower6CurScript], a ret PokemonTower6Script_60b02: ; 60b02 (18:4b02) xor a ld [wJoyIgnore], a - ld [W_POKEMONTOWER6CURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wPokemonTower6CurScript], a + ld [wCurMapScript], a ret PokemonTower6ScriptPointers: ; 60b0d (18:4b0d) @@ -37,8 +37,8 @@ PokemonTower6Script0: ; 60b17 (18:4b17) ld a, 30 ld [wCurEnemyLVL], a ld a, $4 - ld [W_POKEMONTOWER6CURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wPokemonTower6CurScript], a + ld [wCurMapScript], a ret CoordsData_60b45: ; 60b45 (18:4b45) @@ -66,8 +66,8 @@ PokemonTower6Script4: ; 60b48 (18:4b48) xor a ld [wJoyIgnore], a ld a, $0 - ld [W_POKEMONTOWER6CURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wPokemonTower6CurScript], a + ld [wCurMapScript], a ret .asm_60b82 ld a, $1 @@ -80,8 +80,8 @@ PokemonTower6Script4: ; 60b48 (18:4b48) ld hl, wd730 set 7, [hl] ld a, $3 - ld [W_POKEMONTOWER6CURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wPokemonTower6CurScript], a + ld [wCurMapScript], a ret PokemonTower6Script3: ; 60ba1 (18:4ba1) @@ -90,8 +90,8 @@ PokemonTower6Script3: ; 60ba1 (18:4ba1) ret nz call Delay3 xor a - ld [W_POKEMONTOWER6CURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wPokemonTower6CurScript], a + ld [wCurMapScript], a ret PokemonTower6TextPointers: ; 60bb1 (18:4bb1) |