From 0e6fbbfe091a260f627427ce4f204c192c9dbcc3 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Sat, 27 Oct 2018 00:04:18 +0200
Subject: [PATCH] Make battle tower compile

---
 data/battle_scripts_1.s | 16 ++++++++--------
 src/battle_dome.c       | 10 ++--------
 2 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s
index d8f681686..edf49eda5 100644
--- a/data/battle_scripts_1.s
+++ b/data/battle_scripts_1.s
@@ -1601,12 +1601,12 @@ BattleScript_EffectPerishSong::
 	waitanimation
 	printstring STRINGID_FAINTINTHREE
 	waitmessage 0x40
-	setbyte sBANK, 0x0
+	setbyte sBATTLER, 0x0
 BattleScript_PerishSongLoop::
 	jumpifability BS_SCRIPTING, ABILITY_SOUNDPROOF, BattleScript_PerishSongNotAffected
 BattleScript_PerishSongLoopIncrement::
-	addbyte sBANK, 0x1
-	jumpifbytenotequal sBANK, gBattlersCount, BattleScript_PerishSongLoop
+	addbyte sBATTLER, 0x1
+	jumpifbytenotequal sBATTLER, gBattlersCount, BattleScript_PerishSongLoop
 	goto BattleScript_MoveEnd
 
 BattleScript_PerishSongNotAffected::
@@ -2493,7 +2493,7 @@ BattleScript_EffectYawn::
 	waitmessage 0x40
 	goto BattleScript_MoveEnd
 BattleScript_PrintBankAbilityMadeIneffective::
-	copybyte sBANK, sBANK_WITH_ABILITY
+	copybyte sBATTLER, sBATTLER_WITH_ABILITY
 BattleScript_PrintAbilityMadeIneffective::
 	pause 0x20
 	printstring STRINGID_PKMNSXMADEITINEFFECTIVE
@@ -3523,7 +3523,7 @@ BattleScript_RapidSpinAway::
 BattleScript_WrapFree::
 	printstring STRINGID_PKMNGOTFREE
 	waitmessage 0x40
-	copybyte gBattlerTarget, sBANK
+	copybyte gBattlerTarget, sBATTLER
 	return
 
 BattleScript_LeechSeedFree::
@@ -4030,11 +4030,11 @@ BattleScript_ShedSkinActivates::
 	end3
 
 BattleScript_WeatherFormChanges::
-	setbyte sBANK, 0x0
+	setbyte sBATTLER, 0x0
 BattleScript_WeatherFormChangesLoop::
 	trycastformdatachange
-	addbyte sBANK, 0x1
-	jumpifbytenotequal sBANK, gBattlersCount, BattleScript_WeatherFormChangesLoop
+	addbyte sBATTLER, 0x1
+	jumpifbytenotequal sBATTLER, gBattlersCount, BattleScript_WeatherFormChangesLoop
 	return
 
 BattleScript_CastformChange::
diff --git a/src/battle_dome.c b/src/battle_dome.c
index 8c2fa12fd..00bf9646b 100644
--- a/src/battle_dome.c
+++ b/src/battle_dome.c
@@ -57,18 +57,12 @@ struct UnkStruct_860DD10
 
 extern void sub_81B8558(void);
 extern u32 sub_81A39C4(void);
-extern u16 sub_8162548(u8, u8);
-extern u16 RandomizeFacilityTrainerMonId(u16);
-extern u8 SetFacilityPtrsGetLevel(void);
 extern u16 sub_81A5060(u8 monId, u8 moveSlotId);
 extern u8 sub_81A50F0(u8, u8);
 extern u8 sub_81A50B0(u8);
-extern void SetBattleFacilityTrainerGfxId(u16, u8);
 extern void sub_81A4C30(void);
 extern bool8 sub_81A3610(void);
 extern u16 sub_81A4FF0(u8);
-extern u8 GetFrontierTrainerFrontSpriteId(u16);
-extern u8 GetFrontierOpponentClass(u16);
 extern void ReducePlayerPartyToThree(void);
 
 extern u8 gUnknown_0203CEF8[];
@@ -5561,7 +5555,7 @@ static u16 GetWinningMove(s32 winnerTournamentId, s32 loserTournamentId, u8 roun
     u16 bestScore = 0;
     u16 bestId = 0;
     s32 movePower = 0;
-    SetFacilityPtrsGetLevel(); // Unused return variable.
+    SetFacilityPtrsGetLevel();
 
     // Calc move points of all 4 moves for all 3 pokemon hitting all 3 target mons.
     for (i = 0; i < 3; i++)
@@ -6425,7 +6419,7 @@ static void DecideRoundWinners(u8 roundId)
 static void CopyDomeTrainerName(u8 *dst, u16 trainerId)
 {
     s32 i = 0;
-    SetFacilityPtrsGetLevel(); // Unused return value.
+    SetFacilityPtrsGetLevel();
 
     if (trainerId == TRAINER_FRONTIER_BRAIN)
     {