diff options
| author | GriffinR <griffin.richards@comcast.net> | 2019-11-21 00:14:40 -0500 |
|---|---|---|
| committer | GriffinR <griffin.richards@comcast.net> | 2019-11-21 00:14:40 -0500 |
| commit | 7034f59c14fd6fad2634e9b35b405e2b33f75646 (patch) | |
| tree | 6c329c06e691eb8c702ff8b5982b1cb767e954de /src/battle_setup.c | |
| parent | 98b81722e73bbc97145c7b2b20e160084dbd3587 (diff) | |
Rename EventObj to ObjEvent
Diffstat (limited to 'src/battle_setup.c')
| -rw-r--r-- | src/battle_setup.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/battle_setup.c b/src/battle_setup.c index c63d38e70..ea4e807c7 100644 --- a/src/battle_setup.c +++ b/src/battle_setup.c @@ -1168,19 +1168,19 @@ const u8 *BattleSetup_ConfigureTrainerBattle(const u8 *data) } } -void ConfigureAndSetUpOneTrainerBattle(u8 trainerEventObjId, const u8 *trainerScript) +void ConfigureAndSetUpOneTrainerBattle(u8 trainerObjEventId, const u8 *trainerScript) { - gSelectedObjectEvent = trainerEventObjId; - gSpecialVar_LastTalked = gObjectEvents[trainerEventObjId].localId; + gSelectedObjectEvent = trainerObjEventId; + gSpecialVar_LastTalked = gObjectEvents[trainerObjEventId].localId; BattleSetup_ConfigureTrainerBattle(trainerScript + 1); ScriptContext1_SetupScript(EventScript_271354); ScriptContext2_Enable(); } -void ConfigureTwoTrainersBattle(u8 trainerEventObjId, const u8 *trainerScript) +void ConfigureTwoTrainersBattle(u8 trainerObjEventId, const u8 *trainerScript) { - gSelectedObjectEvent = trainerEventObjId; - gSpecialVar_LastTalked = gObjectEvents[trainerEventObjId].localId; + gSelectedObjectEvent = trainerObjEventId; + gSpecialVar_LastTalked = gObjectEvents[trainerObjEventId].localId; BattleSetup_ConfigureTrainerBattle(trainerScript + 1); } |