diff --git a/data/const/item/itemPacciCane.s b/data/const/item/itemPacciCane.s deleted file mode 100644 index fc6c4969..00000000 --- a/data/const/item/itemPacciCane.s +++ /dev/null @@ -1,9 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - .align 2 - -gUnk_0811BDE0:: @ 0811BDE0 - .4byte sub_08076C98 - .4byte sub_08076CBC diff --git a/linker.ld b/linker.ld index 01b51b01..59c7d243 100644 --- a/linker.ld +++ b/linker.ld @@ -1315,7 +1315,7 @@ SECTIONS { src/item/itemTryPickupObject.o(.rodata); src/item/itemPegasusBoots.o(.rodata); src/item/itemOcarina.o(.rodata); - data/const/item/itemPacciCane.o(.rodata); + src/item/itemPacciCane.o(.rodata); data/const/item/itemShield.o(.rodata); src/item/itemGustJar.o(.rodata); data/const/item/itemMoleMitts.o(.rodata); diff --git a/src/item/itemPacciCane.c b/src/item/itemPacciCane.c index dbf9681d..a09a7640 100644 --- a/src/item/itemPacciCane.c +++ b/src/item/itemPacciCane.c @@ -3,10 +3,15 @@ #include "item.h" #include "functions.h" -extern void (*const gUnk_0811BDE0[])(ItemBehavior* beh, u32); +void sub_08076C98(ItemBehavior*, u32); +void sub_08076CBC(ItemBehavior*, u32); void ItemPacciCane(ItemBehavior* beh, u32 idx) { - gUnk_0811BDE0[beh->stateID](beh, idx); + static void (*const stateFuncs[])(ItemBehavior * beh, u32) = { + sub_08076C98, + sub_08076CBC, + }; + stateFuncs[beh->stateID](beh, idx); } void sub_08076C98(ItemBehavior* beh, u32 idx) {