In labels, stick to Place for text without delay, and Print for text …

…with letter delay (#1078)
starleaf-luna · Jan 7, 2024 · 5be9856 · 5be9856
1 parent cd28c44
commit 5be9856
Show file tree

Hide file tree

Showing 20 changed files with 45 additions and 45 deletions.
diff --git a/engine/battle/core.asm b/engine/battle/core.asm
@@ -2828,7 +2828,7 @@ SetUpBattlePartyMenu_Loop: ; switch to fullscreen menu?
 
 JumpToPartyMenuAndPrintText:
 	farcall WritePartyMenuTilemap
-	farcall PrintPartyMenuText
+	farcall PlacePartyMenuText
 	call WaitBGMap
 	call SetDefaultBGPAndOBP
 	call DelayFrame
@@ -9076,7 +9076,7 @@ BattleStartMessage:
 	farcall Battle_GetTrainerName
 
 	ld hl, WantsToBattleText
-	jr .PlaceBattleStartText
+	jr .PrintBattleStartText
 
 .wild
 	call BattleCheckEnemyShininess
@@ -9118,18 +9118,18 @@ BattleStartMessage:
 	farcall StubbedTrainerRankings_HookedEncounters
 
 	ld hl, HookedPokemonAttackedText
-	jr .PlaceBattleStartText
+	jr .PrintBattleStartText
 
 .NotFishing:
 	ld hl, PokemonFellFromTreeText
 	cp BATTLETYPE_TREE
-	jr z, .PlaceBattleStartText
+	jr z, .PrintBattleStartText
 	ld hl, WildCelebiAppearedText
 	cp BATTLETYPE_CELEBI
-	jr z, .PlaceBattleStartText
+	jr z, .PrintBattleStartText
 	ld hl, WildPokemonAppearedText
 
-.PlaceBattleStartText:
+.PrintBattleStartText:
 	push hl
 	farcall BattleStart_TrainerHuds
 	pop hl

diff --git a/engine/events/battle_tower/trainer_text.asm b/engine/events/battle_tower/trainer_text.asm
@@ -80,7 +80,7 @@ endc
 	bccoord 1, 14
 	pop af
 	ldh [rSVBK], a
-	call PlaceHLTextAtBC
+	call PrintTextboxTextAt
 	ret
 
 INCLUDE "mobile/fixed_words.asm"

diff --git a/engine/events/mom.asm b/engine/events/mom.asm
@@ -300,13 +300,13 @@ DSTChecks:
 	call .ClearBox
 	bccoord 1, 14
 	ld hl, .TimesetAskAdjustDSTText
-	call PlaceHLTextAtBC
+	call PrintTextboxTextAt
 	call YesNoBox
 	ret c
 	call .ClearBox
 	bccoord 1, 14
 	ld hl, .MomLostGearBookletText
-	call PlaceHLTextAtBC
+	call PrintTextboxTextAt
 	ret
 
 .loop
@@ -316,7 +316,7 @@ DSTChecks:
 	bit 7, a
 	jr z, .SetDST
 	ld hl, .TimesetAskNotDSTText
-	call PlaceHLTextAtBC
+	call PrintTextboxTextAt
 	call YesNoBox
 	ret c
 	ld a, [wDST]
@@ -326,12 +326,12 @@ DSTChecks:
 	call .ClearBox
 	bccoord 1, 14
 	ld hl, .TimesetNotDSTText
-	call PlaceHLTextAtBC
+	call PrintTextboxTextAt
 	ret
 
 .SetDST:
 	ld hl, .TimesetAskDSTText
-	call PlaceHLTextAtBC
+	call PrintTextboxTextAt
 	call YesNoBox
 	ret c
 	ld a, [wDST]
@@ -341,7 +341,7 @@ DSTChecks:
 	call .ClearBox
 	bccoord 1, 14
 	ld hl, .TimesetDSTText
-	call PlaceHLTextAtBC
+	call PrintTextboxTextAt
 	ret
 
 .SetClockForward:

diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm
@@ -1724,7 +1724,7 @@ ChooseMonToUseItemOn:
 	farcall InitPartyMenuWithCancel
 	farcall InitPartyMenuGFX
 	farcall WritePartyMenuTilemap
-	farcall PrintPartyMenuText
+	farcall PlacePartyMenuText
 	call WaitBGMap
 	call SetDefaultBGPAndOBP
 	call DelayFrame

diff --git 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 SetDefaultBGPAndOBP
 	call DelayFrame

diff --git a/engine/items/tmhm.asm b/engine/items/tmhm.asm
@@ -84,7 +84,7 @@ ChooseMonToLearnTMHM_NoRefresh:
 	ld [wPartyMenuActionText], a
 .loopback
 	farcall WritePartyMenuTilemap
-	farcall PrintPartyMenuText
+	farcall PlacePartyMenuText
 	call WaitBGMap
 	call SetDefaultBGPAndOBP
 	call DelayFrame

diff --git a/engine/link/link.asm b/engine/link/link.asm
@@ -549,7 +549,7 @@ LinkTimeout:
 	pop de
 	pop hl
 	bccoord 1, 14
-	call PlaceHLTextAtBC
+	call PrintTextboxTextAt
 	call RotateThreePalettesRight
 	call ClearScreen
 	ld b, SCGB_DIPLOMA
@@ -1504,7 +1504,7 @@ LinkTrade_TradeStatsMenu:
 	dec a
 	ld [wCurTradePartyMon], a
 	ld [wPlayerLinkAction], a
-	farcall PrintWaitingTextAndSyncAndExchangeNybble
+	farcall PlaceWaitingTextAndSyncAndExchangeNybble
 	ld a, [wOtherPlayerLinkMode]
 	cp $f
 	jp z, InitTradeMenuDisplay
@@ -1526,7 +1526,7 @@ LinkTrade_TradeStatsMenu:
 	farcall Link_WaitBGMap
 	ld hl, .LinkTradeCantBattleText
 	bccoord 1, 14
-	call PlaceHLTextAtBC
+	call PrintTextboxTextAt
 	jr .cancel_trade
 
 .abnormal
@@ -1548,7 +1548,7 @@ LinkTrade_TradeStatsMenu:
 	farcall Link_WaitBGMap
 	ld hl, .LinkAbnormalMonText
 	bccoord 1, 14
-	call PlaceHLTextAtBC
+	call PrintTextboxTextAt
 
 .cancel_trade
 	hlcoord 0, 12
@@ -1560,7 +1560,7 @@ LinkTrade_TradeStatsMenu:
 	call PlaceString
 	ld a, $1
 	ld [wPlayerLinkAction], a
-	farcall PrintWaitingTextAndSyncAndExchangeNybble
+	farcall PlaceWaitingTextAndSyncAndExchangeNybble
 	ld c, 100
 	call DelayFrames
 	jp InitTradeMenuDisplay
@@ -1622,7 +1622,7 @@ LinkTradePartymonMenuCheckCancel:
 	ldcoord_a 9, 17
 	ld a, $f
 	ld [wPlayerLinkAction], a
-	farcall PrintWaitingTextAndSyncAndExchangeNybble
+	farcall PlaceWaitingTextAndSyncAndExchangeNybble
 	ld a, [wOtherPlayerLinkMode]
 	cp $f
 	jr nz, .loop1
@@ -1721,7 +1721,7 @@ LinkTrade:
 	call GetPokemonName
 	ld hl, LinkAskTradeForText
 	bccoord 1, 14
-	call PlaceHLTextAtBC
+	call PrintTextboxTextAt
 	call LoadStandardMenuHeader
 	hlcoord 10, 7
 	ld b, 3
@@ -1770,13 +1770,13 @@ LinkTrade:
 	hlcoord 1, 14
 	ld de, String_TooBadTheTradeWasCanceled
 	call PlaceString
-	farcall PrintWaitingTextAndSyncAndExchangeNybble
+	farcall PlaceWaitingTextAndSyncAndExchangeNybble
 	jp InitTradeMenuDisplay_Delay
 
 .try_trade
 	ld a, $2
 	ld [wPlayerLinkAction], a
-	farcall PrintWaitingTextAndSyncAndExchangeNybble
+	farcall PlaceWaitingTextAndSyncAndExchangeNybble
 	ld a, [wOtherPlayerLinkMode]
 	dec a
 	jr nz, .do_trade
@@ -2019,7 +2019,7 @@ LinkTrade:
 	ld a, b
 	ld [wPlayerLinkAction], a
 	push bc
-	call Serial_PrintWaitingTextAndSyncAndExchangeNybble
+	call Serial_PlaceWaitingTextAndSyncAndExchangeNybble
 	pop bc
 	ld a, [wLinkMode]
 	cp LINK_TIMECAPSULE

diff --git a/engine/link/link_trade.asm b/engine/link/link_trade.asm
@@ -156,15 +156,15 @@ LinkTextbox:
 	call _LinkTextbox
 	ret
 
-PrintWaitingTextAndSyncAndExchangeNybble:
+PlaceWaitingTextAndSyncAndExchangeNybble:
 	call LoadStandardMenuHeader
-	call .PrintWaitingText
+	call .PlaceWaitingText
 	farcall WaitLinkTransfer
 	call Call_ExitMenu
 	call WaitBGMap2
 	ret
 
-.PrintWaitingText:
+.PlaceWaitingText:
 	hlcoord 4, 10
 	ld b, 1
 	ld c, 10

diff --git a/engine/menus/start_menu.asm b/engine/menus/start_menu.asm
@@ -512,7 +512,7 @@ StartMenu_Pokemon:
 
 .menunoreload
 	farcall WritePartyMenuTilemap
-	farcall PrintPartyMenuText
+	farcall PlacePartyMenuText
 	call WaitBGMap
 	call SetDefaultBGPAndOBP
 	call DelayFrame

diff --git a/engine/pokegear/pokegear.asm b/engine/pokegear/pokegear.asm
@@ -518,7 +518,7 @@ Pokegear_UpdateClock:
 	farcall PrintHoursMins
 	ld hl, .GearTodayText
 	bccoord 6, 6
-	call PlaceHLTextAtBC
+	call PrintTextboxTextAt
 	ret
 
 	db "ごぜん@"

diff --git a/engine/pokegear/radio.asm b/engine/pokegear/radio.asm
@@ -133,7 +133,7 @@ PrintRadioLine:
 	cp 2
 	jr nz, .print
 	bccoord 1, 16
-	call PlaceHLTextAtBC
+	call PrintTextboxTextAt
 	jr .skip
 .print
 	call PrintTextboxText

diff --git 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 SetDefaultBGPAndOBP
 	call DelayFrame

diff --git 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

diff --git 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:
@@ -703,7 +703,7 @@ PartyMenuSelect:
 	scf
 	ret
 
-PrintPartyMenuText:
+PlacePartyMenuText:
 	hlcoord 0, 14
 	lb bc, 2, 18
 	call Textbox

diff --git a/engine/rtc/timeset.asm b/engine/rtc/timeset.asm
@@ -547,7 +547,7 @@ InitialSetDSTFlag:
 	lb bc, 3, 18
 	call ClearBox
 	ld hl, .Text
-	call PlaceHLTextAtBC
+	call PrintTextboxTextAt
 	ret
 
 .Text:
@@ -574,7 +574,7 @@ InitialClearDSTFlag:
 	lb bc, 3, 18
 	call ClearBox
 	ld hl, .Text
-	call PlaceHLTextAtBC
+	call PrintTextboxTextAt
 	ret
 
 .Text:
@@ -598,7 +598,7 @@ MrChrono: ; unreferenced
 	lb bc, 3, SCREEN_WIDTH - 2
 	call ClearBox
 	ld hl, .Text
-	call PlaceHLTextAtBC
+	call PrintTextboxTextAt
 	ret
 
 .Text:

diff --git a/home/serial.asm b/home/serial.asm
@@ -278,7 +278,7 @@ Serial_ExchangeSyncBytes::
 	jr nz, .exchange
 	ret
 
-Serial_PrintWaitingTextAndSyncAndExchangeNybble::
+Serial_PlaceWaitingTextAndSyncAndExchangeNybble::
 	call LoadTilemapToTempTilemap
 	callfar PlaceWaitingText
 	call WaitLinkTransfer

diff --git a/home/text.asm b/home/text.asm
@@ -153,7 +153,7 @@ BuenaPrintText::
 
 PrintTextboxText::
 	bccoord TEXTBOX_INNERX, TEXTBOX_INNERY
-	call PlaceHLTextAtBC
+	call PrintTextboxTextAt
 	ret
 
 SetUpTextbox::
@@ -658,7 +658,7 @@ PokeFluteTerminator::
 .stop:
 	text_end
 
-PlaceHLTextAtBC::
+PrintTextboxTextAt::
 	ld a, [wTextboxFlags]
 	push af
 	set TEXT_DELAY_F, a

diff --git a/mobile/fixed_words.asm b/mobile/fixed_words.asm
@@ -198,7 +198,7 @@ PrintEZChatBattleMessage:
 	; now, let's place the string from wc618 to bc
 	pop bc
 	ld hl, wc618
-	call PlaceHLTextAtBC
+	call PrintTextboxTextAt
 	; restore the original values of [wJumptableIndex] and [wcf64]
 	pop hl
 	ld a, l

diff --git a/mobile/mobile_12_2.asm b/mobile/mobile_12_2.asm
@@ -342,7 +342,7 @@ Function4aa34:
 	farcall WritePartyMenuTilemap
 	xor a
 	ld [wPartyMenuActionText], a
-	farcall PrintPartyMenuText
+	farcall PlacePartyMenuText
 	call Function4aab6
 	call WaitBGMap
 	call SetDefaultBGPAndOBP

diff --git a/mobile/mobile_5f.asm b/mobile/mobile_5f.asm
@@ -1979,7 +1979,7 @@ Function17dd13:
 	push hl
 	pop bc
 	pop hl
-	call PlaceHLTextAtBC
+	call PrintTextboxTextAt
 	ret
 
 Function17dd30:
-Original file line number
+Diff line change
@@ Expand Up / @@ -1979,7 +1979,7 @@ Function17dd13: @@
     	push hl
     	pop bc
     	pop hl
-    	call PlaceHLTextAtBC
+    	call PrintTextboxTextAt
     	ret
     Function17dd30:
@@ Expand Down @@