From 3fd900f1bc81cbaf106de17f5b8d41e26de682a8 Mon Sep 17 00:00:00 2001 From: theo3 Date: Tue, 28 Dec 2021 13:53:53 -0800 Subject: [PATCH] rename files, sort asm into subdirectories --- Makefile | 2 +- asm/{ => enemy}/armos.s | 0 asm/{ => enemy}/ballChainSoldier.s | 0 asm/{ => enemy}/bombarossa.s | 0 asm/{ => enemy}/bowMoblin.s | 0 asm/{ => enemy}/businessScrubPrologue.s | 0 asm/{ => enemy}/chuchuBoss.s | 0 asm/{ => enemy}/cloudPiranha.s | 0 asm/{ => enemy}/code_080300AC.s | 0 asm/{ => enemy}/crow.s | 0 asm/{ => enemy}/cuccoAggr.s | 0 asm/{ => enemy}/curtain.s | 0 asm/{ => enemy}/dust.s | 0 asm/{ => enemy}/enemy49.s | 0 asm/{ => enemy}/enemy4D.s | 0 asm/{ => enemy}/enemy50.s | 0 asm/{ => enemy}/enemy62.s | 0 asm/{ => enemy}/enemy64.s | 0 asm/{ => enemy}/enemy66.s | 0 asm/{ => enemy}/eyegore.s | 0 asm/{ => enemy}/flyingPot.s | 0 asm/{ => enemy}/flyingSkull.s | 0 asm/{ => enemy}/ghini.s | 0 asm/{ => enemy}/gleerok.s | 0 asm/{ => enemy}/gyorgChild.s | 0 asm/{ => enemy}/gyorgFemale.s | 0 asm/{ => enemy}/gyorgFemaleEye.s | 0 asm/{ => enemy}/gyorgFemaleMouth.s | 0 asm/{ => enemy}/mulldozer.s | 0 asm/{ => enemy}/octorokGolden.s | 0 asm/{ => enemy}/scissorsBeetle.s | 0 asm/{ => enemy}/spinyBeetle.s | 0 asm/{ => enemy}/stalfos.s | 0 asm/{ => enemy}/sub_080451CC.s | 0 asm/{ => enemy}/takkuri.s | 0 asm/{ => enemy}/wizzrobeFire.s | 0 asm/{ => enemy}/wizzrobeIce.s | 0 asm/{ => enemy}/wizzrobeWind.s | 0 asm/{ => object}/ambientClouds.s | 0 asm/{ => object}/angryStatue.s | 0 asm/{ => object}/barrelInside.s | 0 asm/{ => object}/beanstalk.s | 0 asm/{ => object}/bigBarrel.s | 0 asm/{ => object}/bigIceBlock.s | 0 asm/{ => object}/bigPushableLever.s | 0 asm/{ => object}/bird.s | 0 asm/{ => object}/blockPushed.s | 0 asm/{ => object}/board.s | 0 asm/{ => object}/bollard.s | 0 asm/{ => object}/bossDoor.s | 0 asm/{ => object}/cabinFurniture.s | 0 asm/{ => object}/chestSpawner.s | 0 asm/{ => object}/code_0808C964.s | 0 asm/{ => object}/crenalBeanSprout.s | 0 asm/{ => object}/deathFx.s | 0 asm/{ => object}/doubleBookshelf.s | 0 asm/{ => object}/enemyItem.s | 0 asm/{ => object}/evilSpirit.s | 0 asm/{ => object}/eyeSwitch.s | 0 asm/{ => object}/ezloCap.s | 0 asm/{ => object}/fairy.s | 0 asm/{ => object}/fan.s | 0 asm/{ => object}/figurineDevice.s | 0 asm/{ => object}/fireballChain.s | 0 asm/{ => object}/floatingPlatform.s | 0 asm/{ => object}/fourElements.s | 0 asm/{ => object}/frozenWaterElement.s | 0 asm/{ => object}/gentariCurtains.s | 0 asm/{ => object}/giantBookLadder.s | 0 asm/{ => object}/giantRock.s | 0 asm/{ => object}/giantRock2.s | 0 asm/{ => object}/giantTwig.s | 0 asm/{ => object}/gyorgBossObject.s | 0 asm/{ => object}/hittableLever.s | 0 asm/{ => object}/houseDoorInterior.s | 0 asm/{ => object}/itemForSale.s | 0 asm/{ => object}/ladderHoleInBookshelf.s | 0 asm/{ => object}/ladderUp.s | 0 asm/{ => object}/lamp.s | 0 asm/{ => object}/lavaPlatform.s | 0 asm/{ => object}/lilypadLarge.s | 0 asm/{ => object}/litArea.s | 0 asm/{ => object}/macroAcorn.s | 0 asm/{ => object}/macroBook.s | 0 asm/{ => object}/macroDecorations.s | 0 asm/{ => object}/macroMushroomStalks.s | 0 asm/{ => object}/macroPlayer.s | 0 asm/{ => object}/macroShoes.s | 0 asm/{ => object}/mazaalBossObject.s | 0 asm/{ => object}/minecart.s | 0 asm/{ => object}/minecartDoor.s | 0 asm/{ => object}/minishEmoticon.s | 0 asm/{ => object}/object10.s | 0 asm/{ => object}/object11.s | 0 asm/{ => object}/object12.s | 0 asm/{ => object}/object15.s | 0 asm/{ => object}/object17.s | 0 asm/{ => object}/object1E.s | 0 asm/{ => object}/object1F.s | 0 asm/{ => object}/object20.s | 0 asm/{ => object}/object21.s | 0 asm/{ => object}/object28.s | 0 asm/{ => object}/object2A.s | 0 asm/{ => object}/object2B.s | 0 asm/{ => object}/object30.s | 0 asm/{ => object}/object35.s | 0 asm/{ => object}/object36.s | 0 asm/{ => object}/object37.s | 0 asm/{ => object}/object3A.s | 0 asm/{ => object}/object3D.s | 0 asm/{ => object}/object3E.s | 0 asm/{ => object}/object42.s | 0 asm/{ => object}/object43.s | 0 asm/{ => object}/object44.s | 0 asm/{ => object}/object45.s | 0 asm/{ => object}/object4B.s | 0 asm/{ => object}/object52.s | 0 asm/{ => object}/object53.s | 0 asm/{ => object}/object5B.s | 0 asm/{ => object}/object61.s | 0 asm/{ => object}/object63.s | 0 asm/{ => object}/object64.s | 0 asm/{ => object}/object66.s | 0 asm/{ => object}/object67.s | 0 asm/{ => object}/object68.s | 0 asm/{ => object}/object69.s | 0 asm/{ => object}/object70.s | 0 asm/{ => object}/object74.s | 0 asm/{ => object}/object75.s | 0 asm/{ => object}/object76.s | 0 asm/{ => object}/object79.s | 0 asm/{ => object}/object81.s | 0 asm/{ => object}/object8E.s | 0 asm/{ => object}/object9.s | 0 asm/{ => object}/object90.s | 0 asm/{ => object}/object91.s | 0 asm/{ => object}/object96.s | 0 asm/{ => object}/object97.s | 0 asm/{ => object}/object98.s | 0 asm/{ => object}/object99.s | 0 asm/{ => object}/object9B.s | 0 asm/{ => object}/objectA6.s | 0 asm/{ => object}/objectA7.s | 0 asm/{ => object}/objectA8.s | 0 asm/{ => object}/objectA9.s | 0 asm/{ => object}/objectAB.s | 0 asm/{ => object}/objectAD.s | 0 asm/{ => object}/objectB.s | 0 asm/{ => object}/objectB3.s | 0 asm/{ => object}/objectB4.s | 0 asm/{ => object}/objectB6.s | 0 asm/{ => object}/objectB9.s | 0 asm/{ => object}/objectBD.s | 0 asm/{ => object}/objectBF.s | 0 asm/{ => object}/objectBlockingStairs.s | 0 asm/{ => object}/objectC1.s | 0 asm/{ => object}/objectD.s | 0 asm/{ => object}/objectE.s | 0 asm/{ => object}/objectOnPillar.s | 0 asm/{ => object}/objectOnSpinyBeetle.s | 0 asm/{ => object}/paper.s | 0 asm/{ => object}/picoBloom.s | 0 asm/{ => object}/pressurePlate.s | 0 asm/{ => object}/pullableLever.s | 0 asm/{ => object}/pullableMushroom.s | 0 asm/{ => object}/pushableFurniture.s | 0 asm/{ => object}/pushableGrave.s | 0 asm/{ => object}/pushableLever.s | 0 asm/{ => object}/pushableRock.s | 0 asm/{ => object}/pushableStatue.s | 0 asm/{ => object}/smallIceBlock.s | 0 asm/{ => object}/specialFx.s | 0 asm/{ => object}/steam.s | 0 asm/{ => object}/stoneTablet.s | 0 asm/{ => object}/treeHidingPortal.s | 0 asm/{ => object}/waterfallOpening.s | 0 asm/{ => object}/whirlwind.s | 0 asm/{ => object}/windTribeTeleporter.s | 0 include/enemy.h | 2 +- include/fileScreen.h | 2 +- include/{overworld.h => game.h} | 6 +- include/{textbox.h => message.h} | 6 +- include/npc.h | 4 +- include/object.h | 2 +- include/{audio.h => sound.h} | 6 +- linker.ld | 370 +++++++++++------------ src/code_0808091C.c | 2 +- src/code_080A29BC.c | 58 ---- src/collision.c | 2 +- src/coord.c | 2 +- src/debugScreen.c | 4 +- src/demoScreen.c | 2 +- src/enemy/bladeTrap.c | 2 +- src/enemy/bobomb.c | 2 +- src/enemy/businessScrub.c | 4 +- src/{ => enemy}/code_080300AC.c | 0 src/enemy/doorMimic.c | 2 +- src/enemy/likeLike.c | 2 +- src/enemy/octorokBoss.c | 2 +- src/enemy/pesto.c | 2 +- src/enemy/rupeeLike.c | 2 +- src/enemy/vaatiTransfiguredEye.c | 2 +- src/enemy/vaatiWrath.c | 2 +- src/entity.c | 2 +- src/ezloNag.c | 4 +- src/fileScreen.c | 2 +- src/{overworld.c => game.c} | 6 +- src/interrupts.c | 4 +- src/intro.c | 4 +- src/item/itemBomb.c | 2 +- src/item/itemLantern.c | 2 +- src/item/itemMoleMitts.c | 2 +- src/item/itemOcarina.c | 2 +- src/item/itemPegasusBoots.c | 2 +- src/item/itemRocsCape.c | 2 +- src/item/itemSword.c | 2 +- src/main.c | 4 +- src/manager/manager10.c | 2 +- src/manager/manager15.c | 2 +- src/manager/manager23.c | 2 +- src/manager/manager24.c | 4 +- src/manager/manager27.c | 2 +- src/manager/manager2E.c | 2 +- src/manager/manager3.c | 2 +- src/manager/manager30.c | 2 +- src/manager/manager32.c | 2 +- src/manager/manager33.c | 2 +- src/manager/manager34.c | 2 +- src/manager/manager36.c | 2 +- src/manager/manager37.c | 4 +- src/manager/manager39.c | 4 +- src/manager/manager5.c | 2 +- src/manager/managerB.c | 2 +- src/manager/managerC.c | 2 +- src/manager/managerE.c | 2 +- src/manager/managerF.c | 4 +- src/{textbox.c => message.c} | 4 +- src/npc/beedle.c | 4 +- src/npc/bladeBrothers.c | 2 +- src/npc/brocco.c | 2 +- src/npc/carlov.c | 2 +- src/npc/castleMaid.c | 2 +- src/npc/castorWildsStatue.c | 2 +- src/npc/cat.c | 2 +- src/npc/cow.c | 2 +- src/npc/dampe.c | 2 +- src/npc/epona.c | 4 +- src/npc/ghostBrothers.c | 2 +- src/npc/goron.c | 2 +- src/npc/goronMerchant.c | 2 +- src/npc/guard.c | 2 +- src/npc/kid.c | 2 +- src/npc/librarians.c | 4 +- src/npc/mailbox.c | 2 +- src/npc/marcy.c | 2 +- src/npc/minishEzlo.c | 2 +- src/npc/ministerPotho.c | 2 +- src/npc/mountainMinish.c | 2 +- src/npc/mutoh.c | 2 +- src/npc/npc23.c | 2 +- src/npc/npc4E.c | 2 +- src/npc/npc5.c | 2 +- src/npc/npc9.c | 2 +- src/npc/picolyteBottle.c | 2 +- src/npc/pina.c | 2 +- src/npc/postman.c | 2 +- src/npc/simon.c | 2 +- src/npc/stamp.c | 2 +- src/npc/stockwell.c | 2 +- src/npc/vaati.c | 2 +- src/npc/windTribespeople.c | 2 +- src/npc/zelda.c | 2 +- src/object/archway.c | 2 +- src/object/book.c | 2 +- src/object/heartContainer.c | 2 +- src/object/houseDoorExterior.c | 2 +- src/object/itemOnGround.c | 2 +- src/object/jailBars.c | 2 +- src/object/lightableSwitch.c | 2 +- src/object/lockedDoor.c | 4 +- src/object/metalDoor.c | 2 +- src/object/minishSizedArchway.c | 2 +- src/object/minishSizedEntrance.c | 2 +- src/object/object2A.c | 2 +- src/object/object6A.c | 2 +- src/object/objectA.c | 2 +- src/object/octorokBossObject.c | 2 +- src/object/pot.c | 2 +- src/object/railtrack.c | 2 +- src/object/swordsmanNewsletter.c | 2 +- src/object/thoughtBubble.c | 2 +- src/object/treeHidingPortal.c | 2 +- src/object/warpPoint.c | 2 +- src/object/windcrest.c | 2 +- src/player.c | 6 +- src/playerItem/playerItem11.c | 2 +- src/playerItem/playerItem12.c | 2 +- src/playerItem/playerItem14.c | 2 +- src/playerItem/playerItem15.c | 2 +- src/playerItem/playerItem3.c | 2 +- src/playerItem/playerItemPacciCane.c | 2 +- src/playerItem/playerItemSwordBeam.c | 2 +- src/playerItemUtils.c | 4 +- src/projectile/dirtBallProjectile.c | 2 +- src/projectile/gyorgTail.c | 2 +- src/projectile/mandiblesProjectile.c | 2 +- src/projectile/mazaalEnergyBeam.c | 2 +- src/room.c | 2 +- src/roomInit.c | 4 +- src/save.c | 4 +- src/script.c | 2 +- src/{code_0807CC3C.c => scroll.c} | 1 - src/{audio.c => sound.c} | 2 +- 313 files changed, 346 insertions(+), 405 deletions(-) rename asm/{ => enemy}/armos.s (100%) rename asm/{ => enemy}/ballChainSoldier.s (100%) rename asm/{ => enemy}/bombarossa.s (100%) rename asm/{ => enemy}/bowMoblin.s (100%) rename asm/{ => enemy}/businessScrubPrologue.s (100%) rename asm/{ => enemy}/chuchuBoss.s (100%) rename asm/{ => enemy}/cloudPiranha.s (100%) rename asm/{ => enemy}/code_080300AC.s (100%) rename asm/{ => enemy}/crow.s (100%) rename asm/{ => enemy}/cuccoAggr.s (100%) rename asm/{ => enemy}/curtain.s (100%) rename asm/{ => enemy}/dust.s (100%) rename asm/{ => enemy}/enemy49.s (100%) rename asm/{ => enemy}/enemy4D.s (100%) rename asm/{ => enemy}/enemy50.s (100%) rename asm/{ => enemy}/enemy62.s (100%) rename asm/{ => enemy}/enemy64.s (100%) rename asm/{ => enemy}/enemy66.s (100%) rename asm/{ => enemy}/eyegore.s (100%) rename asm/{ => enemy}/flyingPot.s (100%) rename asm/{ => enemy}/flyingSkull.s (100%) rename asm/{ => enemy}/ghini.s (100%) rename asm/{ => enemy}/gleerok.s (100%) rename asm/{ => enemy}/gyorgChild.s (100%) rename asm/{ => enemy}/gyorgFemale.s (100%) rename asm/{ => enemy}/gyorgFemaleEye.s (100%) rename asm/{ => enemy}/gyorgFemaleMouth.s (100%) rename asm/{ => enemy}/mulldozer.s (100%) rename asm/{ => enemy}/octorokGolden.s (100%) rename asm/{ => enemy}/scissorsBeetle.s (100%) rename asm/{ => enemy}/spinyBeetle.s (100%) rename asm/{ => enemy}/stalfos.s (100%) rename asm/{ => enemy}/sub_080451CC.s (100%) rename asm/{ => enemy}/takkuri.s (100%) rename asm/{ => enemy}/wizzrobeFire.s (100%) rename asm/{ => enemy}/wizzrobeIce.s (100%) rename asm/{ => enemy}/wizzrobeWind.s (100%) rename asm/{ => object}/ambientClouds.s (100%) rename asm/{ => object}/angryStatue.s (100%) rename asm/{ => object}/barrelInside.s (100%) rename asm/{ => object}/beanstalk.s (100%) rename asm/{ => object}/bigBarrel.s (100%) rename asm/{ => object}/bigIceBlock.s (100%) rename asm/{ => object}/bigPushableLever.s (100%) rename asm/{ => object}/bird.s (100%) rename asm/{ => object}/blockPushed.s (100%) rename asm/{ => object}/board.s (100%) rename asm/{ => object}/bollard.s (100%) rename asm/{ => object}/bossDoor.s (100%) rename asm/{ => object}/cabinFurniture.s (100%) rename asm/{ => object}/chestSpawner.s (100%) rename asm/{ => object}/code_0808C964.s (100%) rename asm/{ => object}/crenalBeanSprout.s (100%) rename asm/{ => object}/deathFx.s (100%) rename asm/{ => object}/doubleBookshelf.s (100%) rename asm/{ => object}/enemyItem.s (100%) rename asm/{ => object}/evilSpirit.s (100%) rename asm/{ => object}/eyeSwitch.s (100%) rename asm/{ => object}/ezloCap.s (100%) rename asm/{ => object}/fairy.s (100%) rename asm/{ => object}/fan.s (100%) rename asm/{ => object}/figurineDevice.s (100%) rename asm/{ => object}/fireballChain.s (100%) rename asm/{ => object}/floatingPlatform.s (100%) rename asm/{ => object}/fourElements.s (100%) rename asm/{ => object}/frozenWaterElement.s (100%) rename asm/{ => object}/gentariCurtains.s (100%) rename asm/{ => object}/giantBookLadder.s (100%) rename asm/{ => object}/giantRock.s (100%) rename asm/{ => object}/giantRock2.s (100%) rename asm/{ => object}/giantTwig.s (100%) rename asm/{ => object}/gyorgBossObject.s (100%) rename asm/{ => object}/hittableLever.s (100%) rename asm/{ => object}/houseDoorInterior.s (100%) rename asm/{ => object}/itemForSale.s (100%) rename asm/{ => object}/ladderHoleInBookshelf.s (100%) rename asm/{ => object}/ladderUp.s (100%) rename asm/{ => object}/lamp.s (100%) rename asm/{ => object}/lavaPlatform.s (100%) rename asm/{ => object}/lilypadLarge.s (100%) rename asm/{ => object}/litArea.s (100%) rename asm/{ => object}/macroAcorn.s (100%) rename asm/{ => object}/macroBook.s (100%) rename asm/{ => object}/macroDecorations.s (100%) rename asm/{ => object}/macroMushroomStalks.s (100%) rename asm/{ => object}/macroPlayer.s (100%) rename asm/{ => object}/macroShoes.s (100%) rename asm/{ => object}/mazaalBossObject.s (100%) rename asm/{ => object}/minecart.s (100%) rename asm/{ => object}/minecartDoor.s (100%) rename asm/{ => object}/minishEmoticon.s (100%) rename asm/{ => object}/object10.s (100%) rename asm/{ => object}/object11.s (100%) rename asm/{ => object}/object12.s (100%) rename asm/{ => object}/object15.s (100%) rename asm/{ => object}/object17.s (100%) rename asm/{ => object}/object1E.s (100%) rename asm/{ => object}/object1F.s (100%) rename asm/{ => object}/object20.s (100%) rename asm/{ => object}/object21.s (100%) rename asm/{ => object}/object28.s (100%) rename asm/{ => object}/object2A.s (100%) rename asm/{ => object}/object2B.s (100%) rename asm/{ => object}/object30.s (100%) rename asm/{ => object}/object35.s (100%) rename asm/{ => object}/object36.s (100%) rename asm/{ => object}/object37.s (100%) rename asm/{ => object}/object3A.s (100%) rename asm/{ => object}/object3D.s (100%) rename asm/{ => object}/object3E.s (100%) rename asm/{ => object}/object42.s (100%) rename asm/{ => object}/object43.s (100%) rename asm/{ => object}/object44.s (100%) rename asm/{ => object}/object45.s (100%) rename asm/{ => object}/object4B.s (100%) rename asm/{ => object}/object52.s (100%) rename asm/{ => object}/object53.s (100%) rename asm/{ => object}/object5B.s (100%) rename asm/{ => object}/object61.s (100%) rename asm/{ => object}/object63.s (100%) rename asm/{ => object}/object64.s (100%) rename asm/{ => object}/object66.s (100%) rename asm/{ => object}/object67.s (100%) rename asm/{ => object}/object68.s (100%) rename asm/{ => object}/object69.s (100%) rename asm/{ => object}/object70.s (100%) rename asm/{ => object}/object74.s (100%) rename asm/{ => object}/object75.s (100%) rename asm/{ => object}/object76.s (100%) rename asm/{ => object}/object79.s (100%) rename asm/{ => object}/object81.s (100%) rename asm/{ => object}/object8E.s (100%) rename asm/{ => object}/object9.s (100%) rename asm/{ => object}/object90.s (100%) rename asm/{ => object}/object91.s (100%) rename asm/{ => object}/object96.s (100%) rename asm/{ => object}/object97.s (100%) rename asm/{ => object}/object98.s (100%) rename asm/{ => object}/object99.s (100%) rename asm/{ => object}/object9B.s (100%) rename asm/{ => object}/objectA6.s (100%) rename asm/{ => object}/objectA7.s (100%) rename asm/{ => object}/objectA8.s (100%) rename asm/{ => object}/objectA9.s (100%) rename asm/{ => object}/objectAB.s (100%) rename asm/{ => object}/objectAD.s (100%) rename asm/{ => object}/objectB.s (100%) rename asm/{ => object}/objectB3.s (100%) rename asm/{ => object}/objectB4.s (100%) rename asm/{ => object}/objectB6.s (100%) rename asm/{ => object}/objectB9.s (100%) rename asm/{ => object}/objectBD.s (100%) rename asm/{ => object}/objectBF.s (100%) rename asm/{ => object}/objectBlockingStairs.s (100%) rename asm/{ => object}/objectC1.s (100%) rename asm/{ => object}/objectD.s (100%) rename asm/{ => object}/objectE.s (100%) rename asm/{ => object}/objectOnPillar.s (100%) rename asm/{ => object}/objectOnSpinyBeetle.s (100%) rename asm/{ => object}/paper.s (100%) rename asm/{ => object}/picoBloom.s (100%) rename asm/{ => object}/pressurePlate.s (100%) rename asm/{ => object}/pullableLever.s (100%) rename asm/{ => object}/pullableMushroom.s (100%) rename asm/{ => object}/pushableFurniture.s (100%) rename asm/{ => object}/pushableGrave.s (100%) rename asm/{ => object}/pushableLever.s (100%) rename asm/{ => object}/pushableRock.s (100%) rename asm/{ => object}/pushableStatue.s (100%) rename asm/{ => object}/smallIceBlock.s (100%) rename asm/{ => object}/specialFx.s (100%) rename asm/{ => object}/steam.s (100%) rename asm/{ => object}/stoneTablet.s (100%) rename asm/{ => object}/treeHidingPortal.s (100%) rename asm/{ => object}/waterfallOpening.s (100%) rename asm/{ => object}/whirlwind.s (100%) rename asm/{ => object}/windTribeTeleporter.s (100%) rename include/{overworld.h => game.h} (95%) rename include/{textbox.h => message.h} (97%) rename include/{audio.h => sound.h} (99%) delete mode 100644 src/code_080A29BC.c rename src/{ => enemy}/code_080300AC.c (100%) rename src/{overworld.c => game.c} (99%) rename src/{textbox.c => message.c} (99%) rename src/{code_0807CC3C.c => scroll.c} (74%) rename src/{audio.c => sound.c} (99%) diff --git a/Makefile b/Makefile index ddd26c61..d9d5f42d 100644 --- a/Makefile +++ b/Makefile @@ -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)) diff --git a/asm/armos.s b/asm/enemy/armos.s similarity index 100% rename from asm/armos.s rename to asm/enemy/armos.s diff --git a/asm/ballChainSoldier.s b/asm/enemy/ballChainSoldier.s similarity index 100% rename from asm/ballChainSoldier.s rename to asm/enemy/ballChainSoldier.s diff --git a/asm/bombarossa.s b/asm/enemy/bombarossa.s similarity index 100% rename from asm/bombarossa.s rename to asm/enemy/bombarossa.s diff --git a/asm/bowMoblin.s b/asm/enemy/bowMoblin.s similarity index 100% rename from asm/bowMoblin.s rename to asm/enemy/bowMoblin.s diff --git a/asm/businessScrubPrologue.s b/asm/enemy/businessScrubPrologue.s similarity index 100% rename from asm/businessScrubPrologue.s rename to asm/enemy/businessScrubPrologue.s diff --git a/asm/chuchuBoss.s b/asm/enemy/chuchuBoss.s similarity index 100% rename from asm/chuchuBoss.s rename to asm/enemy/chuchuBoss.s diff --git a/asm/cloudPiranha.s b/asm/enemy/cloudPiranha.s similarity index 100% rename from asm/cloudPiranha.s rename to asm/enemy/cloudPiranha.s diff --git a/asm/code_080300AC.s b/asm/enemy/code_080300AC.s similarity index 100% rename from asm/code_080300AC.s rename to asm/enemy/code_080300AC.s diff --git a/asm/crow.s b/asm/enemy/crow.s similarity index 100% rename from asm/crow.s rename to asm/enemy/crow.s diff --git a/asm/cuccoAggr.s b/asm/enemy/cuccoAggr.s similarity index 100% rename from asm/cuccoAggr.s rename to asm/enemy/cuccoAggr.s diff --git a/asm/curtain.s b/asm/enemy/curtain.s similarity index 100% rename from asm/curtain.s rename to asm/enemy/curtain.s diff --git a/asm/dust.s b/asm/enemy/dust.s similarity index 100% rename from asm/dust.s rename to asm/enemy/dust.s diff --git a/asm/enemy49.s b/asm/enemy/enemy49.s similarity index 100% rename from asm/enemy49.s rename to asm/enemy/enemy49.s diff --git a/asm/enemy4D.s b/asm/enemy/enemy4D.s similarity index 100% rename from asm/enemy4D.s rename to asm/enemy/enemy4D.s diff --git a/asm/enemy50.s b/asm/enemy/enemy50.s similarity index 100% rename from asm/enemy50.s rename to asm/enemy/enemy50.s diff --git a/asm/enemy62.s b/asm/enemy/enemy62.s similarity index 100% rename from asm/enemy62.s rename to asm/enemy/enemy62.s diff --git a/asm/enemy64.s b/asm/enemy/enemy64.s similarity index 100% rename from asm/enemy64.s rename to asm/enemy/enemy64.s diff --git a/asm/enemy66.s b/asm/enemy/enemy66.s similarity index 100% rename from asm/enemy66.s rename to asm/enemy/enemy66.s diff --git a/asm/eyegore.s b/asm/enemy/eyegore.s similarity index 100% rename from asm/eyegore.s rename to asm/enemy/eyegore.s diff --git a/asm/flyingPot.s b/asm/enemy/flyingPot.s similarity index 100% rename from asm/flyingPot.s rename to asm/enemy/flyingPot.s diff --git a/asm/flyingSkull.s b/asm/enemy/flyingSkull.s similarity index 100% rename from asm/flyingSkull.s rename to asm/enemy/flyingSkull.s diff --git a/asm/ghini.s b/asm/enemy/ghini.s similarity index 100% rename from asm/ghini.s rename to asm/enemy/ghini.s diff --git a/asm/gleerok.s b/asm/enemy/gleerok.s similarity index 100% rename from asm/gleerok.s rename to asm/enemy/gleerok.s diff --git a/asm/gyorgChild.s b/asm/enemy/gyorgChild.s similarity index 100% rename from asm/gyorgChild.s rename to asm/enemy/gyorgChild.s diff --git a/asm/gyorgFemale.s b/asm/enemy/gyorgFemale.s similarity index 100% rename from asm/gyorgFemale.s rename to asm/enemy/gyorgFemale.s diff --git a/asm/gyorgFemaleEye.s b/asm/enemy/gyorgFemaleEye.s similarity index 100% rename from asm/gyorgFemaleEye.s rename to asm/enemy/gyorgFemaleEye.s diff --git a/asm/gyorgFemaleMouth.s b/asm/enemy/gyorgFemaleMouth.s similarity index 100% rename from asm/gyorgFemaleMouth.s rename to asm/enemy/gyorgFemaleMouth.s diff --git a/asm/mulldozer.s b/asm/enemy/mulldozer.s similarity index 100% rename from asm/mulldozer.s rename to asm/enemy/mulldozer.s diff --git a/asm/octorokGolden.s b/asm/enemy/octorokGolden.s similarity index 100% rename from asm/octorokGolden.s rename to asm/enemy/octorokGolden.s diff --git a/asm/scissorsBeetle.s b/asm/enemy/scissorsBeetle.s similarity index 100% rename from asm/scissorsBeetle.s rename to asm/enemy/scissorsBeetle.s diff --git a/asm/spinyBeetle.s b/asm/enemy/spinyBeetle.s similarity index 100% rename from asm/spinyBeetle.s rename to asm/enemy/spinyBeetle.s diff --git a/asm/stalfos.s b/asm/enemy/stalfos.s similarity index 100% rename from asm/stalfos.s rename to asm/enemy/stalfos.s diff --git a/asm/sub_080451CC.s b/asm/enemy/sub_080451CC.s similarity index 100% rename from asm/sub_080451CC.s rename to asm/enemy/sub_080451CC.s diff --git a/asm/takkuri.s b/asm/enemy/takkuri.s similarity index 100% rename from asm/takkuri.s rename to asm/enemy/takkuri.s diff --git a/asm/wizzrobeFire.s b/asm/enemy/wizzrobeFire.s similarity index 100% rename from asm/wizzrobeFire.s rename to asm/enemy/wizzrobeFire.s diff --git a/asm/wizzrobeIce.s b/asm/enemy/wizzrobeIce.s similarity index 100% rename from asm/wizzrobeIce.s rename to asm/enemy/wizzrobeIce.s diff --git a/asm/wizzrobeWind.s b/asm/enemy/wizzrobeWind.s similarity index 100% rename from asm/wizzrobeWind.s rename to asm/enemy/wizzrobeWind.s diff --git a/asm/ambientClouds.s b/asm/object/ambientClouds.s similarity index 100% rename from asm/ambientClouds.s rename to asm/object/ambientClouds.s diff --git a/asm/angryStatue.s b/asm/object/angryStatue.s similarity index 100% rename from asm/angryStatue.s rename to asm/object/angryStatue.s diff --git a/asm/barrelInside.s b/asm/object/barrelInside.s similarity index 100% rename from asm/barrelInside.s rename to asm/object/barrelInside.s diff --git a/asm/beanstalk.s b/asm/object/beanstalk.s similarity index 100% rename from asm/beanstalk.s rename to asm/object/beanstalk.s diff --git a/asm/bigBarrel.s b/asm/object/bigBarrel.s similarity index 100% rename from asm/bigBarrel.s rename to asm/object/bigBarrel.s diff --git a/asm/bigIceBlock.s b/asm/object/bigIceBlock.s similarity index 100% rename from asm/bigIceBlock.s rename to asm/object/bigIceBlock.s diff --git a/asm/bigPushableLever.s b/asm/object/bigPushableLever.s similarity index 100% rename from asm/bigPushableLever.s rename to asm/object/bigPushableLever.s diff --git a/asm/bird.s b/asm/object/bird.s similarity index 100% rename from asm/bird.s rename to asm/object/bird.s diff --git a/asm/blockPushed.s b/asm/object/blockPushed.s similarity index 100% rename from asm/blockPushed.s rename to asm/object/blockPushed.s diff --git a/asm/board.s b/asm/object/board.s similarity index 100% rename from asm/board.s rename to asm/object/board.s diff --git a/asm/bollard.s b/asm/object/bollard.s similarity index 100% rename from asm/bollard.s rename to asm/object/bollard.s diff --git a/asm/bossDoor.s b/asm/object/bossDoor.s similarity index 100% rename from asm/bossDoor.s rename to asm/object/bossDoor.s diff --git a/asm/cabinFurniture.s b/asm/object/cabinFurniture.s similarity index 100% rename from asm/cabinFurniture.s rename to asm/object/cabinFurniture.s diff --git a/asm/chestSpawner.s b/asm/object/chestSpawner.s similarity index 100% rename from asm/chestSpawner.s rename to asm/object/chestSpawner.s diff --git a/asm/code_0808C964.s b/asm/object/code_0808C964.s similarity index 100% rename from asm/code_0808C964.s rename to asm/object/code_0808C964.s diff --git a/asm/crenalBeanSprout.s b/asm/object/crenalBeanSprout.s similarity index 100% rename from asm/crenalBeanSprout.s rename to asm/object/crenalBeanSprout.s diff --git a/asm/deathFx.s b/asm/object/deathFx.s similarity index 100% rename from asm/deathFx.s rename to asm/object/deathFx.s diff --git a/asm/doubleBookshelf.s b/asm/object/doubleBookshelf.s similarity index 100% rename from asm/doubleBookshelf.s rename to asm/object/doubleBookshelf.s diff --git a/asm/enemyItem.s b/asm/object/enemyItem.s similarity index 100% rename from asm/enemyItem.s rename to asm/object/enemyItem.s diff --git a/asm/evilSpirit.s b/asm/object/evilSpirit.s similarity index 100% rename from asm/evilSpirit.s rename to asm/object/evilSpirit.s diff --git a/asm/eyeSwitch.s b/asm/object/eyeSwitch.s similarity index 100% rename from asm/eyeSwitch.s rename to asm/object/eyeSwitch.s diff --git a/asm/ezloCap.s b/asm/object/ezloCap.s similarity index 100% rename from asm/ezloCap.s rename to asm/object/ezloCap.s diff --git a/asm/fairy.s b/asm/object/fairy.s similarity index 100% rename from asm/fairy.s rename to asm/object/fairy.s diff --git a/asm/fan.s b/asm/object/fan.s similarity index 100% rename from asm/fan.s rename to asm/object/fan.s diff --git a/asm/figurineDevice.s b/asm/object/figurineDevice.s similarity index 100% rename from asm/figurineDevice.s rename to asm/object/figurineDevice.s diff --git a/asm/fireballChain.s b/asm/object/fireballChain.s similarity index 100% rename from asm/fireballChain.s rename to asm/object/fireballChain.s diff --git a/asm/floatingPlatform.s b/asm/object/floatingPlatform.s similarity index 100% rename from asm/floatingPlatform.s rename to asm/object/floatingPlatform.s diff --git a/asm/fourElements.s b/asm/object/fourElements.s similarity index 100% rename from asm/fourElements.s rename to asm/object/fourElements.s diff --git a/asm/frozenWaterElement.s b/asm/object/frozenWaterElement.s similarity index 100% rename from asm/frozenWaterElement.s rename to asm/object/frozenWaterElement.s diff --git a/asm/gentariCurtains.s b/asm/object/gentariCurtains.s similarity index 100% rename from asm/gentariCurtains.s rename to asm/object/gentariCurtains.s diff --git a/asm/giantBookLadder.s b/asm/object/giantBookLadder.s similarity index 100% rename from asm/giantBookLadder.s rename to asm/object/giantBookLadder.s diff --git a/asm/giantRock.s b/asm/object/giantRock.s similarity index 100% rename from asm/giantRock.s rename to asm/object/giantRock.s diff --git a/asm/giantRock2.s b/asm/object/giantRock2.s similarity index 100% rename from asm/giantRock2.s rename to asm/object/giantRock2.s diff --git a/asm/giantTwig.s b/asm/object/giantTwig.s similarity index 100% rename from asm/giantTwig.s rename to asm/object/giantTwig.s diff --git a/asm/gyorgBossObject.s b/asm/object/gyorgBossObject.s similarity index 100% rename from asm/gyorgBossObject.s rename to asm/object/gyorgBossObject.s diff --git a/asm/hittableLever.s b/asm/object/hittableLever.s similarity index 100% rename from asm/hittableLever.s rename to asm/object/hittableLever.s diff --git a/asm/houseDoorInterior.s b/asm/object/houseDoorInterior.s similarity index 100% rename from asm/houseDoorInterior.s rename to asm/object/houseDoorInterior.s diff --git a/asm/itemForSale.s b/asm/object/itemForSale.s similarity index 100% rename from asm/itemForSale.s rename to asm/object/itemForSale.s diff --git a/asm/ladderHoleInBookshelf.s b/asm/object/ladderHoleInBookshelf.s similarity index 100% rename from asm/ladderHoleInBookshelf.s rename to asm/object/ladderHoleInBookshelf.s diff --git a/asm/ladderUp.s b/asm/object/ladderUp.s similarity index 100% rename from asm/ladderUp.s rename to asm/object/ladderUp.s diff --git a/asm/lamp.s b/asm/object/lamp.s similarity index 100% rename from asm/lamp.s rename to asm/object/lamp.s diff --git a/asm/lavaPlatform.s b/asm/object/lavaPlatform.s similarity index 100% rename from asm/lavaPlatform.s rename to asm/object/lavaPlatform.s diff --git a/asm/lilypadLarge.s b/asm/object/lilypadLarge.s similarity index 100% rename from asm/lilypadLarge.s rename to asm/object/lilypadLarge.s diff --git a/asm/litArea.s b/asm/object/litArea.s similarity index 100% rename from asm/litArea.s rename to asm/object/litArea.s diff --git a/asm/macroAcorn.s b/asm/object/macroAcorn.s similarity index 100% rename from asm/macroAcorn.s rename to asm/object/macroAcorn.s diff --git a/asm/macroBook.s b/asm/object/macroBook.s similarity index 100% rename from asm/macroBook.s rename to asm/object/macroBook.s diff --git a/asm/macroDecorations.s b/asm/object/macroDecorations.s similarity index 100% rename from asm/macroDecorations.s rename to asm/object/macroDecorations.s diff --git a/asm/macroMushroomStalks.s b/asm/object/macroMushroomStalks.s similarity index 100% rename from asm/macroMushroomStalks.s rename to asm/object/macroMushroomStalks.s diff --git a/asm/macroPlayer.s b/asm/object/macroPlayer.s similarity index 100% rename from asm/macroPlayer.s rename to asm/object/macroPlayer.s diff --git a/asm/macroShoes.s b/asm/object/macroShoes.s similarity index 100% rename from asm/macroShoes.s rename to asm/object/macroShoes.s diff --git a/asm/mazaalBossObject.s b/asm/object/mazaalBossObject.s similarity index 100% rename from asm/mazaalBossObject.s rename to asm/object/mazaalBossObject.s diff --git a/asm/minecart.s b/asm/object/minecart.s similarity index 100% rename from asm/minecart.s rename to asm/object/minecart.s diff --git a/asm/minecartDoor.s b/asm/object/minecartDoor.s similarity index 100% rename from asm/minecartDoor.s rename to asm/object/minecartDoor.s diff --git a/asm/minishEmoticon.s b/asm/object/minishEmoticon.s similarity index 100% rename from asm/minishEmoticon.s rename to asm/object/minishEmoticon.s diff --git a/asm/object10.s b/asm/object/object10.s similarity index 100% rename from asm/object10.s rename to asm/object/object10.s diff --git a/asm/object11.s b/asm/object/object11.s similarity index 100% rename from asm/object11.s rename to asm/object/object11.s diff --git a/asm/object12.s b/asm/object/object12.s similarity index 100% rename from asm/object12.s rename to asm/object/object12.s diff --git a/asm/object15.s b/asm/object/object15.s similarity index 100% rename from asm/object15.s rename to asm/object/object15.s diff --git a/asm/object17.s b/asm/object/object17.s similarity index 100% rename from asm/object17.s rename to asm/object/object17.s diff --git a/asm/object1E.s b/asm/object/object1E.s similarity index 100% rename from asm/object1E.s rename to asm/object/object1E.s diff --git a/asm/object1F.s b/asm/object/object1F.s similarity index 100% rename from asm/object1F.s rename to asm/object/object1F.s diff --git a/asm/object20.s b/asm/object/object20.s similarity index 100% rename from asm/object20.s rename to asm/object/object20.s diff --git a/asm/object21.s b/asm/object/object21.s similarity index 100% rename from asm/object21.s rename to asm/object/object21.s diff --git a/asm/object28.s b/asm/object/object28.s similarity index 100% rename from asm/object28.s rename to asm/object/object28.s diff --git a/asm/object2A.s b/asm/object/object2A.s similarity index 100% rename from asm/object2A.s rename to asm/object/object2A.s diff --git a/asm/object2B.s b/asm/object/object2B.s similarity index 100% rename from asm/object2B.s rename to asm/object/object2B.s diff --git a/asm/object30.s b/asm/object/object30.s similarity index 100% rename from asm/object30.s rename to asm/object/object30.s diff --git a/asm/object35.s b/asm/object/object35.s similarity index 100% rename from asm/object35.s rename to asm/object/object35.s diff --git a/asm/object36.s b/asm/object/object36.s similarity index 100% rename from asm/object36.s rename to asm/object/object36.s diff --git a/asm/object37.s b/asm/object/object37.s similarity index 100% rename from asm/object37.s rename to asm/object/object37.s diff --git a/asm/object3A.s b/asm/object/object3A.s similarity index 100% rename from asm/object3A.s rename to asm/object/object3A.s diff --git a/asm/object3D.s b/asm/object/object3D.s similarity index 100% rename from asm/object3D.s rename to asm/object/object3D.s diff --git a/asm/object3E.s b/asm/object/object3E.s similarity index 100% rename from asm/object3E.s rename to asm/object/object3E.s diff --git a/asm/object42.s b/asm/object/object42.s similarity index 100% rename from asm/object42.s rename to asm/object/object42.s diff --git a/asm/object43.s b/asm/object/object43.s similarity index 100% rename from asm/object43.s rename to asm/object/object43.s diff --git a/asm/object44.s b/asm/object/object44.s similarity index 100% rename from asm/object44.s rename to asm/object/object44.s diff --git a/asm/object45.s b/asm/object/object45.s similarity index 100% rename from asm/object45.s rename to asm/object/object45.s diff --git a/asm/object4B.s b/asm/object/object4B.s similarity index 100% rename from asm/object4B.s rename to asm/object/object4B.s diff --git a/asm/object52.s b/asm/object/object52.s similarity index 100% rename from asm/object52.s rename to asm/object/object52.s diff --git a/asm/object53.s b/asm/object/object53.s similarity index 100% rename from asm/object53.s rename to asm/object/object53.s diff --git a/asm/object5B.s b/asm/object/object5B.s similarity index 100% rename from asm/object5B.s rename to asm/object/object5B.s diff --git a/asm/object61.s b/asm/object/object61.s similarity index 100% rename from asm/object61.s rename to asm/object/object61.s diff --git a/asm/object63.s b/asm/object/object63.s similarity index 100% rename from asm/object63.s rename to asm/object/object63.s diff --git a/asm/object64.s b/asm/object/object64.s similarity index 100% rename from asm/object64.s rename to asm/object/object64.s diff --git a/asm/object66.s b/asm/object/object66.s similarity index 100% rename from asm/object66.s rename to asm/object/object66.s diff --git a/asm/object67.s b/asm/object/object67.s similarity index 100% rename from asm/object67.s rename to asm/object/object67.s diff --git a/asm/object68.s b/asm/object/object68.s similarity index 100% rename from asm/object68.s rename to asm/object/object68.s diff --git a/asm/object69.s b/asm/object/object69.s similarity index 100% rename from asm/object69.s rename to asm/object/object69.s diff --git a/asm/object70.s b/asm/object/object70.s similarity index 100% rename from asm/object70.s rename to asm/object/object70.s diff --git a/asm/object74.s b/asm/object/object74.s similarity index 100% rename from asm/object74.s rename to asm/object/object74.s diff --git a/asm/object75.s b/asm/object/object75.s similarity index 100% rename from asm/object75.s rename to asm/object/object75.s diff --git a/asm/object76.s b/asm/object/object76.s similarity index 100% rename from asm/object76.s rename to asm/object/object76.s diff --git a/asm/object79.s b/asm/object/object79.s similarity index 100% rename from asm/object79.s rename to asm/object/object79.s diff --git a/asm/object81.s b/asm/object/object81.s similarity index 100% rename from asm/object81.s rename to asm/object/object81.s diff --git a/asm/object8E.s b/asm/object/object8E.s similarity index 100% rename from asm/object8E.s rename to asm/object/object8E.s diff --git a/asm/object9.s b/asm/object/object9.s similarity index 100% rename from asm/object9.s rename to asm/object/object9.s diff --git a/asm/object90.s b/asm/object/object90.s similarity index 100% rename from asm/object90.s rename to asm/object/object90.s diff --git a/asm/object91.s b/asm/object/object91.s similarity index 100% rename from asm/object91.s rename to asm/object/object91.s diff --git a/asm/object96.s b/asm/object/object96.s similarity index 100% rename from asm/object96.s rename to asm/object/object96.s diff --git a/asm/object97.s b/asm/object/object97.s similarity index 100% rename from asm/object97.s rename to asm/object/object97.s diff --git a/asm/object98.s b/asm/object/object98.s similarity index 100% rename from asm/object98.s rename to asm/object/object98.s diff --git a/asm/object99.s b/asm/object/object99.s similarity index 100% rename from asm/object99.s rename to asm/object/object99.s diff --git a/asm/object9B.s b/asm/object/object9B.s similarity index 100% rename from asm/object9B.s rename to asm/object/object9B.s diff --git a/asm/objectA6.s b/asm/object/objectA6.s similarity index 100% rename from asm/objectA6.s rename to asm/object/objectA6.s diff --git a/asm/objectA7.s b/asm/object/objectA7.s similarity index 100% rename from asm/objectA7.s rename to asm/object/objectA7.s diff --git a/asm/objectA8.s b/asm/object/objectA8.s similarity index 100% rename from asm/objectA8.s rename to asm/object/objectA8.s diff --git a/asm/objectA9.s b/asm/object/objectA9.s similarity index 100% rename from asm/objectA9.s rename to asm/object/objectA9.s diff --git a/asm/objectAB.s b/asm/object/objectAB.s similarity index 100% rename from asm/objectAB.s rename to asm/object/objectAB.s diff --git a/asm/objectAD.s b/asm/object/objectAD.s similarity index 100% rename from asm/objectAD.s rename to asm/object/objectAD.s diff --git a/asm/objectB.s b/asm/object/objectB.s similarity index 100% rename from asm/objectB.s rename to asm/object/objectB.s diff --git a/asm/objectB3.s b/asm/object/objectB3.s similarity index 100% rename from asm/objectB3.s rename to asm/object/objectB3.s diff --git a/asm/objectB4.s b/asm/object/objectB4.s similarity index 100% rename from asm/objectB4.s rename to asm/object/objectB4.s diff --git a/asm/objectB6.s b/asm/object/objectB6.s similarity index 100% rename from asm/objectB6.s rename to asm/object/objectB6.s diff --git a/asm/objectB9.s b/asm/object/objectB9.s similarity index 100% rename from asm/objectB9.s rename to asm/object/objectB9.s diff --git a/asm/objectBD.s b/asm/object/objectBD.s similarity index 100% rename from asm/objectBD.s rename to asm/object/objectBD.s diff --git a/asm/objectBF.s b/asm/object/objectBF.s similarity index 100% rename from asm/objectBF.s rename to asm/object/objectBF.s diff --git a/asm/objectBlockingStairs.s b/asm/object/objectBlockingStairs.s similarity index 100% rename from asm/objectBlockingStairs.s rename to asm/object/objectBlockingStairs.s diff --git a/asm/objectC1.s b/asm/object/objectC1.s similarity index 100% rename from asm/objectC1.s rename to asm/object/objectC1.s diff --git a/asm/objectD.s b/asm/object/objectD.s similarity index 100% rename from asm/objectD.s rename to asm/object/objectD.s diff --git a/asm/objectE.s b/asm/object/objectE.s similarity index 100% rename from asm/objectE.s rename to asm/object/objectE.s diff --git a/asm/objectOnPillar.s b/asm/object/objectOnPillar.s similarity index 100% rename from asm/objectOnPillar.s rename to asm/object/objectOnPillar.s diff --git a/asm/objectOnSpinyBeetle.s b/asm/object/objectOnSpinyBeetle.s similarity index 100% rename from asm/objectOnSpinyBeetle.s rename to asm/object/objectOnSpinyBeetle.s diff --git a/asm/paper.s b/asm/object/paper.s similarity index 100% rename from asm/paper.s rename to asm/object/paper.s diff --git a/asm/picoBloom.s b/asm/object/picoBloom.s similarity index 100% rename from asm/picoBloom.s rename to asm/object/picoBloom.s diff --git a/asm/pressurePlate.s b/asm/object/pressurePlate.s similarity index 100% rename from asm/pressurePlate.s rename to asm/object/pressurePlate.s diff --git a/asm/pullableLever.s b/asm/object/pullableLever.s similarity index 100% rename from asm/pullableLever.s rename to asm/object/pullableLever.s diff --git a/asm/pullableMushroom.s b/asm/object/pullableMushroom.s similarity index 100% rename from asm/pullableMushroom.s rename to asm/object/pullableMushroom.s diff --git a/asm/pushableFurniture.s b/asm/object/pushableFurniture.s similarity index 100% rename from asm/pushableFurniture.s rename to asm/object/pushableFurniture.s diff --git a/asm/pushableGrave.s b/asm/object/pushableGrave.s similarity index 100% rename from asm/pushableGrave.s rename to asm/object/pushableGrave.s diff --git a/asm/pushableLever.s b/asm/object/pushableLever.s similarity index 100% rename from asm/pushableLever.s rename to asm/object/pushableLever.s diff --git a/asm/pushableRock.s b/asm/object/pushableRock.s similarity index 100% rename from asm/pushableRock.s rename to asm/object/pushableRock.s diff --git a/asm/pushableStatue.s b/asm/object/pushableStatue.s similarity index 100% rename from asm/pushableStatue.s rename to asm/object/pushableStatue.s diff --git a/asm/smallIceBlock.s b/asm/object/smallIceBlock.s similarity index 100% rename from asm/smallIceBlock.s rename to asm/object/smallIceBlock.s diff --git a/asm/specialFx.s b/asm/object/specialFx.s similarity index 100% rename from asm/specialFx.s rename to asm/object/specialFx.s diff --git a/asm/steam.s b/asm/object/steam.s similarity index 100% rename from asm/steam.s rename to asm/object/steam.s diff --git a/asm/stoneTablet.s b/asm/object/stoneTablet.s similarity index 100% rename from asm/stoneTablet.s rename to asm/object/stoneTablet.s diff --git a/asm/treeHidingPortal.s b/asm/object/treeHidingPortal.s similarity index 100% rename from asm/treeHidingPortal.s rename to asm/object/treeHidingPortal.s diff --git a/asm/waterfallOpening.s b/asm/object/waterfallOpening.s similarity index 100% rename from asm/waterfallOpening.s rename to asm/object/waterfallOpening.s diff --git a/asm/whirlwind.s b/asm/object/whirlwind.s similarity index 100% rename from asm/whirlwind.s rename to asm/object/whirlwind.s diff --git a/asm/windTribeTeleporter.s b/asm/object/windTribeTeleporter.s similarity index 100% rename from asm/windTribeTeleporter.s rename to asm/object/windTribeTeleporter.s diff --git a/include/enemy.h b/include/enemy.h index 8595b8f3..5905ce5b 100644 --- a/include/enemy.h +++ b/include/enemy.h @@ -4,7 +4,7 @@ #include "global.h" #include "asm.h" -#include "audio.h" +#include "sound.h" #include "effects.h" #include "flags.h" #include "utils.h" diff --git a/include/fileScreen.h b/include/fileScreen.h index 8d67cf82..78a36f90 100644 --- a/include/fileScreen.h +++ b/include/fileScreen.h @@ -1,7 +1,7 @@ #ifndef FILESELECT_H #define FILESELECT_H -#include "audio.h" +#include "sound.h" #include "global.h" #include "save.h" diff --git a/include/overworld.h b/include/game.h similarity index 95% rename from include/overworld.h rename to include/game.h index 43ae0c1a..8fb5253f 100644 --- a/include/overworld.h +++ b/include/game.h @@ -1,5 +1,5 @@ -#ifndef OVERWORLD_H -#define OVERWORLD_H +#ifndef GAME_H +#define GAME_H #include "global.h" #include "area.h" @@ -58,4 +58,4 @@ void sub_08053500(void); u32 GetBottleContaining(u32); -#endif // OVERWORLD_H +#endif // GAME_H diff --git a/include/textbox.h b/include/message.h similarity index 97% rename from include/textbox.h rename to include/message.h index 894c5d9d..f7f8c25d 100644 --- a/include/textbox.h +++ b/include/message.h @@ -1,5 +1,5 @@ -#ifndef TEXTBOX_H -#define TEXTBOX_H +#ifndef MESSAGE_H +#define MESSAGE_H #include "global.h" #include "entity.h" @@ -128,4 +128,4 @@ void MessageAtHeight(u32 index, u32 y); void DispMessageFrame(u16*, u32, u32, u32); -#endif +#endif // MESSAGE_H diff --git a/include/npc.h b/include/npc.h index d67652de..3e049fb0 100644 --- a/include/npc.h +++ b/include/npc.h @@ -5,12 +5,12 @@ #include "asm.h" #include "utils.h" -#include "audio.h" +#include "sound.h" #include "effects.h" #include "room.h" #include "flags.h" #include "coord.h" -#include "textbox.h" +#include "message.h" #include "script.h" #include "save.h" diff --git a/include/object.h b/include/object.h index d7256397..84f9c02c 100644 --- a/include/object.h +++ b/include/object.h @@ -5,7 +5,7 @@ #include "asm.h" #include "utils.h" -#include "audio.h" +#include "sound.h" #include "flags.h" #include "effects.h" #include "room.h" diff --git a/include/audio.h b/include/sound.h similarity index 99% rename from include/audio.h rename to include/sound.h index e5e4c0e4..8549510f 100644 --- a/include/audio.h +++ b/include/sound.h @@ -1,5 +1,5 @@ -#ifndef AUDIO_H -#define AUDIO_H +#ifndef SOUND_H +#define SOUND_H #include "global.h" @@ -597,4 +597,4 @@ typedef enum { SONG_BGM_0 = 0x80110000, } Sound; -#endif // AUDIO_H +#endif // SOUND_H diff --git a/linker.ld b/linker.ld index 225731fc..76401066 100644 --- a/linker.ld +++ b/linker.ld @@ -384,7 +384,7 @@ SECTIONS { src/enemy/pesto.o(.text); src/enemy/puffstool.o(.text); src/enemy/chuchuBoss.o(.text); - asm/chuchuBoss.o(.text); + asm/enemy/chuchuBoss.o(.text); src/enemy/likeLike.o(.text); src/enemy/spearMoblin.o(.text); src/enemy/businessScrub.o(.text); @@ -401,77 +401,77 @@ SECTIONS { src/enemy/fallingBoulder.o(.text); src/enemy/bobomb.o(.text); src/enemy/wallMaster2.o(.text); - asm/gleerok.o(.text); + asm/enemy/gleerok.o(.text); src/enemy/vaatiEyesMacro.o(.text); src/enemy/tektite.o(.text); - asm/wizzrobeWind.o(.text); - asm/wizzrobeFire.o(.text); - asm/wizzrobeIce.o(.text); - src/code_080300AC.o(.text); - asm/code_080300AC.o(.text); - asm/armos.o(.text); - asm/eyegore.o(.text); + asm/enemy/wizzrobeWind.o(.text); + asm/enemy/wizzrobeFire.o(.text); + asm/enemy/wizzrobeIce.o(.text); + src/enemy/code_080300AC.o(.text); + asm/enemy/code_080300AC.o(.text); + asm/enemy/armos.o(.text); + asm/enemy/eyegore.o(.text); src/enemy/rope.o(.text); src/enemy/smallPesto.o(.text); src/enemy/acroBandits.o(.text); src/enemy/bladeTrap.o(.text); src/enemy/keaton.o(.text); - asm/crow.o(.text); - asm/mulldozer.o(.text); - asm/bombarossa.o(.text); + asm/enemy/crow.o(.text); + asm/enemy/mulldozer.o(.text); + asm/enemy/bombarossa.o(.text); src/enemy/wisp.o(.text); - asm/spinyBeetle.o(.text); + asm/enemy/spinyBeetle.o(.text); src/enemy/mazaalHead.o(.text); src/enemy/mazaalMacro.o(.text); src/enemy/mazaalHand.o(.text); src/enemy/octorokBoss.o(.text); - asm/flyingPot.o(.text); + asm/enemy/flyingPot.o(.text); src/enemy/gibdo.o(.text); - asm/octorokGolden.o(.text); + asm/enemy/octorokGolden.o(.text); src/enemy/tektiteGolden.o(.text); src/enemy/ropeGolden.o(.text); - asm/cloudPiranha.o(.text); - asm/scissorsBeetle.o(.text); - asm/cuccoAggr.o(.text); - asm/stalfos.o(.text); - asm/flyingSkull.o(.text); + asm/enemy/cloudPiranha.o(.text); + asm/enemy/scissorsBeetle.o(.text); + asm/enemy/cuccoAggr.o(.text); + asm/enemy/stalfos.o(.text); + asm/enemy/flyingSkull.o(.text); src/enemy/mazaalBracelet.o(.text); - asm/takkuri.o(.text); + asm/enemy/takkuri.o(.text); src/enemy/bowMoblin.o(.text); - asm/bowMoblin.o(.text); + asm/enemy/bowMoblin.o(.text); src/enemy/lakitu.o(.text); src/enemy/lakituCloud.o(.text); - asm/enemy49.o(.text); + asm/enemy/enemy49.o(.text); src/enemy/vaatiRebornEnemy.o(.text); src/enemy/vaatiProjectile.o(.text); - asm/ballChainSoldier.o(.text); + asm/enemy/ballChainSoldier.o(.text); src/enemy/enemy4D.o(.text); - asm/enemy4D.o(.text); - asm/ghini.o(.text); + asm/enemy/enemy4D.o(.text); + asm/enemy/ghini.o(.text); src/enemy/vaatiTransfigured.o(.text); - asm/enemy50.o(.text); + asm/enemy/enemy50.o(.text); src/enemy/vaatiWrath.o(.text); src/enemy/vaatiArm.o(.text); - asm/dust.o(.text); + asm/enemy/dust.o(.text); src/enemy/vaatiBall.o(.text); src/enemy/slime.o(.text); - asm/sub_080451CC.o(.text); + asm/enemy/sub_080451CC.o(.text); src/enemy/miniSlime.o(.text); src/enemy/fireballGuy.o(.text); src/enemy/miniFireballGuy.o(.text); src/enemy/vaatiTransfiguredEye.o(.text); - asm/businessScrubPrologue.o(.text); - asm/gyorgFemale.o(.text); + asm/enemy/businessScrubPrologue.o(.text); + asm/enemy/gyorgFemale.o(.text); src/enemy/gyorgMale.o(.text); - asm/curtain.o(.text); + asm/enemy/curtain.o(.text); src/enemy/vaatiWrathEye.o(.text); - asm/gyorgChild.o(.text); - asm/gyorgFemaleEye.o(.text); - asm/enemy62.o(.text); - asm/gyorgFemaleMouth.o(.text); - asm/enemy64.o(.text); + asm/enemy/gyorgChild.o(.text); + asm/enemy/gyorgFemaleEye.o(.text); + asm/enemy/enemy62.o(.text); + asm/enemy/gyorgFemaleMouth.o(.text); + asm/enemy/enemy64.o(.text); src/enemy/treeItem.o(.text); - asm/enemy66.o(.text); + asm/enemy/enemy66.o(.text); /* END enemies */ src/code_08049CD4.o(.text); asm/code_08049D30.o(.text); @@ -486,7 +486,7 @@ SECTIONS { src/fade.o(.text); src/fileScreen.o(.text); asm/fileScreen.o(.text); - src/overworld.o(.text); + src/game.o(.text); asm/code_080526F8.o(.text); asm/modBombs.o(.text); asm/modArrows.o(.text); @@ -496,7 +496,7 @@ SECTIONS { asm/code_08054C04.o(.text); src/sub_08055E08.o(.text); src/main.o(.text); - src/textbox.o(.text); + src/message.o(.text); asm/code_08056418.o(.text); src/manager/manager1.o(.text); src/manager/manager2.o(.text); @@ -686,214 +686,214 @@ SECTIONS { asm/code_0807CAA0.o(.text); src/flags.o(.text); src/save.o(.text); - src/code_0807CC3C.o(.text); + src/scroll.o(.text); src/script.o(.text); asm/code_0807F0D8.o(.text); src/code_0808091C.o(.text); asm/code_0808091C.o(.text); /* objects */ src/object/itemOnGround.o(.text); - asm/deathFx.o(.text); - asm/itemForSale.o(.text); + asm/object/deathFx.o(.text); + asm/object/itemForSale.o(.text); src/object/button.o(.text); - asm/minishEmoticon.o(.text); + asm/object/minishEmoticon.o(.text); src/object/pot.o(.text); - asm/ezloCap.o(.text); - asm/blockPushed.o(.text); + asm/object/ezloCap.o(.text); + asm/object/blockPushed.o(.text); src/object/lockedDoor.o(.text); - asm/object9.o(.text); + asm/object/object9.o(.text); src/object/objectA.o(.text); - asm/objectB.o(.text); + asm/object/objectB.o(.text); src/object/chestSpawner.o(.text); - asm/chestSpawner.o(.text); - asm/objectD.o(.text); - asm/objectE.o(.text); - asm/specialFx.o(.text); - asm/object10.o(.text); - asm/object11.o(.text); - asm/object12.o(.text); + asm/object/chestSpawner.o(.text); + asm/object/objectD.o(.text); + asm/object/objectE.o(.text); + asm/object/specialFx.o(.text); + asm/object/object10.o(.text); + asm/object/object11.o(.text); + asm/object/object12.o(.text); src/object/railtrack.o(.text); - asm/lilypadLarge.o(.text); - asm/object15.o(.text); - asm/floatingPlatform.o(.text); - asm/object17.o(.text); - asm/evilSpirit.o(.text); + asm/object/lilypadLarge.o(.text); + asm/object/object15.o(.text); + asm/object/floatingPlatform.o(.text); + asm/object/object17.o(.text); + asm/object/evilSpirit.o(.text); src/object/houseDoorExterior.o(.text); src/object/object1A.o(.text); src/object/greatFairy.o(.text); src/object/object1C.o(.text); src/object/object1D.o(.text); - asm/object1E.o(.text); - asm/object1F.o(.text); - asm/object20.o(.text); - asm/object21.o(.text); - asm/figurineDevice.o(.text); - asm/eyeSwitch.o(.text); - asm/pressurePlate.o(.text); - asm/bigBarrel.o(.text); - asm/barrelInside.o(.text); - asm/pushableStatue.o(.text); - asm/object28.o(.text); - asm/ambientClouds.o(.text); + asm/object/object1E.o(.text); + asm/object/object1F.o(.text); + asm/object/object20.o(.text); + asm/object/object21.o(.text); + asm/object/figurineDevice.o(.text); + asm/object/eyeSwitch.o(.text); + asm/object/pressurePlate.o(.text); + asm/object/bigBarrel.o(.text); + asm/object/barrelInside.o(.text); + asm/object/pushableStatue.o(.text); + asm/object/object28.o(.text); + asm/object/ambientClouds.o(.text); src/object/object2A.o(.text); - asm/object2A.o(.text); - asm/object2B.o(.text); - asm/beanstalk.o(.text); + asm/object/object2A.o(.text); + asm/object/object2B.o(.text); + asm/object/beanstalk.o(.text); src/object/smoke.o(.text); - asm/pushableRock.o(.text); - asm/hittableLever.o(.text); - asm/object30.o(.text); + asm/object/pushableRock.o(.text); + asm/object/hittableLever.o(.text); + asm/object/object30.o(.text); src/object/frozenFlower.o(.text); - asm/pullableMushroom.o(.text); - asm/bollard.o(.text); + asm/object/pullableMushroom.o(.text); + asm/object/bollard.o(.text); src/object/warpPoint.o(.text); - asm/object35.o(.text); - asm/object36.o(.text); - asm/object37.o(.text); + asm/object/object35.o(.text); + asm/object/object36.o(.text); + asm/object/object37.o(.text); src/object/jarPortal.o(.text); - asm/bossDoor.o(.text); - asm/object3A.o(.text); - asm/macroMushroomStalks.o(.text); - asm/object75.o(.text); /* 75 and 76 are mislocated in base game */ - asm/object76.o(.text); - asm/code_0808C964.o(.text); - asm/macroPlayer.o(.text); - asm/object3D.o(.text); - asm/object3E.o(.text); + asm/object/bossDoor.o(.text); + asm/object/object3A.o(.text); + asm/object/macroMushroomStalks.o(.text); + asm/object/object75.o(.text); /* 75 and 76 are mislocated in base game */ + asm/object/object76.o(.text); + asm/object/code_0808C964.o(.text); + asm/object/macroPlayer.o(.text); + asm/object/object3D.o(.text); + asm/object/object3E.o(.text); src/object/giantLeaf.o(.text); - asm/fairy.o(.text); - asm/ladderUp.o(.text); - asm/object42.o(.text); - asm/object43.o(.text); - asm/object44.o(.text); - asm/object45.o(.text); - asm/giantBookLadder.o(.text); + asm/object/fairy.o(.text); + asm/object/ladderUp.o(.text); + asm/object/object42.o(.text); + asm/object/object43.o(.text); + asm/object/object44.o(.text); + asm/object/object45.o(.text); + asm/object/giantBookLadder.o(.text); src/object/heartContainer.o(.text); src/object/fileScreenObjects.o(.text); src/object/object49.o(.text); src/object/backgroundCloud.o(.text); - asm/object4B.o(.text); - asm/pushableFurniture.o(.text); + asm/object/object4B.o(.text); + asm/object/pushableFurniture.o(.text); src/object/furniture.o(.text); src/object/minishSizedEntrance.o(.text); src/object/archway.o(.text); - asm/giantRock.o(.text); - asm/giantRock2.o(.text); - asm/object52.o(.text); - asm/object53.o(.text); - asm/pullableLever.o(.text); + asm/object/giantRock.o(.text); + asm/object/giantRock2.o(.text); + asm/object/object52.o(.text); + asm/object/object53.o(.text); + asm/object/pullableLever.o(.text); src/object/minecart.o(.text); - asm/minecart.o(.text); + asm/object/minecart.o(.text); src/object/thoughtBubble.o(.text); src/object/hiddenLadderDown.o(.text); - asm/gentariCurtains.o(.text); - asm/lavaPlatform.o(.text); - asm/paper.o(.text); - asm/object5B.o(.text); + asm/object/gentariCurtains.o(.text); + asm/object/lavaPlatform.o(.text); + asm/object/paper.o(.text); + asm/object/object5B.o(.text); src/object/mask.o(.text); - asm/houseDoorInterior.o(.text); - asm/whirlwind.o(.text); - asm/objectBlockingStairs.o(.text); + asm/object/houseDoorInterior.o(.text); + asm/object/whirlwind.o(.text); + asm/object/objectBlockingStairs.o(.text); src/object/swordsmanNewsletter.o(.text); - asm/object61.o(.text); - asm/giantTwig.o(.text); - asm/object63.o(.text); - asm/object64.o(.text); - asm/ladderHoleInBookshelf.o(.text); - asm/object66.o(.text); - asm/object67.o(.text); - asm/object68.o(.text); - asm/object69.o(.text); + asm/object/object61.o(.text); + asm/object/giantTwig.o(.text); + asm/object/object63.o(.text); + asm/object/object64.o(.text); + asm/object/ladderHoleInBookshelf.o(.text); + asm/object/object66.o(.text); + asm/object/object67.o(.text); + asm/object/object68.o(.text); + asm/object/object69.o(.text); src/object/object6A.o(.text); - asm/crenalBeanSprout.o(.text); - asm/minecartDoor.o(.text); - asm/objectOnPillar.o(.text); + asm/object/crenalBeanSprout.o(.text); + asm/object/minecartDoor.o(.text); + asm/object/objectOnPillar.o(.text); src/object/mineralWaterSource.o(.text); src/object/minishSizedArchway.o(.text); - asm/object70.o(.text); - asm/pushableGrave.o(.text); - asm/stoneTablet.o(.text); + asm/object/object70.o(.text); + asm/object/pushableGrave.o(.text); + asm/object/stoneTablet.o(.text); src/object/lilypadSmall.o(.text); - asm/object74.o(.text); + asm/object/object74.o(.text); src/object/bell.o(.text); - asm/macroDecorations.o(.text); - asm/object79.o(.text); - asm/steam.o(.text); - asm/pushableLever.o(.text); - asm/macroShoes.o(.text); - asm/objectOnSpinyBeetle.o(.text); + asm/object/macroDecorations.o(.text); + asm/object/object79.o(.text); + asm/object/steam.o(.text); + asm/object/pushableLever.o(.text); + asm/object/macroShoes.o(.text); + asm/object/objectOnSpinyBeetle.o(.text); src/object/object7E.o(.text); - asm/picoBloom.o(.text); - asm/board.o(.text); - asm/object81.o(.text); + asm/object/picoBloom.o(.text); + asm/object/board.o(.text); + asm/object/object81.o(.text); src/object/bigVortex.o(.text); - asm/bigPushableLever.o(.text); - asm/smallIceBlock.o(.text); - asm/bigIceBlock.o(.text); + asm/object/bigPushableLever.o(.text); + asm/object/smallIceBlock.o(.text); + asm/object/bigIceBlock.o(.text); src/object/object86.o(.text); src/object/octorokBossObject.o(.text); - asm/macroBook.o(.text); - asm/mazaalBossObject.o(.text); - asm/cabinFurniture.o(.text); - asm/doubleBookshelf.o(.text); + asm/object/macroBook.o(.text); + asm/object/mazaalBossObject.o(.text); + asm/object/cabinFurniture.o(.text); + asm/object/doubleBookshelf.o(.text); src/object/book.o(.text); src/object/fireplace.o(.text); - asm/object8E.o(.text); - asm/frozenWaterElement.o(.text); - asm/object90.o(.text); - asm/object91.o(.text); + asm/object/object8E.o(.text); + asm/object/frozenWaterElement.o(.text); + asm/object/object90.o(.text); + asm/object/object91.o(.text); src/object/bakerOven.o(.text); - asm/lamp.o(.text); + asm/object/lamp.o(.text); src/object/windTribeFlag.o(.text); src/object/bird.o(.text); - asm/bird.o(.text); - asm/object96.o(.text); - asm/object97.o(.text); - asm/object98.o(.text); - asm/object99.o(.text); - asm/macroAcorn.o(.text); - asm/object9B.o(.text); + asm/object/bird.o(.text); + asm/object/object96.o(.text); + asm/object/object97.o(.text); + asm/object/object98.o(.text); + asm/object/object99.o(.text); + asm/object/macroAcorn.o(.text); + asm/object/object9B.o(.text); src/object/treeHidingPortal.o(.text); - asm/treeHidingPortal.o(.text); + asm/object/treeHidingPortal.o(.text); src/object/lightableSwitch.o(.text); src/object/treeThorns.o(.text); src/object/fan.o(.text); - asm/fan.o(.text); - asm/angryStatue.o(.text); + asm/object/fan.o(.text); + asm/object/angryStatue.o(.text); src/object/palaceArchway.o(.text); src/object/objectA2.o(.text); src/object/cloud.o(.text); src/object/minishLight.o(.text); - asm/fireballChain.o(.text); - asm/objectA6.o(.text); - asm/objectA7.o(.text); + asm/object/fireballChain.o(.text); + asm/object/objectA6.o(.text); + asm/object/objectA7.o(.text); src/object/objectA8.o(.text); - asm/objectA8.o(.text); - asm/objectA9.o(.text); - asm/waterfallOpening.o(.text); - asm/objectAB.o(.text); - asm/fourElements.o(.text); - asm/objectAD.o(.text); + asm/object/objectA8.o(.text); + asm/object/objectA9.o(.text); + asm/object/waterfallOpening.o(.text); + asm/object/objectAB.o(.text); + asm/object/fourElements.o(.text); + asm/object/objectAD.o(.text); src/object/floatingBlock.o(.text); src/object/objectAF.o(.text); src/object/metalDoor.o(.text); src/object/jailBars.o(.text); src/object/objectB2.o(.text); - asm/objectB3.o(.text); - asm/objectB4.o(.text); + asm/object/objectB3.o(.text); + asm/object/objectB4.o(.text); src/object/objectB5.o(.text); - asm/objectB6.o(.text); + asm/object/objectB6.o(.text); src/object/well.o(.text); - asm/windTribeTeleporter.o(.text); - asm/objectB9.o(.text); - asm/gyorgBossObject.o(.text); + asm/object/windTribeTeleporter.o(.text); + asm/object/objectB9.o(.text); + asm/object/gyorgBossObject.o(.text); src/object/windcrest.o(.text); - asm/litArea.o(.text); - asm/objectBD.o(.text); + asm/object/litArea.o(.text); + asm/object/objectBD.o(.text); src/object/pinwheel.o(.text); - asm/objectBF.o(.text); - asm/enemyItem.o(.text); - asm/objectC1.o(.text); + asm/object/objectBF.o(.text); + asm/object/enemyItem.o(.text); + asm/object/objectC1.o(.text); /* END objects */ asm/sub_080A276C.o(.text); src/objectUtils.o(.text); @@ -903,7 +903,7 @@ SECTIONS { #ifdef DEMO_USA src/demoScreen.o(.text); #endif - src/audio.o(.text); + src/sound.o(.text); asm/code_080A3480.o(.text); src/sub_080A3B84.o(.text); asm/code_080A3BD0.o(.text); @@ -1173,7 +1173,7 @@ SECTIONS { data/data_080FC3C4.o(.rodata); src/fileScreen.o(.rodata); data/data_080FC8A4.o(.rodata); - src/overworld.o(.rodata); + src/game.o(.rodata); data/data_080FCAC8.o(.rodata); data/const/playerItem/playerItemLantern.o(.rodata); data/data_080FEEB8.o(.rodata); @@ -1183,7 +1183,7 @@ SECTIONS { data/map/tileset_headers.o(.rodata); data/map/metatile_headers.o(.rodata); data/map/map_headers.o(.rodata); - src/textbox.o(.rodata); + src/message.o(.rodata); data/const/manager/manager1.o(.rodata); data/const/manager/manager3.o(.rodata); data/const/manager/manager4.o(.rodata); @@ -1737,7 +1737,7 @@ SECTIONS { src/gba/m4a.o(.rodata); data/sound/voicegroups.o(.rodata); data/sound/programmable_wave_samples.o(.rodata); - src/audio.o(.rodata); + src/sound.o(.rodata); data/sound/direct_sound_samples.o(.rodata); data/sound/sounds.o(.rodata); src/eeprom.o(.rodata); diff --git a/src/code_0808091C.c b/src/code_0808091C.c index 51e23169..fd82dfa6 100644 --- a/src/code_0808091C.c +++ b/src/code_0808091C.c @@ -2,7 +2,7 @@ #include "entity.h" #include "structures.h" #include "functions.h" -#include "overworld.h" +#include "game.h" extern void sub_08080BC4(void); diff --git a/src/code_080A29BC.c b/src/code_080A29BC.c deleted file mode 100644 index 17ea28b0..00000000 --- a/src/code_080A29BC.c +++ /dev/null @@ -1,58 +0,0 @@ -#include "global.h" -#include "entity.h" -#include "room.h" -#include "object.h" - -void sub_080A29C8(s32 xOff, s32 yOff, u32 layer) { - Entity* pEVar1; - - pEVar1 = CreateObject(SPECIAL_FX, 2, 0); - if (pEVar1 != NULL) { - pEVar1->x.HALF.HI = gRoomControls.roomOriginX + xOff; - pEVar1->y.HALF.HI = gRoomControls.roomOriginY + yOff; - pEVar1->collisionLayer = layer; - } -} - -void sub_080A29FC(Entity* parent) { - CreateFx(parent, FX_DASH, 0); -} - -void sub_080A2A08(Entity* parent) { - CreateFx(parent, FX_6, 0); -} - -void sub_080A2A14(Entity* parent) { - CreateFx(parent, FX_WATER_SPLASH, 0); -} - -Entity* sub_080A2A20(Entity* parent, u32 form, u32 parameter) { - Entity* pEVar1; - - pEVar1 = CreateObjectWithParent(parent, GROUND_ITEM, form, parameter); - if (pEVar1 != NULL) { - pEVar1->actionDelay = 5; - } - return pEVar1; -} - -Entity* sub_080A2A3C(Entity* parent, u32 form, u32 subtype, u32 param_4) { - Entity* ent; - - ent = CreateObjectWithParent(parent, GROUND_ITEM, form, subtype); - if (ent != NULL) { - ent->actionDelay = 5; - *(u32*)(&ent->field_0x86) = param_4; - } - return ent; -} - -Entity* sub_080A2A64(Entity* parent) { - Entity* pEVar1; - - pEVar1 = CreateFx(parent, FX_SPARKLE2, 0); - if (pEVar1 != NULL) { - pEVar1->spritePriority.b0 = 7; - } - return pEVar1; -} diff --git a/src/collision.c b/src/collision.c index db07ec77..d39cb4a2 100644 --- a/src/collision.c +++ b/src/collision.c @@ -7,7 +7,7 @@ #include "functions.h" #include "enemy.h" #include "object.h" -#include "overworld.h" +#include "game.h" extern u8 gCollidableCount; extern u8 gUnk_080B3740[]; diff --git a/src/coord.c b/src/coord.c index b9209b69..87108481 100644 --- a/src/coord.c +++ b/src/coord.c @@ -3,7 +3,7 @@ #include "player.h" #include "coord.h" #include "utils.h" -#include "audio.h" +#include "sound.h" #include "room.h" #include "functions.h" diff --git a/src/debugScreen.c b/src/debugScreen.c index 958791fa..b3300574 100644 --- a/src/debugScreen.c +++ b/src/debugScreen.c @@ -1,11 +1,11 @@ #include "global.h" -#include "audio.h" +#include "sound.h" #include "utils.h" #include "functions.h" #include "main.h" #include "menu.h" #include "screen.h" -#include "textbox.h" +#include "message.h" extern void (*const gUnk_08109A30[])(); diff --git a/src/demoScreen.c b/src/demoScreen.c index efc3368d..e2d7c911 100644 --- a/src/demoScreen.c +++ b/src/demoScreen.c @@ -2,7 +2,7 @@ #include "functions.h" #include "main.h" #include "utils.h" -#include "textbox.h" +#include "message.h" #include "fileScreen.h" #include "screen.h" diff --git a/src/enemy/bladeTrap.c b/src/enemy/bladeTrap.c index ecad5157..ceea0b5d 100644 --- a/src/enemy/bladeTrap.c +++ b/src/enemy/bladeTrap.c @@ -1,4 +1,4 @@ -#include "audio.h" +#include "sound.h" #include "entity.h" #include "room.h" #include "functions.h" diff --git a/src/enemy/bobomb.c b/src/enemy/bobomb.c index 32e72b86..94ba6b9d 100644 --- a/src/enemy/bobomb.c +++ b/src/enemy/bobomb.c @@ -1,5 +1,5 @@ #include "asm.h" -#include "audio.h" +#include "sound.h" #include "enemy.h" #include "object.h" #include "functions.h" diff --git a/src/enemy/businessScrub.c b/src/enemy/businessScrub.c index e6b544b3..1bff3860 100644 --- a/src/enemy/businessScrub.c +++ b/src/enemy/businessScrub.c @@ -1,10 +1,10 @@ #include "asm.h" #include "enemy.h" -#include "textbox.h" +#include "message.h" #include "save.h" #include "npc.h" #include "functions.h" -#include "overworld.h" +#include "game.h" extern Entity* sub_08049DF4(u32); extern bool32 sub_08056338(void); diff --git a/src/code_080300AC.c b/src/enemy/code_080300AC.c similarity index 100% rename from src/code_080300AC.c rename to src/enemy/code_080300AC.c diff --git a/src/enemy/doorMimic.c b/src/enemy/doorMimic.c index 299601f8..af328474 100644 --- a/src/enemy/doorMimic.c +++ b/src/enemy/doorMimic.c @@ -1,4 +1,4 @@ -#include "audio.h" +#include "sound.h" #include "enemy.h" #include "functions.h" diff --git a/src/enemy/likeLike.c b/src/enemy/likeLike.c index edab8bed..f0b08684 100644 --- a/src/enemy/likeLike.c +++ b/src/enemy/likeLike.c @@ -1,5 +1,5 @@ #include "enemy.h" -#include "textbox.h" +#include "message.h" #include "save.h" #include "object.h" #include "functions.h" diff --git a/src/enemy/octorokBoss.c b/src/enemy/octorokBoss.c index 1d1c6ab3..b6e207d3 100644 --- a/src/enemy/octorokBoss.c +++ b/src/enemy/octorokBoss.c @@ -2,7 +2,7 @@ #include "functions.h" #include "object.h" #include "projectile.h" -#include "overworld.h" +#include "game.h" extern void sub_08078AC0(u32, u32, u32); extern u32 GetRandomByWeight(const u8*); diff --git a/src/enemy/pesto.c b/src/enemy/pesto.c index 73bc1509..676ecfcf 100644 --- a/src/enemy/pesto.c +++ b/src/enemy/pesto.c @@ -1,6 +1,6 @@ #include "enemy.h" #include "object.h" -#include "overworld.h" +#include "game.h" #include "functions.h" #include "save.h" diff --git a/src/enemy/rupeeLike.c b/src/enemy/rupeeLike.c index 351c56a1..7aacbee9 100644 --- a/src/enemy/rupeeLike.c +++ b/src/enemy/rupeeLike.c @@ -1,6 +1,6 @@ #include "global.h" #include "asm.h" -#include "audio.h" +#include "sound.h" #include "entity.h" #include "enemy.h" #include "object.h" diff --git a/src/enemy/vaatiTransfiguredEye.c b/src/enemy/vaatiTransfiguredEye.c index f43e6290..67e795ac 100644 --- a/src/enemy/vaatiTransfiguredEye.c +++ b/src/enemy/vaatiTransfiguredEye.c @@ -1,6 +1,6 @@ #include "entity.h" #include "enemy.h" -#include "textbox.h" +#include "message.h" #include "coord.h" #include "functions.h" diff --git a/src/enemy/vaatiWrath.c b/src/enemy/vaatiWrath.c index 49049925..23e49183 100644 --- a/src/enemy/vaatiWrath.c +++ b/src/enemy/vaatiWrath.c @@ -1,6 +1,6 @@ #include "enemy.h" #include "object.h" -#include "textbox.h" +#include "message.h" #include "functions.h" #include "save.h" #include "screen.h" diff --git a/src/entity.c b/src/entity.c index a2d4085f..2902c057 100644 --- a/src/entity.c +++ b/src/entity.c @@ -2,7 +2,7 @@ #include "utils.h" #include "functions.h" #include "area.h" -#include "textbox.h" +#include "message.h" #include "npc.h" extern u8 gUnk_081091F8[]; diff --git a/src/ezloNag.c b/src/ezloNag.c index e0edff23..addcacd2 100644 --- a/src/ezloNag.c +++ b/src/ezloNag.c @@ -1,6 +1,6 @@ #include "global.h" -#include "audio.h" -#include "textbox.h" +#include "sound.h" +#include "message.h" typedef struct { s8 unk0; diff --git a/src/fileScreen.c b/src/fileScreen.c index ab3c3729..8d221ccd 100644 --- a/src/fileScreen.c +++ b/src/fileScreen.c @@ -3,7 +3,7 @@ #include "utils.h" #include "screen.h" #include "menu.h" -#include "textbox.h" +#include "message.h" #include "object.h" #include "functions.h" diff --git a/src/overworld.c b/src/game.c similarity index 99% rename from src/overworld.c rename to src/game.c index cc70b283..72fd56c0 100644 --- a/src/overworld.c +++ b/src/game.c @@ -1,5 +1,5 @@ #include "global.h" -#include "audio.h" +#include "sound.h" #include "screen.h" #include "entity.h" #include "player.h" @@ -12,8 +12,8 @@ #include "menu.h" #include "functions.h" #include "area.h" -#include "textbox.h" -#include "overworld.h" +#include "message.h" +#include "game.h" extern u32 gUnk_03003FC0; diff --git a/src/interrupts.c b/src/interrupts.c index 72022c22..253c0aa0 100644 --- a/src/interrupts.c +++ b/src/interrupts.c @@ -1,10 +1,10 @@ #include "global.h" -#include "audio.h" +#include "sound.h" #include "main.h" #include "player.h" #include "structures.h" #include "save.h" -#include "textbox.h" +#include "message.h" #include "functions.h" #include "screen.h" #include "gba/m4a.h" diff --git a/src/intro.c b/src/intro.c index 30aad962..c9eb0f73 100644 --- a/src/intro.c +++ b/src/intro.c @@ -1,10 +1,10 @@ -#include "audio.h" +#include "sound.h" #include "main.h" #include "entity.h" #include "utils.h" #include "screen.h" #include "object.h" -#include "textbox.h" +#include "message.h" #include "functions.h" typedef struct { diff --git a/src/item/itemBomb.c b/src/item/itemBomb.c index 0ed4d65a..c0ce310c 100644 --- a/src/item/itemBomb.c +++ b/src/item/itemBomb.c @@ -1,6 +1,6 @@ #include "item.h" #include "coord.h" -#include "audio.h" +#include "sound.h" #include "functions.h" extern void (*const gUnk_0811BD98[])(ItemBehavior*, u32); diff --git a/src/item/itemLantern.c b/src/item/itemLantern.c index 88245ad8..9399ef1b 100644 --- a/src/item/itemLantern.c +++ b/src/item/itemLantern.c @@ -1,6 +1,6 @@ #include "item.h" #include "functions.h" -#include "audio.h" +#include "sound.h" #include "object.h" extern void (*const gUnk_0811BD68[])(ItemBehavior*, u32); diff --git a/src/item/itemMoleMitts.c b/src/item/itemMoleMitts.c index 82fbecac..9bce54e5 100644 --- a/src/item/itemMoleMitts.c +++ b/src/item/itemMoleMitts.c @@ -1,7 +1,7 @@ #include "item.h" #include "functions.h" -#include "audio.h" +#include "sound.h" extern void (*const gUnk_0811BE04[])(ItemBehavior*, u32); diff --git a/src/item/itemOcarina.c b/src/item/itemOcarina.c index 0ea670a5..5913c477 100644 --- a/src/item/itemOcarina.c +++ b/src/item/itemOcarina.c @@ -1,5 +1,5 @@ #include "item.h" -#include "audio.h" +#include "sound.h" #include "functions.h" extern void (*const gOcarinaStates[4])(ItemBehavior*, u32); diff --git a/src/item/itemPegasusBoots.c b/src/item/itemPegasusBoots.c index e60d820c..cf2bd6ac 100644 --- a/src/item/itemPegasusBoots.c +++ b/src/item/itemPegasusBoots.c @@ -1,6 +1,6 @@ #include "asm.h" #include "item.h" -#include "audio.h" +#include "sound.h" #include "functions.h" #include "effects.h" diff --git a/src/item/itemRocsCape.c b/src/item/itemRocsCape.c index 1e649198..cad38c43 100644 --- a/src/item/itemRocsCape.c +++ b/src/item/itemRocsCape.c @@ -1,5 +1,5 @@ #include "item.h" -#include "audio.h" +#include "sound.h" #include "functions.h" void sub_08076758(ItemBehavior*, u32); diff --git a/src/item/itemSword.c b/src/item/itemSword.c index fda041fb..773403fa 100644 --- a/src/item/itemSword.c +++ b/src/item/itemSword.c @@ -1,6 +1,6 @@ #include "item.h" #include "functions.h" -#include "audio.h" +#include "sound.h" #include "object.h" extern void (*const gUnk_0811BD44[])(ItemBehavior*, u32); diff --git a/src/main.c b/src/main.c index 6052ad10..9cf1eafb 100644 --- a/src/main.c +++ b/src/main.c @@ -1,10 +1,10 @@ -#include "audio.h" +#include "sound.h" #include "functions.h" #include "main.h" #include "screen.h" #include "utils.h" #include "save.h" -#include "textbox.h" +#include "message.h" #include "interrupts.h" extern u32 gRand; diff --git a/src/manager/manager10.c b/src/manager/manager10.c index 7b8460e0..adfbf44c 100644 --- a/src/manager/manager10.c +++ b/src/manager/manager10.c @@ -3,7 +3,7 @@ #include "manager.h" #include "room.h" #include "area.h" -#include "audio.h" +#include "sound.h" #include "screen.h" #include "utils.h" #include "fileScreen.h" diff --git a/src/manager/manager15.c b/src/manager/manager15.c index 8dc10a8f..c23c24fd 100644 --- a/src/manager/manager15.c +++ b/src/manager/manager15.c @@ -1,5 +1,5 @@ #include "global.h" -#include "audio.h" +#include "sound.h" #include "flags.h" #include "screen.h" #include "manager.h" diff --git a/src/manager/manager23.c b/src/manager/manager23.c index 494018a4..4fd43d8a 100644 --- a/src/manager/manager23.c +++ b/src/manager/manager23.c @@ -4,7 +4,7 @@ #include "functions.h" #include "flags.h" #include "object.h" -#include "overworld.h" +#include "game.h" extern void (*const gUnk_08108CCC[])(Manager*); diff --git a/src/manager/manager24.c b/src/manager/manager24.c index e1a9ecee..1f200d47 100644 --- a/src/manager/manager24.c +++ b/src/manager/manager24.c @@ -1,8 +1,8 @@ #include "entity.h" #include "functions.h" #include "flags.h" -#include "audio.h" -#include "overworld.h" +#include "sound.h" +#include "game.h" #include "object.h" extern void (*const gUnk_08108CDC[])(Manager24*); diff --git a/src/manager/manager27.c b/src/manager/manager27.c index 1addc549..a8e66939 100644 --- a/src/manager/manager27.c +++ b/src/manager/manager27.c @@ -1,5 +1,5 @@ #include "global.h" -#include "audio.h" +#include "sound.h" #include "entity.h" #include "flags.h" #include "functions.h" diff --git a/src/manager/manager2E.c b/src/manager/manager2E.c index 7dbb3aa5..1bfc410b 100644 --- a/src/manager/manager2E.c +++ b/src/manager/manager2E.c @@ -3,7 +3,7 @@ #include "manager.h" #include "flags.h" #include "functions.h" -#include "audio.h" +#include "sound.h" typedef struct { Manager manager; diff --git a/src/manager/manager3.c b/src/manager/manager3.c index b4554896..b31a3f1c 100644 --- a/src/manager/manager3.c +++ b/src/manager/manager3.c @@ -5,7 +5,7 @@ #include "area.h" #include "room.h" #include "player.h" -#include "audio.h" +#include "sound.h" #include "object.h" // Facilitates the usage of minish portals. diff --git a/src/manager/manager30.c b/src/manager/manager30.c index 307884ea..ec5f9a52 100644 --- a/src/manager/manager30.c +++ b/src/manager/manager30.c @@ -1,6 +1,6 @@ #include "global.h" #include "asm.h" -#include "audio.h" +#include "sound.h" #include "manager.h" #include "flags.h" #include "functions.h" diff --git a/src/manager/manager32.c b/src/manager/manager32.c index 4aec05ba..1e6580d8 100644 --- a/src/manager/manager32.c +++ b/src/manager/manager32.c @@ -4,7 +4,7 @@ #include "functions.h" #include "area.h" #include "utils.h" -#include "overworld.h" +#include "game.h" typedef struct { Manager manager; diff --git a/src/manager/manager33.c b/src/manager/manager33.c index b0c7fa29..63f3c533 100644 --- a/src/manager/manager33.c +++ b/src/manager/manager33.c @@ -1,7 +1,7 @@ #include "manager.h" #include "room.h" #include "player.h" -#include "audio.h" +#include "sound.h" #include "object.h" void Manager33_Main(Manager* this) { diff --git a/src/manager/manager34.c b/src/manager/manager34.c index a3f83418..e811aaea 100644 --- a/src/manager/manager34.c +++ b/src/manager/manager34.c @@ -1,7 +1,7 @@ #include "manager.h" #include "structures.h" #include "functions.h" -#include "audio.h" +#include "sound.h" typedef struct { Manager manager; diff --git a/src/manager/manager36.c b/src/manager/manager36.c index a0ab4a62..ca9c5c24 100644 --- a/src/manager/manager36.c +++ b/src/manager/manager36.c @@ -1,5 +1,5 @@ #include "manager.h" -#include "audio.h" +#include "sound.h" #include "script.h" typedef struct { diff --git a/src/manager/manager37.c b/src/manager/manager37.c index 0258dee6..8140ac22 100644 --- a/src/manager/manager37.c +++ b/src/manager/manager37.c @@ -2,8 +2,8 @@ #include "structures.h" #include "functions.h" #include "flags.h" -#include "textbox.h" -#include "audio.h" +#include "message.h" +#include "sound.h" #include "save.h" #include "object.h" #include "area.h" diff --git a/src/manager/manager39.c b/src/manager/manager39.c index c3795422..bf69d08a 100644 --- a/src/manager/manager39.c +++ b/src/manager/manager39.c @@ -2,9 +2,9 @@ #include "manager.h" #include "screen.h" #include "area.h" -#include "textbox.h" +#include "message.h" #include "utils.h" -#include "overworld.h" +#include "game.h" #include "functions.h" typedef struct { diff --git a/src/manager/manager5.c b/src/manager/manager5.c index bc9293b7..59473ab7 100644 --- a/src/manager/manager5.c +++ b/src/manager/manager5.c @@ -1,5 +1,5 @@ #include "global.h" -#include "audio.h" +#include "sound.h" #include "manager.h" #include "flags.h" #include "functions.h" diff --git a/src/manager/managerB.c b/src/manager/managerB.c index 4f9cbdb6..9bf28b87 100644 --- a/src/manager/managerB.c +++ b/src/manager/managerB.c @@ -4,7 +4,7 @@ #include "room.h" #include "area.h" #include "utils.h" -#include "audio.h" +#include "sound.h" /* * Manager B is used to create fights: diff --git a/src/manager/managerC.c b/src/manager/managerC.c index 1dae3225..8f467f8e 100644 --- a/src/manager/managerC.c +++ b/src/manager/managerC.c @@ -1,5 +1,5 @@ #include "global.h" -#include "audio.h" +#include "sound.h" #include "manager.h" #include "flags.h" #include "structures.h" diff --git a/src/manager/managerE.c b/src/manager/managerE.c index b1651333..e11c664a 100644 --- a/src/manager/managerE.c +++ b/src/manager/managerE.c @@ -2,7 +2,7 @@ #include "manager.h" #include "flags.h" #include "room.h" -#include "audio.h" +#include "sound.h" #include "functions.h" void ManagerE_Main(ManagerE* this) { diff --git a/src/manager/managerF.c b/src/manager/managerF.c index 27c4e877..15fa53fa 100644 --- a/src/manager/managerF.c +++ b/src/manager/managerF.c @@ -1,12 +1,12 @@ #include "global.h" #include "manager.h" #include "flags.h" -#include "audio.h" +#include "sound.h" #include "room.h" #include "player.h" #include "functions.h" #include "area.h" -#include "textbox.h" +#include "message.h" #include "utils.h" #include "tiles.h" #include "object.h" diff --git a/src/textbox.c b/src/message.c similarity index 99% rename from src/textbox.c rename to src/message.c index f09ed255..3560df71 100644 --- a/src/textbox.c +++ b/src/message.c @@ -1,10 +1,10 @@ #include "global.h" -#include "audio.h" +#include "sound.h" #include "asm.h" #include "room.h" #include "utils.h" #include "functions.h" -#include "textbox.h" +#include "message.h" #include "save.h" #define MESSAGE_ADVANCE_KEYS (A_BUTTON | B_BUTTON | DPAD_ANY | R_BUTTON) diff --git a/src/npc/beedle.c b/src/npc/beedle.c index 54eedff3..703773ff 100644 --- a/src/npc/beedle.c +++ b/src/npc/beedle.c @@ -1,10 +1,10 @@ #include "global.h" #include "entity.h" -#include "textbox.h" +#include "message.h" #include "room.h" #include "script.h" #include "npc.h" -#include "overworld.h" +#include "game.h" typedef struct { u32 unk_00; diff --git a/src/npc/bladeBrothers.c b/src/npc/bladeBrothers.c index 09eec8d5..d0620938 100644 --- a/src/npc/bladeBrothers.c +++ b/src/npc/bladeBrothers.c @@ -3,7 +3,7 @@ #include "flags.h" #include "player.h" #include "room.h" -#include "textbox.h" +#include "message.h" #include "save.h" #include "script.h" #include "npc.h" diff --git a/src/npc/brocco.c b/src/npc/brocco.c index 22c3dedb..b960237c 100644 --- a/src/npc/brocco.c +++ b/src/npc/brocco.c @@ -1,5 +1,5 @@ #include "entity.h" -#include "textbox.h" +#include "message.h" #include "save.h" #include "npc.h" diff --git a/src/npc/carlov.c b/src/npc/carlov.c index 25aa49ca..6fc9ad81 100644 --- a/src/npc/carlov.c +++ b/src/npc/carlov.c @@ -1,4 +1,4 @@ -#include "audio.h" +#include "sound.h" #include "entity.h" #include "room.h" #include "npc.h" diff --git a/src/npc/castleMaid.c b/src/npc/castleMaid.c index 75533301..cfd0dd9e 100644 --- a/src/npc/castleMaid.c +++ b/src/npc/castleMaid.c @@ -2,7 +2,7 @@ #include "script.h" #include "save.h" #include "flags.h" -#include "textbox.h" +#include "message.h" #include "npc.h" #include "manager.h" diff --git a/src/npc/castorWildsStatue.c b/src/npc/castorWildsStatue.c index b621b86f..c0637c96 100644 --- a/src/npc/castorWildsStatue.c +++ b/src/npc/castorWildsStatue.c @@ -1,4 +1,4 @@ -#include "audio.h" +#include "sound.h" #include "entity.h" #include "script.h" #include "functions.h" diff --git a/src/npc/cat.c b/src/npc/cat.c index af53d0c3..09ec72d2 100644 --- a/src/npc/cat.c +++ b/src/npc/cat.c @@ -2,7 +2,7 @@ #include "entity.h" #include "functions.h" #include "save.h" -#include "textbox.h" +#include "message.h" #include "npc.h" extern void sub_08067C44(); diff --git a/src/npc/cow.c b/src/npc/cow.c index 0437072f..5f0bcc0a 100644 --- a/src/npc/cow.c +++ b/src/npc/cow.c @@ -1,5 +1,5 @@ #include "global.h" -#include "audio.h" +#include "sound.h" #include "entity.h" #include "player.h" #include "npc.h" diff --git a/src/npc/dampe.c b/src/npc/dampe.c index d1009033..31eb8c7b 100644 --- a/src/npc/dampe.c +++ b/src/npc/dampe.c @@ -3,7 +3,7 @@ #include "player.h" #include "room.h" #include "flags.h" -#include "textbox.h" +#include "message.h" #include "npc.h" extern u16 gUnk_08113344[]; diff --git a/src/npc/epona.c b/src/npc/epona.c index 9a43655b..b4840bbe 100644 --- a/src/npc/epona.c +++ b/src/npc/epona.c @@ -1,7 +1,7 @@ #include "global.h" -#include "audio.h" +#include "sound.h" #include "entity.h" -#include "textbox.h" +#include "message.h" #include "npc.h" #include "functions.h" diff --git a/src/npc/ghostBrothers.c b/src/npc/ghostBrothers.c index 96130800..192509ff 100644 --- a/src/npc/ghostBrothers.c +++ b/src/npc/ghostBrothers.c @@ -2,7 +2,7 @@ #include "functions.h" #include "save.h" #include "screen.h" -#include "textbox.h" +#include "message.h" #include "npc.h" extern void (*const gUnk_0811017C[])(Entity*); diff --git a/src/npc/goron.c b/src/npc/goron.c index 144cc808..22a217ca 100644 --- a/src/npc/goron.c +++ b/src/npc/goron.c @@ -1,7 +1,7 @@ #include "global.h" #include "entity.h" #include "functions.h" -#include "textbox.h" +#include "message.h" #include "effects.h" #include "npc.h" diff --git a/src/npc/goronMerchant.c b/src/npc/goronMerchant.c index b00f3898..503717a6 100644 --- a/src/npc/goronMerchant.c +++ b/src/npc/goronMerchant.c @@ -1,7 +1,7 @@ #include "global.h" #include "entity.h" #include "functions.h" -#include "textbox.h" +#include "message.h" #include "flags.h" #include "save.h" #include "npc.h" diff --git a/src/npc/guard.c b/src/npc/guard.c index c456d95e..50f559c7 100644 --- a/src/npc/guard.c +++ b/src/npc/guard.c @@ -2,7 +2,7 @@ #include "entity.h" #include "player.h" #include "flags.h" -#include "textbox.h" +#include "message.h" #include "room.h" #include "script.h" #include "functions.h" diff --git a/src/npc/kid.c b/src/npc/kid.c index 1655b279..c5b5872a 100644 --- a/src/npc/kid.c +++ b/src/npc/kid.c @@ -1,5 +1,5 @@ #include "functions.h" -#include "textbox.h" +#include "message.h" #include "npc.h" extern void (*const gUnk_0810BE0C[])(Entity*); diff --git a/src/npc/librarians.c b/src/npc/librarians.c index 9b134e7a..95d1fd2f 100644 --- a/src/npc/librarians.c +++ b/src/npc/librarians.c @@ -2,8 +2,8 @@ #include "script.h" #include "functions.h" #include "flags.h" -#include "textbox.h" -#include "audio.h" +#include "message.h" +#include "sound.h" extern u16 gUnk_08113078[]; diff --git a/src/npc/mailbox.c b/src/npc/mailbox.c index 89901625..9dc5df22 100644 --- a/src/npc/mailbox.c +++ b/src/npc/mailbox.c @@ -1,6 +1,6 @@ #include "global.h" #include "entity.h" -#include "textbox.h" +#include "message.h" #include "effects.h" #include "npc.h" diff --git a/src/npc/marcy.c b/src/npc/marcy.c index ae888d2e..c187fd76 100644 --- a/src/npc/marcy.c +++ b/src/npc/marcy.c @@ -1,7 +1,7 @@ #include "entity.h" #include "functions.h" #include "flags.h" -#include "textbox.h" +#include "message.h" extern u16 gUnk_0810C34C[]; diff --git a/src/npc/minishEzlo.c b/src/npc/minishEzlo.c index 08e255bb..3ae0b056 100644 --- a/src/npc/minishEzlo.c +++ b/src/npc/minishEzlo.c @@ -1,6 +1,6 @@ #include "entity.h" #include "functions.h" -#include "audio.h" +#include "sound.h" extern SpriteLoadData gUnk_0810C48C; diff --git a/src/npc/ministerPotho.c b/src/npc/ministerPotho.c index eb38d37f..70e012eb 100644 --- a/src/npc/ministerPotho.c +++ b/src/npc/ministerPotho.c @@ -1,6 +1,6 @@ #include "entity.h" #include "flags.h" -#include "textbox.h" +#include "message.h" #include "npc.h" extern void (*const gUnk_08110644[])(Entity*); diff --git a/src/npc/mountainMinish.c b/src/npc/mountainMinish.c index 6616a452..ed76f1e1 100644 --- a/src/npc/mountainMinish.c +++ b/src/npc/mountainMinish.c @@ -1,7 +1,7 @@ #include "entity.h" #include "script.h" #include "functions.h" -#include "textbox.h" +#include "message.h" #include "flags.h" #include "npc.h" diff --git a/src/npc/mutoh.c b/src/npc/mutoh.c index 6106baf2..7d0751c7 100644 --- a/src/npc/mutoh.c +++ b/src/npc/mutoh.c @@ -2,7 +2,7 @@ #include "entity.h" #include "player.h" #include "flags.h" -#include "textbox.h" +#include "message.h" #include "npc.h" extern SpriteLoadData gUnk_08110C00; diff --git a/src/npc/npc23.c b/src/npc/npc23.c index 3fc78f64..df0786e4 100644 --- a/src/npc/npc23.c +++ b/src/npc/npc23.c @@ -2,7 +2,7 @@ #include "player.h" #include "structures.h" #include "functions.h" -#include "textbox.h" +#include "message.h" #include "npc.h" extern void (*const gUnk_081104C8[])(Entity*); diff --git a/src/npc/npc4E.c b/src/npc/npc4E.c index ca9f114b..23afefed 100644 --- a/src/npc/npc4E.c +++ b/src/npc/npc4E.c @@ -1,7 +1,7 @@ #include "global.h" #include "entity.h" #include "functions.h" -#include "audio.h" +#include "sound.h" #include "save.h" #include "flags.h" #include "object.h" diff --git a/src/npc/npc5.c b/src/npc/npc5.c index 350e1630..05d2c7e0 100644 --- a/src/npc/npc5.c +++ b/src/npc/npc5.c @@ -1,5 +1,5 @@ #include "functions.h" -#include "textbox.h" +#include "message.h" #include "npc.h" extern void (*const gUnk_0810AC1C[])(Entity*); diff --git a/src/npc/npc9.c b/src/npc/npc9.c index e4f879f9..df8cc07e 100644 --- a/src/npc/npc9.c +++ b/src/npc/npc9.c @@ -1,6 +1,6 @@ #include "global.h" #include "entity.h" -#include "textbox.h" +#include "message.h" #include "npc.h" extern void (*const gUnk_0810C290[])(Entity*); diff --git a/src/npc/picolyteBottle.c b/src/npc/picolyteBottle.c index fa39f1b9..962ca337 100644 --- a/src/npc/picolyteBottle.c +++ b/src/npc/picolyteBottle.c @@ -2,7 +2,7 @@ #include "script.h" #include "structures.h" #include "functions.h" -#include "textbox.h" +#include "message.h" #include "object.h" extern ScreenTransitionData gUnk_0813AD4C; diff --git a/src/npc/pina.c b/src/npc/pina.c index 179ee9d5..a36763ae 100644 --- a/src/npc/pina.c +++ b/src/npc/pina.c @@ -1,6 +1,6 @@ #include "entity.h" #include "functions.h" -#include "textbox.h" +#include "message.h" #include "save.h" #include "npc.h" diff --git a/src/npc/postman.c b/src/npc/postman.c index 79a12f3a..f72ec6d3 100644 --- a/src/npc/postman.c +++ b/src/npc/postman.c @@ -1,5 +1,5 @@ #include "global.h" -#include "audio.h" +#include "sound.h" #include "entity.h" #include "functions.h" #include "npc.h" diff --git a/src/npc/simon.c b/src/npc/simon.c index 3fffc8cc..c5e40ce5 100644 --- a/src/npc/simon.c +++ b/src/npc/simon.c @@ -1,5 +1,5 @@ #include "global.h" -#include "audio.h" +#include "sound.h" #include "entity.h" #include "room.h" #include "flags.h" diff --git a/src/npc/stamp.c b/src/npc/stamp.c index 193ae976..645fe1cc 100644 --- a/src/npc/stamp.c +++ b/src/npc/stamp.c @@ -1,6 +1,6 @@ #include "global.h" #include "entity.h" -#include "textbox.h" +#include "message.h" #include "functions.h" #include "effects.h" #include "npc.h" diff --git a/src/npc/stockwell.c b/src/npc/stockwell.c index e6beed01..40ad8706 100644 --- a/src/npc/stockwell.c +++ b/src/npc/stockwell.c @@ -1,7 +1,7 @@ #include "entity.h" #include "script.h" #include "room.h" -#include "textbox.h" +#include "message.h" #include "functions.h" #include "npc.h" diff --git a/src/npc/vaati.c b/src/npc/vaati.c index a550c1a8..9db43d90 100644 --- a/src/npc/vaati.c +++ b/src/npc/vaati.c @@ -1,7 +1,7 @@ #include "global.h" #include "entity.h" #include "script.h" -#include "audio.h" +#include "sound.h" #include "functions.h" extern void sub_08095CB0(Entity*); diff --git a/src/npc/windTribespeople.c b/src/npc/windTribespeople.c index 76b73c07..ff20d96d 100644 --- a/src/npc/windTribespeople.c +++ b/src/npc/windTribespeople.c @@ -1,5 +1,5 @@ #include "global.h" -#include "audio.h" +#include "sound.h" #include "entity.h" #include "npc.h" diff --git a/src/npc/zelda.c b/src/npc/zelda.c index 296e27e0..b66b879a 100644 --- a/src/npc/zelda.c +++ b/src/npc/zelda.c @@ -1,5 +1,5 @@ #include "global.h" -#include "audio.h" +#include "sound.h" #include "entity.h" #include "functions.h" #include "flags.h" diff --git a/src/object/archway.c b/src/object/archway.c index a8f659dc..e05095d5 100644 --- a/src/object/archway.c +++ b/src/object/archway.c @@ -1,5 +1,5 @@ #include "entity.h" -#include "overworld.h" +#include "game.h" void Archway(Entity* this) { if (this->action == 0) { diff --git a/src/object/book.c b/src/object/book.c index 9f3a5396..2ad7a40b 100644 --- a/src/object/book.c +++ b/src/object/book.c @@ -1,6 +1,6 @@ #include "object.h" #include "functions.h" -#include "textbox.h" +#include "message.h" extern void (*const BookActionFuncs[])(Entity*); extern s8 const gUnk_08123D94[]; diff --git a/src/object/heartContainer.c b/src/object/heartContainer.c index a8868df2..433fb87e 100644 --- a/src/object/heartContainer.c +++ b/src/object/heartContainer.c @@ -1,4 +1,4 @@ -#include "audio.h" +#include "sound.h" #include "entity.h" #include "flags.h" #include "functions.h" diff --git a/src/object/houseDoorExterior.c b/src/object/houseDoorExterior.c index 137b19a5..77736989 100644 --- a/src/object/houseDoorExterior.c +++ b/src/object/houseDoorExterior.c @@ -3,7 +3,7 @@ #include "flags.h" #include "room.h" #include "script.h" -#include "audio.h" +#include "sound.h" #include "object.h" #include "functions.h" #include "npc.h" diff --git a/src/object/itemOnGround.c b/src/object/itemOnGround.c index a7fa6987..d0874cba 100644 --- a/src/object/itemOnGround.c +++ b/src/object/itemOnGround.c @@ -1,5 +1,5 @@ #include "global.h" -#include "audio.h" +#include "sound.h" #include "entity.h" #include "flags.h" #include "player.h" diff --git a/src/object/jailBars.c b/src/object/jailBars.c index da5844e5..84b44b61 100644 --- a/src/object/jailBars.c +++ b/src/object/jailBars.c @@ -2,7 +2,7 @@ #include "entity.h" #include "flags.h" #include "room.h" -#include "audio.h" +#include "sound.h" extern void sub_080A0960(Entity*, u32); extern void sub_0801AF18(u8*, u32, u32); diff --git a/src/object/lightableSwitch.c b/src/object/lightableSwitch.c index 14364188..639ffa17 100644 --- a/src/object/lightableSwitch.c +++ b/src/object/lightableSwitch.c @@ -1,6 +1,6 @@ #include "global.h" #include "asm.h" -#include "audio.h" +#include "sound.h" #include "entity.h" #include "room.h" #include "flags.h" diff --git a/src/object/lockedDoor.c b/src/object/lockedDoor.c index b7fc357a..6f23a9d8 100644 --- a/src/object/lockedDoor.c +++ b/src/object/lockedDoor.c @@ -2,10 +2,10 @@ #include "asm.h" #include "entity.h" #include "flags.h" -#include "audio.h" +#include "sound.h" #include "functions.h" #include "effects.h" -#include "overworld.h" +#include "game.h" void sub_08083338(Entity*); void sub_080834B4(Entity*); diff --git a/src/object/metalDoor.c b/src/object/metalDoor.c index b8506bd8..ed89d276 100644 --- a/src/object/metalDoor.c +++ b/src/object/metalDoor.c @@ -3,7 +3,7 @@ #include "entity.h" #include "room.h" #include "flags.h" -#include "audio.h" +#include "sound.h" #include "functions.h" #include "effects.h" diff --git a/src/object/minishSizedArchway.c b/src/object/minishSizedArchway.c index ad109449..d087c8dc 100644 --- a/src/object/minishSizedArchway.c +++ b/src/object/minishSizedArchway.c @@ -1,5 +1,5 @@ #include "entity.h" -#include "overworld.h" +#include "game.h" void MinishSizedArchway(Entity* this) { if (this->action == 0) { diff --git a/src/object/minishSizedEntrance.c b/src/object/minishSizedEntrance.c index 5b891dd0..36d8e27a 100644 --- a/src/object/minishSizedEntrance.c +++ b/src/object/minishSizedEntrance.c @@ -1,5 +1,5 @@ #include "object.h" -#include "overworld.h" +#include "game.h" #include "functions.h" extern void (*const gUnk_08122254[])(Entity*); diff --git a/src/object/object2A.c b/src/object/object2A.c index 9e36b439..5ef7ba3e 100644 --- a/src/object/object2A.c +++ b/src/object/object2A.c @@ -1,5 +1,5 @@ #include "global.h" -#include "audio.h" +#include "sound.h" #include "entity.h" #include "functions.h" #include "flags.h" diff --git a/src/object/object6A.c b/src/object/object6A.c index 456c28f2..13b93cce 100644 --- a/src/object/object6A.c +++ b/src/object/object6A.c @@ -2,7 +2,7 @@ #include "object.h" #include "area.h" #include "script.h" -#include "textbox.h" +#include "message.h" #include "functions.h" #include "screen.h" diff --git a/src/object/objectA.c b/src/object/objectA.c index 8578c1be..c302382e 100644 --- a/src/object/objectA.c +++ b/src/object/objectA.c @@ -4,7 +4,7 @@ #include "flags.h" #include "object.h" #include "functions.h" -#include "overworld.h" +#include "game.h" extern Hitbox gHitbox_2; diff --git a/src/object/octorokBossObject.c b/src/object/octorokBossObject.c index 0e1caf10..9a50f902 100644 --- a/src/object/octorokBossObject.c +++ b/src/object/octorokBossObject.c @@ -1,6 +1,6 @@ #include "functions.h" #include "object.h" -#include "overworld.h" +#include "game.h" extern void sub_0807B9B8(s32, s32, s32); diff --git a/src/object/pot.c b/src/object/pot.c index fae971d8..bf94a8be 100644 --- a/src/object/pot.c +++ b/src/object/pot.c @@ -1,5 +1,5 @@ #include "global.h" -#include "audio.h" +#include "sound.h" #include "entity.h" #include "flags.h" #include "player.h" diff --git a/src/object/railtrack.c b/src/object/railtrack.c index 3344feaf..d92a9546 100644 --- a/src/object/railtrack.c +++ b/src/object/railtrack.c @@ -1,6 +1,6 @@ #include "global.h" #include "asm.h" -#include "audio.h" +#include "sound.h" #include "entity.h" #include "room.h" #include "flags.h" diff --git a/src/object/swordsmanNewsletter.c b/src/object/swordsmanNewsletter.c index 1cca2ba0..d71fd1f8 100644 --- a/src/object/swordsmanNewsletter.c +++ b/src/object/swordsmanNewsletter.c @@ -1,6 +1,6 @@ #include "global.h" #include "entity.h" -#include "textbox.h" +#include "message.h" extern void sub_080787B4(Entity*); diff --git a/src/object/thoughtBubble.c b/src/object/thoughtBubble.c index e90cfbd7..57ba5cae 100644 --- a/src/object/thoughtBubble.c +++ b/src/object/thoughtBubble.c @@ -1,6 +1,6 @@ #include "global.h" #include "entity.h" -#include "audio.h" +#include "sound.h" extern void (*const ThoughtBubble_Behaviors[])(Entity*); diff --git a/src/object/treeHidingPortal.c b/src/object/treeHidingPortal.c index de23744d..d88f1c8e 100644 --- a/src/object/treeHidingPortal.c +++ b/src/object/treeHidingPortal.c @@ -1,5 +1,5 @@ #include "global.h" -#include "audio.h" +#include "sound.h" #include "entity.h" #include "flags.h" #include "player.h" diff --git a/src/object/warpPoint.c b/src/object/warpPoint.c index 893ddddd..bfa09ca0 100644 --- a/src/object/warpPoint.c +++ b/src/object/warpPoint.c @@ -1,6 +1,6 @@ #include "global.h" #include "object.h" -#include "overworld.h" +#include "game.h" #include "functions.h" extern Hitbox gHitbox_1; diff --git a/src/object/windcrest.c b/src/object/windcrest.c index edbe2e75..15828253 100644 --- a/src/object/windcrest.c +++ b/src/object/windcrest.c @@ -1,5 +1,5 @@ #include "global.h" -#include "audio.h" +#include "sound.h" #include "entity.h" #include "save.h" #include "script.h" diff --git a/src/player.c b/src/player.c index 12c3ac59..3a12ef17 100644 --- a/src/player.c +++ b/src/player.c @@ -1,9 +1,9 @@ #include "global.h" #include "asm.h" -#include "audio.h" +#include "sound.h" #include "entity.h" #include "player.h" -#include "textbox.h" +#include "message.h" #include "utils.h" #include "area.h" #include "item.h" @@ -11,7 +11,7 @@ #include "object.h" #include "functions.h" #include "hitbox.h" -#include "overworld.h" +#include "game.h" #include "screen.h" #include "main.h" diff --git a/src/playerItem/playerItem11.c b/src/playerItem/playerItem11.c index 242dc616..d8f3a3a7 100644 --- a/src/playerItem/playerItem11.c +++ b/src/playerItem/playerItem11.c @@ -2,7 +2,7 @@ #include "entity.h" #include "player.h" #include "functions.h" -#include "audio.h" +#include "sound.h" extern void sub_08078CD0(Entity*); extern void sub_08018FA0(Entity*); diff --git a/src/playerItem/playerItem12.c b/src/playerItem/playerItem12.c index 90eb82c2..f2fc617a 100644 --- a/src/playerItem/playerItem12.c +++ b/src/playerItem/playerItem12.c @@ -1,7 +1,7 @@ #include "asm.h" #include "entity.h" #include "functions.h" -#include "audio.h" +#include "sound.h" extern void (*const gUnk_0811B98C[])(Entity*); diff --git a/src/playerItem/playerItem14.c b/src/playerItem/playerItem14.c index f7e04fb3..e48fd10b 100644 --- a/src/playerItem/playerItem14.c +++ b/src/playerItem/playerItem14.c @@ -1,5 +1,5 @@ #include "entity.h" -#include "audio.h" +#include "sound.h" #include "functions.h" #include "effects.h" diff --git a/src/playerItem/playerItem15.c b/src/playerItem/playerItem15.c index 375e480f..16d0e35c 100644 --- a/src/playerItem/playerItem15.c +++ b/src/playerItem/playerItem15.c @@ -1,5 +1,5 @@ #include "entity.h" -#include "audio.h" +#include "sound.h" #include "coord.h" #include "functions.h" diff --git a/src/playerItem/playerItem3.c b/src/playerItem/playerItem3.c index 4de73cc2..beaf69a0 100644 --- a/src/playerItem/playerItem3.c +++ b/src/playerItem/playerItem3.c @@ -1,5 +1,5 @@ #include "entity.h" -#include "audio.h" +#include "sound.h" #include "functions.h" extern void (*const gUnk_080B77FC[])(Entity*); diff --git a/src/playerItem/playerItemPacciCane.c b/src/playerItem/playerItemPacciCane.c index 0b26c6fd..0e15c369 100644 --- a/src/playerItem/playerItemPacciCane.c +++ b/src/playerItem/playerItemPacciCane.c @@ -1,5 +1,5 @@ #include "entity.h" -#include "audio.h" +#include "sound.h" #include "functions.h" extern void (*const gUnk_0811B9D8[])(Entity*); diff --git a/src/playerItem/playerItemSwordBeam.c b/src/playerItem/playerItemSwordBeam.c index 24099003..0d72189d 100644 --- a/src/playerItem/playerItemSwordBeam.c +++ b/src/playerItem/playerItemSwordBeam.c @@ -2,7 +2,7 @@ #include "player.h" #include "coord.h" #include "functions.h" -#include "audio.h" +#include "sound.h" #include "effects.h" extern void (*const gUnk_080B43F4[])(Entity*); diff --git a/src/playerItemUtils.c b/src/playerItemUtils.c index 22772e62..be571896 100644 --- a/src/playerItemUtils.c +++ b/src/playerItemUtils.c @@ -2,9 +2,9 @@ #include "functions.h" #include "save.h" #include "utils.h" -#include "audio.h" +#include "sound.h" #include "flags.h" -#include "textbox.h" +#include "message.h" #include "object.h" #include "player.h" diff --git a/src/projectile/dirtBallProjectile.c b/src/projectile/dirtBallProjectile.c index 3723a0c7..a4a0d8e1 100644 --- a/src/projectile/dirtBallProjectile.c +++ b/src/projectile/dirtBallProjectile.c @@ -1,4 +1,4 @@ -#include "audio.h" +#include "sound.h" #include "entity.h" #include "enemy.h" #include "player.h" diff --git a/src/projectile/gyorgTail.c b/src/projectile/gyorgTail.c index 556087f7..c36bc6ad 100644 --- a/src/projectile/gyorgTail.c +++ b/src/projectile/gyorgTail.c @@ -1,7 +1,7 @@ #include "entity.h" #include "asm.h" #include "coord.h" -#include "audio.h" +#include "sound.h" #include "functions.h" extern u8 gEntCount; diff --git a/src/projectile/mandiblesProjectile.c b/src/projectile/mandiblesProjectile.c index f01fc3b2..e5b27454 100644 --- a/src/projectile/mandiblesProjectile.c +++ b/src/projectile/mandiblesProjectile.c @@ -2,7 +2,7 @@ #include "enemy.h" #include "coord.h" #include "functions.h" -#include "overworld.h" +#include "game.h" extern Entity* sub_08049DF4(u32); extern u32 sub_08049F1C(Entity*, Entity*, u32); diff --git a/src/projectile/mazaalEnergyBeam.c b/src/projectile/mazaalEnergyBeam.c index 8d617ba3..6e284ccf 100644 --- a/src/projectile/mazaalEnergyBeam.c +++ b/src/projectile/mazaalEnergyBeam.c @@ -1,5 +1,5 @@ #include "entity.h" -#include "audio.h" +#include "sound.h" #include "coord.h" extern void (*const MazaalEnergyBeam_Actions[])(Entity*); diff --git a/src/room.c b/src/room.c index dc8739d6..d752abfb 100644 --- a/src/room.c +++ b/src/room.c @@ -5,7 +5,7 @@ #include "functions.h" #include "utils.h" #include "object.h" -#include "overworld.h" +#include "game.h" extern void sub_0804B058(EntityData* dat); extern void sub_0801AC98(); diff --git a/src/roomInit.c b/src/roomInit.c index 9b9c8612..8c0557c2 100644 --- a/src/roomInit.c +++ b/src/roomInit.c @@ -5,7 +5,7 @@ #include "functions.h" -#include "audio.h" +#include "sound.h" #include "effects.h" #include "screen.h" #include "flags.h" @@ -13,7 +13,7 @@ #include "save.h" #include "area.h" -#include "overworld.h" +#include "game.h" #include "npc.h" diff --git a/src/save.c b/src/save.c index a5b8caea..aa401f10 100644 --- a/src/save.c +++ b/src/save.c @@ -1,10 +1,10 @@ #include "save.h" #include "gba/eeprom.h" -#include "audio.h" +#include "sound.h" #include "menu.h" #include "main.h" #include "functions.h" -#include "overworld.h" +#include "game.h" typedef struct SaveFileStatus { u16 checksum1; diff --git a/src/script.c b/src/script.c index 4e573495..b2648251 100644 --- a/src/script.c +++ b/src/script.c @@ -2,7 +2,7 @@ #include "main.h" #include "screen.h" #include "area.h" -#include "overworld.h" +#include "game.h" #include "object.h" #include "npc.h" diff --git a/src/code_0807CC3C.c b/src/scroll.c similarity index 74% rename from src/code_0807CC3C.c rename to src/scroll.c index de4f6e24..d6079438 100644 --- a/src/code_0807CC3C.c +++ b/src/scroll.c @@ -1,6 +1,5 @@ #include "global.h" -// these three functions use gRoomControls, maybe once that is understood better, these can be decompiled easier ASM_FUNC("asm/non_matching/code_0807CC3C/sub_0807D280.inc", void sub_0807D280(u32 unk_1, u32 unk_2)) ASM_FUNC("asm/non_matching/code_0807CC3C/sub_0807D46C.inc", void sub_0807D46C(u32 unk_1, u32 unk_2)) diff --git a/src/audio.c b/src/sound.c similarity index 99% rename from src/audio.c rename to src/sound.c index 998b00b4..32dc20c4 100644 --- a/src/audio.c +++ b/src/sound.c @@ -1,7 +1,7 @@ #include "global.h" #include "main.h" #include "gba/m4a.h" -#include "audio.h" +#include "sound.h" #include "utils.h" #define IS_BGM(song) ((song)-1 <= NUM_BGM - 1)