Merge remote-tracking branch 'upstream/master' into btl_attrs

1 files changed, 5 insertions, 3 deletions

diff --git a/include/battle.h b/include/battle.h
index 04d259fc9..11bb9e387 100644
--- a/include/battle.h
+++ b/include/battle.h
@@ -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);
@@ -764,6 +764,8 @@ void sub_8012324(void);
 void SwapTurnOrder(u8, u8);
 u8 GetWhoStrikesFirst(u8, u8, u8);
 
+void debug_sub_8010800(void);
+
 // asm/battle_3.o
 u8 CheckMoveLimitations(u8 bank, u8 unusableMoves, u8 check);
 u8 UpdateTurnCounters(void);