From 3f31cb6192e919446fb7a4d3b901e423b4aaf6b0 Mon Sep 17 00:00:00 2001 From: David Benepe Date: Mon, 13 Jul 2020 14:42:42 -0500 Subject: [PATCH] Decompiled 10 functions in unknown_080500 --- asm/non_matchings/unknown_00BC20/D_80019808.s | 6 +- .../unknown_00BC20/func_8000C8F8.s | 2 +- .../unknown_00BC20/func_8000CC7C.s | 2 +- .../unknown_00BC20/func_8000E2B4.s | 2 +- .../unknown_00BC20/func_8000EA54.s | 2 +- .../unknown_00BC20/func_80010994.s | 2 +- .../unknown_00BC20/func_8001A8F4.s | 2 +- .../unknown_00BC20/func_8001AE64.s | 2 +- .../unknown_00BC20/func_8001B4FC.s | 2 +- .../unknown_00BC20/func_80022948.s | 2 +- .../unknown_00BC20/func_80022CFC.s | 2 +- .../unknown_00BC20/func_80022E18.s | 2 +- .../unknown_0255E0/func_80028FAC.s | 2 +- .../unknown_032760/func_80034E9C.s | 2 +- .../unknown_032760/func_80038D58.s | 2 +- .../unknown_032760/func_80038F58.s | 2 +- .../unknown_032760/func_8003B368.s | 2 +- .../unknown_032760/func_8003B4BC.s | 2 +- .../unknown_032760/func_8003B988.s | 2 +- .../unknown_032760/func_8003C2E4.s | 2 +- .../unknown_032760/func_8003C7A4.s | 2 +- .../unknown_032760/func_8003DE74.s | 2 +- .../unknown_032760/func_8003DF08.s | 2 +- .../unknown_032760/func_80042210.s | 2 +- .../unknown_043920/func_80042D20.s | 4 +- .../unknown_043920/func_8004F7F4.s | 2 +- .../unknown_05CEF0/func_8005CB68.s | 2 +- .../unknown_066AA0/func_8006A1C4.s | 2 +- .../unknown_066AA0/func_8006B250.s | 6 +- .../unknown_066AA0/func_8006BFC8.s | 4 +- .../unknown_066AA0/func_8006DCF8.s | 8 +- .../unknown_066AA0/func_8006E3BC.s | 4 +- .../unknown_066AA0/func_8006E5BC.s | 4 +- .../unknown_066AA0/func_8006E994.s | 8 +- .../unknown_066AA0/func_8006F29C.s | 4 +- .../unknown_066AA0/func_8006F398.s | 4 +- asm/non_matchings/unknown_080500/Menu11Init.s | 2 +- asm/non_matchings/unknown_080500/Menu17Init.s | 28 --- .../unknown_080500/MenuCreditsInit.s | 2 +- .../unknown_080500/MenuGameSelectLoop.s | 6 +- asm/non_matchings/unknown_080500/MenuInit.s | 4 +- .../unknown_080500/MenuLoadNewAreaInit.s | 2 +- .../unknown_080500/MenuLoadNewAreaLoop.s | 2 +- .../unknown_080500/MenuMagicCodesListInit.s | 37 ---- .../unknown_080500/MenuTrackSelectInit.s | 2 +- .../unknown_080500/MenuTrackSelectLoop.s | 6 +- .../MenuTrophyRaceRankingsInit.s | 6 +- .../MenuTrophyRaceRankingsLoop.s | 10 +- .../unknown_080500/MenuTrophyRaceRoundInit.s | 6 +- .../unknown_080500/MenuTrophyRaceRoundLoop.s | 8 +- .../unknown_080500/func_8007FF88.s | 28 --- .../unknown_080500/func_800828B8.s | 2 +- .../unknown_080500/func_80086AFC.s | 2 +- .../unknown_080500/func_800876CC.s | 30 --- .../unknown_080500/func_8008D8BC.s | 2 +- .../unknown_080500/func_8008E45C.s | 23 -- .../unknown_080500/func_8008FF1C.s | 2 +- .../unknown_080500/func_80090F30.s | 2 +- .../unknown_080500/func_80092188.s | 2 +- .../unknown_080500/func_80092E94.s | 2 +- .../unknown_080500/func_80093A40.s | 6 +- .../unknown_080500/func_80093D40.s | 4 +- .../unknown_080500/func_80094170.s | 8 +- .../unknown_080500/func_80094604.s | 35 --- .../unknown_080500/func_80094688.s | 8 +- .../unknown_080500/func_80094A5C.s | 2 +- .../unknown_080500/func_80094D28.s | 6 +- .../unknown_080500/func_80095728.s | 10 +- .../unknown_080500/func_80096978.s | 2 +- .../unknown_080500/func_80098208.s | 27 --- .../unknown_080500/func_800983C0.s | 8 +- .../unknown_080500/func_80098774.s | 2 +- .../unknown_080500/func_8009C1B0.s | 36 --- .../unknown_080500/func_8009C3D8.s | 31 --- .../unknown_080500/func_8009D118.s | 45 ---- .../unknown_080500/func_8009D360.s | 2 +- .../unknown_080500/func_8009DB3C.s | 2 +- .../unknown_080500/func_8009E3D0.s | 2 +- .../unknown_09F8F0/func_8009ECF0.s | 2 +- .../unknown_09F8F0/func_800A26C8.s | 2 +- .../unknown_09F8F0/func_800A277C.s | 2 +- .../unknown_09F8F0/func_800A4C44.s | 2 +- .../unknown_09F8F0/func_800A6DB4.s | 2 +- .../unknown_09F8F0/func_800A718C.s | 2 +- include/structs.h | 58 ++--- src/mips1/unknown_066AA0.c | 7 +- src/mips1/unknown_080500.c | 206 +++++++++++++++--- undefined_syms.txt | 5 +- 88 files changed, 343 insertions(+), 501 deletions(-) delete mode 100644 asm/non_matchings/unknown_080500/Menu17Init.s delete mode 100644 asm/non_matchings/unknown_080500/MenuMagicCodesListInit.s delete mode 100644 asm/non_matchings/unknown_080500/func_8007FF88.s delete mode 100644 asm/non_matchings/unknown_080500/func_800876CC.s delete mode 100644 asm/non_matchings/unknown_080500/func_8008E45C.s delete mode 100644 asm/non_matchings/unknown_080500/func_80094604.s delete mode 100644 asm/non_matchings/unknown_080500/func_80098208.s delete mode 100644 asm/non_matchings/unknown_080500/func_8009C1B0.s delete mode 100644 asm/non_matchings/unknown_080500/func_8009C3D8.s delete mode 100644 asm/non_matchings/unknown_080500/func_8009D118.s diff --git a/asm/non_matchings/unknown_00BC20/D_80019808.s b/asm/non_matchings/unknown_00BC20/D_80019808.s index eac712d5..9c33a943 100644 --- a/asm/non_matchings/unknown_00BC20/D_80019808.s +++ b/asm/non_matchings/unknown_00BC20/D_80019808.s @@ -10,7 +10,7 @@ glabel D_80019808 /* 01A428 80019828 AFB00018 */ sw $s0, 0x18($sp) /* 01A42C 8001982C 0C01AF6C */ jal func_8006BDB0 /* 01A430 80019830 AFA400A0 */ sw $a0, 0xa0($sp) -/* 01A434 80019834 0C01BAA4 */ jal func_8006EA90 +/* 01A434 80019834 0C01BAA4 */ jal get_settings /* 01A438 80019838 AFA20064 */ sw $v0, 0x64($sp) /* 01A43C 8001983C 8FBF0064 */ lw $ra, 0x64($sp) /* 01A440 80019840 A7A00088 */ sh $zero, 0x88($sp) @@ -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 is_in_trophy_race +/* 01B000 8001A400 0C02658B */ jal get_trophy_race_world_id /* 01B004 8001A404 00000000 */ nop /* 01B008 8001A408 3C098012 */ lui $t1, %hi(D_8011AEE8) # $t1, 0x8012 /* 01B00C 8001A40C 14400007 */ bnez $v0, .L8001A42C @@ -1006,7 +1006,7 @@ glabel D_80019808 /* 01B25C 8001A65C 00000000 */ nop /* 01B260 8001A660 14400006 */ bnez $v0, .L8001A67C /* 01B264 8001A664 00000000 */ nop -/* 01B268 8001A668 0C02658B */ jal is_in_trophy_race +/* 01B268 8001A668 0C02658B */ jal get_trophy_race_world_id /* 01B26C 8001A66C 00000000 */ nop /* 01B270 8001A670 14400002 */ bnez $v0, .L8001A67C /* 01B274 8001A674 00000000 */ nop diff --git a/asm/non_matchings/unknown_00BC20/func_8000C8F8.s b/asm/non_matchings/unknown_00BC20/func_8000C8F8.s index 5ee31496..121331a6 100644 --- a/asm/non_matchings/unknown_00BC20/func_8000C8F8.s +++ b/asm/non_matchings/unknown_00BC20/func_8000C8F8.s @@ -5,7 +5,7 @@ glabel func_8000C8F8 /* 00D504 8000C904 AFB1001C */ sw $s1, 0x1c($sp) /* 00D508 8000C908 AFB00018 */ sw $s0, 0x18($sp) /* 00D50C 8000C90C AFA40058 */ sw $a0, 0x58($sp) -/* 00D510 8000C910 0C01BAA4 */ jal func_8006EA90 +/* 00D510 8000C910 0C01BAA4 */ jal get_settings /* 00D514 8000C914 AFA5005C */ sw $a1, 0x5c($sp) /* 00D518 8000C918 90580049 */ lbu $t8, 0x49($v0) /* 00D51C 8000C91C 8C4F0004 */ lw $t7, 4($v0) diff --git a/asm/non_matchings/unknown_00BC20/func_8000CC7C.s b/asm/non_matchings/unknown_00BC20/func_8000CC7C.s index 1a099b92..1760289c 100644 --- a/asm/non_matchings/unknown_00BC20/func_8000CC7C.s +++ b/asm/non_matchings/unknown_00BC20/func_8000CC7C.s @@ -68,7 +68,7 @@ glabel func_8000CC7C .L8000CD7C: /* 00D97C 8000CD7C 0C01B683 */ jal func_8006DA0C /* 00D980 8000CD80 00000000 */ nop -/* 00D984 8000CD84 0C01BAA4 */ jal func_8006EA90 +/* 00D984 8000CD84 0C01BAA4 */ jal get_settings /* 00D988 8000CD88 AFA20138 */ sw $v0, 0x138($sp) /* 00D98C 8000CD8C 0040B825 */ move $s7, $v0 /* 00D990 8000CD90 0C0078A7 */ jal func_8001E29C diff --git a/asm/non_matchings/unknown_00BC20/func_8000E2B4.s b/asm/non_matchings/unknown_00BC20/func_8000E2B4.s index 3c0c39d3..642f9303 100644 --- a/asm/non_matchings/unknown_00BC20/func_8000E2B4.s +++ b/asm/non_matchings/unknown_00BC20/func_8000E2B4.s @@ -11,7 +11,7 @@ glabel func_8000E2B4 /* 00EED8 8000E2D8 00000000 */ nop /* 00EEDC 8000E2DC 15E00074 */ bnez $t7, .L8000E4B0 /* 00EEE0 8000E2E0 8FBF0014 */ lw $ra, 0x14($sp) -/* 00EEE4 8000E2E4 0C01BAA4 */ jal func_8006EA90 +/* 00EEE4 8000E2E4 0C01BAA4 */ jal get_settings /* 00EEE8 8000E2E8 00000000 */ nop /* 00EEEC 8000E2EC 3C048012 */ lui $a0, %hi(D_8011AD45) # $a0, 0x8012 /* 00EEF0 8000E2F0 8084AD45 */ lb $a0, %lo(D_8011AD45)($a0) diff --git a/asm/non_matchings/unknown_00BC20/func_8000EA54.s b/asm/non_matchings/unknown_00BC20/func_8000EA54.s index 386c32a9..f4c683c1 100644 --- a/asm/non_matchings/unknown_00BC20/func_8000EA54.s +++ b/asm/non_matchings/unknown_00BC20/func_8000EA54.s @@ -6,7 +6,7 @@ glabel func_8000EA54 /* 00F664 8000EA64 AFB10018 */ sw $s1, 0x18($sp) /* 00F668 8000EA68 AFB00014 */ sw $s0, 0x14($sp) /* 00F66C 8000EA6C AFA40068 */ sw $a0, 0x68($sp) -/* 00F670 8000EA70 0C01BAA4 */ jal func_8006EA90 +/* 00F670 8000EA70 0C01BAA4 */ jal get_settings /* 00F674 8000EA74 AFA5006C */ sw $a1, 0x6c($sp) /* 00F678 8000EA78 8FA30068 */ lw $v1, 0x68($sp) /* 00F67C 8000EA7C 00408825 */ move $s1, $v0 diff --git a/asm/non_matchings/unknown_00BC20/func_80010994.s b/asm/non_matchings/unknown_00BC20/func_80010994.s index 333a3bc3..dfe17c28 100644 --- a/asm/non_matchings/unknown_00BC20/func_80010994.s +++ b/asm/non_matchings/unknown_00BC20/func_80010994.s @@ -503,7 +503,7 @@ glabel func_80010994 .L800110C8: /* 011CC8 800110C8 11A00011 */ beqz $t5, .L80011110 /* 011CCC 800110CC 8FBF0034 */ lw $ra, 0x34($sp) -/* 011CD0 800110D0 0C02658B */ jal is_in_trophy_race +/* 011CD0 800110D0 0C02658B */ jal get_trophy_race_world_id /* 011CD4 800110D4 00000000 */ nop /* 011CD8 800110D8 1440000D */ bnez $v0, .L80011110 /* 011CDC 800110DC 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 1e3c1255..dd5b1ec3 100644 --- a/asm/non_matchings/unknown_00BC20/func_8001A8F4.s +++ b/asm/non_matchings/unknown_00BC20/func_8001A8F4.s @@ -324,7 +324,7 @@ glabel func_8001A8F4 .L8001ADAC: /* 01B9AC 8001ADAC 0C01A955 */ jal func_8006A554 /* 01B9B0 8001ADB0 00002025 */ move $a0, $zero -/* 01B9B4 8001ADB4 0C01BAA4 */ jal func_8006EA90 +/* 01B9B4 8001ADB4 0C01BAA4 */ jal get_settings /* 01B9B8 8001ADB8 30508000 */ andi $s0, $v0, 0x8000 /* 01B9BC 8001ADBC 8C590010 */ lw $t9, %lo(D_80120010)($v0) /* 01B9C0 8001ADC0 00408825 */ move $s1, $v0 diff --git a/asm/non_matchings/unknown_00BC20/func_8001AE64.s b/asm/non_matchings/unknown_00BC20/func_8001AE64.s index 007dc038..90553d2b 100644 --- a/asm/non_matchings/unknown_00BC20/func_8001AE64.s +++ b/asm/non_matchings/unknown_00BC20/func_8001AE64.s @@ -3,7 +3,7 @@ glabel func_8001AE64 /* 01BA68 8001AE68 AFBF001C */ sw $ra, 0x1c($sp) /* 01BA6C 8001AE6C 0C01AF6C */ jal func_8006BDB0 /* 01BA70 8001AE70 AFB00018 */ sw $s0, 0x18($sp) -/* 01BA74 8001AE74 0C01BAA4 */ jal func_8006EA90 +/* 01BA74 8001AE74 0C01BAA4 */ jal get_settings /* 01BA78 8001AE78 AFA2002C */ sw $v0, 0x2c($sp) /* 01BA7C 8001AE7C 8FAA002C */ lw $t2, 0x2c($sp) /* 01BA80 8001AE80 A0400114 */ sb $zero, 0x114($v0) diff --git a/asm/non_matchings/unknown_00BC20/func_8001B4FC.s b/asm/non_matchings/unknown_00BC20/func_8001B4FC.s index a2b21361..87a1fc2c 100644 --- a/asm/non_matchings/unknown_00BC20/func_8001B4FC.s +++ b/asm/non_matchings/unknown_00BC20/func_8001B4FC.s @@ -6,7 +6,7 @@ glabel func_8001B4FC /* 01C10C 8001B50C AFB00018 */ sw $s0, 0x18($sp) /* 01C110 8001B510 3C01800E */ lui $at, %hi(D_800DC734) # $at, 0x800e /* 01C114 8001B514 00808025 */ move $s0, $a0 -/* 01C118 8001B518 0C01BAA4 */ jal func_8006EA90 +/* 01C118 8001B518 0C01BAA4 */ jal get_settings /* 01C11C 8001B51C A020C734 */ sb $zero, %lo(D_800DC734)($at) /* 01C120 8001B520 AFA20020 */ sw $v0, 0x20($sp) /* 01C124 8001B524 0C01AC2B */ jal func_8006B0AC diff --git a/asm/non_matchings/unknown_00BC20/func_80022948.s b/asm/non_matchings/unknown_00BC20/func_80022948.s index ca1e9ee9..027663ce 100644 --- a/asm/non_matchings/unknown_00BC20/func_80022948.s +++ b/asm/non_matchings/unknown_00BC20/func_80022948.s @@ -46,7 +46,7 @@ glabel func_80022948 /* 0235F8 800229F8 AE00012C */ sw $zero, 0x12c($s0) /* 0235FC 800229FC AE000130 */ sw $zero, 0x130($s0) /* 023600 80022A00 A60001BA */ sh $zero, 0x1ba($s0) -/* 023604 80022A04 0C01BAA4 */ jal func_8006EA90 +/* 023604 80022A04 0C01BAA4 */ jal get_settings /* 023608 80022A08 AFA2007C */ sw $v0, 0x7c($sp) /* 02360C 80022A0C 24190050 */ li $t9, 80 /* 023610 80022A10 3C018012 */ lui $at, %hi(D_8011ADB0) # $at, 0x8012 diff --git a/asm/non_matchings/unknown_00BC20/func_80022CFC.s b/asm/non_matchings/unknown_00BC20/func_80022CFC.s index 6cea4093..7194005b 100644 --- a/asm/non_matchings/unknown_00BC20/func_80022CFC.s +++ b/asm/non_matchings/unknown_00BC20/func_80022CFC.s @@ -9,7 +9,7 @@ glabel func_80022CFC /* 023918 80022D18 00808025 */ move $s0, $a0 /* 02391C 80022D1C E7B50018 */ swc1 $f21, 0x18($sp) /* 023920 80022D20 E7AC002C */ swc1 $f12, 0x2c($sp) -/* 023924 80022D24 0C01BAA4 */ jal func_8006EA90 +/* 023924 80022D24 0C01BAA4 */ jal get_settings /* 023928 80022D28 E7AE0030 */ swc1 $f14, 0x30($sp) /* 02392C 80022D2C 3C088012 */ lui $t0, %hi(D_8011AE5C) # $t0, 0x8012 /* 023930 80022D30 8D08AE5C */ lw $t0, %lo(D_8011AE5C)($t0) diff --git a/asm/non_matchings/unknown_00BC20/func_80022E18.s b/asm/non_matchings/unknown_00BC20/func_80022E18.s index 49a00063..dbdc6ae5 100644 --- a/asm/non_matchings/unknown_00BC20/func_80022E18.s +++ b/asm/non_matchings/unknown_00BC20/func_80022E18.s @@ -105,7 +105,7 @@ glabel func_80022E18 /* 023BA0 80022FA0 24010001 */ li $at, 1 /* 023BA4 80022FA4 15A1001F */ bne $t5, $at, .L80023024 /* 023BA8 80022FA8 00000000 */ nop -/* 023BAC 80022FAC 0C01BAA4 */ jal func_8006EA90 +/* 023BAC 80022FAC 0C01BAA4 */ jal get_settings /* 023BB0 80022FB0 AFA30024 */ sw $v1, 0x24($sp) /* 023BB4 80022FB4 8FA30024 */ lw $v1, 0x24($sp) /* 023BB8 80022FB8 94580014 */ lhu $t8, 0x14($v0) diff --git a/asm/non_matchings/unknown_0255E0/func_80028FAC.s b/asm/non_matchings/unknown_0255E0/func_80028FAC.s index 404124bb..4f24d3c6 100644 --- a/asm/non_matchings/unknown_0255E0/func_80028FAC.s +++ b/asm/non_matchings/unknown_0255E0/func_80028FAC.s @@ -9,7 +9,7 @@ glabel func_80028FAC /* 029BC8 80028FC8 AFB10024 */ sw $s1, 0x24($sp) /* 029BCC 80028FCC 0C004B0C */ jal func_80012C30 /* 029BD0 80028FD0 AFB00020 */ sw $s0, 0x20($sp) -/* 029BD4 80028FD4 0C01BAA4 */ jal func_8006EA90 +/* 029BD4 80028FD4 0C01BAA4 */ jal get_settings /* 029BD8 80028FD8 00000000 */ nop /* 029BDC 80028FDC 904E0049 */ lbu $t6, 0x49($v0) /* 029BE0 80028FE0 24010024 */ li $at, 36 diff --git a/asm/non_matchings/unknown_032760/func_80034E9C.s b/asm/non_matchings/unknown_032760/func_80034E9C.s index 510f63c6..7ef65e3e 100644 --- a/asm/non_matchings/unknown_032760/func_80034E9C.s +++ b/asm/non_matchings/unknown_032760/func_80034E9C.s @@ -3,7 +3,7 @@ glabel func_80034E9C /* 035AA0 80034EA0 AFBF001C */ sw $ra, 0x1c($sp) /* 035AA4 80034EA4 AFB00018 */ sw $s0, 0x18($sp) /* 035AA8 80034EA8 00808025 */ move $s0, $a0 -/* 035AAC 80034EAC 0C01BAA4 */ jal func_8006EA90 +/* 035AAC 80034EAC 0C01BAA4 */ jal get_settings /* 035AB0 80034EB0 AFA5005C */ sw $a1, 0x5c($sp) /* 035AB4 80034EB4 0C01AF6C */ jal func_8006BDB0 /* 035AB8 80034EB8 AFA20054 */ sw $v0, 0x54($sp) diff --git a/asm/non_matchings/unknown_032760/func_80038D58.s b/asm/non_matchings/unknown_032760/func_80038D58.s index 1d099db9..c481e78b 100644 --- a/asm/non_matchings/unknown_032760/func_80038D58.s +++ b/asm/non_matchings/unknown_032760/func_80038D58.s @@ -14,7 +14,7 @@ glabel func_80038D58 /* 039988 80038D88 8C89004C */ lw $t1, 0x4c($a0) /* 03998C 80038D8C 00000000 */ nop /* 039990 80038D90 A1200012 */ sb $zero, 0x12($t1) -/* 039994 80038D94 0C01BAA4 */ jal func_8006EA90 +/* 039994 80038D94 0C01BAA4 */ jal get_settings /* 039998 80038D98 AFA40018 */ sw $a0, 0x18($sp) /* 03999C 80038D9C 8C4A0010 */ lw $t2, 0x10($v0) /* 0399A0 80038DA0 8FA40018 */ lw $a0, 0x18($sp) diff --git a/asm/non_matchings/unknown_032760/func_80038F58.s b/asm/non_matchings/unknown_032760/func_80038F58.s index 9f460a40..793e3dbc 100644 --- a/asm/non_matchings/unknown_032760/func_80038F58.s +++ b/asm/non_matchings/unknown_032760/func_80038F58.s @@ -16,7 +16,7 @@ glabel func_80038F58 /* 039B90 80038F90 AFA50084 */ sw $a1, 0x84($sp) /* 039B94 80038F94 8C950064 */ lw $s5, 0x64($a0) /* 039B98 80038F98 0080A025 */ move $s4, $a0 -/* 039B9C 80038F9C 0C01BAA4 */ jal func_8006EA90 +/* 039B9C 80038F9C 0C01BAA4 */ jal get_settings /* 039BA0 80038FA0 24100001 */ li $s0, 1 /* 039BA4 80038FA4 82A30014 */ lb $v1, 0x14($s5) /* 039BA8 80038FA8 00000000 */ nop diff --git a/asm/non_matchings/unknown_032760/func_8003B368.s b/asm/non_matchings/unknown_032760/func_8003B368.s index edca63cf..3024ad1c 100644 --- a/asm/non_matchings/unknown_032760/func_8003B368.s +++ b/asm/non_matchings/unknown_032760/func_8003B368.s @@ -70,7 +70,7 @@ glabel func_8003B368 /* 03C068 8003B468 00000000 */ nop /* 03C06C 8003B46C 13000010 */ beqz $t8, .L8003B4B0 /* 03C070 8003B470 8FBF001C */ lw $ra, 0x1c($sp) -/* 03C074 8003B474 0C01BAA4 */ jal func_8006EA90 +/* 03C074 8003B474 0C01BAA4 */ jal get_settings /* 03C078 8003B478 AFA60024 */ sw $a2, 0x24($sp) /* 03C07C 8003B47C 8FA60024 */ lw $a2, 0x24($sp) /* 03C080 8003B480 94590014 */ lhu $t9, 0x14($v0) diff --git a/asm/non_matchings/unknown_032760/func_8003B4BC.s b/asm/non_matchings/unknown_032760/func_8003B4BC.s index 286ac525..43b1ca62 100644 --- a/asm/non_matchings/unknown_032760/func_8003B4BC.s +++ b/asm/non_matchings/unknown_032760/func_8003B4BC.s @@ -26,7 +26,7 @@ glabel func_8003B4BC /* 03C118 8003B518 00008025 */ move $s0, $zero /* 03C11C 8003B51C 24100001 */ li $s0, 1 .L8003B520: -/* 03C120 8003B520 0C01BAA4 */ jal func_8006EA90 +/* 03C120 8003B520 0C01BAA4 */ jal get_settings /* 03C124 8003B524 E7A2002C */ swc1 $f2, 0x2c($sp) /* 03C128 8003B528 904B0049 */ lbu $t3, 0x49($v0) /* 03C12C 8003B52C 8E23003C */ lw $v1, 0x3c($s1) diff --git a/asm/non_matchings/unknown_032760/func_8003B988.s b/asm/non_matchings/unknown_032760/func_8003B988.s index 86301631..12f0c521 100644 --- a/asm/non_matchings/unknown_032760/func_8003B988.s +++ b/asm/non_matchings/unknown_032760/func_8003B988.s @@ -19,7 +19,7 @@ glabel func_8003B988 /* 03C5CC 8003B9CC 46283282 */ mul.d $f10, $f6, $f8 /* 03C5D0 8003B9D0 462050A0 */ cvt.s.d $f2, $f10 .L8003B9D4: -/* 03C5D4 8003B9D4 0C01BAA4 */ jal func_8006EA90 +/* 03C5D4 8003B9D4 0C01BAA4 */ jal get_settings /* 03C5D8 8003B9D8 E7A20030 */ swc1 $f2, 0x30($sp) /* 03C5DC 8003B9DC 904B0049 */ lbu $t3, 0x49($v0) /* 03C5E0 8003B9E0 8C590004 */ lw $t9, 4($v0) diff --git a/asm/non_matchings/unknown_032760/func_8003C2E4.s b/asm/non_matchings/unknown_032760/func_8003C2E4.s index 912054a5..0d9275ca 100644 --- a/asm/non_matchings/unknown_032760/func_8003C2E4.s +++ b/asm/non_matchings/unknown_032760/func_8003C2E4.s @@ -5,7 +5,7 @@ glabel func_8003C2E4 /* 03CEF0 8003C2F0 AFB0001C */ sw $s0, 0x1c($sp) /* 03CEF4 8003C2F4 AFA50034 */ sw $a1, 0x34($sp) /* 03CEF8 8003C2F8 8C900064 */ lw $s0, 0x64($a0) -/* 03CEFC 8003C2FC 0C01BAA4 */ jal func_8006EA90 +/* 03CEFC 8003C2FC 0C01BAA4 */ jal get_settings /* 03CF00 8003C300 00808825 */ move $s1, $a0 /* 03CF04 8003C304 AFA2002C */ sw $v0, 0x2c($sp) /* 03CF08 8003C308 920E000F */ lbu $t6, 0xf($s0) diff --git a/asm/non_matchings/unknown_032760/func_8003C7A4.s b/asm/non_matchings/unknown_032760/func_8003C7A4.s index 9a200dde..76251dc6 100644 --- a/asm/non_matchings/unknown_032760/func_8003C7A4.s +++ b/asm/non_matchings/unknown_032760/func_8003C7A4.s @@ -17,7 +17,7 @@ glabel func_8003C7A4 /* 03D3E0 8003C7E0 AFA5009C */ sw $a1, 0x9c($sp) /* 03D3E4 8003C7E4 8C9E003C */ lw $fp, 0x3c($a0) /* 03D3E8 8003C7E8 8C920064 */ lw $s2, 0x64($a0) -/* 03D3EC 8003C7EC 0C01BAA4 */ jal func_8006EA90 +/* 03D3EC 8003C7EC 0C01BAA4 */ jal get_settings /* 03D3F0 8003C7F0 0080A025 */ move $s4, $a0 /* 03D3F4 8003C7F4 904F0049 */ lbu $t7, 0x49($v0) /* 03D3F8 8003C7F8 8C4E0004 */ lw $t6, 4($v0) diff --git a/asm/non_matchings/unknown_032760/func_8003DE74.s b/asm/non_matchings/unknown_032760/func_8003DE74.s index abff45db..f5babfa7 100644 --- a/asm/non_matchings/unknown_032760/func_8003DE74.s +++ b/asm/non_matchings/unknown_032760/func_8003DE74.s @@ -16,7 +16,7 @@ glabel func_8003DE74 /* 03EAAC 8003DEAC A0AA0008 */ sb $t2, 8($a1) /* 03EAB0 8003DEB0 314B00FF */ andi $t3, $t2, 0xff /* 03EAB4 8003DEB4 AC8B0078 */ sw $t3, 0x78($a0) -/* 03EAB8 8003DEB8 0C01BAA4 */ jal func_8006EA90 +/* 03EAB8 8003DEB8 0C01BAA4 */ jal get_settings /* 03EABC 8003DEBC AFA40020 */ sw $a0, 0x20($sp) /* 03EAC0 8003DEC0 0C0270B4 */ jal is_in_tracks_mode /* 03EAC4 8003DEC4 AFA2001C */ sw $v0, 0x1c($sp) diff --git a/asm/non_matchings/unknown_032760/func_8003DF08.s b/asm/non_matchings/unknown_032760/func_8003DF08.s index 3592de61..6a5d766c 100644 --- a/asm/non_matchings/unknown_032760/func_8003DF08.s +++ b/asm/non_matchings/unknown_032760/func_8003DF08.s @@ -27,7 +27,7 @@ glabel func_8003DF08 /* 03EB6C 8003DF6C 8FAE001C */ lw $t6, 0x1c($sp) /* 03EB70 8003DF70 0C0006F0 */ jal func_80001BC0 /* 03EB74 8003DF74 AFA60018 */ sw $a2, 0x18($sp) -/* 03EB78 8003DF78 0C01BAA4 */ jal func_8006EA90 +/* 03EB78 8003DF78 0C01BAA4 */ jal get_settings /* 03EB7C 8003DF7C 00000000 */ nop /* 03EB80 8003DF80 8FA40018 */ lw $a0, 0x18($sp) /* 03EB84 8003DF84 94480008 */ lhu $t0, 8($v0) diff --git a/asm/non_matchings/unknown_032760/func_80042210.s b/asm/non_matchings/unknown_032760/func_80042210.s index 746da9f0..d33c8ca8 100644 --- a/asm/non_matchings/unknown_032760/func_80042210.s +++ b/asm/non_matchings/unknown_032760/func_80042210.s @@ -38,7 +38,7 @@ glabel func_80042210 /* 042EA0 800422A0 8FA40018 */ lw $a0, 0x18($sp) /* 042EA4 800422A4 14400009 */ bnez $v0, .L800422CC /* 042EA8 800422A8 00000000 */ nop -/* 042EAC 800422AC 0C01BAA4 */ jal func_8006EA90 +/* 042EAC 800422AC 0C01BAA4 */ jal get_settings /* 042EB0 800422B0 AFA40018 */ sw $a0, 0x18($sp) /* 042EB4 800422B4 9448000E */ lhu $t0, 0xe($v0) /* 042EB8 800422B8 8FA40018 */ lw $a0, 0x18($sp) diff --git a/asm/non_matchings/unknown_043920/func_80042D20.s b/asm/non_matchings/unknown_043920/func_80042D20.s index 2f9370de..c39052e8 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 is_in_trophy_race +/* 043DA0 800431A0 0C02658B */ jal get_trophy_race_world_id /* 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 is_in_trophy_race +/* 043E44 80043244 0C02658B */ jal get_trophy_race_world_id /* 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_043920/func_8004F7F4.s b/asm/non_matchings/unknown_043920/func_8004F7F4.s index 637622a1..62008818 100644 --- a/asm/non_matchings/unknown_043920/func_8004F7F4.s +++ b/asm/non_matchings/unknown_043920/func_8004F7F4.s @@ -1032,7 +1032,7 @@ glabel func_8004F7F4 /* 0512FC 800506FC 00000000 */ nop /* 051300 80050700 4500000A */ bc1f .L8005072C /* 051304 80050704 83AC0053 */ lb $t4, 0x53($sp) -/* 051308 80050708 0C01BAA4 */ jal func_8006EA90 +/* 051308 80050708 0C01BAA4 */ jal get_settings /* 05130C 8005070C 00000000 */ nop /* 051310 80050710 904D0049 */ lbu $t5, 0x49($v0) /* 051314 80050714 24010025 */ li $at, 37 diff --git a/asm/non_matchings/unknown_05CEF0/func_8005CB68.s b/asm/non_matchings/unknown_05CEF0/func_8005CB68.s index 3af6942c..c0dcb0d6 100644 --- a/asm/non_matchings/unknown_05CEF0/func_8005CB68.s +++ b/asm/non_matchings/unknown_05CEF0/func_8005CB68.s @@ -5,7 +5,7 @@ glabel func_8005CB68 /* 05D774 8005CB74 AFA40048 */ sw $a0, 0x48($sp) /* 05D778 8005CB78 AFA5004C */ sw $a1, 0x4c($sp) /* 05D77C 8005CB7C 80AF0000 */ lb $t7, ($a1) -/* 05D780 8005CB80 0C01BAA4 */ jal func_8006EA90 +/* 05D780 8005CB80 0C01BAA4 */ jal get_settings /* 05D784 8005CB84 A3AF0043 */ sb $t7, 0x43($sp) /* 05D788 8005CB88 90580048 */ lbu $t8, 0x48($v0) /* 05D78C 8005CB8C 24190001 */ li $t9, 1 diff --git a/asm/non_matchings/unknown_066AA0/func_8006A1C4.s b/asm/non_matchings/unknown_066AA0/func_8006A1C4.s index 31dd8f72..1f9b2ed8 100644 --- a/asm/non_matchings/unknown_066AA0/func_8006A1C4.s +++ b/asm/non_matchings/unknown_066AA0/func_8006A1C4.s @@ -35,7 +35,7 @@ glabel func_8006A1C4 /* 06AE44 8006A244 24841110 */ addiu $a0, %lo(D_80121110) # addiu $a0, $a0, 0x1110 /* 06AE48 8006A248 12400043 */ beqz $s2, .L8006A358 /* 06AE4C 8006A24C 8FA4005C */ lw $a0, 0x5c($sp) -/* 06AE50 8006A250 0C01BAA4 */ jal func_8006EA90 +/* 06AE50 8006A250 0C01BAA4 */ jal get_settings /* 06AE54 8006A254 00000000 */ nop /* 06AE58 8006A258 32430003 */ andi $v1, $s2, 3 /* 06AE5C 8006A25C 10600004 */ beqz $v1, .L8006A270 diff --git a/asm/non_matchings/unknown_066AA0/func_8006B250.s b/asm/non_matchings/unknown_066AA0/func_8006B250.s index dcf50d93..aa58ec1e 100644 --- a/asm/non_matchings/unknown_066AA0/func_8006B250.s +++ b/asm/non_matchings/unknown_066AA0/func_8006B250.s @@ -45,7 +45,7 @@ glabel func_8006B250 /* 06BEE8 8006B2E8 0C000C63 */ jal func_8000318C /* 06BEEC 8006B2EC 24040010 */ li $a0, 16 .L8006B2F0: -/* 06BEF0 8006B2F0 0C01BAA4 */ jal func_8006EA90 +/* 06BEF0 8006B2F0 0C01BAA4 */ jal get_settings /* 06BEF4 8006B2F4 00000000 */ nop /* 06BEF8 8006B2F8 AFA20040 */ sw $v0, 0x40($sp) /* 06BEFC 8006B2FC 0C01DB16 */ jal func_80076C58 @@ -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 is_in_trophy_race +/* 06C344 8006B744 0C02658B */ jal get_trophy_race_world_id /* 06C348 8006B748 00000000 */ nop /* 06C34C 8006B74C 10400009 */ beqz $v0, .L8006B774 /* 06C350 8006B750 00000000 */ nop @@ -633,7 +633,7 @@ glabel func_8006B250 /* 06C764 8006BB64 1601FFF3 */ bne $s0, $at, .L8006BB34 /* 06C768 8006BB68 00000000 */ nop .L8006BB6C: -/* 06C76C 8006BB6C 0C01BAA4 */ jal func_8006EA90 +/* 06C76C 8006BB6C 0C01BAA4 */ jal get_settings /* 06C770 8006BB70 00000000 */ nop /* 06C774 8006BB74 8E2C0000 */ lw $t4, ($s1) /* 06C778 8006BB78 2401FFFF */ li $at, -1 diff --git a/asm/non_matchings/unknown_066AA0/func_8006BFC8.s b/asm/non_matchings/unknown_066AA0/func_8006BFC8.s index dee9730d..e2c6e835 100644 --- a/asm/non_matchings/unknown_066AA0/func_8006BFC8.s +++ b/asm/non_matchings/unknown_066AA0/func_8006BFC8.s @@ -7,7 +7,7 @@ glabel func_8006BFC8 /* 06CBDC 8006BFDC 00008025 */ move $s0, $zero /* 06CBE0 8006BFE0 14400011 */ bnez $v0, .L8006C028 /* 06CBE4 8006BFE4 00000000 */ nop -/* 06CBE8 8006BFE8 0C01BAA4 */ jal func_8006EA90 +/* 06CBE8 8006BFE8 0C01BAA4 */ jal get_settings /* 06CBEC 8006BFEC 00000000 */ nop /* 06CBF0 8006BFF0 904F0049 */ lbu $t7, 0x49($v0) /* 06CBF4 8006BFF4 8C4E0004 */ lw $t6, 4($v0) @@ -27,7 +27,7 @@ glabel func_8006BFC8 .L8006C028: /* 06CC28 8006C028 24100003 */ li $s0, 3 .L8006C02C: -/* 06CC2C 8006C02C 0C02658B */ jal is_in_trophy_race +/* 06CC2C 8006C02C 0C02658B */ jal get_trophy_race_world_id /* 06CC30 8006C030 00000000 */ nop /* 06CC34 8006C034 10400002 */ beqz $v0, .L8006C040 /* 06CC38 8006C038 00000000 */ nop diff --git a/asm/non_matchings/unknown_066AA0/func_8006DCF8.s b/asm/non_matchings/unknown_066AA0/func_8006DCF8.s index 66bf7fd2..50dfdf7e 100644 --- a/asm/non_matchings/unknown_066AA0/func_8006DCF8.s +++ b/asm/non_matchings/unknown_066AA0/func_8006DCF8.s @@ -313,8 +313,8 @@ glabel func_8006DCF8 /* 06EDB0 8006E1B0 00002025 */ move $a0, $zero /* 06EDB4 8006E1B4 0C027094 */ jal func_8009C250 /* 06EDB8 8006E1B8 AD6C0000 */ sw $t4, ($t3) -/* 06EDBC 8006E1BC 3C108012 */ lui $s0, %hi(D_80123510) # $s0, 0x8012 -/* 06EDC0 8006E1C0 26103510 */ addiu $s0, %lo(D_80123510) # addiu $s0, $s0, 0x3510 +/* 06EDBC 8006E1BC 3C108012 */ lui $s0, %hi(gSettingsPtr) # $s0, 0x8012 +/* 06EDC0 8006E1C0 26103510 */ addiu $s0, %lo(gSettingsPtr) # addiu $s0, $s0, 0x3510 /* 06EDC4 8006E1C4 8E0D0000 */ lw $t5, ($s0) /* 06EDC8 8006E1C8 3C088012 */ lui $t0, %hi(D_801234F4) # $t0, 0x8012 /* 06EDCC 8006E1CC 91AE004A */ lbu $t6, 0x4a($t5) @@ -368,8 +368,8 @@ glabel func_8006DCF8 /* 06EE88 8006E288 8FA4002C */ lw $a0, 0x2c($sp) /* 06EE8C 8006E28C 0C01B2B9 */ jal func_8006CAE4 /* 06EE90 8006E290 2405FFFF */ li $a1, -1 -/* 06EE94 8006E294 3C108012 */ lui $s0, %hi(D_80123510) # $s0, 0x8012 -/* 06EE98 8006E298 26103510 */ addiu $s0, %lo(D_80123510) # addiu $s0, $s0, 0x3510 +/* 06EE94 8006E294 3C108012 */ lui $s0, %hi(gSettingsPtr) # $s0, 0x8012 +/* 06EE98 8006E298 26103510 */ addiu $s0, %lo(gSettingsPtr) # addiu $s0, $s0, 0x3510 /* 06EE9C 8006E29C 8E0C0000 */ lw $t4, ($s0) /* 06EEA0 8006E2A0 00000000 */ nop /* 06EEA4 8006E2A4 918D004B */ lbu $t5, 0x4b($t4) diff --git a/asm/non_matchings/unknown_066AA0/func_8006E3BC.s b/asm/non_matchings/unknown_066AA0/func_8006E3BC.s index 8581cc89..6d9709a7 100644 --- a/asm/non_matchings/unknown_066AA0/func_8006E3BC.s +++ b/asm/non_matchings/unknown_066AA0/func_8006E3BC.s @@ -46,8 +46,8 @@ glabel func_8006E3BC /* 06F06C 8006E46C 0C01C327 */ jal func_80070C9C /* 06F070 8006E470 2405FFFF */ li $a1, -1 /* 06F074 8006E474 8FB80020 */ lw $t8, 0x20($sp) -/* 06F078 8006E478 3C048012 */ lui $a0, %hi(D_80123510) # $a0, 0x8012 -/* 06F07C 8006E47C 24843510 */ addiu $a0, %lo(D_80123510) # addiu $a0, $a0, 0x3510 +/* 06F078 8006E478 3C048012 */ lui $a0, %hi(gSettingsPtr) # $a0, 0x8012 +/* 06F07C 8006E47C 24843510 */ addiu $a0, %lo(gSettingsPtr) # addiu $a0, $a0, 0x3510 /* 06F080 8006E480 AC820000 */ sw $v0, ($a0) /* 06F084 8006E484 0302C821 */ addu $t9, $t8, $v0 /* 06F088 8006E488 AC590004 */ sw $t9, 4($v0) diff --git a/asm/non_matchings/unknown_066AA0/func_8006E5BC.s b/asm/non_matchings/unknown_066AA0/func_8006E5BC.s index b3705d63..a987ff0e 100644 --- a/asm/non_matchings/unknown_066AA0/func_8006E5BC.s +++ b/asm/non_matchings/unknown_066AA0/func_8006E5BC.s @@ -9,8 +9,8 @@ glabel func_8006E5BC /* 06F1D8 8006E5D8 AFB1001C */ sw $s1, 0x1c($sp) /* 06F1DC 8006E5DC 0C0270F2 */ jal func_8009C3C8 /* 06F1E0 8006E5E0 AFB00018 */ sw $s0, 0x18($sp) -/* 06F1E4 8006E5E4 3C108012 */ lui $s0, %hi(D_80123510) # $s0, 0x8012 -/* 06F1E8 8006E5E8 26103510 */ addiu $s0, %lo(D_80123510) # addiu $s0, $s0, 0x3510 +/* 06F1E4 8006E5E4 3C108012 */ lui $s0, %hi(gSettingsPtr) # $s0, 0x8012 +/* 06F1E8 8006E5E8 26103510 */ addiu $s0, %lo(gSettingsPtr) # addiu $s0, $s0, 0x3510 /* 06F1EC 8006E5EC 8E0E0000 */ lw $t6, ($s0) /* 06F1F0 8006E5F0 00008825 */ move $s1, $zero /* 06F1F4 8006E5F4 00009825 */ move $s3, $zero diff --git a/asm/non_matchings/unknown_066AA0/func_8006E994.s b/asm/non_matchings/unknown_066AA0/func_8006E994.s index b1c8b67a..1034cdcf 100644 --- a/asm/non_matchings/unknown_066AA0/func_8006E994.s +++ b/asm/non_matchings/unknown_066AA0/func_8006E994.s @@ -54,13 +54,13 @@ glabel func_8006E994 /* 06F654 8006EA54 00000000 */ nop /* 06F658 8006EA58 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 06F65C 8006EA5C 3C048012 */ lui $a0, %hi(D_80123510) # $a0, 0x8012 +/* 06F65C 8006EA5C 3C048012 */ lui $a0, %hi(gSettingsPtr) # $a0, 0x8012 /* 06F660 8006EA60 AFBF0014 */ sw $ra, 0x14($sp) -/* 06F664 8006EA64 8C843510 */ lw $a0, %lo(D_80123510)($a0) +/* 06F664 8006EA64 8C843510 */ lw $a0, %lo(gSettingsPtr)($a0) /* 06F668 8006EA68 0C01B9DC */ jal func_8006E770 /* 06F66C 8006EA6C 24050003 */ li $a1, 3 -/* 06F670 8006EA70 3C048012 */ lui $a0, %hi(D_80123510) # $a0, 0x8012 -/* 06F674 8006EA74 8C843510 */ lw $a0, %lo(D_80123510)($a0) +/* 06F670 8006EA70 3C048012 */ lui $a0, %hi(gSettingsPtr) # $a0, 0x8012 +/* 06F674 8006EA74 8C843510 */ lw $a0, %lo(gSettingsPtr)($a0) /* 06F678 8006EA78 0C01BA65 */ jal func_8006E994 /* 06F67C 8006EA7C 00000000 */ nop /* 06F680 8006EA80 8FBF0014 */ lw $ra, 0x14($sp) diff --git a/asm/non_matchings/unknown_066AA0/func_8006F29C.s b/asm/non_matchings/unknown_066AA0/func_8006F29C.s index 35ae0767..c1e15948 100644 --- a/asm/non_matchings/unknown_066AA0/func_8006F29C.s +++ b/asm/non_matchings/unknown_066AA0/func_8006F29C.s @@ -4,8 +4,8 @@ glabel func_8006F29C /* 06FEA4 8006F2A4 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 06FEA8 8006F2A8 15C0001F */ bnez $t6, .L8006F328 /* 06FEAC 8006F2AC AFBF0014 */ sw $ra, 0x14($sp) -/* 06FEB0 8006F2B0 3C028012 */ lui $v0, %hi(D_80123510) # $v0, 0x8012 -/* 06FEB4 8006F2B4 8C423510 */ lw $v0, %lo(D_80123510)($v0) +/* 06FEB0 8006F2B0 3C028012 */ lui $v0, %hi(gSettingsPtr) # $v0, 0x8012 +/* 06FEB4 8006F2B4 8C423510 */ lw $v0, %lo(gSettingsPtr)($v0) /* 06FEB8 8006F2B8 240100FF */ li $at, 255 /* 06FEBC 8006F2BC 944F000E */ lhu $t7, 0xe($v0) /* 06FEC0 8006F2C0 00000000 */ nop diff --git a/asm/non_matchings/unknown_066AA0/func_8006F398.s b/asm/non_matchings/unknown_066AA0/func_8006F398.s index 6b6ae900..beb2e90d 100644 --- a/asm/non_matchings/unknown_066AA0/func_8006F398.s +++ b/asm/non_matchings/unknown_066AA0/func_8006F398.s @@ -5,8 +5,8 @@ glabel func_8006F398 /* 06FFA4 8006F3A4 00000000 */ nop /* 06FFA8 8006F3A8 0C003865 */ jal func_8000E194 /* 06FFAC 8006F3AC 00000000 */ nop -/* 06FFB0 8006F3B0 3C028012 */ lui $v0, %hi(D_80123510) # $v0, 0x8012 -/* 06FFB4 8006F3B4 8C423510 */ lw $v0, %lo(D_80123510)($v0) +/* 06FFB0 8006F3B0 3C028012 */ lui $v0, %hi(gSettingsPtr) # $v0, 0x8012 +/* 06FFB4 8006F3B4 8C423510 */ lw $v0, %lo(gSettingsPtr)($v0) /* 06FFB8 8006F3B8 00002825 */ move $a1, $zero /* 06FFBC 8006F3BC 24060018 */ li $a2, 24 /* 06FFC0 8006F3C0 24430054 */ addiu $v1, $v0, 0x54 diff --git a/asm/non_matchings/unknown_080500/Menu11Init.s b/asm/non_matchings/unknown_080500/Menu11Init.s index f792c72c..3edd8d30 100644 --- a/asm/non_matchings/unknown_080500/Menu11Init.s +++ b/asm/non_matchings/unknown_080500/Menu11Init.s @@ -1,7 +1,7 @@ glabel Menu11Init /* 097448 80096848 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 09744C 8009684C AFBF0014 */ sw $ra, 0x14($sp) -/* 097450 80096850 0C01BAA4 */ jal func_8006EA90 +/* 097450 80096850 0C01BAA4 */ jal get_settings /* 097454 80096854 00000000 */ nop /* 097458 80096858 3C03800E */ lui $v1, %hi(D_800DF4A0) # $v1, 0x800e /* 09745C 8009685C 8C63F4A0 */ lw $v1, %lo(D_800DF4A0)($v1) diff --git a/asm/non_matchings/unknown_080500/Menu17Init.s b/asm/non_matchings/unknown_080500/Menu17Init.s deleted file mode 100644 index 387d0fc0..00000000 --- a/asm/non_matchings/unknown_080500/Menu17Init.s +++ /dev/null @@ -1,28 +0,0 @@ -glabel Menu17Init -/* 09B898 8009AC98 3C0E8012 */ lui $t6, %hi(D_80126804) # $t6, 0x8012 -/* 09B89C 8009AC9C 8DCE6804 */ lw $t6, %lo(D_80126804)($t6) -/* 09B8A0 8009ACA0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 09B8A4 8009ACA4 11C00006 */ beqz $t6, .L8009ACC0 -/* 09B8A8 8009ACA8 AFBF0014 */ sw $ra, 0x14($sp) -/* 09B8AC 8009ACAC 3C04800E */ lui $a0, %hi(D_800E1768) # $a0, 0x800e -/* 09B8B0 8009ACB0 0C02719D */ jal func_8009C674 -/* 09B8B4 8009ACB4 24841768 */ addiu $a0, %lo(D_800E1768) # addiu $a0, $a0, 0x1768 -/* 09B8B8 8009ACB8 0C025181 */ jal func_80094604 -/* 09B8BC 8009ACBC 00000000 */ nop -.L8009ACC0: -/* 09B8C0 8009ACC0 3C028012 */ lui $v0, %hi(D_801267EC) # $v0, 0x8012 -/* 09B8C4 8009ACC4 8C4267EC */ lw $v0, %lo(D_801267EC)($v0) -/* 09B8C8 8009ACC8 00000000 */ nop -/* 09B8CC 8009ACCC 80440000 */ lb $a0, ($v0) -/* 09B8D0 8009ACD0 80450001 */ lb $a1, 1($v0) -/* 09B8D4 8009ACD4 80460002 */ lb $a2, 2($v0) -/* 09B8D8 8009ACD8 0C01B8BA */ jal func_8006E2E8 -/* 09B8DC 8009ACDC 00000000 */ nop -/* 09B8E0 8009ACE0 3C01800E */ lui $at, %hi(D_800DF47C) # $at, 0x800e -/* 09B8E4 8009ACE4 8FBF0014 */ lw $ra, 0x14($sp) -/* 09B8E8 8009ACE8 AC20F47C */ sw $zero, %lo(D_800DF47C)($at) -/* 09B8EC 8009ACEC 3C018012 */ lui $at, %hi(D_801263E0) # $at, 0x8012 -/* 09B8F0 8009ACF0 AC2063E0 */ sw $zero, %lo(D_801263E0)($at) -/* 09B8F4 8009ACF4 03E00008 */ jr $ra -/* 09B8F8 8009ACF8 27BD0018 */ addiu $sp, $sp, 0x18 - diff --git a/asm/non_matchings/unknown_080500/MenuCreditsInit.s b/asm/non_matchings/unknown_080500/MenuCreditsInit.s index 47a0c1c1..175c046e 100644 --- a/asm/non_matchings/unknown_080500/MenuCreditsInit.s +++ b/asm/non_matchings/unknown_080500/MenuCreditsInit.s @@ -1,7 +1,7 @@ glabel MenuCreditsInit /* 09BB48 8009AF48 27BDFFD0 */ addiu $sp, $sp, -0x30 /* 09BB4C 8009AF4C AFBF001C */ sw $ra, 0x1c($sp) -/* 09BB50 8009AF50 0C01BAA4 */ jal func_8006EA90 +/* 09BB50 8009AF50 0C01BAA4 */ jal get_settings /* 09BB54 8009AF54 00000000 */ nop /* 09BB58 8009AF58 3C01800E */ lui $at, %hi(D_800DF47C) # $at, 0x800e /* 09BB5C 8009AF5C AC20F47C */ sw $zero, %lo(D_800DF47C)($at) diff --git a/asm/non_matchings/unknown_080500/MenuGameSelectLoop.s b/asm/non_matchings/unknown_080500/MenuGameSelectLoop.s index aeed61d6..3f7e0080 100644 --- a/asm/non_matchings/unknown_080500/MenuGameSelectLoop.s +++ b/asm/non_matchings/unknown_080500/MenuGameSelectLoop.s @@ -1,7 +1,7 @@ glabel MenuGameSelectLoop /* 08EA70 8008DE70 27BDFFB8 */ addiu $sp, $sp, -0x48 /* 08EA74 8008DE74 AFBF0024 */ sw $ra, 0x24($sp) -/* 08EA78 8008DE78 0C01BAA4 */ jal func_8006EA90 +/* 08EA78 8008DE78 0C01BAA4 */ jal get_settings /* 08EA7C 8008DE7C AFA40048 */ sw $a0, 0x48($sp) /* 08EA80 8008DE80 8FA40048 */ lw $a0, 0x48($sp) /* 08EA84 8008DE84 0C02305A */ jal func_8008C168 @@ -331,8 +331,8 @@ 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(gIsInTrophyRace) # $at, 0x800e -/* 08EF54 8008E354 AC200FE8 */ sw $zero, %lo(gIsInTrophyRace)($at) +/* 08EF50 8008E350 3C01800E */ lui $at, %hi(gTrophyRaceWorldId) # $at, 0x800e +/* 08EF54 8008E354 AC200FE8 */ sw $zero, %lo(gTrophyRaceWorldId)($at) /* 08EF58 8008E358 904C004B */ lbu $t4, 0x4b($v0) /* 08EF5C 8008E35C 3C0D800E */ lui $t5, %hi(gIsInAdventureTwo) # $t5, 0x800e /* 08EF60 8008E360 11800017 */ beqz $t4, .L8008E3C0 diff --git a/asm/non_matchings/unknown_080500/MenuInit.s b/asm/non_matchings/unknown_080500/MenuInit.s index 2ecec62f..0da8254f 100644 --- a/asm/non_matchings/unknown_080500/MenuInit.s +++ b/asm/non_matchings/unknown_080500/MenuInit.s @@ -56,7 +56,7 @@ glabel MenuInit /* 0820A8 800814A8 00000000 */ nop /* 0820AC 800814AC 10000038 */ b .L80081590 /* 0820B0 800814B0 8FBF0014 */ lw $ra, 0x14($sp) -/* 0820B4 800814B4 0C02293A */ jal MenuMagicCodesListInit +/* 0820B4 800814B4 0C02293A */ jal menu_magic_codes_list_init /* 0820B8 800814B8 00000000 */ nop /* 0820BC 800814BC 10000034 */ b .L80081590 /* 0820C0 800814C0 8FBF0014 */ lw $ra, 0x14($sp) @@ -92,7 +92,7 @@ glabel MenuInit /* 082138 80081538 00000000 */ nop /* 08213C 8008153C 10000014 */ b .L80081590 /* 082140 80081540 8FBF0014 */ lw $ra, 0x14($sp) -/* 082144 80081544 0C026B26 */ jal Menu17Init +/* 082144 80081544 0C026B26 */ jal menu_17_init /* 082148 80081548 00000000 */ nop /* 08214C 8008154C 10000010 */ b .L80081590 /* 082150 80081550 8FBF0014 */ lw $ra, 0x14($sp) diff --git a/asm/non_matchings/unknown_080500/MenuLoadNewAreaInit.s b/asm/non_matchings/unknown_080500/MenuLoadNewAreaInit.s index bc1e3215..71ae7978 100644 --- a/asm/non_matchings/unknown_080500/MenuLoadNewAreaInit.s +++ b/asm/non_matchings/unknown_080500/MenuLoadNewAreaInit.s @@ -1,7 +1,7 @@ glabel MenuLoadNewAreaInit /* 093884 80092C84 27BDFFD8 */ addiu $sp, $sp, -0x28 /* 093888 80092C88 AFBF001C */ sw $ra, 0x1c($sp) -/* 09388C 80092C8C 0C01BAA4 */ jal func_8006EA90 +/* 09388C 80092C8C 0C01BAA4 */ jal get_settings /* 093890 80092C90 AFB00018 */ sw $s0, 0x18($sp) /* 093894 80092C94 3C01800E */ lui $at, %hi(D_800DF4C4) # $at, 0x800e /* 093898 80092C98 AC20F4C4 */ sw $zero, %lo(D_800DF4C4)($at) diff --git a/asm/non_matchings/unknown_080500/MenuLoadNewAreaLoop.s b/asm/non_matchings/unknown_080500/MenuLoadNewAreaLoop.s index ec50c9ce..c78d523c 100644 --- a/asm/non_matchings/unknown_080500/MenuLoadNewAreaLoop.s +++ b/asm/non_matchings/unknown_080500/MenuLoadNewAreaLoop.s @@ -12,7 +12,7 @@ glabel MenuLoadNewAreaLoop /* 094228 80093628 100000F4 */ b .L800939FC /* 09422C 8009362C 01E01025 */ move $v0, $t7 .L80093630: -/* 094230 80093630 0C01BAA4 */ jal func_8006EA90 +/* 094230 80093630 0C01BAA4 */ jal get_settings /* 094234 80093634 00000000 */ nop /* 094238 80093638 3C19800E */ lui $t9, %hi(D_800DF4C4) # $t9, 0x800e /* 09423C 8009363C 8F39F4C4 */ lw $t9, %lo(D_800DF4C4)($t9) diff --git a/asm/non_matchings/unknown_080500/MenuMagicCodesListInit.s b/asm/non_matchings/unknown_080500/MenuMagicCodesListInit.s deleted file mode 100644 index 0f0423ff..00000000 --- a/asm/non_matchings/unknown_080500/MenuMagicCodesListInit.s +++ /dev/null @@ -1,37 +0,0 @@ -glabel MenuMagicCodesListInit -/* 08B0E8 8008A4E8 3C018012 */ lui $at, %hi(D_801263BC) # $at, 0x8012 -/* 08B0EC 8008A4EC AC2063BC */ sw $zero, %lo(D_801263BC)($at) -/* 08B0F0 8008A4F0 3C01800E */ lui $at, %hi(D_800DF47C) # $at, 0x800e -/* 08B0F4 8008A4F4 AC20F47C */ sw $zero, %lo(D_800DF47C)($at) -/* 08B0F8 8008A4F8 3C018012 */ lui $at, %hi(D_801263E0) # $at, 0x8012 -/* 08B0FC 8008A4FC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 08B100 8008A500 AC2063E0 */ sw $zero, %lo(D_801263E0)($at) -/* 08B104 8008A504 AFBF0014 */ sw $ra, 0x14($sp) -/* 08B108 8008A508 3C018012 */ lui $at, %hi(D_80126C46) # $at, 0x8012 -/* 08B10C 8008A50C A4206C46 */ sh $zero, %lo(D_80126C46)($at) -/* 08B110 8008A510 0C03105C */ jal func_800C4170 -/* 08B114 8008A514 24040002 */ li $a0, 2 -/* 08B118 8008A518 0C0271B5 */ jal func_8009C6D4 -/* 08B11C 8008A51C 2404003F */ li $a0, 63 -/* 08B120 8008A520 0C02392C */ jal func_8008E4B0 -/* 08B124 8008A524 00000000 */ nop -/* 08B128 8008A528 3C04800E */ lui $a0, %hi(D_800DF77C) # $a0, 0x800e -/* 08B12C 8008A52C 0C030076 */ jal func_800C01D8 -/* 08B130 8008A530 2484F77C */ addiu $a0, %lo(D_800DF77C) # addiu $a0, $a0, -0x884 -/* 08B134 8008A534 3C0E8000 */ lui $t6, %hi(osTvType) # $t6, 0x8000 -/* 08B138 8008A538 8DCE0300 */ lw $t6, %lo(osTvType)($t6) -/* 08B13C 8008A53C 2418000A */ li $t8, 10 -/* 08B140 8008A540 15C00005 */ bnez $t6, .L8008A558 -/* 08B144 8008A544 3C018012 */ lui $at, 0x8012 -/* 08B148 8008A548 240F000B */ li $t7, 11 -/* 08B14C 8008A54C 3C018012 */ lui $at, %hi(D_80126C70) # $at, 0x8012 -/* 08B150 8008A550 10000002 */ b .L8008A55C -/* 08B154 8008A554 AC2F6C70 */ sw $t7, %lo(D_80126C70)($at) -.L8008A558: -/* 08B158 8008A558 AC386C70 */ sw $t8, %lo(D_80126C70)($at) -.L8008A55C: -/* 08B15C 8008A55C 8FBF0014 */ lw $ra, 0x14($sp) -/* 08B160 8008A560 27BD0018 */ addiu $sp, $sp, 0x18 -/* 08B164 8008A564 03E00008 */ jr $ra -/* 08B168 8008A568 00000000 */ nop - diff --git a/asm/non_matchings/unknown_080500/MenuTrackSelectInit.s b/asm/non_matchings/unknown_080500/MenuTrackSelectInit.s index ef6fd4ff..dc84f12f 100644 --- a/asm/non_matchings/unknown_080500/MenuTrackSelectInit.s +++ b/asm/non_matchings/unknown_080500/MenuTrackSelectInit.s @@ -12,7 +12,7 @@ glabel MenuTrackSelectInit /* 08F3C8 8008E7C8 AFB00020 */ sw $s0, 0x20($sp) /* 08F3CC 8008E7CC 0C03105C */ jal func_800C4170 /* 08F3D0 8008E7D0 24040002 */ li $a0, 2 -/* 08F3D4 8008E7D4 0C01BAA4 */ jal func_8006EA90 +/* 08F3D4 8008E7D4 0C01BAA4 */ jal get_settings /* 08F3D8 8008E7D8 00000000 */ nop /* 08F3DC 8008E7DC 0040A025 */ move $s4, $v0 /* 08F3E0 8008E7E0 27A4007C */ addiu $a0, $sp, 0x7c diff --git a/asm/non_matchings/unknown_080500/MenuTrackSelectLoop.s b/asm/non_matchings/unknown_080500/MenuTrackSelectLoop.s index 5a8781d5..be3564c9 100644 --- a/asm/non_matchings/unknown_080500/MenuTrackSelectLoop.s +++ b/asm/non_matchings/unknown_080500/MenuTrackSelectLoop.s @@ -1,7 +1,7 @@ glabel MenuTrackSelectLoop /* 08FE34 8008F234 27BDFFE0 */ addiu $sp, $sp, -0x20 /* 08FE38 8008F238 AFBF0014 */ sw $ra, 0x14($sp) -/* 08FE3C 8008F23C 0C01BAA4 */ jal func_8006EA90 +/* 08FE3C 8008F23C 0C01BAA4 */ jal get_settings /* 08FE40 8008F240 AFA40020 */ sw $a0, 0x20($sp) /* 08FE44 8008F244 3C038012 */ lui $v1, %hi(D_801263BC) # $v1, 0x8012 /* 08FE48 8008F248 246363BC */ addiu $v1, %lo(D_801263BC) # addiu $v1, $v1, 0x63bc @@ -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(gIsInTrophyRace) # $at, 0x800e +/* 0900F0 8008F4F0 3C01800E */ lui $at, %hi(gTrophyRaceWorldId) # $at, 0x800e /* 0900F4 8008F4F4 252A0001 */ addiu $t2, $t1, 1 -/* 0900F8 8008F4F8 AC2A0FE8 */ sw $t2, %lo(gIsInTrophyRace)($at) +/* 0900F8 8008F4F8 AC2A0FE8 */ sw $t2, %lo(gTrophyRaceWorldId)($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 1723406a..c8cfe689 100644 --- a/asm/non_matchings/unknown_080500/MenuTrophyRaceRankingsInit.s +++ b/asm/non_matchings/unknown_080500/MenuTrophyRaceRankingsInit.s @@ -1,7 +1,7 @@ glabel MenuTrophyRaceRankingsInit /* 099624 80098A24 27BDFF90 */ addiu $sp, $sp, -0x70 /* 099628 80098A28 AFBF001C */ sw $ra, 0x1c($sp) -/* 09962C 80098A2C 0C01BAA4 */ jal func_8006EA90 +/* 09962C 80098A2C 0C01BAA4 */ jal get_settings /* 099630 80098A30 00000000 */ nop /* 099634 80098A34 2404001A */ li $a0, 26 /* 099638 80098A38 0C0078A7 */ jal func_8001E29C @@ -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(gIsInTrophyRace) # $a1, 0x800e +/* 099690 80098A90 3C05800E */ lui $a1, %hi(gTrophyRaceWorldId) # $a1, 0x800e /* 099694 80098A94 8FA7003C */ lw $a3, 0x3c($sp) /* 099698 80098A98 8FA90040 */ lw $t1, 0x40($sp) -/* 09969C 80098A9C 24A50FE8 */ addiu $a1, %lo(gIsInTrophyRace) # addiu $a1, $a1, 0xfe8 +/* 09969C 80098A9C 24A50FE8 */ addiu $a1, %lo(gTrophyRaceWorldId) # 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) diff --git a/asm/non_matchings/unknown_080500/MenuTrophyRaceRankingsLoop.s b/asm/non_matchings/unknown_080500/MenuTrophyRaceRankingsLoop.s index 0e33d156..f538eeb5 100644 --- a/asm/non_matchings/unknown_080500/MenuTrophyRaceRankingsLoop.s +++ b/asm/non_matchings/unknown_080500/MenuTrophyRaceRankingsLoop.s @@ -2,7 +2,7 @@ glabel MenuTrophyRaceRankingsLoop /* 099BD4 80098FD4 27BDFFB0 */ addiu $sp, $sp, -0x50 /* 099BD8 80098FD8 AFBF001C */ sw $ra, 0x1c($sp) /* 099BDC 80098FDC AFA40050 */ sw $a0, 0x50($sp) -/* 099BE0 80098FE0 0C01BAA4 */ jal func_8006EA90 +/* 099BE0 80098FE0 0C01BAA4 */ jal get_settings /* 099BE4 80098FE4 AFA0003C */ sw $zero, 0x3c($sp) /* 099BE8 80098FE8 3C05800E */ lui $a1, %hi(D_800DF47C) # $a1, 0x800e /* 099BEC 80098FEC 24A5F47C */ addiu $a1, %lo(D_800DF47C) # addiu $a1, $a1, -0xb84 @@ -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(gIsInTrophyRace) # $t7, 0x800e -/* 09A19C 8009959C 8DEF0FE8 */ lw $t7, %lo(gIsInTrophyRace)($t7) +/* 09A198 80099598 3C0F800E */ lui $t7, %hi(gTrophyRaceWorldId) # $t7, 0x800e +/* 09A19C 8009959C 8DEF0FE8 */ lw $t7, %lo(gTrophyRaceWorldId)($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(gIsInTrophyRace) # $at, 0x800e -/* 09A1E4 800995E4 AC200FE8 */ sw $zero, %lo(gIsInTrophyRace)($at) +/* 09A1E0 800995E0 3C01800E */ lui $at, %hi(gTrophyRaceWorldId) # $at, 0x800e +/* 09A1E4 800995E4 AC200FE8 */ sw $zero, %lo(gTrophyRaceWorldId)($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 733df15c..cf20bad3 100644 --- a/asm/non_matchings/unknown_080500/MenuTrophyRaceRoundInit.s +++ b/asm/non_matchings/unknown_080500/MenuTrophyRaceRoundInit.s @@ -4,14 +4,14 @@ glabel MenuTrophyRaceRoundInit /* 098E74 80098274 AFB30020 */ sw $s3, 0x20($sp) /* 098E78 80098278 AFB2001C */ sw $s2, 0x1c($sp) /* 098E7C 8009827C AFB10018 */ sw $s1, 0x18($sp) -/* 098E80 80098280 0C01BAA4 */ jal func_8006EA90 +/* 098E80 80098280 0C01BAA4 */ jal get_settings /* 098E84 80098284 AFB00014 */ sw $s0, 0x14($sp) /* 098E88 80098288 00408825 */ move $s1, $v0 /* 098E8C 8009828C 0C0078A7 */ jal func_8001E29C /* 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(gIsInTrophyRace) # $t6, 0x800e +/* 098E9C 8009829C 3C0E800E */ lui $t6, %hi(gTrophyRaceWorldId) # $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(gIsInTrophyRace)($t6) +/* 098EDC 800982DC 8DCE0FE8 */ lw $t6, %lo(gTrophyRaceWorldId)($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 ba598fd6..9bc72153 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(gIsInTrophyRace) # $t9, 0x800e -/* 0991D8 800985D8 8F390FE8 */ lw $t9, %lo(gIsInTrophyRace)($t9) +/* 0991D4 800985D4 3C19800E */ lui $t9, %hi(gTrophyRaceWorldId) # $t9, 0x800e +/* 0991D8 800985D8 8F390FE8 */ lw $t9, %lo(gTrophyRaceWorldId)($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(gIsInTrophyRace) # $t3, 0x800e -/* 0992F4 800986F4 8D6B0FE8 */ lw $t3, %lo(gIsInTrophyRace)($t3) +/* 0992F0 800986F0 3C0B800E */ lui $t3, %hi(gTrophyRaceWorldId) # $t3, 0x800e +/* 0992F4 800986F4 8D6B0FE8 */ lw $t3, %lo(gTrophyRaceWorldId)($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_8007FF88.s b/asm/non_matchings/unknown_080500/func_8007FF88.s deleted file mode 100644 index eda32029..00000000 --- a/asm/non_matchings/unknown_080500/func_8007FF88.s +++ /dev/null @@ -1,28 +0,0 @@ -glabel func_8007FF88 -/* 080B88 8007FF88 3C02800E */ lui $v0, %hi(D_800E1DAC) # $v0, 0x800e -/* 080B8C 8007FF8C 24421DAC */ addiu $v0, %lo(D_800E1DAC) # addiu $v0, $v0, 0x1dac -/* 080B90 8007FF90 8C440000 */ lw $a0, ($v0) -/* 080B94 8007FF94 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 080B98 8007FF98 10800006 */ beqz $a0, .L8007FFB4 -/* 080B9C 8007FF9C AFBF0014 */ sw $ra, 0x14($sp) -/* 080BA0 8007FFA0 0C01C450 */ jal func_80071140 -/* 080BA4 8007FFA4 00000000 */ nop -/* 080BA8 8007FFA8 3C02800E */ lui $v0, %hi(D_800E1DAC) # $v0, 0x800e -/* 080BAC 8007FFAC 24421DAC */ addiu $v0, %lo(D_800E1DAC) # addiu $v0, $v0, 0x1dac -/* 080BB0 8007FFB0 AC400000 */ sw $zero, ($v0) -.L8007FFB4: -/* 080BB4 8007FFB4 AC400004 */ sw $zero, 4($v0) -/* 080BB8 8007FFB8 3C018012 */ lui $at, %hi(D_80126C2C) # $at, 0x8012 -/* 080BBC 8007FFBC 3C03800E */ lui $v1, %hi(D_800E1DA4) # $v1, 0x800e -/* 080BC0 8007FFC0 AC206C2C */ sw $zero, %lo(D_80126C2C)($at) -/* 080BC4 8007FFC4 24631DA4 */ addiu $v1, %lo(D_800E1DA4) # addiu $v1, $v1, 0x1da4 -/* 080BC8 8007FFC8 AC600000 */ sw $zero, ($v1) -/* 080BCC 8007FFCC AC600004 */ sw $zero, 4($v1) -/* 080BD0 8007FFD0 3C01800E */ lui $at, %hi(D_800E1DB8) # $at, 0x800e -/* 080BD4 8007FFD4 8FBF0014 */ lw $ra, 0x14($sp) -/* 080BD8 8007FFD8 AC201DB8 */ sw $zero, %lo(D_800E1DB8)($at) -/* 080BDC 8007FFDC 3C01800E */ lui $at, %hi(D_800E1DBC) # $at, 0x800e -/* 080BE0 8007FFE0 AC201DBC */ sw $zero, %lo(D_800E1DBC)($at) -/* 080BE4 8007FFE4 03E00008 */ jr $ra -/* 080BE8 8007FFE8 27BD0018 */ addiu $sp, $sp, 0x18 - diff --git a/asm/non_matchings/unknown_080500/func_800828B8.s b/asm/non_matchings/unknown_080500/func_800828B8.s index 060c2125..b8e43404 100644 --- a/asm/non_matchings/unknown_080500/func_800828B8.s +++ b/asm/non_matchings/unknown_080500/func_800828B8.s @@ -1,7 +1,7 @@ glabel func_800828B8 /* 0834B8 800828B8 27BDFFD0 */ addiu $sp, $sp, -0x30 /* 0834BC 800828BC AFBF0014 */ sw $ra, 0x14($sp) -/* 0834C0 800828C0 0C01BAA4 */ jal func_8006EA90 +/* 0834C0 800828C0 0C01BAA4 */ jal get_settings /* 0834C4 800828C4 00000000 */ nop /* 0834C8 800828C8 27A40024 */ addiu $a0, $sp, 0x24 /* 0834CC 800828CC 27A50028 */ addiu $a1, $sp, 0x28 diff --git a/asm/non_matchings/unknown_080500/func_80086AFC.s b/asm/non_matchings/unknown_080500/func_80086AFC.s index aee747ec..9d937664 100644 --- a/asm/non_matchings/unknown_080500/func_80086AFC.s +++ b/asm/non_matchings/unknown_080500/func_80086AFC.s @@ -1,7 +1,7 @@ glabel func_80086AFC /* 0876FC 80086AFC 27BDFFC0 */ addiu $sp, $sp, -0x40 /* 087700 80086B00 AFBF0014 */ sw $ra, 0x14($sp) -/* 087704 80086B04 0C01BAA4 */ jal func_8006EA90 +/* 087704 80086B04 0C01BAA4 */ jal get_settings /* 087708 80086B08 00000000 */ nop /* 08770C 80086B0C 3C0F8012 */ lui $t7, %hi(D_80126BD4) # $t7, 0x8012 /* 087710 80086B10 8DEF6BD4 */ lw $t7, %lo(D_80126BD4)($t7) diff --git a/asm/non_matchings/unknown_080500/func_800876CC.s b/asm/non_matchings/unknown_080500/func_800876CC.s deleted file mode 100644 index 516f4b8b..00000000 --- a/asm/non_matchings/unknown_080500/func_800876CC.s +++ /dev/null @@ -1,30 +0,0 @@ -glabel func_800876CC -/* 0882CC 800876CC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 0882D0 800876D0 308E4000 */ andi $t6, $a0, 0x4000 -/* 0882D4 800876D4 AFBF0014 */ sw $ra, 0x14($sp) -/* 0882D8 800876D8 11C00008 */ beqz $t6, .L800876FC -/* 0882DC 800876DC AFA5001C */ sw $a1, 0x1c($sp) -/* 0882E0 800876E0 24040241 */ li $a0, 577 -/* 0882E4 800876E4 0C000741 */ jal func_80001D04 -/* 0882E8 800876E8 00002825 */ move $a1, $zero -/* 0882EC 800876EC 240F0005 */ li $t7, 5 -/* 0882F0 800876F0 3C018012 */ lui $at, %hi(D_801263E0) # $at, 0x8012 -/* 0882F4 800876F4 1000000B */ b .L80087724 -/* 0882F8 800876F8 AC2F63E0 */ sw $t7, %lo(D_801263E0)($at) -.L800876FC: -/* 0882FC 800876FC 30989000 */ andi $t8, $a0, 0x9000 -/* 088300 80087700 13000008 */ beqz $t8, .L80087724 -/* 088304 80087704 240400EF */ li $a0, 239 -/* 088308 80087708 0C000741 */ jal func_80001D04 -/* 08830C 8008770C 00002825 */ move $a1, $zero -/* 088310 80087710 24190007 */ li $t9, 7 -/* 088314 80087714 3C018012 */ lui $at, %hi(D_801263E0) # $at, 0x8012 -/* 088318 80087718 AC3963E0 */ sw $t9, %lo(D_801263E0)($at) -/* 08831C 8008771C 3C018012 */ lui $at, %hi(D_801263D8) # $at, 0x8012 -/* 088320 80087720 AC2063D8 */ sw $zero, %lo(D_801263D8)($at) -.L80087724: -/* 088324 80087724 8FBF0014 */ lw $ra, 0x14($sp) -/* 088328 80087728 27BD0018 */ addiu $sp, $sp, 0x18 -/* 08832C 8008772C 03E00008 */ jr $ra -/* 088330 80087730 00001025 */ move $v0, $zero - diff --git a/asm/non_matchings/unknown_080500/func_8008D8BC.s b/asm/non_matchings/unknown_080500/func_8008D8BC.s index 96e6ff6a..6a05d6c5 100644 --- a/asm/non_matchings/unknown_080500/func_8008D8BC.s +++ b/asm/non_matchings/unknown_080500/func_8008D8BC.s @@ -1,7 +1,7 @@ glabel func_8008D8BC /* 08E4BC 8008D8BC 27BDFFD0 */ addiu $sp, $sp, -0x30 /* 08E4C0 8008D8C0 AFBF0014 */ sw $ra, 0x14($sp) -/* 08E4C4 8008D8C4 0C01BAA4 */ jal func_8006EA90 +/* 08E4C4 8008D8C4 0C01BAA4 */ jal get_settings /* 08E4C8 8008D8C8 AFA40030 */ sw $a0, 0x30($sp) /* 08E4CC 8008D8CC AFA2001C */ sw $v0, 0x1c($sp) /* 08E4D0 8008D8D0 0C01A955 */ jal func_8006A554 diff --git a/asm/non_matchings/unknown_080500/func_8008E45C.s b/asm/non_matchings/unknown_080500/func_8008E45C.s deleted file mode 100644 index f480146a..00000000 --- a/asm/non_matchings/unknown_080500/func_8008E45C.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel func_8008E45C -/* 08F05C 8008E45C 3C038012 */ lui $v1, %hi(D_80126550) # $v1, 0x8012 -/* 08F060 8008E460 24636550 */ addiu $v1, %lo(D_80126550) # addiu $v1, $v1, 0x6550 -/* 08F064 8008E464 8C6E0060 */ lw $t6, 0x60($v1) -/* 08F068 8008E468 8C6F0064 */ lw $t7, 0x64($v1) -/* 08F06C 8008E46C 8C780068 */ lw $t8, 0x68($v1) -/* 08F070 8008E470 8C79006C */ lw $t9, 0x6c($v1) -/* 08F074 8008E474 8C680070 */ lw $t0, 0x70($v1) -/* 08F078 8008E478 8C690074 */ lw $t1, 0x74($v1) -/* 08F07C 8008E47C 3C02800E */ lui $v0, %hi(D_800E045C) # $v0, 0x800e -/* 08F080 8008E480 3C04800E */ lui $a0, %hi(D_800E0474) # $a0, 0x800e -/* 08F084 8008E484 3C05800E */ lui $a1, %hi(D_800E048C) # $a1, 0x800e -/* 08F088 8008E488 24A5048C */ addiu $a1, %lo(D_800E048C) # addiu $a1, $a1, 0x48c -/* 08F08C 8008E48C 24840474 */ addiu $a0, %lo(D_800E0474) # addiu $a0, $a0, 0x474 -/* 08F090 8008E490 2442045C */ addiu $v0, %lo(D_800E045C) # addiu $v0, $v0, 0x45c -/* 08F094 8008E494 AC4E0000 */ sw $t6, ($v0) -/* 08F098 8008E498 AC4F0008 */ sw $t7, 8($v0) -/* 08F09C 8008E49C AC980000 */ sw $t8, ($a0) -/* 08F0A0 8008E4A0 AC990008 */ sw $t9, 8($a0) -/* 08F0A4 8008E4A4 ACA80000 */ sw $t0, ($a1) -/* 08F0A8 8008E4A8 03E00008 */ jr $ra -/* 08F0AC 8008E4AC ACA90008 */ sw $t1, 8($a1) - diff --git a/asm/non_matchings/unknown_080500/func_8008FF1C.s b/asm/non_matchings/unknown_080500/func_8008FF1C.s index 11f73554..74beb728 100644 --- a/asm/non_matchings/unknown_080500/func_8008FF1C.s +++ b/asm/non_matchings/unknown_080500/func_8008FF1C.s @@ -10,7 +10,7 @@ glabel func_8008FF1C /* 090B3C 8008FF3C AFB20038 */ sw $s2, 0x38($sp) /* 090B40 8008FF40 AFB10034 */ sw $s1, 0x34($sp) /* 090B44 8008FF44 AFB00030 */ sw $s0, 0x30($sp) -/* 090B48 8008FF48 0C01BAA4 */ jal func_8006EA90 +/* 090B48 8008FF48 0C01BAA4 */ jal get_settings /* 090B4C 8008FF4C AFA40080 */ sw $a0, 0x80($sp) /* 090B50 8008FF50 AFA20058 */ sw $v0, 0x58($sp) /* 090B54 8008FF54 0C0078A7 */ jal func_8001E29C diff --git a/asm/non_matchings/unknown_080500/func_80090F30.s b/asm/non_matchings/unknown_080500/func_80090F30.s index 5ae1672e..ca441a6c 100644 --- a/asm/non_matchings/unknown_080500/func_80090F30.s +++ b/asm/non_matchings/unknown_080500/func_80090F30.s @@ -13,7 +13,7 @@ glabel func_80090F30 /* 091B5C 80090F5C AFA40098 */ sw $a0, 0x98($sp) /* 091B60 80090F60 AFA00080 */ sw $zero, 0x80($sp) /* 091B64 80090F64 AFA00078 */ sw $zero, 0x78($sp) -/* 091B68 80090F68 0C01BAA4 */ jal func_8006EA90 +/* 091B68 80090F68 0C01BAA4 */ jal get_settings /* 091B6C 80090F6C AFA00074 */ sw $zero, 0x74($sp) /* 091B70 80090F70 3C108000 */ lui $s0, %hi(osTvType) # $s0, 0x8000 /* 091B74 80090F74 26100300 */ addiu $s0, %lo(osTvType) # addiu $s0, $s0, 0x300 diff --git a/asm/non_matchings/unknown_080500/func_80092188.s b/asm/non_matchings/unknown_080500/func_80092188.s index 58898e7f..f1be05e4 100644 --- a/asm/non_matchings/unknown_080500/func_80092188.s +++ b/asm/non_matchings/unknown_080500/func_80092188.s @@ -4,7 +4,7 @@ glabel func_80092188 /* 092D90 80092190 27BDFFA8 */ addiu $sp, $sp, -0x58 /* 092D94 80092194 AFBF001C */ sw $ra, 0x1c($sp) /* 092D98 80092198 AFA40058 */ sw $a0, 0x58($sp) -/* 092D9C 8009219C 0C01BAA4 */ jal func_8006EA90 +/* 092D9C 8009219C 0C01BAA4 */ jal get_settings /* 092DA0 800921A0 AFAE0030 */ sw $t6, 0x30($sp) /* 092DA4 800921A4 3C06800E */ lui $a2, %hi(D_800E0980) # $a2, 0x800e /* 092DA8 800921A8 24C60980 */ addiu $a2, %lo(D_800E0980) # addiu $a2, $a2, 0x980 diff --git a/asm/non_matchings/unknown_080500/func_80092E94.s b/asm/non_matchings/unknown_080500/func_80092E94.s index 450c8743..1f348cff 100644 --- a/asm/non_matchings/unknown_080500/func_80092E94.s +++ b/asm/non_matchings/unknown_080500/func_80092E94.s @@ -7,7 +7,7 @@ glabel func_80092E94 /* 093AA8 80092EA8 AFB00028 */ sw $s0, 0x28($sp) /* 093AAC 80092EAC AFA40078 */ sw $a0, 0x78($sp) /* 093AB0 80092EB0 AFA5007C */ sw $a1, 0x7c($sp) -/* 093AB4 80092EB4 0C01BAA4 */ jal func_8006EA90 +/* 093AB4 80092EB4 0C01BAA4 */ jal get_settings /* 093AB8 80092EB8 AFA00054 */ sw $zero, 0x54($sp) /* 093ABC 80092EBC 3C0E8000 */ lui $t6, %hi(osTvType) # $t6, 0x8000 /* 093AC0 80092EC0 8DCE0300 */ lw $t6, %lo(osTvType)($t6) diff --git a/asm/non_matchings/unknown_080500/func_80093A40.s b/asm/non_matchings/unknown_080500/func_80093A40.s index 2fb34900..d5102ce6 100644 --- a/asm/non_matchings/unknown_080500/func_80093A40.s +++ b/asm/non_matchings/unknown_080500/func_80093A40.s @@ -5,7 +5,7 @@ glabel func_80093A40 /* 09464C 80093A4C AFB00014 */ sw $s0, 0x14($sp) /* 094650 80093A50 0C01C8A6 */ jal func_80072298 /* 094654 80093A54 00002025 */ move $a0, $zero -/* 094658 80093A58 0C01BAA4 */ jal func_8006EA90 +/* 094658 80093A58 0C01BAA4 */ jal get_settings /* 09465C 80093A5C 00000000 */ nop /* 094660 80093A60 3C11800E */ lui $s1, %hi(D_800E098C) # $s1, 0x800e /* 094664 80093A64 2631098C */ addiu $s1, %lo(D_800E098C) # addiu $s1, $s1, 0x98c @@ -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(gIsInTrophyRace) # $t2, 0x800e +/* 094704 80093B04 3C0A800E */ lui $t2, %hi(gTrophyRaceWorldId) # $t2, 0x800e /* 094708 80093B08 AE290000 */ sw $t1, ($s1) -/* 09470C 80093B0C 8D4A0FE8 */ lw $t2, %lo(gIsInTrophyRace)($t2) +/* 09470C 80093B0C 8D4A0FE8 */ lw $t2, %lo(gTrophyRaceWorldId)($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 eb0108e1..80b46488 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(gIsInTrophyRace) # $t1, 0x800e -/* 094B00 80093F00 8D290FE8 */ lw $t1, %lo(gIsInTrophyRace)($t1) +/* 094AFC 80093EFC 3C09800E */ lui $t1, %hi(gTrophyRaceWorldId) # $t1, 0x800e +/* 094B00 80093F00 8D290FE8 */ lw $t1, %lo(gTrophyRaceWorldId)($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 2f82f33d..4c620f30 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(gIsInTrophyRace) # $a0, 0x800e -/* 094F18 80094318 24840FE8 */ addiu $a0, %lo(gIsInTrophyRace) # addiu $a0, $a0, 0xfe8 +/* 094F14 80094314 3C04800E */ lui $a0, %hi(gTrophyRaceWorldId) # $a0, 0x800e +/* 094F18 80094318 24840FE8 */ addiu $a0, %lo(gTrophyRaceWorldId) # 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(gIsInTrophyRace) # $a0, 0x800e -/* 095018 80094418 24840FE8 */ addiu $a0, %lo(gIsInTrophyRace) # addiu $a0, $a0, 0xfe8 +/* 095014 80094414 3C04800E */ lui $a0, %hi(gTrophyRaceWorldId) # $a0, 0x800e +/* 095018 80094418 24840FE8 */ addiu $a0, %lo(gTrophyRaceWorldId) # 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_80094604.s b/asm/non_matchings/unknown_080500/func_80094604.s deleted file mode 100644 index ab39b69d..00000000 --- a/asm/non_matchings/unknown_080500/func_80094604.s +++ /dev/null @@ -1,35 +0,0 @@ -glabel func_80094604 -/* 095204 80094604 3C028012 */ lui $v0, %hi(D_80126550) # $v0, 0x8012 -/* 095208 80094608 24426550 */ addiu $v0, %lo(D_80126550) # addiu $v0, $v0, 0x6550 -/* 09520C 8009460C 8C4E00C8 */ lw $t6, 0xc8($v0) -/* 095210 80094610 3C01800E */ lui $at, %hi(D_800E0A50) # $at, 0x800e -/* 095214 80094614 AC2E0A50 */ sw $t6, %lo(D_800E0A50)($at) -/* 095218 80094618 8C4F00CC */ lw $t7, 0xcc($v0) -/* 09521C 8009461C 3C01800E */ lui $at, %hi(D_800E0A60) # $at, 0x800e -/* 095220 80094620 AC2F0A60 */ sw $t7, %lo(D_800E0A60)($at) -/* 095224 80094624 8C5800D0 */ lw $t8, 0xd0($v0) -/* 095228 80094628 3C01800E */ lui $at, %hi(D_800E0A70) # $at, 0x800e -/* 09522C 8009462C AC380A70 */ sw $t8, %lo(D_800E0A70)($at) -/* 095230 80094630 8C5900D8 */ lw $t9, 0xd8($v0) -/* 095234 80094634 3C01800E */ lui $at, %hi(D_800E0A90) # $at, 0x800e -/* 095238 80094638 AC390A90 */ sw $t9, %lo(D_800E0A90)($at) -/* 09523C 8009463C 8C4800D4 */ lw $t0, 0xd4($v0) -/* 095240 80094640 3C01800E */ lui $at, %hi(D_800E0A80) # $at, 0x800e -/* 095244 80094644 AC280A80 */ sw $t0, %lo(D_800E0A80)($at) -/* 095248 80094648 8C4900DC */ lw $t1, 0xdc($v0) -/* 09524C 8009464C 3C01800E */ lui $at, %hi(D_800E0AA0) # $at, 0x800e -/* 095250 80094650 AC290AA0 */ sw $t1, %lo(D_800E0AA0)($at) -/* 095254 80094654 8C4A00E0 */ lw $t2, 0xe0($v0) -/* 095258 80094658 3C01800E */ lui $at, %hi(D_800E0AB0) # $at, 0x800e -/* 09525C 8009465C AC2A0AB0 */ sw $t2, %lo(D_800E0AB0)($at) -/* 095260 80094660 8C4B00E4 */ lw $t3, 0xe4($v0) -/* 095264 80094664 3C01800E */ lui $at, %hi(D_800E0AC0) # $at, 0x800e -/* 095268 80094668 AC2B0AC0 */ sw $t3, %lo(D_800E0AC0)($at) -/* 09526C 8009466C 8C4C00E8 */ lw $t4, 0xe8($v0) -/* 095270 80094670 3C01800E */ lui $at, %hi(D_800E0AD0) # $at, 0x800e -/* 095274 80094674 AC2C0AD0 */ sw $t4, %lo(D_800E0AD0)($at) -/* 095278 80094678 8C4D00EC */ lw $t5, 0xec($v0) -/* 09527C 8009467C 3C01800E */ lui $at, 0x800e -/* 095280 80094680 03E00008 */ jr $ra -/* 095284 80094684 AC2D0AE0 */ sw $t5, 0xae0($at) - diff --git a/asm/non_matchings/unknown_080500/func_80094688.s b/asm/non_matchings/unknown_080500/func_80094688.s index 098f3e11..e0eb2b06 100644 --- a/asm/non_matchings/unknown_080500/func_80094688.s +++ b/asm/non_matchings/unknown_080500/func_80094688.s @@ -23,8 +23,8 @@ 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(gIsInTrophyRace) # $t8, 0x800e -/* 0952E8 800946E8 8F180FE8 */ lw $t8, %lo(gIsInTrophyRace)($t8) +/* 0952E4 800946E4 3C18800E */ lui $t8, %hi(gTrophyRaceWorldId) # $t8, 0x800e +/* 0952E8 800946E8 8F180FE8 */ lw $t8, %lo(gTrophyRaceWorldId)($t8) /* 0952EC 800946EC 00000000 */ nop /* 0952F0 800946F0 1700003C */ bnez $t8, .L800947E4 /* 0952F4 800946F4 240B0007 */ li $t3, 7 @@ -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(gIsInTrophyRace) # $t1, 0x800e -/* 095524 80094924 8D290FE8 */ lw $t1, %lo(gIsInTrophyRace)($t1) +/* 095520 80094920 3C09800E */ lui $t1, %hi(gTrophyRaceWorldId) # $t1, 0x800e +/* 095524 80094924 8D290FE8 */ lw $t1, %lo(gTrophyRaceWorldId)($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 90d3e2c5..c9779595 100644 --- a/asm/non_matchings/unknown_080500/func_80094A5C.s +++ b/asm/non_matchings/unknown_080500/func_80094A5C.s @@ -23,7 +23,7 @@ glabel func_80094A5C /* 0956AC 80094AAC 24840A40 */ addiu $a0, %lo(D_800E0A40) # addiu $a0, $a0, 0xa40 /* 0956B0 80094AB0 0C025181 */ jal func_80094604 /* 0956B4 80094AB4 00000000 */ nop -/* 0956B8 80094AB8 0C01BAA4 */ jal func_8006EA90 +/* 0956B8 80094AB8 0C01BAA4 */ jal get_settings /* 0956BC 80094ABC 00000000 */ nop /* 0956C0 80094AC0 80580114 */ lb $t8, 0x114($v0) /* 0956C4 80094AC4 3C05800E */ lui $a1, %hi(D_800E0AF0) # $a1, 0x800e diff --git a/asm/non_matchings/unknown_080500/func_80094D28.s b/asm/non_matchings/unknown_080500/func_80094D28.s index 789707ad..9d77d78c 100644 --- a/asm/non_matchings/unknown_080500/func_80094D28.s +++ b/asm/non_matchings/unknown_080500/func_80094D28.s @@ -5,7 +5,7 @@ glabel func_80094D28 /* 095934 80094D34 AFB20024 */ sw $s2, 0x24($sp) /* 095938 80094D38 AFB10020 */ sw $s1, 0x20($sp) /* 09593C 80094D3C AFB0001C */ sw $s0, 0x1c($sp) -/* 095940 80094D40 0C01BAA4 */ jal func_8006EA90 +/* 095940 80094D40 0C01BAA4 */ jal get_settings /* 095944 80094D44 AFA40060 */ sw $a0, 0x60($sp) /* 095948 80094D48 3C0E800E */ lui $t6, %hi(D_800DF4BC) # $t6, 0x800e /* 09594C 80094D4C 8DCEF4BC */ lw $t6, %lo(D_800DF4BC)($t6) @@ -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(gIsInTrophyRace) # $t3, 0x800e -/* 0961A8 800955A8 8D6B0FE8 */ lw $t3, %lo(gIsInTrophyRace)($t3) +/* 0961A4 800955A4 3C0B800E */ lui $t3, %hi(gTrophyRaceWorldId) # $t3, 0x800e +/* 0961A8 800955A8 8D6B0FE8 */ lw $t3, %lo(gTrophyRaceWorldId)($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 439cc4cb..25c74db8 100644 --- a/asm/non_matchings/unknown_080500/func_80095728.s +++ b/asm/non_matchings/unknown_080500/func_80095728.s @@ -17,7 +17,7 @@ glabel func_80095728 /* 096364 80095764 AC3963A8 */ sw $t9, %lo(D_801263A8)($at) /* 096368 80095768 8CCD0000 */ lw $t5, ($a2) /* 09636C 8009576C 3C018012 */ lui $at, %hi(D_801263AC) # $at, 0x8012 -/* 096370 80095770 0C01BAA4 */ jal func_8006EA90 +/* 096370 80095770 0C01BAA4 */ jal get_settings /* 096374 80095774 AC2D63AC */ sw $t5, %lo(D_801263AC)($at) /* 096378 80095778 3C0E8000 */ lui $t6, %hi(osTvType) # $t6, 0x8000 /* 09637C 8009577C 8DCE0300 */ lw $t6, %lo(osTvType)($t6) @@ -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(gIsInTrophyRace) # $t4, 0x800e -/* 096748 80095B48 8D8C0FE8 */ lw $t4, %lo(gIsInTrophyRace)($t4) +/* 096744 80095B44 3C0C800E */ lui $t4, %hi(gTrophyRaceWorldId) # $t4, 0x800e +/* 096748 80095B48 8D8C0FE8 */ lw $t4, %lo(gTrophyRaceWorldId)($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(gIsInTrophyRace) # $t4, 0x800e +/* 097184 80096584 3C0C800E */ lui $t4, %hi(gTrophyRaceWorldId) # $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(gIsInTrophyRace)($t4) +/* 097200 80096600 8D8C0FE8 */ lw $t4, %lo(gTrophyRaceWorldId)($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_80096978.s b/asm/non_matchings/unknown_080500/func_80096978.s index c5d57864..a2234df3 100644 --- a/asm/non_matchings/unknown_080500/func_80096978.s +++ b/asm/non_matchings/unknown_080500/func_80096978.s @@ -15,7 +15,7 @@ glabel func_80096978 /* 0975AC 800969AC E7B70030 */ swc1 $f23, 0x30($sp) /* 0975B0 800969B0 E7B60034 */ swc1 $f22, 0x34($sp) /* 0975B4 800969B4 E7B50028 */ swc1 $f21, 0x28($sp) -/* 0975B8 800969B8 0C01BAA4 */ jal func_8006EA90 +/* 0975B8 800969B8 0C01BAA4 */ jal get_settings /* 0975BC 800969BC AFA400B0 */ sw $a0, 0xb0($sp) /* 0975C0 800969C0 3C0E8000 */ lui $t6, %hi(osTvType) # $t6, 0x8000 /* 0975C4 800969C4 8DCE0300 */ lw $t6, %lo(osTvType)($t6) diff --git a/asm/non_matchings/unknown_080500/func_80098208.s b/asm/non_matchings/unknown_080500/func_80098208.s deleted file mode 100644 index 1d38aba7..00000000 --- a/asm/non_matchings/unknown_080500/func_80098208.s +++ /dev/null @@ -1,27 +0,0 @@ -glabel func_80098208 -/* 098E08 80098208 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 098E0C 8009820C AFBF0014 */ sw $ra, 0x14($sp) -/* 098E10 80098210 0C01BAA4 */ jal func_8006EA90 -/* 098E14 80098214 00000000 */ nop -/* 098E18 80098218 904E0048 */ lbu $t6, 0x48($v0) -/* 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) -/* 098E30 80098230 904F0049 */ lbu $t7, 0x49($v0) -/* 098E34 80098234 3C01800E */ lui $at, %hi(D_800DF450) # $at, 0x800e -/* 098E38 80098238 A30F0000 */ sb $t7, ($t8) -/* 098E3C 8009823C 8C59004C */ lw $t9, 0x4c($v0) -/* 098E40 80098240 24090001 */ li $t1, 1 -/* 098E44 80098244 A320000F */ sb $zero, 0xf($t9) -/* 098E48 80098248 8C48004C */ lw $t0, 0x4c($v0) -/* 098E4C 8009824C 00002025 */ move $a0, $zero -/* 098E50 80098250 A1000001 */ sb $zero, 1($t0) -/* 098E54 80098254 0C00392F */ jal func_8000E4BC -/* 098E58 80098258 A029F450 */ sb $t1, %lo(D_800DF450)($at) -/* 098E5C 8009825C 8FBF0014 */ lw $ra, 0x14($sp) -/* 098E60 80098260 27BD0018 */ addiu $sp, $sp, 0x18 -/* 098E64 80098264 03E00008 */ jr $ra -/* 098E68 80098268 00000000 */ nop - diff --git a/asm/non_matchings/unknown_080500/func_800983C0.s b/asm/non_matchings/unknown_080500/func_800983C0.s index ed2a5256..7d17ebce 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(gIsInTrophyRace) # $a0, 0x800e +/* 098FE4 800983E4 3C04800E */ lui $a0, %hi(gTrophyRaceWorldId) # $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(gIsInTrophyRace)($a0) +/* 098FF8 800983F8 8C840FE8 */ lw $a0, %lo(gTrophyRaceWorldId)($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(gIsInTrophyRace) # $t8, 0x800e -/* 099010 80098410 8F180FE8 */ lw $t8, %lo(gIsInTrophyRace)($t8) +/* 09900C 8009840C 3C18800E */ lui $t8, %hi(gTrophyRaceWorldId) # $t8, 0x800e +/* 099010 80098410 8F180FE8 */ lw $t8, %lo(gTrophyRaceWorldId)($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_80098774.s b/asm/non_matchings/unknown_080500/func_80098774.s index 21b37c58..b68b05d4 100644 --- a/asm/non_matchings/unknown_080500/func_80098774.s +++ b/asm/non_matchings/unknown_080500/func_80098774.s @@ -8,7 +8,7 @@ glabel func_80098774 /* 09938C 8009878C AFB30024 */ sw $s3, 0x24($sp) /* 099390 80098790 AFB20020 */ sw $s2, 0x20($sp) /* 099394 80098794 AFB1001C */ sw $s1, 0x1c($sp) -/* 099398 80098798 0C01BAA4 */ jal func_8006EA90 +/* 099398 80098798 0C01BAA4 */ jal get_settings /* 09939C 8009879C AFB00018 */ sw $s0, 0x18($sp) /* 0993A0 800987A0 12C00007 */ beqz $s6, .L800987C0 /* 0993A4 800987A4 3C05800E */ lui $a1, %hi(D_800E1048) # $a1, 0x800e diff --git a/asm/non_matchings/unknown_080500/func_8009C1B0.s b/asm/non_matchings/unknown_080500/func_8009C1B0.s deleted file mode 100644 index 84fc5698..00000000 --- a/asm/non_matchings/unknown_080500/func_8009C1B0.s +++ /dev/null @@ -1,36 +0,0 @@ -glabel func_8009C1B0 -/* 09CDB0 8009C1B0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 09CDB4 8009C1B4 AFBF0014 */ sw $ra, 0x14($sp) -/* 09CDB8 8009C1B8 0C01BAA4 */ jal func_8006EA90 -/* 09CDBC 8009C1BC 00000000 */ nop -/* 09CDC0 8009C1C0 3C0E800E */ lui $t6, %hi(D_800DF4B8) # $t6, 0x800e -/* 09CDC4 8009C1C4 8DCEF4B8 */ lw $t6, %lo(D_800DF4B8)($t6) -/* 09CDC8 8009C1C8 00401825 */ move $v1, $v0 -/* 09CDCC 8009C1CC 15C0000E */ bnez $t6, .L8009C208 -/* 09CDD0 8009C1D0 3C0F800E */ lui $t7, %hi(D_800DF478) # $t7, 0x800e -/* 09CDD4 8009C1D4 8DEFF478 */ lw $t7, %lo(D_800DF478)($t7) -/* 09CDD8 8009C1D8 00000000 */ nop -/* 09CDDC 8009C1DC 15E0000A */ bnez $t7, .L8009C208 -/* 09CDE0 8009C1E0 00000000 */ nop -/* 09CDE4 8009C1E4 9058004B */ lbu $t8, 0x4b($v0) -/* 09CDE8 8009C1E8 00000000 */ nop -/* 09CDEC 8009C1EC 13000003 */ beqz $t8, .L8009C1FC -/* 09CDF0 8009C1F0 00000000 */ nop -/* 09CDF4 8009C1F4 10000008 */ b .L8009C218 -/* 09CDF8 8009C1F8 00001025 */ move $v0, $zero -.L8009C1FC: -/* 09CDFC 8009C1FC 90620049 */ lbu $v0, 0x49($v1) -/* 09CE00 8009C200 10000006 */ b .L8009C21C -/* 09CE04 8009C204 8FBF0014 */ lw $ra, 0x14($sp) -.L8009C208: -/* 09CE08 8009C208 3C02800E */ lui $v0, %hi(D_800DF4D4) # $v0, 0x800e -/* 09CE0C 8009C20C 3C01800E */ lui $at, %hi(D_800DF478) # $at, 0x800e -/* 09CE10 8009C210 8C42F4D4 */ lw $v0, %lo(D_800DF4D4)($v0) -/* 09CE14 8009C214 AC20F478 */ sw $zero, %lo(D_800DF478)($at) -.L8009C218: -/* 09CE18 8009C218 8FBF0014 */ lw $ra, 0x14($sp) -.L8009C21C: -/* 09CE1C 8009C21C 27BD0018 */ addiu $sp, $sp, 0x18 -/* 09CE20 8009C220 03E00008 */ jr $ra -/* 09CE24 8009C224 00000000 */ nop - diff --git a/asm/non_matchings/unknown_080500/func_8009C3D8.s b/asm/non_matchings/unknown_080500/func_8009C3D8.s deleted file mode 100644 index fb829ef3..00000000 --- a/asm/non_matchings/unknown_080500/func_8009C3D8.s +++ /dev/null @@ -1,31 +0,0 @@ -glabel func_8009C3D8 -/* 09CFD8 8009C3D8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 09CFDC 8009C3DC AFBF0014 */ sw $ra, 0x14($sp) -/* 09CFE0 8009C3E0 0C01AF6C */ jal func_8006BDB0 -/* 09CFE4 8009C3E4 00000000 */ nop -/* 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 -/* 09CFFC 8009C3FC 8DEFF4B8 */ lw $t7, %lo(D_800DF4B8)($t7) -/* 09D000 8009C400 00000000 */ nop -/* 09D004 8009C404 15E00009 */ bnez $t7, .L8009C42C -/* 09D008 8009C408 00000000 */ nop -/* 09D00C 8009C40C 8043004C */ lb $v1, 0x4c($v0) -/* 09D010 8009C410 00000000 */ nop -/* 09D014 8009C414 10600003 */ beqz $v1, .L8009C424 -/* 09D018 8009C418 30780040 */ andi $t8, $v1, 0x40 -/* 09D01C 8009C41C 13000003 */ beqz $t8, .L8009C42C -/* 09D020 8009C420 00000000 */ nop -.L8009C424: -/* 09D024 8009C424 10000004 */ b .L8009C438 -/* 09D028 8009C428 24020002 */ li $v0, 2 -.L8009C42C: -/* 09D02C 8009C42C 3C02800E */ lui $v0, %hi(D_800DF4BC) # $v0, 0x800e -/* 09D030 8009C430 8C42F4BC */ lw $v0, %lo(D_800DF4BC)($v0) -/* 09D034 8009C434 00000000 */ nop -.L8009C438: -/* 09D038 8009C438 03E00008 */ jr $ra -/* 09D03C 8009C43C 27BD0018 */ addiu $sp, $sp, 0x18 - diff --git a/asm/non_matchings/unknown_080500/func_8009D118.s b/asm/non_matchings/unknown_080500/func_8009D118.s deleted file mode 100644 index 5072132e..00000000 --- a/asm/non_matchings/unknown_080500/func_8009D118.s +++ /dev/null @@ -1,45 +0,0 @@ -glabel func_8009D118 -/* 09DD18 8009D118 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 09DD1C 8009D11C 14800018 */ bnez $a0, .L8009D180 -/* 09DD20 8009D120 AFBF001C */ sw $ra, 0x1c($sp) -/* 09DD24 8009D124 240E005A */ li $t6, 90 -/* 09DD28 8009D128 240F00FF */ li $t7, 255 -/* 09DD2C 8009D12C AFAF0014 */ sw $t7, 0x14($sp) -/* 09DD30 8009D130 AFAE0010 */ sw $t6, 0x10($sp) -/* 09DD34 8009D134 24040001 */ li $a0, 1 -/* 09DD38 8009D138 00002825 */ move $a1, $zero -/* 09DD3C 8009D13C 00003025 */ move $a2, $zero -/* 09DD40 8009D140 0C031400 */ jal func_800C5000 -/* 09DD44 8009D144 2407007F */ li $a3, 127 -/* 09DD48 8009D148 3C18800E */ lui $t8, %hi(D_800DF4EC) # $t8, 0x800e -/* 09DD4C 8009D14C 8318F4EC */ lb $t8, %lo(D_800DF4EC)($t8) -/* 09DD50 8009D150 24040001 */ li $a0, 1 -/* 09DD54 8009D154 13000013 */ beqz $t8, .L8009D1A4 -/* 09DD58 8009D158 00002825 */ move $a1, $zero -/* 09DD5C 8009D15C 2419005A */ li $t9, 90 -/* 09DD60 8009D160 24080078 */ li $t0, 120 -/* 09DD64 8009D164 AFA80014 */ sw $t0, 0x14($sp) -/* 09DD68 8009D168 AFB90010 */ sw $t9, 0x10($sp) -/* 09DD6C 8009D16C 00003025 */ move $a2, $zero -/* 09DD70 8009D170 0C031400 */ jal func_800C5000 -/* 09DD74 8009D174 2407007F */ li $a3, 127 -/* 09DD78 8009D178 1000000B */ b .L8009D1A8 -/* 09DD7C 8009D17C 8FBF001C */ lw $ra, 0x1c($sp) -.L8009D180: -/* 09DD80 8009D180 2409005A */ li $t1, 90 -/* 09DD84 8009D184 240A00FF */ li $t2, 255 -/* 09DD88 8009D188 AFAA0014 */ sw $t2, 0x14($sp) -/* 09DD8C 8009D18C AFA90010 */ sw $t1, 0x10($sp) -/* 09DD90 8009D190 24040001 */ li $a0, 1 -/* 09DD94 8009D194 240500CF */ li $a1, 207 -/* 09DD98 8009D198 240600CF */ li $a2, 207 -/* 09DD9C 8009D19C 0C031400 */ jal func_800C5000 -/* 09DDA0 8009D1A0 240700CF */ li $a3, 207 -.L8009D1A4: -/* 09DDA4 8009D1A4 8FBF001C */ lw $ra, 0x1c($sp) -.L8009D1A8: -/* 09DDA8 8009D1A8 3C01800E */ lui $at, %hi(D_800DF4EC) # $at, 0x800e -/* 09DDAC 8009D1AC A020F4EC */ sb $zero, %lo(D_800DF4EC)($at) -/* 09DDB0 8009D1B0 03E00008 */ jr $ra -/* 09DDB4 8009D1B4 27BD0020 */ addiu $sp, $sp, 0x20 - diff --git a/asm/non_matchings/unknown_080500/func_8009D360.s b/asm/non_matchings/unknown_080500/func_8009D360.s index 2288c53d..f4b7a322 100644 --- a/asm/non_matchings/unknown_080500/func_8009D360.s +++ b/asm/non_matchings/unknown_080500/func_8009D360.s @@ -1,7 +1,7 @@ glabel func_8009D360 /* 09DF60 8009D360 27BDFFD0 */ addiu $sp, $sp, -0x30 /* 09DF64 8009D364 AFBF001C */ sw $ra, 0x1c($sp) -/* 09DF68 8009D368 0C01BAA4 */ jal func_8006EA90 +/* 09DF68 8009D368 0C01BAA4 */ jal get_settings /* 09DF6C 8009D36C 00000000 */ nop /* 09DF70 8009D370 3C03800E */ lui $v1, %hi(D_800DF4DC) # $v1, 0x800e /* 09DF74 8009D374 8063F4DC */ lb $v1, %lo(D_800DF4DC)($v1) diff --git a/asm/non_matchings/unknown_080500/func_8009DB3C.s b/asm/non_matchings/unknown_080500/func_8009DB3C.s index c563cd2f..04ea63e8 100644 --- a/asm/non_matchings/unknown_080500/func_8009DB3C.s +++ b/asm/non_matchings/unknown_080500/func_8009DB3C.s @@ -1,7 +1,7 @@ glabel func_8009DB3C /* 09E73C 8009DB3C 27BDFFB8 */ addiu $sp, $sp, -0x48 /* 09E740 8009DB40 AFBF001C */ sw $ra, 0x1c($sp) -/* 09E744 8009DB44 0C01BAA4 */ jal func_8006EA90 +/* 09E744 8009DB44 0C01BAA4 */ jal get_settings /* 09E748 8009DB48 00000000 */ nop /* 09E74C 8009DB4C 0C027B20 */ jal is_in_two_player_adventure /* 09E750 8009DB50 AFA20030 */ sw $v0, 0x30($sp) diff --git a/asm/non_matchings/unknown_080500/func_8009E3D0.s b/asm/non_matchings/unknown_080500/func_8009E3D0.s index 3c6e0322..6e2e38b5 100644 --- a/asm/non_matchings/unknown_080500/func_8009E3D0.s +++ b/asm/non_matchings/unknown_080500/func_8009E3D0.s @@ -18,7 +18,7 @@ glabel func_8009E3D0 /* 09F010 8009E410 100000EA */ b .L8009E7BC /* 09F014 8009E414 A06E0000 */ sb $t6, ($v1) .L8009E418: -/* 09F018 8009E418 0C01BAA4 */ jal func_8006EA90 +/* 09F018 8009E418 0C01BAA4 */ jal get_settings /* 09F01C 8009E41C 00000000 */ nop /* 09F020 8009E420 AFA20048 */ sw $v0, 0x48($sp) /* 09F024 8009E424 0C01A142 */ jal func_80068508 diff --git a/asm/non_matchings/unknown_09F8F0/func_8009ECF0.s b/asm/non_matchings/unknown_09F8F0/func_8009ECF0.s index fc4719ef..9c798be2 100644 --- a/asm/non_matchings/unknown_09F8F0/func_8009ECF0.s +++ b/asm/non_matchings/unknown_09F8F0/func_8009ECF0.s @@ -12,7 +12,7 @@ glabel func_8009ECF0 /* 09F918 8009ED18 0C01994B */ jal func_8006652C /* 09F91C 8009ED1C 00402025 */ move $a0, $v0 /* 09F920 8009ED20 3C018012 */ lui $at, %hi(D_80126D37) # $at, 0x8012 -/* 09F924 8009ED24 0C01BAA4 */ jal func_8006EA90 +/* 09F924 8009ED24 0C01BAA4 */ jal get_settings /* 09F928 8009ED28 A0226D37 */ sb $v0, %lo(D_80126D37)($at) /* 09F92C 8009ED2C 3C018012 */ lui $at, %hi(D_80127184) # $at, 0x8012 /* 09F930 8009ED30 0C003877 */ jal func_8000E1DC diff --git a/asm/non_matchings/unknown_09F8F0/func_800A26C8.s b/asm/non_matchings/unknown_09F8F0/func_800A26C8.s index c00e3aef..26edad5d 100644 --- a/asm/non_matchings/unknown_09F8F0/func_800A26C8.s +++ b/asm/non_matchings/unknown_09F8F0/func_800A26C8.s @@ -25,7 +25,7 @@ glabel func_800A26C8 /* 0A3324 800A2724 8CE76CDC */ lw $a3, %lo(D_80126CDC)($a3) /* 0A3328 800A2728 00000000 */ nop /* 0A332C 800A272C 24E70720 */ addiu $a3, $a3, 0x720 -/* 0A3330 800A2730 0C01BAA4 */ jal func_8006EA90 +/* 0A3330 800A2730 0C01BAA4 */ jal get_settings /* 0A3334 800A2734 AFA70018 */ sw $a3, 0x18($sp) /* 0A3338 800A2738 80580071 */ lb $t8, 0x71($v0) /* 0A333C 800A273C 8FA70018 */ lw $a3, 0x18($sp) diff --git a/asm/non_matchings/unknown_09F8F0/func_800A277C.s b/asm/non_matchings/unknown_09F8F0/func_800A277C.s index 1a85c47d..19876e23 100644 --- a/asm/non_matchings/unknown_09F8F0/func_800A277C.s +++ b/asm/non_matchings/unknown_09F8F0/func_800A277C.s @@ -655,7 +655,7 @@ glabel func_800A277C /* 0A3D34 800A3134 29A10003 */ slti $at, $t5, 3 /* 0A3D38 800A3138 1020002B */ beqz $at, .L800A31E8 /* 0A3D3C 800A313C 00000000 */ nop -/* 0A3D40 800A3140 0C01BAA4 */ jal func_8006EA90 +/* 0A3D40 800A3140 0C01BAA4 */ jal get_settings /* 0A3D44 800A3144 00000000 */ nop /* 0A3D48 800A3148 3C108012 */ lui $s0, %hi(D_80127184) # $s0, 0x8012 /* 0A3D4C 800A314C 26107184 */ addiu $s0, %lo(D_80127184) # addiu $s0, $s0, 0x7184 diff --git a/asm/non_matchings/unknown_09F8F0/func_800A4C44.s b/asm/non_matchings/unknown_09F8F0/func_800A4C44.s index 64271fc9..47719427 100644 --- a/asm/non_matchings/unknown_09F8F0/func_800A4C44.s +++ b/asm/non_matchings/unknown_09F8F0/func_800A4C44.s @@ -25,7 +25,7 @@ glabel func_800A4C44 /* 0A589C 800A4C9C 10000010 */ b .L800A4CE0 /* 0A58A0 800A4CA0 24030002 */ li $v1, 2 .L800A4CA4: -/* 0A58A4 800A4CA4 0C01BAA4 */ jal func_8006EA90 +/* 0A58A4 800A4CA4 0C01BAA4 */ jal get_settings /* 0A58A8 800A4CA8 00000000 */ nop /* 0A58AC 800A4CAC 3C0F8012 */ lui $t7, %hi(D_80126D10) # $t7, 0x8012 /* 0A58B0 800A4CB0 8DEF6D10 */ lw $t7, %lo(D_80126D10)($t7) diff --git a/asm/non_matchings/unknown_09F8F0/func_800A6DB4.s b/asm/non_matchings/unknown_09F8F0/func_800A6DB4.s index 427a6cf9..cacafc91 100644 --- a/asm/non_matchings/unknown_09F8F0/func_800A6DB4.s +++ b/asm/non_matchings/unknown_09F8F0/func_800A6DB4.s @@ -1,7 +1,7 @@ glabel func_800A6DB4 /* 0A79B4 800A6DB4 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 0A79B8 800A6DB8 AFBF0014 */ sw $ra, 0x14($sp) -/* 0A79BC 800A6DBC 0C01BAA4 */ jal func_8006EA90 +/* 0A79BC 800A6DBC 0C01BAA4 */ jal get_settings /* 0A79C0 800A6DC0 AFA40018 */ sw $a0, 0x18($sp) /* 0A79C4 800A6DC4 8FA30018 */ lw $v1, 0x18($sp) /* 0A79C8 800A6DC8 00000000 */ nop diff --git a/asm/non_matchings/unknown_09F8F0/func_800A718C.s b/asm/non_matchings/unknown_09F8F0/func_800A718C.s index b56f21d7..4d3e77ef 100644 --- a/asm/non_matchings/unknown_09F8F0/func_800A718C.s +++ b/asm/non_matchings/unknown_09F8F0/func_800A718C.s @@ -1,7 +1,7 @@ glabel func_800A718C /* 0A7D8C 800A718C 27BDFFD0 */ addiu $sp, $sp, -0x30 /* 0A7D90 800A7190 AFBF0014 */ sw $ra, 0x14($sp) -/* 0A7D94 800A7194 0C01BAA4 */ jal func_8006EA90 +/* 0A7D94 800A7194 0C01BAA4 */ jal get_settings /* 0A7D98 800A7198 AFA40030 */ sw $a0, 0x30($sp) /* 0A7D9C 800A719C 3C0E8000 */ lui $t6, %hi(osTvType) # $t6, 0x8000 /* 0A7DA0 800A71A0 8DCE0300 */ lw $t6, %lo(osTvType)($t6) diff --git a/include/structs.h b/include/structs.h index 05e7c6bc..d495ae7b 100644 --- a/include/structs.h +++ b/include/structs.h @@ -18,40 +18,48 @@ typedef struct dkr_racer_t { /* Size: 0x18 */ } dkr_racer_t; -typedef struct { - /* 0x0000 */ void *balloons_ptr; - /* 0x0004 */ void *course_flags_ptr; +/* Unknown Size */ +typedef struct Settings4C { + u8 unk0; + u8 unk1; + u8 pad2[0xD]; + u8 unkF; +} Settings4C; + +typedef struct Settings { + /* 0x0000 */ void *balloonsPtr; + /* 0x0004 */ void *courseFlagsPtr; /* 0x0008 */ u16 keys; - /* 0x000A */ char unk000A[2]; + /* 0x000A */ char unkA[2]; /* 0x000C */ u16 bosses; /* 0x000E */ u16 trophies; - /* 0x0010 */ u32 cutscene_flags; - /* 0x0014 */ u16 taj_flags; - /* 0x0016 */ u8 tt_amulet; - /* 0x0017 */ u8 wizpig_amulet; - /* 0x0018 */ void *flap_initials_ptr[3]; - /* 0x0024 */ void *flap_times_ptr[3]; - /* 0x0030 */ void *course_initials_ptr[3]; - /* 0x003C */ void *course_times_ptr[3]; - /* 0x0048 */ u8 world; - /* 0x0049 */ u8 course; - /* 0x004A */ u8 player_count; - /* 0x004B */ u8 new_game; - /* 0x004C */ void *return_course_ptr; + /* 0x0010 */ u32 cutsceneFlags; + /* 0x0014 */ u16 tajFlags; + /* 0x0016 */ u8 ttAmulet; + /* 0x0017 */ u8 wizpigAmulet; + /* 0x0018 */ void *flapInitialsPtr[3]; + /* 0x0024 */ void *flapTimesPtr[3]; + /* 0x0030 */ void *courseInitialsPtr[3]; + /* 0x003C */ void *courseTimesPtr[3]; + /* 0x0048 */ u8 worldId; + /* 0x0049 */ u8 courseId; + /* 0x004A */ u8 playerCount; + /* 0x004B */ u8 newGame; + /* 0x004C */ Settings4C *unk4C; /* 0x0050 */ u32 filename; /* 0x0054 */ dkr_racer_t racers[8]; - /* 0x0114 */ u8 time_trial_racer; + /* 0x0114 */ u8 timeTrialRacer; /* 0x0115 */ char unk0115[2]; /* 0x0117 */ u8 display_times; - /* 0x0118 */ u32 course_flags[65]; + /* 0x0118 */ u32 courseFlags[65]; /* 0x021C */ u16 balloons; - /* 0x021E */ u16 world_balloons[5]; - /* 0x0228 */ u16 flap_initials[3][65]; - /* 0x03AE */ u16 flap_times[3][65]; - /* 0x0534 */ u16 course_initials[3][65]; - /* 0x06BA */ u16 course_times[3][65]; + /* 0x021E */ u16 worldBalloons[5]; + /* 0x0228 */ u16 flapInitials[3][65]; + /* 0x03AE */ u16 flapTimes[3][65]; + /* 0x0534 */ u16 courseInitials[3][65]; + /* 0x06BA */ u16 courseTimes[3][65]; /* Size: 0x0840 */ -} dkr_settings_t; +} Settings; typedef struct { /* 0x00 */ u8 world; diff --git a/src/mips1/unknown_066AA0.c b/src/mips1/unknown_066AA0.c index 91e1afa3..a3069cc7 100644 --- a/src/mips1/unknown_066AA0.c +++ b/src/mips1/unknown_066AA0.c @@ -3,6 +3,7 @@ #include "types.h" #include "macros.h" +#include "structs.h" extern u32 osTvType; extern s8 D_800DD318; @@ -43,7 +44,7 @@ extern s32 D_801234EC; extern s32 D_801234F4; extern s32 D_80123500; extern s32 D_80123504; -extern s32 D_80123510; +extern Settings *gSettingsPtr; extern s8 D_80123514; extern s8 D_80123515; extern s8 D_80123516; @@ -350,8 +351,8 @@ GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_8006E5BC.s") GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_8006E770.s") GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_8006E994.s") -s32 func_8006EA90(void) { - return D_80123510; +Settings* get_settings(void) { + return gSettingsPtr; } s8 func_8006EAA0(void) { diff --git a/src/mips1/unknown_080500.c b/src/mips1/unknown_080500.c index 57855cf5..4ea6b4e2 100644 --- a/src/mips1/unknown_080500.c +++ b/src/mips1/unknown_080500.c @@ -3,9 +3,11 @@ #include "types.h" #include "macros.h" +#include "structs.h" extern s32 osTvType; +extern s8 D_800DF450; extern s32 D_800DF458; extern s32 D_800DF46C; extern s32 gIsInAdventureTwo; @@ -18,14 +20,17 @@ typedef struct unk800DF4A0 { } unk800DF4A0; extern unk800DF4A0* D_800DF4A0; +extern s32 D_800DF478; extern s32 D_800DF47C; extern s32 D_800DF498; extern s32 D_800DF4B8; extern s32 D_800DF4BC; extern s32 D_800DF4C8; +extern s32 D_800DF4D4; extern s8 D_800DF4D8; extern s8 D_800DF4E0; extern s8 D_800DF4E4[4]; +extern s8 D_800DF4EC; extern s32 gIsInTwoPlayerAdventure; extern s32 gSaveFileIndex; extern s16 D_800DF7C4[11]; @@ -38,8 +43,32 @@ extern s32 D_800DFFD4; extern s32 D_800E0398; extern s32 D_800E0410; extern s32 D_800E0414; + +/* Size: 0x18 Bytes */ +typedef struct unk800E045C { + u32* unk0; + s32 pad4; + u32* unk8; + s32 padC; + s32 pad10; + s32 pad14; +} unk800E045C; +extern unk800E045C D_800E045C; +extern unk800E045C D_800E0474; +extern unk800E045C D_800E048C; + extern s32 D_800E0984; extern s32 D_800E0A24; +extern u32* D_800E0A50; +extern u32* D_800E0A60; +extern u32* D_800E0A70; +extern u32* D_800E0A90; +extern u32* D_800E0A80; +extern u32* D_800E0AA0; +extern u32* D_800E0AB0; +extern u32* D_800E0AC0; +extern u32* D_800E0AD0; +extern u32* D_800E0AE0; extern u8 D_800E0F6C[0x20]; // "ABCDEFGHIJKLMNOPQRSTYVWXYZ.? " = Valid chars for name input. extern s32 D_800E0F90; extern s32 D_800E0F94; @@ -47,11 +76,16 @@ extern s32 D_800E0F98; extern s32 D_800E0F9C; extern s32 D_800E0FA0; extern s32 D_800E0FB4; -extern s32 gIsInTrophyRace; +extern s32 D_800E0FEC; +extern s32 gTrophyRaceWorldId; extern s32 D_800E1024; extern s32 D_800E1708; -extern s32 D_800E1768; +extern s16 D_800E1768[10]; extern s32 D_800E17D8; +extern s32 *D_800E1DA4[2]; +extern s32 *D_800E1DAC[2]; +extern s32 D_800E1DB8; +extern s32 D_800E1DBC; extern s8 D_800E1E28; extern s32 D_801263A0; @@ -95,6 +129,7 @@ extern s8 D_801264E2; extern s8 D_80126504; extern s8 D_8012650E; extern s8 D_80126516; +extern u32* D_80126550[1]; // lookup table? Unknown number of entries. extern s8* D_801267EC; extern s32 D_80126804; extern s32 D_80126824; @@ -106,6 +141,7 @@ extern s32 D_801269FC; extern s32 D_80126A0C; extern s32 D_80126A64; extern s32 D_80126AA0; +extern s32 *D_80126C2C; extern s32 D_80126C34; extern s32 D_80126C3C; extern u16 D_80126C40; @@ -117,13 +153,28 @@ extern s16 D_80126C4C; extern u8 D_80126C58; extern f32 D_80126C50; extern s32 *D_80126C6C; +extern s32 D_80126C70; extern s32 D_80126C74; extern s32 D_80126C78; +Settings *get_settings(); void func_8009C4A8(s16 *arg0); GLOBAL_ASM("asm/non_matchings/unknown_080500/func_8007F900.s") -GLOBAL_ASM("asm/non_matchings/unknown_080500/func_8007FF88.s") + +void func_8007FF88(void) { + if (D_800E1DAC[0] != NULL) { + func_80071140(D_800E1DAC[0]); + D_800E1DAC[0] = NULL; + } + D_800E1DAC[1] = NULL; + D_80126C2C = NULL; + D_800E1DA4[0] = NULL; + D_800E1DA4[1] = NULL; + D_800E1DB8 = 0; + D_800E1DBC = 0; +} + GLOBAL_ASM("asm/non_matchings/unknown_080500/func_8007FFEC.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/func_80080580.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/func_80080BC8.s") @@ -269,7 +320,21 @@ 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") GLOBAL_ASM("asm/non_matchings/unknown_080500/func_800875E4.s") -GLOBAL_ASM("asm/non_matchings/unknown_080500/func_800876CC.s") + +s32 func_800876CC(s32 arg0, s32 arg1) { + if (arg0 & 0x4000) { + func_80001D04(0x241, 0); + D_801263E0 = 5; + } else if (arg0 & 0x9000) { + func_80001D04(0xEF, 0); + D_801263E0 = 7; + D_801263D8 = 0; + } + + return 0; +} + + GLOBAL_ASM("asm/non_matchings/unknown_080500/func_80087734.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/MenuSaveOptionsLoop.s") @@ -363,7 +428,23 @@ void func_8008A4C8(void) { func_800C422C(2); } -GLOBAL_ASM("asm/non_matchings/unknown_080500/MenuMagicCodesListInit.s") +void menu_magic_codes_list_init(void) { + D_801263BC = 0; + D_800DF47C = 0; + D_801263E0 = 0; + D_80126C46 = (u16)0; + func_800C4170(2); + func_8009C6D4(0x3F); + func_8008E4B0(); + func_800C01D8(&D_800DF77C); + if (osTvType == 0) { + D_80126C70 = 0xB; + } else { + D_80126C70 = 0xA; + } +} + + GLOBAL_ASM("asm/non_matchings/unknown_080500/func_8008A56C.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/func_8008A8F8.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/MenuMagicCodesListLoop.s") @@ -449,7 +530,15 @@ void func_8008E428(void) { func_800C422C(2); } -GLOBAL_ASM("asm/non_matchings/unknown_080500/func_8008E45C.s") +void func_8008E45C(void) { + D_800E045C.unk0 = D_80126550[24]; + D_800E045C.unk8 = D_80126550[25]; + D_800E0474.unk0 = D_80126550[26]; + D_800E0474.unk8 = D_80126550[27]; + D_800E048C.unk0 = D_80126550[28]; + D_800E048C.unk8 = D_80126550[29]; +} + GLOBAL_ASM("asm/non_matchings/unknown_080500/func_8008E4B0.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/func_8008E4EC.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/MenuTrackSelectInit.s") @@ -536,7 +625,19 @@ void func_800945E4(void) { func_800945B0(); } -GLOBAL_ASM("asm/non_matchings/unknown_080500/func_80094604.s") +void func_80094604(void) { + D_800E0A50 = D_80126550[50]; + D_800E0A60 = D_80126550[51]; + D_800E0A70 = D_80126550[52]; + D_800E0A90 = D_80126550[54]; + D_800E0A80 = D_80126550[53]; + D_800E0AA0 = D_80126550[55]; + D_800E0AB0 = D_80126550[56]; + D_800E0AC0 = D_80126550[57]; + D_800E0AD0 = D_80126550[58]; + D_800E0AE0 = D_80126550[59]; +} + GLOBAL_ASM("asm/non_matchings/unknown_080500/func_80094688.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/func_80094A5C.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/func_80094C14.s") @@ -544,7 +645,6 @@ 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 @@ -558,7 +658,7 @@ void func_80096790(void) { s32 temp; s8 *temp2; - temp2 = (s8*)func_8006BDB0(); // temp2 = array of 8 bytes + temp2 = (s8*)func_8006BDB0(); func_8009C4A8((s16*)&D_800E0A24); temp = *temp2 - 1; // temp is $v1, when it should be $v0! @@ -625,7 +725,19 @@ void func_800981E8(void) { func_800C422C(2); } -GLOBAL_ASM("asm/non_matchings/unknown_080500/func_80098208.s") +// Gets triggered when entering trophy race in adventure mode. +void func_80098208(void) { + Settings *settings = get_settings(); + gTrophyRaceWorldId = settings->worldId; + D_800E0FEC = 0; + settings->unk4C->unk0 = settings->courseId; + settings->unk4C->unkF = 0; + settings->unk4C->unk1 = 0; + D_800DF450 = 1; + func_8000E4BC(0); +} + + GLOBAL_ASM("asm/non_matchings/unknown_080500/MenuTrophyRaceRoundInit.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/func_800983C0.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/MenuTrophyRaceRoundLoop.s") @@ -644,8 +756,8 @@ void func_80099600(void) { func_800C422C(2); } -s32 is_in_trophy_race(void) { - return gIsInTrophyRace; +s32 get_trophy_race_world_id(void) { + return gTrophyRaceWorldId; } GLOBAL_ASM("asm/non_matchings/unknown_080500/func_8009963C.s") @@ -686,12 +798,23 @@ void func_8009ABD8(s8 *arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5) { D_80126804 = arg5; } -GLOBAL_ASM("asm/non_matchings/unknown_080500/Menu17Init.s") +void func_8009C674(s16 *arg0); + +void menu_17_init(void) { + if (D_80126804 != 0) { + func_8009C674(D_800E1768); + func_80094604(); + } + func_8006E2E8(D_801267EC[0], D_801267EC[1], D_801267EC[2]); + D_800DF47C = 0; + D_801263E0 = 0; +} + GLOBAL_ASM("asm/non_matchings/unknown_080500/Menu17Loop.s") void func_8009AF18(void) { if (D_80126804 != 0) { - func_8009C4A8((s16*)&D_800E1768); + func_8009C4A8(D_800E1768); } } @@ -751,7 +874,20 @@ s32 get_save_file_index(void) { return gSaveFileIndex; } -GLOBAL_ASM("asm/non_matchings/unknown_080500/func_8009C1B0.s") +s32 func_8009C1B0(void) { + Settings *settings = get_settings(); + if (D_800DF4B8 == 0 && D_800DF478 == 0) { + if (settings->newGame) { + return 0; + } else { + return settings->courseId; + } + } + D_800DF478 = 0; + return D_800DF4D4; +} + + GLOBAL_ASM("asm/non_matchings/unknown_080500/func_8009C228.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/func_8009C250.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/func_8009C274.s") @@ -779,14 +915,6 @@ void set_magic_code_flags(s32 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) { @@ -795,7 +923,7 @@ s32 func_8009C30C(void) { if (!func_8006B240()) { cheats &= ~4; // Clears MIRRORED_TRACKS cheat } - if ((func_8006B14C(func_8006EA90()->unk49) & 0x40) != 0) { + if ((func_8006B14C(get_settings()->courseId) & 0x40) != 0) { // Clears START_WITH_10_BANANAS, DISABLE_WEAPONS, DISABLE_BANANAS, and BALLOON cheats. cheats &= ~0xF9880; } @@ -809,13 +937,26 @@ s32 func_8009C3C8(void) { return D_800DF4BC; } -GLOBAL_ASM("asm/non_matchings/unknown_080500/func_8009C3D8.s") +typedef struct unk8006BDB0 { + u8 pad[0x4C]; + s8 unk4C; +} unk8006BDB0; + +s32 func_8009C3D8(void) { + unk8006BDB0 *temp = (unk8006BDB0*)func_8006BDB0(); + if (gIsInTwoPlayerAdventure && D_800DF4B8 == 0) { + if (temp->unk4C == 0 || (temp->unk4C & 0x40) != 0) { + return 2; + } + } + return D_800DF4BC; +} s32 func_8009C440(void) { if (D_800DF4B8 == 0) { return 6; } - if (gIsInTrophyRace) { + if (gTrophyRaceWorldId) { return 6; } return (D_800E0410 + 1) << 1; // Doesn't match with multiply. @@ -865,7 +1006,18 @@ void func_8009CF68(s32 arg0) { 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") + +void func_8009D118(s32 arg0) { + if (arg0 == 0) { + func_800C5000(1, 0, 0, 0x7F, 0x5A, 0xFF); + if (D_800DF4EC != 0) { + func_800C5000(1, 0, 0, 0x7F, 0x5A, 0x78); + } + } else { + func_800C5000(1, 0xCF, 0xCF, 0xCF, 0x5A, 0xFF); + } + D_800DF4EC = (u8)0; +} void func_8009D1B8(s32 arg0, s32 arg1, s32 arg2) { func_8009D118(D_801264D8 == D_80126504); diff --git a/undefined_syms.txt b/undefined_syms.txt index a99c7897..264b2b01 100755 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -487,6 +487,7 @@ D_800E0AA0 = 0x800E0AA0; D_800E0AB0 = 0x800E0AB0; D_800E0AC0 = 0x800E0AC0; D_800E0AD0 = 0x800E0AD0; +D_800E0AE0 = 0x800E0AE0; D_800E0AF0 = 0x800E0AF0; D_800E0B18 = 0x800E0B18; D_800E0BCC = 0x800E0BCC; @@ -512,7 +513,7 @@ D_800E0FB0 = 0x800E0FB0; D_800E0FB4 = 0x800E0FB4; D_800E0FD8 = 0x800E0FD8; D_800E0FE4 = 0x800E0FE4; -gIsInTrophyRace = 0x800E0FE8; +gTrophyRaceWorldId = 0x800E0FE8; D_800E0FEC = 0x800E0FEC; D_800E0FF0 = 0x800E0FF0; D_800E1004 = 0x800E1004; @@ -2190,7 +2191,7 @@ D_80123500 = 0x80123500; D_80123504 = 0x80123504; D_80123508 = 0x80123508; D_8012350C = 0x8012350C; -D_80123510 = 0x80123510; +gSettingsPtr = 0x80123510; D_80123514 = 0x80123514; D_80123515 = 0x80123515; D_80123516 = 0x80123516;