diff --git a/data/const/object/palaceArchway.s b/data/const/object/palaceArchway.s deleted file mode 100644 index 0c10617e..00000000 --- a/data/const/object/palaceArchway.s +++ /dev/null @@ -1,9 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - .align 2 - -gUnk_081246EC:: @ 081246EC - .4byte sub_0809F2A0 - .4byte nullsub_537 diff --git a/linker.ld b/linker.ld index 44ce7be2..f1bcb580 100644 --- a/linker.ld +++ b/linker.ld @@ -1528,7 +1528,7 @@ SECTIONS { data/animations/object/fan.o(.rodata); src/object/angryStatue.o(.rodata); data/animations/object/angryStatue.o(.rodata); - data/const/object/palaceArchway.o(.rodata); + src/object/palaceArchway.o(.rodata); src/object/objectA2.o(.rodata); data/animations/object/objectA2.o(.rodata); data/const/object/cloud.o(.rodata); diff --git a/src/object/palaceArchway.c b/src/object/palaceArchway.c index f1c0abb9..73d6218a 100644 --- a/src/object/palaceArchway.c +++ b/src/object/palaceArchway.c @@ -1,9 +1,14 @@ #include "object.h" -extern void (*const gUnk_081246EC[])(Entity*); +void sub_0809F2A0(Entity*); +void nullsub_537(Entity*); void PalaceArchway(Entity* this) { - gUnk_081246EC[this->action](this); + static void (*const actionFuncs[])(Entity*) = { + sub_0809F2A0, + nullsub_537, + }; + actionFuncs[this->action](this); } void sub_0809F2A0(Entity* this) {