Merge pull request #453 from huderlem/battle_tower

Decompile battle_tower

3 files changed, 16 insertions, 15 deletions

diff --git a/src/battle/battle_controller_opponent.c b/src/battle/battle_controller_opponent.c
index d03ef2967..6594e4183 100644
--- a/src/battle/battle_controller_opponent.c
+++ b/src/battle/battle_controller_opponent.c
@@ -4,6 +4,7 @@
 #include "data2.h"
 #include "battle_811DA74.h"
 #include "battle_anim_813F0F4.h"
+#include "battle_tower.h"
 #include "link.h"
 #include "m4a.h"
 #include "main.h"
@@ -76,7 +77,6 @@ extern u8 sub_8046400();
 extern void sub_8032A08();
 extern void sub_8043DB0();
 extern void sub_8033160(void);
-extern u8 sub_8135FBC(void);
 extern u8 get_trainer_class_pic_index(void);
 extern void sub_80313A0(struct Sprite *);
 extern void sub_8032B4C(void);
@@ -1222,7 +1222,7 @@ void OpponentHandleTrainerThrow(void)
     else if (gBattleTypeFlags & BATTLE_TYPE_BATTLE_TOWER)
         trainerPicIndex = get_trainer_class_pic_index();
     else if (gBattleTypeFlags & BATTLE_TYPE_EREADER_TRAINER)
-        trainerPicIndex = sub_8135FBC();
+        trainerPicIndex = GetEReaderTrainerPicIndex();
     else
         trainerPicIndex = gTrainers[gTrainerBattleOpponent].trainerPic;
 
@@ -1252,7 +1252,7 @@ void OpponentHandleTrainerSlide(void)
     else if (gBattleTypeFlags & BATTLE_TYPE_BATTLE_TOWER)
         trainerPicIndex = get_trainer_class_pic_index();
     else if (gBattleTypeFlags & BATTLE_TYPE_EREADER_TRAINER)
-        trainerPicIndex = sub_8135FBC();
+        trainerPicIndex = GetEReaderTrainerPicIndex();
     else
         trainerPicIndex = gTrainers[gTrainerBattleOpponent].trainerPic;
 
diff --git a/src/battle/battle_message.c b/src/battle/battle_message.c
index a3cc320ad..79855a614 100644
--- a/src/battle/battle_message.c
+++ b/src/battle/battle_message.c
@@ -1,6 +1,7 @@
 #include "global.h"
-#include "battle_message.h"
 #include "battle.h"
+#include "battle_message.h"
+#include "battle_tower.h"
 #include "item.h"
 #include "items.h"
 #include "pokemon.h"
@@ -127,7 +128,6 @@ u8 GetBankSide(u8 bank);
 s32 sub_803FC34(u16);
 void get_trainer_name(u8* dst);
 u8 get_trainer_class_name_index(void);
-u8 sub_8135FD8(void);
 u8 GetMultiplayerId(void);
 u8 GetBankByPlayerAI(u8 ID);
 u8 GetBankSide(u8 bank);
@@ -632,7 +632,7 @@ u32 StrCpyDecodeBattle(const u8* src, u8* dst)
                 else if (gBattleTypeFlags & BATTLE_TYPE_BATTLE_TOWER)
                     toCpy = gTrainerClassNames[get_trainer_class_name_index()];
                 else if (gBattleTypeFlags & BATTLE_TYPE_EREADER_TRAINER)
-                    toCpy = gTrainerClassNames[sub_8135FD8()];
+                    toCpy = gTrainerClassNames[GetEReaderTrainerClassNameIndex()];
                 else
                     toCpy = gTrainerClassNames[gTrainers[gTrainerBattleOpponent].trainerClass];
                 break;
@@ -661,7 +661,7 @@ u32 StrCpyDecodeBattle(const u8* src, u8* dst)
                 }
                 else if (gBattleTypeFlags & BATTLE_TYPE_EREADER_TRAINER)
                 {
-                    sub_8135FF4(text);
+                    SetEReaderTrainerName(text);
                     toCpy = text;
                 }
                 else
diff --git a/src/battle/battle_records.c b/src/battle/battle_records.c
index d848a10b8..fd1f528ac 100644
--- a/src/battle/battle_records.c
+++ b/src/battle/battle_records.c
@@ -260,9 +260,9 @@ void ShowLinkBattleRecords(void) {
 
 static bool32 sub_8110494(u8 level)
 {
-    struct SaveBlock2_Sub *sb2sub = &gSaveBlock2.filler_A8;
+    struct BattleTowerData *battleTower = &gSaveBlock2.battleTower;
 
-    switch (sb2sub->var_4AE[level])
+    switch (battleTower->var_4AE[level])
     {
     case 0:
         return FALSE;
@@ -294,17 +294,18 @@ static void PrintWinStreak(const u8 *str, u16 streak, u8 left, u8 top)
 
 static void PrintRecordWinStreak(u8 level, u8 left, u8 top)
 {
-    struct SaveBlock2_Sub *sb2sub = &gSaveBlock2.filler_A8;
-    u16 winStreak = sb2sub->recordWinStreak[level];
+    struct BattleTowerData *battleTower = &gSaveBlock2.battleTower;
+    u16 winStreak = battleTower->recordWinStreaks[level];
     PrintWinStreak(gOtherText_Record, winStreak, left, top);
 }
 
 static u16 GetLastWinStreak(u8 level)
 {
-    u16 result = gSaveBlock2.filler_A8.winStreak[level];
-    if (result > 9999)
-        result = 9999;
-    return result;
+    u16 winStreak = gSaveBlock2.battleTower.currentWinStreaks[level];
+    if (winStreak > 9999)
+        winStreak = 9999;
+
+    return winStreak;
 }
 
 static void PrintLastWinStreak(u8 level, u8 left, u8 top)