battle file more done and clean up tv

include/battle.h

@@ -368,6 +368,94 @@ struct BattleResults
     u8 catchAttempts[11];     // 0x36
 };
 
+struct BattleLinkStringSide
+{
+    u32 spikesMonId:3;
+    u32 reflectMonId:3;
+    u32 lightScreenMonId:3;
+    u32 safeguardMonId:3;
+    u32 mistMonId:3;
+    u32 futureSightMonId:3;
+    u32 doomDesireMonId:3;
+    u32 perishSongMonId:3;
+    u32 wishMonId:3;
+    u32 grudgeMonId:3;
+    u32 field_8_6:2;
+    u32 spikesMoveSlot:2;
+    u32 reflectMoveSlot:2;
+    u32 lightScreenMoveSlot:2;
+    u32 safeguardMoveSlot:2;
+    u32 mistMoveSlot:2;
+    u32 futureSightMoveSlot:2;
+    u32 doomDesireMoveSlot:2;
+    u32 perishSongMoveSlot:2;
+    u32 wishMoveSlot:2;
+    u32 grudgeMoveSlot:2;
+    u32 destinyBondMonId:3;
+    u32 destinyBondMoveSlot:2;
+    u32 field_3_0:4;
+    u32 field_3_1:3;
+    u32 explosion:1;
+    u32 explosionMoveSlot:2;
+    u32 explosionMonId:3;
+    u32 perishSong:1;
+    u32 field_4_2:1;
+    u32 field_5_0:3;
+    u32 field_5_1:2;
+};
+
+struct BattleLinkStringPosition
+{
+    u32 curseMonId:3;
+    u32 leechSeedMonId:3;
+    u32 nightmareMonId:3;
+    u32 wrapMonId:3;
+    u32 attractMonId:3;
+    u32 confusionMonId:3;
+    u32 curseMoveSlot:2;
+    u32 leechSeedMoveSlot:2;
+    u32 nightmareMoveSlot:2;
+    u32 wrapMoveSlot:2;
+    u32 attractMoveSlot:2;
+    u32 confusionMoveSlot:2;
+    u32 waterSportMoveSlot:2;
+    u32 waterSportMonId:3;
+    u32 mudSportMonId:3;
+    u32 mudSportMoveSlot:2;
+    u32 ingrainMonId:3;
+    u32 ingrainMoveSlot:2;
+    u32 field_5_5:3;
+    u32 field_6_0:2;
+};
+
+struct BattleLinkStringMon
+{
+    u32 psnMonId:3;
+    u32 badPsnMonId:3;
+    u32 brnMonId:3;
+    u32 prlzMonId:3;
+    u32 slpMonId:3;
+    u32 frzMonId:3;
+    u32 psnMoveSlot:2;
+    u32 badPsnMoveSlot:2;
+    u32 brnMoveSlot:2;
+    u32 prlzMoveSlot:2;
+    u32 slpMoveSlot:2;
+    u32 frzMoveSlot:2;
+};
+
+struct UnknownBattleLinkStruct
+{
+    struct BattleLinkStringMon mon[2][6]; // [side][partyId]
+    struct BattleLinkStringPosition pos[2][2]; // [side][flank]
+    struct BattleLinkStringSide side[2]; // [side]
+};
+
+struct UnknownBattleLinkArrayStruct
+{
+    s16 unk0[2][6*4];
+};
+
 struct BattleStruct
 {
     u8 turnEffectsTracker;
@@ -472,9 +560,9 @@ struct BattleStruct
     u8 wishPerishSongBattlerId;
     bool8 overworldWeatherDone;
     u8 atkCancellerTracker;
-    s16 field_1A4[2][PARTY_SIZE * 4];
-    u8 field_204[104];
-    u8 field_26C[40];
+    struct UnknownBattleLinkArrayStruct field_1A4;
+    struct UnknownBattleLinkStruct field_204;
+    u8 notSureWhatFieldLol[0x28];
     u8 AI_monToSwitchIntoId[MAX_BATTLERS_COUNT];
     u8 field_298[8];
     u8 field_2A0;
@@ -493,6 +581,7 @@ struct BattleStruct
 #define IS_MOVE_PHYSICAL(moveType)(moveType < TYPE_MYSTERY)
 #define IS_MOVE_SPECIAL(moveType)(moveType > TYPE_MYSTERY)
 
+
 #define GET_STAT_BUFF_ID(n)((n & 0xF))              // first four bits 0x1, 0x2, 0x4, 0x8
 #define GET_STAT_BUFF_VALUE(n)(((n >> 4) & 7))      // 0x10, 0x20, 0x40
 #define STAT_BUFF_NEGATIVE 0x80                     // 0x80, the sign bit

include/battle_script_commands.h

@@ -4,16 +4,16 @@
 #define WINDOW_CLEAR            0x1
 #define WINDOW_x80              0x80
 
-void AI_CalcDmg(u8 bankAtk, u8 bankDef);
-u8 TypeCalc(u16 move, u8 bankAtk, u8 bankDef);
+void AI_CalcDmg(u8 battlerIdAtk, u8 battlerIdDef);
+u8 TypeCalc(u16 move, u8 battlerIdAtk, u8 battlerIdDef);
 u8 AI_TypeCalc(u16 move, u16 targetSpecies, u8 targetAbility);
-u8 GetBattlerTurnOrderNum(u8 bank);
+u8 GetBattlerTurnOrderNum(u8 battlerId);
 void SetMoveEffect(bool8 primary, u8 certain);
 void BattleDestroyYesNoCursorAt(u8 cursorPosition);
 void BattleCreateYesNoCursorAt(u8 cursorPosition);
 void BufferMoveToLearnIntoBattleTextBuff2(void);
 void HandleBattleWindow(u8 xStart, u8 yStart, u8 xEnd, u8 yEnd, u8 flags);
-bool8 UproarWakeUpCheck(u8 bank);
+bool8 UproarWakeUpCheck(u8 battlerId);
 
 extern void (* const gBattleScriptingCommandsTable[])(void);
 extern const u8 gUnknown_0831C494[][4];

include/tv.h

@@ -3,19 +3,40 @@
 
 extern u8 *const gTVStringVarPtrs[3];
 
-void ClearTVShowData(void);
-void PutPokemonTodayCaughtOnAir(void);
+void sub_80EE184(void);
+void sub_80EE35C(u16 foeSpecies, u16 species, u8 moveIdx, const u16 *movePtr, u16 betterMove);
+void sub_80EE8C8(u16 winStreak, u8 facility);
+void DoTVShow(void);
+void DoTVShowInSearchOfTrainers(void);
+void sub_80EDCE8(void);
+void sub_80EE2CC(void);
+void sub_80EE72C(void);
+void sub_80EED10(void);
+void sub_80EED34(void);
+void sub_80EED60(u16 delta);
+void sub_80F01B8(void);
+void sub_80F01E8(void *src, u32 size, u8 masterIdx);
+void sub_80EE4DC(struct Pokemon *pokemon, u8 ribbonMonDataIdx);
 u32 GetPlayerIDAsU32(void);
 bool8 GetPriceReduction(u8 newsKind);
-u8 GetRibbonCount(struct Pokemon *pokemon);
-void TV_PutSecretBaseVisitOnTheAir(void);
-void sub_80EE184(void);
-void sub_80EEA70(void);
 void sub_80F14F8(TVShow *shows);
-size_t sub_80EF370(int value);
-bool8 Put3CheersForPokeblocksOnTheAir(const u8 *partnersName, u8 flavor, u8 unused, u8 sheen, u8 language);
-void SetPokemonAnglerSpecies(u16 species);
-void UpdateTVShowsPerDay(u16 days);
-void PutBattleUpdateOnTheAir(u8 a0, u16 a1, u16 a2, u16 a3);
+size_t CountDigits(int value);
+u8 GetRibbonCount(struct Pokemon *pokemon);
+void sub_80EDE70(u16 nCoinsSpent);
+void sub_80EDE84(u16 nCoinsSpent);
+void sub_80EDD78(u16 nCoinsPaidOut);
+void sub_80EEA70(void);
+void sub_80EDB44(void);
+void sub_80EDC60(const u16 *words);
+void sub_80EDA80(void);
+void sub_80F0C7C(void *src, u32 size, u8 masterIdx);
+void sub_80F0BB8(void);
+void sub_80ED950(bool8 flag);
+void sub_80EEC80(void);
+void sub_80EECA4(void);
+void sub_80EECC8(void);
+void sub_80EECEC(void);
+void sub_80F1208(TVShow *shows);
+void sub_80EE44C(u8 nMonsCaught, u8 nPkblkUsed);
 
 #endif //GUARD_TV_H