diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-06-14 21:58:31 -0500 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2018-06-15 07:49:00 -0500 |
| commit | be5a199f5b1cc13f39b7d4f7eaa80fb08929d9a3 (patch) | |
| tree | c0e5e65957b8acf7337a7cd0125e40c1953983d8 /include | |
| parent | 2e80477ea11c265e69658b852c57097fd8a21492 (diff) | |
Update some event_object_movement things to sync with emerald
Diffstat (limited to 'include')
| -rw-r--r-- | include/event_object_movement.h | 22 | ||||
| -rw-r--r-- | include/macros/map.inc | 4 |
2 files changed, 13 insertions, 13 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 |