Put const data in itemBoomerang

This commit is contained in:
Tal Hayon
2022-04-16 20:47:42 +03:00
parent d2d458d702
commit 0f05b0237d
3 changed files with 8 additions and 12 deletions
-9
View File
@@ -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
+1 -1
View File
@@ -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);
+7 -2
View File
@@ -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) {