ScrCmd_cmdC7; merge pikalaxalt/trainer_tower into pikalaxalt/scrcmd

9 files changed, 30 insertions, 2 deletions

diff --git a/include/battle_2.h b/include/battle_2.h
index ca8b78805..1f7a2304d 100644
--- a/include/battle_2.h
+++ b/include/battle_2.h
@@ -43,6 +43,7 @@ u8 GetWhoStrikesFirst(u8 bank1, u8 bank2, bool8 ignoreChosenMoves);
 void RunBattleScriptCommands_PopCallbacksStack(void);
 void RunBattleScriptCommands(void);
 bool8 TryRunFromBattle(u8 bank);
+void sub_800FD9C(void);
 
 extern const u8 gStatusConditionString_PoisonJpn[8];
 extern const u8 gStatusConditionString_SleepJpn[8];
diff --git a/include/battle_setup.h b/include/battle_setup.h
index 2806295ca..86a84f471 100644
--- a/include/battle_setup.h
+++ b/include/battle_setup.h
@@ -17,5 +17,6 @@ void BattleSetup_StartTrainerBattle(void);
 u8 *BattleSetup_GetScriptAddrAfterBattle(void);
 u8 *BattleSetup_GetTrainerPostBattleScript(void);
 void sub_80803FC(void);
+u8 sub_8080060(void);
 
 #endif // GUARD_BATTLE_SETUP_H
diff --git a/include/battle_transition.h b/include/battle_transition.h
index eba76fd61..91e564790 100644
--- a/include/battle_transition.h
+++ b/include/battle_transition.h
@@ -3,6 +3,8 @@
 
 #include "global.h"
 
-void sub_8149DFC(u8 a1);
+void sub_8149DFC(u8 a0);
+bool8 sub_80D08F8(void);
+void sub_80D08B8(u8 a0);
 
 #endif // GUARD_BATTLE_TRANSITION_H
diff --git a/include/event_data.h b/include/event_data.h
index 13e388bf2..34d103967 100644
--- a/include/event_data.h
+++ b/include/event_data.h
@@ -59,4 +59,7 @@ extern u16 gSpecialVar_0x8014;
 extern u16 gSpecialVar_Result;
 extern u16 gSpecialVar_0x8004;
 
+extern u16 gUnknown_20370DA;
+extern u16 gUnknown_20370DC;
+
 #endif // GUARD_EVENT_DATA_H
diff --git a/include/global.h b/include/global.h
index 858d95831..f418ff757 100644
--- a/include/global.h
+++ b/include/global.h
@@ -709,6 +709,21 @@ struct MEventBuffers
     /*0x344 0x3464*/ u32 unk_344[2][5];
 }; // 0x36C 0x348C
 
+struct TrainerTowerLog
+{
+    u32 unk0;
+    u32 unk4;
+    u8 unk8;
+    u8 unk9;
+    u8 unkA_0:1;
+    u8 unkA_1:1;
+    u8 unkA_2:1;
+    u8 unkA_3:1;
+    u8 unkA_4:1;
+    u8 unkA_5:1;
+    u8 unkA_6:2;
+};
+
 struct SaveBlock1
 {
     /*0x0000*/ struct Coords16 pos;
@@ -766,7 +781,7 @@ struct SaveBlock1
     /*0x3A54*/ struct FameCheckerSaveData fameChecker[NUM_FAMECHECKER_PERSONS];
     /*0x3A94*/ u8 filler3A94[0x2A0];
     /*0x3D34*/ u32 unkArrayIdx;
-    /*0x3D38*/ u32 unkArray[4][3];
+    /*0x3D38*/ struct TrainerTowerLog unkArray[4];
 };
 
 extern struct SaveBlock1* gSaveBlock1Ptr;
diff --git a/include/item.h b/include/item.h
index 2d6bb9370..581693735 100644
--- a/include/item.h
+++ b/include/item.h
@@ -64,5 +64,6 @@ void sub_809A2DC(void);
 void sub_809A2A4(void);
 void sub_8099E90(u16, u8 *);
 void sub_809A824(u16 itemId);
+bool8 AddBagItem(u16 itemId, u16 amount);
 
 #endif // ITEM_H
diff --git a/include/main.h b/include/main.h
index 3fb254c95..6e9d2a25d 100644
--- a/include/main.h
+++ b/include/main.h
@@ -66,6 +66,7 @@ void DoSoftReset(void);
 void ClearPokemonCrySongs(void);
 void RestoreSerialTimer3IntrHandlers(void);
 void SetVBlankCounter1Ptr(u32 *ptr);
+void DisableVBlankCounter1(void);
 
 extern const char RomHeaderGameCode[4];
 extern const char RomHeaderSoftwareVersion;
diff --git a/include/overworld.h b/include/overworld.h
index 6aa58baa9..53914b627 100644
--- a/include/overworld.h
+++ b/include/overworld.h
@@ -88,6 +88,8 @@ void SetCurrentMapLayout(u16 mapDataId);
 void SetWarpDestinationToFixedHoleWarp(s16 x, s16 y);
 
 void ResetInitialPlayerAvatarState(void);
+void sub_8055D40(u16 mapDataId);
+void sub_80563F0(void);
 
 extern u8 gUnknown_2031DD8;
 extern u8 gUnknown_2036E28;
diff --git a/include/pokemon.h b/include/pokemon.h
index e8782af98..4c6240cd4 100644
--- a/include/pokemon.h
+++ b/include/pokemon.h
@@ -670,4 +670,6 @@ void DoMonFrontSpriteAnimation(struct Sprite* sprite, u16 species, bool8 noCry,
 void BattleAnimateFrontSprite(struct Sprite* sprite, u16 species, bool8 noCry, u8 arg3);
 void BattleAnimateBackSprite(struct Sprite* sprite, u16 species);
 
+void PlayMapChosenOrBattleBGM(u16 songId);
+
 #endif // GUARD_POKEMON_H