mirror of
https://github.com/zeldaret/oot.git
synced 2025-08-22 06:52:03 +00:00
Big cleanup (#775)
* Adult and child2 macros OK * ICHAIN cleanup * almost all overlay data * format.sh * func_8002FBAC NON_EQUIVALENT * PR fixes (MZXrules) * fix * change //@ bug to //! @bug * merge master and missed a //@bug * fix ruto * some more cleanup (#2) * more `! @bug` formatting cleanup * parenthesis cleanup * hex naviEnemyId * run formatter * replace `IS_NOT_` macros with `!IS_` * run formatter * run formatter * PR fixes (fig) * Missed something Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
This commit is contained in:
louist103
GitHub
parent
17c79a8f60
commit
556cdad7eb
177 changed files with 902 additions and 862 deletions
|
|
@ -2,7 +2,7 @@
|
|||
#include "z64cutscene_commands.h"
|
||||
|
||||
// clang-format off
|
||||
CutsceneData D_80B4C5D0[] = {
|
||||
static CutsceneData D_80B4C5D0[] = {
|
||||
CS_BEGIN_CUTSCENE(28, 3000),
|
||||
CS_PLAYER_ACTION_LIST(3),
|
||||
CS_PLAYER_ACTION(0x0005, 400, 1211, 0x0000, 0xC000, 0x0000, -422, 84, 1, -422, 84, 1, 1.1266861702801002e-29f, 0.0f, 1.401298464324817e-45f),
|
||||
|
|
@ -247,7 +247,7 @@ CutsceneData D_80B4C5D0[] = {
|
|||
};
|
||||
// clang-format on
|
||||
|
||||
CutsceneCameraAngle D_80B4D5C0[] = {
|
||||
static CutsceneCameraAngle D_80B4D5C0[] = {
|
||||
{ { -440.0f, 117.0f, 0.0f }, { -490.0f, 120.0f, 0.0f }, 0, 45 },
|
||||
{ { -484.0f, 122.0f, -29.0f }, { -480.0f, 116.0f, 18.0f }, 0, 80 },
|
||||
{ { -413.0f, 136.0f, -72.0f }, { -403.0f, 141.0f, -89.0f }, 0, 25 },
|
||||
|
|
@ -262,33 +262,33 @@ CutsceneCameraAngle D_80B4D5C0[] = {
|
|||
{ { -491.0f, 120.0f, -7.0f }, { -509.0f, 115.0f, -7.0f }, 0, 75 },
|
||||
{ { -485.0f, 120.0f, -42.0f }, { -484.0f, 120.0f, 10.0f }, 0, 45 },
|
||||
};
|
||||
CutsceneCameraPoint D_80B4D72C[] = {
|
||||
static CutsceneCameraPoint D_80B4D72C[] = {
|
||||
{ 0, 0, 20, 80.79987f, { -484, 122, -29 } }, { 0, 0, 20, 80.79987f, { -484, 122, -29 } },
|
||||
{ 0, 0, 20, 80.79987f, { -484, 122, -29 } }, { 0, 0, 20, 80.79987f, { -452, 121, -21 } },
|
||||
{ 0, 0, 20, 80.79987f, { -452, 121, -21 } }, { 0, 0, 20, 80.79987f, { -452, 121, -21 } },
|
||||
{ -1, 0, 20, 80.79987f, { -452, 121, -21 } }, { -1, 0, 30, 80.79987f, { -452, 121, -21 } },
|
||||
};
|
||||
CutsceneCameraPoint D_80B4D7AC[] = {
|
||||
static CutsceneCameraPoint D_80B4D7AC[] = {
|
||||
{ 0, 0, 0, 80.79987f, { -480, 116, 18 } }, { 0, 0, 0, 80.79987f, { -480, 116, 18 } },
|
||||
{ 0, 0, 0, 80.79987f, { -480, 116, 18 } }, { 0, 0, 0, 80.79987f, { -480, 116, 18 } },
|
||||
{ 0, 0, 0, 80.79987f, { -480, 116, 18 } }, { 0, 0, 0, 80.79987f, { -480, 116, 18 } },
|
||||
{ -1, 0, 0, 80.79987f, { -480, 116, 18 } }, { -1, 0, 0, 80.79987f, { -480, 116, 18 } },
|
||||
};
|
||||
CutsceneCameraPoint D_80B4D82C[] = {
|
||||
static CutsceneCameraPoint D_80B4D82C[] = {
|
||||
{ 0, 0, 20, 45.200058f, { -439, 116, 0 } }, { 0, 0, 20, 45.200058f, { -439, 116, 0 } },
|
||||
{ 0, 0, 20, 50.60008f, { -433, 116, 0 } }, { 0, 0, 20, 55.600098f, { -431, 116, 0 } },
|
||||
{ 0, 0, 20, 60.000114f, { -427, 116, 0 } }, { 0, 0, 20, 65.000114f, { -424, 116, 0 } },
|
||||
{ 0, 0, 20, 70.800026f, { -422, 116, 0 } }, { 0, 0, 20, 75.59995f, { -419, 115, 0 } },
|
||||
{ -1, 0, 20, 75.59995f, { -419, 116, 0 } }, { -1, 0, 30, 75.59995f, { -419, 115, 0 } },
|
||||
};
|
||||
CutsceneCameraPoint D_80B4D8CC[] = {
|
||||
static CutsceneCameraPoint D_80B4D8CC[] = {
|
||||
{ 0, 0, 0, 60.400116f, { -480, 114, 0 } }, { 0, 0, 0, 45.200058f, { -480, 114, 0 } },
|
||||
{ 0, 0, 0, 45.200058f, { -474, 114, 0 } }, { 0, 0, 0, 50.60008f, { -472, 114, 0 } },
|
||||
{ 0, 0, 0, 55.600098f, { -468, 114, 0 } }, { 0, 0, 0, 60.000114f, { -465, 114, 0 } },
|
||||
{ 0, 0, 0, 65.000114f, { -463, 114, 0 } }, { 0, 0, 0, 70.800026f, { -460, 114, 0 } },
|
||||
{ -1, 0, 0, 75.59995f, { -460, 114, 0 } }, { -1, 0, 0, 75.59995f, { -460, 114, 0 } },
|
||||
};
|
||||
CutsceneCameraPoint D_80B4D96C[] = {
|
||||
static CutsceneCameraPoint D_80B4D96C[] = {
|
||||
{ 0, 0, 25, 60.000114f, { -116, 50, 469 } }, { 0, 0, 25, 60.000114f, { -116, 50, 469 } },
|
||||
{ 0, 0, 25, 60.000114f, { -118, 50, 467 } }, { 0, 0, 25, 60.000114f, { -120, 50, 465 } },
|
||||
{ 0, 0, 25, 60.000114f, { -123, 50, 464 } }, { 0, 0, 25, 60.000114f, { -126, 50, 463 } },
|
||||
|
|
@ -297,7 +297,7 @@ CutsceneCameraPoint D_80B4D96C[] = {
|
|||
{ 0, 0, 25, 60.000114f, { -140, 50, 466 } }, { 0, 0, 25, 60.000114f, { -140, 50, 466 } },
|
||||
{ -1, 0, 25, 60.000114f, { -140, 50, 466 } }, { -1, 0, 25, 60.000114f, { -140, 50, 466 } },
|
||||
};
|
||||
CutsceneCameraPoint D_80B4DA4C[] = {
|
||||
static CutsceneCameraPoint D_80B4DA4C[] = {
|
||||
{ 0, 0, 0, 20.399963f, { -130, 50, 480 } }, { 0, 0, 0, 60.000114f, { -130, 50, 480 } },
|
||||
{ 0, 0, 0, 60.000114f, { -130, 50, 480 } }, { 0, 0, 0, 60.000114f, { -130, 50, 480 } },
|
||||
{ 0, 0, 0, 60.000114f, { -130, 50, 480 } }, { 0, 0, 0, 60.000114f, { -130, 50, 480 } },
|
||||
|
|
@ -306,21 +306,21 @@ CutsceneCameraPoint D_80B4DA4C[] = {
|
|||
{ 0, 0, 0, 60.000114f, { -130, 50, 480 } }, { 0, 0, 0, 60.000114f, { -130, 50, 480 } },
|
||||
{ -1, 0, 0, 60.000114f, { -130, 50, 480 } }, { -1, 0, 0, 60.000114f, { -130, 50, 480 } },
|
||||
};
|
||||
CutsceneCameraPoint D_80B4DB2C[] = {
|
||||
static CutsceneCameraPoint D_80B4DB2C[] = {
|
||||
{ 0, 0, 30, 20.799965f, { -427, 116, 4 } }, { 0, 0, 30, 20.799965f, { -426, 115, 4 } },
|
||||
{ 0, 0, 30, 20.799965f, { -429, 115, 7 } }, { 0, 0, 30, 20.799965f, { -428, 114, 12 } },
|
||||
{ 0, 0, 30, 20.799965f, { -430, 114, 14 } }, { 0, 0, 30, 20.799965f, { -430, 114, 14 } },
|
||||
{ 0, 0, 30, 20.799965f, { -430, 114, 14 } }, { -1, 0, 30, 20.799965f, { -430, 112, 14 } },
|
||||
{ -1, 0, 30, 20.799965f, { -430, 112, 14 } },
|
||||
};
|
||||
CutsceneCameraPoint D_80B4DBBC[] = {
|
||||
static CutsceneCameraPoint D_80B4DBBC[] = {
|
||||
{ 0, 0, 0, 20.799965f, { -389, 109, 36 } }, { 0, 0, 0, 20.799965f, { -389, 109, 36 } },
|
||||
{ 0, 0, 0, 20.799965f, { -389, 109, 36 } }, { 0, 0, 0, 20.799965f, { -389, 109, 36 } },
|
||||
{ 0, 0, 0, 20.799965f, { -389, 109, 36 } }, { 0, 0, 0, 20.799965f, { -389, 109, 36 } },
|
||||
{ 0, 0, 0, 20.799965f, { -389, 109, 36 } }, { -1, 0, 0, 20.799965f, { -389, 109, 36 } },
|
||||
{ -1, 0, 0, 20.799965f, { -389, 109, 36 } },
|
||||
};
|
||||
CutsceneCameraPoint D_80B4DC4C[] = {
|
||||
static CutsceneCameraPoint D_80B4DC4C[] = {
|
||||
{ 0, 0, 30, 45.0f, { -496, 119, 0 } }, { 0, 0, 30, 45.0f, { -496, 119, 0 } },
|
||||
{ 0, 0, 30, 45.0f, { -496, 119, 0 } }, { 0, 0, 15, 45.0f, { -496, 119, 0 } },
|
||||
{ 0, 0, 15, 45.80006f, { -471, 122, 0 } }, { 0, 0, 15, 45.80006f, { -395, 139, 0 } },
|
||||
|
|
@ -330,7 +330,7 @@ CutsceneCameraPoint D_80B4DC4C[] = {
|
|||
{ 0, 0, 30, 45.80006f, { 429, 328, 0 } }, { -1, 0, 30, 45.80006f, { 429, 328, 0 } },
|
||||
{ -1, 0, 30, 45.80006f, { 429, 328, 0 } },
|
||||
};
|
||||
CutsceneCameraPoint D_80B4DD3C[] = {
|
||||
static CutsceneCameraPoint D_80B4DD3C[] = {
|
||||
{ 0, 0, 0, 45.0f, { -443, 115, 0 } }, { 0, 0, 0, 45.0f, { -443, 115, 0 } },
|
||||
{ 0, 0, 0, 45.0f, { -443, 115, 0 } }, { 0, 0, 0, 45.0f, { -443, 115, 0 } },
|
||||
{ 0, 0, 0, 45.80006f, { -420, 133, 0 } }, { 0, 0, 0, 45.80006f, { -344, 150, 0 } },
|
||||
|
|
@ -340,7 +340,7 @@ CutsceneCameraPoint D_80B4DD3C[] = {
|
|||
{ 0, 0, 0, 45.80006f, { 482, 332, 0 } }, { -1, 0, 0, 45.80006f, { 482, 332, 0 } },
|
||||
{ -1, 0, 0, 45.80006f, { 482, 332, 0 } },
|
||||
};
|
||||
CutsceneCameraPoint D_80B4DE2C[] = {
|
||||
static CutsceneCameraPoint D_80B4DE2C[] = {
|
||||
{ 0, 0, 25, 60.600117f, { 66, 404, 425 } }, { 0, 0, 25, 60.400116f, { 66, 404, 425 } },
|
||||
{ 0, 0, 25, 55.600098f, { 66, 404, 426 } }, { 0, 0, 25, 55.200096f, { 63, 373, 413 } },
|
||||
{ 0, 0, 25, 50.400078f, { 26, 353, 408 } }, { 0, 0, 25, 50.400078f, { 17, 325, 397 } },
|
||||
|
|
@ -349,7 +349,7 @@ CutsceneCameraPoint D_80B4DE2C[] = {
|
|||
{ 0, 0, 25, 35.20002f, { -377, 108, 65 } }, { 0, 0, 25, 35.20002f, { -377, 108, 65 } },
|
||||
{ -1, 0, 30, 30.2f, { -376, 108, 65 } }, { -1, 0, 30, 30.2f, { -376, 108, 65 } },
|
||||
};
|
||||
CutsceneCameraPoint D_80B4DF0C[] = {
|
||||
static CutsceneCameraPoint D_80B4DF0C[] = {
|
||||
{ 0, 0, 0, 45.80006f, { 29, 383, 445 } }, { 0, 0, 0, 45.80006f, { 29, 383, 445 } },
|
||||
{ 0, 0, 0, 45.80006f, { 29, 383, 445 } }, { 0, 0, 0, 45.80006f, { 29, 383, 445 } },
|
||||
{ 0, 0, 0, 45.80006f, { 29, 383, 445 } }, { 0, 0, 0, 45.80006f, { 49, 347, 424 } },
|
||||
|
|
@ -358,71 +358,71 @@ CutsceneCameraPoint D_80B4DF0C[] = {
|
|||
{ 0, 0, 0, 30.2f, { -345, 109, 96 } }, { 0, 0, 0, 30.2f, { -345, 109, 96 } },
|
||||
{ -1, 0, 0, 30.2f, { -345, 109, 96 } }, { -1, 0, 0, 30.2f, { -345, 109, 96 } },
|
||||
};
|
||||
CutsceneCameraPoint D_80B4DFEC[] = {
|
||||
static CutsceneCameraPoint D_80B4DFEC[] = {
|
||||
{ 0, 0, 10, 30.0f, { -482, 119, 0 } }, { 0, 0, 10, 30.0f, { -482, 119, 0 } },
|
||||
{ 0, 0, 10, 30.0f, { -482, 119, 0 } }, { 0, 0, 10, 30.800003f, { -482, 119, 0 } },
|
||||
{ 0, 0, 10, 30.800003f, { -482, 119, 0 } }, { 0, 0, 10, 30.800003f, { -462, 126, 0 } },
|
||||
{ 0, 0, 30, 30.800003f, { -395, 150, 0 } }, { 0, 0, 30, 30.800003f, { -395, 150, 0 } },
|
||||
{ -1, 0, 30, 30.800003f, { -395, 150, 0 } }, { -1, 0, 30, 30.800003f, { -395, 150, 0 } },
|
||||
};
|
||||
CutsceneCameraPoint D_80B4E08C[] = {
|
||||
static CutsceneCameraPoint D_80B4E08C[] = {
|
||||
{ 0, 0, 0, 30.0f, { -440, 115, 0 } }, { 0, 0, 0, 30.0f, { -440, 115, 0 } },
|
||||
{ 0, 0, 0, 30.0f, { -440, 115, 0 } }, { 0, 0, 0, 30.800003f, { -440, 115, 0 } },
|
||||
{ 0, 0, 0, 30.800003f, { -440, 115, 0 } }, { 0, 0, 0, 30.800003f, { -423, 142, 0 } },
|
||||
{ 0, 0, 0, 30.800003f, { -358, 171, 0 } }, { 0, 0, 0, 30.800003f, { -358, 171, 0 } },
|
||||
{ -1, 0, 0, 30.800003f, { -358, 171, 0 } }, { -1, 0, 0, 30.800003f, { -358, 171, 0 } },
|
||||
};
|
||||
CutsceneCameraPoint D_80B4E12C[] = {
|
||||
static CutsceneCameraPoint D_80B4E12C[] = {
|
||||
{ 0, 0, 30, 25.0f, { -551, 119, 7 } }, { 0, 0, 30, 25.0f, { -551, 119, 7 } },
|
||||
{ 0, 0, 15, 25.0f, { -551, 119, 7 } }, { 0, 0, 15, 60.0f, { -485, 120, -7 } },
|
||||
{ 0, 0, 30, 60.0f, { -485, 120, -7 } }, { 0, 0, 30, 60.0f, { -485, 120, -7 } },
|
||||
{ 0, 0, 30, 60.0f, { -485, 118, -5 } }, { -1, 0, 30, 60.0f, { -485, 119, -6 } },
|
||||
{ -1, 0, 30, 60.0f, { -485, 119, -6 } },
|
||||
};
|
||||
CutsceneCameraPoint D_80B4E1BC[] = {
|
||||
static CutsceneCameraPoint D_80B4E1BC[] = {
|
||||
{ 0, 0, 0, 45.200058f, { -587, 115, 14 } }, { 0, 0, 0, 25.400097f, { -587, 115, 14 } },
|
||||
{ 0, 0, 0, 25.400097f, { -587, 115, 14 } }, { 0, 0, 0, 60.20023f, { -521, 117, -1 } },
|
||||
{ 0, 0, 0, 60.20023f, { -521, 117, -1 } }, { 0, 0, 0, 60.20023f, { -521, 117, -1 } },
|
||||
{ 0, 0, 0, 60.20023f, { -521, 117, -1 } }, { -1, 0, 0, 60.20023f, { -521, 116, 0 } },
|
||||
{ -1, 0, 0, 60.19925f, { -521, 116, 0 } },
|
||||
};
|
||||
CutsceneCameraPoint D_80B4E24C[] = {
|
||||
static CutsceneCameraPoint D_80B4E24C[] = {
|
||||
{ 0, 0, 30, 60.000114f, { 75, 52, 50 } }, { 0, 0, 30, 60.000114f, { 75, 52, 48 } },
|
||||
{ 0, 0, 60, 60.000114f, { 74, 52, 45 } }, { 0, 0, 60, 60.000114f, { 49, 51, -43 } },
|
||||
{ 0, 0, 30, 60.000114f, { 49, 51, -43 } }, { 0, 0, 30, 60.000114f, { 49, 51, -43 } },
|
||||
{ -1, 0, 30, 60.000114f, { 49, 51, -43 } }, { -1, 0, 30, 60.000114f, { 49, 51, -43 } },
|
||||
};
|
||||
CutsceneCameraPoint D_80B4E2CC[] = {
|
||||
static CutsceneCameraPoint D_80B4E2CC[] = {
|
||||
{ 0, 0, 0, 60.000114f, { 90, 52, 53 } }, { 0, 0, 0, 60.000114f, { 90, 52, 50 } },
|
||||
{ 0, 0, 0, 60.000114f, { 90, 52, 45 } }, { 0, 0, 0, 60.000114f, { 65, 51, -44 } },
|
||||
{ 0, 0, 0, 60.000114f, { 65, 51, -44 } }, { 0, 0, 0, 60.000114f, { 65, 51, -44 } },
|
||||
{ -1, 0, 0, 60.000114f, { 65, 51, -44 } }, { -1, 0, 0, 60.000114f, { 65, 51, -44 } },
|
||||
};
|
||||
CutsceneCameraPoint D_80B4E34C[] = {
|
||||
static CutsceneCameraPoint D_80B4E34C[] = {
|
||||
{ 0, 0, 31, 60.000114f, { -449, 121, -19 } }, { 0, 0, 30, 60.000114f, { -449, 121, -19 } },
|
||||
{ 0, 0, 30, 60.000114f, { -449, 121, -19 } }, { 0, 0, 30, 60.000114f, { -456, 110, -17 } },
|
||||
{ 0, 0, 30, 60.000114f, { -456, 110, -17 } }, { 0, 0, 30, 60.000114f, { -456, 110, -17 } },
|
||||
{ -1, 0, 30, 60.000114f, { -456, 110, -17 } }, { -1, 0, 30, 60.000114f, { -456, 110, -17 } },
|
||||
};
|
||||
CutsceneCameraPoint D_80B4E3CC[] = {
|
||||
static CutsceneCameraPoint D_80B4E3CC[] = {
|
||||
{ 0, 0, 0, 60.000114f, { -441, 107, -22 } }, { 0, 0, 0, 60.000114f, { -441, 107, -22 } },
|
||||
{ 0, 0, 0, 60.000114f, { -441, 107, -22 } }, { 0, 0, 0, 60.000114f, { -441, 107, -22 } },
|
||||
{ 0, 0, 0, 60.000114f, { -441, 107, -22 } }, { 0, 0, 0, 60.000114f, { -441, 107, -22 } },
|
||||
{ -1, 0, 0, 60.000114f, { -441, 107, -22 } }, { -1, 0, 0, 60.000114f, { -441, 107, -22 } },
|
||||
};
|
||||
CutsceneCameraPoint D_80B4E44C[] = {
|
||||
static CutsceneCameraPoint D_80B4E44C[] = {
|
||||
{ 0, 0, 30, 20.799965f, { -331, 110, -91 } }, { 0, 0, 30, 20.799965f, { -331, 110, -91 } },
|
||||
{ 0, 0, 30, 20.799965f, { -331, 110, -91 } }, { 0, 0, 30, 20.799965f, { -511, 121, 7 } },
|
||||
{ 0, 0, 30, 20.799965f, { -511, 121, 7 } }, { 0, 0, 30, 20.799965f, { -511, 121, 7 } },
|
||||
{ -1, 0, 30, 20.799965f, { -511, 121, 7 } }, { -1, 0, 30, 20.799965f, { -511, 121, 7 } },
|
||||
};
|
||||
CutsceneCameraPoint D_80B4E4CC[] = {
|
||||
static CutsceneCameraPoint D_80B4E4CC[] = {
|
||||
{ 0, 0, 0, 20.799965f, { -369, 110, -70 } }, { 0, 0, 0, 20.799965f, { -369, 110, -70 } },
|
||||
{ 0, 0, 0, 20.799965f, { -369, 110, -70 } }, { 0, 0, 0, 20.799965f, { -549, 124, 29 } },
|
||||
{ 0, 0, 0, 20.799965f, { -549, 124, 29 } }, { 0, 0, 0, 20.799965f, { -549, 124, 29 } },
|
||||
{ -1, 0, 0, 20.799965f, { -549, 124, 29 } }, { -1, 0, 0, 20.799965f, { -549, 124, 29 } },
|
||||
};
|
||||
CutsceneCameraMove D_80B4E54C[] = {
|
||||
static CutsceneCameraMove D_80B4E54C[] = {
|
||||
{ D_80B4D72C, D_80B4D7AC, 0 }, { D_80B4D82C, D_80B4D8CC, 0 }, { D_80B4D96C, D_80B4DA4C, 0 },
|
||||
{ D_80B4DB2C, D_80B4DBBC, 0 }, { D_80B4DC4C, D_80B4DD3C, 0 }, { D_80B4DE2C, D_80B4DF0C, 0 },
|
||||
{ D_80B4DFEC, D_80B4E08C, 0 }, { D_80B4E12C, D_80B4E1BC, 0 }, { D_80B4E24C, D_80B4E2CC, 0 },
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue