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
+4 -2
View File
@@ -3,7 +3,9 @@
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) {
s32 sVar1;
@@ -12,7 +14,7 @@ void NPC58(Entity* this) {
Entity* entity;
if (this->action == 0) {
if (LoadExtraSpriteData(this, &gUnk_081146D0) == 0) {
if (LoadExtraSpriteData(this, gUnk_081146D0) == 0) {
return;
}
this->action += 1;
+4 -2
View File
@@ -13,8 +13,6 @@ void sub_0806EABC(Entity* this);
void sub_0806EABC(Entity* this, u32 param);
#endif
extern Font gUnk_081146B8;
void Phonograph(Entity* this) {
if (this->action == 0) {
this->action += 1;
@@ -187,6 +185,10 @@ void sub_0806E964(Entity* this, ScriptExecutionContext* context) {
}
#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
void sub_0806EABC(Entity* this) {
sub_08050384();
+1 -1
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;
WStruct* pWVar4;
u32 uVar5;