merge upstream

9 files changed, 36 insertions, 36 deletions

diff --git a/include/battle.h b/include/battle.h
index 255813ca3..395cf042a 100644
--- a/include/battle.h
+++ b/include/battle.h
@@ -203,7 +203,7 @@ struct Struct2017840
 };
 
 extern struct UnkBattleStruct1 unk_2016A00;
-extern struct UnkBattleStruct4 gUnknown_02024CA8[];
+extern struct UnkBattleStruct4 gDisableStructs[];
 extern struct AI_ThinkingStruct gAIThinkingSpace;
 
 // TODO: move ewram to global.h
@@ -263,30 +263,30 @@ void sub_8011834(void);
 void bc_801362C(void);
 void sub_8011970(void);
 void sub_80119B4(void);
-void sub_8011B00(void);
-void sub_8011E8C(void);
+void BattleBeginFirstTurn(void);
+void BattleTurnPassed(void);
 
 // asm/battle_2.o
 void sub_8012324(void);
 void sub_8012FBC(u8, u8);
 u8 b_first_side(u8, u8, u8);
-void sub_801365C(u8);
-void sub_801377C(void);
+void TurnValuesCleanUp(u8);
+void SpecialStatusesClear(void);
 void sub_80138F0(void);
-void dp01_battle_side_mark_buffer_for_execution();
+void MarkBufferBankForExecution();
 void sub_80155A4();
-void b_cancel_multi_turn_move_maybe(u8);
-void b_std_message();
+void CancelMultiTurnMoves(u8);
+void PrepareStringBattle();
 void sub_80156DC();
 void sub_80157C4(u8 index);
 
 // asm/battle_3.o
 u8 sub_8015A98(u8, u8, u8);
-u8 sub_8015DFC();
-u8 sub_8016558();
+u8 UpdateTurnCounters();
+u8 TurnBasedEffects();
 u8 sub_80170DC();
 u8 sub_80173A4();
-u8 sub_8018324(u8, u8, u8, u8, u16);
+u8 AbilityBattleEffects(u8, u8, u8, u8, u16);
 u8 sub_801A02C();
 
 // asm/battle_4.o
@@ -295,7 +295,7 @@ void move_effectiveness_something(u16, u8, u8);
 
 // asm/battle_5.o
 void nullsub_91(void);
-void sub_802BF74(void);
+void SetBankFuncToPlayerBufferRunCommand(void);
 void sub_802C098();
 void c3_0802FDF4(u8);
 void sub_802E3E4(u8, int);
@@ -312,9 +312,9 @@ void sub_8031F88(u8);
 void sub_80324F8(struct Pokemon *, u8);
 void sub_8032638();
 void sub_8032AA8(u8, u8);
-void sub_8032AE0(void);
+void SetBankFuncToOpponentBufferRunCommand(void);
 
 // asm/battle_9.o
-void sub_8037510(void);
+void SetBankFuncToLinkOpponentBufferRunCommand(void);
 
 #endif // GUARD_BATTLE_H
diff --git a/include/battle_811DA74.h b/include/battle_811DA74.h
index 8b7e2f090..750c3fe2b 100644
--- a/include/battle_811DA74.h
+++ b/include/battle_811DA74.h
@@ -1,10 +1,10 @@
 #ifndef GUARD_BATTLE_811DA74_H
 #define GUARD_BATTLE_811DA74_H
 
-void sub_811DA78(void);
-void sub_811DA94(void);
+void SetBankFuncToLinkPartnerBufferRunCommand(void);
+void LinkPartnerBufferRunCommand(void);
 void sub_811E0A0(void);
-void dp01_tbl3_exec_completed(void);
+void LinkPartnerBufferExecCompleted(void);
 u32 dp01_getattr_by_ch1_for_player_pokemon(u8 a, u8 *b);
 void sub_811EC68(u8);
 
diff --git a/include/battle_anim_81258BC.h b/include/battle_anim_81258BC.h
index 6bbf5dde2..45ef4b8cc 100644
--- a/include/battle_anim_81258BC.h
+++ b/include/battle_anim_81258BC.h
@@ -1,7 +1,7 @@
 #ifndef GUARD_BATTLE_ANIM_81258BC_H
 #define GUARD_BATTLE_ANIM_81258BC_H
 
-void sub_812B468(void);
+void SetBankFuncToSafariBufferRunCommand(void);
 void bx_battle_menu_t6_2(void);
 
 #endif // GUARD_BATTLE_ANIM_81258BC_H
diff --git a/include/battle_anim_8137220.h b/include/battle_anim_8137220.h
index c9708ac62..73bf0d883 100644
--- a/include/battle_anim_8137220.h
+++ b/include/battle_anim_8137220.h
@@ -1,6 +1,6 @@
 #ifndef GUARD_BATTLE_ANIM_8137220_H
 #define GUARD_BATTLE_ANIM_8137220_H
 
-void sub_8137224(void);
+void SetBankFuncToWallyBufferRunCommand(void);
 
 #endif // GUARD_BATTLE_ANIM_8137220_H
diff --git a/include/battle_message.h b/include/battle_message.h
index 04a7770a3..1ac20ce30 100644
--- a/include/battle_message.h
+++ b/include/battle_message.h
@@ -1,7 +1,7 @@
 #ifndef GUARD_BATTLE_MESSAGE_H
 #define GUARD_BATTLE_MESSAGE_H
 
-void get_battle_strings_(u8 *);
-void sub_8120FFC(const u8 *, u8 *);
+void StrCpyDecodeToDisplayedStringBattle(u8 *);
+void StrCpyDecodeBattle(const u8 *, u8 *);
 
 #endif // GUARD_BATTLE_MESSAGE_H
diff --git a/include/pokemon.h b/include/pokemon.h
index 273e7d26e..d67cd647a 100644
--- a/include/pokemon.h
+++ b/include/pokemon.h
@@ -440,7 +440,7 @@ u16 sub_803B7C8(struct Pokemon *mon, u8 a2);
 void DeleteFirstMoveAndGiveMoveToMon(struct Pokemon *mon, u16 move);
 void DeleteFirstMoveAndGiveMoveToBoxMon(struct BoxPokemon *boxMon, u16 move);
 
-u8 sub_803C348(u8 a1);
+u8 CountAliveMons(u8 a1);
 u8 sub_803C434(u8 a1);
 u8 GetMonGender(struct Pokemon *mon);
 u8 GetBoxMonGender(struct BoxPokemon *boxMon);
diff --git a/include/rom3.h b/include/rom3.h
index a66162443..8e99f8de4 100644
--- a/include/rom3.h
+++ b/include/rom3.h
@@ -12,13 +12,13 @@ void dp01_prepare_buffer_wireless_probably(u8 a, u16, u8 *c);
 void sub_800C1A8(u8);
 void sub_800C35C(void);
 void sub_800C47C(u8);
-void dp01_build_cmdbuf_x00_a_b_0(u8 a, u8 b, u8 c);
+void EmitGetAttributes(u8 a, u8 b, u8 c);
 void dp01_build_cmdbuf_x04_4_4_4(u8 a);
 void sub_800C704(u8, u8, u8);
 void dp01_build_cmdbuf_x07_7_7_7(u8 a);
 void dp01_build_cmdbuf_x12_a_bb(u8 a, u8 b, u16 c);
 void dp01_build_cmdbuf_x1D_1D_numargs_varargs(u8, u16, u8 *);
-void dp01_build_cmdbuf_x2E_a(u8 a, u8 b);
+void EmitBattleIntroSlide(u8 a, u8 b);
 void dp01_build_cmdbuf_x2F_2F_2F_2F(u8 a);
 void dp01_build_cmdbuf_x30_TODO(u8 a, u8 *b, u8 c);
 
diff --git a/include/rom_8077ABC.h b/include/rom_8077ABC.h
index 26c89d4cc..11e94e1f5 100644
--- a/include/rom_8077ABC.h
+++ b/include/rom_8077ABC.h
@@ -12,16 +12,16 @@ void sub_8078314(struct Sprite *sprite);
 void sub_8078364(struct Sprite *sprite);
 void sub_8078458(struct Sprite *sprite);
 void sub_80784A8(struct Sprite *sprite);
-u8 battle_side_get_owner(u8);
-u8 battle_side_get_owner(u8);
-u8 battle_side_get_owner(u8 side);
-u8 battle_side_get_owner(u8 slot);
-u8 battle_side_get_owner(u8);
-u8 battle_get_per_side_status(u8);
-u8 battle_get_per_side_status(u8 slot);
-u8 battle_get_side_with_given_state(u8);
-u8 battle_get_side_with_given_state(u8);
-u8 battle_get_side_with_given_state(u8 state);
+u8 GetBankSide(u8);
+u8 GetBankSide(u8);
+u8 GetBankSide(u8 side);
+u8 GetBankSide(u8 slot);
+u8 GetBankSide(u8);
+u8 GetBankIdentity(u8);
+u8 GetBankIdentity(u8 slot);
+u8 GetBankByPlayerAI(u8);
+u8 GetBankByPlayerAI(u8);
+u8 GetBankByPlayerAI(u8 state);
 u8 sub_8078874(u8);
 bool8 sub_8078874(u8);
 bool8 IsDoubleBattle();
@@ -50,7 +50,7 @@ void sub_8079BF4(s16 *bottom, s16 *top, void *ptr);
 void *sub_8079BFC(s16 bottom, s16 top);
 void sub_8079E24();
 u8 sub_8079E90(u8 slot);
-u8 battle_get_per_side_status_permutated(u8 slot);
+u8 GetBankIdentity_permutated(u8 slot);
 void sub_807A784(u8 taskId);
 void sub_807A850(struct Task *task, u8 taskId);
 void sub_807A8D4(struct Sprite *sprite);
diff --git a/include/trig.h b/include/trig.h
index 03d8c453e..a2f98a3e6 100644
--- a/include/trig.h
+++ b/include/trig.h
@@ -1,7 +1,7 @@
 #ifndef GUARD_TRIG_H
 #define GUARD_TRIG_H
 
-extern s16 gSineTable[];
+extern const s16 gSineTable[];
 
 s16 Sin(s16 index, s16 amplitude);
 s16 Cos(s16 index, s16 amplitude);