Remove even more address comments

That should be all of them this time

3 files changed, 131 insertions, 140 deletions

diff --git a/engine/events/battle_tower/battle_tower.asm b/engine/events/battle_tower/battle_tower.asm
index e1aa177e9..59ec3a1a4 100644
--- a/engine/events/battle_tower/battle_tower.asm
+++ b/engine/events/battle_tower/battle_tower.asm
@@ -330,7 +330,7 @@ ReadBTTrainerParty:
 	jr .done_trainer_name
 
 .trainer_name_okay
-	ld hl, wBT_OTTempName ; 0xc608
+	ld hl, wBT_OTTempName
 
 .done_trainer_name
 	ld de, wOTPlayerName
@@ -1564,7 +1564,7 @@ BattleTowerAction_UbersCheck: ; BattleTowerAction $19
 	ld [wScriptVar], a
 	ret
 
-LoadOpponentTrainerAndPokemonWithOTSprite: ; 0x170b44
+LoadOpponentTrainerAndPokemonWithOTSprite:
 	farcall Function_LoadOpponentTrainerAndPokemons
 	ld a, [rSVBK]
 	push af
diff --git a/engine/events/battle_tower/rules.asm b/engine/events/battle_tower/rules.asm
index 49b7b1af0..6a2990118 100644
--- a/engine/events/battle_tower/rules.asm
+++ b/engine/events/battle_tower/rules.asm
@@ -20,11 +20,10 @@ CheckForMobileBattleRules:
 	dw JumpText_NeedAtLeastThreeMon
 	dw JumpText_EggDoesNotQualify
 
-.ExcuseMeText: ; 0x8b1fc
+.ExcuseMeText:
 	; Excuse me!
 	text_jump UnknownText_0x1c5937
 	db "@"
-; 0x8b201
 
 _CheckForBattleTowerRules:
 	ld hl, wStringBuffer2
@@ -56,58 +55,50 @@ _CheckForBattleTowerRules:
 	dw JumpText_TheMonMustNotHoldTheSameItems
 	dw JumpText_YouCantTakeAnEgg
 
-JumpText_ExcuseMeYoureNotReady: ; 0x8b22c
+JumpText_ExcuseMeYoureNotReady:
 	; Excuse me. You're not ready.
 	text_jump Text_ExcuseMeYoureNotReady
 	db "@"
-; 0x8b231
 
 BattleTower_PleaseReturnWhenReady:
 	ld hl, .PleaseReturnWhenReady
 	call PrintText
 	ret
 
-.PleaseReturnWhenReady: ; 0x8b238
+.PleaseReturnWhenReady:
 	; Please return when you're ready.
 	text_jump UnknownText_0x1c5962
 	db "@"
-; 0x8b23d
 
-JumpText_NeedAtLeastThreeMon: ; 0x8b23d
+JumpText_NeedAtLeastThreeMon:
 	; You need at least three #MON.
 	text_jump UnknownText_0x1c5983
 	db "@"
-; 0x8b242
 
-JumpText_EggDoesNotQualify: ; 0x8b242
+JumpText_EggDoesNotQualify:
 	; Sorry, an EGG doesn't qualify.
 	text_jump UnknownText_0x1c59a3
 	db "@"
-; 0x8b247
 
-JumpText_OnlyThreeMonMayBeEntered: ; 0x8b247
+JumpText_OnlyThreeMonMayBeEntered:
 	; Only three #MON may be entered.
 	text_jump Text_OnlyThreeMonMayBeEntered
 	db "@"
-; 0x8b24c
 
-JumpText_TheMonMustAllBeDifferentKinds: ; 0x8b24c
+JumpText_TheMonMustAllBeDifferentKinds:
 	; The @  #MON must all be different kinds.
 	text_jump Text_TheMonMustAllBeDifferentKinds
 	db "@"
-; 0x8b251
 
-JumpText_TheMonMustNotHoldTheSameItems: ; 0x8b251
+JumpText_TheMonMustNotHoldTheSameItems:
 	; The @  #MON must not hold the same items.
 	text_jump Text_TheMonMustNotHoldTheSameItems
 	db "@"
-; 0x8b256
 
-JumpText_YouCantTakeAnEgg: ; 0x8b256
+JumpText_YouCantTakeAnEgg:
 	; You can't take an EGG!
 	text_jump Text_YouCantTakeAnEgg
 	db "@"
-; 0x8b25b
 
 BattleTower_ExecuteJumptable:
 	ld bc, 0
diff --git a/engine/events/battle_tower/trainer_text.asm b/engine/events/battle_tower/trainer_text.asm
index 968bd4366..1172717d6 100644
--- a/engine/events/battle_tower/trainer_text.asm
+++ b/engine/events/battle_tower/trainer_text.asm
@@ -233,485 +233,485 @@ BTFemaleTrainerTexts:
 	dw BTWinF15
 
 
-BTGreetingM1: ; 0x11f42e
+BTGreetingM1:
 	text_jump BattleTowerText_0x1ec000
 	db "@"
 
-BTLossM1: ; 0x11f433
+BTLossM1:
 	text_jump BattleTowerText_0x1ec03b
 	db "@"
 
-BTWinM1: ; 0x11f438
+BTWinM1:
 	text_jump UnknownText_0x1ec060
 	db "@"
 
-BTGreetingM2: ; 0x11f43d
+BTGreetingM2:
 	text_jump BattleTowerText_0x1ec080
 	db "@"
 
-BTLossM2: ; 0x11f442
+BTLossM2:
 	text_jump UnknownText_0x1ec0a3
 	db "@"
 
-BTWinM2: ; 0x11f447
+BTWinM2:
 	text_jump UnknownText_0x1ec0c4
 	db "@"
 
-BTGreetingM3: ; 0x11f44c
+BTGreetingM3:
 	text_jump UnknownText_0x1ec0e1
 	db "@"
 
-BTLossM3: ; 0x11f451
+BTLossM3:
 	text_jump UnknownText_0x1ec108
 	db "@"
 
-BTWinM3: ; 0x11f456
+BTWinM3:
 	text_jump UnknownText_0x1ec12a
 	db "@"
 
-BTGreetingM4: ; 0x11f45b
+BTGreetingM4:
 	text_jump UnknownText_0x1ec14d
 	db "@"
 
-BTLossM4: ; 0x11f460
+BTLossM4:
 	text_jump UnknownText_0x1ec16f
 	db "@"
 
-BTWinM4: ; 0x11f465
+BTWinM4:
 	text_jump UnknownText_0x1ec190
 	db "@"
 
-BTGreetingM5: ; 0x11f46a
+BTGreetingM5:
 	text_jump UnknownText_0x1ec1ae
 	db "@"
 
-BTLossM5: ; 0x11f46f
+BTLossM5:
 	text_jump UnknownText_0x1ec1d0
 	db "@"
 
-BTWinM5: ; 0x11f474
+BTWinM5:
 	text_jump UnknownText_0x1ec1f4
 	db "@"
 
-BTGreetingM6: ; 0x11f479
+BTGreetingM6:
 	text_jump UnknownText_0x1ec216
 	db "@"
 
-BTLossM6: ; 0x11f47e
+BTLossM6:
 	text_jump UnknownText_0x1ec238
 	db "@"
 
-BTWinM6: ; 0x11f483
+BTWinM6:
 	text_jump UnknownText_0x1ec259
 	db "@"
 
-BTGreetingM7: ; 0x11f488
+BTGreetingM7:
 	text_jump UnknownText_0x1ec27b
 	db "@"
 
-BTLossM7: ; 0x11f48d
+BTLossM7:
 	text_jump UnknownText_0x1ec2a0
 	db "@"
 
-BTWinM7: ; 0x11f492
+BTWinM7:
 	text_jump UnknownText_0x1ec2c0
 	db "@"
 
-BTGreetingM8: ; 0x11f497
+BTGreetingM8:
 	text_jump UnknownText_0x1ec2d9
 	db "@"
 
-BTLossM8: ; 0x11f49c
+BTLossM8:
 	text_jump UnknownText_0x1ec2fe
 	db "@"
 
-BTWinM8: ; 0x11f4a1
+BTWinM8:
 	text_jump UnknownText_0x1ec320
 	db "@"
 
-BTGreetingM9: ; 0x11f4a6
+BTGreetingM9:
 	text_jump UnknownText_0x1ec33f
 	db "@"
 
-BTLossM9: ; 0x11f4ab
+BTLossM9:
 	text_jump UnknownText_0x1ec36c
 	db "@"
 
-BTWinM9: ; 0x11f4b0
+BTWinM9:
 	text_jump UnknownText_0x1ec389
 	db "@"
 
-BTGreetingM10: ; 0x11f4b5
+BTGreetingM10:
 	text_jump UnknownText_0x1ec3ad
 	db "@"
 
-BTLossM10: ; 0x11f4ba
+BTLossM10:
 	text_jump UnknownText_0x1ec3c5
 	db "@"
 
-BTWinM10: ; 0x11f4bf
+BTWinM10:
 	text_jump UnknownText_0x1ec3e5
 	db "@"
 
-BTGreetingM11: ; 0x11f4c4
+BTGreetingM11:
 	text_jump UnknownText_0x1ec402
 	db "@"
 
-BTLossM11: ; 0x11f4c9
+BTLossM11:
 	text_jump UnknownText_0x1ec411
 	db "@"
 
-BTWinM11: ; 0x11f4ce
+BTWinM11:
 	text_jump UnknownText_0x1ec41f
 	db "@"
 
-BTGreetingM12: ; 0x11f4d3
+BTGreetingM12:
 	text_jump UnknownText_0x1ec42e
 	db "@"
 
-BTLossM12: ; 0x11f4d8
+BTLossM12:
 	text_jump UnknownText_0x1ec461
 	db "@"
 
-BTWinM12: ; 0x11f4dd
+BTWinM12:
 	text_jump UnknownText_0x1ec4a0
 	db "@"
 
-BTGreetingM13: ; 0x11f4e2
+BTGreetingM13:
 	text_jump UnknownText_0x1ec4d6
 	db "@"
 
-BTLossM13: ; 0x11f4e7
+BTLossM13:
 	text_jump UnknownText_0x1ec4f5
 	db "@"
 
-BTWinM13: ; 0x11f4ec
+BTWinM13:
 	text_jump UnknownText_0x1ec512
 	db "@"
 
-BTGreetingM14: ; 0x11f4f1
+BTGreetingM14:
 	text_jump UnknownText_0x1ec532
 	db "@"
 
-BTLossM14: ; 0x11f4f6
+BTLossM14:
 	text_jump UnknownText_0x1ec54b
 	db "@"
 
-BTWinM14: ; 0x11f4fb
+BTWinM14:
 	text_jump UnknownText_0x1ec565
 	db "@"
 
-BTGreetingM15: ; 0x11f500
+BTGreetingM15:
 	text_jump UnknownText_0x1ec580
 	db "@"
 
-BTLossM15: ; 0x11f505
+BTLossM15:
 	text_jump UnknownText_0x1ec59d
 	db "@"
 
-BTWinM15: ; 0x11f50a
+BTWinM15:
 	text_jump UnknownText_0x1ec5b5
 	db "@"
 
-BTGreetingM16: ; 0x11f50f
+BTGreetingM16:
 	text_jump UnknownText_0x1ec5d3
 	db "@"
 
-BTLossM16: ; 0x11f514
+BTLossM16:
 	text_jump UnknownText_0x1ec5ee
 	db "@"
 
-BTWinM16: ; 0x11f519
+BTWinM16:
 	text_jump UnknownText_0x1ec60d
 	db "@"
 
-BTGreetingM17: ; 0x11f51e
+BTGreetingM17:
 	text_jump UnknownText_0x1ec631
 	db "@"
 
-BTLossM17: ; 0x11f523
+BTLossM17:
 	text_jump UnknownText_0x1ec651
 	db "@"
 
-BTWinM17: ; 0x11f528
+BTWinM17:
 	text_jump UnknownText_0x1ec68f
 	db "@"
 
-BTGreetingM18: ; 0x11f52d
+BTGreetingM18:
 	text_jump UnknownText_0x1ec6b1
 	db "@"
 
-BTLossM18: ; 0x11f532
+BTLossM18:
 	text_jump UnknownText_0x1ec6d0
 	db "@"
 
-BTWinM18: ; 0x11f537
+BTWinM18:
 	text_jump UnknownText_0x1ec708
 	db "@"
 
-BTGreetingM19: ; 0x11f53c
+BTGreetingM19:
 	text_jump UnknownText_0x1ec720
 	db "@"
 
-BTLossM19: ; 0x11f541
+BTLossM19:
 	text_jump UnknownText_0x1ec73e
 	db "@"
 
-BTWinM19: ; 0x11f546
+BTWinM19:
 	text_jump UnknownText_0x1ec75b
 	db "@"
 
-BTGreetingM20: ; 0x11f54b
+BTGreetingM20:
 	text_jump UnknownText_0x1ec77f
 	db "@"
 
-BTLossM20: ; 0x11f550
+BTLossM20:
 	text_jump UnknownText_0x1ec798
 	db "@"
 
-BTWinM20: ; 0x11f555
+BTWinM20:
 	text_jump UnknownText_0x1ec7bb
 	db "@"
 
-BTGreetingM21: ; 0x11f55a
+BTGreetingM21:
 	text_jump UnknownText_0x1ec7d8
 	db "@"
 
-BTLossM21: ; 0x11f55f
+BTLossM21:
 	text_jump UnknownText_0x1ec818
 	db "@"
 
-BTWinM21: ; 0x11f564
+BTWinM21:
 	text_jump UnknownText_0x1ec837
 	db "@"
 
-BTGreetingM22: ; 0x11f569
+BTGreetingM22:
 	text_jump UnknownText_0x1ec858
 	db "@"
 
-BTLossM22: ; 0x11f56e
+BTLossM22:
 	text_jump UnknownText_0x1ec876
 	db "@"
 
-BTWinM22: ; 0x11f573
+BTWinM22:
 	text_jump UnknownText_0x1ec898
 	db "@"
 
-BTGreetingM23: ; 0x11f578
+BTGreetingM23:
 	text_jump UnknownText_0x1ec8b1
 	db "@"
 
-BTLossM23: ; 0x11f57d
+BTLossM23:
 	text_jump UnknownText_0x1ec8d5
 	db "@"
 
-BTWinM23: ; 0x11f582
+BTWinM23:
 	text_jump UnknownText_0x1ec8f0
 	db "@"
 
-BTGreetingM24: ; 0x11f587
+BTGreetingM24:
 	text_jump UnknownText_0x1ec911
 	db "@"
 
-BTLossM24: ; 0x11f58c
+BTLossM24:
 	text_jump UnknownText_0x1ec928
 	db "@"
 
-BTWinM24: ; 0x11f591
+BTWinM24:
 	text_jump UnknownText_0x1ec949
 	db "@"
 
-BTGreetingM25: ; 0x11f596
+BTGreetingM25:
 	text_jump UnknownText_0x1ec969
 	db "@"
 
-BTLossM25: ; 0x11f59b
+BTLossM25:
 	text_jump UnknownText_0x1ec986
 	db "@"
 
-BTWinM25: ; 0x11f5a0
+BTWinM25:
 	text_jump UnknownText_0x1ec99b
 	db "@"
 
 
 
 
-BTGreetingF1: ; 0x11f5a5
+BTGreetingF1:
 	text_jump UnknownText_0x1ec9bd
 	db "@"
 
-BTLossF1: ; 0x11f5aa
+BTLossF1:
 	text_jump UnknownText_0x1ec9d9
 	db "@"
 
-BTWinF1: ; 0x11f5af
+BTWinF1:
 	text_jump UnknownText_0x1ec9f7
 	db "@"
 
-BTGreetingF2: ; 0x11f5b4
+BTGreetingF2:
 	text_jump UnknownText_0x1eca0a
 	db "@"
 
-BTLossF2: ; 0x11f5b9
+BTLossF2:
 	text_jump UnknownText_0x1eca2a
 	db "@"
 
-BTWinF2: ; 0x11f5be
+BTWinF2:
 	text_jump UnknownText_0x1eca47
 	db "@"
 
-BTGreetingF3: ; 0x11f5c3
+BTGreetingF3:
 	text_jump UnknownText_0x1eca64
 	db "@"
 
-BTLossF3: ; 0x11f5c8
+BTLossF3:
 	text_jump UnknownText_0x1eca82
 	db "@"
 
-BTWinF3: ; 0x11f5cd
+BTWinF3:
 	text_jump UnknownText_0x1eca9d
 	db "@"
 
-BTGreetingF4: ; 0x11f5d2
+BTGreetingF4:
 	text_jump UnknownText_0x1ecabf
 	db "@"
 
-BTLossF4: ; 0x11f5d7
+BTLossF4:
 	text_jump UnknownText_0x1ecade
 	db "@"
 
-BTWinF4: ; 0x11f5dc
+BTWinF4:
 	text_jump UnknownText_0x1ecafa
 	db "@"
 
-BTGreetingF5: ; 0x11f5e1
+BTGreetingF5:
 	text_jump UnknownText_0x1ecb19
 	db "@"
 
-BTLossF5: ; 0x11f5e6
+BTLossF5:
 	text_jump UnknownText_0x1ecb37
 	db "@"
 
-BTWinF5: ; 0x11f5eb
+BTWinF5:
 	text_jump UnknownText_0x1ecb55
 	db "@"
 
-BTGreetingF6: ; 0x11f5f0
+BTGreetingF6:
 	text_jump UnknownText_0x1ecb70
 	db "@"
 
-BTLossF6: ; 0x11f5f5
+BTLossF6:
 	text_jump UnknownText_0x1ecb92
 	db "@"
 
-BTWinF6: ; 0x11f5fa
+BTWinF6:
 	text_jump UnknownText_0x1ecbb6
 	db "@"
 
-BTGreetingF7: ; 0x11f5ff
+BTGreetingF7:
 	text_jump UnknownText_0x1ecbd9
 	db "@"
 
-BTLossF7: ; 0x11f604
+BTLossF7:
 	text_jump UnknownText_0x1ecbf3
 	db "@"
 
-BTWinF7: ; 0x11f609
+BTWinF7:
 	text_jump UnknownText_0x1ecc15
 	db "@"
 
-BTGreetingF8: ; 0x11f60e
+BTGreetingF8:
 	text_jump UnknownText_0x1ecc39
 	db "@"
 
-BTLossF8: ; 0x11f613
+BTLossF8:
 	text_jump UnknownText_0x1ecc55
 	db "@"
 
-BTWinF8: ; 0x11f618
+BTWinF8:
 	text_jump UnknownText_0x1ecc75
 	db "@"
 
-BTGreetingF9: ; 0x11f61d
+BTGreetingF9:
 	text_jump UnknownText_0x1ecc92
 	db "@"
 
-BTLossF9: ; 0x11f622
+BTLossF9:
 	text_jump UnknownText_0x1ecca7
 	db "@"
 
-BTWinF9: ; 0x11f627
+BTWinF9:
 	text_jump UnknownText_0x1eccc1
 	db "@"
 
-BTGreetingF10: ; 0x11f62c
+BTGreetingF10:
 	text_jump UnknownText_0x1eccd7
 	db "@"
 
-BTLossF10: ; 0x11f631
+BTLossF10:
 	text_jump UnknownText_0x1eccef
 	db "@"
 
-BTWinF10: ; 0x11f636
+BTWinF10:
 	text_jump UnknownText_0x1ecd0e
 	db "@"
 
-BTGreetingF11: ; 0x11f63b
+BTGreetingF11:
 	text_jump UnknownText_0x1ecd2b
 	db "@"
 
-BTLossF11: ; 0x11f640
+BTLossF11:
 	text_jump UnknownText_0x1ecd4d
 	db "@"
 
-BTWinF11: ; 0x11f645
+BTWinF11:
 	text_jump UnknownText_0x1ecd6b
 	db "@"
 
-BTGreetingF12: ; 0x11f64a
+BTGreetingF12:
 	text_jump UnknownText_0x1ecd8d
 	db "@"
 
-BTLossF12: ; 0x11f64f
+BTLossF12:
 	text_jump UnknownText_0x1ecdaf
 	db "@"
 
-BTWinF12: ; 0x11f654
+BTWinF12:
 	text_jump UnknownText_0x1ecdcf
 	db "@"
 
-BTGreetingF13: ; 0x11f659
+BTGreetingF13:
 	text_jump UnknownText_0x1ecded
 	db "@"
 
-BTLossF13: ; 0x11f65e
+BTLossF13:
 	text_jump UnknownText_0x1ece0d
 	db "@"
 
-BTWinF13: ; 0x11f663
+BTWinF13:
 	text_jump UnknownText_0x1ece2a
 	db "@"
 
-BTGreetingF14: ; 0x11f668
+BTGreetingF14:
 	text_jump UnknownText_0x1ece4b
 	db "@"
 
-BTLossF14: ; 0x11f66d
+BTLossF14:
 	text_jump UnknownText_0x1ece70
 	db "@"
 
-BTWinF14: ; 0x11f672
+BTWinF14:
 	text_jump UnknownText_0x1ece8a
 	db "@"
 
-BTGreetingF15: ; 0x11f677
+BTGreetingF15:
 	text_jump UnknownText_0x1ecea8
 	db "@"
 
-BTLossF15: ; 0x11f67c
+BTLossF15:
 	text_jump UnknownText_0x1ecec9
 	db "@"
 
-BTWinF15: ; 0x11f681
+BTWinF15:
 	text_jump UnknownText_0x1ecee8
 	db "@"