Skip to content

Commit fa97543

Browse files
committed
Fix all fakematches in event object movement
Min changes needed. This also required adjusting faraway_mew's return type.
1 parent 61674ec commit fa97543

5 files changed

Lines changed: 142 additions & 178 deletions

File tree

include/event_object_movement.h

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -148,11 +148,11 @@ void InitObjectEventPalettes(u8 reflectionType);
148148
void UpdateObjectEventCurrentMovement(struct ObjectEvent *objectEvent, struct Sprite *sprite, bool8 (*callback)(struct ObjectEvent *, struct Sprite *));
149149
bool8 ObjectEventFaceOppositeDirection(struct ObjectEvent *objectEvent, u8 direction);
150150
u8 GetOppositeDirection(u8 direction);
151-
u8 GetWalkInPlaceFasterMovementAction(u32);
152-
u8 GetWalkInPlaceFastMovementAction(u32);
153-
u8 GetWalkInPlaceNormalMovementAction(u32);
154-
u8 GetWalkInPlaceSlowMovementAction(u32);
155-
u8 GetCollisionAtCoords(struct ObjectEvent *objectEvent, s16 x, s16 y, u32 dir);
151+
u8 GetWalkInPlaceFasterMovementAction(u8);
152+
u8 GetWalkInPlaceFastMovementAction(u8);
153+
u8 GetWalkInPlaceNormalMovementAction(u8);
154+
u8 GetWalkInPlaceSlowMovementAction(u8);
155+
u8 GetCollisionAtCoords(struct ObjectEvent *objectEvent, s16 x, s16 y, u8 dir);
156156
void MoveCoords(u8 direction, s16 *x, s16 *y);
157157
bool8 ObjectEventIsHeldMovementActive(struct ObjectEvent *objectEvent);
158158
u8 ObjectEventClearHeldMovementIfFinished(struct ObjectEvent *objectEvent);
@@ -161,24 +161,24 @@ void SetTrainerMovementType(struct ObjectEvent *objectEvent, u8 movementType);
161161
u8 GetTrainerFacingDirectionMovementType(u8 direction);
162162
const u8 *GetObjectEventScriptPointerByObjectEventId(u8 objectEventId);
163163
u8 GetCollisionFlagsAtCoords(struct ObjectEvent *objectEvent, s16 x, s16 y, u8 direction);
164-
u8 GetFaceDirectionMovementAction(u32);
165-
u8 GetWalkNormalMovementAction(u32);
166-
u8 GetWalkFastMovementAction(u32);
167-
u8 GetRideWaterCurrentMovementAction(u32);
168-
u8 GetWalkFasterMovementAction(u32);
169-
u8 GetPlayerRunMovementAction(u32);
170-
u8 GetJumpInPlaceMovementAction(u32);
171-
u8 GetAcroWheelieFaceDirectionMovementAction(u32);
172-
u8 GetAcroPopWheelieFaceDirectionMovementAction(u32);
173-
u8 GetAcroEndWheelieFaceDirectionMovementAction(u32);
174-
u8 GetAcroWheelieHopFaceDirectionMovementAction(u32);
175-
u8 GetAcroWheelieHopDirectionMovementAction(u32);
176-
u8 GetAcroWheelieJumpDirectionMovementAction(u32);
177-
u8 GetJumpInPlaceTurnAroundMovementAction(u32);
178-
u8 GetAcroWheelieInPlaceDirectionMovementAction(u32);
179-
u8 GetAcroPopWheelieMoveDirectionMovementAction(u32);
180-
u8 GetAcroWheelieMoveDirectionMovementAction(u32);
181-
u8 GetAcroEndWheelieMoveDirectionMovementAction(u32);
164+
u8 GetFaceDirectionMovementAction(u8);
165+
u8 GetWalkNormalMovementAction(u8);
166+
u8 GetWalkFastMovementAction(u8);
167+
u8 GetRideWaterCurrentMovementAction(u8);
168+
u8 GetWalkFasterMovementAction(u8);
169+
u8 GetPlayerRunMovementAction(u8);
170+
u8 GetJumpInPlaceMovementAction(u8);
171+
u8 GetAcroWheelieFaceDirectionMovementAction(u8);
172+
u8 GetAcroPopWheelieFaceDirectionMovementAction(u8);
173+
u8 GetAcroEndWheelieFaceDirectionMovementAction(u8);
174+
u8 GetAcroWheelieHopFaceDirectionMovementAction(u8);
175+
u8 GetAcroWheelieHopDirectionMovementAction(u8);
176+
u8 GetAcroWheelieJumpDirectionMovementAction(u8);
177+
u8 GetJumpInPlaceTurnAroundMovementAction(u8);
178+
u8 GetAcroWheelieInPlaceDirectionMovementAction(u8);
179+
u8 GetAcroPopWheelieMoveDirectionMovementAction(u8);
180+
u8 GetAcroWheelieMoveDirectionMovementAction(u8);
181+
u8 GetAcroEndWheelieMoveDirectionMovementAction(u8);
182182
u8 GetFishingDirectionAnimNum(u8 direction);
183183
u8 GetAcroWheelieDirectionAnimNum(u8 direction);
184184
u8 GetFishingBiteDirectionAnimNum(u8 direction);
@@ -191,11 +191,11 @@ u8 ObjectEventGetHeldMovementActionId(struct ObjectEvent *objectEvent);
191191
void TryOverrideTemplateCoordsForObjectEvent(const struct ObjectEvent *objectEvent, u8 movementType);
192192
void OverrideTemplateCoordsForObjectEvent(const struct ObjectEvent *objectEvent);
193193
void ShiftStillObjectEventCoords(struct ObjectEvent *objEvent);
194-
void ObjectEventMoveDestCoords(struct ObjectEvent *objEvent, u32 direction, s16 *x, s16 *y);
194+
void ObjectEventMoveDestCoords(struct ObjectEvent *objEvent, u8 direction, s16 *x, s16 *y);
195195
u8 AddCameraObject(u8 linkedSpriteId);
196196
void UpdateObjectEventsForCameraUpdate(s16 x, s16 y);
197-
u8 GetWalkSlowMovementAction(u32);
198-
u8 GetJumpMovementAction(u32);
197+
u8 GetWalkSlowMovementAction(u8);
198+
u8 GetJumpMovementAction(u8);
199199
u8 ElevationToPriority(u8 elevation);
200200
void ObjectEventUpdateElevation(struct ObjectEvent *objEvent);
201201
void SetObjectSubpriorityByElevation(u8 elevation, struct Sprite *sprite, u8 subpriority);
@@ -277,9 +277,9 @@ void MovementType_JogInPlace(struct Sprite *sprite);
277277
void MovementType_RunInPlace(struct Sprite *sprite);
278278
void MovementType_Invisible(struct Sprite *sprite);
279279
void MovementType_WalkSlowlyInPlace(struct Sprite *sprite);
280-
u8 GetSlideMovementAction(u32);
281-
u8 GetJumpMovementAction(u32);
282-
u8 GetJump2MovementAction(u32);
280+
u8 GetSlideMovementAction(u8);
281+
u8 GetJumpMovementAction(u8);
282+
u8 GetJump2MovementAction(u8);
283283
u8 CreateCopySpriteAt(struct Sprite *sprite, s16 x, s16 y, u8 subpriority);
284284

285285
bool8 MovementType_WanderAround_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite);

include/faraway_island.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#ifndef GUARD_FARAWAY_ISLAND_H
22
#define GUARD_FARAWAY_ISLAND_H
33

4-
u32 GetMewMoveDirection(void);
4+
u8 GetMewMoveDirection(void);
55
bool8 ShouldMewShakeGrass(struct ObjectEvent *objectEvent);
66
void UpdateFarawayIslandStepCounter(void);
77
bool8 ObjectEventIsFarawayIslandMew(struct ObjectEvent *objectEvent);

include/field_player_avatar.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ void SetPlayerAvatarFieldMove(void);
4343
u8 GetPlayerAvatarGraphicsIdByCurrentState(void);
4444
void SetPlayerAvatarStateMask(u8 flags);
4545
u8 GetPlayerAvatarGraphicsIdByStateId(u8 state);
46-
u8 GetJumpSpecialMovementAction(u32);
46+
u8 GetJumpSpecialMovementAction(u8);
4747
bool8 PartyHasMonWithSurf(void);
4848
bool8 IsPlayerFacingSurfableFishableWater(void);
4949
bool8 IsPlayerSurfingNorth(void);

0 commit comments

Comments
 (0)