diff options
| author | MegaMech <7255464+MegaMech@users.noreply.github.com> | 2025-01-03 17:41:12 -0700 |
|---|---|---|
| committer | MegaMech <7255464+MegaMech@users.noreply.github.com> | 2025-01-03 17:41:12 -0700 |
| commit | 6a00e588932d47764ea3c5add0670784c2fe3d5f (patch) | |
| tree | 90dce17bcc492df6aba32ec46e6abb8a666f119d /src | |
| parent | 35fd8a412c7c40f5bd0ea4381c03b1f2ef4c7b3e (diff) | |
Finish doc
Diffstat (limited to 'src')
| -rw-r--r-- | src/code_80005FD0.c | 2 | ||||
| -rw-r--r-- | src/code_8006E9C0.c | 4 | ||||
| -rw-r--r-- | src/data/textures.c | 2932 | ||||
| -rw-r--r-- | src/engine/World.cpp | 4 | ||||
| -rw-r--r-- | src/menu_items.c | 994 | ||||
| -rw-r--r-- | src/menu_items.h | 21 | ||||
| -rw-r--r-- | src/menus.c | 1000 | ||||
| -rw-r--r-- | src/menus.h | 47 | ||||
| -rw-r--r-- | src/render_objects.c | 70 | ||||
| -rw-r--r-- | src/save.c | 5 | ||||
| -rw-r--r-- | src/save.h | 2 | ||||
| -rw-r--r-- | src/textures.h | 8 |
12 files changed, 2571 insertions, 2518 deletions
diff --git a/src/code_80005FD0.c b/src/code_80005FD0.c index f6b942ff4..cb4157b63 100644 --- a/src/code_80005FD0.c +++ b/src/code_80005FD0.c @@ -5339,7 +5339,7 @@ void func_80014DE4(s32 cameraIndex) { D_801646D0[cameraIndex].unk0 = 0; D_801646D0[cameraIndex].unk2 = 0; D_801646D0[cameraIndex].unk4 = 0; - if ((gModeSelection == 1) && (D_8018EDFC == 0)) { + if ((gModeSelection == 1) && (gCourseMapInit == 0)) { D_80164678[cameraIndex] = 0; } diff --git a/src/code_8006E9C0.c b/src/code_8006E9C0.c index 3dc4c45da..797b6085a 100644 --- a/src/code_8006E9C0.c +++ b/src/code_8006E9C0.c @@ -384,8 +384,8 @@ void func_8006F824(s32 arg0) { } void func_8006F8CC(void) { - if (D_8018EDFC == 0) { - D_8018EDFC = 1; + if (gCourseMapInit == 0) { + gCourseMapInit = 1; gHUDModes = 0; D_801657E6 = 0; D_801657F0 = 0; diff --git a/src/data/textures.c b/src/data/textures.c index 4d30771ca..ba62a4ed4 100644 --- a/src/data/textures.c +++ b/src/data/textures.c @@ -14,8 +14,8 @@ * */ MenuTexture D_02000000[2] = { - { 3, 0, gTextureTinyFont0, 8, 8, 0, 0, 0x75, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTextureTinyFont0, 8, 8, 0, 0, 0x75}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -23,8 +23,8 @@ MenuTexture D_02000000[2] = { * */ MenuTexture D_02000028[2] = { - { 3, 0, gTextureTinyFont1, 8, 8, 0, 0, 0x49, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTextureTinyFont1, 8, 8, 0, 0, 0x49}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -32,8 +32,8 @@ MenuTexture D_02000028[2] = { * */ MenuTexture D_02000050[2] = { - { 3, 0, gTextureTinyFont2, 8, 8, 0, 0, 0x73, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTextureTinyFont2, 8, 8, 0, 0, 0x73}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -41,8 +41,8 @@ MenuTexture D_02000050[2] = { * */ MenuTexture D_02000078[2] = { - { 3, 0, gTextureTinyFont3, 8, 8, 0, 0, 0x70, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTextureTinyFont3, 8, 8, 0, 0, 0x70}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -50,8 +50,8 @@ MenuTexture D_02000078[2] = { * */ MenuTexture D_020000A0[2] = { - { 3, 0, gTextureTinyFont4, 8, 8, 0, 0, 0x5a, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTextureTinyFont4, 8, 8, 0, 0, 0x5a}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -59,8 +59,8 @@ MenuTexture D_020000A0[2] = { * */ MenuTexture D_020000C8[2] = { - { 3, 0, gTextureTinyFont5, 8, 8, 0, 0, 0x72, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTextureTinyFont5, 8, 8, 0, 0, 0x72}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -68,8 +68,8 @@ MenuTexture D_020000C8[2] = { * */ MenuTexture D_020000F0[2] = { - { 3, 0, gTextureTinyFont6, 8, 8, 0, 0, 0x74, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTextureTinyFont6, 8, 8, 0, 0, 0x74}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -77,8 +77,8 @@ MenuTexture D_020000F0[2] = { * */ MenuTexture D_02000118[2] = { - { 3, 0, gTextureTinyFont7, 8, 8, 0, 0, 0x5e, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTextureTinyFont7, 8, 8, 0, 0, 0x5e}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -86,8 +86,8 @@ MenuTexture D_02000118[2] = { * */ MenuTexture D_02000140[2] = { - { 3, 0, gTextureTinyFont8, 8, 8, 0, 0, 0x77, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTextureTinyFont8, 8, 8, 0, 0, 0x77}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -95,8 +95,8 @@ MenuTexture D_02000140[2] = { * */ MenuTexture D_02000168[2] = { - { 3, 0, gTextureTinyFont9, 8, 8, 0, 0, 0x74, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTextureTinyFont9, 8, 8, 0, 0, 0x74}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -104,8 +104,8 @@ MenuTexture D_02000168[2] = { * */ MenuTexture D_02000190[2] = { - { 3, 0, gTextureTinyFontA, 8, 8, 0, 0, 0x6b, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTextureTinyFontA, 8, 8, 0, 0, 0x6b}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -113,8 +113,8 @@ MenuTexture D_02000190[2] = { * */ MenuTexture D_020001B8[2] = { - { 3, 0, gTextureTinyFontB, 8, 8, 0, 0, 0x7d, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTextureTinyFontB, 8, 8, 0, 0, 0x7d}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -122,8 +122,8 @@ MenuTexture D_020001B8[2] = { * */ MenuTexture D_020001E0[2] = { - { 3, 0, gTextureTinyFontC, 8, 8, 0, 0, 0x75, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTextureTinyFontC, 8, 8, 0, 0, 0x75}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -131,8 +131,8 @@ MenuTexture D_020001E0[2] = { * */ MenuTexture D_02000208[2] = { - { 3, 0, gTextureTinyFontD, 8, 8, 0, 0, 0x71, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTextureTinyFontD, 8, 8, 0, 0, 0x71}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -140,8 +140,8 @@ MenuTexture D_02000208[2] = { * */ MenuTexture D_02000230[2] = { - { 3, 0, gTextureTinyFontE, 8, 8, 0, 0, 0x72, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTextureTinyFontE, 8, 8, 0, 0, 0x72}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -149,8 +149,8 @@ MenuTexture D_02000230[2] = { * */ MenuTexture D_02000258[2] = { - { 3, 0, gTextureTinyFontF, 8, 8, 0, 0, 0x63, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTextureTinyFontF, 8, 8, 0, 0, 0x63}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -158,8 +158,8 @@ MenuTexture D_02000258[2] = { * */ MenuTexture D_02000280[2] = { - { 3, 0, gTextureTinyFontG, 8, 8, 0, 0, 0x73, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTextureTinyFontG, 8, 8, 0, 0, 0x73}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -167,8 +167,8 @@ MenuTexture D_02000280[2] = { * */ MenuTexture D_020002A8[2] = { - { 3, 0, gTextureTinyFontH, 8, 8, 0, 0, 0x78, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTextureTinyFontH, 8, 8, 0, 0, 0x78}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -176,8 +176,8 @@ MenuTexture D_020002A8[2] = { * */ MenuTexture D_020002D0[2] = { - { 3, 0, gTextureTinyFontI, 8, 8, 0, 0, 0x48, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTextureTinyFontI, 8, 8, 0, 0, 0x48}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -185,8 +185,8 @@ MenuTexture D_020002D0[2] = { * */ MenuTexture D_020002F8[2] = { - { 3, 0, gTextureTinyFontJ, 8, 8, 0, 0, 0x52, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTextureTinyFontJ, 8, 8, 0, 0, 0x52}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -194,8 +194,8 @@ MenuTexture D_020002F8[2] = { * */ MenuTexture D_02000320[2] = { - { 3, 0, gTextureTinyFontK, 8, 8, 0, 0, 0x6f, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTextureTinyFontK, 8, 8, 0, 0, 0x6f}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -203,8 +203,8 @@ MenuTexture D_02000320[2] = { * */ MenuTexture D_02000348[2] = { - { 3, 0, gTextureTinyFontL, 8, 8, 0, 0, 0x4b, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTextureTinyFontL, 8, 8, 0, 0, 0x4b}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -212,8 +212,8 @@ MenuTexture D_02000348[2] = { * */ MenuTexture D_02000370[2] = { - { 3, 0, gTextureTinyFontM, 8, 8, 0, 0, 0x7c, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTextureTinyFontM, 8, 8, 0, 0, 0x7c}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -221,8 +221,8 @@ MenuTexture D_02000370[2] = { * */ MenuTexture D_02000398[2] = { - { 3, 0, gTextureTinyFontN, 8, 8, 0, 0, 0x7b, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTextureTinyFontN, 8, 8, 0, 0, 0x7b}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -230,8 +230,8 @@ MenuTexture D_02000398[2] = { * */ MenuTexture D_020003C0[2] = { - { 3, 0, gTextureTinyFontO, 8, 8, 0, 0, 0x76, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTextureTinyFontO, 8, 8, 0, 0, 0x76}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -239,8 +239,8 @@ MenuTexture D_020003C0[2] = { * */ MenuTexture D_020003E8[2] = { - { 3, 0, gTextureTinyFontP, 8, 8, 0, 0, 0x6a, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTextureTinyFontP, 8, 8, 0, 0, 0x6a}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -248,8 +248,8 @@ MenuTexture D_020003E8[2] = { * */ MenuTexture D_02000410[2] = { - { 3, 0, gTextureTinyFontQ, 8, 8, 0, 0, 0x77, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTextureTinyFontQ, 8, 8, 0, 0, 0x77}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -257,8 +257,8 @@ MenuTexture D_02000410[2] = { * */ MenuTexture D_02000438[2] = { - { 3, 0, gTextureTinyFontR, 8, 8, 0, 0, 0x72, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTextureTinyFontR, 8, 8, 0, 0, 0x72}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -266,8 +266,8 @@ MenuTexture D_02000438[2] = { * */ MenuTexture D_02000460[2] = { - { 3, 0, gTextureTinyFontS, 8, 8, 0, 0, 0x70, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTextureTinyFontS, 8, 8, 0, 0, 0x70}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -275,8 +275,8 @@ MenuTexture D_02000460[2] = { * */ MenuTexture D_02000488[2] = { - { 3, 0, gTextureTinyFontT, 8, 8, 0, 0, 0x54, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTextureTinyFontT, 8, 8, 0, 0, 0x54}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -284,8 +284,8 @@ MenuTexture D_02000488[2] = { * */ MenuTexture D_020004B0[2] = { - { 3, 0, gTextureTinyFontU, 8, 8, 0, 0, 0x62, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTextureTinyFontU, 8, 8, 0, 0, 0x62}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -293,8 +293,8 @@ MenuTexture D_020004B0[2] = { * */ MenuTexture D_020004D8[2] = { - { 3, 0, gTextureTinyFontV, 8, 8, 0, 0, 0x5e, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTextureTinyFontV, 8, 8, 0, 0, 0x5e}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -302,8 +302,8 @@ MenuTexture D_020004D8[2] = { * */ MenuTexture D_02000500[2] = { - { 3, 0, gTextureTinyFontW, 8, 8, 0, 0, 0x7c, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTextureTinyFontW, 8, 8, 0, 0, 0x7c}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -311,8 +311,8 @@ MenuTexture D_02000500[2] = { * */ MenuTexture D_02000528[2] = { - { 3, 0, gTextureTinyFontX, 8, 8, 0, 0, 0x6b, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTextureTinyFontX, 8, 8, 0, 0, 0x6b}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -320,8 +320,8 @@ MenuTexture D_02000528[2] = { * */ MenuTexture D_02000550[2] = { - { 3, 0, gTextureTinyFontY, 8, 8, 0, 0, 0x51, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTextureTinyFontY, 8, 8, 0, 0, 0x51}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -329,8 +329,8 @@ MenuTexture D_02000550[2] = { * */ MenuTexture D_02000578[2] = { - { 3, 0, gTextureTinyFontZ, 8, 8, 0, 0, 0x68, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTextureTinyFontZ, 8, 8, 0, 0, 0x68}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -338,8 +338,8 @@ MenuTexture D_02000578[2] = { * */ MenuTexture D_020005A0[2] = { - { 3, 0, gTextureTinyFontExclamationMark, 8, 8, 0, 0, 0x46, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTextureTinyFontExclamationMark, 8, 8, 0, 0, 0x46}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -347,8 +347,8 @@ MenuTexture D_020005A0[2] = { * */ MenuTexture D_020005C8[2] = { - { 3, 0, gTextureTinyFontDoubleQuote, 8, 8, 0, 0, 0x37, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTextureTinyFontDoubleQuote, 8, 8, 0, 0, 0x37}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -356,8 +356,8 @@ MenuTexture D_020005C8[2] = { * */ MenuTexture D_020005F0[2] = { - { 3, 0, gTextureTinyFontHash, 8, 8, 0, 0, 0x70, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTextureTinyFontHash, 8, 8, 0, 0, 0x70}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -365,8 +365,8 @@ MenuTexture D_020005F0[2] = { * */ MenuTexture D_02000618[2] = { - { 3, 0, gTextureTinyFontSingleQuote, 8, 8, 0, 0, 0x2f, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTextureTinyFontSingleQuote, 8, 8, 0, 0, 0x2f}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -374,8 +374,8 @@ MenuTexture D_02000618[2] = { * */ MenuTexture D_02000640[2] = { - { 3, 0, gTextureTinyFontAsterisk, 8, 8, 0, 0, 0x6a, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTextureTinyFontAsterisk, 8, 8, 0, 0, 0x6a}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -383,8 +383,8 @@ MenuTexture D_02000640[2] = { * */ MenuTexture D_02000668[2] = { - { 3, 0, gTextureTinyFontPlus, 8, 8, 0, 0, 0x51, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTextureTinyFontPlus, 8, 8, 0, 0, 0x51}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -392,8 +392,8 @@ MenuTexture D_02000668[2] = { * */ MenuTexture D_02000690[2] = { - { 3, 0, gTexture7EEB18, 8, 8, 0, 0, 0x30, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTexture7EEB18, 8, 8, 0, 0, 0x30}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -401,8 +401,8 @@ MenuTexture D_02000690[2] = { * */ MenuTexture D_020006B8[2] = { - { 3, 0, gTextureTinyFontMinus, 8, 8, 0, 0, 0x35, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTextureTinyFontMinus, 8, 8, 0, 0, 0x35}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -410,8 +410,8 @@ MenuTexture D_020006B8[2] = { * */ MenuTexture D_020006E0[2] = { - { 3, 0, gTextureTinyFontComma, 8, 8, 0, 0, 0x31, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTextureTinyFontComma, 8, 8, 0, 0, 0x31}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -419,8 +419,8 @@ MenuTexture D_020006E0[2] = { * */ MenuTexture D_02000708[2] = { - { 3, 0, gTextureTinyFontForwardSlash, 8, 8, 0, 0, 0x4f, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTextureTinyFontForwardSlash, 8, 8, 0, 0, 0x4f}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -428,8 +428,8 @@ MenuTexture D_02000708[2] = { * */ MenuTexture D_02000730[2] = { - { 3, 0, gTextureTinyFontColon, 8, 8, 0, 0, 0x38, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTextureTinyFontColon, 8, 8, 0, 0, 0x38}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -437,8 +437,8 @@ MenuTexture D_02000730[2] = { * */ MenuTexture D_02000758[2] = { - { 3, 0, gTexture7EEC34, 8, 8, 0, 0, 0x51, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTexture7EEC34, 8, 8, 0, 0, 0x51}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -446,8 +446,8 @@ MenuTexture D_02000758[2] = { * */ MenuTexture D_02000780[2] = { - { 3, 0, gTextureTinyFontQuestion, 8, 8, 0, 0, 0x60, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTextureTinyFontQuestion, 8, 8, 0, 0, 0x60}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -455,8 +455,8 @@ MenuTexture D_02000780[2] = { * */ MenuTexture D_020007A8[2] = { - { 3, 0, gTexture7EECE4, 8, 8, 0, 0, 0x8f, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTexture7EECE4, 8, 8, 0, 0, 0x8f}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -464,8 +464,8 @@ MenuTexture D_020007A8[2] = { * */ MenuTexture D_020007D0[2] = { - { 3, 0, gTexture7EED74, 8, 8, 0, 0, 0x3d, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTexture7EED74, 8, 8, 0, 0, 0x3d}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -473,8 +473,8 @@ MenuTexture D_020007D0[2] = { * */ MenuTexture D_020007F8[2] = { - { 3, 0, gTexture7EEDB0, 8, 8, 0, 0, 0x37, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTexture7EEDB0, 8, 8, 0, 0, 0x37}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -482,8 +482,8 @@ MenuTexture D_020007F8[2] = { * */ MenuTexture D_02000820[2] = { - { 3, 0, gTexture7EEDE8, 8, 8, 0, 0, 0x39, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTexture7EEDE8, 8, 8, 0, 0, 0x39}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -491,8 +491,8 @@ MenuTexture D_02000820[2] = { * */ MenuTexture D_02000848[2] = { - { 3, 0, gTexture7EEE20, 8, 8, 0, 0, 0x5b, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTexture7EEE20, 8, 8, 0, 0, 0x5b}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -500,8 +500,8 @@ MenuTexture D_02000848[2] = { * */ MenuTexture D_02000870[2] = { - { 3, 0, gTexture7EEE7C, 8, 8, 0, 0, 0x55, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTexture7EEE7C, 8, 8, 0, 0, 0x55}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -509,8 +509,8 @@ MenuTexture D_02000870[2] = { * */ MenuTexture D_02000898[2] = { - { 3, 0, gTexture7EEED0, 8, 8, 0, 0, 0x6a, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTexture7EEED0, 8, 8, 0, 0, 0x6a}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -518,8 +518,8 @@ MenuTexture D_02000898[2] = { * */ MenuTexture D_020008C0[2] = { - { 3, 0, gTexture7EEF3C, 8, 8, 0, 0, 0x55, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTexture7EEF3C, 8, 8, 0, 0, 0x55}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -527,8 +527,8 @@ MenuTexture D_020008C0[2] = { * */ MenuTexture D_020008E8[2] = { - { 3, 0, gTexture7EEF90, 8, 8, 0, 0, 0x62, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTexture7EEF90, 8, 8, 0, 0, 0x62}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -536,8 +536,8 @@ MenuTexture D_020008E8[2] = { * */ MenuTexture D_02000910[2] = { - { 3, 0, gTexture7EEFF4, 8, 8, 0, 0, 0x64, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTexture7EEFF4, 8, 8, 0, 0, 0x64}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -545,8 +545,8 @@ MenuTexture D_02000910[2] = { * */ MenuTexture D_02000938[2] = { - { 3, 0, gTexture7EF058, 8, 8, 0, 0, 0x5b, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTexture7EF058, 8, 8, 0, 0, 0x5b}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -554,8 +554,8 @@ MenuTexture D_02000938[2] = { * */ MenuTexture D_02000960[2] = { - { 3, 0, gTexture7EF0B4, 8, 8, 0, 0, 0x5d, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTexture7EF0B4, 8, 8, 0, 0, 0x5d}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -563,8 +563,8 @@ MenuTexture D_02000960[2] = { * */ MenuTexture D_02000988[2] = { - { 3, 0, gTexture7EF110, 8, 8, 0, 0, 0x6d, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTexture7EF110, 8, 8, 0, 0, 0x6d}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -572,8 +572,8 @@ MenuTexture D_02000988[2] = { * */ MenuTexture D_020009B0[2] = { - { 3, 0, gTexture7EF17C, 8, 8, 0, 0, 0x73, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTexture7EF17C, 8, 8, 0, 0, 0x73}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -581,8 +581,8 @@ MenuTexture D_020009B0[2] = { * */ MenuTexture D_020009D8[2] = { - { 3, 0, gTexture7EF1F0, 8, 8, 0, 0, 0x5e, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTexture7EF1F0, 8, 8, 0, 0, 0x5e}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -590,8 +590,8 @@ MenuTexture D_020009D8[2] = { * */ MenuTexture D_02000A00[2] = { - { 3, 0, gTexture7EF250, 8, 8, 0, 0, 0x69, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTexture7EF250, 8, 8, 0, 0, 0x69}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -599,8 +599,8 @@ MenuTexture D_02000A00[2] = { * */ MenuTexture D_02000A28[2] = { - { 3, 0, gTexture7EF2B8, 8, 8, 0, 0, 0x5b, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTexture7EF2B8, 8, 8, 0, 0, 0x5b}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -608,8 +608,8 @@ MenuTexture D_02000A28[2] = { * */ MenuTexture D_02000A50[2] = { - { 3, 0, gTexture7EF314, 8, 8, 0, 0, 0x73, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTexture7EF314, 8, 8, 0, 0, 0x73}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -617,8 +617,8 @@ MenuTexture D_02000A50[2] = { * */ MenuTexture D_02000A78[2] = { - { 3, 0, gTexture7EF388, 8, 8, 0, 0, 0x6f, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTexture7EF388, 8, 8, 0, 0, 0x6f}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -626,8 +626,8 @@ MenuTexture D_02000A78[2] = { * */ MenuTexture D_02000AA0[2] = { - { 3, 0, gTexture7EF3F8, 8, 8, 0, 0, 0x79, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTexture7EF3F8, 8, 8, 0, 0, 0x79}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -635,8 +635,8 @@ MenuTexture D_02000AA0[2] = { * */ MenuTexture D_02000AC8[2] = { - { 3, 0, gTexture7EF470, 8, 8, 0, 0, 0x74, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTexture7EF470, 8, 8, 0, 0, 0x74}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -644,8 +644,8 @@ MenuTexture D_02000AC8[2] = { * */ MenuTexture D_02000AF0[2] = { - { 3, 0, gTexture7EF4E4, 8, 8, 0, 0, 0x70, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTexture7EF4E4, 8, 8, 0, 0, 0x70}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -653,8 +653,8 @@ MenuTexture D_02000AF0[2] = { * */ MenuTexture D_02000B18[2] = { - { 3, 0, gTexture7EF554, 8, 8, 0, 0, 0x6c, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTexture7EF554, 8, 8, 0, 0, 0x6c}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -662,8 +662,8 @@ MenuTexture D_02000B18[2] = { * */ MenuTexture D_02000B40[2] = { - { 3, 0, gTexture7EF5C0, 8, 8, 0, 0, 0x61, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTexture7EF5C0, 8, 8, 0, 0, 0x61}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -671,8 +671,8 @@ MenuTexture D_02000B40[2] = { * */ MenuTexture D_02000B68[2] = { - { 3, 0, gTexture7EF620, 8, 8, 0, 0, 0x72, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTexture7EF620, 8, 8, 0, 0, 0x72}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -680,8 +680,8 @@ MenuTexture D_02000B68[2] = { * */ MenuTexture D_02000B90[2] = { - { 3, 0, gTexture7EF694, 8, 8, 0, 0, 0x74, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTexture7EF694, 8, 8, 0, 0, 0x74}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -689,8 +689,8 @@ MenuTexture D_02000B90[2] = { * */ MenuTexture D_02000BB8[2] = { - { 3, 0, gTexture7EF708, 8, 8, 0, 0, 0x72, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTexture7EF708, 8, 8, 0, 0, 0x72}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -698,8 +698,8 @@ MenuTexture D_02000BB8[2] = { * */ MenuTexture D_02000BE0[2] = { - { 3, 0, gTexture7EF77C, 8, 8, 0, 0, 0x6b, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTexture7EF77C, 8, 8, 0, 0, 0x6b}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -707,8 +707,8 @@ MenuTexture D_02000BE0[2] = { * */ MenuTexture D_02000C08[2] = { - { 3, 0, gTexture7EF7E8, 8, 8, 0, 0, 0x75, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTexture7EF7E8, 8, 8, 0, 0, 0x75}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -716,8 +716,8 @@ MenuTexture D_02000C08[2] = { * */ MenuTexture D_02000C30[2] = { - { 3, 0, gTexture7EF85C, 8, 8, 0, 0, 0x6b, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTexture7EF85C, 8, 8, 0, 0, 0x6b}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -725,8 +725,8 @@ MenuTexture D_02000C30[2] = { * */ MenuTexture D_02000C58[2] = { - { 3, 0, gTexture7EF8C8, 8, 8, 0, 0, 0x72, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTexture7EF8C8, 8, 8, 0, 0, 0x72}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -734,8 +734,8 @@ MenuTexture D_02000C58[2] = { * */ MenuTexture D_02000C80[2] = { - { 3, 0, gTexture7EF93C, 8, 8, 0, 0, 0x76, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTexture7EF93C, 8, 8, 0, 0, 0x76}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -743,8 +743,8 @@ MenuTexture D_02000C80[2] = { * */ MenuTexture D_02000CA8[2] = { - { 3, 0, gTexture7EF9B4, 8, 8, 0, 0, 0x78, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTexture7EF9B4, 8, 8, 0, 0, 0x78}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -752,8 +752,8 @@ MenuTexture D_02000CA8[2] = { * */ MenuTexture D_02000CD0[2] = { - { 3, 0, gTexture7EFA2C, 8, 8, 0, 0, 0x7b, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTexture7EFA2C, 8, 8, 0, 0, 0x7b}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -761,8 +761,8 @@ MenuTexture D_02000CD0[2] = { * */ MenuTexture D_02000CF8[2] = { - { 3, 0, gTexture7EFAA8, 8, 8, 0, 0, 0x57, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTexture7EFAA8, 8, 8, 0, 0, 0x57}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -770,8 +770,8 @@ MenuTexture D_02000CF8[2] = { * */ MenuTexture D_02000D20[2] = { - { 3, 0, gTexture7EFB00, 8, 8, 0, 0, 0x63, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTexture7EFB00, 8, 8, 0, 0, 0x63}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -779,8 +779,8 @@ MenuTexture D_02000D20[2] = { * */ MenuTexture D_02000D48[2] = { - { 3, 0, gTexture7EFB64, 8, 8, 0, 0, 0x57, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTexture7EFB64, 8, 8, 0, 0, 0x57}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -788,8 +788,8 @@ MenuTexture D_02000D48[2] = { * */ MenuTexture D_02000D70[2] = { - { 3, 0, gTexture7EFBBC, 8, 8, 0, 0, 0x75, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTexture7EFBBC, 8, 8, 0, 0, 0x75}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -797,8 +797,8 @@ MenuTexture D_02000D70[2] = { * */ MenuTexture D_02000D98[2] = { - { 3, 0, gTexture7EFC30, 8, 8, 0, 0, 0x7b, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTexture7EFC30, 8, 8, 0, 0, 0x7b}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -806,8 +806,8 @@ MenuTexture D_02000D98[2] = { * */ MenuTexture D_02000DC0[2] = { - { 3, 0, gTexture7EFCAC, 8, 8, 0, 0, 0x53, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTexture7EFCAC, 8, 8, 0, 0, 0x53}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -815,8 +815,8 @@ MenuTexture D_02000DC0[2] = { * */ MenuTexture D_02000DE8[2] = { - { 3, 0, gTexture7EFD00, 8, 8, 0, 0, 0x60, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTexture7EFD00, 8, 8, 0, 0, 0x60}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -824,8 +824,8 @@ MenuTexture D_02000DE8[2] = { * */ MenuTexture D_02000E10[2] = { - { 3, 0, gTexture7EFD60, 8, 8, 0, 0, 0x75, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTexture7EFD60, 8, 8, 0, 0, 0x75}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -833,8 +833,8 @@ MenuTexture D_02000E10[2] = { * */ MenuTexture D_02000E38[2] = { - { 3, 0, gTexture7EFDD4, 8, 8, 0, 0, 0x72, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTexture7EFDD4, 8, 8, 0, 0, 0x72}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -842,8 +842,8 @@ MenuTexture D_02000E38[2] = { * */ MenuTexture D_02000E60[2] = { - { 3, 0, gTexture7EFE48, 8, 8, 0, 0, 0x57, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTexture7EFE48, 8, 8, 0, 0, 0x57}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -851,8 +851,8 @@ MenuTexture D_02000E60[2] = { * */ MenuTexture D_02000E88[2] = { - { 3, 0, gTexture7EFEA0, 8, 8, 0, 0, 0x8d, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTexture7EFEA0, 8, 8, 0, 0, 0x8d}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -860,8 +860,8 @@ MenuTexture D_02000E88[2] = { * */ MenuTexture D_02000EB0[2] = { - { 3, 0, gTexture7EFF2C, 8, 8, 0, 0, 0x63, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTexture7EFF2C, 8, 8, 0, 0, 0x63}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -869,8 +869,8 @@ MenuTexture D_02000EB0[2] = { * */ MenuTexture D_02000ED8[2] = { - { 3, 0, gTexture7EFF90, 8, 8, 0, 0, 0x70, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTexture7EFF90, 8, 8, 0, 0, 0x70}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -878,8 +878,8 @@ MenuTexture D_02000ED8[2] = { * */ MenuTexture D_02000F00[2] = { - { 3, 0, gTexture7F0000, 8, 8, 0, 0, 0x6d, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTexture7F0000, 8, 8, 0, 0, 0x6d}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -887,8 +887,8 @@ MenuTexture D_02000F00[2] = { * */ MenuTexture D_02000F28[2] = { - { 3, 0, gTexture7F006C, 8, 8, 0, 0, 0x6a, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTexture7F006C, 8, 8, 0, 0, 0x6a}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -896,8 +896,8 @@ MenuTexture D_02000F28[2] = { * */ MenuTexture D_02000F50[2] = { - { 3, 0, gTexture7F00D8, 8, 8, 0, 0, 0x80, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTexture7F00D8, 8, 8, 0, 0, 0x80}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -905,8 +905,8 @@ MenuTexture D_02000F50[2] = { * */ MenuTexture D_02000F78[2] = { - { 3, 0, gTexture7F0158, 8, 8, 0, 0, 0x78, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTexture7F0158, 8, 8, 0, 0, 0x78}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -914,8 +914,8 @@ MenuTexture D_02000F78[2] = { * */ MenuTexture D_02000FA0[2] = { - { 3, 0, gTexture7F01D0, 8, 8, 0, 0, 0x6a, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTexture7F01D0, 8, 8, 0, 0, 0x6a}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -923,8 +923,8 @@ MenuTexture D_02000FA0[2] = { * */ MenuTexture D_02000FC8[2] = { - { 3, 0, gTexture7F023C, 8, 8, 0, 0, 0x78, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTexture7F023C, 8, 8, 0, 0, 0x78}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -932,8 +932,8 @@ MenuTexture D_02000FC8[2] = { * */ MenuTexture D_02000FF0[2] = { - { 3, 0, gTexture7F02B4, 8, 8, 0, 0, 0x79, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTexture7F02B4, 8, 8, 0, 0, 0x79}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -941,8 +941,8 @@ MenuTexture D_02000FF0[2] = { * */ MenuTexture D_02001018[2] = { - { 3, 0, gTexture7F032C, 8, 8, 0, 0, 0x63, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTexture7F032C, 8, 8, 0, 0, 0x63}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -950,8 +950,8 @@ MenuTexture D_02001018[2] = { * */ MenuTexture D_02001040[2] = { - { 3, 0, gTexture7F0390, 8, 8, 0, 0, 0x72, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTexture7F0390, 8, 8, 0, 0, 0x72}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -959,8 +959,8 @@ MenuTexture D_02001040[2] = { * */ MenuTexture D_02001068[2] = { - { 3, 0, gTexture7F0404, 8, 8, 0, 0, 0x6d, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTexture7F0404, 8, 8, 0, 0, 0x6d}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -968,8 +968,8 @@ MenuTexture D_02001068[2] = { * */ MenuTexture D_02001090[2] = { - { 3, 0, gTexture7F0470, 8, 8, 0, 0, 0x7d, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTexture7F0470, 8, 8, 0, 0, 0x7d}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -977,8 +977,8 @@ MenuTexture D_02001090[2] = { * */ MenuTexture D_020010B8[2] = { - { 3, 0, gTexture7F04EC, 8, 8, 0, 0, 0x6e, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTexture7F04EC, 8, 8, 0, 0, 0x6e}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -986,8 +986,8 @@ MenuTexture D_020010B8[2] = { * */ MenuTexture D_020010E0[2] = { - { 3, 0, gTexture7F055C, 8, 8, 0, 0, 0x93, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTexture7F055C, 8, 8, 0, 0, 0x93}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -995,8 +995,8 @@ MenuTexture D_020010E0[2] = { * */ MenuTexture D_02001108[2] = { - { 3, 0, gTexture7F05F0, 8, 8, 0, 0, 0x7f, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTexture7F05F0, 8, 8, 0, 0, 0x7f}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -1004,8 +1004,8 @@ MenuTexture D_02001108[2] = { * */ MenuTexture D_02001130[2] = { - { 3, 0, gTexture7F0670, 8, 8, 0, 0, 0x7b, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTexture7F0670, 8, 8, 0, 0, 0x7b}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -1013,8 +1013,8 @@ MenuTexture D_02001130[2] = { * */ MenuTexture D_02001158[2] = { - { 3, 0, gTexture7F06EC, 8, 8, 0, 0, 0x7a, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTexture7F06EC, 8, 8, 0, 0, 0x7a}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -1022,8 +1022,8 @@ MenuTexture D_02001158[2] = { * */ MenuTexture D_02001180[2] = { - { 3, 0, gTexture7F0768, 8, 8, 0, 0, 0x78, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTexture7F0768, 8, 8, 0, 0, 0x78}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -1031,8 +1031,8 @@ MenuTexture D_02001180[2] = { * */ MenuTexture D_020011A8[2] = { - { 3, 0, gTexture7F07E0, 8, 8, 0, 0, 0x77, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTexture7F07E0, 8, 8, 0, 0, 0x77}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -1040,8 +1040,8 @@ MenuTexture D_020011A8[2] = { * */ MenuTexture D_020011D0[2] = { - { 3, 0, gTexture7F0858, 8, 8, 0, 0, 0x7f, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTexture7F0858, 8, 8, 0, 0, 0x7f}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -1049,8 +1049,8 @@ MenuTexture D_020011D0[2] = { * */ MenuTexture D_020011F8[2] = { - { 3, 0, gTexture7F08D8, 8, 8, 0, 0, 0x71, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTexture7F08D8, 8, 8, 0, 0, 0x71}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -1058,8 +1058,8 @@ MenuTexture D_020011F8[2] = { * */ MenuTexture D_02001220[2] = { - { 3, 0, gTexture7F0948, 8, 8, 0, 0, 0x87, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTexture7F0948, 8, 8, 0, 0, 0x87}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -1067,8 +1067,8 @@ MenuTexture D_02001220[2] = { * */ MenuTexture D_02001248[2] = { - { 3, 0, gTexture7F09D0, 8, 8, 0, 0, 0x6d, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTexture7F09D0, 8, 8, 0, 0, 0x6d}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -1076,8 +1076,8 @@ MenuTexture D_02001248[2] = { * */ MenuTexture D_02001270[2] = { - { 3, 0, gTexture7F0A3C, 8, 8, 0, 0, 0x7e, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTexture7F0A3C, 8, 8, 0, 0, 0x7e}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -1085,8 +1085,8 @@ MenuTexture D_02001270[2] = { * */ MenuTexture D_02001298[2] = { - { 3, 0, gTexture7F0ABC, 8, 8, 0, 0, 0x77, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTexture7F0ABC, 8, 8, 0, 0, 0x77}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -1094,8 +1094,8 @@ MenuTexture D_02001298[2] = { * */ MenuTexture D_020012C0[2] = { - { 3, 0, gTexture7F0B34, 8, 8, 0, 0, 0x7d, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTexture7F0B34, 8, 8, 0, 0, 0x7d}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -1103,8 +1103,8 @@ MenuTexture D_020012C0[2] = { * */ MenuTexture D_020012E8[2] = { - { 3, 0, gTexture7F0BB0, 8, 8, 0, 0, 0x75, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTexture7F0BB0, 8, 8, 0, 0, 0x75}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -1112,8 +1112,8 @@ MenuTexture D_020012E8[2] = { * */ MenuTexture D_02001310[2] = { - { 3, 0, gTexture7F0C24, 8, 8, 0, 0, 0x71, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTexture7F0C24, 8, 8, 0, 0, 0x71}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -1121,8 +1121,8 @@ MenuTexture D_02001310[2] = { * */ MenuTexture D_02001338[2] = { - { 3, 0, gTexture7F0C94, 8, 8, 0, 0, 0x77, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTexture7F0C94, 8, 8, 0, 0, 0x77}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -1130,8 +1130,8 @@ MenuTexture D_02001338[2] = { * */ MenuTexture D_02001360[2] = { - { 3, 0, gTexture7F0D0C, 8, 8, 0, 0, 0x7f, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTexture7F0D0C, 8, 8, 0, 0, 0x7f}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -1139,8 +1139,8 @@ MenuTexture D_02001360[2] = { * */ MenuTexture D_02001388[2] = { - { 3, 0, gTexture7F0D8C, 8, 8, 0, 0, 0x61, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTexture7F0D8C, 8, 8, 0, 0, 0x61}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -1148,8 +1148,8 @@ MenuTexture D_02001388[2] = { * */ MenuTexture D_020013B0[2] = { - { 3, 0, gTexture7F0DEC, 8, 8, 0, 0, 0x6e, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTexture7F0DEC, 8, 8, 0, 0, 0x6e}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -1157,8 +1157,8 @@ MenuTexture D_020013B0[2] = { * */ MenuTexture D_020013D8[2] = { - { 3, 0, gTexture7F0E5C, 8, 8, 0, 0, 0x87, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTexture7F0E5C, 8, 8, 0, 0, 0x87}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -1166,8 +1166,8 @@ MenuTexture D_020013D8[2] = { * */ MenuTexture D_02001400[2] = { - { 3, 0, gTexture7F0EE4, 8, 8, 0, 0, 0x78, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTexture7F0EE4, 8, 8, 0, 0, 0x78}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -1175,8 +1175,8 @@ MenuTexture D_02001400[2] = { * */ MenuTexture D_02001428[2] = { - { 3, 0, gTexture7F0F5C, 8, 8, 0, 0, 0x7d, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTexture7F0F5C, 8, 8, 0, 0, 0x7d}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -1184,8 +1184,8 @@ MenuTexture D_02001428[2] = { * */ MenuTexture D_02001450[2] = { - { 3, 0, gTexture7F0FD8, 8, 8, 0, 0, 0x60, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTexture7F0FD8, 8, 8, 0, 0, 0x60}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -1193,8 +1193,8 @@ MenuTexture D_02001450[2] = { * */ MenuTexture D_02001478[2] = { - { 3, 0, gTexture7F1038, 8, 8, 0, 0, 0x65, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTexture7F1038, 8, 8, 0, 0, 0x65}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -1202,8 +1202,8 @@ MenuTexture D_02001478[2] = { * */ MenuTexture D_020014A0[2] = { - { 3, 0, gTexture7F109C, 8, 8, 0, 0, 0x87, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTexture7F109C, 8, 8, 0, 0, 0x87}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -1211,9 +1211,9 @@ MenuTexture D_020014A0[2] = { * */ MenuTexture D_020014C8[6] = { - { 0, 0, gTextureGoldBar, 256, 40, 32, 25, 0xd4c, 0 }, { 0, 0, gTexturePinkBar, 90, 16, 65, 70, 0x468, 0 }, - { 0, 0, gTexturePinkBar, 90, 16, 164, 70, 0x468, 0 }, { 0, 0, gTexturePinkBar, 90, 16, 65, 200, 0x468, 0 }, - { 0, 0, gTexturePinkBar, 90, 16, 164, 200, 0x468, 0 }, { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureGoldBar, 256, 40, 32, 25, 0xd4c}, { 0, gTexturePinkBar, 90, 16, 65, 70, 0x468}, + { 0, gTexturePinkBar, 90, 16, 164, 70, 0x468}, { 0, gTexturePinkBar, 90, 16, 65, 200, 0x468}, + { 0, gTexturePinkBar, 90, 16, 164, 200, 0x468}, { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -1221,14 +1221,14 @@ MenuTexture D_020014C8[6] = { * */ MenuTexture D_02001540[3] = { - { 0, 0, gTextureGreenGoldStripe, 256, 29, 32, 91, 0xbec, 0 }, - { 0, 0, gTextureGoldStripe, 256, 15, 32, 180, 0x6f8, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureGreenGoldStripe, 256, 29, 32, 91, 0xbec}, + { 0, gTextureGoldStripe, 256, 15, 32, 180, 0x6f8}, + { 0, NULL, 0, 0, 0, 0, 0}, }; MenuTexture D_0200157C[2] = { - { 0, 0, gTextureWhiteStripe, 256, 10, 0, 0, 0xe4, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureWhiteStripe, 256, 10, 0, 0, 0xe4}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -1236,8 +1236,8 @@ MenuTexture D_0200157C[2] = { * */ MenuTexture D_020015A4[2] = { - { 3, 0, gTexture7ED50C, 256, 5, 32, 120, 0x196, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTexture7ED50C, 256, 5, 32, 120, 0x196}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -1245,11 +1245,11 @@ MenuTexture D_020015A4[2] = { * */ MenuTexture D_020015CC[5] = { - { 3, 0, gTextureSelectRecord, 68, 10, 75, 74, 0x378, 0 }, - { 3, 0, gTextureTextEnd, 20, 10, 200, 74, 0x12f, 0 }, - { 3, 0, gTextureTextErase, 28, 10, 96, 204, 0x19e, 0 }, - { 3, 0, gTextureTextQuit, 24, 10, 198, 204, 0x149, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTextureSelectRecord, 68, 10, 75, 74, 0x378}, + { 3, gTextureTextEnd, 20, 10, 200, 74, 0x12f}, + { 3, gTextureTextErase, 28, 10, 96, 204, 0x19e}, + { 3, gTextureTextQuit, 24, 10, 198, 204, 0x149}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -1257,8 +1257,8 @@ MenuTexture D_020015CC[5] = { * */ MenuTexture D_02001630[2] = { - { 3, 0, gTextureTableOfContents, 88, 10, 116, 94, 0x42d, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTextureTableOfContents, 88, 10, 116, 94, 0x42d}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -1266,11 +1266,11 @@ MenuTexture D_02001630[2] = { * */ MenuTexture D_02001658[5] = { - { 3, 0, gTextureTextHash, 8, 10, 48, 108, 0x07e, 0 }, - { 3, 0, gTextureTextGameData, 56, 10, 132, 108, 0x2c4, 0 }, - { 3, 0, gTextureTextPages, 32, 10, 252, 108, 0x1c1, 0 }, - { 3, 0, gTextureTextPagesFree, 56, 10, 132, 184, 0x2c2, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTextureTextHash, 8, 10, 48, 108, 0x07e}, + { 3, gTextureTextGameData, 56, 10, 132, 108, 0x2c4}, + { 3, gTextureTextPages, 32, 10, 252, 108, 0x1c1}, + { 3, gTextureTextPagesFree, 56, 10, 132, 184, 0x2c2}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -1278,8 +1278,8 @@ MenuTexture D_02001658[5] = { * */ MenuTexture D_020016BC[2] = { - { 3, 0, gTextureSmallFont0, 8, 9, 0, 0, 0x8e, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTextureSmallFont0, 8, 9, 0, 0, 0x8e}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -1287,8 +1287,8 @@ MenuTexture D_020016BC[2] = { * */ MenuTexture D_020016E4[2] = { - { 3, 0, gTextureSmallFont1, 8, 9, 0, 0, 0x59, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTextureSmallFont1, 8, 9, 0, 0, 0x59}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -1296,8 +1296,8 @@ MenuTexture D_020016E4[2] = { * */ MenuTexture D_0200170C[2] = { - { 3, 0, gTextureSmallFont2, 8, 9, 0, 0, 0x97, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTextureSmallFont2, 8, 9, 0, 0, 0x97}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -1305,8 +1305,8 @@ MenuTexture D_0200170C[2] = { * */ MenuTexture D_02001734[2] = { - { 3, 0, gTextureSmallFont3, 8, 9, 0, 0, 0x95, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTextureSmallFont3, 8, 9, 0, 0, 0x95}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -1314,8 +1314,8 @@ MenuTexture D_02001734[2] = { * */ MenuTexture D_0200175C[2] = { - { 3, 0, gTextureSmallFont4, 8, 9, 0, 0, 0x87, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTextureSmallFont4, 8, 9, 0, 0, 0x87}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -1323,8 +1323,8 @@ MenuTexture D_0200175C[2] = { * */ MenuTexture D_02001784[2] = { - { 3, 0, gTextureSmallFont5, 8, 9, 0, 0, 0x99, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTextureSmallFont5, 8, 9, 0, 0, 0x99}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -1332,8 +1332,8 @@ MenuTexture D_02001784[2] = { * */ MenuTexture D_020017AC[2] = { - { 3, 0, gTextureSmallFont6, 8, 9, 0, 0, 0x9a, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTextureSmallFont6, 8, 9, 0, 0, 0x9a}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -1341,8 +1341,8 @@ MenuTexture D_020017AC[2] = { * */ MenuTexture D_020017D4[2] = { - { 3, 0, gTextureSmallFont7, 8, 9, 0, 0, 0x70, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTextureSmallFont7, 8, 9, 0, 0, 0x70}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -1350,8 +1350,8 @@ MenuTexture D_020017D4[2] = { * */ MenuTexture D_020017FC[2] = { - { 3, 0, gTextureSmallFont8, 8, 9, 0, 0, 0x90, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTextureSmallFont8, 8, 9, 0, 0, 0x90}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -1359,8 +1359,8 @@ MenuTexture D_020017FC[2] = { * */ MenuTexture D_02001824[2] = { - { 3, 0, gTextureSmallFont9, 8, 9, 0, 0, 0x9f, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTextureSmallFont9, 8, 9, 0, 0, 0x9f}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -1368,8 +1368,8 @@ MenuTexture D_02001824[2] = { * */ MenuTexture D_0200184C[2] = { - { 3, 0, gTexture7ED058, 96, 22, 0, 0, 0x238, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTexture7ED058, 96, 22, 0, 0, 0x238}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -1377,8 +1377,8 @@ MenuTexture D_0200184C[2] = { * */ MenuTexture D_02001874[2] = { - { 3, 0, gTexture7ED290, 248, 10, 0, 0, 0x27d, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTexture7ED290, 248, 10, 0, 0, 0x27d}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -1386,8 +1386,8 @@ MenuTexture D_02001874[2] = { * */ MenuTexture D_0200189C[2] = { - { 3, 0, gTextureN64ControllerPakDataSelect, 180, 32, 70, 29, 0x1128, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTextureN64ControllerPakDataSelect, 180, 32, 70, 29, 0x1128}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -1395,8 +1395,8 @@ MenuTexture D_0200189C[2] = { * */ MenuTexture D_020018C4[2] = { - { 3, 0, gTextureEraseDataRecordConfirmation, 180, 32, 70, 29, 0xff4, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTextureEraseDataRecordConfirmation, 180, 32, 70, 29, 0xff4}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -1404,8 +1404,8 @@ MenuTexture D_020018C4[2] = { * */ MenuTexture D_020018EC[2] = { - { 3, 0, gTextureRecordNotErased, 180, 32, 70, 29, 0x8d1, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTextureRecordNotErased, 180, 32, 70, 29, 0x8d1}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -1413,8 +1413,8 @@ MenuTexture D_020018EC[2] = { * */ MenuTexture D_02001914[2] = { - { 3, 0, gTexturePlaceN64ControllerPakIntoController1, 180, 32, 70, 29, 0xc4a, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTexturePlaceN64ControllerPakIntoController1, 180, 32, 70, 29, 0xc4a}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -1422,8 +1422,8 @@ MenuTexture D_02001914[2] = { * */ MenuTexture D_0200193C[2] = { - { 3, 0, gTexturePleaseReinsertOriginalN64ControllerPak, 180, 32, 70, 29, 0xcd6, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTexturePleaseReinsertOriginalN64ControllerPak, 180, 32, 70, 29, 0xcd6}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -1431,8 +1431,8 @@ MenuTexture D_0200193C[2] = { * */ MenuTexture D_02001964[2] = { - { 3, 0, gTextureErasingSelectedRecord, 180, 32, 70, 29, 0xc02, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTextureErasingSelectedRecord, 180, 32, 70, 29, 0xc02}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -1494,8 +1494,8 @@ MkAnimation D_020019DC[2] = { * */ MenuTexture D_020019EC[2] = { - { 0, 0, gTextureNameDK, 64, 12, 0, 64, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureNameDK, 64, 12, 0, 64, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -1503,8 +1503,8 @@ MenuTexture D_020019EC[2] = { * */ MenuTexture D_02001A14[2] = { - { 0, 0, gTextureNameToad, 64, 12, 0, 64, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureNameToad, 64, 12, 0, 64, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -1512,8 +1512,8 @@ MenuTexture D_02001A14[2] = { * */ MenuTexture D_02001A3C[2] = { - { 0, 0, gTextureNameBowser, 64, 12, 0, 64, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureNameBowser, 64, 12, 0, 64, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -1521,8 +1521,8 @@ MenuTexture D_02001A3C[2] = { * */ MenuTexture D_02001A64[2] = { - { 0, 0, gTextureNameLuigi, 64, 12, 0, 64, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureNameLuigi, 64, 12, 0, 64, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -1530,8 +1530,8 @@ MenuTexture D_02001A64[2] = { * */ MenuTexture D_02001A8C[2] = { - { 0, 0, gTextureNameMario, 64, 12, 0, 64, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureNameMario, 64, 12, 0, 64, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -1539,8 +1539,8 @@ MenuTexture D_02001A8C[2] = { * */ MenuTexture D_02001AB4[2] = { - { 0, 0, gTextureNamePeach, 64, 12, 0, 64, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureNamePeach, 64, 12, 0, 64, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -1548,8 +1548,8 @@ MenuTexture D_02001AB4[2] = { * */ MenuTexture D_02001ADC[2] = { - { 0, 0, gTextureNameWario, 64, 12, 0, 64, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureNameWario, 64, 12, 0, 64, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -1557,8 +1557,8 @@ MenuTexture D_02001ADC[2] = { * */ MenuTexture D_02001B04[2] = { - { 0, 0, gTextureNameYoshi, 64, 12, 0, 64, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureNameYoshi, 64, 12, 0, 64, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -1566,8 +1566,8 @@ MenuTexture D_02001B04[2] = { * */ MenuTexture seg2_mario_raceway_preview_texture[2] = { - { 0, 0, gTextureCoursePreviewMarioRaceway, 128, 78, 0, 0, 0x3157, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureCoursePreviewMarioRaceway, 128, 78, 0, 0, 0x3157}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -1575,8 +1575,8 @@ MenuTexture seg2_mario_raceway_preview_texture[2] = { * */ MenuTexture D_02001B54[2] = { - { 0, 0, gTextureCoursePreviewChocoMountain, 128, 78, 0, 0, 0x2a24, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureCoursePreviewChocoMountain, 128, 78, 0, 0, 0x2a24}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -1584,8 +1584,8 @@ MenuTexture D_02001B54[2] = { * */ MenuTexture D_02001B7C[2] = { - { 0, 0, gTextureCoursePreviewBowsersCastle, 128, 78, 0, 0, 0x30de, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureCoursePreviewBowsersCastle, 128, 78, 0, 0, 0x30de}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -1593,8 +1593,8 @@ MenuTexture D_02001B7C[2] = { * */ MenuTexture D_02001BA4[2] = { - { 0, 0, gTextureCoursePreviewBansheeBoardwalk, 128, 78, 0, 0, 0x26ad, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureCoursePreviewBansheeBoardwalk, 128, 78, 0, 0, 0x26ad}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -1602,8 +1602,8 @@ MenuTexture D_02001BA4[2] = { * */ MenuTexture D_02001BCC[2] = { - { 0, 0, gTextureCoursePreviewYoshiValley, 128, 78, 0, 0, 0x3a41, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureCoursePreviewYoshiValley, 128, 78, 0, 0, 0x3a41}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -1611,8 +1611,8 @@ MenuTexture D_02001BCC[2] = { * */ MenuTexture D_02001BF4[2] = { - { 0, 0, gTextureCoursePreviewFrappeSnowland, 128, 78, 0, 0, 0x2409, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureCoursePreviewFrappeSnowland, 128, 78, 0, 0, 0x2409}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -1620,8 +1620,8 @@ MenuTexture D_02001BF4[2] = { * */ MenuTexture D_02001C1C[2] = { - { 0, 0, gTextureCoursePreviewKoopaTroopaBeach, 128, 78, 0, 0, 0x2323, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureCoursePreviewKoopaTroopaBeach, 128, 78, 0, 0, 0x2323}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -1629,8 +1629,8 @@ MenuTexture D_02001C1C[2] = { * */ MenuTexture D_02001C44[2] = { - { 0, 0, gTextureCoursePreviewRoyalRaceway, 128, 78, 0, 0, 0x2821, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureCoursePreviewRoyalRaceway, 128, 78, 0, 0, 0x2821}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -1638,8 +1638,8 @@ MenuTexture D_02001C44[2] = { * */ MenuTexture D_02001C6C[2] = { - { 0, 0, gTextureCoursePreviewLuigiRaceway, 128, 78, 0, 0, 0x2d74, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureCoursePreviewLuigiRaceway, 128, 78, 0, 0, 0x2d74}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -1647,8 +1647,8 @@ MenuTexture D_02001C6C[2] = { * */ MenuTexture D_02001C94[2] = { - { 0, 0, gTextureCoursePreviewMooMooFarm, 128, 78, 0, 0, 0x25c7, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureCoursePreviewMooMooFarm, 128, 78, 0, 0, 0x25c7}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -1656,8 +1656,8 @@ MenuTexture D_02001C94[2] = { * */ MenuTexture D_02001CBC[2] = { - { 0, 0, gTextureCoursePreviewToadsTurnpike, 128, 78, 0, 0, 0x299a, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureCoursePreviewToadsTurnpike, 128, 78, 0, 0, 0x299a}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -1665,8 +1665,8 @@ MenuTexture D_02001CBC[2] = { * */ MenuTexture D_02001CE4[2] = { - { 0, 0, gTextureCoursePreviewKalimariDesert, 128, 78, 0, 0, 0x280a, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureCoursePreviewKalimariDesert, 128, 78, 0, 0, 0x280a}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -1674,8 +1674,8 @@ MenuTexture D_02001CE4[2] = { * */ MenuTexture D_02001D0C[2] = { - { 0, 0, gTextureCoursePreviewSherbetLand, 128, 78, 0, 0, 0x300e, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureCoursePreviewSherbetLand, 128, 78, 0, 0, 0x300e}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -1683,8 +1683,8 @@ MenuTexture D_02001D0C[2] = { * */ MenuTexture D_02001D34[2] = { - { 0, 0, gTextureCoursePreviewRainbowRoad, 128, 78, 0, 0, 0x2824, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureCoursePreviewRainbowRoad, 128, 78, 0, 0, 0x2824}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -1692,8 +1692,8 @@ MenuTexture D_02001D34[2] = { * */ MenuTexture D_02001D5C[2] = { - { 0, 0, gTextureCoursePreviewWarioStadium, 128, 78, 0, 0, 0x32d3, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureCoursePreviewWarioStadium, 128, 78, 0, 0, 0x32d3}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -1701,8 +1701,8 @@ MenuTexture D_02001D5C[2] = { * */ MenuTexture D_02001D84[2] = { - { 0, 0, gTextureCoursePreviewBlockFort, 128, 78, 0, 0, 0x2528, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureCoursePreviewBlockFort, 128, 78, 0, 0, 0x2528}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -1710,8 +1710,8 @@ MenuTexture D_02001D84[2] = { * */ MenuTexture D_02001DAC[2] = { - { 0, 0, gTextureCoursePreviewSkyscraper, 128, 78, 0, 0, 0x26f0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureCoursePreviewSkyscraper, 128, 78, 0, 0, 0x26f0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -1719,8 +1719,8 @@ MenuTexture D_02001DAC[2] = { * */ MenuTexture D_02001DD4[2] = { - { 0, 0, gTextureCoursePreviewDoubleDeck, 128, 78, 0, 0, 0x28f7, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureCoursePreviewDoubleDeck, 128, 78, 0, 0, 0x28f7}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -1728,8 +1728,8 @@ MenuTexture D_02001DD4[2] = { * */ MenuTexture D_02001DFC[2] = { - { 0, 0, gTextureCoursePreviewDksJungleParkway, 128, 78, 0, 0, 0x3ee4, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureCoursePreviewDksJungleParkway, 128, 78, 0, 0, 0x3ee4}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -1737,8 +1737,8 @@ MenuTexture D_02001DFC[2] = { * */ MenuTexture D_02001E24[2] = { - { 0, 0, gTextureCoursePreviewBigDonut, 128, 78, 0, 0, 0x2f5c, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureCoursePreviewBigDonut, 128, 78, 0, 0, 0x2f5c}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -1932,8 +1932,8 @@ MkAnimation D_02001F94[2] = { * */ MenuTexture D_02001FA4[2] = { - { 3, 0, gTexture7ED6A4, 68, 51, 0, 0, 0x38e, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTexture7ED6A4, 68, 51, 0, 0, 0x38e}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -1941,8 +1941,8 @@ MenuTexture D_02001FA4[2] = { * */ MenuTexture D_02001FCC[2] = { - { 1, 0, gTextureTrophyGold, 45, 45, 0, 0, 0x633, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 1, gTextureTrophyGold, 45, 45, 0, 0, 0x633}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -1950,8 +1950,8 @@ MenuTexture D_02001FCC[2] = { * */ MenuTexture D_02001FF4[2] = { - { 1, 0, gTextureTrophySilver, 45, 45, 0, 0, 0x629, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 1, gTextureTrophySilver, 45, 45, 0, 0, 0x629}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -1959,8 +1959,8 @@ MenuTexture D_02001FF4[2] = { * */ MenuTexture D_0200201C[2] = { - { 1, 0, gTextureTrophyBronze, 45, 45, 0, 0, 0x5ec, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 1, gTextureTrophyBronze, 45, 45, 0, 0, 0x5ec}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -1968,8 +1968,8 @@ MenuTexture D_0200201C[2] = { * */ MenuTexture D_02002044[2] = { - { 1, 0, gTextureCupGold, 45, 45, 0, 0, 0x98a, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 1, gTextureCupGold, 45, 45, 0, 0, 0x98a}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -1977,8 +1977,8 @@ MenuTexture D_02002044[2] = { * */ MenuTexture D_0200206C[2] = { - { 1, 0, gTextureCupSilver, 45, 45, 0, 0, 0x985, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 1, gTextureCupSilver, 45, 45, 0, 0, 0x985}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -1986,8 +1986,8 @@ MenuTexture D_0200206C[2] = { * */ MenuTexture D_02002094[2] = { - { 1, 0, gTextureCupBronze, 45, 45, 0, 0, 0x8a2, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 1, gTextureCupBronze, 45, 45, 0, 0, 0x8a2}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -2049,8 +2049,8 @@ MkAnimation D_0200210C[2] = { * */ MenuTexture D_0200211C[2] = { - { 5, 0, gTexture7F2094, 26, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F2094, 26, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -2058,8 +2058,8 @@ MenuTexture D_0200211C[2] = { * */ MenuTexture D_02002144[2] = { - { 5, 0, gTexture7F2164, 26, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F2164, 26, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -2067,8 +2067,8 @@ MenuTexture D_02002144[2] = { * */ MenuTexture D_0200216C[2] = { - { 5, 0, gTexture7F2234, 26, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F2234, 26, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -2076,8 +2076,8 @@ MenuTexture D_0200216C[2] = { * */ MenuTexture D_02002194[2] = { - { 5, 0, gTexture7F2304, 26, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F2304, 26, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -2085,8 +2085,8 @@ MenuTexture D_02002194[2] = { * */ MenuTexture D_020021BC[2] = { - { 5, 0, gTexture7F23D4, 26, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F23D4, 26, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -2094,8 +2094,8 @@ MenuTexture D_020021BC[2] = { * */ MenuTexture D_020021E4[2] = { - { 5, 0, gTexture7F24A4, 26, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F24A4, 26, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -2103,8 +2103,8 @@ MenuTexture D_020021E4[2] = { * */ MenuTexture D_0200220C[2] = { - { 5, 0, gTexture7F2574, 26, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F2574, 26, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -2112,8 +2112,8 @@ MenuTexture D_0200220C[2] = { * */ MenuTexture D_02002234[2] = { - { 5, 0, gTexture7F2644, 26, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F2644, 26, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -2121,8 +2121,8 @@ MenuTexture D_02002234[2] = { * */ MenuTexture D_0200225C[2] = { - { 5, 0, gTexture7F2714, 26, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F2714, 26, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -2130,8 +2130,8 @@ MenuTexture D_0200225C[2] = { * */ MenuTexture D_02002284[2] = { - { 5, 0, gTexture7F27E4, 26, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F27E4, 26, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -2139,8 +2139,8 @@ MenuTexture D_02002284[2] = { * */ MenuTexture D_020022AC[2] = { - { 5, 0, gTexture7F28B4, 26, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F28B4, 26, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -2148,8 +2148,8 @@ MenuTexture D_020022AC[2] = { * */ MenuTexture D_020022D4[2] = { - { 5, 0, gTexture7F2984, 26, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F2984, 26, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -2157,8 +2157,8 @@ MenuTexture D_020022D4[2] = { * */ MenuTexture D_020022FC[2] = { - { 5, 0, gTexture7F2A54, 26, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F2A54, 26, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -2166,8 +2166,8 @@ MenuTexture D_020022FC[2] = { * */ MenuTexture D_02002324[2] = { - { 5, 0, gTexture7F2B24, 26, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F2B24, 26, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -2175,8 +2175,8 @@ MenuTexture D_02002324[2] = { * */ MenuTexture D_0200234C[2] = { - { 5, 0, gTexture7F2BF4, 26, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F2BF4, 26, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -2184,8 +2184,8 @@ MenuTexture D_0200234C[2] = { * */ MenuTexture D_02002374[2] = { - { 5, 0, gTexture7F2CC4, 26, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F2CC4, 26, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -2193,8 +2193,8 @@ MenuTexture D_02002374[2] = { * */ MenuTexture D_0200239C[2] = { - { 5, 0, gTexture7F2D94, 26, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F2D94, 26, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -2202,8 +2202,8 @@ MenuTexture D_0200239C[2] = { * */ MenuTexture D_020023C4[2] = { - { 5, 0, gTexture7F2E64, 26, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F2E64, 26, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -2211,8 +2211,8 @@ MenuTexture D_020023C4[2] = { * */ MenuTexture D_020023EC[2] = { - { 5, 0, gTexture7F2F34, 26, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F2F34, 26, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -2220,8 +2220,8 @@ MenuTexture D_020023EC[2] = { * */ MenuTexture D_02002414[2] = { - { 5, 0, gTexture7F3004, 26, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F3004, 26, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -2229,8 +2229,8 @@ MenuTexture D_02002414[2] = { * */ MenuTexture D_0200243C[2] = { - { 5, 0, gTexture7F30D4, 26, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F30D4, 26, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -2238,8 +2238,8 @@ MenuTexture D_0200243C[2] = { * */ MenuTexture D_02002464[2] = { - { 5, 0, gTexture7F31A4, 26, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F31A4, 26, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -2247,8 +2247,8 @@ MenuTexture D_02002464[2] = { * */ MenuTexture D_0200248C[2] = { - { 5, 0, gTexture7F3274, 26, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F3274, 26, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -2256,8 +2256,8 @@ MenuTexture D_0200248C[2] = { * */ MenuTexture D_020024B4[2] = { - { 5, 0, gTexture7F3344, 26, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F3344, 26, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -2265,8 +2265,8 @@ MenuTexture D_020024B4[2] = { * */ MenuTexture D_020024DC[2] = { - { 5, 0, gTexture7F3414, 26, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F3414, 26, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -2274,8 +2274,8 @@ MenuTexture D_020024DC[2] = { * */ MenuTexture D_02002504[2] = { - { 5, 0, gTexture7F34E4, 26, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F34E4, 26, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -2283,8 +2283,8 @@ MenuTexture D_02002504[2] = { * */ MenuTexture D_0200252C[2] = { - { 5, 0, gTexture7F1394, 26, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F1394, 26, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -2292,8 +2292,8 @@ MenuTexture D_0200252C[2] = { * */ MenuTexture D_02002554[2] = { - { 5, 0, gTexture7F1464, 26, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F1464, 26, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -2301,8 +2301,8 @@ MenuTexture D_02002554[2] = { * */ MenuTexture D_0200257C[2] = { - { 5, 0, gTexture7F16D4, 26, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F16D4, 26, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -2310,8 +2310,8 @@ MenuTexture D_0200257C[2] = { * */ MenuTexture D_020025A4[2] = { - { 5, 0, gTexture7F17A4, 26, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F17A4, 26, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -2319,8 +2319,8 @@ MenuTexture D_020025A4[2] = { * */ MenuTexture D_020025CC[2] = { - { 5, 0, gTexture7F12C4, 26, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F12C4, 26, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -2328,8 +2328,8 @@ MenuTexture D_020025CC[2] = { * */ MenuTexture D_020025F4[2] = { - { 5, 0, gTexture7F1604, 26, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F1604, 26, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -2337,8 +2337,8 @@ MenuTexture D_020025F4[2] = { * */ MenuTexture D_0200261C[2] = { - { 5, 0, gTexture7F1534, 26, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F1534, 26, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -2346,8 +2346,8 @@ MenuTexture D_0200261C[2] = { * */ MenuTexture D_02002644[2] = { - { 5, 0, gTexture7F1124, 26, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F1124, 26, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -2355,8 +2355,8 @@ MenuTexture D_02002644[2] = { * */ MenuTexture D_0200266C[2] = { - { 5, 0, gTexture7F11F4, 26, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F11F4, 26, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -2364,8 +2364,8 @@ MenuTexture D_0200266C[2] = { * */ MenuTexture D_02002694[2] = { - { 5, 0, gTexture7F1874, 26, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F1874, 26, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -2373,8 +2373,8 @@ MenuTexture D_02002694[2] = { * */ MenuTexture D_020026BC[2] = { - { 5, 0, gTexture7F1944, 26, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F1944, 26, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -2382,8 +2382,8 @@ MenuTexture D_020026BC[2] = { * */ MenuTexture D_020026E4[2] = { - { 5, 0, gTexture7F1A14, 26, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F1A14, 26, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -2391,8 +2391,8 @@ MenuTexture D_020026E4[2] = { * */ MenuTexture D_0200270C[2] = { - { 5, 0, gTexture7F1AE4, 26, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F1AE4, 26, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -2400,8 +2400,8 @@ MenuTexture D_0200270C[2] = { * */ MenuTexture D_02002734[2] = { - { 5, 0, gTexture7F1BB4, 26, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F1BB4, 26, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -2409,8 +2409,8 @@ MenuTexture D_02002734[2] = { * */ MenuTexture D_0200275C[2] = { - { 5, 0, gTexture7F1C84, 26, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F1C84, 26, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -2418,8 +2418,8 @@ MenuTexture D_0200275C[2] = { * */ MenuTexture D_02002784[2] = { - { 5, 0, gTexture7F1D54, 26, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F1D54, 26, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -2427,8 +2427,8 @@ MenuTexture D_02002784[2] = { * */ MenuTexture D_020027AC[2] = { - { 5, 0, gTexture7F1E24, 26, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F1E24, 26, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -2436,8 +2436,8 @@ MenuTexture D_020027AC[2] = { * */ MenuTexture D_020027D4[2] = { - { 5, 0, gTexture7F1EF4, 26, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F1EF4, 26, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -2445,8 +2445,8 @@ MenuTexture D_020027D4[2] = { * */ MenuTexture D_020027FC[2] = { - { 5, 0, gTexture7F1FC4, 26, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F1FC4, 26, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -2454,8 +2454,8 @@ MenuTexture D_020027FC[2] = { * */ MenuTexture D_02002824[2] = { - { 5, 0, gTexture7F35B4, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F35B4, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -2463,8 +2463,8 @@ MenuTexture D_02002824[2] = { * */ MenuTexture D_0200284C[2] = { - { 5, 0, gTexture7F3634, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F3634, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -2472,8 +2472,8 @@ MenuTexture D_0200284C[2] = { * */ MenuTexture D_02002874[2] = { - { 5, 0, gTexture7F36B4, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F36B4, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -2481,8 +2481,8 @@ MenuTexture D_02002874[2] = { * */ MenuTexture D_0200289C[2] = { - { 5, 0, gTexture7F3734, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F3734, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -2490,8 +2490,8 @@ MenuTexture D_0200289C[2] = { * */ MenuTexture D_020028C4[2] = { - { 5, 0, gTexture7F37B4, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F37B4, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -2499,8 +2499,8 @@ MenuTexture D_020028C4[2] = { * */ MenuTexture D_020028EC[2] = { - { 5, 0, gTexture7F3AB4, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F3AB4, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -2508,8 +2508,8 @@ MenuTexture D_020028EC[2] = { * */ MenuTexture D_02002914[2] = { - { 5, 0, gTexture7F3B34, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F3B34, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -2517,8 +2517,8 @@ MenuTexture D_02002914[2] = { * */ MenuTexture D_0200293C[2] = { - { 5, 0, gTexture7F3BB4, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F3BB4, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -2526,8 +2526,8 @@ MenuTexture D_0200293C[2] = { * */ MenuTexture D_02002964[2] = { - { 5, 0, gTexture7F3C34, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F3C34, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -2535,8 +2535,8 @@ MenuTexture D_02002964[2] = { * */ MenuTexture D_0200298C[2] = { - { 5, 0, gTexture7F3CB4, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F3CB4, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -2544,8 +2544,8 @@ MenuTexture D_0200298C[2] = { * */ MenuTexture D_020029B4[2] = { - { 5, 0, gTexture7F3D34, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F3D34, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -2553,8 +2553,8 @@ MenuTexture D_020029B4[2] = { * */ MenuTexture D_020029DC[2] = { - { 5, 0, gTexture7F3DB4, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F3DB4, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -2562,8 +2562,8 @@ MenuTexture D_020029DC[2] = { * */ MenuTexture D_02002A04[2] = { - { 5, 0, gTexture7F3E34, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F3E34, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -2571,8 +2571,8 @@ MenuTexture D_02002A04[2] = { * */ MenuTexture D_02002A2C[2] = { - { 5, 0, gTexture7F3EB4, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F3EB4, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -2580,8 +2580,8 @@ MenuTexture D_02002A2C[2] = { * */ MenuTexture D_02002A54[2] = { - { 5, 0, gTexture7F3F34, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F3F34, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -2589,8 +2589,8 @@ MenuTexture D_02002A54[2] = { * */ MenuTexture D_02002A7C[2] = { - { 5, 0, gTexture7F3FB4, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F3FB4, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -2598,8 +2598,8 @@ MenuTexture D_02002A7C[2] = { * */ MenuTexture D_02002AA4[2] = { - { 5, 0, gTexture7F4034, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F4034, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -2607,8 +2607,8 @@ MenuTexture D_02002AA4[2] = { * */ MenuTexture D_02002ACC[2] = { - { 5, 0, gTexture7F40B4, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F40B4, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -2616,8 +2616,8 @@ MenuTexture D_02002ACC[2] = { * */ MenuTexture D_02002AF4[2] = { - { 5, 0, gTexture7F41B4, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F41B4, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -2625,8 +2625,8 @@ MenuTexture D_02002AF4[2] = { * */ MenuTexture D_02002B1C[2] = { - { 5, 0, gTexture7F4234, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F4234, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -2634,8 +2634,8 @@ MenuTexture D_02002B1C[2] = { * */ MenuTexture D_02002B44[2] = { - { 5, 0, gTexture7F42B4, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F42B4, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -2643,8 +2643,8 @@ MenuTexture D_02002B44[2] = { * */ MenuTexture D_02002B6C[2] = { - { 5, 0, gTexture7F4334, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F4334, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -2652,8 +2652,8 @@ MenuTexture D_02002B6C[2] = { * */ MenuTexture D_02002B94[2] = { - { 5, 0, gTexture7F43B4, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F43B4, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -2661,8 +2661,8 @@ MenuTexture D_02002B94[2] = { * */ MenuTexture D_02002BBC[2] = { - { 5, 0, gTexture7F4434, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F4434, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -2670,8 +2670,8 @@ MenuTexture D_02002BBC[2] = { * */ MenuTexture D_02002BE4[2] = { - { 5, 0, gTexture7F44B4, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F44B4, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -2679,8 +2679,8 @@ MenuTexture D_02002BE4[2] = { * */ MenuTexture D_02002C0C[2] = { - { 5, 0, gTexture7F4534, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F4534, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -2688,8 +2688,8 @@ MenuTexture D_02002C0C[2] = { * */ MenuTexture D_02002C34[2] = { - { 5, 0, gTexture7F45B4, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F45B4, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -2697,8 +2697,8 @@ MenuTexture D_02002C34[2] = { * */ MenuTexture D_02002C5C[2] = { - { 5, 0, gTexture7F4634, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F4634, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -2706,8 +2706,8 @@ MenuTexture D_02002C5C[2] = { * */ MenuTexture D_02002C84[2] = { - { 5, 0, gTexture7F46B4, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F46B4, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -2715,8 +2715,8 @@ MenuTexture D_02002C84[2] = { * */ MenuTexture D_02002CAC[2] = { - { 5, 0, gTexture7F4734, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F4734, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -2724,8 +2724,8 @@ MenuTexture D_02002CAC[2] = { * */ MenuTexture D_02002CD4[2] = { - { 5, 0, gTexture7F47B4, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F47B4, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -2733,8 +2733,8 @@ MenuTexture D_02002CD4[2] = { * */ MenuTexture D_02002CFC[2] = { - { 5, 0, gTexture7F4834, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F4834, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -2742,8 +2742,8 @@ MenuTexture D_02002CFC[2] = { * */ MenuTexture D_02002D24[2] = { - { 5, 0, gTexture7F48B4, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F48B4, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -2751,8 +2751,8 @@ MenuTexture D_02002D24[2] = { * */ MenuTexture D_02002D4C[2] = { - { 5, 0, gTexture7F4934, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F4934, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -2760,8 +2760,8 @@ MenuTexture D_02002D4C[2] = { * */ MenuTexture D_02002D74[2] = { - { 5, 0, gTexture7F49B4, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F49B4, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -2769,8 +2769,8 @@ MenuTexture D_02002D74[2] = { * */ MenuTexture D_02002D9C[2] = { - { 5, 0, gTexture7F4A34, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F4A34, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -2778,8 +2778,8 @@ MenuTexture D_02002D9C[2] = { * */ MenuTexture D_02002DC4[2] = { - { 5, 0, gTexture7F4AB4, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F4AB4, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -2787,8 +2787,8 @@ MenuTexture D_02002DC4[2] = { * */ MenuTexture D_02002DEC[2] = { - { 5, 0, gTexture7F4B34, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F4B34, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -2796,8 +2796,8 @@ MenuTexture D_02002DEC[2] = { * */ MenuTexture D_02002E14[2] = { - { 5, 0, gTexture7F4D34, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F4D34, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -2805,8 +2805,8 @@ MenuTexture D_02002E14[2] = { * */ MenuTexture D_02002E3C[2] = { - { 5, 0, gTexture7F4DB4, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F4DB4, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -2814,8 +2814,8 @@ MenuTexture D_02002E3C[2] = { * */ MenuTexture D_02002E64[2] = { - { 5, 0, gTexture7F4E34, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F4E34, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -2823,8 +2823,8 @@ MenuTexture D_02002E64[2] = { * */ MenuTexture D_02002E8C[2] = { - { 5, 0, gTexture7F4EB4, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F4EB4, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -2832,8 +2832,8 @@ MenuTexture D_02002E8C[2] = { * */ MenuTexture D_02002EB4[2] = { - { 5, 0, gTexture7F4F34, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F4F34, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -2841,8 +2841,8 @@ MenuTexture D_02002EB4[2] = { * */ MenuTexture D_02002EDC[2] = { - { 5, 0, gTexture7F4FB4, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F4FB4, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -2850,8 +2850,8 @@ MenuTexture D_02002EDC[2] = { * */ MenuTexture D_02002F04[2] = { - { 5, 0, gTexture7F5034, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F5034, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -2859,8 +2859,8 @@ MenuTexture D_02002F04[2] = { * */ MenuTexture D_02002F2C[2] = { - { 5, 0, gTexture7F50B4, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F50B4, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -2868,8 +2868,8 @@ MenuTexture D_02002F2C[2] = { * */ MenuTexture D_02002F54[2] = { - { 5, 0, gTexture7F5134, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F5134, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -2877,8 +2877,8 @@ MenuTexture D_02002F54[2] = { * */ MenuTexture D_02002F7C[2] = { - { 5, 0, gTexture7F51B4, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F51B4, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -2886,8 +2886,8 @@ MenuTexture D_02002F7C[2] = { * */ MenuTexture D_02002FA4[2] = { - { 5, 0, gTexture7F5234, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F5234, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -2895,8 +2895,8 @@ MenuTexture D_02002FA4[2] = { * */ MenuTexture D_02002FCC[2] = { - { 5, 0, gTexture7F52B4, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F52B4, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -2904,8 +2904,8 @@ MenuTexture D_02002FCC[2] = { * */ MenuTexture D_02002FF4[2] = { - { 5, 0, gTexture7F5334, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F5334, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -2913,8 +2913,8 @@ MenuTexture D_02002FF4[2] = { * */ MenuTexture D_0200301C[2] = { - { 5, 0, gTexture7F53B4, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F53B4, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -2922,8 +2922,8 @@ MenuTexture D_0200301C[2] = { * */ MenuTexture D_02003044[2] = { - { 5, 0, gTexture7F5434, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F5434, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -2931,8 +2931,8 @@ MenuTexture D_02003044[2] = { * */ MenuTexture D_0200306C[2] = { - { 5, 0, gTexture7F54B4, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F54B4, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -2940,8 +2940,8 @@ MenuTexture D_0200306C[2] = { * */ MenuTexture D_02003094[2] = { - { 5, 0, gTexture7F5534, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F5534, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -2949,8 +2949,8 @@ MenuTexture D_02003094[2] = { * */ MenuTexture D_020030BC[2] = { - { 5, 0, gTexture7F55B4, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F55B4, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -2958,8 +2958,8 @@ MenuTexture D_020030BC[2] = { * */ MenuTexture D_020030E4[2] = { - { 5, 0, gTexture7F5634, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F5634, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -2967,8 +2967,8 @@ MenuTexture D_020030E4[2] = { * */ MenuTexture D_0200310C[2] = { - { 5, 0, gTexture7F56B4, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F56B4, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -2976,8 +2976,8 @@ MenuTexture D_0200310C[2] = { * */ MenuTexture D_02003134[2] = { - { 5, 0, gTexture7F5734, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F5734, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -2985,8 +2985,8 @@ MenuTexture D_02003134[2] = { * */ MenuTexture D_0200315C[2] = { - { 5, 0, gTexture7F57B4, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F57B4, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -2994,8 +2994,8 @@ MenuTexture D_0200315C[2] = { * */ MenuTexture D_02003184[2] = { - { 5, 0, gTexture7F5834, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F5834, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -3003,8 +3003,8 @@ MenuTexture D_02003184[2] = { * */ MenuTexture D_020031AC[2] = { - { 5, 0, gTexture7F58B4, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F58B4, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -3012,8 +3012,8 @@ MenuTexture D_020031AC[2] = { * */ MenuTexture D_020031D4[2] = { - { 5, 0, gTexture7F5934, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F5934, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -3021,8 +3021,8 @@ MenuTexture D_020031D4[2] = { * */ MenuTexture D_020031FC[2] = { - { 5, 0, gTexture7F59B4, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F59B4, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -3030,8 +3030,8 @@ MenuTexture D_020031FC[2] = { * */ MenuTexture D_02003224[2] = { - { 5, 0, gTexture7F5A34, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F5A34, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -3039,8 +3039,8 @@ MenuTexture D_02003224[2] = { * */ MenuTexture D_0200324C[2] = { - { 5, 0, gTexture7F5AB4, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F5AB4, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -3048,8 +3048,8 @@ MenuTexture D_0200324C[2] = { * */ MenuTexture D_02003274[2] = { - { 5, 0, gTexture7F5B34, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F5B34, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -3057,8 +3057,8 @@ MenuTexture D_02003274[2] = { * */ MenuTexture D_0200329C[2] = { - { 5, 0, gTexture7F5BB4, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F5BB4, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -3066,8 +3066,8 @@ MenuTexture D_0200329C[2] = { * */ MenuTexture D_020032C4[2] = { - { 5, 0, gTexture7F5C34, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F5C34, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -3075,8 +3075,8 @@ MenuTexture D_020032C4[2] = { * */ MenuTexture D_020032EC[2] = { - { 5, 0, gTexture7F5CB4, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F5CB4, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -3084,8 +3084,8 @@ MenuTexture D_020032EC[2] = { * */ MenuTexture D_02003314[2] = { - { 5, 0, gTexture7F5D34, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F5D34, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -3093,8 +3093,8 @@ MenuTexture D_02003314[2] = { * */ MenuTexture D_0200333C[2] = { - { 5, 0, gTexture7F4BB4, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F4BB4, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -3102,8 +3102,8 @@ MenuTexture D_0200333C[2] = { * */ MenuTexture D_02003364[2] = { - { 5, 0, gTexture7F4C34, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F4C34, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -3111,8 +3111,8 @@ MenuTexture D_02003364[2] = { * */ MenuTexture D_0200338C[2] = { - { 5, 0, gTexture7F4CB4, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F4CB4, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -3120,8 +3120,8 @@ MenuTexture D_0200338C[2] = { * */ MenuTexture D_020033B4[2] = { - { 5, 0, gTexture7F4134, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F4134, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -3129,8 +3129,8 @@ MenuTexture D_020033B4[2] = { * */ MenuTexture D_020033DC[2] = { - { 5, 0, gTexture7F3834, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F3834, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -3138,8 +3138,8 @@ MenuTexture D_020033DC[2] = { * */ MenuTexture D_02003404[2] = { - { 5, 0, gTexture7F38B4, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F38B4, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -3147,8 +3147,8 @@ MenuTexture D_02003404[2] = { * */ MenuTexture D_0200342C[2] = { - { 5, 0, gTexture7F3934, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F3934, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -3156,8 +3156,8 @@ MenuTexture D_0200342C[2] = { * */ MenuTexture D_02003454[2] = { - { 5, 0, gTexture7F39B4, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F39B4, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -3165,8 +3165,8 @@ MenuTexture D_02003454[2] = { * */ MenuTexture D_0200347C[2] = { - { 5, 0, gTexture7F3A34, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F3A34, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -3174,8 +3174,8 @@ MenuTexture D_0200347C[2] = { * */ MenuTexture D_020034A4[2] = { - { 5, 0, gTexture7F5DB4, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F5DB4, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -3183,8 +3183,8 @@ MenuTexture D_020034A4[2] = { * */ MenuTexture D_020034CC[2] = { - { 5, 0, gTexture7F5E34, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F5E34, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -3192,8 +3192,8 @@ MenuTexture D_020034CC[2] = { * */ MenuTexture D_020034F4[2] = { - { 5, 0, gTexture7F5EB4, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F5EB4, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -3201,8 +3201,8 @@ MenuTexture D_020034F4[2] = { * */ MenuTexture D_0200351C[2] = { - { 5, 0, gTexture7F5F34, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F5F34, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -3210,8 +3210,8 @@ MenuTexture D_0200351C[2] = { * */ MenuTexture D_02003544[2] = { - { 5, 0, gTexture7F5FB4, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F5FB4, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -3219,8 +3219,8 @@ MenuTexture D_02003544[2] = { * */ MenuTexture D_0200356C[2] = { - { 5, 0, gTexture7F62B4, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F62B4, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -3228,8 +3228,8 @@ MenuTexture D_0200356C[2] = { * */ MenuTexture D_02003594[2] = { - { 5, 0, gTexture7F6334, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F6334, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -3237,8 +3237,8 @@ MenuTexture D_02003594[2] = { * */ MenuTexture D_020035BC[2] = { - { 5, 0, gTexture7F63B4, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F63B4, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -3246,8 +3246,8 @@ MenuTexture D_020035BC[2] = { * */ MenuTexture D_020035E4[2] = { - { 5, 0, gTexture7F6434, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F6434, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -3255,8 +3255,8 @@ MenuTexture D_020035E4[2] = { * */ MenuTexture D_0200360C[2] = { - { 5, 0, gTexture7F64B4, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F64B4, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -3264,8 +3264,8 @@ MenuTexture D_0200360C[2] = { * */ MenuTexture D_02003634[2] = { - { 5, 0, gTexture7F6534, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F6534, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -3273,8 +3273,8 @@ MenuTexture D_02003634[2] = { * */ MenuTexture D_0200365C[2] = { - { 5, 0, gTexture7F65B4, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F65B4, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -3282,8 +3282,8 @@ MenuTexture D_0200365C[2] = { * */ MenuTexture D_02003684[2] = { - { 5, 0, gTexture7F6634, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F6634, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -3291,8 +3291,8 @@ MenuTexture D_02003684[2] = { * */ MenuTexture D_020036AC[2] = { - { 5, 0, gTexture7F66B4, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F66B4, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -3300,8 +3300,8 @@ MenuTexture D_020036AC[2] = { * */ MenuTexture D_020036D4[2] = { - { 5, 0, gTexture7F6734, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F6734, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -3309,8 +3309,8 @@ MenuTexture D_020036D4[2] = { * */ MenuTexture D_020036FC[2] = { - { 5, 0, gTexture7F67B4, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F67B4, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -3318,8 +3318,8 @@ MenuTexture D_020036FC[2] = { * */ MenuTexture D_02003724[2] = { - { 5, 0, gTexture7F6834, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F6834, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -3327,8 +3327,8 @@ MenuTexture D_02003724[2] = { * */ MenuTexture D_0200374C[2] = { - { 5, 0, gTexture7F68B4, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F68B4, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -3336,8 +3336,8 @@ MenuTexture D_0200374C[2] = { * */ MenuTexture D_02003774[2] = { - { 5, 0, gTexture7F69B4, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F69B4, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -3345,8 +3345,8 @@ MenuTexture D_02003774[2] = { * */ MenuTexture D_0200379C[2] = { - { 5, 0, gTexture7F6A34, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F6A34, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -3354,8 +3354,8 @@ MenuTexture D_0200379C[2] = { * */ MenuTexture D_020037C4[2] = { - { 5, 0, gTexture7F6AB4, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F6AB4, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -3363,8 +3363,8 @@ MenuTexture D_020037C4[2] = { * */ MenuTexture D_020037EC[2] = { - { 5, 0, gTexture7F6B34, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F6B34, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -3372,8 +3372,8 @@ MenuTexture D_020037EC[2] = { * */ MenuTexture D_02003814[2] = { - { 5, 0, gTexture7F6BB4, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F6BB4, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -3381,8 +3381,8 @@ MenuTexture D_02003814[2] = { * */ MenuTexture D_0200383C[2] = { - { 5, 0, gTexture7F6C34, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F6C34, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -3390,8 +3390,8 @@ MenuTexture D_0200383C[2] = { * */ MenuTexture D_02003864[2] = { - { 5, 0, gTexture7F6CB4, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F6CB4, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -3399,8 +3399,8 @@ MenuTexture D_02003864[2] = { * */ MenuTexture D_0200388C[2] = { - { 5, 0, gTexture7F6D34, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F6D34, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -3408,8 +3408,8 @@ MenuTexture D_0200388C[2] = { * */ MenuTexture D_020038B4[2] = { - { 5, 0, gTexture7F6DB4, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F6DB4, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -3417,8 +3417,8 @@ MenuTexture D_020038B4[2] = { * */ MenuTexture D_020038DC[2] = { - { 5, 0, gTexture7F6E34, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F6E34, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -3426,8 +3426,8 @@ MenuTexture D_020038DC[2] = { * */ MenuTexture D_02003904[2] = { - { 5, 0, gTexture7F6EB4, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F6EB4, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -3435,8 +3435,8 @@ MenuTexture D_02003904[2] = { * */ MenuTexture D_0200392C[2] = { - { 5, 0, gTexture7F6F34, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F6F34, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -3444,8 +3444,8 @@ MenuTexture D_0200392C[2] = { * */ MenuTexture D_02003954[2] = { - { 5, 0, gTexture7F6FB4, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F6FB4, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -3453,8 +3453,8 @@ MenuTexture D_02003954[2] = { * */ MenuTexture D_0200397C[2] = { - { 5, 0, gTexture7F7034, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F7034, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -3462,8 +3462,8 @@ MenuTexture D_0200397C[2] = { * */ MenuTexture D_020039A4[2] = { - { 5, 0, gTexture7F70B4, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F70B4, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -3471,8 +3471,8 @@ MenuTexture D_020039A4[2] = { * */ MenuTexture D_020039CC[2] = { - { 5, 0, gTexture7F7134, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F7134, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -3480,8 +3480,8 @@ MenuTexture D_020039CC[2] = { * */ MenuTexture D_020039F4[2] = { - { 5, 0, gTexture7F71B4, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F71B4, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -3489,8 +3489,8 @@ MenuTexture D_020039F4[2] = { * */ MenuTexture D_02003A1C[2] = { - { 5, 0, gTexture7F7234, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F7234, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -3498,8 +3498,8 @@ MenuTexture D_02003A1C[2] = { * */ MenuTexture D_02003A44[2] = { - { 5, 0, gTexture7F72B4, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F72B4, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -3507,8 +3507,8 @@ MenuTexture D_02003A44[2] = { * */ MenuTexture D_02003A6C[2] = { - { 5, 0, gTexture7F7334, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F7334, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -3516,8 +3516,8 @@ MenuTexture D_02003A6C[2] = { * */ MenuTexture D_02003A94[2] = { - { 5, 0, gTexture7F7534, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F7534, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -3525,8 +3525,8 @@ MenuTexture D_02003A94[2] = { * */ MenuTexture D_02003ABC[2] = { - { 5, 0, gTexture7F75B4, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F75B4, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -3534,8 +3534,8 @@ MenuTexture D_02003ABC[2] = { * */ MenuTexture D_02003AE4[2] = { - { 5, 0, gTexture7F7634, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F7634, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -3543,8 +3543,8 @@ MenuTexture D_02003AE4[2] = { * */ MenuTexture D_02003B0C[2] = { - { 5, 0, gTexture7F76B4, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F76B4, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -3552,8 +3552,8 @@ MenuTexture D_02003B0C[2] = { * */ MenuTexture D_02003B34[2] = { - { 5, 0, gTexture7F7734, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F7734, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -3561,8 +3561,8 @@ MenuTexture D_02003B34[2] = { * */ MenuTexture D_02003B5C[2] = { - { 5, 0, gTexture7F77B4, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F77B4, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -3570,8 +3570,8 @@ MenuTexture D_02003B5C[2] = { * */ MenuTexture D_02003B84[2] = { - { 5, 0, gTexture7F7834, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F7834, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -3579,8 +3579,8 @@ MenuTexture D_02003B84[2] = { * */ MenuTexture D_02003BAC[2] = { - { 5, 0, gTexture7F78B4, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F78B4, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -3588,8 +3588,8 @@ MenuTexture D_02003BAC[2] = { * */ MenuTexture D_02003BD4[2] = { - { 5, 0, gTexture7F7934, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F7934, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -3597,8 +3597,8 @@ MenuTexture D_02003BD4[2] = { * */ MenuTexture D_02003BFC[2] = { - { 5, 0, gTexture7F79B4, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F79B4, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -3606,8 +3606,8 @@ MenuTexture D_02003BFC[2] = { * */ MenuTexture D_02003C24[2] = { - { 5, 0, gTexture7F7A34, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F7A34, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -3615,8 +3615,8 @@ MenuTexture D_02003C24[2] = { * */ MenuTexture D_02003C4C[2] = { - { 5, 0, gTexture7F7AB4, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F7AB4, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -3624,8 +3624,8 @@ MenuTexture D_02003C4C[2] = { * */ MenuTexture D_02003C74[2] = { - { 5, 0, gTexture7F7B34, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F7B34, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -3633,8 +3633,8 @@ MenuTexture D_02003C74[2] = { * */ MenuTexture D_02003C9C[2] = { - { 5, 0, gTexture7F7BB4, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F7BB4, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -3642,8 +3642,8 @@ MenuTexture D_02003C9C[2] = { * */ MenuTexture D_02003CC4[2] = { - { 5, 0, gTexture7F7C34, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F7C34, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -3651,8 +3651,8 @@ MenuTexture D_02003CC4[2] = { * */ MenuTexture D_02003CEC[2] = { - { 5, 0, gTexture7F7CB4, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F7CB4, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -3660,8 +3660,8 @@ MenuTexture D_02003CEC[2] = { * */ MenuTexture D_02003D14[2] = { - { 5, 0, gTexture7F7D34, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F7D34, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -3669,8 +3669,8 @@ MenuTexture D_02003D14[2] = { * */ MenuTexture D_02003D3C[2] = { - { 5, 0, gTexture7F7DB4, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F7DB4, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -3678,8 +3678,8 @@ MenuTexture D_02003D3C[2] = { * */ MenuTexture D_02003D64[2] = { - { 5, 0, gTexture7F7E34, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F7E34, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -3687,8 +3687,8 @@ MenuTexture D_02003D64[2] = { * */ MenuTexture D_02003D8C[2] = { - { 5, 0, gTexture7F7EB4, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F7EB4, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -3696,8 +3696,8 @@ MenuTexture D_02003D8C[2] = { * */ MenuTexture D_02003DB4[2] = { - { 5, 0, gTexture7F7F34, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F7F34, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -3705,8 +3705,8 @@ MenuTexture D_02003DB4[2] = { * */ MenuTexture D_02003DDC[2] = { - { 5, 0, gTexture7F7FB4, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F7FB4, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -3714,8 +3714,8 @@ MenuTexture D_02003DDC[2] = { * */ MenuTexture D_02003E04[2] = { - { 5, 0, gTexture7F8034, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F8034, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -3723,8 +3723,8 @@ MenuTexture D_02003E04[2] = { * */ MenuTexture D_02003E2C[2] = { - { 5, 0, gTexture7F80B4, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F80B4, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -3732,8 +3732,8 @@ MenuTexture D_02003E2C[2] = { * */ MenuTexture D_02003E54[2] = { - { 5, 0, gTexture7F8134, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F8134, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -3741,8 +3741,8 @@ MenuTexture D_02003E54[2] = { * */ MenuTexture D_02003E7C[2] = { - { 5, 0, gTexture7F81B4, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F81B4, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -3750,8 +3750,8 @@ MenuTexture D_02003E7C[2] = { * */ MenuTexture D_02003EA4[2] = { - { 5, 0, gTexture7F8234, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F8234, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -3759,8 +3759,8 @@ MenuTexture D_02003EA4[2] = { * */ MenuTexture D_02003ECC[2] = { - { 5, 0, gTexture7F82B4, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F82B4, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -3768,8 +3768,8 @@ MenuTexture D_02003ECC[2] = { * */ MenuTexture D_02003EF4[2] = { - { 5, 0, gTexture7F8334, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F8334, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -3777,8 +3777,8 @@ MenuTexture D_02003EF4[2] = { * */ MenuTexture D_02003F1C[2] = { - { 5, 0, gTexture7F83B4, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F83B4, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -3786,8 +3786,8 @@ MenuTexture D_02003F1C[2] = { * */ MenuTexture D_02003F44[2] = { - { 5, 0, gTexture7F8434, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F8434, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -3795,8 +3795,8 @@ MenuTexture D_02003F44[2] = { * */ MenuTexture D_02003F6C[2] = { - { 5, 0, gTexture7F84B4, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F84B4, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -3804,8 +3804,8 @@ MenuTexture D_02003F6C[2] = { * */ MenuTexture D_02003F94[2] = { - { 5, 0, gTexture7F8534, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F8534, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -3813,8 +3813,8 @@ MenuTexture D_02003F94[2] = { * */ MenuTexture D_02003FBC[2] = { - { 5, 0, gTexture7F73B4, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F73B4, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -3822,8 +3822,8 @@ MenuTexture D_02003FBC[2] = { * */ MenuTexture D_02003FE4[2] = { - { 5, 0, gTexture7F7434, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F7434, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -3831,8 +3831,8 @@ MenuTexture D_02003FE4[2] = { * */ MenuTexture D_0200400C[2] = { - { 5, 0, gTexture7F74B4, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F74B4, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -3840,8 +3840,8 @@ MenuTexture D_0200400C[2] = { * */ MenuTexture D_02004034[2] = { - { 5, 0, gTexture7F6934, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F6934, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -3849,8 +3849,8 @@ MenuTexture D_02004034[2] = { * */ MenuTexture D_0200405C[2] = { - { 5, 0, gTexture7F6034, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F6034, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -3858,8 +3858,8 @@ MenuTexture D_0200405C[2] = { * */ MenuTexture D_02004084[2] = { - { 5, 0, gTexture7F60B4, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F60B4, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -3867,8 +3867,8 @@ MenuTexture D_02004084[2] = { * */ MenuTexture D_020040AC[2] = { - { 5, 0, gTexture7F6134, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F6134, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -3876,8 +3876,8 @@ MenuTexture D_020040AC[2] = { * */ MenuTexture D_020040D4[2] = { - { 5, 0, gTexture7F61B4, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F61B4, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -3885,8 +3885,8 @@ MenuTexture D_020040D4[2] = { * */ MenuTexture D_020040FC[2] = { - { 5, 0, gTexture7F6234, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F6234, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -3894,8 +3894,8 @@ MenuTexture D_020040FC[2] = { * */ MenuTexture D_02004124[2] = { - { 5, 0, gTexture7F9BF4, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F9BF4, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -3903,8 +3903,8 @@ MenuTexture D_02004124[2] = { * */ MenuTexture D_0200414C[2] = { - { 5, 0, gTexture7F8734, 30, 32, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F8734, 30, 32, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -3912,8 +3912,8 @@ MenuTexture D_0200414C[2] = { * */ MenuTexture D_02004174[2] = { - { 5, 0, gTexture7F8914, 30, 32, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F8914, 30, 32, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -3921,8 +3921,8 @@ MenuTexture D_02004174[2] = { * */ MenuTexture D_0200419C[2] = { - { 5, 0, gTexture7F8AF4, 30, 32, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F8AF4, 30, 32, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -3930,8 +3930,8 @@ MenuTexture D_0200419C[2] = { * */ MenuTexture D_020041C4[2] = { - { 5, 0, gTexture7F8CD4, 30, 32, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F8CD4, 30, 32, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -3939,8 +3939,8 @@ MenuTexture D_020041C4[2] = { * */ MenuTexture D_020041EC[2] = { - { 5, 0, gTexture7F8EB4, 30, 32, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F8EB4, 30, 32, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -3948,8 +3948,8 @@ MenuTexture D_020041EC[2] = { * */ MenuTexture D_02004214[2] = { - { 5, 0, gTexture7F9094, 30, 32, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F9094, 30, 32, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -3957,8 +3957,8 @@ MenuTexture D_02004214[2] = { * */ MenuTexture D_0200423C[2] = { - { 5, 0, gTexture7F9274, 30, 32, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F9274, 30, 32, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -3966,8 +3966,8 @@ MenuTexture D_0200423C[2] = { * */ MenuTexture D_02004264[2] = { - { 5, 0, gTexture7F9454, 30, 32, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F9454, 30, 32, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -3975,8 +3975,8 @@ MenuTexture D_02004264[2] = { * */ MenuTexture D_0200428C[2] = { - { 5, 0, gTexture7F9634, 30, 32, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F9634, 30, 32, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -3984,8 +3984,8 @@ MenuTexture D_0200428C[2] = { * */ MenuTexture D_020042B4[2] = { - { 5, 0, gTexture7F9814, 30, 32, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F9814, 30, 32, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -3993,8 +3993,8 @@ MenuTexture D_020042B4[2] = { * */ MenuTexture D_020042DC[2] = { - { 5, 0, gTexture7F85B4, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F85B4, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -4002,8 +4002,8 @@ MenuTexture D_020042DC[2] = { * */ MenuTexture D_02004304[2] = { - { 5, 0, gTexture7F8634, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F8634, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -4011,8 +4011,8 @@ MenuTexture D_02004304[2] = { * */ MenuTexture D_0200432C[2] = { - { 5, 0, gTexture7F86B4, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F86B4, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -4020,8 +4020,8 @@ MenuTexture D_0200432C[2] = { * */ MenuTexture D_02004354[2] = { - { 5, 0, gTexture7F99F4, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F99F4, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -4029,8 +4029,8 @@ MenuTexture D_02004354[2] = { * */ MenuTexture D_0200437C[2] = { - { 5, 0, gTexture7F9A74, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F9A74, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -4038,8 +4038,8 @@ MenuTexture D_0200437C[2] = { * */ MenuTexture D_020043A4[2] = { - { 5, 0, gTexture7F9CF4, 26, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F9CF4, 26, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -4047,8 +4047,8 @@ MenuTexture D_020043A4[2] = { * */ MenuTexture D_020043CC[2] = { - { 5, 0, gTexture7F9DC4, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F9DC4, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -4056,8 +4056,8 @@ MenuTexture D_020043CC[2] = { * */ MenuTexture D_020043F4[2] = { - { 5, 0, gTexture7F9E44, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F9E44, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -4065,8 +4065,8 @@ MenuTexture D_020043F4[2] = { * */ MenuTexture D_0200441C[2] = { - { 5, 0, gTexture7F9EC4, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F9EC4, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -4074,8 +4074,8 @@ MenuTexture D_0200441C[2] = { * */ MenuTexture D_02004444[2] = { - { 5, 0, gTexture7FA044, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7FA044, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -4083,8 +4083,8 @@ MenuTexture D_02004444[2] = { * */ MenuTexture D_0200446C[2] = { - { 5, 0, gTexture7FA0C4, 26, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7FA0C4, 26, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -4092,8 +4092,8 @@ MenuTexture D_0200446C[2] = { * */ MenuTexture D_02004494[2] = { - { 5, 0, gTexture7FA194, 26, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7FA194, 26, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -4101,8 +4101,8 @@ MenuTexture D_02004494[2] = { * */ MenuTexture D_020044BC[2] = { - { 5, 0, gTexture7FA264, 26, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7FA264, 26, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -4110,8 +4110,8 @@ MenuTexture D_020044BC[2] = { * */ MenuTexture D_020044E4[2] = { - { 5, 0, gTexture7F9AF4, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F9AF4, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -4119,8 +4119,8 @@ MenuTexture D_020044E4[2] = { * */ MenuTexture D_0200450C[2] = { - { 5, 0, gTexture7F9B74, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F9B74, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -4128,8 +4128,8 @@ MenuTexture D_0200450C[2] = { * */ MenuTexture D_02004534[2] = { - { 5, 0, gTexture7FA334, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7FA334, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -4137,8 +4137,8 @@ MenuTexture D_02004534[2] = { * */ MenuTexture D_0200455C[2] = { - { 5, 0, gTexture7F9C74, 16, 16, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 5, gTexture7F9C74, 16, 16, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -4146,25 +4146,25 @@ MenuTexture D_0200455C[2] = { * */ MenuTexture D_02004584[1] = { - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** * @brief MenuTexture for the blue sky background * */ -MenuTexture D_02004598[2] = { - { 0, 0, gTextureBackgroundBlueSky, 320, 240, 0, 0, 0xcd60, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, +MenuTexture seg2_blue_sky_background_texture[2] = { + { 0, gTextureBackgroundBlueSky, 320, 240, 0, 0, 0xcd60}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** * @brief MenuTexture for the sunset background * */ -MenuTexture D_020045C0[2] = { - { 0, 0, gTextureBackgroundSunset, 320, 240, 0, 0, 0x93c4, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, +MenuTexture seg2_sunset_background_texture[2] = { + { 0, gTextureBackgroundSunset, 320, 240, 0, 0, 0x93c4}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -4172,8 +4172,8 @@ MenuTexture D_020045C0[2] = { * */ MenuTexture seg2_copyright_1996_texture[2] = { - { 1, 0, gTextureCopyright1996, 124, 17, 98, 199, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 1, gTextureCopyright1996, 124, 17, 98, 199, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -4181,8 +4181,8 @@ MenuTexture seg2_copyright_1996_texture[2] = { * */ MenuTexture seg2_push_start_button_texture[2] = { - { 1, 0, gTexturePushStartButton, 159, 16, 81, 179, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 1, gTexturePushStartButton, 159, 16, 81, 179, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -4190,8 +4190,8 @@ MenuTexture seg2_push_start_button_texture[2] = { * */ MenuTexture D_02004638[2] = { - { 0, 0, gTextureOption, 130, 32, 95, 16, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureOption, 130, 32, 95, 16, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -4199,8 +4199,8 @@ MenuTexture D_02004638[2] = { * */ MenuTexture seg2_game_select_texture[2] = { - { 0, 0, gTextureGameSelect, 200, 32, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureGameSelect, 200, 32, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -4208,10 +4208,10 @@ MenuTexture seg2_game_select_texture[2] = { * */ MenuTexture seg2_menu_1p_column[4] = { - { 1, 0, gTextureMenu1PGame, 64, 54, 0, 0, 0x0, 0 }, - { 1, 0, gTextureMenuModeMarioGP, 64, 18, 0, 65, 0x0, 0 }, - { 1, 0, gTextureMenuModeTimeTrials, 64, 18, 0, 83, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 1, gTextureMenu1PGame, 64, 54, 0, 0, 0x0}, + { 1, gTextureMenuModeMarioGP, 64, 18, 0, 65, 0x0}, + { 1, gTextureMenuModeTimeTrials, 64, 18, 0, 83, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -4219,11 +4219,11 @@ MenuTexture seg2_menu_1p_column[4] = { * */ MenuTexture seg2_menu_2p_column[5] = { - { 1, 0, gTextureMenu2PGame, 64, 54, 0, 0, 0x0, 0 }, - { 1, 0, gTextureMenuModeMarioGP, 64, 18, 0, 65, 0x0, 0 }, - { 1, 0, gTextureMenuModeVS, 64, 18, 0, 83, 0x0, 0 }, - { 1, 0, gTextureMenuModeBattle, 64, 18, 0, 101, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 1, gTextureMenu2PGame, 64, 54, 0, 0, 0x0}, + { 1, gTextureMenuModeMarioGP, 64, 18, 0, 65, 0x0}, + { 1, gTextureMenuModeVS, 64, 18, 0, 83, 0x0}, + { 1, gTextureMenuModeBattle, 64, 18, 0, 101, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -4231,10 +4231,10 @@ MenuTexture seg2_menu_2p_column[5] = { * */ MenuTexture seg2_menu_3p_column[4] = { - { 1, 0, gTextureMenu3PGame, 64, 54, 0, 0, 0x0, 0 }, - { 1, 0, gTextureMenuModeVS, 64, 18, 0, 65, 0x0, 0 }, - { 1, 0, gTextureMenuModeBattle, 64, 18, 0, 83, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 1, gTextureMenu3PGame, 64, 54, 0, 0, 0x0}, + { 1, gTextureMenuModeVS, 64, 18, 0, 65, 0x0}, + { 1, gTextureMenuModeBattle, 64, 18, 0, 83, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -4242,10 +4242,10 @@ MenuTexture seg2_menu_3p_column[4] = { * */ MenuTexture seg2_menu_4p_column[4] = { - { 1, 0, gTextureMenu4PGame, 64, 54, 0, 0, 0x0, 0 }, - { 1, 0, gTextureMenuModeVS, 64, 18, 0, 65, 0x0, 0 }, - { 1, 0, gTextureMenuModeBattle, 64, 18, 0, 83, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 1, gTextureMenu4PGame, 64, 54, 0, 0, 0x0}, + { 1, gTextureMenuModeVS, 64, 18, 0, 65, 0x0}, + { 1, gTextureMenuModeBattle, 64, 18, 0, 83, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -4253,8 +4253,8 @@ MenuTexture seg2_menu_4p_column[4] = { * */ MenuTexture D_020047DC[2] = { - { 1, 0, gTextureSmallGreenTriangle, 12, 7, 27, 56, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 1, gTextureSmallGreenTriangle, 12, 7, 27, 56, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -4262,8 +4262,8 @@ MenuTexture D_020047DC[2] = { * */ MenuTexture D_02004804[2] = { - { 1, 0, gTextureSmallGreenTriangle, 12, 7, 27, 56, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 1, gTextureSmallGreenTriangle, 12, 7, 27, 56, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -4271,8 +4271,8 @@ MenuTexture D_02004804[2] = { * */ MenuTexture D_0200482C[2] = { - { 1, 0, gTextureSmallGreenTriangle, 12, 7, 27, 56, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 1, gTextureSmallGreenTriangle, 12, 7, 27, 56, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -4280,8 +4280,8 @@ MenuTexture D_0200482C[2] = { * */ MenuTexture D_02004854[2] = { - { 1, 0, gTextureSmallGreenTriangle, 12, 7, 27, 56, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 1, gTextureSmallGreenTriangle, 12, 7, 27, 56, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -4289,8 +4289,8 @@ MenuTexture D_02004854[2] = { * */ MenuTexture D_0200487C[2] = { - { 1, 0, gTextureMenuOK, 31, 19, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 1, gTextureMenuOK, 31, 19, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -4298,8 +4298,8 @@ MenuTexture D_0200487C[2] = { * */ MenuTexture D_020048A4[2] = { - { 1, 0, gTextureMenuLOption, 58, 19, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 1, gTextureMenuLOption, 58, 19, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -4307,8 +4307,8 @@ MenuTexture D_020048A4[2] = { * */ MenuTexture D_020048CC[2] = { - { 1, 0, gTextureMenuRData, 58, 19, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 1, gTextureMenuRData, 58, 19, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -4316,8 +4316,8 @@ MenuTexture D_020048CC[2] = { * */ MenuTexture seg2_50_CC_texture[2] = { - { 1, 0, gTextureMenu50cc, 64, 18, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 1, gTextureMenu50cc, 64, 18, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -4325,8 +4325,8 @@ MenuTexture seg2_50_CC_texture[2] = { * */ MenuTexture seg2_100_CC_texture[2] = { - { 1, 0, gTextureMenu100cc, 64, 18, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 1, gTextureMenu100cc, 64, 18, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -4334,8 +4334,8 @@ MenuTexture seg2_100_CC_texture[2] = { * */ MenuTexture seg2_150_CC_texture[2] = { - { 1, 0, gTextureMenu150cc, 64, 18, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 1, gTextureMenu150cc, 64, 18, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -4343,165 +4343,165 @@ MenuTexture seg2_150_CC_texture[2] = { * */ MenuTexture seg2_extra_CC_texture[2] = { - { 1, 0, gTextureMenuExtra, 64, 18, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 1, gTextureMenuExtra, 64, 18, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Menu Without Item + * @brief MenuTextures for Menu Without Item * */ MenuTexture seg2_menu_no_item_texture[2] = { - { 1, 0, gTextureMenuWithoutItem, 64, 18, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 1, gTextureMenuWithoutItem, 64, 18, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Menu With Item + * @brief MenuTextures for Menu With Item * */ MenuTexture D_020049BC[2] = { - { 1, 0, gTextureMenuWithItem, 64, 18, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 1, gTextureMenuWithItem, 64, 18, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Menu Begin + * @brief MenuTextures for Menu Begin * */ MenuTexture D_020049E4[2] = { - { 1, 0, gTextureMenuBegin, 64, 18, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 1, gTextureMenuBegin, 64, 18, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Menu Ghost + * @brief MenuTextures for Menu Ghost * */ MenuTexture D_02004A0C[2] = { - { 1, 0, gTextureMenuGhost, 64, 18, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 1, gTextureMenuGhost, 64, 18, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Menu Data + * @brief MenuTextures for Menu Data * */ MenuTexture seg2_data_texture[2] = { - { 1, 0, gTextureMenuData, 64, 18, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 1, gTextureMenuData, 64, 18, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures P1 Border ? + * @brief MenuTextures P1 Border ? * */ MenuTexture seg2_P1_border_texture[3] = { - { 3, 0, gTexture7E56E4, 64, 64, 0, 0, 0x116c, 0 }, - { 4, 0, gTextureP1BorderBlue, 64, 64, 0, 0, 0x0000, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTexture7E56E4, 64, 64, 0, 0, 0x116c}, + { 4, gTextureP1BorderBlue, 64, 64, 0, 0, 0x0000}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures P2 Border ? + * @brief MenuTextures P2 Border ? * */ MenuTexture seg2_P2_border_texture[3] = { - { 3, 0, gTexture7E56E4, 64, 64, 0, 0, 0x116c, 0 }, - { 4, 0, gTextureP2BorderRed, 64, 64, 0, 0, 0x0000, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTexture7E56E4, 64, 64, 0, 0, 0x116c}, + { 4, gTextureP2BorderRed, 64, 64, 0, 0, 0x0000}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures P3 Border ? + * @brief MenuTextures P3 Border ? * */ MenuTexture seg2_P3_border_texture[3] = { - { 3, 0, gTexture7E56E4, 64, 64, 0, 0, 0x116c, 0 }, - { 4, 0, gTextureP3BorderOrange, 64, 64, 0, 0, 0x0000, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTexture7E56E4, 64, 64, 0, 0, 0x116c}, + { 4, gTextureP3BorderOrange, 64, 64, 0, 0, 0x0000}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures P4 Border ? + * @brief MenuTextures P4 Border ? * */ MenuTexture seg2_P4_border_texture[3] = { - { 3, 0, gTexture7E56E4, 64, 64, 0, 0, 0x116c, 0 }, - { 4, 0, gTextureP4BorderGreen, 64, 64, 0, 0, 0x0000, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 3, gTexture7E56E4, 64, 64, 0, 0, 0x116c}, + { 4, gTextureP4BorderGreen, 64, 64, 0, 0, 0x0000}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Menu Player Select + * @brief MenuTextures for Menu Player Select * */ MenuTexture D_02004B4C[2] = { - { 0, 0, gTexturePlayerSelect, 220, 32, 51, 16, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTexturePlayerSelect, 220, 32, 51, 16, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Menu OK + * @brief MenuTextures for Menu OK * */ MenuTexture D_02004B74[2] = { - { 1, 0, gTextureMenuOK, 31, 19, 264, 202, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 1, gTextureMenuOK, 31, 19, 264, 202, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Menu Select + * @brief MenuTextures for Menu Select * */ MenuTexture seg2_menu_select_texture[2] = { - { 0, 0, gTextureMapSelect, 190, 32, 65, 18, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureMapSelect, 190, 32, 65, 18, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Menu Mushroom Cup + * @brief MenuTextures for Menu Mushroom Cup * */ MenuTexture seg2_mushroom_cup_texture[2] = { - { 1, 0, gTextureMenuMushroomCup, 65, 40, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 1, gTextureMenuMushroomCup, 65, 40, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Menu Flower Cup + * @brief MenuTextures for Menu Flower Cup * */ MenuTexture seg2_flower_cup_texture[2] = { - { 1, 0, gTextureMenuFlowerCup, 65, 40, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 1, gTextureMenuFlowerCup, 65, 40, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Menu Star Cup + * @brief MenuTextures for Menu Star Cup * */ MenuTexture seg2_star_cup_texture[2] = { - { 1, 0, gTextureMenuStarCup, 65, 40, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 1, gTextureMenuStarCup, 65, 40, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Menu Special Cup + * @brief MenuTextures for Menu Special Cup * */ MenuTexture seg2_special_cup_texture[2] = { - { 1, 0, gTextureMenuSpecialCup, 65, 40, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 1, gTextureMenuSpecialCup, 65, 40, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for the course preview mario raceway + * @brief MenuTextures for the course preview mario raceway * */ MenuTexture seg2_mario_raceway_preview_small_texture[2] = { - { 0, 0, gTextureCoursePreviewMarioRaceway, 128, 78, 23, 112, 0x1e3d, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureCoursePreviewMarioRaceway, 128, 78, 23, 112, 0x1e3d}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -4509,11 +4509,11 @@ MenuTexture seg2_mario_raceway_preview_small_texture[2] = { * */ MenuTexture seg2_mushroom_cup_title_texture[5] = { - { 1, 0, gTextureTitleLuigiRaceway, 140, 18, 157, 112, 0x0, 0 }, - { 1, 0, gTextureTitleMooMooFarm, 140, 18, 157, 136, 0x0, 0 }, - { 1, 0, gTextureTitleKoopaTroopaBeach, 140, 18, 157, 160, 0x0, 0 }, - { 1, 0, gTextureTitleKalimariDesert, 140, 18, 157, 184, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 1, gTextureTitleLuigiRaceway, 140, 18, 157, 112, 0x0}, + { 1, gTextureTitleMooMooFarm, 140, 18, 157, 136, 0x0}, + { 1, gTextureTitleKoopaTroopaBeach, 140, 18, 157, 160, 0x0}, + { 1, gTextureTitleKalimariDesert, 140, 18, 157, 184, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -4521,11 +4521,11 @@ MenuTexture seg2_mushroom_cup_title_texture[5] = { * */ MenuTexture seg2_flower_cup_title_texture[5] = { - { 1, 0, gTextureTitleToadsTurnpike, 140, 18, 157, 112, 0x0, 0 }, - { 1, 0, gTextureTitleFrappeSnowland, 140, 18, 157, 136, 0x0, 0 }, - { 1, 0, gTextureTitleChocoMountain, 140, 18, 157, 160, 0x0, 0 }, - { 1, 0, gTextureTitleMarioRaceway, 140, 18, 157, 184, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 1, gTextureTitleToadsTurnpike, 140, 18, 157, 112, 0x0}, + { 1, gTextureTitleFrappeSnowland, 140, 18, 157, 136, 0x0}, + { 1, gTextureTitleChocoMountain, 140, 18, 157, 160, 0x0}, + { 1, gTextureTitleMarioRaceway, 140, 18, 157, 184, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -4533,11 +4533,11 @@ MenuTexture seg2_flower_cup_title_texture[5] = { * */ MenuTexture seg2_star_cup_title_texture[5] = { - { 1, 0, gTextureTitleWarioStadium, 140, 18, 157, 112, 0x0, 0 }, - { 1, 0, gTextureTitleSherbetLand, 140, 18, 157, 136, 0x0, 0 }, - { 1, 0, gTextureTitleRoyalRaceway, 140, 18, 157, 160, 0x0, 0 }, - { 1, 0, gTextureTitleBowsersCastle, 140, 18, 157, 184, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 1, gTextureTitleWarioStadium, 140, 18, 157, 112, 0x0}, + { 1, gTextureTitleSherbetLand, 140, 18, 157, 136, 0x0}, + { 1, gTextureTitleRoyalRaceway, 140, 18, 157, 160, 0x0}, + { 1, gTextureTitleBowsersCastle, 140, 18, 157, 184, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** @@ -4545,1437 +4545,1437 @@ MenuTexture seg2_star_cup_title_texture[5] = { * */ MenuTexture seg2_special_cup_title_texture[5] = { - { 1, 0, gTextureTitleDKsJungleParkway, 140, 18, 157, 112, 0x0, 0 }, - { 1, 0, gTextureTitleYoshiValley, 140, 18, 157, 136, 0x0, 0 }, - { 1, 0, gTextureTitleBansheeBoardwalk, 140, 18, 157, 160, 0x0, 0 }, - { 1, 0, gTextureTitleRainbowRoad, 140, 18, 157, 184, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 1, gTextureTitleDKsJungleParkway, 140, 18, 157, 112, 0x0}, + { 1, gTextureTitleYoshiValley, 140, 18, 157, 136, 0x0}, + { 1, gTextureTitleBansheeBoardwalk, 140, 18, 157, 160, 0x0}, + { 1, gTextureTitleRainbowRoad, 140, 18, 157, 184, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures title for battle mode + * @brief MenuTextures title for battle mode * */ MenuTexture seg2_battle_title_texture[5] = { - { 1, 0, gTextureTitleBigDonut, 140, 18, 157, 112, 0x0, 0 }, - { 1, 0, gTextureTitleBlockFort, 140, 18, 157, 136, 0x0, 0 }, - { 1, 0, gTextureTitleDoubleDeck, 140, 18, 157, 160, 0x0, 0 }, - { 1, 0, gTextureTitleSkyscraper, 140, 18, 157, 184, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 1, gTextureTitleBigDonut, 140, 18, 157, 112, 0x0}, + { 1, gTextureTitleBlockFort, 140, 18, 157, 136, 0x0}, + { 1, gTextureTitleDoubleDeck, 140, 18, 157, 160, 0x0}, + { 1, gTextureTitleSkyscraper, 140, 18, 157, 184, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures Menu OK + * @brief MenuTextures Menu OK * */ MenuTexture D_02004E80[2] = { - { 1, 0, gTextureMenuOK, 31, 19, 265, 208, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 1, gTextureMenuOK, 31, 19, 265, 208, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures title Mario Raceway + * @brief MenuTextures title Mario Raceway * */ MenuTexture seg2_mario_raceway_title_texture[2] = { - { 1, 0, gTextureTitleMarioRaceway, 140, 18, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 1, gTextureTitleMarioRaceway, 140, 18, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures title Choco Mountain + * @brief MenuTextures title Choco Mountain * */ MenuTexture seg2_choco_mountain_title_texture[2] = { - { 1, 0, gTextureTitleChocoMountain, 140, 18, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 1, gTextureTitleChocoMountain, 140, 18, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures title Bowser's Castle + * @brief MenuTextures title Bowser's Castle * */ MenuTexture D_02004EF8[2] = { - { 1, 0, gTextureTitleBowsersCastle, 140, 18, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 1, gTextureTitleBowsersCastle, 140, 18, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures title Banshee Boardwalk + * @brief MenuTextures title Banshee Boardwalk * */ MenuTexture D_02004F20[2] = { - { 1, 0, gTextureTitleBansheeBoardwalk, 140, 18, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 1, gTextureTitleBansheeBoardwalk, 140, 18, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures title Yoshi Valley + * @brief MenuTextures title Yoshi Valley * */ MenuTexture D_02004F48[2] = { - { 1, 0, gTextureTitleYoshiValley, 140, 18, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 1, gTextureTitleYoshiValley, 140, 18, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures title Frappe Snowland + * @brief MenuTextures title Frappe Snowland * */ MenuTexture D_02004F70[2] = { - { 1, 0, gTextureTitleFrappeSnowland, 140, 18, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 1, gTextureTitleFrappeSnowland, 140, 18, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures title Koopa Troopa Beach + * @brief MenuTextures title Koopa Troopa Beach * */ MenuTexture D_02004F98[2] = { - { 1, 0, gTextureTitleKoopaTroopaBeach, 140, 18, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 1, gTextureTitleKoopaTroopaBeach, 140, 18, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures title Royal Raceway + * @brief MenuTextures title Royal Raceway * */ MenuTexture D_02004FC0[2] = { - { 1, 0, gTextureTitleRoyalRaceway, 140, 18, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 1, gTextureTitleRoyalRaceway, 140, 18, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures title Luigi Raceway + * @brief MenuTextures title Luigi Raceway * */ MenuTexture D_02004FE8[2] = { - { 1, 0, gTextureTitleLuigiRaceway, 140, 18, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 1, gTextureTitleLuigiRaceway, 140, 18, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures title Moo Moo Farm + * @brief MenuTextures title Moo Moo Farm * */ MenuTexture D_02005010[2] = { - { 1, 0, gTextureTitleMooMooFarm, 140, 18, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 1, gTextureTitleMooMooFarm, 140, 18, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures title Toad's Turnpike + * @brief MenuTextures title Toad's Turnpike * */ MenuTexture D_02005038[2] = { - { 1, 0, gTextureTitleToadsTurnpike, 140, 18, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 1, gTextureTitleToadsTurnpike, 140, 18, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures title Kalimari Desert + * @brief MenuTextures title Kalimari Desert * */ MenuTexture D_02005060[2] = { - { 1, 0, gTextureTitleKalimariDesert, 140, 18, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 1, gTextureTitleKalimariDesert, 140, 18, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures title Sherbet Land + * @brief MenuTextures title Sherbet Land * */ MenuTexture D_02005088[2] = { - { 1, 0, gTextureTitleSherbetLand, 140, 18, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 1, gTextureTitleSherbetLand, 140, 18, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures title Rainbow Road + * @brief MenuTextures title Rainbow Road * */ MenuTexture D_020050B0[2] = { - { 1, 0, gTextureTitleRainbowRoad, 140, 18, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 1, gTextureTitleRainbowRoad, 140, 18, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures title Wario Stadium + * @brief MenuTextures title Wario Stadium * */ MenuTexture D_020050D8[2] = { - { 1, 0, gTextureTitleWarioStadium, 140, 18, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 1, gTextureTitleWarioStadium, 140, 18, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures title Block Fort + * @brief MenuTextures title Block Fort * */ MenuTexture D_02005100[2] = { - { 1, 0, gTextureTitleBlockFort, 140, 18, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 1, gTextureTitleBlockFort, 140, 18, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures title Skyscraper + * @brief MenuTextures title Skyscraper * */ MenuTexture D_02005128[2] = { - { 1, 0, gTextureTitleSkyscraper, 140, 18, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 1, gTextureTitleSkyscraper, 140, 18, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures title Double Deck + * @brief MenuTextures title Double Deck * */ MenuTexture D_02005150[2] = { - { 1, 0, gTextureTitleDoubleDeck, 140, 18, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 1, gTextureTitleDoubleDeck, 140, 18, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures title DK's Jungle Parkway + * @brief MenuTextures title DK's Jungle Parkway * */ MenuTexture D_02005178[2] = { - { 1, 0, gTextureTitleDKsJungleParkway, 140, 18, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 1, gTextureTitleDKsJungleParkway, 140, 18, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures title Big Donut + * @brief MenuTextures title Big Donut * */ MenuTexture D_020051A0[2] = { - { 1, 0, gTextureTitleBigDonut, 140, 18, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 1, gTextureTitleBigDonut, 140, 18, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Mario Face 00 + * @brief MenuTextures for Mario Face 00 * */ MenuTexture D_020051C8[2] = { - { 0, 0, gTextureMarioFace00, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureMarioFace00, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Mario Face 01 + * @brief MenuTextures for Mario Face 01 * */ MenuTexture D_020051F0[2] = { - { 0, 0, gTextureMarioFace01, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureMarioFace01, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Mario Face 02 + * @brief MenuTextures for Mario Face 02 * */ MenuTexture D_02005218[2] = { - { 0, 0, gTextureMarioFace02, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureMarioFace02, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Mario Face 03 + * @brief MenuTextures for Mario Face 03 * */ MenuTexture D_02005240[2] = { - { 0, 0, gTextureMarioFace03, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureMarioFace03, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Mario Face 04 + * @brief MenuTextures for Mario Face 04 * */ MenuTexture D_02005268[2] = { - { 0, 0, gTextureMarioFace04, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureMarioFace04, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Mario Face 05 + * @brief MenuTextures for Mario Face 05 * */ MenuTexture D_02005290[2] = { - { 0, 0, gTextureMarioFace05, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureMarioFace05, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Mario Face 06 + * @brief MenuTextures for Mario Face 06 * */ MenuTexture D_020052B8[2] = { - { 0, 0, gTextureMarioFace06, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureMarioFace06, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Mario Face 07 + * @brief MenuTextures for Mario Face 07 * */ MenuTexture D_020052E0[2] = { - { 0, 0, gTextureMarioFace07, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureMarioFace07, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Mario Face 08 + * @brief MenuTextures for Mario Face 08 * */ MenuTexture D_02005308[2] = { - { 0, 0, gTextureMarioFace08, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureMarioFace08, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Mario Face 09 + * @brief MenuTextures for Mario Face 09 * */ MenuTexture D_02005330[2] = { - { 0, 0, gTextureMarioFace09, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureMarioFace09, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Mario Face 10 + * @brief MenuTextures for Mario Face 10 * */ MenuTexture D_02005358[2] = { - { 0, 0, gTextureMarioFace10, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureMarioFace10, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Mario Face 11 + * @brief MenuTextures for Mario Face 11 * */ MenuTexture D_02005380[2] = { - { 0, 0, gTextureMarioFace11, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureMarioFace11, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Mario Face 12 + * @brief MenuTextures for Mario Face 12 * */ MenuTexture D_020053A8[2] = { - { 0, 0, gTextureMarioFace12, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureMarioFace12, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Mario Face 13 + * @brief MenuTextures for Mario Face 13 * */ MenuTexture D_020053D0[2] = { - { 0, 0, gTextureMarioFace13, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureMarioFace13, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Mario Face 14 + * @brief MenuTextures for Mario Face 14 * */ MenuTexture D_020053F8[2] = { - { 0, 0, gTextureMarioFace14, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureMarioFace14, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Mario Face 15 + * @brief MenuTextures for Mario Face 15 * */ MenuTexture D_02005420[2] = { - { 0, 0, gTextureMarioFace15, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureMarioFace15, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Mario Face 16 + * @brief MenuTextures for Mario Face 16 * */ MenuTexture D_02005448[2] = { - { 0, 0, gTextureMarioFace16, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureMarioFace16, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Luigi Face 00 + * @brief MenuTextures for Luigi Face 00 * */ MenuTexture D_02005470[2] = { - { 0, 0, gTextureLuigiFace00, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureLuigiFace00, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Luigi Face 01 + * @brief MenuTextures for Luigi Face 01 * */ MenuTexture D_02005498[2] = { - { 0, 0, gTextureLuigiFace01, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureLuigiFace01, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Luigi Face 02 + * @brief MenuTextures for Luigi Face 02 * */ MenuTexture D_020054C0[2] = { - { 0, 0, gTextureLuigiFace02, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureLuigiFace02, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Luigi Face 03 + * @brief MenuTextures for Luigi Face 03 * */ MenuTexture D_020054E8[2] = { - { 0, 0, gTextureLuigiFace03, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureLuigiFace03, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Luigi Face 04 + * @brief MenuTextures for Luigi Face 04 * */ MenuTexture D_02005510[2] = { - { 0, 0, gTextureLuigiFace04, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureLuigiFace04, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Luigi Face 05 + * @brief MenuTextures for Luigi Face 05 * */ MenuTexture D_02005538[2] = { - { 0, 0, gTextureLuigiFace05, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureLuigiFace05, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Luigi Face 06 + * @brief MenuTextures for Luigi Face 06 * */ MenuTexture D_02005560[2] = { - { 0, 0, gTextureLuigiFace06, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureLuigiFace06, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Luigi Face 07 + * @brief MenuTextures for Luigi Face 07 * */ MenuTexture D_02005588[2] = { - { 0, 0, gTextureLuigiFace07, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureLuigiFace07, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Luigi Face 08 + * @brief MenuTextures for Luigi Face 08 * */ MenuTexture D_020055B0[2] = { - { 0, 0, gTextureLuigiFace08, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureLuigiFace08, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Luigi Face 09 + * @brief MenuTextures for Luigi Face 09 * */ MenuTexture D_020055D8[2] = { - { 0, 0, gTextureLuigiFace09, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureLuigiFace09, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Luigi Face 10 + * @brief MenuTextures for Luigi Face 10 * */ MenuTexture D_02005600[2] = { - { 0, 0, gTextureLuigiFace10, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureLuigiFace10, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Luigi Face 11 + * @brief MenuTextures for Luigi Face 11 * */ MenuTexture D_02005628[2] = { - { 0, 0, gTextureLuigiFace11, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureLuigiFace11, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Luigi Face 12 + * @brief MenuTextures for Luigi Face 12 * */ MenuTexture D_02005650[2] = { - { 0, 0, gTextureLuigiFace12, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureLuigiFace12, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Luigi Face 13 + * @brief MenuTextures for Luigi Face 13 * */ MenuTexture D_02005678[2] = { - { 0, 0, gTextureLuigiFace13, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureLuigiFace13, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Luigi Face 14 + * @brief MenuTextures for Luigi Face 14 * */ MenuTexture D_020056A0[2] = { - { 0, 0, gTextureLuigiFace14, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureLuigiFace14, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Luigi Face 15 + * @brief MenuTextures for Luigi Face 15 * */ MenuTexture D_020056C8[2] = { - { 0, 0, gTextureLuigiFace15, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureLuigiFace15, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Luigi Face 16 + * @brief MenuTextures for Luigi Face 16 * */ MenuTexture D_020056F0[2] = { - { 0, 0, gTextureLuigiFace16, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureLuigiFace16, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Toad Face 00 + * @brief MenuTextures for Toad Face 00 * */ MenuTexture D_02005718[2] = { - { 0, 0, gTextureToadFace00, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureToadFace00, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Toad Face 01 + * @brief MenuTextures for Toad Face 01 * */ MenuTexture D_02005740[2] = { - { 0, 0, gTextureToadFace01, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureToadFace01, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Toad Face 02 + * @brief MenuTextures for Toad Face 02 * */ MenuTexture D_02005768[2] = { - { 0, 0, gTextureToadFace02, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureToadFace02, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Toad Face 03 + * @brief MenuTextures for Toad Face 03 * */ MenuTexture D_02005790[2] = { - { 0, 0, gTextureToadFace03, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureToadFace03, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Toad Face 04 + * @brief MenuTextures for Toad Face 04 * */ MenuTexture D_020057B8[2] = { - { 0, 0, gTextureToadFace04, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureToadFace04, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Toad Face 05 + * @brief MenuTextures for Toad Face 05 * */ MenuTexture D_020057E0[2] = { - { 0, 0, gTextureToadFace05, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureToadFace05, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Toad Face 06 + * @brief MenuTextures for Toad Face 06 * */ MenuTexture D_02005808[2] = { - { 0, 0, gTextureToadFace06, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureToadFace06, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Toad Face 07 + * @brief MenuTextures for Toad Face 07 * */ MenuTexture D_02005830[2] = { - { 0, 0, gTextureToadFace07, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureToadFace07, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Toad Face 08 + * @brief MenuTextures for Toad Face 08 * */ MenuTexture D_02005858[2] = { - { 0, 0, gTextureToadFace08, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureToadFace08, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Toad Face 09 + * @brief MenuTextures for Toad Face 09 * */ MenuTexture D_02005880[2] = { - { 0, 0, gTextureToadFace09, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureToadFace09, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Toad Face 10 + * @brief MenuTextures for Toad Face 10 * */ MenuTexture D_020058A8[2] = { - { 0, 0, gTextureToadFace10, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureToadFace10, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Toad Face 11 + * @brief MenuTextures for Toad Face 11 * */ MenuTexture D_020058D0[2] = { - { 0, 0, gTextureToadFace11, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureToadFace11, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Toad Face 12 + * @brief MenuTextures for Toad Face 12 * */ MenuTexture D_020058F8[2] = { - { 0, 0, gTextureToadFace12, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureToadFace12, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Toad Face 13 + * @brief MenuTextures for Toad Face 13 * */ MenuTexture D_02005920[2] = { - { 0, 0, gTextureToadFace13, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureToadFace13, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Toad Face 14 + * @brief MenuTextures for Toad Face 14 * */ MenuTexture D_02005948[2] = { - { 0, 0, gTextureToadFace14, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureToadFace14, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Toad Face 15 + * @brief MenuTextures for Toad Face 15 * */ MenuTexture D_02005970[2] = { - { 0, 0, gTextureToadFace15, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureToadFace15, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Toad Face 16 + * @brief MenuTextures for Toad Face 16 * */ MenuTexture D_02005998[2] = { - { 0, 0, gTextureToadFace16, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureToadFace16, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Peach Face 00 + * @brief MenuTextures for Peach Face 00 * */ MenuTexture D_020059C0[2] = { - { 0, 0, gTexturePeachFace00, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTexturePeachFace00, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Peach Face 01 + * @brief MenuTextures for Peach Face 01 * */ MenuTexture D_020059E8[2] = { - { 0, 0, gTexturePeachFace01, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTexturePeachFace01, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Peach Face 02 + * @brief MenuTextures for Peach Face 02 * */ MenuTexture D_02005A10[2] = { - { 0, 0, gTexturePeachFace02, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTexturePeachFace02, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Peach Face 03 + * @brief MenuTextures for Peach Face 03 * */ MenuTexture D_02005A38[2] = { - { 0, 0, gTexturePeachFace03, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTexturePeachFace03, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Peach Face 04 + * @brief MenuTextures for Peach Face 04 * */ MenuTexture D_02005A60[2] = { - { 0, 0, gTexturePeachFace04, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTexturePeachFace04, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Peach Face 05 + * @brief MenuTextures for Peach Face 05 * */ MenuTexture D_02005A88[2] = { - { 0, 0, gTexturePeachFace05, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTexturePeachFace05, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Peach Face 06 + * @brief MenuTextures for Peach Face 06 * */ MenuTexture D_02005AB0[2] = { - { 0, 0, gTexturePeachFace06, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTexturePeachFace06, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Peach Face 07 + * @brief MenuTextures for Peach Face 07 * */ MenuTexture D_02005AD8[2] = { - { 0, 0, gTexturePeachFace07, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTexturePeachFace07, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Peach Face 08 + * @brief MenuTextures for Peach Face 08 * */ MenuTexture D_02005B00[2] = { - { 0, 0, gTexturePeachFace08, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTexturePeachFace08, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Peach Face 09 + * @brief MenuTextures for Peach Face 09 * */ MenuTexture D_02005B28[2] = { - { 0, 0, gTexturePeachFace09, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTexturePeachFace09, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Peach Face 10 + * @brief MenuTextures for Peach Face 10 * */ MenuTexture D_02005B50[2] = { - { 0, 0, gTexturePeachFace10, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTexturePeachFace10, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Peach Face 11 + * @brief MenuTextures for Peach Face 11 * */ MenuTexture D_02005B78[2] = { - { 0, 0, gTexturePeachFace11, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTexturePeachFace11, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Peach Face 12 + * @brief MenuTextures for Peach Face 12 * */ MenuTexture D_02005BA0[2] = { - { 0, 0, gTexturePeachFace12, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTexturePeachFace12, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Peach Face 13 + * @brief MenuTextures for Peach Face 13 * */ MenuTexture D_02005BC8[2] = { - { 0, 0, gTexturePeachFace13, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTexturePeachFace13, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Peach Face 14 + * @brief MenuTextures for Peach Face 14 * */ MenuTexture D_02005BF0[2] = { - { 0, 0, gTexturePeachFace14, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTexturePeachFace14, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Peach Face 15 + * @brief MenuTextures for Peach Face 15 * */ MenuTexture D_02005C18[2] = { - { 0, 0, gTexturePeachFace15, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTexturePeachFace15, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Peach Face 16 + * @brief MenuTextures for Peach Face 16 * */ MenuTexture D_02005C40[2] = { - { 0, 0, gTexturePeachFace16, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTexturePeachFace16, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Yoshi Face 00 + * @brief MenuTextures for Yoshi Face 00 * */ MenuTexture D_02005C68[2] = { - { 0, 0, gTextureYoshiFace00, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureYoshiFace00, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Yoshi Face 01 + * @brief MenuTextures for Yoshi Face 01 * */ MenuTexture D_02005C90[2] = { - { 0, 0, gTextureYoshiFace01, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureYoshiFace01, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Yoshi Face 02 + * @brief MenuTextures for Yoshi Face 02 * */ MenuTexture D_02005CB8[2] = { - { 0, 0, gTextureYoshiFace02, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureYoshiFace02, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Yoshi Face 03 + * @brief MenuTextures for Yoshi Face 03 * */ MenuTexture D_02005CE0[2] = { - { 0, 0, gTextureYoshiFace03, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureYoshiFace03, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Yoshi Face 04 + * @brief MenuTextures for Yoshi Face 04 * */ MenuTexture D_02005D08[2] = { - { 0, 0, gTextureYoshiFace04, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureYoshiFace04, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Yoshi Face 05 + * @brief MenuTextures for Yoshi Face 05 * */ MenuTexture D_02005D30[2] = { - { 0, 0, gTextureYoshiFace05, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureYoshiFace05, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Yoshi Face 06 + * @brief MenuTextures for Yoshi Face 06 * */ MenuTexture D_02005D58[2] = { - { 0, 0, gTextureYoshiFace06, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureYoshiFace06, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Yoshi Face 07 + * @brief MenuTextures for Yoshi Face 07 * */ MenuTexture D_02005D80[2] = { - { 0, 0, gTextureYoshiFace07, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureYoshiFace07, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Yoshi Face 08 + * @brief MenuTextures for Yoshi Face 08 * */ MenuTexture D_02005DA8[2] = { - { 0, 0, gTextureYoshiFace08, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureYoshiFace08, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Yoshi Face 09 + * @brief MenuTextures for Yoshi Face 09 * */ MenuTexture D_02005DD0[2] = { - { 0, 0, gTextureYoshiFace09, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureYoshiFace09, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Yoshi Face 10 + * @brief MenuTextures for Yoshi Face 10 * */ MenuTexture D_02005DF8[2] = { - { 0, 0, gTextureYoshiFace10, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureYoshiFace10, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Yoshi Face 11 + * @brief MenuTextures for Yoshi Face 11 * */ MenuTexture D_02005E20[2] = { - { 0, 0, gTextureYoshiFace11, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureYoshiFace11, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Yoshi Face 12 + * @brief MenuTextures for Yoshi Face 12 * */ MenuTexture D_02005E48[2] = { - { 0, 0, gTextureYoshiFace12, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureYoshiFace12, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Yoshi Face 13 + * @brief MenuTextures for Yoshi Face 13 * */ MenuTexture D_02005E70[2] = { - { 0, 0, gTextureYoshiFace13, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureYoshiFace13, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Yoshi Face 14 + * @brief MenuTextures for Yoshi Face 14 * */ MenuTexture D_02005E98[2] = { - { 0, 0, gTextureYoshiFace14, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureYoshiFace14, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Yoshi Face 15 + * @brief MenuTextures for Yoshi Face 15 * */ MenuTexture D_02005EC0[2] = { - { 0, 0, gTextureYoshiFace15, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureYoshiFace15, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Yoshi Face 16 + * @brief MenuTextures for Yoshi Face 16 * */ MenuTexture D_02005EE8[2] = { - { 0, 0, gTextureYoshiFace16, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureYoshiFace16, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for DK Face 00 + * @brief MenuTextures for DK Face 00 * */ MenuTexture D_02005F10[2] = { - { 0, 0, gTextureDkFace00, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureDkFace00, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for DK Face 01 + * @brief MenuTextures for DK Face 01 * */ MenuTexture D_02005F38[2] = { - { 0, 0, gTextureDkFace01, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureDkFace01, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for DK Face 02 + * @brief MenuTextures for DK Face 02 * */ MenuTexture D_02005F60[2] = { - { 0, 0, gTextureDkFace02, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureDkFace02, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for DK Face 03 + * @brief MenuTextures for DK Face 03 * */ MenuTexture D_02005F88[2] = { - { 0, 0, gTextureDkFace03, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureDkFace03, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for DK Face 04 + * @brief MenuTextures for DK Face 04 * */ MenuTexture D_02005FB0[2] = { - { 0, 0, gTextureDkFace04, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureDkFace04, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for DK Face 05 + * @brief MenuTextures for DK Face 05 * */ MenuTexture D_02005FD8[2] = { - { 0, 0, gTextureDkFace05, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureDkFace05, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for DK Face 06 + * @brief MenuTextures for DK Face 06 * */ MenuTexture D_02006000[2] = { - { 0, 0, gTextureDkFace06, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureDkFace06, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for DK Face 07 + * @brief MenuTextures for DK Face 07 * */ MenuTexture D_02006028[2] = { - { 0, 0, gTextureDkFace07, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureDkFace07, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for DK Face 08 + * @brief MenuTextures for DK Face 08 * */ MenuTexture D_02006050[2] = { - { 0, 0, gTextureDkFace08, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureDkFace08, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for DK Face 09 + * @brief MenuTextures for DK Face 09 * */ MenuTexture D_02006078[2] = { - { 0, 0, gTextureDkFace09, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureDkFace09, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for DK Face 10 + * @brief MenuTextures for DK Face 10 * */ MenuTexture D_020060A0[2] = { - { 0, 0, gTextureDkFace10, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureDkFace10, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for DK Face 11 + * @brief MenuTextures for DK Face 11 * */ MenuTexture D_020060C8[2] = { - { 0, 0, gTextureDkFace11, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureDkFace11, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for DK Face 12 + * @brief MenuTextures for DK Face 12 * */ MenuTexture D_020060F0[2] = { - { 0, 0, gTextureDkFace12, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureDkFace12, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for DK Face 13 + * @brief MenuTextures for DK Face 13 * */ MenuTexture D_02006118[2] = { - { 0, 0, gTextureDkFace13, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureDkFace13, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for DK Face 14 + * @brief MenuTextures for DK Face 14 * */ MenuTexture D_02006140[2] = { - { 0, 0, gTextureDkFace14, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureDkFace14, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for DK Face 15 + * @brief MenuTextures for DK Face 15 * */ MenuTexture D_02006168[2] = { - { 0, 0, gTextureDkFace15, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureDkFace15, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for DK Face 16 + * @brief MenuTextures for DK Face 16 * */ MenuTexture D_02006190[2] = { - { 0, 0, gTextureDkFace16, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureDkFace16, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Wario Face 00 + * @brief MenuTextures for Wario Face 00 * */ MenuTexture D_020061B8[2] = { - { 0, 0, gTextureWarioFace00, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureWarioFace00, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Wario Face 01 + * @brief MenuTextures for Wario Face 01 * */ MenuTexture D_020061E0[2] = { - { 0, 0, gTextureWarioFace01, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureWarioFace01, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Wario Face 02 + * @brief MenuTextures for Wario Face 02 * */ MenuTexture D_02006208[2] = { - { 0, 0, gTextureWarioFace02, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureWarioFace02, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Wario Face 03 + * @brief MenuTextures for Wario Face 03 * */ MenuTexture D_02006230[2] = { - { 0, 0, gTextureWarioFace03, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureWarioFace03, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Wario Face 04 + * @brief MenuTextures for Wario Face 04 * */ MenuTexture D_02006258[2] = { - { 0, 0, gTextureWarioFace04, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureWarioFace04, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Wario Face 05 + * @brief MenuTextures for Wario Face 05 * */ MenuTexture D_02006280[2] = { - { 0, 0, gTextureWarioFace05, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureWarioFace05, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Wario Face 06 + * @brief MenuTextures for Wario Face 06 * */ MenuTexture D_020062A8[2] = { - { 0, 0, gTextureWarioFace06, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureWarioFace06, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Wario Face 07 + * @brief MenuTextures for Wario Face 07 * */ MenuTexture D_020062D0[2] = { - { 0, 0, gTextureWarioFace07, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureWarioFace07, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Wario Face 08 + * @brief MenuTextures for Wario Face 08 * */ MenuTexture D_020062F8[2] = { - { 0, 0, gTextureWarioFace08, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureWarioFace08, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Wario Face 09 + * @brief MenuTextures for Wario Face 09 * */ MenuTexture D_02006320[2] = { - { 0, 0, gTextureWarioFace09, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureWarioFace09, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Wario Face 10 + * @brief MenuTextures for Wario Face 10 * */ MenuTexture D_02006348[2] = { - { 0, 0, gTextureWarioFace10, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureWarioFace10, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Wario Face 11 + * @brief MenuTextures for Wario Face 11 * */ MenuTexture D_02006370[2] = { - { 0, 0, gTextureWarioFace11, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureWarioFace11, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Wario Face 12 + * @brief MenuTextures for Wario Face 12 * */ MenuTexture D_02006398[2] = { - { 0, 0, gTextureWarioFace12, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureWarioFace12, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Wario Face 13 + * @brief MenuTextures for Wario Face 13 * */ MenuTexture D_020063C0[2] = { - { 0, 0, gTextureWarioFace13, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureWarioFace13, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Wario Face 14 + * @brief MenuTextures for Wario Face 14 * */ MenuTexture D_020063E8[2] = { - { 0, 0, gTextureWarioFace14, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureWarioFace14, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Wario Face 15 + * @brief MenuTextures for Wario Face 15 * */ MenuTexture D_02006410[2] = { - { 0, 0, gTextureWarioFace15, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureWarioFace15, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Wario Face 16 + * @brief MenuTextures for Wario Face 16 * */ MenuTexture D_02006438[2] = { - { 0, 0, gTextureWarioFace16, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureWarioFace16, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Bowser Face 00 + * @brief MenuTextures for Bowser Face 00 * */ MenuTexture D_02006460[2] = { - { 0, 0, gTextureBowserFace00, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureBowserFace00, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Bowser Face 01 + * @brief MenuTextures for Bowser Face 01 * */ MenuTexture D_02006488[2] = { - { 0, 0, gTextureBowserFace01, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureBowserFace01, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Bowser Face 02 + * @brief MenuTextures for Bowser Face 02 * */ MenuTexture D_020064B0[2] = { - { 0, 0, gTextureBowserFace02, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureBowserFace02, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Bowser Face 03 + * @brief MenuTextures for Bowser Face 03 * */ MenuTexture D_020064D8[2] = { - { 0, 0, gTextureBowserFace03, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureBowserFace03, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Bowser Face 04 + * @brief MenuTextures for Bowser Face 04 * */ MenuTexture D_02006500[2] = { - { 0, 0, gTextureBowserFace04, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureBowserFace04, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Bowser Face 05 + * @brief MenuTextures for Bowser Face 05 * */ MenuTexture D_02006528[2] = { - { 0, 0, gTextureBowserFace05, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureBowserFace05, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Bowser Face 06 + * @brief MenuTextures for Bowser Face 06 * */ MenuTexture D_02006550[2] = { - { 0, 0, gTextureBowserFace06, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureBowserFace06, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Bowser Face 07 + * @brief MenuTextures for Bowser Face 07 * */ MenuTexture D_02006578[2] = { - { 0, 0, gTextureBowserFace07, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureBowserFace07, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Bowser Face 08 + * @brief MenuTextures for Bowser Face 08 * */ MenuTexture D_020065A0[2] = { - { 0, 0, gTextureBowserFace08, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureBowserFace08, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Bowser Face 09 + * @brief MenuTextures for Bowser Face 09 * */ MenuTexture D_020065C8[2] = { - { 0, 0, gTextureBowserFace09, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureBowserFace09, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Bowser Face 10 + * @brief MenuTextures for Bowser Face 10 * */ MenuTexture D_020065F0[2] = { - { 0, 0, gTextureBowserFace10, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureBowserFace10, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Bowser Face 11 + * @brief MenuTextures for Bowser Face 11 * */ MenuTexture D_02006618[2] = { - { 0, 0, gTextureBowserFace11, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureBowserFace11, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Bowser Face 12 + * @brief MenuTextures for Bowser Face 12 * */ MenuTexture D_02006640[2] = { - { 0, 0, gTextureBowserFace12, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureBowserFace12, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Bowser Face 13 + * @brief MenuTextures for Bowser Face 13 * */ MenuTexture D_02006668[2] = { - { 0, 0, gTextureBowserFace13, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureBowserFace13, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Bowser Face 14 + * @brief MenuTextures for Bowser Face 14 * */ MenuTexture D_02006690[2] = { - { 0, 0, gTextureBowserFace14, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureBowserFace14, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Bowser Face 15 + * @brief MenuTextures for Bowser Face 15 * */ MenuTexture D_020066B8[2] = { - { 0, 0, gTextureBowserFace15, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureBowserFace15, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** - * @brief MkTextures for Bowser Face 16 + * @brief MenuTextures for Bowser Face 16 * */ MenuTexture D_020066E0[2] = { - { 0, 0, gTextureBowserFace16, 64, 64, 0, 0, 0x0, 0 }, - { 0, 0, NULL, 0, 0, 0, 0, 0, 0 }, + { 0, gTextureBowserFace16, 64, 64, 0, 0, 0x0}, + { 0, NULL, 0, 0, 0, 0, 0}, }; /** diff --git a/src/engine/World.cpp b/src/engine/World.cpp index ded60a262..1e68a4b26 100644 --- a/src/engine/World.cpp +++ b/src/engine/World.cpp @@ -60,8 +60,8 @@ u32 World::GetCupIndex() { u32 World::NextCup() { s32 hack = 1; - // Prevent battle mode - if (gModeSelection == GRAND_PRIX) { + // Do not display battle mode on GP, TT, or VS + if (gModeSelection != BATTLE) { hack = 2; } diff --git a/src/menu_items.c b/src/menu_items.c index 829453b5d..65313aa77 100644 --- a/src/menu_items.c +++ b/src/menu_items.c @@ -52,11 +52,12 @@ const char* GetCupName(void); void guMtxCatL(Mtx* m, Mtx* n, Mtx* res); -u16* gMenuTextureBuffer; +const char* sMenuTextureList[MENU_TEXTURE_BUFFER_MAX]; u8* gMenuCompressedBuffer; u8* sTKMK00_LowResBuffer; u8* sGPPointsCopy; void* gSomeDLBuffer; + /** * List of bytes indexed by character ID * Indicates number of Grand Prix points that character @@ -70,8 +71,8 @@ MenuItem gMenuItems[MENU_ITEMS_MAX]; struct_8018DEE0_entry D_8018DEE0[D_8018DEE0_SIZE]; struct_8018E060_entry D_8018E060[D_8018E060_SIZE + 1]; struct_8018E0E8_entry D_8018E0E8[D_8018E0E8_SIZE]; -s32 sMenuTextureBufferIndex; -struct_8018E118_entry sMenuTextureMap[TEXTURE_MAP_MAX]; +s32 sMenuTextureListIndex; +TextureMap sMenuTextureMap[TEXTURE_MAP_MAX]; s32 sMenuTextureEntries; Gfx* sGfxPtr; s32 gNumD_8018E768Entries; @@ -484,6 +485,9 @@ char* D_800E7890[] = { "UNABLE TO COPY GHOST ", "-- INSUFFICIENT FREE PAGES ", +}; + +char* D_800E78BC[] = { "IN CONTROLLER 1 ", "N64 CONTROLLER PAK", }; @@ -730,8 +734,8 @@ MkAnimation* D_800E7D34[] = { }; MenuTexture* gMenuTexturesBackground[] = { - D_02004598, - D_020045C0, + seg2_blue_sky_background_texture, + seg2_sunset_background_texture, }; MenuTexture* D_800E7D54[] = { @@ -747,7 +751,11 @@ MenuTexture* D_800E7D74[] = { MenuTexture* D_800E7DC4[] = { seg2_mario_raceway_title_texture, seg2_choco_mountain_title_texture, D_02004EF8, D_02004F20, D_02004F48, D_02004F70, D_02004F98, D_02004FC0, D_02004FE8, D_02005010, D_02005038, D_02005060, D_02005088, D_020050B0, - D_020050D8, D_02005100, D_02005128, D_02005150, D_02005178, D_020051A0, + D_020050D8 +}; + +MenuTexture* D_800E7E00[] = { +D_02005100, D_02005128, D_02005150, D_02005178, D_020051A0, }; // Unused? @@ -823,7 +831,6 @@ MenuTexture* D_800E822C[] = { D_0200455C, }; -// In a perfect world this would be `MenuTexture *D_800E8234[][2]` MenuTexture* D_800E8234[] = { seg2_menu_1p_column, D_020047DC, seg2_menu_2p_column, D_02004804, @@ -832,15 +839,37 @@ MenuTexture* D_800E8234[] = { }; MenuTexture* D_800E8254[] = { - seg2_game_select_texture, seg2_menu_1p_column, seg2_menu_2p_column, seg2_menu_3p_column, seg2_menu_4p_column, D_0200487C, D_020048A4, D_020048CC, + seg2_game_select_texture, + seg2_menu_1p_column, + seg2_menu_2p_column, + seg2_menu_3p_column, + seg2_menu_4p_column, + D_0200487C, + D_020048A4, + D_020048CC, }; -MenuTexture* D_800E8274[] = { - seg2_50_CC_texture, seg2_100_CC_texture, seg2_150_CC_texture, seg2_extra_CC_texture, D_020049BC, seg2_menu_no_item_texture, D_020049E4, seg2_data_texture, +MenuTexture* D_800E8274[] = { // CC textures + seg2_50_CC_texture, seg2_100_CC_texture, seg2_150_CC_texture, seg2_extra_CC_texture, +}; +MenuTexture* D_800E8284[] = { // Versus and Battle textures + D_020049BC, seg2_menu_no_item_texture +}; +MenuTexture* D_800E828C[] = { // Time Trials Begin & Data (probably) + D_020049E4, seg2_data_texture, }; +// Next three variables are duplicates of the above, for whatever reason... MenuTexture* D_800E8294[] = { - seg2_50_CC_texture, seg2_100_CC_texture, seg2_150_CC_texture, seg2_extra_CC_texture, D_020049BC, seg2_menu_no_item_texture, D_020049E4, seg2_data_texture, + seg2_50_CC_texture, seg2_100_CC_texture, seg2_150_CC_texture, seg2_extra_CC_texture +}; + +MenuTexture* D_800E82A4[] = { + D_020049BC, seg2_menu_no_item_texture +}; + +MenuTexture* D_800E82AC[] = { + D_020049E4, seg2_data_texture, }; MenuTexture* gMenuTexturesBorderPlayer[] = { @@ -1149,12 +1178,12 @@ void func_80091B78(void) { } gNextFreeMemoryAddress = gFreeMemoryResetAnchor; // Hypothetically, this should be a ptr... But only hypothetically. - gMenuTextureBuffer = get_next_available_memory_addr(0x000900B0); + //sMenuTextureList = get_next_available_memory_addr(0x000900B0); gMenuCompressedBuffer = (u8*) get_next_available_memory_addr(0x0000CE00); sTKMK00_LowResBuffer = (u8*) get_next_available_memory_addr(SCREEN_WIDTH * SCREEN_HEIGHT); gSomeDLBuffer = (struct_8018EE10_entry*) get_next_available_memory_addr(0x00001000); func_800AF9B0(); - D_8018EE0C = 0; + unref_D_8018EE0C = 0; for (i = 0; i < 5; i++) { D_8018E7AC[i] = 0; @@ -1179,7 +1208,7 @@ void func_80091B78(void) { func_800C9D0C((u8) i); } - func_800B44BC(); + set_sound_mode(); osViSetSpecialFeatures(OS_VI_DITHER_FILTER_ON); } @@ -1229,7 +1258,7 @@ void func_80091EE4(void) { gControllerPak1State = BAD; tmp = func_800B5F30(); - if ((D_8018EDFB != 0) && (tmp == 0)) { + if ((gGhostPlayerInit != 0) && (tmp == 0)) { temp_s2 = (GetCupIndex() * 4) + GetCupCursorPosition(); func_800B6708(); @@ -1237,7 +1266,7 @@ void func_80091EE4(void) { if ((D_8018EE10[temp_s0].ghostDataSaved != 0) && (temp_s2 == D_8018EE10[temp_s0].courseIndex)) { func_800B64EC(temp_s0); temp_s0 = 2; - D_8018EDFB = 0; + gGhostPlayerInit = 0; } } } @@ -1245,10 +1274,9 @@ void func_80091EE4(void) { void func_80091FA4(void) { s32 i; - //! @todo These sizes need to be sizeof() for shiftability if possible gMenuCompressedBuffer = (u8*) get_next_available_memory_addr(0x00002800); - gMenuTextureBuffer = (u16*) get_next_available_memory_addr(0x000124F8); + //sMenuTextureList = (u16*) get_next_available_memory_addr(0x000124F8); sTKMK00_LowResBuffer = (u8*) get_next_available_memory_addr(0x00001000); sGPPointsCopy = get_next_available_memory_addr(4); @@ -1260,7 +1288,7 @@ void func_80091FA4(void) { D_8018E838[i] = 0; } - func_80099110(); + clear_menu_textures(); func_8009A344(); clear_menus(); func_80092258(); @@ -1304,7 +1332,7 @@ void func_800921B4(void) { // if selected and detect kind menu void text_rainbow_effect(s32 test, s32 target, s32 alternative_color) { if (test == target) { - if (func_800B4520() != 0) { + if (is_screen_being_faded() != 0) { set_text_color(gGlobalTimer % 3); } else { set_text_color(TEXT_BLUE_GREEN_RED_CYCLE_2); @@ -2060,7 +2088,7 @@ void func_80093E60(void) { s32 i; gMenuCompressedBuffer = get_next_available_memory_addr(0x00002800); - gMenuTextureBuffer = (u16*) get_next_available_memory_addr(0x000124F8); + //sMenuTextureList = (u16*) get_next_available_memory_addr(0x000124F8); sTKMK00_LowResBuffer = get_next_available_memory_addr(0x00001000); sGPPointsCopy = get_next_available_memory_addr(4U); @@ -2072,7 +2100,7 @@ void func_80093E60(void) { D_8018E838[i] = 0; } - func_80099110(); + clear_menu_textures(); func_8009A344(); clear_menus(); func_80092258(); @@ -2236,7 +2264,7 @@ void func_80094A64(struct GfxPool* pool) { void setup_menus(void) { if (gFadeModeSelection != 0) { - func_80099110(); + clear_menu_textures(); func_8009A344(); clear_menus(); func_8009B938(); @@ -2316,7 +2344,7 @@ void setup_menus(void) { add_menu_item(MAIN_MENU_DATA_GFX, 0x0000015E, 0x000000C8, MENU_ITEM_UI_PRIORITY_6); add_menu_item(MAIN_MENU_OPTION_GFX, 0x0000015E, 0x000000C8, MENU_ITEM_UI_PRIORITY_6); if (has_unlocked_extra_mode() != 0) { - add_menu_item(MENU_ITEM_TYPE_015, 0, 0, MENU_ITEM_UI_PRIORITY_6); + add_menu_item(MAIN_MENU_EXTRA_CC, 0, 0, MENU_ITEM_UI_PRIORITY_6); } add_menu_item(MAIN_MENU_150CC, 0, 0, MENU_ITEM_UI_PRIORITY_6); add_menu_item(MAIN_MENU_100CC, 0, 0, MENU_ITEM_UI_PRIORITY_6); @@ -2397,7 +2425,7 @@ CProperties* GetCoursePropsA(void); void func_80095574(void) { s32 var_v0; - if ((D_8018EE0C < 3) || (D_8018E7AC[4] != 0)) { + if ((unref_D_8018EE0C < 3) || (D_8018E7AC[4] != 0)) { handle_menus_default(); } if (gDebugMenuSelection >= 2) { @@ -2440,7 +2468,7 @@ void func_80095574(void) { } debug_print_str2(var_v0 + 0xB9, 0x0000006E, GetCoursePropsA()->DebugName); debug_print_str2(0x00000050, 0x00000078, "screen_mode"); - debug_print_str2(0x000000AA, 0x00000078, gDebugScreenModeNames[D_8018EDF1]); + debug_print_str2(0x000000AA, 0x00000078, gDebugScreenModeNames[gScreenModeListIndex]); debug_print_str2(0x00000050, 0x00000082, "player"); debug_print_str2(0x000000AA, 0x00000082, gDebugCharacterNames[gCharacterSelections[0]]); debug_print_str2(0x00000050, 0x0000008C, "sound mode"); @@ -3153,7 +3181,7 @@ Gfx* func_80098558(Gfx* displayListHead, u32 arg1, u32 arg2, u32 arg3, u32 arg4, arg5Copy = arg5; for (var_v0 = arg2; var_v0 < arg4; var_v0 += 0x20) { for (var_a3 = arg1; var_a3 < arg3; var_a3 += 0x20) { - gMKLoadTextureTile(displayListHead++, gMenuTextureBuffer, G_IM_FMT_RGBA, G_IM_SIZ_16b, arg8, 0, var_a3, var_v0, + gMKLoadTextureTile(displayListHead++, sMenuTextureList, G_IM_FMT_RGBA, G_IM_SIZ_16b, arg8, 0, var_a3, var_v0, var_a3 + 0x20, var_v0 + 0x20, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 5, 5, G_TX_NOLOD, G_TX_NOLOD); gSPTextureRectangle(displayListHead++, arg5 << 2, arg6 << 2, (arg5 + 0x20) << 2, (arg6 + 0x20) << 2, 0, 0, @@ -3187,7 +3215,7 @@ Gfx* func_800987D0(Gfx* displayListHead, u32 arg1, u32 arg2, u32 width, u32 heig columnCopy = column; for (var_v0_2 = arg2; (u32) var_v0_2 < height; var_v0_2 += 0x20) { for (var_a2 = arg1; (u32) var_a2 < width; var_a2 += 0x20) { - gMKLoadTextureTile(displayListHead++, gMenuTextureBuffer, G_IM_FMT_RGBA, G_IM_SIZ_16b, textureWidth, 0, var_a2, + gMKLoadTextureTile(displayListHead++, sMenuTextureList, G_IM_FMT_RGBA, G_IM_SIZ_16b, textureWidth, 0, var_a2, var_v0_2, var_a2 + 0x20, var_v0_2 + 0x20, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 5, 5, G_TX_NOLOD, G_TX_NOLOD); temp_f6 = (temp_f18 * ((temp_f0 * (column - 0xA0)) + (temp_f24 * (row - 0x78)))) + 160.0f; @@ -3363,32 +3391,62 @@ Gfx* func_80098FC8_wide(Gfx* displayListHead, s32 ulx, s32 uly, s32 lrx, s32 lry return draw_box_fill_wide(displayListHead, ulx, uly, lrx, lry, 0, 0, 0, 0xFF); } -void dma_compressed_mio0_texture_segA(u64* data, size_t nbytes, void* vaddr) { -#ifdef TARGET_N64 - OSIoMesg mb; - OSMesg msg; +void load_texture(const char* texture) { + if (sMenuTextureListIndex >= 500) { + printf("\nload_texture: REACHED MAXIMUM MENU ITEMS\n\n"); + return; + } - osInvalDCache(vaddr, nbytes); - osPiStartDma(&mb, OS_MESG_PRI_NORMAL, OS_READ, (uintptr_t) &_textures_0aSegmentRomStart[SEGMENT_OFFSET(data)], - vaddr, nbytes, &gDmaMesgQueue); - osRecvMesg(&gDmaMesgQueue, &msg, OS_MESG_BLOCK); -#endif + sMenuTextureList[sMenuTextureListIndex] = texture; + + sMenuTextureMap[sMenuTextureEntries].textureData = texture; + sMenuTextureMap[sMenuTextureEntries].offset = sMenuTextureListIndex; + + sMenuTextureListIndex += 1; + sMenuTextureEntries += 1; } -void dma_tkmk00_textures(u64* data, size_t nbytes, void* vaddr) { -#ifdef TARGET_N64 - OSIoMesg mb; - OSMesg msg; +/** + * If you need to reset a texture cache after a modification, + * this will reload the texture. + */ +void load_texture_reset_cache(const char* texture) { + if (sMenuTextureListIndex >= 500) { + printf("\nload_texture: REACHED MAXIMUM MENU ITEMS\n\n"); + return; + } - osInvalDCache(vaddr, nbytes); - osPiStartDma(&mb, OS_MESG_PRI_NORMAL, OS_READ, (uintptr_t) &_textures_0bSegmentRomStart[SEGMENT_OFFSET(data)], - vaddr, nbytes, &gDmaMesgQueue); - osRecvMesg(&gDmaMesgQueue, &msg, OS_MESG_BLOCK); -#endif + ResourceDirtyByName(texture); + + sMenuTextureList[sMenuTextureListIndex] = texture; + + sMenuTextureMap[sMenuTextureEntries].textureData = texture; + sMenuTextureMap[sMenuTextureEntries].offset = sMenuTextureListIndex; + + sMenuTextureListIndex += 1; + sMenuTextureEntries += 1; +} + +void replace_texture(s32 index, const char* newTexture) { + sMenuTextureList[sMenuTextureMap[index].offset] = newTexture; + sMenuTextureMap[index].textureData = newTexture; + //printf("\nTEST %s %p %s idx %d\n\n", sMenuTextureList[index], sMenuTextureList[sMenuTextureListIndex], newTexture, sMenuTextureListIndex); } -void func_80099110(void) { - sMenuTextureBufferIndex = 0; +// strcpy the const char asset strings into sMenuTextureList. This replaces osPiDma. +void dma_compressed_mio0_texture_segA(u64* data, size_t nbytes, void* vaddr) { +} + +// strcpy the const char asset strings into sMenuTextureList. This replaces osPiDma. +void dma_tkmk00_textures(u64* data, size_t nbytes, void* vaddr) { +} + +void clear_menu_textures(void) { + for (size_t i = 0; i < ARRAY_COUNT(sMenuTextureList); i++) { + sMenuTextureList[i] = NULL; + } + + sMenuTextureListIndex = 0; sMenuTextureEntries = 0; } @@ -3422,270 +3480,211 @@ void* segmented_to_virtual_dupe_2(const void* addr) { #include <assets/player_selection.h> -#ifdef NON_MATCHING -// https://decomp.me/scratch/NAZ12 -// Register allocation nonsense -void load_menu_img(MenuTexture* arg0) { - u16 var_a1_2; - s32 var_v0; - s32 var_a1; - MenuTexture* var_s1; - struct_8018E118_entry* thing = &sMenuTextureMap[0]; - var_s1 = segmented_to_virtual_dupe(arg0); - while (var_s1->textureData != NULL) { - var_a1 = 0; - for (var_v0 = 0; var_v0 < sMenuTextureEntries; var_v0++) { - if (var_s1->textureData == (thing + var_v0)->textureData) { - var_a1 = 1; +void load_menu_img(MenuTexture* addr) { + u16 size; + s32 i; + s32 imgLoaded; + MenuTexture* texAddr; + TextureMap* texMap = &sMenuTextureMap[0]; + + texAddr = segmented_to_virtual_dupe(addr); + while (texAddr->textureData != NULL) { + imgLoaded = false; + for (i = 0; i < sMenuTextureEntries; i++) { + if (texAddr->textureData == (texMap + i)->textureData) { + imgLoaded = true; break; } } - if (var_a1 == 0) { - if (var_s1->type == 3) { - if (var_s1->size != 0) { - var_a1_2 = var_s1->size; + if (imgLoaded == false) { + if (texAddr->type == 3) { + if (texAddr->size != 0) { + size = texAddr->size; } else { - var_a1_2 = 0x1000; + size = 0x1000; } - if (var_a1_2 % 8) { - var_a1_2 = ((var_a1_2 / 8) * 8) + 8; + if (size % 8) { + size = ((size / 8) * 8) + 8; } -// mio0decode(gMenuCompressedBuffer, &gMenuTextureBuffer[sMenuTextureBufferIndex]); -// size_t texSize = ResourceGetTexSizeByName(var_s1->textureData); -// memcpy(&gMenuTextureBuffer[sMenuTextureBufferIndex], var_s1->textureData, texSize); -#ifdef TARGET_N64 - dma_compressed_mio0_texture_segA(var_s1->textureData, var_a1_2, gMenuCompressedBuffer); - mio0decode(gMenuCompressedBuffer, (u8*) &gMenuTextureBuffer[sMenuTextureBufferIndex]); -#else - strcpy(&gMenuTextureBuffer[sMenuTextureBufferIndex], var_s1->textureData); -#endif + dma_compressed_mio0_texture_segA(texAddr->textureData, size, sMenuTextureList[sMenuTextureListIndex]); + mio0decode(gMenuCompressedBuffer, (u8*) &sMenuTextureList[sMenuTextureListIndex]); + load_texture(texAddr->textureData); } else { -#ifdef TARGET_N64 - dma_compressed_mio0_texture_segA(var_s1->textureData, var_s1->height * var_s1->width * 2, - &gMenuTextureBuffer[sMenuTextureBufferIndex]); -#else - strcpy(&gMenuTextureBuffer[sMenuTextureBufferIndex], var_s1->textureData); -#endif + dma_compressed_mio0_texture_segA(texAddr->textureData, (texAddr->height * texAddr->width) * 2, + &sMenuTextureList[sMenuTextureListIndex]); + load_texture(texAddr->textureData); } - thing[sMenuTextureEntries].textureData = var_s1->textureData; - thing[sMenuTextureEntries].offset = sMenuTextureBufferIndex; - sMenuTextureBufferIndex += var_s1->height * var_s1->width; - sMenuTextureBufferIndex = ((sMenuTextureBufferIndex / 8) * 8) + 8; - sMenuTextureEntries += 1; + //texMap[sMenuTextureEntries].textureData = texAddr->textureData; + //texMap[sMenuTextureEntries].offset = sMenuTextureListIndex; + //sMenuTextureListIndex += 1; + //sMenuTextureListIndex = ((sMenuTextureListIndex / 8) * 8) + 8; + //sMenuTextureEntries += 1; } - var_s1++; + texAddr++; } } -#else -GLOBAL_ASM("asm/non_matchings/menu_items/load_menu_img.s") -#endif -#ifdef NON_MATCHING -// https://decomp.me/scratch/O2tkD -// Register allocation nonsense -void func_80099394(MenuTexture* arg0) { - UNUSED u16 var_a1_2; - s32 var_v0; - s32 var_a1; - UNUSED s32 temp_s3; - MenuTexture* var_s1; - struct_8018E118_entry* thing; +void func_80099394(MenuTexture* addr) { + s32 i; + s32 imgLoaded; + MenuTexture* texAddr; + TextureMap* texMap = &sMenuTextureMap[0]; - var_s1 = segmented_to_virtual_dupe(arg0); - while (var_s1->textureData != NULL) { - var_a1 = 0; - for (var_v0 = 0; var_v0 < sMenuTextureEntries; var_v0++) { - // wtf is going on here? - if (sMenuTextureMap[var_v0 ^ 0].textureData == (*var_s1).textureData) { - var_a1 = 1; + texAddr = segmented_to_virtual_dupe(addr); + while (texAddr->textureData != NULL) { + imgLoaded = false; + for (i = 0; i < sMenuTextureEntries; i++) { + if (texAddr->textureData == (texMap + i)->textureData) { + imgLoaded = true; break; } } - if (var_a1 == 0) { - if (var_s1->type == 5) { -#ifdef TARGET_N64 - dma_compressed_mio0_texture_segA(var_s1->textureData, (u32) ((s32) (var_s1->height * var_s1->width) / 2), - &gMenuTextureBuffer[sMenuTextureBufferIndex]); -#else - u8* tex = LOAD_ASSET(var_s1->textureData); - size_t texSize = ResourceGetTexSizeByName(var_s1->textureData); - memcpy(&gMenuTextureBuffer[sMenuTextureBufferIndex], tex, texSize); -#endif - } - - thing = &sMenuTextureMap[sMenuTextureEntries]; - thing->textureData = var_s1->textureData; - thing = &sMenuTextureMap[sMenuTextureEntries]; - thing->offset = sMenuTextureBufferIndex; - sMenuTextureBufferIndex += (var_s1->height * var_s1->width); - sMenuTextureBufferIndex = ((sMenuTextureBufferIndex / 8) * 8) + 8; - sMenuTextureEntries += 1; + if (imgLoaded == false) { + if (texAddr->type == 5) { + dma_compressed_mio0_texture_segA(texAddr->textureData, (u32) (((s32) (texAddr->height * texAddr->width)) / 2), + &sMenuTextureList[sMenuTextureListIndex]); + load_texture(texAddr->textureData); + } + //texMap[sMenuTextureEntries].textureData = texAddr->textureData; + //texMap[sMenuTextureEntries].offset = sMenuTextureListIndex; + //sMenuTextureListIndex += 1; + //sMenuTextureListIndex = ((sMenuTextureListIndex / 8) * 8) + 8; + //sMenuTextureEntries += 1; } - var_s1++; + texAddr++; } } -#else -GLOBAL_ASM("asm/non_matchings/menu_items/func_80099394.s") -#endif -#ifdef NON_MATCHING -// Register allocation nonsense -// https://decomp.me/scratch/Wv2MX -void func_8009952C(MenuTexture* arg0) { - UNUSED u16 var_a1_2; - s32 var_v0; - s32 var_a1; - UNUSED s32 temp_s3; - MenuTexture* var_s1; - struct_8018E118_entry* thing; +void func_8009952C(MenuTexture* addr) { + s32 i; + s32 imgLoaded; + MenuTexture* texAddr; + TextureMap* texMap = &sMenuTextureMap[0]; - var_s1 = segmented_to_virtual_dupe(arg0); - while (var_s1->textureData != NULL) { - var_a1 = 0; - for (var_v0 = 0; var_v0 < sMenuTextureEntries; var_v0++) { - // wtf is going on here? - if (sMenuTextureMap[var_v0 ^ 0].textureData == (*var_s1).textureData) { - var_a1 = 1; + texAddr = segmented_to_virtual_dupe(addr); + while (texAddr->textureData != NULL) { + imgLoaded = false; + for (i = 0; i < sMenuTextureEntries; i++) { + if (texAddr->textureData == (texMap + i)->textureData) { + imgLoaded = true; break; } } - if (var_a1 == 0) { -#ifdef TARGET_N64 - dma_compressed_mio0_texture_segA(var_s1->textureData, 0x00008000U, gMenuCompressedBuffer); - mio0decode(gMenuCompressedBuffer, (u8*) &gMenuTextureBuffer[sMenuTextureBufferIndex]); -#else - memcpy(&gMenuTextureBuffer[sMenuTextureBufferIndex], var_s1->textureData, var_s1->width * var_s1->height * 2); -#endif - - thing = &sMenuTextureMap[sMenuTextureEntries]; - thing->textureData = var_s1->textureData; - thing = &sMenuTextureMap[sMenuTextureEntries]; - thing->offset = sMenuTextureBufferIndex; - sMenuTextureBufferIndex += (var_s1->height * var_s1->width); - sMenuTextureBufferIndex = ((sMenuTextureBufferIndex / 8) * 8) + 8; - sMenuTextureEntries += 1; + if (imgLoaded == false) { + dma_compressed_mio0_texture_segA(texAddr->textureData, 0x00008000U, &sMenuTextureList[sMenuTextureListIndex]); + mio0decode(gMenuCompressedBuffer, (u8*) &sMenuTextureList[sMenuTextureListIndex]); + load_texture(texAddr->textureData); + //texMap[sMenuTextureEntries].textureData = texAddr->textureData; + //texMap[sMenuTextureEntries].offset = sMenuTextureListIndex; + //sMenuTextureListIndex += 1; + //sMenuTextureListIndex = ((sMenuTextureListIndex / 8) * 8) + 8; + //sMenuTextureEntries += 1; } - var_s1++; + texAddr++; } } -#else -GLOBAL_ASM("asm/non_matchings/menu_items/func_8009952C.s") -#endif void load_menu_img_mio0_forced(MenuTexture* addr) { load_menu_img_comp_type(addr, LOAD_MENU_IMG_MIO0_FORCE); } -#ifdef NON_MATCHING -// Register allocation nonsense -// https://decomp.me/scratch/hwAAp -void load_menu_img_comp_type(MenuTexture* arg0, s32 arg1) { - u16 var_a1_2; - s32 var_v0; - s32 var_a1; - u8 var_v0_2; - MenuTexture* texture; - struct_8018E118_entry* thing = &sMenuTextureMap[0]; - - texture = segmented_to_virtual_dupe(arg0); - - size_t siz = texture->width * texture->height; - // for (size_t i = 0; i < siz; i++) { - // printf(" 0x%llX", texture->textureData[i]); - // } +void load_menu_img_comp_type(MenuTexture* addr, s32 compType) { + u16 size; + s32 i; + s32 imgLoaded; + u8 clearBit; + MenuTexture* texAddr; + TextureMap* texMap = &sMenuTextureMap[0]; - // Because it's loading an mkTexture. The second element in the array is usually all zeros. - // Despite this loop, it's usually only ran once. - while (texture->textureData != NULL) { - var_a1 = 0; - for (var_v0 = 0; var_v0 < sMenuTextureEntries; var_v0++) { - if (texture->textureData == (thing + var_v0)->textureData) { - var_a1 = 1; + texAddr = segmented_to_virtual_dupe(addr); + while (texAddr->textureData != NULL) { + imgLoaded = false; + for (i = 0; i < sMenuTextureEntries; i++) { + if (texAddr->textureData == (texMap + i)->textureData) { + imgLoaded = true; break; } } - if ((var_a1 == 0) || (arg1 > 0)) { - if (texture->size != 0) { - var_a1_2 = texture->size; + + if ((imgLoaded == false) || (compType > LOAD_MENU_IMG_FORCE)) { + if (texAddr->size != 0) { + size = texAddr->size; } else { - var_a1_2 = 0x1000; + size = 0x1000; } - if ((var_a1_2 % 8)) { - var_a1_2 = (((var_a1_2 / 8) * 8) + 8); + if (size % 8) { + size = ((size / 8) * 8) + 8; } - switch (arg1) { /* irregular */ - case -1: - case 1: - // dma_compressed_mio0_texture_segA(texture->textureData, var_a1_2, gMenuCompressedBuffer); + + // dma a compressed texture to the compressed texture buffer + switch (compType) { + case LOAD_MENU_IMG_MIO0_ONCE: + case LOAD_MENU_IMG_MIO0_FORCE: + //dma_compressed_mio0_texture_segA(texAddr->textureData, size, gMenuCompressedBuffer); break; - case 0: - case 2: - // dma_tkmk00_textures(texture->textureData, var_a1_2, gMenuCompressedBuffer); + case LOAD_MENU_IMG_TKMK00_ONCE: + case LOAD_MENU_IMG_TKMK00_FORCE: + //dma_tkmk00_textures(texAddr->textureData, size, gMenuCompressedBuffer); break; } - switch (arg1) { /* switch 1; irregular */ - case -1: /* switch 1 */ - case 1: { - // mio0decode(gMenuCompressedBuffer, (u8*)&gMenuTextureBuffer[sMenuTextureBufferIndex]); - // printf("w: %d, h: %d", texture->width, texture->height); - u8* tex = (u8*) LOAD_ASSET(texture->textureData); - memcpy(&gMenuTextureBuffer[sMenuTextureBufferIndex], tex, texture->width * texture->height * 2); + + // Extract compressed texture to the texture buffer + switch (compType) { + case LOAD_MENU_IMG_MIO0_ONCE: + case LOAD_MENU_IMG_MIO0_FORCE: + mio0decode(gMenuCompressedBuffer, (u8*) &sMenuTextureList[sMenuTextureListIndex]); + //strcpy(&sMenuTextureList[sMenuTextureListIndex], texAddr->textureData); + load_texture(texAddr->textureData); break; - } - case 0: /* switch 1 */ - case 2: /* switch 1 */ - if (texture->type == 1) { - var_v0_2 = 0x000000BE; + case LOAD_MENU_IMG_TKMK00_ONCE: + case LOAD_MENU_IMG_TKMK00_FORCE: + if (texAddr->type == 1) { + clearBit = 0xBE; } else { - var_v0_2 = 1; + clearBit = 1; } if (1) {} - // gMenuTextureBuffer[sMenuTextureBufferIndex] = &gTextureBackgroundBlueSky; - // tkmk00decode(gMenuCompressedBuffer, texture->textureData, (u8*)&gMenuTextureBuffer[sMenuTextureBufferIndex], - // var_v0_2); - u8* tex2 = (u8*) LOAD_ASSET(texture->textureData); - memcpy(&gMenuTextureBuffer[sMenuTextureBufferIndex], tex2, texture->width * texture->height * 2); + tkmk00decode(gMenuCompressedBuffer, sTKMK00_LowResBuffer, + (u8*) &sMenuTextureList[sMenuTextureListIndex], clearBit); + load_texture(texAddr->textureData); + + //strcpy(&sMenuTextureList[sMenuTextureListIndex], texAddr->textureData); break; } - thing[sMenuTextureEntries].textureData = texture->textureData; - thing[sMenuTextureEntries].offset = sMenuTextureBufferIndex; - sMenuTextureBufferIndex += texture->height * texture->width; - sMenuTextureBufferIndex = ((sMenuTextureBufferIndex / 8) * 8) + 8; - sMenuTextureEntries += 1; + //texMap[sMenuTextureEntries].textureData = texAddr->textureData; + //texMap[sMenuTextureEntries].offset = sMenuTextureListIndex; + //sMenuTextureListIndex += 1; + //sMenuTextureListIndex = ((sMenuTextureListIndex / 8) * 8) + 8; + //sMenuTextureEntries += 1; } - texture++; + texAddr++; } } -#else -GLOBAL_ASM("asm/non_matchings/menu_items/load_menu_img_comp_type.s") -#endif -void func_80099958(MenuTexture* arg0, s32 arg1, s32 arg2) { - u16 var_a1; - UNUSED u8* thing; - MenuTexture* temp_v0; +void func_80099958(MenuTexture* addr, s32 arg1, s32 arg2) { + u16 size; + MenuTexture* texAddr; - temp_v0 = segmented_to_virtual_dupe(arg0); - while (temp_v0->textureData != NULL) { - if (temp_v0->size != 0) { - var_a1 = temp_v0->size; + texAddr = segmented_to_virtual_dupe(addr); + while (texAddr->textureData != NULL) { + if (texAddr->size != 0) { + size = texAddr->size; } else { - var_a1 = 0x1400; + size = 0x1400; } - if (var_a1 % 8) { + if (size % 8) { // Round up to the next multiple of eight - var_a1 = ((var_a1 / 8) * 8) + 8; + size = ((size / 8) * 8) + 8; } - // dma_compressed_mio0_texture_segA(temp_v0->textureData, var_a1, gMenuCompressedBuffer); - // mio0decode(gMenuCompressedBuffer, D_802BFB80.arraySize4[arg2][arg1 / 2][(arg1 % 2) + 2].pixel_index_array); - u8* tex = LOAD_ASSET(temp_v0->textureData); - memcpy(D_802BFB80.arraySize4[arg2][arg1 / 2][(arg1 % 2) + 2].pixel_index_array, temp_v0->textureData, - temp_v0->width * temp_v0->height * 2); - temp_v0++; + //! @warning This function does not increment sMenuTextureListIndex + dma_compressed_mio0_texture_segA(texAddr->textureData, size, gMenuCompressedBuffer); + mio0decode(gMenuCompressedBuffer, D_802BFB80.arraySize4[arg2][arg1 / 2][(arg1 % 2) + 2].pixel_index_array); + load_texture(texAddr->textureData); + texAddr++; } } @@ -3711,34 +3710,31 @@ void func_80099A94(MenuTexture* arg0, s32 arg1) { // https://decomp.me/scratch/rxEoi // Something's up with the handling of `_textures_0aSegmentRomStart`, I don't know how to fix it void func_80099AEC(void) { - s8 var_s4; + s8 texEnd; s32 size; - UNUSED s32 stackPadding0; - UNUSED s32 stackPadding1; - s32 huh; - OSIoMesg sp68; - OSMesg sp64; - UNUSED u8* test; - s32 sp60; - MenuTexture* temp_s2; + s32 texSize; + OSIoMesg mb; + OSMesg msg; + s32 bufSize; + MenuTexture* texAddr; struct_8018E060_entry* var_s1; if (gGamestate == RACING) { - sp60 = 0x00000500; + bufSize = 0x00000500; } else { - sp60 = 0x00001000; + bufSize = 0x00001000; } - var_s4 = 0; - var_s1 = &D_8018E060[0]; - temp_s2 = var_s1->texture; + texEnd = 0; + var_s1 = D_8018E060; + texAddr = var_s1->texture; - if (temp_s2 == NULL) + if (texAddr == NULL) return; - huh = temp_s2->size; - if (huh != 0) { - size = huh; + texSize = texAddr->size; + if (texSize != 0) { + size = texSize; } else { size = 0x1400; } @@ -3747,48 +3743,47 @@ void func_80099AEC(void) { } osInvalDCache(gMenuCompressedBuffer, size); #ifdef TARGET_N64 - osPiStartDma(&sp68, 0, 0, (uintptr_t) &_textures_0aSegmentRomStart[SEGMENT_OFFSET(temp_s2->textureData)], + osPiStartDma(&mb, 0, 0, (uintptr_t) &_textures_0aSegmentRomStart[SEGMENT_OFFSET(texAddr->textureData)], gMenuCompressedBuffer, size, &gDmaMesgQueue); #endif - osRecvMesg(&gDmaMesgQueue, &sp64, 1); + osRecvMesg(&gDmaMesgQueue, &msg, 1); while (1) { if ((var_s1 + 1)->texture == NULL) { - var_s4 += 1; + texEnd += 1; } else { - temp_s2 = (var_s1 + 1)->texture; - huh = (var_s1 + 1)->texture->size; - if (huh != 0) { - size = huh; + texAddr = (var_s1 + 1)->texture; + texSize = (var_s1 + 1)->texture->size; + if (texSize != 0) { + size = texSize; } else { size = 0x1400; } if (size % 8) { size = ((size / 8) * 8) + 8; } - osInvalDCache(gMenuCompressedBuffer + sp60 * 4, size); + osInvalDCache(gMenuCompressedBuffer + bufSize * 4, size); #ifdef TARGET_N64 - osPiStartDma(&sp68, 0, 0, (uintptr_t) &_textures_0aSegmentRomStart[SEGMENT_OFFSET(temp_s2->textureData)], - gMenuCompressedBuffer + sp60 * 4, size, &gDmaMesgQueue); + osPiStartDma(&mb, 0, 0, (uintptr_t) &_textures_0aSegmentRomStart[SEGMENT_OFFSET(texAddr->textureData)], + gMenuCompressedBuffer + bufSize * 4, size, &gDmaMesgQueue); #endif } -#ifdef TARGET_N64 - mio0decode(gMenuCompressedBuffer, (u8*) &gMenuTextureBuffer[sMenuTextureMap[var_s1->texNum].offset]); -#else - memcpy(&gMenuTextureBuffer[sMenuTextureMap[var_s1->texNum].offset], var_s1->texture->textureData, - var_s1->texture->width * var_s1->texture->height * 2); -#endif + mio0decode(gMenuCompressedBuffer, (u8*) &sMenuTextureList[sMenuTextureMap[var_s1->texNum].offset]); + //strcpy(&sMenuTextureList[sMenuTextureMap[var_s1->texNum].offset], var_s1->texture->textureData); + //sMenuTextureList[sMenuTextureMap[var_s1->texNum].offset] = var_s1->texture->textureData; + replace_texture(var_s1->texNum, var_s1->texture->textureData); + var_s1->texture = NULL; var_s1++; - if (var_s4 != 0) + if (texEnd != 0) break; - osRecvMesg(&gDmaMesgQueue, &sp64, 1); + osRecvMesg(&gDmaMesgQueue, &msg, 1); if ((var_s1 + 1)->texture == NULL) { - var_s4 += 1; + texEnd += 1; } else { - temp_s2 = (var_s1 + 1)->texture; - huh = (var_s1 + 1)->texture->size; - if (huh != 0) { - size = huh; + texAddr = (var_s1 + 1)->texture; + texSize = (var_s1 + 1)->texture->size; + if (texSize != 0) { + size = texSize; } else { size = 0x1400; } @@ -3797,21 +3792,18 @@ void func_80099AEC(void) { } osInvalDCache(gMenuCompressedBuffer, size); #ifdef TARGET_N64 - osPiStartDma(&sp68, 0, 0, (uintptr_t) &_textures_0aSegmentRomStart[SEGMENT_OFFSET(temp_s2->textureData)], + osPiStartDma(&mb, 0, 0, (uintptr_t) &_textures_0aSegmentRomStart[SEGMENT_OFFSET(texAddr->textureData)], gMenuCompressedBuffer, size, &gDmaMesgQueue); #endif } -#ifdef TARGET_N64 - mio0decode(gMenuCompressedBuffer + sp60 * 4, (u8*) &gMenuTextureBuffer[sMenuTextureMap[var_s1->texNum].offset]); -#else - memcpy(&gMenuTextureBuffer[sMenuTextureMap[var_s1->texNum].offset], var_s1->texture->textureData, - var_s1->texture->width * var_s1->texture->height * 2); -#endif + mio0decode(gMenuCompressedBuffer + bufSize * 4, + (u8*) &sMenuTextureList[sMenuTextureMap[var_s1->texNum].offset]); + replace_texture(var_s1->texNum, var_s1->texture->textureData); var_s1->texture = NULL; var_s1++; - if (var_s4 != 0) + if (texEnd != 0) break; - osRecvMesg(&gDmaMesgQueue, &sp64, 1); + osRecvMesg(&gDmaMesgQueue, &msg, 1); } } #else @@ -3948,7 +3940,7 @@ void func_8009A238(MenuTexture* arg0, s32 arg1) { s32 var_a3; s32 temp_v1; u64* sp24; - UNUSED struct_8018E118_entry* temp_v0; + UNUSED TextureMap* temp_v0; temp_v1 = sMenuTextureMap[arg1].offset; sp24 = arg0->textureData; @@ -3956,12 +3948,12 @@ void func_8009A238(MenuTexture* arg0, s32 arg1) { if (var_a3 % 8) { var_a3 = ((var_a3 / 8) * 8) + 8; } - // dma_tkmk00_textures(sp24, var_a3, gMenuCompressedBuffer); - // tkmk00decode(gMenuCompressedBuffer, sTKMK00_LowResBuffer, (u8*) &gMenuTextureBuffer[temp_v1], 1); + dma_tkmk00_textures(sp24, var_a3, gMenuCompressedBuffer); + // tkmk00decode(gMenuCompressedBuffer, sTKMK00_LowResBuffer, (u8*) &sMenuTextureList[temp_v1], 1); // u8 *tex = (u8 *) LOAD_ASSET(arg0->textureData); - size_t texSize = ResourceGetTexSizeByName(arg0->textureData); - memcpy(&gMenuTextureBuffer[temp_v1], arg0->textureData, texSize); - sMenuTextureMap[arg1].textureData = arg0->textureData; + //size_t texSize = ResourceGetTexSizeByName(arg0->textureData); + replace_texture(arg1, arg0->textureData); + //sMenuTextureMap[arg1].textureData = arg0->textureData; } void func_8009A2F0(struct_8018E0E8_entry* arg0) { @@ -4188,13 +4180,12 @@ void func_8009A9FC(s32 arg0, s32 arg1, u32 arg2, s32 arg3) { s32 alpha; s32 temp_t9; u16 temp_a0; - s32 var_t1; u16* color0; u16* color1; - color0 = &gMenuTextureBuffer[sMenuTextureMap[arg0].offset]; - color1 = &gMenuTextureBuffer[sMenuTextureMap[arg1].offset]; - for (var_t1 = 0; (u32) var_t1 < arg2; var_t1++) { + color0 = LOAD_ASSET(sMenuTextureList[sMenuTextureMap[arg0].offset]); + color1 = LOAD_ASSET(sMenuTextureList[sMenuTextureMap[arg1].offset]); + for (size_t i = 0; i < arg2; i++) { temp_a0 = BSWAP16(*color0++); red = (temp_a0 & 0xF800) >> 0xB; green = (temp_a0 & 0x7C0) >> 6; @@ -4224,7 +4215,7 @@ void func_8009AB7C(s32 arg0) { s32 var_v1; u16* color; - color = &gMenuTextureBuffer[sMenuTextureMap[arg0].offset]; + color = LOAD_ASSET(sMenuTextureList[sMenuTextureMap[arg0].offset]); for (var_v1 = 0; var_v1 < 0x4B000; var_v1++) { u16 color_pixel = BSWAP16(*color); red = ((color_pixel & 0xF800) >> 0xB) * 0x4D; @@ -4256,7 +4247,7 @@ void func_8009AD78(s32 arg0, s32 arg1) { UNUSED u16 temp_a0; u16* color; - color = &gMenuTextureBuffer[sMenuTextureMap[arg0].offset]; + color = LOAD_ASSET(sMenuTextureList[sMenuTextureMap[arg0].offset]); size = sMenuTextureMap[arg0 + 1].offset - sMenuTextureMap[arg0].offset; for (var_v1 = 0; var_v1 != size; var_v1++) { u16 color_pixel = BSWAP16(*color); @@ -4273,41 +4264,49 @@ void func_8009AD78(s32 arg0, s32 arg1) { gSPInvalidateTexCache(gDisplayListHead++, sMenuTextureMap[arg0].offset); } -void convert_img_to_greyscale(s32 arg0, u32 arg1) { - u32 var_s0; +void convert_img_to_greyscale(s32 index, u32 num) { + size_t width = ResourceGetTexWidthByName(sMenuTextureList[sMenuTextureMap[index].offset]); + size_t height = ResourceGetTexHeightByName(sMenuTextureList[sMenuTextureMap[index].offset]); + u32 i; s32 red; s32 green; s32 blue; s32 alpha; - u32 temp_t9; - s32 size; + u32 result; u16* color; - f32 sp48[0x20]; + f32 sp48[32]; + + size_t size = width * height; - for (var_s0 = 0; var_s0 < 0x20; var_s0++) { - sp48[var_s0] = func_800917B0(var_s0 * 0.03125, (arg1 * 1.5 * 0.00390625) + 0.25); + for (i = 0; i < ARRAY_COUNT(sp48); i++) { + sp48[i] = func_800917B0(i * 0.03125, (num * 1.5 * 0.00390625) + 0.25); } - color = &gMenuTextureBuffer[sMenuTextureMap[arg0].offset]; - size = sMenuTextureMap[arg0 + 1].offset - sMenuTextureMap[arg0].offset; - for (var_s0 = 0; var_s0 < (u32) size; var_s0++) { + + color = (u16*)LOAD_ASSET(sMenuTextureList[sMenuTextureMap[index].offset]); + + + + for (i = 0; i < (u32) size; i++) { u16 color_pixel = BSWAP16(*color); red = ((color_pixel & 0xF800) >> 0xB) * 0x55; green = ((color_pixel & 0x7C0) >> 6) * 0x4B; blue = ((color_pixel & 0x3E) >> 1) * 0x5F; alpha = color_pixel & 0x1; - temp_t9 = red + green + blue; - temp_t9 >>= 8; - temp_t9 = sp48[temp_t9] * 32.0f; - if (temp_t9 >= 0x20) { - temp_t9 = 0x1F; + result = red + green + blue; + result >>= 8; + result = sp48[result] * 32.0f; + if (result >= 0x20) { + result = 0x1F; } - *color++ = BSWAP16((temp_t9 << 1) + (temp_t9 << 6) + (temp_t9 << 0xB) + alpha); + *color++ = BSWAP16((result << 1) + (result << 6) + (result << 0xB) + alpha); } // Invalidate texture to properly apply color manipulation - gSPInvalidateTexCache(gDisplayListHead++, sMenuTextureMap[arg0].offset); + gSPInvalidateTexCache(gDisplayListHead++, sMenuTextureMap[index].offset); } -void adjust_img_colour(s32 arg0, s32 screen_size, s32 arg2, s32 arg3, s32 arg4) { +void adjust_img_colour(s32 index, s32 screenSize, s32 r, s32 g, s32 b) { + size_t width = ResourceGetTexWidthByName(sMenuTextureList[sMenuTextureMap[index].offset]); + size_t height = ResourceGetTexHeightByName(sMenuTextureList[sMenuTextureMap[index].offset]); s32 red; s32 green; s32 blue; @@ -4316,11 +4315,14 @@ void adjust_img_colour(s32 arg0, s32 screen_size, s32 arg2, s32 arg3, s32 arg4) s32 newgreen; s32 newblue; u32 temp_t9; - s32 var_v1; u16* color; + // Overwrite the default screen size of 320 * 240 to allow widescreen textures. + screenSize = width * height; + + color = LOAD_ASSET(sMenuTextureList[sMenuTextureMap[index].offset]); - color = &gMenuTextureBuffer[sMenuTextureMap[arg0].offset]; - for (var_v1 = 0; var_v1 < screen_size; var_v1++) { + + for (size_t i = 0; i < screenSize; i++) { u16 color_pixel = BSWAP16(*color); red = ((color_pixel & 0xF800) >> 0xB) * 0x4D; green = ((color_pixel & 0x7C0) >> 6) * 0x96; @@ -4328,13 +4330,13 @@ void adjust_img_colour(s32 arg0, s32 screen_size, s32 arg2, s32 arg3, s32 arg4) alpha = (color_pixel & 0x1); temp_t9 = red + green + blue; temp_t9 = temp_t9 >> 8; - newred = ((temp_t9 * arg2) >> 8) << 0xB; - newgreen = ((temp_t9 * arg3) >> 8) << 6; - newblue = ((temp_t9 * arg4) >> 8) << 1; + newred = ((temp_t9 * r) >> 8) << 0xB; + newgreen = ((temp_t9 * g) >> 8) << 6; + newblue = ((temp_t9 * b) >> 8) << 1; *color++ = BSWAP16(newred + newgreen + newblue + alpha); } // Invalidate texture to properly apply color manipulation - gSPInvalidateTexCache(gDisplayListHead++, sMenuTextureMap[arg0].offset); + gSPInvalidateTexCache(gDisplayListHead++, sMenuTextureMap[index].offset); } u16* func_8009B8C4(u64* arg0) { @@ -4353,7 +4355,7 @@ u16* func_8009B8C4(u64* arg0) { } if (found != 0) { - return &gMenuTextureBuffer[offset]; + return sMenuTextureList[offset]; } return NULL; } @@ -4612,21 +4614,22 @@ Gfx* func_8009C434(Gfx* arg0, struct_8018DEE0_entry* arg1, s32 arg2, s32 arg3, s if (1) {} if (1) {} } + if (arg4 >= 0) { arg0 = func_80097E58(arg0, var_t1, 0, 0U, var_s0->width, var_s0->height, var_s0->dX + arg2, var_s0->dY + arg3, - (u8*) &gMenuTextureBuffer[var_t0], var_s0->width, var_s0->height, (u32) arg4); + (u8*) sMenuTextureList[var_t0], var_s0->width, var_s0->height, (u32) arg4); } else { switch (arg4) { case -1: arg0 = func_80095E10(arg0, var_t1, 0x00000400, 0x00000400, 0, 0, var_s0->width, var_s0->height, - var_s0->dX + arg2, var_s0->dY + arg3, (u8*) &gMenuTextureBuffer[var_t0], var_s0->width, + var_s0->dX + arg2, var_s0->dY + arg3, (u8*) sMenuTextureList[var_t0], var_s0->width, var_s0->height); break; case -2: arg0 = func_800963F0(arg0, var_t1, 0x00000400, 0x00000400, 0.5f, 0.5f, 0, 0, var_s0->width, var_s0->height, var_s0->dX + arg2, var_s0->dY + arg3, - (u8*) &gMenuTextureBuffer[var_t0], var_s0->width, var_s0->height); + (u8*) sMenuTextureList[var_t0], var_s0->width, var_s0->height); break; } } @@ -4776,7 +4779,7 @@ void func_8009CBE4(s32 arg0, s32 arg1, s32 arg2) { return; } D_8018E7AC[arg0] = 0; - D_8018EE0C = 0; + unref_D_8018EE0C = 0; } } @@ -4935,7 +4938,7 @@ void func_8009CE64(s32 arg0) { } else { D_8018E7AC[arg0] = 0; if (gDebugMenuSelection != 0x40) { - switch (D_8018EDE0) { /* switch 3 */ + switch (gMenuFadeType) { /* switch 3 */ case 0: /* switch 3 */ if (gMenuSelection == 8) { gMenuSelection = 0x0000000A; @@ -5033,7 +5036,6 @@ void func_8009CE64(s32 arg0) { if (gNextDemoId >= 6) { gNextDemoId = 0; } - printf("\nSELECTED!!!!!\n"); //gCupSelection = GetCupIndex(); // gCupSelectionByCourseId[gCurrentCourseId]; D_800DC540 = (s32) GetCupIndex(); @@ -5068,11 +5070,11 @@ void func_8009CE64(s32 arg0) { if (gMenuSelection >= 0xE) { gGamestateNext = 4; if (gModeSelection == 1) { - D_8018EDFB = (s8) 1; + gGhostPlayerInit = (s8) 1; } func_8009CE1C(); } - D_8018EE0C = 0; + unref_D_8018EE0C = 0; } else { switch (gDebugGotoScene) { /* switch 5; irregular */ case 1: /* switch 5 */ @@ -5086,7 +5088,7 @@ void func_8009CE64(s32 arg0) { default: /* switch 5 */ gGamestateNext = 4; if (gModeSelection == (s32) 1) { - D_8018EDFB = 1; + gGhostPlayerInit = 1; } break; } @@ -5414,32 +5416,32 @@ void func_8009E17C(u32 arg0) { void func_8009E1C0(void) { func_8009DFE0(10); - D_8018EDE0 = 0; + gMenuFadeType = 0; } void func_8009E1E4(void) { func_8009E000(10); - D_8018EDE0 = 0; + gMenuFadeType = 0; } void func_8009E208(void) { func_8009DFE0(10); - D_8018EDE0 = 1; + gMenuFadeType = 1; } void func_8009E230(void) { func_8009DFE0(10); - D_8018EDE0 = 2; + gMenuFadeType = 2; } void func_8009E258(void) { func_8009DFE0(10); - D_8018EDE0 = 3; + gMenuFadeType = 3; } void func_8009E280(void) { func_8009DFE0(10); - D_8018EDE0 = 4; + gMenuFadeType = 4; } void func_8009E2A8(s32 arg0) { @@ -5630,11 +5632,12 @@ void add_menu_item(s32 type, s32 column, s32 row, s8 priority) { load_menu_img(D_0200184C); break; case MENU_ITEM_UI_START_BACKGROUND: - load_menu_img_comp_type(gMenuTexturesBackground[has_unlocked_extra_mode()], LOAD_MENU_IMG_TKMK00_ONCE); + //load_menu_img_comp_type(gMenuTexturesBackground[has_unlocked_extra_mode()], LOAD_MENU_IMG_TKMK00_ONCE); + load_texture_reset_cache(gMenuTexturesBackground[has_unlocked_extra_mode()]->textureData); break; case MENU_ITEM_UI_LOGO_AND_COPYRIGHT: load_mario_kart_64_logo(); - sMenuTextureBufferIndex += 0x10000; + //sMenuTextureListIndex += 1; load_menu_img(seg2_copyright_1996_texture); break; case MENU_ITEM_UI_PUSH_START_BUTTON: @@ -5643,11 +5646,12 @@ void add_menu_item(s32 type, s32 column, s32 row, s8 priority) { case MAIN_MENU_BACKGROUND: case CHARACTER_SELECT_BACKGROUND: case COURSE_SELECT_BACKGROUND: - load_menu_img_comp_type(gMenuTexturesBackground[has_unlocked_extra_mode()], LOAD_MENU_IMG_TKMK00_ONCE); + load_texture_reset_cache(gMenuTexturesBackground[has_unlocked_extra_mode()]->textureData); + //load_menu_img_comp_type(gMenuTexturesBackground[has_unlocked_extra_mode()], LOAD_MENU_IMG_TKMK00_ONCE); load_menu_img_comp_type(D_02004B74, LOAD_MENU_IMG_TKMK00_ONCE); convert_img_to_greyscale(0, 0x00000019); - adjust_img_colour(0, SCREEN_WIDTH * SCREEN_HEIGHT, D_800E74E8[type - 0x23].red, - D_800E74E8[type - 0x23].green, D_800E74E8[type - 0x23].blue); + adjust_img_colour(0, SCREEN_WIDTH * SCREEN_HEIGHT, D_800E74E8[type - MAIN_MENU_BACKGROUND].red, + D_800E74E8[type - MAIN_MENU_BACKGROUND].green, D_800E74E8[type - MAIN_MENU_BACKGROUND].blue); break; case MENU_ITEM_UI_OK: var_ra->param1 = 0x00000020; @@ -6091,7 +6095,7 @@ void render_menus(MenuItem* arg0) { var_a1 = arg0->type - 0xF; if (arg0->param1 < 0x20) { temp_t9 = (arg0->param1 * 0x3A) / 64; - if (var_a1 == gMainMenuSelectionDepth) { + if (var_a1 == gMainMenuSelection) { gDisplayListHead = draw_flash_select_case_fast(gDisplayListHead, arg0->column + temp_t9, arg0->row, (arg0->column - temp_t9) + 0x39, arg0->row + 0x12); @@ -6108,7 +6112,7 @@ void render_menus(MenuItem* arg0) { case MAIN_MENU_50CC: case MAIN_MENU_100CC: case MAIN_MENU_150CC: - case MENU_ITEM_TYPE_015: + case MAIN_MENU_EXTRA_CC: case MENU_ITEM_TYPE_016: case MENU_ITEM_TYPE_017: case MAIN_MENU_TIME_TRIALS_BEGIN: @@ -6119,20 +6123,25 @@ void render_menus(MenuItem* arg0) { case MAIN_MENU_50CC: case MAIN_MENU_100CC: case MAIN_MENU_150CC: - case MENU_ITEM_TYPE_015: - if ((var_a1 != 0) && (var_a1 != 2)) { - var_v1 = -1; + case MAIN_MENU_EXTRA_CC: + switch(var_a1) { + case 0: + case 2: + break; + default: + var_v1 = -1; + break; } - var_a1 = 18; - sp9C = segmented_to_virtual_dupe(D_800E8234[arg0->type - MAIN_MENU_50CC]); + var_a1 = MAIN_MENU_50CC; + sp9C = segmented_to_virtual_dupe(D_800E8294[arg0->type - MAIN_MENU_50CC]); break; case MENU_ITEM_TYPE_016: case MENU_ITEM_TYPE_017: if (var_a1 != 2) { var_v1 = -1; } else { - var_a1 = 22; - sp9C = segmented_to_virtual_dupe(D_800E8234[arg0->type - MAIN_MENU_50CC]); + var_a1 = MENU_ITEM_TYPE_016; + sp9C = segmented_to_virtual_dupe(D_800E82A4[arg0->type - MENU_ITEM_TYPE_016]); } break; case MAIN_MENU_TIME_TRIALS_BEGIN: @@ -6140,28 +6149,29 @@ void render_menus(MenuItem* arg0) { if (var_a1 != 1) { var_v1 = -1; } else { - var_a1 = 24; - sp9C = segmented_to_virtual_dupe(D_800E8234[arg0->type - MAIN_MENU_50CC]); + var_a1 = MAIN_MENU_TIME_TRIALS_BEGIN; + sp9C = segmented_to_virtual_dupe(D_800E82AC[arg0->type - MAIN_MENU_TIME_TRIALS_BEGIN]); } break; + } // End of switch + if (var_v1 == -1) { + break; } - if (var_v1 != -1) { - if ((gMainMenuSelectionDepth >= 5) && (var_v1 == (arg0->type - var_a1))) { - if (gMainMenuSelectionDepth >= 6) { - gDisplayListHead = - draw_box_fill(gDisplayListHead, arg0->column, arg0->row, arg0->column + 0x3F, - arg0->row + 0x11, 0x000000FF, 0x000000F9, 0x000000DC, 0x000000FF); - } else { - gDisplayListHead = - draw_flash_select_case_slow(gDisplayListHead, arg0->column ^ 0, arg0->row ^ 0, - arg0->column + 0x3F, arg0->row + 0x11); - } + if ((gMainMenuSelection >= 5) && (var_v1 == (arg0->type - var_a1))) { + if (gMainMenuSelection >= 6) { + gDisplayListHead = + draw_box_fill(gDisplayListHead, arg0->column, arg0->row, arg0->column + 0x3F, + arg0->row + 0x11, 0x000000FF, 0x000000F9, 0x000000DC, 0x000000FF); } else { - gDisplayListHead = draw_box_fill(gDisplayListHead, arg0->column, arg0->row, arg0->column + 0x3F, - arg0->row + 0x11, 1, 1, 1, 0x000000FF); + gDisplayListHead = + draw_flash_select_case_slow(gDisplayListHead, arg0->column ^ 0, arg0->row ^ 0, + arg0->column + 0x3F, arg0->row + 0x11); } - gDisplayListHead = render_menu_textures(gDisplayListHead, sp9C, arg0->column, arg0->row); + } else { + gDisplayListHead = draw_box_fill(gDisplayListHead, arg0->column, arg0->row, arg0->column + 0x3F, + arg0->row + 0x11, 1, 1, 1, 0x000000FF); } + gDisplayListHead = render_menu_textures(gDisplayListHead, sp9C, arg0->column, arg0->row); break; case MENU_ITEM_TYPE_01B: func_800A10CC(arg0); @@ -6175,7 +6185,7 @@ void render_menus(MenuItem* arg0) { case CHARACTER_SELECT_MENU_4P_CURSOR: temp_a0 = arg0->type - CHARACTER_SELECT_MENU_1P_CURSOR; if (gCharacterGridSelections[temp_a0]) { - if (D_8018EDE8[temp_a0] == 0) { + if (gCharacterGridIsSelected[temp_a0] == 0) { temp_t2 = 0x000000FF; } else { temp_t2 = gGlobalTimer % 16; @@ -6250,7 +6260,7 @@ void render_menus(MenuItem* arg0) { } func_800A86E8(arg0); set_text_color(3); - print_text_mode_1(arg0->column + 8, arg0->row + 0x10, gBestTimeText[arg0->type - MENU_ITEM_TYPE_065], 0, scaleX, 0.8f); + print_text_mode_1(arg0->column + 8, arg0->row + 0x10, gBestTimeText[arg0->type - MENU_ITEM_TYPE_065], 0, scaleX, 0.8f); func_800A874C(arg0); break; case MENU_ITEM_TYPE_06E: @@ -6277,8 +6287,8 @@ void render_menus(MenuItem* arg0) { func_800A143C(arg0, var_a1); break; case MENU_ITEM_TYPE_08C: - if ((gMainMenuSelectionDepth >= MAIN_MENU_MODE_SUB_SELECT) && (var_a1 == (arg0->type - var_v1))) { - if (gMainMenuSelectionDepth >= MAIN_MENU_MODE_SUB_SELECT) { + if ((gMainMenuSelection >= MAIN_MENU_MODE_SUB_SELECT) && (var_a1 == (arg0->type - var_v1))) { + if (gMainMenuSelection >= MAIN_MENU_MODE_SUB_SELECT) { gDisplayListHead = draw_box_fill(gDisplayListHead, arg0->column, arg0->row, arg0->column + 0x3F, arg0->row + 0x11, 0x000000FF, 0x000000F9, 0x000000DC, 0x000000FF); @@ -6527,7 +6537,7 @@ void func_800A09E0(MenuItem *item) { gDPSetScissor(gDisplayListHead++, G_SC_NON_INTERLACE, 0, 0, 319, 194); for (table_row = 0; table_row < 9; table_row++) { - if (gControllerPakScrollDirection[0] == CONTROLLER_PAK_SCROLL_DIR_NONE && (table_row == 0 || table_row == 8)) { + if (gControllerPakScrollDirection == CONTROLLER_PAK_SCROLL_DIR_NONE && (table_row == 0 || table_row == 8)) { continue; } gDisplayListHead = render_menu_textures(gDisplayListHead, D_0200157C, 0x20, (table_row * 0xA) + item->row); @@ -6557,12 +6567,12 @@ void func_800A0B80(MenuItem* arg0) { gDPSetPrimColor(gDisplayListHead++, 0, 0, 0x00, 0x00, 0x32, 0xFF); for (var_s5 = 0; var_s5 < 9; var_s5++) { - if (D_800E86C4[var_s5] == 0) { + if (gControllerPakVisibleTableRows[var_s5] == 0) { continue; } temp_s1 = var_s5 * 0xA; - var_s0 = D_800E86C4[var_s5]; + var_s0 = gControllerPakVisibleTableRows[var_s5]; if (var_s0 < 0xA) { func_800A08D8(var_s0 + 0x10, 0x00000032, arg0->row + temp_s1 + 1); } else { @@ -6571,8 +6581,8 @@ void func_800A0B80(MenuItem* arg0) { func_800A08D8(0x11U, 0x0000002F, arg0->row + temp_s1 + 1); } temp_s2 = arg0->row + temp_s1 + 1; - if (pfsError[D_800E86C4[var_s5] - 1] == 0) { - temp_s4 = &pfsState[D_800E86C4[var_s5] - 1]; + if (pfsError[gControllerPakVisibleTableRows[var_s5] - 1] == 0) { + temp_s4 = &pfsState[gControllerPakVisibleTableRows[var_s5] - 1]; var_s0 = func_800A095C(temp_s4->game_name, 0x00000010, 0x0000004F, temp_s2); if (temp_s4->ext_name[0] != 0) { func_800A08D8(0x3CU, (var_s0 * 8) + 0x4F, temp_s2); @@ -6919,7 +6929,7 @@ void func_800A1DE0(MenuItem* arg0) { for (var_s1 = 0; var_s1 < 2; var_s1++) { wut = D_800E7840[var_s1]; - if (var_s1 == D_8018EDF9) { + if (var_s1 == gCourseRecordsSubMenuSelection) { var_a0 = 5; } else { var_a0 = 1; @@ -6929,7 +6939,7 @@ void func_800A1DE0(MenuItem* arg0) { } sp58.column = 0x003B; - sp58.row = (D_8018EDF9 * 0xD) + 0x66; + sp58.row = (gCourseRecordsSubMenuSelection * 0xD) + 0x66; func_800A66A8(arg0, &sp58); } @@ -8625,7 +8635,7 @@ void handle_menus_with_pri_arg(s32 priSpecial) { if (menuItem->param1 == 0x000000B4) { func_8009E000(0x00000028); func_800CA388(0x64U); - D_8018EDE0 = 0; + gMenuFadeType = 0; } if ((menuItem->param2 != 0) && (menuItem->param1 >= 3)) { menuItem->param2 = 0; @@ -8662,17 +8672,17 @@ void handle_menus_with_pri_arg(s32 priSpecial) { break; case MAIN_MENU_OPTION_GFX: case MAIN_MENU_DATA_GFX: - switch (gMainMenuSelectionDepth) { - case OPTIONS_SELECTION: - case DATA_SELECTION: - case PLAYER_NUM_SELECTION: + switch (gMainMenuSelection) { + case MAIN_MENU_OPTION: + case MAIN_MENU_DATA: + case MAIN_MENU_PLAYER_SELECT: func_800A9B9C(menuItem); break; - case GAME_MODE_SELECTION: - case GAME_MODE_CC_OR_TIME_TRIALS_OPTIONS_SELECTION: - case CONFIRM_OK_SELECTION: - case CONFIRM_OK_SELECTION_FROM_BACK_OUT: - case TIME_TRIALS_DATA_SELECTION_FROM_BACK_OUT: + case MAIN_MENU_MODE_SELECT: + case MAIN_MENU_MODE_SUB_SELECT: + case MAIN_MENU_OK_SELECT: + case MAIN_MENU_OK_SELECT_GO_BACK: + case MAIN_MENU_MODE_SUB_SELECT_GO_BACK: func_800A9C40(menuItem); break; } @@ -8685,17 +8695,17 @@ void handle_menus_with_pri_arg(s32 priSpecial) { case MENU_ITEM_UI_2P_GAME: case MENU_ITEM_UI_3P_GAME: case MENU_ITEM_UI_4P_GAME: - switch (gMainMenuSelectionDepth) { /* switch 6 */ - case OPTIONS_SELECTION: /* switch 6 */ - case DATA_SELECTION: /* switch 6 */ - case PLAYER_NUM_SELECTION: /* switch 6 */ + switch (gMainMenuSelection) { /* switch 6 */ + case MAIN_MENU_OPTION: /* switch 6 */ + case MAIN_MENU_DATA: /* switch 6 */ + case MAIN_MENU_PLAYER_SELECT: /* switch 6 */ func_800A9B9C(menuItem); break; - case GAME_MODE_SELECTION: /* switch 6 */ - case GAME_MODE_CC_OR_TIME_TRIALS_OPTIONS_SELECTION: /* switch 6 */ - case CONFIRM_OK_SELECTION: /* switch 6 */ - case CONFIRM_OK_SELECTION_FROM_BACK_OUT: /* switch 6 */ - case TIME_TRIALS_DATA_SELECTION_FROM_BACK_OUT: /* switch 6 */ + case MAIN_MENU_MODE_SELECT: /* switch 6 */ + case MAIN_MENU_MODE_SUB_SELECT: /* switch 6 */ + case MAIN_MENU_OK_SELECT: /* switch 6 */ + case MAIN_MENU_OK_SELECT_GO_BACK: /* switch 6 */ + case MAIN_MENU_MODE_SUB_SELECT_GO_BACK: /* switch 6 */ func_800A9C40(menuItem); break; } @@ -8704,7 +8714,7 @@ void handle_menus_with_pri_arg(s32 priSpecial) { case MAIN_MENU_50CC: case MAIN_MENU_100CC: case MAIN_MENU_150CC: - case MENU_ITEM_TYPE_015: + case MAIN_MENU_EXTRA_CC: case MENU_ITEM_TYPE_016: case MENU_ITEM_TYPE_017: case MAIN_MENU_TIME_TRIALS_BEGIN: @@ -8741,7 +8751,7 @@ void handle_menus_with_pri_arg(s32 priSpecial) { func_800AA69C(menuItem); break; } - switch (D_8018EDEE) { + switch (gPlayerSelectMenuSelection) { case PLAYER_SELECT_MENU_MAIN: func_800AAB90(menuItem); break; @@ -9016,8 +9026,8 @@ void func_800A8270(s32 arg0, MenuItem* arg1) { gDPSetRenderMode(gDisplayListHead++, G_RM_OPA_SURF, G_RM_OPA_SURF2); gDPSetCombineMode(gDisplayListHead++, G_CC_DECALRGBA, G_CC_DECALRGBA); if ((arg0 + 1) == gPlayerCount) { - if ((gMainMenuSelectionDepth == OPTIONS_SELECTION) || (gMainMenuSelectionDepth == DATA_SELECTION) || - (gMainMenuSelectionDepth == PLAYER_NUM_SELECTION)) { + if ((gMainMenuSelection == MAIN_MENU_OPTION) || (gMainMenuSelection == MAIN_MENU_DATA) || + (gMainMenuSelection == MAIN_MENU_PLAYER_SELECT)) { gDisplayListHead = draw_flash_select_case_slow(gDisplayListHead, var_s3, var_s0, var_s4, var_s0 + 0x35); } else { gDisplayListHead = draw_box_fill(gDisplayListHead, var_s3, var_s0, var_s4, var_s0 + 0x35, 0x000000FF, @@ -9027,8 +9037,8 @@ void func_800A8270(s32 arg0, MenuItem* arg1) { gDisplayListHead = func_80098FC8(gDisplayListHead, var_s3, var_s0, var_s4, var_s0 + 0x35); } for (var_s0 += 0x41, var_s2 = 0; var_s2 <= gPlayerModeSelection[arg0]; var_s2++, var_s0 += 0x12) { - if ((var_s2 == gGameModeMenuColumn[arg0]) && ((arg0 + 1) == gPlayerCount) && (gMainMenuSelectionDepth >= 4)) { - if (gMainMenuSelectionDepth == GAME_MODE_SELECTION) { + if ((var_s2 == gGameModeMenuColumn[arg0]) && ((arg0 + 1) == gPlayerCount) && (gMainMenuSelection >= 4)) { + if (gMainMenuSelection == MAIN_MENU_MODE_SELECT) { gDisplayListHead = draw_flash_select_case_slow(gDisplayListHead, var_s3, var_s0, var_s4, var_s0 + 0x11); } else { @@ -9051,23 +9061,23 @@ void func_800A8564(MenuItem* arg0) { s32 temp_t0; var_a1 = 0; - switch (arg0->type) { /* irregular */ + switch (arg0->type) { case 0xF: var_a0 = D_0200487C; - if ((gMainMenuSelectionDepth == CONFIRM_OK_SELECTION) || - (gMainMenuSelectionDepth == CONFIRM_OK_SELECTION_FROM_BACK_OUT)) { + if ((gMainMenuSelection == MAIN_MENU_OK_SELECT) || + (gMainMenuSelection == MAIN_MENU_OK_SELECT_GO_BACK)) { var_a1 = 1; } break; case 0x33: var_a0 = D_02004B74; - if ((D_8018EDEE == 2) || (D_8018EDEE == 3)) { + if ((gPlayerSelectMenuSelection == PLAYER_SELECT_MENU_OK) || (gPlayerSelectMenuSelection == PLAYER_SELECT_MENU_OK_GO_BACK)) { var_a1 = 1; } break; case 0x5D: var_a0 = D_02004E80; - if (gSubMenuSelection == 3) { + if (gSubMenuSelection == SUB_MENU_MAP_SELECT_OK) { var_a1 = 1; } break; @@ -9132,7 +9142,7 @@ void func_800A890C(s32 arg0, MenuItem* arg1) { gDPSetRenderMode(gDisplayListHead++, G_RM_OPA_SURF, G_RM_OPA_SURF2); gDPSetCombineMode(gDisplayListHead++, G_CC_DECALRGBA, G_CC_DECALRGBA); if (arg0 == GetCupIndex()) { - if (gSubMenuSelection == 1) { + if (gSubMenuSelection == SUB_MENU_MAP_SELECT_CUP) { gDisplayListHead = draw_flash_select_case_slow(gDisplayListHead, temp_t1 + temp_t7, temp_a2, (temp_t1 - temp_t7) + 64, temp_a2 + 39); } else { @@ -9157,8 +9167,8 @@ void func_800A8A98(MenuItem* arg0) { gDPSetRenderMode(gDisplayListHead++, G_RM_OPA_SURF, G_RM_OPA_SURF2); gDPSetCombineMode(gDisplayListHead++, G_CC_DECALRGBA, G_CC_DECALRGBA); for (someIndex = 0; someIndex < GetCupSize(); someIndex++) { - if ((someIndex == GetCupCursorPosition()) && (gSubMenuSelection >= 2) && (gModeSelection != GRAND_PRIX)) { - if ((gSubMenuSelection == 2) || (gSubMenuSelection == 4)) { + if ((someIndex == GetCupCursorPosition()) && (gSubMenuSelection > SUB_MENU_MAP_SELECT_CUP) && (gModeSelection != GRAND_PRIX)) { + if ((gSubMenuSelection == SUB_MENU_MAP_SELECT_COURSE) || (gSubMenuSelection == SUB_MENU_MAP_SELECT_BATTLE_COURSE)) { gDisplayListHead = draw_flash_select_case_slow( gDisplayListHead, D_800E7208[someIndex][0].column + temp_s2, D_800E7208[someIndex][0].row + temp_s3, D_800E7208[someIndex][1].column + temp_s2, D_800E7208[someIndex][1].row + temp_s3); @@ -9189,7 +9199,7 @@ void func_800A8CA4(MenuItem* arg0) { gDPSetRenderMode(gDisplayListHead++, G_RM_OPA_SURF, G_RM_OPA_SURF2); gDPSetCombineMode(gDisplayListHead++, G_CC_DECALRGBA, G_CC_DECALRGBA); if (gModeSelection == GRAND_PRIX) { - if (gSubMenuSelection != 3) { + if (gSubMenuSelection != SUB_MENU_MAP_SELECT_OK) { for (var_s0 = 0; var_s0 < 4; var_s0++) { // Wut? if ((var_s0 != (temp_v0->param1 % 4)) != 0) { @@ -9227,7 +9237,7 @@ void func_800A8F48(UNUSED MenuItem* arg0) { s32 var_s1; switch (gSubMenuSelection) { /* irregular */ - case 1: + case SUB_MENU_MAP_SELECT_CUP: for (var_s1 = 0; var_s1 < 4; var_s1++) { if (func_800B639C((GetCupIndex() * 4) + var_s1) >= 0) { temp_v0 = &D_800E7168[var_s1]; @@ -9241,7 +9251,7 @@ void func_800A8F48(UNUSED MenuItem* arg0) { } } break; - case 2: + case SUB_MENU_MAP_SELECT_COURSE: default: if (func_800B639C((GetCupIndex() * 4) + GetCupCursorPosition()) >= 0) { gDisplayListHead = func_80098FC8(gDisplayListHead, 0x00000057, 0x00000070, 0x00000096, 0x00000081); @@ -9470,24 +9480,24 @@ void func_800A9710(MenuItem* arg0) { void func_800A97BC(MenuItem* arg0) { s32 i; - switch (*gControllerPakScrollDirection) { + switch (gControllerPakScrollDirection) { case 1: arg0->row -= 2; if (arg0->row < 0x60) { arg0->row = 0x69; - *gControllerPakScrollDirection = 0; + gControllerPakScrollDirection = 0; for (i = 0; i < 8; i++) { if (i < 7) { - D_800E86C4[i] = D_800E86C4[i + 1]; + gControllerPakVisibleTableRows[i] = gControllerPakVisibleTableRows[i + 1]; } else { - if ((D_800E86C4[i - 1] == 0x10) || (D_800E86C4[i - 1] == 0)) { - D_800E86C4[i] = 0; + if ((gControllerPakVisibleTableRows[i - 1] == 0x10) || (gControllerPakVisibleTableRows[i - 1] == 0)) { + gControllerPakVisibleTableRows[i] = 0; } else { - D_800E86C4[i] = D_800E86C4[i - 1] + 1; + gControllerPakVisibleTableRows[i] = gControllerPakVisibleTableRows[i - 1] + 1; } } } - D_800E86C4[0] = D_800E86C4[8] = 0; + gControllerPakVisibleTableRows[0] = gControllerPakVisibleTableRows[8] = 0; } break; @@ -9495,22 +9505,22 @@ void func_800A97BC(MenuItem* arg0) { arg0->row += 2; if (arg0->row >= 0x73) { arg0->row = 0x69; - *gControllerPakScrollDirection = 0; + gControllerPakScrollDirection = 0; for (i = 8; i > 0; i--) { if (i > 1) { - D_800E86C4[i] = D_800E86C4[i - 1]; + gControllerPakVisibleTableRows[i] = gControllerPakVisibleTableRows[i - 1]; } else { - if ((D_800E86C4[i + 1] == 1) || (D_800E86C4[i + 1] == 0)) { - D_800E86C4[i] = 0; + if ((gControllerPakVisibleTableRows[i + 1] == 1) || (gControllerPakVisibleTableRows[i + 1] == 0)) { + gControllerPakVisibleTableRows[i] = 0; } else { - D_800E86C4[i] = D_800E86C4[i + 1] - 1; + gControllerPakVisibleTableRows[i] = gControllerPakVisibleTableRows[i + 1] - 1; } } } - D_800E86C4[0] = D_800E86C4[8] = 0; + gControllerPakVisibleTableRows[0] = gControllerPakVisibleTableRows[8] = 0; break; default: - *gControllerPakScrollDirection = 0; + gControllerPakScrollDirection = 0; break; } } @@ -9532,13 +9542,13 @@ void update_ok_menu_item(MenuItem* arg0) { var_v0 = sp4; // wut? break; case MENU_ITEM_UI_OK: - var_v0 = D_800F0CA0[gMainMenuSelectionDepth - 1]; + var_v0 = D_800F0CA0[gMainMenuSelection - 1]; break; case COURSE_SELECT_OK: var_v0 = D_800F0CA0[gSubMenuSelection + 11]; break; case CHARACTER_SELECT_MENU_OK: - var_v0 = D_800F0CA0[D_8018EDEE + 7]; + var_v0 = D_800F0CA0[gPlayerSelectMenuSelection + 7]; break; } switch (var_v0) { /* switch 1; irregular */ @@ -9615,8 +9625,8 @@ void func_800A9C40(MenuItem* arg0) { arg0->state = 1; case 1: func_800AA280(arg0); - if ((gMainMenuSelectionDepth == CONFIRM_OK_SELECTION_FROM_BACK_OUT) || - (gMainMenuSelectionDepth == TIME_TRIALS_DATA_SELECTION_FROM_BACK_OUT)) { + if ((gMainMenuSelection == MAIN_MENU_OK_SELECT_GO_BACK) || + (gMainMenuSelection == MAIN_MENU_MODE_SUB_SELECT_GO_BACK)) { arg0->param1 = 0x00000020; } else { if (arg0->param1 < 0x20) { @@ -9649,8 +9659,8 @@ void func_800A9D5C(MenuItem* arg0) { switch (arg0->state) { case 2: - if ((gMainMenuSelectionDepth == CONFIRM_OK_SELECTION_FROM_BACK_OUT) || - (gMainMenuSelectionDepth == TIME_TRIALS_DATA_SELECTION_FROM_BACK_OUT)) { + if ((gMainMenuSelection == MAIN_MENU_OK_SELECT_GO_BACK) || + (gMainMenuSelection == MAIN_MENU_MODE_SUB_SELECT_GO_BACK)) { arg0->column = 0x00000080; arg0->row = 0x0000003E; } else { @@ -9710,10 +9720,10 @@ void func_800A9E58(MenuItem* arg0) { arg0->visible = 0; } else { arg0->param2 = gGameModeMenuColumn[gPlayerCount - 1]; - switch (gMainMenuSelectionDepth) { /* switch 2 */ - case GAME_MODE_SELECTION: /* switch 2 */ - case GAME_MODE_CC_OR_TIME_TRIALS_OPTIONS_SELECTION: /* switch 2 */ - case CONFIRM_OK_SELECTION: /* switch 2 */ + switch (gMainMenuSelection) { /* switch 2 */ + case MAIN_MENU_MODE_SELECT: /* switch 2 */ + case MAIN_MENU_MODE_SUB_SELECT: /* switch 2 */ + case MAIN_MENU_OK_SELECT: /* switch 2 */ arg0->visible = 1; temp_v0 = get_menu_item_player_count(); arg0->column = temp_v0->column; @@ -9721,8 +9731,8 @@ void func_800A9E58(MenuItem* arg0) { arg0->param1 = 0; arg0->state = 1; break; - case CONFIRM_OK_SELECTION_FROM_BACK_OUT: /* switch 2 */ - case TIME_TRIALS_DATA_SELECTION_FROM_BACK_OUT: /* switch 2 */ + case MAIN_MENU_OK_SELECT_GO_BACK: /* switch 2 */ + case MAIN_MENU_MODE_SUB_SELECT_GO_BACK: /* switch 2 */ temp_v0 = get_menu_item_player_count(); temp_v1_2 = &D_800E70E8[arg0->type - sp24]; arg0->column = temp_v0->column + temp_v1_2->column; @@ -9738,12 +9748,12 @@ void func_800A9E58(MenuItem* arg0) { } break; case 1: /* switch 5 */ - switch (gMainMenuSelectionDepth) { /* switch 3 */ - case GAME_MODE_SELECTION: /* switch 3 */ - case GAME_MODE_CC_OR_TIME_TRIALS_OPTIONS_SELECTION: /* switch 3 */ - case CONFIRM_OK_SELECTION: /* switch 3 */ - case CONFIRM_OK_SELECTION_FROM_BACK_OUT: /* switch 3 */ - case TIME_TRIALS_DATA_SELECTION_FROM_BACK_OUT: /* switch 3 */ + switch (gMainMenuSelection) { /* switch 3 */ + case MAIN_MENU_MODE_SELECT: /* switch 3 */ + case MAIN_MENU_MODE_SUB_SELECT: /* switch 3 */ + case MAIN_MENU_OK_SELECT: /* switch 3 */ + case MAIN_MENU_OK_SELECT_GO_BACK: /* switch 3 */ + case MAIN_MENU_MODE_SUB_SELECT_GO_BACK: /* switch 3 */ if ((temp_a1 != sp20) && (temp_a1 != sp1C)) { arg0->visible = 0; arg0->state = 0; @@ -9769,12 +9779,12 @@ void func_800A9E58(MenuItem* arg0) { } break; case 2: /* switch 5 */ - switch (gMainMenuSelectionDepth) { /* switch 4 */ - case GAME_MODE_SELECTION: /* switch 4 */ - case GAME_MODE_CC_OR_TIME_TRIALS_OPTIONS_SELECTION: /* switch 4 */ - case CONFIRM_OK_SELECTION: /* switch 4 */ - case CONFIRM_OK_SELECTION_FROM_BACK_OUT: /* switch 4 */ - case TIME_TRIALS_DATA_SELECTION_FROM_BACK_OUT: /* switch 4 */ + switch (gMainMenuSelection) { /* switch 4 */ + case MAIN_MENU_MODE_SELECT: /* switch 4 */ + case MAIN_MENU_MODE_SUB_SELECT: /* switch 4 */ + case MAIN_MENU_OK_SELECT: /* switch 4 */ + case MAIN_MENU_OK_SELECT_GO_BACK: /* switch 4 */ + case MAIN_MENU_MODE_SUB_SELECT_GO_BACK: /* switch 4 */ if ((temp_a1 != sp20) && (temp_a1 != sp1C)) { arg0->visible = 0; arg0->state = 0; @@ -9804,8 +9814,8 @@ void func_800AA280(MenuItem* arg0) { Unk_D_800E70A0* temp_v0; temp_v0 = &D_800E70A0[arg0->type - 0xA]; - if ((gMainMenuSelectionDepth == CONFIRM_OK_SELECTION_FROM_BACK_OUT) || - (gMainMenuSelectionDepth == TIME_TRIALS_DATA_SELECTION_FROM_BACK_OUT)) { + if ((gMainMenuSelection == MAIN_MENU_OK_SELECT_GO_BACK) || + (gMainMenuSelection == MAIN_MENU_MODE_SUB_SELECT_GO_BACK)) { arg0->column = temp_v0->column; arg0->row = temp_v0->row; } else { @@ -9818,17 +9828,17 @@ void func_800AA2EC(MenuItem* arg0) { s32 var_t1; var_t1 = 0; - switch (gMainMenuSelectionDepth) { - case OPTIONS_SELECTION: - case DATA_SELECTION: - case PLAYER_NUM_SELECTION: - case GAME_MODE_SELECTION: + switch (gMainMenuSelection) { + case MAIN_MENU_OPTION: + case MAIN_MENU_DATA: + case MAIN_MENU_PLAYER_SELECT: + case MAIN_MENU_MODE_SELECT: arg0->state = 0; break; - case GAME_MODE_CC_OR_TIME_TRIALS_OPTIONS_SELECTION: - case CONFIRM_OK_SELECTION: - case CONFIRM_OK_SELECTION_FROM_BACK_OUT: - case TIME_TRIALS_DATA_SELECTION_FROM_BACK_OUT: + case MAIN_MENU_MODE_SUB_SELECT: + case MAIN_MENU_OK_SELECT: + case MAIN_MENU_OK_SELECT_GO_BACK: + case MAIN_MENU_MODE_SUB_SELECT_GO_BACK: if (arg0->state != 0) { break; } @@ -9950,7 +9960,7 @@ void func_800AA69C(MenuItem* arg0) { } switch (arg0->subState) { case 0: - if ((D_8018EDE8[temp_v0] != 0) && (var_a0 != 0)) { + if ((gCharacterGridIsSelected[temp_v0] != 0) && (var_a0 != 0)) { arg0->subState = 1; func_8009A594(arg0->D_8018DEE0_index, 0, segmented_to_virtual_dupe_2(gCharacterCelebrateAnimation[temp_a0])); @@ -9971,7 +9981,7 @@ void func_800AA69C(MenuItem* arg0) { if (D_8018DEE0[arg0->D_8018DEE0_index].sequenceIndex >= D_800E8440[temp_a0]) { arg0->subState = 2; func_8009A594(arg0->D_8018DEE0_index, 0, segmented_to_virtual_dupe_2(D_800E83A0[temp_a0])); - } else if ((D_8018EDE8[temp_v0] == 0) && (var_a0 != 0)) { + } else if ((gCharacterGridIsSelected[temp_v0] == 0) && (var_a0 != 0)) { arg0->subState = 3; func_8009A594(arg0->D_8018DEE0_index, D_800E8460[temp_a0] - D_8018DEE0[arg0->D_8018DEE0_index].sequenceIndex, @@ -9979,7 +9989,7 @@ void func_800AA69C(MenuItem* arg0) { } break; case 2: - if ((D_8018EDE8[temp_v0] == 0) && (var_a0 != 0)) { + if ((gCharacterGridIsSelected[temp_v0] == 0) && (var_a0 != 0)) { arg0->subState = 3; func_8009A594(arg0->D_8018DEE0_index, 0, segmented_to_virtual_dupe_2(gCharacterDeselectAnimation[temp_a0])); @@ -9989,7 +9999,7 @@ void func_800AA69C(MenuItem* arg0) { if (D_8018DEE0[arg0->D_8018DEE0_index].sequenceIndex >= D_800E8460[temp_a0]) { arg0->subState = 0; func_8009A594(arg0->D_8018DEE0_index, 0, segmented_to_virtual_dupe_2(D_800E8360[temp_a0])); - } else if ((D_8018EDE8[temp_v0] != 0) && (var_a0 != 0)) { + } else if ((gCharacterGridIsSelected[temp_v0] != 0) && (var_a0 != 0)) { arg0->subState = 1; func_8009A594(arg0->D_8018DEE0_index, D_800E8460[temp_a0] - D_8018DEE0[arg0->D_8018DEE0_index].sequenceIndex, @@ -9998,7 +10008,7 @@ void func_800AA69C(MenuItem* arg0) { break; case 4: case 5: - if ((D_8018EDE8[temp_v0] != 0) && (var_a0 != 0)) { + if ((gCharacterGridIsSelected[temp_v0] != 0) && (var_a0 != 0)) { arg0->subState = 1; func_8009A594(arg0->D_8018DEE0_index, 0, segmented_to_virtual_dupe_2(gCharacterCelebrateAnimation[temp_a0])); @@ -10025,7 +10035,7 @@ void func_800AAA9C(MenuItem* arg0) { arg0->state = 1; /* fallthrough */ case 1: - if (D_8018EDEE == 3) { + if (gPlayerSelectMenuSelection == 3) { arg0->param1 = 0x00000020; } else { if (arg0->param1 < 0x20) { @@ -10095,7 +10105,7 @@ void func_800AAC18(MenuItem* arg0) { temp_a1 = arg0->type - 0x2B; switch (arg0->state) { case 0: - if (D_8018EDEE == 3) { + if (gPlayerSelectMenuSelection == 3) { temp_v0 = func_800AAFCC(temp_a1); if (temp_v0 >= 0) { var_t0 = &D_800E7188[(gScreenModeSelection * 4) + temp_v0]; @@ -11015,7 +11025,7 @@ void func_800ACA14(MenuItem* arg0) { break; case 11: case 12: - if (func_800B4520()) { + if (is_screen_being_faded()) { break; } @@ -11090,7 +11100,7 @@ void func_800ACC50(MenuItem* arg0) { case 11: case 12: case 13: - if (func_800B4520() == 0) { + if (is_screen_being_faded() == 0) { if ((gControllerFive->buttonPressed | gControllerFive->stickPressed) & 0x800) { if (arg0->state >= 0xB) { arg0->state--; @@ -11283,7 +11293,7 @@ void func_800AD2E8(MenuItem* arg0) { case 8: /* switch 3 */ case 9: /* switch 3 */ case 10: /* switch 3 */ - if (func_800B4520() == 0) { + if (is_screen_being_faded() == 0) { if ((gControllerOne->buttonPressed | gControllerOne->stickPressed) & 0x800) { if (arg0->state >= 6) { arg0->state--; @@ -11609,7 +11619,7 @@ void func_800ADF48(MenuItem* arg0) { case 42: case 43: case 44: - if (func_800B4520() == 0) { + if (is_screen_being_faded() == 0) { controller = &gControllers[gIsGamePaused - 1]; if ((controller->buttonPressed | controller->stickPressed) & 0x800) { if (D_800F0B50[gModeSelection] < arg0->state) { @@ -11697,7 +11707,7 @@ void func_800AE218(MenuItem* arg0) { case 14: case 15: case 16: - if (func_800B4520() == 0) { + if (is_screen_being_faded() == 0) { if ((gControllerOne->buttonPressed | gControllerOne->stickPressed) & 0x800) { if (arg0->state >= 0xC) { arg0->state--; diff --git a/src/menu_items.h b/src/menu_items.h index f133a6542..b7dadd5fd 100644 --- a/src/menu_items.h +++ b/src/menu_items.h @@ -67,12 +67,12 @@ typedef struct { /* 0x00 */ u64* textureData; // This should be interpreted as a segmented address /** * Its hard to tell what exactly what this is meant to be, - * but it appears to be used as some sort of offset/index from the address stored in gMenuTextureBuffer. + * but it appears to be used as some sort of offset/index from the address stored in sMenuTextureList. * This value is (roughly) the sum of (width * height) of the * textures in all the previous entries in sMenuTextureMap */ /* 0x04 */ s32 offset; -} struct_8018E118_entry; // size = 0x08 +} TextureMap; // size = 0x08 typedef struct { /* 0x00 */ MenuTexture* textures; @@ -133,7 +133,7 @@ enum MENU_ITEM_TYPE { MAIN_MENU_50CC, MAIN_MENU_100CC, MAIN_MENU_150CC, - MENU_ITEM_TYPE_015, + MAIN_MENU_EXTRA_CC, MENU_ITEM_TYPE_016, MENU_ITEM_TYPE_017, MAIN_MENU_TIME_TRIALS_BEGIN, @@ -416,7 +416,7 @@ Gfx* draw_box_wide(Gfx*, s32, s32, s32, s32, u32, u32, u32, u32); Gfx* func_80098FC8(Gfx*, s32, s32, s32, s32); void dma_compressed_mio0_texture_segA(u64*, size_t, void*); void dma_tkmk00_textures(u64*, size_t, void*); -void func_80099110(void); +void clear_menu_textures(void); void load_menu_img(MenuTexture*); void* segmented_to_virtual_dupe(const void*); void* segmented_to_virtual_dupe_2(const void*); @@ -655,13 +655,20 @@ void tkmk00decode(u8*, u8*, u8*, s32); #define D_8018E768_SIZE 0x08 #define D_8018E7E8_SIZE 0x05 #define D_8018E810_SIZE 0x05 +#define MENU_TEXTURE_BUFFER_MAX 500 /* This is where I'd put my static data, if I had any */ extern s32 D_800DDB24; extern s16 D_80164478[]; -extern u16* gMenuTextureBuffer; +/** + * Old name: sMenuTextureBuffer + * This array has been modified. Instead of holding a buffer of texture data + * It now holds a list of pointers to asset strings. + * use `load_texture()` and `replace_texture()` to add textures to the list for rendering. + */ +extern const char* sMenuTextureList[MENU_TEXTURE_BUFFER_MAX]; extern u8* gMenuCompressedBuffer; extern u8* sTKMK00_LowResBuffer; extern u8* sGPPointsCopy; @@ -674,8 +681,8 @@ extern MenuItem gMenuItems[MENU_ITEMS_MAX]; extern struct_8018DEE0_entry D_8018DEE0[D_8018DEE0_SIZE]; extern struct_8018E060_entry D_8018E060[]; extern struct_8018E0E8_entry D_8018E0E8[D_8018E0E8_SIZE]; -extern s32 sMenuTextureBufferIndex; -extern struct_8018E118_entry sMenuTextureMap[TEXTURE_MAP_MAX]; +extern s32 sMenuTextureListIndex; // Old name: sMenuTextureBufferIndex, index into sMenuTextureList +extern TextureMap sMenuTextureMap[TEXTURE_MAP_MAX]; extern s32 sMenuTextureEntries; extern Gfx* sGfxPtr; extern s32 gNumD_8018E768Entries; diff --git a/src/menus.c b/src/menus.c index 71837b501..316ae8178 100644 --- a/src/menus.c +++ b/src/menus.c @@ -23,76 +23,86 @@ /** BSS **/ s32 gIntroModelZEye; -f32 gIntroModelScale; +f32 gIntroModelScale; // XYZ scale on checkerboard flag, Z scale on intro logo f32 gIntroModelRotX; f32 gIntroModelRotY; f32 gIntroModelRotZ; f32 gIntroModelPosX; f32 gIntroModelPosY; f32 gIntroModelPosZ; -s32 D_8018EDE0; -s8 gCharacterGridSelections[4]; // map from player id to current grid position -s8 D_8018EDE8[4]; // map player id to isCharSelected on CSS -s8 gSubMenuSelection; -s8 gMainMenuSelectionDepth; -s8 D_8018EDEE; // grid screen state? +s32 gMenuFadeType; +s8 gCharacterGridSelections[4]; // Map from each player to current grid position (1-4 top, 5-8 bottom) +bool gCharacterGridIsSelected[4]; // Sets true if a character is selected for each player +s8 gSubMenuSelection; // Map Select states, Options and Ghost Data text selection +s8 gMainMenuSelection; +s8 gPlayerSelectMenuSelection; // grid screen state? s8 gDebugMenuSelection; s8 gControllerPakMenuSelection; -s8 D_8018EDF1; +s8 gScreenModeListIndex; // 0-4 index, selects a screen mode in sScreenModePlayerTable u8 gSoundMode; -s8 gPlayerCount; // main menu row id? but it is also the number of players define -s8 gVersusResultCursorSelection; -s8 gTimeTrialsResultCursorSelection; -s8 gBattleResultCursorSelection; +s8 gPlayerCount; +s8 gVersusResultCursorSelection; // 4 options indexed (10-13), gets set when selecting an option +s8 gTimeTrialsResultCursorSelection; // 5 options indexed (5-9), gets set when selecting an option (excluding Save Ghost) +s8 gBattleResultCursorSelection; // 4 options indexed (10-13), gets set when selecting an option s8 gTimeTrialDataCourseIndex; -s8 gCourseRecordsMenuSelection; -s8 D_8018EDF9; +s8 gCourseRecordsMenuSelection; // Used for selecting an option in course record data +s8 gCourseRecordsSubMenuSelection; // Used for erase records and ghosts (Quit - Erase) s8 gDebugGotoScene; -s8 D_8018EDFB; -s8 D_8018EDFC; +bool gGhostPlayerInit; +bool gCourseMapInit; s32 gMenuTimingCounter; s32 gMenuDelayTimer; -s8 gDemoUseController; +s8 gDemoUseController; // Sets true alongside gDemoMode, controller related s8 gCupSelection; -s8 D_8018EE0A; +s8 sTempCupSelection; // Same as gCupSelection but it's only set in map select, not referenced s8 gCourseIndexInCup; -s8 D_8018EE0C; -struct_8018EE10_entry D_8018EE10[2]; +s8 unref_D_8018EE0C; // Set to 0 but never referenced /** Data **/ s32 gMenuSelection = LOGO_INTRO_MENU; -s32 gFadeModeSelection = 0; +s32 gFadeModeSelection = FADE_MODE_NONE; s8 gCharacterSelections[4] = { MARIO, LUIGI, YOSHI, TOAD }; -// gGameModeRowSelectionForNumPlayers is (gGameModeMenuColumn - 1) -// gGameModeSubMenuRowSelectionForNumPlayers (gGameModeMenuColumn + 1) - -// the current row selected in column i on main menu +// The current row selected in the mode column for each player indexed +// 0-1 1p / 0-2 2p´/ 0-1 3p / 0-1 4p s8 gGameModeMenuColumn[4] = { 0, 0, 0, 0 }; + // For Grand Prix and Versus, this will be the CC mode selected. For Time Trials, it will // be whether 'Begin' or 'Data' is selected. Not used for Battle. // indexed as [column][row] s8 gGameModeSubMenuColumn[4][3] = { { 0, 0, 0 }, { 0, 0, 0 }, { 0, 0, 0 }, { 0, 0, 0 } }; s8 gNextDemoId = 0; -s8 gControllerPakSelectedTableRow = 0; -s8 D_800E86C4[12] = { 0, 0, 1, 2, 3, 4, 5, 6, 0, 0, 0, 0 }; -s8 gControllerPakScrollDirection[16] = { 0 }; // this doesn't make a lot of sense... -s8 unref_800E86E0[4] = { 0, 0, 0, 1 }; - -u32 sVIGammaOffDitherOn = OS_VI_GAMMA_OFF | OS_VI_DITHER_FILTER_ON; - -// Used to set gScreenModeSelection; might be smaller; could be function static data -const s8 D_800F2B50[] = { 0, 1, 2, 3, 3 }; +s8 gControllerPakSelectedTableRow = 0; // 0-4 index, value of the current visible row select + +// Numbers starting from the second 0 to number 6 get altered +// as you move up or down the page table of content (min value is 0, max value is 16 +s8 gControllerPakVisibleTableRows[12] = { 0, 0, 1, 2, 3, 4, 5, 6, 0, 0, 0, 0 }; +s8 gControllerPakScrollDirection = CONTROLLER_PAK_SCROLL_DIR_NONE; // 1 is down, 2 is up +s8 unref_D_800E86D4[12] = { 0 }; +s8 unref_D_800E86E0[4] = { 0, 0, 0, 1 }; + +u32 sVIGammaOffDitherOn = (OS_VI_GAMMA_OFF | OS_VI_DITHER_FILTER_ON); + +/** Rodata **/ + +// Sets the actual screen mode based on values set in sScreenModePlayerCount +const s8 sScreenModePlayerTable[] = { + SCREEN_MODE_1P, + SCREEN_MODE_2P_SPLITSCREEN_HORIZONTAL, + SCREEN_MODE_2P_SPLITSCREEN_VERTICAL, + SCREEN_MODE_3P_4P_SPLITSCREEN, + SCREEN_MODE_3P_4P_SPLITSCREEN +}; -// Set to gPlayerCount, then that sets gPlayerCountSelection1 -const s8 D_800F2B58[] = { 1, 2, 2, 3, 4 }; +// Sets how many players can load on each screen mode set in sScreenModePlayerTable +const s8 sScreenModePlayerCount[] = { 1, 2, 2, 3, 4 }; // Set indexed slots numbers for one-two-three-four mode selection const s8 gPlayerModeSelection[] = { 1, 2, 1, 1 }; // Limit for each index column in one-two-three-four mode selection -const s8 gGameModePlayerColumnDefault[][3] = { +const s8 sGameModePlayerColumnDefault[][3] = { { 2, 1, 0 }, // 1p (GP options, TT options, ...) { 2, 2, 0 }, // 2p (GP options, VS options, Battle) { 2, 0, 0 }, // 3p (VS options, Battle, ...) @@ -101,7 +111,7 @@ const s8 gGameModePlayerColumnDefault[][3] = { // Limit for each index column in one-two-three-four mode selection // for extra mode (mirror mode), hence the extra value (3 instead of 2) -const s8 gGameModePlayerColumnExtra[][3] = { +const s8 sGameModePlayerColumnExtra[][3] = { { 3, 1, 0 }, // 1p (GP options, TT options, ...) { 3, 3, 0 }, // 2p (GP options, VS options, Battle) { 3, 0, 0 }, // 3p (VS options, Battle, ...) @@ -116,8 +126,9 @@ const s32 gGameModePlayerSelection[][3] = { { VERSUS, BATTLE, 0x00000000 }, // 4p game modes }; -// map from character grid position id to character id -const s8 D_800F2BAC[] = { +// Map from character grid position id to character id +// Note: changing order doesn't affect graphics, only the selection +const s8 sCharacterGridOrder[] = { MARIO, LUIGI, PEACH, TOAD, YOSHI, DK, WARIO, BOWSER, }; @@ -134,10 +145,13 @@ const s16 gCupCourseOrder[5][4] = { { COURSE_BIG_DONUT, COURSE_BLOCK_FORT, COURSE_DOUBLE_DECK, COURSE_SKYSCRAPER }, }; -const s8 D_800F2BDC[4] = { 1, 0, 0, 0 }; -const s8 D_800F2BE0[4] = { 0, 1, 3, 4 }; +const s8 unref_800F2BDC[4] = { 1, 0, 0, 0 }; + +// Uses player count to set gScreenModeListIndex, the latter variable then selects a mode +// from sScreenModePlayerTable, note the 2 is not set since that's for vertical 2p screen +const s8 sScreenModeIdxFromPlayerMode[4] = { 0, 1, 3, 4 }; -const union GameModePack gSoundMenuPack = { { SOUND_STEREO, SOUND_HEADPHONES, SOUND_UNUSED, SOUND_MONO } }; +const union GameModePack sSoundMenuPack = { { SOUND_STEREO, SOUND_HEADPHONES, SOUND_UNUSED, SOUND_MONO } }; /**************************/ @@ -147,11 +161,10 @@ const union GameModePack gSoundMenuPack = { { SOUND_STEREO, SOUND_HEADPHONES, SO void update_menus(void) { u16 controllerIdx; - if (gFadeModeSelection == 0) { + if (gFadeModeSelection == FADE_MODE_NONE) { for (controllerIdx = 0; controllerIdx < 4; controllerIdx++) { - // Debug, quick jump through menus using the start button. - if ((func_800B4520() == 0) && (gEnableDebugMode) && + if ((is_screen_being_faded() == 0) && (gEnableDebugMode) && ((gControllers[controllerIdx].buttonPressed & START_BUTTON) != 0)) { // this is certainly a way to write these... switch (gMenuSelection) { @@ -212,13 +225,15 @@ void update_menus(void) { } } -// navigation of the options menu -void options_menu_act(struct Controller* controller, u16 arg1) { +/** + * Navigation of the options menu + */ +void options_menu_act(struct Controller* controller, u16 controllerIdx) { u16 btnAndStick; // sp3E MenuItem* sp38; s32 res; struct_8018EE10_entry* sp30; - bool sp2C; // cursorWasMoved or communicateStoredAction + bool tempVar; // cursorWasMoved or communicateStoredAction UNUSED u32 pad; btnAndStick = (controller->buttonPressed | controller->stickPressed); @@ -227,34 +242,34 @@ void options_menu_act(struct Controller* controller, u16 arg1) { btnAndStick |= A_BUTTON; } - if (!func_800B4520()) { + if (!is_screen_being_faded()) { sp38 = find_menu_items_dupe(0xF0); sp30 = (struct_8018EE10_entry*) gSomeDLBuffer; switch (gSubMenuSelection) { - case 0x15: - case 0x16: - case 0x17: - case 0x18: { - sp2C = false; - if ((btnAndStick & D_JPAD) && (gSubMenuSelection < 0x18)) { + case SUB_MENU_OPTION_RETURN_GAME_SELECT: + case SUB_MENU_OPTION_SOUND_MODE: + case SUB_MENU_OPTION_COPY_CONTROLLER_PAK: + case SUB_MENU_OPTION_ERASE_ALL_DATA: { + tempVar = false; + if ((btnAndStick & D_JPAD) && (gSubMenuSelection < SUB_MENU_OPTION_MAX)) { gSubMenuSelection += 1; play_sound2(SOUND_MENU_CURSOR_MOVE); if (sp38->paramf < 4.2) { sp38->paramf += 4.0; } sp38->subState = 1; - sp2C = true; + tempVar = true; } - if ((btnAndStick & U_JPAD) && (gSubMenuSelection >= 0x16)) { + if ((btnAndStick & U_JPAD) && (gSubMenuSelection > SUB_MENU_OPTION_MIN)) { gSubMenuSelection -= 1; play_sound2(SOUND_MENU_CURSOR_MOVE); if (sp38->paramf < 4.2) { sp38->paramf += 4.0; } - sp2C = true; + tempVar = true; sp38->subState = -1; } - if (sp2C && gSoundMode != sp38->state) { + if (tempVar && gSoundMode != sp38->state) { gSaveData.main.saveInfo.soundMode = gSoundMode; write_save_data_grand_prix_points_and_sound_mode(); update_save_data_backup(); @@ -273,7 +288,7 @@ void options_menu_act(struct Controller* controller, u16 arg1) { } if (btnAndStick & A_BUTTON) { switch (gSubMenuSelection) { - case 0x16: + case SUB_MENU_OPTION_SOUND_MODE: if (gSoundMode < 3) { gSoundMode += 1; } else { @@ -282,7 +297,7 @@ void options_menu_act(struct Controller* controller, u16 arg1) { if (gSoundMode == SOUND_UNUSED) { gSoundMode = SOUND_MONO; } - func_800B44BC(); + set_sound_mode(); switch (gSoundMode) { case SOUND_STEREO: play_sound2(SOUND_MENU_STEREO); @@ -295,18 +310,18 @@ void options_menu_act(struct Controller* controller, u16 arg1) { return; } break; - case 0x17: + case SUB_MENU_OPTION_COPY_CONTROLLER_PAK: switch (controller_pak_2_status()) { case PFS_INVALID_DATA: - gSubMenuSelection = 0x2B; + gSubMenuSelection = SUB_MENU_COPY_PAK_ERROR_NO_GAME_DATA; play_sound2(SOUND_MENU_FILE_NOT_FOUND); return; case PFS_NO_ERROR: func_800B6798(); - sp2C = controller_pak_1_status(); - switch (sp2C) { + tempVar = controller_pak_1_status(); + switch (tempVar) { case PFS_INVALID_DATA: - gSubMenuSelection = 0x46; + gSubMenuSelection = SUB_MENU_COPY_PAK_CREATE_GAME_DATA_INIT; sp38->state = 0; play_sound2(SOUND_MENU_SELECT); break; @@ -314,56 +329,56 @@ void options_menu_act(struct Controller* controller, u16 arg1) { func_800B6708(); break; case PFS_NO_PAK_INSERTED: - gSubMenuSelection = 0x34; + gSubMenuSelection = SUB_MENU_COPY_PAK_ERROR_NO_PAK_1P; play_sound2(SOUND_MENU_FILE_NOT_FOUND); break; case PFS_FILE_OVERFLOW: - gSubMenuSelection = 0x37; + gSubMenuSelection = SUB_MENU_COPY_PAK_ERROR_NO_PAGES_1P; play_sound2(SOUND_MENU_FILE_NOT_FOUND); break; case PFS_PAK_BAD_READ: - case 3: + case PFS_PAK_CORRUPTED: // unreachable, bad reads always returns previous case default: - gSubMenuSelection = 0x35; + gSubMenuSelection = SUB_MENU_COPY_PAK_ERROR_BAD_READ_1P; play_sound2(SOUND_MENU_FILE_NOT_FOUND); break; } - if (sp2C == PFS_INVALID_DATA && !sp30[0].ghostDataSaved && - !sp30[1].ghostDataSaved) { - gSubMenuSelection = 0x2A; + if (tempVar == PFS_INVALID_DATA && !sp30[PLAYER_ONE].ghostDataSaved && + !sp30[PLAYER_TWO].ghostDataSaved) { + gSubMenuSelection = SUB_MENU_COPY_PAK_ERROR_NO_GHOST_DATA; play_sound2(SOUND_MENU_FILE_NOT_FOUND); return; } - if (sp2C == PFS_NO_ERROR) { - if (sp30[0].ghostDataSaved) { - gSubMenuSelection = 0x28; + if (tempVar == PFS_NO_ERROR) { + if (sp30[PLAYER_ONE].ghostDataSaved) { + gSubMenuSelection = SUB_MENU_COPY_PAK_FROM_GHOST1_1P; play_sound2(SOUND_MENU_SELECT); - } else if (sp30[1].ghostDataSaved) { - gSubMenuSelection = 0x29; + } else if (sp30[PLAYER_TWO].ghostDataSaved) { + gSubMenuSelection = SUB_MENU_COPY_PAK_FROM_GHOST2_1P; play_sound2(SOUND_MENU_SELECT); } else { - gSubMenuSelection = 0x2A; + gSubMenuSelection = SUB_MENU_COPY_PAK_ERROR_NO_GHOST_DATA; play_sound2(SOUND_MENU_FILE_NOT_FOUND); } } // else return? return; case PFS_NO_PAK_INSERTED: - gSubMenuSelection = 0x2C; + gSubMenuSelection = SUB_MENU_COPY_PAK_ERROR_NO_PAK_2P; play_sound2(SOUND_MENU_FILE_NOT_FOUND); return; case PFS_PAK_BAD_READ: default: - gSubMenuSelection = 0x2D; + gSubMenuSelection = SUB_MENU_COPY_PAK_ERROR_BAD_READ_2P; play_sound2(SOUND_MENU_FILE_NOT_FOUND); return; } - case 0x18: { - gSubMenuSelection = 0x1E; + case SUB_MENU_OPTION_ERASE_ALL_DATA: { + gSubMenuSelection = SUB_MENU_ERASE_QUIT; play_sound2(SOUND_MENU_SELECT); return; } - case 0x15: { + case SUB_MENU_OPTION_RETURN_GAME_SELECT: { func_8009E280(); play_sound2(SOUND_MENU_GO_BACK); return; @@ -373,9 +388,9 @@ void options_menu_act(struct Controller* controller, u16 arg1) { // maybe else return?; break; } - case 0x1E: - case 0x1F: { - if ((btnAndStick & D_JPAD) && (gSubMenuSelection < 0x1F)) { + case SUB_MENU_ERASE_QUIT: + case SUB_MENU_ERASE_ERASE: { + if ((btnAndStick & D_JPAD) && (gSubMenuSelection < SUB_MENU_ERASE_MAX)) { gSubMenuSelection += 1; play_sound2(SOUND_MENU_CURSOR_MOVE); if (sp38->paramf < 4.2) { @@ -383,7 +398,7 @@ void options_menu_act(struct Controller* controller, u16 arg1) { } sp38->subState = 1; } - if ((btnAndStick & U_JPAD) && (gSubMenuSelection >= 0x1F)) { + if ((btnAndStick & U_JPAD) && (gSubMenuSelection > SUB_MENU_ERASE_MIN)) { gSubMenuSelection -= 1; play_sound2(SOUND_MENU_CURSOR_MOVE); if (sp38->paramf < 4.2) { @@ -392,18 +407,18 @@ void options_menu_act(struct Controller* controller, u16 arg1) { sp38->subState = -1; } if (btnAndStick & B_BUTTON) { - gSubMenuSelection = 0x18; + gSubMenuSelection = SUB_MENU_OPTION_ERASE_ALL_DATA; play_sound2(SOUND_MENU_GO_BACK); return; } if (btnAndStick & A_BUTTON) { switch (gSubMenuSelection) { - case 0x1E: - gSubMenuSelection = 0x18; + case SUB_MENU_ERASE_QUIT: + gSubMenuSelection = SUB_MENU_OPTION_ERASE_ALL_DATA; play_sound2(SOUND_MENU_GO_BACK); break; - case 0x1F: - gSubMenuSelection = 0x20; + case SUB_MENU_ERASE_ERASE: + gSubMenuSelection = SUB_MENU_SAVE_DATA_ERASED; func_800B46D0(); D_800DC5AC = 0; play_sound2(SOUND_MENU_EXPLOSION); @@ -412,16 +427,16 @@ void options_menu_act(struct Controller* controller, u16 arg1) { } break; // or return? } - case 0x20: { + case SUB_MENU_SAVE_DATA_ERASED: { if (btnAndStick & (A_BUTTON | B_BUTTON | START_BUTTON)) { - gSubMenuSelection = 0x18; + gSubMenuSelection = SUB_MENU_OPTION_ERASE_ALL_DATA; play_sound2(SOUND_MENU_GO_BACK); } break; } - case 0x28: - case 0x29: { - if ((btnAndStick & D_JPAD) && (gSubMenuSelection < 0x29) && (sp30[1].ghostDataSaved)) { + case SUB_MENU_COPY_PAK_FROM_GHOST1_1P: + case SUB_MENU_COPY_PAK_FROM_GHOST2_1P: { + if ((btnAndStick & D_JPAD) && (gSubMenuSelection < SUB_MENU_COPY_PAK_FROM_GHOST_MAX) && (sp30[PLAYER_TWO].ghostDataSaved)) { gSubMenuSelection += 1; play_sound2(SOUND_MENU_CURSOR_MOVE); if (sp38->paramf < 4.2) { @@ -429,7 +444,7 @@ void options_menu_act(struct Controller* controller, u16 arg1) { } sp38->subState = 1; } - if ((btnAndStick & U_JPAD) && (gSubMenuSelection >= 0x29) && sp30[0].ghostDataSaved) { + if ((btnAndStick & U_JPAD) && (gSubMenuSelection > SUB_MENU_COPY_PAK_FROM_GHOST_MIN) && sp30[PLAYER_ONE].ghostDataSaved) { gSubMenuSelection -= 1; play_sound2(SOUND_MENU_CURSOR_MOVE); if (sp38->paramf < 4.2) { @@ -438,27 +453,27 @@ void options_menu_act(struct Controller* controller, u16 arg1) { sp38->subState = -1; } if (btnAndStick & B_BUTTON) { - gSubMenuSelection = 0x17; + gSubMenuSelection = SUB_MENU_OPTION_COPY_CONTROLLER_PAK; play_sound2(SOUND_MENU_GO_BACK); return; } if (btnAndStick & A_BUTTON) { - sp38->param2 = gSubMenuSelection - 0x28; - if (sp30[sp38->param2].courseIndex == D_8018EE10[1].courseIndex && D_8018EE10[1].ghostDataSaved) { - gSubMenuSelection = 0x33; + sp38->param2 = gSubMenuSelection - SUB_MENU_COPY_PAK_FROM_GHOST_MIN; + if (sp30[sp38->param2].courseIndex == D_8018EE10[PLAYER_TWO].courseIndex && D_8018EE10[PLAYER_TWO].ghostDataSaved) { + gSubMenuSelection = SUB_MENU_COPY_PAK_TO_GHOST2_2P; } else { - gSubMenuSelection = 0x32; + gSubMenuSelection = SUB_MENU_COPY_PAK_TO_GHOST1_2P; } play_sound2(SOUND_MENU_SELECT); } break; } - case 0x32: - case 0x33: { + case SUB_MENU_COPY_PAK_TO_GHOST1_2P: + case SUB_MENU_COPY_PAK_TO_GHOST2_2P: { // bit of a fake match, but if it works it works? - if ((sp30[sp38->param2].courseIndex != ((0, (D_8018EE10 + (gSubMenuSelection - 0x32))->courseIndex))) || - ((D_8018EE10 + (gSubMenuSelection - 0x32))->ghostDataSaved == 0)) { - if ((btnAndStick & D_JPAD) && (gSubMenuSelection < 0x33)) { + if ((sp30[sp38->param2].courseIndex != ((0, (D_8018EE10 + (gSubMenuSelection - SUB_MENU_COPY_PAK_TO_GHOST_MIN))->courseIndex))) || + ((D_8018EE10 + (gSubMenuSelection - SUB_MENU_COPY_PAK_TO_GHOST_MIN))->ghostDataSaved == 0)) { + if ((btnAndStick & D_JPAD) && (gSubMenuSelection < SUB_MENU_COPY_PAK_TO_GHOST_MAX)) { gSubMenuSelection += 1; play_sound2(SOUND_MENU_CURSOR_MOVE); if (sp38->paramf < 4.2) { @@ -466,7 +481,7 @@ void options_menu_act(struct Controller* controller, u16 arg1) { } sp38->subState = 1; } - if ((btnAndStick & U_JPAD) && (gSubMenuSelection >= 0x33)) { + if ((btnAndStick & U_JPAD) && (gSubMenuSelection > SUB_MENU_COPY_PAK_TO_GHOST_MIN)) { gSubMenuSelection -= 1; play_sound2(SOUND_MENU_CURSOR_MOVE); if (sp38->paramf < 4.2) { @@ -476,39 +491,39 @@ void options_menu_act(struct Controller* controller, u16 arg1) { } } if (btnAndStick & B_BUTTON) { - gSubMenuSelection = sp38->param2 + 0x28; + gSubMenuSelection = sp38->param2 + SUB_MENU_COPY_PAK_FROM_GHOST_MIN; play_sound2(SOUND_MENU_GO_BACK); } else if (btnAndStick & A_BUTTON) { - sp38->param1 = gSubMenuSelection - 0x32; + sp38->param1 = gSubMenuSelection - SUB_MENU_COPY_PAK_TO_GHOST_MIN; if (D_8018EE10[(sp38->param1)].ghostDataSaved) { - gSubMenuSelection = 0x38; + gSubMenuSelection = SUB_MENU_COPY_PAK_PROMPT_QUIT; } else { - gSubMenuSelection = 0x3A; + gSubMenuSelection = SUB_MENU_COPY_PAK_START; sp38->state = 0; } play_sound2(SOUND_MENU_SELECT); } break; } - case 0x2A: - case 0x2B: - case 0x2C: - case 0x2D: - case 0x34: - case 0x35: - case 0x37: - case 0x3C: - case 0x41: - case 0x42: { + case SUB_MENU_COPY_PAK_ERROR_NO_GHOST_DATA: + case SUB_MENU_COPY_PAK_ERROR_NO_GAME_DATA: + case SUB_MENU_COPY_PAK_ERROR_NO_PAK_2P: + case SUB_MENU_COPY_PAK_ERROR_BAD_READ_2P: + case SUB_MENU_COPY_PAK_ERROR_NO_PAK_1P: + case SUB_MENU_COPY_PAK_ERROR_BAD_READ_1P: + case SUB_MENU_COPY_PAK_ERROR_NO_PAGES_1P: + case SUB_MENU_COPY_PAK_COMPLETED: + case SUB_MENU_COPY_PAK_UNABLE_COPY_FROM_1P: + case SUB_MENU_COPY_PAK_UNABLE_READ_FROM_2P: { if (btnAndStick & (A_BUTTON | B_BUTTON | START_BUTTON)) { - gSubMenuSelection = 0x17; + gSubMenuSelection = SUB_MENU_OPTION_COPY_CONTROLLER_PAK; play_sound2(SOUND_MENU_GO_BACK); } break; } - case 0x38: - case 0x39: { - if ((btnAndStick & R_JPAD) && gSubMenuSelection < 0x39) { + case SUB_MENU_COPY_PAK_PROMPT_QUIT: + case SUB_MENU_COPY_PAK_PROMPT_COPY: { + if ((btnAndStick & R_JPAD) && gSubMenuSelection < SUB_MENU_COPY_PAK_PROMPT_MAX) { gSubMenuSelection += 1; play_sound2(SOUND_MENU_CURSOR_MOVE); if (sp38->paramf < 4.2) { @@ -516,7 +531,7 @@ void options_menu_act(struct Controller* controller, u16 arg1) { } sp38->subState = 1; } - if ((btnAndStick & L_JPAD) && gSubMenuSelection >= 0x39) { + if ((btnAndStick & L_JPAD) && gSubMenuSelection > SUB_MENU_COPY_PAK_PROMPT_MIN) { gSubMenuSelection -= 1; play_sound2(SOUND_MENU_CURSOR_MOVE); if (sp38->paramf < 4.2) { @@ -525,16 +540,16 @@ void options_menu_act(struct Controller* controller, u16 arg1) { sp38->subState = -1; } if (btnAndStick & B_BUTTON) { - gSubMenuSelection = sp38->param1 + 0x32; + gSubMenuSelection = sp38->param1 + SUB_MENU_COPY_PAK_TO_GHOST_MIN; play_sound2(SOUND_MENU_GO_BACK); return; } if (btnAndStick & A_BUTTON) { - if (gSubMenuSelection == 0x38) { - gSubMenuSelection = 0x17; + if (gSubMenuSelection == SUB_MENU_COPY_PAK_PROMPT_QUIT) { + gSubMenuSelection = SUB_MENU_OPTION_COPY_CONTROLLER_PAK; play_sound2(SOUND_MENU_GO_BACK); } else { - gSubMenuSelection = 0x3A; + gSubMenuSelection = SUB_MENU_COPY_PAK_START; play_sound2(SOUND_MENU_SELECT); sp38->state = 0; } @@ -542,22 +557,22 @@ void options_menu_act(struct Controller* controller, u16 arg1) { // return? break; } - case 0x3A: { - if (arg1 == 0) { + case SUB_MENU_COPY_PAK_START: { + if (controllerIdx == PLAYER_ONE) { sp38->state += 1; } if (sp38->state >= 3) { - gSubMenuSelection = 0x3B; + gSubMenuSelection = SUB_MENU_COPY_PAK_COPYING; } break; } - case 0x3B: { + case SUB_MENU_COPY_PAK_COPYING: { res = controller_pak_2_status(); if (res == PFS_NO_ERROR) { res = func_800B65F4(sp38->param2, sp38->param1); } if (res != 0) { - gSubMenuSelection = 0x42; + gSubMenuSelection = SUB_MENU_COPY_PAK_UNABLE_READ_FROM_2P; play_sound2(SOUND_MENU_FILE_NOT_FOUND); return; } @@ -567,32 +582,32 @@ void options_menu_act(struct Controller* controller, u16 arg1) { res = func_800B6178(sp38->param1); } if (res != 0) { - gSubMenuSelection = 0x41; + gSubMenuSelection = SUB_MENU_COPY_PAK_UNABLE_COPY_FROM_1P; play_sound2(SOUND_MENU_FILE_NOT_FOUND); return; } - gSubMenuSelection = 0x3C; + gSubMenuSelection = SUB_MENU_COPY_PAK_COMPLETED; D_8018EE10[sp38->param1].courseIndex = (sp30 + sp38->param2)->courseIndex; func_800B6088(sp38->param1); break; } - case 0x46: { - if (arg1 == 0) { + case SUB_MENU_COPY_PAK_CREATE_GAME_DATA_INIT: { + if (controllerIdx == PLAYER_ONE) { sp38->state += 1; } if (sp38->state >= 3) { - gSubMenuSelection = 0x47; + gSubMenuSelection = SUB_MENU_COPY_PAK_CREATE_GAME_DATA_DONE; } break; } - case 0x47: { + case SUB_MENU_COPY_PAK_CREATE_GAME_DATA_DONE: { if (func_800B6A68()) { - gSubMenuSelection = 0x36; + gSubMenuSelection = SUB_MENU_COPY_PAK_ERROR_CANT_CREATE_1P; play_sound2(SOUND_MENU_FILE_NOT_FOUND); } else if (sp30[0].ghostDataSaved) { - gSubMenuSelection = 0x28; + gSubMenuSelection = SUB_MENU_COPY_PAK_FROM_GHOST1_1P; } else { - gSubMenuSelection = 0x29; + gSubMenuSelection = SUB_MENU_COPY_PAK_FROM_GHOST2_1P; } break; } @@ -602,68 +617,73 @@ void options_menu_act(struct Controller* controller, u16 arg1) { } } -// Handle navigating the data menu interface -void data_menu_act(struct Controller* controller, UNUSED u16 arg1) { - u16 buttonAndStickPress = (controller->buttonPressed | controller->stickPressed); +/** + * Navigation of the data menu + */ +void data_menu_act(struct Controller* controller, UNUSED u16 controllerIdx) { + u16 btnAndStick = (controller->buttonPressed | controller->stickPressed); // Make pressing Start have the same effect as pressing A - if ((gEnableDebugMode == 0) && ((buttonAndStickPress & 0x1000) != 0)) { - buttonAndStickPress |= 0x8000; + if ((gEnableDebugMode == 0) && ((btnAndStick & START_BUTTON) != 0)) { + btnAndStick |= A_BUTTON; } - if (func_800B4520() == 0) { - if (gSubMenuSelection == 1) { + if (is_screen_being_faded() == 0) { + if (gSubMenuSelection == SUB_MENU_DATA) { // If DPad/Stick down pressed, move selection down if not already in bottom row - if ((buttonAndStickPress & 0x400) != 0) { + if ((btnAndStick & D_JPAD) != 0) { if ((gTimeTrialDataCourseIndex % 4) != 3) { ++gTimeTrialDataCourseIndex; play_sound2(SOUND_MENU_CURSOR_MOVE); } } // If DPad/Stick up pressed, move selection up if not already in top row - if ((buttonAndStickPress & 0x800) != 0) { - if ((gTimeTrialDataCourseIndex & 3) != 0) { + if ((btnAndStick & U_JPAD) != 0) { + if ((gTimeTrialDataCourseIndex % 4) != 0) { --gTimeTrialDataCourseIndex; play_sound2(SOUND_MENU_CURSOR_MOVE); } } // If DPad/Stick right pressed, move selection right if not already in right-most column - if ((buttonAndStickPress & 0x100) != 0) { + if ((btnAndStick & R_JPAD) != 0) { if ((gTimeTrialDataCourseIndex / 4) != 3) { gTimeTrialDataCourseIndex += 4; play_sound2(SOUND_MENU_CURSOR_MOVE); } } // If DPad/Stick left pressed, move selection left if not already in left-most column - if ((buttonAndStickPress & 0x200) != 0) { + if ((btnAndStick & L_JPAD) != 0) { if ((gTimeTrialDataCourseIndex / 4) != 0) { gTimeTrialDataCourseIndex -= 4; play_sound2(SOUND_MENU_CURSOR_MOVE); } } // If B pressed, go to main menu - if ((buttonAndStickPress & 0x4000) != 0) { + if ((btnAndStick & B_BUTTON) != 0) { func_8009E258(); play_sound2(SOUND_MENU_GO_BACK); return; } // If A pressed, go to selected course's records - if ((buttonAndStickPress & 0x8000) != 0) { - gCourseRecordsMenuSelection = 0; + if ((btnAndStick & A_BUTTON) != 0) { + gCourseRecordsMenuSelection = COURSE_RECORDS_MENU_RETURN_MENU; func_8009E1C0(); play_sound2(SOUND_MENU_OK_CLICKED); } } - // If gSubMenuSelection != 1 and A pressed, go to main menu - // (Will gSubMenuSelection ever not equal 1 when entering the data menu?) - else if ((buttonAndStickPress & 0x8000) != 0) { + // If gSubMenuSelection is not SUB_MENU_DATA and A pressed, go to main menu + // This condition is not reachable but this failsafe was added nonetheless + else if ((btnAndStick & A_BUTTON) != 0) { func_8009E258(); play_sound2(SOUND_MENU_OK_CLICKED); } } } -void course_data_menu_act(struct Controller* controller, UNUSED u16 arg1) { +/** + * Navigation of the course records data menu + */ +void course_data_menu_act(struct Controller* controller, UNUSED u16 controllerIdx) { u16 btnAndStick; // sp2E MenuItem* sp28; CourseTimeTrialRecords* sp24; @@ -675,9 +695,9 @@ void course_data_menu_act(struct Controller* controller, UNUSED u16 arg1) { btnAndStick |= A_BUTTON; } - if (!func_800B4520()) { + if (!is_screen_being_faded()) { switch (gSubMenuSelection) { - case 0x0B: { + case SUB_MENU_DATA_OPTIONS: { if ((btnAndStick & L_JPAD) && (gTimeTrialDataCourseIndex > 0)) { gTimeTrialDataCourseIndex -= 1; play_sound2(SOUND_MENU_CURSOR_MOVE); @@ -691,15 +711,16 @@ void course_data_menu_act(struct Controller* controller, UNUSED u16 arg1) { sp28 = find_menu_items_dupe(0xE8); sp24 = &gSaveData.allCourseTimeTrialRecords.cupRecords[gTimeTrialDataCourseIndex / 4] .courseRecords[gTimeTrialDataCourseIndex % 4]; - if (gCourseRecordsMenuSelection == 2 && func_800B639C(gTimeTrialDataCourseIndex) < 0) { + if (gCourseRecordsMenuSelection == COURSE_RECORDS_MENU_ERASE_GHOST && + func_800B639C(gTimeTrialDataCourseIndex) < 0) { gCourseRecordsMenuSelection -= 1; } - if (gCourseRecordsMenuSelection == 1 && sp24->unknownBytes[0] == 0) { + if (gCourseRecordsMenuSelection == COURSE_RECORDS_MENU_ERASE_RECORDS && sp24->unknownBytes[0] == 0) { gCourseRecordsMenuSelection -= 1; } - if ((btnAndStick & U_JPAD) && (gCourseRecordsMenuSelection > 0)) { + if ((btnAndStick & U_JPAD) && (gCourseRecordsMenuSelection > COURSE_RECORDS_MENU_MIN)) { gCourseRecordsMenuSelection -= 1; if (gCourseRecordsMenuSelection == 1 && sp24->unknownBytes[0] == 0) { gCourseRecordsMenuSelection -= 1; @@ -711,17 +732,19 @@ void course_data_menu_act(struct Controller* controller, UNUSED u16 arg1) { sp28->subState = -1; } - if ((btnAndStick & D_JPAD) && (gCourseRecordsMenuSelection < 2)) { + if ((btnAndStick & D_JPAD) && (gCourseRecordsMenuSelection < COURSE_RECORDS_MENU_MAX)) { gCourseRecordsMenuSelection += 1; - if (gCourseRecordsMenuSelection == 1 && sp24->unknownBytes[0] == 0) { + if (gCourseRecordsMenuSelection == COURSE_RECORDS_MENU_ERASE_RECORDS && + sp24->unknownBytes[0] == 0) { gCourseRecordsMenuSelection += 1; } - if (gCourseRecordsMenuSelection == 2 && func_800B639C(gTimeTrialDataCourseIndex) < 0) { + if (gCourseRecordsMenuSelection == COURSE_RECORDS_MENU_ERASE_GHOST && + func_800B639C(gTimeTrialDataCourseIndex) < 0) { if (sp24->unknownBytes[0] == 0) { - gCourseRecordsMenuSelection = 0; + gCourseRecordsMenuSelection = COURSE_RECORDS_MENU_RETURN_MENU; } else { - gCourseRecordsMenuSelection = 1; + gCourseRecordsMenuSelection = COURSE_RECORDS_MENU_ERASE_RECORDS; } } else { play_sound2(SOUND_MENU_CURSOR_MOVE); @@ -739,21 +762,21 @@ void course_data_menu_act(struct Controller* controller, UNUSED u16 arg1) { if (sp28->paramf < 4.2) { sp28->paramf += 4.0; } - if (gCourseRecordsMenuSelection == 0) { + if (gCourseRecordsMenuSelection == COURSE_RECORDS_MENU_RETURN_MENU) { func_8009E208(); play_sound2(SOUND_MENU_GO_BACK); } else { - gSubMenuSelection = 0x0C; - D_8018EDF9 = 0; + gSubMenuSelection = SUB_MENU_DATA_ERASE_CONFIRM; + gCourseRecordsSubMenuSelection = COURSE_RECORDS_SUB_MENU_QUIT; play_sound2(SOUND_MENU_SELECT); } } break; } - case 0x0C: { + case SUB_MENU_DATA_ERASE_CONFIRM: { sp28 = find_menu_items_dupe(0xE9); - if ((btnAndStick & U_JPAD) && (D_8018EDF9 > 0)) { - D_8018EDF9 -= 1; + if ((btnAndStick & U_JPAD) && (gCourseRecordsSubMenuSelection > COURSE_RECORDS_SUB_MENU_MIN)) { + gCourseRecordsSubMenuSelection -= 1; play_sound2(SOUND_MENU_CURSOR_MOVE); if (sp28->paramf < 4.2) { sp28->paramf += 4.0; @@ -761,8 +784,8 @@ void course_data_menu_act(struct Controller* controller, UNUSED u16 arg1) { sp28->subState = -1; } - if ((btnAndStick & D_JPAD) && (D_8018EDF9 <= 0)) { - D_8018EDF9 += 1; + if ((btnAndStick & D_JPAD) && (gCourseRecordsSubMenuSelection < COURSE_RECORDS_SUB_MENU_MAX)) { + gCourseRecordsSubMenuSelection += 1; play_sound2(SOUND_MENU_CURSOR_MOVE); if (sp28->paramf < 4.2) { sp28->paramf += 4.0; @@ -771,28 +794,28 @@ void course_data_menu_act(struct Controller* controller, UNUSED u16 arg1) { } if (btnAndStick & B_BUTTON) { - gSubMenuSelection = 0xB; + gSubMenuSelection = SUB_MENU_DATA_OPTIONS; play_sound2(SOUND_MENU_GO_BACK); } else if (btnAndStick & A_BUTTON) { - if (D_8018EDF9 != 0) { + if (gCourseRecordsSubMenuSelection != COURSE_RECORDS_SUB_MENU_QUIT) { res = 0; switch (gCourseRecordsMenuSelection) { - case 1: { + case COURSE_RECORDS_MENU_ERASE_RECORDS: { func_800B4728(gTimeTrialDataCourseIndex); func_800B559C(gTimeTrialDataCourseIndex); play_sound2(SOUND_MENU_EXPLOSION); res = -1; break; } - case 2: { + case COURSE_RECORDS_MENU_ERASE_GHOST: { res = func_800B639C(gTimeTrialDataCourseIndex); if (res >= 0) { if (func_800B69BC(res) != 0) { - gSubMenuSelection = 0x0D; + gSubMenuSelection = SUB_MENU_DATA_CANT_ERASE; play_sound2(SOUND_MENU_FILE_NOT_FOUND); } else { play_sound2(SOUND_MENU_EXPLOSION); - gSubMenuSelection = 0x0B; + gSubMenuSelection = SUB_MENU_DATA_OPTIONS; } } break; @@ -800,18 +823,18 @@ void course_data_menu_act(struct Controller* controller, UNUSED u16 arg1) { } if (!(res + 1)) { - gSubMenuSelection = 0xB; + gSubMenuSelection = SUB_MENU_DATA_OPTIONS; } } else { play_sound2(SOUND_MENU_GO_BACK); - gSubMenuSelection = 0xB; + gSubMenuSelection = SUB_MENU_DATA_OPTIONS; } } break; } - case 0x0D: { + case SUB_MENU_DATA_CANT_ERASE: { if (btnAndStick & (A_BUTTON | B_BUTTON | START_BUTTON)) { - gSubMenuSelection = 0xB; + gSubMenuSelection = SUB_MENU_DATA_OPTIONS; } break; } @@ -822,87 +845,76 @@ void course_data_menu_act(struct Controller* controller, UNUSED u16 arg1) { /** * On input skip logo screen **/ -void logo_intro_menu_act(struct Controller* arg0, UNUSED u16 arg1) { - u16 anyInput = arg0->buttonPressed | arg0->stickPressed; - -// Note: Choosing a course in the middle of a cup -// will contain no definition for player staging/lineup. -// #define SKIP_TO_RACE -#ifdef SKIP_TO_RACE - gGamestateNext = 4; // Enter race state - gCCSelection = CC_100; - gCupSelection = 1; - gCourseIndexInCup = 0; - gCurrentCourseId = 0; - gScreenModeSelection = SCREEN_MODE_1P; - gCharacterSelections[0] = 0; - gModeSelection = GRAND_PRIX; - gPlayerCount = 1; -#endif +void logo_intro_menu_act(struct Controller* controller, UNUSED u16 controllerIdx) { + u16 btnAndStick = (controller->buttonPressed | controller->stickPressed); - if ((func_800B4520() == 0) && (anyInput)) { - // Audio related + // If any button is pressed then fade audio out + if ((is_screen_being_faded() == 0) && (btnAndStick)) { + //! @todo Label audio funcs func_800CA388(0x3C); func_8009E1E4(); } } -void controller_pak_menu_act(struct Controller* controller, UNUSED u16 arg1) { - u16 buttonAndStickPress; +/** + * Navigation of the controller pak table data + */ +void controller_pak_menu_act(struct Controller* controller, UNUSED u16 controllerIdx) { + u16 btnAndStick; OSPfsState* osPfsState; s32 selectedTableRow; UNUSED s8 pad; - buttonAndStickPress = controller->buttonPressed | controller->stickPressed; - if (func_800B4520() == 0) { + btnAndStick = (controller->buttonPressed | controller->stickPressed); + if (is_screen_being_faded() == 0) { switch (gControllerPakMenuSelection) { case CONTROLLER_PAK_MENU_SELECT_RECORD: - if ((buttonAndStickPress & 0x9000) != 0) { + if ((btnAndStick & (A_BUTTON | START_BUTTON)) != 0) { gControllerPakMenuSelection = CONTROLLER_PAK_MENU_TABLE_GAME_DATA; play_sound2(SOUND_MENU_SELECT); return; } - if ((buttonAndStickPress & 0x300) != 0) { + if ((btnAndStick & (L_JPAD | R_JPAD)) != 0) { gControllerPakMenuSelection = CONTROLLER_PAK_MENU_END; play_sound2(SOUND_MENU_CURSOR_MOVE); return; } break; case CONTROLLER_PAK_MENU_END: - if ((buttonAndStickPress & 0x9000) != 0) { + if ((btnAndStick & (A_BUTTON | START_BUTTON)) != 0) { play_sound2(SOUND_MENU_SELECT); func_8009E1C0(); gControllerPak1State = BAD; return; } - if ((buttonAndStickPress & 0x300) != 0) { + if ((btnAndStick & (L_JPAD | R_JPAD)) != 0) { gControllerPakMenuSelection = CONTROLLER_PAK_MENU_SELECT_RECORD; play_sound2(SOUND_MENU_CURSOR_MOVE); return; } break; case CONTROLLER_PAK_MENU_TABLE_GAME_DATA: - if ((buttonAndStickPress & 0x9000) != 0) { - selectedTableRow = D_800E86C4[gControllerPakSelectedTableRow + 2] - 1; + if ((btnAndStick & (A_BUTTON | START_BUTTON)) != 0) { + selectedTableRow = gControllerPakVisibleTableRows[gControllerPakSelectedTableRow + 2] - 1; if (pfsError[selectedTableRow] == 0) { gControllerPakMenuSelection = CONTROLLER_PAK_MENU_QUIT; play_sound2(SOUND_MENU_SELECT); return; } - } else if ((buttonAndStickPress & 0x4000) != 0) { - if (gControllerPakScrollDirection[0] == 0) { + } else if ((btnAndStick & B_BUTTON) != 0) { + if (gControllerPakScrollDirection == CONTROLLER_PAK_SCROLL_DIR_NONE) { gControllerPakMenuSelection = CONTROLLER_PAK_MENU_SELECT_RECORD; play_sound2(SOUND_MENU_GO_BACK); return; } - } else if ((buttonAndStickPress & 0x800) != 0) { - if (gControllerPakScrollDirection[0] == 0) { + } else if ((btnAndStick & U_JPAD) != 0) { + if (gControllerPakScrollDirection == CONTROLLER_PAK_SCROLL_DIR_NONE) { --gControllerPakSelectedTableRow; if (gControllerPakSelectedTableRow < 0) { gControllerPakSelectedTableRow = 0; - if (D_800E86C4[gControllerPakSelectedTableRow + 2] != 1) { - gControllerPakScrollDirection[0] = 2; + if (gControllerPakVisibleTableRows[gControllerPakSelectedTableRow + 2] != 1) { + gControllerPakScrollDirection = CONTROLLER_PAK_SCROLL_DIR_UP; play_sound2(SOUND_MENU_CURSOR_MOVE); return; } @@ -911,12 +923,13 @@ void controller_pak_menu_act(struct Controller* controller, UNUSED u16 arg1) { return; } } - } else if (((buttonAndStickPress & 0x400) != 0) && (gControllerPakScrollDirection[0] == 0)) { + } else if (((btnAndStick & D_JPAD) != 0) && + (gControllerPakScrollDirection == CONTROLLER_PAK_SCROLL_DIR_NONE)) { ++gControllerPakSelectedTableRow; if (gControllerPakSelectedTableRow >= CONTROLLER_PAK_MENU_TABLE_GAME_DATA) { gControllerPakSelectedTableRow = CONTROLLER_PAK_MENU_QUIT; - if (D_800E86C4[gControllerPakSelectedTableRow + 2] != 0x10) { - gControllerPakScrollDirection[0] = 1; + if (gControllerPakVisibleTableRows[gControllerPakSelectedTableRow + 2] != 16) { + gControllerPakScrollDirection = CONTROLLER_PAK_SCROLL_DIR_DOWN; play_sound2(SOUND_MENU_CURSOR_MOVE); return; } @@ -927,29 +940,29 @@ void controller_pak_menu_act(struct Controller* controller, UNUSED u16 arg1) { } break; case CONTROLLER_PAK_MENU_QUIT: - if ((buttonAndStickPress & 0xD000) != 0) { + if ((btnAndStick & (A_BUTTON | B_BUTTON | START_BUTTON)) != 0) { gControllerPakMenuSelection = CONTROLLER_PAK_MENU_TABLE_GAME_DATA; play_sound2(SOUND_MENU_GO_BACK); return; } - if ((buttonAndStickPress & 0x300) != 0) { + if ((btnAndStick & (L_JPAD | R_JPAD)) != 0) { gControllerPakMenuSelection = CONTROLLER_PAK_MENU_ERASE; play_sound2(SOUND_MENU_CURSOR_MOVE); return; } break; case CONTROLLER_PAK_MENU_ERASE: - if ((buttonAndStickPress & 0x9000) != 0) { + if ((btnAndStick & (A_BUTTON | START_BUTTON)) != 0) { gControllerPakMenuSelection = CONTROLLER_PAK_MENU_GO_TO_ERASING; play_sound2(SOUND_MENU_SELECT); return; } - if ((buttonAndStickPress & 0x4000) != 0) { + if ((btnAndStick & B_BUTTON) != 0) { gControllerPakMenuSelection = CONTROLLER_PAK_MENU_TABLE_GAME_DATA; play_sound2(SOUND_MENU_GO_BACK); return; } - if ((buttonAndStickPress & 0x300) != 0) { + if ((btnAndStick & (L_JPAD | R_JPAD)) != 0) { gControllerPakMenuSelection = CONTROLLER_PAK_MENU_QUIT; play_sound2(SOUND_MENU_CURSOR_MOVE); return; @@ -959,7 +972,7 @@ void controller_pak_menu_act(struct Controller* controller, UNUSED u16 arg1) { gControllerPakMenuSelection = CONTROLLER_PAK_MENU_ERASING; return; case CONTROLLER_PAK_MENU_ERASING: - selectedTableRow = D_800E86C4[gControllerPakSelectedTableRow + 2] - 1; + selectedTableRow = gControllerPakVisibleTableRows[gControllerPakSelectedTableRow + 2] - 1; osPfsState = &pfsState[selectedTableRow]; switch (osPfsDeleteFile(&gControllerPak1FileHandle, osPfsState->company_code, osPfsState->game_code, @@ -975,7 +988,7 @@ void controller_pak_menu_act(struct Controller* controller, UNUSED u16 arg1) { case PFS_ERR_NOPACK: gControllerPakMenuSelection = CONTROLLER_PAK_MENU_ERASE_ERROR_NO_PAK; return; - case PFS_ERR_NEW_PACK: /* switch 1 */ + case PFS_ERR_NEW_PACK: gControllerPakMenuSelection = CONTROLLER_PAK_MENU_ERASE_ERROR_PAK_CHANGED; return; } @@ -983,7 +996,7 @@ void controller_pak_menu_act(struct Controller* controller, UNUSED u16 arg1) { case CONTROLLER_PAK_MENU_ERASE_ERROR_NOT_ERASED: case CONTROLLER_PAK_MENU_ERASE_ERROR_NO_PAK: case CONTROLLER_PAK_MENU_ERASE_ERROR_PAK_CHANGED: - if ((buttonAndStickPress & 0x9000) != 0) { + if ((btnAndStick & (A_BUTTON | START_BUTTON)) != 0) { gControllerPakMenuSelection = CONTROLLER_PAK_MENU_TABLE_GAME_DATA; } break; @@ -991,22 +1004,24 @@ void controller_pak_menu_act(struct Controller* controller, UNUSED u16 arg1) { } } -void splash_menu_act(struct Controller* controller, u16 arg1) { +/** + * Navigation of the main splash start screen menu + * Also handles debug menu options + */ +void splash_menu_act(struct Controller* controller, u16 controllerIdx) { u16 btnAndStick; u16 i; - s32 sp28; - - sp28 = true; + s32 isDebug = true; btnAndStick = controller->buttonPressed | controller->stickPressed; - if (func_800B4520() == 0) { - if (arg1 == 0) { + if (is_screen_being_faded() == 0) { + if (controllerIdx == PLAYER_ONE) { gMenuDelayTimer += 1; } switch (gDebugMenuSelection) { case DEBUG_MENU_DISABLED: { - sp28 = false; - if ((gMenuDelayTimer >= 0x2E) && (btnAndStick & (A_BUTTON | START_BUTTON))) { + isDebug = false; + if ((gMenuDelayTimer >= 46) && (btnAndStick & (A_BUTTON | START_BUTTON))) { func_8009E1C0(); func_800CA330(0x19); play_sound2(SOUND_INTRO_ENTER_MENU); @@ -1062,15 +1077,15 @@ void splash_menu_act(struct Controller* controller, u16 arg1) { break; } case DEBUG_MENU_SCREEN_MODE: { - if ((btnAndStick & R_JPAD) && (D_8018EDF1 < 4)) { - D_8018EDF1 += 1; + if ((btnAndStick & R_JPAD) && (gScreenModeListIndex < 4)) { + gScreenModeListIndex += 1; play_sound2(SOUND_MENU_CURSOR_MOVE); - gScreenModeSelection = D_800F2B50[D_8018EDF1]; + gScreenModeSelection = sScreenModePlayerTable[gScreenModeListIndex]; } - if ((btnAndStick & L_JPAD) && (D_8018EDF1 > 0)) { - D_8018EDF1 -= 1; + if ((btnAndStick & L_JPAD) && (gScreenModeListIndex > 0)) { + gScreenModeListIndex -= 1; play_sound2(SOUND_MENU_CURSOR_MOVE); - gScreenModeSelection = D_800F2B50[D_8018EDF1]; + gScreenModeSelection = sScreenModePlayerTable[gScreenModeListIndex]; } if (btnAndStick & U_JPAD) { gDebugMenuSelection = DEBUG_MENU_COURSE; @@ -1083,7 +1098,7 @@ void splash_menu_act(struct Controller* controller, u16 arg1) { break; } case DEBUG_MENU_PLAYER: { - if ((btnAndStick & R_JPAD) && (*gCharacterSelections < 7)) { + if ((btnAndStick & R_JPAD) && (gCharacterSelections[0] < 7)) { gCharacterSelections[0] += 1; play_sound2(SOUND_MENU_CURSOR_MOVE); } @@ -1108,7 +1123,7 @@ void splash_menu_act(struct Controller* controller, u16 arg1) { gSoundMode = SOUND_MONO; } play_sound2(SOUND_MENU_CURSOR_MOVE); - func_800B44BC(); + set_sound_mode(); gSaveData.main.saveInfo.soundMode = gSoundMode; write_save_data_grand_prix_points_and_sound_mode(); update_save_data_backup(); @@ -1119,7 +1134,7 @@ void splash_menu_act(struct Controller* controller, u16 arg1) { gSoundMode = SOUND_HEADPHONES; } play_sound2(SOUND_MENU_CURSOR_MOVE); - func_800B44BC(); + set_sound_mode(); gSaveData.main.saveInfo.soundMode = gSoundMode; write_save_data_grand_prix_points_and_sound_mode(); } @@ -1170,9 +1185,9 @@ void splash_menu_act(struct Controller* controller, u16 arg1) { break; } - gPlayerCountSelection1 = gPlayerCount = D_800F2B58[D_8018EDF1]; + gPlayerCountSelection1 = gPlayerCount = sScreenModePlayerCount[gScreenModeListIndex]; - if (sp28) { + if (isDebug) { if (btnAndStick & (A_BUTTON | START_BUTTON)) { func_8009E1C0(); func_800CA330(0x19); @@ -1206,21 +1221,21 @@ void splash_menu_act(struct Controller* controller, u16 arg1) { } } -void func_800B28C8(void) { +void setup_game_mode_selected(void) { // For Grand Prix and Versus, this will be the CC mode selected. For Time Trials, it will // be whether 'Begin' or 'Data' is selected. Not used for Battle. - s8 temp_v0 = gGameModeSubMenuColumn[gPlayerCount - 1][gGameModeMenuColumn[gPlayerCount - 1]]; + s8 subMenuMode = gGameModeSubMenuColumn[gPlayerCount - 1][gGameModeMenuColumn[gPlayerCount - 1]]; // Determine which game mode was selected based on the number of players and the row selected on the main menu switch (gGameModePlayerSelection[gPlayerCount - 1][gGameModeMenuColumn[gPlayerCount - 1]]) { case GRAND_PRIX: - gCCSelection = temp_v0; + gCCSelection = subMenuMode; gPlaceItemBoxes = 1; - gIsMirrorMode = (temp_v0 == CC_EXTRA) ? 1 : 0; + gIsMirrorMode = (subMenuMode == CC_EXTRA) ? 1 : 0; break; case VERSUS: - gCCSelection = temp_v0; + gCCSelection = subMenuMode; gPlaceItemBoxes = 1; - gIsMirrorMode = (temp_v0 == CC_EXTRA) ? 1 : 0; + gIsMirrorMode = (subMenuMode == CC_EXTRA) ? 1 : 0; break; case BATTLE: gPlaceItemBoxes = 1; @@ -1231,40 +1246,44 @@ void func_800B28C8(void) { gIsMirrorMode = 0; gPlaceItemBoxes = 0; - if ((temp_v0 && temp_v0) && temp_v0) {} + if ((subMenuMode && subMenuMode) && subMenuMode) {} break; } } +/** + * Navigation of the main game mode select screen + */ #ifdef NON_MATCHING -// nonmatching: regalloc; arg1 is not AND-ed back into $a1, reg chaos follows -void main_menu_act(struct Controller* controller, u16 arg1) { - u16 btnAndStick; // sp2E - s32 sp28; - bool sp24; - s32 newMode; // temp_v1_2? +// https://decomp.me/scratch/93qj8 +// nonmatching: regalloc; controllerIdx is not AND-ed back into $a1, reg chaos follows +void main_menu_act(struct Controller* controller, u16 controllerIdx) { + u16 btnAndStick; + s32 subMode; + bool cursorMoved; + s32 newMode; btnAndStick = controller->buttonPressed | controller->stickPressed; if (!gEnableDebugMode && (btnAndStick & START_BUTTON)) { btnAndStick |= A_BUTTON; } - if (!func_800B4520()) { - switch (gMainMenuSelectionDepth) { - case BLANK_MAIN_MENU: { + if (!is_screen_being_faded()) { + switch (gMainMenuSelection) { + case MAIN_MENU_NONE: { newMode = gGameModePlayerSelection[gPlayerCount - 1][gGameModeMenuColumn[gPlayerCount - 1]]; break; } - case PLAYER_NUM_SELECTION: { + case MAIN_MENU_PLAYER_SELECT: { if ((btnAndStick & R_JPAD) && gPlayerCount < 4) { gPlayerCount += 1; - func_800B44AC(); + reset_cycle_flash_menu(); play_sound2(SOUND_MENU_CURSOR_MOVE); } if ((btnAndStick & L_JPAD) && gPlayerCount >= 2) { gPlayerCount -= 1; - func_800B44AC(); + reset_cycle_flash_menu(); play_sound2(SOUND_MENU_CURSOR_MOVE); } // L800B2B38 @@ -1285,23 +1304,23 @@ void main_menu_act(struct Controller* controller, u16 arg1) { if (btnAndStick & B_BUTTON) { func_8009E0F0(0x14); func_800CA330(0x19); - D_8018EDE0 = 1; + gMenuFadeType = MENU_FADE_TYPE_BACK; play_sound2(SOUND_MENU_GO_BACK); newMode = gGameModePlayerSelection[gPlayerCount - 1][gGameModeMenuColumn[gPlayerCount - 1]]; } else if (btnAndStick & A_BUTTON) { // L800B2C00 - gMainMenuSelectionDepth = GAME_MODE_SELECTION; - func_800B44AC(); + gMainMenuSelection = MAIN_MENU_MODE_SELECT; + reset_cycle_flash_menu(); play_sound2(SOUND_MENU_SELECT); newMode = gGameModePlayerSelection[gPlayerCount - 1][gGameModeMenuColumn[gPlayerCount - 1]]; } else if (btnAndStick & CONT_L) { // L800B2C58 - gMainMenuSelectionDepth = OPTIONS_SELECTION; + gMainMenuSelection = MAIN_MENU_OPTION; func_8009E280(); play_sound2(SOUND_MENU_OPTION); newMode = gGameModePlayerSelection[gPlayerCount - 1][gGameModeMenuColumn[gPlayerCount - 1]]; } else if (btnAndStick & CONT_R) { - gMainMenuSelectionDepth = DATA_SELECTION; + gMainMenuSelection = MAIN_MENU_DATA; func_8009E258(); play_sound2(SOUND_MENU_DATA); newMode = gGameModePlayerSelection[gPlayerCount - 1][gGameModeMenuColumn[gPlayerCount - 1]]; @@ -1310,11 +1329,11 @@ void main_menu_act(struct Controller* controller, u16 arg1) { } break; } - case GAME_MODE_SELECTION: { + case MAIN_MENU_MODE_SELECT: { if (btnAndStick & D_JPAD) { if (gGameModeMenuColumn[gPlayerCount - 1] < gPlayerModeSelection[gPlayerCount - 1]) { gGameModeMenuColumn[gPlayerCount - 1] += 1; - func_800B44AC(); + reset_cycle_flash_menu(); play_sound2(SOUND_MENU_CURSOR_MOVE); } } @@ -1322,41 +1341,41 @@ void main_menu_act(struct Controller* controller, u16 arg1) { if (btnAndStick & U_JPAD) { if (gGameModeMenuColumn[gPlayerCount - 1] > 0) { gGameModeMenuColumn[gPlayerCount - 1] -= 1; - func_800B44AC(); + reset_cycle_flash_menu(); play_sound2(SOUND_MENU_CURSOR_MOVE); } } // L800B2DE0 if (btnAndStick & B_BUTTON) { - gMainMenuSelectionDepth = PLAYER_NUM_SELECTION; - func_800B44AC(); + gMainMenuSelection = MAIN_MENU_PLAYER_SELECT; + reset_cycle_flash_menu(); play_sound2(SOUND_MENU_GO_BACK); newMode = gGameModePlayerSelection[gPlayerCount - 1][gGameModeMenuColumn[gPlayerCount - 1]]; } else if (btnAndStick & A_BUTTON) { // L800B2E3C switch (gGameModePlayerSelection[gPlayerCount - 1][gGameModeMenuColumn[gPlayerCount - 1]]) { case 0: - gMainMenuSelectionDepth = GAME_MODE_CC_OR_TIME_TRIALS_OPTIONS_SELECTION; + gMainMenuSelection = MAIN_MENU_MODE_SUB_SELECT; play_sound2(SOUND_MENU_GP); break; case 2: - gMainMenuSelectionDepth = GAME_MODE_CC_OR_TIME_TRIALS_OPTIONS_SELECTION; + gMainMenuSelection = MAIN_MENU_MODE_SUB_SELECT; play_sound2(SOUND_MENU_VERSUS); break; case 1: - gMainMenuSelectionDepth = GAME_MODE_CC_OR_TIME_TRIALS_OPTIONS_SELECTION; + gMainMenuSelection = MAIN_MENU_MODE_SUB_SELECT; play_sound2(SOUND_MENU_TIME_TRIALS); break; case 3: - gMainMenuSelectionDepth = CONFIRM_OK_SELECTION; + gMainMenuSelection = MAIN_MENU_OK_SELECT; play_sound2(SOUND_MENU_BATTLE); break; default: - gMainMenuSelectionDepth = CONFIRM_OK_SELECTION; + gMainMenuSelection = MAIN_MENU_OK_SELECT; break; } // L800B2F04 - func_800B44AC(); + reset_cycle_flash_menu(); gMenuTimingCounter = 0; newMode = gGameModePlayerSelection[gPlayerCount - 1][gGameModeMenuColumn[gPlayerCount - 1]]; } else { @@ -1364,9 +1383,9 @@ void main_menu_act(struct Controller* controller, u16 arg1) { } break; } - case GAME_MODE_CC_OR_TIME_TRIALS_OPTIONS_SELECTION: - case TIME_TRIALS_DATA_SELECTION_FROM_BACK_OUT: { - if (arg1 == 0) { + case MAIN_MENU_MODE_SUB_SELECT: + case MAIN_MENU_MODE_SUB_SELECT_GO_BACK: { + if (controllerIdx == PLAYER_ONE) { gMenuTimingCounter++; if ((gMenuTimingCounter == 100 || gMenuTimingCounter % 300 == 0)) { // L800B2FAC @@ -1377,47 +1396,46 @@ void main_menu_act(struct Controller* controller, u16 arg1) { } } // L800B3000 - sp28 = gGameModeSubMenuColumn[gPlayerCount - 1][gGameModeMenuColumn[gPlayerCount - 1]]; - if ((btnAndStick & U_JPAD) && (sp28 > 0)) { + subMode = gGameModeSubMenuColumn[gPlayerCount - 1][gGameModeMenuColumn[gPlayerCount - 1]]; + if ((btnAndStick & U_JPAD) && (subMode > 0)) { gGameModeSubMenuColumn[gPlayerCount - 1][gGameModeMenuColumn[gPlayerCount - 1]] -= 1; - func_800B44AC(); + reset_cycle_flash_menu(); play_sound2(SOUND_MENU_CURSOR_MOVE); } // L800B3068 if (btnAndStick & D_JPAD) { - sp24 = false; + cursorMoved = false; if (has_unlocked_extra_mode()) { - if (sp28 < gGameModePlayerColumnExtra[gPlayerCount + 4][gGameModeMenuColumn[gPlayerCount - 1] + 1]) { - sp24 = true; + if (subMode < sGameModePlayerColumnExtra[gPlayerCount - 1][gGameModeMenuColumn[gPlayerCount - 1]]) { + cursorMoved = true; } } else { - // L800B30D4 - if (sp28 < gGameModePlayerColumnDefault[gPlayerCount][gGameModeMenuColumn[gPlayerCount - 1] + 1]) { - sp24 = true; + if (subMode < sGameModePlayerColumnDefault[gPlayerCount - 1][gGameModeMenuColumn[gPlayerCount - 1]]) { + cursorMoved = true; } } // L800B3110 - if (sp24) { + if (cursorMoved) { gGameModeSubMenuColumn[gPlayerCount - 1][gGameModeMenuColumn[gPlayerCount - 1]]++; - func_800B44AC(); + reset_cycle_flash_menu(); play_sound2(SOUND_MENU_CURSOR_MOVE); } } // L800B3150 - sp28 = gGameModeSubMenuColumn[gPlayerCount - 1][gGameModeMenuColumn[gPlayerCount - 1]]; + subMode = gGameModeSubMenuColumn[gPlayerCount - 1][gGameModeMenuColumn[gPlayerCount - 1]]; if (btnAndStick & B_BUTTON) { - gMainMenuSelectionDepth = GAME_MODE_SELECTION; - func_800B44AC(); + gMainMenuSelection = MAIN_MENU_MODE_SELECT; + reset_cycle_flash_menu(); play_sound2(SOUND_MENU_GO_BACK); newMode = gGameModePlayerSelection[gPlayerCount - 1][gGameModeMenuColumn[gPlayerCount - 1]]; } else if (btnAndStick & A_BUTTON) { // L800B31DC - func_800B44AC(); - if (gPlayerCount == 1 && gGameModeMenuColumn[gPlayerCount - 1] == 1 && sp28 == 1) { + reset_cycle_flash_menu(); + if (gPlayerCount == 1 && gGameModeMenuColumn[gPlayerCount - 1] == 1 && subMode == 1) { // DATA func_8009E258(); play_sound2(SOUND_MENU_DATA); - } else { - gMainMenuSelectionDepth = CONFIRM_OK_SELECTION; + } else { // BEGIN + gMainMenuSelection = MAIN_MENU_OK_SELECT; play_sound2(SOUND_MENU_SELECT); gMenuTimingCounter = 0; } @@ -1428,9 +1446,9 @@ void main_menu_act(struct Controller* controller, u16 arg1) { } break; } - case CONFIRM_OK_SELECTION: - case CONFIRM_OK_SELECTION_FROM_BACK_OUT: { - if ((arg1 == 0) && (++gMenuTimingCounter == 60 || gMenuTimingCounter % 300 == 0)) { + case MAIN_MENU_OK_SELECT: + case MAIN_MENU_OK_SELECT_GO_BACK: { + if ((controllerIdx == PLAYER_ONE) && (++gMenuTimingCounter == 60 || gMenuTimingCounter % 300 == 0)) { play_sound2(SOUND_MENU_OK); } // L800B330C @@ -1439,15 +1457,15 @@ void main_menu_act(struct Controller* controller, u16 arg1) { case 0: case 1: case 2: - gMainMenuSelectionDepth = GAME_MODE_CC_OR_TIME_TRIALS_OPTIONS_SELECTION; + gMainMenuSelection = MAIN_MENU_MODE_SUB_SELECT; break; case 3: default: - gMainMenuSelectionDepth = GAME_MODE_SELECTION; + gMainMenuSelection = MAIN_MENU_MODE_SELECT; break; } // L800B3384 - func_800B44AC(); + reset_cycle_flash_menu(); play_sound2(SOUND_MENU_GO_BACK); gMenuTimingCounter = 0; newMode = gGameModePlayerSelection[gPlayerCount - 1][gGameModeMenuColumn[gPlayerCount - 1]]; @@ -1455,15 +1473,15 @@ void main_menu_act(struct Controller* controller, u16 arg1) { // L800B33D8 func_8009E1C0(); play_sound2(SOUND_MENU_OK_CLICKED); - func_800B28C8(); + setup_game_mode_selected(); newMode = gGameModePlayerSelection[gPlayerCount - 1][gGameModeMenuColumn[gPlayerCount - 1]]; } else { newMode = gGameModePlayerSelection[gPlayerCount - 1][gGameModeMenuColumn[gPlayerCount - 1]]; } break; } - case OPTIONS_SELECTION: - case DATA_SELECTION: { + case MAIN_MENU_OPTION: + case MAIN_MENU_DATA: { newMode = gGameModePlayerSelection[gPlayerCount - 1][gGameModeMenuColumn[gPlayerCount - 1]]; break; } @@ -1479,7 +1497,10 @@ void main_menu_act(struct Controller* controller, u16 arg1) { GLOBAL_ASM("asm/non_matchings/menus/main_menu_act.s") #endif -// check if there is no currently selected and/or hovered character at grid position `gridId` +/** + * Check if there is no currently selected and/or + * hovered character at grid position `gridId` + */ bool is_character_spot_free(s32 gridId) { s32 i; for (i = 0; i < ARRAY_COUNT(gCharacterGridSelections); i++) { @@ -1490,14 +1511,18 @@ bool is_character_spot_free(s32 gridId) { return true; } -#ifdef NON_MATCHING -// grid positions are from right to left, then top to bottom -// nonmatching: the gCharacterGridSelections pointer is not promoted to $s0 -void player_select_menu_act(struct Controller* controller, u16 arg1) { +// Grid positions are from right to left, then top to bottom +// https://decomp.me/scratch/6R4jX +#if 1 +/** + * Navigation of the player select screen + * Grid positions are from right to left, then top to bottom + */ +void player_select_menu_act(struct Controller* controller, u16 controllerIdx) { s8* bar; s8 selected; s8 i; - s8 saved_selection; + s8 savedSelection; u16 btnAndStick; btnAndStick = (controller->buttonPressed) | (controller->stickPressed); @@ -1505,11 +1530,11 @@ void player_select_menu_act(struct Controller* controller, u16 arg1) { btnAndStick |= A_BUTTON; } - if (!func_800B4520()) { - switch (D_8018EDEE) { - case 1: { - saved_selection = gCharacterGridSelections[arg1]; - if (saved_selection == 0) { + if (!is_screen_being_faded()) { + switch (gPlayerSelectMenuSelection) { + case PLAYER_SELECT_MENU_MAIN: { + savedSelection = gCharacterGridSelections[controllerIdx]; + if (savedSelection == 0) { if (btnAndStick & B_BUTTON) { func_8009E208(); play_sound2(0x49008002); @@ -1518,8 +1543,8 @@ void player_select_menu_act(struct Controller* controller, u16 arg1) { } // L800B3630 if (btnAndStick & B_BUTTON) { - if (D_8018EDE8[arg1]) { - D_8018EDE8[arg1] = false; + if (gCharacterGridIsSelected[controllerIdx]) { + gCharacterGridIsSelected[controllerIdx] = false; play_sound2(SOUND_MENU_GO_BACK); } else { func_8009E208(); @@ -1527,16 +1552,15 @@ void player_select_menu_act(struct Controller* controller, u16 arg1) { } } // L800B3684 - if ((btnAndStick & A_BUTTON) && (D_8018EDE8[arg1] == 0)) { - D_8018EDE8[arg1] = true; - i = D_800F2BAC[gCharacterGridSelections[arg1] - 1]; - func_800C90F4(arg1, 0x2900800e + (i << 4)); + if ((btnAndStick & A_BUTTON) && (gCharacterGridIsSelected[controllerIdx] == 0)) { + gCharacterGridIsSelected[controllerIdx] = true; + i = sCharacterGridOrder[gCharacterGridSelections[controllerIdx] - 1]; + func_800C90F4(controllerIdx, 0x2900800e + (i << 4)); } // L800B36F4 selected = false; - for (i = 0; i < 4; i++) { // for (i = 0; i < ARRAY_COUNT(gCharacterGridSelections); i++) { - if ((gCharacterGridSelections[i] != 0) && - (D_8018EDE8[i] == 0)) { //(gCharacterGridSelections[i] && D_8018EDE8[i]) { + for (i = 0; i < ARRAY_COUNT(gCharacterGridSelections); i++) { + if ((gCharacterGridSelections[i] != 0) && (gCharacterGridIsSelected[i] == 0)) { selected = true; break; } @@ -1544,19 +1568,19 @@ void player_select_menu_act(struct Controller* controller, u16 arg1) { // L800B3738 if (!selected) { - D_8018EDEE = 2; - func_800B44AC(); + gPlayerSelectMenuSelection = PLAYER_SELECT_MENU_OK; + reset_cycle_flash_menu(); gMenuTimingCounter = 0; } // L800B3768 - if (D_8018EDE8[arg1] == 0) { + if (gCharacterGridIsSelected[controllerIdx] == 0) { if ((btnAndStick & CONT_RIGHT) && (btnAndStick & CONT_DOWN)) { - if (saved_selection == 1 || saved_selection == 2 || saved_selection == 3) { + if (savedSelection == 1 || savedSelection == 2 || savedSelection == 3) { // L800B37B0 - saved_selection += 5; - if (is_character_spot_free(saved_selection)) { - gCharacterGridSelections[arg1] = saved_selection; + savedSelection += 5; + if (is_character_spot_free(savedSelection)) { + gCharacterGridSelections[controllerIdx] = savedSelection; play_sound2(0x49008000); } } @@ -1564,10 +1588,10 @@ void player_select_menu_act(struct Controller* controller, u16 arg1) { } // L800B37E4 if ((btnAndStick & CONT_LEFT) && (btnAndStick & CONT_DOWN)) { - if (saved_selection == 2 || saved_selection == 3 || saved_selection == 4) { - saved_selection += 3; - if (is_character_spot_free(saved_selection)) { - gCharacterGridSelections[arg1] = saved_selection; + if (savedSelection == 2 || savedSelection == 3 || savedSelection == 4) { + savedSelection += 3; + if (is_character_spot_free(savedSelection)) { + gCharacterGridSelections[controllerIdx] = savedSelection; play_sound2(0x49008000); } } @@ -1575,10 +1599,10 @@ void player_select_menu_act(struct Controller* controller, u16 arg1) { } // L800B3844 if ((btnAndStick & CONT_RIGHT) && (btnAndStick & CONT_UP)) { - if (saved_selection == 5 || saved_selection == 6 || saved_selection == 7) { - saved_selection -= 3; - if (is_character_spot_free(saved_selection)) { - gCharacterGridSelections[arg1] = saved_selection; + if (savedSelection == 5 || savedSelection == 6 || savedSelection == 7) { + savedSelection -= 3; + if (is_character_spot_free(savedSelection)) { + gCharacterGridSelections[controllerIdx] = savedSelection; play_sound2(0x49008000); } } @@ -1586,10 +1610,10 @@ void player_select_menu_act(struct Controller* controller, u16 arg1) { } // L800B38A0 if ((btnAndStick & CONT_LEFT) && (btnAndStick & CONT_UP)) { - if (saved_selection == 6 || saved_selection == 7 || saved_selection == 8) { - saved_selection -= 5; - if (is_character_spot_free(saved_selection)) { - gCharacterGridSelections[arg1] = saved_selection; + if (savedSelection == 6 || savedSelection == 7 || savedSelection == 8) { + savedSelection -= 5; + if (is_character_spot_free(savedSelection)) { + gCharacterGridSelections[controllerIdx] = savedSelection; play_sound2(0x49008000); } } @@ -1597,49 +1621,49 @@ void player_select_menu_act(struct Controller* controller, u16 arg1) { } // L800B38FC if (btnAndStick & CONT_RIGHT) { - if (saved_selection == 4 || saved_selection == 8) + if (savedSelection == 4 || savedSelection == 8) return; - saved_selection += 1; + savedSelection += 1; do { // L800B391C - if (is_character_spot_free(saved_selection)) { - gCharacterGridSelections[arg1] = saved_selection; + if (is_character_spot_free(savedSelection)) { + gCharacterGridSelections[controllerIdx] = savedSelection; play_sound2(0x49008000); // play_sound2(0x49008000); break; } - saved_selection += 1; - if ((saved_selection == 5) || (saved_selection == 9)) + savedSelection += 1; + if ((savedSelection == 5) || (savedSelection == 9)) return; - } while (saved_selection < 10); + } while (savedSelection < 10); return; } // L800B3978 if (btnAndStick & CONT_LEFT) { - if (saved_selection == 1 || saved_selection == 5) + if (savedSelection == 1 || savedSelection == 5) return; - saved_selection -= 1; + savedSelection -= 1; do { - if (is_character_spot_free(saved_selection)) { - gCharacterGridSelections[arg1] = saved_selection; + if (is_character_spot_free(savedSelection)) { + gCharacterGridSelections[controllerIdx] = savedSelection; play_sound2(0x49008000); break; } - saved_selection -= 1; - if ((saved_selection == 0) || (saved_selection == 4)) + savedSelection -= 1; + if ((savedSelection == 0) || (savedSelection == 4)) return; - } while (saved_selection >= 0); + } while (savedSelection >= 0); return; } // L800B39F4 - if ((btnAndStick & CONT_UP) && (saved_selection >= 5)) { - saved_selection = saved_selection - 4; + if ((btnAndStick & CONT_UP) && (savedSelection >= 5)) { + savedSelection = savedSelection - 4; } - if ((btnAndStick & CONT_DOWN) && (saved_selection < 5)) { - saved_selection = saved_selection + 4; + if ((btnAndStick & CONT_DOWN) && (savedSelection < 5)) { + savedSelection = savedSelection + 4; } // L800B3A30 - if (is_character_spot_free(saved_selection)) { - gCharacterGridSelections[arg1] = saved_selection; + if (is_character_spot_free(savedSelection)) { + gCharacterGridSelections[controllerIdx] = savedSelection; play_sound2(0x49008000); } } @@ -1647,7 +1671,7 @@ void player_select_menu_act(struct Controller* controller, u16 arg1) { } case 2: case 3: - if (arg1 == 0) { + if (controllerIdx == 0) { gMenuTimingCounter++; if ((gMenuTimingCounter == 60) || ((gMenuTimingCounter % 300) == 0)) { // L800B3A94 @@ -1656,8 +1680,8 @@ void player_select_menu_act(struct Controller* controller, u16 arg1) { } // L800B3AA4 if (btnAndStick & B_BUTTON) { - D_8018EDEE = 1; - D_8018EDE8[arg1] = false; + gPlayerSelectMenuSelection = PLAYER_SELECT_MENU_MAIN; + gCharacterGridIsSelected[controllerIdx] = false; play_sound2(SOUND_MENU_GO_BACK); break; } @@ -1671,8 +1695,8 @@ void player_select_menu_act(struct Controller* controller, u16 arg1) { break; } // L800B3B24 - if (gCharacterGridSelections[arg1] != 0) { - gCharacterSelections[arg1] = D_800F2BAC[gCharacterGridSelections[arg1] - 1]; + if (gCharacterGridSelections[controllerIdx] != 0) { + gCharacterSelections[controllerIdx] = sCharacterGridOrder[gCharacterGridSelections[controllerIdx] - 1]; } } // L800B3B44 @@ -1685,44 +1709,44 @@ u32 WorldNextCup(void); u32 WorldPreviousCup(void); u32 GetCupIndex(void); -// Handle navigating the course menu interface -void course_select_menu_act(struct Controller* arg0, u16 arg1) { - u16 buttonAndStickPress = (arg0->buttonPressed | arg0->stickPressed); +/** + * Navigation of the map select course menu screen + */ +void course_select_menu_act(struct Controller* controller, u16 controllerIdx) { + u16 btnAndStick = (controller->buttonPressed | controller->stickPressed); - if ((!gEnableDebugMode) && ((buttonAndStickPress & START_BUTTON) != 0)) { - buttonAndStickPress |= A_BUTTON; + if ((!gEnableDebugMode) && ((btnAndStick & START_BUTTON) != 0)) { + btnAndStick |= A_BUTTON; } - if (func_800B4520() == 0) { + if (is_screen_being_faded() == 0) { switch (gSubMenuSelection) { - case 1: - if ((buttonAndStickPress & R_JPAD) != 0) { - // if (GetCupIndex() < SPECIAL_CUP) { - D_8018EE0A = WorldNextCup(); + case SUB_MENU_MAP_SELECT_CUP: + if ((btnAndStick & R_JPAD) != 0) { + sTempCupSelection = WorldNextCup(); //++gCupSelection; - func_800B44AC(); + reset_cycle_flash_menu(); play_sound2(SOUND_MENU_CURSOR_MOVE); - //} } - if (((buttonAndStickPress & L_JPAD) != 0)) { - D_8018EE0A = WorldPreviousCup(); + if (((btnAndStick & L_JPAD) != 0)) { + sTempCupSelection = WorldPreviousCup(); //--gCupSelection; - func_800B44AC(); + reset_cycle_flash_menu(); play_sound2(SOUND_MENU_CURSOR_MOVE); } D_800DC540 = GetCupIndex(); gCurrentCourseId = gCupCourseOrder[gCupSelection][gCourseIndexInCup]; SetCourseFromCup(); - if ((buttonAndStickPress & B_BUTTON) != 0) { + if ((btnAndStick & B_BUTTON) != 0) { func_8009E208(); play_sound2(SOUND_MENU_GO_BACK); - } else if ((buttonAndStickPress & A_BUTTON) != 0) { + } else if ((btnAndStick & A_BUTTON) != 0) { if (gModeSelection != GRAND_PRIX) { - gSubMenuSelection = 2; + gSubMenuSelection = SUB_MENU_MAP_SELECT_COURSE; play_sound2(SOUND_MENU_SELECT); } else { - gSubMenuSelection = 3; + gSubMenuSelection = SUB_MENU_MAP_SELECT_OK; play_sound2(SOUND_MENU_SELECT); //! @todo SetCourse() to course one; SetCupCursorPosition(COURSE_ONE); @@ -1730,66 +1754,66 @@ void course_select_menu_act(struct Controller* arg0, u16 arg1) { gCurrentCourseId = gCupCourseOrder[gCupSelection][COURSE_ONE]; gMenuTimingCounter = 0; } - func_800B44AC(); + reset_cycle_flash_menu(); } break; - case 2: - case 4: - if (((buttonAndStickPress & D_JPAD) != 0) && (GetCupCursorPosition() < GetCupSize())) { + case SUB_MENU_MAP_SELECT_COURSE: + case SUB_MENU_MAP_SELECT_BATTLE_COURSE: + if (((btnAndStick & D_JPAD) != 0) && (GetCupCursorPosition() < (GetCupSize() - 1))) { ++gCourseIndexInCup; SetCupCursorPosition(GetCupCursorPosition() + 1); - func_800B44AC(); + reset_cycle_flash_menu(); play_sound2(SOUND_MENU_CURSOR_MOVE); } - if (((buttonAndStickPress & U_JPAD) != 0) && (GetCupCursorPosition() > COURSE_ONE)) { + if (((btnAndStick & U_JPAD) != 0) && (GetCupCursorPosition() > COURSE_ONE)) { --gCourseIndexInCup; SetCupCursorPosition(GetCupCursorPosition() - 1); - func_800B44AC(); + reset_cycle_flash_menu(); play_sound2(SOUND_MENU_CURSOR_MOVE); } gCurrentCourseId = gCupCourseOrder[gCupSelection][gCourseIndexInCup]; SetCourseFromCup(); - if ((buttonAndStickPress & B_BUTTON) != 0) { - if (gSubMenuSelection == 2) { - gSubMenuSelection = 1; + if ((btnAndStick & B_BUTTON) != 0) { + if (gSubMenuSelection == SUB_MENU_MAP_SELECT_COURSE) { + gSubMenuSelection = SUB_MENU_MAP_SELECT_CUP; } else { func_8009E208(); } - func_800B44AC(); + reset_cycle_flash_menu(); play_sound2(SOUND_MENU_GO_BACK); return; } - if ((buttonAndStickPress & A_BUTTON) != 0) { - gSubMenuSelection = 3; + if ((btnAndStick & A_BUTTON) != 0) { + gSubMenuSelection = SUB_MENU_MAP_SELECT_OK; play_sound2(SOUND_MENU_SELECT); - func_800B44AC(); + reset_cycle_flash_menu(); gMenuTimingCounter = 0; } break; - case 3: - if ((arg1 == 0) && ((++gMenuTimingCounter == 0x3C) || ((gMenuTimingCounter % 300) == 0))) { + case SUB_MENU_MAP_SELECT_OK: + if ((controllerIdx == PLAYER_ONE) && ((++gMenuTimingCounter == 0x3C) || ((gMenuTimingCounter % 300) == 0))) { play_sound2(SOUND_MENU_OK); } - if ((buttonAndStickPress & B_BUTTON) != 0) { + if ((btnAndStick & B_BUTTON) != 0) { switch (gModeSelection) { case GRAND_PRIX: - gSubMenuSelection = 1; + gSubMenuSelection = SUB_MENU_MAP_SELECT_CUP; break; case BATTLE: - gSubMenuSelection = 4; + gSubMenuSelection = SUB_MENU_MAP_SELECT_BATTLE_COURSE; break; default: - gSubMenuSelection = 2; + gSubMenuSelection = SUB_MENU_MAP_SELECT_COURSE; break; } - func_800B44AC(); + reset_cycle_flash_menu(); play_sound2(SOUND_MENU_GO_BACK); return; } - if ((buttonAndStickPress & A_BUTTON) != 0) { + if ((btnAndStick & A_BUTTON) != 0) { func_8009E1C0(); func_800CA330(0x19); play_sound2(SOUND_MENU_OK_CLICKED); @@ -1799,6 +1823,9 @@ void course_select_menu_act(struct Controller* arg0, u16 arg1) { } } +/** + * Loads menu states so they are preserved between menu changes + */ void load_menu_states(s32 menuSelection) { s32 i; @@ -1809,7 +1836,7 @@ void load_menu_states(s32 menuSelection) { D_8015F890 = 0; D_8015F892 = 0; gDebugGotoScene = DEBUG_GOTO_RACING; - D_8018EDFB = 0; + gGhostPlayerInit = 0; D_8016556E = 0; D_80162DD4 = 1; D_80162DD8 = 1; @@ -1818,25 +1845,25 @@ void load_menu_states(s32 menuSelection) { D_80162DCC = 0; switch (menuSelection) { - case 5: - gSubMenuSelection = 21; + case OPTIONS_MENU: + gSubMenuSelection = SUB_MENU_OPTION_RETURN_GAME_SELECT; break; - case 6: - gSubMenuSelection = 1; + case DATA_MENU: + gSubMenuSelection = SUB_MENU_DATA; break; - case 7: - gSubMenuSelection = 11; + case COURSE_DATA_MENU: + gSubMenuSelection = SUB_MENU_DATA_OPTIONS; break; - case 8: + case LOGO_INTRO_MENU: func_800CA008(0, 0); break; - case 9: { + case CONTROLLER_PAK_MENU: { gControllerPakMenuSelection = CONTROLLER_PAK_MENU_SELECT_RECORD; func_800CA008(0, 0); break; } case 0: - case 10: { + case START_MENU: { gIsMirrorMode = 0; gEnableDebugMode = CVarGetInteger("gEnableDebugMode", 0); CourseManager_SetCup(GetMushroomCup()); @@ -1849,17 +1876,17 @@ void load_menu_states(s32 menuSelection) { if (gPlayerCount >= 5) { gPlayerCount = 4; } - D_8018EDF1 = D_800F2BE0[gPlayerCount - 1]; + gScreenModeListIndex = sScreenModeIdxFromPlayerMode[gPlayerCount - 1]; func_800CA008(0, 0); play_sequence(MUSIC_SEQ_TITLE_SCREEN); - D_8018EDFC = 0; + gCourseMapInit = 0; break; } case 1: - case 11: { + case MAIN_MENU: { gEnableDebugMode = CVarGetInteger("gEnableDebugMode", 0); gIsMirrorMode = 0; - D_8018EDFC = 0; + gCourseMapInit = 0; func_800B5F30(); func_8000F0E0(); @@ -1871,9 +1898,9 @@ void load_menu_states(s32 menuSelection) { play_sequence(MUSIC_SEQ_MAIN_MENU); } - switch (D_8018EDE0) { - case 0: { - gMainMenuSelectionDepth = PLAYER_NUM_SELECTION; + switch (gMenuFadeType) { + case MENU_FADE_TYPE_MAIN: { + gMainMenuSelection = MAIN_MENU_PLAYER_SELECT; play_sequence(MUSIC_SEQ_MAIN_MENU); gPlayerCount = 1; if (gScreenModeSelection >= NUM_SCREEN_MODES || gScreenModeSelection < 0) { @@ -1881,35 +1908,35 @@ void load_menu_states(s32 menuSelection) { } break; } - case 1: { - gMainMenuSelectionDepth = CONFIRM_OK_SELECTION_FROM_BACK_OUT; + case MENU_FADE_TYPE_BACK: { + gMainMenuSelection = MAIN_MENU_OK_SELECT_GO_BACK; break; } - case 3: { + case MENU_FADE_TYPE_DATA: { // why... - switch (gMainMenuSelectionDepth) { + switch (gMainMenuSelection) { default: - gMainMenuSelectionDepth = TIME_TRIALS_DATA_SELECTION_FROM_BACK_OUT; + gMainMenuSelection = MAIN_MENU_MODE_SUB_SELECT_GO_BACK; break; - case OPTIONS_SELECTION: - case DATA_SELECTION: - gMainMenuSelectionDepth = PLAYER_NUM_SELECTION; + case MAIN_MENU_OPTION: + case MAIN_MENU_DATA: + gMainMenuSelection = MAIN_MENU_PLAYER_SELECT; break; } break; } - case 4: { - gMainMenuSelectionDepth = PLAYER_NUM_SELECTION; + case MENU_FADE_TYPE_OPTION: { + gMainMenuSelection = MAIN_MENU_PLAYER_SELECT; break; } } break; } case 2: - case 12: { - switch (D_8018EDE0) { - case 0: { - D_8018EDEE = 1; + case CHARACTER_SELECT_MENU: { + switch (gMenuFadeType) { + case MENU_FADE_TYPE_MAIN: { + gPlayerSelectMenuSelection = PLAYER_SELECT_MENU_MAIN; if (gGamestate == 0) { for (i = 0; i < ARRAY_COUNT(gCharacterGridSelections); i++) { if (i < gPlayerCount) { @@ -1917,7 +1944,7 @@ void load_menu_states(s32 menuSelection) { } else { gCharacterGridSelections[i] = 0; } - D_8018EDE8[i] = false; + gCharacterGridIsSelected[i] = false; gCharacterSelections[i] = i; } play_sound2(SOUND_MENU_SELECT_PLAYER); @@ -1927,19 +1954,19 @@ void load_menu_states(s32 menuSelection) { gGamestate = 0; gGamestateNext = 0; play_sequence(MUSIC_SEQ_MAIN_MENU); - for (i = 0; i < ARRAY_COUNT(D_8018EDE8); i++) { - D_8018EDE8[i] = false; + for (i = 0; i < ARRAY_COUNT(gCharacterGridIsSelected); i++) { + gCharacterGridIsSelected[i] = false; } } break; } - case 1: { - D_8018EDEE = 3; - for (i = 0; i < ARRAY_COUNT(D_8018EDE8); i++) { + case MENU_FADE_TYPE_BACK: { + gPlayerSelectMenuSelection = PLAYER_SELECT_MENU_OK_GO_BACK; + for (i = 0; i < ARRAY_COUNT(gCharacterGridIsSelected); i++) { if (gPlayerCount > i) { - D_8018EDE8[i] = true; + gCharacterGridIsSelected[i] = true; } else { - D_8018EDE8[i] = false; + gCharacterGridIsSelected[i] = false; } } break; @@ -1948,18 +1975,18 @@ void load_menu_states(s32 menuSelection) { break; } case 3: - case 13: { + case COURSE_SELECT_MENU: { if (gModeSelection == BATTLE) { CourseManager_SetCup(GetBattleCup()); // gCupSelection = BATTLE_CUP; D_800DC540 = 4; - gSubMenuSelection = 4; + gSubMenuSelection = SUB_MENU_MAP_SELECT_BATTLE_COURSE; } else { if (GetCup() == GetBattleCup()) { CourseManager_SetCup(GetMushroomCup()); // gCupSelection = MUSHROOM_CUP; } - gSubMenuSelection = 1; + gSubMenuSelection = SUB_MENU_MAP_SELECT_CUP; } if (gGamestate != 0) { func_800CA008(0, 0); @@ -1969,7 +1996,7 @@ void load_menu_states(s32 menuSelection) { play_sequence(MUSIC_SEQ_MAIN_MENU); } play_sound2(SOUND_MENU_SELECT_MAP); - D_8018EE0A = 0; + sTempCupSelection = 0; if (gModeSelection == GRAND_PRIX) { gCourseIndexInCup = 0; } @@ -1980,33 +2007,44 @@ void load_menu_states(s32 menuSelection) { break; } } - func_800B44AC(); + reset_cycle_flash_menu(); } -void func_800B44AC(void) { +/** + * Resets when moving cursor option or after a fade + */ +void reset_cycle_flash_menu(void) { gCycleFlashMenu = 0x20; } -void func_800B44BC(void) { +/** + * Changes sound mode pack + */ +void set_sound_mode(void) { UNUSED u32 pad; union GameModePack pack; - pack = gSoundMenuPack; + pack = sSoundMenuPack; if ((gSoundMode == SOUND_STEREO) || (gSoundMode == SOUND_HEADPHONES) || (gSoundMode == SOUND_MONO)) { func_800C3448(pack.modes[gSoundMode] | 0xE0000000); } } -// Likely checks that the user is actually in the menus and not racing. -bool func_800B4520(void) { - +/** + * Checks is a fade render mode is active so menus can't be + * interacted while a fade transition is active + */ +bool is_screen_being_faded(void) { if ((D_8018E7AC[4] == 2) || (D_8018E7AC[4] == 3) || (D_8018E7AC[4] == 4) || (D_8018E7AC[4] == 7)) { return true; } return false; } -UNUSED void func_800B4560(s32 arg0, s32 arg1) { +/** + * Unused debug function, prints the character id for the player and both controller pak ghosts + */ +UNUSED void debug_print_ghost_kart_character_id(s32 arg0, s32 arg1) { struct_8018EE10_entry* pak1 = D_8018EE10; struct_8018EE10_entry* pak2 = (struct_8018EE10_entry*) gSomeDLBuffer; diff --git a/src/menus.h b/src/menus.h index b98f461c2..1e82ec8d0 100644 --- a/src/menus.h +++ b/src/menus.h @@ -204,15 +204,15 @@ void course_data_menu_act(struct Controller*, u16); void logo_intro_menu_act(struct Controller*, u16); void controller_pak_menu_act(struct Controller*, u16); void splash_menu_act(struct Controller*, u16); -void func_800B28C8(void); +void setup_game_mode_selected(void); void main_menu_act(struct Controller*, u16); bool is_character_spot_free(s32); void player_select_menu_act(struct Controller* controller, u16 arg1); void course_select_menu_act(struct Controller*, u16); void load_menu_states(s32); -void func_800B44AC(void); -void func_800B44BC(void); -bool func_800B4520(void); +void reset_cycle_flash_menu(void); +void set_sound_mode(void); +bool is_screen_being_faded(void); /* data */ extern s32 gIntroModelZEye; @@ -223,16 +223,16 @@ extern f32 gIntroModelRotZ; extern f32 gIntroModelPosX; extern f32 gIntroModelPosY; extern f32 gIntroModelPosZ; -extern s32 D_8018EDE0; +extern s32 gMenuFadeType; extern s8 gCharacterGridSelections[]; -extern s8 D_8018EDE8[]; +extern s8 gCharacterGridIsSelected[]; extern s8 gSubMenuSelection; -extern s8 gMainMenuSelectionDepth; -extern s8 D_8018EDEE; +extern s8 gMainMenuSelection; +extern s8 gPlayerSelectMenuSelection; extern s8 gDebugMenuSelection; extern s8 gControllerPakMenuSelection; -extern s8 D_8018EDF1; +extern s8 gScreenModeListIndex; extern u8 gSoundMode; extern s8 gPlayerCount; extern s8 gVersusResultCursorSelection; @@ -240,18 +240,17 @@ extern s8 gTimeTrialsResultCursorSelection; extern s8 gBattleResultCursorSelection; extern s8 gTimeTrialDataCourseIndex; extern s8 gCourseRecordsMenuSelection; -extern s8 D_8018EDF9; +extern s8 gCourseRecordsSubMenuSelection; extern s8 gDebugGotoScene; -extern s8 D_8018EDFB; -extern s8 D_8018EDFC; +extern s8 gGhostPlayerInit; +extern s8 gCourseMapInit; extern s32 gMenuTimingCounter; extern s32 gMenuDelayTimer; extern s8 gDemoUseController; extern s8 gCupSelection; -extern s8 D_8018EE0A; +extern s8 sTempCupSelection; extern s8 gCourseIndexInCup; -extern s8 D_8018EE0C; -extern struct_8018EE10_entry D_8018EE10[]; +extern s8 unref_D_8018EE0C; extern s32 gMenuSelection; // D_800E86A0 extern s32 gFadeModeSelection; @@ -261,21 +260,21 @@ extern s8 gGameModeMenuColumn[]; extern s8 gGameModeSubMenuColumn[4][3]; extern s8 gNextDemoId; extern s8 gControllerPakSelectedTableRow; -extern s8 D_800E86C4[]; -extern s8 gControllerPakScrollDirection[]; -extern s8 unref_800E86E0[]; +extern s8 gControllerPakVisibleTableRows[]; +extern s8 gControllerPakScrollDirection; +extern s8 unref_D_800E86D4[]; extern u32 sVIGammaOffDitherOn; -extern const s8 D_800F2B50[5]; -extern const s8 D_800F2B58[5]; +extern const s8 sScreenModePlayerTable[5]; +extern const s8 sScreenModePlayerCount[5]; extern const s8 gPlayerModeSelection[]; -extern const s8 gGameModePlayerColumnDefault[][3]; -extern const s8 gGameModePlayerColumnExtra[][3]; +extern const s8 sGameModePlayerColumnDefault[][3]; +extern const s8 sGameModePlayerColumnExtra[][3]; extern const s32 gGameModePlayerSelection[][3]; -extern const s8 D_800F2BAC[8]; +extern const s8 sCharacterGridOrder[8]; extern const s16 gCupCourseOrder[NUM_CUPS][NUM_COURSES_PER_CUP]; -extern const union GameModePack gSoundMenuPack; +extern const union GameModePack sSoundMenuPack; // end of menus.c variables diff --git a/src/render_objects.c b/src/render_objects.c index ea3c96060..749e88fc2 100644 --- a/src/render_objects.c +++ b/src/render_objects.c @@ -1882,56 +1882,52 @@ void func_8004C628(s32 arg0, s32 arg1, u32 arg2, u32 arg3, u8* texture) { gSPDisplayList(gDisplayListHead++, D_0D007EB8); } -#ifdef NON_MATCHING -// https://decomp.me/scratch/TqXqn -// There's a weird fakematch concerning `xPos`, don't know that to make of. Can't quite get it over the finish line -// though +// non-matching void render_texture_tile_rgba32_block(s16 x, s16 y, u8* texture, u32 width, u32 height) { - s32 texSizeLess; - s32 i; - s32 yPos; - s32 xPos; - s32 texBlockCount; - u32 texSize; - s32 heightDiv; - s32 realCount; - u8* textureCopy; + s32 remainingSize; + s32 currX; + s32 currY; + u32 size; + s32 tileHeight; + s32 numTiles; + s32 numTilesDup; + + currX = x - (width / 2); + currY = y - (height / 2); - xPos = x - (width / 2); - yPos = y - (height / 2); - textureCopy = texture; gSPDisplayList(gDisplayListHead++, D_0D007EF8); gDPSetRenderMode(gDisplayListHead++, G_RM_XLU_SURF, G_RM_XLU_SURF2); - texSize = width * height * 4; - texBlockCount = texSize / 4096; - if (texSize % 4096) { - texBlockCount++; + + size = width * height * 4; + numTiles = size / 4096; + if (size % 4096) { + numTiles++; } - heightDiv = height / texBlockCount; - realCount = texBlockCount; - for (i = 0; i < realCount; i++) { - load_texture_tile_rgba32_nomirror(textureCopy, width, heightDiv); - render_texture_rectangle_wrap(xPos, yPos, width, heightDiv, 1); - texSizeLess = texSize - (width * heightDiv * 4); - textureCopy += (width * heightDiv * 4); - if (texSizeLess < 0) { - heightDiv = texSize / width; + + tileHeight = height / numTiles; + + numTilesDup = numTiles; + for (size_t i = 0; i < numTilesDup; i++) { + load_texture_tile_rgba32_nomirror(texture, width, tileHeight); + render_texture_rectangle_wrap(currX, currY, width, tileHeight, 1); + + texture += (width * tileHeight * 4); + remainingSize = size - (width * tileHeight * 4); + if (remainingSize < 0) { + tileHeight = size / width; } else { - texSize = texSizeLess; + size -= (width * tileHeight * 4); } // Weird fakematch that is a HUGE improvement - xPos += yPos * 0; - yPos += heightDiv; + currX += currY * 0; + currY += tileHeight; } gSPDisplayList(gDisplayListHead++, D_0D007EB8); } -#else -GLOBAL_ASM("asm/non_matchings/render_objects/render_texture_tile_rgba32_block.s") -#endif -void render_game_logo(s16 arg0, s16 arg1) { - render_texture_tile_rgba32_block(arg0, arg1, gTextureLogoMarioKart64, 0x100, 0x80); +void render_game_logo(s16 x, s16 y) { + render_texture_tile_rgba32_block(x, y, LOAD_ASSET(gTextureLogoMarioKart64), ResourceGetTexWidthByName(gTextureLogoMarioKart64), ResourceGetTexHeightByName(gTextureLogoMarioKart64)); } UNUSED void func_8004C91C(s32 arg0, s32 arg1, u8* texture, s32 arg3, s32 arg4, s32 arg5) { diff --git a/src/save.c b/src/save.c index 29e8b7068..9c5a7e698 100644 --- a/src/save.c +++ b/src/save.c @@ -19,6 +19,9 @@ // very fragile! #define EEPROM_ADDR(ptr) (((uintptr_t) (ptr) - (uintptr_t) (&gSaveData)) / 8) +/** BSS **/ +struct_8018EE10_entry D_8018EE10[2]; + /*** data ***/ u16 gCompanyCode = PFS_COMPANY_CODE('0', '1'); u32 gGameCode = PFS_GAME_CODE('N', 'K', 'T', 'J'); @@ -93,7 +96,7 @@ void reset_save_data_grand_prix_points_and_sound_mode(void) { } main->saveInfo.soundMode = SOUND_STEREO; gSoundMode = SOUND_STEREO; - func_800B44BC(); + set_sound_mode(); write_save_data_grand_prix_points_and_sound_mode(); } diff --git a/src/save.h b/src/save.h index 4d82e79a7..8983a9677 100644 --- a/src/save.h +++ b/src/save.h @@ -14,6 +14,7 @@ #define PFS_NO_ERROR 0 // controller pak no error return #define PFS_NO_PAK_INSERTED 1 // no pak pressent or wrong device inserted into the controller #define PFS_PAK_BAD_READ 2 // controller pak error while data transfer +#define PFS_PAK_CORRUPTED 3 // controller pak has courrupted or has weird data #define PFS_FILE_OVERFLOW 4 // too many files written to in the controller pak #define PFS_INVALID_DATA -1 // bad arguments, game note does not exist, osPfsInit was not called. // controller pak test functions @@ -87,6 +88,7 @@ s32 func_800B6A68(void); // these might not be in this file, but for now... extern u32* D_800DC714; +extern struct_8018EE10_entry D_8018EE10[]; extern u16 gCompanyCode; extern u32 gGameCode; // osPfs gamecode diff --git a/src/textures.h b/src/textures.h index 98cb5986d..64a9774a6 100644 --- a/src/textures.h +++ b/src/textures.h @@ -13,15 +13,13 @@ * */ typedef struct { - /* 0x00 */ s16 type; - /* 0x02 */ s16 unused1; + /* 0x00 */ s32 type; /* 0x04 */ u64* textureData; // This should be interpreted as a segmented address /* 0x08 */ u16 width; /* 0x0A */ u16 height; /* 0x0C */ u16 dX; /* 0x0E */ u16 dY; /* 0x10 */ u16 size; // This size is NOT equal to width*height. Its likely the size of the compressed texture - /* 0x12 */ s16 unused2; } MenuTexture; // size = 0x14 /** @@ -493,8 +491,8 @@ extern MenuTexture D_0200450C[2]; extern MenuTexture D_02004534[2]; extern MenuTexture D_0200455C[2]; extern MenuTexture D_02004584[1]; -extern MenuTexture D_02004598[2]; -extern MenuTexture D_020045C0[2]; +extern MenuTexture seg2_blue_sky_background_texture[2]; +extern MenuTexture seg2_sunset_background_texture[2]; extern MenuTexture seg2_copyright_1996_texture[2]; extern MenuTexture seg2_push_start_button_texture[2]; extern MenuTexture D_02004638[2]; |