diff options
| author | mid-kid <esteve.varela@gmail.com> | 2019-10-20 22:24:17 +0000 |
|---|---|---|
| committer | Rangi <35663410+Rangi42@users.noreply.github.com> | 2019-10-20 18:24:17 -0400 |
| commit | e3e0bcd653f8d671f6fd1390fa922e3b644f4a34 (patch) | |
| tree | 27c9b465e4d3e0de2649a5755a9f0b5021b05798 /engine/events | |
| parent | 3fc2ba41f7bc7fcf1e51f821b4e07525e0e4a873 (diff) | |
#641 fixes and additions. (#646)
Name a lot of text labels according to our conventions
Diffstat (limited to 'engine/events')
32 files changed, 917 insertions, 1123 deletions
diff --git a/engine/events/battle_tower/rules.asm b/engine/events/battle_tower/rules.asm index 3162ef38e..54910c37d 100644 --- a/engine/events/battle_tower/rules.asm +++ b/engine/events/battle_tower/rules.asm @@ -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 diff --git a/engine/events/battle_tower/trainer_text.asm b/engine/events/battle_tower/trainer_text.asm index 6d06e2eec..6ff9c5b3e 100644 --- a/engine/events/battle_tower/trainer_text.asm +++ b/engine/events/battle_tower/trainer_text.asm @@ -94,85 +94,85 @@ BTMaleTrainerTexts: dw .PlayerWon .Greetings: - dw BTGreetingM1 - dw BTGreetingM2 - dw BTGreetingM3 - dw BTGreetingM4 - dw BTGreetingM5 - dw BTGreetingM6 - dw BTGreetingM7 - dw BTGreetingM8 - dw BTGreetingM9 - dw BTGreetingM10 - dw BTGreetingM11 - dw BTGreetingM12 - dw BTGreetingM13 - dw BTGreetingM14 - dw BTGreetingM15 - dw BTGreetingM16 - dw BTGreetingM17 - dw BTGreetingM18 - dw BTGreetingM19 - dw BTGreetingM20 - dw BTGreetingM21 - dw BTGreetingM22 - dw BTGreetingM23 - dw BTGreetingM24 - dw BTGreetingM25 + dw BTGreetingM1Text + dw BTGreetingM2Text + dw BTGreetingM3Text + dw BTGreetingM4Text + dw BTGreetingM5Text + dw BTGreetingM6Text + dw BTGreetingM7Text + dw BTGreetingM8Text + dw BTGreetingM9Text + dw BTGreetingM10Text + dw BTGreetingM11Text + dw BTGreetingM12Text + dw BTGreetingM13Text + dw BTGreetingM14Text + dw BTGreetingM15Text + dw BTGreetingM16Text + dw BTGreetingM17Text + dw BTGreetingM18Text + dw BTGreetingM19Text + dw BTGreetingM20Text + dw BTGreetingM21Text + dw BTGreetingM22Text + dw BTGreetingM23Text + dw BTGreetingM24Text + dw BTGreetingM25Text .PlayerLost: - dw BTLossM1 - dw BTLossM2 - dw BTLossM3 - dw BTLossM4 - dw BTLossM5 - dw BTLossM6 - dw BTLossM7 - dw BTLossM8 - dw BTLossM9 - dw BTLossM10 - dw BTLossM11 - dw BTLossM12 - dw BTLossM13 - dw BTLossM14 - dw BTLossM15 - dw BTLossM16 - dw BTLossM17 - dw BTLossM18 - dw BTLossM19 - dw BTLossM20 - dw BTLossM21 - dw BTLossM22 - dw BTLossM23 - dw BTLossM24 - dw BTLossM25 + dw BTLossM1Text + dw BTLossM2Text + dw BTLossM3Text + dw BTLossM4Text + dw BTLossM5Text + dw BTLossM6Text + dw BTLossM7Text + dw BTLossM8Text + dw BTLossM9Text + dw BTLossM10Text + dw BTLossM11Text + dw BTLossM12Text + dw BTLossM13Text + dw BTLossM14Text + dw BTLossM15Text + dw BTLossM16Text + dw BTLossM17Text + dw BTLossM18Text + dw BTLossM19Text + dw BTLossM20Text + dw BTLossM21Text + dw BTLossM22Text + dw BTLossM23Text + dw BTLossM24Text + dw BTLossM25Text .PlayerWon: - dw BTWinM1 - dw BTWinM2 - dw BTWinM3 - dw BTWinM4 - dw BTWinM5 - dw BTWinM6 - dw BTWinM7 - dw BTWinM8 - dw BTWinM9 - dw BTWinM10 - dw BTWinM11 - dw BTWinM12 - dw BTWinM13 - dw BTWinM14 - dw BTWinM15 - dw BTWinM16 - dw BTWinM17 - dw BTWinM18 - dw BTWinM19 - dw BTWinM20 - dw BTWinM21 - dw BTWinM22 - dw BTWinM23 - dw BTWinM24 - dw BTWinM25 + dw BTWinM1Text + dw BTWinM2Text + dw BTWinM3Text + dw BTWinM4Text + dw BTWinM5Text + dw BTWinM6Text + dw BTWinM7Text + dw BTWinM8Text + dw BTWinM9Text + dw BTWinM10Text + dw BTWinM11Text + dw BTWinM12Text + dw BTWinM13Text + dw BTWinM14Text + dw BTWinM15Text + dw BTWinM16Text + dw BTWinM17Text + dw BTWinM18Text + dw BTWinM19Text + dw BTWinM20Text + dw BTWinM21Text + dw BTWinM22Text + dw BTWinM23Text + dw BTWinM24Text + dw BTWinM25Text BTFemaleTrainerTexts: dw .Greetings @@ -180,532 +180,532 @@ BTFemaleTrainerTexts: dw .PlayerWon .Greetings: - dw BTGreetingF1 - dw BTGreetingF2 - dw BTGreetingF3 - dw BTGreetingF4 - dw BTGreetingF5 - dw BTGreetingF6 - dw BTGreetingF7 - dw BTGreetingF8 - dw BTGreetingF9 - dw BTGreetingF10 - dw BTGreetingF11 - dw BTGreetingF12 - dw BTGreetingF13 - dw BTGreetingF14 - dw BTGreetingF15 + dw BTGreetingF1Text + dw BTGreetingF2Text + dw BTGreetingF3Text + dw BTGreetingF4Text + dw BTGreetingF5Text + dw BTGreetingF6Text + dw BTGreetingF7Text + dw BTGreetingF8Text + dw BTGreetingF9Text + dw BTGreetingF10Text + dw BTGreetingF11Text + dw BTGreetingF12Text + dw BTGreetingF13Text + dw BTGreetingF14Text + dw BTGreetingF15Text .PlayerLost: - dw BTLossF1 - dw BTLossF2 - dw BTLossF3 - dw BTLossF4 - dw BTLossF5 - dw BTLossF6 - dw BTLossF7 - dw BTLossF8 - dw BTLossF9 - dw BTLossF10 - dw BTLossF11 - dw BTLossF12 - dw BTLossF13 - dw BTLossF14 - dw BTLossF15 + dw BTLossF1Text + dw BTLossF2Text + dw BTLossF3Text + dw BTLossF4Text + dw BTLossF5Text + dw BTLossF6Text + dw BTLossF7Text + dw BTLossF8Text + dw BTLossF9Text + dw BTLossF10Text + dw BTLossF11Text + dw BTLossF12Text + dw BTLossF13Text + dw BTLossF14Text + dw BTLossF15Text .PlayerWon: - dw BTWinF1 - dw BTWinF2 - dw BTWinF3 - dw BTWinF4 - dw BTWinF5 - dw BTWinF6 - dw BTWinF7 - dw BTWinF8 - dw BTWinF9 - dw BTWinF10 - dw BTWinF11 - dw BTWinF12 - dw BTWinF13 - dw BTWinF14 - dw BTWinF15 + dw BTWinF1Text + dw BTWinF2Text + dw BTWinF3Text + dw BTWinF4Text + dw BTWinF5Text + dw BTWinF6Text + dw BTWinF7Text + dw BTWinF8Text + dw BTWinF9Text + dw BTWinF10Text + dw BTWinF11Text + dw BTWinF12Text + dw BTWinF13Text + dw BTWinF14Text + dw BTWinF15Text -BTGreetingM1: - text_far BattleTowerText_0x1ec000 +BTGreetingM1Text: + text_far _BTGreetingM1Text text_end -BTLossM1: - text_far BattleTowerText_0x1ec03b +BTLossM1Text: + text_far _BTLossM1Text text_end -BTWinM1: - text_far UnknownText_0x1ec060 +BTWinM1Text: + text_far _BTWinM1Text text_end -BTGreetingM2: - text_far BattleTowerText_0x1ec080 +BTGreetingM2Text: + text_far _BTGreetingM2Text text_end -BTLossM2: - text_far UnknownText_0x1ec0a3 +BTLossM2Text: + text_far _BTLossM2Text text_end -BTWinM2: - text_far UnknownText_0x1ec0c4 +BTWinM2Text: + text_far _BTWinM2Text text_end -BTGreetingM3: - text_far UnknownText_0x1ec0e1 +BTGreetingM3Text: + text_far _BTGreetingM3Text text_end -BTLossM3: - text_far UnknownText_0x1ec108 +BTLossM3Text: + text_far _BTLossM3Text text_end -BTWinM3: - text_far UnknownText_0x1ec12a +BTWinM3Text: + text_far _BTWinM3Text text_end -BTGreetingM4: - text_far UnknownText_0x1ec14d +BTGreetingM4Text: + text_far _BTGreetingM4Text text_end -BTLossM4: - text_far UnknownText_0x1ec16f +BTLossM4Text: + text_far _BTLossM4Text text_end -BTWinM4: - text_far UnknownText_0x1ec190 +BTWinM4Text: + text_far _BTWinM4Text text_end -BTGreetingM5: - text_far UnknownText_0x1ec1ae +BTGreetingM5Text: + text_far _BTGreetingM5Text text_end -BTLossM5: - text_far UnknownText_0x1ec1d0 +BTLossM5Text: + text_far _BTLossM5Text text_end -BTWinM5: - text_far UnknownText_0x1ec1f4 +BTWinM5Text: + text_far _BTWinM5Text text_end -BTGreetingM6: - text_far UnknownText_0x1ec216 +BTGreetingM6Text: + text_far _BTGreetingM6Text text_end -BTLossM6: - text_far UnknownText_0x1ec238 +BTLossM6Text: + text_far _BTLossM6Text text_end -BTWinM6: - text_far UnknownText_0x1ec259 +BTWinM6Text: + text_far _BTWinM6Text text_end -BTGreetingM7: - text_far UnknownText_0x1ec27b +BTGreetingM7Text: + text_far _BTGreetingM7Text text_end -BTLossM7: - text_far UnknownText_0x1ec2a0 +BTLossM7Text: + text_far _BTLossM7Text text_end -BTWinM7: - text_far UnknownText_0x1ec2c0 +BTWinM7Text: + text_far _BTWinM7Text text_end -BTGreetingM8: - text_far UnknownText_0x1ec2d9 +BTGreetingM8Text: + text_far _BTGreetingM8Text text_end -BTLossM8: - text_far UnknownText_0x1ec2fe +BTLossM8Text: + text_far _BTLossM8Text text_end -BTWinM8: - text_far UnknownText_0x1ec320 +BTWinM8Text: + text_far _BTWinM8Text text_end -BTGreetingM9: - text_far UnknownText_0x1ec33f +BTGreetingM9Text: + text_far _BTGreetingM9Text text_end -BTLossM9: - text_far UnknownText_0x1ec36c +BTLossM9Text: + text_far _BTLossM9Text text_end -BTWinM9: - text_far UnknownText_0x1ec389 +BTWinM9Text: + text_far _BTWinM9Text text_end -BTGreetingM10: - text_far UnknownText_0x1ec3ad +BTGreetingM10Text: + text_far _BTGreetingM10Text text_end -BTLossM10: - text_far UnknownText_0x1ec3c5 +BTLossM10Text: + text_far _BTLossM10Text text_end -BTWinM10: - text_far UnknownText_0x1ec3e5 +BTWinM10Text: + text_far _BTWinM10Text text_end -BTGreetingM11: - text_far UnknownText_0x1ec402 +BTGreetingM11Text: + text_far _BTGreetingM11Text text_end -BTLossM11: - text_far UnknownText_0x1ec411 +BTLossM11Text: + text_far _BTLossM11Text text_end -BTWinM11: - text_far UnknownText_0x1ec41f +BTWinM11Text: + text_far _BTWinM11Text text_end -BTGreetingM12: - text_far UnknownText_0x1ec42e +BTGreetingM12Text: + text_far _BTGreetingM12Text text_end -BTLossM12: - text_far UnknownText_0x1ec461 +BTLossM12Text: + text_far _BTLossM12Text text_end -BTWinM12: - text_far UnknownText_0x1ec4a0 +BTWinM12Text: + text_far _BTWinM12Text text_end -BTGreetingM13: - text_far UnknownText_0x1ec4d6 +BTGreetingM13Text: + text_far _BTGreetingM13Text text_end -BTLossM13: - text_far UnknownText_0x1ec4f5 +BTLossM13Text: + text_far _BTLossM13Text text_end -BTWinM13: - text_far UnknownText_0x1ec512 +BTWinM13Text: + text_far _BTWinM13Text text_end -BTGreetingM14: - text_far UnknownText_0x1ec532 +BTGreetingM14Text: + text_far _BTGreetingM14Text text_end -BTLossM14: - text_far UnknownText_0x1ec54b +BTLossM14Text: + text_far _BTLossM14Text text_end -BTWinM14: - text_far UnknownText_0x1ec565 +BTWinM14Text: + text_far _BTWinM14Text text_end -BTGreetingM15: - text_far UnknownText_0x1ec580 +BTGreetingM15Text: + text_far _BTGreetingM15Text text_end -BTLossM15: - text_far UnknownText_0x1ec59d +BTLossM15Text: + text_far _BTLossM15Text text_end -BTWinM15: - text_far UnknownText_0x1ec5b5 +BTWinM15Text: + text_far _BTWinM15Text text_end -BTGreetingM16: - text_far UnknownText_0x1ec5d3 +BTGreetingM16Text: + text_far _BTGreetingM16Text text_end -BTLossM16: - text_far UnknownText_0x1ec5ee +BTLossM16Text: + text_far _BTLossM16Text text_end -BTWinM16: - text_far UnknownText_0x1ec60d +BTWinM16Text: + text_far _BTWinM16Text text_end -BTGreetingM17: - text_far UnknownText_0x1ec631 +BTGreetingM17Text: + text_far _BTGreetingM17Text text_end -BTLossM17: - text_far UnknownText_0x1ec651 +BTLossM17Text: + text_far _BTLossM17Text text_end -BTWinM17: - text_far UnknownText_0x1ec68f +BTWinM17Text: + text_far _BTWinM17Text text_end -BTGreetingM18: - text_far UnknownText_0x1ec6b1 +BTGreetingM18Text: + text_far _BTGreetingM18Text text_end -BTLossM18: - text_far UnknownText_0x1ec6d0 +BTLossM18Text: + text_far _BTLossM18Text text_end -BTWinM18: - text_far UnknownText_0x1ec708 +BTWinM18Text: + text_far _BTWinM18Text text_end -BTGreetingM19: - text_far UnknownText_0x1ec720 +BTGreetingM19Text: + text_far _BTGreetingM19Text text_end -BTLossM19: - text_far UnknownText_0x1ec73e +BTLossM19Text: + text_far _BTLossM19Text text_end -BTWinM19: - text_far UnknownText_0x1ec75b +BTWinM19Text: + text_far _BTWinM19Text text_end -BTGreetingM20: - text_far UnknownText_0x1ec77f +BTGreetingM20Text: + text_far _BTGreetingM20Text text_end -BTLossM20: - text_far UnknownText_0x1ec798 +BTLossM20Text: + text_far _BTLossM20Text text_end -BTWinM20: - text_far UnknownText_0x1ec7bb +BTWinM20Text: + text_far _BTWinM20Text text_end -BTGreetingM21: - text_far UnknownText_0x1ec7d8 +BTGreetingM21Text: + text_far _BTGreetingM21Text text_end -BTLossM21: - text_far UnknownText_0x1ec818 +BTLossM21Text: + text_far _BTLossM21Text text_end -BTWinM21: - text_far UnknownText_0x1ec837 +BTWinM21Text: + text_far _BTWinM21Text text_end -BTGreetingM22: - text_far UnknownText_0x1ec858 +BTGreetingM22Text: + text_far _BTGreetingM22Text text_end -BTLossM22: - text_far UnknownText_0x1ec876 +BTLossM22Text: + text_far _BTLossM22Text text_end -BTWinM22: - text_far UnknownText_0x1ec898 +BTWinM22Text: + text_far _BTWinM22Text text_end -BTGreetingM23: - text_far UnknownText_0x1ec8b1 +BTGreetingM23Text: + text_far _BTGreetingM23Text text_end -BTLossM23: - text_far UnknownText_0x1ec8d5 +BTLossM23Text: + text_far _BTLossM23Text text_end -BTWinM23: - text_far UnknownText_0x1ec8f0 +BTWinM23Text: + text_far _BTWinM23Text text_end -BTGreetingM24: - text_far UnknownText_0x1ec911 +BTGreetingM24Text: + text_far _BTGreetingM24Text text_end -BTLossM24: - text_far UnknownText_0x1ec928 +BTLossM24Text: + text_far _BTLossM24Text text_end -BTWinM24: - text_far UnknownText_0x1ec949 +BTWinM24Text: + text_far _BTWinM24Text text_end -BTGreetingM25: - text_far UnknownText_0x1ec969 +BTGreetingM25Text: + text_far _BTGreetingM25Text text_end -BTLossM25: - text_far UnknownText_0x1ec986 +BTLossM25Text: + text_far _BTLossM25Text text_end -BTWinM25: - text_far UnknownText_0x1ec99b +BTWinM25Text: + text_far _BTWinM25Text text_end -BTGreetingF1: - text_far UnknownText_0x1ec9bd +BTGreetingF1Text: + text_far _BTGreetingF1Text text_end -BTLossF1: - text_far UnknownText_0x1ec9d9 +BTLossF1Text: + text_far _BTLossF1Text text_end -BTWinF1: - text_far UnknownText_0x1ec9f7 +BTWinF1Text: + text_far _BTWinF1Text text_end -BTGreetingF2: - text_far UnknownText_0x1eca0a +BTGreetingF2Text: + text_far _BTGreetingF2Text text_end -BTLossF2: - text_far UnknownText_0x1eca2a +BTLossF2Text: + text_far _BTLossF2Text text_end -BTWinF2: - text_far UnknownText_0x1eca47 +BTWinF2Text: + text_far _BTWinF2Text text_end -BTGreetingF3: - text_far UnknownText_0x1eca64 +BTGreetingF3Text: + text_far _BTGreetingF3Text text_end -BTLossF3: - text_far UnknownText_0x1eca82 +BTLossF3Text: + text_far _BTLossF3Text text_end -BTWinF3: - text_far UnknownText_0x1eca9d +BTWinF3Text: + text_far _BTWinF3Text text_end -BTGreetingF4: - text_far UnknownText_0x1ecabf +BTGreetingF4Text: + text_far _BTGreetingF4Text text_end -BTLossF4: - text_far UnknownText_0x1ecade +BTLossF4Text: + text_far _BTLossF4Text text_end -BTWinF4: - text_far UnknownText_0x1ecafa +BTWinF4Text: + text_far _BTWinF4Text text_end -BTGreetingF5: - text_far UnknownText_0x1ecb19 +BTGreetingF5Text: + text_far _BTGreetingF5Text text_end -BTLossF5: - text_far UnknownText_0x1ecb37 +BTLossF5Text: + text_far _BTLossF5Text text_end -BTWinF5: - text_far UnknownText_0x1ecb55 +BTWinF5Text: + text_far _BTWinF5Text text_end -BTGreetingF6: - text_far UnknownText_0x1ecb70 +BTGreetingF6Text: + text_far _BTGreetingF6Text text_end -BTLossF6: - text_far UnknownText_0x1ecb92 +BTLossF6Text: + text_far _BTLossF6Text text_end -BTWinF6: - text_far UnknownText_0x1ecbb6 +BTWinF6Text: + text_far _BTWinF6Text text_end -BTGreetingF7: - text_far UnknownText_0x1ecbd9 +BTGreetingF7Text: + text_far _BTGreetingF7Text text_end -BTLossF7: - text_far UnknownText_0x1ecbf3 +BTLossF7Text: + text_far _BTLossF7Text text_end -BTWinF7: - text_far UnknownText_0x1ecc15 +BTWinF7Text: + text_far _BTWinF7Text text_end -BTGreetingF8: - text_far UnknownText_0x1ecc39 +BTGreetingF8Text: + text_far _BTGreetingF8Text text_end -BTLossF8: - text_far UnknownText_0x1ecc55 +BTLossF8Text: + text_far _BTLossF8Text text_end -BTWinF8: - text_far UnknownText_0x1ecc75 +BTWinF8Text: + text_far _BTWinF8Text text_end -BTGreetingF9: - text_far UnknownText_0x1ecc92 +BTGreetingF9Text: + text_far _BTGreetingF9Text text_end -BTLossF9: - text_far UnknownText_0x1ecca7 +BTLossF9Text: + text_far _BTLossF9Text text_end -BTWinF9: - text_far UnknownText_0x1eccc1 +BTWinF9Text: + text_far _BTWinF9Text text_end -BTGreetingF10: - text_far UnknownText_0x1eccd7 +BTGreetingF10Text: + text_far _BTGreetingF10Text text_end -BTLossF10: - text_far UnknownText_0x1eccef +BTLossF10Text: + text_far _BTLossF10Text text_end -BTWinF10: - text_far UnknownText_0x1ecd0e +BTWinF10Text: + text_far _BTWinF10Text text_end -BTGreetingF11: - text_far UnknownText_0x1ecd2b +BTGreetingF11Text: + text_far _BTGreetingF11Text text_end -BTLossF11: - text_far UnknownText_0x1ecd4d +BTLossF11Text: + text_far _BTLossF11Text text_end -BTWinF11: - text_far UnknownText_0x1ecd6b +BTWinF11Text: + text_far _BTWinF11Text text_end -BTGreetingF12: - text_far UnknownText_0x1ecd8d +BTGreetingF12Text: + text_far _BTGreetingF12Text text_end -BTLossF12: - text_far UnknownText_0x1ecdaf +BTLossF12Text: + text_far _BTLossF12Text text_end -BTWinF12: - text_far UnknownText_0x1ecdcf +BTWinF12Text: + text_far _BTWinF12Text text_end -BTGreetingF13: - text_far UnknownText_0x1ecded +BTGreetingF13Text: + text_far _BTGreetingF13Text text_end -BTLossF13: - text_far UnknownText_0x1ece0d +BTLossF13Text: + text_far _BTLossF13Text text_end -BTWinF13: - text_far UnknownText_0x1ece2a +BTWinF13Text: + text_far _BTWinF13Text text_end -BTGreetingF14: - text_far UnknownText_0x1ece4b +BTGreetingF14Text: + text_far _BTGreetingF14Text text_end -BTLossF14: - text_far UnknownText_0x1ece70 +BTLossF14Text: + text_far _BTLossF14Text text_end -BTWinF14: - text_far UnknownText_0x1ece8a +BTWinF14Text: + text_far _BTWinF14Text text_end -BTGreetingF15: - text_far UnknownText_0x1ecea8 +BTGreetingF15Text: + text_far _BTGreetingF15Text text_end -BTLossF15: - text_far UnknownText_0x1ecec9 +BTLossF15Text: + text_far _BTLossF15Text text_end -BTWinF15: - text_far UnknownText_0x1ecee8 +BTWinF15Text: + text_far _BTWinF15Text text_end diff --git a/engine/events/buena.asm b/engine/events/buena.asm index 3e78dfa91..ef8c70bfc 100644 --- a/engine/events/buena.asm +++ b/engine/events/buena.asm @@ -70,12 +70,12 @@ BuenaPrize: ld [wMenuSelection], a call Buena_PlacePrizeMenuBox call Buena_DisplayBlueCardBalance - ld hl, .Text_AskWhichPrize + ld hl, .BuenaAskWhichPrizeText call PrintText jr .okay .loop - ld hl, .Text_AskWhichPrize + ld hl, .BuenaAskWhichPrizeText call BuenaPrintText .okay @@ -89,7 +89,7 @@ BuenaPrize: ld a, [hl] ld [wNamedObjectIndexBuffer], a call GetItemName - ld hl, .Text_IsThatRight + ld hl, .BuenaIsThatRightText call BuenaPrintText call YesNoBox jr c, .loop @@ -121,17 +121,17 @@ BuenaPrize: jr .Purchase .InsufficientBalance: - ld hl, .Text_NotEnoughPoints + ld hl, .BuenaNotEnoughPointsText jr .print .BagFull: - ld hl, .Text_NoRoom + ld hl, .BuenaNoRoomText jr .print .Purchase: ld de, SFX_TRANSACTION call PlaySFX - ld hl, .Text_HereYouGo + ld hl, .BuenaHereYouGoText .print call BuenaPrintText @@ -140,40 +140,34 @@ BuenaPrize: .done call CloseWindow call CloseWindow - ld hl, .Text_PleaseComeBackAgain + ld hl, .BuenaComeAgainText call PrintText call JoyWaitAorB call PlayClickSFX ret -.Text_AskWhichPrize: - ; Which prize would you like? - text_far UnknownText_0x1c589f +.BuenaAskWhichPrizeText: + text_far _BuenaAskWhichPrizeText text_end -.Text_IsThatRight: - ; ? Is that right? - text_far UnknownText_0x1c58bc +.BuenaIsThatRightText: + text_far _BuenaIsThatRightText text_end -.Text_HereYouGo: - ; Here you go! - text_far UnknownText_0x1c58d1 +.BuenaHereYouGoText: + text_far _BuenaHereYouGoText text_end -.Text_NotEnoughPoints: - ; You don't have enough points. - text_far UnknownText_0x1c58e0 +.BuenaNotEnoughPointsText: + text_far _BuenaNotEnoughPointsText text_end -.Text_NoRoom: - ; You have no room for it. - text_far UnknownText_0x1c58ff +.BuenaNoRoomText: + text_far _BuenaNoRoomText text_end -.Text_PleaseComeBackAgain: - ; Oh. Please come back again! - text_far UnknownText_0x1c591a +.BuenaComeAgainText: + text_far _BuenaComeAgainText text_end Buena_DisplayBlueCardBalance: diff --git a/engine/events/bug_contest/caught_mon.asm b/engine/events/bug_contest/caught_mon.asm index 71e6f1f62..b2cc044aa 100644 --- a/engine/events/bug_contest/caught_mon.asm +++ b/engine/events/bug_contest/caught_mon.asm @@ -14,7 +14,7 @@ BugContest_SetCaughtContestMon: ld a, [wTempEnemyMonSpecies] ld [wNamedObjectIndexBuffer], a call GetPokemonName - ld hl, .caughttext + ld hl, .ContestCaughtMonText call PrintText ret @@ -32,7 +32,6 @@ BugContest_SetCaughtContestMon: ld hl, wContestMon jp GeneratePartyMonStats -.caughttext - ; Caught @ ! - text_far UnknownText_0x1c10c0 +.ContestCaughtMonText: + text_far _ContestCaughtMonText text_end diff --git a/engine/events/bug_contest/contest.asm b/engine/events/bug_contest/contest.asm index 3e8800739..6a3f77994 100644 --- a/engine/events/bug_contest/contest.asm +++ b/engine/events/bug_contest/contest.asm @@ -18,26 +18,24 @@ BugCatchingContestBattleScript:: BugCatchingContestOverScript:: playsound SFX_ELEVATOR_END opentext - writetext BugCatchingContestText_BeeepTimesUp + writetext BugCatchingContestTimeUpText waitbutton sjump BugCatchingContestReturnToGateScript BugCatchingContestOutOfBallsScript: playsound SFX_ELEVATOR_END opentext - writetext BugCatchingContestText_ContestIsOver + writetext BugCatchingContestIsOverText waitbutton BugCatchingContestReturnToGateScript: closetext jumpstd bugcontestresultswarp -BugCatchingContestText_BeeepTimesUp: - ; ANNOUNCER: BEEEP! Time's up! - text_far UnknownText_0x1bd2ca +BugCatchingContestTimeUpText: + text_far _BugCatchingContestTimeUpText text_end -BugCatchingContestText_ContestIsOver: - ; ANNOUNCER: The Contest is over! - text_far UnknownText_0x1bd2e7 +BugCatchingContestIsOverText: + text_far _BugCatchingContestIsOverText text_end diff --git a/engine/events/bug_contest/display_stats.asm b/engine/events/bug_contest/display_stats.asm index 6969bc893..dc5518594 100644 --- a/engine/events/bug_contest/display_stats.asm +++ b/engine/events/bug_contest/display_stats.asm @@ -67,7 +67,7 @@ DisplayCaughtContestMonStats: ld de, wEnemyMonMaxHP call PrintNum - ld hl, SwitchMonText + ld hl, ContestAskSwitchText call PrintText pop af @@ -86,19 +86,17 @@ DisplayCaughtContestMonStats: .This: db " THIS <PKMN> @" -SwitchMonText: - ; Switch #MON? - text_far UnknownText_0x1c10cf +ContestAskSwitchText: + text_far _ContestAskSwitchText text_end DisplayAlreadyCaughtText: call GetPokemonName - ld hl, .AlreadyCaughtText + ld hl, .ContestAlreadyCaughtText jp PrintText -.AlreadyCaughtText: - ; You already caught a @ . - text_far UnknownText_0x1c10dd +.ContestAlreadyCaughtText: + text_far _ContestAlreadyCaughtText text_end DummyPredef2F: diff --git a/engine/events/bug_contest/judging.asm b/engine/events/bug_contest/judging.asm index a166269d5..9f8c0c5c2 100644 --- a/engine/events/bug_contest/judging.asm +++ b/engine/events/bug_contest/judging.asm @@ -7,66 +7,63 @@ _BugContestJudging: ld a, [wBugContestThirdPlaceMon] ld [wNamedObjectIndexBuffer], a call GetPokemonName - ld hl, BugContest_ThirdPlaceText + ld hl, ContestJudging_ThirdPlaceText call PrintText ld a, [wBugContestSecondPlaceWinnerID] call LoadContestantName ld a, [wBugContestSecondPlaceMon] ld [wNamedObjectIndexBuffer], a call GetPokemonName - ld hl, BugContest_SecondPlaceText + ld hl, ContestJudging_SecondPlaceText call PrintText ld a, [wBugContestFirstPlaceWinnerID] call LoadContestantName ld a, [wBugContestFirstPlaceMon] ld [wNamedObjectIndexBuffer], a call GetPokemonName - ld hl, BugContest_FirstPlaceText + ld hl, ContestJudging_FirstPlaceText call PrintText jp BugContest_GetPlayersResult -BugContest_FirstPlaceText: - text_far ContestJudging_FirstPlaceText +ContestJudging_FirstPlaceText: + text_far _ContestJudging_FirstPlaceText text_asm ld de, SFX_1ST_PLACE call PlaySFX call WaitSFX - ld hl, BugContest_FirstPlaceScoreText + ld hl, ContestJudging_FirstPlaceScoreText ret -BugContest_FirstPlaceScoreText: - ; The winning score was @ points! - text_far ContestJudging_FirstPlaceScoreText +ContestJudging_FirstPlaceScoreText: + text_far _ContestJudging_FirstPlaceScoreText text_end -BugContest_SecondPlaceText: +ContestJudging_SecondPlaceText: ; Placing second was @ , who caught a @ !@ @ - text_far ContestJudging_SecondPlaceText + text_far _ContestJudging_SecondPlaceText text_asm ld de, SFX_2ND_PLACE call PlaySFX call WaitSFX - ld hl, BugContest_SecondPlaceScoreText + ld hl, ContestJudging_SecondPlaceScoreText ret -BugContest_SecondPlaceScoreText: - ; The score was @ points! - text_far ContestJudging_SecondPlaceScoreText +ContestJudging_SecondPlaceScoreText: + text_far _ContestJudging_SecondPlaceScoreText text_end -BugContest_ThirdPlaceText: +ContestJudging_ThirdPlaceText: ; Placing third was @ , who caught a @ !@ @ - text_far ContestJudging_ThirdPlaceText + text_far _ContestJudging_ThirdPlaceText text_asm ld de, SFX_3RD_PLACE call PlaySFX call WaitSFX - ld hl, BugContest_ThirdPlaceScoreText + ld hl, ContestJudging_ThirdPlaceScoreText ret -BugContest_ThirdPlaceScoreText: - ; The score was @ points! - text_far ContestJudging_ThirdPlaceScoreText +ContestJudging_ThirdPlaceScoreText: + text_far _ContestJudging_ThirdPlaceScoreText text_end LoadContestantName: diff --git a/engine/events/daycare.asm b/engine/events/daycare.asm index 34e896778..a3c1ccfd1 100644 --- a/engine/events/daycare.asm +++ b/engine/events/daycare.asm @@ -166,8 +166,7 @@ DayCareAskDepositPokemon: scf ret -.DummyText: - ; +.DaycareDummyText: text_far _DaycareDummyText text_end @@ -207,7 +206,7 @@ DayCare_AskWithdrawBreedMon: jr c, .not_enough_money ld a, [wPartyCount] cp PARTY_LENGTH - jr nc, .PartyFull + jr nc, .party_full and a ret @@ -221,7 +220,7 @@ DayCare_AskWithdrawBreedMon: scf ret -.PartyFull: +.party_full ld a, DAYCARETEXT_PARTY_FULL scf ret @@ -274,124 +273,104 @@ PrintDayCareText: .TextTable: ; entries correspond to DAYCARETEXT_* constants - dw .DayCareManIntro ; 00 - dw .DayCareManOddEgg ; 01 - dw .DayCareLadyIntro ; 02 - dw .DayCareLadyOddEgg ; 03 - dw .WhichOne ; 04 - dw .OkayIllRaiseYourMon ; 05 - dw .CantAcceptEgg ; 06 - dw .JustOneMon ; 07 - dw .LastHealthyMon ; 08 - dw .ComeBackForItLater ; 09 - dw .RemoveMail ; 0a - dw .AreWeGeniusesOrWhat ; 0b - dw .AskRetrieveMon ; 0c - dw .PerfectHeresYourMon ; 0d - dw .GotBackMon ; 0e - dw .ImmediatelyWithdrawMon ; 0f - dw .PartyFull ; 10 - dw .NotEnoughMoney ; 11 - dw .OhFineThen ; 12 - dw .ComeAgain ; 13 - -.DayCareManIntro: - ; I'm the DAY-CARE MAN. Want me to raise a #MON? + dw .DayCareManIntroText ; 00 + dw .DayCareManOddEggText ; 01 + dw .DayCareLadyIntroText ; 02 + dw .DayCareLadyOddEggText ; 03 + dw .WhatShouldIRaiseText ; 04 + dw .IllRaiseYourMonText ; 05 + dw .CantAcceptEggText ; 06 + dw .OnlyOneMonText ; 07 + dw .LastHealthyMonText ; 08 + dw .ComeBackLaterText ; 09 + dw .RemoveMailText ; 0a + dw .AreWeGeniusesText ; 0b + dw .YourMonHasGrownText ; 0c + dw .PerfectHeresYourMonText ; 0d + dw .GotBackMonText ; 0e + dw .BackAlreadyText ; 0f + dw .HaveNoRoomText ; 10 + dw .NotEnoughMoneyText ; 11 + dw .OhFineThenText ; 12 + dw .ComeAgainText ; 13 + +.DayCareManIntroText: text_far _DayCareManIntroText text_end -.DayCareManOddEgg: - ; I'm the DAY-CARE MAN. Do you know about EGGS? I was raising #MON with my wife, you see. We were shocked to find an EGG! How incredible is that? So, want me to raise a #MON? +.DayCareManOddEggText: text_far _DayCareManOddEggText text_end -.DayCareLadyIntro: - ; I'm the DAY-CARE LADY. Should I raise a #MON for you? +.DayCareLadyIntroText: text_far _DayCareLadyIntroText text_end -.DayCareLadyOddEgg: - ; I'm the DAY-CARE LADY. Do you know about EGGS? My husband and I were raising some #MON, you see. We were shocked to find an EGG! How incredible could that be? Should I raise a #MON for you? +.DayCareLadyOddEggText: text_far _DayCareLadyOddEggText text_end -.WhichOne: - ; What should I raise for you? +.WhatShouldIRaiseText: text_far _WhatShouldIRaiseText text_end -.JustOneMon: - ; Oh? But you have just one #MON. +.OnlyOneMonText: text_far _OnlyOneMonText text_end -.CantAcceptEgg: - ; Sorry, but I can't accept an EGG. - text_far _CantRaiseEggText +.CantAcceptEggText: + text_far _CantAcceptEggText text_end -.RemoveMail: - ; Remove MAIL before you come see me. +.RemoveMailText: text_far _RemoveMailText text_end -.LastHealthyMon: - ; If you give me that, what will you battle with? +.LastHealthyMonText: text_far _LastHealthyMonText text_end -.OkayIllRaiseYourMon: - ; OK. I'll raise your @ . +.IllRaiseYourMonText: text_far _IllRaiseYourMonText text_end -.ComeBackForItLater: - ; Come back for it later. +.ComeBackLaterText: text_far _ComeBackLaterText text_end -.AreWeGeniusesOrWhat: - ; Are we geniuses or what? Want to see your @ ? +.AreWeGeniusesText: text_far _AreWeGeniusesText text_end -.AskRetrieveMon: - ; Your @ has grown a lot. By level, it's grown by @ . If you want your #MON back, it will cost ¥@ . +.YourMonHasGrownText: text_far _YourMonHasGrownText text_end -.PerfectHeresYourMon: - ; Perfect! Here's your #MON. +.PerfectHeresYourMonText: text_far _PerfectHeresYourMonText text_end -.GotBackMon: - ; got back @ . +.GotBackMonText: text_far _GotBackMonText text_end -.ImmediatelyWithdrawMon: - ; Huh? Back already? Your @ needs a little more time with us. If you want your #MON back, it will cost ¥100. +.BackAlreadyText: text_far _BackAlreadyText text_end -.PartyFull: - ; You have no room for it. +.HaveNoRoomText: text_far _HaveNoRoomText text_end -.NotEnoughMoney: - ; You don't have enough money. - text_far _DCNotEnoughMoneyText +.NotEnoughMoneyText: + text_far _NotEnoughMoneyText text_end -.OhFineThen: - ; Oh, fine then. +.OhFineThenText: text_far _OhFineThenText text_end -.ComeAgain: - ; Come again. +.ComeAgainText: text_far _ComeAgainText text_end @@ -399,17 +378,16 @@ DayCareManOutside: ld hl, wDayCareMan bit DAYCAREMAN_HAS_EGG_F, [hl] jr nz, .AskGiveEgg - ld hl, .NotYet + ld hl, .NotYetText call PrintText ret -.NotYet: - ; Not yet… +.NotYetText: text_far _NotYetText text_end .AskGiveEgg: - ld hl, .IntroText + ld hl, .FoundAnEggText call PrintText call YesNoBox jr c, .Declined @@ -420,13 +398,13 @@ DayCareManOutside: ld hl, wDayCareMan res DAYCAREMAN_HAS_EGG_F, [hl] call DayCare_InitBreeding - ld hl, .GotEggText + ld hl, .ReceivedEggText call PrintText ld de, SFX_GET_EGG call PlaySFX ld c, 120 call DelayFrames - ld hl, .TakeGoodCareOfItText + ld hl, .TakeGoodCareOfEggText jr .Load0 .Declined: @@ -439,34 +417,29 @@ DayCareManOutside: ret .PartyFull: - ld hl, .PartyFullText + ld hl, .NoRoomForEggText call PrintText ld a, TRUE ld [wScriptVar], a ret -.IntroText: - ; Ah, it's you! We were raising your #MON, and my goodness, were we surprised! Your #MON had an EGG! We don't know how it got there, but your #MON had it. You want it? +.FoundAnEggText: text_far _FoundAnEggText text_end -.GotEggText: - ; received the EGG! +.ReceivedEggText: text_far _ReceivedEggText text_end -.TakeGoodCareOfItText: - ; Take good care of it. +.TakeGoodCareOfEggText: text_far _TakeGoodCareOfEggText text_end .IllKeepItThanksText: - ; Well then, I'll keep it. Thanks! - text_far _RefuseEggText + text_far _IllKeepItThanksText text_end -.PartyFullText: - ; You have no room in your party. Come back later. +.NoRoomForEggText: text_far _NoRoomForEggText text_end diff --git a/engine/events/elevator.asm b/engine/events/elevator.asm index 8394cf442..e51b6be15 100644 --- a/engine/events/elevator.asm +++ b/engine/events/elevator.asm @@ -115,7 +115,7 @@ Elevator_GoToFloor: Elevator_AskWhichFloor: call LoadStandardMenuHeader - ld hl, Elevator_WhichFloorText + ld hl, AskFloorElevatorText call PrintText call Elevator_GetCurrentFloorText ld hl, Elevator_MenuHeader @@ -137,9 +137,8 @@ Elevator_AskWhichFloor: scf ret -Elevator_WhichFloorText: - ; Which floor? - text_far UnknownText_0x1bd2bc +AskFloorElevatorText: + text_far _AskFloorElevatorText text_end Elevator_GetCurrentFloorText: diff --git a/engine/events/itemfinder.asm b/engine/events/itemfinder.asm index 4d9c9c814..3665187c8 100644 --- a/engine/events/itemfinder.asm +++ b/engine/events/itemfinder.asm @@ -30,23 +30,21 @@ ItemFinder: reloadmappart special UpdateTimePals callasm .ItemfinderSound - writetext .Text_FoundSomething + writetext .ItemfinderItemNearbyText closetext end .Script_FoundNothing: reloadmappart special UpdateTimePals - writetext .Text_FoundNothing + writetext .ItemfinderNopeText closetext end -.Text_FoundSomething: - ; Yes! ITEMFINDER indicates there's an item nearby. - text_far UnknownText_0x1c0a77 +.ItemfinderItemNearbyText: + text_far _ItemfinderItemNearbyText text_end -.Text_FoundNothing: - ; Nope! ITEMFINDER isn't responding. - text_far UnknownText_0x1c0aa9 +.ItemfinderNopeText: + text_far _ItemfinderNopeText text_end diff --git a/engine/events/kurt.asm b/engine/events/kurt.asm index 3dd700dbb..3da57db2b 100644 --- a/engine/events/kurt.asm +++ b/engine/events/kurt.asm @@ -1,20 +1,18 @@ Kurt_PrintTextWhichApricorn: - ld hl, .Text + ld hl, .WhichApricornText call PrintText ret -.Text: - ; Which APRICORN should I use? +.WhichApricornText: text_far _WhichApricornText text_end Kurt_PrintTextHowMany: - ld hl, .Text + ld hl, .HowManyShouldIMakeText call PrintText ret -.Text: - ; How many should I make? +.HowManyShouldIMakeText: text_far _HowManyShouldIMakeText text_end diff --git a/engine/events/lucky_number.asm b/engine/events/lucky_number.asm index 928556d6c..36dbf3d0e 100644 --- a/engine/events/lucky_number.asm +++ b/engine/events/lucky_number.asm @@ -110,10 +110,10 @@ CheckForLuckyNumberWinners: ld a, [wCurPartySpecies] ld [wNamedObjectIndexBuffer], a call GetPokemonName - ld hl, .FoundPartymonText + ld hl, .LuckyNumberMatchPartyText pop af jr z, .print - ld hl, .FoundBoxmonText + ld hl, .LuckyNumberMatchPCText .print jp PrintText @@ -206,14 +206,12 @@ CheckForLuckyNumberWinners: dba sBox13 dba sBox14 -.FoundPartymonText: - ; Congratulations! We have a match with the ID number of @ in your party. - text_far UnknownText_0x1c1261 +.LuckyNumberMatchPartyText: + text_far _LuckyNumberMatchPartyText text_end -.FoundBoxmonText: - ; Congratulations! We have a match with the ID number of @ in your PC BOX. - text_far UnknownText_0x1c12ae +.LuckyNumberMatchPCText: + text_far _LuckyNumberMatchPCText text_end PrintTodaysLuckyNumber: diff --git a/engine/events/magikarp.asm b/engine/events/magikarp.asm index 0c41713dd..2450e8d02 100644 --- a/engine/events/magikarp.asm +++ b/engine/events/magikarp.asm @@ -29,7 +29,7 @@ CheckMagikarpLength: call CalcMagikarpLength call PrintMagikarpLength farcall StubbedTrainerRankings_MagikarpLength - ld hl, .MeasureItText + ld hl, .MagikarpGuruMeasureText call PrintText ; Did we beat the record? @@ -71,9 +71,8 @@ CheckMagikarpLength: ld [wScriptVar], a ret -.MeasureItText: - ; Let me measure that MAGIKARP. …Hm, it measures @ . - text_far UnknownText_0x1c1203 +.MagikarpGuruMeasureText: + text_far _MagikarpGuruMeasureText text_end Magikarp_LoadFeetInchesChars: @@ -307,11 +306,10 @@ MagikarpHouseSign: ld a, [wBestMagikarpLengthInches] ld [wMagikarpLength + 1], a call PrintMagikarpLength - ld hl, .CurrentRecordtext + ld hl, .KarpGuruRecordText call PrintText ret -.CurrentRecordtext: - ; "CURRENT RECORD" - text_far UnknownText_0x1c123a +.KarpGuruRecordText: + text_far _KarpGuruRecordText text_end diff --git a/engine/events/misc_scripts.asm b/engine/events/misc_scripts.asm index 653a9eb35..e90063327 100644 --- a/engine/events/misc_scripts.asm +++ b/engine/events/misc_scripts.asm @@ -11,7 +11,7 @@ FindItemInBallScript:: iffalse .no_room disappear LAST_TALKED opentext - writetext .text_found + writetext .FoundItemText playsound SFX_ITEM pause 60 itemnotify @@ -20,21 +20,19 @@ FindItemInBallScript:: .no_room opentext - writetext .text_found + writetext .FoundItemText waitbutton - writetext .text_bag_full + writetext .CantCarryItemText waitbutton closetext end -.text_found - ; found @ ! - text_far UnknownText_0x1c0a1c +.FoundItemText: + text_far _FoundItemText text_end -.text_bag_full - ; But can't carry any more items. - text_far UnknownText_0x1c0a2c +.CantCarryItemText: + text_far _CantCarryItemText text_end .TryReceiveItem: diff --git a/engine/events/misc_scripts_2.asm b/engine/events/misc_scripts_2.asm index 36e4172a7..4889b30aa 100644 --- a/engine/events/misc_scripts_2.asm +++ b/engine/events/misc_scripts_2.asm @@ -1,12 +1,11 @@ RepelWoreOffScript:: opentext - writetext .text + writetext .RepelWoreOffText waitbutton closetext end -.text - ; REPEL's effect wore off. +.RepelWoreOffText: text_far _RepelWoreOffText text_end @@ -14,7 +13,7 @@ HiddenItemScript:: opentext readmem wHiddenItemID getitemname STRING_BUFFER_3, USE_SCRIPT_VAR - writetext .found_text + writetext .PlayerFoundItemText giveitem ITEM_FROM_MEM iffalse .bag_full callasm SetMemEvent @@ -24,20 +23,18 @@ HiddenItemScript:: .bag_full buttonsound - writetext .no_room_text + writetext .ButNoSpaceText waitbutton .finish closetext end -.found_text - ; found @ ! +.PlayerFoundItemText: text_far _PlayerFoundItemText text_end -.no_room_text - ; But has no space left… +.ButNoSpaceText: text_far _ButNoSpaceText text_end diff --git a/engine/events/mom.asm b/engine/events/mom.asm index 9a3c107e0..5d62a1693 100644 --- a/engine/events/mom.asm +++ b/engine/events/mom.asm @@ -38,8 +38,8 @@ BankOfMom: dw .StoreMoney dw .TakeMoney dw .StopOrStartSavingMoney - dw .AskDST dw .JustDoWhatYouCan + dw .AskDST .CheckIfBankInitialized: ld a, [wMomSavingMoney] @@ -58,11 +58,11 @@ BankOfMom: ret .InitializeBank: - ld hl, UnknownText_0x16649 + ld hl, MomLeavingText1 call PrintText call YesNoBox jr c, .DontSaveMoney - ld hl, UnknownText_0x1664e + ld hl, MomLeavingText2 call PrintText ld a, (1 << MOM_ACTIVE_F) | (1 << MOM_SAVING_SOME_MONEY_F) jr .done_1 @@ -72,14 +72,14 @@ BankOfMom: .done_1 ld [wMomSavingMoney], a - ld hl, UnknownText_0x16653 + ld hl, MomLeavingText3 call PrintText ld a, $8 ld [wJumptableIndex], a ret .IsThisAboutYourMoney: - ld hl, UnknownText_0x16658 + ld hl, MomIsThisAboutYourMoneyText call PrintText call YesNoBox jr c, .nope @@ -95,7 +95,7 @@ BankOfMom: ret .AccessBankOfMom: - ld hl, UnknownText_0x1665d + ld hl, MomBankWhatDoYouWantToDoText call PrintText call LoadStandardMenuHeader ld hl, MenuHeader_0x166b5 @@ -131,7 +131,7 @@ BankOfMom: ret .StoreMoney: - ld hl, UnknownText_0x16662 + ld hl, MomStoreMoneyText call PrintText xor a ld hl, wStringBuffer2 @@ -155,7 +155,7 @@ BankOfMom: ld de, wMoney ld bc, wStringBuffer2 farcall CompareMoney - jr c, .DontHaveThatMuchToDeposit + jr c, .InsufficientFundsInWallet ld hl, wStringBuffer2 ld de, wStringBuffer2 + 3 ld bc, 3 @@ -163,7 +163,7 @@ BankOfMom: ld bc, wMomsMoney ld de, wStringBuffer2 farcall GiveMoney - jr c, .CantDepositThatMuch + jr c, .NotEnoughRoomInBank ld bc, wStringBuffer2 + 3 ld de, wMoney farcall TakeMoney @@ -174,18 +174,18 @@ BankOfMom: ld de, SFX_TRANSACTION call PlaySFX call WaitSFX - ld hl, UnknownText_0x1668a + ld hl, MomStoredMoneyText call PrintText ld a, $8 jr .done_4 -.DontHaveThatMuchToDeposit: - ld hl, UnknownText_0x1667b +.InsufficientFundsInWallet: + ld hl, MomInsufficientFundsInWalletText call PrintText ret -.CantDepositThatMuch: - ld hl, UnknownText_0x16680 +.NotEnoughRoomInBank: + ld hl, MomNotEnoughRoomInBankText call PrintText ret @@ -197,7 +197,7 @@ BankOfMom: ret .TakeMoney: - ld hl, UnknownText_0x16667 + ld hl, MomTakeMoneyText call PrintText xor a ld hl, wStringBuffer2 @@ -240,18 +240,18 @@ BankOfMom: ld de, SFX_TRANSACTION call PlaySFX call WaitSFX - ld hl, UnknownText_0x1668f + ld hl, MomTakenMoneyText call PrintText ld a, $8 jr .done_5 .InsufficientFundsInBank: - ld hl, UnknownText_0x16671 + ld hl, MomHaventSavedThatMuchText call PrintText ret .NotEnoughRoomInWallet: - ld hl, UnknownText_0x16676 + ld hl, MomNotEnoughRoomInWalletText call PrintText ret @@ -263,13 +263,13 @@ BankOfMom: ret .StopOrStartSavingMoney: - ld hl, UnknownText_0x1666c + ld hl, MomSaveMoneyText call PrintText call YesNoBox jr c, .StopSavingMoney ld a, (1 << MOM_ACTIVE_F) | (1 << MOM_SAVING_SOME_MONEY_F) ld [wMomSavingMoney], a - ld hl, UnknownText_0x16685 + ld hl, MomStartSavingMoneyText call PrintText ld a, $8 ld [wJumptableIndex], a @@ -282,11 +282,11 @@ BankOfMom: ld [wJumptableIndex], a ret -.AskDST: - ld hl, UnknownText_0x16694 +.JustDoWhatYouCan: + ld hl, MomJustDoWhatYouCanText call PrintText -.JustDoWhatYouCan: +.AskDST: ld hl, wJumptableIndex set 7, [hl] ret @@ -309,13 +309,13 @@ DSTChecks: .LostBooklet: call .ClearBox bccoord 1, 14 - ld hl, .Text_AdjustClock + ld hl, .TimesetAskAdjustDSTText call PlaceHLTextAtBC call YesNoBox ret c call .ClearBox bccoord 1, 14 - ld hl, .Text_LostInstructionBooklet + ld hl, .MomLostGearBookletText call PlaceHLTextAtBC ret @@ -325,7 +325,7 @@ DSTChecks: ld a, [wDST] bit 7, a jr z, .SetDST - ld hl, .Text_IsDSTOver + ld hl, .TimesetAskNotDSTText call PlaceHLTextAtBC call YesNoBox ret c @@ -335,12 +335,12 @@ DSTChecks: call .SetClockBack call .ClearBox bccoord 1, 14 - ld hl, .Text_SetClockBack + ld hl, .TimesetNotDSTText call PlaceHLTextAtBC ret .SetDST: - ld hl, .Text_SwitchToDST + ld hl, .TimesetAskDSTText call PlaceHLTextAtBC call YesNoBox ret c @@ -350,7 +350,7 @@ DSTChecks: call .SetClockForward call .ClearBox bccoord 1, 14 - ld hl, .Text_SetClockForward + ld hl, .TimesetDSTText call PlaceHLTextAtBC ret @@ -389,35 +389,28 @@ DSTChecks: call ClearBox ret -.Text_AdjustClock: - ; Do you want to adjust your clock for Daylight Saving Time? - text_far UnknownText_0x1c6095 +.TimesetAskAdjustDSTText: + text_far _TimesetAskAdjustDSTText text_end -.Text_LostInstructionBooklet: - ; I lost the instruction booklet for the POKéGEAR. - ; Come back again in a while. - text_far UnknownText_0x1c60d1 +.MomLostGearBookletText: + text_far _MomLostGearBookletText text_end -.Text_SwitchToDST: - ; Do you want to switch to Daylight Saving Time? - text_far UnknownText_0x1c6000 +.TimesetAskDSTText: + text_far _TimesetAskDSTText text_end -.Text_SetClockForward: - ; I set the clock forward by one hour. - text_far UnknownText_0x1c6030 +.TimesetDSTText: + text_far _TimesetDSTText text_end -.Text_IsDSTOver: - ; Is Daylight Saving Time over? - text_far UnknownText_0x1c6056 +.TimesetAskNotDSTText: + text_far _TimesetAskNotDSTText text_end -.Text_SetClockBack: - ; I put the clock back one hour. - text_far UnknownText_0x1c6075 +.TimesetNotDSTText: + text_far _TimesetNotDSTText text_end Mom_SetUpWithdrawMenu: @@ -590,84 +583,68 @@ Mom_WithdrawDepositMenuJoypad: dt 90 dt 9 -UnknownText_0x16649: - ; Wow, that's a cute #MON. Where did you get it? … So, you're leaving on an adventure… OK! I'll help too. But what can I do for you? I know! I'll save money for you. On a long journey, money's important. Do you want me to save your money? +MomLeavingText1: text_far _MomLeavingText1 text_end -UnknownText_0x1664e: - ; OK, I'll take care of your money. +MomLeavingText2: text_far _MomLeavingText2 text_end -UnknownText_0x16653: - ; Be careful. #MON are your friends. You need to work as a team. Now, go on! +MomLeavingText3: text_far _MomLeavingText3 text_end -UnknownText_0x16658: - ; Hi! Welcome home! You're trying very hard, I see. I've kept your room tidy. Or is this about your money? - text_far _MomVisitingText1 +MomIsThisAboutYourMoneyText: + text_far _MomIsThisAboutYourMoneyText text_end -UnknownText_0x1665d: - ; What do you want to do? - text_far _MomVisitingText2 +MomBankWhatDoYouWantToDoText: + text_far _MomBankWhatDoYouWantToDoText text_end -UnknownText_0x16662: - ; How much do you want to save? - text_far _MomVisitingText3 +MomStoreMoneyText: + text_far _MomStoreMoneyText text_end -UnknownText_0x16667: - ; How much do you want to take? - text_far _MomVisitingText4 +MomTakeMoneyText: + text_far _MomTakeMoneyText text_end -UnknownText_0x1666c: - ; Do you want to save some money? - text_far _MomVisitingText5 +MomSaveMoneyText: + text_far _MomSaveMoneyText text_end -UnknownText_0x16671: - ; You haven't saved that much. - text_far _MomVisitingText6 +MomHaventSavedThatMuchText: + text_far _MomHaventSavedThatMuchText text_end -UnknownText_0x16676: - ; You can't take that much. - text_far _MomVisitingText7 +MomNotEnoughRoomInWalletText: + text_far _MomNotEnoughRoomInWalletText text_end -UnknownText_0x1667b: - ; You don't have that much. - text_far _MomVisitingText8 +MomInsufficientFundsInWalletText: + text_far _MomInsufficientFundsInWalletText text_end -UnknownText_0x16680: - ; You can't save that much. - text_far _MomVisitingText9 +MomNotEnoughRoomInBankText: + text_far _MomNotEnoughRoomInBankText text_end -UnknownText_0x16685: - ; OK, I'll save your money. Trust me! , stick with it! - text_far _MomVisitingText10 +MomStartSavingMoneyText: + text_far _MomStartSavingMoneyText text_end -UnknownText_0x1668a: - ; Your money's safe here! Get going! - text_far _MomVisitingText11 +MomStoredMoneyText: + text_far _MomStoredMoneyText text_end -UnknownText_0x1668f: - ; , don't give up! - text_far _MomVisitingText12 +MomTakenMoneyText: + text_far _MomTakenMoneyText text_end -UnknownText_0x16694: - ; Just do what you can. - text_far _MomVisitingText13 +MomJustDoWhatYouCanText: + text_far _MomJustDoWhatYouCanText text_end Mom_SavedString: diff --git a/engine/events/mom_phone.asm b/engine/events/mom_phone.asm index 052082395..aa26fd5c0 100644 --- a/engine/events/mom_phone.asm +++ b/engine/events/mom_phone.asm @@ -163,17 +163,17 @@ Mom_GetScriptPointer: ret .ItemScript: - writetext _MomText_HiHowAreYou - writetext _MomText_FoundAnItem - writetext _MomText_BoughtWithYourMoney - writetext _MomText_ItsInPC + writetext MomHiHowAreYouText + writetext MomFoundAnItemText + writetext MomBoughtWithYourMoneyText + writetext MomItsInPCText end .DollScript: - writetext _MomText_HiHowAreYou - writetext _MomText_FoundADoll - writetext _MomText_BoughtWithYourMoney - writetext _MomText_ItsInRoom + writetext MomHiHowAreYouText + writetext MomFoundADollText + writetext MomBoughtWithYourMoneyText + writetext MomItsInYourRoomText end GetItemFromMom: @@ -206,34 +206,28 @@ INCLUDE "data/items/mom_phone.asm" db 0, 0, 0 ; unused -_MomText_HiHowAreYou: - ; Hi, ! How are you? - text_far _MomShoppingText1 +MomHiHowAreYouText: + text_far _MomHiHowAreYouText text_end -_MomText_FoundAnItem: - ; I found a useful item shopping, so - text_far _MomShoppingText2 +MomFoundAnItemText: + text_far _MomFoundAnItemText text_end -_MomText_BoughtWithYourMoney: - ; I bought it with your money. Sorry! - text_far _MomShoppingText3 +MomBoughtWithYourMoneyText: + text_far _MomBoughtWithYourMoneyText text_end -_MomText_ItsInPC: - ; It's in your PC. You'll like it! - text_far _MomShoppingText4 +MomItsInPCText: + text_far _MomItsInPCText text_end -_MomText_FoundADoll: - ; While shopping today, I saw this adorable doll, so - text_far _MomShoppingText5 +MomFoundADollText: + text_far _MomFoundADollText text_end -_MomText_ItsInRoom: - ; It's in your room. You'll love it! - text_far _MomShoppingText6 +MomItsInYourRoomText: + text_far _MomItsInYourRoomText text_end db 0 ; unused diff --git a/engine/events/move_deleter.asm b/engine/events/move_deleter.asm index 7860ab3ae..f9f83fab6 100644 --- a/engine/events/move_deleter.asm +++ b/engine/events/move_deleter.asm @@ -1,9 +1,9 @@ MoveDeletion: - ld hl, .IntroText + ld hl, .DeleterIntroText call PrintText call YesNoBox jr c, .declined - ld hl, .AskWhichMonText + ld hl, .DeleterAskWhichMonText call PrintText farcall SelectMonFromParty jr c, .declined @@ -17,7 +17,7 @@ MoveDeletion: ld a, [hl] and a jr z, .onlyonemove - ld hl, .AskWhichMoveText + ld hl, .DeleterAskWhichMoveText call PrintText call LoadStandardMenuHeader farcall ChooseMoveToDelete @@ -30,7 +30,7 @@ MoveDeletion: ld a, [wCurSpecies] ld [wNamedObjectIndexBuffer], a call GetMoveName - ld hl, .ConfirmDeleteText + ld hl, .AskDeleteMoveText call PrintText call YesNoBox pop bc @@ -40,63 +40,55 @@ MoveDeletion: ld de, SFX_MOVE_DELETED call PlaySFX call WaitSFX - ld hl, .MoveDeletedText + ld hl, .DeleterForgotMoveText call PrintText ret .egg - ld hl, .EggText + ld hl, .MailEggText call PrintText ret .declined - ld hl, .DeclinedDeletionText + ld hl, .DeleterNoComeAgainText call PrintText ret .onlyonemove - ld hl, .OnlyOneMoveText + ld hl, .MoveKnowsOneText call PrintText ret -.OnlyOneMoveText: - ; That #MON knows only one move. - text_far UnknownText_0x1c5eba +.MoveKnowsOneText: + text_far _MoveKnowsOneText text_end -.ConfirmDeleteText: - ; Oh, make it forget @ ? - text_far UnknownText_0x1c5eda +.AskDeleteMoveText: + text_far _AskDeleteMoveText text_end -.MoveDeletedText: - ; Done! Your #MON forgot the move. - text_far UnknownText_0x1c5ef5 +.DeleterForgotMoveText: + text_far _DeleterForgotMoveText text_end -.EggText: - ; An EGG doesn't know any moves! - text_far UnknownText_0x1c5f17 +.MailEggText: + text_far _DeleterEggText text_end -.DeclinedDeletionText: - ; No? Come visit me again. - text_far UnknownText_0x1c5f36 +.DeleterNoComeAgainText: + text_far _DeleterNoComeAgainText text_end -.AskWhichMoveText: - ; Which move should it forget, then? - text_far UnknownText_0x1c5f50 +.DeleterAskWhichMoveText: + text_far _DeleterAskWhichMoveText text_end -.IntroText: - ; Um… Oh, yes, I'm the MOVE DELETER. I can make #MON forget moves. Shall I make a #MON forget? - text_far UnknownText_0x1c5f74 +.DeleterIntroText: + text_far _DeleterIntroText text_end -.AskWhichMonText: - ; Which #MON? - text_far UnknownText_0x1c5fd1 +.DeleterAskWhichMonText: + text_far _DeleterAskWhichMonText text_end .DeleteMove: diff --git a/engine/events/move_tutor.asm b/engine/events/move_tutor.asm index 681dc6adc..8f1640a4f 100644 --- a/engine/events/move_tutor.asm +++ b/engine/events/move_tutor.asm @@ -70,8 +70,8 @@ CheckCanLearnMoveTutorMove: ld de, SFX_WRONG call PlaySFX pop de - ld a, BANK(Text_TMHMNotCompatible) - ld hl, Text_TMHMNotCompatible + ld a, BANK(TMHMNotCompatibleText) + ld hl, TMHMNotCompatibleText call FarPrintText jr .didnt_learn diff --git a/engine/events/name_rater.asm b/engine/events/name_rater.asm index f3a443de4..e2b24c4c7 100644 --- a/engine/events/name_rater.asm +++ b/engine/events/name_rater.asm @@ -1,6 +1,6 @@ _NameRater: ; Introduce himself - ld hl, NameRaterIntroText + ld hl, NameRaterHelloText call PrintText call YesNoBox jp c, .cancel @@ -18,12 +18,12 @@ _NameRater: call CheckIfMonIsYourOT jr c, .traded ; This name is good, but we can do better. How about it? - ld hl, NameRaterIsGoodText + ld hl, NameRaterBetterNameText call PrintText call YesNoBox jr c, .cancel ; What name shall I give it then? - ld hl, NameRaterWhichNameText + ld hl, NameRaterWhatNameText call PrintText ; Load the new nickname into wStringBuffer2 xor a ; PARTYMON @@ -37,11 +37,11 @@ _NameRater: farcall _NamingScreen ; If the new name is empty, treat it as unchanged. call IsNewNameEmpty - ld hl, NameRaterSameAsBeforeText + ld hl, NameRaterSameNameText jr c, .samename ; If the new name is the same as the old name, treat it as unchanged. call CompareNewToOld - ld hl, NameRaterSameAsBeforeText + ld hl, NameRaterSameNameText jr c, .samename ; Copy the new name from wStringBuffer2 ld hl, wPartyMonNicknames @@ -53,22 +53,22 @@ _NameRater: ld hl, wStringBuffer2 ld bc, MON_NAME_LENGTH call CopyBytes - ld hl, NameRaterEvenBetterText + ld hl, NameRaterFinishedText .samename push hl call GetCurNick - ld hl, NameRaterDoneText + ld hl, NameRaterNamedText call PrintText pop hl jr .done .traded - ld hl, NameRaterTradedText + ld hl, NameRaterPerfectNameText jr .done .cancel - ld hl, NameRaterCancelText + ld hl, NameRaterComeAgainText jr .done .egg @@ -178,58 +178,42 @@ GetNicknameLength: jr nz, .loop ret -NameRaterIntroText: - ; Hello, hello! I'm the NAME RATER. - ; I rate the names of #MON. - ; Would you like me to rate names? - text_far UnknownText_0x1c0043 +NameRaterHelloText: + text_far _NameRaterHelloText text_end NameRaterWhichMonText: - ; Which #MON's nickname should I rate for you? - text_far UnknownText_0x1c00a0 + text_far _NameRaterWhichMonText text_end -NameRaterIsGoodText: - ; Hm… @ … That's a fairly decent name. - ; But, how about a slightly better nickname? - ; Want me to give it a better name? - text_far UnknownText_0x1c00cd +NameRaterBetterNameText: + text_far _NameRaterBetterNameText text_end -NameRaterWhichNameText: - ; All right. What name should we give it, then? - text_far UnknownText_0x1c0142 +NameRaterWhatNameText: + text_far _NameRaterWhatNameText text_end -NameRaterEvenBetterText: - ; That's a better name than before! Well done! - text_far UnknownText_0x1c0171 +NameRaterFinishedText: + text_far _NameRaterFinishedText text_end -NameRaterCancelText: - ; OK, then. Come again sometime. - text_far UnknownText_0x1c019e +NameRaterComeAgainText: + text_far _NameRaterComeAgainText text_end -NameRaterTradedText: - ; Hm… @ ? What a great name! It's perfect. - ; Treat @ with loving care. - text_far UnknownText_0x1c01be +NameRaterPerfectNameText: + text_far _NameRaterPerfectNameText text_end NameRaterEggText: - ; Whoa… That's just an EGG. - text_far UnknownText_0x1c0208 + text_far _NameRaterEggText text_end -NameRaterSameAsBeforeText: - ; It might look the different as before, - ; but this new name is much better! Well done! - text_far UnknownText_0x1c0222 +NameRaterSameNameText: + text_far _NameRaterSameNameText text_end -NameRaterDoneText: - ; All right. This #MON is now named @ . - text_far UnknownText_0x1c0272 +NameRaterNamedText: + text_far _NameRaterNamedText text_end diff --git a/engine/events/npc_trade.asm b/engine/events/npc_trade.asm index 19ed72a4b..a14a102cf 100644 --- a/engine/events/npc_trade.asm +++ b/engine/events/npc_trade.asm @@ -34,7 +34,7 @@ NPCTrade:: ld b, SET_FLAG call TradeFlagAction - ld hl, ConnectLinkCableText + ld hl, NPCTradeCableText call PrintText call DoNPCTrade @@ -405,39 +405,38 @@ PrintTradeText: TradeTexts: ; entries correspond to TRADE_DIALOG_* × TRADE_DIALOGSET_* constants ; TRADE_DIALOG_INTRO - dw TradeIntroText1 - dw TradeIntroText2 - dw TradeIntroText3 - dw TradeIntroText4 + dw NPCTradeIntroText1 + dw NPCTradeIntroText2 + dw NPCTradeIntroText2 + dw NPCTradeIntroText3 ; TRADE_DIALOG_CANCEL - dw TradeCancelText1 - dw TradeCancelText2 - dw TradeCancelText3 - dw TradeCancelText4 + dw NPCTradeCancelText1 + dw NPCTradeCancelText2 + dw NPCTradeCancelText2 + dw NPCTradeCancelText3 ; TRADE_DIALOG_WRONG - dw TradeWrongText1 - dw TradeWrongText2 - dw TradeWrongText3 - dw TradeWrongText4 + dw NPCTradeWrongText1 + dw NPCTradeWrongText2 + dw NPCTradeWrongText2 + dw NPCTradeWrongText3 ; TRADE_DIALOG_COMPLETE - dw TradeCompleteText1 - dw TradeCompleteText2 - dw TradeCompleteText3 - dw TradeCompleteText4 + dw NPCTradeCompleteText1 + dw NPCTradeCompleteText2 + dw NPCTradeCompleteText4 + dw NPCTradeCompleteText3 ; TRADE_DIALOG_AFTER - dw TradeAfterText1 - dw TradeAfterText2 - dw TradeAfterText3 - dw TradeAfterText4 - -ConnectLinkCableText: - ; OK, connect the Game Link Cable. - text_far UnknownText_0x1bd407 + dw NPCTradeAfterText1 + dw NPCTradeAfterText2 + dw NPCTradeAfterText4 + dw NPCTradeAfterText3 + +NPCTradeCableText: + text_far _NPCTradeCableText text_end TradedForText: ; traded givemon for getmon - text_far UnknownText_0x1bd429 + text_far Text_NPCTraded text_asm ld de, MUSIC_NONE call PlayMusic @@ -446,95 +445,73 @@ TradedForText: ret .done - ; sound_dex_fanfare_80_109 - ; text_pause - text_far UnknownText_0x1bd445 + text_far _NPCTradeFanfareText text_end -TradeIntroText1: - ; I collect #MON. Do you have @ ? Want to trade it for my @ ? +NPCTradeIntroText1: text_far _NPCTradeIntroText1 text_end -TradeCancelText1: - ; You don't want to trade? Aww… +NPCTradeCancelText1: text_far _NPCTradeCancelText1 text_end -TradeWrongText1: - ; Huh? That's not @ . What a letdown… +NPCTradeWrongText1: text_far _NPCTradeWrongText1 text_end -TradeCompleteText1: - ; Yay! I got myself @ ! Thanks! +NPCTradeCompleteText1: text_far _NPCTradeCompleteText1 text_end -TradeAfterText1: - ; Hi, how's my old @ doing? - text_far _NPCTradeAFterText1 +NPCTradeAfterText1: + text_far _NPCTradeAfterText1 text_end -TradeIntroText2: -TradeIntroText3: - ; Hi, I'm looking for this #MON. If you have @ , would you trade it for my @ ? +NPCTradeIntroText2: text_far _NPCTradeIntroText2 text_end -TradeCancelText2: -TradeCancelText3: - ; You don't have one either? Gee, that's really disappointing… +NPCTradeCancelText2: text_far _NPCTradeCancelText2 text_end -TradeWrongText2: -TradeWrongText3: - ; You don't have @ ? That's too bad, then. +NPCTradeWrongText2: text_far _NPCTradeWrongText2 text_end -TradeCompleteText2: - ; Great! Thank you! I finally got @ . +NPCTradeCompleteText2: text_far _NPCTradeCompleteText2 text_end -TradeAfterText2: - ; Hi! The @ you traded me is doing great! +NPCTradeAfterText2: text_far _NPCTradeAfterText2 text_end -TradeIntroText4: - ; 's cute, but I don't have it. Do you have @ ? Want to trade it for my @ ? +NPCTradeIntroText3: text_far _NPCTradeIntroText3 text_end -TradeCancelText4: - ; You don't want to trade? Oh, darn… +NPCTradeCancelText3: text_far _NPCTradeCancelText3 text_end -TradeWrongText4: - ; That's not @ . Please trade with me if you get one. +NPCTradeWrongText3: text_far _NPCTradeWrongText3 text_end -TradeCompleteText4: - ; Wow! Thank you! I always wanted @ ! +NPCTradeCompleteText3: text_far _NPCTradeCompleteText3 text_end -TradeAfterText4: - ; How is that @ I traded you doing? Your @ 's so cute! +NPCTradeAfterText3: text_far _NPCTradeAfterText3 text_end -TradeCompleteText3: - ; Uh? What happened? +NPCTradeCompleteText4: text_far _NPCTradeCompleteText4 text_end -TradeAfterText3: - ; Trading is so odd… I still have a lot to learn about it. +NPCTradeAfterText4: text_far _NPCTradeAfterText4 text_end diff --git a/engine/events/overworld.asm b/engine/events/overworld.asm index e74bdf0aa..055a5ca9d 100644 --- a/engine/events/overworld.asm +++ b/engine/events/overworld.asm @@ -58,8 +58,6 @@ CheckBadge: ret .BadgeRequiredText: - ; Sorry! A new BADGE - ; is required. text_far _BadgeRequiredText text_end @@ -108,13 +106,12 @@ CheckPartyMove: ret FieldMoveFailed: - ld hl, .CantUseHere + ld hl, .CantUseItemText call MenuTextboxBackup ret -.CantUseHere: - ; Can't use that here. - text_far UnknownText_0x1c05c8 +.CantUseItemText: + text_far _CantUseItemText text_end CutFunction: @@ -156,19 +153,17 @@ CutFunction: ret .FailCut: - ld hl, Text_NothingToCut + ld hl, CutNothingText call MenuTextboxBackup ld a, $80 ret -Text_UsedCut: - ; used CUT! - text_far UnknownText_0x1c05dd +UseCutText: + text_far _UseCutText text_end -Text_NothingToCut: - ; There's nothing to CUT here. - text_far UnknownText_0x1c05ec +CutNothingText: + text_far _CutNothingText text_end CheckMapForSomethingToCut: @@ -212,7 +207,7 @@ Script_CutFromMenu: Script_Cut: callasm GetPartyNick - writetext Text_UsedCut + writetext UseCutText reloadmappart callasm CutDownTreeOrGrass closetext @@ -317,13 +312,13 @@ UseFlash: Script_UseFlash: reloadmappart special UpdateTimePals - writetext UnknownText_0xc8f3 + writetext UseFlashTextScript callasm BlindingFlash closetext end -UnknownText_0xc8f3: - text_far UnknownText_0x1c0609 +UseFlashTextScript: + text_far _BlindingFlashText text_asm call WaitSFX ld de, SFX_FLASH @@ -545,7 +540,6 @@ AskSurfScript: end AskSurfText: - ; The water is calm. Want to SURF? text_far _AskSurfText text_end @@ -683,7 +677,7 @@ Script_WaterfallFromMenu: Script_UsedWaterfall: callasm GetPartyNick - writetext .Text_UsedWaterfall + writetext .UseWaterfallText waitbutton closetext playsound SFX_BUBBLEBEAM @@ -708,9 +702,8 @@ Script_UsedWaterfall: turn_waterfall UP step_end -.Text_UsedWaterfall: - ; used WATERFALL! - text_far UnknownText_0x1c068e +.UseWaterfallText: + text_far _UseWaterfallText text_end TryWaterfallOW:: @@ -736,24 +729,22 @@ TryWaterfallOW:: ret Script_CantDoWaterfall: - jumptext .Text_CantDoWaterfall + jumptext .HugeWaterfallText -.Text_CantDoWaterfall: - ; Wow, it's a huge waterfall. - text_far UnknownText_0x1c06a3 +.HugeWaterfallText: + text_far _HugeWaterfallText text_end Script_AskWaterfall: opentext - writetext .AskUseWaterfall + writetext .AskWaterfallText yesorno iftrue Script_UsedWaterfall closetext end -.AskUseWaterfall: - ; Do you want to use WATERFALL? - text_far UnknownText_0x1c06bf +.AskWaterfallText: + text_far _AskWaterfallText text_end EscapeRopeFunction: @@ -829,7 +820,7 @@ dig_incave ld a, [wBuffer2] cp $2 jr nz, .failescaperope - ld hl, .Text_CantUseHere + ld hl, .CantUseDigText call MenuTextbox call WaitPressAorB_BlinkCursor call CloseWindow @@ -838,31 +829,28 @@ dig_incave ld a, $80 ret -.Text_UsedDig: - ; used DIG! - text_far UnknownText_0x1c06de +.UseDigText: + text_far _UseDigText text_end -.Text_UsedEscapeRope: - ; used an ESCAPE ROPE. - text_far UnknownText_0x1c06ed +.UseEscapeRopeText: + text_far _UseEscapeRopeText text_end -.Text_CantUseHere: - ; Can't use that here. - text_far UnknownText_0x1c0705 +.CantUseDigText: + text_far _CantUseDigText text_end .UsedEscapeRopeScript: reloadmappart special UpdateTimePals - writetext .Text_UsedEscapeRope + writetext .UseEscapeRopeText sjump .UsedDigOrEscapeRopeScript .UsedDigScript: reloadmappart special UpdateTimePals - writetext .Text_UsedDig + writetext .UseDigText .UsedDigOrEscapeRopeScript: waitbutton @@ -932,25 +920,23 @@ TeleportFunction: ret .FailTeleport: - ld hl, .Text_CantUseHere + ld hl, .CantUseTeleportText call MenuTextboxBackup ld a, $80 ret -.Text_ReturnToLastMonCenter: - ; Return to the last #MON CENTER. - text_far UnknownText_0x1c071a +.TeleportReturnText: + text_far _TeleportReturnText text_end -.Text_CantUseHere: - ; Can't use that here. - text_far UnknownText_0x1c073b +.CantUseTeleportText: + text_far _CantUseTeleportText text_end .TeleportScript: reloadmappart special UpdateTimePals - writetext .Text_ReturnToLastMonCenter + writetext .TeleportReturnText pause 60 reloadmappart closetext @@ -986,13 +972,13 @@ StrengthFunction: jr .UseStrength .Unreferenced_AlreadyUsing: - ld hl, .JumpText + ld hl, .AlreadyUsingStrengthText call MenuTextboxBackup ld a, $80 ret -.JumpText: - text_far UnknownText_0x1c0751 +.AlreadyUsingStrengthText: + text_far _AlreadyUsingStrengthText text_end .Failed: @@ -1024,20 +1010,20 @@ Script_StrengthFromMenu: Script_UsedStrength: callasm SetStrengthFlag - writetext .UsedStrength + writetext .UseStrengthText readmem wBuffer6 cry 0 pause 3 - writetext .StrengthAllowedItToMoveBoulders + writetext .MoveBoulderText closetext end -.UsedStrength: - text_far UnknownText_0x1c0774 +.UseStrengthText: + text_far _UseStrengthText text_end -.StrengthAllowedItToMoveBoulders: - text_far UnknownText_0x1c0788 +.MoveBoulderText: + text_far _MoveBoulderText text_end AskStrengthScript: @@ -1047,32 +1033,29 @@ AskStrengthScript: sjump .AlreadyUsedStrength .DontMeetRequirements: - jumptext UnknownText_0xcd73 + jumptext BouldersMayMoveText .AlreadyUsedStrength: - jumptext UnknownText_0xcd6e + jumptext BouldersMoveText .AskStrength: opentext - writetext UnknownText_0xcd69 + writetext AskStrengthText yesorno iftrue Script_UsedStrength closetext end -UnknownText_0xcd69: - ; A #MON may be able to move this. Want to use STRENGTH? - text_far UnknownText_0x1c07a0 +AskStrengthText: + text_far _AskStrengthText text_end -UnknownText_0xcd6e: - ; Boulders may now be moved! - text_far UnknownText_0x1c07d8 +BouldersMoveText: + text_far _BouldersMoveText text_end -UnknownText_0xcd73: - ; A #MON may be able to move this. - text_far UnknownText_0x1c07f4 +BouldersMayMoveText: + text_far _BouldersMayMoveText text_end TryStrengthOW: @@ -1146,9 +1129,8 @@ Jumptable_cdae: ld a, $80 ret -Text_UsedWhirlpool: - ; used WHIRLPOOL! - text_far UnknownText_0x1c0816 +UseWhirlpoolText: + text_far _UseWhirlpoolText text_end TryWhirlpoolMenu: @@ -1186,7 +1168,7 @@ Script_WhirlpoolFromMenu: Script_UsedWhirlpool: callasm GetPartyNick - writetext Text_UsedWhirlpool + writetext UseWhirlpoolText reloadmappart callasm DisappearWhirlpool closetext @@ -1232,22 +1214,22 @@ TryWhirlpoolOW:: ret Script_MightyWhirlpool: - jumptext .MightyWhirlpoolText + jumptext .MayPassWhirlpoolText -.MightyWhirlpoolText: - text_far UnknownText_0x1c082b +.MayPassWhirlpoolText: + text_far _MayPassWhirlpoolText text_end Script_AskWhirlpoolOW: opentext - writetext UnknownText_0xce78 + writetext AskWhirlpoolText yesorno iftrue Script_UsedWhirlpool closetext end -UnknownText_0xce78: - text_far UnknownText_0x1c0864 +AskWhirlpoolText: + text_far _AskWhirlpoolText text_end HeadbuttFunction: @@ -1271,14 +1253,12 @@ TryHeadbuttFromMenu: ld a, $80 ret -UnknownText_0xce9d: - ; did a HEADBUTT! - text_far UnknownText_0x1c0897 +UseHeadbuttText: + text_far _UseHeadbuttText text_end -UnknownText_0xcea2: - ; Nope. Nothing… - text_far UnknownText_0x1c08ac +HeadbuttNothingText: + text_far _HeadbuttNothingText text_end HeadbuttFromMenuScript: @@ -1287,7 +1267,7 @@ HeadbuttFromMenuScript: HeadbuttScript: callasm GetPartyNick - writetext UnknownText_0xce9d + writetext UseHeadbuttText reloadmappart callasm ShakeHeadbuttTree @@ -1301,7 +1281,7 @@ HeadbuttScript: end .no_battle - writetext UnknownText_0xcea2 + writetext HeadbuttNothingText waitbutton closetext end @@ -1323,15 +1303,14 @@ TryHeadbuttOW:: AskHeadbuttScript: opentext - writetext UnknownText_0xcee6 + writetext AskHeadbuttText yesorno iftrue HeadbuttScript closetext end -UnknownText_0xcee6: - ; A #MON could be in this tree. Want to HEADBUTT it? - text_far UnknownText_0x1c08bc +AskHeadbuttText: + text_far _AskHeadbuttText text_end RockSmashFunction: @@ -1385,7 +1364,7 @@ RockSmashFromMenuScript: RockSmashScript: callasm GetPartyNick - writetext UnknownText_0xcf58 + writetext UseRockSmashText closetext special WaitSFX playsound SFX_STRENGTH @@ -1406,8 +1385,8 @@ MovementData_0xcf55: rock_smash 10 step_end -UnknownText_0xcf58: - text_far UnknownText_0x1c08f0 +UseRockSmashText: + text_far _UseRockSmashText text_end AskRockSmashScript: @@ -1415,22 +1394,20 @@ AskRockSmashScript: ifequal 1, .no opentext - writetext UnknownText_0xcf77 + writetext AskRockSmashText yesorno iftrue RockSmashScript closetext end .no - jumptext UnknownText_0xcf72 + jumptext MaySmashText -UnknownText_0xcf72: - ; Maybe a #MON can break this. - text_far UnknownText_0x1c0906 +MaySmashText: + text_far _MaySmashText text_end -UnknownText_0xcf77: - ; This rock looks breakable. Want to use ROCK SMASH? - text_far UnknownText_0x1c0924 +AskRockSmashText: + text_far _AskRockSmashText text_end HasRockSmash: @@ -1539,12 +1516,12 @@ FishFunction: Script_NotEvenANibble: scall Script_FishCastRod - writetext UnknownText_0xd0a9 + writetext RodNothingText sjump Script_NotEvenANibble_FallThrough Script_NotEvenANibble2: scall Script_FishCastRod - writetext UnknownText_0xd0a9 + writetext RodNothingText Script_NotEvenANibble_FallThrough: loademote EMOTE_SHADOW @@ -1565,7 +1542,7 @@ Script_GotABite: .FightTheHookedPokemon: pause 40 applymovement PLAYER, .Movement_RestoreRod - writetext UnknownText_0xd0a4 + writetext RodBiteText callasm PutTheRodAway closetext randomwildmon @@ -1631,19 +1608,16 @@ PutTheRodAway: call ReplaceKrisSprite ret -UnknownText_0xd0a4: - ; Oh! A bite! - text_far UnknownText_0x1c0958 +RodBiteText: + text_far _RodBiteText text_end -UnknownText_0xd0a9: - ; Not even a nibble! - text_far UnknownText_0x1c0965 +RodNothingText: + text_far _RodNothingText text_end -UnknownText_0xd0ae: ; unused - ; Looks like there's nothing here. - text_far UnknownText_0x1c0979 +UnusedNothingHereText: ; unused + text_far _UnusedNothingHereText text_end BikeFunction: @@ -1736,7 +1710,7 @@ Script_GetOnBike: reloadmappart special UpdateTimePals loadvar VAR_MOVEMENT, PLAYER_BIKE - writetext GotOnTheBikeText + writetext GotOnBikeText waitbutton closetext special ReplaceKrisSprite @@ -1756,7 +1730,7 @@ Script_GetOffBike: reloadmappart special UpdateTimePals loadvar VAR_MOVEMENT, PLAYER_NORMAL - writetext GotOffTheBikeText + writetext GotOffBikeText waitbutton FinishGettingOffBike: @@ -1776,18 +1750,15 @@ Script_CantGetOffBike: end .CantGetOffBikeText: - ; You can't get off here! - text_far UnknownText_0x1c099a + text_far _CantGetOffBikeText text_end -GotOnTheBikeText: - ; got on the @ . - text_far UnknownText_0x1c09b2 +GotOnBikeText: + text_far _GotOnBikeText text_end -GotOffTheBikeText: - ; got off the @ . - text_far UnknownText_0x1c09c7 +GotOffBikeText: + text_far _GotOffBikeText text_end TryCutOW:: @@ -1814,7 +1785,7 @@ TryCutOW:: AskCutScript: opentext - writetext UnknownText_0xd1c8 + writetext AskCutText yesorno iffalse .script_d1b8 callasm .CheckMap @@ -1832,13 +1803,13 @@ AskCutScript: ld [wScriptVar], a ret -UnknownText_0xd1c8: - text_far UnknownText_0x1c09dd +AskCutText: + text_far _AskCutText text_end CantCutScript: - jumptext UnknownText_0xd1d0 + jumptext CanCutText -UnknownText_0xd1d0: - text_far UnknownText_0x1c0a05 +CanCutText: + text_far _CanCutText text_end diff --git a/engine/events/poisonstep.asm b/engine/events/poisonstep.asm index 70da92f13..98a6e25a1 100644 --- a/engine/events/poisonstep.asm +++ b/engine/events/poisonstep.asm @@ -146,9 +146,9 @@ DoPoisonStep:: ret .PoisonFaintText: - text_far UnknownText_0x1c0acc + text_far _PoisonFaintText text_end -.PoisonWhiteOutText: - text_far UnknownText_0x1c0ada +.PoisonWhiteoutText: + text_far _PoisonWhiteoutText text_end diff --git a/engine/events/poke_seer.asm b/engine/events/poke_seer.asm index db8d2beab..80d055111 100644 --- a/engine/events/poke_seer.asm +++ b/engine/events/poke_seer.asm @@ -287,53 +287,45 @@ PrintSeerText: ret SeerTexts: - dw SeerIntroText - dw SeerCantTellText - dw SeerMetAtText + dw SeerSeeAllText + dw SeerCantTellAThingText + dw SeerNameLocationText dw SeerTimeLevelText - dw SeerTradedText - dw SeerCancelText + dw SeerTradeText + dw SeerDoNothingText dw SeerEggText - dw SeerLevelOnlyText + dw SeerNoLocationText -SeerIntroText: - ; I see all. I know all… Certainly, I know of your #MON! - text_far UnknownText_0x1c475f +SeerSeeAllText: + text_far _SeerSeeAllText text_end -SeerCantTellText: - ; Whaaaat? I can't tell a thing! How could I not know of this? - text_far UnknownText_0x1c4797 +SeerCantTellAThingText: + text_far _SeerCantTellAThingText text_end -SeerMetAtText: - ; Hm… I see you met @ here: @ ! - text_far UnknownText_0x1c47d4 +SeerNameLocationText: + text_far _SeerNameLocationText text_end SeerTimeLevelText: - ; The time was @ ! Its level was @ ! Am I good or what? - text_far UnknownText_0x1c47fa + text_far _SeerTimeLevelText text_end -SeerTradedText: - ; Hm… @ came from @ in a trade? @ was where @ met @ ! - text_far UnknownText_0x1c4837 +SeerTradeText: + text_far _SeerTradeText text_end -SeerLevelOnlyText: - ; What!? Incredible! I don't understand how, but it is incredible! You are special. I can't tell where you met it, but it was at level @ . Am I good or what? - text_far UnknownText_0x1c487f +SeerNoLocationText: + text_far _SeerNoLocationText text_end SeerEggText: - ; Hey! That's an EGG! You can't say that you've met it yet… - text_far UnknownText_0x1c491d + text_far _SeerEggText text_end -SeerCancelText: - ; Fufufu! I saw that you'd do nothing! - text_far UnknownText_0x1c4955 +SeerDoNothingText: + text_far _SeerDoNothingText text_end SeerAdvice: @@ -364,36 +356,31 @@ SeerAdvice: SeerAdviceTexts: ; level, text - dbw 9, SeerAdvice1 - dbw 29, SeerAdvice2 - dbw 59, SeerAdvice3 - dbw 89, SeerAdvice4 - dbw 100, SeerAdvice5 - dbw 255, SeerAdvice1 - -SeerAdvice1: - ; Incidentally… It would be wise to raise your #MON with a little more care. - text_far UnknownText_0x1c497a + dbw 9, SeerMoreCareText + dbw 29, SeerMoreConfidentText + dbw 59, SeerMuchStrengthText + dbw 89, SeerMightyText + dbw 100, SeerImpressedText + dbw 255, SeerMoreCareText + +SeerMoreCareText: + text_far _SeerMoreCareText text_end -SeerAdvice2: - ; Incidentally… It seems to have grown a little. @ seems to be becoming more confident. - text_far UnknownText_0x1c49c6 +SeerMoreConfidentText: + text_far _SeerMoreConfidentText text_end -SeerAdvice3: - ; Incidentally… @ has grown. It's gained much strength. - text_far UnknownText_0x1c4a21 +SeerMuchStrengthText: + text_far _SeerMuchStrengthText text_end -SeerAdvice4: - ; Incidentally… It certainly has grown mighty! This @ must have come through numerous #MON battles. It looks brimming with confidence. - text_far UnknownText_0x1c4a5b +SeerMightyText: + text_far _SeerMightyText text_end -SeerAdvice5: - ; Incidentally… I'm impressed by your dedication. It's been a long time since I've seen a #MON as mighty as this @ . I'm sure that seeing @ in battle would excite anyone. - text_far UnknownText_0x1c4ae5 +SeerImpressedText: + text_far _SeerImpressedText text_end GetCaughtGender: diff --git a/engine/events/pokecenter_pc.asm b/engine/events/pokecenter_pc.asm index fa06d971e..e22a2ffc4 100644 --- a/engine/events/pokecenter_pc.asm +++ b/engine/events/pokecenter_pc.asm @@ -2,9 +2,9 @@ PokemonCenterPC: call PC_CheckPartyForPokemon ret c call PC_PlayBootSound - ld hl, PokecenterPCText_BootedUpPC + ld hl, PokecenterPCTurnOnText call PC_DisplayText - ld hl, PokecenterPCText_AccessWhosePC + ld hl, PokecenterPCWhoseText call PC_DisplayTextWaitMenu ld hl, .TopMenu call LoadMenuHeader @@ -104,19 +104,18 @@ PC_CheckPartyForPokemon: ret nz ld de, SFX_CHOOSE_PC_OPTION call PlaySFX - ld hl, .MustHavePokemonToUse + ld hl, .PokecenterPCCantUseText call PC_DisplayText scf ret -.MustHavePokemonToUse: - ; Bzzzzt! You must have a #MON to use this! - text_far UnknownText_0x1c1328 +.PokecenterPCCantUseText: + text_far _PokecenterPCCantUseText text_end BillsPC: call PC_PlayChoosePCSound - ld hl, PokecenterPCText_AccessedBillsPC + ld hl, PokecenterBillsPCText call PC_DisplayText farcall _BillsPC and a @@ -124,7 +123,7 @@ BillsPC: PlayersPC: call PC_PlayChoosePCSound - ld hl, PokecenterPCText_AccessedOwnPC + ld hl, PokecenterPlayersPCText call PC_DisplayText ld b, $0 call _PlayersPC @@ -133,7 +132,7 @@ PlayersPC: OaksPC: call PC_PlayChoosePCSound - ld hl, PokecenterPCText_AccessedOaksPC + ld hl, PokecenterOaksPCText call PC_DisplayText farcall ProfOaksPC and a @@ -148,7 +147,7 @@ HallOfFamePC: ret TurnOffPC: - ld hl, PokecenterPCText_LinkClosed + ld hl, PokecenterPCOaksClosedText call PrintText scf ret @@ -181,7 +180,7 @@ PC_WaitPlaySFX: _PlayersHousePC: call PC_PlayBootSound - ld hl, UnknownText_0x156ff + ld hl, PlayersPCTurnOnText call PC_DisplayText ld b, $1 call _PlayersPC @@ -199,15 +198,14 @@ _PlayersHousePC: ld c, $1 ret -UnknownText_0x156ff: - ; turned on the PC. - text_far UnknownText_0x1c1353 +PlayersPCTurnOnText: + text_far _PlayersPCTurnOnText text_end _PlayersPC: ld a, b ld [wWhichIndexSet], a - ld hl, UnknownText_0x157cc + ld hl, PlayersPCAskWhatDoText call PC_DisplayTextWaitMenu call Function15715 call ExitMenu @@ -302,9 +300,8 @@ PC_DisplayTextWaitMenu: ld [wOptions], a ret -UnknownText_0x157cc: - ; What do you want to do? - text_far UnknownText_0x1c1368 +PlayersPCAskWhatDoText: + text_far _PlayersPCAskWhatDoText text_end PlayerWithdrawItemMenu: @@ -334,7 +331,7 @@ PlayerWithdrawItemMenu: jr .withdraw .askquantity - ld hl, .HowManyText + ld hl, .PlayersPCHowManyWithdrawText call MenuTextbox farcall SelectQuantityToToss call ExitMenu @@ -356,7 +353,7 @@ PlayerWithdrawItemMenu: ld hl, wNumPCItems call TossItem predef PartyMonItemName - ld hl, .WithdrewText + ld hl, .PlayersPCWithdrewItemsText call MenuTextbox xor a ldh [hBGMapMode], a @@ -364,22 +361,22 @@ PlayerWithdrawItemMenu: ret .PackFull: - ld hl, .NoRoomText + ld hl, .PlayersPCNoRoomWithdrawText call MenuTextboxBackup ret .done ret -.HowManyText: +.PlayersPCHowManyWithdrawText: text_far _PlayersPCHowManyWithdrawText text_end -.WithdrewText: +.PlayersPCWithdrewItemsText: text_far _PlayersPCWithdrewItemsText text_end -.NoRoomText: +.PlayersPCNoRoomWithdrawText: text_far _PlayersPCNoRoomWithdrawText text_end @@ -436,14 +433,13 @@ PlayerDepositItemMenu: .CheckItemsInBag: farcall HasNoItems ret nc - ld hl, .NoItemsInBag + ld hl, .PlayersPCNoItemsText call MenuTextboxBackup scf ret -.NoItemsInBag: - ; No items here! - text_far UnknownText_0x1c13df +.PlayersPCNoItemsText: + text_far _PlayersPCNoItemsText text_end .TryDepositItem: @@ -494,7 +490,7 @@ PlayerDepositItemMenu: jr .ContinueDeposit .AskQuantity: - ld hl, .HowManyText + ld hl, .PlayersPCHowManyDepositText call MenuTextbox farcall SelectQuantityToToss push af @@ -518,12 +514,12 @@ PlayerDepositItemMenu: ld hl, wNumItems call TossItem predef PartyMonItemName - ld hl, .DepositText + ld hl, .PlayersPCDepositItemsText call PrintText ret .NoRoomInPC: - ld hl, .NoRoomText + ld hl, .PlayersPCNoRoomDepositText call PrintText ret @@ -531,15 +527,15 @@ PlayerDepositItemMenu: and a ret -.HowManyText: +.PlayersPCHowManyDepositText: text_far _PlayersPCHowManyDepositText text_end -.DepositText: +.PlayersPCDepositItemsText: text_far _PlayersPCDepositItemsText text_end -.NoRoomText: +.PlayersPCNoRoomDepositText: text_far _PlayersPCNoRoomDepositText text_end @@ -637,32 +633,26 @@ PC_DisplayText: call ExitMenu ret -PokecenterPCText_BootedUpPC: - ; turned on the PC. - text_far UnknownText_0x1c144d +PokecenterPCTurnOnText: + text_far _PokecenterPCTurnOnText text_end -PokecenterPCText_AccessWhosePC: - ; Access whose PC? - text_far UnknownText_0x1c1462 +PokecenterPCWhoseText: + text_far _PokecenterPCWhoseText text_end -PokecenterPCText_AccessedBillsPC: - ; BILL's PC accessed. #MON Storage System opened. - text_far UnknownText_0x1c1474 +PokecenterBillsPCText: + text_far _PokecenterBillsPCText text_end -PokecenterPCText_AccessedOwnPC: - ; Accessed own PC. Item Storage System opened. - text_far UnknownText_0x1c14a4 +PokecenterPlayersPCText: + text_far _PokecenterPlayersPCText text_end -PokecenterPCText_AccessedOaksPC: - ; PROF.OAK's PC accessed. #DEX Rating System opened. - text_far UnknownText_0x1c14d2 +PokecenterOaksPCText: + text_far _PokecenterOaksPCText text_end -PokecenterPCText_LinkClosed: - ; … Link closed… - text_far UnknownText_0x1c1505 +PokecenterPCOaksClosedText: + text_far _PokecenterPCOaksClosedText text_end diff --git a/engine/events/print_photo.asm b/engine/events/print_photo.asm index 0194b0072..056788b94 100644 --- a/engine/events/print_photo.asm +++ b/engine/events/print_photo.asm @@ -1,5 +1,5 @@ PhotoStudio: - ld hl, .Text_AskWhichMon + ld hl, .WhichMonPhotoText call PrintText farcall SelectMonFromParty jr c, .cancel @@ -7,7 +7,7 @@ PhotoStudio: cp EGG jr z, .egg - ld hl, .Text_HoldStill + ld hl, .HoldStillText call PrintText call DisableSpriteUpdates farcall PrintPartymon @@ -15,41 +15,36 @@ PhotoStudio: ldh a, [hPrinter] and a jr nz, .cancel - ld hl, .Text_Presto + ld hl, .PrestoAllDoneText jr .print_text .cancel - ld hl, .Text_NoPicture + ld hl, .NoPhotoText jr .print_text .egg - ld hl, .Text_Egg + ld hl, .EggPhotoText .print_text call PrintText ret -.Text_AskWhichMon: - ; Which #MON should I photo- graph? +.WhichMonPhotoText: text_far _WhichMonPhotoText text_end -.Text_HoldStill: - ; All righty. Hold still for a bit. - text_far _HoldOnText +.HoldStillText: + text_far _HoldStillText text_end -.Text_Presto: - ; Presto! All done. Come again, OK? +.PrestoAllDoneText: text_far _PrestoAllDoneText text_end -.Text_NoPicture: - ; Oh, no picture? Come again, OK? - text_far UnknownText_0x1c0000 +.NoPhotoText: + text_far _NoPhotoText text_end -.Text_Egg: - ; An EGG? My talent is worth more… - text_far UnknownText_0x1c0021 +.EggPhotoText: + text_far _EggPhotoText text_end diff --git a/engine/events/sacred_ash.asm b/engine/events/sacred_ash.asm index b7553f919..d105b2fb7 100644 --- a/engine/events/sacred_ash.asm +++ b/engine/events/sacred_ash.asm @@ -1,4 +1,3 @@ - _SacredAsh: ld a, $0 ld [wItemEffectSucceeded], a @@ -57,14 +56,13 @@ SacredAshScript: special FadeOutPalettes special FadeInPalettes waitsfx - writetext UnknownText_0x50845 + writetext .UseSacredAshText playsound SFX_CAUGHT_MON waitsfx waitbutton closetext end -UnknownText_0x50845: - ; 's #MON were all healed! - text_far UnknownText_0x1c0b65 +.UseSacredAshText: + text_far _UseSacredAshText text_end diff --git a/engine/events/specials.asm b/engine/events/specials.asm index ef5286dff..d133dd68f 100644 --- a/engine/events/specials.asm +++ b/engine/events/specials.asm @@ -168,7 +168,6 @@ GetMysteryGiftItem: ret .ReceiveItemText: - ; received item text_far _ReceiveItemText text_end @@ -256,12 +255,10 @@ CheckCoinsAndCoinCase: ret .NoCoinsText: - ; You have no coins. text_far _NoCoinsText text_end .NoCoinCaseText: - ; You don't have a COIN CASE. text_far _NoCoinCaseText text_end diff --git a/engine/events/squirtbottle.asm b/engine/events/squirtbottle.asm index a5b7fd866..411b5c2e2 100644 --- a/engine/events/squirtbottle.asm +++ b/engine/events/squirtbottle.asm @@ -9,15 +9,14 @@ _Squirtbottle: reloadmappart special UpdateTimePals callasm .CheckCanUseSquirtbottle - iffalse .NothingHappenedScript + iffalse .SquirtbottleNothingScript farsjump WateredWeirdTreeScript -.NothingHappenedScript: - jumptext .NothingHappenedText +.SquirtbottleNothingScript: + jumptext .SquirtbottleNothingText -.NothingHappenedText: - ; sprinkled water. But nothing happened… - text_far UnknownText_0x1c0b3b +.SquirtbottleNothingText: + text_far _SquirtbottleNothingText text_end .CheckCanUseSquirtbottle: diff --git a/engine/events/std_scripts.asm b/engine/events/std_scripts.asm index ecda72526..1ca5eb4c9 100644 --- a/engine/events/std_scripts.asm +++ b/engine/events/std_scripts.asm @@ -182,7 +182,7 @@ MerchandiseShelfScript: TownMapScript: opentext - farwritetext TownMapText + farwritetext LookTownMapText waitbutton special OverworldTownMap closetext diff --git a/engine/events/sweet_scent.asm b/engine/events/sweet_scent.asm index 92060ea3f..c81aa9c3a 100644 --- a/engine/events/sweet_scent.asm +++ b/engine/events/sweet_scent.asm @@ -9,7 +9,7 @@ SweetScentFromMenu: reloadmappart special UpdateTimePals callasm GetPartyNick - writetext UnknownText_0x50726 + writetext UseSweetScentText waitbutton callasm SweetScentEncounter iffalse SweetScentNothing @@ -24,7 +24,7 @@ SweetScentFromMenu: farsjump BugCatchingContestBattleScript SweetScentNothing: - writetext UnknownText_0x5072b + writetext SweetScentNothingText waitbutton closetext end @@ -57,12 +57,10 @@ SweetScentEncounter: ld [wBattleType], a ret -UnknownText_0x50726: - ; used SWEET SCENT! - text_far UnknownText_0x1c0b03 +UseSweetScentText: + text_far _UseSweetScentText text_end -UnknownText_0x5072b: - ; Looks like there's nothing here… - text_far UnknownText_0x1c0b1a +SweetScentNothingText: + text_far _SweetScentNothingText text_end diff --git a/engine/events/whiteout.asm b/engine/events/whiteout.asm index 4b3c3773a..c9141ac2a 100644 --- a/engine/events/whiteout.asm +++ b/engine/events/whiteout.asm @@ -25,8 +25,7 @@ Script_Whiteout: jumpstd bugcontestresultswarp .WhitedOutText: - ; is out of useable #MON! whited out! - text_far UnknownText_0x1c0a4e + text_far _WhitedOutText text_end OverworldBGMap: |