diff --git a/data/const/object/hiddenLadderDown.s b/data/const/object/hiddenLadderDown.s deleted file mode 100644 index 7a623dda..00000000 --- a/data/const/object/hiddenLadderDown.s +++ /dev/null @@ -1,9 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - .align 2 - -gUnk_08122604:: @ 08122604 - .4byte sub_08091F14 - .4byte sub_08092000 diff --git a/linker.ld b/linker.ld index 42cb5dcb..e3512a2f 100644 --- a/linker.ld +++ b/linker.ld @@ -1439,7 +1439,7 @@ SECTIONS { data/animations/object/minecart.o(.rodata); src/object/thoughtBubble.o(.rodata); data/animations/object/thoughtBubble.o(.rodata); - data/const/object/hiddenLadderDown.o(.rodata); + src/object/hiddenLadderDown.o(.rodata); src/object/gentariCurtains.o(.rodata); data/animations/object/gentariCurtains.o(.rodata); src/object/lavaPlatform.o(.rodata); diff --git a/src/object/hiddenLadderDown.c b/src/object/hiddenLadderDown.c index 55831a80..a16b06c9 100644 --- a/src/object/hiddenLadderDown.c +++ b/src/object/hiddenLadderDown.c @@ -4,11 +4,16 @@ #include "functions.h" #include "flags.h" -extern void (*const gUnk_08122604[])(Entity*); +void sub_08091F14(Entity*); +void sub_08092000(Entity*); void HiddenLadderDown(Entity* this) { + static void (*const actionFuncs[])(Entity*) = { + sub_08091F14, + sub_08092000, + }; if (this->action < 2) { - gUnk_08122604[this->action](this); + actionFuncs[this->action](this); } }