refresh 4

This commit is contained in:
n64
2019-12-01 21:52:53 -05:00
parent a7c423cb43
commit 04732af90b
729 changed files with 21400 additions and 37110 deletions

View File

@@ -3,15 +3,11 @@
#include "make_const_nonconst.h"
// 0x07000000 - 0x07000008
static const Ambient debug_level_select_light_07000000 = {
{{0x7f, 0x00, 0x00}, 0, {0x7f, 0x00, 0x00}, 0}
};
// 0x07000008 - 0x07000018
static const Light debug_level_select_light_07000008 = {
{{0xff, 0x00, 0x00}, 0, {0xff, 0x00, 0x00}, 0, {0x00, 0x00, 0x50}, 0}
};
// 0x07000000 - 0x07000018
static const Lights1 debug_level_select_lights_07000000 = gdSPDefLights1(
0x7f, 0x00, 0x00,
0xff, 0x00, 0x00, 0x00, 0x00, 0x50
);
// 0x07000018 - 0x07000108
static const Vtx debug_level_select_vertex_07000018[] = {
@@ -184,9 +180,7 @@ static const Vtx debug_level_select_vertex_07000798[] = {
// 0x07000858 - 0x07000A28
const Gfx debug_level_select_dl_07000858[] = {
gsDPPipeSync(),
gsSPNumLights(NUMLIGHTS_1), // I cannot tell if they meant to put 0 or 1 here.
gsSPLight(&debug_level_select_light_07000008, 1),
gsSPLight(&debug_level_select_light_07000000, 2),
gsSPSetLights1(debug_level_select_lights_07000000),
gsSPVertex(debug_level_select_vertex_07000018, 15, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0),
@@ -225,15 +219,11 @@ const Gfx debug_level_select_dl_07000858[] = {
gsSPEndDisplayList(),
};
// 0x07000A28 - 0x07000A30
static const Ambient debug_level_select_light_07000A28 = {
{{0x00, 0x00, 0x7f}, 0, {0x00, 0x00, 0x7f}, 0}
};
// 0x07000A30 - 0x07000A40
static const Light debug_level_select_light_07000A30 = {
{{0x00, 0x00, 0xff}, 0, {0x00, 0x00, 0xff}, 0, {0x00, 0x00, 0x50}, 0}
};
// 0x07000A28 - 0x07000A40
static const Lights1 debug_level_select_lights_07000A28 = gdSPDefLights1(
0x00, 0x00, 0x7f,
0x00, 0x00, 0xff, 0x00, 0x00, 0x50
);
// 0x07000A40 - 0x07000B30
static const Vtx debug_level_select_vertex_07000A40[] = {
@@ -378,9 +368,7 @@ static const Vtx debug_level_select_vertex_070010D0[] = {
// 0x07001100 - 0x07001288
const Gfx debug_level_select_dl_07001100[] = {
gsDPPipeSync(),
gsSPNumLights(NUMLIGHTS_1), // I cannot tell if they meant to put 0 or 1 here.
gsSPLight(&debug_level_select_light_07000A30, 1),
gsSPLight(&debug_level_select_light_07000A28, 2),
gsSPSetLights1(debug_level_select_lights_07000A28),
gsSPVertex(debug_level_select_vertex_07000A40, 15, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0),
@@ -414,15 +402,11 @@ const Gfx debug_level_select_dl_07001100[] = {
gsSPEndDisplayList(),
};
// 0x07001288 - 0x07001290
static const Ambient debug_level_select_light_07001288 = {
{{0x00, 0x56, 0x00}, 0, {0x00, 0x56, 0x00}, 0}
};
// 0x07001290 - 0x070012A0
static const Light debug_level_select_light_07001290 = {
{{0x00, 0xad, 0x00}, 0, {0x00, 0xad, 0x00}, 0, {0x00, 0x00, 0x50}, 0}
};
// 0x07001288 - 0x070012A0
static const Lights1 debug_level_select_lights_07001288 = gdSPDefLights1(
0x00, 0x56, 0x00,
0x00, 0xad, 0x00, 0x00, 0x00, 0x50
);
// 0x070012A0 - 0x07001390
static const Vtx debug_level_select_vertex_070012A0[] = {
@@ -611,9 +595,7 @@ static const Vtx debug_level_select_vertex_07001B10[] = {
// 0x07001BA0 - 0x07001D98
const Gfx debug_level_select_dl_07001BA0[] = {
gsDPPipeSync(),
gsSPNumLights(NUMLIGHTS_1), // I cannot tell if they meant to put 0 or 1 here.
gsSPLight(&debug_level_select_light_07001290, 1),
gsSPLight(&debug_level_select_light_07001288, 2),
gsSPSetLights1(debug_level_select_lights_07001288),
gsSPVertex(debug_level_select_vertex_070012A0, 15, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0),
@@ -656,15 +638,11 @@ const Gfx debug_level_select_dl_07001BA0[] = {
gsSPEndDisplayList(),
};
// 0x07001D98 - 0x07001DA0
static const Ambient debug_level_select_light_07001D98 = {
{{0x7f, 0x00, 0x00}, 0, {0x7f, 0x00, 0x00}, 0}
};
// 0x07001DA0 - 0x07001DB0
static const Light debug_level_select_light_07001DA0 = {
{{0xff, 0x00, 0x00}, 0, {0xff, 0x00, 0x00}, 0, {0x00, 0x00, 0x50}, 0}
};
// 0x07001D98 - 0x07001DB0
static const Lights1 debug_level_select_lights_07001D98 = gdSPDefLights1(
0x7f, 0x00, 0x00,
0xff, 0x00, 0x00, 0x00, 0x00, 0x50
);
// 0x07001DB0 - 0x07001EA0
static const Vtx debug_level_select_vertex_07001DB0[] = {
@@ -837,9 +815,7 @@ static const Vtx debug_level_select_vertex_07002530[] = {
// 0x070025F0 - 0x070027C0
const Gfx debug_level_select_dl_070025F0[] = {
gsDPPipeSync(),
gsSPNumLights(NUMLIGHTS_1), // I cannot tell if they meant to put 0 or 1 here.
gsSPLight(&debug_level_select_light_07001DA0, 1),
gsSPLight(&debug_level_select_light_07001D98, 2),
gsSPSetLights1(debug_level_select_lights_07001D98),
gsSPVertex(debug_level_select_vertex_07001DB0, 15, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0),
@@ -878,15 +854,11 @@ const Gfx debug_level_select_dl_070025F0[] = {
gsSPEndDisplayList(),
};
// 0x070027C0 - 0x070027C8
static const Ambient debug_level_select_light_070027C0 = {
{{0x00, 0x00, 0x7f}, 0, {0x00, 0x00, 0x7f}, 0}
};
// 0x070027C8 - 0x070027D8
static const Light debug_level_select_light_070027C8 = {
{{0x00, 0x00, 0xff}, 0, {0x00, 0x00, 0xff}, 0, {0x00, 0x00, 0x50}, 0}
};
// 0x070027C0 - 0x070027D8
static const Lights1 debug_level_select_lights_070027C0 = gdSPDefLights1(
0x00, 0x00, 0x7f,
0x00, 0x00, 0xff, 0x00, 0x00, 0x50
);
// 0x070027D8 - 0x070028C8
static const Vtx debug_level_select_vertex_070027D8[] = {
@@ -1107,9 +1079,7 @@ static const Vtx debug_level_select_vertex_07003228[] = {
// 0x07003258 - 0x070034A0
const Gfx debug_level_select_dl_07003258[] = {
gsDPPipeSync(),
gsSPNumLights(NUMLIGHTS_1), // I cannot tell if they meant to put 0 or 1 here.
gsSPLight(&debug_level_select_light_070027C8, 1),
gsSPLight(&debug_level_select_light_070027C0, 2),
gsSPSetLights1(debug_level_select_lights_070027C0),
gsSPVertex(debug_level_select_vertex_070027D8, 15, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0),
@@ -1159,15 +1129,11 @@ const Gfx debug_level_select_dl_07003258[] = {
gsSPEndDisplayList(),
};
// 0x070034A0 - 0x070034A8
static const Ambient debug_level_select_light_070034A0 = {
{{0x7f, 0x00, 0x00}, 0, {0x7f, 0x00, 0x00}, 0}
};
// 0x070034A8 - 0x070034B8
static const Light debug_level_select_light_070034A8 = {
{{0xff, 0x00, 0x00}, 0, {0xff, 0x00, 0x00}, 0, {0x00, 0x00, 0x50}, 0}
};
// 0x070034A0 - 0x070034B8
static const Lights1 debug_level_select_lights_070034A0 = gdSPDefLights1(
0x7f, 0x00, 0x00,
0xff, 0x00, 0x00, 0x00, 0x00, 0x50
);
// 0x070034B8 - 0x070035A8
static const Vtx debug_level_select_vertex_070034B8[] = {
@@ -1356,9 +1322,7 @@ static const Vtx debug_level_select_vertex_07003D28[] = {
// 0x07003DB8 - 0x07003FB0
const Gfx debug_level_select_dl_07003DB8[] = {
gsDPPipeSync(),
gsSPNumLights(NUMLIGHTS_1), // I cannot tell if they meant to put 0 or 1 here.
gsSPLight(&debug_level_select_light_070034A8, 1),
gsSPLight(&debug_level_select_light_070034A0, 2),
gsSPSetLights1(debug_level_select_lights_070034A0),
gsSPVertex(debug_level_select_vertex_070034B8, 15, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0),
@@ -1401,15 +1365,11 @@ const Gfx debug_level_select_dl_07003DB8[] = {
gsSPEndDisplayList(),
};
// 0x07003FB0 - 0x07003FB8
static const Ambient debug_level_select_light_07003FB0 = {
{{0x00, 0x00, 0x7f}, 0, {0x00, 0x00, 0x7f}, 0}
};
// 0x07003FB8 - 0x07003FC8
static const Light debug_level_select_light_07003FB8 = {
{{0x00, 0x00, 0xff}, 0, {0x00, 0x00, 0xff}, 0, {0x00, 0x00, 0x50}, 0}
};
// 0x07003FB0 - 0x07003FC8
static const Lights1 debug_level_select_lights_07003FB0 = gdSPDefLights1(
0x00, 0x00, 0x7f,
0x00, 0x00, 0xff, 0x00, 0x00, 0x50
);
// 0x07003FC8 - 0x070040B8
static const Vtx debug_level_select_vertex_07003FC8[] = {
@@ -1598,9 +1558,7 @@ static const Vtx debug_level_select_vertex_07004838[] = {
// 0x070048C8 - 0x07004AC0
const Gfx debug_level_select_dl_070048C8[] = {
gsDPPipeSync(),
gsSPNumLights(NUMLIGHTS_1), // I cannot tell if they meant to put 0 or 1 here.
gsSPLight(&debug_level_select_light_07003FB8, 1),
gsSPLight(&debug_level_select_light_07003FB0, 2),
gsSPSetLights1(debug_level_select_lights_07003FB0),
gsSPVertex(debug_level_select_vertex_07003FC8, 15, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0),
@@ -1643,15 +1601,11 @@ const Gfx debug_level_select_dl_070048C8[] = {
gsSPEndDisplayList(),
};
// 0x07004AC0 - 0x07004AC8
static const Ambient debug_level_select_light_07004AC0 = {
{{0x00, 0x59, 0x00}, 0, {0x00, 0x59, 0x00}, 0}
};
// 0x07004AC8 - 0x07004AD8
static const Light debug_level_select_light_07004AC8 = {
{{0x00, 0xb2, 0x00}, 0, {0x00, 0xb2, 0x00}, 0, {0x00, 0x00, 0x50}, 0}
};
// 0x07004AC0 - 0x07004AD8
static const Lights1 debug_level_select_lights_07004AC0 = gdSPDefLights1(
0x00, 0x59, 0x00,
0x00, 0xb2, 0x00, 0x00, 0x00, 0x50
);
// 0x07004AD8 - 0x07004BC8
static const Vtx debug_level_select_vertex_07004AD8[] = {
@@ -1872,9 +1826,7 @@ static const Vtx debug_level_select_vertex_07005528[] = {
// 0x07005558 - 0x070057A0
const Gfx debug_level_select_dl_07005558[] = {
gsDPPipeSync(),
gsSPNumLights(NUMLIGHTS_1), // I cannot tell if they meant to put 0 or 1 here.
gsSPLight(&debug_level_select_light_07004AC8, 1),
gsSPLight(&debug_level_select_light_07004AC0, 2),
gsSPSetLights1(debug_level_select_lights_07004AC0),
gsSPVertex(debug_level_select_vertex_07004AD8, 15, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0),
@@ -1924,15 +1876,11 @@ const Gfx debug_level_select_dl_07005558[] = {
gsSPEndDisplayList(),
};
// 0x070057A0 - 0x070057A8
static const Ambient debug_level_select_light_070057A0 = {
{{0x7f, 0x00, 0x00}, 0, {0x7f, 0x00, 0x00}, 0}
};
// 0x070057A8 - 0x070057B8
static const Light debug_level_select_light_070057A8 = {
{{0xff, 0x00, 0x00}, 0, {0xff, 0x00, 0x00}, 0, {0x00, 0x00, 0x50}, 0}
};
// 0x070057A0 - 0x070057B8
static const Lights1 debug_level_select_lights_070057A0 = gdSPDefLights1(
0x7f, 0x00, 0x00,
0xff, 0x00, 0x00, 0x00, 0x00, 0x50
);
// 0x070057B8 - 0x070058A8
static const Vtx debug_level_select_vertex_070057B8[] = {
@@ -1985,9 +1933,7 @@ static const Vtx debug_level_select_vertex_07005998[] = {
// 0x070059F8 - 0x07005A98
const Gfx debug_level_select_dl_070059F8[] = {
gsDPPipeSync(),
gsSPNumLights(NUMLIGHTS_1), // I cannot tell if they meant to put 0 or 1 here.
gsSPLight(&debug_level_select_light_070057A8, 1),
gsSPLight(&debug_level_select_light_070057A0, 2),
gsSPSetLights1(debug_level_select_lights_070057A0),
gsSPVertex(debug_level_select_vertex_070057B8, 15, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0),
@@ -2001,15 +1947,11 @@ const Gfx debug_level_select_dl_070059F8[] = {
gsSPEndDisplayList(),
};
// 0x07005A98 - 0x07005AA0
static const Ambient debug_level_select_light_07005A98 = {
{{0x00, 0x00, 0x7f}, 0, {0x00, 0x00, 0x7f}, 0}
};
// 0x07005AA0 - 0x07005AB0
static const Light debug_level_select_light_07005AA0 = {
{{0x00, 0x00, 0xff}, 0, {0x00, 0x00, 0xff}, 0, {0x00, 0x00, 0x50}, 0}
};
// 0x07005A98 - 0x07005AB0
static const Lights1 debug_level_select_lights_07005A98 = gdSPDefLights1(
0x00, 0x00, 0x7f,
0x00, 0x00, 0xff, 0x00, 0x00, 0x50
);
// 0x07005AB0 - 0x07005BA0
static const Vtx debug_level_select_vertex_07005AB0[] = {
@@ -2198,9 +2140,7 @@ static const Vtx debug_level_select_vertex_07006320[] = {
// 0x070063B0 - 0x070065A8
const Gfx debug_level_select_dl_070063B0[] = {
gsDPPipeSync(),
gsSPNumLights(NUMLIGHTS_1), // I cannot tell if they meant to put 0 or 1 here.
gsSPLight(&debug_level_select_light_07005AA0, 1),
gsSPLight(&debug_level_select_light_07005A98, 2),
gsSPSetLights1(debug_level_select_lights_07005A98),
gsSPVertex(debug_level_select_vertex_07005AB0, 15, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0),

View File

@@ -4,6 +4,10 @@
#include "make_const_nonconst.h"
#include "text/de/dialog.inc.c"
#include "text/de/level.inc.c"
#include "text/de/star.inc.c"
// Include text/define_text.inc.c, preprocessed with -I text/de/ to get the
// right translation strings, with symbols renamed as below.
#define seg2_course_name_table course_name_table_eu_de
#define seg2_act_name_table act_name_table_eu_de
#define seg2_dialog_table dialog_table_eu_de
#include "text/de/define_text.inc.c"

View File

@@ -4,6 +4,10 @@
#include "make_const_nonconst.h"
#include "text/en/dialog.inc.c"
#include "text/en/level.inc.c"
#include "text/en/star.inc.c"
// Include text/define_text.inc.c, preprocessed with -I text/us/ to get the
// right translation strings, with symbols renamed as below.
#define seg2_course_name_table course_name_table_eu_en
#define seg2_act_name_table act_name_table_eu_en
#define seg2_dialog_table dialog_table_eu_en
#include "text/us/define_text.inc.c"

View File

@@ -4,6 +4,10 @@
#include "make_const_nonconst.h"
#include "text/fr/dialog.inc.c"
#include "text/fr/level.inc.c"
#include "text/fr/star.inc.c"
// Include text/define_text.inc.c, preprocessed with -I text/fr/ to get the
// right translation strings, with symbols renamed as below.
#define seg2_course_name_table course_name_table_eu_fr
#define seg2_act_name_table act_name_table_eu_fr
#define seg2_dialog_table dialog_table_eu_fr
#include "text/fr/define_text.inc.c"

View File

@@ -2075,11 +2075,13 @@ const u8 *const main_hud_camera_lut[] = {
texture_hud_char_arrow_up, texture_hud_char_arrow_down,
};
#ifndef VERSION_EU
#include "text/debug.inc.c"
#include "text/dialog.inc.c"
#include "text/level.inc.c"
#include "text/star.inc.c"
// If you change the language here, the following Makefile rule also needs to
// change, to generate the right version of define_text.inc.c:
// $(BUILD_DIR)/bin/segment2.o: $(BUILD_DIR)/text/$(VERSION)/define_text.inc.c
#ifdef VERSION_JP
#include "text/jp/define_text.inc.c"
#elif defined(VERSION_US)
#include "text/us/define_text.inc.c"
#endif
UNUSED static const u64 segment2_unused_0 = 0;
@@ -2489,16 +2491,11 @@ ALIGNED8 const u8 texture_waterbox_lava[] = {
#include "textures/segment2/segment2.13C58.rgba16.inc.c"
};
// Unreferenced light
UNUSED static const Ambient segment2_light_1 = {
{{0x40, 0x40, 0x40}, 0, {0x40, 0x40, 0x40}, 0}
};
// Unreferenced light
UNUSED static const Light segment2_light_2 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
// Unreferenced light group
static const Lights1 segment2_lights_unused = gdSPDefLights1(
0x40, 0x40, 0x40,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x02014470 - 0x020144B0
static const Mtx matrix_identity = {
@@ -2724,22 +2721,18 @@ const Gfx dl_ia8_up_arrow_end[] = {
};
// 0x02014958 - 0x02014960
static const Ambient seg2_light_02014958 = {
{{0x50, 0x50, 0x50}, 0, {0x50, 0x50, 0x50}, 0}
};
// 0x02014960 - 0x02014970
static const Light seg2_light_02014960 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x32, 0x32, 0x32}, 0}
};
static const Lights1 seg2_lights_02014958 = gdSPDefLights1(
0x50, 0x50, 0x50,
0xff, 0xff, 0xff, 0x32, 0x32, 0x32
);
// 0x02014970 - 0x020149A8
const Gfx dl_paintings_rippling_begin[] = {
gsDPPipeSync(),
gsSPSetGeometryMode(G_LIGHTING | G_SHADING_SMOOTH),
gsDPSetCombineMode(G_CC_MODULATERGBA, G_CC_MODULATERGBA),
gsSPLight(&seg2_light_02014960, 1),
gsSPLight(&seg2_light_02014958, 2),
gsSPLight(&seg2_lights_02014958.l, 1),
gsSPLight(&seg2_lights_02014958.a, 2),
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsSPEndDisplayList(),
};
@@ -2757,8 +2750,8 @@ const Gfx dl_paintings_env_mapped_begin[] = {
gsDPPipeSync(),
gsSPSetGeometryMode(G_LIGHTING | G_TEXTURE_GEN),
gsDPSetCombineMode(G_CC_DECALRGB, G_CC_DECALRGB),
gsSPLight(&seg2_light_02014960, 1),
gsSPLight(&seg2_light_02014958, 2),
gsSPLight(&seg2_lights_02014958.l, 1),
gsSPLight(&seg2_lights_02014958.a, 2),
gsSPTexture(0x4000, 0x4000, 0, G_TX_RENDERTILE, G_ON),
gsSPEndDisplayList(),
};