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/evolve.asm | |
| parent | 3fc2ba41f7bc7fcf1e51f821b4e07525e0e4a873 (diff) | |
#641 fixes and additions. (#646)
Name a lot of text labels according to our conventions
Diffstat (limited to 'engine/pokemon/evolve.asm')
| -rw-r--r-- | engine/pokemon/evolve.asm | 28 |
1 files changed, 12 insertions, 16 deletions
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: |