move src/engine/ direct ewram calls to ewram.h.

22 files changed, 345 insertions, 335 deletions

diff --git a/include/ewram.h b/include/ewram.h
index 83fc5dac6..fa405e59c 100755
--- a/include/ewram.h
+++ b/include/ewram.h
@@ -3,120 +3,156 @@
 
 extern u8 ewram[];
 
-#define BATTLE_STRUCT               ((struct BattleStruct *)     (ewram + 0x0))
-#define ewram0_2                    (*(struct Struct2000000 *)(ewram + 0x0))
-#define namingScreenData            (*(struct NamingScreenData *)(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)
-#define ewramBlankMapName           (ewram + 0xA48)
-#define ewramA6E                    (ewram[0xA6E])
-#define ewram01000                  (*(struct Unk2001000 *)(ewram + 0x1000))
-#define ewramBerryPicTemp           (ewram + 0x1000)
-#define EWRAM_1000                  (*(struct Struct2001000 *)(ewram + 0x1000))
-#define gUnk20011fa                 (u8 *)(&ewram[0x11FA])
-#define gUnk2002694                 (u8 *)(&ewram[0x2694])
-#define gUnk20026A6                 (u8 *)(&ewram[0x26A6])
-#define gUnk20026e4                 (u8 *)(&ewram[0x26E4])
-#define gUnknown_02007000           (*(ewramStruct_02007000 *)(ewram + 0x7000))
-#define ARRAY_2007800               ((struct EasyChatPair *)(ewram + 0x7800))
-#define ARRAY_2007900               ((struct EasyChatPair *)(ewram + 0x7900))
-#define unk_2008000                 (*(struct PlayerRecords *)(ewram + 0x08000))
-#define TRANSITION_STRUCT           (*(struct TransitionData *)   (ewram + 0xC000))
-#define ewram_2010000               (*(struct TradeEwramStruct *)(ewram + 0x10000))
-#define EWRAM_14000                 ((u8 *)(ewram + 0x14000))
-#define EWRAM_14800                 ((u16 *)(ewram + 0x14800))
-#define sEvoInfo                    ((*(struct EvoInfo*)(ewram + 0x14800)))
-#define EWRAM_15000                 ((u8 *)(ewram + 0x15000))
-#define ewram16000                  (ewram[0x16000])
-#define ewram16001                  (ewram[0x16001])
-#define ewram16002                  (ewram[0x16002])
-#define ewram16003                  (ewram[0x16003])
-#define ewram1600C                  (ewram[0x1600C])
-#define ewram1600E                  (ewram[0x1600E])
-#define ewram1601B                  (ewram[0x1601B])
-#define ewram16020                  ((u8 *)(ewram + 0x16020))
-#define ewram16056                  (ewram[0x16056])
-#define ewram16058                  (ewram[0x16058])
-#define ewram16059                  (ewram[0x16059])
-#define UNK_201606C_ARRAY           (ewram + 0x1606C) // lazy define but whatever.
-#define ewram16078                  (ewram[0x16078])
-#define ewram16084                  (ewram[0x16084])
-#define ewram16086                  (ewram[0x16086])
-#define ewram16087                  (ewram[0x16087])
-#define ewram16088                  (ewram[0x16088])
-#define ewram16088_2                (*(u8 *)(ewram + 0x16088))
-#define ewram16089                  (ewram[0x16089])
-#define ewram16089_2                (*(u8 *)(ewram + 0x16089))
-#define EWRAM_1609D                 (ewram[0x1609D])
-#define ewram160A1                  (ewram[0x160A1])
-#define ewram160A6                  (ewram[0x160A6])
-#define ewram160AC                  ((u8 *)(ewram + 0x160AC))
-#define ewram160BC                  ((u16 *)(ewram + 0x160BC))  // hp
-#define ewram160C8                  (ewram[0x160C8])
-#define ewram160C9                  (ewram[0x160C9])
-#define ewram160CB                  (ewram[0x160CB])
-#define ewram160CC                  ((u8 *)(ewram + 0x160CC))
-#define USED_HELD_ITEM(bank)        ((((u16*)(&ewram[0x160CC + bank * 2]))))
-#define USED_HELD_ITEMS(bank)       (*(u16 *)&ewram[0x160CC + 2 * (bank)])
-#define ewram160E6                  (ewram[0x160E6])
-#define CHOICED_MOVE(bank)          (((u16*)(&ewram[0x160E8 + bank * 2])))
-#define ewram160E8                  ((u8 *)(ewram + 0x160E8))
-#define ewram160F0                  ((u8 *)(ewram + 0x160F0))
-#define ewram160F9                  (ewram[0x160F9])
-#define ewram160FB                  (ewram[0x160FB])
-#define ewram16100                  ((u8 *)(ewram + 0x16100))
-#define ewram16108                  ((u8 *)(ewram + 0x16108))
-#define ewram16110                  (ewram[0x16110])
-#define ewram16111                  (ewram[0x16111])
-#define ewram16113                  (ewram[0x16113])
-#define AI_THINKING_STRUCT          ((struct AI_ThinkingStruct *)(ewram + 0x16800))
-#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 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 unk_2018000                 (*(struct PlayerRecords *)(ewram + 0x18000))
-#define EWRAM_18000                 ((u16 *)(ewram + 0x18000))
-#define ewram18000                  ((u16 *)(ewram + 0x18000))
-#define UNK_2018000_STRUCT          (*(struct UnknownStruct2018000 *)(ewram + 0x18000))
-#define ewram18300                  ((u16 *)(ewram + 0x18300))
-#define EWRAM_19348                 (*(u16 *)(ewram + 0x19348))
-#define ewram19348                  (*(struct Struct2019348 *)(ewram + 0x19348))
-#define ewram1B000                  (*(struct Unk201B000 *)(ewram + 0x1B000))
-#define ewram1B000_alt              (*(struct Struct201B000 *)(ewram + 0x1B000))
-#define EWRAM_1B000                 ewram1B000_alt // FIXME
-#define EWRAM_1B000_2               (*(struct Struct201B000 *)(ewram + 0x1B000))
-#define EWRAM_1C000                 (*(struct Struct201C000 *)(ewram + 0x1C000))
-#define ewram1C000                  (*(struct Unk201C000 *)(ewram + 0x1C000))
-#define ewram1c000                  (*(struct Unk201C000 *)(ewram + 0x1C000)) // FIXME, names too similar
-#define ewram1D000                  ((struct Pokemon *)(ewram + 0x1D000))
-#define ewram1D000_2                ((u16 *)(ewram + 0x1D000))
-#define ewram1D400                  ((u16 *)(ewram + 0x1D400))
-#define ewramSavedItemsPocket       ((struct ItemSlot *)(ewram + 0x1E000))  // saved items pocket (for Wally battle)
-#define HALL_OF_FAME_SHEET_0        ((u8 *)(ewram + 0x1E000))
-#define HALL_OF_FAME_SHEET_1        ((u8 *)(ewram + 0x1E800))
-#define ewram_1f000                 (*(struct DecoPCPointers *)(ewram + 0x1f000))
-#define ewramSavedPokeballsPocket   ((struct ItemSlot *)(ewram + 0x1F000))  // saved Pokeballs pocket (for Wally battle)
-#define HALL_OF_FAME_SHEET_2        ((u8 *)(ewram + 0x1F000))
-#define EWRAM_1F800                 ((u16 *)(ewram + 0x1F800))
-#define ewram1FE00                  (*(struct Unk201FE00 *)(ewram + 0x1FE00))
-#define gHelperState                (ewram[0x1FFFE])
-#define gReshowState                (ewram[0x1FFFF])
-#define ewramBagSetupStep           (ewram[0x1FFFF])
+#define BATTLE_STRUCT                   ((struct BattleStruct *)     (ewram + 0x0))
+#define ewram0_2                        (*(struct Struct2000000 *)(ewram + 0x0))
+#define namingScreenData                (*(struct NamingScreenData *)(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)
+#define ewramBlankMapName               (ewram + 0xA48)
+#define ewramA6E                        (ewram[0xA6E])
+#define ewram01000                      (*(struct Unk2001000 *)(ewram + 0x1000))
+#define ewramBerryPicTemp               (ewram + 0x1000)
+#define EWRAM_1000                      (*(struct Struct2001000 *)(ewram + 0x1000))
+#define gUnk20011fa                     (u8 *)(&ewram[0x11FA])
+#define gUnk2002694                     (u8 *)(&ewram[0x2694])
+#define gUnk20026A6                     (u8 *)(&ewram[0x26A6])
+#define gUnk20026e4                     (u8 *)(&ewram[0x26E4])
+#define gUnknown_02007000               (*(ewramStruct_02007000 *)(ewram + 0x7000))
+#define ARRAY_2007800                   ((struct EasyChatPair *)(ewram + 0x7800))
+#define ARRAY_2007900                   ((struct EasyChatPair *)(ewram + 0x7900))
+#define unk_2008000                     (*(struct PlayerRecords *)(ewram + 0x08000))
+#define TRANSITION_STRUCT               (*(struct TransitionData *)   (ewram + 0xC000))
+#define ewramC03C                       (&ewram[0xC03C])
+#define ewram_2010000                   (*(struct TradeEwramStruct *)(ewram + 0x10000))
+#define EWRAM_14000                     ((u8 *)(ewram + 0x14000))
+#define EWRAM_14800                     ((u16 *)(ewram + 0x14800))
+#define sEvoInfo                        ((*(struct EvoInfo*)(ewram + 0x14800)))
+#define EWRAM_15000                     ((u8 *)(ewram + 0x15000))
+#define ewram16000                      (ewram[0x16000])
+#define ewram16001                      (ewram[0x16001])
+#define ewram16002                      (ewram[0x16002])
+#define ewram16003                      (ewram[0x16003])
+#define ewram16004arr(i, bank)          (ewram[0x16004 + i + bank * 2])
+#define ewram1600C                      (ewram[0x1600C])
+#define ewram1600E                      (ewram[0x1600E])
+#define ewram16010arr(bank)             (ewram[0x16010 + bank])
+#define ewram1601B                      (ewram[0x1601B])
+#define eDynamicMoveType                (ewram[0x1601C])
+#define eDmgMultiplier                  (ewram[0x1601F])
+#define ewram16020                      ((u8 *)(ewram + 0x16020))
+#define ewram16020arr(i)                (ewram[0x16020 + i])
+#define ewram16054                      (ewram[0x16054])
+#define ewram16056                      (ewram[0x16056])
+#define ewram16058                      (ewram[0x16058])
+#define ewram16059                      (ewram[0x16059])
+#define ewram16060(bank)                (ewram[0x16060 + bank])
+#define BATTLE_PARTY_ID(bank)           (ewram[0x16064 + bank])
+#define ewram16064                      (&ewram[0x16064])
+#define ewram16064arr(bank)             (ewram[0x16064 + bank])
+#define ewram16068arr(i)                (ewram[0x16068 + i])
+#define UNK_201606C_ARRAY               (ewram + 0x1606C) // lazy define but whatever.
+#define ewram1606Carr(i, a, mul)        (ewram[0x1606C + i + a * mul])
+#define ewram16078                      (ewram[0x16078])
+#define ewram16084                      (ewram[0x16084])
+#define ewram16086                      (ewram[0x16086])
+#define ewram16087                      (ewram[0x16087])
+#define ewram16088                      (ewram[0x16088])
+#define ewram16088_2                    (*(u8 *)(ewram + 0x16088))
+#define ewram16089                      (ewram[0x16089])
+#define ewram16089_2                    (*(u8 *)(ewram + 0x16089))
+#define ewram1608Carr(bank)             (ewram[0x1608C + bank])
+#define EWRAM_1609D                     (ewram[0x1609D])
+#define ewram160A1                      (ewram[0x160A1])
+#define ewram160A6                      (ewram[0x160A6])
+#define ewram160A8                      (ewram[0x160A8])
+#define ewram160A9                      (ewram[0x160A9])
+#define ewram160AA                      (ewram[0x160AA])
+#define ewram160AB                      (ewram[0x160AB])
+#define ewram160AC                      ((u8 *)(ewram + 0x160AC))
+#define ewram160ACarr(i)                (ewram[0x160AC + i])
+#define ewram160ACarr2(i, bank)         (ewram[0x160AC + i + bank * 2])
+#define ewram160BC                      ((u16 *)(ewram + 0x160BC))  // hp
+#define ewram160BCarr(bank)             (ewram[0x160BC + bank * 2])
+#define ewram160C0                      (ewram[0x160C0])
+#define ewram160C2_Flags                ((u16 *)(ewram + 0x160C2))
+#define ewram160C4_Callback             ((MainCallback *)(ewram + 0x160C4))
+#define ewram160C8                      (ewram[0x160C8])
+#define ewram160C8arr(bank)             (ewram[0x160C8 + (bank / 2)])
+#define ewram160C9                      (ewram[0x160C9])
+#define ewram160CB                      (ewram[0x160CB])
+#define ewram160CC                      ((u8 *)(ewram + 0x160CC))
+#define ewram160CCarr(i)                (ewram[0x160CC + i])
+#define USED_HELD_ITEM(bank)            ((((u16*)(&ewram[0x160CC + bank * 2]))))
+#define USED_HELD_ITEMS(bank)           (*(u16 *)&ewram[0x160CC + 2 * (bank)])
+#define ewram160D4(bank)                (ewram[0x160D4 + (bank / 2) * 2])
+#define ewram160DD                      (ewram[0x160DD])
+#define ewram160E0(i)                   (ewram[0x160E0 + i])
+#define ewram160E6                      (ewram[0x160E6])
+#define CHOICED_MOVE(bank)              (((u16*)(&ewram[0x160E8 + bank * 2])))
+#define ewram160E8                      ((u8 *)(ewram + 0x160E8))
+#define ewram160E8arr(i)                (ewram[0x160E8 + i])
+#define ewram160E8arr2(i, bank)         (ewram[0x160E8 + i + bank * 2])
+#define ewram160F0                      ((u8 *)(ewram + 0x160F0))
+#define ewram160F0arr(i)                (ewram[0x160F0 + i])
+#define ewram160F8                      (ewram[0x160F8])
+#define ewram160F9                      (ewram[0x160F9])
+#define ewram160FB                      (ewram[0x160FB])
+#define ewram16100                      ((u8 *)(ewram + 0x16100))
+#define ewram16100arr(i)                (ewram[0x16100 + i])
+#define ewram16100arr2(i, bank)         (ewram[0x16100 + i + bank * 4])
+#define ewram16108                      ((u8 *)(ewram + 0x16108))
+#define ewram16108arr(i)                (ewram[0x16108 + i])
+#define ewram16110                      (ewram[0x16110])
+#define ewram16111                      (ewram[0x16111])
+#define ewram16113                      (ewram[0x16113])
+#define AI_THINKING_STRUCT              ((struct AI_ThinkingStruct *)(ewram + 0x16800))
+#define UNK_2016A00_STRUCT              ((struct UnkBattleStruct1 *) (ewram + 0x16A00))
+#define AI_STACK                        ((struct AI_Stack *)         (ewram + 0x16C00))
+#define AI_ARRAY_160CC(i)               (ewram[0x160CC + i * 2])
+#define ewram17002                      (&ewram[0x17002])
+#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 unk_2018000                     (*(struct PlayerRecords *)(ewram + 0x18000))
+#define EWRAM_18000                     ((u16 *)(ewram + 0x18000))
+#define ewram18000                      ((u16 *)(ewram + 0x18000))
+#define UNK_2018000_STRUCT              (*(struct UnknownStruct2018000 *)(ewram + 0x18000))
+#define ewram18300                      ((u16 *)(ewram + 0x18300))
+#define EWRAM_19348                     (*(u16 *)(ewram + 0x19348))
+#define ewram19348                      (*(struct Struct2019348 *)(ewram + 0x19348))
+#define ewram1B000                      (*(struct Unk201B000 *)(ewram + 0x1B000))
+#define ewram1B000_alt                  (*(struct Struct201B000 *)(ewram + 0x1B000))
+#define EWRAM_1B000                     ewram1B000_alt // FIXME
+#define EWRAM_1B000_2                   (*(struct Struct201B000 *)(ewram + 0x1B000))
+#define EWRAM_1C000                     (*(struct Struct201C000 *)(ewram + 0x1C000))
+#define ewram1C000                      (*(struct Unk201C000 *)(ewram + 0x1C000))
+#define ewram1c000                      (*(struct Unk201C000 *)(ewram + 0x1C000)) // FIXME, names too similar
+#define ewram1D000                      ((struct Pokemon *)(ewram + 0x1D000))
+#define ewram1D000_2                    ((u16 *)(ewram + 0x1D000))
+#define ewram1D400                      ((u16 *)(ewram + 0x1D400))
+#define ewramSavedItemsPocket           ((struct ItemSlot *)(ewram + 0x1E000))  // saved items pocket (for Wally battle)
+#define HALL_OF_FAME_SHEET_0            ((u8 *)(ewram + 0x1E000))
+#define HALL_OF_FAME_SHEET_1            ((u8 *)(ewram + 0x1E800))
+#define ewram_1f000                     (*(struct DecoPCPointers *)(ewram + 0x1f000))
+#define ewramSavedPokeballsPocket       ((struct ItemSlot *)(ewram + 0x1F000))  // saved Pokeballs pocket (for Wally battle)
+#define HALL_OF_FAME_SHEET_2            ((u8 *)(ewram + 0x1F000))
+#define EWRAM_1F800                     ((u16 *)(ewram + 0x1F800))
+#define ewram1FE00                      (*(struct Unk201FE00 *)(ewram + 0x1FE00))
+#define gHelperState                    (ewram[0x1FFFE])
+#define gReshowState                    (ewram[0x1FFFF])
+#define ewramBagSetupStep               (ewram[0x1FFFF])
 
 #endif
diff --git a/shared_syms.txt b/shared_syms.txt
index 571e0633e..5ed4186c6 100644
--- a/shared_syms.txt
+++ b/shared_syms.txt
@@ -1,43 +1,26 @@
-unk_2000000 = 0x2000000;
 ewram = 0x2000000;
-
 unk_2004000 = 0x2004000;
-
 gUnk_2009000 = 0x2009000;
-
 unk_2007800 = 0x2007800;
 unk_2007900 = 0x2007900;
-
 unk_2008000 = 0x2008000;
-
 unk_2015de0 = 0x2015de0;
 unk_2015e00 = 0x2015e00;
 unk_2016000 = 0x2016000;
-
 unk_201606C = 0x201606C;
-
 unk_20160BC = 0x20160BC;
-
 unk_2016A00 = 0x2016A00;
 unk_2016C00 = 0x2016C00;
-
 gTransformStatuses = 0x2017800;
 unk_2017810 = 0x2017810;
-
 gMailboxInfo = 0x201FE00;
-
 gSecretBaseRecord = 0x2017000;
-
 dword_2017100 = 0x2017100;
-
 unk_2018000 = 0x2018000;
-
 unk_2019348 = 0x2019348;
-
 unk_201B260 = 0x201b260;
 unk_201B264 = 0x201B264;
 unk_201C000 = 0x201C000;
-
 gHallOfFame = 0x201E000;
 unk_201f800 = 0x201F800;
 gCutGrassSpriteArray = 0x201FFF0;
diff --git a/src/battle/battle_2.c b/src/battle/battle_2.c
index 26433b055..38c60dee1 100644
--- a/src/battle/battle_2.c
+++ b/src/battle/battle_2.c
@@ -522,8 +522,8 @@ void sub_800F104(void)
     playerId = GetMultiplayerId();
     ewram160CB = playerId;
     // Seriously, Game Freak?
-    pSavedCallback = (MainCallback *)(ewram + 0x160C4);
-    pSavedBattleTypeFlags = (u16 *)(ewram + 0x160C2);
+    pSavedCallback = ewram160C4_Callback;
+    pSavedBattleTypeFlags = ewram160C2_Flags;
     RunTasks();
     AnimateSprites();
     BuildOamBuffer();
@@ -1581,12 +1581,12 @@ void sub_8010874(void)
 
     for (i = 0; i < 8; i++)
     {
-        ewram[i + 0x160AC] = 0;
-        ewram[i + 0x160CC] = 0;
-        ewram[i + 0x160E8] = 0;
-        ewram[i + 0x160F0] = 0;
-        ewram[i + 0x16100] = 0;
-        ewram[i + 0x16108] = 0;
+        ewram160ACarr(i) = 0;
+        ewram160CCarr(i) = 0;
+        ewram160E8arr(i) = 0;
+        ewram160F0arr(i) = 0;
+        ewram16100arr(i) = 0;
+        ewram16108arr(i) = 0;
     }
 
     ewram160C8 = 6;
@@ -1665,7 +1665,7 @@ void SwitchInClearStructs(void)
     {
         if (gUnknown_02024AD0[i].unk0 & (gBitTable[gActiveBank] << 16))
             gUnknown_02024AD0[i].unk0 &= ~(gBitTable[gActiveBank] << 16);
-        if ((gUnknown_02024AD0[i].unk0 & 0xE000) && ewram[0x16020 + i] == gActiveBank)
+        if ((gUnknown_02024AD0[i].unk0 & 0xE000) && ewram16020arr(i) == gActiveBank)
             gUnknown_02024AD0[i].unk0 &= ~0xE000;
     }
 
@@ -1690,14 +1690,14 @@ void SwitchInClearStructs(void)
     gUnknown_02024C2C[gActiveBank] = 0;
     gUnknown_02024C5C[gActiveBank] = 0xFF;
 
-    ewram[0x160AC + gActiveBank * 2 + 0] = 0;
-    ewram[0x160AC + gActiveBank * 2 + 1] = 0;
-    ewram[0x16100 + gActiveBank * 4 + 0] = 0;
-    ewram[0x16100 + gActiveBank * 4 + 1] = 0;
-    ewram[0x16100 + gActiveBank * 4 + 2] = 0;
-    ewram[0x16100 + gActiveBank * 4 + 3] = 0;
-    ewram[0x160E8 + gActiveBank * 2 + 0] = 0;
-    ewram[0x160E8 + gActiveBank * 2 + 1] = 0;
+    ewram160ACarr2(0, gActiveBank) = 0;
+    ewram160ACarr2(1, gActiveBank) = 0;
+    ewram16100arr2(0, gActiveBank) = 0;
+    ewram16100arr2(1, gActiveBank) = 0;
+    ewram16100arr2(2, gActiveBank) = 0;
+    ewram16100arr2(3, gActiveBank) = 0;
+    ewram160E8arr2(0, gActiveBank) = 0;
+    ewram160E8arr2(1, gActiveBank) = 0;
 
     ewram17100.arr[gActiveBank] = 0;
 
@@ -1708,7 +1708,6 @@ void UndoEffectsAfterFainting(void)
 {
     s32 i;
     u8 *ptr;
-    u32 *ptr2;
 
     for (i = 0; i < 8; i++)
         gBattleMons[gActiveBank].statStages[i] = 6;
@@ -1720,7 +1719,7 @@ void UndoEffectsAfterFainting(void)
             gBattleMons[i].status2 &= ~STATUS2_ESCAPE_PREVENTION;
         if (gBattleMons[i].status2 & (gBitTable[gActiveBank] << 16))
             gBattleMons[i].status2 &= ~(gBitTable[gActiveBank] << 16);
-        if ((gBattleMons[i].status2 & STATUS2_WRAPPED) && ewram[0x16020 + i] == gActiveBank)
+        if ((gBattleMons[i].status2 & STATUS2_WRAPPED) && ewram16020arr(i) == gActiveBank)
             gBattleMons[i].status2 &= ~STATUS2_WRAPPED;
     }
     gActionSelectionCursor[gActiveBank] = 0;
@@ -1755,17 +1754,16 @@ void UndoEffectsAfterFainting(void)
     gUnknown_02024C2C[gActiveBank] = 0;
     gUnknown_02024C5C[gActiveBank] = 0xFF;
 
-    ewram[0x160E8 + gActiveBank * 2 + 0] = 0;
-    ewram[0x160E8 + gActiveBank * 2 + 1] = 0;
-    ewram[0x160AC + gActiveBank * 2 + 0] = 0;
-    ewram[0x160AC + gActiveBank * 2 + 1] = 0;
-    ewram[0x16100 + gActiveBank * 4 + 0] = 0;
-    ewram[0x16100 + gActiveBank * 4 + 1] = 0;
-    ewram[0x16100 + gActiveBank * 4 + 2] = 0;
-    ewram[0x16100 + gActiveBank * 4 + 3] = 0;
+    ewram160E8arr2(0, gActiveBank) = 0;
+    ewram160E8arr2(1, gActiveBank) = 0;
+    ewram160ACarr2(0, gActiveBank) = 0;
+    ewram160ACarr2(1, gActiveBank) = 0;
+    ewram16100arr2(0, gActiveBank) = 0;
+    ewram16100arr2(1, gActiveBank) = 0;
+    ewram16100arr2(2, gActiveBank) = 0;
+    ewram16100arr2(3, gActiveBank) = 0;
 
-    ptr2 = (u32 *)(ewram + 0x17100);
-    ptr2[gActiveBank] = 0;
+    ewram17100.arr[gActiveBank] = 0;
 
     gBattleMons[gActiveBank].type1 = gBaseStats[gBattleMons[gActiveBank].species].type1;
     gBattleMons[gActiveBank].type2 = gBaseStats[gBattleMons[gActiveBank].species].type2;
@@ -2126,7 +2124,7 @@ void BattleBeginFirstTurn(void)
             ;
         for (i = 0; i < 4; i++)
         {
-            ewram[0x16068 + i] = 6;
+            ewram16068arr(i) = 6;
             gActionForBanks[i] = 0xFF;
             gChosenMovesByBanks[i] = 0;
         }
@@ -2218,7 +2216,7 @@ void BattleTurnPassed(void)
         gChosenMovesByBanks[i] = 0;
     }
     for (i = 0; i < 4; i++)
-        ewram[0x16068 + i] = 6;
+        ewram16068arr(i) = 6;
     ewram160A6 = gAbsentBankFlags;
     gBattleMainFunc = sub_8012324;
     gRandomTurnNumber = Random();
@@ -2292,23 +2290,23 @@ void sub_8012258(u8 a)
     u8 r1;
 
     for (i = 0; i < 3; i++)
-        gUnknown_02038470[i] = ewram[0x1606C + i + a * 3];
+        gUnknown_02038470[i] = ewram1606Carr(i, a, 3);
     r4 = pokemon_order_func(gBattlePartyID[a]);
-    r1 = pokemon_order_func(ewram[0x16068 + a]);
+    r1 = pokemon_order_func(ewram16068arr(a));
     sub_8094C98(r4, r1);
     if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
     {
         for (i = 0; i < 3; i++)
         {
-            ewram[0x1606C + i + a * 3] = gUnknown_02038470[i];
-            ewram[0x1606C + i + (a ^ 2) * 3] = gUnknown_02038470[i];
+            ewram1606Carr(i, a, 3) = gUnknown_02038470[i];
+            ewram1606Carr(i, (a ^ 2), 3) = gUnknown_02038470[i];
         }
     }
     else
     {
         for (i = 0; i < 3; i++)
         {
-            ewram[0x1606C + i + a * 3] = gUnknown_02038470[i];
+            ewram1606Carr(i, a, 3) = gUnknown_02038470[i];
         }
     }
 }
@@ -2327,7 +2325,7 @@ void sub_8012324(void)
         switch (gBattleCommunication[gActiveBank])
         {
         case 0:
-            ewram[0x016068 + gActiveBank] = 6;
+            ewram16068arr(gActiveBank) = 6;
             if (!(gBattleTypeFlags & 0x40)
              && (r5 & 2)
              && !(ewram160A6 & gBitTable[GetBankByPlayerAI(r5 ^ 2)])
diff --git a/src/battle/battle_3.c b/src/battle/battle_3.c
index 3f2b8d9e5..1d6784297 100644
--- a/src/battle/battle_3.c
+++ b/src/battle/battle_3.c
@@ -721,12 +721,12 @@ u8 TurnBasedEffects(void)
                     gBattleMons[gActiveBank].status2 -= 0x2000;
                     if (gBattleMons[gActiveBank].status2 & STATUS2_WRAPPED)  // damaged by wrap
                     {
-                        BATTLE_STRUCT->animArg1 = ewram[gActiveBank * 2 + 0x16004];
-                        BATTLE_STRUCT->animArg2 = ewram[gActiveBank * 2 + 0x16005];
+                        BATTLE_STRUCT->animArg1 = ewram16004arr(0, gActiveBank);
+                        BATTLE_STRUCT->animArg2 = ewram16004arr(1, gActiveBank);
                         gBattleTextBuff1[0] = 0xFD;
                         gBattleTextBuff1[1] = 2;
-                        gBattleTextBuff1[2] = ewram[gActiveBank * 2 + 0x16004];
-                        gBattleTextBuff1[3] = ewram[gActiveBank * 2 + 0x16005];
+                        gBattleTextBuff1[2] = ewram16004arr(0, gActiveBank);
+                        gBattleTextBuff1[3] = ewram16004arr(1, gActiveBank);
                         gBattleTextBuff1[4] = EOS;
                         gBattlescriptCurrInstr = BattleScript_WrapTurnDmg;
                         gBattleMoveDamage = gBattleMons[gActiveBank].maxHP / 16;
@@ -737,8 +737,8 @@ u8 TurnBasedEffects(void)
                     {
                         gBattleTextBuff1[0] = 0xFD;
                         gBattleTextBuff1[1] = 2;
-                        gBattleTextBuff1[2] = ewram[gActiveBank * 2 + 0x16004];
-                        gBattleTextBuff1[3] = ewram[gActiveBank * 2 + 0x16005];
+                        gBattleTextBuff1[2] = ewram16004arr(0, gActiveBank);
+                        gBattleTextBuff1[3] = ewram16004arr(1, gActiveBank);
                         gBattleTextBuff1[4] = EOS;
                         gBattlescriptCurrInstr = BattleScript_WrapEnds;
                     }
@@ -1377,7 +1377,7 @@ bool8 sub_8018018(u8 bank, u8 r1, u8 r2)
             r2 = gBattlePartyID[r6];
         for (i = 0; i < 6; i++)
         {
-            if (GetMonData(&party[i], MON_DATA_HP) && GetMonData(&party[i], MON_DATA_SPECIES2) && GetMonData(&party[i], MON_DATA_SPECIES2) != SPECIES_EGG && i != r1 && i != r2 && i != ewram[r7 + 0x16068] && i != ewram[r6 + 0x16068])
+            if (GetMonData(&party[i], MON_DATA_HP) && GetMonData(&party[i], MON_DATA_SPECIES2) && GetMonData(&party[i], MON_DATA_SPECIES2) != SPECIES_EGG && i != r1 && i != r2 && i != ewram16068arr(r7) && i != ewram16068arr(r6))
                 break;
         }
         return (i == 6);
@@ -3123,7 +3123,7 @@ u8 GetMoveTarget(u16 move, u8 useMoveTarget) //get move target
         targetBank = gBankAttacker;
         break;
     }
-    ewram[gBankAttacker + 0x16010] = targetBank;
+    ewram16010arr(gBankAttacker) = targetBank;
     return targetBank;
 }
 
diff --git a/src/battle/battle_4.c b/src/battle/battle_4.c
index 5daadd4b5..5c028d86b 100644
--- a/src/battle/battle_4.c
+++ b/src/battle/battle_4.c
@@ -2639,7 +2639,7 @@ void SetMoveEffect(bool8 primary, u8 certainArg)
                     {gBattlescriptCurrInstr++; return;}
 
 				gLastUsedItem = gBattleMons[gBankTarget].item;
-                ewram[gBankAttacker * 2 + 0x160cc] = gLastUsedItem;
+                USED_HELD_ITEM(bank) = gLastUsedItem;
                 gBattleMons[gBankTarget].item = 0;
 
                 gActiveBank = gBankAttacker;
@@ -2653,8 +2653,7 @@ void SetMoveEffect(bool8 primary, u8 certainArg)
                 b_movescr_stack_push(gBattlescriptCurrInstr + 1);
                 gBattlescriptCurrInstr = BattleScript_ItemSteal;
 
-				ewram[gBankTarget * 2 + 0x160e8] = 0;
-                //STORE_CHOICEMOVE(gBankTarget, 0);
+				CHOICED_MOVE(gBankTarget) = 0;
             }
             break;
         case 32: //escape prevention
@@ -2729,8 +2728,7 @@ void SetMoveEffect(bool8 primary, u8 certainArg)
                 b_movescr_stack_push(gBattlescriptCurrInstr + 1);
                 gBattlescriptCurrInstr = BattleScript_KnockedOff;
 
-				ewram[gEffectBank * 2 + 0x160e8] = 0;
-                //STORE_CHOICEMOVE(gEffectBank, 0);
+                CHOICED_MOVE(gEffectBank) = 0;
             }
             break;
         case 59: //overheat
@@ -4998,12 +4996,12 @@ static void atk19_faint_pokemon(void)
         if (!(gAbsentBankFlags & gBitTable[gActiveBank])
          && gBattleMons[gActiveBank].hp == 0)
         {
-            ewram[0x160AC + bank * 2 + 0] = 0;
-            ewram[0x160AC + bank * 2 + 1] = 0;
-            ewram[0x16100 + bank * 4 + 0] = 0;
-            ewram[0x16100 + bank * 4 + 1] = 0;
-            ewram[0x16100 + bank * 4 + 2] = 0;
-            ewram[0x16100 + bank * 4 + 3] = 0;
+            ewram160ACarr2(0, bank) = 0;
+            ewram160ACarr2(1, bank) = 0;
+            ewram16100arr2(0, bank) = 0;
+            ewram16100arr2(1, bank) = 0;
+            ewram16100arr2(2, bank) = 0;
+            ewram16100arr2(3, bank) = 0;
 
             gHitMarker |= HITMARKER_FAINTED(gActiveBank);
             b_movescr_stack_push(gBattlescriptCurrInstr + 7);
@@ -5039,7 +5037,7 @@ static void atk19_faint_pokemon(void)
              && gBattleMons[gBankAttacker].hp != 0
              && gCurrentMove != MOVE_STRUGGLE)
             {
-                u8 moveIndex = ewram[0x1608C + gBankAttacker];
+                u8 moveIndex = ewram1608Carr(gBankAttacker);
 
                 gBattleMons[gBankAttacker].pp[moveIndex] = 0;
                 b_movescr_stack_push(gBattlescriptCurrInstr);
@@ -5122,7 +5120,7 @@ static void atk1E_jumpifability(void)
             gLastUsedAbility = ability;
             gBattlescriptCurrInstr = jump_loc;
             RecordAbilityBattle(bank -1, gLastUsedAbility);
-            ewram[0x160f8] = bank - 1;
+            ewram160F8 = bank - 1;
         }
         else
             gBattlescriptCurrInstr += 7;
@@ -5135,7 +5133,7 @@ static void atk1E_jumpifability(void)
             gLastUsedAbility = ability;
             gBattlescriptCurrInstr = jump_loc;
             RecordAbilityBattle(bank - 1, gLastUsedAbility);
-            ewram[0x160f8] = bank - 1;
+            ewram160F8 = bank - 1;
         }
         else
             gBattlescriptCurrInstr += 7;
@@ -5148,7 +5146,7 @@ static void atk1E_jumpifability(void)
             gLastUsedAbility = ability;
             gBattlescriptCurrInstr = jump_loc;
             RecordAbilityBattle(bank, gLastUsedAbility);
-            ewram[0x160f8] = bank;
+            ewram160F8 = bank;
         }
         else
             gBattlescriptCurrInstr += 7;
@@ -7326,11 +7324,10 @@ static void atk43_jumpifabilitypresent(void)
 
 static void atk44(void)
 {
-    ewram[gBankAttacker + 0x16060] = 1;
+    ewram16060(gBankAttacker) = 1;
 }
 
 #ifdef NONMATCHING
-
 static void atk45_playanimation(void)
 {
     #define ANIMATION_ID T2_READ_8(gBattlescriptCurrInstr + 2)
@@ -9521,7 +9518,7 @@ static void atk4C_copy_poke_data(void)
 
     gActiveBank = GetBattleBank(T2_READ_8(gBattlescriptCurrInstr + 1));
 
-    gBattlePartyID[gActiveBank] = ewram[0x16068 + gActiveBank];
+    gBattlePartyID[gActiveBank] = ewram16068arr(gActiveBank);
 
     EmitGetAttributes(0, 0, gBitTable[gBattlePartyID[gActiveBank]]);
     MarkBufferBankForExecution(gActiveBank);
@@ -9671,8 +9668,7 @@ static void atk4F_jump_if_cannot_switch(void)
 
 void sub_8022A3C(u8 unkown)
 {
-    //BATTLE_STRUCT->unk16064[gActiveBank] = gBattlePartyID[gActiveBank];
-    ewram[gActiveBank + 0x16064] = gBattlePartyID[gActiveBank];
+    BATTLE_PARTY_ID(gActiveBank) = gBattlePartyID[gActiveBank];
     EmitChoosePokemon(0, 1, unkown, 0, BATTLE_STRUCT->unk1606C[gActiveBank]);
     MarkBufferBankForExecution(gActiveBank);
 }
@@ -10760,7 +10756,7 @@ static void atk51_switch_handle_order(void)
         for (i = 0; i < gNoOfAllBanks; i++)
         {
             if (gBattleBufferB[i][0] == 0x22)
-                ewram[i + 0x16068] = gBattleBufferB[i][1];
+                ewram16068arr(i) = gBattleBufferB[i][1];
         }
         break;
     case 1:
@@ -10769,17 +10765,15 @@ static void atk51_switch_handle_order(void)
         break;
     case 2:
         gBattleCommunication[0] = gBattleBufferB[gActiveBank][1];
-        ewram[gActiveBank + 0x16068] = gBattleBufferB[gActiveBank][1];
+        ewram16068arr(gActiveBank) = gBattleBufferB[gActiveBank][1];
         if (gBattleTypeFlags & BATTLE_TYPE_MULTI)
         {
-
-            ewram[(gActiveBank) * 3 + (0x1606C + 0)] &= 0xF;
-            ewram[(gActiveBank) * 3 + (0x1606C + 0)] |= (gBattleBufferB[gActiveBank][2] & 0xF0);
-            ewram[(gActiveBank) * 3 + (0x1606C + 1)] = gBattleBufferB[gActiveBank][3];
-
-            ewram[(gActiveBank ^ 2) * 3 + (0x1606C + 0)] &= (0xF0);
-            ewram[(gActiveBank ^ 2) * 3 + (0x1606C + 0)] |= (gBattleBufferB[gActiveBank][2] & 0xF0) >> 4;
-            ewram[(gActiveBank ^ 2) * 3 + (0x1606C + 2)] = gBattleBufferB[gActiveBank][3];
+            ewram1606Carr(0, gActiveBank, 3) &= 0xF;
+            ewram1606Carr(0, gActiveBank, 3) |= (gBattleBufferB[gActiveBank][2] & 0xF0);
+            ewram1606Carr(1, gActiveBank, 3) = gBattleBufferB[gActiveBank][3];
+            ewram1606Carr(0, (gActiveBank ^ 2), 3) &= (0xF0);
+            ewram1606Carr(0, (gActiveBank ^ 2), 3) |= (gBattleBufferB[gActiveBank][2] & 0xF0) >> 4;
+            ewram1606Carr(2, (gActiveBank ^ 2), 3) = gBattleBufferB[gActiveBank][3];
         }
         else
             sub_8012258(gActiveBank);
@@ -12168,7 +12162,7 @@ static void atk74_hp_thresholds2(void)
     {
         gActiveBank = GetBattleBank(T2_READ_8(gBattlescriptCurrInstr + 1));
         opposing_bank = gActiveBank ^ 1;
-        hp_switchout = ewram[2 * GetBankSide(opposing_bank) + 0x160bc]; //BATTLE_STRUCT->HP_OnSwitchout[GetBankSide(opposing_bank)];
+        hp_switchout = ewram160BCarr(GetBankSide(opposing_bank)); //BATTLE_STRUCT->HP_OnSwitchout[GetBankSide(opposing_bank)];
         result = (hp_switchout - gBattleMons[opposing_bank].hp) * 100 / hp_switchout;
 
         if (gBattleMons[opposing_bank].hp >= hp_switchout)
@@ -12242,7 +12236,7 @@ static void atk76_various(void)
             else
                 gActiveBank = 2;
 
-            choiced_move = (u16*)(&ewram[gActiveBank * 2 + 0x160e8]);
+            choiced_move = CHOICED_MOVE(gActiveBank);
             for (i = 0; i < 4; i++)
             {
                 if (gBattleMons[gActiveBank].moves[i] == *choiced_move)
@@ -12382,11 +12376,11 @@ static void atk7B_healhalfHP_if_possible(void)
 
 static void atk7C_8025508(void)
 {
-    u16 r7 = ewram[gBankAttacker * 2 + 0x160ac] | (ewram[gBankAttacker * 2 + 0x160ad] << 8);
-    u16 r6 = ewram[gBankAttacker * 4 + 0x16100] | (ewram[gBankAttacker * 4 + 0x16101] << 8);
-    u16 r5 = ewram[gBankAttacker * 4 + 0x16102] | (ewram[gBankAttacker * 4 + 0x16103] << 8);
+    u16 r7 = ewram160ACarr2(0, gBankAttacker) | (ewram160ACarr2(1, gBankAttacker) << 8);
+    u16 r6 = ewram16100arr2(0, gBankAttacker) | (ewram16100arr2(1, gBankAttacker) << 8);
+    u16 r5 = ewram16100arr2(2, gBankAttacker) | (ewram16100arr2(3, gBankAttacker) << 8);
 
-    if (r7 !=0 && r7 != 0xFFFF)
+    if (r7 != 0 && r7 != 0xFFFF)
     {
         gHitMarker &= ~(HITMARKER_ATTACKSTRING_PRINTED);
         gCurrentMove = r7;
@@ -13465,12 +13459,12 @@ static void atk8D_setmultihit_counter(void)
 
 static void atk8E_prepare_multihit(void)
 {
-    ewram[0x160e0] = 0xFD;
-    ewram[0x160e1] = 1;
-    ewram[0x160e2] = 1;
-    ewram[0x160e3] = 1;
-    ewram[0x160e4] = 0;
-    ewram[0x160e5] = 0xFF;
+    ewram160E0(0) = 0xFD;
+    ewram160E0(1) = 1;
+    ewram160E0(2) = 1;
+    ewram160E0(3) = 1;
+    ewram160E0(4) = 0;
+    ewram160E0(5) = 0xFF;
     gBattlescriptCurrInstr++;
 }
 
@@ -13478,7 +13472,7 @@ static bool8 sub_80264C0(void)
 {
     if (gBattleMons[gBankAttacker].level >= gBattleMons[gBankTarget].level)
     {
-        ewram[gBankTarget + 0x16064] = gBattlePartyID[gBankTarget];
+        ewram16064arr(gBankTarget) = gBattlePartyID[gBankTarget];
     }
     else
     {
@@ -13488,7 +13482,7 @@ static bool8 sub_80264C0(void)
             gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1);
             return 0;
         }
-        ewram[gBankTarget + 0x16064] = gBattlePartyID[gBankTarget];
+        ewram16064arr(gBankTarget) = gBattlePartyID[gBankTarget];
     }
     gBattlescriptCurrInstr = gUnknown_081D90FC;
     return 1;
@@ -13569,7 +13563,7 @@ static void atk8F_forcerandomswitch(void)
                     } while (i == gBattlePartyID[gBankTarget] || !MON_CAN_BATTLE(&party[i]));
                 }
             }
-            ewram[gBankTarget + 0x16068] = i;
+            ewram16068arr(gBankTarget) = i;
             if (!IsLinkDoubleBattle())
                 sub_8012258(gBankTarget);
             sub_8094B6C(gBankTarget, i, 0);
@@ -15430,7 +15424,7 @@ static void atkBA_jumpifnopursuitswitchdmg(void)
             gBankTarget = GetBankByPlayerAI(2);
     }
 
-    if (gActionForBanks[gBankTarget] == 0 && gBankAttacker == ewram[gBankTarget + 0x16010] && !(gBattleMons[gBankTarget].status1 & (STATUS_SLEEP | STATUS_FREEZE))
+    if (gActionForBanks[gBankTarget] == 0 && gBankAttacker == ewram16010arr(gBankTarget) && !(gBattleMons[gBankTarget].status1 & (STATUS_SLEEP | STATUS_FREEZE))
         && gBattleMons[gBankAttacker].hp && !gDisableStructs[gBankTarget].truantCounter && gChosenMovesByBanks[gBankTarget] == MOVE_PURSUIT)
     {
         int i;
@@ -15499,11 +15493,11 @@ static void atkBE_breakfree(void) //rapid spin
     if (gBattleMons[gBankAttacker].status2 & STATUS2_WRAPPED)
     {
         gBattleMons[gBankAttacker].status2 &= ~(STATUS2_WRAPPED);
-        gBankTarget = ewram[gBankAttacker + 0x16020];
+        gBankTarget = ewram16020arr(gBankAttacker);
         gBattleTextBuff1[0] = 0xFD;
         gBattleTextBuff1[1] = 2;
-        gBattleTextBuff1[2] = ewram[gBankAttacker * 2 + 0x16004];
-        gBattleTextBuff1[3] = ewram[gBankAttacker * 2 + 0x16005];
+        gBattleTextBuff1[2] = ewram16004arr(0, gBankAttacker);
+        gBattleTextBuff1[3] = ewram16004arr(1, gBankAttacker);
         gBattleTextBuff1[4] = 0xFF;
         b_movescr_stack_push_cursor();
         gBattlescriptCurrInstr = BattleScript_WrapFree;
@@ -16983,7 +16977,7 @@ static void atkE1_intimidate_string_loader(void)
 {
     u8 side;
 
-    BATTLE_STRUCT->scriptingActive = ewram[0x160dd];
+    BATTLE_STRUCT->scriptingActive = ewram160DD;
     side = GetBankSide(BATTLE_STRUCT->scriptingActive);
     gBattleTextBuff1[0] = 0xFD;
     gBattleTextBuff1[1] = 9;
@@ -17011,7 +17005,7 @@ static void atkE2_switchout_abilities(void)
     {
     case ABILITY_NATURAL_CURE:
         gBattleMons[gActiveBank].status1 = 0;
-        EmitSetAttributes(0, REQUEST_STATUS_BATTLE, gBitTable[ewram[gActiveBank + 0x16064]], 4, &gBattleMons[gActiveBank].status1);
+        EmitSetAttributes(0, REQUEST_STATUS_BATTLE, gBitTable[ewram16064arr(gActiveBank)], 4, &gBattleMons[gActiveBank].status1);
         MarkBufferBankForExecution(gActiveBank);
         break;
     }
diff --git a/src/battle/battle_ai.c b/src/battle/battle_ai.c
index aeac41750..5145d4980 100644
--- a/src/battle/battle_ai.c
+++ b/src/battle/battle_ai.c
@@ -953,8 +953,8 @@ static void BattleAICmd_is_most_powerful_move(void)
      && sDiscouragedPowerfulMoveEffects[i] == 0xFFFF)
     {
         gDynamicBasePower = 0;
-        ewram[0x1601C] = 0; // why is this a manual array?
-        ewram[0x1601F] = 1;
+        eDynamicMoveType = 0;
+        eDmgMultiplier = 1;
         gBattleMoveFlags = 0;
         gCritMultiplier = 1;
 
@@ -1999,8 +1999,7 @@ static void BattleAICmd_get_used_item(void)
     else
         index = gBankTarget;
 
-    // this hack and a half matches. whatever. i dont care. someone else fix this mess later. PS: still cant fix this.
-    AI_THINKING_STRUCT->funcResult = ewram[MULTI_DIM_ARR(index, B_16, 0x160CC)];
+    AI_THINKING_STRUCT->funcResult = AI_ARRAY_160CC(index);
 
     gAIScriptPtr += 2;
 }
diff --git a/src/battle/battle_controller_opponent.c b/src/battle/battle_controller_opponent.c
index 94ae43461..823d6702a 100644
--- a/src/battle/battle_controller_opponent.c
+++ b/src/battle/battle_controller_opponent.c
@@ -1674,7 +1674,7 @@ _0803558A:\n\
 void OpponentHandleOpenBag(void)
 {
     // What is this?
-    Emitcmd35(1, ewram[0x160D4 + gActiveBank / 2 * 2]);
+    Emitcmd35(1, ewram160D4(gActiveBank));
     OpponentBufferExecCompleted();
 }
 
@@ -1682,7 +1682,7 @@ void OpponentHandlecmd22(void)
 {
     s32 r4;
 
-    if (ewram[0x160C8 + GetBankIdentity(gActiveBank) / 2] == 6)
+    if (ewram160C8arr(GetBankIdentity(gActiveBank)) == 6)
     {
         u8 r6;
         u8 r5;
@@ -1711,10 +1711,10 @@ void OpponentHandlecmd22(void)
     }
     else
     {
-        r4 = ewram[0x160C8 + GetBankIdentity(gActiveBank) / 2];
-        ewram[0x160C8 + GetBankIdentity(gActiveBank) / 2] = 6;
+        r4 = ewram160C8arr(GetBankIdentity(gActiveBank));
+        ewram160C8arr(GetBankIdentity(gActiveBank)) = 6;
     }
-    ewram[0x16068 + gActiveBank] = r4;
+    ewram16068arr(gActiveBank) = r4;
     Emitcmd34(1, r4, 0);
     OpponentBufferExecCompleted();
 }
diff --git a/src/battle/battle_controller_player.c b/src/battle/battle_controller_player.c
index f2fa16593..1aa73e90c 100644
--- a/src/battle/battle_controller_player.c
+++ b/src/battle/battle_controller_player.c
@@ -2645,9 +2645,9 @@ void PlayerHandlecmd22(void)
 
     gUnknown_0300434C[gActiveBank] = CreateTask(TaskDummy, 0xFF);
     gTasks[gUnknown_0300434C[gActiveBank]].data[0] = gBattleBufferA[gActiveBank][1] & 0xF;
-    ewram[0x16054] = gBattleBufferA[gActiveBank][1] >> 4;
-    ewram[0x1609D] = gBattleBufferA[gActiveBank][2];
-    ewram[0x160C0] = gBattleBufferA[gActiveBank][3];
+    ewram16054 = gBattleBufferA[gActiveBank][1] >> 4;
+    EWRAM_1609D = gBattleBufferA[gActiveBank][2];
+    ewram160C0 = gBattleBufferA[gActiveBank][3];
     for (i = 0; i < 3; i++)
         gUnknown_02038470[i] = gBattleBufferA[gActiveBank][4 + i];
     BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0);
diff --git a/src/battle/battle_controller_wally.c b/src/battle/battle_controller_wally.c
index be065e071..9392832d7 100644
--- a/src/battle/battle_controller_wally.c
+++ b/src/battle/battle_controller_wally.c
@@ -240,10 +240,10 @@ void unref_sub_8137220(void)
 void SetBankFuncToWallyBufferRunCommand(void)
 {
     gBattleBankFunc[gActiveBank] = WallyBufferRunCommand;
-    ewram[0x160A8] = 0;
-    ewram[0x160A9] = 0;
-    ewram[0x160AA] = 0;
-    ewram[0x160AB] = 0;
+    ewram160A8 = 0;
+    ewram160A9 = 0;
+    ewram160AA = 0;
+    ewram160AB = 0;
 }
 
 void WallyBufferRunCommand(void)
@@ -261,59 +261,59 @@ void sub_81372BC(void)
 {
     u8 r4;
 
-    switch (ewram[0x160A8])
+    switch (ewram160A8)
     {
     case 0:
-        ewram[0x160AA] = 64;
-        ewram[0x160A8]++;
+        ewram160AA = 64;
+        ewram160A8++;
         // fall through
     case 1:
-        r4 = --ewram[0x160AA];
+        r4 = --ewram160AA;
         if (r4 == 0)
         {
             PlaySE(SE_SELECT);
             Emitcmd33(1, 0, 0);
             WallyBufferExecCompleted();
-            ewram[0x160A8]++;
-            ewram[0x160A9] = r4;
-            ewram[0x160AA] = 64;
+            ewram160A8++;
+            ewram160A9 = r4;
+            ewram160AA = 64;
         }
         break;
     case 2:
-        r4 = --ewram[0x160AA];
+        r4 = --ewram160AA;
         if (r4 == 0)
         {
             PlaySE(SE_SELECT);
             Emitcmd33(1, 0, 0);
             WallyBufferExecCompleted();
-            ewram[0x160A8]++;
-            ewram[0x160A9] = r4;
-            ewram[0x160AA] = 64;
+            ewram160A8++;
+            ewram160A9 = r4;
+            ewram160AA = 64;
         }
         break;
     case 3:
-        r4 = --ewram[0x160AA];
+        r4 = --ewram160AA;
         if (r4 == 0)
         {
             Emitcmd33(1, 9, 0);
             WallyBufferExecCompleted();
-            ewram[0x160A8]++;
-            ewram[0x160A9] = r4;
-            ewram[0x160AA] = 64;
+            ewram160A8++;
+            ewram160A9 = r4;
+            ewram160AA = 64;
         }
         break;
     case 4:
-        if (--ewram[0x160AA] == 0)
+        if (--ewram160AA == 0)
         {
             PlaySE(SE_SELECT);
             nullsub_8(0);
             sub_802E3E4(1, 0);
-            ewram[0x160AA] = 64;
-            ewram[0x160A8]++;
+            ewram160AA = 64;
+            ewram160A8++;
         }
         break;
     case 5:
-        if (--ewram[0x160AA] == 0)
+        if (--ewram160AA == 0)
         {
             PlaySE(SE_SELECT);
             DestroyMenuCursor();
@@ -1291,16 +1291,16 @@ void WallyHandlecmd19(void)
 
 void WallyHandlecmd20(void)
 {
-    switch (ewram[0x160A9])
+    switch (ewram160A9)
     {
     case 0:
         sub_80304A8();
-        ewram[0x160A9]++;
-        ewram[0x160AB] = 80;
+        ewram160A9++;
+        ewram160AB = 80;
         // fall through
     case 1:
-        ewram[0x160AB]--;
-        if (ewram[0x160AB] == 0)
+        ewram160AB--;
+        if (ewram160AB == 0)
         {
             DestroyMenuCursor();
             PlaySE(SE_SELECT);
diff --git a/src/battle/battle_interface.c b/src/battle/battle_interface.c
index 831839d9b..09837bfee 100644
--- a/src/battle/battle_interface.c
+++ b/src/battle/battle_interface.c
@@ -995,8 +995,8 @@ void sub_8044338(u8 a, struct Pokemon *pkmn)
     }
     //_08044486
     r5 = gSprites[a].data5;
-    ConvertIntToDecimalStringN(str + 6, ewram[0x16089], 1, 2);
-    ConvertIntToDecimalStringN(str + 9, ewram[0x16088], 1, 2);
+    ConvertIntToDecimalStringN(str + 6, ewram16089, 1, 2);
+    ConvertIntToDecimalStringN(str + 9, ewram16088, 1, 2);
     str[5] = 0;
     str[8] = 0xBA;
     sub_80034D4((u8 *)0x02000000, str);
diff --git a/src/battle/battle_message.c b/src/battle/battle_message.c
index f98c065b0..4e8067a49 100644
--- a/src/battle/battle_message.c
+++ b/src/battle/battle_message.c
@@ -652,7 +652,7 @@ u32 StrCpyDecodeBattle(const u8* src, u8* dst)
                 if (gTrainerBattleOpponent == 0x400)
                 {
                     memset(text, 0xFF, 8);
-                    memcpy(text, &ewram[0x17002], 7);
+                    memcpy(text, ewram17002, 7);
                     toCpy = text;
                 }
                 else if (gBattleTypeFlags & BATTLE_TYPE_BATTLE_TOWER)
diff --git a/src/battle/battle_transition.c b/src/battle/battle_transition.c
index 5562da462..d0a9bfb92 100644
--- a/src/battle/battle_transition.c
+++ b/src/battle/battle_transition.c
@@ -1733,8 +1733,8 @@ static void Mugshots_CreateOpponentPlayerSprites(struct Task* task)
     task->tMugshotOpponentID = CreateTrainerSprite(sMugshotsTrainerPicIDsTable[mugshotID],
                                                      sMugshotsOpponentCoords[mugshotID][0] - 32,
                                                      sMugshotsOpponentCoords[mugshotID][1] + 42,
-                                                     0, &ewram[0xC03C]);
-    task->tMugshotPlayerID = CreateTrainerSprite(gSaveBlock2.playerGender, 272, 106, 0, &ewram[0xC03C]);
+                                                     0, ewramC03C);
+    task->tMugshotPlayerID = CreateTrainerSprite(gSaveBlock2.playerGender, 272, 106, 0, ewramC03C);
 
     opponentSprite = &gSprites[task->tMugshotOpponentID];
     playerSprite = &gSprites[task->tMugshotPlayerID];
diff --git a/src/debug/matsuda_debug_menu.c b/src/debug/matsuda_debug_menu.c
index 0a495c37a..765ec1f26 100644
--- a/src/debug/matsuda_debug_menu.c
+++ b/src/debug/matsuda_debug_menu.c
@@ -45,7 +45,7 @@ extern u8 gUnknown_083C9282[];
 extern const u8 gUnknown_083C928E[][2];
 extern u8 gUnknown_083C9296[];
 extern u8 gUnknown_083C92A8[];
-extern u8 unk_2000000[]; // TODO: use ewram
+extern u8 ewram[];
 extern u8 gMatsudaDebugMenu_GoBackText[];
 extern u8 gMatsudaDebugMenu_BattlePointsText[];
 extern u8 gMatsudaDebugMenu_StartText[];
@@ -414,14 +414,14 @@ void sub_80AA280(u8 var) // no?
     u8 i;
 
     FillWindowRect_DefaultPalette(&gMenuWindow, 0, 0, 0, 0x1E, 3);
-    StringCopy(unk_2000000, gMatsudaDebugMenu_StartText);
-    StringAppend(unk_2000000, &gUnknown_0203857D[var][0]);
+    StringCopy(ewram, gMatsudaDebugMenu_StartText);
+    StringAppend(ewram, &gUnknown_0203857D[var][0]);
 
     for (i = 0; i < 4; i++)
     {
         if (var == i)
         {
-            sub_8003460(&gMenuWindow, unk_2000000, (10 * i + 2), gUnknown_083C926E[i][0], gUnknown_083C926E[i][1]);
+            sub_8003460(&gMenuWindow, ewram, (10 * i + 2), gUnknown_083C926E[i][0], gUnknown_083C926E[i][1]);
         }
         else
         {
@@ -433,38 +433,38 @@ void sub_80AA280(u8 var) // no?
 
 static void sub_80AA340(u8 var)
 {
-    ConvertIntToDecimalStringN(unk_2000000, gContestMons[var].cool, STR_CONV_MODE_RIGHT_ALIGN, 3);
-    sub_8003460(&gMenuWindow, unk_2000000, 0x66, gUnknown_083C9282[0], gUnknown_083C9282[1]);
+    ConvertIntToDecimalStringN(ewram, gContestMons[var].cool, STR_CONV_MODE_RIGHT_ALIGN, 3);
+    sub_8003460(&gMenuWindow, ewram, 0x66, gUnknown_083C9282[0], gUnknown_083C9282[1]);
 }
 
 static void sub_80AA388(u8 var)
 {
-    ConvertIntToDecimalStringN(unk_2000000, gContestMons[var].cute, STR_CONV_MODE_RIGHT_ALIGN, 3);
-    sub_8003460(&gMenuWindow, unk_2000000, 0x6C, gUnknown_083C9282[2], gUnknown_083C9282[3]);
+    ConvertIntToDecimalStringN(ewram, gContestMons[var].cute, STR_CONV_MODE_RIGHT_ALIGN, 3);
+    sub_8003460(&gMenuWindow, ewram, 0x6C, gUnknown_083C9282[2], gUnknown_083C9282[3]);
 }
 
 static void sub_80AA3D0(u8 var)
 {
-    ConvertIntToDecimalStringN(unk_2000000, gContestMons[var].beauty, STR_CONV_MODE_RIGHT_ALIGN, 3);
-    sub_8003460(&gMenuWindow, unk_2000000, 0x72, gUnknown_083C9282[4], gUnknown_083C9282[5]);
+    ConvertIntToDecimalStringN(ewram, gContestMons[var].beauty, STR_CONV_MODE_RIGHT_ALIGN, 3);
+    sub_8003460(&gMenuWindow, ewram, 0x72, gUnknown_083C9282[4], gUnknown_083C9282[5]);
 }
 
 static void sub_80AA418(u8 var)
 {
-    ConvertIntToDecimalStringN(unk_2000000, gContestMons[var].smart, STR_CONV_MODE_RIGHT_ALIGN, 3);
-    sub_8003460(&gMenuWindow, unk_2000000, 0x78, gUnknown_083C9282[6], gUnknown_083C9282[7]);
+    ConvertIntToDecimalStringN(ewram, gContestMons[var].smart, STR_CONV_MODE_RIGHT_ALIGN, 3);
+    sub_8003460(&gMenuWindow, ewram, 0x78, gUnknown_083C9282[6], gUnknown_083C9282[7]);
 }
 
 static void sub_80AA460(u8 var)
 {
-    ConvertIntToDecimalStringN(unk_2000000, gContestMons[var].tough, STR_CONV_MODE_RIGHT_ALIGN, 3);
-    sub_8003460(&gMenuWindow, unk_2000000, 0x7E, gUnknown_083C9282[8], gUnknown_083C9282[9]);
+    ConvertIntToDecimalStringN(ewram, gContestMons[var].tough, STR_CONV_MODE_RIGHT_ALIGN, 3);
+    sub_8003460(&gMenuWindow, ewram, 0x7E, gUnknown_083C9282[8], gUnknown_083C9282[9]);
 }
 
 static void sub_80AA4A8(u8 var)
 {
-    ConvertIntToDecimalStringN(unk_2000000, gContestMons[var].sheen, STR_CONV_MODE_RIGHT_ALIGN, 3);
-    sub_8003460(&gMenuWindow, unk_2000000, 0x84, gUnknown_083C9282[10], gUnknown_083C9282[11]);
+    ConvertIntToDecimalStringN(ewram, gContestMons[var].sheen, STR_CONV_MODE_RIGHT_ALIGN, 3);
+    sub_8003460(&gMenuWindow, ewram, 0x84, gUnknown_083C9282[10], gUnknown_083C9282[11]);
 }
 
 static void sub_80AA4F0(u8 var1, u8 var2)
@@ -489,8 +489,8 @@ static void sub_80AA614(u8 var1, u8 var2)
 {
     u16 var = sub_80AE770(var1, var2);
 
-    ConvertIntToDecimalStringN(unk_2000000, var, STR_CONV_MODE_RIGHT_ALIGN, 3);
-    sub_8003460(&gMenuWindow, unk_2000000, 0xE2, 3, 0xC);
+    ConvertIntToDecimalStringN(ewram, var, STR_CONV_MODE_RIGHT_ALIGN, 3);
+    sub_8003460(&gMenuWindow, ewram, 0xE2, 3, 0xC);
 }
 
 void sub_80AA658(u8 var)
@@ -739,7 +739,7 @@ void sub_80AACC4(void)
     {
         SetDebugMonForContest();
         if (!(gIsLinkContest & 1))
-            sub_80AE82C(unk_2000000[0]);
+            sub_80AE82C(ewram[0]);
         SetMainCallback2(sub_80AB47C);
     }
 }
@@ -748,7 +748,7 @@ void sub_80AAD08(struct Sprite *sprite, s8 var2)
 {
     if (var2 == 1)
     {
-        unk_2000000[0] = sprite->data3;
+        ewram[0] = sprite->data3;
         SetMainCallback2(sub_80AACC4);
         BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0);
     }
diff --git a/src/engine/main_menu.c b/src/engine/main_menu.c
index e0af86f3d..3a343a0de 100644
--- a/src/engine/main_menu.c
+++ b/src/engine/main_menu.c
@@ -54,7 +54,7 @@ extern const u8 gUnknown_081E796C[];
 
 extern const union AffineAnimCmd *const gSpriteAffineAnimTable_81E79AC[];
 
-extern u8 unk_2000000[];
+extern u8 ewram[];
 
 //Menu layouts
 enum
@@ -1419,14 +1419,14 @@ void AddBirchSpeechObjects(u8 taskId)
     gTasks[taskId].tAzurillSpriteId = spriteId;
 
     //Create Brendan sprite
-    spriteId = CreateTrainerSprite(0, 120, 60, 0, unk_2000000);
+    spriteId = CreateTrainerSprite(0, 120, 60, 0, ewram);
     gSprites[spriteId].callback = nullsub_34;
     gSprites[spriteId].invisible = 1;
     gSprites[spriteId].oam.priority = 0;
     gTasks[taskId].tBrendanSpriteId = spriteId;
 
     //Create May sprite
-    spriteId = CreateTrainerSprite(1, 120, 60, 0, unk_2000000 + 0x800);
+    spriteId = CreateTrainerSprite(1, 120, 60, 0, ewram + 0x800);
     gSprites[spriteId].callback = nullsub_34;
     gSprites[spriteId].invisible = 1;
     gSprites[spriteId].oam.priority = 0;
diff --git a/src/engine/mystery_event_menu.c b/src/engine/mystery_event_menu.c
index 0e48dc177..d70414da4 100644
--- a/src/engine/mystery_event_menu.c
+++ b/src/engine/mystery_event_menu.c
@@ -14,7 +14,7 @@
 #include "task.h"
 #include "text.h"
 
-extern u8 unk_2000000[];
+extern u8 ewram[];
 
 static EWRAM_DATA u8 gUnknown_02039338 = 0;
 
@@ -287,8 +287,8 @@ static void CB2_MysteryEventMenu(void)
     case 11:
         if (gReceivedRemoteLinkPlayers)
             break;
-        unkVal = RunMysteryEventScript(unk_2000000);
-        CpuFill32(0, unk_2000000, 0x7D4);
+        unkVal = RunMysteryEventScript(ewram);
+        CpuFill32(0, ewram, 0x7D4);
         if (!GetEventLoadMessage(gStringVar4, unkVal))
             TrySavingData(NORMAL_SAVE);
         gMain.state++;
diff --git a/src/engine/save.c b/src/engine/save.c
index 5ea949cae..57678dd8f 100644
--- a/src/engine/save.c
+++ b/src/engine/save.c
@@ -11,7 +11,7 @@
 #define GETBLOCKOFFSET(n) (0xF80 * (n - 1))
 #define TOTALNUMSECTORS ((ARRAY_COUNT(gSaveSectionLocations) * 2) + (ARRAY_COUNT(gHallOfFameSaveSectionLocations) * 2)) // there are 2 slots, so double each array count and get the sum.
 
-extern struct SaveSection unk_2000000; // slow save RAM
+extern struct SaveSection ewram; // slow save RAM
 
 u16 gLastWrittenSector;
 u32 gLastSaveCounter;
@@ -95,7 +95,7 @@ u8 save_write_to_flash(u16 a1, const struct SaveSectionLocation *location)
     u32 retVal;
     u16 i;
 
-    gFastSaveSection = &unk_2000000;
+    gFastSaveSection = &ewram;
 
     if (a1 != 0xFFFF) // for link
     {
@@ -156,7 +156,7 @@ u8 HandleWriteSector(u16 a1, const struct SaveSectionLocation *location)
 u8 HandleWriteSectorNBytes(u8 sector, u8 *data, u16 size)
 {
     u16 i;
-    struct SaveSection *section = &unk_2000000;
+    struct SaveSection *section = &ewram;
 
     for (i = 0; i < sizeof(struct SaveSection); i++)
         ((char *)section)[i] = 0;
@@ -186,7 +186,7 @@ u8 TryWriteSector(u8 sector, u8 *data)
 
 u32 RestoreSaveBackupVarsAndIncrement(const struct SaveSectionLocation *location) // location is unused
 {
-    gFastSaveSection = &unk_2000000;
+    gFastSaveSection = &ewram;
     gLastKnownGoodSector = gLastWrittenSector;
     gLastSaveCounter = gSaveCounter;
     gLastWrittenSector++;
@@ -199,7 +199,7 @@ u32 RestoreSaveBackupVarsAndIncrement(const struct SaveSectionLocation *location
 
 u32 RestoreSaveBackupVars(const struct SaveSectionLocation *location) // only ever called once, and gSaveBlock2 is passed to this function. location is unused
 {
-    gFastSaveSection = &unk_2000000;
+    gFastSaveSection = &ewram;
     gLastKnownGoodSector = gLastWrittenSector;
     gLastSaveCounter = gSaveCounter;
     gUnknown_03005EB4 = 0;
@@ -369,7 +369,7 @@ u8 sub_81257F0(u16 a1, const struct SaveSectionLocation *location)
 u8 sub_812587C(u16 a1, const struct SaveSectionLocation *location)
 {
     u8 retVal;
-    gFastSaveSection = &unk_2000000;
+    gFastSaveSection = &ewram;
     if (a1 != 0xFFFF)
     {
         retVal = 0xFF;
@@ -537,7 +537,7 @@ u8 GetSaveValidStatus(const struct SaveSectionLocation *location)
 u8 sub_8125B88(u8 a1, u8 *data, u16 size)
 {
     u16 i;
-    struct SaveSection *section = &unk_2000000;
+    struct SaveSection *section = &ewram;
     DoReadFlashWholeSection(a1, section);
     if (section->security == UNKNOWN_CHECK_VALUE)
     {
@@ -764,7 +764,7 @@ u8 unref_sub_8125FA0(void)
 u8 unref_sub_8125FF0(u8 *data, u16 size)
 {
     u16 i;
-    struct UnkSaveSection *section = (struct UnkSaveSection *)&unk_2000000;
+    struct UnkSaveSection *section = (struct UnkSaveSection *)&ewram;
 
     for (i = 0; i < sizeof(struct SaveSection); i++)
         ((char *)section)[i] = 0;
diff --git a/src/engine/save_failed_screen.c b/src/engine/save_failed_screen.c
index 17bda237e..d194c1625 100644
--- a/src/engine/save_failed_screen.c
+++ b/src/engine/save_failed_screen.c
@@ -22,7 +22,7 @@
 
 #define CLOCK_WIN_TOP (MSG_WIN_TOP - 4)
 
-extern u8 unk_2000000[];
+extern u8 ewram[];
 
 static EWRAM_DATA u16 gSaveFailedType = 0;
 static EWRAM_DATA u16 gSaveFailedClockInfo[9] = {0};
@@ -267,7 +267,7 @@ static void VBlankCB_UpdateClockGraphics(void)
 
 static bool8 VerifySectorWipe(u16 sector)
 {
-    u32 *ptr = (u32 *)&unk_2000000;
+    u32 *ptr = (u32 *)&ewram;
     u16 i;
 
     ReadFlash(sector, 0, ptr, 4096);
diff --git a/src/field/berry_tag_screen.c b/src/field/berry_tag_screen.c
index 1413a02ca..8241fe657 100644
--- a/src/field/berry_tag_screen.c
+++ b/src/field/berry_tag_screen.c
@@ -28,7 +28,7 @@ struct Struct2000000
     /*0x1FFFF*/ u8 var_1FFFF;
 };
 
-extern struct Struct2000000 unk_2000000;
+extern struct Struct2000000 ewram;
 extern u16 gUnknown_030041B4;
 
 static EWRAM_DATA u8 gUnknown_0203932C = 0;
@@ -119,13 +119,13 @@ static bool8 sub_8146058(void)
     case 5:
         if (!MultistepInitMenuWindowContinue())
             break;
-        unk_2000000.var_1FFFF = 0;
+        ewram.var_1FFFF = 0;
         gMain.state += 1;
         break;
     case 6:
         if (!sub_81462B8())
             break;
-        unk_2000000.var_1FFFF = 0;
+        ewram.var_1FFFF = 0;
         gMain.state += 1;
         break;
     case 7:
@@ -191,19 +191,19 @@ bool8 sub_81462B8(void)
     u16 i;
     void *addr;
 
-    switch (unk_2000000.var_1FFFF)
+    switch (ewram.var_1FFFF)
     {
     case 0:
         LZDecompressVram(gBerryCheck_Gfx, (void *)VRAM);
-        unk_2000000.var_1FFFF += 1;
+        ewram.var_1FFFF += 1;
         break;
     case 1:
         LZDecompressVram(gUnknown_08E788E4, (void *)VRAM + 0x2800);
-        unk_2000000.var_1FFFF += 1;
+        ewram.var_1FFFF += 1;
         break;
     case 2:
         LZDecompressVram(gUnknown_08E78A84, (void *)VRAM + 0x3000);
-        unk_2000000.var_1FFFF += 1;
+        ewram.var_1FFFF += 1;
         break;
     case 3:
         for (i = 0; i < 0x400; i++)
@@ -215,19 +215,19 @@ bool8 sub_81462B8(void)
         }
         addr = (void *)(VRAM + 0x3800);
         DmaCopy16(3, gBGTilemapBuffers[2], addr, 0x800);
-        unk_2000000.var_1FFFF += 1;
+        ewram.var_1FFFF += 1;
         break;
     case 4:
         LoadCompressedPalette(gBerryCheck_Pal, 0, 96 * 2);
-        unk_2000000.var_1FFFF += 1;
+        ewram.var_1FFFF += 1;
         break;
     case 5:
         LoadCompressedObjectPic(&gUnknown_083C1F74);
-        unk_2000000.var_1FFFF += 1;
+        ewram.var_1FFFF += 1;
         break;
     case 6:
         LoadCompressedObjectPalette(&gUnknown_083C1F7C);
-        unk_2000000.var_1FFFF = 0;
+        ewram.var_1FFFF = 0;
         return TRUE;
     }
 
diff --git a/src/field/slot_machine.c b/src/field/slot_machine.c
index 153970337..4d97ccb51 100644
--- a/src/field/slot_machine.c
+++ b/src/field/slot_machine.c
@@ -15,7 +15,7 @@ struct UnkStruct1 {
     /*0x02*/ s16 unk02;
 };
 
-extern struct UnkStruct2000000 unk_2000000;
+extern struct UnkStruct2000000 ewram;
 
 extern struct UnkStruct1 *gUnknown_083ED048[];
 extern const u16 gPalette_83EDE24[];
@@ -40,7 +40,7 @@ void sub_8104CAC(u8 arg0) {
 
     sub_8104DA4();
 
-    task = &gTasks[unk_2000000.unk3D];
+    task = &gTasks[ewram.unk3D];
     task->data[1] = arg0;
 
     i = 0;
diff --git a/src/pokemon/pokemon_1.c b/src/pokemon/pokemon_1.c
index 0c0d14d7a..9a92f379d 100644
--- a/src/pokemon/pokemon_1.c
+++ b/src/pokemon/pokemon_1.c
@@ -16,7 +16,7 @@
 //Extracts the lower 16 bits of a 32-bit number
 #define LOHALF(n) ((n) & 0xFFFF)
 
-extern u8 unk_2000000[];
+extern u8 ewram[];
 extern u16 gMoveToLearn;
 
 static EWRAM_DATA u8 sLearningMoveTableID = 0;
@@ -436,9 +436,9 @@ void CalculateMonStats(struct Pokemon *mon)
         newMaxHP = (((n + hpEV / 4) * level) / 100) + level + 10;
     }
 
-    unk_2000000[0x160FA] = newMaxHP - oldMaxHP;
-    if (unk_2000000[0x160FA] == 0)
-        unk_2000000[0x160FA] = 1;
+    ewram[0x160FA] = newMaxHP - oldMaxHP;
+    if (ewram[0x160FA] == 0)
+        ewram[0x160FA] = 1;
 
     SetMonData(mon, MON_DATA_MAX_HP, &newMaxHP);
 
diff --git a/src/scene/contest_painting.c b/src/scene/contest_painting.c
index 3662efdec..928b59760 100644
--- a/src/scene/contest_painting.c
+++ b/src/scene/contest_painting.c
@@ -13,7 +13,7 @@
 #include "text.h"
 #include "unknown_task.h"
 
-extern u8 unk_2000000[];
+extern u8 ewram[];
 
 static u8 gUnknown_03000750;
 static u16 gUnknown_03000752;
@@ -184,15 +184,15 @@ static void ShowContestPainting(void)
     case 2:
         SeedRng(gMain.vblankCounter1);
         InitKeys();
-        ContestPaintingInitWindow(unk_2000000[0x15DDF]);
+        ContestPaintingInitWindow(ewram[0x15DDF]);
         gMain.state++;
         break;
     case 3:
-        sub_8107090(unk_2000000[0x15DDE], unk_2000000[0x15DDF]);
+        sub_8107090(ewram[0x15DDE], ewram[0x15DDF]);
         gMain.state++;
         break;
     case 4:
-        ContestPaintingPrintCaption(unk_2000000[0x15DDE], unk_2000000[0x15DDF]);
+        ContestPaintingPrintCaption(ewram[0x15DDE], ewram[0x15DDF]);
         LoadPalette(gUnknown_083F6140, 0, 1 * 2);
         DmaClear32(3, PLTT, 0x400);
         BeginFastPaletteFade(2);
diff --git a/src/scene/intro.c b/src/scene/intro.c
index a6dd23c92..af9b565a3 100644
--- a/src/scene/intro.c
+++ b/src/scene/intro.c
@@ -1207,7 +1207,7 @@ static void Task_IntroWaitToSetupPart3DoubleFight(u8 taskId)
         gTasks[taskId].func = Task_IntroLoadPart3Streaks;
 }
 
-extern u8 unk_2000000[][32];
+extern u8 ewram[][32];
 
 static void Task_IntroLoadPart3Streaks(u8 taskId)
 {
@@ -1217,12 +1217,12 @@ static void Task_IntroLoadPart3Streaks(u8 taskId)
     intro_reset_and_hide_bgs();
     for (i = 0; i < 32; i++)
     {
-        unk_2000000[0][i] = 0;
-        unk_2000000[1][i] = 17;
-        unk_2000000[2][i] = 34;
+        ewram[0][i] = 0;
+        ewram[1][i] = 17;
+        ewram[2][i] = 34;
     }
     vram = (void *)VRAM;
-    DmaCopy16(3, unk_2000000, vram, 0x60);
+    DmaCopy16(3, ewram, vram, 0x60);
     for (i = 0; i < 0x280; i++)
         ((u16 *)(VRAM + 0x3000))[i] = 0xF001;
     for (i = 0; i < 0x80; i++)