thru atk6B

8 files changed, 59 insertions, 4 deletions

diff --git a/include/battle.h b/include/battle.h
index 144d0a3bb..8abb95333 100644
--- a/include/battle.h
+++ b/include/battle.h
@@ -264,7 +264,7 @@ struct DisableStruct
     /*0x16*/ u8 isFirstTurn;
     /*0x17*/ u8 unk17;
     /*0x18*/ u8 truantCounter : 1;
-    /*0x18*/ u8 truantSwitchInHack : 1;
+    /*0x18*/ u8 truantSwitchInHack : 1; // unused? 
     /*0x18*/ u8 unk18_a_2 : 2;
     /*0x18*/ u8 mimickedMoves : 4;
     /*0x19*/ u8 rechargeTimer;
@@ -941,5 +941,6 @@ extern u16 gExpShareExp;
 extern u8 gLeveledUpInBattle;
 extern u16 gLastResultingMoves[MAX_BATTLERS_COUNT];
 extern u16 gLastPrintedMoves[MAX_BATTLERS_COUNT];
+extern u8 gActionsByTurnOrder[MAX_BATTLERS_COUNT];
 
 #endif // GUARD_BATTLE_H
diff --git a/include/battle_main.h b/include/battle_main.h
index 86de8f39a..27aae9970 100644
--- a/include/battle_main.h
+++ b/include/battle_main.h
@@ -75,7 +75,7 @@ void sub_803B3AC(void); // unused
 void sub_803B598(void); // unused
 void BattleTurnPassed(void);
 u8 IsRunningFromBattleImpossible(void);
-void sub_803BDA0(u8 bank);
+void sub_8013F6C(u8 battlerId);
 void SwapTurnOrder(u8 id1, u8 id2);
 u8 GetWhoStrikesFirst(u8 bank1, u8 bank2, bool8 ignoreChosenMoves);
 void RunBattleScriptCommands_PopCallbacksStack(void);
@@ -98,5 +98,6 @@ extern const u8 gStatusConditionString_LoveJpn[8];
 extern const u8 * const gStatusConditionStringsTable[7][2];
 
 extern const u8 gTypeEffectiveness[336];
+extern const struct TrainerMoney gTrainerMoneyTable[];
 
 #endif // GUARD_BATTLE_MAIN_H
diff --git a/include/battle_script_commands.h b/include/battle_script_commands.h
index c75a029c2..8e5274844 100644
--- a/include/battle_script_commands.h
+++ b/include/battle_script_commands.h
@@ -56,8 +56,8 @@ u8 TypeCalc(u16 move, u8 bankAtk, u8 bankDef);
 u8 AI_TypeCalc(u16 move, u16 targetSpecies, u8 targetAbility);
 u8 GetBattlerTurnOrderNum(u8 bank);
 void SetMoveEffect(bool8 primary, u8 certain);
-void BattleDestroyYesNoCursorAt(u8 cursorPosition);
-void BattleCreateYesNoCursorAt(u8 cursorPosition);
+void BattleDestroyYesNoCursorAt(void);
+void BattleCreateYesNoCursorAt(void);
 void BufferMoveToLearnIntoBattleTextBuff2(void);
 void HandleBattleWindow(u8 xStart, u8 yStart, u8 xEnd, u8 yEnd, u8 flags);
 bool8 UproarWakeUpCheck(u8 bank);
diff --git a/include/battle_scripts.h b/include/battle_scripts.h
index 165b580de..769c4a84a 100644
--- a/include/battle_scripts.h
+++ b/include/battle_scripts.h
@@ -224,5 +224,6 @@ extern const u8 BattleScript_IgnoresWhileAsleep[];
 extern const u8 BattleScript_IgnoresAndHitsItself[];
 extern const u8 BattleScript_MoveEffectRecoil[];
 extern const u8 BattleScript_FlushMessageBox[];
+extern const u8 BattleScript_SpikesOnFaintedBattler[];
 
 #endif // GUARD_BATTLE_SCRIPTS_H
diff --git a/include/constants/trainers.h b/include/constants/trainers.h
new file mode 100644
index 000000000..1aad499a1
--- /dev/null
+++ b/include/constants/trainers.h
@@ -0,0 +1,12 @@
+#ifndef GUARD_TRAINERS_H
+#define GUARD_TRAINERS_H
+
+#define F_TRAINER_FEMALE (1 << 7)
+
+// All trainer parties specify the IV, level, and species for each Pokémon in the
+// party. Some trainer parties also specify held items and custom moves for each
+// Pokémon.
+#define F_TRAINER_PARTY_CUSTOM_MOVESET (1 << 0)
+#define F_TRAINER_PARTY_HELD_ITEM      (1 << 1)
+
+#endif  // GUARD_TRAINERS_H
diff --git a/include/overworld.h b/include/overworld.h
index 7c1f34e41..ea877730e 100644
--- a/include/overworld.h
+++ b/include/overworld.h
@@ -96,6 +96,7 @@ void SetWarpDestinationToFixedHoleWarp(s16 x, s16 y);
 void ResetInitialPlayerAvatarState(void);
 void sub_8055D40(u16 mapDataId);
 void CleanupOverworldWindowsAndTilemaps(void);
+u32 sub_8054C04(void);
 
 extern u8 gUnknown_2031DD8;
 extern u8 gUnknown_2036E28;
diff --git a/include/pokemon_summary_screen.h b/include/pokemon_summary_screen.h
new file mode 100644
index 000000000..7b250b647
--- /dev/null
+++ b/include/pokemon_summary_screen.h
@@ -0,0 +1,36 @@
+#ifndef GUARD_POKEMON_SUMMARY_SCREEN_H
+#define GUARD_POKEMON_SUMMARY_SCREEN_H
+
+#include "main.h"
+
+extern u8 gLastViewedMonIndex;
+
+extern const u8 *const gMoveDescriptionPointers[];
+extern const u8 *const gNatureNamePointers[];
+
+void ShowPokemonSummaryScreen(u8 mode, void *mons, u8 monIndex, u8 maxMonIndex, void (*callback)(void));
+void ShowSelectMovePokemonSummaryScreen(struct Pokemon *, u8, u8, MainCallback, u16);
+void ShowPokemonSummaryScreenSet40EF(u8 mode, struct BoxPokemon *mons, u8 monIndex, u8 maxMonIndex, void (*callback)(void));
+u8 sub_8138B2C(void);
+void SummaryScreen_SetUnknownTaskId(u8 a0);
+void SummaryScreen_DestroyUnknownTask(void);
+
+// The Pokemon Summary Screen can operate in different modes. Certain features,
+// such as move re-ordering, are available in the different modes.
+enum PokemonSummaryScreenMode
+{
+    PSS_MODE_NORMAL,
+    PSS_MODE_UNK1,
+    PSS_MODE_BOX,
+    PSS_MODE_SELECT_MOVE,
+};
+
+enum PokemonSummaryScreenPage
+{
+    PSS_PAGE_INFO,
+    PSS_PAGE_SKILLS,
+    PSS_PAGE_BATTLE_MOVES,
+    PSS_PAGE_CONTEST_MOVES,
+};
+
+#endif // GUARD_POKEMON_SUMMARY_SCREEN_H
diff --git a/include/strings.h b/include/strings.h
index 2b914dfc8..2da65d3e0 100644
--- a/include/strings.h
+++ b/include/strings.h
@@ -223,4 +223,7 @@ extern const u8 gText_LinkStandby[];
 extern const u8 gUnknown_83FE725[];
 extern const u8 gText_WhatWillPkmnDo[];
 
+// battle_script_commands
+extern const u8 gText_BattleYesNoChoice[];
+
 #endif //GUARD_STRINGS_H