aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/PokemonTower7F.asm
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/PokemonTower7F.asm')
-rw-r--r--scripts/PokemonTower7F.asm4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/PokemonTower7F.asm b/scripts/PokemonTower7F.asm
index e8ff81af..3d8cd636 100644
--- a/scripts/PokemonTower7F.asm
+++ b/scripts/PokemonTower7F.asm
@@ -29,7 +29,7 @@ PokemonTower7FEndBattleScript:
cp $ff
jp z, PokemonTower7FSetDefaultScript
call EndTrainerBattle
- ld a, PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN
+ ld a, PAD_CTRL_PAD
ld [wJoyIgnore], a
ld a, [wSpriteIndex]
ldh [hSpriteIndex], a
@@ -65,7 +65,7 @@ PokemonTower7FHideNPCScript:
ret
PokemonTower7FWarpToMrFujiHouseScript:
- ld a, PAD_A | PAD_B | PAD_SELECT | PAD_START | PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN
+ ld a, PAD_BUTTONS | PAD_CTRL_PAD
ld [wJoyIgnore], a
ld a, HS_POKEMON_TOWER_7F_MR_FUJI
ld [wMissableObjectIndex], a