diff options
137 files changed, 1285 insertions, 1217 deletions
diff --git a/constants/wram_constants.asm b/constants/wram_constants.asm index ab705bc12..08cb2092b 100644 --- a/constants/wram_constants.asm +++ b/constants/wram_constants.asm @@ -37,7 +37,7 @@ TEXT_DELAY_FAST EQU %001 ; 1 TEXT_DELAY_MED EQU %011 ; 3 TEXT_DELAY_SLOW EQU %101 ; 5 -; wTextBoxFrame:: ; cfce +; wTextboxFrame:: ; cfce const_def const FRAME_1 ; 0 const FRAME_2 ; 1 @@ -49,7 +49,7 @@ TEXT_DELAY_SLOW EQU %101 ; 5 const FRAME_8 ; 7 NUM_FRAMES EQU const_value -; wTextBoxFlags:: ; cfcf +; wTextboxFlags:: ; cfcf const_def const FAST_TEXT_DELAY_F ; 0 const NO_TEXT_DELAY_F ; 1 diff --git a/data/default_options.asm b/data/default_options.asm index 333f7ef02..c09b18060 100644 --- a/data/default_options.asm +++ b/data/default_options.asm @@ -3,9 +3,9 @@ DefaultOptions: db TEXT_DELAY_MED ; wSaveFileExists: no db FALSE -; wTextBoxFrame: frame 1 +; wTextboxFrame: frame 1 db FRAME_1 -; wTextBoxFlags: use text speed +; wTextboxFlags: use text speed db 1 << FAST_TEXT_DELAY_F ; wGBPrinter: normal brightness db GBPRINTER_NORMAL diff --git a/data/text/common_1.asm b/data/text/common_1.asm index 617de0f49..5c3686350 100644 --- a/data/text/common_1.asm +++ b/data/text/common_1.asm @@ -27,17 +27,17 @@ _NothingHereText:: line "here…" done -UnknownText_0x1bc06b:: +_WhichApricornText:: text "Which APRICORN" line "should I use?" done -UnknownText_0x1bc089:: +_HowManyShouldIMakeText:: text "How many should I" line "make?" done -UnknownText_0x1bc0a2:: +_RecoveredSomeHPText:: text_ram wStringBuffer1 text_start line "recovered @" @@ -45,49 +45,49 @@ UnknownText_0x1bc0a2:: text "HP!" done -UnknownText_0x1bc0bb:: +_CuredOfPoisonText:: text_ram wStringBuffer1 text "'s" line "cured of poison." done -UnknownText_0x1bc0d2:: +_RidOfParalysisText:: text_ram wStringBuffer1 text "'s" line "rid of paralysis." done -UnknownText_0x1bc0ea:: +_BurnWasHealedText:: text_ram wStringBuffer1 text "'s" line "burn was healed." done -UnknownText_0x1bc101:: +_WasDefrostedText:: text_ram wStringBuffer1 text_start line "was defrosted." done -UnknownText_0x1bc115:: +_WokeUpText:: text_ram wStringBuffer1 text_start line "woke up." done -UnknownText_0x1bc123:: +_HealthReturnedText:: text_ram wStringBuffer1 text "'s" line "health returned." done -UnknownText_0x1bc13a:: +_RevitalizedText:: text_ram wStringBuffer1 text_start line "is revitalized." done -UnknownText_0x1bc14f:: +_GrewToLevelText:: text_ram wStringBuffer1 text " grew to" line "level @" @@ -99,28 +99,28 @@ UnknownText_0x1bc14f:: text_end ; unused -UnknownText_0x1bc16e:: +_CameToItsSensesText:: text_ram wStringBuffer1 text " came" line "to its senses." done -UnknownText_0x1bc187:: +_EnterNewPasscodeText:: text "Please enter any" line "four-digit number." done -UnknownText_0x1bc1ac:: +_ConfirmPasscodeText:: text "Enter the same" line "number to confirm." done -UnknownText_0x1bc1cf:: +_PasscodesNotSameText:: text "That's not the" line "same number." done -UnknownText_0x1bc1eb:: +_PasscodeSetText:: text "Your PASSCODE has" line "been set." @@ -131,29 +131,29 @@ UnknownText_0x1bc1eb:: para "" done -UnknownText_0x1bc23e:: +_FourZerosInvalidText:: text "0000 is invalid!" para "" done -UnknownText_0x1bc251:: +_EnterPasscodeText:: text "Enter the CARD" next "FOLDER PASSCODE." done -UnknownText_0x1bc272:: +_IncorrectPasscodeText:: text "Incorrect" line "PASSCODE!" para "" done -UnknownText_0x1bc288:: +_CardFolderOpenText:: text "CARD FOLDER open.@" text_end -UnknownText_0x1bc29c:: +_OakTimeText1:: text "<……><……><……><……><……><……>" line "<……><……><……><……><……><……>" @@ -164,52 +164,52 @@ UnknownText_0x1bc29c:: line "clock for me?" prompt -UnknownText_0x1bc2eb:: +_OakTimeText2:: text "What time is it?" done -UnknownText_0x1bc2fd:: +_OakTimeText3:: text "What?@" text_end -UnknownText_0x1bc305:: +_OakTimeText4:: text "?" done -UnknownText_0x1bc308:: +_OakTimeText5:: text "How many minutes?" done -UnknownText_0x1bc31b:: +_OakTimeText6:: text "Whoa!@" text_end -UnknownText_0x1bc323:: +_OakTimeText7:: text "?" done -UnknownText_0x1bc326:: +_OakTimeText8:: text "!" line "I overslept!" done -UnknownText_0x1bc336:: +_OakTimeText11:: text "!" line "Yikes! I over-" cont "slept!" done -UnknownText_0x1bc34f:: +_OakTimeText12:: text "!" line "No wonder it's so" cont "dark!" done -UnknownText_0x1bc369:: +_OakTimeText13:: text "What day is it?" done -UnknownText_0x1bc37a:: +_OakTimeText14:: text ", is it?" done @@ -263,41 +263,41 @@ UnknownText_0x1bc45e:: line "amount." done -UnknownText_0x1bc471:: +_NothingToChooseText:: text "There's nothing to" line "choose." prompt -UnknownText_0x1bc48c:: +_WhichSidePutOnText:: text "Which side do you" line "want to put it on?" done -UnknownText_0x1bc4b2:: +_WhichSidePutAwayText:: text "Which side do you" line "want to put away?" done -UnknownText_0x1bc4d7:: +_PutAwayTheDecoText:: text "Put away the" line "@" text_ram wStringBuffer3 text "." prompt -UnknownText_0x1bc4ec:: +_NothingToPutAwayText:: text "There's nothing to" line "put away." prompt -UnknownText_0x1bc509:: +_SetUpTheDecoText:: text "Set up the" line "@" text_ram wStringBuffer3 text "." prompt -UnknownText_0x1bc51c:: +_PutAwayAndSetUpText:: text "Put away the" line "@" text_ram wStringBuffer3 @@ -309,74 +309,74 @@ UnknownText_0x1bc51c:: text "." prompt -UnknownText_0x1bc546:: +_AlreadySetUpText:: text "That's already set" line "up." prompt -UnknownText_0x1bc55d:: +_LookTownMapText:: text "It's the TOWN MAP." done -UnknownText_0x1bc570:: +_LookPikachuPosterText:: text "It's a poster of a" line "cute PIKACHU." done -UnknownText_0x1bc591:: +_LookClefairyPosterText:: text "It's a poster of a" line "cute CLEFAIRY." done -UnknownText_0x1bc5b3:: +_LookJigglypuffPosterText:: text "It's a poster of a" line "cute JIGGLYPUFF." done -UnknownText_0x1bc5d7:: +_LookAdorableDecoText:: text "It's an adorable" line "@" text_ram wStringBuffer3 text "." done -UnknownText_0x1bc5ef:: +_LookGiantDecoText:: text "A giant doll! It's" line "fluffy and cuddly." done -UnknownText_0x1bc615:: +_MomShoppingText1:: text "Hi, <PLAYER>!" line "How are you?" prompt -UnknownText_0x1bc62a:: +_MomShoppingText2:: text "I found a useful" line "item shopping, so" prompt -UnknownText_0x1bc64e:: +_MomShoppingText3:: text "I bought it with" line "your money. Sorry!" prompt -UnknownText_0x1bc673:: +_MomShoppingText4:: text "It's in your PC." line "You'll like it!" done -UnknownText_0x1bc693:: +_MomShoppingText5:: text "While shopping" line "today, I saw this" cont "adorable doll, so" prompt -UnknownText_0x1bc6c7:: +_MomShoppingText6:: text "It's in your room." line "You'll love it!" done -UnknownText_0x1bc6e9:: +_TradingText1:: text_ram wPlayerTrademonSpeciesName text " was" line "sent to @" @@ -384,29 +384,29 @@ UnknownText_0x1bc6e9:: text "." done -UnknownText_0x1bc701:: +_TradingText2:: text_start done -UnknownText_0x1bc703:: +_TradingText3:: text_ram wOTTrademonSenderName text " bids" line "farewell to" done -UnknownText_0x1bc719:: +_TradingText4:: text_ram wOTTrademonSpeciesName text "." done -UnknownText_0x1bc71f:: +_TradingText5:: text "Take good care of" line "@" text_ram wOTTrademonSpeciesName text "." done -UnknownText_0x1bc739:: +_TradingText6:: text "For @" text_ram wPlayerTrademonSenderName text "'s" @@ -415,7 +415,7 @@ UnknownText_0x1bc739:: text "," done -UnknownText_0x1bc74c:: +_TradingText7:: text_ram wOTTrademonSenderName text " sends" line "@" @@ -423,7 +423,7 @@ UnknownText_0x1bc74c:: text "." done -UnknownText_0x1bc75e:: +_TradingText8:: text_ram wOTTrademonSenderName text " will" line "trade @" @@ -432,7 +432,7 @@ UnknownText_0x1bc75e:: text_end ; unused -UnknownText_0x1bc774:: +_TradingText9:: text "for @" text_ram wPlayerTrademonSenderName text "'s" @@ -441,7 +441,7 @@ UnknownText_0x1bc774:: text "." done -UnknownText_0x1bc787:: +_TradingText10:: text_ram wPlayerTrademonSenderName text " will" line "trade @" @@ -450,7 +450,7 @@ UnknownText_0x1bc787:: text_end ; unused -UnknownText_0x1bc79d:: +_TradingText11:: text "for @" text_ram wOTTrademonSenderName text "'s" @@ -459,7 +459,7 @@ UnknownText_0x1bc79d:: text "." done -UnknownText_0x1bc7b0:: +_TradingText12:: text_ram wPlayerTrademonSenderName text "'s" line "@" @@ -467,14 +467,14 @@ UnknownText_0x1bc7b0:: text " trade…" done -UnknownText_0x1bc7c3:: +_TradingText13:: text "Take good care of" line "@" text_ram wOTTrademonSpeciesName text "." done -UnknownText_0x1bc7dd:: +_TradingText14:: text_ram wPlayerTrademonSenderName text "'s" line "@" @@ -482,14 +482,14 @@ UnknownText_0x1bc7dd:: text " trade…" done -UnknownText_0x1bc7f0:: +_TradingText15:: text "Take good care of" line "@" text_ram wOTTrademonSpeciesName text "." done -UnknownText_0x1bc80a:: +_TradingText16:: text_ram wOTTrademonSpeciesName text " came" line "back!" @@ -1295,24 +1295,24 @@ UnknownText_0x1bd2e7:: line "Contest is over!" done -UnknownText_0x1bd308:: +_RepelWoreOffText:: text "REPEL's effect" line "wore off." done -UnknownText_0x1bd321:: +_PlayerFoundItemText:: text "<PLAYER> found" line "@" text_ram wStringBuffer3 text "!" done -UnknownText_0x1bd331:: +_ButNoSpaceText:: text "But <PLAYER> has" line "no space left…" done -UnknownText_0x1bd34b:: +_JustSawSomeRareMonText:: text "I just saw some" line "rare @" text_ram wStringBuffer1 @@ -1326,12 +1326,12 @@ UnknownText_0x1bd34b:: cont "#MON, OK?" prompt -UnknownText_0x1bd39e:: +_SavingRecordText:: text "SAVING RECORD…" line "DON'T TURN OFF!" done -UnknownText_0x1bd3be:: +_ReceiveItemText:: text_ram wPlayerName text " received" line "@" @@ -1343,11 +1343,11 @@ UnknownText_0x1bd3be:: text_end ; unused -UnknownText_0x1bd3d7:: +_NoCoinsText:: text "You have no coins." prompt -UnknownText_0x1bd3eb:: +_NoCoinCaseText:: text "You don't have a" line "COIN CASE." prompt @@ -1374,7 +1374,7 @@ UnknownText_0x1bd445:: text_end ; unused -UnknownText_0x1bd449:: +_NPCTradeIntroText1:: text "I collect #MON." line "Do you have" cont "@" @@ -1387,12 +1387,12 @@ UnknownText_0x1bd449:: text "?" done -UnknownText_0x1bd48c:: +_NPCTradeCancelText1:: text "You don't want to" line "trade? Aww…" done -UnknownText_0x1bd4aa:: +_NPCTradeWrongText1:: text "Huh? That's not" line "@" text_ram wStringBuffer1 @@ -1400,7 +1400,7 @@ UnknownText_0x1bd4aa:: cont "What a letdown…" done -UnknownText_0x1bd4d2:: +_NPCTradeCompleteText1:: text "Yay! I got myself" line "@" text_ram wStringBuffer1 @@ -1408,14 +1408,14 @@ UnknownText_0x1bd4d2:: cont "Thanks!" done -UnknownText_0x1bd4f4:: +_NPCTradeAFterText1:: text "Hi, how's my old" line "@" text_ram wStringBuffer2 text " doing?" done -UnknownText_0x1bd512:: +_NPCTradeIntroText2:: text "Hi, I'm looking" line "for this #MON." @@ -1430,7 +1430,7 @@ UnknownText_0x1bd512:: text "?" done -UnknownText_0x1bd565:: +_NPCTradeCancelText2:: text "You don't have" line "one either?" @@ -1438,7 +1438,7 @@ UnknownText_0x1bd565:: line "disappointing…" done -UnknownText_0x1bd5a1:: +_NPCTradeWrongText2:: text "You don't have" line "@" text_ram wStringBuffer1 @@ -1446,7 +1446,7 @@ UnknownText_0x1bd5a1:: cont "too bad, then." done -UnknownText_0x1bd5cc:: +_NPCTradeCompleteText2:: text "Great! Thank you!" para "I finally got" @@ -1455,7 +1455,7 @@ UnknownText_0x1bd5cc:: text "." done -UnknownText_0x1bd5f4:: +_NPCTradeAfterText2:: text "Hi! The @" text_ram wMonOrItemNameBuffer text_start @@ -1463,7 +1463,7 @@ UnknownText_0x1bd5f4:: cont "doing great!" done -UnknownText_0x1bd621:: +_NPCTradeIntroText3:: text_ram wMonOrItemNameBuffer text "'s cute," line "but I don't have" @@ -1479,12 +1479,12 @@ UnknownText_0x1bd621:: text "?" done -UnknownText_0x1bd673:: +_NPCTradeCancelText3:: text "You don't want to" line "trade? Oh, darn…" done -UnknownText_0x1bd696:: +_NPCTradeWrongText3:: text "That's not" line "@" text_ram wStringBuffer1 @@ -1494,7 +1494,7 @@ UnknownText_0x1bd696:: line "me if you get one." done -UnknownText_0x1bd6cd:: +_NPCTradeCompleteText3:: text "Wow! Thank you!" line "I always wanted" cont "@" @@ -1502,7 +1502,7 @@ UnknownText_0x1bd6cd:: text "!" done -UnknownText_0x1bd6f5:: +_NPCTradeAfterText3:: text "How is that" line "@" text_ram wStringBuffer2 @@ -1515,18 +1515,18 @@ UnknownText_0x1bd6f5:: line "so cute!" done -UnknownText_0x1bd731:: +_NPCTradeCompleteText4:: text "Uh? What happened?" done -UnknownText_0x1bd745:: +_NPCTradeAfterText4:: text "Trading is so odd…" para "I still have a lot" line "to learn about it." done -UnknownText_0x1bd77f:: +_MomLeavingText1:: text "Wow, that's a cute" line "#MON." @@ -1554,14 +1554,14 @@ UnknownText_0x1bd77f:: line "save your money?" done -UnknownText_0x1bd868:: +_MomLeavingText2:: text "OK, I'll take care" line "of your money." para "<……><……><……>" prompt -UnknownText_0x1bd88e:: +_MomLeavingText3:: text "Be careful." para "#MON are your" @@ -1571,7 +1571,7 @@ UnknownText_0x1bd88e:: para "Now, go on!" done -UnknownText_0x1bd8da:: +_MomVisitingText1:: text "Hi! Welcome home!" line "You're trying very" cont "hard, I see." @@ -1583,47 +1583,47 @@ UnknownText_0x1bd8da:: line "your money?" done -UnknownText_0x1bd942:: +_MomVisitingText2:: text "What do you want" line "to do?" done -UnknownText_0x1bd95b:: +_MomVisitingText3:: text "How much do you" line "want to save?" done -UnknownText_0x1bd97a:: +_MomVisitingText4:: text "How much do you" line "want to take?" done -UnknownText_0x1bd999:: +_MomVisitingText5:: text "Do you want to" line "save some money?" done -UnknownText_0x1bd9ba:: +_MomVisitingText6:: text "You haven't saved" line "that much." prompt -UnknownText_0x1bd9d7:: +_MomVisitingText7:: text "You can't take" line "that much." prompt -UnknownText_0x1bd9f1:: +_MomVisitingText8:: text "You don't have" line "that much." prompt -UnknownText_0x1bda0b:: +_MomVisitingText9:: text "You can't save" line "that much." prompt -UnknownText_0x1bda25:: +_MomVisitingText10:: text "OK, I'll save your" line "money. Trust me!" @@ -1631,32 +1631,32 @@ UnknownText_0x1bda25:: line "with it!" done -UnknownText_0x1bda5b:: +_MomVisitingText11:: text "Your money's safe" line "here! Get going!" done -UnknownText_0x1bda7e:: +_MomVisitingText12:: text "<PLAYER>, don't" line "give up!" done -UnknownText_0x1bda90:: +_MomVisitingText13:: text "Just do what" line "you can." done -UnknownText_0x1bdaa7:: +_DaycareDummyText:: text_start done -UnknownText_0x1bdaa9:: +_DayCareManIntroText:: text "I'm the DAY-CARE" line "MAN. Want me to" cont "raise a #MON?" done -UnknownText_0x1bdad8:: +_DayCareManOddEggText:: text "I'm the DAY-CARE" line "MAN. Do you know" cont "about EGGS?" @@ -1675,7 +1675,7 @@ UnknownText_0x1bdad8:: line "raise a #MON?" done -UnknownText_0x1bdb85:: +_DayCareLadyIntroText:: text "I'm the DAY-CARE" line "LADY." @@ -1683,7 +1683,7 @@ UnknownText_0x1bdb85:: line "#MON for you?" done -UnknownText_0x1bdbbb:: +_DayCareLadyOddEggText:: text "I'm the DAY-CARE" line "LADY. Do you know" cont "about EGGS?" @@ -1702,45 +1702,45 @@ UnknownText_0x1bdbbb:: line "#MON for you?" done -UnknownText_0x1bdc79:: +_WhatShouldIRaiseText:: text "What should I" line "raise for you?" prompt -UnknownText_0x1bdc97:: +_OnlyOneMonText:: text "Oh? But you have" line "just one #MON." prompt -UnknownText_0x1bdcb8:: +_CantRaiseEggText:: text "Sorry, but I can't" line "accept an EGG." prompt -UnknownText_0x1bdcda:: +_RemoveMailText:: text "Remove MAIL before" line "you come see me." prompt -UnknownText_0x1bdcff:: +_LastHealthyMonText:: text "If you give me" line "that, what will" cont "you battle with?" prompt -UnknownText_0x1bdd30:: +_IllRaiseYourMonText:: text "OK. I'll raise" line "your @" text_ram wStringBuffer1 text "." prompt -UnknownText_0x1bdd4b:: +_ComeBackLaterText:: text "Come back for it" line "later." done -UnknownText_0x1bdd64:: +_AreWeGeniusesText:: text "Are we geniuses or" line "what? Want to see" cont "your @" @@ -1748,7 +1748,7 @@ UnknownText_0x1bdd64:: text "?" done -UnknownText_0x1bdd96:: +_YourMonHasGrownText:: text "Your @" text_ram wStringBuffer1 text_start @@ -1766,19 +1766,19 @@ UnknownText_0x1bdd96:: text "." done -UnknownText_0x1bde04:: +_PerfectHeresYourMonText:: text "Perfect! Here's" line "your #MON." prompt -UnknownText_0x1bde1f:: +_GotBackMonText:: text "<PLAYER> got back" line "@" text_ram wStringBuffer1 text "." prompt -UnknownText_0x1bde32:: +_BackAlreadyText:: text "Huh? Back already?" line "Your @" text_ram wStringBuffer1 @@ -1791,29 +1791,29 @@ UnknownText_0x1bde32:: cont "will cost ¥100." done -UnknownText_0x1bdea2:: +_HaveNoRoomText:: text "You have no room" line "for it." prompt -UnknownText_0x1bdebc:: +_DCNotEnoughMoneyText:: text "You don't have" line "enough money." prompt -UnknownText_0x1bded9:: +_OhFineThenText:: text "Oh, fine then." prompt -UnknownText_0x1bdee9:: +_ComeAgainText:: text "Come again." done -UnknownText_0x1bdef6:: +_NotYetText:: text "Not yet…" done -UnknownText_0x1bdf00:: +_FoundAnEggText:: text "Ah, it's you!" para "We were raising" @@ -1832,39 +1832,39 @@ UnknownText_0x1bdf00:: line "it. You want it?" done -UnknownText_0x1bdfa5:: +_ReceivedEggText:: text "<PLAYER> received" line "the EGG!" done -UnknownText_0x1bdfba:: +_TakeGoodCareOfEggText:: text "Take good care of" line "it." done -UnknownText_0x1bdfd1:: +_RefuseEggText:: text "Well then, I'll" line "keep it. Thanks!" done -UnknownText_0x1bdff2:: +_NoRoomForEggText:: text "You have no room" line "in your party." cont "Come back later." done -UnknownText_0x1be024:: +_WhichMonPhotoText:: text "Which #MON" line "should I photo-" cont "graph?" prompt -UnknownText_0x1be047:: +_HoldOnText:: text "All righty. Hold" line "still for a bit." prompt -UnknownText_0x1be06a:: +_PrestoAllDoneText:: text "Presto! All done." line "Come again, OK?" done diff --git a/data/text/common_3.asm b/data/text/common_3.asm index 53fa047c4..09278eb29 100644 --- a/data/text/common_3.asm +++ b/data/text/common_3.asm @@ -1133,28 +1133,28 @@ UnknownText_0x1c5962:: line "you're ready." done -UnknownText_0x1c5983:: +_NeedAtLeastThreeMonText:: text "You need at least" line "three #MON." para "" done -UnknownText_0x1c59a3:: +_EggDoesNotQualifyText:: text "Sorry, an EGG" line "doesn't qualify." para "" done -Text_OnlyThreeMonMayBeEntered:: +_OnlyThreeMonMayBeEnteredText:: text "Only three #MON" line "may be entered." para "" done -Text_TheMonMustAllBeDifferentKinds:: +_TheMonMustAllBeDifferentKindsText:: text "The @" text_ram wStringBuffer2 text " #MON" @@ -1164,7 +1164,7 @@ Text_TheMonMustAllBeDifferentKinds:: para "" done -Text_TheMonMustNotHoldTheSameItems:: +_TheMonMustNotHoldTheSameItemsText:: text "The @" text_ram wStringBuffer2 text " #MON" @@ -1174,7 +1174,7 @@ Text_TheMonMustNotHoldTheSameItems:: para "" done -Text_YouCantTakeAnEgg:: +_YouCantTakeAnEggText:: text "You can't take an" line "EGG!" diff --git a/docs/_config.yml b/docs/_config.yml index e69de29bb..223aabb05 100644 --- a/docs/_config.yml +++ b/docs/_config.yml @@ -0,0 +1 @@ +markdown: gfm diff --git a/docs/bugs_and_glitches.md b/docs/bugs_and_glitches.md index 8d6ce988d..ab5bc208b 100644 --- a/docs/bugs_and_glitches.md +++ b/docs/bugs_and_glitches.md @@ -306,7 +306,7 @@ Then edit four routines in [engine/battle/effect_commands.asm](https://github.co ... ld hl, HurtItselfText - call StdBattleTextBox + call StdBattleTextbox call HitSelfInConfusion - call BattleCommand_DamageCalc @@ -319,7 +319,7 @@ Then edit four routines in [engine/battle/effect_commands.asm](https://github.co ```diff HitConfusion: ld hl, HurtItselfText - call StdBattleTextBox + call StdBattleTextbox xor a ld [wCriticalHit], a @@ -412,7 +412,7 @@ Add this to the end of each file: .force_struggle ld hl, BattleText_MonHasNoMovesLeft - call StdBattleTextBox + call StdBattleTextbox ld c, 60 call DelayFrames xor a diff --git a/docs/menus.md b/docs/menus.md index b5a6e1e36..35bb14d3a 100644 --- a/docs/menus.md +++ b/docs/menus.md @@ -12,7 +12,7 @@ ## `ScrollingMenu` -This is the only menu that does scrolling. It doesn't draw any `TextBox` around the menu. +This is the only menu that does scrolling. It doesn't draw any `Textbox` around the menu. Structure: diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 4e9d13f15..38abbb51f 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -90,7 +90,7 @@ DoBattle: call NewBattleMonStatus call BreakAttraction call SendOutPlayerMon - call EmptyBattleTextBox + call EmptyBattleTextbox call LoadTileMapToTempTileMap call SetPlayerTurn call SpikesDamage @@ -140,7 +140,7 @@ WildFled_EnemyFled_LinkBattleCanceled: ld hl, BattleText_LinkErrorBattleCanceled .print_text - call StdBattleTextBox + call StdBattleTextbox .skip_text call StopDangerSound @@ -405,7 +405,7 @@ HandleBerserkGene: ld [hl], a call GetItemName ld hl, BattleText_UsersStringBuffer1Activated - call StdBattleTextBox + call StdBattleTextbox callfar BattleCommand_StatUpMessage pop af bit SUBSTATUS_CONFUSED, a @@ -416,7 +416,7 @@ HandleBerserkGene: call Call_PlayBattleAnim_OnlyIfVisible call SwitchTurnCore ld hl, BecameConfusedText - jp StdBattleTextBox + jp StdBattleTextbox EnemyTriesToFlee: ld a, [wLinkMode] @@ -725,7 +725,7 @@ HandleEncore: res SUBSTATUS_ENCORED, [hl] call SetEnemyTurn ld hl, BattleText_TargetsEncoreEnded - jp StdBattleTextBox + jp StdBattleTextbox .do_enemy ld hl, wEnemySubStatus5 @@ -749,7 +749,7 @@ HandleEncore: res SUBSTATUS_ENCORED, [hl] call SetPlayerTurn ld hl, BattleText_TargetsEncoreEnded - jp StdBattleTextBox + jp StdBattleTextbox TryEnemyFlee: ld a, [wBattleMode] @@ -1019,7 +1019,7 @@ ResidualDamage: .got_anim push de - call StdBattleTextBox + call StdBattleTextbox pop de xor a @@ -1077,7 +1077,7 @@ ResidualDamage: ldh [hBGMapMode], a call RestoreHP ld hl, LeechSeedSapsText - call StdBattleTextBox + call StdBattleTextbox .not_seeded call HasUserFainted @@ -1094,7 +1094,7 @@ ResidualDamage: call GetQuarterMaxHP call SubtractHPFromUser ld hl, HasANightmareText - call StdBattleTextBox + call StdBattleTextbox .not_nightmare call HasUserFainted @@ -1112,7 +1112,7 @@ ResidualDamage: call GetQuarterMaxHP call SubtractHPFromUser ld hl, HurtByCurseText - call StdBattleTextBox + call StdBattleTextbox .not_cursed ld hl, wBattleMonHP @@ -1164,7 +1164,7 @@ HandlePerishSong: ld [wDeciramBuffer], a push af ld hl, PerishCountText - call StdBattleTextBox + call StdBattleTextbox pop af ret nz ld a, BATTLE_VARS_SUBSTATUS1 @@ -1263,7 +1263,7 @@ HandleWrap: ld hl, BattleText_UserWasReleasedFromStringBuffer1 .print_text - jp StdBattleTextBox + jp StdBattleTextbox SwitchTurnCore: ldh a, [hBattleTurn] @@ -1318,7 +1318,7 @@ HandleLeftovers: call SwitchTurnCore call RestoreHP ld hl, BattleText_TargetRecoveredWithItem - jp StdBattleTextBox + jp StdBattleTextbox HandleMysteryberry: ldh a, [hSerialConnectionStatus] @@ -1456,7 +1456,7 @@ HandleMysteryberry: call ItemRecoveryAnim call SwitchTurnCore ld hl, BattleText_UserRecoveredPPUsing - jp StdBattleTextBox + jp StdBattleTextbox HandleFutureSight: ldh a, [hSerialConnectionStatus] @@ -1489,7 +1489,7 @@ HandleFutureSight: ret nz ld hl, BattleText_TargetWasHitByFutureSight - call StdBattleTextBox + call StdBattleTextbox ld a, BATTLE_VARS_MOVE call GetBattleVarAddr @@ -1546,7 +1546,7 @@ HandleDefrost: call UpdateBattleHuds call SetEnemyTurn ld hl, DefrostedOpponentText - jp StdBattleTextBox + jp StdBattleTextbox .do_enemy_turn ld a, [wEnemyMonStatus] @@ -1573,7 +1573,7 @@ HandleDefrost: call UpdateBattleHuds call SetPlayerTurn ld hl, DefrostedOpponentText - jp StdBattleTextBox + jp StdBattleTextbox HandleSafeguard: ldh a, [hSerialConnectionStatus] @@ -1610,7 +1610,7 @@ HandleSafeguard: .print ldh [hBattleTurn], a ld hl, BattleText_SafeguardFaded - jp StdBattleTextBox + jp StdBattleTextbox HandleScreens: ldh a, [hSerialConnectionStatus] @@ -1662,7 +1662,7 @@ HandleScreens: push hl push de ld hl, BattleText_MonsLightScreenFell - call StdBattleTextBox + call StdBattleTextbox pop de pop hl ret @@ -1675,7 +1675,7 @@ HandleScreens: ret nz res SCREENS_REFLECT, [hl] ld hl, BattleText_MonsReflectFaded - jp StdBattleTextBox + jp StdBattleTextbox HandleWeather: ld a, [wBattleWeather] @@ -1746,7 +1746,7 @@ HandleWeather: call SubtractHPFromUser ld hl, SandstormHitsText - jp StdBattleTextBox + jp StdBattleTextbox .ended ld hl, .WeatherEndedMessages @@ -1765,7 +1765,7 @@ HandleWeather: ld a, [hli] ld h, [hl] ld l, a - jp StdBattleTextBox + jp StdBattleTextbox .WeatherMessages: ; entries correspond to WEATHER_* constants @@ -1932,7 +1932,7 @@ CheckUserHasEnoughHP: sbc [hl] ret -RestoreHP +RestoreHP: ld hl, wEnemyMonMaxHP ldh a, [hBattleTurn] and a @@ -2141,7 +2141,7 @@ UpdateBattleStateAndExperienceAfterEnemyFaint: ld a, [wBattleMode] dec a call z, PlayVictoryMusic - call EmptyBattleTextBox + call EmptyBattleTextbox call LoadTileMapToTempTileMap ld a, [wBattleResult] and BATTLERESULT_BITMASK @@ -2254,7 +2254,7 @@ FaintYourPokemon: lb bc, 5, 11 call ClearBox ld hl, BattleText_MonFainted - jp StdBattleTextBox + jp StdBattleTextbox FaintEnemyPokemon: call WaitSFX @@ -2267,7 +2267,7 @@ FaintEnemyPokemon: lb bc, 4, 10 call ClearBox ld hl, BattleText_EnemyMonFainted - jp StdBattleTextBox + jp StdBattleTextbox CheckEnemyTrainerDefeated: ld a, [wOTPartyCount] @@ -2351,7 +2351,7 @@ WinTrainerBattle: call z, PlayVictoryMusic callfar Battle_GetTrainerName ld hl, BattleText_EnemyWasDefeated - call StdBattleTextBox + call StdBattleTextbox call IsMobileBattle jr z, .mobile @@ -2391,7 +2391,7 @@ WinTrainerBattle: call BattleWinSlideInEnemyTrainerFrontpic ld c, 40 call DelayFrames - call EmptyBattleTextBox + call EmptyBattleTextbox ld c, BATTLETOWERTEXT_LOSS_TEXT farcall BattleTowerText call WaitPressAorB_BlinkCursor @@ -2456,11 +2456,11 @@ WinTrainerBattle: ld a, [hli] ld h, [hl] ld l, a - jp StdBattleTextBox + jp StdBattleTextbox .KeepItAll: ld hl, GotMoneyForWinningText - jp StdBattleTextBox + jp StdBattleTextbox .AddMoneyToMom: push bc @@ -2681,7 +2681,7 @@ UpdateFaintedPlayerMon: ret ; ?????????? AskUseNextPokemon: - call EmptyBattleTextBox + call EmptyBattleTextbox call LoadTileMapToTempTileMap ; We don't need to be here if we're in a Trainer battle, ; as that decision is made for us. @@ -2691,7 +2691,7 @@ AskUseNextPokemon: ret nz ld hl, BattleText_UseNextMon - call StdBattleTextBox + call StdBattleTextbox .loop lb bc, 1, 7 call PlaceYesNoBox @@ -2709,7 +2709,7 @@ AskUseNextPokemon: jp TryToRunAwayFromBattle ForcePlayerMonChoice: - call EmptyBattleTextBox + call EmptyBattleTextbox call LoadStandardMenuHeader call SetUpBattlePartyMenu_NoLoop call ForcePickPartyMonInBattle @@ -2762,7 +2762,7 @@ ForcePlayerMonChoice: call NewBattleMonStatus call BreakAttraction call SendOutPlayerMon - call EmptyBattleTextBox + call EmptyBattleTextbox call LoadTileMapToTempTileMap call SetPlayerTurn call SpikesDamage @@ -2783,7 +2783,7 @@ PlayerPartyMonEntrance: call NewBattleMonStatus call BreakAttraction call SendOutPlayerMon - call EmptyBattleTextBox + call EmptyBattleTextbox call LoadTileMapToTempTileMap call SetPlayerTurn jp SpikesDamage @@ -2856,7 +2856,7 @@ SwitchMonAlreadyOut: jr nz, .notout ld hl, BattleText_MonIsAlreadyOut - call StdBattleTextBox + call StdBattleTextbox scf ret @@ -2938,7 +2938,7 @@ LostBattle: ld c, 40 call DelayFrames - call EmptyBattleTextBox + call EmptyBattleTextbox ld c, BATTLETOWERTEXT_WIN_TEXT farcall BattleTowerText call WaitPressAorB_BlinkCursor @@ -2974,7 +2974,7 @@ LostBattle: jr z, .mobile .text - call StdBattleTextBox + call StdBattleTextbox .end scf @@ -3192,7 +3192,7 @@ CheckWhetherSwitchmonIsPredetermined: ret ResetEnemyBattleVars: -; and draw empty TextBox +; and draw empty Textbox xor a ld [wLastPlayerCounterMove], a ld [wLastEnemyCounterMove], a @@ -3205,7 +3205,7 @@ ResetEnemyBattleVars: hlcoord 18, 0 ld a, 8 call SlideBattlePicOut - call EmptyBattleTextBox + call EmptyBattleTextbox jp LoadStandardMenuHeader ResetBattleParticipants: @@ -3480,7 +3480,7 @@ OfferSwitch: push af callfar Battle_GetTrainerName ld hl, BattleText_EnemyIsAboutToUseWillPlayerChangeMon - call StdBattleTextBox + call StdBattleTextbox lb bc, 1, 7 call PlaceYesNoBox ld a, [wMenuCursorY] @@ -3529,7 +3529,7 @@ ClearEnemyMonBox: Function_BattleTextEnemySentOut: callfar Battle_GetTrainerName ld hl, BattleText_EnemySentOut - call StdBattleTextBox + call StdBattleTextbox jp WaitBGMap Function_SetEnemyMonAndSendOutAnimation: @@ -3657,7 +3657,7 @@ CheckIfCurPartyMonIsFitToFight: ld hl, BattleText_TheresNoWillToBattle .print_textbox - call StdBattleTextBox + call StdBattleTextbox .finish_fail xor a @@ -3710,7 +3710,7 @@ TryToRunAwayFromBattle: call SetPlayerTurn call GetItemName ld hl, BattleText_UserFledUsingAStringBuffer1 - call StdBattleTextBox + call StdBattleTextbox jp .can_escape .no_flee_item @@ -3788,7 +3788,7 @@ TryToRunAwayFromBattle: ld hl, BattleText_TheresNoEscapeFromTrainerBattle .print_inescapable_text - call StdBattleTextBox + call StdBattleTextbox ld a, TRUE ld [wFailedToFlee], a call LoadTileMapToTempTileMap @@ -3831,7 +3831,7 @@ TryToRunAwayFromBattle: pop de call WaitSFX ld hl, BattleText_GotAwaySafely - call StdBattleTextBox + call StdBattleTextbox call WaitSFX call LoadTileMapToTempTileMap scf @@ -3843,7 +3843,7 @@ TryToRunAwayFromBattle: bit 4, [hl] jr nz, .skip_link_error ld hl, BattleText_LinkErrorBattleCanceled - call StdBattleTextBox + call StdBattleTextbox .skip_link_error call WaitSFX @@ -4000,7 +4000,7 @@ SwitchPlayerMon: call NewBattleMonStatus call BreakAttraction call SendOutPlayerMon - call EmptyBattleTextBox + call EmptyBattleTextbox call LoadTileMapToTempTileMap ld hl, wEnemyMonHP ld a, [hli] @@ -4124,7 +4124,7 @@ SpikesDamage: push bc ld hl, BattleText_UserHurtBySpikes ; "hurt by SPIKES!" - call StdBattleTextBox + call StdBattleTextbox call GetEighthMaxHP call SubtractHPFromTarget @@ -4208,7 +4208,7 @@ PursuitSwitch: ld hl, BattleText_EnemyMonFainted .done_fainted - call StdBattleTextBox + call StdBattleTextbox scf ret @@ -4342,13 +4342,13 @@ UseOpponentItem: call GetItemName callfar ConsumeHeldItem ld hl, RecoveredUsingText - jp StdBattleTextBox + jp StdBattleTextbox ItemRecoveryAnim: push hl push de push bc - call EmptyBattleTextBox + call EmptyBattleTextbox ld a, RECOVER ld [wFXAnimID], a call SwitchTurnCore @@ -4439,7 +4439,7 @@ UseConfusionHealingItem: call GetItemName call ItemRecoveryAnim ld hl, BattleText_ItemHealedConfusion - call StdBattleTextBox + call StdBattleTextbox ldh a, [hBattleTurn] and a jr nz, .do_partymon @@ -4518,7 +4518,7 @@ HandleStatBoostingHeldItems: ld [de], a call GetItemName ld hl, BattleText_UsersStringBuffer1Activated - call StdBattleTextBox + call StdBattleTextbox callfar BattleCommand_StatUpMessage ret @@ -4867,9 +4867,9 @@ BattleMenu: jr z, .ok cp BATTLETYPE_TUTORIAL jr z, .ok - call EmptyBattleTextBox + call EmptyBattleTextbox call UpdateBattleHuds - call EmptyBattleTextBox + call EmptyBattleTextbox call LoadTileMapToTempTileMap .ok @@ -4929,7 +4929,7 @@ LoadBattleMenu2: bit 4, [hl] jr nz, .error ld hl, BattleText_LinkErrorBattleCanceled - call StdBattleTextBox + call StdBattleTextbox ld c, 60 call DelayFrames .error @@ -4989,7 +4989,7 @@ BattleMenu_Pack: .ItemsCantBeUsed: ld hl, BattleText_ItemsCantBeUsedHere - call StdBattleTextBox + call StdBattleTextbox jp BattleMenu .UseItem: @@ -5139,7 +5139,7 @@ TryPlayerSwitch: cp d jr nz, .check_trapped ld hl, BattleText_MonIsAlreadyOut - call StdBattleTextBox + call StdBattleTextbox jp BattleMenuPKMN_Loop .check_trapped @@ -5152,7 +5152,7 @@ TryPlayerSwitch: .trapped ld hl, BattleText_MonCantBeRecalled - call StdBattleTextBox + call StdBattleTextbox jp BattleMenuPKMN_Loop .try_switch @@ -5253,7 +5253,7 @@ BattleMonEntrance: call NewBattleMonStatus call BreakAttraction call SendOutPlayerMon - call EmptyBattleTextBox + call EmptyBattleTextbox call LoadTileMapToTempTileMap call SetPlayerTurn call SpikesDamage @@ -5277,7 +5277,7 @@ PassedBattleMonEntrance: ld [wApplyStatLevelMultipliersToEnemy], a call ApplyStatLevelMultiplierOnAllStats call SendOutPlayerMon - call EmptyBattleTextBox + call EmptyBattleTextbox call LoadTileMapToTempTileMap call SetPlayerTurn jp SpikesDamage @@ -5347,7 +5347,7 @@ MoveSelectionScreen: ld b, 4 ld c, 14 .got_dims - call TextBox + call Textbox hlcoord 6, 17 - NUM_MOVES ld a, [wMoveSelectionMenuType] @@ -5507,7 +5507,7 @@ MoveSelectionScreen: ld hl, BattleText_TheresNoPPLeftForThisMove .place_textbox_start_over - call StdBattleTextBox + call StdBattleTextbox call Call_LoadTempTileMapToTileMap jp MoveSelectionScreen @@ -5626,7 +5626,7 @@ MoveInfoBox: hlcoord 0, 8 ld b, 3 ld c, 9 - call TextBox + call Textbox call MobileTextBorder ld a, [wPlayerDisableCount] @@ -5757,7 +5757,7 @@ CheckPlayerHasUsableMoves: .force_struggle ld hl, BattleText_MonHasNoMovesLeft - call StdBattleTextBox + call StdBattleTextbox ld c, 60 call DelayFrames xor a @@ -5770,7 +5770,7 @@ ParseEnemyAction: ld a, [wLinkMode] and a jr z, .not_linked - call EmptyBattleTextBox + call EmptyBattleTextbox call LoadTileMapToTempTileMap ld a, [wBattlePlayerAction] and a ; BATTLEPLAYERACTION_USEMOVE? @@ -6864,9 +6864,9 @@ Unreferenced_LoadHPExpBarGFX: lb bc, BANK(ExpBarGFX), 8 jp Get2bpp -EmptyBattleTextBox: +EmptyBattleTextbox: ld hl, .empty - jp BattleTextBox + jp BattleTextbox .empty: text_end @@ -7107,7 +7107,7 @@ GiveExperiencePoints: ld hl, wPartyMonNicknames call GetNick ld hl, Text_MonGainedExpPoint - call BattleTextBox + call BattleTextbox ld a, [wStringBuffer2 + 1] ldh [hQuotient + 3], a ld a, [wStringBuffer2] @@ -7267,7 +7267,7 @@ GiveExperiencePoints: callfar ApplyStatusEffectOnPlayerStats callfar BadgeStatBoosts callfar UpdatePlayerHUD - call EmptyBattleTextBox + call EmptyBattleTextbox call LoadTileMapToTempTileMap ld a, $1 ldh [hBGMapMode], a @@ -7283,7 +7283,7 @@ GiveExperiencePoints: call PlaySFX call WaitSFX ld hl, BattleText_StringBuffer1GrewToLevel - call StdBattleTextBox + call StdBattleTextbox call LoadTileMapToTempTileMap .skip_exp_bar_animation @@ -7293,7 +7293,7 @@ GiveExperiencePoints: hlcoord 9, 0 ld b, 10 ld c, 9 - call TextBox + call Textbox hlcoord 11, 1 ld bc, 4 predef PrintTempMonStats @@ -7526,7 +7526,7 @@ AnimateExpBar: farcall AnimateEndOfExpBar call WaitSFX ld hl, BattleText_StringBuffer1GrewToLevel - call StdBattleTextBox + call StdBattleTextbox pop de inc e ld b, $0 @@ -7666,7 +7666,7 @@ SendOutMonText: ld hl, JumpText_YourFoesWeakGetmMon .skip_to_textbox - jp BattleTextBox + jp BattleTextbox JumpText_GoMon: text_far Text_GoMon @@ -7696,7 +7696,7 @@ TextJump_BattleMonNick01: WithdrawMonText: ld hl, .WithdrawMonText - jp BattleTextBox + jp BattleTextbox .WithdrawMonText: text_far Text_BattleMonNickComma @@ -7799,7 +7799,7 @@ Unreferenced_HandleSafariAngerEatingStatus: push hl call Call_LoadTempTileMapToTileMap pop hl - jp StdBattleTextBox + jp StdBattleTextbox FillInExpBar: push hl @@ -8056,7 +8056,7 @@ BattleIntro: set rLCDC_WINDOW_TILEMAP, [hl] ; select 9C00-9FFF xor a ldh [hBGMapMode], a - call EmptyBattleTextBox + call EmptyBattleTextbox hlcoord 9, 7 lb bc, 5, 11 call ClearBox @@ -8336,7 +8336,7 @@ CheckPayDay: ld de, wMoney + 2 call AddBattleMoneyToAccount ld hl, BattleText_PlayerPickedUpPayDayMoney - call StdBattleTextBox + call StdBattleTextbox ld a, [wInBattleTowerBattle] bit 0, a ret z @@ -8901,7 +8901,7 @@ InitBattleDisplay: hlcoord 0, 12 ld b, 4 ld c, 18 - call TextBox + call Textbox farcall MobileTextBorder hlcoord 1, 5 lb bc, 3, 7 @@ -9126,7 +9126,7 @@ BattleStartMessage: push hl farcall BattleStart_TrainerHuds pop hl - call StdBattleTextBox + call StdBattleTextbox call IsMobileBattle2 ret nz diff --git a/engine/battle/effect_commands.asm b/engine/battle/effect_commands.asm index 370818b09..eefb1debe 100644 --- a/engine/battle/effect_commands.asm +++ b/engine/battle/effect_commands.asm @@ -141,7 +141,7 @@ CheckPlayerTurn: res SUBSTATUS_RECHARGE, [hl] ld hl, MustRechargeText - call StdBattleTextBox + call StdBattleTextbox call CantMove jp EndTurn @@ -165,7 +165,7 @@ CheckPlayerTurn: .woke_up ld hl, WokeUpText - call StdBattleTextBox + call StdBattleTextbox call CantMove call UpdateBattleMonInParty ld hl, UpdatePlayerHUD @@ -178,7 +178,7 @@ CheckPlayerTurn: .fast_asleep ld hl, FastAsleepText - call StdBattleTextBox + call StdBattleTextbox ; Snore and Sleep Talk bypass sleep. ld a, [wCurPlayerMove] @@ -204,7 +204,7 @@ CheckPlayerTurn: jr z, .not_frozen ld hl, FrozenSolidText - call StdBattleTextBox + call StdBattleTextbox call CantMove jp EndTurn @@ -217,7 +217,7 @@ CheckPlayerTurn: res SUBSTATUS_FLINCHED, [hl] ld hl, FlinchedText - call StdBattleTextBox + call StdBattleTextbox call CantMove jp EndTurn @@ -237,7 +237,7 @@ CheckPlayerTurn: ld [hl], a ld [wDisabledMove], a ld hl, DisabledNoMoreText - call StdBattleTextBox + call StdBattleTextbox .not_disabled @@ -251,12 +251,12 @@ CheckPlayerTurn: ld hl, wPlayerSubStatus3 res SUBSTATUS_CONFUSED, [hl] ld hl, ConfusedNoMoreText - call StdBattleTextBox + call StdBattleTextbox jr .not_confused .confused ld hl, IsConfusedText - call StdBattleTextBox + call StdBattleTextbox xor a ld [wNumHits], a ld de, ANIM_CONFUSED @@ -284,7 +284,7 @@ CheckPlayerTurn: jr nc, .not_infatuated ld hl, InLoveWithText - call StdBattleTextBox + call StdBattleTextbox xor a ld [wNumHits], a ld de, ANIM_IN_LOVE @@ -296,7 +296,7 @@ CheckPlayerTurn: jr c, .not_infatuated ld hl, InfatuationText - call StdBattleTextBox + call StdBattleTextbox call CantMove jp EndTurn @@ -328,7 +328,7 @@ CheckPlayerTurn: ret nc ld hl, FullyParalyzedText - call StdBattleTextBox + call StdBattleTextbox call CantMove jp EndTurn @@ -370,7 +370,7 @@ CheckEnemyTurn: res SUBSTATUS_RECHARGE, [hl] ld hl, MustRechargeText - call StdBattleTextBox + call StdBattleTextbox call CantMove jp EndTurn @@ -387,7 +387,7 @@ CheckEnemyTurn: jr z, .woke_up ld hl, FastAsleepText - call StdBattleTextBox + call StdBattleTextbox xor a ld [wNumHits], a ld de, ANIM_SLP @@ -396,7 +396,7 @@ CheckEnemyTurn: .woke_up ld hl, WokeUpText - call StdBattleTextBox + call StdBattleTextbox call CantMove call UpdateEnemyMonInParty ld hl, UpdateEnemyHUD @@ -431,7 +431,7 @@ CheckEnemyTurn: jr z, .not_frozen ld hl, FrozenSolidText - call StdBattleTextBox + call StdBattleTextbox call CantMove jp EndTurn @@ -443,7 +443,7 @@ CheckEnemyTurn: res SUBSTATUS_FLINCHED, [hl] ld hl, FlinchedText - call StdBattleTextBox + call StdBattleTextbox call CantMove jp EndTurn @@ -464,7 +464,7 @@ CheckEnemyTurn: ld [wEnemyDisabledMove], a ld hl, DisabledNoMoreText - call StdBattleTextBox + call StdBattleTextbox .not_disabled @@ -479,12 +479,12 @@ CheckEnemyTurn: ld hl, wEnemySubStatus3 res SUBSTATUS_CONFUSED, [hl] ld hl, ConfusedNoMoreText - call StdBattleTextBox + call StdBattleTextbox jr .not_confused .confused ld hl, IsConfusedText - call StdBattleTextBox + call StdBattleTextbox xor a ld [wNumHits], a @@ -503,7 +503,7 @@ CheckEnemyTurn: ld [hl], a ld hl, HurtItselfText - call StdBattleTextBox + call StdBattleTextbox call HitSelfInConfusion call BattleCommand_DamageCalc @@ -532,7 +532,7 @@ CheckEnemyTurn: jr nc, .not_infatuated ld hl, InLoveWithText - call StdBattleTextBox + call StdBattleTextbox xor a ld [wNumHits], a ld de, ANIM_IN_LOVE @@ -544,7 +544,7 @@ CheckEnemyTurn: jr c, .not_infatuated ld hl, InfatuationText - call StdBattleTextBox + call StdBattleTextbox call CantMove jp EndTurn @@ -577,7 +577,7 @@ CheckEnemyTurn: ret nc ld hl, FullyParalyzedText - call StdBattleTextBox + call StdBattleTextbox call CantMove ; fallthrough @@ -599,11 +599,11 @@ MoveDisabled: call GetMoveName ld hl, DisabledMoveText - jp StdBattleTextBox + jp StdBattleTextbox HitConfusion: ld hl, HurtItselfText - call StdBattleTextBox + call StdBattleTextbox xor a ld [wCriticalHit], a @@ -768,7 +768,7 @@ BattleCommand_CheckObedience: jr nc, .DoNothing ld hl, WontObeyText - call StdBattleTextBox + call StdBattleTextbox call HitConfusion jp .EndDisobedience @@ -804,7 +804,7 @@ BattleCommand_CheckObedience: ld hl, IgnoredOrdersText .Print: - call StdBattleTextBox + call StdBattleTextbox jp .EndDisobedience .UseInstead: @@ -934,7 +934,7 @@ IgnoreSleepOnly: ; 'ignored orders…sleeping!' ld hl, IgnoredSleepingText - call StdBattleTextBox + call StdBattleTextbox call EndMoveEffect @@ -1077,7 +1077,7 @@ BattleCommand_DoTurn: ; 'but no pp is left for the move' ld hl, NoPPLeftText .print - call StdBattleTextBox + call StdBattleTextbox ld b, 1 ret @@ -1662,7 +1662,7 @@ BattleCommand_CheckHit: ; 'protecting itself!' ld hl, ProtectingItselfText - call StdBattleTextBox + call StdBattleTextbox ld c, 40 call DelayFrames @@ -2181,7 +2181,7 @@ BattleCommand_ApplyDamage: dec a jr nz, .focus_band_text ld hl, EnduredText - jp StdBattleTextBox + jp StdBattleTextbox .focus_band_text call GetOpponentItem @@ -2189,7 +2189,7 @@ BattleCommand_ApplyDamage: ld [wNamedObjectIndexBuffer], a call GetItemName ld hl, HungOnText - jp StdBattleTextBox + jp StdBattleTextbox .update_damage_taken ld a, BATTLE_VARS_SUBSTATUS4_OPP @@ -2270,7 +2270,7 @@ endr ld [hl], a .do_at_least_1_damage ld hl, CrashedText - call StdBattleTextBox + call StdBattleTextbox ld a, $1 ld [wKickCounter], a call LoadMoveAnim @@ -2288,7 +2288,7 @@ FailText_CheckOpponentProtect: ld h, d ld l, e .not_protected - jp StdBattleTextBox + jp StdBattleTextbox BattleCommand_BideFailText: ld a, [wAttackMissed] @@ -2318,7 +2318,7 @@ BattleCommand_CriticalText: ld a, [hli] ld h, [hl] ld l, a - call StdBattleTextBox + call StdBattleTextbox xor a ld [wCriticalHit], a @@ -2365,7 +2365,7 @@ BattleCommand_SuperEffectiveText: jr nc, .print ld hl, NotVeryEffectiveText .print - jp StdBattleTextBox + jp StdBattleTextbox BattleCommand_CheckFaint: ; checkfaint @@ -2391,7 +2391,7 @@ BattleCommand_CheckFaint: jr z, .no_dbond ld hl, TookDownWithItText - call StdBattleTextBox + call StdBattleTextbox ldh a, [hBattleTurn] and a @@ -2484,7 +2484,7 @@ BattleCommand_BuildOpponentRage: call BattleCommand_SwitchTurn ld hl, RageBuildingText - call StdBattleTextBox + call StdBattleTextbox jp BattleCommand_SwitchTurn BattleCommand_RageDamage: @@ -3522,7 +3522,7 @@ DoPlayerDamage: DoSubstituteDamage: ld hl, SubTookDamageText - call StdBattleTextBox + call StdBattleTextbox ld de, wEnemySubstituteHP ldh a, [hBattleTurn] @@ -3548,7 +3548,7 @@ DoSubstituteDamage: res SUBSTATUS_SUBSTITUTE, [hl] ld hl, SubFadedText - call StdBattleTextBox + call StdBattleTextbox call BattleCommand_SwitchTurn call BattleCommand_LowerSubNoAnim @@ -3651,7 +3651,7 @@ BattleCommand_SleepTarget: call RefreshBattleHuds ld hl, FellAsleepText - call StdBattleTextBox + call StdBattleTextbox farcall UseHeldStatusHealingItem @@ -3662,7 +3662,7 @@ BattleCommand_SleepTarget: push hl call AnimateFailedMove pop hl - jp StdBattleTextBox + jp StdBattleTextbox .CheckAIRandomFail: ; Enemy turn @@ -3722,7 +3722,7 @@ BattleCommand_PoisonTarget: call RefreshBattleHuds ld hl, WasPoisonedText - call StdBattleTextBox + call StdBattleTextbox farcall UseHeldStatusHealingItem ret @@ -3793,7 +3793,7 @@ BattleCommand_Poison: call .apply_poison ld hl, WasPoisonedText - call StdBattleTextBox + call StdBattleTextbox jr .finished .toxic @@ -3803,7 +3803,7 @@ BattleCommand_Poison: call .apply_poison ld hl, BadlyPoisonedText - call StdBattleTextBox + call StdBattleTextbox .finished farcall UseHeldStatusHealingItem @@ -3813,7 +3813,7 @@ BattleCommand_Poison: push hl call AnimateFailedMove pop hl - jp StdBattleTextBox + jp StdBattleTextbox .apply_poison call AnimateCurrentMove @@ -3859,13 +3859,13 @@ BattleCommand_DrainTarget: ; draintarget call SapHealth ld hl, SuckedHealthText - jp StdBattleTextBox + jp StdBattleTextbox BattleCommand_EatDream: ; eatdream call SapHealth ld hl, DreamEatenText - jp StdBattleTextBox + jp StdBattleTextbox SapHealth: ; Divide damage by 2, store it in hDividend @@ -3996,7 +3996,7 @@ BattleCommand_BurnTarget: call RefreshBattleHuds ld hl, WasBurnedText - call StdBattleTextBox + call StdBattleTextbox farcall UseHeldStatusHealingItem ret @@ -4024,7 +4024,7 @@ Defrost: call UpdateOpponentInParty ld hl, DefrostedOpponentText - jp StdBattleTextBox + jp StdBattleTextbox BattleCommand_FreezeTarget: ; freezetarget @@ -4063,7 +4063,7 @@ BattleCommand_FreezeTarget: call RefreshBattleHuds ld hl, WasFrozenText - call StdBattleTextBox + call StdBattleTextbox farcall UseHeldStatusHealingItem ret nz @@ -4543,7 +4543,7 @@ BattleCommand_StatUpMessage: inc b call GetStatName ld hl, .stat - jp BattleTextBox + jp BattleTextbox .stat text_far UnknownText_0x1c0cc6 @@ -4573,7 +4573,7 @@ BattleCommand_StatDownMessage: inc b call GetStatName ld hl, .stat - jp BattleTextBox + jp BattleTextbox .stat text_far UnknownText_0x1c0ceb @@ -4652,7 +4652,7 @@ BattleCommand_StatUpFailText: inc b call GetStatName ld hl, WontRiseAnymoreText - jp StdBattleTextBox + jp StdBattleTextbox BattleCommand_StatDownFailText: ; statdownfailtext @@ -4666,14 +4666,14 @@ BattleCommand_StatDownFailText: jp z, TryPrintButItFailed dec a ld hl, ProtectedByMistText - jp z, StdBattleTextBox + jp z, StdBattleTextbox ld a, [wLoweredStat] and $f ld b, a inc b call GetStatName ld hl, WontDropAnymoreText - jp StdBattleTextBox + jp StdBattleTextbox GetStatName: ld hl, StatNames @@ -5129,7 +5129,7 @@ BattleCommand_ForceSwitch: callfar ForceEnemySwitch ld hl, DraggedOutText - call StdBattleTextBox + call StdBattleTextbox ld hl, SpikesDamage jp CallBattleCore @@ -5226,7 +5226,7 @@ BattleCommand_ForceSwitch: call CallBattleCore ld hl, DraggedOutText - call StdBattleTextBox + call StdBattleTextbox ld hl, SpikesDamage jp CallBattleCore @@ -5252,7 +5252,7 @@ BattleCommand_ForceSwitch: jr z, .do_text ld hl, BlownAwayText .do_text - jp StdBattleTextBox + jp StdBattleTextbox CheckPlayerHasMonToSwitchTo: ld a, [wPartyCount] @@ -5393,7 +5393,7 @@ BattleCommand_EndLoop: call GetBattleVar cp EFFECT_BEAT_UP jr z, .beat_up_2 - call StdBattleTextBox + call StdBattleTextbox .beat_up_2 pop bc @@ -5582,7 +5582,7 @@ BattleCommand_Charge: ld hl, IgnoredOrders2Text ld a, [wAlreadyDisobeyed] and a - call nz, StdBattleTextBox + call nz, StdBattleTextbox call BattleCommand_LowerSub xor a @@ -5631,7 +5631,7 @@ BattleCommand_Charge: call ResetDamage ld hl, .UsedText - call BattleTextBox + call BattleTextbox ld a, BATTLE_VARS_MOVE_EFFECT call GetBattleVar @@ -5752,7 +5752,7 @@ BattleCommand_TrapTarget: ld a, [hli] ld h, [hl] ld l, a - jp StdBattleTextBox + jp StdBattleTextbox .Traps: dbw BIND, UsedBindText ; 'used BIND on' @@ -5827,7 +5827,7 @@ BattleCommand_Recoil: predef AnimateHPBar call RefreshBattleHuds ld hl, RecoilText - jp StdBattleTextBox + jp StdBattleTextbox BattleCommand_ConfuseTarget: ; confusetarget @@ -5861,7 +5861,7 @@ BattleCommand_Confuse: call GetItemName call AnimateFailedMove ld hl, ProtectedByText - jp StdBattleTextBox + jp StdBattleTextbox .no_item_protection ld a, BATTLE_VARS_SUBSTATUS3_OPP @@ -5870,7 +5870,7 @@ BattleCommand_Confuse: jr z, .not_already_confused call AnimateFailedMove ld hl, AlreadyConfusedText - jp StdBattleTextBox + jp StdBattleTextbox .not_already_confused call CheckSubstituteOpp @@ -5909,7 +5909,7 @@ BattleCommand_FinishConfusingTarget: call PlayOpponentBattleAnim ld hl, BecameConfusedText - call StdBattleTextBox + call StdBattleTextbox call GetOpponentItem ld a, b @@ -5951,7 +5951,7 @@ BattleCommand_Paralyze: call GetItemName call AnimateFailedMove ld hl, ProtectedByText - jp StdBattleTextBox + jp StdBattleTextbox .no_item_protection ldh a, [hBattleTurn] @@ -6003,7 +6003,7 @@ BattleCommand_Paralyze: .paralyzed call AnimateFailedMove ld hl, AlreadyParalyzedText - jp StdBattleTextBox + jp StdBattleTextbox .failed jp PrintDidntAffect2 @@ -6131,7 +6131,7 @@ BattleCommand_ResetStats: call AnimateCurrentMove ld hl, EliminatedStatsText - jp StdBattleTextBox + jp StdBattleTextbox .Fill: ld b, wPlayerStatLevelsEnd - wPlayerStatLevels @@ -6184,7 +6184,7 @@ BattleCommand_Heal: jr z, .no_status_to_heal ld hl, RestedText .no_status_to_heal - call StdBattleTextBox + call StdBattleTextbox ldh a, [hBattleTurn] and a jr nz, .calc_enemy_stats @@ -6216,12 +6216,12 @@ BattleCommand_Heal: call UpdateUserInParty call RefreshBattleHuds ld hl, RegainedHealthText - jp StdBattleTextBox + jp StdBattleTextbox .hp_full call AnimateFailedMove ld hl, HPIsFullText - jp StdBattleTextBox + jp StdBattleTextbox INCLUDE "engine/battle/move_effects/transform.asm" @@ -6296,7 +6296,7 @@ BattleCommand_Screen: .good call AnimateCurrentMove - jp StdBattleTextBox + jp StdBattleTextbox .failed call AnimateFailedMove @@ -6305,12 +6305,12 @@ BattleCommand_Screen: PrintDoesntAffect: ; 'it doesn't affect' ld hl, DoesntAffectText - jp StdBattleTextBox + jp StdBattleTextbox PrintNothingHappened: ; 'but nothing happened!' ld hl, NothingHappenedText - jp StdBattleTextBox + jp StdBattleTextbox TryPrintButItFailed: ld a, [wAlreadyFailed] @@ -6322,7 +6322,7 @@ TryPrintButItFailed: PrintButItFailed: ; 'but it failed!' ld hl, ButItFailedText - jp StdBattleTextBox + jp StdBattleTextbox FailMove: call AnimateFailedMove @@ -6336,7 +6336,7 @@ FailMimic: PrintDidntAffect: ; 'it didn't affect' ld hl, DidntAffect1Text - jp StdBattleTextBox + jp StdBattleTextbox PrintDidntAffect2: call AnimateFailedMove @@ -6347,7 +6347,7 @@ PrintDidntAffect2: PrintParalyze: ; 'paralyzed! maybe it can't attack!' ld hl, ParalyzedText - jp StdBattleTextBox + jp StdBattleTextbox CheckSubstituteOpp: ld a, BATTLE_VARS_SUBSTATUS4_OPP @@ -6421,7 +6421,7 @@ BattleCommand_ArenaTrap: set SUBSTATUS_CANT_RUN, [hl] call AnimateCurrentMove ld hl, CantEscapeNowText - jp StdBattleTextBox + jp StdBattleTextbox .failed call AnimateFailedMove @@ -6458,7 +6458,7 @@ BattleCommand_Defrost: .done call RefreshBattleHuds ld hl, WasDefrostedText - jp StdBattleTextBox + jp StdBattleTextbox INCLUDE "engine/battle/move_effects/curse.asm" @@ -6519,7 +6519,7 @@ BattleCommand_CheckSafeguard: ld [wAttackMissed], a call BattleCommand_MoveDelay ld hl, SafeguardProtectText - call StdBattleTextBox + call StdBattleTextbox jp EndMoveEffect INCLUDE "engine/battle/move_effects/magnitude.asm" @@ -6612,14 +6612,14 @@ BattleCommand_TimeBasedHealContinue: ; 'regained health!' ld hl, RegainedHealthText - jp StdBattleTextBox + jp StdBattleTextbox .Full: call AnimateFailedMove ; 'hp is full!' ld hl, HPIsFullText - jp StdBattleTextBox + jp StdBattleTextbox .Multipliers: dw GetEighthMaxHP @@ -6845,7 +6845,7 @@ BattleCommand_ClearText: ; Used in multi-hit moves. ld hl, .text - jp BattleTextBox + jp BattleTextbox .text: text_end diff --git a/engine/battle/move_effects/attract.asm b/engine/battle/move_effects/attract.asm index bb7b4fce4..5eb82d65e 100644 --- a/engine/battle/move_effects/attract.asm +++ b/engine/battle/move_effects/attract.asm @@ -17,7 +17,7 @@ BattleCommand_Attract: ; 'fell in love!' ld hl, FellInLoveText - jp StdBattleTextBox + jp StdBattleTextbox .failed jp FailMove diff --git a/engine/battle/move_effects/beat_up.asm b/engine/battle/move_effects/beat_up.asm index bd0307f40..73bbb2e42 100644 --- a/engine/battle/move_effects/beat_up.asm +++ b/engine/battle/move_effects/beat_up.asm @@ -52,7 +52,7 @@ BattleCommand_BeatUp: ld a, $1 ld [wBeatUpHitAtLeastOnce], a ld hl, BeatUpAttackText - call StdBattleTextBox + call StdBattleTextbox ld a, [wEnemyMonSpecies] ld [wCurSpecies], a @@ -159,12 +159,12 @@ BattleCommand_BeatUp: ld [wNamedObjectIndexBuffer], a call GetPokemonName ld hl, BeatUpAttackText - call StdBattleTextBox + call StdBattleTextbox jp EnemyAttackDamage .finish_beatup ld hl, BeatUpAttackText - call StdBattleTextBox + call StdBattleTextbox ld a, [wBattleMonSpecies] ld [wCurSpecies], a diff --git a/engine/battle/move_effects/belly_drum.asm b/engine/battle/move_effects/belly_drum.asm index 27ef1a542..ac415f576 100644 --- a/engine/battle/move_effects/belly_drum.asm +++ b/engine/battle/move_effects/belly_drum.asm @@ -27,7 +27,7 @@ BattleCommand_BellyDrum: jr nz, .max_attack_loop ld hl, BellyDrumText - jp StdBattleTextBox + jp StdBattleTextbox .failed call AnimateFailedMove diff --git a/engine/battle/move_effects/bide.asm b/engine/battle/move_effects/bide.asm index cfb3f3ab2..74f7c9cfa 100644 --- a/engine/battle/move_effects/bide.asm +++ b/engine/battle/move_effects/bide.asm @@ -20,7 +20,7 @@ BattleCommand_StoreEnergy: res SUBSTATUS_BIDE, [hl] ld hl, UnleashedEnergyText - call StdBattleTextBox + call StdBattleTextbox ld a, BATTLE_VARS_MOVE_POWER call GetBattleVarAddr @@ -66,7 +66,7 @@ BattleCommand_StoreEnergy: .still_storing ld hl, StoringEnergyText - call StdBattleTextBox + call StdBattleTextbox jp EndMoveEffect BattleCommand_UnleashEnergy: diff --git a/engine/battle/move_effects/conversion.asm b/engine/battle/move_effects/conversion.asm index 4b13f29dd..eaa3d6c9c 100644 --- a/engine/battle/move_effects/conversion.asm +++ b/engine/battle/move_effects/conversion.asm @@ -93,4 +93,4 @@ BattleCommand_Conversion: farcall GetTypeName call AnimateCurrentMove ld hl, TransformedTypeText - jp StdBattleTextBox + jp StdBattleTextbox diff --git a/engine/battle/move_effects/conversion2.asm b/engine/battle/move_effects/conversion2.asm index d67725f9c..802b57b53 100644 --- a/engine/battle/move_effects/conversion2.asm +++ b/engine/battle/move_effects/conversion2.asm @@ -58,7 +58,7 @@ BattleCommand_Conversion2: ld [wNamedObjectIndexBuffer], a predef GetTypeName ld hl, TransformedTypeText - jp StdBattleTextBox + jp StdBattleTextbox .failed jp FailMove diff --git a/engine/battle/move_effects/curse.asm b/engine/battle/move_effects/curse.asm index fb59d9b67..3507c6687 100644 --- a/engine/battle/move_effects/curse.asm +++ b/engine/battle/move_effects/curse.asm @@ -76,7 +76,7 @@ BattleCommand_Curse: call CallBattleCore call UpdateUserInParty ld hl, PutACurseText - jp StdBattleTextBox + jp StdBattleTextbox .failed call AnimateFailedMove @@ -90,4 +90,4 @@ BattleCommand_Curse: call GetStatName call AnimateFailedMove ld hl, WontRiseAnymoreText - jp StdBattleTextBox + jp StdBattleTextbox diff --git a/engine/battle/move_effects/destiny_bond.asm b/engine/battle/move_effects/destiny_bond.asm index 55809d98a..6a03b9a76 100644 --- a/engine/battle/move_effects/destiny_bond.asm +++ b/engine/battle/move_effects/destiny_bond.asm @@ -6,4 +6,4 @@ BattleCommand_DestinyBond: set SUBSTATUS_DESTINY_BOND, [hl] call AnimateCurrentMove ld hl, DestinyBondEffectText - jp StdBattleTextBox + jp StdBattleTextbox diff --git a/engine/battle/move_effects/disable.asm b/engine/battle/move_effects/disable.asm index 7f5cfaea0..de6dbc60f 100644 --- a/engine/battle/move_effects/disable.asm +++ b/engine/battle/move_effects/disable.asm @@ -66,7 +66,7 @@ BattleCommand_Disable: ld [wNamedObjectIndexBuffer], a call GetMoveName ld hl, WasDisabledText - jp StdBattleTextBox + jp StdBattleTextbox .failed jp FailMove diff --git a/engine/battle/move_effects/encore.asm b/engine/battle/move_effects/encore.asm index 3ac107e2b..8ca3595f3 100644 --- a/engine/battle/move_effects/encore.asm +++ b/engine/battle/move_effects/encore.asm @@ -114,7 +114,7 @@ BattleCommand_Encore: .finish_move call AnimateCurrentMove ld hl, GotAnEncoreText - jp StdBattleTextBox + jp StdBattleTextbox .failed jp PrintDidntAffect2 diff --git a/engine/battle/move_effects/endure.asm b/engine/battle/move_effects/endure.asm index f0555a737..00ccb130c 100644 --- a/engine/battle/move_effects/endure.asm +++ b/engine/battle/move_effects/endure.asm @@ -13,4 +13,4 @@ BattleCommand_Endure: call AnimateCurrentMove ld hl, BracedItselfText - jp StdBattleTextBox + jp StdBattleTextbox diff --git a/engine/battle/move_effects/focus_energy.asm b/engine/battle/move_effects/focus_energy.asm index ffdc7b136..c4eb1f334 100644 --- a/engine/battle/move_effects/focus_energy.asm +++ b/engine/battle/move_effects/focus_energy.asm @@ -8,7 +8,7 @@ BattleCommand_FocusEnergy: set SUBSTATUS_FOCUS_ENERGY, [hl] call AnimateCurrentMove ld hl, GettingPumpedText - jp StdBattleTextBox + jp StdBattleTextbox .already_pumped call AnimateFailedMove diff --git a/engine/battle/move_effects/foresight.asm b/engine/battle/move_effects/foresight.asm index 4235e0878..ff25b04eb 100644 --- a/engine/battle/move_effects/foresight.asm +++ b/engine/battle/move_effects/foresight.asm @@ -16,7 +16,7 @@ BattleCommand_Foresight: set SUBSTATUS_IDENTIFIED, [hl] call AnimateCurrentMove ld hl, IdentifiedText - jp StdBattleTextBox + jp StdBattleTextbox .failed jp FailMove diff --git a/engine/battle/move_effects/future_sight.asm b/engine/battle/move_effects/future_sight.asm index 0cb0b43ba..129a9e08f 100644 --- a/engine/battle/move_effects/future_sight.asm +++ b/engine/battle/move_effects/future_sight.asm @@ -54,7 +54,7 @@ BattleCommand_FutureSight: call BattleCommand_LowerSub call BattleCommand_MoveDelay ld hl, ForesawAttackText - call StdBattleTextBox + call StdBattleTextbox call BattleCommand_RaiseSub ld de, wPlayerFutureSightDamage ldh a, [hBattleTurn] diff --git a/engine/battle/move_effects/heal_bell.asm b/engine/battle/move_effects/heal_bell.asm index a9923429e..62309f1db 100644 --- a/engine/battle/move_effects/heal_bell.asm +++ b/engine/battle/move_effects/heal_bell.asm @@ -26,7 +26,7 @@ BattleCommand_HealBell: call AnimateCurrentMove ld hl, BellChimedText - call StdBattleTextBox + call StdBattleTextbox ldh a, [hBattleTurn] and a diff --git a/engine/battle/move_effects/leech_seed.asm b/engine/battle/move_effects/leech_seed.asm index 7cb14c27c..bb17ee00c 100644 --- a/engine/battle/move_effects/leech_seed.asm +++ b/engine/battle/move_effects/leech_seed.asm @@ -28,7 +28,7 @@ BattleCommand_LeechSeed: set SUBSTATUS_LEECH_SEED, [hl] call AnimateCurrentMove ld hl, WasSeededText - jp StdBattleTextBox + jp StdBattleTextbox .grass call AnimateFailedMove @@ -37,4 +37,4 @@ BattleCommand_LeechSeed: .evaded call AnimateFailedMove ld hl, EvadedText - jp StdBattleTextBox + jp StdBattleTextbox diff --git a/engine/battle/move_effects/lock_on.asm b/engine/battle/move_effects/lock_on.asm index 7dc4a013d..1de3e14ba 100644 --- a/engine/battle/move_effects/lock_on.asm +++ b/engine/battle/move_effects/lock_on.asm @@ -14,7 +14,7 @@ BattleCommand_LockOn: call AnimateCurrentMove ld hl, TookAimText - jp StdBattleTextBox + jp StdBattleTextbox .fail call AnimateFailedMove diff --git a/engine/battle/move_effects/magnitude.asm b/engine/battle/move_effects/magnitude.asm index eaa0c2a3a..f8961b668 100644 --- a/engine/battle/move_effects/magnitude.asm +++ b/engine/battle/move_effects/magnitude.asm @@ -21,7 +21,7 @@ BattleCommand_GetMagnitude: ld [wDeciramBuffer], a call BattleCommand_MoveDelay ld hl, MagnitudeText - call StdBattleTextBox + call StdBattleTextbox pop de pop bc ret diff --git a/engine/battle/move_effects/mimic.asm b/engine/battle/move_effects/mimic.asm index 30b531572..e4b99377f 100644 --- a/engine/battle/move_effects/mimic.asm +++ b/engine/battle/move_effects/mimic.asm @@ -44,7 +44,7 @@ BattleCommand_Mimic: call GetMoveName call AnimateCurrentMove ld hl, LearnedMoveText - jp StdBattleTextBox + jp StdBattleTextbox .fail jp FailMimic diff --git a/engine/battle/move_effects/mirror_move.asm b/engine/battle/move_effects/mirror_move.asm index 89879c825..98e8aacc9 100644 --- a/engine/battle/move_effects/mirror_move.asm +++ b/engine/battle/move_effects/mirror_move.asm @@ -18,7 +18,7 @@ BattleCommand_MirrorMove: call AnimateFailedMove ld hl, MirrorMoveFailedText - call StdBattleTextBox + call StdBattleTextbox jp EndMoveEffect .use diff --git a/engine/battle/move_effects/mist.asm b/engine/battle/move_effects/mist.asm index 199a30045..26fafdd2d 100644 --- a/engine/battle/move_effects/mist.asm +++ b/engine/battle/move_effects/mist.asm @@ -8,7 +8,7 @@ BattleCommand_Mist: set SUBSTATUS_MIST, [hl] call AnimateCurrentMove ld hl, MistText - jp StdBattleTextBox + jp StdBattleTextbox .already_mist call AnimateFailedMove diff --git a/engine/battle/move_effects/nightmare.asm b/engine/battle/move_effects/nightmare.asm index dd85c722d..9354b15bb 100644 --- a/engine/battle/move_effects/nightmare.asm +++ b/engine/battle/move_effects/nightmare.asm @@ -30,7 +30,7 @@ BattleCommand_Nightmare: set SUBSTATUS_NIGHTMARE, [hl] call AnimateCurrentMove ld hl, StartedNightmareText - jp StdBattleTextBox + jp StdBattleTextbox .failed call AnimateFailedMove diff --git a/engine/battle/move_effects/pain_split.asm b/engine/battle/move_effects/pain_split.asm index 4e4380b23..3c521975d 100644 --- a/engine/battle/move_effects/pain_split.asm +++ b/engine/battle/move_effects/pain_split.asm @@ -32,7 +32,7 @@ BattleCommand_PainSplit: farcall _UpdateBattleHUDs ld hl, SharedPainText - jp StdBattleTextBox + jp StdBattleTextbox .PlayerShareHP: ld a, [hld] diff --git a/engine/battle/move_effects/pay_day.asm b/engine/battle/move_effects/pay_day.asm index 9f59dbb08..5f857aea5 100644 --- a/engine/battle/move_effects/pay_day.asm +++ b/engine/battle/move_effects/pay_day.asm @@ -23,4 +23,4 @@ BattleCommand_PayDay: inc [hl] .done ld hl, CoinsScatteredText - jp StdBattleTextBox + jp StdBattleTextbox diff --git a/engine/battle/move_effects/perish_song.asm b/engine/battle/move_effects/perish_song.asm index 4df52cc1c..1758b65a0 100644 --- a/engine/battle/move_effects/perish_song.asm +++ b/engine/battle/move_effects/perish_song.asm @@ -31,7 +31,7 @@ BattleCommand_PerishSong: .done call AnimateCurrentMove ld hl, StartPerishText - jp StdBattleTextBox + jp StdBattleTextbox .failed call AnimateFailedMove diff --git a/engine/battle/move_effects/present.asm b/engine/battle/move_effects/present.asm index bfc334cc7..188c4e889 100644 --- a/engine/battle/move_effects/present.asm +++ b/engine/battle/move_effects/present.asm @@ -70,7 +70,7 @@ BattleCommand_Present: call CallBattleCore call BattleCommand_SwitchTurn ld hl, RegainedHealthText - call StdBattleTextBox + call StdBattleTextbox call BattleCommand_SwitchTurn call UpdateOpponentInParty jr .do_animation @@ -81,7 +81,7 @@ BattleCommand_Present: jr nc, .do_animation call AnimateFailedMove ld hl, RefusedGiftText - call StdBattleTextBox + call StdBattleTextbox .do_animation jp EndMoveEffect diff --git a/engine/battle/move_effects/protect.asm b/engine/battle/move_effects/protect.asm index 1e540923d..e66bce443 100644 --- a/engine/battle/move_effects/protect.asm +++ b/engine/battle/move_effects/protect.asm @@ -10,7 +10,7 @@ BattleCommand_Protect: call AnimateCurrentMove ld hl, ProtectedItselfText - jp StdBattleTextBox + jp StdBattleTextbox ProtectChance: ld de, wPlayerProtectCount diff --git a/engine/battle/move_effects/psych_up.asm b/engine/battle/move_effects/psych_up.asm index c32316ccd..1bf9f3e6f 100644 --- a/engine/battle/move_effects/psych_up.asm +++ b/engine/battle/move_effects/psych_up.asm @@ -46,4 +46,4 @@ BattleCommand_PsychUp: .merge call AnimateCurrentMove ld hl, CopiedStatsText - jp StdBattleTextBox + jp StdBattleTextbox diff --git a/engine/battle/move_effects/rain_dance.asm b/engine/battle/move_effects/rain_dance.asm index e9ef5d123..c22fb9fdb 100644 --- a/engine/battle/move_effects/rain_dance.asm +++ b/engine/battle/move_effects/rain_dance.asm @@ -6,4 +6,4 @@ BattleCommand_StartRain: ld [wWeatherCount], a call AnimateCurrentMove ld hl, DownpourText - jp StdBattleTextBox + jp StdBattleTextbox diff --git a/engine/battle/move_effects/rapid_spin.asm b/engine/battle/move_effects/rapid_spin.asm index 6e40726db..eb396a35d 100644 --- a/engine/battle/move_effects/rapid_spin.asm +++ b/engine/battle/move_effects/rapid_spin.asm @@ -7,7 +7,7 @@ BattleCommand_ClearHazards: jr z, .not_leeched res SUBSTATUS_LEECH_SEED, [hl] ld hl, ShedLeechSeedText - call StdBattleTextBox + call StdBattleTextbox .not_leeched ld hl, wPlayerScreens @@ -23,7 +23,7 @@ BattleCommand_ClearHazards: res SCREENS_SPIKES, [hl] ld hl, BlewSpikesText push de - call StdBattleTextBox + call StdBattleTextbox pop de .no_spikes @@ -33,4 +33,4 @@ BattleCommand_ClearHazards: xor a ld [de], a ld hl, ReleasedByText - jp StdBattleTextBox + jp StdBattleTextbox diff --git a/engine/battle/move_effects/safeguard.asm b/engine/battle/move_effects/safeguard.asm index cb5a4857e..e64e80921 100644 --- a/engine/battle/move_effects/safeguard.asm +++ b/engine/battle/move_effects/safeguard.asm @@ -16,7 +16,7 @@ BattleCommand_Safeguard: ld [de], a call AnimateCurrentMove ld hl, CoveredByVeilText - jp StdBattleTextBox + jp StdBattleTextbox .failed call AnimateFailedMove diff --git a/engine/battle/move_effects/sandstorm.asm b/engine/battle/move_effects/sandstorm.asm index 77d6e24b5..c88529fb1 100644 --- a/engine/battle/move_effects/sandstorm.asm +++ b/engine/battle/move_effects/sandstorm.asm @@ -11,7 +11,7 @@ BattleCommand_StartSandstorm: ld [wWeatherCount], a call AnimateCurrentMove ld hl, SandstormBrewedText - jp StdBattleTextBox + jp StdBattleTextbox .failed call AnimateFailedMove diff --git a/engine/battle/move_effects/sketch.asm b/engine/battle/move_effects/sketch.asm index 2d9705106..654fb3f54 100644 --- a/engine/battle/move_effects/sketch.asm +++ b/engine/battle/move_effects/sketch.asm @@ -110,7 +110,7 @@ BattleCommand_Sketch: call AnimateCurrentMove ld hl, SketchedText - jp StdBattleTextBox + jp StdBattleTextbox .fail call AnimateFailedMove diff --git a/engine/battle/move_effects/spikes.asm b/engine/battle/move_effects/spikes.asm index c22787d6d..96163a680 100644 --- a/engine/battle/move_effects/spikes.asm +++ b/engine/battle/move_effects/spikes.asm @@ -20,7 +20,7 @@ BattleCommand_Spikes: call AnimateCurrentMove ld hl, SpikesText - jp StdBattleTextBox + jp StdBattleTextbox .failed jp FailMove diff --git a/engine/battle/move_effects/spite.asm b/engine/battle/move_effects/spite.asm index 031cdb71f..06627268b 100644 --- a/engine/battle/move_effects/spite.asm +++ b/engine/battle/move_effects/spite.asm @@ -80,7 +80,7 @@ BattleCommand_Spite: ld a, d ld [wDeciramBuffer], a ld hl, SpiteEffectText - jp StdBattleTextBox + jp StdBattleTextbox .failed jp PrintDidntAffect2 diff --git a/engine/battle/move_effects/substitute.asm b/engine/battle/move_effects/substitute.asm index bafd4c460..d2342c0d6 100644 --- a/engine/battle/move_effects/substitute.asm +++ b/engine/battle/move_effects/substitute.asm @@ -71,7 +71,7 @@ BattleCommand_Substitute: call BattleCommand_RaiseSubNoAnim .finish ld hl, MadeSubstituteText - call StdBattleTextBox + call StdBattleTextbox jp RefreshBattleHuds .already_has_sub @@ -85,4 +85,4 @@ BattleCommand_Substitute: call nz, BattleCommand_RaiseSub ld hl, TooWeakSubText .jp_stdbattletextbox - jp StdBattleTextBox + jp StdBattleTextbox diff --git a/engine/battle/move_effects/sunny_day.asm b/engine/battle/move_effects/sunny_day.asm index f5825930f..0edc38e45 100644 --- a/engine/battle/move_effects/sunny_day.asm +++ b/engine/battle/move_effects/sunny_day.asm @@ -6,4 +6,4 @@ BattleCommand_StartSun: ld [wWeatherCount], a call AnimateCurrentMove ld hl, SunGotBrightText - jp StdBattleTextBox + jp StdBattleTextbox diff --git a/engine/battle/move_effects/teleport.asm b/engine/battle/move_effects/teleport.asm index 55eb6675f..1a6aeed41 100644 --- a/engine/battle/move_effects/teleport.asm +++ b/engine/battle/move_effects/teleport.asm @@ -86,4 +86,4 @@ BattleCommand_Teleport: call SetBattleDraw ld hl, FledFromBattleText - jp StdBattleTextBox + jp StdBattleTextbox diff --git a/engine/battle/move_effects/thief.asm b/engine/battle/move_effects/thief.asm index 47270d6c2..e588c5ff7 100644 --- a/engine/battle/move_effects/thief.asm +++ b/engine/battle/move_effects/thief.asm @@ -93,7 +93,7 @@ BattleCommand_Thief: .stole call GetItemName ld hl, StoleText - jp StdBattleTextBox + jp StdBattleTextbox .playeritem ld a, 1 diff --git a/engine/battle/move_effects/transform.asm b/engine/battle/move_effects/transform.asm index 509a8d03f..fe94c4f2c 100644 --- a/engine/battle/move_effects/transform.asm +++ b/engine/battle/move_effects/transform.asm @@ -135,7 +135,7 @@ BattleCommand_Transform: ld a, SUBSTITUTE call nz, LoadAnim ld hl, TransformedText - jp StdBattleTextBox + jp StdBattleTextbox BattleSideCopy: ; Copy bc bytes from hl to de if it's the player's turn. diff --git a/engine/battle/trainer_huds.asm b/engine/battle/trainer_huds.asm index 2f0e93b6e..bc55c7423 100644 --- a/engine/battle/trainer_huds.asm +++ b/engine/battle/trainer_huds.asm @@ -237,7 +237,7 @@ _ShowLinkBattleParticipants: hlcoord 2, 3 ld b, 9 ld c, 14 - call TextBox + call Textbox hlcoord 4, 5 ld de, wPlayerName call PlaceString diff --git a/engine/battle/used_move_text.asm b/engine/battle/used_move_text.asm index 88522ee32..9fb05ae06 100644 --- a/engine/battle/used_move_text.asm +++ b/engine/battle/used_move_text.asm @@ -1,7 +1,7 @@ DisplayUsedMoveText: ; battle command 03 ld hl, UsedMoveText - call BattleTextBox + call BattleTextbox jp WaitBGMap UsedMoveText: diff --git a/engine/battle_anims/anim_commands.asm b/engine/battle_anims/anim_commands.asm index b528239ee..09cfbcec0 100644 --- a/engine/battle_anims/anim_commands.asm +++ b/engine/battle_anims/anim_commands.asm @@ -152,7 +152,7 @@ BattleAnimRestoreHuds: ldh a, [rSVBK] push af - ld a, BANK(wCurBattleMon) ; alternatively: BANK(wTempMon), BANK(wPartyMon1), several others + ld a, BANK(wCurBattleMon) ; aka BANK(wTempMon) and BANK(wPartyMon1) and several others ldh [rSVBK], a ld hl, UpdateBattleHuds diff --git a/engine/battle_anims/bg_effects.asm b/engine/battle_anims/bg_effects.asm index 00eb9a4ce..41d87275a 100644 --- a/engine/battle_anims/bg_effects.asm +++ b/engine/battle_anims/bg_effects.asm @@ -1417,7 +1417,7 @@ BattleBGEffect_Tackle: ldh [hLYOverrideEnd], a ld hl, BG_EFFECT_STRUCT_03 add hl, bc - ld [hl], $0 + ld [hl], 0 call BGEffect_CheckBattleTurn jr nz, .player_side ld a, 2 @@ -1451,10 +1451,10 @@ BattleBGEffect_25: ldh [hLYOverrideEnd], a ld hl, BG_EFFECT_STRUCT_03 add hl, bc - ld [hl], $0 + ld [hl], 0 call BGEffect_CheckBattleTurn jr nz, .player_side - ld a, 2 + ld a, 2 jr .okay .player_side @@ -1473,7 +1473,7 @@ Tackle_BGEffect25_2d_one: ld a, [hl] cp -8 jr z, .reached_limit - cp 8 + cp 8 jr nz, .finish .reached_limit call BattleBGEffects_IncrementJumptable diff --git a/engine/events/battle_tower/battle_tower.asm b/engine/events/battle_tower/battle_tower.asm index dcfe6ae22..088d920ba 100644 --- a/engine/events/battle_tower/battle_tower.asm +++ b/engine/events/battle_tower/battle_tower.asm @@ -12,33 +12,33 @@ Function1700ba: Function1700c4: ldh a, [rSVBK] push af - ld a, $3 + ld a, BANK(w3_d202TrainerData) ; aka BANK(w3_dffc) and BANK(w3_d202Name) ldh [rSVBK], a call Function17042c - ld a, $5 + ld a, BANK(s5_be45) ; aka BANK(s5_be46) and BANK(s5_aa41) and BANK(s5_aa5d) call GetSRAMBank - ld a, $1 - ld [$be45], a + ld a, 1 + ld [s5_be45], a xor a - ld [$be46], a + ld [s5_be46], a ld hl, w3_dffc - ld de, $aa41 + ld de, s5_aa41 ld bc, 4 call CopyBytes ld hl, w3_d202Name - ld de, $aa8e + ld de, s5_aa8e ld bc, 7 * $cc ; length of battle tower struct from japanese games? call CopyBytes - ld hl, $aa5d ; some sort of count + ld hl, s5_aa5d ; some sort of count ld a, [hl] inc [hl] inc hl sla a sla a ld e, a - ld d, $0 + ld d, 0 add hl, de ld e, l ld d, h @@ -57,11 +57,11 @@ Function170114: ret .Function170121: - ld a, $5 + ld a, BANK(s5_a948) call GetSRAMBank - ld hl, $a948 + ld hl, s5_a948 ld de, wc608 - ld bc, $f6 ; 246 + ld bc, 246 call CopyBytes call CloseSRAM call Function170c8b @@ -69,10 +69,10 @@ Function170114: Function170139: ; Convert the 4-digit decimal number at 5:aa41 into binary - ld a, $5 + ld a, BANK(s5_aa41) call GetSRAMBank - ld de, $aa41 - ld h, $0 + ld de, s5_aa41 + ld h, 0 ld l, h ld bc, 1000 call .DecToBin @@ -82,7 +82,7 @@ Function170139: call .DecToBin ld a, [de] ld c, a - ld b, $0 + ld b, 0 add hl, bc call CloseSRAM ; Store that number in wc608 @@ -145,20 +145,22 @@ Function170139: pop af dec a jr nz, .CopyLoop - ld a, $4 + + ld a, BANK(s4_a013) call GetSRAMBank - ld hl, $a013 - ld bc, $24 + ld hl, s4_a013 + ld bc, 36 call CopyBytes call CloseSRAM - ld a, $5 + + ld a, BANK(s5_a894) ; aka BANK(s5_a948) call GetSRAMBank - ld hl, $a894 + ld hl, s5_a894 ld bc, NAME_LENGTH_JAPANESE call CopyBytes ld hl, wc608 - ld de, $a948 - ld bc, $f6 + ld de, s5_a948 + ld bc, 246 call CopyBytes call CloseSRAM ret @@ -176,7 +178,7 @@ Function170139: ret BattleTowerBattle: - xor a + xor a ; FALSE ld [wBattleTowerBattleEnded], a call _BattleTowerBattle ret @@ -197,7 +199,7 @@ _BattleTowerBattle: call .do_dw call DelayFrame ld a, [wBattleTowerBattleEnded] - cp $1 + cp TRUE jr nz, .loop ret @@ -225,7 +227,7 @@ RunBattleTowerTrainer: ld a, [wInBattleTowerBattle] push af - or $1 + or 1 ld [wInBattleTowerBattle], a xor a @@ -260,7 +262,7 @@ RunBattleTowerTrainer: ld [wInBattleTowerBattle], a pop af ld [wOptions], a - ld a, $1 + ld a, TRUE ld [wBattleTowerBattleEnded], a ret @@ -407,9 +409,9 @@ endr .valid ld [wCurSpecies], a call GetBaseData - ld a, $5 + ld a, BANK(s5_b2fb) call GetSRAMBank - ld a, [$b2fb] ; s5_b2fb ; max level? + ld a, [s5_b2fb] ; s5_b2fb ; max level? call CloseSRAM ld e, a ld hl, MON_LEVEL @@ -599,7 +601,7 @@ Unreferenced_Function1704ca: ret Function1704e1: - call SpeechTextBox + call SpeechTextbox call FadeToMenu call InitBattleTowerChallengeRAM call .JumptableLoop @@ -640,17 +642,17 @@ Function1704e1: dw .Jumptable_2 .Jumptable_0: - ld a, $5 + ld a, BANK(s5_a89c) call GetSRAMBank - ld hl, $a89c + ld hl, s5_a89c ld de, wStringBuffer3 - ld bc, $16 + ld bc, 22 call CopyBytes - ld hl, $a8b2 + ld hl, s5_a8b2 ld de, wc608 - ld bc, $0096 + ld bc, 150 call CopyBytes call CloseSRAM @@ -879,41 +881,41 @@ BattleTowerAction: jp hl .dw - dw BattleTowerAction_CheckExplanationRead ; 0x00 - dw BattleTowerAction_SetExplanationRead ; 0x01 - dw BattleTowerAction_GetChallengeState ; 0x02 - dw BattleTowerAction_SetByteToQuickSaveChallenge ; 0x03 - dw BattleTowerAction_SetByteToCancelChallenge ; 0x04 - dw Function1707ac ; 0x05 - dw Function1707f4 ; 0x06 - dw SaveBattleTowerLevelGroup ; 0x07 - dw LoadBattleTowerLevelGroup ; 0x08 - dw BattleTower_CheckSaveFileExistsAndIsYours ; 0x09 - dw Function1708b1 ; 0x0a - dw CheckMobileEventIndex ; 0x0b - dw Function1708c8 ; 0x0c - dw Function1708f0 ; 0x0d - dw BattleTowerAction_EggTicket ; 0x0e - dw Function1709aa ; 0x0f - dw Function1709bb ; 0x10 - dw Function170a9c ; 0x11 - dw Function170aa0 ; 0x12 - dw Function170aaf ; 0x13 - dw Function170abe ; 0x14 - dw Function170ad7 ; 0x15 - dw Function170807 ; 0x16 - dw Function17081d ; 0x17 - dw BattleTowerAction_LevelCheck ; 0x18 - dw BattleTowerAction_UbersCheck ; 0x19 - dw ResetBattleTowerTrainersSRAM ; 0x1a - dw BattleTower_GiveReward ; 0x1b - dw Function17071b ; 0x1c - dw Function170729 ; 0x1d - dw BattleTower_RandomlyChooseReward ; 0x1e - dw BattleTower_SaveOptions ; 0x1f + dw BattleTowerAction_CheckExplanationRead + dw BattleTowerAction_SetExplanationRead + dw BattleTowerAction_GetChallengeState + dw BattleTowerAction_SetByteToQuickSaveChallenge + dw BattleTowerAction_SetByteToCancelChallenge + dw Function1707ac + dw Function1707f4 + dw SaveBattleTowerLevelGroup + dw LoadBattleTowerLevelGroup + dw BattleTower_CheckSaveFileExistsAndIsYours + dw Function1708b1 + dw CheckMobileEventIndex + dw Function1708c8 + dw Function1708f0 + dw BattleTowerAction_EggTicket + dw Function1709aa + dw Function1709bb + dw Function170a9c + dw Function170aa0 + dw Function170aaf + dw Function170abe + dw Function170ad7 + dw Function170807 + dw Function17081d + dw BattleTowerAction_LevelCheck + dw BattleTowerAction_UbersCheck + dw ResetBattleTowerTrainersSRAM + dw BattleTower_GiveReward + dw Function17071b + dw Function170729 + dw BattleTower_RandomlyChooseReward + dw BattleTower_SaveOptions ; Reset the save memory for BattleTower-Trainers (Counter and all 7 TrainerBytes) -ResetBattleTowerTrainersSRAM: ; BattleTowerAction $1a +ResetBattleTowerTrainersSRAM: ld a, BANK(sBTTrainers) call GetSRAMBank @@ -929,7 +931,7 @@ ResetBattleTowerTrainersSRAM: ; BattleTowerAction $1a ret -BattleTower_GiveReward: ; BattleTowerAction $1b +BattleTower_GiveReward: ld a, BANK(sBattleTowerReward) call GetSRAMBank @@ -958,7 +960,7 @@ BattleTower_GiveReward: ; BattleTowerAction $1b ld [wScriptVar], a ret -Function17071b: ; BattleTowerAction $1c +Function17071b: ld a, BANK(sBattleTowerChallengeState) call GetSRAMBank ld a, BATTLETOWER_WON_CHALLENGE @@ -966,7 +968,7 @@ Function17071b: ; BattleTowerAction $1c call CloseSRAM ret -Function170729: ; BattleTowerAction $1d +Function170729: ld a, BANK(sBattleTowerChallengeState) call GetSRAMBank ld a, BATTLETOWER_RECEIVED_REWARD @@ -974,11 +976,11 @@ Function170729: ; BattleTowerAction $1d call CloseSRAM ret -BattleTower_SaveOptions: ; BattleTowerAction $1f +BattleTower_SaveOptions: farcall SaveOptions ret -BattleTower_RandomlyChooseReward: ; BattleTowerAction $1e +BattleTower_RandomlyChooseReward: ; Generate a random stat boosting item. .loop call Random @@ -999,7 +1001,7 @@ BattleTower_RandomlyChooseReward: ; BattleTowerAction $1e call CloseSRAM ret -BattleTowerAction_CheckExplanationRead: ; BattleTowerAction $00 +BattleTowerAction_CheckExplanationRead: call BattleTower_CheckSaveFileExistsAndIsYours ld a, [wScriptVar] and a @@ -1008,12 +1010,12 @@ BattleTowerAction_CheckExplanationRead: ; BattleTowerAction $00 ld a, BANK(sBattleTowerSaveFileFlags) call GetSRAMBank ld a, [sBattleTowerSaveFileFlags] - and $2 + and 2 ld [wScriptVar], a call CloseSRAM ret -BattleTowerAction_GetChallengeState: ; BattleTowerAction $02 +BattleTowerAction_GetChallengeState: ld hl, sBattleTowerChallengeState ld a, BANK(sBattleTowerChallengeState) call GetSRAMBank @@ -1022,20 +1024,20 @@ BattleTowerAction_GetChallengeState: ; BattleTowerAction $02 call CloseSRAM ret -BattleTowerAction_SetExplanationRead: ; BattleTowerAction $01 +BattleTowerAction_SetExplanationRead: ld a, BANK(sBattleTowerSaveFileFlags) call GetSRAMBank ld a, [sBattleTowerSaveFileFlags] - or $2 + or 2 ld [sBattleTowerSaveFileFlags], a call CloseSRAM ret -BattleTowerAction_SetByteToQuickSaveChallenge: ; BattleTowerAction $03 +BattleTowerAction_SetByteToQuickSaveChallenge: ld c, BATTLETOWER_SAVED_AND_LEFT jr asm_17079f -BattleTowerAction_SetByteToCancelChallenge: ; BattleTowerAction $04 +BattleTowerAction_SetByteToCancelChallenge: ld c, BATTLETOWER_NO_CHALLENGE asm_17079f: ld a, BANK(sBattleTowerChallengeState) @@ -1045,31 +1047,31 @@ asm_17079f: call CloseSRAM ret -Function1707ac: ; BattleTowerAction $05 - ld a, $5 +Function1707ac: + ld a, BANK(s5_aa8c) ; aka BANK(s5_be46) call GetSRAMBank - ld a, [$aa8c] + ld a, [s5_aa8c] ld b, a - ld a, [$be46] + ld a, [s5_be46] ld [wScriptVar], a call CloseSRAM and a ret z ld a, b - cp $2 + cp 2 jr nc, .asm_1707ef push bc call UpdateTime pop bc - ld a, $5 + ld a, BANK(s5_aa8c) call GetSRAMBank - ld a, [$aa8b] + ld a, [s5_aa8b] call CloseSRAM ld c, a ld a, [wCurDay] sub c jr c, .asm_1707e5 - cp $8 + cp 8 jr nc, .asm_1707ef ld a, b and a @@ -1080,44 +1082,44 @@ Function1707ac: ; BattleTowerAction $05 ld a, $8c sub c add [hl] - cp $8 + cp 8 ret c .asm_1707ef - ld a, $8 + ld a, 8 ld [wScriptVar], a -Function1707f4: ; BattleTowerAction $06 - ld a, $5 +Function1707f4: + ld a, BANK(s5_be46) ; aka BANK(s5_aa8b) and BANK(s5_aa8c) call GetSRAMBank xor a - ld [$be46], a - ld [$aa8b], a - ld [$aa8c], a + ld [s5_be46], a + ld [s5_aa8b], a + ld [s5_aa8c], a call CloseSRAM ret -Function170807: ; BattleTowerAction $16 +Function170807: call UpdateTime - ld a, $5 + ld a, BANK(s5_b2f9) ; aka BANK(s5_b2fa) call GetSRAMBank ld a, [wCurDay] - ld [$b2f9], a + ld [s5_b2f9], a xor a - ld [$b2fa], a + ld [s5_b2fa], a call CloseSRAM ret -Function17081d: ; BattleTowerAction $17 +Function17081d: xor a ld [wScriptVar], a - ld a, $5 + ld a, BANK(s5_b2f9) ; aka BANK(s5_b2fa) call GetSRAMBank - ld a, [$b2f9] + ld a, [s5_b2f9] ld c, a - ld a, [$b2fa] + ld a, [s5_b2fa] ld b, a call CloseSRAM - cp $2 + cp 2 jr nc, .asm_170853 push bc call UpdateTime @@ -1125,7 +1127,7 @@ Function17081d: ; BattleTowerAction $17 ld a, [wCurDay] sub c jr c, .asm_170849 - cp $b + cp 11 jr nc, .asm_170853 ld a, b and a @@ -1137,25 +1139,25 @@ Function17081d: ; BattleTowerAction $17 ld a, 140 sub c add [hl] - cp $b + cp 11 ret c .asm_170853 - ld a, $1 + ld a, 1 ld [wScriptVar], a - ld a, $5 + ld a, BANK(s5_b2f9) ; aka BANK(s5_b2fa) call GetSRAMBank xor a - ld [$b2f9], a - ld [$b2fa], a + ld [s5_b2f9], a + ld [s5_b2fa], a call CloseSRAM ret -SaveBattleTowerLevelGroup: ; BattleTowerAction $07 +SaveBattleTowerLevelGroup: ld a, BANK(sBTChoiceOfLevelGroup) call GetSRAMBank ldh a, [rSVBK] push af - ld a, $3 + ld a, BANK(wBTChoiceOfLvlGroup) ldh [rSVBK], a ld a, [wBTChoiceOfLvlGroup] ld [sBTChoiceOfLevelGroup], a @@ -1164,12 +1166,12 @@ SaveBattleTowerLevelGroup: ; BattleTowerAction $07 call CloseSRAM ret -LoadBattleTowerLevelGroup: ; BattleTowerAction $08 ; Load level group choice +LoadBattleTowerLevelGroup: ; Load level group choice ld a, BANK(sBTChoiceOfLevelGroup) call GetSRAMBank ldh a, [rSVBK] push af - ld a, $3 + ld a, BANK(wBTChoiceOfLvlGroup) ldh [rSVBK], a ld a, [sBTChoiceOfLevelGroup] ld [wBTChoiceOfLvlGroup], a @@ -1178,17 +1180,17 @@ LoadBattleTowerLevelGroup: ; BattleTowerAction $08 ; Load level group choice call CloseSRAM ret -BattleTower_CheckSaveFileExistsAndIsYours: ; BattleTowerAction $09 +BattleTower_CheckSaveFileExistsAndIsYours: ld a, [wSaveFileExists] and a jr z, .nope farcall CompareLoadedAndSavedPlayerID jr z, .yes - xor a + xor a ; FALSE jr .nope .yes - ld a, $1 + ld a, TRUE .nope ld [wScriptVar], a @@ -1210,32 +1212,32 @@ CheckMobileEventIndex: ; BattleTowerAction $0b something to do with GS Ball Function1708c8: ; BattleTowerAction $0c call UpdateTime - ld a, $5 + ld a, BANK(s5_aa8b) ; aka BANK(s5_aa8c) and BANK(s5_aa5d) and BANK(s5_aa48) and BANK(s5_aa47) call GetSRAMBank ld a, [wCurDay] - ld [$aa8b], a + ld [s5_aa8b], a xor a - ld [$aa8c], a - ld a, [$aa5d] - cp $2 + ld [s5_aa8c], a + ld a, [s5_aa5d] + cp 2 jr nc, .asm_1708ec ld a, [wCurDay] - ld [$aa48], a - ld a, $1 - ld [$aa47], a + ld [s5_aa48], a + ld a, 1 + ld [s5_aa47], a .asm_1708ec call CloseSRAM ret Function1708f0: ; BattleTowerAction $0d - xor a + xor a ; FALSE ld [wScriptVar], a call UpdateTime - ld a, $5 + ld a, BANK(s5_aa48) ; aka BANK(s5_aa47) call GetSRAMBank - ld a, [$aa48] + ld a, [s5_aa48] ld c, a - ld a, [$aa47] + ld a, [s5_aa47] call CloseSRAM and a ret z @@ -1243,30 +1245,30 @@ Function1708f0: ; BattleTowerAction $0d ld a, c cp [hl] jr nz, Function170923 - ld a, $5 + ld a, BANK(s5_aa5d) call GetSRAMBank - ld a, [$aa5d] + ld a, [s5_aa5d] call CloseSRAM - cp $5 + cp 5 ret c - ld a, $1 + ld a, TRUE ld [wScriptVar], a ret Function170923: - ld a, $5 + ld a, BANK(s5_aa48) ; aka BANK(s5_aa47) and BANK(s5_aa5d) call GetSRAMBank xor a - ld [$aa48], a - ld [$aa47], a - ld hl, $aa5d - ld bc, $0011 + ld [s5_aa48], a + ld [s5_aa47], a + ld hl, s5_aa5d + ld bc, MOBILE_LOGIN_PASSWORD_LENGTH call ByteFill call CloseSRAM ret BattleTowerAction_EggTicket: ; BattleTowerAction $0e - xor a + xor a ; FALSE ld [wScriptVar], a ld a, EGG_TICKET ld [wCurItem], a @@ -1319,7 +1321,7 @@ endr ld [wCurItemQuantity], a ld hl, wNumItems call TossItem - ld a, $1 + ld a, TRUE ld [wScriptVar], a ret @@ -1347,11 +1349,11 @@ Function1709aa: ; BattleTowerAction $0f ret Function1709bb: ; BattleTowerAction $10 - xor a + xor a ; FALSE ld [wScriptVar], a - ld a, $5 + ld a, BANK(s5_a800) call GetSRAMBank - ld a, [$a800] + ld a, [s5_a800] call CloseSRAM cp 6 jr nc, .invalid @@ -1366,10 +1368,10 @@ Function1709bb: ; BattleTowerAction $10 jp hl .invalid - ld a, $5 + ld a, BANK(s5_a800) call GetSRAMBank xor a - ld [$a800], a + ld [s5_a800], a call CloseSRAM ret @@ -1382,46 +1384,46 @@ Function1709bb: ; BattleTowerAction $10 dw .Action5 .DoAction1: - ld a, $5 + ld a, BANK(s5_a800) call GetSRAMBank - ld a, $1 - ld [$a800], a + ld a, 1 + ld [s5_a800], a call CloseSRAM .NoAction: ret .Action4: - ld a, $5 + ld a, BANK(s5_b023) ; aka BANK(s5_a825) and BANK(s5_a826) call GetSRAMBank - ld hl, $b023 + ld hl, s5_b023 ld de, wc608 - ld bc, $0069 + ld bc, 105 call CopyBytes - ld a, [$a825] + ld a, [s5_a825] ld [wcd30], a - ld a, [$a826] + ld a, [s5_a826] ld [wcd31], a call CloseSRAM farcall Function11b6b4 farcall Function17d0f3 - ld a, $1 + ld a, TRUE ld [wScriptVar], a ret .Action5: - ld a, $0 + ld a, 0 ; ??? call GetSRAMBank ld hl, wRTC ld de, wc608 - ld bc, $0004 + ld bc, 4 call CopyBytes call CloseSRAM - ld a, $5 + ld a, BANK(s5_b08c) call GetSRAMBank - ld hl, $b08c + ld hl, s5_b08c ld de, wc608 - ld c, $4 + ld c, 4 .compare_loop ld a, [de] inc de @@ -1444,16 +1446,16 @@ Function1709bb: ; BattleTowerAction $10 ret nz .no_scene - ld a, $1 + ld a, TRUE ld [wScriptVar], a ret .different call CloseSRAM - ld a, $5 + ld a, BANK(s5_a800) call GetSRAMBank xor a - ld [$a800], a + ld [s5_a800], a call CloseSRAM ld [wScriptVar], a ld a, [wMapGroup] @@ -1470,29 +1472,29 @@ Function1709bb: ; BattleTowerAction $10 .no_scene_2 ret -Function170a9c: ; BattleTowerAction $11 +Function170a9c: ld c, FALSE jr asm_170aa2 -Function170aa0: ; BattleTowerAction $12 +Function170aa0: ld c, TRUE asm_170aa2: - ld a, $5 + ld a, BANK(s5_aa8d) call GetSRAMBank ld a, c - ld [$aa8d], a + ld [s5_aa8d], a call CloseSRAM ret -Function170aaf: ; BattleTowerAction $13 - ld a, $5 +Function170aaf: + ld a, BANK(s5_aa8d) call GetSRAMBank - ld a, [$aa8d] + ld a, [s5_aa8d] ld [wScriptVar], a call CloseSRAM ret -Function170abe: ; BattleTowerAction $14 +Function170abe: call BattleTower_CheckSaveFileExistsAndIsYours ld a, [wScriptVar] and a @@ -1501,24 +1503,24 @@ Function170abe: ; BattleTowerAction $14 ld a, BANK(sBattleTowerSaveFileFlags) call GetSRAMBank ld a, [sBattleTowerSaveFileFlags] - and $1 + and 1 ld [wScriptVar], a call CloseSRAM ret -Function170ad7: ; BattleTowerAction $15 +Function170ad7: ld a, BANK(sBattleTowerSaveFileFlags) call GetSRAMBank ld a, [sBattleTowerSaveFileFlags] - or $1 + or 1 ld [sBattleTowerSaveFileFlags], a call CloseSRAM ret -BattleTowerAction_LevelCheck: ; BattleTowerAction $18 - ld a, $5 +BattleTowerAction_LevelCheck: + ld a, BANK(s5_b2fb) call GetSRAMBank - ld a, [$b2fb] + ld a, [s5_b2fb] call CloseSRAM ld c, 10 call SimpleDivide @@ -1526,19 +1528,19 @@ BattleTowerAction_LevelCheck: ; BattleTowerAction $18 ld [wcd4f], a xor a ld [wScriptVar], a - farcall BattleTower_LevelCheck ; level check + farcall BattleTower_LevelCheck ret nc - ld a, $5 + ld a, BANK(s5_b2fb) call GetSRAMBank - ld a, [$b2fb] + ld a, [s5_b2fb] call CloseSRAM ld [wScriptVar], a ret -BattleTowerAction_UbersCheck: ; BattleTowerAction $19 - ld a, $5 +BattleTowerAction_UbersCheck: + ld a, BANK(s5_b2fb) call GetSRAMBank - ld a, [$b2fb] + ld a, [s5_b2fb] call CloseSRAM ld c, 10 call SimpleDivide @@ -1548,9 +1550,9 @@ BattleTowerAction_UbersCheck: ; BattleTowerAction $19 ld [wScriptVar], a farcall BattleTower_UbersCheck ret nc - ld a, $5 + ld a, BANK(s5_b2fb) call GetSRAMBank - ld a, [$b2fb] + ld a, [s5_b2fb] call CloseSRAM ld [wScriptVar], a ret @@ -1559,13 +1561,13 @@ LoadOpponentTrainerAndPokemonWithOTSprite: farcall Function_LoadOpponentTrainerAndPokemons ldh a, [rSVBK] push af - ld a, $3 + ld a, BANK(wBT_OTTrainerClass) ldh [rSVBK], a ld hl, wBT_OTTrainerClass ld a, [hl] dec a ld c, a - ld b, $0 + ld b, 0 pop af ldh [rSVBK], a ld hl, BTTrainerClassSprites @@ -1606,13 +1608,13 @@ DummySpecial_170bd2: CheckForBattleTowerRules: farcall _CheckForBattleTowerRules - jr c, .asm_170bde + jr c, .ready xor a ; FALSE - jr .asm_170be0 + jr .end -.asm_170bde +.ready ld a, TRUE -.asm_170be0 +.end ld [wScriptVar], a ret diff --git a/engine/events/battle_tower/rules.asm b/engine/events/battle_tower/rules.asm index 3584117d3..3162ef38e 100644 --- a/engine/events/battle_tower/rules.asm +++ b/engine/events/battle_tower/rules.asm @@ -17,8 +17,8 @@ CheckForMobileBattleRules: .TextPointers: dw .ExcuseMeText - dw JumpText_NeedAtLeastThreeMon - dw JumpText_EggDoesNotQualify + dw NeedAtLeastThreeMonText + dw EggDoesNotQualifyText .ExcuseMeText: ; Excuse me! @@ -50,10 +50,10 @@ _CheckForBattleTowerRules: .TextPointers: dw JumpText_ExcuseMeYoureNotReady - dw JumpText_OnlyThreeMonMayBeEntered - dw JumpText_TheMonMustAllBeDifferentKinds - dw JumpText_TheMonMustNotHoldTheSameItems - dw JumpText_YouCantTakeAnEgg + dw OnlyThreeMonMayBeEnteredText + dw TheMonMustAllBeDifferentKindsText + dw TheMonMustNotHoldTheSameItemsText + dw YouCantTakeAnEggText JumpText_ExcuseMeYoureNotReady: ; Excuse me. You're not ready. @@ -70,34 +70,34 @@ BattleTower_PleaseReturnWhenReady: text_far UnknownText_0x1c5962 text_end -JumpText_NeedAtLeastThreeMon: +NeedAtLeastThreeMonText: ; You need at least three #MON. - text_far UnknownText_0x1c5983 + text_far _NeedAtLeastThreeMonText text_end -JumpText_EggDoesNotQualify: +EggDoesNotQualifyText: ; Sorry, an EGG doesn't qualify. - text_far UnknownText_0x1c59a3 + text_far _EggDoesNotQualifyText text_end -JumpText_OnlyThreeMonMayBeEntered: +OnlyThreeMonMayBeEnteredText: ; Only three #MON may be entered. - text_far Text_OnlyThreeMonMayBeEntered + text_far _OnlyThreeMonMayBeEnteredText text_end -JumpText_TheMonMustAllBeDifferentKinds: +TheMonMustAllBeDifferentKindsText: ; The @ #MON must all be different kinds. - text_far Text_TheMonMustAllBeDifferentKinds + text_far _TheMonMustAllBeDifferentKindsText text_end -JumpText_TheMonMustNotHoldTheSameItems: +TheMonMustNotHoldTheSameItemsText: ; The @ #MON must not hold the same items. - text_far Text_TheMonMustNotHoldTheSameItems + text_far _TheMonMustNotHoldTheSameItemsText text_end -JumpText_YouCantTakeAnEgg: +YouCantTakeAnEggText: ; You can't take an EGG! - text_far Text_YouCantTakeAnEgg + text_far _YouCantTakeAnEggText text_end BattleTower_ExecuteJumptable: @@ -161,7 +161,7 @@ BattleTower_ExecuteJumptable: call z, .PrintFirstText pop bc call .PrintNthText - ld b, $1 + ld b, 1 pop de ret @@ -178,7 +178,7 @@ BattleTower_ExecuteJumptable: call .GetTextPointers inc hl inc hl - ld b, $0 + ld b, 0 add hl, bc add hl, bc call .LoadTextPointer @@ -194,7 +194,7 @@ BattleTower_CheckPartyLengthIs3: BattleTower_CheckPartyHasThreeMonsThatAreNotEggs: ld hl, wPartyCount ld a, [hli] - ld b, $0 + ld b, 0 ld c, a .loop ld a, [hli] diff --git a/engine/events/bug_contest/display_stats.asm b/engine/events/bug_contest/display_stats.asm index 0e9ba5fd0..6969bc893 100644 --- a/engine/events/bug_contest/display_stats.asm +++ b/engine/events/bug_contest/display_stats.asm @@ -12,12 +12,12 @@ DisplayCaughtContestMonStats: hlcoord 0, 0 ld b, 4 ld c, 13 - call TextBox + call Textbox hlcoord 0, 6 ld b, 4 ld c, 13 - call TextBox + call Textbox hlcoord 2, 0 ld de, .Stock diff --git a/engine/events/daycare.asm b/engine/events/daycare.asm index 4c2b14738..94b90d171 100644 --- a/engine/events/daycare.asm +++ b/engine/events/daycare.asm @@ -168,7 +168,7 @@ DayCareAskDepositPokemon: .DummyText: ; - text_far UnknownText_0x1bdaa7 + text_far _DaycareDummyText text_end DayCare_DepositPokemonText: @@ -297,102 +297,102 @@ PrintDayCareText: .DayCareManIntro: ; I'm the DAY-CARE MAN. Want me to raise a #MON? - text_far UnknownText_0x1bdaa9 + text_far _DayCareManIntroText text_end .DayCareManOddEgg: ; I'm the DAY-CARE MAN. Do you know about EGGS? I was raising #MON with my wife, you see. We were shocked to find an EGG! How incredible is that? So, want me to raise a #MON? - text_far UnknownText_0x1bdad8 + text_far _DayCareManOddEggText text_end .DayCareLadyIntro: ; I'm the DAY-CARE LADY. Should I raise a #MON for you? - text_far UnknownText_0x1bdb85 + text_far _DayCareLadyIntroText text_end .DayCareLadyOddEgg: ; I'm the DAY-CARE LADY. Do you know about EGGS? My husband and I were raising some #MON, you see. We were shocked to find an EGG! How incredible could that be? Should I raise a #MON for you? - text_far UnknownText_0x1bdbbb + text_far _DayCareLadyOddEggText text_end .WhichOne: ; What should I raise for you? - text_far UnknownText_0x1bdc79 + text_far _WhatShouldIRaiseText text_end .JustOneMon: ; Oh? But you have just one #MON. - text_far UnknownText_0x1bdc97 + text_far _OnlyOneMonText text_end .CantAcceptEgg: ; Sorry, but I can't accept an EGG. - text_far UnknownText_0x1bdcb8 + text_far _CantRaiseEggText text_end .RemoveMail: ; Remove MAIL before you come see me. - text_far UnknownText_0x1bdcda + text_far _RemoveMailText text_end .LastHealthyMon: ; If you give me that, what will you battle with? - text_far UnknownText_0x1bdcff + text_far _LastHealthyMonText text_end .OkayIllRaiseYourMon: ; OK. I'll raise your @ . - text_far UnknownText_0x1bdd30 + text_far _IllRaiseYourMonText text_end .ComeBackForItLater: ; Come back for it later. - text_far UnknownText_0x1bdd4b + text_far _ComeBackLaterText text_end .AreWeGeniusesOrWhat: ; Are we geniuses or what? Want to see your @ ? - text_far UnknownText_0x1bdd64 + text_far _AreWeGeniusesText text_end .AskRetrieveMon: ; Your @ has grown a lot. By level, it's grown by @ . If you want your #MON back, it will cost ¥@ . - text_far UnknownText_0x1bdd96 + text_far _YourMonHasGrownText text_end .PerfectHeresYourMon: ; Perfect! Here's your #MON. - text_far UnknownText_0x1bde04 + text_far _PerfectHeresYourMonText text_end .GotBackMon: ; got back @ . - text_far UnknownText_0x1bde1f + text_far _GotBackMonText text_end .ImmediatelyWithdrawMon: ; Huh? Back already? Your @ needs a little more time with us. If you want your #MON back, it will cost ¥100. - text_far UnknownText_0x1bde32 + text_far _BackAlreadyText text_end .PartyFull: ; You have no room for it. - text_far UnknownText_0x1bdea2 + text_far _HaveNoRoomText text_end .NotEnoughMoney: ; You don't have enough money. - text_far UnknownText_0x1bdebc + text_far _DCNotEnoughMoneyText text_end .OhFineThen: ; Oh, fine then. - text_far UnknownText_0x1bded9 + text_far _OhFineThenText text_end .ComeAgain: ; Come again. - text_far UnknownText_0x1bdee9 + text_far _ComeAgainText text_end DayCareManOutside: @@ -405,7 +405,7 @@ DayCareManOutside: .NotYet: ; Not yet… - text_far UnknownText_0x1bdef6 + text_far _NotYetText text_end .AskGiveEgg: @@ -447,27 +447,27 @@ DayCareManOutside: .IntroText: ; Ah, it's you! We were raising your #MON, and my goodness, were we surprised! Your #MON had an EGG! We don't know how it got there, but your #MON had it. You want it? - text_far UnknownText_0x1bdf00 + text_far _FoundAnEggText text_end .GotEggText: ; received the EGG! - text_far UnknownText_0x1bdfa5 + text_far _ReceivedEggText text_end .TakeGoodCareOfItText: ; Take good care of it. - text_far UnknownText_0x1bdfba + text_far _TakeGoodCareOfEggText text_end .IllKeepItThanksText: ; Well then, I'll keep it. Thanks! - text_far UnknownText_0x1bdfd1 + text_far _RefuseEggText text_end .PartyFullText: ; You have no room in your party. Come back later. - text_far UnknownText_0x1bdff2 + text_far _NoRoomForEggText text_end DayCare_GiveEgg: diff --git a/engine/events/elevator.asm b/engine/events/elevator.asm index 71b25bef7..37de3f1b6 100644 --- a/engine/events/elevator.asm +++ b/engine/events/elevator.asm @@ -150,7 +150,7 @@ Elevator_GetCurrentFloorText: hlcoord 0, 0 ld b, 4 ld c, 8 - call TextBox + call Textbox hlcoord 1, 2 ld de, Elevator_CurrentFloorText call PlaceString diff --git a/engine/events/halloffame.asm b/engine/events/halloffame.asm index 00b910166..a4350c2f7 100644 --- a/engine/events/halloffame.asm +++ b/engine/events/halloffame.asm @@ -456,10 +456,10 @@ DisplayHOFMon: call ByteFill hlcoord 0, 0 lb bc, 3, SCREEN_WIDTH - 2 - call TextBox + call Textbox hlcoord 0, 12 lb bc, 4, SCREEN_WIDTH - 2 - call TextBox + call Textbox ld a, [wTempMonSpecies] ld [wCurPartySpecies], a ld [wDeciramBuffer], a @@ -567,10 +567,10 @@ HOF_AnimatePlayerPic: ldh [hBGMapMode], a hlcoord 0, 2 lb bc, 8, 9 - call TextBox + call Textbox hlcoord 0, 12 lb bc, 4, 18 - call TextBox + call Textbox hlcoord 2, 4 ld de, wPlayerName call PlaceString diff --git a/engine/events/kurt.asm b/engine/events/kurt.asm index c1c490a0a..234e5f424 100644 --- a/engine/events/kurt.asm +++ b/engine/events/kurt.asm @@ -5,7 +5,7 @@ Kurt_PrintTextWhichApricorn: .Text: ; Which APRICORN should I use? - text_far UnknownText_0x1bc06b + text_far _WhichApricornText text_end Kurt_PrintTextHowMany: @@ -15,7 +15,7 @@ Kurt_PrintTextHowMany: .Text: ; How many should I make? - text_far UnknownText_0x1bc089 + text_far _HowManyShouldIMakeText text_end SelectApricornForKurt: diff --git a/engine/events/misc_scripts_2.asm b/engine/events/misc_scripts_2.asm index 6b675bea8..36e4172a7 100644 --- a/engine/events/misc_scripts_2.asm +++ b/engine/events/misc_scripts_2.asm @@ -7,7 +7,7 @@ RepelWoreOffScript:: .text ; REPEL's effect wore off. - text_far UnknownText_0x1bd308 + text_far _RepelWoreOffText text_end HiddenItemScript:: @@ -33,12 +33,12 @@ HiddenItemScript:: .found_text ; found @ ! - text_far UnknownText_0x1bd321 + text_far _PlayerFoundItemText text_end .no_room_text ; But has no space left… - text_far UnknownText_0x1bd331 + text_far _ButNoSpaceText text_end SetMemEvent: diff --git a/engine/events/mom.asm b/engine/events/mom.asm index 94d869dca..9a3c107e0 100644 --- a/engine/events/mom.asm +++ b/engine/events/mom.asm @@ -432,7 +432,7 @@ Mom_ContinueMenuSetup: ldh [hBGMapMode], a hlcoord 0, 0 lb bc, 6, 18 - call TextBox + call Textbox hlcoord 1, 2 ld de, Mom_SavedString call PlaceString @@ -592,82 +592,82 @@ Mom_WithdrawDepositMenuJoypad: UnknownText_0x16649: ; Wow, that's a cute #MON. Where did you get it? … So, you're leaving on an adventure… OK! I'll help too. But what can I do for you? I know! I'll save money for you. On a long journey, money's important. Do you want me to save your money? - text_far UnknownText_0x1bd77f + text_far _MomLeavingText1 text_end UnknownText_0x1664e: ; OK, I'll take care of your money. - text_far UnknownText_0x1bd868 + text_far _MomLeavingText2 text_end UnknownText_0x16653: ; Be careful. #MON are your friends. You need to work as a team. Now, go on! - text_far UnknownText_0x1bd88e + text_far _MomLeavingText3 text_end UnknownText_0x16658: ; Hi! Welcome home! You're trying very hard, I see. I've kept your room tidy. Or is this about your money? - text_far UnknownText_0x1bd8da + text_far _MomVisitingText1 text_end UnknownText_0x1665d: ; What do you want to do? - text_far UnknownText_0x1bd942 + text_far _MomVisitingText2 text_end UnknownText_0x16662: ; How much do you want to save? - text_far UnknownText_0x1bd95b + text_far _MomVisitingText3 text_end UnknownText_0x16667: ; How much do you want to take? - text_far UnknownText_0x1bd97a + text_far _MomVisitingText4 text_end UnknownText_0x1666c: ; Do you want to save some money? - text_far UnknownText_0x1bd999 + text_far _MomVisitingText5 text_end UnknownText_0x16671: ; You haven't saved that much. - text_far UnknownText_0x1bd9ba + text_far _MomVisitingText6 text_end UnknownText_0x16676: ; You can't take that much. - text_far UnknownText_0x1bd9d7 + text_far _MomVisitingText7 text_end UnknownText_0x1667b: ; You don't have that much. - text_far UnknownText_0x1bd9f1 + text_far _MomVisitingText8 text_end UnknownText_0x16680: ; You can't save that much. - text_far UnknownText_0x1bda0b + text_far _MomVisitingText9 text_end UnknownText_0x16685: ; OK, I'll save your money. Trust me! , stick with it! - text_far UnknownText_0x1bda25 + text_far _MomVisitingText10 text_end UnknownText_0x1668a: ; Your money's safe here! Get going! - text_far UnknownText_0x1bda5b + text_far _MomVisitingText11 text_end UnknownText_0x1668f: ; , don't give up! - text_far UnknownText_0x1bda7e + text_far _MomVisitingText12 text_end UnknownText_0x16694: ; Just do what you can. - text_far UnknownText_0x1bda90 + text_far _MomVisitingText13 text_end Mom_SavedString: diff --git a/engine/events/mom_phone.asm b/engine/events/mom_phone.asm index ef3f6457b..052082395 100644 --- a/engine/events/mom_phone.asm +++ b/engine/events/mom_phone.asm @@ -208,32 +208,32 @@ INCLUDE "data/items/mom_phone.asm" _MomText_HiHowAreYou: ; Hi, ! How are you? - text_far UnknownText_0x1bc615 + text_far _MomShoppingText1 text_end _MomText_FoundAnItem: ; I found a useful item shopping, so - text_far UnknownText_0x1bc62a + text_far _MomShoppingText2 text_end _MomText_BoughtWithYourMoney: ; I bought it with your money. Sorry! - text_far UnknownText_0x1bc64e + text_far _MomShoppingText3 text_end _MomText_ItsInPC: ; It's in your PC. You'll like it! - text_far UnknownText_0x1bc673 + text_far _MomShoppingText4 text_end _MomText_FoundADoll: ; While shopping today, I saw this adorable doll, so - text_far UnknownText_0x1bc693 + text_far _MomShoppingText5 text_end _MomText_ItsInRoom: ; It's in your room. You'll love it! - text_far UnknownText_0x1bc6c7 + text_far _MomShoppingText6 text_end db 0 ; unused diff --git a/engine/events/npc_trade.asm b/engine/events/npc_trade.asm index 95b191494..19ed72a4b 100644 --- a/engine/events/npc_trade.asm +++ b/engine/events/npc_trade.asm @@ -453,88 +453,88 @@ TradedForText: TradeIntroText1: ; I collect #MON. Do you have @ ? Want to trade it for my @ ? - text_far UnknownText_0x1bd449 + text_far _NPCTradeIntroText1 text_end TradeCancelText1: ; You don't want to trade? Aww… - text_far UnknownText_0x1bd48c + text_far _NPCTradeCancelText1 text_end TradeWrongText1: ; Huh? That's not @ . What a letdown… - text_far UnknownText_0x1bd4aa + text_far _NPCTradeWrongText1 text_end TradeCompleteText1: ; Yay! I got myself @ ! Thanks! - text_far UnknownText_0x1bd4d2 + text_far _NPCTradeCompleteText1 text_end TradeAfterText1: ; Hi, how's my old @ doing? - text_far UnknownText_0x1bd4f4 + text_far _NPCTradeAFterText1 text_end TradeIntroText2: TradeIntroText3: ; Hi, I'm looking for this #MON. If you have @ , would you trade it for my @ ? - text_far UnknownText_0x1bd512 + text_far _NPCTradeIntroText2 text_end TradeCancelText2: TradeCancelText3: ; You don't have one either? Gee, that's really disappointing… - text_far UnknownText_0x1bd565 + text_far _NPCTradeCancelText2 text_end TradeWrongText2: TradeWrongText3: ; You don't have @ ? That's too bad, then. - text_far UnknownText_0x1bd5a1 + text_far _NPCTradeWrongText2 text_end TradeCompleteText2: ; Great! Thank you! I finally got @ . - text_far UnknownText_0x1bd5cc + text_far _NPCTradeCompleteText2 text_end TradeAfterText2: ; Hi! The @ you traded me is doing great! - text_far UnknownText_0x1bd5f4 + text_far _NPCTradeAfterText2 text_end TradeIntroText4: ; 's cute, but I don't have it. Do you have @ ? Want to trade it for my @ ? - text_far UnknownText_0x1bd621 + text_far _NPCTradeIntroText3 text_end TradeCancelText4: ; You don't want to trade? Oh, darn… - text_far UnknownText_0x1bd673 + text_far _NPCTradeCancelText3 text_end TradeWrongText4: ; That's not @ . Please trade with me if you get one. - text_far UnknownText_0x1bd696 + text_far _NPCTradeWrongText3 text_end TradeCompleteText4: ; Wow! Thank you! I always wanted @ ! - text_far UnknownText_0x1bd6cd + text_far _NPCTradeCompleteText3 text_end TradeAfterText4: ; How is that @ I traded you doing? Your @ 's so cute! - text_far UnknownText_0x1bd6f5 + text_far _NPCTradeAfterText3 text_end TradeCompleteText3: ; Uh? What happened? - text_far UnknownText_0x1bd731 + text_far _NPCTradeCompleteText4 text_end TradeAfterText3: ; Trading is so odd… I still have a lot to learn about it. - text_far UnknownText_0x1bd745 + text_far _NPCTradeAfterText4 text_end diff --git a/engine/events/overworld.asm b/engine/events/overworld.asm index 788b0eb92..e74bdf0aa 100644 --- a/engine/events/overworld.asm +++ b/engine/events/overworld.asm @@ -53,7 +53,7 @@ CheckBadge: call CheckEngineFlag ret nc ld hl, .BadgeRequiredText - call MenuTextBoxBackup ; push text to queue + call MenuTextboxBackup ; push text to queue scf ret @@ -109,7 +109,7 @@ CheckPartyMove: FieldMoveFailed: ld hl, .CantUseHere - call MenuTextBoxBackup + call MenuTextboxBackup ret .CantUseHere: @@ -157,7 +157,7 @@ CutFunction: .FailCut: ld hl, Text_NothingToCut - call MenuTextBoxBackup + call MenuTextboxBackup ld a, $80 ret @@ -394,13 +394,13 @@ SurfFunction: .FailSurf: ld hl, CantSurfText - call MenuTextBoxBackup + call MenuTextboxBackup ld a, $80 ret .AlreadySurfing: ld hl, AlreadySurfingText - call MenuTextBoxBackup + call MenuTextboxBackup ld a, $80 ret @@ -830,7 +830,7 @@ dig_incave cp $2 jr nz, .failescaperope ld hl, .Text_CantUseHere - call MenuTextBox + call MenuTextbox call WaitPressAorB_BlinkCursor call CloseWindow @@ -933,7 +933,7 @@ TeleportFunction: .FailTeleport: ld hl, .Text_CantUseHere - call MenuTextBoxBackup + call MenuTextboxBackup ld a, $80 ret @@ -987,7 +987,7 @@ StrengthFunction: .Unreferenced_AlreadyUsing: ld hl, .JumpText - call MenuTextBoxBackup + call MenuTextboxBackup ld a, $80 ret diff --git a/engine/events/pokecenter_pc.asm b/engine/events/pokecenter_pc.asm index 767495592..b899f9323 100644 --- a/engine/events/pokecenter_pc.asm +++ b/engine/events/pokecenter_pc.asm @@ -298,7 +298,7 @@ PC_DisplayTextWaitMenu: push af set NO_TEXT_SCROLL, a ld [wOptions], a - call MenuTextBox + call MenuTextbox pop af ld [wOptions], a ret @@ -336,7 +336,7 @@ PlayerWithdrawItemMenu: .askquantity ld hl, .HowManyText - call MenuTextBox + call MenuTextbox farcall SelectQuantityToToss call ExitMenu call ExitMenu @@ -358,7 +358,7 @@ PlayerWithdrawItemMenu: call TossItem predef PartyMonItemName ld hl, .WithdrewText - call MenuTextBox + call MenuTextbox xor a ldh [hBGMapMode], a call ExitMenu @@ -366,7 +366,7 @@ PlayerWithdrawItemMenu: .PackFull: ld hl, .NoRoomText - call MenuTextBoxBackup + call MenuTextboxBackup ret .done @@ -438,7 +438,7 @@ PlayerDepositItemMenu: farcall HasNoItems ret nc ld hl, .NoItemsInBag - call MenuTextBoxBackup + call MenuTextboxBackup scf ret @@ -496,7 +496,7 @@ PlayerDepositItemMenu: .AskQuantity: ld hl, .HowManyText - call MenuTextBox + call MenuTextbox farcall SelectQuantityToToss push af call ExitMenu @@ -562,7 +562,7 @@ PCItemsJoypad: hlcoord 0, 0 ld b, 10 ld c, 18 - call TextBox + call Textbox ld a, [wPCItemsCursor] ld [wMenuCursorBuffer], a ld a, [wPCItemsScrollPosition] @@ -634,7 +634,7 @@ PCItemsJoypad: dba UpdateItemDescription PC_DisplayText: - call MenuTextBox + call MenuTextbox call ExitMenu ret diff --git a/engine/events/print_photo.asm b/engine/events/print_photo.asm index 83053851f..0194b0072 100644 --- a/engine/events/print_photo.asm +++ b/engine/events/print_photo.asm @@ -31,17 +31,17 @@ PhotoStudio: .Text_AskWhichMon: ; Which #MON should I photo- graph? - text_far UnknownText_0x1be024 + text_far _WhichMonPhotoText text_end .Text_HoldStill: ; All righty. Hold still for a bit. - text_far UnknownText_0x1be047 + text_far _HoldOnText text_end .Text_Presto: ; Presto! All done. Come again, OK? - text_far UnknownText_0x1be06a + text_far _PrestoAllDoneText text_end .Text_NoPicture: diff --git a/engine/events/print_unown.asm b/engine/events/print_unown.asm index 9319ecb3e..176a8725c 100644 --- a/engine/events/print_unown.asm +++ b/engine/events/print_unown.asm @@ -29,15 +29,15 @@ _UnownPrinter: hlcoord 0, 0 lb bc, 3, 18 - call TextBox + call Textbox hlcoord 0, 5 lb bc, 7, 7 - call TextBox + call Textbox hlcoord 0, 14 lb bc, 2, 18 - call TextBox + call Textbox hlcoord 1, 2 ld de, AlphRuinsStampString diff --git a/engine/events/prof_oaks_pc.asm b/engine/events/prof_oaks_pc.asm index 07c14ea01..7954963e6 100644 --- a/engine/events/prof_oaks_pc.asm +++ b/engine/events/prof_oaks_pc.asm @@ -1,6 +1,6 @@ ProfOaksPC: ld hl, OakPCText1 - call MenuTextBox + call MenuTextbox call YesNoBox jr c, .shutdown call ProfOaksPCBoot ; player chose "yes"? diff --git a/engine/events/specials.asm b/engine/events/specials.asm index 5293b1d7a..ef5286dff 100644 --- a/engine/events/specials.asm +++ b/engine/events/specials.asm @@ -169,7 +169,7 @@ GetMysteryGiftItem: .ReceiveItemText: ; received item - text_far UnknownText_0x1bd3be + text_far _ReceiveItemText text_end BugContestJudging: @@ -257,12 +257,12 @@ CheckCoinsAndCoinCase: .NoCoinsText: ; You have no coins. - text_far UnknownText_0x1bd3d7 + text_far _NoCoinsText text_end .NoCoinCaseText: ; You don't have a COIN CASE. - text_far UnknownText_0x1bd3eb + text_far _NoCoinCaseText text_end ClearBGPalettesBufferScreen: diff --git a/engine/games/card_flip.asm b/engine/games/card_flip.asm index 59c8b9ceb..17fd2d493 100644 --- a/engine/games/card_flip.asm +++ b/engine/games/card_flip.asm @@ -494,9 +494,9 @@ CardFlip_UpdateCoinBalanceDisplay: hlcoord 0, 12 ld b, 4 ld c, SCREEN_WIDTH - 2 - call TextBox + call Textbox pop hl - call PrintTextBoxText + call PrintTextboxText call CardFlip_PrintCoinBalance ret @@ -504,7 +504,7 @@ CardFlip_PrintCoinBalance: hlcoord 9, 15 ld b, 1 ld c, 9 - call TextBox + call Textbox hlcoord 10, 16 ld de, .CoinStr call PlaceString @@ -530,7 +530,7 @@ CardFlip_InitTilemap: call CardFlip_CopyToBox hlcoord 0, 12 lb bc, 4, 18 - call TextBox + call Textbox ret CardFlip_FillGreenBox: diff --git a/engine/games/slot_machine.asm b/engine/games/slot_machine.asm index 4a8ee9370..202aca20b 100644 --- a/engine/games/slot_machine.asm +++ b/engine/games/slot_machine.asm @@ -1789,7 +1789,7 @@ Slots_AskPlayAgain: .you_have_coins ld hl, .Text_PlayAgain call PrintText - call LoadMenuTextBox + call LoadMenuTextbox lb bc, 14, 12 call PlaceYesNoBox ld a, [wMenuCursorY] diff --git a/engine/gfx/load_font.asm b/engine/gfx/load_font.asm index 66ff8cb21..db24dced1 100644 --- a/engine/gfx/load_font.asm +++ b/engine/gfx/load_font.asm @@ -75,7 +75,7 @@ _LoadFontsBattleExtra:: jr LoadFrame LoadFrame: - ld a, [wTextBoxFrame] + ld a, [wTextboxFrame] maskbits NUM_FRAMES ld bc, 6 * LEN_1BPP_TILE ld hl, Frames @@ -86,8 +86,8 @@ LoadFrame: lb bc, BANK(Frames), 6 ; "┌" to "┘" call Get1bpp_2 ld hl, vTiles2 tile " " ; $7f - ld de, TextBoxSpaceGFX - lb bc, BANK(TextBoxSpaceGFX), 1 + ld de, TextboxSpaceGFX + lb bc, BANK(TextboxSpaceGFX), 1 call Get1bpp_2 ret diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm index fe5ec5663..35c20db70 100644 --- a/engine/items/item_effects.asm +++ b/engine/items/item_effects.asm @@ -1357,7 +1357,7 @@ RareCandyEffect: hlcoord 9, 0 ld b, 10 ld c, 9 - call TextBox + call Textbox hlcoord 11, 1 ld bc, 4 @@ -1632,7 +1632,7 @@ BitterBerryEffect: call UseItemText ld hl, ConfusedNoMoreText - call StdBattleTextBox + call StdBattleTextbox ld a, 0 @@ -2056,7 +2056,7 @@ Softboiled_MilkDrinkFunction: .cant_use push bc ld hl, .Text_CantBeUsed - call MenuTextBoxBackup + call MenuTextboxBackup pop bc jr .loop @@ -2266,7 +2266,7 @@ PokeFluteEffect: BlueCardEffect: ld hl, .bluecardtext - jp MenuTextBoxWaitButton + jp MenuTextboxWaitButton .bluecardtext text_far UnknownText_0x1c5c5e @@ -2274,7 +2274,7 @@ BlueCardEffect: CoinCaseEffect: ld hl, .coincasetext - jp MenuTextBoxWaitButton + jp MenuTextboxWaitButton .coincasetext text_far UnknownText_0x1c5c7b diff --git a/engine/items/mart.asm b/engine/items/mart.asm index ef06c4d11..6341e9e6e 100644 --- a/engine/items/mart.asm +++ b/engine/items/mart.asm @@ -35,10 +35,10 @@ HerbShop: call FarReadMart call LoadStandardMenuHeader ld hl, Text_HerbShop_Intro - call MartTextBox + call MartTextbox call BuyMenu ld hl, Text_HerbShop_ComeAgain - call MartTextBox + call MartTextbox ret BargainShop: @@ -48,7 +48,7 @@ BargainShop: call ReadMart call LoadStandardMenuHeader ld hl, Text_BargainShop_Intro - call MartTextBox + call MartTextbox call BuyMenu ld hl, wBargainShopFlags ld a, [hli] @@ -59,17 +59,17 @@ BargainShop: .skip_set ld hl, Text_BargainShop_ComeAgain - call MartTextBox + call MartTextbox ret Pharmacist: call FarReadMart call LoadStandardMenuHeader ld hl, Text_Pharmacist_Intro - call MartTextBox + call MartTextbox call BuyMenu ld hl, Text_Pharmacist_ComeAgain - call MartTextBox + call MartTextbox ret RooftopSale: @@ -86,10 +86,10 @@ RooftopSale: call ReadMart call LoadStandardMenuHeader ld hl, Text_Mart_HowMayIHelpYou - call MartTextBox + call MartTextbox call BuyMenu ld hl, Text_Mart_ComeAgain - call MartTextBox + call MartTextbox ret INCLUDE "data/items/rooftop_sale.asm" @@ -203,7 +203,7 @@ StandardMart: .Quit: call ExitMenu ld hl, Text_Mart_ComeAgain - call MartTextBox + call MartTextbox ld a, STANDARDMART_EXIT ret @@ -440,7 +440,7 @@ BuyMenuLoop: ld [wMenuScrollPositionBackup], a ld a, [wMenuCursorY] ld [wMenuCursorBufferBackup], a - call SpeechTextBox + call SpeechTextbox ld a, [wMenuJoypad] cp B_BUTTON jr z, .set_carry @@ -475,7 +475,7 @@ BuyMenuLoop: call JoyWaitAorB .cancel - call SpeechTextBox + call SpeechTextbox and a ret @@ -747,7 +747,7 @@ SellMenu: .Unreferenced_NothingToSell: ld hl, .NothingToSellText - call MenuTextBoxBackup + call MenuTextboxBackup and a ret @@ -796,7 +796,7 @@ SellMenu: lb bc, 3, 18 call ClearBox ld hl, Text_Mart_ICanPayThisMuch - call PrintTextBoxText + call PrintTextboxText call YesNoBox jr c, .declined ld de, wMoney @@ -810,7 +810,7 @@ SellMenu: lb bc, 3, 18 call ClearBox ld hl, Text_Mart_SoldForAmount - call PrintTextBoxText + call PrintTextboxText call PlayTransactionSound farcall PlaceMoneyBottomLeft call JoyWaitAorB @@ -890,8 +890,8 @@ PlayTransactionSound: call PlaySFX ret -MartTextBox: - call MenuTextBox +MartTextbox: + call MenuTextbox call JoyWaitAorB call ExitMenu ret diff --git a/engine/items/pack.asm b/engine/items/pack.asm index 97f04f604..268a013bc 100644 --- a/engine/items/pack.asm +++ b/engine/items/pack.asm @@ -484,7 +484,7 @@ TossMenu: jr c, .finish call Pack_GetItemName ld hl, Text_ConfirmThrowAway - call MenuTextBox + call MenuTextbox call YesNoBox push af call ExitMenu @@ -1358,7 +1358,7 @@ Pack_InitGFX: ; Place the textbox for displaying the item description hlcoord 0, SCREEN_HEIGHT - 4 - 2 lb bc, 4, SCREEN_WIDTH - 2 - call TextBox + call Textbox call EnableLCD call DrawPackGFX ret diff --git a/engine/items/tmhm.asm b/engine/items/tmhm.asm index 98222e4b6..d82b5829e 100644 --- a/engine/items/tmhm.asm +++ b/engine/items/tmhm.asm @@ -247,7 +247,7 @@ TMHM_ShowTMMoveDescription: hlcoord 0, 12 ld b, 4 ld c, SCREEN_WIDTH - 2 - call TextBox + call Textbox ld a, [wCurItem] cp NUM_TMS + NUM_HMS + 1 jr nc, TMHM_JoypadLoop diff --git a/engine/items/update_item_description.asm b/engine/items/update_item_description.asm index d4bc731a1..da56732a2 100644 --- a/engine/items/update_item_description.asm +++ b/engine/items/update_item_description.asm @@ -4,7 +4,7 @@ UpdateItemDescription: hlcoord 0, 12 ld b, 4 ld c, SCREEN_WIDTH - 2 - call TextBox + call Textbox ld a, [wMenuSelection] cp -1 ret z diff --git a/engine/link/place_waiting_text.asm b/engine/link/place_waiting_text.asm index 147683042..dc1fe215c 100644 --- a/engine/link/place_waiting_text.asm +++ b/engine/link/place_waiting_text.asm @@ -7,7 +7,7 @@ PlaceWaitingText:: and a jr z, .notinbattle - call TextBox + call Textbox jr .proceed .notinbattle diff --git a/engine/menus/main_menu.asm b/engine/menus/main_menu.asm index 1de34f40f..281000352 100644 --- a/engine/menus/main_menu.asm +++ b/engine/menus/main_menu.asm @@ -237,11 +237,11 @@ MainMenu_PrintCurrentTimeAndDay: hlcoord 0, 14 ld b, 2 ld c, 18 - call TextBox + call Textbox ret .TimeFail: - call SpeechTextBox + call SpeechTextbox ret .PlaceTime: diff --git a/engine/menus/menu_2.asm b/engine/menus/menu_2.asm index 94732d60b..0a398d259 100644 --- a/engine/menus/menu_2.asm +++ b/engine/menus/menu_2.asm @@ -30,19 +30,19 @@ PlaceMenuItemQuantity: PlaceMoneyTopRight: ld hl, MenuHeader_0x24b15 call CopyMenuHeader - jr PlaceMoneyTextBox + jr PlaceMoneyTextbox PlaceMoneyBottomLeft: ld hl, MenuHeader_0x24b1d call CopyMenuHeader - jr PlaceMoneyTextBox + jr PlaceMoneyTextbox PlaceMoneyAtTopLeftOfTextbox: ld hl, MenuHeader_0x24b15 lb de, 0, 11 call OffsetMenuHeader -PlaceMoneyTextBox: +PlaceMoneyTextbox: call MenuBox call MenuBoxCoord2Tile ld de, SCREEN_WIDTH + 1 @@ -69,7 +69,7 @@ DisplayCoinCaseBalance: hlcoord 11, 0 ld b, 1 ld c, 7 - call TextBox + call Textbox hlcoord 12, 0 ld de, CoinString call PlaceString @@ -86,7 +86,7 @@ DisplayMoneyAndCoinBalance: hlcoord 5, 0 ld b, 3 ld c, 13 - call TextBox + call Textbox hlcoord 6, 1 ld de, MoneyString call PlaceString @@ -119,7 +119,7 @@ Unreferenced_Function24b8f: hlcoord 0, 0 ld b, 3 ld c, 7 - call TextBox + call Textbox hlcoord 1, 1 ld de, wSafariTimeRemaining lb bc, 2, 3 @@ -147,7 +147,7 @@ StartMenu_DrawBugContestStatusBox: hlcoord 0, 0 ld b, 5 ld c, 17 - call TextBox + call Textbox ret StartMenu_PrintBugContestStatus: diff --git a/engine/menus/options_menu.asm b/engine/menus/options_menu.asm index d13868279..a776a05c1 100644 --- a/engine/menus/options_menu.asm +++ b/engine/menus/options_menu.asm @@ -7,7 +7,7 @@ _OptionsMenu: hlcoord 0, 0 ld b, 16 ld c, 18 - call TextBox + call Textbox hlcoord 2, 2 ld de, StringOptions call PlaceString @@ -448,7 +448,7 @@ Options_MenuAccount: .On: db "ON @" Options_Frame: - ld hl, wTextBoxFrame + ld hl, wTextboxFrame ldh a, [hJoyPressed] bit D_LEFT_F, a jr nz, .LeftPressed @@ -470,7 +470,7 @@ Options_Frame: maskbits NUM_FRAMES ld [hl], a UpdateFrame: - ld a, [wTextBoxFrame] + ld a, [wTextboxFrame] hlcoord 16, 15 ; where on the screen the number is drawn add "1" ld [hl], a diff --git a/engine/menus/save.asm b/engine/menus/save.asm index 34b38a25b..e7dcb026a 100644 --- a/engine/menus/save.asm +++ b/engine/menus/save.asm @@ -1,7 +1,7 @@ SaveMenu: call LoadStandardMenuHeader farcall DisplaySaveInfoOnSave - call SpeechTextBox + call SpeechTextbox call UpdateSprites farcall SaveMenu_CopyTilemapAtOnce ld hl, Text_WouldYouLikeToSaveTheGame @@ -39,7 +39,7 @@ SaveAfterLinkTrade: ChangeBoxSaveGame: push de ld hl, Text_SaveOnBoxSwitch - call MenuTextBox + call MenuTextbox call YesNoBox call ExitMenu jr c, .refused @@ -116,7 +116,7 @@ MoveMonWOMail_InsertMon_SaveGame: StartMoveMonWOMail_SaveGame: ld hl, Text_SaveOnMoveMonWOMail - call MenuTextBox + call MenuTextbox call YesNoBox call ExitMenu jr c, .refused @@ -198,7 +198,7 @@ AskOverwriteSaveFile: SaveTheGame_yesorno: ld b, BANK(Text_WouldYouLikeToSaveTheGame) call MapTextbox - call LoadMenuTextBox + call LoadMenuTextbox lb bc, 0, 7 call PlaceYesNoBox ld a, [wMenuCursorY] diff --git a/engine/menus/start_menu.asm b/engine/menus/start_menu.asm index 49144f0b6..ab7b98ea2 100644 --- a/engine/menus/start_menu.asm +++ b/engine/menus/start_menu.asm @@ -379,7 +379,7 @@ endr hlcoord 0, 13 ld b, 3 ld c, 8 - jp TextBoxPalette + jp TextboxPalette .IsMenuAccountOn: ld a, [wOptions2] diff --git a/engine/movie/init_hof_credits.asm b/engine/movie/init_hof_credits.asm index bd05039d9..0a02919ed 100644 --- a/engine/movie/init_hof_credits.asm +++ b/engine/movie/init_hof_credits.asm @@ -25,7 +25,7 @@ InitDisplayForHallOfFame: .SavingRecordDontTurnOff: ; SAVING RECORD… DON'T TURN OFF! - text_far UnknownText_0x1bd39e + text_far _SavingRecordText text_end InitDisplayForRedCredits: diff --git a/engine/movie/trade_animation.asm b/engine/movie/trade_animation.asm index 21eb1fec9..065ba9e18 100644 --- a/engine/movie/trade_animation.asm +++ b/engine/movie/trade_animation.asm @@ -931,7 +931,7 @@ TrademonStats_MonTemplate: hlcoord 3, 0 ld b, $6 ld c, $d - call TextBox + call Textbox hlcoord 4, 0 ld de, .OTMonData call PlaceString @@ -951,7 +951,7 @@ TrademonStats_Egg: hlcoord 3, 0 ld b, 6 ld c, 13 - call TextBox + call Textbox hlcoord 4, 2 ld de, .EggData call PlaceString @@ -1191,12 +1191,12 @@ TradeAnim_SentToOTText: .Text_WasSentTo: ; was sent to @ . - text_far UnknownText_0x1bc6e9 + text_far _TradingText1 text_end .Text_MonName: ; - text_far UnknownText_0x1bc701 + text_far _TradingText2 text_end TradeAnim_OTBidsFarewell: @@ -1211,12 +1211,12 @@ TradeAnim_OTBidsFarewell: .Text_BidsFarewellToMon: ; bids farewell to - text_far UnknownText_0x1bc703 + text_far _TradingText3 text_end .Text_MonName: ; . - text_far UnknownText_0x1bc719 + text_far _TradingText4 text_end TradeAnim_TakeCareOfText: @@ -1234,7 +1234,7 @@ TradeAnim_TakeCareOfText: .Text_TakeGoodCareOfMon: ; Take good care of @ . - text_far UnknownText_0x1bc71f + text_far _TradingText5 text_end TradeAnim_OTSendsText1: @@ -1251,12 +1251,12 @@ TradeAnim_OTSendsText1: .Text_ForYourMon: ; For @ 's @ , - text_far UnknownText_0x1bc739 + text_far _TradingText6 text_end .Text_OTSends: ; sends @ . - text_far UnknownText_0x1bc74c + text_far _TradingText7 text_end TradeAnim_OTSendsText2: @@ -1273,12 +1273,12 @@ TradeAnim_OTSendsText2: .Text_WillTrade: ; will trade @ @ - text_far UnknownText_0x1bc75e + text_far _TradingText8 text_end .Text_ForYourMon: ; for @ 's @ . - text_far UnknownText_0x1bc774 + text_far _TradingText9 text_end TradeAnim_Wait80Frames: diff --git a/engine/overworld/decorations.asm b/engine/overworld/decorations.asm index 74abf56ee..c601b65c3 100644 --- a/engine/overworld/decorations.asm +++ b/engine/overworld/decorations.asm @@ -379,12 +379,12 @@ PopulateDecoCategoryMenu: .empty ld hl, .Text_nothing_to_choose - call MenuTextBoxBackup + call MenuTextboxBackup ret .Text_nothing_to_choose: ; There's nothing to choose. - text_far UnknownText_0x1bc471 + text_far _NothingToChooseText text_end .NonscrollingMenuHeader: @@ -675,7 +675,7 @@ DecoAction_SetItUp: ld hl, wStringBuffer3 call GetDecorationName ld hl, DecoText_PutAwayAndSetUp - call MenuTextBoxBackup + call MenuTextboxBackup xor a ret @@ -684,13 +684,13 @@ DecoAction_SetItUp: ld hl, wStringBuffer3 call GetDecorationName ld hl, DecoText_SetUpTheDeco - call MenuTextBoxBackup + call MenuTextboxBackup xor a ret .alreadythere ld hl, DecoText_AlreadySetUp - call MenuTextBoxBackup + call MenuTextboxBackup scf ret @@ -711,13 +711,13 @@ DecoAction_TryPutItAway: ld hl, wStringBuffer3 call GetDecorationName ld hl, DecoText_PutAwayTheDeco - call MenuTextBoxBackup + call MenuTextboxBackup xor a ret .nothingthere ld hl, DecoText_NothingToPutAway - call MenuTextBoxBackup + call MenuTextboxBackup xor a ret @@ -772,7 +772,7 @@ DecoAction_SetItUp_Ornament: ld [wSelectedDecoration], a call .getwhichside ld hl, DecoText_PutAwayAndSetUp - call MenuTextBoxBackup + call MenuTextboxBackup xor a ret @@ -784,13 +784,13 @@ DecoAction_SetItUp_Ornament: ld hl, wStringBuffer3 call GetDecorationName ld hl, DecoText_SetUpTheDeco - call MenuTextBoxBackup + call MenuTextboxBackup xor a ret .failed ld hl, DecoText_AlreadySetUp - call MenuTextBoxBackup + call MenuTextboxBackup scf ret @@ -806,7 +806,7 @@ DecoAction_SetItUp_Ornament: UnknownText_0x26e41: ; Which side do you want to put it on? - text_far UnknownText_0x1bc48c + text_far _WhichSidePutOnText text_end DecoAction_PutItAway_Ornament: @@ -820,23 +820,23 @@ DecoAction_PutItAway_Ornament: xor a ld [wSelectedDecoration], a ld hl, DecoText_PutAwayTheDeco - call MenuTextBoxBackup + call MenuTextboxBackup xor a ret .nothingthere ld hl, DecoText_NothingToPutAway - call MenuTextBoxBackup + call MenuTextboxBackup xor a ret DecoText_WhichSide: ; Which side do you want to put away? - text_far UnknownText_0x1bc4b2 + text_far _WhichSidePutAwayText text_end DecoAction_AskWhichSide: - call MenuTextBox + call MenuTextbox ld hl, MenuHeader_0x26eab call GetMenu2 call ExitMenu @@ -885,27 +885,27 @@ MenuData_0x26eb3: DecoText_PutAwayTheDeco: ; Put away the @ . - text_far UnknownText_0x1bc4d7 + text_far _PutAwayTheDecoText text_end DecoText_NothingToPutAway: ; There's nothing to put away. - text_far UnknownText_0x1bc4ec + text_far _NothingToPutAwayText text_end DecoText_SetUpTheDeco: ; Set up the @ . - text_far UnknownText_0x1bc509 + text_far _SetUpTheDecoText text_end DecoText_PutAwayAndSetUp: ; Put away the @ and set up the @ . - text_far UnknownText_0x1bc51c + text_far _PutAwayAndSetUpText text_end DecoText_AlreadySetUp: ; That's already set up. - text_far UnknownText_0x1bc546 + text_far _AlreadySetUpText text_end GetDecorationName_c_de: @@ -1013,7 +1013,7 @@ DecorationDesc_TownMapPoster: .TownMapText: ; It's the TOWN MAP. - text_far UnknownText_0x1bc55d + text_far _LookTownMapText text_end DecorationDesc_PikachuPoster: @@ -1021,7 +1021,7 @@ DecorationDesc_PikachuPoster: .PikaPosterText: ; It's a poster of a cute PIKACHU. - text_far UnknownText_0x1bc570 + text_far _LookPikachuPosterText text_end DecorationDesc_ClefairyPoster: @@ -1029,7 +1029,7 @@ DecorationDesc_ClefairyPoster: .ClefairyPosterText: ; It's a poster of a cute CLEFAIRY. - text_far UnknownText_0x1bc591 + text_far _LookClefairyPosterText text_end DecorationDesc_JigglypuffPoster: @@ -1037,7 +1037,7 @@ DecorationDesc_JigglypuffPoster: .JigglypuffPosterText: ; It's a poster of a cute JIGGLYPUFF. - text_far UnknownText_0x1bc5b3 + text_far _LookJigglypuffPosterText text_end DecorationDesc_NullPoster: @@ -1068,7 +1068,7 @@ DecorationDesc_OrnamentOrConsole: .OrnamentConsoleText: ; It's an adorable @ . - text_far UnknownText_0x1bc5d7 + text_far _LookAdorableDecoText text_end DecorationDesc_GiantOrnament: @@ -1081,7 +1081,7 @@ DecorationDesc_GiantOrnament: .BigDollText: ; A giant doll! It's fluffy and cuddly. - text_far UnknownText_0x1bc5ef + text_far _LookGiantDecoText text_end ToggleMaptileDecorations: diff --git a/engine/overworld/scripting.asm b/engine/overworld/scripting.asm index c622dc9db..4f6c6568e 100644 --- a/engine/overworld/scripting.asm +++ b/engine/overworld/scripting.asm @@ -498,7 +498,7 @@ Script_battletowertext: ; script command 0xa4 ; parameters: bttext_id - call SetUpTextBox + call SetUpTextbox call GetScriptByte ld c, a farcall BattleTowerText diff --git a/engine/overworld/wildmons.asm b/engine/overworld/wildmons.asm index ad4a2a02d..a384915b6 100644 --- a/engine/overworld/wildmons.asm +++ b/engine/overworld/wildmons.asm @@ -834,7 +834,7 @@ RandomUnseenWildMon: .SawRareMonText: ; I just saw some rare @ in @ . I'll call you if I see another rare #MON, OK? - text_far UnknownText_0x1bd34b + text_far _JustSawSomeRareMonText text_end RandomPhoneWildMon: diff --git a/engine/phone/phone.asm b/engine/phone/phone.asm index 9582b5921..8a2b022dc 100644 --- a/engine/phone/phone.asm +++ b/engine/phone/phone.asm @@ -555,7 +555,7 @@ UnknownText_0x90336: text_end HangUp_BoopOff: - call SpeechTextBox + call SpeechTextbox ret Phone_StartRinging: @@ -593,7 +593,7 @@ Phone_CallerTextbox: hlcoord 0, 0 ld b, 2 ld c, SCREEN_WIDTH - 2 - call TextBox + call Textbox ret Function90380: diff --git a/engine/pokegear/pokegear.asm b/engine/pokegear/pokegear.asm index 8281dd468..13b561d4b 100644 --- a/engine/pokegear/pokegear.asm +++ b/engine/pokegear/pokegear.asm @@ -313,7 +313,7 @@ InitPokegearTilemap: call PlaceString hlcoord 0, 12 lb bc, 4, 18 - call TextBox + call Textbox call Pokegear_UpdateClock ret @@ -351,7 +351,7 @@ InitPokegearTilemap: call Pokegear_LoadTilemapRLE hlcoord 0, 12 lb bc, 4, 18 - call TextBox + call Textbox ret .Phone: @@ -359,7 +359,7 @@ InitPokegearTilemap: call Pokegear_LoadTilemapRLE hlcoord 0, 12 lb bc, 4, 18 - call TextBox + call Textbox call .PlacePhoneBars call PokegearPhone_UpdateDisplayList ret @@ -1138,7 +1138,7 @@ PokegearPhoneContactSubmenu: ld b, a ld c, 8 push de - call TextBox + call Textbox pop de pop hl inc hl @@ -1213,7 +1213,7 @@ PokegearPhoneContactSubmenu: .Delete: ld hl, PokegearText_DeleteStoredNumber - call MenuTextBox + call MenuTextbox call YesNoBox call ExitMenu jr c, .CancelDelete @@ -1758,7 +1758,7 @@ NoRadioName: call ClearBox hlcoord 0, 12 lb bc, 4, 18 - call TextBox + call Textbox ret OaksPKMNTalkName: db "OAK's <PK><MN> Talk@" @@ -1988,7 +1988,7 @@ PlayRadio: push de hlcoord 0, 12 lb bc, 4, 18 - call TextBox + call Textbox hlcoord 1, 14 ld [hl], "“" pop de diff --git a/engine/pokegear/radio.asm b/engine/pokegear/radio.asm index 64a566630..2e1dccf67 100644 --- a/engine/pokegear/radio.asm +++ b/engine/pokegear/radio.asm @@ -142,7 +142,7 @@ PrintRadioLine: call PlaceHLTextAtBC jr .skip .print - call PrintTextBoxText + call PrintTextboxText .skip ld a, RADIO_SCROLL ld [wCurRadioLine], a diff --git a/engine/pokemon/bills_pc.asm b/engine/pokemon/bills_pc.asm index 8127c8ff5..d7138646e 100644 --- a/engine/pokemon/bills_pc.asm +++ b/engine/pokemon/bills_pc.asm @@ -963,7 +963,7 @@ BillsPC_PlaceString: push de hlcoord 0, 15 lb bc, 1, 18 - call TextBox + call Textbox pop de hlcoord 1, 16 call PlaceString @@ -980,7 +980,7 @@ BillsPC_MoveMonWOMail_BoxNameAndArrows: BillsPC_BoxName: hlcoord 8, 0 lb bc, 1, 10 - call TextBox + call Textbox ld a, [wBillsPC_LoadedBox] and a @@ -1219,7 +1219,7 @@ BillsPC_LoadMonStats: BillsPC_RefreshTextboxes: hlcoord 8, 2 lb bc, 10, 10 - call TextBox + call Textbox hlcoord 8, 2 ld [hl], "└" @@ -1790,7 +1790,7 @@ DepositPokemon: call ClearBox hlcoord 0, 15 lb bc, 1, 18 - call TextBox + call Textbox call WaitBGMap hlcoord 1, 16 ld de, PCString_Stored @@ -1845,7 +1845,7 @@ TryWithdrawPokemon: call ClearBox hlcoord 0, 15 lb bc, 1, 18 - call TextBox + call Textbox call WaitBGMap hlcoord 1, 16 ld de, PCString_Got @@ -1881,7 +1881,7 @@ ReleasePKMN_ByePKMN: call ClearBox hlcoord 0, 15 lb bc, 1, 18 - call TextBox + call Textbox call WaitBGMap ld a, [wCurPartySpecies] @@ -1902,7 +1902,7 @@ ReleasePKMN_ByePKMN: call DelayFrames hlcoord 0, 15 lb bc, 1, 18 - call TextBox + call Textbox hlcoord 1, 16 ld de, PCString_Bye call PlaceString @@ -1925,7 +1925,7 @@ MovePKMNWitoutMail_InsertMon: push af hlcoord 0, 15 lb bc, 1, 18 - call TextBox + call Textbox hlcoord 1, 16 ld de, .Saving_LeaveOn call PlaceString @@ -2241,7 +2241,7 @@ _ChangeBox: ld [wMenuScrollPosition], a hlcoord 0, 4 lb bc, 8, 9 - call TextBox + call Textbox call ScrollingMenu ld a, [wMenuJoypad] cp B_BUTTON @@ -2306,7 +2306,7 @@ GetBoxName: BillsPC_PrintBoxCountAndCapacity: hlcoord 11, 7 lb bc, 5, 7 - call TextBox + call Textbox ld a, [wMenuSelection] cp -1 ret z @@ -2394,7 +2394,7 @@ BillsPC_PrintBoxName: hlcoord 0, 0 ld b, 2 ld c, 18 - call TextBox + call Textbox hlcoord 1, 2 ld de, .Current call PlaceString @@ -2522,7 +2522,7 @@ BillsPC_PlaceChangeBoxString: push de hlcoord 0, 14 lb bc, 2, 18 - call TextBox + call Textbox pop de hlcoord 1, 16 call PlaceString diff --git a/engine/pokemon/bills_pc_top.asm b/engine/pokemon/bills_pc_top.asm index a213bc79a..700c59d35 100644 --- a/engine/pokemon/bills_pc_top.asm +++ b/engine/pokemon/bills_pc_top.asm @@ -10,7 +10,7 @@ _BillsPC: and a ret nz ld hl, .Text_GottaHavePokemon - call MenuTextBoxBackup + call MenuTextboxBackup scf ret @@ -153,13 +153,13 @@ Unreferenced_Functione512: .no_mon ld hl, .Text_NoMon - call MenuTextBoxBackup + call MenuTextboxBackup scf ret .only_one_mon ld hl, .Text_ItsYourLastMon - call MenuTextBoxBackup + call MenuTextboxBackup scf ret @@ -220,7 +220,7 @@ Unreferenced_Functione56d: .asm_e576 ld hl, UnknownText_0xe57e - call MenuTextBoxBackup + call MenuTextboxBackup scf ret @@ -246,10 +246,10 @@ ClearPCItemScreen: call ByteFill hlcoord 0, 0 lb bc, 10, 18 - call TextBox + call Textbox hlcoord 0, 12 lb bc, 4, 18 - call TextBox + call Textbox call WaitBGMap2 call SetPalettes ; load regular palettes? ret diff --git a/engine/pokemon/evolve.asm b/engine/pokemon/evolve.asm index 9b6dd4cb5..0ee10eac8 100644 --- a/engine/pokemon/evolve.asm +++ b/engine/pokemon/evolve.asm @@ -241,7 +241,7 @@ EvolveAfterBattle_MasterLoop: push hl ld hl, Text_EvolvedIntoPKMN - call PrintTextBoxText + call PrintTextboxText farcall StubbedTrainerRankings_MonsEvolved ld de, MUSIC_NONE diff --git a/engine/pokemon/learn.asm b/engine/pokemon/learn.asm index 55e673ecc..d73dd7094 100644 --- a/engine/pokemon/learn.asm +++ b/engine/pokemon/learn.asm @@ -139,7 +139,7 @@ ForgetMove: hlcoord 5, 2 ld b, NUM_MOVES * 2 ld c, MOVE_NAME_LENGTH - call TextBox + call Textbox hlcoord 5 + 2, 2 + 2 ld a, SCREEN_WIDTH * 2 ld [wBuffer1], a diff --git a/engine/pokemon/mail.asm b/engine/pokemon/mail.asm index 91026d2a2..04c9a98e2 100644 --- a/engine/pokemon/mail.asm +++ b/engine/pokemon/mail.asm @@ -307,7 +307,7 @@ _PlayerMailBoxMenu: .nomail ld hl, .EmptyMailboxText - jp MenuTextBoxBackup + jp MenuTextboxBackup .EmptyMailboxText: text_far _EmptyMailboxText @@ -429,7 +429,7 @@ MailboxPC: .PutInPack: ld hl, .MessageLostText - call MenuTextBox + call MenuTextbox call YesNoBox call ExitMenu ret c @@ -442,7 +442,7 @@ MailboxPC: call ReceiveItem jr c, .put_in_bag ld hl, .PackFullText - jp MenuTextBoxBackup + jp MenuTextboxBackup .put_in_bag ld a, [wMenuSelection] @@ -450,7 +450,7 @@ MailboxPC: ld b, a call DeleteMailFromPC ld hl, .PutAwayText - jp MenuTextBoxBackup + jp MenuTextboxBackup .PutAwayText: text_far ClearedMailPutAwayText diff --git a/engine/pokemon/mon_menu.asm b/engine/pokemon/mon_menu.asm index 0d71412b6..19fecff19 100644 --- a/engine/pokemon/mon_menu.asm +++ b/engine/pokemon/mon_menu.asm @@ -30,7 +30,7 @@ TossItemFromPC: and a jr nz, .key_item ld hl, .TossHowMany - call MenuTextBox + call MenuTextbox farcall SelectQuantityToToss push af call CloseWindow @@ -38,7 +38,7 @@ TossItemFromPC: pop af jr c, .quit ld hl, .ConfirmToss - call MenuTextBox + call MenuTextbox call YesNoBox push af call ExitMenu @@ -49,7 +49,7 @@ TossItemFromPC: call TossItem call PartyMonItemName ld hl, .TossedThisMany - call MenuTextBox + call MenuTextbox call ExitMenu and a ret @@ -78,7 +78,7 @@ TossItemFromPC: .CantToss: ld hl, .TooImportantToToss - call MenuTextBoxBackup + call MenuTextboxBackup ret .TooImportantToToss: @@ -88,7 +88,7 @@ TossItemFromPC: CantUseItem: ld hl, CantUseItemText - call MenuTextBoxWaitButton + call MenuTextboxWaitButton ret CantUseItemText: @@ -265,14 +265,14 @@ GiveTakePartyMonItem: .next ld hl, CantBeHeldText - call MenuTextBoxBackup + call MenuTextboxBackup jr .loop .quit ret TryGiveItemToPartymon: - call SpeechTextBox + call SpeechTextbox call PartyMonItemName call GetPartyItemLocation ld a, [hl] @@ -290,13 +290,13 @@ TryGiveItemToPartymon: .give_item_to_mon call GiveItemToPokemon ld hl, MadeHoldText - call MenuTextBoxBackup + call MenuTextboxBackup call GivePartyItem ret .please_remove_mail ld hl, PleaseRemoveMailText - call MenuTextBoxBackup + call MenuTextboxBackup ret .already_holding_item @@ -317,7 +317,7 @@ TryGiveItemToPartymon: jr nc, .bag_full ld hl, TookAndMadeHoldText - call MenuTextBoxBackup + call MenuTextboxBackup ld a, [wNamedObjectIndexBuffer] ld [wCurItem], a call GivePartyItem @@ -328,7 +328,7 @@ TryGiveItemToPartymon: ld [wCurItem], a call ReceiveItemFromPokemon ld hl, ItemStorageIsFullText - call MenuTextBoxBackup + call MenuTextboxBackup .abort ret @@ -346,7 +346,7 @@ GivePartyItem: ret TakePartyItem: - call SpeechTextBox + call SpeechTextbox call GetPartyItemLocation ld a, [hl] and a @@ -363,17 +363,17 @@ TakePartyItem: ld [hl], NO_ITEM call GetItemName ld hl, TookFromText - call MenuTextBoxBackup + call MenuTextboxBackup jr .asm_12c9a .asm_12c8c ld hl, IsntHoldingAnythingText - call MenuTextBoxBackup + call MenuTextboxBackup jr .asm_12c9a .asm_12c94 ld hl, ItemStorageIsFullText - call MenuTextBoxBackup + call MenuTextboxBackup .asm_12c9a ret @@ -442,7 +442,7 @@ GiveItemToPokemon: jp TossItem StartMenuYesNo: - call MenuTextBox + call MenuTextbox call YesNoBox jp ExitMenu @@ -514,12 +514,12 @@ MonMailAction: farcall SendMailToPC jr c, .MailboxFull ld hl, .sentmailtopctext - call MenuTextBoxBackup + call MenuTextboxBackup jr .done .MailboxFull: ld hl, .mailboxfulltext - call MenuTextBoxBackup + call MenuTextboxBackup jr .done .RemoveMailToBag: @@ -535,12 +535,12 @@ MonMailAction: ld [hl], $0 call GetCurNick ld hl, .tookmailfrommontext - call MenuTextBoxBackup + call MenuTextboxBackup jr .done .BagIsFull: ld hl, .bagfulltext - call MenuTextBoxBackup + call MenuTextboxBackup jr .done .done @@ -1118,11 +1118,11 @@ SetUpMoveScreenBG: hlcoord 0, 1 ld b, 9 ld c, 18 - call TextBox + call Textbox hlcoord 0, 11 ld b, 5 ld c, 18 - call TextBox + call Textbox hlcoord 2, 0 lb bc, 2, 3 call ClearBox @@ -1169,7 +1169,7 @@ SetUpMoveList: hlcoord 0, 11 ld b, 5 ld c, 18 - jp TextBox + jp Textbox PrepareToPlaceMoveData: ld hl, wPartyMon1Moves diff --git a/engine/pokemon/party_menu.asm b/engine/pokemon/party_menu.asm index 617039db8..f8a6b0a5e 100644 --- a/engine/pokemon/party_menu.asm +++ b/engine/pokemon/party_menu.asm @@ -712,7 +712,7 @@ PartyMenuSelect: PrintPartyMenuText: hlcoord 0, 14 lb bc, 2, 18 - call TextBox + call Textbox ld a, [wPartyCount] and a jr nz, .haspokemon @@ -805,52 +805,52 @@ PrintPartyMenuActionText: .Text_RecoveredSomeHP: ; recovered @ HP! - text_far UnknownText_0x1bc0a2 + text_far _RecoveredSomeHPText text_end .Text_CuredOfPoison: ; 's cured of poison. - text_far UnknownText_0x1bc0bb + text_far _CuredOfPoisonText text_end .Text_RidOfParalysis: ; 's rid of paralysis. - text_far UnknownText_0x1bc0d2 + text_far _RidOfParalysisText text_end .Text_BurnWasHealed: ; 's burn was healed. - text_far UnknownText_0x1bc0ea + text_far _BurnWasHealedText text_end .Text_Defrosted: ; was defrosted. - text_far UnknownText_0x1bc101 + text_far _WasDefrostedText text_end .Text_WokeUp: ; woke up. - text_far UnknownText_0x1bc115 + text_far _WokeUpText text_end .Text_HealthReturned: ; 's health returned. - text_far UnknownText_0x1bc123 + text_far _HealthReturnedText text_end .Text_Revitalized: ; is revitalized. - text_far UnknownText_0x1bc13a + text_far _RevitalizedText text_end .Text_GrewToLevel: ; grew to level @ !@ @ - text_far UnknownText_0x1bc14f + text_far _GrewToLevelText text_end .Text_CameToItsSenses: ; came to its senses. - text_far UnknownText_0x1bc16e + text_far _CameToItsSensesText text_end .PrintText: diff --git a/engine/pokemon/stats_screen.asm b/engine/pokemon/stats_screen.asm index 84af2bf49..1d8d7da77 100644 --- a/engine/pokemon/stats_screen.asm +++ b/engine/pokemon/stats_screen.asm @@ -843,7 +843,7 @@ StatsScreen_PlaceFrontpic: ld a, [wCurPartySpecies] call IsAPokemon ret c - call StatsScreen_LoadTextBoxSpaceGFX + call StatsScreen_LoadTextboxSpaceGFX ld de, vTiles2 tile $00 predef GetAnimatedFrontpic hlcoord 0, 0 @@ -919,7 +919,7 @@ StatsScreen_GetAnimationParam: xor a ret -StatsScreen_LoadTextBoxSpaceGFX: +StatsScreen_LoadTextboxSpaceGFX: nop push hl push de @@ -930,8 +930,8 @@ StatsScreen_LoadTextBoxSpaceGFX: push af ld a, $1 ldh [rVBK], a - ld de, TextBoxSpaceGFX - lb bc, BANK(TextBoxSpaceGFX), 1 + ld de, TextboxSpaceGFX + lb bc, BANK(TextboxSpaceGFX), 1 ld hl, vTiles2 tile " " call Get2bpp pop af @@ -1042,7 +1042,7 @@ StatsScreen_AnimateEgg: push de ld a, $1 ld [wBoxAlignment], a - call StatsScreen_LoadTextBoxSpaceGFX + call StatsScreen_LoadTextboxSpaceGFX ld de, vTiles2 tile $00 predef GetAnimatedFrontpic pop de diff --git a/engine/printer/print_party.asm b/engine/printer/print_party.asm index caeb1eecd..16310d8f6 100644 --- a/engine/printer/print_party.asm +++ b/engine/printer/print_party.asm @@ -159,7 +159,7 @@ PrintPartyMonPage1: hlcoord 0, 7 ld b, 9 ld c, 18 - call TextBox + call Textbox hlcoord 8, 2 ld a, [wTempMonLevel] call PrintLevel_Force3Digits @@ -242,7 +242,7 @@ PrintPartyMonPage2: hlcoord 0, 0 ld b, 15 ld c, 18 - call TextBox + call Textbox ld bc, SCREEN_WIDTH decoord 0, 0 hlcoord 0, 1 diff --git a/engine/printer/printer.asm b/engine/printer/printer.asm index 27fff95b8..8c659c27e 100644 --- a/engine/printer/printer.asm +++ b/engine/printer/printer.asm @@ -554,7 +554,7 @@ PlacePrinterStatusString: ldh [hBGMapMode], a hlcoord 0, 5 lb bc, 10, 18 - call TextBox + call Textbox pop af ld e, a ld d, 0 diff --git a/engine/rtc/restart_clock.asm b/engine/rtc/restart_clock.asm index f3d8ebdae..16f25cddd 100644 --- a/engine/rtc/restart_clock.asm +++ b/engine/rtc/restart_clock.asm @@ -189,7 +189,7 @@ RestartClock: hlcoord 0, 5 ld b, 5 ld c, 18 - call TextBox + call Textbox decoord 1, 8 ld a, [wBuffer4] ld b, a diff --git a/engine/rtc/timeset.asm b/engine/rtc/timeset.asm index 3898249c7..146adc072 100644 --- a/engine/rtc/timeset.asm +++ b/engine/rtc/timeset.asm @@ -56,7 +56,7 @@ InitClock: hlcoord 3, 7 ld b, 2 ld c, 15 - call TextBox + call Textbox hlcoord 11, 7 ld [hl], $1 hlcoord 11, 10 @@ -86,7 +86,7 @@ InitClock: call PrintText hlcoord 11, 7 lb bc, 2, 7 - call TextBox + call Textbox hlcoord 15, 7 ld [hl], $1 hlcoord 15, 10 @@ -291,12 +291,12 @@ PrintTwoDigitNumberRightAlign: Text_WokeUpOak: ; Zzz… Hm? Wha…? You woke me up! Will you check the clock for me? - text_far UnknownText_0x1bc29c + text_far _OakTimeText1 text_end Text_WhatTimeIsIt: ; What time is it? - text_far UnknownText_0x1bc2eb + text_far _OakTimeText2 text_end String_oclock: @@ -304,7 +304,7 @@ String_oclock: Text_WhatHrs: ; What?@ @ - text_far UnknownText_0x1bc2fd + text_far _OakTimeText3 text_asm hlcoord 1, 16 call DisplayHourOClock @@ -313,12 +313,12 @@ Text_WhatHrs: .QuestionMark: ; ? - text_far UnknownText_0x1bc305 + text_far _OakTimeText4 text_end Text_HowManyMinutes: ; How many minutes? - text_far UnknownText_0x1bc308 + text_far _OakTimeText5 text_end String_min: @@ -326,7 +326,7 @@ String_min: Text_WhoaMins: ; Whoa!@ @ - text_far UnknownText_0x1bc31b + text_far _OakTimeText6 text_asm hlcoord 7, 14 call DisplayMinutesWithMinString @@ -335,7 +335,7 @@ Text_WhoaMins: .QuestionMark: ; ? - text_far UnknownText_0x1bc323 + text_far _OakTimeText7 text_end OakText_ResponseToSetTime: @@ -370,17 +370,17 @@ OakText_ResponseToSetTime: .overslept ; ! I overslept! - text_far UnknownText_0x1bc326 + text_far _OakTimeText8 text_end .yikes ; ! Yikes! I over- slept! - text_far UnknownText_0x1bc336 + text_far _OakTimeText11 text_end .sodark ; ! No wonder it's so dark! - text_far UnknownText_0x1bc34f + text_far _OakTimeText12 text_end TimeSetBackgroundGFX: @@ -408,14 +408,14 @@ SetDayOfWeek: .loop hlcoord 0, 12 lb bc, 4, 18 - call TextBox + call Textbox call LoadStandardMenuHeader ld hl, .WhatDayIsItText call PrintText hlcoord 9, 3 ld b, 2 ld c, 9 - call TextBox + call Textbox hlcoord 14, 3 ld [hl], TIMESET_UP_ARROW hlcoord 14, 6 @@ -534,7 +534,7 @@ SetDayOfWeek: .WhatDayIsItText: ; What day is it? - text_far UnknownText_0x1bc369 + text_far _OakTimeText13 text_end .ConfirmWeekdayText: @@ -546,7 +546,7 @@ SetDayOfWeek: .IsIt: ; , is it? - text_far UnknownText_0x1bc37a + text_far _OakTimeText14 text_end InitialSetDSTFlag: diff --git a/gfx/font.asm b/gfx/font.asm index 2361c2ae6..e83fc4d17 100644 --- a/gfx/font.asm +++ b/gfx/font.asm @@ -44,7 +44,7 @@ INCBIN "gfx/font/phone_icon.2bpp" UnusedBoldFontGFX: ; unused bold letters + unown chars INCBIN "gfx/font/unused_bold_font.1bpp" -TextBoxSpaceGFX: +TextboxSpaceGFX: INCBIN "gfx/frames/space.1bpp" FontsExtra_SolidBlackGFX: diff --git a/home/battle.asm b/home/battle.asm index 37c2e7b1c..7f2e8bfdd 100644 --- a/home/battle.asm +++ b/home/battle.asm @@ -155,18 +155,18 @@ MobileTextBorder:: ld [hl], $5f ; bottom ret -BattleTextBox:: +BattleTextbox:: ; Open a textbox and print text at hl. push hl - call SpeechTextBox + call SpeechTextbox call MobileTextBorder call UpdateSprites call ApplyTilemap pop hl - call PrintTextBoxText + call PrintTextboxText ret -StdBattleTextBox:: +StdBattleTextbox:: ; Open a textbox and print battle text at 20:hl. ldh a, [hROMBank] @@ -175,7 +175,7 @@ StdBattleTextBox:: ld a, BANK(BattleText) rst Bankswitch - call BattleTextBox + call BattleTextbox pop af rst Bankswitch diff --git a/home/map.asm b/home/map.asm index 391500eb2..b85599de8 100644 --- a/home/map.asm +++ b/home/map.asm @@ -1025,13 +1025,13 @@ MapTextbox:: rst Bankswitch push hl - call SpeechTextBox + call SpeechTextbox call SafeUpdateSprites ld a, 1 ldh [hOAMUpdate], a call ApplyTilemap pop hl - call PrintTextBoxText + call PrintTextboxText xor a ldh [hOAMUpdate], a @@ -1932,7 +1932,7 @@ ReturnToMapWithSpeechTextbox:: call ReloadTilesetAndPalettes hlcoord 0, 12 lb bc, 4, 18 - call TextBox + call Textbox ld hl, wVramState set 0, [hl] call UpdateSprites diff --git a/home/menu.asm b/home/menu.asm index 5060a915a..4debb11ad 100644 --- a/home/menu.asm +++ b/home/menu.asm @@ -17,16 +17,16 @@ StoreTo_wMenuCursorBuffer:: ld [wMenuCursorBuffer], a ret -MenuTextBox:: +MenuTextbox:: push hl - call LoadMenuTextBox + call LoadMenuTextbox pop hl jp PrintText ; unused ret -LoadMenuTextBox:: +LoadMenuTextbox:: ld hl, .MenuHeader call LoadMenuHeader ret @@ -37,8 +37,8 @@ LoadMenuTextBox:: dw vTiles0 db 0 ; default option -MenuTextBoxBackup:: - call MenuTextBox +MenuTextboxBackup:: + call MenuTextbox call CloseWindow ret @@ -498,8 +498,8 @@ PlayClickSFX:: pop de ret -MenuTextBoxWaitButton:: - call MenuTextBox +MenuTextboxWaitButton:: + call MenuTextbox call WaitButton call ExitMenu ret diff --git a/home/menu_window.asm b/home/menu_window.asm index 7c511097d..b72677702 100644 --- a/home/menu_window.asm +++ b/home/menu_window.asm @@ -144,7 +144,7 @@ MenuBox:: call GetMenuBoxDims dec b dec c - jp TextBox + jp Textbox GetMenuTextStartCoord:: ld a, [wMenuBorderTopCoord] diff --git a/home/mobile.asm b/home/mobile.asm index e87cdcab4..727518b84 100644 --- a/home/mobile.asm +++ b/home/mobile.asm @@ -159,7 +159,7 @@ Unreferenced_Function3efd:: ld c, 18 call .fill_attr pop hl - call PrintTextBoxText + call PrintTextboxText ret .fill_attr @@ -174,7 +174,7 @@ Unreferenced_Function3efd:: call Function3f35 pop bc pop hl - call TextBoxBorder + call TextboxBorder ret Function3f20:: diff --git a/home/print_text.asm b/home/print_text.asm index 98f50c7c1..b7f76ce64 100644 --- a/home/print_text.asm +++ b/home/print_text.asm @@ -6,15 +6,15 @@ PrintLetterDelay:: ; mid: 3 frames ; slow: 5 frames -; wTextBoxFlags[!0] and A or B override text speed with a one-frame delay. -; wOptions[4] and wTextBoxFlags[!1] disable the delay. +; wTextboxFlags[!0] and A or B override text speed with a one-frame delay. +; wOptions[4] and wTextboxFlags[!1] disable the delay. ld a, [wOptions] bit NO_TEXT_SCROLL, a ret nz ; non-scrolling text? - ld a, [wTextBoxFlags] + ld a, [wTextboxFlags] bit NO_TEXT_DELAY_F, a ret z @@ -31,7 +31,7 @@ PrintLetterDelay:: ld [hl], a ; force fast scroll? - ld a, [wTextBoxFlags] + ld a, [wTextboxFlags] bit FAST_TEXT_DELAY_F, a jr z, .fast diff --git a/home/scrolling_menu.asm b/home/scrolling_menu.asm index 076b43156..cde0e0212 100644 --- a/home/scrolling_menu.asm +++ b/home/scrolling_menu.asm @@ -38,7 +38,7 @@ InitScrollingMenu:: push de call Coord2Tile pop bc - jp TextBox + jp Textbox JoyTextDelay_ForcehJoyDown:: call DelayFrame diff --git a/home/text.asm b/home/text.asm index 6f6ac95de..af6f9a8f4 100644 --- a/home/text.asm +++ b/home/text.asm @@ -40,18 +40,18 @@ ClearScreen:: call ByteFill jr ClearTileMap -TextBox:: +Textbox:: ; Draw a text box at hl with room for b lines of c characters each. ; Places a border around the textbox, then switches the palette to the ; text black-and-white scheme. push bc push hl - call TextBoxBorder + call TextboxBorder pop hl pop bc - jr TextBoxPalette + jr TextboxPalette -TextBoxBorder:: +TextboxBorder:: ; Top push hl ld a, "┌" @@ -97,7 +97,7 @@ TextBoxBorder:: jr nz, .loop ret -TextBoxPalette:: +TextboxPalette:: ; Fill text box width c height b at hl with pal 7 ld de, wAttrMap - wTileMap add hl, de @@ -121,12 +121,12 @@ TextBoxPalette:: jr nz, .col ret -SpeechTextBox:: +SpeechTextbox:: ; Standard textbox. hlcoord TEXTBOX_X, TEXTBOX_Y ld b, TEXTBOX_INNERH ld c, TEXTBOX_INNERW - jp TextBox + jp Textbox TestText:: text "ゲームフりーク！" @@ -140,7 +140,7 @@ RadioTerminator:: text_end PrintText:: - call SetUpTextBox + call SetUpTextbox BuenaPrintText:: push hl hlcoord TEXTBOX_INNERX, TEXTBOX_INNERY @@ -148,14 +148,14 @@ BuenaPrintText:: call ClearBox pop hl -PrintTextBoxText:: +PrintTextboxText:: bccoord TEXTBOX_INNERX, TEXTBOX_INNERY call PlaceHLTextAtBC ret -SetUpTextBox:: +SetUpTextbox:: push hl - call SpeechTextBox + call SpeechTextbox call UpdateSprites call ApplyTilemap pop hl @@ -648,15 +648,15 @@ PokeFluteTerminatorCharacter:: text_end PlaceHLTextAtBC:: - ld a, [wTextBoxFlags] + ld a, [wTextboxFlags] push af set NO_TEXT_DELAY_F, a - ld [wTextBoxFlags], a + ld [wTextboxFlags], a call DoTextUntilTerminator pop af - ld [wTextBoxFlags], a + ld [wTextboxFlags], a ret DoTextUntilTerminator:: @@ -822,7 +822,7 @@ TextCommand_BOX:: push hl ld h, d ld l, e - call TextBox + call Textbox pop hl ret diff --git a/home/window.asm b/home/window.asm index 16564af47..be249e845 100644 --- a/home/window.asm +++ b/home/window.asm @@ -51,7 +51,7 @@ OpenText:: rst Bankswitch call ReanchorBGMap_NoOAMUpdate ; clear bgmap - call SpeechTextBox + call SpeechTextbox call _OpenAndCloseMenu_HDMATransferTileMapAndAttrMap ; anchor bgmap call LoadFonts_NoOAMUpdate ; load font pop af diff --git a/macros/scripts/battle_anims.asm b/macros/scripts/battle_anims.asm index 417e9ac28..adb48e4a4 100644 --- a/macros/scripts/battle_anims.asm +++ b/macros/scripts/battle_anims.asm @@ -209,8 +209,8 @@ ENDM anim_bgeffect: MACRO db anim_bgeffect_command db \1 ; effect - db \2 ; unknown - db \3 ; unknown + db \2 ; jumptable index + db \3 ; battle turn db \4 ; unknown ENDM diff --git a/maps/KurtsHouse.asm b/maps/KurtsHouse.asm index 4de412fe4..3fa4f295d 100644 --- a/maps/KurtsHouse.asm +++ b/maps/KurtsHouse.asm @@ -39,7 +39,7 @@ Kurt1: iftrue .GotLureBall checkevent EVENT_CLEARED_SLOWPOKE_WELL iftrue .ClearedSlowpokeWell - writetext UnknownText_0x18e473 + writetext KurtsHouseKurtMakingBallsMustWaitText waitbutton closetext special FadeOutMusic @@ -48,7 +48,7 @@ Kurt1: ifequal UP, .RunAround turnobject PLAYER, DOWN playsound SFX_FLY - applymovement KURTSHOUSE_KURT1, MovementData_0x18e466 + applymovement KURTSHOUSE_KURT1, KurtsHouseKurtExitHouseMovement playsound SFX_EXIT_BUILDING disappear KURTSHOUSE_KURT1 waitsfx @@ -58,7 +58,7 @@ Kurt1: .RunAround: turnobject PLAYER, DOWN playsound SFX_FLY - applymovement KURTSHOUSE_KURT1, MovementData_0x18e46c + applymovement KURTSHOUSE_KURT1, KurtsHouseKurtGoAroundPlayerThenExitHouseMovement playsound SFX_EXIT_BUILDING disappear KURTSHOUSE_KURT1 waitsfx @@ -66,7 +66,7 @@ Kurt1: end .ClearedSlowpokeWell: - writetext UnknownText_0x18e615 + writetext KurtsHouseKurtHonoredToMakeBallsText buttonsound verbosegiveitem LURE_BALL iffalse .NoRoomForBall @@ -95,7 +95,7 @@ Kurt1: iftrue .CheckApricorns checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_3 iftrue .CheckApricorns - writetext UnknownText_0x18e6c9 + writetext KurtsHouseKurtBallsFromApricornsText waitbutton .CheckApricorns: checkitem RED_APRICORN @@ -120,13 +120,13 @@ Kurt1: end .IMakeBallsFromApricorns: - writetext UnknownText_0x18e6c9 + writetext KurtsHouseKurtBallsFromApricornsText waitbutton closetext end .AskApricorn: - writetext UnknownText_0x18e736 + writetext KurtsHouseKurtAskYouHaveAnApricornText buttonsound setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_3 special SelectApricornForKurt @@ -169,13 +169,13 @@ Kurt1: setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 setflag ENGINE_KURT_MAKING_BALLS .WaitForApricorns: - writetext UnknownText_0x18e779 + writetext KurtsHouseKurtItWillTakeADayText waitbutton closetext end .Cancel: - writetext UnknownText_0x18e7bc + writetext KurtsHouseKurtThatsALetdownText waitbutton closetext end @@ -183,7 +183,7 @@ Kurt1: ._ThatTurnedOutGreat: setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 .ThatTurnedOutGreat: - writetext UnknownText_0x18e82a + writetext KurtsHouseKurtTurnedOutGreatText waitbutton .NoRoomForBall: closetext @@ -192,7 +192,7 @@ Kurt1: .GiveLevelBall: checkflag ENGINE_KURT_MAKING_BALLS iftrue KurtMakingBallsScript - writetext UnknownText_0x18e7fb + writetext KurtsHouseKurtJustFinishedYourBallText buttonsound verbosegiveitemvar LEVEL_BALL, VAR_KURT_APRICORNS iffalse .NoRoomForBall @@ -202,7 +202,7 @@ Kurt1: .GiveLureBall: checkflag ENGINE_KURT_MAKING_BALLS iftrue KurtMakingBallsScript - writetext UnknownText_0x18e7fb + writetext KurtsHouseKurtJustFinishedYourBallText buttonsound verbosegiveitemvar LURE_BALL, VAR_KURT_APRICORNS iffalse .NoRoomForBall @@ -212,7 +212,7 @@ Kurt1: .GiveMoonBall: checkflag ENGINE_KURT_MAKING_BALLS iftrue KurtMakingBallsScript - writetext UnknownText_0x18e7fb + writetext KurtsHouseKurtJustFinishedYourBallText buttonsound verbosegiveitemvar MOON_BALL, VAR_KURT_APRICORNS iffalse .NoRoomForBall @@ -222,7 +222,7 @@ Kurt1: .GiveFriendBall: checkflag ENGINE_KURT_MAKING_BALLS iftrue KurtMakingBallsScript - writetext UnknownText_0x18e7fb + writetext KurtsHouseKurtJustFinishedYourBallText buttonsound verbosegiveitemvar FRIEND_BALL, VAR_KURT_APRICORNS iffalse .NoRoomForBall @@ -232,7 +232,7 @@ Kurt1: .GiveFastBall: checkflag ENGINE_KURT_MAKING_BALLS iftrue KurtMakingBallsScript - writetext UnknownText_0x18e7fb + writetext KurtsHouseKurtJustFinishedYourBallText buttonsound verbosegiveitemvar FAST_BALL, VAR_KURT_APRICORNS iffalse .NoRoomForBall @@ -242,7 +242,7 @@ Kurt1: .GiveHeavyBall: checkflag ENGINE_KURT_MAKING_BALLS iftrue KurtMakingBallsScript - writetext UnknownText_0x18e7fb + writetext KurtsHouseKurtJustFinishedYourBallText buttonsound verbosegiveitemvar HEAVY_BALL, VAR_KURT_APRICORNS iffalse .NoRoomForBall @@ -252,7 +252,7 @@ Kurt1: .GiveLoveBall: checkflag ENGINE_KURT_MAKING_BALLS iftrue KurtMakingBallsScript - writetext UnknownText_0x18e7fb + writetext KurtsHouseKurtJustFinishedYourBallText buttonsound verbosegiveitemvar LOVE_BALL, VAR_KURT_APRICORNS iffalse .NoRoomForBall @@ -264,7 +264,7 @@ Kurt1: iftrue .GaveGSBallToKurt checkitem GS_BALL iffalse .NoGSBall - writetext UnknownText_0x18e8ab + writetext KurtsHouseKurtWhatIsThatText waitbutton closetext setevent EVENT_GAVE_GS_BALL_TO_KURT @@ -275,15 +275,15 @@ Kurt1: .GaveGSBallToKurt: checkflag ENGINE_KURT_MAKING_BALLS iffalse .NotMakingBalls - writetext UnknownText_0x18e934 + writetext KurtsHouseKurtImCheckingItNowText waitbutton - writetext UnknownText_0x18e949 + writetext KurtsHouseKurtAhHaISeeText waitbutton closetext end .NotMakingBalls: - writetext UnknownText_0x18e95c + writetext KurtsHouseKurtThisBallStartedToShakeText waitbutton closetext setevent EVENT_FOREST_IS_RESTLESS @@ -296,13 +296,13 @@ Kurt1: ifequal UP, .GSBallRunAround turnobject PLAYER, DOWN playsound SFX_FLY - applymovement KURTSHOUSE_KURT1, MovementData_0x18e466 + applymovement KURTSHOUSE_KURT1, KurtsHouseKurtExitHouseMovement sjump .KurtHasLeftTheBuilding .GSBallRunAround: turnobject PLAYER, DOWN playsound SFX_FLY - applymovement KURTSHOUSE_KURT1, MovementData_0x18e46c + applymovement KURTSHOUSE_KURT1, KurtsHouseKurtGoAroundPlayerThenExitHouseMovement .KurtHasLeftTheBuilding: playsound SFX_EXIT_BUILDING disappear KURTSHOUSE_KURT1 @@ -320,14 +320,14 @@ Kurt2: KurtMakingBallsScript: checkevent EVENT_BUGGING_KURT_TOO_MUCH iffalse Script_FirstTimeBuggingKurt - writetext UnknownText_0x18e7d8 + writetext KurtsHouseKurtDontBotherMeText waitbutton closetext turnobject KURTSHOUSE_KURT2, UP end Script_FirstTimeBuggingKurt: - writetext UnknownText_0x18e863 + writetext KurtsHouseKurtGranddaughterHelpingWorkFasterText waitbutton closetext turnobject KURTSHOUSE_KURT2, UP @@ -335,10 +335,10 @@ Script_FirstTimeBuggingKurt: end KurtScript_ImCheckingItNow: - writetext UnknownText_0x18e934 + writetext KurtsHouseKurtImCheckingItNowText waitbutton turnobject KURTSHOUSE_KURT2, UP - writetext UnknownText_0x18e949 + writetext KurtsHouseKurtAhHaISeeText waitbutton closetext end @@ -431,7 +431,7 @@ KurtsHouseBookshelf: KurtsHouseRadio: jumpstd radio2 -MovementData_0x18e466: +KurtsHouseKurtExitHouseMovement: big_step DOWN big_step DOWN big_step DOWN @@ -439,7 +439,7 @@ MovementData_0x18e466: big_step DOWN step_end -MovementData_0x18e46c: +KurtsHouseKurtGoAroundPlayerThenExitHouseMovement: big_step RIGHT big_step DOWN big_step DOWN @@ -448,7 +448,7 @@ MovementData_0x18e46c: big_step DOWN step_end -UnknownText_0x18e473: +KurtsHouseKurtMakingBallsMustWaitText: text "Hm? Who are you?" para "<PLAYER>, eh? You" @@ -489,7 +489,7 @@ UnknownText_0x18e473: cont "way!" done -UnknownText_0x18e615: +KurtsHouseKurtHonoredToMakeBallsText: text "KURT: Hi, <PLAYER>!" para "You handled your-" @@ -508,7 +508,7 @@ UnknownText_0x18e615: line "now, but take it." done -UnknownText_0x18e6c9: +KurtsHouseKurtBallsFromApricornsText: text "KURT: I make BALLS" line "from APRICORNS." @@ -520,7 +520,7 @@ UnknownText_0x18e6c9: line "out of them." done -UnknownText_0x18e736: +KurtsHouseKurtAskYouHaveAnApricornText: text "KURT: You have an" line "APRICORN for me?" @@ -528,7 +528,7 @@ UnknownText_0x18e736: line "into a BALL." done -UnknownText_0x18e779: +KurtsHouseKurtItWillTakeADayText: text "KURT: It'll take a" line "day to make you a" @@ -536,23 +536,23 @@ UnknownText_0x18e779: line "for it later." done -UnknownText_0x18e7bc: +KurtsHouseKurtThatsALetdownText: text "KURT: Oh…" line "That's a letdown." done -UnknownText_0x18e7d8: +KurtsHouseKurtDontBotherMeText: text "KURT: I'm working!" line "Don't bother me!" done -UnknownText_0x18e7fb: +KurtsHouseKurtJustFinishedYourBallText: text "KURT: Ah, <PLAYER>!" line "I just finished" cont "your BALL. Here!" done -UnknownText_0x18e82a: +KurtsHouseKurtTurnedOutGreatText: text "KURT: That turned" line "out great." @@ -560,7 +560,7 @@ UnknownText_0x18e82a: line "#MON with it." done -UnknownText_0x18e863: +KurtsHouseKurtGranddaughterHelpingWorkFasterText: text "KURT: Now that my" line "granddaughter is" @@ -568,7 +568,7 @@ UnknownText_0x18e863: line "work much faster." done -UnknownText_0x18e8ab: +KurtsHouseKurtWhatIsThatText: text "Wh-what is that?" para "I've never seen" @@ -584,17 +584,17 @@ UnknownText_0x18e8ab: line "for you." done -UnknownText_0x18e934: +KurtsHouseKurtImCheckingItNowText: text "I'm checking it" line "now." done -UnknownText_0x18e949: +KurtsHouseKurtAhHaISeeText: text "Ah-ha! I see!" line "So…" done -UnknownText_0x18e95c: +KurtsHouseKurtThisBallStartedToShakeText: text "<PLAYER>!" para "This BALL started" diff --git a/maps/RadioTower1F.asm b/maps/RadioTower1F.asm index c85f216b8..ea2f81df4 100644 --- a/maps/RadioTower1F.asm +++ b/maps/RadioTower1F.asm @@ -3,8 +3,8 @@ const RADIOTOWER1F_LASS const RADIOTOWER1F_YOUNGSTER const RADIOTOWER1F_ROCKET - const RADIOTOWER1F_GENTLEMAN - const RADIOTOWER1F_COOLTRAINER_F + const RADIOTOWER1F_LUCKYNUMBERMAN + const RADIOTOWER1F_CARD_WOMAN RadioTower1F_MapScripts: db 0 ; scene scripts @@ -16,13 +16,13 @@ RadioTower1FReceptionistScript: opentext checkflag ENGINE_ROCKETS_IN_RADIO_TOWER iftrue .Rockets - writetext UnknownText_0x5ce77 + writetext RadioTower1FReceptionistWelcomeText waitbutton closetext end .Rockets: - writetext UnknownText_0x5ce81 + writetext RadioTower1FReceptionistNoToursText waitbutton closetext end @@ -30,7 +30,7 @@ RadioTower1FReceptionistScript: RadioTower1FLuckyNumberManScript: faceplayer opentext - writetext UnknownText_0x5ceba + writetext RadioTower1FLuckyNumberManAskToPlayText buttonsound special CheckLuckyNumberShowFlag iffalse .skip @@ -39,21 +39,21 @@ RadioTower1FLuckyNumberManScript: special PrintTodaysLuckyNumber checkflag ENGINE_LUCKY_NUMBER_SHOW iftrue .GameOver - writetext UnknownText_0x5cf3a + writetext RadioTower1FLuckyNumberManThisWeeksIdIsText buttonsound closetext - applymovement RADIOTOWER1F_GENTLEMAN, MovementData_0x5ce71 + applymovement RADIOTOWER1F_LUCKYNUMBERMAN, RadioTower1FLuckyNumberManGoToPCMovement opentext - writetext UnknownText_0x5cf5a + writetext RadioTower1FLuckyNumberManCheckIfMatchText buttonsound waitsfx - writetext UnknownText_0x5cf79 + writetext RadioTower1FLuckyNumberManDotDotDotText playsound SFX_DEX_FANFARE_20_49 waitsfx buttonsound special CheckForLuckyNumberWinners closetext - applymovement RADIOTOWER1F_GENTLEMAN, MovementData_0x5ce74 + applymovement RADIOTOWER1F_LUCKYNUMBERMAN, RadioTower1FLuckyNumberManReturnToPlayerMovement opentext ifequal 1, .FirstPlace ifequal 2, .SecondPlace @@ -61,13 +61,13 @@ RadioTower1FLuckyNumberManScript: sjump .NoPrize .GameOver: - writetext UnknownText_0x5cf7e + writetext RadioTower1FLuckyNumberManComeAgainText waitbutton closetext end .FirstPlace: - writetext UnknownText_0x5cfb5 + writetext RadioTower1FLuckyNumberManPerfectMatchText playsound SFX_1ST_PLACE waitsfx buttonsound @@ -78,7 +78,7 @@ RadioTower1FLuckyNumberManScript: sjump .GameOver .SecondPlace: - writetext UnknownText_0x5d023 + writetext RadioTower1FLuckyNumberManOkayMatchText playsound SFX_2ND_PLACE waitsfx buttonsound @@ -89,7 +89,7 @@ RadioTower1FLuckyNumberManScript: sjump .GameOver .ThirdPlace: - writetext UnknownText_0x5d076 + writetext RadioTower1FLuckyNumberManWeakMatchText playsound SFX_3RD_PLACE waitsfx buttonsound @@ -100,13 +100,13 @@ RadioTower1FLuckyNumberManScript: sjump .GameOver .NoPrize: - writetext UnknownText_0x5d0c0 + writetext RadioTower1FLuckyNumberManNoneOfYourIDNumbersMatchText waitbutton closetext end .BagFull: - writetext UnknownText_0x5d0e6 + writetext RadioTower1FLuckyNumberManNoRoomForYourPrizeText waitbutton closetext end @@ -116,43 +116,43 @@ RadioTower1FRadioCardWomanScript: opentext checkflag ENGINE_RADIO_CARD iftrue .GotCard - writetext UnknownText_0x5d12d + writetext RadioTower1FRadioCardWomanOfferQuizText yesorno iffalse .NoQuiz - writetext UnknownText_0x5d1f2 + writetext RadioTower1FRadioCardWomanQuestion1Text yesorno iffalse .WrongAnswer playsound SFX_ELEVATOR_END waitsfx - writetext UnknownText_0x5d231 + writetext RadioTower1FRadioCardWomanQuestion2Text yesorno iffalse .WrongAnswer playsound SFX_ELEVATOR_END waitsfx - writetext UnknownText_0x5d282 + writetext RadioTower1FRadioCardWomanQuestion3Text yesorno iftrue .WrongAnswer playsound SFX_ELEVATOR_END waitsfx - writetext UnknownText_0x5d2bc + writetext RadioTower1FRadioCardWomanQuestion4Text yesorno iffalse .WrongAnswer playsound SFX_ELEVATOR_END waitsfx - writetext UnknownText_0x5d30e + writetext RadioTower1FRadioCardWomanQuestion5Text yesorno iftrue .WrongAnswer playsound SFX_ELEVATOR_END waitsfx - writetext UnknownText_0x5d37b + writetext RadioTower1FRadioCardWomanYouWinText buttonsound getstring STRING_BUFFER_4, .RadioCardText scall .ReceiveItem - writetext UnknownText_0x5d3c0 + writetext RadioTower1FPokegearIsARadioText buttonsound setflag ENGINE_RADIO_CARD .GotCard: - writetext UnknownText_0x5d3e5 + writetext RadioTower1FRadioCardWomanTuneInText waitbutton closetext end @@ -166,13 +166,13 @@ RadioTower1FRadioCardWomanScript: .WrongAnswer: playsound SFX_WRONG - writetext UnknownText_0x5d409 + writetext RadioTower1FRadioCardWomanWrongAnswerText waitbutton closetext end .NoQuiz: - writetext UnknownText_0x5d443 + writetext RadioTower1FRadioCardWomanNotTakingQuizText waitbutton closetext end @@ -200,28 +200,28 @@ RadioTower1FDirectory: RadioTower1FLuckyChannelSign: jumptext RadioTower1FLuckyChannelSignText -MovementData_0x5ce71: +RadioTower1FLuckyNumberManGoToPCMovement: step RIGHT turn_head UP step_end -MovementData_0x5ce74: +RadioTower1FLuckyNumberManReturnToPlayerMovement: step LEFT turn_head UP step_end -UnknownText_0x5ce77: +RadioTower1FReceptionistWelcomeText: text "Welcome!" done -UnknownText_0x5ce81: +RadioTower1FReceptionistNoToursText: text "Hello. I'm sorry," line "but we're not" cont "offering any tours" cont "today." done -UnknownText_0x5ceba: +RadioTower1FLuckyNumberManAskToPlayText: text "Hi, are you here" line "for the LUCKY NUM-" cont "BER SHOW?" @@ -234,30 +234,30 @@ UnknownText_0x5ceba: line "you win a prize." done -UnknownText_0x5cf3a: +RadioTower1FLuckyNumberManThisWeeksIdIsText: text "This week's ID" line "number is @" text_ram wStringBuffer3 text "." done -UnknownText_0x5cf5a: +RadioTower1FLuckyNumberManCheckIfMatchText: text "Let's see if you" line "have a match." done -UnknownText_0x5cf79: +RadioTower1FLuckyNumberManDotDotDotText: text "<……>" line "<……>" done -UnknownText_0x5cf7e: +RadioTower1FLuckyNumberManComeAgainText: text "Please come back" line "next week for the" cont "next LUCKY NUMBER." done -UnknownText_0x5cfb5: +RadioTower1FLuckyNumberManPerfectMatchText: text "Wow! You have a" line "perfect match of" cont "all five numbers!" @@ -269,7 +269,7 @@ UnknownText_0x5cfb5: line "MASTER BALL!" done -UnknownText_0x5d023: +RadioTower1FLuckyNumberManOkayMatchText: text "Hey! You've" line "matched the last" cont "three numbers!" @@ -279,7 +279,7 @@ UnknownText_0x5d023: cont "SHARE!" done -UnknownText_0x5d076: +RadioTower1FLuckyNumberManWeakMatchText: text "Ooh, you've" line "matched the last" cont "two numbers." @@ -288,12 +288,12 @@ UnknownText_0x5d076: line "prize, a PP UP." done -UnknownText_0x5d0c0: +RadioTower1FLuckyNumberManNoneOfYourIDNumbersMatchText: text "Nope, none of your" line "ID numbers match." done -UnknownText_0x5d0e6: +RadioTower1FLuckyNumberManNoRoomForYourPrizeText: text "You've got no room" line "for your prize." @@ -301,7 +301,7 @@ UnknownText_0x5d0e6: line "back right away." done -UnknownText_0x5d12d: +RadioTower1FRadioCardWomanOfferQuizText: text "We have a special" line "quiz campaign on" cont "right now." @@ -320,7 +320,7 @@ UnknownText_0x5d12d: line "take the quiz?" done -UnknownText_0x5d1f2: +RadioTower1FRadioCardWomanQuestion1Text: text "Question 1:" para "Is there a #MON" @@ -328,7 +328,7 @@ UnknownText_0x5d1f2: cont "in the morning?" done -UnknownText_0x5d231: +RadioTower1FRadioCardWomanQuestion2Text: text "Correct!" line "Question 2:" @@ -339,7 +339,7 @@ UnknownText_0x5d231: line "BERRY at a MART." done -UnknownText_0x5d282: +RadioTower1FRadioCardWomanQuestion3Text: text "Bull's-eye!" line "Question 3:" @@ -347,7 +347,7 @@ UnknownText_0x5d282: line "the move FLASH?" done -UnknownText_0x5d2bc: +RadioTower1FRadioCardWomanQuestion4Text: text "So far so good!" line "Question 4:" @@ -358,7 +358,7 @@ UnknownText_0x5d2bc: line "#MON?" done -UnknownText_0x5d30e: +RadioTower1FRadioCardWomanQuestion5Text: text "Wow! Right again!" line "Here's the final" cont "question:" @@ -370,7 +370,7 @@ UnknownText_0x5d30e: line "on their reels?" done -UnknownText_0x5d37b: +RadioTower1FRadioCardWomanYouWinText: text "Bingo! You got it!" line "Congratulations!" @@ -378,18 +378,18 @@ UnknownText_0x5d37b: line "a RADIO CARD!" done -UnknownText_0x5d3c0: +RadioTower1FPokegearIsARadioText: text "<PLAYER>'s #GEAR" line "can now double as" cont "a radio!" done -UnknownText_0x5d3e5: +RadioTower1FRadioCardWomanTuneInText: text "Please tune in to" line "our radio shows." done -UnknownText_0x5d409: +RadioTower1FRadioCardWomanWrongAnswerText: text "Oh, dear." line "Sorry, but you" @@ -397,7 +397,7 @@ UnknownText_0x5d409: line "Please try again!" done -UnknownText_0x5d443: +RadioTower1FRadioCardWomanNotTakingQuizText: text "Oh. I see. Please" line "see me if you" cont "change your mind." diff --git a/maps/RadioTower2F.asm b/maps/RadioTower2F.asm index 218f4b716..629dd9a59 100644 --- a/maps/RadioTower2F.asm +++ b/maps/RadioTower2F.asm @@ -115,20 +115,20 @@ Buena: readvar VAR_BLUECARDBALANCE ifequal 30, .BlueCardCapped0 playmusic MUSIC_BUENAS_PASSWORD - writetext UnknownText_0x5de35 + writetext RadioTower2FBuenaDoYouKnowPasswordText special AskRememberPassword iffalse .ForgotPassword - writetext UnknownText_0x5de84 + writetext RadioTower2FBuenaJoinTheShowText waitbutton closetext turnobject RADIOTOWER2F_BUENA, RIGHT readvar VAR_FACING ifnotequal RIGHT, .DontNeedToMove - applymovement PLAYER, MovementData_0x5d921 + applymovement PLAYER, RadioTower2FPlayerWalksToMicrophoneMovement .DontNeedToMove: turnobject PLAYER, RIGHT opentext - writetext UnknownText_0x5dedd + writetext RadioTower2FBuenaEveryoneSayPasswordText waitbutton closetext turnobject RADIOTOWER2F_BUENA, DOWN @@ -137,7 +137,7 @@ Buena: closetext iffalse .WrongAnswer opentext - writetext UnknownText_0x5dfc1 + writetext RadioTower2FBuenaCorrectAnswerText waitbutton closetext readvar VAR_BLUECARDBALANCE @@ -149,7 +149,7 @@ Buena: pause 20 turnobject RADIOTOWER2F_BUENA, RIGHT opentext - writetext UnknownText_0x5e054 + writetext RadioTower2FBuenaThanksForComingText waitbutton closetext special FadeOutMusic @@ -160,12 +160,12 @@ Buena: end .Introduction: - writetext UnknownText_0x5dcf4 + writetext RadioTower2FBuenaShowIntroductionText buttonsound setevent EVENT_MET_BUENA verbosegiveitem BLUE_CARD .TuneIn: - writetext UnknownText_0x5de10 + writetext RadioTower2FBuenaTuneInToMyShowText waitbutton closetext checkcellnum PHONE_BUENA @@ -177,7 +177,7 @@ Buena: end .ForgotPassword: - writetext UnknownText_0x5df29 + writetext RadioTower2FBuenaComeBackAfterListeningText waitbutton closetext turnobject RADIOTOWER2F_BUENA, RIGHT @@ -187,7 +187,7 @@ Buena: end .PlayedAlready: - writetext UnknownText_0x5df6c + writetext RadioTower2FBuenaAlreadyPlayedText waitbutton closetext checkcellnum PHONE_BUENA @@ -202,13 +202,13 @@ Buena: .WrongAnswer: setflag ENGINE_BUENAS_PASSWORD_2 opentext - writetext UnknownText_0x5e01c + writetext RadioTower2FBuenaDidYouForgetText waitbutton closetext turnobject RADIOTOWER2F_BUENA, RIGHT pause 20 opentext - writetext UnknownText_0x5e054 + writetext RadioTower2FBuenaThanksForComingText waitbutton closetext turnobject RADIOTOWER2F_BUENA, RIGHT @@ -218,13 +218,13 @@ Buena: end .MidRocketTakeover: - writetext UnknownText_0x5e0c2 + writetext RadioTower2FBuenaPasswordIsHelpText waitbutton closetext end .NoBlueCard: - writetext UnknownText_0x5e192 + writetext RadioTower2FBuenaNoBlueCardText waitbutton closetext checkcellnum PHONE_BUENA @@ -236,7 +236,7 @@ Buena: end .BlueCardCapped0: - writetext UnknownText_0x5e0f1 + writetext RadioTower2FBuenaCardIsFullText waitbutton closetext checkcellnum PHONE_BUENA @@ -248,7 +248,7 @@ Buena: end .TooEarly: - writetext UnknownText_0x5e131 + writetext RadioTower2FBuenaTuneInAfterSixText waitbutton closetext checkcellnum PHONE_BUENA @@ -272,21 +272,21 @@ Buena: setevent EVENT_BUENA_OFFERED_HER_PHONE_NUMBER_NO_BLUE_CARD setevent EVENT_BUENA_OFFERED_HER_PHONE_NUMBER opentext - writetext UnknownText_0x5e1ee + writetext RadioTower2FBuenaOfferPhoneNumberText sjump .AskForNumber .OfferedNumberBefore: opentext - writetext UnknownText_0x5e2bf + writetext RadioTower2FBuenaOfferNumberAgainText .AskForNumber: askforphonenumber PHONE_BUENA ifequal PHONE_CONTACTS_FULL, .PhoneFull ifequal PHONE_CONTACT_REFUSED, .NumberDeclined - writetext UnknownText_0x5e2f3 + writetext RadioTower2FRegisteredBuenasNumberText playsound SFX_REGISTER_PHONE_NUMBER waitsfx buttonsound - writetext UnknownText_0x5e310 + writetext RadioTower2FBuenaCallMeText waitbutton closetext turnobject RADIOTOWER2F_BUENA, RIGHT @@ -294,14 +294,14 @@ Buena: end .NumberDeclined: - writetext UnknownText_0x5e33c + writetext RadioTower2FBuenaSadRejectedText waitbutton closetext turnobject RADIOTOWER2F_BUENA, RIGHT end .PhoneFull: - writetext UnknownText_0x5e35e + writetext RadioTower2FBuenaYourPhoneIsFullText waitbutton closetext turnobject RADIOTOWER2F_BUENA, RIGHT @@ -313,14 +313,14 @@ RadioTowerBuenaPrizeReceptionist: opentext checkitem BLUE_CARD iffalse .NoCard - writetext UnknownText_0x5e392 + writetext RadioTower2FBuenaReceptionistPointsForPrizesText buttonsound special BuenaPrize closetext end .NoCard: - writetext UnknownText_0x5e3d8 + writetext RadioTower2FBuenaReceptionistNoCardText buttonsound closetext end @@ -337,7 +337,7 @@ RadioTower2FPokemonRadioSign: RadioTower2FBookshelf: jumpstd magazinebookshelf -MovementData_0x5d921: +RadioTower2FPlayerWalksToMicrophoneMovement: slow_step DOWN slow_step RIGHT step_end @@ -468,7 +468,7 @@ GruntF2AfterBattleText: line "I won't forget it!" done -UnknownText_0x5dcf4: +RadioTower2FBuenaShowIntroductionText: text "BUENA: Hi! I'm" line "BUENA!" @@ -497,12 +497,12 @@ UnknownText_0x5dcf4: line "point card!" done -UnknownText_0x5de10: +RadioTower2FBuenaTuneInToMyShowText: text "BUENA: Tune in to" line "my PASSWORD SHOW!" done -UnknownText_0x5de35: +RadioTower2FBuenaDoYouKnowPasswordText: text "BUENA: Hi!" line "Did you tune in to" cont "my radio show?" @@ -511,7 +511,7 @@ UnknownText_0x5de35: line "today's password?" done -UnknownText_0x5de84: +RadioTower2FBuenaJoinTheShowText: text "BUENA: Oh, wow!" line "Thank you!" @@ -524,7 +524,7 @@ UnknownText_0x5de84: line "Join the show." done -UnknownText_0x5dedd: +RadioTower2FBuenaEveryoneSayPasswordText: text "BUENA: Everyone" line "ready?" @@ -535,7 +535,7 @@ UnknownText_0x5dedd: line "<PLAY_G>!" done -UnknownText_0x5df29: +RadioTower2FBuenaComeBackAfterListeningText: text "BUENA: Come back" line "after you listen" @@ -543,7 +543,7 @@ UnknownText_0x5df29: line "Catch ya later!" done -UnknownText_0x5df6c: +RadioTower2FBuenaAlreadyPlayedText: text "BUENA: Sorry…" para "You get just one" @@ -553,7 +553,7 @@ UnknownText_0x5df6c: line "for another try!" done -UnknownText_0x5dfc1: +RadioTower2FBuenaCorrectAnswerText: text "BUENA: YIPPEE!" line "That's right!" @@ -564,7 +564,7 @@ UnknownText_0x5dfc1: line "point! Congrats!" done -UnknownText_0x5e01c: +RadioTower2FBuenaDidYouForgetText: text "BUENA: Aww…" line "That's not it…" @@ -572,7 +572,7 @@ UnknownText_0x5e01c: line "password?" done -UnknownText_0x5e054: +RadioTower2FBuenaThanksForComingText: text "BUENA: Yup! Our" line "contestant was" @@ -586,14 +586,14 @@ UnknownText_0x5e054: line "I'll be waiting!" done -UnknownText_0x5e0c2: +RadioTower2FBuenaPasswordIsHelpText: text "BUENA: Huh?" line "Today's password?" para "HELP, of course!" done -UnknownText_0x5e0f1: +RadioTower2FBuenaCardIsFullText: text "BUENA: Your BLUE" line "CARD's full." @@ -601,7 +601,7 @@ UnknownText_0x5e0f1: line "fabulous prize!" done -UnknownText_0x5e131: +RadioTower2FBuenaTuneInAfterSixText: text "BUENA: Tune in to" line "PASSWORD every" @@ -612,7 +612,7 @@ UnknownText_0x5e131: line "in for a visit!" done -UnknownText_0x5e192: +RadioTower2FBuenaNoBlueCardText: text "BUENA: Oh? You" line "forgot to bring" cont "your BLUE CARD?" @@ -622,7 +622,7 @@ UnknownText_0x5e192: cont "don't have it." done -UnknownText_0x5e1ee: +RadioTower2FBuenaOfferPhoneNumberText: text "BUENA: Oh! Your" line "BLUE CARD reached" @@ -643,7 +643,7 @@ UnknownText_0x5e1ee: line "my phone number?" done -UnknownText_0x5e2bf: +RadioTower2FBuenaOfferNumberAgainText: text "BUENA: <PLAY_G>," line "do you want to" @@ -651,23 +651,23 @@ UnknownText_0x5e2bf: line "number?" done -UnknownText_0x5e2f3: +RadioTower2FRegisteredBuenasNumberText: text "<PLAYER> registered" line "BUENA's number." done -UnknownText_0x5e310: +RadioTower2FBuenaCallMeText: text "BUENA: I look" line "forward to hearing" cont "from you!" done -UnknownText_0x5e33c: +RadioTower2FBuenaSadRejectedText: text "BUENA: Aww… It's a" line "special prize…" done -UnknownText_0x5e35e: +RadioTower2FBuenaYourPhoneIsFullText: text "BUENA: <PLAY_G>," line "your phone list" @@ -675,7 +675,7 @@ UnknownText_0x5e35e: line "for me…" done -UnknownText_0x5e392: +RadioTower2FBuenaReceptionistPointsForPrizesText: text "You can cash in" line "your saved points" @@ -683,7 +683,7 @@ UnknownText_0x5e392: line "of your choice!" done -UnknownText_0x5e3d8: +RadioTower2FBuenaReceptionistNoCardText: text "You can't trade in" line "points without" cont "your BLUE CARD." diff --git a/maps/RadioTower3F.asm b/maps/RadioTower3F.asm index 367223ce4..baa8d1b97 100644 --- a/maps/RadioTower3F.asm +++ b/maps/RadioTower3F.asm @@ -51,30 +51,30 @@ RadioTower3FCooltrainerFScript: iftrue .NoRockets checkevent EVENT_USED_THE_CARD_KEY_IN_THE_RADIO_TOWER iftrue .UsedCardKey - writetext UnknownText_0x5e754 + writetext RadioTower3FCooltrainerFPleaseSaveDirectorText waitbutton closetext end .UsedCardKey: - writetext UnknownText_0x5e7cb + writetext RadioTower3FCooltrainerFIsDirectorSafeText waitbutton closetext end .NoRockets: - writetext UnknownText_0x5e7e2 + writetext RadioTower3FCooltrainerFYoureMyHeroText buttonsound verbosegiveitem TM_SUNNY_DAY iffalse .NoRoom - writetext UnknownText_0x5e821 + writetext RadioTower3FCooltrainerFItsSunnyDayText waitbutton closetext setevent EVENT_GOT_SUNNY_DAY_FROM_RADIO_TOWER end .GotSunnyDay: - writetext UnknownText_0x5e85c + writetext RadioTower3FCooltrainerFYouWereMarvelousText waitbutton .NoRoom: closetext @@ -189,7 +189,7 @@ RadioTower3FGymGuyText: cont "clock too!" done -UnknownText_0x5e754: +RadioTower3FCooltrainerFPleaseSaveDirectorText: text "The TEAM ROCKET" line "boss has locked" cont "himself in." @@ -203,12 +203,12 @@ UnknownText_0x5e754: para "Please save him!" done -UnknownText_0x5e7cb: +RadioTower3FCooltrainerFIsDirectorSafeText: text "Is the DIRECTOR" line "safe?" done -UnknownText_0x5e7e2: +RadioTower3FCooltrainerFYoureMyHeroText: text "Thank you!" line "You're my hero!" @@ -216,14 +216,14 @@ UnknownText_0x5e7e2: line "my appreciation." done -UnknownText_0x5e821: +RadioTower3FCooltrainerFItsSunnyDayText: text "It's SUNNY DAY." line "It powers up fire-" cont "type moves for a" cont "while." done -UnknownText_0x5e85c: +RadioTower3FCooltrainerFYouWereMarvelousText: text "You were simply" line "marvelous!" done diff --git a/maps/Route35NationalParkGate.asm b/maps/Route35NationalParkGate.asm index d67480528..8676b146f 100644 --- a/maps/Route35NationalParkGate.asm +++ b/maps/Route35NationalParkGate.asm @@ -52,22 +52,22 @@ Route35NationalParkGate_MapScripts: return .LeavingContestEarly: - applymovement PLAYER, MovementData_0x6a2e2 + applymovement PLAYER, Route35NationalParkGatePlayerApproachOfficer1Movement turnobject ROUTE35NATIONALPARKGATE_OFFICER1, RIGHT opentext readvar VAR_CONTESTMINUTES addval 1 getnum STRING_BUFFER_3 - writetext UnknownText_0x6a79a + writetext Route35NationalParkGateOfficer1WantToFinishText yesorno iffalse .GoBackToContest - writetext UnknownText_0x6a7db + writetext Route35NationalParkGateOfficer1WaitAtNorthGateText waitbutton closetext jumpstd bugcontestresultswarp .GoBackToContest: - writetext UnknownText_0x6a823 + writetext Route35NationalParkGateOfficer1OkGoFinishText waitbutton closetext scall Route35NationalParkGate_EnterContest @@ -88,7 +88,7 @@ Route35OfficerScriptContest: checkflag ENGINE_DAILY_BUG_CONTEST iftrue Route35NationalParkGate_ContestIsOver scall Route35NationalParkGate_GetDayOfWeek - writetext UnknownText_0x6a2eb + writetext Route35NationalParkGateOfficer1AskToParticipateText yesorno iffalse Route35NationalParkGate_DeclinedToParticipate readvar VAR_PARTYCOUNT @@ -98,12 +98,12 @@ Route35OfficerScriptContest: Route35NationalParkGate_OkayToProceed: setflag ENGINE_BUG_CONTEST_TIMER special PlayMapMusic - writetext UnknownText_0x6a39d + writetext Route35NationalParkGateOfficer1GiveParkBallsText buttonsound - writetext UnknownText_0x6a3c7 + writetext Route35NationalParkGatePlayerReceivedParkBallsText playsound SFX_ITEM waitsfx - writetext UnknownText_0x6a3e2 + writetext Route35NationalParkGateOfficer1ExplainsRulesText waitbutton closetext special GiveParkBalls @@ -118,11 +118,11 @@ Route35NationalParkGate_OkayToProceed: Route35NationalParkGate_EnterContest: readvar VAR_FACING ifequal LEFT, Route35NationalParkGate_FacingLeft - applymovement PLAYER, MovementData_0x6a2e5 + applymovement PLAYER, Route35NationalParkGatePlayerGoAroundOfficerAndEnterParkMovement end Route35NationalParkGate_FacingLeft: - applymovement PLAYER, MovementData_0x6a2e9 + applymovement PLAYER, Route35NationalParkGatePlayerEnterParkMovement end Route35NationalParkGate_LeaveTheRestBehind: @@ -134,65 +134,65 @@ Route35NationalParkGate_LeaveTheRestBehind: Route35NationalParkGate_LessThanFullParty: special CheckFirstMonIsEgg ifequal TRUE, Route35NationalParkGate_FirstMonIsEgg - writetext UnknownText_0x6a4c6 + writetext Route35NationalParkGateOfficer1AskToUseFirstMonText yesorno iffalse Route35NationalParkGate_DeclinedToLeaveMonsBehind special ContestDropOffMons iftrue Route35NationalParkGate_FirstMonIsFainted setevent EVENT_LEFT_MONS_WITH_CONTEST_OFFICER - writetext UnknownText_0x6a537 + writetext Route35NationalParkGateOfficer1WellHoldYourMonText buttonsound - writetext UnknownText_0x6a56b + writetext Route35NationalParkGatePlayersMonLeftWithHelperText playsound SFX_GOT_SAFARI_BALLS waitsfx buttonsound sjump Route35NationalParkGate_OkayToProceed Route35NationalParkGate_DeclinedToParticipate: - writetext UnknownText_0x6a5dc + writetext Route35NationalParkGateOfficer1TakePartInFutureText waitbutton closetext end Route35NationalParkGate_DeclinedToLeaveMonsBehind: - writetext UnknownText_0x6a597 + writetext Route35NationalParkGateOfficer1ChooseMonAndComeBackText waitbutton closetext end Route35NationalParkGate_FirstMonIsFainted: - writetext UnknownText_0x6a608 + writetext Route35NationalParkGateOfficer1FirstMonCantBattleText waitbutton closetext end Route35NationalParkGate_NoRoomInBox: - writetext UnknownText_0x6a67c + writetext Route35NationalParkGateOfficer1MakeRoomText waitbutton closetext end Route35NationalParkGate_FirstMonIsEgg: - writetext UnknownText_0x6a71f + writetext Route35NationalParkGateOfficer1EggAsFirstMonText waitbutton closetext end Route35NationalParkGate_ContestIsOver: - writetext UnknownText_0x6a84f + writetext Route35NationalParkGateOfficer1ContestIsOverText waitbutton closetext end Route35NationalParkGate_NoContestToday: - jumptextfaceplayer UnknownText_0x6a894 + jumptextfaceplayer Route35NationalParkGateOfficer1WeHoldContestsText Route35NationalParkGateOfficerScript: faceplayer opentext checkflag ENGINE_DAILY_BUG_CONTEST iftrue Route35NationalParkGate_ContestIsOver - writetext UnknownText_0x6a894 + writetext Route35NationalParkGateOfficer1WeHoldContestsText waitbutton closetext end @@ -207,22 +207,22 @@ Route35NationalParkGate_GetDayOfWeek: jumpstd daytotext end -MovementData_0x6a2e2: +Route35NationalParkGatePlayerApproachOfficer1Movement: step DOWN turn_head LEFT step_end -MovementData_0x6a2e5: +Route35NationalParkGatePlayerGoAroundOfficerAndEnterParkMovement: step RIGHT step UP step UP step_end -MovementData_0x6a2e9: +Route35NationalParkGatePlayerEnterParkMovement: step UP step_end -UnknownText_0x6a2eb: +Route35NationalParkGateOfficer1AskToParticipateText: text "Today's @" text_ram wStringBuffer3 text "." @@ -244,18 +244,18 @@ UnknownText_0x6a2eb: line "give it a try?" done -UnknownText_0x6a39d: +Route35NationalParkGateOfficer1GiveParkBallsText: text "Here are the PARK" line "BALLS for the" cont "Contest." done -UnknownText_0x6a3c7: +Route35NationalParkGatePlayerReceivedParkBallsText: text "<PLAYER> received" line "20 PARK BALLS." done -UnknownText_0x6a3e2: +Route35NationalParkGateOfficer1ExplainsRulesText: text "The person who" line "gets the strong-" cont "est bug #MON" @@ -279,7 +279,7 @@ UnknownText_0x6a3e2: line "find!" done -UnknownText_0x6a4c6: +Route35NationalParkGateOfficer1AskToUseFirstMonText: text "Uh-oh…" para "You have more than" @@ -297,19 +297,19 @@ UnknownText_0x6a4c6: line "you?" done -UnknownText_0x6a537: +Route35NationalParkGateOfficer1WellHoldYourMonText: text "Fine, we'll hold" line "your other #MON" cont "while you compete." done -UnknownText_0x6a56b: +Route35NationalParkGatePlayersMonLeftWithHelperText: text "<PLAYER>'s #MON" line "were left with the" cont "CONTEST HELPER." done -UnknownText_0x6a597: +Route35NationalParkGateOfficer1ChooseMonAndComeBackText: text "Please choose the" line "#MON to be used" @@ -317,13 +317,13 @@ UnknownText_0x6a597: line "then come see me." done -UnknownText_0x6a5dc: +Route35NationalParkGateOfficer1TakePartInFutureText: text "OK. We hope you'll" line "take part in the" cont "future." done -UnknownText_0x6a608: +Route35NationalParkGateOfficer1FirstMonCantBattleText: text "Uh-oh…" line "The first #MON" @@ -337,7 +337,7 @@ UnknownText_0x6a608: line "then come see me." done -UnknownText_0x6a67c: +Route35NationalParkGateOfficer1MakeRoomText: text "Uh-oh…" line "Both your party" @@ -355,7 +355,7 @@ UnknownText_0x6a67c: line "come see me." done -UnknownText_0x6a71f: +Route35NationalParkGateOfficer1EggAsFirstMonText: text "Uh-oh…" line "You have an EGG as" @@ -369,7 +369,7 @@ UnknownText_0x6a71f: line "then come see me." done -UnknownText_0x6a79a: +Route35NationalParkGateOfficer1WantToFinishText: text "You still have @" text_ram wStringBuffer3 text_start @@ -379,7 +379,7 @@ UnknownText_0x6a79a: line "finish now?" done -UnknownText_0x6a7db: +Route35NationalParkGateOfficer1WaitAtNorthGateText: text "OK. Please wait at" line "the North Gate for" @@ -387,13 +387,13 @@ UnknownText_0x6a7db: line "of the winners." done -UnknownText_0x6a823: +Route35NationalParkGateOfficer1OkGoFinishText: text "OK. Please get" line "back outside and" cont "finish up." done -UnknownText_0x6a84f: +Route35NationalParkGateOfficer1ContestIsOverText: text "Today's Contest is" line "over. We hope you" @@ -401,7 +401,7 @@ UnknownText_0x6a84f: line "in the future." done -UnknownText_0x6a894: +Route35NationalParkGateOfficer1WeHoldContestsText: text "We hold Contests" line "regularly in the" diff --git a/maps/Route36NationalParkGate.asm b/maps/Route36NationalParkGate.asm index 7880cf612..fa80fc3d1 100644 --- a/maps/Route36NationalParkGate.asm +++ b/maps/Route36NationalParkGate.asm @@ -67,10 +67,10 @@ Route36NationalParkGate_MapScripts: readvar VAR_CONTESTMINUTES addval 1 getnum STRING_BUFFER_3 - writetext UnknownText_0x6b284 + writetext Route36NationalParkGateOfficer1WantToFinishText yesorno iffalse .GoBackToContest - writetext UnknownText_0x6b2c5 + writetext Route36NationalParkGateOfficer1WaitHereForAnnouncementText waitbutton closetext special FadeBlackQuickly @@ -78,13 +78,13 @@ Route36NationalParkGate_MapScripts: scall .CopyContestants disappear ROUTE36NATIONALPARKGATE_OFFICER1 appear ROUTE36NATIONALPARKGATE_OFFICER2 - applymovement PLAYER, MovementData_0x6add1 + applymovement PLAYER, Route36NationalParkGatePlayerWaitWithContestantsMovement pause 15 special FadeInQuickly jumpstd bugcontestresults .GoBackToContest: - writetext UnknownText_0x6b300 + writetext Route36NationalParkGateOfficer1OkGoFinishText waitbutton closetext turnobject PLAYER, LEFT @@ -149,7 +149,7 @@ Route36OfficerScriptContest: checkflag ENGINE_DAILY_BUG_CONTEST iftrue Route36Officer_ContestHasConcluded scall Route36ParkGate_DayToText - writetext UnknownText_0x6add5 + writetext Route36NationalParkGateOfficer1AskToParticipateText yesorno iffalse .DecidedNotToJoinContest readvar VAR_PARTYCOUNT @@ -159,13 +159,13 @@ Route36OfficerScriptContest: .ResumeStartingContest: setflag ENGINE_BUG_CONTEST_TIMER special PlayMapMusic - writetext UnknownText_0x6ae87 + writetext Route36NationalParkGateOfficer1GiveParkBallsText buttonsound waitsfx - writetext UnknownText_0x6aeb1 + writetext Route36NationalParkGatePlayerReceivedParkBallsText playsound SFX_ITEM waitsfx - writetext UnknownText_0x6aecc + writetext Route36NationalParkGateOfficer1ExplainsRulesText waitbutton closetext setflag ENGINE_BUG_CONTEST_TIMER @@ -186,46 +186,46 @@ Route36OfficerScriptContest: .ContinueLeavingMons: special CheckFirstMonIsEgg ifequal TRUE, .FirstMonIsEgg - writetext UnknownText_0x6afb0 + writetext Route36NationalParkGateOfficer1AskToUseFirstMonText yesorno iffalse .RefusedToLeaveMons special ContestDropOffMons iftrue .FirstMonIsFainted setevent EVENT_LEFT_MONS_WITH_CONTEST_OFFICER - writetext UnknownText_0x6b021 + writetext Route36NationalParkGateOfficer1WellHoldYourMonText buttonsound - writetext UnknownText_0x6b055 + writetext Route36NationalParkGatePlayersMonLeftWithHelperText playsound SFX_GOT_SAFARI_BALLS waitsfx buttonsound sjump .ResumeStartingContest .DecidedNotToJoinContest: - writetext UnknownText_0x6b0c6 + writetext Route36NationalParkGateOfficer1TakePartInFutureText waitbutton closetext end .RefusedToLeaveMons: - writetext UnknownText_0x6b081 + writetext Route36NationalParkGateOfficer1ChooseMonAndComeBackText waitbutton closetext end .FirstMonIsFainted: - writetext UnknownText_0x6b0f2 + writetext Route36NationalParkGateOfficer1FirstMonCantBattleText waitbutton closetext end .BoxFull: - writetext UnknownText_0x6b166 + writetext Route36NationalParkGateOfficer1MakeRoomText waitbutton closetext end .FirstMonIsEgg: - writetext UnknownText_0x6b209 + writetext Route36NationalParkGateOfficer1EggAsFirstMonText waitbutton closetext end @@ -239,13 +239,13 @@ Route36Officer_ContestHasConcluded: iftrue .GoldBerry checkevent EVENT_CONTEST_OFFICER_HAS_BERRY iftrue .Berry - writetext UnknownText_0x6b32b + writetext Route36NationalParkGateOfficer1ContestIsOverText waitbutton closetext end .Sunstone: - writetext UnknownText_0x6b97f + writetext Route36NationalParkGateOfficer1HeresThePrizeText buttonsound verbosegiveitem SUN_STONE iffalse .BagFull @@ -254,7 +254,7 @@ Route36Officer_ContestHasConcluded: end .Everstone: - writetext UnknownText_0x6b97f + writetext Route36NationalParkGateOfficer1HeresThePrizeText buttonsound verbosegiveitem EVERSTONE iffalse .BagFull @@ -263,7 +263,7 @@ Route36Officer_ContestHasConcluded: end .GoldBerry: - writetext UnknownText_0x6b97f + writetext Route36NationalParkGateOfficer1HeresThePrizeText buttonsound verbosegiveitem GOLD_BERRY iffalse .BagFull @@ -272,7 +272,7 @@ Route36Officer_ContestHasConcluded: end .Berry: - writetext UnknownText_0x6b97f + writetext Route36NationalParkGateOfficer1HeresThePrizeText buttonsound verbosegiveitem BERRY iffalse .BagFull @@ -281,20 +281,20 @@ Route36Officer_ContestHasConcluded: end .BagFull: - writetext UnknownText_0x6b910 + writetext Route36NationalParkGateOfficer1WellHoldPrizeText waitbutton closetext end _ContestNotOn: - jumptextfaceplayer UnknownText_0x6b370 + jumptextfaceplayer Route36NationalParkGateOfficer1SomeMonOnlySeenInParkText Route36NationalParkGateOfficerScript: faceplayer opentext checkflag ENGINE_DAILY_BUG_CONTEST iftrue Route36Officer_ContestHasConcluded - writetext UnknownText_0x6b370 + writetext Route36NationalParkGateOfficer1SomeMonOnlySeenInParkText waitbutton closetext end @@ -467,13 +467,13 @@ UnusedBugCatchingContestExplanationSign: ; duplicate of BugCatchingContestExplanationSign in Route35NationalParkGate.asm jumptext UnusedBugCatchingContestExplanationText -MovementData_0x6add1: +Route36NationalParkGatePlayerWaitWithContestantsMovement: big_step DOWN big_step RIGHT turn_head UP step_end -UnknownText_0x6add5: +Route36NationalParkGateOfficer1AskToParticipateText: text "Today's @" text_ram wStringBuffer3 text "." @@ -495,18 +495,18 @@ UnknownText_0x6add5: line "give it a try?" done -UnknownText_0x6ae87: +Route36NationalParkGateOfficer1GiveParkBallsText: text "Here are the PARK" line "BALLS for the" cont "Contest." done -UnknownText_0x6aeb1: +Route36NationalParkGatePlayerReceivedParkBallsText: text "<PLAYER> received" line "20 PARK BALLS." done -UnknownText_0x6aecc: +Route36NationalParkGateOfficer1ExplainsRulesText: text "The person who" line "gets the strong-" cont "est bug #MON" @@ -530,7 +530,7 @@ UnknownText_0x6aecc: line "find!" done -UnknownText_0x6afb0: +Route36NationalParkGateOfficer1AskToUseFirstMonText: text "Uh-oh…" para "You have more than" @@ -548,19 +548,19 @@ UnknownText_0x6afb0: line "you?" done -UnknownText_0x6b021: +Route36NationalParkGateOfficer1WellHoldYourMonText: text "Fine, we'll hold" line "your other #MON" cont "while you compete." done -UnknownText_0x6b055: +Route36NationalParkGatePlayersMonLeftWithHelperText: text "<PLAYER>'s #MON" line "were left with the" cont "CONTEST HELPER." done -UnknownText_0x6b081: +Route36NationalParkGateOfficer1ChooseMonAndComeBackText: text "Please choose the" line "#MON to be used" @@ -568,13 +568,13 @@ UnknownText_0x6b081: line "then come see me." done -UnknownText_0x6b0c6: +Route36NationalParkGateOfficer1TakePartInFutureText: text "OK. We hope you'll" line "take part in the" cont "future." done -UnknownText_0x6b0f2: +Route36NationalParkGateOfficer1FirstMonCantBattleText: text "Uh-oh…" line "The first #MON" @@ -588,7 +588,7 @@ UnknownText_0x6b0f2: line "then come see me." done -UnknownText_0x6b166: +Route36NationalParkGateOfficer1MakeRoomText: text "Uh-oh…" line "Both your party" @@ -606,7 +606,7 @@ UnknownText_0x6b166: line "come see me." done -UnknownText_0x6b209: +Route36NationalParkGateOfficer1EggAsFirstMonText: text "Uh-oh…" line "You have an EGG as" @@ -620,7 +620,7 @@ UnknownText_0x6b209: line "then come see me." done -UnknownText_0x6b284: +Route36NationalParkGateOfficer1WantToFinishText: text "You still have @" text_ram wStringBuffer3 text_start @@ -630,7 +630,7 @@ UnknownText_0x6b284: line "finish now?" done -UnknownText_0x6b2c5: +Route36NationalParkGateOfficer1WaitHereForAnnouncementText: text "OK. Please wait" line "here for the" @@ -638,13 +638,13 @@ UnknownText_0x6b2c5: line "the winners." done -UnknownText_0x6b300: +Route36NationalParkGateOfficer1OkGoFinishText: text "OK. Please go back" line "outside and finish" cont "up." done -UnknownText_0x6b32b: +Route36NationalParkGateOfficer1ContestIsOverText: text "Today's Contest is" line "over. We hope you" @@ -652,7 +652,7 @@ UnknownText_0x6b32b: line "in the future." done -UnknownText_0x6b370: +Route36NationalParkGateOfficer1SomeMonOnlySeenInParkText: text "Some #MON can" line "only be seen in" cont "the PARK." @@ -829,7 +829,7 @@ UnusedBugCatchingContestExplanationText: line "the contest." done -UnknownText_0x6b910: +Route36NationalParkGateOfficer1WellHoldPrizeText: text "Uh-oh… Your PACK" line "is full." @@ -841,7 +841,7 @@ UnknownText_0x6b910: line "then come see me." done -UnknownText_0x6b97f: +Route36NationalParkGateOfficer1HeresThePrizeText: text "<PLAYER>?" para "Here's the prize" diff --git a/mobile/mobile_12.asm b/mobile/mobile_12.asm index c3e0aa6ab..2f9041d1f 100644 --- a/mobile/mobile_12.asm +++ b/mobile/mobile_12.asm @@ -107,7 +107,7 @@ InitMobileProfile: hlcoord 0, 14 ld b, $2 ld c, $12 - call TextBox + call Textbox hlcoord 1, 16 ld de, MobileString_PersonalInfo call PlaceString diff --git a/mobile/mobile_12_2.asm b/mobile/mobile_12_2.asm index cd5a7b233..7c3adbbcb 100644 --- a/mobile/mobile_12_2.asm +++ b/mobile/mobile_12_2.asm @@ -671,7 +671,7 @@ Function4ac58: hlcoord 11, 13 ld b, $3 ld c, $7 - call TextBox + call Textbox hlcoord 13, 14 ld de, String_4ada7 call PlaceString @@ -681,7 +681,7 @@ Function4ac58: hlcoord 11, 9 ld b, $7 ld c, $7 - call TextBox + call Textbox call Function4ad68 .asm_4ac96 diff --git a/mobile/mobile_22.asm b/mobile/mobile_22.asm index 6f17e09de..3920e44c9 100644 --- a/mobile/mobile_22.asm +++ b/mobile/mobile_22.asm @@ -1542,7 +1542,7 @@ Function89a2e: hlcoord 11, 12 ld b, $2 ld c, $6 - call TextBox + call Textbox hlcoord 13, 13 ld de, String_89a4e call PlaceString @@ -2737,7 +2737,7 @@ Function8a1b0: hlcoord 0, 12 ld b, $4 ld c, $12 - call TextBox + call Textbox hlcoord 1, 14 ld a, [wMenuCursorY] ld de, Strings_8a1cc @@ -3057,7 +3057,7 @@ Function8a453: hlcoord 0, 12 ld b, $4 ld c, $12 - call TextBox + call Textbox hlcoord 1, 14 ld de, String_8a476 ld a, [wMenuSelection] @@ -4035,7 +4035,7 @@ Function8aba9: hlcoord 0, 12 ld b, $4 ld c, $12 - call TextBox + call Textbox hlcoord 1, 14 ld de, String_8ac3b call PlaceString @@ -4188,7 +4188,7 @@ Function8ad0b: hlcoord 0, 12 ld b, $4 ld c, $12 - call TextBox + call Textbox ld de, String_8ad89 hlcoord 1, 14 call PlaceString @@ -4199,7 +4199,7 @@ Function8ad0b: hlcoord 0, 12 ld b, $4 ld c, $12 - call TextBox + call Textbox ld de, String_8ad9c hlcoord 1, 14 call PlaceString diff --git a/mobile/mobile_22_2.asm b/mobile/mobile_22_2.asm index 4b28f791f..c86b0711b 100644 --- a/mobile/mobile_22_2.asm +++ b/mobile/mobile_22_2.asm @@ -284,7 +284,7 @@ Function8b4a4: push bc push de call Function8b4d8 - call TextBox + call Textbox pop de pop bc call Function8b4cc @@ -459,27 +459,27 @@ Function8b555: UnknownText_0x8b5ce: ; Please enter any four-digit number. - text_far UnknownText_0x1bc187 + text_far _EnterNewPasscodeText text_end UnknownText_0x8b5d3: ; Enter the same number to confirm. - text_far UnknownText_0x1bc1ac + text_far _ConfirmPasscodeText text_end UnknownText_0x8b5d8: ; That's not the same number. - text_far UnknownText_0x1bc1cf + text_far _PasscodesNotSameText text_end UnknownText_0x8b5dd: ; Your PASSCODE has been set. Enter this number next time to open the CARD FOLDER. - text_far UnknownText_0x1bc1eb + text_far _PasscodeSetText text_end UnknownText_0x8b5e2: ; 0000 is invalid! - text_far UnknownText_0x1bc23e + text_far _FourZerosInvalidText text_end Function8b5e7: @@ -524,17 +524,17 @@ Function8b5e7: UnknownText_0x8b642: ; Enter the CARD FOLDER PASSCODE. - text_far UnknownText_0x1bc251 + text_far _EnterPasscodeText text_end UnknownText_0x8b647: ; Incorrect PASSCODE! - text_far UnknownText_0x1bc272 + text_far _IncorrectPasscodeText text_end UnknownText_0x8b64c: ; CARD FOLDER open.@ @ - text_far UnknownText_0x1bc288 + text_far _CardFolderOpenText text_asm ld de, SFX_TWINKLE call PlaySFX @@ -940,7 +940,7 @@ Function8b8c8: hlcoord 0, 14 ld b, $2 ld c, $12 - call TextBox + call Textbox ld a, [wd033] ld b, 0 ld c, a diff --git a/mobile/mobile_40.asm b/mobile/mobile_40.asm index d018168ab..c342388dd 100644 --- a/mobile/mobile_40.asm +++ b/mobile/mobile_40.asm @@ -1396,7 +1396,7 @@ Function100902: hlcoord 3, 10 ld b, $01 ld c, $0b - call TextBox + call Textbox ld a, [wcd6d] ld c, a ld a, $0a @@ -1860,7 +1860,7 @@ MobileMoveSelectionScreen: ld hl, BattleText_TheresNoPPLeftForThisMove .print_text - call StdBattleTextBox + call StdBattleTextbox call Call_LoadTempTileMapToTileMap jp .GetMoveSelection @@ -1868,7 +1868,7 @@ Function100c74: hlcoord 0, 8 ld b, 8 ld c, 8 - call TextBox + call Textbox ld hl, wBattleMonMoves ld de, wListMoves_MoveIndicesBuffer ld bc, NUM_MOVES @@ -3788,7 +3788,7 @@ _StartMobileBattle: ld [wdc5f], a ld [wdc60], a farcall BlankScreen - call SpeechTextBox + call SpeechTextbox farcall Function100846 ld c, 120 call DelayFrames @@ -4741,14 +4741,14 @@ Function102142: call Function10218d call Function102180 ld hl, UnknownText_0x1021d1 - call MenuTextBox + call MenuTextbox ld de, SFX_LEVEL_UP call PlaySFX call JoyWaitAorB call ExitMenu call Function10219f ld hl, UnknownText_0x1021d6 - call MenuTextBox + call MenuTextbox call YesNoBox call ExitMenu jr c, .asm_10217c @@ -4814,7 +4814,7 @@ UnknownText_0x1021db: text_end Function1021e0: - call MenuTextBox + call MenuTextbox call JoyWaitAorB call ExitMenu ret @@ -6472,7 +6472,7 @@ Function102e07: ld a, [wBattleMode] and a jr z, .link_battle - call TextBox + call Textbox jr .okay .link_battle @@ -6573,7 +6573,7 @@ Function102ea8: ld [wNamedObjectIndexBuffer], a call GetPokemonName ld hl, UnknownText_0x102ee2 - call PrintTextBoxText + call PrintTextboxText ret UnknownText_0x102ee2: diff --git a/mobile/mobile_41.asm b/mobile/mobile_41.asm index da5e95347..66acfb5ac 100644 --- a/mobile/mobile_41.asm +++ b/mobile/mobile_41.asm @@ -1029,7 +1029,7 @@ Function106464:: ret Function10649b: - ld a, [wTextBoxFrame] + ld a, [wTextboxFrame] maskbits NUM_FRAMES ld bc, 6 * LEN_1BPP_TILE ld hl, Frames @@ -1041,9 +1041,9 @@ Function10649b: ld b, BANK(Frames) call Function1064c3 ld hl, vTiles2 tile " " ; $7f - ld de, TextBoxSpaceGFX + ld de, TextboxSpaceGFX ld c, 1 - ld b, BANK(TextBoxSpaceGFX) + ld b, BANK(TextboxSpaceGFX) call Function1064c3 ret diff --git a/mobile/mobile_42.asm b/mobile/mobile_42.asm index 4cb54ce05..3eaa12436 100644 --- a/mobile/mobile_42.asm +++ b/mobile/mobile_42.asm @@ -1255,7 +1255,7 @@ MobileTradeAnim_DisplayEggData: hlcoord 5, 0 ld b, 6 ld c, 9 - call TextBox + call Textbox hlcoord 6, 2 ld de, .EggTemplate call PlaceString @@ -1276,7 +1276,7 @@ Function108a33: hlcoord 5, 0 ld b, 6 ld c, 9 - call TextBox + call Textbox hlcoord 7, 4 ld de, .OddEgg call PlaceString @@ -1294,7 +1294,7 @@ MobileTradeAnim_LoadMonTemplate: hlcoord 4, 0 ld b, 6 ld c, 10 - call TextBox + call Textbox hlcoord 5, 0 ld de, .MonTemplate call PlaceString @@ -1550,15 +1550,15 @@ Function108bec: ret .PlayerWillTradeMon: - text_far UnknownText_0x1bc787 + text_far _TradingText10 text_end .ForPartnersMon: - text_far UnknownText_0x1bc79d + text_far _TradingText11 text_end .UnusedTextPlayersMonTrade: - text_far UnknownText_0x1bc7b0 + text_far _TradingText12 text_end Function108c16: @@ -1571,7 +1571,7 @@ Function108c16: ret .TakeGoodCareOfMon: - text_far UnknownText_0x1bc7c3 + text_far _TradingText13 text_end Function108c2b: @@ -1584,7 +1584,7 @@ Function108c2b: ret .PlayersMonTrade: - text_far UnknownText_0x1bc7dd + text_far _TradingText14 text_end Function108c40: @@ -1607,11 +1607,11 @@ Function108c40: ret .TakeGoodCareOf: - text_far UnknownText_0x1bc7f0 + text_far _TradingText15 text_end .CameBack: - text_far UnknownText_0x1bc80a + text_far _TradingText16 text_end Function108c6d: diff --git a/mobile/mobile_45.asm b/mobile/mobile_45.asm index 8067f5f30..dc0e4966b 100644 --- a/mobile/mobile_45.asm +++ b/mobile/mobile_45.asm @@ -7015,7 +7015,7 @@ Function1178e8: jp MobilePassword_IncrementJumptable Function117942: - call SpeechTextBox + call SpeechTextbox hlcoord 1, 14 ld de, SavedPasswordString call PlaceString diff --git a/mobile/mobile_46.asm b/mobile/mobile_46.asm index b919a9f52..75ed452b9 100644 --- a/mobile/mobile_46.asm +++ b/mobile/mobile_46.asm @@ -1744,7 +1744,7 @@ Function118eb0: Function118ec6: call Function118440 - call SpeechTextBox + call SpeechTextbox ld hl, $d80e ld de, $c320 ld bc, $0026 @@ -5253,7 +5253,7 @@ BattleTowerRoomMenu_WriteMessage: Function11a90f: ld a, $1 ldh [rSVBK], a - call SpeechTextBox + call SpeechTextbox ld a, $50 ld hl, $c320 ld bc, $008c @@ -5503,7 +5503,7 @@ Text_ThisBattleRoomPleaseWait: done Function11ac3e: - call SpeechTextBox + call SpeechTextbox call FadeToMenu callfar ClearSpriteAnims2 call Function11ac51 @@ -7316,7 +7316,7 @@ Function11b7e5: farcall GetCaughtGender ld a, c ld [wOTTrademonCaughtData], a - call SpeechTextBox + call SpeechTextbox call FadeToMenu farcall MobileTradeAnimation_ReceiveGetmonFromGTS farcall Function17d1f1 diff --git a/mobile/mobile_5e.asm b/mobile/mobile_5e.asm index 748a71d55..589d9d444 100644 --- a/mobile/mobile_5e.asm +++ b/mobile/mobile_5e.asm @@ -816,7 +816,7 @@ Function17ac46: ld a, [$d088] bit 4, a jr nz, .bit_4_set - call TextBox + call Textbox ret .bit_4_set diff --git a/mobile/mobile_5f.asm b/mobile/mobile_5f.asm index 48ba99276..9d8a8b831 100644 --- a/mobile/mobile_5f.asm +++ b/mobile/mobile_5f.asm @@ -289,7 +289,7 @@ Function17d0f3: farcall GetCaughtGender ld a, c ld [wOTTrademonCaughtData], a - call SpeechTextBox + call SpeechTextbox call FadeToMenu farcall Function10804d farcall Function17d1f1 @@ -520,7 +520,7 @@ Function17d2ce: .asm_17d2e2 call Function17d314 ret c - call SpeechTextBox + call SpeechTextbox call FadeToMenu ldh a, [rSVBK] push af diff --git a/mobile/mobile_menu.asm b/mobile/mobile_menu.asm index 3b971ee83..ea54ff85c 100644 --- a/mobile/mobile_menu.asm +++ b/mobile/mobile_menu.asm @@ -23,7 +23,7 @@ Function49f16: hlcoord 0, 12 ld b, 4 ld c, SCREEN_HEIGHT - call TextBox + call Textbox xor a ld de, String_0x49fe9 hlcoord 1, 14 @@ -258,7 +258,7 @@ Function4a149: hlcoord 0, 12 ld b, $4 ld c, $12 - call TextBox + call Textbox ld a, [wMenuCursorY] dec a ld hl, Strings_4a23d @@ -418,7 +418,7 @@ Function4a28a: hlcoord 14, 7 ld b, 3 ld c, 4 - call TextBox + call Textbox farcall Mobile_OpenAndCloseMenu_HDMATransferTileMapAndAttrMap ld hl, DeletePassword_YesNo_MenuHeader call LoadMenuHeader @@ -667,7 +667,7 @@ Function4a4c4: hlcoord 0, 12 ld b, $4 ld c, $12 - call TextBox + call Textbox xor a ld hl, Strings_4a5f6 ld d, h diff --git a/mobile/print_opp_message.asm b/mobile/print_opp_message.asm index fc9d7d9c7..77cbbbdfc 100644 --- a/mobile/print_opp_message.asm +++ b/mobile/print_opp_message.asm @@ -1,7 +1,7 @@ Mobile_PrintOpponentBattleMessage: ld a, c push af - call SpeechTextBox + call SpeechTextbox call MobileTextBorder pop af dec a diff --git a/pokecrystal.link b/pokecrystal.link index ccef50b37..6a5c2d6a6 100644 --- a/pokecrystal.link +++ b/pokecrystal.link @@ -361,7 +361,9 @@ SRAM $02 "Boxes 1-7" SRAM $03 "Boxes 8-14" +SRAM $04 + "SRAM Mobile 1" SRAM $05 - "SRAM Mobile" + "SRAM Mobile 2" HRAM "HRAM" @@ -239,8 +239,13 @@ sBox12:: box sBox12 sBox13:: box sBox13 sBox14:: box sBox14 +SECTION "SRAM Mobile 1", SRAM -SECTION "SRAM Mobile", SRAM, BANK [5] + ds $13 + +s4_a013:: ds 36 ; a013 + +SECTION "SRAM Mobile 2", SRAM ds 1 ; former location for sMobileEventIndex, moved to 1:BE3C in English @@ -292,9 +297,64 @@ sTrainerRankingsEnd:: ; a083 ds 1 ; Former location for sMobileEventIndexBackup, moved to 1:BE44 in English -sTrainerRankingsBackup:: ds sTrainerRankingsEnd - sTrainerRankings +sTrainerRankingsBackup:: ds sTrainerRankingsEnd - sTrainerRankings ; a084 + + ds $6fa + +s5_a800:: db ; a800 + + ds $24 + +s5_a825:: db ; a825 +s5_a826:: db ; a826 + + ds $6d + +s5_a894:: ds NAME_LENGTH_JAPANESE ; a894 + + ds $2 + +s5_a89c:: ds 22 ; a89c +s5_a8b2:: ds 150 ; a8b2 + +s5_a948:: ds 246 ; a948 + + ds $3 + +s5_aa41:: ds 4 ; aa41 + + ds $2 + +s5_aa47:: db ; aa47 +s5_aa48:: db ; aa48 + + ds $2 + +sMobileLoginPassword:: ds MOBILE_LOGIN_PASSWORD_LENGTH ; aa4b + + ds $1 + +s5_aa5d:: ds MOBILE_LOGIN_PASSWORD_LENGTH ; aa5d + + ds $1d + +s5_aa8b:: db ; aa8b +s5_aa8c:: db ; aa8c +s5_aa8d:: db ; aa8d +s5_aa8e:: ds 7 * $cc ; aa8e + + ds $1 + +s5_b023:: ds 105 ; b023 +s5_b08c:: ds 4 ; b08c + + ds $269 + +s5_b2f9:: db ; b2f9 +s5_b2fa:: db ; b2fa +s5_b2fb:: db ; b2fb - ds $945 -; aa4b + ds $b49 -sMobileLoginPassword:: ds MOBILE_LOGIN_PASSWORD_LENGTH +s5_be45:: db ; be45 +s5_be46:: db ; be46 @@ -1569,10 +1569,10 @@ wOptions:: ; cfcc ; bit 7: battle scene off/on db wSaveFileExists:: db -wTextBoxFrame:: ; cfce +wTextboxFrame:: ; cfce ; bits 0-2: textbox frame 0-7 db -wTextBoxFlags:: +wTextboxFlags:: ; bit 0: 1-frame text delay ; bit 4: no text delay db @@ -2409,7 +2409,10 @@ wStartHour:: db ; d4b7 wStartMinute:: db ; d4b8 wStartSecond:: db ; d4b9 -wRTC:: ds 8 ; d4ba +wRTC:: ds 4 ; d4ba + + ds 4 + wDST:: ; d4c2 ; bit 7: dst db |