aboutsummaryrefslogtreecommitdiffstats
path: root/constants/oam_constants.asm
diff options
context:
space:
mode:
authorvulcandth <vulcandth@gmail.com>2022-06-06 16:25:31 -0500
committerGitHub <noreply@github.com>2022-06-06 17:25:31 -0400
commit6b5be9129cabe72b9f775b02db1bf7e7169153da (patch)
treed92012450c70f90bf8086bed32ec3dc87b68b332 /constants/oam_constants.asm
parentImproved Virtual Console patch identifiers (#357) (diff)
downloadpokeyellow-6b5be9129cabe72b9f775b02db1bf7e7169153da.tar.gz
pokeyellow-6b5be9129cabe72b9f775b02db1bf7e7169153da.tar.xz
pokeyellow-6b5be9129cabe72b9f775b02db1bf7e7169153da.zip
RGBDS syntax updates (#358)
New MACRO and DEF syntax
Diffstat (limited to 'constants/oam_constants.asm')
-rw-r--r--constants/oam_constants.asm24
1 files changed, 12 insertions, 12 deletions
diff --git a/constants/oam_constants.asm b/constants/oam_constants.asm
index be63dc24..8c5e6be8 100644
--- a/constants/oam_constants.asm
+++ b/constants/oam_constants.asm
@@ -1,17 +1,17 @@
; 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
+DEF OAMFLAG_ENDOFDATA EQU %00000001 ; pseudo OAM flag, only used by game logic
+DEF OAMFLAG_CANBEMASKED EQU %00000010 ; pseudo OAM flag, only used by game logic
; OAM attribute flags
-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)
+DEF OAM_PALETTE EQU %111
+DEF OAM_TILE_BANK EQU 3
+DEF OAM_OBP_NUM EQU 4 ; Non CGB Mode Only
+DEF OAM_X_FLIP EQU 5
+DEF OAM_Y_FLIP EQU 6
+DEF OAM_PRIORITY EQU 7 ; 0: OBJ above BG, 1: OBJ behind BG (colors 1-3)
; OAM attribute masks
-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)
+DEF OAM_OBP1 EQU 1 << OAM_OBP_NUM ; OBJ palette 1
+DEF OAM_HFLIP EQU 1 << OAM_X_FLIP ; horizontal flip
+DEF OAM_VFLIP EQU 1 << OAM_Y_FLIP ; vertical flip
+DEF OAM_BEHIND_BG EQU 1 << OAM_PRIORITY ; behind bg (except color 0)