diff options
| author | garak <garakmon@gmail.com> | 2019-12-17 20:16:40 -0500 |
|---|---|---|
| committer | garak <garakmon@gmail.com> | 2019-12-17 20:16:40 -0500 |
| commit | fabe354c015e0d587353093debafff6f44d6ab07 (patch) | |
| tree | a8c099310a5154e6d87b5a9d67754d48d52bc89c /src/fldeff_rocksmash.c | |
| parent | ddaa88390e53665c6ac73af5e1a2f519dbddb5c6 (diff) | |
final pass at unifying on object event
Diffstat (limited to 'src/fldeff_rocksmash.c')
| -rw-r--r-- | src/fldeff_rocksmash.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/fldeff_rocksmash.c b/src/fldeff_rocksmash.c index c62653367..8b82c60c9 100644 --- a/src/fldeff_rocksmash.c +++ b/src/fldeff_rocksmash.c @@ -50,7 +50,7 @@ static void task08_080C9820(u8 taskId) ScriptContext2_Enable(); gPlayerAvatar.unk6 = TRUE; - mapObjId = gPlayerAvatar.mapObjectId; + mapObjId = gPlayerAvatar.objectEventId; if (!ObjectEventIsMovementOverridden(&gObjectEvents[mapObjId]) || ObjectEventClearHeldMovementIfFinished(&gObjectEvents[mapObjId])) { @@ -70,7 +70,7 @@ static void task08_080C9820(u8 taskId) static void sub_80C98B0(u8 taskId) { - if (ObjectEventCheckHeldMovementStatus(&gObjectEvents[gPlayerAvatar.mapObjectId]) == TRUE) + if (ObjectEventCheckHeldMovementStatus(&gObjectEvents[gPlayerAvatar.objectEventId]) == TRUE) { FieldEffectStart(FLDEFF_FIELD_MOVE_SHOW_MON_INIT); gTasks[taskId].func = sub_80C98FC; @@ -90,7 +90,7 @@ static void sub_80C98FC(u8 taskId) gFieldEffectArguments[2] = 2; if (gFieldEffectArguments[1] == 4) gFieldEffectArguments[2] = 3; - ObjectEventSetGraphicsId(&gObjectEvents[gPlayerAvatar.mapObjectId], GetPlayerAvatarGraphicsIdByCurrentState()); + ObjectEventSetGraphicsId(&gObjectEvents[gPlayerAvatar.objectEventId], GetPlayerAvatarGraphicsIdByCurrentState()); StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], gFieldEffectArguments[2]); FieldEffectActiveListRemove(6); gTasks[taskId].func = sub_80C99A0; |