diff --git a/assets/assets.json b/assets/assets.json index 6ad3126c..7f83dfb2 100644 --- a/assets/assets.json +++ b/assets/assets.json @@ -32723,16 +32723,6 @@ "start": 1084332, "size": 124 }, - { - "path": "manager1C/gUnk_08108C6C.bin", - "start": 1084524, - "size": 16 - }, - { - "path": "manager1C/gUnk_08108C7C.bin", - "start": 1084540, - "size": 4 - }, { "path": "manager1D/gUnk_08108C88.bin", "start": 1084552, diff --git a/data/const/manager/manager1C.s b/data/const/manager/manager1C.s deleted file mode 100644 index bcf3b8bb..00000000 --- a/data/const/manager/manager1C.s +++ /dev/null @@ -1,15 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - .align 2 - -gUnk_08108C64:: @ 08108C64 - .4byte sub_0805B554 - .4byte sub_0805B55C - -gUnk_08108C6C:: @ 08108C6C - .incbin "manager1C/gUnk_08108C6C.bin" - -gUnk_08108C7C:: @ 08108C7C - .incbin "manager1C/gUnk_08108C7C.bin" diff --git a/linker.ld b/linker.ld index 93c4bf45..ad43df49 100644 --- a/linker.ld +++ b/linker.ld @@ -1127,7 +1127,7 @@ SECTIONS { src/manager/manager18.o(.rodata); data/const/manager/manager1A.o(.rodata); src/manager/manager1B.o(.rodata); - data/const/manager/manager1C.o(.rodata); + src/manager/manager1C.o(.rodata); data/const/manager/manager1D.o(.rodata); src/manager/manager1E.o(.rodata); data/const/manager/manager1F.o(.rodata); diff --git a/src/manager/manager1C.c b/src/manager/manager1C.c index 54b5e63f..5651f93f 100644 --- a/src/manager/manager1C.c +++ b/src/manager/manager1C.c @@ -3,13 +3,15 @@ #include "room.h" #include "enemy.h" -extern void (*const gUnk_08108C64[])(Manager*); - -extern u16 gUnk_08108C6C[]; -extern s8 gUnk_08108C7C[]; +void sub_0805B554(Manager*); +void sub_0805B55C(Manager*); void Manager1C_Main(Manager* manager) { - gUnk_08108C64[manager->action](manager); + static void (*const actionFuncs[])(Manager*) = { + sub_0805B554, + sub_0805B55C, + }; + actionFuncs[manager->action](manager); } // Initial setup @@ -20,6 +22,9 @@ void sub_0805B554(Manager* manager) { // Spawn water drops every 0xf frames void sub_0805B55C(Manager* manager) { + static const s16 gUnk_08108C6C[] = { -0x64, -0x3c, -0x14, 0x14, 0x3c, 0x64, 0x8c, 0xb4 }; + static const s8 gUnk_08108C7C[] = { -0x32, -0x19, 0x0, 0x19 }; + if (--manager->unk_0e == 0) { Entity* waterDrop; manager->unk_0e = 0xf;