aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/PokemonTower2F.asm
diff options
context:
space:
mode:
authorRangi42 <sylvie.oukaour+rangi42@gmail.com>2025-06-30 13:30:57 -0400
committerRangi <35663410+Rangi42@users.noreply.github.com>2025-06-30 13:45:24 -0400
commit78e44a8fb10307c55d53a69179b9ff7cd6f49fc0 (patch)
treeccc6113a679d842077d67e5453709438c418114f /scripts/PokemonTower2F.asm
parentReplace hardware_constants.asm with hardware.inc (#511) (diff)
downloadpokeyellow-78e44a8fb10307c55d53a69179b9ff7cd6f49fc0.tar.gz
pokeyellow-78e44a8fb10307c55d53a69179b9ff7cd6f49fc0.tar.xz
pokeyellow-78e44a8fb10307c55d53a69179b9ff7cd6f49fc0.zip
Use combined hardware constants
Diffstat (limited to 'scripts/PokemonTower2F.asm')
-rw-r--r--scripts/PokemonTower2F.asm2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/PokemonTower2F.asm b/scripts/PokemonTower2F.asm
index ec04c623..d3b6c9a4 100644
--- a/scripts/PokemonTower2F.asm
+++ b/scripts/PokemonTower2F.asm
@@ -67,7 +67,7 @@ PokemonTower2FDefeatedRivalScript:
ld a, [wIsInBattle]
cp $ff
jp z, PokemonTower2FResetRivalEncounter
- ld a, PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN
+ ld a, PAD_CTRL_PAD
ld [wJoyIgnore], a
SetEvent EVENT_BEAT_POKEMON_TOWER_RIVAL
ld a, TEXT_POKEMONTOWER2F_RIVAL