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 gregal

This commit is contained in:
Tal Hayon 2022-04-16 11:32:44 +03:00
parent f614c35329
commit 928b51f14c
4 changed files with 16 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
assets/assets.json
View File

@ -39766,11 +39766,6 @@
"size": 7, "size": 7,
"type": "animation" "type": "animation"
}, },
{
"path": "gregal/gUnk_08113D84.bin",
"start": 1129860,
"size": 8
},
{ {
"path": "animations/gSpriteAnimations_MayorHagen_0.bin", "path": "animations/gSpriteAnimations_MayorHagen_0.bin",
"start": 1130432, "start": 1130432,

14
data/const/npc/gregal.s
View File

@ -1,14 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_08113D84:: @ 08113D84
.incbin "gregal/gUnk_08113D84.bin"
gUnk_08113D8C:: @ 08113D8C
.4byte sub_0806CAF4
.4byte sub_0806CB80
.4byte sub_0806CBB4
.4byte sub_0806CC08

2
linker.ld
View File

@ -1278,7 +1278,7 @@ SECTIONS {
data/animations/npc/teachers.o(.rodata); data/animations/npc/teachers.o(.rodata);
data/const/npc/windTribespeople.o(.rodata); data/const/npc/windTribespeople.o(.rodata);
data/animations/npc/windTribespeople.o(.rodata); data/animations/npc/windTribespeople.o(.rodata);
data/const/npc/gregal.o(.rodata); src/npc/gregal.o(.rodata);
data/animations/npc/gregal.o(.rodata); data/animations/npc/gregal.o(.rodata);
data/const/npc/mayorHagen.o(.rodata); data/const/npc/mayorHagen.o(.rodata);
data/animations/npc/mayorHagen.o(.rodata); data/animations/npc/mayorHagen.o(.rodata);

18
src/npc/gregal.c
View File

@ -3,12 +3,24 @@
#include "functions.h" #include "functions.h"
#include "npc.h" #include "npc.h"
extern void (*gUnk_08113D8C[])(Entity*); static const u32 gUnk_08113D84[] = {
0x100c0200,
0x4,
};
extern u32 gUnk_08113D84[]; void sub_0806CAF4(Entity*);
void sub_0806CB80(Entity*);
void sub_0806CBB4(Entity*);
void sub_0806CC08(Entity*);
void Gregal(Entity* this) { void Gregal(Entity* this) {
gUnk_08113D8C[this->type](this); static void (*const actionFuncs[])(Entity*) = {
sub_0806CAF4,
sub_0806CB80,
sub_0806CBB4,
sub_0806CC08,
};
actionFuncs[this->type](this);
} }
void sub_0806CAF4(Entity* this) { void sub_0806CAF4(Entity* this) {