falso
/
tmc
mirror of https://github.com/zeldaret/tmc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Put const data in itemBow

This commit is contained in:
Tal Hayon 2022-04-16 20:49:53 +03:00
parent 0f05b0237d
commit 3c6101e313
3 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
data/const/item/itemBow.s
View File

@ -1,14 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_0811BD80:: @ 0811BD80
.4byte sub_08075DF4
.4byte sub_08075E40
.4byte sub_08075EC0
.4byte sub_08075F38
.4byte sub_08075F84
.4byte sub_08075D88

2
linker.ld
View File

@ -1310,7 +1310,7 @@ SECTIONS {
src/item/itemSword.o(.rodata); src/item/itemSword.o(.rodata);
src/item/itemLantern.o(.rodata); src/item/itemLantern.o(.rodata);
src/item/itemBoomerang.o(.rodata); src/item/itemBoomerang.o(.rodata);
data/const/item/itemBow.o(.rodata); src/item/itemBow.o(.rodata);
data/const/item/itemBomb.o(.rodata); data/const/item/itemBomb.o(.rodata);
data/const/item/itemTryPickupObject.o(.rodata); data/const/item/itemTryPickupObject.o(.rodata);
src/item/itemPegasusBoots.o(.rodata); src/item/itemPegasusBoots.o(.rodata);

12
src/item/itemBow.c
View File

@ -2,10 +2,18 @@
#include "functions.h" #include "functions.h"
#include "save.h" #include "save.h"
extern void (*const gUnk_0811BD80[])(ItemBehavior*, u32); void sub_08075DF4(ItemBehavior*, u32);
void sub_08075E40(ItemBehavior*, u32);
void sub_08075EC0(ItemBehavior*, u32);
void sub_08075F38(ItemBehavior*, u32);
void sub_08075F84(ItemBehavior*, u32);
void sub_08075D88(ItemBehavior*, u32);
void ItemBow(ItemBehavior* this, u32 idx) { void ItemBow(ItemBehavior* this, u32 idx) {
gUnk_0811BD80[this->stateID](this, idx); static void (*const stateFuncs[])(ItemBehavior*, u32) = {
sub_08075DF4, sub_08075E40, sub_08075EC0, sub_08075F38, sub_08075F84, sub_08075D88,
};
stateFuncs[this->stateID](this, idx);
} }
void sub_08075DF4(ItemBehavior* this, u32 idx) { void sub_08075DF4(ItemBehavior* this, u32 idx) {