pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-09-08 08:13:02 -07:00
Code Issues Packages Projects Releases Wiki Activity

#641 fixes and additions. (#646)

Browse Source 
Name a lot of text labels according to our conventions
This commit is contained in:
mid-kid
2019-10-20 22:24:17 +00:00
committed by Rangi
parent 3fc2ba41f7
commit e3e0bcd653
203 changed files with 4077 additions and 4598 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
engine/events/battle_tower/rules.asm
View File

@@ -16,13 +16,12 @@ CheckForMobileBattleRules:
dw BattleTower_CheckPartyHasThreeMonsThatAreNotEggs
.TextPointers:
dw .ExcuseMeText
dw .BTExcuseMeText
dw NeedAtLeastThreeMonText
dw EggDoesNotQualifyText
.ExcuseMeText:
; Excuse me!
text_far UnknownText_0x1c5937
.BTExcuseMeText:
text_far _BTExcuseMeText
text_end
_CheckForBattleTowerRules:
@@ -49,54 +48,46 @@ _CheckForBattleTowerRules:
dw Function_HasPartyAnEgg
.TextPointers:
dw JumpText_ExcuseMeYoureNotReady
dw ExcuseMeYoureNotReadyText
dw OnlyThreeMonMayBeEnteredText
dw TheMonMustAllBeDifferentKindsText
dw TheMonMustNotHoldTheSameItemsText
dw YouCantTakeAnEggText
JumpText_ExcuseMeYoureNotReady:
; Excuse me. You're not ready.
text_far Text_ExcuseMeYoureNotReady
ExcuseMeYoureNotReadyText:
text_far _ExcuseMeYoureNotReadyText
text_end
BattleTower_PleaseReturnWhenReady:
ld hl, .PleaseReturnWhenReady
ld hl, .BattleTowerReturnWhenReadyText
call PrintText
ret
.PleaseReturnWhenReady:
; Please return when you're ready.
text_far UnknownText_0x1c5962
.BattleTowerReturnWhenReadyText:
text_far _BattleTowerReturnWhenReadyText
text_end
NeedAtLeastThreeMonText:
; You need at least three #MON.
text_far _NeedAtLeastThreeMonText
text_end
EggDoesNotQualifyText:
; Sorry, an EGG doesn't qualify.
text_far _EggDoesNotQualifyText
text_end
OnlyThreeMonMayBeEnteredText:
; Only three #MON may be entered.
text_far _OnlyThreeMonMayBeEnteredText
text_end
TheMonMustAllBeDifferentKindsText:
; The @ #MON must all be different kinds.
text_far _TheMonMustAllBeDifferentKindsText
text_end
TheMonMustNotHoldTheSameItemsText:
; The @ #MON must not hold the same items.
text_far _TheMonMustNotHoldTheSameItemsText
text_end
YouCantTakeAnEggText:
; You can't take an EGG!
text_far _YouCantTakeAnEggText
text_end