dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Standardize EVENT_OBJECT to OBJECT_EVENT

Browse Source
This commit is contained in:
GriffinR
2019-11-20 23:12:51 -05:00
parent ec3e86f1d2
commit 82cb741d8b
611 changed files with 4984 additions and 4984 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/trainer_see.c
View File

@@ -179,7 +179,7 @@ bool8 CheckForTrainersWantingBattle(void)
gNoOfApproachingTrainers = 0;
gApproachingTrainerId = 0;
for (i = 0; i < EVENT_OBJECTS_COUNT; i++)
for (i = 0; i < OBJECT_EVENTS_COUNT; i++)
{
u8 retVal;
@@ -774,15 +774,15 @@ void PlayerFaceTrainerAfterBattle(void)
objEvent = &gObjectEvents[gApproachingTrainers[gWhichTrainerToFaceAfterBattle].objectEventId];
gPostBattleMovementScript[0] = GetFaceDirectionMovementAction(GetOppositeDirection(objEvent->facingDirection));
gPostBattleMovementScript[1] = MOVEMENT_ACTION_STEP_END;
ScriptMovement_StartObjectMovementScript(EVENT_OBJ_ID_PLAYER, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, gPostBattleMovementScript);
ScriptMovement_StartObjectMovementScript(OBJ_EVENT_ID_PLAYER, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, gPostBattleMovementScript);
}
else
{
objEvent = &gObjectEvents[gPlayerAvatar.objectEventId];
gPostBattleMovementScript[0] = GetFaceDirectionMovementAction(objEvent->facingDirection);
gPostBattleMovementScript[1] = MOVEMENT_ACTION_STEP_END;
ScriptMovement_StartObjectMovementScript(EVENT_OBJ_ID_PLAYER, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, gPostBattleMovementScript);
ScriptMovement_StartObjectMovementScript(OBJ_EVENT_ID_PLAYER, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, gPostBattleMovementScript);
}
SetMovingNpcId(EVENT_OBJ_ID_PLAYER);
SetMovingNpcId(OBJ_EVENT_ID_PLAYER);
}