diff options
Diffstat (limited to 'engine/items')
-rw-r--r-- | engine/items/item_effects.asm | 76 | ||||
-rw-r--r-- | engine/items/mart.asm | 68 | ||||
-rw-r--r-- | engine/items/pack.asm | 24 | ||||
-rw-r--r-- | engine/items/tmhm.asm | 12 |
4 files changed, 90 insertions, 90 deletions
diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm index cdc22a019..f31f7c319 100644 --- a/engine/items/item_effects.asm +++ b/engine/items/item_effects.asm @@ -1063,37 +1063,37 @@ LevelBallMultiplier: Text_RBY_CatchMarowak: ; It dodged the thrown BALL! This #MON can't be caught! - text_jump UnknownText_0x1c5a5a + text_far UnknownText_0x1c5a5a db "@" Text_RBY_NoShake: ; You missed the #MON! - text_jump UnknownText_0x1c5a90 + text_far UnknownText_0x1c5a90 db "@" Text_NoShake: ; Oh no! The #MON broke free! - text_jump UnknownText_0x1c5aa6 + text_far UnknownText_0x1c5aa6 db "@" Text_OneShake: ; Aww! It appeared to be caught! - text_jump UnknownText_0x1c5ac3 + text_far UnknownText_0x1c5ac3 db "@" Text_TwoShakes: ; Aargh! Almost had it! - text_jump UnknownText_0x1c5ae3 + text_far UnknownText_0x1c5ae3 db "@" Text_ThreeShakes: ; Shoot! It was so close too! - text_jump UnknownText_0x1c5afa + text_far UnknownText_0x1c5afa db "@" Text_GotchaMonWasCaught: ; Gotcha! @ was caught!@ @ - text_jump UnknownText_0x1c5b17 + text_far UnknownText_0x1c5b17 start_asm call WaitSFX push bc @@ -1108,22 +1108,22 @@ Text_GotchaMonWasCaught: TextJump_Waitbutton: ; @ - text_jump Text_Waitbutton_2 + text_far Text_Waitbutton_2 db "@" Text_SentToBillsPC: ; was sent to BILL's PC. - text_jump UnknownText_0x1c5b38 + text_far UnknownText_0x1c5b38 db "@" Text_AddedToPokedex: ; 's data was newly added to the #DEX.@ @ - text_jump UnknownText_0x1c5b53 + text_far UnknownText_0x1c5b53 db "@" Text_AskNicknameNewlyCaughtMon: ; Give a nickname to @ ? - text_jump UnknownText_0x1c5b7f + text_far UnknownText_0x1c5b7f db "@" ReturnToBattle_UseBall: @@ -1234,7 +1234,7 @@ RareCandy_StatBooster_ExitMenu: Text_StatRose: ; 's @ rose. - text_jump UnknownText_0x1c5b9a + text_far UnknownText_0x1c5b9a db "@" StatStrings: @@ -2062,7 +2062,7 @@ Softboiled_MilkDrinkFunction: .Text_CantBeUsed: ; That can't be used on this #MON. - text_jump UnknownText_0x1c5bac + text_far UnknownText_0x1c5bac db "@" EscapeRopeEffect: @@ -2098,7 +2098,7 @@ UseRepel: TextJump_RepelUsedEarlierIsStillInEffect: ; The REPEL used earlier is still in effect. - text_jump Text_RepelUsedEarlierIsStillInEffect + text_far Text_RepelUsedEarlierIsStillInEffect db "@" XAccuracyEffect: @@ -2239,17 +2239,17 @@ PokeFluteEffect: .CatchyTune: ; Played the # FLUTE. Now, that's a catchy tune! - text_jump UnknownText_0x1c5bf9 + text_far UnknownText_0x1c5bf9 db "@" .AllSleepingMonWokeUp: ; All sleeping #MON woke up. - text_jump UnknownText_0x1c5c28 + text_far UnknownText_0x1c5c28 db "@" .PlayedTheFlute: ; played the # FLUTE.@ @ - text_jump UnknownText_0x1c5c44 + text_far UnknownText_0x1c5c44 start_asm ld a, [wBattleMode] and a @@ -2269,7 +2269,7 @@ BlueCardEffect: jp MenuTextBoxWaitButton .bluecardtext - text_jump UnknownText_0x1c5c5e + text_far UnknownText_0x1c5c5e db "@" CoinCaseEffect: @@ -2277,7 +2277,7 @@ CoinCaseEffect: jp MenuTextBoxWaitButton .coincasetext - text_jump UnknownText_0x1c5c7b + text_far UnknownText_0x1c5c7b db "@" OldRodEffect: @@ -2532,27 +2532,27 @@ RestorePP: TextJump_RaiseThePPOfWhichMove: ; Raise the PP of which move? - text_jump Text_RaiseThePPOfWhichMove + text_far Text_RaiseThePPOfWhichMove db "@" TextJump_RestoreThePPOfWhichMove: ; Restore the PP of which move? - text_jump Text_RestoreThePPOfWhichMove + text_far Text_RestoreThePPOfWhichMove db "@" TextJump_PPIsMaxedOut: ; 's PP is maxed out. - text_jump Text_PPIsMaxedOut + text_far Text_PPIsMaxedOut db "@" TextJump_PPsIncreased: ; 's PP increased. - text_jump Text_PPsIncreased + text_far Text_PPsIncreased db "@" UnknownText_0xf739: ; PP was restored. - text_jump UnknownText_0x1c5cf1 + text_far UnknownText_0x1c5cf1 db "@" SquirtbottleEffect: @@ -2591,7 +2591,7 @@ OpenBox: .text ; There was a trophy inside! - text_jump UnknownText_0x1c5d03 + text_far UnknownText_0x1c5d03 db "@" NoEffect: @@ -2686,67 +2686,67 @@ CantUseItemMessage: LooksBitterText: ; It looks bitter… - text_jump UnknownText_0x1c5d3e + text_far UnknownText_0x1c5d3e db "@" CantUseOnEggText: ; That can't be used on an EGG. - text_jump UnknownText_0x1c5d50 + text_far UnknownText_0x1c5d50 db "@" IsntTheTimeText: ; OAK: ! This isn't the time to use that! - text_jump UnknownText_0x1c5d6e + text_far UnknownText_0x1c5d6e db "@" BelongsToSomeoneElseText: ; That belongs to someone else! - text_jump UnknownText_0x1c5d97 + text_far UnknownText_0x1c5d97 db "@" WontHaveAnyEffectText: ; It won't have any effect. - text_jump UnknownText_0x1c5db6 + text_far UnknownText_0x1c5db6 db "@" BlockedTheBallText: ; The trainer blocked the BALL! - text_jump UnknownText_0x1c5dd0 + text_far UnknownText_0x1c5dd0 db "@" DontBeAThiefText: ; Don't be a thief! - text_jump UnknownText_0x1c5def + text_far UnknownText_0x1c5def db "@" CyclingIsntAllowedText: ; Cycling isn't allowed here. - text_jump UnknownText_0x1c5e01 + text_far UnknownText_0x1c5e01 db "@" CantGetOnYourBikeText: ; Can't get on your @ now. - text_jump UnknownText_0x1c5e1d + text_far UnknownText_0x1c5e1d db "@" Ball_BoxIsFullText: ; The #MON BOX is full. That can't be used now. - text_jump UnknownText_0x1c5e3a + text_far UnknownText_0x1c5e3a db "@" UsedItemText: ; used the@ . - text_jump UnknownText_0x1c5e68 + text_far UnknownText_0x1c5e68 db "@" GotOnTheItemText: ; got on the@ . - text_jump UnknownText_0x1c5e7b + text_far UnknownText_0x1c5e7b db "@" GotOffTheItemText: ; got off@ the @ . - text_jump UnknownText_0x1c5e90 + text_far UnknownText_0x1c5e90 db "@" ApplyPPUp: diff --git a/engine/items/mart.asm b/engine/items/mart.asm index 94e3376a2..d7abf1eb4 100644 --- a/engine/items/mart.asm +++ b/engine/items/mart.asm @@ -581,12 +581,12 @@ RooftopSaleAskPurchaseQuantity: Text_Mart_HowMany: ; How many? - text_jump UnknownText_0x1c4bfd + text_far UnknownText_0x1c4bfd db "@" Text_Mart_CostsThisMuch: ; @ (S) will be ¥@ . - text_jump UnknownText_0x1c4c08 + text_far UnknownText_0x1c4c08 db "@" MenuHeader_Buy: @@ -624,107 +624,107 @@ MenuHeader_Buy: Text_HerbShop_Intro: ; Hello, dear. I sell inexpensive herbal medicine. They're good, but a trifle bitter. Your #MON may not like them. Hehehehe… - text_jump UnknownText_0x1c4c28 + text_far UnknownText_0x1c4c28 db "@" Text_HerbShop_HowMany: ; How many? - text_jump UnknownText_0x1c4ca3 + text_far UnknownText_0x1c4ca3 db "@" Text_HerbShop_CostsThisMuch: ; @ (S) will be ¥@ . - text_jump UnknownText_0x1c4cae + text_far UnknownText_0x1c4cae db "@" Text_HerbShop_HereYouGo: ; Thank you, dear. Hehehehe… - text_jump UnknownText_0x1c4cce + text_far UnknownText_0x1c4cce db "@" Text_HerbShop_BagFull: ; Oh? Your PACK is full, dear. - text_jump UnknownText_0x1c4cea + text_far UnknownText_0x1c4cea db "@" Text_HerbShop_InsufficientFunds: ; Hehehe… You don't have the money. - text_jump UnknownText_0x1c4d08 + text_far UnknownText_0x1c4d08 db "@" Text_HerbShop_ComeAgain: ; Come again, dear. Hehehehe… - text_jump UnknownText_0x1c4d2a + text_far UnknownText_0x1c4d2a db "@" Text_BargainShop_Intro: ; Hiya! Care to see some bargains? I sell rare items that nobody else carries--but only one of each item. - text_jump UnknownText_0x1c4d47 + text_far UnknownText_0x1c4d47 db "@" Text_BargainShop_CostsThisMuch: ; costs ¥@ . Want it? - text_jump UnknownText_0x1c4db0 + text_far UnknownText_0x1c4db0 db "@" Text_BargainShop_HereYouGo: ; Thanks. - text_jump UnknownText_0x1c4dcd + text_far UnknownText_0x1c4dcd db "@" Text_BargainShop_BagFull: ; Uh-oh, your PACK is chock-full. - text_jump UnknownText_0x1c4dd6 + text_far UnknownText_0x1c4dd6 db "@" Text_BargainShop_SoldOut: ; You bought that already. I'm all sold out of it. - text_jump UnknownText_0x1c4df7 + text_far UnknownText_0x1c4df7 db "@" Text_BargainShop_InsufficientFunds: ; Uh-oh, you're short on funds. - text_jump UnknownText_0x1c4e28 + text_far UnknownText_0x1c4e28 db "@" Text_BargainShop_ComeAgain: ; Come by again sometime. - text_jump UnknownText_0x1c4e46 + text_far UnknownText_0x1c4e46 db "@" Text_Pharmacist_Intro: ; What's up? Need some medicine? - text_jump UnknownText_0x1c4e5f + text_far UnknownText_0x1c4e5f db "@" Text_Pharmacy_HowMany: ; How many? - text_jump UnknownText_0x1c4e7e + text_far UnknownText_0x1c4e7e db "@" Text_Pharmacy_CostsThisMuch: ; @ (S) will cost ¥@ . - text_jump UnknownText_0x1c4e89 + text_far UnknownText_0x1c4e89 db "@" Text_Pharmacy_HereYouGo: ; Thanks much! - text_jump UnknownText_0x1c4eab + text_far UnknownText_0x1c4eab db "@" Text_Pharmacy_BagFull: ; You don't have any more space. - text_jump UnknownText_0x1c4eb9 + text_far UnknownText_0x1c4eb9 db "@" Text_Pharmacy_InsufficientFunds: ; Huh? That's not enough money. - text_jump UnknownText_0x1c4ed8 + text_far UnknownText_0x1c4ed8 db "@" Text_Pharmacist_ComeAgain: ; All right. See you around. - text_jump UnknownText_0x1c4ef6 + text_far UnknownText_0x1c4ef6 db "@" SellMenu: @@ -751,7 +751,7 @@ SellMenu: .NothingToSellText: ; You don't have anything to sell. - text_jump UnknownText_0x1c4f12 + text_far UnknownText_0x1c4f12 db "@" .TryToSellItem: @@ -820,12 +820,12 @@ SellMenu: Text_Mart_SellHowMany: ; How many? - text_jump UnknownText_0x1c4f33 + text_far UnknownText_0x1c4f33 db "@" Text_Mart_ICanPayThisMuch: ; I can pay you ¥@ . Is that OK? - text_jump UnknownText_0x1c4f3e + text_far UnknownText_0x1c4f3e db "@" .UnusedString15f7d: @@ -833,7 +833,7 @@ Text_Mart_ICanPayThisMuch: Text_Mart_HowMayIHelpYou: ; Welcome! How may I help you? - text_jump UnknownText_0x1c4f62 + text_far UnknownText_0x1c4f62 db "@" MenuHeader_BuySell: @@ -851,35 +851,35 @@ MenuHeader_BuySell: Text_Mart_HereYouGo: ; Here you are. Thank you! - text_jump UnknownText_0x1c4f80 + text_far UnknownText_0x1c4f80 db "@" Text_Mart_InsufficientFunds: ; You don't have enough money. - text_jump UnknownText_0x1c4f9a + text_far UnknownText_0x1c4f9a db "@" Text_Mart_BagFull: ; You can't carry any more items. - text_jump UnknownText_0x1c4fb7 + text_far UnknownText_0x1c4fb7 db "@" TextMart_CantBuyFromYou: ; Sorry, I can't buy that from you. - text_jump UnknownText_0x1c4fd7 + text_far UnknownText_0x1c4fd7 db "@" Text_Mart_ComeAgain: ; Please come again! - text_jump UnknownText_0x1c4ff9 + text_far UnknownText_0x1c4ff9 db "@" Text_Mart_AnythingElse: - text_jump UnknownText_0x1c500d + text_far UnknownText_0x1c500d db "@" Text_Mart_SoldForAmount: - text_jump UnknownText_0x1c502e + text_far UnknownText_0x1c502e db "@" PlayTransactionSound: diff --git a/engine/items/pack.asm b/engine/items/pack.asm index 9ee425204..6d7fc7e10 100644 --- a/engine/items/pack.asm +++ b/engine/items/pack.asm @@ -616,7 +616,7 @@ GiveItem: ret .Egg: ; An EGG can't hold an item. - text_jump Text_AnEGGCantHoldAnItem + text_far Text_AnEGGCantHoldAnItem db "@" QuitItemSubmenu: @@ -1548,58 +1548,58 @@ PC_Mart_BallsPocketMenuHeader: Text_PackNoItems: ; No items. - text_jump UnknownText_0x1c0b9a + text_far UnknownText_0x1c0b9a db "@" Text_ThrowAwayHowMany: ; Throw away how many? - text_jump UnknownText_0x1c0ba5 + text_far UnknownText_0x1c0ba5 db "@" Text_ConfirmThrowAway: ; Throw away @ @ (S)? - text_jump UnknownText_0x1c0bbb + text_far UnknownText_0x1c0bbb db "@" Text_ThrewAway: ; Threw away @ (S). - text_jump UnknownText_0x1c0bd8 + text_far UnknownText_0x1c0bd8 db "@" Text_ThisIsntTheTime: ; OAK: ! This isn't the time to use that! - text_jump UnknownText_0x1c0bee + text_far UnknownText_0x1c0bee db "@" TextJump_YouDontHaveAMon: ; You don't have a #MON! - text_jump Text_YouDontHaveAMon + text_far Text_YouDontHaveAMon db "@" Text_RegisteredItem: ; Registered the @ . - text_jump UnknownText_0x1c0c2e + text_far UnknownText_0x1c0c2e db "@" Text_CantRegister: ; You can't register that item. - text_jump UnknownText_0x1c0c45 + text_far UnknownText_0x1c0c45 db "@" Text_MoveItemWhere: ; Where should this be moved to? - text_jump UnknownText_0x1c0c63 + text_far UnknownText_0x1c0c63 db "@" Text_PackEmptyString: ; - text_jump UnknownText_0x1c0c83 + text_far UnknownText_0x1c0c83 db "@" TextJump_YouCantUseItInABattle: ; Doesn't seem to be used anywhere ; "You can't use it in a battle." - text_jump Text_YouCantUseItInABattle + text_far Text_YouCantUseItInABattle db "@" PackMenuGFX: diff --git a/engine/items/tmhm.asm b/engine/items/tmhm.asm index c81851def..cf71d8467 100644 --- a/engine/items/tmhm.asm +++ b/engine/items/tmhm.asm @@ -168,22 +168,22 @@ TeachTMHM: Text_BootedTM: ; Booted up a TM. - text_jump UnknownText_0x1c0373 + text_far UnknownText_0x1c0373 db "@" Text_BootedHM: ; Booted up an HM. - text_jump UnknownText_0x1c0384 + text_far UnknownText_0x1c0384 db "@" Text_ItContained: ; It contained @ . Teach @ to a #MON? - text_jump UnknownText_0x1c0396 + text_far UnknownText_0x1c0396 db "@" Text_TMHMNotCompatible: ; is not compatible with @ . It can't learn @ . - text_jump UnknownText_0x1c03c2 + text_far UnknownText_0x1c03c2 db "@" TMHM_PocketLoop: @@ -499,12 +499,12 @@ Unreferenced_Function2cadf: .NoRoomText: ; You have no room for any more @ S. - text_jump UnknownText_0x1c03fa + text_far UnknownText_0x1c03fa db "@" .ReceivedText: ; You received @ ! - text_jump UnknownText_0x1c0421 + text_far UnknownText_0x1c0421 db "@" .CheckHaveRoomForTMHM: |