1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-12-29 00:06:33 +00:00

use CS_TEXT_NORMAL when needed (#2367)

This commit is contained in:
Yanis 2024-12-15 21:11:25 +01:00 committed by GitHub
parent 76c1b621ac
commit 582f040789
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 43 additions and 43 deletions

View file

@ -18,11 +18,11 @@ CutsceneData D_808BBD90[] = {
CS_MISC(CS_MISC_STOP_CUTSCENE, 340, 341, 0x0000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0xFFFFFFFD, 0xFFFFFFFF, 0x00000000, 0xFFFFFFFD, 0x00000000, 0x00000000, 0x00000000),
CS_TEXT_LIST(6),
CS_TEXT_NONE(0, 50),
CS_TEXT(0x70E6, 50, 60, 0x0000, 0x0000, 0x0000),
CS_TEXT(0x70E6, 50, 60, CS_TEXT_NORMAL, 0x0000, 0x0000),
CS_TEXT_NONE(60, 250),
CS_TEXT(0x70E7, 250, 260, 0x0000, 0x0000, 0x0000),
CS_TEXT(0x70E7, 250, 260, CS_TEXT_NORMAL, 0x0000, 0x0000),
CS_TEXT_NONE(260, 290),
CS_TEXT(0x70E8, 290, 320, 0x0000, 0x0000, 0x0000),
CS_TEXT(0x70E8, 290, 320, CS_TEXT_NORMAL, 0x0000, 0x0000),
CS_CAM_EYE_SPLINE(0, 251),
CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42700000, 60.0f), -59, 12, 690, 0x0222),
CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42700000, 60.0f), -59, 12, 690, 0x00FA),

View file

@ -43,9 +43,9 @@ CutsceneData D_808BCE20[] = {
CS_CAM_POINT(CS_CAM_STOP, 0x00, 30, CS_FLOAT(0x423CCCC1, 47.199955f), 2673, 127, -267, 0x7805),
CS_TEXT_LIST(4),
CS_TEXT_NONE(0, 40),
CS_TEXT(0x107D, 40, 60, 0x0000, 0xFFFF, 0xFFFF),
CS_TEXT(0x107D, 40, 60, CS_TEXT_NORMAL, 0xFFFF, 0xFFFF),
CS_TEXT_NONE(60, 160),
CS_TEXT(0x1015, 160, 170, 0x0000, 0xFFFF, 0xFFFF),
CS_TEXT(0x1015, 160, 170, CS_TEXT_NORMAL, 0xFFFF, 0xFFFF),
CS_MISC_LIST(1),
CS_MISC(CS_MISC_STOP_CUTSCENE, 180, 200, 0x0000, 0x00000000, 0x00000000, 0xFFFFFFF7, 0xFFFFFFDB, 0x00000000, 0xFFFFFFF7, 0xFFFFFFDB, 0x00000000, 0x00000000, 0x00000000),
CS_ACTOR_CUE_LIST(CS_CMD_ACTOR_CUE_0_6, 1),
@ -96,7 +96,7 @@ CutsceneData D_808BD2A0[] = {
CS_CAM_POINT(CS_CAM_STOP, 0x00, 30, CS_FLOAT(0x42700000, 60.0f), 1, 35, -36, 0x9D94),
CS_TEXT_LIST(2),
CS_TEXT_NONE(0, 20),
CS_TEXT(0x1016, 20, 80, 0x0000, 0xFFFF, 0xFFFF),
CS_TEXT(0x1016, 20, 80, CS_TEXT_NORMAL, 0xFFFF, 0xFFFF),
CS_START_SEQ_LIST(1),
CS_START_SEQ(NA_BGM_DEKU_TREE_CS, 0, 1, 0x0000, 0x00000000, 0x00000000, 0xFFFFFFAC, 0x0000007E, 0x00000000, 0xFFFFFFAC, 0x0000007E),
CS_END_OF_SCRIPT(),
@ -127,7 +127,7 @@ CutsceneData D_808BD520[] = {
CS_CAM_POINT(CS_CAM_STOP, 0x00, 30, CS_FLOAT(0x4223FFED, 40.999928f), 3765, -118, -617, 0x01BC),
CS_TEXT_LIST(2),
CS_TEXT_NONE(0, 20),
CS_TEXT(0x1017, 20, 60, 0x0000, 0xFFFF, 0xFFFF),
CS_TEXT(0x1017, 20, 60, CS_TEXT_NORMAL, 0xFFFF, 0xFFFF),
CS_MISC_LIST(1),
CS_MISC(CS_MISC_STOP_CUTSCENE, 100, 150, 0x0000, 0x00000000, 0x00000000, 0xFFFFFFF5, 0x00000010, 0x00000000, 0xFFFFFFF5, 0x00000010, 0x00000000, 0x00000000, 0x00000000),
CS_STOP_SEQ_LIST(1),
@ -157,7 +157,7 @@ CutsceneData D_808BD790[] = {
CS_CAM_POINT(CS_CAM_STOP, 0x00, 30, CS_FLOAT(0x4297331E, 75.59984f), 3769, 718, -1186, 0x56AC),
CS_TEXT_LIST(2),
CS_TEXT_NONE(0, 20),
CS_TEXT(0x1018, 20, 60, 0x0000, 0xFFFF, 0xFFFF),
CS_TEXT(0x1018, 20, 60, CS_TEXT_NORMAL, 0xFFFF, 0xFFFF),
CS_MISC_LIST(1),
CS_MISC(CS_MISC_STOP_CUTSCENE, 80, 110, 0x0000, 0x00000000, 0x00000000, 0xFFFFFFEA, 0x00000006, 0x00000000, 0xFFFFFFEA, 0x00000006, 0x00000000, 0x00000000, 0x00000000),
CS_STOP_SEQ_LIST(1),

View file

@ -39,15 +39,15 @@ static CutsceneData gFireMedallionCs[] = {
CS_FADE_OUT_SEQ(CS_FADE_OUT_BGM_MAIN, 500, 550, 0x0000, 0x00000000, 0x00000000, 0xFFFFFFC3, 0x0000006E, 0x00000000, 0xFFFFFFC3, 0x0000006E),
CS_TEXT_LIST(10),
CS_TEXT_NONE(0, 310),
CS_TEXT(0x303C, 310, 323, 0x0000, 0x0000, 0x0000),
CS_TEXT(0x303C, 310, 323, CS_TEXT_NORMAL, 0x0000, 0x0000),
CS_TEXT_NONE(323, 344),
CS_TEXT(0x3045, 344, 394, 0x0000, 0x0000, 0x0000),
CS_TEXT(0x3045, 344, 394, CS_TEXT_NORMAL, 0x0000, 0x0000),
CS_TEXT_NONE(394, 415),
CS_TEXT(0x3046, 415, 465, 0x0000, 0x0000, 0x0000),
CS_TEXT(0x3046, 415, 465, CS_TEXT_NORMAL, 0x0000, 0x0000),
CS_TEXT_NONE(465, 800),
CS_TEXT(0x003C, 800, 805, 0x0000, 0x0000, 0x0000),
CS_TEXT(0x003C, 800, 805, CS_TEXT_NORMAL, 0x0000, 0x0000),
CS_TEXT_NONE(805, 865),
CS_TEXT(0x303D, 865, 875, 0x0000, 0x0000, 0x0000),
CS_TEXT(0x303D, 865, 875, CS_TEXT_NORMAL, 0x0000, 0x0000),
CS_CAM_EYE_SPLINE(0, 1361),
CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x4271999A, 60.4f), -85, 3211, 795, 0x00C6),
CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x4271999A, 60.4f), -85, 3211, 795, 0x00C8),

View file

@ -35,19 +35,19 @@ static CutsceneData gShadowMedallionCs[] = {
CS_START_SEQ(NA_BGM_MEDALLION_GET, 770, 771, 0x0000, 0x00000000, 0x00000000, 0xFFFFFFC9, 0x0000005C, 0x00000000, 0xFFFFFFC9, 0x0000005C),
CS_TEXT_LIST(14),
CS_TEXT_NONE(0, 340),
CS_TEXT(0x5022, 340, 353, 0x0000, 0x0000, 0x0000),
CS_TEXT(0x5022, 340, 353, CS_TEXT_NORMAL, 0x0000, 0x0000),
CS_TEXT_NONE(353, 374),
CS_TEXT(0x5025, 374, 404, 0x0000, 0x0000, 0x0000),
CS_TEXT(0x5025, 374, 404, CS_TEXT_NORMAL, 0x0000, 0x0000),
CS_TEXT_NONE(404, 424),
CS_TEXT(0x502B, 424, 474, 0x0000, 0x0000, 0x0000),
CS_TEXT(0x502B, 424, 474, CS_TEXT_NORMAL, 0x0000, 0x0000),
CS_TEXT_NONE(474, 494),
CS_TEXT(0x502C, 494, 543, 0x0000, 0x0000, 0x0000),
CS_TEXT(0x502C, 494, 543, CS_TEXT_NORMAL, 0x0000, 0x0000),
CS_TEXT_NONE(543, 564),
CS_TEXT(0x5026, 564, 613, 0x0000, 0x0000, 0x0000),
CS_TEXT(0x5026, 564, 613, CS_TEXT_NORMAL, 0x0000, 0x0000),
CS_TEXT_NONE(613, 955),
CS_TEXT(0x0041, 955, 959, 0x0000, 0x0000, 0x0000),
CS_TEXT(0x0041, 955, 959, CS_TEXT_NORMAL, 0x0000, 0x0000),
CS_TEXT_NONE(959, 1020),
CS_TEXT(0x5023, 1020, 1029, 0x0000, 0x0000, 0x0000),
CS_TEXT(0x5023, 1020, 1029, CS_TEXT_NORMAL, 0x0000, 0x0000),
CS_DESTINATION(CS_DEST_GRAVEYARD_FROM_CHAMBER_OF_SAGES, 1060, 1061),
CS_FADE_OUT_SEQ_LIST(1),
CS_FADE_OUT_SEQ(CS_FADE_OUT_BGM_MAIN, 673, 723, 0x0000, 0x00000000, 0x00000000, 0xFFFFFFC1, 0x00000058, 0x00000000, 0xFFFFFFC1, 0x00000058),

View file

@ -30,15 +30,15 @@ static CutsceneData gForestMedallionCs[] = {
CS_DESTINATION(CS_DEST_KOKIRI_FOREST_FROM_CHAMBER_OF_SAGES, 974, 1050),
CS_TEXT_LIST(10),
CS_TEXT_NONE(0, 303),
CS_TEXT(0x106A, 303, 323, 0x0000, 0x0000, 0x0000),
CS_TEXT(0x106A, 303, 323, CS_TEXT_NORMAL, 0x0000, 0x0000),
CS_TEXT_NONE(323, 344),
CS_TEXT(0x108F, 344, 394, 0x0000, 0x0000, 0x0000),
CS_TEXT(0x108F, 344, 394, CS_TEXT_NORMAL, 0x0000, 0x0000),
CS_TEXT_NONE(394, 415),
CS_TEXT(0x1090, 415, 465, 0x0000, 0x0000, 0x0000),
CS_TEXT(0x1090, 415, 465, CS_TEXT_NORMAL, 0x0000, 0x0000),
CS_TEXT_NONE(465, 871),
CS_TEXT(0x003E, 871, 875, 0x0000, 0x0000, 0x0000),
CS_TEXT(0x003E, 871, 875, CS_TEXT_NORMAL, 0x0000, 0x0000),
CS_TEXT_NONE(875, 936),
CS_TEXT(0x106B, 936, 946, 0x0000, 0x0000, 0x0000),
CS_TEXT(0x106B, 936, 946, CS_TEXT_NORMAL, 0x0000, 0x0000),
CS_START_SEQ_LIST(1),
CS_START_SEQ(NA_BGM_MEDALLION_GET, 686, 687, 0x0000, 0x00000000, 0x00000000, 0xFFFFFFC5, 0x00000057, 0x00000000, 0xFFFFFFC5, 0x00000057),
CS_FADE_OUT_SEQ_LIST(1),

View file

@ -31,15 +31,15 @@ static CutsceneData gSpiritMedallionCs[] = {
CS_TRANSITION(CS_TRANS_GRAY_FILL_IN, 765, 795),
CS_TEXT_LIST(10),
CS_TEXT_NONE(0, 345),
CS_TEXT(0x6035, 345, 353, 0x0000, 0x0000, 0x0000),
CS_TEXT(0x6035, 345, 353, CS_TEXT_NORMAL, 0x0000, 0x0000),
CS_TEXT_NONE(353, 374),
CS_TEXT(0x6039, 374, 399, 0x0000, 0x0000, 0x0000),
CS_TEXT(0x6039, 374, 399, CS_TEXT_NORMAL, 0x0000, 0x0000),
CS_TEXT_NONE(399, 400),
CS_TEXT(0x603A, 400, 424, 0x0000, 0x0000, 0x0000),
CS_TEXT(0x603A, 400, 424, CS_TEXT_NORMAL, 0x0000, 0x0000),
CS_TEXT_NONE(424, 760),
CS_TEXT(0x003F, 760, 765, 0x0000, 0x0000, 0x0000),
CS_TEXT(0x003F, 760, 765, CS_TEXT_NORMAL, 0x0000, 0x0000),
CS_TEXT_NONE(765, 825),
CS_TEXT(0x6036, 825, 835, 0x0000, 0x0000, 0x0000),
CS_TEXT(0x6036, 825, 835, CS_TEXT_NORMAL, 0x0000, 0x0000),
CS_ACTOR_CUE_LIST(CS_CMD_ACTOR_CUE_8_0, 1),
CS_ACTOR_CUE(0x0004, 0, 3000, 0x0000, 0x0000, 0x0000, 50, 80, 56, 50, 80, 56, CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f)),
CS_DESTINATION(CS_DEST_DESERT_COLOSSUS_FROM_CHAMBER_OF_SAGES, 865, 907),

View file

@ -24,9 +24,9 @@ static CutsceneData gRutoFirstMeetingCs[] = {
CS_MISC(CS_MISC_STOP_CUTSCENE, 315, 345, 0x0000, 0x00000000, 0x00000000, 0xFFFFFFC0, 0x00000032, 0x00000000, 0xFFFFFFC0, 0x00000032, 0x00000000, 0x00000000, 0x00000000),
CS_TEXT_LIST(4),
CS_TEXT_NONE(0, 157),
CS_TEXT(0x404B, 157, 175, 0x0000, 0xFFFF, 0xFFFF),
CS_TEXT(0x404B, 157, 175, CS_TEXT_NORMAL, 0xFFFF, 0xFFFF),
CS_TEXT_NONE(175, 252),
CS_TEXT(0x401E, 252, 300, 0x0000, 0xFFFF, 0xFFFF),
CS_TEXT(0x401E, 252, 300, CS_TEXT_NORMAL, 0xFFFF, 0xFFFF),
CS_CAM_EYE_SPLINE(0, 247),
CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x4235998B, 45.399944f), 55, -290, -2749, 0x20BA),
CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x4235998B, 45.399944f), 55, -290, -2749, 0x44B8),
@ -135,11 +135,11 @@ static CutsceneData gRutoObtainingSapphireCs[] = {
CS_ACTOR_CUE(0x0004, 220, 410, 0x0000, 0x0000, 0x0000, -1065, -973, -3344, -1065, -976, -3344, CS_FLOAT(0x0, 0.0f), CS_FLOAT(0xBC8158ED, -0.015789473f), CS_FLOAT(0x0, 0.0f)),
CS_TEXT_LIST(6),
CS_TEXT_NONE(0, 162),
CS_TEXT(0x4050, 162, 211, 0x0000, 0xFFFF, 0xFFFF),
CS_TEXT(0x4050, 162, 211, CS_TEXT_NORMAL, 0xFFFF, 0xFFFF),
CS_TEXT_NONE(211, 232),
CS_TEXT(0x4051, 232, 241, 0x0000, 0xFFFF, 0xFFFF),
CS_TEXT(0x4051, 232, 241, CS_TEXT_NORMAL, 0xFFFF, 0xFFFF),
CS_TEXT_NONE(241, 247),
CS_TEXT(0x4052, 247, 299, 0x0000, 0xFFFF, 0xFFFF),
CS_TEXT(0x4052, 247, 299, CS_TEXT_NORMAL, 0xFFFF, 0xFFFF),
CS_START_SEQ_LIST(1),
CS_START_SEQ(NA_BGM_ITEM_GET, 112, 113, 0x0000, 0x00000000, 0x00000000, 0xFFFFFFC7, 0x000000B1, 0x00000000, 0xFFFFFFC7, 0x000000B1),
CS_CAM_EYE_SPLINE(0, 1176),
@ -233,7 +233,7 @@ static CutsceneData gRutoFoundSapphireCs[] = {
CS_CAM_POINT(CS_CAM_STOP, 0x00, 30, CS_FLOAT(0x424B3339, 50.800022f), -35, 56, -93, 0x0000),
CS_TEXT_LIST(2),
CS_TEXT_NONE(0, 35),
CS_TEXT(0x404F, 35, 70, 0x0000, 0xFFFF, 0xFFFF),
CS_TEXT(0x404F, 35, 70, CS_TEXT_NORMAL, 0xFFFF, 0xFFFF),
CS_END_OF_SCRIPT(),
};
// clang-format on

View file

@ -201,19 +201,19 @@ static CutsceneData gWaterMedallionCs[] = {
CS_ACTOR_CUE(0x0004, 0, 3000, 0xC10F, 0x0000, 0x0000, 77, 80, -2, 0, 80, 0, CS_FLOAT(0xBCD242E7, -0.025666667f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x3CD242E7, 0.025666667f)),
CS_TEXT_LIST(14),
CS_TEXT_NONE(0, 394),
CS_TEXT(0x4041, 394, 444, 0x0000, 0x0000, 0x0000),
CS_TEXT(0x4041, 394, 444, CS_TEXT_NORMAL, 0x0000, 0x0000),
CS_TEXT_NONE(444, 464),
CS_TEXT(0x4046, 464, 543, 0x0000, 0x0000, 0x0000),
CS_TEXT(0x4046, 464, 543, CS_TEXT_NORMAL, 0x0000, 0x0000),
CS_TEXT_NONE(543, 564),
CS_TEXT(0x4049, 564, 613, 0x0000, 0x0000, 0x0000),
CS_TEXT(0x4049, 564, 613, CS_TEXT_NORMAL, 0x0000, 0x0000),
CS_TEXT_NONE(613, 634),
CS_TEXT(0x4047, 634, 684, 0x0000, 0x0000, 0x0000),
CS_TEXT(0x4047, 634, 684, CS_TEXT_NORMAL, 0x0000, 0x0000),
CS_TEXT_NONE(684, 704),
CS_TEXT(0x404A, 704, 750, 0x0000, 0x0000, 0x0000),
CS_TEXT(0x404A, 704, 750, CS_TEXT_NORMAL, 0x0000, 0x0000),
CS_TEXT_NONE(750, 1085),
CS_TEXT(0x003D, 1085, 1090, 0x0000, 0x0000, 0x0000),
CS_TEXT(0x003D, 1085, 1090, CS_TEXT_NORMAL, 0x0000, 0x0000),
CS_TEXT_NONE(1090, 1150),
CS_TEXT(0x4042, 1150, 1160, 0x0000, 0x0000, 0x0000),
CS_TEXT(0x4042, 1150, 1160, CS_TEXT_NORMAL, 0x0000, 0x0000),
CS_DESTINATION(CS_DEST_LAKE_HYLIA_WATER_RESTORED, 1190, 1213),
CS_START_SEQ_LIST(1),
CS_START_SEQ(NA_BGM_MEDALLION_GET, 900, 901, 0x0000, 0x00000000, 0x00000000, 0xFFFFFFC7, 0x00000034, 0x00000000, 0xFFFFFFC7, 0x00000034),