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
+15 -5
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) {