From f9ea488e358dcfa419725b9aa03db94ffcaa3e87 Mon Sep 17 00:00:00 2001
From: Kermalis <29823718+Kermalis@users.noreply.github.com>
Date: Thu, 7 Sep 2023 01:05:38 -0400
Subject: [PATCH] Add unused EWRAM_DATA variables

---
 src/input.c  | 6 +++---
 src/memory.c | 6 +++---
 src/sprite.c | 5 ++++-
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/input.c b/src/input.c
index 0ea431a9c..fca78f578 100644
--- a/src/input.c
+++ b/src/input.c
@@ -4,7 +4,7 @@
 
 EWRAM_DATA Inputs gRealInputs = {0}; // 20255F0
 static EWRAM_DATA UnusedInputStruct sUnusedInputsRelated = {0}; // 2025600
-static EWRAM_DATA u32 sUnusedScrambledInputJunk = {0}; // 202562C
+static EWRAM_DATA u32 sUnusedScrambledInputJunk[3] = {0}; // 202562C
 static EWRAM_DATA Inputs sBufferedInputs = {0}; // 2025638
 static EWRAM_DATA Inputs sCurrentInputs = {0}; // 2025648
 static EWRAM_DATA Inputs sPrevInputs = {0}; // 2025658
@@ -22,7 +22,7 @@ void InitInput(void)
     sBufferedInputs.repeated = 0;
     sBufferedInputs.shortPress = 0;
 
-    sUnusedScrambledInputJunk = 0x4A14C1; // seems like random keyboard mashing (see UpdateInput)
+    sUnusedScrambledInputJunk[0] = 0x4A14C1; // seems like random keyboard mashing (see UpdateInput)
 
     sUnusedInputsRelated.unk20 = 0;
     sUnusedInputsRelated.unk0 = 0xFFFF; // probably a mask
@@ -201,5 +201,5 @@ void UpdateInput(void)
     sBufferedInputs.repeated |= sCurrentInputs.repeated;
     sBufferedInputs.shortPress |= sCurrentInputs.shortPress;
 
-    sUnusedScrambledInputJunk *= sCurrentInputs.held | 0x54A1C41; // very similar to odd constant in InitInput - probably keymashing
+    sUnusedScrambledInputJunk[0] *= sCurrentInputs.held | 0x54A1C41; // very similar to odd constant in InitInput - probably keymashing
 }
\ No newline at end of file
diff --git a/src/memory.c b/src/memory.c
index 3945f0356..b6165ab05 100644
--- a/src/memory.c
+++ b/src/memory.c
@@ -4,10 +4,10 @@
 
 EWRAM_DATA struct HeapDescriptor *gHeapDescriptorList[8] = {0}; // 2000E88
 EWRAM_DATA u32 gHeapCount = {0}; // 2000EA8
-// space of 4?
+UNUSED static EWRAM_DATA u32 sUnused1 = {0}; // 2000EAC
 EWRAM_DATA struct HeapDescriptor gMainHeapDescriptor = {0}; // 2000EB0
-// space of 4?
-extern struct HeapFreeListElement gMainHeapFreeList[32]; // 2000ED0
+UNUSED static EWRAM_DATA u32 sUnused2 = {0}; // 2000ECC
+extern struct HeapFreeListElement gMainHeapFreeList[32]; // 2000ED0 (CAPACITY OR STRUCT SIZE IS WRONG)
 extern u8 gMainHeap[HEAP_SIZE]; // 20011D0
 
 void InitHeapInternal(void);
diff --git a/src/sprite.c b/src/sprite.c
index e6839d5d3..69d006787 100644
--- a/src/sprite.c
+++ b/src/sprite.c
@@ -3,7 +3,7 @@
 #include "random.h"
 #include "sprite.h"
 
-static EWRAM_DATA u16 sOAMSpriteCount = {0}; // Written to but never read
+static EWRAM_DATA u16 sOAMSpriteCount = {0}; // 2025670 Written to but never read
 #ifndef NONMATCHING
 UNUSED // TODO: Remove the "UNUSED" attribute after sub_8004EA8 is done
 #endif
@@ -14,12 +14,15 @@ UNUSED // TODO: Remove the "UNUSED" attribute after sub_8004EA8 is done
 static EWRAM_DATA s16 sUnknown_2025682[9] = {0};
 static EWRAM_DATA Position sUnknown_2025694 = {0};
 static EWRAM_DATA u32 sUnknown_2025698 = {0};
+UNUSED static EWRAM_DATA u32 sUnused1 = {0}; // 202569C
 static EWRAM_DATA SpriteList sUnknown_20256A0 = {0};
 static EWRAM_DATA UnkSpriteLink sUnknown_2025EA8[128] = {0};
 static EWRAM_DATA SpriteOAM sUnknown_20262A8[128] = {0};
 static EWRAM_DATA s32 sSpriteCount = {0}; // 20266A8
+UNUSED static EWRAM_DATA u32 sUnused2 = {0}; // 20266AC
 static EWRAM_DATA unkStruct_20266B0 sUnknown_20266B0[160] = {0};
 static EWRAM_DATA void *sCharMemCursor = {0}; // 2026E30
+UNUSED static EWRAM_DATA u32 sUnused3 = {0}; // 2026E34
 
 static EWRAM_DATA_2 unkStruct_20266B0 *sUnknown_203B074 = {0};