diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-03-02 14:11:32 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-02 14:11:32 -0500 |
| commit | f5011a27d6c15bb6e3fbb24b680bf5175baffe0e (patch) | |
| tree | 0fc5c1ca8df7787c55ce7cb928923123792e9b0a /src/quest_log_player.c | |
| parent | 40af0d130236cccd5127c2f175006168466b405d (diff) | |
| parent | e2a29e9db964881034f5c1c0507924e2e0fb7840 (diff) | |
Merge pull request #282 from PikalaxALT/field_effect_helpers
port field_effect_helpers from emerald
Diffstat (limited to 'src/quest_log_player.c')
| -rw-r--r-- | src/quest_log_player.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/quest_log_player.c b/src/quest_log_player.c index ccf0565fb..b57e3930c 100644 --- a/src/quest_log_player.c +++ b/src/quest_log_player.c @@ -58,7 +58,7 @@ static void sub_81504A8(void) { struct ObjectEvent *objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; sub_81507BC(objectEvent, GetPlayerAvatarGraphicsIdByStateId(0)); - ObjectEventTurn(objectEvent, objectEvent->placeholder18); + ObjectEventTurn(objectEvent, objectEvent->movementDirection); SetPlayerAvatarStateMask(PLAYER_AVATAR_FLAG_ON_FOOT); } @@ -66,7 +66,7 @@ static void sub_81504E8(void) { struct ObjectEvent *objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; sub_81507BC(objectEvent, GetPlayerAvatarGraphicsIdByStateId(1)); - ObjectEventTurn(objectEvent, objectEvent->placeholder18); + ObjectEventTurn(objectEvent, objectEvent->movementDirection); SetPlayerAvatarStateMask(PLAYER_AVATAR_FLAG_MACH_BIKE); sub_80BD620(0, 0); } @@ -125,7 +125,7 @@ static void sub_81505C4(u8 taskId) sub_81507BC(objectEvent, GetPlayerAvatarGraphicsIdByStateId(0)); else sub_81507BC(objectEvent, GetPlayerAvatarGraphicsIdByStateId(2)); - ObjectEventTurn(objectEvent, objectEvent->placeholder18); + ObjectEventTurn(objectEvent, objectEvent->movementDirection); sprite->pos2.x = 0; sprite->pos2.y = 0; ScriptContext2_Disable(); @@ -143,13 +143,13 @@ static void sub_8150708(void) if (!(gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_SURFING)) { sub_81507BC(objectEvent, GetPlayerAvatarGraphicsIdByStateId(2)); - ObjectEventTurn(objectEvent, objectEvent->placeholder18); + ObjectEventTurn(objectEvent, objectEvent->movementDirection); SetPlayerAvatarStateMask(PLAYER_AVATAR_FLAG_SURFING); gFieldEffectArguments[0] = objectEvent->currentCoords.x; gFieldEffectArguments[1] = objectEvent->currentCoords.y; gFieldEffectArguments[2] = gPlayerAvatar.objectEventId; fieldEffectId = FieldEffectStart(FLDEFF_SURF_BLOB); - objectEvent->mapobj_unk_1A = fieldEffectId; + objectEvent->fieldEffectSpriteId = fieldEffectId; sub_80DC44C(fieldEffectId, 1); } } |