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 itemJarEmpty

This commit is contained in:
Tal Hayon 2022-04-16 21:36:50 +03:00
parent 9d043a4ad7
commit 7a3ca3499c
3 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
data/const/item/itemJarEmpty.s
View File

@ -1,11 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_0811BE28:: @ 0811BE28
.4byte sub_08077534
.4byte sub_08077618
.4byte sub_08077640
.4byte sub_0807766C

3
linker.ld
View File

@ -30,7 +30,6 @@ SECTIONS {
. = 0x00001A40; gBG3Buffer = .;
. = 0x00002A40; gSave = .;
. = 0x00002AC0; gUnk_02002AC0 = .;
. = 0x00002AC8; gUnk_02002AC8 = .;
. = 0x00002B0E; gUnk_02002B0E = .;
. = 0x00002B32; gUnk_02002B32 = .;
. = 0x00002B54; gUnk_02002B54 = .;
@ -1319,7 +1318,7 @@ SECTIONS {
src/item/itemShield.o(.rodata);
src/item/itemGustJar.o(.rodata);
src/item/itemMoleMitts.o(.rodata);
data/const/item/itemJarEmpty.o(.rodata);
src/item/itemJarEmpty.o(.rodata);
data/data_0811BE38.o(.rodata);
data/map/room_headers.o(.rodata);
src/flags.o(.rodata);

15
src/item/itemJarEmpty.c
View File

@ -2,12 +2,19 @@
#include "save.h"
#include "functions.h"
extern void (*const gUnk_0811BE28[])(ItemBehavior*, u32);
extern u8 gUnk_02002AC8[];
void sub_08077534(ItemBehavior*, u32);
void sub_08077618(ItemBehavior*, u32);
void sub_08077640(ItemBehavior*, u32);
void sub_0807766C(ItemBehavior*, u32);
void ItemJarEmpty(ItemBehavior* this, u32 idx) {
gUnk_0811BE28[this->stateID](this, idx);
static void (*const stateFuncs[])(ItemBehavior*, u32) = {
sub_08077534,
sub_08077618,
sub_08077640,
sub_0807766C,
};
stateFuncs[this->stateID](this, idx);
}
void sub_08077534(ItemBehavior* this, u32 idx) {