diff --git a/data/const/item/itemOcarina.s b/data/const/item/itemOcarina.s deleted file mode 100644 index b438eb83..00000000 --- a/data/const/item/itemOcarina.s +++ /dev/null @@ -1,9 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - .align 2 - -gOcarinaStates:: @ 0811BDD8 - .4byte OcarinaUse - .4byte OcarinaUpdate diff --git a/linker.ld b/linker.ld index 293fce16..01b51b01 100644 --- a/linker.ld +++ b/linker.ld @@ -1314,7 +1314,7 @@ SECTIONS { src/item/itemBomb.o(.rodata); src/item/itemTryPickupObject.o(.rodata); src/item/itemPegasusBoots.o(.rodata); - data/const/item/itemOcarina.o(.rodata); + src/item/itemOcarina.o(.rodata); data/const/item/itemPacciCane.o(.rodata); data/const/item/itemShield.o(.rodata); src/item/itemGustJar.o(.rodata); diff --git a/src/item/itemOcarina.c b/src/item/itemOcarina.c index ce7d0c4f..caa7b1f7 100644 --- a/src/item/itemOcarina.c +++ b/src/item/itemOcarina.c @@ -2,13 +2,16 @@ #include "sound.h" #include "functions.h" -extern void (*const gOcarinaStates[4])(ItemBehavior*, u32); - extern void ResetPlayerVelocity(void); - extern void CreateBird(void); +void OcarinaUse(ItemBehavior*, u32); +void OcarinaUpdate(ItemBehavior*, u32); void ItemOcarina(ItemBehavior* this, u32 idx) { + static void (*const gOcarinaStates[])(ItemBehavior*, u32) = { + OcarinaUse, + OcarinaUpdate, + }; gOcarinaStates[this->stateID](this, idx); gPlayerEntity.field_0x7a.HWORD += 1; }