diff --git a/data/const/object/mask.s b/data/const/object/mask.s deleted file mode 100644 index a7e34e4e..00000000 --- a/data/const/object/mask.s +++ /dev/null @@ -1,11 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - .align 2 - -MaskActionFuncs:: @ 081227A4 - .4byte sub_080929A4 - .4byte sub_08092A94 - .4byte sub_08092B0C - .4byte Mask_Delete+1 diff --git a/linker.ld b/linker.ld index e3512a2f..93613e76 100644 --- a/linker.ld +++ b/linker.ld @@ -1446,7 +1446,7 @@ SECTIONS { data/animations/object/lavaPlatform.o(.rodata); src/object/paper.o(.rodata); src/object/object5B.o(.rodata); - data/const/object/mask.o(.rodata); + src/object/mask.o(.rodata); src/object/houseDoorInterior.o(.rodata); src/object/whirlwind.o(.rodata); data/animations/object/whirlwind.o(.rodata); diff --git a/src/object/mask.c b/src/object/mask.c index 6571de7e..af7361af 100644 --- a/src/object/mask.c +++ b/src/object/mask.c @@ -1,9 +1,18 @@ #include "object.h" #include "functions.h" -extern void (*MaskActionFuncs[])(Entity*); +void sub_080929A4(Entity*); +void sub_08092A94(Entity*); +void sub_08092B0C(Entity*); +void Mask_Delete(Entity*); void Mask(Entity* this) { + static void (*const MaskActionFuncs[])(Entity*) = { + sub_080929A4, + sub_08092A94, + sub_08092B0C, + Mask_Delete, + }; MaskActionFuncs[this->action](this); }