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

Implement talker events: core functionality done [commit 4] (#30)

Browse Source
This commit is contained in:
xCrystal
2023-11-29 20:04:08 +01:00
parent 6f4fcf580a
commit dbc0221e15
6 changed files with 220 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
engine/events/trainer_scripts.asm
View File

@@ -29,12 +29,13 @@ StartBattleWithMapTrainerScript:
loadmem wRunningTrainerBattleScript, -1
AlreadyBeatenTrainerScript:
scripttalkafter
jumptrainerafterbattlescript
SeenByTalkerScript::
waitsfx ; wait for any pending space-related sfx
; playsound SFX_
showemote EMOTE_TALK, LAST_TALKED, 20
trainerortalkerflagaction SET_FLAG
callasm .TalkOrSkipTalker
iffalse .skipped
callasm TrainerOrTalkerWalkToPlayer
@@ -45,7 +46,6 @@ SeenByTalkerScript::
ifequal TALKERTYPE_TEXT, .Text
ifequal TALKERTYPE_SCRIPT, .Script
.skipped
trainerortalkerflagaction SET_FLAG
end
.Text
@@ -53,12 +53,10 @@ SeenByTalkerScript::
trainerortalkertext TRAINERORTALKERTEXT_TALKER
waitbutton
closetext
trainerortalkerflagaction SET_FLAG
end
.Script
trainerortalkerflagaction SET_FLAG
end
jumptalkerscript
.TalkOrSkipTalker:
ld a, [wTempTalkerType]