diff options
Diffstat (limited to 'engine/events')
32 files changed, 371 insertions, 369 deletions
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 |