diff --git a/data/const/object/bakerOven.s b/data/const/object/bakerOven.s deleted file mode 100644 index 6d635c75..00000000 --- a/data/const/object/bakerOven.s +++ /dev/null @@ -1,10 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - .align 2 - -gUnk_08123E20:: @ 08123E20 - .4byte sub_0809CC74 - .4byte sub_0809CD0C - .4byte sub_0809CDB4 diff --git a/linker.ld b/linker.ld index 65bffe6f..f6bddc92 100644 --- a/linker.ld +++ b/linker.ld @@ -1509,7 +1509,7 @@ SECTIONS { src/object/frozenWaterElement.o(.rodata); src/object/object90.o(.rodata); src/object/frozenOctorok.o(.rodata); - data/const/object/bakerOven.o(.rodata); + src/object/bakerOven.o(.rodata); data/animations/object/bakerOven.o(.rodata); src/object/lamp.o(.rodata); data/animations/object/lamp.o(.rodata); diff --git a/src/object/bakerOven.c b/src/object/bakerOven.c index 8f77955f..5d48244f 100644 --- a/src/object/bakerOven.c +++ b/src/object/bakerOven.c @@ -2,12 +2,18 @@ #include "functions.h" extern void SoundReqClipped(Entity*, u32); -extern void sub_0809CDF0(Entity*); - -extern void (*const gUnk_08123E20[])(Entity*); +void sub_0809CDF0(Entity*); +void sub_0809CC74(Entity*); +void sub_0809CD0C(Entity*); +void sub_0809CDB4(Entity*); void BakerOven(Entity* this) { - gUnk_08123E20[this->action](this); + static void (*const actionFuncs[])(Entity*) = { + sub_0809CC74, + sub_0809CD0C, + sub_0809CDB4, + }; + actionFuncs[this->action](this); } void sub_0809CC74(Entity* this) {