falso
/
mm
mirror of https://github.com/zeldaret/mm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Template Docs For Player Action (#1279) 

* generic action names

* more docs

* add comment

* more renaming

* do nothing

* another rename

* Swap Init

* simplify name

* more cleanup

* setup

* deku stick

* PR Review

* rm comment

* missed some
This commit is contained in:
engineer124 2023-07-11 09:28:25 +10:00 committed by GitHub
parent 7cbd63c33d
commit db6268a12e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 774 additions and 775 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/z64player.h
View File

@ -1072,7 +1072,7 @@ typedef enum PlayerUnkAA5 {
} PlayerUnkAA5;
typedef void (*PlayerActionFunc)(struct Player* this, struct PlayState* play);
typedef s32 (*PlayerFuncAC4)(struct Player* this, struct PlayState* play);
typedef s32 (*PlayerUpperActionFunc)(struct Player* this, struct PlayState* play);
typedef void (*PlayerFuncD58)(struct PlayState* play, struct Player* this);
@ -1198,7 +1198,7 @@ typedef struct Player {
/* 0xAB8 */ f32 unk_AB8;
/* 0xABC */ f32 unk_ABC;
/* 0xAC0 */ f32 unk_AC0;
/* 0xAC4 */ PlayerFuncAC4 unk_AC4;
/* 0xAC4 */ PlayerUpperActionFunc upperActionFunc; // Upper body/item action functions
/* 0xAC8 */ f32 unk_AC8;
/* 0xACC */ s16 unk_ACC;
/* 0xACE */ s8 unk_ACE;

1295
src/overlays/actors/ovl_player_actor/z_player.c
View File

File diff suppressed because it is too large Load Diff

248
tools/disasm/functions.txt
View File

@ -4313,16 +4313,16 @@
0x8082F0E4:("Player_SetCylinderForAttack",),
0x8082F164:("func_8082F164",),
0x8082F1AC:("func_8082F1AC",),
0x8082F43C:("func_8082F43C",),
0x8082F43C:("Player_SetUpperAction",),
0x8082F470:("func_8082F470",),
0x8082F524:("Player_ItemToItemAction",),
0x8082F594:("func_8082F594",),
0x8082F5A4:("func_8082F5A4",),
0x8082F5C0:("func_8082F5C0",),
0x8082F594:("Player_InitItemAction_DoNothing",),
0x8082F5A4:("Player_InitItemAction_DekuStick",),
0x8082F5C0:("Player_InitItemAction_2",),
0x8082F5FC:("func_8082F5FC",),
0x8082F62C:("Player_SpawnExplosive",),
0x8082F7F4:("func_8082F7F4",),
0x8082F8A0:("func_8082F8A0",),
0x8082F62C:("Player_InitItemAction_SpawnExplosive",),
0x8082F7F4:("Player_InitItemAction_SpawnHookshot",),
0x8082F8A0:("Player_InitItemAction_5",),
0x8082F8BC:("func_8082F8BC",),
0x8082F938:("Player_OverrideBlureColors",),
0x8082FA5C:("func_8082FA5C",),
@ -4360,8 +4360,8 @@
0x808313F0:("func_808313F0",),
0x80831454:("func_80831454",),
0x80831494:("Player_SetAction",),
0x8083172C:("func_8083172C",),
0x80831760:("func_80831760",),
0x8083172C:("Player_SetAction_PreserveMoveFlags",),
0x80831760:("Player_SetAction_PreserveItemAction",),
0x808317C4:("func_808317C4",),
0x80831814:("func_80831814",),
0x808318C0:("func_808318C0",),
@ -4644,94 +4644,94 @@
0x808484F0:("func_808484F0",),
0x80848570:("func_80848570",),
0x80848640:("func_80848640",),
0x80848780:("func_80848780",),
0x808487B8:("func_808487B8",),
0x80848808:("func_80848808",),
0x8084894C:("func_8084894C",),
0x80848A0C:("func_80848A0C",),
0x80848AB0:("func_80848AB0",),
0x80848B6C:("func_80848B6C",),
0x80848BF4:("func_80848BF4",),
0x80848E4C:("func_80848E4C",),
0x80849054:("func_80849054",),
0x808490B4:("func_808490B4",),
0x808491B4:("func_808491B4",),
0x8084923C:("func_8084923C",),
0x808492C4:("func_808492C4",),
0x8084933C:("func_8084933C",),
0x80849570:("func_80849570",),
0x80849620:("func_80849620",),
0x808496AC:("func_808496AC",),
0x808497A0:("func_808497A0",),
0x80849A9C:("func_80849A9C",),
0x80849DD0:("func_80849DD0",),
0x80849FE0:("func_80849FE0",),
0x8084A26C:("func_8084A26C",),
0x8084A5C0:("func_8084A5C0",),
0x8084A794:("func_8084A794",),
0x8084A884:("func_8084A884",),
0x8084A8E8:("func_8084A8E8",),
0x8084AB4C:("func_8084AB4C",),
0x8084AC84:("func_8084AC84",),
0x8084AEEC:("func_8084AEEC",),
0x8084AF9C:("func_8084AF9C",),
0x8084B0EC:("func_8084B0EC",),
0x8084B288:("func_8084B288",),
0x8084B3B8:("func_8084B3B8",),
0x8084B4A8:("func_8084B4A8",),
0x8084B5C0:("func_8084B5C0",),
0x8084BAA4:("func_8084BAA4",),
0x8084BBF0:("func_8084BBF0",),
0x8084BC64:("func_8084BC64",),
0x8084BE40:("func_8084BE40",),
0x8084BF28:("func_8084BF28",),
0x8084BFDC:("func_8084BFDC",),
0x80848780:("Player_UpperAction_0",),
0x808487B8:("Player_UpperAction_1",),
0x80848808:("Player_UpperAction_2",),
0x8084894C:("Player_UpperAction_3",),
0x80848A0C:("Player_UpperAction_4",),
0x80848AB0:("Player_UpperAction_5",),
0x80848B6C:("Player_UpperAction_6",),
0x80848BF4:("Player_UpperAction_7",),
0x80848E4C:("Player_UpperAction_8",),
0x80849054:("Player_UpperAction_9",),
0x808490B4:("Player_UpperAction_10",),
0x808491B4:("Player_UpperAction_11",),
0x8084923C:("Player_UpperAction_12",),
0x808492C4:("Player_UpperAction_13",),
0x8084933C:("Player_UpperAction_14",),
0x80849570:("Player_UpperAction_15",),
0x80849620:("Player_UpperAction_16",),
0x808496AC:("Player_Action_0",),
0x808497A0:("Player_Action_1",),
0x80849A9C:("Player_Action_2",),
0x80849DD0:("Player_Action_3",),
0x80849FE0:("Player_Action_4",),
0x8084A26C:("Player_Action_5",),
0x8084A5C0:("Player_Action_6",),
0x8084A794:("Player_Action_7",),
0x8084A884:("Player_Action_8",),
0x8084A8E8:("Player_Action_9",),
0x8084AB4C:("Player_Action_10",),
0x8084AC84:("Player_Action_11",),
0x8084AEEC:("Player_Action_12",),
0x8084AF9C:("Player_Action_13",),
0x8084B0EC:("Player_Action_14",),
0x8084B288:("Player_Action_15",),
0x8084B3B8:("Player_Action_16",),
0x8084B4A8:("Player_Action_17",),
0x8084B5C0:("Player_Action_18",),
0x8084BAA4:("Player_Action_19",),
0x8084BBF0:("Player_Action_20",),
0x8084BC64:("Player_Action_21",),
0x8084BE40:("Player_Action_22",),
0x8084BF28:("Player_Action_23",),
0x8084BFDC:("Player_Action_24",),
0x8084C124:("func_8084C124",),
0x8084C16C:("func_8084C16C",),
0x8084C6EC:("func_8084C6EC",),
0x8084C94C:("func_8084C94C",),
0x8084CA24:("func_8084CA24",),
0x8084CB58:("func_8084CB58",),
0x8084CCEC:("func_8084CCEC",),
0x8084CE84:("func_8084CE84",),
0x8084D18C:("func_8084D18C",),
0x8084D4EC:("func_8084D4EC",),
0x8084D770:("func_8084D770",),
0x8084D820:("func_8084D820",),
0x8084E034:("func_8084E034",),
0x8084E25C:("func_8084E25C",),
0x8084E334:("func_8084E334",),
0x8084E434:("func_8084E434",),
0x8084E4E4:("func_8084E4E4",),
0x8084E58C:("func_8084E58C",),
0x8084E65C:("func_8084E65C",),
0x8084E724:("func_8084E724",),
0x8084E980:("func_8084E980",),
0x8084ED9C:("func_8084ED9C",),
0x8084EE50:("func_8084EE50",),
0x8084EF9C:("func_8084EF9C",),
0x8084F1B8:("func_8084F1B8",),
0x8084F3DC:("func_8084F3DC",),
0x8084F4E8:("func_8084F4E8",),
0x8084FC0C:("func_8084FC0C",),
0x8084C16C:("Player_Action_25",),
0x8084C6EC:("Player_Action_26",),
0x8084C94C:("Player_Action_27",),
0x8084CA24:("Player_Action_28",),
0x8084CB58:("Player_Action_29",),
0x8084CCEC:("Player_Action_30",),
0x8084CE84:("Player_Action_31",),
0x8084D18C:("Player_Action_32",),
0x8084D4EC:("Player_Action_33",),
0x8084D770:("Player_Action_34",),
0x8084D820:("Player_Action_35",),
0x8084E034:("Player_Action_36",),
0x8084E25C:("Player_Action_37",),
0x8084E334:("Player_Action_38",),
0x8084E434:("Player_Action_39",),
0x8084E4E4:("Player_Action_40",),
0x8084E58C:("Player_Action_41",),
0x8084E65C:("Player_Action_42",),
0x8084E724:("Player_Action_43",),
0x8084E980:("Player_Action_44",),
0x8084ED9C:("Player_Action_45",),
0x8084EE50:("Player_Action_46",),
0x8084EF9C:("Player_Action_47",),
0x8084F1B8:("Player_Action_48",),
0x8084F3DC:("Player_Action_49",),
0x8084F4E8:("Player_Action_50",),
0x8084FC0C:("Player_Action_51",),
0x8084FD7C:("func_8084FD7C",),
0x8084FE48:("func_8084FE48",),
0x8084FE7C:("func_8084FE7C",),
0x808505D0:("func_808505D0",),
0x8084FE7C:("Player_Action_52",),
0x808505D0:("Player_Action_53",),
0x80850734:("func_80850734",),
0x80850854:("func_80850854",),
0x808508C8:("func_808508C8",),
0x80850B18:("func_80850B18",),
0x808508C8:("Player_Action_54",),
0x80850B18:("Player_Action_55",),
0x80850BA8:("func_80850BA8",),
0x80850BF8:("func_80850BF8",),
0x80850D20:("func_80850D20",),
0x80850D68:("func_80850D68",),
0x808513EC:("func_808513EC",),
0x80851588:("func_80851588",),
0x808516B4:("func_808516B4",),
0x808519FC:("func_808519FC",),
0x80851B58:("func_80851B58",),
0x80851BD4:("func_80851BD4",),
0x80850D68:("Player_Action_56",),
0x808513EC:("Player_Action_57",),
0x80851588:("Player_Action_58",),
0x808516B4:("Player_Action_59",),
0x808519FC:("Player_Action_60",),
0x80851B58:("Player_Action_61",),
0x80851BD4:("Player_Action_62",),
0x80851C40:("func_80851C40",),
0x80851D30:("func_80851D30",),
0x80851EAC:("func_80851EAC",),
@ -4741,58 +4741,58 @@
0x80852290:("func_80852290",),
0x8085255C:("func_8085255C",),
0x808525C4:("func_808525C4",),
0x8085269C:("func_8085269C",),
0x80852B28:("func_80852B28",),
0x80852C04:("func_80852C04",),
0x80852FD4:("func_80852FD4",),
0x8085269C:("Player_Action_63",),
0x80852B28:("Player_Action_64",),
0x80852C04:("Player_Action_65",),
0x80852FD4:("Player_Action_66",),
0x808530E0:("func_808530E0",),
0x80853194:("func_80853194",),
0x808534C0:("func_808534C0",),
0x80853754:("func_80853754",),
0x80853850:("func_80853850",),
0x80853A5C:("func_80853A5C",),
0x80853CC0:("func_80853CC0",),
0x80853D68:("func_80853D68",),
0x80854010:("func_80854010",),
0x808540A0:("func_808540A0",),
0x80854118:("func_80854118",),
0x8085421C:("func_8085421C",),
0x8085437C:("func_8085437C",),
0x8085439C:("func_8085439C",),
0x80854430:("func_80854430",),
0x80854614:("func_80854614",),
0x808546D0:("func_808546D0",),
0x80854800:("func_80854800",),
0x808548B8:("func_808548B8",),
0x80854C70:("func_80854C70",),
0x80853194:("Player_Action_67",),
0x808534C0:("Player_Action_68",),
0x80853754:("Player_Action_69",),
0x80853850:("Player_Action_70",),
0x80853A5C:("Player_Action_71",),
0x80853CC0:("Player_Action_72",),
0x80853D68:("Player_Action_73",),
0x80854010:("Player_Action_74",),
0x808540A0:("Player_Action_75",),
0x80854118:("Player_Action_76",),
0x8085421C:("Player_Action_77",),
0x8085437C:("Player_Action_78",),
0x8085439C:("Player_Action_79",),
0x80854430:("Player_Action_80",),
0x80854614:("Player_Action_81",),
0x808546D0:("Player_Action_82",),
0x80854800:("Player_Action_83",),
0x808548B8:("Player_Action_84",),
0x80854C70:("Player_Action_85",),
0x80854CD0:("func_80854CD0",),
0x80854EFC:("func_80854EFC",),
0x808550D0:("func_808550D0",),
0x80855218:("func_80855218",),
0x808553F4:("func_808553F4",),
0x80855818:("func_80855818",),
0x80855A7C:("func_80855A7C",),
0x80855AF4:("func_80855AF4",),
0x80855B9C:("func_80855B9C",),
0x80855C28:("func_80855C28",),
0x80855E08:("func_80855E08",),
0x808553F4:("Player_Action_86",),
0x80855818:("Player_Action_87",),
0x80855A7C:("Player_Action_88",),
0x80855AF4:("Player_Action_89",),
0x80855B9C:("Player_Action_90",),
0x80855C28:("Player_Action_91",),
0x80855E08:("Player_Action_92",),
0x80855F9C:("func_80855F9C",),
0x80856000:("func_80856000",),
0x80856074:("func_80856074",),
0x80856110:("func_80856110",),
0x808561B0:("func_808561B0",),
0x808561B0:("Player_Action_93",),
0x808566C0:("func_808566C0",),
0x8085687C:("func_8085687C",),
0x80856888:("func_80856888",),
0x80856918:("func_80856918",),
0x808573A4:("func_808573A4",),
0x80856918:("Player_Action_94",),
0x808573A4:("Player_Action_95",),
0x80857640:("func_80857640",),
0x808576BC:("func_808576BC",),
0x808577E0:("func_808577E0",),
0x80857950:("func_80857950",),
0x80857A44:("func_80857A44",),
0x80857AEC:("func_80857AEC",),
0x80857BE8:("func_80857BE8",),
0x80857BE8:("Player_Action_96",),
0x80858C84:("func_80858C84",),
0x80858CC8:("func_80858CC8",),
0x80858D48:("func_80858D48",),
@ -4874,7 +4874,7 @@
0x8085AC9C:("func_8085AC9C",),
0x8085AD5C:("func_8085AD5C",),
0x8085ADA0:("Player_CsAction_48",),
0x8085B08C:("func_8085B08C",),
0x8085B08C:("Player_Action_97",),
0x8085B134:("Player_StartFishing",),
0x8085B170:("func_8085B170",),
0x8085B1F0:("Player_GrabPlayer",),

2
tools/disasm/variables.txt
View File

@ -4947,7 +4947,7 @@
0x8085C98C:("sZoraBarrierEnvLighting","UNK_TYPE1","",0x1),
0x8085C99C:("sItemActionParams","UNK_TYPE1","",0x1),
0x8085C9F0:("D_8085C9F0","UNK_PTR","",0x4),
0x8085CB3C:("D_8085CB3C","UNK_PTR","",0x4),
0x8085CB3C:("sPlayerInitItemActionFuncs","UNK_PTR","",0x4),
0x8085CC88:("D_8085CC88","UNK_TYPE1","",0x1),
0x8085CD00:("D_8085CD00","s8","[36]",0x24),
0x8085CD24:("sPlayerExplosiveInfo","UNK_TYPE1","",0x1),