diff --git a/asm/non_matchings/code_80091750/add_8018D9E0_entry.s b/asm/non_matchings/code_80091750/add_ui_element.s similarity index 99% rename from asm/non_matchings/code_80091750/add_8018D9E0_entry.s rename to asm/non_matchings/code_80091750/add_ui_element.s index 19a3eadc8..b29615870 100644 --- a/asm/non_matchings/code_80091750/add_8018D9E0_entry.s +++ b/asm/non_matchings/code_80091750/add_ui_element.s @@ -511,12 +511,12 @@ glabel L8009EC98 /* 09F8A4 8009ECA4 1000024B */ b .L8009F5D4 /* 09F8A8 8009ECA8 8FBF001C */ lw $ra, 0x1c($sp) glabel L8009ECAC -/* 09F8AC 8009ECAC 0C02D557 */ jal func_800B555C +/* 09F8AC 8009ECAC 0C02D557 */ jal has_terminate_150cc /* 09F8B0 8009ECB0 00000000 */ nop /* 09F8B4 8009ECB4 0002C080 */ sll $t8, $v0, 2 -/* 09F8B8 8009ECB8 3C04800E */ lui $a0, %hi(D_800E7D4C) +/* 09F8B8 8009ECB8 3C04800E */ lui $a0, %hi(gMenuTexturesBackground) /* 09F8BC 8009ECBC 00982021 */ addu $a0, $a0, $t8 -/* 09F8C0 8009ECC0 8C847D4C */ lw $a0, %lo(D_800E7D4C)($a0) +/* 09F8C0 8009ECC0 8C847D4C */ lw $a0, %lo(gMenuTexturesBackground)($a0) /* 09F8C4 8009ECC4 0C0265AF */ jal load_menu_img2 /* 09F8C8 8009ECC8 00002825 */ move $a1, $zero /* 09F8CC 8009ECCC 10000241 */ b .L8009F5D4 @@ -542,12 +542,12 @@ glabel L8009ED08 /* 09F914 8009ED14 1000022F */ b .L8009F5D4 /* 09F918 8009ED18 8FBF001C */ lw $ra, 0x1c($sp) glabel L8009ED1C -/* 09F91C 8009ED1C 0C02D557 */ jal func_800B555C +/* 09F91C 8009ED1C 0C02D557 */ jal has_terminate_150cc /* 09F920 8009ED20 00000000 */ nop /* 09F924 8009ED24 00027880 */ sll $t7, $v0, 2 -/* 09F928 8009ED28 3C04800E */ lui $a0, %hi(D_800E7D4C) +/* 09F928 8009ED28 3C04800E */ lui $a0, %hi(gMenuTexturesBackground) /* 09F92C 8009ED2C 008F2021 */ addu $a0, $a0, $t7 -/* 09F930 8009ED30 8C847D4C */ lw $a0, %lo(D_800E7D4C)($a0) +/* 09F930 8009ED30 8C847D4C */ lw $a0, %lo(gMenuTexturesBackground)($a0) /* 09F934 8009ED34 0C0265AF */ jal load_menu_img2 /* 09F938 8009ED38 00002825 */ move $a1, $zero /* 09F93C 8009ED3C 3C040200 */ lui $a0, %hi(D_02004B74) # $a0, 0x200 diff --git a/asm/non_matchings/code_80091750/func_800A1FB0.s b/asm/non_matchings/code_80091750/func_800A1FB0.s index ed9dfc2dd..1b70fdf84 100644 --- a/asm/non_matchings/code_80091750/func_800A1FB0.s +++ b/asm/non_matchings/code_80091750/func_800A1FB0.s @@ -94,8 +94,8 @@ glabel L800A2054 /* 0A2C54 800A2054 3C013F80 */ li $at, 0x3F800000 # 1.000000 /* 0A2C58 800A2058 4481B000 */ mtc1 $at, $f22 /* 0A2C5C 800A205C 3C01800F */ lui $at, %hi(D_800F1C28) # $at, 0x800f -/* 0A2C60 800A2060 3C11800E */ lui $s1, %hi(D_800E7868) # $s1, 0x800e -/* 0A2C64 800A2064 26317868 */ addiu $s1, %lo(D_800E7868) # addiu $s1, $s1, 0x7868 +/* 0A2C60 800A2060 3C11800E */ lui $s1, %hi(gTextOptionMenu) # $s1, 0x800e +/* 0A2C64 800A2064 26317868 */ addiu $s1, %lo(gTextOptionMenu) # addiu $s1, $s1, 0x7868 /* 0A2C68 800A2068 C4341C28 */ lwc1 $f20, %lo(D_800F1C28)($at) /* 0A2C6C 800A206C 00009025 */ move $s2, $zero /* 0A2C70 800A2070 2464FFEB */ addiu $a0, $v1, -0x15 diff --git a/asm/non_matchings/code_80091750/func_80099184.s b/asm/non_matchings/code_80091750/load_menu_img.s similarity index 100% rename from asm/non_matchings/code_80091750/func_80099184.s rename to asm/non_matchings/code_80091750/load_menu_img.s diff --git a/asm/non_matchings/code_80091750/func_800996BC.s b/asm/non_matchings/code_80091750/load_menu_img2.s similarity index 100% rename from asm/non_matchings/code_80091750/func_800996BC.s rename to asm/non_matchings/code_80091750/load_menu_img2.s diff --git a/asm/non_matchings/code_80091750/func_8009F5E0.s b/asm/non_matchings/code_80091750/menu_item_render.s similarity index 98% rename from asm/non_matchings/code_80091750/func_8009F5E0.s rename to asm/non_matchings/code_80091750/menu_item_render.s index b59331691..e59ee4245 100644 --- a/asm/non_matchings/code_80091750/func_8009F5E0.s +++ b/asm/non_matchings/code_80091750/menu_item_render.s @@ -122,7 +122,7 @@ glabel D_800F1AFC .section .text -glabel func_8009F5E0 +glabel menu_item_render /* 0A01E0 8009F5E0 27BDFF50 */ addiu $sp, $sp, -0xb0 /* 0A01E4 8009F5E4 AFBF0034 */ sw $ra, 0x34($sp) /* 0A01E8 8009F5E8 AFB10030 */ sw $s1, 0x30($sp) @@ -289,12 +289,12 @@ glabel L8009F830 /* 0A043C 8009F83C 10000422 */ b .L800A08C8 /* 0A0440 8009F840 8FBF0034 */ lw $ra, 0x34($sp) glabel L8009F844 -/* 0A0444 8009F844 0C02D557 */ jal func_800B555C +/* 0A0444 8009F844 0C02D557 */ jal has_terminate_150cc /* 0A0448 8009F848 00000000 */ nop /* 0A044C 8009F84C 00025880 */ sll $t3, $v0, 2 -/* 0A0450 8009F850 3C05800E */ lui $a1, %hi(D_800E7D4C) +/* 0A0450 8009F850 3C05800E */ lui $a1, %hi(gMenuTexturesBackground) /* 0A0454 8009F854 00AB2821 */ addu $a1, $a1, $t3 -/* 0A0458 8009F858 8CA57D4C */ lw $a1, %lo(D_800E7D4C)($a1) +/* 0A0458 8009F858 8CA57D4C */ lw $a1, %lo(gMenuTexturesBackground)($a1) /* 0A045C 8009F85C 8E040000 */ lw $a0, ($s0) /* 0A0460 8009F860 8E26000C */ lw $a2, %lo(D_FA00000C)($s1) /* 0A0464 8009F864 0C026E9D */ jal func_8009BA74 @@ -597,17 +597,17 @@ glabel L8009FB24 /* 0A08D0 8009FCD0 100002FD */ b .L800A08C8 /* 0A08D4 8009FCD4 8FBF0034 */ lw $ra, 0x34($sp) glabel L8009FCD8 -/* 0A08D8 8009FCD8 0C02D557 */ jal func_800B555C +/* 0A08D8 8009FCD8 0C02D557 */ jal has_terminate_150cc /* 0A08DC 8009FCDC 00000000 */ nop /* 0A08E0 8009FCE0 00026880 */ sll $t5, $v0, 2 -/* 0A08E4 8009FCE4 3C05800E */ lui $a1, %hi(D_800E7D4C) +/* 0A08E4 8009FCE4 3C05800E */ lui $a1, %hi(gMenuTexturesBackground) /* 0A08E8 8009FCE8 00AD2821 */ addu $a1, $a1, $t5 /* 0A08EC 8009FCEC 8E26000C */ lw $a2, 0xc($s1) /* 0A08F0 8009FCF0 8E270010 */ lw $a3, 0x10($s1) /* 0A08F4 8009FCF4 240E0003 */ li $t6, 3 /* 0A08F8 8009FCF8 AFAE0010 */ sw $t6, 0x10($sp) /* 0A08FC 8009FCFC AFA00014 */ sw $zero, 0x14($sp) -/* 0A0900 8009FD00 8CA57D4C */ lw $a1, %lo(D_800E7D4C)($a1) +/* 0A0900 8009FD00 8CA57D4C */ lw $a1, %lo(gMenuTexturesBackground)($a1) /* 0A0904 8009FD04 0C026F27 */ jal func_8009BC9C /* 0A0908 8009FD08 8E040000 */ lw $a0, ($s0) /* 0A090C 8009FD0C 100002ED */ b .L800A08C4 @@ -757,10 +757,10 @@ glabel L8009FF0C .L8009FF24: /* 0A0B24 8009FF24 00084880 */ sll $t1, $t0, 2 .L8009FF28: -/* 0A0B28 8009FF28 3C04800F */ lui $a0, %hi(D_800E824C) # 0x800f +/* 0A0B28 8009FF28 3C04800F */ lui $a0, %hi(D_800E8234-0x18) # 0x800f /* 0A0B2C 8009FF2C 00892021 */ addu $a0, $a0, $t1 /* 0A0B30 8009FF30 AFB900A8 */ sw $t9, 0xa8($sp) -/* 0A0B34 8009FF34 8C84824C */ lw $a0, %lo(D_800E824C)($a0) # -0x7db4($a0) +/* 0A0B34 8009FF34 8C84824C */ lw $a0, %lo(D_800E8234-0x18)($a0) # -0x7db4($a0) /* 0A0B38 8009FF38 0C026449 */ jal segmented_to_virtual_dupe /* 0A0B3C 8009FF3C AFA600AC */ sw $a2, 0xac($sp) /* 0A0B40 8009FF40 8FA600AC */ lw $a2, 0xac($sp) @@ -774,10 +774,10 @@ glabel L8009FF50 /* 0A0B5C 8009FF5C 1000001B */ b .L8009FFCC /* 0A0B60 8009FF60 2406FFFF */ li $a2, -1 .L8009FF64: -/* 0A0B64 8009FF64 3C04800F */ lui $a0, %hi(D_800E824C) # 0x800f +/* 0A0B64 8009FF64 3C04800F */ lui $a0, %hi(D_800E8234-0x18) # 0x800f /* 0A0B68 8009FF68 24050016 */ li $a1, 22 /* 0A0B6C 8009FF6C 008A2021 */ addu $a0, $a0, $t2 -/* 0A0B70 8009FF70 8C84824C */ lw $a0, %lo(D_800E824C)($a0) # -0x7db4($a0) +/* 0A0B70 8009FF70 8C84824C */ lw $a0, %lo(D_800E8234-0x18)($a0) # -0x7db4($a0) /* 0A0B74 8009FF74 AFA500A8 */ sw $a1, 0xa8($sp) /* 0A0B78 8009FF78 0C026449 */ jal segmented_to_virtual_dupe /* 0A0B7C 8009FF7C AFA600AC */ sw $a2, 0xac($sp) @@ -792,10 +792,10 @@ glabel L8009FF90 /* 0A0B9C 8009FF9C 1000000B */ b .L8009FFCC /* 0A0BA0 8009FFA0 2406FFFF */ li $a2, -1 .L8009FFA4: -/* 0A0BA4 8009FFA4 3C04800F */ lui $a0, %hi(D_800E824C) # 0x800f +/* 0A0BA4 8009FFA4 3C04800F */ lui $a0, %hi(D_800E8234-0x18) # 0x800f /* 0A0BA8 8009FFA8 24050018 */ li $a1, 24 /* 0A0BAC 8009FFAC 008B2021 */ addu $a0, $a0, $t3 -/* 0A0BB0 8009FFB0 8C84824C */ lw $a0, %lo(D_800E824C)($a0) # -0x7db4($a0) +/* 0A0BB0 8009FFB0 8C84824C */ lw $a0, %lo(D_800E8234-0x18)($a0) # -0x7db4($a0) /* 0A0BB4 8009FFB4 AFA500A8 */ sw $a1, 0xa8($sp) /* 0A0BB8 8009FFB8 0C026449 */ jal segmented_to_virtual_dupe /* 0A0BBC 8009FFBC AFA600AC */ sw $a2, 0xac($sp) @@ -1180,8 +1180,8 @@ glabel L800A0428 /* 0A1124 800A0524 24040003 */ li $a0, 3 /* 0A1128 800A0528 3C01800F */ lui $at, %hi(D_800F1AFC) # $at, 0x800f /* 0A112C 800A052C C4201AFC */ lwc1 $f0, %lo(D_800F1AFC)($at) -/* 0A1130 800A0530 3C06800E */ lui $a2, %hi(D_800E77B4) # $a2, 0x800e -/* 0A1134 800A0534 24C677B4 */ addiu $a2, %lo(D_800E77B4) # addiu $a2, $a2, 0x77b4 +/* 0A1130 800A0530 3C06800E */ lui $a2, %hi(gTextMenuData) # $a2, 0x800e +/* 0A1134 800A0534 24C677B4 */ addiu $a2, %lo(gTextMenuData) # addiu $a2, $a2, 0x77b4 /* 0A1138 800A0538 24040125 */ li $a0, 293 /* 0A113C 800A053C 2405001C */ li $a1, 28 /* 0A1140 800A0540 00003825 */ move $a3, $zero diff --git a/asm/non_matchings/code_80091750/func_800A474C.s b/asm/non_matchings/code_80091750/render_player_time.s similarity index 100% rename from asm/non_matchings/code_80091750/func_800A474C.s rename to asm/non_matchings/code_80091750/render_player_time.s diff --git a/asm/non_matchings/menus/main_menu_act.s b/asm/non_matchings/menus/main_menu_act.s index f03d69c88..ab5056e92 100644 --- a/asm/non_matchings/menus/main_menu_act.s +++ b/asm/non_matchings/menus/main_menu_act.s @@ -463,7 +463,7 @@ glabel L800B2F70 # case 5, 8 /* 0B3C70 800B3070 00000000 */ nop /* 0B3C74 800B3074 AFA00024 */ sw $zero, 0x24($sp) /* 0B3C78 800B3078 AFA50028 */ sw $a1, 0x28($sp) -/* 0B3C7C 800B307C 0C02D557 */ jal func_800B555C +/* 0B3C7C 800B307C 0C02D557 */ jal has_terminate_150cc /* 0B3C80 800B3080 AFA6001C */ sw $a2, 0x1c($sp) /* 0B3C84 800B3084 8FA30024 */ lw $v1, 0x24($sp) /* 0B3C88 800B3088 8FA50028 */ lw $a1, 0x28($sp) diff --git a/baserom.us.eeprom b/baserom.us.eeprom new file mode 100644 index 000000000..cf0fbc0e2 Binary files /dev/null and b/baserom.us.eeprom differ diff --git a/baserom.us.pak b/baserom.us.pak new file mode 100644 index 000000000..2cfd31c55 Binary files /dev/null and b/baserom.us.pak differ diff --git a/src/code_80091750.c b/src/code_80091750.c index 6562bcf60..7786b6558 100644 --- a/src/code_80091750.c +++ b/src/code_80091750.c @@ -57,7 +57,7 @@ struct_8018E060_entry D_8018E060[D_8018E060_SIZE]; UNUSED u8 code_80091750_bss_padding0[8]; struct_8018E0E8_entry D_8018E0E8[D_8018E0E8_SIZE]; s32 gMenuTextureBufferIndex; -static TextureMap sMenuTextureMap[TEXTURE_MAP_MAX]; +TextureMap sMenuTextureMap[TEXTURE_MAP_MAX]; s32 gNumD_8018E118Entries; Gfx* sGfxPtr; s32 gNumD_8018E768Entries; @@ -879,16 +879,19 @@ MenuTexture* D_800E822C[] = { // In a perfect world this would be `MenuTexture *D_800E8234[][2]` MenuTexture* D_800E8234[] = { - D_02004688, D_020047DC, D_020046D8, D_02004804, D_0200473C, D_0200482C, -}; - -MenuTexture* D_800E824C[] = { - D_0200478C, - D_02004854, + gMenuTextureOnePlayerColone, D_020047DC, gMenuTextureTwoPlayerColone, D_02004804, + gMenuTextureThreePlayerColone, D_0200482C, gMenuTextureFourPlayerColone, D_02004854, }; MenuTexture* D_800E8254[] = { - D_02004660, D_02004688, D_020046D8, D_0200473C, D_0200478C, D_0200487C, D_020048A4, D_020048CC, + D_02004660, + gMenuTextureOnePlayerColone, + gMenuTextureTwoPlayerColone, + gMenuTextureThreePlayerColone, + gMenuTextureFourPlayerColone, + D_0200487C, + D_020048A4, + D_020048CC, }; MenuTexture* D_800E8274[] = { @@ -5361,7 +5364,7 @@ void func_8009E620(void) { } } -#ifndef NON_MATCHING +#ifdef NON_MATCHING // https://decomp.me/scratch/1BHpa // Stack differences, can't figure out how to fix them void add_ui_element(s32 type, s32 column, s32 row, s8 priority) { @@ -5798,7 +5801,7 @@ void add_ui_element(s32 type, s32 column, s32 row, s8 priority) { GLOBAL_ASM("asm/non_matchings/code_80091750/add_ui_element.s") #endif -#ifndef NON_MATCHING +#ifdef NON_MATCHING // https://decomp.me/scratch/MatRp // Biggest diff left is in the case 0x12 though 0x19 handling. Not really sure what's going on there // There's also a diff in the handling of D_800E77A0 in case 0x4. Not sure what's going on there either @@ -5868,8 +5871,8 @@ void menu_item_render(MenuItem* arg0) { func_800A0EB8(arg0, arg0->type - 0xD8); break; case START_MENU_BACKGROUND: /* switch 6 */ - gDisplayListHead = - func_8009BA74(gDisplayListHead, gMenuTexturesBackground[has_terminate_150cc()], arg0->column, arg0->row); + gDisplayListHead = func_8009BA74(gDisplayListHead, gMenuTexturesBackground[has_terminate_150cc()], + arg0->column, arg0->row); break; case START_MENU_LOGO_AND_COPYRIGHT: /* switch 6 */ func_8004C8D4((arg0->column + 0xA0), (arg0->row + 0x47)); @@ -5923,8 +5926,8 @@ void menu_item_render(MenuItem* arg0) { case MAIN_MENU_BACKGROUND: /* switch 6 */ case CHARACTER_SELECT_BACKGROUND: /* switch 6 */ case COURSE_SELECT_BACKGROUND: /* switch 6 */ - gDisplayListHead = - func_8009BC9C(gDisplayListHead, gMenuTexturesBackground[has_terminate_150cc()], arg0->column, arg0->row, 3, 0); + gDisplayListHead = func_8009BC9C(gDisplayListHead, gMenuTexturesBackground[has_terminate_150cc()], + arg0->column, arg0->row, 3, 0); break; case MAIN_MENU_GAME_SELECT: /* switch 6 */ gDisplayListHead = func_8009BA74(gDisplayListHead, D_02004660, arg0->column, arg0->row); @@ -5979,7 +5982,7 @@ void menu_item_render(MenuItem* arg0) { var_v1 = -1; } var_a1 = 18; - sp9C = segmented_to_virtual_dupe(D_800E824C[arg0->type]); + sp9C = segmented_to_virtual_dupe(D_800E8234[arg0->type - MAIN_MENU_50CC]); break; case D_8018D9E0_TYPE_016: /* switch 5 */ case D_8018D9E0_TYPE_017: /* switch 5 */ @@ -5987,7 +5990,7 @@ void menu_item_render(MenuItem* arg0) { var_v1 = -1; } else { var_a1 = 22; - sp9C = segmented_to_virtual_dupe(D_800E824C[arg0->type]); + sp9C = segmented_to_virtual_dupe(D_800E8234[arg0->type - MAIN_MENU_50CC]); } break; case MAIN_MENU_TIME_TRIALS_BEGIN: /* switch 5 */ @@ -5996,7 +5999,7 @@ void menu_item_render(MenuItem* arg0) { var_v1 = -1; } else { var_a1 = 24; - sp9C = segmented_to_virtual_dupe(D_800E824C[arg0->type]); + sp9C = segmented_to_virtual_dupe(D_800E8234[arg0->type - MAIN_MENU_50CC]); } break; } @@ -8108,7 +8111,7 @@ void func_800A638C(MenuItem* arg0) { } } -#ifdef NON_MATCHING +#ifndef NON_MATCHING void guMtxCatL(Mtx*, Mtx*, Mtx*); // https://decomp.me/scratch/GUqCE // All the math stuff at the top is messed up @@ -10707,7 +10710,7 @@ void func_800AC324(MenuItem* arg0) { #ifdef NON_MATCHING // https://decomp.me/scratch/NzdUC // A really stupid register allocation issue -void func_800AC458(struct_8018D9E0_entry* arg0) { +void func_800AC458(MenuItem* arg0) { s32 var_a1; s32 var_t1; diff --git a/src/code_80091750.h b/src/code_80091750.h index 82743f74b..d6984fd8c 100644 --- a/src/code_80091750.h +++ b/src/code_80091750.h @@ -209,6 +209,8 @@ enum D_8018D9E0_type { D_8018D9E0_TYPE_096 = 0x96, D_8018D9E0_TYPE_097, D_8018D9E0_TYPE_098, + D_8018D9E0_TYPE_0A0 = 0xA0, + D_8018D9E0_TYPE_0A1, D_8018D9E0_TYPE_0AA = 0xAA, D_8018D9E0_TYPE_0AB, D_8018D9E0_TYPE_0AC, @@ -798,7 +800,6 @@ extern MenuTexture* D_800E817C[]; extern MenuTexture* D_800E81E4[]; extern MenuTexture* D_800E822C[]; extern MenuTexture* D_800E8234[]; -extern MenuTexture* D_800E824C[]; extern MenuTexture* D_800E8254[]; extern MenuTexture* D_800E8274[]; extern MenuTexture* D_800E8294[]; diff --git a/src/data/textures.c b/src/data/textures.c index fcf2c7c01..6e5598178 100644 --- a/src/data/textures.c +++ b/src/data/textures.c @@ -4204,7 +4204,7 @@ MenuTexture D_02004660[2] = { * @brief MenuTexture for the first colone one player * */ -MenuTexture D_02004688[4] = { +MenuTexture gMenuTextureOnePlayerColone[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 }, @@ -4215,7 +4215,7 @@ MenuTexture D_02004688[4] = { * @brief MenuTexture for the first colone two player * */ -MenuTexture D_020046D8[5] = { +MenuTexture gMenuTextureTwoPlayerColone[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 }, @@ -4227,7 +4227,7 @@ MenuTexture D_020046D8[5] = { * @brief MenuTexture for the first colone three player * */ -MenuTexture D_0200473C[4] = { +MenuTexture gMenuTextureThreePlayerColone[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 }, @@ -4238,7 +4238,7 @@ MenuTexture D_0200473C[4] = { * @brief MenuTexture for the first colone four player * */ -MenuTexture D_0200478C[4] = { +MenuTexture gMenuTextureFourPlayerColone[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 }, diff --git a/src/textures.h b/src/textures.h index 21185429d..25359b5b9 100644 --- a/src/textures.h +++ b/src/textures.h @@ -494,10 +494,10 @@ extern MenuTexture D_020045E8[2]; extern MenuTexture D_02004610[2]; extern MenuTexture D_02004638[2]; extern MenuTexture D_02004660[2]; -extern MenuTexture D_02004688[4]; -extern MenuTexture D_020046D8[5]; -extern MenuTexture D_0200473C[4]; -extern MenuTexture D_0200478C[4]; +extern MenuTexture gMenuTextureOnePlayerColone[4]; +extern MenuTexture gMenuTextureTwoPlayerColone[5]; +extern MenuTexture gMenuTextureThreePlayerColone[4]; +extern MenuTexture gMenuTextureFourPlayerColone[4]; extern MenuTexture D_020047DC[2]; extern MenuTexture D_02004804[2]; extern MenuTexture D_0200482C[2];