eliminate remaining RAM pointers in src/

1 files changed, 26 insertions, 0 deletions

diff --git a/include/ewram.h b/include/ewram.h
index 4f96688c9..ed7ceea16 100755
--- a/include/ewram.h
+++ b/include/ewram.h
@@ -20,8 +20,14 @@ extern u8 gSharedMem[];
 #define ewram0_6                        (u32)(&gSharedMem[0])
 #define ewram0_7                        (&gSharedMem[0])
 #define eSaveSection                    (struct SaveSection *)(gSharedMem + 0x0)
+#define ewram0arr                       ((u8 (*)[32])gSharedMem)
+#define eVoidSharedArr                  (void *)(ewram_addr + 0x0)
+#define eVoidSharedArr2                 (u32)(ewram_addr) // ew(ram)
+#define ewram0_8                        ((struct UnkStruct2000000 *)(gSharedMem + 0x0))
+#define ewram0_9(i)                     (u8 *)(ewram_addr + (i * 0x20))
 #define ewram4                          (*(struct UnknownStruct8 *)(gSharedMem + 0x4))
 #define ewram520                        ((struct UnknownStruct7 *)(gSharedMem + 0x00520))
+#define ewram520_2                      (u8 *)(ewram_addr + 0x520)
 #define eMaySprite                      (gSharedMem + 0x800)
 #define ewram888                        (gSharedMem + 0x888)
 #define ewramBlankMapName               (gSharedMem + 0xA48)
@@ -39,6 +45,7 @@ extern u8 gSharedMem[];
 #define ARRAY_2007900                   ((struct EasyChatPair *)(gSharedMem + 0x7900))
 #define ewram_2008000                   (*(struct PlayerRecords *)(gSharedMem + 0x08000))
 #define ewram8000                       (&gSharedMem[0x8000])
+#define ePokedexPalAddr1                (void *)(gSharedMem + 0x8000)
 #define ewram8800                       (&gSharedMem[0x8800])
 #define ewram9000                       (&gSharedMem[0x9000])
 #define ewram9000_hack                  (void *)(ewram_addr + 0x9000) // TODO: Fix this.
@@ -49,6 +56,7 @@ extern u8 gSharedMem[];
 #define ewramB800                       (&gSharedMem[0xB800])
 #define TRANSITION_STRUCT               (*(struct TransitionData *)   (gSharedMem + 0xC000))
 #define ewramC000                       (&gSharedMem[0xC000])
+#define ePokedexPalAddr2                (void *)(gSharedMem + 0xC000)
 #define ewramC03C                       (&gSharedMem[0xC03C])
 #define ewramC800                       (&gSharedMem[0xC800])
 #define ewramD000                       (&gSharedMem[0xD000])
@@ -59,12 +67,18 @@ extern u8 gSharedMem[];
 #define ewramF800                       (&gSharedMem[0xF800])
 #define ewram_2010000                   (*(struct TradeEwramStruct *)(gSharedMem + 0x10000))
 #define ewram10000                      (&gSharedMem[0x10000])
+#define ewram10000_2                    (void *)(gSharedMem + 0x10000) // slot machine
+#define ePokedexPalAddr3                (void *)(gSharedMem + 0x10000)
 #define ewram10800                      (&gSharedMem[0x10800])
 #define ewram11000                      (&gSharedMem[0x11000])
 #define ewram11800                      (&gSharedMem[0x11800])
+#define ewram12000                      (&gSharedMem[0x12000])
+#define ewram12800                      (&gSharedMem[0x12800])
 #define ewram13000                      (&gSharedMem[0x13000])
+#define ewram13800                      (&gSharedMem[0x13800])
 #define EWRAM_14000                     ((u8 *)(gSharedMem + 0x14000))
 #define ewram14000                      (&gSharedMem[0x14000])
+#define ePokedexPalAddr4                (void *)(gSharedMem + 0x14000)
 #define ewram14000arr(i, data)          (gSharedMem[0x14000 + i + data])
 #define ewram14004arr(i, data)          (gSharedMem[0x14004 + i + data])
 #define ewram14008arr(i, data)          (gSharedMem[0x14008 + data + i])
@@ -80,6 +94,7 @@ extern u8 gSharedMem[];
 #define ewram15DE0                      ((*(struct ContestEntry*)(gSharedMem + 0x15DE0)))
 #define ewram15E00                      ((*(struct Unk2015E00*)(gSharedMem + 0x15E00)))
 #define ewram16000                      (gSharedMem[0x16000])
+#define ewram16000_2                    (&gSharedMem[0x16000])
 #define ewram16001                      (gSharedMem[0x16001])
 #define ewram16002                      (gSharedMem[0x16002])
 #define ewram16003                      (gSharedMem[0x16003])
@@ -162,6 +177,8 @@ extern u8 gSharedMem[];
 #define UNK_2016A00_STRUCT              ((struct UnkBattleStruct1 *) (gSharedMem + 0x16A00))
 #define AI_STACK                        ((struct AI_Stack *)         (gSharedMem + 0x16C00))
 #define AI_ARRAY_160CC(i)               (gSharedMem[0x160CC + i * 2])
+#define ewram16800                      (&gSharedMem[0x16800])
+#define ewram17000                      (&gSharedMem[0x17000])
 #define eLearnMoveStruct                (struct LearnMoveStruct *)(gSharedMem + 0x17000)
 #define eSecretBaseRecord               ((struct SecretBaseRecord *)(gSharedMem + 0x17000))
 #define ewram17002                      (&gSharedMem[0x17002])
@@ -173,6 +190,7 @@ extern u8 gSharedMem[];
 #define ewram17800                      ((struct Struct2017800 *)    (gSharedMem + 0x17800))
 #define EWRAM_17800                     ((struct UnknownStruct1 *)(gSharedMem + 0x17800))
 #define eTransformStatuses              ((struct TransformStatus *)(gSharedMem + 0x17800))
+#define ewram17800_2                    (&gSharedMem[0x17800])
 #define ewram17810                      ((struct Struct2017810 *)    (gSharedMem + 0x17810))
 #define EWRAM_17810                     ((struct UnknownStruct3 *)(gSharedMem + 0x17810))
 #define ewram17840                      (*(struct Struct2017840 *)   (gSharedMem + 0x17840))
@@ -184,17 +202,25 @@ extern u8 gSharedMem[];
 #define ewram18000_3                    *(struct Pokemon **)(gSharedMem + 0x18000)
 #define eBerryBlenderData               (struct BerryBlenderData*)(&gSharedMem[0x18000])
 #define eEggHatchData                   (struct EggHatchData*)(&gSharedMem[0x18000])
+#define ePokedexView1                   (struct PokedexView *)(gSharedMem + 0x18000)
 #define UNK_2018000_STRUCT              (*(struct UnknownStruct2018000 *)(gSharedMem + 0x18000))
 #define ewram18300                      ((u16 *)(gSharedMem + 0x18300))
 #define ewram18800                      (&gSharedMem[0x18800])
+#define ePokedexView2                   (struct PokedexView *)(gSharedMem + 0x18800)
 #define ewram19000                      (&gSharedMem[0x19000])
+#define ePokedexView3                   (struct PokedexView *)(gSharedMem + 0x19000)
 #define EWRAM_19348                     (*(u16 *)(gSharedMem + 0x19348))
 #define ewram19348                      (*(struct Struct2019348 *)(gSharedMem + 0x19348))
 #define ewram19800                      (&gSharedMem[0x19800])
+#define ePokedexView4                   (struct PokedexView *)(gSharedMem + 0x19800)
+#define ewram1A000                      (&gSharedMem[0x1A000])
+#define ewram1A800                      (&gSharedMem[0x1A800])
 #define ewram1B000                      (*(struct Unk201B000 *)(gSharedMem + 0x1B000))
 #define ewram1B000_alt                  (*(struct Struct201B000 *)(gSharedMem + 0x1B000))
 #define EWRAM_1B000                     ewram1B000_alt // FIXME
 #define EWRAM_1B000_2                   (*(struct Struct201B000 *)(gSharedMem + 0x1B000))
+#define ewram1B000_2                    (&gSharedMem[0x1B000])
+#define ewram1B800                      (&gSharedMem[0x1B800])
 #define EWRAM_1C000                     (*(struct Struct201C000 *)(gSharedMem + 0x1C000))
 #define ewram1C000                      (*(struct Unk201C000 *)(gSharedMem + 0x1C000))
 #define ewram1c000                      (*(struct Unk201C000 *)(gSharedMem + 0x1C000)) // FIXME, names too similar