summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/event_object_movement.h22
-rw-r--r--include/macros/map.inc4
-rw-r--r--src/bike.c2
-rw-r--r--src/data/field_event_obj/movement_action_func_tables.h44
-rw-r--r--src/data/field_event_obj/movement_type_func_tables.h6
-rw-r--r--src/event_object_movement.c52
-rw-r--r--src/field_effect.c2
-rw-r--r--src/trainer_see.c4
8 files changed, 67 insertions, 69 deletions
diff --git a/include/event_object_movement.h b/include/event_object_movement.h
index b458fec5a..21e60a60a 100644
--- a/include/event_object_movement.h
+++ b/include/event_object_movement.h
@@ -146,14 +146,14 @@ enum {
MOVEMENT_ACTION_JUMP_SPECIAL_UP,
MOVEMENT_ACTION_JUMP_SPECIAL_LEFT ,
MOVEMENT_ACTION_JUMP_SPECIAL_RIGHT,
- MOVEMENT_ACITON_FACE_PLAYER,
- MOVEMENT_ACITON_FACE_AWAY_PLAYER,
+ MOVEMENT_ACTION_FACE_PLAYER,
+ MOVEMENT_ACTION_FACE_AWAY_PLAYER,
MOVEMENT_ACTION_LOCK_FACING_DIRECTION,
MOVEMENT_ACTION_UNLOCK_FACING_DIRECTION,
- MOVEMENT_ACITON_JUMP_DOWN,
- MOVEMENT_ACITON_JUMP_UP,
- MOVEMENT_ACITON_JUMP_LEFT,
- MOVEMENT_ACITON_JUMP_RIGHT,
+ MOVEMENT_ACTION_JUMP_DOWN,
+ MOVEMENT_ACTION_JUMP_UP,
+ MOVEMENT_ACTION_JUMP_LEFT,
+ MOVEMENT_ACTION_JUMP_RIGHT,
MOVEMENT_ACTION_JUMP_IN_PLACE_DOWN,
MOVEMENT_ACTION_JUMP_IN_PLACE_UP,
MOVEMENT_ACTION_JUMP_IN_PLACE_LEFT,
@@ -180,7 +180,7 @@ enum {
MOVEMENT_ACTION_CLEAR_FIXED_PRIORITY,
MOVEMENT_ACTION_INIT_AFFINE_ANIM,
MOVEMENT_ACTION_CLEAR_AFFINE_ANIM,
- MOVEMENT_ACTION_WALK_DOWN_AFFINE_0,
+ MOVEMENT_ACTION_WALK_DOWN_START_AFFINE,
MOVEMENT_ACTION_WALK_DOWN_AFFINE_1,
MOVEMENT_ACTION_ACRO_WHEELIE_FACE_DOWN,
MOVEMENT_ACTION_ACRO_WHEELIE_FACE_UP,
@@ -546,11 +546,11 @@ u8 MovementType_CopyPlayerInGrass_Step1(struct EventObject *, struct Sprite *);
u8 MovementType_CopyPlayer_Step2(struct EventObject *, struct Sprite *);
u8 MovementType_Hidden_Step0(struct EventObject *, struct Sprite *);
u8 MovementType_WalkInPlace_Step0(struct EventObject *, struct Sprite *);
-u8 MovementType_WalkInPlace_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_MoveInPlace_Step1(struct EventObject *, struct Sprite *);
u8 MovementType_JogInPlace_Step0(struct EventObject *, struct Sprite *);
-u8 MovementType_WalkInPlace_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_MoveInPlace_Step1(struct EventObject *, struct Sprite *);
u8 MovementType_RunInPlace_Step0(struct EventObject *, struct Sprite *);
-u8 MovementType_WalkInPlace_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_MoveInPlace_Step1(struct EventObject *, struct Sprite *);
u8 MovementType_Invisible_Step0(struct EventObject *, struct Sprite *);
u8 MovementType_Invisible_Step1(struct EventObject *, struct Sprite *);
u8 MovementType_Invisible_Step2(struct EventObject *, struct Sprite *);
@@ -650,7 +650,7 @@ u8 GetPlayerRunMovementAction(u32);
u8 GetJump2MovementAction(u32);
u8 GetJumpInPlaceMovementAction(u32);
u8 GetJumpInPlaceTurnAroundMovementAction(u32);
-u8 sub_80608A4(u32);
+u8 GetJumpMovementAction(u32);
u8 GetJumpSpecialMovementAction(u32);
u8 GetWalkInPlaceSlowMovementAction(u32);
u8 GetWalkInPlaceNormalMovementAction(u32);
diff --git a/include/macros/map.inc b/include/macros/map.inc
index db37d9346..4d2708836 100644
--- a/include/macros/map.inc
+++ b/include/macros/map.inc
@@ -14,8 +14,8 @@
.4byte \address
.endm
- .macro object_event byte1, word1, byte2, byte3, byte4, byte5, byte6, byte7, byte8, byte9, byte10, byte11, byte12, byte13, byte14, script, word2, byte15, byte16
- .byte \byte1
+ .macro object_event index, word1, byte2, byte3, byte4, byte5, byte6, byte7, byte8, byte9, byte10, byte11, byte12, byte13, byte14, script, word2, byte15, byte16
+ .byte \index
.2byte \word1
.byte \byte2, \byte3, \byte4, \byte5, \byte6, \byte7, \byte8, \byte9, \byte10, \byte11, \byte12, \byte13, \byte14
.4byte \script
diff --git a/src/bike.c b/src/bike.c
index db37167f3..f0f996b6b 100644
--- a/src/bike.c
+++ b/src/bike.c
@@ -675,7 +675,7 @@ static void AcroBikeTransition_SideJump(u8 direction)
playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId];
PlaySE(SE_JITE_PYOKO);
playerEventObj->facingDirectionLocked = 1;
- PlayerSetAnimId(sub_80608A4(direction), 2);
+ PlayerSetAnimId(GetJumpMovementAction(direction), 2);
}
static void AcroBikeTransition_TurnJump(u8 direction)
diff --git a/src/data/field_event_obj/movement_action_func_tables.h b/src/data/field_event_obj/movement_action_func_tables.h
index 819545343..61871a2ca 100644
--- a/src/data/field_event_obj/movement_action_func_tables.h
+++ b/src/data/field_event_obj/movement_action_func_tables.h
@@ -156,10 +156,10 @@ u8 MovementAction_SetFixedPriority_Step0(struct EventObject *, struct Sprite *);
u8 MovementAction_ClearFixedPriority_Step0(struct EventObject *, struct Sprite *);
u8 MovementAction_InitAffineAnim_Step0(struct EventObject *, struct Sprite *);
u8 MovementAction_ClearAffineAnim_Step0(struct EventObject *, struct Sprite *);
-u8 MovementAction_WalkDownAffine0_Step0(struct EventObject *, struct Sprite *);
-u8 MovementAction_WalkDownAffine0_Step1(struct EventObject *, struct Sprite *);
-u8 MovementAction_WalkDownAffine1_Step0(struct EventObject *, struct Sprite *);
-u8 MovementAction_WalkDownAffine1_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkDownStartAffine_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkDownStartAffine_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkDownAffine_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkDownAffine_Step1(struct EventObject *, struct Sprite *);
u8 MovementAction_AcroWheelieFaceDown_Step0(struct EventObject *, struct Sprite *);
u8 MovementAction_AcroWheelieFaceUp_Step0(struct EventObject *, struct Sprite *);
u8 MovementAction_AcroWheelieFaceLeft_Step0(struct EventObject *, struct Sprite *);
@@ -329,8 +329,8 @@ u8 (*const gMovementActionFuncs_SetFixedPriority[])(struct EventObject *, struct
u8 (*const gMovementActionFuncs_ClearFixedPriority[])(struct EventObject *, struct Sprite *);
u8 (*const gMovementActionFuncs_InitAffineAnim[])(struct EventObject *, struct Sprite *);
u8 (*const gMovementActionFuncs_ClearAffineAnim[])(struct EventObject *, struct Sprite *);
-u8 (*const gMovementActionFuncs_WalkDownAffine0[])(struct EventObject *, struct Sprite *);
-u8 (*const gMovementActionFuncs_WalkDownAffine1[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_WalkDownStartAffine[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_WalkDownAffine[])(struct EventObject *, struct Sprite *);
u8 (*const gMovementActionFuncs_AcroWheelieFaceDown[])(struct EventObject *, struct Sprite *);
u8 (*const gMovementActionFuncs_AcroWheelieFaceUp[])(struct EventObject *, struct Sprite *);
u8 (*const gMovementActionFuncs_AcroWheelieFaceLeft[])(struct EventObject *, struct Sprite *);
@@ -422,10 +422,10 @@ u8 (*const *const gMovementActionFuncs[])(struct EventObject *, struct Sprite *)
gMovementActionFuncs_WalkFastestUp, // MOVEMENT_ACTION_WALK_FASTEST_UP
gMovementActionFuncs_WalkFastestLeft, // MOVEMENT_ACTION_WALK_FASTEST_LEFT
gMovementActionFuncs_WalkFastestRight, // MOVEMENT_ACTION_WALK_FASTEST_RIGHT
- gMovementActionFuncs_SlideDown, // MOVEMENT_ACITON_SLIDE_DOWN
- gMovementActionFuncs_SlideUp, // MOVEMENT_ACITON_SLIDE_UP
- gMovementActionFuncs_SlideLeft, // MOVEMENT_ACITON_SLIDE_LEFT
- gMovementActionFuncs_SlideRight, // MOVEMENT_ACITON_SLIDE_RIGHT
+ gMovementActionFuncs_SlideDown, // MOVEMENT_ACTION_SLIDE_DOWN
+ gMovementActionFuncs_SlideUp, // MOVEMENT_ACTION_SLIDE_UP
+ gMovementActionFuncs_SlideLeft, // MOVEMENT_ACTION_SLIDE_LEFT
+ gMovementActionFuncs_SlideRight, // MOVEMENT_ACTION_SLIDE_RIGHT
gMovementActionFuncs_PlayerRunDown, // MOVEMENT_ACTION_PLAYER_RUN_DOWN
gMovementActionFuncs_PlayerRunUp, // MOVEMENT_ACTION_PLAYER_RUN_UP
gMovementActionFuncs_PlayerRunLeft, // MOVEMENT_ACTION_PLAYER_RUN_LEFT
@@ -439,10 +439,10 @@ u8 (*const *const gMovementActionFuncs[])(struct EventObject *, struct Sprite *)
gMovementActionFuncs_FaceAwayPlayer, // MOVEMENT_ACTION_FACE_AWAY_PLAYER
gMovementActionFuncs_LockFacingDirection, // MOVEMENT_ACTION_LOCK_FACING_DIRECTION
gMovementActionFuncs_UnlockFacingDirection, // MOVEMENT_ACTION_UNLOCK_FACING_DIRECTION
- gMovementActionFuncs_JumpDown, // MOVEMENT_ACITON_JUMP_DOWN
- gMovementActionFuncs_JumpUp, // MOVEMENT_ACITON_JUMP_UP
- gMovementActionFuncs_JumpLeft, // MOVEMENT_ACITON_JUMP_LEFT
- gMovementActionFuncs_JumpRight, // MOVEMENT_ACITON_JUMP_RIGHT
+ gMovementActionFuncs_JumpDown, // MOVEMENT_ACTION_JUMP_DOWN
+ gMovementActionFuncs_JumpUp, // MOVEMENT_ACTION_JUMP_UP
+ gMovementActionFuncs_JumpLeft, // MOVEMENT_ACTION_JUMP_LEFT
+ gMovementActionFuncs_JumpRight, // MOVEMENT_ACTION_JUMP_RIGHT
gMovementActionFuncs_JumpInPlaceDown, // MOVEMENT_ACTION_JUMP_IN_PLACE_DOWN
gMovementActionFuncs_JumpInPlaceUp, // MOVEMENT_ACTION_JUMP_IN_PLACE_UP
gMovementActionFuncs_JumpInPlaceLeft, // MOVEMENT_ACTION_JUMP_IN_PLACE_LEFT
@@ -469,8 +469,8 @@ u8 (*const *const gMovementActionFuncs[])(struct EventObject *, struct Sprite *)
gMovementActionFuncs_ClearFixedPriority, // MOVEMENT_ACTION_CLEAR_FIXED_PRIORITY
gMovementActionFuncs_InitAffineAnim, // MOVEMENT_ACTION_INIT_AFFINE_ANIM
gMovementActionFuncs_ClearAffineAnim, // MOVEMENT_ACTION_CLEAR_AFFINE_ANIM
- gMovementActionFuncs_WalkDownAffine0, // MOVEMENT_ACTION_WALK_DOWN_AFFINE_0
- gMovementActionFuncs_WalkDownAffine1, // MOVEMENT_ACTION_WALK_DOWN_AFFINE_1
+ gMovementActionFuncs_WalkDownStartAffine, // MOVEMENT_ACTION_WALK_DOWN_START_AFFINE
+ gMovementActionFuncs_WalkDownAffine, // MOVEMENT_ACTION_WALK_DOWN_AFFINE_1
gMovementActionFuncs_AcroWheelieFaceDown, // MOVEMENT_ACTION_ACRO_WHEELIE_FACE_DOWN
gMovementActionFuncs_AcroWheelieFaceUp, // MOVEMENT_ACTION_ACRO_WHEELIE_FACE_UP
gMovementActionFuncs_AcroWheelieFaceLeft, // MOVEMENT_ACTION_ACRO_WHEELIE_FACE_LEFT
@@ -1081,15 +1081,15 @@ u8 (*const gMovementActionFuncs_ClearAffineAnim[])(struct EventObject *, struct
MovementAction_Finish
};
-u8 (*const gMovementActionFuncs_WalkDownAffine0[])(struct EventObject *, struct Sprite *) = {
- MovementAction_WalkDownAffine0_Step0,
- MovementAction_WalkDownAffine0_Step1,
+u8 (*const gMovementActionFuncs_WalkDownStartAffine[])(struct EventObject *, struct Sprite *) = {
+ MovementAction_WalkDownStartAffine_Step0,
+ MovementAction_WalkDownStartAffine_Step1,
MovementAction_PauseSpriteAnim
};
-u8 (*const gMovementActionFuncs_WalkDownAffine1[])(struct EventObject *, struct Sprite *) = {
- MovementAction_WalkDownAffine1_Step0,
- MovementAction_WalkDownAffine1_Step1,
+u8 (*const gMovementActionFuncs_WalkDownAffine[])(struct EventObject *, struct Sprite *) = {
+ MovementAction_WalkDownAffine_Step0,
+ MovementAction_WalkDownAffine_Step1,
MovementAction_PauseSpriteAnim
};
diff --git a/src/data/field_event_obj/movement_type_func_tables.h b/src/data/field_event_obj/movement_type_func_tables.h
index ccbdac99c..b038d5b20 100644
--- a/src/data/field_event_obj/movement_type_func_tables.h
+++ b/src/data/field_event_obj/movement_type_func_tables.h
@@ -416,17 +416,17 @@ u8 (*const gMovementTypeFuncs_Hidden[])(struct EventObject *, struct Sprite *) =
u8 (*const gMovementTypeFuncs_WalkInPlace[])(struct EventObject *, struct Sprite *) = {
MovementType_WalkInPlace_Step0,
- MovementType_WalkInPlace_Step1
+ MovementType_MoveInPlace_Step1
};
u8 (*const gMovementTypeFuncs_JogInPlace[])(struct EventObject *, struct Sprite *) = {
MovementType_JogInPlace_Step0,
- MovementType_WalkInPlace_Step1
+ MovementType_MoveInPlace_Step1
};
u8 (*const gMovementTypeFuncs_RunInPlace[])(struct EventObject *, struct Sprite *) = {
MovementType_RunInPlace_Step0,
- MovementType_WalkInPlace_Step1
+ MovementType_MoveInPlace_Step1
};
u8 (*const gMovementTypeFuncs_Invisible[])(struct EventObject *, struct Sprite *) = {
diff --git a/src/event_object_movement.c b/src/event_object_movement.c
index 4ab740702..60bd09ca9 100644
--- a/src/event_object_movement.c
+++ b/src/event_object_movement.c
@@ -819,11 +819,11 @@ const u8 gJumpInPlaceTurnAroundMovementActions[] = {
MOVEMENT_ACTION_JUMP_IN_PLACE_LEFT_RIGHT,
};
const u8 gJumpMovementActions[] = {
- MOVEMENT_ACITON_JUMP_DOWN,
- MOVEMENT_ACITON_JUMP_DOWN,
- MOVEMENT_ACITON_JUMP_UP,
- MOVEMENT_ACITON_JUMP_LEFT,
- MOVEMENT_ACITON_JUMP_RIGHT,
+ MOVEMENT_ACTION_JUMP_DOWN,
+ MOVEMENT_ACTION_JUMP_DOWN,
+ MOVEMENT_ACTION_JUMP_UP,
+ MOVEMENT_ACTION_JUMP_LEFT,
+ MOVEMENT_ACTION_JUMP_RIGHT,
};
const u8 gJumpSpecialMovementActions[] = {
MOVEMENT_ACTION_JUMP_SPECIAL_DOWN,
@@ -1182,19 +1182,17 @@ void RemoveEventObject(struct EventObject *eventObject)
void RemoveEventObjectByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup)
{
u8 eventObjectId;
-
- if (TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId))
- return;
- FlagSet(GetEventObjectFlagIdByEventObjectId(eventObjectId));
- RemoveEventObject(&gEventObjects[eventObjectId]);
+ if (!TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId))
+ {
+ FlagSet(GetEventObjectFlagIdByEventObjectId(eventObjectId));
+ RemoveEventObject(&gEventObjects[eventObjectId]);
+ }
}
void RemoveEventObjectInternal(struct EventObject *eventObject)
{
struct SpriteFrameImage image;
- const struct EventObjectGraphicsInfo *gfxInfo = GetEventObjectGraphicsInfo(eventObject->graphicsId);
-
- image.size = gfxInfo->size;
+ image.size = GetEventObjectGraphicsInfo(eventObject->graphicsId)->size;
gSprites[eventObject->spriteId].images = ℑ
DestroySprite(&gSprites[eventObject->spriteId]);
}
@@ -4028,7 +4026,7 @@ bool8 CopyablePlayerMovement_GoSpeed4(struct EventObject *eventObject, struct Sp
direction = playerDirection;
direction = state_to_direction(gInitialMovementTypeFacingDirections[eventObject->movementType], eventObject->directionSequenceIndex, direction);
EventObjectMoveDestCoords(eventObject, direction, &x, &y);
- EventObjectSetSingleMovement(eventObject, sprite, sub_80608A4(direction));
+ EventObjectSetSingleMovement(eventObject, sprite, GetJumpMovementAction(direction));
if (GetCollisionAtCoords(eventObject, x, y, direction) || (tileCallback != NULL && !tileCallback(MapGridGetMetatileBehaviorAt(x, y))))
{
EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(direction));
@@ -4079,7 +4077,7 @@ void MovementType_TreeDisguise(struct Sprite *sprite)
EventObjectGetLocalIdAndMap(eventObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]);
eventObject->fieldEffectSpriteId = FieldEffectStart(FLDEFF_TREE_DISGUISE);
eventObject->directionSequenceIndex = 1;
- sprite->data[7] ++;
+ sprite->data[7]++;
}
UpdateEventObjectCurrentMovement(&gEventObjects[sprite->data[0]], sprite, MovementType_Disguise_Callback);
}
@@ -4099,7 +4097,7 @@ void MovementType_MountainDisguise(struct Sprite *sprite)
EventObjectGetLocalIdAndMap(eventObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]);
eventObject->fieldEffectSpriteId = FieldEffectStart(FLDEFF_MOUNTAIN_DISGUISE);
eventObject->directionSequenceIndex = 1;
- sprite->data[7] ++;
+ sprite->data[7]++;
}
UpdateEventObjectCurrentMovement(&gEventObjects[sprite->data[0]], sprite, MovementType_Disguise_Callback);
}
@@ -4111,7 +4109,7 @@ void MovementType_Hidden(struct Sprite *sprite)
gEventObjects[sprite->data[0]].fixedPriority = 1;
sprite->subspriteMode = 2;
sprite->oam.priority = 3;
- sprite->data[7] ++;
+ sprite->data[7]++;
}
UpdateEventObjectCurrentMovement(&gEventObjects[sprite->data[0]], sprite, MovementType_Hidden_Callback);
}
@@ -4127,7 +4125,7 @@ u8 MovementType_Hidden_Step0(struct EventObject *eventObject, struct Sprite *spr
return 0;
}
-u8 MovementType_WalkInPlace_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+u8 MovementType_MoveInPlace_Step1(struct EventObject *eventObject, struct Sprite *sprite)
{
if (EventObjectExecSingleMovementAction(eventObject, sprite))
{
@@ -4660,7 +4658,7 @@ dirn_to_anim(GetPlayerRunMovementAction, gPlayerRunMovementActions)
dirn_to_anim(GetJump2MovementAction, gJump2MovementActions)
dirn_to_anim(GetJumpInPlaceMovementAction, gJumpInPlaceMovementActions)
dirn_to_anim(GetJumpInPlaceTurnAroundMovementAction, gJumpInPlaceTurnAroundMovementActions)
-dirn_to_anim(sub_80608A4, gJumpMovementActions)
+dirn_to_anim(GetJumpMovementAction, gJumpMovementActions)
dirn_to_anim(GetJumpSpecialMovementAction, gJumpSpecialMovementActions)
dirn_to_anim(GetWalkInPlaceSlowMovementAction, gWalkInPlaceSlowMovementActions)
dirn_to_anim(GetWalkInPlaceNormalMovementAction, gWalkInPlaceNormalMovementActions)
@@ -6364,17 +6362,17 @@ bool8 MovementAction_ClearAffineAnim_Step0(struct EventObject *eventObject, stru
return TRUE;
}
-bool8 MovementAction_WalkDownAffine0_Step1(struct EventObject *, struct Sprite *);
+bool8 MovementAction_WalkDownStartAffine_Step1(struct EventObject *, struct Sprite *);
-bool8 MovementAction_WalkDownAffine0_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+bool8 MovementAction_WalkDownStartAffine_Step0(struct EventObject *eventObject, struct Sprite *sprite)
{
sub_8060ED8(eventObject, sprite, DIR_SOUTH);
sprite->affineAnimPaused = 0;
StartSpriteAffineAnimIfDifferent(sprite, 0);
- return MovementAction_WalkDownAffine0_Step1(eventObject, sprite);
+ return MovementAction_WalkDownStartAffine_Step1(eventObject, sprite);
}
-bool8 MovementAction_WalkDownAffine0_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+bool8 MovementAction_WalkDownStartAffine_Step1(struct EventObject *eventObject, struct Sprite *sprite)
{
if (an_walk_any_2(eventObject, sprite))
{
@@ -6385,17 +6383,17 @@ bool8 MovementAction_WalkDownAffine0_Step1(struct EventObject *eventObject, stru
return FALSE;
}
-bool8 MovementAction_WalkDownAffine1_Step1(struct EventObject *, struct Sprite *);
+bool8 MovementAction_WalkDownAffine_Step1(struct EventObject *, struct Sprite *);
-bool8 MovementAction_WalkDownAffine1_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+bool8 MovementAction_WalkDownAffine_Step0(struct EventObject *eventObject, struct Sprite *sprite)
{
sub_8060ED8(eventObject, sprite, DIR_SOUTH);
sprite->affineAnimPaused = 0;
ChangeSpriteAffineAnimIfDifferent(sprite, 1);
- return MovementAction_WalkDownAffine1_Step1(eventObject, sprite);
+ return MovementAction_WalkDownAffine_Step1(eventObject, sprite);
}
-bool8 MovementAction_WalkDownAffine1_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+bool8 MovementAction_WalkDownAffine_Step1(struct EventObject *eventObject, struct Sprite *sprite)
{
if (an_walk_any_2(eventObject, sprite))
{
diff --git a/src/field_effect.c b/src/field_effect.c
index 8c00476d7..91794a07a 100644
--- a/src/field_effect.c
+++ b/src/field_effect.c
@@ -1834,7 +1834,7 @@ bool8 sub_8087548(struct Task *task, struct EventObject *eventObject, struct Spr
eventObject->invisible = 0;
CameraObjectReset1();
PlaySE(SE_W091);
- EventObjectSetHeldMovement(eventObject, sub_80608A4(DIR_EAST));
+ EventObjectSetHeldMovement(eventObject, GetJumpMovementAction(DIR_EAST));
}
return FALSE;
}
diff --git a/src/trainer_see.c b/src/trainer_see.c
index 902a67fdf..dfbab1e3a 100644
--- a/src/trainer_see.c
+++ b/src/trainer_see.c
@@ -299,7 +299,7 @@ static bool8 sub_808441C(u8 taskId, struct Task *task, struct EventObject *train
}
else
{
- EventObjectSetHeldMovement(trainerObj, MOVEMENT_ACITON_FACE_PLAYER);
+ EventObjectSetHeldMovement(trainerObj, MOVEMENT_ACTION_FACE_PLAYER);
task->data[0]++;
}
}
@@ -361,7 +361,7 @@ static bool8 sub_80845C8(u8 taskId, struct Task *task, struct EventObject *train
if (!EventObjectIsMovementOverridden(trainerObj)
|| EventObjectClearHeldMovementIfFinished(trainerObj))
{
- EventObjectSetHeldMovement(trainerObj, MOVEMENT_ACITON_FACE_PLAYER);
+ EventObjectSetHeldMovement(trainerObj, MOVEMENT_ACTION_FACE_PLAYER);
task->data[0]++;
}
return FALSE;
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-07 13:34:54 +0000