diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-11-17 13:33:03 -0500 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-11-18 12:41:11 -0500 |
| commit | 3202c4f3dfeac64d815e3b5ee3ee8e891c2b1ba2 (patch) | |
| tree | f71e627c4af610124b7f77cc4a9c2dad2adf02f6 /engine | |
| parent | c05a2d255befc2d3b7fdf3c5375fa9a015c13632 (diff) | |
Resolve issue #575: Rename text commands
Diffstat (limited to 'engine')
77 files changed, 821 insertions, 811 deletions
diff --git a/engine/battle/ai/items.asm b/engine/battle/ai/items.asm index 2bc92c719..b7a6de644 100644 --- a/engine/battle/ai/items.asm +++ b/engine/battle/ai/items.asm @@ -709,7 +709,7 @@ AI_Switch: TextJump_EnemyWithdrew: text_far Text_EnemyWithdrew - db "@" + text_end Function384d5: ; This appears to be unused call AIUsedItemSound @@ -829,4 +829,4 @@ PrintText_UsedItemOn: TextJump_EnemyUsedOn: text_far Text_EnemyUsedOn - db "@" + text_end diff --git a/engine/battle/core.asm b/engine/battle/core.asm index cb2c7e330..8d9e9b512 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -6864,8 +6864,9 @@ Unreferenced_LoadHPExpBarGFX: EmptyBattleTextBox: ld hl, .empty jp BattleTextBox -.empty - db "@" + +.empty: + text_end _BattleRandom:: ; If the normal RNG is used in a link battle it'll desync. @@ -7399,7 +7400,7 @@ BoostExp: Text_MonGainedExpPoint: text_far Text_Gained - start_asm + text_asm ld hl, TextJump_StringBuffer2ExpPoints ld a, [wStringBuffer2 + 2] ; IsTradedMon and a @@ -7410,11 +7411,11 @@ Text_MonGainedExpPoint: TextJump_ABoostedStringBuffer2ExpPoints: text_far Text_ABoostedStringBuffer2ExpPoints - db "@" + text_end TextJump_StringBuffer2ExpPoints: text_far Text_StringBuffer2ExpPoints - db "@" + text_end AnimateExpBar: push bc @@ -7665,29 +7666,29 @@ SendOutMonText: JumpText_GoMon: text_far Text_GoMon - start_asm + text_asm jr Function_TextJump_BattleMonNick01 JumpText_DoItMon: text_far Text_DoItMon - start_asm + text_asm jr Function_TextJump_BattleMonNick01 JumpText_GoForItMon: text_far Text_GoForItMon - start_asm + text_asm jr Function_TextJump_BattleMonNick01 JumpText_YourFoesWeakGetmMon: text_far Text_YourFoesWeakGetmMon - start_asm + text_asm Function_TextJump_BattleMonNick01: ld hl, TextJump_BattleMonNick01 ret TextJump_BattleMonNick01: text_far Text_BattleMonNick01 - db "@" + text_end WithdrawMonText: ld hl, .WithdrawMonText @@ -7695,7 +7696,7 @@ WithdrawMonText: .WithdrawMonText: text_far Text_BattleMonNickComma - start_asm + text_asm ; Print text to withdraw mon ; depending on HP the message is different push de @@ -7746,15 +7747,15 @@ WithdrawMonText: TextJump_ThatsEnoughComeBack: text_far Text_ThatsEnoughComeBack - db "@" + text_end TextJump_OKComeBack: text_far Text_OKComeBack - db "@" + text_end TextJump_GoodComeBack: text_far Text_GoodComeBack - db "@" + text_end Unreferenced_TextJump_ComeBack: ; this function doesn't seem to be used @@ -7763,7 +7764,7 @@ Unreferenced_TextJump_ComeBack: TextJump_ComeBack: text_far Text_ComeBack - db "@" + text_end Unreferenced_HandleSafariAngerEatingStatus: ld hl, wSafariMonEating diff --git a/engine/battle/effect_commands.asm b/engine/battle/effect_commands.asm index 2dafc04ba..9adf90c82 100644 --- a/engine/battle/effect_commands.asm +++ b/engine/battle/effect_commands.asm @@ -4543,7 +4543,7 @@ BattleCommand_StatUpMessage: .stat text_far UnknownText_0x1c0cc6 - start_asm + text_asm ld hl, .up ld a, [wLoweredStat] and $f0 @@ -4553,11 +4553,11 @@ BattleCommand_StatUpMessage: .wayup text_far UnknownText_0x1c0cd0 - db "@" + text_end .up text_far UnknownText_0x1c0ce0 - db "@" + text_end BattleCommand_StatDownMessage: ld a, [wFailedMessage] @@ -4573,7 +4573,7 @@ BattleCommand_StatDownMessage: .stat text_far UnknownText_0x1c0ceb - start_asm + text_asm ld hl, .fell ld a, [wLoweredStat] and $f0 @@ -4583,10 +4583,11 @@ BattleCommand_StatDownMessage: .sharplyfell text_far UnknownText_0x1c0cf5 - db "@" + text_end + .fell text_far UnknownText_0x1c0d06 - db "@" + text_end TryLowerStat: ; Lower stat c from stat struct hl (buffer de). @@ -5637,7 +5638,7 @@ BattleCommand_Charge: .UsedText: text_far UnknownText_0x1c0d0e ; "<USER>" - start_asm + text_asm ld a, BATTLE_VARS_MOVE_ANIM call GetBattleVar cp RAZOR_WIND @@ -5669,32 +5670,32 @@ BattleCommand_Charge: .RazorWind: ; 'made a whirlwind!' text_far UnknownText_0x1c0d12 - db "@" + text_end .Solarbeam: ; 'took in sunlight!' text_far UnknownText_0x1c0d26 - db "@" + text_end .SkullBash: ; 'lowered its head!' text_far UnknownText_0x1c0d3a - db "@" + text_end .SkyAttack: ; 'is glowing!' text_far UnknownText_0x1c0d4e - db "@" + text_end .Fly: ; 'flew up high!' text_far UnknownText_0x1c0d5c - db "@" + text_end .Dig: ; 'dug a hole!' text_far UnknownText_0x1c0d6c - db "@" + text_end BattleCommand3c: ; unused @@ -6857,8 +6858,8 @@ BattleCommand_ClearText: ld hl, .text jp BattleTextBox -.text - db "@" +.text: + text_end SkipToBattleCommand: ; Skip over commands until reaching command b. diff --git a/engine/battle/menu.asm b/engine/battle/menu.asm index 147430030..12d65476b 100644 --- a/engine/battle/menu.asm +++ b/engine/battle/menu.asm @@ -88,7 +88,7 @@ MenuData_0x24f91: Strings24f9a: db "FIGHT@" - db "<PKMN>", "@" + db "<PKMN>@" db "PARKBALL× @" db "RUN@" diff --git a/engine/battle/used_move_text.asm b/engine/battle/used_move_text.asm index 11e004a21..88522ee32 100644 --- a/engine/battle/used_move_text.asm +++ b/engine/battle/used_move_text.asm @@ -7,7 +7,7 @@ DisplayUsedMoveText: UsedMoveText: ; this is a stream of text and asm from 105db9 to 105ef6 text_far _ActorNameText - start_asm + text_asm ldh a, [hBattleTurn] and a jr nz, .start @@ -59,12 +59,12 @@ UsedMoveText: UsedMove1Text: text_far _UsedMove1Text - start_asm + text_asm jr UsedMoveText_CheckObedience UsedMove2Text: text_far _UsedMove2Text - start_asm + text_asm UsedMoveText_CheckObedience: ; check obedience ld a, [wAlreadyDisobeyed] @@ -76,14 +76,14 @@ UsedMoveText_CheckObedience: .UsedInsteadText: text_far _UsedInsteadText - start_asm + text_asm .GetMoveNameText: ld hl, MoveNameText ret MoveNameText: text_far _MoveNameText - start_asm + text_asm ; get start address ld hl, .endusedmovetexts @@ -116,19 +116,23 @@ MoveNameText: EndUsedMove1Text: text_far _EndUsedMove1Text - db "@" + text_end + EndUsedMove2Text: text_far _EndUsedMove2Text - db "@" + text_end + EndUsedMove3Text: text_far _EndUsedMove3Text - db "@" + text_end + EndUsedMove4Text: text_far _EndUsedMove4Text - db "@" + text_end + EndUsedMove5Text: text_far _EndUsedMove5Text - db "@" + text_end GetMoveGrammar: ; store move grammar type in wMoveGrammar diff --git a/engine/events/battle_tower/rules.asm b/engine/events/battle_tower/rules.asm index da51b3f7f..3584117d3 100644 --- a/engine/events/battle_tower/rules.asm +++ b/engine/events/battle_tower/rules.asm @@ -23,7 +23,7 @@ CheckForMobileBattleRules: .ExcuseMeText: ; Excuse me! text_far UnknownText_0x1c5937 - db "@" + text_end _CheckForBattleTowerRules: ld hl, wStringBuffer2 @@ -58,7 +58,7 @@ _CheckForBattleTowerRules: JumpText_ExcuseMeYoureNotReady: ; Excuse me. You're not ready. text_far Text_ExcuseMeYoureNotReady - db "@" + text_end BattleTower_PleaseReturnWhenReady: ld hl, .PleaseReturnWhenReady @@ -68,37 +68,37 @@ BattleTower_PleaseReturnWhenReady: .PleaseReturnWhenReady: ; Please return when you're ready. text_far UnknownText_0x1c5962 - db "@" + text_end JumpText_NeedAtLeastThreeMon: ; You need at least three #MON. text_far UnknownText_0x1c5983 - db "@" + text_end JumpText_EggDoesNotQualify: ; Sorry, an EGG doesn't qualify. text_far UnknownText_0x1c59a3 - db "@" + text_end JumpText_OnlyThreeMonMayBeEntered: ; Only three #MON may be entered. text_far Text_OnlyThreeMonMayBeEntered - db "@" + text_end JumpText_TheMonMustAllBeDifferentKinds: ; The @ #MON must all be different kinds. text_far Text_TheMonMustAllBeDifferentKinds - db "@" + text_end JumpText_TheMonMustNotHoldTheSameItems: ; The @ #MON must not hold the same items. text_far Text_TheMonMustNotHoldTheSameItems - db "@" + text_end JumpText_YouCantTakeAnEgg: ; You can't take an EGG! text_far Text_YouCantTakeAnEgg - db "@" + text_end BattleTower_ExecuteJumptable: ld bc, 0 diff --git a/engine/events/battle_tower/trainer_text.asm b/engine/events/battle_tower/trainer_text.asm index 6aac7f007..6d06e2eec 100644 --- a/engine/events/battle_tower/trainer_text.asm +++ b/engine/events/battle_tower/trainer_text.asm @@ -232,480 +232,480 @@ BTFemaleTrainerTexts: BTGreetingM1: text_far BattleTowerText_0x1ec000 - db "@" + text_end BTLossM1: text_far BattleTowerText_0x1ec03b - db "@" + text_end BTWinM1: text_far UnknownText_0x1ec060 - db "@" + text_end BTGreetingM2: text_far BattleTowerText_0x1ec080 - db "@" + text_end BTLossM2: text_far UnknownText_0x1ec0a3 - db "@" + text_end BTWinM2: text_far UnknownText_0x1ec0c4 - db "@" + text_end BTGreetingM3: text_far UnknownText_0x1ec0e1 - db "@" + text_end BTLossM3: text_far UnknownText_0x1ec108 - db "@" + text_end BTWinM3: text_far UnknownText_0x1ec12a - db "@" + text_end BTGreetingM4: text_far UnknownText_0x1ec14d - db "@" + text_end BTLossM4: text_far UnknownText_0x1ec16f - db "@" + text_end BTWinM4: text_far UnknownText_0x1ec190 - db "@" + text_end BTGreetingM5: text_far UnknownText_0x1ec1ae - db "@" + text_end BTLossM5: text_far UnknownText_0x1ec1d0 - db "@" + text_end BTWinM5: text_far UnknownText_0x1ec1f4 - db "@" + text_end BTGreetingM6: text_far UnknownText_0x1ec216 - db "@" + text_end BTLossM6: text_far UnknownText_0x1ec238 - db "@" + text_end BTWinM6: text_far UnknownText_0x1ec259 - db "@" + text_end BTGreetingM7: text_far UnknownText_0x1ec27b - db "@" + text_end BTLossM7: text_far UnknownText_0x1ec2a0 - db "@" + text_end BTWinM7: text_far UnknownText_0x1ec2c0 - db "@" + text_end BTGreetingM8: text_far UnknownText_0x1ec2d9 - db "@" + text_end BTLossM8: text_far UnknownText_0x1ec2fe - db "@" + text_end BTWinM8: text_far UnknownText_0x1ec320 - db "@" + text_end BTGreetingM9: text_far UnknownText_0x1ec33f - db "@" + text_end BTLossM9: text_far UnknownText_0x1ec36c - db "@" + text_end BTWinM9: text_far UnknownText_0x1ec389 - db "@" + text_end BTGreetingM10: text_far UnknownText_0x1ec3ad - db "@" + text_end BTLossM10: text_far UnknownText_0x1ec3c5 - db "@" + text_end BTWinM10: text_far UnknownText_0x1ec3e5 - db "@" + text_end BTGreetingM11: text_far UnknownText_0x1ec402 - db "@" + text_end BTLossM11: text_far UnknownText_0x1ec411 - db "@" + text_end BTWinM11: text_far UnknownText_0x1ec41f - db "@" + text_end BTGreetingM12: text_far UnknownText_0x1ec42e - db "@" + text_end BTLossM12: text_far UnknownText_0x1ec461 - db "@" + text_end BTWinM12: text_far UnknownText_0x1ec4a0 - db "@" + text_end BTGreetingM13: text_far UnknownText_0x1ec4d6 - db "@" + text_end BTLossM13: text_far UnknownText_0x1ec4f5 - db "@" + text_end BTWinM13: text_far UnknownText_0x1ec512 - db "@" + text_end BTGreetingM14: text_far UnknownText_0x1ec532 - db "@" + text_end BTLossM14: text_far UnknownText_0x1ec54b - db "@" + text_end BTWinM14: text_far UnknownText_0x1ec565 - db "@" + text_end BTGreetingM15: text_far UnknownText_0x1ec580 - db "@" + text_end BTLossM15: text_far UnknownText_0x1ec59d - db "@" + text_end BTWinM15: text_far UnknownText_0x1ec5b5 - db "@" + text_end BTGreetingM16: text_far UnknownText_0x1ec5d3 - db "@" + text_end BTLossM16: text_far UnknownText_0x1ec5ee - db "@" + text_end BTWinM16: text_far UnknownText_0x1ec60d - db "@" + text_end BTGreetingM17: text_far UnknownText_0x1ec631 - db "@" + text_end BTLossM17: text_far UnknownText_0x1ec651 - db "@" + text_end BTWinM17: text_far UnknownText_0x1ec68f - db "@" + text_end BTGreetingM18: text_far UnknownText_0x1ec6b1 - db "@" + text_end BTLossM18: text_far UnknownText_0x1ec6d0 - db "@" + text_end BTWinM18: text_far UnknownText_0x1ec708 - db "@" + text_end BTGreetingM19: text_far UnknownText_0x1ec720 - db "@" + text_end BTLossM19: text_far UnknownText_0x1ec73e - db "@" + text_end BTWinM19: text_far UnknownText_0x1ec75b - db "@" + text_end BTGreetingM20: text_far UnknownText_0x1ec77f - db "@" + text_end BTLossM20: text_far UnknownText_0x1ec798 - db "@" + text_end BTWinM20: text_far UnknownText_0x1ec7bb - db "@" + text_end BTGreetingM21: text_far UnknownText_0x1ec7d8 - db "@" + text_end BTLossM21: text_far UnknownText_0x1ec818 - db "@" + text_end BTWinM21: text_far UnknownText_0x1ec837 - db "@" + text_end BTGreetingM22: text_far UnknownText_0x1ec858 - db "@" + text_end BTLossM22: text_far UnknownText_0x1ec876 - db "@" + text_end BTWinM22: text_far UnknownText_0x1ec898 - db "@" + text_end BTGreetingM23: text_far UnknownText_0x1ec8b1 - db "@" + text_end BTLossM23: text_far UnknownText_0x1ec8d5 - db "@" + text_end BTWinM23: text_far UnknownText_0x1ec8f0 - db "@" + text_end BTGreetingM24: text_far UnknownText_0x1ec911 - db "@" + text_end BTLossM24: text_far UnknownText_0x1ec928 - db "@" + text_end BTWinM24: text_far UnknownText_0x1ec949 - db "@" + text_end BTGreetingM25: text_far UnknownText_0x1ec969 - db "@" + text_end BTLossM25: text_far UnknownText_0x1ec986 - db "@" + text_end BTWinM25: text_far UnknownText_0x1ec99b - db "@" + text_end BTGreetingF1: text_far UnknownText_0x1ec9bd - db "@" + text_end BTLossF1: text_far UnknownText_0x1ec9d9 - db "@" + text_end BTWinF1: text_far UnknownText_0x1ec9f7 - db "@" + text_end BTGreetingF2: text_far UnknownText_0x1eca0a - db "@" + text_end BTLossF2: text_far UnknownText_0x1eca2a - db "@" + text_end BTWinF2: text_far UnknownText_0x1eca47 - db "@" + text_end BTGreetingF3: text_far UnknownText_0x1eca64 - db "@" + text_end BTLossF3: text_far UnknownText_0x1eca82 - db "@" + text_end BTWinF3: text_far UnknownText_0x1eca9d - db "@" + text_end BTGreetingF4: text_far UnknownText_0x1ecabf - db "@" + text_end BTLossF4: text_far UnknownText_0x1ecade - db "@" + text_end BTWinF4: text_far UnknownText_0x1ecafa - db "@" + text_end BTGreetingF5: text_far UnknownText_0x1ecb19 - db "@" + text_end BTLossF5: text_far UnknownText_0x1ecb37 - db "@" + text_end BTWinF5: text_far UnknownText_0x1ecb55 - db "@" + text_end BTGreetingF6: text_far UnknownText_0x1ecb70 - db "@" + text_end BTLossF6: text_far UnknownText_0x1ecb92 - db "@" + text_end BTWinF6: text_far UnknownText_0x1ecbb6 - db "@" + text_end BTGreetingF7: text_far UnknownText_0x1ecbd9 - db "@" + text_end BTLossF7: text_far UnknownText_0x1ecbf3 - db "@" + text_end BTWinF7: text_far UnknownText_0x1ecc15 - db "@" + text_end BTGreetingF8: text_far UnknownText_0x1ecc39 - db "@" + text_end BTLossF8: text_far UnknownText_0x1ecc55 - db "@" + text_end BTWinF8: text_far UnknownText_0x1ecc75 - db "@" + text_end BTGreetingF9: text_far UnknownText_0x1ecc92 - db "@" + text_end BTLossF9: text_far UnknownText_0x1ecca7 - db "@" + text_end BTWinF9: text_far UnknownText_0x1eccc1 - db "@" + text_end BTGreetingF10: text_far UnknownText_0x1eccd7 - db "@" + text_end BTLossF10: text_far UnknownText_0x1eccef - db "@" + text_end BTWinF10: text_far UnknownText_0x1ecd0e - db "@" + text_end BTGreetingF11: text_far UnknownText_0x1ecd2b - db "@" + text_end BTLossF11: text_far UnknownText_0x1ecd4d - db "@" + text_end BTWinF11: text_far UnknownText_0x1ecd6b - db "@" + text_end BTGreetingF12: text_far UnknownText_0x1ecd8d - db "@" + text_end BTLossF12: text_far UnknownText_0x1ecdaf - db "@" + text_end BTWinF12: text_far UnknownText_0x1ecdcf - db "@" + text_end BTGreetingF13: text_far UnknownText_0x1ecded - db "@" + text_end BTLossF13: text_far UnknownText_0x1ece0d - db "@" + text_end BTWinF13: text_far UnknownText_0x1ece2a - db "@" + text_end BTGreetingF14: text_far UnknownText_0x1ece4b - db "@" + text_end BTLossF14: text_far UnknownText_0x1ece70 - db "@" + text_end BTWinF14: text_far UnknownText_0x1ece8a - db "@" + text_end BTGreetingF15: text_far UnknownText_0x1ecea8 - db "@" + text_end BTLossF15: text_far UnknownText_0x1ecec9 - db "@" + text_end BTWinF15: text_far UnknownText_0x1ecee8 - db "@" + text_end diff --git a/engine/events/buena.asm b/engine/events/buena.asm index 5b580c7f2..97a28549b 100644 --- a/engine/events/buena.asm +++ b/engine/events/buena.asm @@ -149,31 +149,32 @@ BuenaPrize: .Text_AskWhichPrize: ; Which prize would you like? text_far UnknownText_0x1c589f - db "@" + text_end .Text_IsThatRight: ; ? Is that right? text_far UnknownText_0x1c58bc - db "@" + text_end -.Text_HereYouGo: ; Here you go! +.Text_HereYouGo: + ; Here you go! text_far UnknownText_0x1c58d1 - db "@" + text_end .Text_NotEnoughPoints: ; You don't have enough points. text_far UnknownText_0x1c58e0 - db "@" + text_end .Text_NoRoom: ; You have no room for it. text_far UnknownText_0x1c58ff - db "@" + text_end .Text_PleaseComeBackAgain: ; Oh. Please come back again! text_far UnknownText_0x1c591a - db "@" + text_end Buena_DisplayBlueCardBalance: ld hl, BlueCardBalanceMenuHeader diff --git a/engine/events/bug_contest/caught_mon.asm b/engine/events/bug_contest/caught_mon.asm index 4d62f189e..71e6f1f62 100644 --- a/engine/events/bug_contest/caught_mon.asm +++ b/engine/events/bug_contest/caught_mon.asm @@ -35,4 +35,4 @@ BugContest_SetCaughtContestMon: .caughttext ; Caught @ ! text_far UnknownText_0x1c10c0 - db "@" + text_end diff --git a/engine/events/bug_contest/contest.asm b/engine/events/bug_contest/contest.asm index 8937d024f..7a5d0885a 100644 --- a/engine/events/bug_contest/contest.asm +++ b/engine/events/bug_contest/contest.asm @@ -35,9 +35,9 @@ BugCatchingContestReturnToGateScript: BugCatchingContestText_BeeepTimesUp: ; ANNOUNCER: BEEEP! Time's up! text_far UnknownText_0x1bd2ca - db "@" + text_end BugCatchingContestText_ContestIsOver: ; ANNOUNCER: The Contest is over! text_far UnknownText_0x1bd2e7 - db "@" + text_end diff --git a/engine/events/bug_contest/display_stats.asm b/engine/events/bug_contest/display_stats.asm index 3232b3f37..0e9ba5fd0 100644 --- a/engine/events/bug_contest/display_stats.asm +++ b/engine/events/bug_contest/display_stats.asm @@ -89,7 +89,7 @@ DisplayCaughtContestMonStats: SwitchMonText: ; Switch #MON? text_far UnknownText_0x1c10cf - db "@" + text_end DisplayAlreadyCaughtText: call GetPokemonName @@ -99,7 +99,7 @@ DisplayAlreadyCaughtText: .AlreadyCaughtText: ; You already caught a @ . text_far UnknownText_0x1c10dd - db "@" + text_end DummyPredef2F: DummyPredef38: diff --git a/engine/events/bug_contest/judging.asm b/engine/events/bug_contest/judging.asm index 276104788..a166269d5 100644 --- a/engine/events/bug_contest/judging.asm +++ b/engine/events/bug_contest/judging.asm @@ -27,7 +27,7 @@ _BugContestJudging: BugContest_FirstPlaceText: text_far ContestJudging_FirstPlaceText - start_asm + text_asm ld de, SFX_1ST_PLACE call PlaySFX call WaitSFX @@ -37,12 +37,12 @@ BugContest_FirstPlaceText: BugContest_FirstPlaceScoreText: ; The winning score was @ points! text_far ContestJudging_FirstPlaceScoreText - db "@" + text_end BugContest_SecondPlaceText: ; Placing second was @ , who caught a @ !@ @ text_far ContestJudging_SecondPlaceText - start_asm + text_asm ld de, SFX_2ND_PLACE call PlaySFX call WaitSFX @@ -52,12 +52,12 @@ BugContest_SecondPlaceText: BugContest_SecondPlaceScoreText: ; The score was @ points! text_far ContestJudging_SecondPlaceScoreText - db "@" + text_end BugContest_ThirdPlaceText: ; Placing third was @ , who caught a @ !@ @ text_far ContestJudging_ThirdPlaceText - start_asm + text_asm ld de, SFX_3RD_PLACE call PlaySFX call WaitSFX @@ -67,7 +67,7 @@ BugContest_ThirdPlaceText: BugContest_ThirdPlaceScoreText: ; The score was @ points! text_far ContestJudging_ThirdPlaceScoreText - db "@" + text_end LoadContestantName: ; If a = 1, get your name. diff --git a/engine/events/daycare.asm b/engine/events/daycare.asm index ee176a702..4c2b14738 100644 --- a/engine/events/daycare.asm +++ b/engine/events/daycare.asm @@ -169,7 +169,7 @@ DayCareAskDepositPokemon: .DummyText: ; text_far UnknownText_0x1bdaa7 - db "@" + text_end DayCare_DepositPokemonText: ld a, DAYCARETEXT_DEPOSIT @@ -298,102 +298,102 @@ PrintDayCareText: .DayCareManIntro: ; I'm the DAY-CARE MAN. Want me to raise a #MON? text_far UnknownText_0x1bdaa9 - db "@" + text_end .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_far UnknownText_0x1bdad8 - db "@" + text_end .DayCareLadyIntro: ; I'm the DAY-CARE LADY. Should I raise a #MON for you? text_far UnknownText_0x1bdb85 - db "@" + text_end .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_far UnknownText_0x1bdbbb - db "@" + text_end .WhichOne: ; What should I raise for you? text_far UnknownText_0x1bdc79 - db "@" + text_end .JustOneMon: ; Oh? But you have just one #MON. text_far UnknownText_0x1bdc97 - db "@" + text_end .CantAcceptEgg: ; Sorry, but I can't accept an EGG. text_far UnknownText_0x1bdcb8 - db "@" + text_end .RemoveMail: ; Remove MAIL before you come see me. text_far UnknownText_0x1bdcda - db "@" + text_end .LastHealthyMon: ; If you give me that, what will you battle with? text_far UnknownText_0x1bdcff - db "@" + text_end .OkayIllRaiseYourMon: ; OK. I'll raise your @ . text_far UnknownText_0x1bdd30 - db "@" + text_end .ComeBackForItLater: ; Come back for it later. text_far UnknownText_0x1bdd4b - db "@" + text_end .AreWeGeniusesOrWhat: ; Are we geniuses or what? Want to see your @ ? text_far UnknownText_0x1bdd64 - db "@" + text_end .AskRetrieveMon: ; Your @ has grown a lot. By level, it's grown by @ . If you want your #MON back, it will cost ¥@ . text_far UnknownText_0x1bdd96 - db "@" + text_end .PerfectHeresYourMon: ; Perfect! Here's your #MON. text_far UnknownText_0x1bde04 - db "@" + text_end .GotBackMon: ; got back @ . text_far UnknownText_0x1bde1f - db "@" + text_end .ImmediatelyWithdrawMon: ; Huh? Back already? Your @ needs a little more time with us. If you want your #MON back, it will cost ¥100. text_far UnknownText_0x1bde32 - db "@" + text_end .PartyFull: ; You have no room for it. text_far UnknownText_0x1bdea2 - db "@" + text_end .NotEnoughMoney: ; You don't have enough money. text_far UnknownText_0x1bdebc - db "@" + text_end .OhFineThen: ; Oh, fine then. text_far UnknownText_0x1bded9 - db "@" + text_end .ComeAgain: ; Come again. text_far UnknownText_0x1bdee9 - db "@" + text_end DayCareManOutside: ld hl, wDayCareMan @@ -406,7 +406,7 @@ DayCareManOutside: .NotYet: ; Not yet… text_far UnknownText_0x1bdef6 - db "@" + text_end .AskGiveEgg: ld hl, .IntroText @@ -448,27 +448,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_far UnknownText_0x1bdf00 - db "@" + text_end .GotEggText: ; received the EGG! text_far UnknownText_0x1bdfa5 - db "@" + text_end .TakeGoodCareOfItText: ; Take good care of it. text_far UnknownText_0x1bdfba - db "@" + text_end .IllKeepItThanksText: ; Well then, I'll keep it. Thanks! text_far UnknownText_0x1bdfd1 - db "@" + text_end .PartyFullText: ; You have no room in your party. Come back later. text_far UnknownText_0x1bdff2 - db "@" + text_end DayCare_GiveEgg: ld a, [wEggMonLevel] diff --git a/engine/events/elevator.asm b/engine/events/elevator.asm index 8a42874cd..1f8c902ca 100644 --- a/engine/events/elevator.asm +++ b/engine/events/elevator.asm @@ -140,7 +140,7 @@ Elevator_AskWhichFloor: Elevator_WhichFloorText: ; Which floor? text_far UnknownText_0x1bd2bc - db "@" + text_end Elevator_GetCurrentFloorText: ld hl, wOptions diff --git a/engine/events/fruit_trees.asm b/engine/events/fruit_trees.asm index 54ac788fd..92e66c07e 100644 --- a/engine/events/fruit_trees.asm +++ b/engine/events/fruit_trees.asm @@ -98,20 +98,20 @@ INCLUDE "data/items/fruit_trees.asm" FruitBearingTreeText: text_far _FruitBearingTreeText - db "@" + text_end HeyItsFruitText: text_far _HeyItsFruitText - db "@" + text_end ObtainedFruitText: text_far _ObtainedFruitText - db "@" + text_end FruitPackIsFullText: text_far _FruitPackIsFullText - db "@" + text_end NothingHereText: text_far _NothingHereText - db "@" + text_end diff --git a/engine/events/itemfinder.asm b/engine/events/itemfinder.asm index 4a465345a..4d9c9c814 100644 --- a/engine/events/itemfinder.asm +++ b/engine/events/itemfinder.asm @@ -44,9 +44,9 @@ ItemFinder: .Text_FoundSomething: ; Yes! ITEMFINDER indicates there's an item nearby. text_far UnknownText_0x1c0a77 - db "@" + text_end .Text_FoundNothing: ; Nope! ITEMFINDER isn't responding. text_far UnknownText_0x1c0aa9 - db "@" + text_end diff --git a/engine/events/kurt.asm b/engine/events/kurt.asm index 2ca502462..c1c490a0a 100644 --- a/engine/events/kurt.asm +++ b/engine/events/kurt.asm @@ -6,7 +6,7 @@ Kurt_PrintTextWhichApricorn: .Text: ; Which APRICORN should I use? text_far UnknownText_0x1bc06b - db "@" + text_end Kurt_PrintTextHowMany: ld hl, .Text @@ -16,7 +16,7 @@ Kurt_PrintTextHowMany: .Text: ; How many should I make? text_far UnknownText_0x1bc089 - db "@" + text_end SelectApricornForKurt: call LoadStandardMenuHeader diff --git a/engine/events/lucky_number.asm b/engine/events/lucky_number.asm index 9d7aac4db..928556d6c 100644 --- a/engine/events/lucky_number.asm +++ b/engine/events/lucky_number.asm @@ -209,12 +209,12 @@ CheckForLuckyNumberWinners: .FoundPartymonText: ; Congratulations! We have a match with the ID number of @ in your party. text_far UnknownText_0x1c1261 - db "@" + text_end .FoundBoxmonText: ; Congratulations! We have a match with the ID number of @ in your PC BOX. text_far UnknownText_0x1c12ae - db "@" + text_end PrintTodaysLuckyNumber: ld hl, wStringBuffer3 diff --git a/engine/events/magikarp.asm b/engine/events/magikarp.asm index b5932eebe..0c41713dd 100644 --- a/engine/events/magikarp.asm +++ b/engine/events/magikarp.asm @@ -74,7 +74,7 @@ CheckMagikarpLength: .MeasureItText: ; Let me measure that MAGIKARP. …Hm, it measures @ . text_far UnknownText_0x1c1203 - db "@" + text_end Magikarp_LoadFeetInchesChars: ld hl, vTiles2 tile "′" ; $6e @@ -314,4 +314,4 @@ MagikarpHouseSign: .CurrentRecordtext: ; "CURRENT RECORD" text_far UnknownText_0x1c123a - db "@" + text_end diff --git a/engine/events/misc_scripts.asm b/engine/events/misc_scripts.asm index 95a80cc69..e2ea5439a 100644 --- a/engine/events/misc_scripts.asm +++ b/engine/events/misc_scripts.asm @@ -30,12 +30,12 @@ FindItemInBallScript:: .text_found ; found @ ! text_far UnknownText_0x1c0a1c - db "@" + text_end .text_bag_full ; But can't carry any more items. text_far UnknownText_0x1c0a2c - db "@" + text_end .TryReceiveItem: xor a diff --git a/engine/events/misc_scripts_2.asm b/engine/events/misc_scripts_2.asm index 02dbcb863..61d9d11f1 100644 --- a/engine/events/misc_scripts_2.asm +++ b/engine/events/misc_scripts_2.asm @@ -8,7 +8,7 @@ RepelWoreOffScript:: .text ; REPEL's effect wore off. text_far UnknownText_0x1bd308 - db "@" + text_end HiddenItemScript:: opentext @@ -34,12 +34,12 @@ HiddenItemScript:: .found_text ; found @ ! text_far UnknownText_0x1bd321 - db "@" + text_end .no_room_text ; But has no space left… text_far UnknownText_0x1bd331 - db "@" + text_end SetMemEvent: ld hl, wEngineBuffer1 diff --git a/engine/events/mom.asm b/engine/events/mom.asm index db6178c7b..94d869dca 100644 --- a/engine/events/mom.asm +++ b/engine/events/mom.asm @@ -392,33 +392,33 @@ DSTChecks: .Text_AdjustClock: ; Do you want to adjust your clock for Daylight Saving Time? text_far UnknownText_0x1c6095 - db "@" + text_end .Text_LostInstructionBooklet: ; I lost the instruction booklet for the POKéGEAR. ; Come back again in a while. text_far UnknownText_0x1c60d1 - db "@" + text_end .Text_SwitchToDST: ; Do you want to switch to Daylight Saving Time? text_far UnknownText_0x1c6000 - db "@" + text_end .Text_SetClockForward: ; I set the clock forward by one hour. text_far UnknownText_0x1c6030 - db "@" + text_end .Text_IsDSTOver: ; Is Daylight Saving Time over? text_far UnknownText_0x1c6056 - db "@" + text_end .Text_SetClockBack: ; I put the clock back one hour. text_far UnknownText_0x1c6075 - db "@" + text_end Mom_SetUpWithdrawMenu: ld de, Mon_WithdrawString @@ -593,82 +593,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_far UnknownText_0x1bd77f - db "@" + text_end UnknownText_0x1664e: ; OK, I'll take care of your money. text_far UnknownText_0x1bd868 - db "@" + text_end UnknownText_0x16653: ; Be careful. #MON are your friends. You need to work as a team. Now, go on! text_far UnknownText_0x1bd88e - db "@" + text_end 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_far UnknownText_0x1bd8da - db "@" + text_end UnknownText_0x1665d: ; What do you want to do? text_far UnknownText_0x1bd942 - db "@" + text_end UnknownText_0x16662: ; How much do you want to save? text_far UnknownText_0x1bd95b - db "@" + text_end UnknownText_0x16667: ; How much do you want to take? text_far UnknownText_0x1bd97a - db "@" + text_end UnknownText_0x1666c: ; Do you want to save some money? text_far UnknownText_0x1bd999 - db "@" + text_end UnknownText_0x16671: ; You haven't saved that much. text_far UnknownText_0x1bd9ba - db "@" + text_end UnknownText_0x16676: ; You can't take that much. text_far UnknownText_0x1bd9d7 - db "@" + text_end UnknownText_0x1667b: ; You don't have that much. text_far UnknownText_0x1bd9f1 - db "@" + text_end UnknownText_0x16680: ; You can't save that much. text_far UnknownText_0x1bda0b - db "@" + text_end UnknownText_0x16685: ; OK, I'll save your money. Trust me! , stick with it! text_far UnknownText_0x1bda25 - db "@" + text_end UnknownText_0x1668a: ; Your money's safe here! Get going! text_far UnknownText_0x1bda5b - db "@" + text_end UnknownText_0x1668f: ; , don't give up! text_far UnknownText_0x1bda7e - db "@" + text_end UnknownText_0x16694: ; Just do what you can. text_far UnknownText_0x1bda90 - db "@" + text_end Mom_SavedString: db "SAVED@" diff --git a/engine/events/mom_phone.asm b/engine/events/mom_phone.asm index 1b919c253..6e14e33d9 100644 --- a/engine/events/mom_phone.asm +++ b/engine/events/mom_phone.asm @@ -209,32 +209,32 @@ INCLUDE "data/items/mom_phone.asm" _MomText_HiHowAreYou: ; Hi, ! How are you? text_far UnknownText_0x1bc615 - db "@" + text_end _MomText_FoundAnItem: ; I found a useful item shopping, so text_far UnknownText_0x1bc62a - db "@" + text_end _MomText_BoughtWithYourMoney: ; I bought it with your money. Sorry! text_far UnknownText_0x1bc64e - db "@" + text_end _MomText_ItsInPC: ; It's in your PC. You'll like it! text_far UnknownText_0x1bc673 - db "@" + text_end _MomText_FoundADoll: ; While shopping today, I saw this adorable doll, so text_far UnknownText_0x1bc693 - db "@" + text_end _MomText_ItsInRoom: ; It's in your room. You'll love it! text_far UnknownText_0x1bc6c7 - db "@" + text_end db 0 ; unused diff --git a/engine/events/move_deleter.asm b/engine/events/move_deleter.asm index f77d94522..7860ab3ae 100644 --- a/engine/events/move_deleter.asm +++ b/engine/events/move_deleter.asm @@ -62,42 +62,42 @@ MoveDeletion: .OnlyOneMoveText: ; That #MON knows only one move. text_far UnknownText_0x1c5eba - db "@" + text_end .ConfirmDeleteText: ; Oh, make it forget @ ? text_far UnknownText_0x1c5eda - db "@" + text_end .MoveDeletedText: ; Done! Your #MON forgot the move. text_far UnknownText_0x1c5ef5 - db "@" + text_end .EggText: ; An EGG doesn't know any moves! text_far UnknownText_0x1c5f17 - db "@" + text_end .DeclinedDeletionText: ; No? Come visit me again. text_far UnknownText_0x1c5f36 - db "@" + text_end .AskWhichMoveText: ; Which move should it forget, then? text_far UnknownText_0x1c5f50 - db "@" + text_end .IntroText: ; Um… Oh, yes, I'm the MOVE DELETER. I can make #MON forget moves. Shall I make a #MON forget? text_far UnknownText_0x1c5f74 - db "@" + text_end .AskWhichMonText: ; Which #MON? text_far UnknownText_0x1c5fd1 - db "@" + text_end .DeleteMove: ld a, b diff --git a/engine/events/name_rater.asm b/engine/events/name_rater.asm index a6a78cf25..f3a443de4 100644 --- a/engine/events/name_rater.asm +++ b/engine/events/name_rater.asm @@ -183,53 +183,53 @@ NameRaterIntroText: ; I rate the names of #MON. ; Would you like me to rate names? text_far UnknownText_0x1c0043 - db "@" + text_end NameRaterWhichMonText: ; Which #MON's nickname should I rate for you? text_far UnknownText_0x1c00a0 - db "@" + text_end NameRaterIsGoodText: ; Hm… @ … That's a fairly decent name. ; But, how about a slightly better nickname? ; Want me to give it a better name? text_far UnknownText_0x1c00cd - db "@" + text_end NameRaterWhichNameText: ; All right. What name should we give it, then? text_far UnknownText_0x1c0142 - db "@" + text_end NameRaterEvenBetterText: ; That's a better name than before! Well done! text_far UnknownText_0x1c0171 - db "@" + text_end NameRaterCancelText: ; OK, then. Come again sometime. text_far UnknownText_0x1c019e - db "@" + text_end NameRaterTradedText: ; Hm… @ ? What a great name! It's perfect. ; Treat @ with loving care. text_far UnknownText_0x1c01be - db "@" + text_end NameRaterEggText: ; Whoa… That's just an EGG. text_far UnknownText_0x1c0208 - db "@" + text_end NameRaterSameAsBeforeText: ; It might look the different as before, ; but this new name is much better! Well done! text_far UnknownText_0x1c0222 - db "@" + text_end NameRaterDoneText: ; All right. This #MON is now named @ . text_far UnknownText_0x1c0272 - db "@" + text_end diff --git a/engine/events/npc_trade.asm b/engine/events/npc_trade.asm index aeccb634e..95b191494 100644 --- a/engine/events/npc_trade.asm +++ b/engine/events/npc_trade.asm @@ -433,12 +433,12 @@ TradeTexts: ConnectLinkCableText: ; OK, connect the Game Link Cable. text_far UnknownText_0x1bd407 - db "@" + text_end TradedForText: ; traded givemon for getmon text_far UnknownText_0x1bd429 - start_asm + text_asm ld de, MUSIC_NONE call PlayMusic call DelayFrame @@ -447,94 +447,94 @@ TradedForText: .done ; sound_dex_fanfare_80_109 - ; interpret_data + ; text_pause text_far UnknownText_0x1bd445 - db "@" + text_end TradeIntroText1: ; I collect #MON. Do you have @ ? Want to trade it for my @ ? text_far UnknownText_0x1bd449 - db "@" + text_end TradeCancelText1: ; You don't want to trade? Aww… text_far UnknownText_0x1bd48c - db "@" + text_end TradeWrongText1: ; Huh? That's not @ . What a letdown… text_far UnknownText_0x1bd4aa - db "@" + text_end TradeCompleteText1: ; Yay! I got myself @ ! Thanks! text_far UnknownText_0x1bd4d2 - db "@" + text_end TradeAfterText1: ; Hi, how's my old @ doing? text_far UnknownText_0x1bd4f4 - db "@" + text_end TradeIntroText2: TradeIntroText3: ; Hi, I'm looking for this #MON. If you have @ , would you trade it for my @ ? text_far UnknownText_0x1bd512 - db "@" + text_end TradeCancelText2: TradeCancelText3: ; You don't have one either? Gee, that's really disappointing… text_far UnknownText_0x1bd565 - db "@" + text_end TradeWrongText2: TradeWrongText3: ; You don't have @ ? That's too bad, then. text_far UnknownText_0x1bd5a1 - db "@" + text_end TradeCompleteText2: ; Great! Thank you! I finally got @ . text_far UnknownText_0x1bd5cc - db "@" + text_end TradeAfterText2: ; Hi! The @ you traded me is doing great! text_far UnknownText_0x1bd5f4 - db "@" + text_end TradeIntroText4: ; 's cute, but I don't have it. Do you have @ ? Want to trade it for my @ ? text_far UnknownText_0x1bd621 - db "@" + text_end TradeCancelText4: ; You don't want to trade? Oh, darn… text_far UnknownText_0x1bd673 - db "@" + text_end TradeWrongText4: ; That's not @ . Please trade with me if you get one. text_far UnknownText_0x1bd696 - db "@" + text_end TradeCompleteText4: ; Wow! Thank you! I always wanted @ ! text_far UnknownText_0x1bd6cd - db "@" + text_end TradeAfterText4: ; How is that @ I traded you doing? Your @ 's so cute! text_far UnknownText_0x1bd6f5 - db "@" + text_end TradeCompleteText3: ; Uh? What happened? text_far UnknownText_0x1bd731 - db "@" + text_end TradeAfterText3: ; Trading is so odd… I still have a lot to learn about it. text_far UnknownText_0x1bd745 - db "@" + text_end diff --git a/engine/events/overworld.asm b/engine/events/overworld.asm index c079fe96a..7dc43c15a 100644 --- a/engine/events/overworld.asm +++ b/engine/events/overworld.asm @@ -61,7 +61,7 @@ CheckBadge: ; Sorry! A new BADGE ; is required. text_far _BadgeRequiredText - db "@" + text_end CheckPartyMove: ; Check if a monster in your party has move d. @@ -115,7 +115,7 @@ FieldMoveFailed: .CantUseHere: ; Can't use that here. text_far UnknownText_0x1c05c8 - db "@" + text_end CutFunction: call FieldMoveJumptableReset @@ -164,12 +164,12 @@ CutFunction: Text_UsedCut: ; used CUT! text_far UnknownText_0x1c05dd - db "@" + text_end Text_NothingToCut: ; There's nothing to CUT here. text_far UnknownText_0x1c05ec - db "@" + text_end CheckMapForSomethingToCut: ; Does the collision data of the facing tile permit cutting? @@ -324,7 +324,7 @@ Script_UseFlash: UnknownText_0xc8f3: text_far UnknownText_0x1c0609 - start_asm + text_asm call WaitSFX ld de, SFX_FLASH call PlaySFX @@ -333,7 +333,7 @@ UnknownText_0xc8f3: ret .BlankText: - db "@" + text_end SurfFunction: call FieldMoveJumptableReset @@ -430,15 +430,15 @@ UsedSurfScript: UsedSurfText: text_far _UsedSurfText - db "@" + text_end CantSurfText: text_far _CantSurfText - db "@" + text_end AlreadySurfingText: text_far _AlreadySurfingText - db "@" + text_end GetSurfType: ; Surfing on Pikachu uses an alternate sprite. @@ -545,8 +545,9 @@ AskSurfScript: end AskSurfText: - text_far _AskSurfText ; The water is calm. - db "@" ; Want to SURF? + ; The water is calm. Want to SURF? + text_far _AskSurfText + text_end FlyFunction: call FieldMoveJumptableReset @@ -710,7 +711,7 @@ Script_UsedWaterfall: .Text_UsedWaterfall: ; used WATERFALL! text_far UnknownText_0x1c068e - db "@" + text_end TryWaterfallOW:: ld d, WATERFALL @@ -740,7 +741,7 @@ Script_CantDoWaterfall: .Text_CantDoWaterfall: ; Wow, it's a huge waterfall. text_far UnknownText_0x1c06a3 - db "@" + text_end Script_AskWaterfall: opentext @@ -753,7 +754,7 @@ Script_AskWaterfall: .AskUseWaterfall: ; Do you want to use WATERFALL? text_far UnknownText_0x1c06bf - db "@" + text_end EscapeRopeFunction: call FieldMoveJumptableReset @@ -840,17 +841,17 @@ dig_incave .Text_UsedDig: ; used DIG! text_far UnknownText_0x1c06de - db "@" + text_end .Text_UsedEscapeRope: ; used an ESCAPE ROPE. text_far UnknownText_0x1c06ed - db "@" + text_end .Text_CantUseHere: ; Can't use that here. text_far UnknownText_0x1c0705 - db "@" + text_end .UsedEscapeRopeScript: reloadmappart @@ -939,12 +940,12 @@ TeleportFunction: .Text_ReturnToLastMonCenter: ; Return to the last #MON CENTER. text_far UnknownText_0x1c071a - db "@" + text_end .Text_CantUseHere: ; Can't use that here. text_far UnknownText_0x1c073b - db "@" + text_end .TeleportScript: reloadmappart @@ -992,7 +993,7 @@ StrengthFunction: .JumpText: text_far UnknownText_0x1c0751 - db "@" + text_end .Failed: ld a, $80 @@ -1033,11 +1034,11 @@ Script_UsedStrength: .UsedStrength: text_far UnknownText_0x1c0774 - db "@" + text_end .StrengthAllowedItToMoveBoulders: text_far UnknownText_0x1c0788 - db "@" + text_end AskStrengthScript: callasm TryStrengthOW @@ -1062,17 +1063,17 @@ AskStrengthScript: UnknownText_0xcd69: ; A #MON may be able to move this. Want to use STRENGTH? text_far UnknownText_0x1c07a0 - db "@" + text_end UnknownText_0xcd6e: ; Boulders may now be moved! text_far UnknownText_0x1c07d8 - db "@" + text_end UnknownText_0xcd73: ; A #MON may be able to move this. text_far UnknownText_0x1c07f4 - db "@" + text_end TryStrengthOW: ld d, STRENGTH @@ -1148,7 +1149,7 @@ Jumptable_cdae: Text_UsedWhirlpool: ; used WHIRLPOOL! text_far UnknownText_0x1c0816 - db "@" + text_end TryWhirlpoolMenu: call GetFacingTileCoord @@ -1235,7 +1236,7 @@ Script_MightyWhirlpool: .MightyWhirlpoolText: text_far UnknownText_0x1c082b - db "@" + text_end Script_AskWhirlpoolOW: opentext @@ -1247,7 +1248,7 @@ Script_AskWhirlpoolOW: UnknownText_0xce78: text_far UnknownText_0x1c0864 - db "@" + text_end HeadbuttFunction: call TryHeadbuttFromMenu @@ -1273,12 +1274,12 @@ TryHeadbuttFromMenu: UnknownText_0xce9d: ; did a HEADBUTT! text_far UnknownText_0x1c0897 - db "@" + text_end UnknownText_0xcea2: ; Nope. Nothing… text_far UnknownText_0x1c08ac - db "@" + text_end HeadbuttFromMenuScript: reloadmappart @@ -1331,7 +1332,7 @@ AskHeadbuttScript: UnknownText_0xcee6: ; A #MON could be in this tree. Want to HEADBUTT it? text_far UnknownText_0x1c08bc - db "@" + text_end RockSmashFunction: call TryRockSmashFromMenu @@ -1407,7 +1408,7 @@ MovementData_0xcf55: UnknownText_0xcf58: text_far UnknownText_0x1c08f0 - db "@" + text_end AskRockSmashScript: callasm HasRockSmash @@ -1425,12 +1426,12 @@ AskRockSmashScript: UnknownText_0xcf72: ; Maybe a #MON can break this. text_far UnknownText_0x1c0906 - db "@" + text_end UnknownText_0xcf77: ; This rock looks breakable. Want to use ROCK SMASH? text_far UnknownText_0x1c0924 - db "@" + text_end HasRockSmash: ld d, ROCK_SMASH @@ -1633,17 +1634,17 @@ PutTheRodAway: UnknownText_0xd0a4: ; Oh! A bite! text_far UnknownText_0x1c0958 - db "@" + text_end UnknownText_0xd0a9: ; Not even a nibble! text_far UnknownText_0x1c0965 - db "@" + text_end UnknownText_0xd0ae: ; unused ; Looks like there's nothing here. text_far UnknownText_0x1c0979 - db "@" + text_end BikeFunction: call .TryBike @@ -1777,17 +1778,17 @@ Script_CantGetOffBike: .CantGetOffBikeText: ; You can't get off here! text_far UnknownText_0x1c099a - db "@" + text_end GotOnTheBikeText: ; got on the @ . text_far UnknownText_0x1c09b2 - db "@" + text_end GotOffTheBikeText: ; got off the @ . text_far UnknownText_0x1c09c7 - db "@" + text_end TryCutOW:: ld d, CUT @@ -1833,11 +1834,11 @@ AskCutScript: UnknownText_0xd1c8: text_far UnknownText_0x1c09dd - db "@" + text_end CantCutScript: jumptext UnknownText_0xd1d0 UnknownText_0xd1d0: text_far UnknownText_0x1c0a05 - db "@" + text_end diff --git a/engine/events/poisonstep.asm b/engine/events/poisonstep.asm index 19c3ebe05..8786ec758 100644 --- a/engine/events/poisonstep.asm +++ b/engine/events/poisonstep.asm @@ -147,8 +147,8 @@ DoPoisonStep:: .PoisonFaintText: text_far UnknownText_0x1c0acc - db "@" + text_end .PoisonWhiteOutText: text_far UnknownText_0x1c0ada - db "@" + text_end diff --git a/engine/events/poke_seer.asm b/engine/events/poke_seer.asm index 6951e7199..db8d2beab 100644 --- a/engine/events/poke_seer.asm +++ b/engine/events/poke_seer.asm @@ -299,42 +299,42 @@ SeerTexts: SeerIntroText: ; I see all. I know all… Certainly, I know of your #MON! text_far UnknownText_0x1c475f - db "@" + text_end SeerCantTellText: ; Whaaaat? I can't tell a thing! How could I not know of this? text_far UnknownText_0x1c4797 - db "@" + text_end SeerMetAtText: ; Hm… I see you met @ here: @ ! text_far UnknownText_0x1c47d4 - db "@" + text_end SeerTimeLevelText: ; The time was @ ! Its level was @ ! Am I good or what? text_far UnknownText_0x1c47fa - db "@" + text_end SeerTradedText: ; Hm… @ came from @ in a trade? @ was where @ met @ ! text_far UnknownText_0x1c4837 - db "@" + text_end 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_far UnknownText_0x1c487f - db "@" + text_end SeerEggText: ; Hey! That's an EGG! You can't say that you've met it yet… text_far UnknownText_0x1c491d - db "@" + text_end SeerCancelText: ; Fufufu! I saw that you'd do nothing! text_far UnknownText_0x1c4955 - db "@" + text_end SeerAdvice: ld a, MON_LEVEL @@ -374,27 +374,27 @@ SeerAdviceTexts: SeerAdvice1: ; Incidentally… It would be wise to raise your #MON with a little more care. text_far UnknownText_0x1c497a - db "@" + text_end SeerAdvice2: ; Incidentally… It seems to have grown a little. @ seems to be becoming more confident. text_far UnknownText_0x1c49c6 - db "@" + text_end SeerAdvice3: ; Incidentally… @ has grown. It's gained much strength. text_far UnknownText_0x1c4a21 - db "@" + text_end SeerAdvice4: ; Incidentally… It certainly has grown mighty! This @ must have come through numerous #MON battles. It looks brimming with confidence. text_far UnknownText_0x1c4a5b - db "@" + text_end 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_far UnknownText_0x1c4ae5 - db "@" + text_end GetCaughtGender: ld hl, MON_CAUGHTGENDER diff --git a/engine/events/pokecenter_pc.asm b/engine/events/pokecenter_pc.asm index c930caed1..3dc02372d 100644 --- a/engine/events/pokecenter_pc.asm +++ b/engine/events/pokecenter_pc.asm @@ -112,7 +112,7 @@ PC_CheckPartyForPokemon: .MustHavePokemonToUse: ; Bzzzzt! You must have a #MON to use this! text_far UnknownText_0x1c1328 - db "@" + text_end BillsPC: call PC_PlayChoosePCSound @@ -202,7 +202,7 @@ _PlayersHousePC: UnknownText_0x156ff: ; turned on the PC. text_far UnknownText_0x1c1353 - db "@" + text_end _PlayersPC: ld a, b @@ -306,7 +306,7 @@ PC_DisplayTextWaitMenu: UnknownText_0x157cc: ; What do you want to do? text_far UnknownText_0x1c1368 - db "@" + text_end PlayerWithdrawItemMenu: call LoadStandardMenuHeader @@ -374,15 +374,15 @@ PlayerWithdrawItemMenu: .HowManyText: text_far _PlayersPCHowManyWithdrawText - db "@" + text_end .WithdrewText: text_far _PlayersPCWithdrewItemsText - db "@" + text_end .NoRoomText: text_far _PlayersPCNoRoomWithdrawText - db "@" + text_end PlayerTossItemMenu: call LoadStandardMenuHeader @@ -445,7 +445,7 @@ PlayerDepositItemMenu: .NoItemsInBag: ; No items here! text_far UnknownText_0x1c13df - db "@" + text_end .TryDepositItem: ld a, [wSpriteUpdatesEnabled] @@ -534,15 +534,15 @@ PlayerDepositItemMenu: .HowManyText: text_far _PlayersPCHowManyDepositText - db "@" + text_end .DepositText: text_far _PlayersPCDepositItemsText - db "@" + text_end .NoRoomText: text_far _PlayersPCNoRoomDepositText - db "@" + text_end PlayerMailBoxMenu: farcall _PlayerMailBoxMenu @@ -641,29 +641,29 @@ PC_DisplayText: PokecenterPCText_BootedUpPC: ; turned on the PC. text_far UnknownText_0x1c144d - db "@" + text_end PokecenterPCText_AccessWhosePC: ; Access whose PC? text_far UnknownText_0x1c1462 - db "@" + text_end PokecenterPCText_AccessedBillsPC: ; BILL's PC accessed. #MON Storage System opened. text_far UnknownText_0x1c1474 - db "@" + text_end PokecenterPCText_AccessedOwnPC: ; Accessed own PC. Item Storage System opened. text_far UnknownText_0x1c14a4 - db "@" + text_end PokecenterPCText_AccessedOaksPC: ; PROF.OAK's PC accessed. #DEX Rating System opened. text_far UnknownText_0x1c14d2 - db "@" + text_end PokecenterPCText_LinkClosed: ; … Link closed… text_far UnknownText_0x1c1505 - db "@" + text_end diff --git a/engine/events/print_photo.asm b/engine/events/print_photo.asm index b99312eaa..83053851f 100644 --- a/engine/events/print_photo.asm +++ b/engine/events/print_photo.asm @@ -32,24 +32,24 @@ PhotoStudio: .Text_AskWhichMon: ; Which #MON should I photo- graph? text_far UnknownText_0x1be024 - db "@" + text_end .Text_HoldStill: ; All righty. Hold still for a bit. text_far UnknownText_0x1be047 - db "@" + text_end .Text_Presto: ; Presto! All done. Come again, OK? text_far UnknownText_0x1be06a - db "@" + text_end .Text_NoPicture: ; Oh, no picture? Come again, OK? text_far UnknownText_0x1c0000 - db "@" + text_end .Text_Egg: ; An EGG? My talent is worth more… text_far UnknownText_0x1c0021 - db "@" + text_end diff --git a/engine/events/prof_oaks_pc.asm b/engine/events/prof_oaks_pc.asm index ed7a34c0f..07c14ea01 100644 --- a/engine/events/prof_oaks_pc.asm +++ b/engine/events/prof_oaks_pc.asm @@ -102,92 +102,92 @@ INCLUDE "data/events/pokedex_ratings.asm" OakPCText1: text_far _OakPCText1 - db "@" + text_end OakPCText2: text_far _OakPCText2 - db "@" + text_end OakPCText3: text_far _OakPCText3 - db "@" + text_end OakRating01: text_far _OakRating01 - db "@" + text_end OakRating02: text_far _OakRating02 - db "@" + text_end OakRating03: text_far _OakRating03 - db "@" + text_end OakRating04: text_far _OakRating04 - db "@" + text_end OakRating05: text_far _OakRating05 - db "@" + text_end OakRating06: text_far _OakRating06 - db "@" + text_end OakRating07: text_far _OakRating07 - db "@" + text_end OakRating08: text_far _OakRating08 - db "@" + text_end OakRating09: text_far _OakRating09 - db "@" + text_end OakRating10: text_far _OakRating10 - db "@" + text_end OakRating11: text_far _OakRating11 - db "@" + text_end OakRating12: text_far _OakRating12 - db "@" + text_end OakRating13: text_far _OakRating13 - db "@" + text_end OakRating14: text_far _OakRating14 - db "@" + text_end OakRating15: text_far _OakRating15 - db "@" + text_end OakRating16: text_far _OakRating16 - db "@" + text_end OakRating17: text_far _OakRating17 - db "@" + text_end OakRating18: text_far _OakRating18 - db "@" + text_end OakRating19: text_far _OakRating19 - db "@" + text_end OakPCText4: text_far _OakPCText4 - db "@" + text_end diff --git a/engine/events/sacred_ash.asm b/engine/events/sacred_ash.asm index 8f200dbb0..b7553f919 100644 --- a/engine/events/sacred_ash.asm +++ b/engine/events/sacred_ash.asm @@ -67,4 +67,4 @@ SacredAshScript: UnknownText_0x50845: ; 's #MON were all healed! text_far UnknownText_0x1c0b65 - db "@" + text_end diff --git a/engine/events/specials.asm b/engine/events/specials.asm index 3fb79697a..5293b1d7a 100644 --- a/engine/events/specials.asm +++ b/engine/events/specials.asm @@ -170,7 +170,7 @@ GetMysteryGiftItem: .ReceiveItemText: ; received item text_far UnknownText_0x1bd3be - db "@" + text_end BugContestJudging: farcall _BugContestJudging @@ -258,12 +258,12 @@ CheckCoinsAndCoinCase: .NoCoinsText: ; You have no coins. text_far UnknownText_0x1bd3d7 - db "@" + text_end .NoCoinCaseText: ; You don't have a COIN CASE. text_far UnknownText_0x1bd3eb - db "@" + text_end ClearBGPalettesBufferScreen: call ClearBGPalettes diff --git a/engine/events/squirtbottle.asm b/engine/events/squirtbottle.asm index df0171d95..31638db40 100644 --- a/engine/events/squirtbottle.asm +++ b/engine/events/squirtbottle.asm @@ -18,7 +18,7 @@ _Squirtbottle: .NothingHappenedText: ; sprinkled water. But nothing happened… text_far UnknownText_0x1c0b3b - db "@" + text_end .CheckCanUseSquirtbottle: ld a, [wMapGroup] diff --git a/engine/events/sweet_scent.asm b/engine/events/sweet_scent.asm index bdbba1e21..ff65b2d7b 100644 --- a/engine/events/sweet_scent.asm +++ b/engine/events/sweet_scent.asm @@ -60,9 +60,9 @@ SweetScentEncounter: UnknownText_0x50726: ; used SWEET SCENT! text_far UnknownText_0x1c0b03 - db "@" + text_end UnknownText_0x5072b: ; Looks like there's nothing here… text_far UnknownText_0x1c0b1a - db "@" + text_end diff --git a/engine/events/whiteout.asm b/engine/events/whiteout.asm index 4a68be792..36295367c 100644 --- a/engine/events/whiteout.asm +++ b/engine/events/whiteout.asm @@ -27,7 +27,7 @@ Script_Whiteout: .WhitedOutText: ; is out of useable #MON! whited out! text_far UnknownText_0x1c0a4e - db "@" + text_end OverworldBGMap: call ClearPalettes diff --git a/engine/games/card_flip.asm b/engine/games/card_flip.asm index 3dd6327b9..827d51af9 100644 --- a/engine/games/card_flip.asm +++ b/engine/games/card_flip.asm @@ -118,7 +118,7 @@ _CardFlip: .PlayWithThreeCoinsText: ; Play with three coins? text_far UnknownText_0x1c5793 - db "@" + text_end .DeductCoins: ld a, [wCoins] @@ -158,7 +158,7 @@ _CardFlip: .NotEnoughCoinsText: ; Not enough coins… text_far UnknownText_0x1c57ab - db "@" + text_end .ChooseACard: xor a @@ -235,7 +235,7 @@ _CardFlip: .ChooseACardText: ; Choose a card. text_far UnknownText_0x1c57be - db "@" + text_end .PlaceYourBet: ld hl, .PlaceYourBetText @@ -257,7 +257,7 @@ _CardFlip: .PlaceYourBetText: ; Place your bet. text_far UnknownText_0x1c57ce - db "@" + text_end .CheckTheCard: xor a @@ -328,12 +328,12 @@ _CardFlip: .PlayAgainText: ; Want to play again? text_far UnknownText_0x1c57df - db "@" + text_end .CardsShuffledText: ; The cards have been shuffled. text_far UnknownText_0x1c57f4 - db "@" + text_end .Quit: ld hl, wJumptableIndex @@ -1115,12 +1115,12 @@ CardFlip_CheckWinCondition: .Text_Yeah: ; Yeah! text_far UnknownText_0x1c5813 - db "@" + text_end .Text_Darn: ; Darn… text_far UnknownText_0x1c581a - db "@" + text_end .AddCoinPlaySFX: ld a, [wCoins] diff --git a/engine/games/dummy_game.asm b/engine/games/dummy_game.asm index 39053b214..582ae67f6 100644 --- a/engine/games/dummy_game.asm +++ b/engine/games/dummy_game.asm @@ -309,7 +309,7 @@ DummyGame_CheckMatch: ret .VictoryText: - start_asm + text_asm push bc hlcoord 2, 13 call DummyGame_PlaceCard @@ -323,12 +323,12 @@ DummyGame_CheckMatch: DummyGameText_Yeah: ; , yeah! text_far UnknownText_0x1c1a5b - db "@" + text_end DummyGameText_Darn: ; Darn… text_far UnknownText_0x1c1a65 - db "@" + text_end DummyGame_InitBoard: ld hl, wDummyGameCards diff --git a/engine/games/slot_machine.asm b/engine/games/slot_machine.asm index a60abda50..4a8ee9370 100644 --- a/engine/games/slot_machine.asm +++ b/engine/games/slot_machine.asm @@ -1750,17 +1750,17 @@ Slots_AskBet: .Text_BetHowManyCoins: ; Bet how many coins? text_far UnknownText_0x1c5049 - db "@" + text_end .Text_Start: ; Start! text_far UnknownText_0x1c505e - db "@" + text_end .Text_NotEnoughCoins: ; Not enough coins. text_far UnknownText_0x1c5066 - db "@" + text_end .MenuHeader: db MENU_BACKUP_TILES ; flags @@ -1806,11 +1806,11 @@ Slots_AskPlayAgain: .Text_OutOfCoins: text_far UnknownText_0x1c5079 - db "@" + text_end .Text_PlayAgain: text_far UnknownText_0x1c5092 - db "@" + text_end Slots_GetPayout: ld a, [wSlotMatched] @@ -1887,7 +1887,7 @@ Slots_PayoutText: dbw "15@@", .LinedUpMonOrCherry .Text_PrintPayout: - start_asm + text_asm ld a, [wSlotMatched] add $25 ldcoord_a 2, 13 @@ -1908,12 +1908,12 @@ endr .Text_LinedUpWonCoins: ; lined up! Won @ coins! text_far UnknownText_0x1c509f - db "@" + text_end .Text_Darn: ; Darn! text_far UnknownText_0x1c50bb - db "@" + text_end .LinedUpSevens: ld a, SFX_2ND_PLACE diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm index f31f7c319..fe5ec5663 100644 --- a/engine/items/item_effects.asm +++ b/engine/items/item_effects.asm @@ -1064,37 +1064,37 @@ LevelBallMultiplier: Text_RBY_CatchMarowak: ; It dodged the thrown BALL! This #MON can't be caught! text_far UnknownText_0x1c5a5a - db "@" + text_end Text_RBY_NoShake: ; You missed the #MON! text_far UnknownText_0x1c5a90 - db "@" + text_end Text_NoShake: ; Oh no! The #MON broke free! text_far UnknownText_0x1c5aa6 - db "@" + text_end Text_OneShake: ; Aww! It appeared to be caught! text_far UnknownText_0x1c5ac3 - db "@" + text_end Text_TwoShakes: ; Aargh! Almost had it! text_far UnknownText_0x1c5ae3 - db "@" + text_end Text_ThreeShakes: ; Shoot! It was so close too! text_far UnknownText_0x1c5afa - db "@" + text_end Text_GotchaMonWasCaught: ; Gotcha! @ was caught!@ @ text_far UnknownText_0x1c5b17 - start_asm + text_asm call WaitSFX push bc ld de, MUSIC_NONE @@ -1109,22 +1109,22 @@ Text_GotchaMonWasCaught: TextJump_Waitbutton: ; @ text_far Text_Waitbutton_2 - db "@" + text_end Text_SentToBillsPC: ; was sent to BILL's PC. text_far UnknownText_0x1c5b38 - db "@" + text_end Text_AddedToPokedex: ; 's data was newly added to the #DEX.@ @ text_far UnknownText_0x1c5b53 - db "@" + text_end Text_AskNicknameNewlyCaughtMon: ; Give a nickname to @ ? text_far UnknownText_0x1c5b7f - db "@" + text_end ReturnToBattle_UseBall: farcall _ReturnToBattle_UseBall @@ -1235,7 +1235,7 @@ RareCandy_StatBooster_ExitMenu: Text_StatRose: ; 's @ rose. text_far UnknownText_0x1c5b9a - db "@" + text_end StatStrings: dw .health @@ -2063,7 +2063,7 @@ Softboiled_MilkDrinkFunction: .Text_CantBeUsed: ; That can't be used on this #MON. text_far UnknownText_0x1c5bac - db "@" + text_end EscapeRopeEffect: xor a @@ -2099,7 +2099,7 @@ UseRepel: TextJump_RepelUsedEarlierIsStillInEffect: ; The REPEL used earlier is still in effect. text_far Text_RepelUsedEarlierIsStillInEffect - db "@" + text_end XAccuracyEffect: ld hl, wPlayerSubStatus4 @@ -2240,17 +2240,17 @@ PokeFluteEffect: .CatchyTune: ; Played the # FLUTE. Now, that's a catchy tune! text_far UnknownText_0x1c5bf9 - db "@" + text_end .AllSleepingMonWokeUp: ; All sleeping #MON woke up. text_far UnknownText_0x1c5c28 - db "@" + text_end .PlayedTheFlute: ; played the # FLUTE.@ @ text_far UnknownText_0x1c5c44 - start_asm + text_asm ld a, [wBattleMode] and a jr nz, .battle @@ -2270,7 +2270,7 @@ BlueCardEffect: .bluecardtext text_far UnknownText_0x1c5c5e - db "@" + text_end CoinCaseEffect: ld hl, .coincasetext @@ -2278,7 +2278,7 @@ CoinCaseEffect: .coincasetext text_far UnknownText_0x1c5c7b - db "@" + text_end OldRodEffect: ld e, $0 @@ -2533,27 +2533,27 @@ RestorePP: TextJump_RaiseThePPOfWhichMove: ; Raise the PP of which move? text_far Text_RaiseThePPOfWhichMove - db "@" + text_end TextJump_RestoreThePPOfWhichMove: ; Restore the PP of which move? text_far Text_RestoreThePPOfWhichMove - db "@" + text_end TextJump_PPIsMaxedOut: ; 's PP is maxed out. text_far Text_PPIsMaxedOut - db "@" + text_end TextJump_PPsIncreased: ; 's PP increased. text_far Text_PPsIncreased - db "@" + text_end UnknownText_0xf739: ; PP was restored. text_far UnknownText_0x1c5cf1 - db "@" + text_end SquirtbottleEffect: farcall _Squirtbottle @@ -2592,7 +2592,7 @@ OpenBox: .text ; There was a trophy inside! text_far UnknownText_0x1c5d03 - db "@" + text_end NoEffect: jp IsntTheTimeMessage @@ -2687,67 +2687,67 @@ CantUseItemMessage: LooksBitterText: ; It looks bitter… text_far UnknownText_0x1c5d3e - db "@" + text_end CantUseOnEggText: ; That can't be used on an EGG. text_far UnknownText_0x1c5d50 - db "@" + text_end IsntTheTimeText: ; OAK: ! This isn't the time to use that! text_far UnknownText_0x1c5d6e - db "@" + text_end BelongsToSomeoneElseText: ; That belongs to someone else! text_far UnknownText_0x1c5d97 - db "@" + text_end WontHaveAnyEffectText: ; It won't have any effect. text_far UnknownText_0x1c5db6 - db "@" + text_end BlockedTheBallText: ; The trainer blocked the BALL! text_far UnknownText_0x1c5dd0 - db "@" + text_end DontBeAThiefText: ; Don't be a thief! text_far UnknownText_0x1c5def - db "@" + text_end CyclingIsntAllowedText: ; Cycling isn't allowed here. text_far UnknownText_0x1c5e01 - db "@" + text_end CantGetOnYourBikeText: ; Can't get on your @ now. text_far UnknownText_0x1c5e1d - db "@" + text_end Ball_BoxIsFullText: ; The #MON BOX is full. That can't be used now. text_far UnknownText_0x1c5e3a - db "@" + text_end UsedItemText: ; used the@ . text_far UnknownText_0x1c5e68 - db "@" + text_end GotOnTheItemText: ; got on the@ . text_far UnknownText_0x1c5e7b - db "@" + text_end GotOffTheItemText: ; got off@ the @ . text_far UnknownText_0x1c5e90 - db "@" + text_end ApplyPPUp: ld a, MON_MOVES diff --git a/engine/items/mart.asm b/engine/items/mart.asm index d7abf1eb4..59fe89dc9 100644 --- a/engine/items/mart.asm +++ b/engine/items/mart.asm @@ -582,12 +582,12 @@ RooftopSaleAskPurchaseQuantity: Text_Mart_HowMany: ; How many? text_far UnknownText_0x1c4bfd - db "@" + text_end Text_Mart_CostsThisMuch: ; @ (S) will be ¥@ . text_far UnknownText_0x1c4c08 - db "@" + text_end MenuHeader_Buy: db MENU_BACKUP_TILES ; flags @@ -625,107 +625,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_far UnknownText_0x1c4c28 - db "@" + text_end Text_HerbShop_HowMany: ; How many? text_far UnknownText_0x1c4ca3 - db "@" + text_end Text_HerbShop_CostsThisMuch: ; @ (S) will be ¥@ . text_far UnknownText_0x1c4cae - db "@" + text_end Text_HerbShop_HereYouGo: ; Thank you, dear. Hehehehe… text_far UnknownText_0x1c4cce - db "@" + text_end Text_HerbShop_BagFull: ; Oh? Your PACK is full, dear. text_far UnknownText_0x1c4cea - db "@" + text_end Text_HerbShop_InsufficientFunds: ; Hehehe… You don't have the money. text_far UnknownText_0x1c4d08 - db "@" + text_end Text_HerbShop_ComeAgain: ; Come again, dear. Hehehehe… text_far UnknownText_0x1c4d2a - db "@" + text_end Text_BargainShop_Intro: ; Hiya! Care to see some bargains? I sell rare items that nobody else carries--but only one of each item. text_far UnknownText_0x1c4d47 - db "@" + text_end Text_BargainShop_CostsThisMuch: ; costs ¥@ . Want it? text_far UnknownText_0x1c4db0 - db "@" + text_end Text_BargainShop_HereYouGo: ; Thanks. text_far UnknownText_0x1c4dcd - db "@" + text_end Text_BargainShop_BagFull: ; Uh-oh, your PACK is chock-full. text_far UnknownText_0x1c4dd6 - db "@" + text_end Text_BargainShop_SoldOut: ; You bought that already. I'm all sold out of it. text_far UnknownText_0x1c4df7 - db "@" + text_end Text_BargainShop_InsufficientFunds: ; Uh-oh, you're short on funds. text_far UnknownText_0x1c4e28 - db "@" + text_end Text_BargainShop_ComeAgain: ; Come by again sometime. text_far UnknownText_0x1c4e46 - db "@" + text_end Text_Pharmacist_Intro: ; What's up? Need some medicine? text_far UnknownText_0x1c4e5f - db "@" + text_end Text_Pharmacy_HowMany: ; How many? text_far UnknownText_0x1c4e7e - db "@" + text_end Text_Pharmacy_CostsThisMuch: ; @ (S) will cost ¥@ . text_far UnknownText_0x1c4e89 - db "@" + text_end Text_Pharmacy_HereYouGo: ; Thanks much! text_far UnknownText_0x1c4eab - db "@" + text_end Text_Pharmacy_BagFull: ; You don't have any more space. text_far UnknownText_0x1c4eb9 - db "@" + text_end Text_Pharmacy_InsufficientFunds: ; Huh? That's not enough money. text_far UnknownText_0x1c4ed8 - db "@" + text_end Text_Pharmacist_ComeAgain: ; All right. See you around. text_far UnknownText_0x1c4ef6 - db "@" + text_end SellMenu: call DisableSpriteUpdates @@ -752,7 +752,7 @@ SellMenu: .NothingToSellText: ; You don't have anything to sell. text_far UnknownText_0x1c4f12 - db "@" + text_end .TryToSellItem: farcall CheckItemMenu @@ -821,12 +821,12 @@ SellMenu: Text_Mart_SellHowMany: ; How many? text_far UnknownText_0x1c4f33 - db "@" + text_end Text_Mart_ICanPayThisMuch: ; I can pay you ¥@ . Is that OK? text_far UnknownText_0x1c4f3e - db "@" + text_end .UnusedString15f7d: db "！ダミー！@" @@ -834,7 +834,7 @@ Text_Mart_ICanPayThisMuch: Text_Mart_HowMayIHelpYou: ; Welcome! How may I help you? text_far UnknownText_0x1c4f62 - db "@" + text_end MenuHeader_BuySell: db MENU_BACKUP_TILES ; flags @@ -852,35 +852,35 @@ MenuHeader_BuySell: Text_Mart_HereYouGo: ; Here you are. Thank you! text_far UnknownText_0x1c4f80 - db "@" + text_end Text_Mart_InsufficientFunds: ; You don't have enough money. text_far UnknownText_0x1c4f9a - db "@" + text_end Text_Mart_BagFull: ; You can't carry any more items. text_far UnknownText_0x1c4fb7 - db "@" + text_end TextMart_CantBuyFromYou: ; Sorry, I can't buy that from you. text_far UnknownText_0x1c4fd7 - db "@" + text_end Text_Mart_ComeAgain: ; Please come again! text_far UnknownText_0x1c4ff9 - db "@" + text_end Text_Mart_AnythingElse: text_far UnknownText_0x1c500d - db "@" + text_end Text_Mart_SoldForAmount: text_far UnknownText_0x1c502e - db "@" + text_end PlayTransactionSound: call WaitSFX diff --git a/engine/items/pack.asm b/engine/items/pack.asm index 6d7fc7e10..97f04f604 100644 --- a/engine/items/pack.asm +++ b/engine/items/pack.asm @@ -617,7 +617,7 @@ GiveItem: .Egg: ; An EGG can't hold an item. text_far Text_AnEGGCantHoldAnItem - db "@" + text_end QuitItemSubmenu: ret @@ -1549,58 +1549,58 @@ PC_Mart_BallsPocketMenuHeader: Text_PackNoItems: ; No items. text_far UnknownText_0x1c0b9a - db "@" + text_end Text_ThrowAwayHowMany: ; Throw away how many? text_far UnknownText_0x1c0ba5 - db "@" + text_end Text_ConfirmThrowAway: ; Throw away @ @ (S)? text_far UnknownText_0x1c0bbb - db "@" + text_end Text_ThrewAway: ; Threw away @ (S). text_far UnknownText_0x1c0bd8 - db "@" + text_end Text_ThisIsntTheTime: ; OAK: ! This isn't the time to use that! text_far UnknownText_0x1c0bee - db "@" + text_end TextJump_YouDontHaveAMon: ; You don't have a #MON! text_far Text_YouDontHaveAMon - db "@" + text_end Text_RegisteredItem: ; Registered the @ . text_far UnknownText_0x1c0c2e - db "@" + text_end Text_CantRegister: ; You can't register that item. text_far UnknownText_0x1c0c45 - db "@" + text_end Text_MoveItemWhere: ; Where should this be moved to? text_far UnknownText_0x1c0c63 - db "@" + text_end Text_PackEmptyString: ; text_far UnknownText_0x1c0c83 - db "@" + text_end TextJump_YouCantUseItInABattle: ; Doesn't seem to be used anywhere ; "You can't use it in a battle." text_far Text_YouCantUseItInABattle - db "@" + text_end PackMenuGFX: INCBIN "gfx/pack/pack_menu.2bpp" diff --git a/engine/items/tmhm.asm b/engine/items/tmhm.asm index cf71d8467..98222e4b6 100644 --- a/engine/items/tmhm.asm +++ b/engine/items/tmhm.asm @@ -169,22 +169,22 @@ TeachTMHM: Text_BootedTM: ; Booted up a TM. text_far UnknownText_0x1c0373 - db "@" + text_end Text_BootedHM: ; Booted up an HM. text_far UnknownText_0x1c0384 - db "@" + text_end Text_ItContained: ; It contained @ . Teach @ to a #MON? text_far UnknownText_0x1c0396 - db "@" + text_end Text_TMHMNotCompatible: ; is not compatible with @ . It can't learn @ . text_far UnknownText_0x1c03c2 - db "@" + text_end TMHM_PocketLoop: xor a @@ -500,12 +500,12 @@ Unreferenced_Function2cadf: .NoRoomText: ; You have no room for any more @ S. text_far UnknownText_0x1c03fa - db "@" + text_end .ReceivedText: ; You received @ ! text_far UnknownText_0x1c0421 - db "@" + text_end .CheckHaveRoomForTMHM: ld a, [wTempTMHM] diff --git a/engine/link/link.asm b/engine/link/link.asm index a013f3423..b51567c31 100644 --- a/engine/link/link.asm +++ b/engine/link/link.asm @@ -508,7 +508,7 @@ LinkTimeout: .TooMuchTimeHasElapsed: ; Too much time has elapsed. Please try again. text_far UnknownText_0x1c4183 - db "@" + text_end ExchangeBytes: ld a, TRUE @@ -1490,7 +1490,7 @@ Function28926: .Text_CantTradeLastMon: ; If you trade that #MON, you won't be able to battle. text_far UnknownText_0x1c41b1 - db "@" + text_end .String_Stats_Trade: db "STATS TRADE@" @@ -1498,7 +1498,7 @@ Function28926: .Text_Abnormal: ; Your friend's @ appears to be abnormal! text_far UnknownText_0x1c41e6 - db "@" + text_end Function28ac9: ld a, [wMenuCursorY] @@ -1951,7 +1951,7 @@ String28eab: UnknownText_0x28eb8: ; Trade @ for @ ? text_far UnknownText_0x1c4212 - db "@" + text_end String28ebd: db "Trade completed!@" diff --git a/engine/link/mystery_gift.asm b/engine/link/mystery_gift.asm index 9844cbfa4..a1228565d 100644 --- a/engine/link/mystery_gift.asm +++ b/engine/link/mystery_gift.asm @@ -129,35 +129,35 @@ DoMysteryGift: .Text_LinkCanceled: text_far UnknownText_0x1c0436 - db "@" + text_end .Text_CommunicationError: text_far UnknownText_0x1c0454 - db "@" + text_end .Text_ReceiveGiftAtCounter: text_far UnknownText_0x1c046a - db "@" + text_end .Text_FriendNotReady: text_far UnknownText_0x1c048e - db "@" + text_end .Text_MaxFiveGifts: text_far UnknownText_0x1c04a7 - db "@" + text_end .Text_MaxOneGiftPerPerson: text_far UnknownText_0x1c04c6 - db "@" + text_end .Text_Sent: text_far UnknownText_0x1c04e9 - db "@" + text_end .Text_SentToHome: text_far UnknownText_0x1c04fa - db "@" + text_end .CheckAlreadyGotFiveGiftsToday: call GetMysteryGiftBank @@ -1491,23 +1491,23 @@ String_PressAToLink_BToCancel_JP: Text_ReceivedCard: text_far UnknownText_0x1c051a - db "@" + text_end Text_ListedCardAsNumber: text_far UnknownText_0x1c0531 - db "@" + text_end Text_CardNotRegistered: text_far UnknownText_0x1c0555 - db "@" + text_end Text_MGLinkCanceled: text_far UnknownText_0x1c0573 - db "@" + text_end Text_MGCommError: text_far UnknownText_0x1c0591 - db "@" + text_end Function105777: call ClearSprites diff --git a/engine/menus/delete_save.asm b/engine/menus/delete_save.asm index a0b2a13e6..85b25e54b 100644 --- a/engine/menus/delete_save.asm +++ b/engine/menus/delete_save.asm @@ -21,7 +21,7 @@ _DeleteSaveData: .Text_ClearAllSaveData: ; Clear all save data? text_far UnknownText_0x1c564a - db "@" + text_end .NoYesMenuHeader: db 0 ; flags diff --git a/engine/menus/init_gender.asm b/engine/menus/init_gender.asm index 69f62c627..4c1f3a8f9 100644 --- a/engine/menus/init_gender.asm +++ b/engine/menus/init_gender.asm @@ -56,7 +56,7 @@ InitGender: TextJump_AreYouABoyOrAreYouAGirl: ; Are you a boy? Or are you a girl? text_far Text_AreYouABoyOrAreYouAGirl - db "@" + text_end InitGenderScreen: ld a, $10 diff --git a/engine/menus/intro_menu.asm b/engine/menus/intro_menu.asm index 1d76ff89a..f6be52c52 100644 --- a/engine/menus/intro_menu.asm +++ b/engine/menus/intro_menu.asm @@ -704,11 +704,11 @@ OakSpeech: OakText1: text_far _OakText1 - db "@" + text_end OakText2: text_far _OakText2 - start_asm + text_asm ld a, WOOPER call PlayMonCry call WaitSFX @@ -717,23 +717,23 @@ OakText2: OakText3: text_far _OakText3 - db "@" + text_end OakText4: text_far _OakText4 - db "@" + text_end OakText5: text_far _OakText5 - db "@" + text_end OakText6: text_far _OakText6 - db "@" + text_end OakText7: text_far _OakText7 - db "@" + text_end NamePlayer: farcall MovePlayerPicRight diff --git a/engine/menus/main_menu.asm b/engine/menus/main_menu.asm index face2ba72..1de34f40f 100644 --- a/engine/menus/main_menu.asm +++ b/engine/menus/main_menu.asm @@ -283,7 +283,7 @@ MainMenu_PrintCurrentTimeAndDay: .UnusedText: ; Clock time unknown text_far UnknownText_0x1c5182 - db "@" + text_end .PlaceCurrentDay: push de diff --git a/engine/menus/menu.asm b/engine/menus/menu.asm index b0644db8a..f9f395329 100644 --- a/engine/menus/menu.asm +++ b/engine/menus/menu.asm @@ -733,7 +733,7 @@ Error_Cant_ExitMenu: .Text_NoWindowsAvailableForPopping: text_far UnknownText_0x1c46b7 - db "@" + text_end _InitVerticalMenuCursor:: ld a, [wMenuDataFlags] diff --git a/engine/menus/save.asm b/engine/menus/save.asm index 70dc03a6d..a5ddfae47 100644 --- a/engine/menus/save.asm +++ b/engine/menus/save.asm @@ -1098,39 +1098,39 @@ Checksum: Text_WouldYouLikeToSaveTheGame: ; Would you like to save the game? text_far UnknownText_0x1c454b - db "@" + text_end Text_SavingDontTurnOffThePower: ; SAVING… DON'T TURN OFF THE POWER. text_far UnknownText_0x1c456d - db "@" + text_end Text_PlayerSavedTheGame: ; saved the game. text_far UnknownText_0x1c4590 - db "@" + text_end Text_AlreadyASaveFile: ; There is already a save file. Is it OK to overwrite? text_far UnknownText_0x1c45a3 - db "@" + text_end Text_AnotherSaveFile: ; There is another save file. Is it OK to overwrite? text_far UnknownText_0x1c45d9 - db "@" + text_end Text_SaveFileCorrupted: ; The save file is corrupted! text_far UnknownText_0x1c460d - db "@" + text_end Text_SaveOnBoxSwitch: ; When you change a #MON BOX, data will be saved. OK? text_far UnknownText_0x1c462a - db "@" + text_end Text_SaveOnMoveMonWOMail: ; Each time you move a #MON, data will be saved. OK? text_far UnknownText_0x1c465f - db "@" + text_end diff --git a/engine/menus/start_menu.asm b/engine/menus/start_menu.asm index 70fd60e9b..49144f0b6 100644 --- a/engine/menus/start_menu.asm +++ b/engine/menus/start_menu.asm @@ -426,7 +426,7 @@ StartMenu_Quit: .EndTheContestText: text_far UnknownText_0x1c1a6c - db "@" + text_end StartMenu_Save: ; Save the game. diff --git a/engine/menus/trainer_card.asm b/engine/menus/trainer_card.asm index 1d959ebce..1509722ed 100644 --- a/engine/menus/trainer_card.asm +++ b/engine/menus/trainer_card.asm @@ -294,7 +294,9 @@ TrainerCard_Page1_PrintDexCaught_GameTime: .Dex_PlayTime: db "#DEX" - next "PLAY TIME@@" + next "PLAY TIME@" + + db "@" ; unused .Badges: db " BADGES▶@" diff --git a/engine/movie/init_hof_credits.asm b/engine/movie/init_hof_credits.asm index 40cfc7ff1..bd05039d9 100644 --- a/engine/movie/init_hof_credits.asm +++ b/engine/movie/init_hof_credits.asm @@ -26,7 +26,7 @@ InitDisplayForHallOfFame: .SavingRecordDontTurnOff: ; SAVING RECORD… DON'T TURN OFF! text_far UnknownText_0x1bd39e - db "@" + text_end InitDisplayForRedCredits: call ClearBGPalettes diff --git a/engine/movie/trade_animation.asm b/engine/movie/trade_animation.asm index 918b0c3e4..2ecbe2060 100644 --- a/engine/movie/trade_animation.asm +++ b/engine/movie/trade_animation.asm @@ -1192,12 +1192,12 @@ TradeAnim_SentToOTText: .Text_WasSentTo: ; was sent to @ . text_far UnknownText_0x1bc6e9 - db "@" + text_end .Text_MonName: ; text_far UnknownText_0x1bc701 - db "@" + text_end TradeAnim_OTBidsFarewell: ld hl, .Text_BidsFarewellToMon @@ -1212,12 +1212,12 @@ TradeAnim_OTBidsFarewell: .Text_BidsFarewellToMon: ; bids farewell to text_far UnknownText_0x1bc703 - db "@" + text_end .Text_MonName: ; . text_far UnknownText_0x1bc719 - db "@" + text_end TradeAnim_TakeCareOfText: call WaitTop @@ -1235,7 +1235,7 @@ TradeAnim_TakeCareOfText: .Text_TakeGoodCareOfMon: ; Take good care of @ . text_far UnknownText_0x1bc71f - db "@" + text_end TradeAnim_OTSendsText1: ld hl, .Text_ForYourMon @@ -1252,12 +1252,12 @@ TradeAnim_OTSendsText1: .Text_ForYourMon: ; For @ 's @ , text_far UnknownText_0x1bc739 - db "@" + text_end .Text_OTSends: ; sends @ . text_far UnknownText_0x1bc74c - db "@" + text_end TradeAnim_OTSendsText2: ld hl, .Text_WillTrade @@ -1274,12 +1274,12 @@ TradeAnim_OTSendsText2: .Text_WillTrade: ; will trade @ @ text_far UnknownText_0x1bc75e - db "@" + text_end .Text_ForYourMon: ; for @ 's @ . text_far UnknownText_0x1bc774 - db "@" + text_end TradeAnim_Wait80Frames: ld c, 80 diff --git a/engine/overworld/decorations.asm b/engine/overworld/decorations.asm index 6eacb0e00..74abf56ee 100644 --- a/engine/overworld/decorations.asm +++ b/engine/overworld/decorations.asm @@ -385,7 +385,7 @@ PopulateDecoCategoryMenu: .Text_nothing_to_choose: ; There's nothing to choose. text_far UnknownText_0x1bc471 - db "@" + text_end .NonscrollingMenuHeader: db MENU_BACKUP_TILES ; flags @@ -807,7 +807,7 @@ DecoAction_SetItUp_Ornament: UnknownText_0x26e41: ; Which side do you want to put it on? text_far UnknownText_0x1bc48c - db "@" + text_end DecoAction_PutItAway_Ornament: ld a, [wSelectedDecoration] @@ -833,7 +833,7 @@ DecoAction_PutItAway_Ornament: DecoText_WhichSide: ; Which side do you want to put away? text_far UnknownText_0x1bc4b2 - db "@" + text_end DecoAction_AskWhichSide: call MenuTextBox @@ -886,27 +886,27 @@ MenuData_0x26eb3: DecoText_PutAwayTheDeco: ; Put away the @ . text_far UnknownText_0x1bc4d7 - db "@" + text_end DecoText_NothingToPutAway: ; There's nothing to put away. text_far UnknownText_0x1bc4ec - db "@" + text_end DecoText_SetUpTheDeco: ; Set up the @ . text_far UnknownText_0x1bc509 - db "@" + text_end DecoText_PutAwayAndSetUp: ; Put away the @ and set up the @ . text_far UnknownText_0x1bc51c - db "@" + text_end DecoText_AlreadySetUp: ; That's already set up. text_far UnknownText_0x1bc546 - db "@" + text_end GetDecorationName_c_de: ld a, c @@ -1014,7 +1014,7 @@ DecorationDesc_TownMapPoster: .TownMapText: ; It's the TOWN MAP. text_far UnknownText_0x1bc55d - db "@" + text_end DecorationDesc_PikachuPoster: jumptext .PikaPosterText @@ -1022,7 +1022,7 @@ DecorationDesc_PikachuPoster: .PikaPosterText: ; It's a poster of a cute PIKACHU. text_far UnknownText_0x1bc570 - db "@" + text_end DecorationDesc_ClefairyPoster: jumptext .ClefairyPosterText @@ -1030,7 +1030,7 @@ DecorationDesc_ClefairyPoster: .ClefairyPosterText: ; It's a poster of a cute CLEFAIRY. text_far UnknownText_0x1bc591 - db "@" + text_end DecorationDesc_JigglypuffPoster: jumptext .JigglypuffPosterText @@ -1038,7 +1038,7 @@ DecorationDesc_JigglypuffPoster: .JigglypuffPosterText: ; It's a poster of a cute JIGGLYPUFF. text_far UnknownText_0x1bc5b3 - db "@" + text_end DecorationDesc_NullPoster: end @@ -1069,7 +1069,7 @@ DecorationDesc_OrnamentOrConsole: .OrnamentConsoleText: ; It's an adorable @ . text_far UnknownText_0x1bc5d7 - db "@" + text_end DecorationDesc_GiantOrnament: ld b, BANK(.BigDollScript) @@ -1082,7 +1082,7 @@ DecorationDesc_GiantOrnament: .BigDollText: ; A giant doll! It's fluffy and cuddly. text_far UnknownText_0x1bc5ef - db "@" + text_end ToggleMaptileDecorations: ; tile coordinates work the same way as for changeblock diff --git a/engine/overworld/scripting.asm b/engine/overworld/scripting.asm index 0e36c30e2..5b72bd83d 100644 --- a/engine/overworld/scripting.asm +++ b/engine/overworld/scripting.asm @@ -537,7 +537,7 @@ GiveItemScript: ReceivedItemText: text_far UnknownText_0x1c4719 - db "@" + text_end Script_verbosegiveitem2: ; script command 0x9f @@ -629,11 +629,11 @@ CurItemName: PutItemInPocketText: text_far UnknownText_0x1c472c - db "@" + text_end PocketIsFullText: text_far UnknownText_0x1c474b - db "@" + text_end Script_pokemart: ; script command 0x94 diff --git a/engine/overworld/select_menu.asm b/engine/overworld/select_menu.asm index 46c207ae7..9cc2ba149 100644 --- a/engine/overworld/select_menu.asm +++ b/engine/overworld/select_menu.asm @@ -13,7 +13,7 @@ SelectMenu:: ItemMayBeRegisteredText: text_far UnknownText_0x1c1cf3 - db "@" + text_end CheckRegisteredItem: ld a, [wWhichRegisteredItem] diff --git a/engine/overworld/wildmons.asm b/engine/overworld/wildmons.asm index ea92b3fa5..ad4a2a02d 100644 --- a/engine/overworld/wildmons.asm +++ b/engine/overworld/wildmons.asm @@ -835,7 +835,7 @@ RandomUnseenWildMon: .SawRareMonText: ; I just saw some rare @ in @ . I'll call you if I see another rare #MON, OK? text_far UnknownText_0x1bd34b - db "@" + text_end RandomPhoneWildMon: farcall GetCallerLocation diff --git a/engine/phone/phone.asm b/engine/phone/phone.asm index 769ed513d..380c25c70 100644 --- a/engine/phone/phone.asm +++ b/engine/phone/phone.asm @@ -417,7 +417,7 @@ WrongNumber: .text ; Huh? Sorry, wrong number! text_far UnknownText_0x1c5565 - db "@" + text_end Script_ReceivePhoneCall: refreshscreen @@ -542,7 +542,7 @@ HangUp_Beep: UnknownText_0x9032a: text_far UnknownText_0x1c5580 - db "@" + text_end HangUp_BoopOn: ld hl, UnknownText_0x90336 @@ -551,7 +551,7 @@ HangUp_BoopOn: UnknownText_0x90336: text_far UnknownText_0x1c5588 - db "@" + text_end HangUp_BoopOff: call SpeechTextBox @@ -711,7 +711,7 @@ UnknownScript_0x90657: UnknownText_0x9065b: ; That number is out of the area. text_far UnknownText_0x1c558b - db "@" + text_end PhoneScript_JustTalkToThem: writetext UnknownText_0x90664 @@ -720,7 +720,7 @@ PhoneScript_JustTalkToThem: UnknownText_0x90664: ; Just go talk to that person! text_far UnknownText_0x1c55ac - db "@" + text_end UnknownScript_0x90669: writetext UnknownText_0x9066d @@ -729,4 +729,4 @@ UnknownScript_0x90669: UnknownText_0x9066d: ; Thank you! text_far UnknownText_0x1c55ca - db "@" + text_end diff --git a/engine/pokedex/pokedex.asm b/engine/pokedex/pokedex.asm index 77d678e0b..87a2438ab 100644 --- a/engine/pokedex/pokedex.asm +++ b/engine/pokedex/pokedex.asm @@ -1204,7 +1204,7 @@ Pokedex_DrawOptionScreenBG: db "NEW #DEX MODE" next "OLD #DEX MODE" next "A to Z MODE" - db "@" + db "@" .UnownMode: db "UNOWN MODE@" diff --git a/engine/pokegear/pokegear.asm b/engine/pokegear/pokegear.asm index e8471fa1b..8281dd468 100644 --- a/engine/pokegear/pokegear.asm +++ b/engine/pokegear/pokegear.asm @@ -533,7 +533,7 @@ Pokegear_UpdateClock: .DayText: text_far UnknownText_0x1c5821 - db "@" + text_end PokegearMap_CheckRegion: ld a, [wPokegearMapPlayerIconLandmark] @@ -937,12 +937,12 @@ PokegearPhone_MakePhoneCall: .dotdotdot ; text_far UnknownText_0x1c5824 - db "@" + text_end .OutOfServiceArea: ; You're out of the service area. text_far UnknownText_0x1c5827 - db "@" + text_end PokegearPhone_FinishPhoneCall: ldh a, [hJoyPressed] @@ -1354,17 +1354,17 @@ Pokegear_LoadTilemapRLE: PokegearText_WhomToCall: ; Whom do you want to call? text_far UnknownText_0x1c5847 - db "@" + text_end PokegearText_PressAnyButtonToExit: ; Press any button to exit. text_far UnknownText_0x1c5862 - db "@" + text_end PokegearText_DeleteStoredNumber: ; Delete this stored phone number? text_far UnknownText_0x1c587d - db "@" + text_end PokegearSpritesGFX: INCBIN "gfx/pokegear/pokegear_sprites.2bpp.lz" diff --git a/engine/pokegear/radio.asm b/engine/pokegear/radio.asm index 52bfc67d0..64a566630 100644 --- a/engine/pokegear/radio.asm +++ b/engine/pokegear/radio.asm @@ -306,32 +306,32 @@ OaksPKMNTalk6: OPT_IntroText1: ; MARY: PROF.OAK'S text_far _OPT_IntroText1 - db "@" + text_end OPT_IntroText2: ; #MON TALK! text_far _OPT_IntroText2 - db "@" + text_end OPT_IntroText3: ; With me, MARY! text_far _OPT_IntroText3 - db "@" + text_end OPT_OakText1: ; OAK: @ @ text_far _OPT_OakText1 - db "@" + text_end OPT_OakText2: ; may be seen around text_far _OPT_OakText2 - db "@" + text_end OPT_OakText3: ; @ . text_far _OPT_OakText3 - db "@" + text_end OaksPKMNTalk7: ld a, [wCurPartySpecies] @@ -344,7 +344,7 @@ OaksPKMNTalk7: OPT_MaryText1: ; MARY: @ 's text_far _OPT_MaryText1 - db "@" + text_end OaksPKMNTalk8: ; 0-15 are all valid indexes into .Adverbs, @@ -384,82 +384,82 @@ OaksPKMNTalk8: .sweetadorably ; sweet and adorably text_far OPT_SweetAdorably - db "@" + text_end .wigglyslickly ; wiggly and slickly text_far OPT_WigglySlickly - db "@" + text_end .aptlynamed ; aptly named and text_far OPT_AptlyNamed - db "@" + text_end .undeniablykindof ; undeniably kind of text_far OPT_UndeniablyKindOf - db "@" + text_end .unbearably ; so, so unbearably text_far OPT_Unbearably - db "@" + text_end .wowimpressively ; wow, impressively text_far OPT_WowImpressively - db "@" + text_end .almostpoisonously ; almost poisonously text_far OPT_AlmostPoisonously - db "@" + text_end .sensually ; ooh, so sensually text_far OPT_Sensually - db "@" + text_end .mischievously ; so mischievously text_far OPT_Mischievously - db "@" + text_end .topically ; so very topically text_far OPT_Topically - db "@" + text_end .addictively ; sure addictively text_far OPT_Addictively - db "@" + text_end .looksinwater ; looks in water is text_far OPT_LooksInWater - db "@" + text_end .evolutionmustbe ; evolution must be text_far OPT_EvolutionMustBe - db "@" + text_end .provocatively ; provocatively text_far OPT_Provocatively - db "@" + text_end .flippedout ; so flipped out and text_far OPT_FlippedOut - db "@" + text_end .heartmeltingly ; heart-meltingly text_far OPT_HeartMeltingly - db "@" + text_end OaksPKMNTalk9: ; 0-15 are all valid indexes into .Adjectives, @@ -507,82 +507,82 @@ OaksPKMNTalk9: .cute ; cute. text_far OPT_Cute - db "@" + text_end .weird ; weird. text_far OPT_Weird - db "@" + text_end .pleasant ; pleasant. text_far OPT_Pleasant - db "@" + text_end .boldsortof ; bold, sort of. text_far OPT_BoldSortOf - db "@" + text_end .frightening ; frightening. text_far OPT_Frightening - db "@" + text_end .suavedebonair ; suave & debonair! text_far OPT_SuaveDebonair - db "@" + text_end .powerful ; powerful. text_far OPT_Powerful - db "@" + text_end .exciting ; exciting. text_far OPT_Exciting - db "@" + text_end .groovy ; groovy! text_far OPT_Groovy - db "@" + text_end .inspiring ; inspiring. text_far OPT_Inspiring - db "@" + text_end .friendly ; friendly. text_far OPT_Friendly - db "@" + text_end .hothothot ; hot, hot, hot! text_far OPT_HotHotHot - db "@" + text_end .stimulating ; stimulating. text_far OPT_Stimulating - db "@" + text_end .guarded ; guarded. text_far OPT_Guarded - db "@" + text_end .lovely ; lovely. text_far OPT_Lovely - db "@" + text_end .speedy ; speedy. text_far OPT_Speedy - db "@" + text_end OaksPKMNTalk10: farcall RadioMusicRestartPokemonChannel @@ -600,10 +600,10 @@ OaksPKMNTalk10: OPT_PokemonChannelText: ; #MON text_far _OPT_PokemonChannelText - db "@" + text_end OPT_RestartText: - db "@" + text_end OaksPKMNTalk11: ld hl, wRadioTextDelay @@ -850,7 +850,7 @@ CopyDexEntryPart2: PokedexShowText: ; @ @ text_far _PokedexShowText - db "@" + text_end BenMonMusic1: call StartPokemonMusicChannel @@ -922,52 +922,52 @@ StartPokemonMusicChannel: BenIntroText1: ; BEN: #MON MUSIC text_far _BenIntroText1 - db "@" + text_end BenIntroText2: ; CHANNEL! text_far _BenIntroText2 - db "@" + text_end BenIntroText3: ; It's me, DJ BEN! text_far _BenIntroText3 - db "@" + text_end FernIntroText1: ; FERN: #MUSIC! text_far _FernIntroText1 - db "@" + text_end FernIntroMusic2: ; With DJ FERN! text_far _FernIntroText2 - db "@" + text_end BenFernText1: ; Today's @ , text_far _BenFernText1 - db "@" + text_end BenFernText2A: ; so let us jam to text_far _BenFernText2A - db "@" + text_end BenFernText2B: ; so chill out to text_far _BenFernText2B - db "@" + text_end BenFernText3A: ; #MON March! text_far _BenFernText3A - db "@" + text_end BenFernText3B: ; #MON Lullaby! text_far _BenFernText3B - db "@" + text_end LuckyNumberShow1: call StartRadioStation @@ -1063,67 +1063,67 @@ LuckyNumberShow15: LC_Text1: ; REED: Yeehaw! How text_far _LC_Text1 - db "@" + text_end LC_Text2: ; y'all doin' now? text_far _LC_Text2 - db "@" + text_end LC_Text3: ; Whether you're up text_far _LC_Text3 - db "@" + text_end LC_Text4: ; or way down low, text_far _LC_Text4 - db "@" + text_end LC_Text5: ; don't you miss the text_far _LC_Text5 - db "@" + text_end LC_Text6: ; LUCKY NUMBER SHOW! text_far _LC_Text6 - db "@" + text_end LC_Text7: ; This week's Lucky text_far _LC_Text7 - db "@" + text_end LC_Text8: ; Number is @ ! text_far _LC_Text8 - db "@" + text_end LC_Text9: ; I'll repeat that! text_far _LC_Text9 - db "@" + text_end LC_Text10: ; Match it and go to text_far _LC_Text10 - db "@" + text_end LC_Text11: ; the RADIO TOWER! text_far _LC_Text11 - db "@" + text_end LC_DragText1: ; …Repeating myself text_far _LC_DragText1 - db "@" + text_end LC_DragText2: ; gets to be a drag… text_far _LC_DragText2 - db "@" + text_end PeoplePlaces1: call StartRadioStation @@ -1149,17 +1149,17 @@ PeoplePlaces3: PnP_Text1: ; PLACES AND PEOPLE! text_far _PnP_Text1 - db "@" + text_end PnP_Text2: ; Brought to you by text_far _PnP_Text2 - db "@" + text_end PnP_Text3: ; me, DJ LILY! text_far _PnP_Text3 - db "@" + text_end PeoplePlaces4: ; People call Random @@ -1201,7 +1201,7 @@ INCLUDE "data/radio/pnp_hidden_people.asm" PnP_Text4: ; @ @ @ text_far _PnP_Text4 - db "@" + text_end PeoplePlaces5: ; 0-15 are all valid indexes into .Adjectives, @@ -1250,82 +1250,82 @@ PeoplePlaces5: PnP_cute: ; is cute. text_far _PnP_cute - db "@" + text_end PnP_lazy: ; is sort of lazy. text_far _PnP_lazy - db "@" + text_end PnP_happy: ; is always happy. text_far _PnP_happy - db "@" + text_end PnP_noisy: ; is quite noisy. text_far _PnP_noisy - db "@" + text_end PnP_precocious: ; is precocious. text_far _PnP_precocious - db "@" + text_end PnP_bold: ; is somewhat bold. text_far _PnP_bold - db "@" + text_end PnP_picky: ; is too picky! text_far _PnP_picky - db "@" + text_end PnP_sortofok: ; is sort of OK. text_far _PnP_sortofok - db "@" + text_end PnP_soso: ; is just so-so. text_far _PnP_soso - db "@" + text_end PnP_great: ; is actually great. text_far _PnP_great - db "@" + text_end PnP_mytype: ; is just my type. text_far _PnP_mytype - db "@" + text_end PnP_cool: ; is so cool, no? text_far _PnP_cool - db "@" + text_end PnP_inspiring: ; is inspiring! text_far _PnP_inspiring - db "@" + text_end PnP_weird: ; is kind of weird. text_far _PnP_weird - db "@" + text_end PnP_rightforme: ; is right for me? text_far _PnP_rightforme - db "@" + text_end PnP_odd: ; is definitely odd! text_far _PnP_odd - db "@" + text_end PeoplePlaces6: ; Places call Random @@ -1351,7 +1351,7 @@ INCLUDE "data/radio/pnp_hidden_places.asm" PnP_Text5: ; @ @ text_far _PnP_Text5 - db "@" + text_end PeoplePlaces7: ; 0-15 are all valid indexes into .Adjectives, @@ -1452,52 +1452,52 @@ RocketRadio10: RocketRadioText1: ; … …Ahem, we are text_far _RocketRadioText1 - db "@" + text_end RocketRadioText2: ; TEAM ROCKET! text_far _RocketRadioText2 - db "@" + text_end RocketRadioText3: ; After three years text_far _RocketRadioText3 - db "@" + text_end RocketRadioText4: ; of preparation, we text_far _RocketRadioText4 - db "@" + text_end RocketRadioText5: ; have risen again text_far _RocketRadioText5 - db "@" + text_end RocketRadioText6: ; from the ashes! text_far _RocketRadioText6 - db "@" + text_end RocketRadioText7: ; GIOVANNI! @ Can you text_far _RocketRadioText7 - db "@" + text_end RocketRadioText8: ; hear?@ We did it! text_far _RocketRadioText8 - db "@" + text_end RocketRadioText9: ; @ Where is our boss? text_far _RocketRadioText9 - db "@" + text_end RocketRadioText10: ; @ Is he listening? text_far _RocketRadioText10 - db "@" + text_end PokeFluteRadio: call StartRadioStation @@ -1809,92 +1809,92 @@ BuenasPasswordChannelName: BuenaRadioText1: ; BUENA: BUENA here! text_far _BuenaRadioText1 - db "@" + text_end BuenaRadioText2: ; Today's password! text_far _BuenaRadioText2 - db "@" + text_end BuenaRadioText3: ; Let me think… It's text_far _BuenaRadioText3 - db "@" + text_end BuenaRadioText4: ; @ ! text_far _BuenaRadioText4 - db "@" + text_end BuenaRadioText5: ; Don't forget it! text_far _BuenaRadioText5 - db "@" + text_end BuenaRadioText6: ; I'm in GOLDENROD's text_far _BuenaRadioText6 - db "@" + text_end BuenaRadioText7: ; RADIO TOWER! text_far _BuenaRadioText7 - db "@" + text_end BuenaRadioMidnightText1: ; BUENA: Oh my… text_far _BuenaRadioMidnightText1 - db "@" + text_end BuenaRadioMidnightText2: ; It's midnight! I text_far _BuenaRadioMidnightText2 - db "@" + text_end BuenaRadioMidnightText3: ; have to shut down! text_far _BuenaRadioMidnightText3 - db "@" + text_end BuenaRadioMidnightText4: ; Thanks for tuning text_far _BuenaRadioMidnightText4 - db "@" + text_end BuenaRadioMidnightText5: ; in to the end! But text_far _BuenaRadioMidnightText5 - db "@" + text_end BuenaRadioMidnightText6: ; don't stay up too text_far _BuenaRadioMidnightText6 - db "@" + text_end BuenaRadioMidnightText7: ; late! Presented to text_far _BuenaRadioMidnightText7 - db "@" + text_end BuenaRadioMidnightText8: ; you by DJ BUENA! text_far _BuenaRadioMidnightText8 - db "@" + text_end BuenaRadioMidnightText9: ; I'm outta here! text_far _BuenaRadioMidnightText9 - db "@" + text_end BuenaRadioMidnightText10: ; … text_far _BuenaRadioMidnightText10 - db "@" + text_end BuenaOffTheAirText: ; text_far _BuenaOffTheAirText - db "@" + text_end CopyRadioTextToRAM: ld a, [hl] diff --git a/engine/pokemon/bills_pc_top.asm b/engine/pokemon/bills_pc_top.asm index 1f8c8390e..a213bc79a 100644 --- a/engine/pokemon/bills_pc_top.asm +++ b/engine/pokemon/bills_pc_top.asm @@ -17,7 +17,7 @@ _BillsPC: .Text_GottaHavePokemon: ; You gotta have #MON to call! text_far UnknownText_0x1c1006 - db "@" + text_end .LogIn: xor a @@ -38,7 +38,7 @@ _BillsPC: .Text_What: ; What? text_far UnknownText_0x1c1024 - db "@" + text_end .LogOut: call CloseSubmenu @@ -131,7 +131,7 @@ BillsPC_MovePKMNMenu: .Text_MonHoldingMail: ; There is a #MON holding MAIL. Please remove the MAIL. text_far UnknownText_0x1c102b - db "@" + text_end BillsPC_DepositMenu: call LoadStandardMenuHeader @@ -166,12 +166,12 @@ Unreferenced_Functione512: .Text_NoMon: ; You don't have a single #MON! text_far UnknownText_0x1c1062 - db "@" + text_end .Text_ItsYourLastMon: ; You can't deposit your last #MON! text_far UnknownText_0x1c1080 - db "@" + text_end CheckCurPartyMonFainted: ld hl, wPartyMon1HP @@ -227,7 +227,7 @@ Unreferenced_Functione56d: UnknownText_0xe57e: ; You can't take any more #MON. text_far UnknownText_0x1c10a2 - db "@" + text_end BillsPC_ChangeBoxMenu: farcall _ChangeBox diff --git a/engine/pokemon/breeding.asm b/engine/pokemon/breeding.asm index 697ed2855..2598ddd3e 100644 --- a/engine/pokemon/breeding.asm +++ b/engine/pokemon/breeding.asm @@ -357,7 +357,7 @@ HatchEggs: .Text_HatchEgg: ; Huh? @ @ text_far UnknownText_0x1c0db0 - start_asm + text_asm ld hl, wVramState res 0, [hl] push hl @@ -379,17 +379,17 @@ HatchEggs: .ClearTextbox: ; text_far UnknownText_0x1c0db8 - db "@" + text_end .CameOutOfItsEgg: ; came out of its EGG!@ @ text_far UnknownText_0x1c0dba - db "@" + text_end .Text_NicknameHatchling: ; Give a nickname to @ ? text_far UnknownText_0x1c0dd8 - db "@" + text_end InitEggMoves: call GetHeritableMoves @@ -896,12 +896,12 @@ DayCareMonCursor: DayCareMon2Text: ; It's @ that was left with the DAY-CARE LADY. text_far UnknownText_0x1c0df3 - db "@" + text_end DayCareMon1Text: ; It's @ that was left with the DAY-CARE MAN. text_far UnknownText_0x1c0e24 - db "@" + text_end DayCareMonCompatibilityText: push bc @@ -931,27 +931,27 @@ DayCareMonCompatibilityText: .AllAlone: ; It's brimming with energy. text_far UnknownText_0x1c0e54 - db "@" + text_end .Incompatible: ; It has no interest in @ . text_far UnknownText_0x1c0e6f - db "@" + text_end .HighCompatibility: ; It appears to care for @ . text_far UnknownText_0x1c0e8d - db "@" + text_end .ModerateCompatibility: ; It's friendly with @ . text_far UnknownText_0x1c0eac - db "@" + text_end .SlightCompatibility: ; It shows interest in @ . text_far UnknownText_0x1c0ec6 - db "@" + text_end Unreferenced_DayCareMonPrintEmptyString: ld hl, .string diff --git a/engine/pokemon/caught_data.asm b/engine/pokemon/caught_data.asm index 3d232c7c1..fe34f197d 100644 --- a/engine/pokemon/caught_data.asm +++ b/engine/pokemon/caught_data.asm @@ -159,7 +159,7 @@ GiveANickname_YesNo: TextJump_GiveANickname: ; Give a nickname to the @ you received? text_far UnknownText_0x1c12fc - db "@" + text_end SetCaughtData: ld a, [wPartyCount] diff --git a/engine/pokemon/evolve.asm b/engine/pokemon/evolve.asm index d026b33f0..9b6dd4cb5 100644 --- a/engine/pokemon/evolve.asm +++ b/engine/pokemon/evolve.asm @@ -397,22 +397,22 @@ IsMonHoldingEverstone: Text_CongratulationsYourPokemon: ; Congratulations! Your @ @ text_far UnknownText_0x1c4b92 - db "@" + text_end Text_EvolvedIntoPKMN: ; evolved into @ ! text_far UnknownText_0x1c4baf - db "@" + text_end Text_StoppedEvolving: ; Huh? @ stopped evolving! text_far UnknownText_0x1c4bc5 - db "@" + text_end Text_WhatEvolving: ; What? @ is evolving! text_far UnknownText_0x1c4be3 - db "@" + text_end LearnLevelMoves: ld a, [wTempSpecies] diff --git a/engine/pokemon/knows_move.asm b/engine/pokemon/knows_move.asm index 85ae3f032..523d13968 100644 --- a/engine/pokemon/knows_move.asm +++ b/engine/pokemon/knows_move.asm @@ -22,4 +22,4 @@ KnowsMove: .Text_knows: ; knows @ . text_far UnknownText_0x1c5ea8 - db "@" + text_end diff --git a/engine/pokemon/learn.asm b/engine/pokemon/learn.asm index dfeb7f97f..55e673ecc 100644 --- a/engine/pokemon/learn.asm +++ b/engine/pokemon/learn.asm @@ -203,32 +203,32 @@ ForgetMove: Text_LearnedMove: ; <MON> learned <MOVE>! text_far UnknownText_0x1c5660 - db "@" + text_end Text_ForgetWhich: ; Which move should be forgotten? text_far UnknownText_0x1c5678 - db "@" + text_end Text_StopLearning: ; Stop learning <MOVE>? text_far UnknownText_0x1c5699 - db "@" + text_end Text_DidNotLearn: ; <MON> did not learn <MOVE>. text_far UnknownText_0x1c56af - db "@" + text_end Text_TryingToLearn: ; <MON> is trying to learn <MOVE>. But <MON> can't learn more than ; four moves. Delete an older move to make room for <MOVE>? text_far UnknownText_0x1c56c9 - db "@" + text_end Text_1_2_and_Poof: text_far UnknownText_0x1c5740 ; 1, 2 and… - start_asm + text_asm push de ld de, SFX_SWITCH_POKEMON call PlaySFX @@ -239,9 +239,9 @@ Text_1_2_and_Poof: .PoofForgot: ; Poof! <MON> forgot <MOVE>. And… text_far UnknownText_0x1c574e - db "@" + text_end Text_CantForgetHM: ; HM moves can't be forgotten now. text_far UnknownText_0x1c5772 - db "@" + text_end diff --git a/engine/pokemon/mail.asm b/engine/pokemon/mail.asm index 6576153dc..91026d2a2 100644 --- a/engine/pokemon/mail.asm +++ b/engine/pokemon/mail.asm @@ -311,7 +311,7 @@ _PlayerMailBoxMenu: .EmptyMailboxText: text_far _EmptyMailboxText - db "@" + text_end InitMail: ; initialize wMailboxCount and beyond with incrementing values, one per mail @@ -454,15 +454,15 @@ MailboxPC: .PutAwayText: text_far ClearedMailPutAwayText - db "@" + text_end .PackFullText: text_far MailPackFullText - db "@" + text_end .MessageLostText: text_far MailMessageLostText - db "@" + text_end .GetMailType: push af @@ -522,15 +522,15 @@ MailboxPC: .HoldingMailText: text_far MailAlreadyHoldingItemText - db "@" + text_end .EggText: text_far MailEggText - db "@" + text_end .MailMovedText: text_far MailMovedFromBoxText - db "@" + text_end .Cancel: ret diff --git a/engine/pokemon/mon_menu.asm b/engine/pokemon/mon_menu.asm index 9f982277f..0d71412b6 100644 --- a/engine/pokemon/mon_menu.asm +++ b/engine/pokemon/mon_menu.asm @@ -64,17 +64,17 @@ TossItemFromPC: .TossHowMany: ; Toss out how many @ (S)? text_far UnknownText_0x1c1a90 - db "@" + text_end .ConfirmToss: ; Throw away @ @ (S)? text_far UnknownText_0x1c1aad - db "@" + text_end .TossedThisMany: ; Discarded @ (S). text_far UnknownText_0x1c1aca - db "@" + text_end .CantToss: ld hl, .TooImportantToToss @@ -84,7 +84,7 @@ TossItemFromPC: .TooImportantToToss: ; That's too impor- tant to toss out! text_far UnknownText_0x1c1adf - db "@" + text_end CantUseItem: ld hl, CantUseItemText @@ -93,7 +93,7 @@ CantUseItem: CantUseItemText: text_far UnknownText_0x1c1b03 - db "@" + text_end PartyMonItemName: ld a, [wCurItem] @@ -392,35 +392,35 @@ GiveTakeItemMenuData: TookAndMadeHoldText: text_far UnknownText_0x1c1b2c - db "@" + text_end MadeHoldText: text_far UnknownText_0x1c1b57 - db "@" + text_end PleaseRemoveMailText: text_far UnknownText_0x1c1b6f - db "@" + text_end IsntHoldingAnythingText: text_far UnknownText_0x1c1b8e - db "@" + text_end ItemStorageIsFullText: text_far UnknownText_0x1c1baa - db "@" + text_end TookFromText: text_far UnknownText_0x1c1bc4 - db "@" + text_end SwitchAlreadyHoldingText: text_far UnknownText_0x1c1bdc - db "@" + text_end CantBeHeldText: text_far UnknownText_0x1c1c09 - db "@" + text_end GetPartyItemLocation: push af @@ -563,32 +563,32 @@ MonMailAction: .mailwilllosemessagetext ; The MAIL will lose its message. OK? text_far UnknownText_0x1c1c22 - db "@" + text_end .tookmailfrommontext ; MAIL detached from <POKEMON>. text_far UnknownText_0x1c1c47 - db "@" + text_end .bagfulltext ; There's no space for removing MAIL. text_far UnknownText_0x1c1c62 - db "@" + text_end .sendmailtopctext ; Send the removed MAIL to your PC? text_far UnknownText_0x1c1c86 - db "@" + text_end .mailboxfulltext ; Your PC's MAILBOX is full. text_far UnknownText_0x1c1ca9 - db "@" + text_end .sentmailtopctext ; The MAIL was sent to your PC. text_far UnknownText_0x1c1cc4 - db "@" + text_end OpenPartyStats: call LoadStandardMenuHeader @@ -750,7 +750,7 @@ MonMenu_Softboiled_MilkDrink: .Text_NotEnoughHP: ; Not enough HP! text_far UnknownText_0x1c1ce3 - db "@" + text_end .CheckMonHasEnoughHP: ; Need to have at least (MaxHP / 5) HP left. diff --git a/engine/pokemon/move_mon.asm b/engine/pokemon/move_mon.asm index e6e108516..9ed86447a 100644 --- a/engine/pokemon/move_mon.asm +++ b/engine/pokemon/move_mon.asm @@ -1801,7 +1801,7 @@ GivePoke:: TextJump_WasSentToBillsPC: ; was sent to BILL's PC. text_far Text_WasSentToBillsPC - db "@" + text_end InitNickname: push de diff --git a/engine/pokemon/party_menu.asm b/engine/pokemon/party_menu.asm index ebc75e1b2..617039db8 100644 --- a/engine/pokemon/party_menu.asm +++ b/engine/pokemon/party_menu.asm @@ -806,52 +806,52 @@ PrintPartyMenuActionText: .Text_RecoveredSomeHP: ; recovered @ HP! text_far UnknownText_0x1bc0a2 - db "@" + text_end .Text_CuredOfPoison: ; 's cured of poison. text_far UnknownText_0x1bc0bb - db "@" + text_end .Text_RidOfParalysis: ; 's rid of paralysis. text_far UnknownText_0x1bc0d2 - db "@" + text_end .Text_BurnWasHealed: ; 's burn was healed. text_far UnknownText_0x1bc0ea - db "@" + text_end .Text_Defrosted: ; was defrosted. text_far UnknownText_0x1bc101 - db "@" + text_end .Text_WokeUp: ; woke up. text_far UnknownText_0x1bc115 - db "@" + text_end .Text_HealthReturned: ; 's health returned. text_far UnknownText_0x1bc123 - db "@" + text_end .Text_Revitalized: ; is revitalized. text_far UnknownText_0x1bc13a - db "@" + text_end .Text_GrewToLevel: ; grew to level @ !@ @ text_far UnknownText_0x1bc14f - db "@" + text_end .Text_CameToItsSenses: ; came to its senses. text_far UnknownText_0x1bc16e - db "@" + text_end .PrintText: ld e, a diff --git a/engine/rtc/reset_password.asm b/engine/rtc/reset_password.asm index 3b4f242d4..0992f0bca 100644 --- a/engine/rtc/reset_password.asm +++ b/engine/rtc/reset_password.asm @@ -34,17 +34,17 @@ _ResetClock: .text_okay ; Password OK. Select CONTINUE & reset settings. text_far UnknownText_0x1c55db - db "@" + text_end .text_wrong ; Wrong password! text_far UnknownText_0x1c560b - db "@" + text_end .text_askreset ; Reset the clock? text_far UnknownText_0x1c561c - db "@" + text_end .NoYes_MenuHeader: db 0 ; flags @@ -104,7 +104,7 @@ ClockResetPassword: .pleaseenterpasswordtext ; Please enter the password. text_far UnknownText_0x1c562e - db "@" + text_end .updateIDdisplay hlcoord 14, 15 diff --git a/engine/rtc/restart_clock.asm b/engine/rtc/restart_clock.asm index b65550f43..f3d8ebdae 100644 --- a/engine/rtc/restart_clock.asm +++ b/engine/rtc/restart_clock.asm @@ -50,12 +50,12 @@ RestartClock: .Text_ClockTimeMayBeWrong: ; The clock's time may be wrong. Please reset the time. text_far UnknownText_0x1c40e6 - db "@" + text_end .Text_SetWithControlPad: ; Set with the Control Pad. Confirm: A Button Cancel: B Button text_far UnknownText_0x1c411c - db "@" + text_end .SetClock: ld a, 1 @@ -104,12 +104,12 @@ RestartClock: .Text_IsThisOK: ; Is this OK? text_far UnknownText_0x1c415b - db "@" + text_end .Text_ClockReset: ; The clock has been reset. text_far UnknownText_0x1c4168 - db "@" + text_end .joy_loop call JoyTextDelay_ForcehJoyDown diff --git a/engine/rtc/timeset.asm b/engine/rtc/timeset.asm index 9ceac6c83..366dd2460 100644 --- a/engine/rtc/timeset.asm +++ b/engine/rtc/timeset.asm @@ -292,12 +292,12 @@ PrintTwoDigitNumberRightAlign: Text_WokeUpOak: ; Zzz… Hm? Wha…? You woke me up! Will you check the clock for me? text_far UnknownText_0x1bc29c - db "@" + text_end Text_WhatTimeIsIt: ; What time is it? text_far UnknownText_0x1bc2eb - db "@" + text_end String_oclock: db "o'clock@" @@ -305,7 +305,7 @@ String_oclock: Text_WhatHrs: ; What?@ @ text_far UnknownText_0x1bc2fd - start_asm + text_asm hlcoord 1, 16 call DisplayHourOClock ld hl, .QuestionMark @@ -314,12 +314,12 @@ Text_WhatHrs: .QuestionMark: ; ? text_far UnknownText_0x1bc305 - db "@" + text_end Text_HowManyMinutes: ; How many minutes? text_far UnknownText_0x1bc308 - db "@" + text_end String_min: db "min.@" @@ -327,7 +327,7 @@ String_min: Text_WhoaMins: ; Whoa!@ @ text_far UnknownText_0x1bc31b - start_asm + text_asm hlcoord 7, 14 call DisplayMinutesWithMinString ld hl, .QuestionMark @@ -336,10 +336,10 @@ Text_WhoaMins: .QuestionMark: ; ? text_far UnknownText_0x1bc323 - db "@" + text_end OakText_ResponseToSetTime: - start_asm + text_asm decoord 1, 14 ld a, [wInitHourBuffer] ld c, a @@ -371,17 +371,17 @@ OakText_ResponseToSetTime: .overslept ; ! I overslept! text_far UnknownText_0x1bc326 - db "@" + text_end .yikes ; ! Yikes! I over- slept! text_far UnknownText_0x1bc336 - db "@" + text_end .sodark ; ! No wonder it's so dark! text_far UnknownText_0x1bc34f - db "@" + text_end TimeSetBackgroundGFX: INCBIN "gfx/new_game/timeset_bg.1bpp" @@ -535,10 +535,10 @@ SetDayOfWeek: .WhatDayIsItText: ; What day is it? text_far UnknownText_0x1bc369 - db "@" + text_end .ConfirmWeekdayText: - start_asm + text_asm hlcoord 1, 14 call .PlaceWeekdayString ld hl, .IsIt @@ -547,7 +547,7 @@ SetDayOfWeek: .IsIt: ; , is it? text_far UnknownText_0x1bc37a - db "@" + text_end InitialSetDSTFlag: ld a, [wDST] @@ -561,7 +561,7 @@ InitialSetDSTFlag: ret .Text: - start_asm + text_asm call UpdateTime ldh a, [hHours] ld b, a @@ -575,7 +575,7 @@ InitialSetDSTFlag: .DSTIsThatOK: ; DST, is that OK? text_far Text_DSTIsThatOK - db "@" + text_end InitialClearDSTFlag: ld a, [wDST] @@ -589,7 +589,7 @@ InitialClearDSTFlag: ret .Text: - start_asm + text_asm call UpdateTime ldh a, [hHours] ld b, a @@ -603,7 +603,7 @@ InitialClearDSTFlag: .IsThatOK: ; , is that OK? text_far UnknownText_0x1c5ff1 - db "@" + text_end DebugDisplayTime: hlcoord 1, 14 @@ -614,7 +614,7 @@ DebugDisplayTime: ret .Text: - start_asm + text_asm call UpdateTime hlcoord 1, 14 |