summaryrefslogtreecommitdiff
path: root/engine/pokemon/mail.asm
diff options
context:
space:
mode:
authormid-kid <esteve.varela@gmail.com>2019-10-20 22:24:17 +0000
committerRangi <35663410+Rangi42@users.noreply.github.com>2019-10-20 18:24:17 -0400
commite3e0bcd653f8d671f6fd1390fa922e3b644f4a34 (patch)
tree27c9b465e4d3e0de2649a5755a9f0b5021b05798 /engine/pokemon/mail.asm
parent3fc2ba41f7bc7fcf1e51f821b4e07525e0e4a873 (diff)
#641 fixes and additions. (#646)
Name a lot of text labels according to our conventions
Diffstat (limited to 'engine/pokemon/mail.asm')
-rw-r--r--engine/pokemon/mail.asm36
1 files changed, 18 insertions, 18 deletions
diff --git a/engine/pokemon/mail.asm b/engine/pokemon/mail.asm
index f89a51944..fa3955003 100644
--- a/engine/pokemon/mail.asm
+++ b/engine/pokemon/mail.asm
@@ -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: