diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-12-28 12:29:21 -0600 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2018-12-29 11:36:54 -0600 |
| commit | 46d41d2fb9c5d8ff842139410ebf0ff1642f9b82 (patch) | |
| tree | 9230d0ab1bf5ccdddc6a0175612ac70b0c5d2b47 /src/field_player_avatar.c | |
| parent | 95dcff581bdc8be8b02e007ad01f758abba274c0 (diff) | |
Use EVENT_OBJ_ID_PLAYER in C code
Diffstat (limited to 'src/field_player_avatar.c')
| -rw-r--r-- | src/field_player_avatar.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c index f14ac8329..8cb3ce912 100644 --- a/src/field_player_avatar.c +++ b/src/field_player_avatar.c @@ -791,7 +791,7 @@ bool8 IsPlayerCollidingWithFarawayIslandMew(u8 direction) playerY = object->currentCoords.y; MoveCoords(direction, &playerX, &playerY); - mewObjectId = GetEventObjectIdByLocalIdAndMap(1, 0x39, 0x1A); + mewObjectId = GetEventObjectIdByLocalIdAndMap(1, MAP_NUM(FARAWAY_ISLAND_INTERIOR), MAP_GROUP(FARAWAY_ISLAND_INTERIOR)); if (mewObjectId == 16) { @@ -1389,7 +1389,7 @@ void InitPlayerAvatar(s16 x, s16 y, u8 direction, u8 gender) u8 eventObjectId; struct EventObject *eventObject; - playerEventObjTemplate.localId = 0xFF; + playerEventObjTemplate.localId = EVENT_OBJ_ID_PLAYER; playerEventObjTemplate.graphicsId = GetPlayerAvatarGraphicsIdByStateIdAndGender(PLAYER_AVATAR_STATE_NORMAL, gender); playerEventObjTemplate.x = x - 7; playerEventObjTemplate.y = y - 7; |