diff --git a/data/data_081081EC.s b/data/data_081081EC.s deleted file mode 100644 index 4d0e1d08..00000000 --- a/data/data_081081EC.s +++ /dev/null @@ -1,11 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - .align 2 - -gUnk_081081EC:: @ 081081EC - .incbin "baserom.gba", 0x1081EC, 0x0000008 - -gUnk_081081F4:: @ 081081F4 - .incbin "baserom.gba", 0x1081F4, 0x0000014 diff --git a/linker.ld b/linker.ld index 451c0cf9..000830ae 100644 --- a/linker.ld +++ b/linker.ld @@ -986,7 +986,9 @@ SECTIONS { data/data_08107BC8.o(.rodata); src/manager/manager5.o(.rodata); src/manager/manager7.o(.rodata); - data/data_081081EC.o(.rodata); + . = ALIGN(4); + src/manager/manager9.o(.rodata); + src/manager/managerA.o(.rodata); src/manager/managerB.o(.rodata); data/data_0810821C.o(.rodata); src/item.o(.rodata); diff --git a/src/manager/manager9.c b/src/manager/manager9.c index fbf3ad56..b5929a2e 100644 --- a/src/manager/manager9.c +++ b/src/manager/manager9.c @@ -21,7 +21,13 @@ void sub_08058324(); extern u32 gUnk_02006F00[]; extern u8 gUnk_02001A40[]; -extern u16 gUnk_081081EC[]; + +const u16 gUnk_081081EC[] = { + 0x30, + 0x30, + 0x30, + 0x38 +}; void sub_080581D8(Manager9* this) { sub_08058210(this); diff --git a/src/manager/managerA.c b/src/manager/managerA.c index 1fd78227..7d7fc388 100644 --- a/src/manager/managerA.c +++ b/src/manager/managerA.c @@ -6,10 +6,22 @@ #include "area.h" -extern void (*gUnk_081081F4[])(Manager*); +void sub_08058398(ManagerA*); +void sub_080583EC(ManagerA*); +void sub_08058408(ManagerA*); +void sub_08058514(ManagerA*); +void sub_080585B0(ManagerA*); + +void (* const gUnk_081081F4[])(ManagerA*) = { + sub_08058398, + sub_080583EC, + sub_08058408, + sub_08058514, + sub_080585B0 +}; -void sub_08058380(Manager* this) { - gUnk_081081F4[this->action](this); +void sub_08058380(ManagerA* this) { + gUnk_081081F4[this->manager.action](this); }