Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix non-battle trainer script not running properly (#8056)

Browse Source
This commit is contained in:
FosterProgramming 2025-10-30 19:47:22 +01:00 committed by GitHub
parent 3a3b947622
commit 0b005d4b6f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/trainer_see.c
View File

@ -380,6 +380,7 @@ bool8 CheckForTrainersWantingBattle(void)
if (numTrainers == 0xFF) // non-trainerbatle script if (numTrainers == 0xFF) // non-trainerbatle script
{ {
u32 objectEventId = gApproachingTrainers[gNoOfApproachingTrainers - 1].objectEventId; u32 objectEventId = gApproachingTrainers[gNoOfApproachingTrainers - 1].objectEventId;
gApproachingTrainers[gNoOfApproachingTrainers - 1].trainerScriptPtr = GetObjectEventScriptPointerByObjectEventId(objectEventId);
gSelectedObjectEvent = objectEventId; gSelectedObjectEvent = objectEventId;
gSpecialVar_LastTalked = gObjectEvents[objectEventId].localId; gSpecialVar_LastTalked = gObjectEvents[objectEventId].localId;
ScriptContext_SetupScript(EventScript_ObjectApproachPlayer); ScriptContext_SetupScript(EventScript_ObjectApproachPlayer);