From 56c405de09ce267c4cfbc68a15c37b2ff51c635a Mon Sep 17 00:00:00 2001
From: Rangi <35663410+Rangi42@users.noreply.github.com>
Date: Mon, 30 Jun 2025 12:47:22 -0400
Subject: Replace hardware_constants.asm with hardware.inc (#511)

---
 scripts/SafariZoneGate.asm | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'scripts/SafariZoneGate.asm')

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
-- 
cgit v1.3.1-sl0p