Merge branch 'master' into nakamura

1 files changed, 5 insertions, 4 deletions

diff --git a/include/battle.h b/include/battle.h
index 544e65b80..11bb9e387 100644
--- a/include/battle.h
+++ b/include/battle.h
@@ -53,7 +53,7 @@ struct Trainer
     /*0x18*/ bool8 doubleBattle;
     /*0x1C*/ u32 aiFlags;
     /*0x20*/ u8 partySize;
-    /*0x24*/ void *party;
+    /*0x24*/ const void *party;
 };
 
 struct UnkBattleStruct1 // AI_Opponent_Info?
@@ -710,11 +710,11 @@ extern u8 gBattleTextBuff1[];
 
 // asm/battle_1.o
 void sub_800D6D4();
-void sub_800D74C();
+void ApplyPlayerChosenFrameToBattleMenu();
 void DrawMainBattleBackground(void);
-void sub_800DAB8();
+void LoadBattleTextboxAndBackground();
 void sub_800DE30(u8);
-void sub_800E23C();
+void LoadBattleEntryBackground();
 
 // src/battle_2.o
 void sub_800E7C4(void);
@@ -726,6 +726,7 @@ void BattleMainCB2(void);
 void sub_800F838(struct Sprite *);
 u8 CreateNPCTrainerParty(struct Pokemon *, u16);
 void sub_800FCFC(void);
+void nullsub_36(struct Sprite *);
 void c2_8011A1C(void);
 void sub_80101B8(void);
 void c2_081284E0(void);