summaryrefslogtreecommitdiff
path: root/engine/events/battle_tower/rules.asm
diff options
context:
space:
mode:
Diffstat (limited to 'engine/events/battle_tower/rules.asm')
-rw-r--r--engine/events/battle_tower/rules.asm42
1 files changed, 21 insertions, 21 deletions
diff --git a/engine/events/battle_tower/rules.asm b/engine/events/battle_tower/rules.asm
index 3584117d3..3162ef38e 100644
--- a/engine/events/battle_tower/rules.asm
+++ b/engine/events/battle_tower/rules.asm
@@ -17,8 +17,8 @@ CheckForMobileBattleRules:
.TextPointers:
dw .ExcuseMeText
- dw JumpText_NeedAtLeastThreeMon
- dw JumpText_EggDoesNotQualify
+ dw NeedAtLeastThreeMonText
+ dw EggDoesNotQualifyText
.ExcuseMeText:
; Excuse me!
@@ -50,10 +50,10 @@ _CheckForBattleTowerRules:
.TextPointers:
dw JumpText_ExcuseMeYoureNotReady
- dw JumpText_OnlyThreeMonMayBeEntered
- dw JumpText_TheMonMustAllBeDifferentKinds
- dw JumpText_TheMonMustNotHoldTheSameItems
- dw JumpText_YouCantTakeAnEgg
+ dw OnlyThreeMonMayBeEnteredText
+ dw TheMonMustAllBeDifferentKindsText
+ dw TheMonMustNotHoldTheSameItemsText
+ dw YouCantTakeAnEggText
JumpText_ExcuseMeYoureNotReady:
; Excuse me. You're not ready.
@@ -70,34 +70,34 @@ BattleTower_PleaseReturnWhenReady:
text_far UnknownText_0x1c5962
text_end
-JumpText_NeedAtLeastThreeMon:
+NeedAtLeastThreeMonText:
; You need at least three #MON.
- text_far UnknownText_0x1c5983
+ text_far _NeedAtLeastThreeMonText
text_end
-JumpText_EggDoesNotQualify:
+EggDoesNotQualifyText:
; Sorry, an EGG doesn't qualify.
- text_far UnknownText_0x1c59a3
+ text_far _EggDoesNotQualifyText
text_end
-JumpText_OnlyThreeMonMayBeEntered:
+OnlyThreeMonMayBeEnteredText:
; Only three #MON may be entered.
- text_far Text_OnlyThreeMonMayBeEntered
+ text_far _OnlyThreeMonMayBeEnteredText
text_end
-JumpText_TheMonMustAllBeDifferentKinds:
+TheMonMustAllBeDifferentKindsText:
; The @ #MON must all be different kinds.
- text_far Text_TheMonMustAllBeDifferentKinds
+ text_far _TheMonMustAllBeDifferentKindsText
text_end
-JumpText_TheMonMustNotHoldTheSameItems:
+TheMonMustNotHoldTheSameItemsText:
; The @ #MON must not hold the same items.
- text_far Text_TheMonMustNotHoldTheSameItems
+ text_far _TheMonMustNotHoldTheSameItemsText
text_end
-JumpText_YouCantTakeAnEgg:
+YouCantTakeAnEggText:
; You can't take an EGG!
- text_far Text_YouCantTakeAnEgg
+ text_far _YouCantTakeAnEggText
text_end
BattleTower_ExecuteJumptable:
@@ -161,7 +161,7 @@ BattleTower_ExecuteJumptable:
call z, .PrintFirstText
pop bc
call .PrintNthText
- ld b, $1
+ ld b, 1
pop de
ret
@@ -178,7 +178,7 @@ BattleTower_ExecuteJumptable:
call .GetTextPointers
inc hl
inc hl
- ld b, $0
+ ld b, 0
add hl, bc
add hl, bc
call .LoadTextPointer
@@ -194,7 +194,7 @@ BattleTower_CheckPartyLengthIs3:
BattleTower_CheckPartyHasThreeMonsThatAreNotEggs:
ld hl, wPartyCount
ld a, [hli]
- ld b, $0
+ ld b, 0
ld c, a
.loop
ld a, [hli]