From 5df6fa5c08a19fb89308f6131dceef721cc5a3d0 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Tue, 29 May 2018 17:53:42 -0500 Subject: Unify 'map object' and 'field object' terms into 'event object' --- src/contest.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/contest.c') diff --git a/src/contest.c b/src/contest.c index d9c19f773..fcadd8ae1 100644 --- a/src/contest.c +++ b/src/contest.c @@ -1,6 +1,6 @@ #include "global.h" #include "constants/items.h" -#include "constants/map_objects.h" +#include "constants/event_objects.h" #include "constants/moves.h" #include "constants/songs.h" #include "constants/species.h" @@ -2138,9 +2138,9 @@ void Contest_CreatePlayerMon(u8 partyIndex) } memcpy(gContestMons[gContestPlayerMonIndex].trainerName, name, 8); if (gSaveBlock2.playerGender == MALE) - gContestMons[gContestPlayerMonIndex].trainerGfxId = MAP_OBJ_GFX_LINK_BRENDAN; + gContestMons[gContestPlayerMonIndex].trainerGfxId = EVENT_OBJ_GFX_LINK_BRENDAN; else - gContestMons[gContestPlayerMonIndex].trainerGfxId = MAP_OBJ_GFX_LINK_MAY; + gContestMons[gContestPlayerMonIndex].trainerGfxId = EVENT_OBJ_GFX_LINK_MAY; gContestMons[gContestPlayerMonIndex].flags = 0; gContestMons[gContestPlayerMonIndex].unk2C[0] = 0; gContestMons[gContestPlayerMonIndex].species = GetMonData(&gPlayerParty[partyIndex], MON_DATA_SPECIES); -- cgit v1.2.3