diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-05-30 07:48:45 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-30 07:48:45 -0500 |
| commit | d1965e3c751b77243c11d62eadc994422dc682ae (patch) | |
| tree | 61ee8faf9f1fc7569efa086f2108b7f886e49127 /src/contest.c | |
| parent | b8f90052a58d1781ef40e2a4b7decf4ca4ed62b8 (diff) | |
| parent | 9680b95bdde1226e12485a84e47c6a7c32932048 (diff) | |
Merge pull request #618 from huderlem/objMovement
Document event object movement
Diffstat (limited to 'src/contest.c')
| -rw-r--r-- | src/contest.c | 6 |
1 files changed, 3 insertions, 3 deletions
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); |