pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-09-08 08:13:02 -07:00
Code Issues Packages Projects Releases Wiki Activity

#641 fixes and additions. (#646)

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

70
mobile/mobile_22.asm
View File

@@ -2482,7 +2482,7 @@ Function89fce:
jp Function89e36
Function89fed:
ld hl, UnknownText_0x8a102
ld hl, MobileCardFolderIntro1Text
call PrintText
jp Function89e36
@@ -2513,14 +2513,14 @@ Function89ff6:
jp Function89e36
Function8a03d:
ld hl, UnknownText_0x8a107
ld hl, MobileCardFolderIntro2Text
call Function89209
call PrintText
call Function8920f
jp Function89e36
Function8a04c:
ld hl, UnknownText_0x8a10c
ld hl, MobileCardFolderIntro3Text
call PrintText
jp Function89e36
@@ -2621,7 +2621,7 @@ Function8a0e6:
jp Function89e36
Function8a0ec:
ld hl, UnknownText_0x8a111
ld hl, MobileCardFolderIntro4Text
call PrintText
jp Function89e36
@@ -2634,24 +2634,20 @@ Function8a0f5:
Function8a0ff:
jp Function89e36
UnknownText_0x8a102:
; The CARD FOLDER stores your and your friends' CARDS. A CARD contains information like the person's name, phone number and profile.
text_far UnknownText_0x1c5238
MobileCardFolderIntro1Text:
text_far _MobileCardFolderIntro1Text
text_end
UnknownText_0x8a107:
; This is your CARD. Once you've entered your phone number, you can trade CARDS with your friends.
text_far UnknownText_0x1c52bc
MobileCardFolderIntro2Text:
text_far _MobileCardFolderIntro2Text
text_end
UnknownText_0x8a10c:
; If you have your friend's CARD, you can use it to make a call from a mobile phone on the 2nd floor of a #MON CENTER.
text_far UnknownText_0x1c531e
MobileCardFolderIntro3Text:
text_far _MobileCardFolderIntro3Text
text_end
UnknownText_0x8a111:
; To safely store your collection of CARDS, you must set a PASSCODE for your CARD FOLDER.
text_far UnknownText_0x1c5394
MobileCardFolderIntro4Text:
text_far _MobileCardFolderIntro4Text
text_end
Function8a116:
@@ -2760,37 +2756,34 @@ Strings_8a1cc:
db "@"
Function8a20d:
ld hl, UnknownText_0x8a232
ld hl, MobileCardFolderAskDeleteText
call PrintText
ld a, $2
call Function89259
ret c
ld hl, UnknownText_0x8a237
ld hl, MobileCardFolderDeleteAreYouSureText
call PrintText
ld a, $2
call Function89259
ret c
xor a
call Function8a2fe
ld hl, UnknownText_0x8a23c
ld hl, MobileCardFolderDeletedText
call PrintText
xor a
and a
ret
UnknownText_0x8a232:
; If the CARD FOLDER is deleted, all its CARDS and the PASSCODE will also be deleted. Beware--a deleted CARD FOLDER can't be restored. Want to delete your CARD FOLDER?
text_far UnknownText_0x1c53ee
MobileCardFolderAskDeleteText:
text_far _MobileCardFolderAskDeleteText
text_end
UnknownText_0x8a237:
; Are you sure you want to delete it?
text_far UnknownText_0x1c5494
MobileCardFolderDeleteAreYouSureText:
text_far _MobileCardFolderDeleteAreYouSureText
text_end
UnknownText_0x8a23c:
; The CARD FOLDER has been deleted.
text_far UnknownText_0x1c54b9
MobileCardFolderDeletedText:
text_far _MobileCardFolderDeletedText
text_end
Function8a241:
@@ -2839,12 +2832,12 @@ Function8a262:
Function8a2aa:
ld hl, MenuHeader_0x8a2ef
call LoadMenuHeader
ld hl, UnknownText_0x8a2f4
ld hl, MobileCardFolderAskOpenOldText
call PrintText
ld a, $1
call Function89259
jr nc, .asm_8a2cf
ld hl, UnknownText_0x8a2f9
ld hl, MobileCardFolderAskDeleteOldText
call PrintText
ld a, $2
call Function89259
@@ -2873,14 +2866,12 @@ MenuHeader_0x8a2ef:
db MENU_BACKUP_TILES ; flags
menu_coords 0, 12, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
UnknownText_0x8a2f4:
; There is an older CARD FOLDER from a previous journey. Do you want to open it?
text_far UnknownText_0x1c54dd
MobileCardFolderAskOpenOldText:
text_far _MobileCardFolderAskOpenOldText
text_end
UnknownText_0x8a2f9:
; Delete the old CARD FOLDER?
text_far UnknownText_0x1c552d
MobileCardFolderAskDeleteOldText:
text_far _MobileCardFolderAskDeleteOldText
text_end
Function8a2fe:
@@ -4140,7 +4131,7 @@ Function8ac7c:
ret
.asm_8acf0
ld hl, UnknownText_0x8ad06
ld hl, MobileCardFolderFinishRegisteringCardsText
call PrintText
ld a, $2
call Function89259
@@ -4151,9 +4142,8 @@ Function8ac7c:
scf
ret
UnknownText_0x8ad06:
; Finish registering CARDS?
text_far UnknownText_0x1c554a
MobileCardFolderFinishRegisteringCardsText:
text_far _MobileCardFolderFinishRegisteringCardsText
text_end
Function8ad0b: