diff --git a/asm/assets/assets.s b/asm/assets/assets.s index cde8f70a..732511d8 100755 --- a/asm/assets/assets.s +++ b/asm/assets/assets.s @@ -5,7 +5,7 @@ .incbin "\filename" .endm -.incbin "./build/bin/unknown.0d8200.bin" +.incbin "./build/ucode/unknown_ucode.0d8200.bin" .incbin "./build/ucode/ucode_boot.0d90c0.bin" .incbin "./build/ucode/f3ddkr_dram.0d9190.bin" .incbin "./build/ucode/f3ddkr_fifo.0da390.bin" diff --git a/asm/non_matchings/unknown_005740/func_8000BADC.s b/asm/non_matchings/unknown_005740/func_8000BADC.s index 6a7fe438..a0684c07 100644 --- a/asm/non_matchings/unknown_005740/func_8000BADC.s +++ b/asm/non_matchings/unknown_005740/func_8000BADC.s @@ -60,8 +60,8 @@ glabel func_8000BADC /* 00C7BC 8000BBBC 24090002 */ li $t1, 2 /* 00C7C0 8000BBC0 46802420 */ cvt.s.w $f16, $f4 .L8000BBC4: -/* 00C7C4 8000BBC4 3C188000 */ lui $t8, %hi(D_80000300) # $t8, 0x8000 -/* 00C7C8 8000BBC8 8F180300 */ lw $t8, %lo(D_80000300)($t8) +/* 00C7C4 8000BBC4 3C188000 */ lui $t8, %hi(osTvType) # $t8, 0x8000 +/* 00C7C8 8000BBC8 8F180300 */ lw $t8, %lo(osTvType)($t8) /* 00C7CC 8000BBCC 46008086 */ mov.s $f2, $f16 /* 00C7D0 8000BBD0 17000005 */ bnez $t8, .L8000BBE8 /* 00C7D4 8000BBD4 3C01800E */ lui $at, %hi(D_800E5138) # $at, 0x800e diff --git a/asm/non_matchings/unknown_005740/func_8000C8B4.s b/asm/non_matchings/unknown_005740/func_8000C8B4.s index 7f6b4417..174c6b1d 100644 --- a/asm/non_matchings/unknown_005740/func_8000C8B4.s +++ b/asm/non_matchings/unknown_005740/func_8000C8B4.s @@ -1,6 +1,6 @@ glabel func_8000C8B4 -/* 00D4B4 8000C8B4 3C0E8000 */ lui $t6, %hi(D_80000300) # $t6, 0x8000 -/* 00D4B8 8000C8B8 8DCE0300 */ lw $t6, %lo(D_80000300)($t6) +/* 00D4B4 8000C8B4 3C0E8000 */ lui $t6, %hi(osTvType) # $t6, 0x8000 +/* 00D4B8 8000C8B8 8DCE0300 */ lw $t6, %lo(osTvType)($t6) /* 00D4BC 8000C8BC 00000000 */ nop /* 00D4C0 8000C8C0 15C00003 */ bnez $t6, .L8000C8D0 /* 00D4C4 8000C8C4 00000000 */ nop diff --git a/asm/non_matchings/unknown_005740/func_800120C8.s b/asm/non_matchings/unknown_005740/func_800120C8.s index 11761d04..ed8f39eb 100644 --- a/asm/non_matchings/unknown_005740/func_800120C8.s +++ b/asm/non_matchings/unknown_005740/func_800120C8.s @@ -460,7 +460,7 @@ glabel func_800120C8 /* 01336C 8001276C 81CF0053 */ lb $t7, 0x53($t6) /* 013370 80012770 8FB900B4 */ lw $t9, 0xb4($sp) /* 013374 80012774 15E10003 */ bne $t7, $at, .L80012784 -/* 013378 80012778 3C0D8000 */ lui $t5, %hi(D_80000310) # $t5, 0x8000 +/* 013378 80012778 3C0D8000 */ lui $t5, %hi(osCicId) # $t5, 0x8000 /* 01337C 8001277C 10000002 */ b .L80012788 /* 013380 80012780 2409010A */ li $t1, 266 .L80012784: @@ -471,7 +471,7 @@ glabel func_800120C8 /* 013390 80012790 35380004 */ ori $t8, $t1, 4 /* 013394 80012794 03004825 */ move $t1, $t8 .L80012798: -/* 013398 80012798 8DAD0310 */ lw $t5, %lo(D_80000310)($t5) +/* 013398 80012798 8DAD0310 */ lw $t5, %lo(osCicId)($t5) /* 01339C 8001279C 240117D7 */ li $at, 6103 /* 0133A0 800127A0 11A10002 */ beq $t5, $at, .L800127AC /* 0133A4 800127A4 00000000 */ nop diff --git a/asm/non_matchings/unknown_005740/func_8001A8F4.s b/asm/non_matchings/unknown_005740/func_8001A8F4.s index 2854ece1..64525158 100644 --- a/asm/non_matchings/unknown_005740/func_8001A8F4.s +++ b/asm/non_matchings/unknown_005740/func_8001A8F4.s @@ -300,8 +300,8 @@ glabel func_8001A8F4 /* 01B954 8001AD54 00000000 */ nop /* 01B958 8001AD58 304A0040 */ andi $t2, $v0, 0x40 /* 01B95C 8001AD5C 15400013 */ bnez $t2, .L8001ADAC -/* 01B960 8001AD60 3C0C8000 */ lui $t4, %hi(D_80000300) # $t4, 0x8000 -/* 01B964 8001AD64 8D8C0300 */ lw $t4, %lo(D_80000300)($t4) +/* 01B960 8001AD60 3C0C8000 */ lui $t4, %hi(osTvType) # $t4, 0x8000 +/* 01B964 8001AD64 8D8C0300 */ lw $t4, %lo(osTvType)($t4) /* 01B968 8001AD68 8FAE0040 */ lw $t6, 0x40($sp) /* 01B96C 8001AD6C 15800003 */ bnez $t4, .L8001AD7C /* 01B970 8001AD70 2402021C */ li $v0, 540 diff --git a/asm/non_matchings/unknown_005740/func_8001AE64.s b/asm/non_matchings/unknown_005740/func_8001AE64.s index 0fe7a2be..007dc038 100644 --- a/asm/non_matchings/unknown_005740/func_8001AE64.s +++ b/asm/non_matchings/unknown_005740/func_8001AE64.s @@ -232,8 +232,8 @@ glabel func_8001AE64 /* 01BDC8 8001B1C8 240B0005 */ li $t3, 5 /* 01BDCC 8001B1CC A02FC730 */ sb $t7, %lo(D_800DC730)($at) .L8001B1D0: -/* 01BDD0 8001B1D0 3C198000 */ lui $t9, %hi(D_80000300) # $t9, 0x8000 -/* 01BDD4 8001B1D4 8F390300 */ lw $t9, %lo(D_80000300)($t9) +/* 01BDD0 8001B1D0 3C198000 */ lui $t9, %hi(osTvType) # $t9, 0x8000 +/* 01BDD4 8001B1D4 8F390300 */ lw $t9, %lo(osTvType)($t9) /* 01BDD8 8001B1D8 00107080 */ sll $t6, $s0, 2 /* 01BDDC 8001B1DC 17200010 */ bnez $t9, .L8001B220 /* 01BDE0 8001B1E0 3C188012 */ lui $t8, %hi(D_8011AE80) # $t8, 0x8012 diff --git a/asm/non_matchings/unknown_005740/func_8001C6C4.s b/asm/non_matchings/unknown_005740/func_8001C6C4.s index 31fcf382..b2430e4b 100644 --- a/asm/non_matchings/unknown_005740/func_8001C6C4.s +++ b/asm/non_matchings/unknown_005740/func_8001C6C4.s @@ -1,7 +1,7 @@ glabel func_8001C6C4 /* 01D2C4 8001C6C4 27BDFF18 */ addiu $sp, $sp, -0xe8 -/* 01D2C8 8001C6C8 3C0E8000 */ lui $t6, %hi(D_80000300) # $t6, 0x8000 -/* 01D2CC 8001C6CC 8DCE0300 */ lw $t6, %lo(D_80000300)($t6) +/* 01D2C8 8001C6C8 3C0E8000 */ lui $t6, %hi(osTvType) # $t6, 0x8000 +/* 01D2CC 8001C6CC 8DCE0300 */ lw $t6, %lo(osTvType)($t6) /* 01D2D0 8001C6D0 AFB2004C */ sw $s2, 0x4c($sp) /* 01D2D4 8001C6D4 00809025 */ move $s2, $a0 /* 01D2D8 8001C6D8 AFBF005C */ sw $ra, 0x5c($sp) diff --git a/asm/non_matchings/unknown_005740/func_8001F460.s b/asm/non_matchings/unknown_005740/func_8001F460.s index 5f51503d..83c340d0 100644 --- a/asm/non_matchings/unknown_005740/func_8001F460.s +++ b/asm/non_matchings/unknown_005740/func_8001F460.s @@ -29,9 +29,9 @@ glabel func_8001F460 /* 0200C8 8001F4C8 AFB8019C */ sw $t8, 0x19c($sp) .L8001F4CC: /* 0200CC 8001F4CC 8FB9019C */ lw $t9, 0x19c($sp) -/* 0200D0 8001F4D0 3C0E8000 */ lui $t6, %hi(D_80000300) # $t6, 0x8000 +/* 0200D0 8001F4D0 3C0E8000 */ lui $t6, %hi(osTvType) # $t6, 0x8000 /* 0200D4 8001F4D4 44992000 */ mtc1 $t9, $f4 -/* 0200D8 8001F4D8 8DCE0300 */ lw $t6, %lo(D_80000300)($t6) +/* 0200D8 8001F4D8 8DCE0300 */ lw $t6, %lo(osTvType)($t6) /* 0200DC 8001F4DC 46802020 */ cvt.s.w $f0, $f4 /* 0200E0 8001F4E0 3C01800E */ lui $at, %hi(D_800E5674) # $at, 0x800e /* 0200E4 8001F4E4 00008025 */ move $s0, $zero diff --git a/asm/non_matchings/unknown_0255E0/D_80024D54.s b/asm/non_matchings/unknown_0255E0/D_80024D54.s index 87d95714..8c4441d2 100644 --- a/asm/non_matchings/unknown_0255E0/D_80024D54.s +++ b/asm/non_matchings/unknown_0255E0/D_80024D54.s @@ -454,8 +454,8 @@ glabel D_80024D54 /* 026008 80025408 00403825 */ move $a3, $v0 /* 02600C 8002540C 0C0310BB */ jal func_800C42EC /* 026010 80025410 00002025 */ move $a0, $zero -/* 026014 80025414 3C198000 */ lui $t9, %hi(D_80000300) # $t9, 0x8000 -/* 026018 80025418 8F390300 */ lw $t9, %lo(D_80000300)($t9) +/* 026014 80025414 3C198000 */ lui $t9, %hi(osTvType) # $t9, 0x8000 +/* 026018 80025418 8F390300 */ lw $t9, %lo(osTvType)($t9) /* 02601C 8002541C 02202025 */ move $a0, $s1 /* 026020 80025420 17200004 */ bnez $t9, .L80025434 /* 026024 80025424 3C07800E */ lui $a3, %hi(D_800E5DF0) # $a3, 0x800e diff --git a/asm/non_matchings/unknown_0255E0/func_800289B8.s b/asm/non_matchings/unknown_0255E0/func_800289B8.s index 19b32d99..6d7d0fe0 100644 --- a/asm/non_matchings/unknown_0255E0/func_800289B8.s +++ b/asm/non_matchings/unknown_0255E0/func_800289B8.s @@ -52,10 +52,10 @@ glabel func_800289B8 /* 029680 80028A80 AE0F0000 */ sw $t7, ($s0) /* 029684 80028A84 37180020 */ ori $t8, (0x05100020 & 0xFFFF) # ori $t8, $t8, 0x20 /* 029688 80028A88 00E8C821 */ addu $t9, $a3, $t0 -/* 02968C 80028A8C 3C0E8000 */ lui $t6, %hi(D_80000300) # $t6, 0x8000 +/* 02968C 80028A8C 3C0E8000 */ lui $t6, %hi(osTvType) # $t6, 0x8000 /* 029690 80028A90 AC590004 */ sw $t9, 4($v0) /* 029694 80028A94 AC580000 */ sw $t8, ($v0) -/* 029698 80028A98 8DCE0300 */ lw $t6, %lo(D_80000300)($t6) +/* 029698 80028A98 8DCE0300 */ lw $t6, %lo(osTvType)($t6) /* 02969C 80028A9C 2410FF6A */ li $s0, -150 /* 0296A0 80028AA0 15C00004 */ bnez $t6, .L80028AB4 /* 0296A4 80028AA4 24040096 */ li $a0, 150 diff --git a/asm/non_matchings/unknown_032760/func_80033F60.s b/asm/non_matchings/unknown_032760/func_80033F60.s index 868184b5..ae522d9c 100644 --- a/asm/non_matchings/unknown_032760/func_80033F60.s +++ b/asm/non_matchings/unknown_032760/func_80033F60.s @@ -1,9 +1,9 @@ glabel func_80033F60 /* 034B60 80033F60 27BDFF78 */ addiu $sp, $sp, -0x88 /* 034B64 80033F64 44852000 */ mtc1 $a1, $f4 -/* 034B68 80033F68 3C0F8000 */ lui $t7, %hi(D_80000300) # $t7, 0x8000 +/* 034B68 80033F68 3C0F8000 */ lui $t7, %hi(osTvType) # $t7, 0x8000 /* 034B6C 80033F6C 46802020 */ cvt.s.w $f0, $f4 -/* 034B70 80033F70 8DEF0300 */ lw $t7, %lo(D_80000300)($t7) +/* 034B70 80033F70 8DEF0300 */ lw $t7, %lo(osTvType)($t7) /* 034B74 80033F74 AFBF002C */ sw $ra, 0x2c($sp) /* 034B78 80033F78 AFB00028 */ sw $s0, 0x28($sp) /* 034B7C 80033F7C AFA5008C */ sw $a1, 0x8c($sp) diff --git a/asm/non_matchings/unknown_032760/func_80034860.s b/asm/non_matchings/unknown_032760/func_80034860.s index 0bd05489..819fcadb 100644 --- a/asm/non_matchings/unknown_032760/func_80034860.s +++ b/asm/non_matchings/unknown_032760/func_80034860.s @@ -1,8 +1,8 @@ glabel func_80034860 /* 035460 80034860 44852000 */ mtc1 $a1, $f4 -/* 035464 80034864 3C0F8000 */ lui $t7, %hi(D_80000300) # $t7, 0x8000 +/* 035464 80034864 3C0F8000 */ lui $t7, %hi(osTvType) # $t7, 0x8000 /* 035468 80034868 468020A0 */ cvt.s.w $f2, $f4 -/* 03546C 8003486C 8DEF0300 */ lw $t7, %lo(D_80000300)($t7) +/* 03546C 8003486C 8DEF0300 */ lw $t7, %lo(osTvType)($t7) /* 035470 80034870 27BDFFA0 */ addiu $sp, $sp, -0x60 /* 035474 80034874 AFB00028 */ sw $s0, 0x28($sp) /* 035478 80034878 00808025 */ move $s0, $a0 diff --git a/asm/non_matchings/unknown_032760/func_80035260.s b/asm/non_matchings/unknown_032760/func_80035260.s index c852bce2..ab76416b 100644 --- a/asm/non_matchings/unknown_032760/func_80035260.s +++ b/asm/non_matchings/unknown_032760/func_80035260.s @@ -1,9 +1,9 @@ glabel func_80035260 /* 035E60 80035260 27BDFFA8 */ addiu $sp, $sp, -0x58 /* 035E64 80035264 44852000 */ mtc1 $a1, $f4 -/* 035E68 80035268 3C0E8000 */ lui $t6, %hi(D_80000300) # $t6, 0x8000 +/* 035E68 80035268 3C0E8000 */ lui $t6, %hi(osTvType) # $t6, 0x8000 /* 035E6C 8003526C 468020A0 */ cvt.s.w $f2, $f4 -/* 035E70 80035270 8DCE0300 */ lw $t6, %lo(D_80000300)($t6) +/* 035E70 80035270 8DCE0300 */ lw $t6, %lo(osTvType)($t6) /* 035E74 80035274 AFBF0024 */ sw $ra, 0x24($sp) /* 035E78 80035278 AFB10020 */ sw $s1, 0x20($sp) /* 035E7C 8003527C AFB0001C */ sw $s0, 0x1c($sp) diff --git a/asm/non_matchings/unknown_032760/func_800361E0.s b/asm/non_matchings/unknown_032760/func_800361E0.s index 0b930458..0b04e4ea 100644 --- a/asm/non_matchings/unknown_032760/func_800361E0.s +++ b/asm/non_matchings/unknown_032760/func_800361E0.s @@ -5,10 +5,10 @@ glabel func_800361E0 /* 036DEC 800361EC AFB10028 */ sw $s1, 0x28($sp) /* 036DF0 800361F0 AFB00024 */ sw $s0, 0x24($sp) /* 036DF4 800361F4 AFA50084 */ sw $a1, 0x84($sp) -/* 036DF8 800361F8 3C0F8000 */ lui $t7, %hi(D_80000300) # $t7, 0x8000 +/* 036DF8 800361F8 3C0F8000 */ lui $t7, %hi(osTvType) # $t7, 0x8000 /* 036DFC 800361FC 46803020 */ cvt.s.w $f0, $f6 /* 036E00 80036200 C4840010 */ lwc1 $f4, 0x10($a0) -/* 036E04 80036204 8DEF0300 */ lw $t7, %lo(D_80000300)($t7) +/* 036E04 80036204 8DEF0300 */ lw $t7, %lo(osTvType)($t7) /* 036E08 80036208 00808025 */ move $s0, $a0 /* 036E0C 8003620C 46000086 */ mov.s $f2, $f0 /* 036E10 80036210 15E00007 */ bnez $t7, .L80036230 diff --git a/asm/non_matchings/unknown_032760/func_800389B8.s b/asm/non_matchings/unknown_032760/func_800389B8.s index f1be889d..8df7043f 100644 --- a/asm/non_matchings/unknown_032760/func_800389B8.s +++ b/asm/non_matchings/unknown_032760/func_800389B8.s @@ -1,8 +1,8 @@ glabel func_800389B8 /* 0395B8 800389B8 44852000 */ mtc1 $a1, $f4 -/* 0395BC 800389BC 3C0E8000 */ lui $t6, %hi(D_80000300) # $t6, 0x8000 +/* 0395BC 800389BC 3C0E8000 */ lui $t6, %hi(osTvType) # $t6, 0x8000 /* 0395C0 800389C0 468020A0 */ cvt.s.w $f2, $f4 -/* 0395C4 800389C4 8DCE0300 */ lw $t6, %lo(D_80000300)($t6) +/* 0395C4 800389C4 8DCE0300 */ lw $t6, %lo(osTvType)($t6) /* 0395C8 800389C8 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 0395CC 800389CC AFBF0014 */ sw $ra, 0x14($sp) /* 0395D0 800389D0 15C00007 */ bnez $t6, .L800389F0 diff --git a/asm/non_matchings/unknown_032760/func_80038AD4.s b/asm/non_matchings/unknown_032760/func_80038AD4.s index 73cc6db9..cb02f03f 100644 --- a/asm/non_matchings/unknown_032760/func_80038AD4.s +++ b/asm/non_matchings/unknown_032760/func_80038AD4.s @@ -1,8 +1,8 @@ glabel func_80038AD4 /* 0396D4 80038AD4 44852000 */ mtc1 $a1, $f4 -/* 0396D8 80038AD8 3C0E8000 */ lui $t6, %hi(D_80000300) # $t6, 0x8000 +/* 0396D8 80038AD8 3C0E8000 */ lui $t6, %hi(osTvType) # $t6, 0x8000 /* 0396DC 80038ADC 468020A0 */ cvt.s.w $f2, $f4 -/* 0396E0 80038AE0 8DCE0300 */ lw $t6, %lo(D_80000300)($t6) +/* 0396E0 80038AE0 8DCE0300 */ lw $t6, %lo(osTvType)($t6) /* 0396E4 80038AE4 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 0396E8 80038AE8 AFBF0014 */ sw $ra, 0x14($sp) /* 0396EC 80038AEC 15C00007 */ bnez $t6, .L80038B0C diff --git a/asm/non_matchings/unknown_032760/func_80039330.s b/asm/non_matchings/unknown_032760/func_80039330.s index 35b7e963..c94b646c 100644 --- a/asm/non_matchings/unknown_032760/func_80039330.s +++ b/asm/non_matchings/unknown_032760/func_80039330.s @@ -6,10 +6,10 @@ glabel func_80039330 /* 039F40 80039340 AFB00024 */ sw $s0, 0x24($sp) /* 039F44 80039344 AFA500B4 */ sw $a1, 0xb4($sp) /* 039F48 80039348 A3A0006B */ sb $zero, 0x6b($sp) -/* 039F4C 8003934C 3C0F8000 */ lui $t7, %hi(D_80000300) # $t7, 0x8000 +/* 039F4C 8003934C 3C0F8000 */ lui $t7, %hi(osTvType) # $t7, 0x8000 /* 039F50 80039350 468030A0 */ cvt.s.w $f2, $f6 /* 039F54 80039354 C4840010 */ lwc1 $f4, 0x10($a0) -/* 039F58 80039358 8DEF0300 */ lw $t7, %lo(D_80000300)($t7) +/* 039F58 80039358 8DEF0300 */ lw $t7, %lo(osTvType)($t7) /* 039F5C 8003935C 00808025 */ move $s0, $a0 /* 039F60 80039360 46001006 */ mov.s $f0, $f2 /* 039F64 80039364 15E00007 */ bnez $t7, .L80039384 diff --git a/asm/non_matchings/unknown_032760/func_8003B4BC.s b/asm/non_matchings/unknown_032760/func_8003B4BC.s index fb6bd7b0..286ac525 100644 --- a/asm/non_matchings/unknown_032760/func_8003B4BC.s +++ b/asm/non_matchings/unknown_032760/func_8003B4BC.s @@ -1,9 +1,9 @@ glabel func_8003B4BC /* 03C0BC 8003B4BC 44852000 */ mtc1 $a1, $f4 /* 03C0C0 8003B4C0 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 03C0C4 8003B4C4 3C0F8000 */ lui $t7, %hi(D_80000300) # $t7, 0x8000 +/* 03C0C4 8003B4C4 3C0F8000 */ lui $t7, %hi(osTvType) # $t7, 0x8000 /* 03C0C8 8003B4C8 46802020 */ cvt.s.w $f0, $f4 -/* 03C0CC 8003B4CC 8DEF0300 */ lw $t7, %lo(D_80000300)($t7) +/* 03C0CC 8003B4CC 8DEF0300 */ lw $t7, %lo(osTvType)($t7) /* 03C0D0 8003B4D0 AFB10020 */ sw $s1, 0x20($sp) /* 03C0D4 8003B4D4 00808825 */ move $s1, $a0 /* 03C0D8 8003B4D8 AFBF0024 */ sw $ra, 0x24($sp) diff --git a/asm/non_matchings/unknown_032760/func_8003B988.s b/asm/non_matchings/unknown_032760/func_8003B988.s index 06f05d1a..86301631 100644 --- a/asm/non_matchings/unknown_032760/func_8003B988.s +++ b/asm/non_matchings/unknown_032760/func_8003B988.s @@ -4,10 +4,10 @@ glabel func_8003B988 /* 03C590 8003B990 AFBF0024 */ sw $ra, 0x24($sp) /* 03C594 8003B994 AFB00020 */ sw $s0, 0x20($sp) /* 03C598 8003B998 AFA50064 */ sw $a1, 0x64($sp) -/* 03C59C 8003B99C 3C188000 */ lui $t8, %hi(D_80000300) # $t8, 0x8000 +/* 03C59C 8003B99C 3C188000 */ lui $t8, %hi(osTvType) # $t8, 0x8000 /* 03C5A0 8003B9A0 46802020 */ cvt.s.w $f0, $f4 /* 03C5A4 8003B9A4 8C8E003C */ lw $t6, 0x3c($a0) -/* 03C5A8 8003B9A8 8F180300 */ lw $t8, %lo(D_80000300)($t8) +/* 03C5A8 8003B9A8 8F180300 */ lw $t8, %lo(osTvType)($t8) /* 03C5AC 8003B9AC 00808025 */ move $s0, $a0 /* 03C5B0 8003B9B0 46000086 */ mov.s $f2, $f0 /* 03C5B4 8003B9B4 17000007 */ bnez $t8, .L8003B9D4 diff --git a/asm/non_matchings/unknown_032760/func_8003CA68.s b/asm/non_matchings/unknown_032760/func_8003CA68.s index ce308981..c7795619 100644 --- a/asm/non_matchings/unknown_032760/func_8003CA68.s +++ b/asm/non_matchings/unknown_032760/func_8003CA68.s @@ -4,9 +4,9 @@ glabel func_8003CA68 /* 03D670 8003CA70 AFBF0024 */ sw $ra, 0x24($sp) /* 03D674 8003CA74 AFB00020 */ sw $s0, 0x20($sp) /* 03D678 8003CA78 AFA50074 */ sw $a1, 0x74($sp) -/* 03D67C 8003CA7C 3C0F8000 */ lui $t7, %hi(D_80000300) # $t7, 0x8000 +/* 03D67C 8003CA7C 3C0F8000 */ lui $t7, %hi(osTvType) # $t7, 0x8000 /* 03D680 8003CA80 46802020 */ cvt.s.w $f0, $f4 -/* 03D684 8003CA84 8DEF0300 */ lw $t7, %lo(D_80000300)($t7) +/* 03D684 8003CA84 8DEF0300 */ lw $t7, %lo(osTvType)($t7) /* 03D688 8003CA88 8C830064 */ lw $v1, 0x64($a0) /* 03D68C 8003CA8C 8C88003C */ lw $t0, 0x3c($a0) /* 03D690 8003CA90 00808025 */ move $s0, $a0 diff --git a/asm/non_matchings/unknown_032760/func_8003D2B8.s b/asm/non_matchings/unknown_032760/func_8003D2B8.s index 673867c1..67a404ab 100644 --- a/asm/non_matchings/unknown_032760/func_8003D2B8.s +++ b/asm/non_matchings/unknown_032760/func_8003D2B8.s @@ -1,8 +1,8 @@ glabel func_8003D2B8 /* 03DEB8 8003D2B8 44852000 */ mtc1 $a1, $f4 -/* 03DEBC 8003D2BC 3C0F8000 */ lui $t7, %hi(D_80000300) # $t7, 0x8000 +/* 03DEBC 8003D2BC 3C0F8000 */ lui $t7, %hi(osTvType) # $t7, 0x8000 /* 03DEC0 8003D2C0 468020A0 */ cvt.s.w $f2, $f4 -/* 03DEC4 8003D2C4 8DEF0300 */ lw $t7, %lo(D_80000300)($t7) +/* 03DEC4 8003D2C4 8DEF0300 */ lw $t7, %lo(osTvType)($t7) /* 03DEC8 8003D2C8 27BDFFD8 */ addiu $sp, $sp, -0x28 /* 03DECC 8003D2CC AFB00018 */ sw $s0, 0x18($sp) /* 03DED0 8003D2D0 00808025 */ move $s0, $a0 diff --git a/asm/non_matchings/unknown_032760/func_8003D5A0.s b/asm/non_matchings/unknown_032760/func_8003D5A0.s index bdec07d6..523369e1 100644 --- a/asm/non_matchings/unknown_032760/func_8003D5A0.s +++ b/asm/non_matchings/unknown_032760/func_8003D5A0.s @@ -1,8 +1,8 @@ glabel func_8003D5A0 /* 03E1A0 8003D5A0 44852000 */ mtc1 $a1, $f4 -/* 03E1A4 8003D5A4 3C0F8000 */ lui $t7, %hi(D_80000300) # $t7, 0x8000 +/* 03E1A4 8003D5A4 3C0F8000 */ lui $t7, %hi(osTvType) # $t7, 0x8000 /* 03E1A8 8003D5A8 468020A0 */ cvt.s.w $f2, $f4 -/* 03E1AC 8003D5AC 8DEF0300 */ lw $t7, %lo(D_80000300)($t7) +/* 03E1AC 8003D5AC 8DEF0300 */ lw $t7, %lo(osTvType)($t7) /* 03E1B0 8003D5B0 27BDFF90 */ addiu $sp, $sp, -0x70 /* 03E1B4 8003D5B4 AFB00020 */ sw $s0, 0x20($sp) /* 03E1B8 8003D5B8 00808025 */ move $s0, $a0 diff --git a/asm/non_matchings/unknown_032760/func_8003E694.s b/asm/non_matchings/unknown_032760/func_8003E694.s index e87cf001..181b488d 100644 --- a/asm/non_matchings/unknown_032760/func_8003E694.s +++ b/asm/non_matchings/unknown_032760/func_8003E694.s @@ -44,9 +44,9 @@ glabel func_8003E694 /* 03F33C 8003E73C 0C01BD93 */ jal func_8006F64C /* 03F340 8003E740 27A40054 */ addiu $a0, $sp, 0x54 /* 03F344 8003E744 8FAB00EC */ lw $t3, 0xec($sp) -/* 03F348 8003E748 3C0C8000 */ lui $t4, %hi(D_80000300) # $t4, 0x8000 +/* 03F348 8003E748 3C0C8000 */ lui $t4, %hi(osTvType) # $t4, 0x8000 /* 03F34C 8003E74C 448B8000 */ mtc1 $t3, $f16 -/* 03F350 8003E750 8D8C0300 */ lw $t4, %lo(D_80000300)($t4) +/* 03F350 8003E750 8D8C0300 */ lw $t4, %lo(osTvType)($t4) /* 03F354 8003E754 46808020 */ cvt.s.w $f0, $f16 /* 03F358 8003E758 3C01800E */ lui $at, %hi(D_800E61F4) # $at, 0x800e /* 03F35C 8003E75C 15800006 */ bnez $t4, .L8003E778 diff --git a/asm/non_matchings/unknown_032760/func_8003F2E8.s b/asm/non_matchings/unknown_032760/func_8003F2E8.s index 988deaea..ea56a6df 100644 --- a/asm/non_matchings/unknown_032760/func_8003F2E8.s +++ b/asm/non_matchings/unknown_032760/func_8003F2E8.s @@ -7,9 +7,9 @@ glabel func_8003F2E8 /* 03FEFC 8003F2FC 44852000 */ mtc1 $a1, $f4 /* 03FF00 8003F300 AFAE0040 */ sw $t6, 0x40($sp) /* 03FF04 8003F304 8DD80004 */ lw $t8, 4($t6) -/* 03FF08 8003F308 3C0B8000 */ lui $t3, %hi(D_80000300) # $t3, 0x8000 +/* 03FF08 8003F308 3C0B8000 */ lui $t3, %hi(osTvType) # $t3, 0x8000 /* 03FF0C 8003F30C 468020A0 */ cvt.s.w $f2, $f4 -/* 03FF10 8003F310 8D6B0300 */ lw $t3, %lo(D_80000300)($t3) +/* 03FF10 8003F310 8D6B0300 */ lw $t3, %lo(osTvType)($t3) /* 03FF14 8003F314 8F190064 */ lw $t9, 0x64($t8) /* 03FF18 8003F318 00808025 */ move $s0, $a0 /* 03FF1C 8003F31C 46001006 */ mov.s $f0, $f2 diff --git a/asm/non_matchings/unknown_032760/func_800422F0.s b/asm/non_matchings/unknown_032760/func_800422F0.s index 2bd1a587..33b77973 100644 --- a/asm/non_matchings/unknown_032760/func_800422F0.s +++ b/asm/non_matchings/unknown_032760/func_800422F0.s @@ -1,9 +1,9 @@ glabel func_800422F0 /* 042EF0 800422F0 27BDFEF0 */ addiu $sp, $sp, -0x110 /* 042EF4 800422F4 44852000 */ mtc1 $a1, $f4 -/* 042EF8 800422F8 3C0E8000 */ lui $t6, %hi(D_80000300) # $t6, 0x8000 +/* 042EF8 800422F8 3C0E8000 */ lui $t6, %hi(osTvType) # $t6, 0x8000 /* 042EFC 800422FC 46802020 */ cvt.s.w $f0, $f4 -/* 042F00 80042300 8DCE0300 */ lw $t6, %lo(D_80000300)($t6) +/* 042F00 80042300 8DCE0300 */ lw $t6, %lo(osTvType)($t6) /* 042F04 80042304 AFB10030 */ sw $s1, 0x30($sp) /* 042F08 80042308 00808825 */ move $s1, $a0 /* 042F0C 8004230C AFBF0034 */ sw $ra, 0x34($sp) diff --git a/asm/non_matchings/unknown_032760/func_80042A90.s b/asm/non_matchings/unknown_032760/func_80042A90.s index 53cb63ae..8964ea14 100644 --- a/asm/non_matchings/unknown_032760/func_80042A90.s +++ b/asm/non_matchings/unknown_032760/func_80042A90.s @@ -65,8 +65,8 @@ glabel func_80042A90 /* 043784 80042B84 00003025 */ move $a2, $zero /* 043788 80042B88 24430018 */ addiu $v1, $v0, 0x18 /* 04378C 80042B8C 00035843 */ sra $t3, $v1, 1 -/* 043790 80042B90 3C0F8000 */ lui $t7, %hi(D_80000300) # $t7, 0x8000 -/* 043794 80042B94 8DEF0300 */ lw $t7, %lo(D_80000300)($t7) +/* 043790 80042B90 3C0F8000 */ lui $t7, %hi(osTvType) # $t7, 0x8000 +/* 043794 80042B94 8DEF0300 */ lw $t7, %lo(osTvType)($t7) /* 043798 80042B98 240C00A0 */ li $t4, 160 /* 04379C 80042B9C 018B6823 */ subu $t5, $t4, $t3 /* 0437A0 80042BA0 256E00A0 */ addiu $t6, $t3, 0xa0 diff --git a/asm/non_matchings/unknown_043920/func_8004DE38.s b/asm/non_matchings/unknown_043920/func_8004DE38.s index f7edd30e..ae35bd18 100644 --- a/asm/non_matchings/unknown_043920/func_8004DE38.s +++ b/asm/non_matchings/unknown_043920/func_8004DE38.s @@ -42,7 +42,7 @@ glabel func_8004DE38 /* 04EAD4 8004DED4 E62E0020 */ swc1 $f14, 0x20($s1) .L8004DED8: /* 04EAD8 8004DED8 C6260024 */ lwc1 $f6, 0x24($s1) -/* 04EADC 8004DEDC 3C188000 */ lui $t8, %hi(D_80000300) # $t8, 0x8000 +/* 04EADC 8004DEDC 3C188000 */ lui $t8, %hi(osTvType) # $t8, 0x8000 /* 04EAE0 8004DEE0 46003221 */ cvt.d.s $f8, $f6 /* 04EAE4 8004DEE4 4628103C */ c.lt.d $f2, $f8 /* 04EAE8 8004DEE8 00000000 */ nop @@ -146,7 +146,7 @@ glabel func_8004DE38 /* 04EC48 8004E048 00000000 */ nop /* 04EC4C 8004E04C A20001F1 */ sb $zero, 0x1f1($s0) .L8004E050: -/* 04EC50 8004E050 8F180300 */ lw $t8, %lo(D_80000300)($t8) +/* 04EC50 8004E050 8F180300 */ lw $t8, %lo(osTvType)($t8) /* 04EC54 8004E054 3C01800E */ lui $at, %hi(D_800E6594) # $at, 0x800e /* 04EC58 8004E058 17000006 */ bnez $t8, .L8004E074 /* 04EC5C 8004E05C 00000000 */ nop diff --git a/asm/non_matchings/unknown_043920/func_80059E40.s b/asm/non_matchings/unknown_043920/func_80059E40.s index 529cf79e..4c9b9b7f 100644 --- a/asm/non_matchings/unknown_043920/func_80059E40.s +++ b/asm/non_matchings/unknown_043920/func_80059E40.s @@ -15,11 +15,11 @@ glabel func_80059E40 /* 05AA74 80059E74 24050002 */ li $a1, 2 .L80059E78: /* 05AA78 80059E78 8E0F0078 */ lw $t7, 0x78($s0) -/* 05AA7C 80059E7C 3C188000 */ lui $t8, %hi(D_80000300) # $t8, 0x8000 +/* 05AA7C 80059E7C 3C188000 */ lui $t8, %hi(osTvType) # $t8, 0x8000 /* 05AA80 80059E80 448F2000 */ mtc1 $t7, $f4 /* 05AA84 80059E84 44813000 */ mtc1 $at, $f6 /* 05AA88 80059E88 46802020 */ cvt.s.w $f0, $f4 -/* 05AA8C 80059E8C 8F180300 */ lw $t8, %lo(D_80000300)($t8) +/* 05AA8C 80059E8C 8F180300 */ lw $t8, %lo(osTvType)($t8) /* 05AA90 80059E90 00057040 */ sll $t6, $a1, 1 /* 05AA94 80059E94 1700000E */ bnez $t8, .L80059ED0 /* 05AA98 80059E98 46060083 */ div.s $f2, $f0, $f6 diff --git a/asm/non_matchings/unknown_066AA0/func_80066CDC.s b/asm/non_matchings/unknown_066AA0/func_80066CDC.s index 4506658d..352b7d17 100644 --- a/asm/non_matchings/unknown_066AA0/func_80066CDC.s +++ b/asm/non_matchings/unknown_066AA0/func_80066CDC.s @@ -148,8 +148,8 @@ glabel func_80066CDC /* 067B18 80066F18 3049FFFF */ andi $t1, $v0, 0xffff /* 067B1C 80066F1C 24030003 */ li $v1, 3 .L80066F20: -/* 067B20 80066F20 3C0A8000 */ lui $t2, %hi(D_80000300) # $t2, 0x8000 -/* 067B24 80066F24 8D4A0300 */ lw $t2, %lo(D_80000300)($t2) +/* 067B20 80066F20 3C0A8000 */ lui $t2, %hi(osTvType) # $t2, 0x8000 +/* 067B24 80066F24 8D4A0300 */ lw $t2, %lo(osTvType)($t2) /* 067B28 80066F28 00093042 */ srl $a2, $t1, 1 /* 067B2C 80066F2C AFA60054 */ sw $a2, 0x54($sp) /* 067B30 80066F30 15400003 */ bnez $t2, .L80066F40 @@ -211,7 +211,7 @@ glabel func_80066CDC /* 067C00 80067000 46048400 */ add.s $f16, $f16, $f4 .L80067004: /* 067C04 80067004 46008482 */ mul.s $f18, $f16, $f0 -/* 067C08 80067008 3C0A8000 */ lui $t2, %hi(D_80000300) # $t2, 0x8000 +/* 067C08 80067008 3C0A8000 */ lui $t2, %hi(osTvType) # $t2, 0x8000 /* 067C0C 8006700C 00A03825 */ move $a3, $a1 /* 067C10 80067010 444FF800 */ cfc1 $t7, $31 /* 067C14 80067014 00000000 */ nop @@ -225,7 +225,7 @@ glabel func_80066CDC /* 067C34 80067034 332E0FFF */ andi $t6, $t9, 0xfff /* 067C38 80067038 030E7825 */ or $t7, $t8, $t6 /* 067C3C 8006703C AC6F0004 */ sw $t7, 4($v1) -/* 067C40 80067040 8D4A0300 */ lw $t2, %lo(D_80000300)($t2) +/* 067C40 80067040 8D4A0300 */ lw $t2, %lo(osTvType)($t2) /* 067C44 80067044 10000267 */ b .L800679E4 /* 067C48 80067048 AFA5004C */ sw $a1, 0x4c($sp) .L8006704C: @@ -360,8 +360,8 @@ glabel func_80066CDC /* 067E30 80067230 01F97025 */ or $t6, $t7, $t9 /* 067E34 80067234 AC8E0004 */ sw $t6, 4($a0) .L80067238: -/* 067E38 80067238 3C0A8000 */ lui $t2, %hi(D_80000300) # $t2, 0x8000 -/* 067E3C 8006723C 8D4A0300 */ lw $t2, %lo(D_80000300)($t2) +/* 067E38 80067238 3C0A8000 */ lui $t2, %hi(osTvType) # $t2, 0x8000 +/* 067E3C 8006723C 8D4A0300 */ lw $t2, %lo(osTvType)($t2) /* 067E40 80067240 AFA5004C */ sw $a1, 0x4c($sp) /* 067E44 80067244 100001E7 */ b .L800679E4 /* 067E48 80067248 00A03825 */ move $a3, $a1 @@ -369,7 +369,7 @@ glabel func_80066CDC /* 067E4C 8006724C 8FF80000 */ lw $t8, ($ra) /* 067E50 80067250 8FAB0058 */ lw $t3, 0x58($sp) /* 067E54 80067254 17000032 */ bnez $t8, .L80067320 -/* 067E58 80067258 3C0A8000 */ lui $t2, %hi(D_80000300) # $t2, 0x8000 +/* 067E58 80067258 3C0A8000 */ lui $t2, %hi(osTvType) # $t2, 0x8000 /* 067E5C 8006725C 8E030000 */ lw $v1, ($s0) /* 067E60 80067260 00097202 */ srl $t6, $t1, 8 /* 067E64 80067264 00CEC023 */ subu $t8, $a2, $t6 @@ -495,7 +495,7 @@ glabel func_80066CDC /* 06802C 8006742C 032FC025 */ or $t8, $t9, $t7 /* 068030 80067430 AC780004 */ sw $t8, 4($v1) .L80067434: -/* 068034 80067434 8D4A0300 */ lw $t2, %lo(D_80000300)($t2) +/* 068034 80067434 8D4A0300 */ lw $t2, %lo(osTvType)($t2) /* 068038 80067438 AFA5004C */ sw $a1, 0x4c($sp) /* 06803C 8006743C 10000169 */ b .L800679E4 /* 068040 80067440 00A03825 */ move $a3, $a1 @@ -595,7 +595,7 @@ glabel func_80066CDC /* 0681A4 800675A4 46049480 */ add.s $f18, $f18, $f4 .L800675A8: /* 0681A8 800675A8 46009182 */ mul.s $f6, $f18, $f0 -/* 0681AC 800675AC 3C0A8000 */ lui $t2, %hi(D_80000300) # $t2, 0x8000 +/* 0681AC 800675AC 3C0A8000 */ lui $t2, %hi(osTvType) # $t2, 0x8000 /* 0681B0 800675B0 444FF800 */ cfc1 $t7, $31 /* 0681B4 800675B4 00000000 */ nop /* 0681B8 800675B8 35E10003 */ ori $at, $t7, 3 @@ -608,7 +608,7 @@ glabel func_80066CDC /* 0681D4 800675D4 33190FFF */ andi $t9, $t8, 0xfff /* 0681D8 800675D8 01D97825 */ or $t7, $t6, $t9 /* 0681DC 800675DC AC6F0004 */ sw $t7, 4($v1) -/* 0681E0 800675E0 8D4A0300 */ lw $t2, %lo(D_80000300)($t2) +/* 0681E0 800675E0 8D4A0300 */ lw $t2, %lo(osTvType)($t2) /* 0681E4 800675E4 100000F3 */ b .L800679B4 /* 0681E8 800675E8 8FB90058 */ lw $t9, 0x58($sp) .L800675EC: @@ -673,7 +673,7 @@ glabel func_80066CDC /* 0682CC 800676CC 46044200 */ add.s $f8, $f8, $f4 .L800676D0: /* 0682D0 800676D0 46004282 */ mul.s $f10, $f8, $f0 -/* 0682D4 800676D4 3C0A8000 */ lui $t2, %hi(D_80000300) # $t2, 0x8000 +/* 0682D4 800676D4 3C0A8000 */ lui $t2, %hi(osTvType) # $t2, 0x8000 /* 0682D8 800676D8 444FF800 */ cfc1 $t7, $31 /* 0682DC 800676DC 00000000 */ nop /* 0682E0 800676E0 35E10003 */ ori $at, $t7, 3 @@ -686,7 +686,7 @@ glabel func_80066CDC /* 0682FC 800676FC 31D90FFF */ andi $t9, $t6, 0xfff /* 068300 80067700 03197825 */ or $t7, $t8, $t9 /* 068304 80067704 AC6F0004 */ sw $t7, 4($v1) -/* 068308 80067708 8D4A0300 */ lw $t2, %lo(D_80000300)($t2) +/* 068308 80067708 8D4A0300 */ lw $t2, %lo(osTvType)($t2) /* 06830C 8006770C 100000A9 */ b .L800679B4 /* 068310 80067710 8FB90058 */ lw $t9, 0x58($sp) .L80067714: @@ -750,7 +750,7 @@ glabel func_80066CDC /* 0683F0 800677F0 46048400 */ add.s $f16, $f16, $f4 .L800677F4: /* 0683F4 800677F4 46008482 */ mul.s $f18, $f16, $f0 -/* 0683F8 800677F8 3C0A8000 */ lui $t2, %hi(D_80000300) # $t2, 0x8000 +/* 0683F8 800677F8 3C0A8000 */ lui $t2, %hi(osTvType) # $t2, 0x8000 /* 0683FC 800677FC 4459F800 */ cfc1 $t9, $31 /* 068400 80067800 00000000 */ nop /* 068404 80067804 37210003 */ ori $at, $t9, 3 @@ -763,7 +763,7 @@ glabel func_80066CDC /* 068420 80067820 31D80FFF */ andi $t8, $t6, 0xfff /* 068424 80067824 01F8C825 */ or $t9, $t7, $t8 /* 068428 80067828 AC990004 */ sw $t9, 4($a0) -/* 06842C 8006782C 8D4A0300 */ lw $t2, %lo(D_80000300)($t2) +/* 06842C 8006782C 8D4A0300 */ lw $t2, %lo(osTvType)($t2) /* 068430 80067830 10000060 */ b .L800679B4 /* 068434 80067834 8FB90058 */ lw $t9, 0x58($sp) .L80067838: @@ -850,7 +850,7 @@ glabel func_80066CDC /* 06856C 8006796C 46049480 */ add.s $f18, $f18, $f4 .L80067970: /* 068570 80067970 46009182 */ mul.s $f6, $f18, $f0 -/* 068574 80067974 3C0A8000 */ lui $t2, %hi(D_80000300) # $t2, 0x8000 +/* 068574 80067974 3C0A8000 */ lui $t2, %hi(osTvType) # $t2, 0x8000 /* 068578 80067978 444FF800 */ cfc1 $t7, $31 /* 06857C 8006797C 00000000 */ nop /* 068580 80067980 35E10003 */ ori $at, $t7, 3 @@ -863,7 +863,7 @@ glabel func_80066CDC /* 06859C 8006799C 332E0FFF */ andi $t6, $t9, 0xfff /* 0685A0 800679A0 030E7825 */ or $t7, $t8, $t6 /* 0685A4 800679A4 ACAF0004 */ sw $t7, 4($a1) -/* 0685A8 800679A8 8D4A0300 */ lw $t2, %lo(D_80000300)($t2) +/* 0685A8 800679A8 8D4A0300 */ lw $t2, %lo(osTvType)($t2) /* 0685AC 800679AC 00000000 */ nop /* 0685B0 800679B0 8FB90058 */ lw $t9, 0x58($sp) .L800679B4: diff --git a/asm/non_matchings/unknown_066AA0/func_8006C3E0.s b/asm/non_matchings/unknown_066AA0/func_8006C3E0.s index 2bbb5929..09df58b3 100644 --- a/asm/non_matchings/unknown_066AA0/func_8006C3E0.s +++ b/asm/non_matchings/unknown_066AA0/func_8006C3E0.s @@ -15,8 +15,8 @@ glabel func_8006C3E0 /* 06D014 8006C414 A020D374 */ sb $zero, %lo(D_800DD374)($at) .L8006C418: /* 06D018 8006C418 3C018012 */ lui $at, %hi(D_80123514) # $at, 0x8012 -/* 06D01C 8006C41C 3C028000 */ lui $v0, %hi(D_80000300) # $v0, 0x8000 -/* 06D020 8006C420 8C420300 */ lw $v0, %lo(D_80000300)($v0) +/* 06D01C 8006C41C 3C028000 */ lui $v0, %hi(osTvType) # $v0, 0x8000 +/* 06D020 8006C420 8C420300 */ lw $v0, %lo(osTvType)($v0) /* 06D024 8006C424 A0203514 */ sb $zero, %lo(D_80123514)($at) /* 06D028 8006C428 3C018012 */ lui $at, %hi(D_80123518) # $at, 0x8012 /* 06D02C 8006C42C 14400004 */ bnez $v0, .L8006C440 diff --git a/asm/non_matchings/unknown_066AA0/func_8006C60C.s b/asm/non_matchings/unknown_066AA0/func_8006C60C.s index d05b4424..edbad0ea 100644 --- a/asm/non_matchings/unknown_066AA0/func_8006C60C.s +++ b/asm/non_matchings/unknown_066AA0/func_8006C60C.s @@ -297,8 +297,8 @@ glabel func_8006C60C /* 06D668 8006CA68 814AD3F0 */ lb $t2, %lo(D_800DD3F0)($t2) /* 06D66C 8006CA6C 24010002 */ li $at, 2 /* 06D670 8006CA70 1541000D */ bne $t2, $at, .L8006CAA8 -/* 06D674 8006CA74 3C0B8000 */ lui $t3, %hi(D_80000300) # $t3, 0x8000 -/* 06D678 8006CA78 8D6B0300 */ lw $t3, %lo(D_80000300)($t3) +/* 06D674 8006CA74 3C0B8000 */ lui $t3, %hi(osTvType) # $t3, 0x8000 +/* 06D678 8006CA78 8D6B0300 */ lw $t3, %lo(osTvType)($t3) /* 06D67C 8006CA7C 3C020002 */ lui $v0, (0x00025800 >> 16) # lui $v0, 2 /* 06D680 8006CA80 15600003 */ bnez $t3, .L8006CA90 /* 06D684 8006CA84 34425800 */ ori $v0, (0x00025800 & 0xFFFF) # ori $v0, $v0, 0x5800 diff --git a/asm/non_matchings/unknown_072E50/func_80075E60.s b/asm/non_matchings/unknown_072E50/func_80075E60.s index 58828789..d4b74114 100644 --- a/asm/non_matchings/unknown_072E50/func_80075E60.s +++ b/asm/non_matchings/unknown_072E50/func_80075E60.s @@ -53,8 +53,8 @@ glabel func_80075E60 /* 076B24 80075F24 10000009 */ b .L80075F4C /* 076B28 80075F28 36D6594A */ ori $s6, (0x4E44594A & 0xFFFF) # ori $s6, $s6, 0x594a .L80075F2C: -/* 076B2C 80075F2C 3C088000 */ lui $t0, %hi(D_80000300) # $t0, 0x8000 -/* 076B30 80075F30 8D080300 */ lw $t0, %lo(D_80000300)($t0) +/* 076B2C 80075F2C 3C088000 */ lui $t0, %hi(osTvType) # $t0, 0x8000 +/* 076B30 80075F30 8D080300 */ lw $t0, %lo(osTvType)($t0) /* 076B34 80075F34 3C164E44 */ lui $s6, (0x4E445945 >> 16) # lui $s6, 0x4e44 /* 076B38 80075F38 15000004 */ bnez $t0, .L80075F4C /* 076B3C 80075F3C 36D65945 */ ori $s6, (0x4E445945 & 0xFFFF) # ori $s6, $s6, 0x5945 diff --git a/asm/non_matchings/unknown_072E50/func_800764E8.s b/asm/non_matchings/unknown_072E50/func_800764E8.s index d094695d..5ab7c70b 100644 --- a/asm/non_matchings/unknown_072E50/func_800764E8.s +++ b/asm/non_matchings/unknown_072E50/func_800764E8.s @@ -22,8 +22,8 @@ glabel func_800764E8 /* 077138 80076538 10000009 */ b .L80076560 /* 07713C 8007653C 34C6594A */ ori $a2, (0x4E44594A & 0xFFFF) # ori $a2, $a2, 0x594a .L80076540: -/* 077140 80076540 3C0E8000 */ lui $t6, %hi(D_80000300) # $t6, 0x8000 -/* 077144 80076544 8DCE0300 */ lw $t6, %lo(D_80000300)($t6) +/* 077140 80076540 3C0E8000 */ lui $t6, %hi(osTvType) # $t6, 0x8000 +/* 077144 80076544 8DCE0300 */ lw $t6, %lo(osTvType)($t6) /* 077148 80076548 3C064E44 */ lui $a2, (0x4E445945 >> 16) # lui $a2, 0x4e44 /* 07714C 8007654C 15C00004 */ bnez $t6, .L80076560 /* 077150 80076550 34C65945 */ ori $a2, (0x4E445945 & 0xFFFF) # ori $a2, $a2, 0x5945 diff --git a/asm/non_matchings/unknown_072E50/func_800766D4.s b/asm/non_matchings/unknown_072E50/func_800766D4.s index f0267cc3..3d1148c2 100644 --- a/asm/non_matchings/unknown_072E50/func_800766D4.s +++ b/asm/non_matchings/unknown_072E50/func_800766D4.s @@ -34,13 +34,13 @@ glabel func_800766D4 /* 07734C 8007674C 00000000 */ nop /* 077350 80076750 24010003 */ li $at, 3 /* 077354 80076754 14410005 */ bne $v0, $at, .L8007676C -/* 077358 80076758 3C0F8000 */ lui $t7, %hi(D_80000300) # $t7, 0x8000 +/* 077358 80076758 3C0F8000 */ lui $t7, %hi(osTvType) # $t7, 0x8000 /* 07735C 8007675C 3C0E4E44 */ lui $t6, (0x4E44594A >> 16) # lui $t6, 0x4e44 /* 077360 80076760 35CE594A */ ori $t6, (0x4E44594A & 0xFFFF) # ori $t6, $t6, 0x594a /* 077364 80076764 1000000A */ b .L80076790 /* 077368 80076768 AFAE002C */ sw $t6, 0x2c($sp) .L8007676C: -/* 07736C 8007676C 8DEF0300 */ lw $t7, %lo(D_80000300)($t7) +/* 07736C 8007676C 8DEF0300 */ lw $t7, %lo(osTvType)($t7) /* 077370 80076770 3C194E44 */ lui $t9, (0x4E445945 >> 16) # lui $t9, 0x4e44 /* 077374 80076774 15E00005 */ bnez $t7, .L8007678C /* 077378 80076778 37395945 */ ori $t9, (0x4E445945 & 0xFFFF) # ori $t9, $t9, 0x5945 diff --git a/asm/non_matchings/unknown_07AF10/func_8007A310.s b/asm/non_matchings/unknown_07AF10/func_8007A310.s index 9f980783..3e84741f 100644 --- a/asm/non_matchings/unknown_07AF10/func_8007A310.s +++ b/asm/non_matchings/unknown_07AF10/func_8007A310.s @@ -1,6 +1,6 @@ glabel func_8007A310 -/* 07AF10 8007A310 3C028000 */ lui $v0, %hi(D_80000300) # $v0, 0x8000 -/* 07AF14 8007A314 8C420300 */ lw $v0, %lo(D_80000300)($v0) +/* 07AF10 8007A310 3C028000 */ lui $v0, %hi(osTvType) # $v0, 0x8000 +/* 07AF14 8007A314 8C420300 */ lw $v0, %lo(osTvType)($v0) /* 07AF18 8007A318 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 07AF1C 8007A31C AFBF0014 */ sw $ra, 0x14($sp) /* 07AF20 8007A320 AFA40018 */ sw $a0, 0x18($sp) diff --git a/asm/non_matchings/unknown_07AF10/func_8007A550.s b/asm/non_matchings/unknown_07AF10/func_8007A550.s index 9d57cf6b..b3fc8ac3 100644 --- a/asm/non_matchings/unknown_07AF10/func_8007A550.s +++ b/asm/non_matchings/unknown_07AF10/func_8007A550.s @@ -1,6 +1,6 @@ glabel func_8007A550 -/* 07B150 8007A550 3C028000 */ lui $v0, %hi(D_80000300) # $v0, 0x8000 -/* 07B154 8007A554 8C420300 */ lw $v0, %lo(D_80000300)($v0) +/* 07B150 8007A550 3C028000 */ lui $v0, %hi(osTvType) # $v0, 0x8000 +/* 07B154 8007A554 8C420300 */ lw $v0, %lo(osTvType)($v0) /* 07B158 8007A558 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 07B15C 8007A55C AFBF0014 */ sw $ra, 0x14($sp) /* 07B160 8007A560 14400004 */ bnez $v0, .L8007A574 @@ -49,8 +49,8 @@ glabel func_8007A550 /* 07B1FC 8007A5FC 24A56260 */ addiu $a1, %lo(D_80126260) # addiu $a1, $a1, 0x6260 /* 07B200 8007A600 0C01EAFF */ jal func_8007ABFC /* 07B204 8007A604 24060050 */ li $a2, 80 -/* 07B208 8007A608 3C088000 */ lui $t0, %hi(D_80000300) # $t0, 0x8000 -/* 07B20C 8007A60C 8D080300 */ lw $t0, %lo(D_80000300)($t0) +/* 07B208 8007A608 3C088000 */ lui $t0, %hi(osTvType) # $t0, 0x8000 +/* 07B20C 8007A60C 8D080300 */ lw $t0, %lo(osTvType)($t0) /* 07B210 8007A610 3C058012 */ lui $a1, %hi(D_80126260) # $a1, 0x8012 /* 07B214 8007A614 1500000C */ bnez $t0, .L8007A648 /* 07B218 8007A618 24A56260 */ addiu $a1, %lo(D_80126260) # addiu $a1, $a1, 0x6260 diff --git a/asm/non_matchings/unknown_080500/MenuBootInit.s b/asm/non_matchings/unknown_080500/MenuBootInit.s index 8cd98608..a73a3427 100644 --- a/asm/non_matchings/unknown_080500/MenuBootInit.s +++ b/asm/non_matchings/unknown_080500/MenuBootInit.s @@ -1,4 +1,4 @@ -glabel MenuBootInit +glabel menu_boot_init /* 0890F4 800884F4 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 0890F8 800884F8 AFBF0014 */ sw $ra, 0x14($sp) /* 0890FC 800884FC 3C04800E */ lui $a0, %hi(D_800DF77C) # $a0, 0x800e @@ -32,6 +32,7 @@ glabel MenuBootInit /* 08916C 8008856C 008D7021 */ addu $t6, $a0, $t5 /* 089170 80088570 AC2BF7E4 */ sw $t3, %lo(D_800DF7E4)($at) /* 089174 80088574 8DCF0000 */ lw $t7, ($t6) + # The extra lui is here. /* 089178 80088578 3C03800E */ lui $v1, %hi(D_800DF7F4) # $v1, 0x800e /* 08917C 8008857C 3C02800E */ lui $v0, %hi(D_800DF7CA) # $v0, 0x800e /* 089180 80088580 3C05800E */ lui $a1, %hi(D_800DF7DA) # $a1, 0x800e diff --git a/asm/non_matchings/unknown_080500/MenuBootLoop.s b/asm/non_matchings/unknown_080500/MenuBootLoop.s index 35ded61c..a4dfaed1 100644 --- a/asm/non_matchings/unknown_080500/MenuBootLoop.s +++ b/asm/non_matchings/unknown_080500/MenuBootLoop.s @@ -1,6 +1,6 @@ -glabel MenuBootLoop -/* 08920C 8008860C 3C0E8000 */ lui $t6, %hi(D_80000300) # $t6, 0x8000 -/* 089210 80088610 8DCE0300 */ lw $t6, %lo(D_80000300)($t6) +glabel menu_boot_loop +/* 08920C 8008860C 3C0E8000 */ lui $t6, %hi(osTvType) # $t6, 0x8000 +/* 089210 80088610 8DCE0300 */ lw $t6, %lo(osTvType)($t6) /* 089214 80088614 27BDFFD0 */ addiu $sp, $sp, -0x30 /* 089218 80088618 AFBF0024 */ sw $ra, 0x24($sp) /* 08921C 8008861C 00802825 */ move $a1, $a0 diff --git a/asm/non_matchings/unknown_080500/MenuCreditsInit.s b/asm/non_matchings/unknown_080500/MenuCreditsInit.s index 8e1386e9..47a0c1c1 100644 --- a/asm/non_matchings/unknown_080500/MenuCreditsInit.s +++ b/asm/non_matchings/unknown_080500/MenuCreditsInit.s @@ -27,8 +27,8 @@ glabel MenuCreditsInit /* 09BBAC 8009AFAC 00002825 */ move $a1, $zero /* 09BBB0 8009AFB0 0C01DED7 */ jal func_80077B5C /* 09BBB4 8009AFB4 00003025 */ move $a2, $zero -/* 09BBB8 8009AFB8 3C0F8000 */ lui $t7, %hi(D_80000300) # $t7, 0x8000 -/* 09BBBC 8009AFBC 8DEF0300 */ lw $t7, %lo(D_80000300)($t7) +/* 09BBB8 8009AFB8 3C0F8000 */ lui $t7, %hi(osTvType) # $t7, 0x8000 +/* 09BBBC 8009AFBC 8DEF0300 */ lw $t7, %lo(osTvType)($t7) /* 09BBC0 8009AFC0 00002025 */ move $a0, $zero /* 09BBC4 8009AFC4 15E00011 */ bnez $t7, .L8009B00C /* 09BBC8 8009AFC8 00002825 */ move $a1, $zero diff --git a/asm/non_matchings/unknown_080500/MenuCreditsLoop.s b/asm/non_matchings/unknown_080500/MenuCreditsLoop.s index aba276b6..52706a0e 100644 --- a/asm/non_matchings/unknown_080500/MenuCreditsLoop.s +++ b/asm/non_matchings/unknown_080500/MenuCreditsLoop.s @@ -33,8 +33,8 @@ glabel MenuCreditsLoop /* 09BFA8 8009B3A8 0C03005C */ jal func_800C0170 /* 09BFAC 8009B3AC 00000000 */ nop .L8009B3B0: -/* 09BFB0 8009B3B0 3C0F8000 */ lui $t7, %hi(D_80000300) # $t7, 0x8000 -/* 09BFB4 8009B3B4 8DEF0300 */ lw $t7, %lo(D_80000300)($t7) +/* 09BFB0 8009B3B0 3C0F8000 */ lui $t7, %hi(osTvType) # $t7, 0x8000 +/* 09BFB4 8009B3B4 8DEF0300 */ lw $t7, %lo(osTvType)($t7) /* 09BFB8 8009B3B8 00002025 */ move $a0, $zero /* 09BFBC 8009B3BC 15E0000C */ bnez $t7, .L8009B3F0 /* 09BFC0 8009B3C0 24050028 */ li $a1, 40 @@ -228,8 +228,8 @@ glabel MenuCreditsLoop /* 09C280 8009B680 1140FFF8 */ beqz $t2, .L8009B664 /* 09C284 8009B684 03002825 */ move $a1, $t8 .L8009B688: -/* 09C288 8009B688 3C0C8000 */ lui $t4, %hi(D_80000300) # $t4, 0x8000 -/* 09C28C 8009B68C 8D8C0300 */ lw $t4, %lo(D_80000300)($t4) +/* 09C288 8009B688 3C0C8000 */ lui $t4, %hi(osTvType) # $t4, 0x8000 +/* 09C28C 8009B68C 8D8C0300 */ lw $t4, %lo(osTvType)($t4) /* 09C290 8009B690 00B01823 */ subu $v1, $a1, $s0 /* 09C294 8009B694 15800003 */ bnez $t4, .L8009B6A4 /* 09C298 8009B698 24010001 */ li $at, 1 diff --git a/asm/non_matchings/unknown_080500/MenuGameSelectLoop.s b/asm/non_matchings/unknown_080500/MenuGameSelectLoop.s index 930f984e..1addd12a 100644 --- a/asm/non_matchings/unknown_080500/MenuGameSelectLoop.s +++ b/asm/non_matchings/unknown_080500/MenuGameSelectLoop.s @@ -240,8 +240,8 @@ glabel MenuGameSelectLoop /* 08EDF0 8008E1F0 3C018012 */ lui $at, %hi(D_80126CC0) # $at, 0x8012 /* 08EDF4 8008E1F4 AC396CC0 */ sw $t9, %lo(D_80126CC0)($at) /* 08EDF8 8008E1F8 AD600000 */ sw $zero, ($t3) -/* 08EDFC 8008E1FC 3C0C8000 */ lui $t4, %hi(D_80000300) # $t4, 0x8000 -/* 08EE00 8008E200 8D8C0300 */ lw $t4, %lo(D_80000300)($t4) +/* 08EDFC 8008E1FC 3C0C8000 */ lui $t4, %hi(osTvType) # $t4, 0x8000 +/* 08EE00 8008E200 8D8C0300 */ lw $t4, %lo(osTvType)($t4) /* 08EE04 8008E204 00004025 */ move $t0, $zero /* 08EE08 8008E208 15800002 */ bnez $t4, .L8008E214 /* 08EE0C 8008E20C 3C0A800E */ lui $t2, %hi(D_800E03FC) # $t2, 0x800e diff --git a/asm/non_matchings/unknown_080500/MenuInit.s b/asm/non_matchings/unknown_080500/MenuInit.s index 4e992e75..b25086b6 100644 --- a/asm/non_matchings/unknown_080500/MenuInit.s +++ b/asm/non_matchings/unknown_080500/MenuInit.s @@ -104,7 +104,7 @@ glabel MenuInit /* 082168 80081568 00000000 */ nop /* 08216C 8008156C 10000008 */ b .L80081590 /* 082170 80081570 8FBF0014 */ lw $ra, 0x14($sp) -/* 082174 80081574 0C02213D */ jal MenuBootInit +/* 082174 80081574 0C02213D */ jal menu_boot_init /* 082178 80081578 00000000 */ nop /* 08217C 8008157C 10000004 */ b .L80081590 /* 082180 80081580 8FBF0014 */ lw $ra, 0x14($sp) diff --git a/asm/non_matchings/unknown_080500/MenuLogoScreenLoop.s b/asm/non_matchings/unknown_080500/MenuLogoScreenLoop.s index e2ec7a73..f9376038 100644 --- a/asm/non_matchings/unknown_080500/MenuLogoScreenLoop.s +++ b/asm/non_matchings/unknown_080500/MenuLogoScreenLoop.s @@ -1,6 +1,6 @@ glabel MenuLogoScreenLoop -/* 083784 80082B84 3C0E8000 */ lui $t6, %hi(D_80000300) # $t6, 0x8000 -/* 083788 80082B88 8DCE0300 */ lw $t6, %lo(D_80000300)($t6) +/* 083784 80082B84 3C0E8000 */ lui $t6, %hi(osTvType) # $t6, 0x8000 +/* 083788 80082B88 8DCE0300 */ lw $t6, %lo(osTvType)($t6) /* 08378C 80082B8C 27BDFFD0 */ addiu $sp, $sp, -0x30 /* 083790 80082B90 AFBF001C */ sw $ra, 0x1c($sp) /* 083794 80082B94 15C00020 */ bnez $t6, .L80082C18 diff --git a/asm/non_matchings/unknown_080500/MenuLogosScreenInit.s b/asm/non_matchings/unknown_080500/MenuLogosScreenInit.s index cfbef6a4..abaa7d5e 100644 --- a/asm/non_matchings/unknown_080500/MenuLogosScreenInit.s +++ b/asm/non_matchings/unknown_080500/MenuLogosScreenInit.s @@ -11,8 +11,8 @@ glabel MenuLogosScreenInit /* 0836D0 80082AD0 00003025 */ move $a2, $zero /* 0836D4 80082AD4 0C01DED7 */ jal func_80077B5C /* 0836D8 80082AD8 E4246450 */ swc1 $f4, %lo(D_80126450)($at) -/* 0836DC 80082ADC 3C0E8000 */ lui $t6, %hi(D_80000300) # $t6, 0x8000 -/* 0836E0 80082AE0 8DCE0300 */ lw $t6, %lo(D_80000300)($t6) +/* 0836DC 80082ADC 3C0E8000 */ lui $t6, %hi(osTvType) # $t6, 0x8000 +/* 0836E0 80082AE0 8DCE0300 */ lw $t6, %lo(osTvType)($t6) /* 0836E4 80082AE4 00002025 */ move $a0, $zero /* 0836E8 80082AE8 15C00011 */ bnez $t6, .L80082B30 /* 0836EC 80082AEC 00002825 */ move $a1, $zero diff --git a/asm/non_matchings/unknown_080500/MenuLoop.s b/asm/non_matchings/unknown_080500/MenuLoop.s index 4aa309ca..350758cd 100644 --- a/asm/non_matchings/unknown_080500/MenuLoop.s +++ b/asm/non_matchings/unknown_080500/MenuLoop.s @@ -121,7 +121,7 @@ glabel MenuLoop /* 082380 80081780 1000000A */ b .L800817AC /* 082384 80081784 AFA2001C */ sw $v0, 0x1c($sp) /* 082388 80081788 8FA40030 */ lw $a0, 0x30($sp) -/* 08238C 8008178C 0C022183 */ jal MenuBootLoop +/* 08238C 8008178C 0C022183 */ jal menu_boot_loop /* 082390 80081790 00000000 */ nop /* 082394 80081794 10000005 */ b .L800817AC /* 082398 80081798 AFA2001C */ sw $v0, 0x1c($sp) diff --git a/asm/non_matchings/unknown_080500/MenuMagicCodesListInit.s b/asm/non_matchings/unknown_080500/MenuMagicCodesListInit.s index e06f9f50..0f0423ff 100644 --- a/asm/non_matchings/unknown_080500/MenuMagicCodesListInit.s +++ b/asm/non_matchings/unknown_080500/MenuMagicCodesListInit.s @@ -18,8 +18,8 @@ glabel MenuMagicCodesListInit /* 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(D_80000300) # $t6, 0x8000 -/* 08B138 8008A538 8DCE0300 */ lw $t6, %lo(D_80000300)($t6) +/* 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 diff --git a/asm/non_matchings/unknown_080500/MenuTitleScreenLoop.s b/asm/non_matchings/unknown_080500/MenuTitleScreenLoop.s index 2ac70bdb..fcb82727 100644 --- a/asm/non_matchings/unknown_080500/MenuTitleScreenLoop.s +++ b/asm/non_matchings/unknown_080500/MenuTitleScreenLoop.s @@ -12,8 +12,8 @@ glabel MenuTitleScreenLoop /* 08460C 80083A0C 3319003F */ andi $t9, $t8, 0x3f /* 084610 80083A10 0C02393B */ jal func_8008E4EC /* 084614 80083A14 AC790000 */ sw $t9, ($v1) -/* 084618 80083A18 3C098000 */ lui $t1, %hi(D_80000300) # $t1, 0x8000 -/* 08461C 80083A1C 8D290300 */ lw $t1, %lo(D_80000300)($t1) +/* 084618 80083A18 3C098000 */ lui $t1, %hi(osTvType) # $t1, 0x8000 +/* 08461C 80083A1C 8D290300 */ lw $t1, %lo(osTvType)($t1) /* 084620 80083A20 8FAB0030 */ lw $t3, 0x30($sp) /* 084624 80083A24 1520000A */ bnez $t1, .L80083A50 /* 084628 80083A28 3C02800E */ lui $v0, %hi(D_800DF47C) # $v0, 0x800e diff --git a/asm/non_matchings/unknown_080500/func_800829F8.s b/asm/non_matchings/unknown_080500/func_800829F8.s index 42a91f53..3b5c779c 100644 --- a/asm/non_matchings/unknown_080500/func_800829F8.s +++ b/asm/non_matchings/unknown_080500/func_800829F8.s @@ -27,8 +27,8 @@ glabel func_800829F8 /* 08365C 80082A5C 00003025 */ move $a2, $zero /* 083660 80082A60 0C0310F3 */ jal func_800C43CC /* 083664 80082A64 00003825 */ move $a3, $zero -/* 083668 80082A68 3C098000 */ lui $t1, %hi(D_80000300) # $t1, 0x8000 -/* 08366C 80082A6C 8D290300 */ lw $t1, %lo(D_80000300)($t1) +/* 083668 80082A68 3C098000 */ lui $t1, %hi(osTvType) # $t1, 0x8000 +/* 08366C 80082A6C 8D290300 */ lw $t1, %lo(osTvType)($t1) /* 083670 80082A70 8FA40020 */ lw $a0, 0x20($sp) /* 083674 80082A74 15200002 */ bnez $t1, .L80082A80 /* 083678 80082A78 240600D0 */ li $a2, 208 diff --git a/asm/non_matchings/unknown_080500/func_8008377C.s b/asm/non_matchings/unknown_080500/func_8008377C.s index 1fdbac2e..e9d28308 100644 --- a/asm/non_matchings/unknown_080500/func_8008377C.s +++ b/asm/non_matchings/unknown_080500/func_8008377C.s @@ -73,8 +73,8 @@ glabel func_8008377C /* 084490 80083890 0C01BD32 */ jal func_8006F4C8 /* 084494 80083894 00000000 */ nop /* 084498 80083898 14400047 */ bnez $v0, .L800839B8 -/* 08449C 8008389C 3C0D8000 */ lui $t5, %hi(D_80000300) # $t5, 0x8000 -/* 0844A0 800838A0 8DAD0300 */ lw $t5, %lo(D_80000300)($t5) +/* 08449C 8008389C 3C0D8000 */ lui $t5, %hi(osTvType) # $t5, 0x8000 +/* 0844A0 800838A0 8DAD0300 */ lw $t5, %lo(osTvType)($t5) /* 0844A4 800838A4 00008825 */ move $s1, $zero /* 0844A8 800838A8 15A00003 */ bnez $t5, .L800838B8 /* 0844AC 800838AC 241200C0 */ li $s2, 192 diff --git a/asm/non_matchings/unknown_080500/func_80084854.s b/asm/non_matchings/unknown_080500/func_80084854.s index 9215b6d2..420c9bc9 100644 --- a/asm/non_matchings/unknown_080500/func_80084854.s +++ b/asm/non_matchings/unknown_080500/func_80084854.s @@ -81,8 +81,8 @@ glabel func_80084854 /* 08557C 8008497C 8F3969D0 */ lw $t9, 0x69d0($t9) /* 085580 80084980 0C019FCB */ jal func_80067F2C /* 085584 80084984 AC39FA48 */ sw $t9, %lo(D_800DFA48)($at) -/* 085588 80084988 3C088000 */ lui $t0, %hi(D_80000300) # $t0, 0x8000 -/* 08558C 8008498C 8D080300 */ lw $t0, %lo(D_80000300)($t0) +/* 085588 80084988 3C088000 */ lui $t0, %hi(osTvType) # $t0, 0x8000 +/* 08558C 8008498C 8D080300 */ lw $t0, %lo(osTvType)($t0) /* 085590 80084990 3C11FFC0 */ lui $s1, (0xFFC040FF >> 16) # lui $s1, 0xffc0 /* 085594 80084994 15000003 */ bnez $t0, .L800849A4 /* 085598 80084998 363140FF */ ori $s1, (0xFFC040FF & 0xFFFF) # ori $s1, $s1, 0x40ff diff --git a/asm/non_matchings/unknown_080500/func_800853D0.s b/asm/non_matchings/unknown_080500/func_800853D0.s index dd7609b0..69f1223a 100644 --- a/asm/non_matchings/unknown_080500/func_800853D0.s +++ b/asm/non_matchings/unknown_080500/func_800853D0.s @@ -317,8 +317,8 @@ glabel func_800853D0 /* 086490 80085890 24A5FF60 */ addiu $a1, $a1, -0xa0 /* 086494 80085894 0C020160 */ jal func_80080580 /* 086498 80085898 01593023 */ subu $a2, $t2, $t9 -/* 08649C 8008589C 3C038000 */ lui $v1, %hi(D_80000300) # $v1, 0x8000 -/* 0864A0 800858A0 8C630300 */ lw $v1, %lo(D_80000300)($v1) +/* 08649C 8008589C 3C038000 */ lui $v1, %hi(osTvType) # $v1, 0x8000 +/* 0864A0 800858A0 8C630300 */ lw $v1, %lo(osTvType)($v1) /* 0864A4 800858A4 8FAD0088 */ lw $t5, 0x88($sp) /* 0864A8 800858A8 14600002 */ bnez $v1, .L800858B4 /* 0864AC 800858AC 25AF000C */ addiu $t7, $t5, 0xc diff --git a/asm/non_matchings/unknown_080500/func_80085B9C.s b/asm/non_matchings/unknown_080500/func_80085B9C.s index 19f1b3ca..30940882 100644 --- a/asm/non_matchings/unknown_080500/func_80085B9C.s +++ b/asm/non_matchings/unknown_080500/func_80085B9C.s @@ -92,10 +92,10 @@ glabel func_80085B9C /* 0868FC 80085CFC 0C031110 */ jal func_800C4440 /* 086900 80085D00 24060020 */ li $a2, 32 /* 086904 80085D04 8FAE004C */ lw $t6, 0x4c($sp) -/* 086908 80085D08 3C0F8000 */ lui $t7, %hi(D_80000300) # $t7, 0x8000 +/* 086908 80085D08 3C0F8000 */ lui $t7, %hi(osTvType) # $t7, 0x8000 /* 08690C 80085D0C 11C0001F */ beqz $t6, .L80085D8C /* 086910 80085D10 3C188012 */ lui $t8, %hi(D_801263BC) # $t8, 0x8012 -/* 086914 80085D14 8DEF0300 */ lw $t7, %lo(D_80000300)($t7) +/* 086914 80085D14 8DEF0300 */ lw $t7, %lo(osTvType)($t7) /* 086918 80085D18 00009025 */ move $s2, $zero /* 08691C 80085D1C 15E00003 */ bnez $t7, .L80085D2C /* 086920 80085D20 3C11800E */ lui $s1, %hi(D_800E043C) # $s1, 0x800e diff --git a/asm/non_matchings/unknown_080500/func_800887E8.s b/asm/non_matchings/unknown_080500/func_800887E8.s index 49c7cafd..61252119 100644 --- a/asm/non_matchings/unknown_080500/func_800887E8.s +++ b/asm/non_matchings/unknown_080500/func_800887E8.s @@ -72,8 +72,8 @@ glabel func_800887E8 /* 0894EC 800888EC AC2063D8 */ sw $zero, %lo(D_801263D8)($at) /* 0894F0 800888F0 0C02392C */ jal func_8008E4B0 /* 0894F4 800888F4 00000000 */ nop -/* 0894F8 800888F8 3C0B8000 */ lui $t3, %hi(D_80000300) # $t3, 0x8000 -/* 0894FC 800888FC 8D6B0300 */ lw $t3, %lo(D_80000300)($t3) +/* 0894F8 800888F8 3C0B8000 */ lui $t3, %hi(osTvType) # $t3, 0x8000 +/* 0894FC 800888FC 8D6B0300 */ lw $t3, %lo(osTvType)($t3) /* 089500 80088900 240D0007 */ li $t5, 7 /* 089504 80088904 15600005 */ bnez $t3, .L8008891C /* 089508 80088908 3C018012 */ lui $at, 0x8012 diff --git a/asm/non_matchings/unknown_080500/func_80088938.s b/asm/non_matchings/unknown_080500/func_80088938.s index 673f44ec..dfe91ba1 100644 --- a/asm/non_matchings/unknown_080500/func_80088938.s +++ b/asm/non_matchings/unknown_080500/func_80088938.s @@ -367,10 +367,10 @@ glabel func_80088938 /* 089AB4 80088EB4 1140005D */ beqz $t2, .L8008902C /* 089AB8 80088EB8 00000000 */ nop /* 089ABC 80088EBC 8D8C6C10 */ lw $t4, %lo(D_80126C10)($t4) -/* 089AC0 80088EC0 3C0D8000 */ lui $t5, %hi(D_80000300) # $t5, 0x8000 +/* 089AC0 80088EC0 3C0D8000 */ lui $t5, %hi(osTvType) # $t5, 0x8000 /* 089AC4 80088EC4 15800059 */ bnez $t4, .L8008902C /* 089AC8 80088EC8 00000000 */ nop -/* 089ACC 80088ECC 8DAD0300 */ lw $t5, %lo(D_80000300)($t5) +/* 089ACC 80088ECC 8DAD0300 */ lw $t5, %lo(osTvType)($t5) /* 089AD0 80088ED0 24150078 */ li $s5, 120 /* 089AD4 80088ED4 15A00003 */ bnez $t5, .L80088EE4 /* 089AD8 80088ED8 00000000 */ nop diff --git a/asm/non_matchings/unknown_080500/func_800896A4.s b/asm/non_matchings/unknown_080500/func_800896A4.s index 23dec410..d8ea2072 100644 --- a/asm/non_matchings/unknown_080500/func_800896A4.s +++ b/asm/non_matchings/unknown_080500/func_800896A4.s @@ -189,8 +189,8 @@ glabel func_800896A4 .L8008996C: /* 08A56C 8008996C 0C0310BB */ jal func_800C42EC /* 08A570 80089970 00002025 */ move $a0, $zero -/* 08A574 80089974 3C168000 */ lui $s6, %hi(D_80000300) # $s6, 0x8000 -/* 08A578 80089978 26D60300 */ addiu $s6, %lo(D_80000300) # addiu $s6, $s6, 0x300 +/* 08A574 80089974 3C168000 */ lui $s6, %hi(osTvType) # $s6, 0x8000 +/* 08A578 80089978 26D60300 */ addiu $s6, %lo(osTvType) # addiu $s6, $s6, 0x300 /* 08A57C 8008997C 8ECB0000 */ lw $t3, ($s6) /* 08A580 80089980 0000F025 */ move $fp, $zero /* 08A584 80089984 241300A4 */ li $s3, 164 diff --git a/asm/non_matchings/unknown_080500/func_8008B20C.s b/asm/non_matchings/unknown_080500/func_8008B20C.s index ef83ccb4..167bdadd 100644 --- a/asm/non_matchings/unknown_080500/func_8008B20C.s +++ b/asm/non_matchings/unknown_080500/func_8008B20C.s @@ -58,8 +58,8 @@ glabel func_8008B20C /* 08BEEC 8008B2EC 144A000F */ bne $v0, $t2, .L8008B32C /* 08BEF0 8008B2F0 00000000 */ nop /* 08BEF4 8008B2F4 1840000D */ blez $v0, .L8008B32C -/* 08BEF8 8008B2F8 3C0B8000 */ lui $t3, %hi(D_80000300) # $t3, 0x8000 -/* 08BEFC 8008B2FC 8D6B0300 */ lw $t3, %lo(D_80000300)($t3) +/* 08BEF8 8008B2F8 3C0B8000 */ lui $t3, %hi(osTvType) # $t3, 0x8000 +/* 08BEFC 8008B2FC 8D6B0300 */ lw $t3, %lo(osTvType)($t3) /* 08BF00 8008B300 240600D0 */ li $a2, 208 /* 08BF04 8008B304 15600002 */ bnez $t3, .L8008B310 /* 08BF08 8008B308 3C048012 */ lui $a0, %hi(D_801263A0) # $a0, 0x8012 diff --git a/asm/non_matchings/unknown_080500/func_8008C698.s b/asm/non_matchings/unknown_080500/func_8008C698.s index a0e173fe..416fd651 100644 --- a/asm/non_matchings/unknown_080500/func_8008C698.s +++ b/asm/non_matchings/unknown_080500/func_8008C698.s @@ -50,8 +50,8 @@ glabel func_8008C698 /* 08D34C 8008C74C 1020FFF3 */ beqz $at, .L8008C71C /* 08D350 8008C750 00000000 */ nop .L8008C754: -/* 08D354 8008C754 3C0D8000 */ lui $t5, %hi(D_80000300) # $t5, 0x8000 -/* 08D358 8008C758 8DAD0300 */ lw $t5, %lo(D_80000300)($t5) +/* 08D354 8008C754 3C0D8000 */ lui $t5, %hi(osTvType) # $t5, 0x8000 +/* 08D358 8008C758 8DAD0300 */ lw $t5, %lo(osTvType)($t5) /* 08D35C 8008C75C 3C078012 */ lui $a3, %hi(D_80126460) # $a3, 0x8012 /* 08D360 8008C760 15A00007 */ bnez $t5, .L8008C780 /* 08D364 8008C764 24E76460 */ addiu $a3, %lo(D_80126460) # addiu $a3, $a3, 0x6460 diff --git a/asm/non_matchings/unknown_080500/func_8008CD74.s b/asm/non_matchings/unknown_080500/func_8008CD74.s index f89dbf4f..947b0571 100644 --- a/asm/non_matchings/unknown_080500/func_8008CD74.s +++ b/asm/non_matchings/unknown_080500/func_8008CD74.s @@ -1,7 +1,7 @@ glabel func_8008CD74 /* 08D974 8008CD74 27BDFF78 */ addiu $sp, $sp, -0x88 -/* 08D978 8008CD78 3C0E8000 */ lui $t6, %hi(D_80000300) # $t6, 0x8000 -/* 08D97C 8008CD7C 8DCE0300 */ lw $t6, %lo(D_80000300)($t6) +/* 08D978 8008CD78 3C0E8000 */ lui $t6, %hi(osTvType) # $t6, 0x8000 +/* 08D97C 8008CD7C 8DCE0300 */ lw $t6, %lo(osTvType)($t6) /* 08D980 8008CD80 AFBF0054 */ sw $ra, 0x54($sp) /* 08D984 8008CD84 AFB70050 */ sw $s7, 0x50($sp) /* 08D988 8008CD88 AFB6004C */ sw $s6, 0x4c($sp) diff --git a/asm/non_matchings/unknown_080500/func_8008FA54.s b/asm/non_matchings/unknown_080500/func_8008FA54.s index e70e8af4..6c2f6d18 100644 --- a/asm/non_matchings/unknown_080500/func_8008FA54.s +++ b/asm/non_matchings/unknown_080500/func_8008FA54.s @@ -1,9 +1,9 @@ glabel func_8008FA54 /* 090654 8008FA54 27BDFF80 */ addiu $sp, $sp, -0x80 /* 090658 8008FA58 3C0E8012 */ lui $t6, %hi(D_80126478) # $t6, 0x8012 -/* 09065C 8008FA5C 3C188000 */ lui $t8, %hi(D_80000300) # $t8, 0x8000 +/* 09065C 8008FA5C 3C188000 */ lui $t8, %hi(osTvType) # $t8, 0x8000 /* 090660 8008FA60 8DCE6478 */ lw $t6, %lo(D_80126478)($t6) -/* 090664 8008FA64 8F180300 */ lw $t8, %lo(D_80000300)($t8) +/* 090664 8008FA64 8F180300 */ lw $t8, %lo(osTvType)($t8) /* 090668 8008FA68 AFB50038 */ sw $s5, 0x38($sp) /* 09066C 8008FA6C AFB40034 */ sw $s4, 0x34($sp) /* 090670 8008FA70 AFB2002C */ sw $s2, 0x2c($sp) @@ -126,8 +126,8 @@ glabel func_8008FA54 /* 090830 8008FC30 1900005B */ blez $t0, .L8008FDA0 /* 090834 8008FC34 3C013FA0 */ li $at, 0x3FA00000 # 1.250000 /* 090838 8008FC38 44816000 */ mtc1 $at, $f12 -/* 09083C 8008FC3C 3C198000 */ lui $t9, %hi(D_80000300) # $t9, 0x8000 -/* 090840 8008FC40 8F390300 */ lw $t9, %lo(D_80000300)($t9) +/* 09083C 8008FC3C 3C198000 */ lui $t9, %hi(osTvType) # $t9, 0x8000 +/* 090840 8008FC40 8F390300 */ lw $t9, %lo(osTvType)($t9) /* 090844 8008FC44 46006086 */ mov.s $f2, $f12 /* 090848 8008FC48 17200007 */ bnez $t9, .L8008FC68 /* 09084C 8008FC4C 46006006 */ mov.s $f0, $f12 @@ -237,10 +237,10 @@ glabel func_8008FA54 /* 0909D0 8008FDD0 44985000 */ mtc1 $t8, $f10 /* 0909D4 8008FDD4 0102C821 */ addu $t9, $t0, $v0 /* 0909D8 8008FDD8 46805420 */ cvt.s.w $f16, $f10 -/* 0909DC 8008FDDC 3C098000 */ lui $t1, %hi(D_80000300) # $t1, 0x8000 +/* 0909DC 8008FDDC 3C098000 */ lui $t1, %hi(osTvType) # $t1, 0x8000 /* 0909E0 8008FDE0 3C0B800E */ lui $t3, %hi(D_800E06C4) # $t3, 0x800e /* 0909E4 8008FDE4 E7300010 */ swc1 $f16, 0x10($t9) -/* 0909E8 8008FDE8 8D290300 */ lw $t1, %lo(D_80000300)($t1) +/* 0909E8 8008FDE8 8D290300 */ lw $t1, %lo(osTvType)($t1) /* 0909EC 8008FDEC 3C01800F */ lui $at, %hi(D_800E84D8) # $at, 0x800f /* 0909F0 8008FDF0 15200008 */ bnez $t1, .L8008FE14 /* 0909F4 8008FDF4 256B06C4 */ addiu $t3, %lo(D_800E06C4) # addiu $t3, $t3, 0x6c4 diff --git a/asm/non_matchings/unknown_080500/func_80090F30.s b/asm/non_matchings/unknown_080500/func_80090F30.s index 1111543a..b319a0aa 100644 --- a/asm/non_matchings/unknown_080500/func_80090F30.s +++ b/asm/non_matchings/unknown_080500/func_80090F30.s @@ -15,8 +15,8 @@ glabel func_80090F30 /* 091B64 80090F64 AFA00078 */ sw $zero, 0x78($sp) /* 091B68 80090F68 0C01BAA4 */ jal func_8006EA90 /* 091B6C 80090F6C AFA00074 */ sw $zero, 0x74($sp) -/* 091B70 80090F70 3C108000 */ lui $s0, %hi(D_80000300) # $s0, 0x8000 -/* 091B74 80090F74 26100300 */ addiu $s0, %lo(D_80000300) # addiu $s0, $s0, 0x300 +/* 091B70 80090F70 3C108000 */ lui $s0, %hi(osTvType) # $s0, 0x8000 +/* 091B74 80090F74 26100300 */ addiu $s0, %lo(osTvType) # addiu $s0, $s0, 0x300 /* 091B78 80090F78 8E0E0000 */ lw $t6, ($s0) /* 091B7C 80090F7C AFA20070 */ sw $v0, 0x70($sp) /* 091B80 80090F80 15C00003 */ bnez $t6, .L80090F90 diff --git a/asm/non_matchings/unknown_080500/func_80092E94.s b/asm/non_matchings/unknown_080500/func_80092E94.s index 011bd173..450c8743 100644 --- a/asm/non_matchings/unknown_080500/func_80092E94.s +++ b/asm/non_matchings/unknown_080500/func_80092E94.s @@ -9,8 +9,8 @@ glabel func_80092E94 /* 093AB0 80092EB0 AFA5007C */ sw $a1, 0x7c($sp) /* 093AB4 80092EB4 0C01BAA4 */ jal func_8006EA90 /* 093AB8 80092EB8 AFA00054 */ sw $zero, 0x54($sp) -/* 093ABC 80092EBC 3C0E8000 */ lui $t6, %hi(D_80000300) # $t6, 0x8000 -/* 093AC0 80092EC0 8DCE0300 */ lw $t6, %lo(D_80000300)($t6) +/* 093ABC 80092EBC 3C0E8000 */ lui $t6, %hi(osTvType) # $t6, 0x8000 +/* 093AC0 80092EC0 8DCE0300 */ lw $t6, %lo(osTvType)($t6) /* 093AC4 80092EC4 00402025 */ move $a0, $v0 /* 093AC8 80092EC8 15C00002 */ bnez $t6, .L80092ED4 /* 093ACC 80092ECC 00002825 */ move $a1, $zero diff --git a/asm/non_matchings/unknown_080500/func_80093D40.s b/asm/non_matchings/unknown_080500/func_80093D40.s index 1f380937..66939f85 100644 --- a/asm/non_matchings/unknown_080500/func_80093D40.s +++ b/asm/non_matchings/unknown_080500/func_80093D40.s @@ -34,8 +34,8 @@ glabel func_80093D40 /* 0949B8 80093DB8 1420FFF1 */ bnez $at, .L80093D80 /* 0949BC 80093DBC 26100004 */ addiu $s0, $s0, 4 .L80093DC0: -/* 0949C0 80093DC0 3C0E8000 */ lui $t6, %hi(D_80000300) # $t6, 0x8000 -/* 0949C4 80093DC4 8DCE0300 */ lw $t6, %lo(D_80000300)($t6) +/* 0949C0 80093DC0 3C0E8000 */ lui $t6, %hi(osTvType) # $t6, 0x8000 +/* 0949C4 80093DC4 8DCE0300 */ lw $t6, %lo(osTvType)($t6) /* 0949C8 80093DC8 00028900 */ sll $s1, $v0, 4 /* 0949CC 80093DCC 15C00003 */ bnez $t6, .L80093DDC /* 0949D0 80093DD0 2631001C */ addiu $s1, $s1, 0x1c diff --git a/asm/non_matchings/unknown_080500/func_80094D28.s b/asm/non_matchings/unknown_080500/func_80094D28.s index 67246a3a..b5a362cf 100644 --- a/asm/non_matchings/unknown_080500/func_80094D28.s +++ b/asm/non_matchings/unknown_080500/func_80094D28.s @@ -369,9 +369,9 @@ glabel func_80094D28 /* 095E70 80095270 AFAA0050 */ sw $t2, 0x50($sp) .L80095274: /* 095E74 80095274 8FB90050 */ lw $t9, 0x50($sp) -/* 095E78 80095278 3C0F8000 */ lui $t7, %hi(D_80000300) # $t7, 0x8000 +/* 095E78 80095278 3C0F8000 */ lui $t7, %hi(osTvType) # $t7, 0x8000 /* 095E7C 8009527C 02190019 */ multu $s0, $t9 -/* 095E80 80095280 8DEF0300 */ lw $t7, %lo(D_80000300)($t7) +/* 095E80 80095280 8DEF0300 */ lw $t7, %lo(osTvType)($t7) /* 095E84 80095284 241000C0 */ li $s0, 192 /* 095E88 80095288 00009012 */ mflo $s2 /* 095E8C 8009528C 26520001 */ addiu $s2, $s2, 1 @@ -591,8 +591,8 @@ glabel func_80094D28 /* 0961B4 800955B4 8FBF002C */ lw $ra, 0x2c($sp) /* 0961B8 800955B8 0C019A06 */ jal func_80066818 /* 0961BC 800955BC 24050001 */ li $a1, 1 -/* 0961C0 800955C0 3C0C8000 */ lui $t4, %hi(D_80000300) # $t4, 0x8000 -/* 0961C4 800955C4 8D8C0300 */ lw $t4, %lo(D_80000300)($t4) +/* 0961C0 800955C0 3C0C8000 */ lui $t4, %hi(osTvType) # $t4, 0x8000 +/* 0961C4 800955C4 8D8C0300 */ lw $t4, %lo(osTvType)($t4) /* 0961C8 800955C8 3C01800F */ lui $at, %hi(D_800E8520) # $at, 0x800f /* 0961CC 800955CC 15800004 */ bnez $t4, .L800955E0 /* 0961D0 800955D0 3C0D8012 */ lui $t5, %hi(D_801263E0) # $t5, 0x8012 diff --git a/asm/non_matchings/unknown_080500/func_80095728.s b/asm/non_matchings/unknown_080500/func_80095728.s index 9605999a..435c5360 100644 --- a/asm/non_matchings/unknown_080500/func_80095728.s +++ b/asm/non_matchings/unknown_080500/func_80095728.s @@ -19,8 +19,8 @@ glabel func_80095728 /* 09636C 8009576C 3C018012 */ lui $at, %hi(D_801263AC) # $at, 0x8012 /* 096370 80095770 0C01BAA4 */ jal func_8006EA90 /* 096374 80095774 AC2D63AC */ sw $t5, %lo(D_801263AC)($at) -/* 096378 80095778 3C0E8000 */ lui $t6, %hi(D_80000300) # $t6, 0x8000 -/* 09637C 8009577C 8DCE0300 */ lw $t6, %lo(D_80000300)($t6) +/* 096378 80095778 3C0E8000 */ lui $t6, %hi(osTvType) # $t6, 0x8000 +/* 09637C 8009577C 8DCE0300 */ lw $t6, %lo(osTvType)($t6) /* 096380 80095780 AFA2002C */ sw $v0, 0x2c($sp) /* 096384 80095784 15C00006 */ bnez $t6, .L800957A0 /* 096388 80095788 3C0A800E */ lui $t2, %hi(D_800DF4BC) # $t2, 0x800e diff --git a/asm/non_matchings/unknown_080500/func_80096978.s b/asm/non_matchings/unknown_080500/func_80096978.s index cab05d2a..c5d57864 100644 --- a/asm/non_matchings/unknown_080500/func_80096978.s +++ b/asm/non_matchings/unknown_080500/func_80096978.s @@ -17,8 +17,8 @@ glabel func_80096978 /* 0975B4 800969B4 E7B50028 */ swc1 $f21, 0x28($sp) /* 0975B8 800969B8 0C01BAA4 */ jal func_8006EA90 /* 0975BC 800969BC AFA400B0 */ sw $a0, 0xb0($sp) -/* 0975C0 800969C0 3C0E8000 */ lui $t6, %hi(D_80000300) # $t6, 0x8000 -/* 0975C4 800969C4 8DCE0300 */ lw $t6, %lo(D_80000300)($t6) +/* 0975C0 800969C0 3C0E8000 */ lui $t6, %hi(osTvType) # $t6, 0x8000 +/* 0975C4 800969C4 8DCE0300 */ lw $t6, %lo(osTvType)($t6) /* 0975C8 800969C8 AFA20084 */ sw $v0, 0x84($sp) /* 0975CC 800969CC 15C00002 */ bnez $t6, .L800969D8 /* 0975D0 800969D0 00001825 */ move $v1, $zero diff --git a/asm/non_matchings/unknown_080500/func_800983C0.s b/asm/non_matchings/unknown_080500/func_800983C0.s index 114ac0d3..c92ca03c 100644 --- a/asm/non_matchings/unknown_080500/func_800983C0.s +++ b/asm/non_matchings/unknown_080500/func_800983C0.s @@ -4,8 +4,8 @@ glabel func_800983C0 /* 098FC8 800983C8 AFA40030 */ sw $a0, 0x30($sp) /* 098FCC 800983CC 0C0078A7 */ jal func_8001E29C /* 098FD0 800983D0 2404001A */ li $a0, 26 -/* 098FD4 800983D4 3C0E8000 */ lui $t6, %hi(D_80000300) # $t6, 0x8000 -/* 098FD8 800983D8 8DCE0300 */ lw $t6, %lo(D_80000300)($t6) +/* 098FD4 800983D4 3C0E8000 */ lui $t6, %hi(osTvType) # $t6, 0x8000 +/* 098FD8 800983D8 8DCE0300 */ lw $t6, %lo(osTvType)($t6) /* 098FDC 800983DC AFA20020 */ sw $v0, 0x20($sp) /* 098FE0 800983E0 15C00004 */ bnez $t6, .L800983F4 /* 098FE4 800983E4 3C04800E */ lui $a0, %hi(D_800E0FE8) # $a0, 0x800e diff --git a/asm/non_matchings/unknown_080500/func_80098774.s b/asm/non_matchings/unknown_080500/func_80098774.s index d4ecbfb7..21b37c58 100644 --- a/asm/non_matchings/unknown_080500/func_80098774.s +++ b/asm/non_matchings/unknown_080500/func_80098774.s @@ -30,8 +30,8 @@ glabel func_80098774 /* 0993DC 800987DC ACA30034 */ sw $v1, 0x34($a1) /* 0993E0 800987E0 3C09800E */ lui $t1, %hi(D_800E0FE4) # $t1, 0x800e /* 0993E4 800987E4 8D290FE4 */ lw $t1, %lo(D_800E0FE4)($t1) -/* 0993E8 800987E8 3C198000 */ lui $t9, %hi(D_80000300) # $t9, 0x8000 -/* 0993EC 800987EC 8F390300 */ lw $t9, %lo(D_80000300)($t9) +/* 0993E8 800987E8 3C198000 */ lui $t9, %hi(osTvType) # $t9, 0x8000 +/* 0993EC 800987EC 8F390300 */ lw $t9, %lo(osTvType)($t9) /* 0993F0 800987F0 2528FFFF */ addiu $t0, $t1, -1 /* 0993F4 800987F4 0008C040 */ sll $t8, $t0, 1 /* 0993F8 800987F8 03004025 */ move $t0, $t8 diff --git a/asm/non_matchings/unknown_080500/func_80099E8C.s b/asm/non_matchings/unknown_080500/func_80099E8C.s index e373cdc8..7b09f6a7 100644 --- a/asm/non_matchings/unknown_080500/func_80099E8C.s +++ b/asm/non_matchings/unknown_080500/func_80099E8C.s @@ -17,8 +17,8 @@ glabel func_80099E8C /* 09AAC8 80099EC8 24A563A8 */ addiu $a1, %lo(D_801263A8) # addiu $a1, $a1, 0x63a8 /* 09AACC 80099ECC 0C019FCB */ jal func_80067F2C /* 09AAD0 80099ED0 02E02025 */ move $a0, $s7 -/* 09AAD4 80099ED4 3C0E8000 */ lui $t6, %hi(D_80000300) # $t6, 0x8000 -/* 09AAD8 80099ED8 8DCE0300 */ lw $t6, %lo(D_80000300)($t6) +/* 09AAD4 80099ED4 3C0E8000 */ lui $t6, %hi(osTvType) # $t6, 0x8000 +/* 09AAD8 80099ED8 8DCE0300 */ lw $t6, %lo(osTvType)($t6) /* 09AADC 80099EDC 3C188012 */ lui $t8, %hi(D_801263D8) # $t8, 0x8012 /* 09AAE0 80099EE0 15C00004 */ bnez $t6, .L80099EF4 /* 09AAE4 80099EE4 24040002 */ li $a0, 2 diff --git a/asm/non_matchings/unknown_080500/func_8009E3D0.s b/asm/non_matchings/unknown_080500/func_8009E3D0.s index 961c9e2a..3c6e0322 100644 --- a/asm/non_matchings/unknown_080500/func_8009E3D0.s +++ b/asm/non_matchings/unknown_080500/func_8009E3D0.s @@ -23,8 +23,8 @@ glabel func_8009E3D0 /* 09F020 8009E420 AFA20048 */ sw $v0, 0x48($sp) /* 09F024 8009E424 0C01A142 */ jal func_80068508 /* 09F028 8009E428 02802025 */ move $a0, $s4 -/* 09F02C 8009E42C 3C0F8000 */ lui $t7, %hi(D_80000300) # $t7, 0x8000 -/* 09F030 8009E430 8DEF0300 */ lw $t7, %lo(D_80000300)($t7) +/* 09F02C 8009E42C 3C0F8000 */ lui $t7, %hi(osTvType) # $t7, 0x8000 +/* 09F030 8009E430 8DEF0300 */ lw $t7, %lo(osTvType)($t7) /* 09F034 8009E434 8FB80048 */ lw $t8, 0x48($sp) /* 09F038 8009E438 15E00003 */ bnez $t7, .L8009E448 /* 09F03C 8009E43C 3C12800E */ lui $s2, %hi(D_800DF75C) # $s2, 0x800e diff --git a/asm/non_matchings/unknown_09F8F0/func_8009F034.s b/asm/non_matchings/unknown_09F8F0/func_8009F034.s index f831fdcc..d8585950 100644 --- a/asm/non_matchings/unknown_09F8F0/func_8009F034.s +++ b/asm/non_matchings/unknown_09F8F0/func_8009F034.s @@ -23,7 +23,7 @@ glabel func_8009F034 /* 09FC88 8009F088 E7B4001C */ swc1 $f20, 0x1c($sp) /* 09FC8C 8009F08C 240C0001 */ li $t4, 1 /* 09FC90 8009F090 11820004 */ beq $t4, $v0, .L8009F0A4 -/* 09FC94 8009F094 3C108000 */ lui $s0, %hi(D_80000300) # $s0, 0x8000 +/* 09FC94 8009F094 3C108000 */ lui $s0, %hi(osTvType) # $s0, 0x8000 /* 09FC98 8009F098 24010005 */ li $at, 5 /* 09FC9C 8009F09C 14410007 */ bne $v0, $at, .L8009F0BC /* 09FCA0 8009F0A0 3C0F8012 */ lui $t7, %hi(D_80126D0C) # $t7, 0x8012 @@ -69,7 +69,7 @@ glabel func_8009F034 /* 09FD2C 8009F12C 3C018012 */ lui $at, %hi(D_80126D35) # $at, 0x8012 /* 09FD30 8009F130 A0206D35 */ sb $zero, %lo(D_80126D35)($at) /* 09FD34 8009F134 3C018012 */ lui $at, %hi(D_80126CD0) # $at, 0x8012 -/* 09FD38 8009F138 26100300 */ addiu $s0, %lo(D_80000300) # addiu $s0, $s0, 0x300 +/* 09FD38 8009F138 26100300 */ addiu $s0, %lo(osTvType) # addiu $s0, $s0, 0x300 /* 09FD3C 8009F13C A0206CD0 */ sb $zero, %lo(D_80126CD0)($at) /* 09FD40 8009F140 8E0E0000 */ lw $t6, ($s0) /* 09FD44 8009F144 2419FF9C */ li $t9, -100 @@ -739,7 +739,7 @@ glabel func_8009F034 /* 0A06F8 8009FAF8 240C0001 */ li $t4, 1 /* 0A06FC 8009FAFC 24010041 */ li $at, 65 /* 0A0700 8009FB00 10410046 */ beq $v0, $at, .L8009FC1C -/* 0A0704 8009FB04 3C0F8000 */ lui $t7, %hi(D_80000300) # $t7, 0x8000 +/* 0A0704 8009FB04 3C0F8000 */ lui $t7, %hi(osTvType) # $t7, 0x8000 /* 0A0708 8009FB08 10000085 */ b .L8009FD20 /* 0A070C 8009FB0C 00000000 */ nop .L8009FB10: @@ -811,7 +811,7 @@ glabel func_8009F034 /* 0A0814 8009FC14 10000042 */ b .L8009FD20 /* 0A0818 8009FC18 E484020C */ swc1 $f4, 0x20c($a0) .L8009FC1C: -/* 0A081C 8009FC1C 8DEF0300 */ lw $t7, %lo(D_80000300)($t7) +/* 0A081C 8009FC1C 8DEF0300 */ lw $t7, %lo(osTvType)($t7) /* 0A0820 8009FC20 3C028012 */ lui $v0, %hi(D_80126D37) # $v0, 0x8012 /* 0A0824 8009FC24 15E00007 */ bnez $t7, .L8009FC44 /* 0A0828 8009FC28 00000000 */ nop @@ -940,8 +940,8 @@ glabel func_8009F034 /* 0A09FC 8009FDFC 46142180 */ add.s $f6, $f4, $f20 /* 0A0A00 8009FE00 E486020C */ swc1 $f6, 0x20c($a0) .L8009FE04: -/* 0A0A04 8009FE04 3C188000 */ lui $t8, %hi(D_80000300) # $t8, 0x8000 -/* 0A0A08 8009FE08 8F180300 */ lw $t8, %lo(D_80000300)($t8) +/* 0A0A04 8009FE04 3C188000 */ lui $t8, %hi(osTvType) # $t8, 0x8000 +/* 0A0A08 8009FE08 8F180300 */ lw $t8, %lo(osTvType)($t8) /* 0A0A0C 8009FE0C 00000000 */ nop /* 0A0A10 8009FE10 17000053 */ bnez $t8, .L8009FF60 /* 0A0A14 8009FE14 00000000 */ nop diff --git a/asm/non_matchings/unknown_09F8F0/func_800A14F0.s b/asm/non_matchings/unknown_09F8F0/func_800A14F0.s index b5502492..c1e39f9b 100644 --- a/asm/non_matchings/unknown_09F8F0/func_800A14F0.s +++ b/asm/non_matchings/unknown_09F8F0/func_800A14F0.s @@ -243,9 +243,9 @@ glabel func_800A14F0 .L800A1878: /* 0A2478 800A1878 24010002 */ li $at, 2 /* 0A247C 800A187C 14610027 */ bne $v1, $at, .L800A191C -/* 0A2480 800A1880 3C0E8000 */ lui $t6, %hi(D_80000300) # $t6, 0x8000 +/* 0A2480 800A1880 3C0E8000 */ lui $t6, %hi(osTvType) # $t6, 0x8000 /* 0A2484 800A1884 E44E064C */ swc1 $f14, 0x64c($v0) -/* 0A2488 800A1888 8DCE0300 */ lw $t6, %lo(D_80000300)($t6) +/* 0A2488 800A1888 8DCE0300 */ lw $t6, %lo(osTvType)($t6) /* 0A248C 800A188C 00000000 */ nop /* 0A2490 800A1890 15C00014 */ bnez $t6, .L800A18E4 /* 0A2494 800A1894 00000000 */ nop diff --git a/asm/non_matchings/unknown_09F8F0/func_800A1E48.s b/asm/non_matchings/unknown_09F8F0/func_800A1E48.s index f69778be..ef5283d6 100644 --- a/asm/non_matchings/unknown_09F8F0/func_800A1E48.s +++ b/asm/non_matchings/unknown_09F8F0/func_800A1E48.s @@ -178,8 +178,8 @@ glabel func_800A1E48 /* 0A2CF4 800A20F4 26940044 */ addiu $s4, $s4, 0x44 .L800A20F8: /* 0A2CF8 800A20F8 17C30015 */ bne $fp, $v1, .L800A2150 -/* 0A2CFC 800A20FC 3C0F8000 */ lui $t7, %hi(D_80000300) # $t7, 0x8000 -/* 0A2D00 800A2100 8DEF0300 */ lw $t7, %lo(D_80000300)($t7) +/* 0A2CFC 800A20FC 3C0F8000 */ lui $t7, %hi(osTvType) # $t7, 0x8000 +/* 0A2D00 800A2100 8DEF0300 */ lw $t7, %lo(osTvType)($t7) /* 0A2D04 800A2104 00000000 */ nop /* 0A2D08 800A2108 15E00010 */ bnez $t7, .L800A214C /* 0A2D0C 800A210C 00000000 */ nop diff --git a/asm/non_matchings/unknown_09F8F0/func_800A277C.s b/asm/non_matchings/unknown_09F8F0/func_800A277C.s index 7beacf94..1a85c47d 100644 --- a/asm/non_matchings/unknown_09F8F0/func_800A277C.s +++ b/asm/non_matchings/unknown_09F8F0/func_800A277C.s @@ -279,7 +279,7 @@ glabel func_800A277C /* 0A379C 800A2B9C 80A30193 */ lb $v1, 0x193($a1) /* 0A37A0 800A2BA0 00004025 */ move $t0, $zero /* 0A37A4 800A2BA4 0460000C */ bltz $v1, .L800A2BD8 -/* 0A37A8 800A2BA8 3C188000 */ lui $t8, %hi(D_80000300) # $t8, 0x8000 +/* 0A37A8 800A2BA8 3C188000 */ lui $t8, %hi(osTvType) # $t8, 0x8000 /* 0A37AC 800A2BAC 00086880 */ sll $t5, $t0, 2 /* 0A37B0 800A2BB0 00AD8021 */ addu $s0, $a1, $t5 /* 0A37B4 800A2BB4 24020005 */ li $v0, 5 @@ -293,7 +293,7 @@ glabel func_800A277C /* 0A37D0 800A2BD0 1502FFF9 */ bne $t0, $v0, .L800A2BB8 /* 0A37D4 800A2BD4 00000000 */ nop .L800A2BD8: -/* 0A37D8 800A2BD8 8F180300 */ lw $t8, %lo(D_80000300)($t8) +/* 0A37D8 800A2BD8 8F180300 */ lw $t8, %lo(osTvType)($t8) /* 0A37DC 800A2BDC 34048CA0 */ li $a0, 36000 /* 0A37E0 800A2BE0 17000012 */ bnez $t8, .L800A2C2C /* 0A37E4 800A2BE4 00000000 */ nop diff --git a/asm/non_matchings/unknown_09F8F0/func_800A6254.s b/asm/non_matchings/unknown_09F8F0/func_800A6254.s index 155d2fc2..5b74f54c 100644 --- a/asm/non_matchings/unknown_09F8F0/func_800A6254.s +++ b/asm/non_matchings/unknown_09F8F0/func_800A6254.s @@ -161,8 +161,8 @@ glabel func_800A6254 /* 0A70B0 800A64B0 00000000 */ nop /* 0A70B4 800A64B4 A1C302FD */ sb $v1, 0x2fd($t6) .L800A64B8: -/* 0A70B8 800A64B8 3C048000 */ lui $a0, %hi(D_80000300) # $a0, 0x8000 -/* 0A70BC 800A64BC 24840300 */ addiu $a0, %lo(D_80000300) # addiu $a0, $a0, 0x300 +/* 0A70B8 800A64B8 3C048000 */ lui $a0, %hi(osTvType) # $a0, 0x8000 +/* 0A70BC 800A64BC 24840300 */ addiu $a0, %lo(osTvType) # addiu $a0, $a0, 0x300 /* 0A70C0 800A64C0 8C8F0000 */ lw $t7, ($a0) /* 0A70C4 800A64C4 00000000 */ nop /* 0A70C8 800A64C8 15E00013 */ bnez $t7, .L800A6518 diff --git a/asm/non_matchings/unknown_09F8F0/func_800A718C.s b/asm/non_matchings/unknown_09F8F0/func_800A718C.s index e9c841b9..b56f21d7 100644 --- a/asm/non_matchings/unknown_09F8F0/func_800A718C.s +++ b/asm/non_matchings/unknown_09F8F0/func_800A718C.s @@ -3,8 +3,8 @@ glabel func_800A718C /* 0A7D90 800A7190 AFBF0014 */ sw $ra, 0x14($sp) /* 0A7D94 800A7194 0C01BAA4 */ jal func_8006EA90 /* 0A7D98 800A7198 AFA40030 */ sw $a0, 0x30($sp) -/* 0A7D9C 800A719C 3C0E8000 */ lui $t6, %hi(D_80000300) # $t6, 0x8000 -/* 0A7DA0 800A71A0 8DCE0300 */ lw $t6, %lo(D_80000300)($t6) +/* 0A7D9C 800A719C 3C0E8000 */ lui $t6, %hi(osTvType) # $t6, 0x8000 +/* 0A7DA0 800A71A0 8DCE0300 */ lw $t6, %lo(osTvType)($t6) /* 0A7DA4 800A71A4 00402025 */ move $a0, $v0 /* 0A7DA8 800A71A8 15C00003 */ bnez $t6, .L800A71B8 /* 0A7DAC 800A71AC 240F0286 */ li $t7, 646 @@ -151,8 +151,8 @@ glabel func_800A718C /* 0A7FA8 800A73A8 24E702A0 */ addiu $a3, $a3, 0x2a0 /* 0A7FAC 800A73AC 0C019826 */ jal func_80066098 /* 0A7FB0 800A73B0 24040001 */ li $a0, 1 -/* 0A7FB4 800A73B4 3C188000 */ lui $t8, %hi(D_80000300) # $t8, 0x8000 -/* 0A7FB8 800A73B8 8F180300 */ lw $t8, %lo(D_80000300)($t8) +/* 0A7FB4 800A73B4 3C188000 */ lui $t8, %hi(osTvType) # $t8, 0x8000 +/* 0A7FB8 800A73B8 8F180300 */ lw $t8, %lo(osTvType)($t8) /* 0A7FBC 800A73BC 00000000 */ nop /* 0A7FC0 800A73C0 17000003 */ bnez $t8, .L800A73D0 /* 0A7FC4 800A73C4 00000000 */ nop diff --git a/asm/non_matchings/unknown_09F8F0/func_800A8474.s b/asm/non_matchings/unknown_09F8F0/func_800A8474.s index 6f03f37b..1e7d9b37 100644 --- a/asm/non_matchings/unknown_09F8F0/func_800A8474.s +++ b/asm/non_matchings/unknown_09F8F0/func_800A8474.s @@ -305,7 +305,7 @@ glabel func_800A8474 /* 0A94DC 800A88DC C4520670 */ lwc1 $f18, 0x670($v0) /* 0A94E0 800A88E0 44104000 */ mfc1 $s0, $f8 /* 0A94E4 800A88E4 444EF800 */ cfc1 $t6, $31 -/* 0A94E8 800A88E8 3C0C8000 */ lui $t4, %hi(D_80000300) # $t4, 0x8000 +/* 0A94E8 800A88E8 3C0C8000 */ lui $t4, %hi(osTvType) # $t4, 0x8000 /* 0A94EC 800A88EC 35C10003 */ ori $at, $t6, 3 /* 0A94F0 800A88F0 38210002 */ xori $at, $at, 2 /* 0A94F4 800A88F4 44C1F800 */ ctc1 $at, $31 @@ -345,7 +345,7 @@ glabel func_800A8474 /* 0A957C 800A897C 44815000 */ mtc1 $at, $f10 /* 0A9580 800A8980 46009224 */ cvt.w.s $f8, $f18 /* 0A9584 800A8984 E56A0650 */ swc1 $f10, 0x650($t3) -/* 0A9588 800A8988 8D8C0300 */ lw $t4, %lo(D_80000300)($t4) +/* 0A9588 800A8988 8D8C0300 */ lw $t4, %lo(osTvType)($t4) /* 0A958C 800A898C 44074000 */ mfc1 $a3, $f8 /* 0A9590 800A8990 44D8F800 */ ctc1 $t8, $31 /* 0A9594 800A8994 15800020 */ bnez $t4, .L800A8A18 @@ -566,10 +566,10 @@ glabel func_800A8474 /* 0A98B8 800A8CB8 3C014361 */ li $at, 0x43610000 # 225.000000 /* 0A98BC 800A8CBC 44818000 */ mtc1 $at, $f16 /* 0A98C0 800A8CC0 8E590000 */ lw $t9, ($s2) -/* 0A98C4 800A8CC4 3C0A8000 */ lui $t2, %hi(D_80000300) # $t2, 0x8000 +/* 0A98C4 800A8CC4 3C0A8000 */ lui $t2, %hi(osTvType) # $t2, 0x8000 /* 0A98C8 800A8CC8 E730064C */ swc1 $f16, 0x64c($t9) -/* 0A98CC 800A8CCC 8D4A0300 */ lw $t2, %lo(D_80000300)($t2) -/* 0A98D0 800A8CD0 3C0D8000 */ lui $t5, %hi(D_80000300) # $t5, 0x8000 +/* 0A98CC 800A8CCC 8D4A0300 */ lw $t2, %lo(osTvType)($t2) +/* 0A98D0 800A8CD0 3C0D8000 */ lui $t5, %hi(osTvType) # $t5, 0x8000 /* 0A98D4 800A8CD4 15400006 */ bnez $t2, .L800A8CF0 /* 0A98D8 800A8CD8 3C118012 */ lui $s1, %hi(D_80126CD5) # $s1, 0x8012 /* 0A98DC 800A8CDC 3C01800F */ li $at, 0x800F0000 # -0.000000 @@ -584,7 +584,7 @@ glabel func_800A8474 /* 0A98FC 800A8CFC 00000000 */ nop /* 0A9900 800A8D00 E5860650 */ swc1 $f6, 0x650($t4) .L800A8D04: -/* 0A9904 800A8D04 8DAD0300 */ lw $t5, %lo(D_80000300)($t5) +/* 0A9904 800A8D04 8DAD0300 */ lw $t5, %lo(osTvType)($t5) /* 0A9908 800A8D08 26316CD5 */ addiu $s1, %lo(D_80126CD5) # addiu $s1, $s1, 0x6cd5 /* 0A990C 800A8D0C 15A00020 */ bnez $t5, .L800A8D90 /* 0A9910 800A8D10 3C058012 */ lui $a1, %hi(D_80126D00) # $a1, 0x8012 @@ -652,7 +652,7 @@ glabel func_800A8474 /* 0A9A00 800A8E00 44835000 */ mtc1 $v1, $f10 /* 0A9A04 800A8E04 46802020 */ cvt.s.w $f0, $f4 /* 0A9A08 800A8E08 246A0001 */ addiu $t2, $v1, 1 -/* 0A9A0C 800A8E0C 3C0E8000 */ lui $t6, %hi(D_80000300) # $t6, 0x8000 +/* 0A9A0C 800A8E0C 3C0E8000 */ lui $t6, %hi(osTvType) # $t6, 0x8000 /* 0A9A10 800A8E10 46006180 */ add.s $f6, $f12, $f0 /* 0A9A14 800A8E14 3C068012 */ lui $a2, %hi(D_80126D04) # $a2, 0x8012 /* 0A9A18 800A8E18 E446036C */ swc1 $f6, 0x36c($v0) @@ -729,7 +729,7 @@ glabel func_800A8474 /* 0A9B34 800A8F34 8E4D0000 */ lw $t5, ($s2) /* 0A9B38 800A8F38 256C0038 */ addiu $t4, $t3, 0x38 /* 0A9B3C 800A8F3C A5AC0646 */ sh $t4, 0x646($t5) -/* 0A9B40 800A8F40 8DCE0300 */ lw $t6, %lo(D_80000300)($t6) +/* 0A9B40 800A8F40 8DCE0300 */ lw $t6, %lo(osTvType)($t6) /* 0A9B44 800A8F44 00000000 */ nop /* 0A9B48 800A8F48 15C0000D */ bnez $t6, .L800A8F80 /* 0A9B4C 800A8F4C 00000000 */ nop @@ -936,8 +936,8 @@ glabel func_800A8474 /* 0A9E58 800A9258 0C02917C */ jal func_800A45F0 /* 0A9E5C 800A925C AFA300D0 */ sw $v1, 0xd0($sp) /* 0A9E60 800A9260 3C01800F */ li $at, 0x800F0000 # -0.000000 -/* 0A9E64 800A9264 3C0E8000 */ lui $t6, %hi(D_80000300) # $t6, 0x8000 -/* 0A9E68 800A9268 8DCE0300 */ lw $t6, %lo(D_80000300)($t6) +/* 0A9E64 800A9264 3C0E8000 */ lui $t6, %hi(osTvType) # $t6, 0x8000 +/* 0A9E68 800A9268 8DCE0300 */ lw $t6, %lo(osTvType)($t6) /* 0A9E6C 800A926C C42187B8 */ lwc1 $f1, %lo(D_800E87B8)($at) /* 0A9E70 800A9270 C42087BC */ lwc1 $f0, %lo(D_800E87BC)($at) /* 0A9E74 800A9274 8FA300D0 */ lw $v1, 0xd0($sp) @@ -1099,7 +1099,7 @@ glabel func_800A8474 /* 0AA0B0 800A94B0 C4440410 */ lwc1 $f4, 0x410($v0) /* 0AA0B4 800A94B4 44103000 */ mfc1 $s0, $f6 /* 0AA0B8 800A94B8 444EF800 */ cfc1 $t6, $31 -/* 0AA0BC 800A94BC 3C0C8000 */ lui $t4, %hi(D_80000300) # $t4, 0x8000 +/* 0AA0BC 800A94BC 3C0C8000 */ lui $t4, %hi(osTvType) # $t4, 0x8000 /* 0AA0C0 800A94C0 35C10003 */ ori $at, $t6, 3 /* 0AA0C4 800A94C4 38210002 */ xori $at, $at, 2 /* 0AA0C8 800A94C8 44C1F800 */ ctc1 $at, $31 @@ -1139,7 +1139,7 @@ glabel func_800A8474 /* 0AA150 800A9550 44818000 */ mtc1 $at, $f16 /* 0AA154 800A9554 460021A4 */ cvt.w.s $f6, $f4 /* 0AA158 800A9558 E5700410 */ swc1 $f16, 0x410($t3) -/* 0AA15C 800A955C 8D8C0300 */ lw $t4, %lo(D_80000300)($t4) +/* 0AA15C 800A955C 8D8C0300 */ lw $t4, %lo(osTvType)($t4) /* 0AA160 800A9560 44053000 */ mfc1 $a1, $f6 /* 0AA164 800A9564 44D8F800 */ ctc1 $t8, $31 /* 0AA168 800A9568 1580003C */ bnez $t4, .L800A965C @@ -1541,8 +1541,8 @@ glabel func_800A8474 .L800A9B34: /* 0AA734 800A9B34 AE0F0000 */ sw $t7, ($s0) .L800A9B38: -/* 0AA738 800A9B38 3C0E8000 */ lui $t6, %hi(D_80000300) # $t6, 0x8000 -/* 0AA73C 800A9B3C 8DCE0300 */ lw $t6, %lo(D_80000300)($t6) +/* 0AA738 800A9B38 3C0E8000 */ lui $t6, %hi(osTvType) # $t6, 0x8000 +/* 0AA73C 800A9B3C 8DCE0300 */ lw $t6, %lo(osTvType)($t6) /* 0AA740 800A9B40 00000000 */ nop /* 0AA744 800A9B44 15C00013 */ bnez $t6, .L800A9B94 /* 0AA748 800A9B48 00000000 */ nop @@ -1579,9 +1579,9 @@ glabel func_800A8474 /* 0AA7C0 800A9BC0 014B6021 */ addu $t4, $t2, $t3 /* 0AA7C4 800A9BC4 018D7821 */ addu $t7, $t4, $t5 /* 0AA7C8 800A9BC8 448F8000 */ mtc1 $t7, $f16 -/* 0AA7CC 800A9BCC 3C188000 */ lui $t8, %hi(D_80000300) # $t8, 0x8000 +/* 0AA7CC 800A9BCC 3C188000 */ lui $t8, %hi(osTvType) # $t8, 0x8000 /* 0AA7D0 800A9BD0 46808020 */ cvt.s.w $f0, $f16 -/* 0AA7D4 800A9BD4 8F180300 */ lw $t8, %lo(D_80000300)($t8) +/* 0AA7D4 800A9BD4 8F180300 */ lw $t8, %lo(osTvType)($t8) /* 0AA7D8 800A9BD8 E7B20130 */ swc1 $f18, 0x130($sp) /* 0AA7DC 800A9BDC 17000006 */ bnez $t8, .L800A9BF8 /* 0AA7E0 800A9BE0 E7A0012C */ swc1 $f0, 0x12c($sp) @@ -2022,13 +2022,13 @@ glabel func_800A8474 /* 0AAE64 800AA264 8FA50148 */ lw $a1, 0x148($sp) /* 0AAE68 800AA268 304D0040 */ andi $t5, $v0, 0x40 /* 0AAE6C 800AA26C 11A00005 */ beqz $t5, .L800AA284 -/* 0AAE70 800AA270 3C0A8000 */ lui $t2, %hi(D_80000300) # $t2, 0x8000 +/* 0AAE70 800AA270 3C0A8000 */ lui $t2, %hi(osTvType) # $t2, 0x8000 /* 0AAE74 800AA274 80AB01D8 */ lb $t3, 0x1d8($a1) /* 0AAE78 800AA278 00000000 */ nop /* 0AAE7C 800AA27C 15600038 */ bnez $t3, .L800AA360 /* 0AAE80 800AA280 00000000 */ nop .L800AA284: -/* 0AAE84 800AA284 8D4A0300 */ lw $t2, %lo(D_80000300)($t2) +/* 0AAE84 800AA284 8D4A0300 */ lw $t2, %lo(osTvType)($t2) /* 0AAE88 800AA288 3C014080 */ li $at, 0x40800000 # 4.000000 /* 0AAE8C 800AA28C 15400007 */ bnez $t2, .L800AA2AC /* 0AAE90 800AA290 00000000 */ nop diff --git a/asm/non_matchings/unknown_09F8F0/func_800AA600.s b/asm/non_matchings/unknown_09F8F0/func_800AA600.s index ac82716b..b6969b86 100644 --- a/asm/non_matchings/unknown_09F8F0/func_800AA600.s +++ b/asm/non_matchings/unknown_09F8F0/func_800AA600.s @@ -183,18 +183,18 @@ glabel func_800AA600 /* 0AB4AC 800AA8AC 3C198012 */ lui $t9, 0x8012 /* 0AB4B0 800AA8B0 29010036 */ slti $at, $t0, 0x36 /* 0AB4B4 800AA8B4 10200092 */ beqz $at, .L800AAB00 -/* 0AB4B8 800AA8B8 3C048000 */ lui $a0, %hi(D_80000300) # $a0, 0x8000 -/* 0AB4BC 800AA8BC 8C840300 */ lw $a0, %lo(D_80000300)($a0) +/* 0AB4B8 800AA8B8 3C048000 */ lui $a0, %hi(osTvType) # $a0, 0x8000 +/* 0AB4BC 800AA8BC 8C840300 */ lw $a0, %lo(osTvType)($a0) /* 0AB4C0 800AA8C0 3C014100 */ li $at, 0x41000000 # 8.000000 /* 0AB4C4 800AA8C4 14800009 */ bnez $a0, .L800AA8EC /* 0AB4C8 800AA8C8 3C0C8012 */ lui $t4, %hi(D_80126CD3) # $t4, 0x8012 /* 0AB4CC 800AA8CC C6080010 */ lwc1 $f8, 0x10($s0) /* 0AB4D0 800AA8D0 44815000 */ mtc1 $at, $f10 -/* 0AB4D4 800AA8D4 3C048000 */ lui $a0, %hi(D_80000300) # $a0, 0x8000 +/* 0AB4D4 800AA8D4 3C048000 */ lui $a0, %hi(osTvType) # $a0, 0x8000 /* 0AB4D8 800AA8D8 460A4401 */ sub.s $f16, $f8, $f10 /* 0AB4DC 800AA8DC 86080006 */ lh $t0, 6($s0) /* 0AB4E0 800AA8E0 E6100010 */ swc1 $f16, 0x10($s0) -/* 0AB4E4 800AA8E4 8C840300 */ lw $a0, %lo(D_80000300)($a0) +/* 0AB4E4 800AA8E4 8C840300 */ lw $a0, %lo(osTvType)($a0) /* 0AB4E8 800AA8E8 00000000 */ nop .L800AA8EC: /* 0AB4EC 800AA8EC 818C6CD3 */ lb $t4, %lo(D_80126CD3)($t4) @@ -327,8 +327,8 @@ glabel func_800AA600 /* 0AB6CC 800AAACC 0C01E2AE */ jal func_80078AB8 /* 0AB6D0 800AAAD0 AFA3001C */ sw $v1, 0x1c($sp) .L800AAAD4: -/* 0AB6D4 800AAAD4 3C0F8000 */ lui $t7, %hi(D_80000300) # $t7, 0x8000 -/* 0AB6D8 800AAAD8 8DEF0300 */ lw $t7, %lo(D_80000300)($t7) +/* 0AB6D4 800AAAD4 3C0F8000 */ lui $t7, %hi(osTvType) # $t7, 0x8000 +/* 0AB6D8 800AAAD8 8DEF0300 */ lw $t7, %lo(osTvType)($t7) /* 0AB6DC 800AAADC 3C014100 */ li $at, 0x41000000 # 8.000000 /* 0AB6E0 800AAAE0 15E00107 */ bnez $t7, .L800AAF00 /* 0AB6E4 800AAAE4 00000000 */ nop @@ -340,10 +340,10 @@ glabel func_800AA600 /* 0AB6FC 800AAAFC E60A0010 */ swc1 $f10, 0x10($s0) .L800AAB00: /* 0AB700 800AAB00 83396CD5 */ lb $t9, %lo(D_80126CD5)($t9) -/* 0AB704 800AAB04 3C188000 */ lui $t8, %hi(D_80000300) # $t8, 0x8000 +/* 0AB704 800AAB04 3C188000 */ lui $t8, %hi(osTvType) # $t8, 0x8000 /* 0AB708 800AAB08 13200028 */ beqz $t9, .L800AABAC /* 0AB70C 800AAB0C 3C013FF0 */ lui $at, 0x3ff0 -/* 0AB710 800AAB10 8F180300 */ lw $t8, %lo(D_80000300)($t8) +/* 0AB710 800AAB10 8F180300 */ lw $t8, %lo(osTvType)($t8) /* 0AB714 800AAB14 00000000 */ nop /* 0AB718 800AAB18 17000024 */ bnez $t8, .L800AABAC /* 0AB71C 800AAB1C 00000000 */ nop diff --git a/asm/non_matchings/unknown_09F8F0/func_800AD2C4.s b/asm/non_matchings/unknown_09F8F0/func_800AD2C4.s index 2a3b6cde..ba485f55 100644 --- a/asm/non_matchings/unknown_09F8F0/func_800AD2C4.s +++ b/asm/non_matchings/unknown_09F8F0/func_800AD2C4.s @@ -1,6 +1,6 @@ glabel func_800AD2C4 -/* 0ADEC4 800AD2C4 3C0E8000 */ lui $t6, %hi(D_80000300) # $t6, 0x8000 -/* 0ADEC8 800AD2C8 8DCE0300 */ lw $t6, %lo(D_80000300)($t6) +/* 0ADEC4 800AD2C4 3C0E8000 */ lui $t6, %hi(osTvType) # $t6, 0x8000 +/* 0ADEC8 800AD2C8 8DCE0300 */ lw $t6, %lo(osTvType)($t6) /* 0ADECC 800AD2CC 44866000 */ mtc1 $a2, $f12 /* 0ADED0 800AD2D0 15C00012 */ bnez $t6, .L800AD31C /* 0ADED4 800AD2D4 3C06800E */ lui $a2, %hi(D_800E2C68) # $a2, 0x800e diff --git a/asm/non_matchings/unknown_0B8920/func_800BF634.s b/asm/non_matchings/unknown_0B8920/func_800BF634.s index bfeb988d..f64be6ea 100644 --- a/asm/non_matchings/unknown_0B8920/func_800BF634.s +++ b/asm/non_matchings/unknown_0B8920/func_800BF634.s @@ -141,7 +141,7 @@ glabel func_800BF634 /* 0C0424 800BF824 C7A40008 */ lwc1 $f4, 8($sp) /* 0C0428 800BF828 E4AC0008 */ swc1 $f12, 8($a1) /* 0C042C 800BF82C 460E2180 */ add.s $f6, $f4, $f14 -/* 0C0430 800BF830 3C0F8000 */ lui $t7, %hi(D_80000300) # $t7, 0x8000 +/* 0C0430 800BF830 3C0F8000 */ lui $t7, %hi(osTvType) # $t7, 0x8000 /* 0C0434 800BF834 E4A60004 */ swc1 $f6, 4($a1) /* 0C0438 800BF838 460E7282 */ mul.s $f10, $f14, $f14 /* 0C043C 800BF83C C7A80008 */ lwc1 $f8, 8($sp) @@ -152,7 +152,7 @@ glabel func_800BF634 /* 0C0450 800BF850 8FAE0010 */ lw $t6, 0x10($sp) /* 0C0454 800BF854 3C01800F */ lui $at, 0x800f /* 0C0458 800BF858 A4AE001A */ sh $t6, 0x1a($a1) -/* 0C045C 800BF85C 8DEF0300 */ lw $t7, %lo(D_80000300)($t7) +/* 0C045C 800BF85C 8DEF0300 */ lw $t7, %lo(osTvType)($t7) /* 0C0460 800BF860 C7A00014 */ lwc1 $f0, 0x14($sp) /* 0C0464 800BF864 15E0002B */ bnez $t7, .L800BF914 /* 0C0468 800BF868 00000000 */ nop @@ -460,13 +460,13 @@ glabel func_800BF634 /* 0C08A8 800BFCA8 C482000C */ lwc1 $f2, 0xc($a0) /* 0C08AC 800BFCAC C4860028 */ lwc1 $f6, 0x28($a0) /* 0C08B0 800BFCB0 46001481 */ sub.s $f18, $f2, $f0 -/* 0C08B4 800BFCB4 3C0E8000 */ lui $t6, %hi(D_80000300) # $t6, 0x8000 +/* 0C08B4 800BFCB4 3C0E8000 */ lui $t6, %hi(osTvType) # $t6, 0x8000 /* 0C08B8 800BFCB8 46001100 */ add.s $f4, $f2, $f0 /* 0C08BC 800BFCBC E4920000 */ swc1 $f18, ($a0) /* 0C08C0 800BFCC0 460E3200 */ add.s $f8, $f6, $f14 /* 0C08C4 800BFCC4 E4840004 */ swc1 $f4, 4($a0) /* 0C08C8 800BFCC8 E4880028 */ swc1 $f8, 0x28($a0) -/* 0C08CC 800BFCCC 8DCE0300 */ lw $t6, %lo(D_80000300)($t6) +/* 0C08CC 800BFCCC 8DCE0300 */ lw $t6, %lo(osTvType)($t6) /* 0C08D0 800BFCD0 3C01800F */ lui $at, 0x800f /* 0C08D4 800BFCD4 15C0002B */ bnez $t6, .L800BFD84 /* 0C08D8 800BFCD8 00000000 */ nop diff --git a/asm/non_matchings/unknown_0B8920/func_800C05C8.s b/asm/non_matchings/unknown_0B8920/func_800C05C8.s index 6f1242d1..200604a6 100644 --- a/asm/non_matchings/unknown_0B8920/func_800C05C8.s +++ b/asm/non_matchings/unknown_0B8920/func_800C05C8.s @@ -8,8 +8,8 @@ glabel func_800C05C8 /* 0C11E0 800C05E0 00A08825 */ move $s1, $a1 /* 0C11E4 800C05E4 11C0004A */ beqz $t6, .L800C0710 /* 0C11E8 800C05E8 AFBF001C */ sw $ra, 0x1c($sp) -/* 0C11EC 800C05EC 3C0F8000 */ lui $t7, %hi(D_80000300) # $t7, 0x8000 -/* 0C11F0 800C05F0 8DEF0300 */ lw $t7, %lo(D_80000300)($t7) +/* 0C11EC 800C05EC 3C0F8000 */ lui $t7, %hi(osTvType) # $t7, 0x8000 +/* 0C11F0 800C05F0 8DEF0300 */ lw $t7, %lo(osTvType)($t7) /* 0C11F4 800C05F4 3C01800F */ lui $at, 0x800f /* 0C11F8 800C05F8 15E00008 */ bnez $t7, .L800C061C /* 0C11FC 800C05FC 00000000 */ nop diff --git a/asm/non_matchings/unknown_0B8920/func_800C29F0.s b/asm/non_matchings/unknown_0B8920/func_800C29F0.s index 3ec7d2c8..e7a61e5e 100644 --- a/asm/non_matchings/unknown_0B8920/func_800C29F0.s +++ b/asm/non_matchings/unknown_0B8920/func_800C29F0.s @@ -22,8 +22,8 @@ glabel func_800C29F0 /* 0C3640 800C2A40 3C018013 */ lui $at, %hi(D_8012A7BA) # $at, 0x8013 /* 0C3644 800C2A44 A420A7BA */ sh $zero, %lo(D_8012A7BA)($at) /* 0C3648 800C2A48 3C018013 */ lui $at, %hi(D_8012A7AE) # $at, 0x8013 -/* 0C364C 800C2A4C 3C198000 */ lui $t9, %hi(D_80000300) # $t9, 0x8000 -/* 0C3650 800C2A50 8F390300 */ lw $t9, %lo(D_80000300)($t9) +/* 0C364C 800C2A4C 3C198000 */ lui $t9, %hi(osTvType) # $t9, 0x8000 +/* 0C3650 800C2A50 8F390300 */ lw $t9, %lo(osTvType)($t9) /* 0C3654 800C2A54 A424A7AE */ sh $a0, %lo(D_8012A7AE)($at) /* 0C3658 800C2A58 3C018013 */ lui $at, %hi(D_8012A7B2) # $at, 0x8013 /* 0C365C 800C2A5C 24180120 */ li $t8, 288 diff --git a/asm/non_matchings/unknown_0B8920/func_800C3158.s b/asm/non_matchings/unknown_0B8920/func_800C3158.s index 13e9e64a..faabe106 100644 --- a/asm/non_matchings/unknown_0B8920/func_800C3158.s +++ b/asm/non_matchings/unknown_0B8920/func_800C3158.s @@ -1,6 +1,6 @@ glabel func_800C3158 -/* 0C3D58 800C3158 3C0E8000 */ lui $t6, %hi(D_80000300) # $t6, 0x8000 -/* 0C3D5C 800C315C 8DCE0300 */ lw $t6, %lo(D_80000300)($t6) +/* 0C3D58 800C3158 3C0E8000 */ lui $t6, %hi(osTvType) # $t6, 0x8000 +/* 0C3D5C 800C315C 8DCE0300 */ lw $t6, %lo(osTvType)($t6) /* 0C3D60 800C3160 44856000 */ mtc1 $a1, $f12 /* 0C3D64 800C3164 15C00010 */ bnez $t6, .L800C31A8 /* 0C3D68 800C3168 3C01404E */ lui $at, 0x404e diff --git a/asm/non_matchings/unknown_0B8920/func_800C38B4.s b/asm/non_matchings/unknown_0B8920/func_800C38B4.s index 04f2e518..5d500bd3 100644 --- a/asm/non_matchings/unknown_0B8920/func_800C38B4.s +++ b/asm/non_matchings/unknown_0B8920/func_800C38B4.s @@ -53,7 +53,7 @@ glabel func_800C38B4 /* 0C457C 800C397C 1000008E */ b .L800C3BB8 /* 0C4580 800C3980 28410003 */ slti $at, $v0, 3 /* 0C4584 800C3984 92090001 */ lbu $t1, 1($s0) -/* 0C4588 800C3988 3C0E8000 */ lui $t6, %hi(D_80000300) # $t6, 0x8000 +/* 0C4588 800C3988 3C0E8000 */ lui $t6, %hi(osTvType) # $t6, 0x8000 /* 0C458C 800C398C AE490004 */ sw $t1, 4($s2) /* 0C4590 800C3990 8E6A0000 */ lw $t2, ($s3) /* 0C4594 800C3994 240100F0 */ li $at, 240 @@ -61,7 +61,7 @@ glabel func_800C38B4 /* 0C459C 800C399C 916D0002 */ lbu $t5, 2($t3) /* 0C45A0 800C39A0 00000000 */ nop /* 0C45A4 800C39A4 AE4D0008 */ sw $t5, 8($s2) -/* 0C45A8 800C39A8 8DCE0300 */ lw $t6, %lo(D_80000300)($t6) +/* 0C45A8 800C39A8 8DCE0300 */ lw $t6, %lo(osTvType)($t6) /* 0C45AC 800C39AC 000D7940 */ sll $t7, $t5, 5 /* 0C45B0 800C39B0 15C00007 */ bnez $t6, .L800C39D0 /* 0C45B4 800C39B4 01ED7821 */ addu $t7, $t7, $t5 diff --git a/asm/non_matchings/unknown_0CCF90/func_800CC5A0.s b/asm/non_matchings/unknown_0CCF90/func_800CC5A0.s index fe8cdad4..fe2cf382 100644 --- a/asm/non_matchings/unknown_0CCF90/func_800CC5A0.s +++ b/asm/non_matchings/unknown_0CCF90/func_800CC5A0.s @@ -129,14 +129,14 @@ glabel func_800CC5A0 /* 0CD388 800CC788 24060000 */ li $a2, 0 /* 0CD38C 800CC78C 0C033AB2 */ jal __ull_div /* 0CD390 800CC790 24070004 */ li $a3, 4 -/* 0CD394 800CC794 3C098000 */ lui $t1, %hi(D_8000030C) # $t1, 0x8000 -/* 0CD398 800CC798 8D29030C */ lw $t1, %lo(D_8000030C)($t1) +/* 0CD394 800CC794 3C098000 */ lui $t1, %hi(osResetType) # $t1, 0x8000 +/* 0CD398 800CC798 8D29030C */ lw $t1, %lo(osResetType)($t1) /* 0CD39C 800CC79C 3C01800E */ lui $at, %hi(D_800E38A4) # $at, 0x800e /* 0CD3A0 800CC7A0 AC2238A0 */ sw $v0, %lo(D_800E38A0)($at) /* 0CD3A4 800CC7A4 15200005 */ bnez $t1, .L800CC7BC /* 0CD3A8 800CC7A8 AC2338A4 */ sw $v1, %lo(D_800E38A4)($at) -/* 0CD3AC 800CC7AC 3C048000 */ lui $a0, %hi(D_8000031C) # $a0, 0x8000 -/* 0CD3B0 800CC7B0 2484031C */ addiu $a0, %lo(D_8000031C) # addiu $a0, $a0, 0x31c +/* 0CD3AC 800CC7AC 3C048000 */ lui $a0, %hi(osAppNMIBuffer) # $a0, 0x8000 +/* 0CD3B0 800CC7B0 2484031C */ addiu $a0, %lo(osAppNMIBuffer) # addiu $a0, $a0, 0x31c /* 0CD3B4 800CC7B4 0C034138 */ jal func_800D04E0 /* 0CD3B8 800CC7B8 24050040 */ li $a1, 64 .L800CC7BC: diff --git a/asm/non_matchings/unknown_0D3020/D_800D25A0.s b/asm/non_matchings/unknown_0D3020/D_800D25A0.s index e5e195de..ddcf58ca 100644 --- a/asm/non_matchings/unknown_0D3020/D_800D25A0.s +++ b/asm/non_matchings/unknown_0D3020/D_800D25A0.s @@ -23,8 +23,8 @@ glabel D_800D25A0 /* 0D31EC 800D25EC 8FA40030 */ lw $a0, 0x30($sp) /* 0D31F0 800D25F0 3C08A460 */ lui $t0, 0xa460 /* 0D31F4 800D25F4 AD020000 */ sw $v0, ($t0) -/* 0D31F8 800D25F8 3C098000 */ lui $t1, %hi(D_80000308) # $t1, 0x8000 -/* 0D31FC 800D25FC 8D290308 */ lw $t1, %lo(D_80000308)($t1) +/* 0D31F8 800D25F8 3C098000 */ lui $t1, %hi(osRomBase) # $t1, 0x8000 +/* 0D31FC 800D25FC 8D290308 */ lw $t1, %lo(osRomBase)($t1) /* 0D3200 800D2600 8FAA002C */ lw $t2, 0x2c($sp) /* 0D3204 800D2604 3C011FFF */ lui $at, (0x1FFFFFFF >> 16) # lui $at, 0x1fff /* 0D3208 800D2608 3421FFFF */ ori $at, (0x1FFFFFFF & 0xFFFF) # ori $at, $at, 0xffff diff --git a/asm/non_matchings/unknown_0D3020/func_800D2B10.s b/asm/non_matchings/unknown_0D3020/func_800D2B10.s index 0e1c962f..0564551a 100644 --- a/asm/non_matchings/unknown_0D3020/func_800D2B10.s +++ b/asm/non_matchings/unknown_0D3020/func_800D2B10.s @@ -17,9 +17,9 @@ glabel func_800D2B10 /* 0D374C 800D2B4C 3C08800E */ lui $t0, %hi(D_800E4870) # $t0, 0x800e /* 0D3750 800D2B50 8D084870 */ lw $t0, %lo(D_800E4870)($t0) /* 0D3754 800D2B54 24190001 */ li $t9, 1 -/* 0D3758 800D2B58 3C098000 */ lui $t1, %hi(D_80000300) # $t1, 0x8000 +/* 0D3758 800D2B58 3C098000 */ lui $t1, %hi(osTvType) # $t1, 0x8000 /* 0D375C 800D2B5C A5190002 */ sh $t9, 2($t0) -/* 0D3760 800D2B60 8D290300 */ lw $t1, %lo(D_80000300)($t1) +/* 0D3760 800D2B60 8D290300 */ lw $t1, %lo(osTvType)($t1) /* 0D3764 800D2B64 1520000B */ bnez $t1, .L800D2B94 /* 0D3768 800D2B68 00000000 */ nop /* 0D376C 800D2B6C 3C0B800E */ lui $t3, %hi(D_800E4874) # $t3, 0x800e @@ -33,8 +33,8 @@ glabel func_800D2B10 /* 0D378C 800D2B8C 10000019 */ b .L800D2BF4 /* 0D3790 800D2B90 AC2C4878 */ sw $t4, %lo(D_800E4878)($at) .L800D2B94: -/* 0D3794 800D2B94 3C0D8000 */ lui $t5, %hi(D_80000300) # $t5, 0x8000 -/* 0D3798 800D2B98 8DAD0300 */ lw $t5, %lo(D_80000300)($t5) +/* 0D3794 800D2B94 3C0D8000 */ lui $t5, %hi(osTvType) # $t5, 0x8000 +/* 0D3798 800D2B98 8DAD0300 */ lw $t5, %lo(osTvType)($t5) /* 0D379C 800D2B9C 24010002 */ li $at, 2 /* 0D37A0 800D2BA0 15A1000B */ bne $t5, $at, .L800D2BD0 /* 0D37A4 800D2BA4 00000000 */ nop diff --git a/asm/non_matchings/unknown_0D3020/func_800D4790.s b/asm/non_matchings/unknown_0D3020/func_800D4790.s index 4658f8b4..b5ef0b58 100644 --- a/asm/non_matchings/unknown_0D3020/func_800D4790.s +++ b/asm/non_matchings/unknown_0D3020/func_800D4790.s @@ -12,8 +12,8 @@ glabel func_800D4790 /* 0D53B4 800D47B4 1720FFFC */ bnez $t9, .L800D47A8 /* 0D53B8 800D47B8 00000000 */ nop .L800D47BC: -/* 0D53BC 800D47BC 3C088000 */ lui $t0, %hi(D_80000308) # $t0, 0x8000 -/* 0D53C0 800D47C0 8D080308 */ lw $t0, %lo(D_80000308)($t0) +/* 0D53BC 800D47BC 3C088000 */ lui $t0, %hi(osRomBase) # $t0, 0x8000 +/* 0D53C0 800D47C0 8D080308 */ lw $t0, %lo(osRomBase)($t0) /* 0D53C4 800D47C4 3C01A000 */ lui $at, 0xa000 /* 0D53C8 800D47C8 00001025 */ move $v0, $zero /* 0D53CC 800D47CC 01044825 */ or $t1, $t0, $a0 diff --git a/extract-ver/dkr-us-1.0.extract-config b/extract-ver/dkr-us-1.0.extract-config index 81c16aa1..e3e00c0d 100755 --- a/extract-ver/dkr-us-1.0.extract-config +++ b/extract-ver/dkr-us-1.0.extract-config @@ -28,17 +28,12 @@ subfolder: "us_1.0" # [0x001000, 0x0D8200] = Game code, not extracted [0xD7200]: "NoExtract" -# [0x0D8200, 0x0D90C0] = Unknown -[0xEC0]: "Binary", "unknown", "bin" - -# ---------------------- Microcode ---------------------- # +# [0x0D8200, 0x0D90C0] = Unknown microcode +[0xEC0]: "Binary", "unknown_ucode", "ucode" # [0x0D90C0, 0x0D9190] = Microcode boot code [0xD0]: "Binary", "ucode_boot", "ucode" -# F3DDKR is a modified version of Fast3D -# TODO: Audio microcode - # [0x0D9190, 0x0DA390] = DRAM Dump version of F3DDKR [0x1200]: "Binary", "f3ddkr_dram", "ucode" @@ -48,10 +43,10 @@ subfolder: "us_1.0" # [0x0DB570, 0x0DC770] = XBUS version of F3DDKR [0x1200]: "Binary", "f3ddkr_xbus", "ucode" -# [0x0DC770, 0x0DD230] = Unknown microcode (Probably audio) +# [0x0DC770, 0x0DD230] = Unknown microcode [0xAC0]: "Binary", "unknown_ucode", "ucode" -# [0x0DD230, 0x0EA7A0] = Unknown +# [0x0DD230, 0x0EA7A0] = Unknown (Might be .data section?) [0xD570]: "Binary", "unknown", "bin" # [0x0EA7A0, 0x0EAFA0] = Data section of F3DDKR-DRAM @@ -63,8 +58,6 @@ subfolder: "us_1.0" # [0x0EB7A0, 0x0EBFA0] = Data section of F3DDKR-XBUS [0x800]: "Binary", "f3ddkr_xbus_data", "ucode" -# ------------------------------------------------------- # - # [0x0EBFA0, 0x0ECD50] = Unknown [0xDB0]: "Binary", "unknown", "bin" diff --git a/src/mips1/unknown_066AA0.c b/src/mips1/unknown_066AA0.c index 34ca2abd..e8b14785 100644 --- a/src/mips1/unknown_066AA0.c +++ b/src/mips1/unknown_066AA0.c @@ -4,7 +4,7 @@ #include "types.h" #include "macros.h" -extern u32 D_80000300; +extern u32 osTvType; extern s32 D_80120CE0; extern s32 D_80120CE4; extern f32 D_80120D10; @@ -18,7 +18,7 @@ GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_80066060.s") void func_80066098(s8 arg0) { s8 temp = (arg0 << 24) >> 24; - if (!D_80000300) { + if (!osTvType) { D_80120D15 = temp; } } diff --git a/src/mips1/unknown_080500.c b/src/mips1/unknown_080500.c index 3af4f88b..0fa757b1 100644 --- a/src/mips1/unknown_080500.c +++ b/src/mips1/unknown_080500.c @@ -36,7 +36,7 @@ extern s32 D_800DF4B8; extern s32 D_800DF4BC; extern s32 D_800DF4C0; extern s32 D_800DF4CC; -extern s32 D_800DF7C4; +extern s16 D_800DF7C4[11]; extern s32 D_800DFA2C; extern s32 D_800DFDC8; extern s32 D_800DFFD0; @@ -136,7 +136,43 @@ GLOBAL_ASM("asm/non_matchings/unknown_080500/MenuSaveOptionsLoop.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/func_80087EB8.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/func_80087F14.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/func_8008832C.s") + + +/* +// Probably not unqiue to the boot menu. +typedef struct MenuBootDrawTexture { +u32* texture; // Pointer to texture to draw. TODO: Make structure for texture header. +s16 xOffset; // Offset from the center of the screen. +s16 yOffset; // Offset from the center of the screen. +} MenuBootDrawTexture; + +extern s32 D_800DF77C; +extern s16 D_800DF7C4[11]; +static MenuBootDrawTexture D_800DF7DC[11]; +extern u32* D_80126550[]; // texture lookup table? +extern s32 D_80126C18; +extern s32 D_80126C20; + +// Almost matches, except for an extra `lui` instruction when the loop unrolls. +void menu_boot_init(void) { + s32 i; + + func_800C01D8(&D_800DF77C); + func_80077B34(0, 0, 0); + func_8009C674(&D_800DF7C4); + + // Sets up the 11 texture pointers for the "Diddy Kong Racing" logo. + for(i = 0; i < 11; i++) { + D_800DF7DC[i].texture = D_80126550[D_800DF7C4[i]]; + } + + // Reset variables for menu_boot_loop() + D_80126C20 = 0; // D_80126C20 is the current state of the boot screen. Either 0, 1, or 2. + D_80126C18 = 0; // D_80126C18 is a timer for the boot screen, counts up to 0x8C frames. +} +*/ GLOBAL_ASM("asm/non_matchings/unknown_080500/MenuBootInit.s") + GLOBAL_ASM("asm/non_matchings/unknown_080500/MenuBootLoop.s") void func_800887C4(void) { diff --git a/undefined_syms.txt b/undefined_syms.txt index c5578c0a..f7e466f1 100755 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -22,11 +22,11 @@ D_8000000C = 0x8000000C; D_80000010 = 0x80000010; D_80000018 = 0x80000018; D_80000020 = 0x80000020; -D_80000300 = 0x80000300; -D_80000308 = 0x80000308; -D_8000030C = 0x8000030C; -D_80000310 = 0x80000310; -D_8000031C = 0x8000031C; +osTvType = 0x80000300; +osRomBase = 0x80000308; +osResetType = 0x8000030C; +osCicId = 0x80000310; +osAppNMIBuffer = 0x8000031C; D_80002A98 = 0x80002A98; D_80002E38 = 0x80002E38; D_80003008 = 0x80003008;