diff options
51 files changed, 112 insertions, 114 deletions
diff --git a/data/text/text_1.asm b/data/text/text_1.asm index af1d3827..2acc6f68 100644 --- a/data/text/text_1.asm +++ b/data/text/text_1.asm @@ -60,7 +60,7 @@ _PokeCenterSignText:: _FoundItemText:: text "<PLAYER> found" line "@" - text_ram wcf4b + text_ram wStringBuffer text "!@" text_end diff --git a/data/text/text_2.asm b/data/text/text_2.asm index 230a38f0..6720021c 100644 --- a/data/text/text_2.asm +++ b/data/text/text_2.asm @@ -18,7 +18,7 @@ _AIBattleUseItemText:: prompt _TradeWentToText:: - text_ram wcf4b + text_ram wStringBuffer text " went" line "to @" text_ram wLinkEnemyTrainerName @@ -28,7 +28,7 @@ _TradeWentToText:: _TradeForText:: text "For <PLAYER>'s" line "@" - text_ram wcf4b + text_ram wStringBuffer text "," done @@ -70,7 +70,7 @@ _TradeWillTradeText:: _TradeforText:: text "for <PLAYER>'s" line "@" - text_ram wcf4b + text_ram wStringBuffer text "." done @@ -106,7 +106,7 @@ _OneMoreGoSlotMachineText:: _LinedUpText:: text " lined up!" line "Scored @" - text_ram wcf4b + text_ram wStringBuffer text " coins!" done @@ -1094,8 +1094,8 @@ _InsteadText:: cont "@" text_end -_CF4BText:: - text_ram wcf4b +_MoveNameText:: + text_ram wStringBuffer text "@" _ExclamationPoint1Text:: @@ -1559,7 +1559,7 @@ _DepositWhichMonText:: done _MonWasStoredText:: - text_ram wcf4b + text_ram wStringBuffer text " was" line "stored in Box @" text_ram wBoxNumString @@ -1577,11 +1577,11 @@ _BoxFullText:: prompt _MonIsTakenOutText:: - text_ram wcf4b + text_ram wStringBuffer text " is" line "taken out." cont "Got @" - text_ram wcf4b + text_ram wStringBuffer text "." prompt @@ -1606,19 +1606,17 @@ _ReleaseWhichMonText:: _OnceReleasedText:: text "Once released," line "@" - text_ram wcf4b + text_ram wStringBuffer text " is" cont "gone forever. OK?" done _MonWasReleasedText:: - text_ram wcf4b + text_ram wStringBuffer text " was" line "released outside." cont "Bye @" - -_CF4BExclamationText:: - text_ram wcf4b + text_ram wStringBuffer text "!" prompt diff --git a/data/text/text_3.asm b/data/text/text_3.asm index 6407dce7..daae6fb5 100644 --- a/data/text/text_3.asm +++ b/data/text/text_3.asm @@ -33,7 +33,7 @@ _ChooseABoxText:: text_end _EvolvedText:: - text_ram wcf4b + text_ram wStringBuffer text " evolved" done @@ -46,14 +46,14 @@ _IntoText:: _StoppedEvolvingText:: text "Huh? @" - text_ram wcf4b + text_ram wStringBuffer text_start line "stopped evolving!" prompt _IsEvolvingText:: text "What? @" - text_ram wcf4b + text_ram wStringBuffer text_start line "is evolving!" done @@ -96,7 +96,7 @@ _FireDefrostedText:: _MonsStatsRoseText:: text "<USER>'s" line "@" - text_ram wcf4b + text_ram wStringBuffer text "@" text_end @@ -111,7 +111,7 @@ _RoseText:: _MonsStatsFellText:: text "<TARGET>'s" line "@" - text_ram wcf4b + text_ram wStringBuffer text "@" text_end diff --git a/data/text/text_4.asm b/data/text/text_4.asm index 4c01b5f4..6a472dc2 100644 --- a/data/text/text_4.asm +++ b/data/text/text_4.asm @@ -27,7 +27,7 @@ _PokemartBuyingGreetingText:: done _PokemartTellBuyPriceText:: - text_ram wcf4b + text_ram wStringBuffer text "?" line "That will be" cont "¥@" @@ -85,7 +85,7 @@ _LearnedMove1Text:: text_ram wLearnMoveMonName text " learned" line "@" - text_ram wcf4b + text_ram wStringBuffer text "!@" text_end @@ -97,7 +97,7 @@ _WhichMoveToForgetText:: _AbandonLearningText:: text "Abandon learning" line "@" - text_ram wcf4b + text_ram wStringBuffer text "?" done @@ -106,7 +106,7 @@ _DidNotLearnText:: text_start line "did not learn" cont "@" - text_ram wcf4b + text_ram wStringBuffer text "!" prompt @@ -115,7 +115,7 @@ _TryingToLearnText:: text " is" line "trying to learn" cont "@" - text_ram wcf4b + text_ram wStringBuffer text "!" para "But, @" @@ -127,7 +127,7 @@ _TryingToLearnText:: para "Delete an older" line "move to make room" cont "for @" - text_ram wcf4b + text_ram wStringBuffer text "?" done diff --git a/data/text/text_5.asm b/data/text/text_5.asm index ae7151cc..fb0cac66 100644 --- a/data/text/text_5.asm +++ b/data/text/text_5.asm @@ -87,7 +87,7 @@ _SentToBoxText:: text " was" cont "sent to #MON" cont "BOX @" - text_ram wcf4b + text_ram wStringBuffer text " on PC!" done diff --git a/data/text/text_6.asm b/data/text/text_6.asm index 39eb22ea..194afa7b 100644 --- a/data/text/text_6.asm +++ b/data/text/text_6.asm @@ -72,7 +72,7 @@ _VitaminStatRoseText:: text_ram wcd6d text "'s" line "@" - text_ram wcf4b + text_ram wStringBuffer text " rose." prompt @@ -138,13 +138,13 @@ _RestorePPWhichTechniqueText:: done _PPMaxedOutText:: - text_ram wcf4b + text_ram wStringBuffer text "'s PP" line "is maxed out." prompt _PPIncreasedText:: - text_ram wcf4b + text_ram wStringBuffer text "'s PP" line "increased." prompt @@ -164,11 +164,11 @@ _BootedUpHMText:: _TeachMachineMoveText:: text "It contained" line "@" - text_ram wcf4b + text_ram wStringBuffer text "!" para "Teach @" - text_ram wcf4b + text_ram wStringBuffer text_start line "to a #MON?" done @@ -178,12 +178,12 @@ _MonCannotLearnMachineMoveText:: text " is not" line "compatible with" cont "@" - text_ram wcf4b + text_ram wStringBuffer text "." para "It can't learn" line "@" - text_ram wcf4b + text_ram wStringBuffer text "." prompt diff --git a/data/text/text_7.asm b/data/text/text_7.asm index 34f070bd..fcb27d20 100644 --- a/data/text/text_7.asm +++ b/data/text/text_7.asm @@ -3,7 +3,7 @@ _ItemUseText001:: text_end _ItemUseText002:: - text_ram wcf4b + text_ram wStringBuffer text "!" done @@ -12,7 +12,7 @@ _GotOnBicycleText1:: text_end _GotOnBicycleText2:: - text_ram wcf4b + text_ram wStringBuffer text "!" prompt @@ -22,7 +22,7 @@ _GotOffBicycleText1:: _GotOffBicycleText2:: text "the @" - text_ram wcf4b + text_ram wStringBuffer text "." prompt @@ -36,7 +36,7 @@ _ThrewAwayItemText:: _IsItOKToTossItemText:: text "Is it OK to toss" line "@" - text_ram wcf4b + text_ram wStringBuffer text "?" prompt @@ -49,7 +49,7 @@ _AlreadyKnowsText:: text_ram wcd6d text " knows" line "@" - text_ram wcf4b + text_ram wStringBuffer text "!" prompt diff --git a/engine/battle/core.asm b/engine/battle/core.asm index f325350f..00906cef 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -2239,7 +2239,7 @@ UseBagItem: ld a, [wcf91] ld [wd11e], a call GetItemName - call CopyStringToCF4B ; copy name + call CopyToStringBuffer xor a ld [wPseudoItemID], a call UseItem @@ -3544,7 +3544,7 @@ CheckPlayerStatusConditions: ld a, RAGE ld [wd11e], a call GetMoveName - call CopyStringToCF4B + call CopyToStringBuffer xor a ld [wPlayerMoveEffect], a ld hl, PlayerCanExecuteMove @@ -3746,7 +3746,7 @@ PrintMoveName: ret _PrintMoveName: - text_far _CF4BText + text_far _MoveNameText text_asm ld hl, ExclamationPointPointerTable ld a, [wd11e] ; exclamation point num @@ -5108,7 +5108,7 @@ ReloadMoveData: call IncrementMovePP ; the follow two function calls are used to reload the move name call GetMoveName - call CopyStringToCF4B + call CopyToStringBuffer ld a, $01 and a ret @@ -5609,7 +5609,7 @@ EnemyCanExecuteChargingMove: ld [wNameListType], a call GetName ld de, wcd6d - call CopyStringToCF4B + call CopyToStringBuffer EnemyCanExecuteMove: xor a ld [wMonIsDisobedient], a @@ -6046,7 +6046,7 @@ CheckEnemyStatusConditions: ld a, RAGE ld [wd11e], a call GetMoveName - call CopyStringToCF4B + call CopyToStringBuffer xor a ld [wEnemyMoveEffect], a ld hl, EnemyCanExecuteMove @@ -6088,7 +6088,7 @@ GetCurrentMove: ld [wNameListType], a call GetName ld de, wcd6d - jp CopyStringToCF4B + jp CopyToStringBuffer LoadEnemyMonData: ld a, [wLinkState] diff --git a/engine/battle/effects.asm b/engine/battle/effects.asm index d86a4cbf..91bb9ee0 100644 --- a/engine/battle/effects.asm +++ b/engine/battle/effects.asm @@ -751,7 +751,7 @@ PrintStatText: jr z, .findStatName_outer jr .findStatName_inner .foundStatName - ld de, wcf4b + ld de, wStringBuffer ld bc, $a jp CopyData diff --git a/engine/events/cinnabar_lab.asm b/engine/events/cinnabar_lab.asm index bccc95d1..7cbb2cd5 100644 --- a/engine/events/cinnabar_lab.asm +++ b/engine/events/cinnabar_lab.asm @@ -116,7 +116,7 @@ LoadFossilItemAndMonName:: ld a, [wFossilMon] ld [wd11e], a call GetMonName - call CopyStringToCF4B + call CopyToStringBuffer ld a, [wFossilItem] ld [wd11e], a call GetItemName diff --git a/engine/events/give_pokemon.asm b/engine/events/give_pokemon.asm index 14dcea42..f2374e1e 100644 --- a/engine/events/give_pokemon.asm +++ b/engine/events/give_pokemon.asm @@ -18,7 +18,7 @@ _GivePokemon:: callfar LoadEnemyMonData call SetPokedexOwnedFlag callfar SendNewMonToBox - ld hl, wcf4b + ld hl, wStringBuffer ld a, [wCurrentBoxNum] and $7f cp 9 diff --git a/engine/events/pokemart.asm b/engine/events/pokemart.asm index c7cb8115..a1d69c72 100644 --- a/engine/events/pokemart.asm +++ b/engine/events/pokemart.asm @@ -159,7 +159,7 @@ DisplayPokemartDialogue_:: ld a, [wcf91] ; item ID ld [wd11e], a ; store item ID for GetItemName call GetItemName - call CopyStringToCF4B ; copy name to wcf4b + call CopyToStringBuffer ld hl, PokemartTellBuyPriceText call PrintText hlcoord 14, 7 diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm index 8114db2b..f58b737e 100644 --- a/engine/items/item_effects.asm +++ b/engine/items/item_effects.asm @@ -1307,9 +1307,9 @@ ItemUseMedicine: jr nz, .statNameInnerLoop jr .statNameLoop .gotStatName - ld de, wcf4b + ld de, wStringBuffer ld bc, 10 - call CopyData ; copy the stat's name to wcf4b + call CopyData ; copy the stat's name to wStringBuffer ld a, SFX_HEAL_AILMENT call PlaySound ld hl, VitaminStatRoseText @@ -1984,7 +1984,7 @@ ItemUsePPRestore: ld a, [hl] ld [wd11e], a call GetMoveName - call CopyStringToCF4B ; copy name to wcf4b + call CopyToStringBuffer pop hl ld a, [wPPRestoreItem] cp ETHER @@ -2161,7 +2161,7 @@ ItemUseTMHM: ld a, [wd11e] ld [wMoveNum], a call GetMoveName - call CopyStringToCF4B ; copy name to wcf4b + call CopyToStringBuffer pop af ld hl, BootedUpTMText jr nc, .printBootedUpMachineText @@ -2187,7 +2187,7 @@ ItemUseTMHM: ld a, [wcf91] push af .chooseMon - ld hl, wcf4b + ld hl, wStringBuffer ld de, wTempMoveNameBuffer ld bc, 14 call CopyData ; save the move name because DisplayPartyMenu will overwrite it @@ -2198,7 +2198,7 @@ ItemUseTMHM: call DisplayPartyMenu push af ld hl, wTempMoveNameBuffer - ld de, wcf4b + ld de, wStringBuffer ld bc, 14 call CopyData pop af @@ -2553,7 +2553,7 @@ TossItem_:: ld a, [wcf91] ld [wd11e], a call GetItemName - call CopyStringToCF4B ; copy name to wcf4b + call CopyToStringBuffer ld hl, IsItOKToTossItemText call PrintText hlcoord 14, 7 @@ -2573,7 +2573,7 @@ TossItem_:: ld a, [wcf91] ld [wd11e], a call GetItemName - call CopyStringToCF4B ; copy name to wcf4b + call CopyToStringBuffer ld hl, ThrewAwayItemText call PrintText pop hl diff --git a/engine/menus/naming_screen.asm b/engine/menus/naming_screen.asm index 9347212e..a0062dcd 100644 --- a/engine/menus/naming_screen.asm +++ b/engine/menus/naming_screen.asm @@ -39,7 +39,7 @@ AskName: pop hl pop af ld [wUpdateSpritesEnabled], a - ld a, [wcf4b] + ld a, [wStringBuffer] cp "@" ret nz .declinedNickname @@ -63,7 +63,7 @@ DisplayNameRaterScreen:: call GBPalWhiteOutWithDelay3 call RestoreScreenTilesAndReloadTilePatterns call LoadGBPal - ld a, [wcf4b] + ld a, [wStringBuffer] cp "@" jr z, .playerCancelled ld hl, wPartyMonNicks @@ -109,7 +109,7 @@ DisplayNamingScreen: ld a, 7 ld [wMaxMenuItem], a ld a, "@" - ld [wcf4b], a + ld [wStringBuffer], a xor a ld hl, wNamingScreenSubmitName ld [hli], a @@ -157,7 +157,7 @@ DisplayNamingScreen: .submitNickname pop de - ld hl, wcf4b + ld hl, wStringBuffer ld bc, NAME_LENGTH call CopyData call GBPalWhiteOutWithDelay3 @@ -375,7 +375,7 @@ PrintNicknameAndUnderscores: lb bc, 1, 10 call ClearScreenArea hlcoord 10, 2 - ld de, wcf4b + ld de, wStringBuffer call PlaceString hlcoord 10, 3 ld a, [wNamingScreenType] @@ -437,9 +437,9 @@ DakutensAndHandakutens: INCLUDE "data/text/dakutens.asm" -; calculates the length of the string at wcf4b and stores it in c +; calculates the length of the string at wStringBuffer and stores it in c CalcStringLength: - ld hl, wcf4b + ld hl, wStringBuffer ld c, $0 .loop ld a, [hl] diff --git a/engine/menus/start_sub_menus.asm b/engine/menus/start_sub_menus.asm index c0448121..cd1e6da6 100644 --- a/engine/menus/start_sub_menus.asm +++ b/engine/menus/start_sub_menus.asm @@ -367,7 +367,7 @@ StartMenu_Item:: ld a, [wcf91] ld [wd11e], a call GetItemName - call CopyStringToCF4B ; copy name to wcf4b + call CopyToStringBuffer ld a, [wcf91] cp BICYCLE jr nz, .notBicycle2 diff --git a/engine/movie/oak_speech/oak_speech2.asm b/engine/movie/oak_speech/oak_speech2.asm index 84df7968..7288207b 100644 --- a/engine/movie/oak_speech/oak_speech2.asm +++ b/engine/movie/oak_speech/oak_speech2.asm @@ -15,7 +15,7 @@ ChoosePlayerName: xor a ; NAME_PLAYER_SCREEN ld [wNamingScreenType], a call DisplayNamingScreen - ld a, [wcf4b] + ld a, [wStringBuffer] cp "@" jr z, .customName call ClearScreen @@ -48,7 +48,7 @@ ChooseRivalName: ld a, NAME_RIVAL_SCREEN ld [wNamingScreenType], a call DisplayNamingScreen - ld a, [wcf4b] + ld a, [wStringBuffer] cp "@" jr z, .customName call ClearScreen diff --git a/engine/movie/trade.asm b/engine/movie/trade.asm index bb06f231..a287c9b4 100644 --- a/engine/movie/trade.asm +++ b/engine/movie/trade.asm @@ -189,7 +189,7 @@ LoadTradingGFXAndMonNames: ld [wd11e], a call GetMonName ld hl, wcd6d - ld de, wcf4b + ld de, wStringBuffer ld bc, NAME_LENGTH call CopyData ld a, [wTradedEnemyMonSpecies] diff --git a/engine/movie/trade2.asm b/engine/movie/trade2.asm index f0d91846..98d1158e 100644 --- a/engine/movie/trade2.asm +++ b/engine/movie/trade2.asm @@ -10,7 +10,7 @@ Trade_PrintPlayerMonInfoText: lb bc, LEADING_ZEROES | 1, 3 call PrintNumber hlcoord 5, 2 - ld de, wcf4b + ld de, wStringBuffer call PlaceString hlcoord 8, 4 ld de, wTradedPlayerMonOT diff --git a/engine/pokemon/evos_moves.asm b/engine/pokemon/evos_moves.asm index 7d5fd469..7e41d58d 100644 --- a/engine/pokemon/evos_moves.asm +++ b/engine/pokemon/evos_moves.asm @@ -114,7 +114,7 @@ Evolution_PartyMonLoop: ; loop over party mons ld a, [wWhichPokemon] ld hl, wPartyMonNicks call GetPartyMonName - call CopyStringToCF4B + call CopyToStringBuffer ld hl, IsEvolvingText call PrintText ld c, 50 @@ -268,7 +268,7 @@ RenameEvolvedMon: pop af ld [wd0b5], a ld hl, wcd6d - ld de, wcf4b + ld de, wStringBuffer .compareNamesLoop ld a, [de] inc de @@ -368,7 +368,7 @@ LearnMoveFromLevelUp: ld [wMoveNum], a ld [wd11e], a call GetMoveName - call CopyStringToCF4B + call CopyToStringBuffer predef LearnMove .done ld a, [wcf91] diff --git a/engine/slots/slot_machine.asm b/engine/slots/slot_machine.asm index fe137632..1c2bb4c9 100644 --- a/engine/slots/slot_machine.asm +++ b/engine/slots/slot_machine.asm @@ -445,7 +445,7 @@ SlotMachine_CheckForMatches: ld a, [hli] ld h, [hl] ld l, a - ld de, wcf4b + ld de, wStringBuffer ld bc, 4 call CopyData pop hl diff --git a/home/copy_string.asm b/home/copy_string.asm index 7f86e501..05f9ba80 100644 --- a/home/copy_string.asm +++ b/home/copy_string.asm @@ -1,9 +1,9 @@ -; copies a string from [de] to [wcf4b] -CopyStringToCF4B:: - ld hl, wcf4b +; copies a string from de to wStringBuffer +CopyToStringBuffer:: + ld hl, wStringBuffer ; fall through -; copies a string from [de] to [hl] +; copies a string from de to hl CopyString:: ld a, [de] inc de diff --git a/home/give.asm b/home/give.asm index cbfd0310..f446cf36 100644 --- a/home/give.asm +++ b/home/give.asm @@ -1,6 +1,6 @@ GiveItem:: ; Give player quantity c of item b, -; and copy the item's name to wcf4b. +; and copy the item's name to wStringBuffer. ; Return carry on success. ld a, b ld [wd11e], a @@ -11,7 +11,7 @@ GiveItem:: call AddItemToInventory ret nc call GetItemName - call CopyStringToCF4B + call CopyToStringBuffer scf ret diff --git a/home/list_menu.asm b/home/list_menu.asm index c856e91d..d6bf43b2 100644 --- a/home/list_menu.asm +++ b/home/list_menu.asm @@ -157,7 +157,7 @@ DisplayListMenuIDLoop:: call GetPartyMonName .storeChosenEntry ; store the menu entry that the player chose and return ld de, wcd6d - call CopyStringToCF4B ; copy name to wcf4b + call CopyToStringBuffer ld a, CHOSE_MENU_ITEM ld [wMenuExitMethod], a ld a, [wCurrentMenuItem] diff --git a/text/BillsHouse.asm b/text/BillsHouse.asm index 11bb3200..9bbea9d7 100644 --- a/text/BillsHouse.asm +++ b/text/BillsHouse.asm @@ -56,7 +56,7 @@ _BillThankYouText:: _SSTicketReceivedText:: text "<PLAYER> received" line "an @" - text_ram wcf4b + text_ram wStringBuffer text "!@" text_end diff --git a/text/BluesHouse.asm b/text/BluesHouse.asm index 6e57cb21..8b3cdd20 100644 --- a/text/BluesHouse.asm +++ b/text/BluesHouse.asm @@ -14,7 +14,7 @@ _DaisyOfferMapText:: _GotMapText:: text "<PLAYER> got a" line "@" - text_ram wcf4b + text_ram wStringBuffer text "!@" text_end diff --git a/text/CeladonCity.asm b/text/CeladonCity.asm index 76fa1775..12146016 100644 --- a/text/CeladonCity.asm +++ b/text/CeladonCity.asm @@ -42,7 +42,7 @@ _TM41PreText:: _ReceivedTM41Text:: text "<PLAYER> received" line "@" - text_ram wcf4b + text_ram wStringBuffer text "!@" text_end diff --git a/text/CeladonDiner.asm b/text/CeladonDiner.asm index dd86a0c1..b91cb5a9 100644 --- a/text/CeladonDiner.asm +++ b/text/CeladonDiner.asm @@ -44,7 +44,7 @@ _CeladonDinerText_491a7:: _ReceivedCoinCaseText:: text "<PLAYER> received" line "a @" - text_ram wcf4b + text_ram wStringBuffer text "!@" text_end diff --git a/text/CeladonGym.asm b/text/CeladonGym.asm index 2ea0dc44..f4ca049a 100644 --- a/text/CeladonGym.asm +++ b/text/CeladonGym.asm @@ -64,7 +64,7 @@ _ErikaRainbowBadgeInfoText:: _ReceivedTM21Text:: text "<PLAYER> received" line "@" - text_ram wcf4b + text_ram wStringBuffer text "!@" text_end diff --git a/text/CeladonMart3F.asm b/text/CeladonMart3F.asm index 9871a5ae..c24763e4 100644 --- a/text/CeladonMart3F.asm +++ b/text/CeladonMart3F.asm @@ -10,7 +10,7 @@ _TM18PreReceiveText:: _ReceivedTM18Text:: text "<PLAYER> received" line "@" - text_ram wcf4b + text_ram wStringBuffer text "!@" text_end diff --git a/text/CeladonMartRoof.asm b/text/CeladonMartRoof.asm index 15bf8c04..cbedb3b7 100644 --- a/text/CeladonMartRoof.asm +++ b/text/CeladonMartRoof.asm @@ -17,7 +17,7 @@ _CeladonMartRoofText_484f3:: _CeladonMartRoofText_484f9:: text "<PLAYER> received" line "@" - text_ram wcf4b + text_ram wStringBuffer text "!@" text_end @@ -25,7 +25,7 @@ _CeladonMartRoofText_484fe:: text_start para "@" - text_ram wcf4b + text_ram wStringBuffer text " contains" line "ICE BEAM!" @@ -47,7 +47,7 @@ _CeladonMartRoofText_48504:: _CeladonMartRoofText_4850a:: text "<PLAYER> received" line "@" - text_ram wcf4b + text_ram wStringBuffer text "!@" text_end @@ -55,7 +55,7 @@ _CeladonMartRoofText_4850f:: text_start para "@" - text_ram wcf4b + text_ram wStringBuffer text " contains" line "ROCK SLIDE!" @@ -137,7 +137,7 @@ _VendingMachineText4:: done _VendingMachineText5:: - text_ram wcf4b + text_ram wStringBuffer text_start line "popped out!" done diff --git a/text/CinnabarGym.asm b/text/CinnabarGym.asm index 00fa7084..daab36d4 100644 --- a/text/CinnabarGym.asm +++ b/text/CinnabarGym.asm @@ -45,7 +45,7 @@ _BlaineVolcanoBadgeInfoText:: _ReceivedTM38Text:: text "<PLAYER> received" line "@" - text_ram wcf4b + text_ram wStringBuffer text "!@" text_end diff --git a/text/CinnabarLabFossilRoom.asm b/text/CinnabarLabFossilRoom.asm index e7983fe9..14db7fff 100644 --- a/text/CinnabarLabFossilRoom.asm +++ b/text/CinnabarLabFossilRoom.asm @@ -30,7 +30,7 @@ _Lab4Text_75dd5:: line "back to life!" para "It was @" - text_ram wcf4b + text_ram wStringBuffer text_start line "like I think!" prompt @@ -43,7 +43,7 @@ _Lab4Text_610ae:: para "It is fossil of" line "@" - text_ram wcf4b + text_ram wStringBuffer text ", a" cont "#MON that is" cont "already extinct!" diff --git a/text/CinnabarLabMetronomeRoom.asm b/text/CinnabarLabMetronomeRoom.asm index f9b2c5d5..2a809953 100644 --- a/text/CinnabarLabMetronomeRoom.asm +++ b/text/CinnabarLabMetronomeRoom.asm @@ -9,7 +9,7 @@ _TM35PreReceiveText:: _ReceivedTM35Text:: text "<PLAYER> received " line "@" - text_ram wcf4b + text_ram wStringBuffer text "!@" text_end diff --git a/text/CopycatsHouse2F.asm b/text/CopycatsHouse2F.asm index 7d1aa0ad..117dd64e 100644 --- a/text/CopycatsHouse2F.asm +++ b/text/CopycatsHouse2F.asm @@ -29,7 +29,7 @@ _TM31PreReceiveText:: _ReceivedTM31Text:: text "<PLAYER> received" line "@" - text_ram wcf4b + text_ram wStringBuffer text "!@" text_end diff --git a/text/FuchsiaGoodRodHouse.asm b/text/FuchsiaGoodRodHouse.asm index 142c2837..4625f8bf 100644 --- a/text/FuchsiaGoodRodHouse.asm +++ b/text/FuchsiaGoodRodHouse.asm @@ -19,7 +19,7 @@ _FuchsiaHouse3Text_561c2:: para "<PLAYER> received" line "a @" - text_ram wcf4b + text_ram wStringBuffer text "!@" text_end diff --git a/text/FuchsiaGym_2.asm b/text/FuchsiaGym_2.asm index b6443a5a..bec13956 100644 --- a/text/FuchsiaGym_2.asm +++ b/text/FuchsiaGym_2.asm @@ -27,7 +27,7 @@ _KogaSoulBadgeInfoText:: _ReceivedTM06Text:: text "<PLAYER> received" line "@" - text_ram wcf4b + text_ram wStringBuffer text "!@" text_end diff --git a/text/MrFujisHouse.asm b/text/MrFujisHouse.asm index 2f76ad94..6c7f3439 100644 --- a/text/MrFujisHouse.asm +++ b/text/MrFujisHouse.asm @@ -50,7 +50,7 @@ _LavenderHouse1Text_1d94c:: _ReceivedFluteText:: text "<PLAYER> received" line "a @" - text_ram wcf4b + text_ram wStringBuffer text "!@" text_end diff --git a/text/MrPsychicsHouse.asm b/text/MrPsychicsHouse.asm index 5ac2c9af..f58188e2 100644 --- a/text/MrPsychicsHouse.asm +++ b/text/MrPsychicsHouse.asm @@ -8,7 +8,7 @@ _TM29PreReceiveText:: _ReceivedTM29Text:: text "<PLAYER> received" line "@" - text_ram wcf4b + text_ram wStringBuffer text "!@" text_end diff --git a/text/MtMoonB2F.asm b/text/MtMoonB2F.asm index f920e0fb..87d8d755 100644 --- a/text/MtMoonB2F.asm +++ b/text/MtMoonB2F.asm @@ -11,7 +11,7 @@ _MtMoon3Text_49f64:: _MtMoon3Text_49f6f:: text "<PLAYER> got the" line "@" - text_ram wcf4b + text_ram wStringBuffer text "!@" text_end diff --git a/text/PokemonFanClub.asm b/text/PokemonFanClub.asm index 87c273a6..150bbeba 100644 --- a/text/PokemonFanClub.asm +++ b/text/PokemonFanClub.asm @@ -85,7 +85,7 @@ FanClubChairStoryText:: ReceivedBikeVoucherText:: text "<PLAYER> received" line "a @" - text_ram wcf4b + text_ram wStringBuffer text "!@" text_end diff --git a/text/Route1.asm b/text/Route1.asm index bf32af26..c7a05cd4 100644 --- a/text/Route1.asm +++ b/text/Route1.asm @@ -15,7 +15,7 @@ _Route1ViridianMartSampleText:: _Route1Text_1cae8:: text "<PLAYER> got" line "@" - text_ram wcf4b + text_ram wStringBuffer text "!@" text_end diff --git a/text/Route12SuperRodHouse.asm b/text/Route12SuperRodHouse.asm index ff633d3a..990fc631 100644 --- a/text/Route12SuperRodHouse.asm +++ b/text/Route12SuperRodHouse.asm @@ -18,7 +18,7 @@ _Route12HouseText_564c5:: para "<PLAYER> received" line "a @" - text_ram wcf4b + text_ram wStringBuffer text "!@" text_end diff --git a/text/Route24.asm b/text/Route24.asm index 6792c401..5dc4ab79 100644 --- a/text/Route24.asm +++ b/text/Route24.asm @@ -14,7 +14,7 @@ _Route24Text_51515:: _Route24Text_5151a:: text "<PLAYER> received" line "a @" - text_ram wcf4b + text_ram wStringBuffer text "!@" text_end diff --git a/text/SSAnneCaptainsRoom.asm b/text/SSAnneCaptainsRoom.asm index 5216cf04..13829483 100644 --- a/text/SSAnneCaptainsRoom.asm +++ b/text/SSAnneCaptainsRoom.asm @@ -34,7 +34,7 @@ _ReceivingHM01Text:: _ReceivedHM01Text:: text "<PLAYER> got" line "@" - text_ram wcf4b + text_ram wStringBuffer text "!@" text_end diff --git a/text/SafariZoneSecretHouse.asm b/text/SafariZoneSecretHouse.asm index 8aff18b7..c8006170 100644 --- a/text/SafariZoneSecretHouse.asm +++ b/text/SafariZoneSecretHouse.asm @@ -17,7 +17,7 @@ _SecretHouseText_4a350:: _ReceivedHM03Text:: text "<PLAYER> received" line "@" - text_ram wcf4b + text_ram wStringBuffer text "!@" text_end diff --git a/text/SilphCo11F.asm b/text/SilphCo11F.asm index 36adf7d9..1b42fd93 100644 --- a/text/SilphCo11F.asm +++ b/text/SilphCo11F.asm @@ -22,7 +22,7 @@ _SilphCoPresidentText:: _ReceivedSilphCoMasterBallText:: text "<PLAYER> got a" line "@" - text_ram wcf4b + text_ram wStringBuffer text "!@" text_end diff --git a/text/SilphCo2F.asm b/text/SilphCo2F.asm index b0cce269..32546b15 100644 --- a/text/SilphCo2F.asm +++ b/text/SilphCo2F.asm @@ -12,7 +12,7 @@ _SilphCo2Text_59ded:: _ReceivedTM36Text:: text "<PLAYER> got" line "@" - text_ram wcf4b + text_ram wStringBuffer text "!@" text_end diff --git a/text/VermilionGym_2.asm b/text/VermilionGym_2.asm index 02af599d..01857483 100644 --- a/text/VermilionGym_2.asm +++ b/text/VermilionGym_2.asm @@ -26,7 +26,7 @@ _LTSurgeThunderBadgeInfoText:: _ReceivedTM24Text:: text "<PLAYER> received " line "@" - text_ram wcf4b + text_ram wStringBuffer text "!@" text_end diff --git a/text/VermilionOldRodHouse.asm b/text/VermilionOldRodHouse.asm index d9a94cd4..587681b2 100644 --- a/text/VermilionOldRodHouse.asm +++ b/text/VermilionOldRodHouse.asm @@ -18,7 +18,7 @@ _VermilionHouse2Text_560b6:: para "<PLAYER> received" line "an @" - text_ram wcf4b + text_ram wStringBuffer text "!@" text_end diff --git a/text/WardensHouse.asm b/text/WardensHouse.asm index 47612904..16ac6835 100644 --- a/text/WardensHouse.asm +++ b/text/WardensHouse.asm @@ -46,7 +46,7 @@ _WardenThankYouText:: _ReceivedHM04Text:: text "<PLAYER> received" line "@" - text_ram wcf4b + text_ram wStringBuffer text "!@" text_end @@ -1055,7 +1055,7 @@ wPartyMenuBlkPacket:: ds $30 NEXTU ds 29 ; storage buffer for various strings -wcf4b:: ds 20 +wStringBuffer:: ds 20 NEXTU ds 29 |