diff --git a/asm/code_800431B0.s b/asm/code_800431B0.s index 644f754ef..db05e6bb1 100644 --- a/asm/code_800431B0.s +++ b/asm/code_800431B0.s @@ -12822,8 +12822,8 @@ glabel func_8004ED40 /* 04FA50 8004EE50 00000000 */ nop glabel func_8004EE54 -/* 04FA54 8004EE54 3C0E800E */ lui $t6, %hi(D_800DC604) # $t6, 0x800e -/* 04FA58 8004EE58 8DCEC604 */ lw $t6, %lo(D_800DC604)($t6) +/* 04FA54 8004EE54 3C0E800E */ lui $t6, %hi(gIsMirrorMode) # $t6, 0x800e +/* 04FA58 8004EE58 8DCEC604 */ lw $t6, %lo(gIsMirrorMode)($t6) /* 04FA5C 8004EE5C 27BDFFC8 */ addiu $sp, $sp, -0x38 /* 04FA60 8004EE60 AFBF0034 */ sw $ra, 0x34($sp) /* 04FA64 8004EE64 11C00025 */ beqz $t6, .L8004EEFC diff --git a/asm/code_8006E9C0.s b/asm/code_8006E9C0.s index ad9e995dc..cf0afd2ce 100644 --- a/asm/code_8006E9C0.s +++ b/asm/code_8006E9C0.s @@ -448,9 +448,9 @@ glabel func_8006F008 /* 06FC14 8006F014 44812000 */ mtc1 $at, $f4 /* 06FC18 8006F018 3C028019 */ lui $v0, %hi(D_8018D01C) # $v0, 0x8019 /* 06FC1C 8006F01C 2442D01C */ addiu $v0, %lo(D_8018D01C) # addiu $v0, $v0, -0x2fe4 -/* 06FC20 8006F020 3C0E800E */ lui $t6, %hi(D_800DC604) # $t6, 0x800e +/* 06FC20 8006F020 3C0E800E */ lui $t6, %hi(gIsMirrorMode) # $t6, 0x800e /* 06FC24 8006F024 E4440000 */ swc1 $f4, ($v0) -/* 06FC28 8006F028 8DCEC604 */ lw $t6, %lo(D_800DC604)($t6) +/* 06FC28 8006F028 8DCEC604 */ lw $t6, %lo(gIsMirrorMode)($t6) /* 06FC2C 8006F02C 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 06FC30 8006F030 AFBF0014 */ sw $ra, 0x14($sp) /* 06FC34 8006F034 11C00005 */ beqz $t6, .L8006F04C @@ -935,8 +935,8 @@ glabel L8006F734 /* 070358 8006F758 2419001F */ li $t9, 31 /* 07035C 8006F75C A439D2E8 */ sh $t9, %lo(D_8018D2E8)($at) .L8006F760: -/* 070360 8006F760 3C09800E */ lui $t1, %hi(D_800DC604) # $t1, 0x800e -/* 070364 8006F764 8D29C604 */ lw $t1, %lo(D_800DC604)($t1) +/* 070360 8006F760 3C09800E */ lui $t1, %hi(gIsMirrorMode) # $t1, 0x800e +/* 070364 8006F764 8D29C604 */ lw $t1, %lo(gIsMirrorMode)($t1) /* 070368 8006F768 3C048019 */ lui $a0, %hi(D_8018D2E0) # $a0, 0x8019 /* 07036C 8006F76C 2484D2E0 */ addiu $a0, %lo(D_8018D2E0) # addiu $a0, $a0, -0x2d20 /* 070370 8006F770 11200006 */ beqz $t1, .L8006F78C diff --git a/asm/code_80071F00.s b/asm/code_80071F00.s index e7a422f68..c6a7011ce 100644 --- a/asm/code_80071F00.s +++ b/asm/code_80071F00.s @@ -4750,7 +4750,7 @@ glabel func_80076194 /* 076DF8 800761F8 24092100 */ li $t1, 8448 /* 076DFC 800761FC E4460010 */ swc1 $f6, 0x10($v0) /* 076E00 80076200 C4C80004 */ lwc1 $f8, 4($a2) -/* 076E04 80076204 3C0A800E */ lui $t2, %hi(D_800DC604) # $t2, 0x800e +/* 076E04 80076204 3C0A800E */ lui $t2, %hi(gIsMirrorMode) # $t2, 0x800e /* 076E08 80076208 252CC000 */ addiu $t4, $t1, -0x4000 /* 076E0C 8007620C E4480014 */ swc1 $f8, 0x14($v0) /* 076E10 80076210 C4CA0008 */ lwc1 $f10, 8($a2) @@ -4758,7 +4758,7 @@ glabel func_80076194 /* 076E18 80076218 A44000C2 */ sh $zero, 0xc2($v0) /* 076E1C 8007621C A44900C0 */ sh $t1, 0xc0($v0) /* 076E20 80076220 E44A0018 */ swc1 $f10, 0x18($v0) -/* 076E24 80076224 8D4AC604 */ lw $t2, %lo(D_800DC604)($t2) +/* 076E24 80076224 8D4AC604 */ lw $t2, %lo(gIsMirrorMode)($t2) /* 076E28 80076228 3C014020 */ li $at, 0x40200000 # 2.500000 /* 076E2C 8007622C 51400003 */ beql $t2, $zero, .L8007623C /* 076E30 80076230 C7B00020 */ lwc1 $f16, 0x20($sp) @@ -11090,7 +11090,7 @@ glabel func_8007BBBC /* 07C7F8 8007BBF8 02002025 */ move $a0, $s0 /* 07C7FC 8007BBFC 24010002 */ li $at, 2 /* 07C800 8007BC00 1041000F */ beq $v0, $at, .L8007BC40 -/* 07C804 8007BC04 3C18800E */ lui $t8, %hi(D_800DC604) # $t8, 0x800e +/* 07C804 8007BC04 3C18800E */ lui $t8, %hi(gIsMirrorMode) # $t8, 0x800e /* 07C808 8007BC08 24010003 */ li $at, 3 /* 07C80C 8007BC0C 10410036 */ beq $v0, $at, .L8007BCE8 /* 07C810 8007BC10 00000000 */ nop @@ -11107,7 +11107,7 @@ glabel func_8007BBBC /* 07C838 8007BC38 1000002D */ b .L8007BCF0 /* 07C83C 8007BC3C A22000D5 */ sb $zero, 0xd5($s1) .L8007BC40: -/* 07C840 8007BC40 8F18C604 */ lw $t8, %lo(D_800DC604)($t8) +/* 07C840 8007BC40 8F18C604 */ lw $t8, %lo(gIsMirrorMode)($t8) /* 07C844 8007BC44 02002025 */ move $a0, $s0 /* 07C848 8007BC48 3C054190 */ lui $a1, 0x4190 /* 07C84C 8007BC4C 1300000D */ beqz $t8, .L8007BC84 @@ -13149,10 +13149,10 @@ glabel func_8007D8D4 .L8007D958: /* 07E558 8007D958 8FB80024 */ lw $t8, 0x24($sp) /* 07E55C 8007D95C 24010001 */ li $at, 1 -/* 07E560 8007D960 3C19800E */ lui $t9, %hi(D_800DC604) # $t9, 0x800e +/* 07E560 8007D960 3C19800E */ lui $t9, %hi(gIsMirrorMode) # $t9, 0x800e /* 07E564 8007D964 1701001C */ bne $t8, $at, .L8007D9D8 -/* 07E568 8007D968 3C08800E */ lui $t0, %hi(D_800DC604) # $t0, 0x800e -/* 07E56C 8007D96C 8F39C604 */ lw $t9, %lo(D_800DC604)($t9) +/* 07E568 8007D968 3C08800E */ lui $t0, %hi(gIsMirrorMode) # $t0, 0x800e +/* 07E56C 8007D96C 8F39C604 */ lw $t9, %lo(gIsMirrorMode)($t9) /* 07E570 8007D970 5320000E */ beql $t9, $zero, .L8007D9AC /* 07E574 8007D974 C4700004 */ lwc1 $f16, 4($v1) /* 07E578 8007D978 C4640004 */ lwc1 $f4, 4($v1) @@ -13181,7 +13181,7 @@ glabel func_8007D8D4 /* 07E5D0 8007D9D0 1000001B */ b .L8007DA40 /* 07E5D4 8007D9D4 8FBF0014 */ lw $ra, 0x14($sp) .L8007D9D8: -/* 07E5D8 8007D9D8 8D08C604 */ lw $t0, %lo(D_800DC604)($t0) +/* 07E5D8 8007D9D8 8D08C604 */ lw $t0, %lo(gIsMirrorMode)($t0) /* 07E5DC 8007D9DC 5100000E */ beql $t0, $zero, .L8007DA18 /* 07E5E0 8007D9E0 C46A0004 */ lwc1 $f10, 4($v1) /* 07E5E4 8007D9E4 C4640004 */ lwc1 $f4, 4($v1) @@ -13582,8 +13582,8 @@ glabel func_8007DF20 /* 07EB6C 8007DF6C 00003825 */ move $a3, $zero /* 07EB70 8007DF70 0C022E2F */ jal func_8008B8BC /* 07EB74 8007DF74 E4440000 */ swc1 $f4, ($v0) -/* 07EB78 8007DF78 3C19800E */ lui $t9, %hi(D_800DC604) # $t9, 0x800e -/* 07EB7C 8007DF7C 8F39C604 */ lw $t9, %lo(D_800DC604)($t9) +/* 07EB78 8007DF78 3C19800E */ lui $t9, %hi(gIsMirrorMode) # $t9, 0x800e +/* 07EB7C 8007DF7C 8F39C604 */ lw $t9, %lo(gIsMirrorMode)($t9) /* 07EB80 8007DF80 44800000 */ mtc1 $zero, $f0 /* 07EB84 8007DF84 8FA2001C */ lw $v0, 0x1c($sp) /* 07EB88 8007DF88 1320000A */ beqz $t9, .L8007DFB4 @@ -14504,8 +14504,8 @@ glabel func_8007EC30 /* 07F86C 8007EC6C E6200044 */ swc1 $f0, 0x44($s1) /* 07F870 8007EC70 0C022E03 */ jal func_8008B80C /* 07F874 8007EC74 E6200014 */ swc1 $f0, 0x14($s1) -/* 07F878 8007EC78 3C18800E */ lui $t8, %hi(D_800DC604) # $t8, 0x800e -/* 07F87C 8007EC7C 8F18C604 */ lw $t8, %lo(D_800DC604)($t8) +/* 07F878 8007EC78 3C18800E */ lui $t8, %hi(gIsMirrorMode) # $t8, 0x800e +/* 07F87C 8007EC7C 8F18C604 */ lw $t8, %lo(gIsMirrorMode)($t8) /* 07F880 8007EC80 02002025 */ move $a0, $s0 /* 07F884 8007EC84 00002825 */ move $a1, $zero /* 07F888 8007EC88 1300000D */ beqz $t8, .L8007ECC0 @@ -14684,10 +14684,10 @@ glabel func_8007EE5C /* 07FB08 8007EF08 E6000014 */ swc1 $f0, 0x14($s0) /* 07FB0C 8007EF0C 3C0141A0 */ li $at, 0x41A00000 # 20.000000 /* 07FB10 8007EF10 44813000 */ mtc1 $at, $f6 -/* 07FB14 8007EF14 3C0A800E */ lui $t2, %hi(D_800DC604) # $t2, 0x800e +/* 07FB14 8007EF14 3C0A800E */ lui $t2, %hi(gIsMirrorMode) # $t2, 0x800e /* 07FB18 8007EF18 00003825 */ move $a3, $zero /* 07FB1C 8007EF1C E6060020 */ swc1 $f6, 0x20($s0) -/* 07FB20 8007EF20 8D4AC604 */ lw $t2, %lo(D_800DC604)($t2) +/* 07FB20 8007EF20 8D4AC604 */ lw $t2, %lo(gIsMirrorMode)($t2) /* 07FB24 8007EF24 02202025 */ move $a0, $s1 /* 07FB28 8007EF28 00002825 */ move $a1, $zero /* 07FB2C 8007EF2C 1140000C */ beqz $t2, .L8007EF60 @@ -15508,8 +15508,8 @@ glabel func_8007FA08 /* 0806B4 8007FAB4 00003025 */ move $a2, $zero /* 0806B8 8007FAB8 0C022E22 */ jal func_8008B888 /* 0806BC 8007FABC 00003825 */ move $a3, $zero -/* 0806C0 8007FAC0 3C09800E */ lui $t1, %hi(D_800DC604) # $t1, 0x800e -/* 0806C4 8007FAC4 8D29C604 */ lw $t1, %lo(D_800DC604)($t1) +/* 0806C0 8007FAC0 3C09800E */ lui $t1, %hi(gIsMirrorMode) # $t1, 0x800e +/* 0806C4 8007FAC4 8D29C604 */ lw $t1, %lo(gIsMirrorMode)($t1) /* 0806C8 8007FAC8 02202025 */ move $a0, $s1 /* 0806CC 8007FACC 00002825 */ move $a1, $zero /* 0806D0 8007FAD0 11200008 */ beqz $t1, .L8007FAF4 @@ -15681,8 +15681,8 @@ glabel L8007FBE4 /* 08093C 8007FD3C A06F00D2 */ sb $t7, 0xd2($v1) /* 080940 8007FD40 846400B0 */ lh $a0, 0xb0($v1) .L8007FD44: -/* 080944 8007FD44 3C18800E */ lui $t8, %hi(D_800DC604) # $t8, 0x800e -/* 080948 8007FD48 8F18C604 */ lw $t8, %lo(D_800DC604)($t8) +/* 080944 8007FD44 3C18800E */ lui $t8, %hi(gIsMirrorMode) # $t8, 0x800e +/* 080948 8007FD48 8F18C604 */ lw $t8, %lo(gIsMirrorMode)($t8) /* 08094C 8007FD4C 00001025 */ move $v0, $zero /* 080950 8007FD50 2499FFFF */ addiu $t9, $a0, -1 /* 080954 8007FD54 1300000B */ beqz $t8, .L8007FD84 @@ -15964,10 +15964,10 @@ glabel func_80080078 /* 080D34 80080134 E6000014 */ swc1 $f0, 0x14($s0) /* 080D38 80080138 3C0141F0 */ li $at, 0x41F00000 # 30.000000 /* 080D3C 8008013C 44813000 */ mtc1 $at, $f6 -/* 080D40 80080140 3C0B800E */ lui $t3, %hi(D_800DC604) # $t3, 0x800e +/* 080D40 80080140 3C0B800E */ lui $t3, %hi(gIsMirrorMode) # $t3, 0x800e /* 080D44 80080144 00003825 */ move $a3, $zero /* 080D48 80080148 E6060020 */ swc1 $f6, 0x20($s0) -/* 080D4C 8008014C 8D6BC604 */ lw $t3, %lo(D_800DC604)($t3) +/* 080D4C 8008014C 8D6BC604 */ lw $t3, %lo(gIsMirrorMode)($t3) /* 080D50 80080150 02202025 */ move $a0, $s1 /* 080D54 80080154 00002825 */ move $a1, $zero /* 080D58 80080158 11600007 */ beqz $t3, .L80080178 @@ -16130,10 +16130,10 @@ glabel func_800802C0 /* 080F88 80080388 44810000 */ mtc1 $at, $f0 /* 080F8C 8008038C E6140044 */ swc1 $f20, 0x44($s0) /* 080F90 80080390 E6140014 */ swc1 $f20, 0x14($s0) -/* 080F94 80080394 3C0B800E */ lui $t3, %hi(D_800DC604) # $t3, 0x800e +/* 080F94 80080394 3C0B800E */ lui $t3, %hi(gIsMirrorMode) # $t3, 0x800e /* 080F98 80080398 E600002C */ swc1 $f0, 0x2c($s0) /* 080F9C 8008039C E6000020 */ swc1 $f0, 0x20($s0) -/* 080FA0 800803A0 8D6BC604 */ lw $t3, %lo(D_800DC604)($t3) +/* 080FA0 800803A0 8D6BC604 */ lw $t3, %lo(gIsMirrorMode)($t3) /* 080FA4 800803A4 02202025 */ move $a0, $s1 /* 080FA8 800803A8 00002825 */ move $a1, $zero /* 080FAC 800803AC 11600008 */ beqz $t3, .L800803D0 @@ -16297,8 +16297,8 @@ glabel func_80080524 /* 0811F4 800805F4 E6020014 */ swc1 $f2, 0x14($s0) /* 0811F8 800805F8 0C022E22 */ jal func_8008B888 /* 0811FC 800805FC E6000020 */ swc1 $f0, 0x20($s0) -/* 081200 80080600 3C0A800E */ lui $t2, %hi(D_800DC604) # $t2, 0x800e -/* 081204 80080604 8D4AC604 */ lw $t2, %lo(D_800DC604)($t2) +/* 081200 80080600 3C0A800E */ lui $t2, %hi(gIsMirrorMode) # $t2, 0x800e +/* 081204 80080604 8D4AC604 */ lw $t2, %lo(gIsMirrorMode)($t2) /* 081208 80080608 3C0B800E */ lui $t3, %hi(D_800DC50C) # $t3, 0x800e /* 08120C 8008060C 02202025 */ move $a0, $s1 /* 081210 80080610 15400006 */ bnez $t2, .L8008062C @@ -20974,8 +20974,8 @@ glabel L80084848 /* 0854D8 800848D8 34099000 */ li $t1, 36864 .L800848DC: /* 0854DC 800848DC A60900C6 */ sh $t1, 0xc6($s0) -/* 0854E0 800848E0 3C0A800E */ lui $t2, %hi(D_800DC604) # $t2, 0x800e -/* 0854E4 800848E4 8D4AC604 */ lw $t2, %lo(D_800DC604)($t2) +/* 0854E0 800848E0 3C0A800E */ lui $t2, %hi(gIsMirrorMode) # $t2, 0x800e +/* 0854E4 800848E4 8D4AC604 */ lw $t2, %lo(gIsMirrorMode)($t2) /* 0854E8 800848E8 252CC000 */ addiu $t4, $t1, -0x4000 /* 0854EC 800848EC 240D0003 */ li $t5, 3 /* 0854F0 800848F0 11400002 */ beqz $t2, .L800848FC @@ -21001,8 +21001,8 @@ glabel L80084904 /* 085538 80084938 00000000 */ nop /* 08553C 8008493C 240E5000 */ li $t6, 20480 /* 085540 80084940 A60E00C6 */ sh $t6, 0xc6($s0) -/* 085544 80084944 3C0F800E */ lui $t7, %hi(D_800DC604) # $t7, 0x800e -/* 085548 80084948 8DEFC604 */ lw $t7, %lo(D_800DC604)($t7) +/* 085544 80084944 3C0F800E */ lui $t7, %hi(gIsMirrorMode) # $t7, 0x800e +/* 085548 80084948 8DEFC604 */ lw $t7, %lo(gIsMirrorMode)($t7) /* 08554C 8008494C 34018000 */ li $at, 32768 /* 085550 80084950 01C1C821 */ addu $t9, $t6, $at /* 085554 80084954 11E00002 */ beqz $t7, .L80084960 @@ -21029,8 +21029,8 @@ glabel L80084968 /* 0855A0 800849A0 240A0006 */ li $t2, 6 /* 0855A4 800849A4 A60900C6 */ sh $t1, 0xc6($s0) /* 0855A8 800849A8 A20A00DD */ sb $t2, 0xdd($s0) -/* 0855AC 800849AC 3C0B800E */ lui $t3, %hi(D_800DC604) # $t3, 0x800e -/* 0855B0 800849B0 8D6BC604 */ lw $t3, %lo(D_800DC604)($t3) +/* 0855AC 800849AC 3C0B800E */ lui $t3, %hi(gIsMirrorMode) # $t3, 0x800e +/* 0855B0 800849B0 8D6BC604 */ lw $t3, %lo(gIsMirrorMode)($t3) /* 0855B4 800849B4 34018000 */ li $at, 32768 /* 0855B8 800849B8 01216821 */ addu $t5, $t1, $at /* 0855BC 800849BC 5160004E */ beql $t3, $zero, .L80084AF8 @@ -21055,8 +21055,8 @@ glabel L800849CC /* 085604 80084A04 240F0006 */ li $t7, 6 /* 085608 80084A08 A60E00C6 */ sh $t6, 0xc6($s0) /* 08560C 80084A0C A20F00DD */ sb $t7, 0xdd($s0) -/* 085610 80084A10 3C18800E */ lui $t8, %hi(D_800DC604) # $t8, 0x800e -/* 085614 80084A14 8F18C604 */ lw $t8, %lo(D_800DC604)($t8) +/* 085610 80084A10 3C18800E */ lui $t8, %hi(gIsMirrorMode) # $t8, 0x800e +/* 085614 80084A14 8F18C604 */ lw $t8, %lo(gIsMirrorMode)($t8) /* 085618 80084A18 34018000 */ li $at, 32768 /* 08561C 80084A1C 01C14021 */ addu $t0, $t6, $at /* 085620 80084A20 53000035 */ beql $t8, $zero, .L80084AF8 @@ -21082,8 +21082,8 @@ glabel L80084A30 /* 08566C 80084A6C 240A0006 */ li $t2, 6 /* 085670 80084A70 A60900C6 */ sh $t1, 0xc6($s0) /* 085674 80084A74 A20A00DD */ sb $t2, 0xdd($s0) -/* 085678 80084A78 3C0B800E */ lui $t3, %hi(D_800DC604) # $t3, 0x800e -/* 08567C 80084A7C 8D6BC604 */ lw $t3, %lo(D_800DC604)($t3) +/* 085678 80084A78 3C0B800E */ lui $t3, %hi(gIsMirrorMode) # $t3, 0x800e +/* 08567C 80084A7C 8D6BC604 */ lw $t3, %lo(gIsMirrorMode)($t3) /* 085680 80084A80 252DC000 */ addiu $t5, $t1, -0x4000 /* 085684 80084A84 5160001C */ beql $t3, $zero, .L80084AF8 /* 085688 80084A88 960600C6 */ lhu $a2, 0xc6($s0) @@ -21108,8 +21108,8 @@ glabel L80084A94 /* 0856D0 80084AD0 240F0006 */ li $t7, 6 /* 0856D4 80084AD4 A60E00C6 */ sh $t6, 0xc6($s0) /* 0856D8 80084AD8 A20F00DD */ sb $t7, 0xdd($s0) -/* 0856DC 80084ADC 3C18800E */ lui $t8, %hi(D_800DC604) # $t8, 0x800e -/* 0856E0 80084AE0 8F18C604 */ lw $t8, %lo(D_800DC604)($t8) +/* 0856DC 80084ADC 3C18800E */ lui $t8, %hi(gIsMirrorMode) # $t8, 0x800e +/* 0856E0 80084AE0 8F18C604 */ lw $t8, %lo(gIsMirrorMode)($t8) /* 0856E4 80084AE4 25C8C000 */ addiu $t0, $t6, -0x4000 /* 0856E8 80084AE8 53000003 */ beql $t8, $zero, .L80084AF8 /* 0856EC 80084AEC 960600C6 */ lhu $a2, 0xc6($s0) diff --git a/asm/code_80091750.s b/asm/code_80091750.s index 756aaee6c..0ed05f510 100644 --- a/asm/code_80091750.s +++ b/asm/code_80091750.s @@ -331,10 +331,10 @@ glabel func_80091B78 /* 0927AC 80091BAC 240F0005 */ li $t7, 5 /* 0927B0 80091BB0 A02FEDF5 */ sb $t7, %lo(D_8018EDF5)($at) /* 0927B4 80091BB4 3C018019 */ lui $at, %hi(D_8018EDF6) # $at, 0x8019 -/* 0927B8 80091BB8 3C048015 */ lui $a0, %hi(D_8014F0B8) # $a0, 0x8015 +/* 0927B8 80091BB8 3C048015 */ lui $a0, %hi(gSIEventMesgQueue) # $a0, 0x8015 /* 0927BC 80091BBC A022EDF6 */ sb $v0, %lo(D_8018EDF6)($at) /* 0927C0 80091BC0 0C0338D0 */ jal osEepromProbe -/* 0927C4 80091BC4 2484F0B8 */ addiu $a0, %lo(D_8014F0B8) # addiu $a0, $a0, -0xf48 +/* 0927C4 80091BC4 2484F0B8 */ addiu $a0, %lo(gSIEventMesgQueue) # addiu $a0, $a0, -0xf48 /* 0927C8 80091BC8 10400003 */ beqz $v0, .L80091BD8 /* 0927CC 80091BCC 00000000 */ nop /* 0927D0 80091BD0 0C02D284 */ jal func_800B4A10 @@ -452,8 +452,8 @@ glabel func_80091B78 glabel func_80091D74 /* 092974 80091D74 27BDFF98 */ addiu $sp, $sp, -0x68 -/* 092978 80091D78 3C0E8015 */ lui $t6, %hi(D_8014F108) # $t6, 0x8015 -/* 09297C 80091D7C 91CEF108 */ lbu $t6, %lo(D_8014F108)($t6) +/* 092978 80091D78 3C0E8015 */ lui $t6, %hi(gControllerBits) # $t6, 0x8015 +/* 09297C 80091D7C 91CEF108 */ lbu $t6, %lo(gControllerBits)($t6) /* 092980 80091D80 AFBF002C */ sw $ra, 0x2c($sp) /* 092984 80091D84 AFB40028 */ sw $s4, 0x28($sp) /* 092988 80091D88 AFB30024 */ sw $s3, 0x24($sp) @@ -475,8 +475,8 @@ glabel func_80091D74 /* 0929C4 80091DC4 00001025 */ move $v0, $zero .L80091DC8: /* 0929C8 80091DC8 8F39C4BC */ lw $t9, %lo(D_800DC4BC)($t9) -/* 0929CC 80091DCC 3C108015 */ lui $s0, %hi(D_8014F0B8) # $s0, 0x8015 -/* 0929D0 80091DD0 2610F0B8 */ addiu $s0, %lo(D_8014F0B8) # addiu $s0, $s0, -0xf48 +/* 0929CC 80091DCC 3C108015 */ lui $s0, %hi(gSIEventMesgQueue) # $s0, 0x8015 +/* 0929D0 80091DD0 2610F0B8 */ addiu $s0, %lo(gSIEventMesgQueue) # addiu $s0, $s0, -0xf48 /* 0929D4 80091DD4 97280004 */ lhu $t0, 4($t9) /* 0929D8 80091DD8 02002025 */ move $a0, $s0 /* 0929DC 80091DDC 31091000 */ andi $t1, $t0, 0x1000 @@ -697,8 +697,8 @@ glabel func_80091FA4 /* 092CF4 800920F4 0C027994 */ jal func_8009E650 /* 092CF8 800920F8 00003825 */ move $a3, $zero .L800920FC: -/* 092CFC 800920FC 3C198015 */ lui $t9, %hi(D_8014F108) # $t9, 0x8015 -/* 092D00 80092100 9339F108 */ lbu $t9, %lo(D_8014F108)($t9) +/* 092CFC 800920FC 3C198015 */ lui $t9, %hi(gControllerBits) # $t9, 0x8015 +/* 092D00 80092100 9339F108 */ lbu $t9, %lo(gControllerBits)($t9) /* 092D04 80092104 3C098019 */ lui $t1, %hi(D_8018EE08) # $t1, 0x8019 /* 092D08 80092108 33280001 */ andi $t0, $t9, 1 /* 092D0C 8009210C 15000008 */ bnez $t0, .L80092130 @@ -4019,8 +4019,8 @@ glabel L80094FF0 /* 095C20 80095020 00003025 */ move $a2, $zero /* 095C24 80095024 0C027994 */ jal func_8009E650 /* 095C28 80095028 00003825 */ move $a3, $zero -/* 095C2C 8009502C 3C188015 */ lui $t8, %hi(D_8014F108) # $t8, 0x8015 -/* 095C30 80095030 9318F108 */ lbu $t8, %lo(D_8014F108)($t8) +/* 095C2C 8009502C 3C188015 */ lui $t8, %hi(gControllerBits) # $t8, 0x8015 +/* 095C30 80095030 9318F108 */ lbu $t8, %lo(gControllerBits)($t8) /* 095C34 80095034 24040004 */ li $a0, 4 /* 095C38 80095038 00002825 */ move $a1, $zero /* 095C3C 8009503C 33190001 */ andi $t9, $t8, 1 @@ -13399,14 +13399,14 @@ glabel L8009D50C /* 09E348 8009D748 AC27C548 */ sw $a3, %lo(D_800DC548)($at) .L8009D74C: /* 09E34C 8009D74C 8F18C548 */ lw $t8, %lo(D_800DC548)($t8) -/* 09E350 8009D750 3C01800E */ lui $at, %hi(D_800DC604) +/* 09E350 8009D750 3C01800E */ lui $at, %hi(gIsMirrorMode) /* 09E354 8009D754 14F80004 */ bne $a3, $t8, .L8009D768 /* 09E358 8009D758 00000000 */ nop -/* 09E35C 8009D75C 3C01800E */ lui $at, %hi(D_800DC604) # $at, 0x800e +/* 09E35C 8009D75C 3C01800E */ lui $at, %hi(gIsMirrorMode) # $at, 0x800e /* 09E360 8009D760 10000002 */ b .L8009D76C -/* 09E364 8009D764 AC25C604 */ sw $a1, %lo(D_800DC604)($at) +/* 09E364 8009D764 AC25C604 */ sw $a1, %lo(gIsMirrorMode)($at) .L8009D768: -/* 09E368 8009D768 AC20C604 */ sw $zero, %lo(D_800DC604)($at) +/* 09E368 8009D768 AC20C604 */ sw $zero, %lo(gIsMirrorMode)($at) .L8009D76C: /* 09E36C 8009D76C 8FBF0014 */ lw $ra, 0x14($sp) .L8009D770: @@ -27714,10 +27714,10 @@ glabel L800AA334 /* 0AB024 800AA424 10000064 */ b .L800AA5B8 /* 0AB028 800AA428 AD190004 */ sw $t9, 4($t0) .L800AA42C: -/* 0AB02C 800AA42C 3C048015 */ lui $a0, %hi(D_8014F0B8) # $a0, 0x8015 +/* 0AB02C 800AA42C 3C048015 */ lui $a0, %hi(gSIEventMesgQueue) # $a0, 0x8015 /* 0AB030 800AA430 3C058019 */ lui $a1, %hi(D_8018E868) # $a1, 0x8019 /* 0AB034 800AA434 24A5E868 */ addiu $a1, %lo(D_8018E868) # addiu $a1, $a1, -0x1798 -/* 0AB038 800AA438 2484F0B8 */ addiu $a0, %lo(D_8014F0B8) # addiu $a0, $a0, -0xf48 +/* 0AB038 800AA438 2484F0B8 */ addiu $a0, %lo(gSIEventMesgQueue) # addiu $a0, $a0, -0xf48 /* 0AB03C 800AA43C 0C0339C8 */ jal func_800CE720 /* 0AB040 800AA440 00003025 */ move $a2, $zero /* 0AB044 800AA444 3C03800F */ lui $v1, %hi(D_800E86F8) # $v1, 0x800f diff --git a/asm/code_80281FA0.s b/asm/code_80281FA0.s index 195ca459d..525af4dc9 100644 --- a/asm/code_80281FA0.s +++ b/asm/code_80281FA0.s @@ -1759,10 +1759,10 @@ glabel func_80283648 /* 126EE8 802838A8 3C08800E */ lui $t0, %hi(D_800DC50C) # $t0, 0x800e /* 126EEC 802838AC 8D08C50C */ lw $t0, %lo(D_800DC50C)($t0) /* 126EF0 802838B0 24010009 */ li $at, 9 -/* 126EF4 802838B4 3C09800E */ lui $t1, %hi(D_800DC604) # $t1, 0x800e +/* 126EF4 802838B4 3C09800E */ lui $t1, %hi(gIsMirrorMode) # $t1, 0x800e /* 126EF8 802838B8 1501000A */ bne $t0, $at, .L802838E4 /* 126EFC 802838BC 00000000 */ nop -/* 126F00 802838C0 8D29C604 */ lw $t1, %lo(D_800DC604)($t1) +/* 126F00 802838C0 8D29C604 */ lw $t1, %lo(gIsMirrorMode)($t1) /* 126F04 802838C4 11200007 */ beqz $t1, .L802838E4 /* 126F08 802838C8 00000000 */ nop /* 126F0C 802838CC C6080000 */ lwc1 $f8, ($s0) diff --git a/asm/code_80290C20.s b/asm/code_80290C20.s index a24bdedc9..92b27af5d 100644 --- a/asm/code_80290C20.s +++ b/asm/code_80290C20.s @@ -131,8 +131,8 @@ glabel load_surface_map /* 0FA3D4 80290DC4 3421FFFF */ ori $at, (0x00FFFFFF & 0xFFFF) # ori $at, $at, 0xffff /* 0FA3D8 80290DC8 27BDFFC8 */ addiu $sp, $sp, -0x38 /* 0FA3DC 80290DCC 0081C824 */ and $t9, $a0, $at -/* 0FA3E0 80290DD0 3C0C800E */ lui $t4, %hi(D_800DC604) # $t4, 0x800e -/* 0FA3E4 80290DD4 8D8CC604 */ lw $t4, %lo(D_800DC604)($t4) +/* 0FA3E0 80290DD0 3C0C800E */ lui $t4, %hi(gIsMirrorMode) # $t4, 0x800e +/* 0FA3E4 80290DD4 8D8CC604 */ lw $t4, %lo(gIsMirrorMode)($t4) /* 0FA3E8 80290DD8 AFBF0014 */ sw $ra, 0x14($sp) /* 0FA3EC 80290DDC 3C018000 */ lui $at, 0x8000 /* 0FA3F0 80290DE0 03195021 */ addu $t2, $t8, $t9 diff --git a/asm/code_80296A50.s b/asm/code_80296A50.s index 3ec2c5b02..7c4e6c808 100644 --- a/asm/code_80296A50.s +++ b/asm/code_80296A50.s @@ -2096,8 +2096,8 @@ glabel func_802986B4 .L802987DC: /* 101DEC 802987DC 3C0E800E */ lui $t6, %hi(D_800DDB40) # $t6, 0x800e /* 101DF0 802987E0 8DCEDB40 */ lw $t6, %lo(D_800DDB40)($t6) -/* 101DF4 802987E4 3C018016 */ lui $at, %hi(D_8015F784) # $at, 0x8016 -/* 101DF8 802987E8 C42AF784 */ lwc1 $f10, %lo(D_8015F784)($at) +/* 101DF4 802987E4 3C018016 */ lui $at, %hi(gCourseDirection) # $at, 0x8016 +/* 101DF8 802987E8 C42AF784 */ lwc1 $f10, %lo(gCourseDirection)($at) /* 101DFC 802987EC 240100B8 */ li $at, 184 /* 101E00 802987F0 028E7823 */ subu $t7, $s4, $t6 /* 101E04 802987F4 01E1001A */ div $zero, $t7, $at @@ -2247,8 +2247,8 @@ glabel L80298970 /* 102020 80298A10 0C032678 */ jal func_800C99E0 /* 102024 80298A14 02602825 */ move $a1, $s3 /* 102028 80298A18 86AB0000 */ lh $t3, ($s5) -/* 10202C 80298A1C 3C018016 */ lui $at, %hi(D_8015F784) # $at, 0x8016 -/* 102030 80298A20 C424F784 */ lwc1 $f4, %lo(D_8015F784)($at) +/* 10202C 80298A1C 3C018016 */ lui $at, %hi(gCourseDirection) # $at, 0x8016 +/* 102030 80298A20 C424F784 */ lwc1 $f4, %lo(gCourseDirection)($at) /* 102034 80298A24 448B8000 */ mtc1 $t3, $f16 /* 102038 80298A28 3C018016 */ lui $at, %hi(D_8015F702) # $at, 0x8016 /* 10203C 80298A2C 3C05802C */ lui $a1, %hi(D_802B91C8) # $a1, 0x802c @@ -2326,9 +2326,9 @@ glabel func_80298AC0 /* 102148 80298B38 3C014220 */ li $at, 0x42200000 # 40.000000 /* 10214C 80298B3C 4481B000 */ mtc1 $at, $f22 /* 102150 80298B40 3C0140A0 */ li $at, 0x40A00000 # 5.000000 -/* 102154 80298B44 3C128016 */ lui $s2, %hi(D_8015F784) # $s2, 0x8016 +/* 102154 80298B44 3C128016 */ lui $s2, %hi(gCourseDirection) # $s2, 0x8016 /* 102158 80298B48 4481A000 */ mtc1 $at, $f20 -/* 10215C 80298B4C 2652F784 */ addiu $s2, %lo(D_8015F784) # addiu $s2, $s2, -0x87c +/* 10215C 80298B4C 2652F784 */ addiu $s2, %lo(gCourseDirection) # addiu $s2, $s2, -0x87c /* 102160 80298B50 24140001 */ li $s4, 1 /* 102164 80298B54 27B30064 */ addiu $s3, $sp, 0x64 /* 102168 80298B58 44822000 */ mtc1 $v0, $f4 @@ -2596,8 +2596,8 @@ glabel func_80298D7C .L80298F20: /* 102530 80298F20 8ED80000 */ lw $t8, ($s6) .L80298F24: -/* 102534 80298F24 3C018016 */ lui $at, %hi(D_8015F784) # $at, 0x8016 -/* 102538 80298F28 C428F784 */ lwc1 $f8, %lo(D_8015F784)($at) +/* 102534 80298F24 3C018016 */ lui $at, %hi(gCourseDirection) # $at, 0x8016 +/* 102538 80298F28 C428F784 */ lwc1 $f8, %lo(gCourseDirection)($at) /* 10253C 80298F2C 240100B8 */ li $at, 184 /* 102540 80298F30 0298C823 */ subu $t9, $s4, $t8 /* 102544 80298F34 0321001A */ div $zero, $t9, $at @@ -6732,8 +6732,8 @@ glabel place_piranha_plants /* 1062B8 8029CCA8 24170070 */ li $s7, 112 /* 1062BC 8029CCAC 12710028 */ beq $s3, $s1, .L8029CD50 /* 1062C0 8029CCB0 3C168016 */ lui $s6, %hi(D_8015F9B8) # $s6, 0x8016 -/* 1062C4 8029CCB4 3C148016 */ lui $s4, %hi(D_8015F784) # $s4, 0x8016 -/* 1062C8 8029CCB8 2694F784 */ addiu $s4, %lo(D_8015F784) # addiu $s4, $s4, -0x87c +/* 1062C4 8029CCB4 3C148016 */ lui $s4, %hi(gCourseDirection) # $s4, 0x8016 +/* 1062C8 8029CCB8 2694F784 */ addiu $s4, %lo(gCourseDirection) # addiu $s4, $s4, -0x87c /* 1062CC 8029CCBC 26D6F9B8 */ addiu $s6, %lo(D_8015F9B8) # addiu $s6, $s6, -0x648 /* 1062D0 8029CCC0 27B50060 */ addiu $s5, $sp, 0x60 /* 1062D4 8029CCC4 44912000 */ mtc1 $s1, $f4 @@ -6829,9 +6829,9 @@ glabel place_palm_trees /* 10642C 8029CE1C 13C2002E */ beq $fp, $v0, .L8029CED8 /* 106430 8029CE20 24150070 */ li $s5, 112 /* 106434 8029CE24 3C148016 */ lui $s4, %hi(D_8015F9B8) # $s4, 0x8016 -/* 106438 8029CE28 3C128016 */ lui $s2, %hi(D_8015F784) # $s2, 0x8016 +/* 106438 8029CE28 3C128016 */ lui $s2, %hi(gCourseDirection) # $s2, 0x8016 /* 10643C 8029CE2C 4481A000 */ mtc1 $at, $f20 -/* 106440 8029CE30 2652F784 */ addiu $s2, %lo(D_8015F784) # addiu $s2, $s2, -0x87c +/* 106440 8029CE30 2652F784 */ addiu $s2, %lo(gCourseDirection) # addiu $s2, $s2, -0x87c /* 106444 8029CE34 2694F9B8 */ addiu $s4, %lo(D_8015F9B8) # addiu $s4, $s4, -0x648 /* 106448 8029CE38 27B3006C */ addiu $s3, $sp, 0x6c /* 10644C 8029CE3C 44822000 */ mtc1 $v0, $f4 @@ -6916,7 +6916,7 @@ glabel func_8029CF0C /* 106578 8029CF68 24A40024 */ addiu $a0, $a1, 0x24 /* 10657C 8029CF6C A5010004 */ sh $at, 4($t0) /* 106580 8029CF70 84A30006 */ lh $v1, 6($a1) -/* 106584 8029CF74 3C018016 */ lui $at, %hi(D_8015F784) # $at, 0x8016 +/* 106584 8029CF74 3C018016 */ lui $at, %hi(gCourseDirection) # $at, 0x8016 /* 106588 8029CF78 44060000 */ mfc1 $a2, $f0 /* 10658C 8029CF7C 0003C040 */ sll $t8, $v1, 1 /* 106590 8029CF80 01187021 */ addu $t6, $t0, $t8 @@ -6925,7 +6925,7 @@ glabel func_8029CF0C /* 10659C 8029CF8C 004F1021 */ addu $v0, $v0, $t7 /* 1065A0 8029CF90 A4B90004 */ sh $t9, 4($a1) /* 1065A4 8029CF94 84490000 */ lh $t1, ($v0) -/* 1065A8 8029CF98 C428F784 */ lwc1 $f8, %lo(D_8015F784)($at) +/* 1065A8 8029CF98 C428F784 */ lwc1 $f8, %lo(gCourseDirection)($at) /* 1065AC 8029CF9C 3C014120 */ li $at, 0x41200000 # 10.000000 /* 1065B0 8029CFA0 44892000 */ mtc1 $t1, $f4 /* 1065B4 8029CFA4 44070000 */ mfc1 $a3, $f0 @@ -6988,10 +6988,10 @@ glabel place_falling_rocks /* 106690 8029D080 12E20034 */ beq $s7, $v0, .L8029D154 /* 106694 8029D084 24160070 */ li $s6, 112 /* 106698 8029D088 3C158016 */ lui $s5, %hi(D_8015F9B8) # $s5, 0x8016 -/* 10669C 8029D08C 3C138016 */ lui $s3, %hi(D_8015F784) # $s3, 0x8016 +/* 10669C 8029D08C 3C138016 */ lui $s3, %hi(gCourseDirection) # $s3, 0x8016 /* 1066A0 8029D090 4481B000 */ mtc1 $at, $f22 /* 1066A4 8029D094 4480A000 */ mtc1 $zero, $f20 -/* 1066A8 8029D098 2673F784 */ addiu $s3, %lo(D_8015F784) # addiu $s3, $s3, -0x87c +/* 1066A8 8029D098 2673F784 */ addiu $s3, %lo(gCourseDirection) # addiu $s3, $s3, -0x87c /* 1066AC 8029D09C 26B5F9B8 */ addiu $s5, %lo(D_8015F9B8) # addiu $s5, $s5, -0x648 /* 1066B0 8029D0A0 27B40064 */ addiu $s4, $sp, 0x64 /* 1066B4 8029D0A4 27B20050 */ addiu $s2, $sp, 0x50 @@ -7362,9 +7362,9 @@ glabel place_segment_06 /* 106C2C 8029D61C 27DEF9B8 */ addiu $fp, %lo(D_8015F9B8) # addiu $fp, $fp, -0x648 /* 106C30 8029D620 3C0140A0 */ li $at, 0x40A00000 # 5.000000 /* 106C34 8029D624 3C17800E */ lui $s7, %hi(gCurrentCourseId) # $s7, 0x800e -/* 106C38 8029D628 3C168016 */ lui $s6, %hi(D_8015F784) # $s6, 0x8016 +/* 106C38 8029D628 3C168016 */ lui $s6, %hi(gCourseDirection) # $s6, 0x8016 /* 106C3C 8029D62C 4481B000 */ mtc1 $at, $f22 -/* 106C40 8029D630 26D6F784 */ addiu $s6, %lo(D_8015F784) # addiu $s6, $s6, -0x87c +/* 106C40 8029D630 26D6F784 */ addiu $s6, %lo(gCourseDirection) # addiu $s6, $s6, -0x87c /* 106C44 8029D634 26F7C5A0 */ addiu $s7, %lo(gCurrentCourseId) # addiu $s7, $s7, -0x3a60 /* 106C48 8029D638 24150007 */ li $s5, 7 /* 106C4C 8029D63C 24140006 */ li $s4, 6 @@ -7562,9 +7562,9 @@ glabel place_all_item_boxes /* 106EF4 8029D8E4 4481B000 */ mtc1 $at, $f22 /* 106EF8 8029D8E8 3C014120 */ li $at, 0x41200000 # 10.000000 /* 106EFC 8029D8EC 3C178016 */ lui $s7, %hi(D_8015F9B8) # $s7, 0x8016 -/* 106F00 8029D8F0 3C148016 */ lui $s4, %hi(D_8015F784) # $s4, 0x8016 +/* 106F00 8029D8F0 3C148016 */ lui $s4, %hi(gCourseDirection) # $s4, 0x8016 /* 106F04 8029D8F4 4481A000 */ mtc1 $at, $f20 -/* 106F08 8029D8F8 2694F784 */ addiu $s4, %lo(D_8015F784) # addiu $s4, $s4, -0x87c +/* 106F08 8029D8F8 2694F784 */ addiu $s4, %lo(gCourseDirection) # addiu $s4, $s4, -0x87c /* 106F0C 8029D8FC 26F7F9B8 */ addiu $s7, %lo(D_8015F9B8) # addiu $s7, $s7, -0x648 /* 106F10 8029D900 27B60058 */ addiu $s6, $sp, 0x58 /* 106F14 8029D904 27B5006C */ addiu $s5, $sp, 0x6c @@ -7769,8 +7769,8 @@ glabel L8029DBBC /* 1071FC 8029DBEC 3C054316 */ lui $a1, 0x4316 /* 107200 8029DBF0 0C0AD4A7 */ jal load_giant_egg /* 107204 8029DBF4 3C064220 */ lui $a2, 0x4220 -/* 107208 8029DBF8 3C018016 */ lui $at, %hi(D_8015F784) # $at, 0x8016 -/* 10720C 8029DBFC C426F784 */ lwc1 $f6, %lo(D_8015F784)($at) +/* 107208 8029DBF8 3C018016 */ lui $at, %hi(gCourseDirection) # $at, 0x8016 +/* 10720C 8029DBFC C426F784 */ lwc1 $f6, %lo(gCourseDirection)($at) /* 107210 8029DC00 C7A40040 */ lwc1 $f4, 0x40($sp) /* 107214 8029DC04 27A40040 */ addiu $a0, $sp, 0x40 /* 107218 8029DC08 27A5002C */ addiu $a1, $sp, 0x2c @@ -7785,8 +7785,8 @@ glabel L8029DBBC /* 10723C 8029DC2C 24060000 */ li $a2, 0 /* 107240 8029DC30 0C0AD4A7 */ jal load_giant_egg /* 107244 8029DC34 3C07449B */ lui $a3, 0x449b -/* 107248 8029DC38 3C018016 */ lui $at, %hi(D_8015F784) # $at, 0x8016 -/* 10724C 8029DC3C C430F784 */ lwc1 $f16, %lo(D_8015F784)($at) +/* 107248 8029DC38 3C018016 */ lui $at, %hi(gCourseDirection) # $at, 0x8016 +/* 10724C 8029DC3C C430F784 */ lwc1 $f16, %lo(gCourseDirection)($at) /* 107250 8029DC40 C7AA0040 */ lwc1 $f10, 0x40($sp) /* 107254 8029DC44 27A40040 */ addiu $a0, $sp, 0x40 /* 107258 8029DC48 27A5002C */ addiu $a1, $sp, 0x2c @@ -7843,8 +7843,8 @@ glabel L8029DCDC /* 107314 8029DD04 27A40040 */ addiu $a0, $sp, 0x40 /* 107318 8029DD08 0C0AD4A7 */ jal load_giant_egg /* 10731C 8029DD0C 24060000 */ li $a2, 0 -/* 107320 8029DD10 3C018016 */ lui $at, %hi(D_8015F784) # $at, 0x8016 -/* 107324 8029DD14 C426F784 */ lwc1 $f6, %lo(D_8015F784)($at) +/* 107320 8029DD10 3C018016 */ lui $at, %hi(gCourseDirection) # $at, 0x8016 +/* 107324 8029DD14 C426F784 */ lwc1 $f6, %lo(gCourseDirection)($at) /* 107328 8029DD18 C7A40040 */ lwc1 $f4, 0x40($sp) /* 10732C 8029DD1C 27A40040 */ addiu $a0, $sp, 0x40 /* 107330 8029DD20 27A5002C */ addiu $a1, $sp, 0x2c @@ -7867,8 +7867,8 @@ glabel L8029DD40 glabel L8029DD60 /* 107370 8029DD60 3C0143A4 */ li $at, 0x43A40000 # 328.000000 /* 107374 8029DD64 44815000 */ mtc1 $at, $f10 -/* 107378 8029DD68 3C018016 */ lui $at, %hi(D_8015F784) # $at, 0x8016 -/* 10737C 8029DD6C C430F784 */ lwc1 $f16, %lo(D_8015F784)($at) +/* 107378 8029DD68 3C018016 */ lui $at, %hi(gCourseDirection) # $at, 0x8016 +/* 10737C 8029DD6C C430F784 */ lwc1 $f16, %lo(gCourseDirection)($at) /* 107380 8029DD70 3C01428C */ li $at, 0x428C0000 # 70.000000 /* 107384 8029DD74 44817000 */ mtc1 $at, $f14 /* 107388 8029DD78 3C06451E */ lui $a2, (0x451ED000 >> 16) # lui $a2, 0x451e @@ -7937,8 +7937,8 @@ glabel L8029DE3C /* 10746C 8029DE5C 3C064000 */ lui $a2, 0x4000 /* 107470 8029DE60 0C0AD4A7 */ jal load_giant_egg /* 107474 8029DE64 3C07420C */ lui $a3, 0x420c -/* 107478 8029DE68 3C018016 */ lui $at, %hi(D_8015F784) # $at, 0x8016 -/* 10747C 8029DE6C C424F784 */ lwc1 $f4, %lo(D_8015F784)($at) +/* 107478 8029DE68 3C018016 */ lui $at, %hi(gCourseDirection) # $at, 0x8016 +/* 10747C 8029DE6C C424F784 */ lwc1 $f4, %lo(gCourseDirection)($at) /* 107480 8029DE70 C7B20040 */ lwc1 $f18, 0x40($sp) /* 107484 8029DE74 27A40040 */ addiu $a0, $sp, 0x40 /* 107488 8029DE78 27A5002C */ addiu $a1, $sp, 0x2c @@ -7959,8 +7959,8 @@ glabel L8029DE3C /* 1074C4 8029DEB4 3C064000 */ lui $a2, 0x4000 /* 1074C8 8029DEB8 0C0AD4A7 */ jal load_giant_egg /* 1074CC 8029DEBC 3C07420C */ lui $a3, 0x420c -/* 1074D0 8029DEC0 3C018016 */ lui $at, %hi(D_8015F784) # $at, 0x8016 -/* 1074D4 8029DEC4 C42AF784 */ lwc1 $f10, %lo(D_8015F784)($at) +/* 1074D0 8029DEC0 3C018016 */ lui $at, %hi(gCourseDirection) # $at, 0x8016 +/* 1074D4 8029DEC4 C42AF784 */ lwc1 $f10, %lo(gCourseDirection)($at) /* 1074D8 8029DEC8 C7A80040 */ lwc1 $f8, 0x40($sp) /* 1074DC 8029DECC 27A40040 */ addiu $a0, $sp, 0x40 /* 1074E0 8029DED0 27A5002C */ addiu $a1, $sp, 0x2c @@ -7988,8 +7988,8 @@ glabel L8029DE3C /* 107538 8029DF28 27A40040 */ addiu $a0, $sp, 0x40 /* 10753C 8029DF2C 0C0AD4A7 */ jal load_giant_egg /* 107540 8029DF30 3C064000 */ lui $a2, 0x4000 -/* 107544 8029DF34 3C018016 */ lui $at, %hi(D_8015F784) # $at, 0x8016 -/* 107548 8029DF38 C424F784 */ lwc1 $f4, %lo(D_8015F784)($at) +/* 107544 8029DF34 3C018016 */ lui $at, %hi(gCourseDirection) # $at, 0x8016 +/* 107548 8029DF38 C424F784 */ lwc1 $f4, %lo(gCourseDirection)($at) /* 10754C 8029DF3C C7B20040 */ lwc1 $f18, 0x40($sp) /* 107550 8029DF40 27A40040 */ addiu $a0, $sp, 0x40 /* 107554 8029DF44 27A5002C */ addiu $a1, $sp, 0x2c @@ -8011,8 +8011,8 @@ glabel L8029DE3C /* 107594 8029DF84 27A40040 */ addiu $a0, $sp, 0x40 /* 107598 8029DF88 0C0AD4A7 */ jal load_giant_egg /* 10759C 8029DF8C 3C064000 */ lui $a2, 0x4000 -/* 1075A0 8029DF90 3C018016 */ lui $at, %hi(D_8015F784) # $at, 0x8016 -/* 1075A4 8029DF94 C42AF784 */ lwc1 $f10, %lo(D_8015F784)($at) +/* 1075A0 8029DF90 3C018016 */ lui $at, %hi(gCourseDirection) # $at, 0x8016 +/* 1075A4 8029DF94 C42AF784 */ lwc1 $f10, %lo(gCourseDirection)($at) /* 1075A8 8029DF98 C7A80040 */ lwc1 $f8, 0x40($sp) /* 1075AC 8029DF9C 27A40040 */ addiu $a0, $sp, 0x40 /* 1075B0 8029DFA0 27A5002C */ addiu $a1, $sp, 0x2c @@ -8049,8 +8049,8 @@ glabel L8029DFFC /* 107620 8029E010 3C0642A6 */ lui $a2, 0x42a6 /* 107624 8029E014 0C0AD4A7 */ jal load_giant_egg /* 107628 8029E018 3C07438F */ lui $a3, 0x438f -/* 10762C 8029E01C 3C018016 */ lui $at, %hi(D_8015F784) # $at, 0x8016 -/* 107630 8029E020 C424F784 */ lwc1 $f4, %lo(D_8015F784)($at) +/* 10762C 8029E01C 3C018016 */ lui $at, %hi(gCourseDirection) # $at, 0x8016 +/* 107630 8029E020 C424F784 */ lwc1 $f4, %lo(gCourseDirection)($at) /* 107634 8029E024 C7B20040 */ lwc1 $f18, 0x40($sp) /* 107638 8029E028 27A40040 */ addiu $a0, $sp, 0x40 /* 10763C 8029E02C 27A5002C */ addiu $a1, $sp, 0x2c @@ -8065,8 +8065,8 @@ glabel L8029DFFC /* 107660 8029E050 3C064290 */ lui $a2, 0x4290 /* 107664 8029E054 0C0AD4A7 */ jal load_giant_egg /* 107668 8029E058 3C07C4C9 */ lui $a3, 0xc4c9 -/* 10766C 8029E05C 3C018016 */ lui $at, %hi(D_8015F784) # $at, 0x8016 -/* 107670 8029E060 C42AF784 */ lwc1 $f10, %lo(D_8015F784)($at) +/* 10766C 8029E05C 3C018016 */ lui $at, %hi(gCourseDirection) # $at, 0x8016 +/* 107670 8029E060 C42AF784 */ lwc1 $f10, %lo(gCourseDirection)($at) /* 107674 8029E064 C7A80040 */ lwc1 $f8, 0x40($sp) /* 107678 8029E068 27A40040 */ addiu $a0, $sp, 0x40 /* 10767C 8029E06C 27A5002C */ addiu $a1, $sp, 0x2c @@ -8082,8 +8082,8 @@ glabel L8029DFFC /* 1076A4 8029E094 27A40040 */ addiu $a0, $sp, 0x40 /* 1076A8 8029E098 0C0AD4A7 */ jal load_giant_egg /* 1076AC 8029E09C 3C06429E */ lui $a2, 0x429e -/* 1076B0 8029E0A0 3C018016 */ lui $at, %hi(D_8015F784) # $at, 0x8016 -/* 1076B4 8029E0A4 C424F784 */ lwc1 $f4, %lo(D_8015F784)($at) +/* 1076B0 8029E0A0 3C018016 */ lui $at, %hi(gCourseDirection) # $at, 0x8016 +/* 1076B4 8029E0A4 C424F784 */ lwc1 $f4, %lo(gCourseDirection)($at) /* 1076B8 8029E0A8 C7B20040 */ lwc1 $f18, 0x40($sp) /* 1076BC 8029E0AC 27A40040 */ addiu $a0, $sp, 0x40 /* 1076C0 8029E0B0 27A5002C */ addiu $a1, $sp, 0x2c @@ -9014,9 +9014,9 @@ glabel func_8029ED38 /* 108418 8029EE08 3C014220 */ li $at, 0x42200000 # 40.000000 /* 10841C 8029EE0C 4481B000 */ mtc1 $at, $f22 /* 108420 8029EE10 3C0140A0 */ li $at, 0x40A00000 # 5.000000 -/* 108424 8029EE14 3C118016 */ lui $s1, %hi(D_8015F784) # $s1, 0x8016 +/* 108424 8029EE14 3C118016 */ lui $s1, %hi(gCourseDirection) # $s1, 0x8016 /* 108428 8029EE18 4481A000 */ mtc1 $at, $f20 -/* 10842C 8029EE1C 2631F784 */ addiu $s1, %lo(D_8015F784) # addiu $s1, $s1, -0x87c +/* 10842C 8029EE1C 2631F784 */ addiu $s1, %lo(gCourseDirection) # addiu $s1, $s1, -0x87c /* 108430 8029EE20 27B20064 */ addiu $s2, $sp, 0x64 /* 108434 8029EE24 44822000 */ mtc1 $v0, $f4 .L8029EE28: diff --git a/asm/libultra.s b/asm/libultra.s index f4f5dc0f4..1c92e4a7e 100644 --- a/asm/libultra.s +++ b/asm/libultra.s @@ -1329,12 +1329,12 @@ glabel osContInit /* 0CDE84 800CD284 24060001 */ li $a2, 1 .L800CD288: /* 0CDE88 800CD288 24180004 */ li $t8, 4 -/* 0CDE8C 800CD28C 3C018019 */ lui $at, %hi(D_80196541) # $at, 0x8019 -/* 0CDE90 800CD290 A0386541 */ sb $t8, %lo(D_80196541)($at) +/* 0CDE8C 800CD28C 3C018019 */ lui $at, %hi(_osContNumControllers) # $at, 0x8019 +/* 0CDE90 800CD290 A0386541 */ sb $t8, %lo(_osContNumControllers)($at) /* 0CDE94 800CD294 0C0334FE */ jal __osPackRequestData /* 0CDE98 800CD298 00002025 */ move $a0, $zero -/* 0CDE9C 800CD29C 3C058019 */ lui $a1, %hi(D_80196500) # $a1, 0x8019 -/* 0CDEA0 800CD2A0 24A56500 */ addiu $a1, %lo(D_80196500) # addiu $a1, $a1, 0x6500 +/* 0CDE9C 800CD29C 3C058019 */ lui $a1, %hi(_osContCmdBuf) # $a1, 0x8019 +/* 0CDEA0 800CD2A0 24A56500 */ addiu $a1, %lo(_osContCmdBuf) # addiu $a1, $a1, 0x6500 /* 0CDEA4 800CD2A4 0C034EA8 */ jal __osSiRawStartDma /* 0CDEA8 800CD2A8 24040001 */ li $a0, 1 /* 0CDEAC 800CD2AC AFA20078 */ sw $v0, 0x78($sp) @@ -1342,8 +1342,8 @@ glabel osContInit /* 0CDEB4 800CD2B4 27A5007C */ addiu $a1, $sp, 0x7c /* 0CDEB8 800CD2B8 0C0335D4 */ jal osRecvMesg /* 0CDEBC 800CD2BC 24060001 */ li $a2, 1 -/* 0CDEC0 800CD2C0 3C058019 */ lui $a1, %hi(D_80196500) # $a1, 0x8019 -/* 0CDEC4 800CD2C4 24A56500 */ addiu $a1, %lo(D_80196500) # addiu $a1, $a1, 0x6500 +/* 0CDEC0 800CD2C0 3C058019 */ lui $a1, %hi(_osContCmdBuf) # $a1, 0x8019 +/* 0CDEC4 800CD2C4 24A56500 */ addiu $a1, %lo(_osContCmdBuf) # addiu $a1, $a1, 0x6500 /* 0CDEC8 800CD2C8 0C034EA8 */ jal __osSiRawStartDma /* 0CDECC 800CD2CC 00002025 */ move $a0, $zero /* 0CDED0 800CD2D0 AFA20078 */ sw $v0, 0x78($sp) @@ -1354,9 +1354,9 @@ glabel osContInit /* 0CDEE4 800CD2E4 8FA40084 */ lw $a0, 0x84($sp) /* 0CDEE8 800CD2E8 0C0334CA */ jal __osContGetInitData /* 0CDEEC 800CD2EC 8FA50088 */ lw $a1, 0x88($sp) -/* 0CDEF0 800CD2F0 3C018019 */ lui $at, %hi(D_80196540) # $at, 0x8019 +/* 0CDEF0 800CD2F0 3C018019 */ lui $at, %hi(_osLastSentSiCmd) # $at, 0x8019 /* 0CDEF4 800CD2F4 0C034ED4 */ jal __osSiCreateAccessQueue -/* 0CDEF8 800CD2F8 A0206540 */ sb $zero, %lo(D_80196540)($at) +/* 0CDEF8 800CD2F8 A0206540 */ sb $zero, %lo(_osLastSentSiCmd)($at) /* 0CDEFC 800CD2FC 3C048019 */ lui $a0, %hi(D_80196568) # $a0, 0x8019 /* 0CDF00 800CD300 3C058019 */ lui $a1, %hi(D_80196580) # $a1, 0x8019 /* 0CDF04 800CD304 24A56580 */ addiu $a1, %lo(D_80196580) # addiu $a1, $a1, 0x6580 @@ -1371,11 +1371,11 @@ glabel osContInit /* 0CDF24 800CD324 00000000 */ nop glabel __osContGetInitData -/* 0CDF28 800CD328 3C0F8019 */ lui $t7, %hi(D_80196541) # $t7, 0x8019 -/* 0CDF2C 800CD32C 91EF6541 */ lbu $t7, %lo(D_80196541)($t7) +/* 0CDF28 800CD328 3C0F8019 */ lui $t7, %hi(_osContNumControllers) # $t7, 0x8019 +/* 0CDF2C 800CD32C 91EF6541 */ lbu $t7, %lo(_osContNumControllers)($t7) /* 0CDF30 800CD330 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 0CDF34 800CD334 3C0E8019 */ lui $t6, %hi(D_80196500) # $t6, 0x8019 -/* 0CDF38 800CD338 25CE6500 */ addiu $t6, %lo(D_80196500) # addiu $t6, $t6, 0x6500 +/* 0CDF34 800CD334 3C0E8019 */ lui $t6, %hi(_osContCmdBuf) # $t6, 0x8019 +/* 0CDF38 800CD338 25CE6500 */ addiu $t6, %lo(_osContCmdBuf) # addiu $t6, $t6, 0x6500 /* 0CDF3C 800CD33C A3A00007 */ sb $zero, 7($sp) /* 0CDF40 800CD340 AFAE0014 */ sw $t6, 0x14($sp) /* 0CDF44 800CD344 19E00028 */ blez $t7, .L800CD3E8 @@ -1411,8 +1411,8 @@ glabel __osContGetInitData /* 0CDFB8 800CD3B8 A3AD0007 */ sb $t5, 7($sp) .L800CD3BC: /* 0CDFBC 800CD3BC 8FAE0008 */ lw $t6, 8($sp) -/* 0CDFC0 800CD3C0 3C198019 */ lui $t9, %hi(D_80196541) # $t9, 0x8019 -/* 0CDFC4 800CD3C4 93396541 */ lbu $t9, %lo(D_80196541)($t9) +/* 0CDFC0 800CD3C0 3C198019 */ lui $t9, %hi(_osContNumControllers) # $t9, 0x8019 +/* 0CDFC4 800CD3C4 93396541 */ lbu $t9, %lo(_osContNumControllers)($t9) /* 0CDFC8 800CD3C8 8FA80014 */ lw $t0, 0x14($sp) /* 0CDFCC 800CD3CC 25CF0001 */ addiu $t7, $t6, 1 /* 0CDFD0 800CD3D0 01F9082A */ slt $at, $t7, $t9 @@ -1434,20 +1434,20 @@ glabel __osPackRequestData .L800CD404: /* 0CE004 800CD404 8FAE0000 */ lw $t6, ($sp) /* 0CE008 800CD408 8FB80000 */ lw $t8, ($sp) -/* 0CE00C 800CD40C 3C018019 */ lui $at, %hi(D_80196500) # 0x8019 +/* 0CE00C 800CD40C 3C018019 */ lui $at, %hi(_osContCmdBuf) # 0x8019 /* 0CE010 800CD410 000E7880 */ sll $t7, $t6, 2 /* 0CE014 800CD414 002F0821 */ addu $at, $at, $t7 -/* 0CE018 800CD418 AC206500 */ sw $zero, %lo(D_80196500)($at) # 0x6500($at) +/* 0CE018 800CD418 AC206500 */ sw $zero, %lo(_osContCmdBuf)($at) # 0x6500($at) /* 0CE01C 800CD41C 27190001 */ addiu $t9, $t8, 1 /* 0CE020 800CD420 2B210010 */ slti $at, $t9, 0x10 /* 0CE024 800CD424 1420FFF7 */ bnez $at, .L800CD404 /* 0CE028 800CD428 AFB90000 */ sw $t9, ($sp) -/* 0CE02C 800CD42C 3C198019 */ lui $t9, %hi(D_80196541) # $t9, 0x8019 -/* 0CE030 800CD430 93396541 */ lbu $t9, %lo(D_80196541)($t9) -/* 0CE034 800CD434 3C098019 */ lui $t1, %hi(D_80196500) # $t1, 0x8019 +/* 0CE02C 800CD42C 3C198019 */ lui $t9, %hi(_osContNumControllers) # $t9, 0x8019 +/* 0CE030 800CD430 93396541 */ lbu $t9, %lo(_osContNumControllers)($t9) +/* 0CE034 800CD434 3C098019 */ lui $t1, %hi(_osContCmdBuf) # $t1, 0x8019 /* 0CE038 800CD438 24080001 */ li $t0, 1 -/* 0CE03C 800CD43C 3C018019 */ lui $at, %hi(D_8019653C) # $at, 0x8019 -/* 0CE040 800CD440 25296500 */ addiu $t1, %lo(D_80196500) # addiu $t1, $t1, 0x6500 +/* 0CE03C 800CD43C 3C018019 */ lui $at, %hi(_osContPifCtrl) # $at, 0x8019 +/* 0CE040 800CD440 25296500 */ addiu $t1, %lo(_osContCmdBuf) # addiu $t1, $t1, 0x6500 /* 0CE044 800CD444 240A00FF */ li $t2, 255 /* 0CE048 800CD448 240B0001 */ li $t3, 1 /* 0CE04C 800CD44C 240C0003 */ li $t4, 3 @@ -1455,7 +1455,7 @@ glabel __osPackRequestData /* 0CE054 800CD454 240E00FF */ li $t6, 255 /* 0CE058 800CD458 240F00FF */ li $t7, 255 /* 0CE05C 800CD45C 241800FF */ li $t8, 255 -/* 0CE060 800CD460 AC28653C */ sw $t0, %lo(D_8019653C)($at) +/* 0CE060 800CD460 AC28653C */ sw $t0, %lo(_osContPifCtrl)($at) /* 0CE064 800CD464 AFA9000C */ sw $t1, 0xc($sp) /* 0CE068 800CD468 A3AA0004 */ sb $t2, 4($sp) /* 0CE06C 800CD46C A3AB0005 */ sb $t3, 5($sp) @@ -1471,14 +1471,14 @@ glabel __osPackRequestData /* 0CE090 800CD490 27A90004 */ addiu $t1, $sp, 4 /* 0CE094 800CD494 8D210000 */ lw $at, ($t1) /* 0CE098 800CD498 8FA8000C */ lw $t0, 0xc($sp) -/* 0CE09C 800CD49C 3C188019 */ lui $t8, %hi(D_80196541) # $t8, 0x8019 +/* 0CE09C 800CD49C 3C188019 */ lui $t8, %hi(_osContNumControllers) # $t8, 0x8019 /* 0CE0A0 800CD4A0 A9010000 */ swl $at, ($t0) /* 0CE0A4 800CD4A4 B9010003 */ swr $at, 3($t0) /* 0CE0A8 800CD4A8 8D2B0004 */ lw $t3, 4($t1) /* 0CE0AC 800CD4AC A90B0004 */ swl $t3, 4($t0) /* 0CE0B0 800CD4B0 B90B0007 */ swr $t3, 7($t0) /* 0CE0B4 800CD4B4 8FAE0000 */ lw $t6, ($sp) -/* 0CE0B8 800CD4B8 93186541 */ lbu $t8, %lo(D_80196541)($t8) +/* 0CE0B8 800CD4B8 93186541 */ lbu $t8, %lo(_osContNumControllers)($t8) /* 0CE0BC 800CD4BC 8FAC000C */ lw $t4, 0xc($sp) /* 0CE0C0 800CD4C0 25CF0001 */ addiu $t7, $t6, 1 /* 0CE0C4 800CD4C4 01F8082A */ slt $at, $t7, $t8 @@ -1500,15 +1500,15 @@ glabel osContStartReadData /* 0CE0F8 800CD4F8 AFA40020 */ sw $a0, 0x20($sp) /* 0CE0FC 800CD4FC 0C034EE8 */ jal __osSiGetAccess /* 0CE100 800CD500 AFA0001C */ sw $zero, 0x1c($sp) -/* 0CE104 800CD504 3C0E8019 */ lui $t6, %hi(D_80196540) # $t6, 0x8019 -/* 0CE108 800CD508 91CE6540 */ lbu $t6, %lo(D_80196540)($t6) +/* 0CE104 800CD504 3C0E8019 */ lui $t6, %hi(_osLastSentSiCmd) # $t6, 0x8019 +/* 0CE108 800CD508 91CE6540 */ lbu $t6, %lo(_osLastSentSiCmd)($t6) /* 0CE10C 800CD50C 24010001 */ li $at, 1 /* 0CE110 800CD510 11C1000C */ beq $t6, $at, .L800CD544 /* 0CE114 800CD514 00000000 */ nop /* 0CE118 800CD518 0C033597 */ jal func_800CD65C /* 0CE11C 800CD51C 00000000 */ nop -/* 0CE120 800CD520 3C058019 */ lui $a1, %hi(D_80196500) # $a1, 0x8019 -/* 0CE124 800CD524 24A56500 */ addiu $a1, %lo(D_80196500) # addiu $a1, $a1, 0x6500 +/* 0CE120 800CD520 3C058019 */ lui $a1, %hi(_osContCmdBuf) # $a1, 0x8019 +/* 0CE124 800CD524 24A56500 */ addiu $a1, %lo(_osContCmdBuf) # addiu $a1, $a1, 0x6500 /* 0CE128 800CD528 0C034EA8 */ jal __osSiRawStartDma /* 0CE12C 800CD52C 24040001 */ li $a0, 1 /* 0CE130 800CD530 AFA2001C */ sw $v0, 0x1c($sp) @@ -1521,26 +1521,26 @@ glabel osContStartReadData .L800CD548: /* 0CE148 800CD548 8FB80018 */ lw $t8, 0x18($sp) /* 0CE14C 800CD54C 8FA80018 */ lw $t0, 0x18($sp) -/* 0CE150 800CD550 3C018019 */ lui $at, %hi(D_80196500) # 0x8019 +/* 0CE150 800CD550 3C018019 */ lui $at, %hi(_osContCmdBuf) # 0x8019 /* 0CE154 800CD554 0018C880 */ sll $t9, $t8, 2 /* 0CE158 800CD558 00390821 */ addu $at, $at, $t9 /* 0CE15C 800CD55C 240F00FF */ li $t7, 255 -/* 0CE160 800CD560 AC2F6500 */ sw $t7, %lo(D_80196500)($at) # 0x6500($at) +/* 0CE160 800CD560 AC2F6500 */ sw $t7, %lo(_osContCmdBuf)($at) # 0x6500($at) /* 0CE164 800CD564 25090001 */ addiu $t1, $t0, 1 /* 0CE168 800CD568 29210010 */ slti $at, $t1, 0x10 /* 0CE16C 800CD56C 1420FFF6 */ bnez $at, .L800CD548 /* 0CE170 800CD570 AFA90018 */ sw $t1, 0x18($sp) -/* 0CE174 800CD574 3C018019 */ lui $at, %hi(D_8019653C) # $at, 0x8019 -/* 0CE178 800CD578 3C058019 */ lui $a1, %hi(D_80196500) # $a1, 0x8019 -/* 0CE17C 800CD57C AC20653C */ sw $zero, %lo(D_8019653C)($at) -/* 0CE180 800CD580 24A56500 */ addiu $a1, %lo(D_80196500) # addiu $a1, $a1, 0x6500 +/* 0CE174 800CD574 3C018019 */ lui $at, %hi(_osContPifCtrl) # $at, 0x8019 +/* 0CE178 800CD578 3C058019 */ lui $a1, %hi(_osContCmdBuf) # $a1, 0x8019 +/* 0CE17C 800CD57C AC20653C */ sw $zero, %lo(_osContPifCtrl)($at) +/* 0CE180 800CD580 24A56500 */ addiu $a1, %lo(_osContCmdBuf) # addiu $a1, $a1, 0x6500 /* 0CE184 800CD584 0C034EA8 */ jal __osSiRawStartDma /* 0CE188 800CD588 00002025 */ move $a0, $zero /* 0CE18C 800CD58C 240A0001 */ li $t2, 1 -/* 0CE190 800CD590 3C018019 */ lui $at, %hi(D_80196540) # $at, 0x8019 +/* 0CE190 800CD590 3C018019 */ lui $at, %hi(_osLastSentSiCmd) # $at, 0x8019 /* 0CE194 800CD594 AFA2001C */ sw $v0, 0x1c($sp) /* 0CE198 800CD598 0C034EF9 */ jal __osSiRelAccess -/* 0CE19C 800CD59C A02A6540 */ sb $t2, %lo(D_80196540)($at) +/* 0CE19C 800CD59C A02A6540 */ sb $t2, %lo(_osLastSentSiCmd)($at) /* 0CE1A0 800CD5A0 8FBF0014 */ lw $ra, 0x14($sp) /* 0CE1A4 800CD5A4 8FA2001C */ lw $v0, 0x1c($sp) /* 0CE1A8 800CD5A8 27BD0020 */ addiu $sp, $sp, 0x20 @@ -1548,11 +1548,11 @@ glabel osContStartReadData /* 0CE1B0 800CD5B0 00000000 */ nop glabel osContGetReadData -/* 0CE1B4 800CD5B4 3C0F8019 */ lui $t7, %hi(D_80196541) # $t7, 0x8019 -/* 0CE1B8 800CD5B8 91EF6541 */ lbu $t7, %lo(D_80196541)($t7) -/* 0CE1BC 800CD5BC 3C0E8019 */ lui $t6, %hi(D_80196500) # $t6, 0x8019 +/* 0CE1B4 800CD5B4 3C0F8019 */ lui $t7, %hi(_osContNumControllers) # $t7, 0x8019 +/* 0CE1B8 800CD5B8 91EF6541 */ lbu $t7, %lo(_osContNumControllers)($t7) +/* 0CE1BC 800CD5BC 3C0E8019 */ lui $t6, %hi(_osContCmdBuf) # $t6, 0x8019 /* 0CE1C0 800CD5C0 27BDFFF0 */ addiu $sp, $sp, -0x10 -/* 0CE1C4 800CD5C4 25CE6500 */ addiu $t6, %lo(D_80196500) # addiu $t6, $t6, 0x6500 +/* 0CE1C4 800CD5C4 25CE6500 */ addiu $t6, %lo(_osContCmdBuf) # addiu $t6, $t6, 0x6500 /* 0CE1C8 800CD5C8 AFAE000C */ sw $t6, 0xc($sp) /* 0CE1CC 800CD5CC 19E00021 */ blez $t7, .L800CD654 /* 0CE1D0 800CD5D0 AFA00000 */ sw $zero, ($sp) @@ -1580,8 +1580,8 @@ glabel osContGetReadData /* 0CE224 800CD624 A0880003 */ sb $t0, 3($a0) .L800CD628: /* 0CE228 800CD628 8FB80000 */ lw $t8, ($sp) -/* 0CE22C 800CD62C 3C0B8019 */ lui $t3, %hi(D_80196541) # $t3, 0x8019 -/* 0CE230 800CD630 916B6541 */ lbu $t3, %lo(D_80196541)($t3) +/* 0CE22C 800CD62C 3C0B8019 */ lui $t3, %hi(_osContNumControllers) # $t3, 0x8019 +/* 0CE230 800CD630 916B6541 */ lbu $t3, %lo(_osContNumControllers)($t3) /* 0CE234 800CD634 8FA9000C */ lw $t1, 0xc($sp) /* 0CE238 800CD638 27190001 */ addiu $t9, $t8, 1 /* 0CE23C 800CD63C 032B082A */ slt $at, $t9, $t3 @@ -1596,25 +1596,25 @@ glabel osContGetReadData glabel func_800CD65C /* 0CE25C 800CD65C 27BDFFF0 */ addiu $sp, $sp, -0x10 -/* 0CE260 800CD660 3C0E8019 */ lui $t6, %hi(D_80196500) # $t6, 0x8019 -/* 0CE264 800CD664 25CE6500 */ addiu $t6, %lo(D_80196500) # addiu $t6, $t6, 0x6500 +/* 0CE260 800CD660 3C0E8019 */ lui $t6, %hi(_osContCmdBuf) # $t6, 0x8019 +/* 0CE264 800CD664 25CE6500 */ addiu $t6, %lo(_osContCmdBuf) # addiu $t6, $t6, 0x6500 /* 0CE268 800CD668 AFAE000C */ sw $t6, 0xc($sp) /* 0CE26C 800CD66C AFA00000 */ sw $zero, ($sp) .L800CD670: /* 0CE270 800CD670 8FAF0000 */ lw $t7, ($sp) /* 0CE274 800CD674 8FB90000 */ lw $t9, ($sp) -/* 0CE278 800CD678 3C018019 */ lui $at, %hi(D_80196500) # 0x8019 +/* 0CE278 800CD678 3C018019 */ lui $at, %hi(_osContCmdBuf) # 0x8019 /* 0CE27C 800CD67C 000FC080 */ sll $t8, $t7, 2 /* 0CE280 800CD680 00380821 */ addu $at, $at, $t8 -/* 0CE284 800CD684 AC206500 */ sw $zero, %lo(D_80196500)($at) # 0x6500($at) +/* 0CE284 800CD684 AC206500 */ sw $zero, %lo(_osContCmdBuf)($at) # 0x6500($at) /* 0CE288 800CD688 27280001 */ addiu $t0, $t9, 1 /* 0CE28C 800CD68C 29010010 */ slti $at, $t0, 0x10 /* 0CE290 800CD690 1420FFF7 */ bnez $at, .L800CD670 /* 0CE294 800CD694 AFA80000 */ sw $t0, ($sp) -/* 0CE298 800CD698 3C198019 */ lui $t9, %hi(D_80196541) # $t9, 0x8019 -/* 0CE29C 800CD69C 93396541 */ lbu $t9, %lo(D_80196541)($t9) +/* 0CE298 800CD698 3C198019 */ lui $t9, %hi(_osContNumControllers) # $t9, 0x8019 +/* 0CE29C 800CD69C 93396541 */ lbu $t9, %lo(_osContNumControllers)($t9) /* 0CE2A0 800CD6A0 24090001 */ li $t1, 1 -/* 0CE2A4 800CD6A4 3C018019 */ lui $at, %hi(D_8019653C) # $at, 0x8019 +/* 0CE2A4 800CD6A4 3C018019 */ lui $at, %hi(_osContPifCtrl) # $at, 0x8019 /* 0CE2A8 800CD6A8 240A00FF */ li $t2, 255 /* 0CE2AC 800CD6AC 240B0001 */ li $t3, 1 /* 0CE2B0 800CD6B0 240C0004 */ li $t4, 4 @@ -1622,7 +1622,7 @@ glabel func_800CD65C /* 0CE2B8 800CD6B8 340EFFFF */ li $t6, 65535 /* 0CE2BC 800CD6BC 240FFFFF */ li $t7, -1 /* 0CE2C0 800CD6C0 2418FFFF */ li $t8, -1 -/* 0CE2C4 800CD6C4 AC29653C */ sw $t1, %lo(D_8019653C)($at) +/* 0CE2C4 800CD6C4 AC29653C */ sw $t1, %lo(_osContPifCtrl)($at) /* 0CE2C8 800CD6C8 A3AA0004 */ sb $t2, 4($sp) /* 0CE2CC 800CD6CC A3AB0005 */ sb $t3, 5($sp) /* 0CE2D0 800CD6D0 A3AC0006 */ sb $t4, 6($sp) @@ -1636,14 +1636,14 @@ glabel func_800CD65C /* 0CE2EC 800CD6EC 27A90004 */ addiu $t1, $sp, 4 /* 0CE2F0 800CD6F0 8D210000 */ lw $at, ($t1) /* 0CE2F4 800CD6F4 8FA8000C */ lw $t0, 0xc($sp) -/* 0CE2F8 800CD6F8 3C188019 */ lui $t8, %hi(D_80196541) # $t8, 0x8019 +/* 0CE2F8 800CD6F8 3C188019 */ lui $t8, %hi(_osContNumControllers) # $t8, 0x8019 /* 0CE2FC 800CD6FC A9010000 */ swl $at, ($t0) /* 0CE300 800CD700 B9010003 */ swr $at, 3($t0) /* 0CE304 800CD704 8D2B0004 */ lw $t3, 4($t1) /* 0CE308 800CD708 A90B0004 */ swl $t3, 4($t0) /* 0CE30C 800CD70C B90B0007 */ swr $t3, 7($t0) /* 0CE310 800CD710 8FAE0000 */ lw $t6, ($sp) -/* 0CE314 800CD714 93186541 */ lbu $t8, %lo(D_80196541)($t8) +/* 0CE314 800CD714 93186541 */ lbu $t8, %lo(_osContNumControllers)($t8) /* 0CE318 800CD718 8FAC000C */ lw $t4, 0xc($sp) /* 0CE31C 800CD71C 25CF0001 */ addiu $t7, $t6, 1 /* 0CE320 800CD720 01F8082A */ slt $at, $t7, $t8 @@ -2600,8 +2600,8 @@ glabel func_800CE3B0 /* 0CF024 800CE424 27A40037 */ addiu $a0, $sp, 0x37 /* 0CF028 800CE428 0C033993 */ jal func_800CE64C /* 0CF02C 800CE42C 27A50024 */ addiu $a1, $sp, 0x24 -/* 0CF030 800CE430 3C0F8019 */ lui $t7, %hi(D_80196541) # $t7, 0x8019 -/* 0CF034 800CE434 91EF6541 */ lbu $t7, %lo(D_80196541)($t7) +/* 0CF030 800CE430 3C0F8019 */ lui $t7, %hi(_osContNumControllers) # $t7, 0x8019 +/* 0CF034 800CE434 91EF6541 */ lbu $t7, %lo(_osContNumControllers)($t7) /* 0CF038 800CE438 AFA00020 */ sw $zero, 0x20($sp) /* 0CF03C 800CE43C 19E00014 */ blez $t7, .L800CE490 /* 0CF040 800CE440 00000000 */ nop @@ -2619,16 +2619,16 @@ glabel func_800CE3B0 /* 0CF06C 800CE46C AFAB0018 */ sw $t3, 0x18($sp) .L800CE470: /* 0CF070 800CE470 8FAC0020 */ lw $t4, 0x20($sp) -/* 0CF074 800CE474 3C0E8019 */ lui $t6, %hi(D_80196541) # $t6, 0x8019 -/* 0CF078 800CE478 91CE6541 */ lbu $t6, %lo(D_80196541)($t6) +/* 0CF074 800CE474 3C0E8019 */ lui $t6, %hi(_osContNumControllers) # $t6, 0x8019 +/* 0CF078 800CE478 91CE6541 */ lbu $t6, %lo(_osContNumControllers)($t6) /* 0CF07C 800CE47C 258D0001 */ addiu $t5, $t4, 1 /* 0CF080 800CE480 AFAD0020 */ sw $t5, 0x20($sp) /* 0CF084 800CE484 01AE082A */ slt $at, $t5, $t6 /* 0CF088 800CE488 1420FFEE */ bnez $at, .L800CE444 /* 0CF08C 800CE48C 00000000 */ nop .L800CE490: -/* 0CF090 800CE490 3C0F8019 */ lui $t7, %hi(D_80196541) # $t7, 0x8019 -/* 0CF094 800CE494 91EF6541 */ lbu $t7, %lo(D_80196541)($t7) +/* 0CF090 800CE490 3C0F8019 */ lui $t7, %hi(_osContNumControllers) # $t7, 0x8019 +/* 0CF094 800CE494 91EF6541 */ lbu $t7, %lo(_osContNumControllers)($t7) /* 0CF098 800CE498 8FB80020 */ lw $t8, 0x20($sp) /* 0CF09C 800CE49C 15F80002 */ bne $t7, $t8, .L800CE4A8 /* 0CF0A0 800CE4A0 00000000 */ nop @@ -2637,8 +2637,8 @@ glabel func_800CE3B0 /* 0CF0A8 800CE4A8 8FB90018 */ lw $t9, 0x18($sp) /* 0CF0AC 800CE4AC 1F20FFC9 */ bgtz $t9, .L800CE3D4 /* 0CF0B0 800CE4B0 00000000 */ nop -/* 0CF0B4 800CE4B4 3C088019 */ lui $t0, %hi(D_80196541) # $t0, 0x8019 -/* 0CF0B8 800CE4B8 91086541 */ lbu $t0, %lo(D_80196541)($t0) +/* 0CF0B4 800CE4B4 3C088019 */ lui $t0, %hi(_osContNumControllers) # $t0, 0x8019 +/* 0CF0B8 800CE4B8 91086541 */ lbu $t0, %lo(_osContNumControllers)($t0) /* 0CF0BC 800CE4BC AFA00020 */ sw $zero, 0x20($sp) /* 0CF0C0 800CE4C0 19000019 */ blez $t0, .L800CE528 /* 0CF0C4 800CE4C4 00000000 */ nop @@ -2661,8 +2661,8 @@ glabel func_800CE3B0 /* 0CF104 800CE504 A3AA001F */ sb $t2, 0x1f($sp) .L800CE508: /* 0CF108 800CE508 8FAB0020 */ lw $t3, 0x20($sp) -/* 0CF10C 800CE50C 3C0C8019 */ lui $t4, %hi(D_80196541) # $t4, 0x8019 -/* 0CF110 800CE510 918C6541 */ lbu $t4, %lo(D_80196541)($t4) +/* 0CF10C 800CE50C 3C0C8019 */ lui $t4, %hi(_osContNumControllers) # $t4, 0x8019 +/* 0CF110 800CE510 918C6541 */ lbu $t4, %lo(_osContNumControllers)($t4) /* 0CF114 800CE514 256D0001 */ addiu $t5, $t3, 1 /* 0CF118 800CE518 AFAD0020 */ sw $t5, 0x20($sp) /* 0CF11C 800CE51C 01AC082A */ slt $at, $t5, $t4 @@ -2683,8 +2683,8 @@ glabel func_800CE3B0 glabel func_800CE550 /* 0CF150 800CE550 27BDFFF0 */ addiu $sp, $sp, -0x10 /* 0CF154 800CE554 308400FF */ andi $a0, $a0, 0xff -/* 0CF158 800CE558 3C018019 */ lui $at, %hi(D_80196540) # $at, 0x8019 -/* 0CF15C 800CE55C A0246540 */ sb $a0, %lo(D_80196540)($at) +/* 0CF158 800CE558 3C018019 */ lui $at, %hi(_osLastSentSiCmd) # $at, 0x8019 +/* 0CF15C 800CE55C A0246540 */ sb $a0, %lo(_osLastSentSiCmd)($at) /* 0CF160 800CE560 AFA00000 */ sw $zero, ($sp) .L800CE564: /* 0CF164 800CE564 8FAE0000 */ lw $t6, ($sp) @@ -2697,8 +2697,8 @@ glabel func_800CE550 /* 0CF180 800CE580 2B210010 */ slti $at, $t9, 0x10 /* 0CF184 800CE584 1420FFF7 */ bnez $at, .L800CE564 /* 0CF188 800CE588 AFB90000 */ sw $t9, ($sp) -/* 0CF18C 800CE58C 3C198019 */ lui $t9, %hi(D_80196541) # $t9, 0x8019 -/* 0CF190 800CE590 93396541 */ lbu $t9, %lo(D_80196541)($t9) +/* 0CF18C 800CE58C 3C198019 */ lui $t9, %hi(_osContNumControllers) # $t9, 0x8019 +/* 0CF190 800CE590 93396541 */ lbu $t9, %lo(_osContNumControllers)($t9) /* 0CF194 800CE594 3C098019 */ lui $t1, %hi(D_80196590) # $t1, 0x8019 /* 0CF198 800CE598 24080001 */ li $t0, 1 /* 0CF19C 800CE59C 3C018019 */ lui $at, %hi(D_801965CC) # $at, 0x8019 @@ -2726,14 +2726,14 @@ glabel func_800CE550 /* 0CF1F0 800CE5F0 27A90004 */ addiu $t1, $sp, 4 /* 0CF1F4 800CE5F4 8D210000 */ lw $at, ($t1) /* 0CF1F8 800CE5F8 8FA8000C */ lw $t0, 0xc($sp) -/* 0CF1FC 800CE5FC 3C188019 */ lui $t8, %hi(D_80196541) # $t8, 0x8019 +/* 0CF1FC 800CE5FC 3C188019 */ lui $t8, %hi(_osContNumControllers) # $t8, 0x8019 /* 0CF200 800CE600 A9010000 */ swl $at, ($t0) /* 0CF204 800CE604 B9010003 */ swr $at, 3($t0) /* 0CF208 800CE608 8D2B0004 */ lw $t3, 4($t1) /* 0CF20C 800CE60C A90B0004 */ swl $t3, 4($t0) /* 0CF210 800CE610 B90B0007 */ swr $t3, 7($t0) /* 0CF214 800CE614 8FAE0000 */ lw $t6, ($sp) -/* 0CF218 800CE618 93186541 */ lbu $t8, %lo(D_80196541)($t8) +/* 0CF218 800CE618 93186541 */ lbu $t8, %lo(_osContNumControllers)($t8) /* 0CF21C 800CE61C 8FAC000C */ lw $t4, 0xc($sp) /* 0CF220 800CE620 25CF0001 */ addiu $t7, $t6, 1 /* 0CF224 800CE624 01F8082A */ slt $at, $t7, $t8 @@ -2749,8 +2749,8 @@ glabel func_800CE550 /* 0CF248 800CE648 A1590000 */ sb $t9, ($t2) glabel func_800CE64C -/* 0CF24C 800CE64C 3C0F8019 */ lui $t7, %hi(D_80196541) # $t7, 0x8019 -/* 0CF250 800CE650 91EF6541 */ lbu $t7, %lo(D_80196541)($t7) +/* 0CF24C 800CE64C 3C0F8019 */ lui $t7, %hi(_osContNumControllers) # $t7, 0x8019 +/* 0CF250 800CE650 91EF6541 */ lbu $t7, %lo(_osContNumControllers)($t7) /* 0CF254 800CE654 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 0CF258 800CE658 3C0E8019 */ lui $t6, %hi(D_80196590) # $t6, 0x8019 /* 0CF25C 800CE65C 25CE6590 */ addiu $t6, %lo(D_80196590) # addiu $t6, $t6, 0x6590 @@ -2789,8 +2789,8 @@ glabel func_800CE64C /* 0CF2DC 800CE6DC A3AD0007 */ sb $t5, 7($sp) .L800CE6E0: /* 0CF2E0 800CE6E0 8FAE0008 */ lw $t6, 8($sp) -/* 0CF2E4 800CE6E4 3C198019 */ lui $t9, %hi(D_80196541) # $t9, 0x8019 -/* 0CF2E8 800CE6E8 93396541 */ lbu $t9, %lo(D_80196541)($t9) +/* 0CF2E4 800CE6E4 3C198019 */ lui $t9, %hi(_osContNumControllers) # $t9, 0x8019 +/* 0CF2E8 800CE6E8 93396541 */ lbu $t9, %lo(_osContNumControllers)($t9) /* 0CF2EC 800CE6EC 8FA80014 */ lw $t0, 0x14($sp) /* 0CF2F0 800CE6F0 25CF0001 */ addiu $t7, $t6, 1 /* 0CF2F4 800CE6F4 01F9082A */ slt $at, $t7, $t9 @@ -9172,9 +9172,9 @@ glabel osEepromWrite /* 0D4D20 800D4120 0C034EA8 */ jal __osSiRawStartDma /* 0D4D24 800D4124 00002025 */ move $a0, $zero /* 0D4D28 800D4128 24190005 */ li $t9, 5 -/* 0D4D2C 800D412C 3C018019 */ lui $at, %hi(D_80196540) # $at, 0x8019 +/* 0D4D2C 800D412C 3C018019 */ lui $at, %hi(_osLastSentSiCmd) # $at, 0x8019 /* 0D4D30 800D4130 AFA20034 */ sw $v0, 0x34($sp) -/* 0D4D34 800D4134 A0396540 */ sb $t9, %lo(D_80196540)($at) +/* 0D4D34 800D4134 A0396540 */ sb $t9, %lo(_osLastSentSiCmd)($at) /* 0D4D38 800D4138 8FA40038 */ lw $a0, 0x38($sp) /* 0D4D3C 800D413C 00002825 */ move $a1, $zero /* 0D4D40 800D4140 0C0335D4 */ jal osRecvMesg @@ -9361,9 +9361,9 @@ glabel __osEepStatus /* 0D4FE8 800D43E8 0C0335D4 */ jal osRecvMesg /* 0D4FEC 800D43EC 24060001 */ li $a2, 1 /* 0D4FF0 800D43F0 240B0005 */ li $t3, 5 -/* 0D4FF4 800D43F4 3C018019 */ lui $at, %hi(D_80196540) # $at, 0x8019 +/* 0D4FF4 800D43F4 3C018019 */ lui $at, %hi(_osLastSentSiCmd) # $at, 0x8019 /* 0D4FF8 800D43F8 3C058019 */ lui $a1, %hi(D_80197660) # $a1, 0x8019 -/* 0D4FFC 800D43FC A02B6540 */ sb $t3, %lo(D_80196540)($at) +/* 0D4FFC 800D43FC A02B6540 */ sb $t3, %lo(_osLastSentSiCmd)($at) /* 0D5000 800D4400 24A57660 */ addiu $a1, %lo(D_80197660) # addiu $a1, $a1, 0x7660 /* 0D5004 800D4404 0C034EA8 */ jal __osSiRawStartDma /* 0D5008 800D4408 00002025 */ move $a0, $zero @@ -11121,8 +11121,8 @@ glabel __osContRamRead /* 0D68E0 800D5CE0 0C034EE8 */ jal __osSiGetAccess /* 0D68E4 800D5CE4 AFAF0028 */ sw $t7, 0x28($sp) /* 0D68E8 800D5CE8 24180002 */ li $t8, 2 -/* 0D68EC 800D5CEC 3C018019 */ lui $at, %hi(D_80196540) # $at, 0x8019 -/* 0D68F0 800D5CF0 A0386540 */ sb $t8, %lo(D_80196540)($at) +/* 0D68EC 800D5CEC 3C018019 */ lui $at, %hi(_osLastSentSiCmd) # $at, 0x8019 +/* 0D68F0 800D5CF0 A0386540 */ sb $t8, %lo(_osLastSentSiCmd)($at) /* 0D68F4 800D5CF4 8FA40064 */ lw $a0, 0x64($sp) /* 0D68F8 800D5CF8 0C0357BD */ jal func_800D5EF4 /* 0D68FC 800D5CFC 97A5006A */ lhu $a1, 0x6a($sp) @@ -12726,8 +12726,8 @@ glabel __osContRamWrite /* 0D7F50 800D7350 0C034EE8 */ jal __osSiGetAccess /* 0D7F54 800D7354 00000000 */ nop /* 0D7F58 800D7358 24080003 */ li $t0, 3 -/* 0D7F5C 800D735C 3C018019 */ lui $at, %hi(D_80196540) # $at, 0x8019 -/* 0D7F60 800D7360 A0286540 */ sb $t0, %lo(D_80196540)($at) +/* 0D7F5C 800D735C 3C018019 */ lui $at, %hi(_osLastSentSiCmd) # $at, 0x8019 +/* 0D7F60 800D7360 A0286540 */ sb $t0, %lo(_osLastSentSiCmd)($at) /* 0D7F64 800D7364 8FA40064 */ lw $a0, 0x64($sp) /* 0D7F68 800D7368 97A5006A */ lhu $a1, 0x6a($sp) /* 0D7F6C 800D736C 0C035D48 */ jal func_800D7520 @@ -13030,9 +13030,9 @@ glabel osEepromRead /* 0D83B0 800D77B0 0C034EA8 */ jal __osSiRawStartDma /* 0D83B4 800D77B4 00002025 */ move $a0, $zero /* 0D83B8 800D77B8 24190004 */ li $t9, 4 -/* 0D83BC 800D77BC 3C018019 */ lui $at, %hi(D_80196540) # $at, 0x8019 +/* 0D83BC 800D77BC 3C018019 */ lui $at, %hi(_osLastSentSiCmd) # $at, 0x8019 /* 0D83C0 800D77C0 AFA20034 */ sw $v0, 0x34($sp) -/* 0D83C4 800D77C4 A0396540 */ sb $t9, %lo(D_80196540)($at) +/* 0D83C4 800D77C4 A0396540 */ sb $t9, %lo(_osLastSentSiCmd)($at) /* 0D83C8 800D77C8 8FA40038 */ lw $a0, 0x38($sp) /* 0D83CC 800D77CC 00002825 */ move $a1, $zero /* 0D83D0 800D77D0 0C0335D4 */ jal osRecvMesg diff --git a/asm/non_matchings/code_800029B0.s b/asm/non_matchings/code_800029B0.s index df229bbd7..cf005d208 100644 --- a/asm/non_matchings/code_800029B0.s +++ b/asm/non_matchings/code_800029B0.s @@ -11,25 +11,25 @@ glabel func_80002A18 /* 003634 80002A34 24010004 */ li $at, 4 /* 003638 80002A38 11E10003 */ beq $t7, $at, .L80002A48 /* 00363C 80002A3C AFBF0014 */ sw $ra, 0x14($sp) -/* 003640 80002A40 3C01800E */ lui $at, %hi(D_800DC604) # $at, 0x800e -/* 003644 80002A44 AC20C604 */ sw $zero, %lo(D_800DC604)($at) +/* 003640 80002A40 3C01800E */ lui $at, %hi(gIsMirrorMode) # $at, 0x800e +/* 003644 80002A44 AC20C604 */ sw $zero, %lo(gIsMirrorMode)($at) .L80002A48: -/* 003648 80002A48 3C18800E */ lui $t8, %hi(D_800DC604) # $t8, 0x800e -/* 00364C 80002A4C 8F18C604 */ lw $t8, %lo(D_800DC604)($t8) -/* 003650 80002A50 3C02800E */ lui $v0, %hi(D_800DC5A4) # $v0, 0x800e +/* 003648 80002A48 3C18800E */ lui $t8, %hi(gIsMirrorMode) # $t8, 0x800e +/* 00364C 80002A4C 8F18C604 */ lw $t8, %lo(gIsMirrorMode)($t8) +/* 003650 80002A50 3C02800E */ lui $v0, %hi(gCurrentlyLoadedCourseId) # $v0, 0x800e /* 003654 80002A54 3C19800E */ lui $t9, %hi(gModeSelection) # $t9, 0x800e /* 003658 80002A58 13000006 */ beqz $t8, .L80002A74 -/* 00365C 80002A5C 2442C5A4 */ addiu $v0, %lo(D_800DC5A4) # addiu $v0, $v0, -0x3a5c +/* 00365C 80002A5C 2442C5A4 */ addiu $v0, %lo(gCurrentlyLoadedCourseId) # addiu $v0, $v0, -0x3a5c /* 003660 80002A60 3C01BF80 */ li $at, 0xBF800000 # -1.000000 /* 003664 80002A64 44812000 */ mtc1 $at, $f4 -/* 003668 80002A68 3C018016 */ lui $at, %hi(D_8015F784) # $at, 0x8016 +/* 003668 80002A68 3C018016 */ lui $at, %hi(gCourseDirection) # $at, 0x8016 /* 00366C 80002A6C 10000005 */ b .L80002A84 -/* 003670 80002A70 E424F784 */ swc1 $f4, %lo(D_8015F784)($at) +/* 003670 80002A70 E424F784 */ swc1 $f4, %lo(gCourseDirection)($at) .L80002A74: /* 003674 80002A74 3C013F80 */ li $at, 0x3F800000 # 1.000000 /* 003678 80002A78 44813000 */ mtc1 $at, $f6 -/* 00367C 80002A7C 3C018016 */ lui $at, %hi(D_8015F784) # $at, 0x8016 -/* 003680 80002A80 E426F784 */ swc1 $f6, %lo(D_8015F784)($at) +/* 00367C 80002A7C 3C018016 */ lui $at, %hi(gCourseDirection) # $at, 0x8016 +/* 003680 80002A80 E426F784 */ swc1 $f6, %lo(gCourseDirection)($at) .L80002A84: /* 003684 80002A84 8F39C53C */ lw $t9, %lo(gModeSelection)($t9) /* 003688 80002A88 3C0E800E */ lui $t6, %hi(D_800DC530) # $t6, 0x800e @@ -117,7 +117,7 @@ glabel func_80002A18 /* 0037C4 80002BC4 2401000A */ li $at, 10 /* 0037C8 80002BC8 256CFFF1 */ addiu $t4, $t3, -0xf /* 0037CC 80002BCC 448C4000 */ mtc1 $t4, $f8 -/* 0037D0 80002BD0 3C0E800E */ lui $t6, %hi(D_800DC604) # $t6, 0x800e +/* 0037D0 80002BD0 3C0E800E */ lui $t6, %hi(gIsMirrorMode) # $t6, 0x800e /* 0037D4 80002BD4 468042A0 */ cvt.s.w $f10, $f8 /* 0037D8 80002BD8 E46A0004 */ swc1 $f10, 4($v1) /* 0037DC 80002BDC 844D0004 */ lh $t5, 4($v0) @@ -128,7 +128,7 @@ glabel func_80002A18 /* 0037F0 80002BF0 8484C5A0 */ lh $a0, %lo(gCurrentCourseId)($a0) /* 0037F4 80002BF4 54810017 */ bnel $a0, $at, .L80002C54 /* 0037F8 80002BF8 2401000E */ li $at, 14 -/* 0037FC 80002BFC 8DCEC604 */ lw $t6, %lo(D_800DC604)($t6) +/* 0037FC 80002BFC 8DCEC604 */ lw $t6, %lo(gIsMirrorMode)($t6) /* 003800 80002C00 51C0000B */ beql $t6, $zero, .L80002C30 /* 003804 80002C04 84580000 */ lh $t8, ($v0) /* 003808 80002C08 844F0000 */ lh $t7, ($v0) @@ -153,8 +153,8 @@ glabel func_80002A18 /* 003850 80002C50 2401000E */ li $at, 14 .L80002C54: /* 003854 80002C54 14810016 */ bne $a0, $at, .L80002CB0 -/* 003858 80002C58 3C19800E */ lui $t9, %hi(D_800DC604) # $t9, 0x800e -/* 00385C 80002C5C 8F39C604 */ lw $t9, %lo(D_800DC604)($t9) +/* 003858 80002C58 3C19800E */ lui $t9, %hi(gIsMirrorMode) # $t9, 0x800e +/* 00385C 80002C5C 8F39C604 */ lw $t9, %lo(gIsMirrorMode)($t9) /* 003860 80002C60 5320000B */ beql $t9, $zero, .L80002C90 /* 003864 80002C64 844A0000 */ lh $t2, ($v0) /* 003868 80002C68 84480000 */ lh $t0, ($v0) @@ -450,13 +450,13 @@ glabel func_80003040 /* 003CA0 800030A0 A420C5C8 */ sh $zero, %lo(D_800DC5C8)($at) /* 003CA4 800030A4 3C018015 */ lui $at, %hi(D_80150110) # $at, 0x8015 /* 003CA8 800030A8 A4200110 */ sh $zero, %lo(D_80150110)($at) -/* 003CAC 800030AC 3C01800E */ lui $at, %hi(D_800DC604) # $at, 0x800e -/* 003CB0 800030B0 AC20C604 */ sw $zero, %lo(D_800DC604)($at) +/* 003CAC 800030AC 3C01800E */ lui $at, %hi(gIsMirrorMode) # $at, 0x800e +/* 003CB0 800030B0 AC20C604 */ sw $zero, %lo(gIsMirrorMode)($at) /* 003CB4 800030B4 3C013F80 */ li $at, 0x3F800000 # 1.000000 /* 003CB8 800030B8 44812000 */ mtc1 $at, $f4 -/* 003CBC 800030BC 3C018016 */ lui $at, %hi(D_8015F784) # $at, 0x8016 +/* 003CBC 800030BC 3C018016 */ lui $at, %hi(gCourseDirection) # $at, 0x8016 /* 003CC0 800030C0 8CA5F728 */ lw $a1, %lo(D_8015F728)($a1) -/* 003CC4 800030C4 E424F784 */ swc1 $f4, %lo(D_8015F784)($at) +/* 003CC4 800030C4 E424F784 */ swc1 $f4, %lo(gCourseDirection)($at) /* 003CC8 800030C8 3C01800E */ lui $at, %hi(gPlayerCountSelection1) # $at, 0x800e /* 003CCC 800030CC AC39C538 */ sw $t9, %lo(gPlayerCountSelection1)($at) /* 003CD0 800030D0 3C01FFFF */ lui $at, (0xFFFF7000 >> 16) # lui $at, 0xffff @@ -514,8 +514,8 @@ glabel L80003180 /* 003D90 80003190 27A40034 */ addiu $a0, $sp, 0x34 /* 003D94 80003194 0C0AD4A7 */ jal load_giant_egg /* 003D98 80003198 24060000 */ li $a2, 0 -/* 003D9C 8000319C 3C018016 */ lui $at, %hi(D_8015F784) # $at, 0x8016 -/* 003DA0 800031A0 C428F784 */ lwc1 $f8, %lo(D_8015F784)($at) +/* 003D9C 8000319C 3C018016 */ lui $at, %hi(gCourseDirection) # $at, 0x8016 +/* 003DA0 800031A0 C428F784 */ lwc1 $f8, %lo(gCourseDirection)($at) /* 003DA4 800031A4 C7A60034 */ lwc1 $f6, 0x34($sp) /* 003DA8 800031A8 27A40034 */ addiu $a0, $sp, 0x34 /* 003DAC 800031AC 27A50020 */ addiu $a1, $sp, 0x20 diff --git a/asm/non_matchings/code_80005FD0.s b/asm/non_matchings/code_80005FD0.s index df81a8cbe..5fa1b1329 100644 --- a/asm/non_matchings/code_80005FD0.s +++ b/asm/non_matchings/code_80005FD0.s @@ -68,8 +68,8 @@ glabel func_80006018 /* 006D10 80006110 27BD0018 */ addiu $sp, $sp, 0x18 glabel func_80006114 -/* 006D14 80006114 3C18800E */ lui $t8, %hi(D_800DC604) -/* 006D18 80006118 8F18C604 */ lw $t8, %lo(D_800DC604)($t8) +/* 006D14 80006114 3C18800E */ lui $t8, %hi(gIsMirrorMode) +/* 006D18 80006118 8F18C604 */ lw $t8, %lo(gIsMirrorMode)($t8) /* 006D1C 8000611C 27BDFFC8 */ addiu $sp, $sp, -0x38 /* 006D20 80006120 00067400 */ sll $t6, $a2, 0x10 /* 006D24 80006124 000E7C03 */ sra $t7, $t6, 0x10 @@ -3597,13 +3597,13 @@ glabel func_8000929C /* 009FE4 800093E4 A4400000 */ sh $zero, ($v0) /* 009FE8 800093E8 8DCF00BC */ lw $t7, 0xbc($t6) /* 009FEC 800093EC 24190001 */ li $t9, 1 -/* 009FF0 800093F0 3C09800E */ lui $t1, %hi(D_800DC604) +/* 009FF0 800093F0 3C09800E */ lui $t1, %hi(gIsMirrorMode) /* 009FF4 800093F4 31F80200 */ andi $t8, $t7, 0x200 /* 009FF8 800093F8 13000002 */ beqz $t8, .L80009404 /* 009FFC 800093FC 3C01C396 */ li $at, 0xC3960000 # -300.000000 /* 00A000 80009400 A4590000 */ sh $t9, ($v0) .L80009404: -/* 00A004 80009404 8D29C604 */ lw $t1, %lo(D_800DC604)($t1) +/* 00A004 80009404 8D29C604 */ lw $t1, %lo(gIsMirrorMode)($t1) /* 00A008 80009408 51200020 */ beql $t1, $zero, .L8000948C /* 00A00C 8000940C 44814000 */ mtc1 $at, $f8 /* 00A010 80009410 3C014396 */ li $at, 0x43960000 # 300.000000 @@ -12195,9 +12195,9 @@ glabel func_80011014 /* 011CBC 800110BC 241E0012 */ li $fp, 18 /* 011CC0 800110C0 44804000 */ mtc1 $zero, $f8 /* 011CC4 800110C4 3C158016 */ lui $s5, %hi(D_80162E70) # $s5, 0x8016 -/* 011CC8 800110C8 3C14800E */ lui $s4, %hi(D_800DC604) +/* 011CC8 800110C8 3C14800E */ lui $s4, %hi(gIsMirrorMode) /* 011CCC 800110CC 460042A1 */ cvt.d.s $f10, $f8 -/* 011CD0 800110D0 2694C604 */ addiu $s4, %lo(D_800DC604) # addiu $s4, $s4, -0x39fc +/* 011CD0 800110D0 2694C604 */ addiu $s4, %lo(gIsMirrorMode) # addiu $s4, $s4, -0x39fc /* 011CD4 800110D4 F7AA0078 */ sdc1 $f10, 0x78($sp) /* 011CD8 800110D8 26B52E70 */ addiu $s5, %lo(D_80162E70) # addiu $s5, $s5, 0x2e70 /* 011CDC 800110DC E7B400C0 */ swc1 $f20, 0xc0($sp) @@ -12555,10 +12555,10 @@ glabel func_80011014 glabel process_path_data /* 0121F4 800115F4 27BDFFF8 */ addiu $sp, $sp, -8 /* 0121F8 800115F8 AFB00004 */ sw $s0, 4($sp) -/* 0121FC 800115FC 3C0A800E */ lui $t2, %hi(D_800DC604) +/* 0121FC 800115FC 3C0A800E */ lui $t2, %hi(gIsMirrorMode) /* 012200 80011600 00808025 */ move $s0, $a0 /* 012204 80011604 00001825 */ move $v1, $zero -/* 012208 80011608 254AC604 */ addiu $t2, %lo(D_800DC604) # addiu $t2, $t2, -0x39fc +/* 012208 80011608 254AC604 */ addiu $t2, %lo(gIsMirrorMode) # addiu $t2, $t2, -0x39fc /* 01220C 8001160C 00001025 */ move $v0, $zero /* 012210 80011610 240B07D0 */ li $t3, 2000 /* 012214 80011614 34098000 */ li $t1, 32768 @@ -12616,14 +12616,14 @@ glabel func_8001168C /* 0122C8 800116C8 F7B40018 */ sdc1 $f20, 0x18($sp) /* 0122CC 800116CC E7A40084 */ swc1 $f4, 0x84($sp) /* 0122D0 800116D0 84AE0000 */ lh $t6, ($a1) -/* 0122D4 800116D4 3C13800E */ lui $s3, %hi(D_800DC604) +/* 0122D4 800116D4 3C13800E */ lui $s3, %hi(gIsMirrorMode) /* 0122D8 800116D8 00808025 */ move $s0, $a0 /* 0122DC 800116DC 448E3000 */ mtc1 $t6, $f6 /* 0122E0 800116E0 00C0A025 */ move $s4, $a2 /* 0122E4 800116E4 00A0B025 */ move $s6, $a1 /* 0122E8 800116E8 46803220 */ cvt.s.w $f8, $f6 /* 0122EC 800116EC 00008825 */ move $s1, $zero -/* 0122F0 800116F0 2673C604 */ addiu $s3, %lo(D_800DC604) # addiu $s3, $s3, -0x39fc +/* 0122F0 800116F0 2673C604 */ addiu $s3, %lo(gIsMirrorMode) # addiu $s3, $s3, -0x39fc /* 0122F4 800116F4 00009025 */ move $s2, $zero /* 0122F8 800116F8 3C013FF0 */ li $at, 0x3FF00000 # 1.875000 /* 0122FC 800116FC E7A800A8 */ swc1 $f8, 0xa8($sp) @@ -13981,14 +13981,14 @@ glabel func_80012A48 /* 013668 80012A68 03281021 */ addu $v0, $t9, $t0 /* 01366C 80012A6C E4440018 */ swc1 $f4, 0x18($v0) /* 013670 80012A70 C4860008 */ lwc1 $f6, 8($a0) -/* 013674 80012A74 3C09800E */ lui $t1, %hi(D_800DC604) +/* 013674 80012A74 3C09800E */ lui $t1, %hi(gIsMirrorMode) /* 013678 80012A78 00057400 */ sll $t6, $a1, 0x10 /* 01367C 80012A7C E446001C */ swc1 $f6, 0x1c($v0) /* 013680 80012A80 C488000C */ lwc1 $f8, 0xc($a0) /* 013684 80012A84 000E7C03 */ sra $t7, $t6, 0x10 /* 013688 80012A88 01E02825 */ move $a1, $t7 /* 01368C 80012A8C E4480020 */ swc1 $f8, 0x20($v0) -/* 013690 80012A90 8D29C604 */ lw $t1, %lo(D_800DC604)($t1) +/* 013690 80012A90 8D29C604 */ lw $t1, %lo(gIsMirrorMode)($t1) /* 013694 80012A94 000F5023 */ negu $t2, $t7 /* 013698 80012A98 51200004 */ beql $t1, $zero, .L80012AAC /* 01369C 80012A9C A4450012 */ sh $a1, 0x12($v0) @@ -14892,11 +14892,11 @@ glabel func_800133C4 /* 0143B4 800137B4 01AE1021 */ addu $v0, $t5, $t6 /* 0143B8 800137B8 E4400018 */ swc1 $f0, 0x18($v0) /* 0143BC 800137BC C60A0008 */ lwc1 $f10, 8($s0) -/* 0143C0 800137C0 3C0F800E */ lui $t7, %hi(D_800DC604) +/* 0143C0 800137C0 3C0F800E */ lui $t7, %hi(gIsMirrorMode) /* 0143C4 800137C4 E44A001C */ swc1 $f10, 0x1c($v0) /* 0143C8 800137C8 C610000C */ lwc1 $f16, 0xc($s0) /* 0143CC 800137CC E4500020 */ swc1 $f16, 0x20($v0) -/* 0143D0 800137D0 8DEFC604 */ lw $t7, %lo(D_800DC604)($t7) +/* 0143D0 800137D0 8DEFC604 */ lw $t7, %lo(gIsMirrorMode)($t7) /* 0143D4 800137D4 51E00006 */ beql $t7, $zero, .L800137F0 /* 0143D8 800137D8 86080024 */ lh $t0, 0x24($s0) /* 0143DC 800137DC 86180024 */ lh $t8, 0x24($s0) @@ -15395,7 +15395,7 @@ glabel func_80013D20 /* 014AE8 80013EE8 460A4401 */ sub.s $f16, $f8, $f10 /* 014AEC 80013EEC 000C6100 */ sll $t4, $t4, 4 /* 014AF0 80013EF0 018D1821 */ addu $v1, $t4, $t5 -/* 014AF4 80013EF4 3C0F800E */ lui $t7, %hi(D_800DC604) +/* 014AF4 80013EF4 3C0F800E */ lui $t7, %hi(gIsMirrorMode) /* 014AF8 80013EF8 E6100014 */ swc1 $f16, 0x14($s0) /* 014AFC 80013EFC C7A40054 */ lwc1 $f4, 0x54($sp) /* 014B00 80013F00 46049181 */ sub.s $f6, $f18, $f4 @@ -15407,7 +15407,7 @@ glabel func_80013D20 /* 014B18 80013F18 E46A0020 */ swc1 $f10, 0x20($v1) /* 014B1C 80013F1C 860E0028 */ lh $t6, 0x28($s0) /* 014B20 80013F20 A46E0010 */ sh $t6, 0x10($v1) -/* 014B24 80013F24 8DEFC604 */ lw $t7, %lo(D_800DC604)($t7) +/* 014B24 80013F24 8DEFC604 */ lw $t7, %lo(gIsMirrorMode)($t7) /* 014B28 80013F28 51E00006 */ beql $t7, $zero, .L80013F44 /* 014B2C 80013F2C 8608002A */ lh $t0, 0x2a($s0) /* 014B30 80013F30 8618002A */ lh $t8, 0x2a($s0) diff --git a/asm/non_matchings/code_800AF9B0.s b/asm/non_matchings/code_800AF9B0.s index a97d6786d..9ef27c4ec 100644 --- a/asm/non_matchings/code_800AF9B0.s +++ b/asm/non_matchings/code_800AF9B0.s @@ -3315,14 +3315,14 @@ glabel func_800B28C8 /* 0B3550 800B2950 A423C648 */ sh $v1, %lo(D_800DC648)($at) /* 0B3554 800B2954 24010003 */ li $at, 3 /* 0B3558 800B2958 14410003 */ bne $v0, $at, .L800B2968 -/* 0B355C 800B295C 3C01800E */ lui $at, %hi(D_800DC604) # 0x800e +/* 0B355C 800B295C 3C01800E */ lui $at, %hi(gIsMirrorMode) # 0x800e /* 0B3560 800B2960 03E00008 */ jr $ra -/* 0B3564 800B2964 AC23C604 */ sw $v1, %lo(D_800DC604)($at) # -0x39fc($at) +/* 0B3564 800B2964 AC23C604 */ sw $v1, %lo(gIsMirrorMode)($at) # -0x39fc($at) .L800B2968: -/* 0B3568 800B2968 3C01800E */ lui $at, %hi(D_800DC604) # 0x800e +/* 0B3568 800B2968 3C01800E */ lui $at, %hi(gIsMirrorMode) # 0x800e /* 0B356C 800B296C 03E00008 */ jr $ra -/* 0B3570 800B2970 AC20C604 */ sw $zero, %lo(D_800DC604)($at) # -0x39fc($at) +/* 0B3570 800B2970 AC20C604 */ sw $zero, %lo(gIsMirrorMode)($at) # -0x39fc($at) .L800B2974: /* 0B3574 800B2974 3C01800E */ lui $at, %hi(D_800DC548) # $at, 0x800e @@ -3331,26 +3331,26 @@ glabel func_800B28C8 /* 0B3580 800B2980 A423C648 */ sh $v1, %lo(D_800DC648)($at) /* 0B3584 800B2984 24010003 */ li $at, 3 /* 0B3588 800B2988 14410003 */ bne $v0, $at, .L800B2998 -/* 0B358C 800B298C 3C01800E */ lui $at, %hi(D_800DC604) # 0x800e +/* 0B358C 800B298C 3C01800E */ lui $at, %hi(gIsMirrorMode) # 0x800e /* 0B3590 800B2990 03E00008 */ jr $ra -/* 0B3594 800B2994 AC23C604 */ sw $v1, %lo(D_800DC604)($at) # -0x39fc($at) +/* 0B3594 800B2994 AC23C604 */ sw $v1, %lo(gIsMirrorMode)($at) # -0x39fc($at) .L800B2998: -/* 0B3598 800B2998 3C01800E */ lui $at, %hi(D_800DC604) # 0x800e +/* 0B3598 800B2998 3C01800E */ lui $at, %hi(gIsMirrorMode) # 0x800e /* 0B359C 800B299C 03E00008 */ jr $ra -/* 0B35A0 800B29A0 AC20C604 */ sw $zero, %lo(D_800DC604)($at) # -0x39fc($at) +/* 0B35A0 800B29A0 AC20C604 */ sw $zero, %lo(gIsMirrorMode)($at) # -0x39fc($at) .L800B29A4: /* 0B35A4 800B29A4 3C01800E */ lui $at, %hi(D_800DC648) # $at, 0x800e /* 0B35A8 800B29A8 A423C648 */ sh $v1, %lo(D_800DC648)($at) -/* 0B35AC 800B29AC 3C01800E */ lui $at, %hi(D_800DC604) # 0x800e +/* 0B35AC 800B29AC 3C01800E */ lui $at, %hi(gIsMirrorMode) # 0x800e /* 0B35B0 800B29B0 03E00008 */ jr $ra -/* 0B35B4 800B29B4 AC20C604 */ sw $zero, %lo(D_800DC604)($at) # -0x39fc($at) +/* 0B35B4 800B29B4 AC20C604 */ sw $zero, %lo(gIsMirrorMode)($at) # -0x39fc($at) .L800B29B8: /* 0B35B8 800B29B8 AC23C548 */ sw $v1, %lo(D_800DC548)($at) # -0x3ab8($at) -/* 0B35BC 800B29BC 3C01800E */ lui $at, %hi(D_800DC604) # $at, 0x800e -/* 0B35C0 800B29C0 AC20C604 */ sw $zero, %lo(D_800DC604)($at) +/* 0B35BC 800B29BC 3C01800E */ lui $at, %hi(gIsMirrorMode) # $at, 0x800e +/* 0B35C0 800B29C0 AC20C604 */ sw $zero, %lo(gIsMirrorMode)($at) /* 0B35C4 800B29C4 3C01800E */ lui $at, %hi(D_800DC648) # $at, 0x800e /* 0B35C8 800B29C8 10400001 */ beqz $v0, .L800B29D0 /* 0B35CC 800B29CC A420C648 */ sh $zero, %lo(D_800DC648)($at) @@ -4938,8 +4938,8 @@ glabel L800B4054 /* 0B4C68 800B4068 1000010A */ b .L800B4494 /* 0B4C6C 800B406C 00000000 */ nop glabel L800B4070 -/* 0B4C70 800B4070 3C01800E */ lui $at, %hi(D_800DC604) # $at, 0x800e -/* 0B4C74 800B4074 AC20C604 */ sw $zero, %lo(D_800DC604)($at) +/* 0B4C70 800B4070 3C01800E */ lui $at, %hi(gIsMirrorMode) # $at, 0x800e +/* 0B4C74 800B4074 AC20C604 */ sw $zero, %lo(gIsMirrorMode)($at) /* 0B4C78 800B4078 3C01800E */ lui $at, %hi(gEnableDebugMode) # $at, 0x800e /* 0B4C7C 800B407C 3C028019 */ lui $v0, %hi(gCupSelection) # $v0, 0x8019 /* 0B4C80 800B4080 A420C520 */ sh $zero, %lo(gEnableDebugMode)($at) @@ -4979,8 +4979,8 @@ glabel L800B4070 glabel L800B4100 /* 0B4D00 800B4100 3C01800E */ lui $at, %hi(gEnableDebugMode) # $at, 0x800e /* 0B4D04 800B4104 A420C520 */ sh $zero, %lo(gEnableDebugMode)($at) -/* 0B4D08 800B4108 3C01800E */ lui $at, %hi(D_800DC604) # $at, 0x800e -/* 0B4D0C 800B410C AC20C604 */ sw $zero, %lo(D_800DC604)($at) +/* 0B4D08 800B4108 3C01800E */ lui $at, %hi(gIsMirrorMode) # $at, 0x800e +/* 0B4D0C 800B410C AC20C604 */ sw $zero, %lo(gIsMirrorMode)($at) /* 0B4D10 800B4110 3C018019 */ lui $at, %hi(D_8018EDFC) # $at, 0x8019 /* 0B4D14 800B4114 0C02D7CC */ jal func_800B5F30 /* 0B4D18 800B4118 A020EDFC */ sb $zero, %lo(D_8018EDFC)($at) @@ -5361,9 +5361,9 @@ glabel func_800B45E0 /* 0B523C 800B463C 03093021 */ addu $a2, $t8, $t1 /* 0B5240 800B4640 00C32823 */ subu $a1, $a2, $v1 /* 0B5244 800B4644 000550C2 */ srl $t2, $a1, 3 -/* 0B5248 800B4648 3C048015 */ lui $a0, %hi(D_8014F0B8) # $a0, 0x8015 +/* 0B5248 800B4648 3C048015 */ lui $a0, %hi(gSIEventMesgQueue) # $a0, 0x8015 /* 0B524C 800B464C A0C20017 */ sb $v0, 0x17($a2) -/* 0B5250 800B4650 2484F0B8 */ addiu $a0, %lo(D_8014F0B8) # addiu $a0, $a0, -0xf48 +/* 0B5250 800B4650 2484F0B8 */ addiu $a0, %lo(gSIEventMesgQueue) # addiu $a0, $a0, -0xf48 /* 0B5254 800B4654 314500FF */ andi $a1, $t2, 0xff /* 0B5258 800B4658 0C034014 */ jal osEepromLongWrite /* 0B525C 800B465C 24070018 */ li $a3, 24 @@ -5387,9 +5387,9 @@ glabel func_800B4670 /* 0B529C 800B469C 00CE2823 */ subu $a1, $a2, $t6 /* 0B52A0 800B46A0 3C018019 */ lui $at, %hi(D_8018ED17) # $at, 0x8019 /* 0B52A4 800B46A4 000578C2 */ srl $t7, $a1, 3 -/* 0B52A8 800B46A8 3C048015 */ lui $a0, %hi(D_8014F0B8) # $a0, 0x8015 +/* 0B52A8 800B46A8 3C048015 */ lui $a0, %hi(gSIEventMesgQueue) # $a0, 0x8015 /* 0B52AC 800B46AC A022ED17 */ sb $v0, %lo(D_8018ED17)($at) -/* 0B52B0 800B46B0 2484F0B8 */ addiu $a0, %lo(D_8014F0B8) # addiu $a0, $a0, -0xf48 +/* 0B52B0 800B46B0 2484F0B8 */ addiu $a0, %lo(gSIEventMesgQueue) # addiu $a0, $a0, -0xf48 /* 0B52B4 800B46B4 31E500FF */ andi $a1, $t7, 0xff /* 0B52B8 800B46B8 0C034014 */ jal osEepromLongWrite /* 0B52BC 800B46BC 24070008 */ li $a3, 8 @@ -5634,12 +5634,12 @@ glabel func_800B49E4 glabel func_800B4A10 /* 0B5610 800B4A10 27BDFFE0 */ addiu $sp, $sp, -0x20 /* 0B5614 800B4A14 AFBF001C */ sw $ra, 0x1c($sp) -/* 0B5618 800B4A18 3C048015 */ lui $a0, %hi(D_8014F0B8) # $a0, 0x8015 +/* 0B5618 800B4A18 3C048015 */ lui $a0, %hi(gSIEventMesgQueue) # $a0, 0x8015 /* 0B561C 800B4A1C 3C068019 */ lui $a2, %hi(D_8018EB90) # $a2, 0x8019 /* 0B5620 800B4A20 AFB10018 */ sw $s1, 0x18($sp) /* 0B5624 800B4A24 AFB00014 */ sw $s0, 0x14($sp) /* 0B5628 800B4A28 24C6EB90 */ addiu $a2, %lo(D_8018EB90) # addiu $a2, $a2, -0x1470 -/* 0B562C 800B4A2C 2484F0B8 */ addiu $a0, %lo(D_8014F0B8) # addiu $a0, $a0, -0xf48 +/* 0B562C 800B4A2C 2484F0B8 */ addiu $a0, %lo(gSIEventMesgQueue) # addiu $a0, $a0, -0xf48 /* 0B5630 800B4A30 00002825 */ move $a1, $zero /* 0B5634 800B4A34 0C034064 */ jal osEepromLongRead /* 0B5638 800B4A38 24070200 */ li $a3, 512 @@ -5872,9 +5872,9 @@ glabel func_800B4CB4 /* 0B5970 800B4D70 00CB2823 */ subu $a1, $a2, $t3 /* 0B5974 800B4D74 3C018019 */ lui $at, %hi(D_8018ED17) # $at, 0x8019 /* 0B5978 800B4D78 000560C2 */ srl $t4, $a1, 3 -/* 0B597C 800B4D7C 3C048015 */ lui $a0, %hi(D_8014F0B8) # $a0, 0x8015 +/* 0B597C 800B4D7C 3C048015 */ lui $a0, %hi(gSIEventMesgQueue) # $a0, 0x8015 /* 0B5980 800B4D80 A022ED17 */ sb $v0, %lo(D_8018ED17)($at) -/* 0B5984 800B4D84 2484F0B8 */ addiu $a0, %lo(D_8014F0B8) # addiu $a0, $a0, -0xf48 +/* 0B5984 800B4D84 2484F0B8 */ addiu $a0, %lo(gSIEventMesgQueue) # addiu $a0, $a0, -0xf48 /* 0B5988 800B4D88 318500FF */ andi $a1, $t4, 0xff /* 0B598C 800B4D8C 0C034014 */ jal osEepromLongWrite /* 0B5990 800B4D90 24070008 */ li $a3, 8 @@ -6576,9 +6576,9 @@ glabel func_800B559C /* 0B633C 800B573C 02C02025 */ move $a0, $s6 /* 0B6340 800B5740 02552823 */ subu $a1, $s2, $s5 /* 0B6344 800B5744 000568C2 */ srl $t5, $a1, 3 -/* 0B6348 800B5748 3C048015 */ lui $a0, %hi(D_8014F0B8) # $a0, 0x8015 +/* 0B6348 800B5748 3C048015 */ lui $a0, %hi(gSIEventMesgQueue) # $a0, 0x8015 /* 0B634C 800B574C A2420037 */ sb $v0, 0x37($s2) -/* 0B6350 800B5750 2484F0B8 */ addiu $a0, %lo(D_8014F0B8) # addiu $a0, $a0, -0xf48 +/* 0B6350 800B5750 2484F0B8 */ addiu $a0, %lo(gSIEventMesgQueue) # addiu $a0, $a0, -0xf48 /* 0B6354 800B5754 31A500FF */ andi $a1, $t5, 0xff /* 0B6358 800B5758 02403025 */ move $a2, $s2 /* 0B635C 800B575C 0C034014 */ jal osEepromLongWrite @@ -6752,9 +6752,9 @@ glabel func_800B5948 /* 0B65C0 800B59C0 00C92823 */ subu $a1, $a2, $t1 /* 0B65C4 800B59C4 3C018019 */ lui $at, %hi(D_8018ED8F) # $at, 0x8019 /* 0B65C8 800B59C8 000550C2 */ srl $t2, $a1, 3 -/* 0B65CC 800B59CC 3C048015 */ lui $a0, %hi(D_8014F0B8) # $a0, 0x8015 +/* 0B65CC 800B59CC 3C048015 */ lui $a0, %hi(gSIEventMesgQueue) # $a0, 0x8015 /* 0B65D0 800B59D0 A022ED8F */ sb $v0, %lo(D_8018ED8F)($at) -/* 0B65D4 800B59D4 2484F0B8 */ addiu $a0, %lo(D_8014F0B8) # addiu $a0, $a0, -0xf48 +/* 0B65D4 800B59D4 2484F0B8 */ addiu $a0, %lo(gSIEventMesgQueue) # addiu $a0, $a0, -0xf48 /* 0B65D8 800B59D8 314500FF */ andi $a1, $t2, 0xff /* 0B65DC 800B59DC 0C034014 */ jal osEepromLongWrite /* 0B65E0 800B59E0 24070008 */ li $a3, 8 @@ -6863,8 +6863,8 @@ glabel func_800B5B2C /* 0B6748 800B5B48 1000000E */ b .L800B5B84 /* 0B674C 800B5B4C 00001025 */ move $v0, $zero .L800B5B50: -/* 0B6750 800B5B50 3C048015 */ lui $a0, %hi(D_8014F0B8) # $a0, 0x8015 -/* 0B6754 800B5B54 2484F0B8 */ addiu $a0, %lo(D_8014F0B8) # addiu $a0, $a0, -0xf48 +/* 0B6750 800B5B50 3C048015 */ lui $a0, %hi(gSIEventMesgQueue) # $a0, 0x8015 +/* 0B6754 800B5B54 2484F0B8 */ addiu $a0, %lo(gSIEventMesgQueue) # addiu $a0, $a0, -0xf48 /* 0B6758 800B5B58 0C0338EC */ jal func_800CE3B0 /* 0B675C 800B5B5C AFA60020 */ sw $a2, 0x20($sp) /* 0B6760 800B5B60 8FA60020 */ lw $a2, 0x20($sp) @@ -6929,13 +6929,13 @@ glabel func_800B5B94 /* 0B6830 800B5C30 0C02D6CB */ jal func_800B5B2C /* 0B6834 800B5C34 00002025 */ move $a0, $zero /* 0B6838 800B5C38 14400003 */ bnez $v0, .L800B5C48 -/* 0B683C 800B5C3C 3C048015 */ lui $a0, %hi(D_8014F0B8) # $a0, 0x8015 +/* 0B683C 800B5C3C 3C048015 */ lui $a0, %hi(gSIEventMesgQueue) # $a0, 0x8015 /* 0B6840 800B5C40 10000054 */ b .L800B5D94 /* 0B6844 800B5C44 24020001 */ li $v0, 1 .L800B5C48: /* 0B6848 800B5C48 3C058019 */ lui $a1, %hi(D_8018E868) # $a1, 0x8019 /* 0B684C 800B5C4C 24A5E868 */ addiu $a1, %lo(D_8018E868) # addiu $a1, $a1, -0x1798 -/* 0B6850 800B5C50 2484F0B8 */ addiu $a0, %lo(D_8014F0B8) # addiu $a0, $a0, -0xf48 +/* 0B6850 800B5C50 2484F0B8 */ addiu $a0, %lo(gSIEventMesgQueue) # addiu $a0, $a0, -0xf48 /* 0B6854 800B5C54 0C0339C8 */ jal func_800CE720 /* 0B6858 800B5C58 00003025 */ move $a2, $zero /* 0B685C 800B5C5C 10400010 */ beqz $v0, .L800B5CA0 @@ -7076,13 +7076,13 @@ glabel func_800B5DA4 /* 0B6A38 800B5E38 0C02D6CB */ jal func_800B5B2C /* 0B6A3C 800B5E3C 24040001 */ li $a0, 1 /* 0B6A40 800B5E40 14400003 */ bnez $v0, .L800B5E50 -/* 0B6A44 800B5E44 3C048015 */ lui $a0, %hi(D_8014F0B8) # $a0, 0x8015 +/* 0B6A44 800B5E44 3C048015 */ lui $a0, %hi(gSIEventMesgQueue) # $a0, 0x8015 /* 0B6A48 800B5E48 10000035 */ b .L800B5F20 /* 0B6A4C 800B5E4C 24020001 */ li $v0, 1 .L800B5E50: /* 0B6A50 800B5E50 3C058019 */ lui $a1, %hi(D_8018E8D0) # $a1, 0x8019 /* 0B6A54 800B5E54 24A5E8D0 */ addiu $a1, %lo(D_8018E8D0) # addiu $a1, $a1, -0x1730 -/* 0B6A58 800B5E58 2484F0B8 */ addiu $a0, %lo(D_8014F0B8) # addiu $a0, $a0, -0xf48 +/* 0B6A58 800B5E58 2484F0B8 */ addiu $a0, %lo(gSIEventMesgQueue) # addiu $a0, $a0, -0xf48 /* 0B6A5C 800B5E5C 0C0339C8 */ jal func_800CE720 /* 0B6A60 800B5E60 24060001 */ li $a2, 1 /* 0B6A64 800B5E64 10400010 */ beqz $v0, .L800B5EA8 @@ -7159,10 +7159,10 @@ glabel func_800B5F30 /* 0B6B50 800B5F50 0C02D6CB */ jal func_800B5B2C /* 0B6B54 800B5F54 00002025 */ move $a0, $zero /* 0B6B58 800B5F58 10400029 */ beqz $v0, .L800B6000 -/* 0B6B5C 800B5F5C 3C048015 */ lui $a0, %hi(D_8014F0B8) # $a0, 0x8015 +/* 0B6B5C 800B5F5C 3C048015 */ lui $a0, %hi(gSIEventMesgQueue) # $a0, 0x8015 /* 0B6B60 800B5F60 3C058019 */ lui $a1, %hi(D_8018E868) # $a1, 0x8019 /* 0B6B64 800B5F64 24A5E868 */ addiu $a1, %lo(D_8018E868) # addiu $a1, $a1, -0x1798 -/* 0B6B68 800B5F68 2484F0B8 */ addiu $a0, %lo(D_8014F0B8) # addiu $a0, $a0, -0xf48 +/* 0B6B68 800B5F68 2484F0B8 */ addiu $a0, %lo(gSIEventMesgQueue) # addiu $a0, $a0, -0xf48 /* 0B6B6C 800B5F6C 0C0339C8 */ jal func_800CE720 /* 0B6B70 800B5F70 00003025 */ move $a2, $zero /* 0B6B74 800B5F74 3C048019 */ lui $a0, %hi(D_8018E868) # $a0, 0x8019 @@ -7224,10 +7224,10 @@ glabel func_800B6014 /* 0B6C34 800B6034 0C02D6CB */ jal func_800B5B2C /* 0B6C38 800B6038 24040001 */ li $a0, 1 /* 0B6C3C 800B603C 1040000D */ beqz $v0, .L800B6074 -/* 0B6C40 800B6040 3C048015 */ lui $a0, %hi(D_8014F0B8) # $a0, 0x8015 +/* 0B6C40 800B6040 3C048015 */ lui $a0, %hi(gSIEventMesgQueue) # $a0, 0x8015 /* 0B6C44 800B6044 3C058019 */ lui $a1, %hi(D_8018E8D0) # $a1, 0x8019 /* 0B6C48 800B6048 24A5E8D0 */ addiu $a1, %lo(D_8018E8D0) # addiu $a1, $a1, -0x1730 -/* 0B6C4C 800B604C 2484F0B8 */ addiu $a0, %lo(D_8014F0B8) # addiu $a0, $a0, -0xf48 +/* 0B6C4C 800B604C 2484F0B8 */ addiu $a0, %lo(gSIEventMesgQueue) # addiu $a0, $a0, -0xf48 /* 0B6C50 800B6050 0C0339C8 */ jal func_800CE720 /* 0B6C54 800B6054 24060001 */ li $a2, 1 /* 0B6C58 800B6058 14400004 */ bnez $v0, .L800B606C @@ -7992,10 +7992,10 @@ glabel func_800B6A68 /* 0B7700 800B6B00 0C02D6CB */ jal func_800B5B2C /* 0B7704 800B6B04 00002025 */ move $a0, $zero /* 0B7708 800B6B08 10400034 */ beqz $v0, .L800B6BDC -/* 0B770C 800B6B0C 3C048015 */ lui $a0, %hi(D_8014F0B8) # $a0, 0x8015 +/* 0B770C 800B6B0C 3C048015 */ lui $a0, %hi(gSIEventMesgQueue) # $a0, 0x8015 /* 0B7710 800B6B10 3C058019 */ lui $a1, %hi(D_8018E868) # $a1, 0x8019 /* 0B7714 800B6B14 24A5E868 */ addiu $a1, %lo(D_8018E868) # addiu $a1, $a1, -0x1798 -/* 0B7718 800B6B18 2484F0B8 */ addiu $a0, %lo(D_8014F0B8) # addiu $a0, $a0, -0xf48 +/* 0B7718 800B6B18 2484F0B8 */ addiu $a0, %lo(gSIEventMesgQueue) # addiu $a0, $a0, -0xf48 /* 0B771C 800B6B1C 0C0339C8 */ jal func_800CE720 /* 0B7720 800B6B20 00003025 */ move $a2, $zero /* 0B7724 800B6B24 1440002D */ bnez $v0, .L800B6BDC diff --git a/asm/non_matchings/code_80281780/load_ending_sequence_royalraceway.s b/asm/non_matchings/code_80281780/load_ending_sequence_royalraceway.s index 12defbe9f..cd7c2f8ee 100644 --- a/asm/non_matchings/code_80281780/load_ending_sequence_royalraceway.s +++ b/asm/non_matchings/code_80281780/load_ending_sequence_royalraceway.s @@ -5,8 +5,8 @@ glabel load_ending_sequence_royalraceway /* 124FB4 80281974 3C01800E */ lui $at, %hi(D_800DC5B4) # $at, 0x800e /* 124FB8 80281978 240F0001 */ li $t7, 1 /* 124FBC 8028197C A42FC5B4 */ sh $t7, %lo(D_800DC5B4)($at) -/* 124FC0 80281980 3C01800E */ lui $at, %hi(D_800DC604) # $at, 0x800e -/* 124FC4 80281984 AC20C604 */ sw $zero, %lo(D_800DC604)($at) +/* 124FC0 80281980 3C01800E */ lui $at, %hi(gIsMirrorMode) # $at, 0x800e +/* 124FC4 80281984 AC20C604 */ sw $zero, %lo(gIsMirrorMode)($at) /* 124FC8 80281988 3C018028 */ lui $at, %hi(D_80287550) # $at, 0x8028 /* 124FCC 8028198C 3418FFFF */ li $t8, 65535 /* 124FD0 80281990 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/non_matchings/main/func_80000934.s b/asm/non_matchings/main/func_80000934.s index 850138fce..c34e55af1 100644 --- a/asm/non_matchings/main/func_80000934.s +++ b/asm/non_matchings/main/func_80000934.s @@ -1,13 +1,13 @@ glabel func_80000934 -/* 001534 80000934 3C0E8016 */ lui $t6, %hi(D_801625EA) # $t6, 0x8016 -/* 001538 80000938 85CE25EA */ lh $t6, %lo(D_801625EA)($t6) +/* 001534 80000934 3C0E8016 */ lui $t6, %hi(sController1Unplugged) # $t6, 0x8016 +/* 001538 80000938 85CE25EA */ lh $t6, %lo(sController1Unplugged)($t6) /* 00153C 8000093C 00047900 */ sll $t7, $a0, 4 /* 001540 80000940 3C18800F */ lui $t8, %hi(gPlayer1Controller) # $t8, 0x800f /* 001544 80000944 15C00036 */ bnez $t6, .L80000A20 /* 001548 80000948 0004C880 */ sll $t9, $a0, 2 /* 00154C 8000094C 0324C823 */ subu $t9, $t9, $a0 -/* 001550 80000950 3C088015 */ lui $t0, %hi(D_8014F0F0) # $t0, 0x8015 -/* 001554 80000954 2508F0F0 */ addiu $t0, %lo(D_8014F0F0) # addiu $t0, $t0, -0xf10 +/* 001550 80000950 3C088015 */ lui $t0, %hi(gControllerPads) # $t0, 0x8015 +/* 001554 80000954 2508F0F0 */ addiu $t0, %lo(gControllerPads) # addiu $t0, $t0, -0xf10 /* 001558 80000958 0019C840 */ sll $t9, $t9, 1 /* 00155C 8000095C 03281821 */ addu $v1, $t9, $t0 /* 001560 80000960 80690002 */ lb $t1, 2($v1) diff --git a/asm/non_matchings/main/func_80002684.s b/asm/non_matchings/main/func_80002684.s index e9839ce7e..25842aa18 100644 --- a/asm/non_matchings/main/func_80002684.s +++ b/asm/non_matchings/main/func_80002684.s @@ -15,30 +15,30 @@ glabel L800026B4 /* 0032B4 800026B4 0C000996 */ jal func_80002658 /* 0032B8 800026B8 00000000 */ nop /* 0032BC 800026BC 240F00FF */ li $t7, 255 -/* 0032C0 800026C0 3C01800E */ lui $at, %hi(D_800DC5A4) # $at, 0x800e +/* 0032C0 800026C0 3C01800E */ lui $at, %hi(gCurrentlyLoadedCourseId) # $at, 0x800e /* 0032C4 800026C4 10000029 */ b .L8000276C -/* 0032C8 800026C8 A42FC5A4 */ sh $t7, %lo(D_800DC5A4)($at) +/* 0032C8 800026C8 A42FC5A4 */ sh $t7, %lo(gCurrentlyLoadedCourseId)($at) glabel L800026CC /* 0032CC 800026CC 0C000975 */ jal func_800025D4 /* 0032D0 800026D0 00000000 */ nop /* 0032D4 800026D4 241800FF */ li $t8, 255 -/* 0032D8 800026D8 3C01800E */ lui $at, %hi(D_800DC5A4) # $at, 0x800e +/* 0032D8 800026D8 3C01800E */ lui $at, %hi(gCurrentlyLoadedCourseId) # $at, 0x800e /* 0032DC 800026DC 10000023 */ b .L8000276C -/* 0032E0 800026E0 A438C5A4 */ sh $t8, %lo(D_800DC5A4)($at) +/* 0032E0 800026E0 A438C5A4 */ sh $t8, %lo(gCurrentlyLoadedCourseId)($at) glabel L800026E4 /* 0032E4 800026E4 0C000980 */ jal func_80002600 /* 0032E8 800026E8 00000000 */ nop /* 0032EC 800026EC 241900FF */ li $t9, 255 -/* 0032F0 800026F0 3C01800E */ lui $at, %hi(D_800DC5A4) # $at, 0x800e +/* 0032F0 800026F0 3C01800E */ lui $at, %hi(gCurrentlyLoadedCourseId) # $at, 0x800e /* 0032F4 800026F4 1000001D */ b .L8000276C -/* 0032F8 800026F8 A439C5A4 */ sh $t9, %lo(D_800DC5A4)($at) +/* 0032F8 800026F8 A439C5A4 */ sh $t9, %lo(gCurrentlyLoadedCourseId)($at) glabel L800026FC /* 0032FC 800026FC 0C00098B */ jal func_8000262C /* 003300 80002700 00000000 */ nop /* 003304 80002704 240800FF */ li $t0, 255 -/* 003308 80002708 3C01800E */ lui $at, %hi(D_800DC5A4) # $at, 0x800e +/* 003308 80002708 3C01800E */ lui $at, %hi(gCurrentlyLoadedCourseId) # $at, 0x800e /* 00330C 8000270C 10000017 */ b .L8000276C -/* 003310 80002710 A428C5A4 */ sh $t0, %lo(D_800DC5A4)($at) +/* 003310 80002710 A428C5A4 */ sh $t0, %lo(gCurrentlyLoadedCourseId)($at) glabel L80002714 /* 003314 80002714 0C000433 */ jal func_800010CC /* 003318 80002718 00000000 */ nop @@ -48,18 +48,18 @@ glabel L80002714 /* 003328 80002728 8FBF0014 */ lw $ra, 0x14($sp) glabel L8000272C /* 00332C 8000272C 240900FF */ li $t1, 255 -/* 003330 80002730 3C01800E */ lui $at, %hi(D_800DC5A4) # $at, 0x800e +/* 003330 80002730 3C01800E */ lui $at, %hi(gCurrentlyLoadedCourseId) # $at, 0x800e /* 003334 80002734 0C000417 */ jal func_8000105C -/* 003338 80002738 A429C5A4 */ sh $t1, %lo(D_800DC5A4)($at) +/* 003338 80002738 A429C5A4 */ sh $t1, %lo(gCurrentlyLoadedCourseId)($at) /* 00333C 8000273C 0C0A065A */ jal load_ending_sequence_royalraceway /* 003340 80002740 00000000 */ nop /* 003344 80002744 1000000A */ b .L80002770 /* 003348 80002748 8FBF0014 */ lw $ra, 0x14($sp) glabel L8000274C /* 00334C 8000274C 240A00FF */ li $t2, 255 -/* 003350 80002750 3C01800E */ lui $at, %hi(D_800DC5A4) # $at, 0x800e +/* 003350 80002750 3C01800E */ lui $at, %hi(gCurrentlyLoadedCourseId) # $at, 0x800e /* 003354 80002754 0C000433 */ jal func_800010CC -/* 003358 80002758 A42AC5A4 */ sh $t2, %lo(D_800DC5A4)($at) +/* 003358 80002758 A42AC5A4 */ sh $t2, %lo(gCurrentlyLoadedCourseId)($at) /* 00335C 8000275C 0C000417 */ jal func_8000105C /* 003360 80002760 00000000 */ nop /* 003364 80002764 0C0A0108 */ jal func_80280420 diff --git a/asm/non_matchings/main/init_controllers.s b/asm/non_matchings/main/init_controllers.s index d577150cc..4ccf867e8 100644 --- a/asm/non_matchings/main/init_controllers.s +++ b/asm/non_matchings/main/init_controllers.s @@ -1,37 +1,37 @@ glabel init_controllers /* 0014A4 800008A4 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 0014A8 800008A8 AFBF0014 */ sw $ra, 0x14($sp) -/* 0014AC 800008AC 3C048015 */ lui $a0, %hi(D_8014F0B8) # $a0, 0x8015 -/* 0014B0 800008B0 3C058015 */ lui $a1, %hi(D_8014F0D0) # $a1, 0x8015 -/* 0014B4 800008B4 24A5F0D0 */ addiu $a1, %lo(D_8014F0D0) # addiu $a1, $a1, -0xf30 -/* 0014B8 800008B8 2484F0B8 */ addiu $a0, %lo(D_8014F0B8) # addiu $a0, $a0, -0xf48 +/* 0014AC 800008AC 3C048015 */ lui $a0, %hi(gSIEventMesgQueue) # $a0, 0x8015 +/* 0014B0 800008B0 3C058015 */ lui $a1, %hi(gSIEventMesgBuf) # $a1, 0x8015 +/* 0014B4 800008B4 24A5F0D0 */ addiu $a1, %lo(gSIEventMesgBuf) # addiu $a1, $a1, -0xf30 +/* 0014B8 800008B8 2484F0B8 */ addiu $a0, %lo(gSIEventMesgQueue) # addiu $a0, $a0, -0xf48 /* 0014BC 800008BC 0C033358 */ jal osCreateMesgQueue /* 0014C0 800008C0 24060003 */ li $a2, 3 -/* 0014C4 800008C4 3C058015 */ lui $a1, %hi(D_8014F0B8) # $a1, 0x8015 +/* 0014C4 800008C4 3C058015 */ lui $a1, %hi(gSIEventMesgQueue) # $a1, 0x8015 /* 0014C8 800008C8 3C063333 */ lui $a2, (0x33333333 >> 16) # lui $a2, 0x3333 /* 0014CC 800008CC 34C63333 */ ori $a2, (0x33333333 & 0xFFFF) # ori $a2, $a2, 0x3333 -/* 0014D0 800008D0 24A5F0B8 */ addiu $a1, %lo(D_8014F0B8) # addiu $a1, $a1, -0xf48 +/* 0014D0 800008D0 24A5F0B8 */ addiu $a1, %lo(gSIEventMesgQueue) # addiu $a1, $a1, -0xf48 /* 0014D4 800008D4 0C033380 */ jal osSetEventMesg /* 0014D8 800008D8 24040005 */ li $a0, 5 -/* 0014DC 800008DC 3C048015 */ lui $a0, %hi(D_8014F0B8) # $a0, 0x8015 -/* 0014E0 800008E0 3C058015 */ lui $a1, %hi(D_8014F108) # $a1, 0x8015 -/* 0014E4 800008E4 3C068015 */ lui $a2, %hi(D_8014F0E0) # $a2, 0x8015 -/* 0014E8 800008E8 24C6F0E0 */ addiu $a2, %lo(D_8014F0E0) # addiu $a2, $a2, -0xf20 -/* 0014EC 800008EC 24A5F108 */ addiu $a1, %lo(D_8014F108) # addiu $a1, $a1, -0xef8 +/* 0014DC 800008DC 3C048015 */ lui $a0, %hi(gSIEventMesgQueue) # $a0, 0x8015 +/* 0014E0 800008E0 3C058015 */ lui $a1, %hi(gControllerBits) # $a1, 0x8015 +/* 0014E4 800008E4 3C068015 */ lui $a2, %hi(gControllerStatuses) # $a2, 0x8015 +/* 0014E8 800008E8 24C6F0E0 */ addiu $a2, %lo(gControllerStatuses) # addiu $a2, $a2, -0xf20 +/* 0014EC 800008EC 24A5F108 */ addiu $a1, %lo(gControllerBits) # addiu $a1, $a1, -0xef8 /* 0014F0 800008F0 0C03344C */ jal osContInit -/* 0014F4 800008F4 2484F0B8 */ addiu $a0, %lo(D_8014F0B8) # addiu $a0, $a0, -0xf48 -/* 0014F8 800008F8 3C0E8015 */ lui $t6, %hi(D_8014F108) # $t6, 0x8015 -/* 0014FC 800008FC 91CEF108 */ lbu $t6, %lo(D_8014F108)($t6) +/* 0014F4 800008F4 2484F0B8 */ addiu $a0, %lo(gSIEventMesgQueue) # addiu $a0, $a0, -0xf48 +/* 0014F8 800008F8 3C0E8015 */ lui $t6, %hi(gControllerBits) # $t6, 0x8015 +/* 0014FC 800008FC 91CEF108 */ lbu $t6, %lo(gControllerBits)($t6) /* 001500 80000900 24180001 */ li $t8, 1 -/* 001504 80000904 3C018016 */ lui $at, %hi(D_801625EA) # 0x8016 +/* 001504 80000904 3C018016 */ lui $at, %hi(sController1Unplugged) # 0x8016 /* 001508 80000908 31CF0001 */ andi $t7, $t6, 1 /* 00150C 8000090C 15E00004 */ bnez $t7, .L80000920 /* 001510 80000910 00000000 */ nop -/* 001514 80000914 3C018016 */ lui $at, %hi(D_801625EA) # $at, 0x8016 +/* 001514 80000914 3C018016 */ lui $at, %hi(sController1Unplugged) # $at, 0x8016 /* 001518 80000918 10000002 */ b .L80000924 -/* 00151C 8000091C A43825EA */ sh $t8, %lo(D_801625EA)($at) +/* 00151C 8000091C A43825EA */ sh $t8, %lo(sController1Unplugged)($at) .L80000920: -/* 001520 80000920 A42025EA */ sh $zero, %lo(D_801625EA)($at) +/* 001520 80000920 A42025EA */ sh $zero, %lo(sController1Unplugged)($at) .L80000924: /* 001524 80000924 8FBF0014 */ lw $ra, 0x14($sp) /* 001528 80000928 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/non_matchings/main/read_controllers.s b/asm/non_matchings/main/read_controllers.s index c007a1618..19532d3fa 100644 --- a/asm/non_matchings/main/read_controllers.s +++ b/asm/non_matchings/main/read_controllers.s @@ -1,17 +1,17 @@ glabel read_controllers /* 001628 80000A28 27BDFFE0 */ addiu $sp, $sp, -0x20 /* 00162C 80000A2C AFBF0014 */ sw $ra, 0x14($sp) -/* 001630 80000A30 3C048015 */ lui $a0, %hi(D_8014F0B8) # $a0, 0x8015 +/* 001630 80000A30 3C048015 */ lui $a0, %hi(gSIEventMesgQueue) # $a0, 0x8015 /* 001634 80000A34 0C03353C */ jal osContStartReadData -/* 001638 80000A38 2484F0B8 */ addiu $a0, %lo(D_8014F0B8) # addiu $a0, $a0, -0xf48 -/* 00163C 80000A3C 3C048015 */ lui $a0, %hi(D_8014F0B8) # $a0, 0x8015 -/* 001640 80000A40 2484F0B8 */ addiu $a0, %lo(D_8014F0B8) # addiu $a0, $a0, -0xf48 +/* 001638 80000A38 2484F0B8 */ addiu $a0, %lo(gSIEventMesgQueue) # addiu $a0, $a0, -0xf48 +/* 00163C 80000A3C 3C048015 */ lui $a0, %hi(gSIEventMesgQueue) # $a0, 0x8015 +/* 001640 80000A40 2484F0B8 */ addiu $a0, %lo(gSIEventMesgQueue) # addiu $a0, $a0, -0xf48 /* 001644 80000A44 27A5001C */ addiu $a1, $sp, 0x1c /* 001648 80000A48 0C0335D4 */ jal osRecvMesg /* 00164C 80000A4C 24060001 */ li $a2, 1 -/* 001650 80000A50 3C048015 */ lui $a0, %hi(D_8014F0F0) # $a0, 0x8015 +/* 001650 80000A50 3C048015 */ lui $a0, %hi(gControllerPads) # $a0, 0x8015 /* 001654 80000A54 0C03356D */ jal osContGetReadData -/* 001658 80000A58 2484F0F0 */ addiu $a0, %lo(D_8014F0F0) # addiu $a0, $a0, -0xf10 +/* 001658 80000A58 2484F0F0 */ addiu $a0, %lo(gControllerPads) # addiu $a0, $a0, -0xf10 /* 00165C 80000A5C 0C00024D */ jal func_80000934 /* 001660 80000A60 00002025 */ move $a0, $zero /* 001664 80000A64 0C00024D */ jal func_80000934 diff --git a/asm/non_matchings/memory.s b/asm/non_matchings/memory.s index 118c30668..db543d13e 100644 --- a/asm/non_matchings/memory.s +++ b/asm/non_matchings/memory.s @@ -745,8 +745,8 @@ glabel func_802A86A8 /* 111CE0 802A86D0 10A00033 */ beqz $a1, .L802A87A0 /* 111CE4 802A86D4 00003025 */ move $a2, $zero /* 111CE8 802A86D8 3C09800E */ lui $t1, %hi(D_800DC608) # $t1, 0x800e -/* 111CEC 802A86DC 3C08800E */ lui $t0, %hi(D_800DC604) # $t0, 0x800e -/* 111CF0 802A86E0 2508C604 */ addiu $t0, %lo(D_800DC604) # addiu $t0, $t0, -0x39fc +/* 111CEC 802A86DC 3C08800E */ lui $t0, %hi(gIsMirrorMode) # $t0, 0x800e +/* 111CF0 802A86E0 2508C604 */ addiu $t0, %lo(gIsMirrorMode) # addiu $t0, $t0, -0x39fc /* 111CF4 802A86E4 2529C608 */ addiu $t1, %lo(D_800DC608) # addiu $t1, $t1, -0x39f8 /* 111CF8 802A86E8 240A00FF */ li $t2, 255 .L802A86EC: @@ -1866,8 +1866,8 @@ glabel func_802A9714 /* 112D3C 802A972C 91C20000 */ lbu $v0, ($t6) /* 112D40 802A9730 246F0001 */ addiu $t7, $v1, 1 /* 112D44 802A9734 AD0F0000 */ sw $t7, ($t0) -/* 112D48 802A9738 3C18800E */ lui $t8, %hi(D_800DC604) # $t8, 0x800e -/* 112D4C 802A973C 8F18C604 */ lw $t8, %lo(D_800DC604)($t8) +/* 112D48 802A9738 3C18800E */ lui $t8, %hi(gIsMirrorMode) # $t8, 0x800e +/* 112D4C 802A973C 8F18C604 */ lw $t8, %lo(gIsMirrorMode)($t8) /* 112D50 802A9740 3044001F */ andi $a0, $v0, 0x1f /* 112D54 802A9744 00023142 */ srl $a2, $v0, 5 /* 112D58 802A9748 1300000D */ beqz $t8, .L802A9780 @@ -1932,8 +1932,8 @@ glabel func_802A980C /* 112E34 802A9824 91C20000 */ lbu $v0, ($t6) /* 112E38 802A9828 246F0001 */ addiu $t7, $v1, 1 /* 112E3C 802A982C AD6F0000 */ sw $t7, ($t3) -/* 112E40 802A9830 3C06800E */ lui $a2, %hi(D_800DC604) # $a2, 0x800e -/* 112E44 802A9834 8CC6C604 */ lw $a2, %lo(D_800DC604)($a2) +/* 112E40 802A9830 3C06800E */ lui $a2, %hi(gIsMirrorMode) # $a2, 0x800e +/* 112E44 802A9834 8CC6C604 */ lw $a2, %lo(gIsMirrorMode)($a2) /* 112E48 802A9838 3C01B100 */ lui $at, 0xb100 /* 112E4C 802A983C 3044001F */ andi $a0, $v0, 0x1f /* 112E50 802A9840 10C0000E */ beqz $a2, .L802A987C @@ -2040,8 +2040,8 @@ glabel func_802A99A4 /* 112FCC 802A99BC 91C20000 */ lbu $v0, ($t6) /* 112FD0 802A99C0 246F0001 */ addiu $t7, $v1, 1 /* 112FD4 802A99C4 AD2F0000 */ sw $t7, ($t1) -/* 112FD8 802A99C8 3C18800E */ lui $t8, %hi(D_800DC604) # $t8, 0x800e -/* 112FDC 802A99CC 8F18C604 */ lw $t8, %lo(D_800DC604)($t8) +/* 112FD8 802A99C8 3C18800E */ lui $t8, %hi(gIsMirrorMode) # $t8, 0x800e +/* 112FDC 802A99CC 8F18C604 */ lw $t8, %lo(gIsMirrorMode)($t8) /* 112FE0 802A99D0 3044001F */ andi $a0, $v0, 0x1f /* 112FE4 802A99D4 00023142 */ srl $a2, $v0, 5 /* 112FE8 802A99D8 13000016 */ beqz $t8, .L802A9A34 diff --git a/data/data_0DD0A0.s b/data/data_0DD0A0.s index 5cd50c4e3..3634f199f 100644 --- a/data/data_0DD0A0.s +++ b/data/data_0DD0A0.s @@ -151,7 +151,7 @@ glabel gCourseTimer glabel gCurrentCourseId .hword 0x0000, 0x0000 -glabel D_800DC5A4 +glabel gCurrentlyLoadedCourseId .hword 0x00ff, 0x0000 glabel D_800DC5A8 @@ -226,7 +226,7 @@ glabel D_800DC5FC glabel D_800DC600 .word 0x8000031c -glabel D_800DC604 +glabel gIsMirrorMode .word 0x00000000 glabel D_800DC608 diff --git a/src/code_800029B0.c b/src/code_800029B0.c index ee29b97c3..b5a2cae2d 100644 --- a/src/code_800029B0.c +++ b/src/code_800029B0.c @@ -31,15 +31,15 @@ extern s16 D_80152308; extern s32 D_802BA038; extern s16 D_802BA048; -extern s16 D_800DC5A4; +extern s16 gCurrentlyLoadedCourseId; -extern f32 D_8015F784; +extern f32 gCourseDirection; extern s8 D_8018EDF3; extern s8 gCupSelection; -extern u32 D_800DC604; +extern u32 gIsMirrorMode; extern u32 D_800DC530; extern u32 D_8015F730; extern u32 D_8015F734; @@ -74,7 +74,7 @@ extern u32 *D_0F04F45C; extern u32 *D_06009570; extern u32 *D_06014330; -extern f32 D_8015F784; +extern f32 gCourseDirection; extern u16 D_8015F900; @@ -115,20 +115,20 @@ void func_80002A18(void) { gPlayerCountSelection1 = D_8018EDF3; if (D_800DC50C != 4) { - D_800DC604 = 0; + gIsMirrorMode = 0; } - if (D_800DC604 != 0) { - D_8015F784 = -1.0f; + if (gIsMirrorMode != 0) { + gCourseDirection = -1.0f; } else { - D_8015F784 = 1.0f; + gCourseDirection = 1.0f; } if (gModeSelection == 0) { gCurrentCourseId = gCupTrackOrder[gCupSelection][gCourseSelection]; } D_800DC52C = D_800DC530; - if (gCurrentCourseId != D_800DC5A4) { + if (gCurrentCourseId != gCurrentlyLoadedCourseId) { D_80150120 = 0; - D_800DC5A4 = gCurrentCourseId; + gCurrentlyLoadedCourseId = gCurrentCourseId; gPrevLoadedAddress = D_8015F734; load_course(gCurrentCourseId); func_80295D88(); @@ -155,11 +155,11 @@ void func_80002A18(void) { D_8015F8D0.unk4 = (f32) (D_80164490->unk2 - 15);; D_8015F8D0.unk8 = D_80164490->unk4; if (gCurrentCourseId == COURSE_TOADS_TURNPIKE) { - D_8015F8D0.unk0 = (D_800DC604 != 0) ? + D_8015F8D0.unk0 = (gIsMirrorMode != 0) ? D_80164490->unk0 + 138.0f : D_80164490->unk0 - 138.0f; } else if (gCurrentCourseId == COURSE_WARIO_STADIUM) { - D_8015F8D0.unk0 = (D_800DC604 != 0) ? + D_8015F8D0.unk0 = (gIsMirrorMode != 0) ? D_80164490->unk0 + 12.0f : D_80164490->unk0 - 12.0f; } else { @@ -239,8 +239,8 @@ void func_80003040(void) { D_800DC5BC = 0; D_800DC5C8 = 0; D_80150110 = 0; - D_800DC604 = 0; - D_8015F784 = 1.0f; + gIsMirrorMode = 0; + gCourseDirection = 1.0f; gPlayerCountSelection1 = 1; set_segment_base_addr(0x03, (gPrevLoadedAddress + 0xFFFF7000)); @@ -258,7 +258,7 @@ void func_80003040(void) { break; case COURSE_YOSHI_VALLEY: load_giant_egg(&sp34, -2300.0f, 0.0f, 634.0f); - sp34 *= D_8015F784; + sp34 *= gCourseDirection; func_8029EC88(&sp34, &sp20, &sp28, 9); break; case COURSE_MOO_MOO_FARM: diff --git a/src/code_80005FD0.c b/src/code_80005FD0.c index 117c77255..3ef617789 100644 --- a/src/code_80005FD0.c +++ b/src/code_80005FD0.c @@ -2,7 +2,7 @@ #include extern u32 func_802B5224(void); -extern s32 D_800DC604; +extern s32 gIsMirrorMode; s16 func_80005FD0(void) { s16 temp_ret; @@ -10,7 +10,7 @@ s16 func_80005FD0(void) { temp_ret = func_802B5224(); phi_v1 = temp_ret; - if (D_800DC604 != 0) { + if (gIsMirrorMode != 0) { phi_v1 = -temp_ret; } return phi_v1; diff --git a/src/code_80281780.c b/src/code_80281780.c index 33c1fd824..54d046a1d 100644 --- a/src/code_80281780.c +++ b/src/code_80281780.c @@ -73,7 +73,7 @@ void func_802818BC(void) { void load_ending_sequence_royalraceway(void) { gCurrentCourseId = COURSE_ROYAL_RACEWAY; D_800DC5B4 = (u16)1; - D_800DC604 = 0; + gIsMirrorMode = 0; D_80287550 = 0xFFFF; D_80287554 = 0; func_802A4D18(); diff --git a/src/code_80281780.h b/src/code_80281780.h index 35f40401a..728cee504 100644 --- a/src/code_80281780.h +++ b/src/code_80281780.h @@ -22,7 +22,7 @@ extern void *gHeapEndPtr; extern s16 gCurrentCourseId; extern u16 D_800DC5B4; -extern s32 D_800DC604; +extern s32 gIsMirrorMode; extern s32 D_800DC530; extern s32 D_800DC52C; extern s32 gModeSelection; diff --git a/src/main.c b/src/main.c index febc307f9..71e322623 100644 --- a/src/main.c +++ b/src/main.c @@ -183,11 +183,11 @@ GLOBAL_ASM("asm/non_matchings/main/func_800006E8.s") #ifdef MIPS_TO_C // generated by mips_to_c commit cae1414eb1bf34873a831a523692fe29870a6f3b void init_controllers(void) { - osCreateMesgQueue(&D_8014F0B8, &D_8014F0D0, 3); - osSetEventMesg(5, &D_8014F0B8, (OSMesg) 0x33333333); - osContInit(&D_8014F0B8, &D_8014F108, &D_8014F0E0); - if ((D_8014F108 & 1) == 0) { - D_801625EA = (u16)1; + osCreateMesgQueue(&gSIEventMesgQueue, &gSIEventMesgBuf, 3); + osSetEventMesg(5, &gSIEventMesgQueue, (OSMesg) 0x33333333); + osContInit(&gSIEventMesgQueue, &gControllerBits, &gControllerStatuses); + if ((gControllerBits & 1) == 0) { + sController1Unplugged = (u16)1; return; } *(void *)0x80160000 = (u16)0; @@ -210,9 +210,9 @@ void func_80000934(s32 arg0) { u16 phi_a0_3; u16 phi_a0_4; - if (D_801625EA == 0) { + if (sController1Unplugged == 0) { // potantial sizeof structs? - temp_v1 = (arg0 * 6) + &D_8014F0F0; + temp_v1 = (arg0 * 6) + &gControllerPads; temp_v0 = (arg0 * 0x10) + &gPlayer1Controller; temp_v0->unk0 = (s16) temp_v1->unk2; temp_v0->unk2 = (s16) temp_v1->unk3; @@ -257,9 +257,9 @@ GLOBAL_ASM("asm/non_matchings/main/func_80000934.s") void *read_controllers(void) { ? sp1C; - osContStartReadData(&D_8014F0B8); - osRecvMesg(&D_8014F0B8, &sp1C, 1); - osContGetReadData(&D_8014F0F0); + osContStartReadData(&gSIEventMesgQueue); + osRecvMesg(&gSIEventMesgQueue, &sp1C, 1); + osContGetReadData(&gControllerPads); func_80000934(0); func_80000934(1); func_80000934(2); diff --git a/undefined_syms.txt b/undefined_syms.txt index e32ad3e38..1f5449230 100644 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -689,12 +689,12 @@ D_8014F018 = 0x8014F018; D_8014F058 = 0x8014F058; D_8014F098 = 0x8014F098; D_8014F0A0 = 0x8014F0A0; -D_8014F0B8 = 0x8014F0B8; -D_8014F0D0 = 0x8014F0D0; -D_8014F0E0 = 0x8014F0E0; +gSIEventMesgQueue = 0x8014F0B8; +gSIEventMesgBuf = 0x8014F0D0; +gControllerStatuses = 0x8014F0E0; D_8014F0E2 = 0x8014F0E2; -D_8014F0F0 = 0x8014F0F0; -D_8014F108 = 0x8014F108; +gControllerPads = 0x8014F0F0; +gControllerBits = 0x8014F108; D_8014F110 = 0x8014F110; D_80150110 = 0x80150110; D_80150112 = 0x80150112; @@ -794,7 +794,7 @@ D_8015F748 = 0x8015F748; D_8015F758 = 0x8015F758; D_8015F768 = 0x8015F768; D_8015F778 = 0x8015F778; -D_8015F784 = 0x8015F784; +gCourseDirection = 0x8015F784; D_8015F788 = 0x8015F788; D_8015F790 = 0x8015F790; D_8015F890 = 0x8015F890; @@ -825,7 +825,7 @@ D_8016452C = 0x8016452C; D_80162329 = 0x80162329; D_80162578 = 0x80162578; D_801625E8 = 0x801625E8; -D_801625EA = 0x801625EA; +sController1Unplugged = 0x801625EA; D_801625EC = 0x801625EC; D_801625F0 = 0x801625F0; D_801625F4 = 0x801625F4; @@ -1912,10 +1912,10 @@ D_80196420 = 0x80196420; D_80196438 = 0x80196438; D_80196440 = 0x80196440; D_801964C0 = 0x801964C0; -D_80196500 = 0x80196500; -D_8019653C = 0x8019653C; -D_80196540 = 0x80196540; -D_80196541 = 0x80196541; +_osContCmdBuf = 0x80196500; +_osContPifCtrl = 0x8019653C; +_osLastSentSiCmd = 0x80196540; +_osContNumControllers = 0x80196541; D_80196548 = 0x80196548; D_80196568 = 0x80196568; D_80196580 = 0x80196580;