diff options
Diffstat (limited to 'data')
| -rw-r--r-- | data/battle_anims/frame_blocks.asm | 676 | ||||
| -rw-r--r-- | data/sprite_anims/surfing_pikachu_frames.asm | 28 | ||||
| -rw-r--r-- | data/sprites/facings.asm | 38 | ||||
| -rw-r--r-- | data/tilesets/ledge_tiles.asm | 16 |
4 files changed, 379 insertions, 379 deletions
diff --git a/data/battle_anims/frame_blocks.asm b/data/battle_anims/frame_blocks.asm index 0e0de32f..daedfc06 100644 --- a/data/battle_anims/frame_blocks.asm +++ b/data/battle_anims/frame_blocks.asm @@ -128,39 +128,39 @@ FrameBlock01: db 9 ; # dbsprite 0, 0, 0, 0, $2c, 0 dbsprite 1, 0, 0, 0, $2d, 0 - dbsprite 2, 0, 0, 0, $2c, OAM_HFLIP + dbsprite 2, 0, 0, 0, $2c, OAM_XFLIP dbsprite 0, 1, 0, 0, $3c, 0 dbsprite 1, 1, 0, 0, $3d, 0 - dbsprite 2, 1, 0, 0, $3c, OAM_HFLIP - dbsprite 0, 2, 0, 0, $2c, OAM_VFLIP - dbsprite 1, 2, 0, 0, $2d, OAM_VFLIP - dbsprite 2, 2, 0, 0, $2c, OAM_HFLIP | OAM_VFLIP + dbsprite 2, 1, 0, 0, $3c, OAM_XFLIP + dbsprite 0, 2, 0, 0, $2c, OAM_YFLIP + dbsprite 1, 2, 0, 0, $2d, OAM_YFLIP + dbsprite 2, 2, 0, 0, $2c, OAM_XFLIP | OAM_YFLIP FrameBlock02: db 16 ; # dbsprite 0, 0, 0, 0, $20, 0 dbsprite 1, 0, 0, 0, $21, 0 - dbsprite 2, 0, 0, 0, $21, OAM_HFLIP - dbsprite 3, 0, 0, 0, $20, OAM_HFLIP + dbsprite 2, 0, 0, 0, $21, OAM_XFLIP + dbsprite 3, 0, 0, 0, $20, OAM_XFLIP dbsprite 0, 1, 0, 0, $30, 0 dbsprite 1, 1, 0, 0, $31, 0 - dbsprite 2, 1, 0, 0, $31, OAM_HFLIP - dbsprite 3, 1, 0, 0, $30, OAM_HFLIP - dbsprite 0, 2, 0, 0, $30, OAM_VFLIP - dbsprite 1, 2, 0, 0, $31, OAM_VFLIP - dbsprite 2, 2, 0, 0, $31, OAM_HFLIP | OAM_VFLIP - dbsprite 3, 2, 0, 0, $30, OAM_HFLIP | OAM_VFLIP - dbsprite 0, 3, 0, 0, $20, OAM_VFLIP - dbsprite 1, 3, 0, 0, $21, OAM_VFLIP - dbsprite 2, 3, 0, 0, $21, OAM_HFLIP | OAM_VFLIP - dbsprite 3, 3, 0, 0, $20, OAM_HFLIP | OAM_VFLIP + dbsprite 2, 1, 0, 0, $31, OAM_XFLIP + dbsprite 3, 1, 0, 0, $30, OAM_XFLIP + dbsprite 0, 2, 0, 0, $30, OAM_YFLIP + dbsprite 1, 2, 0, 0, $31, OAM_YFLIP + dbsprite 2, 2, 0, 0, $31, OAM_XFLIP | OAM_YFLIP + dbsprite 3, 2, 0, 0, $30, OAM_XFLIP | OAM_YFLIP + dbsprite 0, 3, 0, 0, $20, OAM_YFLIP + dbsprite 1, 3, 0, 0, $21, OAM_YFLIP + dbsprite 2, 3, 0, 0, $21, OAM_XFLIP | OAM_YFLIP + dbsprite 3, 3, 0, 0, $20, OAM_XFLIP | OAM_YFLIP FrameBlock03: db 4 ; # dbsprite 0, 0, 0, 0, $02, 0 - dbsprite 1, 0, 0, 0, $02, OAM_HFLIP + dbsprite 1, 0, 0, 0, $02, OAM_XFLIP dbsprite 0, 1, 0, 0, $12, 0 - dbsprite 1, 1, 0, 0, $12, OAM_HFLIP + dbsprite 1, 1, 0, 0, $12, OAM_XFLIP FrameBlock04: db 4 ; # @@ -171,25 +171,25 @@ FrameBlock04: FrameBlock05: db 4 ; # - dbsprite 0, 0, 0, 0, $07, OAM_HFLIP - dbsprite 1, 0, 0, 0, $06, OAM_HFLIP - dbsprite 0, 1, 0, 0, $17, OAM_HFLIP - dbsprite 1, 1, 0, 0, $16, OAM_HFLIP + dbsprite 0, 0, 0, 0, $07, OAM_XFLIP + dbsprite 1, 0, 0, 0, $06, OAM_XFLIP + dbsprite 0, 1, 0, 0, $17, OAM_XFLIP + dbsprite 1, 1, 0, 0, $16, OAM_XFLIP FrameBlock06: db 12 ; # dbsprite 1, 0, 0, 0, $23, 0 dbsprite 0, 1, 0, 0, $32, 0 dbsprite 1, 1, 0, 0, $33, 0 - dbsprite 2, 0, 0, 0, $23, OAM_HFLIP - dbsprite 2, 1, 0, 0, $33, OAM_HFLIP - dbsprite 3, 1, 0, 0, $32, OAM_HFLIP - dbsprite 0, 2, 0, 0, $32, OAM_VFLIP - dbsprite 1, 2, 0, 0, $33, OAM_VFLIP - dbsprite 1, 3, 0, 0, $23, OAM_VFLIP - dbsprite 2, 2, 0, 0, $33, OAM_HFLIP | OAM_VFLIP - dbsprite 3, 2, 0, 0, $32, OAM_HFLIP | OAM_VFLIP - dbsprite 2, 3, 0, 0, $23, OAM_HFLIP | OAM_VFLIP + dbsprite 2, 0, 0, 0, $23, OAM_XFLIP + dbsprite 2, 1, 0, 0, $33, OAM_XFLIP + dbsprite 3, 1, 0, 0, $32, OAM_XFLIP + dbsprite 0, 2, 0, 0, $32, OAM_YFLIP + dbsprite 1, 2, 0, 0, $33, OAM_YFLIP + dbsprite 1, 3, 0, 0, $23, OAM_YFLIP + dbsprite 2, 2, 0, 0, $33, OAM_XFLIP | OAM_YFLIP + dbsprite 3, 2, 0, 0, $32, OAM_XFLIP | OAM_YFLIP + dbsprite 2, 3, 0, 0, $23, OAM_XFLIP | OAM_YFLIP FrameBlock07: db 16 ; # @@ -197,18 +197,18 @@ FrameBlock07: dbsprite 1, 0, 0, 0, $21, 0 dbsprite 0, 1, 0, 0, $30, 0 dbsprite 1, 1, 0, 0, $31, 0 - dbsprite 2, 0, 0, 0, $21, OAM_HFLIP - dbsprite 3, 0, 0, 0, $20, OAM_HFLIP - dbsprite 2, 1, 0, 0, $31, OAM_HFLIP - dbsprite 3, 1, 0, 0, $30, OAM_HFLIP - dbsprite 0, 2, 0, 0, $30, OAM_VFLIP - dbsprite 1, 2, 0, 0, $31, OAM_VFLIP - dbsprite 0, 3, 0, 0, $20, OAM_VFLIP - dbsprite 1, 3, 0, 0, $21, OAM_VFLIP - dbsprite 2, 2, 0, 0, $31, OAM_HFLIP | OAM_VFLIP - dbsprite 3, 2, 0, 0, $30, OAM_HFLIP | OAM_VFLIP - dbsprite 2, 3, 0, 0, $21, OAM_HFLIP | OAM_VFLIP - dbsprite 3, 3, 0, 0, $20, OAM_HFLIP | OAM_VFLIP + dbsprite 2, 0, 0, 0, $21, OAM_XFLIP + dbsprite 3, 0, 0, 0, $20, OAM_XFLIP + dbsprite 2, 1, 0, 0, $31, OAM_XFLIP + dbsprite 3, 1, 0, 0, $30, OAM_XFLIP + dbsprite 0, 2, 0, 0, $30, OAM_YFLIP + dbsprite 1, 2, 0, 0, $31, OAM_YFLIP + dbsprite 0, 3, 0, 0, $20, OAM_YFLIP + dbsprite 1, 3, 0, 0, $21, OAM_YFLIP + dbsprite 2, 2, 0, 0, $31, OAM_XFLIP | OAM_YFLIP + dbsprite 3, 2, 0, 0, $30, OAM_XFLIP | OAM_YFLIP + dbsprite 2, 3, 0, 0, $21, OAM_XFLIP | OAM_YFLIP + dbsprite 3, 3, 0, 0, $20, OAM_XFLIP | OAM_YFLIP FrameBlock08: db 16 ; # @@ -216,62 +216,62 @@ FrameBlock08: dbsprite 1, 0, 0, 0, $21, 0 dbsprite 0, 1, 0, 0, $30, 0 dbsprite 1, 1, 0, 0, $31, 0 - dbsprite 3, 0, 0, 0, $21, OAM_HFLIP - dbsprite 4, 0, 0, 0, $20, OAM_HFLIP - dbsprite 3, 1, 0, 0, $31, OAM_HFLIP - dbsprite 4, 1, 0, 0, $30, OAM_HFLIP - dbsprite 0, 3, 0, 0, $30, OAM_VFLIP - dbsprite 1, 3, 0, 0, $31, OAM_VFLIP - dbsprite 0, 4, 0, 0, $20, OAM_VFLIP - dbsprite 1, 4, 0, 0, $21, OAM_VFLIP - dbsprite 3, 3, 0, 0, $31, OAM_HFLIP | OAM_VFLIP - dbsprite 4, 3, 0, 0, $30, OAM_HFLIP | OAM_VFLIP - dbsprite 3, 4, 0, 0, $21, OAM_HFLIP | OAM_VFLIP - dbsprite 4, 4, 0, 0, $20, OAM_HFLIP | OAM_VFLIP + dbsprite 3, 0, 0, 0, $21, OAM_XFLIP + dbsprite 4, 0, 0, 0, $20, OAM_XFLIP + dbsprite 3, 1, 0, 0, $31, OAM_XFLIP + dbsprite 4, 1, 0, 0, $30, OAM_XFLIP + dbsprite 0, 3, 0, 0, $30, OAM_YFLIP + dbsprite 1, 3, 0, 0, $31, OAM_YFLIP + dbsprite 0, 4, 0, 0, $20, OAM_YFLIP + dbsprite 1, 4, 0, 0, $21, OAM_YFLIP + dbsprite 3, 3, 0, 0, $31, OAM_XFLIP | OAM_YFLIP + dbsprite 4, 3, 0, 0, $30, OAM_XFLIP | OAM_YFLIP + dbsprite 3, 4, 0, 0, $21, OAM_XFLIP | OAM_YFLIP + dbsprite 4, 4, 0, 0, $20, OAM_XFLIP | OAM_YFLIP FrameBlock09: db 12 ; # dbsprite 0, 0, 0, 0, $24, 0 dbsprite 1, 0, 0, 0, $25, 0 dbsprite 0, 1, 0, 0, $34, 0 - dbsprite 3, 0, 0, 0, $25, OAM_HFLIP - dbsprite 4, 0, 0, 0, $24, OAM_HFLIP - dbsprite 4, 1, 0, 0, $34, OAM_HFLIP - dbsprite 0, 3, 0, 0, $34, OAM_VFLIP - dbsprite 0, 4, 0, 0, $24, OAM_VFLIP - dbsprite 1, 4, 0, 0, $25, OAM_VFLIP - dbsprite 4, 3, 0, 0, $34, OAM_HFLIP | OAM_VFLIP - dbsprite 3, 4, 0, 0, $25, OAM_HFLIP | OAM_VFLIP - dbsprite 4, 4, 0, 0, $24, OAM_HFLIP | OAM_VFLIP + dbsprite 3, 0, 0, 0, $25, OAM_XFLIP + dbsprite 4, 0, 0, 0, $24, OAM_XFLIP + dbsprite 4, 1, 0, 0, $34, OAM_XFLIP + dbsprite 0, 3, 0, 0, $34, OAM_YFLIP + dbsprite 0, 4, 0, 0, $24, OAM_YFLIP + dbsprite 1, 4, 0, 0, $25, OAM_YFLIP + dbsprite 4, 3, 0, 0, $34, OAM_XFLIP | OAM_YFLIP + dbsprite 3, 4, 0, 0, $25, OAM_XFLIP | OAM_YFLIP + dbsprite 4, 4, 0, 0, $24, OAM_XFLIP | OAM_YFLIP FrameBlock0a: db 12 ; # dbsprite 0, 0, 0, 0, $24, 0 dbsprite 1, 0, 0, 0, $25, 0 dbsprite 0, 1, 0, 0, $34, 0 - dbsprite 4, 0, 0, 0, $25, OAM_HFLIP - dbsprite 5, 0, 0, 0, $24, OAM_HFLIP - dbsprite 5, 1, 0, 0, $34, OAM_HFLIP - dbsprite 0, 4, 0, 0, $34, OAM_VFLIP - dbsprite 0, 5, 0, 0, $24, OAM_VFLIP - dbsprite 1, 5, 0, 0, $25, OAM_VFLIP - dbsprite 5, 4, 0, 0, $34, OAM_HFLIP | OAM_VFLIP - dbsprite 4, 5, 0, 0, $25, OAM_HFLIP | OAM_VFLIP - dbsprite 5, 5, 0, 0, $24, OAM_HFLIP | OAM_VFLIP + dbsprite 4, 0, 0, 0, $25, OAM_XFLIP + dbsprite 5, 0, 0, 0, $24, OAM_XFLIP + dbsprite 5, 1, 0, 0, $34, OAM_XFLIP + dbsprite 0, 4, 0, 0, $34, OAM_YFLIP + dbsprite 0, 5, 0, 0, $24, OAM_YFLIP + dbsprite 1, 5, 0, 0, $25, OAM_YFLIP + dbsprite 5, 4, 0, 0, $34, OAM_XFLIP | OAM_YFLIP + dbsprite 4, 5, 0, 0, $25, OAM_XFLIP | OAM_YFLIP + dbsprite 5, 5, 0, 0, $24, OAM_XFLIP | OAM_YFLIP FrameBlock0b: db 4 ; # dbsprite 0, 0, 0, 0, $05, 0 - dbsprite 1, 0, 0, 0, $05, OAM_HFLIP + dbsprite 1, 0, 0, 0, $05, OAM_XFLIP dbsprite 0, 1, 0, 0, $15, 0 - dbsprite 1, 1, 0, 0, $15, OAM_HFLIP + dbsprite 1, 1, 0, 0, $15, OAM_XFLIP FrameBlock0c: db 4 ; # dbsprite 0, 0, 0, 0, $04, 0 - dbsprite 1, 0, 0, 0, $04, OAM_HFLIP + dbsprite 1, 0, 0, 0, $04, OAM_XFLIP dbsprite 0, 1, 0, 0, $14, 0 - dbsprite 1, 1, 0, 0, $14, OAM_HFLIP + dbsprite 1, 1, 0, 0, $14, OAM_XFLIP FrameBlock0d: db 8 ; # @@ -279,10 +279,10 @@ FrameBlock0d: dbsprite 1, 0, 0, 0, $0d, 0 dbsprite 0, 1, 0, 0, $1c, 0 dbsprite 1, 1, 0, 0, $1d, 0 - dbsprite 0, 2, 0, 0, $1d, OAM_HFLIP | OAM_VFLIP - dbsprite 1, 2, 0, 0, $1c, OAM_HFLIP | OAM_VFLIP - dbsprite 0, 3, 0, 0, $0d, OAM_HFLIP | OAM_VFLIP - dbsprite 1, 3, 0, 0, $0c, OAM_HFLIP | OAM_VFLIP + dbsprite 0, 2, 0, 0, $1d, OAM_XFLIP | OAM_YFLIP + dbsprite 1, 2, 0, 0, $1c, OAM_XFLIP | OAM_YFLIP + dbsprite 0, 3, 0, 0, $0d, OAM_XFLIP | OAM_YFLIP + dbsprite 1, 3, 0, 0, $0c, OAM_XFLIP | OAM_YFLIP FrameBlock0e: db 4 ; # @@ -293,10 +293,10 @@ FrameBlock0e: FrameBlock0f: db 4 ; # - dbsprite 0, 6, 0, 0, $1d, OAM_HFLIP | OAM_VFLIP - dbsprite 1, 6, 0, 0, $1c, OAM_HFLIP | OAM_VFLIP - dbsprite 0, 7, 0, 0, $0d, OAM_HFLIP | OAM_VFLIP - dbsprite 1, 7, 0, 0, $0c, OAM_HFLIP | OAM_VFLIP + dbsprite 0, 6, 0, 0, $1d, OAM_XFLIP | OAM_YFLIP + dbsprite 1, 6, 0, 0, $1c, OAM_XFLIP | OAM_YFLIP + dbsprite 0, 7, 0, 0, $0d, OAM_XFLIP | OAM_YFLIP + dbsprite 1, 7, 0, 0, $0c, OAM_XFLIP | OAM_YFLIP FrameBlock10: db 8 ; # @@ -304,10 +304,10 @@ FrameBlock10: dbsprite 1, 0, 0, 0, $0f, 0 dbsprite 0, 1, 0, 0, $1e, 0 dbsprite 1, 1, 0, 0, $1f, 0 - dbsprite 2, 0, 0, 0, $0f, OAM_HFLIP - dbsprite 3, 0, 0, 0, $0e, OAM_HFLIP - dbsprite 2, 1, 0, 0, $1f, OAM_HFLIP - dbsprite 3, 1, 0, 0, $1e, OAM_HFLIP + dbsprite 2, 0, 0, 0, $0f, OAM_XFLIP + dbsprite 3, 0, 0, 0, $0e, OAM_XFLIP + dbsprite 2, 1, 0, 0, $1f, OAM_XFLIP + dbsprite 3, 1, 0, 0, $1e, OAM_XFLIP FrameBlock11: db 8 ; # @@ -315,10 +315,10 @@ FrameBlock11: dbsprite 1, 0, 0, 0, $0f, 0 dbsprite 0, 1, 0, 0, $1e, 0 dbsprite 1, 1, 0, 0, $1f, 0 - dbsprite 4, 0, 0, 0, $0f, OAM_HFLIP - dbsprite 5, 0, 0, 0, $0e, OAM_HFLIP - dbsprite 4, 1, 0, 0, $1f, OAM_HFLIP - dbsprite 5, 1, 0, 0, $1e, OAM_HFLIP + dbsprite 4, 0, 0, 0, $0f, OAM_XFLIP + dbsprite 5, 0, 0, 0, $0e, OAM_XFLIP + dbsprite 4, 1, 0, 0, $1f, OAM_XFLIP + dbsprite 5, 1, 0, 0, $1e, OAM_XFLIP FrameBlock12: db 3 ; # @@ -329,46 +329,46 @@ FrameBlock12: FrameBlock13: db 4 ; # dbsprite 0, 0, 0, 0, $36, 0 - dbsprite 1, 0, 0, 0, $36, OAM_HFLIP - dbsprite 0, 1, 0, 0, $36, OAM_VFLIP - dbsprite 1, 1, 0, 0, $36, OAM_HFLIP | OAM_VFLIP + dbsprite 1, 0, 0, 0, $36, OAM_XFLIP + dbsprite 0, 1, 0, 0, $36, OAM_YFLIP + dbsprite 1, 1, 0, 0, $36, OAM_XFLIP | OAM_YFLIP FrameBlock14: db 8 ; # dbsprite 2, 0, 0, 0, $28, 0 - dbsprite 3, 0, 0, 0, $28, OAM_HFLIP + dbsprite 3, 0, 0, 0, $28, OAM_XFLIP dbsprite 2, 1, 0, 0, $38, 0 - dbsprite 3, 1, 0, 0, $38, OAM_HFLIP + dbsprite 3, 1, 0, 0, $38, OAM_XFLIP dbsprite 4, 0, 0, 0, $36, 0 - dbsprite 5, 0, 0, 0, $36, OAM_HFLIP - dbsprite 4, 1, 0, 0, $36, OAM_VFLIP - dbsprite 5, 1, 0, 0, $36, OAM_HFLIP | OAM_VFLIP + dbsprite 5, 0, 0, 0, $36, OAM_XFLIP + dbsprite 4, 1, 0, 0, $36, OAM_YFLIP + dbsprite 5, 1, 0, 0, $36, OAM_XFLIP | OAM_YFLIP FrameBlock15: db 12 ; # dbsprite 0, 0, 0, 0, $28, 0 - dbsprite 1, 0, 0, 0, $28, OAM_HFLIP + dbsprite 1, 0, 0, 0, $28, OAM_XFLIP dbsprite 0, 1, 0, 0, $38, 0 - dbsprite 1, 1, 0, 0, $38, OAM_HFLIP + dbsprite 1, 1, 0, 0, $38, OAM_XFLIP dbsprite 2, 0, 0, 0, $29, 0 - dbsprite 3, 0, 0, 0, $29, OAM_HFLIP + dbsprite 3, 0, 0, 0, $29, OAM_XFLIP dbsprite 2, 1, 0, 0, $39, 0 - dbsprite 3, 1, 0, 0, $39, OAM_HFLIP + dbsprite 3, 1, 0, 0, $39, OAM_XFLIP dbsprite 4, 0, 0, 0, $28, 0 - dbsprite 5, 0, 0, 0, $28, OAM_HFLIP + dbsprite 5, 0, 0, 0, $28, OAM_XFLIP dbsprite 4, 1, 0, 0, $38, 0 - dbsprite 5, 1, 0, 0, $38, OAM_HFLIP + dbsprite 5, 1, 0, 0, $38, OAM_XFLIP FrameBlock16: db 8 ; # dbsprite 0, 0, 0, 0, $29, 0 - dbsprite 1, 0, 0, 0, $29, OAM_HFLIP + dbsprite 1, 0, 0, 0, $29, OAM_XFLIP dbsprite 0, 1, 0, 0, $39, 0 - dbsprite 1, 1, 0, 0, $39, OAM_HFLIP + dbsprite 1, 1, 0, 0, $39, OAM_XFLIP dbsprite 4, 0, 0, 0, $29, 0 - dbsprite 5, 0, 0, 0, $29, OAM_HFLIP + dbsprite 5, 0, 0, 0, $29, OAM_XFLIP dbsprite 4, 1, 0, 0, $39, 0 - dbsprite 5, 1, 0, 0, $39, OAM_HFLIP + dbsprite 5, 1, 0, 0, $39, OAM_XFLIP FrameBlock17: db 4 ; # @@ -379,73 +379,73 @@ FrameBlock17: FrameBlock18: db 1 ; # - dbsprite 0, 3, 0, 0, $45, OAM_HFLIP | OAM_VFLIP + dbsprite 0, 3, 0, 0, $45, OAM_XFLIP | OAM_YFLIP FrameBlock19: db 2 ; # dbsprite 1, 3, 0, 0, $45, 0 - dbsprite 1, 2, 0, 0, $46, OAM_HFLIP | OAM_VFLIP + dbsprite 1, 2, 0, 0, $46, OAM_XFLIP | OAM_YFLIP FrameBlock1a: db 2 ; # - dbsprite 2, 2, 0, 0, $45, OAM_HFLIP | OAM_VFLIP + dbsprite 2, 2, 0, 0, $45, OAM_XFLIP | OAM_YFLIP dbsprite 2, 3, 0, 0, $46, 0 FrameBlock1b: db 2 ; # dbsprite 3, 2, 0, 0, $45, 0 - dbsprite 3, 1, 0, 0, $46, OAM_HFLIP | OAM_VFLIP + dbsprite 3, 1, 0, 0, $46, OAM_XFLIP | OAM_YFLIP FrameBlock1c: db 2 ; # - dbsprite 4, 1, 0, 0, $45, OAM_HFLIP | OAM_VFLIP + dbsprite 4, 1, 0, 0, $45, OAM_XFLIP | OAM_YFLIP dbsprite 4, 2, 0, 0, $46, 0 FrameBlock1d: db 2 ; # dbsprite 5, 1, 0, 0, $45, 0 - dbsprite 5, 0, 0, 0, $46, OAM_HFLIP | OAM_VFLIP + dbsprite 5, 0, 0, 0, $46, OAM_XFLIP | OAM_YFLIP FrameBlock1e: db 2 ; # - dbsprite 6, 0, 0, 0, $45, OAM_HFLIP | OAM_VFLIP + dbsprite 6, 0, 0, 0, $45, OAM_XFLIP | OAM_YFLIP dbsprite 6, 1, 0, 0, $46, 0 FrameBlock75: db 4 ; # dbsprite 0, 0, 0, 0, $43, 0 - dbsprite 1, 0, 0, 0, $43, OAM_HFLIP + dbsprite 1, 0, 0, 0, $43, OAM_XFLIP dbsprite 0, 1, 0, 0, $22, 0 - dbsprite 1, 1, 0, 0, $43, OAM_HFLIP | OAM_VFLIP + dbsprite 1, 1, 0, 0, $43, OAM_XFLIP | OAM_YFLIP FrameBlock1f: db 2 ; # dbsprite 0, 0, 0, 0, $03, 0 - dbsprite 6, 0, 0, 0, $03, OAM_HFLIP + dbsprite 6, 0, 0, 0, $03, OAM_XFLIP FrameBlock20: db 6 ; # dbsprite 0, 0, 0, 0, $03, 0 - dbsprite 6, 0, 0, 0, $03, OAM_HFLIP + dbsprite 6, 0, 0, 0, $03, OAM_XFLIP dbsprite 1, 1, 0, 0, $03, 0 - dbsprite 5, 1, 0, 0, $03, OAM_HFLIP + dbsprite 5, 1, 0, 0, $03, OAM_XFLIP dbsprite 0, 1, 0, 0, $13, 0 - dbsprite 6, 1, 0, 0, $13, OAM_HFLIP + dbsprite 6, 1, 0, 0, $13, OAM_XFLIP FrameBlock21: db 12 ; # dbsprite 0, 0, 0, 0, $03, 0 - dbsprite 6, 0, 0, 0, $03, OAM_HFLIP + dbsprite 6, 0, 0, 0, $03, OAM_XFLIP dbsprite 1, 1, 0, 0, $03, 0 - dbsprite 5, 1, 0, 0, $03, OAM_HFLIP + dbsprite 5, 1, 0, 0, $03, OAM_XFLIP dbsprite 0, 1, 0, 0, $13, 0 - dbsprite 6, 1, 0, 0, $13, OAM_HFLIP + dbsprite 6, 1, 0, 0, $13, OAM_XFLIP dbsprite 2, 2, 0, 0, $03, 0 - dbsprite 4, 2, 0, 0, $03, OAM_HFLIP + dbsprite 4, 2, 0, 0, $03, OAM_XFLIP dbsprite 1, 2, 0, 0, $13, 0 - dbsprite 5, 2, 0, 0, $13, OAM_HFLIP + dbsprite 5, 2, 0, 0, $13, OAM_XFLIP dbsprite 0, 2, 0, 0, $03, 0 - dbsprite 6, 2, 0, 0, $03, OAM_HFLIP + dbsprite 6, 2, 0, 0, $03, OAM_XFLIP FrameBlock22: db 19 ; # @@ -459,15 +459,15 @@ FrameBlock22: dbsprite 2, 2, 0, 0, $03, 0 dbsprite 2, 3, 0, 0, $13, 0 dbsprite 3, 3, 0, 0, $03, 0 - dbsprite 4, 2, 0, 0, $03, OAM_HFLIP - dbsprite 4, 3, 0, 0, $13, OAM_HFLIP - dbsprite 5, 1, 0, 0, $03, OAM_HFLIP - dbsprite 5, 2, 0, 0, $13, OAM_HFLIP - dbsprite 5, 3, 0, 0, $03, OAM_HFLIP - dbsprite 6, 0, 0, 0, $03, OAM_HFLIP - dbsprite 6, 1, 0, 0, $13, OAM_HFLIP - dbsprite 6, 2, 0, 0, $03, OAM_HFLIP - dbsprite 6, 3, 0, 0, $13, OAM_HFLIP + dbsprite 4, 2, 0, 0, $03, OAM_XFLIP + dbsprite 4, 3, 0, 0, $13, OAM_XFLIP + dbsprite 5, 1, 0, 0, $03, OAM_XFLIP + dbsprite 5, 2, 0, 0, $13, OAM_XFLIP + dbsprite 5, 3, 0, 0, $03, OAM_XFLIP + dbsprite 6, 0, 0, 0, $03, OAM_XFLIP + dbsprite 6, 1, 0, 0, $13, OAM_XFLIP + dbsprite 6, 2, 0, 0, $03, OAM_XFLIP + dbsprite 6, 3, 0, 0, $13, OAM_XFLIP FrameBlock23: db 4 ; # @@ -499,24 +499,24 @@ FrameBlock25: FrameBlock26: db 4 ; # dbsprite 2, 0, 0, 0, $44, 0 - dbsprite 3, 0, 0, 0, $44, OAM_HFLIP - dbsprite 2, 1, 0, 0, $44, OAM_VFLIP - dbsprite 3, 1, 0, 0, $44, OAM_HFLIP | OAM_VFLIP + dbsprite 3, 0, 0, 0, $44, OAM_XFLIP + dbsprite 2, 1, 0, 0, $44, OAM_YFLIP + dbsprite 3, 1, 0, 0, $44, OAM_XFLIP | OAM_YFLIP FrameBlock27: db 5 ; # dbsprite 1, 1, 0, 0, $44, 0 - dbsprite 2, 1, 0, 0, $44, OAM_HFLIP - dbsprite 1, 2, 0, 0, $44, OAM_VFLIP - dbsprite 2, 2, 0, 0, $44, OAM_HFLIP | OAM_VFLIP + dbsprite 2, 1, 0, 0, $44, OAM_XFLIP + dbsprite 1, 2, 0, 0, $44, OAM_YFLIP + dbsprite 2, 2, 0, 0, $44, OAM_XFLIP | OAM_YFLIP dbsprite 3, 0, 0, 0, $47, 0 FrameBlock28: db 6 ; # dbsprite 0, 2, 0, 0, $44, 0 - dbsprite 1, 2, 0, 0, $44, OAM_HFLIP - dbsprite 0, 3, 0, 0, $44, OAM_VFLIP - dbsprite 1, 3, 0, 0, $44, OAM_HFLIP | OAM_VFLIP + dbsprite 1, 2, 0, 0, $44, OAM_XFLIP + dbsprite 0, 3, 0, 0, $44, OAM_YFLIP + dbsprite 1, 3, 0, 0, $44, OAM_XFLIP | OAM_YFLIP dbsprite 2, 1, 0, 0, $47, 0 dbsprite 2, 0, 6, 2, $47, 0 @@ -530,9 +530,9 @@ FrameBlock29: FrameBlock2a: db 4 ; # dbsprite 0, 0, 0, 0, $44, 0 - dbsprite 1, 0, 0, 0, $44, OAM_HFLIP - dbsprite 0, 1, 0, 0, $44, OAM_VFLIP - dbsprite 1, 1, 0, 0, $44, OAM_HFLIP | OAM_VFLIP + dbsprite 1, 0, 0, 0, $44, OAM_XFLIP + dbsprite 0, 1, 0, 0, $44, OAM_YFLIP + dbsprite 1, 1, 0, 0, $44, OAM_XFLIP | OAM_YFLIP FrameBlock2b: db 2 ; # @@ -556,28 +556,28 @@ FrameBlock2d: FrameBlock2e: db 8 ; # - dbsprite 0, 0, 0, 0, $27, OAM_HFLIP - dbsprite 1, 0, 0, 0, $26, OAM_HFLIP - dbsprite 0, 1, 0, 0, $37, OAM_HFLIP - dbsprite 1, 1, 0, 0, $36, OAM_HFLIP - dbsprite 0, 2, 0, 0, $29, OAM_HFLIP - dbsprite 1, 2, 0, 0, $28, OAM_HFLIP - dbsprite 0, 3, 0, 0, $39, OAM_HFLIP - dbsprite 1, 3, 0, 0, $38, OAM_HFLIP + dbsprite 0, 0, 0, 0, $27, OAM_XFLIP + dbsprite 1, 0, 0, 0, $26, OAM_XFLIP + dbsprite 0, 1, 0, 0, $37, OAM_XFLIP + dbsprite 1, 1, 0, 0, $36, OAM_XFLIP + dbsprite 0, 2, 0, 0, $29, OAM_XFLIP + dbsprite 1, 2, 0, 0, $28, OAM_XFLIP + dbsprite 0, 3, 0, 0, $39, OAM_XFLIP + dbsprite 1, 3, 0, 0, $38, OAM_XFLIP FrameBlock2f: db 4 ; # dbsprite 0, 0, 0, 0, $0c, 0 dbsprite 1, 0, 0, 0, $0d, 0 - dbsprite 0, 1, 0, 0, $0c, OAM_VFLIP - dbsprite 1, 1, 0, 0, $0d, OAM_VFLIP + dbsprite 0, 1, 0, 0, $0c, OAM_YFLIP + dbsprite 1, 1, 0, 0, $0d, OAM_YFLIP FrameBlock30: db 4 ; # dbsprite 0, 0, 0, 0, $44, 0 - dbsprite 1, 0, 0, 0, $44, OAM_HFLIP - dbsprite 0, 1, 0, 0, $44, OAM_VFLIP - dbsprite 1, 1, 0, 0, $44, OAM_HFLIP | OAM_VFLIP + dbsprite 1, 0, 0, 0, $44, OAM_XFLIP + dbsprite 0, 1, 0, 0, $44, OAM_YFLIP + dbsprite 1, 1, 0, 0, $44, OAM_XFLIP | OAM_YFLIP FrameBlock31: db 1 ; # @@ -587,34 +587,34 @@ FrameBlock32: db 7 ; # dbsprite 0, 0, 0, 0, $4d, 0 dbsprite 1, 0, 0, 0, $2f, 0 - dbsprite 2, 0, 0, 0, $4d, OAM_HFLIP + dbsprite 2, 0, 0, 0, $4d, OAM_XFLIP dbsprite 0, 1, 0, 0, $4e, 0 dbsprite 1, 1, 0, 0, $07, 0 - dbsprite 2, 1, 0, 0, $4e, OAM_HFLIP + dbsprite 2, 1, 0, 0, $4e, OAM_XFLIP dbsprite 1, 2, 0, 0, $3f, 0 FrameBlock33: db 7 ; # - dbsprite 1, 0, 0, 0, $3f, OAM_VFLIP - dbsprite 0, 1, 0, 0, $4e, OAM_VFLIP - dbsprite 1, 1, 0, 0, $07, OAM_VFLIP - dbsprite 2, 1, 0, 0, $4e, OAM_HFLIP | OAM_VFLIP - dbsprite 0, 2, 0, 0, $4d, OAM_VFLIP - dbsprite 1, 2, 0, 0, $2f, OAM_VFLIP - dbsprite 2, 2, 0, 0, $4d, OAM_HFLIP | OAM_VFLIP + dbsprite 1, 0, 0, 0, $3f, OAM_YFLIP + dbsprite 0, 1, 0, 0, $4e, OAM_YFLIP + dbsprite 1, 1, 0, 0, $07, OAM_YFLIP + dbsprite 2, 1, 0, 0, $4e, OAM_XFLIP | OAM_YFLIP + dbsprite 0, 2, 0, 0, $4d, OAM_YFLIP + dbsprite 1, 2, 0, 0, $2f, OAM_YFLIP + dbsprite 2, 2, 0, 0, $4d, OAM_XFLIP | OAM_YFLIP FrameBlock34: db 1 ; # - dbsprite 0, 20, 0, 0, $00, OAM_OBP1 + dbsprite 0, 20, 0, 0, $00, OAM_PAL1 FrameBlock35: db 6 ; # dbsprite 0, 0, 0, 0, $2a, 0 dbsprite 1, 0, 0, 0, $2b, 0 dbsprite 0, 1, 0, 0, $3a, 0 - dbsprite 0, 2, 0, 0, $3a, OAM_VFLIP - dbsprite 0, 3, 0, 0, $2a, OAM_VFLIP - dbsprite 1, 3, 0, 0, $2b, OAM_VFLIP + dbsprite 0, 2, 0, 0, $3a, OAM_YFLIP + dbsprite 0, 3, 0, 0, $2a, OAM_YFLIP + dbsprite 1, 3, 0, 0, $2b, OAM_YFLIP FrameBlock36: db 4 ; # @@ -625,10 +625,10 @@ FrameBlock36: FrameBlock37: db 4 ; # - dbsprite 0, 0, 0, 0, $01, OAM_BEHIND_BG | OAM_HFLIP - dbsprite 1, 0, 0, 0, $00, OAM_BEHIND_BG | OAM_HFLIP - dbsprite 0, 1, 0, 0, $11, OAM_BEHIND_BG | OAM_HFLIP - dbsprite 1, 1, 0, 0, $10, OAM_BEHIND_BG | OAM_HFLIP + dbsprite 0, 0, 0, 0, $01, OAM_PRIO | OAM_XFLIP + dbsprite 1, 0, 0, 0, $00, OAM_PRIO | OAM_XFLIP + dbsprite 0, 1, 0, 0, $11, OAM_PRIO | OAM_XFLIP + dbsprite 1, 1, 0, 0, $10, OAM_PRIO | OAM_XFLIP FrameBlock38: db 4 ; # @@ -639,41 +639,41 @@ FrameBlock38: FrameBlock39: db 4 ; # - dbsprite 0, 0, 0, 0, $0b, OAM_HFLIP - dbsprite 1, 0, 0, 0, $0a, OAM_HFLIP - dbsprite 0, 1, 0, 0, $1b, OAM_HFLIP - dbsprite 1, 1, 0, 0, $1a, OAM_HFLIP + dbsprite 0, 0, 0, 0, $0b, OAM_XFLIP + dbsprite 1, 0, 0, 0, $0a, OAM_XFLIP + dbsprite 0, 1, 0, 0, $1b, OAM_XFLIP + dbsprite 1, 1, 0, 0, $1a, OAM_XFLIP FrameBlock3a: db 4 ; # dbsprite 0, 4, 0, 0, $05, 0 - dbsprite 1, 4, 0, 0, $05, OAM_HFLIP + dbsprite 1, 4, 0, 0, $05, OAM_XFLIP dbsprite 0, 5, 0, 0, $15, 0 - dbsprite 1, 5, 0, 0, $15, OAM_HFLIP + dbsprite 1, 5, 0, 0, $15, OAM_XFLIP FrameBlock3b: db 5 ; # dbsprite 0, 3, 0, 0, $04, 0 - dbsprite 1, 3, 0, 0, $04, OAM_HFLIP + dbsprite 1, 3, 0, 0, $04, OAM_XFLIP dbsprite 0, 4, 0, 0, $14, 0 - dbsprite 1, 4, 0, 0, $14, OAM_HFLIP + dbsprite 1, 4, 0, 0, $14, OAM_XFLIP dbsprite 0, 5, 4, 0, $41, 0 FrameBlock3c: db 6 ; # dbsprite 0, 2, 0, 0, $05, 0 - dbsprite 1, 2, 0, 0, $05, OAM_HFLIP + dbsprite 1, 2, 0, 0, $05, OAM_XFLIP dbsprite 0, 3, 0, 0, $15, 0 - dbsprite 1, 3, 0, 0, $15, OAM_HFLIP + dbsprite 1, 3, 0, 0, $15, OAM_XFLIP dbsprite 0, 4, 4, 0, $42, 0 dbsprite 0, 5, 4, 0, $42, 0 FrameBlock3d: db 7 ; # dbsprite 0, 1, 0, 0, $04, 0 - dbsprite 1, 1, 0, 0, $04, OAM_HFLIP + dbsprite 1, 1, 0, 0, $04, OAM_XFLIP dbsprite 0, 2, 0, 0, $14, 0 - dbsprite 1, 2, 0, 0, $14, OAM_HFLIP + dbsprite 1, 2, 0, 0, $14, OAM_XFLIP dbsprite 0, 3, 4, 0, $41, 0 dbsprite 0, 4, 4, 0, $41, 0 dbsprite 0, 5, 4, 0, $41, 0 @@ -681,9 +681,9 @@ FrameBlock3d: FrameBlock3e: db 8 ; # dbsprite 0, 0, 0, 0, $05, 0 - dbsprite 1, 0, 0, 0, $05, OAM_HFLIP + dbsprite 1, 0, 0, 0, $05, OAM_XFLIP dbsprite 0, 1, 0, 0, $15, 0 - dbsprite 1, 1, 0, 0, $15, OAM_HFLIP + dbsprite 1, 1, 0, 0, $15, OAM_XFLIP dbsprite 0, 2, 4, 0, $42, 0 dbsprite 0, 3, 4, 0, $42, 0 dbsprite 0, 4, 4, 0, $42, 0 @@ -692,9 +692,9 @@ FrameBlock3e: FrameBlock3f: db 8 ; # dbsprite 0, 0, 0, 0, $04, 0 - dbsprite 1, 0, 0, 0, $04, OAM_HFLIP + dbsprite 1, 0, 0, 0, $04, OAM_XFLIP dbsprite 0, 1, 0, 0, $14, 0 - dbsprite 1, 1, 0, 0, $14, OAM_HFLIP + dbsprite 1, 1, 0, 0, $14, OAM_XFLIP dbsprite 0, 2, 4, 0, $41, 0 dbsprite 0, 3, 4, 0, $41, 0 dbsprite 0, 4, 4, 0, $41, 0 @@ -709,7 +709,7 @@ FrameBlock40: FrameBlock41: db 4 ; # dbsprite 0, 0, 0, 0, $06, 0 - dbsprite 1, 0, 0, 0, $06, OAM_HFLIP + dbsprite 1, 0, 0, 0, $06, OAM_XFLIP dbsprite 0, 1, 0, 0, $16, 0 dbsprite 1, 1, 0, 0, $17, 0 @@ -765,139 +765,139 @@ FrameBlock46: FrameBlock47: db 4 ; # dbsprite 0, 0, 0, 0, $43, 0 - dbsprite 1, 0, 0, 0, $43, OAM_HFLIP - dbsprite 0, 1, 0, 0, $43, OAM_VFLIP - dbsprite 1, 1, 0, 0, $43, OAM_HFLIP | OAM_VFLIP + dbsprite 1, 0, 0, 0, $43, OAM_XFLIP + dbsprite 0, 1, 0, 0, $43, OAM_YFLIP + dbsprite 1, 1, 0, 0, $43, OAM_XFLIP | OAM_YFLIP SmallBlackCircleFrameBlock: db 4 ; # dbsprite 1, 1, 0, 0, $33, 0 - dbsprite 2, 1, 0, 0, $33, OAM_HFLIP - dbsprite 1, 2, 0, 0, $33, OAM_VFLIP - dbsprite 2, 2, 0, 0, $33, OAM_HFLIP | OAM_VFLIP + dbsprite 2, 1, 0, 0, $33, OAM_XFLIP + dbsprite 1, 2, 0, 0, $33, OAM_YFLIP + dbsprite 2, 2, 0, 0, $33, OAM_XFLIP | OAM_YFLIP LargeBlackCircleFrameBlock: db 16 ; # dbsprite 0, 0, 0, 0, $22, 0 dbsprite 1, 0, 0, 0, $23, 0 - dbsprite 2, 0, 0, 0, $23, OAM_HFLIP - dbsprite 3, 0, 0, 0, $22, OAM_HFLIP + dbsprite 2, 0, 0, 0, $23, OAM_XFLIP + dbsprite 3, 0, 0, 0, $22, OAM_XFLIP dbsprite 0, 1, 0, 0, $32, 0 dbsprite 1, 1, 0, 0, $43, 0 - dbsprite 2, 1, 0, 0, $43, OAM_HFLIP - dbsprite 3, 1, 0, 0, $32, OAM_HFLIP - dbsprite 0, 2, 0, 0, $32, OAM_VFLIP - dbsprite 1, 2, 0, 0, $43, OAM_VFLIP - dbsprite 2, 2, 0, 0, $43, OAM_HFLIP | OAM_VFLIP - dbsprite 3, 2, 0, 0, $32, OAM_HFLIP | OAM_VFLIP - dbsprite 0, 3, 0, 0, $22, OAM_VFLIP - dbsprite 1, 3, 0, 0, $23, OAM_VFLIP - dbsprite 2, 3, 0, 0, $23, OAM_HFLIP | OAM_VFLIP - dbsprite 3, 3, 0, 0, $22, OAM_HFLIP | OAM_VFLIP + dbsprite 2, 1, 0, 0, $43, OAM_XFLIP + dbsprite 3, 1, 0, 0, $32, OAM_XFLIP + dbsprite 0, 2, 0, 0, $32, OAM_YFLIP + dbsprite 1, 2, 0, 0, $43, OAM_YFLIP + dbsprite 2, 2, 0, 0, $43, OAM_XFLIP | OAM_YFLIP + dbsprite 3, 2, 0, 0, $32, OAM_XFLIP | OAM_YFLIP + dbsprite 0, 3, 0, 0, $22, OAM_YFLIP + dbsprite 1, 3, 0, 0, $23, OAM_YFLIP + dbsprite 2, 3, 0, 0, $23, OAM_XFLIP | OAM_YFLIP + dbsprite 3, 3, 0, 0, $22, OAM_XFLIP | OAM_YFLIP FrameBlock71: db 16 ; # dbsprite 0, 0, 0, 0, $22, 0 dbsprite 1, 0, 0, 0, $3b, 0 - dbsprite 2, 0, 0, 0, $23, OAM_HFLIP - dbsprite 3, 0, 0, 0, $22, OAM_HFLIP + dbsprite 2, 0, 0, 0, $23, OAM_XFLIP + dbsprite 3, 0, 0, 0, $22, OAM_XFLIP dbsprite 0, 1, 0, 0, $32, 0 dbsprite 1, 1, 0, 0, $43, 0 - dbsprite 2, 1, 0, 0, $43, OAM_HFLIP - dbsprite 3, 1, 0, 0, $32, OAM_HFLIP - dbsprite 0, 2, 0, 0, $32, OAM_VFLIP - dbsprite 1, 2, 0, 0, $43, OAM_VFLIP - dbsprite 2, 2, 0, 0, $43, OAM_HFLIP | OAM_VFLIP - dbsprite 3, 2, 0, 0, $32, OAM_HFLIP | OAM_VFLIP - dbsprite 0, 3, 0, 0, $22, OAM_VFLIP - dbsprite 1, 3, 0, 0, $23, OAM_VFLIP - dbsprite 2, 3, 0, 0, $23, OAM_HFLIP | OAM_VFLIP - dbsprite 3, 3, 0, 0, $22, OAM_HFLIP | OAM_VFLIP + dbsprite 2, 1, 0, 0, $43, OAM_XFLIP + dbsprite 3, 1, 0, 0, $32, OAM_XFLIP + dbsprite 0, 2, 0, 0, $32, OAM_YFLIP + dbsprite 1, 2, 0, 0, $43, OAM_YFLIP + dbsprite 2, 2, 0, 0, $43, OAM_XFLIP | OAM_YFLIP + dbsprite 3, 2, 0, 0, $32, OAM_XFLIP | OAM_YFLIP + dbsprite 0, 3, 0, 0, $22, OAM_YFLIP + dbsprite 1, 3, 0, 0, $23, OAM_YFLIP + dbsprite 2, 3, 0, 0, $23, OAM_XFLIP | OAM_YFLIP + dbsprite 3, 3, 0, 0, $22, OAM_XFLIP | OAM_YFLIP FrameBlock72: db 12 ; # dbsprite 0, 0, 0, 0, $32, 0 dbsprite 1, 0, 0, 0, $43, 0 - dbsprite 2, 0, 0, 0, $43, OAM_HFLIP - dbsprite 3, 0, 0, 0, $32, OAM_HFLIP - dbsprite 0, 1, 0, 0, $32, OAM_VFLIP - dbsprite 1, 1, 0, 0, $43, OAM_VFLIP - dbsprite 2, 1, 0, 0, $43, OAM_HFLIP | OAM_VFLIP - dbsprite 3, 1, 0, 0, $32, OAM_HFLIP | OAM_VFLIP - dbsprite 0, 2, 0, 0, $22, OAM_VFLIP - dbsprite 1, 2, 0, 0, $23, OAM_VFLIP - dbsprite 2, 2, 0, 0, $23, OAM_HFLIP | OAM_VFLIP - dbsprite 3, 2, 0, 0, $22, OAM_HFLIP | OAM_VFLIP + dbsprite 2, 0, 0, 0, $43, OAM_XFLIP + dbsprite 3, 0, 0, 0, $32, OAM_XFLIP + dbsprite 0, 1, 0, 0, $32, OAM_YFLIP + dbsprite 1, 1, 0, 0, $43, OAM_YFLIP + dbsprite 2, 1, 0, 0, $43, OAM_XFLIP | OAM_YFLIP + dbsprite 3, 1, 0, 0, $32, OAM_XFLIP | OAM_YFLIP + dbsprite 0, 2, 0, 0, $22, OAM_YFLIP + dbsprite 1, 2, 0, 0, $23, OAM_YFLIP + dbsprite 2, 2, 0, 0, $23, OAM_XFLIP | OAM_YFLIP + dbsprite 3, 2, 0, 0, $22, OAM_XFLIP | OAM_YFLIP FrameBlock73: db 8 ; # - dbsprite 0, 0, 0, 0, $32, OAM_VFLIP - dbsprite 1, 0, 0, 0, $43, OAM_VFLIP - dbsprite 2, 0, 0, 0, $43, OAM_HFLIP | OAM_VFLIP - dbsprite 3, 0, 0, 0, $32, OAM_HFLIP | OAM_VFLIP - dbsprite 0, 1, 0, 0, $22, OAM_VFLIP - dbsprite 1, 1, 0, 0, $23, OAM_VFLIP - dbsprite 2, 1, 0, 0, $23, OAM_HFLIP | OAM_VFLIP - dbsprite 3, 1, 0, 0, $22, OAM_HFLIP | OAM_VFLIP + dbsprite 0, 0, 0, 0, $32, OAM_YFLIP + dbsprite 1, 0, 0, 0, $43, OAM_YFLIP + dbsprite 2, 0, 0, 0, $43, OAM_XFLIP | OAM_YFLIP + dbsprite 3, 0, 0, 0, $32, OAM_XFLIP | OAM_YFLIP + dbsprite 0, 1, 0, 0, $22, OAM_YFLIP + dbsprite 1, 1, 0, 0, $23, OAM_YFLIP + dbsprite 2, 1, 0, 0, $23, OAM_XFLIP | OAM_YFLIP + dbsprite 3, 1, 0, 0, $22, OAM_XFLIP | OAM_YFLIP FrameBlock74: db 4 ; # - dbsprite 0, 0, 0, 0, $22, OAM_VFLIP - dbsprite 1, 0, 0, 0, $23, OAM_VFLIP - dbsprite 2, 0, 0, 0, $23, OAM_HFLIP | OAM_VFLIP - dbsprite 3, 0, 0, 0, $22, OAM_HFLIP | OAM_VFLIP + dbsprite 0, 0, 0, 0, $22, OAM_YFLIP + dbsprite 1, 0, 0, 0, $23, OAM_YFLIP + dbsprite 2, 0, 0, 0, $23, OAM_XFLIP | OAM_YFLIP + dbsprite 3, 0, 0, 0, $22, OAM_XFLIP | OAM_YFLIP FrameBlock4a: db 4 ; # - dbsprite 3, 1, 0, 0, $4c, OAM_HFLIP + dbsprite 3, 1, 0, 0, $4c, OAM_XFLIP dbsprite 1, 4, 0, 0, $4b, 0 dbsprite 4, 6, 0, 0, $4c, 0 - dbsprite 6, 3, 0, 0, $4b, OAM_VFLIP + dbsprite 6, 3, 0, 0, $4b, OAM_YFLIP FrameBlock4b: db 4 ; # dbsprite 3, 0, 0, 0, $4c, 0 - dbsprite 0, 4, 0, 0, $4b, OAM_VFLIP - dbsprite 4, 7, 0, 0, $4c, OAM_HFLIP + dbsprite 0, 4, 0, 0, $4b, OAM_YFLIP + dbsprite 4, 7, 0, 0, $4c, OAM_XFLIP dbsprite 7, 3, 0, 0, $4b, 0 FrameBlock4c: db 4 ; # - dbsprite 1, 2, 0, 0, $4a, OAM_VFLIP + dbsprite 1, 2, 0, 0, $4a, OAM_YFLIP dbsprite 2, 6, 0, 0, $4a, 0 - dbsprite 6, 5, 0, 0, $4a, OAM_HFLIP - dbsprite 5, 1, 0, 0, $4a, OAM_HFLIP | OAM_VFLIP + dbsprite 6, 5, 0, 0, $4a, OAM_XFLIP + dbsprite 5, 1, 0, 0, $4a, OAM_XFLIP | OAM_YFLIP FrameBlock4d: db 4 ; # - dbsprite 0, 1, 0, 0, $4a, OAM_HFLIP - dbsprite 1, 7, 0, 0, $4a, OAM_HFLIP | OAM_VFLIP - dbsprite 7, 6, 0, 0, $4a, OAM_VFLIP + dbsprite 0, 1, 0, 0, $4a, OAM_XFLIP + dbsprite 1, 7, 0, 0, $4a, OAM_XFLIP | OAM_YFLIP + dbsprite 7, 6, 0, 0, $4a, OAM_YFLIP dbsprite 6, 0, 0, 0, $4a, 0 FrameBlock4e: db 8 ; # dbsprite 6, 0, 0, 0, $44, 0 - dbsprite 7, 0, 0, 0, $44, OAM_HFLIP - dbsprite 6, 1, 0, 0, $44, OAM_VFLIP - dbsprite 7, 1, 0, 0, $44, OAM_HFLIP | OAM_VFLIP + dbsprite 7, 0, 0, 0, $44, OAM_XFLIP + dbsprite 6, 1, 0, 0, $44, OAM_YFLIP + dbsprite 7, 1, 0, 0, $44, OAM_XFLIP | OAM_YFLIP dbsprite 1, 4, 2, 6, $44, 0 - dbsprite 2, 4, 2, 6, $44, OAM_HFLIP - dbsprite 1, 5, 2, 6, $44, OAM_VFLIP - dbsprite 2, 5, 2, 6, $44, OAM_HFLIP | OAM_VFLIP + dbsprite 2, 4, 2, 6, $44, OAM_XFLIP + dbsprite 1, 5, 2, 6, $44, OAM_YFLIP + dbsprite 2, 5, 2, 6, $44, OAM_XFLIP | OAM_YFLIP FrameBlock4f: db 12 ; # dbsprite 4, 1, 2, 6, $44, 0 - dbsprite 5, 1, 2, 6, $44, OAM_HFLIP - dbsprite 4, 2, 2, 6, $44, OAM_VFLIP - dbsprite 5, 2, 2, 6, $44, OAM_HFLIP | OAM_VFLIP + dbsprite 5, 1, 2, 6, $44, OAM_XFLIP + dbsprite 4, 2, 2, 6, $44, OAM_YFLIP + dbsprite 5, 2, 2, 6, $44, OAM_XFLIP | OAM_YFLIP dbsprite 6, 0, 2, 6, $47, 0 dbsprite 7, 0, 0, 0, $47, 0 dbsprite 2, 3, 6, 2, $44, 0 - dbsprite 3, 3, 6, 2, $44, OAM_HFLIP - dbsprite 2, 4, 6, 2, $44, OAM_VFLIP - dbsprite 3, 4, 6, 2, $44, OAM_HFLIP | OAM_VFLIP + dbsprite 3, 3, 6, 2, $44, OAM_XFLIP + dbsprite 2, 4, 6, 2, $44, OAM_YFLIP + dbsprite 3, 4, 6, 2, $44, OAM_XFLIP | OAM_YFLIP dbsprite 1, 6, 0, 0, $47, 0 dbsprite 1, 5, 6, 2, $47, 0 @@ -914,14 +914,14 @@ FrameBlock50: FrameBlock51: db 8 ; # - dbsprite 0, 0, 0, 0, $35, OAM_HFLIP - dbsprite 0, 1, 0, 0, $35, OAM_VFLIP + dbsprite 0, 0, 0, 0, $35, OAM_XFLIP + dbsprite 0, 1, 0, 0, $35, OAM_YFLIP dbsprite 0, 2, 0, 0, $35, 0 - dbsprite 0, 3, 0, 0, $35, OAM_HFLIP | OAM_VFLIP + dbsprite 0, 3, 0, 0, $35, OAM_XFLIP | OAM_YFLIP dbsprite 8, 0, 0, 0, $35, 0 - dbsprite 8, 1, 0, 0, $35, OAM_HFLIP | OAM_VFLIP - dbsprite 8, 2, 0, 0, $35, OAM_HFLIP - dbsprite 8, 3, 0, 0, $35, OAM_VFLIP + dbsprite 8, 1, 0, 0, $35, OAM_XFLIP | OAM_YFLIP + dbsprite 8, 2, 0, 0, $35, OAM_XFLIP + dbsprite 8, 3, 0, 0, $35, OAM_YFLIP FrameBlock52: db 4 ; # @@ -939,9 +939,9 @@ FrameBlock53: FrameBlock54: db 4 ; # dbsprite 0, 0, 0, 0, $0e, 0 - dbsprite 1, 0, 0, 0, $0e, OAM_HFLIP + dbsprite 1, 0, 0, 0, $0e, OAM_XFLIP dbsprite 0, 1, 0, 0, $0f, 0 - dbsprite 1, 1, 0, 0, $0f, OAM_HFLIP + dbsprite 1, 1, 0, 0, $0f, OAM_XFLIP FrameBlock55: db 3 ; # @@ -989,22 +989,22 @@ FrameBlock5a: dbsprite 0, 0, 0, 0, $24, 0 dbsprite 1, 0, 0, 0, $25, 0 dbsprite 0, 1, 0, 0, $34, 0 - dbsprite 2, 0, 0, 0, $25, OAM_HFLIP - dbsprite 3, 0, 0, 0, $24, OAM_HFLIP - dbsprite 3, 1, 0, 0, $34, OAM_HFLIP - dbsprite 0, 2, 0, 0, $34, OAM_VFLIP - dbsprite 0, 3, 0, 0, $24, OAM_VFLIP - dbsprite 1, 3, 0, 0, $25, OAM_VFLIP - dbsprite 3, 2, 0, 0, $34, OAM_HFLIP | OAM_VFLIP - dbsprite 2, 3, 0, 0, $25, OAM_HFLIP | OAM_VFLIP - dbsprite 3, 3, 0, 0, $24, OAM_HFLIP | OAM_VFLIP + dbsprite 2, 0, 0, 0, $25, OAM_XFLIP + dbsprite 3, 0, 0, 0, $24, OAM_XFLIP + dbsprite 3, 1, 0, 0, $34, OAM_XFLIP + dbsprite 0, 2, 0, 0, $34, OAM_YFLIP + dbsprite 0, 3, 0, 0, $24, OAM_YFLIP + dbsprite 1, 3, 0, 0, $25, OAM_YFLIP + dbsprite 3, 2, 0, 0, $34, OAM_XFLIP | OAM_YFLIP + dbsprite 2, 3, 0, 0, $25, OAM_XFLIP | OAM_YFLIP + dbsprite 3, 3, 0, 0, $24, OAM_XFLIP | OAM_YFLIP FrameBlock5b: db 4 ; # dbsprite 0, 0, 0, 0, $43, 0 - dbsprite 1, 0, 0, 0, $43, OAM_HFLIP - dbsprite 0, 1, 0, 0, $43, OAM_VFLIP - dbsprite 1, 1, 0, 0, $43, OAM_HFLIP | OAM_VFLIP + dbsprite 1, 0, 0, 0, $43, OAM_XFLIP + dbsprite 0, 1, 0, 0, $43, OAM_YFLIP + dbsprite 1, 1, 0, 0, $43, OAM_XFLIP | OAM_YFLIP FrameBlock5c: db 8 ; # @@ -1013,9 +1013,9 @@ FrameBlock5c: dbsprite 0, 3, 0, 0, $49, 0 dbsprite 2, 2, 0, 0, $49, 0 dbsprite 0, 1, 0, 0, $43, 0 - dbsprite 1, 1, 0, 0, $43, OAM_HFLIP - dbsprite 0, 2, 0, 0, $43, OAM_VFLIP - dbsprite 1, 2, 0, 0, $43, OAM_HFLIP | OAM_VFLIP + dbsprite 1, 1, 0, 0, $43, OAM_XFLIP + dbsprite 0, 2, 0, 0, $43, OAM_YFLIP + dbsprite 1, 2, 0, 0, $43, OAM_XFLIP | OAM_YFLIP FrameBlock5d: db 11 ; # @@ -1023,13 +1023,13 @@ FrameBlock5d: dbsprite 0, 3, 2, 0, $49, 0 dbsprite 2, 2, 0, 4, $49, 0 dbsprite 0, 1, 0, 0, $43, 0 - dbsprite 1, 0, 0, 0, $43, OAM_HFLIP - dbsprite 0, 2, 0, 0, $43, OAM_VFLIP - dbsprite 1, 2, 0, 0, $43, OAM_HFLIP | OAM_VFLIP + dbsprite 1, 0, 0, 0, $43, OAM_XFLIP + dbsprite 0, 2, 0, 0, $43, OAM_YFLIP + dbsprite 1, 2, 0, 0, $43, OAM_XFLIP | OAM_YFLIP dbsprite 1, 0, 0, 4, $43, 0 - dbsprite 2, 0, 0, 4, $43, OAM_HFLIP - dbsprite 1, 1, 0, 4, $43, OAM_VFLIP - dbsprite 2, 1, 0, 4, $43, OAM_HFLIP | OAM_VFLIP + dbsprite 2, 0, 0, 4, $43, OAM_XFLIP + dbsprite 1, 1, 0, 4, $43, OAM_YFLIP + dbsprite 2, 1, 0, 4, $43, OAM_XFLIP | OAM_YFLIP FrameBlock5e: db 15 ; # @@ -1037,17 +1037,17 @@ FrameBlock5e: dbsprite 2, 1, 0, 0, $49, 0 dbsprite 0, 4, 0, 0, $49, 0 dbsprite 0, 1, 0, 0, $43, 0 - dbsprite 1, 1, 0, 0, $43, OAM_HFLIP - dbsprite 0, 2, 0, 0, $43, OAM_VFLIP - dbsprite 1, 2, 0, 0, $43, OAM_HFLIP | OAM_VFLIP + dbsprite 1, 1, 0, 0, $43, OAM_XFLIP + dbsprite 0, 2, 0, 0, $43, OAM_YFLIP + dbsprite 1, 2, 0, 0, $43, OAM_XFLIP | OAM_YFLIP dbsprite 2, 2, 0, 0, $43, 0 - dbsprite 3, 2, 0, 0, $43, OAM_HFLIP - dbsprite 2, 3, 0, 0, $43, OAM_VFLIP - dbsprite 3, 3, 0, 0, $43, OAM_HFLIP | OAM_VFLIP + dbsprite 3, 2, 0, 0, $43, OAM_XFLIP + dbsprite 2, 3, 0, 0, $43, OAM_YFLIP + dbsprite 3, 3, 0, 0, $43, OAM_XFLIP | OAM_YFLIP dbsprite 1, 4, 0, 0, $43, 0 - dbsprite 2, 4, 0, 0, $43, OAM_HFLIP - dbsprite 1, 5, 0, 0, $43, OAM_VFLIP - dbsprite 2, 5, 0, 0, $43, OAM_HFLIP | OAM_VFLIP + dbsprite 2, 4, 0, 0, $43, OAM_XFLIP + dbsprite 1, 5, 0, 0, $43, OAM_YFLIP + dbsprite 2, 5, 0, 0, $43, OAM_XFLIP | OAM_YFLIP FrameBlock5f: db 4 ; # @@ -1140,9 +1140,9 @@ FrameBlock67: FrameBlock68: db 4 ; # dbsprite 0, 0, 0, 0, $03, 0 - dbsprite 1, 0, 0, 0, $03, OAM_HFLIP + dbsprite 1, 0, 0, 0, $03, OAM_XFLIP dbsprite 0, 1, 0, 0, $13, 0 - dbsprite 1, 1, 0, 0, $13, OAM_HFLIP + dbsprite 1, 1, 0, 0, $13, OAM_XFLIP FrameBlock69: db 1 ; # @@ -1151,35 +1151,35 @@ FrameBlock69: FrameBlock6a: db 8 ; # dbsprite 0, 0, 0, 0, $2e, 0 - dbsprite 6, 0, 0, 0, $2e, OAM_HFLIP - dbsprite 0, 6, 0, 0, $2e, OAM_VFLIP - dbsprite 6, 6, 0, 0, $2e, OAM_HFLIP | OAM_VFLIP + dbsprite 6, 0, 0, 0, $2e, OAM_XFLIP + dbsprite 0, 6, 0, 0, $2e, OAM_YFLIP + dbsprite 6, 6, 0, 0, $2e, OAM_XFLIP | OAM_YFLIP dbsprite 3, 0, 0, 0, $2f, 0 - dbsprite 3, 6, 0, 0, $2f, OAM_VFLIP + dbsprite 3, 6, 0, 0, $2f, OAM_YFLIP dbsprite 0, 3, 0, 0, $3e, 0 - dbsprite 6, 3, 0, 0, $3e, OAM_HFLIP + dbsprite 6, 3, 0, 0, $3e, OAM_XFLIP FrameBlock6b: db 8 ; # dbsprite 0, 0, 0, 0, $2e, 0 - dbsprite 4, 0, 0, 0, $2e, OAM_HFLIP - dbsprite 0, 4, 0, 0, $2e, OAM_VFLIP - dbsprite 4, 4, 0, 0, $2e, OAM_HFLIP | OAM_VFLIP + dbsprite 4, 0, 0, 0, $2e, OAM_XFLIP + dbsprite 0, 4, 0, 0, $2e, OAM_YFLIP + dbsprite 4, 4, 0, 0, $2e, OAM_XFLIP | OAM_YFLIP dbsprite 2, 0, 0, 0, $2f, 0 - dbsprite 2, 4, 0, 0, $2f, OAM_VFLIP + dbsprite 2, 4, 0, 0, $2f, OAM_YFLIP dbsprite 0, 2, 0, 0, $3e, 0 - dbsprite 4, 2, 0, 0, $3e, OAM_HFLIP + dbsprite 4, 2, 0, 0, $3e, OAM_XFLIP FrameBlock6c: db 8 ; # dbsprite 0, 0, 0, 0, $2e, 0 - dbsprite 2, 0, 0, 0, $2e, OAM_HFLIP - dbsprite 0, 2, 0, 0, $2e, OAM_VFLIP - dbsprite 2, 2, 0, 0, $2e, OAM_HFLIP | OAM_VFLIP + dbsprite 2, 0, 0, 0, $2e, OAM_XFLIP + dbsprite 0, 2, 0, 0, $2e, OAM_YFLIP + dbsprite 2, 2, 0, 0, $2e, OAM_XFLIP | OAM_YFLIP dbsprite 1, 0, 0, 0, $2f, 0 - dbsprite 1, 2, 0, 0, $2f, OAM_VFLIP + dbsprite 1, 2, 0, 0, $2f, OAM_YFLIP dbsprite 0, 1, 0, 0, $3e, 0 - dbsprite 2, 1, 0, 0, $3e, OAM_HFLIP + dbsprite 2, 1, 0, 0, $3e, OAM_XFLIP FrameBlock6d: db 2 ; # @@ -1189,9 +1189,9 @@ FrameBlock6d: FrameBlock6e: db 4 ; # dbsprite 0, 0, 0, 0, $48, 0 - dbsprite 1, 0, 0, 0, $48, OAM_HFLIP + dbsprite 1, 0, 0, 0, $48, OAM_XFLIP dbsprite 0, 1, 0, 0, $12, 0 - dbsprite 1, 1, 0, 0, $12, OAM_HFLIP + dbsprite 1, 1, 0, 0, $12, OAM_XFLIP FrameBlock6f: db 4 ; # @@ -1202,10 +1202,10 @@ FrameBlock6f: FrameBlock70: db 4 ; # - dbsprite 0, 0, 0, 0, $07, OAM_HFLIP - dbsprite 1, 0, 0, 0, $4a, OAM_HFLIP - dbsprite 0, 1, 0, 0, $17, OAM_HFLIP - dbsprite 1, 1, 0, 0, $16, OAM_HFLIP + dbsprite 0, 0, 0, 0, $07, OAM_XFLIP + dbsprite 1, 0, 0, 0, $4a, OAM_XFLIP + dbsprite 0, 1, 0, 0, $17, OAM_XFLIP + dbsprite 1, 1, 0, 0, $16, OAM_XFLIP FrameBlock76: db 7 ; # @@ -1213,16 +1213,16 @@ FrameBlock76: dbsprite 1, 0, 0, 1, $2f, 0 dbsprite 3, 0, 0, 1, $2f, 0 dbsprite 0, 0, 0, 2, $2e, 0 - dbsprite 4, 0, 0, 2, $2e, OAM_HFLIP + dbsprite 4, 0, 0, 2, $2e, OAM_XFLIP dbsprite 0, 1, 0, 2, $3e, 0 - dbsprite 4, 1, 0, 2, $3e, OAM_HFLIP + dbsprite 4, 1, 0, 2, $3e, OAM_XFLIP FrameBlock77: db 4 ; # dbsprite 0, 0, 2, 0, $4b, 0 dbsprite 1, 0, 2, 0, $4c, 0 - dbsprite 0, 1, 0, 0, $4c, OAM_HFLIP | OAM_VFLIP - dbsprite 1, 1, 0, 0, $4b, OAM_HFLIP | OAM_VFLIP + dbsprite 0, 1, 0, 0, $4c, OAM_XFLIP | OAM_YFLIP + dbsprite 1, 1, 0, 0, $4b, OAM_XFLIP | OAM_YFLIP FrameBlock78: db 1 ; # diff --git a/data/sprite_anims/surfing_pikachu_frames.asm b/data/sprite_anims/surfing_pikachu_frames.asm index cf3463a3..28381a7c 100644 --- a/data/sprite_anims/surfing_pikachu_frames.asm +++ b/data/sprite_anims/surfing_pikachu_frames.asm @@ -68,38 +68,38 @@ Unkn_f945e: dorestart Unkn_f9463: - frame $01, 8, OAM_HFLIP, OAM_VFLIP - frame $02, 8, OAM_HFLIP, OAM_VFLIP + frame $01, 8, OAM_XFLIP, OAM_YFLIP + frame $02, 8, OAM_XFLIP, OAM_YFLIP dorestart Unkn_f9468: - frame $03, 8, OAM_HFLIP, OAM_VFLIP - frame $04, 8, OAM_HFLIP, OAM_VFLIP + frame $03, 8, OAM_XFLIP, OAM_YFLIP + frame $04, 8, OAM_XFLIP, OAM_YFLIP dorestart Unkn_f946d: - frame $05, 8, OAM_HFLIP, OAM_VFLIP - frame $06, 8, OAM_HFLIP, OAM_VFLIP + frame $05, 8, OAM_XFLIP, OAM_YFLIP + frame $06, 8, OAM_XFLIP, OAM_YFLIP dorestart Unkn_f9472: - frame $07, 8, OAM_HFLIP, OAM_VFLIP - frame $08, 8, OAM_HFLIP, OAM_VFLIP + frame $07, 8, OAM_XFLIP, OAM_YFLIP + frame $08, 8, OAM_XFLIP, OAM_YFLIP dorestart Unkn_f9477: - frame $09, 8, OAM_HFLIP, OAM_VFLIP - frame $0a, 8, OAM_HFLIP, OAM_VFLIP + frame $09, 8, OAM_XFLIP, OAM_YFLIP + frame $0a, 8, OAM_XFLIP, OAM_YFLIP dorestart Unkn_f947c: - frame $0b, 8, OAM_HFLIP, OAM_VFLIP - frame $0c, 8, OAM_HFLIP, OAM_VFLIP + frame $0b, 8, OAM_XFLIP, OAM_YFLIP + frame $0c, 8, OAM_XFLIP, OAM_YFLIP dorestart Unkn_f9481: - frame $0d, 8, OAM_HFLIP, OAM_VFLIP - frame $0e, 8, OAM_HFLIP, OAM_VFLIP + frame $0d, 8, OAM_XFLIP, OAM_YFLIP + frame $0e, 8, OAM_XFLIP, OAM_YFLIP dorestart Unkn_f9486: diff --git a/data/sprites/facings.asm b/data/sprites/facings.asm index 74eb2525..ce5faa59 100644 --- a/data/sprites/facings.asm +++ b/data/sprites/facings.asm @@ -59,10 +59,10 @@ SpriteFacingAndAnimationTable: .WalkingDown2: db 4 ; # - db 0, 8, $80, OAM_HFLIP - db 0, 0, $81, OAM_HFLIP - db 8, 8, $82, OAM_HFLIP | UNDER_GRASS - db 8, 0, $83, OAM_HFLIP | UNDER_GRASS | FACING_END + db 0, 8, $80, OAM_XFLIP + db 0, 0, $81, OAM_XFLIP + db 8, 8, $82, OAM_XFLIP | UNDER_GRASS + db 8, 0, $83, OAM_XFLIP | UNDER_GRASS | FACING_END .StandingUp: db 4 ; # @@ -80,10 +80,10 @@ SpriteFacingAndAnimationTable: .WalkingUp2: db 4 ; # - db 0, 8, $84, OAM_HFLIP - db 0, 0, $85, OAM_HFLIP - db 8, 8, $86, OAM_HFLIP | UNDER_GRASS - db 8, 0, $87, OAM_HFLIP | UNDER_GRASS | FACING_END + db 0, 8, $84, OAM_XFLIP + db 0, 0, $85, OAM_XFLIP + db 8, 8, $86, OAM_XFLIP | UNDER_GRASS + db 8, 0, $87, OAM_XFLIP | UNDER_GRASS | FACING_END .StandingLeft: db 4 ; # @@ -101,26 +101,26 @@ SpriteFacingAndAnimationTable: .StandingRight: db 4 ; # - db 0, 8, $08, OAM_HFLIP - db 0, 0, $09, OAM_HFLIP - db 8, 8, $0a, OAM_HFLIP | UNDER_GRASS - db 8, 0, $0b, OAM_HFLIP | UNDER_GRASS | FACING_END + db 0, 8, $08, OAM_XFLIP + db 0, 0, $09, OAM_XFLIP + db 8, 8, $0a, OAM_XFLIP | UNDER_GRASS + db 8, 0, $0b, OAM_XFLIP | UNDER_GRASS | FACING_END .WalkingRight: db 4 ; # - db 0, 8, $88, OAM_HFLIP - db 0, 0, $89, OAM_HFLIP - db 8, 8, $8a, OAM_HFLIP | UNDER_GRASS - db 8, 0, $8b, OAM_HFLIP | UNDER_GRASS | FACING_END + db 0, 8, $88, OAM_XFLIP + db 0, 0, $89, OAM_XFLIP + db 8, 8, $8a, OAM_XFLIP | UNDER_GRASS + db 8, 0, $8b, OAM_XFLIP | UNDER_GRASS | FACING_END .SpecialCase: db 9 ; # db -4, -4, $00, 0 db -4, 4, $01, 0 - db -4, 12, $00, OAM_HFLIP + db -4, 12, $00, OAM_XFLIP db 4, -4, $01, 0 db 4, 4, $02, 0 db 4, 12, $01, 0 - db 12, -4, $00, OAM_VFLIP | UNDER_GRASS + db 12, -4, $00, OAM_YFLIP | UNDER_GRASS db 12, 4, $01, UNDER_GRASS - db 12, 12, $00, OAM_VFLIP | OAM_HFLIP | UNDER_GRASS | FACING_END + db 12, 12, $00, OAM_YFLIP | OAM_XFLIP | UNDER_GRASS | FACING_END diff --git a/data/tilesets/ledge_tiles.asm b/data/tilesets/ledge_tiles.asm index db293800..8c5bff7f 100644 --- a/data/tilesets/ledge_tiles.asm +++ b/data/tilesets/ledge_tiles.asm @@ -1,11 +1,11 @@ LedgeTiles: ; player direction, tile player standing on, ledge tile, input required - db SPRITE_FACING_DOWN, $2C, $37, D_DOWN - db SPRITE_FACING_DOWN, $39, $36, D_DOWN - db SPRITE_FACING_DOWN, $39, $37, D_DOWN - db SPRITE_FACING_LEFT, $2C, $27, D_LEFT - db SPRITE_FACING_LEFT, $39, $27, D_LEFT - db SPRITE_FACING_RIGHT, $2C, $0D, D_RIGHT - db SPRITE_FACING_RIGHT, $2C, $1D, D_RIGHT - db SPRITE_FACING_RIGHT, $39, $0D, D_RIGHT + db SPRITE_FACING_DOWN, $2C, $37, PAD_DOWN + db SPRITE_FACING_DOWN, $39, $36, PAD_DOWN + db SPRITE_FACING_DOWN, $39, $37, PAD_DOWN + db SPRITE_FACING_LEFT, $2C, $27, PAD_LEFT + db SPRITE_FACING_LEFT, $39, $27, PAD_LEFT + db SPRITE_FACING_RIGHT, $2C, $0D, PAD_RIGHT + db SPRITE_FACING_RIGHT, $2C, $1D, PAD_RIGHT + db SPRITE_FACING_RIGHT, $39, $0D, PAD_RIGHT db -1 ; end |