diff --git a/engine/battle/ai/items.asm b/engine/battle/ai/items.asm index cccea4e00..2bc92c719 100644 --- a/engine/battle/ai/items.asm +++ b/engine/battle/ai/items.asm @@ -708,7 +708,7 @@ AI_Switch: ret TextJump_EnemyWithdrew: - text_jump Text_EnemyWithdrew + text_far Text_EnemyWithdrew db "@" Function384d5: ; This appears to be unused @@ -828,5 +828,5 @@ PrintText_UsedItemOn: jp PrintText TextJump_EnemyUsedOn: - text_jump Text_EnemyUsedOn + text_far Text_EnemyUsedOn db "@" diff --git a/engine/battle/core.asm b/engine/battle/core.asm index bee241e3c..cb2c7e330 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -7398,7 +7398,7 @@ BoostExp: ret Text_MonGainedExpPoint: - text_jump Text_Gained + text_far Text_Gained start_asm ld hl, TextJump_StringBuffer2ExpPoints ld a, [wStringBuffer2 + 2] ; IsTradedMon @@ -7409,11 +7409,11 @@ Text_MonGainedExpPoint: ret TextJump_ABoostedStringBuffer2ExpPoints: - text_jump Text_ABoostedStringBuffer2ExpPoints + text_far Text_ABoostedStringBuffer2ExpPoints db "@" TextJump_StringBuffer2ExpPoints: - text_jump Text_StringBuffer2ExpPoints + text_far Text_StringBuffer2ExpPoints db "@" AnimateExpBar: @@ -7664,29 +7664,29 @@ SendOutMonText: jp BattleTextBox JumpText_GoMon: - text_jump Text_GoMon + text_far Text_GoMon start_asm jr Function_TextJump_BattleMonNick01 JumpText_DoItMon: - text_jump Text_DoItMon + text_far Text_DoItMon start_asm jr Function_TextJump_BattleMonNick01 JumpText_GoForItMon: - text_jump Text_GoForItMon + text_far Text_GoForItMon start_asm jr Function_TextJump_BattleMonNick01 JumpText_YourFoesWeakGetmMon: - text_jump Text_YourFoesWeakGetmMon + text_far Text_YourFoesWeakGetmMon start_asm Function_TextJump_BattleMonNick01: ld hl, TextJump_BattleMonNick01 ret TextJump_BattleMonNick01: - text_jump Text_BattleMonNick01 + text_far Text_BattleMonNick01 db "@" WithdrawMonText: @@ -7694,7 +7694,7 @@ WithdrawMonText: jp BattleTextBox .WithdrawMonText: - text_jump Text_BattleMonNickComma + text_far Text_BattleMonNickComma start_asm ; Print text to withdraw mon ; depending on HP the message is different @@ -7745,15 +7745,15 @@ WithdrawMonText: ret TextJump_ThatsEnoughComeBack: - text_jump Text_ThatsEnoughComeBack + text_far Text_ThatsEnoughComeBack db "@" TextJump_OKComeBack: - text_jump Text_OKComeBack + text_far Text_OKComeBack db "@" TextJump_GoodComeBack: - text_jump Text_GoodComeBack + text_far Text_GoodComeBack db "@" Unreferenced_TextJump_ComeBack: @@ -7762,7 +7762,7 @@ Unreferenced_TextJump_ComeBack: ret TextJump_ComeBack: - text_jump Text_ComeBack + text_far Text_ComeBack db "@" Unreferenced_HandleSafariAngerEatingStatus: diff --git a/engine/battle/effect_commands.asm b/engine/battle/effect_commands.asm index 95a0475bf..2dafc04ba 100644 --- a/engine/battle/effect_commands.asm +++ b/engine/battle/effect_commands.asm @@ -4542,7 +4542,7 @@ BattleCommand_StatUpMessage: jp BattleTextBox .stat - text_jump UnknownText_0x1c0cc6 + text_far UnknownText_0x1c0cc6 start_asm ld hl, .up ld a, [wLoweredStat] @@ -4552,11 +4552,11 @@ BattleCommand_StatUpMessage: ret .wayup - text_jump UnknownText_0x1c0cd0 + text_far UnknownText_0x1c0cd0 db "@" .up - text_jump UnknownText_0x1c0ce0 + text_far UnknownText_0x1c0ce0 db "@" BattleCommand_StatDownMessage: @@ -4572,7 +4572,7 @@ BattleCommand_StatDownMessage: jp BattleTextBox .stat - text_jump UnknownText_0x1c0ceb + text_far UnknownText_0x1c0ceb start_asm ld hl, .fell ld a, [wLoweredStat] @@ -4582,10 +4582,10 @@ BattleCommand_StatDownMessage: ret .sharplyfell - text_jump UnknownText_0x1c0cf5 + text_far UnknownText_0x1c0cf5 db "@" .fell - text_jump UnknownText_0x1c0d06 + text_far UnknownText_0x1c0d06 db "@" TryLowerStat: @@ -5636,7 +5636,7 @@ BattleCommand_Charge: jp EndMoveEffect .UsedText: - text_jump UnknownText_0x1c0d0e ; "" + text_far UnknownText_0x1c0d0e ; "" start_asm ld a, BATTLE_VARS_MOVE_ANIM call GetBattleVar @@ -5668,32 +5668,32 @@ BattleCommand_Charge: .RazorWind: ; 'made a whirlwind!' - text_jump UnknownText_0x1c0d12 + text_far UnknownText_0x1c0d12 db "@" .Solarbeam: ; 'took in sunlight!' - text_jump UnknownText_0x1c0d26 + text_far UnknownText_0x1c0d26 db "@" .SkullBash: ; 'lowered its head!' - text_jump UnknownText_0x1c0d3a + text_far UnknownText_0x1c0d3a db "@" .SkyAttack: ; 'is glowing!' - text_jump UnknownText_0x1c0d4e + text_far UnknownText_0x1c0d4e db "@" .Fly: ; 'flew up high!' - text_jump UnknownText_0x1c0d5c + text_far UnknownText_0x1c0d5c db "@" .Dig: ; 'dug a hole!' - text_jump UnknownText_0x1c0d6c + text_far UnknownText_0x1c0d6c db "@" BattleCommand3c: diff --git a/engine/battle/used_move_text.asm b/engine/battle/used_move_text.asm index 656f2ba1f..11e004a21 100644 --- a/engine/battle/used_move_text.asm +++ b/engine/battle/used_move_text.asm @@ -6,7 +6,7 @@ DisplayUsedMoveText: UsedMoveText: ; this is a stream of text and asm from 105db9 to 105ef6 - text_jump _ActorNameText + text_far _ActorNameText start_asm ldh a, [hBattleTurn] and a @@ -58,12 +58,12 @@ UsedMoveText: ret UsedMove1Text: - text_jump _UsedMove1Text + text_far _UsedMove1Text start_asm jr UsedMoveText_CheckObedience UsedMove2Text: - text_jump _UsedMove2Text + text_far _UsedMove2Text start_asm UsedMoveText_CheckObedience: ; check obedience @@ -75,14 +75,14 @@ UsedMoveText_CheckObedience: ret .UsedInsteadText: - text_jump _UsedInsteadText + text_far _UsedInsteadText start_asm .GetMoveNameText: ld hl, MoveNameText ret MoveNameText: - text_jump _MoveNameText + text_far _MoveNameText start_asm ; get start address ld hl, .endusedmovetexts @@ -115,19 +115,19 @@ MoveNameText: dw EndUsedMove5Text EndUsedMove1Text: - text_jump _EndUsedMove1Text + text_far _EndUsedMove1Text db "@" EndUsedMove2Text: - text_jump _EndUsedMove2Text + text_far _EndUsedMove2Text db "@" EndUsedMove3Text: - text_jump _EndUsedMove3Text + text_far _EndUsedMove3Text db "@" EndUsedMove4Text: - text_jump _EndUsedMove4Text + text_far _EndUsedMove4Text db "@" EndUsedMove5Text: - text_jump _EndUsedMove5Text + text_far _EndUsedMove5Text db "@" GetMoveGrammar: diff --git a/engine/events/battle_tower/rules.asm b/engine/events/battle_tower/rules.asm index 6a2990118..da51b3f7f 100644 --- a/engine/events/battle_tower/rules.asm +++ b/engine/events/battle_tower/rules.asm @@ -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: diff --git a/engine/events/battle_tower/trainer_text.asm b/engine/events/battle_tower/trainer_text.asm index 0743741e6..6aac7f007 100644 --- a/engine/events/battle_tower/trainer_text.asm +++ b/engine/events/battle_tower/trainer_text.asm @@ -231,481 +231,481 @@ BTFemaleTrainerTexts: dw BTWinF15 BTGreetingM1: - text_jump BattleTowerText_0x1ec000 + text_far BattleTowerText_0x1ec000 db "@" BTLossM1: - text_jump BattleTowerText_0x1ec03b + text_far BattleTowerText_0x1ec03b db "@" BTWinM1: - text_jump UnknownText_0x1ec060 + text_far UnknownText_0x1ec060 db "@" BTGreetingM2: - text_jump BattleTowerText_0x1ec080 + text_far BattleTowerText_0x1ec080 db "@" BTLossM2: - text_jump UnknownText_0x1ec0a3 + text_far UnknownText_0x1ec0a3 db "@" BTWinM2: - text_jump UnknownText_0x1ec0c4 + text_far UnknownText_0x1ec0c4 db "@" BTGreetingM3: - text_jump UnknownText_0x1ec0e1 + text_far UnknownText_0x1ec0e1 db "@" BTLossM3: - text_jump UnknownText_0x1ec108 + text_far UnknownText_0x1ec108 db "@" BTWinM3: - text_jump UnknownText_0x1ec12a + text_far UnknownText_0x1ec12a db "@" BTGreetingM4: - text_jump UnknownText_0x1ec14d + text_far UnknownText_0x1ec14d db "@" BTLossM4: - text_jump UnknownText_0x1ec16f + text_far UnknownText_0x1ec16f db "@" BTWinM4: - text_jump UnknownText_0x1ec190 + text_far UnknownText_0x1ec190 db "@" BTGreetingM5: - text_jump UnknownText_0x1ec1ae + text_far UnknownText_0x1ec1ae db "@" BTLossM5: - text_jump UnknownText_0x1ec1d0 + text_far UnknownText_0x1ec1d0 db "@" BTWinM5: - text_jump UnknownText_0x1ec1f4 + text_far UnknownText_0x1ec1f4 db "@" BTGreetingM6: - text_jump UnknownText_0x1ec216 + text_far UnknownText_0x1ec216 db "@" BTLossM6: - text_jump UnknownText_0x1ec238 + text_far UnknownText_0x1ec238 db "@" BTWinM6: - text_jump UnknownText_0x1ec259 + text_far UnknownText_0x1ec259 db "@" BTGreetingM7: - text_jump UnknownText_0x1ec27b + text_far UnknownText_0x1ec27b db "@" BTLossM7: - text_jump UnknownText_0x1ec2a0 + text_far UnknownText_0x1ec2a0 db "@" BTWinM7: - text_jump UnknownText_0x1ec2c0 + text_far UnknownText_0x1ec2c0 db "@" BTGreetingM8: - text_jump UnknownText_0x1ec2d9 + text_far UnknownText_0x1ec2d9 db "@" BTLossM8: - text_jump UnknownText_0x1ec2fe + text_far UnknownText_0x1ec2fe db "@" BTWinM8: - text_jump UnknownText_0x1ec320 + text_far UnknownText_0x1ec320 db "@" BTGreetingM9: - text_jump UnknownText_0x1ec33f + text_far UnknownText_0x1ec33f db "@" BTLossM9: - text_jump UnknownText_0x1ec36c + text_far UnknownText_0x1ec36c db "@" BTWinM9: - text_jump UnknownText_0x1ec389 + text_far UnknownText_0x1ec389 db "@" BTGreetingM10: - text_jump UnknownText_0x1ec3ad + text_far UnknownText_0x1ec3ad db "@" BTLossM10: - text_jump UnknownText_0x1ec3c5 + text_far UnknownText_0x1ec3c5 db "@" BTWinM10: - text_jump UnknownText_0x1ec3e5 + text_far UnknownText_0x1ec3e5 db "@" BTGreetingM11: - text_jump UnknownText_0x1ec402 + text_far UnknownText_0x1ec402 db "@" BTLossM11: - text_jump UnknownText_0x1ec411 + text_far UnknownText_0x1ec411 db "@" BTWinM11: - text_jump UnknownText_0x1ec41f + text_far UnknownText_0x1ec41f db "@" BTGreetingM12: - text_jump UnknownText_0x1ec42e + text_far UnknownText_0x1ec42e db "@" BTLossM12: - text_jump UnknownText_0x1ec461 + text_far UnknownText_0x1ec461 db "@" BTWinM12: - text_jump UnknownText_0x1ec4a0 + text_far UnknownText_0x1ec4a0 db "@" BTGreetingM13: - text_jump UnknownText_0x1ec4d6 + text_far UnknownText_0x1ec4d6 db "@" BTLossM13: - text_jump UnknownText_0x1ec4f5 + text_far UnknownText_0x1ec4f5 db "@" BTWinM13: - text_jump UnknownText_0x1ec512 + text_far UnknownText_0x1ec512 db "@" BTGreetingM14: - text_jump UnknownText_0x1ec532 + text_far UnknownText_0x1ec532 db "@" BTLossM14: - text_jump UnknownText_0x1ec54b + text_far UnknownText_0x1ec54b db "@" BTWinM14: - text_jump UnknownText_0x1ec565 + text_far UnknownText_0x1ec565 db "@" BTGreetingM15: - text_jump UnknownText_0x1ec580 + text_far UnknownText_0x1ec580 db "@" BTLossM15: - text_jump UnknownText_0x1ec59d + text_far UnknownText_0x1ec59d db "@" BTWinM15: - text_jump UnknownText_0x1ec5b5 + text_far UnknownText_0x1ec5b5 db "@" BTGreetingM16: - text_jump UnknownText_0x1ec5d3 + text_far UnknownText_0x1ec5d3 db "@" BTLossM16: - text_jump UnknownText_0x1ec5ee + text_far UnknownText_0x1ec5ee db "@" BTWinM16: - text_jump UnknownText_0x1ec60d + text_far UnknownText_0x1ec60d db "@" BTGreetingM17: - text_jump UnknownText_0x1ec631 + text_far UnknownText_0x1ec631 db "@" BTLossM17: - text_jump UnknownText_0x1ec651 + text_far UnknownText_0x1ec651 db "@" BTWinM17: - text_jump UnknownText_0x1ec68f + text_far UnknownText_0x1ec68f db "@" BTGreetingM18: - text_jump UnknownText_0x1ec6b1 + text_far UnknownText_0x1ec6b1 db "@" BTLossM18: - text_jump UnknownText_0x1ec6d0 + text_far UnknownText_0x1ec6d0 db "@" BTWinM18: - text_jump UnknownText_0x1ec708 + text_far UnknownText_0x1ec708 db "@" BTGreetingM19: - text_jump UnknownText_0x1ec720 + text_far UnknownText_0x1ec720 db "@" BTLossM19: - text_jump UnknownText_0x1ec73e + text_far UnknownText_0x1ec73e db "@" BTWinM19: - text_jump UnknownText_0x1ec75b + text_far UnknownText_0x1ec75b db "@" BTGreetingM20: - text_jump UnknownText_0x1ec77f + text_far UnknownText_0x1ec77f db "@" BTLossM20: - text_jump UnknownText_0x1ec798 + text_far UnknownText_0x1ec798 db "@" BTWinM20: - text_jump UnknownText_0x1ec7bb + text_far UnknownText_0x1ec7bb db "@" BTGreetingM21: - text_jump UnknownText_0x1ec7d8 + text_far UnknownText_0x1ec7d8 db "@" BTLossM21: - text_jump UnknownText_0x1ec818 + text_far UnknownText_0x1ec818 db "@" BTWinM21: - text_jump UnknownText_0x1ec837 + text_far UnknownText_0x1ec837 db "@" BTGreetingM22: - text_jump UnknownText_0x1ec858 + text_far UnknownText_0x1ec858 db "@" BTLossM22: - text_jump UnknownText_0x1ec876 + text_far UnknownText_0x1ec876 db "@" BTWinM22: - text_jump UnknownText_0x1ec898 + text_far UnknownText_0x1ec898 db "@" BTGreetingM23: - text_jump UnknownText_0x1ec8b1 + text_far UnknownText_0x1ec8b1 db "@" BTLossM23: - text_jump UnknownText_0x1ec8d5 + text_far UnknownText_0x1ec8d5 db "@" BTWinM23: - text_jump UnknownText_0x1ec8f0 + text_far UnknownText_0x1ec8f0 db "@" BTGreetingM24: - text_jump UnknownText_0x1ec911 + text_far UnknownText_0x1ec911 db "@" BTLossM24: - text_jump UnknownText_0x1ec928 + text_far UnknownText_0x1ec928 db "@" BTWinM24: - text_jump UnknownText_0x1ec949 + text_far UnknownText_0x1ec949 db "@" BTGreetingM25: - text_jump UnknownText_0x1ec969 + text_far UnknownText_0x1ec969 db "@" BTLossM25: - text_jump UnknownText_0x1ec986 + text_far UnknownText_0x1ec986 db "@" BTWinM25: - text_jump UnknownText_0x1ec99b + text_far UnknownText_0x1ec99b db "@" BTGreetingF1: - text_jump UnknownText_0x1ec9bd + text_far UnknownText_0x1ec9bd db "@" BTLossF1: - text_jump UnknownText_0x1ec9d9 + text_far UnknownText_0x1ec9d9 db "@" BTWinF1: - text_jump UnknownText_0x1ec9f7 + text_far UnknownText_0x1ec9f7 db "@" BTGreetingF2: - text_jump UnknownText_0x1eca0a + text_far UnknownText_0x1eca0a db "@" BTLossF2: - text_jump UnknownText_0x1eca2a + text_far UnknownText_0x1eca2a db "@" BTWinF2: - text_jump UnknownText_0x1eca47 + text_far UnknownText_0x1eca47 db "@" BTGreetingF3: - text_jump UnknownText_0x1eca64 + text_far UnknownText_0x1eca64 db "@" BTLossF3: - text_jump UnknownText_0x1eca82 + text_far UnknownText_0x1eca82 db "@" BTWinF3: - text_jump UnknownText_0x1eca9d + text_far UnknownText_0x1eca9d db "@" BTGreetingF4: - text_jump UnknownText_0x1ecabf + text_far UnknownText_0x1ecabf db "@" BTLossF4: - text_jump UnknownText_0x1ecade + text_far UnknownText_0x1ecade db "@" BTWinF4: - text_jump UnknownText_0x1ecafa + text_far UnknownText_0x1ecafa db "@" BTGreetingF5: - text_jump UnknownText_0x1ecb19 + text_far UnknownText_0x1ecb19 db "@" BTLossF5: - text_jump UnknownText_0x1ecb37 + text_far UnknownText_0x1ecb37 db "@" BTWinF5: - text_jump UnknownText_0x1ecb55 + text_far UnknownText_0x1ecb55 db "@" BTGreetingF6: - text_jump UnknownText_0x1ecb70 + text_far UnknownText_0x1ecb70 db "@" BTLossF6: - text_jump UnknownText_0x1ecb92 + text_far UnknownText_0x1ecb92 db "@" BTWinF6: - text_jump UnknownText_0x1ecbb6 + text_far UnknownText_0x1ecbb6 db "@" BTGreetingF7: - text_jump UnknownText_0x1ecbd9 + text_far UnknownText_0x1ecbd9 db "@" BTLossF7: - text_jump UnknownText_0x1ecbf3 + text_far UnknownText_0x1ecbf3 db "@" BTWinF7: - text_jump UnknownText_0x1ecc15 + text_far UnknownText_0x1ecc15 db "@" BTGreetingF8: - text_jump UnknownText_0x1ecc39 + text_far UnknownText_0x1ecc39 db "@" BTLossF8: - text_jump UnknownText_0x1ecc55 + text_far UnknownText_0x1ecc55 db "@" BTWinF8: - text_jump UnknownText_0x1ecc75 + text_far UnknownText_0x1ecc75 db "@" BTGreetingF9: - text_jump UnknownText_0x1ecc92 + text_far UnknownText_0x1ecc92 db "@" BTLossF9: - text_jump UnknownText_0x1ecca7 + text_far UnknownText_0x1ecca7 db "@" BTWinF9: - text_jump UnknownText_0x1eccc1 + text_far UnknownText_0x1eccc1 db "@" BTGreetingF10: - text_jump UnknownText_0x1eccd7 + text_far UnknownText_0x1eccd7 db "@" BTLossF10: - text_jump UnknownText_0x1eccef + text_far UnknownText_0x1eccef db "@" BTWinF10: - text_jump UnknownText_0x1ecd0e + text_far UnknownText_0x1ecd0e db "@" BTGreetingF11: - text_jump UnknownText_0x1ecd2b + text_far UnknownText_0x1ecd2b db "@" BTLossF11: - text_jump UnknownText_0x1ecd4d + text_far UnknownText_0x1ecd4d db "@" BTWinF11: - text_jump UnknownText_0x1ecd6b + text_far UnknownText_0x1ecd6b db "@" BTGreetingF12: - text_jump UnknownText_0x1ecd8d + text_far UnknownText_0x1ecd8d db "@" BTLossF12: - text_jump UnknownText_0x1ecdaf + text_far UnknownText_0x1ecdaf db "@" BTWinF12: - text_jump UnknownText_0x1ecdcf + text_far UnknownText_0x1ecdcf db "@" BTGreetingF13: - text_jump UnknownText_0x1ecded + text_far UnknownText_0x1ecded db "@" BTLossF13: - text_jump UnknownText_0x1ece0d + text_far UnknownText_0x1ece0d db "@" BTWinF13: - text_jump UnknownText_0x1ece2a + text_far UnknownText_0x1ece2a db "@" BTGreetingF14: - text_jump UnknownText_0x1ece4b + text_far UnknownText_0x1ece4b db "@" BTLossF14: - text_jump UnknownText_0x1ece70 + text_far UnknownText_0x1ece70 db "@" BTWinF14: - text_jump UnknownText_0x1ece8a + text_far UnknownText_0x1ece8a db "@" BTGreetingF15: - text_jump UnknownText_0x1ecea8 + text_far UnknownText_0x1ecea8 db "@" BTLossF15: - text_jump UnknownText_0x1ecec9 + text_far UnknownText_0x1ecec9 db "@" BTWinF15: - text_jump UnknownText_0x1ecee8 + text_far UnknownText_0x1ecee8 db "@" diff --git a/engine/events/buena.asm b/engine/events/buena.asm index 3b8fa26f1..5b580c7f2 100644 --- a/engine/events/buena.asm +++ b/engine/events/buena.asm @@ -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: diff --git a/engine/events/bug_contest/caught_mon.asm b/engine/events/bug_contest/caught_mon.asm index fc170cf28..4d62f189e 100644 --- a/engine/events/bug_contest/caught_mon.asm +++ b/engine/events/bug_contest/caught_mon.asm @@ -34,5 +34,5 @@ BugContest_SetCaughtContestMon: .caughttext ; Caught @ ! - text_jump UnknownText_0x1c10c0 + text_far UnknownText_0x1c10c0 db "@" diff --git a/engine/events/bug_contest/contest.asm b/engine/events/bug_contest/contest.asm index 4cf4f949a..8937d024f 100644 --- a/engine/events/bug_contest/contest.asm +++ b/engine/events/bug_contest/contest.asm @@ -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 "@" diff --git a/engine/events/bug_contest/display_stats.asm b/engine/events/bug_contest/display_stats.asm index 9d92f8fe3..3232b3f37 100644 --- a/engine/events/bug_contest/display_stats.asm +++ b/engine/events/bug_contest/display_stats.asm @@ -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: diff --git a/engine/events/bug_contest/judging.asm b/engine/events/bug_contest/judging.asm index a23535998..276104788 100644 --- a/engine/events/bug_contest/judging.asm +++ b/engine/events/bug_contest/judging.asm @@ -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: diff --git a/engine/events/daycare.asm b/engine/events/daycare.asm index 04e1c9090..ee176a702 100644 --- a/engine/events/daycare.asm +++ b/engine/events/daycare.asm @@ -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: diff --git a/engine/events/elevator.asm b/engine/events/elevator.asm index 705b24992..8a42874cd 100644 --- a/engine/events/elevator.asm +++ b/engine/events/elevator.asm @@ -139,7 +139,7 @@ Elevator_AskWhichFloor: Elevator_WhichFloorText: ; Which floor? - text_jump UnknownText_0x1bd2bc + text_far UnknownText_0x1bd2bc db "@" Elevator_GetCurrentFloorText: diff --git a/engine/events/fruit_trees.asm b/engine/events/fruit_trees.asm index 15fa4f80f..54ac788fd 100644 --- a/engine/events/fruit_trees.asm +++ b/engine/events/fruit_trees.asm @@ -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 "@" diff --git a/engine/events/itemfinder.asm b/engine/events/itemfinder.asm index 6a4d6edf3..4a465345a 100644 --- a/engine/events/itemfinder.asm +++ b/engine/events/itemfinder.asm @@ -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 "@" diff --git a/engine/events/kurt.asm b/engine/events/kurt.asm index 9d4ed3e11..2ca502462 100644 --- a/engine/events/kurt.asm +++ b/engine/events/kurt.asm @@ -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: diff --git a/engine/events/lucky_number.asm b/engine/events/lucky_number.asm index 1c3a8dc02..9d7aac4db 100644 --- a/engine/events/lucky_number.asm +++ b/engine/events/lucky_number.asm @@ -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: diff --git a/engine/events/magikarp.asm b/engine/events/magikarp.asm index 155ebfde5..b5932eebe 100644 --- a/engine/events/magikarp.asm +++ b/engine/events/magikarp.asm @@ -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 "@" diff --git a/engine/events/misc_scripts.asm b/engine/events/misc_scripts.asm index f88e72c45..95a80cc69 100644 --- a/engine/events/misc_scripts.asm +++ b/engine/events/misc_scripts.asm @@ -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: diff --git a/engine/events/misc_scripts_2.asm b/engine/events/misc_scripts_2.asm index cb26ce12e..02dbcb863 100644 --- a/engine/events/misc_scripts_2.asm +++ b/engine/events/misc_scripts_2.asm @@ -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: diff --git a/engine/events/mom.asm b/engine/events/mom.asm index fee89f69c..db6178c7b 100644 --- a/engine/events/mom.asm +++ b/engine/events/mom.asm @@ -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: diff --git a/engine/events/mom_phone.asm b/engine/events/mom_phone.asm index 8fe887b95..1b919c253 100644 --- a/engine/events/mom_phone.asm +++ b/engine/events/mom_phone.asm @@ -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 diff --git a/engine/events/move_deleter.asm b/engine/events/move_deleter.asm index 2f0df5162..f77d94522 100644 --- a/engine/events/move_deleter.asm +++ b/engine/events/move_deleter.asm @@ -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: diff --git a/engine/events/name_rater.asm b/engine/events/name_rater.asm index 1ec75db17..a6a78cf25 100644 --- a/engine/events/name_rater.asm +++ b/engine/events/name_rater.asm @@ -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 "@" diff --git a/engine/events/npc_trade.asm b/engine/events/npc_trade.asm index bb71941ed..aeccb634e 100644 --- a/engine/events/npc_trade.asm +++ b/engine/events/npc_trade.asm @@ -432,12 +432,12 @@ TradeTexts: ConnectLinkCableText: ; OK, connect the Game Link Cable. - text_jump UnknownText_0x1bd407 + text_far UnknownText_0x1bd407 db "@" TradedForText: ; traded givemon for getmon - text_jump UnknownText_0x1bd429 + text_far UnknownText_0x1bd429 start_asm ld de, MUSIC_NONE call PlayMusic @@ -448,93 +448,93 @@ TradedForText: .done ; sound_dex_fanfare_80_109 ; interpret_data - text_jump UnknownText_0x1bd445 + text_far UnknownText_0x1bd445 db "@" TradeIntroText1: ; I collect #MON. Do you have @ ? Want to trade it for my @ ? - text_jump UnknownText_0x1bd449 + text_far UnknownText_0x1bd449 db "@" TradeCancelText1: ; You don't want to trade? Aww… - text_jump UnknownText_0x1bd48c + text_far UnknownText_0x1bd48c db "@" TradeWrongText1: ; Huh? That's not @ . What a letdown… - text_jump UnknownText_0x1bd4aa + text_far UnknownText_0x1bd4aa db "@" TradeCompleteText1: ; Yay! I got myself @ ! Thanks! - text_jump UnknownText_0x1bd4d2 + text_far UnknownText_0x1bd4d2 db "@" TradeAfterText1: ; Hi, how's my old @ doing? - text_jump UnknownText_0x1bd4f4 + text_far UnknownText_0x1bd4f4 db "@" TradeIntroText2: TradeIntroText3: ; Hi, I'm looking for this #MON. If you have @ , would you trade it for my @ ? - text_jump UnknownText_0x1bd512 + text_far UnknownText_0x1bd512 db "@" TradeCancelText2: TradeCancelText3: ; You don't have one either? Gee, that's really disappointing… - text_jump UnknownText_0x1bd565 + text_far UnknownText_0x1bd565 db "@" TradeWrongText2: TradeWrongText3: ; You don't have @ ? That's too bad, then. - text_jump UnknownText_0x1bd5a1 + text_far UnknownText_0x1bd5a1 db "@" TradeCompleteText2: ; Great! Thank you! I finally got @ . - text_jump UnknownText_0x1bd5cc + text_far UnknownText_0x1bd5cc db "@" TradeAfterText2: ; Hi! The @ you traded me is doing great! - text_jump UnknownText_0x1bd5f4 + text_far UnknownText_0x1bd5f4 db "@" TradeIntroText4: ; 's cute, but I don't have it. Do you have @ ? Want to trade it for my @ ? - text_jump UnknownText_0x1bd621 + text_far UnknownText_0x1bd621 db "@" TradeCancelText4: ; You don't want to trade? Oh, darn… - text_jump UnknownText_0x1bd673 + text_far UnknownText_0x1bd673 db "@" TradeWrongText4: ; That's not @ . Please trade with me if you get one. - text_jump UnknownText_0x1bd696 + text_far UnknownText_0x1bd696 db "@" TradeCompleteText4: ; Wow! Thank you! I always wanted @ ! - text_jump UnknownText_0x1bd6cd + text_far UnknownText_0x1bd6cd db "@" TradeAfterText4: ; How is that @ I traded you doing? Your @ 's so cute! - text_jump UnknownText_0x1bd6f5 + text_far UnknownText_0x1bd6f5 db "@" TradeCompleteText3: ; Uh? What happened? - text_jump UnknownText_0x1bd731 + text_far UnknownText_0x1bd731 db "@" TradeAfterText3: ; Trading is so odd… I still have a lot to learn about it. - text_jump UnknownText_0x1bd745 + text_far UnknownText_0x1bd745 db "@" diff --git a/engine/events/overworld.asm b/engine/events/overworld.asm index 5c20e980f..c079fe96a 100644 --- a/engine/events/overworld.asm +++ b/engine/events/overworld.asm @@ -60,7 +60,7 @@ CheckBadge: .BadgeRequiredText: ; Sorry! A new BADGE ; is required. - text_jump _BadgeRequiredText + text_far _BadgeRequiredText db "@" CheckPartyMove: @@ -114,7 +114,7 @@ FieldMoveFailed: .CantUseHere: ; Can't use that here. - text_jump UnknownText_0x1c05c8 + text_far UnknownText_0x1c05c8 db "@" CutFunction: @@ -163,12 +163,12 @@ CutFunction: Text_UsedCut: ; used CUT! - text_jump UnknownText_0x1c05dd + text_far UnknownText_0x1c05dd db "@" Text_NothingToCut: ; There's nothing to CUT here. - text_jump UnknownText_0x1c05ec + text_far UnknownText_0x1c05ec db "@" CheckMapForSomethingToCut: @@ -323,7 +323,7 @@ Script_UseFlash: end UnknownText_0xc8f3: - text_jump UnknownText_0x1c0609 + text_far UnknownText_0x1c0609 start_asm call WaitSFX ld de, SFX_FLASH @@ -429,15 +429,15 @@ UsedSurfScript: ret UsedSurfText: - text_jump _UsedSurfText + text_far _UsedSurfText db "@" CantSurfText: - text_jump _CantSurfText + text_far _CantSurfText db "@" AlreadySurfingText: - text_jump _AlreadySurfingText + text_far _AlreadySurfingText db "@" GetSurfType: @@ -545,7 +545,7 @@ AskSurfScript: end AskSurfText: - text_jump _AskSurfText ; The water is calm. + text_far _AskSurfText ; The water is calm. db "@" ; Want to SURF? FlyFunction: @@ -709,7 +709,7 @@ Script_UsedWaterfall: .Text_UsedWaterfall: ; used WATERFALL! - text_jump UnknownText_0x1c068e + text_far UnknownText_0x1c068e db "@" TryWaterfallOW:: @@ -739,7 +739,7 @@ Script_CantDoWaterfall: .Text_CantDoWaterfall: ; Wow, it's a huge waterfall. - text_jump UnknownText_0x1c06a3 + text_far UnknownText_0x1c06a3 db "@" Script_AskWaterfall: @@ -752,7 +752,7 @@ Script_AskWaterfall: .AskUseWaterfall: ; Do you want to use WATERFALL? - text_jump UnknownText_0x1c06bf + text_far UnknownText_0x1c06bf db "@" EscapeRopeFunction: @@ -839,17 +839,17 @@ dig_incave .Text_UsedDig: ; used DIG! - text_jump UnknownText_0x1c06de + text_far UnknownText_0x1c06de db "@" .Text_UsedEscapeRope: ; used an ESCAPE ROPE. - text_jump UnknownText_0x1c06ed + text_far UnknownText_0x1c06ed db "@" .Text_CantUseHere: ; Can't use that here. - text_jump UnknownText_0x1c0705 + text_far UnknownText_0x1c0705 db "@" .UsedEscapeRopeScript: @@ -938,12 +938,12 @@ TeleportFunction: .Text_ReturnToLastMonCenter: ; Return to the last #MON CENTER. - text_jump UnknownText_0x1c071a + text_far UnknownText_0x1c071a db "@" .Text_CantUseHere: ; Can't use that here. - text_jump UnknownText_0x1c073b + text_far UnknownText_0x1c073b db "@" .TeleportScript: @@ -991,7 +991,7 @@ StrengthFunction: ret .JumpText: - text_jump UnknownText_0x1c0751 + text_far UnknownText_0x1c0751 db "@" .Failed: @@ -1032,11 +1032,11 @@ Script_UsedStrength: end .UsedStrength: - text_jump UnknownText_0x1c0774 + text_far UnknownText_0x1c0774 db "@" .StrengthAllowedItToMoveBoulders: - text_jump UnknownText_0x1c0788 + text_far UnknownText_0x1c0788 db "@" AskStrengthScript: @@ -1061,17 +1061,17 @@ AskStrengthScript: UnknownText_0xcd69: ; A #MON may be able to move this. Want to use STRENGTH? - text_jump UnknownText_0x1c07a0 + text_far UnknownText_0x1c07a0 db "@" UnknownText_0xcd6e: ; Boulders may now be moved! - text_jump UnknownText_0x1c07d8 + text_far UnknownText_0x1c07d8 db "@" UnknownText_0xcd73: ; A #MON may be able to move this. - text_jump UnknownText_0x1c07f4 + text_far UnknownText_0x1c07f4 db "@" TryStrengthOW: @@ -1147,7 +1147,7 @@ Jumptable_cdae: Text_UsedWhirlpool: ; used WHIRLPOOL! - text_jump UnknownText_0x1c0816 + text_far UnknownText_0x1c0816 db "@" TryWhirlpoolMenu: @@ -1234,7 +1234,7 @@ Script_MightyWhirlpool: jumptext .MightyWhirlpoolText .MightyWhirlpoolText: - text_jump UnknownText_0x1c082b + text_far UnknownText_0x1c082b db "@" Script_AskWhirlpoolOW: @@ -1246,7 +1246,7 @@ Script_AskWhirlpoolOW: end UnknownText_0xce78: - text_jump UnknownText_0x1c0864 + text_far UnknownText_0x1c0864 db "@" HeadbuttFunction: @@ -1272,12 +1272,12 @@ TryHeadbuttFromMenu: UnknownText_0xce9d: ; did a HEADBUTT! - text_jump UnknownText_0x1c0897 + text_far UnknownText_0x1c0897 db "@" UnknownText_0xcea2: ; Nope. Nothing… - text_jump UnknownText_0x1c08ac + text_far UnknownText_0x1c08ac db "@" HeadbuttFromMenuScript: @@ -1330,7 +1330,7 @@ AskHeadbuttScript: UnknownText_0xcee6: ; A #MON could be in this tree. Want to HEADBUTT it? - text_jump UnknownText_0x1c08bc + text_far UnknownText_0x1c08bc db "@" RockSmashFunction: @@ -1406,7 +1406,7 @@ MovementData_0xcf55: step_end UnknownText_0xcf58: - text_jump UnknownText_0x1c08f0 + text_far UnknownText_0x1c08f0 db "@" AskRockSmashScript: @@ -1424,12 +1424,12 @@ AskRockSmashScript: UnknownText_0xcf72: ; Maybe a #MON can break this. - text_jump UnknownText_0x1c0906 + text_far UnknownText_0x1c0906 db "@" UnknownText_0xcf77: ; This rock looks breakable. Want to use ROCK SMASH? - text_jump UnknownText_0x1c0924 + text_far UnknownText_0x1c0924 db "@" HasRockSmash: @@ -1632,17 +1632,17 @@ PutTheRodAway: UnknownText_0xd0a4: ; Oh! A bite! - text_jump UnknownText_0x1c0958 + text_far UnknownText_0x1c0958 db "@" UnknownText_0xd0a9: ; Not even a nibble! - text_jump UnknownText_0x1c0965 + text_far UnknownText_0x1c0965 db "@" UnknownText_0xd0ae: ; unused ; Looks like there's nothing here. - text_jump UnknownText_0x1c0979 + text_far UnknownText_0x1c0979 db "@" BikeFunction: @@ -1776,17 +1776,17 @@ Script_CantGetOffBike: .CantGetOffBikeText: ; You can't get off here! - text_jump UnknownText_0x1c099a + text_far UnknownText_0x1c099a db "@" GotOnTheBikeText: ; got on the @ . - text_jump UnknownText_0x1c09b2 + text_far UnknownText_0x1c09b2 db "@" GotOffTheBikeText: ; got off the @ . - text_jump UnknownText_0x1c09c7 + text_far UnknownText_0x1c09c7 db "@" TryCutOW:: @@ -1832,12 +1832,12 @@ AskCutScript: ret UnknownText_0xd1c8: - text_jump UnknownText_0x1c09dd + text_far UnknownText_0x1c09dd db "@" CantCutScript: jumptext UnknownText_0xd1d0 UnknownText_0xd1d0: - text_jump UnknownText_0x1c0a05 + text_far UnknownText_0x1c0a05 db "@" diff --git a/engine/events/poisonstep.asm b/engine/events/poisonstep.asm index c7ba7660f..19c3ebe05 100644 --- a/engine/events/poisonstep.asm +++ b/engine/events/poisonstep.asm @@ -146,9 +146,9 @@ DoPoisonStep:: ret .PoisonFaintText: - text_jump UnknownText_0x1c0acc + text_far UnknownText_0x1c0acc db "@" .PoisonWhiteOutText: - text_jump UnknownText_0x1c0ada + text_far UnknownText_0x1c0ada db "@" diff --git a/engine/events/poke_seer.asm b/engine/events/poke_seer.asm index dc99cb536..6951e7199 100644 --- a/engine/events/poke_seer.asm +++ b/engine/events/poke_seer.asm @@ -298,42 +298,42 @@ SeerTexts: SeerIntroText: ; I see all. I know all… Certainly, I know of your #MON! - text_jump UnknownText_0x1c475f + text_far UnknownText_0x1c475f db "@" SeerCantTellText: ; Whaaaat? I can't tell a thing! How could I not know of this? - text_jump UnknownText_0x1c4797 + text_far UnknownText_0x1c4797 db "@" SeerMetAtText: ; Hm… I see you met @ here: @ ! - text_jump UnknownText_0x1c47d4 + text_far UnknownText_0x1c47d4 db "@" SeerTimeLevelText: ; The time was @ ! Its level was @ ! Am I good or what? - text_jump UnknownText_0x1c47fa + text_far UnknownText_0x1c47fa db "@" SeerTradedText: ; Hm… @ came from @ in a trade? @ was where @ met @ ! - text_jump UnknownText_0x1c4837 + text_far UnknownText_0x1c4837 db "@" SeerLevelOnlyText: ; What!? Incredible! I don't understand how, but it is incredible! You are special. I can't tell where you met it, but it was at level @ . Am I good or what? - text_jump UnknownText_0x1c487f + text_far UnknownText_0x1c487f db "@" SeerEggText: ; Hey! That's an EGG! You can't say that you've met it yet… - text_jump UnknownText_0x1c491d + text_far UnknownText_0x1c491d db "@" SeerCancelText: ; Fufufu! I saw that you'd do nothing! - text_jump UnknownText_0x1c4955 + text_far UnknownText_0x1c4955 db "@" SeerAdvice: @@ -373,27 +373,27 @@ SeerAdviceTexts: SeerAdvice1: ; Incidentally… It would be wise to raise your #MON with a little more care. - text_jump UnknownText_0x1c497a + text_far UnknownText_0x1c497a db "@" SeerAdvice2: ; Incidentally… It seems to have grown a little. @ seems to be becoming more confident. - text_jump UnknownText_0x1c49c6 + text_far UnknownText_0x1c49c6 db "@" SeerAdvice3: ; Incidentally… @ has grown. It's gained much strength. - text_jump UnknownText_0x1c4a21 + text_far UnknownText_0x1c4a21 db "@" SeerAdvice4: ; Incidentally… It certainly has grown mighty! This @ must have come through numerous #MON battles. It looks brimming with confidence. - text_jump UnknownText_0x1c4a5b + text_far UnknownText_0x1c4a5b db "@" SeerAdvice5: ; Incidentally… I'm impressed by your dedication. It's been a long time since I've seen a #MON as mighty as this @ . I'm sure that seeing @ in battle would excite anyone. - text_jump UnknownText_0x1c4ae5 + text_far UnknownText_0x1c4ae5 db "@" GetCaughtGender: diff --git a/engine/events/pokecenter_pc.asm b/engine/events/pokecenter_pc.asm index 43bf6dbfe..c930caed1 100644 --- a/engine/events/pokecenter_pc.asm +++ b/engine/events/pokecenter_pc.asm @@ -111,7 +111,7 @@ PC_CheckPartyForPokemon: .MustHavePokemonToUse: ; Bzzzzt! You must have a #MON to use this! - text_jump UnknownText_0x1c1328 + text_far UnknownText_0x1c1328 db "@" BillsPC: @@ -201,7 +201,7 @@ _PlayersHousePC: UnknownText_0x156ff: ; turned on the PC. - text_jump UnknownText_0x1c1353 + text_far UnknownText_0x1c1353 db "@" _PlayersPC: @@ -305,7 +305,7 @@ PC_DisplayTextWaitMenu: UnknownText_0x157cc: ; What do you want to do? - text_jump UnknownText_0x1c1368 + text_far UnknownText_0x1c1368 db "@" PlayerWithdrawItemMenu: @@ -373,15 +373,15 @@ PlayerWithdrawItemMenu: ret .HowManyText: - text_jump _PlayersPCHowManyWithdrawText + text_far _PlayersPCHowManyWithdrawText db "@" .WithdrewText: - text_jump _PlayersPCWithdrewItemsText + text_far _PlayersPCWithdrewItemsText db "@" .NoRoomText: - text_jump _PlayersPCNoRoomWithdrawText + text_far _PlayersPCNoRoomWithdrawText db "@" PlayerTossItemMenu: @@ -444,7 +444,7 @@ PlayerDepositItemMenu: .NoItemsInBag: ; No items here! - text_jump UnknownText_0x1c13df + text_far UnknownText_0x1c13df db "@" .TryDepositItem: @@ -533,15 +533,15 @@ PlayerDepositItemMenu: ret .HowManyText: - text_jump _PlayersPCHowManyDepositText + text_far _PlayersPCHowManyDepositText db "@" .DepositText: - text_jump _PlayersPCDepositItemsText + text_far _PlayersPCDepositItemsText db "@" .NoRoomText: - text_jump _PlayersPCNoRoomDepositText + text_far _PlayersPCNoRoomDepositText db "@" PlayerMailBoxMenu: @@ -640,30 +640,30 @@ PC_DisplayText: PokecenterPCText_BootedUpPC: ; turned on the PC. - text_jump UnknownText_0x1c144d + text_far UnknownText_0x1c144d db "@" PokecenterPCText_AccessWhosePC: ; Access whose PC? - text_jump UnknownText_0x1c1462 + text_far UnknownText_0x1c1462 db "@" PokecenterPCText_AccessedBillsPC: ; BILL's PC accessed. #MON Storage System opened. - text_jump UnknownText_0x1c1474 + text_far UnknownText_0x1c1474 db "@" PokecenterPCText_AccessedOwnPC: ; Accessed own PC. Item Storage System opened. - text_jump UnknownText_0x1c14a4 + text_far UnknownText_0x1c14a4 db "@" PokecenterPCText_AccessedOaksPC: ; PROF.OAK's PC accessed. #DEX Rating System opened. - text_jump UnknownText_0x1c14d2 + text_far UnknownText_0x1c14d2 db "@" PokecenterPCText_LinkClosed: ; … Link closed… - text_jump UnknownText_0x1c1505 + text_far UnknownText_0x1c1505 db "@" diff --git a/engine/events/print_photo.asm b/engine/events/print_photo.asm index 9854239f5..b99312eaa 100644 --- a/engine/events/print_photo.asm +++ b/engine/events/print_photo.asm @@ -31,25 +31,25 @@ PhotoStudio: .Text_AskWhichMon: ; Which #MON should I photo- graph? - text_jump UnknownText_0x1be024 + text_far UnknownText_0x1be024 db "@" .Text_HoldStill: ; All righty. Hold still for a bit. - text_jump UnknownText_0x1be047 + text_far UnknownText_0x1be047 db "@" .Text_Presto: ; Presto! All done. Come again, OK? - text_jump UnknownText_0x1be06a + text_far UnknownText_0x1be06a db "@" .Text_NoPicture: ; Oh, no picture? Come again, OK? - text_jump UnknownText_0x1c0000 + text_far UnknownText_0x1c0000 db "@" .Text_Egg: ; An EGG? My talent is worth more… - text_jump UnknownText_0x1c0021 + text_far UnknownText_0x1c0021 db "@" diff --git a/engine/events/prof_oaks_pc.asm b/engine/events/prof_oaks_pc.asm index df55394aa..ed7a34c0f 100644 --- a/engine/events/prof_oaks_pc.asm +++ b/engine/events/prof_oaks_pc.asm @@ -101,93 +101,93 @@ endr INCLUDE "data/events/pokedex_ratings.asm" OakPCText1: - text_jump _OakPCText1 + text_far _OakPCText1 db "@" OakPCText2: - text_jump _OakPCText2 + text_far _OakPCText2 db "@" OakPCText3: - text_jump _OakPCText3 + text_far _OakPCText3 db "@" OakRating01: - text_jump _OakRating01 + text_far _OakRating01 db "@" OakRating02: - text_jump _OakRating02 + text_far _OakRating02 db "@" OakRating03: - text_jump _OakRating03 + text_far _OakRating03 db "@" OakRating04: - text_jump _OakRating04 + text_far _OakRating04 db "@" OakRating05: - text_jump _OakRating05 + text_far _OakRating05 db "@" OakRating06: - text_jump _OakRating06 + text_far _OakRating06 db "@" OakRating07: - text_jump _OakRating07 + text_far _OakRating07 db "@" OakRating08: - text_jump _OakRating08 + text_far _OakRating08 db "@" OakRating09: - text_jump _OakRating09 + text_far _OakRating09 db "@" OakRating10: - text_jump _OakRating10 + text_far _OakRating10 db "@" OakRating11: - text_jump _OakRating11 + text_far _OakRating11 db "@" OakRating12: - text_jump _OakRating12 + text_far _OakRating12 db "@" OakRating13: - text_jump _OakRating13 + text_far _OakRating13 db "@" OakRating14: - text_jump _OakRating14 + text_far _OakRating14 db "@" OakRating15: - text_jump _OakRating15 + text_far _OakRating15 db "@" OakRating16: - text_jump _OakRating16 + text_far _OakRating16 db "@" OakRating17: - text_jump _OakRating17 + text_far _OakRating17 db "@" OakRating18: - text_jump _OakRating18 + text_far _OakRating18 db "@" OakRating19: - text_jump _OakRating19 + text_far _OakRating19 db "@" OakPCText4: - text_jump _OakPCText4 + text_far _OakPCText4 db "@" diff --git a/engine/events/sacred_ash.asm b/engine/events/sacred_ash.asm index 32f24253c..8f200dbb0 100644 --- a/engine/events/sacred_ash.asm +++ b/engine/events/sacred_ash.asm @@ -66,5 +66,5 @@ SacredAshScript: UnknownText_0x50845: ; 's #MON were all healed! - text_jump UnknownText_0x1c0b65 + text_far UnknownText_0x1c0b65 db "@" diff --git a/engine/events/specials.asm b/engine/events/specials.asm index c030eaf11..3fb79697a 100644 --- a/engine/events/specials.asm +++ b/engine/events/specials.asm @@ -169,7 +169,7 @@ GetMysteryGiftItem: .ReceiveItemText: ; received item - text_jump UnknownText_0x1bd3be + text_far UnknownText_0x1bd3be db "@" BugContestJudging: @@ -257,12 +257,12 @@ CheckCoinsAndCoinCase: .NoCoinsText: ; You have no coins. - text_jump UnknownText_0x1bd3d7 + text_far UnknownText_0x1bd3d7 db "@" .NoCoinCaseText: ; You don't have a COIN CASE. - text_jump UnknownText_0x1bd3eb + text_far UnknownText_0x1bd3eb db "@" ClearBGPalettesBufferScreen: diff --git a/engine/events/squirtbottle.asm b/engine/events/squirtbottle.asm index 74fd4d991..df0171d95 100644 --- a/engine/events/squirtbottle.asm +++ b/engine/events/squirtbottle.asm @@ -17,7 +17,7 @@ _Squirtbottle: .NothingHappenedText: ; sprinkled water. But nothing happened… - text_jump UnknownText_0x1c0b3b + text_far UnknownText_0x1c0b3b db "@" .CheckCanUseSquirtbottle: diff --git a/engine/events/sweet_scent.asm b/engine/events/sweet_scent.asm index 1a378ede8..bdbba1e21 100644 --- a/engine/events/sweet_scent.asm +++ b/engine/events/sweet_scent.asm @@ -59,10 +59,10 @@ SweetScentEncounter: UnknownText_0x50726: ; used SWEET SCENT! - text_jump UnknownText_0x1c0b03 + text_far UnknownText_0x1c0b03 db "@" UnknownText_0x5072b: ; Looks like there's nothing here… - text_jump UnknownText_0x1c0b1a + text_far UnknownText_0x1c0b1a db "@" diff --git a/engine/events/whiteout.asm b/engine/events/whiteout.asm index 82b7a4868..4a68be792 100644 --- a/engine/events/whiteout.asm +++ b/engine/events/whiteout.asm @@ -26,7 +26,7 @@ Script_Whiteout: .WhitedOutText: ; is out of useable #MON! whited out! - text_jump UnknownText_0x1c0a4e + text_far UnknownText_0x1c0a4e db "@" OverworldBGMap: diff --git a/engine/games/card_flip.asm b/engine/games/card_flip.asm index ce85b60a4..3dd6327b9 100644 --- a/engine/games/card_flip.asm +++ b/engine/games/card_flip.asm @@ -117,7 +117,7 @@ _CardFlip: .PlayWithThreeCoinsText: ; Play with three coins? - text_jump UnknownText_0x1c5793 + text_far UnknownText_0x1c5793 db "@" .DeductCoins: @@ -157,7 +157,7 @@ _CardFlip: .NotEnoughCoinsText: ; Not enough coins… - text_jump UnknownText_0x1c57ab + text_far UnknownText_0x1c57ab db "@" .ChooseACard: @@ -234,7 +234,7 @@ _CardFlip: .ChooseACardText: ; Choose a card. - text_jump UnknownText_0x1c57be + text_far UnknownText_0x1c57be db "@" .PlaceYourBet: @@ -256,7 +256,7 @@ _CardFlip: .PlaceYourBetText: ; Place your bet. - text_jump UnknownText_0x1c57ce + text_far UnknownText_0x1c57ce db "@" .CheckTheCard: @@ -327,12 +327,12 @@ _CardFlip: .PlayAgainText: ; Want to play again? - text_jump UnknownText_0x1c57df + text_far UnknownText_0x1c57df db "@" .CardsShuffledText: ; The cards have been shuffled. - text_jump UnknownText_0x1c57f4 + text_far UnknownText_0x1c57f4 db "@" .Quit: @@ -1114,12 +1114,12 @@ CardFlip_CheckWinCondition: .Text_Yeah: ; Yeah! - text_jump UnknownText_0x1c5813 + text_far UnknownText_0x1c5813 db "@" .Text_Darn: ; Darn… - text_jump UnknownText_0x1c581a + text_far UnknownText_0x1c581a db "@" .AddCoinPlaySFX: diff --git a/engine/games/dummy_game.asm b/engine/games/dummy_game.asm index b637dd6a1..39053b214 100644 --- a/engine/games/dummy_game.asm +++ b/engine/games/dummy_game.asm @@ -322,12 +322,12 @@ DummyGame_CheckMatch: DummyGameText_Yeah: ; , yeah! - text_jump UnknownText_0x1c1a5b + text_far UnknownText_0x1c1a5b db "@" DummyGameText_Darn: ; Darn… - text_jump UnknownText_0x1c1a65 + text_far UnknownText_0x1c1a65 db "@" DummyGame_InitBoard: diff --git a/engine/games/slot_machine.asm b/engine/games/slot_machine.asm index 7299a8a32..a60abda50 100644 --- a/engine/games/slot_machine.asm +++ b/engine/games/slot_machine.asm @@ -1749,17 +1749,17 @@ Slots_AskBet: .Text_BetHowManyCoins: ; Bet how many coins? - text_jump UnknownText_0x1c5049 + text_far UnknownText_0x1c5049 db "@" .Text_Start: ; Start! - text_jump UnknownText_0x1c505e + text_far UnknownText_0x1c505e db "@" .Text_NotEnoughCoins: ; Not enough coins. - text_jump UnknownText_0x1c5066 + text_far UnknownText_0x1c5066 db "@" .MenuHeader: @@ -1805,11 +1805,11 @@ Slots_AskPlayAgain: ret .Text_OutOfCoins: - text_jump UnknownText_0x1c5079 + text_far UnknownText_0x1c5079 db "@" .Text_PlayAgain: - text_jump UnknownText_0x1c5092 + text_far UnknownText_0x1c5092 db "@" Slots_GetPayout: @@ -1907,12 +1907,12 @@ endr .Text_LinedUpWonCoins: ; lined up! Won @ coins! - text_jump UnknownText_0x1c509f + text_far UnknownText_0x1c509f db "@" .Text_Darn: ; Darn! - text_jump UnknownText_0x1c50bb + text_far UnknownText_0x1c50bb db "@" .LinedUpSevens: diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm index cdc22a019..f31f7c319 100644 --- a/engine/items/item_effects.asm +++ b/engine/items/item_effects.asm @@ -1063,37 +1063,37 @@ LevelBallMultiplier: Text_RBY_CatchMarowak: ; It dodged the thrown BALL! This #MON can't be caught! - text_jump UnknownText_0x1c5a5a + text_far UnknownText_0x1c5a5a db "@" Text_RBY_NoShake: ; You missed the #MON! - text_jump UnknownText_0x1c5a90 + text_far UnknownText_0x1c5a90 db "@" Text_NoShake: ; Oh no! The #MON broke free! - text_jump UnknownText_0x1c5aa6 + text_far UnknownText_0x1c5aa6 db "@" Text_OneShake: ; Aww! It appeared to be caught! - text_jump UnknownText_0x1c5ac3 + text_far UnknownText_0x1c5ac3 db "@" Text_TwoShakes: ; Aargh! Almost had it! - text_jump UnknownText_0x1c5ae3 + text_far UnknownText_0x1c5ae3 db "@" Text_ThreeShakes: ; Shoot! It was so close too! - text_jump UnknownText_0x1c5afa + text_far UnknownText_0x1c5afa db "@" Text_GotchaMonWasCaught: ; Gotcha! @ was caught!@ @ - text_jump UnknownText_0x1c5b17 + text_far UnknownText_0x1c5b17 start_asm call WaitSFX push bc @@ -1108,22 +1108,22 @@ Text_GotchaMonWasCaught: TextJump_Waitbutton: ; @ - text_jump Text_Waitbutton_2 + text_far Text_Waitbutton_2 db "@" Text_SentToBillsPC: ; was sent to BILL's PC. - text_jump UnknownText_0x1c5b38 + text_far UnknownText_0x1c5b38 db "@" Text_AddedToPokedex: ; 's data was newly added to the #DEX.@ @ - text_jump UnknownText_0x1c5b53 + text_far UnknownText_0x1c5b53 db "@" Text_AskNicknameNewlyCaughtMon: ; Give a nickname to @ ? - text_jump UnknownText_0x1c5b7f + text_far UnknownText_0x1c5b7f db "@" ReturnToBattle_UseBall: @@ -1234,7 +1234,7 @@ RareCandy_StatBooster_ExitMenu: Text_StatRose: ; 's @ rose. - text_jump UnknownText_0x1c5b9a + text_far UnknownText_0x1c5b9a db "@" StatStrings: @@ -2062,7 +2062,7 @@ Softboiled_MilkDrinkFunction: .Text_CantBeUsed: ; That can't be used on this #MON. - text_jump UnknownText_0x1c5bac + text_far UnknownText_0x1c5bac db "@" EscapeRopeEffect: @@ -2098,7 +2098,7 @@ UseRepel: TextJump_RepelUsedEarlierIsStillInEffect: ; The REPEL used earlier is still in effect. - text_jump Text_RepelUsedEarlierIsStillInEffect + text_far Text_RepelUsedEarlierIsStillInEffect db "@" XAccuracyEffect: @@ -2239,17 +2239,17 @@ PokeFluteEffect: .CatchyTune: ; Played the # FLUTE. Now, that's a catchy tune! - text_jump UnknownText_0x1c5bf9 + text_far UnknownText_0x1c5bf9 db "@" .AllSleepingMonWokeUp: ; All sleeping #MON woke up. - text_jump UnknownText_0x1c5c28 + text_far UnknownText_0x1c5c28 db "@" .PlayedTheFlute: ; played the # FLUTE.@ @ - text_jump UnknownText_0x1c5c44 + text_far UnknownText_0x1c5c44 start_asm ld a, [wBattleMode] and a @@ -2269,7 +2269,7 @@ BlueCardEffect: jp MenuTextBoxWaitButton .bluecardtext - text_jump UnknownText_0x1c5c5e + text_far UnknownText_0x1c5c5e db "@" CoinCaseEffect: @@ -2277,7 +2277,7 @@ CoinCaseEffect: jp MenuTextBoxWaitButton .coincasetext - text_jump UnknownText_0x1c5c7b + text_far UnknownText_0x1c5c7b db "@" OldRodEffect: @@ -2532,27 +2532,27 @@ RestorePP: TextJump_RaiseThePPOfWhichMove: ; Raise the PP of which move? - text_jump Text_RaiseThePPOfWhichMove + text_far Text_RaiseThePPOfWhichMove db "@" TextJump_RestoreThePPOfWhichMove: ; Restore the PP of which move? - text_jump Text_RestoreThePPOfWhichMove + text_far Text_RestoreThePPOfWhichMove db "@" TextJump_PPIsMaxedOut: ; 's PP is maxed out. - text_jump Text_PPIsMaxedOut + text_far Text_PPIsMaxedOut db "@" TextJump_PPsIncreased: ; 's PP increased. - text_jump Text_PPsIncreased + text_far Text_PPsIncreased db "@" UnknownText_0xf739: ; PP was restored. - text_jump UnknownText_0x1c5cf1 + text_far UnknownText_0x1c5cf1 db "@" SquirtbottleEffect: @@ -2591,7 +2591,7 @@ OpenBox: .text ; There was a trophy inside! - text_jump UnknownText_0x1c5d03 + text_far UnknownText_0x1c5d03 db "@" NoEffect: @@ -2686,67 +2686,67 @@ CantUseItemMessage: LooksBitterText: ; It looks bitter… - text_jump UnknownText_0x1c5d3e + text_far UnknownText_0x1c5d3e db "@" CantUseOnEggText: ; That can't be used on an EGG. - text_jump UnknownText_0x1c5d50 + text_far UnknownText_0x1c5d50 db "@" IsntTheTimeText: ; OAK: ! This isn't the time to use that! - text_jump UnknownText_0x1c5d6e + text_far UnknownText_0x1c5d6e db "@" BelongsToSomeoneElseText: ; That belongs to someone else! - text_jump UnknownText_0x1c5d97 + text_far UnknownText_0x1c5d97 db "@" WontHaveAnyEffectText: ; It won't have any effect. - text_jump UnknownText_0x1c5db6 + text_far UnknownText_0x1c5db6 db "@" BlockedTheBallText: ; The trainer blocked the BALL! - text_jump UnknownText_0x1c5dd0 + text_far UnknownText_0x1c5dd0 db "@" DontBeAThiefText: ; Don't be a thief! - text_jump UnknownText_0x1c5def + text_far UnknownText_0x1c5def db "@" CyclingIsntAllowedText: ; Cycling isn't allowed here. - text_jump UnknownText_0x1c5e01 + text_far UnknownText_0x1c5e01 db "@" CantGetOnYourBikeText: ; Can't get on your @ now. - text_jump UnknownText_0x1c5e1d + text_far UnknownText_0x1c5e1d db "@" Ball_BoxIsFullText: ; The #MON BOX is full. That can't be used now. - text_jump UnknownText_0x1c5e3a + text_far UnknownText_0x1c5e3a db "@" UsedItemText: ; used the@ . - text_jump UnknownText_0x1c5e68 + text_far UnknownText_0x1c5e68 db "@" GotOnTheItemText: ; got on the@ . - text_jump UnknownText_0x1c5e7b + text_far UnknownText_0x1c5e7b db "@" GotOffTheItemText: ; got off@ the @ . - text_jump UnknownText_0x1c5e90 + text_far UnknownText_0x1c5e90 db "@" ApplyPPUp: diff --git a/engine/items/mart.asm b/engine/items/mart.asm index 94e3376a2..d7abf1eb4 100644 --- a/engine/items/mart.asm +++ b/engine/items/mart.asm @@ -581,12 +581,12 @@ RooftopSaleAskPurchaseQuantity: Text_Mart_HowMany: ; How many? - text_jump UnknownText_0x1c4bfd + text_far UnknownText_0x1c4bfd db "@" Text_Mart_CostsThisMuch: ; @ (S) will be ¥@ . - text_jump UnknownText_0x1c4c08 + text_far UnknownText_0x1c4c08 db "@" MenuHeader_Buy: @@ -624,107 +624,107 @@ MenuHeader_Buy: Text_HerbShop_Intro: ; Hello, dear. I sell inexpensive herbal medicine. They're good, but a trifle bitter. Your #MON may not like them. Hehehehe… - text_jump UnknownText_0x1c4c28 + text_far UnknownText_0x1c4c28 db "@" Text_HerbShop_HowMany: ; How many? - text_jump UnknownText_0x1c4ca3 + text_far UnknownText_0x1c4ca3 db "@" Text_HerbShop_CostsThisMuch: ; @ (S) will be ¥@ . - text_jump UnknownText_0x1c4cae + text_far UnknownText_0x1c4cae db "@" Text_HerbShop_HereYouGo: ; Thank you, dear. Hehehehe… - text_jump UnknownText_0x1c4cce + text_far UnknownText_0x1c4cce db "@" Text_HerbShop_BagFull: ; Oh? Your PACK is full, dear. - text_jump UnknownText_0x1c4cea + text_far UnknownText_0x1c4cea db "@" Text_HerbShop_InsufficientFunds: ; Hehehe… You don't have the money. - text_jump UnknownText_0x1c4d08 + text_far UnknownText_0x1c4d08 db "@" Text_HerbShop_ComeAgain: ; Come again, dear. Hehehehe… - text_jump UnknownText_0x1c4d2a + text_far UnknownText_0x1c4d2a db "@" Text_BargainShop_Intro: ; Hiya! Care to see some bargains? I sell rare items that nobody else carries--but only one of each item. - text_jump UnknownText_0x1c4d47 + text_far UnknownText_0x1c4d47 db "@" Text_BargainShop_CostsThisMuch: ; costs ¥@ . Want it? - text_jump UnknownText_0x1c4db0 + text_far UnknownText_0x1c4db0 db "@" Text_BargainShop_HereYouGo: ; Thanks. - text_jump UnknownText_0x1c4dcd + text_far UnknownText_0x1c4dcd db "@" Text_BargainShop_BagFull: ; Uh-oh, your PACK is chock-full. - text_jump UnknownText_0x1c4dd6 + text_far UnknownText_0x1c4dd6 db "@" Text_BargainShop_SoldOut: ; You bought that already. I'm all sold out of it. - text_jump UnknownText_0x1c4df7 + text_far UnknownText_0x1c4df7 db "@" Text_BargainShop_InsufficientFunds: ; Uh-oh, you're short on funds. - text_jump UnknownText_0x1c4e28 + text_far UnknownText_0x1c4e28 db "@" Text_BargainShop_ComeAgain: ; Come by again sometime. - text_jump UnknownText_0x1c4e46 + text_far UnknownText_0x1c4e46 db "@" Text_Pharmacist_Intro: ; What's up? Need some medicine? - text_jump UnknownText_0x1c4e5f + text_far UnknownText_0x1c4e5f db "@" Text_Pharmacy_HowMany: ; How many? - text_jump UnknownText_0x1c4e7e + text_far UnknownText_0x1c4e7e db "@" Text_Pharmacy_CostsThisMuch: ; @ (S) will cost ¥@ . - text_jump UnknownText_0x1c4e89 + text_far UnknownText_0x1c4e89 db "@" Text_Pharmacy_HereYouGo: ; Thanks much! - text_jump UnknownText_0x1c4eab + text_far UnknownText_0x1c4eab db "@" Text_Pharmacy_BagFull: ; You don't have any more space. - text_jump UnknownText_0x1c4eb9 + text_far UnknownText_0x1c4eb9 db "@" Text_Pharmacy_InsufficientFunds: ; Huh? That's not enough money. - text_jump UnknownText_0x1c4ed8 + text_far UnknownText_0x1c4ed8 db "@" Text_Pharmacist_ComeAgain: ; All right. See you around. - text_jump UnknownText_0x1c4ef6 + text_far UnknownText_0x1c4ef6 db "@" SellMenu: @@ -751,7 +751,7 @@ SellMenu: .NothingToSellText: ; You don't have anything to sell. - text_jump UnknownText_0x1c4f12 + text_far UnknownText_0x1c4f12 db "@" .TryToSellItem: @@ -820,12 +820,12 @@ SellMenu: Text_Mart_SellHowMany: ; How many? - text_jump UnknownText_0x1c4f33 + text_far UnknownText_0x1c4f33 db "@" Text_Mart_ICanPayThisMuch: ; I can pay you ¥@ . Is that OK? - text_jump UnknownText_0x1c4f3e + text_far UnknownText_0x1c4f3e db "@" .UnusedString15f7d: @@ -833,7 +833,7 @@ Text_Mart_ICanPayThisMuch: Text_Mart_HowMayIHelpYou: ; Welcome! How may I help you? - text_jump UnknownText_0x1c4f62 + text_far UnknownText_0x1c4f62 db "@" MenuHeader_BuySell: @@ -851,35 +851,35 @@ MenuHeader_BuySell: Text_Mart_HereYouGo: ; Here you are. Thank you! - text_jump UnknownText_0x1c4f80 + text_far UnknownText_0x1c4f80 db "@" Text_Mart_InsufficientFunds: ; You don't have enough money. - text_jump UnknownText_0x1c4f9a + text_far UnknownText_0x1c4f9a db "@" Text_Mart_BagFull: ; You can't carry any more items. - text_jump UnknownText_0x1c4fb7 + text_far UnknownText_0x1c4fb7 db "@" TextMart_CantBuyFromYou: ; Sorry, I can't buy that from you. - text_jump UnknownText_0x1c4fd7 + text_far UnknownText_0x1c4fd7 db "@" Text_Mart_ComeAgain: ; Please come again! - text_jump UnknownText_0x1c4ff9 + text_far UnknownText_0x1c4ff9 db "@" Text_Mart_AnythingElse: - text_jump UnknownText_0x1c500d + text_far UnknownText_0x1c500d db "@" Text_Mart_SoldForAmount: - text_jump UnknownText_0x1c502e + text_far UnknownText_0x1c502e db "@" PlayTransactionSound: diff --git a/engine/items/pack.asm b/engine/items/pack.asm index 9ee425204..6d7fc7e10 100644 --- a/engine/items/pack.asm +++ b/engine/items/pack.asm @@ -616,7 +616,7 @@ GiveItem: ret .Egg: ; An EGG can't hold an item. - text_jump Text_AnEGGCantHoldAnItem + text_far Text_AnEGGCantHoldAnItem db "@" QuitItemSubmenu: @@ -1548,58 +1548,58 @@ PC_Mart_BallsPocketMenuHeader: Text_PackNoItems: ; No items. - text_jump UnknownText_0x1c0b9a + text_far UnknownText_0x1c0b9a db "@" Text_ThrowAwayHowMany: ; Throw away how many? - text_jump UnknownText_0x1c0ba5 + text_far UnknownText_0x1c0ba5 db "@" Text_ConfirmThrowAway: ; Throw away @ @ (S)? - text_jump UnknownText_0x1c0bbb + text_far UnknownText_0x1c0bbb db "@" Text_ThrewAway: ; Threw away @ (S). - text_jump UnknownText_0x1c0bd8 + text_far UnknownText_0x1c0bd8 db "@" Text_ThisIsntTheTime: ; OAK: ! This isn't the time to use that! - text_jump UnknownText_0x1c0bee + text_far UnknownText_0x1c0bee db "@" TextJump_YouDontHaveAMon: ; You don't have a #MON! - text_jump Text_YouDontHaveAMon + text_far Text_YouDontHaveAMon db "@" Text_RegisteredItem: ; Registered the @ . - text_jump UnknownText_0x1c0c2e + text_far UnknownText_0x1c0c2e db "@" Text_CantRegister: ; You can't register that item. - text_jump UnknownText_0x1c0c45 + text_far UnknownText_0x1c0c45 db "@" Text_MoveItemWhere: ; Where should this be moved to? - text_jump UnknownText_0x1c0c63 + text_far UnknownText_0x1c0c63 db "@" Text_PackEmptyString: ; - text_jump UnknownText_0x1c0c83 + text_far UnknownText_0x1c0c83 db "@" TextJump_YouCantUseItInABattle: ; Doesn't seem to be used anywhere ; "You can't use it in a battle." - text_jump Text_YouCantUseItInABattle + text_far Text_YouCantUseItInABattle db "@" PackMenuGFX: diff --git a/engine/items/tmhm.asm b/engine/items/tmhm.asm index c81851def..cf71d8467 100644 --- a/engine/items/tmhm.asm +++ b/engine/items/tmhm.asm @@ -168,22 +168,22 @@ TeachTMHM: Text_BootedTM: ; Booted up a TM. - text_jump UnknownText_0x1c0373 + text_far UnknownText_0x1c0373 db "@" Text_BootedHM: ; Booted up an HM. - text_jump UnknownText_0x1c0384 + text_far UnknownText_0x1c0384 db "@" Text_ItContained: ; It contained @ . Teach @ to a #MON? - text_jump UnknownText_0x1c0396 + text_far UnknownText_0x1c0396 db "@" Text_TMHMNotCompatible: ; is not compatible with @ . It can't learn @ . - text_jump UnknownText_0x1c03c2 + text_far UnknownText_0x1c03c2 db "@" TMHM_PocketLoop: @@ -499,12 +499,12 @@ Unreferenced_Function2cadf: .NoRoomText: ; You have no room for any more @ S. - text_jump UnknownText_0x1c03fa + text_far UnknownText_0x1c03fa db "@" .ReceivedText: ; You received @ ! - text_jump UnknownText_0x1c0421 + text_far UnknownText_0x1c0421 db "@" .CheckHaveRoomForTMHM: diff --git a/engine/link/link.asm b/engine/link/link.asm index ee88e34b6..a013f3423 100644 --- a/engine/link/link.asm +++ b/engine/link/link.asm @@ -507,7 +507,7 @@ LinkTimeout: .TooMuchTimeHasElapsed: ; Too much time has elapsed. Please try again. - text_jump UnknownText_0x1c4183 + text_far UnknownText_0x1c4183 db "@" ExchangeBytes: @@ -1489,7 +1489,7 @@ Function28926: .Text_CantTradeLastMon: ; If you trade that #MON, you won't be able to battle. - text_jump UnknownText_0x1c41b1 + text_far UnknownText_0x1c41b1 db "@" .String_Stats_Trade: @@ -1497,7 +1497,7 @@ Function28926: .Text_Abnormal: ; Your friend's @ appears to be abnormal! - text_jump UnknownText_0x1c41e6 + text_far UnknownText_0x1c41e6 db "@" Function28ac9: @@ -1950,7 +1950,7 @@ String28eab: UnknownText_0x28eb8: ; Trade @ for @ ? - text_jump UnknownText_0x1c4212 + text_far UnknownText_0x1c4212 db "@" String28ebd: diff --git a/engine/link/mystery_gift.asm b/engine/link/mystery_gift.asm index e71055f7c..9844cbfa4 100644 --- a/engine/link/mystery_gift.asm +++ b/engine/link/mystery_gift.asm @@ -128,35 +128,35 @@ DoMysteryGift: db "@" .Text_LinkCanceled: - text_jump UnknownText_0x1c0436 + text_far UnknownText_0x1c0436 db "@" .Text_CommunicationError: - text_jump UnknownText_0x1c0454 + text_far UnknownText_0x1c0454 db "@" .Text_ReceiveGiftAtCounter: - text_jump UnknownText_0x1c046a + text_far UnknownText_0x1c046a db "@" .Text_FriendNotReady: - text_jump UnknownText_0x1c048e + text_far UnknownText_0x1c048e db "@" .Text_MaxFiveGifts: - text_jump UnknownText_0x1c04a7 + text_far UnknownText_0x1c04a7 db "@" .Text_MaxOneGiftPerPerson: - text_jump UnknownText_0x1c04c6 + text_far UnknownText_0x1c04c6 db "@" .Text_Sent: - text_jump UnknownText_0x1c04e9 + text_far UnknownText_0x1c04e9 db "@" .Text_SentToHome: - text_jump UnknownText_0x1c04fa + text_far UnknownText_0x1c04fa db "@" .CheckAlreadyGotFiveGiftsToday: @@ -1490,23 +1490,23 @@ String_PressAToLink_BToCancel_JP: db "@" Text_ReceivedCard: - text_jump UnknownText_0x1c051a + text_far UnknownText_0x1c051a db "@" Text_ListedCardAsNumber: - text_jump UnknownText_0x1c0531 + text_far UnknownText_0x1c0531 db "@" Text_CardNotRegistered: - text_jump UnknownText_0x1c0555 + text_far UnknownText_0x1c0555 db "@" Text_MGLinkCanceled: - text_jump UnknownText_0x1c0573 + text_far UnknownText_0x1c0573 db "@" Text_MGCommError: - text_jump UnknownText_0x1c0591 + text_far UnknownText_0x1c0591 db "@" Function105777: diff --git a/engine/menus/delete_save.asm b/engine/menus/delete_save.asm index 8be78e979..a0b2a13e6 100644 --- a/engine/menus/delete_save.asm +++ b/engine/menus/delete_save.asm @@ -20,7 +20,7 @@ _DeleteSaveData: .Text_ClearAllSaveData: ; Clear all save data? - text_jump UnknownText_0x1c564a + text_far UnknownText_0x1c564a db "@" .NoYesMenuHeader: diff --git a/engine/menus/init_gender.asm b/engine/menus/init_gender.asm index 21871d0ab..69f62c627 100644 --- a/engine/menus/init_gender.asm +++ b/engine/menus/init_gender.asm @@ -55,7 +55,7 @@ InitGender: TextJump_AreYouABoyOrAreYouAGirl: ; Are you a boy? Or are you a girl? - text_jump Text_AreYouABoyOrAreYouAGirl + text_far Text_AreYouABoyOrAreYouAGirl db "@" InitGenderScreen: diff --git a/engine/menus/intro_menu.asm b/engine/menus/intro_menu.asm index 8cc9cb5ad..1d76ff89a 100644 --- a/engine/menus/intro_menu.asm +++ b/engine/menus/intro_menu.asm @@ -703,11 +703,11 @@ OakSpeech: ret OakText1: - text_jump _OakText1 + text_far _OakText1 db "@" OakText2: - text_jump _OakText2 + text_far _OakText2 start_asm ld a, WOOPER call PlayMonCry @@ -716,23 +716,23 @@ OakText2: ret OakText3: - text_jump _OakText3 + text_far _OakText3 db "@" OakText4: - text_jump _OakText4 + text_far _OakText4 db "@" OakText5: - text_jump _OakText5 + text_far _OakText5 db "@" OakText6: - text_jump _OakText6 + text_far _OakText6 db "@" OakText7: - text_jump _OakText7 + text_far _OakText7 db "@" NamePlayer: diff --git a/engine/menus/main_menu.asm b/engine/menus/main_menu.asm index b21f6fd19..face2ba72 100644 --- a/engine/menus/main_menu.asm +++ b/engine/menus/main_menu.asm @@ -282,7 +282,7 @@ MainMenu_PrintCurrentTimeAndDay: .UnusedText: ; Clock time unknown - text_jump UnknownText_0x1c5182 + text_far UnknownText_0x1c5182 db "@" .PlaceCurrentDay: diff --git a/engine/menus/menu.asm b/engine/menus/menu.asm index 79ef648f7..b0644db8a 100644 --- a/engine/menus/menu.asm +++ b/engine/menus/menu.asm @@ -732,7 +732,7 @@ Error_Cant_ExitMenu: jr .InfiniteLoop .Text_NoWindowsAvailableForPopping: - text_jump UnknownText_0x1c46b7 + text_far UnknownText_0x1c46b7 db "@" _InitVerticalMenuCursor:: diff --git a/engine/menus/save.asm b/engine/menus/save.asm index 51acbc485..70dc03a6d 100644 --- a/engine/menus/save.asm +++ b/engine/menus/save.asm @@ -1097,40 +1097,40 @@ Checksum: Text_WouldYouLikeToSaveTheGame: ; Would you like to save the game? - text_jump UnknownText_0x1c454b + text_far UnknownText_0x1c454b db "@" Text_SavingDontTurnOffThePower: ; SAVING… DON'T TURN OFF THE POWER. - text_jump UnknownText_0x1c456d + text_far UnknownText_0x1c456d db "@" Text_PlayerSavedTheGame: ; saved the game. - text_jump UnknownText_0x1c4590 + text_far UnknownText_0x1c4590 db "@" Text_AlreadyASaveFile: ; There is already a save file. Is it OK to overwrite? - text_jump UnknownText_0x1c45a3 + text_far UnknownText_0x1c45a3 db "@" Text_AnotherSaveFile: ; There is another save file. Is it OK to overwrite? - text_jump UnknownText_0x1c45d9 + text_far UnknownText_0x1c45d9 db "@" Text_SaveFileCorrupted: ; The save file is corrupted! - text_jump UnknownText_0x1c460d + text_far UnknownText_0x1c460d db "@" Text_SaveOnBoxSwitch: ; When you change a #MON BOX, data will be saved. OK? - text_jump UnknownText_0x1c462a + text_far UnknownText_0x1c462a db "@" Text_SaveOnMoveMonWOMail: ; Each time you move a #MON, data will be saved. OK? - text_jump UnknownText_0x1c465f + text_far UnknownText_0x1c465f db "@" diff --git a/engine/menus/start_menu.asm b/engine/menus/start_menu.asm index ad65f6725..70fd60e9b 100644 --- a/engine/menus/start_menu.asm +++ b/engine/menus/start_menu.asm @@ -425,7 +425,7 @@ StartMenu_Quit: ret .EndTheContestText: - text_jump UnknownText_0x1c1a6c + text_far UnknownText_0x1c1a6c db "@" StartMenu_Save: diff --git a/engine/movie/init_hof_credits.asm b/engine/movie/init_hof_credits.asm index f49ccec69..40cfc7ff1 100644 --- a/engine/movie/init_hof_credits.asm +++ b/engine/movie/init_hof_credits.asm @@ -25,7 +25,7 @@ InitDisplayForHallOfFame: .SavingRecordDontTurnOff: ; SAVING RECORD… DON'T TURN OFF! - text_jump UnknownText_0x1bd39e + text_far UnknownText_0x1bd39e db "@" InitDisplayForRedCredits: diff --git a/engine/movie/trade_animation.asm b/engine/movie/trade_animation.asm index 23ea0b864..918b0c3e4 100644 --- a/engine/movie/trade_animation.asm +++ b/engine/movie/trade_animation.asm @@ -1191,12 +1191,12 @@ TradeAnim_SentToOTText: .Text_WasSentTo: ; was sent to @ . - text_jump UnknownText_0x1bc6e9 + text_far UnknownText_0x1bc6e9 db "@" .Text_MonName: ; - text_jump UnknownText_0x1bc701 + text_far UnknownText_0x1bc701 db "@" TradeAnim_OTBidsFarewell: @@ -1211,12 +1211,12 @@ TradeAnim_OTBidsFarewell: .Text_BidsFarewellToMon: ; bids farewell to - text_jump UnknownText_0x1bc703 + text_far UnknownText_0x1bc703 db "@" .Text_MonName: ; . - text_jump UnknownText_0x1bc719 + text_far UnknownText_0x1bc719 db "@" TradeAnim_TakeCareOfText: @@ -1234,7 +1234,7 @@ TradeAnim_TakeCareOfText: .Text_TakeGoodCareOfMon: ; Take good care of @ . - text_jump UnknownText_0x1bc71f + text_far UnknownText_0x1bc71f db "@" TradeAnim_OTSendsText1: @@ -1251,12 +1251,12 @@ TradeAnim_OTSendsText1: .Text_ForYourMon: ; For @ 's @ , - text_jump UnknownText_0x1bc739 + text_far UnknownText_0x1bc739 db "@" .Text_OTSends: ; sends @ . - text_jump UnknownText_0x1bc74c + text_far UnknownText_0x1bc74c db "@" TradeAnim_OTSendsText2: @@ -1273,12 +1273,12 @@ TradeAnim_OTSendsText2: .Text_WillTrade: ; will trade @ @ - text_jump UnknownText_0x1bc75e + text_far UnknownText_0x1bc75e db "@" .Text_ForYourMon: ; for @ 's @ . - text_jump UnknownText_0x1bc774 + text_far UnknownText_0x1bc774 db "@" TradeAnim_Wait80Frames: diff --git a/engine/overworld/decorations.asm b/engine/overworld/decorations.asm index 9b1b2a5a6..6eacb0e00 100644 --- a/engine/overworld/decorations.asm +++ b/engine/overworld/decorations.asm @@ -384,7 +384,7 @@ PopulateDecoCategoryMenu: .Text_nothing_to_choose: ; There's nothing to choose. - text_jump UnknownText_0x1bc471 + text_far UnknownText_0x1bc471 db "@" .NonscrollingMenuHeader: @@ -806,7 +806,7 @@ DecoAction_SetItUp_Ornament: UnknownText_0x26e41: ; Which side do you want to put it on? - text_jump UnknownText_0x1bc48c + text_far UnknownText_0x1bc48c db "@" DecoAction_PutItAway_Ornament: @@ -832,7 +832,7 @@ DecoAction_PutItAway_Ornament: DecoText_WhichSide: ; Which side do you want to put away? - text_jump UnknownText_0x1bc4b2 + text_far UnknownText_0x1bc4b2 db "@" DecoAction_AskWhichSide: @@ -885,27 +885,27 @@ MenuData_0x26eb3: DecoText_PutAwayTheDeco: ; Put away the @ . - text_jump UnknownText_0x1bc4d7 + text_far UnknownText_0x1bc4d7 db "@" DecoText_NothingToPutAway: ; There's nothing to put away. - text_jump UnknownText_0x1bc4ec + text_far UnknownText_0x1bc4ec db "@" DecoText_SetUpTheDeco: ; Set up the @ . - text_jump UnknownText_0x1bc509 + text_far UnknownText_0x1bc509 db "@" DecoText_PutAwayAndSetUp: ; Put away the @ and set up the @ . - text_jump UnknownText_0x1bc51c + text_far UnknownText_0x1bc51c db "@" DecoText_AlreadySetUp: ; That's already set up. - text_jump UnknownText_0x1bc546 + text_far UnknownText_0x1bc546 db "@" GetDecorationName_c_de: @@ -1013,7 +1013,7 @@ DecorationDesc_TownMapPoster: .TownMapText: ; It's the TOWN MAP. - text_jump UnknownText_0x1bc55d + text_far UnknownText_0x1bc55d db "@" DecorationDesc_PikachuPoster: @@ -1021,7 +1021,7 @@ DecorationDesc_PikachuPoster: .PikaPosterText: ; It's a poster of a cute PIKACHU. - text_jump UnknownText_0x1bc570 + text_far UnknownText_0x1bc570 db "@" DecorationDesc_ClefairyPoster: @@ -1029,7 +1029,7 @@ DecorationDesc_ClefairyPoster: .ClefairyPosterText: ; It's a poster of a cute CLEFAIRY. - text_jump UnknownText_0x1bc591 + text_far UnknownText_0x1bc591 db "@" DecorationDesc_JigglypuffPoster: @@ -1037,7 +1037,7 @@ DecorationDesc_JigglypuffPoster: .JigglypuffPosterText: ; It's a poster of a cute JIGGLYPUFF. - text_jump UnknownText_0x1bc5b3 + text_far UnknownText_0x1bc5b3 db "@" DecorationDesc_NullPoster: @@ -1068,7 +1068,7 @@ DecorationDesc_OrnamentOrConsole: .OrnamentConsoleText: ; It's an adorable @ . - text_jump UnknownText_0x1bc5d7 + text_far UnknownText_0x1bc5d7 db "@" DecorationDesc_GiantOrnament: @@ -1081,7 +1081,7 @@ DecorationDesc_GiantOrnament: .BigDollText: ; A giant doll! It's fluffy and cuddly. - text_jump UnknownText_0x1bc5ef + text_far UnknownText_0x1bc5ef db "@" ToggleMaptileDecorations: diff --git a/engine/overworld/scripting.asm b/engine/overworld/scripting.asm index 6b0932804..0e36c30e2 100644 --- a/engine/overworld/scripting.asm +++ b/engine/overworld/scripting.asm @@ -536,7 +536,7 @@ GiveItemScript: end ReceivedItemText: - text_jump UnknownText_0x1c4719 + text_far UnknownText_0x1c4719 db "@" Script_verbosegiveitem2: @@ -628,11 +628,11 @@ CurItemName: ret PutItemInPocketText: - text_jump UnknownText_0x1c472c + text_far UnknownText_0x1c472c db "@" PocketIsFullText: - text_jump UnknownText_0x1c474b + text_far UnknownText_0x1c474b db "@" Script_pokemart: diff --git a/engine/overworld/select_menu.asm b/engine/overworld/select_menu.asm index 4dd324157..46c207ae7 100644 --- a/engine/overworld/select_menu.asm +++ b/engine/overworld/select_menu.asm @@ -12,7 +12,7 @@ SelectMenu:: jp CloseText ItemMayBeRegisteredText: - text_jump UnknownText_0x1c1cf3 + text_far UnknownText_0x1c1cf3 db "@" CheckRegisteredItem: diff --git a/engine/overworld/wildmons.asm b/engine/overworld/wildmons.asm index aa93cdaad..ea92b3fa5 100644 --- a/engine/overworld/wildmons.asm +++ b/engine/overworld/wildmons.asm @@ -834,7 +834,7 @@ RandomUnseenWildMon: .SawRareMonText: ; I just saw some rare @ in @ . I'll call you if I see another rare #MON, OK? - text_jump UnknownText_0x1bd34b + text_far UnknownText_0x1bd34b db "@" RandomPhoneWildMon: diff --git a/engine/phone/phone.asm b/engine/phone/phone.asm index f5fc0b610..769ed513d 100644 --- a/engine/phone/phone.asm +++ b/engine/phone/phone.asm @@ -416,7 +416,7 @@ WrongNumber: end .text ; Huh? Sorry, wrong number! - text_jump UnknownText_0x1c5565 + text_far UnknownText_0x1c5565 db "@" Script_ReceivePhoneCall: @@ -541,7 +541,7 @@ HangUp_Beep: ret UnknownText_0x9032a: - text_jump UnknownText_0x1c5580 + text_far UnknownText_0x1c5580 db "@" HangUp_BoopOn: @@ -550,7 +550,7 @@ HangUp_BoopOn: ret UnknownText_0x90336: - text_jump UnknownText_0x1c5588 + text_far UnknownText_0x1c5588 db "@" HangUp_BoopOff: @@ -710,7 +710,7 @@ UnknownScript_0x90657: UnknownText_0x9065b: ; That number is out of the area. - text_jump UnknownText_0x1c558b + text_far UnknownText_0x1c558b db "@" PhoneScript_JustTalkToThem: @@ -719,7 +719,7 @@ PhoneScript_JustTalkToThem: UnknownText_0x90664: ; Just go talk to that person! - text_jump UnknownText_0x1c55ac + text_far UnknownText_0x1c55ac db "@" UnknownScript_0x90669: @@ -728,5 +728,5 @@ UnknownScript_0x90669: UnknownText_0x9066d: ; Thank you! - text_jump UnknownText_0x1c55ca + text_far UnknownText_0x1c55ca db "@" diff --git a/engine/pokegear/pokegear.asm b/engine/pokegear/pokegear.asm index 580da8014..e8471fa1b 100644 --- a/engine/pokegear/pokegear.asm +++ b/engine/pokegear/pokegear.asm @@ -532,7 +532,7 @@ Pokegear_UpdateClock: db "ごご@" .DayText: - text_jump UnknownText_0x1c5821 + text_far UnknownText_0x1c5821 db "@" PokegearMap_CheckRegion: @@ -936,12 +936,12 @@ PokegearPhone_MakePhoneCall: .dotdotdot ; - text_jump UnknownText_0x1c5824 + text_far UnknownText_0x1c5824 db "@" .OutOfServiceArea: ; You're out of the service area. - text_jump UnknownText_0x1c5827 + text_far UnknownText_0x1c5827 db "@" PokegearPhone_FinishPhoneCall: @@ -1353,17 +1353,17 @@ Pokegear_LoadTilemapRLE: PokegearText_WhomToCall: ; Whom do you want to call? - text_jump UnknownText_0x1c5847 + text_far UnknownText_0x1c5847 db "@" PokegearText_PressAnyButtonToExit: ; Press any button to exit. - text_jump UnknownText_0x1c5862 + text_far UnknownText_0x1c5862 db "@" PokegearText_DeleteStoredNumber: ; Delete this stored phone number? - text_jump UnknownText_0x1c587d + text_far UnknownText_0x1c587d db "@" PokegearSpritesGFX: diff --git a/engine/pokegear/radio.asm b/engine/pokegear/radio.asm index 6f9d709f8..52bfc67d0 100644 --- a/engine/pokegear/radio.asm +++ b/engine/pokegear/radio.asm @@ -305,32 +305,32 @@ OaksPKMNTalk6: OPT_IntroText1: ; MARY: PROF.OAK'S - text_jump _OPT_IntroText1 + text_far _OPT_IntroText1 db "@" OPT_IntroText2: ; #MON TALK! - text_jump _OPT_IntroText2 + text_far _OPT_IntroText2 db "@" OPT_IntroText3: ; With me, MARY! - text_jump _OPT_IntroText3 + text_far _OPT_IntroText3 db "@" OPT_OakText1: ; OAK: @ @ - text_jump _OPT_OakText1 + text_far _OPT_OakText1 db "@" OPT_OakText2: ; may be seen around - text_jump _OPT_OakText2 + text_far _OPT_OakText2 db "@" OPT_OakText3: ; @ . - text_jump _OPT_OakText3 + text_far _OPT_OakText3 db "@" OaksPKMNTalk7: @@ -343,7 +343,7 @@ OaksPKMNTalk7: OPT_MaryText1: ; MARY: @ 's - text_jump _OPT_MaryText1 + text_far _OPT_MaryText1 db "@" OaksPKMNTalk8: @@ -383,82 +383,82 @@ OaksPKMNTalk8: .sweetadorably ; sweet and adorably - text_jump OPT_SweetAdorably + text_far OPT_SweetAdorably db "@" .wigglyslickly ; wiggly and slickly - text_jump OPT_WigglySlickly + text_far OPT_WigglySlickly db "@" .aptlynamed ; aptly named and - text_jump OPT_AptlyNamed + text_far OPT_AptlyNamed db "@" .undeniablykindof ; undeniably kind of - text_jump OPT_UndeniablyKindOf + text_far OPT_UndeniablyKindOf db "@" .unbearably ; so, so unbearably - text_jump OPT_Unbearably + text_far OPT_Unbearably db "@" .wowimpressively ; wow, impressively - text_jump OPT_WowImpressively + text_far OPT_WowImpressively db "@" .almostpoisonously ; almost poisonously - text_jump OPT_AlmostPoisonously + text_far OPT_AlmostPoisonously db "@" .sensually ; ooh, so sensually - text_jump OPT_Sensually + text_far OPT_Sensually db "@" .mischievously ; so mischievously - text_jump OPT_Mischievously + text_far OPT_Mischievously db "@" .topically ; so very topically - text_jump OPT_Topically + text_far OPT_Topically db "@" .addictively ; sure addictively - text_jump OPT_Addictively + text_far OPT_Addictively db "@" .looksinwater ; looks in water is - text_jump OPT_LooksInWater + text_far OPT_LooksInWater db "@" .evolutionmustbe ; evolution must be - text_jump OPT_EvolutionMustBe + text_far OPT_EvolutionMustBe db "@" .provocatively ; provocatively - text_jump OPT_Provocatively + text_far OPT_Provocatively db "@" .flippedout ; so flipped out and - text_jump OPT_FlippedOut + text_far OPT_FlippedOut db "@" .heartmeltingly ; heart-meltingly - text_jump OPT_HeartMeltingly + text_far OPT_HeartMeltingly db "@" OaksPKMNTalk9: @@ -506,82 +506,82 @@ OaksPKMNTalk9: .cute ; cute. - text_jump OPT_Cute + text_far OPT_Cute db "@" .weird ; weird. - text_jump OPT_Weird + text_far OPT_Weird db "@" .pleasant ; pleasant. - text_jump OPT_Pleasant + text_far OPT_Pleasant db "@" .boldsortof ; bold, sort of. - text_jump OPT_BoldSortOf + text_far OPT_BoldSortOf db "@" .frightening ; frightening. - text_jump OPT_Frightening + text_far OPT_Frightening db "@" .suavedebonair ; suave & debonair! - text_jump OPT_SuaveDebonair + text_far OPT_SuaveDebonair db "@" .powerful ; powerful. - text_jump OPT_Powerful + text_far OPT_Powerful db "@" .exciting ; exciting. - text_jump OPT_Exciting + text_far OPT_Exciting db "@" .groovy ; groovy! - text_jump OPT_Groovy + text_far OPT_Groovy db "@" .inspiring ; inspiring. - text_jump OPT_Inspiring + text_far OPT_Inspiring db "@" .friendly ; friendly. - text_jump OPT_Friendly + text_far OPT_Friendly db "@" .hothothot ; hot, hot, hot! - text_jump OPT_HotHotHot + text_far OPT_HotHotHot db "@" .stimulating ; stimulating. - text_jump OPT_Stimulating + text_far OPT_Stimulating db "@" .guarded ; guarded. - text_jump OPT_Guarded + text_far OPT_Guarded db "@" .lovely ; lovely. - text_jump OPT_Lovely + text_far OPT_Lovely db "@" .speedy ; speedy. - text_jump OPT_Speedy + text_far OPT_Speedy db "@" OaksPKMNTalk10: @@ -599,7 +599,7 @@ OaksPKMNTalk10: OPT_PokemonChannelText: ; #MON - text_jump _OPT_PokemonChannelText + text_far _OPT_PokemonChannelText db "@" OPT_RestartText: @@ -849,7 +849,7 @@ CopyDexEntryPart2: PokedexShowText: ; @ @ - text_jump _PokedexShowText + text_far _PokedexShowText db "@" BenMonMusic1: @@ -921,52 +921,52 @@ StartPokemonMusicChannel: BenIntroText1: ; BEN: #MON MUSIC - text_jump _BenIntroText1 + text_far _BenIntroText1 db "@" BenIntroText2: ; CHANNEL! - text_jump _BenIntroText2 + text_far _BenIntroText2 db "@" BenIntroText3: ; It's me, DJ BEN! - text_jump _BenIntroText3 + text_far _BenIntroText3 db "@" FernIntroText1: ; FERN: #MUSIC! - text_jump _FernIntroText1 + text_far _FernIntroText1 db "@" FernIntroMusic2: ; With DJ FERN! - text_jump _FernIntroText2 + text_far _FernIntroText2 db "@" BenFernText1: ; Today's @ , - text_jump _BenFernText1 + text_far _BenFernText1 db "@" BenFernText2A: ; so let us jam to - text_jump _BenFernText2A + text_far _BenFernText2A db "@" BenFernText2B: ; so chill out to - text_jump _BenFernText2B + text_far _BenFernText2B db "@" BenFernText3A: ; #MON March! - text_jump _BenFernText3A + text_far _BenFernText3A db "@" BenFernText3B: ; #MON Lullaby! - text_jump _BenFernText3B + text_far _BenFernText3B db "@" LuckyNumberShow1: @@ -1062,67 +1062,67 @@ LuckyNumberShow15: LC_Text1: ; REED: Yeehaw! How - text_jump _LC_Text1 + text_far _LC_Text1 db "@" LC_Text2: ; y'all doin' now? - text_jump _LC_Text2 + text_far _LC_Text2 db "@" LC_Text3: ; Whether you're up - text_jump _LC_Text3 + text_far _LC_Text3 db "@" LC_Text4: ; or way down low, - text_jump _LC_Text4 + text_far _LC_Text4 db "@" LC_Text5: ; don't you miss the - text_jump _LC_Text5 + text_far _LC_Text5 db "@" LC_Text6: ; LUCKY NUMBER SHOW! - text_jump _LC_Text6 + text_far _LC_Text6 db "@" LC_Text7: ; This week's Lucky - text_jump _LC_Text7 + text_far _LC_Text7 db "@" LC_Text8: ; Number is @ ! - text_jump _LC_Text8 + text_far _LC_Text8 db "@" LC_Text9: ; I'll repeat that! - text_jump _LC_Text9 + text_far _LC_Text9 db "@" LC_Text10: ; Match it and go to - text_jump _LC_Text10 + text_far _LC_Text10 db "@" LC_Text11: ; the RADIO TOWER! - text_jump _LC_Text11 + text_far _LC_Text11 db "@" LC_DragText1: ; …Repeating myself - text_jump _LC_DragText1 + text_far _LC_DragText1 db "@" LC_DragText2: ; gets to be a drag… - text_jump _LC_DragText2 + text_far _LC_DragText2 db "@" PeoplePlaces1: @@ -1148,17 +1148,17 @@ PeoplePlaces3: PnP_Text1: ; PLACES AND PEOPLE! - text_jump _PnP_Text1 + text_far _PnP_Text1 db "@" PnP_Text2: ; Brought to you by - text_jump _PnP_Text2 + text_far _PnP_Text2 db "@" PnP_Text3: ; me, DJ LILY! - text_jump _PnP_Text3 + text_far _PnP_Text3 db "@" PeoplePlaces4: ; People @@ -1200,7 +1200,7 @@ INCLUDE "data/radio/pnp_hidden_people.asm" PnP_Text4: ; @ @ @ - text_jump _PnP_Text4 + text_far _PnP_Text4 db "@" PeoplePlaces5: @@ -1249,82 +1249,82 @@ PeoplePlaces5: PnP_cute: ; is cute. - text_jump _PnP_cute + text_far _PnP_cute db "@" PnP_lazy: ; is sort of lazy. - text_jump _PnP_lazy + text_far _PnP_lazy db "@" PnP_happy: ; is always happy. - text_jump _PnP_happy + text_far _PnP_happy db "@" PnP_noisy: ; is quite noisy. - text_jump _PnP_noisy + text_far _PnP_noisy db "@" PnP_precocious: ; is precocious. - text_jump _PnP_precocious + text_far _PnP_precocious db "@" PnP_bold: ; is somewhat bold. - text_jump _PnP_bold + text_far _PnP_bold db "@" PnP_picky: ; is too picky! - text_jump _PnP_picky + text_far _PnP_picky db "@" PnP_sortofok: ; is sort of OK. - text_jump _PnP_sortofok + text_far _PnP_sortofok db "@" PnP_soso: ; is just so-so. - text_jump _PnP_soso + text_far _PnP_soso db "@" PnP_great: ; is actually great. - text_jump _PnP_great + text_far _PnP_great db "@" PnP_mytype: ; is just my type. - text_jump _PnP_mytype + text_far _PnP_mytype db "@" PnP_cool: ; is so cool, no? - text_jump _PnP_cool + text_far _PnP_cool db "@" PnP_inspiring: ; is inspiring! - text_jump _PnP_inspiring + text_far _PnP_inspiring db "@" PnP_weird: ; is kind of weird. - text_jump _PnP_weird + text_far _PnP_weird db "@" PnP_rightforme: ; is right for me? - text_jump _PnP_rightforme + text_far _PnP_rightforme db "@" PnP_odd: ; is definitely odd! - text_jump _PnP_odd + text_far _PnP_odd db "@" PeoplePlaces6: ; Places @@ -1350,7 +1350,7 @@ INCLUDE "data/radio/pnp_hidden_places.asm" PnP_Text5: ; @ @ - text_jump _PnP_Text5 + text_far _PnP_Text5 db "@" PeoplePlaces7: @@ -1451,52 +1451,52 @@ RocketRadio10: RocketRadioText1: ; … …Ahem, we are - text_jump _RocketRadioText1 + text_far _RocketRadioText1 db "@" RocketRadioText2: ; TEAM ROCKET! - text_jump _RocketRadioText2 + text_far _RocketRadioText2 db "@" RocketRadioText3: ; After three years - text_jump _RocketRadioText3 + text_far _RocketRadioText3 db "@" RocketRadioText4: ; of preparation, we - text_jump _RocketRadioText4 + text_far _RocketRadioText4 db "@" RocketRadioText5: ; have risen again - text_jump _RocketRadioText5 + text_far _RocketRadioText5 db "@" RocketRadioText6: ; from the ashes! - text_jump _RocketRadioText6 + text_far _RocketRadioText6 db "@" RocketRadioText7: ; GIOVANNI! @ Can you - text_jump _RocketRadioText7 + text_far _RocketRadioText7 db "@" RocketRadioText8: ; hear?@ We did it! - text_jump _RocketRadioText8 + text_far _RocketRadioText8 db "@" RocketRadioText9: ; @ Where is our boss? - text_jump _RocketRadioText9 + text_far _RocketRadioText9 db "@" RocketRadioText10: ; @ Is he listening? - text_jump _RocketRadioText10 + text_far _RocketRadioText10 db "@" PokeFluteRadio: @@ -1808,92 +1808,92 @@ BuenasPasswordChannelName: BuenaRadioText1: ; BUENA: BUENA here! - text_jump _BuenaRadioText1 + text_far _BuenaRadioText1 db "@" BuenaRadioText2: ; Today's password! - text_jump _BuenaRadioText2 + text_far _BuenaRadioText2 db "@" BuenaRadioText3: ; Let me think… It's - text_jump _BuenaRadioText3 + text_far _BuenaRadioText3 db "@" BuenaRadioText4: ; @ ! - text_jump _BuenaRadioText4 + text_far _BuenaRadioText4 db "@" BuenaRadioText5: ; Don't forget it! - text_jump _BuenaRadioText5 + text_far _BuenaRadioText5 db "@" BuenaRadioText6: ; I'm in GOLDENROD's - text_jump _BuenaRadioText6 + text_far _BuenaRadioText6 db "@" BuenaRadioText7: ; RADIO TOWER! - text_jump _BuenaRadioText7 + text_far _BuenaRadioText7 db "@" BuenaRadioMidnightText1: ; BUENA: Oh my… - text_jump _BuenaRadioMidnightText1 + text_far _BuenaRadioMidnightText1 db "@" BuenaRadioMidnightText2: ; It's midnight! I - text_jump _BuenaRadioMidnightText2 + text_far _BuenaRadioMidnightText2 db "@" BuenaRadioMidnightText3: ; have to shut down! - text_jump _BuenaRadioMidnightText3 + text_far _BuenaRadioMidnightText3 db "@" BuenaRadioMidnightText4: ; Thanks for tuning - text_jump _BuenaRadioMidnightText4 + text_far _BuenaRadioMidnightText4 db "@" BuenaRadioMidnightText5: ; in to the end! But - text_jump _BuenaRadioMidnightText5 + text_far _BuenaRadioMidnightText5 db "@" BuenaRadioMidnightText6: ; don't stay up too - text_jump _BuenaRadioMidnightText6 + text_far _BuenaRadioMidnightText6 db "@" BuenaRadioMidnightText7: ; late! Presented to - text_jump _BuenaRadioMidnightText7 + text_far _BuenaRadioMidnightText7 db "@" BuenaRadioMidnightText8: ; you by DJ BUENA! - text_jump _BuenaRadioMidnightText8 + text_far _BuenaRadioMidnightText8 db "@" BuenaRadioMidnightText9: ; I'm outta here! - text_jump _BuenaRadioMidnightText9 + text_far _BuenaRadioMidnightText9 db "@" BuenaRadioMidnightText10: ; … - text_jump _BuenaRadioMidnightText10 + text_far _BuenaRadioMidnightText10 db "@" BuenaOffTheAirText: ; - text_jump _BuenaOffTheAirText + text_far _BuenaOffTheAirText db "@" CopyRadioTextToRAM: diff --git a/engine/pokemon/bills_pc_top.asm b/engine/pokemon/bills_pc_top.asm index c437f52ee..1f8c8390e 100644 --- a/engine/pokemon/bills_pc_top.asm +++ b/engine/pokemon/bills_pc_top.asm @@ -16,7 +16,7 @@ _BillsPC: .Text_GottaHavePokemon: ; You gotta have #MON to call! - text_jump UnknownText_0x1c1006 + text_far UnknownText_0x1c1006 db "@" .LogIn: @@ -37,7 +37,7 @@ _BillsPC: .Text_What: ; What? - text_jump UnknownText_0x1c1024 + text_far UnknownText_0x1c1024 db "@" .LogOut: @@ -130,7 +130,7 @@ BillsPC_MovePKMNMenu: .Text_MonHoldingMail: ; There is a #MON holding MAIL. Please remove the MAIL. - text_jump UnknownText_0x1c102b + text_far UnknownText_0x1c102b db "@" BillsPC_DepositMenu: @@ -165,12 +165,12 @@ Unreferenced_Functione512: .Text_NoMon: ; You don't have a single #MON! - text_jump UnknownText_0x1c1062 + text_far UnknownText_0x1c1062 db "@" .Text_ItsYourLastMon: ; You can't deposit your last #MON! - text_jump UnknownText_0x1c1080 + text_far UnknownText_0x1c1080 db "@" CheckCurPartyMonFainted: @@ -226,7 +226,7 @@ Unreferenced_Functione56d: UnknownText_0xe57e: ; You can't take any more #MON. - text_jump UnknownText_0x1c10a2 + text_far UnknownText_0x1c10a2 db "@" BillsPC_ChangeBoxMenu: diff --git a/engine/pokemon/breeding.asm b/engine/pokemon/breeding.asm index d24c1c608..697ed2855 100644 --- a/engine/pokemon/breeding.asm +++ b/engine/pokemon/breeding.asm @@ -356,7 +356,7 @@ HatchEggs: .Text_HatchEgg: ; Huh? @ @ - text_jump UnknownText_0x1c0db0 + text_far UnknownText_0x1c0db0 start_asm ld hl, wVramState res 0, [hl] @@ -378,17 +378,17 @@ HatchEggs: .ClearTextbox: ; - text_jump UnknownText_0x1c0db8 + text_far UnknownText_0x1c0db8 db "@" .CameOutOfItsEgg: ; came out of its EGG!@ @ - text_jump UnknownText_0x1c0dba + text_far UnknownText_0x1c0dba db "@" .Text_NicknameHatchling: ; Give a nickname to @ ? - text_jump UnknownText_0x1c0dd8 + text_far UnknownText_0x1c0dd8 db "@" InitEggMoves: @@ -895,12 +895,12 @@ DayCareMonCursor: DayCareMon2Text: ; It's @ that was left with the DAY-CARE LADY. - text_jump UnknownText_0x1c0df3 + text_far UnknownText_0x1c0df3 db "@" DayCareMon1Text: ; It's @ that was left with the DAY-CARE MAN. - text_jump UnknownText_0x1c0e24 + text_far UnknownText_0x1c0e24 db "@" DayCareMonCompatibilityText: @@ -930,27 +930,27 @@ DayCareMonCompatibilityText: .AllAlone: ; It's brimming with energy. - text_jump UnknownText_0x1c0e54 + text_far UnknownText_0x1c0e54 db "@" .Incompatible: ; It has no interest in @ . - text_jump UnknownText_0x1c0e6f + text_far UnknownText_0x1c0e6f db "@" .HighCompatibility: ; It appears to care for @ . - text_jump UnknownText_0x1c0e8d + text_far UnknownText_0x1c0e8d db "@" .ModerateCompatibility: ; It's friendly with @ . - text_jump UnknownText_0x1c0eac + text_far UnknownText_0x1c0eac db "@" .SlightCompatibility: ; It shows interest in @ . - text_jump UnknownText_0x1c0ec6 + text_far UnknownText_0x1c0ec6 db "@" Unreferenced_DayCareMonPrintEmptyString: diff --git a/engine/pokemon/caught_data.asm b/engine/pokemon/caught_data.asm index 31cfe7e75..3d232c7c1 100644 --- a/engine/pokemon/caught_data.asm +++ b/engine/pokemon/caught_data.asm @@ -158,7 +158,7 @@ GiveANickname_YesNo: TextJump_GiveANickname: ; Give a nickname to the @ you received? - text_jump UnknownText_0x1c12fc + text_far UnknownText_0x1c12fc db "@" SetCaughtData: diff --git a/engine/pokemon/evolve.asm b/engine/pokemon/evolve.asm index b06d9f9cf..d026b33f0 100644 --- a/engine/pokemon/evolve.asm +++ b/engine/pokemon/evolve.asm @@ -396,22 +396,22 @@ IsMonHoldingEverstone: Text_CongratulationsYourPokemon: ; Congratulations! Your @ @ - text_jump UnknownText_0x1c4b92 + text_far UnknownText_0x1c4b92 db "@" Text_EvolvedIntoPKMN: ; evolved into @ ! - text_jump UnknownText_0x1c4baf + text_far UnknownText_0x1c4baf db "@" Text_StoppedEvolving: ; Huh? @ stopped evolving! - text_jump UnknownText_0x1c4bc5 + text_far UnknownText_0x1c4bc5 db "@" Text_WhatEvolving: ; What? @ is evolving! - text_jump UnknownText_0x1c4be3 + text_far UnknownText_0x1c4be3 db "@" LearnLevelMoves: diff --git a/engine/pokemon/knows_move.asm b/engine/pokemon/knows_move.asm index d84a0d424..85ae3f032 100644 --- a/engine/pokemon/knows_move.asm +++ b/engine/pokemon/knows_move.asm @@ -21,5 +21,5 @@ KnowsMove: .Text_knows: ; knows @ . - text_jump UnknownText_0x1c5ea8 + text_far UnknownText_0x1c5ea8 db "@" diff --git a/engine/pokemon/learn.asm b/engine/pokemon/learn.asm index 9031c6857..dfeb7f97f 100644 --- a/engine/pokemon/learn.asm +++ b/engine/pokemon/learn.asm @@ -202,32 +202,32 @@ ForgetMove: Text_LearnedMove: ; learned ! - text_jump UnknownText_0x1c5660 + text_far UnknownText_0x1c5660 db "@" Text_ForgetWhich: ; Which move should be forgotten? - text_jump UnknownText_0x1c5678 + text_far UnknownText_0x1c5678 db "@" Text_StopLearning: ; Stop learning ? - text_jump UnknownText_0x1c5699 + text_far UnknownText_0x1c5699 db "@" Text_DidNotLearn: ; did not learn . - text_jump UnknownText_0x1c56af + text_far UnknownText_0x1c56af db "@" Text_TryingToLearn: ; is trying to learn . But can't learn more than ; four moves. Delete an older move to make room for ? - text_jump UnknownText_0x1c56c9 + text_far UnknownText_0x1c56c9 db "@" Text_1_2_and_Poof: - text_jump UnknownText_0x1c5740 ; 1, 2 and… + text_far UnknownText_0x1c5740 ; 1, 2 and… start_asm push de ld de, SFX_SWITCH_POKEMON @@ -238,10 +238,10 @@ Text_1_2_and_Poof: .PoofForgot: ; Poof! forgot . And… - text_jump UnknownText_0x1c574e + text_far UnknownText_0x1c574e db "@" Text_CantForgetHM: ; HM moves can't be forgotten now. - text_jump UnknownText_0x1c5772 + text_far UnknownText_0x1c5772 db "@" diff --git a/engine/pokemon/mail.asm b/engine/pokemon/mail.asm index 50c59677e..6576153dc 100644 --- a/engine/pokemon/mail.asm +++ b/engine/pokemon/mail.asm @@ -310,7 +310,7 @@ _PlayerMailBoxMenu: jp MenuTextBoxBackup .EmptyMailboxText: - text_jump _EmptyMailboxText + text_far _EmptyMailboxText db "@" InitMail: @@ -453,15 +453,15 @@ MailboxPC: jp MenuTextBoxBackup .PutAwayText: - text_jump ClearedMailPutAwayText + text_far ClearedMailPutAwayText db "@" .PackFullText: - text_jump MailPackFullText + text_far MailPackFullText db "@" .MessageLostText: - text_jump MailMessageLostText + text_far MailMessageLostText db "@" .GetMailType: @@ -521,15 +521,15 @@ MailboxPC: jp CloseSubmenu .HoldingMailText: - text_jump MailAlreadyHoldingItemText + text_far MailAlreadyHoldingItemText db "@" .EggText: - text_jump MailEggText + text_far MailEggText db "@" .MailMovedText: - text_jump MailMovedFromBoxText + text_far MailMovedFromBoxText db "@" .Cancel: diff --git a/engine/pokemon/mon_menu.asm b/engine/pokemon/mon_menu.asm index de9548189..9f982277f 100644 --- a/engine/pokemon/mon_menu.asm +++ b/engine/pokemon/mon_menu.asm @@ -63,17 +63,17 @@ TossItemFromPC: .TossHowMany: ; Toss out how many @ (S)? - text_jump UnknownText_0x1c1a90 + text_far UnknownText_0x1c1a90 db "@" .ConfirmToss: ; Throw away @ @ (S)? - text_jump UnknownText_0x1c1aad + text_far UnknownText_0x1c1aad db "@" .TossedThisMany: ; Discarded @ (S). - text_jump UnknownText_0x1c1aca + text_far UnknownText_0x1c1aca db "@" .CantToss: @@ -83,7 +83,7 @@ TossItemFromPC: .TooImportantToToss: ; That's too impor- tant to toss out! - text_jump UnknownText_0x1c1adf + text_far UnknownText_0x1c1adf db "@" CantUseItem: @@ -92,7 +92,7 @@ CantUseItem: ret CantUseItemText: - text_jump UnknownText_0x1c1b03 + text_far UnknownText_0x1c1b03 db "@" PartyMonItemName: @@ -391,35 +391,35 @@ GiveTakeItemMenuData: db "TAKE@" TookAndMadeHoldText: - text_jump UnknownText_0x1c1b2c + text_far UnknownText_0x1c1b2c db "@" MadeHoldText: - text_jump UnknownText_0x1c1b57 + text_far UnknownText_0x1c1b57 db "@" PleaseRemoveMailText: - text_jump UnknownText_0x1c1b6f + text_far UnknownText_0x1c1b6f db "@" IsntHoldingAnythingText: - text_jump UnknownText_0x1c1b8e + text_far UnknownText_0x1c1b8e db "@" ItemStorageIsFullText: - text_jump UnknownText_0x1c1baa + text_far UnknownText_0x1c1baa db "@" TookFromText: - text_jump UnknownText_0x1c1bc4 + text_far UnknownText_0x1c1bc4 db "@" SwitchAlreadyHoldingText: - text_jump UnknownText_0x1c1bdc + text_far UnknownText_0x1c1bdc db "@" CantBeHeldText: - text_jump UnknownText_0x1c1c09 + text_far UnknownText_0x1c1c09 db "@" GetPartyItemLocation: @@ -562,32 +562,32 @@ MonMailAction: .mailwilllosemessagetext ; The MAIL will lose its message. OK? - text_jump UnknownText_0x1c1c22 + text_far UnknownText_0x1c1c22 db "@" .tookmailfrommontext ; MAIL detached from . - text_jump UnknownText_0x1c1c47 + text_far UnknownText_0x1c1c47 db "@" .bagfulltext ; There's no space for removing MAIL. - text_jump UnknownText_0x1c1c62 + text_far UnknownText_0x1c1c62 db "@" .sendmailtopctext ; Send the removed MAIL to your PC? - text_jump UnknownText_0x1c1c86 + text_far UnknownText_0x1c1c86 db "@" .mailboxfulltext ; Your PC's MAILBOX is full. - text_jump UnknownText_0x1c1ca9 + text_far UnknownText_0x1c1ca9 db "@" .sentmailtopctext ; The MAIL was sent to your PC. - text_jump UnknownText_0x1c1cc4 + text_far UnknownText_0x1c1cc4 db "@" OpenPartyStats: @@ -749,7 +749,7 @@ MonMenu_Softboiled_MilkDrink: .Text_NotEnoughHP: ; Not enough HP! - text_jump UnknownText_0x1c1ce3 + text_far UnknownText_0x1c1ce3 db "@" .CheckMonHasEnoughHP: diff --git a/engine/pokemon/move_mon.asm b/engine/pokemon/move_mon.asm index fc268280b..e6e108516 100644 --- a/engine/pokemon/move_mon.asm +++ b/engine/pokemon/move_mon.asm @@ -1800,7 +1800,7 @@ GivePoke:: TextJump_WasSentToBillsPC: ; was sent to BILL's PC. - text_jump Text_WasSentToBillsPC + text_far Text_WasSentToBillsPC db "@" InitNickname: diff --git a/engine/pokemon/party_menu.asm b/engine/pokemon/party_menu.asm index eb72713d2..ebc75e1b2 100644 --- a/engine/pokemon/party_menu.asm +++ b/engine/pokemon/party_menu.asm @@ -805,52 +805,52 @@ PrintPartyMenuActionText: .Text_RecoveredSomeHP: ; recovered @ HP! - text_jump UnknownText_0x1bc0a2 + text_far UnknownText_0x1bc0a2 db "@" .Text_CuredOfPoison: ; 's cured of poison. - text_jump UnknownText_0x1bc0bb + text_far UnknownText_0x1bc0bb db "@" .Text_RidOfParalysis: ; 's rid of paralysis. - text_jump UnknownText_0x1bc0d2 + text_far UnknownText_0x1bc0d2 db "@" .Text_BurnWasHealed: ; 's burn was healed. - text_jump UnknownText_0x1bc0ea + text_far UnknownText_0x1bc0ea db "@" .Text_Defrosted: ; was defrosted. - text_jump UnknownText_0x1bc101 + text_far UnknownText_0x1bc101 db "@" .Text_WokeUp: ; woke up. - text_jump UnknownText_0x1bc115 + text_far UnknownText_0x1bc115 db "@" .Text_HealthReturned: ; 's health returned. - text_jump UnknownText_0x1bc123 + text_far UnknownText_0x1bc123 db "@" .Text_Revitalized: ; is revitalized. - text_jump UnknownText_0x1bc13a + text_far UnknownText_0x1bc13a db "@" .Text_GrewToLevel: ; grew to level @ !@ @ - text_jump UnknownText_0x1bc14f + text_far UnknownText_0x1bc14f db "@" .Text_CameToItsSenses: ; came to its senses. - text_jump UnknownText_0x1bc16e + text_far UnknownText_0x1bc16e db "@" .PrintText: diff --git a/engine/rtc/reset_password.asm b/engine/rtc/reset_password.asm index 7de7a1d73..3b4f242d4 100644 --- a/engine/rtc/reset_password.asm +++ b/engine/rtc/reset_password.asm @@ -33,17 +33,17 @@ _ResetClock: .text_okay ; Password OK. Select CONTINUE & reset settings. - text_jump UnknownText_0x1c55db + text_far UnknownText_0x1c55db db "@" .text_wrong ; Wrong password! - text_jump UnknownText_0x1c560b + text_far UnknownText_0x1c560b db "@" .text_askreset ; Reset the clock? - text_jump UnknownText_0x1c561c + text_far UnknownText_0x1c561c db "@" .NoYes_MenuHeader: @@ -103,7 +103,7 @@ ClockResetPassword: .pleaseenterpasswordtext ; Please enter the password. - text_jump UnknownText_0x1c562e + text_far UnknownText_0x1c562e db "@" .updateIDdisplay diff --git a/engine/rtc/restart_clock.asm b/engine/rtc/restart_clock.asm index 309faaed2..b65550f43 100644 --- a/engine/rtc/restart_clock.asm +++ b/engine/rtc/restart_clock.asm @@ -49,12 +49,12 @@ RestartClock: .Text_ClockTimeMayBeWrong: ; The clock's time may be wrong. Please reset the time. - text_jump UnknownText_0x1c40e6 + text_far UnknownText_0x1c40e6 db "@" .Text_SetWithControlPad: ; Set with the Control Pad. Confirm: A Button Cancel: B Button - text_jump UnknownText_0x1c411c + text_far UnknownText_0x1c411c db "@" .SetClock: @@ -103,12 +103,12 @@ RestartClock: .Text_IsThisOK: ; Is this OK? - text_jump UnknownText_0x1c415b + text_far UnknownText_0x1c415b db "@" .Text_ClockReset: ; The clock has been reset. - text_jump UnknownText_0x1c4168 + text_far UnknownText_0x1c4168 db "@" .joy_loop diff --git a/engine/rtc/timeset.asm b/engine/rtc/timeset.asm index e634b2180..9ceac6c83 100644 --- a/engine/rtc/timeset.asm +++ b/engine/rtc/timeset.asm @@ -291,12 +291,12 @@ PrintTwoDigitNumberRightAlign: Text_WokeUpOak: ; Zzz… Hm? Wha…? You woke me up! Will you check the clock for me? - text_jump UnknownText_0x1bc29c + text_far UnknownText_0x1bc29c db "@" Text_WhatTimeIsIt: ; What time is it? - text_jump UnknownText_0x1bc2eb + text_far UnknownText_0x1bc2eb db "@" String_oclock: @@ -304,7 +304,7 @@ String_oclock: Text_WhatHrs: ; What?@ @ - text_jump UnknownText_0x1bc2fd + text_far UnknownText_0x1bc2fd start_asm hlcoord 1, 16 call DisplayHourOClock @@ -313,12 +313,12 @@ Text_WhatHrs: .QuestionMark: ; ? - text_jump UnknownText_0x1bc305 + text_far UnknownText_0x1bc305 db "@" Text_HowManyMinutes: ; How many minutes? - text_jump UnknownText_0x1bc308 + text_far UnknownText_0x1bc308 db "@" String_min: @@ -326,7 +326,7 @@ String_min: Text_WhoaMins: ; Whoa!@ @ - text_jump UnknownText_0x1bc31b + text_far UnknownText_0x1bc31b start_asm hlcoord 7, 14 call DisplayMinutesWithMinString @@ -335,7 +335,7 @@ Text_WhoaMins: .QuestionMark: ; ? - text_jump UnknownText_0x1bc323 + text_far UnknownText_0x1bc323 db "@" OakText_ResponseToSetTime: @@ -370,17 +370,17 @@ OakText_ResponseToSetTime: .overslept ; ! I overslept! - text_jump UnknownText_0x1bc326 + text_far UnknownText_0x1bc326 db "@" .yikes ; ! Yikes! I over- slept! - text_jump UnknownText_0x1bc336 + text_far UnknownText_0x1bc336 db "@" .sodark ; ! No wonder it's so dark! - text_jump UnknownText_0x1bc34f + text_far UnknownText_0x1bc34f db "@" TimeSetBackgroundGFX: @@ -534,7 +534,7 @@ SetDayOfWeek: .WhatDayIsItText: ; What day is it? - text_jump UnknownText_0x1bc369 + text_far UnknownText_0x1bc369 db "@" .ConfirmWeekdayText: @@ -546,7 +546,7 @@ SetDayOfWeek: .IsIt: ; , is it? - text_jump UnknownText_0x1bc37a + text_far UnknownText_0x1bc37a db "@" InitialSetDSTFlag: @@ -574,7 +574,7 @@ InitialSetDSTFlag: .DSTIsThatOK: ; DST, is that OK? - text_jump Text_DSTIsThatOK + text_far Text_DSTIsThatOK db "@" InitialClearDSTFlag: @@ -602,7 +602,7 @@ InitialClearDSTFlag: .IsThatOK: ; , is that OK? - text_jump UnknownText_0x1c5ff1 + text_far UnknownText_0x1c5ff1 db "@" DebugDisplayTime: diff --git a/home/map.asm b/home/map.asm index b6f30f7c7..02cfc4b11 100644 --- a/home/map.asm +++ b/home/map.asm @@ -1107,21 +1107,21 @@ ObjectEvent:: jumptextfaceplayer ObjectEventText ObjectEventText:: - text_jump _ObjectEventText + text_far _ObjectEventText db "@" BGEvent:: jumptext BGEventText BGEventText:: - text_jump UnknownText_0x1c46fc + text_far UnknownText_0x1c46fc db "@" CoordinatesEvent:: jumptext CoordinatesEventText CoordinatesEventText:: - text_jump UnknownText_0x1c4706 + text_far UnknownText_0x1c4706 db "@" CheckObjectMask:: diff --git a/home/text.asm b/home/text.asm index 8d3d0e7ec..5b53b5dd3 100644 --- a/home/text.asm +++ b/home/text.asm @@ -739,7 +739,7 @@ TextCommand_RAM:: ret TextCommand_FAR:: -; text_jump +; text_far ; write text from a different bank ; little endian ; [$16][addr][bank] diff --git a/macros/legacy.asm b/macros/legacy.asm index 35e6e9ccb..912d9023b 100644 --- a/macros/legacy.asm +++ b/macros/legacy.asm @@ -163,3 +163,6 @@ step_sleep_5 EQUS "step_sleep 5" step_sleep_6 EQUS "step_sleep 6" step_sleep_7 EQUS "step_sleep 7" step_sleep_8 EQUS "step_sleep 8" + +; macros/scripts/text.asm +text_jump EQUS "text_far" diff --git a/macros/scripts/text.asm b/macros/scripts/text.asm index d1fec35db..3c23c4b16 100644 --- a/macros/scripts/text.asm +++ b/macros/scripts/text.asm @@ -131,7 +131,7 @@ current_day: MACRO ENDM enum TX_FAR ; $16 -text_jump: MACRO +text_far: MACRO db TX_FAR dw \1 db BANK(\1) 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 d3c4dfdf1..982b413d3 100644 --- a/mobile/mobile_40.asm +++ b/mobile/mobile_40.asm @@ -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_42.asm b/mobile/mobile_42.asm index 886eee3db..f44ad55dc 100644 --- a/mobile/mobile_42.asm +++ b/mobile/mobile_42.asm @@ -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 842ad74b0..461009fad 100644 --- a/mobile/mobile_45.asm +++ b/mobile/mobile_45.asm @@ -7424,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_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: