diff --git a/asm/non_matchings/unknown_00BC20/D_80019808.s b/asm/non_matchings/unknown_00BC20/D_80019808.s index df92d4a8..eac712d5 100644 --- a/asm/non_matchings/unknown_00BC20/D_80019808.s +++ b/asm/non_matchings/unknown_00BC20/D_80019808.s @@ -322,7 +322,7 @@ glabel D_80019808 /* 01A8A4 80019CA4 00000000 */ nop /* 01A8A8 80019CA8 3C13800E */ lui $s3, %hi(D_800DC744) # $s3, 0x800e /* 01A8AC 80019CAC 2673C744 */ addiu $s3, %lo(D_800DC744) # addiu $s3, $s3, -0x38bc -/* 01A8B0 80019CB0 0C0270B4 */ jal func_8009C2D0 +/* 01A8B0 80019CB0 0C0270B4 */ jal is_in_tracks_mode /* 01A8B4 80019CB4 A2600000 */ sb $zero, ($s3) /* 01A8B8 80019CB8 14400024 */ bnez $v0, .L80019D4C /* 01A8BC 80019CBC 00003025 */ move $a2, $zero @@ -332,7 +332,7 @@ glabel D_80019808 /* 01A8CC 80019CCC 00000000 */ nop /* 01A8D0 80019CD0 128F000B */ beq $s4, $t7, .L80019D00 /* 01A8D4 80019CD4 00000000 */ nop -/* 01A8D8 80019CD8 0C027B20 */ jal func_8009EC80 +/* 01A8D8 80019CD8 0C027B20 */ jal is_in_two_player_adventure /* 01A8DC 80019CDC 00000000 */ nop /* 01A8E0 80019CE0 1040001A */ beqz $v0, .L80019D4C /* 01A8E4 80019CE4 00003025 */ move $a2, $zero @@ -417,7 +417,7 @@ glabel D_80019808 .L80019DFC: /* 01A9FC 80019DFC 1464FFF9 */ bne $v1, $a0, .L80019DE4 /* 01AA00 80019E00 24420018 */ addiu $v0, $v0, 0x18 -/* 01AA04 80019E04 0C027B20 */ jal func_8009EC80 +/* 01AA04 80019E04 0C027B20 */ jal is_in_two_player_adventure /* 01AA08 80019E08 A2600000 */ sb $zero, ($s3) /* 01AA0C 80019E0C 10400008 */ beqz $v0, .L80019E30 /* 01AA10 80019E10 2404FFFF */ li $a0, -1 @@ -431,7 +431,7 @@ glabel D_80019808 .L80019E30: /* 01AA30 80019E30 1600001C */ bnez $s0, .L80019EA4 /* 01AA34 80019E34 00002825 */ move $a1, $zero -/* 01AA38 80019E38 0C027B20 */ jal func_8009EC80 +/* 01AA38 80019E38 0C027B20 */ jal is_in_two_player_adventure /* 01AA3C 80019E3C 00000000 */ nop /* 01AA40 80019E40 10400014 */ beqz $v0, .L80019E94 /* 01AA44 80019E44 00002025 */ move $a0, $zero @@ -827,7 +827,7 @@ glabel D_80019808 /* 01AFD0 8001A3D0 00000000 */ nop /* 01AFD4 8001A3D4 170000F7 */ bnez $t8, .L8001A7B4 /* 01AFD8 8001A3D8 8FBF0034 */ lw $ra, 0x34($sp) -/* 01AFDC 8001A3DC 0C027B20 */ jal func_8009EC80 +/* 01AFDC 8001A3DC 0C027B20 */ jal is_in_two_player_adventure /* 01AFE0 8001A3E0 A3A0005B */ sb $zero, 0x5b($sp) /* 01AFE4 8001A3E4 3C098012 */ lui $t1, %hi(D_8011AEE8) # $t1, 0x8012 /* 01AFE8 8001A3E8 10400010 */ beqz $v0, .L8001A42C @@ -836,7 +836,7 @@ glabel D_80019808 /* 01AFF4 8001A3F4 00000000 */ nop /* 01AFF8 8001A3F8 19E0000D */ blez $t7, .L8001A430 /* 01AFFC 8001A3FC 87AE0088 */ lh $t6, 0x88($sp) -/* 01B000 8001A400 0C02658B */ jal func_8009962C +/* 01B000 8001A400 0C02658B */ jal is_in_trophy_race /* 01B004 8001A404 00000000 */ nop /* 01B008 8001A408 3C098012 */ lui $t1, %hi(D_8011AEE8) # $t1, 0x8012 /* 01B00C 8001A40C 14400007 */ bnez $v0, .L8001A42C @@ -969,7 +969,7 @@ glabel D_80019808 /* 01B1D4 8001A5D4 00000000 */ nop .L8001A5D8: /* 01B1D8 8001A5D8 A2600000 */ sb $zero, ($s3) -/* 01B1DC 8001A5DC 0C027B20 */ jal func_8009EC80 +/* 01B1DC 8001A5DC 0C027B20 */ jal is_in_two_player_adventure /* 01B1E0 8001A5E0 A3A4005A */ sb $a0, 0x5a($sp) /* 01B1E4 8001A5E4 3C098012 */ lui $t1, %hi(D_8011AEE8) # $t1, 0x8012 /* 01B1E8 8001A5E8 10400008 */ beqz $v0, .L8001A60C @@ -992,7 +992,7 @@ glabel D_80019808 /* 01B228 8001A628 00000000 */ nop /* 01B22C 8001A62C 12990006 */ beq $s4, $t9, .L8001A648 /* 01B230 8001A630 00000000 */ nop -/* 01B234 8001A634 0C027B20 */ jal func_8009EC80 +/* 01B234 8001A634 0C027B20 */ jal is_in_two_player_adventure /* 01B238 8001A638 AFA80080 */ sw $t0, 0x80($sp) /* 01B23C 8001A63C 8FA80080 */ lw $t0, 0x80($sp) /* 01B240 8001A640 1040000E */ beqz $v0, .L8001A67C @@ -1002,11 +1002,11 @@ glabel D_80019808 /* 01B24C 8001A64C 00000000 */ nop /* 01B250 8001A650 12B8000A */ beq $s5, $t8, .L8001A67C /* 01B254 8001A654 00000000 */ nop -/* 01B258 8001A658 0C0270B4 */ jal func_8009C2D0 +/* 01B258 8001A658 0C0270B4 */ jal is_in_tracks_mode /* 01B25C 8001A65C 00000000 */ nop /* 01B260 8001A660 14400006 */ bnez $v0, .L8001A67C /* 01B264 8001A664 00000000 */ nop -/* 01B268 8001A668 0C02658B */ jal func_8009962C +/* 01B268 8001A668 0C02658B */ jal is_in_trophy_race /* 01B26C 8001A66C 00000000 */ nop /* 01B270 8001A670 14400002 */ bnez $v0, .L8001A67C /* 01B274 8001A674 00000000 */ nop @@ -1039,7 +1039,7 @@ glabel D_80019808 .L8001A6D0: /* 01B2D0 8001A6D0 1600001C */ bnez $s0, .L8001A744 /* 01B2D4 8001A6D4 00000000 */ nop -/* 01B2D8 8001A6D8 0C027B20 */ jal func_8009EC80 +/* 01B2D8 8001A6D8 0C027B20 */ jal is_in_two_player_adventure /* 01B2DC 8001A6DC 00000000 */ nop /* 01B2E0 8001A6E0 10400013 */ beqz $v0, .L8001A730 /* 01B2E4 8001A6E4 00000000 */ nop diff --git a/asm/non_matchings/unknown_00BC20/func_8000C604.s b/asm/non_matchings/unknown_00BC20/func_8000C604.s index af94f967..eefa40a1 100644 --- a/asm/non_matchings/unknown_00BC20/func_8000C604.s +++ b/asm/non_matchings/unknown_00BC20/func_8000C604.s @@ -23,7 +23,7 @@ glabel func_8000C604 /* 00D254 8000C654 A2000000 */ sb $zero, ($s0) /* 00D258 8000C658 11E00007 */ beqz $t7, .L8000C678 /* 00D25C 8000C65C 00000000 */ nop -/* 00D260 8000C660 0C027B20 */ jal func_8009EC80 +/* 00D260 8000C660 0C027B20 */ jal is_in_two_player_adventure /* 00D264 8000C664 00000000 */ nop /* 00D268 8000C668 10400003 */ beqz $v0, .L8000C678 /* 00D26C 8000C66C 00000000 */ nop diff --git a/asm/non_matchings/unknown_00BC20/func_8000C8F8.s b/asm/non_matchings/unknown_00BC20/func_8000C8F8.s index 9558481e..5ee31496 100644 --- a/asm/non_matchings/unknown_00BC20/func_8000C8F8.s +++ b/asm/non_matchings/unknown_00BC20/func_8000C8F8.s @@ -38,7 +38,7 @@ glabel func_8000C8F8 /* 00D584 8000C984 00000000 */ nop /* 00D588 8000C988 A2000000 */ sb $zero, ($s0) .L8000C98C: -/* 00D58C 8000C98C 0C0270B4 */ jal func_8009C2D0 +/* 00D58C 8000C98C 0C0270B4 */ jal is_in_tracks_mode /* 00D590 8000C990 00000000 */ nop /* 00D594 8000C994 10400002 */ beqz $v0, .L8000C9A0 /* 00D598 8000C998 00000000 */ nop diff --git a/asm/non_matchings/unknown_00BC20/func_8000CC7C.s b/asm/non_matchings/unknown_00BC20/func_8000CC7C.s index 089ae44f..1a099b92 100644 --- a/asm/non_matchings/unknown_00BC20/func_8000CC7C.s +++ b/asm/non_matchings/unknown_00BC20/func_8000CC7C.s @@ -1277,7 +1277,7 @@ glabel func_8000CC7C /* 00EA98 8000DE98 24010001 */ li $at, 1 /* 00EA9C 8000DE9C 15C10018 */ bne $t6, $at, .L8000DF00 /* 00EAA0 8000DEA0 00000000 */ nop -/* 00EAA4 8000DEA4 0C027B1C */ jal func_8009EC70 +/* 00EAA4 8000DEA4 0C027B1C */ jal is_in_adventure_two /* 00EAA8 8000DEA8 00000000 */ nop /* 00EAAC 8000DEAC 14400014 */ bnez $v0, .L8000DF00 /* 00EAB0 8000DEB0 00000000 */ nop @@ -1312,7 +1312,7 @@ glabel func_8000CC7C /* 00EB1C 8000DF1C 00000000 */ nop /* 00EB20 8000DF20 1720003D */ bnez $t9, .L8000E018 /* 00EB24 8000DF24 8FAE0130 */ lw $t6, 0x130($sp) -/* 00EB28 8000DF28 0C0270B4 */ jal func_8009C2D0 +/* 00EB28 8000DF28 0C0270B4 */ jal is_in_tracks_mode /* 00EB2C 8000DF2C 00000000 */ nop /* 00EB30 8000DF30 14400038 */ bnez $v0, .L8000E014 /* 00EB34 8000DF34 24040010 */ li $a0, 16 @@ -1370,7 +1370,7 @@ glabel func_8000CC7C /* 00EBF8 8000DFF8 24040002 */ li $a0, 2 /* 00EBFC 8000DFFC 0C0274CC */ jal func_8009D330 /* 00EC00 8000E000 02402025 */ move $a0, $s2 -/* 00EC04 8000E004 0C027068 */ jal func_8009C1A0 +/* 00EC04 8000E004 0C027068 */ jal get_save_file_index /* 00EC08 8000E008 00000000 */ nop /* 00EC0C 8000E00C 0C01BB12 */ jal func_8006EC48 /* 00EC10 8000E010 00402025 */ move $a0, $v0 diff --git a/asm/non_matchings/unknown_00BC20/func_8000EA54.s b/asm/non_matchings/unknown_00BC20/func_8000EA54.s index 0dff26c1..386c32a9 100644 --- a/asm/non_matchings/unknown_00BC20/func_8000EA54.s +++ b/asm/non_matchings/unknown_00BC20/func_8000EA54.s @@ -219,7 +219,7 @@ glabel func_8000EA54 /* 00F990 8000ED90 10000013 */ b .L8000EDE0 /* 00F994 8000ED94 24D30001 */ addiu $s3, $a2, 1 /* 00F998 8000ED98 24130001 */ li $s3, 1 -/* 00F99C 8000ED9C 0C027B1C */ jal func_8009EC70 +/* 00F99C 8000ED9C 0C027B1C */ jal is_in_adventure_two /* 00F9A0 8000EDA0 AFA6005C */ sw $a2, 0x5c($sp) /* 00F9A4 8000EDA4 8FA6005C */ lw $a2, 0x5c($sp) /* 00F9A8 8000EDA8 10400008 */ beqz $v0, .L8000EDCC @@ -250,7 +250,7 @@ glabel func_8000EA54 /* 00FA00 8000EE00 14410045 */ bne $v0, $at, .L8000EF18 /* 00FA04 8000EE04 8FB80064 */ lw $t8, 0x64($sp) /* 00FA08 8000EE08 24130001 */ li $s3, 1 -/* 00FA0C 8000EE0C 0C027B1C */ jal func_8009EC70 +/* 00FA0C 8000EE0C 0C027B1C */ jal is_in_adventure_two /* 00FA10 8000EE10 AFA6005C */ sw $a2, 0x5c($sp) /* 00FA14 8000EE14 8FA6005C */ lw $a2, 0x5c($sp) /* 00FA18 8000EE18 10400008 */ beqz $v0, .L8000EE3C @@ -270,7 +270,7 @@ glabel func_8000EA54 /* 00FA4C 8000EE4C 10000032 */ b .L8000EF18 /* 00FA50 8000EE50 8FB80064 */ lw $t8, 0x64($sp) .L8000EE54: -/* 00FA54 8000EE54 0C027B1C */ jal func_8009EC70 +/* 00FA54 8000EE54 0C027B1C */ jal is_in_adventure_two /* 00FA58 8000EE58 00000000 */ nop /* 00FA5C 8000EE5C 10400028 */ beqz $v0, .L8000EF00 /* 00FA60 8000EE60 24130005 */ li $s3, 5 diff --git a/asm/non_matchings/unknown_00BC20/func_80010994.s b/asm/non_matchings/unknown_00BC20/func_80010994.s index f04c88d3..333a3bc3 100644 --- a/asm/non_matchings/unknown_00BC20/func_80010994.s +++ b/asm/non_matchings/unknown_00BC20/func_80010994.s @@ -503,11 +503,11 @@ glabel func_80010994 .L800110C8: /* 011CC8 800110C8 11A00011 */ beqz $t5, .L80011110 /* 011CCC 800110CC 8FBF0034 */ lw $ra, 0x34($sp) -/* 011CD0 800110D0 0C02658B */ jal func_8009962C +/* 011CD0 800110D0 0C02658B */ jal is_in_trophy_race /* 011CD4 800110D4 00000000 */ nop /* 011CD8 800110D8 1440000D */ bnez $v0, .L80011110 /* 011CDC 800110DC 8FBF0034 */ lw $ra, 0x34($sp) -/* 011CE0 800110E0 0C0270B4 */ jal func_8009C2D0 +/* 011CE0 800110E0 0C0270B4 */ jal is_in_tracks_mode /* 011CE4 800110E4 00000000 */ nop /* 011CE8 800110E8 14400009 */ bnez $v0, .L80011110 /* 011CEC 800110EC 8FBF0034 */ lw $ra, 0x34($sp) diff --git a/asm/non_matchings/unknown_00BC20/func_8001A8F4.s b/asm/non_matchings/unknown_00BC20/func_8001A8F4.s index 64525158..1e3c1255 100644 --- a/asm/non_matchings/unknown_00BC20/func_8001A8F4.s +++ b/asm/non_matchings/unknown_00BC20/func_8001A8F4.s @@ -112,7 +112,7 @@ glabel func_8001A8F4 /* 01B690 8001AA90 00000000 */ nop /* 01B694 8001AA94 0C001276 */ jal func_800049D8 /* 01B698 8001AA98 00000000 */ nop -/* 01B69C 8001AA9C 0C027B20 */ jal func_8009EC80 +/* 01B69C 8001AA9C 0C027B20 */ jal is_in_two_player_adventure /* 01B6A0 8001AAA0 00000000 */ nop /* 01B6A4 8001AAA4 1040001C */ beqz $v0, .L8001AB18 /* 01B6A8 8001AAA8 00000000 */ nop diff --git a/asm/non_matchings/unknown_00BC20/func_8001B3C4.s b/asm/non_matchings/unknown_00BC20/func_8001B3C4.s index 3053e821..1123c287 100644 --- a/asm/non_matchings/unknown_00BC20/func_8001B3C4.s +++ b/asm/non_matchings/unknown_00BC20/func_8001B3C4.s @@ -48,7 +48,7 @@ glabel func_8001B3C4 /* 01C074 8001B474 3421FFF0 */ ori $at, (0x00FFFFF0 & 0xFFFF) # ori $at, $at, 0xfff0 /* 01C078 8001B478 15A1000F */ bne $t5, $at, .L8001B4B8 /* 01C07C 8001B47C 2404024C */ li $a0, 588 -/* 01C080 8001B480 0C0270B8 */ jal func_8009C2E0 +/* 01C080 8001B480 0C0270B8 */ jal set_magic_code_flags /* 01C084 8001B484 24040001 */ li $a0, 1 /* 01C088 8001B488 2404024E */ li $a0, 590 /* 01C08C 8001B48C 0C000741 */ jal func_80001D04 diff --git a/asm/non_matchings/unknown_00BC20/func_80022E18.s b/asm/non_matchings/unknown_00BC20/func_80022E18.s index 5b04445d..49a00063 100644 --- a/asm/non_matchings/unknown_00BC20/func_80022E18.s +++ b/asm/non_matchings/unknown_00BC20/func_80022E18.s @@ -130,7 +130,7 @@ glabel func_80022E18 /* 023C00 80023000 94C80014 */ lhu $t0, 0x14($a2) /* 023C04 80023004 00000000 */ nop /* 023C08 80023008 01054825 */ or $t1, $t0, $a1 -/* 023C0C 8002300C 0C027068 */ jal func_8009C1A0 +/* 023C0C 8002300C 0C027068 */ jal get_save_file_index /* 023C10 80023010 A4C90014 */ sh $t1, 0x14($a2) /* 023C14 80023014 0C01BB12 */ jal func_8006EC48 /* 023C18 80023018 00402025 */ move $a0, $v0 diff --git a/asm/non_matchings/unknown_0255E0/func_800249F0.s b/asm/non_matchings/unknown_0255E0/func_800249F0.s index e4ba841d..c43b4390 100644 --- a/asm/non_matchings/unknown_0255E0/func_800249F0.s +++ b/asm/non_matchings/unknown_0255E0/func_800249F0.s @@ -75,7 +75,7 @@ glabel func_800249F0 /* 025704 80024B04 1420FFEB */ bnez $at, .L80024AB4 /* 025708 80024B08 24630044 */ addiu $v1, $v1, 0x44 .L80024B0C: -/* 02570C 80024B0C 0C027B20 */ jal func_8009EC80 +/* 02570C 80024B0C 0C027B20 */ jal is_in_two_player_adventure /* 025710 80024B10 00000000 */ nop /* 025714 80024B14 1040000B */ beqz $v0, .L80024B44 /* 025718 80024B18 3C0E800E */ lui $t6, %hi(D_800DC91C) # $t6, 0x800e diff --git a/asm/non_matchings/unknown_032760/func_8003DBA0.s b/asm/non_matchings/unknown_032760/func_8003DBA0.s index b56ef3f2..1f615ab2 100644 --- a/asm/non_matchings/unknown_032760/func_8003DBA0.s +++ b/asm/non_matchings/unknown_032760/func_8003DBA0.s @@ -14,7 +14,7 @@ glabel func_8003DBA0 /* 03E7D0 8003DBD0 240A0010 */ li $t2, 16 /* 03E7D4 8003DBD4 AC890078 */ sw $t1, 0x78($a0) /* 03E7D8 8003DBD8 AC8A007C */ sw $t2, 0x7c($a0) -/* 03E7DC 8003DBDC 0C0270B4 */ jal func_8009C2D0 +/* 03E7DC 8003DBDC 0C0270B4 */ jal is_in_tracks_mode /* 03E7E0 8003DBE0 AFA40018 */ sw $a0, 0x18($sp) /* 03E7E4 8003DBE4 8FA40018 */ lw $a0, 0x18($sp) /* 03E7E8 8003DBE8 1440000F */ bnez $v0, .L8003DC28 @@ -24,7 +24,7 @@ glabel func_8003DBA0 /* 03E7F8 8003DBF8 8FA40018 */ lw $a0, 0x18($sp) /* 03E7FC 8003DBFC 10400009 */ beqz $v0, .L8003DC24 /* 03E800 8003DC00 240B0003 */ li $t3, 3 -/* 03E804 8003DC04 0C027B1C */ jal func_8009EC70 +/* 03E804 8003DC04 0C027B1C */ jal is_in_adventure_two /* 03E808 8003DC08 AFA40018 */ sw $a0, 0x18($sp) /* 03E80C 8003DC0C 8FA40018 */ lw $a0, 0x18($sp) /* 03E810 8003DC10 10400004 */ beqz $v0, .L8003DC24 diff --git a/asm/non_matchings/unknown_032760/func_8003DC5C.s b/asm/non_matchings/unknown_032760/func_8003DC5C.s index 25c933f8..adddaa87 100644 --- a/asm/non_matchings/unknown_032760/func_8003DC5C.s +++ b/asm/non_matchings/unknown_032760/func_8003DC5C.s @@ -13,7 +13,7 @@ glabel func_8003DC5C /* 03E888 8003DC88 A1190010 */ sb $t9, 0x10($t0) /* 03E88C 8003DC8C AC890078 */ sw $t1, 0x78($a0) /* 03E890 8003DC90 AC80007C */ sw $zero, 0x7c($a0) -/* 03E894 8003DC94 0C0270B4 */ jal func_8009C2D0 +/* 03E894 8003DC94 0C0270B4 */ jal is_in_tracks_mode /* 03E898 8003DC98 AFA40018 */ sw $a0, 0x18($sp) /* 03E89C 8003DC9C 8FA40018 */ lw $a0, 0x18($sp) /* 03E8A0 8003DCA0 1440000F */ bnez $v0, .L8003DCE0 @@ -23,7 +23,7 @@ glabel func_8003DC5C /* 03E8B0 8003DCB0 8FA40018 */ lw $a0, 0x18($sp) /* 03E8B4 8003DCB4 10400009 */ beqz $v0, .L8003DCDC /* 03E8B8 8003DCB8 240A0003 */ li $t2, 3 -/* 03E8BC 8003DCBC 0C027B1C */ jal func_8009EC70 +/* 03E8BC 8003DCBC 0C027B1C */ jal is_in_adventure_two /* 03E8C0 8003DCC0 AFA40018 */ sw $a0, 0x18($sp) /* 03E8C4 8003DCC4 8FA40018 */ lw $a0, 0x18($sp) /* 03E8C8 8003DCC8 14400004 */ bnez $v0, .L8003DCDC diff --git a/asm/non_matchings/unknown_032760/func_8003DE74.s b/asm/non_matchings/unknown_032760/func_8003DE74.s index 2cc11bae..abff45db 100644 --- a/asm/non_matchings/unknown_032760/func_8003DE74.s +++ b/asm/non_matchings/unknown_032760/func_8003DE74.s @@ -18,7 +18,7 @@ glabel func_8003DE74 /* 03EAB4 8003DEB4 AC8B0078 */ sw $t3, 0x78($a0) /* 03EAB8 8003DEB8 0C01BAA4 */ jal func_8006EA90 /* 03EABC 8003DEBC AFA40020 */ sw $a0, 0x20($sp) -/* 03EAC0 8003DEC0 0C0270B4 */ jal func_8009C2D0 +/* 03EAC0 8003DEC0 0C0270B4 */ jal is_in_tracks_mode /* 03EAC4 8003DEC4 AFA2001C */ sw $v0, 0x1c($sp) /* 03EAC8 8003DEC8 8FA40020 */ lw $a0, 0x20($sp) /* 03EACC 8003DECC 14400008 */ bnez $v0, .L8003DEF0 diff --git a/asm/non_matchings/unknown_032760/func_800422F0.s b/asm/non_matchings/unknown_032760/func_800422F0.s index 33b77973..3c4d8b9f 100644 --- a/asm/non_matchings/unknown_032760/func_800422F0.s +++ b/asm/non_matchings/unknown_032760/func_800422F0.s @@ -92,7 +92,7 @@ glabel func_800422F0 /* 043050 80042450 24040000 */ li $a0, 0 /* 043054 80042454 0C027A9E */ jal func_8009EA78 /* 043058 80042458 24050002 */ li $a1, 2 -/* 04305C 8004245C 0C0270B8 */ jal func_8009C2E0 +/* 04305C 8004245C 0C0270B8 */ jal set_magic_code_flags /* 043060 80042460 24040002 */ li $a0, 2 /* 043064 80042464 0C01B629 */ jal func_8006D8A4 /* 043068 80042468 00000000 */ nop @@ -362,7 +362,7 @@ glabel func_800422F0 /* 043444 80042844 24040000 */ li $a0, 0 /* 043448 80042848 0C027A9E */ jal func_8009EA78 /* 04344C 8004284C 24050002 */ li $a1, 2 -/* 043450 80042850 0C0270B8 */ jal func_8009C2E0 +/* 043450 80042850 0C0270B8 */ jal set_magic_code_flags /* 043454 80042854 24040002 */ li $a0, 2 /* 043458 80042858 0C01B629 */ jal func_8006D8A4 /* 04345C 8004285C 00000000 */ nop diff --git a/asm/non_matchings/unknown_032760/func_80042A1C.s b/asm/non_matchings/unknown_032760/func_80042A1C.s index 6e31836a..4fa1f3be 100644 --- a/asm/non_matchings/unknown_032760/func_80042A1C.s +++ b/asm/non_matchings/unknown_032760/func_80042A1C.s @@ -15,7 +15,7 @@ glabel func_80042A1C /* 043650 80042A50 80AF0008 */ lb $t7, 8($a1) /* 043654 80042A54 A480007E */ sh $zero, 0x7e($a0) /* 043658 80042A58 A48F007C */ sh $t7, 0x7c($a0) -/* 04365C 80042A5C 0C0270B4 */ jal func_8009C2D0 +/* 04365C 80042A5C 0C0270B4 */ jal is_in_tracks_mode /* 043660 80042A60 AFA40018 */ sw $a0, 0x18($sp) /* 043664 80042A64 8FA40018 */ lw $a0, 0x18($sp) /* 043668 80042A68 10400003 */ beqz $v0, .L80042A78 diff --git a/asm/non_matchings/unknown_043920/func_80042D20.s b/asm/non_matchings/unknown_043920/func_80042D20.s index f88c2a6f..2f9370de 100644 --- a/asm/non_matchings/unknown_043920/func_80042D20.s +++ b/asm/non_matchings/unknown_043920/func_80042D20.s @@ -306,7 +306,7 @@ glabel func_80042D20 /* 043D94 80043194 00000000 */ nop /* 043D98 80043198 AFA9005C */ sw $t1, 0x5c($sp) /* 043D9C 8004319C A7AC0034 */ sh $t4, 0x34($sp) -/* 043DA0 800431A0 0C02658B */ jal func_8009962C +/* 043DA0 800431A0 0C02658B */ jal is_in_trophy_race /* 043DA4 800431A4 A7AD0078 */ sh $t5, 0x78($sp) /* 043DA8 800431A8 8FA9005C */ lw $t1, 0x5c($sp) /* 043DAC 800431AC 87AC0034 */ lh $t4, 0x34($sp) @@ -348,7 +348,7 @@ glabel func_80042D20 .L8004323C: /* 043E3C 8004323C AFA9005C */ sw $t1, 0x5c($sp) /* 043E40 80043240 A7AC0034 */ sh $t4, 0x34($sp) -/* 043E44 80043244 0C02658B */ jal func_8009962C +/* 043E44 80043244 0C02658B */ jal is_in_trophy_race /* 043E48 80043248 A7AD0078 */ sh $t5, 0x78($sp) /* 043E4C 8004324C 8FA9005C */ lw $t1, 0x5c($sp) /* 043E50 80043250 87AC0034 */ lh $t4, 0x34($sp) diff --git a/asm/non_matchings/unknown_05CEF0/func_8005C364.s b/asm/non_matchings/unknown_05CEF0/func_8005C364.s index dc1dccc5..93a57aa2 100644 --- a/asm/non_matchings/unknown_05CEF0/func_8005C364.s +++ b/asm/non_matchings/unknown_05CEF0/func_8005C364.s @@ -436,7 +436,7 @@ glabel func_8005C364 /* 05D5C0 8005C9C0 00000000 */ nop /* 05D5C4 8005C9C4 14400007 */ bnez $v0, .L8005C9E4 /* 05D5C8 8005C9C8 00000000 */ nop -/* 05D5CC 8005C9CC 0C027B20 */ jal func_8009EC80 +/* 05D5CC 8005C9CC 0C027B20 */ jal is_in_two_player_adventure /* 05D5D0 8005C9D0 00000000 */ nop /* 05D5D4 8005C9D4 10400003 */ beqz $v0, .L8005C9E4 /* 05D5D8 8005C9D8 00000000 */ nop diff --git a/asm/non_matchings/unknown_05CEF0/func_8005CB68.s b/asm/non_matchings/unknown_05CEF0/func_8005CB68.s index 84548474..3af6942c 100644 --- a/asm/non_matchings/unknown_05CEF0/func_8005CB68.s +++ b/asm/non_matchings/unknown_05CEF0/func_8005CB68.s @@ -198,7 +198,7 @@ glabel func_8005CB68 .L8005CE44: /* 05DA44 8005CE44 0C01BC50 */ jal func_8006F140 /* 05DA48 8005CE48 24040003 */ li $a0, 3 -/* 05DA4C 8005CE4C 0C027B20 */ jal func_8009EC80 +/* 05DA4C 8005CE4C 0C027B20 */ jal is_in_two_player_adventure /* 05DA50 8005CE50 00000000 */ nop /* 05DA54 8005CE54 10400004 */ beqz $v0, .L8005CE68 /* 05DA58 8005CE58 83AE0043 */ lb $t6, 0x43($sp) @@ -323,7 +323,7 @@ glabel func_8005CB68 .L8005D010: /* 05DC10 8005D010 00000000 */ nop /* 05DC14 8005D014 25CF0001 */ addiu $t7, $t6, 1 -/* 05DC18 8005D018 0C027068 */ jal func_8009C1A0 +/* 05DC18 8005D018 0C027068 */ jal get_save_file_index /* 05DC1C 8005D01C A3AF0043 */ sb $t7, 0x43($sp) /* 05DC20 8005D020 0C01BB12 */ jal func_8006EC48 /* 05DC24 8005D024 00402025 */ move $a0, $v0 diff --git a/asm/non_matchings/unknown_066AA0/func_8006B250.s b/asm/non_matchings/unknown_066AA0/func_8006B250.s index d1bdd8de..dcf50d93 100644 --- a/asm/non_matchings/unknown_066AA0/func_8006B250.s +++ b/asm/non_matchings/unknown_066AA0/func_8006B250.s @@ -342,7 +342,7 @@ glabel func_8006B250 /* 06C338 8006B738 24010064 */ li $at, 100 /* 06C33C 8006B73C 15410019 */ bne $t2, $at, .L8006B7A4 /* 06C340 8006B740 00000000 */ nop -/* 06C344 8006B744 0C02658B */ jal func_8009962C +/* 06C344 8006B744 0C02658B */ jal is_in_trophy_race /* 06C348 8006B748 00000000 */ nop /* 06C34C 8006B74C 10400009 */ beqz $v0, .L8006B774 /* 06C350 8006B750 00000000 */ nop @@ -355,7 +355,7 @@ glabel func_8006B250 /* 06C36C 8006B76C 1000000D */ b .L8006B7A4 /* 06C370 8006B770 AFA00070 */ sw $zero, 0x70($sp) .L8006B774: -/* 06C374 8006B774 0C0270B4 */ jal func_8009C2D0 +/* 06C374 8006B774 0C0270B4 */ jal is_in_tracks_mode /* 06C378 8006B778 00000000 */ nop /* 06C37C 8006B77C 24010001 */ li $at, 1 /* 06C380 8006B780 14410008 */ bne $v0, $at, .L8006B7A4 @@ -538,7 +538,7 @@ glabel func_8006B250 /* 06C608 8006BA08 1180000B */ beqz $t4, .L8006BA38 /* 06C60C 8006BA0C 00000000 */ nop .L8006BA10: -/* 06C610 8006BA10 0C027B20 */ jal func_8009EC80 +/* 06C610 8006BA10 0C027B20 */ jal is_in_two_player_adventure /* 06C614 8006BA14 00000000 */ nop /* 06C618 8006BA18 10400007 */ beqz $v0, .L8006BA38 /* 06C61C 8006BA1C 24180001 */ li $t8, 1 diff --git a/asm/non_matchings/unknown_066AA0/func_8006BFC8.s b/asm/non_matchings/unknown_066AA0/func_8006BFC8.s index ffc7cdfe..dee9730d 100644 --- a/asm/non_matchings/unknown_066AA0/func_8006BFC8.s +++ b/asm/non_matchings/unknown_066AA0/func_8006BFC8.s @@ -3,7 +3,7 @@ glabel func_8006BFC8 /* 06CBCC 8006BFCC AFBF001C */ sw $ra, 0x1c($sp) /* 06CBD0 8006BFD0 AFB00018 */ sw $s0, 0x18($sp) /* 06CBD4 8006BFD4 AFA40028 */ sw $a0, 0x28($sp) -/* 06CBD8 8006BFD8 0C0270B4 */ jal func_8009C2D0 +/* 06CBD8 8006BFD8 0C0270B4 */ jal is_in_tracks_mode /* 06CBDC 8006BFDC 00008025 */ move $s0, $zero /* 06CBE0 8006BFE0 14400011 */ bnez $v0, .L8006C028 /* 06CBE4 8006BFE4 00000000 */ nop @@ -27,13 +27,13 @@ glabel func_8006BFC8 .L8006C028: /* 06CC28 8006C028 24100003 */ li $s0, 3 .L8006C02C: -/* 06CC2C 8006C02C 0C02658B */ jal func_8009962C +/* 06CC2C 8006C02C 0C02658B */ jal is_in_trophy_race /* 06CC30 8006C030 00000000 */ nop /* 06CC34 8006C034 10400002 */ beqz $v0, .L8006C040 /* 06CC38 8006C038 00000000 */ nop /* 06CC3C 8006C03C 24100004 */ li $s0, 4 .L8006C040: -/* 06CC40 8006C040 0C027B1C */ jal func_8009EC70 +/* 06CC40 8006C040 0C027B1C */ jal is_in_adventure_two /* 06CC44 8006C044 00000000 */ nop /* 06CC48 8006C048 8FAD0028 */ lw $t5, 0x28($sp) /* 06CC4C 8006C04C 10400005 */ beqz $v0, .L8006C064 diff --git a/asm/non_matchings/unknown_066AA0/func_8006CCF0.s b/asm/non_matchings/unknown_066AA0/func_8006CCF0.s index 3385c903..16fc62a9 100644 --- a/asm/non_matchings/unknown_066AA0/func_8006CCF0.s +++ b/asm/non_matchings/unknown_066AA0/func_8006CCF0.s @@ -266,7 +266,7 @@ glabel func_8006CCF0 /* 06DCD8 8006D0D8 00000000 */ nop /* 06DCDC 8006D0DC 10400008 */ beqz $v0, .L8006D100 /* 06DCE0 8006D0E0 360E2020 */ ori $t6, $s0, 0x2020 -/* 06DCE4 8006D0E4 0C027B20 */ jal func_8009EC80 +/* 06DCE4 8006D0E4 0C027B20 */ jal is_in_two_player_adventure /* 06DCE8 8006D0E8 00000000 */ nop /* 06DCEC 8006D0EC 10400004 */ beqz $v0, .L8006D100 /* 06DCF0 8006D0F0 360E2020 */ ori $t6, $s0, 0x2020 @@ -284,7 +284,7 @@ glabel func_8006CCF0 /* 06DD1C 8006D11C 00000000 */ nop /* 06DD20 8006D120 10400008 */ beqz $v0, .L8006D144 /* 06DD24 8006D124 360F0020 */ ori $t7, $s0, 0x20 -/* 06DD28 8006D128 0C027B20 */ jal func_8009EC80 +/* 06DD28 8006D128 0C027B20 */ jal is_in_two_player_adventure /* 06DD2C 8006D12C 00000000 */ nop /* 06DD30 8006D130 10400004 */ beqz $v0, .L8006D144 /* 06DD34 8006D134 360F0020 */ ori $t7, $s0, 0x20 @@ -473,7 +473,7 @@ glabel func_8006CCF0 /* 06DFE4 8006D3E4 2401FFF6 */ li $at, -10 /* 06DFE8 8006D3E8 14410008 */ bne $v0, $at, .L8006D40C /* 06DFEC 8006D3EC 36190020 */ ori $t9, $s0, 0x20 -/* 06DFF0 8006D3F0 0C027B20 */ jal func_8009EC80 +/* 06DFF0 8006D3F0 0C027B20 */ jal is_in_two_player_adventure /* 06DFF4 8006D3F4 00000000 */ nop /* 06DFF8 8006D3F8 10400004 */ beqz $v0, .L8006D40C /* 06DFFC 8006D3FC 36190020 */ ori $t9, $s0, 0x20 @@ -553,7 +553,7 @@ glabel func_8006CCF0 /* 06E108 8006D508 2401FFF6 */ li $at, -10 /* 06E10C 8006D50C 14410008 */ bne $v0, $at, .L8006D530 /* 06E110 8006D510 36180020 */ ori $t8, $s0, 0x20 -/* 06E114 8006D514 0C027B20 */ jal func_8009EC80 +/* 06E114 8006D514 0C027B20 */ jal is_in_two_player_adventure /* 06E118 8006D518 00000000 */ nop /* 06E11C 8006D51C 10400004 */ beqz $v0, .L8006D530 /* 06E120 8006D520 36180020 */ ori $t8, $s0, 0x20 @@ -596,7 +596,7 @@ glabel func_8006CCF0 /* 06E198 8006D598 3C018012 */ lui $at, %hi(D_80123516) # $at, 0x8012 /* 06E19C 8006D59C 0C01B305 */ jal func_8006CC14 /* 06E1A0 8006D5A0 A0203516 */ sb $zero, %lo(D_80123516)($at) -/* 06E1A4 8006D5A4 0C027068 */ jal func_8009C1A0 +/* 06E1A4 8006D5A4 0C027068 */ jal get_save_file_index /* 06E1A8 8006D5A8 00000000 */ nop /* 06E1AC 8006D5AC 0C01BB12 */ jal func_8006EC48 /* 06E1B0 8006D5B0 00402025 */ move $a0, $v0 @@ -758,7 +758,7 @@ glabel func_8006CCF0 /* 06E408 8006D808 10000009 */ b .L8006D830 /* 06E40C 8006D80C 00000000 */ nop .L8006D810: -/* 06E410 8006D810 0C027068 */ jal func_8009C1A0 +/* 06E410 8006D810 0C027068 */ jal get_save_file_index /* 06E414 8006D814 00000000 */ nop /* 06E418 8006D818 0C01BB12 */ jal func_8006EC48 /* 06E41C 8006D81C 00402025 */ move $a0, $v0 @@ -787,7 +787,7 @@ glabel func_8006CCF0 /* 06E470 8006D870 8C8434F4 */ lw $a0, %lo(D_801234F4)($a0) /* 06E474 8006D874 0C01B2D6 */ jal func_8006CB58 /* 06E478 8006D878 00000000 */ nop -/* 06E47C 8006D87C 0C027068 */ jal func_8009C1A0 +/* 06E47C 8006D87C 0C027068 */ jal get_save_file_index /* 06E480 8006D880 00000000 */ nop /* 06E484 8006D884 0C01BB12 */ jal func_8006EC48 /* 06E488 8006D888 00402025 */ move $a0, $v0 diff --git a/asm/non_matchings/unknown_066AA0/func_8006DCF8.s b/asm/non_matchings/unknown_066AA0/func_8006DCF8.s index 4fbf750a..66bf7fd2 100644 --- a/asm/non_matchings/unknown_066AA0/func_8006DCF8.s +++ b/asm/non_matchings/unknown_066AA0/func_8006DCF8.s @@ -98,7 +98,7 @@ glabel func_8006DCF8 /* 06EA6C 8006DE6C 8D260000 */ lw $a2, ($t1) /* 06EA70 8006DE70 0C01B2D6 */ jal func_8006CB58 /* 06EA74 8006DE74 00000000 */ nop -/* 06EA78 8006DE78 0C027068 */ jal func_8009C1A0 +/* 06EA78 8006DE78 0C027068 */ jal get_save_file_index /* 06EA7C 8006DE7C 00000000 */ nop /* 06EA80 8006DE80 0C01BB12 */ jal func_8006EC48 /* 06EA84 8006DE84 00402025 */ move $a0, $v0 @@ -155,7 +155,7 @@ glabel func_8006DCF8 /* 06EB4C 8006DF4C 8D040000 */ lw $a0, ($t0) /* 06EB50 8006DF50 0C01B2D6 */ jal func_8006CB58 /* 06EB54 8006DF54 00000000 */ nop -/* 06EB58 8006DF58 0C027068 */ jal func_8009C1A0 +/* 06EB58 8006DF58 0C027068 */ jal get_save_file_index /* 06EB5C 8006DF5C 00000000 */ nop /* 06EB60 8006DF60 0C01BB12 */ jal func_8006EC48 /* 06EB64 8006DF64 00402025 */ move $a0, $v0 @@ -196,7 +196,7 @@ glabel func_8006DCF8 /* 06EBE8 8006DFE8 8D260000 */ lw $a2, ($t1) /* 06EBEC 8006DFEC 0C01B2D6 */ jal func_8006CB58 /* 06EBF0 8006DFF0 00000000 */ nop -/* 06EBF4 8006DFF4 0C027068 */ jal func_8009C1A0 +/* 06EBF4 8006DFF4 0C027068 */ jal get_save_file_index /* 06EBF8 8006DFF8 00000000 */ nop /* 06EBFC 8006DFFC 0C01BB12 */ jal func_8006EC48 /* 06EC00 8006E000 00402025 */ move $a0, $v0 @@ -376,7 +376,7 @@ glabel func_8006DCF8 /* 06EEA8 8006E2A8 00000000 */ nop /* 06EEAC 8006E2AC 11A0000B */ beqz $t5, .L8006E2DC /* 06EEB0 8006E2B0 8FBF0024 */ lw $ra, 0x24($sp) -/* 06EEB4 8006E2B4 0C0270B4 */ jal func_8009C2D0 +/* 06EEB4 8006E2B4 0C0270B4 */ jal is_in_tracks_mode /* 06EEB8 8006E2B8 00000000 */ nop /* 06EEBC 8006E2BC 14400007 */ bnez $v0, .L8006E2DC /* 06EEC0 8006E2C0 8FBF0024 */ lw $ra, 0x24($sp) diff --git a/asm/non_matchings/unknown_066AA0/func_8006E5BC.s b/asm/non_matchings/unknown_066AA0/func_8006E5BC.s index 5322ae53..b3705d63 100644 --- a/asm/non_matchings/unknown_066AA0/func_8006E5BC.s +++ b/asm/non_matchings/unknown_066AA0/func_8006E5BC.s @@ -39,7 +39,7 @@ glabel func_8006E5BC /* 06F24C 8006E64C 1000000E */ b .L8006E688 /* 06F250 8006E650 A151005A */ sb $s1, 0x5a($t2) .L8006E654: -/* 06F254 8006E654 0C027B20 */ jal func_8009EC80 +/* 06F254 8006E654 0C027B20 */ jal is_in_two_player_adventure /* 06F258 8006E658 00000000 */ nop /* 06F25C 8006E65C 10400006 */ beqz $v0, .L8006E678 /* 06F260 8006E660 00000000 */ nop diff --git a/asm/non_matchings/unknown_066AA0/func_8006EC48.s b/asm/non_matchings/unknown_066AA0/func_8006EC48.s index 43c27849..06511031 100644 --- a/asm/non_matchings/unknown_066AA0/func_8006EC48.s +++ b/asm/non_matchings/unknown_066AA0/func_8006EC48.s @@ -5,7 +5,7 @@ glabel func_8006EC48 /* 06F854 8006EC54 AFBF0014 */ sw $ra, 0x14($sp) /* 06F858 8006EC58 15C00010 */ bnez $t6, .L8006EC9C /* 06F85C 8006EC5C AFA40018 */ sw $a0, 0x18($sp) -/* 06F860 8006EC60 0C0270B4 */ jal func_8009C2D0 +/* 06F860 8006EC60 0C0270B4 */ jal is_in_tracks_mode /* 06F864 8006EC64 00000000 */ nop /* 06F868 8006EC68 1440000C */ bnez $v0, .L8006EC9C /* 06F86C 8006EC6C 2401F3FF */ li $at, -3073 diff --git a/asm/non_matchings/unknown_080500/MenuFileSelectInit.s b/asm/non_matchings/unknown_080500/MenuFileSelectInit.s index f98005f5..0b1bcf57 100644 --- a/asm/non_matchings/unknown_080500/MenuFileSelectInit.s +++ b/asm/non_matchings/unknown_080500/MenuFileSelectInit.s @@ -22,8 +22,8 @@ glabel MenuFileSelectInit /* 08D74C 8008CB4C 240E0001 */ li $t6, 1 /* 08D750 8008CB50 3C018012 */ lui $at, %hi(D_801263D8) # $at, 0x8012 /* 08D754 8008CB54 AC2E63D8 */ sw $t6, %lo(D_801263D8)($at) -/* 08D758 8008CB58 3C01800E */ lui $at, %hi(D_800DF4CC) # $at, 0x800e -/* 08D75C 8008CB5C AC20F4CC */ sw $zero, %lo(D_800DF4CC)($at) +/* 08D758 8008CB58 3C01800E */ lui $at, %hi(gSaveFileIndex) # $at, 0x800e +/* 08D75C 8008CB5C AC20F4CC */ sw $zero, %lo(gSaveFileIndex)($at) /* 08D760 8008CB60 3C01800E */ lui $at, %hi(D_800DF47C) # $at, 0x800e /* 08D764 8008CB64 AC20F47C */ sw $zero, %lo(D_800DF47C)($at) /* 08D768 8008CB68 3C018012 */ lui $at, %hi(D_801263E0) # $at, 0x8012 diff --git a/asm/non_matchings/unknown_080500/MenuFileSelectLoop.s b/asm/non_matchings/unknown_080500/MenuFileSelectLoop.s index 3dd30645..5cb6f76a 100644 --- a/asm/non_matchings/unknown_080500/MenuFileSelectLoop.s +++ b/asm/non_matchings/unknown_080500/MenuFileSelectLoop.s @@ -57,7 +57,7 @@ glabel MenuFileSelectLoop /* 08D488 8008C888 0C0002CA */ jal func_80000B28 /* 08D48C 8008C88C 00000000 */ nop /* 08D490 8008C890 240C0001 */ li $t4, 1 -/* 08D494 8008C894 3C01800E */ lui $at, %hi(D_800DF494) # $at, 0x800e +/* 08D494 8008C894 3C01800E */ lui $at, %hi(gIsInAdventureTwo) # $at, 0x800e /* 08D498 8008C898 0C01B96F */ jal func_8006E5BC /* 08D49C 8008C89C AC2CF4B8 */ sw $t4, %lo(D_800DF4B8)($at) /* 08D4A0 8008C8A0 2404FFFF */ li $a0, -1 @@ -69,7 +69,7 @@ glabel MenuFileSelectLoop /* 08D4B8 8008C8B8 10000080 */ b .L8008CABC /* 08D4BC 8008C8BC 00001025 */ move $v0, $zero .L8008C8C0: -/* 08D4C0 8008C8C0 AC22F494 */ sw $v0, %lo(D_800DF494)($at) +/* 08D4C0 8008C8C0 AC22F494 */ sw $v0, %lo(gIsInAdventureTwo)($at) /* 08D4C4 8008C8C4 3C01800E */ lui $at, %hi(D_800DF4B8) # $at, 0x800e /* 08D4C8 8008C8C8 AC20F4B8 */ sw $zero, %lo(D_800DF4B8)($at) /* 08D4CC 8008C8CC 3C018012 */ lui $at, %hi(D_801269C0) # $at, 0x8012 diff --git a/asm/non_matchings/unknown_080500/MenuGameSelectLoop.s b/asm/non_matchings/unknown_080500/MenuGameSelectLoop.s index 1addd12a..aeed61d6 100644 --- a/asm/non_matchings/unknown_080500/MenuGameSelectLoop.s +++ b/asm/non_matchings/unknown_080500/MenuGameSelectLoop.s @@ -168,8 +168,8 @@ glabel MenuGameSelectLoop /* 08ECDC 8008E0DC 00000000 */ nop /* 08ECE0 8008E0E0 0C02607A */ jal func_800981E8 /* 08ECE4 8008E0E4 00000000 */ nop -/* 08ECE8 8008E0E8 3C0C800E */ lui $t4, %hi(D_800DF4CC) # $t4, 0x800e -/* 08ECEC 8008E0EC 8D8CF4CC */ lw $t4, %lo(D_800DF4CC)($t4) +/* 08ECE8 8008E0E8 3C0C800E */ lui $t4, %hi(gSaveFileIndex) # $t4, 0x800e +/* 08ECEC 8008E0EC 8D8CF4CC */ lw $t4, %lo(gSaveFileIndex)($t4) /* 08ECF0 8008E0F0 3C0E8012 */ lui $t6, %hi(D_801264A0) # $t6, 0x8012 /* 08ECF4 8008E0F4 000C6880 */ sll $t5, $t4, 2 /* 08ECF8 8008E0F8 01AC6823 */ subu $t5, $t5, $t4 @@ -179,8 +179,8 @@ glabel MenuGameSelectLoop /* 08ED08 8008E108 AC206CC0 */ sw $zero, %lo(D_80126CC0)($at) /* 08ED0C 8008E10C 01AE1021 */ addu $v0, $t5, $t6 /* 08ED10 8008E110 A0400000 */ sb $zero, ($v0) -/* 08ED14 8008E114 3C0F800E */ lui $t7, %hi(D_800DF494) # $t7, 0x800e -/* 08ED18 8008E118 8DEFF494 */ lw $t7, %lo(D_800DF494)($t7) +/* 08ED14 8008E114 3C0F800E */ lui $t7, %hi(gIsInAdventureTwo) # $t7, 0x800e +/* 08ED18 8008E118 8DEFF494 */ lw $t7, %lo(gIsInAdventureTwo)($t7) /* 08ED1C 8008E11C 24190001 */ li $t9, 1 /* 08ED20 8008E120 11E00003 */ beqz $t7, .L8008E130 /* 08ED24 8008E124 24440004 */ addiu $a0, $v0, 4 @@ -192,9 +192,9 @@ glabel MenuGameSelectLoop /* 08ED38 8008E138 0C025DD1 */ jal func_80097744 /* 08ED3C 8008E13C 24050003 */ li $a1, 3 /* 08ED40 8008E140 8FAC0038 */ lw $t4, 0x38($sp) -/* 08ED44 8008E144 3C04800E */ lui $a0, %hi(D_800DF4CC) # $a0, 0x800e +/* 08ED44 8008E144 3C04800E */ lui $a0, %hi(gSaveFileIndex) # $a0, 0x800e /* 08ED48 8008E148 AD820050 */ sw $v0, 0x50($t4) -/* 08ED4C 8008E14C 8C84F4CC */ lw $a0, %lo(D_800DF4CC)($a0) +/* 08ED4C 8008E14C 8C84F4CC */ lw $a0, %lo(gSaveFileIndex)($a0) /* 08ED50 8008E150 0C01BADE */ jal func_8006EB78 /* 08ED54 8008E154 00000000 */ nop /* 08ED58 8008E158 0C000326 */ jal func_80000C98 @@ -212,8 +212,8 @@ glabel MenuGameSelectLoop /* 08ED84 8008E184 10400041 */ beqz $v0, .L8008E28C /* 08ED88 8008E188 AFA20040 */ sw $v0, 0x40($sp) /* 08ED8C 8008E18C 18400036 */ blez $v0, .L8008E268 -/* 08ED90 8008E190 3C09800E */ lui $t1, %hi(D_800DF4CC) # $t1, 0x800e -/* 08ED94 8008E194 8D29F4CC */ lw $t1, %lo(D_800DF4CC)($t1) +/* 08ED90 8008E190 3C09800E */ lui $t1, %hi(gSaveFileIndex) # $t1, 0x800e +/* 08ED94 8008E194 8D29F4CC */ lw $t1, %lo(gSaveFileIndex)($t1) /* 08ED98 8008E198 3C0F8012 */ lui $t7, %hi(D_801264A0) # $t7, 0x8012 /* 08ED9C 8008E19C 00097080 */ sll $t6, $t1, 2 /* 08EDA0 8008E1A0 01C97023 */ subu $t6, $t6, $t1 @@ -227,8 +227,8 @@ glabel MenuGameSelectLoop /* 08EDC0 8008E1C0 240400EF */ li $a0, 239 /* 08EDC4 8008E1C4 0C000741 */ jal func_80001D04 /* 08EDC8 8008E1C8 00002825 */ move $a1, $zero -/* 08EDCC 8008E1CC 3C04800E */ lui $a0, %hi(D_800DF4CC) # $a0, 0x800e -/* 08EDD0 8008E1D0 8C84F4CC */ lw $a0, %lo(D_800DF4CC)($a0) +/* 08EDCC 8008E1CC 3C04800E */ lui $a0, %hi(gSaveFileIndex) # $a0, 0x800e +/* 08EDD0 8008E1D0 8C84F4CC */ lw $a0, %lo(gSaveFileIndex)($a0) /* 08EDD4 8008E1D4 0C01BADE */ jal func_8006EB78 /* 08EDD8 8008E1D8 00000000 */ nop /* 08EDDC 8008E1DC 0C000326 */ jal func_80000C98 @@ -293,8 +293,8 @@ glabel MenuGameSelectLoop /* 08EEB4 8008E2B4 00036140 */ sll $t4, $v1, 5 /* 08EEB8 8008E2B8 0581000F */ bgez $t4, .L8008E2F8 /* 08EEBC 8008E2BC 3484FFFF */ ori $a0, (0xFBFFFFFF & 0xFFFF) # ori $a0, $a0, 0xffff -/* 08EEC0 8008E2C0 3C05800E */ lui $a1, %hi(D_800DFD9C) # $a1, 0x800e -/* 08EEC4 8008E2C4 24A5FD9C */ addiu $a1, %lo(D_800DFD9C) # addiu $a1, $a1, -0x264 +/* 08EEC0 8008E2C0 3C05800E */ lui $a1, %hi(gUnlockedMagicCodes) # $a1, 0x800e +/* 08EEC4 8008E2C4 24A5FD9C */ addiu $a1, %lo(gUnlockedMagicCodes) # addiu $a1, $a1, -0x264 /* 08EEC8 8008E2C8 8CAE0000 */ lw $t6, ($a1) /* 08EECC 8008E2CC 8FB80038 */ lw $t8, 0x38($sp) /* 08EED0 8008E2D0 00646824 */ and $t5, $v1, $a0 @@ -310,9 +310,9 @@ glabel MenuGameSelectLoop .L8008E2F8: /* 08EEF8 8008E2F8 3C0D800E */ lui $t5, %hi(D_800DF4BC) # $t5, 0x800e /* 08EEFC 8008E2FC 8DADF4BC */ lw $t5, %lo(D_800DF4BC)($t5) -/* 08EF00 8008E300 3C02800E */ lui $v0, %hi(D_800DF4C0) # $v0, 0x800e +/* 08EF00 8008E300 3C02800E */ lui $v0, %hi(gIsInTwoPlayerAdventure) # $v0, 0x800e /* 08EF04 8008E304 39AE0002 */ xori $t6, $t5, 2 -/* 08EF08 8008E308 2442F4C0 */ addiu $v0, %lo(D_800DF4C0) # addiu $v0, $v0, -0xb40 +/* 08EF08 8008E308 2442F4C0 */ addiu $v0, %lo(gIsInTwoPlayerAdventure) # addiu $v0, $v0, -0xb40 /* 08EF0C 8008E30C 2DCE0001 */ sltiu $t6, $t6, 1 /* 08EF10 8008E310 11C00003 */ beqz $t6, .L8008E320 /* 08EF14 8008E314 AC4E0000 */ sw $t6, ($v0) @@ -331,13 +331,13 @@ glabel MenuGameSelectLoop /* 08EF44 8008E344 0C01B96F */ jal func_8006E5BC /* 08EF48 8008E348 00000000 */ nop /* 08EF4C 8008E34C 8FA20038 */ lw $v0, 0x38($sp) -/* 08EF50 8008E350 3C01800E */ lui $at, %hi(D_800E0FE8) # $at, 0x800e -/* 08EF54 8008E354 AC200FE8 */ sw $zero, %lo(D_800E0FE8)($at) +/* 08EF50 8008E350 3C01800E */ lui $at, %hi(gIsInTrophyRace) # $at, 0x800e +/* 08EF54 8008E354 AC200FE8 */ sw $zero, %lo(gIsInTrophyRace)($at) /* 08EF58 8008E358 904C004B */ lbu $t4, 0x4b($v0) -/* 08EF5C 8008E35C 3C0D800E */ lui $t5, %hi(D_800DF494) # $t5, 0x800e +/* 08EF5C 8008E35C 3C0D800E */ lui $t5, %hi(gIsInAdventureTwo) # $t5, 0x800e /* 08EF60 8008E360 11800017 */ beqz $t4, .L8008E3C0 /* 08EF64 8008E364 00000000 */ nop -/* 08EF68 8008E368 8DADF494 */ lw $t5, %lo(D_800DF494)($t5) +/* 08EF68 8008E368 8DADF494 */ lw $t5, %lo(gIsInAdventureTwo)($t5) /* 08EF6C 8008E36C 00000000 */ nop /* 08EF70 8008E370 11A00005 */ beqz $t5, .L8008E388 /* 08EF74 8008E374 00000000 */ nop @@ -367,11 +367,11 @@ glabel MenuGameSelectLoop /* 08EFCC 8008E3CC 13200005 */ beqz $t9, .L8008E3E4 /* 08EFD0 8008E3D0 3C02800E */ lui $v0, %hi(D_800DF4BC) # $v0, 0x800e /* 08EFD4 8008E3D4 240C0001 */ li $t4, 1 -/* 08EFD8 8008E3D8 3C01800E */ lui $at, %hi(D_800DF494) # $at, 0x800e +/* 08EFD8 8008E3D8 3C01800E */ lui $at, %hi(gIsInAdventureTwo) # $at, 0x800e /* 08EFDC 8008E3DC 10000002 */ b .L8008E3E8 -/* 08EFE0 8008E3E0 AC2CF494 */ sw $t4, %lo(D_800DF494)($at) +/* 08EFE0 8008E3E0 AC2CF494 */ sw $t4, %lo(gIsInAdventureTwo)($at) .L8008E3E4: -/* 08EFE4 8008E3E4 AC20F494 */ sw $zero, %lo(D_800DF494)($at) +/* 08EFE4 8008E3E4 AC20F494 */ sw $zero, %lo(gIsInAdventureTwo)($at) .L8008E3E8: /* 08EFE8 8008E3E8 8C42F4BC */ lw $v0, %lo(D_800DF4BC)($v0) /* 08EFEC 8008E3EC 1000000B */ b .L8008E41C diff --git a/asm/non_matchings/unknown_080500/MenuMagicCodesListLoop.s b/asm/non_matchings/unknown_080500/MenuMagicCodesListLoop.s index 042b6ae0..0fb32c8a 100644 --- a/asm/non_matchings/unknown_080500/MenuMagicCodesListLoop.s +++ b/asm/non_matchings/unknown_080500/MenuMagicCodesListLoop.s @@ -73,9 +73,9 @@ glabel MenuMagicCodesListLoop /* 08B634 8008AA34 1611FFF0 */ bne $s0, $s1, .L8008A9F8 /* 08B638 8008AA38 024D9021 */ addu $s2, $s2, $t5 .L8008AA3C: -/* 08B63C 8008AA3C 3C02800E */ lui $v0, %hi(D_800DFD9C) # $v0, 0x800e +/* 08B63C 8008AA3C 3C02800E */ lui $v0, %hi(gUnlockedMagicCodes) # $v0, 0x800e /* 08B640 8008AA40 3C088012 */ lui $t0, %hi(D_80126C80) # $t0, 0x8012 -/* 08B644 8008AA44 8C42FD9C */ lw $v0, %lo(D_800DFD9C)($v0) +/* 08B644 8008AA44 8C42FD9C */ lw $v0, %lo(gUnlockedMagicCodes)($v0) /* 08B648 8008AA48 25086C80 */ addiu $t0, %lo(D_80126C80) # addiu $t0, $t0, 0x6c80 /* 08B64C 8008AA4C 00008025 */ move $s0, $zero /* 08B650 8008AA50 24110001 */ li $s1, 1 diff --git a/asm/non_matchings/unknown_080500/MenuMagicCodesLoop.s b/asm/non_matchings/unknown_080500/MenuMagicCodesLoop.s index 68a7e476..cf2ab64c 100644 --- a/asm/non_matchings/unknown_080500/MenuMagicCodesLoop.s +++ b/asm/non_matchings/unknown_080500/MenuMagicCodesLoop.s @@ -323,8 +323,8 @@ glabel MenuMagicCodesLoop /* 08AD64 8008A164 1000000E */ b .L8008A1A0 /* 08AD68 8008A168 A5790000 */ sh $t9, ($t3) .L8008A16C: -/* 08AD6C 8008A16C 3C03800E */ lui $v1, %hi(D_800DFD9C) # $v1, 0x800e -/* 08AD70 8008A170 2463FD9C */ addiu $v1, %lo(D_800DFD9C) # addiu $v1, $v1, -0x264 +/* 08AD6C 8008A16C 3C03800E */ lui $v1, %hi(gUnlockedMagicCodes) # $v1, 0x800e +/* 08AD70 8008A170 2463FD9C */ addiu $v1, %lo(gUnlockedMagicCodes) # addiu $v1, $v1, -0x264 /* 08AD74 8008A174 8C780000 */ lw $t8, ($v1) /* 08AD78 8008A178 00087043 */ sra $t6, $t0, 1 /* 08AD7C 8008A17C 240F0001 */ li $t7, 1 @@ -366,9 +366,9 @@ glabel MenuMagicCodesLoop /* 08ADFC 8008A1FC 24010001 */ li $at, 1 /* 08AE00 8008A200 1461000E */ bne $v1, $at, .L8008A23C /* 08AE04 8008A204 240F0001 */ li $t7, 1 -/* 08AE08 8008A208 3C03800E */ lui $v1, %hi(D_800DFD9C) # $v1, 0x800e +/* 08AE08 8008A208 3C03800E */ lui $v1, %hi(gUnlockedMagicCodes) # $v1, 0x800e /* 08AE0C 8008A20C 3C01800E */ lui $at, %hi(gActiveMagicCodes) # $at, 0x800e -/* 08AE10 8008A210 2463FD9C */ addiu $v1, %lo(D_800DFD9C) # addiu $v1, $v1, -0x264 +/* 08AE10 8008A210 2463FD9C */ addiu $v1, %lo(gUnlockedMagicCodes) # addiu $v1, $v1, -0x264 /* 08AE14 8008A214 AC20FD98 */ sw $zero, %lo(gActiveMagicCodes)($at) /* 08AE18 8008A218 8C6E0000 */ lw $t6, ($v1) /* 08AE1C 8008A21C A5BF0000 */ sh $ra, ($t5) diff --git a/asm/non_matchings/unknown_080500/MenuTitleScreenInit.s b/asm/non_matchings/unknown_080500/MenuTitleScreenInit.s index 11310336..06eb5af9 100644 --- a/asm/non_matchings/unknown_080500/MenuTitleScreenInit.s +++ b/asm/non_matchings/unknown_080500/MenuTitleScreenInit.s @@ -9,8 +9,8 @@ glabel MenuTitleScreenInit /* 084158 80083558 3C01800E */ lui $at, %hi(D_800DF47C) # $at, 0x800e /* 08415C 8008355C 0C027055 */ jal func_8009C154 /* 084160 80083560 AC20F47C */ sw $zero, %lo(D_800DF47C)($at) -/* 084164 80083564 3C01800E */ lui $at, %hi(D_800DF4CC) # $at, 0x800e -/* 084168 80083568 AC20F4CC */ sw $zero, %lo(D_800DF4CC)($at) +/* 084164 80083564 3C01800E */ lui $at, %hi(gSaveFileIndex) # $at, 0x800e +/* 084168 80083568 AC20F4CC */ sw $zero, %lo(gSaveFileIndex)($at) /* 08416C 8008356C 3C01800E */ lui $at, %hi(D_800DF45C) # $at, 0x800e /* 084170 80083570 AC20F45C */ sw $zero, %lo(D_800DF45C)($at) /* 084174 80083574 3C01800E */ lui $at, %hi(D_800DF4BC) # $at, 0x800e diff --git a/asm/non_matchings/unknown_080500/MenuTrackSelectInit.s b/asm/non_matchings/unknown_080500/MenuTrackSelectInit.s index 83681ab1..ef6fd4ff 100644 --- a/asm/non_matchings/unknown_080500/MenuTrackSelectInit.s +++ b/asm/non_matchings/unknown_080500/MenuTrackSelectInit.s @@ -540,11 +540,11 @@ glabel MenuTrackSelectInit /* 08FBB8 8008EFB8 24040001 */ li $a0, 1 /* 08FBBC 8008EFBC 3C0C800E */ lui $t4, %hi(D_800E0418) # $t4, 0x800e /* 08FBC0 8008EFC0 8D8C0418 */ lw $t4, %lo(D_800E0418)($t4) -/* 08FBC4 8008EFC4 3C01800E */ lui $at, %hi(D_800DF494) # $at, 0x800e +/* 08FBC4 8008EFC4 3C01800E */ lui $at, %hi(gIsInAdventureTwo) # $at, 0x800e /* 08FBC8 8008EFC8 3C0B800E */ lui $t3, %hi(D_800E0410) # $t3, 0x800e /* 08FBCC 8008EFCC 8D6B0410 */ lw $t3, %lo(D_800E0410)($t3) /* 08FBD0 8008EFD0 8FBF0044 */ lw $ra, 0x44($sp) -/* 08FBD4 8008EFD4 AC2CF494 */ sw $t4, %lo(D_800DF494)($at) +/* 08FBD4 8008EFD4 AC2CF494 */ sw $t4, %lo(gIsInAdventureTwo)($at) /* 08FBD8 8008EFD8 3C018012 */ lui $at, 0x8012 /* 08FBDC 8008EFDC 8FB00020 */ lw $s0, 0x20($sp) /* 08FBE0 8008EFE0 8FB10024 */ lw $s1, 0x24($sp) diff --git a/asm/non_matchings/unknown_080500/MenuTrackSelectLoop.s b/asm/non_matchings/unknown_080500/MenuTrackSelectLoop.s index a02a59e2..5a8781d5 100644 --- a/asm/non_matchings/unknown_080500/MenuTrackSelectLoop.s +++ b/asm/non_matchings/unknown_080500/MenuTrackSelectLoop.s @@ -191,9 +191,9 @@ glabel MenuTrackSelectLoop /* 0900E8 8008F4E8 AC28F478 */ sw $t0, %lo(D_800DF478)($at) .L8008F4EC: /* 0900EC 8008F4EC 8D2969CC */ lw $t1, %lo(D_801269CC)($t1) -/* 0900F0 8008F4F0 3C01800E */ lui $at, %hi(D_800E0FE8) # $at, 0x800e +/* 0900F0 8008F4F0 3C01800E */ lui $at, %hi(gIsInTrophyRace) # $at, 0x800e /* 0900F4 8008F4F4 252A0001 */ addiu $t2, $t1, 1 -/* 0900F8 8008F4F8 AC2A0FE8 */ sw $t2, %lo(D_800E0FE8)($at) +/* 0900F8 8008F4F8 AC2A0FE8 */ sw $t2, %lo(gIsInTrophyRace)($at) /* 0900FC 8008F4FC 3C01800E */ lui $at, %hi(D_800DF450) # $at, 0x800e /* 090100 8008F500 A020F450 */ sb $zero, %lo(D_800DF450)($at) /* 090104 8008F504 3C01800E */ lui $at, %hi(D_800E0FEC) # $at, 0x800e diff --git a/asm/non_matchings/unknown_080500/MenuTrophyRaceRankingsInit.s b/asm/non_matchings/unknown_080500/MenuTrophyRaceRankingsInit.s index 3f867879..1723406a 100644 --- a/asm/non_matchings/unknown_080500/MenuTrophyRaceRankingsInit.s +++ b/asm/non_matchings/unknown_080500/MenuTrophyRaceRankingsInit.s @@ -26,10 +26,10 @@ glabel MenuTrophyRaceRankingsInit /* 099684 80098A84 24630FEC */ addiu $v1, %lo(D_800E0FEC) # addiu $v1, $v1, 0xfec /* 099688 80098A88 8C620000 */ lw $v0, ($v1) /* 09968C 80098A8C 3C01800E */ lui $at, %hi(D_800E0FF0) # $at, 0x800e -/* 099690 80098A90 3C05800E */ lui $a1, %hi(D_800E0FE8) # $a1, 0x800e +/* 099690 80098A90 3C05800E */ lui $a1, %hi(gIsInTrophyRace) # $a1, 0x800e /* 099694 80098A94 8FA7003C */ lw $a3, 0x3c($sp) /* 099698 80098A98 8FA90040 */ lw $t1, 0x40($sp) -/* 09969C 80098A9C 24A50FE8 */ addiu $a1, %lo(D_800E0FE8) # addiu $a1, $a1, 0xfe8 +/* 09969C 80098A9C 24A50FE8 */ addiu $a1, %lo(gIsInTrophyRace) # addiu $a1, $a1, 0xfe8 /* 0996A0 80098AA0 24060006 */ li $a2, 6 /* 0996A4 80098AA4 2404FFFF */ li $a0, -1 /* 0996A8 80098AA8 AC220FF0 */ sw $v0, %lo(D_800E0FF0)($at) @@ -93,7 +93,7 @@ glabel MenuTrophyRaceRankingsInit /* 09977C 80098B7C 24010002 */ li $at, 2 /* 099780 80098B80 10410007 */ beq $v0, $at, .L80098BA0 /* 099784 80098B84 00000000 */ nop -/* 099788 80098B88 0C027B20 */ jal func_8009EC80 +/* 099788 80098B88 0C027B20 */ jal is_in_two_player_adventure /* 09978C 80098B8C AFA90040 */ sw $t1, 0x40($sp) /* 099790 80098B90 8FA90040 */ lw $t1, 0x40($sp) /* 099794 80098B94 3C0B800E */ lui $t3, %hi(D_800DF4BC) # $t3, 0x800e @@ -264,7 +264,7 @@ glabel MenuTrophyRaceRankingsInit /* 0999D8 80098DD8 AFA5004C */ sw $a1, 0x4c($sp) /* 0999DC 80098DDC AFA30048 */ sw $v1, 0x48($sp) .L80098DE0: -/* 0999E0 80098DE0 0C027B20 */ jal func_8009EC80 +/* 0999E0 80098DE0 0C027B20 */ jal is_in_two_player_adventure /* 0999E4 80098DE4 00000000 */ nop /* 0999E8 80098DE8 3C0B800E */ lui $t3, %hi(D_800DF4BC) # $t3, 0x800e /* 0999EC 80098DEC 3C0C800E */ lui $t4, %hi(D_800E0FE4) # $t4, 0x800e diff --git a/asm/non_matchings/unknown_080500/MenuTrophyRaceRankingsLoop.s b/asm/non_matchings/unknown_080500/MenuTrophyRaceRankingsLoop.s index ea0cf58d..0e33d156 100644 --- a/asm/non_matchings/unknown_080500/MenuTrophyRaceRankingsLoop.s +++ b/asm/non_matchings/unknown_080500/MenuTrophyRaceRankingsLoop.s @@ -310,7 +310,7 @@ glabel MenuTrophyRaceRankingsLoop /* 09A04C 8009944C 254A6438 */ addiu $t2, %lo(D_80126438) # addiu $t2, $t2, 0x6438 /* 09A050 80099450 AFA30048 */ sw $v1, 0x48($sp) /* 09A054 80099454 AFAB002C */ sw $t3, 0x2c($sp) -/* 09A058 80099458 0C027B20 */ jal func_8009EC80 +/* 09A058 80099458 0C027B20 */ jal is_in_two_player_adventure /* 09A05C 8009945C AFAC0034 */ sw $t4, 0x34($sp) /* 09A060 80099460 8FA30048 */ lw $v1, 0x48($sp) /* 09A064 80099464 3C0A8012 */ lui $t2, %hi(D_80126438) # $t2, 0x8012 @@ -382,7 +382,7 @@ glabel MenuTrophyRaceRankingsLoop /* 09A160 80099560 A579000E */ sh $t9, 0xe($t3) /* 09A164 80099564 032D7025 */ or $t6, $t9, $t5 /* 09A168 80099568 A56E000E */ sh $t6, 0xe($t3) -/* 09A16C 8009956C 0C027068 */ jal func_8009C1A0 +/* 09A16C 8009956C 0C027068 */ jal get_save_file_index /* 09A170 80099570 AFAC0034 */ sw $t4, 0x34($sp) /* 09A174 80099574 0C01BB12 */ jal func_8006EC48 /* 09A178 80099578 00402025 */ move $a0, $v0 @@ -395,8 +395,8 @@ glabel MenuTrophyRaceRankingsLoop /* 09A18C 8009958C 2404001F */ li $a0, 31 /* 09A190 80099590 0C0078A7 */ jal func_8001E29C /* 09A194 80099594 AFAC0034 */ sw $t4, 0x34($sp) -/* 09A198 80099598 3C0F800E */ lui $t7, %hi(D_800E0FE8) # $t7, 0x800e -/* 09A19C 8009959C 8DEF0FE8 */ lw $t7, %lo(D_800E0FE8)($t7) +/* 09A198 80099598 3C0F800E */ lui $t7, %hi(gIsInTrophyRace) # $t7, 0x800e +/* 09A19C 8009959C 8DEF0FE8 */ lw $t7, %lo(gIsInTrophyRace)($t7) /* 09A1A0 800995A0 8FAC0034 */ lw $t4, 0x34($sp) /* 09A1A4 800995A4 000FC080 */ sll $t8, $t7, 2 /* 09A1A8 800995A8 3C0A8012 */ lui $t2, %hi(D_80126438) # $t2, 0x8012 @@ -414,8 +414,8 @@ glabel MenuTrophyRaceRankingsLoop /* 09A1D8 800995D8 0C0204F4 */ jal MenuInit /* 09A1DC 800995DC 24040017 */ li $a0, 23 .L800995E0: -/* 09A1E0 800995E0 3C01800E */ lui $at, %hi(D_800E0FE8) # $at, 0x800e -/* 09A1E4 800995E4 AC200FE8 */ sw $zero, %lo(D_800E0FE8)($at) +/* 09A1E0 800995E0 3C01800E */ lui $at, %hi(gIsInTrophyRace) # $at, 0x800e +/* 09A1E4 800995E4 AC200FE8 */ sw $zero, %lo(gIsInTrophyRace)($at) .L800995E8: /* 09A1E8 800995E8 8FBF001C */ lw $ra, 0x1c($sp) .L800995EC: diff --git a/asm/non_matchings/unknown_080500/MenuTrophyRaceRoundInit.s b/asm/non_matchings/unknown_080500/MenuTrophyRaceRoundInit.s index 35e12d77..733df15c 100644 --- a/asm/non_matchings/unknown_080500/MenuTrophyRaceRoundInit.s +++ b/asm/non_matchings/unknown_080500/MenuTrophyRaceRoundInit.s @@ -11,7 +11,7 @@ glabel MenuTrophyRaceRoundInit /* 098E90 80098290 2404001A */ li $a0, 26 /* 098E94 80098294 3C03800E */ lui $v1, %hi(D_800E0FEC) # $v1, 0x800e /* 098E98 80098298 8C630FEC */ lw $v1, %lo(D_800E0FEC)($v1) -/* 098E9C 8009829C 3C0E800E */ lui $t6, %hi(D_800E0FE8) # $t6, 0x800e +/* 098E9C 8009829C 3C0E800E */ lui $t6, %hi(gIsInTrophyRace) # $t6, 0x800e /* 098EA0 800982A0 1460000E */ bnez $v1, .L800982DC /* 098EA4 800982A4 3C13800E */ lui $s3, %hi(D_800DF4BC) # $s3, 0x800e /* 098EA8 800982A8 00008025 */ move $s0, $zero @@ -29,7 +29,7 @@ glabel MenuTrophyRaceRoundInit /* 098ED4 800982D4 8C630FEC */ lw $v1, %lo(D_800E0FEC)($v1) /* 098ED8 800982D8 00000000 */ nop .L800982DC: -/* 098EDC 800982DC 8DCE0FE8 */ lw $t6, %lo(D_800E0FE8)($t6) +/* 098EDC 800982DC 8DCE0FE8 */ lw $t6, %lo(gIsInTrophyRace)($t6) /* 098EE0 800982E0 2673F4BC */ addiu $s3, %lo(D_800DF4BC) # addiu $s3, $s3, -0xb44 /* 098EE4 800982E4 000E7880 */ sll $t7, $t6, 2 /* 098EE8 800982E8 01EE7823 */ subu $t7, $t7, $t6 diff --git a/asm/non_matchings/unknown_080500/MenuTrophyRaceRoundLoop.s b/asm/non_matchings/unknown_080500/MenuTrophyRaceRoundLoop.s index 5cb642e8..ba598fd6 100644 --- a/asm/non_matchings/unknown_080500/MenuTrophyRaceRoundLoop.s +++ b/asm/non_matchings/unknown_080500/MenuTrophyRaceRoundLoop.s @@ -13,8 +13,8 @@ glabel MenuTrophyRaceRoundLoop /* 0991C8 800985C8 006E7823 */ subu $t7, $v1, $t6 /* 0991CC 800985CC 1DE00017 */ bgtz $t7, .L8009862C /* 0991D0 800985D0 ACEF0000 */ sw $t7, ($a3) -/* 0991D4 800985D4 3C19800E */ lui $t9, %hi(D_800E0FE8) # $t9, 0x800e -/* 0991D8 800985D8 8F390FE8 */ lw $t9, %lo(D_800E0FE8)($t9) +/* 0991D4 800985D4 3C19800E */ lui $t9, %hi(gIsInTrophyRace) # $t9, 0x800e +/* 0991D8 800985D8 8F390FE8 */ lw $t9, %lo(gIsInTrophyRace)($t9) /* 0991DC 800985DC 3C09800E */ lui $t1, %hi(D_800E0FEC) # $t1, 0x800e /* 0991E0 800985E0 00194080 */ sll $t0, $t9, 2 /* 0991E4 800985E4 8D290FEC */ lw $t1, %lo(D_800E0FEC)($t1) @@ -89,8 +89,8 @@ glabel MenuTrophyRaceRoundLoop /* 0992E4 800986E4 00000000 */ nop /* 0992E8 800986E8 0C0261D5 */ jal func_80098754 /* 0992EC 800986EC 00000000 */ nop -/* 0992F0 800986F0 3C0B800E */ lui $t3, %hi(D_800E0FE8) # $t3, 0x800e -/* 0992F4 800986F4 8D6B0FE8 */ lw $t3, %lo(D_800E0FE8)($t3) +/* 0992F0 800986F0 3C0B800E */ lui $t3, %hi(gIsInTrophyRace) # $t3, 0x800e +/* 0992F4 800986F4 8D6B0FE8 */ lw $t3, %lo(gIsInTrophyRace)($t3) /* 0992F8 800986F8 3C0D800E */ lui $t5, %hi(D_800E0FEC) # $t5, 0x800e /* 0992FC 800986FC 000B6080 */ sll $t4, $t3, 2 /* 099300 80098700 8DAD0FEC */ lw $t5, %lo(D_800E0FEC)($t5) diff --git a/asm/non_matchings/unknown_080500/func_800829F8.s b/asm/non_matchings/unknown_080500/func_800829F8.s deleted file mode 100644 index 3b5c779c..00000000 --- a/asm/non_matchings/unknown_080500/func_800829F8.s +++ /dev/null @@ -1,49 +0,0 @@ -glabel func_800829F8 -/* 0835F8 800829F8 3C02800E */ lui $v0, %hi(D_800DF46C) # $v0, 0x800e -/* 0835FC 800829FC 2442F46C */ addiu $v0, %lo(D_800DF46C) # addiu $v0, $v0, -0xb94 -/* 083600 80082A00 8C4E0000 */ lw $t6, ($v0) -/* 083604 80082A04 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 083608 80082A08 01C57821 */ addu $t7, $t6, $a1 -/* 08360C 80082A0C 31F90010 */ andi $t9, $t7, 0x10 -/* 083610 80082A10 AFBF001C */ sw $ra, 0x1c($sp) -/* 083614 80082A14 AFA40020 */ sw $a0, 0x20($sp) -/* 083618 80082A18 13200020 */ beqz $t9, .L80082A9C -/* 08361C 80082A1C AC4F0000 */ sw $t7, ($v0) -/* 083620 80082A20 0C027AC8 */ jal func_8009EB20 -/* 083624 80082A24 00000000 */ nop -/* 083628 80082A28 0C01FE40 */ jal func_8007F900 -/* 08362C 80082A2C 00402025 */ move $a0, $v0 -/* 083630 80082A30 0C0310BB */ jal func_800C42EC -/* 083634 80082A34 00002025 */ move $a0, $zero -/* 083638 80082A38 240800FF */ li $t0, 255 -/* 08363C 80082A3C AFA80010 */ sw $t0, 0x10($sp) -/* 083640 80082A40 240400FF */ li $a0, 255 -/* 083644 80082A44 240500FF */ li $a1, 255 -/* 083648 80082A48 240600FF */ li $a2, 255 -/* 08364C 80082A4C 0C0310E1 */ jal func_800C4384 -/* 083650 80082A50 00003825 */ move $a3, $zero -/* 083654 80082A54 00002025 */ move $a0, $zero -/* 083658 80082A58 00002825 */ move $a1, $zero -/* 08365C 80082A5C 00003025 */ move $a2, $zero -/* 083660 80082A60 0C0310F3 */ jal func_800C43CC -/* 083664 80082A64 00003825 */ move $a3, $zero -/* 083668 80082A68 3C098000 */ lui $t1, %hi(osTvType) # $t1, 0x8000 -/* 08366C 80082A6C 8D290300 */ lw $t1, %lo(osTvType)($t1) -/* 083670 80082A70 8FA40020 */ lw $a0, 0x20($sp) -/* 083674 80082A74 15200002 */ bnez $t1, .L80082A80 -/* 083678 80082A78 240600D0 */ li $a2, 208 -/* 08367C 80082A7C 240600EA */ li $a2, 234 -.L80082A80: -/* 083680 80082A80 3C0A800E */ lui $t2, %hi(D_800DF4A0) # $t2, 0x800e -/* 083684 80082A84 8D4AF4A0 */ lw $t2, %lo(D_800DF4A0)($t2) -/* 083688 80082A88 240B000C */ li $t3, 12 -/* 08368C 80082A8C 8D47025C */ lw $a3, 0x25c($t2) -/* 083690 80082A90 AFAB0010 */ sw $t3, 0x10($sp) -/* 083694 80082A94 0C031110 */ jal func_800C4440 -/* 083698 80082A98 24058000 */ li $a1, -32768 -.L80082A9C: -/* 08369C 80082A9C 8FBF001C */ lw $ra, 0x1c($sp) -/* 0836A0 80082AA0 27BD0020 */ addiu $sp, $sp, 0x20 -/* 0836A4 80082AA4 03E00008 */ jr $ra -/* 0836A8 80082AA8 00000000 */ nop - diff --git a/asm/non_matchings/unknown_080500/func_80082FAC.s b/asm/non_matchings/unknown_080500/func_80082FAC.s index 1387cb9e..d33d11bb 100644 --- a/asm/non_matchings/unknown_080500/func_80082FAC.s +++ b/asm/non_matchings/unknown_080500/func_80082FAC.s @@ -10,7 +10,7 @@ glabel func_80082FAC /* 083BCC 80082FCC AFAE0018 */ sw $t6, 0x18($sp) /* 083BD0 80082FD0 1320000A */ beqz $t9, .L80082FFC /* 083BD4 80082FD4 8FAB001C */ lw $t3, 0x1c($sp) -/* 083BD8 80082FD8 0C0270B8 */ jal func_8009C2E0 +/* 083BD8 80082FD8 0C0270B8 */ jal set_magic_code_flags /* 083BDC 80082FDC 24040002 */ li $a0, 2 /* 083BE0 80082FE0 3C088012 */ lui $t0, %hi(D_80126448) # $t0, 0x8012 /* 083BE4 80082FE4 3C098012 */ lui $t1, %hi(D_8012644C) # $t1, 0x8012 @@ -27,7 +27,7 @@ glabel func_80082FAC /* 083C0C 8008300C 3421FFF0 */ ori $at, (0x00FFFFF0 & 0xFFFF) # ori $at, $at, 0xfff0 /* 083C10 80083010 15A1000A */ bne $t5, $at, .L8008303C /* 083C14 80083014 8FB9001C */ lw $t9, 0x1c($sp) -/* 083C18 80083018 0C0270B8 */ jal func_8009C2E0 +/* 083C18 80083018 0C0270B8 */ jal set_magic_code_flags /* 083C1C 8008301C 24040001 */ li $a0, 1 /* 083C20 80083020 3C0E8012 */ lui $t6, %hi(D_80126448) # $t6, 0x8012 /* 083C24 80083024 3C0F8012 */ lui $t7, %hi(D_8012644C) # $t7, 0x8012 @@ -41,11 +41,11 @@ glabel func_80082FAC /* 083C40 80083040 33290001 */ andi $t1, $t9, 1 /* 083C44 80083044 11200004 */ beqz $t1, .L80083058 /* 083C48 80083048 3C01800E */ lui $at, 0x800e -/* 083C4C 8008304C 3C01800E */ lui $at, %hi(D_800DF494) # $at, 0x800e +/* 083C4C 8008304C 3C01800E */ lui $at, %hi(gIsInAdventureTwo) # $at, 0x800e /* 083C50 80083050 10000002 */ b .L8008305C -/* 083C54 80083054 AC2AF494 */ sw $t2, %lo(D_800DF494)($at) +/* 083C54 80083054 AC2AF494 */ sw $t2, %lo(gIsInAdventureTwo)($at) .L80083058: -/* 083C58 80083058 AC20F494 */ sw $zero, %lo(D_800DF494)($at) +/* 083C58 80083058 AC20F494 */ sw $zero, %lo(gIsInAdventureTwo)($at) .L8008305C: /* 083C5C 8008305C 8FAD001C */ lw $t5, 0x1c($sp) /* 083C60 80083060 3C010200 */ lui $at, 0x200 diff --git a/asm/non_matchings/unknown_080500/func_80086AFC.s b/asm/non_matchings/unknown_080500/func_80086AFC.s index fb694eb8..aee747ec 100644 --- a/asm/non_matchings/unknown_080500/func_80086AFC.s +++ b/asm/non_matchings/unknown_080500/func_80086AFC.s @@ -440,8 +440,8 @@ glabel func_80086AFC /* 087D8C 8008718C 0C027AAF */ jal func_8009EABC /* 087D90 80087190 34A5FFF3 */ ori $a1, (0x00FFFFF3 & 0xFFFF) # ori $a1, $a1, 0xfff3 /* 087D94 80087194 3C03800E */ lui $v1, %hi(gActiveMagicCodes) # $v1, 0x800e -/* 087D98 80087198 3C05800E */ lui $a1, %hi(D_800DFD9C) # $a1, 0x800e -/* 087D9C 8008719C 24A5FD9C */ addiu $a1, %lo(D_800DFD9C) # addiu $a1, $a1, -0x264 +/* 087D98 80087198 3C05800E */ lui $a1, %hi(gUnlockedMagicCodes) # $a1, 0x800e +/* 087D9C 8008719C 24A5FD9C */ addiu $a1, %lo(gUnlockedMagicCodes) # addiu $a1, $a1, -0x264 /* 087DA0 800871A0 2463FD98 */ addiu $v1, %lo(gActiveMagicCodes) # addiu $v1, $v1, -0x268 /* 087DA4 800871A4 8C780000 */ lw $t8, ($v1) /* 087DA8 800871A8 8CAE0000 */ lw $t6, ($a1) diff --git a/asm/non_matchings/unknown_080500/func_8008A56C.s b/asm/non_matchings/unknown_080500/func_8008A56C.s index c0a679eb..57718a23 100644 --- a/asm/non_matchings/unknown_080500/func_8008A56C.s +++ b/asm/non_matchings/unknown_080500/func_8008A56C.s @@ -52,9 +52,9 @@ glabel func_8008A56C /* 08B234 8008A634 240500A0 */ li $a1, 160 /* 08B238 8008A638 0C031110 */ jal func_800C4440 /* 08B23C 8008A63C 24060020 */ li $a2, 32 -/* 08B240 8008A640 3C03800E */ lui $v1, %hi(D_800DFD9C) # $v1, 0x800e +/* 08B240 8008A640 3C03800E */ lui $v1, %hi(gUnlockedMagicCodes) # $v1, 0x800e /* 08B244 8008A644 3C048012 */ lui $a0, %hi(D_80126C80) # $a0, 0x8012 -/* 08B248 8008A648 8C63FD9C */ lw $v1, %lo(D_800DFD9C)($v1) +/* 08B248 8008A648 8C63FD9C */ lw $v1, %lo(gUnlockedMagicCodes)($v1) /* 08B24C 8008A64C 24846C80 */ addiu $a0, %lo(D_80126C80) # addiu $a0, $a0, 0x6c80 /* 08B250 8008A650 00008025 */ move $s0, $zero /* 08B254 8008A654 24020001 */ li $v0, 1 diff --git a/asm/non_matchings/unknown_080500/func_8008CD74.s b/asm/non_matchings/unknown_080500/func_8008CD74.s index 947b0571..fc1a5283 100644 --- a/asm/non_matchings/unknown_080500/func_8008CD74.s +++ b/asm/non_matchings/unknown_080500/func_8008CD74.s @@ -30,8 +30,8 @@ glabel func_8008CD74 /* 08D9DC 8008CDDC 3C10800E */ lui $s0, %hi(D_800E03CC) # $s0, 0x800e /* 08D9E0 8008CDE0 3C158012 */ lui $s5, %hi(D_80126550) # $s5, 0x8012 /* 08D9E4 8008CDE4 3C13B0E0 */ lui $s3, (0xB0E0C0FF >> 16) # lui $s3, 0xb0e0 -/* 08D9E8 8008CDE8 3C12800E */ lui $s2, %hi(D_800DF494) # $s2, 0x800e -/* 08D9EC 8008CDEC 2652F494 */ addiu $s2, %lo(D_800DF494) # addiu $s2, $s2, -0xb6c +/* 08D9E8 8008CDE8 3C12800E */ lui $s2, %hi(gIsInAdventureTwo) # $s2, 0x800e +/* 08D9EC 8008CDEC 2652F494 */ addiu $s2, %lo(gIsInAdventureTwo) # addiu $s2, $s2, -0xb6c /* 08D9F0 8008CDF0 3673C0FF */ ori $s3, (0xB0E0C0FF & 0xFFFF) # ori $s3, $s3, 0xc0ff /* 08D9F4 8008CDF4 26B56550 */ addiu $s5, %lo(D_80126550) # addiu $s5, $s5, 0x6550 /* 08D9F8 8008CDF8 261003CC */ addiu $s0, %lo(D_800E03CC) # addiu $s0, $s0, 0x3cc @@ -305,10 +305,10 @@ glabel func_8008CD74 /* 08DDE8 8008D1E8 24120001 */ li $s2, 1 .L8008D1EC: /* 08DDEC 8008D1EC 8D4A63E0 */ lw $t2, %lo(D_801263E0)($t2) -/* 08DDF0 8008D1F0 3C0B800E */ lui $t3, %hi(D_800DF4CC) # $t3, 0x800e +/* 08DDF0 8008D1F0 3C0B800E */ lui $t3, %hi(gSaveFileIndex) # $t3, 0x800e /* 08DDF4 8008D1F4 15400006 */ bnez $t2, .L8008D210 /* 08DDF8 8008D1F8 00000000 */ nop -/* 08DDFC 8008D1FC 8D6BF4CC */ lw $t3, %lo(D_800DF4CC)($t3) +/* 08DDFC 8008D1FC 8D6BF4CC */ lw $t3, %lo(gSaveFileIndex)($t3) /* 08DE00 8008D200 00000000 */ nop /* 08DE04 8008D204 166B0002 */ bne $s3, $t3, .L8008D210 /* 08DE08 8008D208 00000000 */ nop @@ -342,10 +342,10 @@ glabel func_8008CD74 .L8008D274: /* 08DE74 8008D274 3C098012 */ lui $t1, %hi(D_80126CC0) # $t1, 0x8012 /* 08DE78 8008D278 8D296CC0 */ lw $t1, %lo(D_80126CC0)($t1) -/* 08DE7C 8008D27C 3C0A800E */ lui $t2, %hi(D_800DF4CC) # $t2, 0x800e +/* 08DE7C 8008D27C 3C0A800E */ lui $t2, %hi(gSaveFileIndex) # $t2, 0x800e /* 08DE80 8008D280 11200004 */ beqz $t1, .L8008D294 /* 08DE84 8008D284 00135880 */ sll $t3, $s3, 2 -/* 08DE88 8008D288 8D4AF4CC */ lw $t2, %lo(D_800DF4CC)($t2) +/* 08DE88 8008D288 8D4AF4CC */ lw $t2, %lo(gSaveFileIndex)($t2) /* 08DE8C 8008D28C 00000000 */ nop /* 08DE90 8008D290 126A0021 */ beq $s3, $t2, .L8008D318 .L8008D294: diff --git a/asm/non_matchings/unknown_080500/func_8008D5F8.s b/asm/non_matchings/unknown_080500/func_8008D5F8.s index 6d1a3347..bcfd2b0c 100644 --- a/asm/non_matchings/unknown_080500/func_8008D5F8.s +++ b/asm/non_matchings/unknown_080500/func_8008D5F8.s @@ -35,9 +35,9 @@ glabel func_8008D5F8 /* 08E278 8008D678 3C098012 */ lui $t1, %hi(D_801263E0) # $t1, 0x8012 /* 08E27C 8008D67C 252963E0 */ addiu $t1, %lo(D_801263E0) # addiu $t1, $t1, 0x63e0 /* 08E280 8008D680 8D220000 */ lw $v0, ($t1) -/* 08E284 8008D684 3C0B800E */ lui $t3, %hi(D_800DF4CC) # $t3, 0x800e +/* 08E284 8008D684 3C0B800E */ lui $t3, %hi(gSaveFileIndex) # $t3, 0x800e /* 08E288 8008D688 10400008 */ beqz $v0, .L8008D6AC -/* 08E28C 8008D68C 256BF4CC */ addiu $t3, %lo(D_800DF4CC) # addiu $t3, $t3, -0xb34 +/* 08E28C 8008D68C 256BF4CC */ addiu $t3, %lo(gSaveFileIndex) # addiu $t3, $t3, -0xb34 /* 08E290 8008D690 240A0001 */ li $t2, 1 /* 08E294 8008D694 104A0021 */ beq $v0, $t2, .L8008D71C /* 08E298 8008D698 240400EF */ li $a0, 239 @@ -54,10 +54,10 @@ glabel func_8008D5F8 /* 08E2C0 8008D6C0 25CE64A0 */ addiu $t6, %lo(D_801264A0) # addiu $t6, $t6, 0x64a0 /* 08E2C4 8008D6C4 01AE1021 */ addu $v0, $t5, $t6 /* 08E2C8 8008D6C8 904F0001 */ lbu $t7, 1($v0) -/* 08E2CC 8008D6CC 3C18800E */ lui $t8, %hi(D_800DF494) # $t8, 0x800e +/* 08E2CC 8008D6CC 3C18800E */ lui $t8, %hi(gIsInAdventureTwo) # $t8, 0x800e /* 08E2D0 8008D6D0 11E0000E */ beqz $t7, .L8008D70C /* 08E2D4 8008D6D4 240400EF */ li $a0, 239 -/* 08E2D8 8008D6D8 8F18F494 */ lw $t8, %lo(D_800DF494)($t8) +/* 08E2D8 8008D6D8 8F18F494 */ lw $t8, %lo(gIsInAdventureTwo)($t8) /* 08E2DC 8008D6DC 90590000 */ lbu $t9, ($v0) /* 08E2E0 8008D6E0 2404015C */ li $a0, 348 /* 08E2E4 8008D6E4 13190008 */ beq $t8, $t9, .L8008D708 @@ -79,8 +79,8 @@ glabel func_8008D5F8 .L8008D71C: /* 08E31C 8008D71C 0C000741 */ jal func_80001D04 /* 08E320 8008D720 00002825 */ move $a1, $zero -/* 08E324 8008D724 3C0B800E */ lui $t3, %hi(D_800DF4CC) # $t3, 0x800e -/* 08E328 8008D728 256BF4CC */ addiu $t3, %lo(D_800DF4CC) # addiu $t3, $t3, -0xb34 +/* 08E324 8008D724 3C0B800E */ lui $t3, %hi(gSaveFileIndex) # $t3, 0x800e +/* 08E328 8008D728 256BF4CC */ addiu $t3, %lo(gSaveFileIndex) # addiu $t3, $t3, -0xb34 /* 08E32C 8008D72C 8D6C0000 */ lw $t4, ($t3) /* 08E330 8008D730 3C018012 */ lui $at, %hi(D_8012648C) # $at, 0x8012 /* 08E334 8008D734 AC2C648C */ sw $t4, %lo(D_8012648C)($at) @@ -95,8 +95,8 @@ glabel func_8008D5F8 .L8008D758: /* 08E358 8008D758 0C000741 */ jal func_80001D04 /* 08E35C 8008D75C 00002825 */ move $a1, $zero -/* 08E360 8008D760 3C0B800E */ lui $t3, %hi(D_800DF4CC) # $t3, 0x800e -/* 08E364 8008D764 256BF4CC */ addiu $t3, %lo(D_800DF4CC) # addiu $t3, $t3, -0xb34 +/* 08E360 8008D760 3C0B800E */ lui $t3, %hi(gSaveFileIndex) # $t3, 0x800e +/* 08E364 8008D764 256BF4CC */ addiu $t3, %lo(gSaveFileIndex) # addiu $t3, $t3, -0xb34 /* 08E368 8008D768 8D6D0000 */ lw $t5, ($t3) /* 08E36C 8008D76C 3C018012 */ lui $at, %hi(D_8012648C) # $at, 0x8012 /* 08E370 8008D770 AC2D648C */ sw $t5, %lo(D_8012648C)($at) @@ -116,9 +116,9 @@ glabel func_8008D5F8 .L8008D7A4: /* 08E3A4 8008D7A4 3C098012 */ lui $t1, %hi(D_801263E0) # $t1, 0x8012 /* 08E3A8 8008D7A8 252963E0 */ addiu $t1, %lo(D_801263E0) # addiu $t1, $t1, 0x63e0 -/* 08E3AC 8008D7AC 3C0B800E */ lui $t3, %hi(D_800DF4CC) # $t3, 0x800e +/* 08E3AC 8008D7AC 3C0B800E */ lui $t3, %hi(gSaveFileIndex) # $t3, 0x800e /* 08E3B0 8008D7B0 8D220000 */ lw $v0, ($t1) -/* 08E3B4 8008D7B4 256BF4CC */ addiu $t3, %lo(D_800DF4CC) # addiu $t3, $t3, -0xb34 +/* 08E3B4 8008D7B4 256BF4CC */ addiu $t3, %lo(gSaveFileIndex) # addiu $t3, $t3, -0xb34 /* 08E3B8 8008D7B8 8D630000 */ lw $v1, ($t3) /* 08E3BC 8008D7BC 00027A00 */ sll $t7, $v0, 8 /* 08E3C0 8008D7C0 240A0001 */ li $t2, 1 diff --git a/asm/non_matchings/unknown_080500/func_8008D8BC.s b/asm/non_matchings/unknown_080500/func_8008D8BC.s index 1f80bca7..96e6ff6a 100644 --- a/asm/non_matchings/unknown_080500/func_8008D8BC.s +++ b/asm/non_matchings/unknown_080500/func_8008D8BC.s @@ -192,7 +192,7 @@ glabel func_8008D8BC /* 08E780 8008DB80 00074880 */ sll $t1, $a3, 2 /* 08E784 8008DB84 01274823 */ subu $t1, $t1, $a3 /* 08E788 8008DB88 00094880 */ sll $t1, $t1, 2 -/* 08E78C 8008DB8C 3C01800E */ lui $at, %hi(D_800DF4CC) # $at, 0x800e +/* 08E78C 8008DB8C 3C01800E */ lui $at, %hi(gSaveFileIndex) # $at, 0x800e /* 08E790 8008DB90 00005012 */ mflo $t2 /* 08E794 8008DB94 010A1021 */ addu $v0, $t0, $t2 /* 08E798 8008DB98 A0400000 */ sb $zero, ($v0) @@ -237,7 +237,7 @@ glabel func_8008D8BC /* 08E82C 8008DC2C 01856821 */ addu $t5, $t4, $a1 .L8008DC30: /* 08E830 8008DC30 A1A00004 */ sb $zero, 4($t5) -/* 08E834 8008DC34 AC27F4CC */ sw $a3, %lo(D_800DF4CC)($at) +/* 08E834 8008DC34 AC27F4CC */ sw $a3, %lo(gSaveFileIndex)($at) /* 08E838 8008DC38 3C018012 */ lui $at, %hi(D_801263E0) # $at, 0x8012 /* 08E83C 8008DC3C AC2063E0 */ sw $zero, %lo(D_801263E0)($at) /* 08E840 8008DC40 3C018012 */ lui $at, %hi(D_80126484) # $at, 0x8012 diff --git a/asm/non_matchings/unknown_080500/func_8008DC7C.s b/asm/non_matchings/unknown_080500/func_8008DC7C.s index b46de24c..ceedd274 100644 --- a/asm/non_matchings/unknown_080500/func_8008DC7C.s +++ b/asm/non_matchings/unknown_080500/func_8008DC7C.s @@ -113,8 +113,8 @@ glabel func_8008DC7C /* 08EA1C 8008DE1C A0490005 */ sb $t1, 5($v0) /* 08EA20 8008DE20 A04A0006 */ sb $t2, 6($v0) /* 08EA24 8008DE24 A0400007 */ sb $zero, 7($v0) -/* 08EA28 8008DE28 3C01800E */ lui $at, %hi(D_800DF4CC) # $at, 0x800e -/* 08EA2C 8008DE2C AC23F4CC */ sw $v1, %lo(D_800DF4CC)($at) +/* 08EA28 8008DE28 3C01800E */ lui $at, %hi(gSaveFileIndex) # $at, 0x800e +/* 08EA2C 8008DE2C AC23F4CC */ sw $v1, %lo(gSaveFileIndex)($at) /* 08EA30 8008DE30 3C018012 */ lui $at, %hi(D_801263E0) # $at, 0x8012 /* 08EA34 8008DE34 AC2063E0 */ sw $zero, %lo(D_801263E0)($at) /* 08EA38 8008DE38 3C018012 */ lui $at, %hi(D_80126488) # $at, 0x8012 diff --git a/asm/non_matchings/unknown_080500/func_80090F30.s b/asm/non_matchings/unknown_080500/func_80090F30.s index b319a0aa..5ae1672e 100644 --- a/asm/non_matchings/unknown_080500/func_80090F30.s +++ b/asm/non_matchings/unknown_080500/func_80090F30.s @@ -1079,8 +1079,8 @@ glabel func_80090F30 /* 092B1C 80091F1C 00000000 */ nop /* 092B20 80091F20 0C01EFC7 */ jal func_8007BF1C /* 092B24 80091F24 00002025 */ move $a0, $zero -/* 092B28 80091F28 3C0A800E */ lui $t2, %hi(D_800DF494) # $t2, 0x800e -/* 092B2C 80091F2C 8D4AF494 */ lw $t2, %lo(D_800DF494)($t2) +/* 092B28 80091F28 3C0A800E */ lui $t2, %hi(gIsInAdventureTwo) # $t2, 0x800e +/* 092B2C 80091F2C 8D4AF494 */ lw $t2, %lo(gIsInAdventureTwo)($t2) /* 092B30 80091F30 2415000B */ li $s5, 11 /* 092B34 80091F34 11400002 */ beqz $t2, .L80091F40 /* 092B38 80091F38 3C014228 */ li $at, 0x42280000 # 42.000000 diff --git a/asm/non_matchings/unknown_080500/func_80092188.s b/asm/non_matchings/unknown_080500/func_80092188.s index b07159b7..58898e7f 100644 --- a/asm/non_matchings/unknown_080500/func_80092188.s +++ b/asm/non_matchings/unknown_080500/func_80092188.s @@ -718,8 +718,8 @@ glabel func_80092188 .L80092BC0: /* 0937C0 80092BC0 3C19800E */ lui $t9, %hi(D_800E0418) # $t9, 0x800e /* 0937C4 80092BC4 8F390418 */ lw $t9, %lo(D_800E0418)($t9) -/* 0937C8 80092BC8 3C01800E */ lui $at, %hi(D_800DF494) # $at, 0x800e -/* 0937CC 80092BCC AC39F494 */ sw $t9, %lo(D_800DF494)($at) +/* 0937C8 80092BC8 3C01800E */ lui $at, %hi(gIsInAdventureTwo) # $at, 0x800e +/* 0937CC 80092BCC AC39F494 */ sw $t9, %lo(gIsInAdventureTwo)($at) /* 0937D0 80092BD0 8FBF001C */ lw $ra, 0x1c($sp) .L80092BD4: /* 0937D4 80092BD4 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/asm/non_matchings/unknown_080500/func_80093A40.s b/asm/non_matchings/unknown_080500/func_80093A40.s index 945f7752..2fb34900 100644 --- a/asm/non_matchings/unknown_080500/func_80093A40.s +++ b/asm/non_matchings/unknown_080500/func_80093A40.s @@ -52,9 +52,9 @@ glabel func_80093A40 /* 0946F8 80093AF8 26316A40 */ addiu $s1, %lo(D_80126A40) # addiu $s1, $s1, 0x6a40 /* 0946FC 80093AFC 24070001 */ li $a3, 1 /* 094700 80093B00 ACA70000 */ sw $a3, ($a1) -/* 094704 80093B04 3C0A800E */ lui $t2, %hi(D_800E0FE8) # $t2, 0x800e +/* 094704 80093B04 3C0A800E */ lui $t2, %hi(gIsInTrophyRace) # $t2, 0x800e /* 094708 80093B08 AE290000 */ sw $t1, ($s1) -/* 09470C 80093B0C 8D4A0FE8 */ lw $t2, %lo(D_800E0FE8)($t2) +/* 09470C 80093B0C 8D4A0FE8 */ lw $t2, %lo(gIsInTrophyRace)($t2) /* 094710 80093B10 8FAB0024 */ lw $t3, 0x24($sp) /* 094714 80093B14 15400073 */ bnez $t2, .L80093CE4 /* 094718 80093B18 00000000 */ nop diff --git a/asm/non_matchings/unknown_080500/func_80093D40.s b/asm/non_matchings/unknown_080500/func_80093D40.s index 66939f85..eb0108e1 100644 --- a/asm/non_matchings/unknown_080500/func_80093D40.s +++ b/asm/non_matchings/unknown_080500/func_80093D40.s @@ -116,8 +116,8 @@ glabel func_80093D40 /* 094AF0 80093EF0 24040007 */ li $a0, 7 /* 094AF4 80093EF4 13200060 */ beqz $t9, .L80094078 /* 094AF8 80093EF8 24058000 */ li $a1, -32768 -/* 094AFC 80093EFC 3C09800E */ lui $t1, %hi(D_800E0FE8) # $t1, 0x800e -/* 094B00 80093F00 8D290FE8 */ lw $t1, %lo(D_800E0FE8)($t1) +/* 094AFC 80093EFC 3C09800E */ lui $t1, %hi(gIsInTrophyRace) # $t1, 0x800e +/* 094B00 80093F00 8D290FE8 */ lw $t1, %lo(gIsInTrophyRace)($t1) /* 094B04 80093F04 24040007 */ li $a0, 7 /* 094B08 80093F08 1120000F */ beqz $t1, .L80093F48 /* 094B0C 80093F0C 24058000 */ li $a1, -32768 diff --git a/asm/non_matchings/unknown_080500/func_80094170.s b/asm/non_matchings/unknown_080500/func_80094170.s index 8376f2ec..2f82f33d 100644 --- a/asm/non_matchings/unknown_080500/func_80094170.s +++ b/asm/non_matchings/unknown_080500/func_80094170.s @@ -111,8 +111,8 @@ glabel func_80094170 /* 094F08 80094308 25080988 */ addiu $t0, %lo(D_800E0988) # addiu $t0, $t0, 0x988 /* 094F0C 8009430C 104C000A */ beq $v0, $t4, .L80094338 /* 094F10 80094310 24C6F47C */ addiu $a2, %lo(D_800DF47C) # addiu $a2, $a2, -0xb84 -/* 094F14 80094314 3C04800E */ lui $a0, %hi(D_800E0FE8) # $a0, 0x800e -/* 094F18 80094318 24840FE8 */ addiu $a0, %lo(D_800E0FE8) # addiu $a0, $a0, 0xfe8 +/* 094F14 80094314 3C04800E */ lui $a0, %hi(gIsInTrophyRace) # $a0, 0x800e +/* 094F18 80094318 24840FE8 */ addiu $a0, %lo(gIsInTrophyRace) # addiu $a0, $a0, 0xfe8 /* 094F1C 8009431C 8C8D0000 */ lw $t5, ($a0) /* 094F20 80094320 00000000 */ nop /* 094F24 80094324 11A00007 */ beqz $t5, .L80094344 @@ -183,8 +183,8 @@ glabel func_80094170 /* 095008 80094408 24020001 */ li $v0, 1 /* 09500C 8009440C 144F0012 */ bne $v0, $t7, .L80094458 /* 095010 80094410 3C078012 */ lui $a3, %hi(D_80126A68) # $a3, 0x8012 -/* 095014 80094414 3C04800E */ lui $a0, %hi(D_800E0FE8) # $a0, 0x800e -/* 095018 80094418 24840FE8 */ addiu $a0, %lo(D_800E0FE8) # addiu $a0, $a0, 0xfe8 +/* 095014 80094414 3C04800E */ lui $a0, %hi(gIsInTrophyRace) # $a0, 0x800e +/* 095018 80094418 24840FE8 */ addiu $a0, %lo(gIsInTrophyRace) # addiu $a0, $a0, 0xfe8 /* 09501C 8009441C 8C980000 */ lw $t8, ($a0) /* 095020 80094420 3C19800E */ lui $t9, %hi(D_800DF4B8) # $t9, 0x800e /* 095024 80094424 1300000A */ beqz $t8, .L80094450 diff --git a/asm/non_matchings/unknown_080500/func_80094688.s b/asm/non_matchings/unknown_080500/func_80094688.s index 044cebc6..098f3e11 100644 --- a/asm/non_matchings/unknown_080500/func_80094688.s +++ b/asm/non_matchings/unknown_080500/func_80094688.s @@ -10,7 +10,7 @@ glabel func_80094688 /* 0952A8 800946A8 8FAE0030 */ lw $t6, 0x30($sp) /* 0952AC 800946AC 3C018012 */ lui $at, %hi(D_80126C28) # $at, 0x8012 /* 0952B0 800946B0 AFA20028 */ sw $v0, 0x28($sp) -/* 0952B4 800946B4 0C027B20 */ jal func_8009EC80 +/* 0952B4 800946B4 0C027B20 */ jal is_in_two_player_adventure /* 0952B8 800946B8 A02E6C28 */ sb $t6, %lo(D_80126C28)($at) /* 0952BC 800946BC 10400003 */ beqz $v0, .L800946CC /* 0952C0 800946C0 00000000 */ nop @@ -23,12 +23,12 @@ glabel func_80094688 /* 0952D8 800946D8 AC206A90 */ sw $zero, %lo(D_80126A90)($at) /* 0952DC 800946DC 24010001 */ li $at, 1 /* 0952E0 800946E0 15E1003F */ bne $t7, $at, .L800947E0 -/* 0952E4 800946E4 3C18800E */ lui $t8, %hi(D_800E0FE8) # $t8, 0x800e -/* 0952E8 800946E8 8F180FE8 */ lw $t8, %lo(D_800E0FE8)($t8) +/* 0952E4 800946E4 3C18800E */ lui $t8, %hi(gIsInTrophyRace) # $t8, 0x800e +/* 0952E8 800946E8 8F180FE8 */ lw $t8, %lo(gIsInTrophyRace)($t8) /* 0952EC 800946EC 00000000 */ nop /* 0952F0 800946F0 1700003C */ bnez $t8, .L800947E4 /* 0952F4 800946F4 240B0007 */ li $t3, 7 -/* 0952F8 800946F8 0C0270B4 */ jal func_8009C2D0 +/* 0952F8 800946F8 0C0270B4 */ jal is_in_tracks_mode /* 0952FC 800946FC 00000000 */ nop /* 095300 80094700 24060001 */ li $a2, 1 /* 095304 80094704 14460011 */ bne $v0, $a2, .L8009474C @@ -176,8 +176,8 @@ glabel func_80094688 /* 095514 80094914 AC286478 */ sw $t0, %lo(D_80126478)($at) /* 095518 80094918 24010001 */ li $at, 1 /* 09551C 8009491C 17210049 */ bne $t9, $at, .L80094A44 -/* 095520 80094920 3C09800E */ lui $t1, %hi(D_800E0FE8) # $t1, 0x800e -/* 095524 80094924 8D290FE8 */ lw $t1, %lo(D_800E0FE8)($t1) +/* 095520 80094920 3C09800E */ lui $t1, %hi(gIsInTrophyRace) # $t1, 0x800e +/* 095524 80094924 8D290FE8 */ lw $t1, %lo(gIsInTrophyRace)($t1) /* 095528 80094928 3C018012 */ lui $at, %hi(D_80126C54) # $at, 0x8012 /* 09552C 8009492C 15200045 */ bnez $t1, .L80094A44 /* 095530 80094930 3C0E800E */ lui $t6, %hi(D_800E0710) # $t6, 0x800e diff --git a/asm/non_matchings/unknown_080500/func_80094A5C.s b/asm/non_matchings/unknown_080500/func_80094A5C.s index 442ef191..90d3e2c5 100644 --- a/asm/non_matchings/unknown_080500/func_80094A5C.s +++ b/asm/non_matchings/unknown_080500/func_80094A5C.s @@ -70,7 +70,7 @@ glabel func_80094A5C /* 09575C 80094B5C 28810008 */ slti $at, $a0, 8 /* 095760 80094B60 1420FFEF */ bnez $at, .L80094B20 /* 095764 80094B64 00001825 */ move $v1, $zero -/* 095768 80094B68 0C027B20 */ jal func_8009EC80 +/* 095768 80094B68 0C027B20 */ jal is_in_two_player_adventure /* 09576C 80094B6C 00000000 */ nop /* 095770 80094B70 10400019 */ beqz $v0, .L80094BD8 /* 095774 80094B74 3C0F800E */ lui $t7, %hi(D_800E0D40) # $t7, 0x800e diff --git a/asm/non_matchings/unknown_080500/func_80094D28.s b/asm/non_matchings/unknown_080500/func_80094D28.s index b5a362cf..789707ad 100644 --- a/asm/non_matchings/unknown_080500/func_80094D28.s +++ b/asm/non_matchings/unknown_080500/func_80094D28.s @@ -240,7 +240,7 @@ glabel func_80094D28 /* 095C98 80095098 AFA3003C */ sw $v1, 0x3c($sp) /* 095C9C 8009509C AFA50040 */ sw $a1, 0x40($sp) /* 095CA0 800950A0 AFA50044 */ sw $a1, 0x44($sp) -/* 095CA4 800950A4 0C027B20 */ jal func_8009EC80 +/* 095CA4 800950A4 0C027B20 */ jal is_in_two_player_adventure /* 095CA8 800950A8 AFA60034 */ sw $a2, 0x34($sp) /* 095CAC 800950AC 8FA3003C */ lw $v1, 0x3c($sp) /* 095CB0 800950B0 8FA40040 */ lw $a0, 0x40($sp) @@ -584,8 +584,8 @@ glabel func_80094D28 /* 096198 80095598 8DEFF4BC */ lw $t7, %lo(D_800DF4BC)($t7) /* 09619C 8009559C 24010001 */ li $at, 1 /* 0961A0 800955A0 15E10019 */ bne $t7, $at, .L80095608 -/* 0961A4 800955A4 3C0B800E */ lui $t3, %hi(D_800E0FE8) # $t3, 0x800e -/* 0961A8 800955A8 8D6B0FE8 */ lw $t3, %lo(D_800E0FE8)($t3) +/* 0961A4 800955A4 3C0B800E */ lui $t3, %hi(gIsInTrophyRace) # $t3, 0x800e +/* 0961A8 800955A8 8D6B0FE8 */ lw $t3, %lo(gIsInTrophyRace)($t3) /* 0961AC 800955AC 00002025 */ move $a0, $zero /* 0961B0 800955B0 15600016 */ bnez $t3, .L8009560C /* 0961B4 800955B4 8FBF002C */ lw $ra, 0x2c($sp) diff --git a/asm/non_matchings/unknown_080500/func_80095728.s b/asm/non_matchings/unknown_080500/func_80095728.s index 435c5360..439cc4cb 100644 --- a/asm/non_matchings/unknown_080500/func_80095728.s +++ b/asm/non_matchings/unknown_080500/func_80095728.s @@ -34,7 +34,7 @@ glabel func_80095728 /* 0963A4 800957A4 AFA00034 */ sw $zero, 0x34($sp) .L800957A8: /* 0963A8 800957A8 8D4AF4BC */ lw $t2, %lo(D_800DF4BC)($t2) -/* 0963AC 800957AC 0C027B20 */ jal func_8009EC80 +/* 0963AC 800957AC 0C027B20 */ jal is_in_two_player_adventure /* 0963B0 800957B0 AFAA0030 */ sw $t2, 0x30($sp) /* 0963B4 800957B4 8FAA0030 */ lw $t2, 0x30($sp) /* 0963B8 800957B8 10400002 */ beqz $v0, .L800957C4 @@ -279,8 +279,8 @@ glabel func_80095728 /* 096738 80095B38 0C0207D3 */ jal func_80081F4C /* 09673C 80095B3C 00000000 */ nop /* 096740 80095B40 104002F4 */ beqz $v0, .L80096714 -/* 096744 80095B44 3C0C800E */ lui $t4, %hi(D_800E0FE8) # $t4, 0x800e -/* 096748 80095B48 8D8C0FE8 */ lw $t4, %lo(D_800E0FE8)($t4) +/* 096744 80095B44 3C0C800E */ lui $t4, %hi(gIsInTrophyRace) # $t4, 0x800e +/* 096748 80095B48 8D8C0FE8 */ lw $t4, %lo(gIsInTrophyRace)($t4) /* 09674C 80095B4C 8FA7002C */ lw $a3, 0x2c($sp) /* 096750 80095B50 1180000A */ beqz $t4, .L80095B7C /* 096754 80095B54 00000000 */ nop @@ -990,7 +990,7 @@ glabel func_80095728 /* 097178 80096578 24040007 */ li $a0, 7 /* 09717C 8009657C 3C028012 */ lui $v0, %hi(D_80126C28) # $v0, 0x8012 /* 097180 80096580 80426C28 */ lb $v0, %lo(D_80126C28)($v0) -/* 097184 80096584 3C0C800E */ lui $t4, %hi(D_800E0FE8) # $t4, 0x800e +/* 097184 80096584 3C0C800E */ lui $t4, %hi(gIsInTrophyRace) # $t4, 0x800e /* 097188 80096588 28410002 */ slti $at, $v0, 2 /* 09718C 8009658C 1420001C */ bnez $at, .L80096600 /* 097190 80096590 24010009 */ li $at, 9 @@ -1024,7 +1024,7 @@ glabel func_80095728 /* 0971F8 800965F8 10000046 */ b .L80096714 /* 0971FC 800965FC AFB90044 */ sw $t9, 0x44($sp) .L80096600: -/* 097200 80096600 8D8C0FE8 */ lw $t4, %lo(D_800E0FE8)($t4) +/* 097200 80096600 8D8C0FE8 */ lw $t4, %lo(gIsInTrophyRace)($t4) /* 097204 80096604 240E000A */ li $t6, 10 /* 097208 80096608 11800003 */ beqz $t4, .L80096618 /* 09720C 8009660C 3C0F800E */ lui $t7, %hi(D_800DF4BC) # $t7, 0x800e diff --git a/asm/non_matchings/unknown_080500/func_80097874.s b/asm/non_matchings/unknown_080500/func_80097874.s deleted file mode 100644 index f54f2b11..00000000 --- a/asm/non_matchings/unknown_080500/func_80097874.s +++ /dev/null @@ -1,43 +0,0 @@ -glabel func_80097874 -/* 098474 80097874 3C01800E */ lui $at, %hi(D_800E0F90) # $at, 0x800e -/* 098478 80097878 AC240F90 */ sw $a0, %lo(D_800E0F90)($at) -/* 09847C 8009787C 3C01800E */ lui $at, %hi(D_800E0F94) # $at, 0x800e -/* 098480 80097880 AC250F94 */ sw $a1, %lo(D_800E0F94)($at) -/* 098484 80097884 3C01800E */ lui $at, %hi(D_800E0F98) # $at, 0x800e -/* 098488 80097888 AC260F98 */ sw $a2, %lo(D_800E0F98)($at) -/* 09848C 8009788C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 098490 80097890 3C01800E */ lui $at, %hi(D_800E0F9C) # $at, 0x800e -/* 098494 80097894 8FAF0028 */ lw $t7, 0x28($sp) -/* 098498 80097898 3C028012 */ lui $v0, %hi(D_80126C6C) # $v0, 0x8012 -/* 09849C 8009789C AC270F9C */ sw $a3, %lo(D_800E0F9C)($at) -/* 0984A0 800978A0 8FB8002C */ lw $t8, 0x2c($sp) -/* 0984A4 800978A4 24426C6C */ addiu $v0, %lo(D_80126C6C) # addiu $v0, $v0, 0x6c6c -/* 0984A8 800978A8 3C018012 */ lui $at, %hi(D_80126C74) # $at, 0x8012 -/* 0984AC 800978AC AC4F0000 */ sw $t7, ($v0) -/* 0984B0 800978B0 8FB90030 */ lw $t9, 0x30($sp) -/* 0984B4 800978B4 AC386C74 */ sw $t8, %lo(D_80126C74)($at) -/* 0984B8 800978B8 3C018012 */ lui $at, %hi(D_80126C78) # $at, 0x8012 -/* 0984BC 800978BC AC396C78 */ sw $t9, %lo(D_80126C78)($at) -/* 0984C0 800978C0 3C01800E */ lui $at, %hi(D_800E0FA0) # $at, 0x800e -/* 0984C4 800978C4 AC200FA0 */ sw $zero, %lo(D_800E0FA0)($at) -/* 0984C8 800978C8 8C480000 */ lw $t0, ($v0) -/* 0984CC 800978CC AFBF0014 */ sw $ra, 0x14($sp) -/* 0984D0 800978D0 AFA40018 */ sw $a0, 0x18($sp) -/* 0984D4 800978D4 8D090000 */ lw $t1, ($t0) -/* 0984D8 800978D8 3C018012 */ lui $at, %hi(D_80126C50) # $at, 0x8012 -/* 0984DC 800978DC 44892000 */ mtc1 $t1, $f4 -/* 0984E0 800978E0 24040002 */ li $a0, 2 -/* 0984E4 800978E4 468021A0 */ cvt.s.w $f6, $f4 -/* 0984E8 800978E8 E4266C50 */ swc1 $f6, %lo(D_80126C50)($at) -/* 0984EC 800978EC 3C018012 */ lui $at, %hi(D_80126C48) # $at, 0x8012 -/* 0984F0 800978F0 AC206C48 */ sw $zero, %lo(D_80126C48)($at) -/* 0984F4 800978F4 3C018012 */ lui $at, %hi(D_80126C3C) # $at, 0x8012 -/* 0984F8 800978F8 AC206C3C */ sw $zero, %lo(D_80126C3C)($at) -/* 0984FC 800978FC 3C018012 */ lui $at, %hi(D_80126C34) # $at, 0x8012 -/* 098500 80097900 0C03105C */ jal func_800C4170 -/* 098504 80097904 AC206C34 */ sw $zero, %lo(D_80126C34)($at) -/* 098508 80097908 8FBF0014 */ lw $ra, 0x14($sp) -/* 09850C 8009790C 27BD0018 */ addiu $sp, $sp, 0x18 -/* 098510 80097910 03E00008 */ jr $ra -/* 098514 80097914 00000000 */ nop - diff --git a/asm/non_matchings/unknown_080500/func_80098208.s b/asm/non_matchings/unknown_080500/func_80098208.s index a40f223d..1d38aba7 100644 --- a/asm/non_matchings/unknown_080500/func_80098208.s +++ b/asm/non_matchings/unknown_080500/func_80098208.s @@ -4,8 +4,8 @@ glabel func_80098208 /* 098E10 80098210 0C01BAA4 */ jal func_8006EA90 /* 098E14 80098214 00000000 */ nop /* 098E18 80098218 904E0048 */ lbu $t6, 0x48($v0) -/* 098E1C 8009821C 3C01800E */ lui $at, %hi(D_800E0FE8) # $at, 0x800e -/* 098E20 80098220 AC2E0FE8 */ sw $t6, %lo(D_800E0FE8)($at) +/* 098E1C 8009821C 3C01800E */ lui $at, %hi(gIsInTrophyRace) # $at, 0x800e +/* 098E20 80098220 AC2E0FE8 */ sw $t6, %lo(gIsInTrophyRace)($at) /* 098E24 80098224 3C01800E */ lui $at, %hi(D_800E0FEC) # $at, 0x800e /* 098E28 80098228 AC200FEC */ sw $zero, %lo(D_800E0FEC)($at) /* 098E2C 8009822C 8C58004C */ lw $t8, 0x4c($v0) diff --git a/asm/non_matchings/unknown_080500/func_800983C0.s b/asm/non_matchings/unknown_080500/func_800983C0.s index c92ca03c..ed2a5256 100644 --- a/asm/non_matchings/unknown_080500/func_800983C0.s +++ b/asm/non_matchings/unknown_080500/func_800983C0.s @@ -8,20 +8,20 @@ glabel func_800983C0 /* 098FD8 800983D8 8DCE0300 */ lw $t6, %lo(osTvType)($t6) /* 098FDC 800983DC AFA20020 */ sw $v0, 0x20($sp) /* 098FE0 800983E0 15C00004 */ bnez $t6, .L800983F4 -/* 098FE4 800983E4 3C04800E */ lui $a0, %hi(D_800E0FE8) # $a0, 0x800e +/* 098FE4 800983E4 3C04800E */ lui $a0, %hi(gIsInTrophyRace) # $a0, 0x800e /* 098FE8 800983E8 240F0012 */ li $t7, 18 /* 098FEC 800983EC 10000002 */ b .L800983F8 /* 098FF0 800983F0 AFAF002C */ sw $t7, 0x2c($sp) .L800983F4: /* 098FF4 800983F4 AFA0002C */ sw $zero, 0x2c($sp) .L800983F8: -/* 098FF8 800983F8 8C840FE8 */ lw $a0, %lo(D_800E0FE8)($a0) +/* 098FF8 800983F8 8C840FE8 */ lw $a0, %lo(gIsInTrophyRace)($a0) /* 098FFC 800983FC 0C01AC75 */ jal func_8006B1D4 /* 099000 80098400 00000000 */ nop /* 099004 80098404 0C01AF77 */ jal func_8006BDDC /* 099008 80098408 00402025 */ move $a0, $v0 -/* 09900C 8009840C 3C18800E */ lui $t8, %hi(D_800E0FE8) # $t8, 0x800e -/* 099010 80098410 8F180FE8 */ lw $t8, %lo(D_800E0FE8)($t8) +/* 09900C 8009840C 3C18800E */ lui $t8, %hi(gIsInTrophyRace) # $t8, 0x800e +/* 099010 80098410 8F180FE8 */ lw $t8, %lo(gIsInTrophyRace)($t8) /* 099014 80098414 3C08800E */ lui $t0, %hi(D_800E0FEC) # $t0, 0x800e /* 099018 80098418 0018C880 */ sll $t9, $t8, 2 /* 09901C 8009841C 8D080FEC */ lw $t0, %lo(D_800E0FEC)($t0) diff --git a/asm/non_matchings/unknown_080500/func_8009C2E0.s b/asm/non_matchings/unknown_080500/func_8009C2E0.s deleted file mode 100644 index 333d8fb8..00000000 --- a/asm/non_matchings/unknown_080500/func_8009C2E0.s +++ /dev/null @@ -1,13 +0,0 @@ -glabel func_8009C2E0 -/* 09CEE0 8009C2E0 3C02800E */ lui $v0, %hi(gActiveMagicCodes) # $v0, 0x800e -/* 09CEE4 8009C2E4 3C03800E */ lui $v1, %hi(D_800DFD9C) # $v1, 0x800e -/* 09CEE8 8009C2E8 2463FD9C */ addiu $v1, %lo(D_800DFD9C) # addiu $v1, $v1, -0x264 -/* 09CEEC 8009C2EC 2442FD98 */ addiu $v0, %lo(gActiveMagicCodes) # addiu $v0, $v0, -0x268 -/* 09CEF0 8009C2F0 8C4E0000 */ lw $t6, ($v0) -/* 09CEF4 8009C2F4 8C780000 */ lw $t8, ($v1) -/* 09CEF8 8009C2F8 01C47825 */ or $t7, $t6, $a0 -/* 09CEFC 8009C2FC 0304C825 */ or $t9, $t8, $a0 -/* 09CF00 8009C300 AC4F0000 */ sw $t7, ($v0) -/* 09CF04 8009C304 03E00008 */ jr $ra -/* 09CF08 8009C308 AC790000 */ sw $t9, ($v1) - diff --git a/asm/non_matchings/unknown_080500/func_8009C30C.s b/asm/non_matchings/unknown_080500/func_8009C30C.s deleted file mode 100644 index 2ee20e5c..00000000 --- a/asm/non_matchings/unknown_080500/func_8009C30C.s +++ /dev/null @@ -1,55 +0,0 @@ -glabel func_8009C30C -/* 09CF0C 8009C30C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 09CF10 8009C310 AFB00018 */ sw $s0, 0x18($sp) -/* 09CF14 8009C314 3C0E800E */ lui $t6, %hi(D_800DF4B8) # $t6, 0x800e -/* 09CF18 8009C318 8DCEF4B8 */ lw $t6, %lo(D_800DF4B8)($t6) -/* 09CF1C 8009C31C 3C10800E */ lui $s0, %hi(gActiveMagicCodes) # $s0, 0x800e -/* 09CF20 8009C320 8E10FD98 */ lw $s0, %lo(gActiveMagicCodes)($s0) -/* 09CF24 8009C324 11C00004 */ beqz $t6, .L8009C338 -/* 09CF28 8009C328 AFBF001C */ sw $ra, 0x1c($sp) -/* 09CF2C 8009C32C 0C003932 */ jal func_8000E4C8 -/* 09CF30 8009C330 00000000 */ nop -/* 09CF34 8009C334 10400004 */ beqz $v0, .L8009C348 -.L8009C338: -/* 09CF38 8009C338 3C011B40 */ lui $at, (0x1B400133 >> 16) # lui $at, 0x1b40 -/* 09CF3C 8009C33C 34210133 */ ori $at, (0x1B400133 & 0xFFFF) # ori $at, $at, 0x133 -/* 09CF40 8009C340 02017824 */ and $t7, $s0, $at -/* 09CF44 8009C344 01E08025 */ move $s0, $t7 -.L8009C348: -/* 09CF48 8009C348 0C01AC90 */ jal func_8006B240 -/* 09CF4C 8009C34C 00000000 */ nop -/* 09CF50 8009C350 14400003 */ bnez $v0, .L8009C360 -/* 09CF54 8009C354 2401FFFB */ li $at, -5 -/* 09CF58 8009C358 0201C024 */ and $t8, $s0, $at -/* 09CF5C 8009C35C 03008025 */ move $s0, $t8 -.L8009C360: -/* 09CF60 8009C360 0C01BAA4 */ jal func_8006EA90 -/* 09CF64 8009C364 00000000 */ nop -/* 09CF68 8009C368 90440049 */ lbu $a0, 0x49($v0) -/* 09CF6C 8009C36C 0C01AC53 */ jal func_8006B14C -/* 09CF70 8009C370 00000000 */ nop -/* 09CF74 8009C374 30590040 */ andi $t9, $v0, 0x40 -/* 09CF78 8009C378 13200005 */ beqz $t9, .L8009C390 -/* 09CF7C 8009C37C 3C09800E */ lui $t1, %hi(D_800DF494) # $t1, 0x800e -/* 09CF80 8009C380 3C01FFF0 */ lui $at, (0xFFF0677F >> 16) # lui $at, 0xfff0 -/* 09CF84 8009C384 3421677F */ ori $at, (0xFFF0677F & 0xFFFF) # ori $at, $at, 0x677f -/* 09CF88 8009C388 02014024 */ and $t0, $s0, $at -/* 09CF8C 8009C38C 01008025 */ move $s0, $t0 -.L8009C390: -/* 09CF90 8009C390 8D29F494 */ lw $t1, %lo(D_800DF494)($t1) -/* 09CF94 8009C394 00000000 */ nop -/* 09CF98 8009C398 11200007 */ beqz $t1, .L8009C3B8 -/* 09CF9C 8009C39C 8FBF001C */ lw $ra, 0x1c($sp) -/* 09CFA0 8009C3A0 0C01AC90 */ jal func_8006B240 -/* 09CFA4 8009C3A4 00000000 */ nop -/* 09CFA8 8009C3A8 10400002 */ beqz $v0, .L8009C3B4 -/* 09CFAC 8009C3AC 360A0004 */ ori $t2, $s0, 4 -/* 09CFB0 8009C3B0 01408025 */ move $s0, $t2 -.L8009C3B4: -/* 09CFB4 8009C3B4 8FBF001C */ lw $ra, 0x1c($sp) -.L8009C3B8: -/* 09CFB8 8009C3B8 02001025 */ move $v0, $s0 -/* 09CFBC 8009C3BC 8FB00018 */ lw $s0, 0x18($sp) -/* 09CFC0 8009C3C0 03E00008 */ jr $ra -/* 09CFC4 8009C3C4 27BD0020 */ addiu $sp, $sp, 0x20 - diff --git a/asm/non_matchings/unknown_080500/func_8009C3D8.s b/asm/non_matchings/unknown_080500/func_8009C3D8.s index c7ef7ca5..fb829ef3 100644 --- a/asm/non_matchings/unknown_080500/func_8009C3D8.s +++ b/asm/non_matchings/unknown_080500/func_8009C3D8.s @@ -3,8 +3,8 @@ glabel func_8009C3D8 /* 09CFDC 8009C3DC AFBF0014 */ sw $ra, 0x14($sp) /* 09CFE0 8009C3E0 0C01AF6C */ jal func_8006BDB0 /* 09CFE4 8009C3E4 00000000 */ nop -/* 09CFE8 8009C3E8 3C0E800E */ lui $t6, %hi(D_800DF4C0) # $t6, 0x800e -/* 09CFEC 8009C3EC 8DCEF4C0 */ lw $t6, %lo(D_800DF4C0)($t6) +/* 09CFE8 8009C3E8 3C0E800E */ lui $t6, %hi(gIsInTwoPlayerAdventure) # $t6, 0x800e +/* 09CFEC 8009C3EC 8DCEF4C0 */ lw $t6, %lo(gIsInTwoPlayerAdventure)($t6) /* 09CFF0 8009C3F0 8FBF0014 */ lw $ra, 0x14($sp) /* 09CFF4 8009C3F4 11C0000D */ beqz $t6, .L8009C42C /* 09CFF8 8009C3F8 3C0F800E */ lui $t7, %hi(D_800DF4B8) # $t7, 0x800e diff --git a/asm/non_matchings/unknown_080500/func_8009D1B8.s b/asm/non_matchings/unknown_080500/func_8009D1B8.s deleted file mode 100644 index deb964a0..00000000 --- a/asm/non_matchings/unknown_080500/func_8009D1B8.s +++ /dev/null @@ -1,48 +0,0 @@ -glabel func_8009D1B8 -/* 09DDB8 8009D1B8 3C0E8012 */ lui $t6, %hi(D_80126504) # $t6, 0x8012 -/* 09DDBC 8009D1BC 3C0F8012 */ lui $t7, %hi(D_801264D8) # $t7, 0x8012 -/* 09DDC0 8009D1C0 81EF64D8 */ lb $t7, %lo(D_801264D8)($t7) -/* 09DDC4 8009D1C4 81CE6504 */ lb $t6, %lo(D_80126504)($t6) -/* 09DDC8 8009D1C8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 09DDCC 8009D1CC AFA40020 */ sw $a0, 0x20($sp) -/* 09DDD0 8009D1D0 AFBF001C */ sw $ra, 0x1c($sp) -/* 09DDD4 8009D1D4 01CF2026 */ xor $a0, $t6, $t7 -/* 09DDD8 8009D1D8 AFA50024 */ sw $a1, 0x24($sp) -/* 09DDDC 8009D1DC AFA60028 */ sw $a2, 0x28($sp) -/* 09DDE0 8009D1E0 0C027446 */ jal func_8009D118 -/* 09DDE4 8009D1E4 2C840001 */ sltiu $a0, $a0, 1 -/* 09DDE8 8009D1E8 3C028012 */ lui $v0, %hi(D_80126504) # $v0, 0x8012 -/* 09DDEC 8009D1EC 24426504 */ addiu $v0, %lo(D_80126504) # addiu $v0, $v0, 0x6504 -/* 09DDF0 8009D1F0 3C198012 */ lui $t9, %hi(D_801264D8) # $t9, 0x8012 -/* 09DDF4 8009D1F4 833964D8 */ lb $t9, %lo(D_801264D8)($t9) -/* 09DDF8 8009D1F8 80580000 */ lb $t8, ($v0) -/* 09DDFC 8009D1FC 24040001 */ li $a0, 1 -/* 09DE00 8009D200 17190004 */ bne $t8, $t9, .L8009D214 -/* 09DE04 8009D204 24058000 */ li $a1, -32768 -/* 09DE08 8009D208 8FA80028 */ lw $t0, 0x28($sp) -/* 09DE0C 8009D20C 3C018012 */ lui $at, %hi(D_80126516) # $at, 0x8012 -/* 09DE10 8009D210 A0286516 */ sb $t0, %lo(D_80126516)($at) -.L8009D214: -/* 09DE14 8009D214 3C068012 */ lui $a2, %hi(D_8012650E) # $a2, 0x8012 -/* 09DE18 8009D218 80C6650E */ lb $a2, %lo(D_8012650E)($a2) -/* 09DE1C 8009D21C 8FA70020 */ lw $a3, 0x20($sp) -/* 09DE20 8009D220 24090001 */ li $t1, 1 -/* 09DE24 8009D224 240A0004 */ li $t2, 4 -/* 09DE28 8009D228 AFAA0014 */ sw $t2, 0x14($sp) -/* 09DE2C 8009D22C 0C03145A */ jal func_800C5168 -/* 09DE30 8009D230 AFA90010 */ sw $t1, 0x10($sp) -/* 09DE34 8009D234 3C028012 */ lui $v0, %hi(D_80126504) # $v0, 0x8012 -/* 09DE38 8009D238 3C038012 */ lui $v1, %hi(D_8012650E) # $v1, 0x8012 -/* 09DE3C 8009D23C 2463650E */ addiu $v1, %lo(D_8012650E) # addiu $v1, $v1, 0x650e -/* 09DE40 8009D240 24426504 */ addiu $v0, %lo(D_80126504) # addiu $v0, $v0, 0x6504 -/* 09DE44 8009D244 806B0000 */ lb $t3, ($v1) -/* 09DE48 8009D248 8FAC0024 */ lw $t4, 0x24($sp) -/* 09DE4C 8009D24C 804E0000 */ lb $t6, ($v0) -/* 09DE50 8009D250 8FBF001C */ lw $ra, 0x1c($sp) -/* 09DE54 8009D254 016C6821 */ addu $t5, $t3, $t4 -/* 09DE58 8009D258 25CF0001 */ addiu $t7, $t6, 1 -/* 09DE5C 8009D25C A06D0000 */ sb $t5, ($v1) -/* 09DE60 8009D260 A04F0000 */ sb $t7, ($v0) -/* 09DE64 8009D264 03E00008 */ jr $ra -/* 09DE68 8009D268 27BD0020 */ addiu $sp, $sp, 0x20 - diff --git a/asm/non_matchings/unknown_080500/func_8009DB3C.s b/asm/non_matchings/unknown_080500/func_8009DB3C.s index f581534b..c563cd2f 100644 --- a/asm/non_matchings/unknown_080500/func_8009DB3C.s +++ b/asm/non_matchings/unknown_080500/func_8009DB3C.s @@ -3,7 +3,7 @@ glabel func_8009DB3C /* 09E740 8009DB40 AFBF001C */ sw $ra, 0x1c($sp) /* 09E744 8009DB44 0C01BAA4 */ jal func_8006EA90 /* 09E748 8009DB48 00000000 */ nop -/* 09E74C 8009DB4C 0C027B20 */ jal func_8009EC80 +/* 09E74C 8009DB4C 0C027B20 */ jal is_in_two_player_adventure /* 09E750 8009DB50 AFA20030 */ sw $v0, 0x30($sp) /* 09E754 8009DB54 10400007 */ beqz $v0, .L8009DB74 /* 09E758 8009DB58 3C038012 */ lui $v1, %hi(D_801264E2) # $v1, 0x8012 @@ -94,7 +94,7 @@ glabel func_8009DB3C /* 09E898 8009DC98 8D44011C */ lw $a0, 0x11c($t2) /* 09E89C 8009DC9C 0C02746E */ jal func_8009D1B8 /* 09E8A0 8009DCA0 24060003 */ li $a2, 3 -/* 09E8A4 8009DCA4 0C027B20 */ jal func_8009EC80 +/* 09E8A4 8009DCA4 0C027B20 */ jal is_in_two_player_adventure /* 09E8A8 8009DCA8 00000000 */ nop /* 09E8AC 8009DCAC 1440001B */ bnez $v0, .L8009DD1C /* 09E8B0 8009DCB0 00000000 */ nop diff --git a/asm/non_matchings/unknown_09F8F0/func_800A01A0.s b/asm/non_matchings/unknown_09F8F0/func_800A01A0.s index 1a859a75..466b590c 100644 --- a/asm/non_matchings/unknown_09F8F0/func_800A01A0.s +++ b/asm/non_matchings/unknown_09F8F0/func_800A01A0.s @@ -598,7 +598,7 @@ glabel func_800A01A0 /* 0A1668 800A0A68 00000000 */ nop /* 0A166C 800A0A6C 17010011 */ bne $t8, $at, .L800A0AB4 /* 0A1670 800A0A70 8FA40028 */ lw $a0, 0x28($sp) -/* 0A1674 800A0A74 0C027B20 */ jal func_8009EC80 +/* 0A1674 800A0A74 0C027B20 */ jal is_in_two_player_adventure /* 0A1678 800A0A78 00000000 */ nop /* 0A167C 800A0A7C 10400007 */ beqz $v0, .L800A0A9C /* 0A1680 800A0A80 8FA40028 */ lw $a0, 0x28($sp) diff --git a/asm/non_matchings/unknown_09F8F0/func_800A26C8.s b/asm/non_matchings/unknown_09F8F0/func_800A26C8.s index a5e000db..c00e3aef 100644 --- a/asm/non_matchings/unknown_09F8F0/func_800A26C8.s +++ b/asm/non_matchings/unknown_09F8F0/func_800A26C8.s @@ -18,7 +18,7 @@ glabel func_800A26C8 /* 0A3308 800A2708 8FA50024 */ lw $a1, 0x24($sp) /* 0A330C 800A270C 0C028E21 */ jal func_800A3884 /* 0A3310 800A2710 00000000 */ nop -/* 0A3314 800A2714 0C027B20 */ jal func_8009EC80 +/* 0A3314 800A2714 0C027B20 */ jal is_in_two_player_adventure /* 0A3318 800A2718 00000000 */ nop /* 0A331C 800A271C 10400011 */ beqz $v0, .L800A2764 /* 0A3320 800A2720 3C078012 */ lui $a3, %hi(D_80126CDC) # $a3, 0x8012 diff --git a/asm/non_matchings/unknown_09F8F0/func_800A5F18.s b/asm/non_matchings/unknown_09F8F0/func_800A5F18.s index e95c74db..197ec134 100644 --- a/asm/non_matchings/unknown_09F8F0/func_800A5F18.s +++ b/asm/non_matchings/unknown_09F8F0/func_800A5F18.s @@ -27,7 +27,7 @@ glabel func_800A5F18 /* 0A6B7C 800A5F7C 304E0040 */ andi $t6, $v0, 0x40 /* 0A6B80 800A5F80 15C000B1 */ bnez $t6, .L800A6248 /* 0A6B84 800A5F84 8FBF001C */ lw $ra, 0x1c($sp) -/* 0A6B88 800A5F88 0C027B20 */ jal func_8009EC80 +/* 0A6B88 800A5F88 0C027B20 */ jal is_in_two_player_adventure /* 0A6B8C 800A5F8C 00000000 */ nop /* 0A6B90 800A5F90 144000AD */ bnez $v0, .L800A6248 /* 0A6B94 800A5F94 8FBF001C */ lw $ra, 0x1c($sp) @@ -39,7 +39,7 @@ glabel func_800A5F18 /* 0A6BAC 800A5FAC 29E10002 */ slti $at, $t7, 2 /* 0A6BB0 800A5FB0 142000A5 */ bnez $at, .L800A6248 /* 0A6BB4 800A5FB4 8FBF001C */ lw $ra, 0x1c($sp) -/* 0A6BB8 800A5FB8 0C027B20 */ jal func_8009EC80 +/* 0A6BB8 800A5FB8 0C027B20 */ jal is_in_two_player_adventure /* 0A6BBC 800A5FBC 00000000 */ nop /* 0A6BC0 800A5FC0 10400005 */ beqz $v0, .L800A5FD8 /* 0A6BC4 800A5FC4 00000000 */ nop diff --git a/asm/non_matchings/unknown_09F8F0/func_800A6254.s b/asm/non_matchings/unknown_09F8F0/func_800A6254.s index 5b74f54c..0d6cf905 100644 --- a/asm/non_matchings/unknown_09F8F0/func_800A6254.s +++ b/asm/non_matchings/unknown_09F8F0/func_800A6254.s @@ -4,7 +4,7 @@ glabel func_800A6254 /* 0A6E5C 800A625C AFA50074 */ sw $a1, 0x74($sp) /* 0A6E60 800A6260 0C01AF66 */ jal func_8006BD98 /* 0A6E64 800A6264 AFA40070 */ sw $a0, 0x70($sp) -/* 0A6E68 800A6268 0C027B20 */ jal func_8009EC80 +/* 0A6E68 800A6268 0C027B20 */ jal is_in_two_player_adventure /* 0A6E6C 800A626C AFA2005C */ sw $v0, 0x5c($sp) /* 0A6E70 800A6270 8FA70070 */ lw $a3, 0x70($sp) /* 0A6E74 800A6274 10400049 */ beqz $v0, .L800A639C @@ -674,7 +674,7 @@ glabel func_800A6254 /* 0A7834 800A6C34 24080001 */ li $t0, 1 /* 0A7838 800A6C38 110B000B */ beq $t0, $t3, .L800A6C68 /* 0A783C 800A6C3C 240C0003 */ li $t4, 3 -/* 0A7840 800A6C40 0C027B20 */ jal func_8009EC80 +/* 0A7840 800A6C40 0C027B20 */ jal is_in_two_player_adventure /* 0A7844 800A6C44 AFA70070 */ sw $a3, 0x70($sp) /* 0A7848 800A6C48 8FA70070 */ lw $a3, 0x70($sp) /* 0A784C 800A6C4C 3C098012 */ lui $t1, %hi(D_80126CDC) # $t1, 0x8012 diff --git a/src/mips1/unknown_080500.c b/src/mips1/unknown_080500.c index 0fa757b1..371f21d9 100644 --- a/src/mips1/unknown_080500.c +++ b/src/mips1/unknown_080500.c @@ -4,6 +4,44 @@ #include "types.h" #include "macros.h" +extern s32 osTvType; + +extern s32 D_800DF458; +extern s32 D_800DF46C; +extern s32 gIsInAdventureTwo; +extern s32 gActiveMagicCodes; +extern s32 gUnlockedMagicCodes; + +typedef struct unk800DF4A0 { + u8 pad0[0x25C]; + s32 unk25C; +} unk800DF4A0; +extern unk800DF4A0* D_800DF4A0; + +extern s32 D_800DF4B8; +extern s32 D_800DF4BC; +extern s32 gIsInTwoPlayerAdventure; +extern s32 gSaveFileIndex; +extern s16 D_800DF7C4[11]; +extern s32 D_800DFA2C; +extern s32 D_800DFDC8; +extern s32 D_800DFFD0; +extern s32 D_800E0398; +extern s32 D_800E0984; +extern s32 D_800E0A24; +extern s32 D_800E0F90; +extern s32 D_800E0F94; +extern s32 D_800E0F98; +extern s32 D_800E0F9C; +extern s32 D_800E0FA0; +extern s32 D_800E0FB4; +extern s32 gIsInTrophyRace; +extern s32 D_800E1024; +extern s32 D_800E1708; +extern s32 D_800E1768; +extern s32 D_800E17D8; + +extern s32 D_801263D8; extern u8 D_80126454; extern u8 D_80126455; extern u8 D_80126456; @@ -28,31 +66,20 @@ extern u8 D_8012646C; extern u8 D_8012646D; extern u8 D_8012646E; extern u8 D_8012646F; - -extern s32 D_800DF458; -extern s32 D_800DF494; -extern s32 gActiveMagicCodes; -extern s32 D_800DF4B8; -extern s32 D_800DF4BC; -extern s32 D_800DF4C0; -extern s32 D_800DF4CC; -extern s16 D_800DF7C4[11]; -extern s32 D_800DFA2C; -extern s32 D_800DFDC8; -extern s32 D_800DFFD0; -extern s32 D_800E0398; -extern s32 D_800E0984; -extern s32 D_800E0A24; -extern s32 D_800E0FB4; -extern s32 D_800E0FE8; -extern s32 D_800E1024; -extern s32 D_800E1708; -extern s32 D_800E1768; -extern s32 D_800E17D8; -extern s32 D_801263D8; +extern s8 D_801264D8; +extern s8 D_80126504; +extern s8 D_8012650E; +extern s8 D_80126516; extern s32 D_80126804; extern s32 D_801269FC; extern s32 D_80126AA0; +extern s32 D_80126C34; +extern s32 D_80126C3C; +extern s32 D_80126C48; +extern f32 D_80126C50; +extern s32 *D_80126C6C; +extern s32 D_80126C74; +extern s32 D_80126C78; GLOBAL_ASM("asm/non_matchings/unknown_080500/func_8007F900.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/func_8007FF88.s") @@ -75,7 +102,26 @@ GLOBAL_ASM("asm/non_matchings/unknown_080500/func_80081E54.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/func_80081F4C.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/DrawMenuText.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/func_800828B8.s") -GLOBAL_ASM("asm/non_matchings/unknown_080500/func_800829F8.s") + +void func_800829F8(s32 arg0, s32 arg1) { + s32 temp; + + D_800DF46C += arg1; + + if (D_800DF46C & 0x10) { + func_8007F900(func_8009EB20()); + func_800C42EC(0); + func_800C4384(0xFF, 0xFF, 0xFF, 0, 0xFF); + func_800C43CC(0, 0, 0, 0); + temp = 0xD0; + if (osTvType == 0) { + temp = 0xEA; + } + func_800C4440(arg0, -0x8000, temp, D_800DF4A0->unk25C, 0xC); + } +} + + GLOBAL_ASM("asm/non_matchings/unknown_080500/MenuLogosScreenInit.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/MenuLogoScreenLoop.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/func_80082FAC.s") @@ -125,7 +171,36 @@ GLOBAL_ASM("asm/non_matchings/unknown_080500/func_800860A8.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/func_800861C8.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/func_800862C4.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/func_800867D4.s") + +#if 1 GLOBAL_ASM("asm/non_matchings/unknown_080500/func_80086A48.s") +#else +extern s32 D_80126A08; +extern s32 D_80126A00; +extern s32 D_801263E0; +extern s32 D_80126BD4; +extern f32 D_80126BDC; +extern f32 D_800E8414; +extern f32 D_80126BEC; +extern s32 D_80126BE4; + +void func_80086A48(s32 arg0) { + f32 temp, temp2, temp3; + temp = D_80126BD4; + temp2 = D_80126BE4; + while (arg0 > 0) { + temp3 = D_800E8414; + if (D_80126A08 > 0) { + D_80126BDC = D_80126BDC + temp3 * (temp - D_80126BDC); + } + if (D_801263E0 > 0 && D_80126A00 > 0) { + D_80126BEC = D_80126BEC + temp3 * (temp2 - D_80126BDC); + } + arg0--; + } +} +#endif + GLOBAL_ASM("asm/non_matchings/unknown_080500/func_80086AFC.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/func_800871D8.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/func_800874D0.s") @@ -274,7 +349,48 @@ GLOBAL_ASM("asm/non_matchings/unknown_080500/func_80090918.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/func_80090ED8.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/func_80090F30.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/func_80092188.s") + +extern s32 D_80126448; +extern s32 D_8012644C; + +#if 1 GLOBAL_ASM("asm/non_matchings/unknown_080500/func_80092BE0.s") +#else +s32 func_80092BE0(s32 arg0) { + s8 *trackIdArray; + s32 index; + s32 temp; + + trackIdArray = (s8*)func_8001E29C(0x1C); + + index = 0; + temp = -1; + if (trackIdArray[0] != -1) { + while(temp < 0) { + if (arg0 == trackIdArray[index]) { + temp = index; + } + index++; + if (trackIdArray[index] == -1) { + break; + } + } + } + + // Does not match! This block has regalloc issues. + if (temp >= 0) { + s32 temp2 = 0x10 << temp; + s32 temp3 = (0x10 << temp) & D_8012644C; + s32 temp4 = ((0x10 << temp) >> 0x1F) & D_80126448; + if (temp4 == 0 && temp3 == 0) { + temp = -1; + } + } + + return temp; +} +#endif + GLOBAL_ASM("asm/non_matchings/unknown_080500/MenuLoadNewAreaInit.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/func_80092E94.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/MenuLoadNewAreaLoop.s") @@ -307,7 +423,40 @@ GLOBAL_ASM("asm/non_matchings/unknown_080500/func_80094C14.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/func_80094D28.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/func_80095624.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/func_80095728.s") + + +#if 1 GLOBAL_ASM("asm/non_matchings/unknown_080500/func_80096790.s") +#else +extern s16 D_800E0710[30]; +extern s32 D_80126BB8; +extern s32 D_80126BBC; + +void func_800981E8(void); + +void func_80096790(void) { + s32 temp; + s8 *temp2; + + temp2 = (s8*)func_8006BDB0(); // temp2 = array of 8 bytes + func_8009C4A8(&D_800E0A24); + temp = *temp2 - 1; // temp is $v1, when it should be $v0! + + if (D_80126BB8) { + func_8009C508(D_800E0710[temp * 3]); + } + D_80126BB8 = 0; + + if (D_80126BBC) { + func_8009C508(D_800E0710[(temp * 3) + 1]); + } + D_80126BBC = 0; + + func_800981E8(); + func_80000968(0); +} +#endif + GLOBAL_ASM("asm/non_matchings/unknown_080500/Menu11Init.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/func_80096978.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/Menu11Loop.s") @@ -320,7 +469,24 @@ void func_800976CC(void) { GLOBAL_ASM("asm/non_matchings/unknown_080500/func_800976F8.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/func_80097744.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/func_800977D0.s") -GLOBAL_ASM("asm/non_matchings/unknown_080500/func_80097874.s") + +void func_80097874(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 *arg4, s32 arg5, s32 arg6) { + D_800E0F90 = arg0; + D_800E0F94 = arg1; + D_800E0F98 = arg2; + D_800E0F9C = arg3; + D_80126C6C = arg4; + D_80126C74 = arg5; + D_80126C78 = arg6; + D_800E0FA0 = 0; + D_80126C50 = (f32) *D_80126C6C; + D_80126C48 = 0; + D_80126C3C = 0; + D_80126C34 = 0; + func_800C4170(2); +} + + GLOBAL_ASM("asm/non_matchings/unknown_080500/func_80097918.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/func_80097D10.s") @@ -347,8 +513,8 @@ void func_80099600(void) { func_800C422C(2); } -s32 func_8009962C(void) { - return D_800E0FE8; +s32 is_in_trophy_race(void) { + return gIsInTrophyRace; } GLOBAL_ASM("asm/non_matchings/unknown_080500/func_8009963C.s") @@ -417,8 +583,8 @@ void func_8009BE5C(void) { GLOBAL_ASM("asm/non_matchings/unknown_080500/func_8009BF20.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/func_8009C154.s") -s32 func_8009C1A0(void) { - return D_800DF4CC; +s32 get_save_file_index(void) { + return gSaveFileIndex; } GLOBAL_ASM("asm/non_matchings/unknown_080500/func_8009C1B0.s") @@ -427,12 +593,39 @@ GLOBAL_ASM("asm/non_matchings/unknown_080500/func_8009C250.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/func_8009C274.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/func_8009C280.s") -s32 func_8009C2D0(void) { +s32 is_in_tracks_mode(void) { return D_800DF4B8; } -GLOBAL_ASM("asm/non_matchings/unknown_080500/func_8009C2E0.s") -GLOBAL_ASM("asm/non_matchings/unknown_080500/func_8009C30C.s") +void set_magic_code_flags(s32 flags) { + gActiveMagicCodes |= flags; + gUnlockedMagicCodes |= flags; +} + +/* Unknown Size */ +typedef struct unknown8006EA90 { + u8 pad[0x49]; + u8 unk49; +} unknown8006EA90; + +unknown8006EA90* func_8006EA90(); + +s32 func_8009C30C(void) { + s32 cheats = gActiveMagicCodes; + if (D_800DF4B8 == 0 || func_8000E4C8() != 0) { + cheats &= 0x1B400133; + } + if (!func_8006B240()) { + cheats &= ~4; // Clears MIRRORED_TRACKS cheat + } + if ((func_8006B14C(func_8006EA90()->unk49) & 0x40) != 0) { + cheats &= ~0xF9880; // Clears START_WITH_10_BANANAS, DISABLE_WEAPONS, DISABLE_BANANAS, and ALL_BALLOONS_ARE_* cheats. + } + if (gIsInAdventureTwo && func_8006B240()) { + cheats |= 4; // Sets MIRRORED_TRACKS cheat + } + return cheats; +} s32 func_8009C3C8(void) { return D_800DF4BC; @@ -453,7 +646,18 @@ GLOBAL_ASM("asm/non_matchings/unknown_080500/func_8009CF68.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/func_8009CFB0.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/func_8009CFEC.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/func_8009D118.s") -GLOBAL_ASM("asm/non_matchings/unknown_080500/func_8009D1B8.s") + +void func_8009D1B8(s32 arg0, s32 arg1, s32 arg2) { + func_8009D118(D_801264D8 == D_80126504); + if (D_801264D8 == D_80126504) { + D_80126516 = (s8) arg2; + } + func_800C5168(1, -0x8000, D_8012650E, arg0, 1, 4); + D_8012650E = (s8) (D_8012650E + arg1); + D_80126504 = (s8) (D_80126504 + 1); +} + + GLOBAL_ASM("asm/non_matchings/unknown_080500/func_8009D26C.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/func_8009D330.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/func_8009D33C.s") @@ -480,15 +684,15 @@ GLOBAL_ASM("asm/non_matchings/unknown_080500/func_8009EB20.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/func_8009EB94.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/func_8009EC60.s") -s32 func_8009EC70(void) { - return D_800DF494; +s32 is_in_adventure_two(void) { + return gIsInAdventureTwo; } -s32 func_8009EC80(void) { - if (func_8009C2D0() != 0) { +s32 is_in_two_player_adventure(void) { + if (is_in_tracks_mode()) { return 0; } - return D_800DF4C0; + return gIsInTwoPlayerAdventure; } s32 is_tt_unlocked(void) { diff --git a/undefined_syms.txt b/undefined_syms.txt index cf924063..a99c7897 100755 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -299,7 +299,7 @@ D_800DF47C = 0x800DF47C; D_800DF480 = 0x800DF480; D_800DF484 = 0x800DF484; D_800DF488 = 0x800DF488; -D_800DF494 = 0x800DF494; +gIsInAdventureTwo = 0x800DF494; D_800DF498 = 0x800DF498; D_800DF49C = 0x800DF49C; D_800DF4A0 = 0x800DF4A0; @@ -310,10 +310,10 @@ D_800DF4B0 = 0x800DF4B0; D_800DF4B4 = 0x800DF4B4; D_800DF4B8 = 0x800DF4B8; D_800DF4BC = 0x800DF4BC; -D_800DF4C0 = 0x800DF4C0; +gIsInTwoPlayerAdventure = 0x800DF4C0; D_800DF4C4 = 0x800DF4C4; D_800DF4C8 = 0x800DF4C8; -D_800DF4CC = 0x800DF4CC; +gSaveFileIndex = 0x800DF4CC; D_800DF4D4 = 0x800DF4D4; D_800DF4D8 = 0x800DF4D8; D_800DF4DC = 0x800DF4DC; @@ -383,7 +383,7 @@ D_800DFCAC = 0x800DFCAC; D_800DFCB4 = 0x800DFCB4; D_800DFD94 = 0x800DFD94; gActiveMagicCodes = 0x800DFD98; -D_800DFD9C = 0x800DFD9C; +gUnlockedMagicCodes = 0x800DFD9C; D_800DFDA0 = 0x800DFDA0; D_800DFDB4 = 0x800DFDB4; D_800DFDC8 = 0x800DFDC8; @@ -512,7 +512,7 @@ D_800E0FB0 = 0x800E0FB0; D_800E0FB4 = 0x800E0FB4; D_800E0FD8 = 0x800E0FD8; D_800E0FE4 = 0x800E0FE4; -D_800E0FE8 = 0x800E0FE8; +gIsInTrophyRace = 0x800E0FE8; D_800E0FEC = 0x800E0FEC; D_800E0FF0 = 0x800E0FF0; D_800E1004 = 0x800E1004;