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 mayorHagen

This commit is contained in:
Tal Hayon 2022-04-16 13:31:31 +03:00
parent 928b51f14c
commit c1d7f51c1f
4 changed files with 16 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
assets/assets.json
View File

@ -39832,16 +39832,6 @@
"size": 14,
"type": "animation"
},
{
"path": "mayorHagen/gUnk_08113F44.bin",
"start": 1130308,
"size": 4
},
{
"path": "mayorHagen/gUnk_08113F48.bin",
"start": 1130312,
"size": 120
},
{
"path": "bigGoron/gUnk_081140CC.bin",
"start": 1130700,

11
data/const/npc/mayorHagen.s
View File

@ -1,11 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_08113F44:: @ 08113F44
.incbin "mayorHagen/gUnk_08113F44.bin"
gUnk_08113F48:: @ 08113F48
.incbin "mayorHagen/gUnk_08113F48.bin"

2
linker.ld
View File

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

20
src/npc/mayorHagen.c
View File

@ -5,9 +5,6 @@
#include "npc.h"
#include "item.h"
extern u32 gUnk_08113F44;
extern Dialog gUnk_08113F48[];
void MayorHagen(Entity* this) {
u32 v;
switch (this->action) {
@ -41,11 +38,24 @@ void MayorHagen(Entity* this) {
}
void sub_0806CE5C(Entity* this) {
static const u8 gUnk_08113F44[] = {
0,
8,
8,
16,
};
sub_08078784(this, sub_0801E99C(this));
sub_08078850(this, 1, 0, &gUnk_08113F44);
sub_08078850(this, 1, 0, gUnk_08113F44);
}
void sub_0806CE80(Entity* this) {
static const Dialog dialogs[] = {
{ 0x89, 1, 2, 1, 0x4c0d, 0x4c01 }, { 0x89, 1, 2, 1, 0x4c0d, 0x4c01 }, { 0x89, 1, 2, 1, 0x4c0d, 0x4c01 },
{ 0x89, 1, 2, 1, 0x4c0d, 0x4c01 }, { 0, 0, 1, 1, 0, 0x4c0e }, { 0, 0, 1, 1, 0, 0x4c0e },
{ 0, 0, 1, 1, 0, 0x4c0f }, { 0, 0, 1, 1, 0, 0x4c10 }, { 0, 0, 1, 1, 0, 0x4c11 },
{ 0, 0, 1, 1, 0, 0x4c12 }, { 0, 0, 1, 1, 0, 0x4c14 }, { 0, 0, 1, 1, 0, 0x4c02 },
{ 0, 0, 1, 1, 0, 0x4c0c }, { 0, 0, 1, 1, 0, 0x4c03 }, { 0, 0, 1, 1, 0, 0x4c04 },
};
u32 v;
u32 v2;
v = gSave.global_progress;
@ -72,7 +82,7 @@ void sub_0806CE80(Entity* this) {
}
}
}
ShowNPCDialogue(this, &gUnk_08113F48[v]);
ShowNPCDialogue(this, &dialogs[v]);
}
void MayorHagen_Fusion(Entity* this) {