pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-09-08 08:13:02 -07:00
Code Issues Packages Projects Releases Wiki Activity

Homogenize transition after trainer/talker (#30); Being writing usage docs

Browse Source
This commit is contained in:
xCrystal
2024-02-17 18:56:19 +01:00
parent e34bac40d6
commit 84688690cd
4 changed files with 138 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
engine/events/trainer_scripts.asm
View File

@@ -26,6 +26,7 @@ StartBattleWithMapTrainerScript:
startbattle
reloadmapafterbattle
trainerortalkerflagaction SET_FLAG
scall AfterTrainerOrTalkerScript
loadmem wRunningTrainerBattleScript, -1
AlreadyBeatenTrainerScript:
@@ -53,10 +54,11 @@ SeenByTalkerScript::
trainerortalkertext TRAINERORTALKERTEXT_TALKER
waitbutton
closetext
end
sjump AfterTrainerOrTalkerScript
.Script
jumptalkerscript
talkerscript
sjump AfterTrainerOrTalkerScript
.TalkOrSkipTalker:
ld a, [wTempTalkerType]
@@ -87,4 +89,13 @@ SeenByTalkerScript::
ld a, [wTempTalkerType]
and TALKERTYPE_MASK
ld [hScriptVar], a
ret
ret
AfterTrainerOrTalkerScript:
wait 200
readmem wSpacesLeft
iftrue .not_landed
turnobject PLAYER, DOWN
wait 100
.not_landed
end