1 files changed, 17 insertions, 22 deletions

diff --git a/include/battle.h b/include/battle.h
index 7c1528072..9545bacff 100644
--- a/include/battle.h
+++ b/include/battle.h
@@ -79,7 +79,7 @@
 #define B_ACTION_SAFARI_POKEBLOCK          6
 #define B_ACTION_SAFARI_GO_NEAR            7
 #define B_ACTION_SAFARI_RUN                8
-#define B_ACTION_9                         9
+#define B_ACTION_OLDMAN_THROW              9
 #define B_ACTION_EXEC_SCRIPT               10
 #define B_ACTION_TRY_FINISH                11
 #define B_ACTION_FINISHED                  12
@@ -101,17 +101,6 @@
 #define MAX_TRAINER_ITEMS 4
 #define MAX_MON_MOVES 4
 
-#define BATTLE_TERRAIN_GRASS        0
-#define BATTLE_TERRAIN_LONG_GRASS   1
-#define BATTLE_TERRAIN_SAND         2
-#define BATTLE_TERRAIN_UNDERWATER   3
-#define BATTLE_TERRAIN_WATER        4
-#define BATTLE_TERRAIN_POND         5
-#define BATTLE_TERRAIN_ROCK         6
-#define BATTLE_TERRAIN_CAVE         7
-#define BATTLE_TERRAIN_INSIDE       8
-#define BATTLE_TERRAIN_PLAIN        9
-
 // array entries for battle communication
 #define MULTIUSE_STATE          0x0
 #define CURSOR_POSITION         0x1
@@ -521,22 +510,20 @@ struct BattleStruct
     u8 expGetterBattlerId;
     u8 field_90;
     u8 field_91;
-    u8 AI_monToSwitchIntoId[MAX_BATTLERS_COUNT];
+    u8 AI_monToSwitchIntoId[2];
+    u8 field_94;
+    u8 field_95;
     u8 field_96;
     u8 field_97;
     u8 lastTakenMove[MAX_BATTLERS_COUNT * 2 * 2]; // ask gamefreak why they declared it that way
     u16 hpOnSwitchout[2];
     u8 abilityPreventingSwitchout;
     u8 hpScale;
-    u8 field_AE;
-    u8 field_AF;
-    u8 field_B0;
-    u8 field_B1;
-    u8 field_B2;
-    u8 field_B3;
+    u16 savedBattleTypeFlags; // ???
+    void (*savedCallback)(void);
     u8 synchronizeMoveEffect;
-    u8 field_B5;
-    u8 field_B6;
+    u8 multiplayerId;
+    u8 overworldWeatherDone;
     u8 atkCancellerTracker;
     u16 usedHeldItems[MAX_BATTLERS_COUNT];
     u8 chosenItem[4]; // why is this an u8?
@@ -556,7 +543,12 @@ struct BattleStruct
     u8 wishPerishSongBattlerId;
     u8 field_182;
     u8 field_183;
-    u8 field_184[124]; // currently unknown
+    u8 field_184;
+    u8 field_185;
+    u8 field_186;
+    u8 field_187;
+    struct BattleEnigmaBerry battleEnigmaBerry;
+    u8 field_1A4[0x5C]; // currently unknown
 }; // size == 0x200 bytes
 
 extern struct BattleStruct *gBattleStruct;
@@ -929,5 +921,8 @@ extern u16 gLastPrintedMoves[MAX_BATTLERS_COUNT];
 extern u8 gActionsByTurnOrder[MAX_BATTLERS_COUNT];
 extern u8 gChosenActionByBattler[MAX_BATTLERS_COUNT];
 extern u8 gBattleTerrain;
+extern struct UnknownPokemonStruct4 gUnknown_2022B58[3];
+extern u16 *gUnknown_2022BC0;
+extern u16 gRandomTurnNumber;
 
 #endif // GUARD_BATTLE_H