Put const data in itemPacciCane

This commit is contained in:
Tal Hayon 2022-04-16 20:59:56 +03:00
parent 8c3854d7ef
commit 13d44cf944
3 changed files with 8 additions and 12 deletions

View File

@ -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

View File

@ -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);

View File

@ -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) {