mirror/mk64
1
0
Fork 0
mirror of https://github.com/n64decomp/mk64 synced 2026-07-03 11:40:13 -04:00
Code Issues Packages Projects Releases Wiki Activity

continue rename

Browse Source
This commit is contained in:
coco875
2024-10-07 19:34:28 +02:00
parent 9ad4f29c3c
commit 52d8c3e21a
9 changed files with 1144 additions and 1117 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/non_matchings/code_80091750/add_ui_element.s
+8 -8
View File
@@ -252,7 +252,7 @@ glabel L8009E888
/* 09F4B8 8009E8B8 8FE6000C */ lw $a2, 0xc($ra)
/* 09F4BC 8009E8BC 8FE70010 */ lw $a3, 0x10($ra)
/* 09F4C0 8009E8C0 24A514C8 */ addiu $a1, %lo(D_020014C8) # addiu $a1, $a1, 0x14c8
/* 09F4C4 8009E8C4 0C026E9D */ jal func_8009BA74
/* 09F4C4 8009E8C4 0C026E9D */ jal render_menu_textures
/* 09F4C8 8009E8C8 8D040000 */ lw $a0, ($t0)
/* 09F4CC 8009E8CC 3C088019 */ lui $t0, %hi(sGfxPtr) # $t0, 0x8019
/* 09F4D0 8009E8D0 2508E75C */ addiu $t0, %lo(sGfxPtr) # addiu $t0, $t0, -0x18a4
@@ -276,7 +276,7 @@ glabel L8009E8E4
/* 09F514 8009E914 8FE6000C */ lw $a2, 0xc($ra)
/* 09F518 8009E918 8FE70010 */ lw $a3, 0x10($ra)
/* 09F51C 8009E91C 24A51540 */ addiu $a1, %lo(D_02001540) # addiu $a1, $a1, 0x1540
/* 09F520 8009E920 0C026E9D */ jal func_8009BA74
/* 09F520 8009E920 0C026E9D */ jal render_menu_textures
/* 09F524 8009E924 8D040000 */ lw $a0, ($t0)
/* 09F528 8009E928 3C088019 */ lui $t0, %hi(sGfxPtr) # $t0, 0x8019
/* 09F52C 8009E92C 2508E75C */ addiu $t0, %lo(sGfxPtr) # addiu $t0, $t0, -0x18a4
@@ -328,7 +328,7 @@ glabel L8009E9AC
/* 09F5D8 8009E9D8 8FE6000C */ lw $a2, 0xc($ra)
/* 09F5DC 8009E9DC 8FE70010 */ lw $a3, 0x10($ra)
/* 09F5E0 8009E9E0 24A515A4 */ addiu $a1, %lo(D_020015A4) # addiu $a1, $a1, 0x15a4
/* 09F5E4 8009E9E4 0C026E9D */ jal func_8009BA74
/* 09F5E4 8009E9E4 0C026E9D */ jal render_menu_textures
/* 09F5E8 8009E9E8 8D040000 */ lw $a0, ($t0)
/* 09F5EC 8009E9EC 3C088019 */ lui $t0, %hi(sGfxPtr) # $t0, 0x8019
/* 09F5F0 8009E9F0 2508E75C */ addiu $t0, %lo(sGfxPtr) # addiu $t0, $t0, -0x18a4
@@ -431,7 +431,7 @@ glabel L8009E9AC
/* 09F774 8009EB74 8FE6000C */ lw $a2, 0xc($ra)
/* 09F778 8009EB78 8FE70010 */ lw $a3, 0x10($ra)
/* 09F77C 8009EB7C 24A515CC */ addiu $a1, %lo(D_020015CC) # addiu $a1, $a1, 0x15cc
/* 09F780 8009EB80 0C026E9D */ jal func_8009BA74
/* 09F780 8009EB80 0C026E9D */ jal render_menu_textures
/* 09F784 8009EB84 8D040000 */ lw $a0, ($t0)
/* 09F788 8009EB88 3C088019 */ lui $t0, %hi(sGfxPtr) # $t0, 0x8019
/* 09F78C 8009EB8C 2508E75C */ addiu $t0, %lo(sGfxPtr) # addiu $t0, $t0, -0x18a4
@@ -450,7 +450,7 @@ glabel L8009E9AC
/* 09F7C0 8009EBC0 8FE6000C */ lw $a2, 0xc($ra)
/* 09F7C4 8009EBC4 8FE70010 */ lw $a3, 0x10($ra)
/* 09F7C8 8009EBC8 24A51630 */ addiu $a1, %lo(D_02001630) # addiu $a1, $a1, 0x1630
/* 09F7CC 8009EBCC 0C026E9D */ jal func_8009BA74
/* 09F7CC 8009EBCC 0C026E9D */ jal render_menu_textures
/* 09F7D0 8009EBD0 8D040000 */ lw $a0, ($t0)
/* 09F7D4 8009EBD4 3C088019 */ lui $t0, %hi(sGfxPtr) # $t0, 0x8019
/* 09F7D8 8009EBD8 2508E75C */ addiu $t0, %lo(sGfxPtr) # addiu $t0, $t0, -0x18a4
@@ -469,7 +469,7 @@ glabel L8009E9AC
/* 09F80C 8009EC0C 8FE6000C */ lw $a2, 0xc($ra)
/* 09F810 8009EC10 8FE70010 */ lw $a3, 0x10($ra)
/* 09F814 8009EC14 24A51658 */ addiu $a1, %lo(D_02001658) # addiu $a1, $a1, 0x1658
/* 09F818 8009EC18 0C026E9D */ jal func_8009BA74
/* 09F818 8009EC18 0C026E9D */ jal render_menu_textures
/* 09F81C 8009EC1C 8D040000 */ lw $a0, ($t0)
/* 09F820 8009EC20 3C088019 */ lui $t0, %hi(sGfxPtr) # $t0, 0x8019
/* 09F824 8009EC24 2508E75C */ addiu $t0, %lo(sGfxPtr) # addiu $t0, $t0, -0x18a4
@@ -814,9 +814,9 @@ glabel L8009F0E0
/* 09FD04 8009F104 10000133 */ b .L8009F5D4
/* 09FD08 8009F108 8FBF001C */ lw $ra, 0x1c($sp)
glabel L8009F10C
/* 09FD0C 8009F10C 3C040200 */ lui $a0, %hi(D_02004A34) # $a0, 0x200
/* 09FD0C 8009F10C 3C040200 */ lui $a0, %hi(gMenuTextureData) # $a0, 0x200
/* 09FD10 8009F110 0C026449 */ jal segmented_to_virtual_dupe
/* 09FD14 8009F114 24844A34 */ addiu $a0, %lo(D_02004A34) # addiu $a0, $a0, 0x4a34
/* 09FD14 8009F114 24844A34 */ addiu $a0, %lo(gMenuTextureData) # addiu $a0, $a0, 0x4a34
/* 09FD18 8009F118 00402025 */ move $a0, $v0
/* 09FD1C 8009F11C 0C0265AF */ jal load_menu_img2
/* 09FD20 8009F120 00002825 */ move $a1, $zero
asm/non_matchings/code_80091750/func_800AB314.s
+1 -1
View File
@@ -8,7 +8,7 @@ glabel func_800AB314
/* 0ABF28 800AB328 24A4005F */ addiu $a0, $a1, 0x5f
/* 0ABF2C 800AB32C AFA3001C */ sw $v1, 0x1c($sp)
/* 0ABF30 800AB330 AFA5003C */ sw $a1, 0x3c($sp)
/* 0ABF34 800AB334 0C02ABBD */ jal find_8018D9E0_entry_dupe
/* 0ABF34 800AB334 0C02ABBD */ jal find_menu_items_type_dupe
/* 0ABF38 800AB338 AFA60040 */ sw $a2, 0x40($sp)
/* 0ABF3C 800AB33C 8FA5003C */ lw $a1, 0x3c($sp)
/* 0ABF40 800AB340 8FA3001C */ lw $v1, 0x1c($sp)
asm/non_matchings/code_80091750/menu_item_render.s
+20 -20
View File
@@ -297,7 +297,7 @@ glabel L8009F844
/* 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
/* 0A0464 8009F864 0C026E9D */ jal render_menu_textures
/* 0A0468 8009F868 8E270010 */ lw $a3, %lo(D_FA000010)($s1)
/* 0A046C 8009F86C 10000415 */ b .L800A08C4
/* 0A0470 8009F870 AE020000 */ sw $v0, ($s0)
@@ -315,7 +315,7 @@ glabel L8009F874
/* 0A049C 8009F89C 24A545E8 */ addiu $a1, %lo(D_020045E8) # addiu $a1, $a1, 0x45e8
/* 0A04A0 8009F8A0 8E040000 */ lw $a0, ($s0)
/* 0A04A4 8009F8A4 8E26000C */ lw $a2, %lo(D_FA00000C)($s1)
/* 0A04A8 8009F8A8 0C026E9D */ jal func_8009BA74
/* 0A04A8 8009F8A8 0C026E9D */ jal render_menu_textures
/* 0A04AC 8009F8AC 8E270010 */ lw $a3, %lo(D_FA000010)($s1)
/* 0A04B0 8009F8B0 10000404 */ b .L800A08C4
/* 0A04B4 8009F8B4 AE020000 */ sw $v0, ($s0)
@@ -336,7 +336,7 @@ glabel L8009F8B8
/* 0A04E8 8009F8E8 8FBF0034 */ lw $ra, 0x34($sp)
/* 0A04EC 8009F8EC 8E040000 */ lw $a0, ($s0)
/* 0A04F0 8009F8F0 8E26000C */ lw $a2, %lo(D_FA00000C)($s1)
/* 0A04F4 8009F8F4 0C026E9D */ jal func_8009BA74
/* 0A04F4 8009F8F4 0C026E9D */ jal render_menu_textures
/* 0A04F8 8009F8F8 8E270010 */ lw $a3, %lo(D_FA000010)($s1)
/* 0A04FC 8009F8FC 100003F1 */ b .L800A08C4
/* 0A0500 8009F900 AE020000 */ sw $v0, ($s0)
@@ -587,9 +587,9 @@ glabel L8009FB24
/* 0A08A8 8009FCA8 00000000 */ nop
/* 0A08AC 8009FCAC 8FA20040 */ lw $v0, 0x40($sp)
/* 0A08B0 8009FCB0 8FA30044 */ lw $v1, 0x44($sp)
/* 0A08B4 8009FCB4 3C0C800E */ lui $t4, %hi(D_800E77A8) # $t4, 0x800e
/* 0A08B4 8009FCB4 3C0C800E */ lui $t4, %hi(gTextBattleIntroduction) # $t4, 0x800e
/* 0A08B8 8009FCB8 3C013F40 */ li $at, 0x3F400000 # 0.750000
/* 0A08BC 8009FCBC 258C77A8 */ addiu $t4, %lo(D_800E77A8) # addiu $t4, $t4, 0x77a8
/* 0A08BC 8009FCBC 258C77A8 */ addiu $t4, %lo(gTextBattleIntroduction) # addiu $t4, $t4, 0x77a8
/* 0A08C0 8009FCC0 44810000 */ mtc1 $at, $f0
/* 0A08C4 8009FCC4 24420004 */ addiu $v0, $v0, 4
/* 0A08C8 8009FCC8 144CFFE8 */ bne $v0, $t4, .L8009FC6C
@@ -617,7 +617,7 @@ glabel L8009FD14
/* 0A0918 8009FD18 24A54660 */ addiu $a1, %lo(D_02004660) # addiu $a1, $a1, 0x4660
/* 0A091C 8009FD1C 8E040000 */ lw $a0, ($s0)
/* 0A0920 8009FD20 8E26000C */ lw $a2, 0xc($s1)
/* 0A0924 8009FD24 0C026E9D */ jal func_8009BA74
/* 0A0924 8009FD24 0C026E9D */ jal render_menu_textures
/* 0A0928 8009FD28 8E270010 */ lw $a3, 0x10($s1)
/* 0A092C 8009FD2C 100002E5 */ b .L800A08C4
/* 0A0930 8009FD30 AE020000 */ sw $v0, ($s0)
@@ -866,7 +866,7 @@ glabel L8009FF90
/* 0A0CB0 800A00B0 8E040000 */ lw $a0, ($s0)
/* 0A0CB4 800A00B4 8FA5009C */ lw $a1, 0x9c($sp)
/* 0A0CB8 800A00B8 8E26000C */ lw $a2, 0xc($s1)
/* 0A0CBC 800A00BC 0C026E9D */ jal func_8009BA74
/* 0A0CBC 800A00BC 0C026E9D */ jal render_menu_textures
/* 0A0CC0 800A00C0 8E270010 */ lw $a3, 0x10($s1)
/* 0A0CC4 800A00C4 100001FF */ b .L800A08C4
/* 0A0CC8 800A00C8 AE020000 */ sw $v0, ($s0)
@@ -880,7 +880,7 @@ glabel L800A00DC
/* 0A0CE0 800A00E0 24A54B4C */ addiu $a1, %lo(D_02004B4C) # addiu $a1, $a1, 0x4b4c
/* 0A0CE4 800A00E4 8E040000 */ lw $a0, ($s0)
/* 0A0CE8 800A00E8 8E26000C */ lw $a2, 0xc($s1)
/* 0A0CEC 800A00EC 0C026E9D */ jal func_8009BA74
/* 0A0CEC 800A00EC 0C026E9D */ jal render_menu_textures
/* 0A0CF0 800A00F0 8E270010 */ lw $a3, 0x10($s1)
/* 0A0CF4 800A00F4 100001F3 */ b .L800A08C4
/* 0A0CF8 800A00F8 AE020000 */ sw $v0, ($s0)
@@ -920,7 +920,7 @@ glabel L800A00FC
.L800A0170:
/* 0A0D70 800A0170 24C600BF */ addiu $a2, $a2, 0xbf
.L800A0174:
/* 0A0D74 800A0174 0C028474 */ jal func_800A11D0
/* 0A0D74 800A0174 0C028474 */ jal render_cursor_player
/* 0A0D78 800A0178 02202025 */ move $a0, $s1
/* 0A0D7C 800A017C 100001D2 */ b .L800A08C8
/* 0A0D80 800A0180 8FBF0034 */ lw $ra, 0x34($sp)
@@ -968,7 +968,7 @@ glabel L800A01F8
/* 0A0E18 800A0218 8E040000 */ lw $a0, ($s0)
/* 0A0E1C 800A021C 00402825 */ move $a1, $v0
/* 0A0E20 800A0220 8E26000C */ lw $a2, 0xc($s1)
/* 0A0E24 800A0224 0C026E9D */ jal func_8009BA74
/* 0A0E24 800A0224 0C026E9D */ jal render_menu_textures
/* 0A0E28 800A0228 8E270010 */ lw $a3, 0x10($s1)
/* 0A0E2C 800A022C AE020000 */ sw $v0, ($s0)
/* 0A0E30 800A0230 0C02A329 */ jal func_800A8CA4
@@ -984,7 +984,7 @@ glabel L800A0240
/* 0A0E54 800A0254 8E040000 */ lw $a0, ($s0)
/* 0A0E58 800A0258 00402825 */ move $a1, $v0
/* 0A0E5C 800A025C 8E26000C */ lw $a2, 0xc($s1)
/* 0A0E60 800A0260 0C026E9D */ jal func_8009BA74
/* 0A0E60 800A0260 0C026E9D */ jal render_menu_textures
/* 0A0E64 800A0264 8E270010 */ lw $a3, 0x10($s1)
/* 0A0E68 800A0268 10000196 */ b .L800A08C4
/* 0A0E6C 800A026C AE020000 */ sw $v0, ($s0)
@@ -1054,7 +1054,7 @@ glabel L800A02DC
/* 0A0F54 800A0354 1000015C */ b .L800A08C8
/* 0A0F58 800A0358 8FBF0034 */ lw $ra, 0x34($sp)
glabel L800A035C
/* 0A0F5C 800A035C 0C02A385 */ jal func_800A8E14
/* 0A0F5C 800A035C 0C02A385 */ jal render_battle_introduction
/* 0A0F60 800A0360 02202025 */ move $a0, $s1
/* 0A0F64 800A0364 10000158 */ b .L800A08C8
/* 0A0F68 800A0368 8FBF0034 */ lw $ra, 0x34($sp)
@@ -1090,7 +1090,7 @@ glabel L800A037C
/* 0A0FD8 800A03D8 8E040000 */ lw $a0, ($s0)
/* 0A0FDC 800A03DC 00402825 */ move $a1, $v0
/* 0A0FE0 800A03E0 8E26000C */ lw $a2, 0xc($s1)
/* 0A0FE4 800A03E4 0C026E9D */ jal func_8009BA74
/* 0A0FE4 800A03E4 0C026E9D */ jal render_menu_textures
/* 0A0FE8 800A03E8 8E270010 */ lw $a3, 0x10($s1)
/* 0A0FEC 800A03EC 10000135 */ b .L800A08C4
/* 0A0FF0 800A03F0 AE020000 */ sw $v0, ($s0)
@@ -1169,11 +1169,11 @@ glabel L800A0428
/* 0A10FC 800A04FC 24A7003F */ addiu $a3, $a1, 0x3f
/* 0A1100 800A0500 AE020000 */ sw $v0, ($s0)
.L800A0504:
/* 0A1104 800A0504 3C050200 */ lui $a1, %hi(D_02004A34) # $a1, 0x200
/* 0A1108 800A0508 24A54A34 */ addiu $a1, %lo(D_02004A34) # addiu $a1, $a1, 0x4a34
/* 0A1104 800A0504 3C050200 */ lui $a1, %hi(gMenuTextureData) # $a1, 0x200
/* 0A1108 800A0508 24A54A34 */ addiu $a1, %lo(gMenuTextureData) # addiu $a1, $a1, 0x4a34
/* 0A110C 800A050C 8E040000 */ lw $a0, ($s0)
/* 0A1110 800A0510 8E26000C */ lw $a2, 0xc($s1)
/* 0A1114 800A0514 0C026E9D */ jal func_8009BA74
/* 0A1114 800A0514 0C026E9D */ jal render_menu_textures
/* 0A1118 800A0518 8E270010 */ lw $a3, 0x10($s1)
/* 0A111C 800A051C AE020000 */ sw $v0, ($s0)
/* 0A1120 800A0520 0C024C36 */ jal set_text_color
@@ -1299,7 +1299,7 @@ glabel L800A0694
/* 0A12D0 800A06D0 8E040000 */ lw $a0, ($s0)
/* 0A12D4 800A06D4 00402825 */ move $a1, $v0
/* 0A12D8 800A06D8 8E26000C */ lw $a2, 0xc($s1)
/* 0A12DC 800A06DC 0C026E9D */ jal func_8009BA74
/* 0A12DC 800A06DC 0C026E9D */ jal render_menu_textures
/* 0A12E0 800A06E0 8E270010 */ lw $a3, 0x10($s1)
/* 0A12E4 800A06E4 AE020000 */ sw $v0, ($s0)
/* 0A12E8 800A06E8 8E2E001C */ lw $t6, 0x1c($s1)
@@ -1311,7 +1311,7 @@ glabel L800A0694
/* 0A1300 800A0700 AFAE0010 */ sw $t6, 0x10($sp)
/* 0A1304 800A0704 02202025 */ move $a0, $s1
/* 0A1308 800A0708 8FA500A8 */ lw $a1, 0xa8($sp)
/* 0A130C 800A070C 0C028474 */ jal func_800A11D0
/* 0A130C 800A070C 0C028474 */ jal render_cursor_player
/* 0A1310 800A0710 240600FF */ li $a2, 255
/* 0A1314 800A0714 1000006C */ b .L800A08C8
/* 0A1318 800A0718 8FBF0034 */ lw $ra, 0x34($sp)
@@ -1375,7 +1375,7 @@ glabel L800A07CC
/* 0A13D0 800A07D0 24A54638 */ addiu $a1, %lo(D_02004638) # addiu $a1, $a1, 0x4638
/* 0A13D4 800A07D4 8E040000 */ lw $a0, ($s0)
/* 0A13D8 800A07D8 8E26000C */ lw $a2, 0xc($s1)
/* 0A13DC 800A07DC 0C026E9D */ jal func_8009BA74
/* 0A13DC 800A07DC 0C026E9D */ jal render_menu_textures
/* 0A13E0 800A07E0 8E270010 */ lw $a3, 0x10($s1)
/* 0A13E4 800A07E4 10000037 */ b .L800A08C4
/* 0A13E8 800A07E8 AE020000 */ sw $v0, ($s0)
@@ -1426,7 +1426,7 @@ glabel L800A084C
/* 0A1480 800A0880 8E040000 */ lw $a0, ($s0)
/* 0A1484 800A0884 00402825 */ move $a1, $v0
/* 0A1488 800A0888 8E26000C */ lw $a2, 0xc($s1)
/* 0A148C 800A088C 0C026E9D */ jal func_8009BA74
/* 0A148C 800A088C 0C026E9D */ jal render_menu_textures
/* 0A1490 800A0890 8E270010 */ lw $a3, 0x10($s1)
/* 0A1494 800A0894 AE020000 */ sw $v0, ($s0)
/* 0A1498 800A0898 8E29001C */ lw $t1, 0x1c($s1)
asm/non_matchings/code_80091750/render_player_time.s
+1 -1
View File
@@ -86,7 +86,7 @@ glabel render_player_time
/* 0A5438 800A4838 8FAB0030 */ lw $t3, 0x30($sp)
/* 0A543C 800A483C 55600024 */ bnel $t3, $zero, .L800A48D0
/* 0A5440 800A4840 24020003 */ li $v0, 3
/* 0A5444 800A4844 0C02ABBD */ jal find_8018D9E0_entry_dupe
/* 0A5444 800A4844 0C02ABBD */ jal find_menu_items_type_dupe
/* 0A5448 800A4848 240400BB */ li $a0, 187
/* 0A544C 800A484C 8FAC0050 */ lw $t4, 0x50($sp)
/* 0A5450 800A4850 29810005 */ slti $at, $t4, 5
src/code_80091750.c
+873 -852
View File
File diff suppressed because it is too large Load Diff
src/code_80091750.h
+187 -187
View File
@@ -89,26 +89,26 @@ typedef struct {
/* 0x06 */ s16 pad1;
} Unk_D_800E70A0; // size = 0x08
enum D_8018D9E0_priority {
D_8018D9E0_PRIORITY_0,
D_8018D9E0_PRIORITY_1,
D_8018D9E0_PRIORITY_2,
D_8018D9E0_PRIORITY_3,
D_8018D9E0_PRIORITY_4,
D_8018D9E0_PRIORITY_5,
D_8018D9E0_PRIORITY_6,
D_8018D9E0_PRIORITY_7,
D_8018D9E0_PRIORITY_8,
D_8018D9E0_PRIORITY_9,
D_8018D9E0_PRIORITY_A,
D_8018D9E0_PRIORITY_B,
D_8018D9E0_PRIORITY_C
enum MENU_ITEMpriority {
MENU_ITEM_PRIORITY_0,
MENU_ITEM_PRIORITY_1,
MENU_ITEM_PRIORITY_2,
MENU_ITEM_PRIORITY_3,
MENU_ITEM_PRIORITY_4,
MENU_ITEM_PRIORITY_5,
MENU_ITEM_PRIORITY_6,
MENU_ITEM_PRIORITY_7,
MENU_ITEM_PRIORITY_8,
MENU_ITEM_PRIORITY_9,
MENU_ITEM_PRIORITY_A,
MENU_ITEM_PRIORITY_B,
MENU_ITEM_PRIORITY_C
};
enum CenterText { LEFT_TEXT = 1, CENTER_TEXT_MODE_1, RIGHT_TEXT, CENTER_TEXT_MODE_2 };
enum D_8018D9E0_type {
D_8018D9E0_TYPE_NULL,
enum MENU_ITEMtype {
MENU_ITEM_TYPE_NULL,
START_MENU_BACKGROUND,
START_MENU_LOGO_AND_COPYRIGHT,
START_MENU_PUSH_START_BUTTON,
@@ -125,12 +125,12 @@ enum D_8018D9E0_type {
MAIN_MENU_50CC,
MAIN_MENU_100CC,
MAIN_MENU_150CC,
D_8018D9E0_TYPE_015,
D_8018D9E0_TYPE_016,
D_8018D9E0_TYPE_017,
MENU_ITEM_TYPE_015,
MENU_ITEM_TYPE_016,
MENU_ITEM_TYPE_017,
MAIN_MENU_TIME_TRIALS_BEGIN,
MAIN_MENU_TIME_TRIALS_DATA,
D_8018D9E0_TYPE_01B = 0x1B,
MENU_ITEM_TYPE_01B = 0x1B,
MAIN_MENU_BACKGROUND = 0x23,
CHARACTER_SELECT_BACKGROUND,
COURSE_SELECT_BACKGROUND,
@@ -148,168 +148,168 @@ enum D_8018D9E0_type {
CHARACTER_SELECT_MENU_2P_CURSOR,
CHARACTER_SELECT_MENU_3P_CURSOR,
CHARACTER_SELECT_MENU_4P_CURSOR,
D_8018D9E0_TYPE_043 = 0x43,
D_8018D9E0_TYPE_044,
D_8018D9E0_TYPE_045,
D_8018D9E0_TYPE_046,
D_8018D9E0_TYPE_047,
D_8018D9E0_TYPE_048,
D_8018D9E0_TYPE_049,
D_8018D9E0_TYPE_050 = 0x50,
MENU_ITEM_TYPE_043 = 0x43,
MENU_ITEM_TYPE_044,
MENU_ITEM_TYPE_045,
MENU_ITEM_TYPE_046,
MENU_ITEM_TYPE_047,
MENU_ITEM_TYPE_048,
MENU_ITEM_TYPE_049,
MENU_ITEM_TYPE_050 = 0x50,
COURSE_SELECT_MAP_SELECT = 0x52,
COURSE_SELECT_MUSHROOM_CUP,
COURSE_SELECT_FLOWER_CUP,
COURSE_SELECT_STAR_CUP,
COURSE_SELECT_SPECIAL_CUP,
D_8018D9E0_TYPE_058 = 0x58,
MENU_ITEM_TYPE_058 = 0x58,
COURSE_SELECT_COURSE_NAMES,
D_8018D9E0_TYPE_05A,
D_8018D9E0_TYPE_05B,
MENU_ITEM_TYPE_05A,
MENU_ITEM_TYPE_05B,
COURSE_SELECT_BATTLE_NAMES,
COURSE_SELECT_OK,
D_8018D9E0_TYPE_05E,
D_8018D9E0_TYPE_05F,
D_8018D9E0_TYPE_060,
D_8018D9E0_TYPE_061,
D_8018D9E0_TYPE_062,
D_8018D9E0_TYPE_064 = 0x64,
D_8018D9E0_TYPE_065,
D_8018D9E0_TYPE_066,
D_8018D9E0_TYPE_067,
D_8018D9E0_TYPE_068,
D_8018D9E0_TYPE_069,
D_8018D9E0_TYPE_06E = 0x6E,
D_8018D9E0_TYPE_078 = 0x78,
D_8018D9E0_TYPE_079,
D_8018D9E0_TYPE_07A,
D_8018D9E0_TYPE_07B,
D_8018D9E0_TYPE_07C,
D_8018D9E0_TYPE_07D,
D_8018D9E0_TYPE_07E,
D_8018D9E0_TYPE_07F,
D_8018D9E0_TYPE_080,
D_8018D9E0_TYPE_081,
D_8018D9E0_TYPE_082,
D_8018D9E0_TYPE_083,
D_8018D9E0_TYPE_084,
D_8018D9E0_TYPE_085,
D_8018D9E0_TYPE_086,
D_8018D9E0_TYPE_087,
D_8018D9E0_TYPE_088,
D_8018D9E0_TYPE_089,
D_8018D9E0_TYPE_08A,
D_8018D9E0_TYPE_08B,
D_8018D9E0_TYPE_08C,
D_8018D9E0_TYPE_08D,
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,
D_8018D9E0_TYPE_0AF = 0XAF,
D_8018D9E0_TYPE_0B0,
D_8018D9E0_TYPE_0B1,
D_8018D9E0_TYPE_0B2,
D_8018D9E0_TYPE_0B3,
D_8018D9E0_TYPE_0B4,
D_8018D9E0_TYPE_0B9 = 0xB9,
D_8018D9E0_TYPE_0BA,
D_8018D9E0_TYPE_0BB,
D_8018D9E0_TYPE_0BC,
D_8018D9E0_TYPE_0BD,
D_8018D9E0_TYPE_0BE,
D_8018D9E0_TYPE_0C7 = 0xC7,
D_8018D9E0_TYPE_0D2 = 0xD2,
D_8018D9E0_TYPE_0D3,
D_8018D9E0_TYPE_0D4,
D_8018D9E0_TYPE_0D5,
D_8018D9E0_TYPE_0D6,
D_8018D9E0_TYPE_0D7,
D_8018D9E0_TYPE_0D8,
D_8018D9E0_TYPE_0D9,
D_8018D9E0_TYPE_0DA,
D_8018D9E0_TYPE_0E6 = 0xE6,
D_8018D9E0_TYPE_0E7,
D_8018D9E0_TYPE_0E8,
D_8018D9E0_TYPE_0E9,
D_8018D9E0_TYPE_0EA,
D_8018D9E0_TYPE_0F0 = 0xF0,
D_8018D9E0_TYPE_0F1,
MENU_ITEM_TYPE_05E,
MENU_ITEM_TYPE_05F,
MENU_ITEM_TYPE_060,
MENU_ITEM_TYPE_061,
MENU_ITEM_TYPE_062,
MENU_ITEM_TYPE_064 = 0x64,
MENU_ITEM_TYPE_065,
MENU_ITEM_TYPE_066,
MENU_ITEM_TYPE_067,
MENU_ITEM_TYPE_068,
MENU_ITEM_TYPE_069,
MENU_ITEM_TYPE_06E = 0x6E,
MENU_ITEM_TYPE_078 = 0x78,
MENU_ITEM_TYPE_079,
MENU_ITEM_TYPE_07A,
MENU_ITEM_TYPE_07B,
MENU_ITEM_TYPE_07C,
MENU_ITEM_TYPE_07D,
MENU_ITEM_TYPE_07E,
MENU_ITEM_TYPE_07F,
MENU_ITEM_TYPE_080,
MENU_ITEM_TYPE_081,
MENU_ITEM_TYPE_082,
MENU_ITEM_TYPE_083,
MENU_ITEM_TYPE_084,
MENU_ITEM_TYPE_085,
MENU_ITEM_TYPE_086,
MENU_ITEM_TYPE_087,
MENU_ITEM_TYPE_088,
MENU_ITEM_TYPE_089,
MENU_ITEM_TYPE_08A,
MENU_ITEM_TYPE_08B,
MENU_ITEM_TYPE_08C,
MENU_ITEM_TYPE_08D,
MENU_ITEM_TYPE_096 = 0x96,
MENU_ITEM_TYPE_097,
MENU_ITEM_TYPE_098,
MENU_ITEM_TYPE_0A0 = 0xA0,
MENU_ITEM_TYPE_0A1,
MENU_ITEM_TYPE_0AA = 0xAA,
MENU_ITEM_TYPE_0AB,
MENU_ITEM_TYPE_0AC,
MENU_ITEM_TYPE_0AF = 0XAF,
MENU_ITEM_TYPE_0B0,
MENU_ITEM_TYPE_0B1,
MENU_ITEM_TYPE_0B2,
MENU_ITEM_TYPE_0B3,
MENU_ITEM_TYPE_0B4,
MENU_ITEM_TYPE_0B9 = 0xB9,
MENU_ITEM_TYPE_0BA,
MENU_ITEM_TYPE_0BB,
MENU_ITEM_TYPE_0BC,
MENU_ITEM_TYPE_0BD,
MENU_ITEM_TYPE_0BE,
MENU_ITEM_TYPE_0C7 = 0xC7,
MENU_ITEM_TYPE_0D2 = 0xD2,
MENU_ITEM_TYPE_0D3,
MENU_ITEM_TYPE_0D4,
MENU_ITEM_TYPE_0D5,
MENU_ITEM_TYPE_0D6,
MENU_ITEM_TYPE_0D7,
MENU_ITEM_TYPE_0D8,
MENU_ITEM_TYPE_0D9,
MENU_ITEM_TYPE_0DA,
MENU_ITEM_TYPE_0E6 = 0xE6,
MENU_ITEM_TYPE_0E7,
MENU_ITEM_TYPE_0E8,
MENU_ITEM_TYPE_0E9,
MENU_ITEM_TYPE_0EA,
MENU_ITEM_TYPE_0F0 = 0xF0,
MENU_ITEM_TYPE_0F1,
LOGO_INTRO_MENU_LOGO = 0xFA,
START_MENU_FLAG,
D_8018D9E0_TYPE_10E = 0x10E,
D_8018D9E0_TYPE_12B = 0X12B,
D_8018D9E0_TYPE_12C,
D_8018D9E0_TYPE_12D,
D_8018D9E0_TYPE_12E,
D_8018D9E0_TYPE_12F,
D_8018D9E0_TYPE_130,
D_8018D9E0_TYPE_190 = 0x190,
D_8018D9E0_TYPE_191,
D_8018D9E0_TYPE_192,
D_8018D9E0_TYPE_193,
D_8018D9E0_TYPE_194,
D_8018D9E0_TYPE_195,
D_8018D9E0_TYPE_196,
D_8018D9E0_TYPE_197,
D_8018D9E0_TYPE_198,
D_8018D9E0_TYPE_199,
D_8018D9E0_TYPE_19A,
D_8018D9E0_TYPE_19B,
D_8018D9E0_TYPE_19C,
D_8018D9E0_TYPE_19D,
D_8018D9E0_TYPE_19E,
D_8018D9E0_TYPE_19F,
D_8018D9E0_TYPE_1A0,
D_8018D9E0_TYPE_1A1,
D_8018D9E0_TYPE_1A2,
D_8018D9E0_TYPE_1A3,
D_8018D9E0_TYPE_1A4,
D_8018D9E0_TYPE_1A5,
D_8018D9E0_TYPE_1A6,
D_8018D9E0_TYPE_1A7,
D_8018D9E0_TYPE_1A8,
D_8018D9E0_TYPE_1A9,
D_8018D9E0_TYPE_1AA,
D_8018D9E0_TYPE_1AB,
D_8018D9E0_TYPE_1AC,
D_8018D9E0_TYPE_1AD,
D_8018D9E0_TYPE_1AE,
D_8018D9E0_TYPE_1AF,
D_8018D9E0_TYPE_1B0,
D_8018D9E0_TYPE_1B1,
D_8018D9E0_TYPE_1B2,
D_8018D9E0_TYPE_1B3,
D_8018D9E0_TYPE_1B4,
D_8018D9E0_TYPE_1B5,
D_8018D9E0_TYPE_1B6,
D_8018D9E0_TYPE_1B7,
D_8018D9E0_TYPE_1B8,
D_8018D9E0_TYPE_1B9,
D_8018D9E0_TYPE_1BA,
D_8018D9E0_TYPE_1BB,
D_8018D9E0_TYPE_1BC,
D_8018D9E0_TYPE_1BD,
D_8018D9E0_TYPE_1BE,
D_8018D9E0_TYPE_1BF,
D_8018D9E0_TYPE_1C0,
D_8018D9E0_TYPE_1C1,
D_8018D9E0_TYPE_1C2,
D_8018D9E0_TYPE_1C3,
D_8018D9E0_TYPE_1C4,
D_8018D9E0_TYPE_1C5,
D_8018D9E0_TYPE_1C6,
D_8018D9E0_TYPE_1C7,
D_8018D9E0_TYPE_1C8,
D_8018D9E0_TYPE_1C9,
D_8018D9E0_TYPE_1CA,
D_8018D9E0_TYPE_1CB,
D_8018D9E0_TYPE_1CC,
D_8018D9E0_TYPE_1CD,
D_8018D9E0_TYPE_1CE
MENU_ITEM_TYPE_10E = 0x10E,
MENU_ITEM_TYPE_12B = 0X12B,
MENU_ITEM_TYPE_12C,
MENU_ITEM_TYPE_12D,
MENU_ITEM_TYPE_12E,
MENU_ITEM_TYPE_12F,
MENU_ITEM_TYPE_130,
MENU_ITEM_TYPE_190 = 0x190,
MENU_ITEM_TYPE_191,
MENU_ITEM_TYPE_192,
MENU_ITEM_TYPE_193,
MENU_ITEM_TYPE_194,
MENU_ITEM_TYPE_195,
MENU_ITEM_TYPE_196,
MENU_ITEM_TYPE_197,
MENU_ITEM_TYPE_198,
MENU_ITEM_TYPE_199,
MENU_ITEM_TYPE_19A,
MENU_ITEM_TYPE_19B,
MENU_ITEM_TYPE_19C,
MENU_ITEM_TYPE_19D,
MENU_ITEM_TYPE_19E,
MENU_ITEM_TYPE_19F,
MENU_ITEM_TYPE_1A0,
MENU_ITEM_TYPE_1A1,
MENU_ITEM_TYPE_1A2,
MENU_ITEM_TYPE_1A3,
MENU_ITEM_TYPE_1A4,
MENU_ITEM_TYPE_1A5,
MENU_ITEM_TYPE_1A6,
MENU_ITEM_TYPE_1A7,
MENU_ITEM_TYPE_1A8,
MENU_ITEM_TYPE_1A9,
MENU_ITEM_TYPE_1AA,
MENU_ITEM_TYPE_1AB,
MENU_ITEM_TYPE_1AC,
MENU_ITEM_TYPE_1AD,
MENU_ITEM_TYPE_1AE,
MENU_ITEM_TYPE_1AF,
MENU_ITEM_TYPE_1B0,
MENU_ITEM_TYPE_1B1,
MENU_ITEM_TYPE_1B2,
MENU_ITEM_TYPE_1B3,
MENU_ITEM_TYPE_1B4,
MENU_ITEM_TYPE_1B5,
MENU_ITEM_TYPE_1B6,
MENU_ITEM_TYPE_1B7,
MENU_ITEM_TYPE_1B8,
MENU_ITEM_TYPE_1B9,
MENU_ITEM_TYPE_1BA,
MENU_ITEM_TYPE_1BB,
MENU_ITEM_TYPE_1BC,
MENU_ITEM_TYPE_1BD,
MENU_ITEM_TYPE_1BE,
MENU_ITEM_TYPE_1BF,
MENU_ITEM_TYPE_1C0,
MENU_ITEM_TYPE_1C1,
MENU_ITEM_TYPE_1C2,
MENU_ITEM_TYPE_1C3,
MENU_ITEM_TYPE_1C4,
MENU_ITEM_TYPE_1C5,
MENU_ITEM_TYPE_1C6,
MENU_ITEM_TYPE_1C7,
MENU_ITEM_TYPE_1C8,
MENU_ITEM_TYPE_1C9,
MENU_ITEM_TYPE_1CA,
MENU_ITEM_TYPE_1CB,
MENU_ITEM_TYPE_1CC,
MENU_ITEM_TYPE_1CD,
MENU_ITEM_TYPE_1CE
};
enum TEXT_MENU_ID { CONTINUE_GAME, RETRY, COURSE_CHANGE, DRIVER_CHANGE, QUIT_TEXT_MENU, REPLAY, SAVE_GHOST };
@@ -433,7 +433,7 @@ void func_8009B938(void);
void func_8009B954(MenuTexture*);
void func_8009B998(void);
Gfx* func_8009B9D0(Gfx*, MenuTexture*);
Gfx* func_8009BA74(Gfx*, MenuTexture*, s32, s32);
Gfx* render_menu_textures(Gfx*, MenuTexture*, s32, s32);
Gfx* func_8009BC9C(Gfx*, MenuTexture*, s32, s32, s32, s32);
Gfx* print_letter(Gfx*, MenuTexture*, f32, f32, s32, f32, f32);
Gfx* func_8009C204(Gfx*, MenuTexture*, s32, s32, s32);
@@ -484,7 +484,7 @@ void func_800A0DFC(void);
void func_800A0EB8(MenuItem*, s32);
void func_800A0FA4(MenuItem*, s32);
void func_800A10CC(MenuItem*);
void func_800A11D0(MenuItem*, s32, s32);
void render_cursor_player(MenuItem*, s32, s32);
void func_800A12BC(MenuItem*, MenuTexture*);
void func_800A1350(MenuItem*);
void func_800A143C(MenuItem*, s32);
@@ -547,7 +547,7 @@ void func_800A874C(MenuItem*);
void func_800A890C(s32, MenuItem*);
void func_800A8A98(MenuItem*);
void func_800A8CA4(MenuItem*);
void func_800A8E14(MenuItem*);
void render_battle_introduction(MenuItem*);
void func_800A8EC0(MenuItem*);
void func_800A8F48(MenuItem*);
void func_800A90D4(s32, MenuItem*);
@@ -561,7 +561,7 @@ void func_800A94C8(MenuItem*, s32, s32);
void func_800A954C(MenuItem*);
void func_800A9710(MenuItem*);
void func_800A97BC(MenuItem*);
void func_800A9A98(MenuItem*);
void update_ok_menu_item(MenuItem*);
void func_800A9B9C(MenuItem*);
void func_800A9C40(MenuItem*);
void func_800A9D5C(MenuItem*);
@@ -573,14 +573,14 @@ void func_800AA69C(MenuItem*);
void func_800AAA9C(MenuItem*);
void func_800AAB90(MenuItem*);
void func_800AAC18(MenuItem*);
void func_800AADD4(MenuItem*);
void update_cursor(MenuItem*);
void func_800AAE18(MenuItem*);
MenuItem* func_800AAE68(void);
MenuItem* func_800AAEB4(s32);
MenuItem* find_8018D9E0_entry_dupe(s32);
MenuItem* find_8018D9E0_entry(s32);
s32 func_800AAF70(s32);
void func_800AAF94(MenuItem*, s32);
MenuItem* get_menu_item_player_count(void);
MenuItem* get_menu_item_character(s32);
MenuItem* find_menu_items_type_dupe(s32);
MenuItem* find_menu_items_type(s32);
s32 get_state_menu_item_character(s32);
void move_menu_item_at_character_portrait(MenuItem*, s32);
s32 func_800AAFCC(s32);
void func_800AB020(MenuItem*);
void func_800AB098(MenuItem*);
@@ -734,13 +734,13 @@ extern char* gPrefixTimeText[];
extern char* D_800E7744[];
extern char* gMenuText[];
extern char* D_800E7778[];
extern char D_800E7780[];
extern char gTextMenuAnnounceGhost[];
extern char* D_800E77A0[];
extern char* D_800E77A8[];
extern char* gTextBattleIntroduction[];
extern char gTextMenuData[];
extern char D_800E77D8[];
extern char* sCourseLengths[];
extern char* gTextMenuDataCourse[];
extern char* gTextMenuOption[];
extern char* D_800E7840[];
extern char* gEraseBestGhostText[];
extern char* D_800E7860[];
@@ -800,7 +800,7 @@ extern MenuTexture* D_800E8234[];
extern MenuTexture* D_800E8254[];
extern MenuTexture* D_800E8274[];
extern MenuTexture* D_800E8294[];
extern MenuTexture* D_800E82B4[];
extern MenuTexture* gMenuTexturesBorderPlayer[];
extern MenuTexture* gMenuTexturesTrackSelection[];
extern MenuTexture* D_800E82F4[];
extern MkAnimation* D_800E8320[];
src/data/textures.c
+10 -10
View File
@@ -1562,7 +1562,7 @@ MenuTexture D_02001B04[2] = {
* @brief MenuTexture of Course Preview Mario Raceway
*
*/
MenuTexture D_02001B2C[2] = {
MenuTexture gMenuTexturePreviewMarioRaceway[2] = {
{ 0, 0, gTextureCoursePreviewMarioRaceway, 128, 78, 0, 0, 0x3157, 0 },
{ 0, 0, NULL, 0, 0, 0, 0, 0, 0 },
};
@@ -1743,8 +1743,8 @@ MenuTexture D_02001E24[2] = {
*
*/
MkAnimation D_02001E4C[3] = {
{ D_02001B2C, 0x0000003c },
{ D_02001B2C, 0x0000003c },
{ gMenuTexturePreviewMarioRaceway, 0x0000003c },
{ gMenuTexturePreviewMarioRaceway, 0x0000003c },
{ NULL, 0x00000000 },
};
@@ -1753,7 +1753,7 @@ MkAnimation D_02001E4C[3] = {
*
*/
MkAnimation D_02001E64[2] = {
{ D_02001B2C, 0x0000003c },
{ gMenuTexturePreviewMarioRaceway, 0x0000003c },
{ NULL, 0x00000000 },
};
@@ -4384,7 +4384,7 @@ MenuTexture D_02004A0C[2] = {
* @brief MenuTextures for Menu Data
*
*/
MenuTexture D_02004A34[2] = {
MenuTexture gMenuTextureData[2] = {
{ 1, 0, gTextureMenuData, 64, 18, 0, 0, 0x0, 0 },
{ 0, 0, NULL, 0, 0, 0, 0, 0, 0 },
};
@@ -4393,7 +4393,7 @@ MenuTexture D_02004A34[2] = {
* @brief MenuTextures P1 Border ?
*
*/
MenuTexture D_02004A5C[3] = {
MenuTexture gMenuTextureBorderP1[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 },
@@ -4403,7 +4403,7 @@ MenuTexture D_02004A5C[3] = {
* @brief MenuTextures P2 Border ?
*
*/
MenuTexture D_02004A98[3] = {
MenuTexture gMenuTextureBorderP2[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 },
@@ -4413,7 +4413,7 @@ MenuTexture D_02004A98[3] = {
* @brief MenuTextures P3 Border ?
*
*/
MenuTexture D_02004AD4[3] = {
MenuTexture gMenuTextureBorderP3[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 },
@@ -4423,7 +4423,7 @@ MenuTexture D_02004AD4[3] = {
* @brief MenuTextures P4 Border ?
*
*/
MenuTexture D_02004B10[3] = {
MenuTexture gMenuTextureBorderP4[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 },
@@ -4496,7 +4496,7 @@ MenuTexture gMenuTextureSpecialCup[2] = {
* @brief MenuTextures for the course preview mario raceway
*
*/
MenuTexture gMenuTexturePreviewMarioRaceway[2] = {
MenuTexture gMenuTexturePreviewMarioRacewaySmall[2] = {
{ 0, 0, gTextureCoursePreviewMarioRaceway, 128, 78, 23, 112, 0x1e3d, 0 },
{ 0, 0, NULL, 0, 0, 0, 0, 0, 0 },
};
src/menus.c
+37 -31
View File
@@ -40,9 +40,9 @@ f32 gIntroModelPosY;
f32 gIntroModelPosZ;
s32 gMenuFadeType;
s8 gCharacterGridSelections[4]; // Map from each player to current grid position (1-4 top, 5-8 bottom)
s8 gCharacterGridSelections[4]; // Map from each player to current grid position (1-4 top, 5-8 bottom)
bool8 gCharacterGridIsSelected[4]; // Sets true if a character is selected for each player
s8 gSubMenuSelection; // Map Select states, Options and Ghost Data text selection
s8 gSubMenuSelection; // Map Select states, Options and Ghost Data text selection
s8 gMainMenuSelection;
s8 gPlayerSelectMenuSelection;
s8 gDebugMenuSelection;
@@ -50,11 +50,12 @@ s8 gControllerPakMenuSelection;
s8 gScreenModeListIndex; // 0-4 index, selects a screen mode in sScreenModePlayerTable
u8 gSoundMode;
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 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; // Used for selecting an option in course record data
s8 gCourseRecordsMenuSelection; // Used for selecting an option in course record data
s8 gCourseRecordsSubMenuSelection; // Used for erase records and ghosts (Quit - Erase)
s8 gDebugGotoScene;
bool8 gGhostPlayerInit;
@@ -99,13 +100,9 @@ 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
};
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 };
// Sets how many players can load on each screen mode set in sScreenModePlayerTable
const s8 sScreenModePlayerCount[] = { 1, 2, 2, 3, 4 };
@@ -141,8 +138,7 @@ const s32 gGameModePlayerSelection[][3] = {
// 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,
MARIO, LUIGI, PEACH, TOAD, YOSHI, DK, WARIO, BOWSER,
};
const s16 gCupCourseOrder[5][4] = {
@@ -257,7 +253,7 @@ void options_menu_act(struct Controller* controller, u16 controllerIdx) {
}
if (!is_screen_being_faded()) {
sp38 = find_8018D9E0_entry_dupe(0xF0);
sp38 = find_menu_items_type_dupe(0xF0);
sp30 = (struct_8018EE10_entry*) gSomeDLBuffer;
switch (gSubMenuSelection) {
case SUB_MENU_OPTION_RETURN_GAME_SELECT:
@@ -450,7 +446,8 @@ void options_menu_act(struct Controller* controller, u16 controllerIdx) {
}
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)) {
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->unk24 < 4.2) {
@@ -458,7 +455,8 @@ void options_menu_act(struct Controller* controller, u16 controllerIdx) {
}
sp38->unk8 = 1;
}
if ((btnAndStick & U_JPAD) && (gSubMenuSelection > SUB_MENU_COPY_PAK_FROM_GHOST_MIN) && sp30[PLAYER_ONE].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->unk24 < 4.2) {
@@ -473,7 +471,8 @@ void options_menu_act(struct Controller* controller, u16 controllerIdx) {
}
if (btnAndStick & A_BUTTON) {
sp38->unk20 = gSubMenuSelection - SUB_MENU_COPY_PAK_FROM_GHOST_MIN;
if (sp30[sp38->unk20].courseIndex == D_8018EE10[PLAYER_TWO].courseIndex && D_8018EE10[PLAYER_TWO].ghostDataSaved) {
if (sp30[sp38->unk20].courseIndex == D_8018EE10[PLAYER_TWO].courseIndex &&
D_8018EE10[PLAYER_TWO].ghostDataSaved) {
gSubMenuSelection = SUB_MENU_COPY_PAK_TO_GHOST2_2P;
} else {
gSubMenuSelection = SUB_MENU_COPY_PAK_TO_GHOST1_2P;
@@ -485,7 +484,8 @@ void options_menu_act(struct Controller* controller, u16 controllerIdx) {
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->unk20].courseIndex != ((0, (D_8018EE10 + (gSubMenuSelection - SUB_MENU_COPY_PAK_TO_GHOST_MIN))->courseIndex))) ||
if ((sp30[sp38->unk20].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;
@@ -722,10 +722,11 @@ void course_data_menu_act(struct Controller* controller, UNUSED u16 controllerId
play_sound2(SOUND_MENU_CURSOR_MOVE);
}
sp28 = find_8018D9E0_entry_dupe(0xE8);
sp28 = find_menu_items_type_dupe(0xE8);
sp24 = &gSaveData.allCourseTimeTrialRecords.cupRecords[gTimeTrialDataCourseIndex / 4]
.courseRecords[gTimeTrialDataCourseIndex % 4];
if (gCourseRecordsMenuSelection == COURSE_RECORDS_MENU_ERASE_GHOST && func_800B639C(gTimeTrialDataCourseIndex) < 0) {
if (gCourseRecordsMenuSelection == COURSE_RECORDS_MENU_ERASE_GHOST &&
func_800B639C(gTimeTrialDataCourseIndex) < 0) {
gCourseRecordsMenuSelection -= 1;
}
@@ -747,11 +748,13 @@ void course_data_menu_act(struct Controller* controller, UNUSED u16 controllerId
if ((btnAndStick & D_JPAD) && (gCourseRecordsMenuSelection < COURSE_RECORDS_MENU_MAX)) {
gCourseRecordsMenuSelection += 1;
if (gCourseRecordsMenuSelection == COURSE_RECORDS_MENU_ERASE_RECORDS && sp24->unknownBytes[0] == 0) {
if (gCourseRecordsMenuSelection == COURSE_RECORDS_MENU_ERASE_RECORDS &&
sp24->unknownBytes[0] == 0) {
gCourseRecordsMenuSelection += 1;
}
if (gCourseRecordsMenuSelection == COURSE_RECORDS_MENU_ERASE_GHOST && func_800B639C(gTimeTrialDataCourseIndex) < 0) {
if (gCourseRecordsMenuSelection == COURSE_RECORDS_MENU_ERASE_GHOST &&
func_800B639C(gTimeTrialDataCourseIndex) < 0) {
if (sp24->unknownBytes[0] == 0) {
gCourseRecordsMenuSelection = COURSE_RECORDS_MENU_RETURN_MENU;
} else {
@@ -785,7 +788,7 @@ void course_data_menu_act(struct Controller* controller, UNUSED u16 controllerId
break;
}
case SUB_MENU_DATA_ERASE_CONFIRM: {
sp28 = find_8018D9E0_entry_dupe(0xE9);
sp28 = find_menu_items_type_dupe(0xE9);
if ((btnAndStick & U_JPAD) && (gCourseRecordsSubMenuSelection > COURSE_RECORDS_SUB_MENU_MIN)) {
gCourseRecordsSubMenuSelection -= 1;
play_sound2(SOUND_MENU_CURSOR_MOVE);
@@ -934,7 +937,8 @@ void controller_pak_menu_act(struct Controller* controller, UNUSED u16 controlle
return;
}
}
} else if (((btnAndStick & D_JPAD) != 0) && (gControllerPakScrollDirection == CONTROLLER_PAK_SCROLL_DIR_NONE)) {
} 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;
@@ -1414,12 +1418,14 @@ void main_menu_act(struct Controller* controller, u16 controllerIdx) {
if (btnAndStick & D_JPAD) {
cursorMoved = false;
if (has_terminate_150cc()) {
if (subMode < sGameModePlayerColumnExtra[gPlayerCount - 1][gGameModeMenuColumn[gPlayerCount - 1]]) {
if (subMode <
sGameModePlayerColumnExtra[gPlayerCount - 1][gGameModeMenuColumn[gPlayerCount - 1]]) {
cursorMoved = true;
}
} else {
// L800B30D4
if (subMode < sGameModePlayerColumnDefault[gPlayerCount - 1][gGameModeMenuColumn[gPlayerCount - 1]]) {
if (subMode <
sGameModePlayerColumnDefault[gPlayerCount - 1][gGameModeMenuColumn[gPlayerCount - 1]]) {
cursorMoved = true;
}
}
@@ -1569,8 +1575,7 @@ void player_select_menu_act(struct Controller* controller, u16 controllerIdx) {
// L800B36F4
selected = false;
for (i = 0; i < ARRAY_COUNT(gCharacterGridSelections); i++) {
if ((gCharacterGridSelections[i] != 0) &&
(gCharacterGridIsSelected[i] == 0)) {
if ((gCharacterGridSelections[i] != 0) && (gCharacterGridIsSelected[i] == 0)) {
selected = true;
break;
}
@@ -1793,7 +1798,8 @@ void course_select_menu_act(struct Controller* arg0, u16 controllerIdx) {
}
break;
case SUB_MENU_MAP_SELECT_OK:
if ((controllerIdx == PLAYER_ONE) && ((++gMenuTimingCounter == 0x3C) || ((gMenuTimingCounter % 300) == 0))) {
if ((controllerIdx == PLAYER_ONE) &&
((++gMenuTimingCounter == 0x3C) || ((gMenuTimingCounter % 300) == 0))) {
play_sound2(SOUND_MENU_OK);
}
src/textures.h
+7 -7
View File
@@ -200,7 +200,7 @@ extern MenuTexture D_02001A8C[2];
extern MenuTexture D_02001AB4[2];
extern MenuTexture D_02001ADC[2];
extern MenuTexture D_02001B04[2];
extern MenuTexture D_02001B2C[2];
extern MenuTexture gMenuTexturePreviewMarioRaceway[2];
extern MenuTexture D_02001B54[2];
extern MenuTexture D_02001B7C[2];
extern MenuTexture D_02001BA4[2];
@@ -513,11 +513,11 @@ extern MenuTexture gMenuTextureWithoutItem[2];
extern MenuTexture D_020049BC[2];
extern MenuTexture D_020049E4[2];
extern MenuTexture D_02004A0C[2];
extern MenuTexture D_02004A34[2];
extern MenuTexture D_02004A5C[3];
extern MenuTexture D_02004A98[3];
extern MenuTexture D_02004AD4[3];
extern MenuTexture D_02004B10[3];
extern MenuTexture gMenuTextureData[2];
extern MenuTexture gMenuTextureBorderP1[3];
extern MenuTexture gMenuTextureBorderP2[3];
extern MenuTexture gMenuTextureBorderP3[3];
extern MenuTexture gMenuTextureBorderP4[3];
extern MenuTexture D_02004B4C[2];
extern MenuTexture D_02004B74[2];
extern MenuTexture gMenuTextureMenuSelect[2];
@@ -525,7 +525,7 @@ extern MenuTexture gMenuTextureMushroomCup[2];
extern MenuTexture gMenuTextureFlowerCup[2];
extern MenuTexture gMenuTextureStarCup[2];
extern MenuTexture gMenuTextureSpecialCup[2];
extern MenuTexture gMenuTexturePreviewMarioRaceway[2];
extern MenuTexture gMenuTexturePreviewMarioRacewaySmall[2];
extern MenuTexture gMenuTextureTitleMushroomCup[5];
extern MenuTexture gMenuTextureTitleFlowerCup[5];
extern MenuTexture gMenuTextureTitleStarCup[5];