#641 fixes and additions. (#646)

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

View File

@@ -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: