summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
Diffstat (limited to 'data')
-rw-r--r--data/battle_anims/framesets.asm90
-rw-r--r--data/battle_anims/oam.asm2
-rw-r--r--data/moves/animations.asm2
-rw-r--r--data/sprite_anims/framesets.asm14
-rw-r--r--data/sprite_anims/oam.asm2
5 files changed, 55 insertions, 55 deletions
diff --git a/data/battle_anims/framesets.asm b/data/battle_anims/framesets.asm
index e0fe57007..a5641570c 100644
--- a/data/battle_anims/framesets.asm
+++ b/data/battle_anims/framesets.asm
@@ -230,11 +230,11 @@ BattleAnimFrameData:
frame BATTLEANIMOAMSET_4C, 2
frame BATTLEANIMOAMSET_4D, 4
frame BATTLEANIMOAMSET_4E, 2
- dorepeat 2
+ dowait 2
frame BATTLEANIMOAMSET_4E, 2
- dorepeat 2
+ dowait 2
frame BATTLEANIMOAMSET_4E, 2
- dorepeat 2
+ dowait 2
frame BATTLEANIMOAMSET_4E, 2
delanim
@@ -243,11 +243,11 @@ BattleAnimFrameData:
frame BATTLEANIMOAMSET_4C, 2, OAM_X_FLIP
frame BATTLEANIMOAMSET_4D, 4, OAM_X_FLIP
frame BATTLEANIMOAMSET_4E, 2, OAM_X_FLIP
- dorepeat 2
+ dowait 2
frame BATTLEANIMOAMSET_4E, 2, OAM_X_FLIP
- dorepeat 2
+ dowait 2
frame BATTLEANIMOAMSET_4E, 2, OAM_X_FLIP
- dorepeat 2
+ dowait 2
frame BATTLEANIMOAMSET_4E, 2, OAM_X_FLIP
delanim
@@ -256,11 +256,11 @@ BattleAnimFrameData:
frame BATTLEANIMOAMSET_4C, 2, 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
- dorepeat 2
+ dowait 2
frame BATTLEANIMOAMSET_4E, 2, OAM_X_FLIP, OAM_Y_FLIP
- dorepeat 2
+ dowait 2
frame BATTLEANIMOAMSET_4E, 2, OAM_X_FLIP, OAM_Y_FLIP
- dorepeat 2
+ dowait 2
frame BATTLEANIMOAMSET_4E, 2, OAM_X_FLIP, OAM_Y_FLIP
delanim
@@ -272,11 +272,11 @@ BattleAnimFrameData:
frame BATTLEANIMOAMSET_50, 1
frame BATTLEANIMOAMSET_51, 1
frame BATTLEANIMOAMSET_52, 2
- dorepeat 2
+ dowait 2
frame BATTLEANIMOAMSET_52, 2
- dorepeat 2
+ dowait 2
frame BATTLEANIMOAMSET_52, 2
- dorepeat 2
+ dowait 2
frame BATTLEANIMOAMSET_52, 2
delanim
@@ -288,11 +288,11 @@ BattleAnimFrameData:
frame BATTLEANIMOAMSET_50, 1, OAM_X_FLIP
frame BATTLEANIMOAMSET_51, 1, OAM_X_FLIP
frame BATTLEANIMOAMSET_52, 2, OAM_X_FLIP
- dorepeat 2
+ dowait 2
frame BATTLEANIMOAMSET_52, 2, OAM_X_FLIP
- dorepeat 2
+ dowait 2
frame BATTLEANIMOAMSET_52, 2, OAM_X_FLIP
- dorepeat 2
+ dowait 2
frame BATTLEANIMOAMSET_52, 2, OAM_X_FLIP
delanim
@@ -368,13 +368,13 @@ BattleAnimFrameData:
frame BATTLEANIMOAMSET_10, 3
frame BATTLEANIMOAMSET_0F, 3
frame BATTLEANIMOAMSET_12, 1
- dorepeat 1
+ dowait 1
frame BATTLEANIMOAMSET_12, 1
- dorepeat 1
+ dowait 1
frame BATTLEANIMOAMSET_12, 1
- dorepeat 1
+ dowait 1
frame BATTLEANIMOAMSET_12, 1
- dorepeat 1
+ dowait 1
frame BATTLEANIMOAMSET_12, 3
delanim
@@ -535,13 +535,13 @@ BattleAnimFrameData:
frame BATTLEANIMOAMSET_34, 32
frame BATTLEANIMOAMSET_35, 32 ; fallthrough
.Frameset_2f:
- dorepeat 2
+ dowait 2
frame BATTLEANIMOAMSET_35, 4
- dorepeat 2
+ dowait 2
frame BATTLEANIMOAMSET_35, 4
- dorepeat 2
+ dowait 2
frame BATTLEANIMOAMSET_35, 4
- dorepeat 2
+ dowait 2
frame BATTLEANIMOAMSET_35, 4
delanim
@@ -579,13 +579,13 @@ BattleAnimFrameData:
.Frameset_35:
frame BATTLEANIMOAMSET_40, 2
- dorepeat 2
+ dowait 2
frame BATTLEANIMOAMSET_40, 2
- dorepeat 2
+ dowait 2
frame BATTLEANIMOAMSET_41, 2
- dorepeat 2
+ dowait 2
frame BATTLEANIMOAMSET_41, 2
- dorepeat 2
+ dowait 2
dorestart
.Frameset_36:
@@ -597,7 +597,7 @@ BattleAnimFrameData:
.Frameset_37:
frame BATTLEANIMOAMSET_19, 2
- dorepeat 2
+ dowait 2
dorestart
.Frameset_38:
@@ -607,7 +607,7 @@ BattleAnimFrameData:
.Frameset_39:
frame BATTLEANIMOAMSET_18, 2
- dorepeat 2
+ dowait 2
dorestart
.Frameset_3a:
@@ -639,15 +639,15 @@ BattleAnimFrameData:
endanim
.Frameset_44:
- dorepeat 20
+ dowait 20
frame BATTLEANIMOAMSET_55, 40
frame BATTLEANIMOAMSET_54, 40
frame BATTLEANIMOAMSET_53, 20
- dorepeat 4
+ dowait 4
frame BATTLEANIMOAMSET_53, 4
- dorepeat 4
+ dowait 4
frame BATTLEANIMOAMSET_53, 4
- dorepeat 4
+ dowait 4
frame BATTLEANIMOAMSET_53, 4
delanim
@@ -658,11 +658,11 @@ BattleAnimFrameData:
delanim
.Frameset_45:
- dorepeat 0
+ dowait 0
frame BATTLEANIMOAMSET_14, 0
frame BATTLEANIMOAMSET_15, 0
frame BATTLEANIMOAMSET_14, 0, OAM_X_FLIP
- dorepeat 0
+ dowait 0
frame BATTLEANIMOAMSET_16, 0, OAM_X_FLIP
frame BATTLEANIMOAMSET_15, 0
frame BATTLEANIMOAMSET_16, 0
@@ -867,7 +867,7 @@ BattleAnimFrameData:
delanim
.Frameset_68:
- dorepeat 15
+ dowait 15
frame BATTLEANIMOAMSET_84, 15
frame BATTLEANIMOAMSET_85, 15
frame BATTLEANIMOAMSET_29, 15
@@ -970,11 +970,11 @@ BattleAnimFrameData:
frame BATTLEANIMOAMSET_9C, 2
frame BATTLEANIMOAMSET_9D, 2
frame BATTLEANIMOAMSET_9E, 8
- dorepeat 2
+ dowait 2
frame BATTLEANIMOAMSET_9E, 2
- dorepeat 2
+ dowait 2
frame BATTLEANIMOAMSET_9E, 2
- dorepeat 2
+ dowait 2
frame BATTLEANIMOAMSET_9E, 2
delanim
@@ -1160,11 +1160,11 @@ BattleAnimFrameData:
frame BATTLEANIMOAMSET_50, 1
frame BATTLEANIMOAMSET_51, 1
frame BATTLEANIMOAMSET_52, 2
- dorepeat 2
+ dowait 2
frame BATTLEANIMOAMSET_52, 2
- dorepeat 2
+ dowait 2
frame BATTLEANIMOAMSET_52, 2
- dorepeat 2
+ dowait 2
frame BATTLEANIMOAMSET_52, 2
delanim
@@ -1178,11 +1178,11 @@ BattleAnimFrameData:
frame BATTLEANIMOAMSET_50, 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
- dorepeat 2
+ dowait 2
frame BATTLEANIMOAMSET_52, 2, OAM_X_FLIP, OAM_Y_FLIP
- dorepeat 2
+ dowait 2
frame BATTLEANIMOAMSET_52, 2, OAM_X_FLIP, OAM_Y_FLIP
- dorepeat 2
+ dowait 2
frame BATTLEANIMOAMSET_52, 2, OAM_X_FLIP, OAM_Y_FLIP
delanim
diff --git a/data/battle_anims/oam.asm b/data/battle_anims/oam.asm
index 1beca2937..42c9c8295 100644
--- a/data/battle_anims/oam.asm
+++ b/data/battle_anims/oam.asm
@@ -1,6 +1,6 @@
BattleAnimOAMData:
; entries correspond to BATTLEANIMOAMSET_* constants
- ; vtile offset, length, pointer
+ ; vtile offset, data length, data pointer
dbbw $00, 16, .OAMData_00 ; BATTLEANIMOAMSET_00
dbbw $04, 9, .OAMData_01 ; BATTLEANIMOAMSET_01
dbbw $08, 4, .OAMData_02 ; BATTLEANIMOAMSET_02
diff --git a/data/moves/animations.asm b/data/moves/animations.asm
index 0902c143a..3b069efed 100644
--- a/data/moves/animations.asm
+++ b/data/moves/animations.asm
@@ -398,7 +398,7 @@ BattleAnim_ThrowPokeBall:
anim_jump .Loop
.Click:
- anim_clearsprites
+ anim_keepsprites
anim_ret
.BreakFree:
diff --git a/data/sprite_anims/framesets.asm b/data/sprite_anims/framesets.asm
index 666f2b2e2..549b4b637 100644
--- a/data/sprite_anims/framesets.asm
+++ b/data/sprite_anims/framesets.asm
@@ -129,12 +129,12 @@ SpriteAnimFrameData:
.Frameset_TextEntryCursor:
frame SPRITE_ANIM_OAMSET_TEXT_ENTRY_CURSOR, 1
- dorepeat 1
+ dowait 1
dorestart
.Frameset_TextEntryCursorBig:
frame SPRITE_ANIM_OAMSET_TEXT_ENTRY_CURSOR_BIG, 1
- dorepeat 1
+ dowait 1
dorestart
.Frameset_GameFreakLogo:
@@ -285,11 +285,11 @@ SpriteAnimFrameData:
; unused
frame SPRITE_ANIM_OAMSET_UNUSED_4E, 3
- dorepeat 3
+ dowait 3
dorestart
.Frameset_Unused1C:
- dorepeat 32
+ dowait 32
endanim
.Frameset_Leaf:
@@ -299,9 +299,9 @@ SpriteAnimFrameData:
.Frameset_CutTree:
frame SPRITE_ANIM_OAMSET_TREE_1, 2
frame SPRITE_ANIM_OAMSET_CUT_TREE_2, 16
- dorepeat 1
+ dowait 1
frame SPRITE_ANIM_OAMSET_CUT_TREE_3, 1
- dorepeat 1
+ dowait 1
frame SPRITE_ANIM_OAMSET_CUT_TREE_4, 1
delanim
@@ -483,7 +483,7 @@ SpriteAnimFrameData:
endanim
.Frameset_IntroUnownF:
- dorepeat 0
+ dowait 0
endanim
.Frameset_CelebiLeft:
diff --git a/data/sprite_anims/oam.asm b/data/sprite_anims/oam.asm
index 4fa153504..ece914e0c 100644
--- a/data/sprite_anims/oam.asm
+++ b/data/sprite_anims/oam.asm
@@ -1,6 +1,6 @@
SpriteAnimOAMData:
; entries correspond to SPRITE_ANIM_OAMSET_* constants
- ; vtile offset, pointer
+ ; vtile offset, data pointer
dbw $00, .OAMData_RedWalk ; SPRITE_ANIM_OAMSET_RED_WALK_1
dbw $04, .OAMData_RedWalk ; SPRITE_ANIM_OAMSET_RED_WALK_2
dbw $4c, .OAMData_1x1_Palette0 ; SPRITE_ANIM_OAMSET_GS_INTRO_BUBBLE_1
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-06 10:13:59 +0000