summaryrefslogtreecommitdiff
path: root/constants/oam_constants.asm
diff options
context:
space:
mode:
authordannye <33dannye@gmail.com>2020-11-04 00:06:44 -0600
committerdannye <33dannye@gmail.com>2020-11-04 00:06:44 -0600
commit5647ca687b92954dcf37a6ea6bfbc9a341c32de4 (patch)
treedde1937a1bfdb3a835f4155e1c2eb8f1aaf86f63 /constants/oam_constants.asm
parent53fcd05aa24693093d8af1dc8ec4fedd3957decc (diff)
Sync with pokered
Diffstat (limited to 'constants/oam_constants.asm')
-rwxr-xr-xconstants/oam_constants.asm7
1 files changed, 3 insertions, 4 deletions
diff --git a/constants/oam_constants.asm b/constants/oam_constants.asm
index 9eb52385..7a80bdd2 100755
--- a/constants/oam_constants.asm
+++ b/constants/oam_constants.asm
@@ -1,8 +1,6 @@
; OAM flags used by this game
OAMFLAG_ENDOFDATA EQU %00000001 ; pseudo OAM flag, only used by game logic
OAMFLAG_CANBEMASKED EQU %00000010 ; pseudo OAM flag, only used by game logic
-OAMFLAG_VFLIPPED EQU %00100000 ; OAM flag flips the sprite vertically.
-; Used for making left facing sprites face right and to alternate between left and right foot animation when walking up or down
; OAM attribute flags
OAM_PALETTE EQU %111
@@ -13,8 +11,9 @@ OAM_Y_FLIP EQU 6
OAM_PRIORITY EQU 7 ; 0: OBJ above BG, 1: OBJ behind BG (colors 1-3)
; OAM attribute masks
-OAM_HFLIP EQU 1 << OAM_X_FLIP ; horizontal flip
-OAM_VFLIP EQU 1 << OAM_Y_FLIP ; vertical flip
+OAM_OBP1 EQU 1 << OAM_OBP_NUM ; OBJ palette 1
+OAM_HFLIP EQU 1 << OAM_X_FLIP ; horizontal flip
+OAM_VFLIP EQU 1 << OAM_Y_FLIP ; vertical flip
OAM_BEHIND_BG EQU 1 << OAM_PRIORITY ; behind bg (except color 0)
frame: MACRO