5 files changed, 8 insertions, 8 deletions
diff --git a/include/battle.h b/include/battle.h
index c4a0fe9a5..9e67e8ec5 100644
--- a/include/battle.h
+++ b/include/battle.h
@@ -479,10 +479,10 @@ struct BattleStruct
     u16 changedItems[MAX_BATTLERS_COUNT];
     u8 intimidateBattler;
     u8 switchInItemsCounter;
-    u8 field_DA;
+    u8 arenaTurnCounter;
     u8 turnSideTracker;
     u8 fillerDC[0xDF-0xDC];
-    u8 field_DF;
+    u8 givenExpMons; // Bits for enemy party's pokemon that gave exp to player's party.
     u8 lastTakenMoveFrom[MAX_BATTLERS_COUNT * MAX_BATTLERS_COUNT * 2]; // a 3-D array [target][attacker][byte]
     u16 castformPalette[MAX_BATTLERS_COUNT][16];
     u8 field_180;
diff --git a/include/battle_setup.h b/include/battle_setup.h
index 98c366acd..3b327e3f7 100644
--- a/include/battle_setup.h
+++ b/include/battle_setup.h
@@ -38,7 +38,7 @@ void ConfigureAndSetUpOneTrainerBattle(u8 trainerEventObjId, const u8 *trainerSc
 void ConfigureTwoTrainersBattle(u8 trainerEventObjId, const u8 *trainerScript);
 void SetUpTwoTrainersBattle(void);
 bool32 GetTrainerFlagFromScriptPointer(const u8 *data);
-void sub_80B16D8(void);
+void SetUpTrainerMovement(void);
 u8 GetTrainerBattleMode(void);
 bool8 GetTrainerFlag(void);
 bool8 HasTrainerBeenFought(u16 trainerId);
diff --git a/include/constants/battle_setup.h b/include/constants/battle_setup.h
index 329bfa650..d98e1762f 100644
--- a/include/constants/battle_setup.h
+++ b/include/constants/battle_setup.h
@@ -10,7 +10,7 @@
 #define TRAINER_BATTLE_CONTINUE_SCRIPT_DOUBLE           6
 #define TRAINER_BATTLE_REMATCH_DOUBLE                   7
 #define TRAINER_BATTLE_CONTINUE_SCRIPT_DOUBLE_NO_MUSIC  8
-#define TRAINER_BATTLE_9                                9
+#define TRAINER_BATTLE_PYRAMID                          9
 #define TRAINER_BATTLE_SET_TRAINER_A                    10
 #define TRAINER_BATTLE_SET_TRAINER_B                    11
 #define TRAINER_BATTLE_12                               12
diff --git a/include/event_scripts.h b/include/event_scripts.h
index 058cec39b..7f69ef3ae 100644
--- a/include/event_scripts.h
+++ b/include/event_scripts.h
@@ -10,11 +10,11 @@ extern const u8 EventScript_275D0C[];
 extern const u8 EventScript_275D1F[];
 extern const u8 EventScript_275D2E[];
 extern const u8 EventScript_271354[];
-extern const u8 EventScript_2713C2[];
+extern const u8 EventScript_DoTainerBattle[];
 extern const u8 EventScript_TryDoDoubleTrainerBattle[];
-extern const u8 EventScript_271362[];
+extern const u8 EventScript_TryDoNormalTrainerBattle[];
 extern const u8 EventScript_TryDoDoubleRematchBattle[];
-extern const u8 EventScript_2713D1[];
+extern const u8 EventScript_TryDoRematchBattle[];
 extern const u8 EventScript_SecretPower1[];
 extern const u8 EventScript_SecretPower2[];
 
diff --git a/include/trainer_see.h b/include/trainer_see.h
index 43f8b82d2..a9b92d71b 100644
--- a/include/trainer_see.h
+++ b/include/trainer_see.h
@@ -19,7 +19,7 @@ extern u8 gApproachingTrainerId;
 bool8 CheckForTrainersWantingBattle(void);
 void sub_80B4578(struct EventObject *var);
 void EndTrainerApproach(void);
-void sub_80B45D0(void);
+void TryPrepareSecondApproachingTrainer(void);
 u8 FldEff_ExclamationMarkIcon(void);
 u8 FldEff_QuestionMarkIcon(void);
 u8 FldEff_HeartIcon(void);