mirror of
https://github.com/zeldaret/oot.git
synced 2025-08-06 06:10:21 +00:00
ovl_Demo_Kankyo OK (#608)
* Decompiled, not yet matched * Another match * Fix merge * OK * Move cutscene data to separate source files, name some functions and variables * Small cleanup * Some docs * Small improvements * Struct_Unk_150 -> DemoKankyo_Unk_150 * Review Suggestions Co-authored-by: mzxrules <mzxrules@gmail.com> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Further review changes * rm reloc asm Co-authored-by: Thar0 <maximilianc64@gmail.com> Co-authored-by: mzxrules <mzxrules@gmail.com> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
This commit is contained in:
Tharo
GitHub
parent
5da5263176
commit
badb1d9d5e
40 changed files with 1226 additions and 3300 deletions
|
|
@ -1,2 +1,10 @@
|
|||
ovl_Demo_Kankyo
|
||||
z_demo_kankyo.c
|
||||
z_demo_kankyo_cutscene_data1.c
|
||||
z_demo_kankyo_cutscene_data2.c
|
||||
z_demo_kankyo_cutscene_data3.c
|
||||
z_demo_kankyo_cutscene_data4.c
|
||||
z_demo_kankyo_cutscene_data5.c
|
||||
z_demo_kankyo_cutscene_data6.c
|
||||
z_demo_kankyo_cutscene_data7.c
|
||||
z_demo_kankyo_cutscene_data8.c
|
||||
z_demo_kankyo.c
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -6,9 +6,47 @@
|
|||
|
||||
struct DemoKankyo;
|
||||
|
||||
typedef void (*DemoKankyoActionFunc)(struct DemoKankyo*, GlobalContext*);
|
||||
|
||||
typedef enum {
|
||||
/* 0x00 */ DEMOKANKYO_BLUE_RAIN,
|
||||
/* 0x01 */ DEMOKANKYO_BLUE_RAIN_2,
|
||||
/* 0x02 */ DEMOKANKYO_ROCK_1,
|
||||
/* 0x03 */ DEMOKANKYO_ROCK_2,
|
||||
/* 0x04 */ DEMOKANKYO_ROCK_3,
|
||||
/* 0x05 */ DEMOKANKYO_ROCK_4,
|
||||
/* 0x06 */ DEMOKANKYO_ROCK_5,
|
||||
/* 0x07 */ DEMOKANKYO_CLOUDS,
|
||||
/* 0x08 */ DEMOKANKYO_8, // These unnamed types are removed types that would have used object_gi_melody
|
||||
/* 0x09 */ DEMOKANKYO_9,
|
||||
/* 0x0A */ DEMOKANKYO_A,
|
||||
/* 0x0B */ DEMOKANKYO_B,
|
||||
/* 0x0C */ DEMOKANKYO_C,
|
||||
/* 0x0D */ DEMOKANKYO_DOOR_OF_TIME,
|
||||
/* 0x0E */ DEMOKANKYO_LIGHT_PLANE,
|
||||
/* 0x0F */ DEMOKANKYO_WARP_OUT,
|
||||
/* 0x10 */ DEMOKANKYO_WARP_IN,
|
||||
/* 0x11 */ DEMOKANKYO_SPARKLES
|
||||
} DemoKankyoType;
|
||||
|
||||
typedef struct {
|
||||
/* 0x00 */ Vec3f unk_0;
|
||||
/* 0x0C */ Vec3f unk_C;
|
||||
/* 0x18 */ f32 unk_18; // For Door of Time, this is the amount to translate it by used for when it's opening
|
||||
/* 0x1C */ f32 unk_1C;
|
||||
/* 0x20 */ s16 unk_20;
|
||||
/* 0x22 */ u8 unk_22; // mode ?
|
||||
/* 0x23 */ u8 unk_23;
|
||||
/* 0x24 */ s16 unk_24;
|
||||
} DemoKankyoUnk150; // size = 0x28
|
||||
|
||||
typedef struct DemoKankyo {
|
||||
/* 0x0000 */ Actor actor;
|
||||
/* 0x014C */ char unk_14C[0x4B8];
|
||||
/* 0x014C */ u8 objBankIndex;
|
||||
/* 0x014D */ u8 sparkleCounter;
|
||||
/* 0x014E */ u8 warpTimer;
|
||||
/* 0x0150 */ DemoKankyoUnk150 unk_150[30];
|
||||
/* 0x0600 */ DemoKankyoActionFunc actionFunc;
|
||||
} DemoKankyo; // size = 0x0604
|
||||
|
||||
extern const ActorInit Demo_Kankyo_InitVars;
|
||||
|
|
|
|||
|
|
@ -0,0 +1,25 @@
|
|||
#include "z_demo_kankyo.h"
|
||||
#include "z64cutscene_commands.h"
|
||||
|
||||
// clang-format off
|
||||
CutsceneData gAdultWarpInCS[] = {
|
||||
CS_BEGIN_CUTSCENE(2, 164),
|
||||
CS_CAM_POS_PLAYER_LIST(0, 135),
|
||||
CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 60.32485580444336f, 31, 79, 59, 0x010F),
|
||||
CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 60.32485580444336f, 31, 78, 60, 0x0120),
|
||||
CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 60.32485580444336f, 32, 78, 60, 0x0131),
|
||||
CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 60.32485580444336f, 30, 79, 59, 0x01F4),
|
||||
CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 60.32485580444336f, 30, 78, 60, 0x01F6),
|
||||
CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 60.32485580444336f, 30, 78, 60, 0x0207),
|
||||
CS_CAM_POS_PLAYER(CS_CMD_STOP, 0x00, 0, 60.32485580444336f, 30, 78, 60, 0x0000),
|
||||
CS_CAM_FOCUS_POINT_PLAYER_LIST(0, 164),
|
||||
CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 30, 60.32485580444336f, 11, 50, 23, 0x010F),
|
||||
CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 30, 60.32485580444336f, 11, 48, 22, 0x0120),
|
||||
CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 7, 60.32485580444336f, 11, 48, 22, 0x0131),
|
||||
CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 7, 60.32485580444336f, 57, 101, 21, 0x01F4),
|
||||
CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 30, 60.32485580444336f, 57, 101, 21, 0x01F6),
|
||||
CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 30, 60.32485580444336f, 57, 101, 21, 0x0207),
|
||||
CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_STOP, 0x00, 30, 60.32485580444336f, 57, 101, 21, 0x0000),
|
||||
CS_END(),
|
||||
};
|
||||
// clang-format on
|
||||
|
|
@ -0,0 +1,31 @@
|
|||
#include "z_demo_kankyo.h"
|
||||
#include "z64cutscene_commands.h"
|
||||
|
||||
// clang-format off
|
||||
CutsceneData gAdultWarpOutCS[] = {
|
||||
CS_BEGIN_CUTSCENE(5, 1167),
|
||||
CS_CAM_POS_PLAYER_LIST(0, 1138),
|
||||
CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 60.324859619140625f, 31, 82, 61, 0x20BA),
|
||||
CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 60.324859619140625f, 31, 82, 61, 0xA1BC),
|
||||
CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 60.324859619140625f, 31, 82, 61, 0xA5E1),
|
||||
CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 60.324859619140625f, 31, 82, 61, 0xA5CB),
|
||||
CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 60.324859619140625f, 31, 82, 61, 0xA5EB),
|
||||
CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 60.324859619140625f, 31, 82, 61, 0x20BA),
|
||||
CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 60.324859619140625f, 31, 82, 61, 0xA1BC),
|
||||
CS_CAM_POS_PLAYER(CS_CMD_STOP, 0x00, 0, 60.324859619140625f, 31, 82, 61, 0xA5E1),
|
||||
CS_CAM_FOCUS_POINT_PLAYER_LIST(0, 1167),
|
||||
CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 30, 60.324859619140625f, 55, 99, 31, 0x20BA),
|
||||
CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 30, 60.324859619140625f, 55, 99, 31, 0xA1BC),
|
||||
CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 10, 60.324859619140625f, 55, 99, 31, 0xA5E1),
|
||||
CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 7, 60.324859619140625f, 17, 59, 31, 0xA5CB),
|
||||
CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 30, 60.324859619140625f, 17, 59, 31, 0xA5EB),
|
||||
CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 1000, 60.324859619140625f, 17, 59, 31, 0x20BA),
|
||||
CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 30, 60.324859619140625f, 17, 59, 31, 0xA1BC),
|
||||
CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_STOP, 0x00, 30, 60.324859619140625f, 17, 59, 31, 0xA5E1),
|
||||
CS_SCENE_TRANS_FX(0x0005, 36, 46),
|
||||
CS_SCENE_TRANS_FX(0x0001, 30, 35),
|
||||
CS_MISC_LIST(1),
|
||||
CS_MISC(0x000C, 95, 97, 0x0000, 0x00000000, 0x00000000, 0xFFFFFFE3, 0xFFFFFFF9, 0x00000000, 0xFFFFFFE3, 0xFFFFFFF9, 0x00000000, 0x00000000, 0x00000000),
|
||||
CS_END(),
|
||||
};
|
||||
// clang-format on
|
||||
|
|
@ -0,0 +1,25 @@
|
|||
#include "z_demo_kankyo.h"
|
||||
#include "z64cutscene_commands.h"
|
||||
|
||||
// clang-format off
|
||||
CutsceneData gAdultWarpInToTCS[] = {
|
||||
CS_BEGIN_CUTSCENE(2, 118),
|
||||
CS_CAM_POS_PLAYER_LIST(0, 89),
|
||||
CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 71.32476043701172f, 53, 53, 40, 0x010F),
|
||||
CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 60.0f, 53, 53, 40, 0x0120),
|
||||
CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 60.0f, 53, 53, 40, 0x0131),
|
||||
CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 70.59991455078125f, 58, 102, 48, 0x01F4),
|
||||
CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 70.59991455078125f, 58, 102, 48, 0x01F6),
|
||||
CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 70.59991455078125f, 58, 102, 48, 0x0207),
|
||||
CS_CAM_POS_PLAYER(CS_CMD_STOP, 0x00, 0, 70.59991455078125f, 58, 102, 48, 0x0047),
|
||||
CS_CAM_FOCUS_POINT_PLAYER_LIST(0, 118),
|
||||
CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 7, 70.52477264404297f, 11, 29, 10, 0x010F),
|
||||
CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 7, 70.39991760253906f, 11, 29, 10, 0x0120),
|
||||
CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 7, 70.59991455078125f, 11, 29, 10, 0x0131),
|
||||
CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 7, 70.59991455078125f, 29, 71, 25, 0x01F4),
|
||||
CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 30, 70.59991455078125f, 29, 71, 25, 0x01F6),
|
||||
CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 30, 70.59991455078125f, 29, 71, 25, 0x0207),
|
||||
CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_STOP, 0x00, 30, 70.59991455078125f, 29, 71, 25, 0x0047),
|
||||
CS_END(),
|
||||
};
|
||||
// clang-format on
|
||||
|
|
@ -0,0 +1,25 @@
|
|||
#include "z_demo_kankyo.h"
|
||||
#include "z64cutscene_commands.h"
|
||||
|
||||
// clang-format off
|
||||
CutsceneData gAdultWarpOutToTCS[] = {
|
||||
CS_BEGIN_CUTSCENE(5, 1120),
|
||||
CS_SCENE_TRANS_FX(0x0005, 36, 46),
|
||||
CS_SCENE_TRANS_FX(0x0001, 30, 35),
|
||||
CS_CAM_POS_PLAYER_LIST(0, 1091),
|
||||
CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 60.324859619140625f, 42, 89, 50, 0x0000),
|
||||
CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 60.324859619140625f, 42, 89, 50, 0x0000),
|
||||
CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 60.324859619140625f, 42, 89, 50, 0x0000),
|
||||
CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 60.324859619140625f, 42, 89, 50, 0x0000),
|
||||
CS_CAM_POS_PLAYER(CS_CMD_STOP, 0x00, 0, 60.324859619140625f, 42, 89, 50, 0x29D0),
|
||||
CS_CAM_FOCUS_POINT_PLAYER_LIST(0, 1120),
|
||||
CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 30, 60.324859619140625f, 24, 66, 29, 0x0000),
|
||||
CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 30, 60.324859619140625f, 24, 66, 29, 0x0000),
|
||||
CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 1000, 60.324859619140625f, 24, 66, 29, 0x0000),
|
||||
CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 30, 60.324859619140625f, 24, 66, 29, 0x0000),
|
||||
CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_STOP, 0x00, 30, 60.324859619140625f, 24, 66, 29, 0x29D0),
|
||||
CS_MISC_LIST(1),
|
||||
CS_MISC(0x000C, 95, 96, 0x0000, 0x00000000, 0x00000000, 0xFFFFFFEE, 0xFFFFFFF3, 0x00000000, 0xFFFFFFEE, 0xFFFFFFF3, 0x00000000, 0x00000000, 0x00000000),
|
||||
CS_END(),
|
||||
};
|
||||
// clang-format on
|
||||
|
|
@ -0,0 +1,27 @@
|
|||
#include "z_demo_kankyo.h"
|
||||
#include "z64cutscene_commands.h"
|
||||
|
||||
// clang-format off
|
||||
CutsceneData gChildWarpInCS[] = {
|
||||
CS_BEGIN_CUTSCENE(2, 1164),
|
||||
CS_CAM_POS_PLAYER_LIST(0, 1135),
|
||||
CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 60.32485580444336f, 31, 68, 59, 0x010F),
|
||||
CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 60.32485580444336f, 32, 68, 60, 0x0120),
|
||||
CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 60.32485580444336f, 31, 69, 59, 0x0131),
|
||||
CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 60.32485580444336f, 31, 64, 59, 0x01F4),
|
||||
CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 60.32485580444336f, 31, 64, 59, 0x01F6),
|
||||
CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 60.32485580444336f, 31, 64, 59, 0x0207),
|
||||
CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 60.32485580444336f, 31, 64, 59, 0xB46C),
|
||||
CS_CAM_POS_PLAYER(CS_CMD_STOP, 0x00, 0, 60.32485580444336f, 31, 64, 59, 0x05BC),
|
||||
CS_CAM_FOCUS_POINT_PLAYER_LIST(0, 1164),
|
||||
CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 30, 60.32485580444336f, 12, 40, 22, 0x010F),
|
||||
CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 30, 60.32485580444336f, 11, 38, 22, 0x0120),
|
||||
CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 7, 60.32485580444336f, 11, 39, 22, 0x0131),
|
||||
CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 7, 60.32485580444336f, 57, 86, 21, 0x01F4),
|
||||
CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 30, 60.32485580444336f, 57, 86, 21, 0x01F6),
|
||||
CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 1000, 60.32485580444336f, 57, 86, 21, 0x0207),
|
||||
CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 30, 60.32485580444336f, 57, 86, 21, 0xB46C),
|
||||
CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_STOP, 0x00, 30, 60.32485580444336f, 57, 86, 21, 0x05BC),
|
||||
CS_END(),
|
||||
};
|
||||
// clang-format on
|
||||
|
|
@ -0,0 +1,31 @@
|
|||
#include "z_demo_kankyo.h"
|
||||
#include "z64cutscene_commands.h"
|
||||
|
||||
// clang-format off
|
||||
CutsceneData gChildWarpOutCS[] = {
|
||||
CS_BEGIN_CUTSCENE(5, 1167),
|
||||
CS_SCENE_TRANS_FX(0x0005, 36, 46),
|
||||
CS_SCENE_TRANS_FX(0x0001, 30, 35),
|
||||
CS_CAM_POS_PLAYER_LIST(0, 1138),
|
||||
CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 60.324859619140625f, 30, 63, 61, 0xA8A5),
|
||||
CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 60.324859619140625f, 30, 63, 61, 0xA3D9),
|
||||
CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 60.324859619140625f, 30, 63, 61, 0xF3A5),
|
||||
CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 60.32486343383789f, 29, 61, 59, 0xA5D5),
|
||||
CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 60.32486343383789f, 29, 61, 59, 0xA5E7),
|
||||
CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 60.32486343383789f, 29, 61, 59, 0xA5EC),
|
||||
CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 60.32486343383789f, 29, 61, 59, 0xBCA5),
|
||||
CS_CAM_POS_PLAYER(CS_CMD_STOP, 0x00, 0, 60.32486343383789f, 29, 61, 59, 0xEEC0),
|
||||
CS_CAM_FOCUS_POINT_PLAYER_LIST(0, 1167),
|
||||
CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 30, 60.324859619140625f, 54, 79, 31, 0xA8A5),
|
||||
CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 30, 60.324859619140625f, 54, 80, 31, 0xA3D9),
|
||||
CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 10, 60.324859619140625f, 54, 79, 31, 0xF3A5),
|
||||
CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 7, 60.32486343383789f, 15, 42, 30, 0xA5D5),
|
||||
CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 30, 60.32486343383789f, 15, 42, 30, 0xA5E7),
|
||||
CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 1000, 60.32486343383789f, 15, 42, 30, 0xA5EC),
|
||||
CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 30, 60.32486343383789f, 15, 42, 30, 0xBCA5),
|
||||
CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_STOP, 0x00, 30, 60.32486343383789f, 15, 42, 30, 0xEEC0),
|
||||
CS_MISC_LIST(1),
|
||||
CS_MISC(0x000C, 95, 96, 0x0000, 0x00000000, 0x00000000, 0xFFFFFFEF, 0xFFFFFFCD, 0x00000000, 0xFFFFFFEF, 0xFFFFFFCD, 0x00000000, 0x00000000, 0x00000000),
|
||||
CS_END(),
|
||||
};
|
||||
// clang-format on
|
||||
|
|
@ -0,0 +1,27 @@
|
|||
#include "z_demo_kankyo.h"
|
||||
#include "z64cutscene_commands.h"
|
||||
|
||||
// clang-format off
|
||||
CutsceneData gChildWarpInToTCS[] = {
|
||||
CS_BEGIN_CUTSCENE(2, 1118),
|
||||
CS_CAM_POS_PLAYER_LIST(0, 1089),
|
||||
CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 71.32476043701172f, 53, 53, 40, 0x010F),
|
||||
CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 60.0f, 53, 53, 40, 0x0120),
|
||||
CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 60.0f, 53, 53, 40, 0x0131),
|
||||
CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 70.59991455078125f, 58, 89, 47, 0x01F4),
|
||||
CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 70.59991455078125f, 58, 89, 47, 0x01F6),
|
||||
CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 70.59991455078125f, 58, 89, 47, 0x0207),
|
||||
CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 70.59991455078125f, 58, 89, 47, 0x0000),
|
||||
CS_CAM_POS_PLAYER(CS_CMD_STOP, 0x00, 0, 70.59991455078125f, 58, 89, 47, 0x0000),
|
||||
CS_CAM_FOCUS_POINT_PLAYER_LIST(0, 1118),
|
||||
CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 7, 70.52477264404297f, 11, 29, 10, 0x010F),
|
||||
CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 7, 70.39991760253906f, 11, 29, 10, 0x0120),
|
||||
CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 7, 70.59991455078125f, 11, 29, 10, 0x0131),
|
||||
CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 7, 70.59991455078125f, 29, 58, 25, 0x01F4),
|
||||
CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 30, 70.59991455078125f, 29, 58, 25, 0x01F6),
|
||||
CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 1000, 70.59991455078125f, 29, 58, 25, 0x0207),
|
||||
CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 30, 70.59991455078125f, 29, 58, 25, 0x0000),
|
||||
CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_STOP, 0x00, 30, 70.59991455078125f, 29, 58, 25, 0x0000),
|
||||
CS_END(),
|
||||
};
|
||||
// clang-format on
|
||||
|
|
@ -0,0 +1,25 @@
|
|||
#include "z_demo_kankyo.h"
|
||||
#include "z64cutscene_commands.h"
|
||||
|
||||
// clang-format off
|
||||
CutsceneData gChildWarpOutToTCS[] = {
|
||||
CS_BEGIN_CUTSCENE(5, 1120),
|
||||
CS_SCENE_TRANS_FX(0x0005, 36, 46),
|
||||
CS_SCENE_TRANS_FX(0x0001, 30, 35),
|
||||
CS_CAM_POS_PLAYER_LIST(0, 1091),
|
||||
CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 60.324867248535156f, 41, 75, 49, 0x1F1C),
|
||||
CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 60.324867248535156f, 41, 75, 49, 0x1F8C),
|
||||
CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 60.324867248535156f, 41, 75, 49, 0x1FFC),
|
||||
CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 60.324867248535156f, 41, 75, 49, 0x206C),
|
||||
CS_CAM_POS_PLAYER(CS_CMD_STOP, 0x00, 0, 60.324867248535156f, 41, 75, 49, 0x20DC),
|
||||
CS_CAM_FOCUS_POINT_PLAYER_LIST(0, 1120),
|
||||
CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 30, 60.324867248535156f, 24, 52, 29, 0x1F1C),
|
||||
CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 30, 60.324867248535156f, 24, 52, 29, 0x1F8C),
|
||||
CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 1000, 60.324867248535156f, 24, 52, 29, 0x1FFC),
|
||||
CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 30, 60.324867248535156f, 24, 52, 29, 0x206C),
|
||||
CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_STOP, 0x00, 30, 60.324867248535156f, 24, 52, 29, 0x20DC),
|
||||
CS_MISC_LIST(1),
|
||||
CS_MISC(0x000C, 95, 96, 0x0000, 0x00000000, 0x00000000, 0xFFFFFFDF, 0x00000019, 0x00000000, 0xFFFFFFDF, 0x00000019, 0x00000000, 0x00000000, 0x00000000),
|
||||
CS_END(),
|
||||
};
|
||||
// clang-format on
|
||||
Loading…
Add table
Add a link
Reference in a new issue