diff options
Diffstat (limited to 'scripts')
53 files changed, 226 insertions, 226 deletions
diff --git a/scripts/AgathasRoom.asm b/scripts/AgathasRoom.asm index 2d0dca08..548f78bf 100644 --- a/scripts/AgathasRoom.asm +++ b/scripts/AgathasRoom.asm @@ -44,7 +44,7 @@ AgathasRoomNoopScript: AgathaScriptWalkIntoRoom: ; Walk six steps upward. ld hl, wSimulatedJoypadStatesEnd - ld a, D_UP + ld a, PAD_UP ld [hli], a ld [hli], a ld [hli], a @@ -77,7 +77,7 @@ AgathasRoomDefaultScript: ld a, TEXT_AGATHASROOM_AGATHA_DONT_RUN_AWAY ldh [hTextID], a call DisplayTextID - ld a, D_UP + ld a, PAD_UP ld [wSimulatedJoypadStatesEnd], a ld a, $1 ld [wSimulatedJoypadStatesIndex], a diff --git a/scripts/BikeShop.asm b/scripts/BikeShop.asm index d8b82386..a245b657 100644 --- a/scripts/BikeShop.asm +++ b/scripts/BikeShop.asm @@ -40,7 +40,7 @@ BikeShopClerkText: xor a ld [wCurrentMenuItem], a ld [wLastMenuItem], a - ld a, A_BUTTON | B_BUTTON + ld a, PAD_A | PAD_B ld [wMenuWatchedKeys], a ld a, $1 ld [wMaxMenuItem], a @@ -64,7 +64,7 @@ BikeShopClerkText: ld hl, BikeShopClerkDoYouLikeItText call PrintText call HandleMenuInput - bit BIT_B_BUTTON, a + bit B_PAD_B, a jr nz, .cancel ld hl, wStatusFlags5 res BIT_NO_TEXT_DELAY, [hl] diff --git a/scripts/BillsHouse.asm b/scripts/BillsHouse.asm index 86f79cb3..6074b007 100644 --- a/scripts/BillsHouse.asm +++ b/scripts/BillsHouse.asm @@ -62,7 +62,7 @@ BillsHousePokemonEntersMachineScript: BillsHouseBillExitsMachineScript: CheckEvent EVENT_USED_CELL_SEPARATOR_ON_BILL ret z - ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN + ld a, PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN ld [wJoyIgnore], a ld a, BILLSHOUSE_BILL1 ld [wSpriteIndex], a diff --git a/scripts/BrunosRoom.asm b/scripts/BrunosRoom.asm index 6d7fde6e..1f8ff4cf 100644 --- a/scripts/BrunosRoom.asm +++ b/scripts/BrunosRoom.asm @@ -44,7 +44,7 @@ BrunosRoomNoopScript: BrunoScriptWalkIntoRoom: ; Walk six steps upward. ld hl, wSimulatedJoypadStatesEnd - ld a, D_UP + ld a, PAD_UP ld [hli], a ld [hli], a ld [hli], a @@ -77,7 +77,7 @@ BrunosRoomDefaultScript: ld a, TEXT_BRUNOSROOM_BRUNO_DONT_RUN_AWAY ldh [hTextID], a call DisplayTextID ; "Don't run away!" - ld a, D_UP + ld a, PAD_UP ld [wSimulatedJoypadStatesEnd], a ld a, $1 ld [wSimulatedJoypadStatesIndex], a diff --git a/scripts/CeladonGym.asm b/scripts/CeladonGym.asm index f95d129a..10ffcfca 100644 --- a/scripts/CeladonGym.asm +++ b/scripts/CeladonGym.asm @@ -40,7 +40,7 @@ CeladonGymErikaPostBattleScript: ld a, [wIsInBattle] cp $ff jp z, CeladonGymResetScripts - ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN + ld a, PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN ld [wJoyIgnore], a CeladonGymReceiveTM21: diff --git a/scripts/CeladonMartRoof.asm b/scripts/CeladonMartRoof.asm index d06fc4a2..9a1f8834 100644 --- a/scripts/CeladonMartRoof.asm +++ b/scripts/CeladonMartRoof.asm @@ -48,7 +48,7 @@ CeladonMartRoofScript_GiveDrinkToGirl: call PrintText xor a ld [wCurrentMenuItem], a - ld a, A_BUTTON | B_BUTTON + ld a, PAD_A | PAD_B ld [wMenuWatchedKeys], a ld a, [wFilteredBagItemsCount] dec a @@ -72,7 +72,7 @@ CeladonMartRoofScript_GiveDrinkToGirl: ld hl, wStatusFlags5 res BIT_NO_TEXT_DELAY, [hl] call HandleMenuInput - bit BIT_B_BUTTON, a + bit B_PAD_B, a ret nz ld hl, wFilteredBagItems ld a, [wCurrentMenuItem] diff --git a/scripts/CeruleanCity.asm b/scripts/CeruleanCity.asm index 9cf44891..c08d0280 100644 --- a/scripts/CeruleanCity.asm +++ b/scripts/CeruleanCity.asm @@ -24,7 +24,7 @@ CeruleanCityRocketDefeatedScript: ld a, [wIsInBattle] cp $ff jp z, CeruleanCityClearScripts - ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN + ld a, PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN ld [wJoyIgnore], a SetEvent EVENT_BEAT_CERULEAN_ROCKET_THIEF ld a, TEXT_CERULEANCITY_ROCKET @@ -78,7 +78,7 @@ ENDC call PlayMusic xor a ldh [hJoyHeld], a - ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN + ld a, PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN ld [wJoyIgnore], a ld a, [wXCoord] cp 20 ; is the player standing on the right side of the bridge? @@ -170,7 +170,7 @@ CeruleanCityRivalDefeatedScript: cp $ff jp z, CeruleanCityClearScripts call CeruleanCityFaceRivalScript - ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN + ld a, PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN ld [wJoyIgnore], a SetEvent EVENT_BEAT_CERULEAN_RIVAL ld a, TEXT_CERULEANCITY_RIVAL diff --git a/scripts/CeruleanGym.asm b/scripts/CeruleanGym.asm index e924907a..e05b4659 100644 --- a/scripts/CeruleanGym.asm +++ b/scripts/CeruleanGym.asm @@ -40,7 +40,7 @@ CeruleanGymMistyPostBattleScript: ld a, [wIsInBattle] cp $ff jp z, CeruleanGymResetScripts - ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN + ld a, PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN ld [wJoyIgnore], a CeruleanGymReceiveTM11: diff --git a/scripts/ChampionsRoom.asm b/scripts/ChampionsRoom.asm index 4d8a218b..953ee9b5 100644 --- a/scripts/ChampionsRoom.asm +++ b/scripts/ChampionsRoom.asm @@ -28,7 +28,7 @@ ChampionsRoomDefaultScript: ret ChampionsRoomPlayerEntersScript: - ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN + ld a, PAD_A | PAD_B | PAD_SELECT | PAD_START | PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN ld [wJoyIgnore], a ld hl, wSimulatedJoypadStatesEnd ld de, RivalEntrance_RLEMovement @@ -41,9 +41,9 @@ ChampionsRoomPlayerEntersScript: ret RivalEntrance_RLEMovement: - db D_UP, 1 - db D_RIGHT, 1 - db D_UP, 3 + db PAD_UP, 1 + db PAD_RIGHT, 1 + db PAD_UP, 3 db -1 ; end ChampionsRoomRivalReadyToBattleScript: @@ -96,7 +96,7 @@ ChampionsRoomRivalDefeatedScript: jp z, ResetRivalScript call UpdateSprites SetEvent EVENT_BEAT_CHAMPION_RIVAL - ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN + ld a, PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN ld [wJoyIgnore], a ld a, TEXT_CHAMPIONSROOM_RIVAL ldh [hTextID], a @@ -205,7 +205,7 @@ ChampionsRoomOakExitsScript: ret ChampionsRoomPlayerFollowsOakScript: - ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN + ld a, PAD_A | PAD_B | PAD_SELECT | PAD_START | PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN ld [wJoyIgnore], a ld hl, wSimulatedJoypadStatesEnd ld de, WalkToHallOfFame_RLEMovement @@ -218,8 +218,8 @@ ChampionsRoomPlayerFollowsOakScript: ret WalkToHallOfFame_RLEMovement: - db D_UP, 4 - db D_LEFT, 1 + db PAD_UP, 4 + db PAD_LEFT, 1 db -1 ; end ChampionsRoomCleanupScript: @@ -233,10 +233,10 @@ ChampionsRoomCleanupScript: ret ChampionsRoom_DisplayTextID_AllowABSelectStart: - ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN + ld a, PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN ld [wJoyIgnore], a call DisplayTextID - ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN + ld a, PAD_A | PAD_B | PAD_SELECT | PAD_START | PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN ld [wJoyIgnore], a ret diff --git a/scripts/CinnabarGym.asm b/scripts/CinnabarGym.asm index efda64a5..600ae571 100644 --- a/scripts/CinnabarGym.asm +++ b/scripts/CinnabarGym.asm @@ -140,7 +140,7 @@ CinnabarGymBlainePostBattleScript: ld a, [wIsInBattle] cp $ff jp z, CinnabarGymResetScripts - ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN + ld a, PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN ld [wJoyIgnore], a ; fallthrough CinnabarGymReceiveTM38: diff --git a/scripts/CinnabarIsland.asm b/scripts/CinnabarIsland.asm index f2a36afb..ce1b683c 100644 --- a/scripts/CinnabarIsland.asm +++ b/scripts/CinnabarIsland.asm @@ -32,7 +32,7 @@ CinnabarIslandDefaultScript: ldh [hJoyHeld], a ld a, $1 ld [wSimulatedJoypadStatesIndex], a - ld a, D_DOWN + ld a, PAD_DOWN ld [wSimulatedJoypadStatesEnd], a call StartSimulatingJoypadStates xor a diff --git a/scripts/FightingDojo.asm b/scripts/FightingDojo.asm index bffa4554..78409ed2 100644 --- a/scripts/FightingDojo.asm +++ b/scripts/FightingDojo.asm @@ -68,7 +68,7 @@ FightingDojoKarateMasterPostBattleScript: ldh [hSpriteFacingDirection], a call SetSpriteFacingDirectionAndDelay .already_facing - ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN + ld a, PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN ld [wJoyIgnore], a SetEventRange EVENT_BEAT_KARATE_MASTER, EVENT_BEAT_FIGHTING_DOJO_TRAINER_3 ld a, TEXT_FIGHTINGDOJO_KARATE_MASTER_I_WILL_GIVE_YOU_A_POKEMON diff --git a/scripts/FuchsiaGym.asm b/scripts/FuchsiaGym.asm index c983c896..fc4a45ac 100644 --- a/scripts/FuchsiaGym.asm +++ b/scripts/FuchsiaGym.asm @@ -42,7 +42,7 @@ FuchsiaGymKogaPostBattleScript: ld a, [wIsInBattle] cp $ff jp z, FuchsiaGymResetScripts - ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN + ld a, PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN ld [wJoyIgnore], a ; fallthrough FuchsiaGymReceiveTM06: diff --git a/scripts/GameCorner.asm b/scripts/GameCorner.asm index f95431d1..b1250857 100644 --- a/scripts/GameCorner.asm +++ b/scripts/GameCorner.asm @@ -55,7 +55,7 @@ GameCornerRocketBattleScript: ld a, [wIsInBattle] cp $ff jp z, GameCornerReenterMapAfterPlayerLoss - ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN + ld a, PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN ld [wJoyIgnore], a ld a, TEXT_GAMECORNER_ROCKET_AFTER_BATTLE ldh [hTextID], a diff --git a/scripts/HallOfFame.asm b/scripts/HallOfFame.asm index c6ecf4ec..84ef26c6 100644 --- a/scripts/HallOfFame.asm +++ b/scripts/HallOfFame.asm @@ -58,7 +58,7 @@ HallOfFameResetEventsAndSaveScript: jp Init HallOfFameDefaultScript: - ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN + ld a, PAD_A | PAD_B | PAD_SELECT | PAD_START | PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN ld [wJoyIgnore], a ld hl, wSimulatedJoypadStatesEnd ld de, HallOfFameEntryMovement @@ -71,7 +71,7 @@ HallOfFameDefaultScript: ret HallOfFameEntryMovement: - db D_UP, 5 + db PAD_UP, 5 db -1 ; end HallOfFameOakCongratulationsScript: @@ -94,7 +94,7 @@ HallOfFameOakCongratulationsScript: ld a, TEXT_HALLOFFAME_OAK ldh [hTextID], a call DisplayTextID - ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN + ld a, PAD_A | PAD_B | PAD_SELECT | PAD_START | PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN ld [wJoyIgnore], a ld a, HS_CERULEAN_CAVE_GUY ld [wMissableObjectIndex], a diff --git a/scripts/LancesRoom.asm b/scripts/LancesRoom.asm index 235deac1..169aa17d 100644 --- a/scripts/LancesRoom.asm +++ b/scripts/LancesRoom.asm @@ -95,7 +95,7 @@ LancesRoomLanceEndBattleScript: WalkToLance: ; Moves the player down the hallway to Lance's room. - ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN + ld a, PAD_A | PAD_B | PAD_SELECT | PAD_START | PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN ld [wJoyIgnore], a ld hl, wSimulatedJoypadStatesEnd ld de, WalkToLance_RLEList @@ -109,10 +109,10 @@ WalkToLance: ret WalkToLance_RLEList: - db D_UP, 12 - db D_LEFT, 12 - db D_DOWN, 7 - db D_LEFT, 6 + db PAD_UP, 12 + db PAD_LEFT, 12 + db PAD_DOWN, 7 + db PAD_LEFT, 6 db -1 ; end LancesRoomPlayerIsMovingScript: diff --git a/scripts/LoreleisRoom.asm b/scripts/LoreleisRoom.asm index 455561b8..ada3b583 100644 --- a/scripts/LoreleisRoom.asm +++ b/scripts/LoreleisRoom.asm @@ -46,7 +46,7 @@ LoreleisRoomNoopScript: LoreleiScriptWalkIntoRoom: ; Walk six steps upward. ld hl, wSimulatedJoypadStatesEnd - ld a, D_UP + ld a, PAD_UP ld [hli], a ld [hli], a ld [hli], a @@ -79,7 +79,7 @@ LoreleisRoomDefaultScript: ld a, TEXT_LORELEISROOM_DONT_RUN_AWAY ldh [hTextID], a call DisplayTextID ; "Don't run away!" - ld a, D_UP + ld a, PAD_UP ld [wSimulatedJoypadStatesEnd], a ld a, $1 ld [wSimulatedJoypadStatesIndex], a diff --git a/scripts/MtMoonB2F.asm b/scripts/MtMoonB2F.asm index d7d4a35b..80236aed 100644 --- a/scripts/MtMoonB2F.asm +++ b/scripts/MtMoonB2F.asm @@ -132,7 +132,7 @@ MtMoonB2FSuperNerdTakesOtherFossilScript: ld a, [wStatusFlags5] bit BIT_SCRIPTED_NPC_MOVEMENT, a ret nz - ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN + ld a, PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN ld [wJoyIgnore], a ld a, $1 ld [wDoNotWaitForButtonPressAfterDisplayingText], a diff --git a/scripts/Museum1F.asm b/scripts/Museum1F.asm index 465c72f8..6cb6889a 100644 --- a/scripts/Museum1F.asm +++ b/scripts/Museum1F.asm @@ -115,7 +115,7 @@ Museum1FScientist1Text: call PrintText ld a, $1 ld [wSimulatedJoypadStatesIndex], a - ld a, D_DOWN + ld a, PAD_DOWN ld [wSimulatedJoypadStatesEnd], a call StartSimulatingJoypadStates call UpdateSprites diff --git a/scripts/OaksLab.asm b/scripts/OaksLab.asm index 71704c5b..8a2b7de3 100644 --- a/scripts/OaksLab.asm +++ b/scripts/OaksLab.asm @@ -102,7 +102,7 @@ OaksLabPlayerEntersLabScript: ret PlayerEntryMovementRLE: - db D_UP, 8 + db PAD_UP, 8 db -1 ; end OaksLabFollowedOakScript: @@ -126,7 +126,7 @@ OaksLabFollowedOakScript: ret OaksLabOakChooseMonSpeechScript: - ld a, SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN + ld a, PAD_SELECT | PAD_START | PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN ld [wJoyIgnore], a ld a, TEXT_OAKSLAB_RIVAL_FED_UP_WITH_WAITING ldh [hTextID], a @@ -171,7 +171,7 @@ OaksLabPlayerDontGoAwayScript: call DisplayTextID ld a, $1 ld [wSimulatedJoypadStatesIndex], a - ld a, D_UP + ld a, PAD_UP ld [wSimulatedJoypadStatesEnd], a call StartSimulatingJoypadStates ld a, PLAYER_DIR_UP @@ -293,7 +293,7 @@ OaksLabRivalChoosesStarterScript: ld a, [wStatusFlags5] bit BIT_SCRIPTED_NPC_MOVEMENT, a ret nz - ld a, SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN + ld a, PAD_SELECT | PAD_START | PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN ld [wJoyIgnore], a ld a, OAKSLAB_RIVAL ldh [hSpriteIndex], a @@ -416,7 +416,7 @@ OaksLabRivalStartBattleScript: ret OaksLabRivalEndBattleScript: - ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN + ld a, PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN ld [wJoyIgnore], a ld a, PLAYER_DIR_UP ld [wPlayerMovingDirection], a @@ -557,7 +557,7 @@ OaksLabOakGivesPokedexScript: ret nz call EnableAutoTextBoxDrawing call PlayDefaultMusic - ld a, SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN + ld a, PAD_SELECT | PAD_START | PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN ld [wJoyIgnore], a call OaksLabRivalFaceUpOakFaceDownScript ld a, TEXT_OAKSLAB_RIVAL_WHAT_DID_YOU_CALL_ME_FOR @@ -931,7 +931,7 @@ OaksLabMonChoiceMenu: call AddPartyMon ld hl, wStatusFlags4 set BIT_GOT_STARTER, [hl] - ld a, SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN + ld a, PAD_SELECT | PAD_START | PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN ld [wJoyIgnore], a ld a, SCRIPT_OAKSLAB_CHOSE_STARTER_SCRIPT ld [wOaksLabCurScript], a diff --git a/scripts/PalletTown.asm b/scripts/PalletTown.asm index 14c5a840..cf6231ea 100644 --- a/scripts/PalletTown.asm +++ b/scripts/PalletTown.asm @@ -34,7 +34,7 @@ PalletTownDefaultScript: ld c, a ld a, MUSIC_MEET_PROF_OAK ; "oak appears" music call PlayMusic - ld a, SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN + ld a, PAD_SELECT | PAD_START | PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN ld [wJoyIgnore], a SetEvent EVENT_OAK_APPEARED_IN_PALLET @@ -49,7 +49,7 @@ PalletTownOakHeyWaitScript: ld a, TEXT_PALLETTOWN_OAK ldh [hTextID], a call DisplayTextID - ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN + ld a, PAD_A | PAD_B | PAD_SELECT | PAD_START | PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN ld [wJoyIgnore], a ld a, HS_PALLET_TOWN_OAK ld [wMissableObjectIndex], a @@ -82,7 +82,7 @@ PalletTownOakWalksToPlayerScript: ld a, PALLETTOWN_OAK ldh [hSpriteIndex], a call MoveSprite - ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN + ld a, PAD_A | PAD_B | PAD_SELECT | PAD_START | PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN ld [wJoyIgnore], a ; trigger the next script @@ -98,13 +98,13 @@ PalletTownOakNotSafeComeWithMeScript: ld [wSpritePlayerStateData1FacingDirection], a ld a, TRUE ld [wOakWalkedToPlayer], a - ld a, SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN + ld a, PAD_SELECT | PAD_START | PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN ld [wJoyIgnore], a ld a, TEXT_PALLETTOWN_OAK ldh [hTextID], a call DisplayTextID ; set up movement script that causes the player to follow Oak to his lab - ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN + ld a, PAD_A | PAD_B | PAD_SELECT | PAD_START | PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN ld [wJoyIgnore], a ld a, PALLETTOWN_OAK ld [wSpriteIndex], a diff --git a/scripts/PewterCity.asm b/scripts/PewterCity.asm index 5cf0c8c7..961e5ee4 100644 --- a/scripts/PewterCity.asm +++ b/scripts/PewterCity.asm @@ -31,7 +31,7 @@ ENDC ld hl, PewterCityPlayerLeavingEastCoords call ArePlayerCoordsInArray ret nc - ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN + ld a, PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN ld [wJoyIgnore], a ld a, TEXT_PEWTERCITY_YOUNGSTER ldh [hTextID], a diff --git a/scripts/PewterGym.asm b/scripts/PewterGym.asm index 6c4c9443..a56c848e 100644 --- a/scripts/PewterGym.asm +++ b/scripts/PewterGym.asm @@ -40,7 +40,7 @@ PewterGymBrockPostBattle: ld a, [wIsInBattle] cp $ff jp z, PewterGymResetScripts - ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN + ld a, PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN ld [wJoyIgnore], a ; fallthrough PewterGymScriptReceiveTM34: diff --git a/scripts/PokemonTower2F.asm b/scripts/PokemonTower2F.asm index 6b3fe4ae..ec04c623 100644 --- a/scripts/PokemonTower2F.asm +++ b/scripts/PokemonTower2F.asm @@ -67,7 +67,7 @@ PokemonTower2FDefeatedRivalScript: ld a, [wIsInBattle] cp $ff jp z, PokemonTower2FResetRivalEncounter - ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN + ld a, PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN ld [wJoyIgnore], a SetEvent EVENT_BEAT_POKEMON_TOWER_RIVAL ld a, TEXT_POKEMONTOWER2F_RIVAL diff --git a/scripts/PokemonTower5F.asm b/scripts/PokemonTower5F.asm index b35a2f0a..fb023a0b 100644 --- a/scripts/PokemonTower5F.asm +++ b/scripts/PokemonTower5F.asm @@ -26,7 +26,7 @@ PokemonTower5FDefaultScript: ret nz xor a ldh [hJoyHeld], a - ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN + ld a, PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN ld [wJoyIgnore], a ld hl, wStatusFlags4 set BIT_NO_BATTLES, [hl] diff --git a/scripts/PokemonTower6F.asm b/scripts/PokemonTower6F.asm index 251b3759..861fdd65 100644 --- a/scripts/PokemonTower6F.asm +++ b/scripts/PokemonTower6F.asm @@ -50,13 +50,13 @@ PokemonTower6FMarowakBattleScript: ld a, [wIsInBattle] cp $ff jp z, PokemonTower6FSetDefaultScript - ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN + ld a, PAD_A | PAD_B | PAD_SELECT | PAD_START | PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN ld [wJoyIgnore], a ld a, [wStatusFlags3] bit BIT_TALKED_TO_TRAINER, a ret nz call UpdateSprites - ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN + ld a, PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN ld [wJoyIgnore], a ld a, [wBattleResult] and a @@ -74,7 +74,7 @@ PokemonTower6FMarowakBattleScript: .did_not_defeat ld a, $1 ld [wSimulatedJoypadStatesIndex], a - ld a, D_RIGHT + ld a, PAD_RIGHT ld [wSimulatedJoypadStatesEnd], a xor a ld [wSpritePlayerStateData2MovementByte1], a diff --git a/scripts/PokemonTower7F.asm b/scripts/PokemonTower7F.asm index 41fba59c..e8ff81af 100644 --- a/scripts/PokemonTower7F.asm +++ b/scripts/PokemonTower7F.asm @@ -29,7 +29,7 @@ PokemonTower7FEndBattleScript: cp $ff jp z, PokemonTower7FSetDefaultScript call EndTrainerBattle - ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN + ld a, PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN ld [wJoyIgnore], a ld a, [wSpriteIndex] ldh [hSpriteIndex], a @@ -65,7 +65,7 @@ PokemonTower7FHideNPCScript: ret PokemonTower7FWarpToMrFujiHouseScript: - ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN + ld a, PAD_A | PAD_B | PAD_SELECT | PAD_START | PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN ld [wJoyIgnore], a ld a, HS_POKEMON_TOWER_7F_MR_FUJI ld [wMissableObjectIndex], a diff --git a/scripts/RocketHideoutB2F.asm b/scripts/RocketHideoutB2F.asm index 0df2f06a..a57cecbd 100644 --- a/scripts/RocketHideoutB2F.asm +++ b/scripts/RocketHideoutB2F.asm @@ -28,7 +28,7 @@ RocketHideoutB2FDefaultScript: call StartSimulatingJoypadStates ld a, SFX_ARROW_TILES call PlaySound - ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN + ld a, PAD_A | PAD_B | PAD_SELECT | PAD_START | PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN ld [wJoyIgnore], a ld a, SCRIPT_ROCKETHIDEOUTB2F_PLAYER_SPINNING ld [wCurMapScript], a @@ -83,177 +83,177 @@ RocketHideout2ArrowTilePlayerMovement: ;format: direction, count ;each list is read starting from the $FF and working backwards RocketHideout2ArrowMovement1: - db D_LEFT, 2 + db PAD_LEFT, 2 db -1 ; end RocketHideout2ArrowMovement2: - db D_RIGHT, 4 + db PAD_RIGHT, 4 db -1 ; end RocketHideout2ArrowMovement3: - db D_UP, 4 - db D_RIGHT, 4 + db PAD_UP, 4 + db PAD_RIGHT, 4 db -1 ; end RocketHideout2ArrowMovement4: - db D_UP, 4 - db D_RIGHT, 4 - db D_UP, 1 + db PAD_UP, 4 + db PAD_RIGHT, 4 + db PAD_UP, 1 db -1 ; end RocketHideout2ArrowMovement5: - db D_LEFT, 2 - db D_UP, 3 + db PAD_LEFT, 2 + db PAD_UP, 3 db -1 ; end RocketHideout2ArrowMovement6: - db D_DOWN, 2 - db D_RIGHT, 4 + db PAD_DOWN, 2 + db PAD_RIGHT, 4 db -1 ; end RocketHideout2ArrowMovement7: - db D_UP, 2 + db PAD_UP, 2 db -1 ; end RocketHideout2ArrowMovement8: - db D_UP, 4 + db PAD_UP, 4 db -1 ; end RocketHideout2ArrowMovement9: - db D_LEFT, 6 + db PAD_LEFT, 6 db -1 ; end RocketHideout2ArrowMovement10: - db D_UP, 1 + db PAD_UP, 1 db -1 ; end RocketHideout2ArrowMovement11: - db D_LEFT, 6 - db D_UP, 4 + db PAD_LEFT, 6 + db PAD_UP, 4 db -1 ; end RocketHideout2ArrowMovement12: - db D_DOWN, 2 + db PAD_DOWN, 2 db -1 ; end RocketHideout2ArrowMovement13: - db D_LEFT, 8 + db PAD_LEFT, 8 db -1 ; end RocketHideout2ArrowMovement14: - db D_LEFT, 8 - db D_UP, 1 + db PAD_LEFT, 8 + db PAD_UP, 1 db -1 ; end RocketHideout2ArrowMovement15: - db D_LEFT, 8 - db D_UP, 6 + db PAD_LEFT, 8 + db PAD_UP, 6 db -1 ; end RocketHideout2ArrowMovement16: - db D_UP, 2 - db D_RIGHT, 4 + db PAD_UP, 2 + db PAD_RIGHT, 4 db -1 ; end RocketHideout2ArrowMovement17: - db D_UP, 2 - db D_RIGHT, 4 - db D_UP, 2 + db PAD_UP, 2 + db PAD_RIGHT, 4 + db PAD_UP, 2 db -1 ; end RocketHideout2ArrowMovement18: - db D_DOWN, 2 - db D_RIGHT, 4 - db D_DOWN, 2 + db PAD_DOWN, 2 + db PAD_RIGHT, 4 + db PAD_DOWN, 2 db -1 ; end RocketHideout2ArrowMovement19: - db D_DOWN, 2 - db D_RIGHT, 4 + db PAD_DOWN, 2 + db PAD_RIGHT, 4 db -1 ; end RocketHideout2ArrowMovement20: - db D_LEFT, 10 + db PAD_LEFT, 10 db -1 ; end RocketHideout2ArrowMovement21: - db D_LEFT, 10 - db D_UP, 2 + db PAD_LEFT, 10 + db PAD_UP, 2 db -1 ; end RocketHideout2ArrowMovement22: - db D_LEFT, 10 - db D_UP, 4 + db PAD_LEFT, 10 + db PAD_UP, 4 db -1 ; end RocketHideout2ArrowMovement23: - db D_UP, 2 - db D_RIGHT, 2 + db PAD_UP, 2 + db PAD_RIGHT, 2 db -1 ; end RocketHideout2ArrowMovement24: - db D_RIGHT, 1 - db D_DOWN, 2 + db PAD_RIGHT, 1 + db PAD_DOWN, 2 db -1 ; end RocketHideout2ArrowMovement25: - db D_RIGHT, 1 + db PAD_RIGHT, 1 db -1 ; end RocketHideout2ArrowMovement26: - db D_DOWN, 2 - db D_RIGHT, 2 + db PAD_DOWN, 2 + db PAD_RIGHT, 2 db -1 ; end RocketHideout2ArrowMovement27: - db D_DOWN, 2 - db D_LEFT, 2 + db PAD_DOWN, 2 + db PAD_LEFT, 2 db -1 ; end RocketHideout2ArrowMovement28: - db D_UP, 2 - db D_RIGHT, 4 - db D_UP, 2 - db D_LEFT, 3 + db PAD_UP, 2 + db PAD_RIGHT, 4 + db PAD_UP, 2 + db PAD_LEFT, 3 db -1 ; end RocketHideout2ArrowMovement29: - db D_DOWN, 2 - db D_LEFT, 4 + db PAD_DOWN, 2 + db PAD_LEFT, 4 db -1 ; end RocketHideout2ArrowMovement30: - db D_LEFT, 6 - db D_UP, 4 - db D_LEFT, 5 + db PAD_LEFT, 6 + db PAD_UP, 4 + db PAD_LEFT, 5 db -1 ; end RocketHideout2ArrowMovement31: - db D_UP, 2 + db PAD_UP, 2 db -1 ; end RocketHideout2ArrowMovement32: - db D_UP, 1 + db PAD_UP, 1 db -1 ; end RocketHideout2ArrowMovement33: - db D_UP, 3 + db PAD_UP, 3 db -1 ; end RocketHideout2ArrowMovement34: - db D_UP, 5 + db PAD_UP, 5 db -1 ; end RocketHideout2ArrowMovement35: - db D_RIGHT, 1 - db D_DOWN, 2 - db D_LEFT, 4 + db PAD_RIGHT, 1 + db PAD_DOWN, 2 + db PAD_LEFT, 4 db -1 ; end RocketHideout2ArrowMovement36: - db D_LEFT, 10 - db D_UP, 2 - db D_LEFT, 5 + db PAD_LEFT, 10 + db PAD_UP, 2 + db PAD_LEFT, 5 db -1 ; end RocketHideoutB2FPlayerSpinningScript: diff --git a/scripts/RocketHideoutB3F.asm b/scripts/RocketHideoutB3F.asm index 0c0e02ea..bf6a1176 100644 --- a/scripts/RocketHideoutB3F.asm +++ b/scripts/RocketHideoutB3F.asm @@ -28,7 +28,7 @@ RocketHideoutB3FDefaultScript: call StartSimulatingJoypadStates ld a, SFX_ARROW_TILES call PlaySound - ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN + ld a, PAD_A | PAD_B | PAD_SELECT | PAD_START | PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN ld [wJoyIgnore], a ld a, SCRIPT_ROCKETHIDEOUTB3F_PLAYER_SPINNING ld [wCurMapScript], a @@ -56,61 +56,61 @@ RocketHideout3ArrowTilePlayerMovement: ;format: direction, count ;each list is read starting from the $FF and working backwards RocketHideout3ArrowMovement1: - db D_RIGHT, 4 - db D_UP, 4 - db D_RIGHT, 4 + db PAD_RIGHT, 4 + db PAD_UP, 4 + db PAD_RIGHT, 4 db -1 ; end RocketHideout3ArrowMovement2: - db D_DOWN, 4 - db D_RIGHT, 4 + db PAD_DOWN, 4 + db PAD_RIGHT, 4 db -1 ; end RocketHideout3ArrowMovement3: - db D_LEFT, 2 + db PAD_LEFT, 2 db -1 ; end RocketHideout3ArrowMovement4: - db D_RIGHT, 4 - db D_UP, 2 - db D_RIGHT, 2 + db PAD_RIGHT, 4 + db PAD_UP, 2 + db PAD_RIGHT, 2 db -1 ; end RocketHideout3ArrowMovement5: - db D_RIGHT, 4 - db D_UP, 2 - db D_RIGHT, 2 - db D_UP, 3 + db PAD_RIGHT, 4 + db PAD_UP, 2 + db PAD_RIGHT, 2 + db PAD_UP, 3 db -1 ; end RocketHideout3ArrowMovement6: - db D_RIGHT, 4 + db PAD_RIGHT, 4 db -1 ; end RocketHideout3ArrowMovement7: - db D_RIGHT, 2 + db PAD_RIGHT, 2 db -1 ; end RocketHideout3ArrowMovement8: - db D_RIGHT, 4 - db D_UP, 2 + db PAD_RIGHT, 4 + db PAD_UP, 2 db -1 ; end RocketHideout3ArrowMovement9: - db D_RIGHT, 4 - db D_UP, 4 + db PAD_RIGHT, 4 + db PAD_UP, 4 db -1 ; end RocketHideout3ArrowMovement10: - db D_DOWN, 4 + db PAD_DOWN, 4 db -1 ; end RocketHideout3ArrowMovement11: - db D_UP, 2 + db PAD_UP, 2 db -1 ; end RocketHideout3ArrowMovement12: - db D_UP, 1 + db PAD_UP, 1 db -1 ; end RocketHideoutB3FPlayerSpinningScript: diff --git a/scripts/RocketHideoutB4F.asm b/scripts/RocketHideoutB4F.asm index a8445db3..3920f70d 100644 --- a/scripts/RocketHideoutB4F.asm +++ b/scripts/RocketHideoutB4F.asm @@ -49,7 +49,7 @@ RocketHideoutB4FBeatGiovanniScript: cp $ff jp z, RocketHideoutB4FSetDefaultScript call UpdateSprites - ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN + ld a, PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN ld [wJoyIgnore], a SetEvent EVENT_BEAT_ROCKET_HIDEOUT_GIOVANNI ld a, TEXT_ROCKETHIDEOUTB4F_GIOVANNI_HOPE_WE_MEET_AGAIN diff --git a/scripts/Route16Gate1F.asm b/scripts/Route16Gate1F.asm index a8bf2f0f..464cb939 100644 --- a/scripts/Route16Gate1F.asm +++ b/scripts/Route16Gate1F.asm @@ -32,7 +32,7 @@ Route16Gate1FDefaultScript: ld [wSimulatedJoypadStatesIndex], a ld b, $0 ld c, a - ld a, D_UP + ld a, PAD_UP ld hl, wSimulatedJoypadStatesEnd call FillMemory call StartSimulatingJoypadStates @@ -55,7 +55,7 @@ Route16Gate1FPlayerMovingUpScript: ld a, [wSimulatedJoypadStatesIndex] and a ret nz - ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN + ld a, PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN ld [wJoyIgnore], a Route16Gate1FGuardScript: @@ -64,7 +64,7 @@ Route16Gate1FGuardScript: call DisplayTextID ld a, $1 ld [wSimulatedJoypadStatesIndex], a - ld a, D_RIGHT + ld a, PAD_RIGHT ld [wSimulatedJoypadStatesEnd], a call StartSimulatingJoypadStates ld a, SCRIPT_ROUTE16GATE1F_PLAYER_MOVING_RIGHT diff --git a/scripts/Route18Gate1F.asm b/scripts/Route18Gate1F.asm index a2b4dcdf..d97e3101 100644 --- a/scripts/Route18Gate1F.asm +++ b/scripts/Route18Gate1F.asm @@ -32,7 +32,7 @@ Route18Gate1FDefaultScript: ld [wSimulatedJoypadStatesIndex], a ld b, 0 ld c, a - ld a, D_UP + ld a, PAD_UP ld hl, wSimulatedJoypadStatesEnd call FillMemory call StartSimulatingJoypadStates @@ -55,7 +55,7 @@ Route18Gate1FPlayerMovingUpScript: ld a, [wSimulatedJoypadStatesIndex] and a ret nz - ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN + ld a, PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN ld [wJoyIgnore], a Route18Gate1FGuardScript: @@ -64,7 +64,7 @@ Route18Gate1FGuardScript: call DisplayTextID ld a, $1 ld [wSimulatedJoypadStatesIndex], a - ld a, D_RIGHT + ld a, PAD_RIGHT ld [wSimulatedJoypadStatesEnd], a call StartSimulatingJoypadStates ld a, SCRIPT_ROUTE18GATE1F_PLAYER_MOVING_RIGHT diff --git a/scripts/Route22.asm b/scripts/Route22.asm index 1a2602fd..cab9ec33 100644 --- a/scripts/Route22.asm +++ b/scripts/Route22.asm @@ -65,7 +65,7 @@ Route22DefaultScript: ld [wSavedCoordIndex], a xor a ldh [hJoyHeld], a - ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN + ld a, PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN ld [wJoyIgnore], a ld a, PLAYER_DIR_LEFT ld [wPlayerMovingDirection], a @@ -162,7 +162,7 @@ Route22Rival1AfterBattleScript: ld a, ROUTE22_RIVAL1 ldh [hSpriteIndex], a call SetSpriteFacingDirectionAndDelay - ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN + ld a, PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN ld [wJoyIgnore], a SetEvent EVENT_BEAT_ROUTE22_RIVAL_1ST_BATTLE ld a, TEXT_ROUTE22_RIVAL1 @@ -321,7 +321,7 @@ Route22Rival2AfterBattleScript: .set_rival_facing_direction ldh [hSpriteFacingDirection], a call SetSpriteFacingDirectionAndDelay - ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN + ld a, PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN ld [wJoyIgnore], a SetEvent EVENT_BEAT_ROUTE22_RIVAL_2ND_BATTLE ld a, TEXT_ROUTE22_RIVAL2 diff --git a/scripts/Route22Gate.asm b/scripts/Route22Gate.asm index d6160ad8..e8e13b3c 100644 --- a/scripts/Route22Gate.asm +++ b/scripts/Route22Gate.asm @@ -36,7 +36,7 @@ Route22GateScriptCoords: Route22GateMovePlayerDownScript: ld a, $1 ld [wSimulatedJoypadStatesIndex], a - ld a, D_DOWN + ld a, PAD_DOWN ld [wSimulatedJoypadStatesEnd], a ld [wSpritePlayerStateData1FacingDirection], a ld [wJoyIgnore], a diff --git a/scripts/Route23.asm b/scripts/Route23.asm index ac4853d8..e2a66c4e 100644 --- a/scripts/Route23.asm +++ b/scripts/Route23.asm @@ -123,7 +123,7 @@ CascadeBadgeText: Route23MovePlayerDownScript: ld a, $1 ld [wSimulatedJoypadStatesIndex], a - ld a, D_DOWN + ld a, PAD_DOWN ld [wSimulatedJoypadStatesEnd], a xor a ld [wSpritePlayerStateData1FacingDirection], a diff --git a/scripts/Route24.asm b/scripts/Route24.asm index 53185147..c18da62f 100644 --- a/scripts/Route24.asm +++ b/scripts/Route24.asm @@ -35,7 +35,7 @@ Route24DefaultScript: call DisplayTextID CheckAndResetEvent EVENT_NUGGET_REWARD_AVAILABLE ret z - ld a, D_DOWN + ld a, PAD_DOWN ld [wSimulatedJoypadStatesEnd], a ld a, $1 ld [wSimulatedJoypadStatesIndex], a @@ -64,7 +64,7 @@ Route24AfterRocketBattleScript: cp $ff jp z, Route24SetDefaultScript call UpdateSprites - ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN + ld a, PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN ld [wJoyIgnore], a SetEvent EVENT_BEAT_ROUTE24_ROCKET ld a, TEXT_ROUTE24_COOLTRAINER_M1 diff --git a/scripts/Route5Gate.asm b/scripts/Route5Gate.asm index 0ccf9fae..581a3da5 100644 --- a/scripts/Route5Gate.asm +++ b/scripts/Route5Gate.asm @@ -10,7 +10,7 @@ Route5Gate_ScriptPointers: dw_const Route5GatePlayerMovingScript, SCRIPT_ROUTE5GATE_PLAYER_MOVING Route5GateMovePlayerUpScript: - ld a, D_UP + ld a, PAD_UP ld [wSimulatedJoypadStatesEnd], a ld a, $1 ld [wSimulatedJoypadStatesIndex], a diff --git a/scripts/Route6Gate.asm b/scripts/Route6Gate.asm index 48228c7d..40f7d5ca 100644 --- a/scripts/Route6Gate.asm +++ b/scripts/Route6Gate.asm @@ -57,7 +57,7 @@ Route6GatePlayerMovingScript: Route6GateMovePlayerDownScript: ld hl, wStatusFlags5 set BIT_SCRIPTED_MOVEMENT_STATE, [hl] - ld a, D_DOWN + ld a, PAD_DOWN ld [wSimulatedJoypadStatesEnd], a ld a, $1 ld [wSimulatedJoypadStatesIndex], a diff --git a/scripts/Route7Gate.asm b/scripts/Route7Gate.asm index e599e147..01f597ff 100644 --- a/scripts/Route7Gate.asm +++ b/scripts/Route7Gate.asm @@ -13,7 +13,7 @@ Route7Gate_ScriptPointers: Route7GateMovePlayerLeftScript: ld hl, wStatusFlags5 set BIT_SCRIPTED_MOVEMENT_STATE, [hl] - ld a, D_LEFT + ld a, PAD_LEFT ld [wSimulatedJoypadStatesEnd], a ld a, $1 ld [wSimulatedJoypadStatesIndex], a diff --git a/scripts/Route8Gate.asm b/scripts/Route8Gate.asm index 44e94a0c..533e45f6 100644 --- a/scripts/Route8Gate.asm +++ b/scripts/Route8Gate.asm @@ -12,7 +12,7 @@ Route8Gate_ScriptPointers: Route8GateMovePlayerRightScript: ld hl, wStatusFlags5 set BIT_SCRIPTED_MOVEMENT_STATE, [hl] - ld a, D_RIGHT + ld a, PAD_RIGHT ld [wSimulatedJoypadStatesEnd], a ld a, $1 ld [wSimulatedJoypadStatesIndex], a diff --git a/scripts/SSAnne2F.asm b/scripts/SSAnne2F.asm index 5bd5589d..45dece40 100644 --- a/scripts/SSAnne2F.asm +++ b/scripts/SSAnne2F.asm @@ -42,7 +42,7 @@ SSAnne2FDefaultScript: call SetSpriteMovementBytesToFF xor a ldh [hJoyHeld], a - ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN + ld a, PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN ld [wJoyIgnore], a ldh a, [hSavedCoordIndex] cp $2 @@ -126,7 +126,7 @@ SSAnne2FRivalAfterBattleScript: cp $ff jp z, SSAnne2FResetScripts call SSAnne2FSetFacingDirectionScript - ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN + ld a, PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN ld [wJoyIgnore], a ld a, TEXT_SSANNE2F_RIVAL_CUT_MASTER ldh [hTextID], a diff --git a/scripts/SafariZoneGate.asm b/scripts/SafariZoneGate.asm index 74a7baa1..87b6ec6d 100644 --- a/scripts/SafariZoneGate.asm +++ b/scripts/SafariZoneGate.asm @@ -22,7 +22,7 @@ SafariZoneGateDefaultScript: ld a, TEXT_SAFARIZONEGATE_SAFARI_ZONE_WORKER1_1 ldh [hTextID], a call DisplayTextID - ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN + ld a, PAD_A | PAD_B | PAD_SELECT | PAD_START | PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN ld [wJoyIgnore], a xor a ldh [hJoyHeld], a @@ -35,10 +35,10 @@ SafariZoneGateDefaultScript: ld [wSafariZoneGateCurScript], a ret .player_not_next_to_worker - ld a, D_RIGHT + ld a, PAD_RIGHT ld c, 1 call SafariZoneEntranceAutoWalk - ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN + ld a, PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN ld [wJoyIgnore], a ld a, SCRIPT_SAFARIZONEGATE_PLAYER_MOVING_RIGHT ld [wSafariZoneGateCurScript], a @@ -60,7 +60,7 @@ SafariZoneGateWouldYouLikeToJoinScript: ld a, TEXT_SAFARIZONEGATE_SAFARI_ZONE_WORKER1_WOULD_YOU_LIKE_TO_JOIN ldh [hTextID], a call DisplayTextID - ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN + ld a, PAD_A | PAD_B | PAD_SELECT | PAD_START | PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN ld [wJoyIgnore], a ret @@ -80,14 +80,14 @@ SafariZoneGateLeavingSafariScript: jr z, .leaving_early ResetEventReuseHL EVENT_IN_SAFARI_ZONE call UpdateSprites - ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN + ld a, PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN ld [wJoyIgnore], a ld a, TEXT_SAFARIZONEGATE_SAFARI_ZONE_WORKER1_GOOD_HAUL_COME_AGAIN ldh [hTextID], a call DisplayTextID xor a ld [wNumSafariBalls], a - ld a, D_DOWN + ld a, PAD_DOWN ld c, 3 call SafariZoneEntranceAutoWalk ld a, SCRIPT_SAFARIZONEGATE_PLAYER_MOVING_DOWN @@ -189,7 +189,7 @@ SafariZoneGateSafariZoneWorker1WouldYouLikeToJoinText: ld [wSafariSteps], a ld a, LOW(502) ld [wSafariSteps + 1], a - ld a, D_UP + ld a, PAD_UP ld c, 3 call SafariZoneEntranceAutoWalk SetEvent EVENT_IN_SAFARI_ZONE @@ -202,7 +202,7 @@ SafariZoneGateSafariZoneWorker1WouldYouLikeToJoinText: ld hl, .PleaseComeAgainText call PrintText .CantPayWalkDown - ld a, D_DOWN + ld a, PAD_DOWN ld c, 1 call SafariZoneEntranceAutoWalk ld a, SCRIPT_SAFARIZONEGATE_PLAYER_MOVING_DOWN @@ -235,7 +235,7 @@ SafariZoneGateSafariZoneWorker1LeavingEarlyText: call PrintText xor a ld [wSpritePlayerStateData1FacingDirection], a - ld a, D_DOWN + ld a, PAD_DOWN ld c, 3 call SafariZoneEntranceAutoWalk ResetEvents EVENT_SAFARI_GAME_OVER, EVENT_IN_SAFARI_ZONE @@ -247,7 +247,7 @@ SafariZoneGateSafariZoneWorker1LeavingEarlyText: call PrintText ld a, SPRITE_FACING_UP ld [wSpritePlayerStateData1FacingDirection], a - ld a, D_UP + ld a, PAD_UP ld c, 1 call SafariZoneEntranceAutoWalk ld a, SCRIPT_SAFARIZONEGATE_LEAVING_SAFARI diff --git a/scripts/SaffronGym.asm b/scripts/SaffronGym.asm index 4bfb7b2c..afa37fe9 100644 --- a/scripts/SaffronGym.asm +++ b/scripts/SaffronGym.asm @@ -40,7 +40,7 @@ SaffronGymSabrinaPostBattle: ld a, [wIsInBattle] cp $ff jp z, SaffronGymResetScripts - ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN + ld a, PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN ld [wJoyIgnore], a SaffronGymSabrinaReceiveTM46Script: diff --git a/scripts/SeafoamIslandsB3F.asm b/scripts/SeafoamIslandsB3F.asm index 23dfd050..671d7719 100644 --- a/scripts/SeafoamIslandsB3F.asm +++ b/scripts/SeafoamIslandsB3F.asm @@ -79,9 +79,9 @@ SeafoamIslandsB3FDefaultScript: ret RLEList_ForcedSurfingStrongCurrentNearSteps: - db D_DOWN, 6 - db D_RIGHT, 5 - db D_DOWN, 3 + db PAD_DOWN, 6 + db PAD_RIGHT, 5 + db PAD_DOWN, 3 db -1 ; end SeafoamIslandsB3FObjectMoving1Script: @@ -122,16 +122,16 @@ SeafoamIslandsB3FMoveObjectScript: ret .RLEList_StrongCurrentNearRightBoulder: - db D_DOWN, 6 - db D_RIGHT, 2 - db D_DOWN, 4 - db D_LEFT, 1 + db PAD_DOWN, 6 + db PAD_RIGHT, 2 + db PAD_DOWN, 4 + db PAD_LEFT, 1 db -1 ; end .RLEList_StrongCurrentNearLeftBoulder: - db D_DOWN, 6 - db D_RIGHT, 2 - db D_DOWN, 4 + db PAD_DOWN, 6 + db PAD_RIGHT, 2 + db PAD_DOWN, 4 db -1 ; end SeafoamIslandsB3FObjectMoving2Script: diff --git a/scripts/SeafoamIslandsB4F.asm b/scripts/SeafoamIslandsB4F.asm index 783b410d..314a8d50 100644 --- a/scripts/SeafoamIslandsB4F.asm +++ b/scripts/SeafoamIslandsB4F.asm @@ -45,7 +45,7 @@ SeafoamIslandsB4FDefaultScript: ld a, 1 .forcePlayerUpFromSurfExit ld [wSimulatedJoypadStatesIndex], a - ld a, D_UP + ld a, PAD_UP ld [wSimulatedJoypadStatesEnd], a call StartSimulatingJoypadStates ld hl, wStatusFlags7 @@ -103,15 +103,15 @@ SeafoamIslandsB4FMoveObjectScript: db -1 ; end .RLEList_StrongCurrentNearRightBoulder: - db D_UP, 3 - db D_RIGHT, 2 - db D_UP, 1 + db PAD_UP, 3 + db PAD_RIGHT, 2 + db PAD_UP, 1 db -1 ; end .RLEList_StrongCurrentNearLeftBoulder: - db D_UP, 3 - db D_RIGHT, 3 - db D_UP, 1 + db PAD_UP, 3 + db PAD_RIGHT, 3 + db PAD_UP, 1 db -1 ; end SeafoamIslandsB4FObjectMoving2Script: diff --git a/scripts/SilphCo11F.asm b/scripts/SilphCo11F.asm index 6953d37c..c1f3ff6b 100644 --- a/scripts/SilphCo11F.asm +++ b/scripts/SilphCo11F.asm @@ -173,7 +173,7 @@ SilphCo11FDefaultScript: ld [wSavedCoordIndex], a xor a ldh [hJoyHeld], a - ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN + ld a, PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN ld [wJoyIgnore], a ld a, TEXT_SILPHCO11F_GIOVANNI ldh [hTextID], a @@ -220,7 +220,7 @@ SilphCo11FGiovanniAfterBattleScript: ld b, SPRITE_FACING_DOWN .continue call SilphCo11FSetPlayerAndSpriteFacingDirectionScript - ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN + ld a, PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN ld [wJoyIgnore], a ld a, TEXT_SILPHCO11F_GIOVANNI_YOU_RUINED_OUR_PLANS ldh [hTextID], a diff --git a/scripts/SilphCo7F.asm b/scripts/SilphCo7F.asm index 358be537..f52fd56a 100644 --- a/scripts/SilphCo7F.asm +++ b/scripts/SilphCo7F.asm @@ -127,7 +127,7 @@ SilphCo7FDefaultScript: jp nc, CheckFightingMapTrainers xor a ldh [hJoyHeld], a - ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN + ld a, PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN ld [wJoyIgnore], a ld a, PLAYER_DIR_DOWN ld [wPlayerMovingDirection], a @@ -207,7 +207,7 @@ SilphCo7FRivalAfterBattleScript: ld a, [wIsInBattle] cp $ff jp z, SilphCo7FSetDefaultScript - ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN + ld a, PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN ld [wJoyIgnore], a SetEvent EVENT_BEAT_SILPH_CO_RIVAL ld a, PLAYER_DIR_DOWN diff --git a/scripts/VermilionCity.asm b/scripts/VermilionCity.asm index 40a08dbc..5d19ed64 100644 --- a/scripts/VermilionCity.asm +++ b/scripts/VermilionCity.asm @@ -59,7 +59,7 @@ VermilionCityDefaultScript: and a ret nz .ship_departed - ld a, D_UP + ld a, PAD_UP ld [wSimulatedJoypadStatesEnd], a ld a, $1 ld [wSimulatedJoypadStatesIndex], a @@ -81,9 +81,9 @@ VermilionCityPlayerAllowedToPassScript: ret VermilionCityPlayerExitShipScript: - ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN + ld a, PAD_A | PAD_B | PAD_SELECT | PAD_START | PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN ld [wJoyIgnore], a - ld a, D_UP + ld a, PAD_UP ld [wSimulatedJoypadStatesEnd], a ld [wSimulatedJoypadStatesEnd + 1], a ld a, 2 diff --git a/scripts/VermilionDock.asm b/scripts/VermilionDock.asm index 532a9bb5..d626a630 100644 --- a/scripts/VermilionDock.asm +++ b/scripts/VermilionDock.asm @@ -14,7 +14,7 @@ VermilionDock_Script: ld hl, wStatusFlags5 set BIT_SCRIPTED_MOVEMENT_STATE, [hl] ld hl, wSimulatedJoypadStatesEnd - ld a, D_UP + ld a, PAD_UP ld [hli], a ld [hli], a ld [hl], a diff --git a/scripts/VermilionGym.asm b/scripts/VermilionGym.asm index 8d3a33b6..3fdd713d 100644 --- a/scripts/VermilionGym.asm +++ b/scripts/VermilionGym.asm @@ -59,7 +59,7 @@ VermilionGymLTSurgeAfterBattleScript: ld a, [wIsInBattle] cp $ff ; did we lose? jp z, VermilionGymResetScripts - ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN + ld a, PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN ld [wJoyIgnore], a VermilionGymLTSurgeReceiveTM24Script: diff --git a/scripts/ViridianCity.asm b/scripts/ViridianCity.asm index 473b7ee5..e30f41f1 100644 --- a/scripts/ViridianCity.asm +++ b/scripts/ViridianCity.asm @@ -118,7 +118,7 @@ ViridianCityMovePlayerDownScript: call StartSimulatingJoypadStates ld a, $1 ld [wSimulatedJoypadStatesIndex], a - ld a, D_DOWN + ld a, PAD_DOWN ld [wSimulatedJoypadStatesEnd], a xor a ld [wSpritePlayerStateData1FacingDirection], a diff --git a/scripts/ViridianGym.asm b/scripts/ViridianGym.asm index 55d849d2..49253c4b 100644 --- a/scripts/ViridianGym.asm +++ b/scripts/ViridianGym.asm @@ -45,7 +45,7 @@ ViridianGymDefaultScript: set BIT_SPINNING, [hl] ld a, SFX_ARROW_TILES call PlaySound - ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN + ld a, PAD_A | PAD_B | PAD_SELECT | PAD_START | PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN ld [wJoyIgnore], a ld a, SCRIPT_VIRIDIANGYM_PLAYER_SPINNING ld [wCurMapScript], a @@ -67,51 +67,51 @@ ViridianGymArrowTilePlayerMovement: db -1 ; end ViridianGymArrowMovement1: - db D_UP, 9 + db PAD_UP, 9 db -1 ; end ViridianGymArrowMovement2: - db D_LEFT, 8 + db PAD_LEFT, 8 db -1 ; end ViridianGymArrowMovement3: - db D_DOWN, 9 + db PAD_DOWN, 9 db -1 ; end ViridianGymArrowMovement4: - db D_RIGHT, 6 + db PAD_RIGHT, 6 db -1 ; end ViridianGymArrowMovement5: - db D_DOWN, 2 + db PAD_DOWN, 2 db -1 ; end ViridianGymArrowMovement6: - db D_DOWN, 7 + db PAD_DOWN, 7 db -1 ; end ViridianGymArrowMovement7: - db D_RIGHT, 8 + db PAD_RIGHT, 8 db -1 ; end ViridianGymArrowMovement8: - db D_RIGHT, 9 + db PAD_RIGHT, 9 db -1 ; end ViridianGymArrowMovement9: - db D_UP, 8 + db PAD_UP, 8 db -1 ; end ViridianGymArrowMovement10: - db D_UP, 6 + db PAD_UP, 6 db -1 ; end ViridianGymArrowMovement11: - db D_LEFT, 6 + db PAD_LEFT, 6 db -1 ; end ViridianGymArrowMovement12: - db D_LEFT, 12 + db PAD_LEFT, 12 db -1 ; end ViridianGymPlayerSpinningScript: @@ -132,7 +132,7 @@ ViridianGymGiovanniPostBattle: ld a, [wIsInBattle] cp $ff jp z, ViridianGymResetScripts - ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN + ld a, PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN ld [wJoyIgnore], a ; fallthrough ViridianGymReceiveTM27: diff --git a/scripts/ViridianMart.asm b/scripts/ViridianMart.asm index f54f3c26..34e1281c 100644 --- a/scripts/ViridianMart.asm +++ b/scripts/ViridianMart.asm @@ -41,8 +41,8 @@ ViridianMartDefaultScript: ret .PlayerMovement: - db D_LEFT, 1 - db D_UP, 2 + db PAD_LEFT, 1 + db PAD_UP, 2 db -1 ; end ViridianMartOaksParcelScript: |