mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-06 06:10:21 +00:00
Code Issues Projects Releases Wiki Activity

ovl_En_Nb Decompiled (#298)

Browse source 
* started nabooru

* more work on nabooru

* did more

* file name

* almost done with z_en_nb

* did some more

* most of en_nb decomp

* data migrated en_nb

* did more

* almost finished

* started some documentation on ovl_en_nb

* did more documentation on en_nb

* did some more

* one non matching in en_nb

* ran format.sh

* update

* updated undefined_syms

* updated descriptions

* use DISP macros, delete japanese files. NABOORU IS 100% MATCHING POGGERS

* made suggested changes and removed reloc file

* Made some suggetsed changes

* Made some updates

* review 3

Co-authored-by: fig <fig02srl@gmail.com>
This commit is contained in:
Lucas Shaw 2020-12-02 12:57:54 -07:00 • committed by GitHub
parent 4876610c75
commit 620e3418c7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
137 changed files with 1770 additions and 4208 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/overlays/actors/ovl_En_Ik/z_en_ik.c
View file

@ -285,12 +285,10 @@ void func_80A7492C(EnIk* this, GlobalContext* globalCtx) {
void func_80A74AAC(EnIk* this) {
this->unk_2F8 = 5;
if (this->unk_2FB == 0) {
SkelAnime_ChangeAnim(&this->skelAnime, &D_0600ED24, 1.0f, 0.0f,
SkelAnime_GetFrameCount(&D_0600ED24), 0, -4.0f);
SkelAnime_ChangeAnim(&this->skelAnime, &D_0600ED24, 1.0f, 0.0f, SkelAnime_GetFrameCount(&D_0600ED24), 0, -4.0f);
this->actor.speedXZ = 0.9f;
} else {
SkelAnime_ChangeAnim(&this->skelAnime, &D_06006734, 1.0f, 0.0f,
SkelAnime_GetFrameCount(&D_06006734), 0, -4.0f);
SkelAnime_ChangeAnim(&this->skelAnime, &D_06006734, 1.0f, 0.0f, SkelAnime_GetFrameCount(&D_06006734), 0, -4.0f);
Audio_PlayActorSound2(&this->actor, NA_SE_EN_IRONNACK_DASH);
this->actor.speedXZ = 2.5f;
}
@ -540,12 +538,10 @@ void func_80A75790(EnIk* this) {
this->unk_2F8 = 0;
yawDiff = yaw - this->actor.shape.rot.y;
if (ABS(yawDiff) <= 0x4000) {
SkelAnime_ChangeAnim(&this->skelAnime, &D_06006194, 1.0f, 0.0f,
SkelAnime_GetFrameCount(&D_06006194), 2, -4.0f);
SkelAnime_ChangeAnim(&this->skelAnime, &D_06006194, 1.0f, 0.0f, SkelAnime_GetFrameCount(&D_06006194), 2, -4.0f);
this->actor.speedXZ = -6.0f;
} else {
SkelAnime_ChangeAnim(&this->skelAnime, &D_060045BC, 1.0f, 0.0f,
SkelAnime_GetFrameCount(&D_060045BC), 2, -4.0f);
SkelAnime_ChangeAnim(&this->skelAnime, &D_060045BC, 1.0f, 0.0f, SkelAnime_GetFrameCount(&D_060045BC), 2, -4.0f);
this->actor.speedXZ = 6.0f;
}
this->unk_2FE = 0;
@ -1018,8 +1014,7 @@ void func_80A77148(EnIk* this) {
}
void func_80A77158(EnIk* this, GlobalContext* globalCtx) {
SkelAnime_ChangeAnim(&this->skelAnime, &D_0600C114, 1.0f, 0.0f, SkelAnime_GetFrameCount(&D_0600C114),
2, 0.0f);
SkelAnime_ChangeAnim(&this->skelAnime, &D_0600C114, 1.0f, 0.0f, SkelAnime_GetFrameCount(&D_0600C114), 2, 0.0f);
func_80A770C0(this, globalCtx, 4);
this->action = 1;
this->drawMode = 1;
@ -1027,8 +1022,7 @@ void func_80A77158(EnIk* this, GlobalContext* globalCtx) {
}
void func_80A771E4(EnIk* this) {
SkelAnime_ChangeAnim(&this->skelAnime, &D_0600C114, 1.0f, 0.0f, SkelAnime_GetFrameCount(&D_0600C114),
2, 0.0f);
SkelAnime_ChangeAnim(&this->skelAnime, &D_0600C114, 1.0f, 0.0f, SkelAnime_GetFrameCount(&D_0600C114), 2, 0.0f);
this->action = 2;
this->drawMode = 1;
this->unk_4D4 = 0;

1772
src/overlays/actors/ovl_En_Nb/z_en_nb.c
View file

File diff suppressed because it is too large Load diff

31
src/overlays/actors/ovl_En_Nb/z_en_nb.h
View file

@ -6,11 +6,40 @@
struct EnNb;
typedef void (*EnNbActionFunc)(struct EnNb*, GlobalContext*);
typedef void (*EnNbDrawFunc)(struct EnNb*, GlobalContext*);
typedef struct EnNb {
/* 0x0000 */ Actor actor;
/* 0x014C */ char unk_14C[0x1DC];
/* 0x014C */ SkelAnime skelAnime;
/* 0x0190 */ Vec3s limbDrawTable[19];
/* 0x0202 */ Vec3s transitionDrawTable[19];
/* 0x0274 */ s16 eyeIdx;
/* 0x0276 */ s16 blinkTimer;
/* 0x0278 */ s32 action;
/* 0x027C */ s32 drawMode;
/* 0x0280 */ f32 alphaTimer;
/* 0x0284 */ u32 alpha;
/* 0x0288 */ s32 flag;
/* 0x028C */ s32 previousCsAction;
/* 0x0290 */ f32 timer;
/* 0x0294 */ ColliderCylinder collider;
/* 0x02E0 */ s32 headTurnFlag;
/* 0x02E4 */ Vec3f initialPos;
/* 0x02F0 */ Vec3f finalPos;
/* 0x02FC */ s16 pathYaw;
/* 0x02FE */ u16 movementTimer;
/* 0x0300 */ struct_80034A14_arg1 unk_300;
} EnNb; // size = 0x0328
typedef enum {
/* 0x02 */ NB_TYPE_DEMO02 = 2,
/* 0x03 */ NB_TYPE_KIDNAPPED,
/* 0x04 */ NB_TYPE_KNUCKLE,
/* 0x05 */ NB_TYPE_CREDITS,
/* 0x06 */ NB_TYPE_CRAWLSPACE
} EnNbType;
extern const ActorInit En_Nb_InitVars;
#endif

170
src/overlays/actors/ovl_En_Nb/z_en_nb_cutscene_data.c Normal file
View file

@ -0,0 +1,170 @@
#include "z_en_nb.h"
#include "z64cutscene_commands.h"
// clang-format off
static CutsceneData D_80AB431C[] = {
CS_BEGIN_CUTSCENE(27, 3011),
CS_UNK_DATA_LIST(0x00000020, 1),
CS_UNK_DATA(0x00010000, 0x0BB80000, 0x00000000, 0x00000000, 0xFFFFFFFC, 0x00000002, 0x00000000, 0xFFFFFFFC, 0x00000002, 0x00000000, 0x00000000, 0x00000000),
CS_NPC_ACTION_LIST(31, 5),
CS_NPC_ACTION(0x0001, 0, 501, 0x0000, 0x0000, 0x0000, 0, 216, 0, 0, 216, 0, 0.0f, 0.0f, 0.0f),
CS_NPC_ACTION(0x0002, 501, 502, 0x0000, 0x0000, 0x0000, 0, 216, 0, 0, 216, 0, 0.0f, 0.0f, 0.0f),
CS_NPC_ACTION(0x0004, 502, 573, 0x0000, 0x0000, 0x0000, 0, 216, 0, 0, 216, 0, 0.0f, 0.0f, 0.0f),
CS_NPC_ACTION(0x0002, 573, 621, 0x0000, 0x0000, 0x0000, 0, 216, 0, 0, 82, 0, 0.0f, -2.7916667461395264f, 0.0f),
CS_NPC_ACTION(0x0003, 621, 3011, 0x0000, 0x0000, 0x0000, 0, 82, 0, 0, 82, 0, 0.0f, 0.0f, 0.0f),
CS_PLAYER_ACTION_LIST(3),
CS_PLAYER_ACTION(0x000D, 0, 240, 0x0000, 0x1555, 0x0000, 0, 6, 0, 0, 6, 0, 0.0f, 0.0f, 1.401298464324817e-45f),
CS_PLAYER_ACTION(0x0005, 240, 461, 0x0000, 0x1555, 0x0000, 0, 6, 0, 0, 6, 0, 0.0f, 0.0f, 1.401298464324817e-45f),
CS_PLAYER_ACTION(0x0013, 461, 1616, 0x0000, 0x9555, 0x0000, 0, 6, 0, 0, 6, 0, 0.0f, 0.0f, 1.401298464324817e-45f),
CS_NPC_ACTION_LIST(49, 1),
CS_NPC_ACTION(0x0001, 0, 3000, 0x0000, 0x0000, 0x0000, 0, -16, -121, 0, -16, -121, 0.0f, 0.0f, 0.0f),
CS_LIGHTING_LIST(1),
CS_LIGHTING(0x0004, 0, 3000, 0x0000, 0x00000000, 0xFFFFFF9E, 0x00000000, 0x0000002F, 0xFFFFFF9E, 0x00000000, 0x0000002F),
CS_NPC_ACTION_LIST(39, 1),
CS_NPC_ACTION(0x0001, 0, 3000, 0x0000, 0x0000, 0x0000, 0, 0, -2, 0, 0, -2, 0.0f, 0.0f, 0.0f),
CS_NPC_ACTION_LIST(40, 3),
CS_NPC_ACTION(0x0001, 0, 145, 0x0000, 0x0000, 0x0000, -97, 6, -167, -97, 6, -167, 0.0f, 0.0f, 0.0f),
CS_NPC_ACTION(0x0002, 145, 431, 0x0000, 0x0000, 0x0000, -97, 6, -167, -97, 6, -167, 0.0f, 0.0f, 0.0f),
CS_NPC_ACTION(0x0003, 431, 1399, 0x0000, 0x0000, 0x0000, -97, 6, -167, -97, 6, -167, 0.0f, 0.0f, 0.0f),
CS_SCENE_TRANS_FX(0x0005, 500, 530),
CS_SCENE_TRANS_FX(0x0001, 489, 499),
CS_SCENE_TRANS_FX(0x0001, 765, 795),
CS_TEXT_LIST(10),
CS_TEXT_NONE(0, 345),
CS_TEXT_DISPLAY_TEXTBOX(0x6035, 345, 353, 0x0000, 0x0000, 0x0000),
CS_TEXT_NONE(353, 374),
CS_TEXT_DISPLAY_TEXTBOX(0x6039, 374, 399, 0x0000, 0x0000, 0x0000),
CS_TEXT_NONE(399, 400),
CS_TEXT_DISPLAY_TEXTBOX(0x603A, 400, 424, 0x0000, 0x0000, 0x0000),
CS_TEXT_NONE(424, 760),
CS_TEXT_DISPLAY_TEXTBOX(0x003F, 760, 765, 0x0000, 0x0000, 0x0000),
CS_TEXT_NONE(765, 825),
CS_TEXT_DISPLAY_TEXTBOX(0x6036, 825, 835, 0x0000, 0x0000, 0x0000),
CS_NPC_ACTION_LIST(62, 1),
CS_NPC_ACTION(0x0004, 0, 3000, 0x0000, 0x0000, 0x0000, 50, 80, 56, 50, 80, 56, 0.0f, 0.0f, 0.0f),
CS_TERMINATOR(DESERT_COLOSSUS_SPIRIT_BLUE_WARP, 865, 907),
CS_PLAY_BGM_LIST(1),
CS_PLAY_BGM(0x0044, 575, 576, 0x0000, 0x00000000, 0xFFFFFFEF, 0x00000000, 0x00000034, 0xFFFFFFEF, 0x00000000, 0x00000034),
CS_FADE_BGM_LIST(1),
CS_FADE_BGM(0x0004, 479, 529, 0x0000, 0x00000000, 0x00000000, 0xFFFFFFC7, 0x0000005C, 0x00000000, 0xFFFFFFC7, 0x0000005C),
CS_CAM_POS_LIST(0, 366),
CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.80000305175781f, -269, 89, -454, 0x00C6),
CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.80000305175781f, -269, 89, -454, 0x00C8),
CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.80000305175781f, -269, 89, -454, 0x00D7),
CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.80000305175781f, -223, 75, -377, 0x00E8),
CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.80000305175781f, -92, 31, -157, 0x00EA),
CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.80000305175781f, 13, 15, 19, 0x013D),
CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.80000305175781f, 49, 28, 77, 0x013F),
CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.80000305175781f, 74, 20, 122, 0x014E),
CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 50.5999641418457f, 74, 20, 122, 0x015F),
CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 45.39994430541992f, 74, 20, 122, 0x0161),
CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 45.39994430541992f, 74, 20, 122, 0x300A),
CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 45.39994430541992f, 74, 20, 122, 0x656F),
CS_CAM_POS(CS_CMD_STOP, 0x00, 0, 45.39994430541992f, 74, 20, 122, 0x676F),
CS_CAM_POS_LIST(263, 2484),
CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 62.00456619262695f, 134, 19, 198, 0x00C6),
CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 62.00456619262695f, 134, 19, 198, 0x00C8),
CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 62.00456619262695f, 134, 43, 198, 0x00D7),
CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 62.00456619262695f, 133, 60, 197, 0x00E8),
CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 62.00456619262695f, 133, 60, 197, 0x00EA),
CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 62.00456619262695f, 133, 60, 197, 0x013D),
CS_CAM_POS(CS_CMD_STOP, 0x00, 0, 62.00456619262695f, 133, 60, 197, 0x013F),
CS_CAM_POS_LIST(363, 1595),
CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 40.399925231933594f, 116, 21, 45, 0x00C6),
CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 40.399925231933594f, 116, 21, 45, 0x00C8),
CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 40.399925231933594f, 116, 21, 45, 0x00D7),
CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 40.399925231933594f, 117, 24, 69, 0x00E8),
CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 40.399925231933594f, 105, 46, 117, 0x00EA),
CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 40.399925231933594f, 105, 46, 117, 0x013D),
CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 40.399925231933594f, 105, 46, 117, 0x013F),
CS_CAM_POS(CS_CMD_STOP, 0x00, 0, 40.399925231933594f, 105, 46, 117, 0x002E),
CS_CAM_POS_LIST(433, 1594),
CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 45.599945068359375f, 139, 33, -108, 0x00C6),
CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 45.599945068359375f, 139, 33, -108, 0x00C8),
CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 45.599945068359375f, 140, 81, -109, 0x00D7),
CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 45.599945068359375f, 140, 252, -109, 0x00E8),
CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.60000228881836f, 140, 252, -109, 0x00EA),
CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.60000228881836f, 140, 252, -109, 0x013D),
CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.60000228881836f, 140, 252, -109, 0x013F),
CS_CAM_POS(CS_CMD_STOP, 0x00, 0, 60.60000228881836f, 140, 252, -109, 0x002E),
CS_CAM_POS_LIST(498, 840),
CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, 13, 854, 2, 0x00C6),
CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, 9, 853, 5, 0x00C8),
CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -3, 853, 5, 0x00D7),
CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -9, 853, -6, 0x00E8),
CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -2, 852, -17, 0x00EA),
CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, 9, 852, -17, 0x013D),
CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, 16, 852, -6, 0x013F),
CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, 9, 852, 5, 0x002E),
CS_CAM_POS(CS_CMD_STOP, 0x00, 0, 60.0f, -3, 851, 5, 0x0063),
CS_CAM_POS_PLAYER_LIST(574, 1755),
CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 68.59994506835938f, 0, 33, -27, 0x00C6),
CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 68.59994506835938f, 0, 33, -27, 0x00C8),
CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 68.59994506835938f, 0, 68, -26, 0x00D7),
CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 68.59994506835938f, 0, 103, -26, 0x00E8),
CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 68.59994506835938f, 0, 103, -26, 0x00EA),
CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 68.59994506835938f, 0, 103, -26, 0x013D),
CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 68.59994506835938f, 0, 103, -26, 0x013F),
CS_CAM_POS_PLAYER(CS_CMD_STOP, 0x00, 0, 68.59994506835938f, 0, 103, -26, 0x002E),
CS_CAM_FOCUS_POINT_LIST(0, 395),
CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 60.80000305175781f, -141, 51, -239, 0x00C6),
CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 60.80000305175781f, -141, 51, -239, 0x00C8),
CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 60.80000305175781f, -141, 52, -239, 0x00D7),
CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 60.80000305175781f, -96, 32, -164, 0x00E8),
CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 60.80000305175781f, 34, 19, 56, 0x00EA),
CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 60.80000305175781f, 138, 2, 230, 0x013D),
CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 60.80000305175781f, 165, 22, 286, 0x013F),
CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 35, 55.799983978271484f, 181, 116, 315, 0x014E),
CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 50.5999641418457f, 175, 134, 305, 0x015F),
CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 45.39994430541992f, 172, 142, 300, 0x0161),
CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 45.39994430541992f, 171, 142, 300, 0x300A),
CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 45.39994430541992f, 171, 141, 299, 0x656F),
CS_CAM_FOCUS_POINT(CS_CMD_STOP, 0x00, 30, 45.39994430541992f, 171, 141, 299, 0x676F),
CS_CAM_FOCUS_POINT_LIST(263, 2513),
CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 70, 62.00456619262695f, -67, 36, 17, 0x00C6),
CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 70, 62.00456619262695f, -67, 32, 17, 0x00C8),
CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 50, 62.00456619262695f, -66, 34, 18, 0x00D7),
CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 1000, 62.00456619262695f, -60, 24, 23, 0x00E8),
CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 1000, 62.00456619262695f, -60, 22, 23, 0x00EA),
CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 62.00456619262695f, -60, 19, 23, 0x013D),
CS_CAM_FOCUS_POINT(CS_CMD_STOP, 0x00, 30, 62.00456619262695f, -60, 18, 23, 0x013F),
CS_CAM_FOCUS_POINT_LIST(363, 1624),
CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 40.399925231933594f, 34, 58, 269, 0x00C6),
CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 40.399925231933594f, 34, 58, 269, 0x00C8),
CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 50, 40.399925231933594f, 34, 58, 269, 0x00D7),
CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 50, 40.399925231933594f, 42, 74, 293, 0x00E8),
CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 41, 40.399925231933594f, 22, 93, 336, 0x00EA),
CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 1000, 40.399925231933594f, 22, 93, 336, 0x013D),
CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 40.399925231933594f, 22, 93, 336, 0x013F),
CS_CAM_FOCUS_POINT(CS_CMD_STOP, 0x00, 30, 40.399925231933594f, 22, 93, 336, 0x002E),
CS_CAM_FOCUS_POINT_LIST(433, 1623),
CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 45.599945068359375f, 4, 14, 108, 0x00C6),
CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 45.599945068359375f, 4, 14, 108, 0x00C8),
CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 20, 50.99996566772461f, 4, 76, 108, 0x00D7),
CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 20, 70.59991455078125f, 111, 501, -62, 0x00E8),
CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 70.59991455078125f, 111, 500, -62, 0x00EA),
CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 1000, 70.59991455078125f, 111, 500, -62, 0x013D),
CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 70.39991760253906f, 111, 500, -62, 0x013F),
CS_CAM_FOCUS_POINT(CS_CMD_STOP, 0x00, 30, 70.39991760253906f, 111, 500, -62, 0x002E),
CS_CAM_FOCUS_POINT_LIST(498, 889),
CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 50, 60.0f, 3, 6, -6, 0x00C6),
CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 40, 60.0f, 3, 6, -6, 0x00C8),
CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 50.99996566772461f, 3, 6, -6, 0x00D7),
CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 20, 20.599849700927734f, 3, 6, -6, 0x00E8),
CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 51, 10.799838066101074f, 3, 6, -6, 0x00EA),
CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 50, 10.3998384475708f, 3, 6, -6, 0x013D),
CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 50, 10.3998384475708f, 3, 6, -6, 0x013F),
CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 50, 10.199838638305664f, 3, 6, -6, 0x002E),
CS_CAM_FOCUS_POINT(CS_CMD_STOP, 0x00, 50, 10.999837875366211f, 3, 6, -6, 0x0063),
CS_CAM_FOCUS_POINT_PLAYER_LIST(574, 1784),
CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 30, 68.59994506835938f, 0, 100, 5, 0x00C6),
CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 30, 68.59994506835938f, 0, 101, 6, 0x00C8),
CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 30, 68.59994506835938f, 1, 99, 41, 0x00D7),
CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 30, 68.59994506835938f, 0, 42, 16, 0x00E8),
CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 30, 68.59994506835938f, 0, 42, 16, 0x00EA),
CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 1000, 68.59994506835938f, 0, 42, 16, 0x013D),
CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 30, 68.59994506835938f, 0, 42, 16, 0x013F),
CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_STOP, 0x00, 30, 68.59994506835938f, 0, 42, 16, 0x002E),
CS_END(),
};
// clang-format on

4
src/overlays/actors/ovl_En_Okuta/z_en_okuta.c
View file

@ -627,8 +627,8 @@ s32 EnOkuta_GetSnoutScale(EnOkuta* this, f32 animCurrentFrame, Vec3f* scale) {
}
s32 EnOkuta_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot,
Actor* actor) {
EnOkuta* this = (EnOkuta*)actor;
void* thisx) {
EnOkuta* this = THIS;
f32 animCurrentFrame = this->skelAnime.animCurrentFrame;
Vec3f scale;
s32 doScale = false;

3
src/overlays/actors/ovl_En_Zl3/z_en_zl3.c
View file

@ -1068,8 +1068,7 @@ void func_80B559C4(EnZl3* this) {
Vec3f* thisPos = &this->actor.posRot.pos;
Vec3f* unk_32C = &this->unk_32C;
Vec3f* unk_338 = &this->unk_338;
f32 temp_f0 = func_8006F9BC(SkelAnime_GetFrameCount(&D_06005248), 0,
(s32)this->skelAnime.animCurrentFrame, 3, 3);
f32 temp_f0 = func_8006F9BC(SkelAnime_GetFrameCount(&D_06005248), 0, (s32)this->skelAnime.animCurrentFrame, 3, 3);
thisPos->x = unk_32C->x + (temp_f0 * (unk_338->x - unk_32C->x));
thisPos->z = unk_32C->z + (temp_f0 * (unk_338->z - unk_32C->z));