diff --git a/Makefile b/Makefile index e17925d4..4e9ab197 100644 --- a/Makefile +++ b/Makefile @@ -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) diff --git a/data/animations/acroBandits.inc b/data/animations/enemy/acroBandits.inc similarity index 100% rename from data/animations/acroBandits.inc rename to data/animations/enemy/acroBandits.inc diff --git a/data/animations/armos.inc b/data/animations/enemy/armos.inc similarity index 100% rename from data/animations/armos.inc rename to data/animations/enemy/armos.inc diff --git a/data/animations/ballChainSoldier.inc b/data/animations/enemy/ballChainSoldier.inc similarity index 100% rename from data/animations/ballChainSoldier.inc rename to data/animations/enemy/ballChainSoldier.inc diff --git a/data/animations/beetle.s b/data/animations/enemy/beetle.s similarity index 100% rename from data/animations/beetle.s rename to data/animations/enemy/beetle.s diff --git a/data/animations/bobomb.s b/data/animations/enemy/bobomb.s similarity index 100% rename from data/animations/bobomb.s rename to data/animations/enemy/bobomb.s diff --git a/data/animations/bombPeahat.s b/data/animations/enemy/bombPeahat.s similarity index 100% rename from data/animations/bombPeahat.s rename to data/animations/enemy/bombPeahat.s diff --git a/data/animations/bombarossa.inc b/data/animations/enemy/bombarossa.inc similarity index 100% rename from data/animations/bombarossa.inc rename to data/animations/enemy/bombarossa.inc diff --git a/data/animations/bowMoblin.inc b/data/animations/enemy/bowMoblin.inc similarity index 100% rename from data/animations/bowMoblin.inc rename to data/animations/enemy/bowMoblin.inc diff --git a/data/animations/businessScrub.s b/data/animations/enemy/businessScrub.s similarity index 100% rename from data/animations/businessScrub.s rename to data/animations/enemy/businessScrub.s diff --git a/data/animations/chaser.s b/data/animations/enemy/chaser.s similarity index 100% rename from data/animations/chaser.s rename to data/animations/enemy/chaser.s diff --git a/data/animations/chuchu.s b/data/animations/enemy/chuchu.s similarity index 100% rename from data/animations/chuchu.s rename to data/animations/enemy/chuchu.s diff --git a/data/animations/chuchuBoss.s b/data/animations/enemy/chuchuBoss.s similarity index 100% rename from data/animations/chuchuBoss.s rename to data/animations/enemy/chuchuBoss.s diff --git a/data/animations/cloudPiranha.inc b/data/animations/enemy/cloudPiranha.inc similarity index 100% rename from data/animations/cloudPiranha.inc rename to data/animations/enemy/cloudPiranha.inc diff --git a/data/animations/crow.inc b/data/animations/enemy/crow.inc similarity index 100% rename from data/animations/crow.inc rename to data/animations/enemy/crow.inc diff --git a/data/animations/cuccoAggr.inc b/data/animations/enemy/cuccoAggr.inc similarity index 100% rename from data/animations/cuccoAggr.inc rename to data/animations/enemy/cuccoAggr.inc diff --git a/data/animations/curtain.inc b/data/animations/enemy/curtain.inc similarity index 100% rename from data/animations/curtain.inc rename to data/animations/enemy/curtain.inc diff --git a/data/animations/darkNut.s b/data/animations/enemy/darkNut.s similarity index 100% rename from data/animations/darkNut.s rename to data/animations/enemy/darkNut.s diff --git a/data/animations/doorMimic.s b/data/animations/enemy/doorMimic.s similarity index 100% rename from data/animations/doorMimic.s rename to data/animations/enemy/doorMimic.s diff --git a/data/animations/enemy5A.inc b/data/animations/enemy/enemy5A.inc similarity index 100% rename from data/animations/enemy5A.inc rename to data/animations/enemy/enemy5A.inc diff --git a/data/animations/enemy5F.inc b/data/animations/enemy/enemy5F.inc similarity index 100% rename from data/animations/enemy5F.inc rename to data/animations/enemy/enemy5F.inc diff --git a/data/animations/enemy62.inc b/data/animations/enemy/enemy62.inc similarity index 100% rename from data/animations/enemy62.inc rename to data/animations/enemy/enemy62.inc diff --git a/data/animations/enemyE.s b/data/animations/enemy/enemyE.s similarity index 100% rename from data/animations/enemyE.s rename to data/animations/enemy/enemyE.s diff --git a/data/animations/eyegore.inc b/data/animations/enemy/eyegore.inc similarity index 100% rename from data/animations/eyegore.inc rename to data/animations/enemy/eyegore.inc diff --git a/data/animations/fallingBoulder.s b/data/animations/enemy/fallingBoulder.s similarity index 100% rename from data/animations/fallingBoulder.s rename to data/animations/enemy/fallingBoulder.s diff --git a/data/animations/fireballGuy.inc b/data/animations/enemy/fireballGuy.inc similarity index 100% rename from data/animations/fireballGuy.inc rename to data/animations/enemy/fireballGuy.inc diff --git a/data/animations/flyingSkull.inc b/data/animations/enemy/flyingSkull.inc similarity index 100% rename from data/animations/flyingSkull.inc rename to data/animations/enemy/flyingSkull.inc diff --git a/data/animations/ghini.inc b/data/animations/enemy/ghini.inc similarity index 100% rename from data/animations/ghini.inc rename to data/animations/enemy/ghini.inc diff --git a/data/animations/gibdo.inc b/data/animations/enemy/gibdo.inc similarity index 100% rename from data/animations/gibdo.inc rename to data/animations/enemy/gibdo.inc diff --git a/data/animations/gleerok.inc b/data/animations/enemy/gleerok.inc similarity index 100% rename from data/animations/gleerok.inc rename to data/animations/enemy/gleerok.inc diff --git a/data/animations/gyorgChild.inc b/data/animations/enemy/gyorgChild.inc similarity index 100% rename from data/animations/gyorgChild.inc rename to data/animations/enemy/gyorgChild.inc diff --git a/data/animations/gyorgFemaleEye.inc b/data/animations/enemy/gyorgFemaleEye.inc similarity index 100% rename from data/animations/gyorgFemaleEye.inc rename to data/animations/enemy/gyorgFemaleEye.inc diff --git a/data/animations/gyorgFemaleMouth.inc b/data/animations/enemy/gyorgFemaleMouth.inc similarity index 100% rename from data/animations/gyorgFemaleMouth.inc rename to data/animations/enemy/gyorgFemaleMouth.inc diff --git a/data/animations/gyorgMale.inc b/data/animations/enemy/gyorgMale.inc similarity index 100% rename from data/animations/gyorgMale.inc rename to data/animations/enemy/gyorgMale.inc diff --git a/data/animations/helmasaur.s b/data/animations/enemy/helmasaur.s similarity index 100% rename from data/animations/helmasaur.s rename to data/animations/enemy/helmasaur.s diff --git a/data/animations/keaton.inc b/data/animations/enemy/keaton.inc similarity index 100% rename from data/animations/keaton.inc rename to data/animations/enemy/keaton.inc diff --git a/data/animations/keese.s b/data/animations/enemy/keese.s similarity index 100% rename from data/animations/keese.s rename to data/animations/enemy/keese.s diff --git a/data/animations/lakitu.s b/data/animations/enemy/lakitu.s similarity index 100% rename from data/animations/lakitu.s rename to data/animations/enemy/lakitu.s diff --git a/data/animations/leever.s b/data/animations/enemy/leever.s similarity index 100% rename from data/animations/leever.s rename to data/animations/enemy/leever.s diff --git a/data/animations/likeLike.s b/data/animations/enemy/likeLike.s similarity index 100% rename from data/animations/likeLike.s rename to data/animations/enemy/likeLike.s diff --git a/data/animations/madderpillar.s b/data/animations/enemy/madderpillar.s similarity index 100% rename from data/animations/madderpillar.s rename to data/animations/enemy/madderpillar.s diff --git a/data/animations/mazaalBracelet.inc b/data/animations/enemy/mazaalBracelet.inc similarity index 100% rename from data/animations/mazaalBracelet.inc rename to data/animations/enemy/mazaalBracelet.inc diff --git a/data/animations/mazaalHand.inc b/data/animations/enemy/mazaalHand.inc similarity index 100% rename from data/animations/mazaalHand.inc rename to data/animations/enemy/mazaalHand.inc diff --git a/data/animations/mazaalHead.inc b/data/animations/enemy/mazaalHead.inc similarity index 100% rename from data/animations/mazaalHead.inc rename to data/animations/enemy/mazaalHead.inc diff --git a/data/animations/mazaalMacro.inc b/data/animations/enemy/mazaalMacro.inc similarity index 100% rename from data/animations/mazaalMacro.inc rename to data/animations/enemy/mazaalMacro.inc diff --git a/data/animations/moldworm.s b/data/animations/enemy/moldworm.s similarity index 100% rename from data/animations/moldworm.s rename to data/animations/enemy/moldworm.s diff --git a/data/animations/mulldozer.inc b/data/animations/enemy/mulldozer.inc similarity index 100% rename from data/animations/mulldozer.inc rename to data/animations/enemy/mulldozer.inc diff --git a/data/animations/octorok.s b/data/animations/enemy/octorok.s similarity index 100% rename from data/animations/octorok.s rename to data/animations/enemy/octorok.s diff --git a/data/animations/octorokBoss.inc b/data/animations/enemy/octorokBoss.inc similarity index 100% rename from data/animations/octorokBoss.inc rename to data/animations/enemy/octorokBoss.inc diff --git a/data/animations/peahat.s b/data/animations/enemy/peahat.s similarity index 100% rename from data/animations/peahat.s rename to data/animations/enemy/peahat.s diff --git a/data/animations/pesto.s b/data/animations/enemy/pesto.s similarity index 100% rename from data/animations/pesto.s rename to data/animations/enemy/pesto.s diff --git a/data/animations/puffstool.s b/data/animations/enemy/puffstool.s similarity index 100% rename from data/animations/puffstool.s rename to data/animations/enemy/puffstool.s diff --git a/data/animations/rockChuchu.s b/data/animations/enemy/rockChuchu.s similarity index 100% rename from data/animations/rockChuchu.s rename to data/animations/enemy/rockChuchu.s diff --git a/data/animations/rollobite.s b/data/animations/enemy/rollobite.s similarity index 100% rename from data/animations/rollobite.s rename to data/animations/enemy/rollobite.s diff --git a/data/animations/rope.inc b/data/animations/enemy/rope.inc similarity index 100% rename from data/animations/rope.inc rename to data/animations/enemy/rope.inc diff --git a/data/animations/rupeeLike.s b/data/animations/enemy/rupeeLike.s similarity index 100% rename from data/animations/rupeeLike.s rename to data/animations/enemy/rupeeLike.s diff --git a/data/animations/scissorsBeetle.inc b/data/animations/enemy/scissorsBeetle.inc similarity index 100% rename from data/animations/scissorsBeetle.inc rename to data/animations/enemy/scissorsBeetle.inc diff --git a/data/animations/slime.inc b/data/animations/enemy/slime.inc similarity index 100% rename from data/animations/slime.inc rename to data/animations/enemy/slime.inc diff --git a/data/animations/sluggula.s b/data/animations/enemy/sluggula.s similarity index 100% rename from data/animations/sluggula.s rename to data/animations/enemy/sluggula.s diff --git a/data/animations/spark.s b/data/animations/enemy/spark.s similarity index 100% rename from data/animations/spark.s rename to data/animations/enemy/spark.s diff --git a/data/animations/spearMoblin.s b/data/animations/enemy/spearMoblin.s similarity index 100% rename from data/animations/spearMoblin.s rename to data/animations/enemy/spearMoblin.s diff --git a/data/animations/spikedBeetle.s b/data/animations/enemy/spikedBeetle.s similarity index 100% rename from data/animations/spikedBeetle.s rename to data/animations/enemy/spikedBeetle.s diff --git a/data/animations/spinyBeetle.inc b/data/animations/enemy/spinyBeetle.inc similarity index 100% rename from data/animations/spinyBeetle.inc rename to data/animations/enemy/spinyBeetle.inc diff --git a/data/animations/spinyChuchu.s b/data/animations/enemy/spinyChuchu.s similarity index 100% rename from data/animations/spinyChuchu.s rename to data/animations/enemy/spinyChuchu.s diff --git a/data/animations/stalfos.inc b/data/animations/enemy/stalfos.inc similarity index 100% rename from data/animations/stalfos.inc rename to data/animations/enemy/stalfos.inc diff --git a/data/animations/tektite.inc b/data/animations/enemy/tektite.inc similarity index 100% rename from data/animations/tektite.inc rename to data/animations/enemy/tektite.inc diff --git a/data/animations/vaatiArm.inc b/data/animations/enemy/vaatiArm.inc similarity index 100% rename from data/animations/vaatiArm.inc rename to data/animations/enemy/vaatiArm.inc diff --git a/data/animations/vaatiBall.inc b/data/animations/enemy/vaatiBall.inc similarity index 100% rename from data/animations/vaatiBall.inc rename to data/animations/enemy/vaatiBall.inc diff --git a/data/animations/vaatiEyesMacro.inc b/data/animations/enemy/vaatiEyesMacro.inc similarity index 100% rename from data/animations/vaatiEyesMacro.inc rename to data/animations/enemy/vaatiEyesMacro.inc diff --git a/data/animations/vaatiProjectile.inc b/data/animations/enemy/vaatiProjectile.inc similarity index 100% rename from data/animations/vaatiProjectile.inc rename to data/animations/enemy/vaatiProjectile.inc diff --git a/data/animations/vaatiRebornEnemy.inc b/data/animations/enemy/vaatiRebornEnemy.inc similarity index 100% rename from data/animations/vaatiRebornEnemy.inc rename to data/animations/enemy/vaatiRebornEnemy.inc diff --git a/data/animations/vaatiTransfigured.inc b/data/animations/enemy/vaatiTransfigured.inc similarity index 100% rename from data/animations/vaatiTransfigured.inc rename to data/animations/enemy/vaatiTransfigured.inc diff --git a/data/animations/vaatiWrath.inc b/data/animations/enemy/vaatiWrath.inc similarity index 100% rename from data/animations/vaatiWrath.inc rename to data/animations/enemy/vaatiWrath.inc diff --git a/data/animations/wallMaster.s b/data/animations/enemy/wallMaster.s similarity index 100% rename from data/animations/wallMaster.s rename to data/animations/enemy/wallMaster.s diff --git a/data/animations/waterDrop.s b/data/animations/enemy/waterDrop.s similarity index 100% rename from data/animations/waterDrop.s rename to data/animations/enemy/waterDrop.s diff --git a/data/animations/wisp.inc b/data/animations/enemy/wisp.inc similarity index 100% rename from data/animations/wisp.inc rename to data/animations/enemy/wisp.inc diff --git a/data/animations/wizzrobeFire.inc b/data/animations/enemy/wizzrobeFire.inc similarity index 100% rename from data/animations/wizzrobeFire.inc rename to data/animations/enemy/wizzrobeFire.inc diff --git a/data/animations/wizzrobeIce.inc b/data/animations/enemy/wizzrobeIce.inc similarity index 100% rename from data/animations/wizzrobeIce.inc rename to data/animations/enemy/wizzrobeIce.inc diff --git a/data/animations/wizzrobeWind.inc b/data/animations/enemy/wizzrobeWind.inc similarity index 100% rename from data/animations/wizzrobeWind.inc rename to data/animations/enemy/wizzrobeWind.inc diff --git a/data/animations/greatFairy.s b/data/animations/npc/greatFairy.s similarity index 100% rename from data/animations/greatFairy.s rename to data/animations/npc/greatFairy.s diff --git a/data/code_08049D30.inc b/data/const/code_08049D30.inc similarity index 100% rename from data/code_08049D30.inc rename to data/const/code_08049D30.inc diff --git a/data/acroBandits.inc b/data/const/enemy/acroBandits.inc similarity index 100% rename from data/acroBandits.inc rename to data/const/enemy/acroBandits.inc diff --git a/data/armos.inc b/data/const/enemy/armos.inc similarity index 100% rename from data/armos.inc rename to data/const/enemy/armos.inc diff --git a/data/ballChainSoldier.inc b/data/const/enemy/ballChainSoldier.inc similarity index 100% rename from data/ballChainSoldier.inc rename to data/const/enemy/ballChainSoldier.inc diff --git a/data/bombarossa.inc b/data/const/enemy/bombarossa.inc similarity index 100% rename from data/bombarossa.inc rename to data/const/enemy/bombarossa.inc diff --git a/data/bowMoblin.inc b/data/const/enemy/bowMoblin.inc similarity index 100% rename from data/bowMoblin.inc rename to data/const/enemy/bowMoblin.inc diff --git a/data/businessScrubPrologue.inc b/data/const/enemy/businessScrubPrologue.inc similarity index 100% rename from data/businessScrubPrologue.inc rename to data/const/enemy/businessScrubPrologue.inc diff --git a/data/cloudPiranha.inc b/data/const/enemy/cloudPiranha.inc similarity index 100% rename from data/cloudPiranha.inc rename to data/const/enemy/cloudPiranha.inc diff --git a/data/crow.inc b/data/const/enemy/crow.inc similarity index 100% rename from data/crow.inc rename to data/const/enemy/crow.inc diff --git a/data/cuccoAggr.inc b/data/const/enemy/cuccoAggr.inc similarity index 100% rename from data/cuccoAggr.inc rename to data/const/enemy/cuccoAggr.inc diff --git a/data/curtain.inc b/data/const/enemy/curtain.inc similarity index 100% rename from data/curtain.inc rename to data/const/enemy/curtain.inc diff --git a/data/dust.inc b/data/const/enemy/dust.inc similarity index 100% rename from data/dust.inc rename to data/const/enemy/dust.inc diff --git a/data/enemy49.inc b/data/const/enemy/enemy49.inc similarity index 100% rename from data/enemy49.inc rename to data/const/enemy/enemy49.inc diff --git a/data/enemy4D.inc b/data/const/enemy/enemy4D.inc similarity index 100% rename from data/enemy4D.inc rename to data/const/enemy/enemy4D.inc diff --git a/data/enemy50.inc b/data/const/enemy/enemy50.inc similarity index 100% rename from data/enemy50.inc rename to data/const/enemy/enemy50.inc diff --git a/data/enemy5A.inc b/data/const/enemy/enemy5A.inc similarity index 100% rename from data/enemy5A.inc rename to data/const/enemy/enemy5A.inc diff --git a/data/enemy5F.inc b/data/const/enemy/enemy5F.inc similarity index 100% rename from data/enemy5F.inc rename to data/const/enemy/enemy5F.inc diff --git a/data/enemy62.inc b/data/const/enemy/enemy62.inc similarity index 100% rename from data/enemy62.inc rename to data/const/enemy/enemy62.inc diff --git a/data/enemy64.inc b/data/const/enemy/enemy64.inc similarity index 100% rename from data/enemy64.inc rename to data/const/enemy/enemy64.inc diff --git a/data/enemy66.inc b/data/const/enemy/enemy66.inc similarity index 100% rename from data/enemy66.inc rename to data/const/enemy/enemy66.inc diff --git a/data/eyegore.inc b/data/const/enemy/eyegore.inc similarity index 100% rename from data/eyegore.inc rename to data/const/enemy/eyegore.inc diff --git a/data/fireballGuy.inc b/data/const/enemy/fireballGuy.inc similarity index 100% rename from data/fireballGuy.inc rename to data/const/enemy/fireballGuy.inc diff --git a/data/flyingPot.inc b/data/const/enemy/flyingPot.inc similarity index 100% rename from data/flyingPot.inc rename to data/const/enemy/flyingPot.inc diff --git a/data/flyingSkull.inc b/data/const/enemy/flyingSkull.inc similarity index 100% rename from data/flyingSkull.inc rename to data/const/enemy/flyingSkull.inc diff --git a/data/ghini.inc b/data/const/enemy/ghini.inc similarity index 100% rename from data/ghini.inc rename to data/const/enemy/ghini.inc diff --git a/data/gibdo.inc b/data/const/enemy/gibdo.inc similarity index 100% rename from data/gibdo.inc rename to data/const/enemy/gibdo.inc diff --git a/data/gleerok.inc b/data/const/enemy/gleerok.inc similarity index 100% rename from data/gleerok.inc rename to data/const/enemy/gleerok.inc diff --git a/data/gyorgChild.inc b/data/const/enemy/gyorgChild.inc similarity index 100% rename from data/gyorgChild.inc rename to data/const/enemy/gyorgChild.inc diff --git a/data/gyorgFemale.inc b/data/const/enemy/gyorgFemale.inc similarity index 100% rename from data/gyorgFemale.inc rename to data/const/enemy/gyorgFemale.inc diff --git a/data/gyorgFemaleEye.inc b/data/const/enemy/gyorgFemaleEye.inc similarity index 100% rename from data/gyorgFemaleEye.inc rename to data/const/enemy/gyorgFemaleEye.inc diff --git a/data/gyorgFemaleMouth.inc b/data/const/enemy/gyorgFemaleMouth.inc similarity index 100% rename from data/gyorgFemaleMouth.inc rename to data/const/enemy/gyorgFemaleMouth.inc diff --git a/data/keaton.inc b/data/const/enemy/keaton.inc similarity index 100% rename from data/keaton.inc rename to data/const/enemy/keaton.inc diff --git a/data/mazaalBracelet.inc b/data/const/enemy/mazaalBracelet.inc similarity index 100% rename from data/mazaalBracelet.inc rename to data/const/enemy/mazaalBracelet.inc diff --git a/data/mazaalHand.inc b/data/const/enemy/mazaalHand.inc similarity index 100% rename from data/mazaalHand.inc rename to data/const/enemy/mazaalHand.inc diff --git a/data/mazaalHead.inc b/data/const/enemy/mazaalHead.inc similarity index 100% rename from data/mazaalHead.inc rename to data/const/enemy/mazaalHead.inc diff --git a/data/mazaalMacro.inc b/data/const/enemy/mazaalMacro.inc similarity index 100% rename from data/mazaalMacro.inc rename to data/const/enemy/mazaalMacro.inc diff --git a/data/miniFireballGuy.inc b/data/const/enemy/miniFireballGuy.inc similarity index 100% rename from data/miniFireballGuy.inc rename to data/const/enemy/miniFireballGuy.inc diff --git a/data/miniSlime.inc b/data/const/enemy/miniSlime.inc similarity index 100% rename from data/miniSlime.inc rename to data/const/enemy/miniSlime.inc diff --git a/data/mulldozer.inc b/data/const/enemy/mulldozer.inc similarity index 100% rename from data/mulldozer.inc rename to data/const/enemy/mulldozer.inc diff --git a/data/octorokBoss.inc b/data/const/enemy/octorokBoss.inc similarity index 100% rename from data/octorokBoss.inc rename to data/const/enemy/octorokBoss.inc diff --git a/data/octorokGolden.inc b/data/const/enemy/octorokGolden.inc similarity index 100% rename from data/octorokGolden.inc rename to data/const/enemy/octorokGolden.inc diff --git a/data/rope.inc b/data/const/enemy/rope.inc similarity index 100% rename from data/rope.inc rename to data/const/enemy/rope.inc diff --git a/data/ropeGolden.inc b/data/const/enemy/ropeGolden.inc similarity index 100% rename from data/ropeGolden.inc rename to data/const/enemy/ropeGolden.inc diff --git a/data/scissorsBeetle.inc b/data/const/enemy/scissorsBeetle.inc similarity index 100% rename from data/scissorsBeetle.inc rename to data/const/enemy/scissorsBeetle.inc diff --git a/data/slime.inc b/data/const/enemy/slime.inc similarity index 100% rename from data/slime.inc rename to data/const/enemy/slime.inc diff --git a/data/smallPesto.inc b/data/const/enemy/smallPesto.inc similarity index 100% rename from data/smallPesto.inc rename to data/const/enemy/smallPesto.inc diff --git a/data/spinyBeetle.inc b/data/const/enemy/spinyBeetle.inc similarity index 100% rename from data/spinyBeetle.inc rename to data/const/enemy/spinyBeetle.inc diff --git a/data/stalfos.inc b/data/const/enemy/stalfos.inc similarity index 100% rename from data/stalfos.inc rename to data/const/enemy/stalfos.inc diff --git a/data/takkuri.inc b/data/const/enemy/takkuri.inc similarity index 100% rename from data/takkuri.inc rename to data/const/enemy/takkuri.inc diff --git a/data/tektite.inc b/data/const/enemy/tektite.inc similarity index 100% rename from data/tektite.inc rename to data/const/enemy/tektite.inc diff --git a/data/tektiteGolden.inc b/data/const/enemy/tektiteGolden.inc similarity index 100% rename from data/tektiteGolden.inc rename to data/const/enemy/tektiteGolden.inc diff --git a/data/treeItem.inc b/data/const/enemy/treeItem.inc similarity index 100% rename from data/treeItem.inc rename to data/const/enemy/treeItem.inc diff --git a/data/vaatiArm.inc b/data/const/enemy/vaatiArm.inc similarity index 100% rename from data/vaatiArm.inc rename to data/const/enemy/vaatiArm.inc diff --git a/data/vaatiBall.inc b/data/const/enemy/vaatiBall.inc similarity index 100% rename from data/vaatiBall.inc rename to data/const/enemy/vaatiBall.inc diff --git a/data/vaatiEyesMacro.inc b/data/const/enemy/vaatiEyesMacro.inc similarity index 100% rename from data/vaatiEyesMacro.inc rename to data/const/enemy/vaatiEyesMacro.inc diff --git a/data/vaatiProjectile.inc b/data/const/enemy/vaatiProjectile.inc similarity index 100% rename from data/vaatiProjectile.inc rename to data/const/enemy/vaatiProjectile.inc diff --git a/data/vaatiRebornEnemy.inc b/data/const/enemy/vaatiRebornEnemy.inc similarity index 100% rename from data/vaatiRebornEnemy.inc rename to data/const/enemy/vaatiRebornEnemy.inc diff --git a/data/vaatiTransfigured.inc b/data/const/enemy/vaatiTransfigured.inc similarity index 100% rename from data/vaatiTransfigured.inc rename to data/const/enemy/vaatiTransfigured.inc diff --git a/data/vaatiWrath.inc b/data/const/enemy/vaatiWrath.inc similarity index 100% rename from data/vaatiWrath.inc rename to data/const/enemy/vaatiWrath.inc diff --git a/data/wisp.inc b/data/const/enemy/wisp.inc similarity index 100% rename from data/wisp.inc rename to data/const/enemy/wisp.inc diff --git a/data/wizzrobeFire.inc b/data/const/enemy/wizzrobeFire.inc similarity index 100% rename from data/wizzrobeFire.inc rename to data/const/enemy/wizzrobeFire.inc diff --git a/data/wizzrobeIce.inc b/data/const/enemy/wizzrobeIce.inc similarity index 100% rename from data/wizzrobeIce.inc rename to data/const/enemy/wizzrobeIce.inc diff --git a/data/wizzrobeWind.inc b/data/const/enemy/wizzrobeWind.inc similarity index 100% rename from data/wizzrobeWind.inc rename to data/const/enemy/wizzrobeWind.inc diff --git a/data/data_080CC6FC.s b/data/data_080CC6FC.s index ca448653..ddb2f0e4 100644 --- a/data/data_080CC6FC.s +++ b/data/data_080CC6FC.s @@ -4,100 +4,100 @@ .section .rodata @ TODO convert .inc files into .s files and include them in linker.ld - .include "data/gleerok.inc" - .include "data/animations/gleerok.inc" + .include "data/const/enemy/gleerok.inc" + .include "data/animations/enemy/gleerok.inc" - .include "data/vaatiEyesMacro.inc" - .include "data/animations/vaatiEyesMacro.inc" + .include "data/const/enemy/vaatiEyesMacro.inc" + .include "data/animations/enemy/vaatiEyesMacro.inc" - .include "data/tektite.inc" - .include "data/animations/tektite.inc" + .include "data/const/enemy/tektite.inc" + .include "data/animations/enemy/tektite.inc" - .include "data/wizzrobeWind.inc" - .include "data/animations/wizzrobeWind.inc" + .include "data/const/enemy/wizzrobeWind.inc" + .include "data/animations/enemy/wizzrobeWind.inc" - .include "data/wizzrobeFire.inc" - .include "data/animations/wizzrobeFire.inc" + .include "data/const/enemy/wizzrobeFire.inc" + .include "data/animations/enemy/wizzrobeFire.inc" - .include "data/wizzrobeIce.inc" - .include "data/animations/wizzrobeIce.inc" + .include "data/const/enemy/wizzrobeIce.inc" + .include "data/animations/enemy/wizzrobeIce.inc" - .include "data/armos.inc" - .include "data/animations/armos.inc" + .include "data/const/enemy/armos.inc" + .include "data/animations/enemy/armos.inc" - .include "data/eyegore.inc" - .include "data/animations/eyegore.inc" + .include "data/const/enemy/eyegore.inc" + .include "data/animations/enemy/eyegore.inc" - .include "data/rope.inc" - .include "data/animations/rope.inc" + .include "data/const/enemy/rope.inc" + .include "data/animations/enemy/rope.inc" - .include "data/smallPesto.inc" + .include "data/const/enemy/smallPesto.inc" - .include "data/acroBandits.inc" - .include "data/animations/acroBandits.inc" + .include "data/const/enemy/acroBandits.inc" + .include "data/animations/enemy/acroBandits.inc" - .include "data/keaton.inc" - .include "data/animations/keaton.inc" + .include "data/const/enemy/keaton.inc" + .include "data/animations/enemy/keaton.inc" - .include "data/crow.inc" - .include "data/animations/crow.inc" + .include "data/const/enemy/crow.inc" + .include "data/animations/enemy/crow.inc" - .include "data/mulldozer.inc" - .include "data/animations/mulldozer.inc" + .include "data/const/enemy/mulldozer.inc" + .include "data/animations/enemy/mulldozer.inc" - .include "data/bombarossa.inc" - .include "data/animations/bombarossa.inc" + .include "data/const/enemy/bombarossa.inc" + .include "data/animations/enemy/bombarossa.inc" - .include "data/wisp.inc" - .include "data/animations/wisp.inc" + .include "data/const/enemy/wisp.inc" + .include "data/animations/enemy/wisp.inc" .incbin "baserom.gba", 0x0CEBDC, 0x000010 - .include "data/spinyBeetle.inc" - .include "data/animations/spinyBeetle.inc" + .include "data/const/enemy/spinyBeetle.inc" + .include "data/animations/enemy/spinyBeetle.inc" - .include "data/mazaalHead.inc" - .include "data/animations/mazaalHead.inc" + .include "data/const/enemy/mazaalHead.inc" + .include "data/animations/enemy/mazaalHead.inc" - .include "data/mazaalMacro.inc" - .include "data/animations/mazaalMacro.inc" + .include "data/const/enemy/mazaalMacro.inc" + .include "data/animations/enemy/mazaalMacro.inc" - .include "data/mazaalHand.inc" - .include "data/animations/mazaalHand.inc" + .include "data/const/enemy/mazaalHand.inc" + .include "data/animations/enemy/mazaalHand.inc" - .include "data/octorokBoss.inc" - .include "data/animations/octorokBoss.inc" + .include "data/const/enemy/octorokBoss.inc" + .include "data/animations/enemy/octorokBoss.inc" - .include "data/flyingPot.inc" + .include "data/const/enemy/flyingPot.inc" - .include "data/gibdo.inc" - .include "data/animations/gibdo.inc" + .include "data/const/enemy/gibdo.inc" + .include "data/animations/enemy/gibdo.inc" - .include "data/octorokGolden.inc" + .include "data/const/enemy/octorokGolden.inc" - .include "data/tektiteGolden.inc" + .include "data/const/enemy/tektiteGolden.inc" - .include "data/ropeGolden.inc" + .include "data/const/enemy/ropeGolden.inc" - .include "data/cloudPiranha.inc" - .include "data/animations/cloudPiranha.inc" + .include "data/const/enemy/cloudPiranha.inc" + .include "data/animations/enemy/cloudPiranha.inc" - .include "data/scissorsBeetle.inc" - .include "data/animations/scissorsBeetle.inc" + .include "data/const/enemy/scissorsBeetle.inc" + .include "data/animations/enemy/scissorsBeetle.inc" - .include "data/cuccoAggr.inc" - .include "data/animations/cuccoAggr.inc" + .include "data/const/enemy/cuccoAggr.inc" + .include "data/animations/enemy/cuccoAggr.inc" - .include "data/stalfos.inc" - .include "data/animations/stalfos.inc" + .include "data/const/enemy/stalfos.inc" + .include "data/animations/enemy/stalfos.inc" - .include "data/flyingSkull.inc" - .include "data/animations/flyingSkull.inc" + .include "data/const/enemy/flyingSkull.inc" + .include "data/animations/enemy/flyingSkull.inc" - .include "data/mazaalBracelet.inc" - .include "data/animations/mazaalBracelet.inc" + .include "data/const/enemy/mazaalBracelet.inc" + .include "data/animations/enemy/mazaalBracelet.inc" - .include "data/takkuri.inc" + .include "data/const/enemy/takkuri.inc" - .include "data/bowMoblin.inc" - .include "data/animations/bowMoblin.inc" + .include "data/const/enemy/bowMoblin.inc" + .include "data/animations/enemy/bowMoblin.inc" diff --git a/data/data_080D0448.s b/data/data_080D0448.s index 7f9f086b..9602baa3 100644 --- a/data/data_080D0448.s +++ b/data/data_080D0448.s @@ -5,51 +5,51 @@ .align 2 @ TODO convert .inc files into .s files and include them in linker.ld - .include "data/enemy49.inc" + .include "data/const/enemy/enemy49.inc" - .include "data/vaatiRebornEnemy.inc" - .include "data/animations/vaatiRebornEnemy.inc" + .include "data/const/enemy/vaatiRebornEnemy.inc" + .include "data/animations/enemy/vaatiRebornEnemy.inc" - .include "data/vaatiProjectile.inc" - .include "data/animations/vaatiProjectile.inc" + .include "data/const/enemy/vaatiProjectile.inc" + .include "data/animations/enemy/vaatiProjectile.inc" - .include "data/ballChainSoldier.inc" - .include "data/animations/ballChainSoldier.inc" + .include "data/const/enemy/ballChainSoldier.inc" + .include "data/animations/enemy/ballChainSoldier.inc" - .include "data/enemy4D.inc" + .include "data/const/enemy/enemy4D.inc" - .include "data/ghini.inc" - .include "data/animations/ghini.inc" + .include "data/const/enemy/ghini.inc" + .include "data/animations/enemy/ghini.inc" - .include "data/vaatiTransfigured.inc" - .include "data/animations/vaatiTransfigured.inc" + .include "data/const/enemy/vaatiTransfigured.inc" + .include "data/animations/enemy/vaatiTransfigured.inc" - .include "data/enemy50.inc" + .include "data/const/enemy/enemy50.inc" - .include "data/vaatiWrath.inc" - .include "data/animations/vaatiWrath.inc" + .include "data/const/enemy/vaatiWrath.inc" + .include "data/animations/enemy/vaatiWrath.inc" - .include "data/vaatiArm.inc" - .include "data/animations/vaatiArm.inc" + .include "data/const/enemy/vaatiArm.inc" + .include "data/animations/enemy/vaatiArm.inc" - .include "data/dust.inc" + .include "data/const/enemy/dust.inc" - .include "data/vaatiBall.inc" - .include "data/animations/vaatiBall.inc" + .include "data/const/enemy/vaatiBall.inc" + .include "data/animations/enemy/vaatiBall.inc" - .include "data/slime.inc" - .include "data/animations/slime.inc" + .include "data/const/enemy/slime.inc" + .include "data/animations/enemy/slime.inc" - .include "data/miniSlime.inc" + .include "data/const/enemy/miniSlime.inc" - .include "data/fireballGuy.inc" - .include "data/animations/fireballGuy.inc" + .include "data/const/enemy/fireballGuy.inc" + .include "data/animations/enemy/fireballGuy.inc" - .include "data/miniFireballGuy.inc" + .include "data/const/enemy/miniFireballGuy.inc" - .include "data/enemy5A.inc" - .include "data/animations/enemy5A.inc" + .include "data/const/enemy/enemy5A.inc" + .include "data/animations/enemy/enemy5A.inc" - .include "data/businessScrubPrologue.inc" + .include "data/const/enemy/businessScrubPrologue.inc" - .include "data/gyorgFemale.inc" + .include "data/const/enemy/gyorgFemale.inc" diff --git a/data/data_080D1C70.s b/data/data_080D1C70.s index 221ebc2b..1c9dc17a 100644 --- a/data/data_080D1C70.s +++ b/data/data_080D1C70.s @@ -6,30 +6,30 @@ @ TODO convert .inc files into .s files and include them in linker.ld - .include "data/animations/gyorgMale.inc" + .include "data/animations/enemy/gyorgMale.inc" - .include "data/curtain.inc" - .include "data/animations/curtain.inc" + .include "data/const/enemy/curtain.inc" + .include "data/animations/enemy/curtain.inc" - .include "data/enemy5F.inc" - .include "data/animations/enemy5F.inc" + .include "data/const/enemy/enemy5F.inc" + .include "data/animations/enemy/enemy5F.inc" - .include "data/gyorgChild.inc" - .include "data/animations/gyorgChild.inc" + .include "data/const/enemy/gyorgChild.inc" + .include "data/animations/enemy/gyorgChild.inc" - .include "data/gyorgFemaleEye.inc" - .include "data/animations/gyorgFemaleEye.inc" + .include "data/const/enemy/gyorgFemaleEye.inc" + .include "data/animations/enemy/gyorgFemaleEye.inc" - .include "data/enemy62.inc" - .include "data/animations/enemy62.inc" + .include "data/const/enemy/enemy62.inc" + .include "data/animations/enemy/enemy62.inc" - .include "data/gyorgFemaleMouth.inc" - .include "data/animations/gyorgFemaleMouth.inc" + .include "data/const/enemy/gyorgFemaleMouth.inc" + .include "data/animations/enemy/gyorgFemaleMouth.inc" - .include "data/enemy64.inc" + .include "data/const/enemy/enemy64.inc" - .include "data/treeItem.inc" + .include "data/const/enemy/treeItem.inc" - .include "data/enemy66.inc" + .include "data/const/enemy/enemy66.inc" - .include "data/code_08049D30.inc" + .include "data/const/code_08049D30.inc" diff --git a/data/data_08108D30.s b/data/data_08108D30.s index 445dfc43..5afcf96e 100644 --- a/data/data_08108D30.s +++ b/data/data_08108D30.s @@ -391,7 +391,7 @@ gUnk_08109B60:: @ 08109B60 gUnk_08109B80:: @ 08109B80 .incbin "baserom.gba", 0x109B80, 0x000003C -gUnk_08109BBC:: @ 08109BBC +gUnk_08109BBC:: @ 08109BBC TODO festari .incbin "baserom.gba", 0x109BBC, 0x000000C gUnk_08109BC8:: @ 08109BC8 @@ -427,7 +427,7 @@ gUnk_08109C59:: @ 08109C59 gUnk_08109C60:: @ 08109C60 .incbin "baserom.gba", 0x109C60, 0x0000038 -gUnk_08109C98:: @ 08109C98 +gUnk_08109C98:: @ 08109C98 TODO forestMinish.c .incbin "baserom.gba", 0x109C98, 0x0000080 gUnk_08109D18:: @ 08109D18 diff --git a/linker.ld b/linker.ld index bc1ce302..c6d01c22 100644 --- a/linker.ld +++ b/linker.ld @@ -907,75 +907,75 @@ SECTIONS { src/coord.o(.rodata); data/data_080C93E0.o(.rodata); src/enemy/octorok.o(.rodata); - data/animations/octorok.o(.rodata); + data/animations/enemy/octorok.o(.rodata); src/enemy/chuchu.o(.rodata); - data/animations/chuchu.o(.rodata); + data/animations/enemy/chuchu.o(.rodata); src/enemy/leever.o(.rodata); - data/animations/leever.o(.rodata); + data/animations/enemy/leever.o(.rodata); src/enemy/peahat.o(.rodata); - data/animations/peahat.o(.rodata); + data/animations/enemy/peahat.o(.rodata); src/enemy/rollobite.o(.rodata); - data/animations/rollobite.o(.rodata); + data/animations/enemy/rollobite.o(.rodata); src/enemy/darkNut.o(.rodata); - data/animations/darkNut.o(.rodata); + data/animations/enemy/darkNut.o(.rodata); src/enemy/hangingSeed.o(.rodata); src/enemy/beetle.o(.rodata); - data/animations/beetle.o(.rodata); + data/animations/enemy/beetle.o(.rodata); src/enemy/keese.o(.rodata); - data/animations/keese.o(.rodata); + data/animations/enemy/keese.o(.rodata); src/enemy/doorMimic.o(.rodata); - data/animations/doorMimic.o(.rodata); + data/animations/enemy/doorMimic.o(.rodata); src/enemy/rockChuchu.o(.rodata); - data/animations/rockChuchu.o(.rodata); + data/animations/enemy/rockChuchu.o(.rodata); src/enemy/spinyChuchu.o(.rodata); - data/animations/spinyChuchu.o(.rodata); + data/animations/enemy/spinyChuchu.o(.rodata); src/enemy/cuccoChickAggr.o(.rodata); src/enemy/moldorm.o(.rodata); src/enemy/enemyE.o(.rodata); - data/animations/enemyE.o(.rodata); + data/animations/enemy/enemyE.o(.rodata); src/enemy/moldworm.o(.rodata); - data/animations/moldworm.o(.rodata); + data/animations/enemy/moldworm.o(.rodata); src/enemy/sluggula.o(.rodata); - data/animations/sluggula.o(.rodata); + data/animations/enemy/sluggula.o(.rodata); src/enemy/pesto.o(.rodata); - data/animations/pesto.o(.rodata); + data/animations/enemy/pesto.o(.rodata); src/enemy/puffstool.o(.rodata); - data/animations/puffstool.o(.rodata); + data/animations/enemy/puffstool.o(.rodata); src/enemy/chuchuBoss.o(.rodata); - data/animations/chuchuBoss.o(.rodata); + data/animations/enemy/chuchuBoss.o(.rodata); src/enemy/likeLike.o(.rodata); - data/animations/likeLike.o(.rodata); + data/animations/enemy/likeLike.o(.rodata); src/enemy/spearMoblin.o(.rodata); - data/animations/spearMoblin.o(.rodata); + data/animations/enemy/spearMoblin.o(.rodata); src/enemy/businessScrub.o(.rodata); - data/animations/businessScrub.o(.rodata); + data/animations/enemy/businessScrub.o(.rodata); src/enemy/rupeeLike.o(.rodata); - data/animations/rupeeLike.o(.rodata); + data/animations/enemy/rupeeLike.o(.rodata); src/enemy/madderpillar.o(.rodata); - data/animations/madderpillar.o(.rodata); + data/animations/enemy/madderpillar.o(.rodata); src/enemy/waterDrop.o(.rodata); - data/animations/waterDrop.o(.rodata); + data/animations/enemy/waterDrop.o(.rodata); src/enemy/wallMaster.o(.rodata); - data/animations/wallMaster.o(.rodata); + data/animations/enemy/wallMaster.o(.rodata); src/enemy/bombPeahat.o(.rodata); - data/animations/bombPeahat.o(.rodata); + data/animations/enemy/bombPeahat.o(.rodata); src/enemy/spark.o(.rodata); - data/animations/spark.o(.rodata); + data/animations/enemy/spark.o(.rodata); src/enemy/chaser.o(.rodata); - data/animations/chaser.o(.rodata); + data/animations/enemy/chaser.o(.rodata); src/enemy/spikedBeetle.o(.rodata); - data/animations/spikedBeetle.o(.rodata); + data/animations/enemy/spikedBeetle.o(.rodata); src/enemy/sensorBladeTrap.o(.rodata); src/enemy/helmasaur.o(.rodata); - data/animations/helmasaur.o(.rodata); + data/animations/enemy/helmasaur.o(.rodata); src/enemy/fallingBoulder.o(.rodata); - data/animations/fallingBoulder.o(.rodata); + data/animations/enemy/fallingBoulder.o(.rodata); src/enemy/bobomb.o(.rodata); - data/animations/bobomb.o(.rodata); + data/animations/enemy/bobomb.o(.rodata); src/enemy/wallMaster2.o(.rodata); data/data_080CC6FC.o(.rodata); src/enemy/lakitu.o(.rodata); - data/animations/lakitu.o(.rodata); + data/animations/enemy/lakitu.o(.rodata); src/enemy/lakituCloud.o(.rodata); data/data_080D0448.o(.rodata); src/enemy/gyorgMale.o(.rodata); @@ -1018,7 +1018,7 @@ SECTIONS { src/script.o(.rodata); data/data_0811E750.o(.rodata); src/object/greatFairy.o(.rodata); - data/animations/greatFairy.o(.rodata); + data/animations/npc/greatFairy.o(.rodata); data/data_081208A0.o(.rodata); src/object/heartContainer.o(.rodata); data/data_08121C58.o(.rodata);