pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-11-16 11:27:33 -08:00
Code Issues Packages Projects Releases Wiki Activity

Revise frame macro to account for flags in sprite anim framesets

Browse Source
This commit is contained in:
pikalaxalt 2016-05-15 23:05:41 -04:00
parent ee906a67c7
commit 1544185bec
2 changed files with 205 additions and 198 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
data/sprite_engine.asm
View File

@ -105,21 +105,21 @@ SpriteAnimFrameData: ; 8d6e6
frame SPRITE_ANIM_FRAME_IDX_00, 8
frame SPRITE_ANIM_FRAME_IDX_01, 8
frame SPRITE_ANIM_FRAME_IDX_00, 8
frame SPRITE_ANIM_FRAME_IDX_01, 72
frame SPRITE_ANIM_FRAME_IDX_01, 8, OAM_X_FLIP
dorestart
.Frameset_2d:
frame SPRITE_ANIM_FRAME_IDX_63, 8
frame SPRITE_ANIM_FRAME_IDX_64, 8
frame SPRITE_ANIM_FRAME_IDX_63, 8
frame SPRITE_ANIM_FRAME_IDX_64, 72
frame SPRITE_ANIM_FRAME_IDX_64, 8, OAM_X_FLIP
dorestart
.Frameset_2e:
frame SPRITE_ANIM_FRAME_IDX_65, 8
frame SPRITE_ANIM_FRAME_IDX_66, 8
frame SPRITE_ANIM_FRAME_IDX_65, 8
frame SPRITE_ANIM_FRAME_IDX_66, 72
frame SPRITE_ANIM_FRAME_IDX_66, 8, OAM_X_FLIP
dorestart
.Frameset_07:
@ -157,7 +157,7 @@ SpriteAnimFrameData: ; 8d6e6
.Frameset_0b:
frame SPRITE_ANIM_FRAME_IDX_23, 3
frame SPRITE_ANIM_FRAME_IDX_23, 131
frame SPRITE_ANIM_FRAME_IDX_23, 3, OAM_Y_FLIP
dorestart
.Frameset_0c:
@ -170,8 +170,8 @@ SpriteAnimFrameData: ; 8d6e6
.Frameset_0d:
frame SPRITE_ANIM_FRAME_IDX_27, 7
frame SPRITE_ANIM_FRAME_IDX_28, 7
frame SPRITE_ANIM_FRAME_IDX_27, 135
frame SPRITE_ANIM_FRAME_IDX_28, 71
frame SPRITE_ANIM_FRAME_IDX_27, 7, OAM_Y_FLIP
frame SPRITE_ANIM_FRAME_IDX_28, 7, OAM_X_FLIP
dorestart
.Frameset_0e:
@ -205,7 +205,7 @@ SpriteAnimFrameData: ; 8d6e6
frame SPRITE_ANIM_FRAME_IDX_30, 3
frame SPRITE_ANIM_FRAME_IDX_31, 3
frame SPRITE_ANIM_FRAME_IDX_30, 3
frame SPRITE_ANIM_FRAME_IDX_31, 67
frame SPRITE_ANIM_FRAME_IDX_31, 3, OAM_X_FLIP
dorestart
.Frameset_15:
@ -242,7 +242,7 @@ SpriteAnimFrameData: ; 8d6e6
frame SPRITE_ANIM_FRAME_IDX_41, 8
frame SPRITE_ANIM_FRAME_IDX_42, 8
frame SPRITE_ANIM_FRAME_IDX_41, 8
frame SPRITE_ANIM_FRAME_IDX_42, 72
frame SPRITE_ANIM_FRAME_IDX_42, 8, OAM_X_FLIP
dorestart
; XXX
@ -262,9 +262,9 @@ SpriteAnimFrameData: ; 8d6e6
; XXX
frame SPRITE_ANIM_FRAME_IDX_49, 1
frame SPRITE_ANIM_FRAME_IDX_49, 65
frame SPRITE_ANIM_FRAME_IDX_49, 193
frame SPRITE_ANIM_FRAME_IDX_49, 129
frame SPRITE_ANIM_FRAME_IDX_49, 1, OAM_X_FLIP
frame SPRITE_ANIM_FRAME_IDX_49, 1, OAM_X_FLIP, OAM_Y_FLIP
frame SPRITE_ANIM_FRAME_IDX_49, 1, OAM_Y_FLIP
dorestart
; XXX
@ -314,15 +314,15 @@ SpriteAnimFrameData: ; 8d6e6
endanim
.Frameset_21:
frame SPRITE_ANIM_FRAME_IDX_55, 96
frame SPRITE_ANIM_FRAME_IDX_55, 32, OAM_X_FLIP
endanim
.Frameset_22:
frame SPRITE_ANIM_FRAME_IDX_55, 160
frame SPRITE_ANIM_FRAME_IDX_55, 32, OAM_Y_FLIP
endanim
.Frameset_23:
frame SPRITE_ANIM_FRAME_IDX_55, 224
frame SPRITE_ANIM_FRAME_IDX_55, 32, OAM_X_FLIP, OAM_Y_FLIP
endanim
.Frameset_24:
@ -338,7 +338,7 @@ SpriteAnimFrameData: ; 8d6e6
frame SPRITE_ANIM_FRAME_IDX_50, 2
frame SPRITE_ANIM_FRAME_IDX_5B, 2
frame SPRITE_ANIM_FRAME_IDX_50, 2
frame SPRITE_ANIM_FRAME_IDX_5B, 66
frame SPRITE_ANIM_FRAME_IDX_5B, 2, OAM_X_FLIP
dorestart
.Frameset_26:
@ -376,30 +376,30 @@ SpriteAnimFrameData: ; 8d6e6
frame SPRITE_ANIM_FRAME_IDX_30, 3
frame SPRITE_ANIM_FRAME_IDX_31, 3
frame SPRITE_ANIM_FRAME_IDX_30, 3
frame SPRITE_ANIM_FRAME_IDX_31, 67
frame SPRITE_ANIM_FRAME_IDX_31, 3, OAM_X_FLIP
frame SPRITE_ANIM_FRAME_IDX_30, 3
frame SPRITE_ANIM_FRAME_IDX_31, 3
frame SPRITE_ANIM_FRAME_IDX_30, 3
frame SPRITE_ANIM_FRAME_IDX_31, 67
frame SPRITE_ANIM_FRAME_IDX_31, 3, OAM_X_FLIP
frame SPRITE_ANIM_FRAME_IDX_30, 3
frame SPRITE_ANIM_FRAME_IDX_31, 3
frame SPRITE_ANIM_FRAME_IDX_30, 3
frame SPRITE_ANIM_FRAME_IDX_31, 67
frame SPRITE_ANIM_FRAME_IDX_31, 3, OAM_X_FLIP
endanim
.Frameset_30:
frame SPRITE_ANIM_FRAME_IDX_30, 3
frame SPRITE_ANIM_FRAME_IDX_31, 3
frame SPRITE_ANIM_FRAME_IDX_30, 3
frame SPRITE_ANIM_FRAME_IDX_31, 67
frame SPRITE_ANIM_FRAME_IDX_31, 3, OAM_X_FLIP
frame SPRITE_ANIM_FRAME_IDX_30, 3
frame SPRITE_ANIM_FRAME_IDX_31, 3
frame SPRITE_ANIM_FRAME_IDX_30, 3
frame SPRITE_ANIM_FRAME_IDX_31, 67
frame SPRITE_ANIM_FRAME_IDX_31, 3, OAM_X_FLIP
frame SPRITE_ANIM_FRAME_IDX_30, 3
frame SPRITE_ANIM_FRAME_IDX_31, 3
frame SPRITE_ANIM_FRAME_IDX_30, 3
frame SPRITE_ANIM_FRAME_IDX_31, 67
frame SPRITE_ANIM_FRAME_IDX_31, 3, OAM_X_FLIP
frame SPRITE_ANIM_FRAME_IDX_32, 3
frame SPRITE_ANIM_FRAME_IDX_33, 3
frame SPRITE_ANIM_FRAME_IDX_34, 3
@ -453,21 +453,21 @@ SpriteAnimFrameData: ; 8d6e6
delanim
.Frameset_3a:
frame SPRITE_ANIM_FRAME_IDX_76, 67
frame SPRITE_ANIM_FRAME_IDX_77, 67
frame SPRITE_ANIM_FRAME_IDX_78, 71
frame SPRITE_ANIM_FRAME_IDX_76, 3, OAM_X_FLIP
frame SPRITE_ANIM_FRAME_IDX_77, 3, OAM_X_FLIP
frame SPRITE_ANIM_FRAME_IDX_78, 7, OAM_X_FLIP
delanim
.Frameset_3b:
frame SPRITE_ANIM_FRAME_IDX_76, 131
frame SPRITE_ANIM_FRAME_IDX_77, 131
frame SPRITE_ANIM_FRAME_IDX_78, 135
frame SPRITE_ANIM_FRAME_IDX_76, 3, OAM_Y_FLIP
frame SPRITE_ANIM_FRAME_IDX_77, 3, OAM_Y_FLIP
frame SPRITE_ANIM_FRAME_IDX_78, 7, OAM_Y_FLIP
delanim
.Frameset_3c:
frame SPRITE_ANIM_FRAME_IDX_76, 195
frame SPRITE_ANIM_FRAME_IDX_77, 195
frame SPRITE_ANIM_FRAME_IDX_78, 199
frame SPRITE_ANIM_FRAME_IDX_76, 3, OAM_X_FLIP, OAM_Y_FLIP
frame SPRITE_ANIM_FRAME_IDX_77, 3, OAM_X_FLIP, OAM_Y_FLIP
frame SPRITE_ANIM_FRAME_IDX_78, 7, OAM_X_FLIP, OAM_Y_FLIP
delanim
.Frameset_3d:
@ -492,8 +492,8 @@ SpriteAnimFrameData: ; 8d6e6
endanim
.Frameset_41:
frame SPRITE_ANIM_FRAME_IDX_7F, 72
frame SPRITE_ANIM_FRAME_IDX_80, 72
frame SPRITE_ANIM_FRAME_IDX_7F, 8, OAM_X_FLIP
frame SPRITE_ANIM_FRAME_IDX_80, 8, OAM_X_FLIP
endanim
; 8d94d

9
macros.asm
View File

@ -140,7 +140,14 @@ lda_coord: MACRO
; pic animations
frame: MACRO
db \1
db \2
x = \2
IF _NARG > 2
rept _NARG +- 2
x = x | (1 << (\3 + 1))
shift
endr
endc
db x
ENDM
setrepeat: MACRO
db $fe