Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Document some movement action functions #318

Merged
merged 2 commits into from
Dec 17, 2024
+5,529 −5,630
Merged

Document some movement action functions #318

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9ee714b
Rename movement action constants
cbt6 Dec 13, 2024
63de4d7
Document some movement action functions
cbt6 Dec 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
596 changes: 298 additions & 298 deletions asm/macros/movement.inc
View file
Open in desktop

Large diffs are not rendered by default.

312 changes: 157 additions & 155 deletions consts/movement.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,161 +3,163 @@
"@MovementAction": {
"type": "enum",
"values": [
"MOVEMENT_ACTION_0",
"MOVEMENT_ACTION_1",
"MOVEMENT_ACTION_2",
"MOVEMENT_ACTION_3",
"MOVEMENT_ACTION_4",
"MOVEMENT_ACTION_5",
"MOVEMENT_ACTION_6",
"MOVEMENT_ACTION_7",
"MOVEMENT_ACTION_8",
"MOVEMENT_ACTION_9",
"MOVEMENT_ACTION_A",
"MOVEMENT_ACTION_B",
"MOVEMENT_ACTION_C",
"MOVEMENT_ACTION_D",
"MOVEMENT_ACTION_E",
"MOVEMENT_ACTION_F",
"MOVEMENT_ACTION_10",
"MOVEMENT_ACTION_11",
"MOVEMENT_ACTION_12",
"MOVEMENT_ACTION_13",
"MOVEMENT_ACTION_14",
"MOVEMENT_ACTION_15",
"MOVEMENT_ACTION_16",
"MOVEMENT_ACTION_17",
"MOVEMENT_ACTION_18",
"MOVEMENT_ACTION_19",
"MOVEMENT_ACTION_1A",
"MOVEMENT_ACTION_1B",
"MOVEMENT_ACTION_1C",
"MOVEMENT_ACTION_1D",
"MOVEMENT_ACTION_1E",
"MOVEMENT_ACTION_1F",
"MOVEMENT_ACTION_20",
"MOVEMENT_ACTION_21",
"MOVEMENT_ACTION_22",
"MOVEMENT_ACTION_23",
"MOVEMENT_ACTION_24",
"MOVEMENT_ACTION_25",
"MOVEMENT_ACTION_26",
"MOVEMENT_ACTION_27",
"MOVEMENT_ACTION_28",
"MOVEMENT_ACTION_29",
"MOVEMENT_ACTION_2A",
"MOVEMENT_ACTION_2B",
"MOVEMENT_ACTION_2C",
"MOVEMENT_ACTION_2D",
"MOVEMENT_ACTION_2E",
"MOVEMENT_ACTION_2F",
"MOVEMENT_ACTION_30",
"MOVEMENT_ACTION_31",
"MOVEMENT_ACTION_32",
"MOVEMENT_ACTION_33",
"MOVEMENT_ACTION_34",
"MOVEMENT_ACTION_35",
"MOVEMENT_ACTION_36",
"MOVEMENT_ACTION_37",
"MOVEMENT_ACTION_38",
"MOVEMENT_ACTION_39",
"MOVEMENT_ACTION_3A",
"MOVEMENT_ACTION_3B",
"MOVEMENT_ACTION_3C",
"MOVEMENT_ACTION_3D",
"MOVEMENT_ACTION_3E",
"MOVEMENT_ACTION_3F",
"MOVEMENT_ACTION_40",
"MOVEMENT_ACTION_41",
"MOVEMENT_ACTION_42",
"MOVEMENT_ACTION_43",
"MOVEMENT_ACTION_44",
"MOVEMENT_ACTION_45",
"MOVEMENT_ACTION_46",
"MOVEMENT_ACTION_47",
"MOVEMENT_ACTION_48",
"MOVEMENT_ACTION_49",
"MOVEMENT_ACTION_4A",
"MOVEMENT_ACTION_4B",
"MOVEMENT_ACTION_4C",
"MOVEMENT_ACTION_4D",
"MOVEMENT_ACTION_4E",
"MOVEMENT_ACTION_4F",
"MOVEMENT_ACTION_50",
"MOVEMENT_ACTION_51",
"MOVEMENT_ACTION_52",
"MOVEMENT_ACTION_53",
"MOVEMENT_ACTION_54",
"MOVEMENT_ACTION_55",
"MOVEMENT_ACTION_56",
"MOVEMENT_ACTION_57",
"MOVEMENT_ACTION_58",
"MOVEMENT_ACTION_59",
"MOVEMENT_ACTION_5A",
"MOVEMENT_ACTION_5B",
"MOVEMENT_ACTION_5C",
"MOVEMENT_ACTION_5D",
"MOVEMENT_ACTION_5E",
"MOVEMENT_ACTION_5F",
"MOVEMENT_ACTION_60",
"MOVEMENT_ACTION_61",
"MOVEMENT_ACTION_62",
"MOVEMENT_ACTION_63",
"MOVEMENT_ACTION_64",
"MOVEMENT_ACTION_65",
"MOVEMENT_ACTION_66",
"MOVEMENT_ACTION_67",
"MOVEMENT_ACTION_68",
"MOVEMENT_ACTION_69",
"MOVEMENT_ACTION_6A",
"MOVEMENT_ACTION_6B",
"MOVEMENT_ACTION_6C",
"MOVEMENT_ACTION_6D",
"MOVEMENT_ACTION_6E",
"MOVEMENT_ACTION_6F",
"MOVEMENT_ACTION_70",
"MOVEMENT_ACTION_71",
"MOVEMENT_ACTION_72",
"MOVEMENT_ACTION_73",
"MOVEMENT_ACTION_74",
"MOVEMENT_ACTION_75",
"MOVEMENT_ACTION_76",
"MOVEMENT_ACTION_77",
"MOVEMENT_ACTION_78",
"MOVEMENT_ACTION_79",
"MOVEMENT_ACTION_7A",
"MOVEMENT_ACTION_7B",
"MOVEMENT_ACTION_7C",
"MOVEMENT_ACTION_7D",
"MOVEMENT_ACTION_7E",
"MOVEMENT_ACTION_7F",
"MOVEMENT_ACTION_80",
"MOVEMENT_ACTION_81",
"MOVEMENT_ACTION_82",
"MOVEMENT_ACTION_83",
"MOVEMENT_ACTION_84",
"MOVEMENT_ACTION_85",
"MOVEMENT_ACTION_86",
"MOVEMENT_ACTION_87",
"MOVEMENT_ACTION_88",
"MOVEMENT_ACTION_89",
"MOVEMENT_ACTION_8A",
"MOVEMENT_ACTION_8B",
"MOVEMENT_ACTION_8C",
"MOVEMENT_ACTION_8D",
"MOVEMENT_ACTION_8E",
"MOVEMENT_ACTION_8F",
"MOVEMENT_ACTION_90",
"MOVEMENT_ACTION_91",
"MOVEMENT_ACTION_92",
"MOVEMENT_ACTION_93",
"MOVEMENT_ACTION_94",
"MOVEMENT_ACTION_95",
"MOVEMENT_ACTION_96",
"MOVEMENT_ACTION_97",
"MOVEMENT_ACTION_98",
"MOVEMENT_ACTION_99",
"MOVEMENT_ACTION_END"
"MOVEMENT_ACTION_000",
"MOVEMENT_ACTION_001",
"MOVEMENT_ACTION_002",
"MOVEMENT_ACTION_003",
"MOVEMENT_ACTION_004",
"MOVEMENT_ACTION_005",
"MOVEMENT_ACTION_006",
"MOVEMENT_ACTION_007",
"MOVEMENT_ACTION_008",
"MOVEMENT_ACTION_009",
"MOVEMENT_ACTION_010",
"MOVEMENT_ACTION_011",
"MOVEMENT_ACTION_012",
"MOVEMENT_ACTION_013",
"MOVEMENT_ACTION_014",
"MOVEMENT_ACTION_015",
"MOVEMENT_ACTION_016",
"MOVEMENT_ACTION_017",
"MOVEMENT_ACTION_018",
"MOVEMENT_ACTION_019",
"MOVEMENT_ACTION_020",
"MOVEMENT_ACTION_021",
"MOVEMENT_ACTION_022",
"MOVEMENT_ACTION_023",
"MOVEMENT_ACTION_024",
"MOVEMENT_ACTION_025",
"MOVEMENT_ACTION_026",
"MOVEMENT_ACTION_027",
"MOVEMENT_ACTION_028",
"MOVEMENT_ACTION_029",
"MOVEMENT_ACTION_030",
"MOVEMENT_ACTION_031",
"MOVEMENT_ACTION_032",
"MOVEMENT_ACTION_033",
"MOVEMENT_ACTION_034",
"MOVEMENT_ACTION_035",
"MOVEMENT_ACTION_036",
"MOVEMENT_ACTION_037",
"MOVEMENT_ACTION_038",
"MOVEMENT_ACTION_039",
"MOVEMENT_ACTION_040",
"MOVEMENT_ACTION_041",
"MOVEMENT_ACTION_042",
"MOVEMENT_ACTION_043",
"MOVEMENT_ACTION_044",
"MOVEMENT_ACTION_045",
"MOVEMENT_ACTION_046",
"MOVEMENT_ACTION_047",
"MOVEMENT_ACTION_048",
"MOVEMENT_ACTION_049",
"MOVEMENT_ACTION_050",
"MOVEMENT_ACTION_051",
"MOVEMENT_ACTION_052",
"MOVEMENT_ACTION_053",
"MOVEMENT_ACTION_054",
"MOVEMENT_ACTION_055",
"MOVEMENT_ACTION_056",
"MOVEMENT_ACTION_057",
"MOVEMENT_ACTION_058",
"MOVEMENT_ACTION_059",
"MOVEMENT_ACTION_060",
"MOVEMENT_ACTION_061",
"MOVEMENT_ACTION_062",
"MOVEMENT_ACTION_063",
"MOVEMENT_ACTION_064",
"MOVEMENT_ACTION_065",
"MOVEMENT_ACTION_066",
"MOVEMENT_ACTION_067",
"MOVEMENT_ACTION_068",
"MOVEMENT_ACTION_069",
"MOVEMENT_ACTION_070",
"MOVEMENT_ACTION_071",
"MOVEMENT_ACTION_072",
"MOVEMENT_ACTION_073",
"MOVEMENT_ACTION_074",
"MOVEMENT_ACTION_075",
"MOVEMENT_ACTION_076",
"MOVEMENT_ACTION_077",
"MOVEMENT_ACTION_078",
"MOVEMENT_ACTION_079",
"MOVEMENT_ACTION_080",
"MOVEMENT_ACTION_081",
"MOVEMENT_ACTION_082",
"MOVEMENT_ACTION_083",
"MOVEMENT_ACTION_084",
"MOVEMENT_ACTION_085",
"MOVEMENT_ACTION_086",
"MOVEMENT_ACTION_087",
"MOVEMENT_ACTION_088",
"MOVEMENT_ACTION_089",
"MOVEMENT_ACTION_090",
"MOVEMENT_ACTION_091",
"MOVEMENT_ACTION_092",
"MOVEMENT_ACTION_093",
"MOVEMENT_ACTION_094",
"MOVEMENT_ACTION_095",
"MOVEMENT_ACTION_096",
"MOVEMENT_ACTION_097",
"MOVEMENT_ACTION_098",
"MOVEMENT_ACTION_099",
"MOVEMENT_ACTION_100",
"MOVEMENT_ACTION_101",
"MOVEMENT_ACTION_102",
"MOVEMENT_ACTION_103",
"MOVEMENT_ACTION_104",
"MOVEMENT_ACTION_105",
"MOVEMENT_ACTION_106",
"MOVEMENT_ACTION_107",
"MOVEMENT_ACTION_108",
"MOVEMENT_ACTION_109",
"MOVEMENT_ACTION_110",
"MOVEMENT_ACTION_111",
"MOVEMENT_ACTION_112",
"MOVEMENT_ACTION_113",
"MOVEMENT_ACTION_114",
"MOVEMENT_ACTION_115",
"MOVEMENT_ACTION_116",
"MOVEMENT_ACTION_117",
"MOVEMENT_ACTION_118",
"MOVEMENT_ACTION_119",
"MOVEMENT_ACTION_120",
"MOVEMENT_ACTION_121",
"MOVEMENT_ACTION_122",
"MOVEMENT_ACTION_123",
"MOVEMENT_ACTION_124",
"MOVEMENT_ACTION_125",
"MOVEMENT_ACTION_126",
"MOVEMENT_ACTION_127",
"MOVEMENT_ACTION_128",
"MOVEMENT_ACTION_129",
"MOVEMENT_ACTION_130",
"MOVEMENT_ACTION_131",
"MOVEMENT_ACTION_132",
"MOVEMENT_ACTION_133",
"MOVEMENT_ACTION_134",
"MOVEMENT_ACTION_135",
"MOVEMENT_ACTION_136",
"MOVEMENT_ACTION_137",
"MOVEMENT_ACTION_138",
"MOVEMENT_ACTION_139",
"MOVEMENT_ACTION_140",
"MOVEMENT_ACTION_141",
"MOVEMENT_ACTION_142",
"MOVEMENT_ACTION_143",
"MOVEMENT_ACTION_144",
"MOVEMENT_ACTION_145",
"MOVEMENT_ACTION_146",
"MOVEMENT_ACTION_147",
"MOVEMENT_ACTION_148",
"MOVEMENT_ACTION_149",
"MOVEMENT_ACTION_150",
"MOVEMENT_ACTION_151",
"MOVEMENT_ACTION_152",
"MOVEMENT_ACTION_153",
"MAX_MOVEMENT_ACTION",
"MOVEMENT_ACTION_END",
"MOVEMENT_ACTION_NONE"
],
"overrides": {
"MOVEMENT_ACTION_END": 254
Expand Down
6 changes: 0 additions & 6 deletions include/constdata/const_020EE31C.h
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions include/constdata/const_020EE3A8.h
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions include/constdata/const_020EE4B8.h
View file
Open in desktop

This file was deleted.

10 changes: 5 additions & 5 deletions include/map_object.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,8 @@ void *sub_02062A54(MapObject *param0, int param1);
void *sub_02062A78(MapObject *param0);
void *sub_02062A7C(MapObject *param0, int param1);
void *sub_02062AA0(MapObject *param0);
void *sub_02062AA4(MapObject *param0, int param1);
void *sub_02062AC8(MapObject *param0);
void *MapObject_InitMovementData(MapObject *mapObj, int size);
void *MapObject_GetMovementData(MapObject *mapObj);
void *sub_02062ACC(MapObject *param0, int param1);
void *sub_02062AF0(MapObject *param0);
void sub_02062AF8(MapObject *param0, UnkFuncPtr_020EDF0C param1);
Expand All @@ -139,9 +139,9 @@ void sub_02062B9C(MapObject *param0, UnkFuncPtr_ov5_021FB0F0_4 param1);
void sub_02062BA4(MapObject *param0);
void MapObject_SetMovementAction(MapObject *mapObj, int movementAction);
int MapObject_GetMovementAction(const MapObject *mapObj);
void sub_02062BC0(MapObject *param0, int param1);
void sub_02062BC8(MapObject *param0);
int sub_02062BD8(const MapObject *param0);
void MapObject_SetMovementStep(MapObject *mapObj, int movementStep);
void MapObject_AdvanceMovementStep(MapObject *mapObj);
int MapObject_GetMovementStep(const MapObject *mapObj);
void sub_02062BE0(MapObject *param0, u32 param1);
u32 sub_02062BE8(const MapObject *param0);
void sub_02062BF0(MapObject *param0, u32 param1);
Expand Down
6 changes: 3 additions & 3 deletions include/map_object_move.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ int sub_0206415C(MapObject *param0, u32 param1);
int sub_0206417C(MapObject *param0, u32 param1);
int MapObject_GetDxFromDir(int param0);
int MapObject_GetDyFromDir(int param0);
void sub_020641B4(MapObject *param0, int param1);
void sub_02064208(MapObject *param0);
void MapObject_StepDir(MapObject *mapObj, int dir);
void MapObject_UpdateCoords(MapObject *mapObj);
u32 sub_02064238(MapObject *param0, int param1);
void MapObject_AddVecToPos(MapObject *param0, const VecFx32 *param1);
void MapObject_StepDirection(MapObject *param0, int param1, fx32 param2);
void MapObject_MovePosInDir(MapObject *mapObj, int dir, fx32 distance);
int sub_020642F8(MapObject *param0);
int sub_02064390(MapObject *param0);
void VecFx32_StepDirection(int param0, VecFx32 *param1, fx32 param2);
Expand Down
2 changes: 1 addition & 1 deletion include/unk_020655F4.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ int MapObject_HasAnimationEnded(SysTask *param0);
void MapObject_FinishAnimation(SysTask *param0);
int sub_02065838(int param0, int param1);
int sub_0206587C(int param0);
void sub_020658B4(MapObject *param0);
void MapObject_DoMovementAction(MapObject *param0);
int sub_020658DC(MapObject *param0);

#endif // POKEPLATINUM_UNK_020655F4_H
Loading
Loading