Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions 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

21
mobile/mobile_12_2.asm
View File

@@ -235,13 +235,12 @@ Function4a94e:
.asm_4a9b0
ld de, SFX_WRONG
call PlaySFX
ld hl, UnknownText_0x4a9be
ld hl, MobilePickThreeMonForBattle
call PrintText
jr .asm_4a974
UnknownText_0x4a9be:
; Pick three #MON for battle.
text_far UnknownText_0x1c51d7
MobilePickThreeMonForBattle:
text_far _MobilePickThreeMonForBattle
text_end
Function4a9c3:
@@ -287,14 +286,13 @@ Function4a9d7:
ld de, wd012
ld bc, 6
call CopyBytes
ld hl, UnknownText_0x4aa1d
ld hl, MobileUseTheseThreeMonText
call PrintText
call YesNoBox
ret
UnknownText_0x4aa1d:
; , @ and @ . Use these three?
text_far UnknownText_0x1c51f4
MobileUseTheseThreeMonText:
text_far _MobileUseTheseThreeMonText
text_end
Function4aa22:
@@ -772,7 +770,7 @@ Function4ad17:
jr z, .asm_4ad39
ld de, SFX_WRONG
call WaitPlaySFX
ld hl, UnknownText_0x4ad51
ld hl, MobileOnlyThreeMonMayEnterText
call PrintText
ret
@@ -792,9 +790,8 @@ Function4ad17:
call Function4adc2
ret
UnknownText_0x4ad51:
; Only three #MON may enter.
text_far UnknownText_0x1c521c
MobileOnlyThreeMonMayEnterText:
text_far _MobileOnlyThreeMonMayEnterText
text_end
Function4ad56:

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:

35
mobile/mobile_22_2.asm
View File

@@ -406,7 +406,7 @@ Function8b539:
Function8b555:
.loop
ld hl, UnknownText_0x8b5ce
ld hl, EnterNewPasscodeText
call PrintText
ld bc, wd017
call Function8b45c
@@ -417,12 +417,12 @@ Function8b555:
ld bc, wd017
call Function8b664
jr nz, .asm_8b57c
ld hl, UnknownText_0x8b5e2
ld hl, FourZerosInvalidText
call PrintText
jr .loop
.asm_8b57c
ld hl, UnknownText_0x8b5d3
ld hl, ConfirmPasscodeText
call PrintText
ld bc, wd013
call Function8b45c
@@ -434,7 +434,7 @@ Function8b555:
call Function89448
ld bc, wd013
call Function8b493
ld hl, UnknownText_0x8b5d8
ld hl, PasscodesNotSameText
call PrintText
jr .asm_8b57c
@@ -448,7 +448,7 @@ Function8b555:
call Function89448
ld bc, wd013
call Function8b493
ld hl, UnknownText_0x8b5dd
ld hl, PasscodeSetText
call PrintText
and a
.asm_8b5c8
@@ -457,28 +457,23 @@ Function8b555:
pop af
ret
UnknownText_0x8b5ce:
; Please enter any four-digit number.
EnterNewPasscodeText:
text_far _EnterNewPasscodeText
text_end
UnknownText_0x8b5d3:
; Enter the same number to confirm.
ConfirmPasscodeText:
text_far _ConfirmPasscodeText
text_end
UnknownText_0x8b5d8:
; That's not the same number.
PasscodesNotSameText:
text_far _PasscodesNotSameText
text_end
UnknownText_0x8b5dd:
; Your PASSCODE has been set. Enter this number next time to open the CARD FOLDER.
PasscodeSetText:
text_far _PasscodeSetText
text_end
UnknownText_0x8b5e2:
; 0000 is invalid!
FourZerosInvalidText:
text_far _FourZerosInvalidText
text_end
@@ -494,7 +489,7 @@ Function8b5e7:
ld e, $0
call Function89c44
.asm_8b602
ld hl, UnknownText_0x8b642
ld hl, EnterPasscodeText
call PrintText
ld bc, wd013
call Function8b45c
@@ -507,7 +502,7 @@ Function8b5e7:
call Function8b3a4
call CloseSRAM
jr z, .asm_8b635
ld hl, UnknownText_0x8b647
ld hl, IncorrectPasscodeText
call PrintText
ld bc, wd013
call Function8b36c
@@ -522,13 +517,11 @@ Function8b5e7:
pop af
ret
UnknownText_0x8b642:
; Enter the CARD FOLDER PASSCODE.
EnterPasscodeText:
text_far _EnterPasscodeText
text_end
UnknownText_0x8b647:
; Incorrect PASSCODE!
IncorrectPasscodeText:
text_far _IncorrectPasscodeText
text_end

40
mobile/mobile_42.asm
View File

@@ -1539,52 +1539,52 @@ Function108be0:
Function108bec:
ld a, $90
ldh [hWY], a
ld hl, .PlayerWillTradeMon
ld hl, .MobilePlayerWillTradeMonText
call PrintText
ld c, 80
call DelayFrames
ld hl, .ForPartnersMon
ld hl, .MobileForPartnersMonText
call PrintText
ld c, 80
call DelayFrames
ret
.PlayerWillTradeMon:
text_far _TradingText10
.MobilePlayerWillTradeMonText:
text_far _MobilePlayerWillTradeMonText
text_end
.ForPartnersMon:
text_far _TradingText11
.MobileForPartnersMonText:
text_far _MobileForPartnersMonText
text_end
.UnusedTextPlayersMonTrade:
text_far _TradingText12
.MobilePlayersMonTradeText:
text_far _MobilePlayersMonTradeText
text_end
Function108c16:
ld a, $90
ldh [hWY], a
ld hl, .TakeGoodCareOfMon
ld hl, .MobileTakeGoodCareOfMonText
call PrintText
ld c, 80
call DelayFrames
ret
.TakeGoodCareOfMon:
text_far _TradingText13
.MobileTakeGoodCareOfMonText:
text_far _MobileTakeGoodCareOfMonText
text_end
Function108c2b:
ld a, $90
ldh [hWY], a
ld hl, .PlayersMonTrade
ld hl, .MobilePlayersMonTrade2Text
call PrintText
ld c, 80
call DelayFrames
ret
.PlayersMonTrade:
text_far _TradingText14
.MobilePlayersMonTrade2Text:
text_far _MobilePlayersMonTrade2Text
text_end
Function108c40:
@@ -1593,25 +1593,25 @@ Function108c40:
ld a, [wcf65]
and %10000000
jr z, .Getmon
ld hl, .CameBack
ld hl, .MobileTradeCameBackText
call PrintText
ld c, 80
call DelayFrames
ret
.Getmon:
ld hl, .TakeGoodCareOf
ld hl, .MobileTakeGoodCareOfText
call PrintText
ld c, 80
call DelayFrames
ret
.TakeGoodCareOf:
text_far _TradingText15
.MobileTakeGoodCareOfText:
text_far _MobileTakeGoodCareOfText
text_end
.CameBack:
text_far _TradingText16
.MobileTradeCameBackText:
text_far _MobileTradeCameBackText
text_end
Function108c6d:

14
mobile/mobile_menu.asm
View File

@@ -413,7 +413,7 @@ Function4a28a:
.DeleteLoginPassword:
call PlaceHollowCursor
ld hl, UnknownText_0x4a358
ld hl, DeleteSavedLoginPasswordText
call PrintText
hlcoord 14, 7
ld b, 3
@@ -435,7 +435,7 @@ Function4a28a:
ld bc, MOBILE_LOGIN_PASSWORD_LENGTH
call ByteFill
call CloseSRAM
ld hl, UnknownText_0x4a35d
ld hl, DeletedTheLoginPasswordText
call PrintText
call JoyWaitAorB
.dont_delete_password
@@ -455,14 +455,12 @@ String_4a34b:
next "けす"
next "もどる@"
UnknownText_0x4a358:
; Delete the saved LOG-IN PASSWORD?
text_far UnknownText_0x1c5196
DeleteSavedLoginPasswordText:
text_far _DeleteSavedLoginPasswordText
text_end
UnknownText_0x4a35d:
; Deleted the LOG-IN PASSWORD.
text_far UnknownText_0x1c51b9
DeletedTheLoginPasswordText:
text_far _DeletedTheLoginPasswordText
text_end
DeletePassword_YesNo_MenuHeader: