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)

---
 engine/movie/trade.asm | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

(limited to 'engine/movie/trade.asm')

diff --git a/engine/movie/trade.asm b/engine/movie/trade.asm
index fd1c6ac1..f2ae9bb7 100644
--- a/engine/movie/trade.asm
+++ b/engine/movie/trade.asm
@@ -347,9 +347,9 @@ Trade_AnimateBallEnteringLinkCable:
 
 Trade_BallInsideLinkCableOAMBlock:
 	db $7e, 0
-	db $7e, OAM_HFLIP
-	db $7e, OAM_VFLIP
-	db $7e, OAM_HFLIP | OAM_VFLIP
+	db $7e, OAM_XFLIP
+	db $7e, OAM_YFLIP
+	db $7e, OAM_XFLIP | OAM_YFLIP
 
 Trade_ShowEnemyMon:
 	ld a, TRADE_BALL_TILT_ANIM
@@ -712,28 +712,28 @@ Trade_CircleOAMBlocks:
 	trade_circle_oam_block .OAMBlock3, 24, 24
 
 .OAMBlock0:
-	db ICON_TRADEBUBBLE << 2 + 0, OAM_OBP1
-	db ICON_TRADEBUBBLE << 2 + 1, OAM_OBP1
-	db ICON_TRADEBUBBLE << 2 + 2, OAM_OBP1
-	db ICON_TRADEBUBBLE << 2 + 3, OAM_OBP1
+	db ICON_TRADEBUBBLE << 2 + 0, OAM_PAL1
+	db ICON_TRADEBUBBLE << 2 + 1, OAM_PAL1
+	db ICON_TRADEBUBBLE << 2 + 2, OAM_PAL1
+	db ICON_TRADEBUBBLE << 2 + 3, OAM_PAL1
 
 .OAMBlock1:
-	db ICON_TRADEBUBBLE << 2 + 1, OAM_OBP1 | OAM_HFLIP
-	db ICON_TRADEBUBBLE << 2 + 0, OAM_OBP1 | OAM_HFLIP
-	db ICON_TRADEBUBBLE << 2 + 3, OAM_OBP1 | OAM_HFLIP
-	db ICON_TRADEBUBBLE << 2 + 2, OAM_OBP1 | OAM_HFLIP
+	db ICON_TRADEBUBBLE << 2 + 1, OAM_PAL1 | OAM_XFLIP
+	db ICON_TRADEBUBBLE << 2 + 0, OAM_PAL1 | OAM_XFLIP
+	db ICON_TRADEBUBBLE << 2 + 3, OAM_PAL1 | OAM_XFLIP
+	db ICON_TRADEBUBBLE << 2 + 2, OAM_PAL1 | OAM_XFLIP
 
 .OAMBlock2:
-	db ICON_TRADEBUBBLE << 2 + 2, OAM_OBP1 | OAM_VFLIP
-	db ICON_TRADEBUBBLE << 2 + 3, OAM_OBP1 | OAM_VFLIP
-	db ICON_TRADEBUBBLE << 2 + 0, OAM_OBP1 | OAM_VFLIP
-	db ICON_TRADEBUBBLE << 2 + 1, OAM_OBP1 | OAM_VFLIP
+	db ICON_TRADEBUBBLE << 2 + 2, OAM_PAL1 | OAM_YFLIP
+	db ICON_TRADEBUBBLE << 2 + 3, OAM_PAL1 | OAM_YFLIP
+	db ICON_TRADEBUBBLE << 2 + 0, OAM_PAL1 | OAM_YFLIP
+	db ICON_TRADEBUBBLE << 2 + 1, OAM_PAL1 | OAM_YFLIP
 
 .OAMBlock3:
-	db ICON_TRADEBUBBLE << 2 + 3, OAM_OBP1 | OAM_HFLIP | OAM_VFLIP
-	db ICON_TRADEBUBBLE << 2 + 2, OAM_OBP1 | OAM_HFLIP | OAM_VFLIP
-	db ICON_TRADEBUBBLE << 2 + 1, OAM_OBP1 | OAM_HFLIP | OAM_VFLIP
-	db ICON_TRADEBUBBLE << 2 + 0, OAM_OBP1 | OAM_HFLIP | OAM_VFLIP
+	db ICON_TRADEBUBBLE << 2 + 3, OAM_PAL1 | OAM_XFLIP | OAM_YFLIP
+	db ICON_TRADEBUBBLE << 2 + 2, OAM_PAL1 | OAM_XFLIP | OAM_YFLIP
+	db ICON_TRADEBUBBLE << 2 + 1, OAM_PAL1 | OAM_XFLIP | OAM_YFLIP
+	db ICON_TRADEBUBBLE << 2 + 0, OAM_PAL1 | OAM_XFLIP | OAM_YFLIP
 
 ; a = species
 Trade_LoadMonSprite:
-- 
cgit v1.3.1-sl0p