1 files changed, 7 insertions, 9 deletions
diff --git a/include/ewram.h b/include/ewram.h
index 1b54a1ebc..2acf8d203 100755
--- a/include/ewram.h
+++ b/include/ewram.h
@@ -4,13 +4,12 @@
 extern u8 ewram[];
 
 #define BATTLE_STRUCT           ((struct BattleStruct *)     (ewram + 0x0))
-#define ewram0                (*(struct UnknownStruct7 *)(ewram + 0x0))
 #define ewram0_2                (*(struct Struct2000000 *)(ewram + 0x0))
 #define namingScreenData                (*(struct NamingScreenData *)(ewram + 0x0))
-#define unk_2000000                (*(struct UnkStruct *)(ewram + 0x0))
 #define ewramBerryPic             (ewram + 0x0)
 #define ewram0_3             (*(struct UnknownStruct3 *)(ewram + 0x0))
 #define ewram0_4             (*(struct Unk2000000 *)(ewram + 0x0))
+#define ewram0_5                (*(struct UnkStruct *)(ewram + 0x0))
 #define ewram4                (*(struct UnknownStruct8 *)(ewram + 0x4))
 #define ewram520                ((struct UnknownStruct7 *)(ewram + 0x00520))
 #define ewram888                (ewram + 0x888)
@@ -79,19 +78,18 @@ extern u8 ewram[];
 #define UNK_2016A00_STRUCT                ((struct UnkBattleStruct1 *) (ewram + 0x16A00))
 #define AI_STACK                ((struct AI_Stack *)         (ewram + 0x16C00))
 #define AI_ARRAY_160CC          ((struct SmallItemStruct *)  (ewram + 0x160CC))
-#define ewram17100_2                (*(struct Struct2017100 *)(ewram + 0x17100))
+#define ewram17000              ((u32 *)                     (ewram + 0x17100)) // this label is incorrect.
+#define ewram17100                (*(struct Struct2017100 *)(ewram + 0x17100))
 #define B_BATTLESCRIPTS_STACK                ((struct scriptsStack *)     (ewram + 0x17110))
+#define ewram17130                (ewram[0x17130])
 #define B_FUNCTION_STACK        ((struct funcStack *)        (ewram + 0x17140))
+#define ewram17160                (ewram[0x17160])
 #define ewram17800              ((struct Struct2017800 *)    (ewram + 0x17800))
+#define EWRAM_17800           ((struct UnknownStruct1 *)(ewram + 0x17800))
 #define ewram17810              ((struct Struct2017810 *)    (ewram + 0x17810))
+#define EWRAM_17810           ((struct UnknownStruct3 *)(ewram + 0x17810))
 #define ewram17840              (*(struct Struct2017840 *)   (ewram + 0x17840))
 #define ewram17850              ((struct UnknownStruct5 *)(ewram + 0x17850))
-#define ewram17000              ((u32 *)                     (ewram + 0x17100)) // this label is incorrect.
-#define ewram17100                ((u32 *)(ewram + 0x17100))
-#define ewram17130                (ewram[0x17130])
-#define ewram17160                (ewram[0x17160])
-#define EWRAM_17800           ((struct UnknownStruct1 *)(ewram + 0x17800))
-#define EWRAM_17810           ((struct UnknownStruct3 *)(ewram + 0x17810))
 #define unk_2018000           (*(struct PlayerRecords *)(ewram + 0x18000))
 #define EWRAM_18000           ((u16 *)(ewram + 0x18000))
 #define ewram18000                ((u16 *)(ewram + 0x18000))