diff options
Diffstat (limited to 'src/fldeff_rocksmash.c')
| -rw-r--r-- | src/fldeff_rocksmash.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/fldeff_rocksmash.c b/src/fldeff_rocksmash.c index 90abda81f..980b72d4f 100644 --- a/src/fldeff_rocksmash.c +++ b/src/fldeff_rocksmash.c @@ -13,9 +13,9 @@ #include "palette.h" #include "overworld.h" #include "wild_encounter.h" -#include "field_map_obj.h" +#include "event_object_movement.h" #include "constants/songs.h" -#include "constants/map_objects.h" +#include "constants/object_events.h" #include "constants/map_types.h" static void task08_080C9820(u8 taskId); @@ -31,10 +31,10 @@ bool8 CheckObjectGraphicsInFrontOfPlayer(u8 graphicsId) GetXYCoordsOneStepInFrontOfPlayer(&gPlayerFacingPosition.x, &gPlayerFacingPosition.y); gPlayerFacingPosition.height = PlayerGetZCoord(); - mapObjId = GetFieldObjectIdByXYZ(gPlayerFacingPosition.x, gPlayerFacingPosition.y, gPlayerFacingPosition.height); - if (gMapObjects[mapObjId].graphicsId != graphicsId) + mapObjId = GetObjectEventIdByXYZ(gPlayerFacingPosition.x, gPlayerFacingPosition.y, gPlayerFacingPosition.height); + if (gObjectEvents[mapObjId].graphicsId != graphicsId) return FALSE; - gSpecialVar_LastTalked = gMapObjects[mapObjId].localId; + gSpecialVar_LastTalked = gObjectEvents[mapObjId].localId; return TRUE; } @@ -50,9 +50,9 @@ static void task08_080C9820(u8 taskId) ScriptContext2_Enable(); gPlayerAvatar.unk6 = TRUE; - mapObjId = gPlayerAvatar.mapObjectId; - if (!FieldObjectIsMovementOverridden(&gMapObjects[mapObjId]) - || FieldObjectClearHeldMovementIfFinished(&gMapObjects[mapObjId])) + mapObjId = gPlayerAvatar.objectEventId; + if (!ObjectEventIsMovementOverridden(&gObjectEvents[mapObjId]) + || ObjectEventClearHeldMovementIfFinished(&gObjectEvents[mapObjId])) { if (gMapHeader.mapType == MAP_TYPE_UNDERWATER) { @@ -62,7 +62,7 @@ static void task08_080C9820(u8 taskId) else { sub_805CB70(); - FieldObjectSetHeldMovement(&gMapObjects[mapObjId], 0x45); + ObjectEventSetHeldMovement(&gObjectEvents[mapObjId], 0x45); gTasks[taskId].func = sub_80C98B0; } } @@ -70,7 +70,7 @@ static void task08_080C9820(u8 taskId) static void sub_80C98B0(u8 taskId) { - if (FieldObjectCheckHeldMovementStatus(&gMapObjects[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; - EventObjectSetGraphicsId(&gMapObjects[gPlayerAvatar.mapObjectId], GetPlayerAvatarGraphicsIdByCurrentState()); + ObjectEventSetGraphicsId(&gObjectEvents[gPlayerAvatar.objectEventId], GetPlayerAvatarGraphicsIdByCurrentState()); StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], gFieldEffectArguments[2]); FieldEffectActiveListRemove(6); gTasks[taskId].func = sub_80C99A0; @@ -106,7 +106,7 @@ static void sub_80C99A0(u8 taskId) bool8 SetUpFieldMove_RockSmash(void) { - if (CheckObjectGraphicsInFrontOfPlayer(/*MAP_OBJ_GFX_BREAKABLE_ROCK*/0x60) == TRUE) + if (CheckObjectGraphicsInFrontOfPlayer(OBJECT_EVENT_GFX_ROCK_SMASH_ROCK) == TRUE) { gFieldCallback2 = FieldCallback_PrepareFadeInFromMenu; gPostMenuFieldCallback = sub_80C9A10; |