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

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:

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:

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

engine/overworld/warp_connection.asm

@@ -287,7 +287,6 @@ LoadMapGraphics:
 	xor a
 	ldh [hTileAnimFrame], a
 	farcall RefreshSprites
-	call LoadFrame
 	call LoadOverworldFontAndFrame
 	ret
 

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