fileScreen.c OK

4 files changed, 12 insertions, 9 deletions

diff --git a/src/object/bird.c b/src/object/bird.c
index aedff14d..47a822c6 100644
--- a/src/object/bird.c
+++ b/src/object/bird.c
@@ -2,6 +2,7 @@
 #include "entity.h"
 #include "flags.h"
 #include "functions.h"
+#include "save.h"
 
 extern void (*const gUnk_08123EC0[])(Entity*);
 extern void (*const gUnk_08123EEC[])(Entity*);
@@ -118,7 +119,7 @@ void sub_0809D130(Entity* this) {
         sub_0800445C(this);
     } else if (sub_08017850(this) != 0) {
         CreateItemEntity(0x17, 0, 0);
-        gUnk_02002A40.windcrests |= 0x10000000;
+        gSave.windcrests |= 0x10000000;
         DeleteThisEntity();
     }
 }
diff --git a/src/object/fileScreenObjects.c b/src/object/fileScreenObjects.c
index 4b18fa79..7bc3f717 100644
--- a/src/object/fileScreenObjects.c
+++ b/src/object/fileScreenObjects.c
@@ -6,8 +6,8 @@
 #include "menu.h"
 #include "npc.h"
 #include "position.h"
-#include "readKeyInput.h"
 #include "structures.h"
+#include "fileScreen.h"
 
 extern int sub_0807A094(int);
 extern void LoadPalettes(const u8*, int, int);
@@ -92,8 +92,8 @@ void sub_0808E818(Entity* this) {
     }
 
     if (gUnk_02032EC0.lastState == 0) {
-        if (gUnk_03000FF0.heldKeys & L_BUTTON) {
-            switch (gUnk_03000FF0.newKeys) {
+        if (gInput.heldKeys & L_BUTTON) {
+            switch (gInput.newKeys) {
                 case DPAD_UP:
                     this->animationState = 0;
                     break;
@@ -167,7 +167,7 @@ void sub_0808E988(Entity* this) {
 }
 
 void sub_0808E9F4(Entity* this) {
-    if (sub_0808E950() && gUnk_02002A40.unk6) {
+    if (sub_0808E950() && gSave.unk6) {
         this->spriteSettings.b.draw = 2;
     } else {
         this->spriteSettings.b.draw = 0;
@@ -323,7 +323,7 @@ void sub_0808EBB8(Entity* this) {
 }
 
 static Entity* sub_0808EC80(int form) {
-    Entity* entityA = (Entity*) &gUnk_03003DA0;
+    Entity* entityA = (Entity*)&gUnk_03003DA0;
     Entity* entityB = entityA->next;
     while (entityB != entityA) {
         if ((entityB->entityType.type == 0x6 && entityB->entityType.subtype == 0x48) &&
diff --git a/src/object/greatFairy.c b/src/object/greatFairy.c
index 257e748e..dac1e955 100644
--- a/src/object/greatFairy.c
+++ b/src/object/greatFairy.c
@@ -5,6 +5,7 @@
 #include "structures.h"
 #include "greatFairy.h"
 #include "functions.h"
+#include "save.h"
 
 enum {
     BEHAVIORS,
@@ -540,10 +541,10 @@ void sub_08087424(Entity* arg0, struct_08087424* arg1) {
 
     switch (arg1->unk4) {
         case 0:
-            gUnk_02002A40.stats.arrowCount = arg1->unk4;
+            gSave.stats.arrowCount = arg1->unk4;
             break;
         case 1:
-            gUnk_02002A40.stats.bombCount = 0;
+            gSave.stats.bombCount = 0;
             break;
     }
 }
diff --git a/src/object/windcrest.c b/src/object/windcrest.c
index f8c804e5..ff559344 100644
--- a/src/object/windcrest.c
+++ b/src/object/windcrest.c
@@ -1,6 +1,7 @@
 #include "global.h"
 #include "entity.h"
 #include "functions.h"
+#include "save.h"
 
 extern void sub_0807DD64(Entity*);
 extern void sub_0807DDAC(Entity*, u32);
@@ -27,6 +28,6 @@ void sub_080A2124(Entity* this) {
 
 void Windcrest_Unlock(Entity* this) {
     PlaySFX(0x72);
-    gUnk_02002A40.windcrests = gUnk_02002A40.windcrests | 1 << (this->entityType.parameter + 0x18);
+    gSave.windcrests = gSave.windcrests | 1 << (this->entityType.parameter + 0x18);
     CreateFx(this, 0x46, 0);
 }