From 3a6a300da48c98ab844ddc4d209abf51adf2aa44 Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Sun, 12 Jun 2016 10:11:31 -0700 Subject: [PATCH] sync text --- charmap.asm | 8 + constants.asm | 1 + constants/misc_constants.asm | 24 +-- constants/text_constants.asm | 14 ++ engine/gamefreak.asm | 1 - engine/hall_of_fame.asm | 4 +- text.asm | 305 ++++++++++++++-------------- text/maps/bike_shop.asm | 2 +- text/maps/celadon_dept_store_3f.asm | 2 +- text/maps/fan_club.asm | 6 +- text/maps/hall_of_fame.asm | 6 +- text/maps/lance.asm | 2 +- text/maps/museum_1f.asm | 2 +- text/maps/oaks_lab.asm | 64 +++--- text/maps/reds_house_1f.asm | 2 +- text/maps/route_22.asm | 6 +- text/maps/silph_co_11f.asm | 2 +- text/maps/vermilion_city.asm | 6 +- text/oakspeech.asm | 1 - 19 files changed, 238 insertions(+), 220 deletions(-) create mode 100644 constants/text_constants.asm diff --git a/charmap.asm b/charmap.asm index 980c79a3..8f57a130 100644 --- a/charmap.asm +++ b/charmap.asm @@ -147,9 +147,16 @@ charmap "ゅ", $E1 charmap "ょ", $E2 charmap "ー", $E3 +charmap "", $4A ; PkMn charmap "@", $50 +charmap "", $52 +charmap "", $53 charmap "#", $54 ;charmap "POKé", $54 +charmap "", $59 +charmap "", $5A +charmap "′", $71 +charmap "″", $73 charmap "…", $75 charmap "┌", $79 @@ -233,6 +240,7 @@ charmap "'m", $E5 charmap "?", $E6 charmap "!", $E7 charmap ".", $E8 +charmap "▷", $EC charmap "▶", $ED charmap "♂", $EF charmap "¥", $F0 diff --git a/constants.asm b/constants.asm index 8bca86eb..d4e453ec 100644 --- a/constants.asm +++ b/constants.asm @@ -30,3 +30,4 @@ INCLUDE "constants/tilesets.asm" INCLUDE "constants/starter_mons.asm" INCLUDE "constants/event_constants.asm" INCLUDE "constants/event_macros.asm" +INCLUDE "constants/text_constants.asm" diff --git a/constants/misc_constants.asm b/constants/misc_constants.asm index de777c5d..cc10de70 100644 --- a/constants/misc_constants.asm +++ b/constants/misc_constants.asm @@ -29,6 +29,16 @@ D_LEFT EQU %00100000 D_UP EQU %01000000 D_DOWN EQU %10000000 +const_value set 0 + const BIT_A_BUTTON + const BIT_B_BUTTON + const BIT_SELECT + const BIT_START + const BIT_D_RIGHT + const BIT_D_LEFT + const BIT_D_UP + const BIT_D_DOWN + SCREEN_WIDTH EQU 20 SCREEN_HEIGHT EQU 18 @@ -152,20 +162,6 @@ FLAG_RESET EQU 0 FLAG_SET EQU 1 FLAG_TEST EQU 2 -; special text IDs -TEXT_MON_FAINTED EQU $d0 -TEXT_BLACKED_OUT EQU $d1 -TEXT_REPEL_WORE_OFF EQU $d2 -TEXT_SAFARI_GAME_OVER EQU $d3 - -; PrintNumber - -BIT_LEFT_ALIGN EQU 6 -BIT_LEADING_ZEROES EQU 7 - -LEFT_ALIGN EQU (1 << BIT_LEFT_ALIGN) -LEADING_ZEROES EQU (1 << BIT_LEADING_ZEROES) - ; HP bar HP_BAR_GREEN EQU 0 HP_BAR_YELLOW EQU 1 diff --git a/constants/text_constants.asm b/constants/text_constants.asm new file mode 100644 index 00000000..3cddce26 --- /dev/null +++ b/constants/text_constants.asm @@ -0,0 +1,14 @@ +; special text IDs +TEXT_MON_FAINTED EQU $d0 +TEXT_BLACKED_OUT EQU $d1 +TEXT_REPEL_WORE_OFF EQU $d2 +TEXT_SAFARI_GAME_OVER EQU $d3 + +; PrintNumber +BIT_MONEY_SIGN EQU 5 +BIT_LEFT_ALIGN EQU 6 +BIT_LEADING_ZEROES EQU 7 + +MONEY_SIGN EQU (1 << BIT_MONEY_SIGN) +LEFT_ALIGN EQU (1 << BIT_LEFT_ALIGN) +LEADING_ZEROES EQU (1 << BIT_LEADING_ZEROES) diff --git a/engine/gamefreak.asm b/engine/gamefreak.asm index 69c059ff..5226072b 100755 --- a/engine/gamefreak.asm +++ b/engine/gamefreak.asm @@ -199,7 +199,6 @@ MoveDownSmallStars: add hl, de dec c jr nz, .innerLoop - ; Toggle the palette so that the lower star in the small stars tile blinks in ; and out. ld a, [rOBP1] diff --git a/engine/hall_of_fame.asm b/engine/hall_of_fame.asm index dc1026a8..9eb4edc5 100755 --- a/engine/hall_of_fame.asm +++ b/engine/hall_of_fame.asm @@ -58,8 +58,8 @@ AnimateHallOfFame: ld c, 80 call DelayFrames coord hl, 2, 13 - ld b, $3 - ld c, $e + ld b, 3 + ld c, 14 call TextBoxBorder coord hl, 4, 15 ld de, HallOfFameText diff --git a/text.asm b/text.asm index 49c246ee..866d4a7f 100644 --- a/text.asm +++ b/text.asm @@ -1,4 +1,5 @@ - +INCLUDE "charmap.asm" +INCLUDE "constants/text_constants.asm" TEXT_1 EQU $20 TEXT_2 EQU TEXT_1 + 1 TEXT_3 EQU TEXT_2 + 1 @@ -15,7 +16,6 @@ POKEDEX_TEXT EQU TEXT_11 + 1 MOVE_NAMES EQU POKEDEX_TEXT + 1 INCLUDE "macros.asm" -INCLUDE "charmap.asm" INCLUDE "hram.asm" @@ -25,7 +25,7 @@ _CardKeySuccessText1:: text "Bingo!@@" _CardKeySuccessText2:: - db $0 + text "" line "The CARD KEY" cont "opened the door!" done @@ -79,7 +79,7 @@ _PokeCenterSignText:: done _FoundItemText:: - text $52, " found" + text " found" line "@" TX_RAM wcf4b text "!@@" @@ -96,7 +96,7 @@ _OaksAideHiText:: para "If you caught @" TX_NUM hOaksAideRequirement, 1, 3 - db $0 + text "" line "kinds of #MON," cont "I'm supposed to" cont "give you an" @@ -104,7 +104,7 @@ _OaksAideHiText:: TX_RAM wOaksAideRewardItemName text "!" - para "So, ", $52, "! Have" + para "So, ! Have" line "you caught at" cont "least @" TX_NUM hOaksAideRequirement, 1, 3 @@ -117,7 +117,7 @@ _OaksAideUhOhText:: line "Uh-oh! You have" cont "caught only @" TX_NUM hOaksAideNumMonsOwned, 1, 3 - db $0 + text "" cont "kinds of #MON!" para "You need @" @@ -134,7 +134,7 @@ _OaksAideComeBackText:: para "When you get @" TX_NUM hOaksAideRequirement, 1, 3 - db $0 + text "" line "kinds, come back" cont "for @" TX_RAM wOaksAideRewardItemName @@ -153,7 +153,7 @@ _OaksAideHereYouGoText:: prompt _OaksAideGotItemText:: - text $52, " got the" + text " got the" line "@" TX_RAM wOaksAideRewardItemName text "!@@" @@ -239,10 +239,10 @@ _AIBattleWithdrawText:: _AIBattleUseItemText:: TX_RAM wTrainerName - db $0 + text "" line "used @" TX_RAM wcd6d - db $0 + text "" cont "on @" TX_RAM wEnemyMonNick text "!" @@ -257,7 +257,7 @@ _TradeWentToText:: done _TradeForText:: - text "For ", $52, "'s" + text "For 's" line "@" TX_RAM wcf4b text "," @@ -295,11 +295,11 @@ _TradeWillTradeText:: text " will" line "trade @" TX_RAM wcd6d - db $0 + text "" done _TradeforText:: - text "for ", $52, "'s" + text "for 's" line "@" TX_RAM wcf4b text "." @@ -351,7 +351,7 @@ _YeahText:: _DexSeenOwnedText:: text "#DEX Seen:@" TX_NUM wDexRatingNumMonsSeen, 1, 3 - db $0 + text "" line " Owned:@" TX_NUM wDexRatingNumMonsOwned, 1, 3 db "@" @@ -362,27 +362,27 @@ _DexRatingText:: _GymStatueText1:: TX_RAM wGymCityName - db $0 + text "" line "#MON GYM" cont "LEADER: @" TX_RAM wGymLeaderName - db $0 + text "" para "WINNING TRAINERS:" - line $53 + line "" done _GymStatueText2:: TX_RAM wGymCityName - db $0 + text "" line "#MON GYM" cont "LEADER: @" TX_RAM wGymLeaderName - db $0 + text "" para "WINNING TRAINERS:" - line $53 - cont $52 + line "" + cont "" done _ViridianCityPokecenterGuyText:: @@ -627,7 +627,7 @@ _BillsHouseMonitorText:: done _BillsHouseInitiatedText:: - text $52, " initiated" + text " initiated" line "TELEPORTER's Cell" cont "Separator!@@" @@ -801,7 +801,7 @@ _IndigoPlateauHQText:: done _RedBedroomSNESText:: - text $52, " is" + text " is" line "playing the SNES!" cont "...Okay!" cont "It's time to go!" @@ -972,31 +972,31 @@ _VermilionGymTrashFailText:: cont "locks were reset!@@" _FoundHiddenItemText:: - text $52, " found" + text " found" line "@" TX_RAM wcd6d text "!@@" _HiddenItemBagFullText:: - text "But, ", $52, " has" + text "But, has" line "no more room for" cont "other items!" done _FoundHiddenCoinsText:: - text $52, " found" + text " found" line "@" - TX_BCD hCoins, $c2 + TX_BCD hCoins, 2 | LEADING_ZEROES | LEFT_ALIGN text " coins!@@" _FoundHiddenCoins2Text:: - text $52, " found" + text " found" line "@" - TX_BCD hCoins, $c2 + TX_BCD hCoins, 2 | LEADING_ZEROES | LEFT_ALIGN text " coins!@@" _DroppedHiddenCoinsText:: - db $0 + text "" para "Oops! Dropped" line "some coins!" done @@ -1050,48 +1050,48 @@ _OutOfSafariBallsText:: _WildRanText:: text "Wild @" TX_RAM wEnemyMonNick - db $0 + text "" line "ran!" prompt _EnemyRanText:: text "Enemy @" TX_RAM wEnemyMonNick - db $0 + text "" line "ran!" prompt _HurtByPoisonText:: - text $5a, "'s" + text "'s" line "hurt by poison!" prompt _HurtByBurnText:: - text $5a, "'s" + text "'s" line "hurt by the burn!" prompt _HurtByLeechSeedText:: text "LEECH SEED saps" - line $5a, "!" + line "!" prompt _EnemyMonFaintedText:: text "Enemy @" TX_RAM wEnemyMonNick - db $0 + text "" line "fainted!" prompt _MoneyForWinningText:: - text $52, " got ¥@" - TX_BCD wAmountMoneyWon, $c3 - db $0 + text " got ¥@" + TX_BCD wAmountMoneyWon, 3 | LEADING_ZEROES | LEFT_ALIGN + text "" line "for winning!" prompt _TrainerDefeatedText:: - text $52, " defeated" + text " defeated" line "@" TX_RAM wTrainerName text "!" @@ -1099,7 +1099,7 @@ _TrainerDefeatedText:: _PlayerMonFaintedText:: TX_RAM wBattleMonNick - db $0 + text "" line "fainted!" prompt @@ -1108,20 +1108,20 @@ _UseNextMonText:: done _Sony1WinText:: - text $53, ": Yeah! Am" + text ": Yeah! Am" line "I great or what?" prompt _PlayerBlackedOutText2:: - text $52, " is out of" + text " is out of" line "useable #MON!" - para $52, " blacked" + para " blacked" line "out!" prompt _LinkBattleLostText:: - text $52, " lost to" + text " lost to" line "@" TX_RAM wTrainerName text "!" @@ -1135,7 +1135,7 @@ _TrainerAboutToUseText:: TX_RAM wEnemyMonNick text "!" - para "Will ", $52 + para "Will " line "change #MON?" done @@ -1212,42 +1212,42 @@ _GetOutText:: prompt _FastAsleepText:: - text $5A + text "" line "is fast asleep!" prompt _WokeUpText:: - text $5A + text "" line "woke up!" prompt _IsFrozenText:: - text $5A + text "" line "is frozen solid!" prompt _FullyParalyzedText:: - text $5A,"'s" + text "'s" line "fully paralyzed!" prompt _FlinchedText:: - text $5A + text "" line "flinched!" prompt _MustRechargeText:: - text $5A + text "" line "must recharge!" prompt _DisabledNoMoreText:: - text $5A,"'s" + text "'s" line "disabled no more!" prompt _IsConfusedText:: - text $5A + text "" line "is confused!" prompt @@ -1257,37 +1257,37 @@ _HurtItselfText:: prompt _ConfusedNoMoreText:: - text $5A,"'s" + text "'s" line "confused no more!" prompt _SavingEnergyText:: - text $5A + text "" line "is saving energy!" prompt _UnleashedEnergyText:: - text $5A + text "" line "unleashed energy!" prompt _ThrashingAboutText:: - text $5A,"'s" + text "'s" line "thrashing about!" done _AttackContinuesText:: - text $5A,"'s" + text "'s" line "attack continues!" done _CantMoveText:: - text $5A + text "" line "can't move!" prompt _MoveIsDisabledText:: - text $5a, "'s" + text "'s" line "@" TX_RAM wcd6d text " is" @@ -1295,14 +1295,14 @@ _MoveIsDisabledText:: prompt _MonName1Text:: - text $5a, "@@" + text "@@" _Used1Text:: - db $0 + text "" line "used @@" _Used2Text:: - db $0 + text "" line "used @@" _InsteadText:: @@ -1334,24 +1334,24 @@ _ExclamationPoint5Text:: done _AttackMissedText:: - text $5a, "'s" + text "'s" line "attack missed!" prompt _KeptGoingAndCrashedText:: - text $5a + text "" line "kept going and" cont "crashed!" prompt _UnaffectedText:: - text $59, "'s" + text "'s" line "unaffected!" prompt _DoesntAffectMonText:: text "It doesn't affect" - line $59, "!" + line "!" prompt _CriticalHitText:: @@ -1388,23 +1388,23 @@ _TurnedAwayText:: _IgnoredOrdersText:: TX_RAM wBattleMonNick - db $0 + text "" line "ignored orders!" prompt _SubstituteTookDamageText:: text "The SUBSTITUTE" line "took damage for" - cont $59, "!" + cont "!" prompt _SubstituteBrokeText:: - text $59, "'s" + text "'s" line "SUBSTITUTE broke!" prompt _BuildingRageText:: - text $5a, "'s" + text "'s" line "RAGE is building!" prompt @@ -1431,6 +1431,7 @@ _WithExpAllText:: _BoostedText:: text "a boosted" cont "@@" + _ExpPointsText:: TX_NUM wExpAmountGained, 2, 4 text " EXP. Points!" @@ -1446,7 +1447,7 @@ _GrewLevelText:: _WildMonAppearedText:: text "Wild @" TX_RAM wEnemyMonNick - db $0 + text "" line "appeared!" prompt @@ -1454,13 +1455,13 @@ _HookedMonAttackedText:: text "The hooked" line "@" TX_RAM wEnemyMonNick - db $0 + text "" cont "attacked!" prompt _EnemyAppearedText:: TX_RAM wEnemyMonNick - db $0 + text "" line "appeared!" prompt @@ -1513,7 +1514,7 @@ _GoodText:: text "good!@@" _ComeBackText:: - db $0 + text "" line "Come back!" done @@ -1543,9 +1544,9 @@ _SafariZoneAngryText:: ; money related _PickUpPayDayMoneyText:: - text $52, " picked up" + text " picked up" line "¥@" - TX_BCD wTotalPayDayMoney, $c3 + TX_BCD wTotalPayDayMoney, 3 | LEADING_ZEROES | LEFT_ALIGN text "!" prompt @@ -1585,7 +1586,7 @@ _PartyMenuSwapMonText:: _PotionText:: TX_RAM wcd6d - db $0 + text "" line "recovered by @" TX_NUM wHPBarHPDifference, 2, 3 text "!" @@ -1617,7 +1618,7 @@ _IceHealText:: _AwakeningText:: TX_RAM wcd6d - db $0 + text "" line "woke up!" done @@ -1629,7 +1630,7 @@ _FullHealText:: _ReviveText:: TX_RAM wcd6d - db $0 + text "" line "is revitalized!" done @@ -1637,11 +1638,11 @@ _RareCandyText:: TX_RAM wcd6d text " grew" line "to level @" - TX_NUM wCurEnemyLVL, $1,$3 + TX_NUM wCurEnemyLVL, 1, 3 text "!@@" _TurnedOnPC1Text:: - text $52, " turned on" + text " turned on" line "the PC." prompt @@ -1669,7 +1670,7 @@ _AccessedMyPCText:: prompt _TurnedOnPC2Text:: - text $52, " turned on" + text " turned on" line "the PC." prompt @@ -1902,13 +1903,13 @@ _DoYouWantToNicknameText:: _YourNameIsText:: text "Right! So your" - line "name is ", $52, "!" + line "name is !" prompt _HisNameIsText:: text "That's right! I" line "remember now! His" - cont "name is ", $53, "!" + cont "name is !" prompt _WillBeTradedText:: @@ -2011,7 +2012,7 @@ _WouldYouLikeToSaveText:: done _GameSavedText:: - text $52, " saved" + text " saved" line "the game!" done @@ -2031,7 +2032,7 @@ _WhenYouChangeBoxText:: _ChooseABoxText:: text "Choose a" - line $4a, " BOX.@@" + line " BOX.@@" _EvolvedText:: TX_RAM wcf4b @@ -2039,7 +2040,7 @@ _EvolvedText:: done _IntoText:: - db $0 + text "" line "into @" TX_RAM wcd6d text "!" @@ -2048,54 +2049,54 @@ _IntoText:: _StoppedEvolvingText:: text "Huh? @" TX_RAM wcf4b - db $0 + text "" line "stopped evolving!" prompt _IsEvolvingText:: text "What? @" TX_RAM wcf4b - db $0 + text "" line "is evolving!" done _FellAsleepText:: - text $59 + text "" line "fell asleep!" prompt _AlreadyAsleepText:: - text $59, "'s" + text "'s" line "already asleep!" prompt _PoisonedText:: - text $59 + text "" line "was poisoned!" prompt _BadlyPoisonedText:: - text $59, "'s" + text "'s" line "badly poisoned!" prompt _BurnedText:: - text $59 + text "" line "was burned!" prompt _FrozenText:: - text $59 + text "" line "was frozen solid!" prompt _FireDefrostedText:: text "Fire defrosted" - line $59, "!" + line "!" prompt _MonsStatsRoseText:: - text $5a, "'s" + text "'s" line "@" TX_RAM wcf4b text "@@" @@ -2108,7 +2109,7 @@ _RoseText:: prompt _MonsStatsFellText:: - text $59, "'s" + text "'s" line "@" TX_RAM wcf4b text "@@" @@ -2121,60 +2122,60 @@ _FellText:: prompt _RanFromBattleText:: - text $5a + text "" line "ran from battle!" prompt _RanAwayScaredText:: - text $59 + text "" line "ran away scared!" prompt _WasBlownAwayText:: - text $59 + text "" line "was blown away!" prompt _ChargeMoveEffectText:: - text $5a, "@@" + text "@@" _MadeWhirlwindText:: - db $0 + text "" line "made a whirlwind!" prompt _TookInSunlightText:: - db $0 + text "" line "took in sunlight!" prompt _LoweredItsHeadText:: - db $0 + text "" line "lowered its head!" prompt _SkyAttackGlowingText:: - db $0 + text "" line "is glowing!" prompt _FlewUpHighText:: - db $0 + text "" line "flew up high!" prompt _DugAHoleText:: - db $0 + text "" line "dug a hole!" prompt _BecameConfusedText:: - text $59 + text "" line "became confused!" prompt _MimicLearnedMoveText:: - text $5a + text "" line "learned" cont "@" TX_RAM wcd6d @@ -2182,7 +2183,7 @@ _MimicLearnedMoveText:: prompt _MoveWasDisabledText:: - text $59, "'s" + text "'s" line "@" TX_RAM wcd6d text " was" @@ -2203,16 +2204,16 @@ _ButItFailedText:: _DidntAffectText:: text "It didn't affect" - line $59, "!" + line "!" prompt _IsUnaffectedText:: - text $59 + text "" line "is unaffected!" prompt _ParalyzedMayNotAttackText:: - text $59, "'s" + text "'s" line "paralyzed! It may" cont "not attack!" prompt @@ -2223,7 +2224,7 @@ _SubstituteText:: prompt _HasSubstituteText:: - text $5a + text "" line "has a SUBSTITUTE!" prompt @@ -2243,23 +2244,23 @@ _GettingPumpedText:: prompt _WasSeededText:: - text $59 + text "" line "was seeded!" prompt _EvadedAttackText:: - text $59 + text "" line "evaded attack!" prompt _HitWithRecoilText:: - text $5a, "'s" + text "'s" line "hit with recoil!" prompt _ConvertedTypeText:: text "Converted type to" - line $59, "'s!" + line "'s!" prompt _StatusChangesEliminatedText:: @@ -2268,23 +2269,23 @@ _StatusChangesEliminatedText:: prompt _StartedSleepingEffect:: - text $5a + text "" line "started sleeping!" done _FellAsleepBecameHealthyText:: - text $5a + text "" line "fell asleep and" cont "became healthy!" done _RegainedHealthText:: - text $5a + text "" line "regained health!" prompt _TransformedText:: - text $5a + text "" line "transformed into" cont "@" TX_RAM wcd6d @@ -2292,28 +2293,28 @@ _TransformedText:: prompt _LightScreenProtectedText:: - text $5a, "'s" + text "'s" line "protected against" cont "special attacks!" prompt _ReflectGainedArmorText:: - text $5a + text "" line "gained armor!" prompt _ShroudedInMistText:: - text $5a, "'s" + text "'s" line "shrouded in mist!" prompt _SuckedHealthText:: text "Sucked health from" - line $59, "!" + line "!" prompt _DreamWasEatenText:: - text $59, "'s" + text "'s" line "dream was eaten!" prompt @@ -2433,15 +2434,15 @@ _PokemartGreetingText:: _PokemonFaintedText:: TX_RAM wcd6d - db $0 + text "" line "fainted!" done _PlayerBlackedOutText:: - text $52, " is out of" + text " is out of" line "useable #MON!" - para $52, " blacked" + para " blacked" line "out!" prompt @@ -2459,7 +2460,7 @@ _PokemartTellBuyPriceText:: text "?" line "That will be" cont "¥@" - TX_BCD hMoney, $c3 + TX_BCD hMoney, 3 | LEADING_ZEROES | LEFT_ALIGN text ". OK?" done @@ -2486,7 +2487,7 @@ _PokemonSellingGreetingText:: _PokemartTellSellPriceText:: text "I can pay you" line "¥@" - TX_BCD hMoney, $c3 + TX_BCD hMoney, 3 | LEADING_ZEROES | LEFT_ALIGN text " for that." done @@ -2530,7 +2531,7 @@ _AbandonLearningText:: _DidNotLearnText:: TX_RAM wLearnMoveMonName - db $0 + text "" line "did not learn" cont "@" TX_RAM wcf4b @@ -2547,7 +2548,7 @@ _TryingToLearnText:: para "But, @" TX_RAM wLearnMoveMonName - db $0 + text "" line "can't learn more" cont "than 4 moves!" @@ -2565,7 +2566,7 @@ _PoofText:: text " Poof!@@" _ForgotAndText:: - db $0 + text "" para "@" TX_RAM wLearnMoveMonName text " forgot" @@ -2721,7 +2722,7 @@ _CannotGetOffHereText:: prompt _GotMonText:: - text $52, " got" + text " got" line "@" TX_RAM wcd6d text "!@@" @@ -2818,7 +2819,7 @@ _ItemUseBallText06:: text "!@@" _SurfingGotOnText:: - text $52, " got on" + text " got on" line "@" TX_RAM wcd6d text "!" @@ -2843,12 +2844,12 @@ _VitaminNoEffectText:: prompt _ThrewBaitText:: - text $52, " threw" + text " threw" line "some BAIT." done _ThrewRockText:: - text $52, " threw a" + text " threw a" line "ROCK." done @@ -2866,13 +2867,13 @@ _FluteWokeUpText:: prompt _PlayedFluteHadEffectText:: - text $52, " played the" + text " played the" line "# FLUTE.@@" _CoinCaseNumCoinsText:: text "Coins" line "@" - TX_BCD wPlayerCoins, $c2 + TX_BCD wPlayerCoins, 2 | LEADING_ZEROES | LEFT_ALIGN text " " prompt @@ -2929,7 +2930,7 @@ _TeachMachineMoveText:: para "Teach @" TX_RAM wcf4b - db $0 + text "" line "to a #MON?" done @@ -2948,7 +2949,7 @@ _MonCannotLearnMachineMoveText:: prompt _ItemUseNotTimeText:: - text "OAK: ", $52, "!" + text "OAK: !" line "This isn't the" cont "time to use that! " prompt @@ -2994,7 +2995,7 @@ _BoxFullCannotThrowBallText:: SECTION "Text 11", ROMX, BANK[TEXT_11] _ItemUseText001:: - text $52," used@@" + text " used@@" _ItemUseText002:: TX_RAM wcf4b @@ -3002,7 +3003,7 @@ _ItemUseText002:: done _GotOnBicycleText1:: - text $52, " got on the@@" + text " got on the@@" _GotOnBicycleText2:: TX_RAM wcf4b @@ -3010,7 +3011,7 @@ _GotOnBicycleText2:: prompt _GotOffBicycleText1:: - text $52, " got off@@" + text " got off@@" _GotOffBicycleText2:: text "the @" @@ -3051,7 +3052,7 @@ _ConnectCableText:: prompt _TradedForText:: - text $52, " traded" + text " traded" line "@" TX_RAM wInGameTradeGiveMonName text " for" @@ -3103,7 +3104,7 @@ _WannaTrade2Text:: para "your @" TX_RAM wInGameTradeGiveMonName - db $0 + text "" line "for @" TX_RAM wInGameTradeReceiveMonName text "?" diff --git a/text/maps/bike_shop.asm b/text/maps/bike_shop.asm index 33f53ee9..86799865 100644 --- a/text/maps/bike_shop.asm +++ b/text/maps/bike_shop.asm @@ -25,7 +25,7 @@ _BikeShopText_1d81f:: prompt _BikeShopText_1d824:: - text $52, " exchanged" + text " exchanged" line "the BIKE VOUCHER" cont "for a BICYCLE.@@" diff --git a/text/maps/celadon_dept_store_3f.asm b/text/maps/celadon_dept_store_3f.asm index 1aad756f..8211750d 100644 --- a/text/maps/celadon_dept_store_3f.asm +++ b/text/maps/celadon_dept_store_3f.asm @@ -8,7 +8,7 @@ _TM18PreReceiveText:: prompt _ReceivedTM18Text:: - text $52, " received" + text " received" line "@" TX_RAM wcf4b text "!@@" diff --git a/text/maps/fan_club.asm b/text/maps/fan_club.asm index 7477405c..4827f2e8 100644 --- a/text/maps/fan_club.asm +++ b/text/maps/fan_club.asm @@ -83,13 +83,13 @@ FanClubChairStoryText:: prompt ReceivedBikeVoucherText:: - text $52, " received" + text " received" line "a @" TX_RAM wcf4b text "!@@" ExplainBikeVoucherText:: - db $0 + text "" para "Exchange that for" line "a BICYCLE!" @@ -111,7 +111,7 @@ FanClubNoStoryText:: done FanClubChairFinalText:: - text "Hello, ", $52, "!" + text "Hello, !" para "Did you come see" line "me about my" diff --git a/text/maps/hall_of_fame.asm b/text/maps/hall_of_fame.asm index 6c5dd40e..c799268b 100644 --- a/text/maps/hall_of_fame.asm +++ b/text/maps/hall_of_fame.asm @@ -1,7 +1,7 @@ _HallofFameRoomText1:: text "OAK: Er-hem!" line "Congratulations" - cont $52, "!" + cont "!" para "This floor is the" line "#MON HALL OF" @@ -16,13 +16,13 @@ _HallofFameRoomText1:: line "also recorded in" cont "the HALL OF FAME!" - para $52, "! You have" + para "! You have" line "endeavored hard" cont "to become the new" cont "LEAGUE champion!" para "Congratulations," - line $52, ", you and" + line ", you and" cont "your #MON are" cont "HALL OF FAMERs!" done diff --git a/text/maps/lance.asm b/text/maps/lance.asm index 3c75ce47..0313b158 100644 --- a/text/maps/lance.asm +++ b/text/maps/lance.asm @@ -1,6 +1,6 @@ _LanceBeforeBattleText:: text "Ah! I heard about" - line "you ", $52, "!" + line "you !" para "I lead the ELITE" line "FOUR! You can" diff --git a/text/maps/museum_1f.asm b/text/maps/museum_1f.asm index 46b4484c..16431bda 100644 --- a/text/maps/museum_1f.asm +++ b/text/maps/museum_1f.asm @@ -81,7 +81,7 @@ _Museum1FText_5c28e:: prompt _ReceivedOldAmberText:: - text $52, " received" + text " received" line "OLD AMBER!@@" _Museum1FText_5c299:: diff --git a/text/maps/oaks_lab.asm b/text/maps/oaks_lab.asm index 52af450d..1f02c355 100644 --- a/text/maps/oaks_lab.asm +++ b/text/maps/oaks_lab.asm @@ -1,11 +1,11 @@ _OaksLabGaryText1:: - text $53,": Yo" - line $52,"! Gramps" + text ": Yo" + line "! Gramps" cont "isn't around!" done _OaksLabText40:: - text $53,": Heh, I" + text ": Heh, I" line "don't need to be" cont "greedy like you!" @@ -14,7 +14,7 @@ _OaksLabText40:: done _OaksLabText41:: - text $53,": My" + text ": My" line "#MON looks a" cont "lot stronger." done @@ -60,7 +60,7 @@ _OaksLabLastMonText:: done _OaksLabText_1d2f0:: - text "OAK: Now, ", $52, "," + text "OAK: Now, ," line "which #MON do" cont "you want?" done @@ -73,14 +73,14 @@ _OaksLabText_1d2f5:: done _OaksLabText_1d2fa:: - text "OAK: ", $52, "," + text "OAK: ," line "raise your young" cont "#MON by making" cont "it fight!" done _OaksLabDeliverParcelText1:: - text "OAK: Oh, ", $52, "!" + text "OAK: Oh, !" para "How is my old" line "#MON?" @@ -95,11 +95,11 @@ _OaksLabDeliverParcelText1:: para "What? You have" line "something for me?" - para $52, " delivered" + para " delivered" line "OAK's PARCEL.@@" _OaksLabDeliverParcelText2:: - db $0 + text "" para "Ah! This is the" line "custom # BALL" cont "I ordered!" @@ -109,7 +109,7 @@ _OaksLabDeliverParcelText2:: _OaksLabAroundWorldText:: text "#MON around the" line "world wait for" - cont "you, ", $52, "!" + cont "you, !" done _OaksLabGivePokeballsText1:: @@ -123,11 +123,11 @@ _OaksLabGivePokeballsText1:: cont "to capture wild" cont "#MON." - para $52, " got 5" + para " got 5" line "# BALLs!@@" _OaksLabGivePokeballsText2:: - db $0 + text "" para "When a wild" line "#MON appears," cont "it's fair game." @@ -182,20 +182,20 @@ _OaksLabText_1d340:: done _OaksLabRivalWaitingText:: - text $53, ": Gramps!" + text ": Gramps!" line "I'm fed up with" cont "waiting!" done _OaksLabChooseMonText:: - text "OAK: ", $53, "?" + text "OAK: ?" line "Let me think..." para "Oh, that's right," line "I told you to" cont "come! Just wait!" - para "Here, ", $52, "!" + para "Here, !" para "There are 3" line "#MON here!" @@ -216,14 +216,14 @@ _OaksLabChooseMonText:: done _OaksLabRivalInterjectionText:: - text $53, ": Hey!" + text ": Hey!" line "Gramps! What" cont "about me?" done _OaksLabBePatientText:: text "OAK: Be patient!" - line $53, ", you can" + line ", you can" cont "have one too!" done @@ -233,19 +233,19 @@ _OaksLabLeavingText:: done _OaksLabRivalPickingMonText:: - text $53, ": I'll take" + text ": I'll take" line "this one, then!" done _OaksLabRivalReceivedMonText:: - text $53, " received" + text " received" line "a @" TX_RAM wcd6d text "!@@" _OaksLabRivalChallengeText:: - text $53, ": Wait" - line $52, "!" + text ": Wait" + line "!" cont "Let's check out" cont "our #MON!" @@ -261,26 +261,26 @@ _OaksLabText_1d3be:: prompt _OaksLabText_1d3c3:: - text $53, ": Yeah! Am" + text ": Yeah! Am" line "I great or what?" prompt _OaksLabRivalToughenUpText:: - text $53, ": Okay!" + text ": Okay!" line "I'll make my" cont "#MON fight to" cont "toughen it up!" - para $52, "! Gramps!" + para "! Gramps!" line "Smell you later!" done _OaksLabText21:: - text $53, ": Gramps!" + text ": Gramps!" done _OaksLabText22:: - text $53, ": What did" + text ": What did" line "you call me for?" done @@ -305,11 +305,11 @@ _OaksLabText24:: done _OaksLabText25:: - text "OAK: ", $52, " and" - line $53, "! Take" + text "OAK: and" + line "! Take" cont "these with you!" - para $52, " got" + para " got" line "#DEX from OAK!@@" _OaksLabText26:: @@ -336,11 +336,11 @@ _OaksLabText26:: done _OaksLabText27:: - text $53, ": Alright" + text ": Alright" line "Gramps! Leave it" cont "all to me!" - para $52, ", I hate to" + para ", I hate to" line "say it, but I" cont "don't need you!" @@ -350,7 +350,7 @@ _OaksLabText27:: para "I'll tell her not" line "to lend you one," - cont $52, "! Hahaha!" + cont "! Hahaha!" done _OaksLabText_1d405:: diff --git a/text/maps/reds_house_1f.asm b/text/maps/reds_house_1f.asm index 8b82f2de..07768af9 100644 --- a/text/maps/reds_house_1f.asm +++ b/text/maps/reds_house_1f.asm @@ -10,7 +10,7 @@ _MomWakeUpText:: done _MomHealText1:: - text "MOM: ",$52,"!" + text "MOM: !" line "You should take a" cont "quick rest." prompt diff --git a/text/maps/route_22.asm b/text/maps/route_22.asm index f2d7ae96..ac4141eb 100644 --- a/text/maps/route_22.asm +++ b/text/maps/route_22.asm @@ -60,7 +60,7 @@ _Route22RivalBeforeBattleText2:: cont "That's cool!" para "Then I'll whip you" - line $52, " as a" + line " as a" cont "warm up for" cont "#MON LEAGUE!" @@ -88,8 +88,8 @@ _Route22RivalDefeatedText2:: prompt _Route22Text_511d0:: - text $53, ": Hahaha!" - line $52, "! That's" + text ": Hahaha!" + line "! That's" cont "your best? You're" cont "nowhere near as" cont "good as me, pal!" diff --git a/text/maps/silph_co_11f.asm b/text/maps/silph_co_11f.asm index 7fccab4f..8e7a3848 100644 --- a/text/maps/silph_co_11f.asm +++ b/text/maps/silph_co_11f.asm @@ -58,7 +58,7 @@ _SilphCo11Text2:: done _SilphCo11Text3:: - text "Ah ", $52, "!" + text "Ah !" line "So we meet again!" para "The PRESIDENT and" diff --git a/text/maps/vermilion_city.asm b/text/maps/vermilion_city.asm index ff90cbef..b060a123 100644 --- a/text/maps/vermilion_city.asm +++ b/text/maps/vermilion_city.asm @@ -35,7 +35,7 @@ _SSAnneWelcomeText9:: prompt _SSAnneFlashedTicketText:: - text $52, " flashed" + text " flashed" line "the S.S.TICKET!" para "Great! Welcome to" @@ -43,7 +43,7 @@ _SSAnneFlashedTicketText:: done _SSAnneNoTicketText:: - text $52, " doesn't" + text " doesn't" line "have the needed" cont "S.S.TICKET." @@ -71,7 +71,7 @@ _VermilionCityText5:: line "Gogogoh!@@" _VermilionCityText14:: - db $0 + text "" para "A MACHOP is" line "stomping the land" cont "flat." diff --git a/text/oakspeech.asm b/text/oakspeech.asm index 91aaf5c3..5911092c 100644 --- a/text/oakspeech.asm +++ b/text/oakspeech.asm @@ -53,4 +53,3 @@ _OakSpeechText3:: cont "with #MON" cont "awaits! Let's go!" done -