summaryrefslogtreecommitdiff
path: root/src/npc
diff options
context:
space:
mode:
authorCatobat <69204835+Catobat@users.noreply.github.com>2023-01-07 22:54:36 +0100
committerCatobat <69204835+Catobat@users.noreply.github.com>2023-01-07 22:54:36 +0100
commitfbdd0078cd92dc914fe29ea6ac71778ca814bbcc (patch)
tree1d6a4c6dffb48a29679cad842458dec0c489f7db /src/npc
parentfba95b9ff778a83706806b15924e63862937d214 (diff)
Give unk141 and unk1C1 in SaveFile names
Diffstat (limited to 'src/npc')
-rw-r--r--src/npc/cucco.c2
-rw-r--r--src/npc/din.c2
-rw-r--r--src/npc/farore.c2
-rw-r--r--src/npc/nayru.c2
-rw-r--r--src/npc/tingleSiblings.c2
5 files changed, 5 insertions, 5 deletions
diff --git a/src/npc/cucco.c b/src/npc/cucco.c
index c79084a8..9944978e 100644
--- a/src/npc/cucco.c
+++ b/src/npc/cucco.c
@@ -113,7 +113,7 @@ void sub_0806E65C(Entity* this) {
void Cucco_ShowMessage(Entity* this) {
u32 val = 0;
u32 index = sub_08002632(this);
- if (gSave.unk1C1[index] == 0xf3) {
+ if (gSave.fuserOffers[index] == 0xf3) {
val = 1;
}
diff --git a/src/npc/din.c b/src/npc/din.c
index 894edab4..19f23540 100644
--- a/src/npc/din.c
+++ b/src/npc/din.c
@@ -31,7 +31,7 @@ void Din(Entity* this) {
void sub_08064828(Entity* this) {
u32 tmp = sub_0801E99C(this);
- if ((gSave.unk141[sub_08002632(this)] != 0) && (gSave.global_progress < 7)) {
+ if ((gSave.fuserProgress[sub_08002632(this)] != 0) && (gSave.global_progress < 7)) {
tmp = 0;
}
sub_08078784(this, tmp);
diff --git a/src/npc/farore.c b/src/npc/farore.c
index 32f6e6ee..cbd09a5a 100644
--- a/src/npc/farore.c
+++ b/src/npc/farore.c
@@ -31,7 +31,7 @@ void Farore(Entity* this) {
void sub_08064A28(Entity* this) {
u32 tmp = sub_0801E99C(this);
- if ((gSave.unk141[sub_08002632(this)] != 0) && (gSave.global_progress < 7)) {
+ if ((gSave.fuserProgress[sub_08002632(this)] != 0) && (gSave.global_progress < 7)) {
tmp = 0;
}
sub_08078784(this, tmp);
diff --git a/src/npc/nayru.c b/src/npc/nayru.c
index 262b251c..23ab5de6 100644
--- a/src/npc/nayru.c
+++ b/src/npc/nayru.c
@@ -31,7 +31,7 @@ void Nayru(Entity* this) {
void sub_08064928(Entity* this) {
u32 tmp = sub_0801E99C(this);
- if ((gSave.unk141[sub_08002632(this)] != 0) && (gSave.global_progress < 7)) {
+ if ((gSave.fuserProgress[sub_08002632(this)] != 0) && (gSave.global_progress < 7)) {
tmp = 0;
}
sub_08078784(this, tmp);
diff --git a/src/npc/tingleSiblings.c b/src/npc/tingleSiblings.c
index 7ca9c778..36819425 100644
--- a/src/npc/tingleSiblings.c
+++ b/src/npc/tingleSiblings.c
@@ -134,7 +134,7 @@ void sub_08064F28(Entity* this, ScriptExecutionContext* context) {
context->condition = 0;
roomFlag = gUnk_0810FC50[this->type];
if (CheckRoomFlag(roomFlag) == 0) {
- bVar2 = gSave.unk141[sub_08002632(this)];
+ bVar2 = gSave.fuserProgress[sub_08002632(this)];
if (bVar2 >= 2) {
uVar5 = 3;
} else {