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/pokemon | |
| parent | 3fc2ba41f7bc7fcf1e51f821b4e07525e0e4a873 (diff) | |
#641 fixes and additions. (#646)
Name a lot of text labels according to our conventions
Diffstat (limited to 'engine/pokemon')
| -rw-r--r-- | engine/pokemon/bills_pc_top.asm | 42 | ||||
| -rw-r--r-- | engine/pokemon/breeding.asm | 72 | ||||
| -rw-r--r-- | engine/pokemon/caught_data.asm | 7 | ||||
| -rw-r--r-- | engine/pokemon/evolve.asm | 28 | ||||
| -rw-r--r-- | engine/pokemon/knows_move.asm | 7 | ||||
| -rw-r--r-- | engine/pokemon/learn.asm | 52 | ||||
| -rw-r--r-- | engine/pokemon/mail.asm | 36 | ||||
| -rw-r--r-- | engine/pokemon/mon_menu.asm | 133 | ||||
| -rw-r--r-- | engine/pokemon/move_mon.asm | 7 | ||||
| -rw-r--r-- | engine/pokemon/party_menu.asm | 52 |
10 files changed, 192 insertions, 244 deletions
diff --git a/engine/pokemon/bills_pc_top.asm b/engine/pokemon/bills_pc_top.asm index 700c59d35..b449c765a 100644 --- a/engine/pokemon/bills_pc_top.asm +++ b/engine/pokemon/bills_pc_top.asm @@ -9,14 +9,13 @@ _BillsPC: ld a, [wPartyCount] and a ret nz - ld hl, .Text_GottaHavePokemon + ld hl, .PCGottaHavePokemonText call MenuTextboxBackup scf ret -.Text_GottaHavePokemon: - ; You gotta have #MON to call! - text_far UnknownText_0x1c1006 +.PCGottaHavePokemonText: + text_far _PCGottaHavePokemonText text_end .LogIn: @@ -28,16 +27,15 @@ _BillsPC: ld a, [hl] push af set NO_TEXT_SCROLL, [hl] - ld hl, .Text_What + ld hl, .PCWhatText call PrintText pop af ld [wOptions], a call LoadFontsBattleExtra ret -.Text_What: - ; What? - text_far UnknownText_0x1c1024 +.PCWhatText: + text_far _PCWhatText text_end .LogOut: @@ -112,7 +110,7 @@ BillsPC_MovePKMNMenu: call LoadStandardMenuHeader farcall IsAnyMonHoldingMail jr nc, .no_mail - ld hl, .Text_MonHoldingMail + ld hl, .PCMonHoldingMailText call PrintText jr .quit @@ -128,9 +126,8 @@ BillsPC_MovePKMNMenu: and a ret -.Text_MonHoldingMail: - ; There is a #MON holding MAIL. Please remove the MAIL. - text_far UnknownText_0x1c102b +.PCMonHoldingMailText: + text_far _PCMonHoldingMailText text_end BillsPC_DepositMenu: @@ -152,25 +149,23 @@ Unreferenced_Functione512: ret .no_mon - ld hl, .Text_NoMon + ld hl, .PCNoSingleMonText call MenuTextboxBackup scf ret .only_one_mon - ld hl, .Text_ItsYourLastMon + ld hl, .PCCantDepositLastMonText call MenuTextboxBackup scf ret -.Text_NoMon: - ; You don't have a single #MON! - text_far UnknownText_0x1c1062 +.PCNoSingleMonText: + text_far _PCNoSingleMonText text_end -.Text_ItsYourLastMon: - ; You can't deposit your last #MON! - text_far UnknownText_0x1c1080 +.PCCantDepositLastMonText: + text_far _PCCantDepositLastMonText text_end CheckCurPartyMonFainted: @@ -219,14 +214,13 @@ Unreferenced_Functione56d: ret .asm_e576 - ld hl, UnknownText_0xe57e + ld hl, PCCantTakeText call MenuTextboxBackup scf ret -UnknownText_0xe57e: - ; You can't take any more #MON. - text_far UnknownText_0x1c10a2 +PCCantTakeText: + text_far _PCCantTakeText text_end BillsPC_ChangeBoxMenu: diff --git a/engine/pokemon/breeding.asm b/engine/pokemon/breeding.asm index 66d227ce5..34a0f2bbe 100644 --- a/engine/pokemon/breeding.asm +++ b/engine/pokemon/breeding.asm @@ -319,7 +319,7 @@ HatchEggs: ld d, h ld e, l push de - ld hl, .Text_NicknameHatchling + ld hl, .BreedAskNicknameText call PrintText call YesNoBox pop de @@ -356,7 +356,7 @@ HatchEggs: .Text_HatchEgg: ; Huh? @ @ - text_far UnknownText_0x1c0db0 + text_far Text_BreedHuh text_asm ld hl, wVramState res 0, [hl] @@ -366,29 +366,26 @@ HatchEggs: ld a, [wCurPartySpecies] push af call EggHatch_AnimationSequence - ld hl, .ClearTextbox + ld hl, .BreedClearboxText call PrintText pop af ld [wCurPartySpecies], a pop bc pop de pop hl - ld hl, .CameOutOfItsEgg + ld hl, .BreedEggHatchText ret -.ClearTextbox: - ; - text_far UnknownText_0x1c0db8 +.BreedClearboxText: + text_far _BreedClearboxText text_end -.CameOutOfItsEgg: - ; came out of its EGG!@ @ - text_far UnknownText_0x1c0dba +.BreedEggHatchText: + text_far _BreedEggHatchText text_end -.Text_NicknameHatchling: - ; Give a nickname to @ ? - text_far UnknownText_0x1c0dd8 +.BreedAskNicknameText: + text_far _BreedAskNicknameText text_end InitEggMoves: @@ -865,7 +862,7 @@ Hatch_ShellFragmentLoop: ret DayCareMon1: - ld hl, DayCareMon1Text + ld hl, LeftWithDayCareManText call PrintText ld a, [wBreedMon1Species] call PlayMonCry @@ -878,7 +875,7 @@ DayCareMon1: jp PrintText DayCareMon2: - ld hl, DayCareMon2Text + ld hl, LeftWithDayCareLadyText call PrintText ld a, [wBreedMon2Species] call PlayMonCry @@ -893,14 +890,12 @@ DayCareMon2: DayCareMonCursor: jp WaitPressAorB_BlinkCursor -DayCareMon2Text: - ; It's @ that was left with the DAY-CARE LADY. - text_far UnknownText_0x1c0df3 +LeftWithDayCareLadyText: + text_far _LeftWithDayCareLadyText text_end -DayCareMon1Text: - ; It's @ that was left with the DAY-CARE MAN. - text_far UnknownText_0x1c0e24 +LeftWithDayCareManText: + text_far _LeftWithDayCareManText text_end DayCareMonCompatibilityText: @@ -911,46 +906,41 @@ DayCareMonCompatibilityText: call CheckBreedmonCompatibility pop bc ld a, [wBreedingCompatibility] - ld hl, .AllAlone + ld hl, .BreedBrimmingWithEnergyText cp -1 jr z, .done - ld hl, .Incompatible + ld hl, .BreedNoInterestText and a jr z, .done - ld hl, .HighCompatibility + ld hl, .BreedAppearsToCareForText cp 230 jr nc, .done cp 70 - ld hl, .ModerateCompatibility + ld hl, .BreedFriendlyText jr nc, .done - ld hl, .SlightCompatibility + ld hl, .BreedShowsInterestText .done ret -.AllAlone: - ; It's brimming with energy. - text_far UnknownText_0x1c0e54 +.BreedBrimmingWithEnergyText: + text_far _BreedBrimmingWithEnergyText text_end -.Incompatible: - ; It has no interest in @ . - text_far UnknownText_0x1c0e6f +.BreedNoInterestText: + text_far _BreedNoInterestText text_end -.HighCompatibility: - ; It appears to care for @ . - text_far UnknownText_0x1c0e8d +.BreedAppearsToCareForText: + text_far _BreedAppearsToCareForText text_end -.ModerateCompatibility: - ; It's friendly with @ . - text_far UnknownText_0x1c0eac +.BreedFriendlyText: + text_far _BreedFriendlyText text_end -.SlightCompatibility: - ; It shows interest in @ . - text_far UnknownText_0x1c0ec6 +.BreedShowsInterestText: + text_far _BreedShowsInterestText text_end Unreferenced_DayCareMonPrintEmptyString: diff --git a/engine/pokemon/caught_data.asm b/engine/pokemon/caught_data.asm index fe34f197d..0633b8e9a 100644 --- a/engine/pokemon/caught_data.asm +++ b/engine/pokemon/caught_data.asm @@ -152,13 +152,12 @@ CheckPartyFullAfterContest: ret GiveANickname_YesNo: - ld hl, TextJump_GiveANickname + ld hl, CaughtAskNicknameText call PrintText jp YesNoBox -TextJump_GiveANickname: - ; Give a nickname to the @ you received? - text_far UnknownText_0x1c12fc +CaughtAskNicknameText: + text_far _CaughtAskNicknameText text_end SetCaughtData: diff --git a/engine/pokemon/evolve.asm b/engine/pokemon/evolve.asm index 0ee10eac8..51c47c0d6 100644 --- a/engine/pokemon/evolve.asm +++ b/engine/pokemon/evolve.asm @@ -204,7 +204,7 @@ EvolveAfterBattle_MasterLoop: ld hl, wPartyMonNicknames call GetNick call CopyName1 - ld hl, Text_WhatEvolving + ld hl, EvolvingText call PrintText ld c, 50 @@ -227,7 +227,7 @@ EvolveAfterBattle_MasterLoop: pop af jp c, CancelEvolution - ld hl, Text_CongratulationsYourPokemon + ld hl, CongratulationsYourPokemonText call PrintText pop hl @@ -240,7 +240,7 @@ EvolveAfterBattle_MasterLoop: call GetPokemonName push hl - ld hl, Text_EvolvedIntoPKMN + ld hl, EvolvedIntoText call PrintTextboxText farcall StubbedTrainerRankings_MonsEvolved @@ -377,7 +377,7 @@ UpdateSpeciesNameIfNotNicknamed: jp CopyBytes CancelEvolution: - ld hl, Text_StoppedEvolving + ld hl, StoppedEvolvingText call PrintText call ClearTileMap pop hl @@ -394,24 +394,20 @@ IsMonHoldingEverstone: pop hl ret -Text_CongratulationsYourPokemon: - ; Congratulations! Your @ @ - text_far UnknownText_0x1c4b92 +CongratulationsYourPokemonText: + text_far _CongratulationsYourPokemonText text_end -Text_EvolvedIntoPKMN: - ; evolved into @ ! - text_far UnknownText_0x1c4baf +EvolvedIntoText: + text_far _EvolvedIntoText text_end -Text_StoppedEvolving: - ; Huh? @ stopped evolving! - text_far UnknownText_0x1c4bc5 +StoppedEvolvingText: + text_far _StoppedEvolvingText text_end -Text_WhatEvolving: - ; What? @ is evolving! - text_far UnknownText_0x1c4be3 +EvolvingText: + text_far _EvolvingText text_end LearnLevelMoves: diff --git a/engine/pokemon/knows_move.asm b/engine/pokemon/knows_move.asm index 523d13968..9fe0f6ace 100644 --- a/engine/pokemon/knows_move.asm +++ b/engine/pokemon/knows_move.asm @@ -14,12 +14,11 @@ KnowsMove: ret .knows_move - ld hl, .Text_knows + ld hl, .KnowsMoveText call PrintText scf ret -.Text_knows: - ; knows @ . - text_far UnknownText_0x1c5ea8 +.KnowsMoveText: + text_far _KnowsMoveText text_end diff --git a/engine/pokemon/learn.asm b/engine/pokemon/learn.asm index d73dd7094..6722c4fe1 100644 --- a/engine/pokemon/learn.asm +++ b/engine/pokemon/learn.asm @@ -102,25 +102,25 @@ LearnMove: jp .learned .cancel - ld hl, Text_StopLearning ; Stop learning <MOVE>? + ld hl, StopLearningMoveText call PrintText call YesNoBox jp c, .loop - ld hl, Text_DidNotLearn ; <MON> did not learn <MOVE>. + ld hl, DidNotLearnMoveText call PrintText ld b, 0 ret .learned - ld hl, Text_LearnedMove ; <MON> learned <MOVE>! + ld hl, LearnedMoveText call PrintText ld b, 1 ret ForgetMove: push hl - ld hl, Text_TryingToLearn + ld hl, AskForgetMoveText call PrintText call YesNoBox pop hl @@ -134,7 +134,7 @@ ForgetMove: pop hl .loop push hl - ld hl, Text_ForgetWhich + ld hl, MoveAskForgetText call PrintText hlcoord 5, 2 ld b, NUM_MOVES * 2 @@ -191,7 +191,7 @@ ForgetMove: ret .hmmove - ld hl, Text_CantForgetHM + ld hl, MoveCantForgetHMText call PrintText pop hl jr .loop @@ -200,48 +200,40 @@ ForgetMove: scf ret -Text_LearnedMove: -; <MON> learned <MOVE>! - text_far UnknownText_0x1c5660 +LearnedMoveText: + text_far _LearnedMoveText text_end -Text_ForgetWhich: -; Which move should be forgotten? - text_far UnknownText_0x1c5678 +MoveAskForgetText: + text_far _MoveAskForgetText text_end -Text_StopLearning: -; Stop learning <MOVE>? - text_far UnknownText_0x1c5699 +StopLearningMoveText: + text_far _StopLearningMoveText text_end -Text_DidNotLearn: -; <MON> did not learn <MOVE>. - text_far UnknownText_0x1c56af +DidNotLearnMoveText: + text_far _DidNotLearnMoveText text_end -Text_TryingToLearn: -; <MON> is trying to learn <MOVE>. But <MON> can't learn more than -; four moves. Delete an older move to make room for <MOVE>? - text_far UnknownText_0x1c56c9 +AskForgetMoveText: + text_far _AskForgetMoveText text_end Text_1_2_and_Poof: - text_far UnknownText_0x1c5740 ; 1, 2 and… + text_far Text_MoveForgetCount ; 1, 2 and… text_asm push de ld de, SFX_SWITCH_POKEMON call PlaySFX pop de - ld hl, .PoofForgot + ld hl, .MoveForgotText ret -.PoofForgot: -; Poof! <MON> forgot <MOVE>. And… - text_far UnknownText_0x1c574e +.MoveForgotText: + text_far _MoveForgotText text_end -Text_CantForgetHM: -; HM moves can't be forgotten now. - text_far UnknownText_0x1c5772 +MoveCantForgetHMText: + text_far _MoveCantForgetHMText text_end diff --git a/engine/pokemon/mail.asm b/engine/pokemon/mail.asm index f89a51944..fa3955003 100644 --- a/engine/pokemon/mail.asm +++ b/engine/pokemon/mail.asm @@ -428,7 +428,7 @@ MailboxPC: jp CloseSubmenu .PutInPack: - ld hl, .MessageLostText + ld hl, .MailMessageLostText call MenuTextbox call YesNoBox call ExitMenu @@ -441,7 +441,7 @@ MailboxPC: ld hl, wNumItems call ReceiveItem jr c, .put_in_bag - ld hl, .PackFullText + ld hl, .MailPackFullText jp MenuTextboxBackup .put_in_bag @@ -449,19 +449,19 @@ MailboxPC: dec a ld b, a call DeleteMailFromPC - ld hl, .PutAwayText + ld hl, .MailClearedPutAwayText jp MenuTextboxBackup -.PutAwayText: - text_far ClearedMailPutAwayText +.MailClearedPutAwayText: + text_far _MailClearedPutAwayText text_end -.PackFullText: - text_far MailPackFullText +.MailPackFullText: + text_far _MailPackFullText text_end -.MessageLostText: - text_far MailMessageLostText +.MailMessageLostText: + text_far _MailMessageLostText text_end .GetMailType: @@ -500,12 +500,12 @@ MailboxPC: ld a, [hl] and a jr z, .attach_mail - ld hl, .HoldingMailText + ld hl, .MailAlreadyHoldingItemText call PrintText jr .try_again .egg - ld hl, .EggText + ld hl, .MailEggText call PrintText jr .try_again @@ -514,22 +514,22 @@ MailboxPC: dec a ld b, a call MoveMailFromPCToParty - ld hl, .MailMovedText + ld hl, .MailMovedFromBoxText call PrintText .exit2 jp CloseSubmenu -.HoldingMailText: - text_far MailAlreadyHoldingItemText +.MailAlreadyHoldingItemText: + text_far _MailAlreadyHoldingItemText text_end -.EggText: - text_far MailEggText +.MailEggText: + text_far _MailEggText text_end -.MailMovedText: - text_far MailMovedFromBoxText +.MailMovedFromBoxText: + text_far _MailMovedFromBoxText text_end .Cancel: diff --git a/engine/pokemon/mon_menu.asm b/engine/pokemon/mon_menu.asm index 624a7c964..0b19dcb14 100644 --- a/engine/pokemon/mon_menu.asm +++ b/engine/pokemon/mon_menu.asm @@ -29,7 +29,7 @@ TossItemFromPC: ld a, [wItemAttributeParamBuffer] and a jr nz, .key_item - ld hl, .TossHowMany + ld hl, .ItemsTossOutHowManyText call MenuTextbox farcall SelectQuantityToToss push af @@ -37,7 +37,7 @@ TossItemFromPC: call ExitMenu pop af jr c, .quit - ld hl, .ConfirmToss + ld hl, .ItemsThrowAwayText call MenuTextbox call YesNoBox push af @@ -48,7 +48,7 @@ TossItemFromPC: ld a, [wCurItemQuantity] call TossItem call PartyMonItemName - ld hl, .TossedThisMany + ld hl, .ItemsDiscardedText call MenuTextbox call ExitMenu and a @@ -61,38 +61,34 @@ TossItemFromPC: scf ret -.TossHowMany: - ; Toss out how many @ (S)? - text_far UnknownText_0x1c1a90 +.ItemsTossOutHowManyText: + text_far _ItemsTossOutHowManyText text_end -.ConfirmToss: - ; Throw away @ @ (S)? - text_far UnknownText_0x1c1aad +.ItemsThrowAwayText: + text_far _ItemsThrowAwayText text_end -.TossedThisMany: - ; Discarded @ (S). - text_far UnknownText_0x1c1aca +.ItemsDiscardedText: + text_far _ItemsDiscardedText text_end .CantToss: - ld hl, .TooImportantToToss + ld hl, .ItemsTooImportantText call MenuTextboxBackup ret -.TooImportantToToss: - ; That's too impor- tant to toss out! - text_far UnknownText_0x1c1adf +.ItemsTooImportantText: + text_far _ItemsTooImportantText text_end CantUseItem: - ld hl, CantUseItemText + ld hl, ItemsOakWarningText call MenuTextboxWaitButton ret -CantUseItemText: - text_far UnknownText_0x1c1b03 +ItemsOakWarningText: + text_far _ItemsOakWarningText text_end PartyMonItemName: @@ -264,7 +260,7 @@ GiveTakePartyMonItem: jr .quit .next - ld hl, CantBeHeldText + ld hl, ItemCantHeldText call MenuTextboxBackup jr .loop @@ -289,20 +285,20 @@ TryGiveItemToPartymon: .give_item_to_mon call GiveItemToPokemon - ld hl, MadeHoldText + ld hl, PokemonHoldItemText call MenuTextboxBackup call GivePartyItem ret .please_remove_mail - ld hl, PleaseRemoveMailText + ld hl, PokemonRemoveMailText call MenuTextboxBackup ret .already_holding_item ld [wNamedObjectIndexBuffer], a call GetItemName - ld hl, SwitchAlreadyHoldingText + ld hl, PokemonAskSwapItemText call StartMenuYesNo jr c, .abort @@ -316,7 +312,7 @@ TryGiveItemToPartymon: call ReceiveItemFromPokemon jr nc, .bag_full - ld hl, TookAndMadeHoldText + ld hl, PokemonSwapItemText call MenuTextboxBackup ld a, [wNamedObjectIndexBuffer] ld [wCurItem], a @@ -327,7 +323,7 @@ TryGiveItemToPartymon: ld a, [wNamedObjectIndexBuffer] ld [wCurItem], a call ReceiveItemFromPokemon - ld hl, ItemStorageIsFullText + ld hl, ItemStorageFullText call MenuTextboxBackup .abort @@ -362,17 +358,17 @@ TakePartyItem: ld [wNamedObjectIndexBuffer], a ld [hl], NO_ITEM call GetItemName - ld hl, TookFromText + ld hl, PokemonTookItemText call MenuTextboxBackup jr .asm_12c9a .asm_12c8c - ld hl, IsntHoldingAnythingText + ld hl, PokemonNotHoldingText call MenuTextboxBackup jr .asm_12c9a .asm_12c94 - ld hl, ItemStorageIsFullText + ld hl, ItemStorageFullText call MenuTextboxBackup .asm_12c9a @@ -390,36 +386,36 @@ GiveTakeItemMenuData: db "GIVE@" db "TAKE@" -TookAndMadeHoldText: - text_far UnknownText_0x1c1b2c +PokemonSwapItemText: + text_far _PokemonSwapItemText text_end -MadeHoldText: - text_far UnknownText_0x1c1b57 +PokemonHoldItemText: + text_far _PokemonHoldItemText text_end -PleaseRemoveMailText: - text_far UnknownText_0x1c1b6f +PokemonRemoveMailText: + text_far _PokemonRemoveMailText text_end -IsntHoldingAnythingText: - text_far UnknownText_0x1c1b8e +PokemonNotHoldingText: + text_far _PokemonNotHoldingText text_end -ItemStorageIsFullText: - text_far UnknownText_0x1c1baa +ItemStorageFullText: + text_far _ItemStorageFullText text_end -TookFromText: - text_far UnknownText_0x1c1bc4 +PokemonTookItemText: + text_far _PokemonTookItemText text_end -SwitchAlreadyHoldingText: - text_far UnknownText_0x1c1bdc +PokemonAskSwapItemText: + text_far _PokemonAskSwapItemText text_end -CantBeHeldText: - text_far UnknownText_0x1c1c09 +ItemCantHeldText: + text_far _ItemCantHeldText text_end GetPartyItemLocation: @@ -506,24 +502,24 @@ MonMailAction: ret .take - ld hl, .sendmailtopctext + ld hl, .MailAskSendToPCText call StartMenuYesNo jr c, .RemoveMailToBag ld a, [wCurPartyMon] ld b, a farcall SendMailToPC jr c, .MailboxFull - ld hl, .sentmailtopctext + ld hl, .MailSentToPCText call MenuTextboxBackup jr .done .MailboxFull: - ld hl, .mailboxfulltext + ld hl, .MailboxFullText call MenuTextboxBackup jr .done .RemoveMailToBag: - ld hl, .mailwilllosemessagetext + ld hl, .MailLoseMessageText call StartMenuYesNo jr c, .done call GetPartyItemLocation @@ -534,12 +530,12 @@ MonMailAction: call GetPartyItemLocation ld [hl], $0 call GetCurNick - ld hl, .tookmailfrommontext + ld hl, .MailDetachedText call MenuTextboxBackup jr .done .BagIsFull: - ld hl, .bagfulltext + ld hl, .MailNoSpaceText call MenuTextboxBackup jr .done @@ -560,34 +556,28 @@ MonMailAction: db "TAKE@" db "QUIT@" -.mailwilllosemessagetext -; The MAIL will lose its message. OK? - text_far UnknownText_0x1c1c22 +.MailLoseMessageText: + text_far _MailLoseMessageText text_end -.tookmailfrommontext -; MAIL detached from <POKEMON>. - text_far UnknownText_0x1c1c47 +.MailDetachedText: + text_far _MailDetachedText text_end -.bagfulltext -; There's no space for removing MAIL. - text_far UnknownText_0x1c1c62 +.MailNoSpaceText: + text_far _MailNoSpaceText text_end -.sendmailtopctext -; Send the removed MAIL to your PC? - text_far UnknownText_0x1c1c86 +.MailAskSendToPCText: + text_far _MailAskSendToPCText text_end -.mailboxfulltext -; Your PC's MAILBOX is full. - text_far UnknownText_0x1c1ca9 +.MailboxFullText: + text_far _MailboxFullText text_end -.sentmailtopctext -; The MAIL was sent to your PC. - text_far UnknownText_0x1c1cc4 +.MailSentToPCText: + text_far _MailSentToPCText text_end OpenPartyStats: @@ -738,7 +728,7 @@ MonMenu_Softboiled_MilkDrink: jr .finish .NotEnoughHP: - ld hl, .Text_NotEnoughHP + ld hl, .PokemonNotEnoughHPText call PrintText .finish @@ -747,9 +737,8 @@ MonMenu_Softboiled_MilkDrink: ld a, $3 ret -.Text_NotEnoughHP: - ; Not enough HP! - text_far UnknownText_0x1c1ce3 +.PokemonNotEnoughHPText: + text_far _PokemonNotEnoughHPText text_end .CheckMonHasEnoughHP: diff --git a/engine/pokemon/move_mon.asm b/engine/pokemon/move_mon.asm index eaa05f84a..eb5afa9dc 100644 --- a/engine/pokemon/move_mon.asm +++ b/engine/pokemon/move_mon.asm @@ -1782,7 +1782,7 @@ GivePoke:: ld a, b and a ret z - ld hl, TextJump_WasSentToBillsPC + ld hl, WasSentToBillsPCText call PrintText ld a, BANK(sBoxMonNicknames) call GetSRAMBank @@ -1800,9 +1800,8 @@ GivePoke:: ld b, $2 ret -TextJump_WasSentToBillsPC: - ; was sent to BILL's PC. - text_far Text_WasSentToBillsPC +WasSentToBillsPCText: + text_far _WasSentToBillsPCText text_end InitNickname: diff --git a/engine/pokemon/party_menu.asm b/engine/pokemon/party_menu.asm index f8a6b0a5e..49c2c4713 100644 --- a/engine/pokemon/party_menu.asm +++ b/engine/pokemon/party_menu.asm @@ -792,64 +792,54 @@ PrintPartyMenuActionText: .MenuActionTexts: ; entries correspond to PARTYMENUTEXT_* constants - dw .Text_CuredOfPoison - dw .Text_BurnWasHealed - dw .Text_Defrosted - dw .Text_WokeUp - dw .Text_RidOfParalysis - dw .Text_RecoveredSomeHP - dw .Text_HealthReturned - dw .Text_Revitalized - dw .Text_GrewToLevel - dw .Text_CameToItsSenses - -.Text_RecoveredSomeHP: - ; recovered @ HP! + dw .CuredOfPoisonText + dw .BurnWasHealedText + dw .WasDefrostedText + dw .WokeUpText + dw .RidOfParalysisText + dw .RecoveredSomeHPText + dw .HealthReturnedText + dw .RevitalizedText + dw .GrewToLevelText + dw .CameToItsSensesText + +.RecoveredSomeHPText: text_far _RecoveredSomeHPText text_end -.Text_CuredOfPoison: - ; 's cured of poison. +.CuredOfPoisonText: text_far _CuredOfPoisonText text_end -.Text_RidOfParalysis: - ; 's rid of paralysis. +.RidOfParalysisText: text_far _RidOfParalysisText text_end -.Text_BurnWasHealed: - ; 's burn was healed. +.BurnWasHealedText: text_far _BurnWasHealedText text_end -.Text_Defrosted: - ; was defrosted. +.WasDefrostedText: text_far _WasDefrostedText text_end -.Text_WokeUp: - ; woke up. +.WokeUpText: text_far _WokeUpText text_end -.Text_HealthReturned: - ; 's health returned. +.HealthReturnedText: text_far _HealthReturnedText text_end -.Text_Revitalized: - ; is revitalized. +.RevitalizedText: text_far _RevitalizedText text_end -.Text_GrewToLevel: - ; grew to level @ !@ @ +.GrewToLevelText: text_far _GrewToLevelText text_end -.Text_CameToItsSenses: - ; came to its senses. +.CameToItsSensesText: text_far _CameToItsSensesText text_end |
