summaryrefslogtreecommitdiff
path: root/engine/events/battle_tower
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2020-10-26 15:45:57 -0400
committerRangi <remy.oukaour+rangi42@gmail.com>2020-10-26 20:29:58 -0400
commit9dcdad5e60fbc10ba81ae127743c78a6b00d3dd5 (patch)
tree1bbe56fe1c3b0ad4c95d191f0137007becef7169 /engine/events/battle_tower
parenta2b6befd7d12b2ad8bb97979a10519500dcdd870 (diff)
Comment, remove, or revise many unreferenced labels
Diffstat (limited to 'engine/events/battle_tower')
-rw-r--r--engine/events/battle_tower/battle_tower.asm6
-rw-r--r--engine/events/battle_tower/load_trainer.asm2
2 files changed, 4 insertions, 4 deletions
diff --git a/engine/events/battle_tower/battle_tower.asm b/engine/events/battle_tower/battle_tower.asm
index f335a83c9..0e59b4737 100644
--- a/engine/events/battle_tower/battle_tower.asm
+++ b/engine/events/battle_tower/battle_tower.asm
@@ -67,7 +67,7 @@ Function170114:
call Function170c8b
ret
-Function170139:
+Function170139: ; unreferenced
; Convert the 4-digit decimal number at s5_aa41 into binary
ld a, BANK(s5_aa41)
call OpenSRAM
@@ -374,7 +374,7 @@ ReadBTTrainerParty:
ld [bc], a
ret
-ValidateBTParty:
+ValidateBTParty: ; unreferenced
; Check for and fix errors in party data
ld hl, wBT_OTTempMon1Species
ld d, BATTLETOWER_PARTY_LENGTH
@@ -386,7 +386,7 @@ ValidateBTParty:
ld a, [hl]
and a
x = $ff
-rept ($ff - NUM_POKEMON)
+rept $ff - NUM_POKEMON
jr z, .invalid
cp x
x = x - 1
diff --git a/engine/events/battle_tower/load_trainer.asm b/engine/events/battle_tower/load_trainer.asm
index 8ed401afe..165efb8dd 100644
--- a/engine/events/battle_tower/load_trainer.asm
+++ b/engine/events/battle_tower/load_trainer.asm
@@ -95,7 +95,7 @@ Function_LoadRandomBattleTowerMon:
ld c, BATTLETOWER_PARTY_LENGTH
.loop
push bc
- ld a, BANK(sBTMonPrevTrainer1)
+ ld a, BANK(sBTMonOfTrainers)
call OpenSRAM
.FindARandomBattleTowerMon: