diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/berry.c | 2 | ||||
| -rw-r--r-- | src/data/field_map_obj/anim_func_ptrs.h | 8 | ||||
| -rw-r--r-- | src/event_object_movement.c | 436 | ||||
| -rw-r--r-- | src/field_effect.c | 70 | ||||
| -rw-r--r-- | src/field_fadetransition.c | 12 | ||||
| -rw-r--r-- | src/field_player_avatar.c | 91 | ||||
| -rw-r--r-- | src/fldeff_berrytree.c | 10 | ||||
| -rw-r--r-- | src/item_use.c | 8 | ||||
| -rw-r--r-- | src/map_obj_lock.c | 12 | ||||
| -rw-r--r-- | src/overworld.c | 8 | ||||
| -rw-r--r-- | src/rom6.c | 8 | ||||
| -rw-r--r-- | src/scrcmd.c | 6 | ||||
| -rw-r--r-- | src/script_movement.c | 6 | ||||
| -rw-r--r-- | src/trainer_see.c | 46 |
14 files changed, 361 insertions, 362 deletions
diff --git a/src/berry.c b/src/berry.c index 8829407da..5a0e39580 100644 --- a/src/berry.c +++ b/src/berry.c @@ -1543,7 +1543,7 @@ void ResetBerryTreeSparkleFlags(void) bottom = top + 8; for (i = 0; i < (u8)ARRAY_COUNT(gSaveBlock1.mapObjects); i++) { - if (gMapObjects[i].active && gMapObjects[i].animPattern == 12) // is the object an active berry tree? + if (gMapObjects[i].active && gMapObjects[i].movementType == 12) // is the object an active berry tree? { cam_left = gMapObjects[i].currentCoords.x; cam_top = gMapObjects[i].currentCoords.y; diff --git a/src/data/field_map_obj/anim_func_ptrs.h b/src/data/field_map_obj/anim_func_ptrs.h index 1d1fac71e..22bb6794b 100644 --- a/src/data/field_map_obj/anim_func_ptrs.h +++ b/src/data/field_map_obj/anim_func_ptrs.h @@ -548,10 +548,10 @@ u8 (*const Unknown_8375FF0[])(struct MapObject *, struct Sprite *); u8 (*const Unknown_8375FFC[])(struct MapObject *, struct Sprite *); u8 (*const *const gUnknown_08375778[])(struct MapObject *, struct Sprite *) = { - Unknown_83759A0, - Unknown_83759A8, - Unknown_83759B0, - Unknown_83759B8, + Unknown_83759A0, // face south + Unknown_83759A8, // face north + Unknown_83759B0, // face west + Unknown_83759B8, // face east Unknown_83759D4, Unknown_83759E0, Unknown_83759EC, diff --git a/src/event_object_movement.c b/src/event_object_movement.c index 78ed41d77..168db72c5 100644 --- a/src/event_object_movement.c +++ b/src/event_object_movement.c @@ -1495,10 +1495,11 @@ const u32 gFieldEffectPic_Sparkle_1[] = INCBIN_U32("graphics/field_effect_object const u16 gFieldEffectObjectPalette3[] = INCBIN_U16("graphics/field_effect_objects/palettes/03.gbapal"); const u32 gFieldEffectPic_Bird[] = INCBIN_U32("graphics/field_effect_objects/pics/bird.4bpp"); -void (*const gUnknown_0836DA88[])(struct Sprite *) = +// movement type callbacks +static void (*const sMovementTypeCallbacks[])(struct Sprite *) = { - sub_805C884, - sub_805CDE8, + MovementType_None, // MOVEMENT_TYPE_NONE + sub_805CDE8, // MOVEMENT_TYPE_LOOK_AROUND sub_805C8AC, sub_805CF28, sub_805CF28, @@ -1573,7 +1574,7 @@ void (*const gUnknown_0836DA88[])(struct Sprite *) = sub_805FC00, sub_805FC00, sub_805FC00, - sub_805FC70 + sub_805FC70, }; const u8 gUnknown_0836DBBC[] = {0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}; @@ -1918,7 +1919,7 @@ void npc_clear_ids_and_state(struct MapObject *mapObj) mapObj->localId = 0xFF; mapObj->mapNum = 0xFF; mapObj->mapGroup = 0xFF; - mapObj->animId = 0xFF; + mapObj->movementActionId = 0xFF; } void npcs_clear_ids_and_state(void) @@ -2024,33 +2025,34 @@ u8 GetFieldObjectIdByLocalId(u8 localId) return 16; } -u8 InitFieldObjectStateFromTemplate(struct MapObjectTemplate *template, u8 b, u8 c) +u8 TryInitFieldObjectStateFromTemplate(struct MapObjectTemplate *template, u8 mapNum, u8 mapGroup) { struct MapObject *mapObj; u8 var; - s16 r3; - s16 r2; + s16 initialX; + s16 initialY; - if (GetAvailableFieldObjectSlot(template->localId, b, c, &var) != 0) + if (GetAvailableFieldObjectSlot(template->localId, mapNum, mapGroup, &var) != 0) return 16; + mapObj = (void *)&gMapObjects[var]; npc_clear_ids_and_state((struct MapObject *)mapObj); - r3 = template->x + 7; - r2 = template->y + 7; + initialX = template->x + 7; + initialY = template->y + 7; mapObj->active = TRUE; mapObj->triggerGroundEffectsOnMove = TRUE; mapObj->graphicsId = template->graphicsId; - mapObj->animPattern = template->movementType; + mapObj->movementType = template->movementType; mapObj->localId = template->localId; - mapObj->mapNum = b; + mapObj->mapNum = mapNum; asm("":::"r6"); - mapObj->mapGroup = c; - mapObj->initialCoords.x = r3; - mapObj->initialCoords.y = r2; - mapObj->currentCoords.x = r3; - mapObj->currentCoords.y = r2; - mapObj->previousCoords.x = r3; - mapObj->previousCoords.y = r2; + mapObj->mapGroup = mapGroup; + mapObj->initialCoords.x = initialX; + mapObj->initialCoords.y = initialY; + mapObj->currentCoords.x = initialX; + mapObj->currentCoords.y = initialY; + mapObj->previousCoords.x = initialX; + mapObj->previousCoords.y = initialY; mapObj->currentElevation = template->elevation; mapObj->previousElevation = template->elevation; mapObj->range.as_nybbles.x = template->unkA_0; @@ -2061,7 +2063,7 @@ u8 InitFieldObjectStateFromTemplate(struct MapObjectTemplate *template, u8 b, u8 FieldObjectSetDirection((struct MapObject *)mapObj, mapObj->previousMovementDirection); asm("":::"r5","r6"); FieldObjectHandleDynamicGraphicsId((struct MapObject *)mapObj); - if (gUnknown_0836DBBC[mapObj->animPattern] != 0) + if (gUnknown_0836DBBC[mapObj->movementType] != 0) { if (mapObj->range.as_nybbles.x == 0) mapObj->range.as_nybbles.x++; @@ -2087,7 +2089,7 @@ u8 sub_805ADDC(u8 localId) struct MapObjectTemplate *template = &gSaveBlock1.mapObjectTemplates[i]; if (template->localId == localId && !FlagGet(template->flagId)) - return InitFieldObjectStateFromTemplate(template, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup); + return TryInitFieldObjectStateFromTemplate(template, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup); } return 16; } @@ -2152,7 +2154,7 @@ void npc_hide_all_but_player(void) } } -u8 sub_805AFCC(struct MapObjectTemplate *mapObjTemplate, struct SpriteTemplate *sprTemplate, u8 c, u8 d, s16 e, s16 f) +u8 sub_805AFCC(struct MapObjectTemplate *mapObjTemplate, struct SpriteTemplate *sprTemplate, u8 mapNum, u8 mapGroup, s16 e, s16 f) { u8 mapObjectId; u8 spriteId; @@ -2160,7 +2162,7 @@ u8 sub_805AFCC(struct MapObjectTemplate *mapObjTemplate, struct SpriteTemplate * struct MapObject *mapObject; struct Sprite *sprite; - mapObjectId = InitFieldObjectStateFromTemplate(mapObjTemplate, c, d); + mapObjectId = TryInitFieldObjectStateFromTemplate(mapObjTemplate, mapNum, mapGroup); if (mapObjectId == 16) return 16; @@ -2170,7 +2172,7 @@ u8 sub_805AFCC(struct MapObjectTemplate *mapObjTemplate, struct SpriteTemplate * npc_load_two_palettes__no_record(gfxInfo->paletteTag1, gfxInfo->paletteSlot); else if (gfxInfo->paletteSlot == 10) npc_load_two_palettes__and_record(gfxInfo->paletteTag1, gfxInfo->paletteSlot); - if (mapObject->animPattern == 0x4C) + if (mapObject->movementType == 0x4C) mapObject->invisible = TRUE; #ifdef NONMATCHING @@ -2179,7 +2181,7 @@ u8 sub_805AFCC(struct MapObjectTemplate *mapObjTemplate, struct SpriteTemplate * *(u16 *)&sprTemplate->paletteTag = 0xFFFF; #endif spriteId = CreateSprite(sprTemplate, 0, 0, 0); - if (spriteId == 64) + if (spriteId == MAX_SPRITES) { #if DEBUG gUnknown_Debug_03004BC0--; @@ -2205,7 +2207,7 @@ u8 sub_805AFCC(struct MapObjectTemplate *mapObjTemplate, struct SpriteTemplate * return mapObjectId; } -u8 SpawnFieldObject(struct MapObjectTemplate *mapObjTemplate, u8 b, u8 c, s16 d, s16 e) +u8 TrySpawnFieldObject(struct MapObjectTemplate *mapObjTemplate, u8 mapNum, u8 mapGroup, s16 cameraDeltaX, s16 cameraDeltaY) { struct SpriteTemplate spriteTemplate; const struct SubspriteTable *subspriteTables = NULL; @@ -2217,7 +2219,7 @@ u8 SpawnFieldObject(struct MapObjectTemplate *mapObjTemplate, u8 b, u8 c, s16 d, MakeObjectTemplateFromFieldObjectTemplate(mapObjTemplate, &spriteTemplate, &subspriteTables); spriteFrameImage.size = gfxInfo->size; spriteTemplate.images = &spriteFrameImage; - mapObjectId = sub_805AFCC(mapObjTemplate, &spriteTemplate, b, c, d, e); + mapObjectId = sub_805AFCC(mapObjTemplate, &spriteTemplate, mapNum, mapGroup, cameraDeltaX, cameraDeltaY); if (mapObjectId == 16) return 16; gSprites[gMapObjects[mapObjectId].spriteId].images = gfxInfo->images; @@ -2232,7 +2234,7 @@ u8 SpawnSpecialFieldObject(struct MapObjectTemplate *mapObjTemplate) s16 y; GetFieldObjectMovingCameraOffset(&x, &y); - return SpawnFieldObject(mapObjTemplate, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup, x, y); + return TrySpawnFieldObject(mapObjTemplate, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup, x, y); } u8 SpawnSpecialFieldObjectParametrized(u8 a, u8 b, u8 c, s16 d, s16 e, u8 f) @@ -2265,7 +2267,7 @@ u8 show_sprite(u8 a, u8 b, u8 c) if (r5 == NULL) return 16; GetFieldObjectMovingCameraOffset(&x, &y); - return SpawnFieldObject(r5, b, c, x, y); + return TrySpawnFieldObject(r5, b, c, x, y); } void MakeObjectTemplateFromFieldObjectGraphicsInfo(u16 graphicsId, void (*callback)(struct Sprite *), struct SpriteTemplate *sprTemplate, const struct SubspriteTable **subspriteTables) @@ -2284,7 +2286,7 @@ void MakeObjectTemplateFromFieldObjectGraphicsInfo(u16 graphicsId, void (*callba void MakeObjectTemplateFromFieldObjectGraphicsInfoWithCallbackIndex(u16 graphicsId, u16 callbackIndex, struct SpriteTemplate *sprTemplate, const struct SubspriteTable **subspriteTables) { - MakeObjectTemplateFromFieldObjectGraphicsInfo(graphicsId, gUnknown_0836DA88[callbackIndex], sprTemplate, subspriteTables); + MakeObjectTemplateFromFieldObjectGraphicsInfo(graphicsId, sMovementTypeCallbacks[callbackIndex], sprTemplate, subspriteTables); } void MakeObjectTemplateFromFieldObjectTemplate(struct MapObjectTemplate *mapObjTemplate, struct SpriteTemplate *sprTemplate, const struct SubspriteTable **subspriteTables) @@ -2357,7 +2359,7 @@ u8 sub_805B410(u8 graphicsId, u8 b, s16 x, s16 y, u8 elevation, u8 direction) return spriteId; } -void sub_805B55C(s16 a, s16 b) +void TrySpawnFieldObjects(s16 cameraDeltaX, s16 cameraDeltaY) { u8 i; @@ -2377,7 +2379,7 @@ void sub_805B55C(s16 a, s16 b) if (r10 <= bar && spC >= bar && r9 <= foo && sp8 >= foo && !FlagGet(template->flagId)) - SpawnFieldObject(template, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup, a, b); + TrySpawnFieldObject(template, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup, cameraDeltaX, cameraDeltaY); } } } @@ -2472,7 +2474,7 @@ void sub_805B75C(u8 a, s16 b, s16 c) subspriteTables = NULL; gfxInfo = GetFieldObjectGraphicsInfo(mapObject->graphicsId); sp18.size = gfxInfo->size; - MakeObjectTemplateFromFieldObjectGraphicsInfoWithCallbackIndex(mapObject->graphicsId, mapObject->animPattern, &sp0, &subspriteTables); + MakeObjectTemplateFromFieldObjectGraphicsInfoWithCallbackIndex(mapObject->graphicsId, mapObject->movementType, &sp0, &subspriteTables); sp0.images = &sp18; *(u16 *)&sp0.paletteTag = 0xFFFF; if (gfxInfo->paletteSlot == 0) @@ -2491,7 +2493,7 @@ void sub_805B75C(u8 a, s16 b, s16 c) sprite->pos1.x += 8; sprite->pos1.y += 16 + sprite->centerToCornerVecY; sprite->images = gfxInfo->images; - if (mapObject->animPattern == 11) + if (mapObject->movementType == 11) { SetPlayerAvatarFieldObjectIdAndObjectId(a, spriteId); mapObject->warpArrowSpriteId = sub_8126B54(); @@ -2502,7 +2504,7 @@ void sub_805B75C(u8 a, s16 b, s16 c) sprite->coordOffsetEnabled = TRUE; sprite->data[0] = a; mapObject->spriteId = spriteId; - if (!mapObject->inanimate && mapObject->animPattern != 11) + if (!mapObject->inanimate && mapObject->movementType != 11) StartSpriteAnim(sprite, FieldObjectDirectionToImageAnimId(mapObject->facingDirection)); sub_805B914(mapObject); SetObjectSubpriorityByZCoord(mapObject->previousElevation, sprite, 1); @@ -2511,7 +2513,7 @@ void sub_805B75C(u8 a, s16 b, s16 c) void sub_805B914(struct MapObject *mapObject) { - mapObject->regularAnimActive = FALSE; + mapObject->singleMovementActive = FALSE; mapObject->triggerGroundEffectsOnMove = TRUE; mapObject->hasShadow = FALSE; mapObject->hasReflection = FALSE; @@ -2519,7 +2521,7 @@ void sub_805B914(struct MapObject *mapObject) mapObject->inShallowFlowingWater = FALSE; mapObject->inSandPile = FALSE; mapObject->inHotSprings = FALSE; - FieldObjectClearAnim(mapObject); + FieldObjectClearHeldMovement(mapObject); } void SetPlayerAvatarFieldObjectIdAndObjectId(u8 mapObjectId, u8 spriteId) @@ -2890,10 +2892,10 @@ bool8 FieldObjectDoesZCoordMatch(struct MapObject *mapObject, u8 z) return TRUE; } -void UpdateFieldObjectsForCameraUpdate(s16 x, s16 y) +void UpdateFieldObjectsForCameraUpdate(s16 cameraDeltaX, s16 cameraDeltaY) { UpdateFieldObjectCoordsForCameraUpdate(); - sub_805B55C(x, y); + TrySpawnFieldObjects(cameraDeltaX, cameraDeltaY); RemoveFieldObjectsOutsideView(); } @@ -3187,7 +3189,7 @@ u16 npc_paltag_by_palslot(u8 a) return 0x11FF; } -fieldmap_object_null_cb(sub_805C884, sub_805C8A8); +fieldmap_object_empty_callback(MovementType_None, MovementType_None_Callback); fieldmap_object_cb(sub_805C8AC, sub_805C8D0, gUnknown_08375224); u8 sub_805C8F0(struct MapObject *mapObject, struct Sprite *sprite) @@ -3197,21 +3199,21 @@ u8 sub_805C8F0(struct MapObject *mapObject, struct Sprite *sprite) return 1; } -extern void FieldObjectSetRegularAnim(struct MapObject *, struct Sprite *, u8); +extern void FieldObjectSetSingleMovement(struct MapObject *, struct Sprite *, u8); u8 sub_805C904(struct MapObject *mapObject, struct Sprite *sprite) { - FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->facingDirection)); + FieldObjectSetSingleMovement(mapObject, sprite, GetFaceDirectionAnimId(mapObject->facingDirection)); sprite->data[1] = 2; return 1; } -extern u8 FieldObjectExecRegularAnim(struct MapObject *, struct Sprite *); +extern u8 FieldObjectExecSingleMovementAction(struct MapObject *, struct Sprite *); void sub_8064820(struct Sprite *, s16); u8 sub_805C930(struct MapObject *mapObject, struct Sprite *sprite) { - if (FieldObjectExecRegularAnim(mapObject, sprite) == 0) + if (FieldObjectExecSingleMovementAction(mapObject, sprite) == 0) { return 0; } @@ -3251,17 +3253,17 @@ u8 sub_805C98C(struct MapObject *mapObject, struct Sprite *sprite) u8 sub_805C9D8(struct MapObject *mapObject, struct Sprite *sprite) { - FieldObjectSetRegularAnim(mapObject, sprite, GetGoSpeed0AnimId(mapObject->movementDirection)); - mapObject->regularAnimActive = 1; + FieldObjectSetSingleMovement(mapObject, sprite, GetGoSpeed0AnimId(mapObject->movementDirection)); + mapObject->singleMovementActive = 1; sprite->data[1] = 6; return 1; } u8 sub_805CA08(struct MapObject *mapObject, struct Sprite *sprite) { - if (FieldObjectExecRegularAnim(mapObject, sprite) != 0) + if (FieldObjectExecSingleMovementAction(mapObject, sprite) != 0) { - mapObject->regularAnimActive = 0; + mapObject->singleMovementActive = 0; sprite->data[1] = 1; } return 0; @@ -3515,17 +3517,17 @@ u8 sub_805CE2C(struct MapObject *mapObject, struct Sprite *sprite) u8 sub_805CE40(struct MapObject *mapObject, struct Sprite *sprite) { - FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->facingDirection)); + FieldObjectSetSingleMovement(mapObject, sprite, GetFaceDirectionAnimId(mapObject->facingDirection)); sprite->data[1] = 2; return 1; } u8 sub_805CE6C(struct MapObject *mapObject, struct Sprite *sprite) { - if (FieldObjectExecRegularAnim(mapObject, sprite) != 0) + if (FieldObjectExecSingleMovementAction(mapObject, sprite) != 0) { sub_8064820(sprite, gUnknown_0837520C[Random() & 3]); - mapObject->regularAnimActive = 0; + mapObject->singleMovementActive = 0; sprite->data[1] = 3; } return 0; @@ -3567,14 +3569,14 @@ u8 sub_805CF6C(struct MapObject *mapObject, struct Sprite *sprite) u8 sub_805CF80(struct MapObject *mapObject, struct Sprite *sprite) { - FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->facingDirection)); + FieldObjectSetSingleMovement(mapObject, sprite, GetFaceDirectionAnimId(mapObject->facingDirection)); sprite->data[1] = 2; return 1; } u8 sub_805CFAC(struct MapObject *mapObject, struct Sprite *sprite) { - if (FieldObjectExecRegularAnim(mapObject, sprite) == 0) + if (FieldObjectExecSingleMovementAction(mapObject, sprite) == 0) { return 0; } @@ -3610,17 +3612,17 @@ u8 sub_805D008(struct MapObject *mapObject, struct Sprite *sprite) u8 sub_805D054(struct MapObject *mapObject, struct Sprite *sprite) { - FieldObjectSetRegularAnim(mapObject, sprite, GetGoSpeed0AnimId(mapObject->movementDirection)); - mapObject->regularAnimActive = 1; + FieldObjectSetSingleMovement(mapObject, sprite, GetGoSpeed0AnimId(mapObject->movementDirection)); + mapObject->singleMovementActive = 1; sprite->data[1] = 6; return 1; } u8 sub_805D084(struct MapObject *mapObject, struct Sprite *sprite) { - if (FieldObjectExecRegularAnim(mapObject, sprite) != 0) + if (FieldObjectExecSingleMovementAction(mapObject, sprite) != 0) { - mapObject->regularAnimActive = 0; + mapObject->singleMovementActive = 0; sprite->data[1] = 1; } return 0; @@ -3637,14 +3639,14 @@ u8 sub_805D0F0(struct MapObject *mapObject, struct Sprite *sprite) u8 sub_805D104(struct MapObject *mapObject, struct Sprite *sprite) { - FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->facingDirection)); + FieldObjectSetSingleMovement(mapObject, sprite, GetFaceDirectionAnimId(mapObject->facingDirection)); sprite->data[1] = 2; return 1; } u8 sub_805D130(struct MapObject *mapObject, struct Sprite *sprite) { - if (FieldObjectExecRegularAnim(mapObject, sprite) == 0) + if (FieldObjectExecSingleMovementAction(mapObject, sprite) == 0) { return 0; } @@ -3680,17 +3682,17 @@ u8 sub_805D18C(struct MapObject *mapObject, struct Sprite *sprite) u8 sub_805D1D8(struct MapObject *mapObject, struct Sprite *sprite) { - FieldObjectSetRegularAnim(mapObject, sprite, GetGoSpeed0AnimId(mapObject->movementDirection)); - mapObject->regularAnimActive = 1; + FieldObjectSetSingleMovement(mapObject, sprite, GetGoSpeed0AnimId(mapObject->movementDirection)); + mapObject->singleMovementActive = 1; sprite->data[1] = 6; return 1; } u8 sub_805D208(struct MapObject *mapObject, struct Sprite *sprite) { - if (FieldObjectExecRegularAnim(mapObject, sprite) != 0) + if (FieldObjectExecSingleMovementAction(mapObject, sprite) != 0) { - mapObject->regularAnimActive = 0; + mapObject->singleMovementActive = 0; sprite->data[1] = 1; } return 0; @@ -3701,14 +3703,14 @@ fieldmap_object_cb(sub_805D230, sub_805D254, gUnknown_083752C4); u8 sub_805D274(struct MapObject *mapObject, struct Sprite *sprite) { npc_reset(mapObject, sprite); - FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->facingDirection)); + FieldObjectSetSingleMovement(mapObject, sprite, GetFaceDirectionAnimId(mapObject->facingDirection)); sprite->data[1] = 1; return 1; } u8 sub_805D2A0(struct MapObject *mapObject, struct Sprite *sprite) { - if (FieldObjectExecRegularAnim(mapObject, sprite) != 0) + if (FieldObjectExecSingleMovementAction(mapObject, sprite) != 0) { sprite->data[1] = 2; return 1; @@ -3718,7 +3720,7 @@ u8 sub_805D2A0(struct MapObject *mapObject, struct Sprite *sprite) u8 sub_805D2C0(struct MapObject *mapObject, struct Sprite *sprite) { - mapObject->regularAnimActive = 0; + mapObject->singleMovementActive = 0; return 0; } @@ -3770,14 +3772,14 @@ u8 do_berry_tree_growth_sparkle_1(struct MapObject *mapObject, struct Sprite *sp return 1; } get_berry_tree_graphics(mapObject, sprite); - FieldObjectSetRegularAnim(mapObject, sprite, 0x39); + FieldObjectSetSingleMovement(mapObject, sprite, 0x39); sprite->data[1] = 1; return 1; } u8 sub_805D3EC(struct MapObject *mapObject, struct Sprite *sprite) { - if (FieldObjectExecRegularAnim(mapObject, sprite)) + if (FieldObjectExecSingleMovementAction(mapObject, sprite)) { sprite->data[1] = 0; return 1; @@ -3787,7 +3789,7 @@ u8 sub_805D3EC(struct MapObject *mapObject, struct Sprite *sprite) u8 do_berry_tree_growth_sparkle_2(struct MapObject *mapObject, struct Sprite *sprite) { - mapObject->regularAnimActive = 1; + mapObject->singleMovementActive = 1; sprite->data[1] = 3; sprite->data[2] = 0; sprite->data[7] |= 2; @@ -3839,17 +3841,17 @@ u8 sub_805D538(struct MapObject *mapObject, struct Sprite *sprite) u8 sub_805D54C(struct MapObject *mapObject, struct Sprite *sprite) { - FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->facingDirection)); + FieldObjectSetSingleMovement(mapObject, sprite, GetFaceDirectionAnimId(mapObject->facingDirection)); sprite->data[1] = 2; return 1; } u8 sub_805D578(struct MapObject *mapObject, struct Sprite *sprite) { - if (FieldObjectExecRegularAnim(mapObject, sprite)) + if (FieldObjectExecSingleMovementAction(mapObject, sprite)) { sub_8064820(sprite, gUnknown_0837520C[Random() & 3]); - mapObject->regularAnimActive = 0; + mapObject->singleMovementActive = 0; sprite->data[1] = 3; } return 0; @@ -3891,17 +3893,17 @@ u8 sub_805D678(struct MapObject *mapObject, struct Sprite *sprite) u8 sub_805D68C(struct MapObject *mapObject, struct Sprite *sprite) { - FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->facingDirection)); + FieldObjectSetSingleMovement(mapObject, sprite, GetFaceDirectionAnimId(mapObject->facingDirection)); sprite->data[1] = 2; return 1; } u8 sub_805D6B8(struct MapObject *mapObject, struct Sprite *sprite) { - if (FieldObjectExecRegularAnim(mapObject, sprite)) + if (FieldObjectExecSingleMovementAction(mapObject, sprite)) { sub_8064820(sprite, gUnknown_0837520C[Random() & 3]); - mapObject->regularAnimActive = 0; + mapObject->singleMovementActive = 0; sprite->data[1] = 3; } return 0; @@ -3943,17 +3945,17 @@ u8 sub_805D7B8(struct MapObject *mapObject, struct Sprite *sprite) u8 sub_805D7CC(struct MapObject *mapObject, struct Sprite *sprite) { - FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->facingDirection)); + FieldObjectSetSingleMovement(mapObject, sprite, GetFaceDirectionAnimId(mapObject->facingDirection)); sprite->data[1] = 2; return 1; } u8 sub_805D7F8(struct MapObject *mapObject, struct Sprite *sprite) { - if (FieldObjectExecRegularAnim(mapObject, sprite)) + if (FieldObjectExecSingleMovementAction(mapObject, sprite)) { sub_8064820(sprite, gUnknown_0837521C[Random() & 3]); - mapObject->regularAnimActive = 0; + mapObject->singleMovementActive = 0; sprite->data[1] = 3; } return 0; @@ -3995,17 +3997,17 @@ u8 sub_805D8F8(struct MapObject *mapObject, struct Sprite *sprite) u8 sub_805D90C(struct MapObject *mapObject, struct Sprite *sprite) { - FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->facingDirection)); + FieldObjectSetSingleMovement(mapObject, sprite, GetFaceDirectionAnimId(mapObject->facingDirection)); sprite->data[1] = 2; return 1; } u8 sub_805D938(struct MapObject *mapObject, struct Sprite *sprite) { - if (FieldObjectExecRegularAnim(mapObject, sprite)) + if (FieldObjectExecSingleMovementAction(mapObject, sprite)) { sub_8064820(sprite, gUnknown_0837521C[Random() & 3]); - mapObject->regularAnimActive = 0; + mapObject->singleMovementActive = 0; sprite->data[1] = 3; } return 0; @@ -4047,17 +4049,17 @@ u8 sub_805DA38(struct MapObject *mapObject, struct Sprite *sprite) u8 sub_805DA4C(struct MapObject *mapObject, struct Sprite *sprite) { - FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->facingDirection)); + FieldObjectSetSingleMovement(mapObject, sprite, GetFaceDirectionAnimId(mapObject->facingDirection)); sprite->data[1] = 2; return 1; } u8 sub_805DA78(struct MapObject *mapObject, struct Sprite *sprite) { - if (FieldObjectExecRegularAnim(mapObject, sprite)) + if (FieldObjectExecSingleMovementAction(mapObject, sprite)) { sub_8064820(sprite, gUnknown_0837521C[Random() & 3]); - mapObject->regularAnimActive = 0; + mapObject->singleMovementActive = 0; sprite->data[1] = 3; } return 0; @@ -4099,17 +4101,17 @@ u8 sub_805DB78(struct MapObject *mapObject, struct Sprite *sprite) u8 sub_805DB8C(struct MapObject *mapObject, struct Sprite *sprite) { - FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->facingDirection)); + FieldObjectSetSingleMovement(mapObject, sprite, GetFaceDirectionAnimId(mapObject->facingDirection)); sprite->data[1] = 2; return 1; } u8 sub_805DBB8(struct MapObject *mapObject, struct Sprite *sprite) { - if (FieldObjectExecRegularAnim(mapObject, sprite)) + if (FieldObjectExecSingleMovementAction(mapObject, sprite)) { sub_8064820(sprite, gUnknown_0837521C[Random() & 3]); - mapObject->regularAnimActive = 0; + mapObject->singleMovementActive = 0; sprite->data[1] = 3; } return 0; @@ -4151,17 +4153,17 @@ u8 sub_805DCB8(struct MapObject *mapObject, struct Sprite *sprite) u8 sub_805DCCC(struct MapObject *mapObject, struct Sprite *sprite) { - FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->facingDirection)); + FieldObjectSetSingleMovement(mapObject, sprite, GetFaceDirectionAnimId(mapObject->facingDirection)); sprite->data[1] = 2; return 1; } u8 sub_805DCF8(struct MapObject *mapObject, struct Sprite *sprite) { - if (FieldObjectExecRegularAnim(mapObject, sprite)) + if (FieldObjectExecSingleMovementAction(mapObject, sprite)) { sub_8064820(sprite, gUnknown_0837521C[Random() & 3]); - mapObject->regularAnimActive = 0; + mapObject->singleMovementActive = 0; sprite->data[1] = 3; } return 0; @@ -4203,17 +4205,17 @@ u8 sub_805DDF8(struct MapObject *mapObject, struct Sprite *sprite) u8 sub_805DE0C(struct MapObject *mapObject, struct Sprite *sprite) { - FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->facingDirection)); + FieldObjectSetSingleMovement(mapObject, sprite, GetFaceDirectionAnimId(mapObject->facingDirection)); sprite->data[1] = 2; return 1; } u8 sub_805DE38(struct MapObject *mapObject, struct Sprite *sprite) { - if (FieldObjectExecRegularAnim(mapObject, sprite)) + if (FieldObjectExecSingleMovementAction(mapObject, sprite)) { sub_8064820(sprite, gUnknown_0837521C[Random() & 3]); - mapObject->regularAnimActive = 0; + mapObject->singleMovementActive = 0; sprite->data[1] = 3; } return 0; @@ -4255,17 +4257,17 @@ u8 sub_805DF38(struct MapObject *mapObject, struct Sprite *sprite) u8 sub_805DF4C(struct MapObject *mapObject, struct Sprite *sprite) { - FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->facingDirection)); + FieldObjectSetSingleMovement(mapObject, sprite, GetFaceDirectionAnimId(mapObject->facingDirection)); sprite->data[1] = 2; return 1; } u8 sub_805DF78(struct MapObject *mapObject, struct Sprite *sprite) { - if (FieldObjectExecRegularAnim(mapObject, sprite)) + if (FieldObjectExecSingleMovementAction(mapObject, sprite)) { sub_8064820(sprite, gUnknown_0837521C[Random() & 3]); - mapObject->regularAnimActive = 0; + mapObject->singleMovementActive = 0; sprite->data[1] = 3; } return 0; @@ -4307,17 +4309,17 @@ u8 sub_805E078(struct MapObject *mapObject, struct Sprite *sprite) u8 sub_805E08C(struct MapObject *mapObject, struct Sprite *sprite) { - FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->facingDirection)); + FieldObjectSetSingleMovement(mapObject, sprite, GetFaceDirectionAnimId(mapObject->facingDirection)); sprite->data[1] = 2; return 1; } u8 sub_805E0B8(struct MapObject *mapObject, struct Sprite *sprite) { - if (FieldObjectExecRegularAnim(mapObject, sprite)) + if (FieldObjectExecSingleMovementAction(mapObject, sprite)) { sub_8064820(sprite, gUnknown_0837521C[Random() & 3]); - mapObject->regularAnimActive = 0; + mapObject->singleMovementActive = 0; sprite->data[1] = 3; } return 0; @@ -4353,14 +4355,14 @@ fieldmap_object_cb(sub_805E174, sub_805E198, gUnknown_083753CC); u8 sub_805E1B8(struct MapObject *mapObject, struct Sprite *sprite) { npc_reset(mapObject, sprite); - FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->facingDirection)); + FieldObjectSetSingleMovement(mapObject, sprite, GetFaceDirectionAnimId(mapObject->facingDirection)); sprite->data[1] = 1; return 1; } u8 sub_805E1E4(struct MapObject *mapObject, struct Sprite *sprite) { - if (FieldObjectExecRegularAnim(mapObject, sprite)) + if (FieldObjectExecSingleMovementAction(mapObject, sprite)) { sub_8064820(sprite, 0x30); sprite->data[1] = 2; @@ -4397,14 +4399,14 @@ fieldmap_object_cb(sub_805E278, sub_803E29C, gUnknown_083753E4); u8 sub_805E2BC(struct MapObject *mapObject, struct Sprite *sprite) { npc_reset(mapObject, sprite); - FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->facingDirection)); + FieldObjectSetSingleMovement(mapObject, sprite, GetFaceDirectionAnimId(mapObject->facingDirection)); sprite->data[1] = 1; return 1; } u8 sub_805E2E8(struct MapObject *mapObject, struct Sprite *sprite) { - if (FieldObjectExecRegularAnim(mapObject, sprite)) + if (FieldObjectExecSingleMovementAction(mapObject, sprite)) { sub_8064820(sprite, 0x30); sprite->data[1] = 2; @@ -4448,7 +4450,7 @@ u8 sub_805E3C0(struct MapObject *mapObject, struct Sprite *sprite) u8 sub_805E3D4(struct MapObject *mapObject, struct Sprite *sprite) { u8 direction; - direction = gUnknown_0836DC09[mapObject->animPattern]; + direction = gUnknown_0836DC09[mapObject->movementType]; if (mapObject->directionSequenceIndex != 0) { direction = GetOppositeDirection(direction); @@ -4480,17 +4482,17 @@ u8 sub_805E40C(struct MapObject *mapObject, struct Sprite *sprite) { goSpeed0AnimId = GetStepInPlaceDelay16AnimId(mapObject->facingDirection); } - FieldObjectSetRegularAnim(mapObject, sprite, goSpeed0AnimId); - mapObject->regularAnimActive = 1; + FieldObjectSetSingleMovement(mapObject, sprite, goSpeed0AnimId); + mapObject->singleMovementActive = 1; sprite->data[1] = 3; return 1; } u8 sub_805E4C4(struct MapObject *mapObject, struct Sprite *sprite) { - if (FieldObjectExecRegularAnim(mapObject, sprite)) + if (FieldObjectExecSingleMovementAction(mapObject, sprite)) { - mapObject->regularAnimActive = 0; + mapObject->singleMovementActive = 0; sprite->data[1] = 1; } return 0; @@ -4525,17 +4527,17 @@ u8 MoveFieldObjectInNextDirectionInSequence(struct MapObject *mapObject, struct { goSpeed0AnimId = GetStepInPlaceDelay16AnimId(mapObject->facingDirection); } - FieldObjectSetRegularAnim(mapObject, sprite, goSpeed0AnimId); - mapObject->regularAnimActive = 1; + FieldObjectSetSingleMovement(mapObject, sprite, goSpeed0AnimId); + mapObject->singleMovementActive = 1; sprite->data[1] = 2; return 1; } u8 sub_805E5B4(struct MapObject *mapObject, struct Sprite *sprite) { - if (FieldObjectExecRegularAnim(mapObject, sprite)) + if (FieldObjectExecSingleMovementAction(mapObject, sprite)) { - mapObject->regularAnimActive = 0; + mapObject->singleMovementActive = 0; sprite->data[1] = 1; } return 0; @@ -4870,7 +4872,7 @@ u8 mss_npc_reset_oampriv3_1_unk2_unk3(struct MapObject *mapObject, struct Sprite u8 sub_805F364(struct MapObject *mapObject, struct Sprite *sprite) { - if (gMapObjects[gPlayerAvatar.mapObjectId].animId == 0xFF || gPlayerAvatar.tileTransitionState == T_TILE_CENTER) + if (gMapObjects[gPlayerAvatar.mapObjectId].movementActionId == 0xFF || gPlayerAvatar.tileTransitionState == T_TILE_CENTER) { return 0; } @@ -4879,9 +4881,9 @@ u8 sub_805F364(struct MapObject *mapObject, struct Sprite *sprite) u8 sub_805F3C4(struct MapObject *mapObject, struct Sprite *sprite) { - if (FieldObjectExecRegularAnim(mapObject, sprite)) + if (FieldObjectExecSingleMovementAction(mapObject, sprite)) { - mapObject->regularAnimActive = 0; + mapObject->singleMovementActive = 0; sprite->data[1] = 1; } return 0; @@ -4894,8 +4896,8 @@ bool8 sub_805F3EC(struct MapObject *mapObject, struct Sprite *sprite, u8 a2, boo bool8 sub_805F3F0(struct MapObject *mapObject, struct Sprite *sprite, u8 a2, bool8 a3(u8)) { - FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(state_to_direction(gUnknown_0836DC09[mapObject->animPattern], mapObject->directionSequenceIndex, a2))); - mapObject->regularAnimActive = 1; + FieldObjectSetSingleMovement(mapObject, sprite, GetFaceDirectionAnimId(state_to_direction(gUnknown_0836DC09[mapObject->movementType], mapObject->directionSequenceIndex, a2))); + mapObject->singleMovementActive = 1; sprite->data[1] = 2; return 1; } @@ -4907,14 +4909,14 @@ bool8 sub_805F438(struct MapObject *mapObject, struct Sprite *sprite, u8 a2, boo s16 y; direction = a2; - direction = state_to_direction(gUnknown_0836DC09[mapObject->animPattern], mapObject->directionSequenceIndex, direction); + direction = state_to_direction(gUnknown_0836DC09[mapObject->movementType], mapObject->directionSequenceIndex, direction); FieldObjectMoveDestCoords(mapObject, direction, &x, &y); - FieldObjectSetRegularAnim(mapObject, sprite, GetGoSpeed0AnimId(direction)); + FieldObjectSetSingleMovement(mapObject, sprite, GetGoSpeed0AnimId(direction)); if (npc_block_way(mapObject, x, y, direction) || (a3 != NULL && !a3(MapGridGetMetatileBehaviorAt(x, y)))) { - FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(direction)); + FieldObjectSetSingleMovement(mapObject, sprite, GetFaceDirectionAnimId(direction)); } - mapObject->regularAnimActive = 1; + mapObject->singleMovementActive = 1; sprite->data[1] = 2; return 1; } @@ -4926,14 +4928,14 @@ bool8 sub_805F4F0(struct MapObject *mapObject, struct Sprite *sprite, u8 playerD s16 y; direction = playerDirection; - direction = state_to_direction(gUnknown_0836DC09[mapObject->animPattern], mapObject->directionSequenceIndex, direction); + direction = state_to_direction(gUnknown_0836DC09[mapObject->movementType], mapObject->directionSequenceIndex, direction); FieldObjectMoveDestCoords(mapObject, direction, &x, &y); - FieldObjectSetRegularAnim(mapObject, sprite, sub_8060744(direction)); + FieldObjectSetSingleMovement(mapObject, sprite, sub_8060744(direction)); if (npc_block_way(mapObject, x, y, direction) || (tileCB != NULL && !tileCB(MapGridGetMetatileBehaviorAt(x, y)))) { - FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(direction)); + FieldObjectSetSingleMovement(mapObject, sprite, GetFaceDirectionAnimId(direction)); } - mapObject->regularAnimActive = TRUE; + mapObject->singleMovementActive = TRUE; sprite->data[1] = 2; return TRUE; } @@ -4945,14 +4947,14 @@ bool8 sub_805F5A8(struct MapObject *mapObject, struct Sprite *sprite, u8 playerD s16 y; direction = playerDirection; - direction = state_to_direction(gUnknown_0836DC09[mapObject->animPattern], mapObject->directionSequenceIndex, direction); + direction = state_to_direction(gUnknown_0836DC09[mapObject->movementType], mapObject->directionSequenceIndex, direction); FieldObjectMoveDestCoords(mapObject, direction, &x, &y); - FieldObjectSetRegularAnim(mapObject, sprite, sub_806079C(direction)); + FieldObjectSetSingleMovement(mapObject, sprite, sub_806079C(direction)); if (npc_block_way(mapObject, x, y, direction) || (tileCB != NULL && !tileCB(MapGridGetMetatileBehaviorAt(x, y)))) { - FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(direction)); + FieldObjectSetSingleMovement(mapObject, sprite, GetFaceDirectionAnimId(direction)); } - mapObject->regularAnimActive = TRUE; + mapObject->singleMovementActive = TRUE; sprite->data[1] = 2; return TRUE; } @@ -4964,14 +4966,14 @@ bool8 sub_805F660(struct MapObject *mapObject, struct Sprite *sprite, u8 playerD s16 y; direction = playerDirection; - direction = state_to_direction(gUnknown_0836DC09[mapObject->animPattern], mapObject->directionSequenceIndex, direction); + direction = state_to_direction(gUnknown_0836DC09[mapObject->movementType], mapObject->directionSequenceIndex, direction); FieldObjectMoveDestCoords(mapObject, direction, &x, &y); - FieldObjectSetRegularAnim(mapObject, sprite, sub_80607C8(direction)); + FieldObjectSetSingleMovement(mapObject, sprite, sub_80607C8(direction)); if (npc_block_way(mapObject, x, y, direction) || (tileCB != NULL && !tileCB(MapGridGetMetatileBehaviorAt(x, y)))) { - FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(direction)); + FieldObjectSetSingleMovement(mapObject, sprite, GetFaceDirectionAnimId(direction)); } - mapObject->regularAnimActive = TRUE; + mapObject->singleMovementActive = TRUE; sprite->data[1] = 2; return TRUE; } @@ -4981,9 +4983,9 @@ bool8 cph_IM_DIFFERENT(struct MapObject *mapObject, struct Sprite *sprite, u8 pl u32 direction; direction = playerDirection; - direction = state_to_direction(gUnknown_0836DC09[mapObject->animPattern], mapObject->directionSequenceIndex, direction); - FieldObjectSetRegularAnim(mapObject, sprite, sub_806084C(direction)); - mapObject->regularAnimActive = TRUE; + direction = state_to_direction(gUnknown_0836DC09[mapObject->movementType], mapObject->directionSequenceIndex, direction); + FieldObjectSetSingleMovement(mapObject, sprite, sub_806084C(direction)); + mapObject->singleMovementActive = TRUE; sprite->data[1] = 2; return TRUE; } @@ -4995,14 +4997,14 @@ bool8 sub_805F760(struct MapObject *mapObject, struct Sprite *sprite, u8 playerD s16 y; direction = playerDirection; - direction = state_to_direction(gUnknown_0836DC09[mapObject->animPattern], mapObject->directionSequenceIndex, direction); + direction = state_to_direction(gUnknown_0836DC09[mapObject->movementType], mapObject->directionSequenceIndex, direction); FieldObjectMoveDestCoords(mapObject, direction, &x, &y); - FieldObjectSetRegularAnim(mapObject, sprite, sub_80608A4(direction)); + FieldObjectSetSingleMovement(mapObject, sprite, sub_80608A4(direction)); if (npc_block_way(mapObject, x, y, direction) || (tileCB != NULL && !tileCB(MapGridGetMetatileBehaviorAt(x, y)))) { - FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(direction)); + FieldObjectSetSingleMovement(mapObject, sprite, GetFaceDirectionAnimId(direction)); } - mapObject->regularAnimActive = TRUE; + mapObject->singleMovementActive = TRUE; sprite->data[1] = 2; return TRUE; } @@ -5014,16 +5016,16 @@ bool8 oac_hopping(struct MapObject *mapObject, struct Sprite *sprite, u8 playerD s16 y; direction = playerDirection; - direction = state_to_direction(gUnknown_0836DC09[mapObject->animPattern], mapObject->directionSequenceIndex, direction); + direction = state_to_direction(gUnknown_0836DC09[mapObject->movementType], mapObject->directionSequenceIndex, direction); x = mapObject->currentCoords.x; y = mapObject->currentCoords.y; sub_8060320(direction, &x, &y, 2, 2); - FieldObjectSetRegularAnim(mapObject, sprite, GetJumpLedgeAnimId(direction)); + FieldObjectSetSingleMovement(mapObject, sprite, GetJumpLedgeAnimId(direction)); if (npc_block_way(mapObject, x, y, direction) || (tileCB != NULL && !tileCB(MapGridGetMetatileBehaviorAt(x, y)))) { - FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(direction)); + FieldObjectSetSingleMovement(mapObject, sprite, GetFaceDirectionAnimId(direction)); } - mapObject->regularAnimActive = TRUE; + mapObject->singleMovementActive = TRUE; sprite->data[1] = 2; return TRUE; } @@ -5032,7 +5034,7 @@ fieldmap_object_cb(sub_805F8E0, sub_805F904, gUnknown_083755C0); u8 mss_08062EA4(struct MapObject *mapObject, struct Sprite *sprite) { - if (gMapObjects[gPlayerAvatar.mapObjectId].animId == 0xFF || gPlayerAvatar.tileTransitionState == T_TILE_CENTER) + if (gMapObjects[gPlayerAvatar.mapObjectId].movementActionId == 0xFF || gPlayerAvatar.tileTransitionState == T_TILE_CENTER) { return 0; } @@ -5102,7 +5104,7 @@ u8 sub_805FAF8(struct MapObject *mapObject, struct Sprite *sprite) u8 sub_805FB04(struct MapObject *mapObject, struct Sprite *sprite) { - if (FieldObjectExecRegularAnim(mapObject, sprite)) + if (FieldObjectExecSingleMovementAction(mapObject, sprite)) { sprite->data[1] = 0; } @@ -5114,7 +5116,7 @@ fieldmap_object_cb(sub_805FB20, sub_805FB44, gUnknown_083755D0); u8 sub_805FB64(struct MapObject *mapObject, struct Sprite *sprite) { npc_reset(mapObject, sprite); - FieldObjectSetRegularAnim(mapObject, sprite, GetStepInPlaceDelay16AnimId(mapObject->facingDirection)); + FieldObjectSetSingleMovement(mapObject, sprite, GetStepInPlaceDelay16AnimId(mapObject->facingDirection)); sprite->data[1] = 1; return 1; } @@ -5124,7 +5126,7 @@ fieldmap_object_cb(sub_805FB90, sub_805FBB4, gUnknown_083755D8); u8 sub_805FBD4(struct MapObject *mapObject, struct Sprite *sprite) { npc_reset(mapObject, sprite); - FieldObjectSetRegularAnim(mapObject, sprite, GetStepInPlaceDelay8AnimId(mapObject->facingDirection)); + FieldObjectSetSingleMovement(mapObject, sprite, GetStepInPlaceDelay8AnimId(mapObject->facingDirection)); sprite->data[1] = 1; return 1; } @@ -5134,7 +5136,7 @@ fieldmap_object_cb(sub_805FC00, sub_805FC24, gUnknown_083755E0); u8 sub_805FC44(struct MapObject *mapObject, struct Sprite *sprite) { npc_reset(mapObject, sprite); - FieldObjectSetRegularAnim(mapObject, sprite, GetStepInPlaceDelay4AnimId(mapObject->facingDirection)); + FieldObjectSetSingleMovement(mapObject, sprite, GetStepInPlaceDelay4AnimId(mapObject->facingDirection)); sprite->data[1] = 1; return 1; } @@ -5144,7 +5146,7 @@ fieldmap_object_cb(sub_805FC70, sub_805FC94, gUnknown_083755E8); u8 sub_805FCB4(struct MapObject *mapObject, struct Sprite *sprite) { npc_reset(mapObject, sprite); - FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->facingDirection)); + FieldObjectSetSingleMovement(mapObject, sprite, GetFaceDirectionAnimId(mapObject->facingDirection)); mapObject->invisible = 1; sprite->data[1] = 1; return 1; @@ -5152,7 +5154,7 @@ u8 sub_805FCB4(struct MapObject *mapObject, struct Sprite *sprite) u8 sub_805FCE8(struct MapObject *mapObject, struct Sprite *sprite) { - if (FieldObjectExecRegularAnim(mapObject, sprite)) + if (FieldObjectExecSingleMovementAction(mapObject, sprite)) { sprite->data[1] = 2; return 1; @@ -5162,7 +5164,7 @@ u8 sub_805FCE8(struct MapObject *mapObject, struct Sprite *sprite) u8 sub_805FD08(struct MapObject *mapObject, struct Sprite *sprite) { - mapObject->regularAnimActive = 0; + mapObject->singleMovementActive = 0; return 0; } @@ -5170,10 +5172,10 @@ void sub_805FC70(struct Sprite *sprite); void npc_reset(struct MapObject *mapObject, struct Sprite *sprite) { - mapObject->regularAnimActive = 0; - mapObject->specialAnimActive = 0; - mapObject->specialAnimFinished = 0; - mapObject->animId = 0xff; + mapObject->singleMovementActive = 0; + mapObject->heldMovementActive = 0; + mapObject->heldMovementFinished = 0; + mapObject->movementActionId = 0xff; sprite->data[1] = 0; } @@ -5300,12 +5302,12 @@ u8 sub_805FE90(s16 a0, s16 a1, s16 a2, s16 a3) } } -void npc_set_running_behaviour_etc(struct MapObject *mapObject, u8 animPattern) +void npc_set_running_behaviour_etc(struct MapObject *mapObject, u8 movementType) { - mapObject->animPattern = animPattern; + mapObject->movementType = movementType; mapObject->directionSequenceIndex = 0; - mapObject->playerAnimId = 0; - gSprites[mapObject->spriteId].callback = gUnknown_0836DA88[animPattern]; + mapObject->playerMovementActionId = 0; + gSprites[mapObject->spriteId].callback = sMovementTypeCallbacks[movementType]; gSprites[mapObject->spriteId].data[1] = 0; } @@ -5536,85 +5538,82 @@ void FieldObjectMoveDestCoords(struct MapObject *mapObject, u32 direction, s16 * MoveCoords(newDirn, x, y); } -bool8 FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(struct MapObject *mapObject) +bool8 FieldObjectIsMovementOverridden(struct MapObject *mapObject) { - if (mapObject->regularAnimActive || mapObject->specialAnimActive) - { + if (mapObject->singleMovementActive || mapObject->heldMovementActive) return TRUE; - } + return FALSE; } -bool8 FieldObjectIsSpecialAnimActive(struct MapObject *mapObject) +bool8 FieldObjectIsHeldMovementActive(struct MapObject *mapObject) { - if (mapObject->specialAnimActive && mapObject->animId != 0xff) + if (mapObject->heldMovementActive && mapObject->movementActionId != 0xff) { return TRUE; } return FALSE; } -bool8 FieldObjectSetSpecialAnim(struct MapObject *mapObject, u8 specialAnimId) +bool8 FieldObjectSetHeldMovement(struct MapObject *mapObject, u8 movementActionId) { - if (FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(mapObject)) - { + if (FieldObjectIsMovementOverridden(mapObject)) return TRUE; - } + UnfreezeMapObject(mapObject); - mapObject->animId = specialAnimId; - mapObject->specialAnimActive = 1; - mapObject->specialAnimFinished = 0; + mapObject->movementActionId = movementActionId; + mapObject->heldMovementActive = 1; + mapObject->heldMovementFinished = 0; gSprites[mapObject->spriteId].data[2] = 0; return FALSE; } -void FieldObjectForceSetSpecialAnim(struct MapObject *mapObject, u8 specialAnimId) +void FieldObjectForceSetHeldMovement(struct MapObject *mapObject, u8 movementActionId) { - FieldObjectClearAnimIfSpecialAnimActive(mapObject); - FieldObjectSetSpecialAnim(mapObject, specialAnimId); + FieldObjectClearHeldMovementIfActive(mapObject); + FieldObjectSetHeldMovement(mapObject, movementActionId); } -void FieldObjectClearAnimIfSpecialAnimActive(struct MapObject *mapObject) +void FieldObjectClearHeldMovementIfActive(struct MapObject *mapObject) { - if (mapObject->specialAnimActive) + if (mapObject->heldMovementActive) { - FieldObjectClearAnim(mapObject); + FieldObjectClearHeldMovement(mapObject); } } -void FieldObjectClearAnim(struct MapObject *mapObject) +void FieldObjectClearHeldMovement(struct MapObject *mapObject) { - mapObject->animId = 0xFF; - mapObject->specialAnimActive = 0; - mapObject->specialAnimFinished = 0; + mapObject->movementActionId = 0xFF; + mapObject->heldMovementActive = 0; + mapObject->heldMovementFinished = 0; gSprites[mapObject->spriteId].data[1] = 0; gSprites[mapObject->spriteId].data[2] = 0; } -bool8 FieldObjectCheckIfSpecialAnimFinishedOrInactive(struct MapObject *mapObject) +bool8 FieldObjectCheckHeldMovementStatus(struct MapObject *mapObject) { - if (mapObject->specialAnimActive) - return mapObject->specialAnimFinished; + if (mapObject->heldMovementActive) + return mapObject->heldMovementFinished; + return 0x10; } -bool8 FieldObjectClearAnimIfSpecialAnimFinished(struct MapObject *mapObject) +bool8 FieldObjectClearHeldMovementIfFinished(struct MapObject *mapObject) { - u8 specialAnimStatus; - specialAnimStatus = FieldObjectCheckIfSpecialAnimFinishedOrInactive(mapObject); - if (specialAnimStatus != 0 && specialAnimStatus != 0x10) - { - FieldObjectClearAnimIfSpecialAnimActive(mapObject); - } - return specialAnimStatus; + u8 heldMovementStatus; + heldMovementStatus = FieldObjectCheckHeldMovementStatus(mapObject); + if (heldMovementStatus != 0 && heldMovementStatus != 0x10) + FieldObjectClearHeldMovementIfActive(mapObject); + + return heldMovementStatus; } -u8 FieldObjectGetSpecialAnim(struct MapObject *mapObject) +u8 FieldObjectGetHeldMovementActionId(struct MapObject *mapObject) { - if (mapObject->specialAnimActive) - { - return mapObject->animId; - } + if (mapObject->heldMovementActive) + return mapObject->movementActionId; + return 0xFF; } @@ -5623,16 +5622,16 @@ extern void DoGroundEffects_OnBeginStep(struct MapObject *mapObject, struct Spri extern void DoGroundEffects_OnFinishStep(struct MapObject *mapObject, struct Sprite *sprite); void npc_obj_transfer_image_anim_pause_flag(struct MapObject *mapObject, struct Sprite *sprite); void sub_80634A0(struct MapObject *mapObject, struct Sprite *sprite); -void FieldObjectExecSpecialAnim(struct MapObject *mapObject, struct Sprite *sprite); +void FieldObjectExecHeldMovementAction(struct MapObject *mapObject, struct Sprite *sprite); void FieldObjectUpdateSubpriority(struct MapObject *mapObject, struct Sprite *sprite); void meta_step(struct MapObject *mapObject, struct Sprite *sprite, u8 (*callback)(struct MapObject *, struct Sprite *)) { DoGroundEffects_OnSpawn(mapObject, sprite); sub_80634A0(mapObject, sprite); - if (FieldObjectIsSpecialAnimActive(mapObject)) + if (FieldObjectIsHeldMovementActive(mapObject)) { - FieldObjectExecSpecialAnim(mapObject, sprite); + FieldObjectExecHeldMovementAction(mapObject, sprite); } else if (!mapObject->frozen) { @@ -5677,7 +5676,7 @@ dirn_to_anim(GetStepInPlaceDelay4AnimId, gUnknown_08375718) u8 FieldObjectFaceOppositeDirection(struct MapObject *mapObject, u8 direction) { - return FieldObjectSetSpecialAnim(mapObject, GetFaceDirectionAnimId(GetOppositeDirection(direction))); + return FieldObjectSetHeldMovement(mapObject, GetFaceDirectionAnimId(GetOppositeDirection(direction))); } u8 sub_80609D8(u8 index) @@ -5819,28 +5818,29 @@ u32 state_to_direction(u8 a0, u32 a1, u32 a2) return gUnknown_08375767[a0 - 1][zffuOffset - 1]; } -void FieldObjectExecSpecialAnim(struct MapObject *mapObject, struct Sprite *sprite) +void FieldObjectExecHeldMovementAction(struct MapObject *mapObject, struct Sprite *sprite) { - if (gUnknown_08375778[mapObject->animId][sprite->data[2]](mapObject, sprite)) + if (gUnknown_08375778[mapObject->movementActionId][sprite->data[2]](mapObject, sprite)) { - mapObject->specialAnimFinished = 1; + mapObject->heldMovementFinished = 1; } } -bool8 FieldObjectExecRegularAnim(struct MapObject *mapObject, struct Sprite *sprite) +bool8 FieldObjectExecSingleMovementAction(struct MapObject *mapObject, struct Sprite *sprite) { - if (gUnknown_08375778[mapObject->animId][sprite->data[2]](mapObject, sprite)) + if (gUnknown_08375778[mapObject->movementActionId][sprite->data[2]](mapObject, sprite)) { - mapObject->animId = 0xFF; + mapObject->movementActionId = 0xFF; sprite->data[2] = 0; return 1; } + return 0; } -void FieldObjectSetRegularAnim(struct MapObject *mapObject, struct Sprite *sprite, u8 animId) +void FieldObjectSetSingleMovement(struct MapObject *mapObject, struct Sprite *sprite, u8 animId) { - mapObject->animId = animId; + mapObject->movementActionId = animId; sprite->data[2] = 0; } @@ -7176,7 +7176,7 @@ bool8 sub_8062584(struct MapObject *mapObject, struct Sprite *sprite) bool8 sub_80625B0(struct MapObject *mapObject, struct Sprite *sprite) { - an_look_any(mapObject, sprite, gUnknown_0836DC09[mapObject->animPattern]); + an_look_any(mapObject, sprite, gUnknown_0836DC09[mapObject->movementType]); return TRUE; } @@ -7256,12 +7256,12 @@ bool8 sub_8062704(struct MapObject *, struct Sprite *); bool8 sub_80626C0(struct MapObject *mapObject, struct Sprite *sprite) { - if (mapObject->animPattern == 0x3F) + if (mapObject->movementType == 0x3F) { sub_8084794(mapObject); return FALSE; } - else if (mapObject->animPattern != 0x39 && mapObject->animPattern != 0x3A) + else if (mapObject->movementType != 0x39 && mapObject->movementType != 0x3A) { sprite->data[2] = 2; return TRUE; @@ -9073,7 +9073,7 @@ const s8 *const gUnknown_083761D0[] = { bool8 FreezeMapObject(struct MapObject *mapObject) { - if (mapObject->specialAnimActive || mapObject->frozen) + if (mapObject->heldMovementActive || mapObject->frozen) { return TRUE; } @@ -9174,9 +9174,9 @@ bool8 obj_npc_ministep(struct Sprite *sprite) return TRUE; } -void sub_806467C(struct Sprite *sprite, u8 a2) +void sub_806467C(struct Sprite *sprite, u8 direction) { - sprite->data[3] = a2; + sprite->data[3] = direction; sprite->data[4] = 0; sprite->data[5] = 0; } diff --git a/src/field_effect.c b/src/field_effect.c index 51d1a1a0a..bb18c870f 100644 --- a/src/field_effect.c +++ b/src/field_effect.c @@ -1180,7 +1180,7 @@ bool8 sub_80867AC(struct Task *task) // gUnknown_0839F2CC[0] CameraObjectReset2(); gMapObjects[gPlayerAvatar.mapObjectId].invisible = 1; gPlayerAvatar.preventStep = TRUE; - FieldObjectSetSpecialAnim(playerObject, GetFaceDirectionAnimId(player_get_direction_lower_nybble())); + FieldObjectSetHeldMovement(playerObject, GetFaceDirectionAnimId(player_get_direction_lower_nybble())); task->data[4] = playerSprite->subspriteMode; playerObject->fixedPriority = 1; playerSprite->oam.priority = 1; @@ -1328,9 +1328,9 @@ bool8 sub_8086AC0(struct Task *task) { struct MapObject *mapObject; mapObject = &gMapObjects[gPlayerAvatar.mapObjectId]; - if (!FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(mapObject) || FieldObjectClearAnimIfSpecialAnimFinished(mapObject)) + if (!FieldObjectIsMovementOverridden(mapObject) || FieldObjectClearHeldMovementIfFinished(mapObject)) { - FieldObjectSetSpecialAnim(mapObject, GetFaceDirectionAnimId(player_get_direction_lower_nybble())); + FieldObjectSetHeldMovement(mapObject, GetFaceDirectionAnimId(player_get_direction_lower_nybble())); task->data[0]++; task->data[2] = 0; task->data[3] = 0; @@ -1447,7 +1447,7 @@ bool8 sub_8086CF4(struct Task *task) u8 behavior; CameraObjectReset2(); mapObject = &gMapObjects[gPlayerAvatar.mapObjectId]; - FieldObjectSetSpecialAnim(mapObject, GetFaceDirectionAnimId(DIR_EAST)); + FieldObjectSetHeldMovement(mapObject, GetFaceDirectionAnimId(DIR_EAST)); PlayerGetDestCoords(&x, &y); behavior = MapGridGetMetatileBehaviorAt(x, y); task->data[0]++; @@ -1541,11 +1541,11 @@ bool8 sub_8086ED4(struct Task *task) { struct MapObject *mapObject; mapObject = &gMapObjects[gPlayerAvatar.mapObjectId]; - if (FieldObjectClearAnimIfSpecialAnimFinished(mapObject)) + if (FieldObjectClearHeldMovementIfFinished(mapObject)) { CameraObjectReset1(); ScriptContext2_Disable(); - FieldObjectSetSpecialAnim(mapObject, GetGoSpeed0AnimId(DIR_EAST)); + FieldObjectSetHeldMovement(mapObject, GetGoSpeed0AnimId(DIR_EAST)); DestroyTask(FindTaskIdByFunc(sub_8086CBC)); } return FALSE; @@ -1578,9 +1578,9 @@ bool8 sub_8086FB0(struct Task *task, struct MapObject *mapObject) bool8 waterfall_1_do_anim_probably(struct Task *task, struct MapObject *mapObject) { ScriptContext2_Enable(); - if (!FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(mapObject)) + if (!FieldObjectIsMovementOverridden(mapObject)) { - FieldObjectClearAnimIfSpecialAnimFinished(mapObject); + FieldObjectClearHeldMovementIfFinished(mapObject); gFieldEffectArguments[0] = task->data[1]; FieldEffectStart(FLDEFF_FIELD_MOVE_SHOW_MON_INIT); task->data[0]++; @@ -1600,14 +1600,14 @@ bool8 waterfall_2_wait_anim_finish_probably(struct Task *task, struct MapObject bool8 sub_8087030(struct Task *task, struct MapObject *mapObject) { - FieldObjectSetSpecialAnim(mapObject, GetSimpleGoAnimId(DIR_NORTH)); + FieldObjectSetHeldMovement(mapObject, GetSimpleGoAnimId(DIR_NORTH)); task->data[0]++; return FALSE; } bool8 sub_8087058(struct Task *task, struct MapObject *mapObject) { - if (!FieldObjectClearAnimIfSpecialAnimFinished(mapObject)) + if (!FieldObjectClearHeldMovementIfFinished(mapObject)) { return FALSE; } @@ -1834,14 +1834,14 @@ bool8 sub_8087548(struct Task *task, struct MapObject *mapObject, struct Sprite mapObject->invisible = 0; CameraObjectReset1(); PlaySE(SE_W091); - FieldObjectSetSpecialAnim(mapObject, sub_80608A4(DIR_EAST)); + FieldObjectSetHeldMovement(mapObject, sub_80608A4(DIR_EAST)); } return FALSE; } bool8 sub_808759C(struct Task *task, struct MapObject *mapObject, struct Sprite *sprite) { - if (FieldObjectClearAnimIfSpecialAnimFinished(mapObject)) + if (FieldObjectClearHeldMovementIfFinished(mapObject)) { gPlayerAvatar.preventStep = FALSE; ScriptContext2_Disable(); @@ -1896,7 +1896,7 @@ bool8 sub_80876C8(struct Task *task, struct MapObject *mapObject, struct Sprite bool8 sub_80876F8(struct Task *task, struct MapObject *mapObject, struct Sprite *sprite) { - if (FieldObjectClearAnimIfSpecialAnimFinished(mapObject)) + if (FieldObjectClearHeldMovementIfFinished(mapObject)) { if (task->data[1] > 3) { @@ -1909,7 +1909,7 @@ bool8 sub_80876F8(struct Task *task, struct MapObject *mapObject, struct Sprite } else { task->data[1]++; - FieldObjectSetSpecialAnim(mapObject, GetStepInPlaceDelay4AnimId(mapObject->facingDirection)); + FieldObjectSetHeldMovement(mapObject, GetStepInPlaceDelay4AnimId(mapObject->facingDirection)); PlaySE(SE_FU_ZUZUZU); } } @@ -1999,7 +1999,7 @@ void sub_8087914(struct Task *task) fade_8080918(); } mapObject = &gMapObjects[gPlayerAvatar.mapObjectId]; - if (!FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(mapObject) || FieldObjectClearAnimIfSpecialAnimFinished(mapObject)) + if (!FieldObjectIsMovementOverridden(mapObject) || FieldObjectClearHeldMovementIfFinished(mapObject)) { if (task->data[14] == 0 && !gPaletteFade.active && sub_8054034() == TRUE) { @@ -2011,7 +2011,7 @@ void sub_8087914(struct Task *task) DestroyTask(FindTaskIdByFunc(sub_80878C4)); } else if (task->data[1] == 0 || (--task->data[1]) == 0) { - FieldObjectSetSpecialAnim(mapObject, GetFaceDirectionAnimId(unknown_0839F380[mapObject->facingDirection])); + FieldObjectSetHeldMovement(mapObject, GetFaceDirectionAnimId(unknown_0839F380[mapObject->facingDirection])); if (task->data[2] < 12) { task->data[2]++; @@ -2059,7 +2059,7 @@ void sub_8087AC8(struct Task *task) struct MapObject *mapObject = &gMapObjects[gPlayerAvatar.mapObjectId]; if (task->data[1] == 0 || (--task->data[1]) == 0) { - if (FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(mapObject) && !FieldObjectClearAnimIfSpecialAnimFinished(mapObject)) + if (FieldObjectIsMovementOverridden(mapObject) && !FieldObjectClearHeldMovementIfFinished(mapObject)) { return; } @@ -2071,7 +2071,7 @@ void sub_8087AC8(struct Task *task) DestroyTask(FindTaskIdByFunc(sub_8087A74)); return; } - FieldObjectSetSpecialAnim(mapObject, GetFaceDirectionAnimId(unknown_0839F380[mapObject->facingDirection])); + FieldObjectSetHeldMovement(mapObject, GetFaceDirectionAnimId(unknown_0839F380[mapObject->facingDirection])); if (task->data[2] < 32) { task->data[2]++; @@ -2833,10 +2833,10 @@ void sub_80889E4(struct Task *task) { struct MapObject *mapObject; mapObject = &gMapObjects[gPlayerAvatar.mapObjectId]; - if (!FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(mapObject) || FieldObjectClearAnimIfSpecialAnimFinished(mapObject)) + if (!FieldObjectIsMovementOverridden(mapObject) || FieldObjectClearHeldMovementIfFinished(mapObject)) { sub_8059BF4(); - FieldObjectSetSpecialAnim(mapObject, 0x39); + FieldObjectSetHeldMovement(mapObject, 0x39); task->data[0]++; } } @@ -2845,7 +2845,7 @@ void sub_8088A30(struct Task *task) { struct MapObject *mapObject; mapObject = &gMapObjects[gPlayerAvatar.mapObjectId]; - if (FieldObjectCheckIfSpecialAnimFinishedOrInactive(mapObject)) + if (FieldObjectCheckHeldMovementStatus(mapObject)) { gFieldEffectArguments[0] = task->data[15] | 0x80000000; FieldEffectStart(FLDEFF_FIELD_MOVE_SHOW_MON_INIT); @@ -2860,8 +2860,8 @@ void sub_8088A78(struct Task *task) { mapObject = &gMapObjects[gPlayerAvatar.mapObjectId]; sub_805B980(mapObject, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_SURFING)); - FieldObjectClearAnimIfSpecialAnimFinished(mapObject); - FieldObjectSetSpecialAnim(mapObject, sub_80608D0(mapObject->movementDirection)); + FieldObjectClearHeldMovementIfFinished(mapObject); + FieldObjectSetHeldMovement(mapObject, sub_80608D0(mapObject->movementDirection)); gFieldEffectArguments[0] = task->data[1]; gFieldEffectArguments[1] = task->data[2]; gFieldEffectArguments[2] = gPlayerAvatar.mapObjectId; @@ -2874,11 +2874,11 @@ void sub_8088AF4(struct Task *task) { struct MapObject *mapObject; mapObject = &gMapObjects[gPlayerAvatar.mapObjectId]; - if (FieldObjectClearAnimIfSpecialAnimFinished(mapObject)) + if (FieldObjectClearHeldMovementIfFinished(mapObject)) { gPlayerAvatar.preventStep = FALSE; gPlayerAvatar.flags &= 0xdf; - FieldObjectSetSpecialAnim(mapObject, GetFaceDirectionAnimId(mapObject->movementDirection)); + FieldObjectSetHeldMovement(mapObject, GetFaceDirectionAnimId(mapObject->movementDirection)); sub_8127ED0(mapObject->fieldEffectSpriteId, 1); UnfreezeMapObjects(); ScriptContext2_Disable(); @@ -2962,13 +2962,13 @@ void sub_8088CA0(struct Task *task) { struct MapObject *mapObject; mapObject = &gMapObjects[gPlayerAvatar.mapObjectId]; - if (!FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(mapObject) || FieldObjectClearAnimIfSpecialAnimFinished(mapObject)) + if (!FieldObjectIsMovementOverridden(mapObject) || FieldObjectClearHeldMovementIfFinished(mapObject)) { task->data[15] = gPlayerAvatar.flags; gPlayerAvatar.preventStep = TRUE; SetPlayerAvatarStateMask(1); sub_8059BF4(); - FieldObjectSetSpecialAnim(mapObject, 0x39); + FieldObjectSetHeldMovement(mapObject, 0x39); task->data[0]++; } } @@ -2977,7 +2977,7 @@ void sub_8088CF8(struct Task *task) { struct MapObject *mapObject; mapObject = &gMapObjects[gPlayerAvatar.mapObjectId]; - if (FieldObjectClearAnimIfSpecialAnimFinished(mapObject)) + if (FieldObjectClearHeldMovementIfFinished(mapObject)) { task->data[0]++; gFieldEffectArguments[0] = task->data[1]; @@ -3008,7 +3008,7 @@ void sub_8088D94(struct Task *task) task->data[0]++; task->data[2] = 16; SetPlayerAvatarTransitionFlags(PLAYER_AVATAR_FLAG_ON_FOOT); - FieldObjectSetSpecialAnim(&gMapObjects[gPlayerAvatar.mapObjectId], 0x02); + FieldObjectSetHeldMovement(&gMapObjects[gPlayerAvatar.mapObjectId], 0x02); } } @@ -3016,7 +3016,7 @@ void sub_8088DD8(struct Task *task) { struct MapObject *mapObject; mapObject = &gMapObjects[gPlayerAvatar.mapObjectId]; - if ((task->data[2] == 0 || (--task->data[2]) == 0) && FieldObjectClearAnimIfSpecialAnimFinished(mapObject)) + if ((task->data[2] == 0 || (--task->data[2]) == 0) && FieldObjectClearHeldMovementIfFinished(mapObject)) { task->data[0]++; PlaySE(SE_W019); @@ -3033,7 +3033,7 @@ void sub_8088E2C(struct Task *task) sub_805B980(mapObject, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_SURFING)); StartSpriteAnim(&gSprites[mapObject->spriteId], 0x16); mapObject->inanimate = 1; - FieldObjectSetSpecialAnim(mapObject, 0x48); + FieldObjectSetHeldMovement(mapObject, 0x48); if (task->data[15] & 0x08) { DestroySprite(&gSprites[mapObject->fieldEffectSpriteId]); @@ -3049,7 +3049,7 @@ void sub_8088EB4(struct Task *task) if ((++task->data[2]) >= 10) { mapObject = &gMapObjects[gPlayerAvatar.mapObjectId]; - FieldObjectClearAnimIfSpecialAnimActive(mapObject); + FieldObjectClearHeldMovementIfActive(mapObject); mapObject->inanimate = 0; mapObject->hasShadow = 0; sub_8088FFC(task->data[1], mapObject->spriteId); @@ -3259,7 +3259,7 @@ void sub_80892A0(struct Task *task) { struct MapObject *mapObject; mapObject = &gMapObjects[gPlayerAvatar.mapObjectId]; - if (!FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(mapObject) || FieldObjectClearAnimIfSpecialAnimFinished(mapObject)) + if (!FieldObjectIsMovementOverridden(mapObject) || FieldObjectClearHeldMovementIfFinished(mapObject)) { task->data[0]++; task->data[2] = 17; @@ -3343,14 +3343,14 @@ void sub_8089414(struct Task *task) sprite->pos2.y = 0; sprite->coordOffsetEnabled = 1; sub_8059BF4(); - FieldObjectSetSpecialAnim(mapObject, 0x39); + FieldObjectSetHeldMovement(mapObject, 0x39); task->data[0]++; } } void sub_808948C(struct Task *task) { - if (FieldObjectClearAnimIfSpecialAnimFinished(&gMapObjects[gPlayerAvatar.mapObjectId])) + if (FieldObjectClearHeldMovementIfFinished(&gMapObjects[gPlayerAvatar.mapObjectId])) { task->data[0]++; sub_8089230(task->data[1]); diff --git a/src/field_fadetransition.c b/src/field_fadetransition.c index 4a4122641..669b6b531 100644 --- a/src/field_fadetransition.c +++ b/src/field_fadetransition.c @@ -231,7 +231,7 @@ void sub_8080B9C(u8 taskId) u8 mapObjId; sub_8080958(1); mapObjId = GetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0); - FieldObjectSetSpecialAnim(&gMapObjects[mapObjId], 8); + FieldObjectSetHeldMovement(&gMapObjects[mapObjId], 8); task->data[0] = 2; } break; @@ -241,7 +241,7 @@ void sub_8080B9C(u8 taskId) u8 mapObjId; task->data[1] = FieldAnimateDoorClose(*x, *y); mapObjId = GetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0); - FieldObjectClearAnimIfSpecialAnimFinished(&gMapObjects[mapObjId]); + FieldObjectClearHeldMovementIfFinished(&gMapObjects[mapObjId]); task->data[0] = 3; } break; @@ -279,7 +279,7 @@ void task_map_chg_seq_0807E20C(u8 taskId) u8 mapObjId; sub_8080958(1); mapObjId = GetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0); - FieldObjectSetSpecialAnim(&gMapObjects[mapObjId], GetGoSpeed0AnimId(player_get_direction_lower_nybble())); + FieldObjectSetHeldMovement(&gMapObjects[mapObjId], GetGoSpeed0AnimId(player_get_direction_lower_nybble())); task->data[0] = 2; } break; @@ -571,9 +571,9 @@ void sub_808115C(u8 taskId) { u8 mapObjId; mapObjId = GetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0); - FieldObjectClearAnimIfSpecialAnimActive(&gMapObjects[mapObjId]); + FieldObjectClearHeldMovementIfActive(&gMapObjects[mapObjId]); mapObjId = GetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0); - FieldObjectSetSpecialAnim(&gMapObjects[mapObjId], 9); + FieldObjectSetHeldMovement(&gMapObjects[mapObjId], 9); task->data[0] = 2; } break; @@ -583,7 +583,7 @@ void sub_808115C(u8 taskId) u8 mapObjId; task->data[1] = FieldAnimateDoorClose(*x, *y - 1); mapObjId = GetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0); - FieldObjectClearAnimIfSpecialAnimFinished(&gMapObjects[mapObjId]); + FieldObjectClearHeldMovementIfFinished(&gMapObjects[mapObjId]); sub_8080958(0); task->data[0] = 3; } diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c index b17816f6d..f4f53c0a9 100644 --- a/src/field_player_avatar.c +++ b/src/field_player_avatar.c @@ -196,7 +196,7 @@ static u8 (*const gUnknown_0830FC98[])(struct Task *, struct MapObject *) = sub_805A1B8, }; -fieldmap_object_null_cb(sub_80587B4, sub_80587D8); +fieldmap_object_empty_callback(sub_80587B4, sub_80587D8); void player_step(u8 direction, u16 newKeys, u16 heldKeys) { @@ -221,14 +221,13 @@ void player_step(u8 direction, u16 newKeys, u16 heldKeys) static bool8 sub_8058854(struct MapObject *playerMapObj, u8 direction) { - if (FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(playerMapObj) - && !FieldObjectClearAnimIfSpecialAnimFinished(playerMapObj)) + if (FieldObjectIsMovementOverridden(playerMapObj) + && !FieldObjectClearHeldMovementIfFinished(playerMapObj)) { - u8 specialAnim = FieldObjectGetSpecialAnim(playerMapObj); - - if (specialAnim > 24 && specialAnim < 29 && direction != DIR_NONE && playerMapObj->movementDirection != direction) + u8 heldMovementActionId = FieldObjectGetHeldMovementActionId(playerMapObj); + if (heldMovementActionId > 24 && heldMovementActionId < 29 && direction != DIR_NONE && playerMapObj->movementDirection != direction) { - FieldObjectClearAnim(playerMapObj); + FieldObjectClearHeldMovement(playerMapObj); return FALSE; } else @@ -718,7 +717,7 @@ void sub_8059204(void) static bool8 player_is_anim_in_certain_ranges(void) { - u8 unk = gMapObjects[gPlayerAvatar.mapObjectId].animId; + u8 unk = gMapObjects[gPlayerAvatar.mapObjectId].movementActionId; if (unk < 4 || (unk >= 16 && unk < 0x15) @@ -740,35 +739,35 @@ static bool8 sub_80592A4(void) static bool8 PlayerIsAnimActive(void) { - return FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(&gMapObjects[gPlayerAvatar.mapObjectId]); + return FieldObjectIsMovementOverridden(&gMapObjects[gPlayerAvatar.mapObjectId]); } static bool8 PlayerCheckIfAnimFinishedOrInactive(void) { - return FieldObjectCheckIfSpecialAnimFinishedOrInactive(&gMapObjects[gPlayerAvatar.mapObjectId]); + return FieldObjectCheckHeldMovementStatus(&gMapObjects[gPlayerAvatar.mapObjectId]); } static void player_set_x22(u8 a) { - gMapObjects[gPlayerAvatar.mapObjectId].playerAnimId = a; + gMapObjects[gPlayerAvatar.mapObjectId].playerMovementActionId = a; } u8 player_get_x22(void) { - return gMapObjects[gPlayerAvatar.mapObjectId].playerAnimId; + return gMapObjects[gPlayerAvatar.mapObjectId].playerMovementActionId; } static void sub_8059348(u8 a) { - FieldObjectForceSetSpecialAnim(&gMapObjects[gPlayerAvatar.mapObjectId], a); + FieldObjectForceSetHeldMovement(&gMapObjects[gPlayerAvatar.mapObjectId], a); } -void PlayerSetAnimId(u8 animId, u8 b) +void PlayerSetAnimId(u8 movementActionId, u8 b) { if (!PlayerIsAnimActive()) { player_set_x22(b); - FieldObjectSetSpecialAnim(&gMapObjects[gPlayerAvatar.mapObjectId], animId); + FieldObjectSetHeldMovement(&gMapObjects[gPlayerAvatar.mapObjectId], movementActionId); } } @@ -1228,7 +1227,7 @@ static void sub_8059E2C(u8 taskId) ; } -u8 sub_8059E84(struct Task *task, struct MapObject *b, struct MapObject *c) +u8 sub_8059E84(struct Task *task, struct MapObject *playerObject, struct MapObject *strengthObject) { ScriptContext2_Enable(); gPlayerAvatar.preventStep = TRUE; @@ -1236,19 +1235,19 @@ u8 sub_8059E84(struct Task *task, struct MapObject *b, struct MapObject *c) return 0; } -u8 sub_8059EA4(struct Task *task, struct MapObject *b, struct MapObject *c) +u8 sub_8059EA4(struct Task *task, struct MapObject *playerObject, struct MapObject *strengthObject) { - if (!FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(b) - && !FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(c)) + if (!FieldObjectIsMovementOverridden(playerObject) + && !FieldObjectIsMovementOverridden(strengthObject)) { - FieldObjectClearAnimIfSpecialAnimFinished(b); - FieldObjectClearAnimIfSpecialAnimFinished(c); - FieldObjectSetSpecialAnim(b, GetStepInPlaceDelay16AnimId((u8)task->data[2])); - FieldObjectSetSpecialAnim(c, GetSimpleGoAnimId((u8)task->data[2])); - gFieldEffectArguments[0] = c->currentCoords.x; - gFieldEffectArguments[1] = c->currentCoords.y; - gFieldEffectArguments[2] = c->previousElevation; - gFieldEffectArguments[3] = gSprites[c->spriteId].oam.priority; + FieldObjectClearHeldMovementIfFinished(playerObject); + FieldObjectClearHeldMovementIfFinished(strengthObject); + FieldObjectSetHeldMovement(playerObject, GetStepInPlaceDelay16AnimId((u8)task->data[2])); + FieldObjectSetHeldMovement(strengthObject, GetSimpleGoAnimId((u8)task->data[2])); + gFieldEffectArguments[0] = strengthObject->currentCoords.x; + gFieldEffectArguments[1] = strengthObject->currentCoords.y; + gFieldEffectArguments[2] = strengthObject->previousElevation; + gFieldEffectArguments[3] = gSprites[strengthObject->spriteId].oam.priority; FieldEffectStart(FLDEFF_DUST); PlaySE(SE_W070); task->data[0]++; @@ -1256,13 +1255,13 @@ u8 sub_8059EA4(struct Task *task, struct MapObject *b, struct MapObject *c) return 0; } -u8 sub_8059F40(struct Task *task, struct MapObject *b, struct MapObject *c) +u8 sub_8059F40(struct Task *task, struct MapObject *playerObject, struct MapObject *strengthObject) { - if (FieldObjectCheckIfSpecialAnimFinishedOrInactive(b) - && FieldObjectCheckIfSpecialAnimFinishedOrInactive(c)) + if (FieldObjectCheckHeldMovementStatus(playerObject) + && FieldObjectCheckHeldMovementStatus(strengthObject)) { - FieldObjectClearAnimIfSpecialAnimFinished(b); - FieldObjectClearAnimIfSpecialAnimFinished(c); + FieldObjectClearHeldMovementIfFinished(playerObject); + FieldObjectClearHeldMovementIfFinished(strengthObject); gPlayerAvatar.preventStep = FALSE; ScriptContext2_Disable(); DestroyTask(FindTaskIdByFunc(sub_8059E2C)); @@ -1289,10 +1288,10 @@ static void DoPlayerAvatarSecretBaseMatJump(u8 taskId) u8 PlayerAvatar_DoSecretBaseMatJump(struct Task *task, struct MapObject *mapObject) { gPlayerAvatar.preventStep = TRUE; - if (FieldObjectClearAnimIfSpecialAnimFinished(mapObject)) + if (FieldObjectClearHeldMovementIfFinished(mapObject)) { PlaySE(SE_DANSA); - FieldObjectSetSpecialAnim(mapObject, sub_806084C(mapObject->facingDirection)); + FieldObjectSetHeldMovement(mapObject, sub_806084C(mapObject->facingDirection)); task->data[1]++; if (task->data[1] > 1) { @@ -1335,11 +1334,11 @@ u8 sub_805A100(struct Task *task, struct MapObject *mapObject) { u8 directions[] = {DIR_WEST, DIR_EAST, DIR_NORTH, DIR_SOUTH}; - if (FieldObjectClearAnimIfSpecialAnimFinished(mapObject)) + if (FieldObjectClearHeldMovementIfFinished(mapObject)) { u8 direction; - FieldObjectSetSpecialAnim(mapObject, GetFaceDirectionAnimId(direction = directions[mapObject->movementDirection - 1])); + FieldObjectSetHeldMovement(mapObject, GetFaceDirectionAnimId(direction = directions[mapObject->movementDirection - 1])); if (direction == (u8)task->data[1]) task->data[2]++; task->data[0]++; @@ -1353,9 +1352,9 @@ u8 sub_805A178(struct Task *task, struct MapObject *mapObject) { const u8 arr[] = {16, 16, 17, 18, 19}; - if (FieldObjectClearAnimIfSpecialAnimFinished(mapObject)) + if (FieldObjectClearHeldMovementIfFinished(mapObject)) { - FieldObjectSetSpecialAnim(mapObject, arr[task->data[2]]); + FieldObjectSetHeldMovement(mapObject, arr[task->data[2]]); task->data[0] = 1; } return 0; @@ -1363,9 +1362,9 @@ u8 sub_805A178(struct Task *task, struct MapObject *mapObject) u8 sub_805A1B8(struct Task *task, struct MapObject *mapObject) { - if (FieldObjectClearAnimIfSpecialAnimFinished(mapObject)) + if (FieldObjectClearHeldMovementIfFinished(mapObject)) { - FieldObjectSetSpecialAnim(mapObject, GetSimpleGoAnimId(GetOppositeDirection(task->data[1]))); + FieldObjectSetHeldMovement(mapObject, GetSimpleGoAnimId(GetOppositeDirection(task->data[1]))); ScriptContext2_Disable(); gPlayerAvatar.preventStep = FALSE; DestroyTask(FindTaskIdByFunc(sub_805A08C)); @@ -1397,13 +1396,13 @@ static void taskFF_0805D1D4(u8 taskId) { struct MapObject *playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId]; - if (FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(playerMapObj)) + if (FieldObjectIsMovementOverridden(playerMapObj)) { - if (!FieldObjectClearAnimIfSpecialAnimFinished(playerMapObj)) + if (!FieldObjectClearHeldMovementIfFinished(playerMapObj)) return; } sub_8127ED0(playerMapObj->fieldEffectSpriteId, 2); - FieldObjectSetSpecialAnim(playerMapObj, sub_80608D0((u8)gTasks[taskId].data[0])); + FieldObjectSetHeldMovement(playerMapObj, sub_80608D0((u8)gTasks[taskId].data[0])); gTasks[taskId].func = sub_805A2D0; } @@ -1411,10 +1410,10 @@ static void sub_805A2D0(u8 taskId) { struct MapObject *playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId]; - if (FieldObjectClearAnimIfSpecialAnimFinished(playerMapObj)) + if (FieldObjectClearHeldMovementIfFinished(playerMapObj)) { sub_805B980(playerMapObj, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_NORMAL)); - FieldObjectSetSpecialAnim(playerMapObj, GetFaceDirectionAnimId(playerMapObj->facingDirection)); + FieldObjectSetHeldMovement(playerMapObj, GetFaceDirectionAnimId(playerMapObj->facingDirection)); gPlayerAvatar.preventStep = FALSE; ScriptContext2_Disable(); DestroySprite(&gSprites[playerMapObj->fieldEffectSpriteId]); @@ -1495,7 +1494,7 @@ u8 Fishing2(struct Task *task) task->tMinRoundsRequired = arr1[task->tFishingRod] + (Random() % arr2[task->tFishingRod]); task->tPlayerGfxId = gMapObjects[gPlayerAvatar.mapObjectId].graphicsId; playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId]; - FieldObjectClearAnimIfSpecialAnimActive(playerMapObj); + FieldObjectClearHeldMovementIfActive(playerMapObj); playerMapObj->enableAnim = 1; sub_8059C3C(playerMapObj->facingDirection); task->tStep++; diff --git a/src/fldeff_berrytree.c b/src/fldeff_berrytree.c index fa4a7e76b..1f0990a5e 100644 --- a/src/fldeff_berrytree.c +++ b/src/fldeff_berrytree.c @@ -16,11 +16,11 @@ static void Task_WateringBerryTreeAnim_0(u8 taskId) static void Task_WateringBerryTreeAnim_1(u8 taskId) { struct MapObject *playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId]; - if (!FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(playerMapObj) - || FieldObjectClearAnimIfSpecialAnimFinished(playerMapObj)) + if (!FieldObjectIsMovementOverridden(playerMapObj) + || FieldObjectClearHeldMovementIfFinished(playerMapObj)) { sub_8059D08(player_get_direction_lower_nybble()); - FieldObjectSetSpecialAnim(playerMapObj, GetStepInPlaceDelay16AnimId(player_get_direction_lower_nybble())); + FieldObjectSetHeldMovement(playerMapObj, GetStepInPlaceDelay16AnimId(player_get_direction_lower_nybble())); gTasks[taskId].func = Task_WateringBerryTreeAnim_2; } } @@ -28,13 +28,13 @@ static void Task_WateringBerryTreeAnim_1(u8 taskId) static void Task_WateringBerryTreeAnim_2(u8 taskId) { struct MapObject *playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId]; - if (FieldObjectClearAnimIfSpecialAnimFinished(playerMapObj)) + if (FieldObjectClearHeldMovementIfFinished(playerMapObj)) { s16 value = gTasks[taskId].data[1]++; if (value < 10) { - FieldObjectSetSpecialAnim(playerMapObj, GetStepInPlaceDelay16AnimId(player_get_direction_lower_nybble())); + FieldObjectSetHeldMovement(playerMapObj, GetStepInPlaceDelay16AnimId(player_get_direction_lower_nybble())); } else { diff --git a/src/item_use.c b/src/item_use.c index 9638588fe..5ec703bd2 100644 --- a/src/item_use.c +++ b/src/item_use.c @@ -688,15 +688,15 @@ u8 GetPlayerDirectionTowardsHiddenItem(s16 itemX, s16 itemY) void SetPlayerDirectionTowardsItem(u8 direction) { - FieldObjectClearAnimIfSpecialAnimFinished(&gMapObjects[GetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0)]); - FieldObjectClearAnim(&gMapObjects[GetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0)]); + FieldObjectClearHeldMovementIfFinished(&gMapObjects[GetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0)]); + FieldObjectClearHeldMovement(&gMapObjects[GetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0)]); UnfreezeMapObject(&gMapObjects[GetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0)]); PlayerTurnInPlace(direction); } void DisplayItemRespondingMessageAndExitItemfinder(u8 taskId) { - if (FieldObjectCheckIfSpecialAnimFinishedOrInactive(&gMapObjects[GetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0)]) == TRUE) + if (FieldObjectCheckHeldMovementStatus(&gMapObjects[GetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0)]) == TRUE) DisplayItemMessageOnField(taskId, gOtherText_ItemfinderResponding, ExitItemfinder, 0); } @@ -704,7 +704,7 @@ void RotatePlayerAndExitItemfinder(u8 taskId) { s16 *data = gTasks[taskId].data; - if (FieldObjectCheckIfSpecialAnimFinishedOrInactive(&gMapObjects[GetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0)]) == TRUE + if (FieldObjectCheckHeldMovementStatus(&gMapObjects[GetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0)]) == TRUE || data[2] == FALSE) { SetPlayerDirectionTowardsItem(gItemFinderDirections[data[5]]); diff --git a/src/map_obj_lock.c b/src/map_obj_lock.c index bac306cd8..7b3b9b3e6 100644 --- a/src/map_obj_lock.c +++ b/src/map_obj_lock.c @@ -52,7 +52,7 @@ void sub_8064D38(u8 taskId) sub_80594C0(); task->data[0] = 1; } - if (!task->data[1] && !gMapObjects[gSelectedMapObject].regularAnimActive) + if (!task->data[1] && !gMapObjects[gSelectedMapObject].singleMovementActive) { FreezeMapObject(&gMapObjects[gSelectedMapObject]); task->data[1] = 1; @@ -79,7 +79,7 @@ void LockSelectedMapObject(void) u8 taskId; FreezeMapObjectsExceptOne(gSelectedMapObject); taskId = CreateTask(sub_8064D38, 80); - if (!gMapObjects[gSelectedMapObject].regularAnimActive) + if (!gMapObjects[gSelectedMapObject].singleMovementActive) { FreezeMapObject(&gMapObjects[gSelectedMapObject]); gTasks[taskId].data[1] = 1; @@ -89,7 +89,7 @@ void LockSelectedMapObject(void) void sub_8064E2C(void) { u8 objectId = GetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0); - FieldObjectClearAnimIfSpecialAnimFinished(&gMapObjects[objectId]); + FieldObjectClearHeldMovementIfFinished(&gMapObjects[objectId]); sub_80A2178(); UnfreezeMapObjects(); } @@ -99,9 +99,9 @@ void unref_sub_8064E5C(void) u8 objectId; if (gMapObjects[gSelectedMapObject].active) - FieldObjectClearAnimIfSpecialAnimFinished(&gMapObjects[gSelectedMapObject]); + FieldObjectClearHeldMovementIfFinished(&gMapObjects[gSelectedMapObject]); objectId = GetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0); - FieldObjectClearAnimIfSpecialAnimFinished(&gMapObjects[objectId]); + FieldObjectClearHeldMovementIfFinished(&gMapObjects[objectId]); sub_80A2178(); UnfreezeMapObjects(); } @@ -113,5 +113,5 @@ void sub_8064EAC(void) void sub_8064ED4(void) { - FieldObjectClearAnimIfSpecialAnimActive(&gMapObjects[gSelectedMapObject]); + FieldObjectClearHeldMovementIfActive(&gMapObjects[gSelectedMapObject]); } diff --git a/src/overworld.c b/src/overworld.c index 98bb43add..f5624cd70 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -1825,7 +1825,7 @@ void sub_8054D90(void) gUnknown_0300489C = 0; gUnknown_03004898 = 0; sub_805AA98(); - sub_805B55C(0, 0); + TrySpawnFieldObjects(0, 0); mapheader_run_first_tag4_script_list_match(); } @@ -1841,7 +1841,7 @@ void mli4_mapscripts_and_other(void) InitPlayerAvatar(x, y, player->player_field_1, gSaveBlock2.playerGender); SetPlayerAvatarTransitionFlags(player->player_field_0); player_avatar_init_params_reset(); - sub_805B55C(0, 0); + TrySpawnFieldObjects(0, 0); ResetBerryTreeSparkleFlags(); mapheader_run_first_tag4_script_list_match(); } @@ -2505,7 +2505,7 @@ void SpawnLinkPlayerMapObject(u8 linkPlayerId, s16 x, s16 y, u8 a4) linkPlayerMapObj->mode = 0; mapObj->active = 1; - mapObj->regularAnimActive = a4; + mapObj->singleMovementActive = a4; mapObj->range.as_byte = 2; mapObj->spriteId = 64; @@ -2720,7 +2720,7 @@ void CreateLinkPlayerSprite(u8 linkPlayerId) if (linkPlayerMapObj->active) { - u8 val = GetRivalAvatarGraphicsIdByStateIdAndGender(PLAYER_AVATAR_STATE_NORMAL, mapObj->regularAnimActive); + u8 val = GetRivalAvatarGraphicsIdByStateIdAndGender(PLAYER_AVATAR_STATE_NORMAL, mapObj->singleMovementActive); mapObj->spriteId = AddPseudoFieldObject(val, SpriteCB_LinkPlayer, 0, 0, 0); sprite = &gSprites[mapObj->spriteId]; sprite->coordOffsetEnabled = TRUE; diff --git a/src/rom6.c b/src/rom6.c index 24c2de6d2..ca1e4b250 100644 --- a/src/rom6.c +++ b/src/rom6.c @@ -63,8 +63,8 @@ static void task08_080C9820(u8 taskId) ScriptContext2_Enable(); gPlayerAvatar.preventStep = TRUE; mapObjId = gPlayerAvatar.mapObjectId; - if (!FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(&gMapObjects[mapObjId]) - || FieldObjectClearAnimIfSpecialAnimFinished(&gMapObjects[mapObjId])) + if (!FieldObjectIsMovementOverridden(&gMapObjects[mapObjId]) + || FieldObjectClearHeldMovementIfFinished(&gMapObjects[mapObjId])) { if (gMapHeader.mapType == MAP_TYPE_UNDERWATER) { @@ -74,7 +74,7 @@ static void task08_080C9820(u8 taskId) else { sub_8059BF4(); - FieldObjectSetSpecialAnim(&gMapObjects[mapObjId], 0x39); + FieldObjectSetHeldMovement(&gMapObjects[mapObjId], 0x39); gTasks[taskId].func = sub_810B3DC; } } @@ -82,7 +82,7 @@ static void task08_080C9820(u8 taskId) static void sub_810B3DC(u8 taskId) { - if (FieldObjectCheckIfSpecialAnimFinishedOrInactive(&gMapObjects[gPlayerAvatar.mapObjectId]) == TRUE) + if (FieldObjectCheckHeldMovementStatus(&gMapObjects[gPlayerAvatar.mapObjectId]) == TRUE) { FieldEffectStart(FLDEFF_FIELD_MOVE_SHOW_MON_INIT); gTasks[taskId].func = sub_810B428; diff --git a/src/scrcmd.c b/src/scrcmd.c index 29c1f982e..674912c16 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -1205,7 +1205,7 @@ bool8 ScrCmd_releaseall(struct ScriptContext *ctx) HideFieldMessageBox(); objectId = GetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0); - FieldObjectClearAnimIfSpecialAnimFinished(&gMapObjects[objectId]); + FieldObjectClearHeldMovementIfFinished(&gMapObjects[objectId]); sub_80A2178(); UnfreezeMapObjects(); return FALSE; @@ -1217,9 +1217,9 @@ bool8 ScrCmd_release(struct ScriptContext *ctx) HideFieldMessageBox(); if (gMapObjects[gSelectedMapObject].active) - FieldObjectClearAnimIfSpecialAnimFinished(&gMapObjects[gSelectedMapObject]); + FieldObjectClearHeldMovementIfFinished(&gMapObjects[gSelectedMapObject]); objectId = GetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0); - FieldObjectClearAnimIfSpecialAnimFinished(&gMapObjects[objectId]); + FieldObjectClearHeldMovementIfFinished(&gMapObjects[objectId]); sub_80A2178(); UnfreezeMapObjects(); return FALSE; diff --git a/src/script_movement.c b/src/script_movement.c index 653dffcbf..ed1289a66 100644 --- a/src/script_movement.c +++ b/src/script_movement.c @@ -206,8 +206,8 @@ static void sub_80A2490(u8 taskId, u8 b, u8 mapObjId, const u8 *d) { u8 var; - if (FieldObjectIsSpecialAnimActive(&gMapObjects[mapObjId]) - && !FieldObjectClearAnimIfSpecialAnimFinished(&gMapObjects[mapObjId])) + if (FieldObjectIsHeldMovementActive(&gMapObjects[mapObjId]) + && !FieldObjectClearHeldMovementIfFinished(&gMapObjects[mapObjId])) return; var = *d; @@ -218,7 +218,7 @@ static void sub_80A2490(u8 taskId, u8 b, u8 mapObjId, const u8 *d) } else { - if (!FieldObjectSetSpecialAnim(&gMapObjects[mapObjId], var)) + if (!FieldObjectSetHeldMovement(&gMapObjects[mapObjId], var)) { d++; npc_obj_offscreen_culling_and_flag_update(b, d); diff --git a/src/trainer_see.c b/src/trainer_see.c index 2501d2c7f..a4811ecd5 100644 --- a/src/trainer_see.c +++ b/src/trainer_see.c @@ -266,7 +266,7 @@ static bool8 sub_8084398(u8 taskId, struct Task *task, struct MapObject *trainer FieldObjectGetLocalIdAndMap(trainerObj, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]); FieldEffectStart(FLDEFF_EXCLAMATION_MARK_ICON_1); direction = GetFaceDirectionAnimId(trainerObj->facingDirection); - FieldObjectSetSpecialAnim(trainerObj, direction); + FieldObjectSetHeldMovement(trainerObj, direction); task->data[0]++; return TRUE; } @@ -280,9 +280,9 @@ static bool8 sub_80843DC(u8 taskId, struct Task *task, struct MapObject *trainer else { task->data[0]++; - if (trainerObj->animPattern == 57 || trainerObj->animPattern == 58) + if (trainerObj->movementType == 57 || trainerObj->movementType == 58) task->data[0] = 6; - if (trainerObj->animPattern == 63) + if (trainerObj->movementType == 63) task->data[0] = 8; return TRUE; } @@ -290,16 +290,16 @@ static bool8 sub_80843DC(u8 taskId, struct Task *task, struct MapObject *trainer static bool8 sub_808441C(u8 taskId, struct Task *task, struct MapObject *trainerObj) { - if (!(FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(trainerObj)) || FieldObjectClearAnimIfSpecialAnimFinished(trainerObj)) + if (!(FieldObjectIsMovementOverridden(trainerObj)) || FieldObjectClearHeldMovementIfFinished(trainerObj)) { if (task->data[3]) { - FieldObjectSetSpecialAnim(trainerObj, GetGoSpeed0AnimId(trainerObj->facingDirection)); + FieldObjectSetHeldMovement(trainerObj, GetGoSpeed0AnimId(trainerObj->facingDirection)); task->data[3]--; } else { - FieldObjectSetSpecialAnim(trainerObj, 0x3E); + FieldObjectSetHeldMovement(trainerObj, 0x3E); task->data[0]++; } } @@ -310,7 +310,7 @@ static bool8 sub_8084478(u8 taskId, struct Task *task, struct MapObject *trainer { struct MapObject *playerObj; - if (FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(trainerObj) && !FieldObjectClearAnimIfSpecialAnimFinished(trainerObj)) + if (FieldObjectIsMovementOverridden(trainerObj) && !FieldObjectClearHeldMovementIfFinished(trainerObj)) return FALSE; npc_set_running_behaviour_etc(trainerObj, npc_running_behaviour_by_direction(trainerObj->facingDirection)); @@ -318,11 +318,11 @@ static bool8 sub_8084478(u8 taskId, struct Task *task, struct MapObject *trainer sub_805C754(trainerObj); playerObj = &gMapObjects[gPlayerAvatar.mapObjectId]; - if (FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(playerObj) && !FieldObjectClearAnimIfSpecialAnimFinished(playerObj)) + if (FieldObjectIsMovementOverridden(playerObj) && !FieldObjectClearHeldMovementIfFinished(playerObj)) return FALSE; sub_80597E8(); - FieldObjectSetSpecialAnim(&gMapObjects[gPlayerAvatar.mapObjectId], GetFaceDirectionAnimId(GetOppositeDirection(trainerObj->facingDirection))); + FieldObjectSetHeldMovement(&gMapObjects[gPlayerAvatar.mapObjectId], GetFaceDirectionAnimId(GetOppositeDirection(trainerObj->facingDirection))); task->data[0]++; return FALSE; } @@ -331,18 +331,18 @@ static bool8 sub_8084534(u8 taskId, struct Task *task, struct MapObject *trainer { struct MapObject *playerObj = &gMapObjects[gPlayerAvatar.mapObjectId]; - if (!FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(playerObj) - || FieldObjectClearAnimIfSpecialAnimFinished(playerObj)) + if (!FieldObjectIsMovementOverridden(playerObj) + || FieldObjectClearHeldMovementIfFinished(playerObj)) SwitchTaskToFollowupFunc(taskId); return FALSE; } static bool8 sub_8084578(u8 taskId, struct Task *task, struct MapObject *trainerObj) { - if (!FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(trainerObj) - || FieldObjectClearAnimIfSpecialAnimFinished(trainerObj)) + if (!FieldObjectIsMovementOverridden(trainerObj) + || FieldObjectClearHeldMovementIfFinished(trainerObj)) { - FieldObjectSetSpecialAnim(trainerObj, 0x59); + FieldObjectSetHeldMovement(trainerObj, 0x59); task->data[0]++; } return FALSE; @@ -350,7 +350,7 @@ static bool8 sub_8084578(u8 taskId, struct Task *task, struct MapObject *trainer static bool8 sub_80845AC(u8 taskId, struct Task *task, struct MapObject *trainerObj) { - if (FieldObjectClearAnimIfSpecialAnimFinished(trainerObj)) + if (FieldObjectClearHeldMovementIfFinished(trainerObj)) task->data[0] = 3; return FALSE; @@ -358,10 +358,10 @@ static bool8 sub_80845AC(u8 taskId, struct Task *task, struct MapObject *trainer static bool8 sub_80845C8(u8 taskId, struct Task *task, struct MapObject *trainerObj) { - if (!FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(trainerObj) - || FieldObjectClearAnimIfSpecialAnimFinished(trainerObj)) + if (!FieldObjectIsMovementOverridden(trainerObj) + || FieldObjectClearHeldMovementIfFinished(trainerObj)) { - FieldObjectSetSpecialAnim(trainerObj, 0x3E); + FieldObjectSetHeldMovement(trainerObj, 0x3E); task->data[0]++; } return FALSE; @@ -369,7 +369,7 @@ static bool8 sub_80845C8(u8 taskId, struct Task *task, struct MapObject *trainer static bool8 sub_80845FC(u8 taskId, struct Task *task, struct MapObject *trainerObj) { - if (FieldObjectCheckIfSpecialAnimFinishedOrInactive(trainerObj)) + if (FieldObjectCheckHeldMovementStatus(trainerObj)) { gFieldEffectArguments[0] = trainerObj->currentCoords.x; gFieldEffectArguments[1] = trainerObj->currentCoords.y; @@ -392,8 +392,8 @@ static bool8 sub_8084654(u8 taskId, struct Task *task, struct MapObject *trainer sprite = &gSprites[trainerObj->spriteId]; sprite->oam.priority = 2; - FieldObjectClearAnimIfSpecialAnimFinished(trainerObj); - FieldObjectSetSpecialAnim(trainerObj, sub_806084C(trainerObj->facingDirection)); + FieldObjectClearHeldMovementIfFinished(trainerObj); + FieldObjectSetHeldMovement(trainerObj, sub_806084C(trainerObj->facingDirection)); task->data[0]++; } return FALSE; @@ -424,7 +424,7 @@ void sub_80846E4(u8 taskId) LoadWordFromTwoHalfwords(&task->data[1], (u32 *)&mapObj); if (!task->data[7]) { - FieldObjectClearAnim(mapObj); + FieldObjectClearHeldMovement(mapObj); task->data[7]++; } gTrainerSeeFuncList2[task->data[0]](taskId, task, mapObj); @@ -436,7 +436,7 @@ void sub_80846E4(u8 taskId) } else { - mapObj->specialAnimFinished = 0; + mapObj->heldMovementFinished = 0; } } |