aboutsummaryrefslogtreecommitdiffstats
path: root/constants/oam_constants.asm
diff options
context:
space:
mode:
authorU-Daniel-PC\Daniel <corrnondacqb@yahoo.com>2015-06-04 23:17:30 -0500
committerU-Daniel-PC\Daniel <corrnondacqb@yahoo.com>2015-06-04 23:17:30 -0500
commitb0b1f88b9466f0414e4a6c782b5348f46768c8c4 (patch)
tree3ed8d12b5328b4f655d96351b3959f262fb2d72a /constants/oam_constants.asm
parentEOL Windows->UNIX (diff)
parentMerge pull request #96 from dannye/master (diff)
downloadpokeyellow-b0b1f88b9466f0414e4a6c782b5348f46768c8c4.tar.gz
pokeyellow-b0b1f88b9466f0414e4a6c782b5348f46768c8c4.tar.xz
pokeyellow-b0b1f88b9466f0414e4a6c782b5348f46768c8c4.zip
Merge branch 'master' of https://github.com/iimarckus/pokered
Conflicts: wram.asm
Diffstat (limited to 'constants/oam_constants.asm')
-rwxr-xr-xconstants/oam_constants.asm18
1 files changed, 9 insertions, 9 deletions
diff --git a/constants/oam_constants.asm b/constants/oam_constants.asm
index a707e16d..ddf95648 100755
--- a/constants/oam_constants.asm
+++ b/constants/oam_constants.asm
@@ -1,9 +1,9 @@
-; 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_HFLIP EQU %00100000 ; horizontal flip
-OAM_VFLIP EQU %01000000 ; vertical flip \ No newline at end of file
+; 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_HFLIP EQU %00100000 ; horizontal flip
+OAM_VFLIP EQU %01000000 ; vertical flip