summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAkihiro Otomo <37920078+Akatsuki-py@users.noreply.github.com>2020-08-02 13:31:10 +0900
committerGitHub <noreply@github.com>2020-08-02 00:31:10 -0400
commitb48bbbb047afc05a1215c2b119957e7b6bb91447 (patch)
treebc2e6eb2103e349cc29b32e3e7cdc4f5384fec5e
parent2b54583c8be4aa28f4c6a70c65baeb2e3c84fdfc (diff)
fix OAMFLAG_VFLIPPED (#283)
Replace incorrect label OAMFLAG_VFLIPPED with OAM_HFLIP
-rwxr-xr-xconstants/oam_constants.asm2
-rw-r--r--data/sprites/facings.asm8
2 files changed, 4 insertions, 6 deletions
diff --git a/constants/oam_constants.asm b/constants/oam_constants.asm
index f0f06025..be63dc24 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
diff --git a/data/sprites/facings.asm b/data/sprites/facings.asm
index d76ddbcc..eb583d53 100644
--- a/data/sprites/facings.asm
+++ b/data/sprites/facings.asm
@@ -53,7 +53,7 @@ SpriteFacingAndAnimationTable:
.FlippedOAM:
; y, x, attributes
- db 0, 8, OAMFLAG_VFLIPPED ; top left
- db 0, 0, OAMFLAG_VFLIPPED ; top right
- db 8, 8, OAMFLAG_VFLIPPED | OAMFLAG_CANBEMASKED ; bottom left
- db 8, 0, OAMFLAG_VFLIPPED | OAMFLAG_CANBEMASKED | OAMFLAG_ENDOFDATA ; bottom right
+ db 0, 8, OAM_HFLIP ; top left
+ db 0, 0, OAM_HFLIP ; top right
+ db 8, 8, OAM_HFLIP | OAMFLAG_CANBEMASKED ; bottom left
+ db 8, 0, OAM_HFLIP | OAMFLAG_CANBEMASKED | OAMFLAG_ENDOFDATA ; bottom right