text_jump → text_far

The previous name for this was rather misleading. It isn't an actual
jump like you'd expect the `jp` instruction to behave as. Instead, it
behaves more like a `farcall`.
This also makes it consistent with its current command ID name of
`TX_FAR`.
This commit is contained in:
mid-kid
2018-10-28 17:16:55 +01:00
parent 0af682d38a
commit 940256569b
85 changed files with 851 additions and 848 deletions

View File

@@ -22,7 +22,7 @@ CheckForMobileBattleRules:
.ExcuseMeText:
; Excuse me!
text_jump UnknownText_0x1c5937
text_far UnknownText_0x1c5937
db "@"
_CheckForBattleTowerRules:
@@ -57,7 +57,7 @@ _CheckForBattleTowerRules:
JumpText_ExcuseMeYoureNotReady:
; Excuse me. You're not ready.
text_jump Text_ExcuseMeYoureNotReady
text_far Text_ExcuseMeYoureNotReady
db "@"
BattleTower_PleaseReturnWhenReady:
@@ -67,37 +67,37 @@ BattleTower_PleaseReturnWhenReady:
.PleaseReturnWhenReady:
; Please return when you're ready.
text_jump UnknownText_0x1c5962
text_far UnknownText_0x1c5962
db "@"
JumpText_NeedAtLeastThreeMon:
; You need at least three #MON.
text_jump UnknownText_0x1c5983
text_far UnknownText_0x1c5983
db "@"
JumpText_EggDoesNotQualify:
; Sorry, an EGG doesn't qualify.
text_jump UnknownText_0x1c59a3
text_far UnknownText_0x1c59a3
db "@"
JumpText_OnlyThreeMonMayBeEntered:
; Only three #MON may be entered.
text_jump Text_OnlyThreeMonMayBeEntered
text_far Text_OnlyThreeMonMayBeEntered
db "@"
JumpText_TheMonMustAllBeDifferentKinds:
; The @ #MON must all be different kinds.
text_jump Text_TheMonMustAllBeDifferentKinds
text_far Text_TheMonMustAllBeDifferentKinds
db "@"
JumpText_TheMonMustNotHoldTheSameItems:
; The @ #MON must not hold the same items.
text_jump Text_TheMonMustNotHoldTheSameItems
text_far Text_TheMonMustNotHoldTheSameItems
db "@"
JumpText_YouCantTakeAnEgg:
; You can't take an EGG!
text_jump Text_YouCantTakeAnEgg
text_far Text_YouCantTakeAnEgg
db "@"
BattleTower_ExecuteJumptable:

File diff suppressed because it is too large Load Diff

View File

@@ -148,31 +148,31 @@ BuenaPrize:
.Text_AskWhichPrize:
; Which prize would you like?
text_jump UnknownText_0x1c589f
text_far UnknownText_0x1c589f
db "@"
.Text_IsThatRight:
; ? Is that right?
text_jump UnknownText_0x1c58bc
text_far UnknownText_0x1c58bc
db "@"
.Text_HereYouGo: ; Here you go!
text_jump UnknownText_0x1c58d1
text_far UnknownText_0x1c58d1
db "@"
.Text_NotEnoughPoints:
; You don't have enough points.
text_jump UnknownText_0x1c58e0
text_far UnknownText_0x1c58e0
db "@"
.Text_NoRoom:
; You have no room for it.
text_jump UnknownText_0x1c58ff
text_far UnknownText_0x1c58ff
db "@"
.Text_PleaseComeBackAgain:
; Oh. Please come back again!
text_jump UnknownText_0x1c591a
text_far UnknownText_0x1c591a
db "@"
Buena_DisplayBlueCardBalance:

View File

@@ -34,5 +34,5 @@ BugContest_SetCaughtContestMon:
.caughttext
; Caught @ !
text_jump UnknownText_0x1c10c0
text_far UnknownText_0x1c10c0
db "@"

View File

@@ -34,10 +34,10 @@ BugCatchingContestReturnToGateScript:
BugCatchingContestText_BeeepTimesUp:
; ANNOUNCER: BEEEP! Time's up!
text_jump UnknownText_0x1bd2ca
text_far UnknownText_0x1bd2ca
db "@"
BugCatchingContestText_ContestIsOver:
; ANNOUNCER: The Contest is over!
text_jump UnknownText_0x1bd2e7
text_far UnknownText_0x1bd2e7
db "@"

View File

@@ -88,7 +88,7 @@ DisplayCaughtContestMonStats:
SwitchMonText:
; Switch #MON?
text_jump UnknownText_0x1c10cf
text_far UnknownText_0x1c10cf
db "@"
DisplayAlreadyCaughtText:
@@ -98,7 +98,7 @@ DisplayAlreadyCaughtText:
.AlreadyCaughtText:
; You already caught a @ .
text_jump UnknownText_0x1c10dd
text_far UnknownText_0x1c10dd
db "@"
DummyPredef2F:

View File

@@ -26,7 +26,7 @@ _BugContestJudging:
jp BugContest_GetPlayersResult
BugContest_FirstPlaceText:
text_jump ContestJudging_FirstPlaceText
text_far ContestJudging_FirstPlaceText
start_asm
ld de, SFX_1ST_PLACE
call PlaySFX
@@ -36,12 +36,12 @@ BugContest_FirstPlaceText:
BugContest_FirstPlaceScoreText:
; The winning score was @ points!
text_jump ContestJudging_FirstPlaceScoreText
text_far ContestJudging_FirstPlaceScoreText
db "@"
BugContest_SecondPlaceText:
; Placing second was @ , who caught a @ !@ @
text_jump ContestJudging_SecondPlaceText
text_far ContestJudging_SecondPlaceText
start_asm
ld de, SFX_2ND_PLACE
call PlaySFX
@@ -51,12 +51,12 @@ BugContest_SecondPlaceText:
BugContest_SecondPlaceScoreText:
; The score was @ points!
text_jump ContestJudging_SecondPlaceScoreText
text_far ContestJudging_SecondPlaceScoreText
db "@"
BugContest_ThirdPlaceText:
; Placing third was @ , who caught a @ !@ @
text_jump ContestJudging_ThirdPlaceText
text_far ContestJudging_ThirdPlaceText
start_asm
ld de, SFX_3RD_PLACE
call PlaySFX
@@ -66,7 +66,7 @@ BugContest_ThirdPlaceText:
BugContest_ThirdPlaceScoreText:
; The score was @ points!
text_jump ContestJudging_ThirdPlaceScoreText
text_far ContestJudging_ThirdPlaceScoreText
db "@"
LoadContestantName:

View File

@@ -168,7 +168,7 @@ DayCareAskDepositPokemon:
.DummyText:
;
text_jump UnknownText_0x1bdaa7
text_far UnknownText_0x1bdaa7
db "@"
DayCare_DepositPokemonText:
@@ -297,102 +297,102 @@ PrintDayCareText:
.DayCareManIntro:
; I'm the DAY-CARE MAN. Want me to raise a #MON?
text_jump UnknownText_0x1bdaa9
text_far UnknownText_0x1bdaa9
db "@"
.DayCareManOddEgg:
; I'm the DAY-CARE MAN. Do you know about EGGS? I was raising #MON with my wife, you see. We were shocked to find an EGG! How incredible is that? So, want me to raise a #MON?
text_jump UnknownText_0x1bdad8
text_far UnknownText_0x1bdad8
db "@"
.DayCareLadyIntro:
; I'm the DAY-CARE LADY. Should I raise a #MON for you?
text_jump UnknownText_0x1bdb85
text_far UnknownText_0x1bdb85
db "@"
.DayCareLadyOddEgg:
; I'm the DAY-CARE LADY. Do you know about EGGS? My husband and I were raising some #MON, you see. We were shocked to find an EGG! How incredible could that be? Should I raise a #MON for you?
text_jump UnknownText_0x1bdbbb
text_far UnknownText_0x1bdbbb
db "@"
.WhichOne:
; What should I raise for you?
text_jump UnknownText_0x1bdc79
text_far UnknownText_0x1bdc79
db "@"
.JustOneMon:
; Oh? But you have just one #MON.
text_jump UnknownText_0x1bdc97
text_far UnknownText_0x1bdc97
db "@"
.CantAcceptEgg:
; Sorry, but I can't accept an EGG.
text_jump UnknownText_0x1bdcb8
text_far UnknownText_0x1bdcb8
db "@"
.RemoveMail:
; Remove MAIL before you come see me.
text_jump UnknownText_0x1bdcda
text_far UnknownText_0x1bdcda
db "@"
.LastHealthyMon:
; If you give me that, what will you battle with?
text_jump UnknownText_0x1bdcff
text_far UnknownText_0x1bdcff
db "@"
.OkayIllRaiseYourMon:
; OK. I'll raise your @ .
text_jump UnknownText_0x1bdd30
text_far UnknownText_0x1bdd30
db "@"
.ComeBackForItLater:
; Come back for it later.
text_jump UnknownText_0x1bdd4b
text_far UnknownText_0x1bdd4b
db "@"
.AreWeGeniusesOrWhat:
; Are we geniuses or what? Want to see your @ ?
text_jump UnknownText_0x1bdd64
text_far UnknownText_0x1bdd64
db "@"
.AskRetrieveMon:
; Your @ has grown a lot. By level, it's grown by @ . If you want your #MON back, it will cost ¥@ .
text_jump UnknownText_0x1bdd96
text_far UnknownText_0x1bdd96
db "@"
.PerfectHeresYourMon:
; Perfect! Here's your #MON.
text_jump UnknownText_0x1bde04
text_far UnknownText_0x1bde04
db "@"
.GotBackMon:
; got back @ .
text_jump UnknownText_0x1bde1f
text_far UnknownText_0x1bde1f
db "@"
.ImmediatelyWithdrawMon:
; Huh? Back already? Your @ needs a little more time with us. If you want your #MON back, it will cost ¥100.
text_jump UnknownText_0x1bde32
text_far UnknownText_0x1bde32
db "@"
.PartyFull:
; You have no room for it.
text_jump UnknownText_0x1bdea2
text_far UnknownText_0x1bdea2
db "@"
.NotEnoughMoney:
; You don't have enough money.
text_jump UnknownText_0x1bdebc
text_far UnknownText_0x1bdebc
db "@"
.OhFineThen:
; Oh, fine then.
text_jump UnknownText_0x1bded9
text_far UnknownText_0x1bded9
db "@"
.ComeAgain:
; Come again.
text_jump UnknownText_0x1bdee9
text_far UnknownText_0x1bdee9
db "@"
DayCareManOutside:
@@ -405,7 +405,7 @@ DayCareManOutside:
.NotYet:
; Not yet…
text_jump UnknownText_0x1bdef6
text_far UnknownText_0x1bdef6
db "@"
.AskGiveEgg:
@@ -447,27 +447,27 @@ DayCareManOutside:
.IntroText:
; Ah, it's you! We were raising your #MON, and my goodness, were we surprised! Your #MON had an EGG! We don't know how it got there, but your #MON had it. You want it?
text_jump UnknownText_0x1bdf00
text_far UnknownText_0x1bdf00
db "@"
.GotEggText:
; received the EGG!
text_jump UnknownText_0x1bdfa5
text_far UnknownText_0x1bdfa5
db "@"
.TakeGoodCareOfItText:
; Take good care of it.
text_jump UnknownText_0x1bdfba
text_far UnknownText_0x1bdfba
db "@"
.IllKeepItThanksText:
; Well then, I'll keep it. Thanks!
text_jump UnknownText_0x1bdfd1
text_far UnknownText_0x1bdfd1
db "@"
.PartyFullText:
; You have no room in your party. Come back later.
text_jump UnknownText_0x1bdff2
text_far UnknownText_0x1bdff2
db "@"
DayCare_GiveEgg:

View File

@@ -139,7 +139,7 @@ Elevator_AskWhichFloor:
Elevator_WhichFloorText:
; Which floor?
text_jump UnknownText_0x1bd2bc
text_far UnknownText_0x1bd2bc
db "@"
Elevator_GetCurrentFloorText:

View File

@@ -97,21 +97,21 @@ GetFruitTreeItem:
INCLUDE "data/items/fruit_trees.asm"
FruitBearingTreeText:
text_jump _FruitBearingTreeText
text_far _FruitBearingTreeText
db "@"
HeyItsFruitText:
text_jump _HeyItsFruitText
text_far _HeyItsFruitText
db "@"
ObtainedFruitText:
text_jump _ObtainedFruitText
text_far _ObtainedFruitText
db "@"
FruitPackIsFullText:
text_jump _FruitPackIsFullText
text_far _FruitPackIsFullText
db "@"
NothingHereText:
text_jump _NothingHereText
text_far _NothingHereText
db "@"

View File

@@ -43,10 +43,10 @@ ItemFinder:
.Text_FoundSomething:
; Yes! ITEMFINDER indicates there's an item nearby.
text_jump UnknownText_0x1c0a77
text_far UnknownText_0x1c0a77
db "@"
.Text_FoundNothing:
; Nope! ITEMFINDER isn't responding.
text_jump UnknownText_0x1c0aa9
text_far UnknownText_0x1c0aa9
db "@"

View File

@@ -5,7 +5,7 @@ Kurt_PrintTextWhichApricorn:
.Text:
; Which APRICORN should I use?
text_jump UnknownText_0x1bc06b
text_far UnknownText_0x1bc06b
db "@"
Kurt_PrintTextHowMany:
@@ -15,7 +15,7 @@ Kurt_PrintTextHowMany:
.Text:
; How many should I make?
text_jump UnknownText_0x1bc089
text_far UnknownText_0x1bc089
db "@"
SelectApricornForKurt:

View File

@@ -208,12 +208,12 @@ CheckForLuckyNumberWinners:
.FoundPartymonText:
; Congratulations! We have a match with the ID number of @ in your party.
text_jump UnknownText_0x1c1261
text_far UnknownText_0x1c1261
db "@"
.FoundBoxmonText:
; Congratulations! We have a match with the ID number of @ in your PC BOX.
text_jump UnknownText_0x1c12ae
text_far UnknownText_0x1c12ae
db "@"
PrintTodaysLuckyNumber:

View File

@@ -73,7 +73,7 @@ CheckMagikarpLength:
.MeasureItText:
; Let me measure that MAGIKARP. …Hm, it measures @ .
text_jump UnknownText_0x1c1203
text_far UnknownText_0x1c1203
db "@"
Magikarp_LoadFeetInchesChars:
@@ -313,5 +313,5 @@ MagikarpHouseSign:
.CurrentRecordtext:
; "CURRENT RECORD"
text_jump UnknownText_0x1c123a
text_far UnknownText_0x1c123a
db "@"

View File

@@ -29,12 +29,12 @@ FindItemInBallScript::
.text_found
; found @ !
text_jump UnknownText_0x1c0a1c
text_far UnknownText_0x1c0a1c
db "@"
.text_bag_full
; But can't carry any more items.
text_jump UnknownText_0x1c0a2c
text_far UnknownText_0x1c0a2c
db "@"
.TryReceiveItem:

View File

@@ -7,7 +7,7 @@ RepelWoreOffScript::
.text
; REPEL's effect wore off.
text_jump UnknownText_0x1bd308
text_far UnknownText_0x1bd308
db "@"
HiddenItemScript::
@@ -33,12 +33,12 @@ HiddenItemScript::
.found_text
; found @ !
text_jump UnknownText_0x1bd321
text_far UnknownText_0x1bd321
db "@"
.no_room_text
; But has no space left…
text_jump UnknownText_0x1bd331
text_far UnknownText_0x1bd331
db "@"
SetMemEvent:

View File

@@ -391,33 +391,33 @@ DSTChecks:
.Text_AdjustClock:
; Do you want to adjust your clock for Daylight Saving Time?
text_jump UnknownText_0x1c6095
text_far UnknownText_0x1c6095
db "@"
.Text_LostInstructionBooklet:
; I lost the instruction booklet for the POKéGEAR.
; Come back again in a while.
text_jump UnknownText_0x1c60d1
text_far UnknownText_0x1c60d1
db "@"
.Text_SwitchToDST:
; Do you want to switch to Daylight Saving Time?
text_jump UnknownText_0x1c6000
text_far UnknownText_0x1c6000
db "@"
.Text_SetClockForward:
; I set the clock forward by one hour.
text_jump UnknownText_0x1c6030
text_far UnknownText_0x1c6030
db "@"
.Text_IsDSTOver:
; Is Daylight Saving Time over?
text_jump UnknownText_0x1c6056
text_far UnknownText_0x1c6056
db "@"
.Text_SetClockBack:
; I put the clock back one hour.
text_jump UnknownText_0x1c6075
text_far UnknownText_0x1c6075
db "@"
Mom_SetUpWithdrawMenu:
@@ -592,82 +592,82 @@ Mom_WithdrawDepositMenuJoypad:
UnknownText_0x16649:
; Wow, that's a cute #MON. Where did you get it? … So, you're leaving on an adventure… OK! I'll help too. But what can I do for you? I know! I'll save money for you. On a long journey, money's important. Do you want me to save your money?
text_jump UnknownText_0x1bd77f
text_far UnknownText_0x1bd77f
db "@"
UnknownText_0x1664e:
; OK, I'll take care of your money.
text_jump UnknownText_0x1bd868
text_far UnknownText_0x1bd868
db "@"
UnknownText_0x16653:
; Be careful. #MON are your friends. You need to work as a team. Now, go on!
text_jump UnknownText_0x1bd88e
text_far UnknownText_0x1bd88e
db "@"
UnknownText_0x16658:
; Hi! Welcome home! You're trying very hard, I see. I've kept your room tidy. Or is this about your money?
text_jump UnknownText_0x1bd8da
text_far UnknownText_0x1bd8da
db "@"
UnknownText_0x1665d:
; What do you want to do?
text_jump UnknownText_0x1bd942
text_far UnknownText_0x1bd942
db "@"
UnknownText_0x16662:
; How much do you want to save?
text_jump UnknownText_0x1bd95b
text_far UnknownText_0x1bd95b
db "@"
UnknownText_0x16667:
; How much do you want to take?
text_jump UnknownText_0x1bd97a
text_far UnknownText_0x1bd97a
db "@"
UnknownText_0x1666c:
; Do you want to save some money?
text_jump UnknownText_0x1bd999
text_far UnknownText_0x1bd999
db "@"
UnknownText_0x16671:
; You haven't saved that much.
text_jump UnknownText_0x1bd9ba
text_far UnknownText_0x1bd9ba
db "@"
UnknownText_0x16676:
; You can't take that much.
text_jump UnknownText_0x1bd9d7
text_far UnknownText_0x1bd9d7
db "@"
UnknownText_0x1667b:
; You don't have that much.
text_jump UnknownText_0x1bd9f1
text_far UnknownText_0x1bd9f1
db "@"
UnknownText_0x16680:
; You can't save that much.
text_jump UnknownText_0x1bda0b
text_far UnknownText_0x1bda0b
db "@"
UnknownText_0x16685:
; OK, I'll save your money. Trust me! , stick with it!
text_jump UnknownText_0x1bda25
text_far UnknownText_0x1bda25
db "@"
UnknownText_0x1668a:
; Your money's safe here! Get going!
text_jump UnknownText_0x1bda5b
text_far UnknownText_0x1bda5b
db "@"
UnknownText_0x1668f:
; , don't give up!
text_jump UnknownText_0x1bda7e
text_far UnknownText_0x1bda7e
db "@"
UnknownText_0x16694:
; Just do what you can.
text_jump UnknownText_0x1bda90
text_far UnknownText_0x1bda90
db "@"
Mom_SavedString:

View File

@@ -208,32 +208,32 @@ INCLUDE "data/items/mom_phone.asm"
_MomText_HiHowAreYou:
; Hi, ! How are you?
text_jump UnknownText_0x1bc615
text_far UnknownText_0x1bc615
db "@"
_MomText_FoundAnItem:
; I found a useful item shopping, so
text_jump UnknownText_0x1bc62a
text_far UnknownText_0x1bc62a
db "@"
_MomText_BoughtWithYourMoney:
; I bought it with your money. Sorry!
text_jump UnknownText_0x1bc64e
text_far UnknownText_0x1bc64e
db "@"
_MomText_ItsInPC:
; It's in your PC. You'll like it!
text_jump UnknownText_0x1bc673
text_far UnknownText_0x1bc673
db "@"
_MomText_FoundADoll:
; While shopping today, I saw this adorable doll, so
text_jump UnknownText_0x1bc693
text_far UnknownText_0x1bc693
db "@"
_MomText_ItsInRoom:
; It's in your room. You'll love it!
text_jump UnknownText_0x1bc6c7
text_far UnknownText_0x1bc6c7
db "@"
db 0 ; unused

View File

@@ -61,42 +61,42 @@ MoveDeletion:
.OnlyOneMoveText:
; That #MON knows only one move.
text_jump UnknownText_0x1c5eba
text_far UnknownText_0x1c5eba
db "@"
.ConfirmDeleteText:
; Oh, make it forget @ ?
text_jump UnknownText_0x1c5eda
text_far UnknownText_0x1c5eda
db "@"
.MoveDeletedText:
; Done! Your #MON forgot the move.
text_jump UnknownText_0x1c5ef5
text_far UnknownText_0x1c5ef5
db "@"
.EggText:
; An EGG doesn't know any moves!
text_jump UnknownText_0x1c5f17
text_far UnknownText_0x1c5f17
db "@"
.DeclinedDeletionText:
; No? Come visit me again.
text_jump UnknownText_0x1c5f36
text_far UnknownText_0x1c5f36
db "@"
.AskWhichMoveText:
; Which move should it forget, then?
text_jump UnknownText_0x1c5f50
text_far UnknownText_0x1c5f50
db "@"
.IntroText:
; Um… Oh, yes, I'm the MOVE DELETER. I can make #MON forget moves. Shall I make a #MON forget?
text_jump UnknownText_0x1c5f74
text_far UnknownText_0x1c5f74
db "@"
.AskWhichMonText:
; Which #MON?
text_jump UnknownText_0x1c5fd1
text_far UnknownText_0x1c5fd1
db "@"
.DeleteMove:

View File

@@ -182,54 +182,54 @@ NameRaterIntroText:
; Hello, hello! I'm the NAME RATER.
; I rate the names of #MON.
; Would you like me to rate names?
text_jump UnknownText_0x1c0043
text_far UnknownText_0x1c0043
db "@"
NameRaterWhichMonText:
; Which #MON's nickname should I rate for you?
text_jump UnknownText_0x1c00a0
text_far UnknownText_0x1c00a0
db "@"
NameRaterIsGoodText:
; Hm… @ … That's a fairly decent name.
; But, how about a slightly better nickname?
; Want me to give it a better name?
text_jump UnknownText_0x1c00cd
text_far UnknownText_0x1c00cd
db "@"
NameRaterWhichNameText:
; All right. What name should we give it, then?
text_jump UnknownText_0x1c0142
text_far UnknownText_0x1c0142
db "@"
NameRaterEvenBetterText:
; That's a better name than before! Well done!
text_jump UnknownText_0x1c0171
text_far UnknownText_0x1c0171
db "@"
NameRaterCancelText:
; OK, then. Come again sometime.
text_jump UnknownText_0x1c019e
text_far UnknownText_0x1c019e
db "@"
NameRaterTradedText:
; Hm… @ ? What a great name! It's perfect.
; Treat @ with loving care.
text_jump UnknownText_0x1c01be
text_far UnknownText_0x1c01be
db "@"
NameRaterEggText:
; Whoa… That's just an EGG.
text_jump UnknownText_0x1c0208
text_far UnknownText_0x1c0208
db "@"
NameRaterSameAsBeforeText:
; It might look the different as before,
; but this new name is much better! Well done!
text_jump UnknownText_0x1c0222
text_far UnknownText_0x1c0222
db "@"
NameRaterDoneText:
; All right. This #MON is now named @ .
text_jump UnknownText_0x1c0272
text_far UnknownText_0x1c0272
db "@"

Some files were not shown because too many files have changed in this diff Show More