From 10f9559eab8c93b94abb8ae8d1083704ad4e169a Mon Sep 17 00:00:00 2001
From: dannye <33dannye@gmail.com>
Date: Wed, 20 May 2020 19:40:33 -0500
Subject: Sync with pokered

---
 constants/oam_constants.asm | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'constants/oam_constants.asm')

diff --git a/constants/oam_constants.asm b/constants/oam_constants.asm
index 8e855fc9..9eb52385 100755
--- a/constants/oam_constants.asm
+++ b/constants/oam_constants.asm
@@ -5,8 +5,17 @@ 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_HFLIP EQU %00100000 ; horizontal flip
-OAM_VFLIP EQU %01000000 ; vertical flip
+OAM_PALETTE   EQU %111
+OAM_TILE_BANK EQU 3
+OAM_OBP_NUM   EQU 4 ; Non CGB Mode Only
+OAM_X_FLIP    EQU 5
+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_BEHIND_BG EQU 1 << OAM_PRIORITY ; behind bg (except color 0)
 
 frame: MACRO
 	db \1
-- 
cgit v1.3.1-sl0p