mirror of
https://github.com/zeldaret/tmc
synced 2026-06-14 14:28:16 -04:00
Put const data in itemOcarina
This commit is contained in:
@@ -1,9 +0,0 @@
|
||||
.include "asm/macros.inc"
|
||||
.include "constants/constants.inc"
|
||||
|
||||
.section .rodata
|
||||
.align 2
|
||||
|
||||
gOcarinaStates:: @ 0811BDD8
|
||||
.4byte OcarinaUse
|
||||
.4byte OcarinaUpdate
|
||||
@@ -1314,7 +1314,7 @@ SECTIONS {
|
||||
src/item/itemBomb.o(.rodata);
|
||||
src/item/itemTryPickupObject.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/itemShield.o(.rodata);
|
||||
src/item/itemGustJar.o(.rodata);
|
||||
|
||||
@@ -2,13 +2,16 @@
|
||||
#include "sound.h"
|
||||
#include "functions.h"
|
||||
|
||||
extern void (*const gOcarinaStates[4])(ItemBehavior*, u32);
|
||||
|
||||
extern void ResetPlayerVelocity(void);
|
||||
|
||||
extern void CreateBird(void);
|
||||
void OcarinaUse(ItemBehavior*, u32);
|
||||
void OcarinaUpdate(ItemBehavior*, u32);
|
||||
|
||||
void ItemOcarina(ItemBehavior* this, u32 idx) {
|
||||
static void (*const gOcarinaStates[])(ItemBehavior*, u32) = {
|
||||
OcarinaUse,
|
||||
OcarinaUpdate,
|
||||
};
|
||||
gOcarinaStates[this->stateID](this, idx);
|
||||
gPlayerEntity.field_0x7a.HWORD += 1;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user