hackern64/HackerSM64
0
0
Fork 0
mirror of https://github.com/HackerN64/HackerSM64.git synced 2026-01-21 10:35:32 -08:00
Code Issues Packages Projects Releases Wiki Activity

Refresh 7

Browse Source
This commit is contained in:
n64
2020-03-01 22:42:52 -05:00
parent 9a801cb96d
commit 06ec56df7f
414 changed files with 7706 additions and 10210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

317
bin/segment2.c
View File

@@ -82,7 +82,7 @@ ALIGNED8 static const u8 texture_hud_char_I[] = {
#include "textures/segment2/segment2.02400.rgba16.inc.c"
};
#ifdef VERSION_JP
#if defined(VERSION_JP) || defined(VERSION_SH)
ALIGNED8 static const u8 texture_hud_char_J[] = {
#include "textures/segment2/segment2.02600.rgba16.inc.c"
};
@@ -112,7 +112,7 @@ ALIGNED8 static const u8 texture_hud_char_P[] = {
#include "textures/segment2/segment2.03200.rgba16.inc.c"
};
#ifdef VERSION_JP
#if defined(VERSION_JP) || defined(VERSION_SH)
ALIGNED8 static const u8 texture_hud_char_Q[] = {
#include "textures/segment2/segment2.03400.rgba16.inc.c"
};
@@ -134,7 +134,7 @@ ALIGNED8 static const u8 texture_hud_char_U[] = {
#include "textures/segment2/segment2.03C00.rgba16.inc.c"
};
#if defined(VERSION_JP) || defined(VERSION_EU)
#if defined(VERSION_JP) || defined(VERSION_EU) || defined(VERSION_SH)
ALIGNED8 static const u8 texture_hud_char_V[] = {
#include "textures/segment2/segment2.03E00.rgba16.inc.c"
};
@@ -144,7 +144,7 @@ ALIGNED8 static const u8 texture_hud_char_W[] = {
#include "textures/segment2/segment2.04000.rgba16.inc.c"
};
#ifdef VERSION_JP
#if defined(VERSION_JP) || defined(VERSION_SH)
ALIGNED8 static const u8 texture_hud_char_X[] = {
#include "textures/segment2/segment2.04200.rgba16.inc.c"
};
@@ -154,7 +154,7 @@ ALIGNED8 static const u8 texture_hud_char_Y[] = {
#include "textures/segment2/segment2.04400.rgba16.inc.c"
};
#if defined(VERSION_JP) || defined(VERSION_EU)
#if defined(VERSION_JP) || defined(VERSION_EU) || defined(VERSION_SH)
ALIGNED8 static const u8 texture_hud_char_Z[] = {
#include "textures/segment2/segment2.04600.rgba16.inc.c"
};
@@ -174,7 +174,7 @@ ALIGNED8 static const u8 texture_hud_char_umlaut[] = {
};
#endif
#ifdef VERSION_JP
#if defined(VERSION_JP) || defined(VERSION_SH)
ALIGNED8 static const u8 texture_hud_char_exclamation[] = {
#include "textures/segment2/segment2.04C00.rgba16.inc.c"// JP !
};
@@ -212,13 +212,13 @@ ALIGNED8 static const u8 texture_hud_char_star[] = {
#include "textures/segment2/segment2.05C00.rgba16.inc.c"
};
#ifdef VERSION_JP
#if defined(VERSION_JP) || defined(VERSION_SH)
ALIGNED8 static const u8 texture_hud_char_decimal_point[] = {
#include "textures/segment2/segment2.05E00.rgba16.inc.c"
};
#endif
#ifdef VERSION_JP
#if defined(VERSION_JP) || defined(VERSION_SH)
ALIGNED8 static const u8 texture_hud_char_beta_key[] = {
#include "textures/segment2/segment2.06000.rgba16.inc.c"
};
@@ -345,7 +345,7 @@ ALIGNED8 static const u8 texture_credits_char_period[] = {
};
// JP Small Font
#ifdef VERSION_JP
#if defined(VERSION_JP) || defined(VERSION_SH)
ALIGNED8 static const u8 texture_font_char_jp_0[] = {
#include "textures/segment2/segment2.07100.ia1.inc.c"
};
@@ -1987,7 +1987,7 @@ const u8 *const main_font_lut[] = {
texture_font_char_us_question, texture_font_char_us_double_quote_open, texture_font_char_us_double_quote_close, texture_font_char_us_tilde,
0x0, texture_font_char_us_coin, texture_font_char_us_star_filled, texture_font_char_us_multiply,
texture_font_char_us_interpunct, texture_font_char_us_star_hollow, 0x0, 0x0,
#elif defined(VERSION_JP)
#elif defined(VERSION_JP) || defined(VERSION_SH)
texture_font_char_jp_0, texture_font_char_jp_1, texture_font_char_jp_2, texture_font_char_jp_3,
texture_font_char_jp_4, texture_font_char_jp_5, texture_font_char_jp_6, texture_font_char_jp_7,
texture_font_char_jp_8, texture_font_char_jp_9, texture_font_char_jp_A, texture_font_char_jp_B,
@@ -2078,7 +2078,7 @@ const u8 *const main_hud_camera_lut[] = {
// 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
#if defined(VERSION_JP) || defined(VERSION_SH)
#include "text/jp/define_text.inc.c"
#elif defined(VERSION_US)
#include "text/us/define_text.inc.c"
@@ -2773,11 +2773,12 @@ const Gfx dl_paintings_draw_ripples[] = {
gsSPEndDisplayList(),
};
// 14A60-15BAD: count and triangles?
// 14A60: triangle mesh
// 0x02014A60
const s16 seg2_triangle_mesh[] = {
157,
const s16 seg2_painting_triangle_mesh[] = {
157, // numVtx
// format:
// 2D point (x, y), ripple (0 or 1)
614, 583, 0, // 0
614, 614, 0, // 1
562, 614, 0, // 2
@@ -3201,128 +3202,172 @@ const s16 seg2_triangle_mesh[] = {
118, 154, 140, // 261
140, 135, 130, // 262
117, 154, 118, // 263
0, // TODO: alignment?
};
// 0x02015444: TODO
const s16 seg2_mesh_order[] = {
3, 1, 2, 3, 1, 1, 4,
1, 2, 4, 5, 6, 2, 3, 5,
14, 59, 62, 3, 3, 58, 59, 6,
4, 5, 13, 14, 15, 16, 2, 4,
13, 2, 6, 7, 6, 0, 6, 7,
8, 9, 10, 4, 6, 10, 11, 12,
4, 7, 8, 154, 155, 6, 8, 9,
77, 154, 163, 194, 6, 0, 9, 72,
73, 75, 77, 6, 0, 10, 11, 19,
70, 72, 6, 11, 12, 17, 18, 19,
20, 4, 13, 16, 17, 18, 6, 14,
15, 53, 61, 62, 64, 6, 15, 16,
18, 20, 64, 67, 6, 19, 20, 66,
67, 69, 70, 8, 21, 22, 27, 31,
80, 81, 149, 150, 3, 21, 22, 26,
6, 23, 24, 25, 28, 57, 60, 3,
24, 25, 26, 6, 22, 24, 26, 27,
28, 29, 6, 27, 29, 30, 31, 32,
33, 8, 30, 33, 39, 40, 78, 79,
146, 147, 6, 34, 35, 37, 44, 63,
65, 6, 23, 28, 29, 32, 34, 35,
6, 23, 35, 53, 60, 61, 63, 6,
38, 39, 40, 41, 42, 43, 6, 32,
33, 34, 37, 38, 39, 8, 41, 42,
48, 52, 76, 82, 148, 151, 6, 44,
46, 65, 66, 68, 69, 6, 45, 46,
47, 56, 68, 71, 6, 37, 38, 43,
44, 45, 46, 6, 42, 43, 45, 47,
48, 49, 6, 36, 48, 49, 50, 51,
52, 8, 50, 51, 152, 153, 170, 174,
214, 215, 6, 36, 47, 49, 54, 55,
56, 6, 54, 55, 74, 169, 178, 196,
6, 54, 56, 71, 73, 74, 75, 3,
25, 57, 58, 6, 57, 58, 59, 60,
61, 62, 6, 53, 63, 64, 65, 66,
67, 6, 68, 69, 70, 71, 72, 73,
6, 74, 75, 77, 194, 195, 196, 6,
79, 82, 125, 137, 146, 148, 6, 78,
80, 129, 130, 147, 149, 6, 76, 144,
145, 151, 152, 153, 3, 84, 85, 86,
1, 85, 4, 85, 86, 91, 95, 6,
83, 87, 88, 90, 119, 124, 3, 84,
87, 88, 6, 89, 91, 92, 93, 94,
95, 6, 84, 86, 87, 89, 90, 91,
4, 93, 94, 101, 105, 2, 94, 95,
6, 96, 97, 100, 108, 126, 131, 6,
83, 89, 90, 92, 96, 97, 6, 83,
97, 123, 124, 126, 127, 6, 99, 101,
102, 103, 104, 105, 6, 92, 93, 96,
99, 100, 101, 4, 98, 103, 104, 110,
2, 104, 105, 6, 99, 100, 102, 106,
107, 108, 6, 106, 107, 111, 117, 134,
138, 6, 106, 108, 131, 132, 134, 135,
6, 98, 109, 110, 112, 113, 114, 6,
102, 103, 107, 109, 110, 111, 4, 113,
114, 221, 223, 2, 98, 114, 6, 115,
116, 142, 213, 226, 236, 6, 109, 111,
112, 115, 116, 117, 6, 116, 117, 138,
140, 141, 142, 3, 88, 118, 119, 6,
120, 121, 122, 130, 149, 150, 3, 118,
120, 121, 6, 118, 119, 120, 122, 123,
124, 6, 125, 128, 129, 133, 146, 147,
6, 122, 123, 127, 128, 129, 130, 6,
126, 127, 128, 131, 132, 133, 6, 136,
137, 139, 145, 148, 151, 6, 125, 132,
133, 135, 136, 137, 6, 134, 135, 136,
138, 139, 140, 6, 143, 144, 153, 215,
246, 252, 6, 139, 140, 141, 143, 144,
145, 6, 154, 155, 162, 163, 164, 165,
1, 157, 3, 157, 158, 159, 4, 157,
159, 160, 161, 6, 158, 159, 160, 167,
205, 206, 6, 156, 160, 161, 166, 167,
168, 6, 162, 163, 194, 195, 197, 199,
6, 162, 164, 166, 168, 199, 202, 4,
156, 164, 165, 166, 6, 167, 168, 201,
202, 204, 205, 6, 36, 50, 55, 169,
170, 171, 6, 170, 171, 172, 173, 174,
175, 8, 172, 173, 180, 184, 209, 210,
211, 212, 6, 176, 177, 179, 188, 198,
200, 6, 169, 171, 175, 176, 177, 178,
6, 177, 178, 195, 196, 197, 198, 6,
172, 175, 176, 179, 180, 181, 6, 180,
181, 182, 183, 184, 185, 8, 182, 183,
189, 192, 216, 217, 218, 219, 6, 186,
187, 190, 193, 203, 207, 6, 179, 181,
185, 186, 187, 188, 6, 187, 188, 200,
201, 203, 204, 6, 182, 185, 186, 189,
190, 191, 3, 189, 191, 192, 3, 193,
207, 208, 6, 197, 198, 199, 200, 201,
202, 6, 203, 204, 205, 206, 207, 208,
6, 209, 210, 250, 251, 253, 258, 6,
210, 211, 217, 219, 247, 258, 6, 209,
212, 214, 215, 251, 252, 3, 216, 218,
263, 6, 218, 219, 247, 259, 261, 263,
6, 220, 221, 222, 223, 224, 225, 6,
112, 113, 115, 213, 220, 221, 2, 223,
224, 4, 224, 225, 230, 235, 6, 226,
227, 236, 245, 248, 249, 6, 213, 220,
222, 226, 227, 228, 6, 227, 228, 231,
239, 249, 255, 6, 229, 230, 232, 233,
234, 235, 6, 222, 225, 228, 229, 230,
231, 2, 233, 235, 4, 233, 234, 241,
243, 6, 237, 238, 242, 244, 257, 262,
6, 229, 231, 232, 237, 238, 239, 6,
238, 239, 254, 255, 256, 257, 3, 240,
241, 243, 6, 232, 234, 237, 240, 241,
242, 3, 244, 260, 262, 6, 141, 142,
143, 236, 245, 246, 6, 245, 246, 248,
250, 251, 252, 6, 248, 249, 250, 253,
254, 255, 6, 247, 253, 254, 256, 258,
259, 6, 256, 257, 259, 260, 261, 262,
2, 12, 17, 2, 21, 81, 3, 81,
121, 150, 4, 30, 31, 78, 80, 4,
40, 41, 79, 82, 4, 51, 52, 76,
152, 2, 155, 165, 3, 158, 206, 208,
2, 156, 161, 4, 173, 174, 212, 214,
4, 183, 184, 211, 217, 3, 190, 191,
193, 2, 192, 216, 3, 260, 261, 263,
3, 240, 242, 244, 1, 243,
/* 0x02015444: seg2_painting_mesh_neighbor_tris
* Lists the neighboring triangles for each vertex in the mesh.
* Used when applying gouraud shading to the generated ripple mesh
*
* Format:
* num neighbors, neighbor0, neighbor1, ...
* The nth entry corresponds to the nth vertex in seg2_painting_triangle_mesh
*/
const s16 seg2_painting_mesh_neighbor_tris[] = {
3, 1, 2, 3,
1, 1,
4, 1, 2, 4, 5,
6, 2, 3, 5, 14, 59, 62,
3, 3, 58, 59,
6, 4, 5, 13, 14, 15, 16,
2, 4, 13,
2, 6, 7,
6, 0, 6, 7, 8, 9, 10,
4, 6, 10, 11, 12,
4, 7, 8, 154, 155,
6, 8, 9, 77, 154, 163, 194,
6, 0, 9, 72, 73, 75, 77,
6, 0, 10, 11, 19, 70, 72,
6, 11, 12, 17, 18, 19, 20,
4, 13, 16, 17, 18,
6, 14, 15, 53, 61, 62, 64,
6, 15, 16, 18, 20, 64, 67,
6, 19, 20, 66, 67, 69, 70,
8, 21, 22, 27, 31, 80, 81, 149, 150,
3, 21, 22, 26,
6, 23, 24, 25, 28, 57, 60,
3, 24, 25, 26,
6, 22, 24, 26, 27, 28, 29,
6, 27, 29, 30, 31, 32, 33,
8, 30, 33, 39, 40, 78, 79, 146, 147,
6, 34, 35, 37, 44, 63, 65,
6, 23, 28, 29, 32, 34, 35,
6, 23, 35, 53, 60, 61, 63,
6, 38, 39, 40, 41, 42, 43,
6, 32, 33, 34, 37, 38, 39,
8, 41, 42, 48, 52, 76, 82, 148, 151,
6, 44, 46, 65, 66, 68, 69,
6, 45, 46, 47, 56, 68, 71,
6, 37, 38, 43, 44, 45, 46,
6, 42, 43, 45, 47, 48, 49,
6, 36, 48, 49, 50, 51, 52,
8, 50, 51, 152, 153, 170, 174, 214, 215,
6, 36, 47, 49, 54, 55, 56,
6, 54, 55, 74, 169, 178, 196,
6, 54, 56, 71, 73, 74, 75,
3, 25, 57, 58,
6, 57, 58, 59, 60, 61, 62,
6, 53, 63, 64, 65, 66, 67,
6, 68, 69, 70, 71, 72, 73,
6, 74, 75, 77, 194, 195, 196,
6, 79, 82, 125, 137, 146, 148,
6, 78, 80, 129, 130, 147, 149,
6, 76, 144, 145, 151, 152, 153,
3, 84, 85, 86,
1, 85,
4, 85, 86, 91, 95,
6, 83, 87, 88, 90, 119, 124,
3, 84, 87, 88,
6, 89, 91, 92, 93, 94, 95,
6, 84, 86, 87, 89, 90, 91,
4, 93, 94, 101, 105,
2, 94, 95,
6, 96, 97, 100, 108, 126, 131,
6, 83, 89, 90, 92, 96, 97,
6, 83, 97, 123, 124, 126, 127,
6, 99, 101, 102, 103, 104, 105,
6, 92, 93, 96, 99, 100, 101,
4, 98, 103, 104, 110,
2, 104, 105,
6, 99, 100, 102, 106, 107, 108,
6, 106, 107, 111, 117, 134, 138,
6, 106, 108, 131, 132, 134, 135,
6, 98, 109, 110, 112, 113, 114,
6, 102, 103, 107, 109, 110, 111,
4, 113, 114, 221, 223,
2, 98, 114,
6, 115, 116, 142, 213, 226, 236,
6, 109, 111, 112, 115, 116, 117,
6, 116, 117, 138, 140, 141, 142,
3, 88, 118, 119,
6, 120, 121, 122, 130, 149, 150,
3, 118, 120, 121,
6, 118, 119, 120, 122, 123, 124,
6, 125, 128, 129, 133, 146, 147,
6, 122, 123, 127, 128, 129, 130,
6, 126, 127, 128, 131, 132, 133,
6, 136, 137, 139, 145, 148, 151,
6, 125, 132, 133, 135, 136, 137,
6, 134, 135, 136, 138, 139, 140,
6, 143, 144, 153, 215, 246, 252,
6, 139, 140, 141, 143, 144, 145,
6, 154, 155, 162, 163, 164, 165,
1, 157,
3, 157, 158, 159,
4, 157, 159, 160, 161,
6, 158, 159, 160, 167, 205, 206,
6, 156, 160, 161, 166, 167, 168,
6, 162, 163, 194, 195, 197, 199,
6, 162, 164, 166, 168, 199, 202,
4, 156, 164, 165, 166,
6, 167, 168, 201, 202, 204, 205,
6, 36, 50, 55, 169, 170, 171,
6, 170, 171, 172, 173, 174, 175,
8, 172, 173, 180, 184, 209, 210, 211, 212,
6, 176, 177, 179, 188, 198, 200,
6, 169, 171, 175, 176, 177, 178,
6, 177, 178, 195, 196, 197, 198,
6, 172, 175, 176, 179, 180, 181,
6, 180, 181, 182, 183, 184, 185,
8, 182, 183, 189, 192, 216, 217, 218, 219,
6, 186, 187, 190, 193, 203, 207,
6, 179, 181, 185, 186, 187, 188,
6, 187, 188, 200, 201, 203, 204,
6, 182, 185, 186, 189, 190, 191,
3, 189, 191, 192,
3, 193, 207, 208,
6, 197, 198, 199, 200, 201, 202,
6, 203, 204, 205, 206, 207, 208,
6, 209, 210, 250, 251, 253, 258,
6, 210, 211, 217, 219, 247, 258,
6, 209, 212, 214, 215, 251, 252,
3, 216, 218, 263,
6, 218, 219, 247, 259, 261, 263,
6, 220, 221, 222, 223, 224, 225,
6, 112, 113, 115, 213, 220, 221,
2, 223, 224,
4, 224, 225, 230, 235,
6, 226, 227, 236, 245, 248, 249,
6, 213, 220, 222, 226, 227, 228,
6, 227, 228, 231, 239, 249, 255,
6, 229, 230, 232, 233, 234, 235,
6, 222, 225, 228, 229, 230, 231,
2, 233, 235,
4, 233, 234, 241, 243,
6, 237, 238, 242, 244, 257, 262,
6, 229, 231, 232, 237, 238, 239,
6, 238, 239, 254, 255, 256, 257,
3, 240, 241, 243,
6, 232, 234, 237, 240, 241, 242,
3, 244, 260, 262,
6, 141, 142, 143, 236, 245, 246,
6, 245, 246, 248, 250, 251, 252,
6, 248, 249, 250, 253, 254, 255,
6, 247, 253, 254, 256, 258, 259,
6, 256, 257, 259, 260, 261, 262,
2, 12, 17,
2, 21, 81,
3, 81, 121, 150,
4, 30, 31, 78, 80,
4, 40, 41, 79, 82,
4, 51, 52, 76, 152,
2, 155, 165,
3, 158, 206, 208,
2, 156, 161,
4, 173, 174, 212, 214,
4, 183, 184, 211, 217,
3, 190, 191, 193,
2, 192, 216,
3, 260, 261, 263,
3, 240, 242, 244,
1, 243,
};

5
bin/spooky.c
View File

@@ -12,11 +12,6 @@ ALIGNED8 const u8 spooky_09000800[] = {
#include "textures/spooky/bbh_textures.00800.rgba16.inc.c"
};
// 0x09001000
ALIGNED8 const u8 spooky_09001000[] = {
#include "textures/spooky/bbh_textures.01000.rgba16.inc.c"
};
// 0x09001800
ALIGNED8 const u8 spooky_09001800[] = {
#include "textures/spooky/bbh_textures.01800.rgba16.inc.c"