diff --git a/data/const/object/metalDoor.s b/data/const/object/metalDoor.s deleted file mode 100644 index df748a3c..00000000 --- a/data/const/object/metalDoor.s +++ /dev/null @@ -1,12 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - .align 2 - -gUnk_0812493C:: @ 0812493C - .4byte sub_080A0684 - .4byte sub_080A0718 - .4byte sub_080A074C - .4byte sub_080A07BC - .4byte sub_080A07F0 diff --git a/linker.ld b/linker.ld index f1bcb580..485e89a1 100644 --- a/linker.ld +++ b/linker.ld @@ -1544,7 +1544,7 @@ SECTIONS { src/object/objectAD.o(.rodata); data/const/object/objectAF.o(.rodata); data/animations/object/objectAF.o(.rodata); - data/const/object/metalDoor.o(.rodata); + src/object/metalDoor.o(.rodata); data/const/object/jailBars.o(.rodata); data/animations/object/jailBars.o(.rodata); data/animations/object/objectB2.o(.rodata); diff --git a/src/object/metalDoor.c b/src/object/metalDoor.c index fd5e7b22..1938f2b5 100644 --- a/src/object/metalDoor.c +++ b/src/object/metalDoor.c @@ -9,13 +9,19 @@ #include "hitbox.h" extern u32 sub_08083734(Entity*, u32); -extern void sub_080A080C(Entity*); -extern void sub_080A0870(Entity*); - -extern void (*const gUnk_0812493C[])(Entity*); +void sub_080A080C(Entity*); +void sub_080A0870(Entity*); +void sub_080A0684(Entity*); +void sub_080A0718(Entity*); +void sub_080A074C(Entity*); +void sub_080A07BC(Entity*); +void sub_080A07F0(Entity*); void MetalDoor(Entity* this) { - gUnk_0812493C[this->action](this); + static void (*const actionFuncs[])(Entity*) = { + sub_080A0684, sub_080A0718, sub_080A074C, sub_080A07BC, sub_080A07F0, + }; + actionFuncs[this->action](this); } void sub_080A0684(Entity* this) {