From 031e33957dfaf9a5e29fb67aaf600ec809b8e35f Mon Sep 17 00:00:00 2001 From: yenatch Date: Sun, 25 May 2014 10:51:53 -0700 Subject: Rename joypad registers. --- scripts/pokemontower7.asm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'scripts/pokemontower7.asm') diff --git a/scripts/pokemontower7.asm b/scripts/pokemontower7.asm index 3e1fcccb..e2806f70 100755 --- a/scripts/pokemontower7.asm +++ b/scripts/pokemontower7.asm @@ -9,7 +9,7 @@ PokemonTower7Script: ; 60d05 (18:4d05) PokemonTower7Script_60d18: ; 60d18 (18:4d18) xor a - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ld [W_POKEMONTOWER7CURSCRIPT], a ld [W_CURMAPSCRIPT], a ret @@ -29,7 +29,7 @@ PokemonTower7Script2: ; 60d23 (18:4d23) jp z, PokemonTower7Script_60d18 call EndTrainerBattle ld a, $f0 - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ld a, [$cf13] ld [H_DOWNARROWBLINKCNT2], a ; $ff8c call DisplayTextID @@ -55,7 +55,7 @@ PokemonTower7Script3: ; 60d56 (18:4d56) ld a, $11 call Predef ; indirect jump to RemoveMissableObject (f1d7 (3:71d7)) xor a - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ld [$cf13], a ld [wTrainerHeaderFlagBit], a ld [$da38], a @@ -66,7 +66,7 @@ PokemonTower7Script3: ; 60d56 (18:4d56) PokemonTower7Script4: ; 60d86 (18:4d86) ld a, $ff - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ld a, $43 ld [$cc4d], a ld a, $11 -- cgit v1.3.1-sl0p