diff --git a/include/functions.h b/include/functions.h index 65913c68..b4316733 100644 --- a/include/functions.h +++ b/include/functions.h @@ -222,7 +222,7 @@ 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_08052D74(void*, void*, void*); +extern void sub_08052D74(void*, void (*)(), void (*)()); extern void sub_0800451C(Entity*); extern u32 sub_080002F0(u32, u32, u32); extern u32 sub_080040D8(Entity*, u8*, s32, s32); diff --git a/include/main.h b/include/main.h index 99007163..3225f2ed 100644 --- a/include/main.h +++ b/include/main.h @@ -97,6 +97,7 @@ extern u16 gPaletteBuffer[]; extern void VBlankInterruptWait(void); extern void DisableInterruptsAndDMA(void); extern void EnableVBlankIntr(void); +extern void sub_08056250(void); static void sub_08055F70(void); static bool32 SoftResetKeysPressed(void); diff --git a/src/manager/manager14.c b/src/manager/manager14.c index e2baa74d..0b98f542 100644 --- a/src/manager/manager14.c +++ b/src/manager/manager14.c @@ -5,6 +5,7 @@ #include "flags.h" #include "coord.h" #include "main.h" +#include "functions.h" typedef struct { Manager manager; @@ -15,16 +16,12 @@ typedef struct { u8 unk_25[0x1B]; } Manager14; -extern u8 gUnk_03003DE4; -extern u16 gUnk_02017AA0[]; - const u16 gUnk_08108588[] = { 0x1000, 0xF01, 0xE02, 0xD03, 0xC04, 0xB05, 0xA06, 0x907, 0x808 }; const u16 gUnk_0810859A[] = { 0x808, 0x907, 0xA06, 0x907 }; -extern void sub_08052D74(void*, void (*)(), void (*)()); -extern void sub_08056250(void); extern void sub_0805622C(u16*, u32, u32); +extern u16 gUnk_02017AA0[]; void Manager14_Main(Manager14*); void sub_08059E80(Manager14*); diff --git a/src/manager/manager1A.c b/src/manager/manager1A.c index b0401f28..d828bff5 100644 --- a/src/manager/manager1A.c +++ b/src/manager/manager1A.c @@ -31,8 +31,6 @@ void Manager1A_Main(Manager1A* this) { gUnk_08108668[this->manager.action](this); } -extern void sub_08052D74(void*, void*, void*); - typedef struct struct_08108764 { u8 unk_00; u8 unk_01; // area ID?