diff options
| author | theo3 <arisstephenson2@gmail.com> | 2021-12-28 13:53:53 -0800 |
|---|---|---|
| committer | theo3 <arisstephenson2@gmail.com> | 2021-12-28 13:53:53 -0800 |
| commit | 3fd900f1bc81cbaf106de17f5b8d41e26de682a8 (patch) | |
| tree | b6226159f870a5974379851e986261eb8d1ce5fc /src | |
| parent | 0f65f8fd5008d06defcfae6c9d66270ff45a8e49 (diff) | |
rename files, sort asm into subdirectories
Diffstat (limited to 'src')
127 files changed, 146 insertions, 205 deletions
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 index 612df34a..612df34a 100644 --- a/src/code_080300AC.c +++ b/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 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); @@ -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 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*); @@ -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" @@ -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 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 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) |