#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

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