#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

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