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

Use directional movement action constants

Browse Source
This commit is contained in:
GriffinR
2020-03-26 13:54:42 -04:00
parent 6cf4bc4101
commit 73503e3e4d
4 changed files with 170 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/field_player_avatar.s
+1 -1
View File
@@ -1990,7 +1990,7 @@ sub_805C20C: @ 805C20C
push {lr} push {lr}
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
bl GetWalkSlowMovementAction bl GetFaceDirectionFastMovementAction
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
movs r1, 0x1 movs r1, 0x1
src/data/object_events/object_event_graphics_info.h
+1 -1
View File
@@ -151,4 +151,4 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Pidgey = {SPRITE_I
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Clefairy = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_1, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Clefairy, gDummySpriteAffineAnimTable}; const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Clefairy = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_1, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Clefairy, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Mom = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Mom, gDummySpriteAffineAnimTable}; const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Mom = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Mom, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Seagallop = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_21, OBJ_EVENT_PAL_TAG_NONE, 2048, 64, 64, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_64x64, gObjectEventSpriteOamTables_64x64, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Seagallop, gDummySpriteAffineAnimTable}; const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Seagallop = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_21, OBJ_EVENT_PAL_TAG_NONE, 2048, 64, 64, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_64x64, gObjectEventSpriteOamTables_64x64, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Seagallop, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SSAnne = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_11, OBJ_EVENT_PAL_TAG_NONE, 4096, 128, 64, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_8x8, gObjectEventSpriteOamTables_8x8, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_SSAnne, gDummySpriteAffineAnimTable}; const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SSAnne = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_11, OBJ_EVENT_PAL_TAG_NONE, 4096, 128, 64, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_8x8, gObjectEventSpriteOamTables_128x64, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_SSAnne, gDummySpriteAffineAnimTable};
src/data/object_events/object_event_subsprites.h
+1 -1
View File
@@ -1098,7 +1098,7 @@ const struct Subsprite gSubsprites_83A3A40[] = {
} }
}; };
const struct SubspriteTable gObjectEventSpriteOamTables_8x8[] = { const struct SubspriteTable gObjectEventSpriteOamTables_128x64[] = {
{4, gSubsprites_83A3A20}, {4, gSubsprites_83A3A20},
{4, gSubsprites_83A3A20}, {4, gSubsprites_83A3A20},
{4, gSubsprites_83A3A30}, {4, gSubsprites_83A3A30},
src/event_object_movement.c
+167 -167
View File
@@ -929,267 +929,267 @@ static const struct Coords16 sDirectionToVectors[] = {
}; };
const u8 gFaceDirectionMovementActions[] = { const u8 gFaceDirectionMovementActions[] = {
[DIR_NONE] = 0x0, [DIR_NONE] = MOVEMENT_ACTION_FACE_DOWN,
[DIR_SOUTH] = 0x0, [DIR_SOUTH] = MOVEMENT_ACTION_FACE_DOWN,
[DIR_NORTH] = 0x1, [DIR_NORTH] = MOVEMENT_ACTION_FACE_UP,
[DIR_WEST] = 0x2, [DIR_WEST] = MOVEMENT_ACTION_FACE_LEFT,
[DIR_EAST] = 0x3, [DIR_EAST] = MOVEMENT_ACTION_FACE_RIGHT,
}; };
const u8 gWalkSlowMovementActions[] = { const u8 gFaceDirectionFastMovementActions[] = {
[DIR_NONE] = 0x4, [DIR_NONE] = MOVEMENT_ACTION_FACE_DOWN_FAST,
[DIR_SOUTH] = 0x4, [DIR_SOUTH] = MOVEMENT_ACTION_FACE_DOWN_FAST,
[DIR_NORTH] = 0x5, [DIR_NORTH] = MOVEMENT_ACTION_FACE_UP_FAST,
[DIR_WEST] = 0x6, [DIR_WEST] = MOVEMENT_ACTION_FACE_LEFT_FAST,
[DIR_EAST] = 0x7, [DIR_EAST] = MOVEMENT_ACTION_FACE_RIGHT_FAST,
}; };
const u8 gUnknown_83A64F6[] = { const u8 gUnknown_83A64F6[] = {
[DIR_NONE] = 0x9B, [DIR_NONE] = MOVEMENT_ACTION_0x9B,
[DIR_SOUTH] = 0x9B, [DIR_SOUTH] = MOVEMENT_ACTION_0x9B,
[DIR_NORTH] = 0x9C, [DIR_NORTH] = MOVEMENT_ACTION_0x9C,
[DIR_WEST] = 0x9D, [DIR_WEST] = MOVEMENT_ACTION_0x9D,
[DIR_EAST] = 0x9E, [DIR_EAST] = MOVEMENT_ACTION_0x9E,
}; };
const u8 gUnknown_83A64FB[] = { const u8 gUnknown_83A64FB[] = {
[DIR_NONE] = 0x8, [DIR_NONE] = MOVEMENT_ACTION_WALK_SLOWEST_DOWN,
[DIR_SOUTH] = 0x8, [DIR_SOUTH] = MOVEMENT_ACTION_WALK_SLOWEST_DOWN,
[DIR_NORTH] = 0x9, [DIR_NORTH] = MOVEMENT_ACTION_WALK_SLOWEST_UP,
[DIR_WEST] = 0xA, [DIR_WEST] = MOVEMENT_ACTION_WALK_SLOWEST_LEFT,
[DIR_EAST] = 0xB, [DIR_EAST] = MOVEMENT_ACTION_WALK_SLOWEST_RIGHT,
}; };
const u8 gUnknown_83A6500[] = { const u8 gUnknown_83A6500[] = {
[DIR_NONE] = 0xC, [DIR_NONE] = MOVEMENT_ACTION_WALK_SLOW_DOWN,
[DIR_SOUTH] = 0xC, [DIR_SOUTH] = MOVEMENT_ACTION_WALK_SLOW_DOWN,
[DIR_NORTH] = 0xD, [DIR_NORTH] = MOVEMENT_ACTION_WALK_SLOW_UP,
[DIR_WEST] = 0xE, [DIR_WEST] = MOVEMENT_ACTION_WALK_SLOW_LEFT,
[DIR_EAST] = 0xF, [DIR_EAST] = MOVEMENT_ACTION_WALK_SLOW_RIGHT,
}; };
const u8 gUnknown_83A6505[] = { const u8 gUnknown_83A6505[] = {
[DIR_NONE] = 0x10, [DIR_NONE] = MOVEMENT_ACTION_WALK_NORMAL_DOWN,
[DIR_SOUTH] = 0x10, [DIR_SOUTH] = MOVEMENT_ACTION_WALK_NORMAL_DOWN,
[DIR_NORTH] = 0x11, [DIR_NORTH] = MOVEMENT_ACTION_WALK_NORMAL_UP,
[DIR_WEST] = 0x12, [DIR_WEST] = MOVEMENT_ACTION_WALK_NORMAL_LEFT,
[DIR_EAST] = 0x13, [DIR_EAST] = MOVEMENT_ACTION_WALK_NORMAL_RIGHT,
}; };
const u8 gUnknown_83A650A[] = { const u8 gUnknown_83A650A[] = {
[DIR_NONE] = 0x1D, [DIR_NONE] = MOVEMENT_ACTION_WALK_FAST_DOWN,
[DIR_SOUTH] = 0x1D, [DIR_SOUTH] = MOVEMENT_ACTION_WALK_FAST_DOWN,
[DIR_NORTH] = 0x1E, [DIR_NORTH] = MOVEMENT_ACTION_WALK_FAST_UP,
[DIR_WEST] = 0x1F, [DIR_WEST] = MOVEMENT_ACTION_WALK_FAST_LEFT,
[DIR_EAST] = 0x20, [DIR_EAST] = MOVEMENT_ACTION_WALK_FAST_RIGHT,
}; };
const u8 gUnknown_83A650F[] = { const u8 gUnknown_83A650F[] = {
[DIR_NONE] = 0xA0, [DIR_NONE] = MOVEMENT_ACTION_0xA0,
[DIR_SOUTH] = 0xA0, [DIR_SOUTH] = MOVEMENT_ACTION_0xA0,
[DIR_NORTH] = 0xA1, [DIR_NORTH] = MOVEMENT_ACTION_0xA1,
[DIR_WEST] = 0xA2, [DIR_WEST] = MOVEMENT_ACTION_0xA2,
[DIR_EAST] = 0xA3, [DIR_EAST] = MOVEMENT_ACTION_0xA3,
}; };
const u8 gUnknown_83A6514[] = { const u8 gUnknown_83A6514[] = {
[DIR_NONE] = 0x31, [DIR_NONE] = MOVEMENT_ACTION_FACE_DOWN_SLOW,
[DIR_SOUTH] = 0x31, [DIR_SOUTH] = MOVEMENT_ACTION_FACE_DOWN_SLOW,
[DIR_NORTH] = 0x32, [DIR_NORTH] = MOVEMENT_ACTION_FACE_UP_SLOW,
[DIR_WEST] = 0x33, [DIR_WEST] = MOVEMENT_ACTION_FACE_LEFT_SLOW,
[DIR_EAST] = 0x34, [DIR_EAST] = MOVEMENT_ACTION_FACE_RIGHT_SLOW,
}; };
const u8 gUnknown_83A6519[] = { const u8 gUnknown_83A6519[] = {
[DIR_NONE] = 0x35, [DIR_NONE] = MOVEMENT_ACTION_WALK_FASTEST_DOWN,
[DIR_SOUTH] = 0x35, [DIR_SOUTH] = MOVEMENT_ACTION_WALK_FASTEST_DOWN,
[DIR_NORTH] = 0x36, [DIR_NORTH] = MOVEMENT_ACTION_WALK_FASTEST_UP,
[DIR_WEST] = 0x37, [DIR_WEST] = MOVEMENT_ACTION_WALK_FASTEST_LEFT,
[DIR_EAST] = 0x38, [DIR_EAST] = MOVEMENT_ACTION_WALK_FASTEST_RIGHT,
}; };
const u8 gUnknown_83A651E[] = { const u8 gUnknown_83A651E[] = {
[DIR_NONE] = 0x39, [DIR_NONE] = MOVEMENT_ACTION_SLIDE_DOWN,
[DIR_SOUTH] = 0x39, [DIR_SOUTH] = MOVEMENT_ACTION_SLIDE_DOWN,
[DIR_NORTH] = 0x3A, [DIR_NORTH] = MOVEMENT_ACTION_SLIDE_UP,
[DIR_WEST] = 0x3B, [DIR_WEST] = MOVEMENT_ACTION_SLIDE_LEFT,
[DIR_EAST] = 0x3C, [DIR_EAST] = MOVEMENT_ACTION_SLIDE_RIGHT,
}; };
const u8 gUnknown_83A6523[] = { const u8 gUnknown_83A6523[] = {
[DIR_NONE] = 0x3D, [DIR_NONE] = MOVEMENT_ACTION_PLAYER_RUN_DOWN,
[DIR_SOUTH] = 0x3D, [DIR_SOUTH] = MOVEMENT_ACTION_PLAYER_RUN_DOWN,
[DIR_NORTH] = 0x3E, [DIR_NORTH] = MOVEMENT_ACTION_PLAYER_RUN_UP,
[DIR_WEST] = 0x3F, [DIR_WEST] = MOVEMENT_ACTION_PLAYER_RUN_LEFT,
[DIR_EAST] = 0x40, [DIR_EAST] = MOVEMENT_ACTION_PLAYER_RUN_RIGHT,
}; };
const u8 gUnknown_83A6528[] = { const u8 gUnknown_83A6528[] = {
[DIR_NONE] = 0x41, [DIR_NONE] = MOVEMENT_ACTION_PLAYER_RUN_DOWN_SLOW,
[DIR_SOUTH] = 0x41, [DIR_SOUTH] = MOVEMENT_ACTION_PLAYER_RUN_DOWN_SLOW,
[DIR_NORTH] = 0x42, [DIR_NORTH] = MOVEMENT_ACTION_PLAYER_RUN_UP_SLOW,
[DIR_WEST] = 0x43, [DIR_WEST] = MOVEMENT_ACTION_PLAYER_RUN_LEFT_SLOW,
[DIR_EAST] = 0x44, [DIR_EAST] = MOVEMENT_ACTION_PLAYER_RUN_RIGHT_SLOW,
}; };
const u8 gUnknown_83A652D[] = { const u8 gUnknown_83A652D[] = {
[DIR_NONE] = 0x94, [DIR_NONE] = MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_DOWN,
[DIR_SOUTH] = 0x94, [DIR_SOUTH] = MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_DOWN,
[DIR_NORTH] = 0x95, [DIR_NORTH] = MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_UP,
[DIR_WEST] = 0x96, [DIR_WEST] = MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_LEFT,
[DIR_EAST] = 0x97, [DIR_EAST] = MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_RIGHT,
}; };
const u8 gUnknown_83A6532[] = { const u8 gUnknown_83A6532[] = {
[DIR_NONE] = 0x14, [DIR_NONE] = MOVEMENT_ACTION_JUMP_2_DOWN,
[DIR_SOUTH] = 0x14, [DIR_SOUTH] = MOVEMENT_ACTION_JUMP_2_DOWN,
[DIR_NORTH] = 0x15, [DIR_NORTH] = MOVEMENT_ACTION_JUMP_2_UP,
[DIR_WEST] = 0x16, [DIR_WEST] = MOVEMENT_ACTION_JUMP_2_LEFT,
[DIR_EAST] = 0x17, [DIR_EAST] = MOVEMENT_ACTION_JUMP_2_RIGHT,
}; };
const u8 gUnknown_83A6537[] = { const u8 gUnknown_83A6537[] = {
[DIR_NONE] = 0x52, [DIR_NONE] = MOVEMENT_ACTION_JUMP_IN_PLACE_DOWN,
[DIR_SOUTH] = 0x52, [DIR_SOUTH] = MOVEMENT_ACTION_JUMP_IN_PLACE_DOWN,
[DIR_NORTH] = 0x53, [DIR_NORTH] = MOVEMENT_ACTION_JUMP_IN_PLACE_UP,
[DIR_WEST] = 0x54, [DIR_WEST] = MOVEMENT_ACTION_JUMP_IN_PLACE_LEFT,
[DIR_EAST] = 0x55, [DIR_EAST] = MOVEMENT_ACTION_JUMP_IN_PLACE_RIGHT,
}; };
const u8 gUnknown_83A653C[] = { const u8 gUnknown_83A653C[] = {
[DIR_NONE] = 0x57, [DIR_NONE] = MOVEMENT_ACTION_JUMP_IN_PLACE_UP_DOWN,
[DIR_SOUTH] = 0x57, [DIR_SOUTH] = MOVEMENT_ACTION_JUMP_IN_PLACE_UP_DOWN,
[DIR_NORTH] = 0x56, [DIR_NORTH] = MOVEMENT_ACTION_JUMP_IN_PLACE_DOWN_UP,
[DIR_WEST] = 0x59, [DIR_WEST] = MOVEMENT_ACTION_JUMP_IN_PLACE_RIGHT_LEFT,
[DIR_EAST] = 0x58, [DIR_EAST] = MOVEMENT_ACTION_JUMP_IN_PLACE_LEFT_RIGHT,
}; };
const u8 gUnknown_83A6541[] = { const u8 gUnknown_83A6541[] = {
[DIR_NONE] = 0x4E, [DIR_NONE] = MOVEMENT_ACTION_JUMP_DOWN,
[DIR_SOUTH] = 0x4E, [DIR_SOUTH] = MOVEMENT_ACTION_JUMP_DOWN,
[DIR_NORTH] = 0x4F, [DIR_NORTH] = MOVEMENT_ACTION_JUMP_UP,
[DIR_WEST] = 0x50, [DIR_WEST] = MOVEMENT_ACTION_JUMP_LEFT,
[DIR_EAST] = 0x51, [DIR_EAST] = MOVEMENT_ACTION_JUMP_RIGHT,
}; };
const u8 gUnknown_83A6546[] = { const u8 gUnknown_83A6546[] = {
[DIR_NONE] = 0x46, [DIR_NONE] = MOVEMENT_ACTION_JUMP_SPECIAL_DOWN,
[DIR_SOUTH] = 0x46, [DIR_SOUTH] = MOVEMENT_ACTION_JUMP_SPECIAL_DOWN,
[DIR_NORTH] = 0x47, [DIR_NORTH] = MOVEMENT_ACTION_JUMP_SPECIAL_UP,
[DIR_WEST] = 0x48, [DIR_WEST] = MOVEMENT_ACTION_JUMP_SPECIAL_LEFT,
[DIR_EAST] = 0x49, [DIR_EAST] = MOVEMENT_ACTION_JUMP_SPECIAL_RIGHT,
}; };
const u8 gUnknown_83A654B[] = { const u8 gUnknown_83A654B[] = {
[DIR_NONE] = 0xA6, [DIR_NONE] = MOVEMENT_ACTION_0xA6,
[DIR_SOUTH] = 0xA6, [DIR_SOUTH] = MOVEMENT_ACTION_0xA6,
[DIR_NORTH] = 0xA7, [DIR_NORTH] = MOVEMENT_ACTION_0xA7,
[DIR_WEST] = 0xA8, [DIR_WEST] = MOVEMENT_ACTION_0xA8,
[DIR_EAST] = 0xA9, [DIR_EAST] = MOVEMENT_ACTION_0xA9,
}; };
const u8 gUnknown_83A6550[] = { const u8 gUnknown_83A6550[] = {
[DIR_NONE] = 0x21, [DIR_NONE] = MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_DOWN,
[DIR_SOUTH] = 0x21, [DIR_SOUTH] = MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_DOWN,
[DIR_NORTH] = 0x22, [DIR_NORTH] = MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_UP,
[DIR_WEST] = 0x23, [DIR_WEST] = MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_LEFT,
[DIR_EAST] = 0x24, [DIR_EAST] = MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_RIGHT,
}; };
const u8 gUnknown_83A6555[] = { const u8 gUnknown_83A6555[] = {
[DIR_NONE] = 0x25, [DIR_NONE] = MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_DOWN,
[DIR_SOUTH] = 0x25, [DIR_SOUTH] = MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_DOWN,
[DIR_NORTH] = 0x26, [DIR_NORTH] = MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_UP,
[DIR_WEST] = 0x27, [DIR_WEST] = MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_LEFT,
[DIR_EAST] = 0x28, [DIR_EAST] = MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_RIGHT,
}; };
const u8 gUnknown_83A655A[] = { const u8 gUnknown_83A655A[] = {
[DIR_NONE] = 0x29, [DIR_NONE] = MOVEMENT_ACTION_WALK_IN_PLACE_FAST_DOWN,
[DIR_SOUTH] = 0x29, [DIR_SOUTH] = MOVEMENT_ACTION_WALK_IN_PLACE_FAST_DOWN,
[DIR_NORTH] = 0x2A, [DIR_NORTH] = MOVEMENT_ACTION_WALK_IN_PLACE_FAST_UP,
[DIR_WEST] = 0x2B, [DIR_WEST] = MOVEMENT_ACTION_WALK_IN_PLACE_FAST_LEFT,
[DIR_EAST] = 0x2C, [DIR_EAST] = MOVEMENT_ACTION_WALK_IN_PLACE_FAST_RIGHT,
}; };
const u8 gUnknown_83A655F[] = { const u8 gUnknown_83A655F[] = {
[DIR_NONE] = 0x2D, [DIR_NONE] = MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_DOWN,
[DIR_SOUTH] = 0x2D, [DIR_SOUTH] = MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_DOWN,
[DIR_NORTH] = 0x2E, [DIR_NORTH] = MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_UP,
[DIR_WEST] = 0x2F, [DIR_WEST] = MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_LEFT,
[DIR_EAST] = 0x30, [DIR_EAST] = MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_RIGHT,
}; };
const u8 gUnknown_83A6564[] = { const u8 gUnknown_83A6564[] = {
[DIR_NONE] = 0x70, [DIR_NONE] = MOVEMENT_ACTION_ACRO_WHEELIE_FACE_DOWN,
[DIR_SOUTH] = 0x70, [DIR_SOUTH] = MOVEMENT_ACTION_ACRO_WHEELIE_FACE_DOWN,
[DIR_NORTH] = 0x71, [DIR_NORTH] = MOVEMENT_ACTION_ACRO_WHEELIE_FACE_UP,
[DIR_WEST] = 0x72, [DIR_WEST] = MOVEMENT_ACTION_ACRO_WHEELIE_FACE_LEFT,
[DIR_EAST] = 0x73, [DIR_EAST] = MOVEMENT_ACTION_ACRO_WHEELIE_FACE_RIGHT,
}; };
const u8 gUnknown_83A6569[] = { const u8 gUnknown_83A6569[] = {
[DIR_NONE] = 0x74, [DIR_NONE] = MOVEMENT_ACTION_ACRO_POP_WHEELIE_DOWN,
[DIR_SOUTH] = 0x74, [DIR_SOUTH] = MOVEMENT_ACTION_ACRO_POP_WHEELIE_DOWN,
[DIR_NORTH] = 0x75, [DIR_NORTH] = MOVEMENT_ACTION_ACRO_POP_WHEELIE_UP,
[DIR_WEST] = 0x76, [DIR_WEST] = MOVEMENT_ACTION_ACRO_POP_WHEELIE_LEFT,
[DIR_EAST] = 0x77, [DIR_EAST] = MOVEMENT_ACTION_ACRO_POP_WHEELIE_RIGHT,
}; };
const u8 gUnknown_83A656E[] = { const u8 gUnknown_83A656E[] = {
[DIR_NONE] = 0x78, [DIR_NONE] = MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_DOWN,
[DIR_SOUTH] = 0x78, [DIR_SOUTH] = MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_DOWN,
[DIR_NORTH] = 0x79, [DIR_NORTH] = MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_UP,
[DIR_WEST] = 0x7A, [DIR_WEST] = MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_LEFT,
[DIR_EAST] = 0x7B, [DIR_EAST] = MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_RIGHT,
}; };
const u8 gUnknown_83A6573[] = { const u8 gUnknown_83A6573[] = {
[DIR_NONE] = 0x7C, [DIR_NONE] = MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_DOWN,
[DIR_SOUTH] = 0x7C, [DIR_SOUTH] = MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_DOWN,
[DIR_NORTH] = 0x7D, [DIR_NORTH] = MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_UP,
[DIR_WEST] = 0x7E, [DIR_WEST] = MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_LEFT,
[DIR_EAST] = 0x7F, [DIR_EAST] = MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_RIGHT,
}; };
const u8 gUnknown_83A6578[] = { const u8 gUnknown_83A6578[] = {
[DIR_NONE] = 0x80, [DIR_NONE] = MOVEMENT_ACTION_ACRO_WHEELIE_HOP_DOWN,
[DIR_SOUTH] = 0x80, [DIR_SOUTH] = MOVEMENT_ACTION_ACRO_WHEELIE_HOP_DOWN,
[DIR_NORTH] = 0x81, [DIR_NORTH] = MOVEMENT_ACTION_ACRO_WHEELIE_HOP_UP,
[DIR_WEST] = 0x82, [DIR_WEST] = MOVEMENT_ACTION_ACRO_WHEELIE_HOP_LEFT,
[DIR_EAST] = 0x83, [DIR_EAST] = MOVEMENT_ACTION_ACRO_WHEELIE_HOP_RIGHT,
}; };
const u8 gUnknown_83A657D[] = { const u8 gUnknown_83A657D[] = {
[DIR_NONE] = 0x84, [DIR_NONE] = MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_DOWN,
[DIR_SOUTH] = 0x84, [DIR_SOUTH] = MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_DOWN,
[DIR_NORTH] = 0x85, [DIR_NORTH] = MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_UP,
[DIR_WEST] = 0x86, [DIR_WEST] = MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_LEFT,
[DIR_EAST] = 0x87, [DIR_EAST] = MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_RIGHT,
}; };
const u8 gUnknown_83A6582[] = { const u8 gUnknown_83A6582[] = {
[DIR_NONE] = 0x88, [DIR_NONE] = MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_DOWN,
[DIR_SOUTH] = 0x88, [DIR_SOUTH] = MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_DOWN,
[DIR_NORTH] = 0x89, [DIR_NORTH] = MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_UP,
[DIR_WEST] = 0x8A, [DIR_WEST] = MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_LEFT,
[DIR_EAST] = 0x8B, [DIR_EAST] = MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_RIGHT,
}; };
const u8 gUnknown_83A6587[] = { const u8 gUnknown_83A6587[] = {
[DIR_NONE] = 0x8C, [DIR_NONE] = MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_DOWN,
[DIR_SOUTH] = 0x8C, [DIR_SOUTH] = MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_DOWN,
[DIR_NORTH] = 0x8D, [DIR_NORTH] = MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_UP,
[DIR_WEST] = 0x8E, [DIR_WEST] = MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_LEFT,
[DIR_EAST] = 0x8F, [DIR_EAST] = MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_RIGHT,
}; };
const u8 gUnknown_83A658C[] = { const u8 gUnknown_83A658C[] = {
[DIR_NONE] = 0x90, [DIR_NONE] = MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_DOWN,
[DIR_SOUTH] = 0x90, [DIR_SOUTH] = MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_DOWN,
[DIR_NORTH] = 0x91, [DIR_NORTH] = MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_UP,
[DIR_WEST] = 0x92, [DIR_WEST] = MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_LEFT,
[DIR_EAST] = 0x93, [DIR_EAST] = MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_RIGHT,
}; };
const u8 gOppositeDirections[] = { const u8 gOppositeDirections[] = {
@@ -5435,7 +5435,7 @@ u8 name(u32 idx) \
} }
dirn_to_anim(GetFaceDirectionMovementAction, gFaceDirectionMovementActions); dirn_to_anim(GetFaceDirectionMovementAction, gFaceDirectionMovementActions);
dirn_to_anim(GetWalkSlowMovementAction, gWalkSlowMovementActions); dirn_to_anim(GetFaceDirectionFastMovementAction, gFaceDirectionFastMovementActions);
u8 sub_8063F10(u32 idx) u8 sub_8063F10(u32 idx)
{ {