Merge branch 'master' of https://github.com/pret/pokered

56 files changed, 291 insertions, 291 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 019fe97d..66b2a1e6 100644
--- a/scripts/BikeShop.asm
+++ b/scripts/BikeShop.asm
@@ -41,7 +41,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
@@ -67,7 +67,7 @@ BikeShopClerkText:
 	ld hl, wStatusFlags5
 	res BIT_NO_TEXT_DELAY, [hl]
 	call HandleMenuInput
-	bit BIT_B_BUTTON, a
+	bit B_PAD_B, a
 	jr nz, .cancel
 	ld a, [wCurrentMenuItem]
 	and a
diff --git a/scripts/BillsHouse.asm b/scripts/BillsHouse.asm
index 3c1de8e4..17bea71a 100644
--- a/scripts/BillsHouse.asm
+++ b/scripts/BillsHouse.asm
@@ -56,7 +56,7 @@ BillsHouseScript1:
 	ret
 
 BillsHouseScript2:
-	ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN
+	ld a, PAD_BUTTONS | PAD_CTRL_PAD
 	ld [wJoyIgnore], a
 	ld a, [wSpritePlayerStateData1FacingDirection]
 	and a ; cp SPRITE_FACING_DOWN
@@ -135,7 +135,7 @@ PikachuMovementData_1e152:
 BillsHouseScript4:
 	CheckEvent EVENT_USED_CELL_SEPARATOR_ON_BILL
 	ret z
-	ld a, SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN
+	ld a, PAD_SELECT | PAD_START | PAD_CTRL_PAD
 	ld [wJoyIgnore], a
 	ld a, SCRIPT_BILLSHOUSE_SCRIPT5
 	ld [wBillsHouseCurScript], a
@@ -213,7 +213,7 @@ BillsHouseScript7:
 	ld [wPlayerMovingDirection], a
 	ld a, SPRITE_FACING_UP
 	ld [wSpritePlayerStateData1FacingDirection], a
-	ld a, ~(A_BUTTON | B_BUTTON)
+	ld a, PAD_SELECT | PAD_START | PAD_CTRL_PAD
 	ld [wJoyIgnore], a
 	ld de, RLE_1e219
 	ld hl, wSimulatedJoypadStatesEnd
@@ -226,7 +226,7 @@ BillsHouseScript7:
 	ret
 
 RLE_1e219:
-	db D_RIGHT, $3
+	db PAD_RIGHT, $3
 	db $FF
 
 BillsHouseScript8:
diff --git a/scripts/BillsHouse_2.asm b/scripts/BillsHouse_2.asm
index 763747e7..f75ab204 100644
--- a/scripts/BillsHouse_2.asm
+++ b/scripts/BillsHouse_2.asm
@@ -105,7 +105,7 @@ Func_f24ae::
 	ret
 
 Func_f24d5::
-	ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN
+	ld a, PAD_BUTTONS | PAD_CTRL_PAD
 	ld [wJoyIgnore], a
 	xor a
 	ld [wPlayerMovingDirection], 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..2e9e197b 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_CTRL_PAD
 	ld [wJoyIgnore], a
 
 CeladonGymReceiveTM21:
diff --git a/scripts/CeladonMartRoof.asm b/scripts/CeladonMartRoof.asm
index 57eab858..4bb4d596 100644
--- a/scripts/CeladonMartRoof.asm
+++ b/scripts/CeladonMartRoof.asm
@@ -49,7 +49,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
@@ -73,7 +73,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 c1268a60..0bc77b42 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_CTRL_PAD
 	ld [wJoyIgnore], a
 	SetEvent EVENT_BEAT_CERULEAN_ROCKET_THIEF
 	ld a, TEXT_CERULEANCITY_ROCKET
@@ -76,7 +76,7 @@ ENDC
 	call PlayMusic
 	xor a
 	ldh [hJoyHeld], a
-	ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN
+	ld a, PAD_CTRL_PAD
 	ld [wJoyIgnore], a
 	ld a, [wXCoord]
 	cp 20 ; is the player standing on the right side of the bridge?
@@ -153,7 +153,7 @@ CeruleanCityRivalDefeatedScript:
 	cp $ff
 	jp z, CeruleanCityClearScripts
 	call CeruleanCityFaceRivalScript
-	ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN
+	ld a, PAD_CTRL_PAD
 	ld [wJoyIgnore], a
 	SetEvent EVENT_BEAT_CERULEAN_RIVAL
 	ld a, TEXT_CERULEANCITY_RIVAL
diff --git a/scripts/CeruleanGym.asm b/scripts/CeruleanGym.asm
index cb4d3975..a899fcc0 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_CTRL_PAD
 	ld [wJoyIgnore], a
 
 CeruleanGymReceiveTM11:
diff --git a/scripts/ChampionsRoom.asm b/scripts/ChampionsRoom.asm
index 3188a5c0..8db95e56 100644
--- a/scripts/ChampionsRoom.asm
+++ b/scripts/ChampionsRoom.asm
@@ -29,7 +29,7 @@ ChampionsRoomDefaultScript:
 	ret
 
 ChampionsRoomPlayerEntersScript:
-	ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN
+	ld a, PAD_BUTTONS | PAD_CTRL_PAD
 	ld [wJoyIgnore], a
 	ld hl, wSimulatedJoypadStatesEnd
 	ld de, RivalEntrance_RLEMovement
@@ -42,9 +42,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:
@@ -86,7 +86,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_CTRL_PAD
 	ld [wJoyIgnore], a
 	ld a, TEXT_CHAMPIONSROOM_RIVAL
 	ldh [hTextID], a
@@ -195,7 +195,7 @@ ChampionsRoomOakExitsScript:
 	ret
 
 ChampionsRoomPlayerFollowsOakScript:
-	ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN
+	ld a, PAD_BUTTONS | PAD_CTRL_PAD
 	ld [wJoyIgnore], a
 	ld hl, wSimulatedJoypadStatesEnd
 	ld de, WalkToHallOfFame_RLEMovement
@@ -208,8 +208,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:
@@ -223,10 +223,10 @@ ChampionsRoomCleanupScript:
 	ret
 
 ChampionsRoom_DisplayTextID_AllowABSelectStart:
-	ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN
+	ld a, PAD_CTRL_PAD
 	ld [wJoyIgnore], a
 	call DisplayTextID
-	ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN
+	ld a, PAD_BUTTONS | PAD_CTRL_PAD
 	ld [wJoyIgnore], a
 	ret
 
diff --git a/scripts/CinnabarGym.asm b/scripts/CinnabarGym.asm
index a81e1df1..fd3ceda1 100644
--- a/scripts/CinnabarGym.asm
+++ b/scripts/CinnabarGym.asm
@@ -200,7 +200,7 @@ CinnabarGymBlainePostBattleScript:
 	ld a, [wIsInBattle]
 	cp $ff
 	jp z, CinnabarGymResetScripts
-	ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN
+	ld a, PAD_CTRL_PAD
 	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..04b35e82 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_CTRL_PAD
 	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..79b3e4ef 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_CTRL_PAD
 	ld [wJoyIgnore], a
 ; fallthrough
 FuchsiaGymReceiveTM06:
diff --git a/scripts/GameCorner.asm b/scripts/GameCorner.asm
index e242381f..5aaa998c 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_CTRL_PAD
 	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..eb26afaf 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_BUTTONS | PAD_CTRL_PAD
 	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_BUTTONS | PAD_CTRL_PAD
 	ld [wJoyIgnore], a
 	ld a, HS_CERULEAN_CAVE_GUY
 	ld [wMissableObjectIndex], a
diff --git a/scripts/LancesRoom.asm b/scripts/LancesRoom.asm
index 772b33bf..f54a0511 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_BUTTONS | PAD_CTRL_PAD
 	ld [wJoyIgnore], a
 	ld hl, wSimulatedJoypadStatesEnd
 	ld de, WalkToLance_RLEList
@@ -109,10 +109,10 @@ WalkToLance:
 	ret
 
 WalkToLance_RLEList:
-	db D_UP, 13
-	db D_LEFT, 12
-	db D_DOWN, 7
-	db D_LEFT, 6
+	db PAD_UP, 13
+	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 89873526..4b82ea12 100644
--- a/scripts/MtMoonB2F.asm
+++ b/scripts/MtMoonB2F.asm
@@ -200,7 +200,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_CTRL_PAD
 	ld [wJoyIgnore], a
 	ld a, $1
 	ld [wDoNotWaitForButtonPressAfterDisplayingText], a
@@ -235,7 +235,7 @@ MtMoonB2FScript_49e15:
 	call PlayMusic
 	xor a
 	ldh [hJoyHeld], a
-	ld a, ~(A_BUTTON | B_BUTTON)
+	ld a, PAD_SELECT | PAD_START | PAD_CTRL_PAD
 	ld [wJoyIgnore], a
 	ld a, HS_MT_MOON_B2F_JESSIE
 	call MtMoonB2FScript_ShowObject
@@ -250,10 +250,10 @@ MtMoonB2FScript_49e15:
 	ld [wDoNotWaitForButtonPressAfterDisplayingText], a
 	ld a, $1
 	ld [wSimulatedJoypadStatesIndex], a
-	ld a, D_UP
+	ld a, PAD_UP
 	ld [wSimulatedJoypadStatesEnd], a
 	call StartSimulatingJoypadStates
-	ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN
+	ld a, PAD_BUTTONS | PAD_CTRL_PAD
 	ld [wJoyIgnore], a
 	ld a, SCRIPT_MTMOONB2F_SCRIPT6
 	call MtMoonB2FSetScript
@@ -270,7 +270,7 @@ MovementData_f9e66:
 	db $FF
 
 MtMoonB2FScript6:
-	ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN
+	ld a, PAD_BUTTONS | PAD_CTRL_PAD
 	ld [wJoyIgnore], a
 	ld a, [wSimulatedJoypadStatesIndex]
 	and a
@@ -280,14 +280,14 @@ MtMoonB2FScript6:
 	ldh [hSpriteIndex], a
 	ld de, MovementData_f9e65
 	call MoveSprite
-	ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN
+	ld a, PAD_BUTTONS | PAD_CTRL_PAD
 	ld [wJoyIgnore], a
 	ld a, SCRIPT_MTMOONB2F_SCRIPT7
 	call MtMoonB2FSetScript
 	ret
 
 MtMoonB2FScript7:
-	ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN
+	ld a, PAD_BUTTONS | PAD_CTRL_PAD
 	ld [wJoyIgnore], a
 	ld a, [wStatusFlags5]
 	bit BIT_SCRIPTED_NPC_MOVEMENT, a
@@ -302,14 +302,14 @@ MtMoonB2FScript9:
 	ldh [hSpriteIndex], a
 	ld de, MovementData_f9e66
 	call MoveSprite
-	ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN
+	ld a, PAD_BUTTONS | PAD_CTRL_PAD
 	ld [wJoyIgnore], a
 	ld a, SCRIPT_MTMOONB2F_SCRIPT10
 	call MtMoonB2FSetScript
 	ret
 
 MtMoonB2FScript10:
-	ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN
+	ld a, PAD_BUTTONS | PAD_CTRL_PAD
 	ld [wJoyIgnore], a
 	ld a, [wStatusFlags5]
 	bit BIT_SCRIPTED_NPC_MOVEMENT, a
@@ -320,7 +320,7 @@ MtMoonB2FScript11:
 	ld a, SPRITE_FACING_LEFT
 	ld [wSprite06StateData1FacingDirection], a
 	call Delay3
-	ld a, ~(A_BUTTON | B_BUTTON)
+	ld a, PAD_SELECT | PAD_START | PAD_CTRL_PAD
 	ld [wJoyIgnore], a
 	ld a, TEXT_MTMOONB2F_TEXT13
 	ldh [hTextID], a
@@ -345,7 +345,7 @@ MtMoonB2FScript12:
 	ret
 
 MtMoonB2FScript13:
-	ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN
+	ld a, PAD_BUTTONS | PAD_CTRL_PAD
 	ld [wJoyIgnore], a
 	ld a, [wIsInBattle]
 	cp $ff
@@ -356,7 +356,7 @@ MtMoonB2FScript13:
 	xor a
 	ld [wSprite02StateData1FacingDirection], a
 	ld [wSprite06StateData1FacingDirection], a
-	ld a, ~(A_BUTTON | B_BUTTON)
+	ld a, PAD_SELECT | PAD_START | PAD_CTRL_PAD
 	ld [wJoyIgnore], a
 	ld a, $1
 	ld [wDoNotWaitForButtonPressAfterDisplayingText], a
@@ -369,14 +369,14 @@ MtMoonB2FScript13:
 	ld c, BANK(Music_MeetJessieJames)
 	ld a, MUSIC_MEET_JESSIE_JAMES
 	call PlayMusic
-	ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN
+	ld a, PAD_BUTTONS | PAD_CTRL_PAD
 	ld [wJoyIgnore], a
 	ld a, SCRIPT_MTMOONB2F_SCRIPT14
 	call MtMoonB2FSetScript
 	ret
 
 MtMoonB2FScript14:
-	ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN
+	ld a, PAD_BUTTONS | PAD_CTRL_PAD
 	ld [wJoyIgnore], a
 	call GBFadeOutToBlack
 	ld a, HS_MT_MOON_B2F_JESSIE
diff --git a/scripts/Museum1F_2.asm b/scripts/Museum1F_2.asm
index 836242f4..9a848f50 100644
--- a/scripts/Museum1F_2.asm
+++ b/scripts/Museum1F_2.asm
@@ -72,7 +72,7 @@ Museum1FPrintScientist1Text::
 	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 5be583d9..c7197cb9 100644
--- a/scripts/OaksLab.asm
+++ b/scripts/OaksLab.asm
@@ -107,7 +107,7 @@ OaksLabPlayerEntersLabScript:
 	ret
 
 PlayerEntryMovementRLE:
-	db D_UP, 8
+	db PAD_UP, 8
 	db -1 ; end
 
 OaksLabFollowedOakScript:
@@ -131,7 +131,7 @@ OaksLabFollowedOakScript:
 
 OaksLabOakChooseMonSpeechScript:
 	SetEvent EVENT_OAK_ASKED_TO_CHOOSE_MON
-	ld a, SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN
+	ld a, PAD_SELECT | PAD_START | PAD_CTRL_PAD
 	ld [wJoyIgnore], a
 	ld a, TEXT_OAKSLAB_RIVAL_FED_UP_WITH_WAITING
 	ldh [hTextID], a
@@ -179,7 +179,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
@@ -232,7 +232,7 @@ OaksLabRivalTakesPokeballScript:
 	ld a, EEVEE
 	ld [wNamedObjectIndex], a
 	call GetMonName
-	ld a, ~(A_BUTTON | B_BUTTON)
+	ld a, PAD_SELECT | PAD_START | PAD_CTRL_PAD
 	ld [wJoyIgnore], a
 	ld a, TEXT_OAKSLAB_RIVAL_RECEIVED_MON
 	ldh [hTextID], a
@@ -253,7 +253,7 @@ OaksLabRivalTakesPokeballScript:
 	ld [wPlayerMovingDirection], a
 	ld a, $2
 	ld [wSimulatedJoypadStatesIndex], a
-	ld a, D_RIGHT
+	ld a, PAD_RIGHT
 	ld [wSimulatedJoypadStatesEnd], a
 	ld [wSimulatedJoypadStatesEnd + 1], a
 	call StartSimulatingJoypadStates
@@ -265,7 +265,7 @@ OaksLabPlayerWalksToOakScript:
 	jr z, .asm_1c599
 	ld a, $1
 	ld [wSimulatedJoypadStatesIndex], a
-	ld a, D_LEFT
+	ld a, PAD_LEFT
 	ld [wSimulatedJoypadStatesEnd], a
 	jr .asm_1c5a6
 
@@ -282,10 +282,10 @@ OaksLabPlayerWalksToOakScript:
 	ret
 
 OaksLabRLE_PlayerWalksToOak:
-	db D_UP, 2
-	db D_LEFT, 3
-	db D_DOWN, 1
-	db D_LEFT, 1
+	db PAD_UP, 2
+	db PAD_LEFT, 3
+	db PAD_DOWN, 1
+	db PAD_LEFT, 1
 	db $FF
 
 OaksLabPlayerReceivesPikachuScript:
@@ -364,7 +364,7 @@ OaksLabRivalStartBattleScript:
 	ret
 
 OaksLabRivalEndBattleScript:
-	ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN
+	ld a, PAD_BUTTONS | PAD_CTRL_PAD
 	ld [wJoyIgnore], a
 
 	; If you beat your rival here, his Eevee will evolve into
@@ -380,7 +380,7 @@ OaksLabRivalEndBattleScript:
 	ld a, b
 	ld [wRivalStarter], a
 
-	ld a, ~(A_BUTTON | B_BUTTON)
+	ld a, PAD_SELECT | PAD_START | PAD_CTRL_PAD
 	ld [wJoyIgnore], a
 	ld a, PLAYER_DIR_UP
 	ld [wPlayerMovingDirection], a
@@ -439,7 +439,7 @@ OaksLabPlayerWatchRivalExitScript:
 	ld a, [wStatusFlags5]
 	bit BIT_SCRIPTED_NPC_MOVEMENT, a
 	jr nz, .checkRivalPosition
-	ld a, ~(A_BUTTON | B_BUTTON)
+	ld a, PAD_SELECT | PAD_START | PAD_CTRL_PAD
 	ld [wJoyIgnore], a
 	ld a, HS_OAKS_LAB_RIVAL
 	ld [wMissableObjectIndex], a
@@ -544,7 +544,7 @@ OaksLabOakGivesPokedexScript:
 	ret nz
 	call EnableAutoTextBoxDrawing
 	call PlayDefaultMusic
-	ld a, ~(A_BUTTON | B_BUTTON)
+	ld a, PAD_SELECT | PAD_START | PAD_CTRL_PAD
 	ld [wJoyIgnore], a
 	call OaksLabRivalFaceUpOakFaceDownScript
 	ld a, TEXT_OAKSLAB_RIVAL_MY_POKEMON_HAS_GROWN_STRONGER
diff --git a/scripts/PalletTown.asm b/scripts/PalletTown.asm
index 5bdd774b..42e3ea3e 100644
--- a/scripts/PalletTown.asm
+++ b/scripts/PalletTown.asm
@@ -35,7 +35,7 @@ PalletTownDefaultScript:
 .asm_18e40
 	xor a
 	ldh [hJoyHeld], a
-	ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN
+	ld a, PAD_BUTTONS | PAD_CTRL_PAD
 	ld [wJoyIgnore], a
 	ld a, PLAYER_DIR_UP
 	ld [wPlayerMovingDirection], a
@@ -52,14 +52,14 @@ PalletTownDefaultScript:
 	ret
 
 PalletTownOakHeyWaitScript:
-	ld a, ~(A_BUTTON | B_BUTTON)
+	ld a, PAD_SELECT | PAD_START | PAD_CTRL_PAD
 	ld [wJoyIgnore], a
 	xor a
 	ld [wOakWalkedToPlayer], a
 	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_BUTTONS | PAD_CTRL_PAD
 	ld [wJoyIgnore], a
 	ld hl, wSprite01StateData2MapY
 	ld a, 8
@@ -106,7 +106,7 @@ PalletTownOakGreetsPlayerScript:
 	ld a, [wStatusFlags5]
 	bit BIT_SCRIPTED_NPC_MOVEMENT, a
 	ret nz
-	ld a, ~(A_BUTTON | B_BUTTON)
+	ld a, PAD_SELECT | PAD_START | PAD_CTRL_PAD
 	ld [wJoyIgnore], a
 	ld a, 1
 	ld [wOakWalkedToPlayer], a
@@ -118,7 +118,7 @@ PalletTownOakGreetsPlayerScript:
 	ldh [hTextID], a
 	call DisplayTextID
 	; oak faces the horizontally adjacent patch of grass to face pikachu
-	ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN
+	ld a, PAD_BUTTONS | PAD_CTRL_PAD
 	ld [wJoyIgnore], a
 	ld a, $2
 	ld [wSprite01StateData1MovementStatus], a
@@ -136,7 +136,7 @@ PalletTownOakGreetsPlayerScript:
 
 PalletTownPikachuBattleScript:
 	; start the pikachu battle
-	ld a, ~(A_BUTTON | B_BUTTON)
+	ld a, PAD_SELECT | PAD_START | PAD_CTRL_PAD
 	ld [wJoyIgnore], a
 	xor a
 	ld [wListScrollOffset], a
@@ -165,7 +165,7 @@ PalletTownAfterPikachuBattleScript:
 	ld a, TEXT_PALLETTOWN_OAK_COME_WITH_ME
 	ldh [hTextID], a
 	call DisplayTextID
-	ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN
+	ld a, PAD_BUTTONS | PAD_CTRL_PAD
 	ld [wJoyIgnore], a
 
 	; trigger the next script
diff --git a/scripts/PewterCity.asm b/scripts/PewterCity.asm
index 6cd96acc..79c02f9a 100644
--- a/scripts/PewterCity.asm
+++ b/scripts/PewterCity.asm
@@ -34,7 +34,7 @@ ENDC
 	ld hl, PewterCityPlayerLeavingEastCoords
 	call ArePlayerCoordsInArray
 	ret nc
-	ld a, SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN
+	ld a, PAD_SELECT | PAD_START | PAD_CTRL_PAD
 	ld [wJoyIgnore], a
 	ld a, TEXT_PEWTERCITY_YOUNGSTER
 	ldh [hTextID], a
diff --git a/scripts/PewterGym.asm b/scripts/PewterGym.asm
index 87b35924..4cb13fa4 100644
--- a/scripts/PewterGym.asm
+++ b/scripts/PewterGym.asm
@@ -41,7 +41,7 @@ PewterGymBrockPostBattle:
 	ld a, [wIsInBattle]
 	cp $ff
 	jp z, PewterGymResetScripts
-	ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN
+	ld a, PAD_CTRL_PAD
 	ld [wJoyIgnore], a
 ; fallthrough
 PewterGymScriptReceiveTM34:
diff --git a/scripts/PokemonTower2F.asm b/scripts/PokemonTower2F.asm
index 4a7abbb6..d5fbd932 100644
--- a/scripts/PokemonTower2F.asm
+++ b/scripts/PokemonTower2F.asm
@@ -65,7 +65,7 @@ PokemonTower2FDefeatedRivalScript:
 	ld a, [wIsInBattle]
 	cp $ff
 	jp z, PokemonTower2FResetRivalEncounter
-	ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN
+	ld a, PAD_CTRL_PAD
 	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..4c083980 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_CTRL_PAD
 	ld [wJoyIgnore], a
 	ld hl, wStatusFlags4
 	set BIT_NO_BATTLES, [hl]
diff --git a/scripts/PokemonTower6F.asm b/scripts/PokemonTower6F.asm
index 251b3759..ad71ad6d 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_BUTTONS | PAD_CTRL_PAD
 	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_CTRL_PAD
 	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 79c091b6..3e30db56 100644
--- a/scripts/PokemonTower7F.asm
+++ b/scripts/PokemonTower7F.asm
@@ -55,7 +55,7 @@ PokemonTower7FScript_60d2a:
 	call PlayMusic
 	xor a
 	ldh [hJoyHeld], a
-	ld a, ~(A_BUTTON | B_BUTTON)
+	ld a, PAD_SELECT | PAD_START | PAD_CTRL_PAD
 	ld [wJoyIgnore], a
 	ld a, HS_POKEMON_TOWER_7F_JESSIE
 	call PokemonTower7FScript_ShowObject
@@ -66,7 +66,7 @@ PokemonTower7FScript_60d2a:
 	ld a, TEXT_POKEMONTOWER7F_TEXT4
 	ldh [hTextID], a
 	call DisplayTextID
-	ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN
+	ld a, PAD_BUTTONS | PAD_CTRL_PAD
 	ld [wJoyIgnore], a
 	ld a, SCRIPT_POKEMONTOWER7F_SCRIPT1
 	call PokemonTower7FSetScript
@@ -89,14 +89,14 @@ PokemonTower7FScript1:
 	ld a, POKEMONTOWER7F_JESSIE
 	ldh [hSpriteIndex], a
 	call MoveSprite
-	ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN
+	ld a, PAD_BUTTONS | PAD_CTRL_PAD
 	ld [wJoyIgnore], a
 	ld a, SCRIPT_POKEMONTOWER7F_SCRIPT2
 	call PokemonTower7FSetScript
 	ret
 
 PokemonTower7FScript2:
-	ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN
+	ld a, PAD_BUTTONS | PAD_CTRL_PAD
 	ld [wJoyIgnore], a
 	ld a, [wStatusFlags5]
 	bit BIT_SCRIPTED_NPC_MOVEMENT, a
@@ -120,14 +120,14 @@ PokemonTower7FScript4:
 	ld a, POKEMONTOWER7F_JAMES
 	ldh [hSpriteIndex], a
 	call MoveSprite
-	ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN
+	ld a, PAD_BUTTONS | PAD_CTRL_PAD
 	ld [wJoyIgnore], a
 	ld a, SCRIPT_POKEMONTOWER7F_SCRIPT5
 	call PokemonTower7FSetScript
 	ret
 
 PokemonTower7FScript5:
-	ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN
+	ld a, PAD_BUTTONS | PAD_CTRL_PAD
 	ld [wJoyIgnore], a
 	ld a, [wStatusFlags5]
 	bit BIT_SCRIPTED_NPC_MOVEMENT, a
@@ -143,7 +143,7 @@ PokemonTower7FScript6:
 	ld [wSprite02StateData1FacingDirection], a
 .asm_60dff
 	call Delay3
-	ld a, ~(A_BUTTON | B_BUTTON)
+	ld a, PAD_SELECT | PAD_START | PAD_CTRL_PAD
 	ld [wJoyIgnore], a
 	ld a, TEXT_POKEMONTOWER7F_TEXT5
 	ldh [hTextID], a
@@ -167,7 +167,7 @@ PokemonTower7FScript7:
 	ret
 
 PokemonTower7FScript8:
-	ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN
+	ld a, PAD_BUTTONS | PAD_CTRL_PAD
 	ld [wJoyIgnore], a
 	ld a, [wIsInBattle]
 	cp $ff
@@ -178,7 +178,7 @@ PokemonTower7FScript8:
 	xor a
 	ld [wSprite01StateData1FacingDirection], a
 	ld [wSprite02StateData1FacingDirection], a
-	ld a, ~(A_BUTTON | B_BUTTON)
+	ld a, PAD_SELECT | PAD_START | PAD_CTRL_PAD
 	ld [wJoyIgnore], a
 	ld a, $1
 	ld [wDoNotWaitForButtonPressAfterDisplayingText], a
@@ -191,14 +191,14 @@ PokemonTower7FScript8:
 	ld c, BANK(Music_MeetJessieJames)
 	ld a, MUSIC_MEET_JESSIE_JAMES
 	call PlayMusic
-	ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN
+	ld a, PAD_BUTTONS | PAD_CTRL_PAD
 	ld [wJoyIgnore], a
 	ld a, SCRIPT_POKEMONTOWER7F_SCRIPT9
 	call PokemonTower7FSetScript
 	ret
 
 PokemonTower7FScript9:
-	ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN
+	ld a, PAD_BUTTONS | PAD_CTRL_PAD
 	ld [wJoyIgnore], a
 	call GBFadeOutToBlack
 	ld a, HS_POKEMON_TOWER_7F_JESSIE
@@ -235,7 +235,7 @@ PokemonTower7FScript_HideObject:
 	ret
 
 PokemonTower7FWarpToMrFujiHouseScript:
-	ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN
+	ld a, PAD_BUTTONS | PAD_CTRL_PAD
 	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..080f1539 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_BUTTONS | PAD_CTRL_PAD
 	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..eb1073d4 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_BUTTONS | PAD_CTRL_PAD
 	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 bfd4a835..15a98853 100644
--- a/scripts/RocketHideoutB4F.asm
+++ b/scripts/RocketHideoutB4F.asm
@@ -45,7 +45,7 @@ RocketHideoutB4FBeatGiovanniScript:
 	ld a, [wIsInBattle]
 	cp $ff
 	jp z, RocketHideoutB4FResetScripts
-	ld a, SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN
+	ld a, PAD_SELECT | PAD_START | PAD_CTRL_PAD
 	ld [wJoyIgnore], a
 	SetEvent EVENT_BEAT_ROCKET_HIDEOUT_GIOVANNI
 	ld a, TEXT_ROCKETHIDEOUTB4F_GIOVANNI_HOPE_WE_MEET_AGAIN
@@ -95,7 +95,7 @@ RocketHideoutB4FScript_455a5:
 .asm_455c2
 	xor a
 	ldh [hJoyHeld], a
-	ld a, SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN
+	ld a, PAD_SELECT | PAD_START | PAD_CTRL_PAD
 	ld [wJoyIgnore], a
 	call StopAllMusic
 	ld c, BANK(Music_MeetJessieJames)
@@ -112,7 +112,7 @@ RocketHideoutB4FScript_455a5:
 	call DisplayTextID
 	xor a
 	ld [wDoNotWaitForButtonPressAfterDisplayingText], a
-	ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN
+	ld a, PAD_BUTTONS | PAD_CTRL_PAD
 	ld [wJoyIgnore], a
 	ld a, HS_ROCKET_HIDEOUT_B4F_JAMES
 	call RocketHideoutB4FScript_ShowObject
@@ -139,14 +139,14 @@ RocketHideoutB4FScript4:
 	ld a, ROCKETHIDEOUTB4F_JAMES
 	ldh [hSpriteIndex], a
 	call MoveSprite
-	ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN
+	ld a, PAD_BUTTONS | PAD_CTRL_PAD
 	ld [wJoyIgnore], a
 	ld a, SCRIPT_ROCKETHIDEOUTB4F_SCRIPT5
 	call RocketHideoutB4FSetScript
 	ret
 
 RocketHideoutB4FScript5:
-	ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN
+	ld a, PAD_BUTTONS | PAD_CTRL_PAD
 	ld [wJoyIgnore], a
 	ld a, [wStatusFlags5]
 	bit BIT_SCRIPTED_NPC_MOVEMENT, a
@@ -162,7 +162,7 @@ RocketHideoutB4FScript6:
 	ld [wSprite02StateData1FacingDirection], a
 .asm_4564a
 	call Delay3
-	ld a, SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN
+	ld a, PAD_SELECT | PAD_START | PAD_CTRL_PAD
 	ld [wJoyIgnore], a
 RocketHideoutB4FScript7:
 	ld de, RocketHideoutB4FJessieJamesMovementData_45606
@@ -173,19 +173,19 @@ RocketHideoutB4FScript7:
 	ld a, ROCKETHIDEOUTB4F_JESSIE
 	ldh [hSpriteIndex], a
 	call MoveSprite
-	ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN
+	ld a, PAD_BUTTONS | PAD_CTRL_PAD
 	ld [wJoyIgnore], a
 	ld a, SCRIPT_ROCKETHIDEOUTB4F_SCRIPT8
 	call RocketHideoutB4FSetScript
 	ret
 
 RocketHideoutB4FScript8:
-	ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN
+	ld a, PAD_BUTTONS | PAD_CTRL_PAD
 	ld [wJoyIgnore], a
 	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_CTRL_PAD
 	ld [wJoyIgnore], a
 RocketHideoutB4FScript9:
 	ld a, $2
@@ -221,7 +221,7 @@ RocketHideoutB4FScript10:
 	ret
 
 RocketHideoutB4FScript11:
-	ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN
+	ld a, PAD_BUTTONS | PAD_CTRL_PAD
 	ld [wJoyIgnore], a
 	ld a, [wIsInBattle]
 	cp $ff
@@ -232,7 +232,7 @@ RocketHideoutB4FScript11:
 	xor a
 	ld [wSprite02StateData1FacingDirection], a
 	ld [wSprite03StateData1FacingDirection], a
-	ld a, SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN
+	ld a, PAD_SELECT | PAD_START | PAD_CTRL_PAD
 	ld [wJoyIgnore], a
 	ld a, $1
 	ld [wDoNotWaitForButtonPressAfterDisplayingText], a
@@ -245,14 +245,14 @@ RocketHideoutB4FScript11:
 	ld c, BANK(Music_MeetJessieJames)
 	ld a, MUSIC_MEET_JESSIE_JAMES
 	call PlayMusic
-	ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN
+	ld a, PAD_BUTTONS | PAD_CTRL_PAD
 	ld [wJoyIgnore], a
 	ld a, SCRIPT_ROCKETHIDEOUTB4F_SCRIPT12
 	call RocketHideoutB4FSetScript
 	ret
 
 RocketHideoutB4FScript12:
-	ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN
+	ld a, PAD_BUTTONS | PAD_CTRL_PAD
 	ld [wJoyIgnore], a
 	call GBFadeOutToBlack
 	ld a, HS_ROCKET_HIDEOUT_B4F_JAMES
diff --git a/scripts/Route16Gate1F.asm b/scripts/Route16Gate1F.asm
index a8bf2f0f..8f02a616 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_CTRL_PAD
 	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..3bf2f8e6 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_CTRL_PAD
 	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 d4149252..77ad1ad0 100644
--- a/scripts/Route22.asm
+++ b/scripts/Route22.asm
@@ -66,7 +66,7 @@ Route22DefaultScript:
 	ld [wSavedCoordIndex], a
 	xor a
 	ldh [hJoyHeld], a
-	ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN
+	ld a, PAD_CTRL_PAD
 	ld [wJoyIgnore], a
 	ld a, PLAYER_DIR_LEFT
 	ld [wPlayerMovingDirection], a
@@ -166,7 +166,7 @@ Route22Rival1AfterBattleScript:
 	ld a, ROUTE22_RIVAL1
 	ldh [hSpriteIndex], a
 	call SetSpriteFacingDirectionAndDelay
-	ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN
+	ld a, PAD_CTRL_PAD
 	ld [wJoyIgnore], a
 	SetEvent EVENT_BEAT_ROUTE22_RIVAL_1ST_BATTLE
 	ld a, TEXT_ROUTE22_RIVAL1
@@ -319,7 +319,7 @@ Route22Rival2AfterBattleScript:
 .set_rival_facing_direction
 	ldh [hSpriteFacingDirection], a
 	call SetSpriteFacingDirectionAndDelay
-	ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN
+	ld a, PAD_CTRL_PAD
 	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 97b4ae6a..b8ff0ed2 100644
--- a/scripts/Route22Gate.asm
+++ b/scripts/Route22Gate.asm
@@ -39,7 +39,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 29c90868..24a5281a 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_CTRL_PAD
 	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 eb8b3957..d1204f74 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 8fb6f18d..2d98c513 100644
--- a/scripts/SSAnne2F.asm
+++ b/scripts/SSAnne2F.asm
@@ -40,7 +40,7 @@ SSAnne2FDefaultScript:
 	call SetSpriteMovementBytesToFF
 	xor a
 	ldh [hJoyHeld], a
-	ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN
+	ld a, PAD_CTRL_PAD
 	ld [wJoyIgnore], a
 	ldh a, [hSavedCoordIndex]
 	cp $2
@@ -109,7 +109,7 @@ SSAnne2FRivalAfterBattleScript:
 	cp $ff
 	jp z, SSAnne2FResetScripts
 	call SSAnne2FSetFacingDirectionScript
-	ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN
+	ld a, PAD_CTRL_PAD
 	ld [wJoyIgnore], a
 	ld a, TEXT_SSANNE2F_RIVAL_CUT_MASTER
 	ldh [hTextID], a
diff --git a/scripts/SafariZoneGate.asm b/scripts/SafariZoneGate.asm
index a0f4d828..0e1a05bf 100644
--- a/scripts/SafariZoneGate.asm
+++ b/scripts/SafariZoneGate.asm
@@ -23,7 +23,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_BUTTONS | PAD_CTRL_PAD
 	ld [wJoyIgnore], a
 	xor a
 	ldh [hJoyHeld], a
@@ -36,10 +36,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_CTRL_PAD
 	ld [wJoyIgnore], a
 	ld a, SCRIPT_SAFARIZONEGATE_PLAYER_MOVING_RIGHT
 	ld [wSafariZoneGateCurScript], a
@@ -61,7 +61,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_BUTTONS | PAD_CTRL_PAD
 	ld [wJoyIgnore], a
 	ret
 
@@ -81,7 +81,7 @@ 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_CTRL_PAD
 	ld [wJoyIgnore], a
 	ld a, TEXT_SAFARIZONEGATE_SAFARI_ZONE_WORKER1_GOOD_HAUL_COME_AGAIN
 	ldh [hTextID], a
@@ -90,7 +90,7 @@ SafariZoneGateLeavingSafariScript:
 	ld [wNumSafariBalls], a
 	ld [wSafariSteps], a
 	ld [wSafariSteps], a ; ?????
-	ld a, D_DOWN
+	ld a, PAD_DOWN
 	ld c, 3
 	call SafariZoneEntranceAutoWalk
 	ld a, SCRIPT_SAFARIZONEGATE_PLAYER_MOVING_DOWN
@@ -164,7 +164,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
@@ -176,7 +176,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/SafariZoneGate_2.asm b/scripts/SafariZoneGate_2.asm
index d760ed83..819c2cc2 100644
--- a/scripts/SafariZoneGate_2.asm
+++ b/scripts/SafariZoneGate_2.asm
@@ -60,7 +60,7 @@ SafariZoneGatePrintSafariZoneWorker1WouldYouLikeToJoinText::
 	ld [wSafariSteps], a
 	ld a, l
 	ld [wSafariSteps + 1], a
-	ld a, D_UP
+	ld a, PAD_UP
 	ld c, 3
 	call SafariZoneEntranceAutoWalk2
 	SetEvent EVENT_IN_SAFARI_ZONE
@@ -73,7 +73,7 @@ SafariZoneGatePrintSafariZoneWorker1WouldYouLikeToJoinText::
 	ld hl, .PleaseComeAgainText
 	call PrintText
 .CantPayWalkDown
-	ld a, D_DOWN
+	ld a, PAD_DOWN
 	ld c, 1
 	call SafariZoneEntranceAutoWalk2
 	ld a, SCRIPT_SAFARIZONEGATE_PLAYER_MOVING_DOWN
diff --git a/scripts/SaffronGym.asm b/scripts/SaffronGym.asm
index 4bfb7b2c..46ebf2c6 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_CTRL_PAD
 	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 5fe805f0..91ba9669 100644
--- a/scripts/SeafoamIslandsB4F.asm
+++ b/scripts/SeafoamIslandsB4F.asm
@@ -46,7 +46,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
@@ -104,15 +104,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 87887432..5b72e3f8 100644
--- a/scripts/SilphCo11F.asm
+++ b/scripts/SilphCo11F.asm
@@ -119,7 +119,7 @@ SilphCo11FScript_621c5:
 	ld [wSavedCoordIndex], a
 	xor a
 	ldh [hJoyHeld], a
-	ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN
+	ld a, PAD_CTRL_PAD
 	ld [wJoyIgnore], a
 	ld a, TEXT_SILPHCO11F_GIOVANNI
 	ldh [hTextID], a
@@ -167,7 +167,7 @@ SilphCo11FGiovanniAfterBattleScript:
 	ld b, SPRITE_FACING_DOWN
 .continue
 	call SilphCo11FScript_621ff
-	ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN
+	ld a, PAD_CTRL_PAD
 	ld [wJoyIgnore], a
 	ld a, TEXT_SILPHCO11F_GIOVANNI_YOU_RUINED_OUR_PLANS
 	ldh [hTextID], a
@@ -240,7 +240,7 @@ SilphCo11FScript_6229c:
 	call PlayMusic
 	xor a
 	ldh [hJoyHeld], a
-	ld a, SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN
+	ld a, PAD_SELECT | PAD_START | PAD_CTRL_PAD
 	ld [wJoyIgnore], a
 	ld a, $1
 	ld [wDoNotWaitForButtonPressAfterDisplayingText], a
@@ -249,7 +249,7 @@ SilphCo11FScript_6229c:
 	call DisplayTextID
 	xor a
 	ld [wDoNotWaitForButtonPressAfterDisplayingText], a
-	ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN
+	ld a, PAD_BUTTONS | PAD_CTRL_PAD
 	ld [wJoyIgnore], a
 	SetEvent EVENT_782
 	ld a, SCRIPT_SILPHCO11F_SCRIPT5
@@ -316,14 +316,14 @@ SilphCo11FScript5:
 	ld a, SILPHCO11F_JAMES
 	ldh [hSpriteIndex], a
 	call MoveSprite
-	ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN
+	ld a, PAD_BUTTONS | PAD_CTRL_PAD
 	ld [wJoyIgnore], a
 	ld a, SCRIPT_SILPHCO11F_SCRIPT6
 	call SilphCo11FSetCurScript
 	ret
 
 SilphCo11FScript6:
-	ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN
+	ld a, PAD_BUTTONS | PAD_CTRL_PAD
 	ld [wJoyIgnore], a
 	ld a, [wStatusFlags5]
 	bit BIT_SCRIPTED_NPC_MOVEMENT, a
@@ -339,7 +339,7 @@ SilphCo11FScript7:
 	ld [hl], SPRITE_FACING_UP
 .asm_6235e
 	call Delay3
-	ld a, SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN
+	ld a, PAD_SELECT | PAD_START | PAD_CTRL_PAD
 	ld [wJoyIgnore], a
 SilphCo11FScript8:
 	ld de, SilphCo11FMovementData_622fb
@@ -354,19 +354,19 @@ SilphCo11FScript8:
 	ld a, SILPHCO11F_JESSIE
 	ldh [hSpriteIndex], a
 	call MoveSprite
-	ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN
+	ld a, PAD_BUTTONS | PAD_CTRL_PAD
 	ld [wJoyIgnore], a
 	ld a, SCRIPT_SILPHCO11F_SCRIPT9
 	call SilphCo11FSetCurScript
 	ret
 
 SilphCo11FScript9:
-	ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN
+	ld a, PAD_BUTTONS | PAD_CTRL_PAD
 	ld [wJoyIgnore], a
 	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_CTRL_PAD
 	ld [wJoyIgnore], a
 SilphCo11FScript10:
 	ld a, $2
@@ -401,7 +401,7 @@ SilphCo11FScript11:
 	ret
 
 SilphCo11FScript12:
-	ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN
+	ld a, PAD_BUTTONS | PAD_CTRL_PAD
 	ld [wJoyIgnore], a
 	ld a, [wIsInBattle]
 	cp $ff
@@ -412,7 +412,7 @@ SilphCo11FScript12:
 	xor a
 	ld [wSprite04StateData1FacingDirection], a
 	ld [wSprite06StateData1FacingDirection], a
-	ld a, SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN
+	ld a, PAD_SELECT | PAD_START | PAD_CTRL_PAD
 	ld [wJoyIgnore], a
 	ld a, $1
 	ld [wDoNotWaitForButtonPressAfterDisplayingText], a
@@ -425,14 +425,14 @@ SilphCo11FScript12:
 	ld c, BANK(Music_MeetJessieJames)
 	ld a, MUSIC_MEET_JESSIE_JAMES
 	call PlayMusic
-	ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN
+	ld a, PAD_BUTTONS | PAD_CTRL_PAD
 	ld [wJoyIgnore], a
 	ld a, SCRIPT_SILPHCO11F_SCRIPT13
 	call SilphCo11FSetCurScript
 	ret
 
 SilphCo11FScript13:
-	ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN
+	ld a, PAD_BUTTONS | PAD_CTRL_PAD
 	ld [wJoyIgnore], a
 	call GBFadeOutToBlack
 	ld a, HS_SILPH_CO_11F_JAMES
diff --git a/scripts/SilphCo7F.asm b/scripts/SilphCo7F.asm
index f1532448..dd67a6a2 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_CTRL_PAD
 	ld [wJoyIgnore], a
 	ld a, PLAYER_DIR_DOWN
 	ld [wPlayerMovingDirection], a
@@ -195,7 +195,7 @@ SilphCo7FRivalAfterBattleScript:
 	ld a, [wIsInBattle]
 	cp $ff
 	jp z, SilphCo7FSetDefaultScript
-	ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN
+	ld a, PAD_CTRL_PAD
 	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 647446fa..1d9d790d 100644
--- a/scripts/VermilionCity.asm
+++ b/scripts/VermilionCity.asm
@@ -74,7 +74,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
@@ -99,9 +99,9 @@ VermilionCityPlayerAllowedToPassScript:
 	ret
 
 VermilionCityPlayerExitShipScript:
-	ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN
+	ld a, PAD_BUTTONS | PAD_CTRL_PAD
 	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 1de518e3..6e8f6822 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..19b2e202 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_CTRL_PAD
 	ld [wJoyIgnore], a
 
 VermilionGymLTSurgeReceiveTM24Script:
diff --git a/scripts/ViridianCity.asm b/scripts/ViridianCity.asm
index 9ffe0950..07646f1a 100644
--- a/scripts/ViridianCity.asm
+++ b/scripts/ViridianCity.asm
@@ -51,7 +51,7 @@ ViridianCityCheckGymOpenScript:
 	call StartSimulatingJoypadStates
 	ld a, $1
 	ld [wSimulatedJoypadStatesIndex], a
-	ld a, D_DOWN
+	ld a, PAD_DOWN
 	ld [wSimulatedJoypadStatesEnd], a
 	xor a
 	ld [wSpritePlayerStateData1FacingDirection], a
@@ -158,7 +158,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
@@ -184,7 +184,7 @@ ViridianCityCheckWaitingOldMan:
 	ld a, TEXT_VIRIDIANCITY_OLD_MAN2
 	ldh [hTextID], a
 	call DisplayTextID
-	ld a, D_UP | D_DOWN | D_LEFT | D_RIGHT | START | SELECT
+	ld a, PAD_SELECT | PAD_START | PAD_CTRL_PAD
 	ld [wJoyIgnore], a
 	ret
 
@@ -192,7 +192,7 @@ ViridianCityOldManInitialCatchTrainingScript:
 	call ViridianCityOldManStartCatchTrainingScript.SetupSprite
 	call ViridianCityOldManStartCatchTrainingScript.SetupBattle
 	SetEvent EVENT_INITIAL_CATCH_TRAINING
-	ld a, D_UP | D_DOWN | D_LEFT | D_RIGHT | START | SELECT
+	ld a, PAD_SELECT | PAD_START | PAD_CTRL_PAD
 	ld [wJoyIgnore], a
 	ld a, SCRIPT_VIRIDIANCITY_OLD_MAN_END_INITIAL_CATCH_TRAINING
 	ld [wViridianCityCurScript], a
@@ -203,7 +203,7 @@ ViridianCityOldManEndInitialCatchTrainingScript:
 	call UpdateSprites
 	call Delay3
 	SetEvent EVENT_COMPLETED_CATCH_TRAINING
-	ld a, D_UP | D_DOWN | D_LEFT | D_RIGHT | START | SELECT
+	ld a, PAD_SELECT | PAD_START | PAD_CTRL_PAD
 	ld [wJoyIgnore], a
 	ld a, TEXT_VIRIDIANCITY_OLD_MAN2
 	ldh [hTextID], a
diff --git a/scripts/ViridianCity_2.asm b/scripts/ViridianCity_2.asm
index e81055b2..cd48e67b 100644
--- a/scripts/ViridianCity_2.asm
+++ b/scripts/ViridianCity_2.asm
@@ -75,7 +75,7 @@ ViridianCityPrintOldManSleepyText::
 	call StartSimulatingJoypadStates
 	ld a, $1
 	ld [wSimulatedJoypadStatesIndex], a
-	ld a, D_DOWN
+	ld a, PAD_DOWN
 	ld [wSimulatedJoypadStatesEnd], a
 	ld a, SCRIPT_VIRIDIANCITY_PLAYER_MOVING_DOWN
 	ld [wViridianCityCurScript], a
diff --git a/scripts/ViridianGym.asm b/scripts/ViridianGym.asm
index 55d849d2..6f195037 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_BUTTONS | PAD_CTRL_PAD
 	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_CTRL_PAD
 	ld [wJoyIgnore], a
 ; fallthrough
 ViridianGymReceiveTM27:
diff --git a/scripts/ViridianMart.asm b/scripts/ViridianMart.asm
index d3b3eceb..f118b475 100644
--- a/scripts/ViridianMart.asm
+++ b/scripts/ViridianMart.asm
@@ -42,8 +42,8 @@ ViridianMartDefaultScript:
 	ret
 
 .PlayerMovement:
-	db D_LEFT, 1
-	db D_UP, 2
+	db PAD_LEFT, 1
+	db PAD_UP, 2
 	db -1 ; end
 
 ViridianMartOaksParcelScript: