rename files, sort asm into subdirectories

2021-12-28 13:53:53 -08:00 · 2021-12-28 13:53:53 -08:00 · 3fd900f1bc
parent 0f65f8fd50
commit 3fd900f1bc
313 changed files with 346 additions and 405 deletions
--- a/2
+++ b/2
@ -131,7 +131,7 @@ C_SRCS := $(wildcard $(C_SUBDIR)/*.c $(C_SUBDIR)/*/*.c)
 C_OBJS := $(patsubst $(C_SUBDIR)/%.c,$(C_BUILDDIR)/%.o,$(C_SRCS))

 ASM_SRCS := $(wildcard $(ASM_SUBDIR)/*.s $(ASM_SUBDIR)/*/*.s)
-ASM_OBJS := $(patsubst $(ASM_SUBDIR)/%.s,$(ASM_BUILDDIR)/%.o,$(ASM_SRCS))
+ASM_OBJS := $(patsubst $(ASM_SUBDIR)/%.s,$(ASM_BUILDDIR)/%.o,$(ASM_SRCS)) $(patsubst $(ASM_SUBDIR)/*/%.s,$(ASM_BUILDDIR)/**/%.o,$(ASM_SRCS))

 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))
--- a/asm/enemy/armos.s
+++ b/asm/enemy/armos.s
--- a/asm/enemy/ballChainSoldier.s
+++ b/asm/enemy/ballChainSoldier.s
--- a/asm/enemy/bombarossa.s
+++ b/asm/enemy/bombarossa.s
--- a/asm/enemy/bowMoblin.s
+++ b/asm/enemy/bowMoblin.s
--- a/asm/enemy/businessScrubPrologue.s
+++ b/asm/enemy/businessScrubPrologue.s
--- a/asm/enemy/chuchuBoss.s
+++ b/asm/enemy/chuchuBoss.s
--- a/asm/enemy/cloudPiranha.s
+++ b/asm/enemy/cloudPiranha.s
--- a/asm/enemy/code_080300AC.s
+++ b/asm/enemy/code_080300AC.s
--- a/asm/enemy/crow.s
+++ b/asm/enemy/crow.s
--- a/asm/enemy/cuccoAggr.s
+++ b/asm/enemy/cuccoAggr.s
--- a/asm/enemy/curtain.s
+++ b/asm/enemy/curtain.s
--- a/asm/enemy/dust.s
+++ b/asm/enemy/dust.s
--- a/asm/enemy/enemy49.s
+++ b/asm/enemy/enemy49.s
--- a/asm/enemy/enemy4D.s
+++ b/asm/enemy/enemy4D.s
--- a/asm/enemy/enemy50.s
+++ b/asm/enemy/enemy50.s
--- a/asm/enemy/enemy62.s
+++ b/asm/enemy/enemy62.s
--- a/asm/enemy/enemy64.s
+++ b/asm/enemy/enemy64.s
--- a/asm/enemy/enemy66.s
+++ b/asm/enemy/enemy66.s
--- a/asm/enemy/eyegore.s
+++ b/asm/enemy/eyegore.s
--- a/asm/enemy/flyingPot.s
+++ b/asm/enemy/flyingPot.s
--- a/asm/enemy/flyingSkull.s
+++ b/asm/enemy/flyingSkull.s
--- a/asm/enemy/ghini.s
+++ b/asm/enemy/ghini.s
--- a/asm/enemy/gleerok.s
+++ b/asm/enemy/gleerok.s
--- a/asm/enemy/gyorgChild.s
+++ b/asm/enemy/gyorgChild.s
--- a/asm/enemy/gyorgFemale.s
+++ b/asm/enemy/gyorgFemale.s
--- a/asm/enemy/gyorgFemaleEye.s
+++ b/asm/enemy/gyorgFemaleEye.s
--- a/asm/enemy/gyorgFemaleMouth.s
+++ b/asm/enemy/gyorgFemaleMouth.s
--- a/asm/enemy/mulldozer.s
+++ b/asm/enemy/mulldozer.s
--- a/asm/enemy/octorokGolden.s
+++ b/asm/enemy/octorokGolden.s
--- a/asm/enemy/scissorsBeetle.s
+++ b/asm/enemy/scissorsBeetle.s
--- a/asm/enemy/spinyBeetle.s
+++ b/asm/enemy/spinyBeetle.s
--- a/asm/enemy/stalfos.s
+++ b/asm/enemy/stalfos.s
--- a/asm/enemy/sub_080451CC.s
+++ b/asm/enemy/sub_080451CC.s
--- a/asm/enemy/takkuri.s
+++ b/asm/enemy/takkuri.s
--- a/asm/enemy/wizzrobeFire.s
+++ b/asm/enemy/wizzrobeFire.s
--- a/asm/enemy/wizzrobeIce.s
+++ b/asm/enemy/wizzrobeIce.s
--- a/asm/enemy/wizzrobeWind.s
+++ b/asm/enemy/wizzrobeWind.s
--- a/asm/object/ambientClouds.s
+++ b/asm/object/ambientClouds.s
--- a/asm/object/angryStatue.s
+++ b/asm/object/angryStatue.s
--- a/asm/object/barrelInside.s
+++ b/asm/object/barrelInside.s
--- a/asm/object/beanstalk.s
+++ b/asm/object/beanstalk.s
--- a/asm/object/bigBarrel.s
+++ b/asm/object/bigBarrel.s
--- a/asm/object/bigIceBlock.s
+++ b/asm/object/bigIceBlock.s
--- a/asm/object/bigPushableLever.s
+++ b/asm/object/bigPushableLever.s
--- a/asm/object/bird.s
+++ b/asm/object/bird.s
--- a/asm/object/blockPushed.s
+++ b/asm/object/blockPushed.s
--- a/asm/object/board.s
+++ b/asm/object/board.s
--- a/asm/object/bollard.s
+++ b/asm/object/bollard.s
--- a/asm/object/bossDoor.s
+++ b/asm/object/bossDoor.s
--- a/asm/object/cabinFurniture.s
+++ b/asm/object/cabinFurniture.s
--- a/asm/object/chestSpawner.s
+++ b/asm/object/chestSpawner.s
--- a/asm/object/code_0808C964.s
+++ b/asm/object/code_0808C964.s
--- a/asm/object/crenalBeanSprout.s
+++ b/asm/object/crenalBeanSprout.s
--- a/asm/object/deathFx.s
+++ b/asm/object/deathFx.s
--- a/asm/object/doubleBookshelf.s
+++ b/asm/object/doubleBookshelf.s
--- a/asm/object/enemyItem.s
+++ b/asm/object/enemyItem.s
--- a/asm/object/evilSpirit.s
+++ b/asm/object/evilSpirit.s
--- a/asm/object/eyeSwitch.s
+++ b/asm/object/eyeSwitch.s
--- a/asm/object/ezloCap.s
+++ b/asm/object/ezloCap.s
--- a/asm/object/fairy.s
+++ b/asm/object/fairy.s
--- a/asm/object/fan.s
+++ b/asm/object/fan.s
--- a/asm/object/figurineDevice.s
+++ b/asm/object/figurineDevice.s
--- a/asm/object/fireballChain.s
+++ b/asm/object/fireballChain.s
--- a/asm/object/floatingPlatform.s
+++ b/asm/object/floatingPlatform.s
--- a/asm/object/fourElements.s
+++ b/asm/object/fourElements.s
--- a/asm/object/frozenWaterElement.s
+++ b/asm/object/frozenWaterElement.s
--- a/asm/object/gentariCurtains.s
+++ b/asm/object/gentariCurtains.s
--- a/asm/object/giantBookLadder.s
+++ b/asm/object/giantBookLadder.s
--- a/asm/object/giantRock.s
+++ b/asm/object/giantRock.s
--- a/asm/object/giantRock2.s
+++ b/asm/object/giantRock2.s
--- a/asm/object/giantTwig.s
+++ b/asm/object/giantTwig.s
--- a/asm/object/gyorgBossObject.s
+++ b/asm/object/gyorgBossObject.s
--- a/asm/object/hittableLever.s
+++ b/asm/object/hittableLever.s
--- a/asm/object/houseDoorInterior.s
+++ b/asm/object/houseDoorInterior.s
--- a/asm/object/itemForSale.s
+++ b/asm/object/itemForSale.s
--- a/asm/object/ladderHoleInBookshelf.s
+++ b/asm/object/ladderHoleInBookshelf.s
--- a/asm/object/ladderUp.s
+++ b/asm/object/ladderUp.s
--- a/asm/object/lamp.s
+++ b/asm/object/lamp.s
--- a/asm/object/lavaPlatform.s
+++ b/asm/object/lavaPlatform.s
--- a/asm/object/lilypadLarge.s
+++ b/asm/object/lilypadLarge.s
--- a/asm/object/litArea.s
+++ b/asm/object/litArea.s
--- a/asm/object/macroAcorn.s
+++ b/asm/object/macroAcorn.s
--- a/asm/object/macroBook.s
+++ b/asm/object/macroBook.s
--- a/asm/object/macroDecorations.s
+++ b/asm/object/macroDecorations.s
--- a/asm/object/macroMushroomStalks.s
+++ b/asm/object/macroMushroomStalks.s
--- a/asm/object/macroPlayer.s
+++ b/asm/object/macroPlayer.s
--- a/asm/object/macroShoes.s
+++ b/asm/object/macroShoes.s
--- a/asm/object/mazaalBossObject.s
+++ b/asm/object/mazaalBossObject.s
--- a/asm/object/minecart.s
+++ b/asm/object/minecart.s
--- a/asm/object/minecartDoor.s
+++ b/asm/object/minecartDoor.s
--- a/asm/object/minishEmoticon.s
+++ b/asm/object/minishEmoticon.s
--- a/asm/object/object10.s
+++ b/asm/object/object10.s
--- a/asm/object/object11.s
+++ b/asm/object/object11.s
--- a/asm/object/object12.s
+++ b/asm/object/object12.s
--- a/asm/object/object15.s
+++ b/asm/object/object15.s
--- a/asm/object/object17.s
+++ b/asm/object/object17.s
--- a/asm/object/object1E.s
+++ b/asm/object/object1E.s
--- a/asm/object/object1F.s
+++ b/asm/object/object1F.s
--- a/asm/object/object20.s
+++ b/asm/object/object20.s
--- a/Show More
+++ b/Show More