izzy/2ship2harkinian-Android
0
0
Fork 0
mirror of https://github.com/izzy2lost/2ship2harkinian-Android.git synced 2026-06-19 01:20:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Setup for Player Cutscene Docs (#1270)

Browse Source 
* player cs docs setup

* more docs

* more docs

* missed enums

* more docs, but broken. Need to fix sPlayerCsModeAnimFuncs

* fix

* rm enum

* more minor docs

* PR suggestion

* typo

* csActionFunc

* PR Suggestion

* fix bss

* fix bss
This commit is contained in:
engineer124
2023-06-25 08:33:22 -04:00
committed by GitHub
parent 21655f31c5
commit 541199888c
15 changed files with 907 additions and 789 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/z64player.h
+103 -4
View File
@@ -600,7 +600,7 @@ typedef struct struct_80122744_arg1 {
} struct_80122744_arg1; // size = 0x8
typedef enum PlayerCsMode {
/* 0x00 */ PLAYER_CSMODE_0,
/* 0x00 */ PLAYER_CSMODE_NONE,
/* 0x01 */ PLAYER_CSMODE_1,
/* 0x02 */ PLAYER_CSMODE_2,
/* 0x03 */ PLAYER_CSMODE_3,
@@ -743,6 +743,102 @@ typedef enum PlayerCsMode {
/* 0x8C */ PLAYER_CSMODE_MAX
} PlayerCsMode;
typedef enum PlayerCueId {
/* 0x00 */ PLAYER_CUEID_NONE,
/* 0x01 */ PLAYER_CUEID_1,
/* 0x02 */ PLAYER_CUEID_2,
/* 0x03 */ PLAYER_CUEID_3,
/* 0x04 */ PLAYER_CUEID_4,
/* 0x05 */ PLAYER_CUEID_5,
/* 0x06 */ PLAYER_CUEID_6,
/* 0x07 */ PLAYER_CUEID_7,
/* 0x08 */ PLAYER_CUEID_8,
/* 0x09 */ PLAYER_CUEID_9,
/* 0x0A */ PLAYER_CUEID_10,
/* 0x0B */ PLAYER_CUEID_11,
/* 0x0C */ PLAYER_CUEID_12,
/* 0x0D */ PLAYER_CUEID_13,
/* 0x0E */ PLAYER_CUEID_14,
/* 0x0F */ PLAYER_CUEID_15,
/* 0x10 */ PLAYER_CUEID_16,
/* 0x11 */ PLAYER_CUEID_17,
/* 0x12 */ PLAYER_CUEID_18,
/* 0x13 */ PLAYER_CUEID_19,
/* 0x14 */ PLAYER_CUEID_20,
/* 0x15 */ PLAYER_CUEID_21,
/* 0x16 */ PLAYER_CUEID_22,
/* 0x17 */ PLAYER_CUEID_23,
/* 0x18 */ PLAYER_CUEID_24,
/* 0x19 */ PLAYER_CUEID_25,
/* 0x1A */ PLAYER_CUEID_26,
/* 0x1B */ PLAYER_CUEID_27,
/* 0x1C */ PLAYER_CUEID_28,
/* 0x1D */ PLAYER_CUEID_29,
/* 0x1E */ PLAYER_CUEID_30,
/* 0x1F */ PLAYER_CUEID_31,
/* 0x20 */ PLAYER_CUEID_32,
/* 0x21 */ PLAYER_CUEID_33,
/* 0x22 */ PLAYER_CUEID_34,
/* 0x23 */ PLAYER_CUEID_35,
/* 0x24 */ PLAYER_CUEID_36,
/* 0x25 */ PLAYER_CUEID_37,
/* 0x26 */ PLAYER_CUEID_38,
/* 0x27 */ PLAYER_CUEID_39,
/* 0x28 */ PLAYER_CUEID_40,
/* 0x29 */ PLAYER_CUEID_41,
/* 0x2A */ PLAYER_CUEID_42,
/* 0x2B */ PLAYER_CUEID_43,
/* 0x2C */ PLAYER_CUEID_44,
/* 0x2D */ PLAYER_CUEID_45,
/* 0x2E */ PLAYER_CUEID_46,
/* 0x2F */ PLAYER_CUEID_47,
/* 0x30 */ PLAYER_CUEID_48,
/* 0x31 */ PLAYER_CUEID_49,
/* 0x32 */ PLAYER_CUEID_50,
/* 0x33 */ PLAYER_CUEID_51,
/* 0x34 */ PLAYER_CUEID_52,
/* 0x35 */ PLAYER_CUEID_53,
/* 0x36 */ PLAYER_CUEID_54,
/* 0x37 */ PLAYER_CUEID_55,
/* 0x38 */ PLAYER_CUEID_56,
/* 0x39 */ PLAYER_CUEID_57,
/* 0x3A */ PLAYER_CUEID_58,
/* 0x3B */ PLAYER_CUEID_59,
/* 0x3C */ PLAYER_CUEID_60,
/* 0x3D */ PLAYER_CUEID_61,
/* 0x3E */ PLAYER_CUEID_62,
/* 0x3F */ PLAYER_CUEID_63,
/* 0x40 */ PLAYER_CUEID_64,
/* 0x41 */ PLAYER_CUEID_65,
/* 0x42 */ PLAYER_CUEID_66,
/* 0x43 */ PLAYER_CUEID_67,
/* 0x44 */ PLAYER_CUEID_68,
/* 0x45 */ PLAYER_CUEID_69,
/* 0x46 */ PLAYER_CUEID_70,
/* 0x47 */ PLAYER_CUEID_71,
/* 0x48 */ PLAYER_CUEID_72,
/* 0x49 */ PLAYER_CUEID_73,
/* 0x4A */ PLAYER_CUEID_74,
/* 0x4B */ PLAYER_CUEID_75,
/* 0x4C */ PLAYER_CUEID_76,
/* 0x4D */ PLAYER_CUEID_77,
/* 0x4E */ PLAYER_CUEID_78,
/* 0x4F */ PLAYER_CUEID_79,
/* 0x50 */ PLAYER_CUEID_80,
/* 0x51 */ PLAYER_CUEID_81,
/* 0x52 */ PLAYER_CUEID_82,
/* 0x53 */ PLAYER_CUEID_83,
/* 0x54 */ PLAYER_CUEID_84,
/* 0x55 */ PLAYER_CUEID_85,
/* 0x56 */ PLAYER_CUEID_86,
/* 0x57 */ PLAYER_CUEID_87,
/* 0x58 */ PLAYER_CUEID_88,
/* 0x59 */ PLAYER_CUEID_89,
/* 0x5A */ PLAYER_CUEID_90,
/* 0x5B */ PLAYER_CUEID_91,
/* 0x5C */ PLAYER_CUEID_MAX
} PlayerCueId;
//
#define PLAYER_STATE1_1 (1 << 0)
@@ -1040,14 +1136,17 @@ typedef struct Player {
/* 0x390 */ Actor* rideActor;
/* 0x394 */ u8 csMode; // PlayerCsMode enum
/* 0x395 */ u8 prevCsMode; // PlayerCsMode enum
/* 0x396 */ u8 unk_396; // currentActorActionId?
/* 0x396 */ u8 cueId; // PlayerCueId enum
/* 0x397 */ u8 unk_397; // PlayerDoorType enum
/* 0x398 */ Actor* unk_398; // csActor?
/* 0x398 */ Actor* csActor;
/* 0x39C */ UNK_TYPE1 unk_39C[0x4];
/* 0x3A0 */ Vec3f unk_3A0;
/* 0x3AC */ Vec3f unk_3AC;
/* 0x3B8 */ u16 unk_3B8;
/* 0x3BA */ s16 doorBgCamIndex;
/* 0x3BA */ union {
s16 doorBgCamIndex;
s16 unk_3BA; // When in a cutscene, boolean to determine if `PLAYER_STATE1_20000000` is set
};
/* 0x3BC */ s16 subCamId;
/* 0x3BE */ char unk_3BE[2];
/* 0x3C0 */ Vec3f unk_3C0;
src/code/z_actor.c
+7 -5
View File
@@ -1370,7 +1370,8 @@ void Actor_MountHorse(PlayState* play, Player* player, Actor* horse) {
}
s32 func_800B7200(Player* player) {
return (player->stateFlags1 & (PLAYER_STATE1_80 | PLAYER_STATE1_20000000)) || (player->csMode != PLAYER_CSMODE_0);
return (player->stateFlags1 & (PLAYER_STATE1_80 | PLAYER_STATE1_20000000)) ||
(player->csMode != PLAYER_CSMODE_NONE);
}
void Actor_SpawnHorse(PlayState* play, Player* player) {
@@ -1380,13 +1381,14 @@ void Actor_SpawnHorse(PlayState* play, Player* player) {
s32 func_800B724C(PlayState* play, Actor* actor, u8 csMode) {
Player* player = GET_PLAYER(play);
if ((player->csMode == PLAYER_CSMODE_5) || ((csMode == PLAYER_CSMODE_END) && (player->csMode == PLAYER_CSMODE_0))) {
if ((player->csMode == PLAYER_CSMODE_5) ||
((csMode == PLAYER_CSMODE_END) && (player->csMode == PLAYER_CSMODE_NONE))) {
return false;
}
player->csMode = csMode;
player->unk_398 = actor;
player->doorBgCamIndex = 0;
player->csActor = actor;
player->unk_3BA = false;
return true;
}
@@ -1394,7 +1396,7 @@ s32 func_800B7298(PlayState* play, Actor* actor, u8 csMode) {
Player* player = GET_PLAYER(play);
if (func_800B724C(play, actor, csMode)) {
player->doorBgCamIndex = 1;
player->unk_3BA = true;
return true;
}
return false;
src/code/z_demo.c
+1 -1
View File
@@ -43,7 +43,7 @@ void Cutscene_InitContext(PlayState* play, CutsceneContext* csCtx) {
sCueTypeList[i] = 0;
}
gDisablePlayerCsModeStartPos = 0;
gDisablePlayerCsModeStartPos = false;
Audio_SetCutsceneFlag(false);
}
src/code/z_eventmgr.c
+3 -3
View File
@@ -204,7 +204,7 @@ void CutsceneManager_End(void) {
sCutsceneMgr.targetActor->flags &= ~ACTOR_FLAG_100000;
// fallthrough
case CS_START_1:
func_800B7298(sCutsceneMgr.play, 0, PLAYER_CSMODE_END);
func_800B7298(sCutsceneMgr.play, NULL, PLAYER_CSMODE_END);
sCutsceneMgr.startMethod = CS_START_0;
break;
@@ -335,7 +335,7 @@ s16 CutsceneManager_StartWithPlayerCs(s16 csId, Actor* actor) {
s16 startCsId = CutsceneManager_Start(csId, actor);
if (startCsId >= 0) {
func_800B7298(sCutsceneMgr.play, 0, PLAYER_CSMODE_WAIT);
func_800B7298(sCutsceneMgr.play, NULL, PLAYER_CSMODE_WAIT);
if (sCutsceneMgr.length == 0) {
CutsceneManager_Stop(sCutsceneMgr.csId);
}
@@ -351,7 +351,7 @@ s16 CutsceneManager_StartWithPlayerCsAndSetFlag(s16 csId, Actor* actor) {
s16 startCsId = CutsceneManager_Start(csId, actor);
if (startCsId >= 0) {
func_800B7298(sCutsceneMgr.play, 0, PLAYER_CSMODE_WAIT);
func_800B7298(sCutsceneMgr.play, NULL, PLAYER_CSMODE_WAIT);
if (sCutsceneMgr.length == 0) {
CutsceneManager_Stop(sCutsceneMgr.csId);
}
src/code/z_player_lib.c
+1 -1
View File
@@ -495,7 +495,7 @@ void func_80123140(PlayState* play, Player* player) {
s32 Player_InBlockingCsMode(PlayState* play, Player* player) {
return (player->stateFlags1 & (PLAYER_STATE1_80 | PLAYER_STATE1_200 | PLAYER_STATE1_20000000)) ||
(player->csMode != PLAYER_CSMODE_0) || (play->transitionTrigger == TRANS_TRIGGER_START) ||
(player->csMode != PLAYER_CSMODE_NONE) || (play->transitionTrigger == TRANS_TRIGGER_START) ||
(play->transitionMode != TRANS_MODE_OFF) || (player->stateFlags1 & PLAYER_STATE1_1) ||
(player->stateFlags3 & PLAYER_STATE3_80) || (play->actorCtx.unk268 != 0);
}
src/overlays/actors/ovl_Boss_03/z_boss_03.c
+5 -5
View File
@@ -688,7 +688,7 @@ void Boss03_ChasePlayer(Boss03* this, PlayState* play) {
if (&this->actor == player->actor.parent) {
player->unk_AE8 = 101;
player->actor.parent = NULL;
player->csMode = PLAYER_CSMODE_0;
player->csMode = PLAYER_CSMODE_NONE;
}
func_809E344C(this, play);
@@ -784,7 +784,7 @@ void Boss03_CatchPlayer(Boss03* this, PlayState* play) {
if (&this->actor == player->actor.parent) {
player->unk_AE8 = 101;
player->actor.parent = NULL;
player->csMode = PLAYER_CSMODE_0;
player->csMode = PLAYER_CSMODE_NONE;
Play_DisableMotionBlur();
}
@@ -912,7 +912,7 @@ void Boss03_ChewPlayer(Boss03* this, PlayState* play) {
if (&this->actor == player->actor.parent) {
player->unk_AE8 = 101;
player->actor.parent = NULL;
player->csMode = PLAYER_CSMODE_0;
player->csMode = PLAYER_CSMODE_NONE;
Play_DisableMotionBlur();
func_800B8D50(play, NULL, 10.0f, this->actor.shape.rot.y, 0.0f, 0x20);
}
@@ -1754,7 +1754,7 @@ void Boss03_SetupStunned(Boss03* this, PlayState* play) {
if (&this->actor == player->actor.parent) {
player->unk_AE8 = 101;
player->actor.parent = NULL;
player->csMode = PLAYER_CSMODE_0;
player->csMode = PLAYER_CSMODE_NONE;
Play_DisableMotionBlur();
}
@@ -1906,7 +1906,7 @@ void Boss03_UpdateCollision(Boss03* this, PlayState* play) {
if (&this->actor == player->actor.parent) {
player->unk_AE8 = 101;
player->actor.parent = NULL;
player->csMode = PLAYER_CSMODE_0;
player->csMode = PLAYER_CSMODE_NONE;
Play_DisableMotionBlur();
}
src/overlays/actors/ovl_Dm_Tag/z_dm_tag.c
+2 -2
View File
@@ -154,7 +154,7 @@ s32 func_80C224D8(DmTag* this, PlayState* play) {
break;
case 6:
func_800B7298(play, &this->actor, 7);
func_800B7298(play, &this->actor, PLAYER_CSMODE_WAIT);
play->nextEntrance = ENTRANCE(STOCK_POT_INN, 5);
gSaveContext.nextCutsceneIndex = 0;
play->transitionTrigger = TRANS_TRIGGER_START;
@@ -168,7 +168,7 @@ s32 func_80C224D8(DmTag* this, PlayState* play) {
s32 func_80C227E8(DmTag* this, PlayState* play) {
if (this->unk_1A4 == 0) {
func_800B7298(play, &this->actor, 7);
func_800B7298(play, &this->actor, PLAYER_CSMODE_WAIT);
play->nextEntrance = ENTRANCE(STOCK_POT_INN, 4);
gSaveContext.nextCutsceneIndex = 0;
play->transitionTrigger = TRANS_TRIGGER_START;
src/overlays/actors/ovl_En_Ge2/z_en_ge2.c
+3 -3
View File
@@ -478,7 +478,7 @@ void EnGe2_PatrolDuties(EnGe2* this, PlayState* play) {
Player* player = GET_PLAYER(play);
f32 visionRange = gSaveContext.save.isNight ? 200.0f : 280.0f;
if (player->csMode == 0x1A) {
if (player->csMode == PLAYER_CSMODE_26) {
this->picto.actor.speed = 0.0f;
this->actionFunc = EnGe2_SetupCharge;
Animation_Change(&this->skelAnime, &gGerudoPurpleLookingAboutAnim, 1.0f, 0.0f,
@@ -493,7 +493,7 @@ void EnGe2_PatrolDuties(EnGe2* this, PlayState* play) {
this->picto.actor.shape.rot.y, 0x1800, visionRange, this->verticalDetectRange)) {
if ((GERUDO_PURPLE_GET_EXIT(&this->picto.actor) != GERUDO_PURPLE_EXIT_NONE) && !Play_InCsMode(play)) {
this->picto.actor.speed = 0.0f;
func_800B7298(play, &this->picto.actor, 0x1A);
func_800B7298(play, &this->picto.actor, PLAYER_CSMODE_26);
Lib_PlaySfx(NA_SE_SY_FOUND);
Message_StartTextbox(play, 0x1194, &this->picto.actor);
this->actionFunc = EnGe2_SetupCharge;
@@ -678,7 +678,7 @@ void EnGe2_GuardStationary(EnGe2* this, PlayState* play) {
if (EnGe2_LookForPlayer(play, &this->picto.actor, &this->picto.actor.focus.pos, this->picto.actor.shape.rot.y,
0x4000, 720.0f, this->verticalDetectRange)) {
if ((GERUDO_PURPLE_GET_EXIT(&this->picto.actor) != GERUDO_PURPLE_EXIT_NONE) && !Play_InCsMode(play)) {
func_800B7298(play, &this->picto.actor, 0x1A);
func_800B7298(play, &this->picto.actor, PLAYER_CSMODE_26);
Lib_PlaySfx(NA_SE_SY_FOUND);
Message_StartTextbox(play, 0x1194, &this->picto.actor);
this->timer = 50;
src/overlays/actors/ovl_En_Horse/z_en_horse.c
+1 -1
View File
@@ -663,7 +663,7 @@ s32 EnHorse_PlayerCanMove(EnHorse* this, PlayState* play) {
(((this->stateFlags & ENHORSE_FLAG_19) || (this->stateFlags & ENHORSE_FLAG_29)) && !this->inRace) ||
(this->action == ENHORSE_ACTION_HBA) || (player->actor.flags & ACTOR_FLAG_TALK_REQUESTED) ||
(play->csCtx.state != CS_STATE_IDLE) || (CutsceneManager_GetCurrentCsId() != CS_ID_NONE) ||
(player->stateFlags1 & PLAYER_STATE1_20) || (player->csMode != PLAYER_CSMODE_0)) {
(player->stateFlags1 & PLAYER_STATE1_20) || (player->csMode != PLAYER_CSMODE_NONE)) {
return false;
}
return true;
src/overlays/actors/ovl_En_Kaizoku/z_en_kaizoku.c
+8 -8
View File
@@ -480,7 +480,7 @@ void func_80B85FA8(EnKaizoku* this, PlayState* play) {
}
CutsceneManager_StartWithPlayerCs(this->csId, &this->picto.actor);
func_800B7298(play, &this->picto.actor, 0x15);
func_800B7298(play, &this->picto.actor, PLAYER_CSMODE_21);
this->subCamId = CutsceneManager_GetCurrentSubCamId(this->picto.actor.csId);
this->picto.actor.shape.rot.y = this->picto.actor.world.rot.y = this->picto.actor.yawTowardsPlayer;
@@ -537,7 +537,7 @@ void func_80B85FA8(EnKaizoku* this, PlayState* play) {
this->unk_2D8 = 0;
this->picto.actor.world.pos.y = this->picto.actor.floorHeight;
this->picto.actor.velocity.y = 0.0f;
func_800B7298(play, &this->picto.actor, 4);
func_800B7298(play, &this->picto.actor, PLAYER_CSMODE_4);
Actor_SpawnFloorDustRing(play, &this->picto.actor, &this->leftFootPos, 3.0f, 2, 2.0f, 0, 0, 0);
Actor_SpawnFloorDustRing(play, &this->picto.actor, &this->rightFootPos, 3.0f, 2, 2.0f, 0, 0, 0);
Actor_PlaySfx(&this->picto.actor, NA_SE_EN_PIRATE_ONGND);
@@ -608,7 +608,7 @@ void func_80B85FA8(EnKaizoku* this, PlayState* play) {
case 7:
if (this->unk_598 == 0) {
func_800B7298(play, &this->picto.actor, 6);
func_800B7298(play, &this->picto.actor, PLAYER_CSMODE_END);
CutsceneManager_Stop(this->csId);
this->unk_59C = 0;
this->subCamId = SUB_CAM_ID_DONE;
@@ -673,7 +673,7 @@ void func_80B86804(EnKaizoku* this, PlayState* play) {
CutsceneManager_StartWithPlayerCs(this->csId, &this->picto.actor);
}
func_800B7298(play, &this->picto.actor, 0x60);
func_800B7298(play, &this->picto.actor, PLAYER_CSMODE_96);
this->subCamId = CutsceneManager_GetCurrentSubCamId(this->picto.actor.csId);
this->unk_2B2 = 30;
this->picto.actor.flags &= ~ACTOR_FLAG_1;
@@ -723,7 +723,7 @@ void func_80B868B8(EnKaizoku* this, PlayState* play) {
case 2:
if ((Message_GetState(&play->msgCtx) == TEXT_STATE_5) && Message_ShouldAdvance(play)) {
Message_CloseTextbox(play);
func_800B7298(play, &this->picto.actor, 6);
func_800B7298(play, &this->picto.actor, PLAYER_CSMODE_END);
CutsceneManager_Stop(this->csId);
this->subCamId = SUB_CAM_ID_DONE;
play->nextEntrance = play->setupExitList[this->exitIndex];
@@ -798,7 +798,7 @@ void func_80B86B74(EnKaizoku* this, PlayState* play) {
if ((Message_GetState(&play->msgCtx) == TEXT_STATE_5) && Message_ShouldAdvance(play)) {
Message_CloseTextbox(play);
EnKaizoku_ChangeAnim(this, EN_KAIZOKU_ANIM_18);
func_800B7298(play, &this->picto.actor, 0x85);
func_800B7298(play, &this->picto.actor, PLAYER_CSMODE_133);
this->unk_5A0 = 0;
this->unk_598 = 0;
this->unk_59C++;
@@ -864,7 +864,7 @@ void func_80B86B74(EnKaizoku* this, PlayState* play) {
play->envCtx.fillScreen = false;
this->unk_59C = 0;
this->subCamId = SUB_CAM_ID_DONE;
func_800B7298(play, &this->picto.actor, 6);
func_800B7298(play, &this->picto.actor, PLAYER_CSMODE_END);
CutsceneManager_Stop(this->csId);
if (this->switchFlag >= 0) {
Flags_SetSwitch(play, this->switchFlag);
@@ -1684,7 +1684,7 @@ void func_80B8960C(EnKaizoku* this, PlayState* play) {
}
this->picto.actor.speed = 0.0f;
this->unk_2D8 = 1;
func_800B7298(play, &this->picto.actor, 0x7B);
func_800B7298(play, &this->picto.actor, PLAYER_CSMODE_123);
Enemy_StartFinishingBlow(play, &this->picto.actor);
Actor_PlaySfx(&this->picto.actor, NA_SE_EN_PIRATE_DEAD);
this->picto.actor.flags |= ACTOR_FLAG_CANT_LOCK_ON;
src/overlays/actors/ovl_En_Test3/z_en_test3.c
+2 -2
View File
@@ -527,7 +527,7 @@ void func_80A3F0B0(EnTest3* this, PlayState* play) {
}
void func_80A3F114(EnTest3* this, PlayState* play) {
if (this->player.csMode != PLAYER_CSMODE_0) {
if (this->player.csMode != PLAYER_CSMODE_NONE) {
play->startPlayerCutscene(play, &this->player, PLAYER_CSMODE_END);
}
}
@@ -1065,7 +1065,7 @@ void EnTest3_Update(Actor* thisx, PlayState* play2) {
play->actorCtx.flags &= ~ACTORCTX_FLAG_4;
} else if (this->player.actor.category == ACTORCAT_PLAYER) {
func_80A409D4(this, play);
} else if (play->startPlayerCutscene(play, &this->player, PLAYER_CSMODE_0)) {
} else if (play->startPlayerCutscene(play, &this->player, PLAYER_CSMODE_NONE)) {
if (this->unk_D88 >= 7) {
Vec3f worldPos;
src/overlays/actors/ovl_En_Zod/z_en_zod.c
+1 -1
View File
@@ -480,7 +480,7 @@ void func_80BAFDB4(EnZod* this, PlayState* play) {
EnZod_UpdateAnimation(this);
if (CutsceneManager_IsNext(this->actor.csId)) {
CutsceneManager_Start(this->actor.csId, &this->actor);
func_800B7298(play, NULL, 0x44);
func_800B7298(play, NULL, PLAYER_CSMODE_68);
Message_StartTextbox(play, 0x103A, &this->actor);
this->actionFunc = EnZod_SetupRehearse;
} else {
src/overlays/actors/ovl_player_actor/z_player.c
+698 -681
View File
File diff suppressed because it is too large Load Diff
tools/disasm/functions.txt
+68 -68
View File
@@ -4796,84 +4796,84 @@
0x80858C84:("func_80858C84",),
0x80858CC8:("func_80858CC8",),
0x80858D48:("func_80858D48",),
0x80858DB4:("func_80858DB4",),
0x80858DDC:("func_80858DDC",),
0x80858DFC:("func_80858DFC",),
0x80858E40:("func_80858E40",),
0x80858E60:("func_80858E60",),
0x80858E80:("func_80858E80",),
0x80858EA0:("func_80858EA0",),
0x80858EC0:("func_80858EC0",),
0x80858EFC:("func_80858EFC",),
0x80858F1C:("func_80858F1C",),
0x80858F3C:("func_80858F3C",),
0x80858F5C:("func_80858F5C",),
0x80858F7C:("func_80858F7C",),
0x80858F9C:("func_80858F9C",),
0x80858FBC:("func_80858FBC",),
0x80858DB4:("Player_CsAnim_1",),
0x80858DDC:("Player_CsAnim_2",),
0x80858DFC:("Player_CsAnim_14",),
0x80858E40:("Player_CsAnim_3",),
0x80858E60:("Player_CsAnim_4",),
0x80858E80:("Player_CsAnim_5",),
0x80858EA0:("Player_CsAnim_6",),
0x80858EC0:("Player_CsAnim_19",),
0x80858EFC:("Player_CsAnim_7",),
0x80858F1C:("Player_CsAnim_8",),
0x80858F3C:("Player_CsAnim_9",),
0x80858F5C:("Player_CsAnim_10",),
0x80858F7C:("Player_CsAnim_15",),
0x80858F9C:("Player_CsAnim_16",),
0x80858FBC:("Player_CsAnim_11",),
0x80858FE8:("func_80858FE8",),
0x80859028:("func_80859028",),
0x80859168:("func_80859168",),
0x808591BC:("func_808591BC",),
0x80859210:("func_80859210",),
0x80859028:("Player_CsAnim_12",),
0x80859168:("Player_CsAnim_17",),
0x808591BC:("Player_CsAnim_13",),
0x80859210:("Player_CsAnim_18",),
0x80859248:("func_80859248",),
0x8085929C:("func_8085929C",),
0x80859300:("func_80859300",),
0x80859414:("func_80859414",),
0x808594D0:("func_808594D0",),
0x808595B8:("func_808595B8",),
0x8085968C:("func_8085968C",),
0x80859708:("func_80859708",),
0x8085978C:("func_8085978C",),
0x80859890:("func_80859890",),
0x80859990:("func_80859990",),
0x808599DC:("func_808599DC",),
0x80859A10:("func_80859A10",),
0x80859A44:("func_80859A44",),
0x80859AD0:("func_80859AD0",),
0x80859AF8:("func_80859AF8",),
0x80859B28:("func_80859B28",),
0x80859B54:("func_80859B54",),
0x80859414:("Player_CsAction_0",),
0x808594D0:("Player_CsAction_1",),
0x808595B8:("Player_CsAction_2",),
0x8085968C:("Player_CsAction_3",),
0x80859708:("Player_CsAction_4",),
0x8085978C:("Player_CsAction_5",),
0x80859890:("Player_CsAction_6",),
0x80859990:("Player_CsAction_7",),
0x808599DC:("Player_CsAction_8",),
0x80859A10:("Player_CsAction_9",),
0x80859A44:("Player_CsAction_10",),
0x80859AD0:("Player_CsAction_11",),
0x80859AF8:("Player_CsAction_12",),
0x80859B28:("Player_CsAction_13",),
0x80859B54:("Player_CsAction_14",),
0x80859BA8:("Player_Cutscene_Translate",),
0x80859C60:("func_80859C60",),
0x80859CA0:("func_80859CA0",),
0x80859C60:("Player_CsAction_15",),
0x80859CA0:("Player_CsAction_16",),
0x80859CE0:("func_80859CE0",),
0x80859CFC:("func_80859CFC",),
0x80859D44:("func_80859D44",),
0x80859D70:("func_80859D70",),
0x80859EBC:("func_80859EBC",),
0x80859F4C:("func_80859F4C",),
0x80859FCC:("func_80859FCC",),
0x80859FF4:("func_80859FF4",),
0x8085A04C:("Player_Cutscene_TranslateReverse",),
0x8085A120:("func_8085A120",),
0x8085A144:("func_8085A144",),
0x8085A19C:("func_8085A19C",),
0x8085A1D4:("func_8085A1D4",),
0x8085A24C:("func_8085A24C",),
0x8085A2AC:("func_8085A2AC",),
0x8085A330:("func_8085A330",),
0x8085A364:("func_8085A364",),
0x8085A40C:("func_8085A40C",),
0x8085A4A4:("func_8085A4A4",),
0x8085A530:("func_8085A530",),
0x8085A5DC:("func_8085A5DC",),
0x8085A66C:("func_8085A66C",),
0x8085A6C0:("func_8085A6C0",),
0x8085A710:("func_8085A710",),
0x8085A768:("func_8085A768",),
0x8085A7C0:("func_8085A7C0",),
0x8085A8C4:("func_8085A8C4",),
0x8085A940:("func_8085A940",),
0x8085AA10:("func_8085AA10",),
0x8085AA60:("func_8085AA60",),
0x8085AA84:("func_8085AA84",),
0x8085AACC:("func_8085AACC",),
0x80859CFC:("Player_CsAction_17",),
0x80859D44:("Player_CsAction_18",),
0x80859D70:("Player_CsAction_19",),
0x80859EBC:("Player_CsAction_20",),
0x80859F4C:("Player_CsAction_21",),
0x80859FCC:("Player_CsAction_22",),
0x80859FF4:("Player_CsAction_23",),
0x8085A04C:("Player_CsAction_TranslateReverse",),
0x8085A120:("Player_CsAction_25",),
0x8085A144:("Player_CsAction_26",),
0x8085A19C:("Player_CsAction_27",),
0x8085A1D4:("Player_CsAction_28",),
0x8085A24C:("Player_CsAction_29",),
0x8085A2AC:("Player_CsAction_30",),
0x8085A330:("Player_CsAction_31",),
0x8085A364:("Player_CsAction_32",),
0x8085A40C:("Player_CsAction_33",),
0x8085A4A4:("Player_CsAction_34",),
0x8085A530:("Player_CsAction_35",),
0x8085A5DC:("Player_CsAction_36",),
0x8085A66C:("Player_CsAction_37",),
0x8085A6C0:("Player_CsAction_38",),
0x8085A710:("Player_CsAction_39",),
0x8085A768:("Player_CsAction_40",),
0x8085A7C0:("Player_CsAction_41",),
0x8085A8C4:("Player_CsAction_42",),
0x8085A940:("Player_CsAction_43",),
0x8085AA10:("Player_CsAction_44",),
0x8085AA60:("Player_CsAction_45",),
0x8085AA84:("Player_CsAction_46",),
0x8085AACC:("Player_CsAction_End",),
0x8085AB58:("Player_Cutscene_SetPosAndYawToStart",),
0x8085ABA8:("Player_Cutscene_8085ABA8",),
0x8085AC9C:("func_8085AC9C",),
0x8085AD5C:("func_8085AD5C",),
0x8085ADA0:("func_8085ADA0",),
0x8085ADA0:("Player_CsAction_48",),
0x8085B08C:("func_8085B08C",),
0x8085B134:("Player_StartFishing",),
0x8085B170:("func_8085B170",),
tools/disasm/variables.txt
+4 -4
View File
@@ -5033,7 +5033,7 @@
0x8085D370:("D_8085D370","UNK_TYPE1","",0x1),
0x8085D37C:("D_8085D37C","UNK_TYPE1","",0x1),
0x8085D380:("D_8085D380","UNK_TYPE1","",0x1),
0x8085D384:("D_8085D384","UNK_TYPE1","",0x1),
0x8085D384:("sPlayerCsModes","UNK_TYPE1","",0x1),
0x8085D3E0:("D_8085D3E0","UNK_TYPE1","",0x1),
0x8085D3F4:("D_8085D3F4","UNK_TYPE1","",0x1),
0x8085D3F8:("D_8085D3F8","UNK_TYPE1","",0x1),
@@ -5121,7 +5121,7 @@
0x8085D96C:("D_8085D96C","UNK_TYPE1","",0x1),
0x8085D978:("D_8085D978","UNK_TYPE1","",0x1),
0x8085D984:("D_8085D984","UNK_TYPE1","",0x1),
0x8085D990:("D_8085D990","UNK_TYPE1","",0x1),
0x8085D990:("sPlayerCsModeAnimFuncs","UNK_TYPE1","",0x1),
0x8085D9E0:("D_8085D9E0","UNK_TYPE1","",0x1),
0x8085D9F0:("D_8085D9F0","UNK_TYPE1","",0x1),
0x8085D9FC:("D_8085D9FC","UNK_TYPE1","",0x1),
@@ -5143,8 +5143,8 @@
0x8085DA88:("D_8085DA88","UNK_TYPE1","",0x1),
0x8085DA8C:("D_8085DA8C","UNK_TYPE1","",0x1),
0x8085DA90:("D_8085DA90","UNK_TYPE1","",0x1),
0x8085DA94:("D_8085DA94","UNK_TYPE1","",0x1),
0x8085DEF4:("D_8085DEF4","UNK_TYPE1","",0x1),
0x8085DA94:("sPlayerCsModeInitFuncs","UNK_TYPE1","",0x1),
0x8085DEF4:("sPlayerCsModeUpdateFuncs","UNK_TYPE1","",0x1),
0x8085E354:("D_8085E354","UNK_TYPE1","",0x1),
0x8085E368:("D_8085E368","UNK_TYPE2","",0x2),
0x8085E3A4:("D_8085E3A4","UNK_TYPE1","",0x1),