dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix movement types; fix some math ops

Browse Source
This commit is contained in:
PikalaxALT
2021-03-30 20:33:31 -04:00
parent 35b68c68ee
commit f00b44699c
7 changed files with 406 additions and 402 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/data/object_events/movement_action_func_tables.h
+170 -170
View File
@@ -463,176 +463,176 @@ static u8 GetMoveDirectionFasterAnimNum(u8 direction);
static u8 GetMoveDirectionFastestAnimNum(u8 direction);
bool8 (*const *const gMovementActionFuncs[])(struct ObjectEvent *, struct Sprite *) = {
sMovementActionFuncs_x00,
sMovementActionFuncs_x01,
sMovementActionFuncs_x02,
sMovementActionFuncs_x03,
sMovementActionFuncs_x04,
sMovementActionFuncs_x05,
sMovementActionFuncs_x06,
sMovementActionFuncs_x07,
sMovementActionFuncs_x08,
sMovementActionFuncs_x09,
sMovementActionFuncs_x0A,
sMovementActionFuncs_x0B,
sMovementActionFuncs_x0C,
sMovementActionFuncs_x0D,
sMovementActionFuncs_x0E,
sMovementActionFuncs_x0F,
sMovementActionFuncs_x10,
sMovementActionFuncs_x11,
sMovementActionFuncs_x12,
sMovementActionFuncs_x13,
sMovementActionFuncs_x14,
sMovementActionFuncs_x15,
sMovementActionFuncs_x16,
sMovementActionFuncs_x17,
sMovementActionFuncs_x18,
sMovementActionFuncs_x19,
sMovementActionFuncs_x1A,
sMovementActionFuncs_x1B,
sMovementActionFuncs_x1C,
sMovementActionFuncs_x1D,
sMovementActionFuncs_x1E,
sMovementActionFuncs_x1F,
sMovementActionFuncs_x20,
sMovementActionFuncs_x21,
sMovementActionFuncs_x22,
sMovementActionFuncs_x23,
sMovementActionFuncs_x24,
sMovementActionFuncs_x25,
sMovementActionFuncs_x26,
sMovementActionFuncs_x27,
sMovementActionFuncs_x28,
sMovementActionFuncs_x29,
sMovementActionFuncs_x2A,
sMovementActionFuncs_x2B,
sMovementActionFuncs_x2C,
sMovementActionFuncs_x2D,
sMovementActionFuncs_x2E,
sMovementActionFuncs_x2F,
sMovementActionFuncs_x30,
sMovementActionFuncs_x31,
sMovementActionFuncs_x32,
sMovementActionFuncs_x33,
sMovementActionFuncs_x34,
sMovementActionFuncs_x35,
sMovementActionFuncs_x36,
sMovementActionFuncs_x37,
sMovementActionFuncs_x38,
sMovementActionFuncs_x39,
sMovementActionFuncs_x3A,
sMovementActionFuncs_x3B,
sMovementActionFuncs_x3C,
sMovementActionFuncs_x3D,
sMovementActionFuncs_x3E,
sMovementActionFuncs_x3F,
sMovementActionFuncs_x40,
sMovementActionFuncs_x41,
sMovementActionFuncs_x42,
sMovementActionFuncs_x43,
sMovementActionFuncs_x44,
sMovementActionFuncs_x45,
sMovementActionFuncs_x46,
sMovementActionFuncs_x47,
sMovementActionFuncs_x48,
sMovementActionFuncs_x49,
sMovementActionFuncs_x4A,
sMovementActionFuncs_x4B,
sMovementActionFuncs_x4C,
sMovementActionFuncs_x4D,
sMovementActionFuncs_x4E,
sMovementActionFuncs_x4F,
sMovementActionFuncs_x50,
sMovementActionFuncs_x51,
sMovementActionFuncs_x52,
sMovementActionFuncs_x53,
sMovementActionFuncs_x54,
sMovementActionFuncs_x55,
sMovementActionFuncs_x56,
sMovementActionFuncs_x57,
sMovementActionFuncs_x58,
sMovementActionFuncs_x59,
sMovementActionFuncs_x5A,
sMovementActionFuncs_x5B,
sMovementActionFuncs_x5C,
sMovementActionFuncs_x5D,
sMovementActionFuncs_x5E,
sMovementActionFuncs_x5F,
sMovementActionFuncs_x60,
sMovementActionFuncs_x61,
sMovementActionFuncs_x62,
sMovementActionFuncs_x63,
sMovementActionFuncs_x64,
sMovementActionFuncs_x65,
sMovementActionFuncs_x66,
sMovementActionFuncs_x67,
sMovementActionFuncs_x68,
sMovementActionFuncs_x69,
sMovementActionFuncs_x6A,
sMovementActionFuncs_x6B,
sMovementActionFuncs_x6C,
sMovementActionFuncs_x6D,
sMovementActionFuncs_x6E,
sMovementActionFuncs_x6F,
sMovementActionFuncs_x70,
sMovementActionFuncs_x71,
sMovementActionFuncs_x72,
sMovementActionFuncs_x73,
sMovementActionFuncs_x74,
sMovementActionFuncs_x75,
sMovementActionFuncs_x76,
sMovementActionFuncs_x77,
sMovementActionFuncs_x78,
sMovementActionFuncs_x79,
sMovementActionFuncs_x7A,
sMovementActionFuncs_x7B,
sMovementActionFuncs_x7C,
sMovementActionFuncs_x7D,
sMovementActionFuncs_x7E,
sMovementActionFuncs_x7F,
sMovementActionFuncs_x80,
sMovementActionFuncs_x81,
sMovementActionFuncs_x82,
sMovementActionFuncs_x83,
sMovementActionFuncs_x84,
sMovementActionFuncs_x85,
sMovementActionFuncs_x86,
sMovementActionFuncs_x87,
sMovementActionFuncs_x88,
sMovementActionFuncs_x89,
sMovementActionFuncs_x8A,
sMovementActionFuncs_x8B,
sMovementActionFuncs_x8C,
sMovementActionFuncs_x8D,
sMovementActionFuncs_x8E,
sMovementActionFuncs_x8F,
sMovementActionFuncs_x90,
sMovementActionFuncs_x91,
sMovementActionFuncs_x92,
sMovementActionFuncs_x93,
sMovementActionFuncs_x94,
sMovementActionFuncs_x95,
sMovementActionFuncs_x96,
sMovementActionFuncs_x97,
sMovementActionFuncs_x98,
sMovementActionFuncs_x99,
sMovementActionFuncs_x9A,
sMovementActionFuncs_x9B,
sMovementActionFuncs_x9C,
sMovementActionFuncs_x9D,
sMovementActionFuncs_x9E,
sMovementActionFuncs_x9F,
sMovementActionFuncs_xA0,
sMovementActionFuncs_xA1,
sMovementActionFuncs_xA2,
sMovementActionFuncs_xA3,
sMovementActionFuncs_xA4,
sMovementActionFuncs_xA5,
sMovementActionFuncs_xA6,
sMovementActionFuncs_xA7,
sMovementActionFuncs_xA8,
sMovementActionFuncs_xA9,
[MOVEMENT_ACTION_FACE_DOWN] = sMovementActionFuncs_x00,
[MOVEMENT_ACTION_FACE_UP] = sMovementActionFuncs_x01,
[MOVEMENT_ACTION_FACE_LEFT] = sMovementActionFuncs_x02,
[MOVEMENT_ACTION_FACE_RIGHT] = sMovementActionFuncs_x03,
[MOVEMENT_ACTION_FACE_DOWN_FAST] = sMovementActionFuncs_x04,
[MOVEMENT_ACTION_FACE_UP_FAST] = sMovementActionFuncs_x05,
[MOVEMENT_ACTION_FACE_LEFT_FAST] = sMovementActionFuncs_x06,
[MOVEMENT_ACTION_FACE_RIGHT_FAST] = sMovementActionFuncs_x07,
[MOVEMENT_ACTION_WALK_SLOWEST_DOWN] = sMovementActionFuncs_x08,
[MOVEMENT_ACTION_WALK_SLOWEST_UP] = sMovementActionFuncs_x09,
[MOVEMENT_ACTION_WALK_SLOWEST_LEFT] = sMovementActionFuncs_x0A,
[MOVEMENT_ACTION_WALK_SLOWEST_RIGHT] = sMovementActionFuncs_x0B,
[MOVEMENT_ACTION_WALK_SLOW_DOWN] = sMovementActionFuncs_x0C,
[MOVEMENT_ACTION_WALK_SLOW_UP] = sMovementActionFuncs_x0D,
[MOVEMENT_ACTION_WALK_SLOW_LEFT] = sMovementActionFuncs_x0E,
[MOVEMENT_ACTION_WALK_SLOW_RIGHT] = sMovementActionFuncs_x0F,
[MOVEMENT_ACTION_WALK_NORMAL_DOWN] = sMovementActionFuncs_x10,
[MOVEMENT_ACTION_WALK_NORMAL_UP] = sMovementActionFuncs_x11,
[MOVEMENT_ACTION_WALK_NORMAL_LEFT] = sMovementActionFuncs_x12,
[MOVEMENT_ACTION_WALK_NORMAL_RIGHT] = sMovementActionFuncs_x13,
[MOVEMENT_ACTION_JUMP_2_DOWN] = sMovementActionFuncs_x14,
[MOVEMENT_ACTION_JUMP_2_UP] = sMovementActionFuncs_x15,
[MOVEMENT_ACTION_JUMP_2_LEFT] = sMovementActionFuncs_x16,
[MOVEMENT_ACTION_JUMP_2_RIGHT] = sMovementActionFuncs_x17,
[MOVEMENT_ACTION_DELAY_1] = sMovementActionFuncs_x18,
[MOVEMENT_ACTION_DELAY_2] = sMovementActionFuncs_x19,
[MOVEMENT_ACTION_DELAY_4] = sMovementActionFuncs_x1A,
[MOVEMENT_ACTION_DELAY_8] = sMovementActionFuncs_x1B,
[MOVEMENT_ACTION_DELAY_16] = sMovementActionFuncs_x1C,
[MOVEMENT_ACTION_WALK_FAST_DOWN] = sMovementActionFuncs_x1D,
[MOVEMENT_ACTION_WALK_FAST_UP] = sMovementActionFuncs_x1E,
[MOVEMENT_ACTION_WALK_FAST_LEFT] = sMovementActionFuncs_x1F,
[MOVEMENT_ACTION_WALK_FAST_RIGHT] = sMovementActionFuncs_x20,
[MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_DOWN] = sMovementActionFuncs_x21,
[MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_UP] = sMovementActionFuncs_x22,
[MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_LEFT] = sMovementActionFuncs_x23,
[MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_RIGHT] = sMovementActionFuncs_x24,
[MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_DOWN] = sMovementActionFuncs_x25,
[MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_UP] = sMovementActionFuncs_x26,
[MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_LEFT] = sMovementActionFuncs_x27,
[MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_RIGHT] = sMovementActionFuncs_x28,
[MOVEMENT_ACTION_WALK_IN_PLACE_FAST_DOWN] = sMovementActionFuncs_x29,
[MOVEMENT_ACTION_WALK_IN_PLACE_FAST_UP] = sMovementActionFuncs_x2A,
[MOVEMENT_ACTION_WALK_IN_PLACE_FAST_LEFT] = sMovementActionFuncs_x2B,
[MOVEMENT_ACTION_WALK_IN_PLACE_FAST_RIGHT] = sMovementActionFuncs_x2C,
[MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_DOWN] = sMovementActionFuncs_x2D,
[MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_UP] = sMovementActionFuncs_x2E,
[MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_LEFT] = sMovementActionFuncs_x2F,
[MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_RIGHT] = sMovementActionFuncs_x30,
[MOVEMENT_ACTION_FACE_DOWN_SLOW] = sMovementActionFuncs_x31,
[MOVEMENT_ACTION_FACE_UP_SLOW] = sMovementActionFuncs_x32,
[MOVEMENT_ACTION_FACE_LEFT_SLOW] = sMovementActionFuncs_x33,
[MOVEMENT_ACTION_FACE_RIGHT_SLOW] = sMovementActionFuncs_x34,
[MOVEMENT_ACTION_WALK_FASTEST_DOWN] = sMovementActionFuncs_x35,
[MOVEMENT_ACTION_WALK_FASTEST_UP] = sMovementActionFuncs_x36,
[MOVEMENT_ACTION_WALK_FASTEST_LEFT] = sMovementActionFuncs_x37,
[MOVEMENT_ACTION_WALK_FASTEST_RIGHT] = sMovementActionFuncs_x38,
[MOVEMENT_ACTION_SLIDE_DOWN] = sMovementActionFuncs_x39,
[MOVEMENT_ACTION_SLIDE_UP] = sMovementActionFuncs_x3A,
[MOVEMENT_ACTION_SLIDE_LEFT] = sMovementActionFuncs_x3B,
[MOVEMENT_ACTION_SLIDE_RIGHT] = sMovementActionFuncs_x3C,
[MOVEMENT_ACTION_PLAYER_RUN_DOWN] = sMovementActionFuncs_x3D,
[MOVEMENT_ACTION_PLAYER_RUN_UP] = sMovementActionFuncs_x3E,
[MOVEMENT_ACTION_PLAYER_RUN_LEFT] = sMovementActionFuncs_x3F,
[MOVEMENT_ACTION_PLAYER_RUN_RIGHT] = sMovementActionFuncs_x40,
[MOVEMENT_ACTION_PLAYER_RUN_DOWN_SLOW] = sMovementActionFuncs_x41,
[MOVEMENT_ACTION_PLAYER_RUN_UP_SLOW] = sMovementActionFuncs_x42,
[MOVEMENT_ACTION_PLAYER_RUN_LEFT_SLOW] = sMovementActionFuncs_x43,
[MOVEMENT_ACTION_PLAYER_RUN_RIGHT_SLOW] = sMovementActionFuncs_x44,
[MOVEMENT_ACTION_START_ANIM_IN_DIRECTION] = sMovementActionFuncs_x45,
[MOVEMENT_ACTION_JUMP_SPECIAL_DOWN] = sMovementActionFuncs_x46,
[MOVEMENT_ACTION_JUMP_SPECIAL_UP] = sMovementActionFuncs_x47,
[MOVEMENT_ACTION_JUMP_SPECIAL_LEFT] = sMovementActionFuncs_x48,
[MOVEMENT_ACTION_JUMP_SPECIAL_RIGHT] = sMovementActionFuncs_x49,
[MOVEMENT_ACTION_FACE_PLAYER] = sMovementActionFuncs_x4A,
[MOVEMENT_ACTION_FACE_AWAY_PLAYER] = sMovementActionFuncs_x4B,
[MOVEMENT_ACTION_LOCK_FACING_DIRECTION] = sMovementActionFuncs_x4C,
[MOVEMENT_ACTION_UNLOCK_FACING_DIRECTION] = sMovementActionFuncs_x4D,
[MOVEMENT_ACTION_JUMP_DOWN] = sMovementActionFuncs_x4E,
[MOVEMENT_ACTION_JUMP_UP] = sMovementActionFuncs_x4F,
[MOVEMENT_ACTION_JUMP_LEFT] = sMovementActionFuncs_x50,
[MOVEMENT_ACTION_JUMP_RIGHT] = sMovementActionFuncs_x51,
[MOVEMENT_ACTION_JUMP_IN_PLACE_DOWN] = sMovementActionFuncs_x52,
[MOVEMENT_ACTION_JUMP_IN_PLACE_UP] = sMovementActionFuncs_x53,
[MOVEMENT_ACTION_JUMP_IN_PLACE_LEFT] = sMovementActionFuncs_x54,
[MOVEMENT_ACTION_JUMP_IN_PLACE_RIGHT] = sMovementActionFuncs_x55,
[MOVEMENT_ACTION_JUMP_IN_PLACE_DOWN_UP] = sMovementActionFuncs_x56,
[MOVEMENT_ACTION_JUMP_IN_PLACE_UP_DOWN] = sMovementActionFuncs_x57,
[MOVEMENT_ACTION_JUMP_IN_PLACE_LEFT_RIGHT] = sMovementActionFuncs_x58,
[MOVEMENT_ACTION_JUMP_IN_PLACE_RIGHT_LEFT] = sMovementActionFuncs_x59,
[MOVEMENT_ACTION_FACE_ORIGINAL_DIRECTION] = sMovementActionFuncs_x5A,
[MOVEMENT_ACTION_NURSE_JOY_BOW_DOWN] = sMovementActionFuncs_x5B,
[MOVEMENT_ACTION_ENABLE_JUMP_LANDING_GROUND_EFFECT] = sMovementActionFuncs_x5C,
[MOVEMENT_ACTION_DISABLE_JUMP_LANDING_GROUND_EFFECT] = sMovementActionFuncs_x5D,
[MOVEMENT_ACTION_DISABLE_ANIMATION] = sMovementActionFuncs_x5E,
[MOVEMENT_ACTION_RESTORE_ANIMATION] = sMovementActionFuncs_x5F,
[MOVEMENT_ACTION_SET_INVISIBLE] = sMovementActionFuncs_x60,
[MOVEMENT_ACTION_SET_VISIBLE] = sMovementActionFuncs_x61,
[MOVEMENT_ACTION_EMOTE_EXCLAMATION_MARK] = sMovementActionFuncs_x62,
[MOVEMENT_ACTION_EMOTE_QUESTION_MARK] = sMovementActionFuncs_x63,
[MOVEMENT_ACTION_EMOTE_X] = sMovementActionFuncs_x64,
[MOVEMENT_ACTION_EMOTE_DOUBLE_EXCL_MARK] = sMovementActionFuncs_x65,
[MOVEMENT_ACTION_EMOTE_SMILE] = sMovementActionFuncs_x66,
[MOVEMENT_ACTION_REVEAL_TRAINER] = sMovementActionFuncs_x67,
[MOVEMENT_ACTION_ROCK_SMASH_BREAK] = sMovementActionFuncs_x68,
[MOVEMENT_ACTION_CUT_TREE] = sMovementActionFuncs_x69,
[MOVEMENT_ACTION_SET_FIXED_PRIORITY] = sMovementActionFuncs_x6A,
[MOVEMENT_ACTION_CLEAR_FIXED_PRIORITY] = sMovementActionFuncs_x6B,
[MOVEMENT_ACTION_INIT_AFFINE_ANIM] = sMovementActionFuncs_x6C,
[MOVEMENT_ACTION_CLEAR_AFFINE_ANIM] = sMovementActionFuncs_x6D,
[MOVEMENT_ACTION_WALK_DOWN_START_AFFINE] = sMovementActionFuncs_x6E,
[MOVEMENT_ACTION_WALK_DOWN_AFFINE] = sMovementActionFuncs_x6F,
[MOVEMENT_ACTION_ACRO_WHEELIE_FACE_DOWN] = sMovementActionFuncs_x70,
[MOVEMENT_ACTION_ACRO_WHEELIE_FACE_UP] = sMovementActionFuncs_x71,
[MOVEMENT_ACTION_ACRO_WHEELIE_FACE_LEFT] = sMovementActionFuncs_x72,
[MOVEMENT_ACTION_ACRO_WHEELIE_FACE_RIGHT] = sMovementActionFuncs_x73,
[MOVEMENT_ACTION_ACRO_POP_WHEELIE_DOWN] = sMovementActionFuncs_x74,
[MOVEMENT_ACTION_ACRO_POP_WHEELIE_UP] = sMovementActionFuncs_x75,
[MOVEMENT_ACTION_ACRO_POP_WHEELIE_LEFT] = sMovementActionFuncs_x76,
[MOVEMENT_ACTION_ACRO_POP_WHEELIE_RIGHT] = sMovementActionFuncs_x77,
[MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_DOWN] = sMovementActionFuncs_x78,
[MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_UP] = sMovementActionFuncs_x79,
[MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_LEFT] = sMovementActionFuncs_x7A,
[MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_RIGHT] = sMovementActionFuncs_x7B,
[MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_DOWN] = sMovementActionFuncs_x7C,
[MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_UP] = sMovementActionFuncs_x7D,
[MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_LEFT] = sMovementActionFuncs_x7E,
[MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_RIGHT] = sMovementActionFuncs_x7F,
[MOVEMENT_ACTION_ACRO_WHEELIE_HOP_DOWN] = sMovementActionFuncs_x80,
[MOVEMENT_ACTION_ACRO_WHEELIE_HOP_UP] = sMovementActionFuncs_x81,
[MOVEMENT_ACTION_ACRO_WHEELIE_HOP_LEFT] = sMovementActionFuncs_x82,
[MOVEMENT_ACTION_ACRO_WHEELIE_HOP_RIGHT] = sMovementActionFuncs_x83,
[MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_DOWN] = sMovementActionFuncs_x84,
[MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_UP] = sMovementActionFuncs_x85,
[MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_LEFT] = sMovementActionFuncs_x86,
[MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_RIGHT] = sMovementActionFuncs_x87,
[MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_DOWN] = sMovementActionFuncs_x88,
[MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_UP] = sMovementActionFuncs_x89,
[MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_LEFT] = sMovementActionFuncs_x8A,
[MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_RIGHT] = sMovementActionFuncs_x8B,
[MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_DOWN] = sMovementActionFuncs_x8C,
[MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_UP] = sMovementActionFuncs_x8D,
[MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_LEFT] = sMovementActionFuncs_x8E,
[MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_RIGHT] = sMovementActionFuncs_x8F,
[MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_DOWN] = sMovementActionFuncs_x90,
[MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_UP] = sMovementActionFuncs_x91,
[MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_LEFT] = sMovementActionFuncs_x92,
[MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_RIGHT] = sMovementActionFuncs_x93,
[MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_DOWN] = sMovementActionFuncs_x94,
[MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_UP] = sMovementActionFuncs_x95,
[MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_LEFT] = sMovementActionFuncs_x96,
[MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_RIGHT] = sMovementActionFuncs_x97,
[MOVEMENT_ACTION_0x98] = sMovementActionFuncs_x98,
[MOVEMENT_ACTION_0x99] = sMovementActionFuncs_x99,
[MOVEMENT_ACTION_0x9A] = sMovementActionFuncs_x9A,
[MOVEMENT_ACTION_0x9B] = sMovementActionFuncs_x9B,
[MOVEMENT_ACTION_0x9C] = sMovementActionFuncs_x9C,
[MOVEMENT_ACTION_0x9D] = sMovementActionFuncs_x9D,
[MOVEMENT_ACTION_0x9E] = sMovementActionFuncs_x9E,
[MOVEMENT_ACTION_0x9F] = sMovementActionFuncs_x9F,
[MOVEMENT_ACTION_0xA0] = sMovementActionFuncs_xA0,
[MOVEMENT_ACTION_0xA1] = sMovementActionFuncs_xA1,
[MOVEMENT_ACTION_0xA2] = sMovementActionFuncs_xA2,
[MOVEMENT_ACTION_0xA3] = sMovementActionFuncs_xA3,
[MOVEMENT_ACTION_FLY_UP] = sMovementActionFuncs_xA4,
[MOVEMENT_ACTION_FLY_DOWN] = sMovementActionFuncs_xA5,
[MOVEMENT_ACTION_0xA6] = sMovementActionFuncs_xA6,
[MOVEMENT_ACTION_0xA7] = sMovementActionFuncs_xA7,
[MOVEMENT_ACTION_0xA8] = sMovementActionFuncs_xA8,
[MOVEMENT_ACTION_0xA9] = sMovementActionFuncs_xA9,
};
static bool8 (*const sMovementActionFuncs_x00[])(struct ObjectEvent *, struct Sprite *) = {
src/data/object_events/movement_type_func_tables.h
+19 -19
View File
@@ -4,7 +4,7 @@ static bool8 MovementType_WanderAround_Step2(struct ObjectEvent *objectEvent, st
static bool8 MovementType_WanderAround_Step3(struct ObjectEvent *objectEvent, struct Sprite *sprite);
static bool8 MovementType_WanderAround_Step4(struct ObjectEvent *objectEvent, struct Sprite *sprite);
static bool8 MovementType_WanderAround_Step5(struct ObjectEvent *objectEvent, struct Sprite *sprite);
static bool8 MovementType_WanderAround_Step5Duplicate(struct ObjectEvent *objectEvent, struct Sprite *sprite);
static bool8 MovementType_WanderAround_Step5Slowest(struct ObjectEvent *objectEvent, struct Sprite *sprite);
static bool8 MovementType_WanderAround_Step6(struct ObjectEvent *objectEvent, struct Sprite *sprite);
static bool8 MovementType_LookAround_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite);
static bool8 MovementType_LookAround_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite);
@@ -141,12 +141,12 @@ static bool8 MovementType_MoveInPlace_Step1(struct ObjectEvent *objectEvent, str
static bool8 MovementType_Invisible_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite);
static bool8 MovementType_Invisible_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite);
static bool8 MovementType_Invisible_Step2(struct ObjectEvent *objectEvent, struct Sprite *sprite);
static bool8 sub_8063364(struct ObjectEvent *objectEvent, struct Sprite *sprite);
static bool8 sub_8063384(struct ObjectEvent *objectEvent, struct Sprite *sprite);
static bool8 sub_80633A4(struct ObjectEvent *objectEvent, struct Sprite *sprite);
static bool8 sub_80633B4(struct ObjectEvent *objectEvent, struct Sprite *sprite);
static bool8 sub_80633D4(struct ObjectEvent *objectEvent, struct Sprite *sprite);
static bool8 sub_80633F4(struct ObjectEvent *objectEvent, struct Sprite *sprite);
static bool8 MovementType_VsSeeker4D_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite);
static bool8 MovementType_VsSeeker4D_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite);
static bool8 MovementType_VsSeeker4D_Step2(struct ObjectEvent *objectEvent, struct Sprite *sprite);
static bool8 MovementType_VsSeeker4E_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite);
static bool8 MovementType_VsSeeker4F_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite);
static bool8 MovementType_VsSeeker4E_VsSeeker4F_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite);
static u8 GetVectorDirection(s16 dx, s16 dy, s16 absdx, s16 absdy);
static u8 GetLimitedVectorDirection_SouthNorth(s16 dx, s16 dy, s16 absdx, s16 absdy);
@@ -170,13 +170,13 @@ u8 (*const gMovementTypeFuncs_WanderAround[])(struct ObjectEvent *, struct Sprit
MovementType_WanderAround_Step6,
};
u8 (*const gMovementTypeFuncs_WanderAroundDuplicate[])(struct ObjectEvent *, struct Sprite *) = {
u8 (*const gMovementTypeFuncs_WanderAroundSlowest[])(struct ObjectEvent *, struct Sprite *) = {
MovementType_WanderAround_Step0,
MovementType_WanderAround_Step1,
MovementType_WanderAround_Step2,
MovementType_WanderAround_Step3,
MovementType_WanderAround_Step4,
MovementType_WanderAround_Step5Duplicate,
MovementType_WanderAround_Step5Slowest,
MovementType_WanderAround_Step6,
};
@@ -596,18 +596,18 @@ u8 (*const gMovementTypeFuncs_Invisible[])(struct ObjectEvent *, struct Sprite *
MovementType_Invisible_Step2,
};
u8 (*const gUnknown_83A63F0[])(struct ObjectEvent *, struct Sprite *) = {
sub_8063364,
sub_8063384,
sub_80633A4,
u8 (*const gMovementTypeFuncs_VsSeeker4D[])(struct ObjectEvent *, struct Sprite *) = {
MovementType_VsSeeker4D_Step0,
MovementType_VsSeeker4D_Step1,
MovementType_VsSeeker4D_Step2,
};
u8 (*const gUnknown_83A63FC[])(struct ObjectEvent *, struct Sprite *) = {
sub_80633B4,
sub_80633F4,
u8 (*const gMovementTypeFuncs_VsSeeker4E[])(struct ObjectEvent *, struct Sprite *) = {
MovementType_VsSeeker4E_Step0,
MovementType_VsSeeker4E_VsSeeker4F_Step1,
};
u8 (*const gUnknown_83A6404[])(struct ObjectEvent *, struct Sprite *) = {
sub_80633D4,
sub_80633F4,
u8 (*const gMovementTypeFuncs_VsSeeker4F[])(struct ObjectEvent *, struct Sprite *) = {
MovementType_VsSeeker4F_Step0,
MovementType_VsSeeker4E_VsSeeker4F_Step1,
};