falso
/
tmc
mirror of https://github.com/zeldaret/tmc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Put const data into festari

This commit is contained in:
Tal Hayon 2022-04-13 22:40:07 +03:00
parent ce25a10148
commit eb7a55f464
3 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
data/const/npc/festari.s
View File

@ -1,10 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_08109BBC:: @ 08109BBC
.4byte sub_0805FE10
.4byte sub_0805FE48
.4byte sub_0805FF18

2
linker.ld
View File

@ -1151,7 +1151,7 @@ SECTIONS {
data/data_08108E6C.o(.rodata);
src/playerItem/playerItemSpiralBeam.o(.rodata);
data/animations/npc/gentari.o(.rodata);
data/const/npc/festari.o(.rodata);
src/npc/festari.o(.rodata);
data/animations/npc/festari.o(.rodata);
data/const/npc/forestMinish.o(.rodata);
data/animations/npc/forestMinish.o(.rodata);

14
src/npc/festari.c
View File

@ -3,12 +3,18 @@
#include "functions.h"
#include "npc.h"
extern void sub_0805FF2C(Entity*, ScriptExecutionContext*);
extern void (*const gUnk_08109BBC[])(Entity*);
void sub_0805FF2C(Entity*, ScriptExecutionContext*);
void sub_0805FE10(Entity* this);
void sub_0805FE48(Entity* this);
void sub_0805FF18(Entity* this);
void Festari(Entity* this) {
gUnk_08109BBC[this->action](this);
static void (*const actionFuncs[])(Entity*) = {
sub_0805FE10,
sub_0805FE48,
sub_0805FF18,
};
actionFuncs[this->action](this);
}
void sub_0805FE10(Entity* this) {