From dbac777d95875b49e98da94551a89616c2addf3c Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 22 Mar 2020 20:17:47 -0400 Subject: through CheckMovementInputNotOnBike --- data/event_object_movement.s | 333 ++++++++++++++++++++++--------------------- data/field_player_avatar.s | 29 ---- 2 files changed, 167 insertions(+), 195 deletions(-) (limited to 'data') diff --git a/data/event_object_movement.s b/data/event_object_movement.s index 259099795..6aad8341a 100644 --- a/data/event_object_movement.s +++ b/data/event_object_movement.s @@ -1,3 +1,4 @@ +#include "constants/event_object_movement.h" .include "asm/macros.inc" .include "constants/constants.inc" .section .rodata @@ -769,7 +770,7 @@ sMovementTypeCallbacks:: @ 839FBC8 .4byte MovementType_FaceDirection .4byte MovementType_FaceDirection .4byte MovementType_FaceDirection - .4byte sub_805B3B8 + .4byte MovementType_Player .4byte NULL .4byte MovementType_FaceDownAndUp .4byte MovementType_FaceLeftAndRight @@ -7888,235 +7889,235 @@ sDirectionToVectors:: @ 83A64C8 @ gFaceDirectionMovementActions gFaceDirectionMovementActions:: @ 83A64EC - .byte 0x0 @ DIR_NONE - .byte 0x0 @ DIR_SOUTH - .byte 0x1 @ DIR_NORTH - .byte 0x2 @ DIR_WEST - .byte 0x3 @ DIR_EAST + .byte MOVEMENT_ACTION_FACE_DOWN @ DIR_NONE + .byte MOVEMENT_ACTION_FACE_DOWN @ DIR_SOUTH + .byte MOVEMENT_ACTION_FACE_UP @ DIR_NORTH + .byte MOVEMENT_ACTION_FACE_LEFT @ DIR_WEST + .byte MOVEMENT_ACTION_FACE_RIGHT @ DIR_EAST gWalkSlowMovementActions:: @ 83A64F1 - .byte 0x4 @ DIR_NONE - .byte 0x4 @ DIR_SOUTH - .byte 0x5 @ DIR_NORTH - .byte 0x6 @ DIR_WEST - .byte 0x7 @ DIR_EAST + .byte MOVEMENT_ACTION_FACE_DOWN_FAST @ DIR_NONE + .byte MOVEMENT_ACTION_FACE_DOWN_FAST @ DIR_SOUTH + .byte MOVEMENT_ACTION_FACE_UP_FAST @ DIR_NORTH + .byte MOVEMENT_ACTION_FACE_LEFT_FAST @ DIR_WEST + .byte MOVEMENT_ACTION_FACE_RIGHT_FAST @ DIR_EAST gUnknown_83A64F6:: @ 83A64F6 - .byte 0x9B @ DIR_NONE - .byte 0x9B @ DIR_SOUTH - .byte 0x9C @ DIR_NORTH - .byte 0x9D @ DIR_WEST - .byte 0x9E @ DIR_EAST + .byte MOVEMENT_ACTION_0x9B @ DIR_NONE + .byte MOVEMENT_ACTION_0x9B @ DIR_SOUTH + .byte MOVEMENT_ACTION_0x9C @ DIR_NORTH + .byte MOVEMENT_ACTION_0x9D @ DIR_WEST + .byte MOVEMENT_ACTION_0x9E @ DIR_EAST gUnknown_83A64FB:: @ 83A64FB - .byte 0x8 @ DIR_NONE - .byte 0x8 @ DIR_SOUTH - .byte 0x9 @ DIR_NORTH - .byte 0xA @ DIR_WEST - .byte 0xB @ DIR_EAST + .byte MOVEMENT_ACTION_WALK_SLOWEST_DOWN @ DIR_NONE + .byte MOVEMENT_ACTION_WALK_SLOWEST_DOWN @ DIR_SOUTH + .byte MOVEMENT_ACTION_WALK_SLOWEST_UP @ DIR_NORTH + .byte MOVEMENT_ACTION_WALK_SLOWEST_LEFT @ DIR_WEST + .byte MOVEMENT_ACTION_WALK_SLOWEST_RIGHT @ DIR_EAST gUnknown_83A6500:: @ 83A6500 - .byte 0xC @ DIR_NONE - .byte 0xC @ DIR_SOUTH - .byte 0xD @ DIR_NORTH - .byte 0xE @ DIR_WEST - .byte 0xF @ DIR_EAST + .byte MOVEMENT_ACTION_WALK_SLOW_DOWN @ DIR_NONE + .byte MOVEMENT_ACTION_WALK_SLOW_DOWN @ DIR_SOUTH + .byte MOVEMENT_ACTION_WALK_SLOW_UP @ DIR_NORTH + .byte MOVEMENT_ACTION_WALK_SLOW_LEFT @ DIR_WEST + .byte MOVEMENT_ACTION_WALK_SLOW_RIGHT @ DIR_EAST gUnknown_83A6505:: @ 83A6505 - .byte 0x10 @ DIR_NONE - .byte 0x10 @ DIR_SOUTH - .byte 0x11 @ DIR_NORTH - .byte 0x12 @ DIR_WEST - .byte 0x13 @ DIR_EAST + .byte MOVEMENT_ACTION_WALK_NORMAL_DOWN @ DIR_NONE + .byte MOVEMENT_ACTION_WALK_NORMAL_DOWN @ DIR_SOUTH + .byte MOVEMENT_ACTION_WALK_NORMAL_UP @ DIR_NORTH + .byte MOVEMENT_ACTION_WALK_NORMAL_LEFT @ DIR_WEST + .byte MOVEMENT_ACTION_WALK_NORMAL_RIGHT @ DIR_EAST gUnknown_83A650A:: @ 83A650A - .byte 0x1D @ DIR_NONE - .byte 0x1D @ DIR_SOUTH - .byte 0x1E @ DIR_NORTH - .byte 0x1F @ DIR_WEST - .byte 0x20 @ DIR_EAST + .byte MOVEMENT_ACTION_WALK_FAST_DOWN @ DIR_NONE + .byte MOVEMENT_ACTION_WALK_FAST_DOWN @ DIR_SOUTH + .byte MOVEMENT_ACTION_WALK_FAST_UP @ DIR_NORTH + .byte MOVEMENT_ACTION_WALK_FAST_LEFT @ DIR_WEST + .byte MOVEMENT_ACTION_WALK_FAST_RIGHT @ DIR_EAST gUnknown_83A650F:: @ 83A650F - .byte 0xA0 @ DIR_NONE - .byte 0xA0 @ DIR_SOUTH - .byte 0xA1 @ DIR_NORTH - .byte 0xA2 @ DIR_WEST - .byte 0xA3 @ DIR_EAST + .byte MOVEMENT_ACTION_0xA0 @ DIR_NONE + .byte MOVEMENT_ACTION_0xA0 @ DIR_SOUTH + .byte MOVEMENT_ACTION_0xA1 @ DIR_NORTH + .byte MOVEMENT_ACTION_0xA2 @ DIR_WEST + .byte MOVEMENT_ACTION_0xA3 @ DIR_EAST gUnknown_83A6514:: @ 83A6514 - .byte 0x31 @ DIR_NONE - .byte 0x31 @ DIR_SOUTH - .byte 0x32 @ DIR_NORTH - .byte 0x33 @ DIR_WEST - .byte 0x34 @ DIR_EAST + .byte MOVEMENT_ACTION_FACE_DOWN_SLOW @ DIR_NONE + .byte MOVEMENT_ACTION_FACE_DOWN_SLOW @ DIR_SOUTH + .byte MOVEMENT_ACTION_FACE_UP_SLOW @ DIR_NORTH + .byte MOVEMENT_ACTION_FACE_LEFT_SLOW @ DIR_WEST + .byte MOVEMENT_ACTION_FACE_RIGHT_SLOW @ DIR_EAST gUnknown_83A6519:: @ 83A6519 - .byte 0x35 @ DIR_NONE - .byte 0x35 @ DIR_SOUTH - .byte 0x36 @ DIR_NORTH - .byte 0x37 @ DIR_WEST - .byte 0x38 @ DIR_EAST + .byte MOVEMENT_ACTION_WALK_FASTEST_DOWN @ DIR_NONE + .byte MOVEMENT_ACTION_WALK_FASTEST_DOWN @ DIR_SOUTH + .byte MOVEMENT_ACTION_WALK_FASTEST_UP @ DIR_NORTH + .byte MOVEMENT_ACTION_WALK_FASTEST_LEFT @ DIR_WEST + .byte MOVEMENT_ACTION_WALK_FASTEST_RIGHT @ DIR_EAST gUnknown_83A651E:: @ 83A651E - .byte 0x39 @ DIR_NONE - .byte 0x39 @ DIR_SOUTH - .byte 0x3A @ DIR_NORTH - .byte 0x3B @ DIR_WEST - .byte 0x3C @ DIR_EAST + .byte MOVEMENT_ACTION_SLIDE_DOWN @ DIR_NONE + .byte MOVEMENT_ACTION_SLIDE_DOWN @ DIR_SOUTH + .byte MOVEMENT_ACTION_SLIDE_UP @ DIR_NORTH + .byte MOVEMENT_ACTION_SLIDE_LEFT @ DIR_WEST + .byte MOVEMENT_ACTION_SLIDE_RIGHT @ DIR_EAST gUnknown_83A6523:: @ 83A6523 - .byte 0x3D @ DIR_NONE - .byte 0x3D @ DIR_SOUTH - .byte 0x3E @ DIR_NORTH - .byte 0x3F @ DIR_WEST - .byte 0x40 @ DIR_EAST + .byte MOVEMENT_ACTION_PLAYER_RUN_DOWN @ DIR_NONE + .byte MOVEMENT_ACTION_PLAYER_RUN_DOWN @ DIR_SOUTH + .byte MOVEMENT_ACTION_PLAYER_RUN_UP @ DIR_NORTH + .byte MOVEMENT_ACTION_PLAYER_RUN_LEFT @ DIR_WEST + .byte MOVEMENT_ACTION_PLAYER_RUN_RIGHT @ DIR_EAST gUnknown_83A6528:: @ 83A6528 - .byte 0x41 @ DIR_NONE - .byte 0x41 @ DIR_SOUTH - .byte 0x42 @ DIR_NORTH - .byte 0x43 @ DIR_WEST - .byte 0x44 @ DIR_EAST + .byte MOVEMENT_ACTION_PLAYER_RUN_DOWN_SLOW @ DIR_NONE + .byte MOVEMENT_ACTION_PLAYER_RUN_DOWN_SLOW @ DIR_SOUTH + .byte MOVEMENT_ACTION_PLAYER_RUN_UP_SLOW @ DIR_NORTH + .byte MOVEMENT_ACTION_PLAYER_RUN_LEFT_SLOW @ DIR_WEST + .byte MOVEMENT_ACTION_PLAYER_RUN_RIGHT_SLOW @ DIR_EAST gUnknown_83A652D:: @ 83A652D - .byte 0x94 @ DIR_NONE - .byte 0x94 @ DIR_SOUTH - .byte 0x95 @ DIR_NORTH - .byte 0x96 @ DIR_WEST - .byte 0x97 @ DIR_EAST + .byte MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_DOWN @ DIR_NONE + .byte MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_DOWN @ DIR_SOUTH + .byte MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_UP @ DIR_NORTH + .byte MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_LEFT @ DIR_WEST + .byte MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_RIGHT @ DIR_EAST gUnknown_83A6532:: @ 83A6532 - .byte 0x14 @ DIR_NONE - .byte 0x14 @ DIR_SOUTH - .byte 0x15 @ DIR_NORTH - .byte 0x16 @ DIR_WEST - .byte 0x17 @ DIR_EAST + .byte MOVEMENT_ACTION_JUMP_2_DOWN @ DIR_NONE + .byte MOVEMENT_ACTION_JUMP_2_DOWN @ DIR_SOUTH + .byte MOVEMENT_ACTION_JUMP_2_UP @ DIR_NORTH + .byte MOVEMENT_ACTION_JUMP_2_LEFT @ DIR_WEST + .byte MOVEMENT_ACTION_JUMP_2_RIGHT @ DIR_EAST gUnknown_83A6537:: @ 83A6537 - .byte 0x52 @ DIR_NONE - .byte 0x52 @ DIR_SOUTH - .byte 0x53 @ DIR_NORTH - .byte 0x54 @ DIR_WEST - .byte 0x55 @ DIR_EAST + .byte MOVEMENT_ACTION_JUMP_IN_PLACE_DOWN @ DIR_NONE + .byte MOVEMENT_ACTION_JUMP_IN_PLACE_DOWN @ DIR_SOUTH + .byte MOVEMENT_ACTION_JUMP_IN_PLACE_UP @ DIR_NORTH + .byte MOVEMENT_ACTION_JUMP_IN_PLACE_LEFT @ DIR_WEST + .byte MOVEMENT_ACTION_JUMP_IN_PLACE_RIGHT @ DIR_EAST gUnknown_83A653C:: @ 83A653C - .byte 0x57 @ DIR_NONE - .byte 0x57 @ DIR_SOUTH - .byte 0x56 @ DIR_NORTH - .byte 0x59 @ DIR_WEST - .byte 0x58 @ DIR_EAST + .byte MOVEMENT_ACTION_JUMP_IN_PLACE_UP_DOWN @ DIR_NONE + .byte MOVEMENT_ACTION_JUMP_IN_PLACE_UP_DOWN @ DIR_SOUTH + .byte MOVEMENT_ACTION_JUMP_IN_PLACE_DOWN_UP @ DIR_NORTH + .byte MOVEMENT_ACTION_JUMP_IN_PLACE_RIGHT_LEFT @ DIR_WEST + .byte MOVEMENT_ACTION_JUMP_IN_PLACE_LEFT_RIGHT @ DIR_EAST gUnknown_83A6541:: @ 83A6541 - .byte 0x4E @ DIR_NONE - .byte 0x4E @ DIR_SOUTH - .byte 0x4F @ DIR_NORTH - .byte 0x50 @ DIR_WEST - .byte 0x51 @ DIR_EAST + .byte MOVEMENT_ACTION_JUMP_DOWN @ DIR_NONE + .byte MOVEMENT_ACTION_JUMP_DOWN @ DIR_SOUTH + .byte MOVEMENT_ACTION_JUMP_UP @ DIR_NORTH + .byte MOVEMENT_ACTION_JUMP_LEFT @ DIR_WEST + .byte MOVEMENT_ACTION_JUMP_RIGHT @ DIR_EAST gUnknown_83A6546:: @ 83A6546 - .byte 0x46 @ DIR_NONE - .byte 0x46 @ DIR_SOUTH - .byte 0x47 @ DIR_NORTH - .byte 0x48 @ DIR_WEST - .byte 0x49 @ DIR_EAST + .byte MOVEMENT_ACTION_JUMP_SPECIAL_DOWN @ DIR_NONE + .byte MOVEMENT_ACTION_JUMP_SPECIAL_DOWN @ DIR_SOUTH + .byte MOVEMENT_ACTION_JUMP_SPECIAL_UP @ DIR_NORTH + .byte MOVEMENT_ACTION_JUMP_SPECIAL_LEFT @ DIR_WEST + .byte MOVEMENT_ACTION_JUMP_SPECIAL_RIGHT @ DIR_EAST gUnknown_83A654B:: @ 83A654B - .byte 0xA6 @ DIR_NONE - .byte 0xA6 @ DIR_SOUTH - .byte 0xA7 @ DIR_NORTH - .byte 0xA8 @ DIR_WEST - .byte 0xA9 @ DIR_EAST + .byte MOVEMENT_ACTION_0xA6 @ DIR_NONE + .byte MOVEMENT_ACTION_0xA6 @ DIR_SOUTH + .byte MOVEMENT_ACTION_0xA7 @ DIR_NORTH + .byte MOVEMENT_ACTION_0xA8 @ DIR_WEST + .byte MOVEMENT_ACTION_0xA9 @ DIR_EAST gUnknown_83A6550:: @ 83A6550 - .byte 0x21 @ DIR_NONE - .byte 0x21 @ DIR_SOUTH - .byte 0x22 @ DIR_NORTH - .byte 0x23 @ DIR_WEST - .byte 0x24 @ DIR_EAST + .byte MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_DOWN @ DIR_NONE + .byte MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_DOWN @ DIR_SOUTH + .byte MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_UP @ DIR_NORTH + .byte MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_LEFT @ DIR_WEST + .byte MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_RIGHT @ DIR_EAST gUnknown_83A6555:: @ 83A6555 - .byte 0x25 @ DIR_NONE - .byte 0x25 @ DIR_SOUTH - .byte 0x26 @ DIR_NORTH - .byte 0x27 @ DIR_WEST - .byte 0x28 @ DIR_EAST + .byte MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_DOWN @ DIR_NONE + .byte MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_DOWN @ DIR_SOUTH + .byte MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_UP @ DIR_NORTH + .byte MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_LEFT @ DIR_WEST + .byte MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_RIGHT @ DIR_EAST gUnknown_83A655A:: @ 83A655A - .byte 0x29 @ DIR_NONE - .byte 0x29 @ DIR_SOUTH - .byte 0x2A @ DIR_NORTH - .byte 0x2B @ DIR_WEST - .byte 0x2C @ DIR_EAST + .byte MOVEMENT_ACTION_WALK_IN_PLACE_FAST_DOWN @ DIR_NONE + .byte MOVEMENT_ACTION_WALK_IN_PLACE_FAST_DOWN @ DIR_SOUTH + .byte MOVEMENT_ACTION_WALK_IN_PLACE_FAST_UP @ DIR_NORTH + .byte MOVEMENT_ACTION_WALK_IN_PLACE_FAST_LEFT @ DIR_WEST + .byte MOVEMENT_ACTION_WALK_IN_PLACE_FAST_RIGHT @ DIR_EAST gUnknown_83A655F:: @ 83A655F - .byte 0x2D @ DIR_NONE - .byte 0x2D @ DIR_SOUTH - .byte 0x2E @ DIR_NORTH - .byte 0x2F @ DIR_WEST - .byte 0x30 @ DIR_EAST + .byte MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_DOWN @ DIR_NONE + .byte MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_DOWN @ DIR_SOUTH + .byte MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_UP @ DIR_NORTH + .byte MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_LEFT @ DIR_WEST + .byte MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_RIGHT @ DIR_EAST gUnknown_83A6564:: @ 83A6564 - .byte 0x70 @ DIR_NONE - .byte 0x70 @ DIR_SOUTH - .byte 0x71 @ DIR_NORTH - .byte 0x72 @ DIR_WEST - .byte 0x73 @ DIR_EAST + .byte MOVEMENT_ACTION_ACRO_WHEELIE_FACE_DOWN @ DIR_NONE + .byte MOVEMENT_ACTION_ACRO_WHEELIE_FACE_DOWN @ DIR_SOUTH + .byte MOVEMENT_ACTION_ACRO_WHEELIE_FACE_UP @ DIR_NORTH + .byte MOVEMENT_ACTION_ACRO_WHEELIE_FACE_LEFT @ DIR_WEST + .byte MOVEMENT_ACTION_ACRO_WHEELIE_FACE_RIGHT @ DIR_EAST gUnknown_83A6569:: @ 83A6569 - .byte 0x74 @ DIR_NONE - .byte 0x74 @ DIR_SOUTH - .byte 0x75 @ DIR_NORTH - .byte 0x76 @ DIR_WEST - .byte 0x77 @ DIR_EAST + .byte MOVEMENT_ACTION_ACRO_POP_WHEELIE_DOWN @ DIR_NONE + .byte MOVEMENT_ACTION_ACRO_POP_WHEELIE_DOWN @ DIR_SOUTH + .byte MOVEMENT_ACTION_ACRO_POP_WHEELIE_UP @ DIR_NORTH + .byte MOVEMENT_ACTION_ACRO_POP_WHEELIE_LEFT @ DIR_WEST + .byte MOVEMENT_ACTION_ACRO_POP_WHEELIE_RIGHT @ DIR_EAST gUnknown_83A656E:: @ 83A656E - .byte 0x78 @ DIR_NONE - .byte 0x78 @ DIR_SOUTH - .byte 0x79 @ DIR_NORTH - .byte 0x7A @ DIR_WEST - .byte 0x7B @ DIR_EAST + .byte MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_DOWN @ DIR_NONE + .byte MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_DOWN @ DIR_SOUTH + .byte MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_UP @ DIR_NORTH + .byte MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_LEFT @ DIR_WEST + .byte MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_RIGHT @ DIR_EAST gUnknown_83A6573:: @ 83A6573 - .byte 0x7C @ DIR_NONE - .byte 0x7C @ DIR_SOUTH - .byte 0x7D @ DIR_NORTH - .byte 0x7E @ DIR_WEST - .byte 0x7F @ DIR_EAST + .byte MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_DOWN @ DIR_NONE + .byte MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_DOWN @ DIR_SOUTH + .byte MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_UP @ DIR_NORTH + .byte MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_LEFT @ DIR_WEST + .byte MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_RIGHT @ DIR_EAST gUnknown_83A6578:: @ 83A6578 - .byte 0x80 @ DIR_NONE - .byte 0x80 @ DIR_SOUTH - .byte 0x81 @ DIR_NORTH - .byte 0x82 @ DIR_WEST - .byte 0x83 @ DIR_EAST + .byte MOVEMENT_ACTION_ACRO_WHEELIE_HOP_DOWN @ DIR_NONE + .byte MOVEMENT_ACTION_ACRO_WHEELIE_HOP_DOWN @ DIR_SOUTH + .byte MOVEMENT_ACTION_ACRO_WHEELIE_HOP_UP @ DIR_NORTH + .byte MOVEMENT_ACTION_ACRO_WHEELIE_HOP_LEFT @ DIR_WEST + .byte MOVEMENT_ACTION_ACRO_WHEELIE_HOP_RIGHT @ DIR_EAST gUnknown_83A657D:: @ 83A657D - .byte 0x84 @ DIR_NONE - .byte 0x84 @ DIR_SOUTH - .byte 0x85 @ DIR_NORTH - .byte 0x86 @ DIR_WEST - .byte 0x87 @ DIR_EAST + .byte MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_DOWN @ DIR_NONE + .byte MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_DOWN @ DIR_SOUTH + .byte MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_UP @ DIR_NORTH + .byte MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_LEFT @ DIR_WEST + .byte MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_RIGHT @ DIR_EAST gUnknown_83A6582:: @ 83A6582 - .byte 0x88 @ DIR_NONE - .byte 0x88 @ DIR_SOUTH - .byte 0x89 @ DIR_NORTH - .byte 0x8A @ DIR_WEST - .byte 0x8B @ DIR_EAST + .byte MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_DOWN @ DIR_NONE + .byte MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_DOWN @ DIR_SOUTH + .byte MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_UP @ DIR_NORTH + .byte MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_LEFT @ DIR_WEST + .byte MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_RIGHT @ DIR_EAST gUnknown_83A6587:: @ 83A6587 - .byte 0x8C @ DIR_NONE - .byte 0x8C @ DIR_SOUTH - .byte 0x8D @ DIR_NORTH - .byte 0x8E @ DIR_WEST - .byte 0x8F @ DIR_EAST + .byte MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_DOWN @ DIR_NONE + .byte MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_DOWN @ DIR_SOUTH + .byte MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_UP @ DIR_NORTH + .byte MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_LEFT @ DIR_WEST + .byte MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_RIGHT @ DIR_EAST gUnknown_83A658C:: @ 83A658C - .byte 0x90 @ DIR_NONE - .byte 0x90 @ DIR_SOUTH - .byte 0x91 @ DIR_NORTH - .byte 0x92 @ DIR_WEST - .byte 0x93 @ DIR_EAST + .byte MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_DOWN @ DIR_NONE + .byte MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_DOWN @ DIR_SOUTH + .byte MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_UP @ DIR_NORTH + .byte MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_LEFT @ DIR_WEST + .byte MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_RIGHT @ DIR_EAST @ gOppositeDirections ? gOppositeDirections:: @ 83A6591 diff --git a/data/field_player_avatar.s b/data/field_player_avatar.s index be4036928..bfa367941 100644 --- a/data/field_player_avatar.s +++ b/data/field_player_avatar.s @@ -3,35 +3,6 @@ .include "constants/constants.inc" .section .rodata .align 2 -gUnknown_835B764:: @ 835B764 - .4byte MetatileBehavior_IsUnknownMovement48, ForcedMovement_Slip - .4byte MetatileBehavior_IsIce_2, ForcedMovement_Slip - .4byte MetatileBehavior_IsWalkSouth, sub_805B750 - .4byte MetatileBehavior_IsWalkNorth, sub_805B768 - .4byte MetatileBehavior_IsWalkWest, sub_805B780 - .4byte MetatileBehavior_IsWalkEast, sub_805B798 - .4byte MetatileBehavior_IsSouthwardCurrent, sub_805B82C - .4byte MetatileBehavior_IsNorthwardCurrent, sub_805B844 - .4byte MetatileBehavior_IsWestwardCurrent, sub_805B85C - .4byte MetatileBehavior_IsEastwardCurrent, sub_805B874 - .4byte MetatileBehavior_UnusedIsSpinRight, sub_805B7B0 - .4byte MetatileBehavior_UnusedIsSpinLeft, sub_805B7CC - .4byte MetatileBehavior_UnusedIsSpinUp, sub_805B7E8 - .4byte MetatileBehavior_UnusedIsSpinDown, sub_805B804 - .4byte MetatileBehavior_IsSlideSouth, ForcedMovement_SlideSouth - .4byte MetatileBehavior_IsSlideNorth, ForcedMovement_SlideNorth - .4byte MetatileBehavior_IsSlideWest, ForcedMovement_SlideWest - .4byte MetatileBehavior_IsSlideEast, ForcedMovement_SlideEast - .4byte MetatileBehavior_IsWaterfall, sub_805B82C - .4byte MetatileBehavior_UnusedReturnFalse_7, sub_805B924 - .4byte MetatileBehavior_UnusedReturnFalse_8, sub_805B930 - .4byte NULL, ForcedMovement_None - -gUnknown_835B814:: @ 835B814 - .4byte PlayerNotOnBikeNotMoving - .4byte sub_805B9C4 - .4byte sub_805B9D4 - gUnknown_835B820:: @ 835B820 .byte 0x04, 0x04, 0x05, 0x06, 0x07 -- cgit v1.2.3 From f9a3607824d00f17999288e241fc3ad339716279 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 23 Mar 2020 08:54:37 -0400 Subject: through CheckForObjectEventCollision --- data/maps/PewterCity/scripts.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data') diff --git a/data/maps/PewterCity/scripts.inc b/data/maps/PewterCity/scripts.inc index be854826b..c50fcdb2d 100644 --- a/data/maps/PewterCity/scripts.inc +++ b/data/maps/PewterCity/scripts.inc @@ -744,7 +744,7 @@ PewterCity_EventScript_AideGiveRunningShoes:: @ 81662DE msgbox PewterCity_Text_RunningShoesLetterFromMom closemessage removeobject LOCALID_AIDE - setflag FLAG_SYS_RUNNING_SHOES + setflag FLAG_SYS_B_DASH setvar VAR_MAP_SCENE_PEWTER_CITY, 2 return -- cgit v1.2.3 From 5b3e9f376b2ed230df1d7e6d23e0239f69d10ba4 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 23 Mar 2020 21:42:35 -0400 Subject: through PlayerGetCopyableMovement --- data/field_player_avatar.s | 25 ---------------------- data/maps/FuchsiaCity_WardensHouse/map.json | 2 +- data/maps/MtEmber_Exterior/map.json | 10 ++++----- data/maps/MtEmber_RubyPath_B2F/map.json | 6 +++--- data/maps/MtEmber_RubyPath_B3F/map.json | 8 +++---- data/maps/MtEmber_Summit/map.json | 8 +++---- data/maps/SeafoamIslands_1F/map.json | 4 ++-- data/maps/SeafoamIslands_B1F/map.json | 4 ++-- data/maps/SeafoamIslands_B2F/map.json | 4 ++-- data/maps/SeafoamIslands_B3F/map.json | 12 +++++------ data/maps/SeafoamIslands_B4F/map.json | 4 ++-- data/maps/SevenIsland_SevaultCanyon/map.json | 4 ++-- .../SevenIsland_SevaultCanyon_TanobyKey/map.json | 14 ++++++------ data/maps/SixIsland_RuinValley/map.json | 16 +++++++------- data/maps/VictoryRoad_1F/map.json | 6 +++--- data/maps/VictoryRoad_2F/map.json | 6 +++--- data/maps/VictoryRoad_3F/map.json | 8 +++---- data/scripts/field_moves.inc | 4 ++-- 18 files changed, 60 insertions(+), 85 deletions(-) (limited to 'data') diff --git a/data/field_player_avatar.s b/data/field_player_avatar.s index bfa367941..f7b7a3493 100644 --- a/data/field_player_avatar.s +++ b/data/field_player_avatar.s @@ -3,31 +3,6 @@ .include "constants/constants.inc" .section .rodata .align 2 -gUnknown_835B820:: @ 835B820 - .byte 0x04, 0x04, 0x05, 0x06, 0x07 - - .align 2 -gUnknown_835B828:: @ 835B828 - .4byte MetatileBehavior_ReturnFalse_14 // Related to Acro Bike - .4byte MetatileBehavior_ReturnFalse_15 // Related to Acro Bike - .4byte MetatileBehavior_ReturnFalse_16 // Related to Acro Bike - .4byte MetatileBehavior_ReturnFalse_17 // Related to Acro Bike - .4byte MetatileBehavior_ReturnFalse_18 // Related to Acro Bike - -gUnknown_835B83C:: @ 835B83C - .byte 0x09, 0x0a, 0x0b, 0x0c, 0x0d - - .align 2 -gUnknown_835B844:: @ 835B844 - .4byte sub_805BE60 - .4byte sub_805BE74 - .4byte sub_805BE74 - .4byte sub_805BE90 - .4byte nullsub_23 - .4byte PlayerAvatarTransition_ReturnToField - .4byte nullsub_22 - .4byte nullsub_22 - gUnknown_835B864:: @ 835B864 .4byte MetatileBehavior_IsSouthArrowWarp .4byte MetatileBehavior_IsNorthArrowWarp diff --git a/data/maps/FuchsiaCity_WardensHouse/map.json b/data/maps/FuchsiaCity_WardensHouse/map.json index a6d7e8044..74e75066a 100644 --- a/data/maps/FuchsiaCity_WardensHouse/map.json +++ b/data/maps/FuchsiaCity_WardensHouse/map.json @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 11, "y": 6, "elevation": 3, diff --git a/data/maps/MtEmber_Exterior/map.json b/data/maps/MtEmber_Exterior/map.json index 7499f0047..86fe279ca 100644 --- a/data/maps/MtEmber_Exterior/map.json +++ b/data/maps/MtEmber_Exterior/map.json @@ -120,7 +120,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 22, "y": 45, "elevation": 3, @@ -133,7 +133,7 @@ "flag": "0" }, { - "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 17, "y": 46, "elevation": 3, @@ -146,7 +146,7 @@ "flag": "0" }, { - "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 36, "y": 14, "elevation": 3, @@ -185,7 +185,7 @@ "flag": "FLAG_TEMP_15" }, { - "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 35, "y": 14, "elevation": 3, @@ -198,7 +198,7 @@ "flag": "0" }, { - "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 35, "y": 17, "elevation": 3, diff --git a/data/maps/MtEmber_RubyPath_B2F/map.json b/data/maps/MtEmber_RubyPath_B2F/map.json index e505dd6ab..e260e42bd 100644 --- a/data/maps/MtEmber_RubyPath_B2F/map.json +++ b/data/maps/MtEmber_RubyPath_B2F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 9, "y": 3, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 12, "y": 5, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 12, "y": 2, "elevation": 3, diff --git a/data/maps/MtEmber_RubyPath_B3F/map.json b/data/maps/MtEmber_RubyPath_B3F/map.json index 3107af9f3..1888f4506 100644 --- a/data/maps/MtEmber_RubyPath_B3F/map.json +++ b/data/maps/MtEmber_RubyPath_B3F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 10, "y": 4, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 26, "y": 12, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 28, "y": 8, "elevation": 3, @@ -133,7 +133,7 @@ "flag": "FLAG_TEMP_17" }, { - "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 15, "y": 13, "elevation": 3, diff --git a/data/maps/MtEmber_Summit/map.json b/data/maps/MtEmber_Summit/map.json index 9442cb532..92aabd11e 100644 --- a/data/maps/MtEmber_Summit/map.json +++ b/data/maps/MtEmber_Summit/map.json @@ -29,7 +29,7 @@ "flag": "FLAG_HIDE_MOLTRES" }, { - "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 10, "y": 12, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 9, "y": 12, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 8, "y": 11, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "0" }, { - "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 8, "y": 10, "elevation": 3, diff --git a/data/maps/SeafoamIslands_1F/map.json b/data/maps/SeafoamIslands_1F/map.json index 9ec2b53ae..5962bae21 100644 --- a/data/maps/SeafoamIslands_1F/map.json +++ b/data/maps/SeafoamIslands_1F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 22, "y": 12, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_HIDE_SEAFOAM_1F_BOULDER_1" }, { - "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 32, "y": 9, "elevation": 3, diff --git a/data/maps/SeafoamIslands_B1F/map.json b/data/maps/SeafoamIslands_B1F/map.json index b5a669e7d..684842b1c 100644 --- a/data/maps/SeafoamIslands_B1F/map.json +++ b/data/maps/SeafoamIslands_B1F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 22, "y": 8, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_HIDE_SEAFOAM_B1F_BOULDER_1" }, { - "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 30, "y": 8, "elevation": 3, diff --git a/data/maps/SeafoamIslands_B2F/map.json b/data/maps/SeafoamIslands_B2F/map.json index a91d362c1..a12678c4f 100644 --- a/data/maps/SeafoamIslands_B2F/map.json +++ b/data/maps/SeafoamIslands_B2F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 22, "y": 8, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_HIDE_SEAFOAM_B2F_BOULDER_1" }, { - "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 30, "y": 8, "elevation": 3, diff --git a/data/maps/SeafoamIslands_B3F/map.json b/data/maps/SeafoamIslands_B3F/map.json index 25ad96266..9d9c4db52 100644 --- a/data/maps/SeafoamIslands_B3F/map.json +++ b/data/maps/SeafoamIslands_B3F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 23, "y": 8, "elevation": 1, @@ -29,7 +29,7 @@ "flag": "FLAG_HIDE_SEAFOAM_B3F_BOULDER_1" }, { - "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 24, "y": 8, "elevation": 1, @@ -42,7 +42,7 @@ "flag": "FLAG_HIDE_SEAFOAM_B3F_BOULDER_2" }, { - "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 12, "y": 16, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_HIDE_SEAFOAM_B3F_BOULDER_5" }, { - "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 13, "y": 16, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "FLAG_HIDE_SEAFOAM_B3F_BOULDER_6" }, { - "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 9, "y": 16, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "FLAG_HIDE_SEAFOAM_B3F_BOULDER_4" }, { - "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 6, "y": 17, "elevation": 3, diff --git a/data/maps/SeafoamIslands_B4F/map.json b/data/maps/SeafoamIslands_B4F/map.json index 4375e5fad..eeae9ad11 100644 --- a/data/maps/SeafoamIslands_B4F/map.json +++ b/data/maps/SeafoamIslands_B4F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 8, "y": 18, "elevation": 1, @@ -29,7 +29,7 @@ "flag": "FLAG_HIDE_SEAFOAM_B4F_BOULDER_1" }, { - "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 9, "y": 18, "elevation": 1, diff --git a/data/maps/SevenIsland_SevaultCanyon/map.json b/data/maps/SevenIsland_SevaultCanyon/map.json index 0cb611d5e..7b579284e 100644 --- a/data/maps/SevenIsland_SevaultCanyon/map.json +++ b/data/maps/SevenIsland_SevaultCanyon/map.json @@ -144,7 +144,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 13, "y": 47, "elevation": 3, @@ -209,7 +209,7 @@ "flag": "FLAG_TEMP_17" }, { - "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 17, "y": 47, "elevation": 3, diff --git a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json index cbcc15d02..8cb2b4fe3 100644 --- a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json +++ b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 7, "y": 6, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 8, "y": 6, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 8, "y": 9, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 6, "y": 10, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "0" }, { - "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 8, "y": 10, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "0" }, { - "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 6, "y": 9, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "0" }, { - "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 6, "y": 6, "elevation": 3, diff --git a/data/maps/SixIsland_RuinValley/map.json b/data/maps/SixIsland_RuinValley/map.json index 8a5ff9436..c6bc3b25a 100644 --- a/data/maps/SixIsland_RuinValley/map.json +++ b/data/maps/SixIsland_RuinValley/map.json @@ -100,7 +100,7 @@ "flag": "0" }, { - "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 17, "y": 10, "elevation": 5, @@ -113,7 +113,7 @@ "flag": "0" }, { - "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 17, "y": 12, "elevation": 5, @@ -126,7 +126,7 @@ "flag": "0" }, { - "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 18, "y": 11, "elevation": 5, @@ -139,7 +139,7 @@ "flag": "0" }, { - "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 6, "y": 33, "elevation": 3, @@ -152,7 +152,7 @@ "flag": "0" }, { - "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 6, "y": 34, "elevation": 3, @@ -165,7 +165,7 @@ "flag": "0" }, { - "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 41, "y": 32, "elevation": 3, @@ -178,7 +178,7 @@ "flag": "0" }, { - "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 41, "y": 33, "elevation": 3, @@ -191,7 +191,7 @@ "flag": "0" }, { - "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 42, "y": 33, "elevation": 3, diff --git a/data/maps/VictoryRoad_1F/map.json b/data/maps/VictoryRoad_1F/map.json index 75a812a17..1dc53b977 100644 --- a/data/maps/VictoryRoad_1F/map.json +++ b/data/maps/VictoryRoad_1F/map.json @@ -68,7 +68,7 @@ "flag": "FLAG_HIDE_VICTORY_ROAD_1F_TM02" }, { - "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 7, "y": 18, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "0" }, { - "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 4, "y": 12, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "0" }, { - "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 16, "y": 3, "elevation": 3, diff --git a/data/maps/VictoryRoad_2F/map.json b/data/maps/VictoryRoad_2F/map.json index 20ce486e2..023f96e1c 100644 --- a/data/maps/VictoryRoad_2F/map.json +++ b/data/maps/VictoryRoad_2F/map.json @@ -133,7 +133,7 @@ "flag": "FLAG_HIDE_VICTORY_ROAD_2F_TM37" }, { - "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 8, "y": 7, "elevation": 3, @@ -146,7 +146,7 @@ "flag": "0" }, { - "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 6, "y": 17, "elevation": 3, @@ -159,7 +159,7 @@ "flag": "0" }, { - "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 33, "y": 19, "elevation": 3, diff --git a/data/maps/VictoryRoad_3F/map.json b/data/maps/VictoryRoad_3F/map.json index cf2d28b45..a20c6a276 100644 --- a/data/maps/VictoryRoad_3F/map.json +++ b/data/maps/VictoryRoad_3F/map.json @@ -94,7 +94,7 @@ "flag": "FLAG_HIDE_VICTORY_ROAD_3F_TM50" }, { - "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 19, "y": 15, "elevation": 3, @@ -107,7 +107,7 @@ "flag": "0" }, { - "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 33, "y": 18, "elevation": 0, @@ -120,7 +120,7 @@ "flag": "FLAG_HIDE_VICTORY_ROAD_3F_BOULDER" }, { - "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 35, "y": 13, "elevation": 3, @@ -133,7 +133,7 @@ "flag": "0" }, { - "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 32, "y": 5, "elevation": 3, diff --git a/data/scripts/field_moves.inc b/data/scripts/field_moves.inc index 282071755..7ae90849d 100644 --- a/data/scripts/field_moves.inc +++ b/data/scripts/field_moves.inc @@ -125,7 +125,7 @@ EventScript_StrengthBoulder:: @ 81BE11D goto_if_questlog EventScript_ReleaseEnd lockall goto_if_unset FLAG_BADGE04_GET, EventScript_CantMoveBoulder - goto_if_set FLAG_SYS_STRENGTH_ACTIVE, EventScript_AlreadyUsedStrength + goto_if_set FLAG_SYS_USE_STRENGTH, EventScript_AlreadyUsedStrength checkpartymove MOVE_STRENGTH compare VAR_RESULT, PARTY_SIZE goto_if_eq EventScript_CantMoveBoulder @@ -147,7 +147,7 @@ EventScript_FldEffStrength:: @ 81BE16E end EventScript_UseStrength:: @ 81BE179 - setflag FLAG_SYS_STRENGTH_ACTIVE + setflag FLAG_SYS_USE_STRENGTH msgbox Text_MonUsedStrengthCanMoveBoulders, MSGBOX_SIGN end -- cgit v1.2.3 From 6c964a63505f6dc7527661400f6aae145c4cdf4b Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 24 Mar 2020 20:59:37 -0400 Subject: through InitPlayerAvatar --- data/field_player_avatar.s | 31 ------------------------------- 1 file changed, 31 deletions(-) (limited to 'data') diff --git a/data/field_player_avatar.s b/data/field_player_avatar.s index f7b7a3493..c7a03c7fe 100644 --- a/data/field_player_avatar.s +++ b/data/field_player_avatar.s @@ -3,37 +3,6 @@ .include "constants/constants.inc" .section .rodata .align 2 -gUnknown_835B864:: @ 835B864 - .4byte MetatileBehavior_IsSouthArrowWarp - .4byte MetatileBehavior_IsNorthArrowWarp - .4byte MetatileBehavior_IsWestArrowWarp - .4byte MetatileBehavior_IsEastArrowWarp - -gUnknown_835B874:: @ 835B874 - .byte OBJ_EVENT_GFX_RED_NORMAL, OBJ_EVENT_GFX_GREEN_NORMAL - .byte OBJ_EVENT_GFX_RED_BIKE, OBJ_EVENT_GFX_GREEN_BIKE - .byte OBJ_EVENT_GFX_RED_SURF, OBJ_EVENT_GFX_GREEN_SURF - .byte OBJ_EVENT_GFX_RED_ITEM, OBJ_EVENT_GFX_GREEN_ITEM - .byte OBJ_EVENT_GFX_RED_FISH, OBJ_EVENT_GFX_GREEN_FISH - .byte OBJ_EVENT_GFX_RED_ITEM_COPY, OBJ_EVENT_GFX_GREEN_ITEM_COPY - -gUnknown_835B880:: @ 835B880 - .byte OBJ_EVENT_GFX_RS_BRENDAN - .byte OBJ_EVENT_GFX_RS_MAY - -gUnknown_835B882:: @ 835B882 - @ Male - .byte OBJ_EVENT_GFX_RED_NORMAL, 0x01 - .byte OBJ_EVENT_GFX_RED_BIKE, 0x02 - .byte OBJ_EVENT_GFX_RED_SURF, 0x08 - @ Female - .byte OBJ_EVENT_GFX_GREEN_NORMAL, 0x01 - .byte OBJ_EVENT_GFX_GREEN_BIKE, 0x02 - .byte OBJ_EVENT_GFX_GREEN_SURF, 0x08 - -gUnknown_835B88E:: @ 835B88E - .byte OBJ_EVENT_GFX_RED_VS_SEEKER - .byte OBJ_EVENT_GFX_GREEN_VS_SEEKER gUnknown_835B890:: @ 835B890 .4byte MetatileBehavior_IsSouthArrowWarp -- cgit v1.2.3 From f1841ef24d63aa2425d4316b9f49408d90c29bdb Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 25 Mar 2020 08:57:52 -0400 Subject: through sub_805D1A8 --- data/field_player_avatar.s | 26 -------------------------- 1 file changed, 26 deletions(-) (limited to 'data') diff --git a/data/field_player_avatar.s b/data/field_player_avatar.s index c7a03c7fe..c4a4f324f 100644 --- a/data/field_player_avatar.s +++ b/data/field_player_avatar.s @@ -4,32 +4,6 @@ .section .rodata .align 2 -gUnknown_835B890:: @ 835B890 - .4byte MetatileBehavior_IsSouthArrowWarp - .4byte MetatileBehavior_IsNorthArrowWarp - .4byte MetatileBehavior_IsWestArrowWarp - .4byte MetatileBehavior_IsEastArrowWarp - -gUnknown_835B8A0:: @ 835B8A0 - .4byte sub_805CD64 - .4byte sub_805CD84 - .4byte sub_805CE20 - -gUnknown_835B8AC:: @ 835B8AC - .4byte PlayerAvatar_DoSecretBaseMatJump - -gUnknown_835B8B0:: @ 835B8B0 - .4byte sub_805CFC4 - .4byte sub_805CFEC - .4byte sub_805D064 - .4byte sub_805D0A4 - -gUnknown_835B8C0:: @ 835B8C0 - .byte 0x03, 0x04, 0x02, 0x01 - -gUnknown_835B8C4:: @ 835B8C4 - .byte 0x18, 0x18, 0x19, 0x1a, 0x1b - .align 2 gUnknown_835B8CC:: @ 835B8CC .4byte sub_805D33C -- cgit v1.2.3 From c032dc02319139771d8fed40c14297ee81b18b34 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 25 Mar 2020 17:37:07 -0400 Subject: through AlignFishingAnimationFrames --- data/field_player_avatar.s | 34 ---------------------------------- 1 file changed, 34 deletions(-) (limited to 'data') diff --git a/data/field_player_avatar.s b/data/field_player_avatar.s index c4a4f324f..74faff36c 100644 --- a/data/field_player_avatar.s +++ b/data/field_player_avatar.s @@ -4,39 +4,5 @@ .section .rodata .align 2 - .align 2 -gUnknown_835B8CC:: @ 835B8CC - .4byte sub_805D33C - .4byte fish1 - .4byte fish2 - .4byte sub_805D430 - .4byte sub_805D47C - .4byte sub_805D508 - .4byte sub_805D574 - .4byte sub_805D580 - .4byte sub_805D5EC - .4byte sub_805D66C - .4byte sub_805D6C8 - .4byte sub_805D7C0 - .4byte sub_805D838 - .4byte sub_805D8AC - .4byte sub_805D8D8 - .4byte sub_805D980 - -gUnknown_835B90C:: @ 835B90C - .2byte 0x0001, 0x0001, 0x0001 - -gUnknown_835B912:: @ 835B912 - .2byte 0x0001, 0x0003, 0x0006 - -gUnknown_835B918:: @ 835B918 - .string "ยท$" - -gUnknown_835B91A:: @ 835B91A - .2byte 0x0024, 0x0021, 0x001e - -gUnknown_835B920:: @ 835B920 - .2byte 0x0000, 0x0000, 0x0028, 0x000a, 0x0046, 0x001e - gUnknown_835B92C:: @ 835B92C .byte 0x01, 0x03, 0x04, 0x02, 0x01 -- cgit v1.2.3 From 302c6bfe6b13a329cb2aa36913b07b86abcc3694 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 25 Mar 2020 18:00:26 -0400 Subject: finish field_player_avatar --- data/field_player_avatar.s | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 data/field_player_avatar.s (limited to 'data') diff --git a/data/field_player_avatar.s b/data/field_player_avatar.s deleted file mode 100644 index 74faff36c..000000000 --- a/data/field_player_avatar.s +++ /dev/null @@ -1,8 +0,0 @@ -#include "constants/event_objects.h" - .include "asm/macros.inc" - .include "constants/constants.inc" - .section .rodata - .align 2 - -gUnknown_835B92C:: @ 835B92C - .byte 0x01, 0x03, 0x04, 0x02, 0x01 -- cgit v1.2.3