summaryrefslogtreecommitdiff
path: root/constants/oam_constants.asm
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2020-07-17 15:58:06 -0400
committerRangi <remy.oukaour+rangi42@gmail.com>2020-07-17 15:58:06 -0400
commit76289dfda0b7405944e10a78b7381c723475bea4 (patch)
treeb3041f6324c7a5b6065a84d94af66ddb098dee2c /constants/oam_constants.asm
parentf53341efa170a322392e5d9cf094128a52041b1d (diff)
Port dbsprite macro for OAM y,x,tile,attr data from pokecrystal
Diffstat (limited to 'constants/oam_constants.asm')
-rwxr-xr-xconstants/oam_constants.asm5
1 files changed, 3 insertions, 2 deletions
diff --git a/constants/oam_constants.asm b/constants/oam_constants.asm
index 2d34048d..f0f06025 100755
--- a/constants/oam_constants.asm
+++ b/constants/oam_constants.asm
@@ -13,6 +13,7 @@ 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)