Replace simple ewram access with battle struct, 2

1 files changed, 10 insertions, 52 deletions

diff --git a/include/ewram.h b/include/ewram.h
index 3feed99ae..0efac7bda 100644
--- a/include/ewram.h
+++ b/include/ewram.h
@@ -91,68 +91,35 @@ extern u8 gSharedMem[];
 #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])
 #define ewram16004arr(i, battler)       (gSharedMem[0x16004 + i + battler * 2])
-#define ewram1600C                      (gSharedMem[0x1600C])
-#define ewram1600E                      (gSharedMem[0x1600E])
 #define ewram16010arr(battler)          (gSharedMem[0x16010 + battler])
-#define ewram1601B                      (gSharedMem[0x1601B])
 #define eDynamicMoveType                (gSharedMem[0x1601C])
 #define eFocusPunchBattler              (gSharedMem[0x1601D])
 #define eDmgMultiplier                  (gSharedMem[0x1601F])
 #define ewram16020                      ((u8 *)(gSharedMem + 0x16020))
 #define ewram16020arr(i)                (gSharedMem[0x16020 + i])
-#define ewram16054                      (gSharedMem[0x16054])
-#define ewram16056                      (gSharedMem[0x16056])
 #define ewram16058                      (gSharedMem[0x16058])
-#define ewram16059                      (gSharedMem[0x16059])
 #define ewram16060(battler)             (gSharedMem[0x16060 + battler])
 #define BATTLE_PARTY_ID(battler)        (gSharedMem[0x16064 + battler])
-#define ewram16064                      (&gSharedMem[0x16064])
 #define ewram16064arr(battler)          (gSharedMem[0x16064 + battler])
 #define ewram16068arr(i)                (gSharedMem[0x16068 + i])
 #define UNK_201606C_ARRAY               (gSharedMem + 0x1606C) // lazy define but whatever.
 #define ewram1606Carr(i, a)             (gSharedMem[0x1606C + i + a * 3])
-#define ewram16078                      (gSharedMem[0x16078])
-#define ewram16084                      (gSharedMem[0x16084])
-#define ewram16086                      (gSharedMem[0x16086])
-#define ewram16087                      (gSharedMem[0x16087])
 #define ewram16088                      (gSharedMem[0x16088])
-#define ewram16088_2                    (*(u8 *)(gSharedMem + 0x16088))
 #define ewram16089                      (gSharedMem[0x16089])
-#define ewram16089_2                    (*(u8 *)(gSharedMem + 0x16089))
-
-// src/battle/anim/battle_intro.c
-#define ewram1608A                      gSharedMem[0x1608A]
-#define ewram1608B                      gSharedMem[0x1608B]
 
 #define ewram1608Carr(battler)          (gSharedMem[0x1608C + battler])
 #define ewram16094arr(battler)          (gSharedMem[0x16094 + battler])
 #define EWRAM_1609D                     (gSharedMem[0x1609D])
-#define ewram1609e(flank)               (gSharedMem[0x1609E + (flank)])
-#define ewram160A1                      (gSharedMem[0x160A1])
-#define ewram160A4                      (gSharedMem[0x160A4])
-#define ewram160A5                      (gSharedMem[0x160A5])
-#define ewram160A6                      (gSharedMem[0x160A6])
 #define ewram160A8                      (gSharedMem[0x160A8])
 #define ewram160A9                      (gSharedMem[0x160A9])
 #define ewram160AA                      (gSharedMem[0x160AA])
 #define ewram160AB                      (gSharedMem[0x160AB])
-#define ewram160AC                      ((u8 *)(gSharedMem + 0x160AC))
-#define ewram160ACarr(i)                (gSharedMem[0x160AC + i])
-#define ewram160ACarr2(i, battler)      (gSharedMem[0x160AC + i + battler * 2])
-#define ewram160BC                      ((u16 *)(gSharedMem + 0x160BC))  // hp
-#define ewram160BCarr(battler)          (gSharedMem[0x160BC + battler * 2])
-#define ewram160C0                      (gSharedMem[0x160C0])
-#define ewram160C2_Flags                ((u16 *)(gSharedMem + 0x160C2))
-#define ewram160C4_Callback             ((MainCallback *)(gSharedMem + 0x160C4))
-#define ewram160C8                      (gSharedMem[0x160C8])
+#define eLastTakenMove_flat(i)          (gSharedMem[0x160AC + i])
+#define eLastTakenMove_2d(i, battler)   (gSharedMem[0x160AC + i + battler * 2])
+#define eHpOnSwitchout(battler)         (gSharedMem[0x160BC + battler * 2])
 #define ewram160C8arr(battler)          (gSharedMem[0x160C8 + (battler / 2)])
-#define ewram160C9                      (gSharedMem[0x160C9])
-#define ewram160CB                      (gSharedMem[0x160CB])
-#define ewram160CC                      ((u8 *)(gSharedMem + 0x160CC))
 #define ewram160CCarr(i)                (gSharedMem[0x160CC + i])
 #define USED_HELD_ITEM(battler)         ((((u16*)(&gSharedMem[0x160CC + battler * 2]))))
 #define USED_HELD_ITEMS(battler)        (*(u16 *)&gSharedMem[0x160CC + 2 * (battler)])
@@ -161,8 +128,6 @@ extern u8 gSharedMem[];
 #define ewram160DA(battler)             (gSharedMem[0x160DA + (battler >> 1)])
 #define ewram160DD                      (gSharedMem[0x160DD])
 #define ewram160E0(i)                   (gSharedMem[0x160E0 + i])
-#define ewram160E6                      (gSharedMem[0x160E6])
-#define ewram160E7                      (gSharedMem[0x160E7])
 #define CHOICED_MOVE(battler)           (((u16*)(&gSharedMem[0x160E8 + battler * 2])))
 #define ewram160E8                      ((u8 *)(gSharedMem + 0x160E8))
 #define ewram160E8arr(i)                (gSharedMem[0x160E8 + i])
@@ -170,7 +135,6 @@ extern u8 gSharedMem[];
 #define ewram160F0                      ((u8 *)(gSharedMem + 0x160F0))
 #define ewram160F0arr(i)                (gSharedMem[0x160F0 + i])
 #define ewram160F8                      (gSharedMem[0x160F8])
-#define ewram160F9                      (gSharedMem[0x160F9])
 #define eStatHp                         (gSharedMem[0x160FA])
 #define ewram160FB                      (gSharedMem[0x160FB])
 #define ewram16100                      ((u8 *)(gSharedMem + 0x16100))
@@ -178,30 +142,24 @@ extern u8 gSharedMem[];
 #define ewram16100arr2(i, battler)      (gSharedMem[0x16100 + i + battler * 4])
 #define ewram16108                      ((u8 *)(gSharedMem + 0x16108))
 #define ewram16108arr(i)                (gSharedMem[0x16108 + i])
-#define ewram16110                      (gSharedMem[0x16110])
-#define ewram16111                      (gSharedMem[0x16111])
-#define eMultihitMoveEffect             (gSharedMem[0x16112])
-#define ewram16113                      (gSharedMem[0x16113])
 #define ewram16400                      (gSharedMem + 0x16400)
-#define AI_THINKING_STRUCT              ((struct AI_ThinkingStruct *)(gSharedMem + 0x16800))
-#define AI_BATTLE_HISTORY               ((struct BattleHistory *) (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 eMoveTutorMenu                  (struct MoveTutorMenu *)(gSharedMem + 0x17000)
 
 // gBattleResources
+#define AI_THINKING_STRUCT              ((struct AI_ThinkingStruct *)(gSharedMem + 0x16800))
+#define AI_BATTLE_HISTORY               ((struct BattleHistory *) (gSharedMem + 0x16A00))
+#define AI_STACK                        ((struct AI_Stack *)         (gSharedMem + 0x16C00))
 #define eSecretBaseRecord               ((struct SecretBaseRecord *)(gSharedMem + 0x17000))
 #define eBattleFlagsArr                 (*(struct ResourceFlags *)(gSharedMem + 0x17100))
 #define B_BATTLESCRIPTS_STACK           ((struct BattleScriptsStack *)     (gSharedMem + 0x17110))
 #define B_FUNCTION_STACK                ((struct BattleCallbacksStack *)        (gSharedMem + 0x17140))
+#define gBattleResources_statsBeforeLvlUp ((struct StatsArray *)(gSharedMem + 0x17180))
 
-
+#define ewram17000                      (&gSharedMem[0x17000])
+#define eMoveTutorMenu                  (struct MoveTutorMenu *)(gSharedMem + 0x17000)
 #define eCableCar1                      ((struct CableCarEwramStruct1 *)(gSharedMem + 0x17000))
-#define ewram17130                      (gSharedMem[0x17130])
-#define ewram17160                      (gSharedMem[0x17160])
-#define ewram17800                      ((struct Struct2017800 *)    (gSharedMem + 0x17800))
+#define gBattleSpriteInfo               ((struct BattleSpriteInfo *)    (gSharedMem + 0x17800))
 #define ewram17800_2                    (&gSharedMem[0x17800])
 #define EWRAM_17800                     ((struct UnknownStruct1 *)(gSharedMem + 0x17800))
 #define eTransformStatuses              ((struct TransformStatus *)(gSharedMem + 0x17800))