Put const data in itemShield

This commit is contained in:
Tal Hayon
2022-04-16 21:03:00 +03:00
parent 13d44cf944
commit 0b81971858
3 changed files with 10 additions and 13 deletions
-10
View File
@@ -1,10 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_0811BDE8:: @ 0811BDE8
.4byte sub_08076D04
.4byte sub_08076D34
.4byte sub_08076D94
+1 -1
View File
@@ -1316,7 +1316,7 @@ SECTIONS {
src/item/itemPegasusBoots.o(.rodata);
src/item/itemOcarina.o(.rodata);
src/item/itemPacciCane.o(.rodata);
data/const/item/itemShield.o(.rodata);
src/item/itemShield.o(.rodata);
src/item/itemGustJar.o(.rodata);
data/const/item/itemMoleMitts.o(.rodata);
data/const/item/itemJarEmpty.o(.rodata);
+9 -2
View File
@@ -4,10 +4,17 @@
#include "sound.h"
#include "functions.h"
extern void (*const gUnk_0811BDE8[])(ItemBehavior* beh, u32);
void sub_08076D04(ItemBehavior*, u32);
void sub_08076D34(ItemBehavior*, u32);
void sub_08076D94(ItemBehavior*, u32);
void ItemShield(ItemBehavior* beh, u32 idx) {
gUnk_0811BDE8[beh->stateID](beh, idx);
static void (*const stateFuncs[])(ItemBehavior*, u32) = {
sub_08076D04,
sub_08076D34,
sub_08076D94,
};
stateFuncs[beh->stateID](beh, idx);
}
void sub_08076D04(ItemBehavior* beh, u32 idx) {