giant battle handler is done wohohohhohoho

3 files changed, 24 insertions, 8 deletions

diff --git a/include/battle.h b/include/battle.h
index e5e5a94d1..50d2389ac 100644
--- a/include/battle.h
+++ b/include/battle.h
@@ -61,7 +61,8 @@
 #define STEVEN_PARTNER_ID           0xC03
 #define SECRET_BASE_OPPONENT        0x400
 
-#define BATTLE_TYPE_FRONTIER        (BATTLE_TYPE_BATTLE_TOWER | BATTLE_TYPE_DOME | BATTLE_TYPE_PALACE | BATTLE_TYPE_ARENA | BATTLE_TYPE_FACTORY | BATTLE_TYPE_x100000 | BATTLE_TYPE_PYRAMID)
+#define BATTLE_TYPE_FRONTIER                (BATTLE_TYPE_BATTLE_TOWER | BATTLE_TYPE_DOME | BATTLE_TYPE_PALACE | BATTLE_TYPE_ARENA | BATTLE_TYPE_FACTORY | BATTLE_TYPE_x100000 | BATTLE_TYPE_PYRAMID)
+#define BATTLE_TYPE_FRONTIER_NO_PYRAMID     (BATTLE_TYPE_BATTLE_TOWER | BATTLE_TYPE_DOME | BATTLE_TYPE_PALACE | BATTLE_TYPE_ARENA | BATTLE_TYPE_FACTORY | BATTLE_TYPE_x100000)
 
 #define BATTLE_WON                  0x1
 #define BATTLE_LOST                 0x2
@@ -136,6 +137,7 @@
 #define HITMARKER_PURSUIT_TRAP          0x00001000
 #define HITMARKER_IGNORE_SAFEGUARD      0x00002000
 #define HITMARKER_SYNCHRONISE_EFFECT    0x00004000
+#define HITMARKER_x8000                 0x00008000
 #define HITMARKER_IGNORE_ON_AIR         0x00010000
 #define HITMARKER_IGNORE_UNDERGROUND    0x00020000
 #define HITMARKER_IGNORE_UNDERWATER     0x00040000
@@ -614,10 +616,7 @@ struct BattleStruct
     u8 field_7E;
     u8 formToChangeInto;
     u8 chosenMovesIds[4];
-    u8 field_84;
-    u8 field_85;
-    u8 field_86;
-    u8 field_87;
+    u8 field_84[4];
     u8 field_88;
     u8 field_89;
     u8 field_8A;
@@ -906,7 +905,7 @@ void BattleTurnPassed(void);
 void BattleScriptPush(const u8* bsPtr);
 void BattleScriptPushCursor(void);
 void BattleScriptPop(void);
-u8 sub_803FB4C(void);  // msg, can't select a move
+u8 TrySetCantSelectMoveBattleScript(void);
 u8 CheckMoveLimitations(u8 bank, u8 unusableMoves, u8 check);
 bool8 AreAllMovesUnusable(void);
 u8 GetImprisonedMovesCount(u8 bank, u16 move);
diff --git a/include/battle_controllers.h b/include/battle_controllers.h
index 61e8bec29..9a7f947fa 100644
--- a/include/battle_controllers.h
+++ b/include/battle_controllers.h
@@ -14,6 +14,16 @@ struct MovePpInfo
     u8 ppBonuses;
 };
 
+struct ChooseMoveStruct
+{
+    u16 moves[4];
+    u8 ppNumbers[4];
+    u8 ppWithBonusNumbers[4];
+    u16 species;
+    u8 monType1;
+    u8 monType2;
+};
+
 #define REQUEST_ALL_BATTLE      0x0
 #define REQUEST_SPECIES_BATTLE  0x1
 #define REQUEST_HELDITEM_BATTLE 0x2
@@ -40,8 +50,8 @@ void EmitSpriteInvisibility(u8 bufferId, bool8 isInvisible);
 void EmitReturnPokeToBall(u8 bufferId, u8 arg1);
 void EmitGetMonData(u8 bufferId, u8 arg1, u8 arg2);
 void EmitSwitchInAnim(u8 bufferId, u8 partyId, bool8 dontClearSubstituteBit);
-void EmitChoosePokemon(u8 bufferId, u8 caseId, u8 arg2, u8 abilityId, const u8* arg4);
-void EmitLinkStandbyMsg(u8 bufferId, u8 arg1, u8 arg2);
+void EmitChoosePokemon(u8 bufferId, u8 caseId, u8 arg2, u8 abilityId, u8* arg4);
+void EmitLinkStandbyMsg(u8 bufferId, u8 arg1, bool32 arg2);
 void EmitTrainerSlide(u8 bufferId);
 void EmitTrainerSlideBack(u8 bufferId);
 void EmitFaintingCry(u8 bufferId);
@@ -56,6 +66,10 @@ void EmitIntroSlide(u8 bufferId, u8 terrainId);
 void EmitDrawTrainerPic(u8 bufferId);
 void EmitLoadMonSprite(u8 bufferId);
 void EmitIntroTrainerBallThrow(u8 bufferId);
+void EmitChooseAction(u8 bufferId, u8 arg1, u16 arg2);
+void EmitChooseMove(u8 bufferId, bool8 isDoubleBattle, bool8 NoPpNumber, struct ChooseMoveStruct* movePpData);
+void EmitOpenBag(u8 bufferId, u8* arg1);
+void Emit_x32(u8 bufferId);
 
 #define RESET_ACTION_MOVE_SELECTION     0
 #define RESET_ACTION_SELECTION          1
diff --git a/include/recorded_battle.h b/include/recorded_battle.h
index 2040f2b8a..2df1620e4 100644
--- a/include/recorded_battle.h
+++ b/include/recorded_battle.h
@@ -6,10 +6,13 @@ extern u32 gRecordedBattleRngSeed;
 void sub_8185F84(void);
 void sub_8184E58(void);
 void RecordedBattle_SetBankAction(u8 bank, u8 action);
+void RecordedBattle_ClearBankAction(u8 bank, u8 bytesToClear);
 void sub_8185F90(u16 arg0);
 bool8 sub_8186450(void);
 u8 sub_8185FAC(void);
 u8 sub_8185FB8(void);
 u8 MoveRecordedBattleToSaveData(void);
+void sub_818603C(u8);
+void sub_8185FD0(void);
 
 #endif // GUARD_RECORDED_BATTLE_H