From 78e44a8fb10307c55d53a69179b9ff7cd6f49fc0 Mon Sep 17 00:00:00 2001 From: Rangi42 Date: Mon, 30 Jun 2025 13:30:57 -0400 Subject: Use combined hardware constants --- scripts/PokemonTower7F.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'scripts/PokemonTower7F.asm') 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 -- cgit v1.3.1-sl0p