diff --git a/include/asm.h b/include/asm.h
index fed7a35b..b889ab88 100644
--- a/include/asm.h
+++ b/include/asm.h
@@ -11,6 +11,7 @@ extern u32 GetTileType(u32 pos, u32 layer);
 extern void SetTile(u32 index, u32 position, u32 layer);
 extern void UpdateScrollVram(void);
 extern u32 sub_080002D0(struct Entity_*);
+extern u32 sub_080002F0(u32, u32, u32);
 extern void LoadResourceAsync(const void*, u32, u32);
 extern void sub_08001242(struct Entity_*);
 extern void sub_08001290(struct Entity_*, u32);
@@ -29,5 +30,8 @@ extern u32 sub_080045B4(struct Entity_*, u32, u32);
 extern u32 sub_080045D4(u32, u32, u32, u32);
 extern u32 sub_080045DA(s32, s32);
 extern u32 sub_080086B4(u32, u32, u8*);
+extern u32 ResolveCollisionLayer(struct Entity_*);
+extern void sub_0800417E(struct Entity_*, u32);
+extern u32 sub_0800442E(struct Entity_*);
 
 #endif // ASM_H
diff --git a/include/common.h b/include/common.h
index e46df918..6b4763c4 100644
--- a/include/common.h
+++ b/include/common.h
@@ -3,6 +3,8 @@
 
 #include "global.h"
 
+struct Entity_;
+
 typedef struct {
     u16 heldKeys;
     u16 newKeys;
@@ -10,11 +12,11 @@ typedef struct {
     u8 unk6;
     u8 unk7;
 } Input;
-
 extern Input gInput;
 
 void LoadPalettes(const u8*, s32, s32);
 void LoadPaletteGroup(u32 group);
+void LoadGfxGroup(u32 group);
 void SetColor(u32 colorIndex, u32 color);
 void SetFillColor(u32 color, u32 arg1);
 
@@ -73,7 +75,12 @@ void zFree(void* ptr);
 void DispReset(bool32 refresh);
 
 u32 CheckPlayerProximity(u32, u32, u32, u32);
-
+u32 CheckKinstoneFused(u32);
 void sub_0801E1EC(u32, u32, u32);
+void sub_0801DD58(u32, u32);
+void sub_0801E1B8(u32, u32);
+void sub_0801E738(u32);
+void sub_0801DFB4(struct Entity_*, u32, u32, u32);
+u32 sub_0801E00C(void);
 
 #endif // COMMON_H
diff --git a/include/enemy.h b/include/enemy.h
index 1a8fc7f2..8e38e557 100644
--- a/include/enemy.h
+++ b/include/enemy.h
@@ -10,12 +10,21 @@
 #include "common.h"
 
 #include "entity.h"
+#include "projectile.h"
 
 extern u32 GetNextFunction(Entity*);
 extern void EnemyFunctionHandler(Entity*, EntityActionArray);
 extern void sub_08001324(Entity*);
+extern Entity* CreateDeathFx(Entity*, u32, u32);
 
 extern Entity* sub_0804A9FC(Entity*, u32);
+extern void SetChildOffset(Entity*, s32, s32, s32);
+extern Entity* CreateProjectileWithParent(Entity*, u8, u8);
+
+extern void sub_0804A7D4(Entity*);
+extern void sub_08002724(void*, u8*);
+extern void sub_080026C4(u8*, u8*, u8*, u32);
+extern void sub_080026F2(u8*, void*, u8*, u32);
 
 typedef enum {
     /*0x00*/ OCTOROK,
diff --git a/include/entity.h b/include/entity.h
index 898661f8..7d61134e 100644
--- a/include/entity.h
+++ b/include/entity.h
@@ -232,9 +232,12 @@ u32 LoadExtraSpriteData(Entity*, SpriteLoadData*);
 void SetExtraSpriteFrame(Entity*, u32, u32);
 void SetSpriteSubEntryOffsetData1(Entity*, u32, u32);
 void SetSpriteSubEntryOffsetData2(Entity*, u32, u32);
+u8* GetSpriteSubEntryOffsetDataPointer(u32, u32);
 
 u32 GetFacingDirection(Entity*, Entity*);
 
+u32 ProcessMovement(Entity*);
+
 /**
  * @brief Delete the entity currently in execution.
  */
diff --git a/include/fileselect.h b/include/fileselect.h
index d2a2f52e..bba9eed7 100644
--- a/include/fileselect.h
+++ b/include/fileselect.h
@@ -70,6 +70,7 @@ extern void sub_0805F7DC(u32, struct_02036540*);
 extern void sub_0805F300(struct_02036540*);
 extern void sub_08050A64(u32);
 extern void sub_08050AFC(u32);
+extern void sub_08050384();
 
 extern const struct_080FC844 gUnk_080FC844;
 extern const u16 gUnk_080FC85C[][3];
diff --git a/include/functions.h b/include/functions.h
index c71445d6..31ef2f13 100644
--- a/include/functions.h
+++ b/include/functions.h
@@ -12,32 +12,11 @@
 #include "script.h"
 
 // Identified - to be sorted into header files
-extern u32 CheckKinstoneFused(u32);
-extern void ForceEquipItem(u32, u32);
-extern void LoadRoomEntityList(EntityData* listPtr);
-extern void SetChildOffset(Entity*, s32, s32, s32);
-extern Entity* CreatePlayerItem(u32, u32, u32, u32);
 extern void SetDirtTile(u32);
-extern Entity* CreateDeathFx(Entity*, u32, u32);
-extern u8* GetSpriteSubEntryOffsetDataPointer(u32, u32);
 extern bool32 LoadFixedGFX(Entity*, u32);
-extern void CreateItemEntity(u32, u32, u32);
-extern u32 ProcessMovement(Entity*);
 extern void MenuFadeIn(u32, u32);
-extern void LoadPaletteGroup(u32);
 extern void TryLoadPrologueHyruleTown(void);
-extern void LoadGfxGroup(u32);
-extern Entity* CreateProjectileWithParent(Entity*, u8, u8);
-extern u32 GetSaleItemConfirmMessageID(u32);
 extern void FlushSprites(void);
-extern Entity* CreateProjectile(u32);
-extern s32 GetItemPrice();
-extern void DoExitTransition(ScreenTransitionData*);
-extern void CreateDustAt(s32, s32, u32);
-extern void PutItemOnSlot(u32 itemID);
-extern Entity* CreateSpeechBubbleQuestionMark(Entity*, s32, s32);
-extern Entity* CreateSpeechBubbleExclamationMark(Entity*, s32, s32);
-extern Entity* CreateSpeechBubbleSleep(Entity*, s32, s32);
 
 // Unidentified
 extern void sub_0805EC9C();
@@ -78,86 +57,42 @@ extern void sub_08059278(void);
 extern void sub_0804C128(u32);
 extern void sub_08058324(u32);
 extern void sub_0801AFE4(void);
-extern u32 sub_08060354(void);
-extern void sub_08057E64(void);
-extern void sub_0809F814(u32);
-extern void sub_080300E8(void);
-extern void sub_08058D34(void);
 extern void sub_0807AABC(Entity*);
 extern void sub_0805B4D0(u32);
-extern void sub_0804D0B4(void);
-extern void sub_080534AC();
 extern void sub_0807BA8C(u32, u32);
-extern void sub_0804D9B0();
-extern void sub_0807BB98(u32, u32, u32, u32);
-extern void sub_0801D000(u32);
-extern void sub_08018C58(u32);
 extern void sub_080AF284(void);
 extern void sub_080A71C4(u32, u32, u32, u32);
 extern void sub_08054564();
-extern void sub_0801DD58(u32, u32);
-extern void sub_0804ED18();
-extern void sub_080AF2E4(void);
-extern void sub_0804F578(void);
-extern void sub_08059994(void);
 extern void DrawDirect(u32, u32); // trampoline to sub_080B27F4
-extern void sub_0801E1B8(u32, u32);
-extern void sub_080A3B74(void);
-extern void sub_080A4054(void);
 extern void sub_0801C1D4(void);
 extern void DrawOAMCmd(void);
-extern void sub_080A4D34(void);
-extern u32 sub_080A4494(void);
-extern void sub_080A4528(void);
-extern void sub_080A4398(void);
-extern void sub_0801E738(u32);
-extern void sub_080A7114(u32);
 extern u32 sub_0807953C(void);
 extern void sub_080AE068(Entity*);
 extern u32 sub_0800445C(Entity*);
 extern u32 sub_0801766C(Entity*);
 extern void sub_08004168(Entity*);
-extern void sub_08056208(void);
-extern void sub_08050384();
 extern u32 sub_0806F520();
 extern void sub_0806F4E8(Entity*);
-extern void sub_0804A7D4(Entity*);
-extern void sub_08033744(Entity*);
-extern void sub_0800417E(Entity*, u32);
 extern void sub_080784C8();
 extern u32 sub_0808288C(Entity*, u32, u32, u32);
 extern void sub_0806FDA0(Entity*);
 extern bool32 LoadSwapGFX(Entity*, u16, u32);
-extern u32 ResolveCollisionLayer(Entity*);
-extern void sub_08077728();
 extern void sub_0807921C();
 extern void sub_0807ACCC(Entity*);
-extern void sub_080A2BE4(Entity*, u32);
-extern u32 sub_08097ADC(Entity*);
 extern u32 sub_08079F8C(void);
 extern void sub_080787CC(Entity*);
 extern u32 sub_080044EC(Entity*, u32);
 extern u32 sub_080002B8(Entity*);
 extern u32 sub_08049F84(Entity*, u32);
-extern void sub_0802F45C(Entity*);
 extern u32 sub_0800419C(Entity*, Entity*, u32, u32);
 extern void sub_08004542(Entity*);
-extern void sub_08077B20();
 extern u32 sub_08017850(Entity*);
 extern void sub_080809D4(void);
 extern void sub_08080CB4(Entity*);
-extern u32 sub_0800442E(Entity*);
-extern void sub_08081404(Entity*, u32);
 extern void sub_0807B7D8(u32, u32, u32);
 extern void sub_0800451C(Entity*);
-extern u32 sub_080002F0(u32, u32, u32);
 extern u32 sub_080040D8(Entity*, u8*, s32, s32);
-extern void LoadGfxGroups();
-extern void SetColor(u32, u32);
 extern u32 sub_0805F8F8(u32);
-extern void sub_08002724(void*, u8*);
-extern void sub_080026C4(u8*, u8*, u8*, u32);
-extern void sub_080026F2(u8*, void*, u8*, u32);
 extern u32 sub_0805F7A0(u32);
 extern u32* sub_0805F25C(u32);
 u32 sub_0806FCB8(Entity*, u32, u32, u32);
@@ -165,8 +100,6 @@ extern void sub_080A1D70(Entity*, u32);
 extern void sub_0806F62C(Entity*, u32, u32);
 extern void sub_080A1ED0(u32, u32, u32);
 extern u32 sub_0806F5B0(u32);
-extern void sub_0801DFB4(Entity*, u32, u32, u32);
-extern u32 sub_0801E00C(void);
 extern void sub_08078790(Entity*, u32);
 extern void sub_080788E0(Entity*);
 extern void sub_08078B48(void);
@@ -174,13 +107,9 @@ extern void sub_0807919C();
 extern void sub_0807CAA0(u32, u32);
 extern void sub_080085B0(Entity*);
 extern u32 sub_08079D48();
-extern u32 sub_08008B22();
-extern void MessageClose();
 extern u32 sub_080542AC(u32);
 extern u32 sub_08079FC4(u32);
-extern u32* sub_08008790(Entity*, u32);
 extern void sub_0805F8E4(u32 r0, WStruct* r1);
-
 extern Entity* sub_08077C94(ItemBehavior*, u32);
 extern Entity* sub_08077C0C(ItemBehavior*, u32);
 extern void sub_08077D38(ItemBehavior*, u32);
@@ -190,10 +119,8 @@ extern u32 sub_0806F948(Entity*);
 extern void sub_08077DF4(ItemBehavior*, u32);
 extern void sub_08077BB8(ItemBehavior*);
 extern bool32 sub_08077EFC(ItemBehavior*);
-
 extern void sub_08078E84(Entity*, Entity*);
 extern void sub_080042D0(Entity*, u32, u16);
-
 extern u32 sub_080002A8(u32, u32, u32);
 extern void sub_080806BC(u32, u32, u32, u32);
 
diff --git a/include/game.h b/include/game.h
index e42f5b91..81dd794b 100644
--- a/include/game.h
+++ b/include/game.h
@@ -32,13 +32,17 @@ bool32 HasDungeonSmallKey(void);
 bool32 ItemIsSword(u32 item);
 bool32 ItemIsShield(u32 item);
 u32 GetBottleContaining(u32 item);
+void PutItemOnSlot(u32 item);
+s32 GetItemPrice(u32 item);
+u32 GetSaleItemConfirmMessageID(u32 item);
+void ForceEquipItem(u32 item, u32 slot);
 
 void LoadGfxGroups(void);
 void LoadCutsceneRoom(u32 room, u32 area);
 void InitRoom(void);
 void InitParachuteRoom(void);
 
-void RegisterTransitionManager(void* mgr, void (*onEnter)(void), void (*onExit)(void));
+void RegisterTransitionManager(void* mgr, void (*onEnter)(void*), void (*onExit)(void*));
 void RoomExitCallback(void);
 
 void RestoreGameTask(u32 a1);
diff --git a/include/item.h b/include/item.h
index b47066da..c5409c29 100644
--- a/include/item.h
+++ b/include/item.h
@@ -5,6 +5,9 @@
 #include "entity.h"
 #include "player.h"
 
+void CreateItemEntity(u32, u32, u32);
+void sub_08081404(Entity*, u32);
+
 extern void ItemDebug(ItemBehavior*, u32);
 extern void ItemSword(ItemBehavior*, u32);
 extern void ItemBomb(ItemBehavior*, u32);
diff --git a/include/kinstone.h b/include/kinstone.h
index 8760673d..28b799dd 100644
--- a/include/kinstone.h
+++ b/include/kinstone.h
@@ -3,6 +3,8 @@
 
 #include "global.h"
 
+extern void sub_08018C58(u32);
+
 typedef struct {
     u8 unk[4];
     u32 unk2;
diff --git a/include/main.h b/include/main.h
index 988b4233..7b0abd05 100644
--- a/include/main.h
+++ b/include/main.h
@@ -97,5 +97,6 @@ extern void VBlankInterruptWait(void);
 extern void DisableInterruptsAndDMA(void);
 extern void EnableVBlankIntr(void);
 extern void sub_08056250(void);
+extern void sub_08056208(void);
 
 #endif
diff --git a/include/message.h b/include/message.h
index c8d3e7b9..c0164810 100644
--- a/include/message.h
+++ b/include/message.h
@@ -126,6 +126,11 @@ void MessageFromTarget(u32 index);
  */
 void MessageAtHeight(u32 index, u32 y);
 
+/**
+ * @brief Close message.
+ */
+void MessageClose(void);
+
 void DispMessageFrame(u16*, s32, s32, u32);
 
 #endif // MESSAGE_H
diff --git a/include/object.h b/include/object.h
index d4792ecf..20688709 100644
--- a/include/object.h
+++ b/include/object.h
@@ -20,9 +20,14 @@ extern void sub_080787B4(Entity*);
 extern void sub_0808C650(Entity*, u32);
 extern u32 sub_0808C67C(void);
 extern void sub_0808C688(void);
+extern void sub_080A2BE4(Entity*, u32);
 
 void CreateDust(Entity* parent);
+void CreateDustAt(s32, s32, u32);
 void CreateDustSmall(Entity* parent);
+Entity* CreateSpeechBubbleQuestionMark(Entity*, s32, s32);
+Entity* CreateSpeechBubbleExclamationMark(Entity*, s32, s32);
+Entity* CreateSpeechBubbleSleep(Entity*, s32, s32);
 
 typedef enum {
     GROUND_ITEM,
diff --git a/include/player.h b/include/player.h
index 9160123a..583d882b 100644
--- a/include/player.h
+++ b/include/player.h
@@ -288,6 +288,8 @@ void ResetPlayerAnimationAndAction(void);
 void SetPlayerActionNormal(void);
 void RespawnAsMinish(void);
 
+Entity* CreatePlayerItem(u32, u32, u32, u32);
+
 void ResolvePlayerAnimation(void);
 void RegisterPlayerHitbox(void);
 void UpdateFloorType(void);
@@ -299,6 +301,11 @@ s32 ModHealth(s32 delta);
 void ModRupees(s32 delta);
 void DeleteClones(void);
 
+void sub_08077728();
+extern void sub_08077B20();
+extern u32 sub_08008B22();
+extern u32* sub_08008790(Entity*, u32);
+
 #define COPY_FLAG_FROM_TO(base, src, dest) (base) = ((base) & ~(dest)) | (((dest) * ((base) & (src))) / src)
 
 #endif
diff --git a/include/projectile.h b/include/projectile.h
index 0ad6e7e9..4eaf6a44 100644
--- a/include/projectile.h
+++ b/include/projectile.h
@@ -1,6 +1,8 @@
 #ifndef PROJECTILE_H
 #define PROJECTILE_H
 
+extern Entity* CreateProjectile(u32);
+
 typedef enum {
     /*00*/ DARK_NUT_SWORD_SLASH,
     /*01*/ ROCK_PROJECTILE,
diff --git a/include/room.h b/include/room.h
index 074cc8d5..7886d288 100644
--- a/include/room.h
+++ b/include/room.h
@@ -160,6 +160,20 @@ typedef struct {
 static_assert(sizeof(RoomTransition) == 0xB0);
 extern RoomTransition gRoomTransition;
 
+typedef struct {
+    u16 type;
+    u8 field_0x2[4];
+    s16 playerXPos;
+    s16 playerYPos;
+    u8 field_0xa;
+    u8 area;
+    u8 room;
+    u8 playerLayer;
+    u8 field_0xe;
+    u8 playerState;
+    u16 transitionSFX;
+} ScreenTransitionData;
+
 typedef struct {
     u8 type;
     u8 _1;
@@ -188,16 +202,19 @@ typedef enum {
     TILE_ENTITY_D,
 } TileEntityType;
 
-extern void SetTileType(u32, u32, u32);
-extern void InitScreenShake(u32 time, u32 magnitude);
+void SetTileType(u32, u32, u32);
+void InitScreenShake(u32 time, u32 magnitude);
 
 void CallRoomProp5And7(void);
 void LoadRoom(void);
 void SetCurrentRoomPropertyList(u32 area, u32 room);
-extern void* GetCurrentRoomProperty(u32);
-extern void LoadRoomTileEntities();
+void* GetCurrentRoomProperty(u32);
+void LoadRoomTileEntities();
+void LoadRoomEntityList(EntityData* listPtr);
 
 void sub_0804B3C4(void*);
 void sub_0804B0B0(u32 arg0, u32 arg1);
 
+void DoExitTransition(ScreenTransitionData* data);
+
 #endif
diff --git a/include/structures.h b/include/structures.h
index c6c8f80b..95a22ffc 100644
--- a/include/structures.h
+++ b/include/structures.h
@@ -38,20 +38,6 @@ static_assert(sizeof(struct_02000010) == 0x20);
 
 extern struct_02000010 gUnk_02000010;
 
-typedef struct {
-    u16 type;
-    u8 field_0x2[4];
-    s16 playerXPos;
-    s16 playerYPos;
-    u8 field_0xa;
-    u8 area;
-    u8 room;
-    u8 playerLayer;
-    u8 field_0xe;
-    u8 playerState;
-    u16 transitionSFX;
-} ScreenTransitionData;
-
 typedef struct {
     u8 active;
     u8 field_0x1;
diff --git a/include/subtask.h b/include/subtask.h
new file mode 100644
index 00000000..185210d8
--- /dev/null
+++ b/include/subtask.h
@@ -0,0 +1,16 @@
+#ifndef SUBTASK_H
+#define SUBTASK_H
+
+#include "global.h"
+
+// todo: separate headers for each subtask?
+
+extern void sub_080A4528(void);
+extern void sub_080A4398(void);
+extern void sub_080A7114(u32);
+extern void sub_080A3B74(void);
+extern void sub_080A4054(void);
+extern void sub_080A4D34(void);
+extern u32 sub_080A4494(void);
+
+#endif // SUBTASK_H
diff --git a/src/code_08049CD4.c b/src/code_08049CD4.c
index 68f78d10..a773306d 100644
--- a/src/code_08049CD4.c
+++ b/src/code_08049CD4.c
@@ -5,7 +5,7 @@ extern u32 gRoomMemory;
 
 extern void MemFill32(u32, void*, u32);
 
-void ClearRoomMemory() {
+void ClearRoomMemory(void) {
     MemFill32(0xFFFFFFFF, &gRoomMemory, 0x40);
     gUnk_020354B0 = &gRoomMemory;
 }
diff --git a/src/code_0805436C.c b/src/code_0805436C.c
index eb4c77d2..dfbe2966 100644
--- a/src/code_0805436C.c
+++ b/src/code_0805436C.c
@@ -19,7 +19,7 @@ extern u8 gUnk_0200AF14;
 extern u32 gUnk_080015BC;
 extern u8 gUnk_080FE1C6[];
 extern u32 gUnk_02034398;
-extern void (*const gUnk_080FE2A0[])();
+extern void (*const gUnk_080FE2A0[])(void);
 
 void ForceEquipItem(u32, u8);
 extern void sub_0807CAA0(u32, u32);
diff --git a/src/debugScreen.c b/src/debugScreen.c
index de141619..9e85a178 100644
--- a/src/debugScreen.c
+++ b/src/debugScreen.c
@@ -6,10 +6,11 @@
 #include "menu.h"
 #include "screen.h"
 #include "message.h"
+#include "game.h"
 
-extern void (*const gUnk_08109A30[])();
+extern void (*const gUnk_08109A30[])(void);
 
-void DebugTask() {
+void DebugTask(void) {
     gUnk_08109A30[gMain.state]();
 }
 
@@ -90,6 +91,6 @@ void sub_0805FA98(void) {
     gScreen.bg3.updated = 1;
 }
 
-void sub_0805FBC4() {
+void sub_0805FBC4(void) {
     SetTask(TASK_TITLE);
 }
diff --git a/src/demoScreen.c b/src/demoScreen.c
index e3185859..98cbc68d 100644
--- a/src/demoScreen.c
+++ b/src/demoScreen.c
@@ -5,9 +5,10 @@
 #include "message.h"
 #include "fileselect.h"
 #include "screen.h"
+#include "game.h"
 
 extern void (*const demoFunctions[])(void);
-void sub_080A30AC();
+void sub_080A30AC(void);
 
 extern u8 gUnk_02000004;
 void sub_080A3198(u32, u32);
diff --git a/src/enemy.c b/src/enemy.c
index e9d4f51d..b0594e0f 100644
--- a/src/enemy.c
+++ b/src/enemy.c
@@ -419,11 +419,11 @@ const EnemyDefinition gEnemyDefinition_46[] = {
     { 72, 384, &gUnk_080FD258, SPRITE_BOWMOBLIN_1, { 1, 1, 1, 2 }, 8, 256, 138, 139 },
 };
 
-extern void sub_08049E18();
-extern void sub_08049E4C();
-extern void sub_08049E80();
-extern void sub_08049EB0();
-void (*const gUnk_080D3BE8[])() = {
+extern Entity* sub_08049E18(void);
+extern Entity* sub_08049E4C(void);
+extern Entity* sub_08049E80(void);
+extern Entity* sub_08049EB0(void);
+Entity* (*const gUnk_080D3BE8[])(void) = {
     sub_08049E18,
     sub_08049E4C,
     sub_08049E80,
diff --git a/src/enemy/beetle.c b/src/enemy/beetle.c
index 24e01379..bba26d7a 100644
--- a/src/enemy/beetle.c
+++ b/src/enemy/beetle.c
@@ -3,7 +3,7 @@
 
 extern u32 PlayerInRange(Entity*, u32, u32);
 
-u32 sub_08021D00();
+u32 sub_08021D00(Entity*);
 void sub_08021D44(Entity* this, u32 direction);
 
 extern void (*const gUnk_080CB590[])(Entity*);
diff --git a/src/enemy/bladeTrap.c b/src/enemy/bladeTrap.c
index ceea0b5d..eeee9ffe 100644
--- a/src/enemy/bladeTrap.c
+++ b/src/enemy/bladeTrap.c
@@ -3,7 +3,7 @@
 #include "room.h"
 #include "functions.h"
 
-extern void sub_080A2CC0();
+extern void sub_080A2CC0(Entity*, void*, void*);
 
 void BladeTrap(Entity* this) {
     if (this->action == 0) {
diff --git a/src/enemy/businessScrub.c b/src/enemy/businessScrub.c
index 1bff3860..b2b20f06 100644
--- a/src/enemy/businessScrub.c
+++ b/src/enemy/businessScrub.c
@@ -5,6 +5,7 @@
 #include "npc.h"
 #include "functions.h"
 #include "game.h"
+#include "item.h"
 
 extern Entity* sub_08049DF4(u32);
 extern bool32 sub_08056338(void);
diff --git a/src/enemy/darkNut.c b/src/enemy/darkNut.c
index ed6d602b..7e200a8a 100644
--- a/src/enemy/darkNut.c
+++ b/src/enemy/darkNut.c
@@ -6,23 +6,23 @@ typedef struct {
     u8 field_0x1;
 } PACKED stuct_080CAB14;
 
-void sub_08021218();
-void sub_08021588();
-void sub_080213D0();
-void sub_08021390();
-void sub_0802159C();
-void sub_0804AA1C();
-void sub_080213F0();
-u32 sub_080214FC();
-void sub_08021540();
-void sub_08021600();
-void sub_080213B0();
-u32 PlayerInRange();
-u32 sub_0802169C();
-void sub_0802124C();
-void sub_08021644();
-void sub_08021414();
-void sub_08021400();
+void sub_08021218(Entity*, u32, u32);
+void sub_08021588(Entity*);
+void sub_080213D0(Entity*, u32);
+void sub_08021390(Entity*);
+void sub_0802159C(Entity*);
+void sub_0804AA1C(Entity*);
+void sub_080213F0(Entity*);
+u32 sub_080214FC(Entity*);
+void sub_08021540(Entity*);
+void sub_08021600(Entity*);
+void sub_080213B0(Entity*);
+u32 PlayerInRange(Entity*, u32, u32);
+u32 sub_0802169C(Entity*, Entity*);
+void sub_0802124C(Entity*);
+void sub_08021644(Entity*);
+void sub_08021414(Entity*);
+void sub_08021400(Entity*);
 u32 sub_08021274(u32, u32);
 u32 sub_08021664(Entity*, Entity*);
 u32 sub_0804A044(Entity*, Entity*, u32);
diff --git a/src/enemy/doorMimic.c b/src/enemy/doorMimic.c
index af328474..413046c9 100644
--- a/src/enemy/doorMimic.c
+++ b/src/enemy/doorMimic.c
@@ -3,8 +3,8 @@
 #include "functions.h"
 
 extern s16 sub_080001DA(u32, u32); // ?
-extern void sub_08049CF4();
-void sub_080221C0();
+extern void sub_08049CF4(Entity*);
+void sub_080221C0(Entity*);
 
 typedef struct {
     s8 h;
diff --git a/src/enemy/enemy4D.c b/src/enemy/enemy4D.c
index 75c28eb1..3e6508ad 100644
--- a/src/enemy/enemy4D.c
+++ b/src/enemy/enemy4D.c
@@ -29,7 +29,7 @@ void sub_0803EB34(Entity* this) {
     CreateDeathFx(this, 0xff, 0x57);
 }
 
-void nullsub_21() {
+void nullsub_21(Entity* this) {
 }
 
 void sub_0803EB44(Entity* this) {
diff --git a/src/enemy/gibdo.c b/src/enemy/gibdo.c
index 0649b7a9..71dfe53f 100644
--- a/src/enemy/gibdo.c
+++ b/src/enemy/gibdo.c
@@ -2,21 +2,22 @@
 #include "enemy.h"
 #include "object.h"
 #include "functions.h"
+
 // Gibudo
-void sub_08037794();
-void sub_08037B10();
-void sub_0803797C();
-void sub_080379BC();
-void sub_08037C0C();
-u32 sub_08037810();
-void sub_080377B0();
-u32 sub_080378B0();
-u32 sub_08037914();
-u32 sub_080379EC();
-void sub_08037A58();
-void sub_08037ACC();
-void sub_08037B48();
-void sub_08037A14();
+void sub_08037794(Entity*);
+void sub_08037B10(Entity*);
+void sub_0803797C(Entity*);
+void sub_080379BC(Entity*);
+void sub_08037C0C(Entity*, Entity*);
+u32 sub_08037810(Entity*);
+void sub_080377B0(Entity*);
+u32 sub_080378B0(Entity*);
+u32 sub_08037914(Entity*);
+u32 sub_080379EC(Entity*);
+void sub_08037A58(Entity*);
+void sub_08037ACC(Entity*);
+void sub_08037B48(Entity*);
+void sub_08037A14(Entity*);
 
 extern void sub_0804A4E4(Entity*, Entity*);
 extern Entity* sub_08049DF4(u32);
@@ -75,7 +76,7 @@ NONMATCH("asm/non_matching/gibdo/sub_080374A4.inc", void sub_080374A4(Entity* th
 }
 END_NONMATCH
 
-void nullsub_162() {
+void nullsub_162(Entity* this) {
 }
 
 void sub_08037558(Entity* this) {
diff --git a/src/enemy/lakituCloud.c b/src/enemy/lakituCloud.c
index ae2f5a7d..502e4ab8 100644
--- a/src/enemy/lakituCloud.c
+++ b/src/enemy/lakituCloud.c
@@ -4,6 +4,7 @@
 #include "player.h"
 #include "functions.h"
 #include "effects.h"
+#include "enemy.h"
 
 extern u32 GetNextFunction(Entity*);
 
diff --git a/src/enemy/likeLike.c b/src/enemy/likeLike.c
index 37ee4055..7d764c07 100644
--- a/src/enemy/likeLike.c
+++ b/src/enemy/likeLike.c
@@ -3,6 +3,7 @@
 #include "save.h"
 #include "object.h"
 #include "functions.h"
+#include "item.h"
 
 extern bool32 ItemIsShield(u32);
 
diff --git a/src/enemy/mazaalHead.c b/src/enemy/mazaalHead.c
index 3898f0c0..3a065362 100644
--- a/src/enemy/mazaalHead.c
+++ b/src/enemy/mazaalHead.c
@@ -810,8 +810,8 @@ void sub_08034BC8(Entity* this) {
 
 void sub_08034C00(Entity* this) {
     if (((gPlayerState.flags & PL_MINISH) != 0) &&
-        CheckPlayerInRegion(this->x.HALF.HI - gRoomControls.origin_x,
-                            this->y.HALF.HI - gRoomControls.origin_y + 0xd, 3, 3) != 0) {
+        CheckPlayerInRegion(this->x.HALF.HI - gRoomControls.origin_x, this->y.HALF.HI - gRoomControls.origin_y + 0xd, 3,
+                            3) != 0) {
         if (gRoomTransition.field_0x39 >= 0x3d) {
             DoExitTransition((ScreenTransitionData*)&gUnk_080CED88);
         } else {
diff --git a/src/enemy/miniSlime.c b/src/enemy/miniSlime.c
index 488cb419..1bfc3fc6 100644
--- a/src/enemy/miniSlime.c
+++ b/src/enemy/miniSlime.c
@@ -3,7 +3,7 @@
 
 void sub_08045374(Entity*);
 
-extern void sub_080452E4();
+extern void sub_080452E4(Entity*);
 extern void ReplaceMonitoredEntity(Entity*, Entity*);
 
 extern void (*const gUnk_080D17C0[])(Entity*);
diff --git a/src/enemy/octorok.c b/src/enemy/octorok.c
index 4c142bdc..47d4c486 100644
--- a/src/enemy/octorok.c
+++ b/src/enemy/octorok.c
@@ -3,9 +3,9 @@
 
 extern Entity* sub_08049DF4(u32);
 
-void Octorok_Pause();
-bool32 Octorok_FacesPlayer();
-void Octorok_Turn();
+void Octorok_Pause(Entity*);
+bool32 Octorok_FacesPlayer(Entity*);
+void Octorok_Turn(Entity*);
 
 extern void (*const gOctorok[6])(Entity*);
 extern void (*const gOctorokActions[4])(Entity*);
diff --git a/src/enemy/rollobite.c b/src/enemy/rollobite.c
index 0a7dc34c..bf367eef 100644
--- a/src/enemy/rollobite.c
+++ b/src/enemy/rollobite.c
@@ -14,9 +14,9 @@ void sub_08020A7C(Entity*);
 bool32 Rollobite_TryToHoleUp(Entity*);
 bool32 Rollobite_IsRolledUp(Entity*);
 
-extern void sub_080AE58C();
-extern void sub_080AE7E8();
-extern void sub_08078930();
+extern void sub_080AE58C(Entity*, u32, u32);
+extern void sub_080AE7E8(Entity*, u32, u32, u32);
+extern void sub_08078930(Entity*);
 
 void Rollobite(Entity* this) {
     EnemyFunctionHandler(this, gRollobiteFunctions);
diff --git a/src/enemy/rope.c b/src/enemy/rope.c
index e555d60b..bf0a7ecb 100644
--- a/src/enemy/rope.c
+++ b/src/enemy/rope.c
@@ -5,10 +5,10 @@ extern void (*const gRope[6])(Entity*);
 extern void (*const gUnk_080CE460[4])(Entity*);
 extern void (*const gUnk_080CE470[3])(Entity*);
 extern Entity* gUnk_020000B0;
-extern u32 sub_0804A044();
+extern u32 sub_0804A044(Entity*, Entity*, u32);
 
-void sub_08031600();
-u32 sub_0803163C();
+void sub_08031600(Entity*);
+u32 sub_0803163C(Entity*);
 
 void Rope(Entity* this) {
     EnemyFunctionHandler(this, gRope);
diff --git a/src/enemy/rupeeLike.c b/src/enemy/rupeeLike.c
index ffa409cd..cd068b96 100644
--- a/src/enemy/rupeeLike.c
+++ b/src/enemy/rupeeLike.c
@@ -78,7 +78,7 @@ void sub_080293B4(Entity* this) {
     CreateDeathFx(this, 0xff, gUnk_080CCC34[this->cutsceneBeh.HALF.LO * 3 + this->type]);
 }
 
-void nullsub_141() {
+void nullsub_141(Entity* this) {
 }
 
 void sub_080293DC(Entity* this) {
diff --git a/src/enemy/slime.c b/src/enemy/slime.c
index 2f2a18ee..e6faf992 100644
--- a/src/enemy/slime.c
+++ b/src/enemy/slime.c
@@ -37,7 +37,7 @@ void sub_08044F88(Entity* this) {
     }
 }
 
-void nullsub_171() {
+void nullsub_171(Entity* this) {
 }
 
 void sub_08044FC8(Entity* this) {
diff --git a/src/enemy/smallPesto.c b/src/enemy/smallPesto.c
index ec6d93ca..7e26ab7d 100644
--- a/src/enemy/smallPesto.c
+++ b/src/enemy/smallPesto.c
@@ -21,7 +21,7 @@ void sub_08031680(Entity* this) {
     gUnk_080CE548[this->action](this);
 }
 
-void nullsub_152() {
+void nullsub_152(Entity* this) {
 }
 
 void sub_0803169C(Entity* this) {
diff --git a/src/enemy/tektite.c b/src/enemy/tektite.c
index 07709ae9..e029da29 100644
--- a/src/enemy/tektite.c
+++ b/src/enemy/tektite.c
@@ -1,6 +1,8 @@
 #include "enemy.h"
 #include "functions.h"
 
+static void sub_0802F45C(Entity* this);
+
 extern void (*const gUnk_080CDED0[])(Entity*);
 extern void (*const gUnk_080CDEE8[])(Entity*);
 
@@ -175,7 +177,7 @@ void sub_0802F3F4(Entity* this) {
     }
 }
 
-void sub_0802F45C(Entity* this) {
+static void sub_0802F45C(Entity* this) {
     u32 temp;
 
     if (sub_08049FA0(this) == 0) {
diff --git a/src/enemy/vaatiArm.c b/src/enemy/vaatiArm.c
index 78a49cf7..cb01f671 100644
--- a/src/enemy/vaatiArm.c
+++ b/src/enemy/vaatiArm.c
@@ -546,8 +546,7 @@ void sub_08042C34(Entity* this) {
             y = gRoomControls.origin_y + gRoomControls.height + -0x40;
         }
 #endif
-        if (((u32)((x - gRoomControls.origin_x) - 0x90) < 0x41) &&
-            ((u32)((y - gRoomControls.origin_y) - 8) < 0x41)) {
+        if (((u32)((x - gRoomControls.origin_x) - 0x90) < 0x41) && ((u32)((y - gRoomControls.origin_y) - 8) < 0x41)) {
             x = gRoomControls.origin_x + 0xb0;
             y = gRoomControls.origin_y + 0x40;
         }
diff --git a/src/enemy/vaatiBall.c b/src/enemy/vaatiBall.c
index 68e5be20..f02eedd3 100644
--- a/src/enemy/vaatiBall.c
+++ b/src/enemy/vaatiBall.c
@@ -141,7 +141,7 @@ void sub_080447E0(Entity* this) {
     }
 }
 
-extern void sub_08044DEC();
+extern void sub_08044DEC(Entity*);
 
 void sub_08044868(Entity* this) {
     Entity* vaati = this->parent;
diff --git a/src/enemy/vaatiWrath.c b/src/enemy/vaatiWrath.c
index 6a3c1425..f0877357 100644
--- a/src/enemy/vaatiWrath.c
+++ b/src/enemy/vaatiWrath.c
@@ -389,8 +389,7 @@ void VaatiWrathType0Action8(Entity* this) {
     sub_08042004(this);
     UpdateAnimationSingleFrame(this);
     LinearMoveUpdate(this);
-    if (((gRoomControls.origin_x + 0x20) > this->x.HALF.HI) ||
-        ((gRoomControls.origin_x + 0x140) < this->x.HALF.HI)) {
+    if (((gRoomControls.origin_x + 0x20) > this->x.HALF.HI) || ((gRoomControls.origin_x + 0x140) < this->x.HALF.HI)) {
         if (0x3f < this->speed) {
             this->direction ^= 0x10;
         }
diff --git a/src/enemy/wisp.c b/src/enemy/wisp.c
index 6b399d2d..190167e5 100644
--- a/src/enemy/wisp.c
+++ b/src/enemy/wisp.c
@@ -3,6 +3,8 @@
 #include "object.h"
 #include "functions.h"
 
+static void sub_08033744(Entity* this);
+
 extern void (*const gUnk_080CEB74[])(Entity*);
 extern void (*const gUnk_080CEB8C[])(Entity*);
 extern void (*const gUnk_080CEB98[])(Entity*);
@@ -120,7 +122,7 @@ void sub_080336DC(Entity* this) {
     }
 }
 
-void sub_08033744(Entity* this) {
+static void sub_08033744(Entity* this) {
     u32 temp;
     u32 rand = (u32)Random() % 256;
 
diff --git a/src/enterPortalSubtask.c b/src/enterPortalSubtask.c
index 712ab7ca..072c0e3f 100644
--- a/src/enterPortalSubtask.c
+++ b/src/enterPortalSubtask.c
@@ -12,8 +12,8 @@ typedef struct {
     u32 unk;
 } struct_02018EB0;
 
-extern void (*const gUnk_080D4120[])();
-extern void (*const gUnk_080D412C[])();
+extern void (*const gUnk_080D4120[])(void);
+extern void (*const gUnk_080D412C[])(void);
 
 extern struct_02018EB0 gUnk_02018EB0;
 
diff --git a/src/entity.c b/src/entity.c
index 8c75fa94..8092dd71 100644
--- a/src/entity.c
+++ b/src/entity.c
@@ -15,19 +15,19 @@ void sub_0805EE88(void);
 void ClearAllDeletedEntities(void);
 void DeleteAllEntities(void);
 void sub_0805E98C(void);
-extern void sub_0806FE84();
-extern void sub_08078954();
+extern void sub_0806FE84(Entity*);
+extern void sub_08078954(Entity*);
 extern void sub_08017744(Entity*);
-extern void UnloadHitbox();
-extern void sub_0804AA1C();
+extern void UnloadHitbox(Entity*);
+extern void sub_0804AA1C(Entity*);
 
 void ClearDeletedEntity(Entity*);
-extern void _ClearAndUpdateEntities();
+extern void _ClearAndUpdateEntities(void);
 extern void UpdateEntities_arm(u32);
 
 static void UpdatePriorityTimer(void);
-static void ReleaseTransitionManager();
-static void UnlinkEntity();
+static void ReleaseTransitionManager(void*);
+static void UnlinkEntity(Entity*);
 
 typedef struct {
     void* table;
@@ -106,7 +106,7 @@ bool32 AnyPrioritySet(void) {
     return prio != PRIO_MIN;
 }
 
-static void UpdatePriority() {
+static void UpdatePriority(void) {
     UpdatePriorityTimer();
     if (gPriorityHandler.queued_priority) {
         gPriorityHandler.ent_priority = gPriorityHandler.queued_priority;
@@ -175,7 +175,7 @@ void SetPlayerEventPriority(void) {
     gPlayerEntity.updatePriority = PRIO_PLAYER_EVENT;
 }
 
-void ResetPlayerEventPriority() {
+void ResetPlayerEventPriority(void) {
     gPriorityHandler.sys_priority = PRIO_MIN;
     gPlayerEntity.updatePriority = PRIO_PLAYER;
 }
@@ -185,19 +185,19 @@ void RevokePriority(Entity* e) {
     ResetEntityPriority();
 }
 
-void SetRoomReloadPriority() {
+void SetRoomReloadPriority(void) {
     gPriorityHandler.sys_priority = PRIO_PLAYER_EVENT;
 }
 
-void SetInitializationPriority() {
+void SetInitializationPriority(void) {
     gPriorityHandler.sys_priority = PRIO_HIGHEST;
 }
 
-void ResetSystemPriority() {
+void ResetSystemPriority(void) {
     gPriorityHandler.sys_priority = PRIO_MIN;
 }
 
-void UpdateEntities() {
+void UpdateEntities(void) {
     void (*f)(u32);
 
     gRoomVars.filler1[0] = gRoomVars.field_0x4;
@@ -212,14 +212,14 @@ void UpdateEntities() {
     sub_0805EE88();
 }
 
-void UpdateManagers() {
+void UpdateManagers(void) {
     void (*f)(u32);
     f = UpdateEntities_arm;
     f(1);
     ClearAllDeletedEntities();
 }
 
-void EraseAllEntities() {
+void EraseAllEntities(void) {
     DeleteAllEntities();
     MemClear(&gPriorityHandler, 12);
     MemClear(&gPlayerEntity, 10880);
@@ -424,7 +424,7 @@ void DeleteManager(void* ent) {
         return;
 
     ReleaseTransitionManager(manager);
-    UnlinkEntity(manager);
+    UnlinkEntity((Entity*)manager);
     MemClear(manager, sizeof(Temp));
     gManagerCount--;
 }
diff --git a/src/fileselect.c b/src/fileselect.c
index 8fe1f7a3..2a26ad02 100644
--- a/src/fileselect.c
+++ b/src/fileselect.c
@@ -6,6 +6,7 @@
 #include "message.h"
 #include "object.h"
 #include "functions.h"
+#include "subtask.h"
 
 // copy, erase, start
 #define NUM_FILE_OPERATIONS 3
@@ -92,7 +93,7 @@ static void sub_08050624(u32);
 static void sub_0805066C(void);
 static void HideButtonR(void);
 static void ShowButtonR(void);
-void sub_08051458();
+void sub_08051458(void);
 
 void CreateDialogBox(u32 arg0, u32 arg1) {
     u32 sfx;
diff --git a/src/game.c b/src/game.c
index bde1233c..37cda100 100644
--- a/src/game.c
+++ b/src/game.c
@@ -16,6 +16,7 @@
 #include "message.h"
 #include "game.h"
 #include "item.h"
+#include "subtask.h"
 
 // Game task
 
@@ -71,49 +72,50 @@ extern void* gUnk_080B755C[];
 extern void** gExitLists[];
 extern void** gAreaTable[];
 
-void FinalizeSave(void);
-void ClearArmosData(void);
-void ClearRoomMemory(void);
-void ClearMenuSavestate(void);
-void ResetUI(void);
-void sub_0806FD8C(void);
-void sub_080300C4(void);
-u32 sub_0805BC04(void);
-void DeleteSleepingEntities(void);
-u32 UpdateLightLevel(void);
-void sub_080185F8(void);
-void UpdateDoorTransition(void);
-u32 IsEnterPortal(void);
-void UpdateCarriedObject(void);
-void DrawUI();
-u32 CheckPlayerInactive();
-void CollisionMain();
-void sub_0805BB74();
-void CreateZeldaFollower(void);
-void LoadRoomGfx();
-void RecycleEntities();
-void sub_0804AF90();
-void CallRoomProp6();
-void UpdateScroll();
-void UpdateBgAnim();
-void CleanUpGFXSlots();
-void sub_080ADE24();
-void InitUI(u32);
-void sub_0801AE44(u32);
-void GenerateAreaHint(void);
-void ForceSetPlayerState(u32);
-void UpdateRoomTracker(void);
-void InitScriptData(void);
-void sub_08054524(void);
-void sub_080186D4(void);
-void sub_0806F364(void);
-void sub_08052FF4(u32 area, u32 room);
-void sub_0807C860(void);
-void sub_0807C740(void);
-void SetBGDefaults(void);
-void LoadItemGfx(void);
+extern void CreateDialogBox(u32, u32);
+extern void FinalizeSave(void);
+extern void ClearArmosData(void);
+extern void ClearRoomMemory(void);
+extern void ClearMenuSavestate(void);
+extern void ResetUI(void);
+extern void sub_0806FD8C(void);
+extern void sub_080300C4(void);
+extern u32 sub_0805BC04(void);
+extern void DeleteSleepingEntities(void);
+extern u32 UpdateLightLevel(void);
+extern void sub_080185F8(void);
+extern void UpdateDoorTransition(void);
+extern u32 IsEnterPortal(void);
+extern void UpdateCarriedObject(void);
+extern void DrawUI(void);
+extern u32 CheckPlayerInactive(void);
+extern void CollisionMain(void);
+extern void sub_0805BB74(u32);
+extern void CreateZeldaFollower(void);
+extern void LoadRoomGfx(void);
+extern void RecycleEntities(void);
+extern void sub_0804AF90(void);
+extern void CallRoomProp6(void);
+extern void UpdateScroll(void);
+extern void UpdateBgAnim(void);
+extern void CleanUpGFXSlots(void);
+extern void sub_080ADE24(void);
+extern void InitUI(u32);
+extern void sub_0801AE44(u32);
+extern void GenerateAreaHint(void);
+extern void ForceSetPlayerState(u32);
+extern void UpdateRoomTracker(void);
+extern void InitScriptData(void);
+extern void sub_08054524(void);
+extern void sub_080186D4(void);
+extern void sub_0806F364(void);
+extern void sub_08052FF4(u32 area, u32 room);
+extern void sub_0807C860(void);
+extern void sub_0807C740(void);
+extern void SetBGDefaults(void);
+extern void LoadItemGfx(void);
 
-static void LoadRoomBgm();
+static void LoadRoomBgm(void);
 static void sub_08052010(void);
 static void ResetTmpFlags(void);
 static void InitializeEntities(void);
@@ -133,7 +135,7 @@ static void sub_0805329C(void);
 static void InitializePlayer(void);
 /* static */ void sub_08051F9C(u32 a1, u32 a2, u32 a3, u32 a4);
 static void DrawGameOverText(void);
-static u32 StairsAreValid();
+static u32 StairsAreValid(void);
 static void ClearFlagArray(const u16*);
 static void DummyHandler(u32* a1);
 static void sub_08053434(u32* a1);
@@ -178,8 +180,6 @@ typedef struct {
     u16 _a;
 } PopupOption;
 
-extern void CreateDialogBox();
-
 typedef struct {
     u8 area;
     u8 room;
diff --git a/src/interrupts.c b/src/interrupts.c
index 4041fd50..e7c6463d 100644
--- a/src/interrupts.c
+++ b/src/interrupts.c
@@ -21,18 +21,18 @@ extern Entity gUnk_03003BE0;
 extern Entity* gPlayerClones[3];
 extern u16 gUnk_080B2CD8[];
 
-extern void sub_080ADD70();
-extern void sub_0801C25C();
-extern void UpdateDisplayControls();
-extern void LoadResources();
-extern void HandlePlayerLife();
-extern void DoPlayerAction();
-extern void sub_080171F0();
-extern void sub_08078FB0();
-extern void sub_0807A050();
-extern u32 sub_08079B24();
-extern void sub_08079708();
-extern void CreateSparkle();
+extern void sub_080ADD70(void);
+extern void sub_0801C25C(void);
+extern void UpdateDisplayControls(void);
+extern void LoadResources(void);
+extern void HandlePlayerLife(Entity*);
+extern void DoPlayerAction(Entity*);
+extern void sub_080171F0(void);
+extern void sub_08078FB0(Entity*);
+extern void sub_0807A050(void);
+extern u32 sub_08079B24(void);
+extern void sub_08079708(Entity*);
+extern void CreateSparkle(Entity*);
 extern void sub_080028E0(Entity*);
 extern void sub_08078180(void);
 extern void sub_0807B0C8(void);
diff --git a/src/item/itemLantern.c b/src/item/itemLantern.c
index 6a171d8c..3376c721 100644
--- a/src/item/itemLantern.c
+++ b/src/item/itemLantern.c
@@ -2,6 +2,7 @@
 #include "functions.h"
 #include "sound.h"
 #include "object.h"
+#include "game.h"
 
 extern void (*const gUnk_0811BD68[])(ItemBehavior*, u32);
 
diff --git a/src/item/itemMoleMitts.c b/src/item/itemMoleMitts.c
index 5fdeb0b6..355f69df 100644
--- a/src/item/itemMoleMitts.c
+++ b/src/item/itemMoleMitts.c
@@ -10,7 +10,7 @@ s32 sub_080774A0(void);
 extern u8 gUnk_0811BE14[];
 extern s32 sub_0800875A(Entity*, u32, ItemBehavior*);
 
-extern void UpdatePlayerMovement();
+extern void UpdatePlayerMovement(void);
 
 void ItemMoleMitts(ItemBehavior* this, u32 arg1) {
     gUnk_0811BE04[this->stateID](this, arg1);
diff --git a/src/item/itemShield.c b/src/item/itemShield.c
index 621341e2..445bbece 100644
--- a/src/item/itemShield.c
+++ b/src/item/itemShield.c
@@ -6,7 +6,7 @@
 extern void sub_08077E78(ItemBehavior*, u32);
 extern void SoundReq(u32);
 extern void UpdateItemAnim(ItemBehavior*);
-extern u32 sub_08077EFC();
+extern u32 sub_08077EFC(ItemBehavior*);
 extern void sub_08077BB8(ItemBehavior*);
 extern void sub_08077D38(ItemBehavior*, u32);
 extern void sub_0806F948(Entity*);
@@ -26,7 +26,7 @@ void sub_08076D04(ItemBehavior* beh, u32 arg1) {
 }
 
 void sub_08076D34(ItemBehavior* beh, u32 arg1) {
-    if (sub_08077EFC() != 0) {
+    if (sub_08077EFC(beh) != 0) {
         gPlayerState.field_0x3[0] |= 1;
         UpdateItemAnim(beh);
         if (beh->field_0x5[9] != 0) {
diff --git a/src/main.c b/src/main.c
index 7a15ed58..ced56ca5 100644
--- a/src/main.c
+++ b/src/main.c
@@ -29,10 +29,8 @@ void (*const sTaskHandlers[])(void) = {
     [TASK_FILE_SELECT] = FileSelectTask,
 #endif
 
-    [TASK_GAME] = GameTask,
-    [TASK_GAMEOVER] = GameOverTask,
-    [TASK_STAFFROLL] = StaffrollTask,
-    [TASK_DEBUG] = DebugTask,
+    [TASK_GAME] = GameTask,           [TASK_GAMEOVER] = GameOverTask,
+    [TASK_STAFFROLL] = StaffrollTask, [TASK_DEBUG] = DebugTask,
 };
 
 static void sub_080560B8(void);
@@ -225,7 +223,7 @@ static u32 CheckHeaderValid(void) {
     return TRUE;
 }
 
-void InitDMA() {
+void InitDMA(void) {
     SoundReq(SONG_VSYNC_OFF);
     gScreen._6d = gScreen._6c;
     gScreen._6c = 0;
@@ -238,7 +236,7 @@ void InitDMA() {
     DmaWait(3);
 }
 
-void sub_08056208() {
+void sub_08056208(void) {
     SoundReq(SONG_VSYNC_ON);
     gScreen._6c = gScreen._6d;
     gScreen._6d = 0;
@@ -252,7 +250,7 @@ void sub_0805622C(void* a1, u32 a2, u32 a3) {
     gUnk_03003DE4 ^= 1;
 }
 
-void sub_08056250() {
+void sub_08056250(void) {
     gScreen._6c = 0;
 }
 
@@ -299,10 +297,10 @@ u16 CheckRegionsOnScreen(u16* arr) {
     return 0xff;
 }
 
-void PlayerItemNulled2() {
+void PlayerItemNulled2(void) {
     DeleteThisEntity();
 }
 
-void PlayerItemNulled() {
+void PlayerItemNulled(void) {
     DeleteThisEntity();
 }
diff --git a/src/manager/manager1.c b/src/manager/manager1.c
index 51b28137..a47dd57b 100644
--- a/src/manager/manager1.c
+++ b/src/manager/manager1.c
@@ -2,6 +2,7 @@
 #include "entity.h"
 #include "screen.h"
 #include "functions.h"
+#include "common.h"
 
 extern void sub_08056250(void);
 
diff --git a/src/manager/manager10.c b/src/manager/manager10.c
index cedc2a29..1ba0150d 100644
--- a/src/manager/manager10.c
+++ b/src/manager/manager10.c
@@ -148,11 +148,11 @@ void sub_080596E0(Manager10* this) {
     }
 }
 
-u32 sub_08059844() {
+u32 sub_08059844(void) {
     return gPlayerEntity.x.HALF.HI - gRoomControls.origin_x > gRoomControls.width >> 1;
 }
 
-u32 sub_0805986C() {
+u32 sub_0805986C(void) {
     return gPlayerEntity.x.HALF.HI - gRoomControls.origin_x > 0x200;
 }
 
@@ -207,7 +207,7 @@ void sub_08059960(const u16* unk1, const u16* unk2, u16* unk3, u8 unk4) {
     }
 }
 
-void sub_08059994() {
+void sub_08059994(void) {
     if (sub_0805986C()) {
         LoadPaletteGroup(0x5B);
         gArea.queued_bgm = 0x1E;
diff --git a/src/manager/manager12.c b/src/manager/manager12.c
index a29877bd..24b2e630 100644
--- a/src/manager/manager12.c
+++ b/src/manager/manager12.c
@@ -24,7 +24,7 @@ extern u16 gUnk_081083AE;
 extern u16 gUnk_081083C4;
 
 void sub_08059CC0(u32, u32);
-void sub_08059B18();
+void sub_08059B18(void);
 
 bool32 sub_08059C8C(Manager12*, u32, u8*, u16*);
 
diff --git a/src/manager/manager14.c b/src/manager/manager14.c
index 367111f6..9f5d8154 100644
--- a/src/manager/manager14.c
+++ b/src/manager/manager14.c
@@ -30,8 +30,8 @@ void sub_0805A098(Manager14*);
 void sub_0805A0C0(Manager14*);
 void sub_0805A114(u32, u32);
 void sub_0805A1D8(Manager14*);
-void nullsub_495();
-void sub_0805A25C();
+void nullsub_495(void*);
+void sub_0805A25C(void*);
 
 void Manager14_Main(Manager14* this) {
     static void (*const gUnk_081085A4[])(Manager14*) = {
@@ -186,10 +186,10 @@ void sub_0805A1D8(Manager14* this) {
     }
 }
 
-void nullsub_495() {
+void nullsub_495(void* this) {
 }
 
-void sub_0805A25C() {
+void sub_0805A25C(void* this) {
     gScreen.controls.layerFXControl = 0;
     gScreen.lcd.displayControl &= ~DISPCNT_BG3_ON;
     sub_08056250();
diff --git a/src/manager/manager1A.c b/src/manager/manager1A.c
index 5e760473..9aea4722 100644
--- a/src/manager/manager1A.c
+++ b/src/manager/manager1A.c
@@ -165,10 +165,8 @@ void sub_0805B210(Manager1A* this) {
             gRoomTransition.player_status.start_pos_y = tmp->unk_06;
             break;
         case 1:
-            gRoomTransition.player_status.start_pos_x =
-                gPlayerEntity.x.HALF.HI - gRoomControls.origin_x + tmp->unk_04;
-            gRoomTransition.player_status.start_pos_y =
-                gPlayerEntity.y.HALF.HI - gRoomControls.origin_y + tmp->unk_06;
+            gRoomTransition.player_status.start_pos_x = gPlayerEntity.x.HALF.HI - gRoomControls.origin_x + tmp->unk_04;
+            gRoomTransition.player_status.start_pos_y = gPlayerEntity.y.HALF.HI - gRoomControls.origin_y + tmp->unk_06;
             break;
         case 2:
             gRoomTransition.player_status.start_pos_x = tmp->unk_04;
diff --git a/src/manager/manager1B.c b/src/manager/manager1B.c
index 8fb9e70a..4eafda98 100644
--- a/src/manager/manager1B.c
+++ b/src/manager/manager1B.c
@@ -2,6 +2,7 @@
 #include "manager.h"
 #include "functions.h"
 #include "screen.h"
+#include "common.h"
 
 typedef struct {
     Manager manager;
diff --git a/src/manager/manager2.c b/src/manager/manager2.c
index a9404c10..828dcbcc 100644
--- a/src/manager/manager2.c
+++ b/src/manager/manager2.c
@@ -1,6 +1,8 @@
 #include "global.h"
 #include "screen.h"
 #include "functions.h"
+#include "game.h"
+#include "common.h"
 
 typedef struct {
     Manager manager;
@@ -9,7 +11,7 @@ typedef struct {
     void* field_0x3c;
 } Manager2;
 
-extern void sub_080576A0();
+extern void sub_080576A0(void*);
 extern void sub_0805754C(Manager2*);
 
 extern u8 gMapDataTopSpecial[];
@@ -81,9 +83,9 @@ void sub_08057688(void) {
     gScreen.bg1.control = BGCNT_SCREENBASE(30) | BGCNT_CHARBASE(2) | BGCNT_MOSAIC;
 }
 
-void sub_080576A0(Manager2* this) {
+void sub_080576A0(void* this) {
     LoadGfxGroup(gRoomVars.unk_10[0]);
-    this->field_0x38 = NULL;
-    this->field_0x3c = NULL;
-    sub_0805754C(this);
+    ((Manager2*)this)->field_0x38 = NULL;
+    ((Manager2*)this)->field_0x3c = NULL;
+    sub_0805754C((Manager2*)this);
 }
diff --git a/src/manager/manager27.c b/src/manager/manager27.c
index 8cd20656..e5c4483c 100644
--- a/src/manager/manager27.c
+++ b/src/manager/manager27.c
@@ -3,6 +3,7 @@
 #include "entity.h"
 #include "flags.h"
 #include "functions.h"
+#include "common.h"
 
 extern u32 sub_0805C920(Entity*);
 
diff --git a/src/manager/manager2F.c b/src/manager/manager2F.c
index 7b7285df..614e418a 100644
--- a/src/manager/manager2F.c
+++ b/src/manager/manager2F.c
@@ -4,6 +4,7 @@
 #include "room.h"
 #include "screen.h"
 #include "functions.h"
+#include "common.h"
 
 void sub_0805D470(Manager*);
 
diff --git a/src/manager/manager4.c b/src/manager/manager4.c
index e287d521..f73c9514 100644
--- a/src/manager/manager4.c
+++ b/src/manager/manager4.c
@@ -89,7 +89,7 @@ u32 sub_0805795C(Manager* this, DiggingCaveEntrance* entr) {
     }
 }
 
-extern void sub_08080930();
+extern void sub_08080930(u32);
 
 #ifdef EU
 ASM_FUNC("asm/non_matching/eu/sub_08057A18.inc", void sub_08057A18(Manager* this, DiggingCaveEntrance* entr))
diff --git a/src/manager/manager7.c b/src/manager/manager7.c
index ba3e03a2..5316a4a3 100644
--- a/src/manager/manager7.c
+++ b/src/manager/manager7.c
@@ -1,6 +1,7 @@
 #include "manager.h"
 #include "asm.h"
 #include "functions.h"
+#include "common.h"
 
 typedef struct {
     Manager manager;
@@ -8,8 +9,8 @@ typedef struct {
     u8 unk_21[0x1F];
 } Manager7;
 
-void sub_08057E30();
-u32 sub_08057E40();
+void sub_08057E30(void*);
+u32 sub_08057E40(Manager7*);
 void sub_08057E7C(u32);
 
 extern u32 CheckRegionsOnScreen(const u16*);
@@ -106,7 +107,7 @@ void Manager7_Main(Manager7* this) {
 }
 #endif
 
-void sub_08057E30(Manager7* this) {
+void sub_08057E30(void* this) {
     sub_08057E7C(gRoomVars.unk_10[0]);
 }
 
@@ -120,7 +121,7 @@ u32 sub_08057E40(Manager7* this) {
     }
 }
 
-void sub_08057E64() {
+void sub_08057E64(void) {
     u32 tmp;
     tmp = CheckRegionsOnScreen(gUnk_08108050);
     if (tmp != 0xFF) {
diff --git a/src/manager/manager8.c b/src/manager/manager8.c
index f3fbffa9..7ec803be 100644
--- a/src/manager/manager8.c
+++ b/src/manager/manager8.c
@@ -1,6 +1,7 @@
 #include "manager.h"
 #include "screen.h"
 #include "functions.h"
+#include "common.h"
 
 typedef struct {
     Manager manager;
@@ -11,7 +12,7 @@ typedef struct {
 } Manager8;
 
 void sub_08057F20(Manager8*);
-void sub_08057EFC();
+void sub_08057EFC(void*);
 void sub_08058034(void);
 void sub_08058084(u16*, u16*);
 
@@ -27,12 +28,12 @@ void Manager8_Main(Manager8* this) {
     }
 }
 
-void sub_08057EFC(Manager8* this) {
+void sub_08057EFC(void* this) {
     LoadGfxGroup((u32)gRoomVars.unk_10[0]);
     sub_08058034();
-    this->unk_3c = 0;
-    this->unk_38 = 0;
-    sub_08057F20(this);
+    ((Manager8*)this)->unk_3c = 0;
+    ((Manager8*)this)->unk_38 = 0;
+    sub_08057F20(((Manager8*)this));
 }
 
 void sub_08058004(u32, void*, void*);
@@ -75,7 +76,7 @@ void sub_08058004(u32 unk1, void* unk2, void* unk3) {
     }
 }
 
-void sub_08058034() {
+void sub_08058034(void) {
     u32 tmp;
     u16 *tmp2, *tmp3;
     tmp2 = gMapDataTopSpecial;
diff --git a/src/manager/manager9.c b/src/manager/manager9.c
index 4e992f59..c00132df 100644
--- a/src/manager/manager9.c
+++ b/src/manager/manager9.c
@@ -3,6 +3,7 @@
 #include "room.h"
 #include "screen.h"
 #include "functions.h"
+#include "common.h"
 
 typedef struct {
     Manager manager;
@@ -66,7 +67,7 @@ void sub_080582A0(u32 unk, u32* unk2, u16* unk3) {
 
 extern u8 gMapDataTopSpecial[];
 
-void sub_080582D0() {
+void sub_080582D0(void) {
     u8* tmp = gMapDataTopSpecial;
     u8* tmp2 = tmp + 0x4000;
     sub_080582F8(tmp, tmp2);
diff --git a/src/manager/managerC.c b/src/manager/managerC.c
index f198cf04..5f498695 100644
--- a/src/manager/managerC.c
+++ b/src/manager/managerC.c
@@ -27,6 +27,8 @@ typedef struct {
     u16 unk_6;
 } struct_08108228;
 
+void sub_08058D34(void);
+
 void (*const gUnk_0810821C[])(ManagerC*);
 const struct_08108228 gUnk_08108228[6];
 const struct_08108228 gUnk_08108258[6];
@@ -267,7 +269,7 @@ void sub_08058CB0(ManagerC* this) {
     this->unk_24.HALF.HI = this->unk_20 = gUnk_08108300[tmp3];
 }
 
-void sub_08058CFC() {
+void sub_08058CFC(void) {
     u32 tmp = gPlayerEntity.y.HALF.HI - gRoomControls.scroll_y;
     if (tmp < 0x4C) {
         sub_080044AE(&gPlayerEntity, 0xC0, 0x10);
@@ -277,7 +279,7 @@ void sub_08058CFC() {
     }
 }
 
-void sub_08058D34() {
+void sub_08058D34(void) {
     u16 tmp;
     u32 tmp2;
     LoadPaletteGroup(0x28);
diff --git a/src/manager/managerF.c b/src/manager/managerF.c
index dd27ac02..0a7cec00 100644
--- a/src/manager/managerF.c
+++ b/src/manager/managerF.c
@@ -284,7 +284,7 @@ void sub_08059220(ManagerF* this) {
     }
 }
 
-void sub_08059278() {
+void sub_08059278(void) {
     ManagerF* tmp;
     tmp = (ManagerF*)FindEntityByID(0x9, 0xF, 0x6);
     if (tmp) {
diff --git a/src/npc/bladeBrothers.c b/src/npc/bladeBrothers.c
index f9bc50b6..8b313f98 100644
--- a/src/npc/bladeBrothers.c
+++ b/src/npc/bladeBrothers.c
@@ -8,6 +8,7 @@
 #include "script.h"
 #include "npc.h"
 #include "functions.h"
+#include "game.h"
 
 extern void (*gUnk_081115C0[])(Entity*);
 extern void (*gUnk_081115D0[])(Entity*);
diff --git a/src/npc/cat.c b/src/npc/cat.c
index 09ec72d2..1b69f913 100644
--- a/src/npc/cat.c
+++ b/src/npc/cat.c
@@ -5,7 +5,7 @@
 #include "message.h"
 #include "npc.h"
 
-extern void sub_08067C44();
+extern void sub_08067C44(Entity*);
 
 extern void (*gCat[9])(Entity*);
 
@@ -14,7 +14,7 @@ extern Dialog gUnk_08110EF8;
 extern Hitbox gUnk_08110EF0;
 extern void sub_08067B08(Entity*);
 
-extern u32 sub_08067D20();
+extern u32 sub_08067D20(Entity*);
 extern void sub_08067AAC(Entity*);
 extern void sub_08067B34(Entity*);
 extern void sub_08067B80(Entity*, u32);
diff --git a/src/npc/dampe.c b/src/npc/dampe.c
index fd7ddbb7..5c22a331 100644
--- a/src/npc/dampe.c
+++ b/src/npc/dampe.c
@@ -84,7 +84,7 @@ void sub_0806BEC8(Entity* this, ScriptExecutionContext* context) {
     MessageNoOverlap(gUnk_0811334A[msgIndex], this);
 }
 
-void sub_0806BEFC() {
+void sub_0806BEFC(void) {
     SetTileType(0x17E, 0x58E, 1);
     SetTileType(0x17F, 0x58F, 1);
     SetTileType(0x180, 0x5CE, 1);
diff --git a/src/npc/dog.c b/src/npc/dog.c
index bd88e5c3..85ed9568 100644
--- a/src/npc/dog.c
+++ b/src/npc/dog.c
@@ -4,7 +4,7 @@
 
 extern void (*gUnk_08111D88[])(Entity*);
 void sub_08069FE8(Entity*);
-u32 sub_08069EF0();
+u32 sub_08069EF0(Entity*);
 
 extern u8 gUnk_08111DA8[];
 u32 sub_08069F90(Entity*);
diff --git a/src/npc/guard.c b/src/npc/guard.c
index b0f44595..d8afe8b2 100644
--- a/src/npc/guard.c
+++ b/src/npc/guard.c
@@ -7,6 +7,7 @@
 #include "script.h"
 #include "functions.h"
 #include "npc.h"
+#include "projectile.h"
 
 typedef struct {
     u32 unk;
diff --git a/src/npc/mailbox.c b/src/npc/mailbox.c
index 9dc5df22..755e0b2c 100644
--- a/src/npc/mailbox.c
+++ b/src/npc/mailbox.c
@@ -4,7 +4,7 @@
 #include "effects.h"
 #include "npc.h"
 
-extern void sub_08063280();
+extern void sub_08063280(Entity*, u32);
 
 extern void (*gMailboxBehaviors[4])(Entity*);
 
diff --git a/src/npc/mayorHagen.c b/src/npc/mayorHagen.c
index bf56dd1d..673b2b81 100644
--- a/src/npc/mayorHagen.c
+++ b/src/npc/mayorHagen.c
@@ -4,7 +4,7 @@
 #include "flags.h"
 #include "npc.h"
 
-extern void sub_08078850();
+extern void sub_08078850(Entity*, u32, u32, u32*);
 extern u32 gUnk_08113F44;
 extern Dialog gUnk_08113F48[];
 
diff --git a/src/npc/npc4E.c b/src/npc/npc4E.c
index d5952c03..19c7b63a 100644
--- a/src/npc/npc4E.c
+++ b/src/npc/npc4E.c
@@ -6,6 +6,7 @@
 #include "flags.h"
 #include "object.h"
 #include "npc.h"
+#include "game.h"
 
 extern Hitbox gHitbox_2;
 typedef struct {
@@ -184,7 +185,7 @@ void sub_0806DC58(Entity* this) {
     ForceEquipItem(sub_0806DBF4(this->field_0x68.HALF.HI), 1);
 }
 
-void sub_0806DC7C() {
+void sub_0806DC7C(void) {
     const u16* tiles = gUnk_081141F4;
     while (*tiles != 0) {
         u32 tile = *tiles;
@@ -193,7 +194,7 @@ void sub_0806DC7C() {
     }
 }
 
-void sub_0806DCA0() {
+void sub_0806DCA0(void) {
     const u16* tiles = gUnk_081141F4;
     while (*tiles != 0) {
         u32 tile = *tiles;
@@ -202,7 +203,7 @@ void sub_0806DCA0() {
     }
 }
 
-void sub_0806DCC0() {
+void sub_0806DCC0(void) {
     gRoomTransition.player_status.overworld_map_x = 0x7c8;
     gRoomTransition.player_status.overworld_map_y = 0xf8;
 }
diff --git a/src/npc/npc5.c b/src/npc/npc5.c
index 1fa8c0f6..6ad456bb 100644
--- a/src/npc/npc5.c
+++ b/src/npc/npc5.c
@@ -822,7 +822,7 @@ bool32 sub_08061A74(Entity* this, s32 x, s32 y, s32 param) {
     return TRUE;
 }
 
-void sub_08061AA0() {
+void sub_08061AA0(void) {
     DeleteThisEntity();
 }
 
diff --git a/src/npc/pina.c b/src/npc/pina.c
index a36763ae..1ca1e56e 100644
--- a/src/npc/pina.c
+++ b/src/npc/pina.c
@@ -3,6 +3,7 @@
 #include "message.h"
 #include "save.h"
 #include "npc.h"
+#include "object.h"
 
 void sub_08063B68(Entity* this);
 void sub_08063A80(Entity* this);
diff --git a/src/npc/stamp.c b/src/npc/stamp.c
index 645fe1cc..4fd6944b 100644
--- a/src/npc/stamp.c
+++ b/src/npc/stamp.c
@@ -5,7 +5,7 @@
 #include "effects.h"
 #include "npc.h"
 
-extern void sub_08062CA4();
+extern void sub_08062CA4(Entity*);
 
 extern void (*gStampBehaviors1[4])(Entity*);
 extern void (*gStampBehaviors2[2])(Entity*);
diff --git a/src/npc/stockwell.c b/src/npc/stockwell.c
index 40ad8706..05f38e8c 100644
--- a/src/npc/stockwell.c
+++ b/src/npc/stockwell.c
@@ -4,6 +4,8 @@
 #include "message.h"
 #include "functions.h"
 #include "npc.h"
+#include "object.h"
+#include "item.h"
 
 extern void (*const gUnk_0810FDC8[])(Entity*);
 
diff --git a/src/npc/townMinish.c b/src/npc/townMinish.c
index 557b7341..50045270 100644
--- a/src/npc/townMinish.c
+++ b/src/npc/townMinish.c
@@ -3,9 +3,9 @@
 #include "npc.h"
 #include "functions.h"
 
-extern u32 sub_080002C0();
+extern u32 sub_080002C0(u32, u32, u32);
 extern void sub_0806ACC4(Entity*);
-extern void sub_0806AEA8();
+extern void sub_0806AEA8(Entity*);
 extern void sub_0806AEE4(Entity*);
 extern void sub_0806AFE8(Entity*, ScriptExecutionContext*);
 extern void sub_08078850(Entity*, u32, u32, u32*);
@@ -14,7 +14,7 @@ extern u8 gUnk_081125F4[12];
 extern SpriteLoadData gUnk_08112674[];
 extern u32 gUnk_081126D4[4];
 extern u8 gUnk_081126E4[4];
-extern void (*gUnk_081126E8[])();
+extern void (*gUnk_081126E8[])(Entity*);
 extern Dialog gUnk_081126F0[0x10];
 extern void (*gUnk_08112BF0[])(Entity*, ScriptExecutionContext*);
 extern u16 gUnk_08112C40[5];
diff --git a/src/npcUtils.c b/src/npcUtils.c
index 01ddd448..f1b97dd6 100644
--- a/src/npcUtils.c
+++ b/src/npcUtils.c
@@ -10,7 +10,7 @@
 extern const NPCDefinition gNPCDefinitions[];
 
 extern Hitbox* gNPCHitboxes[];
-extern u32 (*gUnk_08114EFC[])();
+extern u32 (*gUnk_08114EFC[])(Entity*);
 extern u32 (*gUnk_08114F0C[])(Entity*, u8*);
 
 typedef struct {
diff --git a/src/object/bird.c b/src/object/bird.c
index 33bea93a..24e2693b 100644
--- a/src/object/bird.c
+++ b/src/object/bird.c
@@ -1,6 +1,7 @@
 #include "save.h"
 #include "object.h"
 #include "functions.h"
+#include "item.h"
 
 extern void (*const gUnk_08123EC0[])(Entity*);
 extern void (*const gUnk_08123EEC[])(Entity*);
diff --git a/src/object/book.c b/src/object/book.c
index 3da498bc..7c3bf57e 100644
--- a/src/object/book.c
+++ b/src/object/book.c
@@ -1,6 +1,7 @@
 #include "object.h"
 #include "functions.h"
 #include "message.h"
+#include "item.h"
 
 extern void (*const BookActionFuncs[])(Entity*);
 extern s8 const gUnk_08123D94[];
diff --git a/src/object/cloud.c b/src/object/cloud.c
index dd3da89d..5c4383d8 100644
--- a/src/object/cloud.c
+++ b/src/object/cloud.c
@@ -2,6 +2,8 @@
 #include "structures.h"
 #include "functions.h"
 
+void sub_0809F814(u32 r0);
+
 extern void sub_0809F7BC(Entity*);
 extern void sub_0809F7F4(Entity*);
 extern void (*gUnk_08124798[])(Entity*);
diff --git a/src/object/greatFairy.c b/src/object/greatFairy.c
index 85e8681a..9232fd21 100644
--- a/src/object/greatFairy.c
+++ b/src/object/greatFairy.c
@@ -6,7 +6,7 @@
 
 void GreatFairy_InitializeAnimation(Entity*);
 Entity* GreatFairy_CreateForm(Entity*, u32, u32);
-void sub_080873D0();
+void sub_080873D0(Entity*);
 extern void (*const GreatFairy_Main[])(Entity*);
 extern void (*const GreatFairy_Behaviors[])(Entity*);
 extern void (*const GreatFairy_WingsBehaviors[])(Entity*);
diff --git a/src/object/heartContainer.c b/src/object/heartContainer.c
index 433fb87e..9e8346b3 100644
--- a/src/object/heartContainer.c
+++ b/src/object/heartContainer.c
@@ -2,6 +2,7 @@
 #include "entity.h"
 #include "flags.h"
 #include "functions.h"
+#include "item.h"
 
 static void sub_0808E6A0(Entity*);
 static void sub_0808E6E4(Entity*);
diff --git a/src/object/lilypadSmall.c b/src/object/lilypadSmall.c
index 31c5c3a8..5ec5fb84 100644
--- a/src/object/lilypadSmall.c
+++ b/src/object/lilypadSmall.c
@@ -6,6 +6,7 @@ extern void sub_080A2CC0(Entity*, Entity**, u16*);
 extern u16 gUnk_08123318[];
 
 static void sub_08097B24(Entity* this);
+static u32 sub_08097ADC(Entity* this);
 
 void LilypadSmall(Entity* this) {
     u32 rand;
@@ -30,7 +31,7 @@ void LilypadSmall(Entity* this) {
     }
 }
 
-u32 sub_08097ADC(Entity* this) {
+static u32 sub_08097ADC(Entity* this) {
     if ((gPlayerState.flags & PL_MINISH) == 0) {
         return 0;
     } else if (EntityInRectRadius(this, &gPlayerEntity, 8, 8) == 0) {
diff --git a/src/object/object1A.c b/src/object/object1A.c
index bdc3fe49..292a70f6 100644
--- a/src/object/object1A.c
+++ b/src/object/object1A.c
@@ -1,7 +1,7 @@
 #include "object.h"
 #include "functions.h"
 
-extern void sub_08086A6C();
+extern void sub_08086A6C(Entity*);
 
 extern void (*gUnk_081206C4[99])(Entity*);
 
diff --git a/src/object/object6A.c b/src/object/object6A.c
index 1f956870..f02d7660 100644
--- a/src/object/object6A.c
+++ b/src/object/object6A.c
@@ -5,6 +5,7 @@
 #include "message.h"
 #include "functions.h"
 #include "screen.h"
+#include "item.h"
 
 extern u8 gUnk_08114F30[];
 extern u8 gUnk_08114F34[];
diff --git a/src/object/objectA8.c b/src/object/objectA8.c
index ef00c9df..8a347a1f 100644
--- a/src/object/objectA8.c
+++ b/src/object/objectA8.c
@@ -1,6 +1,7 @@
 #include "entity.h"
 #include "player.h"
 #include "functions.h"
+#include "item.h"
 
 extern void (*gUnk_08124824[])(Entity*);
 
diff --git a/src/object/palaceArchway.c b/src/object/palaceArchway.c
index 13e6d3bb..f1c0abb9 100644
--- a/src/object/palaceArchway.c
+++ b/src/object/palaceArchway.c
@@ -14,5 +14,5 @@ void sub_0809F2A0(Entity* this) {
     SetTile(0x4069, COORD_TO_TILE(this), this->collisionLayer);
 }
 
-void nullsub_537() {
+void nullsub_537(Entity* this) {
 }
diff --git a/src/player.c b/src/player.c
index 26ee17c9..1f6b0cc7 100644
--- a/src/player.c
+++ b/src/player.c
@@ -241,7 +241,7 @@ static EntityAction sub_0807518C;
 static EntityAction sub_080751B4;
 
 static void sub_080717F8(Entity*);
-static void reset_priority();
+static void reset_priority(void);
 static void break_out(Entity* this);
 static void sub_08073AD4(Entity* this);
 static void sub_08073B60(Entity*);
@@ -257,44 +257,41 @@ void SurfaceAction_Ladder(Entity*);
 void SurfaceAction_AutoLadder(Entity*);
 
 extern void sub_080A4D88(void);
-extern void RespawnPlayer();
-extern void sub_080797EC();
-extern void UpdatePlayerMovement();
-extern void sub_08077698();
-extern void sub_08079258();
-extern void EnablePlayerDraw();
-extern u32 sub_08079B24();
-extern void sub_08079708();
-extern void sub_080792D8();
-extern Entity* CreatePlayerBomb();
-extern u32 sub_0806F854();
-extern u32 UpdatePlayerCollision();
-extern void sub_08079744();
-extern void sub_0807AE20();
-extern u32 sub_0807A894();
-extern u32 sub_080797C4();
-extern u32 sub_0807AC54();
-extern void sub_0800892E();
-extern void sub_08078F24();
-extern void sub_0807B068();
-extern u32 sub_080001DA();
-extern u32 sub_0807A2F8();
-extern u32 sub_0806F730();
-extern u32 sub_08007DD6();
-extern u32 GetSurfaceCalcType();
+extern void RespawnPlayer(void);
+extern void sub_080797EC(void);
+extern void UpdatePlayerMovement(void);
+extern void sub_08079258(void);
+extern void EnablePlayerDraw(Entity*);
+extern u32 sub_08079B24(void);
+extern void sub_08079708(Entity*);
+extern Entity* CreatePlayerBomb(Entity*, u32);
+extern u32 sub_0806F854(Entity*, s32, s32);
+extern u32 UpdatePlayerCollision(void);
+extern void sub_08079744(Entity*);
+extern void sub_0807AE20(Entity*);
+extern u32 sub_0807A894(Entity*);
+extern u32 sub_080797C4(void);
+extern void sub_0800892E(Entity*);
+extern void sub_08078F24(void);
+extern void sub_0807B068(Entity*);
+extern u32 sub_080001DA(u32, u32);
+extern u32 sub_0807A2F8(u32);
+extern u32 sub_0806F730(Entity*);
+extern u32 sub_08007DD6(u32, const u16*);
+extern u32 GetSurfaceCalcType(Entity*, u32, u32);
 extern void sub_08074808(Entity* this);
 extern void DoJump(Entity*);
 extern void SetZeldaFollowTarget(Entity*);
 u32 ItemIsSword(u32 item);
-extern u32 sub_0807A2B8();
-extern u32 sub_08079550();
-extern u32 sub_080782C0();
+extern u32 sub_0807A2B8(void);
+extern u32 sub_08079550(void);
+extern u32 sub_080782C0(void);
 extern u32 sub_080793E4(u32);
 extern void sub_08008AC6(Entity*);
 extern u32 sub_08079C30(Entity*);
-extern void sub_08077AEC();
-extern u32 RunQueuedAction();
-extern void UpdatePlayerSkills();
+extern void sub_08077AEC(void);
+extern u32 RunQueuedAction(void);
+extern void UpdatePlayerSkills(void);
 
 void sub_08077698(Entity*);
 u32 sub_080782C0(void);
@@ -3294,7 +3291,7 @@ static NONMATCH("asm/non_matching/player/sub_080740D8.inc", void sub_080740D8(En
 }
 END_NONMATCH
 
-u32 sub_080741C4() {
+u32 sub_080741C4(void) {
     if ((gPlayerState.jump_status && (gPlayerState.jump_status & 7) != 3) || gPlayerEntity.z.WORD != 0) {
         gPlayerState.field_0x11 = 0;
         gPlayerState.field_0x37 = 0;
@@ -3529,7 +3526,7 @@ void SurfaceAction_Water(Entity* this) {
 }
 
 void sub_08074808(Entity* this) {
-    sub_08077AEC(this);
+    sub_08077AEC();
     if (GetInventoryValue(ITEM_FLIPPERS) == 1) {
         if (!gPlayerState.swim_state) {
             if ((gPlayerState.flags & 0x10000) != 0)
@@ -3559,7 +3556,7 @@ void SurfaceAction_Button(Entity* this) {
     gPlayerState.field_0x3f -= 2;
 }
 
-void sub_080748D4() {
+void sub_080748D4(void) {
     sub_080741C4();
 }
 
diff --git a/src/playerItem.c b/src/playerItem.c
index a6c41629..bb91563e 100644
--- a/src/playerItem.c
+++ b/src/playerItem.c
@@ -1,26 +1,29 @@
 #include "global.h"
 #include "functions.h"
+#include "player.h"
 
-extern void PlayerItemSword();
-extern void PlayerItemBomb();
-extern void PlayerItem3();
-extern void PlayerItemBow();
-extern void PlayerItemShield();
-extern void PlayerItemLantern();
-extern void PlayerItemNulled();
-extern void PlayerItemGustJar();
-extern void PlayerItemPacciCane();
-extern void PlayerItemC();
-extern void PlayerItemCellOverwriteSet();
-extern void PlayerItemSwordSpin();
-extern void PlayerItemSwordBeam();
-extern void PlayerItem10();
-extern void PlayerItem11();
-extern void PlayerItem12();
-extern void PlayerItem13();
-extern void PlayerItem14();
-extern void PlayerItem15();
-extern void PlayerItemNulled2();
+typedef void(PlayerItemFunc)(Entity*);
+
+PlayerItemFunc PlayerItemSword;
+PlayerItemFunc PlayerItemBomb;
+PlayerItemFunc PlayerItem3;
+PlayerItemFunc PlayerItemBow;
+PlayerItemFunc PlayerItemShield;
+PlayerItemFunc PlayerItemLantern;
+PlayerItemFunc PlayerItemNulled;
+PlayerItemFunc PlayerItemGustJar;
+PlayerItemFunc PlayerItemPacciCane;
+PlayerItemFunc PlayerItemC;
+PlayerItemFunc PlayerItemCellOverwriteSet;
+PlayerItemFunc PlayerItemSwordSpin;
+PlayerItemFunc PlayerItemSwordBeam;
+PlayerItemFunc PlayerItem10;
+PlayerItemFunc PlayerItem11;
+PlayerItemFunc PlayerItem12;
+PlayerItemFunc PlayerItem13;
+PlayerItemFunc PlayerItem14;
+PlayerItemFunc PlayerItem15;
+PlayerItemFunc PlayerItemNulled2;
 
 typedef struct {
     u8 bitfield;
@@ -34,7 +37,7 @@ typedef struct {
 extern const PlayerItemDefinition gPlayerItemDefinitions[];
 extern const PlayerItemDefinition* gAdditionalPlayerItemDefinitions[3];
 
-void (*const gPlayerItemFunctions[])() = {
+PlayerItemFunc* const gPlayerItemFunctions[] = {
     DeleteEntity,
     PlayerItemSword,
     PlayerItemBomb,
diff --git a/src/playerItem/playerItem14.c b/src/playerItem/playerItem14.c
index e48fd10b..3e50c389 100644
--- a/src/playerItem/playerItem14.c
+++ b/src/playerItem/playerItem14.c
@@ -2,6 +2,7 @@
 #include "sound.h"
 #include "functions.h"
 #include "effects.h"
+#include "asm.h"
 
 extern void (*const gUnk_08109AC8[])(Entity*);
 extern Hitbox gUnk_08109AD0;
diff --git a/src/playerItem/playerItemPacciCane.c b/src/playerItem/playerItemPacciCane.c
index c009e4b9..3a6f533c 100644
--- a/src/playerItem/playerItemPacciCane.c
+++ b/src/playerItem/playerItemPacciCane.c
@@ -25,6 +25,6 @@ void sub_080704D4(Entity* this) {
 
 ASM_FUNC("asm/non_matching/playerItemPacciCane/sub_080704FC.inc", void sub_080704FC(Entity* this))
 
-void ClearMenuSavestate() {
+void ClearMenuSavestate(void) {
     MemClear(gUnk_02034490, sizeof(gUnk_02034490));
 }
diff --git a/src/playerItem/playerItemSwordBeam.c b/src/playerItem/playerItemSwordBeam.c
index 671c13b5..b39ce936 100644
--- a/src/playerItem/playerItemSwordBeam.c
+++ b/src/playerItem/playerItemSwordBeam.c
@@ -5,6 +5,7 @@
 #include "sound.h"
 #include "effects.h"
 #include "common.h"
+#include "asm.h"
 
 extern void (*const gUnk_080B43F4[])(Entity*);
 
diff --git a/src/projectile/ballAndChain.c b/src/projectile/ballAndChain.c
index 281b04b6..61a812ba 100644
--- a/src/projectile/ballAndChain.c
+++ b/src/projectile/ballAndChain.c
@@ -1,5 +1,6 @@
 #include "entity.h"
 #include "functions.h"
+#include "projectile.h"
 
 bool32 sub_080AB12C(Entity* this);
 
diff --git a/src/projectile/guardLineOfSight.c b/src/projectile/guardLineOfSight.c
index 02ecc3cd..67dd7576 100644
--- a/src/projectile/guardLineOfSight.c
+++ b/src/projectile/guardLineOfSight.c
@@ -2,6 +2,7 @@
 #include "asm.h"
 #include "coord.h"
 #include "functions.h"
+#include "projectile.h"
 
 extern u32 sub_080644C8(Entity*);
 extern bool32 sub_080AE4CC(Entity*, u32, u32, u32);
diff --git a/src/projectile/gyorgTail.c b/src/projectile/gyorgTail.c
index c36bc6ad..36a0498e 100644
--- a/src/projectile/gyorgTail.c
+++ b/src/projectile/gyorgTail.c
@@ -3,6 +3,7 @@
 #include "coord.h"
 #include "sound.h"
 #include "functions.h"
+#include "projectile.h"
 
 extern u8 gEntCount;
 extern Hitbox gHitbox_21;
diff --git a/src/projectile/v1EyeLaser.c b/src/projectile/v1EyeLaser.c
index 500cee96..b1b068e8 100644
--- a/src/projectile/v1EyeLaser.c
+++ b/src/projectile/v1EyeLaser.c
@@ -1,5 +1,6 @@
 #include "entity.h"
 #include "functions.h"
+#include "projectile.h"
 
 extern void (*const V1EyeLaser_Actions[])(Entity*);
 extern const Hitbox* const gUnk_0812A5F4[];
diff --git a/src/projectile/winder.c b/src/projectile/winder.c
index 7a0471e6..8dddd4a4 100644
--- a/src/projectile/winder.c
+++ b/src/projectile/winder.c
@@ -2,6 +2,7 @@
 #include "asm.h"
 #include "functions.h"
 #include "common.h"
+#include "projectile.h"
 
 extern void (*const Winder_Actions[])(Entity*);
 extern const u8 gUnk_0812A6BC[];
diff --git a/src/room.c b/src/room.c
index 76d09d83..8e8928d0 100644
--- a/src/room.c
+++ b/src/room.c
@@ -8,7 +8,7 @@
 #include "game.h"
 
 extern void sub_0804B058(EntityData* dat);
-extern void sub_0801AC98();
+extern void sub_0801AC98(void);
 extern u32 sub_08049D1C(u32);
 extern Entity* LoadRoomEntity(EntityData*);
 extern void* GetRoomProperty(u32, u32, u32);
@@ -17,8 +17,8 @@ extern void** gCurrentRoomProperties;
 extern void*** gAreaTable[];
 extern u8 gUnk_081091E4[];
 
-extern void sub_080186EC();
-extern void sub_0804B16C();
+extern void sub_080186EC(void);
+extern void sub_0804B16C(void);
 extern void ClearSmallChests(void);
 extern Entity* GetEmptyEntityByKind(u32 kind);
 
@@ -147,9 +147,9 @@ void sub_0804AFB0(void** properties) {
     }
 }
 
-u32 CallRoomProp6() {
+u32 CallRoomProp6(void) {
     u32 result;
-    u32 (*func)();
+    u32 (*func)(void);
 
     result = 1;
     func = (u32(*)())GetCurrentRoomProperty(6);
@@ -159,7 +159,7 @@ u32 CallRoomProp6() {
 }
 
 void CallRoomProp5And7(void) {
-    void (*func)();
+    void (*func)(void);
 
     sub_080186EC();
     func = (void (*)())GetCurrentRoomProperty(5);
@@ -219,7 +219,7 @@ void SetCurrentRoomPropertyList(u32 area, u32 room) {
 }
 
 void sub_0804B0E8(u32 arg0, u32 arg1) {
-    void (*func)();
+    void (*func)(void);
 
     // init function at index 4 of room data
     func = (void (*)())GetRoomProperty(arg0, arg1, 4);
diff --git a/src/roomInit.c b/src/roomInit.c
index 11bc69fb..5f6ee01a 100644
--- a/src/roomInit.c
+++ b/src/roomInit.c
@@ -1,150 +1,159 @@
 #include "global.h"
-
 #include "main.h"
 #include "common.h"
-
 #include "functions.h"
-
 #include "sound.h"
 #include "effects.h"
 #include "screen.h"
 #include "flags.h"
 #include "item.h"
 #include "save.h"
-
 #include "area.h"
 #include "game.h"
-
 #include "npc.h"
+#include "kinstone.h"
+
+extern u32 sub_08060354(void);
+extern void sub_08057E64(void);
+extern void sub_0809F814(u32);
+extern void sub_080300E8(void);
+extern void sub_08058D34(void);
+extern void sub_0807BB98(u32, u32, u32, u32);
+extern void sub_080AF2E4(void);
+extern void sub_08059994(void);
 
 static void sub_0804E150(void);
+static void sub_0804D0B4(void);
+static void sub_0804D9B0(void);
+static void sub_0804ED18(void);
+static void sub_0804F578(void);
 
 u32 sub_unk3_ArmosInteriors_RuinsEntranceNorth(u32 arg0) {
     return 1;
 }
 
-void sub_StateChange_ArmosInteriors_RuinsEntranceNorth() {
+void sub_StateChange_ArmosInteriors_RuinsEntranceNorth(void) {
     sub_08030118(0);
 }
 
-u32 sub_unk3_ArmosInteriors_RuinsEntranceSouth() {
+u32 sub_unk3_ArmosInteriors_RuinsEntranceSouth(void) {
     return 1;
 }
 
-void sub_StateChange_ArmosInteriors_RuinsEntranceSouth() {
+void sub_StateChange_ArmosInteriors_RuinsEntranceSouth(void) {
     sub_08030118(1);
 }
 
-u32 sub_unk3_ArmosInteriors_RuinsLeft() {
+u32 sub_unk3_ArmosInteriors_RuinsLeft(void) {
     return 1;
 }
 
-void sub_StateChange_ArmosInteriors_RuinsLeft() {
+void sub_StateChange_ArmosInteriors_RuinsLeft(void) {
     sub_08030118(2);
 }
 
-u32 sub_unk3_ArmosInteriors_RuinsMiddleLeft() {
+u32 sub_unk3_ArmosInteriors_RuinsMiddleLeft(void) {
     return 1;
 }
 
-void sub_StateChange_ArmosInteriors_RuinsMiddleLeft() {
+void sub_StateChange_ArmosInteriors_RuinsMiddleLeft(void) {
     sub_08030118(3);
 }
 
-u32 sub_unk3_ArmosInteriors_RuinsMiddleRight() {
+u32 sub_unk3_ArmosInteriors_RuinsMiddleRight(void) {
     return 1;
 }
 
-void sub_StateChange_ArmosInteriors_RuinsMiddleRight() {
+void sub_StateChange_ArmosInteriors_RuinsMiddleRight(void) {
     sub_08030118(4);
 }
 
-u32 sub_unk3_ArmosInteriors_RuinsRight() {
+u32 sub_unk3_ArmosInteriors_RuinsRight(void) {
     return 1;
 }
 
-void sub_StateChange_ArmosInteriors_RuinsRight() {
+void sub_StateChange_ArmosInteriors_RuinsRight(void) {
     sub_08030118(5);
 }
 
-u32 sub_unk3_ArmosInteriors_6() {
+u32 sub_unk3_ArmosInteriors_6(void) {
     return 1;
 }
 
-void sub_StateChange_ArmosInteriors_6() {
+void sub_StateChange_ArmosInteriors_6(void) {
     sub_08030118(6);
 }
 
-u32 sub_unk3_ArmosInteriors_RuinsGrassPath() {
+u32 sub_unk3_ArmosInteriors_RuinsGrassPath(void) {
     return 1;
 }
 
-void sub_StateChange_ArmosInteriors_RuinsGrassPath() {
+void sub_StateChange_ArmosInteriors_RuinsGrassPath(void) {
     sub_08030118(7);
 }
 
-u32 sub_unk3_ArmosInteriors_8() {
+u32 sub_unk3_ArmosInteriors_8(void) {
     return 1;
 }
 
-void sub_StateChange_ArmosInteriors_8() {
+void sub_StateChange_ArmosInteriors_8(void) {
     sub_08030118(8);
 }
 
-u32 sub_unk3_ArmosInteriors_FortressOfWindsLeft() {
+u32 sub_unk3_ArmosInteriors_FortressOfWindsLeft(void) {
     return 1;
 }
 
-void sub_StateChange_ArmosInteriors_FortressOfWindsLeft() {
+void sub_StateChange_ArmosInteriors_FortressOfWindsLeft(void) {
     sub_08030118(9);
     gArea.dungeon_idx = 3;
     gArea.areaMetadata = 0x4e;
 }
 
-u32 sub_unk3_ArmosInteriors_FortressOfWindsRight() {
+u32 sub_unk3_ArmosInteriors_FortressOfWindsRight(void) {
     return 1;
 }
 
-void sub_StateChange_ArmosInteriors_FortressOfWindsRight() {
+void sub_StateChange_ArmosInteriors_FortressOfWindsRight(void) {
     sub_08030118(10);
     gArea.dungeon_idx = 3;
     gArea.areaMetadata = 0x4e;
 }
 
-u32 sub_unk3_CrenelMinishPaths_CrenelBean() {
+u32 sub_unk3_CrenelMinishPaths_CrenelBean(void) {
     return 1;
 }
 
-void sub_StateChange_CrenelMinishPaths_CrenelBean() {
+void sub_StateChange_CrenelMinishPaths_CrenelBean(void) {
     sub_080575C8(35);
     sub_08057688();
 }
 
-u32 sub_unk3_CrenelMinishPaths_CrenelWater() {
+u32 sub_unk3_CrenelMinishPaths_CrenelWater(void) {
     return 1;
 }
 
-void sub_StateChange_CrenelMinishPaths_CrenelWater() {
+void sub_StateChange_CrenelMinishPaths_CrenelWater(void) {
     sub_080575C8(35);
 }
 
-void sub_unk1_CrenelMinishPaths_CrenelWater() {
+void sub_unk1_CrenelMinishPaths_CrenelWater(void) {
     sub_080575C8(35);
 }
 
-u32 sub_unk3_CrenelMinishPaths_Rainfall() {
+u32 sub_unk3_CrenelMinishPaths_Rainfall(void) {
     return 1;
 }
 
-void sub_StateChange_CrenelMinishPaths_Rainfall() {
+void sub_StateChange_CrenelMinishPaths_Rainfall(void) {
     sub_080580B0(34);
 }
 
-void sub_unk1_CrenelMinishPaths_Rainfall() {
+void sub_unk1_CrenelMinishPaths_Rainfall(void) {
     sub_080580B0(34);
 }
 
-u32 sub_unk3_CrenelMinishPaths_MelarisMine() {
+u32 sub_unk3_CrenelMinishPaths_MelarisMine(void) {
     return 1;
 }
 
@@ -155,59 +164,59 @@ void sub_StateChange_CrenelMinishPaths_MelarisMine(void) {
         SetGlobalFlag(WHITE_SWORD_END);
 }
 
-void sub_unk1_CrenelMinishPaths_MelarisMine() {
+void sub_unk1_CrenelMinishPaths_MelarisMine(void) {
     sub_080580B0(34);
 }
 
-u32 sub_unk3_MinishPaths1_ToMinishVillage() {
+u32 sub_unk3_MinishPaths1_ToMinishVillage(void) {
     return 1;
 }
 
-void sub_StateChange_MinishPaths1_ToMinishVillage() {
+void sub_StateChange_MinishPaths1_ToMinishVillage(void) {
     sub_080575C8(30);
 }
 
-void sub_unk1_MinishPaths1_ToMinishVillage() {
+void sub_unk1_MinishPaths1_ToMinishVillage(void) {
     sub_080575C8(30);
 }
 
-u32 sub_unk3_MinishPaths1_CastorWilds() {
+u32 sub_unk3_MinishPaths1_CastorWilds(void) {
     return 1;
 }
 
-void sub_StateChange_MinishPaths1_CastorWilds() {
+void sub_StateChange_MinishPaths1_CastorWilds(void) {
     sub_080575C8(33);
 }
 
-void sub_unk1_MinishPaths1_CastorWilds() {
+void sub_unk1_MinishPaths1_CastorWilds(void) {
     sub_080575C8(33);
 }
 
-u32 sub_unk3_MinishPaths1_HyruleTown() {
+u32 sub_unk3_MinishPaths1_HyruleTown(void) {
     return 1;
 }
 
-void sub_StateChange_MinishPaths1_HyruleTown() {
+void sub_StateChange_MinishPaths1_HyruleTown(void) {
     sub_080575C8(31);
 }
 
-void sub_unk1_MinishPaths1_HyruleTown() {
+void sub_unk1_MinishPaths1_HyruleTown(void) {
     sub_080575C8(31);
 }
 
-u32 sub_unk3_MinishPaths1_LonLonRanch() {
+u32 sub_unk3_MinishPaths1_LonLonRanch(void) {
     return 1;
 }
 
-void sub_StateChange_MinishPaths1_LonLonRanch() {
+void sub_StateChange_MinishPaths1_LonLonRanch(void) {
     sub_080575C8(32);
 }
 
-void sub_unk1_MinishPaths1_LonLonRanch() {
+void sub_unk1_MinishPaths1_LonLonRanch(void) {
     sub_080575C8(32);
 }
 
-u32 sub_unk3_MinishPaths1_MayorsCabin() {
+u32 sub_unk3_MinishPaths1_MayorsCabin(void) {
     return 1;
 }
 
@@ -221,11 +230,11 @@ void sub_StateChange_MinishPaths1_MayorsCabin(void) {
         LoadRoomEntityList(&Entities_MinishPaths1_MayorsCabin_gUnk_080D6138);
 }
 
-void sub_unk1_MinishPaths1_MayorsCabin() {
+void sub_unk1_MinishPaths1_MayorsCabin(void) {
     sub_080575C8(32);
 }
 
-u32 sub_unk3_HouseInteriors1_Mayor() {
+u32 sub_unk3_HouseInteriors1_Mayor(void) {
     return 1;
 }
 
@@ -237,7 +246,7 @@ void sub_StateChange_HouseInteriors1_Mayor(void) {
         LoadRoomEntityList(&Entities_HouseInteriors1_Mayor_080D6210);
 }
 
-u32 sub_unk3_HouseInteriors1_PostOffice() {
+u32 sub_unk3_HouseInteriors1_PostOffice(void) {
     return 1;
 }
 
@@ -313,7 +322,7 @@ void sub_StateChange_HouseInteriors1_PostOffice(void) {
         LoadRoomEntityList(&gUnk_080D6440);
 }
 
-u32 sub_unk3_HouseInteriors1_Library2F() {
+u32 sub_unk3_HouseInteriors1_Library2F(void) {
     return 1;
 }
 
@@ -336,7 +345,7 @@ void sub_StateChange_HouseInteriors1_Library2F(void) {
     LoadRoomEntityList(&gUnk_080D6618);
 }
 
-u32 sub_unk3_HouseInteriors1_Library1F() {
+u32 sub_unk3_HouseInteriors1_Library1F(void) {
     return 1;
 }
 
@@ -356,7 +365,7 @@ void sub_StateChange_HouseInteriors1_Library1F(void) {
     }
 }
 
-u32 sub_unk3_HouseInteriors1_Inn1F() {
+u32 sub_unk3_HouseInteriors1_Inn1F(void) {
     return 1;
 }
 
@@ -448,7 +457,7 @@ void sub_StateChange_HouseInteriors1_InnEastRoom(void) {
     }
 }
 
-u32 sub_unk3_HouseInteriors1_InnWest2F() {
+u32 sub_unk3_HouseInteriors1_InnWest2F(void) {
     return 1;
 }
 
@@ -492,21 +501,21 @@ void sub_StateChange_HouseInteriors1_InnWest2F(void) {
         LoadRoomEntityList(&UpperInn_Oracles);
 }
 
-u32 sub_unk3_HouseInteriors1_InnEast2F() {
+u32 sub_unk3_HouseInteriors1_InnEast2F(void) {
     return 1;
 }
 
-void sub_StateChange_HouseInteriors1_InnEast2F() {
+void sub_StateChange_HouseInteriors1_InnEast2F(void) {
 }
 
-u32 sub_unk3_HouseInteriors1_InnMinishHeartPiece() {
+u32 sub_unk3_HouseInteriors1_InnMinishHeartPiece(void) {
     return 1;
 }
 
-void sub_StateChange_HouseInteriors1_InnMinishHeartPiece() {
+void sub_StateChange_HouseInteriors1_InnMinishHeartPiece(void) {
 }
 
-u32 sub_unk3_HouseInteriors1_SchoolWest() {
+u32 sub_unk3_HouseInteriors1_SchoolWest(void) {
     return 1;
 }
 
@@ -521,7 +530,7 @@ void sub_StateChange_HouseInteriors1_SchoolWest(void) {
     }
 }
 
-u32 sub_unk3_HouseInteriors1_SchoolEast() {
+u32 sub_unk3_HouseInteriors1_SchoolEast(void) {
     return 1;
 }
 
@@ -610,7 +619,7 @@ void sub_StateChange_HyruleCastle_1(void) {
     }
 }
 
-u32 sub_unk3_HyruleCastle_2() {
+u32 sub_unk3_HyruleCastle_2(void) {
     return 1;
 }
 
@@ -639,7 +648,7 @@ void sub_StateChange_HyruleCastle_2(void) {
     }
 }
 
-u32 sub_unk3_HyruleCastle_3() {
+u32 sub_unk3_HyruleCastle_3(void) {
     return 1;
 }
 
@@ -696,95 +705,95 @@ void sub_StateChange_HyruleCastle_4(void) {
 
 extern ScreenTransitionData gUnk_0813AB80;
 
-void sub_0804BCDC() {
+void sub_0804BCDC(void) {
     sub_0808091C(&gUnk_0813AB80, TRANSITION_FADE_BLACK_SLOW);
 }
 
-u32 sub_unk3_HyruleCastle_5() {
+u32 sub_unk3_HyruleCastle_5(void) {
     return 1;
 }
 
-void sub_StateChange_HyruleCastle_5() {
+void sub_StateChange_HyruleCastle_5(void) {
 }
 
-u32 sub_unk3_87_Main() {
+u32 sub_unk3_87_Main(void) {
     return 1;
 }
 
-void sub_StateChange_87_Main() {
+void sub_StateChange_87_Main(void) {
 }
 
-u32 sub_unk3_45_Main() {
+u32 sub_unk3_45_Main(void) {
     return 1;
 }
 
-void sub_StateChange_45_Main() {
+void sub_StateChange_45_Main(void) {
 }
 
-u32 sub_unk3_4D_Main() {
+u32 sub_unk3_4D_Main(void) {
     return 1;
 }
 
-void sub_StateChange_4D_Main() {
+void sub_StateChange_4D_Main(void) {
 }
 
-u32 sub_unk3_57_Main() {
+u32 sub_unk3_57_Main(void) {
     return 1;
 }
 
-void sub_StateChange_57_Main() {
+void sub_StateChange_57_Main(void) {
 }
 
-u32 sub_unk3_5F_Main() {
+u32 sub_unk3_5F_Main(void) {
     return 1;
 }
 
-void sub_StateChange_5F_Main() {
+void sub_StateChange_5F_Main(void) {
 }
 
-u32 sub_unk3_67_Main() {
+u32 sub_unk3_67_Main(void) {
     return 1;
 }
 
-void sub_StateChange_67_Main() {
+void sub_StateChange_67_Main(void) {
 }
 
-u32 sub_unk3_6F_Main() {
+u32 sub_unk3_6F_Main(void) {
     return 1;
 }
 
-void sub_StateChange_6F_Main() {
+void sub_StateChange_6F_Main(void) {
 }
 
-u32 sub_unk3_77_Main() {
+u32 sub_unk3_77_Main(void) {
     return 1;
 }
 
-void sub_StateChange_77_Main() {
+void sub_StateChange_77_Main(void) {
 }
 
-u32 sub_unk3_7F_Main() {
+u32 sub_unk3_7F_Main(void) {
     return 1;
 }
 
-void sub_StateChange_7F_Main() {
+void sub_StateChange_7F_Main(void) {
 }
 
-u32 sub_unk3_8F_Main() {
+u32 sub_unk3_8F_Main(void) {
     return 1;
 }
 
-void sub_StateChange_8F_Main() {
+void sub_StateChange_8F_Main(void) {
 }
 
-u32 sub_unk3_GreatFairies_Entrance() {
+u32 sub_unk3_GreatFairies_Entrance(void) {
     return 1;
 }
 
-void sub_StateChange_GreatFairies_Entrance() {
+void sub_StateChange_GreatFairies_Entrance(void) {
 }
 
-u32 sub_unk3_GreatFairies_Exit() {
+u32 sub_unk3_GreatFairies_Exit(void) {
     return 1;
 }
 
@@ -801,42 +810,42 @@ void sub_StateChange_GreatFairies_Exit(void) {
     }
 }
 
-u32 sub_unk3_Dojos_Grayblade() {
+u32 sub_unk3_Dojos_Grayblade(void) {
     return 1;
 }
 
-void sub_StateChange_Dojos_Grayblade() {
+void sub_StateChange_Dojos_Grayblade(void) {
 }
 
-u32 sub_unk3_Dojos_Splitblade() {
+u32 sub_unk3_Dojos_Splitblade(void) {
     return 1;
 }
 
-void sub_StateChange_Dojos_Splitblade() {
+void sub_StateChange_Dojos_Splitblade(void) {
 }
 
-u32 sub_unk3_Dojos_Greatblade() {
+u32 sub_unk3_Dojos_Greatblade(void) {
     return 1;
 }
 
-void sub_StateChange_Dojos_Greatblade() {
+void sub_StateChange_Dojos_Greatblade(void) {
 }
 
-u32 sub_unk3_Dojos_Scarblade() {
+u32 sub_unk3_Dojos_Scarblade(void) {
     return 1;
 }
 
-void sub_StateChange_Dojos_Scarblade() {
+void sub_StateChange_Dojos_Scarblade(void) {
 }
 
-u32 sub_unk3_Dojos_Swiftblade() {
+u32 sub_unk3_Dojos_Swiftblade(void) {
     return 1;
 }
 
-void sub_StateChange_Dojos_Swiftblade() {
+void sub_StateChange_Dojos_Swiftblade(void) {
 }
 
-u32 sub_unk3_Dojos_Grimblade() {
+u32 sub_unk3_Dojos_Grimblade(void) {
     return 1;
 }
 
@@ -852,70 +861,70 @@ void sub_StateChange_Dojos_Grimblade(void) {
     }
 }
 
-u32 sub_unk3_Dojos_Waveblade() {
+u32 sub_unk3_Dojos_Waveblade(void) {
     return 1;
 }
 
-void sub_StateChange_Dojos_Waveblade() {
+void sub_StateChange_Dojos_Waveblade(void) {
 }
 
-u32 sub_unk3_Dojos_7() {
+u32 sub_unk3_Dojos_7(void) {
     return 1;
 }
 
-void sub_StateChange_Dojos_7() {
+void sub_StateChange_Dojos_7(void) {
 }
 
-u32 sub_unk3_Dojos_8() {
+u32 sub_unk3_Dojos_8(void) {
     return 1;
 }
 
-void sub_StateChange_Dojos_8() {
+void sub_StateChange_Dojos_8(void) {
 }
 
-u32 sub_unk3_Dojos_9() {
+u32 sub_unk3_Dojos_9(void) {
     return 1;
 }
 
-void sub_StateChange_Dojos_9() {
+void sub_StateChange_Dojos_9(void) {
 }
 
-u32 sub_unk3_Dojos_ToGrimblade() {
+u32 sub_unk3_Dojos_ToGrimblade(void) {
     return 1;
 }
 
-void sub_StateChange_Dojos_ToGrimblade() {
+void sub_StateChange_Dojos_ToGrimblade(void) {
 }
 
-u32 sub_unk3_Dojos_ToSplitblade() {
+u32 sub_unk3_Dojos_ToSplitblade(void) {
     return 1;
 }
 
-void sub_StateChange_Dojos_ToSplitblade() {
+void sub_StateChange_Dojos_ToSplitblade(void) {
 }
 
-u32 sub_unk3_Dojos_ToGreatblade() {
+u32 sub_unk3_Dojos_ToGreatblade(void) {
     return 1;
 }
 
-void sub_StateChange_Dojos_ToGreatblade() {
+void sub_StateChange_Dojos_ToGreatblade(void) {
 }
 
-u32 sub_unk3_Dojos_ToScarblade() {
+u32 sub_unk3_Dojos_ToScarblade(void) {
     return 1;
 }
 
-void sub_StateChange_Dojos_ToScarblade() {
+void sub_StateChange_Dojos_ToScarblade(void) {
 }
 
-u32 sub_unk3_GoronCave_StairsToCave() {
+u32 sub_unk3_GoronCave_StairsToCave(void) {
     return 1;
 }
 
-void sub_StateChange_GoronCave_StairsToCave() {
+void sub_StateChange_GoronCave_StairsToCave(void) {
 }
 
-u32 sub_unk3_GoronCave_Main() {
+u32 sub_unk3_GoronCave_Main(void) {
     return 1;
 }
 
@@ -1011,14 +1020,14 @@ void sub_0804BF38(u32 arg0, struct_0804BF38* arg1)
 ASM_FUNC("asm/non_matching/sub_0804BF38.inc", void sub_0804BF38(Entity* this, ScriptExecutionContext* context))
 #endif
 
-u32 sub_unk3_EzloAuxCutscene_Main() {
+u32 sub_unk3_EzloAuxCutscene_Main(void) {
     return 1;
 }
 
-void sub_StateChange_EzloAuxCutscene_Main() {
+void sub_StateChange_EzloAuxCutscene_Main(void) {
 }
 
-u32 sub_unk3_RoyalValley_Main() {
+u32 sub_unk3_RoyalValley_Main(void) {
     return 1;
 }
 
@@ -1055,7 +1064,7 @@ void sub_StateChange_RoyalValley_Main(void) {
     ClearGlobalFlag(MAZE_CLEAR);
 }
 
-u32 sub_unk3_RoyalValley_ForestMaze() {
+u32 sub_unk3_RoyalValley_ForestMaze(void) {
     return 1;
 }
 
@@ -1070,37 +1079,37 @@ ASM_FUNC("asm/non_matching/sub_0804C258.inc", void sub_0804C258(void))
 
 ASM_FUNC("asm/non_matching/sub_0804C290.inc", void sub_0804C290(void))
 
-u32 sub_unk3_RoyalValleyGraves_HeartPiece() {
+u32 sub_unk3_RoyalValleyGraves_HeartPiece(void) {
     return 1;
 }
 
-void sub_StateChange_RoyalValleyGraves_HeartPiece() {
+void sub_StateChange_RoyalValleyGraves_HeartPiece(void) {
 }
 
-u32 sub_unk3_RoyalValleyGraves_Gina() {
+u32 sub_unk3_RoyalValleyGraves_Gina(void) {
     return 1;
 }
 
-void sub_StateChange_RoyalValleyGraves_Gina() {
+void sub_StateChange_RoyalValleyGraves_Gina(void) {
 }
 
-u32 sub_unk3_MinishRafters_Cafe() {
+u32 sub_unk3_MinishRafters_Cafe(void) {
     return 1;
 }
 
-void sub_StateChange_MinishRafters_Cafe() {
+void sub_StateChange_MinishRafters_Cafe(void) {
     sub_08058324(0);
 }
 
-u32 sub_unk3_MinishRafters_Stockwell() {
+u32 sub_unk3_MinishRafters_Stockwell(void) {
     return 1;
 }
 
-void sub_StateChange_MinishRafters_Stockwell() {
+void sub_StateChange_MinishRafters_Stockwell(void) {
     sub_08058324(1);
 }
 
-u32 sub_unk3_MinishRafters_DrLeft() {
+u32 sub_unk3_MinishRafters_DrLeft(void) {
     return 1;
 }
 
@@ -1114,19 +1123,19 @@ void sub_StateChange_MinishRafters_DrLeft(void) {
         LoadRoomEntityList(&gUnk_080D9800);
 }
 
-void sub_unk1_MinishRafters_DrLeft() {
+void sub_unk1_MinishRafters_DrLeft(void) {
     sub_StateChange_MinishRafters_DrLeft();
 }
 
-u32 sub_unk3_MinishRafters_Bakery() {
+u32 sub_unk3_MinishRafters_Bakery(void) {
     return 1;
 }
 
-void sub_StateChange_MinishRafters_Bakery() {
+void sub_StateChange_MinishRafters_Bakery(void) {
     sub_08058324(3);
 }
 
-u32 sub_unk3_CastorWilds_Main() {
+u32 sub_unk3_CastorWilds_Main(void) {
     return 1;
 }
 
@@ -1153,39 +1162,39 @@ void sub_unk1_CastorWilds_Main(void) {
         LoadRoomEntityList(&gUnk_080D9CE8);
 }
 
-u32 sub_unk3_CastorCaves_South() {
+u32 sub_unk3_CastorCaves_South(void) {
     return 1;
 }
 
-void sub_StateChange_CastorCaves_South() {
+void sub_StateChange_CastorCaves_South(void) {
 }
 
-u32 sub_unk3_CastorCaves_North() {
+u32 sub_unk3_CastorCaves_North(void) {
     return 1;
 }
 
-void sub_StateChange_CastorCaves_North() {
+void sub_StateChange_CastorCaves_North(void) {
 }
 
-u32 sub_unk3_CastorCaves_WindRuins() {
+u32 sub_unk3_CastorCaves_WindRuins(void) {
     return 1;
 }
 
-void sub_StateChange_CastorCaves_WindRuins() {
+void sub_StateChange_CastorCaves_WindRuins(void) {
 }
 
-u32 sub_unk3_CastorCaves_Darknut() {
+u32 sub_unk3_CastorCaves_Darknut(void) {
     return 1;
 }
 
-void sub_StateChange_CastorCaves_Darknut() {
+void sub_StateChange_CastorCaves_Darknut(void) {
 }
 
-u32 sub_unk3_CastorCaves_HeartPiece() {
+u32 sub_unk3_CastorCaves_HeartPiece(void) {
     return 1;
 }
 
-void sub_StateChange_CastorCaves_HeartPiece() {
+void sub_StateChange_CastorCaves_HeartPiece(void) {
 }
 
 extern u32 gUnk_080DA230;
@@ -1197,124 +1206,124 @@ u32 sub_unk3_CastorDarknut_Main(void) {
     return 1;
 }
 
-void sub_StateChange_CastorDarknut_Main() {
+void sub_StateChange_CastorDarknut_Main(void) {
 }
 
-u32 sub_unk3_CastorDarknut_Hall() {
+u32 sub_unk3_CastorDarknut_Hall(void) {
     return 1;
 }
 
-void sub_StateChange_CastorDarknut_Hall() {
+void sub_StateChange_CastorDarknut_Hall(void) {
 }
 
-u32 sub_unk3_GreatFairies_Graveyard() {
+u32 sub_unk3_GreatFairies_Graveyard(void) {
     return 1;
 }
 
-void sub_StateChange_GreatFairies_Graveyard() {
+void sub_StateChange_GreatFairies_Graveyard(void) {
 }
 
-u32 sub_unk3_GreatFairies_MinishWoods() {
+u32 sub_unk3_GreatFairies_MinishWoods(void) {
     return 1;
 }
 
-void sub_StateChange_GreatFairies_MinishWoods() {
+void sub_StateChange_GreatFairies_MinishWoods(void) {
 }
 
-u32 sub_unk3_GreatFairies_MtCrenel() {
+u32 sub_unk3_GreatFairies_MtCrenel(void) {
     return 1;
 }
 
-void sub_StateChange_GreatFairies_MtCrenel() {
+void sub_StateChange_GreatFairies_MtCrenel(void) {
 }
 
-u32 sub_unk3_GardenFountains_East() {
+u32 sub_unk3_GardenFountains_East(void) {
     return 1;
 }
 
-void sub_StateChange_GardenFountains_East() {
+void sub_StateChange_GardenFountains_East(void) {
 }
 
-u32 sub_unk3_GardenFountains_West() {
+u32 sub_unk3_GardenFountains_West(void) {
     return 1;
 }
 
-void sub_StateChange_GardenFountains_West() {
+void sub_StateChange_GardenFountains_West(void) {
 }
 
-u32 sub_unk3_MinishHouseInteriors_GentariMain() {
+u32 sub_unk3_MinishHouseInteriors_GentariMain(void) {
     return 1;
 }
 
-void sub_StateChange_MinishHouseInteriors_GentariMain() {
+void sub_StateChange_MinishHouseInteriors_GentariMain(void) {
     sub_0801AFE4();
 }
 
-u32 sub_unk3_MinishHouseInteriors_GentariExit() {
+u32 sub_unk3_MinishHouseInteriors_GentariExit(void) {
     return 1;
 }
 
-void sub_StateChange_MinishHouseInteriors_GentariExit() {
+void sub_StateChange_MinishHouseInteriors_GentariExit(void) {
     sub_0801AFE4();
 }
 
-u32 sub_unk3_MinishHouseInteriors_Festari() {
+u32 sub_unk3_MinishHouseInteriors_Festari(void) {
     return 1;
 }
 
-void sub_StateChange_MinishHouseInteriors_Festari() {
+void sub_StateChange_MinishHouseInteriors_Festari(void) {
     sub_0801AFE4();
 }
 
-u32 sub_unk3_MinishHouseInteriors_Red() {
+u32 sub_unk3_MinishHouseInteriors_Red(void) {
     return 1;
 }
 
-void sub_StateChange_MinishHouseInteriors_Red() {
+void sub_StateChange_MinishHouseInteriors_Red(void) {
     sub_0801AFE4();
 }
 
-u32 sub_unk3_MinishHouseInteriors_Green() {
+u32 sub_unk3_MinishHouseInteriors_Green(void) {
     return 1;
 }
 
-void sub_StateChange_MinishHouseInteriors_Green() {
+void sub_StateChange_MinishHouseInteriors_Green(void) {
     sub_0801AFE4();
 }
 
-u32 sub_unk3_MinishHouseInteriors_Blue() {
+u32 sub_unk3_MinishHouseInteriors_Blue(void) {
     return 1;
 }
 
-void sub_StateChange_MinishHouseInteriors_Blue() {
+void sub_StateChange_MinishHouseInteriors_Blue(void) {
     sub_0801AFE4();
 }
 
-u32 sub_unk3_MinishHouseInteriors_SideArea() {
+u32 sub_unk3_MinishHouseInteriors_SideArea(void) {
     return 1;
 }
 
-void sub_StateChange_MinishHouseInteriors_SideArea() {
+void sub_StateChange_MinishHouseInteriors_SideArea(void) {
     sub_0801AFE4();
 }
 
-u32 sub_unk3_MinishHouseInteriors_ShoeMinish() {
+u32 sub_unk3_MinishHouseInteriors_ShoeMinish(void) {
     return 1;
 }
 
-void sub_StateChange_MinishHouseInteriors_ShoeMinish() {
+void sub_StateChange_MinishHouseInteriors_ShoeMinish(void) {
     sub_0801AFE4();
 }
 
-u32 sub_unk3_MinishHouseInteriors_PotMinish() {
+u32 sub_unk3_MinishHouseInteriors_PotMinish(void) {
     return 1;
 }
 
-void sub_StateChange_MinishHouseInteriors_PotMinish() {
+void sub_StateChange_MinishHouseInteriors_PotMinish(void) {
     sub_0801AFE4();
 }
 
-u32 sub_unk3_MinishHouseInteriors_BarrelMinish() {
+u32 sub_unk3_MinishHouseInteriors_BarrelMinish(void) {
     return 1;
 }
 
@@ -1386,7 +1395,7 @@ void sub_StateChange_MinishHouseInteriors_BarrelMinish(void) {
     sub_0801AFE4();
 }
 
-u32 sub_unk3_MinishHouseInteriors_MelariMinesSouthwest() {
+u32 sub_unk3_MinishHouseInteriors_MelariMinesSouthwest(void) {
     return 1;
 }
 
@@ -1399,7 +1408,7 @@ void sub_StateChange_MinishHouseInteriors_MelariMinesSouthwest(void) {
     sub_0801AFE4();
 }
 
-u32 sub_unk3_MinishHouseInteriors_MelariMinesSoutheast() {
+u32 sub_unk3_MinishHouseInteriors_MelariMinesSoutheast(void) {
     return 1;
 }
 
@@ -1412,7 +1421,7 @@ void sub_StateChange_MinishHouseInteriors_MelariMinesSoutheast(void) {
     sub_0801AFE4();
 }
 
-u32 sub_unk3_MinishHouseInteriors_MelariMinesEast() {
+u32 sub_unk3_MinishHouseInteriors_MelariMinesEast(void) {
     return 1;
 }
 
@@ -1425,31 +1434,31 @@ void sub_StateChange_MinishHouseInteriors_MelariMinesEast(void) {
     sub_0801AFE4();
 }
 
-u32 sub_unk3_MinishHouseInteriors_HyruleFieldSouthwest() {
+u32 sub_unk3_MinishHouseInteriors_HyruleFieldSouthwest(void) {
     return 1;
 }
 
-void sub_StateChange_MinishHouseInteriors_HyruleFieldSouthwest() {
+void sub_StateChange_MinishHouseInteriors_HyruleFieldSouthwest(void) {
     sub_0801AFE4();
 }
 
-u32 sub_unk3_MinishHouseInteriors_HyruleFieldOutsideLinksHouse() {
+u32 sub_unk3_MinishHouseInteriors_HyruleFieldOutsideLinksHouse(void) {
     return 1;
 }
 
-void sub_StateChange_MinishHouseInteriors_HyruleFieldOutsideLinksHouse() {
+void sub_StateChange_MinishHouseInteriors_HyruleFieldOutsideLinksHouse(void) {
     sub_0801AFE4();
 }
 
-u32 sub_unk3_MinishHouseInteriors_NextToKnuckle() {
+u32 sub_unk3_MinishHouseInteriors_NextToKnuckle(void) {
     return 1;
 }
 
-void sub_StateChange_MinishHouseInteriors_NextToKnuckle() {
+void sub_StateChange_MinishHouseInteriors_NextToKnuckle(void) {
     sub_0801AFE4();
 }
 
-u32 sub_unk3_MinishHouseInteriors_Librari() {
+u32 sub_unk3_MinishHouseInteriors_Librari(void) {
     return 1;
 }
 
@@ -1462,39 +1471,39 @@ void sub_StateChange_MinishHouseInteriors_Librari(void) {
     sub_0801AFE4();
 }
 
-u32 sub_unk3_MinishHouseInteriors_HyruleFieldExit() {
+u32 sub_unk3_MinishHouseInteriors_HyruleFieldExit(void) {
     return 1;
 }
 
-void sub_StateChange_MinishHouseInteriors_HyruleFieldExit() {
+void sub_StateChange_MinishHouseInteriors_HyruleFieldExit(void) {
     sub_0801AFE4();
 }
 
-u32 sub_unk3_MinishHouseInteriors_HyruleTown() {
+u32 sub_unk3_MinishHouseInteriors_HyruleTown(void) {
     return 1;
 }
 
-void sub_StateChange_MinishHouseInteriors_HyruleTown() {
+void sub_StateChange_MinishHouseInteriors_HyruleTown(void) {
     sub_0801AFE4();
 }
 
-u32 sub_unk3_MinishHouseInteriors_MinishWoodsBomb() {
+u32 sub_unk3_MinishHouseInteriors_MinishWoodsBomb(void) {
     return 1;
 }
 
-void sub_StateChange_MinishHouseInteriors_MinishWoodsBomb() {
+void sub_StateChange_MinishHouseInteriors_MinishWoodsBomb(void) {
     sub_0801AFE4();
 }
 
-u32 sub_unk3_MinishHouseInteriors_LakeHyliaOcarina() {
+u32 sub_unk3_MinishHouseInteriors_LakeHyliaOcarina(void) {
     return 1;
 }
 
-void sub_StateChange_MinishHouseInteriors_LakeHyliaOcarina() {
+void sub_StateChange_MinishHouseInteriors_LakeHyliaOcarina(void) {
     sub_0801AFE4();
 }
 
-u32 sub_unk3_TownMinishHoles_MayorsHouse() {
+u32 sub_unk3_TownMinishHoles_MayorsHouse(void) {
     return 1;
 }
 
@@ -1510,43 +1519,43 @@ void sub_StateChange_TownMinishHoles_MayorsHouse(void) {
     sub_0801AFE4();
 }
 
-u32 sub_unk3_TownMinishHoles_WestOracle() {
+u32 sub_unk3_TownMinishHoles_WestOracle(void) {
     return 1;
 }
 
-void sub_StateChange_TownMinishHoles_WestOracle() {
+void sub_StateChange_TownMinishHoles_WestOracle(void) {
     sub_0801AFE4();
 }
 
-u32 sub_unk3_TownMinishHoles_DrLeft() {
+u32 sub_unk3_TownMinishHoles_DrLeft(void) {
     return 1;
 }
 
-void sub_StateChange_TownMinishHoles_DrLeft() {
+void sub_StateChange_TownMinishHoles_DrLeft(void) {
     sub_0801AFE4();
 }
 
-u32 sub_unk3_TownMinishHoles_Carpenter() {
+u32 sub_unk3_TownMinishHoles_Carpenter(void) {
     return 1;
 }
 
-void sub_StateChange_TownMinishHoles_Carpenter() {
+void sub_StateChange_TownMinishHoles_Carpenter(void) {
     sub_0801AFE4();
 }
 
-u32 sub_unk3_TownMinishHoles_Cafe() {
+u32 sub_unk3_TownMinishHoles_Cafe(void) {
     return 1;
 }
 
-void sub_StateChange_TownMinishHoles_Cafe() {
+void sub_StateChange_TownMinishHoles_Cafe(void) {
     sub_0801AFE4();
 }
 
-u32 sub_unk3_TownMinishHoles_5() {
+u32 sub_unk3_TownMinishHoles_5(void) {
     return 1;
 }
 
-void sub_StateChange_TownMinishHoles_5() {
+void sub_StateChange_TownMinishHoles_5(void) {
     sub_0801AFE4();
 }
 
@@ -1570,7 +1579,7 @@ void sub_StateChange_TownMinishHoles_LibraryBookshelf(void) {
     sub_0801AFE4();
 }
 
-u32 sub_unk3_TownMinishHoles_LibrariBookHouse() {
+u32 sub_unk3_TownMinishHoles_LibrariBookHouse(void) {
     return 1;
 }
 
@@ -1583,7 +1592,7 @@ void sub_StateChange_TownMinishHoles_LibrariBookHouse(void) {
     sub_0801AFE4();
 }
 
-u32 sub_unk3_TownMinishHoles_RemShoeShop() {
+u32 sub_unk3_TownMinishHoles_RemShoeShop(void) {
     return 1;
 }
 
@@ -1617,77 +1626,77 @@ void sub_StateChange_TownMinishHoles_RemShoeShop(void) {
     sub_0801AFE4();
 }
 
-u32 sub_unk3_MinishCaves_BeanPesto() {
+u32 sub_unk3_MinishCaves_BeanPesto(void) {
     return 1;
 }
 
-void sub_StateChange_MinishCaves_BeanPesto() {
+void sub_StateChange_MinishCaves_BeanPesto(void) {
 }
 
-u32 sub_unk3_MinishCaves_SoutheastWater1() {
+u32 sub_unk3_MinishCaves_SoutheastWater1(void) {
     return 1;
 }
 
-void sub_StateChange_MinishCaves_SoutheastWater1() {
+void sub_StateChange_MinishCaves_SoutheastWater1(void) {
 }
 
-u32 sub_unk3_MinishCaves_SoutheastWater2() {
+u32 sub_unk3_MinishCaves_SoutheastWater2(void) {
     return 1;
 }
 
-void sub_StateChange_MinishCaves_SoutheastWater2() {
+void sub_StateChange_MinishCaves_SoutheastWater2(void) {
 }
 
-u32 sub_unk3_MinishCaves_Ruins() {
+u32 sub_unk3_MinishCaves_Ruins(void) {
     return 1;
 }
 
-void sub_StateChange_MinishCaves_Ruins() {
+void sub_StateChange_MinishCaves_Ruins(void) {
 }
 
-u32 sub_unk3_MinishCaves_OutsideLinksHouse() {
+u32 sub_unk3_MinishCaves_OutsideLinksHouse(void) {
     return 1;
 }
 
-void sub_StateChange_MinishCaves_OutsideLinksHouse() {
+void sub_StateChange_MinishCaves_OutsideLinksHouse(void) {
 }
 
-u32 sub_unk3_MinishCaves_MinishWoodsNorth1() {
+u32 sub_unk3_MinishCaves_MinishWoodsNorth1(void) {
     return 1;
 }
 
-void sub_StateChange_MinishCaves_MinishWoodsNorth1() {
+void sub_StateChange_MinishCaves_MinishWoodsNorth1(void) {
 }
 
-u32 sub_unk3_MinishCaves_MinishWoodsNorth2() {
+u32 sub_unk3_MinishCaves_MinishWoodsNorth2(void) {
     return 1;
 }
 
-void sub_StateChange_MinishCaves_MinishWoodsNorth2() {
+void sub_StateChange_MinishCaves_MinishWoodsNorth2(void) {
 }
 
-u32 sub_unk3_MinishCaves_LakeHyliaNorth() {
+u32 sub_unk3_MinishCaves_LakeHyliaNorth(void) {
     return 1;
 }
 
-void sub_StateChange_MinishCaves_LakeHyliaNorth() {
+void sub_StateChange_MinishCaves_LakeHyliaNorth(void) {
 }
 
-u32 sub_unk3_MinishCaves_LakeHyliaLibrari() {
+u32 sub_unk3_MinishCaves_LakeHyliaLibrari(void) {
     return 1;
 }
 
-void sub_StateChange_MinishCaves_LakeHyliaLibrari() {
+void sub_StateChange_MinishCaves_LakeHyliaLibrari(void) {
 }
 
-u32 sub_unk3_MinishCaves_MinishWoodsSouthwest() {
+u32 sub_unk3_MinishCaves_MinishWoodsSouthwest(void) {
     return 1;
 }
 
-void sub_StateChange_MinishCaves_MinishWoodsSouthwest() {
+void sub_StateChange_MinishCaves_MinishWoodsSouthwest(void) {
 }
 
-u32 sub_unk3_MinishVillage_Main() {
+u32 sub_unk3_MinishVillage_Main(void) {
     return 1;
 }
 
@@ -1719,11 +1728,11 @@ void sub_StateChange_MinishVillage_Main(void) {
     sub_08057E64();
 }
 
-u32 sub_unk3_MinishVillage_SideHouse() {
+u32 sub_unk3_MinishVillage_SideHouse(void) {
     return 1;
 }
 
-void sub_StateChange_MinishVillage_SideHouse() {
+void sub_StateChange_MinishVillage_SideHouse(void) {
 }
 
 typedef struct {
@@ -1739,77 +1748,77 @@ void sub_unk2_MinishVillage_SideHouse(void) {
     LoadPaletteGroup(0x19);
 }
 
-u32 sub_unk3_CastleGardenMinishHoles_East() {
+u32 sub_unk3_CastleGardenMinishHoles_East(void) {
     return 1;
 }
 
-void sub_StateChange_CastleGardenMinishHoles_East() {
+void sub_StateChange_CastleGardenMinishHoles_East(void) {
 }
 
-u32 sub_unk3_CastleGardenMinishHoles_West() {
+u32 sub_unk3_CastleGardenMinishHoles_West(void) {
     return 1;
 }
 
-void sub_StateChange_CastleGardenMinishHoles_West() {
+void sub_StateChange_CastleGardenMinishHoles_West(void) {
 }
 
-u32 sub_unk3_37_0() {
+u32 sub_unk3_37_0(void) {
     return 1;
 }
 
-void sub_StateChange_37_0() {
+void sub_StateChange_37_0(void) {
 }
 
-u32 sub_unk3_37_1() {
+u32 sub_unk3_37_1(void) {
     return 1;
 }
 
-void sub_StateChange_37_1() {
+void sub_StateChange_37_1(void) {
 }
 
-u32 sub_unk3_MinishCracks_LonLonRanchNorth() {
+u32 sub_unk3_MinishCracks_LonLonRanchNorth(void) {
     return 1;
 }
 
-void sub_StateChange_MinishCracks_LonLonRanchNorth() {
+void sub_StateChange_MinishCracks_LonLonRanchNorth(void) {
 }
 
-u32 sub_unk3_MinishCracks_LakeHyliaEast() {
+u32 sub_unk3_MinishCracks_LakeHyliaEast(void) {
     return 1;
 }
 
-void sub_StateChange_MinishCracks_LakeHyliaEast() {
+void sub_StateChange_MinishCracks_LakeHyliaEast(void) {
 }
 
-u32 sub_unk3_MinishCracks_HyruleCastleGarden() {
+u32 sub_unk3_MinishCracks_HyruleCastleGarden(void) {
     return 1;
 }
 
-void sub_StateChange_MinishCracks_HyruleCastleGarden() {
+void sub_StateChange_MinishCracks_HyruleCastleGarden(void) {
 }
 
-u32 sub_unk3_MinishCracks_MtCrenel() {
+u32 sub_unk3_MinishCracks_MtCrenel(void) {
     return 1;
 }
 
-void sub_StateChange_MinishCracks_MtCrenel() {
+void sub_StateChange_MinishCracks_MtCrenel(void) {
 }
 
-u32 sub_unk3_MinishCracks_EastHyruleCastle() {
+u32 sub_unk3_MinishCracks_EastHyruleCastle(void) {
     return 1;
 }
 
-void sub_StateChange_MinishCracks_EastHyruleCastle() {
+void sub_StateChange_MinishCracks_EastHyruleCastle(void) {
 }
 
-u32 sub_unk3_MinishCracks_5() {
+u32 sub_unk3_MinishCracks_5(void) {
     return 1;
 }
 
-void sub_StateChange_MinishCracks_5() {
+void sub_StateChange_MinishCracks_5(void) {
 }
 
-u32 sub_unk3_MinishCracks_CastleWildsBowHole() {
+u32 sub_unk3_MinishCracks_CastleWildsBowHole(void) {
     return 1;
 }
 
@@ -1821,84 +1830,84 @@ void sub_StateChange_MinishCracks_CastleWildsBowHole(void) {
     }
 }
 
-u32 sub_unk3_MinishCracks_RuinsEntrance() {
+u32 sub_unk3_MinishCracks_RuinsEntrance(void) {
     return 1;
 }
 
-void sub_StateChange_MinishCracks_RuinsEntrance() {
+void sub_StateChange_MinishCracks_RuinsEntrance(void) {
 }
 
-u32 sub_unk3_MinishCracks_MinishWoodsSouth() {
+u32 sub_unk3_MinishCracks_MinishWoodsSouth(void) {
     return 1;
 }
 
-void sub_StateChange_MinishCracks_MinishWoodsSouth() {
+void sub_StateChange_MinishCracks_MinishWoodsSouth(void) {
 }
 
-u32 sub_unk3_MinishCracks_CastorWildsNorth() {
+u32 sub_unk3_MinishCracks_CastorWildsNorth(void) {
     return 1;
 }
 
-void sub_StateChange_MinishCracks_CastorWildsNorth() {
+void sub_StateChange_MinishCracks_CastorWildsNorth(void) {
 }
 
-u32 sub_unk3_MinishCracks_CastorWildsWest() {
+u32 sub_unk3_MinishCracks_CastorWildsWest(void) {
     return 1;
 }
 
-void sub_StateChange_MinishCracks_CastorWildsWest() {
+void sub_StateChange_MinishCracks_CastorWildsWest(void) {
 }
 
-u32 sub_unk3_MinishCracks_CastorWildsMiddle() {
+u32 sub_unk3_MinishCracks_CastorWildsMiddle(void) {
     return 1;
 }
 
-void sub_StateChange_MinishCracks_CastorWildsMiddle() {
+void sub_StateChange_MinishCracks_CastorWildsMiddle(void) {
 }
 
-u32 sub_unk3_MinishCracks_RuinsTektite() {
+u32 sub_unk3_MinishCracks_RuinsTektite(void) {
     return 1;
 }
 
-void sub_StateChange_MinishCracks_RuinsTektite() {
+void sub_StateChange_MinishCracks_RuinsTektite(void) {
 }
 
-u32 sub_unk3_MinishCracks_CastorWildsNextToBow() {
+u32 sub_unk3_MinishCracks_CastorWildsNextToBow(void) {
     return 1;
 }
 
-void sub_StateChange_MinishCracks_CastorWildsNextToBow() {
+void sub_StateChange_MinishCracks_CastorWildsNextToBow(void) {
 }
 
-u32 sub_unk3_MinishCracks_E() {
+u32 sub_unk3_MinishCracks_E(void) {
     return 1;
 }
 
-void sub_StateChange_MinishCracks_E() {
+void sub_StateChange_MinishCracks_E(void) {
 }
 
-u32 sub_unk3_MinishCracks_F() {
+u32 sub_unk3_MinishCracks_F(void) {
     return 1;
 }
 
-void sub_StateChange_MinishCracks_F() {
+void sub_StateChange_MinishCracks_F(void) {
 }
 
-u32 sub_unk3_MinishCracks_10() {
+u32 sub_unk3_MinishCracks_10(void) {
     return 1;
 }
 
-void sub_StateChange_MinishCracks_10() {
+void sub_StateChange_MinishCracks_10(void) {
 }
 
-u32 sub_unk3_MinishCracks_11() {
+u32 sub_unk3_MinishCracks_11(void) {
     return 1;
 }
 
-void sub_StateChange_MinishCracks_11() {
+void sub_StateChange_MinishCracks_11(void) {
 }
 
-u32 sub_unk3_MelarisMine_Main() {
+u32 sub_unk3_MelarisMine_Main(void) {
     return 1;
 }
 
@@ -1918,7 +1927,7 @@ void sub_StateChange_MelarisMine_Main(void) {
     SetLocalFlag(0x8e);
 }
 
-u32 sub_unk3_CloudTops_House() {
+u32 sub_unk3_CloudTops_House(void) {
     return 1;
 }
 
@@ -1936,14 +1945,14 @@ void sub_unk1_CloudTops_House(void) {
     }
 }
 
-u32 sub_unk3_CloudTops_Middle() {
+u32 sub_unk3_CloudTops_Middle(void) {
     return 1;
 }
 
-void sub_StateChange_CloudTops_Middle() {
+void sub_StateChange_CloudTops_Middle(void) {
 }
 
-u32 sub_unk3_CloudTops_Bottom() {
+u32 sub_unk3_CloudTops_Bottom(void) {
     return 1;
 }
 
@@ -1975,11 +1984,11 @@ void sub_StateChange_CloudTops_Bottom(void) {
     }
 }
 
-u32 sub_unk3_Ruins_Entrance() {
+u32 sub_unk3_Ruins_Entrance(void) {
     return 1;
 }
 
-void sub_StateChange_Ruins_Entrance() {
+void sub_StateChange_Ruins_Entrance(void) {
     sub_080300E8();
 #if defined(JP) || defined(EU) || defined(DEMO_JP)
     SetLocalFlag(0x25);
@@ -1988,14 +1997,14 @@ void sub_StateChange_Ruins_Entrance() {
 #endif
 }
 
-u32 sub_unk3_Ruins_Beanstalk() {
+u32 sub_unk3_Ruins_Beanstalk(void) {
     return 1;
 }
 
-void sub_StateChange_Ruins_Beanstalk() {
+void sub_StateChange_Ruins_Beanstalk(void) {
 }
 
-u32 sub_unk3_Ruins_TripleTektites() {
+u32 sub_unk3_Ruins_TripleTektites(void) {
     return 1;
 }
 
@@ -2014,14 +2023,14 @@ void sub_unk1_Ruins_TripleTektites(void) {
     }
 }
 
-u32 sub_unk3_Ruins_LadderToTektites() {
+u32 sub_unk3_Ruins_LadderToTektites(void) {
     return 1;
 }
 
-void sub_StateChange_Ruins_LadderToTektites() {
+void sub_StateChange_Ruins_LadderToTektites(void) {
 }
 
-u32 sub_unk3_Ruins_FortressEntrance() {
+u32 sub_unk3_Ruins_FortressEntrance(void) {
     return 1;
 }
 
@@ -2034,7 +2043,7 @@ void sub_StateChange_Ruins_FortressEntrance(void) {
     }
 }
 
-u32 sub_unk3_Ruins_Armos() {
+u32 sub_unk3_Ruins_Armos(void) {
     return 1;
 }
 
@@ -2059,7 +2068,7 @@ void sub_StateChange_Ruins_Armos(void) {
     }
 }
 
-u32 sub_unk3_DeepwoodShrine_Madderpillar() {
+u32 sub_unk3_DeepwoodShrine_Madderpillar(void) {
     return 1;
 }
 
@@ -2073,14 +2082,14 @@ void sub_StateChange_DeepwoodShrine_Madderpillar(void) {
     }
 }
 
-u32 sub_unk3_DeepwoodShrine_BluePortal() {
+u32 sub_unk3_DeepwoodShrine_BluePortal(void) {
     return 1;
 }
 
-void sub_StateChange_DeepwoodShrine_BluePortal() {
+void sub_StateChange_DeepwoodShrine_BluePortal(void) {
 }
 
-u32 sub_unk3_DeepwoodShrine_StairsToB1() {
+u32 sub_unk3_DeepwoodShrine_StairsToB1(void) {
     return 1;
 }
 
@@ -2103,28 +2112,28 @@ void sub_StateChange_DeepwoodShrine_StairsToB1(void) {
     }
 }
 
-u32 sub_unk3_DeepwoodShrine_PotBridge() {
+u32 sub_unk3_DeepwoodShrine_PotBridge(void) {
     return 1;
 }
 
-void sub_StateChange_DeepwoodShrine_PotBridge() {
+void sub_StateChange_DeepwoodShrine_PotBridge(void) {
 }
 
-u32 sub_unk3_DeepwoodShrine_DoubleStatue() {
+u32 sub_unk3_DeepwoodShrine_DoubleStatue(void) {
     return 1;
 }
 
-void sub_StateChange_DeepwoodShrine_DoubleStatue() {
+void sub_StateChange_DeepwoodShrine_DoubleStatue(void) {
 }
 
-u32 sub_unk3_DeepwoodShrine_Map() {
+u32 sub_unk3_DeepwoodShrine_Map(void) {
     return 1;
 }
 
-void sub_StateChange_DeepwoodShrine_Map() {
+void sub_StateChange_DeepwoodShrine_Map(void) {
 }
 
-u32 sub_unk3_DeepwoodShrine_Barrel() {
+u32 sub_unk3_DeepwoodShrine_Barrel(void) {
     return 1;
 }
 
@@ -2148,39 +2157,39 @@ void sub_StateChange_DeepwoodShrine_Barrel(void) {
     }
 }
 
-u32 sub_unk3_DeepwoodShrine_Button() {
+u32 sub_unk3_DeepwoodShrine_Button(void) {
     return 1;
 }
 
-void sub_StateChange_DeepwoodShrine_Button() {
+void sub_StateChange_DeepwoodShrine_Button(void) {
 }
 
-u32 sub_unk3_DeepwoodShrine_Mulldozer() {
+u32 sub_unk3_DeepwoodShrine_Mulldozer(void) {
     return 1;
 }
 
-void sub_StateChange_DeepwoodShrine_Mulldozer() {
+void sub_StateChange_DeepwoodShrine_Mulldozer(void) {
 }
 
-u32 sub_unk3_DeepwoodShrine_Pillars() {
+u32 sub_unk3_DeepwoodShrine_Pillars(void) {
     return 1;
 }
-void sub_StateChange_DeepwoodShrine_Pillars() {
+void sub_StateChange_DeepwoodShrine_Pillars(void) {
 }
 
-u32 sub_unk3_DeepwoodShrine_Lever() {
+u32 sub_unk3_DeepwoodShrine_Lever(void) {
     return 1;
 }
 
-void sub_StateChange_DeepwoodShrine_Lever() {
+void sub_StateChange_DeepwoodShrine_Lever(void) {
 }
 
-u32 sub_unk3_DeepwoodShrine_Entrance() {
+u32 sub_unk3_DeepwoodShrine_Entrance(void) {
     return 1;
 }
 
 #if defined(DEMO_USA) || defined(DEMO_JP)
-void sub_StateChange_DeepwoodShrine_Entrance() {
+void sub_StateChange_DeepwoodShrine_Entrance(void) {
 #ifdef DEMO_USA
     if (gSaveHeader->saveFileId != 0 && GetInventoryValue(ITEM_EARTH_ELEMENT) == 0) {
 #else
@@ -2194,53 +2203,53 @@ void sub_StateChange_DeepwoodShrine_Entrance() {
     }
 }
 #else
-void sub_StateChange_DeepwoodShrine_Entrance() {
+void sub_StateChange_DeepwoodShrine_Entrance(void) {
 }
 #endif
 
-u32 sub_unk3_DeepwoodShrine_Torch() {
+u32 sub_unk3_DeepwoodShrine_Torch(void) {
     return 1;
 }
 
-void sub_StateChange_DeepwoodShrine_Torch() {
+void sub_StateChange_DeepwoodShrine_Torch(void) {
 }
 
-u32 sub_unk3_DeepwoodShrine_BossKey() {
+u32 sub_unk3_DeepwoodShrine_BossKey(void) {
     return 1;
 }
 
-void sub_StateChange_DeepwoodShrine_BossKey() {
+void sub_StateChange_DeepwoodShrine_BossKey(void) {
 }
 
-u32 sub_unk3_DeepwoodShrine_Compass() {
+u32 sub_unk3_DeepwoodShrine_Compass(void) {
     return 1;
 }
 
-void sub_StateChange_DeepwoodShrine_Compass() {
+void sub_StateChange_DeepwoodShrine_Compass(void) {
 }
 
-u32 sub_unk3_DeepwoodShrine_13() {
+u32 sub_unk3_DeepwoodShrine_13(void) {
     return 1;
 }
 
-void sub_StateChange_DeepwoodShrine_13() {
+void sub_StateChange_DeepwoodShrine_13(void) {
 }
 
-u32 sub_unk3_DeepwoodShrine_LilyPadWest() {
+u32 sub_unk3_DeepwoodShrine_LilyPadWest(void) {
     return 1;
 }
 
-void sub_StateChange_DeepwoodShrine_LilyPadWest() {
+void sub_StateChange_DeepwoodShrine_LilyPadWest(void) {
 }
 
-u32 sub_unk3_DeepwoodShrine_LilyPadEast() {
+u32 sub_unk3_DeepwoodShrine_LilyPadEast(void) {
     return 1;
 }
 
-void sub_StateChange_DeepwoodShrine_LilyPadEast() {
+void sub_StateChange_DeepwoodShrine_LilyPadEast(void) {
 }
 
-u32 sub_unk3_DeepwoodShrineBoss_Main() {
+u32 sub_unk3_DeepwoodShrineBoss_Main(void) {
     return 1;
 }
 
@@ -2268,14 +2277,14 @@ void sub_StateChange_DeepwoodShrineBoss_Main(void) {
     }
 }
 
-u32 sub_unk3_DeepwoodShrine_PreBoss() {
+u32 sub_unk3_DeepwoodShrine_PreBoss(void) {
     return 1;
 }
 
-void sub_StateChange_DeepwoodShrine_PreBoss() {
+void sub_StateChange_DeepwoodShrine_PreBoss(void) {
 }
 
-u32 sub_unk3_DeepwoodShrine_InsideBarrel() {
+u32 sub_unk3_DeepwoodShrine_InsideBarrel(void) {
     return 1;
 }
 
@@ -2285,7 +2294,7 @@ void sub_StateChange_DeepwoodShrine_InsideBarrel(void) {
     gMain.substate = 5;
 }
 
-u32 sub_unk3_DeepwoodShrineEntry_Main() {
+u32 sub_unk3_DeepwoodShrineEntry_Main(void) {
     return 1;
 }
 
@@ -2297,33 +2306,33 @@ void sub_StateChange_DeepwoodShrineEntry_Main(void) {
     }
 }
 
-u32 sub_unk3_CaveOfFlames_AfterCane() {
+u32 sub_unk3_CaveOfFlames_AfterCane(void) {
     return 1;
 }
 
-void sub_StateChange_CaveOfFlames_AfterCane() {
+void sub_StateChange_CaveOfFlames_AfterCane(void) {
 }
 
-u32 sub_unk3_CaveOfFlames_SpinyChus() {
+u32 sub_unk3_CaveOfFlames_SpinyChus(void) {
     return 1;
 }
 
-void sub_StateChange_CaveOfFlames_SpinyChus() {
+void sub_StateChange_CaveOfFlames_SpinyChus(void) {
 }
 
-u32 sub_unk3_CaveOfFlames_CartToSpinyChus() {
+u32 sub_unk3_CaveOfFlames_CartToSpinyChus(void) {
     return 1;
 }
 
-void sub_StateChange_CaveOfFlames_CartToSpinyChus() {
+void sub_StateChange_CaveOfFlames_CartToSpinyChus(void) {
 }
 
-u32 sub_unk3_CaveOfFlames_Entrance() {
+u32 sub_unk3_CaveOfFlames_Entrance(void) {
     return 1;
 }
 
 #ifdef DEMO_USA
-void sub_StateChange_CaveOfFlames_Entrance() {
+void sub_StateChange_CaveOfFlames_Entrance(void) {
     if (GetInventoryValue(ITEM_FIRE_ELEMENT) == 0) {
         SetTileType(0x365, 0x287, 2);
         SetTileType(0x365, 0x288, 2);
@@ -2331,64 +2340,64 @@ void sub_StateChange_CaveOfFlames_Entrance() {
     }
 }
 #else
-void sub_StateChange_CaveOfFlames_Entrance() {
+void sub_StateChange_CaveOfFlames_Entrance(void) {
 }
 #endif
 
-u32 sub_unk3_CaveOfFlames_MainCart() {
+u32 sub_unk3_CaveOfFlames_MainCart(void) {
     return 1;
 }
 
-void sub_StateChange_CaveOfFlames_MainCart() {
+void sub_StateChange_CaveOfFlames_MainCart(void) {
 }
 
-u32 sub_unk3_CaveOfFlames_NorthEntrance() {
+u32 sub_unk3_CaveOfFlames_NorthEntrance(void) {
     return 1;
 }
 
-void sub_StateChange_CaveOfFlames_NorthEntrance() {
+void sub_StateChange_CaveOfFlames_NorthEntrance(void) {
 }
 
-u32 sub_unk3_CaveOfFlames_CartWest() {
+u32 sub_unk3_CaveOfFlames_CartWest(void) {
     return 1;
 }
 
-void sub_StateChange_CaveOfFlames_CartWest() {
+void sub_StateChange_CaveOfFlames_CartWest(void) {
 }
 
-u32 sub_unk3_CaveOfFlames_Helmasaur() {
+u32 sub_unk3_CaveOfFlames_Helmasaur(void) {
     return 1;
 }
 
-void sub_StateChange_CaveOfFlames_Helmasaur() {
+void sub_StateChange_CaveOfFlames_Helmasaur(void) {
 }
 
-u32 sub_unk3_CaveOfFlames_Rollobite() {
+u32 sub_unk3_CaveOfFlames_Rollobite(void) {
     return 1;
 }
 
-void sub_StateChange_CaveOfFlames_Rollobite() {
+void sub_StateChange_CaveOfFlames_Rollobite(void) {
 }
 
-u32 sub_unk3_CaveOfFlames_MinishLava() {
+u32 sub_unk3_CaveOfFlames_MinishLava(void) {
     return 1;
 }
 
-void sub_StateChange_CaveOfFlames_MinishLava() {
+void sub_StateChange_CaveOfFlames_MinishLava(void) {
 }
 
-u32 sub_unk3_CaveOfFlames_MinishSpikes() {
+u32 sub_unk3_CaveOfFlames_MinishSpikes(void) {
     return 1;
 }
 
-void sub_StateChange_CaveOfFlames_MinishSpikes() {
+void sub_StateChange_CaveOfFlames_MinishSpikes(void) {
 }
 
-u32 sub_unk3_CaveOfFlames_RollobiteSwitch() {
+u32 sub_unk3_CaveOfFlames_RollobiteSwitch(void) {
     return 1;
 }
 
-void sub_StateChange_CaveOfFlames_RollobiteSwitch() {
+void sub_StateChange_CaveOfFlames_RollobiteSwitch(void) {
 }
 
 extern u32 gUnk_080E103C;
@@ -2400,52 +2409,52 @@ u32 sub_unk3_CaveOfFlames_BeforeGleerok(void) {
     return 1;
 }
 
-void sub_StateChange_CaveOfFlames_BeforeGleerok() {
+void sub_StateChange_CaveOfFlames_BeforeGleerok(void) {
 }
 
-u32 sub_unk3_CaveOfFlames_PathBossKey() {
+u32 sub_unk3_CaveOfFlames_PathBossKey(void) {
     return 1;
 }
 
-void sub_StateChange_CaveOfFlames_PathBossKey() {
+void sub_StateChange_CaveOfFlames_PathBossKey(void) {
 }
 
-u32 sub_unk3_CaveOfFlames_PathBossKey2() {
+u32 sub_unk3_CaveOfFlames_PathBossKey2(void) {
     return 1;
 }
 
-void sub_StateChange_CaveOfFlames_PathBossKey2() {
+void sub_StateChange_CaveOfFlames_PathBossKey2(void) {
 }
 
-u32 sub_unk3_CaveOfFlames_Compass() {
+u32 sub_unk3_CaveOfFlames_Compass(void) {
     return 1;
 }
 
-void sub_StateChange_CaveOfFlames_Compass() {
+void sub_StateChange_CaveOfFlames_Compass(void) {
 }
 
-u32 sub_unk3_CaveOfFlames_Bobomb() {
+u32 sub_unk3_CaveOfFlames_Bobomb(void) {
     return 1;
 }
 
-void sub_StateChange_CaveOfFlames_Bobomb() {
+void sub_StateChange_CaveOfFlames_Bobomb(void) {
 }
 
-u32 sub_unk3_CaveOfFlames_BossDoor() {
+u32 sub_unk3_CaveOfFlames_BossDoor(void) {
     return 1;
 }
 
-void sub_StateChange_CaveOfFlames_BossDoor() {
+void sub_StateChange_CaveOfFlames_BossDoor(void) {
 }
 
-u32 sub_unk3_CaveOfFlames_18() {
+u32 sub_unk3_CaveOfFlames_18(void) {
     return 1;
 }
 
-void sub_StateChange_CaveOfFlames_18() {
+void sub_StateChange_CaveOfFlames_18(void) {
 }
 
-u32 sub_unk3_CaveOfFlamesBoss_Main() {
+u32 sub_unk3_CaveOfFlamesBoss_Main(void) {
     return 1;
 }
 
@@ -2466,14 +2475,14 @@ void sub_StateChange_CaveOfFlamesBoss_Main(void) {
     }
 }
 
-u32 sub_unk3_FortressOfWinds_Eyegore() {
+u32 sub_unk3_FortressOfWinds_Eyegore(void) {
     return 1;
 }
 
-void sub_StateChange_FortressOfWinds_Eyegore() {
+void sub_StateChange_FortressOfWinds_Eyegore(void) {
 }
 
-u32 sub_unk3_FortressOfWinds_BeforeMazaal() {
+u32 sub_unk3_FortressOfWinds_BeforeMazaal(void) {
     return 1;
 }
 
@@ -2482,72 +2491,72 @@ void sub_StateChange_FortressOfWinds_BeforeMazaal(void) {
     gRoomTransition.field_0x39 = 0x5a;
 }
 
-u32 sub_unk3_FortressOfWinds_EastKeyLever() {
+u32 sub_unk3_FortressOfWinds_EastKeyLever(void) {
     return 1;
 }
 
-void sub_StateChange_FortressOfWinds_EastKeyLever() {
+void sub_StateChange_FortressOfWinds_EastKeyLever(void) {
     sub_080300E8();
 }
 
-u32 sub_unk3_FortressOfWinds_PitPlatforms() {
+u32 sub_unk3_FortressOfWinds_PitPlatforms(void) {
     return 1;
 }
 
-void sub_StateChange_FortressOfWinds_PitPlatforms() {
+void sub_StateChange_FortressOfWinds_PitPlatforms(void) {
 }
 
-u32 sub_unk3_FortressOfWinds_WestKeyLever() {
+u32 sub_unk3_FortressOfWinds_WestKeyLever(void) {
     return 1;
 }
 
-void sub_StateChange_FortressOfWinds_WestKeyLever() {
+void sub_StateChange_FortressOfWinds_WestKeyLever(void) {
     sub_080300E8();
 }
 
-u32 sub_unk3_FortressOfWinds_Darknut() {
+u32 sub_unk3_FortressOfWinds_Darknut(void) {
     return 1;
 }
 
-void sub_StateChange_FortressOfWinds_Darknut() {
+void sub_StateChange_FortressOfWinds_Darknut(void) {
 }
 
-u32 sub_unk3_FortressOfWinds_EyeBridge() {
+u32 sub_unk3_FortressOfWinds_EyeBridge(void) {
     return 1;
 }
 
-void sub_StateChange_FortressOfWinds_EyeBridge() {
+void sub_StateChange_FortressOfWinds_EyeBridge(void) {
 }
 
-u32 sub_unk3_FortressOfWinds_Pit() {
+u32 sub_unk3_FortressOfWinds_Pit(void) {
     return 1;
 }
 
-void sub_StateChange_FortressOfWinds_Pit() {
+void sub_StateChange_FortressOfWinds_Pit(void) {
 }
 
-u32 sub_unk3_FortressOfWinds_Wallmaster() {
+u32 sub_unk3_FortressOfWinds_Wallmaster(void) {
     return 1;
 }
 
-void sub_StateChange_FortressOfWinds_Wallmaster() {
+void sub_StateChange_FortressOfWinds_Wallmaster(void) {
 }
 
-u32 sub_unk3_FortressOfWinds_Clone() {
+u32 sub_unk3_FortressOfWinds_Clone(void) {
     return 1;
 }
 
-void sub_StateChange_FortressOfWinds_Clone() {
+void sub_StateChange_FortressOfWinds_Clone(void) {
 }
 
-u32 sub_unk3_FortressOfWinds_SpikeTraps() {
+u32 sub_unk3_FortressOfWinds_SpikeTraps(void) {
     return 1;
 }
 
-void sub_StateChange_FortressOfWinds_SpikeTraps() {
+void sub_StateChange_FortressOfWinds_SpikeTraps(void) {
 }
 
-u32 sub_unk3_FortressOfWinds_Mazaal() {
+u32 sub_unk3_FortressOfWinds_Mazaal(void) {
     return 1;
 }
 
@@ -2566,98 +2575,98 @@ void sub_StateChange_FortressOfWinds_Mazaal(void) {
     }
 }
 
-u32 sub_unk3_FortressOfWinds_Stalfos() {
+u32 sub_unk3_FortressOfWinds_Stalfos(void) {
     return 1;
 }
 
-void sub_StateChange_FortressOfWinds_Stalfos() {
+void sub_StateChange_FortressOfWinds_Stalfos(void) {
 }
 
-u32 sub_unk3_FortressOfWinds_EntranceMoleMitts() {
+u32 sub_unk3_FortressOfWinds_EntranceMoleMitts(void) {
     return 1;
 }
 
-void sub_StateChange_Dojos_Waveblade0() {
+void sub_StateChange_Dojos_Waveblade0(void) {
 }
 
-u32 sub_unk3_FortressOfWinds_Main2F() {
+u32 sub_unk3_FortressOfWinds_Main2F(void) {
     return 1;
 }
 
-void sub_StateChange_Dojos_Waveblade1() {
+void sub_StateChange_Dojos_Waveblade1(void) {
 }
 
-u32 sub_unk3_FortressOfWinds_MinishHole() {
+u32 sub_unk3_FortressOfWinds_MinishHole(void) {
     return 1;
 }
 
-void sub_StateChange_Dojos_Waveblade2() {
+void sub_StateChange_Dojos_Waveblade2(void) {
 }
 
-u32 sub_unk3_FortressOfWinds_BossKey() {
+u32 sub_unk3_FortressOfWinds_BossKey(void) {
     return 1;
 }
 
-void sub_StateChange_Dojos_Waveblade3() {
+void sub_StateChange_Dojos_Waveblade3(void) {
 }
 
-u32 sub_unk3_FortressOfWinds_WestStairs2F() {
+u32 sub_unk3_FortressOfWinds_WestStairs2F(void) {
     return 1;
 }
 
-void sub_StateChange_Dojos_Waveblade4() {
+void sub_StateChange_Dojos_Waveblade4(void) {
 }
 
-u32 sub_unk3_FortressOfWinds_EastStairs2F() {
+u32 sub_unk3_FortressOfWinds_EastStairs2F(void) {
     return 1;
 }
 
-void sub_StateChange_Dojos_Waveblade5() {
+void sub_StateChange_Dojos_Waveblade5(void) {
 }
 
-u32 sub_unk3_FortressOfWinds_WestStairs1F() {
+u32 sub_unk3_FortressOfWinds_WestStairs1F(void) {
     return 1;
 }
 
-void sub_StateChange_Dojos_Waveblade6() {
+void sub_StateChange_Dojos_Waveblade6(void) {
 }
 
-u32 sub_unk3_FortressOfWinds_CenterStairs1F() {
+u32 sub_unk3_FortressOfWinds_CenterStairs1F(void) {
     return 1;
 }
 
-void sub_StateChange_Dojos_Waveblade7() {
+void sub_StateChange_Dojos_Waveblade7(void) {
 }
 
-u32 sub_unk3_FortressOfWinds_EastStairs1F() {
+u32 sub_unk3_FortressOfWinds_EastStairs1F(void) {
     return 1;
 }
 
-void sub_StateChange_Dojos_Waveblade8() {
+void sub_StateChange_Dojos_Waveblade8(void) {
 }
 
-u32 sub_unk3_FortressOfWinds_Wizzrobe() {
+u32 sub_unk3_FortressOfWinds_Wizzrobe(void) {
     return 1;
 }
 
-void sub_StateChange_Dojos_Waveblade9() {
+void sub_StateChange_Dojos_Waveblade9(void) {
 }
 
-u32 sub_unk3_FortressOfWinds_HeartPiece() {
+u32 sub_unk3_FortressOfWinds_HeartPiece(void) {
     return 1;
 }
 
-void sub_StateChange_Dojos_70() {
+void sub_StateChange_Dojos_70(void) {
 }
 
-u32 sub_unk3_InnerMazaal_Main() {
+u32 sub_unk3_InnerMazaal_Main(void) {
     return 1;
 }
 
-void sub_StateChange_Dojos_71() {
+void sub_StateChange_Dojos_71(void) {
 }
 
-u32 sub_unk3_FortressOfWindsTop_Main() {
+u32 sub_unk3_FortressOfWindsTop_Main(void) {
     return 1;
 }
 
@@ -2672,15 +2681,15 @@ void sub_StateChange_FortressOfWindsTop_Main(void) {
     }
 }
 
-u32 sub_unk3_TempleOfDroplets_WestHole() {
+u32 sub_unk3_TempleOfDroplets_WestHole(void) {
     return 1;
 }
 
-void sub_StateChange_TempleOfDroplets_WestHole() {
+void sub_StateChange_TempleOfDroplets_WestHole(void) {
     sub_0804D0B4();
 }
 
-void sub_0804D0B4(void) {
+static void sub_0804D0B4(void) {
     if (!CheckLocalFlag(0x29)) {
         SetLocalFlag(0x29);
         SetLocalFlag(0x4b);
@@ -2688,98 +2697,98 @@ void sub_0804D0B4(void) {
     }
 }
 
-u32 sub_unk3_TempleOfDroplets_NorthSplit() {
+u32 sub_unk3_TempleOfDroplets_NorthSplit(void) {
     return 1;
 }
 
-void sub_StateChange_TempleOfDroplets_NorthSplit() {
+void sub_StateChange_TempleOfDroplets_NorthSplit(void) {
 }
 
-u32 sub_unk3_TempleOfDroplets_EastHole() {
+u32 sub_unk3_TempleOfDroplets_EastHole(void) {
     return 1;
 }
 
-void sub_StateChange_TempleOfDroplets_EastHole() {
+void sub_StateChange_TempleOfDroplets_EastHole(void) {
 }
 
-u32 sub_unk3_TempleOfDroplets_Entrance() {
+u32 sub_unk3_TempleOfDroplets_Entrance(void) {
     return 1;
 }
 
-void sub_StateChange_TempleOfDroplets_Entrance() {
+void sub_StateChange_TempleOfDroplets_Entrance(void) {
 }
 
-u32 sub_unk3_TempleOfDroplets_NorthwestStairs() {
+u32 sub_unk3_TempleOfDroplets_NorthwestStairs(void) {
     return 1;
 }
 
-void sub_StateChange_TempleOfDroplets_NorthwestStairs() {
+void sub_StateChange_TempleOfDroplets_NorthwestStairs(void) {
 }
 
-u32 sub_unk3_TempleOfDroplets_ScissorsMiniboss() {
+u32 sub_unk3_TempleOfDroplets_ScissorsMiniboss(void) {
     return 1;
 }
 
-void sub_StateChange_TempleOfDroplets_ScissorsMiniboss() {
+void sub_StateChange_TempleOfDroplets_ScissorsMiniboss(void) {
 }
 
-u32 sub_unk3_TempleOfDroplets_WaterfallNorthwest() {
+u32 sub_unk3_TempleOfDroplets_WaterfallNorthwest(void) {
     return 1;
 }
 
-void sub_StateChange_TempleOfDroplets_WaterfallNorthwest() {
+void sub_StateChange_TempleOfDroplets_WaterfallNorthwest(void) {
 }
 
-u32 sub_unk3_TempleOfDroplets_WaterfallNortheast() {
+u32 sub_unk3_TempleOfDroplets_WaterfallNortheast(void) {
     return 1;
 }
 
-void sub_StateChange_TempleOfDroplets_WaterfallNortheast() {
+void sub_StateChange_TempleOfDroplets_WaterfallNortheast(void) {
 }
 
-u32 sub_unk3_TempleOfDroplets_Element() {
+u32 sub_unk3_TempleOfDroplets_Element(void) {
     return 1;
 }
 
-void sub_StateChange_TempleOfDroplets_Element() {
+void sub_StateChange_TempleOfDroplets_Element(void) {
 }
 
-u32 sub_unk3_TempleOfDroplets_IceCorner() {
+u32 sub_unk3_TempleOfDroplets_IceCorner(void) {
     return 1;
 }
 
-void sub_StateChange_TempleOfDroplets_IceCorner() {
+void sub_StateChange_TempleOfDroplets_IceCorner(void) {
 }
 
-u32 sub_unk3_TempleOfDroplets_IcePitMaze() {
+u32 sub_unk3_TempleOfDroplets_IcePitMaze(void) {
     return 1;
 }
 
-void sub_StateChange_TempleOfDroplets_IcePitMaze() {
+void sub_StateChange_TempleOfDroplets_IcePitMaze(void) {
 }
 
-u32 sub_unk3_TempleOfDroplets_HoleToBlueChuchu() {
+u32 sub_unk3_TempleOfDroplets_HoleToBlueChuchu(void) {
     return 1;
 }
 
-void sub_StateChange_TempleOfDroplets_HoleToBlueChuchu() {
+void sub_StateChange_TempleOfDroplets_HoleToBlueChuchu(void) {
 }
 
-u32 sub_unk3_TempleOfDroplets_WaterfallSoutheast() {
+u32 sub_unk3_TempleOfDroplets_WaterfallSoutheast(void) {
     return 1;
 }
 
-void sub_StateChange_TempleOfDroplets_WaterfallSoutheast() {
+void sub_StateChange_TempleOfDroplets_WaterfallSoutheast(void) {
 }
 
-u32 sub_unk3_TempleOfDroplets_WaterfallSouthwest() {
+u32 sub_unk3_TempleOfDroplets_WaterfallSouthwest(void) {
     return 1;
 }
 
-void sub_StateChange_TempleOfDroplets_WaterfallSouthwest() {
+void sub_StateChange_TempleOfDroplets_WaterfallSouthwest(void) {
 }
 
-u32 sub_unk3_TempleOfDroplets_BigOcto() {
+u32 sub_unk3_TempleOfDroplets_BigOcto(void) {
     return 1;
 }
 
@@ -2795,14 +2804,14 @@ void sub_StateChange_TempleOfDroplets_BigOcto(void) {
     }
 }
 
-u32 sub_unk3_TempleOfDroplets_ToBigBlueChuchu() {
+u32 sub_unk3_TempleOfDroplets_ToBigBlueChuchu(void) {
     return 1;
 }
 
-void sub_StateChange_Dojos_72() {
+void sub_StateChange_Dojos_72(void) {
 }
 
-u32 sub_unk3_TempleOfDroplets_BigBlueChuchu() {
+u32 sub_unk3_TempleOfDroplets_BigBlueChuchu(void) {
     return 1;
 }
 
@@ -2815,7 +2824,7 @@ void sub_StateChange_TempleOfDroplets_BigBlueChuchu(void) {
     }
 }
 
-u32 sub_unk3_TempleOfDroplets_BigBlueChuchuKey() {
+u32 sub_unk3_TempleOfDroplets_BigBlueChuchuKey(void) {
     return 1;
 }
 
@@ -2834,63 +2843,63 @@ void sub_StateChange_TempleOfDroplets_BigBlueChuchuKey(void) {
     }
 }
 
-u32 sub_unk3_TempleOfDroplets_BossKey() {
+u32 sub_unk3_TempleOfDroplets_BossKey(void) {
     return 1;
 }
 
-void sub_StateChange_Dojos_73() {
+void sub_StateChange_Dojos_73(void) {
 }
 
-u32 sub_unk3_TempleOfDroplets_NorthSmallKey() {
+u32 sub_unk3_TempleOfDroplets_NorthSmallKey(void) {
     return 1;
 }
 
-void sub_StateChange_Dojos_74() {
+void sub_StateChange_Dojos_74(void) {
 }
 
-u32 sub_unk3_TempleOfDroplets_BlockCloneButtonPuzzle() {
+u32 sub_unk3_TempleOfDroplets_BlockCloneButtonPuzzle(void) {
     return 1;
 }
 
-void sub_StateChange_Dojos_75() {
+void sub_StateChange_Dojos_75(void) {
 }
 
-u32 sub_unk3_TempleOfDroplets_BlockClonePuzzle() {
+u32 sub_unk3_TempleOfDroplets_BlockClonePuzzle(void) {
     return 1;
 }
 
-void sub_StateChange_Dojos_76() {
+void sub_StateChange_Dojos_76(void) {
 }
 
-u32 sub_unk3_TempleOfDroplets_BlockCloneIceBridge() {
+u32 sub_unk3_TempleOfDroplets_BlockCloneIceBridge(void) {
     return 1;
 }
 
-void sub_StateChange_Dojos_77() {
+void sub_StateChange_Dojos_77(void) {
 }
 
-u32 sub_unk3_TempleOfDroplets_StairsToScissorsMiniboss() {
+u32 sub_unk3_TempleOfDroplets_StairsToScissorsMiniboss(void) {
     return 1;
 }
 
-void sub_StateChange_Dojos_78() {
+void sub_StateChange_Dojos_78(void) {
 }
 
-u32 sub_unk3_TempleOfDroplets_SpikeBar() {
+u32 sub_unk3_TempleOfDroplets_SpikeBar(void) {
     return 1;
 }
 
-void sub_StateChange_Dojos_79() {
+void sub_StateChange_Dojos_79(void) {
 }
 
-u32 sub_unk3_TempleOfDroplets_Lanterns() {
+u32 sub_unk3_TempleOfDroplets_Lanterns(void) {
     return 1;
 }
 
-void sub_StateChange_Dojos_80() {
+void sub_StateChange_Dojos_80(void) {
 }
 
-u32 sub_unk3_TempleOfDroplets_LilypadIceBlocks() {
+u32 sub_unk3_TempleOfDroplets_LilypadIceBlocks(void) {
     return 1;
 }
 
@@ -2905,42 +2914,42 @@ void sub_StateChange_TempleOfDroplets_LilypadIceBlocks(void) {
     }
 }
 
-u32 sub_unk3_TempleOfDroplets_Pit() {
+u32 sub_unk3_TempleOfDroplets_Pit(void) {
     return 1;
 }
 
-void sub_StateChange_Dojos_81() {
+void sub_StateChange_Dojos_81(void) {
 }
 
-u32 sub_unk3_TempleOfDroplets_FireBars() {
+u32 sub_unk3_TempleOfDroplets_FireBars(void) {
     return 1;
 }
 
-void sub_StateChange_Dojos_82() {
+void sub_StateChange_Dojos_82(void) {
 }
 
-u32 sub_unk3_TempleOfDroplets_LanternMaze() {
+u32 sub_unk3_TempleOfDroplets_LanternMaze(void) {
     return 1;
 }
 
-void sub_StateChange_Dojos_83() {
+void sub_StateChange_Dojos_83(void) {
 }
 
-u32 sub_unk3_TempleOfDroplets_Madderpillars() {
+u32 sub_unk3_TempleOfDroplets_Madderpillars(void) {
     return 1;
 }
 
-void sub_StateChange_Dojos_84() {
+void sub_StateChange_Dojos_84(void) {
 }
 
-u32 sub_unk3_TempleOfDroplets_AfterMadderpillars() {
+u32 sub_unk3_TempleOfDroplets_AfterMadderpillars(void) {
     return 1;
 }
 
-void sub_StateChange_Dojos_85() {
+void sub_StateChange_Dojos_85(void) {
 }
 
-u32 sub_unk3_TempleOfDroplets_BlueChuchuKeyLever() {
+u32 sub_unk3_TempleOfDroplets_BlueChuchuKeyLever(void) {
     return 1;
 }
 
@@ -2956,63 +2965,63 @@ void sub_StateChange_TempleOfDroplets_BlueChuchuKeyLever(void) {
     }
 }
 
-u32 sub_unk3_TempleOfDroplets_MulldozerKey() {
+u32 sub_unk3_TempleOfDroplets_MulldozerKey(void) {
     return 1;
 }
 
-void sub_StateChange_Dojos_86() {
+void sub_StateChange_Dojos_86(void) {
 }
 
-u32 sub_unk3_TempleOfDroplets_BombWall() {
+u32 sub_unk3_TempleOfDroplets_BombWall(void) {
     return 1;
 }
 
-void sub_StateChange_Dojos_87() {
+void sub_StateChange_Dojos_87(void) {
 }
 
-u32 sub_unk3_TempleOfDroplets_LilypadWestB2() {
+u32 sub_unk3_TempleOfDroplets_LilypadWestB2(void) {
     return 1;
 }
 
-void sub_StateChange_Dojos_88() {
+void sub_StateChange_Dojos_88(void) {
 }
 
-u32 sub_unk3_TempleOfDroplets_CompassRoom() {
+u32 sub_unk3_TempleOfDroplets_CompassRoom(void) {
     return 1;
 }
 
-void sub_StateChange_Dojos_89() {
+void sub_StateChange_Dojos_89(void) {
 }
 
-u32 sub_unk3_TempleOfDroplets_LanternScissors() {
+u32 sub_unk3_TempleOfDroplets_LanternScissors(void) {
     return 1;
 }
 
-void sub_StateChange_Dojos_90() {
+void sub_StateChange_Dojos_90(void) {
 }
 
-u32 sub_unk3_TempleOfDroplets_LilypadMiddleB2() {
+u32 sub_unk3_TempleOfDroplets_LilypadMiddleB2(void) {
     return 1;
 }
 
-void sub_StateChange_Dojos_91() {
+void sub_StateChange_Dojos_91(void) {
 }
 
-u32 sub_unk3_TempleOfDroplets_LilypadEastB2() {
+u32 sub_unk3_TempleOfDroplets_LilypadEastB2(void) {
     return 1;
 }
 
-void sub_StateChange_Dojos_92() {
+void sub_StateChange_Dojos_92(void) {
 }
 
-u32 sub_unk3_TempleOfDroplets_FlameBarBlockPuzzle() {
+u32 sub_unk3_TempleOfDroplets_FlameBarBlockPuzzle(void) {
     return 1;
 }
 
-void sub_StateChange_Dojos_93() {
+void sub_StateChange_Dojos_93(void) {
 }
 
-u32 sub_unk3_RoyalCrypt_KingGustaf() {
+u32 sub_unk3_RoyalCrypt_KingGustaf(void) {
     return 1;
 }
 
@@ -3024,57 +3033,57 @@ void sub_StateChange_RoyalCrypt_KingGustaf(void) {
     }
 }
 
-u32 sub_unk3_RoyalCrypt_WaterRope() {
+u32 sub_unk3_RoyalCrypt_WaterRope(void) {
     return 1;
 }
 
-void sub_StateChange_Dojos_94() {
+void sub_StateChange_Dojos_94(void) {
 }
 
-u32 sub_unk3_RoyalCrypt_Gibdo() {
+u32 sub_unk3_RoyalCrypt_Gibdo(void) {
     return 1;
 }
 
-void sub_StateChange_Dojos_95() {
+void sub_StateChange_Dojos_95(void) {
 }
 
-u32 sub_unk3_RoyalCrypt_3() {
+u32 sub_unk3_RoyalCrypt_3(void) {
     return 1;
 }
 
-void sub_StateChange_Dojos_96() {
+void sub_StateChange_Dojos_96(void) {
 }
 
-u32 sub_unk3_RoyalCrypt_KeyBlock() {
+u32 sub_unk3_RoyalCrypt_KeyBlock(void) {
     return 1;
 }
 
-void sub_StateChange_Dojos_97() {
+void sub_StateChange_Dojos_97(void) {
 }
 
-u32 sub_unk3_RoyalCrypt_5() {
+u32 sub_unk3_RoyalCrypt_5(void) {
     return 1;
 }
 
-void sub_StateChange_Dojos_98() {
+void sub_StateChange_Dojos_98(void) {
 }
 
-u32 sub_unk3_RoyalCrypt_6() {
+u32 sub_unk3_RoyalCrypt_6(void) {
     return 1;
 }
 
-void sub_StateChange_Dojos_99() {
+void sub_StateChange_Dojos_99(void) {
 }
 
-u32 sub_unk3_RoyalCrypt_MushroomPit() {
+u32 sub_unk3_RoyalCrypt_MushroomPit(void) {
     return 1;
 }
 
-void sub_StateChange_RoyalCrypt_MushroomPit() {
+void sub_StateChange_RoyalCrypt_MushroomPit(void) {
     sub_08054570();
 }
 
-u32 sub_unk3_RoyalCrypt_Entrance() {
+u32 sub_unk3_RoyalCrypt_Entrance(void) {
     return 1;
 }
 
@@ -3092,7 +3101,7 @@ void sub_StateChange_RoyalCrypt_Entrance(void) {
     }
 }
 
-u32 sub_unk3_PalaceOfWinds_0() {
+u32 sub_unk3_PalaceOfWinds_0(void) {
     return 1;
 }
 
@@ -3118,338 +3127,338 @@ void sub_StateChange_PalaceOfWinds_0(void) {
     }
 }
 
-u32 sub_unk3_PalaceOfWinds_1() {
+u32 sub_unk3_PalaceOfWinds_1(void) {
     return 1;
 }
 
-void sub_StateChange_PalaceOfWinds_1() {
+void sub_StateChange_PalaceOfWinds_1(void) {
     Manager19_Main(NULL);
 }
 
-u32 sub_unk3_PalaceOfWinds_2() {
+u32 sub_unk3_PalaceOfWinds_2(void) {
     return 1;
 }
 
-void sub_StateChange_PalaceOfWinds_2() {
+void sub_StateChange_PalaceOfWinds_2(void) {
     Manager19_Main(NULL);
 }
 
-u32 sub_unk3_PalaceOfWinds_3() {
+u32 sub_unk3_PalaceOfWinds_3(void) {
     return 1;
 }
 
-void sub_StateChange_PalaceOfWinds_3() {
+void sub_StateChange_PalaceOfWinds_3(void) {
     Manager19_Main(NULL);
 }
 
-u32 sub_unk3_PalaceOfWinds_4() {
+u32 sub_unk3_PalaceOfWinds_4(void) {
     return 1;
 }
 
-void sub_StateChange_PalaceOfWinds_4() {
+void sub_StateChange_PalaceOfWinds_4(void) {
     Manager19_Main(NULL);
 }
 
-u32 sub_unk3_PalaceOfWinds_5() {
+u32 sub_unk3_PalaceOfWinds_5(void) {
     return 1;
 }
 
-void sub_StateChange_PalaceOfWinds_5() {
+void sub_StateChange_PalaceOfWinds_5(void) {
     Manager19_Main(NULL);
 }
 
-u32 sub_unk3_PalaceOfWinds_6() {
+u32 sub_unk3_PalaceOfWinds_6(void) {
     return 1;
 }
 
-void sub_StateChange_PalaceOfWinds_6() {
+void sub_StateChange_PalaceOfWinds_6(void) {
     Manager19_Main(NULL);
 }
 
-u32 sub_unk3_PalaceOfWinds_7() {
+u32 sub_unk3_PalaceOfWinds_7(void) {
     return 1;
 }
 
-void sub_StateChange_PalaceOfWinds_7() {
+void sub_StateChange_PalaceOfWinds_7(void) {
     Manager19_Main(NULL);
 }
 
-u32 sub_unk3_PalaceOfWinds_8() {
+u32 sub_unk3_PalaceOfWinds_8(void) {
     return 1;
 }
 
-void sub_StateChange_PalaceOfWinds_8() {
+void sub_StateChange_PalaceOfWinds_8(void) {
     Manager19_Main(NULL);
 }
 
-u32 sub_unk3_PalaceOfWinds_9() {
+u32 sub_unk3_PalaceOfWinds_9(void) {
     return 1;
 }
 
-void sub_StateChange_PalaceOfWinds_9() {
+void sub_StateChange_PalaceOfWinds_9(void) {
     Manager19_Main(NULL);
 }
 
-u32 sub_unk3_PalaceOfWinds_10() {
+u32 sub_unk3_PalaceOfWinds_10(void) {
     return 1;
 }
 
-void sub_StateChange_PalaceOfWinds_10() {
+void sub_StateChange_PalaceOfWinds_10(void) {
     Manager19_Main(NULL);
 }
 
-u32 sub_unk3_PalaceOfWinds_11() {
+u32 sub_unk3_PalaceOfWinds_11(void) {
     return 1;
 }
 
-void sub_StateChange_PalaceOfWinds_11() {
+void sub_StateChange_PalaceOfWinds_11(void) {
     Manager19_Main(NULL);
 }
 
-u32 sub_unk3_PalaceOfWinds_12() {
+u32 sub_unk3_PalaceOfWinds_12(void) {
     return 1;
 }
 
-void sub_StateChange_PalaceOfWinds_12() {
+void sub_StateChange_PalaceOfWinds_12(void) {
     Manager19_Main(NULL);
 }
 
-u32 sub_unk3_PalaceOfWinds_13() {
+u32 sub_unk3_PalaceOfWinds_13(void) {
     return 1;
 }
 
-void sub_StateChange_PalaceOfWinds_13() {
+void sub_StateChange_PalaceOfWinds_13(void) {
     Manager19_Main(NULL);
 }
 
-u32 sub_unk3_PalaceOfWinds_14() {
+u32 sub_unk3_PalaceOfWinds_14(void) {
     return 1;
 }
 
-void sub_StateChange_PalaceOfWinds_14() {
+void sub_StateChange_PalaceOfWinds_14(void) {
     Manager19_Main(NULL);
 }
 
-u32 sub_unk3_PalaceOfWinds_15() {
+u32 sub_unk3_PalaceOfWinds_15(void) {
     return 1;
 }
 
-void sub_StateChange_PalaceOfWinds_15() {
+void sub_StateChange_PalaceOfWinds_15(void) {
     Manager19_Main(NULL);
 }
 
-u32 sub_unk3_PalaceOfWinds_16() {
+u32 sub_unk3_PalaceOfWinds_16(void) {
     return 1;
 }
 
-void sub_StateChange_PalaceOfWinds_16() {
+void sub_StateChange_PalaceOfWinds_16(void) {
     Manager19_Main(NULL);
 }
 
-u32 sub_unk3_PalaceOfWinds_17() {
+u32 sub_unk3_PalaceOfWinds_17(void) {
     return 1;
 }
 
-void sub_StateChange_PalaceOfWinds_17() {
+void sub_StateChange_PalaceOfWinds_17(void) {
     Manager19_Main(NULL);
 }
 
-u32 sub_unk3_PalaceOfWinds_18() {
+u32 sub_unk3_PalaceOfWinds_18(void) {
     return 1;
 }
 
-void sub_StateChange_PalaceOfWinds_18() {
+void sub_StateChange_PalaceOfWinds_18(void) {
     Manager19_Main(NULL);
 }
 
-u32 sub_unk3_PalaceOfWinds_19() {
+u32 sub_unk3_PalaceOfWinds_19(void) {
     return 1;
 }
 
-void sub_StateChange_PalaceOfWinds_19() {
+void sub_StateChange_PalaceOfWinds_19(void) {
     Manager19_Main(NULL);
 }
 
-u32 sub_unk3_PalaceOfWinds_20() {
+u32 sub_unk3_PalaceOfWinds_20(void) {
     return 1;
 }
 
-void sub_StateChange_PalaceOfWinds_20() {
+void sub_StateChange_PalaceOfWinds_20(void) {
     Manager19_Main(NULL);
 }
 
-u32 sub_unk3_PalaceOfWinds_21() {
+u32 sub_unk3_PalaceOfWinds_21(void) {
     return 1;
 }
 
-void sub_StateChange_PalaceOfWinds_21() {
+void sub_StateChange_PalaceOfWinds_21(void) {
 }
 
-u32 sub_unk3_PalaceOfWinds_22() {
+u32 sub_unk3_PalaceOfWinds_22(void) {
     return 1;
 }
 
-void sub_StateChange_PalaceOfWinds_22() {
+void sub_StateChange_PalaceOfWinds_22(void) {
     Manager19_Main(NULL);
 }
 
-u32 sub_unk3_PalaceOfWinds_23() {
+u32 sub_unk3_PalaceOfWinds_23(void) {
     return 1;
 }
 
-void sub_StateChange_PalaceOfWinds_23() {
+void sub_StateChange_PalaceOfWinds_23(void) {
     Manager19_Main(NULL);
 }
 
-u32 sub_unk3_PalaceOfWinds_24() {
+u32 sub_unk3_PalaceOfWinds_24(void) {
     return 1;
 }
 
-void sub_StateChange_PalaceOfWinds_24() {
+void sub_StateChange_PalaceOfWinds_24(void) {
     Manager19_Main(NULL);
 }
 
-u32 sub_unk3_PalaceOfWinds_25() {
+u32 sub_unk3_PalaceOfWinds_25(void) {
     return 1;
 }
 
-void sub_StateChange_PalaceOfWinds_25() {
+void sub_StateChange_PalaceOfWinds_25(void) {
     Manager19_Main(NULL);
 }
 
-u32 sub_unk3_PalaceOfWinds_26() {
+u32 sub_unk3_PalaceOfWinds_26(void) {
     return 1;
 }
 
-void sub_StateChange_PalaceOfWinds_26() {
+void sub_StateChange_PalaceOfWinds_26(void) {
     Manager19_Main(NULL);
 }
 
-u32 sub_unk3_PalaceOfWinds_27() {
+u32 sub_unk3_PalaceOfWinds_27(void) {
     return 1;
 }
 
-void sub_StateChange_PalaceOfWinds_27() {
+void sub_StateChange_PalaceOfWinds_27(void) {
 }
 
-u32 sub_unk3_PalaceOfWinds_28() {
+u32 sub_unk3_PalaceOfWinds_28(void) {
     return 1;
 }
 
-void sub_StateChange_PalaceOfWinds_28() {
+void sub_StateChange_PalaceOfWinds_28(void) {
 }
 
-u32 sub_unk3_PalaceOfWinds_29() {
+u32 sub_unk3_PalaceOfWinds_29(void) {
     return 1;
 }
 
-void sub_StateChange_PalaceOfWinds_29() {
+void sub_StateChange_PalaceOfWinds_29(void) {
 }
 
-u32 sub_unk3_PalaceOfWinds_30() {
+u32 sub_unk3_PalaceOfWinds_30(void) {
     return 1;
 }
 
-void sub_StateChange_PalaceOfWinds_30() {
+void sub_StateChange_PalaceOfWinds_30(void) {
 }
 
-u32 sub_unk3_PalaceOfWinds_31() {
+u32 sub_unk3_PalaceOfWinds_31(void) {
     return 1;
 }
 
-void sub_StateChange_PalaceOfWinds_31() {
+void sub_StateChange_PalaceOfWinds_31(void) {
 }
 
-u32 sub_unk3_PalaceOfWinds_32() {
+u32 sub_unk3_PalaceOfWinds_32(void) {
     return 1;
 }
 
-void sub_StateChange_PalaceOfWinds_32() {
+void sub_StateChange_PalaceOfWinds_32(void) {
 }
 
-u32 sub_unk3_PalaceOfWinds_33() {
+u32 sub_unk3_PalaceOfWinds_33(void) {
     return 1;
 }
 
-void sub_StateChange_PalaceOfWinds_33() {
+void sub_StateChange_PalaceOfWinds_33(void) {
     Manager19_Main(NULL);
 }
 
-u32 sub_unk3_PalaceOfWinds_34() {
+u32 sub_unk3_PalaceOfWinds_34(void) {
     return 1;
 }
 
-void sub_StateChange_PalaceOfWinds_34() {
+void sub_StateChange_PalaceOfWinds_34(void) {
     Manager19_Main(NULL);
 }
 
-u32 sub_unk3_PalaceOfWinds_35() {
+u32 sub_unk3_PalaceOfWinds_35(void) {
     return 1;
 }
 
-void sub_StateChange_PalaceOfWinds_35() {
+void sub_StateChange_PalaceOfWinds_35(void) {
     Manager19_Main(NULL);
 }
 
-u32 sub_unk3_PalaceOfWinds_36() {
+u32 sub_unk3_PalaceOfWinds_36(void) {
     return 1;
 }
 
-void sub_StateChange_PalaceOfWinds_36() {
+void sub_StateChange_PalaceOfWinds_36(void) {
     Manager19_Main(NULL);
 }
 
-u32 sub_unk3_PalaceOfWinds_37() {
+u32 sub_unk3_PalaceOfWinds_37(void) {
     return 1;
 }
 
-void sub_StateChange_PalaceOfWinds_37() {
+void sub_StateChange_PalaceOfWinds_37(void) {
 }
 
-u32 sub_unk3_PalaceOfWinds_38() {
+u32 sub_unk3_PalaceOfWinds_38(void) {
     return 1;
 }
 
-void sub_StateChange_PalaceOfWinds_38() {
+void sub_StateChange_PalaceOfWinds_38(void) {
 }
 
-u32 sub_unk3_PalaceOfWinds_39() {
+u32 sub_unk3_PalaceOfWinds_39(void) {
     return 1;
 }
 
-void sub_StateChange_PalaceOfWinds_39() {
+void sub_StateChange_PalaceOfWinds_39(void) {
 }
 
-u32 sub_unk3_PalaceOfWinds_40() {
+u32 sub_unk3_PalaceOfWinds_40(void) {
     return 1;
 }
 
-void sub_StateChange_PalaceOfWinds_40() {
+void sub_StateChange_PalaceOfWinds_40(void) {
 }
 
-u32 sub_unk3_PalaceOfWinds_41() {
+u32 sub_unk3_PalaceOfWinds_41(void) {
     return 1;
 }
 
-void sub_StateChange_PalaceOfWinds_41() {
+void sub_StateChange_PalaceOfWinds_41(void) {
 }
 
-u32 sub_unk3_PalaceOfWinds_42() {
+u32 sub_unk3_PalaceOfWinds_42(void) {
     return 1;
 }
 
-void sub_StateChange_PalaceOfWinds_42() {
+void sub_StateChange_PalaceOfWinds_42(void) {
 }
 
-u32 sub_unk3_PalaceOfWinds_43() {
+u32 sub_unk3_PalaceOfWinds_43(void) {
     return 1;
 }
 
-void sub_StateChange_PalaceOfWinds_43() {
+void sub_StateChange_PalaceOfWinds_43(void) {
     Manager19_Main(NULL);
 }
 
-u32 sub_unk3_PalaceOfWinds_44() {
+u32 sub_unk3_PalaceOfWinds_44(void) {
     return 1;
 }
 
@@ -3462,61 +3471,61 @@ void sub_StateChange_PalaceOfWinds_44(void) {
     }
 }
 
-u32 sub_unk3_PalaceOfWinds_45() {
+u32 sub_unk3_PalaceOfWinds_45(void) {
     return 1;
 }
 
-void sub_StateChange_PalaceOfWinds_45() {
+void sub_StateChange_PalaceOfWinds_45(void) {
     Manager19_Main(NULL);
 }
 
-u32 sub_unk3_PalaceOfWinds_46() {
+u32 sub_unk3_PalaceOfWinds_46(void) {
     return 1;
 }
 
-void sub_StateChange_PalaceOfWinds_46() {
+void sub_StateChange_PalaceOfWinds_46(void) {
     Manager19_Main(NULL);
 }
 
-u32 sub_unk3_PalaceOfWinds_47() {
+u32 sub_unk3_PalaceOfWinds_47(void) {
     return 1;
 }
 
-void sub_StateChange_PalaceOfWinds_47() {
+void sub_StateChange_PalaceOfWinds_47(void) {
     Manager19_Main(NULL);
 }
 
-u32 sub_unk3_PalaceOfWinds_48() {
+u32 sub_unk3_PalaceOfWinds_48(void) {
     return 1;
 }
 
-void sub_StateChange_PalaceOfWinds_48() {
+void sub_StateChange_PalaceOfWinds_48(void) {
     Manager19_Main(NULL);
 }
 
-u32 sub_unk3_PalaceOfWinds_49() {
+u32 sub_unk3_PalaceOfWinds_49(void) {
     return 1;
 }
 
-void sub_StateChange_PalaceOfWinds_49() {
+void sub_StateChange_PalaceOfWinds_49(void) {
     Manager19_Main(NULL);
 }
 
-u32 sub_unk3_PalaceOfWinds_50() {
+u32 sub_unk3_PalaceOfWinds_50(void) {
     return 1;
 }
 
-void sub_StateChange_PalaceOfWinds_50() {
+void sub_StateChange_PalaceOfWinds_50(void) {
 }
 
-u32 sub_unk3_PalaceOfWindsBoss_Main() {
+u32 sub_unk3_PalaceOfWindsBoss_Main(void) {
     return 1;
 }
 
-void sub_StateChange_PalaceOfWindsBoss_Main() {
+void sub_StateChange_PalaceOfWindsBoss_Main(void) {
 }
 
-u32 sub_unk3_Vaati2_Main() {
+u32 sub_unk3_Vaati2_Main(void) {
     return 1;
 }
 
@@ -3525,7 +3534,7 @@ void sub_StateChange_Vaati2_Main(void) {
     gArea.bgm = gArea.queued_bgm;
 }
 
-u32 sub_unk3_Vaati3_Main() {
+u32 sub_unk3_Vaati3_Main(void) {
     return 1;
 }
 
@@ -3546,29 +3555,29 @@ void sub_StateChange_Vaati3_Main(void) {
     }
 }
 
-u32 sub_unk3_DarkHyruleCastleBridge_Main() {
+u32 sub_unk3_DarkHyruleCastleBridge_Main(void) {
     return 1;
 }
 
-void sub_StateChange_DarkHyruleCastleBridge_Main() {
+void sub_StateChange_DarkHyruleCastleBridge_Main(void) {
     sub_0805B4D0(6);
 }
 
-u32 sub_unk3_VaatisArms_First() {
+u32 sub_unk3_VaatisArms_First(void) {
     return 1;
 }
 
-void sub_StateChange_VaatisArms_First() {
+void sub_StateChange_VaatisArms_First(void) {
 }
 
-u32 sub_unk3_VaatisArms_Second() {
+u32 sub_unk3_VaatisArms_Second(void) {
     return 1;
 }
 
-void sub_StateChange_VaatisArms_Second() {
+void sub_StateChange_VaatisArms_Second(void) {
 }
 
-u32 sub_unk3_DarkHyruleCastleOutside_ZeldaStatuePlatform() {
+u32 sub_unk3_DarkHyruleCastleOutside_ZeldaStatuePlatform(void) {
     sub_080534AC();
     return 1;
 }
@@ -3614,7 +3623,7 @@ void sub_0804D810(void) {
     }
 }
 
-u32 sub_unk3_DarkHyruleCastleOutside_Garden() {
+u32 sub_unk3_DarkHyruleCastleOutside_Garden(void) {
     return 1;
 }
 
@@ -3645,53 +3654,53 @@ void sub_StateChange_DarkHyruleCastleOutside_Garden(void) {
     ClearGlobalFlag(0x5d);
 }
 
-u32 sub_unk3_DarkHyruleCastleOutside_OutsideNorthwest() {
+u32 sub_unk3_DarkHyruleCastleOutside_OutsideNorthwest(void) {
     return 1;
 }
 
-void sub_StateChange_Dojos_ToGrimblade0() {
+void sub_StateChange_Dojos_ToGrimblade0(void) {
 }
 
-u32 sub_unk3_DarkHyruleCastleOutside_OutsideNortheast() {
+u32 sub_unk3_DarkHyruleCastleOutside_OutsideNortheast(void) {
     return 1;
 }
 
-void sub_StateChange_Dojos_ToGrimblade1() {
+void sub_StateChange_Dojos_ToGrimblade1(void) {
 }
 
-u32 sub_unk3_DarkHyruleCastleOutside_OutsideEast() {
+u32 sub_unk3_DarkHyruleCastleOutside_OutsideEast(void) {
     return 1;
 }
 
-void sub_StateChange_Dojos_ToGrimblade2() {
+void sub_StateChange_Dojos_ToGrimblade2(void) {
 }
 
-u32 sub_unk3_DarkHyruleCastleOutside_OutsideSouthwest() {
+u32 sub_unk3_DarkHyruleCastleOutside_OutsideSouthwest(void) {
     return 1;
 }
 
-void sub_StateChange_Dojos_ToGrimblade3() {
+void sub_StateChange_Dojos_ToGrimblade3(void) {
 }
 
-u32 sub_unk3_DarkHyruleCastleOutside_OutsideSouth() {
+u32 sub_unk3_DarkHyruleCastleOutside_OutsideSouth(void) {
     return 1;
 }
 
-void sub_StateChange_Dojos_ToGrimblade4() {
+void sub_StateChange_Dojos_ToGrimblade4(void) {
 }
 
-u32 sub_unk3_DarkHyruleCastleOutside_OutsideSoutheast() {
+u32 sub_unk3_DarkHyruleCastleOutside_OutsideSoutheast(void) {
     return 1;
 }
 
-void sub_StateChange_Dojos_ToGrimblade5() {
+void sub_StateChange_Dojos_ToGrimblade5(void) {
 }
 
-u32 sub_unk3_DarkHyruleCastleOutside_8() {
+u32 sub_unk3_DarkHyruleCastleOutside_8(void) {
     return 1;
 }
 
-void sub_StateChange_Dojos_ToGrimblade6() {
+void sub_StateChange_Dojos_ToGrimblade6(void) {
 }
 
 extern u32 gUnk_080EB604;
@@ -3726,7 +3735,7 @@ void sub_StateChange_DarkHyruleCastle_0(void) {
 
 extern EntityData gUnk_080EB684;
 
-void sub_0804D9B0(void) {
+static void sub_0804D9B0(void) {
     sub_0807BB98(0x797, 1, 5, 1);
     sub_0807BB98(0x357, 1, 5, 1);
     sub_0807BB98(0x55f, 1, 2, 1);
@@ -3734,39 +3743,39 @@ void sub_0804D9B0(void) {
     gArea.queued_bgm = gArea.bgm;
 }
 
-u32 sub_unk3_DarkHyruleCastle_1() {
+u32 sub_unk3_DarkHyruleCastle_1(void) {
     return 1;
 }
 
-void sub_StateChange_Dojos_ToGrimblade7() {
+void sub_StateChange_Dojos_ToGrimblade7(void) {
 }
 
-u32 sub_unk3_DarkHyruleCastle_2() {
+u32 sub_unk3_DarkHyruleCastle_2(void) {
     return 1;
 }
 
-void sub_StateChange_Dojos_ToGrimblade8() {
+void sub_StateChange_Dojos_ToGrimblade8(void) {
 }
 
-u32 sub_unk3_DarkHyruleCastle_3() {
+u32 sub_unk3_DarkHyruleCastle_3(void) {
     return 1;
 }
 
-void sub_StateChange_Dojos_ToGrimblade9() {
+void sub_StateChange_Dojos_ToGrimblade9(void) {
 }
 
-u32 sub_unk3_DarkHyruleCastle_4() {
+u32 sub_unk3_DarkHyruleCastle_4(void) {
     return 1;
 }
 
-void sub_StateChange_Dojos_ToSplitblade0() {
+void sub_StateChange_Dojos_ToSplitblade0(void) {
 }
 
-u32 sub_unk3_DarkHyruleCastle_5() {
+u32 sub_unk3_DarkHyruleCastle_5(void) {
     return 1;
 }
 
-void sub_StateChange_Dojos_ToSplitblade1() {
+void sub_StateChange_Dojos_ToSplitblade1(void) {
 }
 
 u32 sub_unk3_DarkHyruleCastle_6(void) {
@@ -3796,55 +3805,55 @@ void sub_StateChange_DarkHyruleCastle_6(void) {
     }
 }
 
-u32 sub_unk3_DarkHyruleCastle_7() {
+u32 sub_unk3_DarkHyruleCastle_7(void) {
     return 1;
 }
 
-void sub_StateChange_Dojos_ToSplitblade2() {
+void sub_StateChange_Dojos_ToSplitblade2(void) {
 }
 
-u32 sub_unk3_DarkHyruleCastle_8() {
+u32 sub_unk3_DarkHyruleCastle_8(void) {
     return 1;
 }
 
-void sub_StateChange_Dojos_ToSplitblade3() {
+void sub_StateChange_Dojos_ToSplitblade3(void) {
 }
 
-u32 sub_unk3_DarkHyruleCastle_9() {
+u32 sub_unk3_DarkHyruleCastle_9(void) {
     return 1;
 }
 
-void sub_StateChange_Dojos_ToSplitblade4() {
+void sub_StateChange_Dojos_ToSplitblade4(void) {
 }
 
-u32 sub_unk3_DarkHyruleCastle_10() {
+u32 sub_unk3_DarkHyruleCastle_10(void) {
     return 1;
 }
 
-void sub_StateChange_Dojos_ToSplitblade5() {
+void sub_StateChange_Dojos_ToSplitblade5(void) {
 }
 
-u32 sub_unk3_DarkHyruleCastle_11() {
+u32 sub_unk3_DarkHyruleCastle_11(void) {
     return 1;
 }
 
-void sub_StateChange_Dojos_ToSplitblade6() {
+void sub_StateChange_Dojos_ToSplitblade6(void) {
 }
 
-u32 sub_unk3_DarkHyruleCastle_12() {
+u32 sub_unk3_DarkHyruleCastle_12(void) {
     return 1;
 }
-void sub_StateChange_Dojos_ToSplitblade7() {
+void sub_StateChange_Dojos_ToSplitblade7(void) {
 }
 
-u32 sub_unk3_DarkHyruleCastle_13() {
+u32 sub_unk3_DarkHyruleCastle_13(void) {
     return 1;
 }
 
-void sub_StateChange_Dojos_ToSplitblade8() {
+void sub_StateChange_Dojos_ToSplitblade8(void) {
 }
 
-u32 sub_unk3_DarkHyruleCastle_14() {
+u32 sub_unk3_DarkHyruleCastle_14(void) {
     return 1;
 }
 
@@ -3856,14 +3865,14 @@ void sub_StateChange_DarkHyruleCastle_14(void) {
     }
 }
 
-u32 sub_unk3_DarkHyruleCastle_15() {
+u32 sub_unk3_DarkHyruleCastle_15(void) {
     return 1;
 }
 
-void sub_StateChange_Dojos_ToSplitblade9() {
+void sub_StateChange_Dojos_ToSplitblade9(void) {
 }
 
-u32 sub_unk3_DarkHyruleCastle_16() {
+u32 sub_unk3_DarkHyruleCastle_16(void) {
     return 1;
 }
 
@@ -3875,21 +3884,21 @@ void sub_StateChange_DarkHyruleCastle_16(void) {
     }
 }
 
-u32 sub_unk3_DarkHyruleCastle_17() {
+u32 sub_unk3_DarkHyruleCastle_17(void) {
     return 1;
 }
 
-void sub_StateChange_Dojos_ToGreatblade0() {
+void sub_StateChange_Dojos_ToGreatblade0(void) {
 }
 
-u32 sub_unk3_DarkHyruleCastle_18() {
+u32 sub_unk3_DarkHyruleCastle_18(void) {
     return 1;
 }
 
-void sub_StateChange_Dojos_ToGreatblade1() {
+void sub_StateChange_Dojos_ToGreatblade1(void) {
 }
 
-u32 sub_unk3_DarkHyruleCastle_19() {
+u32 sub_unk3_DarkHyruleCastle_19(void) {
     return 1;
 }
 
@@ -3901,14 +3910,14 @@ void sub_StateChange_DarkHyruleCastle_19(void) {
     }
 }
 
-u32 sub_unk3_DarkHyruleCastle_20() {
+u32 sub_unk3_DarkHyruleCastle_20(void) {
     return 1;
 }
 
-void sub_StateChange_Dojos_ToGreatblade2() {
+void sub_StateChange_Dojos_ToGreatblade2(void) {
 }
 
-u32 sub_unk3_DarkHyruleCastle_21() {
+u32 sub_unk3_DarkHyruleCastle_21(void) {
     return 1;
 }
 
@@ -3920,46 +3929,46 @@ void sub_StateChange_DarkHyruleCastle_21(void) {
     }
 }
 
-u32 sub_unk3_DarkHyruleCastle_22() {
+u32 sub_unk3_DarkHyruleCastle_22(void) {
     return 1;
 }
 
-void sub_StateChange_Dojos_ToGreatblade3() {
+void sub_StateChange_Dojos_ToGreatblade3(void) {
 }
 
-u32 sub_unk3_DarkHyruleCastle_23() {
+u32 sub_unk3_DarkHyruleCastle_23(void) {
     return 1;
 }
 
-void sub_StateChange_Dojos_ToGreatblade4() {
+void sub_StateChange_Dojos_ToGreatblade4(void) {
 }
 
-u32 sub_unk3_DarkHyruleCastle_24() {
+u32 sub_unk3_DarkHyruleCastle_24(void) {
     return 1;
 }
 
-void sub_StateChange_Dojos_ToGreatblade5() {
+void sub_StateChange_Dojos_ToGreatblade5(void) {
 }
 
-u32 sub_unk3_DarkHyruleCastle_25() {
+u32 sub_unk3_DarkHyruleCastle_25(void) {
     return 1;
 }
 
-void sub_StateChange_Dojos_ToGreatblade6() {
+void sub_StateChange_Dojos_ToGreatblade6(void) {
 }
 
-u32 sub_unk3_DarkHyruleCastle_26() {
+u32 sub_unk3_DarkHyruleCastle_26(void) {
     return 1;
 }
 
-void sub_StateChange_Dojos_ToGreatblade7() {
+void sub_StateChange_Dojos_ToGreatblade7(void) {
 }
 
-u32 sub_unk3_DarkHyruleCastle_27() {
+u32 sub_unk3_DarkHyruleCastle_27(void) {
     return 1;
 }
 
-void sub_StateChange_Dojos_ToGreatblade8() {
+void sub_StateChange_Dojos_ToGreatblade8(void) {
 }
 
 u32 sub_unk3_DarkHyruleCastle_28(void) {
@@ -3979,18 +3988,18 @@ void sub_StateChange_DarkHyruleCastle_28(void) {
     }
 }
 
-u32 sub_unk3_DarkHyruleCastle_29() {
+u32 sub_unk3_DarkHyruleCastle_29(void) {
     return 1;
 }
 
-void sub_StateChange_Dojos_ToGreatblade9() {
+void sub_StateChange_Dojos_ToGreatblade9(void) {
 }
 
-u32 sub_unk3_DarkHyruleCastle_30() {
+u32 sub_unk3_DarkHyruleCastle_30(void) {
     return 1;
 }
 
-void sub_StateChange_Dojos_ToScarblade0() {
+void sub_StateChange_Dojos_ToScarblade0(void) {
 }
 
 extern u32 gUnk_080ED1E4;
@@ -4009,151 +4018,151 @@ void sub_StateChange_DarkHyruleCastle_31(void) {
     }
 }
 
-u32 sub_unk3_DarkHyruleCastle_32() {
+u32 sub_unk3_DarkHyruleCastle_32(void) {
     return 1;
 }
 
-void sub_StateChange_Dojos_ToScarblade1() {
+void sub_StateChange_Dojos_ToScarblade1(void) {
 }
 
-u32 sub_unk3_DarkHyruleCastle_33() {
+u32 sub_unk3_DarkHyruleCastle_33(void) {
     return 1;
 }
 
-void sub_StateChange_Dojos_ToScarblade2() {
+void sub_StateChange_Dojos_ToScarblade2(void) {
 }
 
-u32 sub_unk3_DarkHyruleCastle_34() {
+u32 sub_unk3_DarkHyruleCastle_34(void) {
     return 1;
 }
 
-void sub_StateChange_Dojos_ToScarblade3() {
+void sub_StateChange_Dojos_ToScarblade3(void) {
 }
 
-u32 sub_unk3_DarkHyruleCastle_35() {
+u32 sub_unk3_DarkHyruleCastle_35(void) {
     return 1;
 }
 
-void sub_StateChange_Dojos_ToScarblade4() {
+void sub_StateChange_Dojos_ToScarblade4(void) {
 }
 
-u32 sub_unk3_DarkHyruleCastle_36() {
+u32 sub_unk3_DarkHyruleCastle_36(void) {
     return 1;
 }
 
-void sub_StateChange_Dojos_ToScarblade5() {
+void sub_StateChange_Dojos_ToScarblade5(void) {
 }
 
-u32 sub_unk3_DarkHyruleCastle_37() {
+u32 sub_unk3_DarkHyruleCastle_37(void) {
     return 1;
 }
 
-void sub_StateChange_Dojos_ToScarblade6() {
+void sub_StateChange_Dojos_ToScarblade6(void) {
 }
 
-u32 sub_unk3_DarkHyruleCastle_38() {
+u32 sub_unk3_DarkHyruleCastle_38(void) {
     return 1;
 }
 
-void sub_StateChange_Dojos_ToScarblade7() {
+void sub_StateChange_Dojos_ToScarblade7(void) {
 }
 
-u32 sub_unk3_DarkHyruleCastle_39() {
+u32 sub_unk3_DarkHyruleCastle_39(void) {
     return 1;
 }
 
-void sub_StateChange_Dojos_ToScarblade8() {
+void sub_StateChange_Dojos_ToScarblade8(void) {
 }
 
-u32 sub_unk3_DarkHyruleCastle_40() {
+u32 sub_unk3_DarkHyruleCastle_40(void) {
     return 1;
 }
 
-void sub_StateChange_Dojos_ToScarblade9() {
+void sub_StateChange_Dojos_ToScarblade9(void) {
 }
 
-u32 sub_unk3_DarkHyruleCastle_41() {
+u32 sub_unk3_DarkHyruleCastle_41(void) {
     return 1;
 }
 
-void sub_StateChange_GoronCave_StairsToCave0() {
+void sub_StateChange_GoronCave_StairsToCave0(void) {
 }
 
-u32 sub_unk3_DarkHyruleCastle_42() {
+u32 sub_unk3_DarkHyruleCastle_42(void) {
     return 1;
 }
 
-void sub_StateChange_GoronCave_StairsToCave1() {
+void sub_StateChange_GoronCave_StairsToCave1(void) {
 }
 
-u32 sub_unk3_DarkHyruleCastle_43() {
+u32 sub_unk3_DarkHyruleCastle_43(void) {
     return 1;
 }
 
-void sub_StateChange_GoronCave_StairsToCave2() {
+void sub_StateChange_GoronCave_StairsToCave2(void) {
 }
 
-u32 sub_unk3_DarkHyruleCastle_44() {
+u32 sub_unk3_DarkHyruleCastle_44(void) {
     return 1;
 }
 
-void sub_StateChange_GoronCave_StairsToCave3() {
+void sub_StateChange_GoronCave_StairsToCave3(void) {
 }
 
-u32 sub_unk3_DarkHyruleCastle_45() {
+u32 sub_unk3_DarkHyruleCastle_45(void) {
     return 1;
 }
 
-void sub_StateChange_GoronCave_StairsToCave4() {
+void sub_StateChange_GoronCave_StairsToCave4(void) {
 }
 
-u32 sub_unk3_DarkHyruleCastle_46() {
+u32 sub_unk3_DarkHyruleCastle_46(void) {
     return 1;
 }
 
-void sub_StateChange_GoronCave_StairsToCave5() {
+void sub_StateChange_GoronCave_StairsToCave5(void) {
 }
 
-u32 sub_unk3_DarkHyruleCastle_47() {
+u32 sub_unk3_DarkHyruleCastle_47(void) {
     return 1;
 }
 
-void sub_StateChange_GoronCave_StairsToCave6() {
+void sub_StateChange_GoronCave_StairsToCave6(void) {
 }
 
-u32 sub_unk3_DarkHyruleCastle_48() {
+u32 sub_unk3_DarkHyruleCastle_48(void) {
     return 1;
 }
 
-void sub_StateChange_GoronCave_StairsToCave7() {
+void sub_StateChange_GoronCave_StairsToCave7(void) {
 }
 
-u32 sub_unk3_DarkHyruleCastle_49() {
+u32 sub_unk3_DarkHyruleCastle_49(void) {
     return 1;
 }
 
-void sub_StateChange_GoronCave_StairsToCave8() {
+void sub_StateChange_GoronCave_StairsToCave8(void) {
 }
 
-u32 sub_unk3_DarkHyruleCastle_50() {
+u32 sub_unk3_DarkHyruleCastle_50(void) {
     return 1;
 }
 
-void sub_StateChange_GoronCave_StairsToCave9() {
+void sub_StateChange_GoronCave_StairsToCave9(void) {
 }
 
-u32 sub_unk3_DarkHyruleCastle_51() {
+u32 sub_unk3_DarkHyruleCastle_51(void) {
     return 1;
 }
 
-void sub_StateChange_Ruins_Beanstalk0() {
+void sub_StateChange_Ruins_Beanstalk0(void) {
 }
 
-u32 sub_unk3_DarkHyruleCastle_52() {
+u32 sub_unk3_DarkHyruleCastle_52(void) {
     return 1;
 }
 
-void sub_StateChange_Ruins_Beanstalk1() {
+void sub_StateChange_Ruins_Beanstalk1(void) {
 }
 
 u32 sub_unk3_DarkHyruleCastle_53(void) {
@@ -4174,11 +4183,11 @@ void sub_StateChange_DarkHyruleCastle_53(void) {
     }
 }
 
-u32 sub_unk3_DarkHyruleCastle_54() {
+u32 sub_unk3_DarkHyruleCastle_54(void) {
     return 1;
 }
 
-void sub_StateChange_Ruins_Beanstalk2() {
+void sub_StateChange_Ruins_Beanstalk2(void) {
 }
 
 u32 sub_unk3_DarkHyruleCastle_55(void) {
@@ -4198,14 +4207,14 @@ void sub_StateChange_DarkHyruleCastle_55(void) {
     }
 }
 
-u32 sub_unk3_DarkHyruleCastle_56() {
+u32 sub_unk3_DarkHyruleCastle_56(void) {
     return 1;
 }
 
-void sub_StateChange_Ruins_Beanstalk3() {
+void sub_StateChange_Ruins_Beanstalk3(void) {
 }
 
-u32 sub_unk3_DarkHyruleCastle_57() {
+u32 sub_unk3_DarkHyruleCastle_57(void) {
     return 1;
 }
 
@@ -4217,11 +4226,11 @@ void sub_StateChange_DarkHyruleCastle_57(void) {
     }
 }
 
-u32 sub_unk3_DarkHyruleCastle_58() {
+u32 sub_unk3_DarkHyruleCastle_58(void) {
     return 1;
 }
 
-void sub_StateChange_Ruins_Beanstalk4() {
+void sub_StateChange_Ruins_Beanstalk4(void) {
 }
 
 ASM_FUNC("asm/non_matching/sub_unk3_HyruleTown_0.inc", u32 sub_unk3_HyruleTown_0(void))
@@ -4338,95 +4347,95 @@ void sub_unk1_HyruleTown_8(void) {
 
 ASM_FUNC("asm/non_matching/sub_0804E150.inc", void sub_0804E150(void))
 
-u32 sub_unk3_HyruleTownMinishCaves_Entrance() {
+u32 sub_unk3_HyruleTownMinishCaves_Entrance(void) {
     return 1;
 }
 
-void sub_StateChange_HyruleTownMinishCaves_Entrance() {
+void sub_StateChange_HyruleTownMinishCaves_Entrance(void) {
 }
 
-u32 sub_unk3_HyruleTownMinishCaves_NorthRoom() {
+u32 sub_unk3_HyruleTownMinishCaves_NorthRoom(void) {
     return 1;
 }
 
-void sub_StateChange_HyruleTownMinishCaves_NorthRoom() {
+void sub_StateChange_HyruleTownMinishCaves_NorthRoom(void) {
 }
 
-u32 sub_unk3_HyruleTownMinishCaves_PacciJump() {
+u32 sub_unk3_HyruleTownMinishCaves_PacciJump(void) {
     return 1;
 }
 
-void sub_StateChange_HyruleTownMinishCaves_PacciJump() {
+void sub_StateChange_HyruleTownMinishCaves_PacciJump(void) {
 }
 
-u32 sub_unk3_HyruleTownMinishCaves_MulldozerFight() {
+u32 sub_unk3_HyruleTownMinishCaves_MulldozerFight(void) {
     return 1;
 }
 
-void sub_StateChange_HyruleTownMinishCaves_MulldozerFight() {
+void sub_StateChange_HyruleTownMinishCaves_MulldozerFight(void) {
 }
 
-u32 sub_unk3_HyruleTownMinishCaves_WestChest() {
+u32 sub_unk3_HyruleTownMinishCaves_WestChest(void) {
     return 1;
 }
 
-void sub_StateChange_HyruleTownMinishCaves_WestChest() {
+void sub_StateChange_HyruleTownMinishCaves_WestChest(void) {
 }
 
-u32 sub_unk3_HyruleTownMinishCaves_Flippers() {
+u32 sub_unk3_HyruleTownMinishCaves_Flippers(void) {
     return 1;
 }
 
-void sub_StateChange_HyruleTownMinishCaves_Flippers() {
+void sub_StateChange_HyruleTownMinishCaves_Flippers(void) {
 }
 
-u32 sub_unk3_HyruleTownMinishCaves_Librari() {
+u32 sub_unk3_HyruleTownMinishCaves_Librari(void) {
     return 1;
 }
 
-void sub_StateChange_HyruleTownMinishCaves_Librari() {
+void sub_StateChange_HyruleTownMinishCaves_Librari(void) {
 }
 
-u32 sub_unk3_HyruleTownMinishCaves_WestFrozenChest() {
+u32 sub_unk3_HyruleTownMinishCaves_WestFrozenChest(void) {
     return 1;
 }
 
-void sub_StateChange_HyruleTownMinishCaves_WestFrozenChest() {
+void sub_StateChange_HyruleTownMinishCaves_WestFrozenChest(void) {
 }
 
-u32 sub_unk3_HyruleTownMinishCaves_CrossIntersection() {
+u32 sub_unk3_HyruleTownMinishCaves_CrossIntersection(void) {
     return 1;
 }
 
-void sub_StateChange_HyruleTownMinishCaves_CrossIntersection() {
+void sub_StateChange_HyruleTownMinishCaves_CrossIntersection(void) {
 }
 
-u32 sub_unk3_HyruleTownMinishCaves_SoutheastCorner() {
+u32 sub_unk3_HyruleTownMinishCaves_SoutheastCorner(void) {
     return 1;
 }
 
-void sub_StateChange_HyruleTownMinishCaves_SoutheastCorner() {
+void sub_StateChange_HyruleTownMinishCaves_SoutheastCorner(void) {
 }
 
-u32 sub_unk3_HyruleTownMinishCaves_Entrance2() {
+u32 sub_unk3_HyruleTownMinishCaves_Entrance2(void) {
     return 1;
 }
 
-void sub_StateChange_HyruleTownMinishCaves_Entrance2() {
+void sub_StateChange_HyruleTownMinishCaves_Entrance2(void) {
 }
 
-u32 sub_unk3_HyruleTownUnderground_Main() {
+u32 sub_unk3_HyruleTownUnderground_Main(void) {
     return 1;
 }
 
-void sub_StateChange_HyruleTownUnderground_Main() {
+void sub_StateChange_HyruleTownUnderground_Main(void) {
 }
 
-u32 sub_unk3_HyruleTownUnderground_Well() {
+u32 sub_unk3_HyruleTownUnderground_Well(void) {
     return 1;
 }
 
-void sub_StateChange_HyruleTownUnderground_Well() {
+void sub_StateChange_HyruleTownUnderground_Well(void) {
 }
 
 extern u32 gUnk_080F09A0;
@@ -4505,7 +4514,7 @@ void sub_StateChange_CastleGarden_Main(void) {
     sub_080AF284();
 }
 
-u32 sub_unk3_SimonsSimulation_Main() {
+u32 sub_unk3_SimonsSimulation_Main(void) {
     ClearLocalFlag(1);
     return 1;
 }
@@ -4518,7 +4527,7 @@ extern struct {
     u32 unk_04;
 } gUnk_080F0E1C[];
 
-void sub_StateChange_SimonsSimulation_Main() {
+void sub_StateChange_SimonsSimulation_Main(void) {
     u32 r;
     u32 index;
     u32 tmp;
@@ -4544,7 +4553,7 @@ void sub_StateChange_SimonsSimulation_Main() {
     SoundReq(SONG_STOP_BGM);
 }
 
-u32 sub_unk3_HouseInteriors2_Stranger() {
+u32 sub_unk3_HouseInteriors2_Stranger(void) {
     return 1;
 }
 
@@ -4559,7 +4568,7 @@ void sub_StateChange_HouseInteriors2_Stranger(void) {
     }
 }
 
-u32 sub_unk3_HouseInteriors2_WestOracle() {
+u32 sub_unk3_HouseInteriors2_WestOracle(void) {
     return 1;
 }
 
@@ -4577,21 +4586,21 @@ void sub_StateChange_HouseInteriors2_WestOracle(void) {
     }
 }
 
-u32 sub_unk3_HouseInteriors2_2() {
+u32 sub_unk3_HouseInteriors2_2(void) {
     return 1;
 }
 
-void sub_StateChange_Ruins_Beanstalk5() {
+void sub_StateChange_Ruins_Beanstalk5(void) {
 }
 
-u32 sub_unk3_HouseInteriors2_3() {
+u32 sub_unk3_HouseInteriors2_3(void) {
     return 1;
 }
 
-void sub_StateChange_Ruins_Beanstalk6() {
+void sub_StateChange_Ruins_Beanstalk6(void) {
 }
 
-u32 sub_unk3_HouseInteriors2_DrLeft() {
+u32 sub_unk3_HouseInteriors2_DrLeft(void) {
     return 1;
 }
 
@@ -4609,7 +4618,7 @@ void sub_StateChange_HouseInteriors2_DrLeft(void) {
     }
 }
 
-u32 sub_unk3_HouseInteriors2_Romio() {
+u32 sub_unk3_HouseInteriors2_Romio(void) {
     return 1;
 }
 
@@ -4628,7 +4637,7 @@ void sub_StateChange_HouseInteriors2_Romio(void) {
     }
 }
 
-u32 sub_unk3_HouseInteriors2_Julietta() {
+u32 sub_unk3_HouseInteriors2_Julietta(void) {
     return 1;
 }
 
@@ -4669,7 +4678,7 @@ void sub_StateChange_HouseInteriors2_Julietta(void) {
     }
 }
 
-u32 sub_unk3_HouseInteriors2_Percy() {
+u32 sub_unk3_HouseInteriors2_Percy(void) {
     return 1;
 }
 
@@ -4696,7 +4705,7 @@ void sub_StateChange_HouseInteriors2_Percy(void) {
     }
 }
 
-u32 sub_unk3_HouseInteriors2_EastOracle() {
+u32 sub_unk3_HouseInteriors2_EastOracle(void) {
     return 1;
 }
 
@@ -4714,28 +4723,28 @@ void sub_StateChange_HouseInteriors2_EastOracle(void) {
     }
 }
 
-u32 sub_unk3_HouseInteriors2_A() {
+u32 sub_unk3_HouseInteriors2_A(void) {
     return 1;
 }
 
-void sub_StateChange_Ruins_Beanstalk7() {
+void sub_StateChange_Ruins_Beanstalk7(void) {
 }
 
-u32 sub_unk3_HouseInteriors2_B() {
+u32 sub_unk3_HouseInteriors2_B(void) {
     return 1;
 }
 
-void sub_StateChange_Ruins_Beanstalk8() {
+void sub_StateChange_Ruins_Beanstalk8(void) {
 }
 
-u32 sub_unk3_HouseInteriors2_Cucco() {
+u32 sub_unk3_HouseInteriors2_Cucco(void) {
     return 1;
 }
 
-void sub_StateChange_Ruins_Beanstalk9() {
+void sub_StateChange_Ruins_Beanstalk9(void) {
 }
 
-u32 sub_unk3_HouseInteriors2_LinksHouseEntrance() {
+u32 sub_unk3_HouseInteriors2_LinksHouseEntrance(void) {
     return 1;
 }
 
@@ -4751,7 +4760,7 @@ void sub_StateChange_HouseInteriors2_LinksHouseEntrance(void) {
     }
 }
 
-u32 sub_unk3_HouseInteriors2_LinksHouseSmith() {
+u32 sub_unk3_HouseInteriors2_LinksHouseSmith(void) {
     return 1;
 }
 
@@ -4770,7 +4779,7 @@ void sub_StateChange_HouseInteriors2_LinksHouseSmith(void) {
     }
 }
 
-u32 sub_unk3_HouseInteriors2_Dampe() {
+u32 sub_unk3_HouseInteriors2_Dampe(void) {
     return 1;
 }
 
@@ -4782,7 +4791,7 @@ void sub_StateChange_HouseInteriors2_Dampe(void) {
     }
 }
 
-u32 sub_unk3_HouseInteriors2_Stockwell() {
+u32 sub_unk3_HouseInteriors2_Stockwell(void) {
     return 1;
 }
 
@@ -4795,7 +4804,7 @@ void sub_StateChange_HouseInteriors2_Stockwell(void) {
     }
 }
 
-u32 sub_unk3_HouseInteriors2_LinksHouseBedroom() {
+u32 sub_unk3_HouseInteriors2_LinksHouseBedroom(void) {
     return 1;
 }
 
@@ -4827,7 +4836,7 @@ void sub_0804E864(void) {
     ModHealth(0xa0);
 }
 
-u32 sub_unk3_HouseInteriors4_Carpenter() {
+u32 sub_unk3_HouseInteriors4_Carpenter(void) {
     return 1;
 }
 
@@ -4843,15 +4852,15 @@ void sub_StateChange_HouseInteriors4_Carpenter(void) {
     }
 }
 
-u32 sub_unk3_HouseInteriors4_Swiftblade() {
+u32 sub_unk3_HouseInteriors4_Swiftblade(void) {
     return 1;
 }
 
-void sub_StateChange_HouseInteriors4_Swiftblade() {
+void sub_StateChange_HouseInteriors4_Swiftblade(void) {
     sub_08054564();
 }
 
-u32 sub_unk3_HouseInteriors4_RanchHouseWest() {
+u32 sub_unk3_HouseInteriors4_RanchHouseWest(void) {
     return 1;
 }
 
@@ -4866,7 +4875,7 @@ void sub_StateChange_HouseInteriors4_RanchHouseWest(void) {
     }
 }
 
-u32 sub_unk3_HouseInteriors4_RanchHouseEast() {
+u32 sub_unk3_HouseInteriors4_RanchHouseEast(void) {
     return 1;
 }
 
@@ -4878,14 +4887,14 @@ void sub_StateChange_HouseInteriors4_RanchHouseEast(void) {
     }
 }
 
-u32 sub_unk3_HouseInteriors4_FarmHouse() {
+u32 sub_unk3_HouseInteriors4_FarmHouse(void) {
     return 1;
 }
 
-void sub_StateChange_Ruins_LadderToTektites0() {
+void sub_StateChange_Ruins_LadderToTektites0(void) {
 }
 
-u32 sub_unk3_HouseInteriors4_Mayor() {
+u32 sub_unk3_HouseInteriors4_Mayor(void) {
     return 1;
 }
 
@@ -4943,74 +4952,74 @@ void sub_StateChange_LakeHylia_Main(void) {
     SetTile(0x4091, 0x694, 1);
 }
 
-u32 sub_unk3_LakeHylia_Beanstalk() {
+u32 sub_unk3_LakeHylia_Beanstalk(void) {
     return 1;
 }
 
-void sub_StateChange_Ruins_LadderToTektites1() {
+void sub_StateChange_Ruins_LadderToTektites1(void) {
 }
 
-u32 sub_unk3_LakeWoodsCave_Main() {
+u32 sub_unk3_LakeWoodsCave_Main(void) {
     return 1;
 }
 
-void sub_StateChange_Ruins_LadderToTektites2() {
+void sub_StateChange_Ruins_LadderToTektites2(void) {
 }
 
-u32 sub_unk3_HyliaDigCaves_Middle() {
+u32 sub_unk3_HyliaDigCaves_Middle(void) {
     return 1;
 }
 
-void sub_StateChange_Ruins_LadderToTektites3() {
+void sub_StateChange_Ruins_LadderToTektites3(void) {
 }
 
-u32 sub_unk3_HyliaDigCaves_North() {
+u32 sub_unk3_HyliaDigCaves_North(void) {
     return 1;
 }
 
-void sub_StateChange_Ruins_LadderToTektites4() {
+void sub_StateChange_Ruins_LadderToTektites4(void) {
 }
 
-u32 sub_unk3_CastorWildsDigCave_Main() {
+u32 sub_unk3_CastorWildsDigCave_Main(void) {
     return 1;
 }
 
-void sub_StateChange_Ruins_LadderToTektites5() {
+void sub_StateChange_Ruins_LadderToTektites5(void) {
 }
 
-u32 sub_unk3_HyruleDigCaves_Main() {
+u32 sub_unk3_HyruleDigCaves_Main(void) {
     return 1;
 }
 
-void sub_StateChange_Ruins_LadderToTektites6() {
+void sub_StateChange_Ruins_LadderToTektites6(void) {
 }
 
-u32 sub_unk3_CrenelDigCave_Main() {
+u32 sub_unk3_CrenelDigCave_Main(void) {
     return 1;
 }
 
-void sub_StateChange_Ruins_LadderToTektites7() {
+void sub_StateChange_Ruins_LadderToTektites7(void) {
 }
 
-u32 sub_unk3_DigCaves1_HyruleFieldFarm() {
+u32 sub_unk3_DigCaves1_HyruleFieldFarm(void) {
     return 1;
 }
 
-void sub_StateChange_Ruins_LadderToTektites8() {
+void sub_StateChange_Ruins_LadderToTektites8(void) {
 }
 
-u32 sub_unk3_DigCaves1_TrilbyHighlands() {
+u32 sub_unk3_DigCaves1_TrilbyHighlands(void) {
     return 1;
 }
 
-void sub_StateChange_Ruins_LadderToTektites9() {
+void sub_StateChange_Ruins_LadderToTektites9(void) {
 }
 
-u32 sub_unk3_VeilFallsDigCave_Main() {
+u32 sub_unk3_VeilFallsDigCave_Main(void) {
     return 1;
 }
 
-void sub_StateChange_VeilFallsDigCave_Main() {
+void sub_StateChange_VeilFallsDigCave_Main(void) {
 }
 
 u32 sub_unk3_OuterFortressOfWinds_EntranceHall(void) {
@@ -5018,7 +5027,7 @@ u32 sub_unk3_OuterFortressOfWinds_EntranceHall(void) {
     return 1;
 }
 
-void sub_StateChange_OuterFortressOfWinds_EntranceHall() {
+void sub_StateChange_OuterFortressOfWinds_EntranceHall(void) {
 }
 
 u32 sub_unk3_OuterFortressOfWinds_2F(void) {
@@ -5026,7 +5035,7 @@ u32 sub_unk3_OuterFortressOfWinds_2F(void) {
     return 1;
 }
 
-void sub_StateChange_OuterFortressOfWinds_2F() {
+void sub_StateChange_OuterFortressOfWinds_2F(void) {
 }
 
 u32 sub_unk3_OuterFortressOfWinds_3F(void) {
@@ -5034,7 +5043,7 @@ u32 sub_unk3_OuterFortressOfWinds_3F(void) {
     return 1;
 }
 
-void sub_StateChange_OuterFortressOfWinds_3F() {
+void sub_StateChange_OuterFortressOfWinds_3F(void) {
 }
 
 u32 sub_unk3_OuterFortressOfWinds_MoleMitts(void) {
@@ -5043,7 +5052,7 @@ u32 sub_unk3_OuterFortressOfWinds_MoleMitts(void) {
     return 1;
 }
 
-void sub_StateChange_OuterFortressOfWinds_MoleMitts() {
+void sub_StateChange_OuterFortressOfWinds_MoleMitts(void) {
 }
 
 u32 sub_unk3_OuterFortressOfWinds_SmallKey(void) {
@@ -5052,7 +5061,7 @@ u32 sub_unk3_OuterFortressOfWinds_SmallKey(void) {
     return 1;
 }
 
-void sub_StateChange_OuterFortressOfWinds_SmallKey() {
+void sub_StateChange_OuterFortressOfWinds_SmallKey(void) {
 }
 
 extern u32 gUnk_080F4EB0;
@@ -5110,11 +5119,11 @@ void sub_unk1_MinishWoods_Main(void) {
     }
 }
 
-u32 sub_unk3_Empty_Main() {
+u32 sub_unk3_Empty_Main(void) {
     return 1;
 }
 
-void sub_StateChange_Empty_Main() {
+void sub_StateChange_Empty_Main(void) {
 }
 
 extern u32 gUnk_080F5348;
@@ -5144,11 +5153,11 @@ void sub_StateChange_SanctuaryEntrance_Main(void) {
     }
 }
 
-void sub_0804ED18(void) {
+static void sub_0804ED18(void) {
     gArea.queued_bgm = gArea.bgm;
 }
 
-u32 sub_unk3_Sanctuary_Hall() {
+u32 sub_unk3_Sanctuary_Hall(void) {
     return 1;
 }
 
@@ -5159,7 +5168,7 @@ void sub_StateChange_Sanctuary_Hall(void) {
     }
 }
 
-u32 sub_unk3_Sanctuary_Main() {
+u32 sub_unk3_Sanctuary_Main(void) {
     return 1;
 }
 
@@ -5211,7 +5220,7 @@ void sub_StateChange_Sanctuary_Main(void) {
     }
 }
 
-u32 sub_unk3_Sanctuary_StainedGlass() {
+u32 sub_unk3_Sanctuary_StainedGlass(void) {
     return 1;
 }
 
@@ -5226,7 +5235,7 @@ void sub_StateChange_Sanctuary_StainedGlass(void) {
     }
 }
 
-u32 sub_unk3_HouseInteriors3_StockwellShop() {
+u32 sub_unk3_HouseInteriors3_StockwellShop(void) {
     return 1;
 }
 
@@ -5275,14 +5284,14 @@ void sub_StateChange_HouseInteriors3_StockwellShop(void) {
     }
 }
 
-u32 sub_unk3_HouseInteriors3_Cafe() {
+u32 sub_unk3_HouseInteriors3_Cafe(void) {
     return 1;
 }
 
-void sub_StateChange_HouseInteriors3_Cafe() {
+void sub_StateChange_HouseInteriors3_Cafe(void) {
 }
 
-u32 sub_unk3_HouseInteriors3_RemShoeShop() {
+u32 sub_unk3_HouseInteriors3_RemShoeShop(void) {
     return 1;
 }
 
@@ -5296,10 +5305,10 @@ void sub_StateChange_HouseInteriors3_RemShoeShop(void) {
 #endif
 }
 
-u32 sub_unk3_HouseInteriors3_Bakery() {
+u32 sub_unk3_HouseInteriors3_Bakery(void) {
     return 1;
 }
-void sub_StateChange_HouseInteriors3_Bakery() {
+void sub_StateChange_HouseInteriors3_Bakery(void) {
 }
 
 u32 sub_unk3_HouseInteriors3_Simon(void) {
@@ -5321,7 +5330,7 @@ void sub_StateChange_HouseInteriors3_Simon(void) {
     }
 }
 
-u32 sub_unk3_HouseInteriors3_FigurineHouse() {
+u32 sub_unk3_HouseInteriors3_FigurineHouse(void) {
     return 1;
 }
 
@@ -5337,7 +5346,7 @@ void sub_StateChange_HouseInteriors3_FigurineHouse(void) {
     }
 }
 
-u32 sub_unk3_HouseInteriors3_BorlovEntrance() {
+u32 sub_unk3_HouseInteriors3_BorlovEntrance(void) {
     return 1;
 }
 
@@ -5356,18 +5365,18 @@ void sub_StateChange_HouseInteriors3_BorlovEntrance(void) {
     }
 }
 
-u32 sub_unk3_HouseInteriors3_Carlov() {
+u32 sub_unk3_HouseInteriors3_Carlov(void) {
     return 1;
 }
 
-void sub_StateChange_HouseInteriors3_Carlov() {
+void sub_StateChange_HouseInteriors3_Carlov(void) {
 }
 
-u32 sub_unk3_HouseInteriors3_Borlov() {
+u32 sub_unk3_HouseInteriors3_Borlov(void) {
     return 1;
 }
 
-void sub_StateChange_HouseInteriors3_Borlov() {
+void sub_StateChange_HouseInteriors3_Borlov(void) {
 }
 
 u32 sub_unk3_WindTribeTower_Entrance(void) {
@@ -5401,7 +5410,7 @@ void sub_StateChange_WindTribeTower_Entrance(void) {
     SetWorldMapPos(8, 0, 0x1e8, 0x158);
 }
 
-u32 sub_unk3_WindTribeTower_Floor2() {
+u32 sub_unk3_WindTribeTower_Floor2(void) {
     return 1;
 }
 
@@ -5418,14 +5427,14 @@ void sub_StateChange_WindTribeTower_Floor2(void) {
     }
 }
 
-u32 sub_unk3_WindTribeTower_Floor3() {
+u32 sub_unk3_WindTribeTower_Floor3(void) {
     return 1;
 }
 
-void sub_StateChange_WindTribeTower_Floor3() {
+void sub_StateChange_WindTribeTower_Floor3(void) {
 }
 
-u32 sub_unk3_WindTribeTower_Floor4() {
+u32 sub_unk3_WindTribeTower_Floor4(void) {
     return 1;
 }
 
@@ -5440,7 +5449,7 @@ void sub_StateChange_WindTribeTower_Floor4(void) {
     }
 }
 
-u32 sub_unk3_WindTribeTowerRoof_Main() {
+u32 sub_unk3_WindTribeTowerRoof_Main(void) {
     return 1;
 }
 
@@ -5457,81 +5466,81 @@ void sub_StateChange_WindTribeTowerRoof_Main(void) {
 #endif
 }
 
-u32 sub_unk3_Beanstalks_MountCrenel() {
+u32 sub_unk3_Beanstalks_MountCrenel(void) {
     return 1;
 }
 
-void sub_StateChange_Beanstalks_MountCrenel() {
+void sub_StateChange_Beanstalks_MountCrenel(void) {
 }
 
-u32 sub_unk3_Beanstalks_LakeHylia() {
+u32 sub_unk3_Beanstalks_LakeHylia(void) {
     return 1;
 }
 
-void sub_StateChange_Beanstalks_LakeHylia() {
+void sub_StateChange_Beanstalks_LakeHylia(void) {
 }
 
-u32 sub_unk3_Beanstalks_Ruins() {
+u32 sub_unk3_Beanstalks_Ruins(void) {
     return 1;
 }
 
-void sub_StateChange_Beanstalks_Ruins() {
+void sub_StateChange_Beanstalks_Ruins(void) {
 }
 
-u32 sub_unk3_Beanstalks_EasternHills() {
+u32 sub_unk3_Beanstalks_EasternHills(void) {
     return 1;
 }
 
-void sub_StateChange_Beanstalks_EasternHills() {
+void sub_StateChange_Beanstalks_EasternHills(void) {
 }
 
-u32 sub_unk3_Beanstalks_WesternWoods() {
+u32 sub_unk3_Beanstalks_WesternWoods(void) {
     return 1;
 }
 
-void sub_StateChange_Beanstalks_WesternWoods() {
+void sub_StateChange_Beanstalks_WesternWoods(void) {
 }
 
-u32 sub_unk3_Beanstalks_MountCrenelClimb() {
+u32 sub_unk3_Beanstalks_MountCrenelClimb(void) {
     return 1;
 }
 
-void sub_StateChange_Beanstalks_MountCrenelClimb() {
+void sub_StateChange_Beanstalks_MountCrenelClimb(void) {
 }
 
-u32 sub_unk3_Beanstalks_LakeHyliaClimb() {
+u32 sub_unk3_Beanstalks_LakeHyliaClimb(void) {
     return 1;
 }
 
-void sub_StateChange_Beanstalks_LakeHyliaClimb() {
+void sub_StateChange_Beanstalks_LakeHyliaClimb(void) {
 }
 
-u32 sub_unk3_Beanstalks_RuinsClimb() {
+u32 sub_unk3_Beanstalks_RuinsClimb(void) {
     return 1;
 }
 
-void sub_StateChange_Beanstalks_RuinsClimb() {
+void sub_StateChange_Beanstalks_RuinsClimb(void) {
 }
 
-u32 sub_unk3_Beanstalks_EasternHillsClimb() {
+u32 sub_unk3_Beanstalks_EasternHillsClimb(void) {
     return 1;
 }
 
-void sub_StateChange_Beanstalks_EasternHillsClimb() {
+void sub_StateChange_Beanstalks_EasternHillsClimb(void) {
 }
 
-u32 sub_unk3_Beanstalks_WesternWoodsClimb() {
+u32 sub_unk3_Beanstalks_WesternWoodsClimb(void) {
     return 1;
 }
 
-void sub_StateChange_Beanstalks_WesternWoodsClimb() {
+void sub_StateChange_Beanstalks_WesternWoodsClimb(void) {
 }
 
-u32 sub_unk3_HyruleField_WesternWoodSouth() {
+u32 sub_unk3_HyruleField_WesternWoodSouth(void) {
     return 1;
 }
 
-void sub_StateChange_HyruleField_WesternWoodSouth() {
+void sub_StateChange_HyruleField_WesternWoodSouth(void) {
     Manager18_Main(0);
 }
 
@@ -5578,19 +5587,19 @@ void sub_unk1_HyruleField_LinksHouseExterior(void) {
     }
 }
 
-u32 sub_unk3_HyruleField_FromMinishWoods() {
+u32 sub_unk3_HyruleField_FromMinishWoods(void) {
     return 1;
 }
 
-void sub_StateChange_HyruleField_FromMinishWoods() {
+void sub_StateChange_HyruleField_FromMinishWoods(void) {
     Manager18_Main(NULL);
 }
 
-u32 sub_unk3_HyruleField_FromMinishWoodsNorth() {
+u32 sub_unk3_HyruleField_FromMinishWoodsNorth(void) {
     return 1;
 }
 
-void sub_StateChange_HyruleField_FromMinishWoodsNorth() {
+void sub_StateChange_HyruleField_FromMinishWoodsNorth(void) {
     Manager18_Main(NULL);
 }
 
@@ -5620,7 +5629,7 @@ void sub_StateChange_HyruleField_Farmers(void) {
     }
 }
 
-u32 sub_unk3_HyruleField_LonLonRanch() {
+u32 sub_unk3_HyruleField_LonLonRanch(void) {
     return 1;
 }
 
@@ -5654,9 +5663,9 @@ void sub_StateChange_HyruleField_LonLonRanch(void) {
 }
 
 extern u32 gUnk_080F7CD0;
-extern void sub_0804F5E8();
+extern void sub_0804F5E8(void);
 extern u32 gUnk_080F7C80;
-extern void sub_0804F4E4();
+extern void sub_0804F4E4(void);
 
 u32 sub_unk3_HyruleField_OutsideCastle(void) {
     if (CheckGlobalFlag(TABIDACHI) && !GetInventoryValue(0x11)) {
@@ -5680,7 +5689,7 @@ u32 sub_unk3_HyruleField_OutsideCastle(void) {
     return 1;
 }
 
-void sub_0804F4E4() {
+void sub_0804F4E4(void) {
     Manager18_Main(NULL);
     sub_0804F578();
 }
@@ -5712,7 +5721,7 @@ void sub_StateChange_HyruleField_OutsideCastle(void) {
 
 extern EntityData gUnk_080F7DC0;
 
-void sub_0804F578(void) {
+static void sub_0804F578(void) {
 #if defined(JP) || defined(EU) || defined(DEMO_JP)
     if (!CheckLocalFlag(0x8c)) {
 #else
@@ -5862,7 +5871,7 @@ void sub_0804F9C8(void) {
     sub_0807BA8C(0x4d9, 1);
 }
 
-u32 sub_unk3_HyruleField_OutsideCastleWest() {
+u32 sub_unk3_HyruleField_OutsideCastleWest(void) {
     return 1;
 }
 
@@ -5875,7 +5884,7 @@ void sub_StateChange_HyruleField_OutsideCastleWest(void) {
     }
 }
 
-u32 sub_unk3_HyruleField_TrilbyHighlands() {
+u32 sub_unk3_HyruleField_TrilbyHighlands(void) {
     return 1;
 }
 
@@ -5892,7 +5901,7 @@ void sub_StateChange_HyruleField_TrilbyHighlands(void) {
     }
 }
 
-u32 sub_unk3_HyruleField_PercysHouse() {
+u32 sub_unk3_HyruleField_PercysHouse(void) {
     return 1;
 }
 
@@ -5905,7 +5914,7 @@ void sub_StateChange_HyruleField_PercysHouse(void) {
     }
 }
 
-u32 sub_unk3_Caves_Boomerang() {
+u32 sub_unk3_Caves_Boomerang(void) {
     return 1;
 }
 
@@ -5923,91 +5932,91 @@ void sub_StateChange_Caves_Boomerang(void) {
     }
 }
 
-u32 sub_unk3_Caves_ToGraveyard() {
+u32 sub_unk3_Caves_ToGraveyard(void) {
     return 1;
 }
 
-void sub_StateChange_Caves_ToGraveyard() {
+void sub_StateChange_Caves_ToGraveyard(void) {
 }
 
-u32 sub_unk3_Caves_2() {
+u32 sub_unk3_Caves_2(void) {
     return 1;
 }
 
-void sub_StateChange_Caves_2() {
+void sub_StateChange_Caves_2(void) {
 }
 
-u32 sub_unk3_Caves_3() {
+u32 sub_unk3_Caves_3(void) {
     return 1;
 }
 
-void sub_StateChange_Caves_3() {
+void sub_StateChange_Caves_3(void) {
 }
 
-u32 sub_unk3_Caves_4() {
+u32 sub_unk3_Caves_4(void) {
     return 1;
 }
 
-void sub_StateChange_Caves_4() {
+void sub_StateChange_Caves_4(void) {
 }
 
-u32 sub_unk3_Caves_5() {
+u32 sub_unk3_Caves_5(void) {
     return 1;
 }
 
-void sub_StateChange_Caves_5() {
+void sub_StateChange_Caves_5(void) {
 }
 
-u32 sub_unk3_Caves_6() {
+u32 sub_unk3_Caves_6(void) {
     return 1;
 }
 
-void sub_StateChange_Caves_6() {
+void sub_StateChange_Caves_6(void) {
 }
 
-u32 sub_unk3_Caves_KeeseChest() {
+u32 sub_unk3_Caves_KeeseChest(void) {
     return 1;
 }
 
-void sub_StateChange_Caves_KeeseChest() {
+void sub_StateChange_Caves_KeeseChest(void) {
 }
 
-u32 sub_unk3_Caves_FairyFountainTrilbyHighlands() {
+u32 sub_unk3_Caves_FairyFountainTrilbyHighlands(void) {
     return 1;
 }
 
-void sub_StateChange_Caves_FairyFountainTrilbyHighlands() {
+void sub_StateChange_Caves_FairyFountainTrilbyHighlands(void) {
 }
 
-u32 sub_unk3_Caves_FairyFountainLinksHouse() {
+u32 sub_unk3_Caves_FairyFountainLinksHouse(void) {
     return 1;
 }
 
-void sub_StateChange_Caves_FairyFountainLinksHouse() {
+void sub_StateChange_Caves_FairyFountainLinksHouse(void) {
 }
 
-u32 sub_unk3_Caves_A() {
+u32 sub_unk3_Caves_A(void) {
     return 1;
 }
 
-void sub_StateChange_Caves_A() {
+void sub_StateChange_Caves_A(void) {
 }
 
-u32 sub_unk3_Caves_HyruleTownWaterfall() {
+u32 sub_unk3_Caves_HyruleTownWaterfall(void) {
     return 1;
 }
 
-void sub_StateChange_Caves_HyruleTownWaterfall() {
+void sub_StateChange_Caves_HyruleTownWaterfall(void) {
 }
 
-u32 sub_unk3_Caves_LonLonRanch() {
+u32 sub_unk3_Caves_LonLonRanch(void) {
     return 1;
 }
 
-void sub_StateChange_Caves_LonLonRanch() {
+void sub_StateChange_Caves_LonLonRanch(void) {
 }
 
-u32 sub_unk3_Caves_LonLonRanchSecret() {
+u32 sub_unk3_Caves_LonLonRanchSecret(void) {
     return 1;
 }
 
@@ -6022,76 +6031,76 @@ void sub_StateChange_Caves_LonLonRanchSecret(void) {
     }
 }
 
-u32 sub_unk3_Caves_TrilbyHighlands() {
+u32 sub_unk3_Caves_TrilbyHighlands(void) {
     return 1;
 }
 
-void sub_StateChange_Caves_TrilbyHighlands() {
+void sub_StateChange_Caves_TrilbyHighlands(void) {
 }
 
-u32 sub_unk3_Caves_LonLonRanchWallet() {
+u32 sub_unk3_Caves_LonLonRanchWallet(void) {
     return 1;
 }
 
-void sub_StateChange_Caves_LonLonRanchWallet() {
+void sub_StateChange_Caves_LonLonRanchWallet(void) {
 }
 
-u32 sub_unk3_Caves_RupeeLinksHouse() {
+u32 sub_unk3_Caves_RupeeLinksHouse(void) {
     return 1;
 }
 
-void sub_StateChange_Caves_RupeeLinksHouse() {
+void sub_StateChange_Caves_RupeeLinksHouse(void) {
 }
 
-u32 sub_unk3_Caves_RupeeTrilbyHighlands() {
+u32 sub_unk3_Caves_RupeeTrilbyHighlands(void) {
     return 1;
 }
 
-void sub_StateChange_Caves_RupeeTrilbyHighlands() {
+void sub_StateChange_Caves_RupeeTrilbyHighlands(void) {
 }
 
-u32 sub_unk3_Caves_FairyFountainMoleMitts() {
+u32 sub_unk3_Caves_FairyFountainMoleMitts(void) {
     return 1;
 }
 
-void sub_StateChange_Caves_FairyFountainMoleMitts() {
+void sub_StateChange_Caves_FairyFountainMoleMitts(void) {
 }
 
-u32 sub_unk3_Caves_KeeseChestSoutheastHyrule() {
+u32 sub_unk3_Caves_KeeseChestSoutheastHyrule(void) {
     return 1;
 }
-void sub_StateChange_Caves_KeeseChestSoutheastHyrule() {
+void sub_StateChange_Caves_KeeseChestSoutheastHyrule(void) {
 }
 
-u32 sub_unk3_Caves_BottleBusinessScrub() {
+u32 sub_unk3_Caves_BottleBusinessScrub(void) {
     return 1;
 }
 
-void sub_StateChange_Caves_BottleBusinessScrub() {
+void sub_StateChange_Caves_BottleBusinessScrub(void) {
 }
 
-u32 sub_unk3_Caves_HeartPieceHallway() {
+u32 sub_unk3_Caves_HeartPieceHallway(void) {
     return 1;
 }
 
-void sub_StateChange_Caves_HeartPieceHallway() {
+void sub_StateChange_Caves_HeartPieceHallway(void) {
 }
 
-u32 sub_unk3_Caves_FairyFountainBoomerang() {
+u32 sub_unk3_Caves_FairyFountainBoomerang(void) {
     return 1;
 }
 
-void sub_StateChange_Caves_FairyFountainBoomerang() {
+void sub_StateChange_Caves_FairyFountainBoomerang(void) {
 }
 
-u32 sub_unk3_Caves_KinstoneBusinessScrub() {
+u32 sub_unk3_Caves_KinstoneBusinessScrub(void) {
     return 1;
 }
 
-void sub_StateChange_Caves_KinstoneBusinessScrub() {
+void sub_StateChange_Caves_KinstoneBusinessScrub(void) {
 }
 
-u32 sub_unk3_VeilFalls_Main() {
+u32 sub_unk3_VeilFalls_Main(void) {
     return 1;
 }
 
@@ -6109,74 +6118,74 @@ void sub_unk1_VeilFalls_Main(void) {
     }
 }
 
-u32 sub_unk3_VeilFallsCaves_Hallway2F() {
+u32 sub_unk3_VeilFallsCaves_Hallway2F(void) {
     return 1;
 }
 
-void sub_StateChange_VeilFallsCaves_Hallway2F() {
+void sub_StateChange_VeilFallsCaves_Hallway2F(void) {
 }
 
-u32 sub_unk3_VeilFallsCaves_Hallway1F() {
+u32 sub_unk3_VeilFallsCaves_Hallway1F(void) {
     return 1;
 }
 
-void sub_StateChange_VeilFallsCaves_Hallway1F() {
+void sub_StateChange_VeilFallsCaves_Hallway1F(void) {
 }
 
-u32 sub_unk3_VeilFallsCaves_SecretRoom() {
+u32 sub_unk3_VeilFallsCaves_SecretRoom(void) {
     return 1;
 }
 
-void sub_StateChange_VeilFallsCaves_SecretRoom() {
+void sub_StateChange_VeilFallsCaves_SecretRoom(void) {
 }
 
-u32 sub_unk3_VeilFallsCaves_Entrance() {
+u32 sub_unk3_VeilFallsCaves_Entrance(void) {
     return 1;
 }
 
-void sub_StateChange_VeilFallsCaves_Entrance() {
+void sub_StateChange_VeilFallsCaves_Entrance(void) {
 }
 
-u32 sub_unk3_VeilFallsCaves_Exit() {
+u32 sub_unk3_VeilFallsCaves_Exit(void) {
     return 1;
 }
 
-void sub_StateChange_VeilFallsCaves_Exit() {
+void sub_StateChange_VeilFallsCaves_Exit(void) {
 }
 
-u32 sub_unk3_VeilFallsCaves_SecretChest() {
+u32 sub_unk3_VeilFallsCaves_SecretChest(void) {
     return 1;
 }
 
-void sub_StateChange_VeilFallsCaves_SecretChest() {
+void sub_StateChange_VeilFallsCaves_SecretChest(void) {
 }
 
-u32 sub_unk3_VeilFallsCaves_SecretStaircases() {
+u32 sub_unk3_VeilFallsCaves_SecretStaircases(void) {
     return 1;
 }
 
-void sub_StateChange_VeilFallsCaves_SecretStaircases() {
+void sub_StateChange_VeilFallsCaves_SecretStaircases(void) {
 }
 
-u32 sub_unk3_VeilFallsCaves_BlockPuzzle() {
+u32 sub_unk3_VeilFallsCaves_BlockPuzzle(void) {
     return 1;
 }
 
-void sub_StateChange_VeilFallsCaves_BlockPuzzle() {
+void sub_StateChange_VeilFallsCaves_BlockPuzzle(void) {
 }
 
-u32 sub_unk3_VeilFallsCaves_RupeePath() {
+u32 sub_unk3_VeilFallsCaves_RupeePath(void) {
     return 1;
 }
 
-void sub_StateChange_VeilFallsCaves_RupeePath() {
+void sub_StateChange_VeilFallsCaves_RupeePath(void) {
 }
 
-u32 sub_unk3_VeilFallsCaves_HeartPiece() {
+u32 sub_unk3_VeilFallsCaves_HeartPiece(void) {
     return 1;
 }
 
-void sub_StateChange_VeilFallsCaves_HeartPiece() {
+void sub_StateChange_VeilFallsCaves_HeartPiece(void) {
 }
 
 extern u32 gUnk_080F9BF8;
@@ -6188,47 +6197,47 @@ u32 sub_unk3_VeilFallsTop_Main(void) {
     return 1;
 }
 
-void sub_StateChange_VeilFallsTop_Main() {
+void sub_StateChange_VeilFallsTop_Main(void) {
     sub_0805B4D0(2);
     sub_0806D0B0(0);
 }
 
-u32 sub_unk3_47_0() {
+u32 sub_unk3_47_0(void) {
     return 1;
 }
 
-void sub_StateChange_47_0() {
+void sub_StateChange_47_0(void) {
 }
 
-u32 sub_unk3_47_1() {
+u32 sub_unk3_47_1(void) {
     return 1;
 }
 
-void sub_StateChange_47_1() {
+void sub_StateChange_47_1(void) {
 }
 
-u32 sub_unk3_47_2() {
+u32 sub_unk3_47_2(void) {
     return 1;
 }
 
-void sub_StateChange_47_2() {
+void sub_StateChange_47_2(void) {
 }
 
-u32 sub_unk3_47_3() {
+u32 sub_unk3_47_3(void) {
     return 1;
 }
 
-void sub_StateChange_47_3() {
+void sub_StateChange_47_3(void) {
 }
 
-u32 sub_unk3_47_4() {
+u32 sub_unk3_47_4(void) {
     return 1;
 }
 
-void sub_StateChange_47_4() {
+void sub_StateChange_47_4(void) {
 }
 
-u32 sub_unk3_TreeInteriors_WitchHut() {
+u32 sub_unk3_TreeInteriors_WitchHut(void) {
     return 1;
 }
 
@@ -6244,119 +6253,119 @@ void sub_StateChange_TreeInteriors_WitchHut(void) {
     }
 }
 
-u32 sub_0804FCD4() {
+u32 sub_0804FCD4(void) {
     return 1;
 }
 
-void nullsub_434() {
+void nullsub_434(void) {
 }
 
-u32 sub_0804FCDC() {
+u32 sub_0804FCDC(void) {
     return 1;
 }
 
-void nullsub_435() {
+void nullsub_435(void) {
 }
 
-u32 sub_0804FCE4() {
+u32 sub_0804FCE4(void) {
     return 1;
 }
 
-void nullsub_436() {
+void nullsub_436(void) {
 }
 
-u32 sub_0804FCEC() {
+u32 sub_0804FCEC(void) {
     return 1;
 }
 
-void nullsub_437() {
+void nullsub_437(void) {
 }
 
-u32 sub_0804FCF4() {
+u32 sub_0804FCF4(void) {
     return 1;
 }
 
-void nullsub_438() {
+void nullsub_438(void) {
 }
 
-u32 sub_0804FCFC() {
+u32 sub_0804FCFC(void) {
     return 1;
 }
 
-void nullsub_439() {
+void nullsub_439(void) {
 }
 
-u32 sub_0804FD04() {
+u32 sub_0804FD04(void) {
     return 1;
 }
 
-void nullsub_440() {
+void nullsub_440(void) {
 }
 
-u32 sub_0804FD0C() {
+u32 sub_0804FD0C(void) {
     return 1;
 }
 
-void nullsub_441() {
+void nullsub_441(void) {
 }
 
-u32 sub_0804FD14() {
+u32 sub_0804FD14(void) {
     return 1;
 }
 
-void nullsub_442() {
+void nullsub_442(void) {
 }
 
-u32 sub_0804FD1C() {
+u32 sub_0804FD1C(void) {
     return 1;
 }
 
-void nullsub_443() {
+void nullsub_443(void) {
 }
 
-u32 sub_0804FD24() {
+u32 sub_0804FD24(void) {
     return 1;
 }
 
-void nullsub_444() {
+void nullsub_444(void) {
 }
 
-u32 sub_0804FD2C() {
+u32 sub_0804FD2C(void) {
     return 1;
 }
 
-void nullsub_445() {
+void nullsub_445(void) {
 }
 
-u32 sub_0804FD34() {
+u32 sub_0804FD34(void) {
     return 1;
 }
 
-void nullsub_446() {
+void nullsub_446(void) {
 }
 
-u32 sub_0804FD3C() {
+u32 sub_0804FD3C(void) {
     return 1;
 }
 
-void nullsub_447() {
+void nullsub_447(void) {
 }
 
-u32 sub_0804FD44() {
+u32 sub_0804FD44(void) {
     return 1;
 }
 
-void nullsub_448() {
+void nullsub_448(void) {
 }
 
-u32 sub_unk3_TreeInteriors_StairsToCarlov() {
+u32 sub_unk3_TreeInteriors_StairsToCarlov(void) {
     return 1;
 }
 
-void sub_StateChange_TreeInteriors_StairsToCarlov() {
+void sub_StateChange_TreeInteriors_StairsToCarlov(void) {
 }
 
-u32 sub_unk3_TreeInteriors_PercysTreehouse() {
+u32 sub_unk3_TreeInteriors_PercysTreehouse(void) {
     return 1;
 }
 
@@ -6368,101 +6377,101 @@ void sub_StateChange_TreeInteriors_PercysTreehouse(void) {
     }
 }
 
-u32 sub_unk3_TreeInteriors_HeartPiece() {
+u32 sub_unk3_TreeInteriors_HeartPiece(void) {
     return 1;
 }
-void sub_StateChange_TreeInteriors_HeartPiece() {
+void sub_StateChange_TreeInteriors_HeartPiece(void) {
 }
 
-u32 sub_unk3_TreeInteriors_StairsToBladeBrother() {
+u32 sub_unk3_TreeInteriors_StairsToBladeBrother(void) {
     return 1;
 }
 
-void sub_StateChange_TreeInteriors_StairsToBladeBrother() {
+void sub_StateChange_TreeInteriors_StairsToBladeBrother(void) {
 }
 
-u32 sub_unk3_TreeInteriors_14() {
+u32 sub_unk3_TreeInteriors_14(void) {
     return 1;
 }
 
-void sub_StateChange_TreeInteriors_14() {
+void sub_StateChange_TreeInteriors_14(void) {
 }
 
-u32 sub_unk3_TreeInteriors_BoomerangNorthwest() {
+u32 sub_unk3_TreeInteriors_BoomerangNorthwest(void) {
     return 1;
 }
 
-void sub_StateChange_TreeInteriors_BoomerangNorthwest() {
+void sub_StateChange_TreeInteriors_BoomerangNorthwest(void) {
 }
 
-u32 sub_unk3_TreeInteriors_BoomerangNortheast() {
+u32 sub_unk3_TreeInteriors_BoomerangNortheast(void) {
     return 1;
 }
 
-void sub_StateChange_TreeInteriors_BoomerangNortheast() {
+void sub_StateChange_TreeInteriors_BoomerangNortheast(void) {
 }
 
-u32 sub_unk3_TreeInteriors_BoomerangSouthwest() {
+u32 sub_unk3_TreeInteriors_BoomerangSouthwest(void) {
     return 1;
 }
 
-void sub_StateChange_TreeInteriors_BoomerangSouthwest() {
+void sub_StateChange_TreeInteriors_BoomerangSouthwest(void) {
 }
 
-u32 sub_unk3_TreeInteriors_BoomerangSoutheast() {
+u32 sub_unk3_TreeInteriors_BoomerangSoutheast(void) {
     return 1;
 }
 
-void sub_StateChange_TreeInteriors_BoomerangSoutheast() {
+void sub_StateChange_TreeInteriors_BoomerangSoutheast(void) {
 }
 
-u32 sub_unk3_TreeInteriors_HeartPieceSouthwestField() {
+u32 sub_unk3_TreeInteriors_HeartPieceSouthwestField(void) {
     return 1;
 }
 
-void sub_StateChange_TreeInteriors_HeartPieceSouthwestField() {
+void sub_StateChange_TreeInteriors_HeartPieceSouthwestField(void) {
 }
 
-u32 sub_unk3_TreeInteriors_StairsToFairyFountain() {
+u32 sub_unk3_TreeInteriors_StairsToFairyFountain(void) {
     return 1;
 }
 
-void sub_StateChange_TreeInteriors_StairsToFairyFountain() {
+void sub_StateChange_TreeInteriors_StairsToFairyFountain(void) {
 }
 
-u32 sub_unk3_TreeInteriors_StairsToWalletFairy() {
+u32 sub_unk3_TreeInteriors_StairsToWalletFairy(void) {
     return 1;
 }
 
-void sub_StateChange_TreeInteriors_StairsToWalletFairy() {
+void sub_StateChange_TreeInteriors_StairsToWalletFairy(void) {
 }
 
-u32 sub_unk3_TreeInteriors_1C() {
+u32 sub_unk3_TreeInteriors_1C(void) {
     return 1;
 }
 
-void sub_StateChange_TreeInteriors_1C() {
+void sub_StateChange_TreeInteriors_1C(void) {
 }
 
-u32 sub_unk3_TreeInteriors_StairsToBusinessScrub() {
+u32 sub_unk3_TreeInteriors_StairsToBusinessScrub(void) {
     return 1;
 }
 
-void sub_StateChange_TreeInteriors_StairsToBusinessScrub() {
+void sub_StateChange_TreeInteriors_StairsToBusinessScrub(void) {
 }
 
-u32 sub_unk3_TreeInteriors_1E() {
+u32 sub_unk3_TreeInteriors_1E(void) {
     return 1;
 }
 
-void sub_StateChange_TreeInteriors_1E() {
+void sub_StateChange_TreeInteriors_1E(void) {
 }
 
-u32 sub_unk3_TreeInteriors_1F() {
+u32 sub_unk3_TreeInteriors_1F(void) {
     return 1;
 }
 
-void sub_StateChange_TreeInteriors_1F() {
+void sub_StateChange_TreeInteriors_1F(void) {
 }
 
 extern u32 gUnk_080FAD48;
@@ -6487,18 +6496,18 @@ void sub_StateChange_MtCrenel_MountainTop(void) {
     sub_08059994();
 }
 
-void sub_unk1_MtCrenel_MountainTop() {
+void sub_unk1_MtCrenel_MountainTop(void) {
     sub_0805B4D0(0);
 }
 
-u32 sub_unk3_MtCrenel_WallClimb() {
+u32 sub_unk3_MtCrenel_WallClimb(void) {
     return 1;
 }
 
-void sub_StateChange_MtCrenel_WallClimb() {
+void sub_StateChange_MtCrenel_WallClimb(void) {
 }
 
-u32 sub_unk3_MtCrenel_CaveOfFlamesEntrance() {
+u32 sub_unk3_MtCrenel_CaveOfFlamesEntrance(void) {
     return 1;
 }
 
@@ -6524,14 +6533,14 @@ void sub_unk1_MtCrenel_CaveOfFlamesEntrance(void) {
     }
 }
 
-u32 sub_unk3_MtCrenel_GustJarShortcut() {
+u32 sub_unk3_MtCrenel_GustJarShortcut(void) {
     return 1;
 }
 
-void sub_StateChange_MtCrenel_GustJarShortcut() {
+void sub_StateChange_MtCrenel_GustJarShortcut(void) {
 }
 
-u32 sub_unk3_MtCrenel_Entrance() {
+u32 sub_unk3_MtCrenel_Entrance(void) {
     return 1;
 }
 
@@ -6541,105 +6550,105 @@ void sub_StateChange_MtCrenel_Entrance(void) {
 #endif
 }
 
-u32 sub_unk3_CrenelCaves_BlockPushing() {
+u32 sub_unk3_CrenelCaves_BlockPushing(void) {
     return 1;
 }
 
-void sub_StateChange_CrenelCaves_BlockPushing() {
+void sub_StateChange_CrenelCaves_BlockPushing(void) {
 }
 
-u32 sub_unk3_CrenelCaves_PillarCave() {
+u32 sub_unk3_CrenelCaves_PillarCave(void) {
     return 1;
 }
 
-void sub_StateChange_CrenelCaves_PillarCave() {
+void sub_StateChange_CrenelCaves_PillarCave(void) {
 }
 
-u32 sub_unk3_CrenelCaves_BridgeSwitch() {
+u32 sub_unk3_CrenelCaves_BridgeSwitch(void) {
     return 1;
 }
 
-void sub_StateChange_CrenelCaves_BridgeSwitch() {
+void sub_StateChange_CrenelCaves_BridgeSwitch(void) {
 }
 
-u32 sub_unk3_CrenelCaves_ExitToMines() {
+u32 sub_unk3_CrenelCaves_ExitToMines(void) {
     return 1;
 }
 
-void sub_StateChange_CrenelCaves_ExitToMines() {
+void sub_StateChange_CrenelCaves_ExitToMines(void) {
 }
 
-u32 sub_unk3_CrenelCaves_GripRing() {
+u32 sub_unk3_CrenelCaves_GripRing(void) {
     return 1;
 }
 
-void sub_StateChange_CrenelCaves_GripRing() {
+void sub_StateChange_CrenelCaves_GripRing(void) {
 }
 
-u32 sub_unk3_CrenelCaves_FairyFountain() {
+u32 sub_unk3_CrenelCaves_FairyFountain(void) {
     return 1;
 }
 
-void sub_StateChange_CrenelCaves_FairyFountain() {
+void sub_StateChange_CrenelCaves_FairyFountain(void) {
 }
 
-u32 sub_unk3_CrenelCaves_SpinyChuPuzzle() {
+u32 sub_unk3_CrenelCaves_SpinyChuPuzzle(void) {
     return 1;
 }
 
-void sub_StateChange_CrenelCaves_SpinyChuPuzzle() {
+void sub_StateChange_CrenelCaves_SpinyChuPuzzle(void) {
 }
 
-u32 sub_unk3_CrenelCaves_ChuchuPotChest() {
+u32 sub_unk3_CrenelCaves_ChuchuPotChest(void) {
     return 1;
 }
 
-void sub_StateChange_CrenelCaves_ChuchuPotChest() {
+void sub_StateChange_CrenelCaves_ChuchuPotChest(void) {
 }
 
-u32 sub_unk3_CrenelCaves_WaterHeartPiece() {
+u32 sub_unk3_CrenelCaves_WaterHeartPiece(void) {
     return 1;
 }
 
-void sub_StateChange_CrenelCaves_WaterHeartPiece() {
+void sub_StateChange_CrenelCaves_WaterHeartPiece(void) {
 }
 
-u32 sub_unk3_CrenelCaves_RupeeFairyFountain() {
+u32 sub_unk3_CrenelCaves_RupeeFairyFountain(void) {
     return 1;
 }
 
-void sub_StateChange_CrenelCaves_RupeeFairyFountain() {
+void sub_StateChange_CrenelCaves_RupeeFairyFountain(void) {
 }
 
-u32 sub_unk3_CrenelCaves_HelmasaurHallway() {
+u32 sub_unk3_CrenelCaves_HelmasaurHallway(void) {
     return 1;
 }
 
-void sub_StateChange_CrenelCaves_HelmasaurHallway() {
+void sub_StateChange_CrenelCaves_HelmasaurHallway(void) {
 }
 
-u32 sub_unk3_CrenelCaves_MushroomKeese() {
+u32 sub_unk3_CrenelCaves_MushroomKeese(void) {
     return 1;
 }
 
-void sub_StateChange_CrenelCaves_MushroomKeese() {
+void sub_StateChange_CrenelCaves_MushroomKeese(void) {
 }
 
-u32 sub_unk3_CrenelCaves_LadderToGreenWater() {
+u32 sub_unk3_CrenelCaves_LadderToGreenWater(void) {
     return 1;
 }
 
-void sub_StateChange_CrenelCaves_LadderToGreenWater() {
+void sub_StateChange_CrenelCaves_LadderToGreenWater(void) {
 }
 
-u32 sub_unk3_CrenelCaves_BombBusinessScrub() {
+u32 sub_unk3_CrenelCaves_BombBusinessScrub(void) {
     return 1;
 }
 
-void sub_StateChange_CrenelCaves_BombBusinessScrub() {
+void sub_StateChange_CrenelCaves_BombBusinessScrub(void) {
 }
 
-u32 sub_unk3_CrenelCaves_Hermit() {
+u32 sub_unk3_CrenelCaves_Hermit(void) {
     return 1;
 }
 
@@ -6649,16 +6658,16 @@ void sub_StateChange_CrenelCaves_Hermit(void) {
     }
 }
 
-u32 sub_unk3_CrenelCaves_HintScrub() {
+u32 sub_unk3_CrenelCaves_HintScrub(void) {
     return 1;
 }
 
-void sub_StateChange_CrenelCaves_HintScrub() {
+void sub_StateChange_CrenelCaves_HintScrub(void) {
 }
 
-u32 sub_unk3_CrenelCaves_ToGrayblade() {
+u32 sub_unk3_CrenelCaves_ToGrayblade(void) {
     return 1;
 }
 
-void sub_StateChange_CrenelCaves_ToGrayblade() {
+void sub_StateChange_CrenelCaves_ToGrayblade(void) {
 }
diff --git a/src/save.c b/src/save.c
index 12676418..90964d18 100644
--- a/src/save.c
+++ b/src/save.c
@@ -5,6 +5,7 @@
 #include "main.h"
 #include "functions.h"
 #include "game.h"
+#include "fileselect.h"
 
 typedef struct SaveFileStatus {
     u16 checksum1;
@@ -90,7 +91,7 @@ const SaveFileEEPROMAddresses gSaveFileEEPROMAddresses[] = { { 0x500, 0x30, 0x10
                                                              { 0x20, 0x60, 0x1060, 0xf80, 0x1f80 },
                                                              { 0x8, 0xfa0, 0x1fa0, 0xfa0, 0x1fa0 } };
 #endif
-void sub_0807CD9C() {
+void sub_0807CD9C(void) {
     UpdateGlobalProgress();
 }
 
diff --git a/src/sound.c b/src/sound.c
index aa12853b..342ae9c6 100644
--- a/src/sound.c
+++ b/src/sound.c
@@ -223,7 +223,7 @@ static void PlayFadeOut(u32 sound) {
     doPlaySound(sound);
 }
 
-static void InitVolume() {
+static void InitVolume(void) {
     gSoundPlayingInfo.volumeMasterUnk = 0x100;
     gSoundPlayingInfo.volumeMaster = 0x100;
     gSoundPlayingInfo.volumeMasterTarget = 0x100;
diff --git a/src/sub_08055E08.c b/src/sub_08055E08.c
index e5f0d095..3070b26f 100644
--- a/src/sub_08055E08.c
+++ b/src/sub_08055E08.c
@@ -4,7 +4,7 @@
 #include "functions.h"
 #include "screen.h"
 
-extern void (*const gUnk_080FF420[])();
+extern void (*const gUnk_080FF420[])(void);
 extern void sub_0804B0B0(u32, u32);
 extern void sub_08055B70(u32, u32, u32, u32);
 
diff --git a/src/sub_0807CA18.c b/src/sub_0807CA18.c
index 223dae66..d8e9db7a 100644
--- a/src/sub_0807CA18.c
+++ b/src/sub_0807CA18.c
@@ -2,8 +2,6 @@
 #include "save.h"
 #include "common.h"
 
-extern void sub_0807C960();
-
 extern u16 gMetatilesBottom[];
 extern u16 gMetatilesTop[];
 extern u8 gMapData;
@@ -41,7 +39,7 @@ void sub_0807C9D8(u32* a1) {
     LoadPalettes(gUnk_020176E0, 2, 13);
 }
 
-u32 FinalizeSave() {
+u32 FinalizeSave(void) {
     if (gSave.invalid || gSave.initialized != 1) {
         gSave.invalid = 0;
         gSave.initialized = 1;
diff --git a/src/subtask.c b/src/subtask.c
index f95bedcf..4b7352ef 100644
--- a/src/subtask.c
+++ b/src/subtask.c
@@ -2,8 +2,10 @@
 #include "functions.h"
 #include "menu.h"
 #include "screen.h"
+#include "common.h"
+#include "subtask.h"
 
-extern void (*const gUnk_081280C4[])();
+extern void (*const gUnk_081280C4[])(void);
 
 void Subtask_KinstoneMenu(void) {
 #if !(defined(DEMO_USA) || defined(DEMO_JP))
diff --git a/src/text.c b/src/text.c
index 8aadf79d..01f8ab2e 100644
--- a/src/text.c
+++ b/src/text.c
@@ -3,6 +3,7 @@
 #include "structures.h"
 #include "functions.h"
 #include "asm.h"
+#include "enemy.h"
 
 extern u16 gUnk_081092D4;
 extern u8 gUnk_081094CE;
diff --git a/src/title.c b/src/title.c
index 2afc8d28..2b134d60 100644
--- a/src/title.c
+++ b/src/title.c
@@ -60,7 +60,7 @@ static const u16 sLightRaysAlphaBlends[] = {
 
 #ifdef DEMO_JP
 static const SaveFile gDemoSave = {
-    .unk_01 = 1,
+    .initialized = 1,
     .msg_speed = 1,
     .brightness = 1,
     .global_progress = 1,