pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-04-09 05:44:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

dorepeat -> dowait for oam animations

Browse Source 
Having the pic animation macros be the same as the oam animation macros
isn't really turning out so well... I wonder if we should split them up
eventually.
This commit is contained in:
mid-kid
2019-02-15 02:54:35 +01:00
parent d9d688df4e
commit 469c51d086
3 changed files with 74 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
data/battle_anims/framesets.asm
View File

@@ -230,11 +230,11 @@ BattleAnimFrameData:
frame BATTLEANIMOAMSET_4C, 2 frame BATTLEANIMOAMSET_4C, 2
frame BATTLEANIMOAMSET_4D, 4 frame BATTLEANIMOAMSET_4D, 4
frame BATTLEANIMOAMSET_4E, 2 frame BATTLEANIMOAMSET_4E, 2
dorepeat 2 dowait 2
frame BATTLEANIMOAMSET_4E, 2 frame BATTLEANIMOAMSET_4E, 2
dorepeat 2 dowait 2
frame BATTLEANIMOAMSET_4E, 2 frame BATTLEANIMOAMSET_4E, 2
dorepeat 2 dowait 2
frame BATTLEANIMOAMSET_4E, 2 frame BATTLEANIMOAMSET_4E, 2
delanim delanim
@@ -243,11 +243,11 @@ BattleAnimFrameData:
frame BATTLEANIMOAMSET_4C, 2, OAM_X_FLIP frame BATTLEANIMOAMSET_4C, 2, OAM_X_FLIP
frame BATTLEANIMOAMSET_4D, 4, OAM_X_FLIP frame BATTLEANIMOAMSET_4D, 4, OAM_X_FLIP
frame BATTLEANIMOAMSET_4E, 2, OAM_X_FLIP frame BATTLEANIMOAMSET_4E, 2, OAM_X_FLIP
dorepeat 2 dowait 2
frame BATTLEANIMOAMSET_4E, 2, OAM_X_FLIP frame BATTLEANIMOAMSET_4E, 2, OAM_X_FLIP
dorepeat 2 dowait 2
frame BATTLEANIMOAMSET_4E, 2, OAM_X_FLIP frame BATTLEANIMOAMSET_4E, 2, OAM_X_FLIP
dorepeat 2 dowait 2
frame BATTLEANIMOAMSET_4E, 2, OAM_X_FLIP frame BATTLEANIMOAMSET_4E, 2, OAM_X_FLIP
delanim delanim
@@ -256,11 +256,11 @@ BattleAnimFrameData:
frame BATTLEANIMOAMSET_4C, 2, OAM_X_FLIP, OAM_Y_FLIP frame BATTLEANIMOAMSET_4C, 2, OAM_X_FLIP, OAM_Y_FLIP
frame BATTLEANIMOAMSET_4D, 4, OAM_X_FLIP, OAM_Y_FLIP frame BATTLEANIMOAMSET_4D, 4, OAM_X_FLIP, OAM_Y_FLIP
frame BATTLEANIMOAMSET_4E, 2, OAM_X_FLIP, OAM_Y_FLIP frame BATTLEANIMOAMSET_4E, 2, OAM_X_FLIP, OAM_Y_FLIP
dorepeat 2 dowait 2
frame BATTLEANIMOAMSET_4E, 2, OAM_X_FLIP, OAM_Y_FLIP frame BATTLEANIMOAMSET_4E, 2, OAM_X_FLIP, OAM_Y_FLIP
dorepeat 2 dowait 2
frame BATTLEANIMOAMSET_4E, 2, OAM_X_FLIP, OAM_Y_FLIP frame BATTLEANIMOAMSET_4E, 2, OAM_X_FLIP, OAM_Y_FLIP
dorepeat 2 dowait 2
frame BATTLEANIMOAMSET_4E, 2, OAM_X_FLIP, OAM_Y_FLIP frame BATTLEANIMOAMSET_4E, 2, OAM_X_FLIP, OAM_Y_FLIP
delanim delanim
@@ -272,11 +272,11 @@ BattleAnimFrameData:
frame BATTLEANIMOAMSET_50, 1 frame BATTLEANIMOAMSET_50, 1
frame BATTLEANIMOAMSET_51, 1 frame BATTLEANIMOAMSET_51, 1
frame BATTLEANIMOAMSET_52, 2 frame BATTLEANIMOAMSET_52, 2
dorepeat 2 dowait 2
frame BATTLEANIMOAMSET_52, 2 frame BATTLEANIMOAMSET_52, 2
dorepeat 2 dowait 2
frame BATTLEANIMOAMSET_52, 2 frame BATTLEANIMOAMSET_52, 2
dorepeat 2 dowait 2
frame BATTLEANIMOAMSET_52, 2 frame BATTLEANIMOAMSET_52, 2
delanim delanim
@@ -288,11 +288,11 @@ BattleAnimFrameData:
frame BATTLEANIMOAMSET_50, 1, OAM_X_FLIP frame BATTLEANIMOAMSET_50, 1, OAM_X_FLIP
frame BATTLEANIMOAMSET_51, 1, OAM_X_FLIP frame BATTLEANIMOAMSET_51, 1, OAM_X_FLIP
frame BATTLEANIMOAMSET_52, 2, OAM_X_FLIP frame BATTLEANIMOAMSET_52, 2, OAM_X_FLIP
dorepeat 2 dowait 2
frame BATTLEANIMOAMSET_52, 2, OAM_X_FLIP frame BATTLEANIMOAMSET_52, 2, OAM_X_FLIP
dorepeat 2 dowait 2
frame BATTLEANIMOAMSET_52, 2, OAM_X_FLIP frame BATTLEANIMOAMSET_52, 2, OAM_X_FLIP
dorepeat 2 dowait 2
frame BATTLEANIMOAMSET_52, 2, OAM_X_FLIP frame BATTLEANIMOAMSET_52, 2, OAM_X_FLIP
delanim delanim
@@ -368,13 +368,13 @@ BattleAnimFrameData:
frame BATTLEANIMOAMSET_10, 3 frame BATTLEANIMOAMSET_10, 3
frame BATTLEANIMOAMSET_0F, 3 frame BATTLEANIMOAMSET_0F, 3
frame BATTLEANIMOAMSET_12, 1 frame BATTLEANIMOAMSET_12, 1
dorepeat 1 dowait 1
frame BATTLEANIMOAMSET_12, 1 frame BATTLEANIMOAMSET_12, 1
dorepeat 1 dowait 1
frame BATTLEANIMOAMSET_12, 1 frame BATTLEANIMOAMSET_12, 1
dorepeat 1 dowait 1
frame BATTLEANIMOAMSET_12, 1 frame BATTLEANIMOAMSET_12, 1
dorepeat 1 dowait 1
frame BATTLEANIMOAMSET_12, 3 frame BATTLEANIMOAMSET_12, 3
delanim delanim
@@ -535,13 +535,13 @@ BattleAnimFrameData:
frame BATTLEANIMOAMSET_34, 32 frame BATTLEANIMOAMSET_34, 32
frame BATTLEANIMOAMSET_35, 32 ; fallthrough frame BATTLEANIMOAMSET_35, 32 ; fallthrough
.Frameset_2f: .Frameset_2f:
dorepeat 2 dowait 2
frame BATTLEANIMOAMSET_35, 4 frame BATTLEANIMOAMSET_35, 4
dorepeat 2 dowait 2
frame BATTLEANIMOAMSET_35, 4 frame BATTLEANIMOAMSET_35, 4
dorepeat 2 dowait 2
frame BATTLEANIMOAMSET_35, 4 frame BATTLEANIMOAMSET_35, 4
dorepeat 2 dowait 2
frame BATTLEANIMOAMSET_35, 4 frame BATTLEANIMOAMSET_35, 4
delanim delanim
@@ -579,13 +579,13 @@ BattleAnimFrameData:
.Frameset_35: .Frameset_35:
frame BATTLEANIMOAMSET_40, 2 frame BATTLEANIMOAMSET_40, 2
dorepeat 2 dowait 2
frame BATTLEANIMOAMSET_40, 2 frame BATTLEANIMOAMSET_40, 2
dorepeat 2 dowait 2
frame BATTLEANIMOAMSET_41, 2 frame BATTLEANIMOAMSET_41, 2
dorepeat 2 dowait 2
frame BATTLEANIMOAMSET_41, 2 frame BATTLEANIMOAMSET_41, 2
dorepeat 2 dowait 2
dorestart dorestart
.Frameset_36: .Frameset_36:
@@ -597,7 +597,7 @@ BattleAnimFrameData:
.Frameset_37: .Frameset_37:
frame BATTLEANIMOAMSET_19, 2 frame BATTLEANIMOAMSET_19, 2
dorepeat 2 dowait 2
dorestart dorestart
.Frameset_38: .Frameset_38:
@@ -607,7 +607,7 @@ BattleAnimFrameData:
.Frameset_39: .Frameset_39:
frame BATTLEANIMOAMSET_18, 2 frame BATTLEANIMOAMSET_18, 2
dorepeat 2 dowait 2
dorestart dorestart
.Frameset_3a: .Frameset_3a:
@@ -639,15 +639,15 @@ BattleAnimFrameData:
endanim endanim
.Frameset_44: .Frameset_44:
dorepeat 20 dowait 20
frame BATTLEANIMOAMSET_55, 40 frame BATTLEANIMOAMSET_55, 40
frame BATTLEANIMOAMSET_54, 40 frame BATTLEANIMOAMSET_54, 40
frame BATTLEANIMOAMSET_53, 20 frame BATTLEANIMOAMSET_53, 20
dorepeat 4 dowait 4
frame BATTLEANIMOAMSET_53, 4 frame BATTLEANIMOAMSET_53, 4
dorepeat 4 dowait 4
frame BATTLEANIMOAMSET_53, 4 frame BATTLEANIMOAMSET_53, 4
dorepeat 4 dowait 4
frame BATTLEANIMOAMSET_53, 4 frame BATTLEANIMOAMSET_53, 4
delanim delanim
@@ -658,11 +658,11 @@ BattleAnimFrameData:
delanim delanim
.Frameset_45: .Frameset_45:
dorepeat 0 dowait 0
frame BATTLEANIMOAMSET_14, 0 frame BATTLEANIMOAMSET_14, 0
frame BATTLEANIMOAMSET_15, 0 frame BATTLEANIMOAMSET_15, 0
frame BATTLEANIMOAMSET_14, 0, OAM_X_FLIP frame BATTLEANIMOAMSET_14, 0, OAM_X_FLIP
dorepeat 0 dowait 0
frame BATTLEANIMOAMSET_16, 0, OAM_X_FLIP frame BATTLEANIMOAMSET_16, 0, OAM_X_FLIP
frame BATTLEANIMOAMSET_15, 0 frame BATTLEANIMOAMSET_15, 0
frame BATTLEANIMOAMSET_16, 0 frame BATTLEANIMOAMSET_16, 0
@@ -867,7 +867,7 @@ BattleAnimFrameData:
delanim delanim
.Frameset_68: .Frameset_68:
dorepeat 15 dowait 15
frame BATTLEANIMOAMSET_84, 15 frame BATTLEANIMOAMSET_84, 15
frame BATTLEANIMOAMSET_85, 15 frame BATTLEANIMOAMSET_85, 15
frame BATTLEANIMOAMSET_29, 15 frame BATTLEANIMOAMSET_29, 15
@@ -970,11 +970,11 @@ BattleAnimFrameData:
frame BATTLEANIMOAMSET_9C, 2 frame BATTLEANIMOAMSET_9C, 2
frame BATTLEANIMOAMSET_9D, 2 frame BATTLEANIMOAMSET_9D, 2
frame BATTLEANIMOAMSET_9E, 8 frame BATTLEANIMOAMSET_9E, 8
dorepeat 2 dowait 2
frame BATTLEANIMOAMSET_9E, 2 frame BATTLEANIMOAMSET_9E, 2
dorepeat 2 dowait 2
frame BATTLEANIMOAMSET_9E, 2 frame BATTLEANIMOAMSET_9E, 2
dorepeat 2 dowait 2
frame BATTLEANIMOAMSET_9E, 2 frame BATTLEANIMOAMSET_9E, 2
delanim delanim
@@ -1160,11 +1160,11 @@ BattleAnimFrameData:
frame BATTLEANIMOAMSET_50, 1 frame BATTLEANIMOAMSET_50, 1
frame BATTLEANIMOAMSET_51, 1 frame BATTLEANIMOAMSET_51, 1
frame BATTLEANIMOAMSET_52, 2 frame BATTLEANIMOAMSET_52, 2
dorepeat 2 dowait 2
frame BATTLEANIMOAMSET_52, 2 frame BATTLEANIMOAMSET_52, 2
dorepeat 2 dowait 2
frame BATTLEANIMOAMSET_52, 2 frame BATTLEANIMOAMSET_52, 2
dorepeat 2 dowait 2
frame BATTLEANIMOAMSET_52, 2 frame BATTLEANIMOAMSET_52, 2
delanim delanim
@@ -1178,11 +1178,11 @@ BattleAnimFrameData:
frame BATTLEANIMOAMSET_50, 1, OAM_X_FLIP, OAM_Y_FLIP frame BATTLEANIMOAMSET_50, 1, OAM_X_FLIP, OAM_Y_FLIP
frame BATTLEANIMOAMSET_51, 1, OAM_X_FLIP, OAM_Y_FLIP frame BATTLEANIMOAMSET_51, 1, OAM_X_FLIP, OAM_Y_FLIP
frame BATTLEANIMOAMSET_52, 2, OAM_X_FLIP, OAM_Y_FLIP frame BATTLEANIMOAMSET_52, 2, OAM_X_FLIP, OAM_Y_FLIP
dorepeat 2 dowait 2
frame BATTLEANIMOAMSET_52, 2, OAM_X_FLIP, OAM_Y_FLIP frame BATTLEANIMOAMSET_52, 2, OAM_X_FLIP, OAM_Y_FLIP
dorepeat 2 dowait 2
frame BATTLEANIMOAMSET_52, 2, OAM_X_FLIP, OAM_Y_FLIP frame BATTLEANIMOAMSET_52, 2, OAM_X_FLIP, OAM_Y_FLIP
dorepeat 2 dowait 2
frame BATTLEANIMOAMSET_52, 2, OAM_X_FLIP, OAM_Y_FLIP frame BATTLEANIMOAMSET_52, 2, OAM_X_FLIP, OAM_Y_FLIP
delanim delanim

14
data/sprite_anims/framesets.asm
View File

@@ -129,12 +129,12 @@ SpriteAnimFrameData:
.Frameset_TextEntryCursor: .Frameset_TextEntryCursor:
frame SPRITE_ANIM_OAMSET_TEXT_ENTRY_CURSOR, 1 frame SPRITE_ANIM_OAMSET_TEXT_ENTRY_CURSOR, 1
dorepeat 1 dowait 1
dorestart dorestart
.Frameset_TextEntryCursorBig: .Frameset_TextEntryCursorBig:
frame SPRITE_ANIM_OAMSET_TEXT_ENTRY_CURSOR_BIG, 1 frame SPRITE_ANIM_OAMSET_TEXT_ENTRY_CURSOR_BIG, 1
dorepeat 1 dowait 1
dorestart dorestart
.Frameset_GameFreakLogo: .Frameset_GameFreakLogo:
@@ -285,11 +285,11 @@ SpriteAnimFrameData:
; unused ; unused
frame SPRITE_ANIM_OAMSET_UNUSED_4E, 3 frame SPRITE_ANIM_OAMSET_UNUSED_4E, 3
dorepeat 3 dowait 3
dorestart dorestart
.Frameset_Unused1C: .Frameset_Unused1C:
dorepeat 32 dowait 32
endanim endanim
.Frameset_Leaf: .Frameset_Leaf:
@@ -299,9 +299,9 @@ SpriteAnimFrameData:
.Frameset_CutTree: .Frameset_CutTree:
frame SPRITE_ANIM_OAMSET_TREE_1, 2 frame SPRITE_ANIM_OAMSET_TREE_1, 2
frame SPRITE_ANIM_OAMSET_CUT_TREE_2, 16 frame SPRITE_ANIM_OAMSET_CUT_TREE_2, 16
dorepeat 1 dowait 1
frame SPRITE_ANIM_OAMSET_CUT_TREE_3, 1 frame SPRITE_ANIM_OAMSET_CUT_TREE_3, 1
dorepeat 1 dowait 1
frame SPRITE_ANIM_OAMSET_CUT_TREE_4, 1 frame SPRITE_ANIM_OAMSET_CUT_TREE_4, 1
delanim delanim
@@ -483,7 +483,7 @@ SpriteAnimFrameData:
endanim endanim
.Frameset_IntroUnownF: .Frameset_IntroUnownF:
dorepeat 0 dowait 0
endanim endanim
.Frameset_CelebiLeft: .Frameset_CelebiLeft:

35
macros/scripts/gfx_anims.asm
View File

@@ -15,20 +15,20 @@ ENDM
enum_start $fc enum_start $fc
enum delanim_command ; $fc enum delanim_command ; $fc
delanim: MACRO ; used for oam delanim: MACRO
; Removes the object from the screen, as opposed to `endanim` which just stops all motion
db delanim_command db delanim_command
ENDM ENDM
enum dorepeat_command ; $fd enum dowait_command ; $fd
dorepeat: MACRO dowait: MACRO
db dorepeat_command db dowait_command
db \1 ; # db \1 ; frames
ENDM ENDM
enum setrepeat_command ; $fe enum dorestart_command ; $fe
setrepeat: MACRO dorestart: MACRO
db setrepeat_command db dorestart_command
db \1 ; #
ENDM ENDM
enum endanim_command ; $ff enum endanim_command ; $ff
@@ -36,9 +36,18 @@ endanim: MACRO
db endanim_command db endanim_command
ENDM ENDM
__enum__ = $fe
enum dorestart_command ; $fe ; Used for pic animations
dorestart: MACRO ; used for oam __enum__ = $fd
db dorestart_command
enum dorepeat_command ; $fd
dorepeat: MACRO
db dorepeat_command
db \1 ; command offset to jump to
ENDM
enum setrepeat_command ; $fe
setrepeat: MACRO
db setrepeat_command
db \1 ; amount of times to repeat
ENDM ENDM