Move animations and const data into separate folders for enemies.

2021-03-14 18:35:25 +01:00 · 2021-03-14 18:35:25 +01:00 · ce1c60b109
parent 665d6716cb
commit ce1c60b109
148 changed files with 145 additions and 145 deletions
--- a/2
+++ b/2
@ -92,7 +92,7 @@ C_OBJS := $(patsubst $(C_SUBDIR)/%.c,$(C_BUILDDIR)/%.o,$(C_SRCS))
 ASM_SRCS := $(wildcard $(ASM_SUBDIR)/*.s)
 ASM_OBJS := $(patsubst $(ASM_SUBDIR)/%.s,$(ASM_BUILDDIR)/%.o,$(ASM_SRCS))
-DATA_ASM_SRCS := $(wildcard $(DATA_ASM_SUBDIR)/*.s $(DATA_ASM_SUBDIR)/**/*.s)
+DATA_ASM_SRCS := $(wildcard $(DATA_ASM_SUBDIR)/*.s $(DATA_ASM_SUBDIR)/**/*.s $(DATA_ASM_SUBDIR)/**/**/*.s)
 DATA_ASM_OBJS := $(patsubst $(DATA_ASM_SUBDIR)/%.s,$(DATA_ASM_BUILDDIR)/%.o,$(DATA_ASM_SRCS))
 SONG_SRCS := $(wildcard $(SONG_SUBDIR)/*.s)
--- a/data/animations/enemy/acroBandits.inc
+++ b/data/animations/enemy/acroBandits.inc
--- a/data/animations/enemy/armos.inc
+++ b/data/animations/enemy/armos.inc
--- a/data/animations/enemy/ballChainSoldier.inc
+++ b/data/animations/enemy/ballChainSoldier.inc
--- a/data/animations/enemy/beetle.s
+++ b/data/animations/enemy/beetle.s
--- a/data/animations/enemy/bobomb.s
+++ b/data/animations/enemy/bobomb.s
--- a/data/animations/enemy/bombPeahat.s
+++ b/data/animations/enemy/bombPeahat.s
--- a/data/animations/enemy/bombarossa.inc
+++ b/data/animations/enemy/bombarossa.inc
--- a/data/animations/enemy/bowMoblin.inc
+++ b/data/animations/enemy/bowMoblin.inc
--- a/data/animations/enemy/businessScrub.s
+++ b/data/animations/enemy/businessScrub.s
--- a/data/animations/enemy/chaser.s
+++ b/data/animations/enemy/chaser.s
--- a/data/animations/enemy/chuchu.s
+++ b/data/animations/enemy/chuchu.s
--- a/data/animations/enemy/chuchuBoss.s
+++ b/data/animations/enemy/chuchuBoss.s
--- a/data/animations/enemy/cloudPiranha.inc
+++ b/data/animations/enemy/cloudPiranha.inc
--- a/data/animations/enemy/crow.inc
+++ b/data/animations/enemy/crow.inc
--- a/data/animations/enemy/cuccoAggr.inc
+++ b/data/animations/enemy/cuccoAggr.inc
--- a/data/animations/enemy/curtain.inc
+++ b/data/animations/enemy/curtain.inc
--- a/data/animations/enemy/darkNut.s
+++ b/data/animations/enemy/darkNut.s
--- a/data/animations/enemy/doorMimic.s
+++ b/data/animations/enemy/doorMimic.s
--- a/data/animations/enemy/enemy5A.inc
+++ b/data/animations/enemy/enemy5A.inc
--- a/data/animations/enemy/enemy5F.inc
+++ b/data/animations/enemy/enemy5F.inc
--- a/data/animations/enemy/enemy62.inc
+++ b/data/animations/enemy/enemy62.inc
--- a/data/animations/enemy/enemyE.s
+++ b/data/animations/enemy/enemyE.s
--- a/data/animations/enemy/eyegore.inc
+++ b/data/animations/enemy/eyegore.inc
--- a/data/animations/enemy/fallingBoulder.s
+++ b/data/animations/enemy/fallingBoulder.s
--- a/data/animations/enemy/fireballGuy.inc
+++ b/data/animations/enemy/fireballGuy.inc
--- a/data/animations/enemy/flyingSkull.inc
+++ b/data/animations/enemy/flyingSkull.inc
--- a/data/animations/enemy/ghini.inc
+++ b/data/animations/enemy/ghini.inc
--- a/data/animations/enemy/gibdo.inc
+++ b/data/animations/enemy/gibdo.inc
--- a/data/animations/enemy/gleerok.inc
+++ b/data/animations/enemy/gleerok.inc
--- a/data/animations/enemy/gyorgChild.inc
+++ b/data/animations/enemy/gyorgChild.inc
--- a/data/animations/enemy/gyorgFemaleEye.inc
+++ b/data/animations/enemy/gyorgFemaleEye.inc
--- a/data/animations/enemy/gyorgFemaleMouth.inc
+++ b/data/animations/enemy/gyorgFemaleMouth.inc
--- a/data/animations/enemy/gyorgMale.inc
+++ b/data/animations/enemy/gyorgMale.inc
--- a/data/animations/enemy/helmasaur.s
+++ b/data/animations/enemy/helmasaur.s
--- a/data/animations/enemy/keaton.inc
+++ b/data/animations/enemy/keaton.inc
--- a/data/animations/enemy/keese.s
+++ b/data/animations/enemy/keese.s
--- a/data/animations/enemy/lakitu.s
+++ b/data/animations/enemy/lakitu.s
--- a/data/animations/enemy/leever.s
+++ b/data/animations/enemy/leever.s
--- a/data/animations/enemy/likeLike.s
+++ b/data/animations/enemy/likeLike.s
--- a/data/animations/enemy/madderpillar.s
+++ b/data/animations/enemy/madderpillar.s
--- a/data/animations/enemy/mazaalBracelet.inc
+++ b/data/animations/enemy/mazaalBracelet.inc
--- a/data/animations/enemy/mazaalHand.inc
+++ b/data/animations/enemy/mazaalHand.inc
--- a/data/animations/enemy/mazaalHead.inc
+++ b/data/animations/enemy/mazaalHead.inc
--- a/data/animations/enemy/mazaalMacro.inc
+++ b/data/animations/enemy/mazaalMacro.inc
--- a/data/animations/enemy/moldworm.s
+++ b/data/animations/enemy/moldworm.s
--- a/data/animations/enemy/mulldozer.inc
+++ b/data/animations/enemy/mulldozer.inc
--- a/data/animations/enemy/octorok.s
+++ b/data/animations/enemy/octorok.s
--- a/data/animations/enemy/octorokBoss.inc
+++ b/data/animations/enemy/octorokBoss.inc
--- a/data/animations/enemy/peahat.s
+++ b/data/animations/enemy/peahat.s
--- a/data/animations/enemy/pesto.s
+++ b/data/animations/enemy/pesto.s
--- a/data/animations/enemy/puffstool.s
+++ b/data/animations/enemy/puffstool.s
--- a/data/animations/enemy/rockChuchu.s
+++ b/data/animations/enemy/rockChuchu.s
--- a/data/animations/enemy/rollobite.s
+++ b/data/animations/enemy/rollobite.s
--- a/data/animations/enemy/rope.inc
+++ b/data/animations/enemy/rope.inc
--- a/data/animations/enemy/rupeeLike.s
+++ b/data/animations/enemy/rupeeLike.s
--- a/data/animations/enemy/scissorsBeetle.inc
+++ b/data/animations/enemy/scissorsBeetle.inc
--- a/data/animations/enemy/slime.inc
+++ b/data/animations/enemy/slime.inc
--- a/data/animations/enemy/sluggula.s
+++ b/data/animations/enemy/sluggula.s
--- a/data/animations/enemy/spark.s
+++ b/data/animations/enemy/spark.s
--- a/data/animations/enemy/spearMoblin.s
+++ b/data/animations/enemy/spearMoblin.s
--- a/data/animations/enemy/spikedBeetle.s
+++ b/data/animations/enemy/spikedBeetle.s
--- a/data/animations/enemy/spinyBeetle.inc
+++ b/data/animations/enemy/spinyBeetle.inc
--- a/data/animations/enemy/spinyChuchu.s
+++ b/data/animations/enemy/spinyChuchu.s
--- a/data/animations/enemy/stalfos.inc
+++ b/data/animations/enemy/stalfos.inc
--- a/data/animations/enemy/tektite.inc
+++ b/data/animations/enemy/tektite.inc
--- a/data/animations/enemy/vaatiArm.inc
+++ b/data/animations/enemy/vaatiArm.inc
--- a/data/animations/enemy/vaatiBall.inc
+++ b/data/animations/enemy/vaatiBall.inc
--- a/data/animations/enemy/vaatiEyesMacro.inc
+++ b/data/animations/enemy/vaatiEyesMacro.inc
--- a/data/animations/enemy/vaatiProjectile.inc
+++ b/data/animations/enemy/vaatiProjectile.inc
--- a/data/animations/enemy/vaatiRebornEnemy.inc
+++ b/data/animations/enemy/vaatiRebornEnemy.inc
--- a/data/animations/enemy/vaatiTransfigured.inc
+++ b/data/animations/enemy/vaatiTransfigured.inc
--- a/data/animations/enemy/vaatiWrath.inc
+++ b/data/animations/enemy/vaatiWrath.inc
--- a/data/animations/enemy/wallMaster.s
+++ b/data/animations/enemy/wallMaster.s
--- a/data/animations/enemy/waterDrop.s
+++ b/data/animations/enemy/waterDrop.s
--- a/data/animations/enemy/wisp.inc
+++ b/data/animations/enemy/wisp.inc
--- a/data/animations/enemy/wizzrobeFire.inc
+++ b/data/animations/enemy/wizzrobeFire.inc
--- a/data/animations/enemy/wizzrobeIce.inc
+++ b/data/animations/enemy/wizzrobeIce.inc
--- a/data/animations/enemy/wizzrobeWind.inc
+++ b/data/animations/enemy/wizzrobeWind.inc
--- a/data/animations/npc/greatFairy.s
+++ b/data/animations/npc/greatFairy.s
--- a/data/const/code_08049D30.inc
+++ b/data/const/code_08049D30.inc
--- a/data/const/enemy/acroBandits.inc
+++ b/data/const/enemy/acroBandits.inc
--- a/data/const/enemy/armos.inc
+++ b/data/const/enemy/armos.inc
--- a/data/const/enemy/ballChainSoldier.inc
+++ b/data/const/enemy/ballChainSoldier.inc
--- a/data/const/enemy/bombarossa.inc
+++ b/data/const/enemy/bombarossa.inc
--- a/data/const/enemy/bowMoblin.inc
+++ b/data/const/enemy/bowMoblin.inc
--- a/data/const/enemy/businessScrubPrologue.inc
+++ b/data/const/enemy/businessScrubPrologue.inc
--- a/data/const/enemy/cloudPiranha.inc
+++ b/data/const/enemy/cloudPiranha.inc
--- a/data/const/enemy/crow.inc
+++ b/data/const/enemy/crow.inc
--- a/data/const/enemy/cuccoAggr.inc
+++ b/data/const/enemy/cuccoAggr.inc
--- a/data/const/enemy/curtain.inc
+++ b/data/const/enemy/curtain.inc
--- a/data/const/enemy/dust.inc
+++ b/data/const/enemy/dust.inc
--- a/data/const/enemy/enemy49.inc
+++ b/data/const/enemy/enemy49.inc
--- a/data/const/enemy/enemy4D.inc
+++ b/data/const/enemy/enemy4D.inc
--- a/data/const/enemy/enemy50.inc
+++ b/data/const/enemy/enemy50.inc
--- a/data/const/enemy/enemy5A.inc
+++ b/data/const/enemy/enemy5A.inc
--- a/data/const/enemy/enemy5F.inc
+++ b/data/const/enemy/enemy5F.inc
--- a/data/const/enemy/enemy62.inc
+++ b/data/const/enemy/enemy62.inc
--- a/data/const/enemy/enemy64.inc
+++ b/data/const/enemy/enemy64.inc
--- a/data/const/enemy/enemy66.inc
+++ b/data/const/enemy/enemy66.inc
--- a/Show More
+++ b/Show More