Resolve issue #575: Rename text commands

2025-12-11 05:02:16 -08:00 · 2018-11-17 13:33:03 -05:00
parent c05a2d255b
commit 3202c4f3df
123 changed files with 1869 additions and 1745 deletions
--- a/mobile/mobile_12_2.asm
+++ b/mobile/mobile_12_2.asm
@@ -242,7 +242,7 @@ Function4a94e:
 UnknownText_0x4a9be:
 	; Pick three #MON for battle.
 	text_far UnknownText_0x1c51d7
-	db "@"
+	text_end

 Function4a9c3:
 	ld hl, wd002
@@ -295,7 +295,7 @@ Function4a9d7:
 UnknownText_0x4aa1d:
 	; , @  and @ . Use these three?
 	text_far UnknownText_0x1c51f4
-	db "@"
+	text_end

 Function4aa22:
 	call ClearBGPalettes
@@ -795,7 +795,7 @@ Function4ad17:
 UnknownText_0x4ad51:
 	; Only three #MON may enter.
 	text_far UnknownText_0x1c521c
-	db "@"
+	text_end

 Function4ad56:
 	farcall OpenPartyStats
--- a/mobile/mobile_22.asm
+++ b/mobile/mobile_22.asm
@@ -2637,22 +2637,22 @@ Function8a0ff:
 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
-	db "@"
+	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
-	db "@"
+	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
-	db "@"
+	text_end

 UnknownText_0x8a111:
 	; To safely store your collection of CARDS, you must set a PASSCODE for your CARD FOLDER.
 	text_far UnknownText_0x1c5394
-	db "@"
+	text_end

 Function8a116:
 	ld a, $1
@@ -2781,17 +2781,17 @@ Function8a20d:
 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
-	db "@"
+	text_end

 UnknownText_0x8a237:
 	; Are you sure you want to delete it?
 	text_far UnknownText_0x1c5494
-	db "@"
+	text_end

 UnknownText_0x8a23c:
 	; The CARD FOLDER has been deleted.
 	text_far UnknownText_0x1c54b9
-	db "@"
+	text_end

 Function8a241:
 	call LoadStandardMenuHeader
@@ -2876,12 +2876,12 @@ MenuHeader_0x8a2ef:
 UnknownText_0x8a2f4:
 	; There is an older CARD FOLDER from a previous journey. Do you want to open it?
 	text_far UnknownText_0x1c54dd
-	db "@"
+	text_end

 UnknownText_0x8a2f9:
 	; Delete the old CARD FOLDER?
 	text_far UnknownText_0x1c552d
-	db "@"
+	text_end

 Function8a2fe:
 	call Function8a313
@@ -4154,7 +4154,7 @@ Function8ac7c:
 UnknownText_0x8ad06:
 	; Finish registering CARDS?
 	text_far UnknownText_0x1c554a
-	db "@"
+	text_end

 Function8ad0b:
 .asm_8ad0b
--- a/mobile/mobile_22_2.asm
+++ b/mobile/mobile_22_2.asm
@@ -460,27 +460,27 @@ Function8b555:
 UnknownText_0x8b5ce:
 	; Please enter any four-digit number.
 	text_far UnknownText_0x1bc187
-	db "@"
+	text_end

 UnknownText_0x8b5d3:
 	; Enter the same number to confirm.
 	text_far UnknownText_0x1bc1ac
-	db "@"
+	text_end

 UnknownText_0x8b5d8:
 	; That's not the same number.
 	text_far UnknownText_0x1bc1cf
-	db "@"
+	text_end

 UnknownText_0x8b5dd:
 	; Your PASSCODE has been set. Enter this number next time to open the CARD FOLDER.
 	text_far UnknownText_0x1bc1eb
-	db "@"
+	text_end

 UnknownText_0x8b5e2:
 	; 0000 is invalid!
 	text_far UnknownText_0x1bc23e
-	db "@"
+	text_end

 Function8b5e7:
 	ld bc, wd013
@@ -525,17 +525,17 @@ Function8b5e7:
 UnknownText_0x8b642:
 	; Enter the CARD FOLDER PASSCODE.
 	text_far UnknownText_0x1bc251
-	db "@"
+	text_end

 UnknownText_0x8b647:
 	; Incorrect PASSCODE!
 	text_far UnknownText_0x1bc272
-	db "@"
+	text_end

 UnknownText_0x8b64c:
 	; CARD FOLDER open.@ @
 	text_far UnknownText_0x1bc288
-	start_asm
+	text_asm
 	ld de, SFX_TWINKLE
 	call PlaySFX
 	call WaitSFX
@@ -543,8 +543,9 @@ UnknownText_0x8b64c:
 	call DelayFrames
 	ld hl, .string_8b663
 	ret
+
 .string_8b663
-	db "@"
+	text_end

 Function8b664:
 	push bc
--- a/mobile/mobile_40.asm
+++ b/mobile/mobile_40.asm
@@ -4803,15 +4803,15 @@ Function1021b8:

 UnknownText_0x1021d1:
 	text_far UnknownText_0x1bd19a
-	db "@"
+	text_end

 UnknownText_0x1021d6:
 	text_far UnknownText_0x1bd1ba
-	db "@"
+	text_end

 UnknownText_0x1021db:
 	text_far UnknownText_0x1bd1dd
-	db "@"
+	text_end

 Function1021e0:
 	call MenuTextBox
@@ -4821,15 +4821,15 @@ Function1021e0:

 UnknownText_0x1021ea:
 	text_far UnknownText_0x1bd201
-	db "@"
+	text_end

 UnknownText_0x1021ef:
 	text_far UnknownText_0x1bd211
-	db "@"
+	text_end

 UnknownText_0x1021f4:
 	text_far UnknownText_0x1bd223
-	db "@"
+	text_end

 Function1021f9:
 	call Function102233
@@ -6578,7 +6578,7 @@ Function102ea8:

 UnknownText_0x102ee2:
 	text_far UnknownText_0x1bd286
-	db "@"
+	text_end

 Function102ee7:
 	call Function102dc3
@@ -7497,25 +7497,31 @@ MenuData_10374f:

 UnknownText_0x10375d:
 	text_far UnknownText_0x1c422a
-	db "@"
+	text_end
+
 UnknownText_0x103762:
 	text_far UnknownText_0x1c4275
-	db "@"
+	text_end
+
 UnknownText_0x103767:
 	text_far UnknownText_0x1c4298
-	db "@"
+	text_end
+
 UnknownText_0x10376c:
 	text_far UnknownText_0x1c439c
-	db "@"
+	text_end
+
 UnknownText_0x103771:
 	text_far UnknownText_0x1c43dc
-	db "@"
+	text_end
+
 UnknownText_0x103776:
 	text_far UnknownText_0x1c4419
-	db "@"
+	text_end
+
 UnknownText_0x10377b:
 	text_far UnknownText_0x1c445a
-	db "@"
+	text_end

 Function103780:
 	ld a, [wChosenCableClubRoom]
@@ -7579,7 +7585,7 @@ Function1037c2:

 UnknownText_0x1037e6:
 	text_far UnknownText_0x1c449c
-	db "@"
+	text_end

 Function1037eb:
 	call Function103823
@@ -7609,11 +7615,11 @@ Function1037eb:

 UnknownText_0x103819:
 	text_far UnknownText_0x1c44c0
-	db "@"
+	text_end

 UnknownText_0x10381e:
 	text_far UnknownText_0x1c44e7
-	db "@"
+	text_end

 Function103823:
 	farcall Mobile_AlwaysReturnNotCarry
@@ -7661,7 +7667,7 @@ Function10383c:

 UnknownText_0x103876:
 	text_far UnknownText_0x1c4508
-	db "@"
+	text_end

 Function10387b:
 	farcall Mobile_AlwaysReturnNotCarry
@@ -7677,4 +7683,4 @@ Function10387b:

 UnknownText_0x103898:
 	text_far UnknownText_0x1c4525
-	db "@"
+	text_end
--- a/mobile/mobile_42.asm
+++ b/mobile/mobile_42.asm
@@ -1551,15 +1551,15 @@ Function108bec:

 .PlayerWillTradeMon:
 	text_far UnknownText_0x1bc787
-	db "@"
+	text_end

 .ForPartnersMon:
 	text_far UnknownText_0x1bc79d
-	db "@"
+	text_end

 .UnusedTextPlayersMonTrade:
 	text_far UnknownText_0x1bc7b0
-	db "@"
+	text_end

 Function108c16:
 	ld a, $90
@@ -1572,7 +1572,7 @@ Function108c16:

 .TakeGoodCareOfMon:
 	text_far UnknownText_0x1bc7c3
-	db "@"
+	text_end

 Function108c2b:
 	ld a, $90
@@ -1585,7 +1585,7 @@ Function108c2b:

 .PlayersMonTrade:
 	text_far UnknownText_0x1bc7dd
-	db "@"
+	text_end

 Function108c40:
 	ld a, $90
@@ -1608,11 +1608,11 @@ Function108c40:

 .TakeGoodCareOf:
 	text_far UnknownText_0x1bc7f0
-	db "@"
+	text_end

 .CameBack:
 	text_far UnknownText_0x1bc80a
-	db "@"
+	text_end

 Function108c6d:
 	ld hl, LZ_108fe7
--- a/mobile/mobile_45.asm
+++ b/mobile/mobile_45.asm
@@ -7425,11 +7425,11 @@ YesNo117ccc:

 MobileStadiumEntryText:
 	text_far _MobileStadiumEntryText
-	db "@"
+	text_end

 MobileStadiumSuccessText:
 	text_far _MobileStadiumSuccessText
-	db "@"
+	text_end

 MobileStudium_JumptableIncrement:
 	ld hl, wJumptableIndex
--- a/mobile/mobile_46.asm
+++ b/mobile/mobile_46.asm
@@ -5451,7 +5451,7 @@ Text_PartyMonTopsThisLevel:
 	done

 Text_UberRestriction:
-	text_from_ram wcd49
+	text_ram wcd49
 	text " may go"
 	line "only to BATTLE"

@@ -5494,10 +5494,10 @@ Text_WhichBattleRoom:
 	done

 Text_ThisBattleRoomPleaseWait:
-	text_from_ram wStringBuffer3
+	text_ram wStringBuffer3
 	text "'s ROOM"
 	line "@"
-	text_from_ram wStringBuffer4
+	text_ram wStringBuffer4
 	text "?"
 	cont "Please wait…"
 	done
--- a/mobile/mobile_5f.asm
+++ b/mobile/mobile_5f.asm
@@ -178,33 +178,33 @@ CheckStringForErrors:
 .loop
 	ld a, [de]
 	inc de
-	and a
+	and a ; "<NULL>"
 	jr z, .NextChar
-	cp $60
+	cp FIRST_REGULAR_TEXT_CHAR
 	jr nc, .NextChar
-	cp $4e
+	cp "<NEXT>"
 	jr z, .NextChar
 	cp "@"
 	jr z, .Done
-	cp $5
+	cp "ガ"
 	jr c, .Fail
 	cp "<PLAY_G>"
 	jr c, .NextChar
-	cp $19
+	cp "<JP_18>" + 1
 	jr c, .Fail
-	cp $1d
+	cp "<NI>"
 	jr c, .NextChar
-	cp $26
+	cp "<NO>" + 1
 	jr c, .Fail
-	cp $35
+	cp "<ROUTE>"
 	jr c, .NextChar
-	cp $3a
+	cp "<GREEN>" + 1
 	jr c, .Fail
-	cp $3f
+	cp "<ENEMY>"
 	jr c, .NextChar
-	cp $40
+	cp "<ENEMY>" + 1
 	jr c, .Fail
-	cp $49
+	cp "<MOM>"
 	jr c, .NextChar

 .Fail:
--- a/mobile/mobile_menu.asm
+++ b/mobile/mobile_menu.asm
@@ -458,12 +458,12 @@ String_4a34b:
 UnknownText_0x4a358:
 	; Delete the saved LOG-IN PASSWORD?
 	text_far UnknownText_0x1c5196
-	db "@"
+	text_end

 UnknownText_0x4a35d:
 	; Deleted the LOG-IN PASSWORD.
 	text_far UnknownText_0x1c51b9
-	db "@"
+	text_end

 DeletePassword_YesNo_MenuHeader:
 	db MENU_BACKUP_TILES ; flags