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 npc58

This commit is contained in:
Tal Hayon 2022-04-16 20:37:58 +03:00
parent d0c14ba8ee
commit bb43265c50
6 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,11 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_081146B8:: @ 081146B8
.incbin "npc58/gUnk_081146B8.bin"
gUnk_081146D0:: @ 081146D0
.incbin "data_081146D0/gUnk_081146D0.bin"

2
include/fileselect.h
View File

@ -52,7 +52,7 @@ extern struct_02019EE0 gMapDataBottomSpecial;
// TODO size: 0x8000 from ClearTilemaps? // TODO size: 0x8000 from ClearTilemaps?
extern void sub_08056FEC(u32, struct_020227E8*); extern void sub_08056FEC(u32, struct_020227E8*);
extern u32 sub_0805F46C(u32, Font*); extern u32 sub_0805F46C(u32, const Font*);
extern void ClearTilemaps(void); extern void ClearTilemaps(void);
extern void sub_0805194C(u32); extern void sub_0805194C(u32);
extern WStruct* sub_0805F2C8(void); extern WStruct* sub_0805F2C8(void);

2
linker.ld
View File

@ -1297,7 +1297,7 @@ SECTIONS {
src/npc/cucco.o(.rodata); src/npc/cucco.o(.rodata);
src/npc/cuccoChick.o(.rodata); src/npc/cuccoChick.o(.rodata);
src/npc/phonograph.o(.rodata); src/npc/phonograph.o(.rodata);
data/const/npc/npc58.o(.rodata); src/npc/npc58.o(.rodata);
src/npcDefinitions.o(.rodata); src/npcDefinitions.o(.rodata);
data/data_081146D0.o(.rodata); data/data_081146D0.o(.rodata);
src/physics.o(.rodata); src/physics.o(.rodata);

6
src/npc/npc58.c
View File

@ -3,7 +3,9 @@
extern void sub_0806FFBC(Entity*, u32, u32, u32); extern void sub_0806FFBC(Entity*, u32, u32, u32);
extern SpriteLoadData gUnk_081146D0; static const SpriteLoadData gUnk_081146D0[] = {
{ 0, 0x61, 0x4 }, { 0x800, 0x61, 0x4 }, { 0x1000, 0x61, 0x4 }, { 0x1800, 0x61, 0x4 }, { 0, 0, 0 },
};
void NPC58(Entity* this) { void NPC58(Entity* this) {
s32 sVar1; s32 sVar1;
@ -12,7 +14,7 @@ void NPC58(Entity* this) {
Entity* entity; Entity* entity;
if (this->action == 0) { if (this->action == 0) {
if (LoadExtraSpriteData(this, &gUnk_081146D0) == 0) { if (LoadExtraSpriteData(this, gUnk_081146D0) == 0) {
return; return;
} }
this->action += 1; this->action += 1;

6
src/npc/phonograph.c
View File

@ -13,8 +13,6 @@ void sub_0806EABC(Entity* this);
void sub_0806EABC(Entity* this, u32 param); void sub_0806EABC(Entity* this, u32 param);
#endif #endif
extern Font gUnk_081146B8;
void Phonograph(Entity* this) { void Phonograph(Entity* this) {
if (this->action == 0) { if (this->action == 0) {
this->action += 1; this->action += 1;
@ -187,6 +185,10 @@ void sub_0806E964(Entity* this, ScriptExecutionContext* context) {
} }
#endif #endif
const static Font gUnk_081146B8 = {
(u16*)0x2034fce, (void*)0x0600d000, (void*)0x2000d00, 0, 0xf080, 0xd0, 1, 1, 1, 1, 0, 0, 0, 1, 0
};
#ifdef EU #ifdef EU
void sub_0806EABC(Entity* this) { void sub_0806EABC(Entity* this) {
sub_08050384(); sub_08050384();

2
src/text.c
View File

@ -430,7 +430,7 @@ void sub_0805F440(Token* param_1, u8* param_2) {
} }
} }
u32 sub_0805F46C(u32 param_1, Font* param_2) { u32 sub_0805F46C(u32 param_1, const Font* param_2) {
u32 uVar1; u32 uVar1;
WStruct* pWVar4; WStruct* pWVar4;
u32 uVar5; u32 uVar5;