Merge pull request #573 from mid-kid/master

 text_jump → text_far 

10 files changed, 69 insertions, 71 deletions

diff --git a/mobile/mobile_12_2.asm b/mobile/mobile_12_2.asm
index d886f85ed..b60dffbd5 100644
--- a/mobile/mobile_12_2.asm
+++ b/mobile/mobile_12_2.asm
@@ -241,7 +241,7 @@ Function4a94e:
 
 UnknownText_0x4a9be:
 	; Pick three #MON for battle.
-	text_jump UnknownText_0x1c51d7
+	text_far UnknownText_0x1c51d7
 	db "@"
 
 Function4a9c3:
@@ -294,7 +294,7 @@ Function4a9d7:
 
 UnknownText_0x4aa1d:
 	; , @  and @ . Use these three?
-	text_jump UnknownText_0x1c51f4
+	text_far UnknownText_0x1c51f4
 	db "@"
 
 Function4aa22:
@@ -794,7 +794,7 @@ Function4ad17:
 
 UnknownText_0x4ad51:
 	; Only three #MON may enter.
-	text_jump UnknownText_0x1c521c
+	text_far UnknownText_0x1c521c
 	db "@"
 
 Function4ad56:
diff --git a/mobile/mobile_22.asm b/mobile/mobile_22.asm
index 4c972e737..3af7171cd 100644
--- a/mobile/mobile_22.asm
+++ b/mobile/mobile_22.asm
@@ -2636,22 +2636,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_jump UnknownText_0x1c5238
+	text_far UnknownText_0x1c5238
 	db "@"
 
 UnknownText_0x8a107:
 	; This is your CARD. Once you've entered your phone number, you can trade CARDS with your friends.
-	text_jump UnknownText_0x1c52bc
+	text_far UnknownText_0x1c52bc
 	db "@"
 
 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_jump UnknownText_0x1c531e
+	text_far UnknownText_0x1c531e
 	db "@"
 
 UnknownText_0x8a111:
 	; To safely store your collection of CARDS, you must set a PASSCODE for your CARD FOLDER.
-	text_jump UnknownText_0x1c5394
+	text_far UnknownText_0x1c5394
 	db "@"
 
 Function8a116:
@@ -2780,17 +2780,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_jump UnknownText_0x1c53ee
+	text_far UnknownText_0x1c53ee
 	db "@"
 
 UnknownText_0x8a237:
 	; Are you sure you want to delete it?
-	text_jump UnknownText_0x1c5494
+	text_far UnknownText_0x1c5494
 	db "@"
 
 UnknownText_0x8a23c:
 	; The CARD FOLDER has been deleted.
-	text_jump UnknownText_0x1c54b9
+	text_far UnknownText_0x1c54b9
 	db "@"
 
 Function8a241:
@@ -2875,12 +2875,12 @@ MenuHeader_0x8a2ef:
 
 UnknownText_0x8a2f4:
 	; There is an older CARD FOLDER from a previous journey. Do you want to open it?
-	text_jump UnknownText_0x1c54dd
+	text_far UnknownText_0x1c54dd
 	db "@"
 
 UnknownText_0x8a2f9:
 	; Delete the old CARD FOLDER?
-	text_jump UnknownText_0x1c552d
+	text_far UnknownText_0x1c552d
 	db "@"
 
 Function8a2fe:
@@ -4153,7 +4153,7 @@ Function8ac7c:
 
 UnknownText_0x8ad06:
 	; Finish registering CARDS?
-	text_jump UnknownText_0x1c554a
+	text_far UnknownText_0x1c554a
 	db "@"
 
 Function8ad0b:
diff --git a/mobile/mobile_22_2.asm b/mobile/mobile_22_2.asm
index e317adb8d..94e6734d1 100644
--- a/mobile/mobile_22_2.asm
+++ b/mobile/mobile_22_2.asm
@@ -459,27 +459,27 @@ Function8b555:
 
 UnknownText_0x8b5ce:
 	; Please enter any four-digit number.
-	text_jump UnknownText_0x1bc187
+	text_far UnknownText_0x1bc187
 	db "@"
 
 UnknownText_0x8b5d3:
 	; Enter the same number to confirm.
-	text_jump UnknownText_0x1bc1ac
+	text_far UnknownText_0x1bc1ac
 	db "@"
 
 UnknownText_0x8b5d8:
 	; That's not the same number.
-	text_jump UnknownText_0x1bc1cf
+	text_far UnknownText_0x1bc1cf
 	db "@"
 
 UnknownText_0x8b5dd:
 	; Your PASSCODE has been set. Enter this number next time to open the CARD FOLDER.
-	text_jump UnknownText_0x1bc1eb
+	text_far UnknownText_0x1bc1eb
 	db "@"
 
 UnknownText_0x8b5e2:
 	; 0000 is invalid!
-	text_jump UnknownText_0x1bc23e
+	text_far UnknownText_0x1bc23e
 	db "@"
 
 Function8b5e7:
@@ -524,17 +524,17 @@ Function8b5e7:
 
 UnknownText_0x8b642:
 	; Enter the CARD FOLDER PASSCODE.
-	text_jump UnknownText_0x1bc251
+	text_far UnknownText_0x1bc251
 	db "@"
 
 UnknownText_0x8b647:
 	; Incorrect PASSCODE!
-	text_jump UnknownText_0x1bc272
+	text_far UnknownText_0x1bc272
 	db "@"
 
 UnknownText_0x8b64c:
 	; CARD FOLDER open.@ @
-	text_jump UnknownText_0x1bc288
+	text_far UnknownText_0x1bc288
 	start_asm
 	ld de, SFX_TWINKLE
 	call PlaySFX
diff --git a/mobile/mobile_40.asm b/mobile/mobile_40.asm
index 05f8a6b80..982b413d3 100644
--- a/mobile/mobile_40.asm
+++ b/mobile/mobile_40.asm
@@ -686,7 +686,7 @@ Function100493:
 Function100495:
 	jr asm_100497
 
-asm_100497
+asm_100497:
 	call Function100337
 	ret c
 	ret z
@@ -2987,7 +2987,7 @@ Function101406:
 	and a
 	ret
 
-asm_101416
+asm_101416:
 	scf
 	ret
 
@@ -4802,15 +4802,15 @@ Function1021b8:
 	ret
 
 UnknownText_0x1021d1:
-	text_jump UnknownText_0x1bd19a
+	text_far UnknownText_0x1bd19a
 	db "@"
 
 UnknownText_0x1021d6:
-	text_jump UnknownText_0x1bd1ba
+	text_far UnknownText_0x1bd1ba
 	db "@"
 
 UnknownText_0x1021db:
-	text_jump UnknownText_0x1bd1dd
+	text_far UnknownText_0x1bd1dd
 	db "@"
 
 Function1021e0:
@@ -4820,15 +4820,15 @@ Function1021e0:
 	ret
 
 UnknownText_0x1021ea:
-	text_jump UnknownText_0x1bd201
+	text_far UnknownText_0x1bd201
 	db "@"
 
 UnknownText_0x1021ef:
-	text_jump UnknownText_0x1bd211
+	text_far UnknownText_0x1bd211
 	db "@"
 
 UnknownText_0x1021f4:
-	text_jump UnknownText_0x1bd223
+	text_far UnknownText_0x1bd223
 	db "@"
 
 Function1021f9:
@@ -6577,7 +6577,7 @@ Function102ea8:
 	ret
 
 UnknownText_0x102ee2:
-	text_jump UnknownText_0x1bd286
+	text_far UnknownText_0x1bd286
 	db "@"
 
 Function102ee7:
@@ -7496,25 +7496,25 @@ MenuData_10374f:
 	db "せつめい@"
 
 UnknownText_0x10375d:
-	text_jump UnknownText_0x1c422a
+	text_far UnknownText_0x1c422a
 	db "@"
 UnknownText_0x103762:
-	text_jump UnknownText_0x1c4275
+	text_far UnknownText_0x1c4275
 	db "@"
 UnknownText_0x103767:
-	text_jump UnknownText_0x1c4298
+	text_far UnknownText_0x1c4298
 	db "@"
 UnknownText_0x10376c:
-	text_jump UnknownText_0x1c439c
+	text_far UnknownText_0x1c439c
 	db "@"
 UnknownText_0x103771:
-	text_jump UnknownText_0x1c43dc
+	text_far UnknownText_0x1c43dc
 	db "@"
 UnknownText_0x103776:
-	text_jump UnknownText_0x1c4419
+	text_far UnknownText_0x1c4419
 	db "@"
 UnknownText_0x10377b:
-	text_jump UnknownText_0x1c445a
+	text_far UnknownText_0x1c445a
 	db "@"
 
 Function103780:
@@ -7578,7 +7578,7 @@ Function1037c2:
 	ret
 
 UnknownText_0x1037e6:
-	text_jump UnknownText_0x1c449c
+	text_far UnknownText_0x1c449c
 	db "@"
 
 Function1037eb:
@@ -7608,11 +7608,11 @@ Function1037eb:
 	ret
 
 UnknownText_0x103819:
-	text_jump UnknownText_0x1c44c0
+	text_far UnknownText_0x1c44c0
 	db "@"
 
 UnknownText_0x10381e:
-	text_jump UnknownText_0x1c44e7
+	text_far UnknownText_0x1c44e7
 	db "@"
 
 Function103823:
@@ -7660,7 +7660,7 @@ Function10383c:
 	ret
 
 UnknownText_0x103876:
-	text_jump UnknownText_0x1c4508
+	text_far UnknownText_0x1c4508
 	db "@"
 
 Function10387b:
@@ -7676,5 +7676,5 @@ Function10387b:
 	ret
 
 UnknownText_0x103898:
-	text_jump UnknownText_0x1c4525
+	text_far UnknownText_0x1c4525
 	db "@"
diff --git a/mobile/mobile_41.asm b/mobile/mobile_41.asm
index e772ce14b..da5e95347 100644
--- a/mobile/mobile_41.asm
+++ b/mobile/mobile_41.asm
@@ -1079,7 +1079,7 @@ Function1064d8:
 	ldh [rSVBK], a
 	jr asm_1064ed
 
-asm_1064ed
+asm_1064ed:
 	ld de, wDecompressScratch
 	ld b, $0
 	ldh a, [rSVBK]
diff --git a/mobile/mobile_42.asm b/mobile/mobile_42.asm
index 48684f383..f44ad55dc 100644
--- a/mobile/mobile_42.asm
+++ b/mobile/mobile_42.asm
@@ -1183,7 +1183,7 @@ Function10895e:
 
 Function108963:
 	ld de, vTiles2 tile $31
-asm_108966
+asm_108966:
 	call DelayFrame
 	ld hl, vTiles2
 	lb bc, $a, $31 ; $a is the bank of ?????
@@ -1550,15 +1550,15 @@ Function108bec:
 	ret
 
 .PlayerWillTradeMon:
-	text_jump UnknownText_0x1bc787
+	text_far UnknownText_0x1bc787
 	db "@"
 
 .ForPartnersMon:
-	text_jump UnknownText_0x1bc79d
+	text_far UnknownText_0x1bc79d
 	db "@"
 
 .UnusedTextPlayersMonTrade:
-	text_jump UnknownText_0x1bc7b0
+	text_far UnknownText_0x1bc7b0
 	db "@"
 
 Function108c16:
@@ -1571,7 +1571,7 @@ Function108c16:
 	ret
 
 .TakeGoodCareOfMon:
-	text_jump UnknownText_0x1bc7c3
+	text_far UnknownText_0x1bc7c3
 	db "@"
 
 Function108c2b:
@@ -1584,7 +1584,7 @@ Function108c2b:
 	ret
 
 .PlayersMonTrade:
-	text_jump UnknownText_0x1bc7dd
+	text_far UnknownText_0x1bc7dd
 	db "@"
 
 Function108c40:
@@ -1607,11 +1607,11 @@ Function108c40:
 	ret
 
 .TakeGoodCareOf:
-	text_jump UnknownText_0x1bc7f0
+	text_far UnknownText_0x1bc7f0
 	db "@"
 
 .CameBack:
-	text_jump UnknownText_0x1bc80a
+	text_far UnknownText_0x1bc80a
 	db "@"
 
 Function108c6d:
diff --git a/mobile/mobile_45.asm b/mobile/mobile_45.asm
index fefa145c5..461009fad 100644
--- a/mobile/mobile_45.asm
+++ b/mobile/mobile_45.asm
@@ -5534,8 +5534,7 @@ Function1167a6:
 	ld hl, wc312
 	inc [hl]
 
-asm_1167af
-.asm_1167af
+asm_1167af:
 	ld a, [wc311]
 	cp $ff
 	ret z
@@ -5562,7 +5561,7 @@ asm_1167af
 	jr nz, .asm_1167e3
 	xor a
 	ld [wc312], a
-	jr .asm_1167af
+	jr asm_1167af
 
 .asm_1167dc
 	ld a, $ff
@@ -7425,11 +7424,11 @@ YesNo117ccc:
 	next "いいえ@"
 
 MobileStadiumEntryText:
-	text_jump _MobileStadiumEntryText
+	text_far _MobileStadiumEntryText
 	db "@"
 
 MobileStadiumSuccessText:
-	text_jump _MobileStadiumSuccessText
+	text_far _MobileStadiumSuccessText
 	db "@"
 
 MobileStudium_JumptableIncrement:
diff --git a/mobile/mobile_46.asm b/mobile/mobile_46.asm
index 8a795536a..6e4188dac 100644
--- a/mobile/mobile_46.asm
+++ b/mobile/mobile_46.asm
@@ -9,7 +9,7 @@ Function118007:
 	xor a
 	ld [wcd38], a
 
-asm_11800b
+asm_11800b:
 	call BattleTowerRoomMenu_InitRAM
 	ld a, $18
 	ld [wcd33], a
@@ -1022,7 +1022,7 @@ Function11886a:
 Function11886e:
 	xor a
 
-asm_11886f
+asm_11886f:
 	ld [wBGMapPalBuffer], a
 	ld a, $0
 	ld [wcd3c], a
@@ -1562,7 +1562,7 @@ Function118d9b:
 	call BattleTowerRoomMenu2
 	ret c
 
-asm_118d9f
+asm_118d9f:
 	ld hl, $c608
 	call Function119940
 	ld a, [wcd38]
@@ -1655,16 +1655,15 @@ Function118e06:
 	jr asm_118e3e
 
 Function118e39:
-.asm_118e39
 	ld a, [hli]
 	and a
-	jr nz, .asm_118e39
+	jr nz, Function118e39
 	dec hl
-asm_118e3e
-.asm_118e3e
+
+asm_118e3e:
 	ld a, [hld]
 	cp $2f
-	jr nz, .asm_118e3e
+	jr nz, asm_118e3e
 	inc hl
 	inc hl
 	ld de, wcd85
@@ -3564,7 +3563,7 @@ Function119b45:
 	ld a, [wcf65]
 	ld h, a
 
-asm_119b4d
+asm_119b4d:
 	ld a, $26
 	jp Function119e2b
 
@@ -6444,13 +6443,13 @@ Function11b267:
 	ld [hl], $ef
 	ret
 
-asm_11b26a
+asm_11b26a:
 	xor a
 	ld [bc], a
 	ld [hl], $7f
 	ret
 
-asm_11b26f
+asm_11b26f:
 	ld a, $2
 	ld [bc], a
 
diff --git a/mobile/mobile_5f.asm b/mobile/mobile_5f.asm
index c37ecd4c6..dbaa0f43e 100644
--- a/mobile/mobile_5f.asm
+++ b/mobile/mobile_5f.asm
@@ -1109,7 +1109,7 @@ Function17d711:
 	ld l, a
 	jp hl
 
-asm_17d721
+asm_17d721:
 	call Function17e5af
 	ld a, $2
 	ld [wcd77], a
@@ -2571,7 +2571,7 @@ Function17e026:
 	ld bc, $1a
 	add hl, bc
 
-asm_17e0ee
+asm_17e0ee:
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
diff --git a/mobile/mobile_menu.asm b/mobile/mobile_menu.asm
index ba8ae5784..4b31dba87 100644
--- a/mobile/mobile_menu.asm
+++ b/mobile/mobile_menu.asm
@@ -457,12 +457,12 @@ String_4a34b:
 
 UnknownText_0x4a358:
 	; Delete the saved LOG-IN PASSWORD?
-	text_jump UnknownText_0x1c5196
+	text_far UnknownText_0x1c5196
 	db "@"
 
 UnknownText_0x4a35d:
 	; Deleted the LOG-IN PASSWORD.
-	text_jump UnknownText_0x1c51b9
+	text_far UnknownText_0x1c51b9
 	db "@"
 
 DeletePassword_YesNo_MenuHeader: