Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

In labels, stick to Place for text without delay, and Print for text with letter delay (#1078)

Browse Source
This commit is contained in:
xCrystal
2024-01-07 14:06:40 +01:00
parent cd28c44ff3
commit 5be9856f3a
20 changed files with 45 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
engine/battle/core.asm
View File

@@ -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