diff --git a/data/const/item/itemBoomerang.s b/data/const/item/itemBoomerang.s deleted file mode 100644 index 18365c51..00000000 --- a/data/const/item/itemBoomerang.s +++ /dev/null @@ -1,9 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - .align 2 - -gUnk_0811BD78:: @ 0811BD78 - .4byte sub_08075D2C - .4byte sub_08075D88 diff --git a/linker.ld b/linker.ld index e14aeb53..29becf13 100644 --- a/linker.ld +++ b/linker.ld @@ -1309,7 +1309,7 @@ SECTIONS { src/item.o(.rodata); src/item/itemSword.o(.rodata); src/item/itemLantern.o(.rodata); - data/const/item/itemBoomerang.o(.rodata); + src/item/itemBoomerang.o(.rodata); data/const/item/itemBow.o(.rodata); data/const/item/itemBomb.o(.rodata); data/const/item/itemTryPickupObject.o(.rodata); diff --git a/src/item/itemBoomerang.c b/src/item/itemBoomerang.c index 22ac3849..55a8e22a 100644 --- a/src/item/itemBoomerang.c +++ b/src/item/itemBoomerang.c @@ -1,10 +1,15 @@ #include "item.h" #include "functions.h" -extern void (*const gUnk_0811BD78[])(ItemBehavior*, u32); +void sub_08075D2C(ItemBehavior*, u32); +void sub_08075D88(ItemBehavior*, u32); void ItemBoomerang(ItemBehavior* this, u32 idx) { - gUnk_0811BD78[this->stateID](this, idx); + static void (*const stateFuncs[])(ItemBehavior*, u32) = { + sub_08075D2C, + sub_08075D88, + }; + stateFuncs[this->stateID](this, idx); } void sub_08075D2C(ItemBehavior* this, u32 idx) {