diff options
Diffstat (limited to 'data/text')
| -rw-r--r-- | data/text/alphabets.asm | 14 | ||||
| -rw-r--r-- | data/text/dakutens.asm | 4 | ||||
| -rw-r--r-- | data/text/text_1.asm | 46 | ||||
| -rw-r--r-- | data/text/text_2.asm | 349 | ||||
| -rw-r--r-- | data/text/text_3.asm | 54 | ||||
| -rw-r--r-- | data/text/text_4.asm | 50 | ||||
| -rw-r--r-- | data/text/text_5.asm | 20 | ||||
| -rw-r--r-- | data/text/text_6.asm | 43 | ||||
| -rw-r--r-- | data/text/text_7.asm | 60 |
9 files changed, 356 insertions, 284 deletions
diff --git a/data/text/alphabets.asm b/data/text/alphabets.asm index 9799a7e6..07e6cf96 100644 --- a/data/text/alphabets.asm +++ b/data/text/alphabets.asm @@ -1,5 +1,15 @@ LowerCaseAlphabet: - db "abcdefghijklmnopqrstuvwxyz ×():;[]",$e1,$e2,"-?!♂♀/⠄,¥UPPER CASE@" + db "abcdefghi" + db "jklmnopqr" + db "stuvwxyz " + db "×():;[]<PK><MN>" + db "-?!♂♀/<DOT>,<ED>" + db "UPPER CASE@" UpperCaseAlphabet: - db "ABCDEFGHIJKLMNOPQRSTUVWXYZ ×():;[]",$e1,$e2,"-?!♂♀/⠄,¥lower case@" + db "ABCDEFGHI" + db "JKLMNOPQR" + db "STUVWXYZ " + db "×():;[]<PK><MN>" + db "-?!♂♀/<DOT>,<ED>" + db "lower case@" diff --git a/data/text/dakutens.asm b/data/text/dakutens.asm index f3bf4854..7a53c71f 100644 --- a/data/text/dakutens.asm +++ b/data/text/dakutens.asm @@ -7,9 +7,9 @@ Dakutens: db "サザ", "シジ", "スズ", "セゼ", "ソゾ" db "タダ", "チヂ", "ツヅ", "テデ", "トド" db "ハバ", "ヒビ", "フブ", "へべ", "ホボ" - db $ff + db -1 ; end Handakutens: db "はぱ", "ひぴ", "ふぷ", "へぺ", "ほぽ" db "ハパ", "ヒピ", "フプ", "へぺ", "ホポ" - db $ff + db -1 ; end diff --git a/data/text/text_1.asm b/data/text/text_1.asm index 1ab54da3..af1d3827 100644 --- a/data/text/text_1.asm +++ b/data/text/text_1.asm @@ -1,8 +1,9 @@ _CardKeySuccessText1:: - text "Bingo!@@" + text "Bingo!@" + text_end _CardKeySuccessText2:: - text "" + text_start line "The CARD KEY" cont "opened the door!" done @@ -13,8 +14,9 @@ _CardKeyFailText:: done _TrainerNameText:: - TX_RAM wcd6d - text ": @@" + text_ram wcd6d + text ": @" + text_end _NoNibbleText:: text "Not even a nibble!" @@ -58,8 +60,9 @@ _PokeCenterSignText:: _FoundItemText:: text "<PLAYER> found" line "@" - TX_RAM wcf4b - text "!@@" + text_ram wcf4b + text "!@" + text_end _NoMoreRoomForItemText:: text "No more room for" @@ -72,19 +75,19 @@ _OaksAideHiText:: cont "AIDE!" para "If you caught @" - TX_NUM hOaksAideRequirement, 1, 3 - text "" + text_decimal hOaksAideRequirement, 1, 3 + text_start line "kinds of #MON," cont "I'm supposed to" cont "give you an" cont "@" - TX_RAM wOaksAideRewardItemName + text_ram wOaksAideRewardItemName text "!" para "So, <PLAYER>! Have" line "you caught at" cont "least @" - TX_NUM hOaksAideRequirement, 1, 3 + text_decimal hOaksAideRequirement, 1, 3 text " kinds of" cont "#MON?" done @@ -93,16 +96,16 @@ _OaksAideUhOhText:: text "Let's see..." line "Uh-oh! You have" cont "caught only @" - TX_NUM hOaksAideNumMonsOwned, 1, 3 - text "" + text_decimal hOaksAideNumMonsOwned, 1, 3 + text_start cont "kinds of #MON!" para "You need @" - TX_NUM hOaksAideRequirement, 1, 3 + text_decimal hOaksAideRequirement, 1, 3 text " kinds" line "if you want the" cont "@" - TX_RAM wOaksAideRewardItemName + text_ram wOaksAideRewardItemName text "." done @@ -110,18 +113,18 @@ _OaksAideComeBackText:: text "Oh. I see." para "When you get @" - TX_NUM hOaksAideRequirement, 1, 3 - text "" + text_decimal hOaksAideRequirement, 1, 3 + text_start line "kinds, come back" cont "for @" - TX_RAM wOaksAideRewardItemName + text_ram wOaksAideRewardItemName text "." done _OaksAideHereYouGoText:: text "Great! You have" line "caught @" - TX_NUM hOaksAideNumMonsOwned, 1, 3 + text_decimal hOaksAideNumMonsOwned, 1, 3 text " kinds " cont "of #MON!" cont "Congratulations!" @@ -132,14 +135,15 @@ _OaksAideHereYouGoText:: _OaksAideGotItemText:: text "<PLAYER> got the" line "@" - TX_RAM wOaksAideRewardItemName - text "!@@" + text_ram wOaksAideRewardItemName + text "!@" + text_end _OaksAideNoRoomText:: text "Oh! I see you" line "don't have any" cont "room for the" cont "@" - TX_RAM wOaksAideRewardItemName + text_ram wOaksAideRewardItemName text "." done diff --git a/data/text/text_2.asm b/data/text/text_2.asm index 01e8641b..5e620fbb 100644 --- a/data/text/text_2.asm +++ b/data/text/text_2.asm @@ -1,53 +1,53 @@ _AIBattleWithdrawText:: - TX_RAM wTrainerName + text_ram wTrainerName text " with-" line "drew @" - TX_RAM wEnemyMonNick + text_ram wEnemyMonNick text "!" prompt _AIBattleUseItemText:: - TX_RAM wTrainerName - text "" + text_ram wTrainerName + text_start line "used @" - TX_RAM wcd6d - text "" + text_ram wcd6d + text_start cont "on @" - TX_RAM wEnemyMonNick + text_ram wEnemyMonNick text "!" prompt _TradeWentToText:: - TX_RAM wcf4b + text_ram wcf4b text " went" line "to @" - TX_RAM wLinkEnemyTrainerName + text_ram wLinkEnemyTrainerName text "." done _TradeForText:: text "For <PLAYER>'s" line "@" - TX_RAM wcf4b + text_ram wcf4b text "," done _TradeSendsText:: - TX_RAM wLinkEnemyTrainerName + text_ram wLinkEnemyTrainerName text " sends" line "@" - TX_RAM wcd6d + text_ram wcd6d text "." done _TradeWavesFarewellText:: - TX_RAM wLinkEnemyTrainerName + text_ram wLinkEnemyTrainerName text " waves" line "farewell as" done _TradeTransferredText:: - TX_RAM wcd6d + text_ram wcd6d text " is" line "transferred." done @@ -55,22 +55,22 @@ _TradeTransferredText:: _TradeTakeCareText:: text "Take good care of" line "@" - TX_RAM wcd6d + text_ram wcd6d text "." done _TradeWillTradeText:: - TX_RAM wLinkEnemyTrainerName + text_ram wLinkEnemyTrainerName text " will" line "trade @" - TX_RAM wcd6d - text "" + text_ram wcd6d + text_start done _TradeforText:: text "for <PLAYER>'s" line "@" - TX_RAM wcf4b + text_ram wcf4b text "." done @@ -106,7 +106,7 @@ _OneMoreGoSlotMachineText:: _LinedUpText:: text " lined up!" line "Scored @" - TX_RAM wcf4b + text_ram wcf4b text " coins!" done @@ -115,39 +115,40 @@ _NotThisTimeText:: prompt _YeahText:: - text "Yeah!@@" + text "Yeah!@" + text_end _DexSeenOwnedText:: text "#DEX Seen:@" - TX_NUM wDexRatingNumMonsSeen, 1, 3 - text "" + text_decimal wDexRatingNumMonsSeen, 1, 3 + text_start line " Owned:@" - TX_NUM wDexRatingNumMonsOwned, 1, 3 - db "@" + text_decimal wDexRatingNumMonsOwned, 1, 3 + text_end _DexRatingText:: - text "#DEX Rating", $6d + text "#DEX Rating<COLON>" done _GymStatueText1:: - TX_RAM wGymCityName - text "" + text_ram wGymCityName + text_start line "#MON GYM" cont "LEADER: @" - TX_RAM wGymLeaderName - text "" + text_ram wGymLeaderName + text_start para "WINNING TRAINERS:" line "<RIVAL>" done _GymStatueText2:: - TX_RAM wGymCityName - text "" + text_ram wGymCityName + text_start line "#MON GYM" cont "LEADER: @" - TX_RAM wGymLeaderName - text "" + text_ram wGymLeaderName + text_start para "WINNING TRAINERS:" line "<RIVAL>" @@ -375,7 +376,8 @@ _CinnabarGymQuizCorrectText:: text "You're absolutely" line "correct!" - para "Go on through!@@" + para "Go on through!@" + text_end _CinnabarGymQuizIncorrectText:: text "Sorry! Bad call!" @@ -398,7 +400,8 @@ _BillsHouseMonitorText:: _BillsHouseInitiatedText:: text "<PLAYER> initiated" line "TELEPORTER's Cell" - cont "Separator!@@" + cont "Separator!@" + text_end _BillsHousePokemonListText1:: text "BILL's favorite" @@ -479,7 +482,8 @@ TMNotebookText:: line "HMs that can be" cont "used repeatedly." - para "SILPH CO.@@" + para "SILPH CO.@" + text_end _TurnPageText:: text "Turn the page?" @@ -487,7 +491,8 @@ _TurnPageText:: _ViridianSchoolNotebookText5:: text "GIRL: Hey! Don't" - line "look at my notes!@@" + line "look at my notes!@" + text_end _ViridianSchoolNotebookText1:: text "Looked at the" @@ -718,7 +723,8 @@ _VermilionGymTrashSuccessText1:: cont "Turn it on!" para "The 1st electric" - line "lock opened!@@" + line "lock opened!@" + text_end _VermilionGymTrashSuccessText2:: text "Hey! There's" @@ -732,19 +738,22 @@ _VermilionGymTrashSuccessText3:: line "lock opened!" para "The motorized door" - line "opened!@@" + line "opened!@" + text_end _VermilionGymTrashFailText:: text "Nope! There's" line "only trash here." cont "Hey! The electric" - cont "locks were reset!@@" + cont "locks were reset!@" + text_end _FoundHiddenItemText:: text "<PLAYER> found" line "@" - TX_RAM wcd6d - text "!@@" + text_ram wcd6d + text "!@" + text_end _HiddenItemBagFullText:: text "But, <PLAYER> has" @@ -755,17 +764,19 @@ _HiddenItemBagFullText:: _FoundHiddenCoinsText:: text "<PLAYER> found" line "@" - TX_BCD hCoins, 2 | LEADING_ZEROES | LEFT_ALIGN - text " coins!@@" + text_bcd hCoins, 2 | LEADING_ZEROES | LEFT_ALIGN + text " coins!@" + text_end _FoundHiddenCoins2Text:: text "<PLAYER> found" line "@" - TX_BCD hCoins, 2 | LEADING_ZEROES | LEFT_ALIGN - text " coins!@@" + text_bcd hCoins, 2 | LEADING_ZEROES | LEFT_ALIGN + text " coins!@" + text_end _DroppedHiddenCoinsText:: - text "" + text_start para "Oops! Dropped" line "some coins!" done @@ -802,7 +813,8 @@ _ElevatorText:: done _TownMapText:: - text "A TOWN MAP.@@" + text "A TOWN MAP.@" + text_end _PokemonStuffText:: text "Wow! Tons of" @@ -818,15 +830,15 @@ _OutOfSafariBallsText:: _WildRanText:: text "Wild @" - TX_RAM wEnemyMonNick - text "" + text_ram wEnemyMonNick + text_start line "ran!" prompt _EnemyRanText:: text "Enemy @" - TX_RAM wEnemyMonNick - text "" + text_ram wEnemyMonNick + text_start line "ran!" prompt @@ -847,28 +859,28 @@ _HurtByLeechSeedText:: _EnemyMonFaintedText:: text "Enemy @" - TX_RAM wEnemyMonNick - text "" + text_ram wEnemyMonNick + text_start line "fainted!" prompt _MoneyForWinningText:: text "<PLAYER> got ¥@" - TX_BCD wAmountMoneyWon, 3 | LEADING_ZEROES | LEFT_ALIGN - text "" + text_bcd wAmountMoneyWon, 3 | LEADING_ZEROES | LEFT_ALIGN + text_start line "for winning!" prompt _TrainerDefeatedText:: text "<PLAYER> defeated" line "@" - TX_RAM wTrainerName + text_ram wTrainerName text "!" prompt _PlayerMonFaintedText:: - TX_RAM wBattleMonNick - text "" + text_ram wBattleMonNick + text_start line "fainted!" prompt @@ -892,16 +904,16 @@ _PlayerBlackedOutText2:: _LinkBattleLostText:: text "<PLAYER> lost to" line "@" - TX_RAM wTrainerName + text_ram wTrainerName text "!" prompt _TrainerAboutToUseText:: - TX_RAM wTrainerName + text_ram wTrainerName text " is" line "about to use" cont"@" - TX_RAM wEnemyMonNick + text_ram wEnemyMonNick text "!" para "Will <PLAYER>" @@ -909,10 +921,10 @@ _TrainerAboutToUseText:: done _TrainerSentOutText:: - TX_RAM wTrainerName + text_ram wTrainerName text " sent" line "out @" - TX_RAM wEnemyMonNick + text_ram wEnemyMonNick text "!" done @@ -941,7 +953,7 @@ _ItemsCantBeUsedHereText:: prompt _AlreadyOutText:: - TX_RAM wBattleMonNick + text_ram wBattleMonNick text " is" line "already out!" prompt @@ -957,7 +969,7 @@ _MoveDisabledText:: prompt _NoMovesLeftText:: - TX_RAM wBattleMonNick + text_ram wBattleMonNick text " has no" line "moves left!" done @@ -965,12 +977,12 @@ _NoMovesLeftText:: _MultiHitText:: text "Hit the enemy" line "@" - TX_NUM wPlayerNumHits,1,1 + text_decimal wPlayerNumHits, 1, 1 text " times!" prompt _ScaredText:: - TX_RAM wBattleMonNick + text_ram wBattleMonNick text " is too" line "scared to move!" prompt @@ -1058,28 +1070,32 @@ _CantMoveText:: _MoveIsDisabledText:: text "<USER>'s" line "@" - TX_RAM wcd6d + text_ram wcd6d text " is" cont "disabled!" prompt _MonName1Text:: - text "<USER>@@" + text "<USER>@" + text_end _Used1Text:: - text "" - line "used @@" + text_start + line "used @" + text_end _Used2Text:: - text "" - line "used @@" + text_start + line "used @" + text_end _InsteadText:: text "instead," - cont "@@" + cont "@" + text_end _CF4BText:: - TX_RAM wcf4b + text_ram wcf4b text "@" _ExclamationPoint1Text:: @@ -1132,32 +1148,32 @@ _OHKOText:: prompt _LoafingAroundText:: - TX_RAM wBattleMonNick + text_ram wBattleMonNick text " is" line "loafing around." prompt _BeganToNapText:: - TX_RAM wBattleMonNick + text_ram wBattleMonNick text " began" line "to nap!" prompt _WontObeyText:: - TX_RAM wBattleMonNick + text_ram wBattleMonNick text " won't" line "obey!" prompt _TurnedAwayText:: - TX_RAM wBattleMonNick + text_ram wBattleMonNick text " turned" line "away!" prompt _IgnoredOrdersText:: - TX_RAM wBattleMonNick - text "" + text_ram wBattleMonNick + text_start line "ignored orders!" prompt @@ -1184,58 +1200,62 @@ _MirrorMoveFailedText:: _HitXTimesText:: text "Hit @" - TX_NUM wEnemyNumHits, 1, 1 + text_decimal wEnemyNumHits, 1, 1 text " times!" prompt _GainedText:: - TX_RAM wcd6d + text_ram wcd6d text " gained" - line "@@" + line "@" + text_end _WithExpAllText:: text "with EXP.ALL," - cont "@@" + cont "@" + text_end _BoostedText:: text "a boosted" - cont "@@" + cont "@" + text_end _ExpPointsText:: - TX_NUM wExpAmountGained, 2, 4 + text_decimal wExpAmountGained, 2, 4 text " EXP. Points!" prompt _GrewLevelText:: - TX_RAM wcd6d + text_ram wcd6d text " grew" line "to level @" - TX_NUM wCurEnemyLVL, 1, 3 - text "!@@" + text_decimal wCurEnemyLVL, 1, 3 + text "!@" + text_end _WildMonAppearedText:: text "Wild @" - TX_RAM wEnemyMonNick - text "" + text_ram wEnemyMonNick + text_start line "appeared!" prompt _HookedMonAttackedText:: text "The hooked" line "@" - TX_RAM wEnemyMonNick - text "" + text_ram wEnemyMonNick + text_start cont "attacked!" prompt _EnemyAppearedText:: - TX_RAM wEnemyMonNick - text "" + text_ram wEnemyMonNick + text_start line "appeared!" prompt _TrainerWantsToFightText:: - TX_RAM wTrainerName + text_ram wTrainerName text " wants" line "to fight!" prompt @@ -1252,38 +1272,46 @@ _GhostCantBeIDdText:: prompt _GoText:: - text "Go! @@" + text "Go! @" + text_end _DoItText:: - text "Do it! @@" + text "Do it! @" + text_end _GetmText:: - text "Get'm! @@" + text "Get'm! @" + text_end _EnemysWeakText:: text "The enemy's weak!" - line "Get'm! @@" + line "Get'm! @" + text_end _PlayerMon1Text:: - TX_RAM wBattleMonNick + text_ram wBattleMonNick text "!" done _PlayerMon2Text:: - TX_RAM wBattleMonNick - text " @@" + text_ram wBattleMonNick + text " @" + text_end _EnoughText:: - text "enough!@@" + text "enough!@" + text_end _OKExclamationText:: - text "OK!@@" + text "OK!@" + text_end _GoodText:: - text "good!@@" + text "good!@" + text_end _ComeBackText:: - text "" + text_start line "Come back!" done @@ -1299,15 +1327,15 @@ _NotVeryEffectiveText:: _SafariZoneEatingText:: text "Wild @" - TX_RAM wEnemyMonNick - text "" + text_ram wEnemyMonNick + text_start line "is eating!" prompt _SafariZoneAngryText:: text "Wild @" - TX_RAM wEnemyMonNick - text "" + text_ram wEnemyMonNick + text_start line "is angry!" prompt @@ -1315,7 +1343,7 @@ _SafariZoneAngryText:: _PickUpPayDayMoneyText:: text "<PLAYER> picked up" line "¥@" - TX_BCD wTotalPayDayMoney, 3 | LEADING_ZEROES | LEFT_ALIGN + text_bcd wTotalPayDayMoney, 3 | LEADING_ZEROES | LEFT_ALIGN text "!" prompt @@ -1354,61 +1382,62 @@ _PartyMenuSwapMonText:: done _PotionText:: - TX_RAM wcd6d - text "" + text_ram wcd6d + text_start line "recovered by @" - TX_NUM wHPBarHPDifference, 2, 3 + text_decimal wHPBarHPDifference, 2, 3 text "!" done _AntidoteText:: - TX_RAM wcd6d + text_ram wcd6d text " was" line "cured of poison!" done _ParlyzHealText:: - TX_RAM wcd6d + text_ram wcd6d text "'s" line "rid of paralysis!" done _BurnHealText:: - TX_RAM wcd6d + text_ram wcd6d text "'s" line "burn was healed!" done _IceHealText:: - TX_RAM wcd6d + text_ram wcd6d text " was" line "defrosted!" done _AwakeningText:: - TX_RAM wcd6d - text "" + text_ram wcd6d + text_start line "woke up!" done _FullHealText:: - TX_RAM wcd6d + text_ram wcd6d text "'s" line "health returned!" done _ReviveText:: - TX_RAM wcd6d - text "" + text_ram wcd6d + text_start line "is revitalized!" done _RareCandyText:: - TX_RAM wcd6d + text_ram wcd6d text " grew" line "to level @" - TX_NUM wCurEnemyLVL, 1, 3 - text "!@@" + text_decimal wCurEnemyLVL, 1, 3 + text "!@" + text_end _TurnedOnPC1Text:: text "<PLAYER> turned on" @@ -1458,7 +1487,7 @@ _DepositHowManyText:: done _ItemWasStoredText:: - TX_RAM wcd6d + text_ram wcd6d text " was" line "stored via PC." prompt @@ -1485,7 +1514,7 @@ _WithdrawHowManyText:: _WithdrewItemText:: text "Withdrew" line "@" - TX_RAM wcd6d + text_ram wcd6d text "." prompt @@ -1530,10 +1559,10 @@ _DepositWhichMonText:: done _MonWasStoredText:: - TX_RAM wcf4b + text_ram wcf4b text " was" line "stored in Box @" - TX_RAM wBoxNumString + text_ram wBoxNumString text "." prompt @@ -1548,11 +1577,11 @@ _BoxFullText:: prompt _MonIsTakenOutText:: - TX_RAM wcf4b + text_ram wcf4b text " is" line "taken out." cont "Got @" - TX_RAM wcf4b + text_ram wcf4b text "." prompt @@ -1577,25 +1606,26 @@ _ReleaseWhichMonText:: _OnceReleasedText:: text "Once released," line "@" - TX_RAM wcf4b + text_ram wcf4b text " is" cont "gone forever. OK?" done _MonWasReleasedText:: - TX_RAM wcf4b + text_ram wcf4b text " was" line "released outside." cont "Bye @" _CF4BExclamationText:: - TX_RAM wcf4b + text_ram wcf4b text "!" prompt _RequireCoinCaseText:: text "A COIN CASE is" - line "required!@@" + line "required!@" + text_end _ExchangeCoinsForPrizesText:: text "We exchange your" @@ -1608,25 +1638,29 @@ _WhichPrizeText:: done _HereYouGoText:: - text "Here you go!@@" + text "Here you go!@" + text_end _SoYouWantPrizeText:: text "So, you want" line "@" - TX_RAM wcd6d + text_ram wcd6d text "?" done _SorryNeedMoreCoinsText:: text "Sorry, you need" - line "more coins.@@" + line "more coins.@" + text_end _OopsYouDontHaveEnoughRoomText:: text "Oops! You don't" - line "have enough room.@@" + line "have enough room.@" + text_end _OhFineThenText:: - text "Oh, fine then.@@" + text "Oh, fine then.@" + text_end _GetDexRatedText:: text "Want to get your" @@ -1635,7 +1669,8 @@ _GetDexRatedText:: _ClosedOaksPCText:: text "Closed link to" - line "PROF.OAK's PC.@@" + line "PROF.OAK's PC.@" + text_end _AccessedOaksPCText:: text "Accessed PROF." @@ -1674,10 +1709,13 @@ _OakSpeechText2A:: text "This world is" line "inhabited by" cont "creatures called" - cont "#MON!@@" + cont "#MON!@" + text_end _OakSpeechText2B:: - text $51,"For some people," + text_start + + para "For some people," line "#MON are" cont "pets. Others use" cont "them for fights." @@ -1720,7 +1758,7 @@ _DoYouWantToNicknameText:: text "Do you want to" line "give a nickname" cont "to @" - TX_RAM wcd6d + text_ram wcd6d text "?" done @@ -1736,18 +1774,19 @@ _HisNameIsText:: prompt _WillBeTradedText:: - TX_RAM wNameOfPlayerMonToBeTraded + text_ram wNameOfPlayerMonToBeTraded text " and" line "@" - TX_RAM wcd6d + text_ram wcd6d text " will" cont "be traded." done -_Char00Text:: - TX_NUM hSpriteIndexOrTextID,1,2 +_TextIDErrorText:: + text_decimal hSpriteIndexOrTextID, 1, 2 text " ERROR." done -_Char55Text:: - text $4B,"@@" +_ContCharText:: + text "<_CONT>@" + text_end diff --git a/data/text/text_3.asm b/data/text/text_3.asm index 3b2ff787..6407dce7 100644 --- a/data/text/text_3.asm +++ b/data/text/text_3.asm @@ -29,31 +29,32 @@ _WhenYouChangeBoxText:: _ChooseABoxText:: text "Choose a" - line "<pkmn> BOX.@@" + line "<PKMN> BOX.@" + text_end _EvolvedText:: - TX_RAM wcf4b + text_ram wcf4b text " evolved" done _IntoText:: - text "" + text_start line "into @" - TX_RAM wcd6d + text_ram wcd6d text "!" done _StoppedEvolvingText:: text "Huh? @" - TX_RAM wcf4b - text "" + text_ram wcf4b + text_start line "stopped evolving!" prompt _IsEvolvingText:: text "What? @" - TX_RAM wcf4b - text "" + text_ram wcf4b + text_start line "is evolving!" done @@ -95,11 +96,13 @@ _FireDefrostedText:: _MonsStatsRoseText:: text "<USER>'s" line "@" - TX_RAM wcf4b - text "@@" + text_ram wcf4b + text "@" + text_end _GreatlyRoseText:: - text $4c, "greatly@@" + text "<SCROLL>greatly@" + text_end _RoseText:: text " rose!" @@ -108,11 +111,13 @@ _RoseText:: _MonsStatsFellText:: text "<TARGET>'s" line "@" - TX_RAM wcf4b - text "@@" + text_ram wcf4b + text "@" + text_end _GreatlyFellText:: - text $4c, "greatly@@" + text "<SCROLL>greatly@" + text_end _FellText:: text " fell!" @@ -134,35 +139,36 @@ _WasBlownAwayText:: prompt _ChargeMoveEffectText:: - text "<USER>@@" + text "<USER>@" + text_end _MadeWhirlwindText:: - text "" + text_start line "made a whirlwind!" prompt _TookInSunlightText:: - text "" + text_start line "took in sunlight!" prompt _LoweredItsHeadText:: - text "" + text_start line "lowered its head!" prompt _SkyAttackGlowingText:: - text "" + text_start line "is glowing!" prompt _FlewUpHighText:: - text "" + text_start line "flew up high!" prompt _DugAHoleText:: - text "" + text_start line "dug a hole!" prompt @@ -175,14 +181,14 @@ _MimicLearnedMoveText:: text "<USER>" line "learned" cont "@" - TX_RAM wcd6d + text_ram wcd6d text "!" prompt _MoveWasDisabledText:: text "<TARGET>'s" line "@" - TX_RAM wcd6d + text_ram wcd6d text " was" cont "disabled!" prompt @@ -285,7 +291,7 @@ _TransformedText:: text "<USER>" line "transformed into" cont "@" - TX_RAM wcd6d + text_ram wcd6d text "!" prompt diff --git a/data/text/text_4.asm b/data/text/text_4.asm index 6ec22680..4c01b5f4 100644 --- a/data/text/text_4.asm +++ b/data/text/text_4.asm @@ -4,8 +4,8 @@ _PokemartGreetingText:: done _PokemonFaintedText:: - TX_RAM wcd6d - text "" + text_ram wcd6d + text_start line "fainted!" done @@ -27,11 +27,11 @@ _PokemartBuyingGreetingText:: done _PokemartTellBuyPriceText:: - TX_RAM wcf4b + text_ram wcf4b text "?" line "That will be" cont "¥@" - TX_BCD hMoney, 3 | LEADING_ZEROES | LEFT_ALIGN + text_bcd hMoney, 3 | LEADING_ZEROES | LEFT_ALIGN text ". OK?" done @@ -58,7 +58,7 @@ _PokemonSellingGreetingText:: _PokemartTellSellPriceText:: text "I can pay you" line "¥@" - TX_BCD hMoney, 3 | LEADING_ZEROES | LEFT_ALIGN + text_bcd hMoney, 3 | LEADING_ZEROES | LEFT_ALIGN text " for that." done @@ -82,11 +82,12 @@ _PokemartAnythingElseText:: done _LearnedMove1Text:: - TX_RAM wLearnMoveMonName + text_ram wLearnMoveMonName text " learned" line "@" - TX_RAM wcf4b - text "!@@" + text_ram wcf4b + text "!@" + text_end _WhichMoveToForgetText:: text "Which move should" @@ -96,53 +97,55 @@ _WhichMoveToForgetText:: _AbandonLearningText:: text "Abandon learning" line "@" - TX_RAM wcf4b + text_ram wcf4b text "?" done _DidNotLearnText:: - TX_RAM wLearnMoveMonName - text "" + text_ram wLearnMoveMonName + text_start line "did not learn" cont "@" - TX_RAM wcf4b + text_ram wcf4b text "!" prompt _TryingToLearnText:: - TX_RAM wLearnMoveMonName + text_ram wLearnMoveMonName text " is" line "trying to learn" cont "@" - TX_RAM wcf4b + text_ram wcf4b text "!" para "But, @" - TX_RAM wLearnMoveMonName - text "" + text_ram wLearnMoveMonName + text_start line "can't learn more" cont "than 4 moves!" para "Delete an older" line "move to make room" cont "for @" - TX_RAM wcf4b + text_ram wcf4b text "?" done _OneTwoAndText:: - text "1, 2 and...@@" + text "1, 2 and...@" + text_end _PoofText:: - text " Poof!@@" + text " Poof!@" + text_end _ForgotAndText:: - text "" + text_start para "@" - TX_RAM wLearnMoveMonName + text_ram wLearnMoveMonName text " forgot" line "@" - TX_RAM wcd6d + text_ram wcd6d text "!" para "And..." @@ -204,7 +207,8 @@ _CableClubNPCPleaseApplyHereHaveToSaveText:: done _CableClubNPCPleaseWaitText:: - text "Please wait.@@" + text "Please wait.@" + text_end _CableClubNPCLinkClosedBecauseOfInactivityText:: text "The link has been" diff --git a/data/text/text_5.asm b/data/text/text_5.asm index 26a11a40..ae7151cc 100644 --- a/data/text/text_5.asm +++ b/data/text/text_5.asm @@ -9,12 +9,13 @@ _CableClubNPCMakingPreparationsText:: done _UsedStrengthText:: - TX_RAM wcd6d + text_ram wcd6d text " used" - line "STRENGTH.@@" + line "STRENGTH.@" + text_end _CanMoveBouldersText:: - TX_RAM wcd6d + text_ram wcd6d text " can" line "move boulders." prompt @@ -40,13 +41,13 @@ _WarpToLastPokemonCenterText:: done _CannotUseTeleportNowText:: - TX_RAM wcd6d + text_ram wcd6d text " can't" line "use TELEPORT now." prompt _CannotFlyHereText:: - TX_RAM wcd6d + text_ram wcd6d text " can't" line "FLY here." prompt @@ -74,18 +75,19 @@ _CannotGetOffHereText:: _GotMonText:: text "<PLAYER> got" line "@" - TX_RAM wcd6d - text "!@@" + text_ram wcd6d + text "!@" + text_end _SentToBoxText:: text "There's no more" line "room for #MON!" cont "@" - TX_RAM wBoxMonNicks + text_ram wBoxMonNicks text " was" cont "sent to #MON" cont "BOX @" - TX_RAM wcf4b + text_ram wcf4b text " on PC!" done diff --git a/data/text/text_6.asm b/data/text/text_6.asm index 45c553cd..39eb22ea 100644 --- a/data/text/text_6.asm +++ b/data/text/text_6.asm @@ -29,19 +29,20 @@ _ItemUseBallText04:: _ItemUseBallText05:: text "All right!" line "@" - TX_RAM wEnemyMonNick + text_ram wEnemyMonNick text " was" - cont "caught!@@" + cont "caught!@" + text_end _ItemUseBallText07:: - TX_RAM wBoxMonNicks + text_ram wBoxMonNicks text " was" line "transferred to" cont "BILL's PC!" prompt _ItemUseBallText08:: - TX_RAM wBoxMonNicks + text_ram wBoxMonNicks text " was" line "transferred to" cont "someone's PC!" @@ -51,13 +52,14 @@ _ItemUseBallText06:: text "New #DEX data" line "will be added for" cont "@" - TX_RAM wEnemyMonNick - text "!@@" + text_ram wEnemyMonNick + text "!@" + text_end _SurfingGotOnText:: text "<PLAYER> got on" line "@" - TX_RAM wcd6d + text_ram wcd6d text "!" prompt @@ -67,10 +69,10 @@ _SurfingNoPlaceToGetOffText:: prompt _VitaminStatRoseText:: - TX_RAM wcd6d + text_ram wcd6d text "'s" line "@" - TX_RAM wcf4b + text_ram wcf4b text " rose." prompt @@ -104,12 +106,13 @@ _FluteWokeUpText:: _PlayedFluteHadEffectText:: text "<PLAYER> played the" - line "# FLUTE.@@" + line "# FLUTE.@" + text_end _CoinCaseNumCoinsText:: text "Coins" line "@" - TX_BCD wPlayerCoins, 2 | LEADING_ZEROES | LEFT_ALIGN + text_bcd wPlayerCoins, 2 | LEADING_ZEROES | LEFT_ALIGN text " " prompt @@ -135,13 +138,13 @@ _RestorePPWhichTechniqueText:: done _PPMaxedOutText:: - TX_RAM wcf4b + text_ram wcf4b text "'s PP" line "is maxed out." prompt _PPIncreasedText:: - TX_RAM wcf4b + text_ram wcf4b text "'s PP" line "increased." prompt @@ -161,26 +164,26 @@ _BootedUpHMText:: _TeachMachineMoveText:: text "It contained" line "@" - TX_RAM wcf4b + text_ram wcf4b text "!" para "Teach @" - TX_RAM wcf4b - text "" + text_ram wcf4b + text_start line "to a #MON?" done _MonCannotLearnMachineMoveText:: - TX_RAM wcd6d + text_ram wcd6d text " is not" line "compatible with" cont "@" - TX_RAM wcf4b + text_ram wcf4b text "." para "It can't learn" line "@" - TX_RAM wcf4b + text_ram wcf4b text "." prompt @@ -217,7 +220,7 @@ _NoCyclingAllowedHereText:: _NoSurfingHereText:: text "No SURFing on" line "@" - TX_RAM wcd6d + text_ram wcd6d text " here!" prompt diff --git a/data/text/text_7.asm b/data/text/text_7.asm index e836fc8e..34f070bd 100644 --- a/data/text/text_7.asm +++ b/data/text/text_7.asm @@ -1,39 +1,42 @@ _ItemUseText001:: - text "<PLAYER> used@@" + text "<PLAYER> used@" + text_end _ItemUseText002:: - TX_RAM wcf4b + text_ram wcf4b text "!" done _GotOnBicycleText1:: - text "<PLAYER> got on the@@" + text "<PLAYER> got on the@" + text_end _GotOnBicycleText2:: - TX_RAM wcf4b + text_ram wcf4b text "!" prompt _GotOffBicycleText1:: - text "<PLAYER> got off@@" + text "<PLAYER> got off@" + text_end _GotOffBicycleText2:: text "the @" - TX_RAM wcf4b + text_ram wcf4b text "." prompt _ThrewAwayItemText:: text "Threw away" line "@" - TX_RAM wcd6d + text_ram wcd6d text "." prompt _IsItOKToTossItemText:: text "Is it OK to toss" line "@" - TX_RAM wcf4b + text_ram wcf4b text "?" prompt @@ -43,10 +46,10 @@ _TooImportantToTossText:: prompt _AlreadyKnowsText:: - TX_RAM wcd6d + text_ram wcd6d text " knows" line "@" - TX_RAM wcf4b + text_ram wcf4b text "!" prompt @@ -58,21 +61,22 @@ _ConnectCableText:: _TradedForText:: text "<PLAYER> traded" line "@" - TX_RAM wInGameTradeGiveMonName + text_ram wInGameTradeGiveMonName text " for" cont "@" - TX_RAM wInGameTradeReceiveMonName - text "!@@" + text_ram wInGameTradeReceiveMonName + text "!@" + text_end _WannaTrade1Text:: text "I'm looking for" line "@" - TX_RAM wInGameTradeGiveMonName + text_ram wInGameTradeGiveMonName text "! Wanna" para "trade one for" line "@" - TX_RAM wInGameTradeReceiveMonName + text_ram wInGameTradeReceiveMonName text "? " done @@ -84,7 +88,7 @@ _NoTrade1Text:: _WrongMon1Text:: text "What? That's not" line "@" - TX_RAM wInGameTradeGiveMonName + text_ram wInGameTradeGiveMonName text "!" para "If you get one," @@ -98,7 +102,7 @@ _Thanks1Text:: _AfterTrade1Text:: text "Isn't my old" line "@" - TX_RAM wInGameTradeReceiveMonName + text_ram wInGameTradeReceiveMonName text " great?" done @@ -107,10 +111,10 @@ _WannaTrade2Text:: line "you want to trade" para "your @" - TX_RAM wInGameTradeGiveMonName - text "" + text_ram wInGameTradeGiveMonName + text_start line "for @" - TX_RAM wInGameTradeReceiveMonName + text_ram wInGameTradeReceiveMonName text "?" done @@ -122,7 +126,7 @@ _NoTrade2Text:: _WrongMon2Text:: text "Hmmm? This isn't" line "@" - TX_RAM wInGameTradeGiveMonName + text_ram wInGameTradeGiveMonName text "." para "Think of me when" @@ -135,7 +139,7 @@ _Thanks2Text:: _AfterTrade2Text:: text "The @" - TX_RAM wInGameTradeGiveMonName + text_ram wInGameTradeGiveMonName text " you" line "traded to me" @@ -145,12 +149,12 @@ _AfterTrade2Text:: _WannaTrade3Text:: text "Hi! Do you have" line "@" - TX_RAM wInGameTradeGiveMonName + text_ram wInGameTradeGiveMonName text "?" para "Want to trade it" line "for @" - TX_RAM wInGameTradeReceiveMonName + text_ram wInGameTradeReceiveMonName text "?" done @@ -161,7 +165,7 @@ _NoTrade3Text:: _WrongMon3Text:: text "...This is no" line "@" - TX_RAM wInGameTradeGiveMonName + text_ram wInGameTradeGiveMonName text "." para "If you get one," @@ -175,11 +179,11 @@ _Thanks3Text:: _AfterTrade3Text:: text "How is my old" line "@" - TX_RAM wInGameTradeReceiveMonName + text_ram wInGameTradeReceiveMonName text "?" para "My @" - TX_RAM wInGameTradeGiveMonName + text_ram wInGameTradeGiveMonName text " is" line "doing great!" done @@ -190,7 +194,7 @@ _NothingToCutText:: prompt _UsedCutText:: - TX_RAM wcd6d + text_ram wcd6d text " hacked" line "away with CUT!" prompt |