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 itemOcarina

This commit is contained in:
Tal Hayon 2022-04-16 20:58:27 +03:00
parent 2cad513327
commit 8c3854d7ef
3 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
data/const/item/itemOcarina.s
View File

@ -1,9 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gOcarinaStates:: @ 0811BDD8
.4byte OcarinaUse
.4byte OcarinaUpdate

2
linker.ld
View File

@ -1314,7 +1314,7 @@ SECTIONS {
src/item/itemBomb.o(.rodata); src/item/itemBomb.o(.rodata);
src/item/itemTryPickupObject.o(.rodata); src/item/itemTryPickupObject.o(.rodata);
src/item/itemPegasusBoots.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/itemPacciCane.o(.rodata);
data/const/item/itemShield.o(.rodata); data/const/item/itemShield.o(.rodata);
src/item/itemGustJar.o(.rodata); src/item/itemGustJar.o(.rodata);

9
src/item/itemOcarina.c
View File

@ -2,13 +2,16 @@
#include "sound.h" #include "sound.h"
#include "functions.h" #include "functions.h"
extern void (*const gOcarinaStates[4])(ItemBehavior*, u32);
extern void ResetPlayerVelocity(void); extern void ResetPlayerVelocity(void);
extern void CreateBird(void); extern void CreateBird(void);
void OcarinaUse(ItemBehavior*, u32);
void OcarinaUpdate(ItemBehavior*, u32);
void ItemOcarina(ItemBehavior* this, u32 idx) { void ItemOcarina(ItemBehavior* this, u32 idx) {
static void (*const gOcarinaStates[])(ItemBehavior*, u32) = {
OcarinaUse,
OcarinaUpdate,
};
gOcarinaStates[this->stateID](this, idx); gOcarinaStates[this->stateID](this, idx);
gPlayerEntity.field_0x7a.HWORD += 1; gPlayerEntity.field_0x7a.HWORD += 1;
} }