diff --git a/constants/wram_constants.asm b/constants/wram_constants.asm index edd5e5e10..f96d34061 100644 --- a/constants/wram_constants.asm +++ b/constants/wram_constants.asm @@ -56,7 +56,7 @@ DEF NUM_FRAMES EQU const_value ; wTextboxFlags:: const_def const FAST_TEXT_DELAY_F ; 0 - const NO_TEXT_DELAY_F ; 1 + const TEXT_DELAY_F ; 1 ; wGBPrinterBrightness:: DEF GBPRINTER_LIGHTEST EQU $00 diff --git a/data/maps/attributes.asm b/data/maps/attributes.asm index 1ec73b0cb..a60e17dc9 100644 --- a/data/maps/attributes.asm +++ b/data/maps/attributes.asm @@ -96,7 +96,9 @@ MACRO connection endc ENDM - map_attributes Level1_Map1, LEVEL_1_MAP_1, $ff, 0 + map_attributes Level1_Map1, LEVEL_1_MAP_1, $00, SOUTH | NORTH + connection south, Level1_Map1, LEVEL_1_MAP_1, 0 + connection north, Level1_Map1, LEVEL_1_MAP_1, 0 ; map_attributes NewBarkTown, NEW_BARK_TOWN, $05, WEST | EAST ; connection west, Route29, ROUTE_29, 0 diff --git a/engine/battle/ai/items.asm b/engine/battle/ai/items.asm index 7e5c5ef59..3cff6eb3a 100644 --- a/engine/battle/ai/items.asm +++ b/engine/battle/ai/items.asm @@ -697,7 +697,7 @@ AI_Switch: jr c, .skiptext ld hl, EnemyWithdrewText - call PrintText + call PrintText1bpp .skiptext ld a, 1 @@ -838,7 +838,7 @@ PrintText_UsedItemOn: ld bc, ITEM_NAME_LENGTH call CopyBytes ld hl, EnemyUsedOnText - jp PrintText + jp PrintText1bpp EnemyUsedOnText: text_far _EnemyUsedOnText diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 9713bc938..861818ce3 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -2716,7 +2716,7 @@ SetUpBattlePartyMenu_Loop: ; switch to fullscreen menu? JumpToPartyMenuAndPrintText: farcall WritePartyMenuTilemap - farcall PrintPartyMenuText + farcall PlacePartyMenuText call WaitBGMap call SetPalettes call DelayFrame @@ -4833,7 +4833,7 @@ BattleMenu_Pack: call UpdateBattleHUDs call WaitBGMap call LoadTilemapToTempTilemap - call ClearWindowData + call ClearMenuAndWindowData call FinishBattleAnim and a ret @@ -4844,7 +4844,7 @@ BattleMenu_Pack: ld a, [wBattleResult] and BATTLERESULT_BITMASK ld [wBattleResult], a ; WIN - call ClearWindowData + call ClearMenuAndWindowData call SetPalettes scf ret @@ -5144,7 +5144,7 @@ MoveSelectionScreen: ld b, 4 ld c, 14 .got_dims - call Textbox + call Textbox1bpp hlcoord 6, 17 - NUM_MOVES ld a, [wMoveSelectionMenuType] @@ -5423,7 +5423,7 @@ MoveInfoBox: hlcoord 0, 8 ld b, 3 ld c, 9 - call Textbox + call Textbox1bpp ld a, [wPlayerDisableCount] and a @@ -7126,7 +7126,7 @@ GiveExperiencePoints: hlcoord 9, 0 ld b, 10 ld c, 9 - call Textbox + call Textbox1bpp hlcoord 11, 1 ld bc, 4 predef PrintTempMonStats @@ -8686,7 +8686,7 @@ InitBattleDisplay: hlcoord 0, 12 ld b, 4 ld c, 18 - call Textbox + call Textbox1bpp hlcoord 1, 5 lb bc, 3, 7 call ClearBox diff --git a/engine/battle/start_battle.asm b/engine/battle/start_battle.asm index 42b8cde4e..e97b26567 100644 --- a/engine/battle/start_battle.asm +++ b/engine/battle/start_battle.asm @@ -167,7 +167,7 @@ ClearBattleRAM: callfar ResetEnemyStatLevels - call ClearWindowData + call ClearMenuAndWindowData ld hl, hBGMapAddress xor a ; LOW(vBGMap0) diff --git a/engine/battle/trainer_huds.asm b/engine/battle/trainer_huds.asm index 87218979c..d650f7a06 100644 --- a/engine/battle/trainer_huds.asm +++ b/engine/battle/trainer_huds.asm @@ -238,7 +238,7 @@ _ShowLinkBattleParticipants: hlcoord 2, 3 ld b, 9 ld c, 14 - call Textbox + call Textbox1bpp hlcoord 4, 5 ld de, wPlayerName call PlaceString diff --git a/engine/debug/debug_room.asm b/engine/debug/debug_room.asm index 2f6592145..e5a94e586 100644 --- a/engine/debug/debug_room.asm +++ b/engine/debug/debug_room.asm @@ -584,7 +584,7 @@ DebugRoom_EditPagedValues: hlcoord 0, 0 ld b, SCREEN_HEIGHT - 2 ld c, SCREEN_WIDTH - 2 - call Textbox + call Textbox1bpp hlcoord 8, 17 ld de, DebugRoom_PageString call PlaceString diff --git a/engine/events/buena.asm b/engine/events/buena.asm index 91f73ca72..3c936173c 100644 --- a/engine/events/buena.asm +++ b/engine/events/buena.asm @@ -69,7 +69,7 @@ BuenaPrize: call Buena_PlacePrizeMenuBox call Buena_DisplayBlueCardBalance ld hl, .BuenaAskWhichPrizeText - call PrintText + call PrintText1bpp jr .okay .loop @@ -139,7 +139,7 @@ BuenaPrize: call CloseWindow call CloseWindow ld hl, .BuenaComeAgainText - call PrintText + call PrintText1bpp call JoyWaitAorB call PlayClickSFX ret diff --git a/engine/events/bug_contest/caught_mon.asm b/engine/events/bug_contest/caught_mon.asm index 533eae2b1..ea8783010 100644 --- a/engine/events/bug_contest/caught_mon.asm +++ b/engine/events/bug_contest/caught_mon.asm @@ -15,7 +15,7 @@ BugContest_SetCaughtContestMon: ld [wNamedObjectIndex], a call GetPokemonName ld hl, .ContestCaughtMonText - call PrintText + call PrintText1bpp ret .generatestats diff --git a/engine/events/bug_contest/display_stats.asm b/engine/events/bug_contest/display_stats.asm index 02a5eebda..dcc95e8e9 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 Textbox1bpp hlcoord 0, 6 ld b, 4 ld c, 13 - call Textbox + call Textbox1bpp hlcoord 2, 0 ld de, .Stock @@ -68,7 +68,7 @@ DisplayCaughtContestMonStats: call PrintNum ld hl, ContestAskSwitchText - call PrintText + call PrintText1bpp pop af ld [wOptions], a @@ -93,7 +93,7 @@ ContestAskSwitchText: DisplayAlreadyCaughtText: call GetPokemonName ld hl, .ContestAlreadyCaughtText - jp PrintText + jp PrintText1bpp .ContestAlreadyCaughtText: text_far _ContestAlreadyCaughtText diff --git a/engine/events/bug_contest/judging.asm b/engine/events/bug_contest/judging.asm index e0eca3850..24835d84f 100644 --- a/engine/events/bug_contest/judging.asm +++ b/engine/events/bug_contest/judging.asm @@ -7,21 +7,21 @@ _BugContestJudging: ld [wNamedObjectIndex], a call GetPokemonName ld hl, ContestJudging_ThirdPlaceText - call PrintText + call PrintText2bpp ld a, [wBugContestSecondPlaceWinnerID] call LoadContestantName ld a, [wBugContestSecondPlaceMon] ld [wNamedObjectIndex], a call GetPokemonName ld hl, ContestJudging_SecondPlaceText - call PrintText + call PrintText2bpp ld a, [wBugContestFirstPlaceWinnerID] call LoadContestantName ld a, [wBugContestFirstPlaceMon] ld [wNamedObjectIndex], a call GetPokemonName ld hl, ContestJudging_FirstPlaceText - call PrintText + call PrintText2bpp jp BugContest_GetPlayersResult ContestJudging_FirstPlaceText: diff --git a/engine/events/daycare.asm b/engine/events/daycare.asm index 00675502b..ffbc6b89a 100644 --- a/engine/events/daycare.asm +++ b/engine/events/daycare.asm @@ -268,7 +268,7 @@ PrintDayCareText: ld a, [hli] ld h, [hl] ld l, a - call PrintText + call PrintText1bpp ret .TextTable: @@ -379,7 +379,7 @@ DayCareManOutside: bit DAYCAREMAN_HAS_EGG_F, [hl] jr nz, .AskGiveEgg ld hl, .NotYetText - call PrintText + call PrintText1bpp ret .NotYetText: @@ -388,7 +388,7 @@ DayCareManOutside: .AskGiveEgg: ld hl, .FoundAnEggText - call PrintText + call PrintText1bpp call YesNoBox jr c, .Declined ld a, [wPartyCount] @@ -399,7 +399,7 @@ DayCareManOutside: res DAYCAREMAN_HAS_EGG_F, [hl] call DayCare_InitBreeding ld hl, .ReceivedEggText - call PrintText + call PrintText1bpp ld de, SFX_GET_EGG call PlaySFX ld c, 120 @@ -411,14 +411,14 @@ DayCareManOutside: ld hl, .IllKeepItThanksText .Load0: - call PrintText + call PrintText1bpp xor a ; FALSE ld [wScriptVar], a ret .PartyFull: ld hl, .NoRoomForEggText - call PrintText + call PrintText1bpp ld a, TRUE ld [wScriptVar], a ret diff --git a/engine/events/elevator.asm b/engine/events/elevator.asm index 001122fb9..a2f5c6030 100644 --- a/engine/events/elevator.asm +++ b/engine/events/elevator.asm @@ -117,7 +117,7 @@ Elevator_GoToFloor: Elevator_AskWhichFloor: call LoadStandardMenuHeader ld hl, AskFloorElevatorText - call PrintText + call PrintText1bpp call Elevator_GetCurrentFloorText ld hl, Elevator_MenuHeader call CopyMenuHeader @@ -150,7 +150,7 @@ Elevator_GetCurrentFloorText: hlcoord 0, 0 ld b, 4 ld c, 8 - call Textbox + call Textbox1bpp hlcoord 1, 2 ld de, Elevator_CurrentFloorText call PlaceString diff --git a/engine/events/halloffame.asm b/engine/events/halloffame.asm index 02dd5a11a..574824eb7 100644 --- a/engine/events/halloffame.asm +++ b/engine/events/halloffame.asm @@ -457,10 +457,10 @@ DisplayHOFMon: call ByteFill hlcoord 0, 0 lb bc, 3, SCREEN_WIDTH - 2 - call Textbox + call Textbox1bpp hlcoord 0, 12 lb bc, 4, SCREEN_WIDTH - 2 - call Textbox + call Textbox1bpp ld a, [wTempMonSpecies] ld [wCurPartySpecies], a ld [wTextDecimalByte], a @@ -564,10 +564,10 @@ HOF_AnimatePlayerPic: ldh [hBGMapMode], a hlcoord 0, 2 lb bc, 8, 9 - call Textbox + call Textbox1bpp hlcoord 0, 12 lb bc, 4, 18 - call Textbox + call Textbox1bpp hlcoord 2, 4 ld de, wPlayerName call PlaceString diff --git a/engine/events/kurt.asm b/engine/events/kurt.asm index 9ce7f2e52..20e7d0a28 100644 --- a/engine/events/kurt.asm +++ b/engine/events/kurt.asm @@ -1,6 +1,6 @@ Kurt_PrintTextWhichApricorn: ld hl, .WhichApricornText - call PrintText + call PrintText1bpp ret .WhichApricornText: @@ -9,7 +9,7 @@ Kurt_PrintTextWhichApricorn: Kurt_PrintTextHowMany: ld hl, .HowManyShouldIMakeText - call PrintText + call PrintText1bpp ret .HowManyShouldIMakeText: diff --git a/engine/events/lucky_number.asm b/engine/events/lucky_number.asm index 609849474..f5443920c 100644 --- a/engine/events/lucky_number.asm +++ b/engine/events/lucky_number.asm @@ -116,7 +116,7 @@ CheckForLuckyNumberWinners: ld hl, .LuckyNumberMatchPCText .print - jp PrintText + jp PrintText2bpp .CompareLuckyNumberToMonID: push bc diff --git a/engine/events/magikarp.asm b/engine/events/magikarp.asm index 65031c783..03b8b00cc 100644 --- a/engine/events/magikarp.asm +++ b/engine/events/magikarp.asm @@ -29,7 +29,7 @@ CheckMagikarpLength: call CalcMagikarpLength call PrintMagikarpLength ld hl, .MagikarpGuruMeasureText - call PrintText + call PrintText2bpp ; Did we beat the record? ld hl, wMagikarpLength @@ -294,7 +294,7 @@ MagikarpHouseSign: ld [wMagikarpLength + 1], a call PrintMagikarpLength ld hl, .KarpGuruRecordText - call PrintText + call PrintText2bpp ret .KarpGuruRecordText: diff --git a/engine/events/mom.asm b/engine/events/mom.asm index 068877a32..48b1203c9 100644 --- a/engine/events/mom.asm +++ b/engine/events/mom.asm @@ -49,11 +49,11 @@ BankOfMom: .InitializeBank: ld hl, MomLeavingText1 - call PrintText + call PrintText1bpp call YesNoBox jr c, .DontSaveMoney ld hl, MomLeavingText2 - call PrintText + call PrintText1bpp ld a, (1 << MOM_ACTIVE_F) | (1 << MOM_SAVING_SOME_MONEY_F) jr .done_1 @@ -63,14 +63,14 @@ BankOfMom: .done_1 ld [wMomSavingMoney], a ld hl, MomLeavingText3 - call PrintText + call PrintText1bpp ld a, $8 ld [wJumptableIndex], a ret .IsThisAboutYourMoney: ld hl, MomIsThisAboutYourMoneyText - call PrintText + call PrintText1bpp call YesNoBox jr c, .nope ld a, $3 @@ -85,7 +85,7 @@ BankOfMom: .AccessBankOfMom: ld hl, MomBankWhatDoYouWantToDoText - call PrintText + call PrintText1bpp call LoadStandardMenuHeader ld hl, BankOfMom_MenuHeader call CopyMenuHeader @@ -121,7 +121,7 @@ BankOfMom: .StoreMoney: ld hl, MomStoreMoneyText - call PrintText + call PrintText1bpp xor a ld hl, wStringBuffer2 ld [hli], a @@ -164,18 +164,18 @@ BankOfMom: call PlaySFX call WaitSFX ld hl, MomStoredMoneyText - call PrintText + call PrintText1bpp ld a, $8 jr .done_4 .InsufficientFundsInWallet: ld hl, MomInsufficientFundsInWalletText - call PrintText + call PrintText1bpp ret .NotEnoughRoomInBank: ld hl, MomNotEnoughRoomInBankText - call PrintText + call PrintText1bpp ret .CancelDeposit: @@ -187,7 +187,7 @@ BankOfMom: .TakeMoney: ld hl, MomTakeMoneyText - call PrintText + call PrintText1bpp xor a ld hl, wStringBuffer2 ld [hli], a @@ -230,18 +230,18 @@ BankOfMom: call PlaySFX call WaitSFX ld hl, MomTakenMoneyText - call PrintText + call PrintText1bpp ld a, $8 jr .done_5 .InsufficientFundsInBank: ld hl, MomHaventSavedThatMuchText - call PrintText + call PrintText1bpp ret .NotEnoughRoomInWallet: ld hl, MomNotEnoughRoomInWalletText - call PrintText + call PrintText1bpp ret .CancelWithdraw: @@ -253,13 +253,13 @@ BankOfMom: .StopOrStartSavingMoney: ld hl, MomSaveMoneyText - call PrintText + call PrintText1bpp call YesNoBox jr c, .StopSavingMoney ld a, (1 << MOM_ACTIVE_F) | (1 << MOM_SAVING_SOME_MONEY_F) ld [wMomSavingMoney], a ld hl, MomStartSavingMoneyText - call PrintText + call PrintText1bpp ld a, $8 ld [wJumptableIndex], a ret @@ -273,7 +273,7 @@ BankOfMom: .JustDoWhatYouCan: ld hl, MomJustDoWhatYouCanText - call PrintText + call PrintText1bpp .AskDST: ld hl, wJumptableIndex @@ -292,7 +292,7 @@ Mom_ContinueMenuSetup: ldh [hBGMapMode], a hlcoord 0, 0 lb bc, 6, 18 - call Textbox + call Textbox1bpp hlcoord 1, 2 ld de, Mom_SavedString call PlaceString diff --git a/engine/events/move_deleter.asm b/engine/events/move_deleter.asm index 2d6841e47..581cbe214 100644 --- a/engine/events/move_deleter.asm +++ b/engine/events/move_deleter.asm @@ -1,10 +1,10 @@ MoveDeletion: ld hl, .DeleterIntroText - call PrintText + call PrintText1bpp call YesNoBox jr c, .declined ld hl, .DeleterAskWhichMonText - call PrintText + call PrintText1bpp farcall SelectMonFromParty jr c, .declined ld a, [wCurPartySpecies] @@ -18,7 +18,7 @@ MoveDeletion: and a jr z, .onlyonemove ld hl, .DeleterAskWhichMoveText - call PrintText + call PrintText1bpp call LoadStandardMenuHeader farcall ChooseMoveToDelete push af @@ -31,7 +31,7 @@ MoveDeletion: ld [wNamedObjectIndex], a call GetMoveName ld hl, .AskDeleteMoveText - call PrintText + call PrintText1bpp call YesNoBox pop bc jr c, .declined @@ -41,22 +41,22 @@ MoveDeletion: call PlaySFX call WaitSFX ld hl, .DeleterForgotMoveText - call PrintText + call PrintText1bpp ret .egg ld hl, .MailEggText - call PrintText + call PrintText1bpp ret .declined ld hl, .DeleterNoComeAgainText - call PrintText + call PrintText1bpp ret .onlyonemove ld hl, .MoveKnowsOneText - call PrintText + call PrintText1bpp ret .MoveKnowsOneText: diff --git a/engine/events/move_tutor.asm b/engine/events/move_tutor.asm index 12f314aaa..89fe671e7 100644 --- a/engine/events/move_tutor.asm +++ b/engine/events/move_tutor.asm @@ -72,7 +72,7 @@ CheckCanLearnMoveTutorMove: pop de ld a, BANK(TMHMNotCompatibleText) ld hl, TMHMNotCompatibleText - call FarPrintText + call FarPrintText1bpp jr .didnt_learn .can_learn diff --git a/engine/events/name_rater.asm b/engine/events/name_rater.asm index 9b6ae6bc9..197aeeeec 100644 --- a/engine/events/name_rater.asm +++ b/engine/events/name_rater.asm @@ -1,12 +1,12 @@ _NameRater: ; Introduce himself ld hl, NameRaterHelloText - call PrintText + call PrintText1bpp call YesNoBox jp c, .cancel ; Select a Pokemon from your party ld hl, NameRaterWhichMonText - call PrintText + call PrintText1bpp farcall SelectMonFromParty jr c, .cancel ; He can't rename an egg... @@ -19,12 +19,12 @@ _NameRater: jr c, .traded ; This name is good, but we can do better. How about it? ld hl, NameRaterBetterNameText - call PrintText + call PrintText1bpp call YesNoBox jr c, .cancel ; What name shall I give it then? ld hl, NameRaterWhatNameText - call PrintText + call PrintText1bpp ; Load the new nickname into wStringBuffer2 xor a ; PARTYMON ld [wMonType], a @@ -59,7 +59,7 @@ _NameRater: push hl call GetCurNickname ld hl, NameRaterNamedText - call PrintText + call PrintText1bpp pop hl jr .done @@ -75,7 +75,7 @@ _NameRater: ld hl, NameRaterEggText .done - call PrintText + call PrintText1bpp ret CheckIfMonIsYourOT: diff --git a/engine/events/npc_trade.asm b/engine/events/npc_trade.asm index b0c0c9dd5..160c0734e 100644 --- a/engine/events/npc_trade.asm +++ b/engine/events/npc_trade.asm @@ -35,14 +35,14 @@ NPCTrade:: call TradeFlagAction ld hl, NPCTradeCableText - call PrintText + call PrintText1bpp call DoNPCTrade call .TradeAnimation call GetTradeMonNames ld hl, TradedForText - call PrintText + call PrintText1bpp call RestartMapMusic @@ -400,7 +400,7 @@ PrintTradeText: ld a, [hli] ld h, [hl] ld l, a - call PrintText + call PrintText1bpp ret TradeTexts: diff --git a/engine/events/overworld.asm b/engine/events/overworld.asm index aa2e49411..006d3a093 100644 --- a/engine/events/overworld.asm +++ b/engine/events/overworld.asm @@ -620,7 +620,6 @@ FlyFunction: farcall RespawnPlayer call DelayFrame call UpdatePlayerSprite - call LoadOverworldFontAndFrame ret WaterfallFunction: diff --git a/engine/events/poisonstep.asm b/engine/events/poisonstep.asm index b7a1ce23a..2ba59b5c1 100644 --- a/engine/events/poisonstep.asm +++ b/engine/events/poisonstep.asm @@ -130,7 +130,7 @@ DoPoisonStep:: farcall ChangeHappiness farcall GetPartyNickname ld hl, .PoisonFaintText - call PrintText + call PrintText2bpp .mon_not_fainted pop de diff --git a/engine/events/poke_seer.asm b/engine/events/poke_seer.asm index c5c2b6958..ad7aefe5d 100644 --- a/engine/events/poke_seer.asm +++ b/engine/events/poke_seer.asm @@ -278,7 +278,7 @@ PrintSeerText: ld a, [hli] ld h, [hl] ld l, a - call PrintText + call PrintText2bpp ret SeerTexts: @@ -346,7 +346,7 @@ SeerAdvice: ld a, [hli] ld h, [hl] ld l, a - call PrintText + call PrintText2bpp ret SeerAdviceTexts: diff --git a/engine/events/pokecenter_pc.asm b/engine/events/pokecenter_pc.asm index d2e6ca83f..c5b9de90f 100644 --- a/engine/events/pokecenter_pc.asm +++ b/engine/events/pokecenter_pc.asm @@ -174,7 +174,7 @@ HallOfFamePC: TurnOffPC: ld hl, PokecenterPCOaksClosedText - call PrintText + call PrintText1bpp scf ret @@ -536,12 +536,12 @@ PlayerDepositItemMenu: call TossItem predef PartyMonItemName ld hl, .PlayersPCDepositItemsText - call PrintText + call PrintText1bpp ret .NoRoomInPC: ld hl, .PlayersPCNoRoomDepositText - call PrintText + call PrintText1bpp ret .DeclinedToDeposit: @@ -578,7 +578,7 @@ PCItemsJoypad: hlcoord 0, 0 ld b, 10 ld c, 18 - call Textbox + call Textbox1bpp ld a, [wPCItemsCursor] ld [wMenuCursorPosition], a ld a, [wPCItemsScrollPosition] diff --git a/engine/events/print_photo.asm b/engine/events/print_photo.asm index 056788b94..01512be6b 100644 --- a/engine/events/print_photo.asm +++ b/engine/events/print_photo.asm @@ -1,6 +1,6 @@ PhotoStudio: ld hl, .WhichMonPhotoText - call PrintText + call PrintText2bpp farcall SelectMonFromParty jr c, .cancel ld a, [wCurPartySpecies] @@ -8,7 +8,7 @@ PhotoStudio: jr z, .egg ld hl, .HoldStillText - call PrintText + call PrintText2bpp call DisableSpriteUpdates farcall PrintPartymon call ReturnToMapWithSpeechTextbox @@ -26,7 +26,7 @@ PhotoStudio: ld hl, .EggPhotoText .print_text - call PrintText + call PrintText2bpp ret .WhichMonPhotoText: diff --git a/engine/events/print_unown.asm b/engine/events/print_unown.asm index 3fac1c0fe..a71fd15bb 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 Textbox1bpp hlcoord 0, 5 lb bc, 7, 7 - call Textbox + call Textbox1bpp hlcoord 0, 14 lb bc, 2, 18 - call Textbox + call Textbox1bpp hlcoord 1, 2 ld de, AlphRuinsStampString diff --git a/engine/events/prof_oaks_pc.asm b/engine/events/prof_oaks_pc.asm index b272e3fb5..8001b1a94 100644 --- a/engine/events/prof_oaks_pc.asm +++ b/engine/events/prof_oaks_pc.asm @@ -6,14 +6,14 @@ ProfOaksPC: call ProfOaksPCBoot ; player chose "yes"? .shutdown ld hl, OakPCText4 - call PrintText + call PrintText1bpp call JoyWaitAorB call ExitMenu ret ProfOaksPCBoot: ld hl, OakPCText2 - call PrintText + call PrintText1bpp call Rate call PlaySFX ; sfx loaded by previous Rate function call call JoyWaitAorB @@ -45,13 +45,13 @@ Rate: ; print appropriate rating call .UpdateRatingBuffers ld hl, OakPCText3 - call PrintText + call PrintText1bpp call JoyWaitAorB ld a, [wTempPokedexCaughtCount] ld hl, OakRatings call FindOakRating push de - call PrintText + call PrintText1bpp pop de ret diff --git a/engine/events/specials.asm b/engine/events/specials.asm index b177d58fc..40f9ca5d1 100644 --- a/engine/events/specials.asm +++ b/engine/events/specials.asm @@ -201,7 +201,7 @@ CheckCoinsAndCoinCase: ld hl, .NoCoinCaseText .print - call PrintText + call PrintText2bpp scf ret diff --git a/engine/games/card_flip.asm b/engine/games/card_flip.asm index 74e5e671b..6086b6697 100644 --- a/engine/games/card_flip.asm +++ b/engine/games/card_flip.asm @@ -302,7 +302,7 @@ _CardFlip: ldh [hBGMapMode], a call CardFlip_ShuffleDeck ld hl, .CardFlipShuffledText - call PrintText + call PrintText1bpp jr .LoopAround .KeepTheCurrentDeck: @@ -475,7 +475,7 @@ CardFlip_UpdateCoinBalanceDisplay: hlcoord 0, 12 ld b, 4 ld c, SCREEN_WIDTH - 2 - call Textbox + call Textbox1bpp pop hl call PrintTextboxText call CardFlip_PrintCoinBalance @@ -485,7 +485,7 @@ CardFlip_PrintCoinBalance: hlcoord 9, 15 ld b, 1 ld c, 9 - call Textbox + call Textbox1bpp hlcoord 10, 16 ld de, .CoinStr call PlaceString @@ -511,7 +511,7 @@ CardFlip_InitTilemap: call CardFlip_CopyToBox hlcoord 0, 12 lb bc, 4, 18 - call Textbox + call Textbox1bpp ret CardFlip_FillGreenBox: diff --git a/engine/games/memory_game.asm b/engine/games/memory_game.asm index 489582ac6..a9bf3a821 100644 --- a/engine/games/memory_game.asm +++ b/engine/games/memory_game.asm @@ -289,7 +289,7 @@ MemoryGame_CheckMatch: add hl, de call MemoryGame_PlaceCard ld hl, .VictoryText - call PrintText + call PrintText1bpp ret .no_match @@ -305,7 +305,7 @@ MemoryGame_CheckMatch: call MemoryGame_PlaceCard ld hl, MemoryGameDarnText - call PrintText + call PrintText1bpp ret .VictoryText: @@ -457,7 +457,7 @@ MemoryGame_InitStrings: ld de, .japstr2 call PlaceString ld hl, .dummy_text - call PrintText + call PrintText1bpp ret .dummy_text diff --git a/engine/games/slot_machine.asm b/engine/games/slot_machine.asm index c36815a87..4d02ea302 100644 --- a/engine/games/slot_machine.asm +++ b/engine/games/slot_machine.asm @@ -1717,7 +1717,7 @@ Slots_TurnLightsOnOrOff: Slots_AskBet: .loop ld hl, .SlotsBetHowManyCoinsText - call PrintText + call PrintText1bpp ld hl, .MenuHeader call LoadMenuHeader call VerticalMenu @@ -1737,7 +1737,7 @@ Slots_AskBet: cp c jr nc, .Start ld hl, .SlotsNotEnoughCoinsText - call PrintText + call PrintText1bpp jr .loop .Start: @@ -1752,7 +1752,7 @@ Slots_AskBet: ld de, SFX_PAY_DAY call PlaySFX ld hl, .SlotsStartText - call PrintText + call PrintText1bpp and a ret @@ -1787,14 +1787,14 @@ Slots_AskPlayAgain: or [hl] jr nz, .you_have_coins ld hl, .SlotsRanOutOfCoinsText - call PrintText + call PrintText1bpp ld c, 60 call DelayFrames jr .exit_slots .you_have_coins ld hl, .SlotsPlayAgainText - call PrintText + call PrintText1bpp call LoadMenuTextbox lb bc, 14, 12 call PlaceYesNoBox @@ -1857,7 +1857,7 @@ Slots_PayoutText: cp SLOTS_NO_MATCH jr nz, .MatchedSomething ld hl, .SlotsDarnText - call PrintText + call PrintText1bpp ret .MatchedSomething: @@ -1880,7 +1880,7 @@ Slots_PayoutText: .return ld hl, .Text_PrintPayout - call PrintText + call PrintText1bpp ret .PayoutStrings: diff --git a/engine/gfx/dma_transfer.asm b/engine/gfx/dma_transfer.asm index 481fde909..9179a014e 100644 --- a/engine/gfx/dma_transfer.asm +++ b/engine/gfx/dma_transfer.asm @@ -57,7 +57,6 @@ ReloadMapPart:: ret OpenAndCloseMenu_HDMATransferTilemapAndAttrmap:: -; OpenText ld hl, .Function jp CallInSafeGFXMode diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm index 957b7fdab..a57825b28 100644 --- a/engine/items/item_effects.asm +++ b/engine/items/item_effects.asm @@ -237,7 +237,7 @@ PokeBallEffect: ld hl, wOptions res NO_TEXT_SCROLL, [hl] ld hl, ItemUsedText - call PrintText + call PrintText1bpp ld a, [wEnemyMonCatchRate] ld b, a @@ -503,7 +503,7 @@ PokeBallEffect: jp z, .FinishTutorial ld hl, Text_GotchaMonWasCaught - call PrintText + call PrintText1bpp call ClearSprites @@ -524,7 +524,7 @@ PokeBallEffect: jr z, .skip_pokedex ld hl, NewDexDataText - call PrintText + call PrintText1bpp call ClearSprites @@ -569,7 +569,7 @@ PokeBallEffect: .SkipPartyMonFriendBall: ld hl, AskGiveNicknameText - call PrintText + call PrintText1bpp ld a, [wCurPartySpecies] ld [wNamedObjectIndex], a @@ -629,7 +629,7 @@ PokeBallEffect: call CloseSRAM ld hl, AskGiveNicknameText - call PrintText + call PrintText1bpp ld a, [wCurPartySpecies] ld [wNamedObjectIndex], a @@ -672,7 +672,7 @@ PokeBallEffect: call CloseSRAM ld hl, BallSentToPCText - call PrintText + call PrintText1bpp call RotateThreePalettesRight call LoadStandardFont @@ -686,7 +686,7 @@ PokeBallEffect: ld hl, Text_GotchaMonWasCaught .shake_and_break_free - call PrintText + call PrintText1bpp call ClearSprites .return_from_capture @@ -1190,7 +1190,7 @@ VitaminEffect: call Play_SFX_FULL_HEAL ld hl, ItemStatRoseText - call PrintText + call PrintText1bpp ld c, HAPPINESS_USEDITEM farcall ChangeHappiness @@ -1199,7 +1199,7 @@ VitaminEffect: NoEffectMessage: ld hl, ItemWontHaveEffectText - call PrintText + call PrintText1bpp jp ClearPalettes UpdateStatsAfterItem: @@ -1341,7 +1341,7 @@ RareCandyEffect: hlcoord 9, 0 ld b, 10 ld c, 9 - call Textbox + call Textbox1bpp hlcoord 11, 1 ld bc, 4 @@ -1722,7 +1722,7 @@ ChooseMonToUseItemOn: farcall InitPartyMenuWithCancel farcall InitPartyMenuGFX farcall WritePartyMenuTilemap - farcall PrintPartyMenuText + farcall PlacePartyMenuText call WaitBGMap call SetPalettes call DelayFrame @@ -2073,7 +2073,7 @@ UseRepel: ld a, [wRepelEffect] and a ld hl, RepelUsedEarlierIsStillInEffectText - jp nz, PrintText + jp nz, PrintText1bpp ld a, b ld [wRepelEffect], a @@ -2189,9 +2189,9 @@ PokeFluteEffect: ld a, [wPokeFluteCuredSleep] and a ld hl, .PlayedFluteText - jp z, PrintText + jp z, PrintText1bpp ld hl, .PlayedTheFlute - call PrintText + call PrintText1bpp ld a, [wLowHealthAlarm] and 1 << DANGER_ON_F @@ -2199,7 +2199,7 @@ PokeFluteEffect: ; more code was dummied out here .dummy ld hl, .FluteWakeUpText - jp PrintText + jp PrintText1bpp .CureSleep: ld de, PARTYMON_STRUCT_LENGTH @@ -2305,7 +2305,7 @@ RestorePPEffect: ld hl, RestoreThePPOfWhichMoveText .ppup - call PrintText + call PrintText1bpp ld a, [wCurMoveNum] push af @@ -2346,7 +2346,7 @@ RestorePPEffect: .CantUsePPUpOnSketch: ld hl, PPIsMaxedOutText - call PrintText + call PrintText1bpp jr .loop2 .do_ppup @@ -2359,7 +2359,7 @@ RestorePPEffect: call Play_SFX_FULL_HEAL ld hl, PPsIncreasedText - call PrintText + call PrintText1bpp FinishPPRestore: call ClearPalettes @@ -2382,7 +2382,7 @@ BattleRestorePP: .not_in_battle call Play_SFX_FULL_HEAL ld hl, PPRestoredText - call PrintText + call PrintText1bpp jr FinishPPRestore .UpdateBattleMonPP: @@ -2557,7 +2557,7 @@ OpenBox: farcall SetSpecificDecorationFlag ld hl, .SentTrophyHomeText - call PrintText + call PrintText1bpp jp UseDisposableItem @@ -2577,7 +2577,7 @@ Play_SFX_FULL_HEAL: UseItemText: ld hl, ItemUsedText - call PrintText + call PrintText1bpp call Play_SFX_FULL_HEAL call WaitPressAorB_BlinkCursor UseDisposableItem: @@ -2599,14 +2599,14 @@ UseBallInTrainerBattle: ld [wNumHits], a predef PlayBattleAnim ld hl, BallBlockedText - call PrintText + call PrintText1bpp ld hl, BallDontBeAThiefText - call PrintText + call PrintText1bpp jr UseDisposableItem WontHaveAnyEffect_NotUsedMessage: ld hl, ItemWontHaveEffectText - call PrintText + call PrintText1bpp ; Item wasn't used. ld a, $2 @@ -2615,11 +2615,11 @@ WontHaveAnyEffect_NotUsedMessage: LooksBitterMessage: ld hl, ItemLooksBitterText - jp PrintText + jp PrintText1bpp Ball_BoxIsFullMessage: ld hl, BallBoxFullText - call PrintText + call PrintText1bpp ; Item wasn't used. ld a, $2 @@ -2654,7 +2654,7 @@ CantUseItemMessage: ; Item couldn't be used. xor a ld [wItemEffectSucceeded], a - jp PrintText + jp PrintText1bpp ItemLooksBitterText: text_far _ItemLooksBitterText diff --git a/engine/items/mart.asm b/engine/items/mart.asm index 11e44e3b8..f9f1256bc 100644 --- a/engine/items/mart.asm +++ b/engine/items/mart.asm @@ -163,7 +163,7 @@ StandardMart: .HowMayIHelpYou: call LoadStandardMenuHeader ld hl, MartWelcomeText - call PrintText + call PrintText1bpp ld a, STANDARDMART_TOPMENU ret @@ -211,7 +211,7 @@ StandardMart: .AnythingElse: call LoadStandardMenuHeader ld hl, MartAskMoreText - call PrintText + call PrintText1bpp ld a, STANDARDMART_TOPMENU ret @@ -364,7 +364,7 @@ LoadBuyMenuText: ld a, [hli] ld h, [hl] ld l, a - call PrintText + call PrintText1bpp ret MartAskPurchaseQuantity: @@ -441,7 +441,7 @@ BuyMenuLoop: ld [wMenuScrollPositionBackup], a ld a, [wMenuCursorY] ld [wMenuCursorPositionBackup], a - call SpeechTextbox + call SpeechTextbox1bpp ld a, [wMenuJoypad] cp B_BUTTON jr z, .set_carry @@ -476,7 +476,7 @@ BuyMenuLoop: call JoyWaitAorB .cancel - call SpeechTextbox + call SpeechTextbox1bpp and a ret @@ -758,13 +758,13 @@ SellMenu: and a jr z, .okay_to_sell ld hl, MartCantBuyText - call PrintText + call PrintText1bpp and a ret .okay_to_sell ld hl, MartSellHowManyText - call PrintText + call PrintText1bpp farcall PlaceMoneyAtTopLeftOfTextbox farcall SelectQuantityToSell call ExitMenu diff --git a/engine/items/pack.asm b/engine/items/pack.asm index d23d9d9e3..3aa576535 100644 --- a/engine/items/pack.asm +++ b/engine/items/pack.asm @@ -572,7 +572,7 @@ GiveItem: farcall InitPartyMenuGFX .loop farcall WritePartyMenuTilemap - farcall PrintPartyMenuText + farcall PlacePartyMenuText call WaitBGMap call SetPalettes call DelayFrame @@ -582,7 +582,7 @@ GiveItem: cp EGG jr nz, .give ld hl, .AnEggCantHoldAnItemText - call PrintText + call PrintText1bpp jr .loop .give @@ -1200,7 +1200,7 @@ Pack_PrintTextNoScroll: push af set NO_TEXT_SCROLL, a ld [wOptions], a - call PrintText + call PrintText1bpp pop af ld [wOptions], a ret @@ -1357,7 +1357,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 Textbox1bpp call EnableLCD call DrawPackGFX ret diff --git a/engine/items/tmhm.asm b/engine/items/tmhm.asm index ae858d631..523e3bf53 100644 --- a/engine/items/tmhm.asm +++ b/engine/items/tmhm.asm @@ -60,9 +60,9 @@ AskTeachTMHM: jr c, .TM ld hl, BootedHMText ; Booted up an HM .TM: - call PrintText + call PrintText1bpp ld hl, ContainedMoveText - call PrintText + call PrintText1bpp call YesNoBox .NotTMHM: pop bc @@ -84,7 +84,7 @@ ChooseMonToLearnTMHM_NoRefresh: ld [wPartyMenuActionText], a .loopback farcall WritePartyMenuTilemap - farcall PrintPartyMenuText + farcall PlacePartyMenuText call WaitBGMap call SetPalettes call DelayFrame @@ -133,7 +133,7 @@ TeachTMHM: call PlaySFX pop de ld hl, TMHMNotCompatibleText - call PrintText + call PrintText1bpp jr .nope .compatible @@ -242,7 +242,7 @@ TMHM_ShowTMMoveDescription: hlcoord 0, 12 ld b, 4 ld c, SCREEN_WIDTH - 2 - call Textbox + call Textbox1bpp ld a, [wCurItem] cp NUM_TMS + NUM_HMS + 1 jr nc, TMHM_JoypadLoop @@ -491,7 +491,7 @@ VerboseReceiveTMHM: ; unreferenced jr nc, .print ld hl, .ReceivedTMHMText .print - jp PrintText + jp PrintText1bpp .NoRoomTMHMText: text_far _NoRoomTMHMText diff --git a/engine/items/update_item_description.asm b/engine/items/update_item_description.asm index da56732a2..02b13ac7a 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 Textbox1bpp ld a, [wMenuSelection] cp -1 ret z diff --git a/engine/link/link.asm b/engine/link/link.asm index 36c30e17d..b82e3d03d 100644 --- a/engine/link/link.asm +++ b/engine/link/link.asm @@ -522,7 +522,7 @@ LinkTimeout: pop de pop hl bccoord 1, 14 - call PlaceHLTextAtBC + call PrintHLTextAtBC call RotateThreePalettesRight call ClearScreen ld b, CGB_DIPLOMA @@ -1465,7 +1465,7 @@ LinkTrade_TradeStatsMenu: farcall Link_WaitBGMap ld hl, .LinkTradeCantBattleText bccoord 1, 14 - call PlaceHLTextAtBC + call PrintHLTextAtBC jr .cancel_trade .abnormal @@ -1487,7 +1487,7 @@ LinkTrade_TradeStatsMenu: farcall Link_WaitBGMap ld hl, .LinkAbnormalMonText bccoord 1, 14 - call PlaceHLTextAtBC + call PrintHLTextAtBC .cancel_trade hlcoord 0, 12 @@ -1660,7 +1660,7 @@ LinkTrade: call GetPokemonName ld hl, LinkAskTradeForText bccoord 1, 14 - call PlaceHLTextAtBC + call PrintHLTextAtBC call LoadStandardMenuHeader hlcoord 10, 7 ld b, 3 diff --git a/engine/link/place_waiting_text.asm b/engine/link/place_waiting_text.asm index dc1fe215c..ebf28e441 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 Textbox1bpp jr .proceed .notinbattle diff --git a/engine/menus/delete_save.asm b/engine/menus/delete_save.asm index 467d66209..3f1788a8d 100644 --- a/engine/menus/delete_save.asm +++ b/engine/menus/delete_save.asm @@ -7,7 +7,7 @@ _DeleteSaveData: ld de, MUSIC_MAIN_MENU call PlayMusic ld hl, .ClearAllSaveDataText - call PrintText + call PrintText1bpp ld hl, .NoYesMenuHeader call CopyMenuHeader call VerticalMenu diff --git a/engine/menus/init_gender.asm b/engine/menus/init_gender.asm index 2ef9cc344..7713dd793 100644 --- a/engine/menus/init_gender.asm +++ b/engine/menus/init_gender.asm @@ -23,7 +23,7 @@ InitGender: call WaitBGMap2 call SetPalettes ld hl, AreYouABoyOrAreYouAGirlText - call PrintText + call PrintText1bpp ld hl, .MenuHeader call LoadMenuHeader call WaitBGMap2 diff --git a/engine/menus/intro_menu.asm b/engine/menus/intro_menu.asm index 0501375d4..73186c09a 100644 --- a/engine/menus/intro_menu.asm +++ b/engine/menus/intro_menu.asm @@ -42,7 +42,7 @@ NewGame_ClearTilemapEtc: call ClearTilemap call LoadFrame call LoadStandardFont - call ClearWindowData + call ClearMenuAndWindowData ret Option: @@ -535,7 +535,7 @@ OakSpeech: call Intro_RotatePalettesLeftFrontpic ld hl, OakText1 - call PrintText + call PrintText1bpp call RotateThreePalettesRight call ClearTilemap @@ -556,9 +556,9 @@ OakSpeech: call Intro_WipeInFrontpic ld hl, OakText2 - call PrintText + call PrintText1bpp ld hl, OakText4 - call PrintText + call PrintText1bpp call RotateThreePalettesRight call ClearTilemap @@ -573,7 +573,7 @@ OakSpeech: call Intro_RotatePalettesLeftFrontpic ld hl, OakText5 - call PrintText + call PrintText1bpp call RotateThreePalettesRight call ClearTilemap @@ -586,10 +586,10 @@ OakSpeech: call Intro_RotatePalettesLeftFrontpic ld hl, OakText6 - call PrintText + call PrintText1bpp call NamePlayer ld hl, OakText7 - call PrintText + call PrintText1bpp ret OakText1: @@ -1124,7 +1124,7 @@ CopyrightString: GameInit:: farcall TryLoadSaveData - call ClearWindowData + call ClearMenuAndWindowData call ClearBGPalettes call ClearTilemap ld a, HIGH(vBGMap0) diff --git a/engine/menus/main_menu.asm b/engine/menus/main_menu.asm index 1e85037f2..0f48fb1ec 100644 --- a/engine/menus/main_menu.asm +++ b/engine/menus/main_menu.asm @@ -147,7 +147,7 @@ MainMenu_PrintCurrentTimeAndDay: hlcoord 0, 14 ld b, 2 ld c, 18 - call Textbox + call Textbox1bpp ret .PlaceTime: @@ -212,7 +212,7 @@ ClearTilemapEtc: call ClearTilemap call LoadFrame call LoadStandardFont - call ClearWindowData + call ClearMenuAndWindowData ret MainMenu_NewGame: diff --git a/engine/menus/menu.asm b/engine/menus/menu.asm index 6b65c895f..3ca69d89e 100644 --- a/engine/menus/menu.asm +++ b/engine/menus/menu.asm @@ -647,7 +647,7 @@ RestoreOverworldMapTiles: ; unreferenced Error_Cant_ExitMenu: ld hl, .WindowPoppingErrorText - call PrintText + call PrintText1bpp call WaitBGMap .infinite_loop jr .infinite_loop diff --git a/engine/menus/menu_2.asm b/engine/menus/menu_2.asm index 8fa4845aa..b07769da0 100644 --- a/engine/menus/menu_2.asm +++ b/engine/menus/menu_2.asm @@ -69,7 +69,7 @@ DisplayCoinCaseBalance: hlcoord 11, 0 ld b, 1 ld c, 7 - call Textbox + call Textbox1bpp 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 Textbox1bpp hlcoord 6, 1 ld de, MoneyString call PlaceString @@ -118,7 +118,7 @@ StartMenu_PrintSafariGameStatus: ; unreferenced hlcoord 0, 0 ld b, 3 ld c, 7 - call Textbox + call Textbox1bpp hlcoord 1, 1 ld de, wSafariTimeRemaining lb bc, 2, 3 @@ -146,7 +146,7 @@ StartMenu_DrawBugContestStatusBox: hlcoord 0, 0 ld b, 5 ld c, 17 - call Textbox + call Textbox1bpp ret StartMenu_PrintBugContestStatus: diff --git a/engine/menus/options_menu.asm b/engine/menus/options_menu.asm index df7e17132..297459169 100644 --- a/engine/menus/options_menu.asm +++ b/engine/menus/options_menu.asm @@ -20,7 +20,7 @@ _Option: hlcoord 0, 0 ld b, SCREEN_HEIGHT - 2 ld c, SCREEN_WIDTH - 2 - call Textbox + call Textbox1bpp hlcoord 2, 2 ld de, StringOptions call PlaceString diff --git a/engine/menus/save.asm b/engine/menus/save.asm index 776b3e772..ad0554dad 100644 --- a/engine/menus/save.asm +++ b/engine/menus/save.asm @@ -1,7 +1,7 @@ SaveMenu: call LoadStandardMenuHeader farcall DisplaySaveInfoOnSave - call SpeechTextbox + call SpeechTextbox2bpp call UpdateSprites farcall SaveMenu_CopyTilemapAtOnce ld hl, WouldYouLikeToSaveTheGameText @@ -18,7 +18,6 @@ SaveMenu: .refused call ExitMenu - call GSReloadPalettes farcall SaveMenu_CopyTilemapAtOnce scf ret @@ -209,7 +208,6 @@ SaveTheGame_yesorno: dec a call CloseWindow push af - call GSReloadPalettes pop af and a ret @@ -244,7 +242,7 @@ SavedTheGame: ld [wOptions], a ; saved the game! ld hl, SavedTheGameText - call PrintText + call PrintText1bpp ; restore the original text speed setting pop af ld [wOptions], a @@ -328,7 +326,7 @@ SavingDontTurnOffThePower: ld [wOptions], a ; SAVING... DON'T TURN OFF THE POWER. ld hl, SavingDontTurnOffThePowerText - call PrintText + call PrintText1bpp ; Restore the text speed setting pop af ld [wOptions], a @@ -536,7 +534,7 @@ TryLoadSaveFile: set NO_TEXT_SCROLL, a ld [wOptions], a ld hl, SaveFileCorruptedText - call PrintText + call PrintText1bpp pop af ld [wOptions], a scf diff --git a/engine/menus/scrolling_menu.asm b/engine/menus/scrolling_menu.asm index 7e9d41933..5f63edc60 100644 --- a/engine/menus/scrolling_menu.asm +++ b/engine/menus/scrolling_menu.asm @@ -78,11 +78,6 @@ ScrollingMenuJoyAction: jp nz, .d_down jr .loop -.no_zero_no_carry ; unreferenced - ld a, -1 - and a - ret - .a_button call PlaceHollowCursor ld a, [wMenuCursorY] diff --git a/engine/menus/start_menu.asm b/engine/menus/start_menu.asm index 44fccd63d..6d9ceb60e 100644 --- a/engine/menus/start_menu.asm +++ b/engine/menus/start_menu.asm @@ -11,7 +11,7 @@ const STARTMENUITEM_QUIT ; 8 StartMenu:: - call ClearWindowData + call ClearMenuAndWindowData ld de, SFX_MENU call PlaySFX @@ -34,7 +34,7 @@ StartMenu:: call .DrawBugContestStatusBox call SafeUpdateSprites call _OpenAndCloseMenu_HDMATransferTilemapAndAttrmap - farcall LoadFonts_NoOAMUpdate + farcall LoadFont_NoOAMUpdate call .DrawBugContestStatus call UpdateTimePals jr .Select @@ -151,7 +151,6 @@ StartMenu:: call DrawVariableLengthMenuBox call .DrawBugContestStatus call UpdateSprites - call GSReloadPalettes call FinishExitMenu ret @@ -512,7 +511,7 @@ StartMenu_Pokemon: .menunoreload farcall WritePartyMenuTilemap - farcall PrintPartyMenuText + farcall PlacePartyMenuText call WaitBGMap call SetPalettes ; load regular palettes? call DelayFrame diff --git a/engine/movie/init_hof_credits.asm b/engine/movie/init_hof_credits.asm index 11164ed79..36bee39ed 100644 --- a/engine/movie/init_hof_credits.asm +++ b/engine/movie/init_hof_credits.asm @@ -18,7 +18,7 @@ InitDisplayForHallOfFame: ldh [hSCX], a call EnableLCD ld hl, .SavingRecordText - call PrintText + call PrintText1bpp call WaitBGMap2 call SetPalettes ret diff --git a/engine/movie/trade_animation.asm b/engine/movie/trade_animation.asm index a71c5b575..132dd1373 100644 --- a/engine/movie/trade_animation.asm +++ b/engine/movie/trade_animation.asm @@ -927,7 +927,7 @@ TrademonStats_MonTemplate: hlcoord 3, 0 ld b, $6 ld c, $d - call Textbox + call Textbox1bpp hlcoord 4, 0 ld de, .OTMonData call PlaceString @@ -947,7 +947,7 @@ TrademonStats_Egg: hlcoord 3, 0 ld b, 6 ld c, 13 - call Textbox + call Textbox1bpp hlcoord 4, 2 ld de, .EggData call PlaceString @@ -1167,11 +1167,11 @@ TradeAnim_SentToOTText: cp LINK_TIMECAPSULE jr z, .time_capsule ld hl, .MonNameSentToText - call PrintText + call PrintText1bpp ld c, 189 call DelayFrames ld hl, .MonWasSentToText - call PrintText + call PrintText1bpp call TradeAnim_Wait80Frames ld c, 128 call DelayFrames @@ -1180,7 +1180,7 @@ TradeAnim_SentToOTText: .time_capsule ld hl, .MonWasSentToText - call PrintText + call PrintText1bpp call TradeAnim_Wait80Frames call TradeAnim_AdvanceScriptPointer ret @@ -1195,10 +1195,10 @@ TradeAnim_SentToOTText: TradeAnim_OTBidsFarewell: ld hl, .BidsFarewellToMonText - call PrintText + call PrintText1bpp call TradeAnim_Wait80Frames ld hl, .MonNameBidsFarewellText - call PrintText + call PrintText1bpp call TradeAnim_Wait80Frames call TradeAnim_AdvanceScriptPointer ret @@ -1219,7 +1219,7 @@ TradeAnim_TakeCareOfText: call ByteFill call WaitBGMap ld hl, .TakeGoodCareOfMonText - call PrintText + call PrintText1bpp call TradeAnim_Wait80Frames call TradeAnim_AdvanceScriptPointer ret @@ -1230,10 +1230,10 @@ TradeAnim_TakeCareOfText: TradeAnim_OTSendsText1: ld hl, .ForYourMonSendsText - call PrintText + call PrintText1bpp call TradeAnim_Wait80Frames ld hl, .OTSendsText - call PrintText + call PrintText1bpp call TradeAnim_Wait80Frames ld c, 14 call DelayFrames @@ -1250,10 +1250,10 @@ TradeAnim_OTSendsText1: TradeAnim_OTSendsText2: ld hl, .WillTradeText - call PrintText + call PrintText1bpp call TradeAnim_Wait80Frames ld hl, .ForYourMonWillTradeText - call PrintText + call PrintText1bpp call TradeAnim_Wait80Frames ld c, 14 call DelayFrames diff --git a/engine/overworld/init_map.asm b/engine/overworld/init_map.asm index 87102a2bf..865a634e7 100644 --- a/engine/overworld/init_map.asm +++ b/engine/overworld/init_map.asm @@ -56,24 +56,20 @@ ReanchorBGMap_NoOAMUpdate:: ldh [hBGMapAddress], a ret -LoadFonts_NoOAMUpdate:: +LoadFont_NoOAMUpdate:: ldh a, [hOAMUpdate] push af ld a, $1 ldh [hOAMUpdate], a - call .LoadGFX - - pop af - ldh [hOAMUpdate], a - ret - -.LoadGFX: call LoadFrame ld a, $90 ldh [hWY], a call SafeUpdateSprites call LoadStandardFont + + pop af + ldh [hOAMUpdate], a ret HDMATransfer_FillBGMap0WithBlack: diff --git a/engine/overworld/scripting.asm b/engine/overworld/scripting.asm index a549918fb..ff27a751d 100644 --- a/engine/overworld/scripting.asm +++ b/engine/overworld/scripting.asm @@ -383,6 +383,8 @@ Script_promptbutton: ret Script_yesorno: + ld a, TRUE + ld [wMenuBoxUse2bppFrame], a call YesNoBox ld a, FALSE jr c, .no @@ -423,6 +425,8 @@ Script_closepokepic: ret Script_verticalmenu: + ld a, TRUE + ld [wMenuBoxUse2bppFrame], a ld a, [wScriptBank] ld hl, VerticalMenu rst FarCall @@ -434,6 +438,8 @@ Script_verticalmenu: ret Script__2dmenu: + ld a, TRUE + ld [wMenuBoxUse2bppFrame], a ld a, [wScriptBank] ld hl, _2DMenu rst FarCall @@ -445,7 +451,11 @@ Script__2dmenu: ret Script_battletowertext: - call SetUpTextbox + push hl + call SpeechTextbox2bpp + call UpdateSprites + call ApplyTilemap + pop hl call GetScriptByte ret @@ -2188,7 +2198,7 @@ Script_reloadend: jp Script_end Script_opentext: - call OpenText + call OpenText2bpp ret Script_refreshscreen: diff --git a/engine/overworld/select_menu.asm b/engine/overworld/select_menu.asm index bdd3633ed..4b678fd07 100644 --- a/engine/overworld/select_menu.asm +++ b/engine/overworld/select_menu.asm @@ -4,7 +4,7 @@ SelectMenu:: jp UseRegisteredItem .NotRegistered: - call OpenText + call OpenText2bpp ld b, BANK(MayRegisterItemText) ld hl, MayRegisterItemText call MapTextbox @@ -125,14 +125,14 @@ UseRegisteredItem: dw .Overworld .NoFunction: - call OpenText + call OpenText2bpp call CantUseItem call CloseText and a ret .Current: - call OpenText + call OpenText2bpp call DoItemEffect call CloseText and a diff --git a/engine/overworld/warp_connection.asm b/engine/overworld/warp_connection.asm index ac271486d..be5b9f509 100644 --- a/engine/overworld/warp_connection.asm +++ b/engine/overworld/warp_connection.asm @@ -287,7 +287,6 @@ LoadMapGraphics: xor a ldh [hTileAnimFrame], a farcall RefreshSprites - call LoadFrame call LoadOverworldFontAndFrame ret diff --git a/engine/overworld/wildmons.asm b/engine/overworld/wildmons.asm index a08557cb3..d258d96ea 100644 --- a/engine/overworld/wildmons.asm +++ b/engine/overworld/wildmons.asm @@ -816,7 +816,7 @@ RandomUnseenWildMon: ld [wNamedObjectIndex], a call GetPokemonName ld hl, .JustSawSomeRareMonText - call PrintText + call PrintText2bpp xor a ld [wScriptVar], a ret diff --git a/engine/phone/phone.asm b/engine/phone/phone.asm index 1b0521fc2..36e21fdc6 100644 --- a/engine/phone/phone.asm +++ b/engine/phone/phone.asm @@ -519,7 +519,7 @@ HangUp_ShutDown: ; unreferenced HangUp_Beep: ld hl, PhoneClickText - call PrintText + call PrintText2bpp ld de, SFX_HANG_UP call PlaySFX ret @@ -530,7 +530,7 @@ PhoneClickText: HangUp_BoopOn: ld hl, PhoneEllipseText - call PrintText + call PrintText2bpp ret PhoneEllipseText: @@ -538,7 +538,7 @@ PhoneEllipseText: text_end HangUp_BoopOff: - call SpeechTextbox + call SpeechTextbox2bpp ret Phone_StartRinging: @@ -576,7 +576,7 @@ Phone_CallerTextbox: hlcoord 0, 0 ld b, 2 ld c, SCREEN_WIDTH - 2 - call Textbox + call Textbox1bpp ret GetCallerClassAndName: diff --git a/engine/pokegear/pokegear.asm b/engine/pokegear/pokegear.asm index 18e6c8fdb..a94342e96 100644 --- a/engine/pokegear/pokegear.asm +++ b/engine/pokegear/pokegear.asm @@ -274,7 +274,7 @@ InitPokegearTilemap: call PlaceString hlcoord 0, 12 lb bc, 4, 18 - call Textbox + call Textbox1bpp ret .switch @@ -300,7 +300,7 @@ InitPokegearTilemap: call Pokegear_LoadTilemapRLE hlcoord 0, 12 lb bc, 4, 18 - call Textbox + call Textbox1bpp ret .Phone: @@ -308,7 +308,7 @@ InitPokegearTilemap: call Pokegear_LoadTilemapRLE hlcoord 0, 12 lb bc, 4, 18 - call Textbox + call Textbox1bpp call .PlacePhoneBars call PokegearPhone_UpdateDisplayList ret @@ -400,7 +400,7 @@ PokegearJumptable: PokegearClock_Init: call InitPokegearTilemap ld hl, PokegearPressButtonText - call PrintText + call PrintText1bpp ld hl, wJumptableIndex inc [hl] call ExitPokegearRadio_HandleMusic @@ -698,7 +698,7 @@ PokegearPhone_Init: call InitPokegearTilemap call ExitPokegearRadio_HandleMusic ld hl, PokegearAskWhoCallText - call PrintText + call PrintText1bpp ret PokegearPhone_Joypad: @@ -788,12 +788,12 @@ PokegearPhone_MakePhoneCall: ld de, SFX_CALL call PlaySFX ld hl, .GearEllipseText - call PrintText + call PrintText1bpp call WaitSFX ld de, SFX_CALL call PlaySFX ld hl, .GearEllipseText - call PrintText + call PrintText1bpp call WaitSFX ld a, [wPokegearPhoneSelectedPerson] ld b, a @@ -812,11 +812,11 @@ PokegearPhone_MakePhoneCall: .no_service farcall Phone_NoSignal ld hl, .GearOutOfServiceText - call PrintText + call PrintText1bpp ld a, POKEGEARSTATE_PHONEJOYPAD ld [wJumptableIndex], a ld hl, PokegearAskWhoCallText - call PrintText + call PrintText1bpp ret .GearEllipseText: @@ -835,7 +835,7 @@ PokegearPhone_FinishPhoneCall: ld a, POKEGEARSTATE_PHONEJOYPAD ld [wJumptableIndex], a ld hl, PokegearAskWhoCallText - call PrintText + call PrintText1bpp ret PokegearPhone_GetDPad: @@ -1017,7 +1017,7 @@ PokegearPhoneContactSubmenu: ld b, a ld c, 8 push de - call Textbox + call Textbox1bpp pop de pop hl inc hl @@ -1086,7 +1086,7 @@ PokegearPhoneContactSubmenu: .Cancel: ld hl, PokegearAskWhoCallText - call PrintText + call PrintText1bpp scf ret @@ -1101,7 +1101,7 @@ PokegearPhoneContactSubmenu: ldh [hBGMapMode], a call PokegearPhone_UpdateDisplayList ld hl, PokegearAskWhoCallText - call PrintText + call PrintText1bpp call WaitBGMap .CancelDelete: scf @@ -1565,7 +1565,7 @@ NoRadioName: call ClearBox hlcoord 0, 12 lb bc, 4, 18 - call Textbox + call Textbox1bpp ret OaksPKMNTalkName: db "OAK's Talk@" @@ -1775,7 +1775,7 @@ PlayRadio: push de hlcoord 0, 12 lb bc, 4, 18 - call Textbox + call Textbox1bpp hlcoord 1, 14 ld [hl], "“" pop de diff --git a/engine/pokegear/radio.asm b/engine/pokegear/radio.asm index 8c2c38739..6f1bfe52d 100644 --- a/engine/pokegear/radio.asm +++ b/engine/pokegear/radio.asm @@ -129,7 +129,7 @@ PrintRadioLine: cp 2 jr nz, .print bccoord 1, 16 - call PlaceHLTextAtBC + call PrintHLTextAtBC jr .skip .print call PrintTextboxText @@ -538,10 +538,10 @@ OaksPKMNTalk9: OaksPKMNTalk10: farcall RadioMusicRestartPokemonChannel ld hl, OPT_RestartText - call PrintText + call PrintText1bpp call WaitBGMap ld hl, OPT_PokemonChannelText - call PrintText + call PrintText1bpp ld a, OAKS_POKEMON_TALK_11 ld [wCurRadioLine], a ld a, 100 @@ -598,7 +598,7 @@ OaksPKMNTalk14: ld de, MUSIC_POKEMON_TALK callfar RadioMusicRestartDE ld hl, .terminator - call PrintText + call PrintText1bpp ld a, OAKS_POKEMON_TALK_4 ld [wNextRadioLine], a xor a @@ -858,7 +858,7 @@ BenFernMusic7: StartPokemonMusicChannel: call RadioTerminator - call PrintText + call PrintText1bpp ld de, MUSIC_POKEMON_MARCH call GetWeekday and 1 @@ -1792,7 +1792,7 @@ StartRadioStation: and a ret nz call RadioTerminator - call PrintText + call PrintText1bpp ld hl, RadioChannelSongs ld a, [wCurRadioLine] ld c, a diff --git a/engine/pokemon/bills_pc.asm b/engine/pokemon/bills_pc.asm index 13a85dc4a..add4bc7b1 100644 --- a/engine/pokemon/bills_pc.asm +++ b/engine/pokemon/bills_pc.asm @@ -960,7 +960,7 @@ BillsPC_PlaceString: push de hlcoord 0, 15 lb bc, 1, 18 - call Textbox + call Textbox1bpp pop de hlcoord 1, 16 call PlaceString @@ -977,7 +977,7 @@ BillsPC_MoveMonWOMail_BoxNameAndArrows: BillsPC_BoxName: hlcoord 8, 0 lb bc, 1, 10 - call Textbox + call Textbox1bpp ld a, [wBillsPC_LoadedBox] and a @@ -1216,7 +1216,7 @@ BillsPC_LoadMonStats: BillsPC_RefreshTextboxes: hlcoord 8, 2 lb bc, 10, 10 - call Textbox + call Textbox1bpp hlcoord 8, 2 ld [hl], "└" @@ -1771,7 +1771,7 @@ DepositPokemon: call ClearBox hlcoord 0, 15 lb bc, 1, 18 - call Textbox + call Textbox1bpp call WaitBGMap hlcoord 1, 16 ld de, PCString_Stored @@ -1826,7 +1826,7 @@ TryWithdrawPokemon: call ClearBox hlcoord 0, 15 lb bc, 1, 18 - call Textbox + call Textbox1bpp call WaitBGMap hlcoord 1, 16 ld de, PCString_Got @@ -1862,7 +1862,7 @@ ReleasePKMN_ByePKMN: call ClearBox hlcoord 0, 15 lb bc, 1, 18 - call Textbox + call Textbox1bpp call WaitBGMap ld a, [wCurPartySpecies] @@ -1883,7 +1883,7 @@ ReleasePKMN_ByePKMN: call DelayFrames hlcoord 0, 15 lb bc, 1, 18 - call Textbox + call Textbox1bpp hlcoord 1, 16 ld de, PCString_Bye call PlaceString @@ -1906,7 +1906,7 @@ MovePKMNWithoutMail_InsertMon: push af hlcoord 0, 15 lb bc, 1, 18 - call Textbox + call Textbox1bpp hlcoord 1, 16 ld de, .Saving_LeaveOn call PlaceString @@ -2212,7 +2212,7 @@ _ChangeBox: ld [wMenuScrollPosition], a hlcoord 0, 4 lb bc, 8, 9 - call Textbox + call Textbox1bpp call ScrollingMenu ld a, [wMenuJoypad] cp B_BUTTON @@ -2275,7 +2275,7 @@ GetBoxName: BillsPC_PrintBoxCountAndCapacity: hlcoord 11, 7 lb bc, 5, 7 - call Textbox + call Textbox1bpp ld a, [wMenuSelection] cp -1 ret z @@ -2350,7 +2350,7 @@ BillsPC_PrintBoxName: hlcoord 0, 0 ld b, 2 ld c, 18 - call Textbox + call Textbox1bpp hlcoord 1, 2 ld de, .Current call PlaceString @@ -2478,7 +2478,7 @@ BillsPC_PlaceChangeBoxString: push de hlcoord 0, 14 lb bc, 2, 18 - call Textbox + call Textbox1bpp pop de hlcoord 1, 16 call PlaceString diff --git a/engine/pokemon/bills_pc_top.asm b/engine/pokemon/bills_pc_top.asm index fa5833aef..e34e8423d 100644 --- a/engine/pokemon/bills_pc_top.asm +++ b/engine/pokemon/bills_pc_top.asm @@ -28,7 +28,7 @@ _BillsPC: push af set NO_TEXT_SCROLL, [hl] ld hl, .PCWhatText - call PrintText + call PrintText1bpp pop af ld [wOptions], a call LoadFontsBattleExtra @@ -111,7 +111,7 @@ BillsPC_MovePKMNMenu: farcall IsAnyMonHoldingMail jr nc, .no_mail ld hl, .PCMonHoldingMailText - call PrintText + call PrintText1bpp jr .quit .no_mail @@ -240,10 +240,10 @@ ClearPCItemScreen: call ByteFill hlcoord 0, 0 lb bc, 10, 18 - call Textbox + call Textbox1bpp hlcoord 0, 12 lb bc, 4, 18 - call Textbox + call Textbox1bpp call WaitBGMap2 call SetPalettes ; load regular palettes? ret diff --git a/engine/pokemon/breeding.asm b/engine/pokemon/breeding.asm index f2049b0ca..58d40d2ca 100644 --- a/engine/pokemon/breeding.asm +++ b/engine/pokemon/breeding.asm @@ -301,7 +301,7 @@ HatchEggs: ld hl, wPlayerName call CopyBytes ld hl, .Text_HatchEgg - call PrintText + call PrintText1bpp ld a, [wCurPartyMon] ld hl, wPartyMonNicknames ld bc, MON_NAME_LENGTH @@ -310,7 +310,7 @@ HatchEggs: ld e, l push de ld hl, .BreedAskNicknameText - call PrintText + call PrintText1bpp call YesNoBox pop de jr c, .nonickname @@ -357,7 +357,7 @@ HatchEggs: push af call EggHatch_AnimationSequence ld hl, .BreedClearboxText - call PrintText + call PrintText1bpp pop af ld [wCurPartySpecies], a pop bc @@ -854,7 +854,7 @@ Hatch_ShellFragmentLoop: DayCareMon1: ld hl, LeftWithDayCareManText - call PrintText + call PrintText1bpp ld a, [wBreedMon1Species] call PlayMonCry ld a, [wDayCareLady] @@ -863,11 +863,11 @@ DayCareMon1: call PromptButton ld hl, wBreedMon2Nickname call DayCareMonCompatibilityText - jp PrintText + jp PrintText1bpp DayCareMon2: ld hl, LeftWithDayCareLadyText - call PrintText + call PrintText1bpp ld a, [wBreedMon2Species] call PlayMonCry ld a, [wDayCareMan] @@ -876,7 +876,7 @@ DayCareMon2: call PromptButton ld hl, wBreedMon1Nickname call DayCareMonCompatibilityText - jp PrintText + jp PrintText1bpp DayCareMonCursor: jp WaitPressAorB_BlinkCursor diff --git a/engine/pokemon/caught_data.asm b/engine/pokemon/caught_data.asm index 54471e1b6..3ac0fcd61 100644 --- a/engine/pokemon/caught_data.asm +++ b/engine/pokemon/caught_data.asm @@ -149,7 +149,7 @@ CheckPartyFullAfterContest: GiveANickname_YesNo: ld hl, CaughtAskNicknameText - call PrintText + call PrintText1bpp jp YesNoBox CaughtAskNicknameText: diff --git a/engine/pokemon/evolve.asm b/engine/pokemon/evolve.asm index 3f457b97e..51a48617a 100644 --- a/engine/pokemon/evolve.asm +++ b/engine/pokemon/evolve.asm @@ -205,7 +205,7 @@ EvolveAfterBattle_MasterLoop: call GetNickname call CopyName1 ld hl, EvolvingText - call PrintText + call PrintText1bpp ld c, 50 call DelayFrames @@ -228,7 +228,7 @@ EvolveAfterBattle_MasterLoop: jp c, CancelEvolution ld hl, CongratulationsYourPokemonText - call PrintText + call PrintText1bpp pop hl @@ -377,7 +377,7 @@ UpdateSpeciesNameIfNotNicknamed: CancelEvolution: ld hl, StoppedEvolvingText - call PrintText + call PrintText1bpp call ClearTilemap pop hl jp EvolveAfterBattle_MasterLoop diff --git a/engine/pokemon/knows_move.asm b/engine/pokemon/knows_move.asm index 9fe0f6ace..779083512 100644 --- a/engine/pokemon/knows_move.asm +++ b/engine/pokemon/knows_move.asm @@ -15,7 +15,7 @@ KnowsMove: .knows_move ld hl, .KnowsMoveText - call PrintText + call PrintText1bpp scf ret diff --git a/engine/pokemon/learn.asm b/engine/pokemon/learn.asm index c7728249e..5402aa538 100644 --- a/engine/pokemon/learn.asm +++ b/engine/pokemon/learn.asm @@ -52,7 +52,7 @@ LearnMove: call GetMoveName ld hl, Text_1_2_and_Poof ; 1, 2 and… - call PrintText + call PrintText1bpp pop de pop hl @@ -103,25 +103,25 @@ LearnMove: .cancel ld hl, StopLearningMoveText - call PrintText + call PrintText1bpp call YesNoBox jp c, .loop ld hl, DidNotLearnMoveText - call PrintText + call PrintText1bpp ld b, 0 ret .learned ld hl, LearnedMoveText - call PrintText + call PrintText1bpp ld b, 1 ret ForgetMove: push hl ld hl, AskForgetMoveText - call PrintText + call PrintText1bpp call YesNoBox pop hl ret c @@ -135,11 +135,11 @@ ForgetMove: .loop push hl ld hl, MoveAskForgetText - call PrintText + call PrintText1bpp hlcoord 5, 2 ld b, NUM_MOVES * 2 ld c, MOVE_NAME_LENGTH - call Textbox + call Textbox1bpp hlcoord 5 + 2, 2 + 2 ld a, SCREEN_WIDTH * 2 ld [wListMovesLineSpacing], a @@ -192,7 +192,7 @@ ForgetMove: .hmmove ld hl, MoveCantForgetHMText - call PrintText + call PrintText1bpp pop hl jr .loop diff --git a/engine/pokemon/mail.asm b/engine/pokemon/mail.asm index 55e6b03fb..eef206a57 100644 --- a/engine/pokemon/mail.asm +++ b/engine/pokemon/mail.asm @@ -488,7 +488,7 @@ MailboxPC: farcall InitPartyMenuWithCancel farcall InitPartyMenuGFX farcall WritePartyMenuTilemap - farcall PrintPartyMenuText + farcall PlacePartyMenuText call WaitBGMap call SetPalettes call DelayFrame @@ -503,12 +503,12 @@ MailboxPC: and a jr z, .attach_mail ld hl, .MailAlreadyHoldingItemText - call PrintText + call PrintText1bpp jr .try_again .egg ld hl, .MailEggText - call PrintText + call PrintText1bpp jr .try_again .attach_mail @@ -517,7 +517,7 @@ MailboxPC: ld b, a call MoveMailFromPCToParty ld hl, .MailMovedFromBoxText - call PrintText + call PrintText1bpp .exit2 jp CloseSubmenu diff --git a/engine/pokemon/mon_menu.asm b/engine/pokemon/mon_menu.asm index 7d4934d37..4c6ed3a21 100644 --- a/engine/pokemon/mon_menu.asm +++ b/engine/pokemon/mon_menu.asm @@ -164,7 +164,7 @@ SwitchPartyMons: ld a, PARTYMENUACTION_MOVE ld [wPartyMenuActionText], a farcall WritePartyMenuTilemap - farcall PrintPartyMenuText + farcall PlacePartyMenuText hlcoord 0, 1 ld bc, SCREEN_WIDTH * 2 @@ -268,7 +268,7 @@ GiveTakePartyMonItem: ret TryGiveItemToPartymon: - call SpeechTextbox + call SpeechTextbox1bpp call PartyMonItemName call GetPartyItemLocation ld a, [hl] @@ -342,7 +342,7 @@ GivePartyItem: ret TakePartyItem: - call SpeechTextbox + call SpeechTextbox1bpp call GetPartyItemLocation ld a, [hl] and a @@ -728,7 +728,7 @@ MonMenu_Softboiled_MilkDrink: .NotEnoughHP: ld hl, .PokemonNotEnoughHPText - call PrintText + call PrintText1bpp .finish xor a @@ -1106,11 +1106,11 @@ SetUpMoveScreenBG: hlcoord 0, 1 ld b, 9 ld c, 18 - call Textbox + call Textbox1bpp hlcoord 0, 11 ld b, 5 ld c, 18 - call Textbox + call Textbox1bpp hlcoord 2, 0 lb bc, 2, 3 call ClearBox @@ -1157,7 +1157,7 @@ SetUpMoveList: hlcoord 0, 11 ld b, 5 ld c, 18 - jp Textbox + jp Textbox1bpp PrepareToPlaceMoveData: ld hl, wPartyMon1Moves diff --git a/engine/pokemon/move_mon.asm b/engine/pokemon/move_mon.asm index 4701705f3..c37b6dc60 100644 --- a/engine/pokemon/move_mon.asm +++ b/engine/pokemon/move_mon.asm @@ -1784,7 +1784,7 @@ GivePoke:: and a ret z ld hl, WasSentToBillsPCText - call PrintText + call PrintText1bpp ld a, BANK(sBoxMonNicknames) call OpenSRAM ld hl, wMonOrItemNameBuffer diff --git a/engine/pokemon/party_menu.asm b/engine/pokemon/party_menu.asm index 28b546e88..7c68a411c 100644 --- a/engine/pokemon/party_menu.asm +++ b/engine/pokemon/party_menu.asm @@ -31,7 +31,7 @@ InitPartyMenuLayout: call InitPartyMenuWithCancel call InitPartyMenuGFX call WritePartyMenuTilemap - call PrintPartyMenuText + call PlacePartyMenuText ret LoadPartyMenuGFX: @@ -625,10 +625,10 @@ PartyMenuSelect: scf ret -PrintPartyMenuText: +PlacePartyMenuText: hlcoord 0, 14 lb bc, 2, 18 - call Textbox + call Textbox1bpp ld a, [wPartyCount] and a jr nz, .haspokemon @@ -769,7 +769,7 @@ PrintPartyMenuActionText: push af set NO_TEXT_SCROLL, a ld [wOptions], a - call PrintText + call PrintText1bpp pop af ld [wOptions], a ret diff --git a/engine/printer/print_party.asm b/engine/printer/print_party.asm index d0c18df7a..9d7e6e5da 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 Textbox1bpp hlcoord 8, 2 ld a, [wTempMonLevel] call PrintLevel_Force3Digits @@ -241,7 +241,7 @@ PrintPartyMonPage2: hlcoord 0, 0 ld b, 15 ld c, 18 - call Textbox + call Textbox1bpp ld bc, SCREEN_WIDTH decoord 0, 0 hlcoord 0, 1 diff --git a/engine/printer/printer.asm b/engine/printer/printer.asm index 8ccdce866..ca6d1d1eb 100644 --- a/engine/printer/printer.asm +++ b/engine/printer/printer.asm @@ -562,7 +562,7 @@ PlacePrinterStatusString: ldh [hBGMapMode], a hlcoord 0, 5 lb bc, 10, 18 - call Textbox + call Textbox1bpp pop af ld e, a ld d, 0 diff --git a/home/battle.asm b/home/battle.asm index fa92b89b5..0106cd4cb 100644 --- a/home/battle.asm +++ b/home/battle.asm @@ -161,7 +161,7 @@ FarCopyRadioText:: BattleTextbox:: ; Open a textbox and print text at hl. push hl - call SpeechTextbox + call SpeechTextbox1bpp call UpdateSprites call ApplyTilemap pop hl diff --git a/home/map.asm b/home/map.asm index 2913652b9..26d3f6dc0 100644 --- a/home/map.asm +++ b/home/map.asm @@ -1012,7 +1012,9 @@ MapTextbox:: rst Bankswitch push hl - call SpeechTextbox + call ClearTextbox + lda_coord 17, 17 + ldcoord_a 18, 17 call SafeUpdateSprites ld a, 1 ldh [hOAMUpdate], a @@ -1900,7 +1902,6 @@ CloseSubmenu:: call ReloadTilesetAndPalettes call UpdateSprites call Call_ExitMenu - call GSReloadPalettes jr FinishExitMenu ExitAllMenus:: @@ -1908,7 +1909,6 @@ ExitAllMenus:: call Call_ExitMenu call ReloadTilesetAndPalettes call UpdateSprites - call GSReloadPalettes FinishExitMenu:: ld b, CGB_MAPPALS call GetCGBLayout @@ -1924,9 +1924,7 @@ ReturnToMapWithSpeechTextbox:: call ClearBGPalettes call ClearSprites call ReloadTilesetAndPalettes - hlcoord 0, 12 - lb bc, 4, 18 - call Textbox + call SpeechTextbox1bpp ld hl, wVramState set 0, [hl] call UpdateSprites diff --git a/home/menu.asm b/home/menu.asm index b99bd3ed5..d60e96df6 100644 --- a/home/menu.asm +++ b/home/menu.asm @@ -209,7 +209,12 @@ MenuBox:: call GetMenuBoxDims dec b dec c - jp Textbox + ld a, [wMenuBoxUse2bppFrame] + and a + jp z, Textbox1bpp + ld d, h + ld e, l + jp Textbox2bpp GetMenuTextStartCoord:: ld a, [wMenuBorderTopCoord] @@ -329,7 +334,7 @@ MenuTextbox:: push hl call LoadMenuTextbox pop hl - jp PrintText + jp PrintText1bpp LoadMenuTextbox:: ld hl, .MenuHeader @@ -734,7 +739,7 @@ GetMenuDataPointerTableEntry:: add hl, de ret -ClearWindowData:: +ClearMenuAndWindowData:: ld hl, wMenuMetadata call .ClearMenuData ld hl, wMenuHeader diff --git a/home/palettes.asm b/home/palettes.asm index 0f1b86fc8..53acc70f3 100644 --- a/home/palettes.asm +++ b/home/palettes.asm @@ -272,9 +272,6 @@ ClearVBank1:: ldh [rVBK], a ret -GSReloadPalettes:: ; dummied out - ret - ReloadSpritesNoPalettes:: ldh a, [rSVBK] push af diff --git a/home/print_text.asm b/home/print_text.asm index cfbde60f1..a654e20a9 100644 --- a/home/print_text.asm +++ b/home/print_text.asm @@ -15,7 +15,7 @@ PrintLetterDelay:: ; non-scrolling text? ld a, [wTextboxFlags] - bit NO_TEXT_DELAY_F, a + bit TEXT_DELAY_F, a ret z push hl @@ -102,14 +102,14 @@ PrintNum:: homecall _PrintNum ret -FarPrintText:: +FarPrintText1bpp:: ldh [hTempBank], a ldh a, [hROMBank] push af ldh a, [hTempBank] rst Bankswitch - call PrintText + call PrintText1bpp pop af rst Bankswitch diff --git a/home/scrolling_menu.asm b/home/scrolling_menu.asm index cde0e0212..de1c8cdb1 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 Textbox1bpp JoyTextDelay_ForcehJoyDown:: call DelayFrame diff --git a/home/text.asm b/home/text.asm index 8bfd18f5c..7c7dfa466 100644 --- a/home/text.asm +++ b/home/text.asm @@ -40,7 +40,13 @@ ClearScreen:: call ByteFill jr ClearTilemap -Textbox:: +SpeechTextbox1bpp:: +; Standard 1bpp textbox. + hlcoord TEXTBOX_X, TEXTBOX_Y + ld b, TEXTBOX_INNERH + ld c, TEXTBOX_INNERW + +Textbox1bpp:: ; 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. @@ -121,20 +127,18 @@ TextboxPalette:: jr nz, .col ret -SpeechTextbox:: -; Standard textbox. - hlcoord TEXTBOX_X, TEXTBOX_Y - ld b, TEXTBOX_INNERH - ld c, TEXTBOX_INNERW - jp Textbox - ; decoord TEXTBOX_X, TEXTBOX_Y - ; lb bc, 4, SCREEN_WIDTH - 2 - ; push bc - ; push de - ; farcall OverworldTextbox - ; pop hl - ; pop bc - ; jp TextboxPalette +SpeechTextbox2bpp:: +; Standard 2bpp textbox (with overworld frame). + decoord TEXTBOX_X, TEXTBOX_Y + lb bc, 4, SCREEN_WIDTH - 2 + +Textbox2bpp:: + push bc + push de + farcall _OverworldTextbox + pop hl + pop bc + jp TextboxPalette RadioTerminator:: ld hl, .stop @@ -143,29 +147,35 @@ RadioTerminator:: .stop: text_end -PrintText:: - call SetUpTextbox +ClearTextbox: + hlcoord TEXTBOX_INNERX, TEXTBOX_INNERY + lb bc, TEXTBOX_INNERH - 1, TEXTBOX_INNERW + jp ClearBox + +PrintText1bpp:: + push hl + call SpeechTextbox1bpp + jr _PrintText + +PrintText2bpp:: + push hl + call SpeechTextbox2bpp + +_PrintText: + call UpdateSprites + call ApplyTilemap + pop hl ; fallthrough BuenaPrintText:: push hl - hlcoord TEXTBOX_INNERX, TEXTBOX_INNERY - lb bc, TEXTBOX_INNERH - 1, TEXTBOX_INNERW - call ClearBox + call ClearTextbox pop hl ; fallthrough PrintTextboxText:: bccoord TEXTBOX_INNERX, TEXTBOX_INNERY - call PlaceHLTextAtBC - ret - -SetUpTextbox:: - push hl - call SpeechTextbox - call UpdateSprites - call ApplyTilemap - pop hl + call PrintHLTextAtBC ret PlaceString:: @@ -415,9 +425,7 @@ Paragraph:: .linkbattle call Text_WaitBGMap call PromptButton - hlcoord TEXTBOX_INNERX, TEXTBOX_INNERY - lb bc, TEXTBOX_INNERH - 1, TEXTBOX_INNERW - call ClearBox + call ClearTextbox call UnloadBlinkingCursor ld c, 20 call DelayFrames @@ -583,10 +591,10 @@ PokeFluteTerminator:: .stop: text_end -PlaceHLTextAtBC:: +PrintHLTextAtBC:: ld a, [wTextboxFlags] push af - set NO_TEXT_DELAY_F, a + set TEXT_DELAY_F, a ld [wTextboxFlags], a call DoTextUntilTerminator @@ -738,7 +746,7 @@ TextCommand_BOX:: push hl ld h, d ld l, e - call Textbox + call Textbox1bpp pop hl ret diff --git a/home/trainers.asm b/home/trainers.asm index 01dc10ae6..ef55b0a18 100644 --- a/home/trainers.asm +++ b/home/trainers.asm @@ -225,7 +225,7 @@ PrintWinLossText:: ld h, [hl] ld l, a call GetMapScriptsBank - call FarPrintText + call FarPrintText1bpp call WaitBGMap call WaitPressAorB_BlinkCursor ret diff --git a/home/window.asm b/home/window.asm index cc9bed126..388432f21 100644 --- a/home/window.asm +++ b/home/window.asm @@ -1,13 +1,14 @@ RefreshScreen:: - call ClearWindowData + call ClearMenuAndWindowData ldh a, [hROMBank] push af - ld a, BANK(ReanchorBGMap_NoOAMUpdate) ; aka BANK(LoadFonts_NoOAMUpdate) + ld a, BANK(ReanchorBGMap_NoOAMUpdate) ; aka BANK(LoadFont_NoOAMUpdate) rst Bankswitch call ReanchorBGMap_NoOAMUpdate call _OpenAndCloseMenu_HDMATransferTilemapAndAttrmap - call LoadFonts_NoOAMUpdate + ld a, $90 + ldh [hWY], a pop af rst Bankswitch @@ -19,16 +20,7 @@ CloseText:: ld a, $1 ldh [hOAMUpdate], a - call .CloseText - - pop af - ldh [hOAMUpdate], a - ld hl, wVramState - res 6, [hl] - ret - -.CloseText: - call ClearWindowData + call ClearMenuAndWindowData xor a ldh [hBGMapMode], a call OverworldTextModeSwitch @@ -41,20 +33,43 @@ CloseText:: call UpdatePlayerSprite xor a ldh [hBGMapMode], a - call LoadOverworldFontAndFrame + + pop af + ldh [hOAMUpdate], a + ld hl, wVramState + res 6, [hl] ret -OpenText:: - call ClearWindowData +OpenText2bpp:: + call ClearMenuAndWindowData ldh a, [hROMBank] push af - ld a, BANK(ReanchorBGMap_NoOAMUpdate) ; aka BANK(LoadFonts_NoOAMUpdate) + ld a, BANK(ReanchorBGMap_NoOAMUpdate) + rst Bankswitch + +; assumes that the overworld 2bpp font and frame are loaded when calling this + call ReanchorBGMap_NoOAMUpdate ; clear bgmap + call SpeechTextbox2bpp + call _OpenAndCloseMenu_HDMATransferTilemapAndAttrmap ; anchor bgmap + ld a, $90 + ldh [hWY], a + + pop af + rst Bankswitch + + ret + +OpenText1bpp:: + call ClearMenuAndWindowData + ldh a, [hROMBank] + push af + ld a, BANK(ReanchorBGMap_NoOAMUpdate) ; aka BANK(LoadFont_NoOAMUpdate) rst Bankswitch call ReanchorBGMap_NoOAMUpdate ; clear bgmap - call SpeechTextbox + call SpeechTextbox1bpp call _OpenAndCloseMenu_HDMATransferTilemapAndAttrmap ; anchor bgmap - call LoadFonts_NoOAMUpdate ; load font + call LoadFont_NoOAMUpdate ; load 1bpp font and frame, hide window pop af rst Bankswitch diff --git a/maps/Level1_Map1.asm b/maps/Level1_Map1.asm index e75d3c7da..031de2b3d 100755 --- a/maps/Level1_Map1.asm +++ b/maps/Level1_Map1.asm @@ -3,6 +3,7 @@ const PLAYERSHOUSE2F_DOLL_1 const PLAYERSHOUSE2F_DOLL_2 const PLAYERSHOUSE2F_BIG_DOLL + const PLAYERSHOUSE2F_TRAINER Level1_Map1_MapScripts: def_scene_scripts @@ -10,16 +11,26 @@ Level1_Map1_MapScripts: def_callbacks PlayersHouseDoll1Script:: - describedecoration DECODESC_LEFT_DOLL + opentext + pokemart MARTTYPE_STANDARD, MART_AZALEA + closetext + end +; describedecoration DECODESC_LEFT_DOLL PlayersHouseDoll2Script: - describedecoration DECODESC_RIGHT_DOLL + jumpstd PokecenterNurseScript +; describedecoration DECODESC_RIGHT_DOLL PlayersHouseBigDollScript: - describedecoration DECODESC_BIG_DOLL + jumpstd PCScript +; describedecoration DECODESC_BIG_DOLL PlayersHouseGameConsoleScript: - describedecoration DECODESC_CONSOLE + randomwildmon + startbattle + reloadmapafterbattle + end +; describedecoration DECODESC_CONSOLE PlayersHousePosterScript: describedecoration DECODESC_POSTER @@ -67,10 +78,46 @@ PlayersRadioText4: line "#MON CHANNEL…" done +TrainerYoungsterMikey: + trainer YOUNGSTER, MIKEY, EVENT_DECO_BED_1, YoungsterMikeySeenText, YoungsterMikeyBeatenText, 0, .Script + +.Script: + endifjustbattled + opentext + writetext YoungsterMikeyAfterText + waitbutton + closetext + end + + +YoungsterMikeySeenText: + text "You're a #MON" + line "trainer, right?" + + para "Then you have to" + line "battle!" + done + +YoungsterMikeyBeatenText: + text "That's strange." + line "I won before." + done + +YoungsterMikeyAfterText: + text "Becoming a good" + line "trainer is really" + cont "tough." + + para "I'm going to bat-" + line "tle other people" + cont "to get better." + done + Level1_Map1_MapEvents: db 0, 0 ; filler def_warp_events + warp_event 7, 0, LEVEL_1_MAP_1, 1 def_coord_events @@ -84,4 +131,5 @@ Level1_Map1_MapEvents: object_event 4, 2, SPRITE_CONSOLE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PlayersHouseGameConsoleScript, -1 object_event 4, 4, SPRITE_DOLL_1, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PlayersHouseDoll1Script, -1 object_event 5, 4, SPRITE_DOLL_2, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PlayersHouseDoll2Script, -1 - object_event 0, 1, SPRITE_BIG_DOLL, SPRITEMOVEDATA_BIGDOLL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PlayersHouseBigDollScript, -1 \ No newline at end of file + object_event 0, 1, SPRITE_BIG_DOLL, SPRITEMOVEDATA_BIGDOLL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PlayersHouseBigDollScript, -1 + object_event 6, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerYoungsterMikey, -1 \ No newline at end of file diff --git a/ram/wram.asm b/ram/wram.asm index fbf28f48c..d119f78db 100644 --- a/ram/wram.asm +++ b/ram/wram.asm @@ -1188,7 +1188,8 @@ wMenuCursorY:: db wMenuCursorX:: db wCursorOffCharacter:: db wCursorCurrentTile:: dw - ds 3 +wMenuBoxUse2bppFrame:: db + ds 2 wMoreMenuDataEnd:: wOverworldDelay:: db