Use overworld textbox in text printing functions, differentiating between 1bpp and 2bpp text (#10)

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

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

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

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:

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

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

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

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:

engine/events/lucky_number.asm

@@ -116,7 +116,7 @@ CheckForLuckyNumberWinners:
 	ld hl, .LuckyNumberMatchPCText
 
 .print
-	jp PrintText
+	jp PrintText2bpp
 
 .CompareLuckyNumberToMonID:
 	push bc

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:

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

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:

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

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:

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:

engine/events/overworld.asm

@@ -620,7 +620,6 @@ FlyFunction:
 	farcall RespawnPlayer
 	call DelayFrame
 	call UpdatePlayerSprite
-	call LoadOverworldFontAndFrame
 	ret
 
 WaterfallFunction:

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

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:

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]

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: