diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-12-19 17:19:02 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-19 17:19:02 -0600 |
| commit | 864b38317748ff0b2b743dc48a9828bbc720fdc1 (patch) | |
| tree | 04043fefdc0ed9e65519317cd70a4f6eec69e4a0 /src | |
| parent | d7755fda6ce16f17254c8d5158d01fca42f13932 (diff) | |
| parent | 5e6ceeb631f038556da9daa24bcb2ccd5bcfa368 (diff) | |
Merge pull request #460 from melthelesbian/applymovement_tweaks
update applymovement to remove magic numbers
Diffstat (limited to 'src')
| -rw-r--r-- | src/event_object_movement.c | 2 | ||||
| -rw-r--r-- | src/field_specials.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/event_object_movement.c b/src/event_object_movement.c index ef125e564..ffa8f53c9 100644 --- a/src/event_object_movement.c +++ b/src/event_object_movement.c @@ -1144,7 +1144,7 @@ u8 GetFirstInactiveEventObjectId(void) u8 GetEventObjectIdByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroupId) { - if (localId < 0xFF) + if (localId < EVENT_OBJ_ID_PLAYER) { return GetEventObjectIdByLocalIdAndMapInternal(localId, mapNum, mapGroupId); } diff --git a/src/field_specials.c b/src/field_specials.c index 3a50e272e..3f945fcfb 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -1279,17 +1279,17 @@ void IsGrassTypeInParty(void) gSpecialVar_Result = FALSE; } -void SpawnScriptEventObject(void) +void SpawnCameraObject(void) { - u8 obj = SpawnSpecialEventObjectParameterized(EVENT_OBJ_GFX_BOY_1, 8, 0x7F, gSaveBlock1Ptr->pos.x + 7, gSaveBlock1Ptr->pos.y + 7, 3); + u8 obj = SpawnSpecialEventObjectParameterized(EVENT_OBJ_GFX_BOY_1, 8, EVENT_OBJ_ID_CAMERA, gSaveBlock1Ptr->pos.x + 7, gSaveBlock1Ptr->pos.y + 7, 3); gEventObjects[obj].invisible = TRUE; CameraObjectSetFollowedObjectId(gEventObjects[obj].spriteId); } -void RemoveScriptEventObject(void) +void RemoveCameraObject(void) { CameraObjectSetFollowedObjectId(GetPlayerAvatarObjectId()); - RemoveEventObjectByLocalIdAndMap(0x7F, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); + RemoveEventObjectByLocalIdAndMap(EVENT_OBJ_ID_CAMERA, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); } u8 GetPokeblockNameByMonNature(void) |