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 frozenFlower

This commit is contained in:
Tal Hayon 2022-04-17 20:33:32 +03:00
parent e6931831b6
commit dcbdf53c11
3 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
data/const/object/object31.s
View File

@ -1,9 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_0812119C:: @ 0812119C
.4byte sub_0808A9DC
.4byte nullsub_519

2
linker.ld
View File

@ -1389,7 +1389,7 @@ SECTIONS {
data/animations/object/pushableRock.o(.rodata); data/animations/object/pushableRock.o(.rodata);
src/object/hittableLever.o(.rodata); src/object/hittableLever.o(.rodata);
src/object/object30.o(.rodata); src/object/object30.o(.rodata);
data/const/object/object31.o(.rodata); src/object/frozenFlower.o(.rodata);
src/object/pullableMushroom.o(.rodata); src/object/pullableMushroom.o(.rodata);
data/animations/object/pullableMushroom.o(.rodata); data/animations/object/pullableMushroom.o(.rodata);
src/object/bollard.o(.rodata); src/object/bollard.o(.rodata);

9
src/object/frozenFlower.c
View File

@ -1,9 +1,14 @@
#include "object.h" #include "object.h"
extern void (*const gUnk_0812119C[])(Entity*); void sub_0808A9DC(Entity*);
void nullsub_519(Entity*);
void FrozenFlower(Entity* this) { void FrozenFlower(Entity* this) {
gUnk_0812119C[this->action](this); static void (*const actionFuncs[])(Entity*) = {
sub_0808A9DC,
nullsub_519,
};
actionFuncs[this->action](this);
} }
void sub_0808A9DC(Entity* this) { void sub_0808A9DC(Entity* this) {