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 jarPortal

This commit is contained in:
Tal Hayon 2022-04-17 20:34:58 +03:00
parent dcbdf53c11
commit 809ad1331b
3 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
data/const/object/jarPortal.s
View File

@ -1,13 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_08121488:: @ 08121488
.4byte sub_0808BE9C
.4byte sub_0808BF14
.4byte sub_0808BF58
.4byte sub_0808BFD8
.4byte sub_0808C0AC

2
linker.ld
View File

@ -1400,7 +1400,7 @@ SECTIONS {
data/animations/object/object35.o(.rodata);
src/object/object36.o(.rodata);
src/object/object37.o(.rodata);
data/const/object/jarPortal.o(.rodata);
src/object/jarPortal.o(.rodata);
data/animations/object/jarPortal.o(.rodata);
src/object/bossDoor.o(.rodata);
data/animations/object/bossDoor.o(.rodata);

12
src/object/jarPortal.c
View File

@ -2,17 +2,23 @@
#include "area.h"
#include "functions.h"
extern void (*gUnk_08121488[])(Entity*);
extern u32 PortalReadyForMinish(void);
u32 sub_0808C128(Entity*);
void sub_0808C13C(Entity*);
void sub_0808BE9C(Entity*);
void sub_0808BF14(Entity*);
void sub_0808BF58(Entity*);
void sub_0808BFD8(Entity*);
void sub_0808C0AC(Entity*);
void sub_0808C148(Entity*, u32);
void sub_0808C01C(Entity*, u32);
void JarPortal(Entity* this) {
gUnk_08121488[this->action](this);
static void (*const actionFuncs[])(Entity*) = {
sub_0808BE9C, sub_0808BF14, sub_0808BF58, sub_0808BFD8, sub_0808C0AC,
};
actionFuncs[this->action](this);
}
void sub_0808BE9C(Entity* this) {