diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2025-06-30 12:47:22 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-06-30 12:47:22 -0400 |
| commit | 56c405de09ce267c4cfbc68a15c37b2ff51c635a (patch) | |
| tree | 47d25c237e9af824f7a57295a2d2e298b194a8e6 /engine/movie/trade.asm | |
| parent | Distinguish single trainer pics section from Pokemon pics (diff) | |
| download | pokeyellow-56c405de09ce267c4cfbc68a15c37b2ff51c635a.tar.gz pokeyellow-56c405de09ce267c4cfbc68a15c37b2ff51c635a.tar.xz pokeyellow-56c405de09ce267c4cfbc68a15c37b2ff51c635a.zip | |
Replace hardware_constants.asm with hardware.inc (#511)
Diffstat (limited to 'engine/movie/trade.asm')
| -rw-r--r-- | engine/movie/trade.asm | 38 |
1 files changed, 19 insertions, 19 deletions
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: |