diff --git a/data/const/npc/clothesRack.s b/data/const/npc/clothesRack.s deleted file mode 100644 index c9157cd7..00000000 --- a/data/const/npc/clothesRack.s +++ /dev/null @@ -1,9 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - .align 2 - -gUnk_0811423C:: @ 0811423C - .4byte sub_0806DD90 - .4byte sub_0806DEC8 diff --git a/linker.ld b/linker.ld index 1600006f..01c227d3 100644 --- a/linker.ld +++ b/linker.ld @@ -1287,7 +1287,7 @@ SECTIONS { src/npc/npc4E.o(.rodata); src/npc/npc4F.o(.rodata); data/animations/npc/npc4F.o(.rodata); - data/const/npc/clothesRack.o(.rodata); + src/npc/clothesRack.o(.rodata); data/animations/npc/clothesRack.o(.rodata); src/npc/picolyteBottle.o(.rodata); data/const/npc/smallTownMinish.o(.rodata); diff --git a/src/npc/clothesRack.c b/src/npc/clothesRack.c index 5c6c0831..883999f8 100644 --- a/src/npc/clothesRack.c +++ b/src/npc/clothesRack.c @@ -1,9 +1,14 @@ #include "npc.h" -extern void (*gUnk_0811423C[])(Entity*); +void sub_0806DD90(Entity*); +void sub_0806DEC8(Entity*); void ClothesRack(Entity* this) { - gUnk_0811423C[this->action](this); + static void (*const actionFuncs[])(Entity*) = { + sub_0806DD90, + sub_0806DEC8, + }; + actionFuncs[this->action](this); } void sub_0806DD90(Entity* this) {