diff --git a/data/const/manager/manager35.s b/data/const/manager/manager35.s deleted file mode 100644 index d75b95c0..00000000 --- a/data/const/manager/manager35.s +++ /dev/null @@ -1,11 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - .align 2 - -gUnk_08108D98:: @ 08108D98 - .4byte sub_0805DC9C - .4byte sub_0805DCC8 - .4byte sub_0805DD24 - .4byte sub_0805DD68 diff --git a/linker.ld b/linker.ld index 767cf754..2490c049 100644 --- a/linker.ld +++ b/linker.ld @@ -1142,7 +1142,7 @@ SECTIONS { src/manager/manager31.o(.rodata); src/manager/manager32.o(.rodata); src/manager/manager34.o(.rodata); - data/const/manager/manager35.o(.rodata); + src/manager/manager35.o(.rodata); data/const/manager/manager36.o(.rodata); data/const/manager/manager37.o(.rodata); data/const/manager/manager38.o(.rodata); diff --git a/src/manager/manager35.c b/src/manager/manager35.c index 49083531..e913ae82 100644 --- a/src/manager/manager35.c +++ b/src/manager/manager35.c @@ -15,10 +15,19 @@ typedef struct { u16 field_0x3e; } Manager35; -extern void (*const gUnk_08108D98[])(Manager35*); +void sub_0805DC9C(Manager35*); +void sub_0805DCC8(Manager35*); +void sub_0805DD24(Manager35*); +void sub_0805DD68(Manager35*); void Manager35_Main(Manager35* this) { - gUnk_08108D98[this->manager.action](this); + static void (*const actionFuncs[])(Manager35*) = { + sub_0805DC9C, + sub_0805DCC8, + sub_0805DD24, + sub_0805DD68, + }; + actionFuncs[this->manager.action](this); } void sub_0805DC9C(Manager35* this) {