summaryrefslogtreecommitdiff
path: root/data/animations/enemy
diff options
context:
space:
mode:
authoroctorock <79596758+octorock@users.noreply.github.com>2021-10-24 11:41:27 +0200
committeroctorock <79596758+octorock@users.noreply.github.com>2021-10-24 11:41:27 +0200
commitfdfd43d0d31feeda3082227bcfae7d32abc663f6 (patch)
tree0d853b60ad7a72d6076410f676b3aeb897ad4b06 /data/animations/enemy
parenta19a870382befa354caa24148733ea335fcc692c (diff)
Extract animations
Diffstat (limited to 'data/animations/enemy')
-rw-r--r--data/animations/enemy/acroBandits.s90
-rw-r--r--data/animations/enemy/armos.s48
-rw-r--r--data/animations/enemy/ballChainSoldier.s204
-rw-r--r--data/animations/enemy/beetle.s42
-rw-r--r--data/animations/enemy/bobomb.s60
-rw-r--r--data/animations/enemy/bombPeahat.s24
-rw-r--r--data/animations/enemy/bombarossa.s6
-rw-r--r--data/animations/enemy/bowMoblin.s96
-rw-r--r--data/animations/enemy/businessScrub.s156
-rw-r--r--data/animations/enemy/chaser.s18
-rw-r--r--data/animations/enemy/chuchu.s60
-rw-r--r--data/animations/enemy/chuchuBoss.s168
-rw-r--r--data/animations/enemy/cloudPiranha.s72
-rw-r--r--data/animations/enemy/crow.s36
-rw-r--r--data/animations/enemy/cuccoAggr.s30
-rw-r--r--data/animations/enemy/curtain.s24
-rw-r--r--data/animations/enemy/darkNut.s456
-rw-r--r--data/animations/enemy/doorMimic.s48
-rw-r--r--data/animations/enemy/enemy62.s384
-rw-r--r--data/animations/enemy/eyegore.s92
-rw-r--r--data/animations/enemy/fallingBoulder.s12
-rw-r--r--data/animations/enemy/fireballGuy.s12
-rw-r--r--data/animations/enemy/flyingSkull.s6
-rw-r--r--data/animations/enemy/ghini.s60
-rw-r--r--data/animations/enemy/gibdo.s120
-rw-r--r--data/animations/enemy/gleerok.s810
-rw-r--r--data/animations/enemy/gyorgChild.s96
-rw-r--r--data/animations/enemy/gyorgFemaleEye.s144
-rw-r--r--data/animations/enemy/gyorgFemaleMouth.s24
-rw-r--r--data/animations/enemy/gyorgMale.s12
-rw-r--r--data/animations/enemy/helmasaur.s72
-rw-r--r--data/animations/enemy/keaton.s72
-rw-r--r--data/animations/enemy/keese.s12
-rw-r--r--data/animations/enemy/lakitu.s90
-rw-r--r--data/animations/enemy/leever.s18
-rw-r--r--data/animations/enemy/likeLike.s18
-rw-r--r--data/animations/enemy/madderpillar.s168
-rw-r--r--data/animations/enemy/mazaalBracelet.s150
-rw-r--r--data/animations/enemy/mazaalHand.s60
-rw-r--r--data/animations/enemy/mazaalHead.s42
-rw-r--r--data/animations/enemy/mazaalMacro.s18
-rw-r--r--data/animations/enemy/moldworm.s144
-rw-r--r--data/animations/enemy/mulldozer.s72
-rw-r--r--data/animations/enemy/octorok.s48
-rw-r--r--data/animations/enemy/octorokBoss.s84
-rw-r--r--data/animations/enemy/peahat.s36
-rw-r--r--data/animations/enemy/pesto.s48
-rw-r--r--data/animations/enemy/puffstool.s54
-rw-r--r--data/animations/enemy/rockChuchu.s18
-rw-r--r--data/animations/enemy/rollobite.s144
-rw-r--r--data/animations/enemy/rope.s48
-rw-r--r--data/animations/enemy/rupeeLike.s48
-rw-r--r--data/animations/enemy/scissorsBeetle.s120
-rw-r--r--data/animations/enemy/slime.s66
-rw-r--r--data/animations/enemy/sluggula.s42
-rw-r--r--data/animations/enemy/spark.s6
-rw-r--r--data/animations/enemy/spearMoblin.s96
-rw-r--r--data/animations/enemy/spikedBeetle.s60
-rw-r--r--data/animations/enemy/spinyBeetle.s30
-rw-r--r--data/animations/enemy/spinyChuchu.s42
-rw-r--r--data/animations/enemy/stalfos.s216
-rw-r--r--data/animations/enemy/tektite.s30
-rw-r--r--data/animations/enemy/vaatiArm.s126
-rw-r--r--data/animations/enemy/vaatiBall.s18
-rw-r--r--data/animations/enemy/vaatiEyesMacro.s12
-rw-r--r--data/animations/enemy/vaatiProjectile.s18
-rw-r--r--data/animations/enemy/vaatiRebornEnemy.s92
-rw-r--r--data/animations/enemy/vaatiTransfigured.s136
-rw-r--r--data/animations/enemy/vaatiTransfiguredEye.s88
-rw-r--r--data/animations/enemy/vaatiWrath.s192
-rw-r--r--data/animations/enemy/vaatiWrathEye.s54
-rw-r--r--data/animations/enemy/wallMaster.s18
-rw-r--r--data/animations/enemy/waterDrop.s17
-rw-r--r--data/animations/enemy/wisp.s12
-rw-r--r--data/animations/enemy/wizzrobeFire.s48
-rw-r--r--data/animations/enemy/wizzrobeIce.s48
-rw-r--r--data/animations/enemy/wizzrobeWind.s48
77 files changed, 3252 insertions, 3257 deletions
diff --git a/data/animations/enemy/acroBandits.s b/data/animations/enemy/acroBandits.s
index 4dedae93..c75bd694 100644
--- a/data/animations/enemy/acroBandits.s
+++ b/data/animations/enemy/acroBandits.s
@@ -4,65 +4,65 @@
.section .rodata
@ .align 2
-gUnk_080CE60E:: @ 080CE60E
- .incbin "acroBandits/gUnk_080CE60E.bin"
+gSpriteAnimations_AcroBandits_0:: @ 080CE60E
+ .include "animations/gSpriteAnimations_AcroBandits_0.s"
-gUnk_080CE626:: @ 080CE626
- .incbin "acroBandits/gUnk_080CE626.bin"
+gSpriteAnimations_AcroBandits_1:: @ 080CE626
+ .include "animations/gSpriteAnimations_AcroBandits_1.s"
-gUnk_080CE657:: @ 080CE657
- .incbin "acroBandits/gUnk_080CE657.bin"
+gSpriteAnimations_AcroBandits_2:: @ 080CE657
+ .include "animations/gSpriteAnimations_AcroBandits_2.s"
-gUnk_080CE667:: @ 080CE667
- .incbin "acroBandits/gUnk_080CE667.bin"
+gSpriteAnimations_AcroBandits_3:: @ 080CE667
+ .include "animations/gSpriteAnimations_AcroBandits_3.s"
-gUnk_080CE68F:: @ 080CE68F
- .incbin "acroBandits/gUnk_080CE68F.bin"
+gSpriteAnimations_AcroBandits_4:: @ 080CE68F
+ .include "animations/gSpriteAnimations_AcroBandits_4.s"
-gUnk_080CE698:: @ 080CE698
- .incbin "acroBandits/gUnk_080CE698.bin"
+gSpriteAnimations_AcroBandits_5:: @ 080CE698
+ .include "animations/gSpriteAnimations_AcroBandits_5.s"
-gUnk_080CE69D:: @ 080CE69D
- .incbin "acroBandits/gUnk_080CE69D.bin"
+gSpriteAnimations_AcroBandits_6:: @ 080CE69D
+ .include "animations/gSpriteAnimations_AcroBandits_6.s"
-gUnk_080CE6A6:: @ 080CE6A6
- .incbin "acroBandits/gUnk_080CE6A6.bin"
+gSpriteAnimations_AcroBandits_7:: @ 080CE6A6
+ .include "animations/gSpriteAnimations_AcroBandits_7.s"
-gUnk_080CE6AF:: @ 080CE6AF
- .incbin "acroBandits/gUnk_080CE6AF.bin"
+gSpriteAnimations_AcroBandits_8:: @ 080CE6AF
+ .include "animations/gSpriteAnimations_AcroBandits_8.s"
-gUnk_080CE6C0:: @ 080CE6C0
- .incbin "acroBandits/gUnk_080CE6C0.bin"
+gSpriteAnimations_AcroBandits_9:: @ 080CE6C0
+ .include "animations/gSpriteAnimations_AcroBandits_9.s"
-gUnk_080CE6D1:: @ 080CE6D1
- .incbin "acroBandits/gUnk_080CE6D1.bin"
+gSpriteAnimations_AcroBandits_10:: @ 080CE6D1
+ .include "animations/gSpriteAnimations_AcroBandits_10.s"
-gUnk_080CE6D6:: @ 080CE6D6
- .incbin "acroBandits/gUnk_080CE6D6.bin"
+gSpriteAnimations_AcroBandits_11:: @ 080CE6D6
+ .include "animations/gSpriteAnimations_AcroBandits_11.s"
-gUnk_080CE6DB:: @ 080CE6DB
- .incbin "acroBandits/gUnk_080CE6DB.bin"
+gSpriteAnimations_AcroBandits_12:: @ 080CE6DB
+ .include "animations/gSpriteAnimations_AcroBandits_12.s"
-gUnk_080CE6E7:: @ 080CE6E7
- .incbin "acroBandits/gUnk_080CE6E7.bin"
+gSpriteAnimations_AcroBandits_13:: @ 080CE6E7
+ .include "animations/gSpriteAnimations_AcroBandits_13.s"
-gUnk_080CE727:: @ 080CE727
- .incbin "acroBandits/gUnk_080CE727.bin"
+gSpriteAnimations_AcroBandits_14:: @ 080CE727
+ .include "animations/gSpriteAnimations_AcroBandits_14.s"
gSpriteAnimations_AcroBandits:: @ 080CE770
- .4byte gUnk_080CE60E
- .4byte gUnk_080CE626
- .4byte gUnk_080CE657
- .4byte gUnk_080CE667
- .4byte gUnk_080CE68F
- .4byte gUnk_080CE698
- .4byte gUnk_080CE69D
- .4byte gUnk_080CE6A6
- .4byte gUnk_080CE6AF
- .4byte gUnk_080CE6C0
- .4byte gUnk_080CE6D1
- .4byte gUnk_080CE6D6
- .4byte gUnk_080CE6DB
- .4byte gUnk_080CE6E7
- .4byte gUnk_080CE727
+ .4byte gSpriteAnimations_AcroBandits_0
+ .4byte gSpriteAnimations_AcroBandits_1
+ .4byte gSpriteAnimations_AcroBandits_2
+ .4byte gSpriteAnimations_AcroBandits_3
+ .4byte gSpriteAnimations_AcroBandits_4
+ .4byte gSpriteAnimations_AcroBandits_5
+ .4byte gSpriteAnimations_AcroBandits_6
+ .4byte gSpriteAnimations_AcroBandits_7
+ .4byte gSpriteAnimations_AcroBandits_8
+ .4byte gSpriteAnimations_AcroBandits_9
+ .4byte gSpriteAnimations_AcroBandits_10
+ .4byte gSpriteAnimations_AcroBandits_11
+ .4byte gSpriteAnimations_AcroBandits_12
+ .4byte gSpriteAnimations_AcroBandits_13
+ .4byte gSpriteAnimations_AcroBandits_14
.4byte 00000000
diff --git a/data/animations/enemy/armos.s b/data/animations/enemy/armos.s
index 448edeb9..b792b0fd 100644
--- a/data/animations/enemy/armos.s
+++ b/data/animations/enemy/armos.s
@@ -7,37 +7,37 @@
gUnk_080CE164:: @ 080CE164
.incbin "armos/gUnk_080CE164.bin"
-gUnk_080CE16C:: @ 080CE16C
- .incbin "armos/gUnk_080CE16C.bin"
+gSpriteAnimations_Armos_0:: @ 080CE16C
+ .include "animations/gSpriteAnimations_Armos_0.s"
-gUnk_080CE185:: @ 080CE185
- .incbin "armos/gUnk_080CE185.bin"
+gSpriteAnimations_Armos_1:: @ 080CE185
+ .include "animations/gSpriteAnimations_Armos_1.s"
-gUnk_080CE19E:: @ 080CE19E
- .incbin "armos/gUnk_080CE19E.bin"
+gSpriteAnimations_Armos_2:: @ 080CE19E
+ .include "animations/gSpriteAnimations_Armos_2.s"
-gUnk_080CE1B7:: @ 080CE1B7
- .incbin "armos/gUnk_080CE1B7.bin"
+gSpriteAnimations_Armos_3:: @ 080CE1B7
+ .include "animations/gSpriteAnimations_Armos_3.s"
-gUnk_080CE1D0:: @ 080CE1D0
- .incbin "armos/gUnk_080CE1D0.bin"
+gSpriteAnimations_Armos_4:: @ 080CE1D0
+ .include "animations/gSpriteAnimations_Armos_4.s"
-gUnk_080CE205:: @ 080CE205
- .incbin "armos/gUnk_080CE205.bin"
+gSpriteAnimations_Armos_5:: @ 080CE205
+ .include "animations/gSpriteAnimations_Armos_5.s"
-gUnk_080CE246:: @ 080CE246
- .incbin "armos/gUnk_080CE246.bin"
+gSpriteAnimations_Armos_6:: @ 080CE246
+ .include "animations/gSpriteAnimations_Armos_6.s"
-gUnk_080CE25E:: @ 080CE25E
- .incbin "armos/gUnk_080CE25E.bin"
+gSpriteAnimations_Armos_7:: @ 080CE25E
+ .include "animations/gSpriteAnimations_Armos_7.s"
gSpriteAnimations_Armos:: @ 080CE264
- .4byte gUnk_080CE16C
- .4byte gUnk_080CE185
- .4byte gUnk_080CE19E
- .4byte gUnk_080CE1B7
- .4byte gUnk_080CE1D0
- .4byte gUnk_080CE205
- .4byte gUnk_080CE246
- .4byte gUnk_080CE25E
+ .4byte gSpriteAnimations_Armos_0
+ .4byte gSpriteAnimations_Armos_1
+ .4byte gSpriteAnimations_Armos_2
+ .4byte gSpriteAnimations_Armos_3
+ .4byte gSpriteAnimations_Armos_4
+ .4byte gSpriteAnimations_Armos_5
+ .4byte gSpriteAnimations_Armos_6
+ .4byte gSpriteAnimations_Armos_7
.4byte 00000000
diff --git a/data/animations/enemy/ballChainSoldier.s b/data/animations/enemy/ballChainSoldier.s
index ccb9484a..37fc771a 100644
--- a/data/animations/enemy/ballChainSoldier.s
+++ b/data/animations/enemy/ballChainSoldier.s
@@ -4,140 +4,140 @@
.section .rodata
.align 2
-gUnk_080D0744:: @ 080D0744
- .incbin "ballChainSoldier/gUnk_080D0744.bin"
+gSpriteAnimations_BallChainSoldier_0:: @ 080D0744
+ .include "animations/gSpriteAnimations_BallChainSoldier_0.s"
-gUnk_080D0748:: @ 080D0748
- .incbin "ballChainSoldier/gUnk_080D0748.bin"
+gSpriteAnimations_BallChainSoldier_19:: @ 080D0748
+ .include "animations/gSpriteAnimations_BallChainSoldier_19.s"
-gUnk_080D074C:: @ 080D074C
- .incbin "ballChainSoldier/gUnk_080D074C.bin"
+gSpriteAnimations_BallChainSoldier_18:: @ 080D074C
+ .include "animations/gSpriteAnimations_BallChainSoldier_18.s"
-gUnk_080D0750:: @ 080D0750
- .incbin "ballChainSoldier/gUnk_080D0750.bin"
+gSpriteAnimations_BallChainSoldier_17:: @ 080D0750
+ .include "animations/gSpriteAnimations_BallChainSoldier_17.s"
-gUnk_080D0754:: @ 080D0754
- .incbin "ballChainSoldier/gUnk_080D0754.bin"
+gSpriteAnimations_BallChainSoldier_16:: @ 080D0754
+ .include "animations/gSpriteAnimations_BallChainSoldier_16.s"
-gUnk_080D0758:: @ 080D0758
- .incbin "ballChainSoldier/gUnk_080D0758.bin"
+gSpriteAnimations_BallChainSoldier_4:: @ 080D0758
+ .include "animations/gSpriteAnimations_BallChainSoldier_4.s"
-gUnk_080D075C:: @ 080D075C
- .incbin "ballChainSoldier/gUnk_080D075C.bin"
+gSpriteAnimations_BallChainSoldier_7:: @ 080D075C
+ .include "animations/gSpriteAnimations_BallChainSoldier_7.s"
-gUnk_080D0760:: @ 080D0760
- .incbin "ballChainSoldier/gUnk_080D0760.bin"
+gSpriteAnimations_BallChainSoldier_6:: @ 080D0760
+ .include "animations/gSpriteAnimations_BallChainSoldier_6.s"
-gUnk_080D0764:: @ 080D0764
- .incbin "ballChainSoldier/gUnk_080D0764.bin"
+gSpriteAnimations_BallChainSoldier_5:: @ 080D0764
+ .include "animations/gSpriteAnimations_BallChainSoldier_5.s"
-gUnk_080D0768:: @ 080D0768
- .incbin "ballChainSoldier/gUnk_080D0768.bin"
+gSpriteAnimations_BallChainSoldier_20:: @ 080D0768
+ .include "animations/gSpriteAnimations_BallChainSoldier_20.s"
-gUnk_080D076C:: @ 080D076C
- .incbin "ballChainSoldier/gUnk_080D076C.bin"
+gSpriteAnimations_BallChainSoldier_23:: @ 080D076C
+ .include "animations/gSpriteAnimations_BallChainSoldier_23.s"
-gUnk_080D0770:: @ 080D0770
- .incbin "ballChainSoldier/gUnk_080D0770.bin"
+gSpriteAnimations_BallChainSoldier_22:: @ 080D0770
+ .include "animations/gSpriteAnimations_BallChainSoldier_22.s"
-gUnk_080D0774:: @ 080D0774
- .incbin "ballChainSoldier/gUnk_080D0774.bin"
+gSpriteAnimations_BallChainSoldier_21:: @ 080D0774
+ .include "animations/gSpriteAnimations_BallChainSoldier_21.s"
-gUnk_080D0778:: @ 080D0778
- .incbin "ballChainSoldier/gUnk_080D0778.bin"
+gSpriteAnimations_BallChainSoldier_9:: @ 080D0778
+ .include "animations/gSpriteAnimations_BallChainSoldier_9.s"
-gUnk_080D077C:: @ 080D077C
- .incbin "ballChainSoldier/gUnk_080D077C.bin"
+gSpriteAnimations_BallChainSoldier_8:: @ 080D077C
+ .include "animations/gSpriteAnimations_BallChainSoldier_8.s"
-gUnk_080D0780:: @ 080D0780
- .incbin "ballChainSoldier/gUnk_080D0780.bin"
+gSpriteAnimations_BallChainSoldier_11:: @ 080D0780
+ .include "animations/gSpriteAnimations_BallChainSoldier_11.s"
-gUnk_080D0784:: @ 080D0784
- .incbin "ballChainSoldier/gUnk_080D0784.bin"
+gSpriteAnimations_BallChainSoldier_10:: @ 080D0784
+ .include "animations/gSpriteAnimations_BallChainSoldier_10.s"
-gUnk_080D0788:: @ 080D0788
- .incbin "ballChainSoldier/gUnk_080D0788.bin"
+gSpriteAnimations_BallChainSoldier_25:: @ 080D0788
+ .include "animations/gSpriteAnimations_BallChainSoldier_25.s"
-gUnk_080D078C:: @ 080D078C
- .incbin "ballChainSoldier/gUnk_080D078C.bin"
+gSpriteAnimations_BallChainSoldier_24:: @ 080D078C
+ .include "animations/gSpriteAnimations_BallChainSoldier_24.s"
-gUnk_080D0790:: @ 080D0790
- .incbin "ballChainSoldier/gUnk_080D0790.bin"
+gSpriteAnimations_BallChainSoldier_27:: @ 080D0790
+ .include "animations/gSpriteAnimations_BallChainSoldier_27.s"
-gUnk_080D0794:: @ 080D0794
- .incbin "ballChainSoldier/gUnk_080D0794.bin"
+gSpriteAnimations_BallChainSoldier_26:: @ 080D0794
+ .include "animations/gSpriteAnimations_BallChainSoldier_26.s"
-gUnk_080D0798:: @ 080D0798
- .incbin "ballChainSoldier/gUnk_080D0798.bin"
+gSpriteAnimations_BallChainSoldier_12:: @ 080D0798
+ .include "animations/gSpriteAnimations_BallChainSoldier_12.s"
-gUnk_080D079C:: @ 080D079C
- .incbin "ballChainSoldier/gUnk_080D079C.bin"
+gSpriteAnimations_BallChainSoldier_13:: @ 080D079C
+ .include "animations/gSpriteAnimations_BallChainSoldier_13.s"
-gUnk_080D07A0:: @ 080D07A0
- .incbin "ballChainSoldier/gUnk_080D07A0.bin"
+gSpriteAnimations_BallChainSoldier_14:: @ 080D07A0
+ .include "animations/gSpriteAnimations_BallChainSoldier_14.s"
-gUnk_080D07A4:: @ 080D07A4
- .incbin "ballChainSoldier/gUnk_080D07A4.bin"
+gSpriteAnimations_BallChainSoldier_15:: @ 080D07A4
+ .include "animations/gSpriteAnimations_BallChainSoldier_15.s"
-gUnk_080D07A8:: @ 080D07A8
- .incbin "ballChainSoldier/gUnk_080D07A8.bin"
+gSpriteAnimations_BallChainSoldier_28:: @ 080D07A8
+ .include "animations/gSpriteAnimations_BallChainSoldier_28.s"
-gUnk_080D07AC:: @ 080D07AC
- .incbin "ballChainSoldier/gUnk_080D07AC.bin"
+gSpriteAnimations_BallChainSoldier_29:: @ 080D07AC
+ .include "animations/gSpriteAnimations_BallChainSoldier_29.s"
-gUnk_080D07B0:: @ 080D07B0
- .incbin "ballChainSoldier/gUnk_080D07B0.bin"
+gSpriteAnimations_BallChainSoldier_30:: @ 080D07B0
+ .include "animations/gSpriteAnimations_BallChainSoldier_30.s"
-gUnk_080D07B4:: @ 080D07B4
- .incbin "ballChainSoldier/gUnk_080D07B4.bin"
+gSpriteAnimations_BallChainSoldier_31:: @ 080D07B4
+ .include "animations/gSpriteAnimations_BallChainSoldier_31.s"
-gUnk_080D07B8:: @ 080D07B8
- .incbin "ballChainSoldier/gUnk_080D07B8.bin"
+gSpriteAnimations_BallChainSoldier_32:: @ 080D07B8
+ .include "animations/gSpriteAnimations_BallChainSoldier_32.s"
-gUnk_080D07C5:: @ 080D07C5
- .incbin "ballChainSoldier/gUnk_080D07C5.bin"
+gSpriteAnimations_BallChainSoldier_33:: @ 080D07C5
+ .include "animations/gSpriteAnimations_BallChainSoldier_33.s"
-gUnk_080D07D2:: @ 080D07D2
- .incbin "ballChainSoldier/gUnk_080D07D2.bin"
+gSpriteAnimations_BallChainSoldier_34:: @ 080D07D2
+ .include "animations/gSpriteAnimations_BallChainSoldier_34.s"
-gUnk_080D07DF:: @ 080D07DF
- .incbin "ballChainSoldier/gUnk_080D07DF.bin"
+gSpriteAnimations_BallChainSoldier_35:: @ 080D07DF
+ .include "animations/gSpriteAnimations_BallChainSoldier_35.s"
gSpriteAnimations_BallChainSoldier:: @ 080D07EC
- .4byte gUnk_080D0744
- .4byte gUnk_080D0740
- .4byte gUnk_080D073C
- .4byte gUnk_080D0738
- .4byte gUnk_080D0758
- .4byte gUnk_080D0764
- .4byte gUnk_080D0760
- .4byte gUnk_080D075C
- .4byte gUnk_080D077C
- .4byte gUnk_080D0778
- .4byte gUnk_080D0784
- .4byte gUnk_080D0780
- .4byte gUnk_080D0798
- .4byte gUnk_080D079C
- .4byte gUnk_080D07A0
- .4byte gUnk_080D07A4
- .4byte gUnk_080D0754
- .4byte gUnk_080D0750
- .4byte gUnk_080D074C
- .4byte gUnk_080D0748
- .4byte gUnk_080D0768
- .4byte gUnk_080D0774
- .4byte gUnk_080D0770
- .4byte gUnk_080D076C
- .4byte gUnk_080D078C
- .4byte gUnk_080D0788
- .4byte gUnk_080D0794
- .4byte gUnk_080D0790
- .4byte gUnk_080D07A8
- .4byte gUnk_080D07AC
- .4byte gUnk_080D07B0
- .4byte gUnk_080D07B4
- .4byte gUnk_080D07B8
- .4byte gUnk_080D07C5
- .4byte gUnk_080D07D2
- .4byte gUnk_080D07DF
+ .4byte gSpriteAnimations_BallChainSoldier_0
+ .4byte gSpriteAnimations_BallChainSoldier_1
+ .4byte gSpriteAnimations_BallChainSoldier_2
+ .4byte gSpriteAnimations_BallChainSoldier_3
+ .4byte gSpriteAnimations_BallChainSoldier_4
+ .4byte gSpriteAnimations_BallChainSoldier_5
+ .4byte gSpriteAnimations_BallChainSoldier_6
+ .4byte gSpriteAnimations_BallChainSoldier_7
+ .4byte gSpriteAnimations_BallChainSoldier_8
+ .4byte gSpriteAnimations_BallChainSoldier_9
+ .4byte gSpriteAnimations_BallChainSoldier_10
+ .4byte gSpriteAnimations_BallChainSoldier_11
+ .4byte gSpriteAnimations_BallChainSoldier_12
+ .4byte gSpriteAnimations_BallChainSoldier_13
+ .4byte gSpriteAnimations_BallChainSoldier_14
+ .4byte gSpriteAnimations_BallChainSoldier_15
+ .4byte gSpriteAnimations_BallChainSoldier_16
+ .4byte gSpriteAnimations_BallChainSoldier_17
+ .4byte gSpriteAnimations_BallChainSoldier_18
+ .4byte gSpriteAnimations_BallChainSoldier_19
+ .4byte gSpriteAnimations_BallChainSoldier_20
+ .4byte gSpriteAnimations_BallChainSoldier_21
+ .4byte gSpriteAnimations_BallChainSoldier_22
+ .4byte gSpriteAnimations_BallChainSoldier_23
+ .4byte gSpriteAnimations_BallChainSoldier_24
+ .4byte gSpriteAnimations_BallChainSoldier_25
+ .4byte gSpriteAnimations_BallChainSoldier_26
+ .4byte gSpriteAnimations_BallChainSoldier_27
+ .4byte gSpriteAnimations_BallChainSoldier_28
+ .4byte gSpriteAnimations_BallChainSoldier_29
+ .4byte gSpriteAnimations_BallChainSoldier_30
+ .4byte gSpriteAnimations_BallChainSoldier_31
+ .4byte gSpriteAnimations_BallChainSoldier_32
+ .4byte gSpriteAnimations_BallChainSoldier_33
+ .4byte gSpriteAnimations_BallChainSoldier_34
+ .4byte gSpriteAnimations_BallChainSoldier_35
.4byte 00000000
diff --git a/data/animations/enemy/beetle.s b/data/animations/enemy/beetle.s
index ad879d6e..ac709c31 100644
--- a/data/animations/enemy/beetle.s
+++ b/data/animations/enemy/beetle.s
@@ -3,33 +3,33 @@
.section .rodata
-gUnk_080CB5EC:: @ 080CB5EC
- .incbin "beetle/gUnk_080CB5EC.bin"
+gSpriteAnimations_Beetle_0:: @ 080CB5EC
+ .include "animations/gSpriteAnimations_Beetle_0.s"
-gUnk_080CB600:: @ 080CB600
- .incbin "beetle/gUnk_080CB600.bin"
+gSpriteAnimations_Beetle_1:: @ 080CB600
+ .include "animations/gSpriteAnimations_Beetle_1.s"
-gUnk_080CB61C:: @ 080CB61C
- .incbin "beetle/gUnk_080CB61C.bin"
+gSpriteAnimations_Beetle_2:: @ 080CB61C
+ .include "animations/gSpriteAnimations_Beetle_2.s"
-gUnk_080CB62D:: @ 080CB62D
- .incbin "beetle/gUnk_080CB62D.bin"
+gSpriteAnimations_Beetle_3:: @ 080CB62D
+ .include "animations/gSpriteAnimations_Beetle_3.s"
-gUnk_080CB645:: @ 080CB645
- .incbin "beetle/gUnk_080CB645.bin"
+gSpriteAnimations_Beetle_4:: @ 080CB645
+ .include "animations/gSpriteAnimations_Beetle_4.s"
-gUnk_080CB65D:: @ 080CB65D
- .incbin "beetle/gUnk_080CB65D.bin"
+gSpriteAnimations_Beetle_5:: @ 080CB65D
+ .include "animations/gSpriteAnimations_Beetle_5.s"
-gUnk_080CB671:: @ 080CB671
- .incbin "beetle/gUnk_080CB671.bin"
+gSpriteAnimations_Beetle_6:: @ 080CB671
+ .include "animations/gSpriteAnimations_Beetle_6.s"
gSpriteAnimations_Beetle:: @ 080CB67C
- .4byte gUnk_080CB5EC
- .4byte gUnk_080CB600
- .4byte gUnk_080CB61C
- .4byte gUnk_080CB62D
- .4byte gUnk_080CB645
- .4byte gUnk_080CB65D
- .4byte gUnk_080CB671
+ .4byte gSpriteAnimations_Beetle_0
+ .4byte gSpriteAnimations_Beetle_1
+ .4byte gSpriteAnimations_Beetle_2
+ .4byte gSpriteAnimations_Beetle_3
+ .4byte gSpriteAnimations_Beetle_4
+ .4byte gSpriteAnimations_Beetle_5
+ .4byte gSpriteAnimations_Beetle_6
.4byte 00000000
diff --git a/data/animations/enemy/bobomb.s b/data/animations/enemy/bobomb.s
index f9bca349..e174efc7 100644
--- a/data/animations/enemy/bobomb.s
+++ b/data/animations/enemy/bobomb.s
@@ -3,45 +3,45 @@
.section .rodata
-gUnk_080CD628:: @ 080CD628
- .incbin "bobomb/gUnk_080CD628.bin"
+gSpriteAnimations_Bobomb_0:: @ 080CD628
+ .include "animations/gSpriteAnimations_Bobomb_0.s"
-gUnk_080CD639:: @ 080CD639
- .incbin "bobomb/gUnk_080CD639.bin"
+gSpriteAnimations_Bobomb_1:: @ 080CD639
+ .include "animations/gSpriteAnimations_Bobomb_1.s"
-gUnk_080CD64A:: @ 080CD64A
- .incbin "bobomb/gUnk_080CD64A.bin"
+gSpriteAnimations_Bobomb_2:: @ 080CD64A
+ .include "animations/gSpriteAnimations_Bobomb_2.s"
-gUnk_080CD65B:: @ 080CD65B
- .incbin "bobomb/gUnk_080CD65B.bin"
+gSpriteAnimations_Bobomb_3:: @ 080CD65B
+ .include "animations/gSpriteAnimations_Bobomb_3.s"
-gUnk_080CD66C:: @ 080CD66C
- .incbin "bobomb/gUnk_080CD66C.bin"
+gSpriteAnimations_Bobomb_4:: @ 080CD66C
+ .include "animations/gSpriteAnimations_Bobomb_4.s"
-gUnk_080CD671:: @ 080CD671
- .incbin "bobomb/gUnk_080CD671.bin"
+gSpriteAnimations_Bobomb_5:: @ 080CD671
+ .include "animations/gSpriteAnimations_Bobomb_5.s"
-gUnk_080CD676:: @ 080CD676
- .incbin "bobomb/gUnk_080CD676.bin"
+gSpriteAnimations_Bobomb_6:: @ 080CD676
+ .include "animations/gSpriteAnimations_Bobomb_6.s"
-gUnk_080CD67F:: @ 080CD67F
- .incbin "bobomb/gUnk_080CD67F.bin"
+gSpriteAnimations_Bobomb_7:: @ 080CD67F
+ .include "animations/gSpriteAnimations_Bobomb_7.s"
-gUnk_080CD688:: @ 080CD688
- .incbin "bobomb/gUnk_080CD688.bin"
+gSpriteAnimations_Bobomb_8:: @ 080CD688
+ .include "animations/gSpriteAnimations_Bobomb_8.s"
-gUnk_080CD6AC:: @ 080CD6AC
- .incbin "bobomb/gUnk_080CD6AC.bin"
+gSpriteAnimations_Bobomb_9:: @ 080CD6AC
+ .include "animations/gSpriteAnimations_Bobomb_9.s"
gSpriteAnimations_Bobomb:: @ 080CD6D0
- .4byte gUnk_080CD628
- .4byte gUnk_080CD639
- .4byte gUnk_080CD64A
- .4byte gUnk_080CD65B
- .4byte gUnk_080CD66C
- .4byte gUnk_080CD671
- .4byte gUnk_080CD676
- .4byte gUnk_080CD67F
- .4byte gUnk_080CD688
- .4byte gUnk_080CD6AC
+ .4byte gSpriteAnimations_Bobomb_0
+ .4byte gSpriteAnimations_Bobomb_1
+ .4byte gSpriteAnimations_Bobomb_2
+ .4byte gSpriteAnimations_Bobomb_3
+ .4byte gSpriteAnimations_Bobomb_4
+ .4byte gSpriteAnimations_Bobomb_5
+ .4byte gSpriteAnimations_Bobomb_6
+ .4byte gSpriteAnimations_Bobomb_7
+ .4byte gSpriteAnimations_Bobomb_8
+ .4byte gSpriteAnimations_Bobomb_9
.4byte 00000000
diff --git a/data/animations/enemy/bombPeahat.s b/data/animations/enemy/bombPeahat.s
index 568c2f5b..29ea76ee 100644
--- a/data/animations/enemy/bombPeahat.s
+++ b/data/animations/enemy/bombPeahat.s
@@ -3,21 +3,21 @@
.section .rodata
-gUnk_080CD184:: @ 080CD184
- .incbin "bombPeahat/gUnk_080CD184.bin"
+gSpriteAnimations_BombPeahat_0:: @ 080CD184
+ .include "animations/gSpriteAnimations_BombPeahat_0.s"
-gUnk_080CD195:: @ 080CD195
- .incbin "bombPeahat/gUnk_080CD195.bin"
+gSpriteAnimations_BombPeahat_1:: @ 080CD195
+ .include "animations/gSpriteAnimations_BombPeahat_1.s"
-gUnk_080CD1D6:: @ 080CD1D6
- .incbin "bombPeahat/gUnk_080CD1D6.bin"
+gSpriteAnimations_BombPeahat_2:: @ 080CD1D6
+ .include "animations/gSpriteAnimations_BombPeahat_2.s"
-gUnk_080CD217:: @ 080CD217
- .incbin "bombPeahat/gUnk_080CD217.bin"
+gSpriteAnimations_BombPeahat_3:: @ 080CD217
+ .include "animations/gSpriteAnimations_BombPeahat_3.s"
gSpriteAnimations_BombPeahat:: @ 080CD220
- .4byte gUnk_080CD184
- .4byte gUnk_080CD195
- .4byte gUnk_080CD1D6
- .4byte gUnk_080CD217
+ .4byte gSpriteAnimations_BombPeahat_0
+ .4byte gSpriteAnimations_BombPeahat_1
+ .4byte gSpriteAnimations_BombPeahat_2
+ .4byte gSpriteAnimations_BombPeahat_3
.4byte 00000000
diff --git a/data/animations/enemy/bombarossa.s b/data/animations/enemy/bombarossa.s
index 0c4c8f6b..ad392cf5 100644
--- a/data/animations/enemy/bombarossa.s
+++ b/data/animations/enemy/bombarossa.s
@@ -4,9 +4,9 @@
.section .rodata
.align 2
-gUnk_080CEB60:: @ 080CEB60
- .incbin "bombarossa/gUnk_080CEB60.bin"
+gSpriteAnimations_Bombarossa_0:: @ 080CEB60
+ .include "animations/gSpriteAnimations_Bombarossa_0.s"
gSpriteAnimations_Bombarossa:: @ 080CEB6C
- .4byte gUnk_080CEB60
+ .4byte gSpriteAnimations_Bombarossa_0
.4byte 00000000
diff --git a/data/animations/enemy/bowMoblin.s b/data/animations/enemy/bowMoblin.s
index d4d92fbd..891348ad 100644
--- a/data/animations/enemy/bowMoblin.s
+++ b/data/animations/enemy/bowMoblin.s
@@ -4,69 +4,69 @@
.section .rodata
.align 2
-gUnk_080CFFCC:: @ 080CFFCC
- .incbin "bowMoblin/gUnk_080CFFCC.bin"
+gSpriteAnimations_BowMoblin_0:: @ 080CFFCC
+ .include "animations/gSpriteAnimations_BowMoblin_0.s"
-gUnk_080CFFD5:: @ 080CFFD5
- .incbin "bowMoblin/gUnk_080CFFD5.bin"
+gSpriteAnimations_BowMoblin_1:: @ 080CFFD5
+ .include "animations/gSpriteAnimations_BowMoblin_1.s"
-gUnk_080CFFDE:: @ 080CFFDE
- .incbin "bowMoblin/gUnk_080CFFDE.bin"
+gSpriteAnimations_BowMoblin_2:: @ 080CFFDE
+ .include "animations/gSpriteAnimations_BowMoblin_2.s"
-gUnk_080CFFE7:: @ 080CFFE7
- .incbin "bowMoblin/gUnk_080CFFE7.bin"
+gSpriteAnimations_BowMoblin_3:: @ 080CFFE7
+ .include "animations/gSpriteAnimations_BowMoblin_3.s"
-gUnk_080CFFF0:: @ 080CFFF0
- .incbin "bowMoblin/gUnk_080CFFF0.bin"
+gSpriteAnimations_BowMoblin_4:: @ 080CFFF0
+ .include "animations/gSpriteAnimations_BowMoblin_4.s"
-gUnk_080D0001:: @ 080D0001
- .incbin "bowMoblin/gUnk_080D0001.bin"
+gSpriteAnimations_BowMoblin_5:: @ 080D0001
+ .include "animations/gSpriteAnimations_BowMoblin_5.s"
-gUnk_080D0012:: @ 080D0012
- .incbin "bowMoblin/gUnk_080D0012.bin"
+gSpriteAnimations_BowMoblin_6:: @ 080D0012
+ .include "animations/gSpriteAnimations_BowMoblin_6.s"
-gUnk_080D0023:: @ 080D0023
- .incbin "bowMoblin/gUnk_080D0023.bin"
+gSpriteAnimations_BowMoblin_7:: @ 080D0023
+ .include "animations/gSpriteAnimations_BowMoblin_7.s"
-gUnk_080D0034:: @ 080D0034
- .incbin "bowMoblin/gUnk_080D0034.bin"
+gSpriteAnimations_BowMoblin_8:: @ 080D0034
+ .include "animations/gSpriteAnimations_BowMoblin_8.s"
-gUnk_080D0045:: @ 080D0045
- .incbin "bowMoblin/gUnk_080D0045.bin"
+gSpriteAnimations_BowMoblin_9:: @ 080D0045
+ .include "animations/gSpriteAnimations_BowMoblin_9.s"
-gUnk_080D0056:: @ 080D0056
- .incbin "bowMoblin/gUnk_080D0056.bin"
+gSpriteAnimations_BowMoblin_10:: @ 080D0056
+ .include "animations/gSpriteAnimations_BowMoblin_10.s"
-gUnk_080D0067:: @ 080D0067
- .incbin "bowMoblin/gUnk_080D0067.bin"
+gSpriteAnimations_BowMoblin_11:: @ 080D0067
+ .include "animations/gSpriteAnimations_BowMoblin_11.s"
-gUnk_080D0078:: @ 080D0078
- .incbin "bowMoblin/gUnk_080D0078.bin"
+gSpriteAnimations_BowMoblin_12:: @ 080D0078
+ .include "animations/gSpriteAnimations_BowMoblin_12.s"
-gUnk_080D008D:: @ 080D008D
- .incbin "bowMoblin/gUnk_080D008D.bin"
+gSpriteAnimations_BowMoblin_13:: @ 080D008D
+ .include "animations/gSpriteAnimations_BowMoblin_13.s"
-gUnk_080D00A2:: @ 080D00A2
- .incbin "bowMoblin/gUnk_080D00A2.bin"
+gSpriteAnimations_BowMoblin_14:: @ 080D00A2
+ .include "animations/gSpriteAnimations_BowMoblin_14.s"
-gUnk_080D00B7:: @ 080D00B7
- .incbin "bowMoblin/gUnk_080D00B7.bin"
+gSpriteAnimations_BowMoblin_15:: @ 080D00B7
+ .include "animations/gSpriteAnimations_BowMoblin_15.s"
gSpriteAnimations_BowMoblin:: @ 080D00CC
- .4byte gUnk_080CFFCC
- .4byte gUnk_080CFFD5
- .4byte gUnk_080CFFDE
- .4byte gUnk_080CFFE7
- .4byte gUnk_080CFFF0
- .4byte gUnk_080D0001
- .4byte gUnk_080D0012
- .4byte gUnk_080D0023
- .4byte gUnk_080D0034
- .4byte gUnk_080D0045
- .4byte gUnk_080D0056
- .4byte gUnk_080D0067
- .4byte gUnk_080D0078
- .4byte gUnk_080D008D
- .4byte gUnk_080D00A2
- .4byte gUnk_080D00B7
+ .4byte gSpriteAnimations_BowMoblin_0
+ .4byte gSpriteAnimations_BowMoblin_1
+ .4byte gSpriteAnimations_BowMoblin_2
+ .4byte gSpriteAnimations_BowMoblin_3
+ .4byte gSpriteAnimations_BowMoblin_4
+ .4byte gSpriteAnimations_BowMoblin_5
+ .4byte gSpriteAnimations_BowMoblin_6
+ .4byte gSpriteAnimations_BowMoblin_7
+ .4byte gSpriteAnimations_BowMoblin_8
+ .4byte gSpriteAnimations_BowMoblin_9
+ .4byte gSpriteAnimations_BowMoblin_10
+ .4byte gSpriteAnimations_BowMoblin_11
+ .4byte gSpriteAnimations_BowMoblin_12
+ .4byte gSpriteAnimations_BowMoblin_13
+ .4byte gSpriteAnimations_BowMoblin_14
+ .4byte gSpriteAnimations_BowMoblin_15
.4byte 00000000
diff --git a/data/animations/enemy/businessScrub.s b/data/animations/enemy/businessScrub.s
index 9d54d592..e2d02fed 100644
--- a/data/animations/enemy/businessScrub.s
+++ b/data/animations/enemy/businessScrub.s
@@ -4,109 +4,109 @@
.section .rodata
-gUnk_080CCA0A:: @ 080CCA0A
- .incbin "businessScrub/gUnk_080CCA0A.bin"
+gSpriteAnimations_BusinessScrub_2:: @ 080CCA0A
+ .include "animations/gSpriteAnimations_BusinessScrub_2.s"
-gUnk_080CCA1F:: @ 080CCA1F
- .incbin "businessScrub/gUnk_080CCA1F.bin"
+gSpriteAnimations_BusinessScrub_0:: @ 080CCA1F
+ .include "animations/gSpriteAnimations_BusinessScrub_0.s"
-gUnk_080CCA34:: @ 080CCA34
- .incbin "businessScrub/gUnk_080CCA34.bin"
+gSpriteAnimations_BusinessScrub_1:: @ 080CCA34
+ .include "animations/gSpriteAnimations_BusinessScrub_1.s"
-gUnk_080CCA49:: @ 080CCA49
- .incbin "businessScrub/gUnk_080CCA49.bin"
+gSpriteAnimations_BusinessScrub_3:: @ 080CCA49
+ .include "animations/gSpriteAnimations_BusinessScrub_3.s"
-gUnk_080CCA5E:: @ 080CCA5E
- .incbin "businessScrub/gUnk_080CCA5E.bin"
+gSpriteAnimations_BusinessScrub_14:: @ 080CCA5E
+ .include "animations/gSpriteAnimations_BusinessScrub_14.s"
-gUnk_080CCA6F:: @ 080CCA6F
- .incbin "businessScrub/gUnk_080CCA6F.bin"
+gSpriteAnimations_BusinessScrub_12:: @ 080CCA6F
+ .include "animations/gSpriteAnimations_BusinessScrub_12.s"
-gUnk_080CCA80:: @ 080CCA80
- .incbin "businessScrub/gUnk_080CCA80.bin"
+gSpriteAnimations_BusinessScrub_13:: @ 080CCA80
+ .include "animations/gSpriteAnimations_BusinessScrub_13.s"
-gUnk_080CCA91:: @ 080CCA91
- .incbin "businessScrub/gUnk_080CCA91.bin"
+gSpriteAnimations_BusinessScrub_15:: @ 080CCA91
+ .include "animations/gSpriteAnimations_BusinessScrub_15.s"
-gUnk_080CCAA2:: @ 080CCAA2
- .incbin "businessScrub/gUnk_080CCAA2.bin"
+gSpriteAnimations_BusinessScrub_6:: @ 080CCAA2
+ .include "animations/gSpriteAnimations_BusinessScrub_6.s"
-gUnk_080CCAA7:: @ 080CCAA7
- .incbin "businessScrub/gUnk_080CCAA7.bin"
+gSpriteAnimations_BusinessScrub_4:: @ 080CCAA7
+ .include "animations/gSpriteAnimations_BusinessScrub_4.s"
-gUnk_080CCAAC:: @ 080CCAAC
- .incbin "businessScrub/gUnk_080CCAAC.bin"
+gSpriteAnimations_BusinessScrub_5:: @ 080CCAAC
+ .include "animations/gSpriteAnimations_BusinessScrub_5.s"
-gUnk_080CCAB1:: @ 080CCAB1
- .incbin "businessScrub/gUnk_080CCAB1.bin"
+gSpriteAnimations_BusinessScrub_7:: @ 080CCAB1
+ .include "animations/gSpriteAnimations_BusinessScrub_7.s"
-gUnk_080CCAB6:: @ 080CCAB6
- .incbin "businessScrub/gUnk_080CCAB6.bin"
+gSpriteAnimations_BusinessScrub_10:: @ 080CCAB6
+ .include "animations/gSpriteAnimations_BusinessScrub_10.s"
-gUnk_080CCAC6:: @ 080CCAC6
- .incbin "businessScrub/gUnk_080CCAC6.bin"
+gSpriteAnimations_BusinessScrub_8:: @ 080CCAC6
+ .include "animations/gSpriteAnimations_BusinessScrub_8.s"
-gUnk_080CCAD6:: @ 080CCAD6
- .incbin "businessScrub/gUnk_080CCAD6.bin"
+gSpriteAnimations_BusinessScrub_9:: @ 080CCAD6
+ .include "animations/gSpriteAnimations_BusinessScrub_9.s"
-gUnk_080CCAE6:: @ 080CCAE6
- .incbin "businessScrub/gUnk_080CCAE6.bin"
+gSpriteAnimations_BusinessScrub_11:: @ 080CCAE6
+ .include "animations/gSpriteAnimations_BusinessScrub_11.s"
-gUnk_080CCAF6:: @ 080CCAF6
- .incbin "businessScrub/gUnk_080CCAF6.bin"
+gSpriteAnimations_BusinessScrub_18:: @ 080CCAF6
+ .include "animations/gSpriteAnimations_BusinessScrub_18.s"
-gUnk_080CCB07:: @ 080CCB07
- .incbin "businessScrub/gUnk_080CCB07.bin"
+gSpriteAnimations_BusinessScrub_16:: @ 080CCB07
+ .include "animations/gSpriteAnimations_BusinessScrub_16.s"
-gUnk_080CCB18:: @ 080CCB18
- .incbin "businessScrub/gUnk_080CCB18.bin"
+gSpriteAnimations_BusinessScrub_17:: @ 080CCB18
+ .include "animations/gSpriteAnimations_BusinessScrub_17.s"
-gUnk_080CCB29:: @ 080CCB29
- .incbin "businessScrub/gUnk_080CCB29.bin"
+gSpriteAnimations_BusinessScrub_19:: @ 080CCB29
+ .include "animations/gSpriteAnimations_BusinessScrub_19.s"
-gUnk_080CCB3A:: @ 080CCB3A
- .incbin "businessScrub/gUnk_080CCB3A.bin"
+gSpriteAnimations_BusinessScrub_22:: @ 080CCB3A
+ .include "animations/gSpriteAnimations_BusinessScrub_22.s"
-gUnk_080CCB47:: @ 080CCB47
- .incbin "businessScrub/gUnk_080CCB47.bin"
+gSpriteAnimations_BusinessScrub_20:: @ 080CCB47
+ .include "animations/gSpriteAnimations_BusinessScrub_20.s"
-gUnk_080CCB54:: @ 080CCB54
- .incbin "businessScrub/gUnk_080CCB54.bin"
+gSpriteAnimations_BusinessScrub_21:: @ 080CCB54
+ .include "animations/gSpriteAnimations_BusinessScrub_21.s"
-gUnk_080CCB61:: @ 080CCB61
- .incbin "businessScrub/gUnk_080CCB61.bin"
+gSpriteAnimations_BusinessScrub_23:: @ 080CCB61
+ .include "animations/gSpriteAnimations_BusinessScrub_23.s"
-gUnk_080CCB6E:: @ 080CCB6E
- .incbin "businessScrub/gUnk_080CCB6E.bin"
+gSpriteAnimations_BusinessScrub_24:: @ 080CCB6E
+ .include "animations/gSpriteAnimations_BusinessScrub_24.s"
-gUnk_080CCB7F:: @ 080CCB7F
- .incbin "businessScrub/gUnk_080CCB7F.bin"
+gSpriteAnimations_BusinessScrub_25:: @ 080CCB7F
+ .include "animations/gSpriteAnimations_BusinessScrub_25.s"
gSpriteAnimations_BusinessScrub:: @ 080CCB94
- .4byte gUnk_080CCA1F
- .4byte gUnk_080CCA34
- .4byte gUnk_080CCA0A
- .4byte gUnk_080CCA49
- .4byte gUnk_080CCAA7
- .4byte gUnk_080CCAAC
- .4byte gUnk_080CCAA2
- .4byte gUnk_080CCAB1
- .4byte gUnk_080CCAC6
- .4byte gUnk_080CCAD6
- .4byte gUnk_080CCAB6
- .4byte gUnk_080CCAE6
- .4byte gUnk_080CCA6F
- .4byte gUnk_080CCA80
- .4byte gUnk_080CCA5E
- .4byte gUnk_080CCA91
- .4byte gUnk_080CCB07
- .4byte gUnk_080CCB18
- .4byte gUnk_080CCAF6
- .4byte gUnk_080CCB29
- .4byte gUnk_080CCB47
- .4byte gUnk_080CCB54
- .4byte gUnk_080CCB3A
- .4byte gUnk_080CCB61
- .4byte gUnk_080CCB6E
- .4byte gUnk_080CCB7F
+ .4byte gSpriteAnimations_BusinessScrub_0
+ .4byte gSpriteAnimations_BusinessScrub_1
+ .4byte gSpriteAnimations_BusinessScrub_2
+ .4byte gSpriteAnimations_BusinessScrub_3
+ .4byte gSpriteAnimations_BusinessScrub_4
+ .4byte gSpriteAnimations_BusinessScrub_5
+ .4byte gSpriteAnimations_BusinessScrub_6
+ .4byte gSpriteAnimations_BusinessScrub_7
+ .4byte gSpriteAnimations_BusinessScrub_8
+ .4byte gSpriteAnimations_BusinessScrub_9
+ .4byte gSpriteAnimations_BusinessScrub_10
+ .4byte gSpriteAnimations_BusinessScrub_11
+ .4byte gSpriteAnimations_BusinessScrub_12
+ .4byte gSpriteAnimations_BusinessScrub_13
+ .4byte gSpriteAnimations_BusinessScrub_14
+ .4byte gSpriteAnimations_BusinessScrub_15
+ .4byte gSpriteAnimations_BusinessScrub_16
+ .4byte gSpriteAnimations_BusinessScrub_17
+ .4byte gSpriteAnimations_BusinessScrub_18
+ .4byte gSpriteAnimations_BusinessScrub_19
+ .4byte gSpriteAnimations_BusinessScrub_20
+ .4byte gSpriteAnimations_BusinessScrub_21
+ .4byte gSpriteAnimations_BusinessScrub_22
+ .4byte gSpriteAnimations_BusinessScrub_23
+ .4byte gSpriteAnimations_BusinessScrub_24
+ .4byte gSpriteAnimations_BusinessScrub_25
.4byte 00000000
diff --git a/data/animations/enemy/chaser.s b/data/animations/enemy/chaser.s
index 2d678b41..66950e79 100644
--- a/data/animations/enemy/chaser.s
+++ b/data/animations/enemy/chaser.s
@@ -3,17 +3,17 @@
.section .rodata
-gUnk_080CD2A8:: @ 080CD2A8
- .incbin "chaser/gUnk_080CD2A8.bin"
+gSpriteAnimations_Chaser_0:: @ 080CD2A8
+ .include "animations/gSpriteAnimations_Chaser_0.s"
-gUnk_080CD2AC:: @ 080CD2AC
- .incbin "chaser/gUnk_080CD2AC.bin"
+gSpriteAnimations_Chaser_1:: @ 080CD2AC
+ .include "animations/gSpriteAnimations_Chaser_1.s"
-gUnk_080CD2BD:: @ 080CD2BD
- .incbin "chaser/gUnk_080CD2BD.bin"
+gSpriteAnimations_Chaser_2:: @ 080CD2BD
+ .include "animations/gSpriteAnimations_Chaser_2.s"
gSpriteAnimations_Chaser:: @ 080CD2C8
- .4byte gUnk_080CD2A8
- .4byte gUnk_080CD2AC
- .4byte gUnk_080CD2BD
+ .4byte gSpriteAnimations_Chaser_0
+ .4byte gSpriteAnimations_Chaser_1
+ .4byte gSpriteAnimations_Chaser_2
.4byte 00000000
diff --git a/data/animations/enemy/chuchu.s b/data/animations/enemy/chuchu.s
index 0cd82f11..e6f9a35d 100644
--- a/data/animations/enemy/chuchu.s
+++ b/data/animations/enemy/chuchu.s
@@ -7,45 +7,45 @@
gUnk_080CA2B4:: @ 080CA2B4
.incbin "chuchu/gUnk_080CA2B4.bin"
-gUnk_080CA2BE:: @ 080CA2BE
- .incbin "chuchu/gUnk_080CA2BE.bin"
+gSpriteAnimations_Chuchu_0:: @ 080CA2BE
+ .include "animations/gSpriteAnimations_Chuchu_0.s"
-gUnk_080CA2EA:: @ 080CA2EA
- .incbin "chuchu/gUnk_080CA2EA.bin"
+gSpriteAnimations_Chuchu_1:: @ 080CA2EA
+ .include "animations/gSpriteAnimations_Chuchu_1.s"
-gUnk_080CA2FB:: @ 080CA2FB
- .incbin "chuchu/gUnk_080CA2FB.bin"
+gSpriteAnimations_Chuchu_2:: @ 080CA2FB
+ .include "animations/gSpriteAnimations_Chuchu_2.s"
-gUnk_080CA33C:: @ 080CA33C
- .incbin "chuchu/gUnk_080CA33C.bin"
+gSpriteAnimations_Chuchu_3:: @ 080CA33C
+ .include "animations/gSpriteAnimations_Chuchu_3.s"
-gUnk_080CA358:: @ 080CA358
- .incbin "chuchu/gUnk_080CA358.bin"
+gSpriteAnimations_Chuchu_4:: @ 080CA358
+ .include "animations/gSpriteAnimations_Chuchu_4.s"
-gUnk_080CA364:: @ 080CA364
- .incbin "chuchu/gUnk_080CA364.bin"
+gSpriteAnimations_Chuchu_5:: @ 080CA364
+ .include "animations/gSpriteAnimations_Chuchu_5.s"
-gUnk_080CA370:: @ 080CA370
- .incbin "chuchu/gUnk_080CA370.bin"
+gSpriteAnimations_Chuchu_6:: @ 080CA370
+ .include "animations/gSpriteAnimations_Chuchu_6.s"
-gUnk_080CA3B1:: @ 080CA3B1
- .incbin "chuchu/gUnk_080CA3B1.bin"
+gSpriteAnimations_Chuchu_7:: @ 080CA3B1
+ .include "animations/gSpriteAnimations_Chuchu_7.s"
-gUnk_080CA3C5:: @ 080CA3C5
- .incbin "chuchu/gUnk_080CA3C5.bin"
+gSpriteAnimations_Chuchu_8:: @ 080CA3C5
+ .include "animations/gSpriteAnimations_Chuchu_8.s"
-gUnk_080CA42E:: @ 080CA42E
- .incbin "chuchu/gUnk_080CA42E.bin"
+gSpriteAnimations_Chuchu_9:: @ 080CA42E
+ .include "animations/gSpriteAnimations_Chuchu_9.s"
gSpriteAnimations_Chuchu:: @ 080CA470
- .4byte gUnk_080CA2BE
- .4byte gUnk_080CA2EA
- .4byte gUnk_080CA2FB
- .4byte gUnk_080CA33C
- .4byte gUnk_080CA358
- .4byte gUnk_080CA364
- .4byte gUnk_080CA370
- .4byte gUnk_080CA3B1
- .4byte gUnk_080CA3C5
- .4byte gUnk_080CA42E
+ .4byte gSpriteAnimations_Chuchu_0
+ .4byte gSpriteAnimations_Chuchu_1
+ .4byte gSpriteAnimations_Chuchu_2
+ .4byte gSpriteAnimations_Chuchu_3
+ .4byte gSpriteAnimations_Chuchu_4
+ .4byte gSpriteAnimations_Chuchu_5
+ .4byte gSpriteAnimations_Chuchu_6
+ .4byte gSpriteAnimations_Chuchu_7
+ .4byte gSpriteAnimations_Chuchu_8
+ .4byte gSpriteAnimations_Chuchu_9
.4byte 00000000
diff --git a/data/animations/enemy/chuchuBoss.s b/data/animations/enemy/chuchuBoss.s
index 9ca1cb25..41d08cad 100644
--- a/data/animations/enemy/chuchuBoss.s
+++ b/data/animations/enemy/chuchuBoss.s
@@ -3,122 +3,122 @@
.section .rodata
-gUnk_080CC2DF:: @ 080CC2DF
- .incbin "chuchuBoss/gUnk_080CC2DF.bin"
+gSpriteAnimations_ChuchuBoss_1_0:: @ 080CC2DF
+ .include "animations/gSpriteAnimations_ChuchuBoss_1_0.s"
-gUnk_080CC2E3:: @ 080CC2E3
- .incbin "chuchuBoss/gUnk_080CC2E3.bin"
+gSpriteAnimations_ChuchuBoss_1_1:: @ 080CC2E3
+ .include "animations/gSpriteAnimations_ChuchuBoss_1_1.s"
-gUnk_080CC2E7:: @ 080CC2E7
- .incbin "chuchuBoss/gUnk_080CC2E7.bin"
+gSpriteAnimations_ChuchuBoss_1_2:: @ 080CC2E7
+ .include "animations/gSpriteAnimations_ChuchuBoss_1_2.s"
-gUnk_080CC2EB:: @ 080CC2EB
- .incbin "chuchuBoss/gUnk_080CC2EB.bin"
+gSpriteAnimations_ChuchuBoss_1_3:: @ 080CC2EB
+ .include "animations/gSpriteAnimations_ChuchuBoss_1_3.s"
-gUnk_080CC2EF:: @ 080CC2EF
- .incbin "chuchuBoss/gUnk_080CC2EF.bin"
+gSpriteAnimations_ChuchuBoss_0_0:: @ 080CC2EF
+ .include "animations/gSpriteAnimations_ChuchuBoss_0_0.s"
-gUnk_080CC2F4:: @ 080CC2F4
- .incbin "chuchuBoss/gUnk_080CC2F4.bin"
+gSpriteAnimations_ChuchuBoss_0_1:: @ 080CC2F4
+ .include "animations/gSpriteAnimations_ChuchuBoss_0_1.s"
-gUnk_080CC305:: @ 080CC305
- .incbin "chuchuBoss/gUnk_080CC305.bin"
+gSpriteAnimations_ChuchuBoss_0_2:: @ 080CC305
+ .include "animations/gSpriteAnimations_ChuchuBoss_0_2.s"
-gUnk_080CC31E:: @ 080CC31E
- .incbin "chuchuBoss/gUnk_080CC31E.bin"
+gSpriteAnimations_ChuchuBoss_0_3:: @ 080CC31E
+ .include "animations/gSpriteAnimations_ChuchuBoss_0_3.s"
-gUnk_080CC32B:: @ 080CC32B
- .incbin "chuchuBoss/gUnk_080CC32B.bin"
+gSpriteAnimations_ChuchuBoss_0_4:: @ 080CC32B
+ .include "animations/gSpriteAnimations_ChuchuBoss_0_4.s"
-gUnk_080CC338:: @ 080CC338
- .incbin "chuchuBoss/gUnk_080CC338.bin"
+gSpriteAnimations_ChuchuBoss_0_10:: @ 080CC338
+ .include "animations/gSpriteAnimations_ChuchuBoss_0_10.s"
-gUnk_080CC33D:: @ 080CC33D
- .incbin "chuchuBoss/gUnk_080CC33D.bin"
+gSpriteAnimations_ChuchuBoss_0_5:: @ 080CC33D
+ .include "animations/gSpriteAnimations_ChuchuBoss_0_5.s"
-gUnk_080CC346:: @ 080CC346
- .incbin "chuchuBoss/gUnk_080CC346.bin"
+gSpriteAnimations_ChuchuBoss_0_7:: @ 080CC346
+ .include "animations/gSpriteAnimations_ChuchuBoss_0_7.s"
-gUnk_080CC353:: @ 080CC353
- .incbin "chuchuBoss/gUnk_080CC353.bin"
+gSpriteAnimations_ChuchuBoss_0_6:: @ 080CC353
+ .include "animations/gSpriteAnimations_ChuchuBoss_0_6.s"
-gUnk_080CC35C:: @ 080CC35C
- .incbin "chuchuBoss/gUnk_080CC35C.bin"
+gSpriteAnimations_ChuchuBoss_0_8:: @ 080CC35C
+ .include "animations/gSpriteAnimations_ChuchuBoss_0_8.s"
-gUnk_080CC369:: @ 080CC369
- .incbin "chuchuBoss/gUnk_080CC369.bin"
+gSpriteAnimations_ChuchuBoss_0_11:: @ 080CC369
+ .include "animations/gSpriteAnimations_ChuchuBoss_0_11.s"
-gUnk_080CC372:: @ 080CC372
- .incbin "chuchuBoss/gUnk_080CC372.bin"
+gSpriteAnimations_ChuchuBoss_0_12:: @ 080CC372
+ .include "animations/gSpriteAnimations_ChuchuBoss_0_12.s"
-gUnk_080CC37B:: @ 080CC37B
- .incbin "chuchuBoss/gUnk_080CC37B.bin"
+gSpriteAnimations_ChuchuBoss_0_9:: @ 080CC37B
+ .include "animations/gSpriteAnimations_ChuchuBoss_0_9.s"
-gUnk_080CC39C:: @ 080CC39C
- .incbin "chuchuBoss/gUnk_080CC39C.bin"
+gSpriteAnimations_ChuchuBoss_2_0:: @ 080CC39C
+ .include "animations/gSpriteAnimations_ChuchuBoss_2_0.s"
-gUnk_080CC3D4:: @ 080CC3D4
- .incbin "chuchuBoss/gUnk_080CC3D4.bin"
+gSpriteAnimations_ChuchuBoss_2_1:: @ 080CC3D4
+ .include "animations/gSpriteAnimations_ChuchuBoss_2_1.s"
-gUnk_080CC40C:: @ 080CC40C
- .incbin "chuchuBoss/gUnk_080CC40C.bin"
+gSpriteAnimations_ChuchuBoss_2_2:: @ 080CC40C
+ .include "animations/gSpriteAnimations_ChuchuBoss_2_2.s"
-gUnk_080CC440:: @ 080CC440
- .incbin "chuchuBoss/gUnk_080CC440.bin"
+gSpriteAnimations_ChuchuBoss_2_4:: @ 080CC440
+ .include "animations/gSpriteAnimations_ChuchuBoss_2_4.s"
-gUnk_080CC478:: @ 080CC478
- .incbin "chuchuBoss/gUnk_080CC478.bin"
+gSpriteAnimations_ChuchuBoss_2_5:: @ 080CC478
+ .include "animations/gSpriteAnimations_ChuchuBoss_2_5.s"
-gUnk_080CC4B0:: @ 080CC4B0
- .incbin "chuchuBoss/gUnk_080CC4B0.bin"
+gSpriteAnimations_ChuchuBoss_2_3:: @ 080CC4B0
+ .include "animations/gSpriteAnimations_ChuchuBoss_2_3.s"
-gUnk_080CC515:: @ 080CC515
- .incbin "chuchuBoss/gUnk_080CC515.bin"
+gSpriteAnimations_ChuchuBoss_2_6:: @ 080CC515
+ .include "animations/gSpriteAnimations_ChuchuBoss_2_6.s"
-gUnk_080CC582:: @ 080CC582
- .incbin "chuchuBoss/gUnk_080CC582.bin"
+gSpriteAnimations_ChuchuBoss_2_7:: @ 080CC582
+ .include "animations/gSpriteAnimations_ChuchuBoss_2_7.s"
-gUnk_080CC5EF:: @ 080CC5EF
- .incbin "chuchuBoss/gUnk_080CC5EF.bin"
+gSpriteAnimations_ChuchuBoss_2_8:: @ 080CC5EF
+ .include "animations/gSpriteAnimations_ChuchuBoss_2_8.s"
-gUnk_080CC65C:: @ 080CC65C
- .incbin "chuchuBoss/gUnk_080CC65C.bin"
+gSpriteAnimations_ChuchuBoss_2_9:: @ 080CC65C
+ .include "animations/gSpriteAnimations_ChuchuBoss_2_9.s"
-gUnk_080CC67D:: @ 080CC67D
- .incbin "chuchuBoss/gUnk_080CC67D.bin"
+gSpriteAnimations_ChuchuBoss_1_4:: @ 080CC67D
+ .include "animations/gSpriteAnimations_ChuchuBoss_1_4.s"
gSpriteAnimations_ChuchuBoss_1:: @ 080CC684
- .4byte gUnk_080CC2DF
- .4byte gUnk_080CC2E3
- .4byte gUnk_080CC2E7
- .4byte gUnk_080CC2EB
- .4byte gUnk_080CC67D
+ .4byte gSpriteAnimations_ChuchuBoss_1_0
+ .4byte gSpriteAnimations_ChuchuBoss_1_1
+ .4byte gSpriteAnimations_ChuchuBoss_1_2
+ .4byte gSpriteAnimations_ChuchuBoss_1_3
+ .4byte gSpriteAnimations_ChuchuBoss_1_4
.4byte 00000000
gSpriteAnimations_ChuchuBoss_0:: @ 080CC69C
- .4byte gUnk_080CC2EF
- .4byte gUnk_080CC2F4
- .4byte gUnk_080CC305
- .4byte gUnk_080CC31E
- .4byte gUnk_080CC32B
- .4byte gUnk_080CC33D
- .4byte gUnk_080CC353
- .4byte gUnk_080CC346
- .4byte gUnk_080CC35C
- .4byte gUnk_080CC37B
- .4byte gUnk_080CC338
- .4byte gUnk_080CC369
- .4byte gUnk_080CC372
+ .4byte gSpriteAnimations_ChuchuBoss_0_0
+ .4byte gSpriteAnimations_ChuchuBoss_0_1
+ .4byte gSpriteAnimations_ChuchuBoss_0_2
+ .4byte gSpriteAnimations_ChuchuBoss_0_3
+ .4byte gSpriteAnimations_ChuchuBoss_0_4
+ .4byte gSpriteAnimations_ChuchuBoss_0_5
+ .4byte gSpriteAnimations_ChuchuBoss_0_6
+ .4byte gSpriteAnimations_ChuchuBoss_0_7
+ .4byte gSpriteAnimations_ChuchuBoss_0_8
+ .4byte gSpriteAnimations_ChuchuBoss_0_9
+ .4byte gSpriteAnimations_ChuchuBoss_0_10
+ .4byte gSpriteAnimations_ChuchuBoss_0_11
+ .4byte gSpriteAnimations_ChuchuBoss_0_12
.4byte 00000000
gSpriteAnimations_ChuchuBoss_2:: @ 080CC6D4
- .4byte gUnk_080CC39C
- .4byte gUnk_080CC3D4
- .4byte gUnk_080CC40C
- .4byte gUnk_080CC4B0
- .4byte gUnk_080CC440
- .4byte gUnk_080CC478
- .4byte gUnk_080CC515
- .4byte gUnk_080CC582
- .4byte gUnk_080CC5EF
- .4byte gUnk_080CC65C
+ .4byte gSpriteAnimations_ChuchuBoss_2_0
+ .4byte gSpriteAnimations_ChuchuBoss_2_1
+ .4byte gSpriteAnimations_ChuchuBoss_2_2
+ .4byte gSpriteAnimations_ChuchuBoss_2_3
+ .4byte gSpriteAnimations_ChuchuBoss_2_4
+ .4byte gSpriteAnimations_ChuchuBoss_2_5
+ .4byte gSpriteAnimations_ChuchuBoss_2_6
+ .4byte gSpriteAnimations_ChuchuBoss_2_7
+ .4byte gSpriteAnimations_ChuchuBoss_2_8
+ .4byte gSpriteAnimations_ChuchuBoss_2_9
diff --git a/data/animations/enemy/cloudPiranha.s b/data/animations/enemy/cloudPiranha.s
index ef00db68..fc2ca23d 100644
--- a/data/animations/enemy/cloudPiranha.s
+++ b/data/animations/enemy/cloudPiranha.s
@@ -4,53 +4,53 @@
.section .rodata
.align 2
-gUnk_080CF530:: @ 080CF530
- .incbin "cloudPiranha/gUnk_080CF530.bin"
+gSpriteAnimations_CloudPiranha_0:: @ 080CF530
+ .include "animations/gSpriteAnimations_CloudPiranha_0.s"
-gUnk_080CF53D:: @ 080CF53D
- .incbin "cloudPiranha/gUnk_080CF53D.bin"
+gSpriteAnimations_CloudPiranha_1:: @ 080CF53D
+ .include "animations/gSpriteAnimations_CloudPiranha_1.s"
-gUnk_080CF54A:: @ 080CF54A
- .incbin "cloudPiranha/gUnk_080CF54A.bin"
+gSpriteAnimations_CloudPiranha_2:: @ 080CF54A
+ .include "animations/gSpriteAnimations_CloudPiranha_2.s"
-gUnk_080CF557:: @ 080CF557
- .incbin "cloudPiranha/gUnk_080CF557.bin"
+gSpriteAnimations_CloudPiranha_3:: @ 080CF557
+ .include "animations/gSpriteAnimations_CloudPiranha_3.s"
-gUnk_080CF564:: @ 080CF564
- .incbin "cloudPiranha/gUnk_080CF564.bin"
+gSpriteAnimations_CloudPiranha_4:: @ 080CF564
+ .include "animations/gSpriteAnimations_CloudPiranha_4.s"
-gUnk_080CF571:: @ 080CF571
- .incbin "cloudPiranha/gUnk_080CF571.bin"
+gSpriteAnimations_CloudPiranha_5:: @ 080CF571
+ .include "animations/gSpriteAnimations_CloudPiranha_5.s"
-gUnk_080CF57E:: @ 080CF57E
- .incbin "cloudPiranha/gUnk_080CF57E.bin"
+gSpriteAnimations_CloudPiranha_6:: @ 080CF57E
+ .include "animations/gSpriteAnimations_CloudPiranha_6.s"
-gUnk_080CF58B:: @ 080CF58B
- .incbin "cloudPiranha/gUnk_080CF58B.bin"
+gSpriteAnimations_CloudPiranha_7:: @ 080CF58B
+ .include "animations/gSpriteAnimations_CloudPiranha_7.s"
-gUnk_080CF598:: @ 080CF598
- .incbin "cloudPiranha/gUnk_080CF598.bin"
+gSpriteAnimations_CloudPiranha_8:: @ 080CF598
+ .include "animations/gSpriteAnimations_CloudPiranha_8.s"
-gUnk_080CF5A5:: @ 080CF5A5
- .incbin "cloudPiranha/gUnk_080CF5A5.bin"
+gSpriteAnimations_CloudPiranha_9:: @ 080CF5A5
+ .include "animations/gSpriteAnimations_CloudPiranha_9.s"
-gUnk_080CF5B2:: @ 080CF5B2
- .incbin "cloudPiranha/gUnk_080CF5B2.bin"
+gSpriteAnimations_CloudPiranha_10:: @ 080CF5B2
+ .include "animations/gSpriteAnimations_CloudPiranha_10.s"
-gUnk_080CF5BF:: @ 080CF5BF
- .incbin "cloudPiranha/gUnk_080CF5BF.bin"
+gSpriteAnimations_CloudPiranha_11:: @ 080CF5BF
+ .include "animations/gSpriteAnimations_CloudPiranha_11.s"
gSpriteAnimations_CloudPiranha:: @ 080CF5CC
- .4byte gUnk_080CF530
- .4byte gUnk_080CF53D
- .4byte gUnk_080CF54A
- .4byte gUnk_080CF557
- .4byte gUnk_080CF564
- .4byte gUnk_080CF571
- .4byte gUnk_080CF57E
- .4byte gUnk_080CF58B
- .4byte gUnk_080CF598
- .4byte gUnk_080CF5A5
- .4byte gUnk_080CF5B2
- .4byte gUnk_080CF5BF
+ .4byte gSpriteAnimations_CloudPiranha_0
+ .4byte gSpriteAnimations_CloudPiranha_1
+ .4byte gSpriteAnimations_CloudPiranha_2
+ .4byte gSpriteAnimations_CloudPiranha_3
+ .4byte gSpriteAnimations_CloudPiranha_4
+ .4byte gSpriteAnimations_CloudPiranha_5
+ .4byte gSpriteAnimations_CloudPiranha_6
+ .4byte gSpriteAnimations_CloudPiranha_7
+ .4byte gSpriteAnimations_CloudPiranha_8
+ .4byte gSpriteAnimations_CloudPiranha_9
+ .4byte gSpriteAnimations_CloudPiranha_10
+ .4byte gSpriteAnimations_CloudPiranha_11
.4byte 00000000
diff --git a/data/animations/enemy/crow.s b/data/animations/enemy/crow.s
index 8b6482dd..f01e8fc5 100644
--- a/data/animations/enemy/crow.s
+++ b/data/animations/enemy/crow.s
@@ -5,29 +5,29 @@
.align 2
-gUnk_080CE9B0:: @ 080CE9B0
- .incbin "crow/gUnk_080CE9B0.bin"
+gSpriteAnimations_Crow_0:: @ 080CE9B0
+ .include "animations/gSpriteAnimations_Crow_0.s"
-gUnk_080CE9B5:: @ 080CE9B5
- .incbin "crow/gUnk_080CE9B5.bin"
+gSpriteAnimations_Crow_1:: @ 080CE9B5
+ .include "animations/gSpriteAnimations_Crow_1.s"
-gUnk_080CE9BA:: @ 080CE9BA
- .incbin "crow/gUnk_080CE9BA.bin"
+gSpriteAnimations_Crow_2:: @ 080CE9BA
+ .include "animations/gSpriteAnimations_Crow_2.s"
-gUnk_080CE9CB:: @ 080CE9CB
- .incbin "crow/gUnk_080CE9CB.bin"
+gSpriteAnimations_Crow_3:: @ 080CE9CB
+ .include "animations/gSpriteAnimations_Crow_3.s"
-gUnk_080CE9DC:: @ 080CE9DC
- .incbin "crow/gUnk_080CE9DC.bin"
+gSpriteAnimations_Crow_4:: @ 080CE9DC
+ .include "animations/gSpriteAnimations_Crow_4.s"
-gUnk_080CE9ED:: @ 080CE9ED
- .incbin "crow/gUnk_080CE9ED.bin"
+gSpriteAnimations_Crow_5:: @ 080CE9ED
+ .include "animations/gSpriteAnimations_Crow_5.s"
gSpriteAnimations_Crow:: @ 080CEA00
- .4byte gUnk_080CE9B0
- .4byte gUnk_080CE9B5
- .4byte gUnk_080CE9BA
- .4byte gUnk_080CE9CB
- .4byte gUnk_080CE9DC
- .4byte gUnk_080CE9ED
+ .4byte gSpriteAnimations_Crow_0
+ .4byte gSpriteAnimations_Crow_1
+ .4byte gSpriteAnimations_Crow_2
+ .4byte gSpriteAnimations_Crow_3
+ .4byte gSpriteAnimations_Crow_4
+ .4byte gSpriteAnimations_Crow_5
.4byte 00000000
diff --git a/data/animations/enemy/cuccoAggr.s b/data/animations/enemy/cuccoAggr.s
index 3f43c950..815d45f8 100644
--- a/data/animations/enemy/cuccoAggr.s
+++ b/data/animations/enemy/cuccoAggr.s
@@ -4,24 +4,24 @@
.section .rodata
@ .align 2
-gUnk_080CF831:: @ 080CF831
- .incbin "cuccoAggr/gUnk_080CF831.bin"
+gSpriteAnimations_CuccoAggr_0:: @ 080CF831
+ .include "animations/gSpriteAnimations_CuccoAggr_0.s"
-gUnk_080CF836:: @ 080CF836
- .incbin "cuccoAggr/gUnk_080CF836.bin"
+gSpriteAnimations_CuccoAggr_1:: @ 080CF836
+ .include "animations/gSpriteAnimations_CuccoAggr_1.s"
-gUnk_080CF847:: @ 080CF847
- .incbin "cuccoAggr/gUnk_080CF847.bin"
+gSpriteAnimations_CuccoAggr_2:: @ 080CF847
+ .include "animations/gSpriteAnimations_CuccoAggr_2.s"
-gUnk_080CF85F:: @ 080CF85F
- .incbin "cuccoAggr/gUnk_080CF85F.bin"
+gSpriteAnimations_CuccoAggr_3:: @ 080CF85F
+ .include "animations/gSpriteAnimations_CuccoAggr_3.s"
-gUnk_080CF87F:: @ 080CF87F
- .incbin "cuccoAggr/gUnk_080CF87F.bin"
+gSpriteAnimations_CuccoAggr_4:: @ 080CF87F
+ .include "animations/gSpriteAnimations_CuccoAggr_4.s"
gSpriteAnimations_CuccoAggr:: @ 080CF890
- .4byte gUnk_080CF831
- .4byte gUnk_080CF836
- .4byte gUnk_080CF847
- .4byte gUnk_080CF85F
- .4byte gUnk_080CF87F
+ .4byte gSpriteAnimations_CuccoAggr_0
+ .4byte gSpriteAnimations_CuccoAggr_1
+ .4byte gSpriteAnimations_CuccoAggr_2
+ .4byte gSpriteAnimations_CuccoAggr_3
+ .4byte gSpriteAnimations_CuccoAggr_4
diff --git a/data/animations/enemy/curtain.s b/data/animations/enemy/curtain.s
index 3c90e805..ba4205b0 100644
--- a/data/animations/enemy/curtain.s
+++ b/data/animations/enemy/curtain.s
@@ -5,21 +5,21 @@
.align 2
-gUnk_080D1CF0:: @ 080D1CF0
- .incbin "curtain/gUnk_080D1CF0.bin"
+gSpriteAnimations_Curtain_0:: @ 080D1CF0
+ .include "animations/gSpriteAnimations_Curtain_0.s"
-gUnk_080D1CF9:: @ 080D1CF9
- .incbin "curtain/gUnk_080D1CF9.bin"
+gSpriteAnimations_Curtain_1:: @ 080D1CF9
+ .include "animations/gSpriteAnimations_Curtain_1.s"
-gUnk_080D1D02:: @ 080D1D02
- .incbin "curtain/gUnk_080D1D02.bin"
+gSpriteAnimations_Curtain_2:: @ 080D1D02
+ .include "animations/gSpriteAnimations_Curtain_2.s"
-gUnk_080D1D26:: @ 080D1D26
- .incbin "curtain/gUnk_080D1D26.bin"
+gSpriteAnimations_Curtain_3:: @ 080D1D26
+ .include "animations/gSpriteAnimations_Curtain_3.s"
gSpriteAnimations_Curtain:: @ 080D1D34
- .4byte gUnk_080D1CF0
- .4byte gUnk_080D1CF9
- .4byte gUnk_080D1D02
- .4byte gUnk_080D1D26
+ .4byte gSpriteAnimations_Curtain_0
+ .4byte gSpriteAnimations_Curtain_1
+ .4byte gSpriteAnimations_Curtain_2
+ .4byte gSpriteAnimations_Curtain_3
.4byte 00000000
diff --git a/data/animations/enemy/darkNut.s b/data/animations/enemy/darkNut.s
index d1012274..d6a9c040 100644
--- a/data/animations/enemy/darkNut.s
+++ b/data/animations/enemy/darkNut.s
@@ -4,312 +4,312 @@
.section .rodata
.align 2
-gUnk_080CAB6C:: @ 080CAB6C
- .incbin "darkNut/gUnk_080CAB6C.bin"
+gSpriteAnimations_DarkNut_0_0:: @ 080CAB6C
+ .include "animations/gSpriteAnimations_DarkNut_0_0.s"
-gUnk_080CAB70:: @ 080CAB70
- .incbin "darkNut/gUnk_080CAB70.bin"
+gSpriteAnimations_DarkNut_0_1:: @ 080CAB70
+ .include "animations/gSpriteAnimations_DarkNut_0_1.s"
-gUnk_080CAB74:: @ 080CAB74
- .incbin "darkNut/gUnk_080CAB74.bin"
+gSpriteAnimations_DarkNut_0_2:: @ 080CAB74
+ .include "animations/gSpriteAnimations_DarkNut_0_2.s"
-gUnk_080CAB78:: @ 080CAB78
- .incbin "darkNut/gUnk_080CAB78.bin"
+gSpriteAnimations_DarkNut_0_3:: @ 080CAB78
+ .include "animations/gSpriteAnimations_DarkNut_0_3.s"
-gUnk_080CAB7C:: @ 080CAB7C
- .incbin "darkNut/gUnk_080CAB7C.bin"
+gSpriteAnimations_DarkNut_0_4:: @ 080CAB7C
+ .include "animations/gSpriteAnimations_DarkNut_0_4.s"
-gUnk_080CAB8C:: @ 080CAB8C
- .incbin "darkNut/gUnk_080CAB8C.bin"
+gSpriteAnimations_DarkNut_0_5:: @ 080CAB8C
+ .include "animations/gSpriteAnimations_DarkNut_0_5.s"
-gUnk_080CAB9C:: @ 080CAB9C
- .incbin "darkNut/gUnk_080CAB9C.bin"
+gSpriteAnimations_DarkNut_0_6:: @ 080CAB9C
+ .include "animations/gSpriteAnimations_DarkNut_0_6.s"
-gUnk_080CABAC:: @ 080CABAC
- .incbin "darkNut/gUnk_080CABAC.bin"
+gSpriteAnimations_DarkNut_0_7:: @ 080CABAC
+ .include "animations/gSpriteAnimations_DarkNut_0_7.s"
-gUnk_080CABBC:: @ 080CABBC
- .incbin "darkNut/gUnk_080CABBC.bin"
+gSpriteAnimations_DarkNut_0_8:: @ 080CABBC
+ .include "animations/gSpriteAnimations_DarkNut_0_8.s"
-gUnk_080CABC0:: @ 080CABC0
- .incbin "darkNut/gUnk_080CABC0.bin"
+gSpriteAnimations_DarkNut_0_9:: @ 080CABC0
+ .include "animations/gSpriteAnimations_DarkNut_0_9.s"
-gUnk_080CABC4:: @ 080CABC4
- .incbin "darkNut/gUnk_080CABC4.bin"
+gSpriteAnimations_DarkNut_0_10:: @ 080CABC4
+ .include "animations/gSpriteAnimations_DarkNut_0_10.s"
-gUnk_080CABC8:: @ 080CABC8
- .incbin "darkNut/gUnk_080CABC8.bin"
+gSpriteAnimations_DarkNut_0_11:: @ 080CABC8
+ .include "animations/gSpriteAnimations_DarkNut_0_11.s"
-gUnk_080CABCC:: @ 080CABCC
- .incbin "darkNut/gUnk_080CABCC.bin"
+gSpriteAnimations_DarkNut_0_12:: @ 080CABCC
+ .include "animations/gSpriteAnimations_DarkNut_0_12.s"
-gUnk_080CABE5:: @ 080CABE5
- .incbin "darkNut/gUnk_080CABE5.bin"
+gSpriteAnimations_DarkNut_0_13:: @ 080CABE5
+ .include "animations/gSpriteAnimations_DarkNut_0_13.s"
-gUnk_080CABFE:: @ 080CABFE
- .incbin "darkNut/gUnk_080CABFE.bin"
+gSpriteAnimations_DarkNut_0_14:: @ 080CABFE
+ .include "animations/gSpriteAnimations_DarkNut_0_14.s"
-gUnk_080CAC17:: @ 080CAC17
- .incbin "darkNut/gUnk_080CAC17.bin"
+gSpriteAnimations_DarkNut_0_15:: @ 080CAC17
+ .include "animations/gSpriteAnimations_DarkNut_0_15.s"
-gUnk_080CAC30:: @ 080CAC30
- .incbin "darkNut/gUnk_080CAC30.bin"
+gSpriteAnimations_DarkNut_0_16:: @ 080CAC30
+ .include "animations/gSpriteAnimations_DarkNut_0_16.s"
-gUnk_080CAC3C:: @ 080CAC3C
- .incbin "darkNut/gUnk_080CAC3C.bin"
+gSpriteAnimations_DarkNut_0_17:: @ 080CAC3C
+ .include "animations/gSpriteAnimations_DarkNut_0_17.s"
-gUnk_080CAC48:: @ 080CAC48
- .incbin "darkNut/gUnk_080CAC48.bin"
+gSpriteAnimations_DarkNut_0_18:: @ 080CAC48
+ .include "animations/gSpriteAnimations_DarkNut_0_18.s"
-gUnk_080CAC54:: @ 080CAC54
- .incbin "darkNut/gUnk_080CAC54.bin"
+gSpriteAnimations_DarkNut_0_19:: @ 080CAC54
+ .include "animations/gSpriteAnimations_DarkNut_0_19.s"
-gUnk_080CAC60:: @ 080CAC60
- .incbin "darkNut/gUnk_080CAC60.bin"
+gSpriteAnimations_DarkNut_0_20:: @ 080CAC60
+ .include "animations/gSpriteAnimations_DarkNut_0_20.s"
-gUnk_080CAC88:: @ 080CAC88
- .incbin "darkNut/gUnk_080CAC88.bin"
+gSpriteAnimations_DarkNut_0_21:: @ 080CAC88
+ .include "animations/gSpriteAnimations_DarkNut_0_21.s"
-gUnk_080CACB0:: @ 080CACB0
- .incbin "darkNut/gUnk_080CACB0.bin"
+gSpriteAnimations_DarkNut_0_22:: @ 080CACB0
+ .include "animations/gSpriteAnimations_DarkNut_0_22.s"
-gUnk_080CACD8:: @ 080CACD8
- .incbin "darkNut/gUnk_080CACD8.bin"
+gSpriteAnimations_DarkNut_0_23:: @ 080CACD8
+ .include "animations/gSpriteAnimations_DarkNut_0_23.s"
-gUnk_080CAD00:: @ 080CAD00
- .incbin "darkNut/gUnk_080CAD00.bin"
+gSpriteAnimations_DarkNut_0_24:: @ 080CAD00
+ .include "animations/gSpriteAnimations_DarkNut_0_24.s"
-gUnk_080CAD19:: @ 080CAD19
- .incbin "darkNut/gUnk_080CAD19.bin"
+gSpriteAnimations_DarkNut_0_25:: @ 080CAD19
+ .include "animations/gSpriteAnimations_DarkNut_0_25.s"
-gUnk_080CAD32:: @ 080CAD32
- .incbin "darkNut/gUnk_080CAD32.bin"
+gSpriteAnimations_DarkNut_0_26:: @ 080CAD32
+ .include "animations/gSpriteAnimations_DarkNut_0_26.s"
-gUnk_080CAD4B:: @ 080CAD4B
- .incbin "darkNut/gUnk_080CAD4B.bin"
+gSpriteAnimations_DarkNut_0_27:: @ 080CAD4B
+ .include "animations/gSpriteAnimations_DarkNut_0_27.s"
-gUnk_080CAD64:: @ 080CAD64
- .incbin "darkNut/gUnk_080CAD64.bin"
+gSpriteAnimations_DarkNut_0_28:: @ 080CAD64
+ .include "animations/gSpriteAnimations_DarkNut_0_28.s"
-gUnk_080CAD70:: @ 080CAD70
- .incbin "darkNut/gUnk_080CAD70.bin"
+gSpriteAnimations_DarkNut_0_29:: @ 080CAD70
+ .include "animations/gSpriteAnimations_DarkNut_0_29.s"
-gUnk_080CAD7C:: @ 080CAD7C
- .incbin "darkNut/gUnk_080CAD7C.bin"
+gSpriteAnimations_DarkNut_0_30:: @ 080CAD7C
+ .include "animations/gSpriteAnimations_DarkNut_0_30.s"
-gUnk_080CAD88:: @ 080CAD88
- .incbin "darkNut/gUnk_080CAD88.bin"
+gSpriteAnimations_DarkNut_0_31:: @ 080CAD88
+ .include "animations/gSpriteAnimations_DarkNut_0_31.s"
-gUnk_080CAD94:: @ 080CAD94
- .incbin "darkNut/gUnk_080CAD94.bin"
+gSpriteAnimations_DarkNut_0_32:: @ 080CAD94
+ .include "animations/gSpriteAnimations_DarkNut_0_32.s"
-gUnk_080CADA9:: @ 080CADA9
- .incbin "darkNut/gUnk_080CADA9.bin"
+gSpriteAnimations_DarkNut_0_33:: @ 080CADA9
+ .include "animations/gSpriteAnimations_DarkNut_0_33.s"
-gUnk_080CADBE:: @ 080CADBE
- .incbin "darkNut/gUnk_080CADBE.bin"
+gSpriteAnimations_DarkNut_0_34:: @ 080CADBE
+ .include "animations/gSpriteAnimations_DarkNut_0_34.s"
-gUnk_080CADD3:: @ 080CADD3
- .incbin "darkNut/gUnk_080CADD3.bin"
+gSpriteAnimations_DarkNut_0_35:: @ 080CADD3
+ .include "animations/gSpriteAnimations_DarkNut_0_35.s"
-gUnk_080CADE8:: @ 080CADE8
- .incbin "darkNut/gUnk_080CADE8.bin"
+gSpriteAnimations_DarkNut_0_36:: @ 080CADE8
+ .include "animations/gSpriteAnimations_DarkNut_0_36.s"
-gUnk_080CAE01:: @ 080CAE01
- .incbin "darkNut/gUnk_080CAE01.bin"
+gSpriteAnimations_DarkNut_0_37:: @ 080CAE01
+ .include "animations/gSpriteAnimations_DarkNut_0_37.s"
-gUnk_080CAE1A:: @ 080CAE1A
- .incbin "darkNut/gUnk_080CAE1A.bin"
+gSpriteAnimations_DarkNut_0_38:: @ 080CAE1A
+ .include "animations/gSpriteAnimations_DarkNut_0_38.s"
-gUnk_080CAE33:: @ 080CAE33
- .incbin "darkNut/gUnk_080CAE33.bin"
+gSpriteAnimations_DarkNut_0_39:: @ 080CAE33
+ .include "animations/gSpriteAnimations_DarkNut_0_39.s"
-gUnk_080CAE4C:: @ 080CAE4C
- .incbin "darkNut/gUnk_080CAE4C.bin"
+gSpriteAnimations_DarkNut_0_40:: @ 080CAE4C
+ .include "animations/gSpriteAnimations_DarkNut_0_40.s"
-gUnk_080CAE65:: @ 080CAE65
- .incbin "darkNut/gUnk_080CAE65.bin"
+gSpriteAnimations_DarkNut_0_41:: @ 080CAE65
+ .include "animations/gSpriteAnimations_DarkNut_0_41.s"
-gUnk_080CAE7E:: @ 080CAE7E
- .incbin "darkNut/gUnk_080CAE7E.bin"
+gSpriteAnimations_DarkNut_0_42:: @ 080CAE7E
+ .include "animations/gSpriteAnimations_DarkNut_0_42.s"
-gUnk_080CAE97:: @ 080CAE97
- .incbin "darkNut/gUnk_080CAE97.bin"
+gSpriteAnimations_DarkNut_0_43:: @ 080CAE97
+ .include "animations/gSpriteAnimations_DarkNut_0_43.s"
-gUnk_080CAEB0:: @ 080CAEB0
- .incbin "darkNut/gUnk_080CAEB0.bin"
+gSpriteAnimations_DarkNut_0_44:: @ 080CAEB0
+ .include "animations/gSpriteAnimations_DarkNut_0_44.s"
-gUnk_080CAEC0:: @ 080CAEC0
- .incbin "darkNut/gUnk_080CAEC0.bin"
+gSpriteAnimations_DarkNut_0_45:: @ 080CAEC0
+ .include "animations/gSpriteAnimations_DarkNut_0_45.s"
-gUnk_080CAED0:: @ 080CAED0
- .incbin "darkNut/gUnk_080CAED0.bin"
+gSpriteAnimations_DarkNut_0_46:: @ 080CAED0
+ .include "animations/gSpriteAnimations_DarkNut_0_46.s"
-gUnk_080CAEE0:: @ 080CAEE0
- .incbin "darkNut/gUnk_080CAEE0.bin"
+gSpriteAnimations_DarkNut_0_47:: @ 080CAEE0
+ .include "animations/gSpriteAnimations_DarkNut_0_47.s"
-gUnk_080CAEF0:: @ 080CAEF0
- .incbin "darkNut/gUnk_080CAEF0.bin"
+gSpriteAnimations_DarkNut_1_0:: @ 080CAEF0
+ .include "animations/gSpriteAnimations_DarkNut_1_0.s"
-gUnk_080CAF20:: @ 080CAF20
- .incbin "darkNut/gUnk_080CAF20.bin"
+gSpriteAnimations_DarkNut_1_1:: @ 080CAF20
+ .include "animations/gSpriteAnimations_DarkNut_1_1.s"
-gUnk_080CAF50:: @ 080CAF50
- .incbin "darkNut/gUnk_080CAF50.bin"
+gSpriteAnimations_DarkNut_1_2:: @ 080CAF50
+ .include "animations/gSpriteAnimations_DarkNut_1_2.s"
-gUnk_080CAF80:: @ 080CAF80
- .incbin "darkNut/gUnk_080CAF80.bin"
+gSpriteAnimations_DarkNut_1_3:: @ 080CAF80
+ .include "animations/gSpriteAnimations_DarkNut_1_3.s"
-gUnk_080CAFB0:: @ 080CAFB0
- .incbin "darkNut/gUnk_080CAFB0.bin"
+gSpriteAnimations_DarkNut_1_4:: @ 080CAFB0
+ .include "animations/gSpriteAnimations_DarkNut_1_4.s"
-gUnk_080CAFC8:: @ 080CAFC8
- .incbin "darkNut/gUnk_080CAFC8.bin"
+gSpriteAnimations_DarkNut_1_5:: @ 080CAFC8
+ .include "animations/gSpriteAnimations_DarkNut_1_5.s"
-gUnk_080CAFE0:: @ 080CAFE0
- .incbin "darkNut/gUnk_080CAFE0.bin"
+gSpriteAnimations_DarkNut_1_6:: @ 080CAFE0
+ .include "animations/gSpriteAnimations_DarkNut_1_6.s"
-gUnk_080CAFF8:: @ 080CAFF8
- .incbin "darkNut/gUnk_080CAFF8.bin"
+gSpriteAnimations_DarkNut_1_7:: @ 080CAFF8
+ .include "animations/gSpriteAnimations_DarkNut_1_7.s"
-gUnk_080CB010:: @ 080CB010
- .incbin "darkNut/gUnk_080CB010.bin"
+gSpriteAnimations_DarkNut_1_8:: @ 080CB010
+ .include "animations/gSpriteAnimations_DarkNut_1_8.s"
-gUnk_080CB045:: @ 080CB045
- .incbin "darkNut/gUnk_080CB045.bin"
+gSpriteAnimations_DarkNut_1_9:: @ 080CB045
+ .include "animations/gSpriteAnimations_DarkNut_1_9.s"
-gUnk_080CB07A:: @ 080CB07A
- .incbin "darkNut/gUnk_080CB07A.bin"
+gSpriteAnimations_DarkNut_1_10:: @ 080CB07A
+ .include "animations/gSpriteAnimations_DarkNut_1_10.s"
-gUnk_080CB0AF:: @ 080CB0AF
- .incbin "darkNut/gUnk_080CB0AF.bin"
+gSpriteAnimations_DarkNut_1_11:: @ 080CB0AF
+ .include "animations/gSpriteAnimations_DarkNut_1_11.s"
-gUnk_080CB0E4:: @ 080CB0E4
- .incbin "darkNut/gUnk_080CB0E4.bin"
+gSpriteAnimations_DarkNut_1_12:: @ 080CB0E4
+ .include "animations/gSpriteAnimations_DarkNut_1_12.s"
-gUnk_080CB0EC:: @ 080CB0EC
- .incbin "darkNut/gUnk_080CB0EC.bin"
+gSpriteAnimations_DarkNut_1_13:: @ 080CB0EC
+ .include "animations/gSpriteAnimations_DarkNut_1_13.s"
-gUnk_080CB0F4:: @ 080CB0F4
- .incbin "darkNut/gUnk_080CB0F4.bin"
+gSpriteAnimations_DarkNut_1_14:: @ 080CB0F4
+ .include "animations/gSpriteAnimations_DarkNut_1_14.s"
-gUnk_080CB0FC:: @ 080CB0FC
- .incbin "darkNut/gUnk_080CB0FC.bin"
+gSpriteAnimations_DarkNut_1_15:: @ 080CB0FC
+ .include "animations/gSpriteAnimations_DarkNut_1_15.s"
-gUnk_080CB104:: @ 080CB104
- .incbin "darkNut/gUnk_080CB104.bin"
+gSpriteAnimations_DarkNut_1_16:: @ 080CB104
+ .include "animations/gSpriteAnimations_DarkNut_1_16.s"
-gUnk_080CB174:: @ 080CB174
- .incbin "darkNut/gUnk_080CB174.bin"
+gSpriteAnimations_DarkNut_1_17:: @ 080CB174
+ .include "animations/gSpriteAnimations_DarkNut_1_17.s"
-gUnk_080CB1E4:: @ 080CB1E4
- .incbin "darkNut/gUnk_080CB1E4.bin"
+gSpriteAnimations_DarkNut_1_18:: @ 080CB1E4
+ .include "animations/gSpriteAnimations_DarkNut_1_18.s"
-gUnk_080CB254:: @ 080CB254
- .incbin "darkNut/gUnk_080CB254.bin"
+gSpriteAnimations_DarkNut_1_19:: @ 080CB254
+ .include "animations/gSpriteAnimations_DarkNut_1_19.s"
-gUnk_080CB2C4:: @ 080CB2C4
- .incbin "darkNut/gUnk_080CB2C4.bin"
+gSpriteAnimations_DarkNut_1_20:: @ 080CB2C4
+ .include "animations/gSpriteAnimations_DarkNut_1_20.s"
-gUnk_080CB2F8:: @ 080CB2F8
- .incbin "darkNut/gUnk_080CB2F8.bin"
+gSpriteAnimations_DarkNut_1_21:: @ 080CB2F8
+ .include "animations/gSpriteAnimations_DarkNut_1_21.s"
-gUnk_080CB32C:: @ 080CB32C
- .incbin "darkNut/gUnk_080CB32C.bin"
+gSpriteAnimations_DarkNut_1_22:: @ 080CB32C
+ .include "animations/gSpriteAnimations_DarkNut_1_22.s"
-gUnk_080CB360:: @ 080CB360
- .incbin "darkNut/gUnk_080CB360.bin"
+gSpriteAnimations_DarkNut_1_23:: @ 080CB360
+ .include "animations/gSpriteAnimations_DarkNut_1_23.s"
-gUnk_080CB394:: @ 080CB394
- .incbin "darkNut/gUnk_080CB394.bin"
+gSpriteAnimations_DarkNut_1_24:: @ 080CB394
+ .include "animations/gSpriteAnimations_DarkNut_1_24.s"
-gUnk_080CB3BD:: @ 080CB3BD
- .incbin "darkNut/gUnk_080CB3BD.bin"
+gSpriteAnimations_DarkNut_1_25:: @ 080CB3BD
+ .include "animations/gSpriteAnimations_DarkNut_1_25.s"
-gUnk_080CB3E6:: @ 080CB3E6
- .incbin "darkNut/gUnk_080CB3E6.bin"
+gSpriteAnimations_DarkNut_1_26:: @ 080CB3E6
+ .include "animations/gSpriteAnimations_DarkNut_1_26.s"
-gUnk_080CB40F:: @ 080CB40F
- .incbin "darkNut/gUnk_080CB40F.bin"
+gSpriteAnimations_DarkNut_1_27:: @ 080CB40F
+ .include "animations/gSpriteAnimations_DarkNut_1_27.s"
gSpriteAnimations_DarkNut_0:: @ 080CB438
- .4byte gUnk_080CAB6C
- .4byte gUnk_080CAB70
- .4byte gUnk_080CAB74
- .4byte gUnk_080CAB78
- .4byte gUnk_080CAB7C
- .4byte gUnk_080CAB8C
- .4byte gUnk_080CAB9C
- .4byte gUnk_080CABAC
- .4byte gUnk_080CABBC
- .4byte gUnk_080CABC0
- .4byte gUnk_080CABC4
- .4byte gUnk_080CABC8
- .4byte gUnk_080CABCC
- .4byte gUnk_080CABE5
- .4byte gUnk_080CABFE
- .4byte gUnk_080CAC17
- .4byte gUnk_080CAC30
- .4byte gUnk_080CAC3C
- .4byte gUnk_080CAC48
- .4byte gUnk_080CAC54
- .4byte gUnk_080CAC60
- .4byte gUnk_080CAC88
- .4byte gUnk_080CACB0
- .4byte gUnk_080CACD8
- .4byte gUnk_080CAD00
- .4byte gUnk_080CAD19
- .4byte gUnk_080CAD32
- .4byte gUnk_080CAD4B
- .4byte gUnk_080CAD64
- .4byte gUnk_080CAD70
- .4byte gUnk_080CAD7C
- .4byte gUnk_080CAD88
- .4byte gUnk_080CAD94
- .4byte gUnk_080CADA9
- .4byte gUnk_080CADBE
- .4byte gUnk_080CADD3
- .4byte gUnk_080CADE8
- .4byte gUnk_080CAE01
- .4byte gUnk_080CAE1A
- .4byte gUnk_080CAE33
- .4byte gUnk_080CAE4C
- .4byte gUnk_080CAE65
- .4byte gUnk_080CAE7E
- .4byte gUnk_080CAE97
- .4byte gUnk_080CAEB0
- .4byte gUnk_080CAEC0
- .4byte gUnk_080CAED0
- .4byte gUnk_080CAEE0
+ .4byte gSpriteAnimations_DarkNut_0_0
+ .4byte gSpriteAnimations_DarkNut_0_1
+ .4byte gSpriteAnimations_DarkNut_0_2
+ .4byte gSpriteAnimations_DarkNut_0_3
+ .4byte gSpriteAnimations_DarkNut_0_4
+ .4byte gSpriteAnimations_DarkNut_0_5
+ .4byte gSpriteAnimations_DarkNut_0_6
+ .4byte gSpriteAnimations_DarkNut_0_7
+ .4byte gSpriteAnimations_DarkNut_0_8
+ .4byte gSpriteAnimations_DarkNut_0_9
+ .4byte gSpriteAnimations_DarkNut_0_10
+ .4byte gSpriteAnimations_DarkNut_0_11
+ .4byte gSpriteAnimations_DarkNut_0_12
+ .4byte gSpriteAnimations_DarkNut_0_13
+ .4byte gSpriteAnimations_DarkNut_0_14
+ .4byte gSpriteAnimations_DarkNut_0_15
+ .4byte gSpriteAnimations_DarkNut_0_16
+ .4byte gSpriteAnimations_DarkNut_0_17
+ .4byte gSpriteAnimations_DarkNut_0_18
+ .4byte gSpriteAnimations_DarkNut_0_19
+ .4byte gSpriteAnimations_DarkNut_0_20
+ .4byte gSpriteAnimations_DarkNut_0_21
+ .4byte gSpriteAnimations_DarkNut_0_22
+ .4byte gSpriteAnimations_DarkNut_0_23
+ .4byte gSpriteAnimations_DarkNut_0_24
+ .4byte gSpriteAnimations_DarkNut_0_25
+ .4byte gSpriteAnimations_DarkNut_0_26
+ .4byte gSpriteAnimations_DarkNut_0_27
+ .4byte gSpriteAnimations_DarkNut_0_28
+ .4byte gSpriteAnimations_DarkNut_0_29
+ .4byte gSpriteAnimations_DarkNut_0_30
+ .4byte gSpriteAnimations_DarkNut_0_31
+ .4byte gSpriteAnimations_DarkNut_0_32
+ .4byte gSpriteAnimations_DarkNut_0_33
+ .4byte gSpriteAnimations_DarkNut_0_34
+ .4byte gSpriteAnimations_DarkNut_0_35
+ .4byte gSpriteAnimations_DarkNut_0_36
+ .4byte gSpriteAnimations_DarkNut_0_37
+ .4byte gSpriteAnimations_DarkNut_0_38
+ .4byte gSpriteAnimations_DarkNut_0_39
+ .4byte gSpriteAnimations_DarkNut_0_40
+ .4byte gSpriteAnimations_DarkNut_0_41
+ .4byte gSpriteAnimations_DarkNut_0_42
+ .4byte gSpriteAnimations_DarkNut_0_43
+ .4byte gSpriteAnimations_DarkNut_0_44
+ .4byte gSpriteAnimations_DarkNut_0_45
+ .4byte gSpriteAnimations_DarkNut_0_46
+ .4byte gSpriteAnimations_DarkNut_0_47
.4byte 00000000
gSpriteAnimations_DarkNut_1:: @ 080CB4FC
- .4byte gUnk_080CAEF0
- .4byte gUnk_080CAF20
- .4byte gUnk_080CAF50
- .4byte gUnk_080CAF80
- .4byte gUnk_080CAFB0
- .4byte gUnk_080CAFC8
- .4byte gUnk_080CAFE0
- .4byte gUnk_080CAFF8
- .4byte gUnk_080CB010
- .4byte gUnk_080CB045
- .4byte gUnk_080CB07A
- .4byte gUnk_080CB0AF
- .4byte gUnk_080CB0E4
- .4byte gUnk_080CB0EC
- .4byte gUnk_080CB0F4
- .4byte gUnk_080CB0FC
- .4byte gUnk_080CB104
- .4byte gUnk_080CB174
- .4byte gUnk_080CB1E4
- .4byte gUnk_080CB254
- .4byte gUnk_080CB2C4
- .4byte gUnk_080CB2F8
- .4byte gUnk_080CB32C
- .4byte gUnk_080CB360
- .4byte gUnk_080CB394
- .4byte gUnk_080CB3BD
- .4byte gUnk_080CB3E6
- .4byte gUnk_080CB40F
+ .4byte gSpriteAnimations_DarkNut_1_0
+ .4byte gSpriteAnimations_DarkNut_1_1
+ .4byte gSpriteAnimations_DarkNut_1_2
+ .4byte gSpriteAnimations_DarkNut_1_3
+ .4byte gSpriteAnimations_DarkNut_1_4
+ .4byte gSpriteAnimations_DarkNut_1_5
+ .4byte gSpriteAnimations_DarkNut_1_6
+ .4byte gSpriteAnimations_DarkNut_1_7
+ .4byte gSpriteAnimations_DarkNut_1_8
+ .4byte gSpriteAnimations_DarkNut_1_9
+ .4byte gSpriteAnimations_DarkNut_1_10
+ .4byte gSpriteAnimations_DarkNut_1_11
+ .4byte gSpriteAnimations_DarkNut_1_12
+ .4byte gSpriteAnimations_DarkNut_1_13
+ .4byte gSpriteAnimations_DarkNut_1_14
+ .4byte gSpriteAnimations_DarkNut_1_15
+ .4byte gSpriteAnimations_DarkNut_1_16
+ .4byte gSpriteAnimations_DarkNut_1_17
+ .4byte gSpriteAnimations_DarkNut_1_18
+ .4byte gSpriteAnimations_DarkNut_1_19
+ .4byte gSpriteAnimations_DarkNut_1_20
+ .4byte gSpriteAnimations_DarkNut_1_21
+ .4byte gSpriteAnimations_DarkNut_1_22
+ .4byte gSpriteAnimations_DarkNut_1_23
+ .4byte gSpriteAnimations_DarkNut_1_24
+ .4byte gSpriteAnimations_DarkNut_1_25
+ .4byte gSpriteAnimations_DarkNut_1_26
+ .4byte gSpriteAnimations_DarkNut_1_27
.4byte 00000000
diff --git a/data/animations/enemy/doorMimic.s b/data/animations/enemy/doorMimic.s
index d31a3c22..2470c7bf 100644
--- a/data/animations/enemy/doorMimic.s
+++ b/data/animations/enemy/doorMimic.s
@@ -3,35 +3,35 @@
.section .rodata
-gUnk_080CB8B4:: @ 080CB8B4
- .incbin "doorMimic/gUnk_080CB8B4.bin"
+gSpriteAnimations_DoorMimic_0:: @ 080CB8B4
+ .include "animations/gSpriteAnimations_DoorMimic_0.s"
-gUnk_080CB8B9:: @ 080CB8B9
- .incbin "doorMimic/gUnk_080CB8B9.bin"
+gSpriteAnimations_DoorMimic_1:: @ 080CB8B9
+ .include "animations/gSpriteAnimations_DoorMimic_1.s"
-gUnk_080CB8BE:: @ 080CB8BE
- .incbin "doorMimic/gUnk_080CB8BE.bin"
+gSpriteAnimations_DoorMimic_4:: @ 080CB8BE
+ .include "animations/gSpriteAnimations_DoorMimic_4.s"
-gUnk_080CB8D7:: @ 080CB8D7
- .incbin "doorMimic/gUnk_080CB8D7.bin"
+gSpriteAnimations_DoorMimic_5:: @ 080CB8D7
+ .include "animations/gSpriteAnimations_DoorMimic_5.s"
-gUnk_080CB8F0:: @ 080CB8F0
- .incbin "doorMimic/gUnk_080CB8F0.bin"
+gSpriteAnimations_DoorMimic_8:: @ 080CB8F0
+ .include "animations/gSpriteAnimations_DoorMimic_8.s"
-gUnk_080CB901:: @ 080CB901
- .incbin "doorMimic/gUnk_080CB901.bin"
+gSpriteAnimations_DoorMimic_9:: @ 080CB901
+ .include "animations/gSpriteAnimations_DoorMimic_9.s"
gSpriteAnimations_DoorMimic:: @ 080CB914
- .4byte gUnk_080CB8B4
- .4byte gUnk_080CB8B9
- .4byte gUnk_080CB8B9
- .4byte gUnk_080CB8B4
- .4byte gUnk_080CB8BE
- .4byte gUnk_080CB8D7
- .4byte gUnk_080CB8D7
- .4byte gUnk_080CB8BE
- .4byte gUnk_080CB8F0
- .4byte gUnk_080CB901
- .4byte gUnk_080CB901
- .4byte gUnk_080CB8F0
+ .4byte gSpriteAnimations_DoorMimic_0
+ .4byte gSpriteAnimations_DoorMimic_1
+ .4byte gSpriteAnimations_DoorMimic_1
+ .4byte gSpriteAnimations_DoorMimic_0
+ .4byte gSpriteAnimations_DoorMimic_4
+ .4byte gSpriteAnimations_DoorMimic_5
+ .4byte gSpriteAnimations_DoorMimic_5
+ .4byte gSpriteAnimations_DoorMimic_4
+ .4byte gSpriteAnimations_DoorMimic_8
+ .4byte gSpriteAnimations_DoorMimic_9
+ .4byte gSpriteAnimations_DoorMimic_9
+ .4byte gSpriteAnimations_DoorMimic_8
.4byte 00000000
diff --git a/data/animations/enemy/enemy62.s b/data/animations/enemy/enemy62.s
index 67987686..729d7ac0 100644
--- a/data/animations/enemy/enemy62.s
+++ b/data/animations/enemy/enemy62.s
@@ -4,261 +4,261 @@
.section .rodata
.align 2
-gUnk_080D2368:: @ 080D2368
- .incbin "enemy62/gUnk_080D2368.bin"
+gSpriteAnimations_Enemy62_0:: @ 080D2368
+ .include "animations/gSpriteAnimations_Enemy62_0.s"
-gUnk_080D2379:: @ 080D2379
- .incbin "enemy62/gUnk_080D2379.bin"
+gSpriteAnimations_Enemy62_1:: @ 080D2379
+ .include "animations/gSpriteAnimations_Enemy62_1.s"
-gUnk_080D238A:: @ 080D238A
- .incbin "enemy62/gUnk_080D238A.bin"
+gSpriteAnimations_Enemy62_2:: @ 080D238A
+ .include "animations/gSpriteAnimations_Enemy62_2.s"
-gUnk_080D239B:: @ 080D239B
- .incbin "enemy62/gUnk_080D239B.bin"
+gSpriteAnimations_Enemy62_3:: @ 080D239B
+ .include "animations/gSpriteAnimations_Enemy62_3.s"
-gUnk_080D23AC:: @ 080D23AC
- .incbin "enemy62/gUnk_080D23AC.bin"
+gSpriteAnimations_Enemy62_4:: @ 080D23AC
+ .include "animations/gSpriteAnimations_Enemy62_4.s"
-gUnk_080D23BD:: @ 080D23BD
- .incbin "enemy62/gUnk_080D23BD.bin"
+gSpriteAnimations_Enemy62_5:: @ 080D23BD
+ .include "animations/gSpriteAnimations_Enemy62_5.s"
-gUnk_080D23CE:: @ 080D23CE
- .incbin "enemy62/gUnk_080D23CE.bin"
+gSpriteAnimations_Enemy62_6:: @ 080D23CE
+ .include "animations/gSpriteAnimations_Enemy62_6.s"
-gUnk_080D23DF:: @ 080D23DF
- .incbin "enemy62/gUnk_080D23DF.bin"
+gSpriteAnimations_Enemy62_7:: @ 080D23DF
+ .include "animations/gSpriteAnimations_Enemy62_7.s"
-gUnk_080D23F0:: @ 080D23F0
- .incbin "enemy62/gUnk_080D23F0.bin"
+gSpriteAnimations_Enemy62_8:: @ 080D23F0
+ .include "animations/gSpriteAnimations_Enemy62_8.s"
-gUnk_080D2401:: @ 080D2401
- .incbin "enemy62/gUnk_080D2401.bin"
+gSpriteAnimations_Enemy62_9:: @ 080D2401
+ .include "animations/gSpriteAnimations_Enemy62_9.s"
-gUnk_080D2412:: @ 080D2412
- .incbin "enemy62/gUnk_080D2412.bin"
+gSpriteAnimations_Enemy62_10:: @ 080D2412
+ .include "animations/gSpriteAnimations_Enemy62_10.s"
-gUnk_080D2423:: @ 080D2423
- .incbin "enemy62/gUnk_080D2423.bin"
+gSpriteAnimations_Enemy62_11:: @ 080D2423
+ .include "animations/gSpriteAnimations_Enemy62_11.s"
-gUnk_080D2434:: @ 080D2434
- .incbin "enemy62/gUnk_080D2434.bin"
+gSpriteAnimations_Enemy62_12:: @ 080D2434
+ .include "animations/gSpriteAnimations_Enemy62_12.s"
-gUnk_080D2445:: @ 080D2445
- .incbin "enemy62/gUnk_080D2445.bin"
+gSpriteAnimations_Enemy62_13:: @ 080D2445
+ .include "animations/gSpriteAnimations_Enemy62_13.s"
-gUnk_080D2456:: @ 080D2456
- .incbin "enemy62/gUnk_080D2456.bin"
+gSpriteAnimations_Enemy62_14:: @ 080D2456
+ .include "animations/gSpriteAnimations_Enemy62_14.s"
-gUnk_080D2467:: @ 080D2467
- .incbin "enemy62/gUnk_080D2467.bin"
+gSpriteAnimations_Enemy62_15:: @ 080D2467
+ .include "animations/gSpriteAnimations_Enemy62_15.s"
-gUnk_080D2478:: @ 080D2478
- .incbin "enemy62/gUnk_080D2478.bin"
+gSpriteAnimations_Enemy62_16:: @ 080D2478
+ .include "animations/gSpriteAnimations_Enemy62_16.s"
-gUnk_080D2489:: @ 080D2489
- .incbin "enemy62/gUnk_080D2489.bin"
+gSpriteAnimations_Enemy62_17:: @ 080D2489
+ .include "animations/gSpriteAnimations_Enemy62_17.s"
-gUnk_080D249A:: @ 080D249A
- .incbin "enemy62/gUnk_080D249A.bin"
+gSpriteAnimations_Enemy62_18:: @ 080D249A
+ .include "animations/gSpriteAnimations_Enemy62_18.s"
-gUnk_080D24AB:: @ 080D24AB
- .incbin "enemy62/gUnk_080D24AB.bin"
+gSpriteAnimations_Enemy62_19:: @ 080D24AB
+ .include "animations/gSpriteAnimations_Enemy62_19.s"
-gUnk_080D24BC:: @ 080D24BC
- .incbin "enemy62/gUnk_080D24BC.bin"
+gSpriteAnimations_Enemy62_20:: @ 080D24BC
+ .include "animations/gSpriteAnimations_Enemy62_20.s"
-gUnk_080D24CD:: @ 080D24CD
- .incbin "enemy62/gUnk_080D24CD.bin"
+gSpriteAnimations_Enemy62_21:: @ 080D24CD
+ .include "animations/gSpriteAnimations_Enemy62_21.s"
-gUnk_080D24DE:: @ 080D24DE
- .incbin "enemy62/gUnk_080D24DE.bin"
+gSpriteAnimations_Enemy62_22:: @ 080D24DE
+ .include "animations/gSpriteAnimations_Enemy62_22.s"
-gUnk_080D24EF:: @ 080D24EF
- .incbin "enemy62/gUnk_080D24EF.bin"
+gSpriteAnimations_Enemy62_23:: @ 080D24EF
+ .include "animations/gSpriteAnimations_Enemy62_23.s"
-gUnk_080D2500:: @ 080D2500
- .incbin "enemy62/gUnk_080D2500.bin"
+gSpriteAnimations_Enemy62_24:: @ 080D2500
+ .include "animations/gSpriteAnimations_Enemy62_24.s"
-gUnk_080D2511:: @ 080D2511
- .incbin "enemy62/gUnk_080D2511.bin"
+gSpriteAnimations_Enemy62_25:: @ 080D2511
+ .include "animations/gSpriteAnimations_Enemy62_25.s"
-gUnk_080D2522:: @ 080D2522
- .incbin "enemy62/gUnk_080D2522.bin"
+gSpriteAnimations_Enemy62_26:: @ 080D2522
+ .include "animations/gSpriteAnimations_Enemy62_26.s"
-gUnk_080D2533:: @ 080D2533
- .incbin "enemy62/gUnk_080D2533.bin"
+gSpriteAnimations_Enemy62_27:: @ 080D2533
+ .include "animations/gSpriteAnimations_Enemy62_27.s"
-gUnk_080D2544:: @ 080D2544
- .incbin "enemy62/gUnk_080D2544.bin"
+gSpriteAnimations_Enemy62_28:: @ 080D2544
+ .include "animations/gSpriteAnimations_Enemy62_28.s"
-gUnk_080D2555:: @ 080D2555
- .incbin "enemy62/gUnk_080D2555.bin"
+gSpriteAnimations_Enemy62_29:: @ 080D2555
+ .include "animations/gSpriteAnimations_Enemy62_29.s"
-gUnk_080D2566:: @ 080D2566
- .incbin "enemy62/gUnk_080D2566.bin"
+gSpriteAnimations_Enemy62_30:: @ 080D2566
+ .include "animations/gSpriteAnimations_Enemy62_30.s"
-gUnk_080D2577:: @ 080D2577
- .incbin "enemy62/gUnk_080D2577.bin"
+gSpriteAnimations_Enemy62_31:: @ 080D2577
+ .include "animations/gSpriteAnimations_Enemy62_31.s"
-gUnk_080D2588:: @ 080D2588
- .incbin "enemy62/gUnk_080D2588.bin"
+gSpriteAnimations_Enemy62_32:: @ 080D2588
+ .include "animations/gSpriteAnimations_Enemy62_32.s"
-gUnk_080D2599:: @ 080D2599
- .incbin "enemy62/gUnk_080D2599.bin"
+gSpriteAnimations_Enemy62_33:: @ 080D2599
+ .include "animations/gSpriteAnimations_Enemy62_33.s"
-gUnk_080D25AA:: @ 080D25AA
- .incbin "enemy62/gUnk_080D25AA.bin"
+gSpriteAnimations_Enemy62_34:: @ 080D25AA
+ .include "animations/gSpriteAnimations_Enemy62_34.s"
-gUnk_080D25BB:: @ 080D25BB
- .incbin "enemy62/gUnk_080D25BB.bin"
+gSpriteAnimations_Enemy62_35:: @ 080D25BB
+ .include "animations/gSpriteAnimations_Enemy62_35.s"
-gUnk_080D25CC:: @ 080D25CC
- .incbin "enemy62/gUnk_080D25CC.bin"
+gSpriteAnimations_Enemy62_36:: @ 080D25CC
+ .include "animations/gSpriteAnimations_Enemy62_36.s"
-gUnk_080D25DD:: @ 080D25DD
- .incbin "enemy62/gUnk_080D25DD.bin"
+gSpriteAnimations_Enemy62_37:: @ 080D25DD
+ .include "animations/gSpriteAnimations_Enemy62_37.s"
-gUnk_080D25EE:: @ 080D25EE
- .incbin "enemy62/gUnk_080D25EE.bin"
+gSpriteAnimations_Enemy62_38:: @ 080D25EE
+ .include "animations/gSpriteAnimations_Enemy62_38.s"
-gUnk_080D25FF:: @ 080D25FF
- .incbin "enemy62/gUnk_080D25FF.bin"
+gSpriteAnimations_Enemy62_39:: @ 080D25FF
+ .include "animations/gSpriteAnimations_Enemy62_39.s"
-gUnk_080D2610:: @ 080D2610
- .incbin "enemy62/gUnk_080D2610.bin"
+gSpriteAnimations_Enemy62_40:: @ 080D2610
+ .include "animations/gSpriteAnimations_Enemy62_40.s"
-gUnk_080D2621:: @ 080D2621
- .incbin "enemy62/gUnk_080D2621.bin"
+gSpriteAnimations_Enemy62_41:: @ 080D2621
+ .include "animations/gSpriteAnimations_Enemy62_41.s"
-gUnk_080D2632:: @ 080D2632
- .incbin "enemy62/gUnk_080D2632.bin"
+gSpriteAnimations_Enemy62_42:: @ 080D2632
+ .include "animations/gSpriteAnimations_Enemy62_42.s"
-gUnk_080D2643:: @ 080D2643
- .incbin "enemy62/gUnk_080D2643.bin"
+gSpriteAnimations_Enemy62_43:: @ 080D2643
+ .include "animations/gSpriteAnimations_Enemy62_43.s"
-gUnk_080D2654:: @ 080D2654
- .incbin "enemy62/gUnk_080D2654.bin"
+gSpriteAnimations_Enemy62_44:: @ 080D2654
+ .include "animations/gSpriteAnimations_Enemy62_44.s"
-gUnk_080D2665:: @ 080D2665
- .incbin "enemy62/gUnk_080D2665.bin"
+gSpriteAnimations_Enemy62_45:: @ 080D2665
+ .include "animations/gSpriteAnimations_Enemy62_45.s"
-gUnk_080D2676:: @ 080D2676
- .incbin "enemy62/gUnk_080D2676.bin"
+gSpriteAnimations_Enemy62_46:: @ 080D2676
+ .include "animations/gSpriteAnimations_Enemy62_46.s"
-gUnk_080D2687:: @ 080D2687
- .incbin "enemy62/gUnk_080D2687.bin"
+gSpriteAnimations_Enemy62_47:: @ 080D2687
+ .include "animations/gSpriteAnimations_Enemy62_47.s"
-gUnk_080D2698:: @ 080D2698
- .incbin "enemy62/gUnk_080D2698.bin"
+gSpriteAnimations_Enemy62_48:: @ 080D2698
+ .include "animations/gSpriteAnimations_Enemy62_48.s"
-gUnk_080D26A9:: @ 080D26A9
- .incbin "enemy62/gUnk_080D26A9.bin"
+gSpriteAnimations_Enemy62_49:: @ 080D26A9
+ .include "animations/gSpriteAnimations_Enemy62_49.s"
-gUnk_080D26BA:: @ 080D26BA
- .incbin "enemy62/gUnk_080D26BA.bin"
+gSpriteAnimations_Enemy62_50:: @ 080D26BA
+ .include "animations/gSpriteAnimations_Enemy62_50.s"
-gUnk_080D26CB:: @ 080D26CB
- .incbin "enemy62/gUnk_080D26CB.bin"
+gSpriteAnimations_Enemy62_51:: @ 080D26CB
+ .include "animations/gSpriteAnimations_Enemy62_51.s"
-gUnk_080D26DC:: @ 080D26DC
- .incbin "enemy62/gUnk_080D26DC.bin"
+gSpriteAnimations_Enemy62_52:: @ 080D26DC
+ .include "animations/gSpriteAnimations_Enemy62_52.s"
-gUnk_080D26ED:: @ 080D26ED
- .incbin "enemy62/gUnk_080D26ED.bin"
+gSpriteAnimations_Enemy62_53:: @ 080D26ED
+ .include "animations/gSpriteAnimations_Enemy62_53.s"
-gUnk_080D26FE:: @ 080D26FE
- .incbin "enemy62/gUnk_080D26FE.bin"
+gSpriteAnimations_Enemy62_54:: @ 080D26FE
+ .include "animations/gSpriteAnimations_Enemy62_54.s"
-gUnk_080D270F:: @ 080D270F
- .incbin "enemy62/gUnk_080D270F.bin"
+gSpriteAnimations_Enemy62_55:: @ 080D270F
+ .include "animations/gSpriteAnimations_Enemy62_55.s"
-gUnk_080D2720:: @ 080D2720
- .incbin "enemy62/gUnk_080D2720.bin"
+gSpriteAnimations_Enemy62_56:: @ 080D2720
+ .include "animations/gSpriteAnimations_Enemy62_56.s"
-gUnk_080D2731:: @ 080D2731
- .incbin "enemy62/gUnk_080D2731.bin"
+gSpriteAnimations_Enemy62_57:: @ 080D2731
+ .include "animations/gSpriteAnimations_Enemy62_57.s"
-gUnk_080D2742:: @ 080D2742
- .incbin "enemy62/gUnk_080D2742.bin"
+gSpriteAnimations_Enemy62_58:: @ 080D2742
+ .include "animations/gSpriteAnimations_Enemy62_58.s"
-gUnk_080D2753:: @ 080D2753
- .incbin "enemy62/gUnk_080D2753.bin"
+gSpriteAnimations_Enemy62_59:: @ 080D2753
+ .include "animations/gSpriteAnimations_Enemy62_59.s"
-gUnk_080D2764:: @ 080D2764
- .incbin "enemy62/gUnk_080D2764.bin"
+gSpriteAnimations_Enemy62_60:: @ 080D2764
+ .include "animations/gSpriteAnimations_Enemy62_60.s"
-gUnk_080D2775:: @ 080D2775
- .incbin "enemy62/gUnk_080D2775.bin"
+gSpriteAnimations_Enemy62_61:: @ 080D2775
+ .include "animations/gSpriteAnimations_Enemy62_61.s"
-gUnk_080D2786:: @ 080D2786
- .incbin "enemy62/gUnk_080D2786.bin"
+gSpriteAnimations_Enemy62_62:: @ 080D2786
+ .include "animations/gSpriteAnimations_Enemy62_62.s"
-gUnk_080D2797:: @ 080D2797
- .incbin "enemy62/gUnk_080D2797.bin"
+gSpriteAnimations_Enemy62_63:: @ 080D2797
+ .include "animations/gSpriteAnimations_Enemy62_63.s"
gSpriteAnimations_Enemy62:: @ 080D27A8
- .4byte gUnk_080D2368
- .4byte gUnk_080D2379
- .4byte gUnk_080D238A
- .4byte gUnk_080D239B
- .4byte gUnk_080D23AC
- .4byte gUnk_080D23BD
- .4byte gUnk_080D23CE
- .4byte gUnk_080D23DF
- .4byte gUnk_080D23F0
- .4byte gUnk_080D2401
- .4byte gUnk_080D2412
- .4byte gUnk_080D2423
- .4byte gUnk_080D2434
- .4byte gUnk_080D2445
- .4byte gUnk_080D2456
- .4byte gUnk_080D2467
- .4byte gUnk_080D2478
- .4byte gUnk_080D2489
- .4byte gUnk_080D249A
- .4byte gUnk_080D24AB
- .4byte gUnk_080D24BC
- .4byte gUnk_080D24CD
- .4byte gUnk_080D24DE
- .4byte gUnk_080D24EF
- .4byte gUnk_080D2500
- .4byte gUnk_080D2511
- .4byte gUnk_080D2522
- .4byte gUnk_080D2533
- .4byte gUnk_080D2544
- .4byte gUnk_080D2555
- .4byte gUnk_080D2566
- .4byte gUnk_080D2577
- .4byte gUnk_080D2588
- .4byte gUnk_080D2599
- .4byte gUnk_080D25AA
- .4byte gUnk_080D25BB
- .4byte gUnk_080D25CC
- .4byte gUnk_080D25DD
- .4byte gUnk_080D25EE
- .4byte gUnk_080D25FF
- .4byte gUnk_080D2610
- .4byte gUnk_080D2621
- .4byte gUnk_080D2632
- .4byte gUnk_080D2643
- .4byte gUnk_080D2654
- .4byte gUnk_080D2665
- .4byte gUnk_080D2676
- .4byte gUnk_080D2687
- .4byte gUnk_080D2698
- .4byte gUnk_080D26A9
- .4byte gUnk_080D26BA
- .4byte gUnk_080D26CB
- .4byte gUnk_080D26DC
- .4byte gUnk_080D26ED
- .4byte gUnk_080D26FE
- .4byte gUnk_080D270F
- .4byte gUnk_080D2720
- .4byte gUnk_080D2731
- .4byte gUnk_080D2742
- .4byte gUnk_080D2753
- .4byte gUnk_080D2764
- .4byte gUnk_080D2775
- .4byte gUnk_080D2786
- .4byte gUnk_080D2797
+ .4byte gSpriteAnimations_Enemy62_0
+ .4byte gSpriteAnimations_Enemy62_1
+ .4byte gSpriteAnimations_Enemy62_2
+ .4byte gSpriteAnimations_Enemy62_3
+ .4byte gSpriteAnimations_Enemy62_4
+ .4byte gSpriteAnimations_Enemy62_5
+ .4byte gSpriteAnimations_Enemy62_6
+ .4byte gSpriteAnimations_Enemy62_7
+ .4byte gSpriteAnimations_Enemy62_8
+ .4byte gSpriteAnimations_Enemy62_9
+ .4byte gSpriteAnimations_Enemy62_10
+ .4byte gSpriteAnimations_Enemy62_11
+ .4byte gSpriteAnimations_Enemy62_12
+ .4byte gSpriteAnimations_Enemy62_13
+ .4byte gSpriteAnimations_Enemy62_14
+ .4byte gSpriteAnimations_Enemy62_15
+ .4byte gSpriteAnimations_Enemy62_16
+ .4byte gSpriteAnimations_Enemy62_17
+ .4byte gSpriteAnimations_Enemy62_18
+ .4byte gSpriteAnimations_Enemy62_19
+ .4byte gSpriteAnimations_Enemy62_20
+ .4byte gSpriteAnimations_Enemy62_21
+ .4byte gSpriteAnimations_Enemy62_22
+ .4byte gSpriteAnimations_Enemy62_23
+ .4byte gSpriteAnimations_Enemy62_24
+ .4byte gSpriteAnimations_Enemy62_25
+ .4byte gSpriteAnimations_Enemy62_26
+ .4byte gSpriteAnimations_Enemy62_27
+ .4byte gSpriteAnimations_Enemy62_28
+ .4byte gSpriteAnimations_Enemy62_29
+ .4byte gSpriteAnimations_Enemy62_30
+ .4byte gSpriteAnimations_Enemy62_31
+ .4byte gSpriteAnimations_Enemy62_32
+ .4byte gSpriteAnimations_Enemy62_33
+ .4byte gSpriteAnimations_Enemy62_34
+ .4byte gSpriteAnimations_Enemy62_35
+ .4byte gSpriteAnimations_Enemy62_36
+ .4byte gSpriteAnimations_Enemy62_37
+ .4byte gSpriteAnimations_Enemy62_38
+ .4byte gSpriteAnimations_Enemy62_39
+ .4byte gSpriteAnimations_Enemy62_40
+ .4byte gSpriteAnimations_Enemy62_41
+ .4byte gSpriteAnimations_Enemy62_42
+ .4byte gSpriteAnimations_Enemy62_43
+ .4byte gSpriteAnimations_Enemy62_44
+ .4byte gSpriteAnimations_Enemy62_45
+ .4byte gSpriteAnimations_Enemy62_46
+ .4byte gSpriteAnimations_Enemy62_47
+ .4byte gSpriteAnimations_Enemy62_48
+ .4byte gSpriteAnimations_Enemy62_49
+ .4byte gSpriteAnimations_Enemy62_50
+ .4byte gSpriteAnimations_Enemy62_51
+ .4byte gSpriteAnimations_Enemy62_52
+ .4byte gSpriteAnimations_Enemy62_53
+ .4byte gSpriteAnimations_Enemy62_54
+ .4byte gSpriteAnimations_Enemy62_55
+ .4byte gSpriteAnimations_Enemy62_56
+ .4byte gSpriteAnimations_Enemy62_57
+ .4byte gSpriteAnimations_Enemy62_58
+ .4byte gSpriteAnimations_Enemy62_59
+ .4byte gSpriteAnimations_Enemy62_60
+ .4byte gSpriteAnimations_Enemy62_61
+ .4byte gSpriteAnimations_Enemy62_62
+ .4byte gSpriteAnimations_Enemy62_63
.4byte 00000000
diff --git a/data/animations/enemy/eyegore.s b/data/animations/enemy/eyegore.s
index 9e19db8f..567eb414 100644
--- a/data/animations/enemy/eyegore.s
+++ b/data/animations/enemy/eyegore.s
@@ -4,66 +4,66 @@
.section .rodata
.align 2
-gUnk_080CE30C:: @ 080CE30C
- .incbin "eyegore/gUnk_080CE30C.bin"
+gSpriteAnimations_Eyegore_2:: @ 080CE30C
+ .include "animations/gSpriteAnimations_Eyegore_2.s"
-gUnk_080CE31C:: @ 080CE31C
- .incbin "eyegore/gUnk_080CE31C.bin"
+gSpriteAnimations_Eyegore_6:: @ 080CE31C
+ .include "animations/gSpriteAnimations_Eyegore_6.s"
-gUnk_080CE335:: @ 080CE335
- .incbin "eyegore/gUnk_080CE335.bin"
+gSpriteAnimations_Eyegore_0:: @ 080CE335
+ .include "animations/gSpriteAnimations_Eyegore_0.s"
-gUnk_080CE345:: @ 080CE345
- .incbin "eyegore/gUnk_080CE345.bin"
+gSpriteAnimations_Eyegore_4:: @ 080CE345
+ .include "animations/gSpriteAnimations_Eyegore_4.s"
-gUnk_080CE35E:: @ 080CE35E
- .incbin "eyegore/gUnk_080CE35E.bin"
+gSpriteAnimations_Eyegore_3:: @ 080CE35E
+ .include "animations/gSpriteAnimations_Eyegore_3.s"
-gUnk_080CE36E:: @ 080CE36E
- .incbin "eyegore/gUnk_080CE36E.bin"
+gSpriteAnimations_Eyegore_7:: @ 080CE36E
+ .include "animations/gSpriteAnimations_Eyegore_7.s"
-gUnk_080CE387:: @ 080CE387
- .incbin "eyegore/gUnk_080CE387.bin"
+gSpriteAnimations_Eyegore_1:: @ 080CE387
+ .include "animations/gSpriteAnimations_Eyegore_1.s"
-gUnk_080CE397:: @ 080CE397
- .incbin "eyegore/gUnk_080CE397.bin"
+gSpriteAnimations_Eyegore_5:: @ 080CE397
+ .include "animations/gSpriteAnimations_Eyegore_5.s"
-gUnk_080CE3B0:: @ 080CE3B0
- .incbin "eyegore/gUnk_080CE3B0.bin"
+gSpriteAnimations_Eyegore_10:: @ 080CE3B0
+ .include "animations/gSpriteAnimations_Eyegore_10.s"
-gUnk_080CE3BC:: @ 080CE3BC
- .incbin "eyegore/gUnk_080CE3BC.bin"
+gSpriteAnimations_Eyegore_8:: @ 080CE3BC
+ .include "animations/gSpriteAnimations_Eyegore_8.s"
-gUnk_080CE3C8:: @ 080CE3C8
- .incbin "eyegore/gUnk_080CE3C8.bin"
+gSpriteAnimations_Eyegore_11:: @ 080CE3C8
+ .include "animations/gSpriteAnimations_Eyegore_11.s"
-gUnk_080CE3D4:: @ 080CE3D4
- .incbin "eyegore/gUnk_080CE3D4.bin"
+gSpriteAnimations_Eyegore_9:: @ 080CE3D4
+ .include "animations/gSpriteAnimations_Eyegore_9.s"
-gUnk_080CE3E0:: @ 080CE3E0
- .incbin "eyegore/gUnk_080CE3E0.bin"
+gSpriteAnimations_Eyegore_14:: @ 080CE3E0
+ .include "animations/gSpriteAnimations_Eyegore_14.s"
-gUnk_080CE3EC:: @ 080CE3EC
- .incbin "eyegore/gUnk_080CE3EC.bin"
+gSpriteAnimations_Eyegore_15:: @ 080CE3EC
+ .include "animations/gSpriteAnimations_Eyegore_15.s"
-gUnk_080CE3F8:: @ 080CE3F8
- .incbin "eyegore/gUnk_080CE3F8.bin"
+gSpriteAnimations_Eyegore_13:: @ 080CE3F8
+ .include "animations/gSpriteAnimations_Eyegore_13.s"
gSpriteAnimations_Eyegore:: @ 080CE404
- .4byte gUnk_080CE335
- .4byte gUnk_080CE387
- .4byte gUnk_080CE30C
- .4byte gUnk_080CE35E
- .4byte gUnk_080CE345
- .4byte gUnk_080CE397
- .4byte gUnk_080CE31C
- .4byte gUnk_080CE36E
- .4byte gUnk_080CE3BC
- .4byte gUnk_080CE3D4
- .4byte gUnk_080CE3B0
- .4byte gUnk_080CE3C8
- .4byte gUnk_080CE3BC
- .4byte gUnk_080CE3F8
- .4byte gUnk_080CE3E0
- .4byte gUnk_080CE3EC
+ .4byte gSpriteAnimations_Eyegore_0
+ .4byte gSpriteAnimations_Eyegore_1
+ .4byte gSpriteAnimations_Eyegore_2
+ .4byte gSpriteAnimations_Eyegore_3
+ .4byte gSpriteAnimations_Eyegore_4
+ .4byte gSpriteAnimations_Eyegore_5
+ .4byte gSpriteAnimations_Eyegore_6
+ .4byte gSpriteAnimations_Eyegore_7
+ .4byte gSpriteAnimations_Eyegore_8
+ .4byte gSpriteAnimations_Eyegore_9
+ .4byte gSpriteAnimations_Eyegore_10
+ .4byte gSpriteAnimations_Eyegore_11
+ .4byte gSpriteAnimations_Eyegore_8
+ .4byte gSpriteAnimations_Eyegore_13
+ .4byte gSpriteAnimations_Eyegore_14
+ .4byte gSpriteAnimations_Eyegore_15
.4byte 00000000
diff --git a/data/animations/enemy/fallingBoulder.s b/data/animations/enemy/fallingBoulder.s
index 559d52c1..197247a2 100644
--- a/data/animations/enemy/fallingBoulder.s
+++ b/data/animations/enemy/fallingBoulder.s
@@ -3,13 +3,13 @@
.section .rodata
-gUnk_080CD5A4:: @ 080CD5A4
- .incbin "fallingBoulder/gUnk_080CD5A4.bin"
+gSpriteAnimations_FallingBoulder_0:: @ 080CD5A4
+ .include "animations/gSpriteAnimations_FallingBoulder_0.s"
-gUnk_080CD5B5:: @ 080CD5B5
- .incbin "fallingBoulder/gUnk_080CD5B5.bin"
+gSpriteAnimations_FallingBoulder_1:: @ 080CD5B5
+ .include "animations/gSpriteAnimations_FallingBoulder_1.s"
gSpriteAnimations_FallingBoulder:: @ 080CD5C8
- .4byte gUnk_080CD5A4
- .4byte gUnk_080CD5B5
+ .4byte gSpriteAnimations_FallingBoulder_0
+ .4byte gSpriteAnimations_FallingBoulder_1
.4byte 00000000
diff --git a/data/animations/enemy/fireballGuy.s b/data/animations/enemy/fireballGuy.s
index 928b0e8d..41d80842 100644
--- a/data/animations/enemy/fireballGuy.s
+++ b/data/animations/enemy/fireballGuy.s
@@ -4,13 +4,13 @@
.section .rodata
.align 2
-gUnk_080D1818:: @ 080D1818
- .incbin "fireballGuy/gUnk_080D1818.bin"
+gSpriteAnimations_FireballGuy_0:: @ 080D1818
+ .include "animations/gSpriteAnimations_FireballGuy_0.s"
-gUnk_080D1839:: @ 080D1839
- .incbin "fireballGuy/gUnk_080D1839.bin"
+gSpriteAnimations_FireballGuy_1:: @ 080D1839
+ .include "animations/gSpriteAnimations_FireballGuy_1.s"
gSpriteAnimations_FireballGuy:: @ 080D185C
- .4byte gUnk_080D1818
- .4byte gUnk_080D1839
+ .4byte gSpriteAnimations_FireballGuy_0
+ .4byte gSpriteAnimations_FireballGuy_1
.4byte 00000000
diff --git a/data/animations/enemy/flyingSkull.s b/data/animations/enemy/flyingSkull.s
index 5e2b8502..631b517b 100644
--- a/data/animations/enemy/flyingSkull.s
+++ b/data/animations/enemy/flyingSkull.s
@@ -4,9 +4,9 @@
.section .rodata
.align 2
-gUnk_080CFBE8:: @ 080CFBE8
- .incbin "flyingSkull/gUnk_080CFBE8.bin"
+gSpriteAnimations_FlyingSkull_0:: @ 080CFBE8
+ .include "animations/gSpriteAnimations_FlyingSkull_0.s"
gSpriteAnimations_FlyingSkull:: @ 080CFC0C
- .4byte gUnk_080CFBE8
+ .4byte gSpriteAnimations_FlyingSkull_0
.4byte 00000000
diff --git a/data/animations/enemy/ghini.s b/data/animations/enemy/ghini.s
index ae7f8040..76f2bcca 100644
--- a/data/animations/enemy/ghini.s
+++ b/data/animations/enemy/ghini.s
@@ -4,45 +4,45 @@
.section .rodata
.align 2
-gUnk_080D0988:: @ 080D0988
- .incbin "ghini/gUnk_080D0988.bin"
+gSpriteAnimations_Ghini_0:: @ 080D0988
+ .include "animations/gSpriteAnimations_Ghini_0.s"
-gUnk_080D09A4:: @ 080D09A4
- .incbin "ghini/gUnk_080D09A4.bin"
+gSpriteAnimations_Ghini_2:: @ 080D09A4
+ .include "animations/gSpriteAnimations_Ghini_2.s"
-gUnk_080D09C9:: @ 080D09C9
- .incbin "ghini/gUnk_080D09C9.bin"
+gSpriteAnimations_Ghini_1:: @ 080D09C9
+ .include "animations/gSpriteAnimations_Ghini_1.s"
-gUnk_080D09EE:: @ 080D09EE
- .incbin "ghini/gUnk_080D09EE.bin"
+gSpriteAnimations_Ghini_3:: @ 080D09EE
+ .include "animations/gSpriteAnimations_Ghini_3.s"
-gUnk_080D0A32:: @ 080D0A32
- .incbin "ghini/gUnk_080D0A32.bin"
+gSpriteAnimations_Ghini_4:: @ 080D0A32
+ .include "animations/gSpriteAnimations_Ghini_4.s"
-gUnk_080D0A6B:: @ 080D0A6B
- .incbin "ghini/gUnk_080D0A6B.bin"
+gSpriteAnimations_Ghini_5:: @ 080D0A6B
+ .include "animations/gSpriteAnimations_Ghini_5.s"
-gUnk_080D0A6F:: @ 080D0A6F
- .incbin "ghini/gUnk_080D0A6F.bin"
+gSpriteAnimations_Ghini_6:: @ 080D0A6F
+ .include "animations/gSpriteAnimations_Ghini_6.s"
-gUnk_080D0A73:: @ 080D0A73
- .incbin "ghini/gUnk_080D0A73.bin"
+gSpriteAnimations_Ghini_7:: @ 080D0A73
+ .include "animations/gSpriteAnimations_Ghini_7.s"
-gUnk_080D0A7F:: @ 080D0A7F
- .incbin "ghini/gUnk_080D0A7F.bin"
+gSpriteAnimations_Ghini_8:: @ 080D0A7F
+ .include "animations/gSpriteAnimations_Ghini_8.s"
-gUnk_080D0A8B:: @ 080D0A8B
- .incbin "ghini/gUnk_080D0A8B.bin"
+gSpriteAnimations_Ghini_9:: @ 080D0A8B
+ .include "animations/gSpriteAnimations_Ghini_9.s"
gSpriteAnimations_Ghini:: @ 080D0A90
- .4byte gUnk_080D0988
- .4byte gUnk_080D09C9
- .4byte gUnk_080D09A4
- .4byte gUnk_080D09EE
- .4byte gUnk_080D0A32
- .4byte gUnk_080D0A6B
- .4byte gUnk_080D0A6F
- .4byte gUnk_080D0A73
- .4byte gUnk_080D0A7F
- .4byte gUnk_080D0A8B
+ .4byte gSpriteAnimations_Ghini_0
+ .4byte gSpriteAnimations_Ghini_1
+ .4byte gSpriteAnimations_Ghini_2
+ .4byte gSpriteAnimations_Ghini_3
+ .4byte gSpriteAnimations_Ghini_4
+ .4byte gSpriteAnimations_Ghini_5
+ .4byte gSpriteAnimations_Ghini_6
+ .4byte gSpriteAnimations_Ghini_7
+ .4byte gSpriteAnimations_Ghini_8
+ .4byte gSpriteAnimations_Ghini_9
.4byte 00000000
diff --git a/data/animations/enemy/gibdo.s b/data/animations/enemy/gibdo.s
index be8b3d68..7532f19e 100644
--- a/data/animations/enemy/gibdo.s
+++ b/data/animations/enemy/gibdo.s
@@ -4,85 +4,85 @@
.section .rodata
.align 2
-gUnk_080CF2D0:: @ 080CF2D0
- .incbin "gibdo/gUnk_080CF2D0.bin"
+gSpriteAnimations_Gibdo_0:: @ 080CF2D0
+ .include "animations/gSpriteAnimations_Gibdo_0.s"
-gUnk_080CF2D4:: @ 080CF2D4
- .incbin "gibdo/gUnk_080CF2D4.bin"
+gSpriteAnimations_Gibdo_1:: @ 080CF2D4
+ .include "animations/gSpriteAnimations_Gibdo_1.s"
-gUnk_080CF2D8:: @ 080CF2D8
- .incbin "gibdo/gUnk_080CF2D8.bin"
+gSpriteAnimations_Gibdo_2:: @ 080CF2D8
+ .include "animations/gSpriteAnimations_Gibdo_2.s"
-gUnk_080CF2DC:: @ 080CF2DC
- .incbin "gibdo/gUnk_080CF2DC.bin"
+gSpriteAnimations_Gibdo_3:: @ 080CF2DC
+ .include "animations/gSpriteAnimations_Gibdo_3.s"
-gUnk_080CF2E0:: @ 080CF2E0
- .incbin "gibdo/gUnk_080CF2E0.bin"
+gSpriteAnimations_Gibdo_4:: @ 080CF2E0
+ .include "animations/gSpriteAnimations_Gibdo_4.s"
-gUnk_080CF2F9:: @ 080CF2F9
- .incbin "gibdo/gUnk_080CF2F9.bin"
+gSpriteAnimations_Gibdo_5:: @ 080CF2F9
+ .include "animations/gSpriteAnimations_Gibdo_5.s"
-gUnk_080CF312:: @ 080CF312
- .incbin "gibdo/gUnk_080CF312.bin"
+gSpriteAnimations_Gibdo_6:: @ 080CF312
+ .include "animations/gSpriteAnimations_Gibdo_6.s"
-gUnk_080CF32B:: @ 080CF32B
- .incbin "gibdo/gUnk_080CF32B.bin"
+gSpriteAnimations_Gibdo_7:: @ 080CF32B
+ .include "animations/gSpriteAnimations_Gibdo_7.s"
-gUnk_080CF344:: @ 080CF344
- .incbin "gibdo/gUnk_080CF344.bin"
+gSpriteAnimations_Gibdo_8:: @ 080CF344
+ .include "animations/gSpriteAnimations_Gibdo_8.s"
-gUnk_080CF35C:: @ 080CF35C
- .incbin "gibdo/gUnk_080CF35C.bin"
+gSpriteAnimations_Gibdo_9:: @ 080CF35C
+ .include "animations/gSpriteAnimations_Gibdo_9.s"
-gUnk_080CF374:: @ 080CF374
- .incbin "gibdo/gUnk_080CF374.bin"
+gSpriteAnimations_Gibdo_10:: @ 080CF374
+ .include "animations/gSpriteAnimations_Gibdo_10.s"
-gUnk_080CF38C:: @ 080CF38C
- .incbin "gibdo/gUnk_080CF38C.bin"
+gSpriteAnimations_Gibdo_11:: @ 080CF38C
+ .include "animations/gSpriteAnimations_Gibdo_11.s"
-gUnk_080CF3A4:: @ 080CF3A4
- .incbin "gibdo/gUnk_080CF3A4.bin"
+gSpriteAnimations_Gibdo_12:: @ 080CF3A4
+ .include "animations/gSpriteAnimations_Gibdo_12.s"
-gUnk_080CF3AD:: @ 080CF3AD
- .incbin "gibdo/gUnk_080CF3AD.bin"
+gSpriteAnimations_Gibdo_13:: @ 080CF3AD
+ .include "animations/gSpriteAnimations_Gibdo_13.s"
-gUnk_080CF3B6:: @ 080CF3B6
- .incbin "gibdo/gUnk_080CF3B6.bin"
+gSpriteAnimations_Gibdo_14:: @ 080CF3B6
+ .include "animations/gSpriteAnimations_Gibdo_14.s"
-gUnk_080CF3BF:: @ 080CF3BF
- .incbin "gibdo/gUnk_080CF3BF.bin"
+gSpriteAnimations_Gibdo_15:: @ 080CF3BF
+ .include "animations/gSpriteAnimations_Gibdo_15.s"
-gUnk_080CF3C8:: @ 080CF3C8
- .incbin "gibdo/gUnk_080CF3C8.bin"
+gSpriteAnimations_Gibdo_16:: @ 080CF3C8
+ .include "animations/gSpriteAnimations_Gibdo_16.s"
-gUnk_080CF3DC:: @ 080CF3DC
- .incbin "gibdo/gUnk_080CF3DC.bin"
+gSpriteAnimations_Gibdo_17:: @ 080CF3DC
+ .include "animations/gSpriteAnimations_Gibdo_17.s"
-gUnk_080CF3F0:: @ 080CF3F0
- .incbin "gibdo/gUnk_080CF3F0.bin"
+gSpriteAnimations_Gibdo_18:: @ 080CF3F0
+ .include "animations/gSpriteAnimations_Gibdo_18.s"
-gUnk_080CF404:: @ 080CF404
- .incbin "gibdo/gUnk_080CF404.bin"
+gSpriteAnimations_Gibdo_19:: @ 080CF404
+ .include "animations/gSpriteAnimations_Gibdo_19.s"
gSpriteAnimations_Gibdo:: @ 080CF418
- .4byte gUnk_080CF2D0
- .4byte gUnk_080CF2D4
- .4byte gUnk_080CF2D8
- .4byte gUnk_080CF2DC
- .4byte gUnk_080CF2E0
- .4byte gUnk_080CF2F9
- .4byte gUnk_080CF312
- .4byte gUnk_080CF32B
- .4byte gUnk_080CF344
- .4byte gUnk_080CF35C
- .4byte gUnk_080CF374
- .4byte gUnk_080CF38C
- .4byte gUnk_080CF3A4
- .4byte gUnk_080CF3AD
- .4byte gUnk_080CF3B6
- .4byte gUnk_080CF3BF
- .4byte gUnk_080CF3C8
- .4byte gUnk_080CF3DC
- .4byte gUnk_080CF3F0
- .4byte gUnk_080CF404
+ .4byte gSpriteAnimations_Gibdo_0
+ .4byte gSpriteAnimations_Gibdo_1
+ .4byte gSpriteAnimations_Gibdo_2
+ .4byte gSpriteAnimations_Gibdo_3
+ .4byte gSpriteAnimations_Gibdo_4
+ .4byte gSpriteAnimations_Gibdo_5
+ .4byte gSpriteAnimations_Gibdo_6
+ .4byte gSpriteAnimations_Gibdo_7
+ .4byte gSpriteAnimations_Gibdo_8
+ .4byte gSpriteAnimations_Gibdo_9
+ .4byte gSpriteAnimations_Gibdo_10
+ .4byte gSpriteAnimations_Gibdo_11
+ .4byte gSpriteAnimations_Gibdo_12
+ .4byte gSpriteAnimations_Gibdo_13
+ .4byte gSpriteAnimations_Gibdo_14
+ .4byte gSpriteAnimations_Gibdo_15
+ .4byte gSpriteAnimations_Gibdo_16
+ .4byte gSpriteAnimations_Gibdo_17
+ .4byte gSpriteAnimations_Gibdo_18
+ .4byte gSpriteAnimations_Gibdo_19
.4byte 00000000
diff --git a/data/animations/enemy/gleerok.s b/data/animations/enemy/gleerok.s
index d8b55762..aa73d70e 100644
--- a/data/animations/enemy/gleerok.s
+++ b/data/animations/enemy/gleerok.s
@@ -6,546 +6,546 @@
-gUnk_080CD8A3:: @ 080CD8A3
- .incbin "gleerok/gUnk_080CD8A3.bin"
+gSpriteAnimations_Gleerok_1_36:: @ 080CD8A3
+ .include "animations/gSpriteAnimations_Gleerok_1_36.s"
-gUnk_080CD8A7:: @ 080CD8A7
- .incbin "gleerok/gUnk_080CD8A7.bin"
+gSpriteAnimations_Gleerok_1_37:: @ 080CD8A7
+ .include "animations/gSpriteAnimations_Gleerok_1_37.s"
-gUnk_080CD8AB:: @ 080CD8AB
- .incbin "gleerok/gUnk_080CD8AB.bin"
+gSpriteAnimations_Gleerok_1_38:: @ 080CD8AB
+ .include "animations/gSpriteAnimations_Gleerok_1_38.s"
-gUnk_080CD8AF:: @ 080CD8AF
- .incbin "gleerok/gUnk_080CD8AF.bin"
+gSpriteAnimations_Gleerok_1_39:: @ 080CD8AF
+ .include "animations/gSpriteAnimations_Gleerok_1_39.s"
-gUnk_080CD8B3:: @ 080CD8B3
- .incbin "gleerok/gUnk_080CD8B3.bin"
+gSpriteAnimations_Gleerok_1_40:: @ 080CD8B3
+ .include "animations/gSpriteAnimations_Gleerok_1_40.s"
-gUnk_080CD8B7:: @ 080CD8B7
- .incbin "gleerok/gUnk_080CD8B7.bin"
+gSpriteAnimations_Gleerok_1_41:: @ 080CD8B7
+ .include "animations/gSpriteAnimations_Gleerok_1_41.s"
-gUnk_080CD8BB:: @ 080CD8BB
- .incbin "gleerok/gUnk_080CD8BB.bin"
+gSpriteAnimations_Gleerok_1_42:: @ 080CD8BB
+ .include "animations/gSpriteAnimations_Gleerok_1_42.s"
-gUnk_080CD8BF:: @ 080CD8BF
- .incbin "gleerok/gUnk_080CD8BF.bin"
+gSpriteAnimations_Gleerok_1_43:: @ 080CD8BF
+ .include "animations/gSpriteAnimations_Gleerok_1_43.s"
-gUnk_080CD8C3:: @ 080CD8C3
- .incbin "gleerok/gUnk_080CD8C3.bin"
+gSpriteAnimations_Gleerok_1_44:: @ 080CD8C3
+ .include "animations/gSpriteAnimations_Gleerok_1_44.s"
-gUnk_080CD8C7:: @ 080CD8C7
- .incbin "gleerok/gUnk_080CD8C7.bin"
+gSpriteAnimations_Gleerok_1_45:: @ 080CD8C7
+ .include "animations/gSpriteAnimations_Gleerok_1_45.s"
-gUnk_080CD8CB:: @ 080CD8CB
- .incbin "gleerok/gUnk_080CD8CB.bin"
+gSpriteAnimations_Gleerok_1_46:: @ 080CD8CB
+ .include "animations/gSpriteAnimations_Gleerok_1_46.s"
-gUnk_080CD8CF:: @ 080CD8CF
- .incbin "gleerok/gUnk_080CD8CF.bin"
+gSpriteAnimations_Gleerok_1_47:: @ 080CD8CF
+ .include "animations/gSpriteAnimations_Gleerok_1_47.s"
-gUnk_080CD8D3:: @ 080CD8D3
- .incbin "gleerok/gUnk_080CD8D3.bin"
+gSpriteAnimations_Gleerok_1_24:: @ 080CD8D3
+ .include "animations/gSpriteAnimations_Gleerok_1_24.s"
-gUnk_080CD8D7:: @ 080CD8D7
- .incbin "gleerok/gUnk_080CD8D7.bin"
+gSpriteAnimations_Gleerok_1_25:: @ 080CD8D7
+ .include "animations/gSpriteAnimations_Gleerok_1_25.s"
-gUnk_080CD8DB:: @ 080CD8DB
- .incbin "gleerok/gUnk_080CD8DB.bin"
+gSpriteAnimations_Gleerok_1_26:: @ 080CD8DB
+ .include "animations/gSpriteAnimations_Gleerok_1_26.s"
-gUnk_080CD8DF:: @ 080CD8DF
- .incbin "gleerok/gUnk_080CD8DF.bin"
+gSpriteAnimations_Gleerok_1_27:: @ 080CD8DF
+ .include "animations/gSpriteAnimations_Gleerok_1_27.s"
-gUnk_080CD8E3:: @ 080CD8E3
- .incbin "gleerok/gUnk_080CD8E3.bin"
+gSpriteAnimations_Gleerok_1_28:: @ 080CD8E3
+ .include "animations/gSpriteAnimations_Gleerok_1_28.s"
-gUnk_080CD8E7:: @ 080CD8E7
- .incbin "gleerok/gUnk_080CD8E7.bin"
+gSpriteAnimations_Gleerok_1_29:: @ 080CD8E7
+ .include "animations/gSpriteAnimations_Gleerok_1_29.s"
-gUnk_080CD8EB:: @ 080CD8EB
- .incbin "gleerok/gUnk_080CD8EB.bin"
+gSpriteAnimations_Gleerok_1_30:: @ 080CD8EB
+ .include "animations/gSpriteAnimations_Gleerok_1_30.s"
-gUnk_080CD8EF:: @ 080CD8EF
- .incbin "gleerok/gUnk_080CD8EF.bin"
+gSpriteAnimations_Gleerok_1_31:: @ 080CD8EF
+ .include "animations/gSpriteAnimations_Gleerok_1_31.s"
-gUnk_080CD8F3:: @ 080CD8F3
- .incbin "gleerok/gUnk_080CD8F3.bin"
+gSpriteAnimations_Gleerok_1_32:: @ 080CD8F3
+ .include "animations/gSpriteAnimations_Gleerok_1_32.s"
-gUnk_080CD8F7:: @ 080CD8F7
- .incbin "gleerok/gUnk_080CD8F7.bin"
+gSpriteAnimations_Gleerok_1_33:: @ 080CD8F7
+ .include "animations/gSpriteAnimations_Gleerok_1_33.s"
-gUnk_080CD8FB:: @ 080CD8FB
- .incbin "gleerok/gUnk_080CD8FB.bin"
+gSpriteAnimations_Gleerok_1_34:: @ 080CD8FB
+ .include "animations/gSpriteAnimations_Gleerok_1_34.s"
-gUnk_080CD8FF:: @ 080CD8FF
- .incbin "gleerok/gUnk_080CD8FF.bin"
+gSpriteAnimations_Gleerok_1_35:: @ 080CD8FF
+ .include "animations/gSpriteAnimations_Gleerok_1_35.s"
-gUnk_080CD903:: @ 080CD903
- .incbin "gleerok/gUnk_080CD903.bin"
+gSpriteAnimations_Gleerok_1_12:: @ 080CD903
+ .include "animations/gSpriteAnimations_Gleerok_1_12.s"
-gUnk_080CD907:: @ 080CD907
- .incbin "gleerok/gUnk_080CD907.bin"
+gSpriteAnimations_Gleerok_1_13:: @ 080CD907
+ .include "animations/gSpriteAnimations_Gleerok_1_13.s"
-gUnk_080CD90B:: @ 080CD90B
- .incbin "gleerok/gUnk_080CD90B.bin"
+gSpriteAnimations_Gleerok_1_14:: @ 080CD90B
+ .include "animations/gSpriteAnimations_Gleerok_1_14.s"
-gUnk_080CD90F:: @ 080CD90F
- .incbin "gleerok/gUnk_080CD90F.bin"
+gSpriteAnimations_Gleerok_1_15:: @ 080CD90F
+ .include "animations/gSpriteAnimations_Gleerok_1_15.s"
-gUnk_080CD913:: @ 080CD913
- .incbin "gleerok/gUnk_080CD913.bin"
+gSpriteAnimations_Gleerok_1_16:: @ 080CD913
+ .include "animations/gSpriteAnimations_Gleerok_1_16.s"
-gUnk_080CD917:: @ 080CD917
- .incbin "gleerok/gUnk_080CD917.bin"
+gSpriteAnimations_Gleerok_1_17:: @ 080CD917
+ .include "animations/gSpriteAnimations_Gleerok_1_17.s"
-gUnk_080CD91B:: @ 080CD91B
- .incbin "gleerok/gUnk_080CD91B.bin"
+gSpriteAnimations_Gleerok_1_18:: @ 080CD91B
+ .include "animations/gSpriteAnimations_Gleerok_1_18.s"
-gUnk_080CD91F:: @ 080CD91F
- .incbin "gleerok/gUnk_080CD91F.bin"
+gSpriteAnimations_Gleerok_1_19:: @ 080CD91F
+ .include "animations/gSpriteAnimations_Gleerok_1_19.s"
-gUnk_080CD923:: @ 080CD923
- .incbin "gleerok/gUnk_080CD923.bin"
+gSpriteAnimations_Gleerok_1_20:: @ 080CD923
+ .include "animations/gSpriteAnimations_Gleerok_1_20.s"
-gUnk_080CD927:: @ 080CD927
- .incbin "gleerok/gUnk_080CD927.bin"
+gSpriteAnimations_Gleerok_1_21:: @ 080CD927
+ .include "animations/gSpriteAnimations_Gleerok_1_21.s"
-gUnk_080CD92B:: @ 080CD92B
- .incbin "gleerok/gUnk_080CD92B.bin"
+gSpriteAnimations_Gleerok_1_22:: @ 080CD92B
+ .include "animations/gSpriteAnimations_Gleerok_1_22.s"
-gUnk_080CD92F:: @ 080CD92F
- .incbin "gleerok/gUnk_080CD92F.bin"
+gSpriteAnimations_Gleerok_1_23:: @ 080CD92F
+ .include "animations/gSpriteAnimations_Gleerok_1_23.s"
-gUnk_080CD933:: @ 080CD933
- .incbin "gleerok/gUnk_080CD933.bin"
+gSpriteAnimations_Gleerok_1_0:: @ 080CD933
+ .include "animations/gSpriteAnimations_Gleerok_1_0.s"
-gUnk_080CD937:: @ 080CD937
- .incbin "gleerok/gUnk_080CD937.bin"
+gSpriteAnimations_Gleerok_1_1:: @ 080CD937
+ .include "animations/gSpriteAnimations_Gleerok_1_1.s"
-gUnk_080CD93B:: @ 080CD93B
- .incbin "gleerok/gUnk_080CD93B.bin"
+gSpriteAnimations_Gleerok_1_2:: @ 080CD93B
+ .include "animations/gSpriteAnimations_Gleerok_1_2.s"
-gUnk_080CD93F:: @ 080CD93F
- .incbin "gleerok/gUnk_080CD93F.bin"
+gSpriteAnimations_Gleerok_1_3:: @ 080CD93F
+ .include "animations/gSpriteAnimations_Gleerok_1_3.s"
-gUnk_080CD943:: @ 080CD943
- .incbin "gleerok/gUnk_080CD943.bin"
+gSpriteAnimations_Gleerok_1_4:: @ 080CD943
+ .include "animations/gSpriteAnimations_Gleerok_1_4.s"
-gUnk_080CD947:: @ 080CD947
- .incbin "gleerok/gUnk_080CD947.bin"
+gSpriteAnimations_Gleerok_1_5:: @ 080CD947
+ .include "animations/gSpriteAnimations_Gleerok_1_5.s"
-gUnk_080CD94B:: @ 080CD94B
- .incbin "gleerok/gUnk_080CD94B.bin"
+gSpriteAnimations_Gleerok_1_6:: @ 080CD94B
+ .include "animations/gSpriteAnimations_Gleerok_1_6.s"
-gUnk_080CD94F:: @ 080CD94F
- .incbin "gleerok/gUnk_080CD94F.bin"
+gSpriteAnimations_Gleerok_1_7:: @ 080CD94F
+ .include "animations/gSpriteAnimations_Gleerok_1_7.s"
-gUnk_080CD953:: @ 080CD953
- .incbin "gleerok/gUnk_080CD953.bin"
+gSpriteAnimations_Gleerok_1_8:: @ 080CD953
+ .include "animations/gSpriteAnimations_Gleerok_1_8.s"
-gUnk_080CD957:: @ 080CD957
- .incbin "gleerok/gUnk_080CD957.bin"
+gSpriteAnimations_Gleerok_1_9:: @ 080CD957
+ .include "animations/gSpriteAnimations_Gleerok_1_9.s"
-gUnk_080CD95B:: @ 080CD95B
- .incbin "gleerok/gUnk_080CD95B.bin"
+gSpriteAnimations_Gleerok_1_10:: @ 080CD95B
+ .include "animations/gSpriteAnimations_Gleerok_1_10.s"
-gUnk_080CD95F:: @ 080CD95F
- .incbin "gleerok/gUnk_080CD95F.bin"
+gSpriteAnimations_Gleerok_1_11:: @ 080CD95F
+ .include "animations/gSpriteAnimations_Gleerok_1_11.s"
-gUnk_080CD963:: @ 080CD963
- .incbin "gleerok/gUnk_080CD963.bin"
+gSpriteAnimations_Gleerok_1_48:: @ 080CD963
+ .include "animations/gSpriteAnimations_Gleerok_1_48.s"
-gUnk_080CD967:: @ 080CD967
- .incbin "gleerok/gUnk_080CD967.bin"
+gSpriteAnimations_Gleerok_1_49:: @ 080CD967
+ .include "animations/gSpriteAnimations_Gleerok_1_49.s"
-gUnk_080CD96B:: @ 080CD96B
- .incbin "gleerok/gUnk_080CD96B.bin"
+gSpriteAnimations_Gleerok_1_50:: @ 080CD96B
+ .include "animations/gSpriteAnimations_Gleerok_1_50.s"
-gUnk_080CD96F:: @ 080CD96F
- .incbin "gleerok/gUnk_080CD96F.bin"
+gSpriteAnimations_Gleerok_1_51:: @ 080CD96F
+ .include "animations/gSpriteAnimations_Gleerok_1_51.s"
-gUnk_080CD973:: @ 080CD973
- .incbin "gleerok/gUnk_080CD973.bin"
+gSpriteAnimations_Gleerok_1_52:: @ 080CD973
+ .include "animations/gSpriteAnimations_Gleerok_1_52.s"
-gUnk_080CD977:: @ 080CD977
- .incbin "gleerok/gUnk_080CD977.bin"
+gSpriteAnimations_Gleerok_1_53:: @ 080CD977
+ .include "animations/gSpriteAnimations_Gleerok_1_53.s"
-gUnk_080CD97B:: @ 080CD97B
- .incbin "gleerok/gUnk_080CD97B.bin"
+gSpriteAnimations_Gleerok_1_54:: @ 080CD97B
+ .include "animations/gSpriteAnimations_Gleerok_1_54.s"
-gUnk_080CD97F:: @ 080CD97F
- .incbin "gleerok/gUnk_080CD97F.bin"
+gSpriteAnimations_Gleerok_1_55:: @ 080CD97F
+ .include "animations/gSpriteAnimations_Gleerok_1_55.s"
-gUnk_080CD983:: @ 080CD983
- .incbin "gleerok/gUnk_080CD983.bin"
+gSpriteAnimations_Gleerok_1_56:: @ 080CD983
+ .include "animations/gSpriteAnimations_Gleerok_1_56.s"
-gUnk_080CD987:: @ 080CD987
- .incbin "gleerok/gUnk_080CD987.bin"
+gSpriteAnimations_Gleerok_1_57:: @ 080CD987
+ .include "animations/gSpriteAnimations_Gleerok_1_57.s"
-gUnk_080CD98B:: @ 080CD98B
- .incbin "gleerok/gUnk_080CD98B.bin"
+gSpriteAnimations_Gleerok_1_58:: @ 080CD98B
+ .include "animations/gSpriteAnimations_Gleerok_1_58.s"
-gUnk_080CD98F:: @ 080CD98F
- .incbin "gleerok/gUnk_080CD98F.bin"
+gSpriteAnimations_Gleerok_1_59:: @ 080CD98F
+ .include "animations/gSpriteAnimations_Gleerok_1_59.s"
-gUnk_080CD993:: @ 080CD993
- .incbin "gleerok/gUnk_080CD993.bin"
+gSpriteAnimations_Gleerok_1_60:: @ 080CD993
+ .include "animations/gSpriteAnimations_Gleerok_1_60.s"
-gUnk_080CD997:: @ 080CD997
- .incbin "gleerok/gUnk_080CD997.bin"
+gSpriteAnimations_Gleerok_1_61:: @ 080CD997
+ .include "animations/gSpriteAnimations_Gleerok_1_61.s"
-gUnk_080CD99B:: @ 080CD99B
- .incbin "gleerok/gUnk_080CD99B.bin"
+gSpriteAnimations_Gleerok_1_62:: @ 080CD99B
+ .include "animations/gSpriteAnimations_Gleerok_1_62.s"
-gUnk_080CD99F:: @ 080CD99F
- .incbin "gleerok/gUnk_080CD99F.bin"
+gSpriteAnimations_Gleerok_1_63:: @ 080CD99F
+ .include "animations/gSpriteAnimations_Gleerok_1_63.s"
-gUnk_080CD9A3:: @ 080CD9A3
- .incbin "gleerok/gUnk_080CD9A3.bin"
+gSpriteAnimations_Gleerok_1_64:: @ 080CD9A3
+ .include "animations/gSpriteAnimations_Gleerok_1_64.s"
-gUnk_080CD9A7:: @ 080CD9A7
- .incbin "gleerok/gUnk_080CD9A7.bin"
+gSpriteAnimations_Gleerok_1_65:: @ 080CD9A7
+ .include "animations/gSpriteAnimations_Gleerok_1_65.s"
-gUnk_080CD9AB:: @ 080CD9AB
- .incbin "gleerok/gUnk_080CD9AB.bin"
+gSpriteAnimations_Gleerok_1_66:: @ 080CD9AB
+ .include "animations/gSpriteAnimations_Gleerok_1_66.s"
-gUnk_080CD9AF:: @ 080CD9AF
- .incbin "gleerok/gUnk_080CD9AF.bin"
+gSpriteAnimations_Gleerok_1_67:: @ 080CD9AF
+ .include "animations/gSpriteAnimations_Gleerok_1_67.s"
-gUnk_080CD9B3:: @ 080CD9B3
- .incbin "gleerok/gUnk_080CD9B3.bin"
+gSpriteAnimations_Gleerok_1_68:: @ 080CD9B3
+ .include "animations/gSpriteAnimations_Gleerok_1_68.s"
-gUnk_080CD9B7:: @ 080CD9B7
- .incbin "gleerok/gUnk_080CD9B7.bin"
+gSpriteAnimations_Gleerok_1_69:: @ 080CD9B7
+ .include "animations/gSpriteAnimations_Gleerok_1_69.s"
-gUnk_080CD9BB:: @ 080CD9BB
- .incbin "gleerok/gUnk_080CD9BB.bin"
+gSpriteAnimations_Gleerok_1_70:: @ 080CD9BB
+ .include "animations/gSpriteAnimations_Gleerok_1_70.s"
-gUnk_080CD9BF:: @ 080CD9BF
- .incbin "gleerok/gUnk_080CD9BF.bin"
+gSpriteAnimations_Gleerok_1_71:: @ 080CD9BF
+ .include "animations/gSpriteAnimations_Gleerok_1_71.s"
-gUnk_080CD9C3:: @ 080CD9C3
- .incbin "gleerok/gUnk_080CD9C3.bin"
+gSpriteAnimations_Gleerok_1_72:: @ 080CD9C3
+ .include "animations/gSpriteAnimations_Gleerok_1_72.s"
-gUnk_080CD9C7:: @ 080CD9C7
- .incbin "gleerok/gUnk_080CD9C7.bin"
+gSpriteAnimations_Gleerok_1_73:: @ 080CD9C7
+ .include "animations/gSpriteAnimations_Gleerok_1_73.s"
-gUnk_080CD9CB:: @ 080CD9CB
- .incbin "gleerok/gUnk_080CD9CB.bin"
+gSpriteAnimations_Gleerok_1_76:: @ 080CD9CB
+ .include "animations/gSpriteAnimations_Gleerok_1_76.s"
-gUnk_080CD9CF:: @ 080CD9CF
- .incbin "gleerok/gUnk_080CD9CF.bin"
+gSpriteAnimations_Gleerok_1_77:: @ 080CD9CF
+ .include "animations/gSpriteAnimations_Gleerok_1_77.s"
-gUnk_080CD9DF:: @ 080CD9DF
- .incbin "gleerok/gUnk_080CD9DF.bin"
+gSpriteAnimations_Gleerok_1_78:: @ 080CD9DF
+ .include "animations/gSpriteAnimations_Gleerok_1_78.s"
-gUnk_080CD9FB:: @ 080CD9FB
- .incbin "gleerok/gUnk_080CD9FB.bin"
+gSpriteAnimations_Gleerok_0_0:: @ 080CD9FB
+ .include "animations/gSpriteAnimations_Gleerok_0_0.s"
-gUnk_080CD9FF:: @ 080CD9FF
- .incbin "gleerok/gUnk_080CD9FF.bin"
+gSpriteAnimations_Gleerok_0_1:: @ 080CD9FF
+ .include "animations/gSpriteAnimations_Gleerok_0_1.s"
-gUnk_080CDA03:: @ 080CDA03
- .incbin "gleerok/gUnk_080CDA03.bin"
+gSpriteAnimations_Gleerok_0_2:: @ 080CDA03
+ .include "animations/gSpriteAnimations_Gleerok_0_2.s"
-gUnk_080CDA07:: @ 080CDA07
- .incbin "gleerok/gUnk_080CDA07.bin"
+gSpriteAnimations_Gleerok_0_3:: @ 080CDA07
+ .include "animations/gSpriteAnimations_Gleerok_0_3.s"
-gUnk_080CDA0B:: @ 080CDA0B
- .incbin "gleerok/gUnk_080CDA0B.bin"
+gSpriteAnimations_Gleerok_0_4:: @ 080CDA0B
+ .include "animations/gSpriteAnimations_Gleerok_0_4.s"
-gUnk_080CDA0F:: @ 080CDA0F
- .incbin "gleerok/gUnk_080CDA0F.bin"
+gSpriteAnimations_Gleerok_0_5:: @ 080CDA0F
+ .include "animations/gSpriteAnimations_Gleerok_0_5.s"
-gUnk_080CDA13:: @ 080CDA13
- .incbin "gleerok/gUnk_080CDA13.bin"
+gSpriteAnimations_Gleerok_0_6:: @ 080CDA13
+ .include "animations/gSpriteAnimations_Gleerok_0_6.s"
-gUnk_080CDA17:: @ 080CDA17
- .incbin "gleerok/gUnk_080CDA17.bin"
+gSpriteAnimations_Gleerok_0_7:: @ 080CDA17
+ .include "animations/gSpriteAnimations_Gleerok_0_7.s"
-gUnk_080CDA1B:: @ 080CDA1B
- .incbin "gleerok/gUnk_080CDA1B.bin"
+gSpriteAnimations_Gleerok_0_8:: @ 080CDA1B
+ .include "animations/gSpriteAnimations_Gleerok_0_8.s"
-gUnk_080CDA1F:: @ 080CDA1F
- .incbin "gleerok/gUnk_080CDA1F.bin"
+gSpriteAnimations_Gleerok_0_9:: @ 080CDA1F
+ .include "animations/gSpriteAnimations_Gleerok_0_9.s"
-gUnk_080CDA23:: @ 080CDA23
- .incbin "gleerok/gUnk_080CDA23.bin"
+gSpriteAnimations_Gleerok_0_10:: @ 080CDA23
+ .include "animations/gSpriteAnimations_Gleerok_0_10.s"
-gUnk_080CDA27:: @ 080CDA27
- .incbin "gleerok/gUnk_080CDA27.bin"
+gSpriteAnimations_Gleerok_0_11:: @ 080CDA27
+ .include "animations/gSpriteAnimations_Gleerok_0_11.s"
-gUnk_080CDA2B:: @ 080CDA2B
- .incbin "gleerok/gUnk_080CDA2B.bin"
+gSpriteAnimations_Gleerok_0_12:: @ 080CDA2B
+ .include "animations/gSpriteAnimations_Gleerok_0_12.s"
-gUnk_080CDA2F:: @ 080CDA2F
- .incbin "gleerok/gUnk_080CDA2F.bin"
+gSpriteAnimations_Gleerok_0_13:: @ 080CDA2F
+ .include "animations/gSpriteAnimations_Gleerok_0_13.s"
-gUnk_080CDA33:: @ 080CDA33
- .incbin "gleerok/gUnk_080CDA33.bin"
+gSpriteAnimations_Gleerok_0_14:: @ 080CDA33
+ .include "animations/gSpriteAnimations_Gleerok_0_14.s"
-gUnk_080CDA37:: @ 080CDA37
- .incbin "gleerok/gUnk_080CDA37.bin"
+gSpriteAnimations_Gleerok_0_15:: @ 080CDA37
+ .include "animations/gSpriteAnimations_Gleerok_0_15.s"
-gUnk_080CDA3B:: @ 080CDA3B
- .incbin "gleerok/gUnk_080CDA3B.bin"
+gSpriteAnimations_Gleerok_0_16:: @ 080CDA3B
+ .include "animations/gSpriteAnimations_Gleerok_0_16.s"
-gUnk_080CDA3F:: @ 080CDA3F
- .incbin "gleerok/gUnk_080CDA3F.bin"
+gSpriteAnimations_Gleerok_0_17:: @ 080CDA3F
+ .include "animations/gSpriteAnimations_Gleerok_0_17.s"
-gUnk_080CDA43:: @ 080CDA43
- .incbin "gleerok/gUnk_080CDA43.bin"
+gSpriteAnimations_Gleerok_0_18:: @ 080CDA43
+ .include "animations/gSpriteAnimations_Gleerok_0_18.s"
-gUnk_080CDA47:: @ 080CDA47
- .incbin "gleerok/gUnk_080CDA47.bin"
+gSpriteAnimations_Gleerok_0_19:: @ 080CDA47
+ .include "animations/gSpriteAnimations_Gleerok_0_19.s"
-gUnk_080CDA4B:: @ 080CDA4B
- .incbin "gleerok/gUnk_080CDA4B.bin"
+gSpriteAnimations_Gleerok_0_20:: @ 080CDA4B
+ .include "animations/gSpriteAnimations_Gleerok_0_20.s"
-gUnk_080CDA4F:: @ 080CDA4F
- .incbin "gleerok/gUnk_080CDA4F.bin"
+gSpriteAnimations_Gleerok_0_21:: @ 080CDA4F
+ .include "animations/gSpriteAnimations_Gleerok_0_21.s"
-gUnk_080CDA53:: @ 080CDA53
- .incbin "gleerok/gUnk_080CDA53.bin"
+gSpriteAnimations_Gleerok_0_22:: @ 080CDA53
+ .include "animations/gSpriteAnimations_Gleerok_0_22.s"
-gUnk_080CDA57:: @ 080CDA57
- .incbin "gleerok/gUnk_080CDA57.bin"
+gSpriteAnimations_Gleerok_0_23:: @ 080CDA57
+ .include "animations/gSpriteAnimations_Gleerok_0_23.s"
-gUnk_080CDA5B:: @ 080CDA5B
- .incbin "gleerok/gUnk_080CDA5B.bin"
+gSpriteAnimations_Gleerok_0_26:: @ 080CDA5B
+ .include "animations/gSpriteAnimations_Gleerok_0_26.s"
-gUnk_080CDA5F:: @ 080CDA5F
- .incbin "gleerok/gUnk_080CDA5F.bin"
+gSpriteAnimations_Gleerok_0_25:: @ 080CDA5F
+ .include "animations/gSpriteAnimations_Gleerok_0_25.s"
-gUnk_080CDA63:: @ 080CDA63
- .incbin "gleerok/gUnk_080CDA63.bin"
+gSpriteAnimations_Gleerok_0_24:: @ 080CDA63
+ .include "animations/gSpriteAnimations_Gleerok_0_24.s"
-gUnk_080CDA67:: @ 080CDA67
- .incbin "gleerok/gUnk_080CDA67.bin"
+gSpriteAnimations_Gleerok_0_30:: @ 080CDA67
+ .include "animations/gSpriteAnimations_Gleerok_0_30.s"
-gUnk_080CDA6B:: @ 080CDA6B
- .incbin "gleerok/gUnk_080CDA6B.bin"
+gSpriteAnimations_Gleerok_0_29:: @ 080CDA6B
+ .include "animations/gSpriteAnimations_Gleerok_0_29.s"
-gUnk_080CDA6F:: @ 080CDA6F
- .incbin "gleerok/gUnk_080CDA6F.bin"
+gSpriteAnimations_Gleerok_0_28:: @ 080CDA6F
+ .include "animations/gSpriteAnimations_Gleerok_0_28.s"
-gUnk_080CDA73:: @ 080CDA73
- .incbin "gleerok/gUnk_080CDA73.bin"
+gSpriteAnimations_Gleerok_0_34:: @ 080CDA73
+ .include "animations/gSpriteAnimations_Gleerok_0_34.s"
-gUnk_080CDA77:: @ 080CDA77
- .incbin "gleerok/gUnk_080CDA77.bin"
+gSpriteAnimations_Gleerok_0_33:: @ 080CDA77
+ .include "animations/gSpriteAnimations_Gleerok_0_33.s"
-gUnk_080CDA7B:: @ 080CDA7B
- .incbin "gleerok/gUnk_080CDA7B.bin"
+gSpriteAnimations_Gleerok_0_32:: @ 080CDA7B
+ .include "animations/gSpriteAnimations_Gleerok_0_32.s"
-gUnk_080CDA7F:: @ 080CDA7F
- .incbin "gleerok/gUnk_080CDA7F.bin"
+gSpriteAnimations_Gleerok_0_38:: @ 080CDA7F
+ .include "animations/gSpriteAnimations_Gleerok_0_38.s"
-gUnk_080CDA83:: @ 080CDA83
- .incbin "gleerok/gUnk_080CDA83.bin"
+gSpriteAnimations_Gleerok_0_37:: @ 080CDA83
+ .include "animations/gSpriteAnimations_Gleerok_0_37.s"
-gUnk_080CDA87:: @ 080CDA87
- .incbin "gleerok/gUnk_080CDA87.bin"
+gSpriteAnimations_Gleerok_0_36:: @ 080CDA87
+ .include "animations/gSpriteAnimations_Gleerok_0_36.s"
-gUnk_080CDA8B:: @ 080CDA8B
- .incbin "gleerok/gUnk_080CDA8B.bin"
+gSpriteAnimations_Gleerok_0_40:: @ 080CDA8B
+ .include "animations/gSpriteAnimations_Gleerok_0_40.s"
-gUnk_080CDA90:: @ 080CDA90
- .incbin "gleerok/gUnk_080CDA90.bin"
+gSpriteAnimations_Gleerok_0_41:: @ 080CDA90
+ .include "animations/gSpriteAnimations_Gleerok_0_41.s"
-gUnk_080CDA95:: @ 080CDA95
- .incbin "gleerok/gUnk_080CDA95.bin"
+gSpriteAnimations_Gleerok_0_42:: @ 080CDA95
+ .include "animations/gSpriteAnimations_Gleerok_0_42.s"
-gUnk_080CDA9A:: @ 080CDA9A
- .incbin "gleerok/gUnk_080CDA9A.bin"
+gSpriteAnimations_Gleerok_0_43:: @ 080CDA9A
+ .include "animations/gSpriteAnimations_Gleerok_0_43.s"
-gUnk_080CDA9F:: @ 080CDA9F
- .incbin "gleerok/gUnk_080CDA9F.bin"
+gSpriteAnimations_Gleerok_1_79:: @ 080CDA9F
+ .include "animations/gSpriteAnimations_Gleerok_1_79.s"
-gUnk_080CDAC4:: @ 080CDAC4
- .incbin "gleerok/gUnk_080CDAC4.bin"
+gSpriteAnimations_Gleerok_1_86:: @ 080CDAC4
+ .include "animations/gSpriteAnimations_Gleerok_1_86.s"
-gUnk_080CDAD5:: @ 080CDAD5
- .incbin "gleerok/gUnk_080CDAD5.bin"
+gSpriteAnimations_Gleerok_1_87:: @ 080CDAD5
+ .include "animations/gSpriteAnimations_Gleerok_1_87.s"
-gUnk_080CDAE6:: @ 080CDAE6
- .incbin "gleerok/gUnk_080CDAE6.bin"
+gSpriteAnimations_Gleerok_1_80:: @ 080CDAE6
+ .include "animations/gSpriteAnimations_Gleerok_1_80.s"
-gUnk_080CDAF3:: @ 080CDAF3
- .incbin "gleerok/gUnk_080CDAF3.bin"
+gSpriteAnimations_Gleerok_0_44:: @ 080CDAF3
+ .include "animations/gSpriteAnimations_Gleerok_0_44.s"
-gUnk_080CDB03:: @ 080CDB03
- .incbin "gleerok/gUnk_080CDB03.bin"
+gSpriteAnimations_Gleerok_0_45:: @ 080CDB03
+ .include "animations/gSpriteAnimations_Gleerok_0_45.s"
-gUnk_080CDB17:: @ 080CDB17
- .incbin "gleerok/gUnk_080CDB17.bin"
+gSpriteAnimations_Gleerok_0_46:: @ 080CDB17
+ .include "animations/gSpriteAnimations_Gleerok_0_46.s"
-gUnk_080CDB28:: @ 080CDB28
- .incbin "gleerok/gUnk_080CDB28.bin"
+gSpriteAnimations_Gleerok_1_81:: @ 080CDB28
+ .include "animations/gSpriteAnimations_Gleerok_1_81.s"
-gUnk_080CDB39:: @ 080CDB39
- .incbin "gleerok/gUnk_080CDB39.bin"
+gSpriteAnimations_Gleerok_1_82:: @ 080CDB39
+ .include "animations/gSpriteAnimations_Gleerok_1_82.s"
-gUnk_080CDB5D:: @ 080CDB5D
- .incbin "gleerok/gUnk_080CDB5D.bin"
+gSpriteAnimations_Gleerok_1_83:: @ 080CDB5D
+ .include "animations/gSpriteAnimations_Gleerok_1_83.s"
-gUnk_080CDB6D:: @ 080CDB6D
- .incbin "gleerok/gUnk_080CDB6D.bin"
+gSpriteAnimations_Gleerok_1_84:: @ 080CDB6D
+ .include "animations/gSpriteAnimations_Gleerok_1_84.s"
-gUnk_080CDB7E:: @ 080CDB7E
- .incbin "gleerok/gUnk_080CDB7E.bin"
+gSpriteAnimations_Gleerok_1_85:: @ 080CDB7E
+ .include "animations/gSpriteAnimations_Gleerok_1_85.s"
-gUnk_080CDB92:: @ 080CDB92
- .incbin "gleerok/gUnk_080CDB92.bin"
+gSpriteAnimations_Gleerok_0_47:: @ 080CDB92
+ .include "animations/gSpriteAnimations_Gleerok_0_47.s"
-gUnk_080CDBAB:: @ 080CDBAB
- .incbin "gleerok/gUnk_080CDBAB.bin"
+gSpriteAnimations_Gleerok_0_48:: @ 080CDBAB
+ .include "animations/gSpriteAnimations_Gleerok_0_48.s"
-gUnk_080CDBC4:: @ 080CDBC4
- .incbin "gleerok/gUnk_080CDBC4.bin"
+gSpriteAnimations_Gleerok_0_49:: @ 080CDBC4
+ .include "animations/gSpriteAnimations_Gleerok_0_49.s"
-gUnk_080CDBDD:: @ 080CDBDD
- .incbin "gleerok/gUnk_080CDBDD.bin"
+gSpriteAnimations_Gleerok_0_50:: @ 080CDBDD
+ .include "animations/gSpriteAnimations_Gleerok_0_50.s"
gSpriteAnimations_Gleerok_1:: @ 080CDC00
- .4byte gUnk_080CD933
- .4byte gUnk_080CD937
- .4byte gUnk_080CD93B
- .4byte gUnk_080CD93F
- .4byte gUnk_080CD943
- .4byte gUnk_080CD947
- .4byte gUnk_080CD94B
- .4byte gUnk_080CD94F
- .4byte gUnk_080CD953
- .4byte gUnk_080CD957
- .4byte gUnk_080CD95B
- .4byte gUnk_080CD95F
- .4byte gUnk_080CD903
- .4byte gUnk_080CD907
- .4byte gUnk_080CD90B
- .4byte gUnk_080CD90F
- .4byte gUnk_080CD913
- .4byte gUnk_080CD917
- .4byte gUnk_080CD91B
- .4byte gUnk_080CD91F
- .4byte gUnk_080CD923
- .4byte gUnk_080CD927
- .4byte gUnk_080CD92B
- .4byte gUnk_080CD92F
- .4byte gUnk_080CD8D3
- .4byte gUnk_080CD8D7
- .4byte gUnk_080CD8DB
- .4byte gUnk_080CD8DF
- .4byte gUnk_080CD8E3
- .4byte gUnk_080CD8E7
- .4byte gUnk_080CD8EB
- .4byte gUnk_080CD8EF
- .4byte gUnk_080CD8F3
- .4byte gUnk_080CD8F7
- .4byte gUnk_080CD8FB
- .4byte gUnk_080CD8FF
- .4byte gUnk_080CD8A3
- .4byte gUnk_080CD8A7
- .4byte gUnk_080CD8AB
- .4byte gUnk_080CD8AF
- .4byte gUnk_080CD8B3
- .4byte gUnk_080CD8B7
- .4byte gUnk_080CD8BB
- .4byte gUnk_080CD8BF
- .4byte gUnk_080CD8C3
- .4byte gUnk_080CD8C7
- .4byte gUnk_080CD8CB
- .4byte gUnk_080CD8CF
- .4byte gUnk_080CD963
- .4byte gUnk_080CD967
- .4byte gUnk_080CD96B
- .4byte gUnk_080CD96F
- .4byte gUnk_080CD973
- .4byte gUnk_080CD977
- .4byte gUnk_080CD97B
- .4byte gUnk_080CD97F
- .4byte gUnk_080CD983
- .4byte gUnk_080CD987
- .4byte gUnk_080CD98B
- .4byte gUnk_080CD98F
- .4byte gUnk_080CD993
- .4byte gUnk_080CD997
- .4byte gUnk_080CD99B
- .4byte gUnk_080CD99F
- .4byte gUnk_080CD9A3
- .4byte gUnk_080CD9A7
- .4byte gUnk_080CD9AB
- .4byte gUnk_080CD9AF
- .4byte gUnk_080CD9B3
- .4byte gUnk_080CD9B7
- .4byte gUnk_080CD9BB
- .4byte gUnk_080CD9BF
- .4byte gUnk_080CD9C3
- .4byte gUnk_080CD9C7
- .4byte gUnk_080CD9C3
- .4byte gUnk_080CD9C7
- .4byte gUnk_080CD9CB
- .4byte gUnk_080CD9CF
- .4byte gUnk_080CD9DF
- .4byte gUnk_080CDA9F
- .4byte gUnk_080CDAE6
- .4byte gUnk_080CDB28
- .4byte gUnk_080CDB39
- .4byte gUnk_080CDB5D
- .4byte gUnk_080CDB6D
- .4byte gUnk_080CDB7E
- .4byte gUnk_080CDAC4
- .4byte gUnk_080CDAD5
+ .4byte gSpriteAnimations_Gleerok_1_0
+ .4byte gSpriteAnimations_Gleerok_1_1
+ .4byte gSpriteAnimations_Gleerok_1_2
+ .4byte gSpriteAnimations_Gleerok_1_3
+ .4byte gSpriteAnimations_Gleerok_1_4
+ .4byte gSpriteAnimations_Gleerok_1_5
+ .4byte gSpriteAnimations_Gleerok_1_6
+ .4byte gSpriteAnimations_Gleerok_1_7
+ .4byte gSpriteAnimations_Gleerok_1_8
+ .4byte gSpriteAnimations_Gleerok_1_9
+ .4byte gSpriteAnimations_Gleerok_1_10
+ .4byte gSpriteAnimations_Gleerok_1_11
+ .4byte gSpriteAnimations_Gleerok_1_12
+ .4byte gSpriteAnimations_Gleerok_1_13
+ .4byte gSpriteAnimations_Gleerok_1_14
+ .4byte gSpriteAnimations_Gleerok_1_15
+ .4byte gSpriteAnimations_Gleerok_1_16
+ .4byte gSpriteAnimations_Gleerok_1_17
+ .4byte gSpriteAnimations_Gleerok_1_18
+ .4byte gSpriteAnimations_Gleerok_1_19
+ .4byte gSpriteAnimations_Gleerok_1_20
+ .4byte gSpriteAnimations_Gleerok_1_21
+ .4byte gSpriteAnimations_Gleerok_1_22
+ .4byte gSpriteAnimations_Gleerok_1_23
+ .4byte gSpriteAnimations_Gleerok_1_24
+ .4byte gSpriteAnimations_Gleerok_1_25
+ .4byte gSpriteAnimations_Gleerok_1_26
+ .4byte gSpriteAnimations_Gleerok_1_27
+ .4byte gSpriteAnimations_Gleerok_1_28
+ .4byte gSpriteAnimations_Gleerok_1_29
+ .4byte gSpriteAnimations_Gleerok_1_30
+ .4byte gSpriteAnimations_Gleerok_1_31
+ .4byte gSpriteAnimations_Gleerok_1_32
+ .4byte gSpriteAnimations_Gleerok_1_33
+ .4byte gSpriteAnimations_Gleerok_1_34
+ .4byte gSpriteAnimations_Gleerok_1_35
+ .4byte gSpriteAnimations_Gleerok_1_36
+ .4byte gSpriteAnimations_Gleerok_1_37
+ .4byte gSpriteAnimations_Gleerok_1_38
+ .4byte gSpriteAnimations_Gleerok_1_39
+ .4byte gSpriteAnimations_Gleerok_1_40
+ .4byte gSpriteAnimations_Gleerok_1_41
+ .4byte gSpriteAnimations_Gleerok_1_42
+ .4byte gSpriteAnimations_Gleerok_1_43
+ .4byte gSpriteAnimations_Gleerok_1_44
+ .4byte gSpriteAnimations_Gleerok_1_45
+ .4byte gSpriteAnimations_Gleerok_1_46
+ .4byte gSpriteAnimations_Gleerok_1_47
+ .4byte gSpriteAnimations_Gleerok_1_48
+ .4byte gSpriteAnimations_Gleerok_1_49
+ .4byte gSpriteAnimations_Gleerok_1_50
+ .4byte gSpriteAnimations_Gleerok_1_51
+ .4byte gSpriteAnimations_Gleerok_1_52
+ .4byte gSpriteAnimations_Gleerok_1_53
+ .4byte gSpriteAnimations_Gleerok_1_54
+ .4byte gSpriteAnimations_Gleerok_1_55
+ .4byte gSpriteAnimations_Gleerok_1_56
+ .4byte gSpriteAnimations_Gleerok_1_57
+ .4byte gSpriteAnimations_Gleerok_1_58
+ .4byte gSpriteAnimations_Gleerok_1_59
+ .4byte gSpriteAnimations_Gleerok_1_60
+ .4byte gSpriteAnimations_Gleerok_1_61
+ .4byte gSpriteAnimations_Gleerok_1_62
+ .4byte gSpriteAnimations_Gleerok_1_63
+ .4byte gSpriteAnimations_Gleerok_1_64
+ .4byte gSpriteAnimations_Gleerok_1_65
+ .4byte gSpriteAnimations_Gleerok_1_66
+ .4byte gSpriteAnimations_Gleerok_1_67
+ .4byte gSpriteAnimations_Gleerok_1_68
+ .4byte gSpriteAnimations_Gleerok_1_69
+ .4byte gSpriteAnimations_Gleerok_1_70
+ .4byte gSpriteAnimations_Gleerok_1_71
+ .4byte gSpriteAnimations_Gleerok_1_72
+ .4byte gSpriteAnimations_Gleerok_1_73
+ .4byte gSpriteAnimations_Gleerok_1_72
+ .4byte gSpriteAnimations_Gleerok_1_73
+ .4byte gSpriteAnimations_Gleerok_1_76
+ .4byte gSpriteAnimations_Gleerok_1_77
+ .4byte gSpriteAnimations_Gleerok_1_78
+ .4byte gSpriteAnimations_Gleerok_1_79
+ .4byte gSpriteAnimations_Gleerok_1_80
+ .4byte gSpriteAnimations_Gleerok_1_81
+ .4byte gSpriteAnimations_Gleerok_1_82
+ .4byte gSpriteAnimations_Gleerok_1_83
+ .4byte gSpriteAnimations_Gleerok_1_84
+ .4byte gSpriteAnimations_Gleerok_1_85
+ .4byte gSpriteAnimations_Gleerok_1_86
+ .4byte gSpriteAnimations_Gleerok_1_87
.4byte 00000000
gSpriteAnimations_Gleerok_0:: @ 080CDD64
- .4byte gUnk_080CD9FB
- .4byte gUnk_080CD9FF
- .4byte gUnk_080CDA03
- .4byte gUnk_080CDA07
- .4byte gUnk_080CDA0B
- .4byte gUnk_080CDA0F
- .4byte gUnk_080CDA13
- .4byte gUnk_080CDA17
- .4byte gUnk_080CDA1B
- .4byte gUnk_080CDA1F
- .4byte gUnk_080CDA23
- .4byte gUnk_080CDA27
- .4byte gUnk_080CDA2B
- .4byte gUnk_080CDA2F
- .4byte gUnk_080CDA33
- .4byte gUnk_080CDA37
- .4byte gUnk_080CDA3B
- .4byte gUnk_080CDA3F
- .4byte gUnk_080CDA43
- .4byte gUnk_080CDA47
- .4byte gUnk_080CDA4B
- .4byte gUnk_080CDA4F
- .4byte gUnk_080CDA53
- .4byte gUnk_080CDA57
- .4byte gUnk_080CDA63
- .4byte gUnk_080CDA5F
- .4byte gUnk_080CDA5B
- .4byte gUnk_080CD9FB
- .4byte gUnk_080CDA6F
- .4byte gUnk_080CDA6B
- .4byte gUnk_080CDA67
- .4byte gUnk_080CDA07
- .4byte gUnk_080CDA7B
- .4byte gUnk_080CDA77
- .4byte gUnk_080CDA73
- .4byte gUnk_080CDA13
- .4byte gUnk_080CDA87
- .4byte gUnk_080CDA83
- .4byte gUnk_080CDA7F
- .4byte gUnk_080CDA1F
- .4byte gUnk_080CDA8B
- .4byte gUnk_080CDA90
- .4byte gUnk_080CDA95
- .4byte gUnk_080CDA9A
- .4byte gUnk_080CDAF3
- .4byte gUnk_080CDB03
- .4byte gUnk_080CDB17
- .4byte gUnk_080CDB92
- .4byte gUnk_080CDBAB
- .4byte gUnk_080CDBC4
- .4byte gUnk_080CDBDD
+ .4byte gSpriteAnimations_Gleerok_0_0
+ .4byte gSpriteAnimations_Gleerok_0_1
+ .4byte gSpriteAnimations_Gleerok_0_2
+ .4byte gSpriteAnimations_Gleerok_0_3
+ .4byte gSpriteAnimations_Gleerok_0_4
+ .4byte gSpriteAnimations_Gleerok_0_5
+ .4byte gSpriteAnimations_Gleerok_0_6
+ .4byte gSpriteAnimations_Gleerok_0_7
+ .4byte gSpriteAnimations_Gleerok_0_8
+ .4byte gSpriteAnimations_Gleerok_0_9
+ .4byte gSpriteAnimations_Gleerok_0_10
+ .4byte gSpriteAnimations_Gleerok_0_11
+ .4byte gSpriteAnimations_Gleerok_0_12
+ .4byte gSpriteAnimations_Gleerok_0_13
+ .4byte gSpriteAnimations_Gleerok_0_14
+ .4byte gSpriteAnimations_Gleerok_0_15
+ .4byte gSpriteAnimations_Gleerok_0_16
+ .4byte gSpriteAnimations_Gleerok_0_17
+ .4byte gSpriteAnimations_Gleerok_0_18
+ .4byte gSpriteAnimations_Gleerok_0_19
+ .4byte gSpriteAnimations_Gleerok_0_20
+ .4byte gSpriteAnimations_Gleerok_0_21
+ .4byte gSpriteAnimations_Gleerok_0_22
+ .4byte gSpriteAnimations_Gleerok_0_23
+ .4byte gSpriteAnimations_Gleerok_0_24
+ .4byte gSpriteAnimations_Gleerok_0_25
+ .4byte gSpriteAnimations_Gleerok_0_26
+ .4byte gSpriteAnimations_Gleerok_0_0
+ .4byte gSpriteAnimations_Gleerok_0_28
+ .4byte gSpriteAnimations_Gleerok_0_29
+ .4byte gSpriteAnimations_Gleerok_0_30
+ .4byte gSpriteAnimations_Gleerok_0_3
+ .4byte gSpriteAnimations_Gleerok_0_32
+ .4byte gSpriteAnimations_Gleerok_0_33
+ .4byte gSpriteAnimations_Gleerok_0_34
+ .4byte gSpriteAnimations_Gleerok_0_6
+ .4byte gSpriteAnimations_Gleerok_0_36
+ .4byte gSpriteAnimations_Gleerok_0_37
+ .4byte gSpriteAnimations_Gleerok_0_38
+ .4byte gSpriteAnimations_Gleerok_0_9
+ .4byte gSpriteAnimations_Gleerok_0_40
+ .4byte gSpriteAnimations_Gleerok_0_41
+ .4byte gSpriteAnimations_Gleerok_0_42
+ .4byte gSpriteAnimations_Gleerok_0_43
+ .4byte gSpriteAnimations_Gleerok_0_44
+ .4byte gSpriteAnimations_Gleerok_0_45
+ .4byte gSpriteAnimations_Gleerok_0_46
+ .4byte gSpriteAnimations_Gleerok_0_47
+ .4byte gSpriteAnimations_Gleerok_0_48
+ .4byte gSpriteAnimations_Gleerok_0_49
+ .4byte gSpriteAnimations_Gleerok_0_50
.4byte 00000000
diff --git a/data/animations/enemy/gyorgChild.s b/data/animations/enemy/gyorgChild.s
index 67719bce..d0a62788 100644
--- a/data/animations/enemy/gyorgChild.s
+++ b/data/animations/enemy/gyorgChild.s
@@ -4,69 +4,69 @@
.section .rodata
@ .align 2
-gUnk_080D1EB6:: @ 080D1EB6
- .incbin "gyorgChild/gUnk_080D1EB6.bin"
+gSpriteAnimations_GyorgChild_0:: @ 080D1EB6
+ .include "animations/gSpriteAnimations_GyorgChild_0.s"
-gUnk_080D1EBF:: @ 080D1EBF
- .incbin "gyorgChild/gUnk_080D1EBF.bin"
+gSpriteAnimations_GyorgChild_1:: @ 080D1EBF
+ .include "animations/gSpriteAnimations_GyorgChild_1.s"
-gUnk_080D1EC8:: @ 080D1EC8
- .incbin "gyorgChild/gUnk_080D1EC8.bin"
+gSpriteAnimations_GyorgChild_2:: @ 080D1EC8
+ .include "animations/gSpriteAnimations_GyorgChild_2.s"
-gUnk_080D1ED1:: @ 080D1ED1
- .incbin "gyorgChild/gUnk_080D1ED1.bin"
+gSpriteAnimations_GyorgChild_3:: @ 080D1ED1
+ .include "animations/gSpriteAnimations_GyorgChild_3.s"
-gUnk_080D1EDA:: @ 080D1EDA
- .incbin "gyorgChild/gUnk_080D1EDA.bin"
+gSpriteAnimations_GyorgChild_4:: @ 080D1EDA
+ .include "animations/gSpriteAnimations_GyorgChild_4.s"
-gUnk_080D1EE3:: @ 080D1EE3
- .incbin "gyorgChild/gUnk_080D1EE3.bin"
+gSpriteAnimations_GyorgChild_5:: @ 080D1EE3
+ .include "animations/gSpriteAnimations_GyorgChild_5.s"
-gUnk_080D1EEC:: @ 080D1EEC
- .incbin "gyorgChild/gUnk_080D1EEC.bin"
+gSpriteAnimations_GyorgChild_6:: @ 080D1EEC
+ .include "animations/gSpriteAnimations_GyorgChild_6.s"
-gUnk_080D1EF5:: @ 080D1EF5
- .incbin "gyorgChild/gUnk_080D1EF5.bin"
+gSpriteAnimations_GyorgChild_7:: @ 080D1EF5
+ .include "animations/gSpriteAnimations_GyorgChild_7.s"
-gUnk_080D1EFE:: @ 080D1EFE
- .incbin "gyorgChild/gUnk_080D1EFE.bin"
+gSpriteAnimations_GyorgChild_8:: @ 080D1EFE
+ .include "animations/gSpriteAnimations_GyorgChild_8.s"
-gUnk_080D1F02:: @ 080D1F02
- .incbin "gyorgChild/gUnk_080D1F02.bin"
+gSpriteAnimations_GyorgChild_9:: @ 080D1F02
+ .include "animations/gSpriteAnimations_GyorgChild_9.s"
-gUnk_080D1F06:: @ 080D1F06
- .incbin "gyorgChild/gUnk_080D1F06.bin"
+gSpriteAnimations_GyorgChild_10:: @ 080D1F06
+ .include "animations/gSpriteAnimations_GyorgChild_10.s"
-gUnk_080D1F0A:: @ 080D1F0A
- .incbin "gyorgChild/gUnk_080D1F0A.bin"
+gSpriteAnimations_GyorgChild_11:: @ 080D1F0A
+ .include "animations/gSpriteAnimations_GyorgChild_11.s"
-gUnk_080D1F0E:: @ 080D1F0E
- .incbin "gyorgChild/gUnk_080D1F0E.bin"
+gSpriteAnimations_GyorgChild_12:: @ 080D1F0E
+ .include "animations/gSpriteAnimations_GyorgChild_12.s"
-gUnk_080D1F12:: @ 080D1F12
- .incbin "gyorgChild/gUnk_080D1F12.bin"
+gSpriteAnimations_GyorgChild_13:: @ 080D1F12
+ .include "animations/gSpriteAnimations_GyorgChild_13.s"
-gUnk_080D1F16:: @ 080D1F16
- .incbin "gyorgChild/gUnk_080D1F16.bin"
+gSpriteAnimations_GyorgChild_14:: @ 080D1F16
+ .include "animations/gSpriteAnimations_GyorgChild_14.s"
-gUnk_080D1F1A:: @ 080D1F1A
- .incbin "gyorgChild/gUnk_080D1F1A.bin"
+gSpriteAnimations_GyorgChild_15:: @ 080D1F1A
+ .include "animations/gSpriteAnimations_GyorgChild_15.s"
gSpriteAnimations_GyorgChild:: @ 080D1F20
- .4byte gUnk_080D1EB6
- .4byte gUnk_080D1EBF
- .4byte gUnk_080D1EC8
- .4byte gUnk_080D1ED1
- .4byte gUnk_080D1EDA
- .4byte gUnk_080D1EE3
- .4byte gUnk_080D1EEC
- .4byte gUnk_080D1EF5
- .4byte gUnk_080D1EFE
- .4byte gUnk_080D1F02
- .4byte gUnk_080D1F06
- .4byte gUnk_080D1F0A
- .4byte gUnk_080D1F0E
- .4byte gUnk_080D1F12
- .4byte gUnk_080D1F16
- .4byte gUnk_080D1F1A
+ .4byte gSpriteAnimations_GyorgChild_0
+ .4byte gSpriteAnimations_GyorgChild_1
+ .4byte gSpriteAnimations_GyorgChild_2
+ .4byte gSpriteAnimations_GyorgChild_3
+ .4byte gSpriteAnimations_GyorgChild_4
+ .4byte gSpriteAnimations_GyorgChild_5
+ .4byte gSpriteAnimations_GyorgChild_6
+ .4byte gSpriteAnimations_GyorgChild_7
+ .4byte gSpriteAnimations_GyorgChild_8
+ .4byte gSpriteAnimations_GyorgChild_9
+ .4byte gSpriteAnimations_GyorgChild_10
+ .4byte gSpriteAnimations_GyorgChild_11
+ .4byte gSpriteAnimations_GyorgChild_12
+ .4byte gSpriteAnimations_GyorgChild_13
+ .4byte gSpriteAnimations_GyorgChild_14
+ .4byte gSpriteAnimations_GyorgChild_15
.4byte 00000000
diff --git a/data/animations/enemy/gyorgFemaleEye.s b/data/animations/enemy/gyorgFemaleEye.s
index ddbb5926..a56a454c 100644
--- a/data/animations/enemy/gyorgFemaleEye.s
+++ b/data/animations/enemy/gyorgFemaleEye.s
@@ -4,101 +4,101 @@
.section .rodata
.align 2
-gUnk_080D2050:: @ 080D2050
- .incbin "gyorgFemaleEye/gUnk_080D2050.bin"
+gSpriteAnimations_GyorgFemaleEye_0:: @ 080D2050
+ .include "animations/gSpriteAnimations_GyorgFemaleEye_0.s"
-gUnk_080D2064:: @ 080D2064
- .incbin "gyorgFemaleEye/gUnk_080D2064.bin"
+gSpriteAnimations_GyorgFemaleEye_1:: @ 080D2064
+ .include "animations/gSpriteAnimations_GyorgFemaleEye_1.s"
-gUnk_080D2078:: @ 080D2078
- .incbin "gyorgFemaleEye/gUnk_080D2078.bin"
+gSpriteAnimations_GyorgFemaleEye_2:: @ 080D2078
+ .include "animations/gSpriteAnimations_GyorgFemaleEye_2.s"
-gUnk_080D208C:: @ 080D208C
- .incbin "gyorgFemaleEye/gUnk_080D208C.bin"
+gSpriteAnimations_GyorgFemaleEye_3:: @ 080D208C
+ .include "animations/gSpriteAnimations_GyorgFemaleEye_3.s"
-gUnk_080D20A0:: @ 080D20A0
- .incbin "gyorgFemaleEye/gUnk_080D20A0.bin"
+gSpriteAnimations_GyorgFemaleEye_4:: @ 080D20A0
+ .include "animations/gSpriteAnimations_GyorgFemaleEye_4.s"
-gUnk_080D20B4:: @ 080D20B4
- .incbin "gyorgFemaleEye/gUnk_080D20B4.bin"
+gSpriteAnimations_GyorgFemaleEye_5:: @ 080D20B4
+ .include "animations/gSpriteAnimations_GyorgFemaleEye_5.s"
-gUnk_080D20C8:: @ 080D20C8
- .incbin "gyorgFemaleEye/gUnk_080D20C8.bin"
+gSpriteAnimations_GyorgFemaleEye_6:: @ 080D20C8
+ .include "animations/gSpriteAnimations_GyorgFemaleEye_6.s"
-gUnk_080D20DC:: @ 080D20DC
- .incbin "gyorgFemaleEye/gUnk_080D20DC.bin"
+gSpriteAnimations_GyorgFemaleEye_7:: @ 080D20DC
+ .include "animations/gSpriteAnimations_GyorgFemaleEye_7.s"
-gUnk_080D20F0:: @ 080D20F0
- .incbin "gyorgFemaleEye/gUnk_080D20F0.bin"
+gSpriteAnimations_GyorgFemaleEye_8:: @ 080D20F0
+ .include "animations/gSpriteAnimations_GyorgFemaleEye_8.s"
-gUnk_080D2104:: @ 080D2104
- .incbin "gyorgFemaleEye/gUnk_080D2104.bin"
+gSpriteAnimations_GyorgFemaleEye_9:: @ 080D2104
+ .include "animations/gSpriteAnimations_GyorgFemaleEye_9.s"
-gUnk_080D2118:: @ 080D2118
- .incbin "gyorgFemaleEye/gUnk_080D2118.bin"
+gSpriteAnimations_GyorgFemaleEye_10:: @ 080D2118
+ .include "animations/gSpriteAnimations_GyorgFemaleEye_10.s"
-gUnk_080D212C:: @ 080D212C
- .incbin "gyorgFemaleEye/gUnk_080D212C.bin"
+gSpriteAnimations_GyorgFemaleEye_11:: @ 080D212C
+ .include "animations/gSpriteAnimations_GyorgFemaleEye_11.s"
-gUnk_080D2140:: @ 080D2140
- .incbin "gyorgFemaleEye/gUnk_080D2140.bin"
+gSpriteAnimations_GyorgFemaleEye_12:: @ 080D2140
+ .include "animations/gSpriteAnimations_GyorgFemaleEye_12.s"
-gUnk_080D2154:: @ 080D2154
- .incbin "gyorgFemaleEye/gUnk_080D2154.bin"
+gSpriteAnimations_GyorgFemaleEye_13:: @ 080D2154
+ .include "animations/gSpriteAnimations_GyorgFemaleEye_13.s"
-gUnk_080D2168:: @ 080D2168
- .incbin "gyorgFemaleEye/gUnk_080D2168.bin"
+gSpriteAnimations_GyorgFemaleEye_14:: @ 080D2168
+ .include "animations/gSpriteAnimations_GyorgFemaleEye_14.s"
-gUnk_080D217C:: @ 080D217C
- .incbin "gyorgFemaleEye/gUnk_080D217C.bin"
+gSpriteAnimations_GyorgFemaleEye_15:: @ 080D217C
+ .include "animations/gSpriteAnimations_GyorgFemaleEye_15.s"
-gUnk_080D2190:: @ 080D2190
- .incbin "gyorgFemaleEye/gUnk_080D2190.bin"
+gSpriteAnimations_GyorgFemaleEye_16:: @ 080D2190
+ .include "animations/gSpriteAnimations_GyorgFemaleEye_16.s"
-gUnk_080D21B9:: @ 080D21B9
- .incbin "gyorgFemaleEye/gUnk_080D21B9.bin"
+gSpriteAnimations_GyorgFemaleEye_17:: @ 080D21B9
+ .include "animations/gSpriteAnimations_GyorgFemaleEye_17.s"
-gUnk_080D21E2:: @ 080D21E2
- .incbin "gyorgFemaleEye/gUnk_080D21E2.bin"
+gSpriteAnimations_GyorgFemaleEye_18:: @ 080D21E2
+ .include "animations/gSpriteAnimations_GyorgFemaleEye_18.s"
-gUnk_080D220B:: @ 080D220B
- .incbin "gyorgFemaleEye/gUnk_080D220B.bin"
+gSpriteAnimations_GyorgFemaleEye_19:: @ 080D220B
+ .include "animations/gSpriteAnimations_GyorgFemaleEye_19.s"
-gUnk_080D2234:: @ 080D2234
- .incbin "gyorgFemaleEye/gUnk_080D2234.bin"
+gSpriteAnimations_GyorgFemaleEye_20:: @ 080D2234
+ .include "animations/gSpriteAnimations_GyorgFemaleEye_20.s"
-gUnk_080D2244:: @ 080D2244
- .incbin "gyorgFemaleEye/gUnk_080D2244.bin"
+gSpriteAnimations_GyorgFemaleEye_21:: @ 080D2244
+ .include "animations/gSpriteAnimations_GyorgFemaleEye_21.s"
-gUnk_080D2254:: @ 080D2254
- .incbin "gyorgFemaleEye/gUnk_080D2254.bin"
+gSpriteAnimations_GyorgFemaleEye_22:: @ 080D2254
+ .include "animations/gSpriteAnimations_GyorgFemaleEye_22.s"
-gUnk_080D2264:: @ 080D2264
- .incbin "gyorgFemaleEye/gUnk_080D2264.bin"
+gSpriteAnimations_GyorgFemaleEye_23:: @ 080D2264
+ .include "animations/gSpriteAnimations_GyorgFemaleEye_23.s"
gSpriteAnimations_GyorgFemaleEye:: @ 080D2274
- .4byte gUnk_080D2050
- .4byte gUnk_080D2064
- .4byte gUnk_080D2078
- .4byte gUnk_080D208C
- .4byte gUnk_080D20A0
- .4byte gUnk_080D20B4
- .4byte gUnk_080D20C8
- .4byte gUnk_080D20DC
- .4byte gUnk_080D20F0
- .4byte gUnk_080D2104
- .4byte gUnk_080D2118
- .4byte gUnk_080D212C
- .4byte gUnk_080D2140
- .4byte gUnk_080D2154
- .4byte gUnk_080D2168
- .4byte gUnk_080D217C
- .4byte gUnk_080D2190
- .4byte gUnk_080D21B9
- .4byte gUnk_080D21E2
- .4byte gUnk_080D220B
- .4byte gUnk_080D2234
- .4byte gUnk_080D2244
- .4byte gUnk_080D2254
- .4byte gUnk_080D2264
+ .4byte gSpriteAnimations_GyorgFemaleEye_0
+ .4byte gSpriteAnimations_GyorgFemaleEye_1
+ .4byte gSpriteAnimations_GyorgFemaleEye_2
+ .4byte gSpriteAnimations_GyorgFemaleEye_3
+ .4byte gSpriteAnimations_GyorgFemaleEye_4
+ .4byte gSpriteAnimations_GyorgFemaleEye_5
+ .4byte gSpriteAnimations_GyorgFemaleEye_6
+ .4byte gSpriteAnimations_GyorgFemaleEye_7
+ .4byte gSpriteAnimations_GyorgFemaleEye_8
+ .4byte gSpriteAnimations_GyorgFemaleEye_9
+ .4byte gSpriteAnimations_GyorgFemaleEye_10
+ .4byte gSpriteAnimations_GyorgFemaleEye_11
+ .4byte gSpriteAnimations_GyorgFemaleEye_12
+ .4byte gSpriteAnimations_GyorgFemaleEye_13
+ .4byte gSpriteAnimations_GyorgFemaleEye_14
+ .4byte gSpriteAnimations_GyorgFemaleEye_15
+ .4byte gSpriteAnimations_GyorgFemaleEye_16
+ .4byte gSpriteAnimations_GyorgFemaleEye_17
+ .4byte gSpriteAnimations_GyorgFemaleEye_18
+ .4byte gSpriteAnimations_GyorgFemaleEye_19
+ .4byte gSpriteAnimations_GyorgFemaleEye_20
+ .4byte gSpriteAnimations_GyorgFemaleEye_21
+ .4byte gSpriteAnimations_GyorgFemaleEye_22
+ .4byte gSpriteAnimations_GyorgFemaleEye_23
.4byte 00000000
diff --git a/data/animations/enemy/gyorgFemaleMouth.s b/data/animations/enemy/gyorgFemaleMouth.s
index a30f3c01..cc30806b 100644
--- a/data/animations/enemy/gyorgFemaleMouth.s
+++ b/data/animations/enemy/gyorgFemaleMouth.s
@@ -4,21 +4,21 @@
.section .rodata
.align 2
-gUnk_080D291C:: @ 080D291C
- .incbin "gyorgFemaleMouth/gUnk_080D291C.bin"
+gSpriteAnimations_GyorgFemaleMouth_0:: @ 080D291C
+ .include "animations/gSpriteAnimations_GyorgFemaleMouth_0.s"
-gUnk_080D292D:: @ 080D292D
- .incbin "gyorgFemaleMouth/gUnk_080D292D.bin"
+gSpriteAnimations_GyorgFemaleMouth_1:: @ 080D292D
+ .include "animations/gSpriteAnimations_GyorgFemaleMouth_1.s"
-gUnk_080D293E:: @ 080D293E
- .incbin "gyorgFemaleMouth/gUnk_080D293E.bin"
+gSpriteAnimations_GyorgFemaleMouth_2:: @ 080D293E
+ .include "animations/gSpriteAnimations_GyorgFemaleMouth_2.s"
-gUnk_080D294F:: @ 080D294F
- .incbin "gyorgFemaleMouth/gUnk_080D294F.bin"
+gSpriteAnimations_GyorgFemaleMouth_3:: @ 080D294F
+ .include "animations/gSpriteAnimations_GyorgFemaleMouth_3.s"
gSpriteAnimations_GyorgFemaleMouth:: @ 080D2960
- .4byte gUnk_080D291C
- .4byte gUnk_080D292D
- .4byte gUnk_080D293E
- .4byte gUnk_080D294F
+ .4byte gSpriteAnimations_GyorgFemaleMouth_0
+ .4byte gSpriteAnimations_GyorgFemaleMouth_1
+ .4byte gSpriteAnimations_GyorgFemaleMouth_2
+ .4byte gSpriteAnimations_GyorgFemaleMouth_3
.4byte 00000000
diff --git a/data/animations/enemy/gyorgMale.s b/data/animations/enemy/gyorgMale.s
index bdb7aab7..51c4f5e2 100644
--- a/data/animations/enemy/gyorgMale.s
+++ b/data/animations/enemy/gyorgMale.s
@@ -4,13 +4,13 @@
.section .rodata
.align 2
-gUnk_080D1C70:: @ 080D1C70
- .incbin "gyorgMale/gUnk_080D1C70.bin"
+gSpriteAnimations_GyorgMale_0:: @ 080D1C70
+ .include "animations/gSpriteAnimations_GyorgMale_0.s"
-gUnk_080D1C91:: @ 080D1C91
- .incbin "gyorgMale/gUnk_080D1C91.bin"
+gSpriteAnimations_GyorgMale_1:: @ 080D1C91
+ .include "animations/gSpriteAnimations_GyorgMale_1.s"
gSpriteAnimations_GyorgMale:: @ 080D1CBC
- .4byte gUnk_080D1C70
- .4byte gUnk_080D1C91
+ .4byte gSpriteAnimations_GyorgMale_0
+ .4byte gSpriteAnimations_GyorgMale_1
.4byte 00000000
diff --git a/data/animations/enemy/helmasaur.s b/data/animations/enemy/helmasaur.s
index f76e917e..4c2b4866 100644
--- a/data/animations/enemy/helmasaur.s
+++ b/data/animations/enemy/helmasaur.s
@@ -3,53 +3,53 @@
.section .rodata
-gUnk_080CD474:: @ 080CD474
- .incbin "helmasaur/gUnk_080CD474.bin"
+gSpriteAnimations_Helmasaur_0:: @ 080CD474
+ .include "animations/gSpriteAnimations_Helmasaur_0.s"
-gUnk_080CD485:: @ 080CD485
- .incbin "helmasaur/gUnk_080CD485.bin"
+gSpriteAnimations_Helmasaur_1:: @ 080CD485
+ .include "animations/gSpriteAnimations_Helmasaur_1.s"
-gUnk_080CD496:: @ 080CD496
- .incbin "helmasaur/gUnk_080CD496.bin"
+gSpriteAnimations_Helmasaur_2:: @ 080CD496
+ .include "animations/gSpriteAnimations_Helmasaur_2.s"
-gUnk_080CD4A7:: @ 080CD4A7
- .incbin "helmasaur/gUnk_080CD4A7.bin"
+gSpriteAnimations_Helmasaur_3:: @ 080CD4A7
+ .include "animations/gSpriteAnimations_Helmasaur_3.s"
-gUnk_080CD4B8:: @ 080CD4B8
- .incbin "helmasaur/gUnk_080CD4B8.bin"
+gSpriteAnimations_Helmasaur_4:: @ 080CD4B8
+ .include "animations/gSpriteAnimations_Helmasaur_4.s"
-gUnk_080CD4C9:: @ 080CD4C9
- .incbin "helmasaur/gUnk_080CD4C9.bin"
+gSpriteAnimations_Helmasaur_5:: @ 080CD4C9
+ .include "animations/gSpriteAnimations_Helmasaur_5.s"
-gUnk_080CD4DA:: @ 080CD4DA
- .incbin "helmasaur/gUnk_080CD4DA.bin"
+gSpriteAnimations_Helmasaur_6:: @ 080CD4DA
+ .include "animations/gSpriteAnimations_Helmasaur_6.s"
-gUnk_080CD4EB:: @ 080CD4EB
- .incbin "helmasaur/gUnk_080CD4EB.bin"
+gSpriteAnimations_Helmasaur_7:: @ 080CD4EB
+ .include "animations/gSpriteAnimations_Helmasaur_7.s"
-gUnk_080CD4FC:: @ 080CD4FC
- .incbin "helmasaur/gUnk_080CD4FC.bin"
+gSpriteAnimations_Helmasaur_8:: @ 080CD4FC
+ .include "animations/gSpriteAnimations_Helmasaur_8.s"
-gUnk_080CD500:: @ 080CD500
- .incbin "helmasaur/gUnk_080CD500.bin"
+gSpriteAnimations_Helmasaur_9:: @ 080CD500
+ .include "animations/gSpriteAnimations_Helmasaur_9.s"
-gUnk_080CD504:: @ 080CD504
- .incbin "helmasaur/gUnk_080CD504.bin"
+gSpriteAnimations_Helmasaur_10:: @ 080CD504
+ .include "animations/gSpriteAnimations_Helmasaur_10.s"
-gUnk_080CD508:: @ 080CD508
- .incbin "helmasaur/gUnk_080CD508.bin"
+gSpriteAnimations_Helmasaur_11:: @ 080CD508
+ .include "animations/gSpriteAnimations_Helmasaur_11.s"
gSpriteAnimations_Helmasaur:: @ 080CD50C
- .4byte gUnk_080CD474
- .4byte gUnk_080CD485
- .4byte gUnk_080CD496
- .4byte gUnk_080CD4A7
- .4byte gUnk_080CD4B8
- .4byte gUnk_080CD4C9
- .4byte gUnk_080CD4DA
- .4byte gUnk_080CD4EB
- .4byte gUnk_080CD4FC
- .4byte gUnk_080CD500
- .4byte gUnk_080CD504
- .4byte gUnk_080CD508
+ .4byte gSpriteAnimations_Helmasaur_0
+ .4byte gSpriteAnimations_Helmasaur_1
+ .4byte gSpriteAnimations_Helmasaur_2
+ .4byte gSpriteAnimations_Helmasaur_3
+ .4byte gSpriteAnimations_Helmasaur_4
+ .4byte gSpriteAnimations_Helmasaur_5
+ .4byte gSpriteAnimations_Helmasaur_6
+ .4byte gSpriteAnimations_Helmasaur_7
+ .4byte gSpriteAnimations_Helmasaur_8
+ .4byte gSpriteAnimations_Helmasaur_9
+ .4byte gSpriteAnimations_Helmasaur_10
+ .4byte gSpriteAnimations_Helmasaur_11
.4byte 00000000
diff --git a/data/animations/enemy/keaton.s b/data/animations/enemy/keaton.s
index 1bde80ba..a464a19c 100644
--- a/data/animations/enemy/keaton.s
+++ b/data/animations/enemy/keaton.s
@@ -4,53 +4,53 @@
.section .rodata
.align 2
-gUnk_080CE818:: @ 080CE818
- .incbin "keaton/gUnk_080CE818.bin"
+gSpriteAnimations_Keaton_0:: @ 080CE818
+ .include "animations/gSpriteAnimations_Keaton_0.s"
-gUnk_080CE829:: @ 080CE829
- .incbin "keaton/gUnk_080CE829.bin"
+gSpriteAnimations_Keaton_1:: @ 080CE829
+ .include "animations/gSpriteAnimations_Keaton_1.s"
-gUnk_080CE83A:: @ 080CE83A
- .incbin "keaton/gUnk_080CE83A.bin"
+gSpriteAnimations_Keaton_2:: @ 080CE83A
+ .include "animations/gSpriteAnimations_Keaton_2.s"
-gUnk_080CE84B:: @ 080CE84B
- .incbin "keaton/gUnk_080CE84B.bin"
+gSpriteAnimations_Keaton_3:: @ 080CE84B
+ .include "animations/gSpriteAnimations_Keaton_3.s"
-gUnk_080CE85C:: @ 080CE85C
- .incbin "keaton/gUnk_080CE85C.bin"
+gSpriteAnimations_Keaton_4:: @ 080CE85C
+ .include "animations/gSpriteAnimations_Keaton_4.s"
-gUnk_080CE86D:: @ 080CE86D
- .incbin "keaton/gUnk_080CE86D.bin"
+gSpriteAnimations_Keaton_5:: @ 080CE86D
+ .include "animations/gSpriteAnimations_Keaton_5.s"
-gUnk_080CE87E:: @ 080CE87E
- .incbin "keaton/gUnk_080CE87E.bin"
+gSpriteAnimations_Keaton_6:: @ 080CE87E
+ .include "animations/gSpriteAnimations_Keaton_6.s"
-gUnk_080CE88F:: @ 080CE88F
- .incbin "keaton/gUnk_080CE88F.bin"
+gSpriteAnimations_Keaton_7:: @ 080CE88F
+ .include "animations/gSpriteAnimations_Keaton_7.s"
-gUnk_080CE8A0:: @ 080CE8A0
- .incbin "keaton/gUnk_080CE8A0.bin"
+gSpriteAnimations_Keaton_8:: @ 080CE8A0
+ .include "animations/gSpriteAnimations_Keaton_8.s"
-gUnk_080CE8C9:: @ 080CE8C9
- .incbin "keaton/gUnk_080CE8C9.bin"
+gSpriteAnimations_Keaton_9:: @ 080CE8C9
+ .include "animations/gSpriteAnimations_Keaton_9.s"
-gUnk_080CE8F2:: @ 080CE8F2
- .incbin "keaton/gUnk_080CE8F2.bin"
+gSpriteAnimations_Keaton_10:: @ 080CE8F2
+ .include "animations/gSpriteAnimations_Keaton_10.s"
-gUnk_080CE91B:: @ 080CE91B
- .incbin "keaton/gUnk_080CE91B.bin"
+gSpriteAnimations_Keaton_11:: @ 080CE91B
+ .include "animations/gSpriteAnimations_Keaton_11.s"
gSpriteAnimations_Keaton:: @ 080CE944
- .4byte gUnk_080CE818
- .4byte gUnk_080CE829
- .4byte gUnk_080CE83A
- .4byte gUnk_080CE84B
- .4byte gUnk_080CE85C
- .4byte gUnk_080CE86D
- .4byte gUnk_080CE87E
- .4byte gUnk_080CE88F
- .4byte gUnk_080CE8A0
- .4byte gUnk_080CE8C9
- .4byte gUnk_080CE8F2
- .4byte gUnk_080CE91B
+ .4byte gSpriteAnimations_Keaton_0
+ .4byte gSpriteAnimations_Keaton_1
+ .4byte gSpriteAnimations_Keaton_2
+ .4byte gSpriteAnimations_Keaton_3
+ .4byte gSpriteAnimations_Keaton_4
+ .4byte gSpriteAnimations_Keaton_5
+ .4byte gSpriteAnimations_Keaton_6
+ .4byte gSpriteAnimations_Keaton_7
+ .4byte gSpriteAnimations_Keaton_8
+ .4byte gSpriteAnimations_Keaton_9
+ .4byte gSpriteAnimations_Keaton_10
+ .4byte gSpriteAnimations_Keaton_11
.4byte 00000000
diff --git a/data/animations/enemy/keese.s b/data/animations/enemy/keese.s
index e3528e8e..ad8b0f58 100644
--- a/data/animations/enemy/keese.s
+++ b/data/animations/enemy/keese.s
@@ -3,13 +3,13 @@
.section .rodata
-gUnk_080CB706:: @ 080CB706
- .incbin "keese/gUnk_080CB706.bin"
+gSpriteAnimations_Keese_0:: @ 080CB706
+ .include "animations/gSpriteAnimations_Keese_0.s"
-gUnk_080CB71E:: @ 080CB71E
- .incbin "keese/gUnk_080CB71E.bin"
+gSpriteAnimations_Keese_1:: @ 080CB71E
+ .include "animations/gSpriteAnimations_Keese_1.s"
gSpriteAnimations_Keese:: @ 080CB728
- .4byte gUnk_080CB706
- .4byte gUnk_080CB71E
+ .4byte gSpriteAnimations_Keese_0
+ .4byte gSpriteAnimations_Keese_1
.4byte 00000000
diff --git a/data/animations/enemy/lakitu.s b/data/animations/enemy/lakitu.s
index 7cfcbfa9..9566aa36 100644
--- a/data/animations/enemy/lakitu.s
+++ b/data/animations/enemy/lakitu.s
@@ -4,32 +4,32 @@
.section .rodata
.align 2
-gUnk_080D015C:: @ 080D015C
- .incbin "lakitu/gUnk_080D015C.bin"
+gSpriteAnimations_Lakitu_0:: @ 080D015C
+ .include "animations/gSpriteAnimations_Lakitu_0.s"
-gUnk_080D016D:: @ 080D016D
- .incbin "lakitu/gUnk_080D016D.bin"
+gSpriteAnimations_Lakitu_1:: @ 080D016D
+ .include "animations/gSpriteAnimations_Lakitu_1.s"
-gUnk_080D017E:: @ 080D017E
- .incbin "lakitu/gUnk_080D017E.bin"
+gSpriteAnimations_Lakitu_2:: @ 080D017E
+ .include "animations/gSpriteAnimations_Lakitu_2.s"
-gUnk_080D018F:: @ 080D018F
- .incbin "lakitu/gUnk_080D018F.bin"
+gSpriteAnimations_Lakitu_3:: @ 080D018F
+ .include "animations/gSpriteAnimations_Lakitu_3.s"
-gUnk_080D01A0:: @ 080D01A0
- .incbin "lakitu/gUnk_080D01A0.bin"
+gSpriteAnimations_Lakitu_4:: @ 080D01A0
+ .include "animations/gSpriteAnimations_Lakitu_4.s"
-gUnk_080D01B1:: @ 080D01B1
- .incbin "lakitu/gUnk_080D01B1.bin"
+gSpriteAnimations_Lakitu_5:: @ 080D01B1
+ .include "animations/gSpriteAnimations_Lakitu_5.s"
-gUnk_080D01C2:: @ 080D01C2
- .incbin "lakitu/gUnk_080D01C2.bin"
+gSpriteAnimations_Lakitu_6:: @ 080D01C2
+ .include "animations/gSpriteAnimations_Lakitu_6.s"
-gUnk_080D01D3:: @ 080D01D3
- .incbin "lakitu/gUnk_080D01D3.bin"
+gSpriteAnimations_Lakitu_7:: @ 080D01D3
+ .include "animations/gSpriteAnimations_Lakitu_7.s"
-gUnk_080D01E4:: @ 080D01E4
- .incbin "lakitu/gUnk_080D01E4.bin"
+gSpriteAnimations_Lakitu_8:: @ 080D01E4
+ .include "animations/gSpriteAnimations_Lakitu_8.s"
gUnk_080D01EF:: @ 080D01EF
.incbin "lakitu/gUnk_080D01EF.bin"
@@ -43,17 +43,17 @@ gUnk_080D0210:: @ 080D0210
gUnk_080D0211:: @ 080D0211
.incbin "lakitu/gUnk_080D0211.bin"
-gUnk_080D0225:: @ 080D0225
- .incbin "lakitu/gUnk_080D0225.bin"
+gSpriteAnimations_Lakitu_9:: @ 080D0225
+ .include "animations/gSpriteAnimations_Lakitu_9.s"
-gUnk_080D0266:: @ 080D0266
- .incbin "lakitu/gUnk_080D0266.bin"
+gSpriteAnimations_Lakitu_10:: @ 080D0266
+ .include "animations/gSpriteAnimations_Lakitu_10.s"
-gUnk_080D02A7:: @ 080D02A7
- .incbin "lakitu/gUnk_080D02A7.bin"
+gSpriteAnimations_Lakitu_11:: @ 080D02A7
+ .include "animations/gSpriteAnimations_Lakitu_11.s"
-gUnk_080D02E8:: @ 080D02E8
- .incbin "lakitu/gUnk_080D02E8.bin"
+gSpriteAnimations_Lakitu_12:: @ 080D02E8
+ .include "animations/gSpriteAnimations_Lakitu_12.s"
gUnk_080D02F3:: @ 080D02F3
.incbin "lakitu/gUnk_080D02F3.bin"
@@ -64,8 +64,8 @@ gUnk_080D02F6:: @ 080D02F6
gUnk_080D02F7:: @ 080D02F7
.incbin "lakitu/gUnk_080D02F7.bin"
-gUnk_080D02F9:: @ 080D02F9
- .incbin "lakitu/gUnk_080D02F9.bin"
+gSpriteAnimations_Lakitu_13:: @ 080D02F9
+ .include "animations/gSpriteAnimations_Lakitu_13.s"
gUnk_080D02FC:: @ 080D02FC
.incbin "lakitu/gUnk_080D02FC.bin"
@@ -73,8 +73,8 @@ gUnk_080D02FC:: @ 080D02FC
gUnk_080D0300:: @ 080D0300
.incbin "lakitu/gUnk_080D0300.bin"
-gUnk_080D030A:: @ 080D030A
- .incbin "lakitu/gUnk_080D030A.bin"
+gSpriteAnimations_Lakitu_14:: @ 080D030A
+ .include "animations/gSpriteAnimations_Lakitu_14.s"
gUnk_080D031B:: @ 080D031B
.incbin "lakitu/gUnk_080D031B.bin"
@@ -104,21 +104,21 @@ gUnk_080D03A3:: @ 080D03A3
.incbin "lakitu/gUnk_080D03A3.bin"
gSpriteAnimations_Lakitu:: @ 080D03B4
- .4byte gUnk_080D015C
- .4byte gUnk_080D016D
- .4byte gUnk_080D017E
- .4byte gUnk_080D018F
- .4byte gUnk_080D01A0
- .4byte gUnk_080D01B1
- .4byte gUnk_080D01C2
- .4byte gUnk_080D01D3
- .4byte gUnk_080D01E4
- .4byte gUnk_080D0225
- .4byte gUnk_080D0266
- .4byte gUnk_080D02A7
- .4byte gUnk_080D02E8
- .4byte gUnk_080D02F9
- .4byte gUnk_080D030A
+ .4byte gSpriteAnimations_Lakitu_0
+ .4byte gSpriteAnimations_Lakitu_1
+ .4byte gSpriteAnimations_Lakitu_2
+ .4byte gSpriteAnimations_Lakitu_3
+ .4byte gSpriteAnimations_Lakitu_4
+ .4byte gSpriteAnimations_Lakitu_5
+ .4byte gSpriteAnimations_Lakitu_6
+ .4byte gSpriteAnimations_Lakitu_7
+ .4byte gSpriteAnimations_Lakitu_8
+ .4byte gSpriteAnimations_Lakitu_9
+ .4byte gSpriteAnimations_Lakitu_10
+ .4byte gSpriteAnimations_Lakitu_11
+ .4byte gSpriteAnimations_Lakitu_12
+ .4byte gSpriteAnimations_Lakitu_13
+ .4byte gSpriteAnimations_Lakitu_14
gUnk_080D03F0:: @ 080D03F0
.4byte gUnk_080D031B
diff --git a/data/animations/enemy/leever.s b/data/animations/enemy/leever.s
index 055fbac0..571e84eb 100644
--- a/data/animations/enemy/leever.s
+++ b/data/animations/enemy/leever.s
@@ -4,17 +4,17 @@
.section .rodata
.align 2
-gUnk_080CA4D4:: @ 080CA4D4
- .incbin "leever/gUnk_080CA4D4.bin"
+gSpriteAnimations_Leever_0:: @ 080CA4D4
+ .include "animations/gSpriteAnimations_Leever_0.s"
-gUnk_080CA500:: @ 080CA500
- .incbin "leever/gUnk_080CA500.bin"
+gSpriteAnimations_Leever_1:: @ 080CA500
+ .include "animations/gSpriteAnimations_Leever_1.s"
-gUnk_080CA51C:: @ 080CA51C
- .incbin "leever/gUnk_080CA51C.bin"
+gSpriteAnimations_Leever_2:: @ 080CA51C
+ .include "animations/gSpriteAnimations_Leever_2.s"
gSpriteAnimations_Leever:: @ 080CA560
- .4byte gUnk_080CA4D4
- .4byte gUnk_080CA500
- .4byte gUnk_080CA51C
+ .4byte gSpriteAnimations_Leever_0
+ .4byte gSpriteAnimations_Leever_1
+ .4byte gSpriteAnimations_Leever_2
.4byte 00000000
diff --git a/data/animations/enemy/likeLike.s b/data/animations/enemy/likeLike.s
index 17ef68ee..4e4c7c8a 100644
--- a/data/animations/enemy/likeLike.s
+++ b/data/animations/enemy/likeLike.s
@@ -3,17 +3,17 @@
.section .rodata
-gUnk_080CC734:: @ 080CC734
- .incbin "likeLike/gUnk_080CC734.bin"
+gSpriteAnimations_LikeLike_0:: @ 080CC734
+ .include "animations/gSpriteAnimations_LikeLike_0.s"
-gUnk_080CC759:: @ 080CC759
- .incbin "likeLike/gUnk_080CC759.bin"
+gSpriteAnimations_LikeLike_1:: @ 080CC759
+ .include "animations/gSpriteAnimations_LikeLike_1.s"
-gUnk_080CC76E:: @ 080CC76E
- .incbin "likeLike/gUnk_080CC76E.bin"
+gSpriteAnimations_LikeLike_2:: @ 080CC76E
+ .include "animations/gSpriteAnimations_LikeLike_2.s"
gSpriteAnimations_LikeLike:: @ 080CC780
- .4byte gUnk_080CC734
- .4byte gUnk_080CC759
- .4byte gUnk_080CC76E
+ .4byte gSpriteAnimations_LikeLike_0
+ .4byte gSpriteAnimations_LikeLike_1
+ .4byte gSpriteAnimations_LikeLike_2
.4byte 00000000
diff --git a/data/animations/enemy/madderpillar.s b/data/animations/enemy/madderpillar.s
index 321e6235..344b85c5 100644
--- a/data/animations/enemy/madderpillar.s
+++ b/data/animations/enemy/madderpillar.s
@@ -3,120 +3,120 @@
.section .rodata
-gUnk_080CCDDC:: @ 080CCDDC
- .incbin "madderpillar/gUnk_080CCDDC.bin"
+gSpriteAnimations_Madderpillar_0_0:: @ 080CCDDC
+ .include "animations/gSpriteAnimations_Madderpillar_0_0.s"
-gUnk_080CCDED:: @ 080CCDED
- .incbin "madderpillar/gUnk_080CCDED.bin"
+gSpriteAnimations_Madderpillar_0_1:: @ 080CCDED
+ .include "animations/gSpriteAnimations_Madderpillar_0_1.s"
-gUnk_080CCDFE:: @ 080CCDFE
- .incbin "madderpillar/gUnk_080CCDFE.bin"
+gSpriteAnimations_Madderpillar_0_2:: @ 080CCDFE
+ .include "animations/gSpriteAnimations_Madderpillar_0_2.s"
-gUnk_080CCE0F:: @ 080CCE0F
- .incbin "madderpillar/gUnk_080CCE0F.bin"
+gSpriteAnimations_Madderpillar_0_3:: @ 080CCE0F
+ .include "animations/gSpriteAnimations_Madderpillar_0_3.s"
-gUnk_080CCE20:: @ 080CCE20
- .incbin "madderpillar/gUnk_080CCE20.bin"
+gSpriteAnimations_Madderpillar_0_4:: @ 080CCE20
+ .include "animations/gSpriteAnimations_Madderpillar_0_4.s"
-gUnk_080CCE31:: @ 080CCE31
- .incbin "madderpillar/gUnk_080CCE31.bin"
+gSpriteAnimations_Madderpillar_0_5:: @ 080CCE31
+ .include "animations/gSpriteAnimations_Madderpillar_0_5.s"
-gUnk_080CCE42:: @ 080CCE42
- .incbin "madderpillar/gUnk_080CCE42.bin"
+gSpriteAnimations_Madderpillar_0_6:: @ 080CCE42
+ .include "animations/gSpriteAnimations_Madderpillar_0_6.s"
-gUnk_080CCE53:: @ 080CCE53
- .incbin "madderpillar/gUnk_080CCE53.bin"
+gSpriteAnimations_Madderpillar_0_7:: @ 080CCE53
+ .include "animations/gSpriteAnimations_Madderpillar_0_7.s"
gSpriteAnimations_Madderpillar_0:: @ 080CCE64
- .4byte gUnk_080CCDDC
- .4byte gUnk_080CCDED
- .4byte gUnk_080CCDFE
- .4byte gUnk_080CCE0F
- .4byte gUnk_080CCE20
- .4byte gUnk_080CCE31
- .4byte gUnk_080CCE42
- .4byte gUnk_080CCE53
+ .4byte gSpriteAnimations_Madderpillar_0_0
+ .4byte gSpriteAnimations_Madderpillar_0_1
+ .4byte gSpriteAnimations_Madderpillar_0_2
+ .4byte gSpriteAnimations_Madderpillar_0_3
+ .4byte gSpriteAnimations_Madderpillar_0_4
+ .4byte gSpriteAnimations_Madderpillar_0_5
+ .4byte gSpriteAnimations_Madderpillar_0_6
+ .4byte gSpriteAnimations_Madderpillar_0_7
.4byte 00000000
-gUnk_080CCE88:: @ 080CCE88
- .incbin "madderpillar/gUnk_080CCE88.bin"
+gSpriteAnimations_Madderpillar_1_0:: @ 080CCE88
+ .include "animations/gSpriteAnimations_Madderpillar_1_0.s"
-gUnk_080CCE99:: @ 080CCE99
- .incbin "madderpillar/gUnk_080CCE99.bin"
+gSpriteAnimations_Madderpillar_1_1:: @ 080CCE99
+ .include "animations/gSpriteAnimations_Madderpillar_1_1.s"
-gUnk_080CCEAA:: @ 080CCEAA
- .incbin "madderpillar/gUnk_080CCEAA.bin"
+gSpriteAnimations_Madderpillar_1_2:: @ 080CCEAA
+ .include "animations/gSpriteAnimations_Madderpillar_1_2.s"
-gUnk_080CCEBB:: @ 080CCEBB
- .incbin "madderpillar/gUnk_080CCEBB.bin"
+gSpriteAnimations_Madderpillar_1_3:: @ 080CCEBB
+ .include "animations/gSpriteAnimations_Madderpillar_1_3.s"
-gUnk_080CCECC:: @ 080CCECC
- .incbin "madderpillar/gUnk_080CCECC.bin"
+gSpriteAnimations_Madderpillar_1_4:: @ 080CCECC
+ .include "animations/gSpriteAnimations_Madderpillar_1_4.s"
-gUnk_080CCEDD:: @ 080CCEDD
- .incbin "madderpillar/gUnk_080CCEDD.bin"
+gSpriteAnimations_Madderpillar_1_5:: @ 080CCEDD
+ .include "animations/gSpriteAnimations_Madderpillar_1_5.s"
-gUnk_080CCEEE:: @ 080CCEEE
- .incbin "madderpillar/gUnk_080CCEEE.bin"
+gSpriteAnimations_Madderpillar_1_6:: @ 080CCEEE
+ .include "animations/gSpriteAnimations_Madderpillar_1_6.s"
-gUnk_080CCEFF:: @ 080CCEFF
- .incbin "madderpillar/gUnk_080CCEFF.bin"
+gSpriteAnimations_Madderpillar_1_7:: @ 080CCEFF
+ .include "animations/gSpriteAnimations_Madderpillar_1_7.s"
-gUnk_080CCF10:: @ 080CCF10
- .incbin "madderpillar/gUnk_080CCF10.bin"
+gSpriteAnimations_Madderpillar_1_8:: @ 080CCF10
+ .include "animations/gSpriteAnimations_Madderpillar_1_8.s"
-gUnk_080CCF15:: @ 080CCF15
- .incbin "madderpillar/gUnk_080CCF15.bin"
+gSpriteAnimations_Madderpillar_1_9:: @ 080CCF15
+ .include "animations/gSpriteAnimations_Madderpillar_1_9.s"
-gUnk_080CCF1A:: @ 080CCF1A
- .incbin "madderpillar/gUnk_080CCF1A.bin"
+gSpriteAnimations_Madderpillar_1_10:: @ 080CCF1A
+ .include "animations/gSpriteAnimations_Madderpillar_1_10.s"
-gUnk_080CCF1F:: @ 080CCF1F
- .incbin "madderpillar/gUnk_080CCF1F.bin"
+gSpriteAnimations_Madderpillar_1_11:: @ 080CCF1F
+ .include "animations/gSpriteAnimations_Madderpillar_1_11.s"
-gUnk_080CCF24:: @ 080CCF24
- .incbin "madderpillar/gUnk_080CCF24.bin"
+gSpriteAnimations_Madderpillar_1_12:: @ 080CCF24
+ .include "animations/gSpriteAnimations_Madderpillar_1_12.s"
-gUnk_080CCF41:: @ 080CCF41
- .incbin "madderpillar/gUnk_080CCF41.bin"
+gSpriteAnimations_Madderpillar_1_13:: @ 080CCF41
+ .include "animations/gSpriteAnimations_Madderpillar_1_13.s"
-gUnk_080CCF5E:: @ 080CCF5E
- .incbin "madderpillar/gUnk_080CCF5E.bin"
+gSpriteAnimations_Madderpillar_1_14:: @ 080CCF5E
+ .include "animations/gSpriteAnimations_Madderpillar_1_14.s"
-gUnk_080CCF7B:: @ 080CCF7B
- .incbin "madderpillar/gUnk_080CCF7B.bin"
+gSpriteAnimations_Madderpillar_1_15:: @ 080CCF7B
+ .include "animations/gSpriteAnimations_Madderpillar_1_15.s"
-gUnk_080CCF98:: @ 080CCF98
- .incbin "madderpillar/gUnk_080CCF98.bin"
+gSpriteAnimations_Madderpillar_1_16:: @ 080CCF98
+ .include "animations/gSpriteAnimations_Madderpillar_1_16.s"
-gUnk_080CCFA9:: @ 080CCFA9
- .incbin "madderpillar/gUnk_080CCFA9.bin"
+gSpriteAnimations_Madderpillar_1_17:: @ 080CCFA9
+ .include "animations/gSpriteAnimations_Madderpillar_1_17.s"
-gUnk_080CCFBA:: @ 080CCFBA
- .incbin "madderpillar/gUnk_080CCFBA.bin"
+gSpriteAnimations_Madderpillar_1_18:: @ 080CCFBA
+ .include "animations/gSpriteAnimations_Madderpillar_1_18.s"
-gUnk_080CCFCB:: @ 080CCFCB
- .incbin "madderpillar/gUnk_080CCFCB.bin"
+gSpriteAnimations_Madderpillar_1_19:: @ 080CCFCB
+ .include "animations/gSpriteAnimations_Madderpillar_1_19.s"
gSpriteAnimations_Madderpillar_1:: @ 080CCFDC
- .4byte gUnk_080CCE88
- .4byte gUnk_080CCE99
- .4byte gUnk_080CCEAA
- .4byte gUnk_080CCEBB
- .4byte gUnk_080CCECC
- .4byte gUnk_080CCEDD
- .4byte gUnk_080CCEEE
- .4byte gUnk_080CCEFF
- .4byte gUnk_080CCF10
- .4byte gUnk_080CCF15
- .4byte gUnk_080CCF1A
- .4byte gUnk_080CCF1F
- .4byte gUnk_080CCF24
- .4byte gUnk_080CCF41
- .4byte gUnk_080CCF5E
- .4byte gUnk_080CCF7B
- .4byte gUnk_080CCF98
- .4byte gUnk_080CCFA9
- .4byte gUnk_080CCFBA
- .4byte gUnk_080CCFCB
+ .4byte gSpriteAnimations_Madderpillar_1_0
+ .4byte gSpriteAnimations_Madderpillar_1_1
+ .4byte gSpriteAnimations_Madderpillar_1_2
+ .4byte gSpriteAnimations_Madderpillar_1_3
+ .4byte gSpriteAnimations_Madderpillar_1_4
+ .4byte gSpriteAnimations_Madderpillar_1_5
+ .4byte gSpriteAnimations_Madderpillar_1_6
+ .4byte gSpriteAnimations_Madderpillar_1_7
+ .4byte gSpriteAnimations_Madderpillar_1_8
+ .4byte gSpriteAnimations_Madderpillar_1_9
+ .4byte gSpriteAnimations_Madderpillar_1_10
+ .4byte gSpriteAnimations_Madderpillar_1_11
+ .4byte gSpriteAnimations_Madderpillar_1_12
+ .4byte gSpriteAnimations_Madderpillar_1_13
+ .4byte gSpriteAnimations_Madderpillar_1_14
+ .4byte gSpriteAnimations_Madderpillar_1_15
+ .4byte gSpriteAnimations_Madderpillar_1_16
+ .4byte gSpriteAnimations_Madderpillar_1_17
+ .4byte gSpriteAnimations_Madderpillar_1_18
+ .4byte gSpriteAnimations_Madderpillar_1_19
.4byte 00000000
diff --git a/data/animations/enemy/mazaalBracelet.s b/data/animations/enemy/mazaalBracelet.s
index d2995db4..95d31787 100644
--- a/data/animations/enemy/mazaalBracelet.s
+++ b/data/animations/enemy/mazaalBracelet.s
@@ -4,105 +4,105 @@
.section .rodata
.align 2
-gUnk_080CFD60:: @ 080CFD60
- .incbin "mazaalBracelet/gUnk_080CFD60.bin"
+gSpriteAnimations_MazaalBracelet_0:: @ 080CFD60
+ .include "animations/gSpriteAnimations_MazaalBracelet_0.s"
-gUnk_080CFD71:: @ 080CFD71
- .incbin "mazaalBracelet/gUnk_080CFD71.bin"
+gSpriteAnimations_MazaalBracelet_1:: @ 080CFD71
+ .include "animations/gSpriteAnimations_MazaalBracelet_1.s"
-gUnk_080CFD82:: @ 080CFD82
- .incbin "mazaalBracelet/gUnk_080CFD82.bin"
+gSpriteAnimations_MazaalBracelet_2:: @ 080CFD82
+ .include "animations/gSpriteAnimations_MazaalBracelet_2.s"
-gUnk_080CFDD6:: @ 080CFDD6
- .incbin "mazaalBracelet/gUnk_080CFDD6.bin"
+gSpriteAnimations_MazaalBracelet_3:: @ 080CFDD6
+ .include "animations/gSpriteAnimations_MazaalBracelet_3.s"
-gUnk_080CFE2A:: @ 080CFE2A
- .incbin "mazaalBracelet/gUnk_080CFE2A.bin"
+gSpriteAnimations_MazaalBracelet_4:: @ 080CFE2A
+ .include "animations/gSpriteAnimations_MazaalBracelet_4.s"
-gUnk_080CFE37:: @ 080CFE37
- .incbin "mazaalBracelet/gUnk_080CFE37.bin"
+gSpriteAnimations_MazaalBracelet_5:: @ 080CFE37
+ .include "animations/gSpriteAnimations_MazaalBracelet_5.s"
-gUnk_080CFE44:: @ 080CFE44
- .incbin "mazaalBracelet/gUnk_080CFE44.bin"
+gSpriteAnimations_MazaalBracelet_6:: @ 080CFE44
+ .include "animations/gSpriteAnimations_MazaalBracelet_6.s"
-gUnk_080CFE4C:: @ 080CFE4C
- .incbin "mazaalBracelet/gUnk_080CFE4C.bin"
+gSpriteAnimations_MazaalBracelet_7:: @ 080CFE4C
+ .include "animations/gSpriteAnimations_MazaalBracelet_7.s"
-gUnk_080CFE54:: @ 080CFE54
- .incbin "mazaalBracelet/gUnk_080CFE54.bin"
+gSpriteAnimations_MazaalBracelet_8:: @ 080CFE54
+ .include "animations/gSpriteAnimations_MazaalBracelet_8.s"
-gUnk_080CFE58:: @ 080CFE58
- .incbin "mazaalBracelet/gUnk_080CFE58.bin"
+gSpriteAnimations_MazaalBracelet_9:: @ 080CFE58
+ .include "animations/gSpriteAnimations_MazaalBracelet_9.s"
-gUnk_080CFE5C:: @ 080CFE5C
- .incbin "mazaalBracelet/gUnk_080CFE5C.bin"
+gSpriteAnimations_MazaalBracelet_10:: @ 080CFE5C
+ .include "animations/gSpriteAnimations_MazaalBracelet_10.s"
-gUnk_080CFE60:: @ 080CFE60
- .incbin "mazaalBracelet/gUnk_080CFE60.bin"
+gSpriteAnimations_MazaalBracelet_11:: @ 080CFE60
+ .include "animations/gSpriteAnimations_MazaalBracelet_11.s"
-gUnk_080CFE71:: @ 080CFE71
- .incbin "mazaalBracelet/gUnk_080CFE71.bin"
+gSpriteAnimations_MazaalBracelet_12:: @ 080CFE71
+ .include "animations/gSpriteAnimations_MazaalBracelet_12.s"
-gUnk_080CFE76:: @ 080CFE76
- .incbin "mazaalBracelet/gUnk_080CFE76.bin"
+gSpriteAnimations_MazaalBracelet_13:: @ 080CFE76
+ .include "animations/gSpriteAnimations_MazaalBracelet_13.s"
-gUnk_080CFE7B:: @ 080CFE7B
- .incbin "mazaalBracelet/gUnk_080CFE7B.bin"
+gSpriteAnimations_MazaalBracelet_14:: @ 080CFE7B
+ .include "animations/gSpriteAnimations_MazaalBracelet_14.s"
-gUnk_080CFE80:: @ 080CFE80
- .incbin "mazaalBracelet/gUnk_080CFE80.bin"
+gSpriteAnimations_MazaalBracelet_15:: @ 080CFE80
+ .include "animations/gSpriteAnimations_MazaalBracelet_15.s"
-gUnk_080CFE85:: @ 080CFE85
- .incbin "mazaalBracelet/gUnk_080CFE85.bin"
+gSpriteAnimations_MazaalBracelet_16:: @ 080CFE85
+ .include "animations/gSpriteAnimations_MazaalBracelet_16.s"
-gUnk_080CFE8A:: @ 080CFE8A
- .incbin "mazaalBracelet/gUnk_080CFE8A.bin"
+gSpriteAnimations_MazaalBracelet_17:: @ 080CFE8A
+ .include "animations/gSpriteAnimations_MazaalBracelet_17.s"
-gUnk_080CFE8F:: @ 080CFE8F
- .incbin "mazaalBracelet/gUnk_080CFE8F.bin"
+gSpriteAnimations_MazaalBracelet_18:: @ 080CFE8F
+ .include "animations/gSpriteAnimations_MazaalBracelet_18.s"
-gUnk_080CFE94:: @ 080CFE94
- .incbin "mazaalBracelet/gUnk_080CFE94.bin"
+gSpriteAnimations_MazaalBracelet_19:: @ 080CFE94
+ .include "animations/gSpriteAnimations_MazaalBracelet_19.s"
-gUnk_080CFE99:: @ 080CFE99
- .incbin "mazaalBracelet/gUnk_080CFE99.bin"
+gSpriteAnimations_MazaalBracelet_20:: @ 080CFE99
+ .include "animations/gSpriteAnimations_MazaalBracelet_20.s"
-gUnk_080CFE9E:: @ 080CFE9E
- .incbin "mazaalBracelet/gUnk_080CFE9E.bin"
+gSpriteAnimations_MazaalBracelet_21:: @ 080CFE9E
+ .include "animations/gSpriteAnimations_MazaalBracelet_21.s"
-gUnk_080CFEA3:: @ 080CFEA3
- .incbin "mazaalBracelet/gUnk_080CFEA3.bin"
+gSpriteAnimations_MazaalBracelet_22:: @ 080CFEA3
+ .include "animations/gSpriteAnimations_MazaalBracelet_22.s"
-gUnk_080CFEB0:: @ 080CFEB0
- .incbin "mazaalBracelet/gUnk_080CFEB0.bin"
+gSpriteAnimations_MazaalBracelet_23:: @ 080CFEB0
+ .include "animations/gSpriteAnimations_MazaalBracelet_23.s"
-gUnk_080CFEC1:: @ 080CFEC1
- .incbin "mazaalBracelet/gUnk_080CFEC1.bin"
+gSpriteAnimations_MazaalBracelet_24:: @ 080CFEC1
+ .include "animations/gSpriteAnimations_MazaalBracelet_24.s"
gSpriteAnimations_MazaalBracelet:: @ 080CFED4
- .4byte gUnk_080CFD60
- .4byte gUnk_080CFD71
- .4byte gUnk_080CFD82
- .4byte gUnk_080CFDD6
- .4byte gUnk_080CFE2A
- .4byte gUnk_080CFE37
- .4byte gUnk_080CFE44
- .4byte gUnk_080CFE4C
- .4byte gUnk_080CFE54
- .4byte gUnk_080CFE58
- .4byte gUnk_080CFE5C
- .4byte gUnk_080CFE60
- .4byte gUnk_080CFE71
- .4byte gUnk_080CFE76
- .4byte gUnk_080CFE7B
- .4byte gUnk_080CFE80
- .4byte gUnk_080CFE85
- .4byte gUnk_080CFE8A
- .4byte gUnk_080CFE8F
- .4byte gUnk_080CFE94
- .4byte gUnk_080CFE99
- .4byte gUnk_080CFE9E
- .4byte gUnk_080CFEA3
- .4byte gUnk_080CFEB0
- .4byte gUnk_080CFEC1
+ .4byte gSpriteAnimations_MazaalBracelet_0
+ .4byte gSpriteAnimations_MazaalBracelet_1
+ .4byte gSpriteAnimations_MazaalBracelet_2
+ .4byte gSpriteAnimations_MazaalBracelet_3
+ .4byte gSpriteAnimations_MazaalBracelet_4
+ .4byte gSpriteAnimations_MazaalBracelet_5
+ .4byte gSpriteAnimations_MazaalBracelet_6
+ .4byte gSpriteAnimations_MazaalBracelet_7
+ .4byte gSpriteAnimations_MazaalBracelet_8
+ .4byte gSpriteAnimations_MazaalBracelet_9
+ .4byte gSpriteAnimations_MazaalBracelet_10
+ .4byte gSpriteAnimations_MazaalBracelet_11
+ .4byte gSpriteAnimations_MazaalBracelet_12
+ .4byte gSpriteAnimations_MazaalBracelet_13
+ .4byte gSpriteAnimations_MazaalBracelet_14
+ .4byte gSpriteAnimations_MazaalBracelet_15
+ .4byte gSpriteAnimations_MazaalBracelet_16
+ .4byte gSpriteAnimations_MazaalBracelet_17
+ .4byte gSpriteAnimations_MazaalBracelet_18
+ .4byte gSpriteAnimations_MazaalBracelet_19
+ .4byte gSpriteAnimations_MazaalBracelet_20
+ .4byte gSpriteAnimations_MazaalBracelet_21
+ .4byte gSpriteAnimations_MazaalBracelet_22
+ .4byte gSpriteAnimations_MazaalBracelet_23
+ .4byte gSpriteAnimations_MazaalBracelet_24
.4byte 00000000
diff --git a/data/animations/enemy/mazaalHand.s b/data/animations/enemy/mazaalHand.s
index c35b7684..28f7fffa 100644
--- a/data/animations/enemy/mazaalHand.s
+++ b/data/animations/enemy/mazaalHand.s
@@ -5,45 +5,45 @@
.align 2
-gUnk_080CEF7C:: @ 080CEF7C
- .incbin "mazaalHand/gUnk_080CEF7C.bin"
+gSpriteAnimations_MazaalHand_0:: @ 080CEF7C
+ .include "animations/gSpriteAnimations_MazaalHand_0.s"
-gUnk_080CEF9D:: @ 080CEF9D
- .incbin "mazaalHand/gUnk_080CEF9D.bin"
+gSpriteAnimations_MazaalHand_1:: @ 080CEF9D
+ .include "animations/gSpriteAnimations_MazaalHand_1.s"
-gUnk_080CEFA5:: @ 080CEFA5
- .incbin "mazaalHand/gUnk_080CEFA5.bin"
+gSpriteAnimations_MazaalHand_2:: @ 080CEFA5
+ .include "animations/gSpriteAnimations_MazaalHand_2.s"
-gUnk_080CEFAE:: @ 080CEFAE
- .incbin "mazaalHand/gUnk_080CEFAE.bin"
+gSpriteAnimations_MazaalHand_3:: @ 080CEFAE
+ .include "animations/gSpriteAnimations_MazaalHand_3.s"
-gUnk_080CEFB2:: @ 080CEFB2
- .incbin "mazaalHand/gUnk_080CEFB2.bin"
+gSpriteAnimations_MazaalHand_4:: @ 080CEFB2
+ .include "animations/gSpriteAnimations_MazaalHand_4.s"
-gUnk_080CEFB6:: @ 080CEFB6
- .incbin "mazaalHand/gUnk_080CEFB6.bin"
+gSpriteAnimations_MazaalHand_5:: @ 080CEFB6
+ .include "animations/gSpriteAnimations_MazaalHand_5.s"
-gUnk_080CEFCB:: @ 080CEFCB
- .incbin "mazaalHand/gUnk_080CEFCB.bin"
+gSpriteAnimations_MazaalHand_6:: @ 080CEFCB
+ .include "animations/gSpriteAnimations_MazaalHand_6.s"
-gUnk_080CEFE0:: @ 080CEFE0
- .incbin "mazaalHand/gUnk_080CEFE0.bin"
+gSpriteAnimations_MazaalHand_7:: @ 080CEFE0
+ .include "animations/gSpriteAnimations_MazaalHand_7.s"
-gUnk_080CEFE9:: @ 080CEFE9
- .incbin "mazaalHand/gUnk_080CEFE9.bin"
+gSpriteAnimations_MazaalHand_8:: @ 080CEFE9
+ .include "animations/gSpriteAnimations_MazaalHand_8.s"
-gUnk_080CF002:: @ 080CF002
- .incbin "mazaalHand/gUnk_080CF002.bin"
+gSpriteAnimations_MazaalHand_9:: @ 080CF002
+ .include "animations/gSpriteAnimations_MazaalHand_9.s"
gSpriteAnimations_MazaalHand:: @ 080CF014
- .4byte gUnk_080CEF7C
- .4byte gUnk_080CEF9D
- .4byte gUnk_080CEFA5
- .4byte gUnk_080CEFAE
- .4byte gUnk_080CEFB2
- .4byte gUnk_080CEFB6
- .4byte gUnk_080CEFCB
- .4byte gUnk_080CEFE0
- .4byte gUnk_080CEFE9
- .4byte gUnk_080CF002
+ .4byte gSpriteAnimations_MazaalHand_0
+ .4byte gSpriteAnimations_MazaalHand_1
+ .4byte gSpriteAnimations_MazaalHand_2
+ .4byte gSpriteAnimations_MazaalHand_3
+ .4byte gSpriteAnimations_MazaalHand_4
+ .4byte gSpriteAnimations_MazaalHand_5
+ .4byte gSpriteAnimations_MazaalHand_6
+ .4byte gSpriteAnimations_MazaalHand_7
+ .4byte gSpriteAnimations_MazaalHand_8
+ .4byte gSpriteAnimations_MazaalHand_9
.4byte 00000000
diff --git a/data/animations/enemy/mazaalHead.s b/data/animations/enemy/mazaalHead.s
index c8ce0be1..1f97effc 100644
--- a/data/animations/enemy/mazaalHead.s
+++ b/data/animations/enemy/mazaalHead.s
@@ -4,33 +4,33 @@
.section .rodata
.align 2
-gUnk_080CEDB0:: @ 080CEDB0
- .incbin "mazaalHead/gUnk_080CEDB0.bin"
+gSpriteAnimations_MazaalHead_0:: @ 080CEDB0
+ .include "animations/gSpriteAnimations_MazaalHead_0.s"
-gUnk_080CEDB5:: @ 080CEDB5
- .incbin "mazaalHead/gUnk_080CEDB5.bin"
+gSpriteAnimations_MazaalHead_1:: @ 080CEDB5
+ .include "animations/gSpriteAnimations_MazaalHead_1.s"
-gUnk_080CEDBA:: @ 080CEDBA
- .incbin "mazaalHead/gUnk_080CEDBA.bin"
+gSpriteAnimations_MazaalHead_2:: @ 080CEDBA
+ .include "animations/gSpriteAnimations_MazaalHead_2.s"
-gUnk_080CEDCF:: @ 080CEDCF
- .incbin "mazaalHead/gUnk_080CEDCF.bin"
+gSpriteAnimations_MazaalHead_3:: @ 080CEDCF
+ .include "animations/gSpriteAnimations_MazaalHead_3.s"
-gUnk_080CEE07:: @ 080CEE07
- .incbin "mazaalHead/gUnk_080CEE07.bin"
+gSpriteAnimations_MazaalHead_4:: @ 080CEE07
+ .include "animations/gSpriteAnimations_MazaalHead_4.s"
-gUnk_080CEE3F:: @ 080CEE3F
- .incbin "mazaalHead/gUnk_080CEE3F.bin"
+gSpriteAnimations_MazaalHead_5:: @ 080CEE3F
+ .include "animations/gSpriteAnimations_MazaalHead_5.s"
-gUnk_080CEE57:: @ 080CEE57
- .incbin "mazaalHead/gUnk_080CEE57.bin"
+gSpriteAnimations_MazaalHead_6:: @ 080CEE57
+ .include "animations/gSpriteAnimations_MazaalHead_6.s"
gSpriteAnimations_MazaalHead:: @ 080CEE70
- .4byte gUnk_080CEDB0
- .4byte gUnk_080CEDB5
- .4byte gUnk_080CEDBA
- .4byte gUnk_080CEDCF
- .4byte gUnk_080CEE07
- .4byte gUnk_080CEE3F
- .4byte gUnk_080CEE57
+ .4byte gSpriteAnimations_MazaalHead_0
+ .4byte gSpriteAnimations_MazaalHead_1
+ .4byte gSpriteAnimations_MazaalHead_2
+ .4byte gSpriteAnimations_MazaalHead_3
+ .4byte gSpriteAnimations_MazaalHead_4
+ .4byte gSpriteAnimations_MazaalHead_5
+ .4byte gSpriteAnimations_MazaalHead_6
.4byte 00000000
diff --git a/data/animations/enemy/mazaalMacro.s b/data/animations/enemy/mazaalMacro.s
index 4faa020b..738143ed 100644
--- a/data/animations/enemy/mazaalMacro.s
+++ b/data/animations/enemy/mazaalMacro.s
@@ -4,17 +4,17 @@
.section .rodata
.align 2
-gUnk_080CEF08:: @ 080CEF08
- .incbin "mazaalMacro/gUnk_080CEF08.bin"
+gSpriteAnimations_MazaalMacro_1:: @ 080CEF08
+ .include "animations/gSpriteAnimations_MazaalMacro_1.s"
-gUnk_080CEF0C:: @ 080CEF0C
- .incbin "mazaalMacro/gUnk_080CEF0C.bin"
+gSpriteAnimations_MazaalMacro_0:: @ 080CEF0C
+ .include "animations/gSpriteAnimations_MazaalMacro_0.s"
-gUnk_080CEF1D:: @ 080CEF1D
- .incbin "mazaalMacro/gUnk_080CEF1D.bin"
+gSpriteAnimations_MazaalMacro_2:: @ 080CEF1D
+ .include "animations/gSpriteAnimations_MazaalMacro_2.s"
gSpriteAnimations_MazaalMacro:: @ 080CEF24
- .4byte gUnk_080CEF0C
- .4byte gUnk_080CEF08
- .4byte gUnk_080CEF1D
+ .4byte gSpriteAnimations_MazaalMacro_0
+ .4byte gSpriteAnimations_MazaalMacro_1
+ .4byte gSpriteAnimations_MazaalMacro_2
.4byte 00000000
diff --git a/data/animations/enemy/moldworm.s b/data/animations/enemy/moldworm.s
index 54191286..483c8dfc 100644
--- a/data/animations/enemy/moldworm.s
+++ b/data/animations/enemy/moldworm.s
@@ -3,101 +3,101 @@
.section .rodata
-gUnk_080CBCC8:: @ 080CBCC8
- .incbin "moldworm/gUnk_080CBCC8.bin"
+gSpriteAnimations_Moldworm_0:: @ 080CBCC8
+ .include "animations/gSpriteAnimations_Moldworm_0.s"
-gUnk_080CBCCC:: @ 080CBCCC
- .incbin "moldworm/gUnk_080CBCCC.bin"
+gSpriteAnimations_Moldworm_1:: @ 080CBCCC
+ .include "animations/gSpriteAnimations_Moldworm_1.s"
-gUnk_080CBCD0:: @ 080CBCD0
- .incbin "moldworm/gUnk_080CBCD0.bin"
+gSpriteAnimations_Moldworm_2:: @ 080CBCD0
+ .include "animations/gSpriteAnimations_Moldworm_2.s"
-gUnk_080CBCD4:: @ 080CBCD4
- .incbin "moldworm/gUnk_080CBCD4.bin"
+gSpriteAnimations_Moldworm_3:: @ 080CBCD4
+ .include "animations/gSpriteAnimations_Moldworm_3.s"
-gUnk_080CBCD8:: @ 080CBCD8
- .incbin "moldworm/gUnk_080CBCD8.bin"
+gSpriteAnimations_Moldworm_4:: @ 080CBCD8
+ .include "animations/gSpriteAnimations_Moldworm_4.s"
-gUnk_080CBCDC:: @ 080CBCDC
- .incbin "moldworm/gUnk_080CBCDC.bin"
+gSpriteAnimations_Moldworm_5:: @ 080CBCDC
+ .include "animations/gSpriteAnimations_Moldworm_5.s"
-gUnk_080CBCE0:: @ 080CBCE0
- .incbin "moldworm/gUnk_080CBCE0.bin"
+gSpriteAnimations_Moldworm_6:: @ 080CBCE0
+ .include "animations/gSpriteAnimations_Moldworm_6.s"
-gUnk_080CBCE4:: @ 080CBCE4
- .incbin "moldworm/gUnk_080CBCE4.bin"
+gSpriteAnimations_Moldworm_7:: @ 080CBCE4
+ .include "animations/gSpriteAnimations_Moldworm_7.s"
-gUnk_080CBCE8:: @ 080CBCE8
- .incbin "moldworm/gUnk_080CBCE8.bin"
+gSpriteAnimations_Moldworm_8:: @ 080CBCE8
+ .include "animations/gSpriteAnimations_Moldworm_8.s"
-gUnk_080CBCEC:: @ 080CBCEC
- .incbin "moldworm/gUnk_080CBCEC.bin"
+gSpriteAnimations_Moldworm_9:: @ 080CBCEC
+ .include "animations/gSpriteAnimations_Moldworm_9.s"
-gUnk_080CBCF0:: @ 080CBCF0
- .incbin "moldworm/gUnk_080CBCF0.bin"
+gSpriteAnimations_Moldworm_10:: @ 080CBCF0
+ .include "animations/gSpriteAnimations_Moldworm_10.s"
-gUnk_080CBCF4:: @ 080CBCF4
- .incbin "moldworm/gUnk_080CBCF4.bin"
+gSpriteAnimations_Moldworm_11:: @ 080CBCF4
+ .include "animations/gSpriteAnimations_Moldworm_11.s"
-gUnk_080CBCF8:: @ 080CBCF8
- .incbin "moldworm/gUnk_080CBCF8.bin"
+gSpriteAnimations_Moldworm_12:: @ 080CBCF8
+ .include "animations/gSpriteAnimations_Moldworm_12.s"
-gUnk_080CBCFC:: @ 080CBCFC
- .incbin "moldworm/gUnk_080CBCFC.bin"
+gSpriteAnimations_Moldworm_13:: @ 080CBCFC
+ .include "animations/gSpriteAnimations_Moldworm_13.s"
-gUnk_080CBD00:: @ 080CBD00
- .incbin "moldworm/gUnk_080CBD00.bin"
+gSpriteAnimations_Moldworm_14:: @ 080CBD00
+ .include "animations/gSpriteAnimations_Moldworm_14.s"
-gUnk_080CBD04:: @ 080CBD04
- .incbin "moldworm/gUnk_080CBD04.bin"
+gSpriteAnimations_Moldworm_15:: @ 080CBD04
+ .include "animations/gSpriteAnimations_Moldworm_15.s"
-gUnk_080CBD08:: @ 080CBD08
- .incbin "moldworm/gUnk_080CBD08.bin"
+gSpriteAnimations_Moldworm_16:: @ 080CBD08
+ .include "animations/gSpriteAnimations_Moldworm_16.s"
-gUnk_080CBD0C:: @ 080CBD0C
- .incbin "moldworm/gUnk_080CBD0C.bin"
+gSpriteAnimations_Moldworm_17:: @ 080CBD0C
+ .include "animations/gSpriteAnimations_Moldworm_17.s"
-gUnk_080CBD10:: @ 080CBD10
- .incbin "moldworm/gUnk_080CBD10.bin"
+gSpriteAnimations_Moldworm_18:: @ 080CBD10
+ .include "animations/gSpriteAnimations_Moldworm_18.s"
-gUnk_080CBD14:: @ 080CBD14
- .incbin "moldworm/gUnk_080CBD14.bin"
+gSpriteAnimations_Moldworm_19:: @ 080CBD14
+ .include "animations/gSpriteAnimations_Moldworm_19.s"
-gUnk_080CBD18:: @ 080CBD18
- .incbin "moldworm/gUnk_080CBD18.bin"
+gSpriteAnimations_Moldworm_20:: @ 080CBD18
+ .include "animations/gSpriteAnimations_Moldworm_20.s"
-gUnk_080CBD1C:: @ 080CBD1C
- .incbin "moldworm/gUnk_080CBD1C.bin"
+gSpriteAnimations_Moldworm_21:: @ 080CBD1C
+ .include "animations/gSpriteAnimations_Moldworm_21.s"
-gUnk_080CBD20:: @ 080CBD20
- .incbin "moldworm/gUnk_080CBD20.bin"
+gSpriteAnimations_Moldworm_22:: @ 080CBD20
+ .include "animations/gSpriteAnimations_Moldworm_22.s"
-gUnk_080CBD4C:: @ 080CBD4C
- .incbin "moldworm/gUnk_080CBD4C.bin"
+gSpriteAnimations_Moldworm_23:: @ 080CBD4C
+ .include "animations/gSpriteAnimations_Moldworm_23.s"
gSpriteAnimations_Moldworm:: @ 080CBD58
- .4byte gUnk_080CBCC8
- .4byte gUnk_080CBCCC
- .4byte gUnk_080CBCD0
- .4byte gUnk_080CBCD4
- .4byte gUnk_080CBCD8
- .4byte gUnk_080CBCDC
- .4byte gUnk_080CBCE0
- .4byte gUnk_080CBCE4
- .4byte gUnk_080CBCE8
- .4byte gUnk_080CBCEC
- .4byte gUnk_080CBCF0
- .4byte gUnk_080CBCF4
- .4byte gUnk_080CBCF8
- .4byte gUnk_080CBCFC
- .4byte gUnk_080CBD00
- .4byte gUnk_080CBD04
- .4byte gUnk_080CBD08
- .4byte gUnk_080CBD0C
- .4byte gUnk_080CBD10
- .4byte gUnk_080CBD14
- .4byte gUnk_080CBD18
- .4byte gUnk_080CBD1C
- .4byte gUnk_080CBD20
- .4byte gUnk_080CBD4C
+ .4byte gSpriteAnimations_Moldworm_0
+ .4byte gSpriteAnimations_Moldworm_1
+ .4byte gSpriteAnimations_Moldworm_2
+ .4byte gSpriteAnimations_Moldworm_3
+ .4byte gSpriteAnimations_Moldworm_4
+ .4byte gSpriteAnimations_Moldworm_5
+ .4byte gSpriteAnimations_Moldworm_6
+ .4byte gSpriteAnimations_Moldworm_7
+ .4byte gSpriteAnimations_Moldworm_8
+ .4byte gSpriteAnimations_Moldworm_9
+ .4byte gSpriteAnimations_Moldworm_10
+ .4byte gSpriteAnimations_Moldworm_11
+ .4byte gSpriteAnimations_Moldworm_12
+ .4byte gSpriteAnimations_Moldworm_13
+ .4byte gSpriteAnimations_Moldworm_14
+ .4byte gSpriteAnimations_Moldworm_15
+ .4byte gSpriteAnimations_Moldworm_16
+ .4byte gSpriteAnimations_Moldworm_17
+ .4byte gSpriteAnimations_Moldworm_18
+ .4byte gSpriteAnimations_Moldworm_19
+ .4byte gSpriteAnimations_Moldworm_20
+ .4byte gSpriteAnimations_Moldworm_21
+ .4byte gSpriteAnimations_Moldworm_22
+ .4byte gSpriteAnimations_Moldworm_23
.4byte 00000000
diff --git a/data/animations/enemy/mulldozer.s b/data/animations/enemy/mulldozer.s
index 22d64357..596e0914 100644
--- a/data/animations/enemy/mulldozer.s
+++ b/data/animations/enemy/mulldozer.s
@@ -4,53 +4,53 @@
.section .rodata
@ .align 2
-gUnk_080CEA66:: @ 080CEA66
- .incbin "mulldozer/gUnk_080CEA66.bin"
+gSpriteAnimations_Mulldozer_0:: @ 080CEA66
+ .include "animations/gSpriteAnimations_Mulldozer_0.s"
-gUnk_080CEA6B:: @ 080CEA6B
- .incbin "mulldozer/gUnk_080CEA6B.bin"
+gSpriteAnimations_Mulldozer_1:: @ 080CEA6B
+ .include "animations/gSpriteAnimations_Mulldozer_1.s"
-gUnk_080CEA70:: @ 080CEA70
- .incbin "mulldozer/gUnk_080CEA70.bin"
+gSpriteAnimations_Mulldozer_2:: @ 080CEA70
+ .include "animations/gSpriteAnimations_Mulldozer_2.s"
-gUnk_080CEA75:: @ 080CEA75
- .incbin "mulldozer/gUnk_080CEA75.bin"
+gSpriteAnimations_Mulldozer_3:: @ 080CEA75
+ .include "animations/gSpriteAnimations_Mulldozer_3.s"
-gUnk_080CEA7A:: @ 080CEA7A
- .incbin "mulldozer/gUnk_080CEA7A.bin"
+gSpriteAnimations_Mulldozer_4:: @ 080CEA7A
+ .include "animations/gSpriteAnimations_Mulldozer_4.s"
-gUnk_080CEA8B:: @ 080CEA8B
- .incbin "mulldozer/gUnk_080CEA8B.bin"
+gSpriteAnimations_Mulldozer_5:: @ 080CEA8B
+ .include "animations/gSpriteAnimations_Mulldozer_5.s"
-gUnk_080CEA9C:: @ 080CEA9C
- .incbin "mulldozer/gUnk_080CEA9C.bin"
+gSpriteAnimations_Mulldozer_6:: @ 080CEA9C
+ .include "animations/gSpriteAnimations_Mulldozer_6.s"
-gUnk_080CEAAD:: @ 080CEAAD
- .incbin "mulldozer/gUnk_080CEAAD.bin"
+gSpriteAnimations_Mulldozer_7:: @ 080CEAAD
+ .include "animations/gSpriteAnimations_Mulldozer_7.s"
-gUnk_080CEABE:: @ 080CEABE
- .incbin "mulldozer/gUnk_080CEABE.bin"
+gSpriteAnimations_Mulldozer_8:: @ 080CEABE
+ .include "animations/gSpriteAnimations_Mulldozer_8.s"
-gUnk_080CEACF:: @ 080CEACF
- .incbin "mulldozer/gUnk_080CEACF.bin"
+gSpriteAnimations_Mulldozer_9:: @ 080CEACF
+ .include "animations/gSpriteAnimations_Mulldozer_9.s"
-gUnk_080CEAE0:: @ 080CEAE0
- .incbin "mulldozer/gUnk_080CEAE0.bin"
+gSpriteAnimations_Mulldozer_10:: @ 080CEAE0
+ .include "animations/gSpriteAnimations_Mulldozer_10.s"
-gUnk_080CEAF1:: @ 080CEAF1
- .incbin "mulldozer/gUnk_080CEAF1.bin"
+gSpriteAnimations_Mulldozer_11:: @ 080CEAF1
+ .include "animations/gSpriteAnimations_Mulldozer_11.s"
gSpriteAnimations_Mulldozer:: @ 080CEB04
- .4byte gUnk_080CEA66
- .4byte gUnk_080CEA6B
- .4byte gUnk_080CEA70
- .4byte gUnk_080CEA75
- .4byte gUnk_080CEA7A
- .4byte gUnk_080CEA8B
- .4byte gUnk_080CEA9C
- .4byte gUnk_080CEAAD
- .4byte gUnk_080CEABE
- .4byte gUnk_080CEACF
- .4byte gUnk_080CEAE0
- .4byte gUnk_080CEAF1
+ .4byte gSpriteAnimations_Mulldozer_0
+ .4byte gSpriteAnimations_Mulldozer_1
+ .4byte gSpriteAnimations_Mulldozer_2
+ .4byte gSpriteAnimations_Mulldozer_3
+ .4byte gSpriteAnimations_Mulldozer_4
+ .4byte gSpriteAnimations_Mulldozer_5
+ .4byte gSpriteAnimations_Mulldozer_6
+ .4byte gSpriteAnimations_Mulldozer_7
+ .4byte gSpriteAnimations_Mulldozer_8
+ .4byte gSpriteAnimations_Mulldozer_9
+ .4byte gSpriteAnimations_Mulldozer_10
+ .4byte gSpriteAnimations_Mulldozer_11
.4byte 00000000
diff --git a/data/animations/enemy/octorok.s b/data/animations/enemy/octorok.s
index f3df634a..8c9810d3 100644
--- a/data/animations/enemy/octorok.s
+++ b/data/animations/enemy/octorok.s
@@ -4,37 +4,37 @@
.section .rodata
.align 2
-gUnk_080CA180:: @ 080CA180
- .incbin "octorok/gUnk_080CA180.bin"
+gSpriteAnimations_Octorok_0:: @ 080CA180
+ .include "animations/gSpriteAnimations_Octorok_0.s"
-gUnk_080CA189:: @ 080CA189
- .incbin "octorok/gUnk_080CA189.bin"
+gSpriteAnimations_Octorok_1:: @ 080CA189
+ .include "animations/gSpriteAnimations_Octorok_1.s"
-gUnk_080CA192:: @ 080CA192
- .incbin "octorok/gUnk_080CA192.bin"
+gSpriteAnimations_Octorok_2:: @ 080CA192
+ .include "animations/gSpriteAnimations_Octorok_2.s"
-gUnk_080CA19B:: @ 080CA19B
- .incbin "octorok/gUnk_080CA19B.bin"
+gSpriteAnimations_Octorok_3:: @ 080CA19B
+ .include "animations/gSpriteAnimations_Octorok_3.s"
-gUnk_080CA1A4:: @ 080CA1A4
- .incbin "octorok/gUnk_080CA1A4.bin"
+gSpriteAnimations_Octorok_4:: @ 080CA1A4
+ .include "animations/gSpriteAnimations_Octorok_4.s"
-gUnk_080CA1B9:: @ 080CA1B9
- .incbin "octorok/gUnk_080CA1B9.bin"
+gSpriteAnimations_Octorok_5:: @ 080CA1B9
+ .include "animations/gSpriteAnimations_Octorok_5.s"
-gUnk_080CA1CE:: @ 080CA1CE
- .incbin "octorok/gUnk_080CA1CE.bin"
+gSpriteAnimations_Octorok_6:: @ 080CA1CE
+ .include "animations/gSpriteAnimations_Octorok_6.s"
-gUnk_080CA1E3:: @ 080CA1E3
- .incbin "octorok/gUnk_080CA1E3.bin"
+gSpriteAnimations_Octorok_7:: @ 080CA1E3
+ .include "animations/gSpriteAnimations_Octorok_7.s"
gSpriteAnimations_Octorok:: @ 080CA1F8
- .4byte gUnk_080CA180
- .4byte gUnk_080CA189
- .4byte gUnk_080CA192
- .4byte gUnk_080CA19B
- .4byte gUnk_080CA1A4
- .4byte gUnk_080CA1B9
- .4byte gUnk_080CA1CE
- .4byte gUnk_080CA1E3
+ .4byte gSpriteAnimations_Octorok_0
+ .4byte gSpriteAnimations_Octorok_1
+ .4byte gSpriteAnimations_Octorok_2
+ .4byte gSpriteAnimations_Octorok_3
+ .4byte gSpriteAnimations_Octorok_4
+ .4byte gSpriteAnimations_Octorok_5
+ .4byte gSpriteAnimations_Octorok_6
+ .4byte gSpriteAnimations_Octorok_7
.4byte 00000000
diff --git a/data/animations/enemy/octorokBoss.s b/data/animations/enemy/octorokBoss.s
index 9133c8bc..225d890a 100644
--- a/data/animations/enemy/octorokBoss.s
+++ b/data/animations/enemy/octorokBoss.s
@@ -4,64 +4,64 @@
.section .rodata
.align 2
-gUnk_080CF14C:: @ 080CF14C
- .incbin "octorokBoss/gUnk_080CF14C.bin"
+gSpriteAnimations_OctorokBoss_1_0:: @ 080CF14C
+ .include "animations/gSpriteAnimations_OctorokBoss_1_0.s"
-gUnk_080CF150:: @ 080CF150
- .incbin "octorokBoss/gUnk_080CF150.bin"
+gSpriteAnimations_OctorokBoss_1_1:: @ 080CF150
+ .include "animations/gSpriteAnimations_OctorokBoss_1_1.s"
-gUnk_080CF154:: @ 080CF154
- .incbin "octorokBoss/gUnk_080CF154.bin"
+gSpriteAnimations_OctorokBoss_1_2:: @ 080CF154
+ .include "animations/gSpriteAnimations_OctorokBoss_1_2.s"
-gUnk_080CF158:: @ 080CF158
- .incbin "octorokBoss/gUnk_080CF158.bin"
+gSpriteAnimations_OctorokBoss_0_1:: @ 080CF158
+ .include "animations/gSpriteAnimations_OctorokBoss_0_1.s"
-gUnk_080CF16D:: @ 080CF16D
- .incbin "octorokBoss/gUnk_080CF16D.bin"
+gSpriteAnimations_OctorokBoss_0_2:: @ 080CF16D
+ .include "animations/gSpriteAnimations_OctorokBoss_0_2.s"
-gUnk_080CF182:: @ 080CF182
- .incbin "octorokBoss/gUnk_080CF182.bin"
+gSpriteAnimations_OctorokBoss_1_3:: @ 080CF182
+ .include "animations/gSpriteAnimations_OctorokBoss_1_3.s"
-gUnk_080CF186:: @ 080CF186
- .incbin "octorokBoss/gUnk_080CF186.bin"
+gSpriteAnimations_OctorokBoss_0_0:: @ 080CF186
+ .include "animations/gSpriteAnimations_OctorokBoss_0_0.s"
-gUnk_080CF197:: @ 080CF197
- .incbin "octorokBoss/gUnk_080CF197.bin"
+gSpriteAnimations_OctorokBoss_1_4:: @ 080CF197
+ .include "animations/gSpriteAnimations_OctorokBoss_1_4.s"
-gUnk_080CF1AC:: @ 080CF1AC
- .incbin "octorokBoss/gUnk_080CF1AC.bin"
+gSpriteAnimations_OctorokBoss_1_5:: @ 080CF1AC
+ .include "animations/gSpriteAnimations_OctorokBoss_1_5.s"
-gUnk_080CF1BD:: @ 080CF1BD
- .incbin "octorokBoss/gUnk_080CF1BD.bin"
+gSpriteAnimations_OctorokBoss_1_6:: @ 080CF1BD
+ .include "animations/gSpriteAnimations_OctorokBoss_1_6.s"
-gUnk_080CF1DD:: @ 080CF1DD
- .incbin "octorokBoss/gUnk_080CF1DD.bin"
+gSpriteAnimations_OctorokBoss_1_7:: @ 080CF1DD
+ .include "animations/gSpriteAnimations_OctorokBoss_1_7.s"
-gUnk_080CF1E2:: @ 080CF1E2
- .incbin "octorokBoss/gUnk_080CF1E2.bin"
+gSpriteAnimations_OctorokBoss_1_8:: @ 080CF1E2
+ .include "animations/gSpriteAnimations_OctorokBoss_1_8.s"
-gUnk_080CF1FB:: @ 080CF1FB
- .incbin "octorokBoss/gUnk_080CF1FB.bin"
+gSpriteAnimations_OctorokBoss_1_9:: @ 080CF1FB
+ .include "animations/gSpriteAnimations_OctorokBoss_1_9.s"
-gUnk_080CF1FF:: @ 080CF1FF
- .incbin "octorokBoss/gUnk_080CF1FF.bin"
+gSpriteAnimations_OctorokBoss_1_10:: @ 080CF1FF
+ .include "animations/gSpriteAnimations_OctorokBoss_1_10.s"
gSpriteAnimations_OctorokBoss_1:: @ 080CF204
- .4byte gUnk_080CF14C
- .4byte gUnk_080CF150
- .4byte gUnk_080CF154
- .4byte gUnk_080CF182
- .4byte gUnk_080CF197
- .4byte gUnk_080CF1AC
- .4byte gUnk_080CF1BD
- .4byte gUnk_080CF1DD
- .4byte gUnk_080CF1E2
- .4byte gUnk_080CF1FB
- .4byte gUnk_080CF1FF
+ .4byte gSpriteAnimations_OctorokBoss_1_0
+ .4byte gSpriteAnimations_OctorokBoss_1_1
+ .4byte gSpriteAnimations_OctorokBoss_1_2
+ .4byte gSpriteAnimations_OctorokBoss_1_3
+ .4byte gSpriteAnimations_OctorokBoss_1_4
+ .4byte gSpriteAnimations_OctorokBoss_1_5
+ .4byte gSpriteAnimations_OctorokBoss_1_6
+ .4byte gSpriteAnimations_OctorokBoss_1_7
+ .4byte gSpriteAnimations_OctorokBoss_1_8
+ .4byte gSpriteAnimations_OctorokBoss_1_9
+ .4byte gSpriteAnimations_OctorokBoss_1_10
.4byte 00000000
gSpriteAnimations_OctorokBoss_0:: @ 080CF234
- .4byte gUnk_080CF186
- .4byte gUnk_080CF158
- .4byte gUnk_080CF16D
+ .4byte gSpriteAnimations_OctorokBoss_0_0
+ .4byte gSpriteAnimations_OctorokBoss_0_1
+ .4byte gSpriteAnimations_OctorokBoss_0_2
.4byte 00000000
diff --git a/data/animations/enemy/peahat.s b/data/animations/enemy/peahat.s
index b4b86e78..dd98efe6 100644
--- a/data/animations/enemy/peahat.s
+++ b/data/animations/enemy/peahat.s
@@ -7,29 +7,29 @@
gUnk_080CA5D4:: @ 080CA5D4
.incbin "peahat/gUnk_080CA5D4.bin"
-gUnk_080CA5D6:: @ 080CA5D6
- .incbin "peahat/gUnk_080CA5D6.bin"
+gSpriteAnimations_Peahat_0:: @ 080CA5D6
+ .include "animations/gSpriteAnimations_Peahat_0.s"
-gUnk_080CA5E7:: @ 080CA5E7
- .incbin "peahat/gUnk_080CA5E7.bin"
+gSpriteAnimations_Peahat_1:: @ 080CA5E7
+ .include "animations/gSpriteAnimations_Peahat_1.s"
-gUnk_080CA5F8:: @ 080CA5F8
- .incbin "peahat/gUnk_080CA5F8.bin"
+gSpriteAnimations_Peahat_2:: @ 080CA5F8
+ .include "animations/gSpriteAnimations_Peahat_2.s"
-gUnk_080CA615:: @ 080CA615
- .incbin "peahat/gUnk_080CA615.bin"
+gSpriteAnimations_Peahat_3:: @ 080CA615
+ .include "animations/gSpriteAnimations_Peahat_3.s"
-gUnk_080CA626:: @ 080CA626
- .incbin "peahat/gUnk_080CA626.bin"
+gSpriteAnimations_Peahat_4:: @ 080CA626
+ .include "animations/gSpriteAnimations_Peahat_4.s"
-gUnk_080CA63A:: @ 080CA63A
- .incbin "peahat/gUnk_080CA63A.bin"
+gSpriteAnimations_Peahat_5:: @ 080CA63A
+ .include "animations/gSpriteAnimations_Peahat_5.s"
gSpriteAnimations_Peahat:: @ 080CA650
- .4byte gUnk_080CA5D6
- .4byte gUnk_080CA5E7
- .4byte gUnk_080CA5F8
- .4byte gUnk_080CA615
- .4byte gUnk_080CA626
- .4byte gUnk_080CA63A
+ .4byte gSpriteAnimations_Peahat_0
+ .4byte gSpriteAnimations_Peahat_1
+ .4byte gSpriteAnimations_Peahat_2
+ .4byte gSpriteAnimations_Peahat_3
+ .4byte gSpriteAnimations_Peahat_4
+ .4byte gSpriteAnimations_Peahat_5
.4byte 00000000
diff --git a/data/animations/enemy/pesto.s b/data/animations/enemy/pesto.s
index 66c9efed..af91019e 100644
--- a/data/animations/enemy/pesto.s
+++ b/data/animations/enemy/pesto.s
@@ -3,37 +3,37 @@
.section .rodata
-gUnk_080CBF30:: @ 080CBF30
- .incbin "pesto/gUnk_080CBF30.bin"
+gSpriteAnimations_Pesto_0:: @ 080CBF30
+ .include "animations/gSpriteAnimations_Pesto_0.s"
-gUnk_080CBF39:: @ 080CBF39
- .incbin "pesto/gUnk_080CBF39.bin"
+gSpriteAnimations_Pesto_1:: @ 080CBF39
+ .include "animations/gSpriteAnimations_Pesto_1.s"
-gUnk_080CBF42:: @ 080CBF42
- .incbin "pesto/gUnk_080CBF42.bin"
+gSpriteAnimations_Pesto_2:: @ 080CBF42
+ .include "animations/gSpriteAnimations_Pesto_2.s"
-gUnk_080CBF4B:: @ 080CBF4B
- .incbin "pesto/gUnk_080CBF4B.bin"
+gSpriteAnimations_Pesto_3:: @ 080CBF4B
+ .include "animations/gSpriteAnimations_Pesto_3.s"
-gUnk_080CBF54:: @ 080CBF54
- .incbin "pesto/gUnk_080CBF54.bin"
+gSpriteAnimations_Pesto_4:: @ 080CBF54
+ .include "animations/gSpriteAnimations_Pesto_4.s"
-gUnk_080CBF5D:: @ 080CBF5D
- .incbin "pesto/gUnk_080CBF5D.bin"
+gSpriteAnimations_Pesto_5:: @ 080CBF5D
+ .include "animations/gSpriteAnimations_Pesto_5.s"
-gUnk_080CBF66:: @ 080CBF66
- .incbin "pesto/gUnk_080CBF66.bin"
+gSpriteAnimations_Pesto_6:: @ 080CBF66
+ .include "animations/gSpriteAnimations_Pesto_6.s"
-gUnk_080CBF6F:: @ 080CBF6F
- .incbin "pesto/gUnk_080CBF6F.bin"
+gSpriteAnimations_Pesto_7:: @ 080CBF6F
+ .include "animations/gSpriteAnimations_Pesto_7.s"
gSpriteAnimations_Pesto:: @ 080CBF78
- .4byte gUnk_080CBF30
- .4byte gUnk_080CBF39
- .4byte gUnk_080CBF42
- .4byte gUnk_080CBF4B
- .4byte gUnk_080CBF54
- .4byte gUnk_080CBF5D
- .4byte gUnk_080CBF66
- .4byte gUnk_080CBF6F
+ .4byte gSpriteAnimations_Pesto_0
+ .4byte gSpriteAnimations_Pesto_1
+ .4byte gSpriteAnimations_Pesto_2
+ .4byte gSpriteAnimations_Pesto_3
+ .4byte gSpriteAnimations_Pesto_4
+ .4byte gSpriteAnimations_Pesto_5
+ .4byte gSpriteAnimations_Pesto_6
+ .4byte gSpriteAnimations_Pesto_7
.4byte 00000000
diff --git a/data/animations/enemy/puffstool.s b/data/animations/enemy/puffstool.s
index e8d45ac0..55a6b596 100644
--- a/data/animations/enemy/puffstool.s
+++ b/data/animations/enemy/puffstool.s
@@ -3,42 +3,42 @@
.section .rodata
-gUnk_080CC0CA:: @ 080CC0CA
- .incbin "puffstool/gUnk_080CC0CA.bin"
+gSpriteAnimations_Puffstool_0:: @ 080CC0CA
+ .include "animations/gSpriteAnimations_Puffstool_0.s"
-gUnk_080CC10B:: @ 080CC10B
- .incbin "puffstool/gUnk_080CC10B.bin"
+gSpriteAnimations_Puffstool_1:: @ 080CC10B
+ .include "animations/gSpriteAnimations_Puffstool_1.s"
-gUnk_080CC118:: @ 080CC118
- .incbin "puffstool/gUnk_080CC118.bin"
+gSpriteAnimations_Puffstool_2:: @ 080CC118
+ .include "animations/gSpriteAnimations_Puffstool_2.s"
-gUnk_080CC121:: @ 080CC121
- .incbin "puffstool/gUnk_080CC121.bin"
+gSpriteAnimations_Puffstool_3:: @ 080CC121
+ .include "animations/gSpriteAnimations_Puffstool_3.s"
-gUnk_080CC131:: @ 080CC131
- .incbin "puffstool/gUnk_080CC131.bin"
+gSpriteAnimations_Puffstool_4:: @ 080CC131
+ .include "animations/gSpriteAnimations_Puffstool_4.s"
-gUnk_080CC13E:: @ 080CC13E
- .incbin "puffstool/gUnk_080CC13E.bin"
+gSpriteAnimations_Puffstool_5:: @ 080CC13E
+ .include "animations/gSpriteAnimations_Puffstool_5.s"
-gUnk_080CC14B:: @ 080CC14B
- .incbin "puffstool/gUnk_080CC14B.bin"
+gSpriteAnimations_Puffstool_6:: @ 080CC14B
+ .include "animations/gSpriteAnimations_Puffstool_6.s"
-gUnk_080CC158:: @ 080CC158
- .incbin "puffstool/gUnk_080CC158.bin"
+gSpriteAnimations_Puffstool_7:: @ 080CC158
+ .include "animations/gSpriteAnimations_Puffstool_7.s"
-gUnk_080CC165:: @ 080CC165
- .incbin "puffstool/gUnk_080CC165.bin"
+gSpriteAnimations_Puffstool_8:: @ 080CC165
+ .include "animations/gSpriteAnimations_Puffstool_8.s"
gSpriteAnimations_Puffstool:: @ 080CC174
- .4byte gUnk_080CC0CA
- .4byte gUnk_080CC10B
- .4byte gUnk_080CC118
- .4byte gUnk_080CC121
- .4byte gUnk_080CC131
- .4byte gUnk_080CC13E
- .4byte gUnk_080CC14B
- .4byte gUnk_080CC158
- .4byte gUnk_080CC165
+ .4byte gSpriteAnimations_Puffstool_0
+ .4byte gSpriteAnimations_Puffstool_1
+ .4byte gSpriteAnimations_Puffstool_2
+ .4byte gSpriteAnimations_Puffstool_3
+ .4byte gSpriteAnimations_Puffstool_4
+ .4byte gSpriteAnimations_Puffstool_5
+ .4byte gSpriteAnimations_Puffstool_6
+ .4byte gSpriteAnimations_Puffstool_7
+ .4byte gSpriteAnimations_Puffstool_8
.4byte 00000000
diff --git a/data/animations/enemy/rockChuchu.s b/data/animations/enemy/rockChuchu.s
index 31a5677c..7cf2d55c 100644
--- a/data/animations/enemy/rockChuchu.s
+++ b/data/animations/enemy/rockChuchu.s
@@ -3,17 +3,17 @@
.section .rodata
-gUnk_080CB96C:: @ 080CB96C
- .incbin "rockChuchu/gUnk_080CB96C.bin"
+gSpriteAnimations_RockChuchu_0:: @ 080CB96C
+ .include "animations/gSpriteAnimations_RockChuchu_0.s"
-gUnk_080CB995:: @ 080CB995
- .incbin "rockChuchu/gUnk_080CB995.bin"
+gSpriteAnimations_RockChuchu_1:: @ 080CB995
+ .include "animations/gSpriteAnimations_RockChuchu_1.s"
-gUnk_080CB9D6:: @ 080CB9D6
- .incbin "rockChuchu/gUnk_080CB9D6.bin"
+gSpriteAnimations_RockChuchu_2:: @ 080CB9D6
+ .include "animations/gSpriteAnimations_RockChuchu_2.s"
gSpriteAnimations_RockChuchu:: @ 080CBA18
- .4byte gUnk_080CB96C
- .4byte gUnk_080CB995
- .4byte gUnk_080CB9D6
+ .4byte gSpriteAnimations_RockChuchu_0
+ .4byte gSpriteAnimations_RockChuchu_1
+ .4byte gSpriteAnimations_RockChuchu_2
.4byte 00000000
diff --git a/data/animations/enemy/rollobite.s b/data/animations/enemy/rollobite.s
index f6e8b81c..fc6af82d 100644
--- a/data/animations/enemy/rollobite.s
+++ b/data/animations/enemy/rollobite.s
@@ -7,101 +7,101 @@
gUnk_080CA6D4:: @ 080CA6D4
.incbin "rollobite/gUnk_080CA6D4.bin"
-gUnk_080CA6D7:: @ 080CA6D7
- .incbin "rollobite/gUnk_080CA6D7.bin"
+gSpriteAnimations_Rollobite_0:: @ 080CA6D7
+ .include "animations/gSpriteAnimations_Rollobite_0.s"
-gUnk_080CA6F8:: @ 080CA6F8
- .incbin "rollobite/gUnk_080CA6F8.bin"
+gSpriteAnimations_Rollobite_1:: @ 080CA6F8
+ .include "animations/gSpriteAnimations_Rollobite_1.s"
-gUnk_080CA719:: @ 080CA719
- .incbin "rollobite/gUnk_080CA719.bin"
+gSpriteAnimations_Rollobite_2:: @ 080CA719
+ .include "animations/gSpriteAnimations_Rollobite_2.s"
-gUnk_080CA73A:: @ 080CA73A
- .incbin "rollobite/gUnk_080CA73A.bin"
+gSpriteAnimations_Rollobite_3:: @ 080CA73A
+ .include "animations/gSpriteAnimations_Rollobite_3.s"
-gUnk_080CA75B:: @ 080CA75B
- .incbin "rollobite/gUnk_080CA75B.bin"
+gSpriteAnimations_Rollobite_4:: @ 080CA75B
+ .include "animations/gSpriteAnimations_Rollobite_4.s"
-gUnk_080CA76C:: @ 080CA76C
- .incbin "rollobite/gUnk_080CA76C.bin"
+gSpriteAnimations_Rollobite_5:: @ 080CA76C
+ .include "animations/gSpriteAnimations_Rollobite_5.s"
-gUnk_080CA77D:: @ 080CA77D
- .incbin "rollobite/gUnk_080CA77D.bin"
+gSpriteAnimations_Rollobite_6:: @ 080CA77D
+ .include "animations/gSpriteAnimations_Rollobite_6.s"
-gUnk_080CA78E:: @ 080CA78E
- .incbin "rollobite/gUnk_080CA78E.bin"
+gSpriteAnimations_Rollobite_7:: @ 080CA78E
+ .include "animations/gSpriteAnimations_Rollobite_7.s"
-gUnk_080CA79F:: @ 080CA79F
- .incbin "rollobite/gUnk_080CA79F.bin"
+gSpriteAnimations_Rollobite_12:: @ 080CA79F
+ .include "animations/gSpriteAnimations_Rollobite_12.s"
-gUnk_080CA7F7:: @ 080CA7F7
- .incbin "rollobite/gUnk_080CA7F7.bin"
+gSpriteAnimations_Rollobite_13:: @ 080CA7F7
+ .include "animations/gSpriteAnimations_Rollobite_13.s"
-gUnk_080CA84F:: @ 080CA84F
- .incbin "rollobite/gUnk_080CA84F.bin"
+gSpriteAnimations_Rollobite_14:: @ 080CA84F
+ .include "animations/gSpriteAnimations_Rollobite_14.s"
-gUnk_080CA8A7:: @ 080CA8A7
- .incbin "rollobite/gUnk_080CA8A7.bin"
+gSpriteAnimations_Rollobite_15:: @ 080CA8A7
+ .include "animations/gSpriteAnimations_Rollobite_15.s"
-gUnk_080CA8FF:: @ 080CA8FF
- .incbin "rollobite/gUnk_080CA8FF.bin"
+gSpriteAnimations_Rollobite_8:: @ 080CA8FF
+ .include "animations/gSpriteAnimations_Rollobite_8.s"
-gUnk_080CA907:: @ 080CA907
- .incbin "rollobite/gUnk_080CA907.bin"
+gSpriteAnimations_Rollobite_9:: @ 080CA907
+ .include "animations/gSpriteAnimations_Rollobite_9.s"
-gUnk_080CA90F:: @ 080CA90F
- .incbin "rollobite/gUnk_080CA90F.bin"
+gSpriteAnimations_Rollobite_10:: @ 080CA90F
+ .include "animations/gSpriteAnimations_Rollobite_10.s"
-gUnk_080CA917:: @ 080CA917
- .incbin "rollobite/gUnk_080CA917.bin"
+gSpriteAnimations_Rollobite_11:: @ 080CA917
+ .include "animations/gSpriteAnimations_Rollobite_11.s"
-gUnk_080CA91F:: @ 080CA91F
- .incbin "rollobite/gUnk_080CA91F.bin"
+gSpriteAnimations_Rollobite_16:: @ 080CA91F
+ .include "animations/gSpriteAnimations_Rollobite_16.s"
-gUnk_080CA923:: @ 080CA923
- .incbin "rollobite/gUnk_080CA923.bin"
+gSpriteAnimations_Rollobite_17:: @ 080CA923
+ .include "animations/gSpriteAnimations_Rollobite_17.s"
-gUnk_080CA927:: @ 080CA927
- .incbin "rollobite/gUnk_080CA927.bin"
+gSpriteAnimations_Rollobite_18:: @ 080CA927
+ .include "animations/gSpriteAnimations_Rollobite_18.s"
-gUnk_080CA92B:: @ 080CA92B
- .incbin "rollobite/gUnk_080CA92B.bin"
+gSpriteAnimations_Rollobite_19:: @ 080CA92B
+ .include "animations/gSpriteAnimations_Rollobite_19.s"
-gUnk_080CA92F:: @ 080CA92F
- .incbin "rollobite/gUnk_080CA92F.bin"
+gSpriteAnimations_Rollobite_20:: @ 080CA92F
+ .include "animations/gSpriteAnimations_Rollobite_20.s"
-gUnk_080CA970:: @ 080CA970
- .incbin "rollobite/gUnk_080CA970.bin"
+gSpriteAnimations_Rollobite_21:: @ 080CA970
+ .include "animations/gSpriteAnimations_Rollobite_21.s"
-gUnk_080CA9B1:: @ 080CA9B1
- .incbin "rollobite/gUnk_080CA9B1.bin"
+gSpriteAnimations_Rollobite_22:: @ 080CA9B1
+ .include "animations/gSpriteAnimations_Rollobite_22.s"
-gUnk_080CA9F2:: @ 080CA9F2
- .incbin "rollobite/gUnk_080CA9F2.bin"
+gSpriteAnimations_Rollobite_23:: @ 080CA9F2
+ .include "animations/gSpriteAnimations_Rollobite_23.s"
gSpriteAnimations_Rollobite:: @ 080CAA34
- .4byte gUnk_080CA6D7
- .4byte gUnk_080CA6F8
- .4byte gUnk_080CA719
- .4byte gUnk_080CA73A
- .4byte gUnk_080CA75B
- .4byte gUnk_080CA76C
- .4byte gUnk_080CA77D
- .4byte gUnk_080CA78E
- .4byte gUnk_080CA8FF
- .4byte gUnk_080CA907
- .4byte gUnk_080CA90F
- .4byte gUnk_080CA917
- .4byte gUnk_080CA79F
- .4byte gUnk_080CA7F7
- .4byte gUnk_080CA84F
- .4byte gUnk_080CA8A7
- .4byte gUnk_080CA91F
- .4byte gUnk_080CA923
- .4byte gUnk_080CA927
- .4byte gUnk_080CA92B
- .4byte gUnk_080CA92F
- .4byte gUnk_080CA970
- .4byte gUnk_080CA9B1
- .4byte gUnk_080CA9F2
+ .4byte gSpriteAnimations_Rollobite_0
+ .4byte gSpriteAnimations_Rollobite_1
+ .4byte gSpriteAnimations_Rollobite_2
+ .4byte gSpriteAnimations_Rollobite_3
+ .4byte gSpriteAnimations_Rollobite_4
+ .4byte gSpriteAnimations_Rollobite_5
+ .4byte gSpriteAnimations_Rollobite_6
+ .4byte gSpriteAnimations_Rollobite_7
+ .4byte gSpriteAnimations_Rollobite_8
+ .4byte gSpriteAnimations_Rollobite_9
+ .4byte gSpriteAnimations_Rollobite_10
+ .4byte gSpriteAnimations_Rollobite_11
+ .4byte gSpriteAnimations_Rollobite_12
+ .4byte gSpriteAnimations_Rollobite_13
+ .4byte gSpriteAnimations_Rollobite_14
+ .4byte gSpriteAnimations_Rollobite_15
+ .4byte gSpriteAnimations_Rollobite_16
+ .4byte gSpriteAnimations_Rollobite_17
+ .4byte gSpriteAnimations_Rollobite_18
+ .4byte gSpriteAnimations_Rollobite_19
+ .4byte gSpriteAnimations_Rollobite_20
+ .4byte gSpriteAnimations_Rollobite_21
+ .4byte gSpriteAnimations_Rollobite_22
+ .4byte gSpriteAnimations_Rollobite_23
.4byte 00000000
diff --git a/data/animations/enemy/rope.s b/data/animations/enemy/rope.s
index 530897bd..5a403d6c 100644
--- a/data/animations/enemy/rope.s
+++ b/data/animations/enemy/rope.s
@@ -4,37 +4,37 @@
.section .rodata
.align 2
-gUnk_080CE47C:: @ 080CE47C
- .incbin "rope/gUnk_080CE47C.bin"
+gSpriteAnimations_Rope_0:: @ 080CE47C
+ .include "animations/gSpriteAnimations_Rope_0.s"
-gUnk_080CE48D:: @ 080CE48D
- .incbin "rope/gUnk_080CE48D.bin"
+gSpriteAnimations_Rope_1:: @ 080CE48D
+ .include "animations/gSpriteAnimations_Rope_1.s"
-gUnk_080CE49E:: @ 080CE49E
- .incbin "rope/gUnk_080CE49E.bin"
+gSpriteAnimations_Rope_2:: @ 080CE49E
+ .include "animations/gSpriteAnimations_Rope_2.s"
-gUnk_080CE4AF:: @ 080CE4AF
- .incbin "rope/gUnk_080CE4AF.bin"
+gSpriteAnimations_Rope_3:: @ 080CE4AF
+ .include "animations/gSpriteAnimations_Rope_3.s"
-gUnk_080CE4C0:: @ 080CE4C0
- .incbin "rope/gUnk_080CE4C0.bin"
+gSpriteAnimations_Rope_4:: @ 080CE4C0
+ .include "animations/gSpriteAnimations_Rope_4.s"
-gUnk_080CE4D1:: @ 080CE4D1
- .incbin "rope/gUnk_080CE4D1.bin"
+gSpriteAnimations_Rope_5:: @ 080CE4D1
+ .include "animations/gSpriteAnimations_Rope_5.s"
-gUnk_080CE4E2:: @ 080CE4E2
- .incbin "rope/gUnk_080CE4E2.bin"
+gSpriteAnimations_Rope_6:: @ 080CE4E2
+ .include "animations/gSpriteAnimations_Rope_6.s"
-gUnk_080CE4F3:: @ 080CE4F3
- .incbin "rope/gUnk_080CE4F3.bin"
+gSpriteAnimations_Rope_7:: @ 080CE4F3
+ .include "animations/gSpriteAnimations_Rope_7.s"
gSpriteAnimations_Rope:: @ 080CE50C
- .4byte gUnk_080CE47C
- .4byte gUnk_080CE48D
- .4byte gUnk_080CE49E
- .4byte gUnk_080CE4AF
- .4byte gUnk_080CE4C0
- .4byte gUnk_080CE4D1
- .4byte gUnk_080CE4E2
- .4byte gUnk_080CE4F3
+ .4byte gSpriteAnimations_Rope_0
+ .4byte gSpriteAnimations_Rope_1
+ .4byte gSpriteAnimations_Rope_2
+ .4byte gSpriteAnimations_Rope_3
+ .4byte gSpriteAnimations_Rope_4
+ .4byte gSpriteAnimations_Rope_5
+ .4byte gSpriteAnimations_Rope_6
+ .4byte gSpriteAnimations_Rope_7
.4byte 00000000
diff --git a/data/animations/enemy/rupeeLike.s b/data/animations/enemy/rupeeLike.s
index 2c085f55..b613ae8a 100644
--- a/data/animations/enemy/rupeeLike.s
+++ b/data/animations/enemy/rupeeLike.s
@@ -3,37 +3,37 @@
.section .rodata
-gUnk_080CCC4A:: @ 080CCC4A
- .incbin "rupeeLike/gUnk_080CCC4A.bin"
+gSpriteAnimations_RupeeLike_0:: @ 080CCC4A
+ .include "animations/gSpriteAnimations_RupeeLike_0.s"
-gUnk_080CCC5F:: @ 080CCC5F
- .incbin "rupeeLike/gUnk_080CCC5F.bin"
+gSpriteAnimations_RupeeLike_1:: @ 080CCC5F
+ .include "animations/gSpriteAnimations_RupeeLike_1.s"
-gUnk_080CCC74:: @ 080CCC74
- .incbin "rupeeLike/gUnk_080CCC74.bin"
+gSpriteAnimations_RupeeLike_2:: @ 080CCC74
+ .include "animations/gSpriteAnimations_RupeeLike_2.s"
-gUnk_080CCC9C:: @ 080CCC9C
- .incbin "rupeeLike/gUnk_080CCC9C.bin"
+gSpriteAnimations_RupeeLike_3:: @ 080CCC9C
+ .include "animations/gSpriteAnimations_RupeeLike_3.s"
-gUnk_080CCCB4:: @ 080CCCB4
- .incbin "rupeeLike/gUnk_080CCCB4.bin"
+gSpriteAnimations_RupeeLike_4:: @ 080CCCB4
+ .include "animations/gSpriteAnimations_RupeeLike_4.s"
-gUnk_080CCCC9:: @ 080CCCC9
- .incbin "rupeeLike/gUnk_080CCCC9.bin"
+gSpriteAnimations_RupeeLike_5:: @ 080CCCC9
+ .include "animations/gSpriteAnimations_RupeeLike_5.s"
-gUnk_080CCCDE:: @ 080CCCDE
- .incbin "rupeeLike/gUnk_080CCCDE.bin"
+gSpriteAnimations_RupeeLike_6:: @ 080CCCDE
+ .include "animations/gSpriteAnimations_RupeeLike_6.s"
-gUnk_080CCD06:: @ 080CCD06
- .incbin "rupeeLike/gUnk_080CCD06.bin"
+gSpriteAnimations_RupeeLike_7:: @ 080CCD06
+ .include "animations/gSpriteAnimations_RupeeLike_7.s"
gSpriteAnimations_RupeeLike:: @ 080CCD20
- .4byte gUnk_080CCC4A
- .4byte gUnk_080CCC5F
- .4byte gUnk_080CCC74
- .4byte gUnk_080CCC9C
- .4byte gUnk_080CCCB4
- .4byte gUnk_080CCCC9
- .4byte gUnk_080CCCDE
- .4byte gUnk_080CCD06
+ .4byte gSpriteAnimations_RupeeLike_0
+ .4byte gSpriteAnimations_RupeeLike_1
+ .4byte gSpriteAnimations_RupeeLike_2
+ .4byte gSpriteAnimations_RupeeLike_3
+ .4byte gSpriteAnimations_RupeeLike_4
+ .4byte gSpriteAnimations_RupeeLike_5
+ .4byte gSpriteAnimations_RupeeLike_6
+ .4byte gSpriteAnimations_RupeeLike_7
.4byte 00000000
diff --git a/data/animations/enemy/scissorsBeetle.s b/data/animations/enemy/scissorsBeetle.s
index d3b95abe..0af2acb0 100644
--- a/data/animations/enemy/scissorsBeetle.s
+++ b/data/animations/enemy/scissorsBeetle.s
@@ -4,85 +4,85 @@
.section .rodata
.align 2
-gUnk_080CF644:: @ 080CF644
- .incbin "scissorsBeetle/gUnk_080CF644.bin"
+gSpriteAnimations_ScissorsBeetle_0:: @ 080CF644
+ .include "animations/gSpriteAnimations_ScissorsBeetle_0.s"
-gUnk_080CF649:: @ 080CF649
- .incbin "scissorsBeetle/gUnk_080CF649.bin"
+gSpriteAnimations_ScissorsBeetle_1:: @ 080CF649
+ .include "animations/gSpriteAnimations_ScissorsBeetle_1.s"
-gUnk_080CF64E:: @ 080CF64E
- .incbin "scissorsBeetle/gUnk_080CF64E.bin"
+gSpriteAnimations_ScissorsBeetle_2:: @ 080CF64E
+ .include "animations/gSpriteAnimations_ScissorsBeetle_2.s"
-gUnk_080CF653:: @ 080CF653
- .incbin "scissorsBeetle/gUnk_080CF653.bin"
+gSpriteAnimations_ScissorsBeetle_3:: @ 080CF653
+ .include "animations/gSpriteAnimations_ScissorsBeetle_3.s"
-gUnk_080CF658:: @ 080CF658
- .incbin "scissorsBeetle/gUnk_080CF658.bin"
+gSpriteAnimations_ScissorsBeetle_4:: @ 080CF658
+ .include "animations/gSpriteAnimations_ScissorsBeetle_4.s"
-gUnk_080CF669:: @ 080CF669
- .incbin "scissorsBeetle/gUnk_080CF669.bin"
+gSpriteAnimations_ScissorsBeetle_5:: @ 080CF669
+ .include "animations/gSpriteAnimations_ScissorsBeetle_5.s"
-gUnk_080CF67A:: @ 080CF67A
- .incbin "scissorsBeetle/gUnk_080CF67A.bin"
+gSpriteAnimations_ScissorsBeetle_6:: @ 080CF67A
+ .include "animations/gSpriteAnimations_ScissorsBeetle_6.s"
-gUnk_080CF68B:: @ 080CF68B
- .incbin "scissorsBeetle/gUnk_080CF68B.bin"
+gSpriteAnimations_ScissorsBeetle_7:: @ 080CF68B
+ .include "animations/gSpriteAnimations_ScissorsBeetle_7.s"
-gUnk_080CF69C:: @ 080CF69C
- .incbin "scissorsBeetle/gUnk_080CF69C.bin"
+gSpriteAnimations_ScissorsBeetle_8:: @ 080CF69C
+ .include "animations/gSpriteAnimations_ScissorsBeetle_8.s"
-gUnk_080CF6A1:: @ 080CF6A1
- .incbin "scissorsBeetle/gUnk_080CF6A1.bin"
+gSpriteAnimations_ScissorsBeetle_9:: @ 080CF6A1
+ .include "animations/gSpriteAnimations_ScissorsBeetle_9.s"
-gUnk_080CF6A6:: @ 080CF6A6
- .incbin "scissorsBeetle/gUnk_080CF6A6.bin"
+gSpriteAnimations_ScissorsBeetle_10:: @ 080CF6A6
+ .include "animations/gSpriteAnimations_ScissorsBeetle_10.s"
-gUnk_080CF6AB:: @ 080CF6AB
- .incbin "scissorsBeetle/gUnk_080CF6AB.bin"
+gSpriteAnimations_ScissorsBeetle_11:: @ 080CF6AB
+ .include "animations/gSpriteAnimations_ScissorsBeetle_11.s"
-gUnk_080CF6B0:: @ 080CF6B0
- .incbin "scissorsBeetle/gUnk_080CF6B0.bin"
+gSpriteAnimations_ScissorsBeetle_12:: @ 080CF6B0
+ .include "animations/gSpriteAnimations_ScissorsBeetle_12.s"
-gUnk_080CF6C1:: @ 080CF6C1
- .incbin "scissorsBeetle/gUnk_080CF6C1.bin"
+gSpriteAnimations_ScissorsBeetle_13:: @ 080CF6C1
+ .include "animations/gSpriteAnimations_ScissorsBeetle_13.s"
-gUnk_080CF6D2:: @ 080CF6D2
- .incbin "scissorsBeetle/gUnk_080CF6D2.bin"
+gSpriteAnimations_ScissorsBeetle_14:: @ 080CF6D2
+ .include "animations/gSpriteAnimations_ScissorsBeetle_14.s"
-gUnk_080CF6E3:: @ 080CF6E3
- .incbin "scissorsBeetle/gUnk_080CF6E3.bin"
+gSpriteAnimations_ScissorsBeetle_15:: @ 080CF6E3
+ .include "animations/gSpriteAnimations_ScissorsBeetle_15.s"
-gUnk_080CF6F4:: @ 080CF6F4
- .incbin "scissorsBeetle/gUnk_080CF6F4.bin"
+gSpriteAnimations_ScissorsBeetle_16:: @ 080CF6F4
+ .include "animations/gSpriteAnimations_ScissorsBeetle_16.s"
-gUnk_080CF700:: @ 080CF700
- .incbin "scissorsBeetle/gUnk_080CF700.bin"
+gSpriteAnimations_ScissorsBeetle_17:: @ 080CF700
+ .include "animations/gSpriteAnimations_ScissorsBeetle_17.s"
-gUnk_080CF70C:: @ 080CF70C
- .incbin "scissorsBeetle/gUnk_080CF70C.bin"
+gSpriteAnimations_ScissorsBeetle_18:: @ 080CF70C
+ .include "animations/gSpriteAnimations_ScissorsBeetle_18.s"
-gUnk_080CF718:: @ 080CF718
- .incbin "scissorsBeetle/gUnk_080CF718.bin"
+gSpriteAnimations_ScissorsBeetle_19:: @ 080CF718
+ .include "animations/gSpriteAnimations_ScissorsBeetle_19.s"
gSpriteAnimations_ScissorsBeetle:: @ 080CF724
- .4byte gUnk_080CF644
- .4byte gUnk_080CF649
- .4byte gUnk_080CF64E
- .4byte gUnk_080CF653
- .4byte gUnk_080CF658
- .4byte gUnk_080CF669
- .4byte gUnk_080CF67A
- .4byte gUnk_080CF68B
- .4byte gUnk_080CF69C
- .4byte gUnk_080CF6A1
- .4byte gUnk_080CF6A6
- .4byte gUnk_080CF6AB
- .4byte gUnk_080CF6B0
- .4byte gUnk_080CF6C1
- .4byte gUnk_080CF6D2
- .4byte gUnk_080CF6E3
- .4byte gUnk_080CF6F4
- .4byte gUnk_080CF700
- .4byte gUnk_080CF70C
- .4byte gUnk_080CF718
+ .4byte gSpriteAnimations_ScissorsBeetle_0
+ .4byte gSpriteAnimations_ScissorsBeetle_1
+ .4byte gSpriteAnimations_ScissorsBeetle_2
+ .4byte gSpriteAnimations_ScissorsBeetle_3
+ .4byte gSpriteAnimations_ScissorsBeetle_4
+ .4byte gSpriteAnimations_ScissorsBeetle_5
+ .4byte gSpriteAnimations_ScissorsBeetle_6
+ .4byte gSpriteAnimations_ScissorsBeetle_7
+ .4byte gSpriteAnimations_ScissorsBeetle_8
+ .4byte gSpriteAnimations_ScissorsBeetle_9
+ .4byte gSpriteAnimations_ScissorsBeetle_10
+ .4byte gSpriteAnimations_ScissorsBeetle_11
+ .4byte gSpriteAnimations_ScissorsBeetle_12
+ .4byte gSpriteAnimations_ScissorsBeetle_13
+ .4byte gSpriteAnimations_ScissorsBeetle_14
+ .4byte gSpriteAnimations_ScissorsBeetle_15
+ .4byte gSpriteAnimations_ScissorsBeetle_16
+ .4byte gSpriteAnimations_ScissorsBeetle_17
+ .4byte gSpriteAnimations_ScissorsBeetle_18
+ .4byte gSpriteAnimations_ScissorsBeetle_19
.4byte 00000000
diff --git a/data/animations/enemy/slime.s b/data/animations/enemy/slime.s
index 04c8f78e..de41a327 100644
--- a/data/animations/enemy/slime.s
+++ b/data/animations/enemy/slime.s
@@ -4,49 +4,49 @@
.section .rodata
.align 2
-gUnk_080D16DC:: @ 080D16DC
- .incbin "slime/gUnk_080D16DC.bin"
+gSpriteAnimations_Slime_0:: @ 080D16DC
+ .include "animations/gSpriteAnimations_Slime_0.s"
-gUnk_080D16E5:: @ 080D16E5
- .incbin "slime/gUnk_080D16E5.bin"
+gSpriteAnimations_Slime_1:: @ 080D16E5
+ .include "animations/gSpriteAnimations_Slime_1.s"
-gUnk_080D16F5:: @ 080D16F5
- .incbin "slime/gUnk_080D16F5.bin"
+gSpriteAnimations_Slime_2:: @ 080D16F5
+ .include "animations/gSpriteAnimations_Slime_2.s"
-gUnk_080D170D:: @ 080D170D
- .incbin "slime/gUnk_080D170D.bin"
+gSpriteAnimations_Slime_3:: @ 080D170D
+ .include "animations/gSpriteAnimations_Slime_3.s"
-gUnk_080D171D:: @ 080D171D
- .incbin "slime/gUnk_080D171D.bin"
+gSpriteAnimations_Slime_4:: @ 080D171D
+ .include "animations/gSpriteAnimations_Slime_4.s"
-gUnk_080D1741:: @ 080D1741
- .incbin "slime/gUnk_080D1741.bin"
+gSpriteAnimations_Slime_5:: @ 080D1741
+ .include "animations/gSpriteAnimations_Slime_5.s"
-gUnk_080D1761:: @ 080D1761
- .incbin "slime/gUnk_080D1761.bin"
+gSpriteAnimations_Slime_6:: @ 080D1761
+ .include "animations/gSpriteAnimations_Slime_6.s"
-gUnk_080D176A:: @ 080D176A
- .incbin "slime/gUnk_080D176A.bin"
+gSpriteAnimations_Slime_7:: @ 080D176A
+ .include "animations/gSpriteAnimations_Slime_7.s"
-gUnk_080D1773:: @ 080D1773
- .incbin "slime/gUnk_080D1773.bin"
+gSpriteAnimations_Slime_8:: @ 080D1773
+ .include "animations/gSpriteAnimations_Slime_8.s"
-gUnk_080D1778:: @ 080D1778
- .incbin "slime/gUnk_080D1778.bin"
+gSpriteAnimations_Slime_9:: @ 080D1778
+ .include "animations/gSpriteAnimations_Slime_9.s"
-gUnk_080D177D:: @ 080D177D
- .incbin "slime/gUnk_080D177D.bin"
+gSpriteAnimations_Slime_10:: @ 080D177D
+ .include "animations/gSpriteAnimations_Slime_10.s"
gSpriteAnimations_Slime:: @ 080D1790
- .4byte gUnk_080D16DC
- .4byte gUnk_080D16E5
- .4byte gUnk_080D16F5
- .4byte gUnk_080D170D
- .4byte gUnk_080D171D
- .4byte gUnk_080D1741
- .4byte gUnk_080D1761
- .4byte gUnk_080D176A
- .4byte gUnk_080D1773
- .4byte gUnk_080D1778
- .4byte gUnk_080D177D
+ .4byte gSpriteAnimations_Slime_0
+ .4byte gSpriteAnimations_Slime_1
+ .4byte gSpriteAnimations_Slime_2
+ .4byte gSpriteAnimations_Slime_3
+ .4byte gSpriteAnimations_Slime_4
+ .4byte gSpriteAnimations_Slime_5
+ .4byte gSpriteAnimations_Slime_6
+ .4byte gSpriteAnimations_Slime_7
+ .4byte gSpriteAnimations_Slime_8
+ .4byte gSpriteAnimations_Slime_9
+ .4byte gSpriteAnimations_Slime_10
.4byte 00000000
diff --git a/data/animations/enemy/sluggula.s b/data/animations/enemy/sluggula.s
index f8e0bc13..3b4808e7 100644
--- a/data/animations/enemy/sluggula.s
+++ b/data/animations/enemy/sluggula.s
@@ -3,34 +3,34 @@
.section .rodata
-gUnk_080CBE02:: @ 080CBE02
- .incbin "sluggula/gUnk_080CBE02.bin"
+gSpriteAnimations_Sluggula_0:: @ 080CBE02
+ .include "animations/gSpriteAnimations_Sluggula_0.s"
-gUnk_080CBE1B:: @ 080CBE1B
- .incbin "sluggula/gUnk_080CBE1B.bin"
+gSpriteAnimations_Sluggula_1:: @ 080CBE1B
+ .include "animations/gSpriteAnimations_Sluggula_1.s"
-gUnk_080CBE34:: @ 080CBE34
- .incbin "sluggula/gUnk_080CBE34.bin"
+gSpriteAnimations_Sluggula_2:: @ 080CBE34
+ .include "animations/gSpriteAnimations_Sluggula_2.s"
-gUnk_080CBE4D:: @ 080CBE4D
- .incbin "sluggula/gUnk_080CBE4D.bin"
+gSpriteAnimations_Sluggula_3:: @ 080CBE4D
+ .include "animations/gSpriteAnimations_Sluggula_3.s"
-gUnk_080CBE66:: @ 080CBE66
- .incbin "sluggula/gUnk_080CBE66.bin"
+gSpriteAnimations_Sluggula_4:: @ 080CBE66
+ .include "animations/gSpriteAnimations_Sluggula_4.s"
-gUnk_080CBE8A:: @ 080CBE8A
- .incbin "sluggula/gUnk_080CBE8A.bin"
+gSpriteAnimations_Sluggula_5:: @ 080CBE8A
+ .include "animations/gSpriteAnimations_Sluggula_5.s"
-gUnk_080CBE9E:: @ 080CBE9E
- .incbin "sluggula/gUnk_080CBE9E.bin"
+gSpriteAnimations_Sluggula_6:: @ 080CBE9E
+ .include "animations/gSpriteAnimations_Sluggula_6.s"
gSpriteAnimations_Sluggula:: @ 080CBEA4
- .4byte gUnk_080CBE02
- .4byte gUnk_080CBE1B
- .4byte gUnk_080CBE34
- .4byte gUnk_080CBE4D
- .4byte gUnk_080CBE66
- .4byte gUnk_080CBE8A
- .4byte gUnk_080CBE9E
+ .4byte gSpriteAnimations_Sluggula_0
+ .4byte gSpriteAnimations_Sluggula_1
+ .4byte gSpriteAnimations_Sluggula_2
+ .4byte gSpriteAnimations_Sluggula_3
+ .4byte gSpriteAnimations_Sluggula_4
+ .4byte gSpriteAnimations_Sluggula_5
+ .4byte gSpriteAnimations_Sluggula_6
.4byte 00000000
diff --git a/data/animations/enemy/spark.s b/data/animations/enemy/spark.s
index 0f7b26e4..6f62aed6 100644
--- a/data/animations/enemy/spark.s
+++ b/data/animations/enemy/spark.s
@@ -3,9 +3,9 @@
.section .rodata
-gUnk_080CD258:: @ 080CD258
- .incbin "spark/gUnk_080CD258.bin"
+gSpriteAnimations_Spark_0:: @ 080CD258
+ .include "animations/gSpriteAnimations_Spark_0.s"
gSpriteAnimations_Spark:: @ 080CD274
- .4byte gUnk_080CD258
+ .4byte gSpriteAnimations_Spark_0
.4byte 00000000
diff --git a/data/animations/enemy/spearMoblin.s b/data/animations/enemy/spearMoblin.s
index 2447cca4..720a8b66 100644
--- a/data/animations/enemy/spearMoblin.s
+++ b/data/animations/enemy/spearMoblin.s
@@ -4,71 +4,71 @@
.section .rodata
-gUnk_080CC7E0:: @ 080CC7E0
- .incbin "spearMoblin/gUnk_080CC7E0.bin"
+gSpriteAnimations_SpearMoblin_0:: @ 080CC7E0
+ .include "animations/gSpriteAnimations_SpearMoblin_0.s"
-gUnk_080CC7E9:: @ 080CC7E9
- .incbin "spearMoblin/gUnk_080CC7E9.bin"
+gSpriteAnimations_SpearMoblin_1:: @ 080CC7E9
+ .include "animations/gSpriteAnimations_SpearMoblin_1.s"
-gUnk_080CC7F2:: @ 080CC7F2
- .incbin "spearMoblin/gUnk_080CC7F2.bin"
+gSpriteAnimations_SpearMoblin_2:: @ 080CC7F2
+ .include "animations/gSpriteAnimations_SpearMoblin_2.s"
-gUnk_080CC7FB:: @ 080CC7FB
- .incbin "spearMoblin/gUnk_080CC7FB.bin"
+gSpriteAnimations_SpearMoblin_3:: @ 080CC7FB
+ .include "animations/gSpriteAnimations_SpearMoblin_3.s"
-gUnk_080CC804:: @ 080CC804
- .incbin "spearMoblin/gUnk_080CC804.bin"
+gSpriteAnimations_SpearMoblin_4:: @ 080CC804
+ .include "animations/gSpriteAnimations_SpearMoblin_4.s"
-gUnk_080CC815:: @ 080CC815
- .incbin "spearMoblin/gUnk_080CC815.bin"
+gSpriteAnimations_SpearMoblin_5:: @ 080CC815
+ .include "animations/gSpriteAnimations_SpearMoblin_5.s"
-gUnk_080CC826:: @ 080CC826
- .incbin "spearMoblin/gUnk_080CC826.bin"
+gSpriteAnimations_SpearMoblin_6:: @ 080CC826
+ .include "animations/gSpriteAnimations_SpearMoblin_6.s"
-gUnk_080CC837:: @ 080CC837
- .incbin "spearMoblin/gUnk_080CC837.bin"
+gSpriteAnimations_SpearMoblin_7:: @ 080CC837
+ .include "animations/gSpriteAnimations_SpearMoblin_7.s"
-gUnk_080CC848:: @ 080CC848
- .incbin "spearMoblin/gUnk_080CC848.bin"
+gSpriteAnimations_SpearMoblin_8:: @ 080CC848
+ .include "animations/gSpriteAnimations_SpearMoblin_8.s"
-gUnk_080CC859:: @ 080CC859
- .incbin "spearMoblin/gUnk_080CC859.bin"
+gSpriteAnimations_SpearMoblin_9:: @ 080CC859
+ .include "animations/gSpriteAnimations_SpearMoblin_9.s"
-gUnk_080CC86A:: @ 080CC86A
- .incbin "spearMoblin/gUnk_080CC86A.bin"
+gSpriteAnimations_SpearMoblin_10:: @ 080CC86A
+ .include "animations/gSpriteAnimations_SpearMoblin_10.s"
-gUnk_080CC87B:: @ 080CC87B
- .incbin "spearMoblin/gUnk_080CC87B.bin"
+gSpriteAnimations_SpearMoblin_11:: @ 080CC87B
+ .include "animations/gSpriteAnimations_SpearMoblin_11.s"
-gUnk_080CC88C:: @ 080CC88C
- .incbin "spearMoblin/gUnk_080CC88C.bin"
+gSpriteAnimations_SpearMoblin_12:: @ 080CC88C
+ .include "animations/gSpriteAnimations_SpearMoblin_12.s"
-gUnk_080CC8A1:: @ 080CC8A1
- .incbin "spearMoblin/gUnk_080CC8A1.bin"
+gSpriteAnimations_SpearMoblin_13:: @ 080CC8A1
+ .include "animations/gSpriteAnimations_SpearMoblin_13.s"
-gUnk_080CC8B6:: @ 080CC8B6
- .incbin "spearMoblin/gUnk_080CC8B6.bin"
+gSpriteAnimations_SpearMoblin_14:: @ 080CC8B6
+ .include "animations/gSpriteAnimations_SpearMoblin_14.s"
-gUnk_080CC8CB:: @ 080CC8CB
- .incbin "spearMoblin/gUnk_080CC8CB.bin"
+gSpriteAnimations_SpearMoblin_15:: @ 080CC8CB
+ .include "animations/gSpriteAnimations_SpearMoblin_15.s"
gSpriteAnimations_SpearMoblin:: @ 080CC8E0
- .4byte gUnk_080CC7E0
- .4byte gUnk_080CC7E9
- .4byte gUnk_080CC7F2
- .4byte gUnk_080CC7FB
- .4byte gUnk_080CC804
- .4byte gUnk_080CC815
- .4byte gUnk_080CC826
- .4byte gUnk_080CC837
- .4byte gUnk_080CC848
- .4byte gUnk_080CC859
- .4byte gUnk_080CC86A
- .4byte gUnk_080CC87B
- .4byte gUnk_080CC88C
- .4byte gUnk_080CC8A1
- .4byte gUnk_080CC8B6
- .4byte gUnk_080CC8CB
+ .4byte gSpriteAnimations_SpearMoblin_0
+ .4byte gSpriteAnimations_SpearMoblin_1
+ .4byte gSpriteAnimations_SpearMoblin_2
+ .4byte gSpriteAnimations_SpearMoblin_3
+ .4byte gSpriteAnimations_SpearMoblin_4
+ .4byte gSpriteAnimations_SpearMoblin_5
+ .4byte gSpriteAnimations_SpearMoblin_6
+ .4byte gSpriteAnimations_SpearMoblin_7
+ .4byte gSpriteAnimations_SpearMoblin_8
+ .4byte gSpriteAnimations_SpearMoblin_9
+ .4byte gSpriteAnimations_SpearMoblin_10
+ .4byte gSpriteAnimations_SpearMoblin_11
+ .4byte gSpriteAnimations_SpearMoblin_12
+ .4byte gSpriteAnimations_SpearMoblin_13
+ .4byte gSpriteAnimations_SpearMoblin_14
+ .4byte gSpriteAnimations_SpearMoblin_15
.4byte 00000000
gUnk_080CC924:: @ 080CC924
diff --git a/data/animations/enemy/spikedBeetle.s b/data/animations/enemy/spikedBeetle.s
index a67974f2..ed27fe57 100644
--- a/data/animations/enemy/spikedBeetle.s
+++ b/data/animations/enemy/spikedBeetle.s
@@ -3,45 +3,45 @@
.section .rodata
-gUnk_080CD31C:: @ 080CD31C
- .incbin "spikedBeetle/gUnk_080CD31C.bin"
+gSpriteAnimations_SpikedBeetle_0:: @ 080CD31C
+ .include "animations/gSpriteAnimations_SpikedBeetle_0.s"
-gUnk_080CD32D:: @ 080CD32D
- .incbin "spikedBeetle/gUnk_080CD32D.bin"
+gSpriteAnimations_SpikedBeetle_1:: @ 080CD32D
+ .include "animations/gSpriteAnimations_SpikedBeetle_1.s"
-gUnk_080CD33E:: @ 080CD33E
- .incbin "spikedBeetle/gUnk_080CD33E.bin"
+gSpriteAnimations_SpikedBeetle_2:: @ 080CD33E
+ .include "animations/gSpriteAnimations_SpikedBeetle_2.s"
-gUnk_080CD34F:: @ 080CD34F
- .incbin "spikedBeetle/gUnk_080CD34F.bin"
+gSpriteAnimations_SpikedBeetle_3:: @ 080CD34F
+ .include "animations/gSpriteAnimations_SpikedBeetle_3.s"
-gUnk_080CD360:: @ 080CD360
- .incbin "spikedBeetle/gUnk_080CD360.bin"
+gSpriteAnimations_SpikedBeetle_4:: @ 080CD360
+ .include "animations/gSpriteAnimations_SpikedBeetle_4.s"
-gUnk_080CD368:: @ 080CD368
- .incbin "spikedBeetle/gUnk_080CD368.bin"
+gSpriteAnimations_SpikedBeetle_5:: @ 080CD368
+ .include "animations/gSpriteAnimations_SpikedBeetle_5.s"
-gUnk_080CD370:: @ 080CD370
- .incbin "spikedBeetle/gUnk_080CD370.bin"
+gSpriteAnimations_SpikedBeetle_6:: @ 080CD370
+ .include "animations/gSpriteAnimations_SpikedBeetle_6.s"
-gUnk_080CD378:: @ 080CD378
- .incbin "spikedBeetle/gUnk_080CD378.bin"
+gSpriteAnimations_SpikedBeetle_7:: @ 080CD378
+ .include "animations/gSpriteAnimations_SpikedBeetle_7.s"
-gUnk_080CD380:: @ 080CD380
- .incbin "spikedBeetle/gUnk_080CD380.bin"
+gSpriteAnimations_SpikedBeetle_8:: @ 080CD380
+ .include "animations/gSpriteAnimations_SpikedBeetle_8.s"
-gUnk_080CD391:: @ 080CD391
- .incbin "spikedBeetle/gUnk_080CD391.bin"
+gSpriteAnimations_SpikedBeetle_9:: @ 080CD391
+ .include "animations/gSpriteAnimations_SpikedBeetle_9.s"
gSpriteAnimations_SpikedBeetle:: @ 080CD398
- .4byte gUnk_080CD31C
- .4byte gUnk_080CD32D
- .4byte gUnk_080CD33E
- .4byte gUnk_080CD34F
- .4byte gUnk_080CD360
- .4byte gUnk_080CD368
- .4byte gUnk_080CD370
- .4byte gUnk_080CD378
- .4byte gUnk_080CD380
- .4byte gUnk_080CD391
+ .4byte gSpriteAnimations_SpikedBeetle_0
+ .4byte gSpriteAnimations_SpikedBeetle_1
+ .4byte gSpriteAnimations_SpikedBeetle_2
+ .4byte gSpriteAnimations_SpikedBeetle_3
+ .4byte gSpriteAnimations_SpikedBeetle_4
+ .4byte gSpriteAnimations_SpikedBeetle_5
+ .4byte gSpriteAnimations_SpikedBeetle_6
+ .4byte gSpriteAnimations_SpikedBeetle_7
+ .4byte gSpriteAnimations_SpikedBeetle_8
+ .4byte gSpriteAnimations_SpikedBeetle_9
.4byte 00000000
diff --git a/data/animations/enemy/spinyBeetle.s b/data/animations/enemy/spinyBeetle.s
index dcd7498a..1ace6618 100644
--- a/data/animations/enemy/spinyBeetle.s
+++ b/data/animations/enemy/spinyBeetle.s
@@ -4,25 +4,25 @@
.section .rodata
.align 2
-gUnk_080CEC24:: @ 080CEC24
- .incbin "spinyBeetle/gUnk_080CEC24.bin"
+gSpriteAnimations_SpinyBeetle_0:: @ 080CEC24
+ .include "animations/gSpriteAnimations_SpinyBeetle_0.s"
-gUnk_080CEC29:: @ 080CEC29
- .incbin "spinyBeetle/gUnk_080CEC29.bin"
+gSpriteAnimations_SpinyBeetle_1:: @ 080CEC29
+ .include "animations/gSpriteAnimations_SpinyBeetle_1.s"
-gUnk_080CEC42:: @ 080CEC42
- .incbin "spinyBeetle/gUnk_080CEC42.bin"
+gSpriteAnimations_SpinyBeetle_2:: @ 080CEC42
+ .include "animations/gSpriteAnimations_SpinyBeetle_2.s"
-gUnk_080CEC4B:: @ 080CEC4B
- .incbin "spinyBeetle/gUnk_080CEC4B.bin"
+gSpriteAnimations_SpinyBeetle_3:: @ 080CEC4B
+ .include "animations/gSpriteAnimations_SpinyBeetle_3.s"
-gUnk_080CEC5C:: @ 080CEC5C
- .incbin "spinyBeetle/gUnk_080CEC5C.bin"
+gSpriteAnimations_SpinyBeetle_4:: @ 080CEC5C
+ .include "animations/gSpriteAnimations_SpinyBeetle_4.s"
gSpriteAnimations_SpinyBeetle:: @ 080CEC70
- .4byte gUnk_080CEC24
- .4byte gUnk_080CEC29
- .4byte gUnk_080CEC42
- .4byte gUnk_080CEC4B
- .4byte gUnk_080CEC5C
+ .4byte gSpriteAnimations_SpinyBeetle_0
+ .4byte gSpriteAnimations_SpinyBeetle_1
+ .4byte gSpriteAnimations_SpinyBeetle_2
+ .4byte gSpriteAnimations_SpinyBeetle_3
+ .4byte gSpriteAnimations_SpinyBeetle_4
.4byte 00000000
diff --git a/data/animations/enemy/spinyChuchu.s b/data/animations/enemy/spinyChuchu.s
index aedabc85..32278363 100644
--- a/data/animations/enemy/spinyChuchu.s
+++ b/data/animations/enemy/spinyChuchu.s
@@ -3,33 +3,33 @@
.section .rodata
-gUnk_080CBA64:: @ 080CBA64
- .incbin "spinyChuchu/gUnk_080CBA64.bin"
+gSpriteAnimations_SpinyChuchu_0:: @ 080CBA64
+ .include "animations/gSpriteAnimations_SpinyChuchu_0.s"
-gUnk_080CBAA5:: @ 080CBAA5
- .incbin "spinyChuchu/gUnk_080CBAA5.bin"
+gSpriteAnimations_SpinyChuchu_1:: @ 080CBAA5
+ .include "animations/gSpriteAnimations_SpinyChuchu_1.s"
-gUnk_080CBAE5:: @ 080CBAE5
- .incbin "spinyChuchu/gUnk_080CBAE5.bin"
+gSpriteAnimations_SpinyChuchu_2:: @ 080CBAE5
+ .include "animations/gSpriteAnimations_SpinyChuchu_2.s"
-gUnk_080CBAFD:: @ 080CBAFD
- .incbin "spinyChuchu/gUnk_080CBAFD.bin"
+gSpriteAnimations_SpinyChuchu_3:: @ 080CBAFD
+ .include "animations/gSpriteAnimations_SpinyChuchu_3.s"
-gUnk_080CBB21:: @ 080CBB21
- .incbin "spinyChuchu/gUnk_080CBB21.bin"
+gSpriteAnimations_SpinyChuchu_4:: @ 080CBB21
+ .include "animations/gSpriteAnimations_SpinyChuchu_4.s"
-gUnk_080CBB32:: @ 080CBB32
- .incbin "spinyChuchu/gUnk_080CBB32.bin"
+gSpriteAnimations_SpinyChuchu_5:: @ 080CBB32
+ .include "animations/gSpriteAnimations_SpinyChuchu_5.s"
-gUnk_080CBB3F:: @ 080CBB3F
- .incbin "spinyChuchu/gUnk_080CBB3F.bin"
+gSpriteAnimations_SpinyChuchu_6:: @ 080CBB3F
+ .include "animations/gSpriteAnimations_SpinyChuchu_6.s"
gSpriteAnimations_SpinyChuchu:: @ 080CBB44
- .4byte gUnk_080CBA64
- .4byte gUnk_080CBAA5
- .4byte gUnk_080CBAE5
- .4byte gUnk_080CBAFD
- .4byte gUnk_080CBB21
- .4byte gUnk_080CBB32
- .4byte gUnk_080CBB3F
+ .4byte gSpriteAnimations_SpinyChuchu_0
+ .4byte gSpriteAnimations_SpinyChuchu_1
+ .4byte gSpriteAnimations_SpinyChuchu_2
+ .4byte gSpriteAnimations_SpinyChuchu_3
+ .4byte gSpriteAnimations_SpinyChuchu_4
+ .4byte gSpriteAnimations_SpinyChuchu_5
+ .4byte gSpriteAnimations_SpinyChuchu_6
.4byte 00000000
diff --git a/data/animations/enemy/stalfos.s b/data/animations/enemy/stalfos.s
index fb47cac7..ee411bf0 100644
--- a/data/animations/enemy/stalfos.s
+++ b/data/animations/enemy/stalfos.s
@@ -4,149 +4,149 @@
.section .rodata
@ .align 2
-gUnk_080CF942:: @ 080CF942
- .incbin "stalfos/gUnk_080CF942.bin"
+gSpriteAnimations_Stalfos_0:: @ 080CF942
+ .include "animations/gSpriteAnimations_Stalfos_0.s"
-gUnk_080CF946:: @ 080CF946
- .incbin "stalfos/gUnk_080CF946.bin"
+gSpriteAnimations_Stalfos_1:: @ 080CF946
+ .include "animations/gSpriteAnimations_Stalfos_1.s"
-gUnk_080CF94A:: @ 080CF94A
- .incbin "stalfos/gUnk_080CF94A.bin"
+gSpriteAnimations_Stalfos_2:: @ 080CF94A
+ .include "animations/gSpriteAnimations_Stalfos_2.s"
-gUnk_080CF94E:: @ 080CF94E
- .incbin "stalfos/gUnk_080CF94E.bin"
+gSpriteAnimations_Stalfos_3:: @ 080CF94E
+ .include "animations/gSpriteAnimations_Stalfos_3.s"
-gUnk_080CF952:: @ 080CF952
- .incbin "stalfos/gUnk_080CF952.bin"
+gSpriteAnimations_Stalfos_4:: @ 080CF952
+ .include "animations/gSpriteAnimations_Stalfos_4.s"
-gUnk_080CF96B:: @ 080CF96B
- .incbin "stalfos/gUnk_080CF96B.bin"
+gSpriteAnimations_Stalfos_5:: @ 080CF96B
+ .include "animations/gSpriteAnimations_Stalfos_5.s"
-gUnk_080CF984:: @ 080CF984
- .incbin "stalfos/gUnk_080CF984.bin"
+gSpriteAnimations_Stalfos_6:: @ 080CF984
+ .include "animations/gSpriteAnimations_Stalfos_6.s"
-gUnk_080CF99D:: @ 080CF99D
- .incbin "stalfos/gUnk_080CF99D.bin"
+gSpriteAnimations_Stalfos_7:: @ 080CF99D
+ .include "animations/gSpriteAnimations_Stalfos_7.s"
-gUnk_080CF9B6:: @ 080CF9B6
- .incbin "stalfos/gUnk_080CF9B6.bin"
+gSpriteAnimations_Stalfos_8:: @ 080CF9B6
+ .include "animations/gSpriteAnimations_Stalfos_8.s"
-gUnk_080CF9BA:: @ 080CF9BA
- .incbin "stalfos/gUnk_080CF9BA.bin"
+gSpriteAnimations_Stalfos_9:: @ 080CF9BA
+ .include "animations/gSpriteAnimations_Stalfos_9.s"
-gUnk_080CF9BE:: @ 080CF9BE
- .incbin "stalfos/gUnk_080CF9BE.bin"
+gSpriteAnimations_Stalfos_10:: @ 080CF9BE
+ .include "animations/gSpriteAnimations_Stalfos_10.s"
-gUnk_080CF9C2:: @ 080CF9C2
- .incbin "stalfos/gUnk_080CF9C2.bin"
+gSpriteAnimations_Stalfos_11:: @ 080CF9C2
+ .include "animations/gSpriteAnimations_Stalfos_11.s"
-gUnk_080CF9C6:: @ 080CF9C6
- .incbin "stalfos/gUnk_080CF9C6.bin"
+gSpriteAnimations_Stalfos_12:: @ 080CF9C6
+ .include "animations/gSpriteAnimations_Stalfos_12.s"
-gUnk_080CF9D7:: @ 080CF9D7
- .incbin "stalfos/gUnk_080CF9D7.bin"
+gSpriteAnimations_Stalfos_13:: @ 080CF9D7
+ .include "animations/gSpriteAnimations_Stalfos_13.s"
-gUnk_080CF9E8:: @ 080CF9E8
- .incbin "stalfos/gUnk_080CF9E8.bin"
+gSpriteAnimations_Stalfos_14:: @ 080CF9E8
+ .include "animations/gSpriteAnimations_Stalfos_14.s"
-gUnk_080CF9F9:: @ 080CF9F9
- .incbin "stalfos/gUnk_080CF9F9.bin"
+gSpriteAnimations_Stalfos_15:: @ 080CF9F9
+ .include "animations/gSpriteAnimations_Stalfos_15.s"
-gUnk_080CFA0A:: @ 080CFA0A
- .incbin "stalfos/gUnk_080CFA0A.bin"
+gSpriteAnimations_Stalfos_16:: @ 080CFA0A
+ .include "animations/gSpriteAnimations_Stalfos_16.s"
-gUnk_080CFA0E:: @ 080CFA0E
- .incbin "stalfos/gUnk_080CFA0E.bin"
+gSpriteAnimations_Stalfos_17:: @ 080CFA0E
+ .include "animations/gSpriteAnimations_Stalfos_17.s"
-gUnk_080CFA12:: @ 080CFA12
- .incbin "stalfos/gUnk_080CFA12.bin"
+gSpriteAnimations_Stalfos_18:: @ 080CFA12
+ .include "animations/gSpriteAnimations_Stalfos_18.s"
-gUnk_080CFA16:: @ 080CFA16
- .incbin "stalfos/gUnk_080CFA16.bin"
+gSpriteAnimations_Stalfos_19:: @ 080CFA16
+ .include "animations/gSpriteAnimations_Stalfos_19.s"
-gUnk_080CFA1A:: @ 080CFA1A
- .incbin "stalfos/gUnk_080CFA1A.bin"
+gSpriteAnimations_Stalfos_20:: @ 080CFA1A
+ .include "animations/gSpriteAnimations_Stalfos_20.s"
-gUnk_080CFA33:: @ 080CFA33
- .incbin "stalfos/gUnk_080CFA33.bin"
+gSpriteAnimations_Stalfos_21:: @ 080CFA33
+ .include "animations/gSpriteAnimations_Stalfos_21.s"
-gUnk_080CFA4C:: @ 080CFA4C
- .incbin "stalfos/gUnk_080CFA4C.bin"
+gSpriteAnimations_Stalfos_22:: @ 080CFA4C
+ .include "animations/gSpriteAnimations_Stalfos_22.s"
-gUnk_080CFA65:: @ 080CFA65
- .incbin "stalfos/gUnk_080CFA65.bin"
+gSpriteAnimations_Stalfos_23:: @ 080CFA65
+ .include "animations/gSpriteAnimations_Stalfos_23.s"
-gUnk_080CFA7E:: @ 080CFA7E
- .incbin "stalfos/gUnk_080CFA7E.bin"
+gSpriteAnimations_Stalfos_24:: @ 080CFA7E
+ .include "animations/gSpriteAnimations_Stalfos_24.s"
-gUnk_080CFA92:: @ 080CFA92
- .incbin "stalfos/gUnk_080CFA92.bin"
+gSpriteAnimations_Stalfos_25:: @ 080CFA92
+ .include "animations/gSpriteAnimations_Stalfos_25.s"
-gUnk_080CFAA6:: @ 080CFAA6
- .incbin "stalfos/gUnk_080CFAA6.bin"
+gSpriteAnimations_Stalfos_26:: @ 080CFAA6
+ .include "animations/gSpriteAnimations_Stalfos_26.s"
-gUnk_080CFABA:: @ 080CFABA
- .incbin "stalfos/gUnk_080CFABA.bin"
+gSpriteAnimations_Stalfos_27:: @ 080CFABA
+ .include "animations/gSpriteAnimations_Stalfos_27.s"
-gUnk_080CFACE:: @ 080CFACE
- .incbin "stalfos/gUnk_080CFACE.bin"
+gSpriteAnimations_Stalfos_28:: @ 080CFACE
+ .include "animations/gSpriteAnimations_Stalfos_28.s"
-gUnk_080CFAD2:: @ 080CFAD2
- .incbin "stalfos/gUnk_080CFAD2.bin"
+gSpriteAnimations_Stalfos_29:: @ 080CFAD2
+ .include "animations/gSpriteAnimations_Stalfos_29.s"
-gUnk_080CFAD6:: @ 080CFAD6
- .incbin "stalfos/gUnk_080CFAD6.bin"
+gSpriteAnimations_Stalfos_30:: @ 080CFAD6
+ .include "animations/gSpriteAnimations_Stalfos_30.s"
-gUnk_080CFADA:: @ 080CFADA
- .incbin "stalfos/gUnk_080CFADA.bin"
+gSpriteAnimations_Stalfos_31:: @ 080CFADA
+ .include "animations/gSpriteAnimations_Stalfos_31.s"
-gUnk_080CFADE:: @ 080CFADE
- .incbin "stalfos/gUnk_080CFADE.bin"
+gSpriteAnimations_Stalfos_32:: @ 080CFADE
+ .include "animations/gSpriteAnimations_Stalfos_32.s"
-gUnk_080CFAE2:: @ 080CFAE2
- .incbin "stalfos/gUnk_080CFAE2.bin"
+gSpriteAnimations_Stalfos_33:: @ 080CFAE2
+ .include "animations/gSpriteAnimations_Stalfos_33.s"
-gUnk_080CFAE6:: @ 080CFAE6
- .incbin "stalfos/gUnk_080CFAE6.bin"
+gSpriteAnimations_Stalfos_34:: @ 080CFAE6
+ .include "animations/gSpriteAnimations_Stalfos_34.s"
-gUnk_080CFAEA:: @ 080CFAEA
- .incbin "stalfos/gUnk_080CFAEA.bin"
+gSpriteAnimations_Stalfos_35:: @ 080CFAEA
+ .include "animations/gSpriteAnimations_Stalfos_35.s"
gSpriteAnimations_Stalfos:: @ 080CFAF0
- .4byte gUnk_080CF942
- .4byte gUnk_080CF946
- .4byte gUnk_080CF94A
- .4byte gUnk_080CF94E
- .4byte gUnk_080CF952
- .4byte gUnk_080CF96B
- .4byte gUnk_080CF984
- .4byte gUnk_080CF99D
- .4byte gUnk_080CF9B6
- .4byte gUnk_080CF9BA
- .4byte gUnk_080CF9BE
- .4byte gUnk_080CF9C2
- .4byte gUnk_080CF9C6
- .4byte gUnk_080CF9D7
- .4byte gUnk_080CF9E8
- .4byte gUnk_080CF9F9
- .4byte gUnk_080CFA0A
- .4byte gUnk_080CFA0E
- .4byte gUnk_080CFA12
- .4byte gUnk_080CFA16
- .4byte gUnk_080CFA1A
- .4byte gUnk_080CFA33
- .4byte gUnk_080CFA4C
- .4byte gUnk_080CFA65
- .4byte gUnk_080CFA7E
- .4byte gUnk_080CFA92
- .4byte gUnk_080CFAA6
- .4byte gUnk_080CFABA
- .4byte gUnk_080CFACE
- .4byte gUnk_080CFAD2
- .4byte gUnk_080CFAD6
- .4byte gUnk_080CFADA
- .4byte gUnk_080CFADE
- .4byte gUnk_080CFAE2
- .4byte gUnk_080CFAE6
- .4byte gUnk_080CFAEA
+ .4byte gSpriteAnimations_Stalfos_0
+ .4byte gSpriteAnimations_Stalfos_1
+ .4byte gSpriteAnimations_Stalfos_2
+ .4byte gSpriteAnimations_Stalfos_3
+ .4byte gSpriteAnimations_Stalfos_4
+ .4byte gSpriteAnimations_Stalfos_5
+ .4byte gSpriteAnimations_Stalfos_6
+ .4byte gSpriteAnimations_Stalfos_7
+ .4byte gSpriteAnimations_Stalfos_8
+ .4byte gSpriteAnimations_Stalfos_9
+ .4byte gSpriteAnimations_Stalfos_10
+ .4byte gSpriteAnimations_Stalfos_11
+ .4byte gSpriteAnimations_Stalfos_12
+ .4byte gSpriteAnimations_Stalfos_13
+ .4byte gSpriteAnimations_Stalfos_14
+ .4byte gSpriteAnimations_Stalfos_15
+ .4byte gSpriteAnimations_Stalfos_16
+ .4byte gSpriteAnimations_Stalfos_17
+ .4byte gSpriteAnimations_Stalfos_18
+ .4byte gSpriteAnimations_Stalfos_19
+ .4byte gSpriteAnimations_Stalfos_20
+ .4byte gSpriteAnimations_Stalfos_21
+ .4byte gSpriteAnimations_Stalfos_22
+ .4byte gSpriteAnimations_Stalfos_23
+ .4byte gSpriteAnimations_Stalfos_24
+ .4byte gSpriteAnimations_Stalfos_25
+ .4byte gSpriteAnimations_Stalfos_26
+ .4byte gSpriteAnimations_Stalfos_27
+ .4byte gSpriteAnimations_Stalfos_28
+ .4byte gSpriteAnimations_Stalfos_29
+ .4byte gSpriteAnimations_Stalfos_30
+ .4byte gSpriteAnimations_Stalfos_31
+ .4byte gSpriteAnimations_Stalfos_32
+ .4byte gSpriteAnimations_Stalfos_33
+ .4byte gSpriteAnimations_Stalfos_34
+ .4byte gSpriteAnimations_Stalfos_35
.4byte 00000000
diff --git a/data/animations/enemy/tektite.s b/data/animations/enemy/tektite.s
index 59b1aaed..59d00807 100644
--- a/data/animations/enemy/tektite.s
+++ b/data/animations/enemy/tektite.s
@@ -6,25 +6,25 @@
-gUnk_080CDEFC:: @ 080CDEFC
- .incbin "tektite/gUnk_080CDEFC.bin"
+gSpriteAnimations_Tektite_0:: @ 080CDEFC
+ .include "animations/gSpriteAnimations_Tektite_0.s"
-gUnk_080CDF09:: @ 080CDF09
- .incbin "tektite/gUnk_080CDF09.bin"
+gSpriteAnimations_Tektite_1:: @ 080CDF09
+ .include "animations/gSpriteAnimations_Tektite_1.s"
-gUnk_080CDF1A:: @ 080CDF1A
- .incbin "tektite/gUnk_080CDF1A.bin"
+gSpriteAnimations_Tektite_2:: @ 080CDF1A
+ .include "animations/gSpriteAnimations_Tektite_2.s"
-gUnk_080CDF27:: @ 080CDF27
- .incbin "tektite/gUnk_080CDF27.bin"
+gSpriteAnimations_Tektite_3:: @ 080CDF27
+ .include "animations/gSpriteAnimations_Tektite_3.s"
-gUnk_080CDF33:: @ 080CDF33
- .incbin "tektite/gUnk_080CDF33.bin"
+gSpriteAnimations_Tektite_4:: @ 080CDF33
+ .include "animations/gSpriteAnimations_Tektite_4.s"
gSpriteAnimations_Tektite:: @ 080CDF38
- .4byte gUnk_080CDEFC
- .4byte gUnk_080CDF09
- .4byte gUnk_080CDF1A
- .4byte gUnk_080CDF27
- .4byte gUnk_080CDF33
+ .4byte gSpriteAnimations_Tektite_0
+ .4byte gSpriteAnimations_Tektite_1
+ .4byte gSpriteAnimations_Tektite_2
+ .4byte gSpriteAnimations_Tektite_3
+ .4byte gSpriteAnimations_Tektite_4
.4byte 00000000
diff --git a/data/animations/enemy/vaatiArm.s b/data/animations/enemy/vaatiArm.s
index b4192456..e98185cd 100644
--- a/data/animations/enemy/vaatiArm.s
+++ b/data/animations/enemy/vaatiArm.s
@@ -4,89 +4,89 @@
.section .rodata
@ .align 2
-gUnk_080D141E:: @ 080D141E
- .incbin "vaatiArm/gUnk_080D141E.bin"
+gSpriteAnimations_VaatiArm_0:: @ 080D141E
+ .include "animations/gSpriteAnimations_VaatiArm_0.s"
-gUnk_080D142B:: @ 080D142B
- .incbin "vaatiArm/gUnk_080D142B.bin"
+gSpriteAnimations_VaatiArm_1:: @ 080D142B
+ .include "animations/gSpriteAnimations_VaatiArm_1.s"
-gUnk_080D1430:: @ 080D1430
- .incbin "vaatiArm/gUnk_080D1430.bin"
+gSpriteAnimations_VaatiArm_2:: @ 080D1430
+ .include "animations/gSpriteAnimations_VaatiArm_2.s"
-gUnk_080D1435:: @ 080D1435
- .incbin "vaatiArm/gUnk_080D1435.bin"
+gSpriteAnimations_VaatiArm_3:: @ 080D1435
+ .include "animations/gSpriteAnimations_VaatiArm_3.s"
-gUnk_080D143A:: @ 080D143A
- .incbin "vaatiArm/gUnk_080D143A.bin"
+gSpriteAnimations_VaatiArm_4:: @ 080D143A
+ .include "animations/gSpriteAnimations_VaatiArm_4.s"
-gUnk_080D143F:: @ 080D143F
- .incbin "vaatiArm/gUnk_080D143F.bin"
+gSpriteAnimations_VaatiArm_5:: @ 080D143F
+ .include "animations/gSpriteAnimations_VaatiArm_5.s"
-gUnk_080D1444:: @ 080D1444
- .incbin "vaatiArm/gUnk_080D1444.bin"
+gSpriteAnimations_VaatiArm_6:: @ 080D1444
+ .include "animations/gSpriteAnimations_VaatiArm_6.s"
-gUnk_080D1449:: @ 080D1449
- .incbin "vaatiArm/gUnk_080D1449.bin"
+gSpriteAnimations_VaatiArm_7:: @ 080D1449
+ .include "animations/gSpriteAnimations_VaatiArm_7.s"
-gUnk_080D144E:: @ 080D144E
- .incbin "vaatiArm/gUnk_080D144E.bin"
+gSpriteAnimations_VaatiArm_8:: @ 080D144E
+ .include "animations/gSpriteAnimations_VaatiArm_8.s"
-gUnk_080D1453:: @ 080D1453
- .incbin "vaatiArm/gUnk_080D1453.bin"
+gSpriteAnimations_VaatiArm_9:: @ 080D1453
+ .include "animations/gSpriteAnimations_VaatiArm_9.s"
-gUnk_080D1458:: @ 080D1458
- .incbin "vaatiArm/gUnk_080D1458.bin"
+gSpriteAnimations_VaatiArm_10:: @ 080D1458
+ .include "animations/gSpriteAnimations_VaatiArm_10.s"
-gUnk_080D145D:: @ 080D145D
- .incbin "vaatiArm/gUnk_080D145D.bin"
+gSpriteAnimations_VaatiArm_11:: @ 080D145D
+ .include "animations/gSpriteAnimations_VaatiArm_11.s"
-gUnk_080D1462:: @ 080D1462
- .incbin "vaatiArm/gUnk_080D1462.bin"
+gSpriteAnimations_VaatiArm_12:: @ 080D1462
+ .include "animations/gSpriteAnimations_VaatiArm_12.s"
-gUnk_080D1467:: @ 080D1467
- .incbin "vaatiArm/gUnk_080D1467.bin"
+gSpriteAnimations_VaatiArm_13:: @ 080D1467
+ .include "animations/gSpriteAnimations_VaatiArm_13.s"
-gUnk_080D1488:: @ 080D1488
- .incbin "vaatiArm/gUnk_080D1488.bin"
+gSpriteAnimations_VaatiArm_14:: @ 080D1488
+ .include "animations/gSpriteAnimations_VaatiArm_14.s"
-gUnk_080D148D:: @ 080D148D
- .incbin "vaatiArm/gUnk_080D148D.bin"
+gSpriteAnimations_VaatiArm_15:: @ 080D148D
+ .include "animations/gSpriteAnimations_VaatiArm_15.s"
-gUnk_080D14DE:: @ 080D14DE
- .incbin "vaatiArm/gUnk_080D14DE.bin"
+gSpriteAnimations_VaatiArm_16:: @ 080D14DE
+ .include "animations/gSpriteAnimations_VaatiArm_16.s"
-gUnk_080D14F3:: @ 080D14F3
- .incbin "vaatiArm/gUnk_080D14F3.bin"
+gSpriteAnimations_VaatiArm_17:: @ 080D14F3
+ .include "animations/gSpriteAnimations_VaatiArm_17.s"
-gUnk_080D150C:: @ 080D150C
- .incbin "vaatiArm/gUnk_080D150C.bin"
+gSpriteAnimations_VaatiArm_18:: @ 080D150C
+ .include "animations/gSpriteAnimations_VaatiArm_18.s"
-gUnk_080D1525:: @ 080D1525
- .incbin "vaatiArm/gUnk_080D1525.bin"
+gSpriteAnimations_VaatiArm_19:: @ 080D1525
+ .include "animations/gSpriteAnimations_VaatiArm_19.s"
-gUnk_080D152A:: @ 080D152A
- .incbin "vaatiArm/gUnk_080D152A.bin"
+gSpriteAnimations_VaatiArm_20:: @ 080D152A
+ .include "animations/gSpriteAnimations_VaatiArm_20.s"
gSpriteAnimations_VaatiArm:: @ 080D1530
- .4byte gUnk_080D141E
- .4byte gUnk_080D142B
- .4byte gUnk_080D1430
- .4byte gUnk_080D1435
- .4byte gUnk_080D143A
- .4byte gUnk_080D143F
- .4byte gUnk_080D1444
- .4byte gUnk_080D1449
- .4byte gUnk_080D144E
- .4byte gUnk_080D1453
- .4byte gUnk_080D1458
- .4byte gUnk_080D145D
- .4byte gUnk_080D1462
- .4byte gUnk_080D1467
- .4byte gUnk_080D1488
- .4byte gUnk_080D148D
- .4byte gUnk_080D14DE
- .4byte gUnk_080D14F3
- .4byte gUnk_080D150C
- .4byte gUnk_080D1525
- .4byte gUnk_080D152A
+ .4byte gSpriteAnimations_VaatiArm_0
+ .4byte gSpriteAnimations_VaatiArm_1
+ .4byte gSpriteAnimations_VaatiArm_2
+ .4byte gSpriteAnimations_VaatiArm_3
+ .4byte gSpriteAnimations_VaatiArm_4
+ .4byte gSpriteAnimations_VaatiArm_5
+ .4byte gSpriteAnimations_VaatiArm_6
+ .4byte gSpriteAnimations_VaatiArm_7
+ .4byte gSpriteAnimations_VaatiArm_8
+ .4byte gSpriteAnimations_VaatiArm_9
+ .4byte gSpriteAnimations_VaatiArm_10
+ .4byte gSpriteAnimations_VaatiArm_11
+ .4byte gSpriteAnimations_VaatiArm_12
+ .4byte gSpriteAnimations_VaatiArm_13
+ .4byte gSpriteAnimations_VaatiArm_14
+ .4byte gSpriteAnimations_VaatiArm_15
+ .4byte gSpriteAnimations_VaatiArm_16
+ .4byte gSpriteAnimations_VaatiArm_17
+ .4byte gSpriteAnimations_VaatiArm_18
+ .4byte gSpriteAnimations_VaatiArm_19
+ .4byte gSpriteAnimations_VaatiArm_20
.4byte 00000000
diff --git a/data/animations/enemy/vaatiBall.s b/data/animations/enemy/vaatiBall.s
index a5fdb8f3..26dc4186 100644
--- a/data/animations/enemy/vaatiBall.s
+++ b/data/animations/enemy/vaatiBall.s
@@ -4,17 +4,17 @@
.section .rodata
.align 2
-gUnk_080D1638:: @ 080D1638
- .incbin "vaatiBall/gUnk_080D1638.bin"
+gSpriteAnimations_VaatiBall_0:: @ 080D1638
+ .include "animations/gSpriteAnimations_VaatiBall_0.s"
-gUnk_080D163D:: @ 080D163D
- .incbin "vaatiBall/gUnk_080D163D.bin"
+gSpriteAnimations_VaatiBall_1:: @ 080D163D
+ .include "animations/gSpriteAnimations_VaatiBall_1.s"
-gUnk_080D166E:: @ 080D166E
- .incbin "vaatiBall/gUnk_080D166E.bin"
+gSpriteAnimations_VaatiBall_2:: @ 080D166E
+ .include "animations/gSpriteAnimations_VaatiBall_2.s"
gSpriteAnimations_VaatiBall:: @ 080D1694
- .4byte gUnk_080D1638
- .4byte gUnk_080D163D
- .4byte gUnk_080D166E
+ .4byte gSpriteAnimations_VaatiBall_0
+ .4byte gSpriteAnimations_VaatiBall_1
+ .4byte gSpriteAnimations_VaatiBall_2
.4byte 00000000
diff --git a/data/animations/enemy/vaatiEyesMacro.s b/data/animations/enemy/vaatiEyesMacro.s
index 04b728e0..01248ba8 100644
--- a/data/animations/enemy/vaatiEyesMacro.s
+++ b/data/animations/enemy/vaatiEyesMacro.s
@@ -6,13 +6,13 @@
-gUnk_080CDEA0:: @ 080CDEA0
- .incbin "vaatiEyesMacro/gUnk_080CDEA0.bin"
+gSpriteAnimations_VaatiEyesMacro_0:: @ 080CDEA0
+ .include "animations/gSpriteAnimations_VaatiEyesMacro_0.s"
-gUnk_080CDEB1:: @ 080CDEB1
- .incbin "vaatiEyesMacro/gUnk_080CDEB1.bin"
+gSpriteAnimations_VaatiEyesMacro_1:: @ 080CDEB1
+ .include "animations/gSpriteAnimations_VaatiEyesMacro_1.s"
gSpriteAnimations_VaatiEyesMacro:: @ 080CDEC4
- .4byte gUnk_080CDEA0
- .4byte gUnk_080CDEB1
+ .4byte gSpriteAnimations_VaatiEyesMacro_0
+ .4byte gSpriteAnimations_VaatiEyesMacro_1
.4byte 00000000
diff --git a/data/animations/enemy/vaatiProjectile.s b/data/animations/enemy/vaatiProjectile.s
index 9235a99e..17dbedf4 100644
--- a/data/animations/enemy/vaatiProjectile.s
+++ b/data/animations/enemy/vaatiProjectile.s
@@ -4,17 +4,17 @@
.section .rodata
.align 2
-gUnk_080D0688:: @ 080D0688
- .incbin "vaatiProjectile/gUnk_080D0688.bin"
+gSpriteAnimations_VaatiProjectile_0:: @ 080D0688
+ .include "animations/gSpriteAnimations_VaatiProjectile_0.s"
-gUnk_080D06A1:: @ 080D06A1
- .incbin "vaatiProjectile/gUnk_080D06A1.bin"
+gSpriteAnimations_VaatiProjectile_1:: @ 080D06A1
+ .include "animations/gSpriteAnimations_VaatiProjectile_1.s"
-gUnk_080D06B2:: @ 080D06B2
- .incbin "vaatiProjectile/gUnk_080D06B2.bin"
+gSpriteAnimations_VaatiProjectile_2:: @ 080D06B2
+ .include "animations/gSpriteAnimations_VaatiProjectile_2.s"
gSpriteAnimations_VaatiProjectile:: @ 080D06D0
- .4byte gUnk_080D0688
- .4byte gUnk_080D06A1
- .4byte gUnk_080D06B2
+ .4byte gSpriteAnimations_VaatiProjectile_0
+ .4byte gSpriteAnimations_VaatiProjectile_1
+ .4byte gSpriteAnimations_VaatiProjectile_2
.4byte 00000000
diff --git a/data/animations/enemy/vaatiRebornEnemy.s b/data/animations/enemy/vaatiRebornEnemy.s
index 5c2a099f..12799c59 100644
--- a/data/animations/enemy/vaatiRebornEnemy.s
+++ b/data/animations/enemy/vaatiRebornEnemy.s
@@ -4,75 +4,75 @@
.section .rodata
@ .align 2
-gUnk_080D04D7:: @ 080D04D7
- .incbin "vaatiRebornEnemy/gUnk_080D04D7.bin"
+gSpriteAnimations_VaatiRebornEnemy_0_0:: @ 080D04D7
+ .include "animations/gSpriteAnimations_VaatiRebornEnemy_0_0.s"
-gUnk_080D04E8:: @ 080D04E8
- .incbin "vaatiRebornEnemy/gUnk_080D04E8.bin"
+gSpriteAnimations_VaatiRebornEnemy_0_1:: @ 080D04E8
+ .include "animations/gSpriteAnimations_VaatiRebornEnemy_0_1.s"
-gUnk_080D0501:: @ 080D0501
- .incbin "vaatiRebornEnemy/gUnk_080D0501.bin"
+gSpriteAnimations_VaatiRebornEnemy_0_2:: @ 080D0501
+ .include "animations/gSpriteAnimations_VaatiRebornEnemy_0_2.s"
-gUnk_080D050D:: @ 080D050D
- .incbin "vaatiRebornEnemy/gUnk_080D050D.bin"
+gSpriteAnimations_VaatiRebornEnemy_0_3:: @ 080D050D
+ .include "animations/gSpriteAnimations_VaatiRebornEnemy_0_3.s"
-gUnk_080D0531:: @ 080D0531
- .incbin "vaatiRebornEnemy/gUnk_080D0531.bin"
+gSpriteAnimations_VaatiRebornEnemy_0_4:: @ 080D0531
+ .include "animations/gSpriteAnimations_VaatiRebornEnemy_0_4.s"
gSpriteAnimations_VaatiRebornEnemy_0:: @ 080D0558
- .4byte gUnk_080D04D7
- .4byte gUnk_080D04E8
- .4byte gUnk_080D0501
- .4byte gUnk_080D050D
- .4byte gUnk_080D0531
+ .4byte gSpriteAnimations_VaatiRebornEnemy_0_0
+ .4byte gSpriteAnimations_VaatiRebornEnemy_0_1
+ .4byte gSpriteAnimations_VaatiRebornEnemy_0_2
+ .4byte gSpriteAnimations_VaatiRebornEnemy_0_3
+ .4byte gSpriteAnimations_VaatiRebornEnemy_0_4
.4byte 00000000
-gUnk_080D0570:: @ 080D0570
- .incbin "vaatiRebornEnemy/gUnk_080D0570.bin"
+gSpriteAnimations_VaatiRebornEnemy_1_0:: @ 080D0570
+ .include "animations/gSpriteAnimations_VaatiRebornEnemy_1_0.s"
-gUnk_080D0575:: @ 080D0575
- .incbin "vaatiRebornEnemy/gUnk_080D0575.bin"
+gSpriteAnimations_VaatiRebornEnemy_1_1:: @ 080D0575
+ .include "animations/gSpriteAnimations_VaatiRebornEnemy_1_1.s"
-gUnk_080D0585:: @ 080D0585
- .incbin "vaatiRebornEnemy/gUnk_080D0585.bin"
+gSpriteAnimations_VaatiRebornEnemy_1_2:: @ 080D0585
+ .include "animations/gSpriteAnimations_VaatiRebornEnemy_1_2.s"
gSpriteAnimations_VaatiRebornEnemy_1:: @ 080D058C
- .4byte gUnk_080D0570
- .4byte gUnk_080D0575
- .4byte gUnk_080D0585
+ .4byte gSpriteAnimations_VaatiRebornEnemy_1_0
+ .4byte gSpriteAnimations_VaatiRebornEnemy_1_1
+ .4byte gSpriteAnimations_VaatiRebornEnemy_1_2
.4byte 00000000
-gUnk_080D059C:: @ 080D059C
- .incbin "vaatiRebornEnemy/gUnk_080D059C.bin"
+gSpriteAnimations_VaatiRebornEnemy_2_0:: @ 080D059C
+ .include "animations/gSpriteAnimations_VaatiRebornEnemy_2_0.s"
-gUnk_080D05AD:: @ 080D05AD
- .incbin "vaatiRebornEnemy/gUnk_080D05AD.bin"
+gSpriteAnimations_VaatiRebornEnemy_2_2:: @ 080D05AD
+ .include "animations/gSpriteAnimations_VaatiRebornEnemy_2_2.s"
-gUnk_080D05BE:: @ 080D05BE
- .incbin "vaatiRebornEnemy/gUnk_080D05BE.bin"
+gSpriteAnimations_VaatiRebornEnemy_2_1:: @ 080D05BE
+ .include "animations/gSpriteAnimations_VaatiRebornEnemy_2_1.s"
-gUnk_080D05CF:: @ 080D05CF
- .incbin "vaatiRebornEnemy/gUnk_080D05CF.bin"
+gSpriteAnimations_VaatiRebornEnemy_2_3:: @ 080D05CF
+ .include "animations/gSpriteAnimations_VaatiRebornEnemy_2_3.s"
gSpriteAnimations_VaatiRebornEnemy_2:: @ 080D05E0
- .4byte gUnk_080D059C
- .4byte gUnk_080D05BE
- .4byte gUnk_080D05AD
- .4byte gUnk_080D05CF
+ .4byte gSpriteAnimations_VaatiRebornEnemy_2_0
+ .4byte gSpriteAnimations_VaatiRebornEnemy_2_1
+ .4byte gSpriteAnimations_VaatiRebornEnemy_2_2
+ .4byte gSpriteAnimations_VaatiRebornEnemy_2_3
.4byte 00000000
-gUnk_080D05F4:: @ 080D05F4
- .incbin "vaatiRebornEnemy/gUnk_080D05F4.bin"
+gSpriteAnimations_VaatiRebornEnemy_3_0:: @ 080D05F4
+ .include "animations/gSpriteAnimations_VaatiRebornEnemy_3_0.s"
-gUnk_080D0609:: @ 080D0609
- .incbin "vaatiRebornEnemy/gUnk_080D0609.bin"
+gSpriteAnimations_VaatiRebornEnemy_3_1:: @ 080D0609
+ .include "animations/gSpriteAnimations_VaatiRebornEnemy_3_1.s"
-gUnk_080D061E:: @ 080D061E
- .incbin "vaatiRebornEnemy/gUnk_080D061E.bin"
+gSpriteAnimations_VaatiRebornEnemy_3_3:: @ 080D061E
+ .include "animations/gSpriteAnimations_VaatiRebornEnemy_3_3.s"
gSpriteAnimations_VaatiRebornEnemy_3:: @ 080D0634
- .4byte gUnk_080D05F4
- .4byte gUnk_080D0609
- .4byte gUnk_080D05F4
- .4byte gUnk_080D061E
+ .4byte gSpriteAnimations_VaatiRebornEnemy_3_0
+ .4byte gSpriteAnimations_VaatiRebornEnemy_3_1
+ .4byte gSpriteAnimations_VaatiRebornEnemy_3_0
+ .4byte gSpriteAnimations_VaatiRebornEnemy_3_3
.4byte 00000000
diff --git a/data/animations/enemy/vaatiTransfigured.s b/data/animations/enemy/vaatiTransfigured.s
index 805fa8ed..8e776ade 100644
--- a/data/animations/enemy/vaatiTransfigured.s
+++ b/data/animations/enemy/vaatiTransfigured.s
@@ -4,106 +4,106 @@
.section .rodata
.align 2
-gUnk_080D0BA4:: @ 080D0BA4
- .incbin "vaatiTransfigured/gUnk_080D0BA4.bin"
+gSpriteAnimations_VaatiTransfigured_0_0:: @ 080D0BA4
+ .include "animations/gSpriteAnimations_VaatiTransfigured_0_0.s"
-gUnk_080D0BB5:: @ 080D0BB5
- .incbin "vaatiTransfigured/gUnk_080D0BB5.bin"
+gSpriteAnimations_VaatiTransfigured_0_4:: @ 080D0BB5
+ .include "animations/gSpriteAnimations_VaatiTransfigured_0_4.s"
gSpriteAnimations_VaatiTransfigured_0:: @ 080D0BC4
- .4byte gUnk_080D0BA4
- .4byte gUnk_080D0BA4
- .4byte gUnk_080D0BA4
- .4byte gUnk_080D0BA4
- .4byte gUnk_080D0BB5
+ .4byte gSpriteAnimations_VaatiTransfigured_0_0
+ .4byte gSpriteAnimations_VaatiTransfigured_0_0
+ .4byte gSpriteAnimations_VaatiTransfigured_0_0
+ .4byte gSpriteAnimations_VaatiTransfigured_0_0
+ .4byte gSpriteAnimations_VaatiTransfigured_0_4
.4byte 00000000
-gUnk_080D0BDC:: @ 080D0BDC
- .incbin "vaatiTransfigured/gUnk_080D0BDC.bin"
+gSpriteAnimations_VaatiTransfigured_2_0:: @ 080D0BDC
+ .include "animations/gSpriteAnimations_VaatiTransfigured_2_0.s"
-gUnk_080D0BE1:: @ 080D0BE1
- .incbin "vaatiTransfigured/gUnk_080D0BE1.bin"
+gSpriteAnimations_VaatiTransfigured_2_4:: @ 080D0BE1
+ .include "animations/gSpriteAnimations_VaatiTransfigured_2_4.s"
-gUnk_080D0BED:: @ 080D0BED
- .incbin "vaatiTransfigured/gUnk_080D0BED.bin"
+gSpriteAnimations_VaatiTransfigured_2_5:: @ 080D0BED
+ .include "animations/gSpriteAnimations_VaatiTransfigured_2_5.s"
-gUnk_080D0BF2:: @ 080D0BF2
- .incbin "vaatiTransfigured/gUnk_080D0BF2.bin"
+gSpriteAnimations_VaatiTransfigured_2_6:: @ 080D0BF2
+ .include "animations/gSpriteAnimations_VaatiTransfigured_2_6.s"
-gUnk_080D0BF7:: @ 080D0BF7
- .incbin "vaatiTransfigured/gUnk_080D0BF7.bin"
+gSpriteAnimations_VaatiTransfigured_2_7:: @ 080D0BF7
+ .include "animations/gSpriteAnimations_VaatiTransfigured_2_7.s"
-gUnk_080D0BFC:: @ 080D0BFC
- .incbin "vaatiTransfigured/gUnk_080D0BFC.bin"
+gSpriteAnimations_VaatiTransfigured_2_8:: @ 080D0BFC
+ .include "animations/gSpriteAnimations_VaatiTransfigured_2_8.s"
gSpriteAnimations_VaatiTransfigured_2:: @ 080D0C0C
- .4byte gUnk_080D0BDC
- .4byte gUnk_080D0BDC
- .4byte gUnk_080D0BDC
- .4byte gUnk_080D0BDC
- .4byte gUnk_080D0BE1
- .4byte gUnk_080D0BED
- .4byte gUnk_080D0BF2
- .4byte gUnk_080D0BF7
- .4byte gUnk_080D0BFC
+ .4byte gSpriteAnimations_VaatiTransfigured_2_0
+ .4byte gSpriteAnimations_VaatiTransfigured_2_0
+ .4byte gSpriteAnimations_VaatiTransfigured_2_0
+ .4byte gSpriteAnimations_VaatiTransfigured_2_0
+ .4byte gSpriteAnimations_VaatiTransfigured_2_4
+ .4byte gSpriteAnimations_VaatiTransfigured_2_5
+ .4byte gSpriteAnimations_VaatiTransfigured_2_6
+ .4byte gSpriteAnimations_VaatiTransfigured_2_7
+ .4byte gSpriteAnimations_VaatiTransfigured_2_8
.4byte 00000000
-gUnk_080D0C34:: @ 080D0C34
- .incbin "vaatiTransfigured/gUnk_080D0C34.bin"
+gSpriteAnimations_VaatiTransfigured_1_0:: @ 080D0C34
+ .include "animations/gSpriteAnimations_VaatiTransfigured_1_0.s"
-gUnk_080D0C55:: @ 080D0C55
- .incbin "vaatiTransfigured/gUnk_080D0C55.bin"
+gSpriteAnimations_VaatiTransfigured_1_1:: @ 080D0C55
+ .include "animations/gSpriteAnimations_VaatiTransfigured_1_1.s"
gSpriteAnimations_VaatiTransfigured_1:: @ 080D0C88
- .4byte gUnk_080D0C34
- .4byte gUnk_080D0C55
- .4byte gUnk_080D0C34
- .4byte gUnk_080D0C34
- .4byte gUnk_080D0C34
+ .4byte gSpriteAnimations_VaatiTransfigured_1_0
+ .4byte gSpriteAnimations_VaatiTransfigured_1_1
+ .4byte gSpriteAnimations_VaatiTransfigured_1_0
+ .4byte gSpriteAnimations_VaatiTransfigured_1_0
+ .4byte gSpriteAnimations_VaatiTransfigured_1_0
.4byte 00000000
-gUnk_080D0CA0:: @ 080D0CA0
- .incbin "vaatiTransfigured/gUnk_080D0CA0.bin"
+gSpriteAnimations_VaatiTransfigured_3_0:: @ 080D0CA0
+ .include "animations/gSpriteAnimations_VaatiTransfigured_3_0.s"
-gUnk_080D0CA5:: @ 080D0CA5
- .incbin "vaatiTransfigured/gUnk_080D0CA5.bin"
+gSpriteAnimations_VaatiTransfigured_3_2:: @ 080D0CA5
+ .include "animations/gSpriteAnimations_VaatiTransfigured_3_2.s"
-gUnk_080D0CD5:: @ 080D0CD5
- .incbin "vaatiTransfigured/gUnk_080D0CD5.bin"
+gSpriteAnimations_VaatiTransfigured_3_3:: @ 080D0CD5
+ .include "animations/gSpriteAnimations_VaatiTransfigured_3_3.s"
-gUnk_080D0CE6:: @ 080D0CE6
- .incbin "vaatiTransfigured/gUnk_080D0CE6.bin"
+gSpriteAnimations_VaatiTransfigured_3_4:: @ 080D0CE6
+ .include "animations/gSpriteAnimations_VaatiTransfigured_3_4.s"
gSpriteAnimations_VaatiTransfigured_3:: @ 080D0CF4
- .4byte gUnk_080D0CA0
- .4byte gUnk_080D0CA0
- .4byte gUnk_080D0CA5
- .4byte gUnk_080D0CD5
- .4byte gUnk_080D0CE6
+ .4byte gSpriteAnimations_VaatiTransfigured_3_0
+ .4byte gSpriteAnimations_VaatiTransfigured_3_0
+ .4byte gSpriteAnimations_VaatiTransfigured_3_2
+ .4byte gSpriteAnimations_VaatiTransfigured_3_3
+ .4byte gSpriteAnimations_VaatiTransfigured_3_4
.4byte 00000000
-gUnk_080D0D0C:: @ 080D0D0C
- .incbin "vaatiTransfigured/gUnk_080D0D0C.bin"
+gSpriteAnimations_VaatiTransfigured_4_0:: @ 080D0D0C
+ .include "animations/gSpriteAnimations_VaatiTransfigured_4_0.s"
gSpriteAnimations_VaatiTransfigured_4:: @ 080D0D40
- .4byte gUnk_080D0D0C
- .incbin "vaatiTransfigured/gSpriteAnimations_VaatiTransfigured_4.bin"
+ .4byte gSpriteAnimations_VaatiTransfigured_4_0
+ .include "animations/gSpriteAnimations_VaatiTransfigured_4.s"
-gUnk_080D0D48:: @ 080D0D48
- .incbin "vaatiTransfigured/gUnk_080D0D48.bin"
+gSpriteAnimations_VaatiTransfigured_5_0:: @ 080D0D48
+ .include "animations/gSpriteAnimations_VaatiTransfigured_5_0.s"
-gUnk_080D0D78:: @ 080D0D78
- .incbin "vaatiTransfigured/gUnk_080D0D78.bin"
+gSpriteAnimations_VaatiTransfigured_5_1:: @ 080D0D78
+ .include "animations/gSpriteAnimations_VaatiTransfigured_5_1.s"
-gUnk_080D0D91:: @ 080D0D91
- .incbin "vaatiTransfigured/gUnk_080D0D91.bin"
+gSpriteAnimations_VaatiTransfigured_5_2:: @ 080D0D91
+ .include "animations/gSpriteAnimations_VaatiTransfigured_5_2.s"
-gUnk_080D0DA1:: @ 080D0DA1
- .incbin "vaatiTransfigured/gUnk_080D0DA1.bin"
+gSpriteAnimations_VaatiTransfigured_5_3:: @ 080D0DA1
+ .include "animations/gSpriteAnimations_VaatiTransfigured_5_3.s"
gSpriteAnimations_VaatiTransfigured_5:: @ 080D0DB0
- .4byte gUnk_080D0D48
- .4byte gUnk_080D0D78
- .4byte gUnk_080D0D91
- .4byte gUnk_080D0DA1
+ .4byte gSpriteAnimations_VaatiTransfigured_5_0
+ .4byte gSpriteAnimations_VaatiTransfigured_5_1
+ .4byte gSpriteAnimations_VaatiTransfigured_5_2
+ .4byte gSpriteAnimations_VaatiTransfigured_5_3
.4byte 00000000
diff --git a/data/animations/enemy/vaatiTransfiguredEye.s b/data/animations/enemy/vaatiTransfiguredEye.s
index 90368ee6..dab1e9f0 100644
--- a/data/animations/enemy/vaatiTransfiguredEye.s
+++ b/data/animations/enemy/vaatiTransfiguredEye.s
@@ -4,63 +4,63 @@
.section .rodata
.align 2
-gUnk_080D18C4:: @ 080D18C4
- .incbin "enemy5A/gUnk_080D18C4.bin"
+gSpriteAnimations_Enemy5A_0:: @ 080D18C4
+ .include "animations/gSpriteAnimations_Enemy5A_0.s"
-gUnk_080D18C9:: @ 080D18C9
- .incbin "enemy5A/gUnk_080D18C9.bin"
+gSpriteAnimations_Enemy5A_1:: @ 080D18C9
+ .include "animations/gSpriteAnimations_Enemy5A_1.s"
-gUnk_080D18DA:: @ 080D18DA
- .incbin "enemy5A/gUnk_080D18DA.bin"
+gSpriteAnimations_Enemy5A_2:: @ 080D18DA
+ .include "animations/gSpriteAnimations_Enemy5A_2.s"
-gUnk_080D18F3:: @ 080D18F3
- .incbin "enemy5A/gUnk_080D18F3.bin"
+gSpriteAnimations_Enemy5A_3:: @ 080D18F3
+ .include "animations/gSpriteAnimations_Enemy5A_3.s"
-gUnk_080D1914:: @ 080D1914
- .incbin "enemy5A/gUnk_080D1914.bin"
+gSpriteAnimations_Enemy5A_4:: @ 080D1914
+ .include "animations/gSpriteAnimations_Enemy5A_4.s"
-gUnk_080D191D:: @ 080D191D
- .incbin "enemy5A/gUnk_080D191D.bin"
+gSpriteAnimations_Enemy5A_5:: @ 080D191D
+ .include "animations/gSpriteAnimations_Enemy5A_5.s"
-gUnk_080D1926:: @ 080D1926
- .incbin "enemy5A/gUnk_080D1926.bin"
+gSpriteAnimations_Enemy5A_6:: @ 080D1926
+ .include "animations/gSpriteAnimations_Enemy5A_6.s"
-gUnk_080D192F:: @ 080D192F
- .incbin "enemy5A/gUnk_080D192F.bin"
+gSpriteAnimations_Enemy5A_8:: @ 080D192F
+ .include "animations/gSpriteAnimations_Enemy5A_8.s"
-gUnk_080D1934:: @ 080D1934
- .incbin "enemy5A/gUnk_080D1934.bin"
+gSpriteAnimations_Enemy5A_9:: @ 080D1934
+ .include "animations/gSpriteAnimations_Enemy5A_9.s"
-gUnk_080D1945:: @ 080D1945
- .incbin "enemy5A/gUnk_080D1945.bin"
+gSpriteAnimations_Enemy5A_10:: @ 080D1945
+ .include "animations/gSpriteAnimations_Enemy5A_10.s"
-gUnk_080D195A:: @ 080D195A
- .incbin "enemy5A/gUnk_080D195A.bin"
+gSpriteAnimations_Enemy5A_11:: @ 080D195A
+ .include "animations/gSpriteAnimations_Enemy5A_11.s"
-gUnk_080D1967:: @ 080D1967
- .incbin "enemy5A/gUnk_080D1967.bin"
+gSpriteAnimations_Enemy5A_12:: @ 080D1967
+ .include "animations/gSpriteAnimations_Enemy5A_12.s"
-gUnk_080D1988:: @ 080D1988
- .incbin "enemy5A/gUnk_080D1988.bin"
+gSpriteAnimations_Enemy5A_13:: @ 080D1988
+ .include "animations/gSpriteAnimations_Enemy5A_13.s"
-gUnk_080D19AD:: @ 080D19AD
- .incbin "enemy5A/gUnk_080D19AD.bin"
+gSpriteAnimations_Enemy5A_14:: @ 080D19AD
+ .include "animations/gSpriteAnimations_Enemy5A_14.s"
gSpriteAnimations_Enemy5A:: @ 080D19B8
- .4byte gUnk_080D18C4
- .4byte gUnk_080D18C9
- .4byte gUnk_080D18DA
- .4byte gUnk_080D18F3
- .4byte gUnk_080D1914
- .4byte gUnk_080D191D
- .4byte gUnk_080D1926
- .4byte gUnk_080D18DA
- .4byte gUnk_080D192F
- .4byte gUnk_080D1934
- .4byte gUnk_080D1945
- .4byte gUnk_080D195A
- .4byte gUnk_080D1967
- .4byte gUnk_080D1988
- .4byte gUnk_080D19AD
- .4byte gUnk_080D1945
+ .4byte gSpriteAnimations_Enemy5A_0
+ .4byte gSpriteAnimations_Enemy5A_1
+ .4byte gSpriteAnimations_Enemy5A_2
+ .4byte gSpriteAnimations_Enemy5A_3
+ .4byte gSpriteAnimations_Enemy5A_4
+ .4byte gSpriteAnimations_Enemy5A_5
+ .4byte gSpriteAnimations_Enemy5A_6
+ .4byte gSpriteAnimations_Enemy5A_2
+ .4byte gSpriteAnimations_Enemy5A_8
+ .4byte gSpriteAnimations_Enemy5A_9
+ .4byte gSpriteAnimations_Enemy5A_10
+ .4byte gSpriteAnimations_Enemy5A_11
+ .4byte gSpriteAnimations_Enemy5A_12
+ .4byte gSpriteAnimations_Enemy5A_13
+ .4byte gSpriteAnimations_Enemy5A_14
+ .4byte gSpriteAnimations_Enemy5A_10
.4byte 00000000
diff --git a/data/animations/enemy/vaatiWrath.s b/data/animations/enemy/vaatiWrath.s
index 20a5e7f9..07e1d4f6 100644
--- a/data/animations/enemy/vaatiWrath.s
+++ b/data/animations/enemy/vaatiWrath.s
@@ -4,134 +4,134 @@
.section .rodata
.align 2
-gUnk_080D0ED0:: @ 080D0ED0
- .incbin "vaatiWrath/gUnk_080D0ED0.bin"
+gSpriteAnimations_VaatiWrath_0:: @ 080D0ED0
+ .include "animations/gSpriteAnimations_VaatiWrath_0.s"
-gUnk_080D0EE9:: @ 080D0EE9
- .incbin "vaatiWrath/gUnk_080D0EE9.bin"
+gSpriteAnimations_VaatiWrath_1:: @ 080D0EE9
+ .include "animations/gSpriteAnimations_VaatiWrath_1.s"
-gUnk_080D0F02:: @ 080D0F02
- .incbin "vaatiWrath/gUnk_080D0F02.bin"
+gSpriteAnimations_VaatiWrath_2:: @ 080D0F02
+ .include "animations/gSpriteAnimations_VaatiWrath_2.s"
-gUnk_080D0F13:: @ 080D0F13
- .incbin "vaatiWrath/gUnk_080D0F13.bin"
+gSpriteAnimations_VaatiWrath_3:: @ 080D0F13
+ .include "animations/gSpriteAnimations_VaatiWrath_3.s"
-gUnk_080D0F28:: @ 080D0F28
- .incbin "vaatiWrath/gUnk_080D0F28.bin"
+gSpriteAnimations_VaatiWrath_4:: @ 080D0F28
+ .include "animations/gSpriteAnimations_VaatiWrath_4.s"
-gUnk_080D0F6D:: @ 080D0F6D
- .incbin "vaatiWrath/gUnk_080D0F6D.bin"
+gSpriteAnimations_VaatiWrath_5:: @ 080D0F6D
+ .include "animations/gSpriteAnimations_VaatiWrath_5.s"
-gUnk_080D0F82:: @ 080D0F82
- .incbin "vaatiWrath/gUnk_080D0F82.bin"
+gSpriteAnimations_VaatiWrath_6:: @ 080D0F82
+ .include "animations/gSpriteAnimations_VaatiWrath_6.s"
-gUnk_080D0F9B:: @ 080D0F9B
- .incbin "vaatiWrath/gUnk_080D0F9B.bin"
+gSpriteAnimations_VaatiWrath_7:: @ 080D0F9B
+ .include "animations/gSpriteAnimations_VaatiWrath_7.s"
-gUnk_080D0FB0:: @ 080D0FB0
- .incbin "vaatiWrath/gUnk_080D0FB0.bin"
+gSpriteAnimations_VaatiWrath_8:: @ 080D0FB0
+ .include "animations/gSpriteAnimations_VaatiWrath_8.s"
-gUnk_080D0FC1:: @ 080D0FC1
- .incbin "vaatiWrath/gUnk_080D0FC1.bin"
+gSpriteAnimations_VaatiWrath_9:: @ 080D0FC1
+ .include "animations/gSpriteAnimations_VaatiWrath_9.s"
-gUnk_080D0FD6:: @ 080D0FD6
- .incbin "vaatiWrath/gUnk_080D0FD6.bin"
+gSpriteAnimations_VaatiWrath_10:: @ 080D0FD6
+ .include "animations/gSpriteAnimations_VaatiWrath_10.s"
-gUnk_080D0FF3:: @ 080D0FF3
- .incbin "vaatiWrath/gUnk_080D0FF3.bin"
+gSpriteAnimations_VaatiWrath_11:: @ 080D0FF3
+ .include "animations/gSpriteAnimations_VaatiWrath_11.s"
-gUnk_080D0FF8:: @ 080D0FF8
- .incbin "vaatiWrath/gUnk_080D0FF8.bin"
+gSpriteAnimations_VaatiWrath_12:: @ 080D0FF8
+ .include "animations/gSpriteAnimations_VaatiWrath_12.s"
-gUnk_080D1019:: @ 080D1019
- .incbin "vaatiWrath/gUnk_080D1019.bin"
+gSpriteAnimations_VaatiWrath_13:: @ 080D1019
+ .include "animations/gSpriteAnimations_VaatiWrath_13.s"
-gUnk_080D1036:: @ 080D1036
- .incbin "vaatiWrath/gUnk_080D1036.bin"
+gSpriteAnimations_VaatiWrath_14:: @ 080D1036
+ .include "animations/gSpriteAnimations_VaatiWrath_14.s"
-gUnk_080D104F:: @ 080D104F
- .incbin "vaatiWrath/gUnk_080D104F.bin"
+gSpriteAnimations_VaatiWrath_15:: @ 080D104F
+ .include "animations/gSpriteAnimations_VaatiWrath_15.s"
-gUnk_080D1060:: @ 080D1060
- .incbin "vaatiWrath/gUnk_080D1060.bin"
+gSpriteAnimations_VaatiWrath_16:: @ 080D1060
+ .include "animations/gSpriteAnimations_VaatiWrath_16.s"
-gUnk_080D106D:: @ 080D106D
- .incbin "vaatiWrath/gUnk_080D106D.bin"
+gSpriteAnimations_VaatiWrath_17:: @ 080D106D
+ .include "animations/gSpriteAnimations_VaatiWrath_17.s"
-gUnk_080D107A:: @ 080D107A
- .incbin "vaatiWrath/gUnk_080D107A.bin"
+gSpriteAnimations_VaatiWrath_18:: @ 080D107A
+ .include "animations/gSpriteAnimations_VaatiWrath_18.s"
-gUnk_080D107F:: @ 080D107F
- .incbin "vaatiWrath/gUnk_080D107F.bin"
+gSpriteAnimations_VaatiWrath_19:: @ 080D107F
+ .include "animations/gSpriteAnimations_VaatiWrath_19.s"
-gUnk_080D10A0:: @ 080D10A0
- .incbin "vaatiWrath/gUnk_080D10A0.bin"
+gSpriteAnimations_VaatiWrath_20:: @ 080D10A0
+ .include "animations/gSpriteAnimations_VaatiWrath_20.s"
-gUnk_080D10B5:: @ 080D10B5
- .incbin "vaatiWrath/gUnk_080D10B5.bin"
+gSpriteAnimations_VaatiWrath_21:: @ 080D10B5
+ .include "animations/gSpriteAnimations_VaatiWrath_21.s"
-gUnk_080D10C6:: @ 080D10C6
- .incbin "vaatiWrath/gUnk_080D10C6.bin"
+gSpriteAnimations_VaatiWrath_22:: @ 080D10C6
+ .include "animations/gSpriteAnimations_VaatiWrath_22.s"
-gUnk_080D10D7:: @ 080D10D7
- .incbin "vaatiWrath/gUnk_080D10D7.bin"
+gSpriteAnimations_VaatiWrath_23:: @ 080D10D7
+ .include "animations/gSpriteAnimations_VaatiWrath_23.s"
-gUnk_080D10EC:: @ 080D10EC
- .incbin "vaatiWrath/gUnk_080D10EC.bin"
+gSpriteAnimations_VaatiWrath_24:: @ 080D10EC
+ .include "animations/gSpriteAnimations_VaatiWrath_24.s"
-gUnk_080D10F1:: @ 080D10F1
- .incbin "vaatiWrath/gUnk_080D10F1.bin"
+gSpriteAnimations_VaatiWrath_25:: @ 080D10F1
+ .include "animations/gSpriteAnimations_VaatiWrath_25.s"
-gUnk_080D1106:: @ 080D1106
- .incbin "vaatiWrath/gUnk_080D1106.bin"
+gSpriteAnimations_VaatiWrath_26:: @ 080D1106
+ .include "animations/gSpriteAnimations_VaatiWrath_26.s"
-gUnk_080D1117:: @ 080D1117
- .incbin "vaatiWrath/gUnk_080D1117.bin"
+gSpriteAnimations_VaatiWrath_27:: @ 080D1117
+ .include "animations/gSpriteAnimations_VaatiWrath_27.s"
-gUnk_080D1138:: @ 080D1138
- .incbin "vaatiWrath/gUnk_080D1138.bin"
+gSpriteAnimations_VaatiWrath_28:: @ 080D1138
+ .include "animations/gSpriteAnimations_VaatiWrath_28.s"
-gUnk_080D114D:: @ 080D114D
- .incbin "vaatiWrath/gUnk_080D114D.bin"
+gSpriteAnimations_VaatiWrath_29:: @ 080D114D
+ .include "animations/gSpriteAnimations_VaatiWrath_29.s"
-gUnk_080D117E:: @ 080D117E
- .incbin "vaatiWrath/gUnk_080D117E.bin"
+gSpriteAnimations_VaatiWrath_30:: @ 080D117E
+ .include "animations/gSpriteAnimations_VaatiWrath_30.s"
-gUnk_080D1197:: @ 080D1197
- .incbin "vaatiWrath/gUnk_080D1197.bin"
+gSpriteAnimations_VaatiWrath_31:: @ 080D1197
+ .include "animations/gSpriteAnimations_VaatiWrath_31.s"
gSpriteAnimations_VaatiWrath:: @ 080D11AC
- .4byte gUnk_080D0ED0
- .4byte gUnk_080D0EE9
- .4byte gUnk_080D0F02
- .4byte gUnk_080D0F13
- .4byte gUnk_080D0F28
- .4byte gUnk_080D0F6D
- .4byte gUnk_080D0F82
- .4byte gUnk_080D0F9B
- .4byte gUnk_080D0FB0
- .4byte gUnk_080D0FC1
- .4byte gUnk_080D0FD6
- .4byte gUnk_080D0FF3
- .4byte gUnk_080D0FF8
- .4byte gUnk_080D1019
- .4byte gUnk_080D1036
- .4byte gUnk_080D104F
- .4byte gUnk_080D1060
- .4byte gUnk_080D106D
- .4byte gUnk_080D107A
- .4byte gUnk_080D107F
- .4byte gUnk_080D10A0
- .4byte gUnk_080D10B5
- .4byte gUnk_080D10C6
- .4byte gUnk_080D10D7
- .4byte gUnk_080D10EC
- .4byte gUnk_080D10F1
- .4byte gUnk_080D1106
- .4byte gUnk_080D1117
- .4byte gUnk_080D1138
- .4byte gUnk_080D114D
- .4byte gUnk_080D117E
- .4byte gUnk_080D1197
+ .4byte gSpriteAnimations_VaatiWrath_0
+ .4byte gSpriteAnimations_VaatiWrath_1
+ .4byte gSpriteAnimations_VaatiWrath_2
+ .4byte gSpriteAnimations_VaatiWrath_3
+ .4byte gSpriteAnimations_VaatiWrath_4
+ .4byte gSpriteAnimations_VaatiWrath_5
+ .4byte gSpriteAnimations_VaatiWrath_6
+ .4byte gSpriteAnimations_VaatiWrath_7
+ .4byte gSpriteAnimations_VaatiWrath_8
+ .4byte gSpriteAnimations_VaatiWrath_9
+ .4byte gSpriteAnimations_VaatiWrath_10
+ .4byte gSpriteAnimations_VaatiWrath_11
+ .4byte gSpriteAnimations_VaatiWrath_12
+ .4byte gSpriteAnimations_VaatiWrath_13
+ .4byte gSpriteAnimations_VaatiWrath_14
+ .4byte gSpriteAnimations_VaatiWrath_15
+ .4byte gSpriteAnimations_VaatiWrath_16
+ .4byte gSpriteAnimations_VaatiWrath_17
+ .4byte gSpriteAnimations_VaatiWrath_18
+ .4byte gSpriteAnimations_VaatiWrath_19
+ .4byte gSpriteAnimations_VaatiWrath_20
+ .4byte gSpriteAnimations_VaatiWrath_21
+ .4byte gSpriteAnimations_VaatiWrath_22
+ .4byte gSpriteAnimations_VaatiWrath_23
+ .4byte gSpriteAnimations_VaatiWrath_24
+ .4byte gSpriteAnimations_VaatiWrath_25
+ .4byte gSpriteAnimations_VaatiWrath_26
+ .4byte gSpriteAnimations_VaatiWrath_27
+ .4byte gSpriteAnimations_VaatiWrath_28
+ .4byte gSpriteAnimations_VaatiWrath_29
+ .4byte gSpriteAnimations_VaatiWrath_30
+ .4byte gSpriteAnimations_VaatiWrath_31
.4byte 00000000
diff --git a/data/animations/enemy/vaatiWrathEye.s b/data/animations/enemy/vaatiWrathEye.s
index 6852d4bf..e7e49b14 100644
--- a/data/animations/enemy/vaatiWrathEye.s
+++ b/data/animations/enemy/vaatiWrathEye.s
@@ -4,41 +4,41 @@
.section .rodata
.align 2
-gUnk_080D1DA0:: @ 080D1DA0
- .incbin "enemy5F/gUnk_080D1DA0.bin"
+gSpriteAnimations_Enemy5F_0:: @ 080D1DA0
+ .include "animations/gSpriteAnimations_Enemy5F_0.s"
-gUnk_080D1DC8:: @ 080D1DC8
- .incbin "enemy5F/gUnk_080D1DC8.bin"
+gSpriteAnimations_Enemy5F_1:: @ 080D1DC8
+ .include "animations/gSpriteAnimations_Enemy5F_1.s"
-gUnk_080D1DCC:: @ 080D1DCC
- .incbin "enemy5F/gUnk_080D1DCC.bin"
+gSpriteAnimations_Enemy5F_2:: @ 080D1DCC
+ .include "animations/gSpriteAnimations_Enemy5F_2.s"
-gUnk_080D1DD0:: @ 080D1DD0
- .incbin "enemy5F/gUnk_080D1DD0.bin"
+gSpriteAnimations_Enemy5F_4:: @ 080D1DD0
+ .include "animations/gSpriteAnimations_Enemy5F_4.s"
-gUnk_080D1DDC:: @ 080D1DDC
- .incbin "enemy5F/gUnk_080D1DDC.bin"
+gSpriteAnimations_Enemy5F_3:: @ 080D1DDC
+ .include "animations/gSpriteAnimations_Enemy5F_3.s"
-gUnk_080D1DE8:: @ 080D1DE8
- .incbin "enemy5F/gUnk_080D1DE8.bin"
+gSpriteAnimations_Enemy5F_5:: @ 080D1DE8
+ .include "animations/gSpriteAnimations_Enemy5F_5.s"
-gUnk_080D1E05:: @ 080D1E05
- .incbin "enemy5F/gUnk_080D1E05.bin"
+gSpriteAnimations_Enemy5F_6:: @ 080D1E05
+ .include "animations/gSpriteAnimations_Enemy5F_6.s"
-gUnk_080D1E21:: @ 080D1E21
- .incbin "enemy5F/gUnk_080D1E21.bin"
+gSpriteAnimations_Enemy5F_7:: @ 080D1E21
+ .include "animations/gSpriteAnimations_Enemy5F_7.s"
-gUnk_080D1E32:: @ 080D1E32
- .incbin "enemy5F/gUnk_080D1E32.bin"
+gSpriteAnimations_Enemy5F_8:: @ 080D1E32
+ .include "animations/gSpriteAnimations_Enemy5F_8.s"
gSpriteAnimations_Enemy5F:: @ 080D1E44
- .4byte gUnk_080D1DA0
- .4byte gUnk_080D1DC8
- .4byte gUnk_080D1DCC
- .4byte gUnk_080D1DDC
- .4byte gUnk_080D1DD0
- .4byte gUnk_080D1DE8
- .4byte gUnk_080D1E05
- .4byte gUnk_080D1E21
- .4byte gUnk_080D1E32
+ .4byte gSpriteAnimations_Enemy5F_0
+ .4byte gSpriteAnimations_Enemy5F_1
+ .4byte gSpriteAnimations_Enemy5F_2
+ .4byte gSpriteAnimations_Enemy5F_3
+ .4byte gSpriteAnimations_Enemy5F_4
+ .4byte gSpriteAnimations_Enemy5F_5
+ .4byte gSpriteAnimations_Enemy5F_6
+ .4byte gSpriteAnimations_Enemy5F_7
+ .4byte gSpriteAnimations_Enemy5F_8
.4byte 00000000
diff --git a/data/animations/enemy/wallMaster.s b/data/animations/enemy/wallMaster.s
index 4d83662c..644232f2 100644
--- a/data/animations/enemy/wallMaster.s
+++ b/data/animations/enemy/wallMaster.s
@@ -3,17 +3,17 @@
.section .rodata
-gUnk_080CD0B8:: @ 080CD0B8
- .incbin "wallMaster/gUnk_080CD0B8.bin"
+gSpriteAnimations_WallMaster_0:: @ 080CD0B8
+ .include "animations/gSpriteAnimations_WallMaster_0.s"
-gUnk_080CD0C5:: @ 080CD0C5
- .incbin "wallMaster/gUnk_080CD0C5.bin"
+gSpriteAnimations_WallMaster_1:: @ 080CD0C5
+ .include "animations/gSpriteAnimations_WallMaster_1.s"
-gUnk_080CD0DA:: @ 080CD0DA
- .incbin "wallMaster/gUnk_080CD0DA.bin"
+gSpriteAnimations_WallMaster_2:: @ 080CD0DA
+ .include "animations/gSpriteAnimations_WallMaster_2.s"
gSpriteAnimations_WallMaster:: @ 080CD0E0
- .4byte gUnk_080CD0B8
- .4byte gUnk_080CD0C5
- .4byte gUnk_080CD0DA
+ .4byte gSpriteAnimations_WallMaster_0
+ .4byte gSpriteAnimations_WallMaster_1
+ .4byte gSpriteAnimations_WallMaster_2
.4byte 00000000
diff --git a/data/animations/enemy/waterDrop.s b/data/animations/enemy/waterDrop.s
index 77ac9e9e..d973fd07 100644
--- a/data/animations/enemy/waterDrop.s
+++ b/data/animations/enemy/waterDrop.s
@@ -3,18 +3,13 @@
.section .rodata
-gUnk_080CD044:: @ 080CD044
-.ifdef EU
- @ TODO only small differences
- .incbin "waterDrop/gUnk_080CD044_EU.bin"
-.else
- .incbin "waterDrop/gUnk_080CD044_1_USA-JP-DEMO_USA-DEMO_JP.bin"
-.endif
+gSpriteAnimations_WaterDrop_0:: @ 080CD044
+ .include "animations/gSpriteAnimations_WaterDrop_0.s"
-gUnk_080CD069:: @ 080CD069
- .incbin "waterDrop/gUnk_080CD069.bin"
+gSpriteAnimations_WaterDrop_1:: @ 080CD069
+ .include "animations/gSpriteAnimations_WaterDrop_1.s"
gSpriteAnimations_WaterDrop:: @ 080CD070
- .4byte gUnk_080CD044
- .4byte gUnk_080CD069
+ .4byte gSpriteAnimations_WaterDrop_0
+ .4byte gSpriteAnimations_WaterDrop_1
.4byte 00000000
diff --git a/data/animations/enemy/wisp.s b/data/animations/enemy/wisp.s
index ec2e9bc8..8a9a6953 100644
--- a/data/animations/enemy/wisp.s
+++ b/data/animations/enemy/wisp.s
@@ -4,13 +4,13 @@
.section .rodata
.align 2
-gUnk_080CEBAC:: @ 080CEBAC
- .incbin "wisp/gUnk_080CEBAC.bin"
+gSpriteAnimations_Wisp_0:: @ 080CEBAC
+ .include "animations/gSpriteAnimations_Wisp_0.s"
-gUnk_080CEBBD:: @ 080CEBBD
- .incbin "wisp/gUnk_080CEBBD.bin"
+gSpriteAnimations_Wisp_1:: @ 080CEBBD
+ .include "animations/gSpriteAnimations_Wisp_1.s"
gSpriteAnimations_Wisp:: @ 080CEBD0
- .4byte gUnk_080CEBAC
- .4byte gUnk_080CEBBD
+ .4byte gSpriteAnimations_Wisp_0
+ .4byte gSpriteAnimations_Wisp_1
.4byte 00000000
diff --git a/data/animations/enemy/wizzrobeFire.s b/data/animations/enemy/wizzrobeFire.s
index a9dd1dc1..2e1fd92f 100644
--- a/data/animations/enemy/wizzrobeFire.s
+++ b/data/animations/enemy/wizzrobeFire.s
@@ -4,37 +4,37 @@
.section .rodata
.align 2
-gUnk_080CDFE8:: @ 080CDFE8
- .incbin "wizzrobeFire/gUnk_080CDFE8.bin"
+gSpriteAnimations_WizzrobeFire_0:: @ 080CDFE8
+ .include "animations/gSpriteAnimations_WizzrobeFire_0.s"
-gUnk_080CDFF5:: @ 080CDFF5
- .incbin "wizzrobeFire/gUnk_080CDFF5.bin"
+gSpriteAnimations_WizzrobeFire_1:: @ 080CDFF5
+ .include "animations/gSpriteAnimations_WizzrobeFire_1.s"
-gUnk_080CE002:: @ 080CE002
- .incbin "wizzrobeFire/gUnk_080CE002.bin"
+gSpriteAnimations_WizzrobeFire_2:: @ 080CE002
+ .include "animations/gSpriteAnimations_WizzrobeFire_2.s"
-gUnk_080CE00F:: @ 080CE00F
- .incbin "wizzrobeFire/gUnk_080CE00F.bin"
+gSpriteAnimations_WizzrobeFire_3:: @ 080CE00F
+ .include "animations/gSpriteAnimations_WizzrobeFire_3.s"
-gUnk_080CE01C:: @ 080CE01C
- .incbin "wizzrobeFire/gUnk_080CE01C.bin"
+gSpriteAnimations_WizzrobeFire_4:: @ 080CE01C
+ .include "animations/gSpriteAnimations_WizzrobeFire_4.s"
-gUnk_080CE029:: @ 080CE029
- .incbin "wizzrobeFire/gUnk_080CE029.bin"
+gSpriteAnimations_WizzrobeFire_5:: @ 080CE029
+ .include "animations/gSpriteAnimations_WizzrobeFire_5.s"
-gUnk_080CE036:: @ 080CE036
- .incbin "wizzrobeFire/gUnk_080CE036.bin"
+gSpriteAnimations_WizzrobeFire_6:: @ 080CE036
+ .include "animations/gSpriteAnimations_WizzrobeFire_6.s"
-gUnk_080CE043:: @ 080CE043
- .incbin "wizzrobeFire/gUnk_080CE043.bin"
+gSpriteAnimations_WizzrobeFire_7:: @ 080CE043
+ .include "animations/gSpriteAnimations_WizzrobeFire_7.s"
gSpriteAnimations_WizzrobeFire:: @ 080CE050
- .4byte gUnk_080CDFE8
- .4byte gUnk_080CDFF5
- .4byte gUnk_080CE002
- .4byte gUnk_080CE00F
- .4byte gUnk_080CE01C
- .4byte gUnk_080CE029
- .4byte gUnk_080CE036
- .4byte gUnk_080CE043
+ .4byte gSpriteAnimations_WizzrobeFire_0
+ .4byte gSpriteAnimations_WizzrobeFire_1
+ .4byte gSpriteAnimations_WizzrobeFire_2
+ .4byte gSpriteAnimations_WizzrobeFire_3
+ .4byte gSpriteAnimations_WizzrobeFire_4
+ .4byte gSpriteAnimations_WizzrobeFire_5
+ .4byte gSpriteAnimations_WizzrobeFire_6
+ .4byte gSpriteAnimations_WizzrobeFire_7
.4byte 00000000
diff --git a/data/animations/enemy/wizzrobeIce.s b/data/animations/enemy/wizzrobeIce.s
index fac3de9d..3a0efa37 100644
--- a/data/animations/enemy/wizzrobeIce.s
+++ b/data/animations/enemy/wizzrobeIce.s
@@ -4,37 +4,37 @@
.section .rodata
.align 2
-gUnk_080CE098:: @ 080CE098
- .incbin "wizzrobeIce/gUnk_080CE098.bin"
+gSpriteAnimations_WizzrobeIce_0:: @ 080CE098
+ .include "animations/gSpriteAnimations_WizzrobeIce_0.s"
-gUnk_080CE0A5:: @ 080CE0A5
- .incbin "wizzrobeIce/gUnk_080CE0A5.bin"
+gSpriteAnimations_WizzrobeIce_1:: @ 080CE0A5
+ .include "animations/gSpriteAnimations_WizzrobeIce_1.s"
-gUnk_080CE0B2:: @ 080CE0B2
- .incbin "wizzrobeIce/gUnk_080CE0B2.bin"
+gSpriteAnimations_WizzrobeIce_2:: @ 080CE0B2
+ .include "animations/gSpriteAnimations_WizzrobeIce_2.s"
-gUnk_080CE0BF:: @ 080CE0BF
- .incbin "wizzrobeIce/gUnk_080CE0BF.bin"
+gSpriteAnimations_WizzrobeIce_3:: @ 080CE0BF
+ .include "animations/gSpriteAnimations_WizzrobeIce_3.s"
-gUnk_080CE0CC:: @ 080CE0CC
- .incbin "wizzrobeIce/gUnk_080CE0CC.bin"
+gSpriteAnimations_WizzrobeIce_4:: @ 080CE0CC
+ .include "animations/gSpriteAnimations_WizzrobeIce_4.s"
-gUnk_080CE0D9:: @ 080CE0D9
- .incbin "wizzrobeIce/gUnk_080CE0D9.bin"
+gSpriteAnimations_WizzrobeIce_5:: @ 080CE0D9
+ .include "animations/gSpriteAnimations_WizzrobeIce_5.s"
-gUnk_080CE0E6:: @ 080CE0E6
- .incbin "wizzrobeIce/gUnk_080CE0E6.bin"
+gSpriteAnimations_WizzrobeIce_6:: @ 080CE0E6
+ .include "animations/gSpriteAnimations_WizzrobeIce_6.s"
-gUnk_080CE0F3:: @ 080CE0F3
- .incbin "wizzrobeIce/gUnk_080CE0F3.bin"
+gSpriteAnimations_WizzrobeIce_7:: @ 080CE0F3
+ .include "animations/gSpriteAnimations_WizzrobeIce_7.s"
gSpriteAnimations_WizzrobeIce:: @ 080CE100
- .4byte gUnk_080CE098
- .4byte gUnk_080CE0A5
- .4byte gUnk_080CE0B2
- .4byte gUnk_080CE0BF
- .4byte gUnk_080CE0CC
- .4byte gUnk_080CE0D9
- .4byte gUnk_080CE0E6
- .4byte gUnk_080CE0F3
+ .4byte gSpriteAnimations_WizzrobeIce_0
+ .4byte gSpriteAnimations_WizzrobeIce_1
+ .4byte gSpriteAnimations_WizzrobeIce_2
+ .4byte gSpriteAnimations_WizzrobeIce_3
+ .4byte gSpriteAnimations_WizzrobeIce_4
+ .4byte gSpriteAnimations_WizzrobeIce_5
+ .4byte gSpriteAnimations_WizzrobeIce_6
+ .4byte gSpriteAnimations_WizzrobeIce_7
.4byte 00000000
diff --git a/data/animations/enemy/wizzrobeWind.s b/data/animations/enemy/wizzrobeWind.s
index 92e9f3b7..37a4959f 100644
--- a/data/animations/enemy/wizzrobeWind.s
+++ b/data/animations/enemy/wizzrobeWind.s
@@ -5,37 +5,37 @@
.align 2
-gUnk_080CDF78:: @ 080CDF78
- .incbin "wizzrobeWind/gUnk_080CDF78.bin"
+gSpriteAnimations_WizzrobeWind_0:: @ 080CDF78
+ .include "animations/gSpriteAnimations_WizzrobeWind_0.s"
-gUnk_080CDF7D:: @ 080CDF7D
- .incbin "wizzrobeWind/gUnk_080CDF7D.bin"
+gSpriteAnimations_WizzrobeWind_1:: @ 080CDF7D
+ .include "animations/gSpriteAnimations_WizzrobeWind_1.s"
-gUnk_080CDF82:: @ 080CDF82
- .incbin "wizzrobeWind/gUnk_080CDF82.bin"
+gSpriteAnimations_WizzrobeWind_2:: @ 080CDF82
+ .include "animations/gSpriteAnimations_WizzrobeWind_2.s"
-gUnk_080CDF87:: @ 080CDF87
- .incbin "wizzrobeWind/gUnk_080CDF87.bin"
+gSpriteAnimations_WizzrobeWind_3:: @ 080CDF87
+ .include "animations/gSpriteAnimations_WizzrobeWind_3.s"
-gUnk_080CDF8C:: @ 080CDF8C
- .incbin "wizzrobeWind/gUnk_080CDF8C.bin"
+gSpriteAnimations_WizzrobeWind_4:: @ 080CDF8C
+ .include "animations/gSpriteAnimations_WizzrobeWind_4.s"
-gUnk_080CDF91:: @ 080CDF91
- .incbin "wizzrobeWind/gUnk_080CDF91.bin"
+gSpriteAnimations_WizzrobeWind_5:: @ 080CDF91
+ .include "animations/gSpriteAnimations_WizzrobeWind_5.s"
-gUnk_080CDF96:: @ 080CDF96
- .incbin "wizzrobeWind/gUnk_080CDF96.bin"
+gSpriteAnimations_WizzrobeWind_6:: @ 080CDF96
+ .include "animations/gSpriteAnimations_WizzrobeWind_6.s"
-gUnk_080CDF9B:: @ 080CDF9B
- .incbin "wizzrobeWind/gUnk_080CDF9B.bin"
+gSpriteAnimations_WizzrobeWind_7:: @ 080CDF9B
+ .include "animations/gSpriteAnimations_WizzrobeWind_7.s"
gSpriteAnimations_WizzrobeWind:: @ 080CDFA0
- .4byte gUnk_080CDF78
- .4byte gUnk_080CDF7D
- .4byte gUnk_080CDF82
- .4byte gUnk_080CDF87
- .4byte gUnk_080CDF8C
- .4byte gUnk_080CDF91
- .4byte gUnk_080CDF96
- .4byte gUnk_080CDF9B
+ .4byte gSpriteAnimations_WizzrobeWind_0
+ .4byte gSpriteAnimations_WizzrobeWind_1
+ .4byte gSpriteAnimations_WizzrobeWind_2
+ .4byte gSpriteAnimations_WizzrobeWind_3
+ .4byte gSpriteAnimations_WizzrobeWind_4
+ .4byte gSpriteAnimations_WizzrobeWind_5
+ .4byte gSpriteAnimations_WizzrobeWind_6
+ .4byte gSpriteAnimations_WizzrobeWind_7
.4byte 00000000