diff --git a/data/const/manager/manager2B.s b/data/const/manager/manager2B.s deleted file mode 100644 index c917c9cc..00000000 --- a/data/const/manager/manager2B.s +++ /dev/null @@ -1,10 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - .align 2 - -gUnk_08108D30:: @ 08108D30 - .4byte sub_0805D02C - .4byte sub_0805D0C4 - .4byte sub_0805D0FC diff --git a/linker.ld b/linker.ld index 5ba71a93..7720f810 100644 --- a/linker.ld +++ b/linker.ld @@ -1137,7 +1137,7 @@ SECTIONS { src/manager/manager26.o(.rodata); src/manager/manager27.o(.rodata); src/manager/manager28.o(.rodata); - data/const/manager/manager2B.o(.rodata); + src/manager/manager2B.o(.rodata); data/const/manager/manager2E.o(.rodata); data/const/manager/manager31.o(.rodata); data/const/manager/manager32.o(.rodata); diff --git a/src/manager/manager2B.c b/src/manager/manager2B.c index b83236e4..db812f9b 100644 --- a/src/manager/manager2B.c +++ b/src/manager/manager2B.c @@ -24,11 +24,17 @@ typedef struct { u16 field_0x3e; } Manager2B; -extern void (*const gUnk_08108D30[])(Manager2B*); - void sub_0805D11C(Manager2B*); +void sub_0805D02C(Manager2B*); +void sub_0805D0C4(Manager2B*); +void sub_0805D0FC(Manager2B*); void Manager2B_Main(Manager2B* this) { + static void (*const gUnk_08108D30[])(Manager2B*) = { + sub_0805D02C, + sub_0805D0C4, + sub_0805D0FC, + }; gUnk_08108D30[this->manager.action](this); }