#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

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