From 1bbc7674ff96b0d293950b267d80696fb6357e35 Mon Sep 17 00:00:00 2001 From: Maciek Baron Date: Mon, 17 Jan 2022 13:44:14 +0000 Subject: [PATCH] Identify active screen mode, relabel accordingly (#141) --- .../code_80005FD0/func_800061DC.s | 4 +- .../code_8001C4D0/func_8001C4D0.s | 4 +- .../code_8001C4D0/func_8001CCEC.s | 44 ++++----- .../code_8001C4D0/func_8001D944.s | 38 ++++---- .../code_8001C4D0/func_8001F394.s | 6 +- .../code_8001C4D0/func_8001F87C.s | 4 +- .../code_8001F980/func_8001FB0C.s | 14 +-- .../code_8001F980/func_80020524.s | 4 +- .../code_8001F980/func_8002088C.s | 4 +- .../code_8001F980/func_800212B4.s | 12 +-- .../code_8001F980/func_80021B0C.s | 4 +- .../code_8001F980/func_8002276C.s | 4 +- .../code_80027040/func_80027A20.s | 6 +- .../code_80027D00/func_80028864.s | 28 +++--- .../code_80027D00/func_8002D268.s | 92 +++++++++---------- .../code_80027D00/func_8002E594.s | 72 +++++++-------- .../code_80027D00/func_8002F730.s | 22 ++--- .../code_80027D00/func_800382DC.s | 4 +- .../code_800393C0/func_8003C0F0.s | 20 ++-- .../code_800393C0/func_8003D080.s | 32 +++---- .../code_80040E50/func_80041D34.s | 8 +- .../code_800431B0/func_800514BC.s | 4 +- .../code_80057C60/func_8006AFD0.s | 12 +-- .../code_80057C60/func_8006CEC0.s | 12 +-- .../code_80057C60/func_8006D474.s | 12 +-- .../code_80057C60/func_8006DD3C.s | 8 +- .../code_80057C60/func_8006E058.s | 4 +- .../code_80071F00/func_8007B34C.s | 8 +- .../code_8028DF00/func_8028F588.s | 26 +++--- .../code_8028DF00/func_8028F970.s | 4 +- .../code_80290C20/func_8029122C.s | 20 ++-- .../code_80290C20/render_luigi_raceway.s | 8 +- .../code_80290C20/render_wario_stadium.s | 8 +- .../code_802A3730/func_802A7728.s | 6 +- .../code_802A3730/func_802A7940.s | 8 +- asm/non_matchings/code_actors/func_8029B06C.s | 16 ++-- asm/non_matchings/code_actors/func_8029B2E4.s | 16 ++-- asm/non_matchings/code_actors/func_8029B4E0.s | 16 ++-- asm/non_matchings/code_actors/func_8029B6EC.s | 16 ++-- .../staff_ghosts/func_80005B18.s | 4 +- include/defines.h | 2 +- include/variables.h | 2 +- src/code_800029B0.c | 2 +- src/code_80005FD0.c | 2 +- src/code_8001C4D0.c | 14 +-- src/code_8001F980.c | 26 +++--- src/code_80027040.c | 4 +- src/code_80027D00.c | 10 +- src/code_800393C0.c | 24 ++--- src/code_80040E50.c | 12 +-- src/code_800431B0.c | 2 +- src/code_80057C60.c | 36 ++++---- src/code_80071F00.c | 4 +- src/code_80280000.c | 2 +- src/code_80281780.c | 2 +- src/code_80281780.h | 2 +- src/code_8028DF00.c | 14 +-- src/code_80290C20.c | 8 +- src/code_80296A50.c | 8 +- src/code_802A3730.c | 18 ++-- src/main.c | 14 +-- src/staff_ghosts.c | 8 +- 62 files changed, 425 insertions(+), 425 deletions(-) diff --git a/asm/non_matchings/code_80005FD0/func_800061DC.s b/asm/non_matchings/code_80005FD0/func_800061DC.s index 59e8e67b0..109b7b290 100644 --- a/asm/non_matchings/code_80005FD0/func_800061DC.s +++ b/asm/non_matchings/code_80005FD0/func_800061DC.s @@ -1,6 +1,6 @@ glabel func_800061DC -/* 006DDC 800061DC 3C02800E */ lui $v0, %hi(D_800DC52C) -/* 006DE0 800061E0 8C42C52C */ lw $v0, %lo(D_800DC52C)($v0) +/* 006DDC 800061DC 3C02800E */ lui $v0, %hi(gActiveScreenMode) +/* 006DE0 800061E0 8C42C52C */ lw $v0, %lo(gActiveScreenMode)($v0) /* 006DE4 800061E4 27BDFFF0 */ addiu $sp, $sp, -0x10 /* 006DE8 800061E8 F7B40008 */ sdc1 $f20, 8($sp) /* 006DEC 800061EC 4485A000 */ mtc1 $a1, $f20 diff --git a/asm/non_matchings/code_8001C4D0/func_8001C4D0.s b/asm/non_matchings/code_8001C4D0/func_8001C4D0.s index 144478fc3..812989fb4 100644 --- a/asm/non_matchings/code_8001C4D0/func_8001C4D0.s +++ b/asm/non_matchings/code_8001C4D0/func_8001C4D0.s @@ -93,9 +93,9 @@ glabel L8001C524 /* 01D238 8001C638 E5400000 */ swc1 $f0, ($t2) /* 01D23C 8001C63C E4204A90 */ swc1 $f0, %lo(D_80164A90)($at) /* 01D240 8001C640 3C018016 */ lui $at, %hi(D_80164AA0) -/* 01D244 8001C644 3C04800E */ lui $a0, %hi(D_800DC52C) # $a0, 0x800e +/* 01D244 8001C644 3C04800E */ lui $a0, %hi(gActiveScreenMode) # $a0, 0x800e /* 01D248 8001C648 002E0821 */ addu $at, $at, $t6 -/* 01D24C 8001C64C 2484C52C */ addiu $a0, %lo(D_800DC52C) # addiu $a0, $a0, -0x3ad4 +/* 01D24C 8001C64C 2484C52C */ addiu $a0, %lo(gActiveScreenMode) # addiu $a0, $a0, -0x3ad4 /* 01D250 8001C650 E4204AA0 */ swc1 $f0, %lo(D_80164AA0)($at) /* 01D254 8001C654 8C8C0000 */ lw $t4, ($a0) /* 01D258 8001C658 3C01800E */ lui $at, %hi(D_800DDB30) diff --git a/asm/non_matchings/code_8001C4D0/func_8001CCEC.s b/asm/non_matchings/code_8001C4D0/func_8001CCEC.s index 12d261785..ff30a11c9 100644 --- a/asm/non_matchings/code_8001C4D0/func_8001CCEC.s +++ b/asm/non_matchings/code_8001C4D0/func_8001CCEC.s @@ -24,7 +24,7 @@ glabel func_8001CCEC /* 01D944 8001CD44 3C0541A0 */ lui $a1, 0x41a0 /* 01D948 8001CD48 0000C012 */ mflo $t8 /* 01D94C 8001CD4C 44983000 */ mtc1 $t8, $f6 -/* 01D950 8001CD50 00000000 */ nop +/* 01D950 8001CD50 00000000 */ nop /* 01D954 8001CD54 46803221 */ cvt.d.w $f8, $f6 /* 01D958 8001CD58 44833000 */ mtc1 $v1, $f6 /* 01D95C 8001CD5C 46282282 */ mul.d $f10, $f4, $f8 @@ -38,7 +38,7 @@ glabel func_8001CCEC /* 01D97C 8001CD7C 44807000 */ mtc1 $zero, $f14 /* 01D980 8001CD80 3C01800F */ lui $at, %hi(D_800ED530) /* 01D984 8001CD84 460E003C */ c.lt.s $f0, $f14 -/* 01D988 8001CD88 00000000 */ nop +/* 01D988 8001CD88 00000000 */ nop /* 01D98C 8001CD8C 4502000F */ bc1fl .L8001CDCC /* 01D990 8001CD90 44807000 */ mtc1 $zero, $f14 /* 01D994 8001CD94 D426D530 */ ldc1 $f6, %lo(D_800ED530)($at) @@ -50,16 +50,16 @@ glabel func_8001CCEC /* 01D9AC 8001CDAC 462050A0 */ cvt.s.d $f2, $f10 /* 01D9B0 8001CDB0 46001221 */ cvt.d.s $f8, $f2 /* 01D9B4 8001CDB4 4624403E */ c.le.d $f8, $f4 -/* 01D9B8 8001CDB8 00000000 */ nop +/* 01D9B8 8001CDB8 00000000 */ nop /* 01D9BC 8001CDBC 45020003 */ bc1fl .L8001CDCC /* 01D9C0 8001CDC0 44807000 */ mtc1 $zero, $f14 /* 01D9C4 8001CDC4 46007086 */ mov.s $f2, $f14 .L8001CDC8: /* 01D9C8 8001CDC8 44807000 */ mtc1 $zero, $f14 .L8001CDCC: -/* 01D9CC 8001CDCC 00000000 */ nop +/* 01D9CC 8001CDCC 00000000 */ nop /* 01D9D0 8001CDD0 460E903E */ c.le.s $f18, $f14 -/* 01D9D4 8001CDD4 00000000 */ nop +/* 01D9D4 8001CDD4 00000000 */ nop /* 01D9D8 8001CDD8 45020003 */ bc1fl .L8001CDE8 /* 01D9DC 8001CDDC A6030DB4 */ sh $v1, 0xdb4($s0) /* 01D9E0 8001CDE0 46007486 */ mov.s $f18, $f14 @@ -82,7 +82,7 @@ glabel func_8001CCEC /* 01DA20 8001CE20 024D2021 */ addu $a0, $s2, $t5 /* 01DA24 8001CE24 00005012 */ mflo $t2 /* 01DA28 8001CE28 448A5000 */ mtc1 $t2, $f10 -/* 01DA2C 8001CE2C 00000000 */ nop +/* 01DA2C 8001CE2C 00000000 */ nop /* 01DA30 8001CE30 46805121 */ cvt.d.w $f4, $f10 /* 01DA34 8001CE34 44825000 */ mtc1 $v0, $f10 /* 01DA38 8001CE38 46243202 */ mul.d $f8, $f6, $f4 @@ -106,14 +106,14 @@ glabel func_8001CCEC /* 01DA80 8001CE80 46204020 */ cvt.s.d $f0, $f8 /* 01DA84 8001CE84 46000121 */ cvt.d.s $f4, $f0 /* 01DA88 8001CE88 4626203E */ c.le.d $f4, $f6 -/* 01DA8C 8001CE8C 00000000 */ nop +/* 01DA8C 8001CE8C 00000000 */ nop /* 01DA90 8001CE90 45020003 */ bc1fl .L8001CEA0 /* 01DA94 8001CE94 460E803E */ c.le.s $f16, $f14 /* 01DA98 8001CE98 46007006 */ mov.s $f0, $f14 .L8001CE9C: /* 01DA9C 8001CE9C 460E803E */ c.le.s $f16, $f14 .L8001CEA0: -/* 01DAA0 8001CEA0 00000000 */ nop +/* 01DAA0 8001CEA0 00000000 */ nop /* 01DAA4 8001CEA4 45020003 */ bc1fl .L8001CEB4 /* 01DAA8 8001CEA8 A622009C */ sh $v0, 0x9c($s1) /* 01DAAC 8001CEAC 46007406 */ mov.s $f16, $f14 @@ -123,7 +123,7 @@ glabel func_8001CCEC /* 01DAB8 8001CEB8 858C4678 */ lh $t4, 0x4678($t4) /* 01DABC 8001CEBC 24010002 */ li $at, 2 /* 01DAC0 8001CEC0 15810022 */ bne $t4, $at, .L8001CF4C -/* 01DAC4 8001CEC4 00000000 */ nop +/* 01DAC4 8001CEC4 00000000 */ nop /* 01DAC8 8001CEC8 AFA40044 */ sw $a0, 0x44($sp) /* 01DACC 8001CECC E7B00050 */ swc1 $f16, 0x50($sp) /* 01DAD0 8001CED0 0C008973 */ jal move_f32_towards @@ -151,7 +151,7 @@ glabel func_8001CCEC /* 01DB28 8001CF28 E46A0000 */ swc1 $f10, ($v1) /* 01DB2C 8001CF2C C4680000 */ lwc1 $f8, ($v1) /* 01DB30 8001CF30 4608303E */ c.le.s $f6, $f8 -/* 01DB34 8001CF34 00000000 */ nop +/* 01DB34 8001CF34 00000000 */ nop /* 01DB38 8001CF38 4502002E */ bc1fl .L8001CFF4 /* 01DB3C 8001CF3C 860C00CA */ lh $t4, 0xca($s0) /* 01DB40 8001CF40 44812000 */ mtc1 $at, $f4 @@ -184,18 +184,18 @@ glabel func_8001CCEC /* 01DBA8 8001CFA8 3C01800F */ lui $at, %hi(D_800ED558) /* 01DBAC 8001CFAC D426D558 */ ldc1 $f6, %lo(D_800ED558)($at) /* 01DBB0 8001CFB0 46005221 */ cvt.d.s $f8, $f10 -/* 01DBB4 8001CFB4 3C0A800E */ lui $t2, %hi(D_800DC52C) # $t2, 0x800e +/* 01DBB4 8001CFB4 3C0A800E */ lui $t2, %hi(gActiveScreenMode) # $t2, 0x800e /* 01DBB8 8001CFB8 46264101 */ sub.d $f4, $f8, $f6 /* 01DBBC 8001CFBC 3C01800E */ lui $at, %hi(D_800DDB30) /* 01DBC0 8001CFC0 462022A0 */ cvt.s.d $f10, $f4 /* 01DBC4 8001CFC4 E46A0000 */ swc1 $f10, ($v1) -/* 01DBC8 8001CFC8 8D4AC52C */ lw $t2, %lo(D_800DC52C)($t2) +/* 01DBC8 8001CFC8 8D4AC52C */ lw $t2, %lo(gActiveScreenMode)($t2) /* 01DBCC 8001CFCC C4680000 */ lwc1 $f8, ($v1) /* 01DBD0 8001CFD0 000A5880 */ sll $t3, $t2, 2 /* 01DBD4 8001CFD4 002B0821 */ addu $at, $at, $t3 /* 01DBD8 8001CFD8 C420DB30 */ lwc1 $f0, %lo(D_800DDB30)($at) /* 01DBDC 8001CFDC 4600403E */ c.le.s $f8, $f0 -/* 01DBE0 8001CFE0 00000000 */ nop +/* 01DBE0 8001CFE0 00000000 */ nop /* 01DBE4 8001CFE4 45020003 */ bc1fl .L8001CFF4 /* 01DBE8 8001CFE8 860C00CA */ lh $t4, 0xca($s0) /* 01DBEC 8001CFEC E4600000 */ swc1 $f0, ($v1) @@ -205,8 +205,8 @@ glabel func_8001CCEC /* 01DBF4 8001CFF4 24010100 */ li $at, 256 /* 01DBF8 8001CFF8 318D0100 */ andi $t5, $t4, 0x100 /* 01DBFC 8001CFFC 15A10048 */ bne $t5, $at, .L8001D120 -/* 01DC00 8001D000 3C02800E */ lui $v0, %hi(D_800DC52C) # $v0, 0x800e -/* 01DC04 8001D004 8C42C52C */ lw $v0, %lo(D_800DC52C)($v0) +/* 01DC00 8001D000 3C02800E */ lui $v0, %hi(gActiveScreenMode) # $v0, 0x800e +/* 01DC04 8001D004 8C42C52C */ lw $v0, %lo(gActiveScreenMode)($v0) /* 01DC08 8001D008 24010001 */ li $at, 1 /* 01DC0C 8001D00C 3C0E8016 */ lui $t6, %hi(D_80164A90) # $t6, 0x8016 /* 01DC10 8001D010 10410006 */ beq $v0, $at, .L8001D02C @@ -328,7 +328,7 @@ glabel func_8001CCEC /* 01DDCC 8001D1CC C7A60050 */ lwc1 $f6, 0x50($sp) /* 01DDD0 8001D1D0 46244280 */ add.d $f10, $f8, $f4 /* 01DDD4 8001D1D4 44814000 */ mtc1 $at, $f8 -/* 01DDD8 8001D1D8 00000000 */ nop +/* 01DDD8 8001D1D8 00000000 */ nop /* 01DDDC 8001D1DC 46083103 */ div.s $f4, $f6, $f8 /* 01DDE0 8001D1E0 46002221 */ cvt.d.s $f8, $f4 /* 01DDE4 8001D1E4 46285100 */ add.d $f4, $f10, $f8 @@ -346,11 +346,11 @@ glabel func_8001CCEC /* 01DE14 8001D214 86090DD2 */ lh $t1, 0xdd2($s0) /* 01DE18 8001D218 460042A1 */ cvt.d.s $f10, $f8 /* 01DE1C 8001D21C 44894000 */ mtc1 $t1, $f8 -/* 01DE20 8001D220 00000000 */ nop +/* 01DE20 8001D220 00000000 */ nop /* 01DE24 8001D224 46804221 */ cvt.d.w $f8, $f8 /* 01DE28 8001D228 46204202 */ mul.d $f8, $f8, $f0 /* 01DE2C 8001D22C 44800000 */ mtc1 $zero, $f0 -/* 01DE30 8001D230 00000000 */ nop +/* 01DE30 8001D230 00000000 */ nop /* 01DE34 8001D234 44050000 */ mfc1 $a1, $f0 /* 01DE38 8001D238 44070000 */ mfc1 $a3, $f0 /* 01DE3C 8001D23C 46285280 */ add.d $f10, $f10, $f8 @@ -420,10 +420,10 @@ glabel func_8001CCEC /* 01DF38 8001D338 C60A0094 */ lwc1 $f10, 0x94($s0) /* 01DF3C 8001D33C 46065103 */ div.s $f4, $f10, $f6 /* 01DF40 8001D340 44815000 */ mtc1 $at, $f10 -/* 01DF44 8001D344 00000000 */ nop +/* 01DF44 8001D344 00000000 */ nop /* 01DF48 8001D348 460A2182 */ mul.s $f6, $f4, $f10 /* 01DF4C 8001D34C 4608303E */ c.le.s $f6, $f8 -/* 01DF50 8001D350 00000000 */ nop +/* 01DF50 8001D350 00000000 */ nop /* 01DF54 8001D354 45020013 */ bc1fl .L8001D3A4 /* 01DF58 8001D358 C6280010 */ lwc1 $f8, 0x10($s1) /* 01DF5C 8001D35C 8E0E00BC */ lw $t6, 0xbc($s0) @@ -503,10 +503,10 @@ glabel func_8001CCEC /* 01E074 8001D474 C6040094 */ lwc1 $f4, 0x94($s0) /* 01E078 8001D478 46082183 */ div.s $f6, $f4, $f8 /* 01E07C 8001D47C 44812000 */ mtc1 $at, $f4 -/* 01E080 8001D480 00000000 */ nop +/* 01E080 8001D480 00000000 */ nop /* 01E084 8001D484 46043202 */ mul.s $f8, $f6, $f4 /* 01E088 8001D488 460A403E */ c.le.s $f8, $f10 -/* 01E08C 8001D48C 00000000 */ nop +/* 01E08C 8001D48C 00000000 */ nop /* 01E090 8001D490 45020013 */ bc1fl .L8001D4E0 /* 01E094 8001D494 C6200004 */ lwc1 $f0, 4($s1) /* 01E098 8001D498 8E0B00BC */ lw $t3, 0xbc($s0) diff --git a/asm/non_matchings/code_8001C4D0/func_8001D944.s b/asm/non_matchings/code_8001C4D0/func_8001D944.s index 1afcbe59a..e55788c43 100644 --- a/asm/non_matchings/code_8001C4D0/func_8001D944.s +++ b/asm/non_matchings/code_8001C4D0/func_8001D944.s @@ -24,7 +24,7 @@ glabel func_8001D944 /* 01E59C 8001D99C 3C0541A0 */ lui $a1, 0x41a0 /* 01E5A0 8001D9A0 0000C012 */ mflo $t8 /* 01E5A4 8001D9A4 44983000 */ mtc1 $t8, $f6 -/* 01E5A8 8001D9A8 00000000 */ nop +/* 01E5A8 8001D9A8 00000000 */ nop /* 01E5AC 8001D9AC 46803221 */ cvt.d.w $f8, $f6 /* 01E5B0 8001D9B0 44833000 */ mtc1 $v1, $f6 /* 01E5B4 8001D9B4 46282282 */ mul.d $f10, $f4, $f8 @@ -38,7 +38,7 @@ glabel func_8001D944 /* 01E5D4 8001D9D4 44807000 */ mtc1 $zero, $f14 /* 01E5D8 8001D9D8 3C01800F */ lui $at, %hi(D_800ED588) /* 01E5DC 8001D9DC 460E003C */ c.lt.s $f0, $f14 -/* 01E5E0 8001D9E0 00000000 */ nop +/* 01E5E0 8001D9E0 00000000 */ nop /* 01E5E4 8001D9E4 4502000F */ bc1fl .L8001DA24 /* 01E5E8 8001D9E8 44807000 */ mtc1 $zero, $f14 /* 01E5EC 8001D9EC D426D588 */ ldc1 $f6, %lo(D_800ED588)($at) @@ -50,16 +50,16 @@ glabel func_8001D944 /* 01E604 8001DA04 462050A0 */ cvt.s.d $f2, $f10 /* 01E608 8001DA08 46001221 */ cvt.d.s $f8, $f2 /* 01E60C 8001DA0C 4624403E */ c.le.d $f8, $f4 -/* 01E610 8001DA10 00000000 */ nop +/* 01E610 8001DA10 00000000 */ nop /* 01E614 8001DA14 45020003 */ bc1fl .L8001DA24 /* 01E618 8001DA18 44807000 */ mtc1 $zero, $f14 /* 01E61C 8001DA1C 46007086 */ mov.s $f2, $f14 .L8001DA20: /* 01E620 8001DA20 44807000 */ mtc1 $zero, $f14 .L8001DA24: -/* 01E624 8001DA24 00000000 */ nop +/* 01E624 8001DA24 00000000 */ nop /* 01E628 8001DA28 460E903E */ c.le.s $f18, $f14 -/* 01E62C 8001DA2C 00000000 */ nop +/* 01E62C 8001DA2C 00000000 */ nop /* 01E630 8001DA30 45020003 */ bc1fl .L8001DA40 /* 01E634 8001DA34 A6030DB4 */ sh $v1, 0xdb4($s0) /* 01E638 8001DA38 46007486 */ mov.s $f18, $f14 @@ -82,7 +82,7 @@ glabel func_8001D944 /* 01E678 8001DA78 024D2021 */ addu $a0, $s2, $t5 /* 01E67C 8001DA7C 00005012 */ mflo $t2 /* 01E680 8001DA80 448A5000 */ mtc1 $t2, $f10 -/* 01E684 8001DA84 00000000 */ nop +/* 01E684 8001DA84 00000000 */ nop /* 01E688 8001DA88 46805121 */ cvt.d.w $f4, $f10 /* 01E68C 8001DA8C 44825000 */ mtc1 $v0, $f10 /* 01E690 8001DA90 46243202 */ mul.d $f8, $f6, $f4 @@ -106,14 +106,14 @@ glabel func_8001D944 /* 01E6D8 8001DAD8 46204020 */ cvt.s.d $f0, $f8 /* 01E6DC 8001DADC 46000121 */ cvt.d.s $f4, $f0 /* 01E6E0 8001DAE0 4626203E */ c.le.d $f4, $f6 -/* 01E6E4 8001DAE4 00000000 */ nop +/* 01E6E4 8001DAE4 00000000 */ nop /* 01E6E8 8001DAE8 45020003 */ bc1fl .L8001DAF8 /* 01E6EC 8001DAEC 460E803E */ c.le.s $f16, $f14 /* 01E6F0 8001DAF0 46007006 */ mov.s $f0, $f14 .L8001DAF4: /* 01E6F4 8001DAF4 460E803E */ c.le.s $f16, $f14 .L8001DAF8: -/* 01E6F8 8001DAF8 00000000 */ nop +/* 01E6F8 8001DAF8 00000000 */ nop /* 01E6FC 8001DAFC 45020003 */ bc1fl .L8001DB0C /* 01E700 8001DB00 A622009C */ sh $v0, 0x9c($s1) /* 01E704 8001DB04 46007406 */ mov.s $f16, $f14 @@ -123,7 +123,7 @@ glabel func_8001D944 /* 01E710 8001DB10 858C4678 */ lh $t4, 0x4678($t4) /* 01E714 8001DB14 24010002 */ li $at, 2 /* 01E718 8001DB18 15810022 */ bne $t4, $at, .L8001DBA4 -/* 01E71C 8001DB1C 00000000 */ nop +/* 01E71C 8001DB1C 00000000 */ nop /* 01E720 8001DB20 AFA40048 */ sw $a0, 0x48($sp) /* 01E724 8001DB24 E7B00050 */ swc1 $f16, 0x50($sp) /* 01E728 8001DB28 0C008973 */ jal move_f32_towards @@ -151,7 +151,7 @@ glabel func_8001D944 /* 01E780 8001DB80 E44A0000 */ swc1 $f10, ($v0) /* 01E784 8001DB84 C4480000 */ lwc1 $f8, ($v0) /* 01E788 8001DB88 4608303E */ c.le.s $f6, $f8 -/* 01E78C 8001DB8C 00000000 */ nop +/* 01E78C 8001DB8C 00000000 */ nop /* 01E790 8001DB90 4502002E */ bc1fl .L8001DC4C /* 01E794 8001DB94 860C00CA */ lh $t4, 0xca($s0) /* 01E798 8001DB98 44812000 */ mtc1 $at, $f4 @@ -184,18 +184,18 @@ glabel func_8001D944 /* 01E800 8001DC00 3C01800F */ lui $at, %hi(D_800ED5B0) /* 01E804 8001DC04 D426D5B0 */ ldc1 $f6, %lo(D_800ED5B0)($at) /* 01E808 8001DC08 46005221 */ cvt.d.s $f8, $f10 -/* 01E80C 8001DC0C 3C0A800E */ lui $t2, %hi(D_800DC52C) # $t2, 0x800e +/* 01E80C 8001DC0C 3C0A800E */ lui $t2, %hi(gActiveScreenMode) # $t2, 0x800e /* 01E810 8001DC10 46264101 */ sub.d $f4, $f8, $f6 /* 01E814 8001DC14 3C01800E */ lui $at, %hi(D_800DDB30) /* 01E818 8001DC18 462022A0 */ cvt.s.d $f10, $f4 /* 01E81C 8001DC1C E44A0000 */ swc1 $f10, ($v0) -/* 01E820 8001DC20 8D4AC52C */ lw $t2, %lo(D_800DC52C)($t2) +/* 01E820 8001DC20 8D4AC52C */ lw $t2, %lo(gActiveScreenMode)($t2) /* 01E824 8001DC24 C4480000 */ lwc1 $f8, ($v0) /* 01E828 8001DC28 000A5880 */ sll $t3, $t2, 2 /* 01E82C 8001DC2C 002B0821 */ addu $at, $at, $t3 /* 01E830 8001DC30 C420DB30 */ lwc1 $f0, %lo(D_800DDB30)($at) /* 01E834 8001DC34 4600403E */ c.le.s $f8, $f0 -/* 01E838 8001DC38 00000000 */ nop +/* 01E838 8001DC38 00000000 */ nop /* 01E83C 8001DC3C 45020003 */ bc1fl .L8001DC4C /* 01E840 8001DC40 860C00CA */ lh $t4, 0xca($s0) /* 01E844 8001DC44 E4400000 */ swc1 $f0, ($v0) @@ -273,7 +273,7 @@ glabel func_8001D944 /* 01E954 8001DD54 C7AA0050 */ lwc1 $f10, 0x50($sp) /* 01E958 8001DD58 46243200 */ add.d $f8, $f6, $f4 /* 01E95C 8001DD5C 44813000 */ mtc1 $at, $f6 -/* 01E960 8001DD60 00000000 */ nop +/* 01E960 8001DD60 00000000 */ nop /* 01E964 8001DD64 46065103 */ div.s $f4, $f10, $f6 /* 01E968 8001DD68 460021A1 */ cvt.d.s $f6, $f4 /* 01E96C 8001DD6C 46264100 */ add.d $f4, $f8, $f6 @@ -295,7 +295,7 @@ glabel func_8001D944 /* 01E9AC 8001DDAC 860C0DD2 */ lh $t4, 0xdd2($s0) /* 01E9B0 8001DDB0 46003221 */ cvt.d.s $f8, $f6 /* 01E9B4 8001DDB4 448C3000 */ mtc1 $t4, $f6 -/* 01E9B8 8001DDB8 00000000 */ nop +/* 01E9B8 8001DDB8 00000000 */ nop /* 01E9BC 8001DDBC 468031A1 */ cvt.d.w $f6, $f6 /* 01E9C0 8001DDC0 46223182 */ mul.d $f6, $f6, $f2 /* 01E9C4 8001DDC4 46264200 */ add.d $f8, $f8, $f6 @@ -365,10 +365,10 @@ glabel func_8001D944 /* 01EAC0 8001DEC0 C6080094 */ lwc1 $f8, 0x94($s0) /* 01EAC4 8001DEC4 460A4103 */ div.s $f4, $f8, $f10 /* 01EAC8 8001DEC8 44814000 */ mtc1 $at, $f8 -/* 01EACC 8001DECC 00000000 */ nop +/* 01EACC 8001DECC 00000000 */ nop /* 01EAD0 8001DED0 46082282 */ mul.s $f10, $f4, $f8 /* 01EAD4 8001DED4 4606503E */ c.le.s $f10, $f6 -/* 01EAD8 8001DED8 00000000 */ nop +/* 01EAD8 8001DED8 00000000 */ nop /* 01EADC 8001DEDC 45020013 */ bc1fl .L8001DF2C /* 01EAE0 8001DEE0 C6260010 */ lwc1 $f6, 0x10($s1) /* 01EAE4 8001DEE4 8E1900BC */ lw $t9, 0xbc($s0) @@ -448,10 +448,10 @@ glabel func_8001D944 /* 01EBFC 8001DFFC C6040094 */ lwc1 $f4, 0x94($s0) /* 01EC00 8001E000 46062283 */ div.s $f10, $f4, $f6 /* 01EC04 8001E004 44812000 */ mtc1 $at, $f4 -/* 01EC08 8001E008 00000000 */ nop +/* 01EC08 8001E008 00000000 */ nop /* 01EC0C 8001E00C 46045182 */ mul.s $f6, $f10, $f4 /* 01EC10 8001E010 4608303E */ c.le.s $f6, $f8 -/* 01EC14 8001E014 00000000 */ nop +/* 01EC14 8001E014 00000000 */ nop /* 01EC18 8001E018 45020013 */ bc1fl .L8001E068 /* 01EC1C 8001E01C C6200004 */ lwc1 $f0, 4($s1) /* 01EC20 8001E020 8E0E00BC */ lw $t6, 0xbc($s0) diff --git a/asm/non_matchings/code_8001C4D0/func_8001F394.s b/asm/non_matchings/code_8001C4D0/func_8001F394.s index ffeecc444..59b25c32f 100644 --- a/asm/non_matchings/code_8001C4D0/func_8001F394.s +++ b/asm/non_matchings/code_8001C4D0/func_8001F394.s @@ -209,7 +209,7 @@ glabel L8001F654 /* 02027C 8001F67C AFA7001C */ sw $a3, 0x1c($sp) /* 020280 8001F680 44061000 */ mfc1 $a2, $f2 /* 020284 8001F684 0C008973 */ jal move_f32_towards -/* 020288 8001F688 00000000 */ nop +/* 020288 8001F688 00000000 */ nop /* 02028C 8001F68C 44806000 */ mtc1 $zero, $f12 /* 020290 8001F690 10000032 */ b .L8001F75C /* 020294 8001F694 8FA7001C */ lw $a3, 0x1c($sp) @@ -269,8 +269,8 @@ glabel L8001F6D8 .L8001F758: /* 020358 8001F758 E48C0000 */ swc1 $f12, ($a0) .L8001F75C: -/* 02035C 8001F75C 3C02800E */ lui $v0, %hi(D_800DC52C) # $v0, 0x800e -/* 020360 8001F760 8C42C52C */ lw $v0, %lo(D_800DC52C)($v0) +/* 02035C 8001F75C 3C02800E */ lui $v0, %hi(gActiveScreenMode) # $v0, 0x800e +/* 020360 8001F760 8C42C52C */ lw $v0, %lo(gActiveScreenMode)($v0) /* 020364 8001F764 3C038016 */ lui $v1, %hi(D_80164A28) # $v1, 0x8016 /* 020368 8001F768 24634A28 */ addiu $v1, %lo(D_80164A28) # addiu $v1, $v1, 0x4a28 /* 02036C 8001F76C 1040000A */ beqz $v0, .L8001F798 diff --git a/asm/non_matchings/code_8001C4D0/func_8001F87C.s b/asm/non_matchings/code_8001C4D0/func_8001F87C.s index 2c211d896..5e032f736 100644 --- a/asm/non_matchings/code_8001C4D0/func_8001F87C.s +++ b/asm/non_matchings/code_8001C4D0/func_8001F87C.s @@ -1,6 +1,6 @@ glabel func_8001F87C -/* 02047C 8001F87C 3C0E800E */ lui $t6, %hi(D_800DC52C) # $t6, 0x800e -/* 020480 8001F880 8DCEC52C */ lw $t6, %lo(D_800DC52C)($t6) +/* 02047C 8001F87C 3C0E800E */ lui $t6, %hi(gActiveScreenMode) # $t6, 0x800e +/* 020480 8001F880 8DCEC52C */ lw $t6, %lo(gActiveScreenMode)($t6) /* 020484 8001F884 27BDFFF0 */ addiu $sp, $sp, -0x10 /* 020488 8001F888 3C02800E */ lui $v0, %hi(gPlayerOne) # $v0, 0x800e /* 02048C 8001F88C AFB2000C */ sw $s2, 0xc($sp) diff --git a/asm/non_matchings/code_8001F980/func_8001FB0C.s b/asm/non_matchings/code_8001F980/func_8001FB0C.s index 761b3e960..2f424bb96 100644 --- a/asm/non_matchings/code_8001F980/func_8001FB0C.s +++ b/asm/non_matchings/code_8001F980/func_8001FB0C.s @@ -1,7 +1,7 @@ glabel func_8001FB0C /* 02070C 8001FB0C 27BDFF80 */ addiu $sp, $sp, -0x80 -/* 020710 8001FB10 3C02800E */ lui $v0, %hi(D_800DC52C) # $v0, 0x800e -/* 020714 8001FB14 8C42C52C */ lw $v0, %lo(D_800DC52C)($v0) +/* 020710 8001FB10 3C02800E */ lui $v0, %hi(gActiveScreenMode) # $v0, 0x800e +/* 020714 8001FB14 8C42C52C */ lw $v0, %lo(gActiveScreenMode)($v0) /* 020718 8001FB18 AFB00018 */ sw $s0, 0x18($sp) /* 02071C 8001FB1C 00A08025 */ move $s0, $a1 /* 020720 8001FB20 AFBF001C */ sw $ra, 0x1c($sp) @@ -16,7 +16,7 @@ glabel func_8001FB0C /* 020744 8001FB44 10410007 */ beq $v0, $at, .L8001FB64 /* 020748 8001FB48 24010003 */ li $at, 3 /* 02074C 8001FB4C 10410007 */ beq $v0, $at, .L8001FB6C -/* 020750 8001FB50 00000000 */ nop +/* 020750 8001FB50 00000000 */ nop /* 020754 8001FB54 10000007 */ b .L8001FB74 /* 020758 8001FB58 24021FFE */ li $v0, 8190 .L8001FB5C: @@ -124,7 +124,7 @@ glabel func_8001FB0C /* 0208E4 8001FCE4 C7A40034 */ lwc1 $f4, 0x34($sp) /* 0208E8 8001FCE8 E7A60060 */ swc1 $f6, 0x60($sp) /* 0208EC 8001FCEC 46122182 */ mul.s $f6, $f4, $f18 -/* 0208F0 8001FCF0 00000000 */ nop +/* 0208F0 8001FCF0 00000000 */ nop /* 0208F4 8001FCF4 460E4102 */ mul.s $f4, $f8, $f14 /* 0208F8 8001FCF8 46043201 */ sub.s $f8, $f6, $f4 /* 0208FC 8001FCFC C7A60060 */ lwc1 $f6, 0x60($sp) @@ -135,7 +135,7 @@ glabel func_8001FB0C /* 020910 8001FD10 45020006 */ bc1fl .L8001FD2C /* 020914 8001FD14 C7A80064 */ lwc1 $f8, 0x64($sp) /* 020918 8001FD18 4604003E */ c.le.s $f0, $f4 -/* 02091C 8001FD1C 00000000 */ nop +/* 02091C 8001FD1C 00000000 */ nop /* 020920 8001FD20 4503000F */ bc1tl .L8001FD60 /* 020924 8001FD24 240E0001 */ li $t6, 1 .L8001FD28: @@ -143,7 +143,7 @@ glabel func_8001FB0C .L8001FD2C: /* 02092C 8001FD2C C7AA0060 */ lwc1 $f10, 0x60($sp) /* 020930 8001FD30 4600403E */ c.le.s $f8, $f0 -/* 020934 8001FD34 00000000 */ nop +/* 020934 8001FD34 00000000 */ nop /* 020938 8001FD38 4502000B */ bc1fl .L8001FD68 /* 02093C 8001FD3C 8FBF001C */ lw $ra, 0x1c($sp) /* 020940 8001FD40 4600503E */ c.le.s $f10, $f0 @@ -151,7 +151,7 @@ glabel func_8001FB0C /* 020948 8001FD48 45020007 */ bc1fl .L8001FD68 /* 02094C 8001FD4C 8FBF001C */ lw $ra, 0x1c($sp) /* 020950 8001FD50 4600303E */ c.le.s $f6, $f0 -/* 020954 8001FD54 00000000 */ nop +/* 020954 8001FD54 00000000 */ nop /* 020958 8001FD58 45000002 */ bc1f .L8001FD64 /* 02095C 8001FD5C 240E0001 */ li $t6, 1 .L8001FD60: diff --git a/asm/non_matchings/code_8001F980/func_80020524.s b/asm/non_matchings/code_8001F980/func_80020524.s index 8b568fb0a..cadc8e84d 100644 --- a/asm/non_matchings/code_8001F980/func_80020524.s +++ b/asm/non_matchings/code_8001F980/func_80020524.s @@ -54,8 +54,8 @@ glabel func_80020524 /* 0211F4 800205F4 24050003 */ li $a1, 3 /* 0211F8 800205F8 0C01B96B */ jal func_8006E5AC /* 0211FC 800205FC 00003025 */ move $a2, $zero -/* 021200 80020600 3C0D800E */ lui $t5, %hi(D_800DC52C) # $t5, 0x800e -/* 021204 80020604 8DADC52C */ lw $t5, %lo(D_800DC52C)($t5) +/* 021200 80020600 3C0D800E */ lui $t5, %hi(gActiveScreenMode) # $t5, 0x800e +/* 021204 80020604 8DADC52C */ lw $t5, %lo(gActiveScreenMode)($t5) /* 021208 80020608 24010003 */ li $at, 3 /* 02120C 8002060C 3C04800E */ lui $a0, %hi(gPlayerFive) # $a0, 0x800e /* 021210 80020610 11A10013 */ beq $t5, $at, .L80020660 diff --git a/asm/non_matchings/code_8001F980/func_8002088C.s b/asm/non_matchings/code_8001F980/func_8002088C.s index f9548da11..225978616 100644 --- a/asm/non_matchings/code_8001F980/func_8002088C.s +++ b/asm/non_matchings/code_8001F980/func_8002088C.s @@ -54,8 +54,8 @@ glabel func_8002088C /* 02155C 8002095C 24050003 */ li $a1, 3 /* 021560 80020960 0C01B98D */ jal func_8006E634 /* 021564 80020964 24060001 */ li $a2, 1 -/* 021568 80020968 3C0D800E */ lui $t5, %hi(D_800DC52C) # $t5, 0x800e -/* 02156C 8002096C 8DADC52C */ lw $t5, %lo(D_800DC52C)($t5) +/* 021568 80020968 3C0D800E */ lui $t5, %hi(gActiveScreenMode) # $t5, 0x800e +/* 02156C 8002096C 8DADC52C */ lw $t5, %lo(gActiveScreenMode)($t5) /* 021570 80020970 24010003 */ li $at, 3 /* 021574 80020974 3C04800E */ lui $a0, %hi(gPlayerFive) # $a0, 0x800e /* 021578 80020978 11A10013 */ beq $t5, $at, .L800209C8 diff --git a/asm/non_matchings/code_8001F980/func_800212B4.s b/asm/non_matchings/code_8001F980/func_800212B4.s index 663db1e7e..f66289cd0 100644 --- a/asm/non_matchings/code_8001F980/func_800212B4.s +++ b/asm/non_matchings/code_8001F980/func_800212B4.s @@ -69,8 +69,8 @@ glabel func_800212B4 /* 021FC0 800213C0 24060003 */ li $a2, 3 /* 021FC4 800213C4 0C008000 */ jal func_80020000 /* 021FC8 800213C8 00003825 */ move $a3, $zero -/* 021FCC 800213CC 3C19800E */ lui $t9, %hi(D_800DC52C) # $t9, 0x800e -/* 021FD0 800213D0 8F39C52C */ lw $t9, %lo(D_800DC52C)($t9) +/* 021FCC 800213CC 3C19800E */ lui $t9, %hi(gActiveScreenMode) # $t9, 0x800e +/* 021FD0 800213D0 8F39C52C */ lw $t9, %lo(gActiveScreenMode)($t9) /* 021FD4 800213D4 24010003 */ li $at, 3 /* 021FD8 800213D8 3C04800E */ lui $a0, %hi(gPlayerFive) # $a0, 0x800e /* 021FDC 800213DC 1321001B */ beq $t9, $at, .L8002144C @@ -122,8 +122,8 @@ glabel func_800212B4 /* 022090 80021490 24050003 */ li $a1, 3 /* 022094 80021494 0C008491 */ jal func_80021244 /* 022098 80021498 00003025 */ move $a2, $zero -/* 02209C 8002149C 3C18800E */ lui $t8, %hi(D_800DC52C) # $t8, 0x800e -/* 0220A0 800214A0 8F18C52C */ lw $t8, %lo(D_800DC52C)($t8) +/* 02209C 8002149C 3C18800E */ lui $t8, %hi(gActiveScreenMode) # $t8, 0x800e +/* 0220A0 800214A0 8F18C52C */ lw $t8, %lo(gActiveScreenMode)($t8) /* 0220A4 800214A4 24010003 */ li $at, 3 /* 0220A8 800214A8 3C04800E */ lui $a0, %hi(gPlayerFive) # $a0, 0x800e /* 0220AC 800214AC 13010013 */ beq $t8, $at, .L800214FC @@ -175,8 +175,8 @@ glabel func_800212B4 /* 02215C 8002155C 24050003 */ li $a1, 3 /* 022160 80021560 0C01B96B */ jal func_8006E5AC /* 022164 80021564 00003025 */ move $a2, $zero -/* 022168 80021568 3C0F800E */ lui $t7, %hi(D_800DC52C) # $t7, 0x800e -/* 02216C 8002156C 8DEFC52C */ lw $t7, %lo(D_800DC52C)($t7) +/* 022168 80021568 3C0F800E */ lui $t7, %hi(gActiveScreenMode) # $t7, 0x800e +/* 02216C 8002156C 8DEFC52C */ lw $t7, %lo(gActiveScreenMode)($t7) /* 022170 80021570 24010003 */ li $at, 3 /* 022174 80021574 3C04800E */ lui $a0, %hi(gPlayerFive) # $a0, 0x800e /* 022178 80021578 11E10013 */ beq $t7, $at, .L800215C8 diff --git a/asm/non_matchings/code_8001F980/func_80021B0C.s b/asm/non_matchings/code_8001F980/func_80021B0C.s index 91e45eb15..2cb7ebf9c 100644 --- a/asm/non_matchings/code_8001F980/func_80021B0C.s +++ b/asm/non_matchings/code_8001F980/func_80021B0C.s @@ -21,8 +21,8 @@ glabel func_80021B0C /* 022758 80021B58 24050003 */ li $a1, 3 /* 02275C 80021B5C 0C01B9F3 */ jal func_8006E7CC /* 022760 80021B60 00003025 */ move $a2, $zero -/* 022764 80021B64 3C0E800E */ lui $t6, %hi(D_800DC52C) # $t6, 0x800e -/* 022768 80021B68 8DCEC52C */ lw $t6, %lo(D_800DC52C)($t6) +/* 022764 80021B64 3C0E800E */ lui $t6, %hi(gActiveScreenMode) # $t6, 0x800e +/* 022768 80021B68 8DCEC52C */ lw $t6, %lo(gActiveScreenMode)($t6) /* 02276C 80021B6C 24010003 */ li $at, 3 /* 022770 80021B70 3C04800E */ lui $a0, %hi(gPlayerFive) # $a0, 0x800e /* 022774 80021B74 11C10013 */ beq $t6, $at, .L80021BC4 diff --git a/asm/non_matchings/code_8001F980/func_8002276C.s b/asm/non_matchings/code_8001F980/func_8002276C.s index db36ae306..05ef5ed7f 100644 --- a/asm/non_matchings/code_8001F980/func_8002276C.s +++ b/asm/non_matchings/code_8001F980/func_8002276C.s @@ -1,6 +1,6 @@ glabel func_8002276C -/* 02336C 8002276C 3C02800E */ lui $v0, %hi(D_800DC52C) # $v0, 0x800e -/* 023370 80022770 8C42C52C */ lw $v0, %lo(D_800DC52C)($v0) +/* 02336C 8002276C 3C02800E */ lui $v0, %hi(gActiveScreenMode) # $v0, 0x800e +/* 023370 80022770 8C42C52C */ lw $v0, %lo(gActiveScreenMode)($v0) /* 023374 80022774 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 023378 80022778 AFBF0014 */ sw $ra, 0x14($sp) /* 02337C 8002277C 1040000B */ beqz $v0, .L800227AC diff --git a/asm/non_matchings/code_80027040/func_80027A20.s b/asm/non_matchings/code_80027040/func_80027A20.s index 4bd0e942f..4dcaa6bef 100644 --- a/asm/non_matchings/code_80027040/func_80027A20.s +++ b/asm/non_matchings/code_80027040/func_80027A20.s @@ -1,7 +1,7 @@ glabel func_80027A20 /* 028620 80027A20 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 028624 80027A24 3C02800E */ lui $v0, %hi(D_800DC52C) # $v0, 0x800e -/* 028628 80027A28 8C42C52C */ lw $v0, %lo(D_800DC52C)($v0) +/* 028624 80027A24 3C02800E */ lui $v0, %hi(gActiveScreenMode) # $v0, 0x800e +/* 028628 80027A28 8C42C52C */ lw $v0, %lo(gActiveScreenMode)($v0) /* 02862C 80027A2C AFA60038 */ sw $a2, 0x38($sp) /* 028630 80027A30 AFA7003C */ sw $a3, 0x3c($sp) /* 028634 80027A34 00067600 */ sll $t6, $a2, 0x18 @@ -112,4 +112,4 @@ glabel func_80027A20 /* 0287CC 80027BCC 8FB00028 */ lw $s0, 0x28($sp) /* 0287D0 80027BD0 27BD0030 */ addiu $sp, $sp, 0x30 /* 0287D4 80027BD4 03E00008 */ jr $ra -/* 0287D8 80027BD8 00000000 */ nop +/* 0287D8 80027BD8 00000000 */ nop diff --git a/asm/non_matchings/code_80027D00/func_80028864.s b/asm/non_matchings/code_80027D00/func_80028864.s index db17cec40..0bd1d40a8 100644 --- a/asm/non_matchings/code_80027D00/func_80028864.s +++ b/asm/non_matchings/code_80027D00/func_80028864.s @@ -9,12 +9,12 @@ glabel func_80028864 /* 029480 80028880 304E2000 */ andi $t6, $v0, 0x2000 /* 029484 80028884 55C000CD */ bnel $t6, $zero, .L80028BBC /* 029488 80028888 304E0200 */ andi $t6, $v0, 0x200 -/* 02948C 8002888C 3C02800E */ lui $v0, %hi(D_800DC52C) # $v0, 0x800e -/* 029490 80028890 8C42C52C */ lw $v0, %lo(D_800DC52C)($v0) +/* 02948C 8002888C 3C02800E */ lui $v0, %hi(gActiveScreenMode) # $v0, 0x800e +/* 029490 80028890 8C42C52C */ lw $v0, %lo(gActiveScreenMode)($v0) /* 029494 80028894 24030001 */ li $v1, 1 /* 029498 80028898 3C0F8016 */ lui $t7, %hi(D_8016557C) # $t7, 0x8016 /* 02949C 8002889C 10400009 */ beqz $v0, .L800288C4 -/* 0294A0 800288A0 00000000 */ nop +/* 0294A0 800288A0 00000000 */ nop /* 0294A4 800288A4 10430015 */ beq $v0, $v1, .L800288FC /* 0294A8 800288A8 24010002 */ li $at, 2 /* 0294AC 800288AC 10410013 */ beq $v0, $at, .L800288FC @@ -33,7 +33,7 @@ glabel func_80028864 /* 0294DC 800288DC 46802120 */ cvt.s.w $f4, $f4 /* 0294E0 800288E0 44062000 */ mfc1 $a2, $f4 /* 0294E4 800288E4 0C007EC3 */ jal func_8001FB0C -/* 0294E8 800288E8 00000000 */ nop +/* 0294E8 800288E8 00000000 */ nop /* 0294EC 800288EC 8FA40020 */ lw $a0, 0x20($sp) /* 0294F0 800288F0 A7A2001E */ sh $v0, 0x1e($sp) /* 0294F4 800288F4 10000061 */ b .L80028A7C @@ -49,7 +49,7 @@ glabel func_80028864 /* 029518 80028918 468031A0 */ cvt.s.w $f6, $f6 /* 02951C 8002891C 44063000 */ mfc1 $a2, $f6 /* 029520 80028920 0C007EC3 */ jal func_8001FB0C -/* 029524 80028924 00000000 */ nop +/* 029524 80028924 00000000 */ nop /* 029528 80028928 24010001 */ li $at, 1 /* 02952C 8002892C 8FA40020 */ lw $a0, 0x20($sp) /* 029530 80028930 14410003 */ bne $v0, $at, .L80028940 @@ -67,7 +67,7 @@ glabel func_80028864 /* 02955C 8002895C 46804220 */ cvt.s.w $f8, $f8 /* 029560 80028960 44064000 */ mfc1 $a2, $f8 /* 029564 80028964 0C007EC3 */ jal func_8001FB0C -/* 029568 80028968 00000000 */ nop +/* 029568 80028968 00000000 */ nop /* 02956C 8002896C 8FA40020 */ lw $a0, 0x20($sp) /* 029570 80028970 A7A2001E */ sh $v0, 0x1e($sp) /* 029574 80028974 10000041 */ b .L80028A7C @@ -82,7 +82,7 @@ glabel func_80028864 /* 029594 80028994 468052A0 */ cvt.s.w $f10, $f10 /* 029598 80028998 44065000 */ mfc1 $a2, $f10 /* 02959C 8002899C 0C007EC3 */ jal func_8001FB0C -/* 0295A0 800289A0 00000000 */ nop +/* 0295A0 800289A0 00000000 */ nop /* 0295A4 800289A4 24010001 */ li $at, 1 /* 0295A8 800289A8 8FA40020 */ lw $a0, 0x20($sp) /* 0295AC 800289AC 14410003 */ bne $v0, $at, .L800289BC @@ -100,7 +100,7 @@ glabel func_80028864 /* 0295D8 800289D8 46808420 */ cvt.s.w $f16, $f16 /* 0295DC 800289DC 44068000 */ mfc1 $a2, $f16 /* 0295E0 800289E0 0C007EC3 */ jal func_8001FB0C -/* 0295E4 800289E4 00000000 */ nop +/* 0295E4 800289E4 00000000 */ nop /* 0295E8 800289E8 24010001 */ li $at, 1 /* 0295EC 800289EC 8FA40020 */ lw $a0, 0x20($sp) /* 0295F0 800289F0 14410003 */ bne $v0, $at, .L80028A00 @@ -118,7 +118,7 @@ glabel func_80028864 /* 02961C 80028A1C 468094A0 */ cvt.s.w $f18, $f18 /* 029620 80028A20 44069000 */ mfc1 $a2, $f18 /* 029624 80028A24 0C007EC3 */ jal func_8001FB0C -/* 029628 80028A28 00000000 */ nop +/* 029628 80028A28 00000000 */ nop /* 02962C 80028A2C 24010001 */ li $at, 1 /* 029630 80028A30 8FA40020 */ lw $a0, 0x20($sp) /* 029634 80028A34 14410003 */ bne $v0, $at, .L80028A44 @@ -136,7 +136,7 @@ glabel func_80028864 /* 029660 80028A60 46802120 */ cvt.s.w $f4, $f4 /* 029664 80028A64 44062000 */ mfc1 $a2, $f4 /* 029668 80028A68 0C007EC3 */ jal func_8001FB0C -/* 02966C 80028A6C 00000000 */ nop +/* 02966C 80028A6C 00000000 */ nop /* 029670 80028A70 8FA40020 */ lw $a0, 0x20($sp) /* 029674 80028A74 A7A2001E */ sh $v0, 0x1e($sp) /* 029678 80028A78 24030001 */ li $v1, 1 @@ -168,7 +168,7 @@ glabel func_80028864 /* 0296D8 80028AD8 8FA50024 */ lw $a1, 0x24($sp) /* 0296DC 80028ADC 83A6002F */ lb $a2, 0x2f($sp) /* 0296E0 80028AE0 146A0031 */ bne $v1, $t2, .L80028BA8 -/* 0296E4 80028AE4 00000000 */ nop +/* 0296E4 80028AE4 00000000 */ nop .L80028AE8: /* 0296E8 80028AE8 8C8B00BC */ lw $t3, 0xbc($a0) .L80028AEC: @@ -208,7 +208,7 @@ glabel func_80028864 /* 029770 80028B70 83A6002F */ lb $a2, 0x2f($sp) /* 029774 80028B74 318D0800 */ andi $t5, $t4, 0x800 /* 029778 80028B78 11A00007 */ beqz $t5, .L80028B98 -/* 02977C 80028B7C 00000000 */ nop +/* 02977C 80028B7C 00000000 */ nop .L80028B80: /* 029780 80028B80 8FA50024 */ lw $a1, 0x24($sp) .L80028B84: @@ -255,7 +255,7 @@ glabel func_80028864 /* 029810 80028C10 13010004 */ beq $t8, $at, .L80028C24 /* 029814 80028C14 3C014248 */ li $at, 0x42480000 # 50.000000 /* 029818 80028C18 44813000 */ mtc1 $at, $f6 -/* 02981C 80028C1C 00000000 */ nop +/* 02981C 80028C1C 00000000 */ nop /* 029820 80028C20 E486009C */ swc1 $f6, 0x9c($a0) .L80028C24: /* 029824 80028C24 8C9900BC */ lw $t9, 0xbc($a0) @@ -266,4 +266,4 @@ glabel func_80028864 .L80028C38: /* 029838 80028C38 27BD0020 */ addiu $sp, $sp, 0x20 /* 02983C 80028C3C 03E00008 */ jr $ra -/* 029840 80028C40 00000000 */ nop +/* 029840 80028C40 00000000 */ nop diff --git a/asm/non_matchings/code_80027D00/func_8002D268.s b/asm/non_matchings/code_80027D00/func_8002D268.s index f5db9ea4b..19b832fe6 100644 --- a/asm/non_matchings/code_80027D00/func_8002D268.s +++ b/asm/non_matchings/code_80027D00/func_8002D268.s @@ -98,12 +98,12 @@ glabel func_8002D268 /* 02DFDC 8002D3DC 02002025 */ move $a0, $s0 /* 02DFE0 8002D3E0 01A2C024 */ and $t8, $t5, $v0 /* 02DFE4 8002D3E4 14580007 */ bne $v0, $t8, .L8002D404 -/* 02DFE8 8002D3E8 00000000 */ nop +/* 02DFE8 8002D3E8 00000000 */ nop /* 02DFEC 8002D3EC 86190228 */ lh $t9, 0x228($s0) /* 02DFF0 8002D3F0 24080002 */ li $t0, 2 /* 02DFF4 8002D3F4 2B210064 */ slti $at, $t9, 0x64 /* 02DFF8 8002D3F8 14200002 */ bnez $at, .L8002D404 -/* 02DFFC 8002D3FC 00000000 */ nop +/* 02DFFC 8002D3FC 00000000 */ nop /* 02E000 8002D400 AFA8007C */ sw $t0, 0x7c($sp) .L8002D404: /* 02E004 8002D404 0C00DEED */ jal func_80037BB4 @@ -122,7 +122,7 @@ glabel func_8002D268 /* 02E038 8002D438 C6040064 */ lwc1 $f4, 0x64($s0) /* 02E03C 8002D43C C608006C */ lwc1 $f8, 0x6c($s0) /* 02E040 8002D440 46102182 */ mul.s $f6, $f4, $f16 -/* 02E044 8002D444 00000000 */ nop +/* 02E044 8002D444 00000000 */ nop /* 02E048 8002D448 46104282 */ mul.s $f10, $f8, $f16 /* 02E04C 8002D44C E6060064 */ swc1 $f6, 0x64($s0) /* 02E050 8002D450 E60A006C */ swc1 $f10, 0x6c($s0) @@ -146,7 +146,7 @@ glabel func_8002D268 /* 02E094 8002D494 D422D7E0 */ ldc1 $f2, %lo(D_800ED7E0)($at) /* 02E098 8002D498 460021A1 */ cvt.d.s $f6, $f4 /* 02E09C 8002D49C 46223202 */ mul.d $f8, $f6, $f2 -/* 02E0A0 8002D4A0 00000000 */ nop +/* 02E0A0 8002D4A0 00000000 */ nop /* 02E0A4 8002D4A4 460C8282 */ mul.s $f10, $f16, $f12 /* 02E0A8 8002D4A8 46005121 */ cvt.d.s $f4, $f10 /* 02E0AC 8002D4AC 46244180 */ add.d $f6, $f8, $f4 @@ -164,7 +164,7 @@ glabel func_8002D268 /* 02E0DC 8002D4DC 46003282 */ mul.s $f10, $f6, $f0 /* 02E0E0 8002D4E0 46005221 */ cvt.d.s $f8, $f10 /* 02E0E4 8002D4E4 46224102 */ mul.d $f4, $f8, $f2 -/* 02E0E8 8002D4E8 00000000 */ nop +/* 02E0E8 8002D4E8 00000000 */ nop /* 02E0EC 8002D4EC 460E8182 */ mul.s $f6, $f16, $f14 /* 02E0F0 8002D4F0 460032A1 */ cvt.d.s $f10, $f6 /* 02E0F4 8002D4F4 462A2200 */ add.d $f8, $f4, $f10 @@ -185,7 +185,7 @@ glabel func_8002D268 /* 02E12C 8002D52C C7AA016C */ lwc1 $f10, 0x16c($sp) /* 02E130 8002D530 4600418D */ trunc.w.s $f6, $f8 /* 02E134 8002D534 44023000 */ mfc1 $v0, $f6 -/* 02E138 8002D538 00000000 */ nop +/* 02E138 8002D538 00000000 */ nop /* 02E13C 8002D53C 2841000A */ slti $at, $v0, 0xa /* 02E140 8002D540 54200003 */ bnel $at, $zero, .L8002D550 /* 02E144 8002D544 C6080140 */ lwc1 $f8, 0x140($s0) @@ -201,7 +201,7 @@ glabel func_8002D268 /* 02E168 8002D568 03AB6821 */ addu $t5, $sp, $t3 /* 02E16C 8002D56C C5A20104 */ lwc1 $f2, 0x104($t5) /* 02E170 8002D570 46041282 */ mul.s $f10, $f2, $f4 -/* 02E174 8002D574 00000000 */ nop +/* 02E174 8002D574 00000000 */ nop /* 02E178 8002D578 460C8202 */ mul.s $f8, $f16, $f12 /* 02E17C 8002D57C 46085180 */ add.s $f6, $f10, $f8 /* 02E180 8002D580 E7A600B4 */ swc1 $f6, 0xb4($sp) @@ -215,9 +215,9 @@ glabel func_8002D268 /* 02E1A0 8002D5A0 46005207 */ neg.s $f8, $f10 /* 02E1A4 8002D5A4 46043380 */ add.s $f14, $f6, $f4 /* 02E1A8 8002D5A8 46004182 */ mul.s $f6, $f8, $f0 -/* 02E1AC 8002D5AC 00000000 */ nop +/* 02E1AC 8002D5AC 00000000 */ nop /* 02E1B0 8002D5B0 46061102 */ mul.s $f4, $f2, $f6 -/* 02E1B4 8002D5B4 00000000 */ nop +/* 02E1B4 8002D5B4 00000000 */ nop /* 02E1B8 8002D5B8 460E8282 */ mul.s $f10, $f16, $f14 /* 02E1BC 8002D5BC 460A2200 */ add.s $f8, $f4, $f10 /* 02E1C0 8002D5C0 E7A800AC */ swc1 $f8, 0xac($sp) @@ -234,7 +234,7 @@ glabel func_8002D268 /* 02E1E8 8002D5E8 3C014080 */ li $at, 0x40800000 # 4.000000 /* 02E1EC 8002D5EC 44815000 */ mtc1 $at, $f10 /* 02E1F0 8002D5F0 46026182 */ mul.s $f6, $f12, $f2 -/* 02E1F4 8002D5F4 00000000 */ nop +/* 02E1F4 8002D5F4 00000000 */ nop /* 02E1F8 8002D5F8 46100102 */ mul.s $f4, $f0, $f16 /* 02E1FC 8002D5FC E7A600B4 */ swc1 $f6, 0xb4($sp) /* 02E200 8002D600 46027182 */ mul.s $f6, $f14, $f2 @@ -247,9 +247,9 @@ glabel func_8002D268 /* 02E214 8002D614 5483000A */ bnel $a0, $v1, .L8002D640 /* 02E218 8002D618 8619002E */ lh $t9, 0x2e($s0) /* 02E21C 8002D61C 46026102 */ mul.s $f4, $f12, $f2 -/* 02E220 8002D620 00000000 */ nop +/* 02E220 8002D620 00000000 */ nop /* 02E224 8002D624 46100282 */ mul.s $f10, $f0, $f16 -/* 02E228 8002D628 00000000 */ nop +/* 02E228 8002D628 00000000 */ nop /* 02E22C 8002D62C 46027202 */ mul.s $f8, $f14, $f2 /* 02E230 8002D630 E7A400B4 */ swc1 $f4, 0xb4($sp) /* 02E234 8002D634 E7AA00B0 */ swc1 $f10, 0xb0($sp) @@ -286,7 +286,7 @@ glabel func_8002D268 /* 02E2AC 8002D6AC 460A3080 */ add.s $f2, $f6, $f10 /* 02E2B0 8002D6B0 46001121 */ cvt.d.s $f4, $f2 /* 02E2B4 8002D6B4 4624403C */ c.lt.d $f8, $f4 -/* 02E2B8 8002D6B8 00000000 */ nop +/* 02E2B8 8002D6B8 00000000 */ nop /* 02E2BC 8002D6BC 45020006 */ bc1fl .L8002D6D8 /* 02E2C0 8002D6C0 860D0044 */ lh $t5, 0x44($s0) /* 02E2C4 8002D6C4 860C0044 */ lh $t4, 0x44($s0) @@ -300,7 +300,7 @@ glabel func_8002D268 .L8002D6E0: /* 02E2E0 8002D6E0 C606008C */ lwc1 $f6, 0x8c($s0) /* 02E2E4 8002D6E4 4600303E */ c.le.s $f6, $f0 -/* 02E2E8 8002D6E8 00000000 */ nop +/* 02E2E8 8002D6E8 00000000 */ nop /* 02E2EC 8002D6EC 4502000E */ bc1fl .L8002D728 /* 02E2F0 8002D6F0 E7A00180 */ swc1 $f0, 0x180($sp) /* 02E2F4 8002D6F4 8E0200BC */ lw $v0, 0xbc($s0) @@ -416,7 +416,7 @@ glabel func_8002D268 /* 02E498 8002D898 460042A1 */ cvt.d.s $f10, $f8 /* 02E49C 8002D89C 460021A1 */ cvt.d.s $f6, $f4 /* 02E4A0 8002D8A0 462A7102 */ mul.d $f4, $f14, $f10 -/* 02E4A4 8002D8A4 00000000 */ nop +/* 02E4A4 8002D8A4 00000000 */ nop /* 02E4A8 8002D8A8 46241202 */ mul.d $f8, $f2, $f4 /* 02E4AC 8002D8AC 46283281 */ sub.d $f10, $f6, $f8 /* 02E4B0 8002D8B0 C606020C */ lwc1 $f6, 0x20c($s0) @@ -451,7 +451,7 @@ glabel func_8002D268 /* 02E520 8002D920 460051A1 */ cvt.d.s $f6, $f10 /* 02E524 8002D924 46004121 */ cvt.d.s $f4, $f8 /* 02E528 8002D928 46267202 */ mul.d $f8, $f14, $f6 -/* 02E52C 8002D92C 00000000 */ nop +/* 02E52C 8002D92C 00000000 */ nop /* 02E530 8002D930 46280282 */ mul.d $f10, $f0, $f8 /* 02E534 8002D934 462A2181 */ sub.d $f6, $f4, $f10 /* 02E538 8002D938 46303203 */ div.d $f8, $f6, $f16 @@ -470,7 +470,7 @@ glabel func_8002D268 /* 02E56C 8002D96C 46003221 */ cvt.d.s $f8, $f6 /* 02E570 8002D970 460022A1 */ cvt.d.s $f10, $f4 /* 02E574 8002D974 46287102 */ mul.d $f4, $f14, $f8 -/* 02E578 8002D978 00000000 */ nop +/* 02E578 8002D978 00000000 */ nop /* 02E57C 8002D97C 46241182 */ mul.d $f6, $f2, $f4 /* 02E580 8002D980 46265201 */ sub.d $f8, $f10, $f6 /* 02E584 8002D984 46304103 */ div.d $f4, $f8, $f16 @@ -514,7 +514,7 @@ glabel func_8002D268 /* 02E618 8002DA18 460022A1 */ cvt.d.s $f10, $f4 /* 02E61C 8002DA1C 46003221 */ cvt.d.s $f8, $f6 /* 02E620 8002DA20 462A7182 */ mul.d $f6, $f14, $f10 -/* 02E624 8002DA24 00000000 */ nop +/* 02E624 8002DA24 00000000 */ nop /* 02E628 8002DA28 46261102 */ mul.d $f4, $f2, $f6 /* 02E62C 8002DA2C 46244281 */ sub.d $f10, $f8, $f4 /* 02E630 8002DA30 46305183 */ div.d $f6, $f10, $f16 @@ -535,7 +535,7 @@ glabel func_8002D268 /* 02E668 8002DA68 460051A1 */ cvt.d.s $f6, $f10 /* 02E66C 8002DA6C 46004121 */ cvt.d.s $f4, $f8 /* 02E670 8002DA70 46267202 */ mul.d $f8, $f14, $f6 -/* 02E674 8002DA74 00000000 */ nop +/* 02E674 8002DA74 00000000 */ nop /* 02E678 8002DA78 46280282 */ mul.d $f10, $f0, $f8 /* 02E67C 8002DA7C 462A2181 */ sub.d $f6, $f4, $f10 /* 02E680 8002DA80 C6040DAC */ lwc1 $f4, 0xdac($s0) @@ -548,7 +548,7 @@ glabel func_8002D268 /* 02E69C 8002DA9C 860200CA */ lh $v0, 0xca($s0) /* 02E6A0 8002DAA0 30590002 */ andi $t9, $v0, 2 /* 02E6A4 8002DAA4 1321000D */ beq $t9, $at, .L8002DADC -/* 02E6A8 8002DAA8 00000000 */ nop +/* 02E6A8 8002DAA8 00000000 */ nop /* 02E6AC 8002DAAC 30480008 */ andi $t0, $v0, 8 /* 02E6B0 8002DAB0 24010008 */ li $at, 8 /* 02E6B4 8002DAB4 5101000A */ beql $t0, $at, .L8002DAE0 @@ -688,9 +688,9 @@ glabel func_8002D268 /* 02E8AC 8002DCAC E7AA00A8 */ swc1 $f10, 0xa8($sp) /* 02E8B0 8002DCB0 C7A400A8 */ lwc1 $f4, 0xa8($sp) /* 02E8B4 8002DCB4 44803000 */ mtc1 $zero, $f6 -/* 02E8B8 8002DCB8 00000000 */ nop +/* 02E8B8 8002DCB8 00000000 */ nop /* 02E8BC 8002DCBC 4606203E */ c.le.s $f4, $f6 -/* 02E8C0 8002DCC0 00000000 */ nop +/* 02E8C0 8002DCC0 00000000 */ nop /* 02E8C4 8002DCC4 450200B5 */ bc1fl .L8002DF9C /* 02E8C8 8002DCC8 C60A0124 */ lwc1 $f10, 0x124($s0) /* 02E8CC 8002DCCC 8E0900BC */ lw $t1, 0xbc($s0) @@ -750,7 +750,7 @@ glabel func_8002D268 /* 02E99C 8002DD9C 46043203 */ div.s $f8, $f6, $f4 /* 02E9A0 8002DDA0 44054000 */ mfc1 $a1, $f8 /* 02E9A4 8002DDA4 0C032B74 */ jal func_800CADD0 -/* 02E9A8 8002DDA8 00000000 */ nop +/* 02E9A8 8002DDA8 00000000 */ nop /* 02E9AC 8002DDAC 96030000 */ lhu $v1, ($s0) /* 02E9B0 8002DDB0 306D4000 */ andi $t5, $v1, 0x4000 /* 02E9B4 8002DDB4 01A01825 */ move $v1, $t5 @@ -780,7 +780,7 @@ glabel func_8002D268 /* 02EA04 8002DE04 3C01800F */ lui $at, %hi(D_800ED838) # $at, 0x800f /* 02EA08 8002DE08 46082282 */ mul.s $f10, $f4, $f8 /* 02EA0C 8002DE0C 460A303E */ c.le.s $f6, $f10 -/* 02EA10 8002DE10 00000000 */ nop +/* 02EA10 8002DE10 00000000 */ nop /* 02EA14 8002DE14 45020020 */ bc1fl .L8002DE98 /* 02EA18 8002DE18 860200C2 */ lh $v0, 0xc2($s0) /* 02EA1C 8002DE1C 96020000 */ lhu $v0, ($s0) @@ -803,7 +803,7 @@ glabel func_8002D268 /* 02EA60 8002DE60 46065103 */ div.s $f4, $f10, $f6 /* 02EA64 8002DE64 44052000 */ mfc1 $a1, $f4 /* 02EA68 8002DE68 0C032B74 */ jal func_800CADD0 -/* 02EA6C 8002DE6C 00000000 */ nop +/* 02EA6C 8002DE6C 00000000 */ nop /* 02EA70 8002DE70 96030000 */ lhu $v1, ($s0) /* 02EA74 8002DE74 306F4000 */ andi $t7, $v1, 0x4000 /* 02EA78 8002DE78 01E01825 */ move $v1, $t7 @@ -833,7 +833,7 @@ glabel func_8002D268 /* 02EAC8 8002DEC8 3C013FC0 */ li $at, 0x3FC00000 # 1.500000 /* 02EACC 8002DECC 46043202 */ mul.s $f8, $f6, $f4 /* 02EAD0 8002DED0 4608503E */ c.le.s $f10, $f8 -/* 02EAD4 8002DED4 00000000 */ nop +/* 02EAD4 8002DED4 00000000 */ nop /* 02EAD8 8002DED8 4502002A */ bc1fl .L8002DF84 /* 02EADC 8002DEDC A60000C2 */ sh $zero, 0xc2($s0) /* 02EAE0 8002DEE0 96020000 */ lhu $v0, ($s0) @@ -865,7 +865,7 @@ glabel func_8002D268 /* 02EB48 8002DF48 460A4183 */ div.s $f6, $f8, $f10 /* 02EB4C 8002DF4C 44053000 */ mfc1 $a1, $f6 /* 02EB50 8002DF50 0C032B74 */ jal func_800CADD0 -/* 02EB54 8002DF54 00000000 */ nop +/* 02EB54 8002DF54 00000000 */ nop /* 02EB58 8002DF58 1000000A */ b .L8002DF84 /* 02EB5C 8002DF5C A60000C2 */ sh $zero, 0xc2($s0) .L8002DF60: @@ -877,13 +877,13 @@ glabel func_8002D268 /* 02EB70 8002DF70 460A4183 */ div.s $f6, $f8, $f10 /* 02EB74 8002DF74 44053000 */ mfc1 $a1, $f6 /* 02EB78 8002DF78 0C032B74 */ jal func_800CADD0 -/* 02EB7C 8002DF7C 00000000 */ nop +/* 02EB7C 8002DF7C 00000000 */ nop .L8002DF80: /* 02EB80 8002DF80 A60000C2 */ sh $zero, 0xc2($s0) .L8002DF84: /* 02EB84 8002DF84 861800C2 */ lh $t8, 0xc2($s0) /* 02EB88 8002DF88 44982000 */ mtc1 $t8, $f4 -/* 02EB8C 8002DF8C 00000000 */ nop +/* 02EB8C 8002DF8C 00000000 */ nop /* 02EB90 8002DF90 46802220 */ cvt.s.w $f8, $f4 /* 02EB94 8002DF94 E60800EC */ swc1 $f8, 0xec($s0) /* 02EB98 8002DF98 C60A0124 */ lwc1 $f10, 0x124($s0) @@ -892,7 +892,7 @@ glabel func_8002D268 /* 02EBA0 8002DFA0 E7AA00A8 */ swc1 $f10, 0xa8($sp) /* 02EBA4 8002DFA4 C7A400A8 */ lwc1 $f4, 0xa8($sp) /* 02EBA8 8002DFA8 4606203E */ c.le.s $f4, $f6 -/* 02EBAC 8002DFAC 00000000 */ nop +/* 02EBAC 8002DFAC 00000000 */ nop /* 02EBB0 8002DFB0 4500000D */ bc1f .L8002DFE8 /* 02EBB4 8002DFB4 27B900A8 */ addiu $t9, $sp, 0xa8 /* 02EBB8 8002DFB8 27A800FC */ addiu $t0, $sp, 0xfc @@ -913,7 +913,7 @@ glabel func_8002D268 /* 02EBF0 8002DFF0 E7A800A8 */ swc1 $f8, 0xa8($sp) /* 02EBF4 8002DFF4 C7AA00A8 */ lwc1 $f10, 0xa8($sp) /* 02EBF8 8002DFF8 4606503C */ c.lt.s $f10, $f6 -/* 02EBFC 8002DFFC 00000000 */ nop +/* 02EBFC 8002DFFC 00000000 */ nop /* 02EC00 8002E000 4500000F */ bc1f .L8002E040 /* 02EC04 8002E004 27AA00FC */ addiu $t2, $sp, 0xfc /* 02EC08 8002E008 27A900F8 */ addiu $t1, $sp, 0xf8 @@ -936,7 +936,7 @@ glabel func_8002D268 /* 02EC48 8002E048 E7A400A8 */ swc1 $f4, 0xa8($sp) /* 02EC4C 8002E04C C7A800A8 */ lwc1 $f8, 0xa8($sp) /* 02EC50 8002E050 460A403C */ c.lt.s $f8, $f10 -/* 02EC54 8002E054 00000000 */ nop +/* 02EC54 8002E054 00000000 */ nop /* 02EC58 8002E058 4500000F */ bc1f .L8002E098 /* 02EC5C 8002E05C 27AB00FC */ addiu $t3, $sp, 0xfc /* 02EC60 8002E060 27AD00F8 */ addiu $t5, $sp, 0xf8 @@ -959,7 +959,7 @@ glabel func_8002D268 /* 02ECA0 8002E0A0 E7A600A8 */ swc1 $f6, 0xa8($sp) /* 02ECA4 8002E0A4 C7A400A8 */ lwc1 $f4, 0xa8($sp) /* 02ECA8 8002E0A8 4604403E */ c.le.s $f8, $f4 -/* 02ECAC 8002E0AC 00000000 */ nop +/* 02ECAC 8002E0AC 00000000 */ nop /* 02ECB0 8002E0B0 45020015 */ bc1fl .L8002E108 /* 02ECB4 8002E0B4 8E0A00BC */ lw $t2, 0xbc($s0) /* 02ECB8 8002E0B8 C60A0120 */ lwc1 $f10, 0x120($s0) @@ -967,7 +967,7 @@ glabel func_8002D268 /* 02ECC0 8002E0C0 E7AA00A8 */ swc1 $f10, 0xa8($sp) /* 02ECC4 8002E0C4 C7A600A8 */ lwc1 $f6, 0xa8($sp) /* 02ECC8 8002E0C8 4606203E */ c.le.s $f4, $f6 -/* 02ECCC 8002E0CC 00000000 */ nop +/* 02ECCC 8002E0CC 00000000 */ nop /* 02ECD0 8002E0D0 4502000D */ bc1fl .L8002E108 /* 02ECD4 8002E0D4 8E0A00BC */ lw $t2, 0xbc($s0) /* 02ECD8 8002E0D8 96190046 */ lhu $t9, 0x46($s0) @@ -1035,8 +1035,8 @@ glabel func_8002D268 /* 02EDBC 8002E1BC E6000074 */ swc1 $f0, 0x74($s0) /* 02EDC0 8002E1C0 31494000 */ andi $t1, $t2, 0x4000 /* 02EDC4 8002E1C4 1521000F */ bne $t1, $at, .L8002E204 -/* 02EDC8 8002E1C8 3C02800E */ lui $v0, %hi(D_800DC52C) # $v0, 0x800e -/* 02EDCC 8002E1CC 8C42C52C */ lw $v0, %lo(D_800DC52C)($v0) +/* 02EDC8 8002E1C8 3C02800E */ lui $v0, %hi(gActiveScreenMode) # $v0, 0x800e +/* 02EDCC 8002E1CC 8C42C52C */ lw $v0, %lo(gActiveScreenMode)($v0) /* 02EDD0 8002E1D0 24010002 */ li $at, 2 /* 02EDD4 8002E1D4 02002025 */ move $a0, $s0 /* 02EDD8 8002E1D8 10400005 */ beqz $v0, .L8002E1F0 @@ -1080,7 +1080,7 @@ glabel func_8002D268 /* 02EE60 8002E260 C604008C */ lwc1 $f4, 0x8c($s0) /* 02EE64 8002E264 E6000094 */ swc1 $f0, 0x94($s0) /* 02EE68 8002E268 4608203E */ c.le.s $f4, $f8 -/* 02EE6C 8002E26C 00000000 */ nop +/* 02EE6C 8002E26C 00000000 */ nop /* 02EE70 8002E270 45020023 */ bc1fl .L8002E300 /* 02EE74 8002E274 C7AA00FC */ lwc1 $f10, 0xfc($sp) /* 02EE78 8002E278 C6060094 */ lwc1 $f6, 0x94($s0) @@ -1089,13 +1089,13 @@ glabel func_8002D268 /* 02EE84 8002E284 46003221 */ cvt.d.s $f8, $f6 /* 02EE88 8002E288 8FAC0054 */ lw $t4, 0x54($sp) /* 02EE8C 8002E28C 462A403E */ c.le.d $f8, $f10 -/* 02EE90 8002E290 00000000 */ nop +/* 02EE90 8002E290 00000000 */ nop /* 02EE94 8002E294 4502001A */ bc1fl .L8002E300 /* 02EE98 8002E298 C7AA00FC */ lwc1 $f10, 0xfc($sp) /* 02EE9C 8002E29C 44802000 */ mtc1 $zero, $f4 /* 02EEA0 8002E2A0 C5860004 */ lwc1 $f6, 4($t4) /* 02EEA4 8002E2A4 46062032 */ c.eq.s $f4, $f6 -/* 02EEA8 8002E2A8 00000000 */ nop +/* 02EEA8 8002E2A8 00000000 */ nop /* 02EEAC 8002E2AC 45020014 */ bc1fl .L8002E300 /* 02EEB0 8002E2B0 C7AA00FC */ lwc1 $f10, 0xfc($sp) /* 02EEB4 8002E2B4 44805000 */ mtc1 $zero, $f10 @@ -1103,13 +1103,13 @@ glabel func_8002D268 /* 02EEBC 8002E2BC C7A00098 */ lwc1 $f0, 0x98($sp) /* 02EEC0 8002E2C0 3C01BF80 */ li $at, 0xBF800000 # -1.000000 /* 02EEC4 8002E2C4 46085032 */ c.eq.s $f10, $f8 -/* 02EEC8 8002E2C8 00000000 */ nop +/* 02EEC8 8002E2C8 00000000 */ nop /* 02EECC 8002E2CC 4502000C */ bc1fl .L8002E300 /* 02EED0 8002E2D0 C7AA00FC */ lwc1 $f10, 0xfc($sp) /* 02EED4 8002E2D4 44816000 */ mtc1 $at, $f12 /* 02EED8 8002E2D8 C7A200A0 */ lwc1 $f2, 0xa0($sp) /* 02EEDC 8002E2DC 460C0102 */ mul.s $f4, $f0, $f12 -/* 02EEE0 8002E2E0 00000000 */ nop +/* 02EEE0 8002E2E0 00000000 */ nop /* 02EEE4 8002E2E4 460C1182 */ mul.s $f6, $f2, $f12 /* 02EEE8 8002E2E8 46002000 */ add.s $f0, $f4, $f0 /* 02EEEC 8002E2EC 46023080 */ add.s $f2, $f6, $f2 @@ -1176,7 +1176,7 @@ glabel func_8002D268 /* 02EFD4 8002E3D4 016D1021 */ addu $v0, $t3, $t5 /* 02EFD8 8002E3D8 C44C0000 */ lwc1 $f12, ($v0) /* 02EFDC 8002E3DC 4602603C */ c.lt.s $f12, $f2 -/* 02EFE0 8002E3E0 00000000 */ nop +/* 02EFE0 8002E3E0 00000000 */ nop /* 02EFE4 8002E3E4 4502000E */ bc1fl .L8002E420 /* 02EFE8 8002E3E8 86180044 */ lh $t8, 0x44($s0) /* 02EFEC 8002E3EC 46026003 */ div.s $f0, $f12, $f2 @@ -1200,7 +1200,7 @@ glabel func_8002D268 /* 02F030 8002E430 44816000 */ mtc1 $at, $f12 /* 02F034 8002E434 C6020094 */ lwc1 $f2, 0x94($s0) /* 02F038 8002E438 4602603C */ c.lt.s $f12, $f2 -/* 02F03C 8002E43C 00000000 */ nop +/* 02F03C 8002E43C 00000000 */ nop /* 02F040 8002E440 4502000D */ bc1fl .L8002E478 /* 02F044 8002E444 3C0143FA */ lui $at, 0x43fa /* 02F048 8002E448 46026003 */ div.s $f0, $f12, $f2 @@ -1220,9 +1220,9 @@ glabel func_8002D268 /* 02F078 8002E478 44814000 */ mtc1 $at, $f8 /* 02F07C 8002E47C C60A0124 */ lwc1 $f10, 0x124($s0) /* 02F080 8002E480 460A403E */ c.le.s $f8, $f10 -/* 02F084 8002E484 00000000 */ nop +/* 02F084 8002E484 00000000 */ nop /* 02F088 8002E488 45000007 */ bc1f .L8002E4A8 -/* 02F08C 8002E48C 00000000 */ nop +/* 02F08C 8002E48C 00000000 */ nop /* 02F090 8002E490 86080078 */ lh $t0, 0x78($s0) /* 02F094 8002E494 05010003 */ bgez $t0, .L8002E4A4 /* 02F098 8002E498 00087043 */ sra $t6, $t0, 1 @@ -1237,4 +1237,4 @@ glabel func_8002D268 /* 02F0B4 8002E4B4 8FB00028 */ lw $s0, 0x28($sp) /* 02F0B8 8002E4B8 27BD0190 */ addiu $sp, $sp, 0x190 /* 02F0BC 8002E4BC 03E00008 */ jr $ra -/* 02F0C0 8002E4C0 00000000 */ nop +/* 02F0C0 8002E4C0 00000000 */ nop diff --git a/asm/non_matchings/code_80027D00/func_8002E594.s b/asm/non_matchings/code_80027D00/func_8002E594.s index cf452ca89..77b8a7cbe 100644 --- a/asm/non_matchings/code_80027D00/func_8002E594.s +++ b/asm/non_matchings/code_80027D00/func_8002E594.s @@ -233,7 +233,7 @@ glabel func_8002E594 /* 02F504 8002E904 462C4283 */ div.d $f10, $f8, $f12 /* 02F508 8002E908 46102182 */ mul.s $f6, $f4, $f16 /* 02F50C 8002E90C 44814000 */ mtc1 $at, $f8 -/* 02F510 8002E910 00000000 */ nop +/* 02F510 8002E910 00000000 */ nop /* 02F514 8002E914 46083100 */ add.s $f4, $f6, $f8 /* 02F518 8002E918 460021A1 */ cvt.d.s $f6, $f4 /* 02F51C 8002E91C 46265203 */ div.d $f8, $f10, $f6 @@ -251,14 +251,14 @@ glabel func_8002E594 /* 02F54C 8002E94C 460051A1 */ cvt.d.s $f6, $f10 /* 02F550 8002E950 46004121 */ cvt.d.s $f4, $f8 /* 02F554 8002E954 46267202 */ mul.d $f8, $f14, $f6 -/* 02F558 8002E958 00000000 */ nop +/* 02F558 8002E958 00000000 */ nop /* 02F55C 8002E95C 46281282 */ mul.d $f10, $f2, $f8 /* 02F560 8002E960 462A2181 */ sub.d $f6, $f4, $f10 /* 02F564 8002E964 C604020C */ lwc1 $f4, 0x20c($s0) /* 02F568 8002E968 462C3203 */ div.d $f8, $f6, $f12 /* 02F56C 8002E96C 46102282 */ mul.s $f10, $f4, $f16 /* 02F570 8002E970 44813000 */ mtc1 $at, $f6 -/* 02F574 8002E974 00000000 */ nop +/* 02F574 8002E974 00000000 */ nop /* 02F578 8002E978 46065100 */ add.s $f4, $f10, $f6 /* 02F57C 8002E97C 460022A1 */ cvt.d.s $f10, $f4 /* 02F580 8002E980 462A4183 */ div.d $f6, $f8, $f10 @@ -325,7 +325,7 @@ glabel func_8002E594 /* 02F668 8002EA68 46003121 */ cvt.d.s $f4, $f6 /* 02F66C 8002EA6C 460042A1 */ cvt.d.s $f10, $f8 /* 02F670 8002EA70 46247202 */ mul.d $f8, $f14, $f4 -/* 02F674 8002EA74 00000000 */ nop +/* 02F674 8002EA74 00000000 */ nop /* 02F678 8002EA78 46280182 */ mul.d $f6, $f0, $f8 /* 02F67C 8002EA7C 46265101 */ sub.d $f4, $f10, $f6 /* 02F680 8002EA80 C60A0DAC */ lwc1 $f10, 0xdac($s0) @@ -338,14 +338,14 @@ glabel func_8002E594 /* 02F69C 8002EA9C 860200CA */ lh $v0, 0xca($s0) /* 02F6A0 8002EAA0 30490002 */ andi $t1, $v0, 2 /* 02F6A4 8002EAA4 11210005 */ beq $t1, $at, .L8002EABC -/* 02F6A8 8002EAA8 00000000 */ nop +/* 02F6A8 8002EAA8 00000000 */ nop /* 02F6AC 8002EAAC 304A0008 */ andi $t2, $v0, 8 /* 02F6B0 8002EAB0 24010008 */ li $at, 8 /* 02F6B4 8002EAB4 55410007 */ bnel $t2, $at, .L8002EAD4 /* 02F6B8 8002EAB8 C6000014 */ lwc1 $f0, 0x14($s0) .L8002EABC: /* 02F6BC 8002EABC 44800000 */ mtc1 $zero, $f0 -/* 02F6C0 8002EAC0 00000000 */ nop +/* 02F6C0 8002EAC0 00000000 */ nop /* 02F6C4 8002EAC4 E7A00058 */ swc1 $f0, 0x58($sp) /* 02F6C8 8002EAC8 E7A00054 */ swc1 $f0, 0x54($sp) /* 02F6CC 8002EACC E7A0005C */ swc1 $f0, 0x5c($sp) @@ -411,7 +411,7 @@ glabel func_8002E594 /* 02F7B8 8002EBB8 E7A80074 */ swc1 $f8, 0x74($sp) /* 02F7BC 8002EBBC C7AA0074 */ lwc1 $f10, 0x74($sp) /* 02F7C0 8002EBC0 4600503E */ c.le.s $f10, $f0 -/* 02F7C4 8002EBC4 00000000 */ nop +/* 02F7C4 8002EBC4 00000000 */ nop /* 02F7C8 8002EBC8 450200C1 */ bc1fl .L8002EED0 /* 02F7CC 8002EBCC C6080124 */ lwc1 $f8, 0x124($s0) /* 02F7D0 8002EBD0 8E0B00BC */ lw $t3, 0xbc($s0) @@ -463,7 +463,7 @@ glabel func_8002E594 /* 02F884 8002EC84 460A4103 */ div.s $f4, $f8, $f10 /* 02F888 8002EC88 44052000 */ mfc1 $a1, $f4 /* 02F88C 8002EC8C 0C032B74 */ jal func_800CADD0 -/* 02F890 8002EC90 00000000 */ nop +/* 02F890 8002EC90 00000000 */ nop /* 02F894 8002EC94 96020000 */ lhu $v0, ($s0) /* 02F898 8002EC98 44800000 */ mtc1 $zero, $f0 /* 02F89C 8002EC9C 304A4000 */ andi $t2, $v0, 0x4000 @@ -494,9 +494,9 @@ glabel func_8002E594 /* 02F8F0 8002ECF0 3C014000 */ li $at, 0x40000000 # 2.000000 /* 02F8F4 8002ECF4 46045182 */ mul.s $f6, $f10, $f4 /* 02F8F8 8002ECF8 4606403E */ c.le.s $f8, $f6 -/* 02F8FC 8002ECFC 00000000 */ nop +/* 02F8FC 8002ECFC 00000000 */ nop /* 02F900 8002ED00 45000020 */ bc1f .L8002ED84 -/* 02F904 8002ED04 00000000 */ nop +/* 02F904 8002ED04 00000000 */ nop /* 02F908 8002ED08 96030000 */ lhu $v1, ($s0) /* 02F90C 8002ED0C 44815000 */ mtc1 $at, $f10 /* 02F910 8002ED10 24014000 */ li $at, 16384 @@ -517,7 +517,7 @@ glabel func_8002E594 /* 02F94C 8002ED4C 46083283 */ div.s $f10, $f6, $f8 /* 02F950 8002ED50 44055000 */ mfc1 $a1, $f10 /* 02F954 8002ED54 0C032B74 */ jal func_800CADD0 -/* 02F958 8002ED58 00000000 */ nop +/* 02F958 8002ED58 00000000 */ nop /* 02F95C 8002ED5C 96020000 */ lhu $v0, ($s0) /* 02F960 8002ED60 44800000 */ mtc1 $zero, $f0 /* 02F964 8002ED64 30584000 */ andi $t8, $v0, 0x4000 @@ -526,7 +526,7 @@ glabel func_8002E594 /* 02F96C 8002ED6C 24014000 */ li $at, 16384 .L8002ED70: /* 02F970 8002ED70 14410004 */ bne $v0, $at, .L8002ED84 -/* 02F974 8002ED74 00000000 */ nop +/* 02F974 8002ED74 00000000 */ nop /* 02F978 8002ED78 86080044 */ lh $t0, 0x44($s0) /* 02F97C 8002ED7C 350C0100 */ ori $t4, $t0, 0x100 /* 02F980 8002ED80 A60C0044 */ sh $t4, 0x44($s0) @@ -560,7 +560,7 @@ glabel func_8002E594 /* 02F9E0 8002EDE0 46083283 */ div.s $f10, $f6, $f8 /* 02F9E4 8002EDE4 44055000 */ mfc1 $a1, $f10 /* 02F9E8 8002EDE8 0C032B74 */ jal func_800CADD0 -/* 02F9EC 8002EDEC 00000000 */ nop +/* 02F9EC 8002EDEC 00000000 */ nop /* 02F9F0 8002EDF0 44800000 */ mtc1 $zero, $f0 /* 02F9F4 8002EDF4 860200C2 */ lh $v0, 0xc2($s0) .L8002EDF8: @@ -585,7 +585,7 @@ glabel func_8002E594 /* 02FA38 8002EE38 46283283 */ div.d $f10, $f6, $f8 /* 02FA3C 8002EE3C 4620510D */ trunc.w.d $f4, $f10 /* 02FA40 8002EE40 44182000 */ mfc1 $t8, $f4 -/* 02FA44 8002EE44 00000000 */ nop +/* 02FA44 8002EE44 00000000 */ nop /* 02FA48 8002EE48 A61800C2 */ sh $t8, 0xc2($s0) /* 02FA4C 8002EE4C C426D880 */ lwc1 $f6, %lo(D_800ED880)($at) /* 02FA50 8002EE50 E60000F4 */ swc1 $f0, 0xf4($s0) @@ -603,7 +603,7 @@ glabel func_8002E594 /* 02FA7C 8002EE7C 31694000 */ andi $t1, $t3, 0x4000 /* 02FA80 8002EE80 4620320D */ trunc.w.d $f8, $f6 /* 02FA84 8002EE84 440C4000 */ mfc1 $t4, $f8 -/* 02FA88 8002EE88 00000000 */ nop +/* 02FA88 8002EE88 00000000 */ nop /* 02FA8C 8002EE8C A60C00C2 */ sh $t4, 0xc2($s0) /* 02FA90 8002EE90 C42AD884 */ lwc1 $f10, %lo(D_800ED884)($at) /* 02FA94 8002EE94 24014000 */ li $at, 16384 @@ -619,7 +619,7 @@ glabel func_8002E594 .L8002EEB8: /* 02FAB8 8002EEB8 860F00C2 */ lh $t7, 0xc2($s0) /* 02FABC 8002EEBC 448F2000 */ mtc1 $t7, $f4 -/* 02FAC0 8002EEC0 00000000 */ nop +/* 02FAC0 8002EEC0 00000000 */ nop /* 02FAC4 8002EEC4 468021A0 */ cvt.s.w $f6, $f4 /* 02FAC8 8002EEC8 E60600EC */ swc1 $f6, 0xec($s0) /* 02FACC 8002EECC C6080124 */ lwc1 $f8, 0x124($s0) @@ -627,7 +627,7 @@ glabel func_8002E594 /* 02FAD0 8002EED0 E7A80074 */ swc1 $f8, 0x74($sp) /* 02FAD4 8002EED4 C7AA0074 */ lwc1 $f10, 0x74($sp) /* 02FAD8 8002EED8 4600503E */ c.le.s $f10, $f0 -/* 02FADC 8002EEDC 00000000 */ nop +/* 02FADC 8002EEDC 00000000 */ nop /* 02FAE0 8002EEE0 4500000F */ bc1f .L8002EF20 /* 02FAE4 8002EEE4 27AE0074 */ addiu $t6, $sp, 0x74 /* 02FAE8 8002EEE8 27B900D0 */ addiu $t9, $sp, 0xd0 @@ -643,13 +643,13 @@ glabel func_8002E594 /* 02FB10 8002EF10 0C00FD1B */ jal func_8003F46C /* 02FB14 8002EF14 27A700E0 */ addiu $a3, $sp, 0xe0 /* 02FB18 8002EF18 44800000 */ mtc1 $zero, $f0 -/* 02FB1C 8002EF1C 00000000 */ nop +/* 02FB1C 8002EF1C 00000000 */ nop .L8002EF20: /* 02FB20 8002EF20 C604011C */ lwc1 $f4, 0x11c($s0) /* 02FB24 8002EF24 E7A40074 */ swc1 $f4, 0x74($sp) /* 02FB28 8002EF28 C7A60074 */ lwc1 $f6, 0x74($sp) /* 02FB2C 8002EF2C 4600303C */ c.lt.s $f6, $f0 -/* 02FB30 8002EF30 00000000 */ nop +/* 02FB30 8002EF30 00000000 */ nop /* 02FB34 8002EF34 45000014 */ bc1f .L8002EF88 /* 02FB38 8002EF38 27AC00D0 */ addiu $t4, $sp, 0xd0 /* 02FB3C 8002EF3C 27AB00CC */ addiu $t3, $sp, 0xcc @@ -670,13 +670,13 @@ glabel func_8002E594 /* 02FB78 8002EF78 0C00C7D2 */ jal func_80031F48 /* 02FB7C 8002EF7C 3C0540C0 */ lui $a1, 0x40c0 /* 02FB80 8002EF80 44800000 */ mtc1 $zero, $f0 -/* 02FB84 8002EF84 00000000 */ nop +/* 02FB84 8002EF84 00000000 */ nop .L8002EF88: /* 02FB88 8002EF88 C6080120 */ lwc1 $f8, 0x120($s0) /* 02FB8C 8002EF8C E7A80074 */ swc1 $f8, 0x74($sp) /* 02FB90 8002EF90 C7AA0074 */ lwc1 $f10, 0x74($sp) /* 02FB94 8002EF94 4600503C */ c.lt.s $f10, $f0 -/* 02FB98 8002EF98 00000000 */ nop +/* 02FB98 8002EF98 00000000 */ nop /* 02FB9C 8002EF9C 45000014 */ bc1f .L8002EFF0 /* 02FBA0 8002EFA0 27AA00D0 */ addiu $t2, $sp, 0xd0 /* 02FBA4 8002EFA4 27AD00CC */ addiu $t5, $sp, 0xcc @@ -697,22 +697,22 @@ glabel func_8002E594 /* 02FBE0 8002EFE0 0C00C7D2 */ jal func_80031F48 /* 02FBE4 8002EFE4 3C0540C0 */ lui $a1, 0x40c0 /* 02FBE8 8002EFE8 44800000 */ mtc1 $zero, $f0 -/* 02FBEC 8002EFEC 00000000 */ nop +/* 02FBEC 8002EFEC 00000000 */ nop .L8002EFF0: /* 02FBF0 8002EFF0 C604011C */ lwc1 $f4, 0x11c($s0) /* 02FBF4 8002EFF4 E7A40074 */ swc1 $f4, 0x74($sp) /* 02FBF8 8002EFF8 C7A60074 */ lwc1 $f6, 0x74($sp) /* 02FBFC 8002EFFC 4606003E */ c.le.s $f0, $f6 -/* 02FC00 8002F000 00000000 */ nop +/* 02FC00 8002F000 00000000 */ nop /* 02FC04 8002F004 45000013 */ bc1f .L8002F054 -/* 02FC08 8002F008 00000000 */ nop +/* 02FC08 8002F008 00000000 */ nop /* 02FC0C 8002F00C C6080120 */ lwc1 $f8, 0x120($s0) /* 02FC10 8002F010 E7A80074 */ swc1 $f8, 0x74($sp) /* 02FC14 8002F014 C7AA0074 */ lwc1 $f10, 0x74($sp) /* 02FC18 8002F018 460A003E */ c.le.s $f0, $f10 -/* 02FC1C 8002F01C 00000000 */ nop +/* 02FC1C 8002F01C 00000000 */ nop /* 02FC20 8002F020 4500000C */ bc1f .L8002F054 -/* 02FC24 8002F024 00000000 */ nop +/* 02FC24 8002F024 00000000 */ nop /* 02FC28 8002F028 960E0046 */ lhu $t6, 0x46($s0) /* 02FC2C 8002F02C 96020256 */ lhu $v0, 0x256($s0) /* 02FC30 8002F030 31D9FFDF */ andi $t9, $t6, 0xffdf @@ -743,7 +743,7 @@ glabel func_8002E594 /* 02FC90 8002F090 44813000 */ mtc1 $at, $f6 /* 02FC94 8002F094 460A4102 */ mul.s $f4, $f8, $f10 /* 02FC98 8002F098 4604303E */ c.le.s $f6, $f4 -/* 02FC9C 8002F09C 00000000 */ nop +/* 02FC9C 8002F09C 00000000 */ nop /* 02FCA0 8002F0A0 4502000D */ bc1fl .L8002F0D8 /* 02FCA4 8002F0A4 8E0D00BC */ lw $t5, 0xbc($s0) /* 02FCA8 8002F0A8 860200CA */ lh $v0, 0xca($s0) @@ -786,8 +786,8 @@ glabel func_8002E594 /* 02FD2C 8002F12C E6000074 */ swc1 $f0, 0x74($s0) /* 02FD30 8002F130 33084000 */ andi $t0, $t8, 0x4000 /* 02FD34 8002F134 1501000F */ bne $t0, $at, .L8002F174 -/* 02FD38 8002F138 3C02800E */ lui $v0, %hi(D_800DC52C) # $v0, 0x800e -/* 02FD3C 8002F13C 8C42C52C */ lw $v0, %lo(D_800DC52C)($v0) +/* 02FD38 8002F138 3C02800E */ lui $v0, %hi(gActiveScreenMode) # $v0, 0x800e +/* 02FD3C 8002F13C 8C42C52C */ lw $v0, %lo(gActiveScreenMode)($v0) /* 02FD40 8002F140 24010002 */ li $at, 2 /* 02FD44 8002F144 02002025 */ move $a0, $s0 /* 02FD48 8002F148 10400005 */ beqz $v0, .L8002F160 @@ -836,7 +836,7 @@ glabel func_8002E594 /* 02FDE4 8002F1E4 44804000 */ mtc1 $zero, $f8 /* 02FDE8 8002F1E8 C606008C */ lwc1 $f6, 0x8c($s0) /* 02FDEC 8002F1EC 4608303E */ c.le.s $f6, $f8 -/* 02FDF0 8002F1F0 00000000 */ nop +/* 02FDF0 8002F1F0 00000000 */ nop /* 02FDF4 8002F1F4 45020009 */ bc1fl .L8002F21C /* 02FDF8 8002F1F8 24010400 */ li $at, 1024 /* 02FDFC 8002F1FC C60A0094 */ lwc1 $f10, 0x94($s0) @@ -844,7 +844,7 @@ glabel func_8002E594 /* 02FE04 8002F204 D428D888 */ ldc1 $f8, %lo(D_800ED888)($at) /* 02FE08 8002F208 46005121 */ cvt.d.s $f4, $f10 /* 02FE0C 8002F20C 4628203C */ c.lt.d $f4, $f8 -/* 02FE10 8002F210 00000000 */ nop +/* 02FE10 8002F210 00000000 */ nop /* 02FE14 8002F214 45010013 */ bc1t .L8002F264 .L8002F218: /* 02FE18 8002F218 24010400 */ li $at, 1024 @@ -854,7 +854,7 @@ glabel func_8002E594 /* 02FE24 8002F224 44803000 */ mtc1 $zero, $f6 /* 02FE28 8002F228 C60A008C */ lwc1 $f10, 0x8c($s0) /* 02FE2C 8002F22C 4606503E */ c.le.s $f10, $f6 -/* 02FE30 8002F230 00000000 */ nop +/* 02FE30 8002F230 00000000 */ nop /* 02FE34 8002F234 45020018 */ bc1fl .L8002F298 /* 02FE38 8002F238 C7A800D0 */ lwc1 $f8, 0xd0($sp) /* 02FE3C 8002F23C C6040094 */ lwc1 $f4, 0x94($s0) @@ -873,7 +873,7 @@ glabel func_8002E594 /* 02FE6C 8002F26C C7A00054 */ lwc1 $f0, 0x54($sp) /* 02FE70 8002F270 C7A2005C */ lwc1 $f2, 0x5c($sp) /* 02FE74 8002F274 460C0282 */ mul.s $f10, $f0, $f12 -/* 02FE78 8002F278 00000000 */ nop +/* 02FE78 8002F278 00000000 */ nop /* 02FE7C 8002F27C 460C1102 */ mul.s $f4, $f2, $f12 /* 02FE80 8002F280 46005000 */ add.s $f0, $f10, $f0 /* 02FE84 8002F284 46022080 */ add.s $f2, $f4, $f2 @@ -911,9 +911,9 @@ glabel func_8002E594 /* 02FEF8 8002F2F8 01AF1021 */ addu $v0, $t5, $t7 /* 02FEFC 8002F2FC C44C0000 */ lwc1 $f12, ($v0) /* 02FF00 8002F300 4602603C */ c.lt.s $f12, $f2 -/* 02FF04 8002F304 00000000 */ nop +/* 02FF04 8002F304 00000000 */ nop /* 02FF08 8002F308 4500000D */ bc1f .L8002F340 -/* 02FF0C 8002F30C 00000000 */ nop +/* 02FF0C 8002F30C 00000000 */ nop /* 02FF10 8002F310 46026003 */ div.s $f0, $f12, $f2 /* 02FF14 8002F314 C6080034 */ lwc1 $f8, 0x34($s0) /* 02FF18 8002F318 C60A0038 */ lwc1 $f10, 0x38($s0) @@ -933,4 +933,4 @@ glabel func_8002E594 /* 02FF4C 8002F34C 8FB00028 */ lw $s0, 0x28($sp) /* 02FF50 8002F350 27BD00F8 */ addiu $sp, $sp, 0xf8 /* 02FF54 8002F354 03E00008 */ jr $ra -/* 02FF58 8002F358 00000000 */ nop +/* 02FF58 8002F358 00000000 */ nop diff --git a/asm/non_matchings/code_80027D00/func_8002F730.s b/asm/non_matchings/code_80027D00/func_8002F730.s index 229c07690..ed84c5355 100644 --- a/asm/non_matchings/code_80027D00/func_8002F730.s +++ b/asm/non_matchings/code_80027D00/func_8002F730.s @@ -197,8 +197,8 @@ glabel func_8002F730 /* 030638 8002FA38 E6000074 */ swc1 $f0, 0x74($s0) /* 03063C 8002FA3C 316C4000 */ andi $t4, $t3, 0x4000 /* 030640 8002FA40 1581000F */ bne $t4, $at, .L8002FA80 -/* 030644 8002FA44 3C02800E */ lui $v0, %hi(D_800DC52C) # $v0, 0x800e -/* 030648 8002FA48 8C42C52C */ lw $v0, %lo(D_800DC52C)($v0) +/* 030644 8002FA44 3C02800E */ lui $v0, %hi(gActiveScreenMode) # $v0, 0x800e +/* 030648 8002FA48 8C42C52C */ lw $v0, %lo(gActiveScreenMode)($v0) /* 03064C 8002FA4C 24010002 */ li $at, 2 /* 030650 8002FA50 02002025 */ move $a0, $s0 /* 030654 8002FA54 10400005 */ beqz $v0, .L8002FA6C @@ -233,7 +233,7 @@ glabel func_8002F730 /* 0306B8 8002FAB8 C7AA0068 */ lwc1 $f10, 0x68($sp) /* 0306BC 8002FABC C7A6006C */ lwc1 $f6, 0x6c($sp) /* 0306C0 8002FAC0 460A5102 */ mul.s $f4, $f10, $f10 -/* 0306C4 8002FAC4 00000000 */ nop +/* 0306C4 8002FAC4 00000000 */ nop /* 0306C8 8002FAC8 46063202 */ mul.s $f8, $f6, $f6 /* 0306CC 8002FACC C7A60070 */ lwc1 $f6, 0x70($sp) /* 0306D0 8002FAD0 46082280 */ add.s $f10, $f4, $f8 @@ -247,7 +247,7 @@ glabel func_8002F730 /* 0306F0 8002FAF0 E6000094 */ swc1 $f0, 0x94($s0) /* 0306F4 8002FAF4 3C0C800E */ lui $t4, %hi(gKartTopSpeedTable) # $t4, 0x800e /* 0306F8 8002FAF8 4606103E */ c.le.s $f2, $f6 -/* 0306FC 8002FAFC 00000000 */ nop +/* 0306FC 8002FAFC 00000000 */ nop /* 030700 8002FB00 4502000A */ bc1fl .L8002FB2C /* 030704 8002FB04 44803000 */ mtc1 $zero, $f6 /* 030708 8002FB08 C6040094 */ lwc1 $f4, 0x94($s0) @@ -255,14 +255,14 @@ glabel func_8002F730 /* 030710 8002FB10 D428D8C0 */ ldc1 $f8, %lo(D_800ED8C0)($at) /* 030714 8002FB14 460022A1 */ cvt.d.s $f10, $f4 /* 030718 8002FB18 4628503C */ c.lt.d $f10, $f8 -/* 03071C 8002FB1C 00000000 */ nop +/* 03071C 8002FB1C 00000000 */ nop /* 030720 8002FB20 45030014 */ bc1tl .L8002FB74 /* 030724 8002FB24 3C01BF80 */ lui $at, 0xbf80 /* 030728 8002FB28 44803000 */ mtc1 $zero, $f6 .L8002FB2C: -/* 03072C 8002FB2C 00000000 */ nop +/* 03072C 8002FB2C 00000000 */ nop /* 030730 8002FB30 4606103E */ c.le.s $f2, $f6 -/* 030734 8002FB34 00000000 */ nop +/* 030734 8002FB34 00000000 */ nop /* 030738 8002FB38 4502001A */ bc1fl .L8002FBA4 /* 03073C 8002FB3C C7AA00CC */ lwc1 $f10, 0xcc($sp) /* 030740 8002FB40 C6040094 */ lwc1 $f4, 0x94($s0) @@ -270,7 +270,7 @@ glabel func_8002F730 /* 030748 8002FB48 D428D8C8 */ ldc1 $f8, %lo(D_800ED8C8)($at) /* 03074C 8002FB4C 460022A1 */ cvt.d.s $f10, $f4 /* 030750 8002FB50 4628503C */ c.lt.d $f10, $f8 -/* 030754 8002FB54 00000000 */ nop +/* 030754 8002FB54 00000000 */ nop /* 030758 8002FB58 45020012 */ bc1fl .L8002FBA4 /* 03075C 8002FB5C C7AA00CC */ lwc1 $f10, 0xcc($sp) /* 030760 8002FB60 8E0A00BC */ lw $t2, 0xbc($s0) @@ -283,7 +283,7 @@ glabel func_8002F730 /* 030778 8002FB78 C7A00068 */ lwc1 $f0, 0x68($sp) /* 03077C 8002FB7C C7A20070 */ lwc1 $f2, 0x70($sp) /* 030780 8002FB80 460C0182 */ mul.s $f6, $f0, $f12 -/* 030784 8002FB84 00000000 */ nop +/* 030784 8002FB84 00000000 */ nop /* 030788 8002FB88 460C1102 */ mul.s $f4, $f2, $f12 /* 03078C 8002FB8C 46003000 */ add.s $f0, $f6, $f0 /* 030790 8002FB90 46022080 */ add.s $f2, $f4, $f2 @@ -339,7 +339,7 @@ glabel func_8002F730 /* 03084C 8002FC4C 016C1021 */ addu $v0, $t3, $t4 /* 030850 8002FC50 C44C0000 */ lwc1 $f12, ($v0) /* 030854 8002FC54 4602603C */ c.lt.s $f12, $f2 -/* 030858 8002FC58 00000000 */ nop +/* 030858 8002FC58 00000000 */ nop /* 03085C 8002FC5C 4502000E */ bc1fl .L8002FC98 /* 030860 8002FC60 8FBF002C */ lw $ra, 0x2c($sp) /* 030864 8002FC64 46026003 */ div.s $f0, $f12, $f2 @@ -359,4 +359,4 @@ glabel func_8002F730 /* 030898 8002FC98 8FB00028 */ lw $s0, 0x28($sp) /* 03089C 8002FC9C 27BD0100 */ addiu $sp, $sp, 0x100 /* 0308A0 8002FCA0 03E00008 */ jr $ra -/* 0308A4 8002FCA4 00000000 */ nop +/* 0308A4 8002FCA4 00000000 */ nop diff --git a/asm/non_matchings/code_80027D00/func_800382DC.s b/asm/non_matchings/code_80027D00/func_800382DC.s index 062e8697f..96c0339d2 100644 --- a/asm/non_matchings/code_80027D00/func_800382DC.s +++ b/asm/non_matchings/code_80027D00/func_800382DC.s @@ -1,6 +1,6 @@ glabel func_800382DC -/* 038EDC 800382DC 3C02800E */ lui $v0, %hi(D_800DC52C) # $v0, 0x800e -/* 038EE0 800382E0 8C42C52C */ lw $v0, %lo(D_800DC52C)($v0) +/* 038EDC 800382DC 3C02800E */ lui $v0, %hi(gActiveScreenMode) # $v0, 0x800e +/* 038EE0 800382E0 8C42C52C */ lw $v0, %lo(gActiveScreenMode)($v0) /* 038EE4 800382E4 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 038EE8 800382E8 AFBF0014 */ sw $ra, 0x14($sp) /* 038EEC 800382EC 10400009 */ beqz $v0, .L80038314 diff --git a/asm/non_matchings/code_800393C0/func_8003C0F0.s b/asm/non_matchings/code_800393C0/func_8003C0F0.s index 6d676e1f6..cd89633fe 100644 --- a/asm/non_matchings/code_800393C0/func_8003C0F0.s +++ b/asm/non_matchings/code_800393C0/func_8003C0F0.s @@ -68,8 +68,8 @@ glabel L8003C1B4 /* 03CDE8 8003C1E8 01600008 */ jr $t3 /* 03CDEC 8003C1EC 00000000 */ nop glabel L8003C1F0 -/* 03CDF0 8003C1F0 3C02800E */ lui $v0, %hi(D_800DC52C) # $v0, 0x800e -/* 03CDF4 8003C1F4 8C42C52C */ lw $v0, %lo(D_800DC52C)($v0) +/* 03CDF0 8003C1F0 3C02800E */ lui $v0, %hi(gActiveScreenMode) # $v0, 0x800e +/* 03CDF4 8003C1F4 8C42C52C */ lw $v0, %lo(gActiveScreenMode)($v0) /* 03CDF8 8003C1F8 24010001 */ li $at, 1 /* 03CDFC 8003C1FC 3C03800E */ lui $v1, %hi(gModeSelection) # 0x800e /* 03CE00 8003C200 1040000B */ beqz $v0, .L8003C230 @@ -350,8 +350,8 @@ glabel L8003C1F0 /* 03D224 8003C624 100001CA */ b .L8003CD50 /* 03D228 8003C628 8C63C53C */ lw $v1, %lo(gModeSelection)($v1) glabel L8003C62C -/* 03D22C 8003C62C 3C02800E */ lui $v0, %hi(D_800DC52C) # $v0, 0x800e -/* 03D230 8003C630 8C42C52C */ lw $v0, %lo(D_800DC52C)($v0) +/* 03D22C 8003C62C 3C02800E */ lui $v0, %hi(gActiveScreenMode) # $v0, 0x800e +/* 03D230 8003C630 8C42C52C */ lw $v0, %lo(gActiveScreenMode)($v0) /* 03D234 8003C634 24010001 */ li $at, 1 /* 03D238 8003C638 24040002 */ li $a0, 2 /* 03D23C 8003C63C 10410007 */ beq $v0, $at, .L8003C65C @@ -427,8 +427,8 @@ glabel L8003C62C /* 03D344 8003C744 10000182 */ b .L8003CD50 /* 03D348 8003C748 8C63C53C */ lw $v1, %lo(gModeSelection)($v1) glabel L8003C74C -/* 03D34C 8003C74C 3C02800E */ lui $v0, %hi(D_800DC52C) # $v0, 0x800e -/* 03D350 8003C750 8C42C52C */ lw $v0, %lo(D_800DC52C)($v0) +/* 03D34C 8003C74C 3C02800E */ lui $v0, %hi(gActiveScreenMode) # $v0, 0x800e +/* 03D350 8003C750 8C42C52C */ lw $v0, %lo(gActiveScreenMode)($v0) /* 03D354 8003C754 24010001 */ li $at, 1 /* 03D358 8003C758 24040002 */ li $a0, 2 /* 03D35C 8003C75C 10410007 */ beq $v0, $at, .L8003C77C @@ -504,8 +504,8 @@ glabel L8003C74C /* 03D464 8003C864 1000013A */ b .L8003CD50 /* 03D468 8003C868 8C63C53C */ lw $v1, %lo(gModeSelection)($v1) glabel L8003C86C -/* 03D46C 8003C86C 3C02800E */ lui $v0, %hi(D_800DC52C) # $v0, 0x800e -/* 03D470 8003C870 8C42C52C */ lw $v0, %lo(D_800DC52C)($v0) +/* 03D46C 8003C86C 3C02800E */ lui $v0, %hi(gActiveScreenMode) # $v0, 0x800e +/* 03D470 8003C870 8C42C52C */ lw $v0, %lo(gActiveScreenMode)($v0) /* 03D474 8003C874 24010001 */ li $at, 1 /* 03D478 8003C878 24040002 */ li $a0, 2 /* 03D47C 8003C87C 10410007 */ beq $v0, $at, .L8003C89C @@ -581,8 +581,8 @@ glabel L8003C86C /* 03D584 8003C984 100000F2 */ b .L8003CD50 /* 03D588 8003C988 8C63C53C */ lw $v1, %lo(gModeSelection)($v1) glabel L8003C98C -/* 03D58C 8003C98C 3C02800E */ lui $v0, %hi(D_800DC52C) # $v0, 0x800e -/* 03D590 8003C990 8C42C52C */ lw $v0, %lo(D_800DC52C)($v0) +/* 03D58C 8003C98C 3C02800E */ lui $v0, %hi(gActiveScreenMode) # $v0, 0x800e +/* 03D590 8003C990 8C42C52C */ lw $v0, %lo(gActiveScreenMode)($v0) /* 03D594 8003C994 24010001 */ li $at, 1 /* 03D598 8003C998 24040002 */ li $a0, 2 /* 03D59C 8003C99C 10410007 */ beq $v0, $at, .L8003C9BC diff --git a/asm/non_matchings/code_800393C0/func_8003D080.s b/asm/non_matchings/code_800393C0/func_8003D080.s index dbc917a52..729ccd282 100644 --- a/asm/non_matchings/code_800393C0/func_8003D080.s +++ b/asm/non_matchings/code_800393C0/func_8003D080.s @@ -18,11 +18,11 @@ glabel func_8003D080 .L8003D0BC: /* 03DCBC 8003D0BC 3C0F800E */ lui $t7, %hi(D_800DC51C) # $t7, 0x800e /* 03DCC0 8003D0C0 95EFC51C */ lhu $t7, %lo(D_800DC51C)($t7) -/* 03DCC4 8003D0C4 3C02800E */ lui $v0, %hi(D_800DC52C) # 0x800e +/* 03DCC4 8003D0C4 3C02800E */ lui $v0, %hi(gActiveScreenMode) # 0x800e /* 03DCC8 8003D0C8 15E00117 */ bnez $t7, .L8003D528 /* 03DCCC 8003D0CC 00000000 */ nop -/* 03DCD0 8003D0D0 3C02800E */ lui $v0, %hi(D_800DC52C) # $v0, 0x800e -/* 03DCD4 8003D0D4 8C42C52C */ lw $v0, %lo(D_800DC52C)($v0) +/* 03DCD0 8003D0D0 3C02800E */ lui $v0, %hi(gActiveScreenMode) # $v0, 0x800e +/* 03DCD4 8003D0D4 8C42C52C */ lw $v0, %lo(gActiveScreenMode)($v0) /* 03DCD8 8003D0D8 24010001 */ li $at, 1 /* 03DCDC 8003D0DC 10400009 */ beqz $v0, .L8003D104 /* 03DCE0 8003D0E0 00000000 */ nop @@ -110,9 +110,9 @@ glabel func_8003D080 /* 03DE14 8003D214 0C007134 */ jal func_8001C4D0 /* 03DE18 8003D218 AFA00014 */ sw $zero, 0x14($sp) .L8003D21C: -/* 03DE1C 8003D21C 3C02800E */ lui $v0, %hi(D_800DC52C) # $v0, 0x800e +/* 03DE1C 8003D21C 3C02800E */ lui $v0, %hi(gActiveScreenMode) # $v0, 0x800e /* 03DE20 8003D220 10000125 */ b .L8003D6B8 -/* 03DE24 8003D224 8C42C52C */ lw $v0, %lo(D_800DC52C)($v0) +/* 03DE24 8003D224 8C42C52C */ lw $v0, %lo(gActiveScreenMode)($v0) .L8003D228: /* 03DE28 8003D228 3C02800E */ lui $v0, %hi(gModeSelection) # $v0, 0x800e /* 03DE2C 8003D22C 8C42C53C */ lw $v0, %lo(gModeSelection)($v0) @@ -197,9 +197,9 @@ glabel func_8003D080 /* 03DF5C 8003D35C 0C007134 */ jal func_8001C4D0 /* 03DF60 8003D360 AFA80010 */ sw $t0, 0x10($sp) .L8003D364: -/* 03DF64 8003D364 3C02800E */ lui $v0, %hi(D_800DC52C) # $v0, 0x800e +/* 03DF64 8003D364 3C02800E */ lui $v0, %hi(gActiveScreenMode) # $v0, 0x800e /* 03DF68 8003D368 100000D3 */ b .L8003D6B8 -/* 03DF6C 8003D36C 8C42C52C */ lw $v0, %lo(D_800DC52C)($v0) +/* 03DF6C 8003D36C 8C42C52C */ lw $v0, %lo(gActiveScreenMode)($v0) .L8003D370: /* 03DF70 8003D370 8D4AC53C */ lw $t2, %lo(gModeSelection)($t2) # -0x3ac4($t2) /* 03DF74 8003D374 24010003 */ li $at, 3 @@ -310,11 +310,11 @@ glabel func_8003D080 /* 03E114 8003D514 0C007134 */ jal func_8001C4D0 /* 03E118 8003D518 AFAF0010 */ sw $t7, 0x10($sp) .L8003D51C: -/* 03E11C 8003D51C 3C02800E */ lui $v0, %hi(D_800DC52C) # $v0, 0x800e +/* 03E11C 8003D51C 3C02800E */ lui $v0, %hi(gActiveScreenMode) # $v0, 0x800e /* 03E120 8003D520 10000065 */ b .L8003D6B8 -/* 03E124 8003D524 8C42C52C */ lw $v0, %lo(D_800DC52C)($v0) +/* 03E124 8003D524 8C42C52C */ lw $v0, %lo(gActiveScreenMode)($v0) .L8003D528: -/* 03E128 8003D528 8C42C52C */ lw $v0, %lo(D_800DC52C)($v0) # -0x3ad4($v0) +/* 03E128 8003D528 8C42C52C */ lw $v0, %lo(gActiveScreenMode)($v0) # -0x3ad4($v0) /* 03E12C 8003D52C 3C01800F */ lui $at, %hi(gPlayers+0x14) # $at, 0x800f /* 03E130 8003D530 3C06800F */ lui $a2, %hi(gPlayers+0x1C) # 0x800f /* 03E134 8003D534 1040000B */ beqz $v0, .L8003D564 @@ -339,9 +339,9 @@ glabel func_8003D080 /* 03E17C 8003D57C 84E769BE */ lh $a3, %lo(gPlayers+0x2E)($a3) /* 03E180 8003D580 0C007134 */ jal func_8001C4D0 /* 03E184 8003D584 AFA00014 */ sw $zero, 0x14($sp) -/* 03E188 8003D588 3C02800E */ lui $v0, %hi(D_800DC52C) # $v0, 0x800e +/* 03E188 8003D588 3C02800E */ lui $v0, %hi(gActiveScreenMode) # $v0, 0x800e /* 03E18C 8003D58C 1000004A */ b .L8003D6B8 -/* 03E190 8003D590 8C42C52C */ lw $v0, %lo(D_800DC52C)($v0) +/* 03E190 8003D590 8C42C52C */ lw $v0, %lo(gActiveScreenMode)($v0) .L8003D594: /* 03E194 8003D594 3C01800F */ lui $at, %hi(gPlayers+0x14) # $at, 0x800f /* 03E198 8003D598 C42C69A4 */ lwc1 $f12, %lo(gPlayers+0x14)($at) @@ -365,9 +365,9 @@ glabel func_8003D080 /* 03E1E0 8003D5E0 AFAA0014 */ sw $t2, 0x14($sp) /* 03E1E4 8003D5E4 0C007134 */ jal func_8001C4D0 /* 03E1E8 8003D5E8 AFA90010 */ sw $t1, 0x10($sp) -/* 03E1EC 8003D5EC 3C02800E */ lui $v0, %hi(D_800DC52C) # $v0, 0x800e +/* 03E1EC 8003D5EC 3C02800E */ lui $v0, %hi(gActiveScreenMode) # $v0, 0x800e /* 03E1F0 8003D5F0 10000031 */ b .L8003D6B8 -/* 03E1F4 8003D5F4 8C42C52C */ lw $v0, %lo(D_800DC52C)($v0) +/* 03E1F4 8003D5F4 8C42C52C */ lw $v0, %lo(gActiveScreenMode)($v0) .L8003D5F8: /* 03E1F8 8003D5F8 3C01800F */ lui $at, %hi(gPlayers+0x14) # $at, 0x800f /* 03E1FC 8003D5FC C42C69A4 */ lwc1 $f12, %lo(gPlayers+0x14)($at) @@ -415,8 +415,8 @@ glabel func_8003D080 /* 03E2A4 8003D6A4 AFB80010 */ sw $t8, 0x10($sp) /* 03E2A8 8003D6A8 0C007134 */ jal func_8001C4D0 /* 03E2AC 8003D6AC 24420DD8 */ addiu $v0, $v0, 0xdd8 -/* 03E2B0 8003D6B0 3C02800E */ lui $v0, %hi(D_800DC52C) # $v0, 0x800e -/* 03E2B4 8003D6B4 8C42C52C */ lw $v0, %lo(D_800DC52C)($v0) +/* 03E2B0 8003D6B0 3C02800E */ lui $v0, %hi(gActiveScreenMode) # $v0, 0x800e +/* 03E2B4 8003D6B4 8C42C52C */ lw $v0, %lo(gActiveScreenMode)($v0) .L8003D6B8: /* 03E2B8 8003D6B8 1040000B */ beqz $v0, .L8003D6E8 /* 03E2BC 8003D6BC 3C04800E */ lui $a0, %hi(gPlayerOneCopy) # 0x800e diff --git a/asm/non_matchings/code_80040E50/func_80041D34.s b/asm/non_matchings/code_80040E50/func_80041D34.s index 63832f54e..1e8b1ea63 100644 --- a/asm/non_matchings/code_80040E50/func_80041D34.s +++ b/asm/non_matchings/code_80040E50/func_80041D34.s @@ -25,8 +25,8 @@ glabel func_80041D34 /* 042990 80041D90 3C01BF80 */ li $at, 0xBF800000 # -1.000000 /* 042994 80041D94 44816000 */ mtc1 $at, $f12 /* 042998 80041D98 3C0143A0 */ li $at, 0x43A00000 # 320.000000 -/* 04299C 80041D9C 3C02800E */ lui $v0, %hi(D_800DC52C) # $v0, 0x800e -/* 0429A0 80041DA0 8C42C52C */ lw $v0, %lo(D_800DC52C)($v0) +/* 04299C 80041D9C 3C02800E */ lui $v0, %hi(gActiveScreenMode) # $v0, 0x800e +/* 0429A0 80041DA0 8C42C52C */ lw $v0, %lo(gActiveScreenMode)($v0) /* 0429A4 80041DA4 44817000 */ mtc1 $at, $f14 /* 0429A8 80041DA8 3C014370 */ li $at, 0x43700000 # 240.000000 /* 0429AC 80041DAC 44818000 */ mtc1 $at, $f16 @@ -75,7 +75,7 @@ glabel func_80041D34 /* 042A4C 80041E4C 3C0742F0 */ lui $a3, 0x42f0 /* 042A50 80041E50 3C048015 */ lui $a0, %hi(gGfxPool) # 0x8015 /* 042A54 80041E54 15C0000D */ bnez $t6, .L80041E8C -/* 042A58 80041E58 00000000 */ nop +/* 042A58 80041E58 00000000 */ nop /* 042A5C 80041E5C 3C048015 */ lui $a0, %hi(gGfxPool) # $a0, 0x8015 /* 042A60 80041E60 8C84EF40 */ lw $a0, %lo(gGfxPool)($a0) /* 042A64 80041E64 44050000 */ mfc1 $a1, $f0 @@ -116,4 +116,4 @@ glabel func_80041D34 .L80041EE8: /* 042AE8 80041EE8 27BD0028 */ addiu $sp, $sp, 0x28 /* 042AEC 80041EEC 03E00008 */ jr $ra -/* 042AF0 80041EF0 00000000 */ nop +/* 042AF0 80041EF0 00000000 */ nop diff --git a/asm/non_matchings/code_800431B0/func_800514BC.s b/asm/non_matchings/code_800431B0/func_800514BC.s index 308935ab6..ac62b5157 100644 --- a/asm/non_matchings/code_800431B0/func_800514BC.s +++ b/asm/non_matchings/code_800431B0/func_800514BC.s @@ -22,8 +22,8 @@ glabel func_800514BC /* 052108 80051508 24130008 */ li $s3, 8 /* 05210C 8005150C 144F0006 */ bne $v0, $t7, .L80051528 /* 052110 80051510 00008825 */ move $s1, $zero -/* 052114 80051514 3C18800E */ lui $t8, %hi(D_800DC52C) # $t8, 0x800e -/* 052118 80051518 8F18C52C */ lw $t8, %lo(D_800DC52C)($t8) +/* 052114 80051514 3C18800E */ lui $t8, %hi(gActiveScreenMode) # $t8, 0x800e +/* 052118 80051518 8F18C52C */ lw $t8, %lo(gActiveScreenMode)($t8) /* 05211C 8005151C 14580002 */ bne $v0, $t8, .L80051528 /* 052120 80051520 00000000 */ nop /* 052124 80051524 00009825 */ move $s3, $zero diff --git a/asm/non_matchings/code_80057C60/func_8006AFD0.s b/asm/non_matchings/code_80057C60/func_8006AFD0.s index 2c90871cb..d32806312 100644 --- a/asm/non_matchings/code_80057C60/func_8006AFD0.s +++ b/asm/non_matchings/code_80057C60/func_8006AFD0.s @@ -107,8 +107,8 @@ glabel func_8006AFD0 /* 06BD6C 8006B16C 03381021 */ addu $v0, $t9, $t8 /* 06BD70 8006B170 C44E0000 */ lwc1 $f14, ($v0) /* 06BD74 8006B174 C44C0008 */ lwc1 $f12, 8($v0) -/* 06BD78 8006B178 3C0E800E */ lui $t6, %hi(D_800DC52C) # $t6, 0x800e -/* 06BD7C 8006B17C 8DCEC52C */ lw $t6, %lo(D_800DC52C)($t6) +/* 06BD78 8006B178 3C0E800E */ lui $t6, %hi(gActiveScreenMode) # $t6, 0x800e +/* 06BD7C 8006B17C 8DCEC52C */ lw $t6, %lo(gActiveScreenMode)($t6) /* 06BD80 8006B180 460E9501 */ sub.s $f20, $f18, $f14 /* 06BD84 8006B184 24010003 */ li $at, 3 /* 06BD88 8006B188 11C1000B */ beq $t6, $at, .L8006B1B8 @@ -139,9 +139,9 @@ glabel func_8006AFD0 /* 06BDE4 8006B1E4 4600A021 */ cvt.d.s $f0, $f20 /* 06BDE8 8006B1E8 3C01800F */ lui $at, %hi(D_800EE850) # $at, 0x800f /* 06BDEC 8006B1EC 4620803E */ c.le.d $f16, $f0 -/* 06BDF0 8006B1F0 00000000 */ nop +/* 06BDF0 8006B1F0 00000000 */ nop /* 06BDF4 8006B1F4 45000003 */ bc1f .L8006B204 -/* 06BDF8 8006B1F8 00000000 */ nop +/* 06BDF8 8006B1F8 00000000 */ nop /* 06BDFC 8006B1FC C434E850 */ lwc1 $f20, %lo(D_800EE850)($at) /* 06BE00 8006B200 4600A021 */ cvt.d.s $f0, $f20 .L8006B204: @@ -149,7 +149,7 @@ glabel func_8006AFD0 /* 06BE08 8006B208 D432E858 */ ldc1 $f18, %lo(D_800EE858)($at) /* 06BE0C 8006B20C 3C01800F */ lui $at, %hi(D_800EE860) # $at, 0x800f /* 06BE10 8006B210 4632003E */ c.le.d $f0, $f18 -/* 06BE14 8006B214 00000000 */ nop +/* 06BE14 8006B214 00000000 */ nop /* 06BE18 8006B218 45020003 */ bc1fl .L8006B228 /* 06BE1C 8006B21C 87A2018A */ lh $v0, 0x18a($sp) /* 06BE20 8006B220 C434E860 */ lwc1 $f20, %lo(D_800EE860)($at) @@ -205,7 +205,7 @@ glabel func_8006AFD0 /* 06BEE0 8006B2E0 46009107 */ neg.s $f4, $f18 /* 06BEE4 8006B2E4 4600218D */ trunc.w.s $f6, $f4 /* 06BEE8 8006B2E8 44183000 */ mfc1 $t8, $f6 -/* 06BEEC 8006B2EC 00000000 */ nop +/* 06BEEC 8006B2EC 00000000 */ nop /* 06BEF0 8006B2F0 A7B8012C */ sh $t8, 0x12c($sp) /* 06BEF4 8006B2F4 85CF0048 */ lh $t7, 0x48($t6) /* 06BEF8 8006B2F8 AFA3003C */ sw $v1, 0x3c($sp) diff --git a/asm/non_matchings/code_80057C60/func_8006CEC0.s b/asm/non_matchings/code_80057C60/func_8006CEC0.s index bb586e7a1..9a8ef3744 100644 --- a/asm/non_matchings/code_80057C60/func_8006CEC0.s +++ b/asm/non_matchings/code_80057C60/func_8006CEC0.s @@ -29,7 +29,7 @@ glabel func_8006CEC0 /* 06DB28 8006CF28 002A0821 */ addu $at, $at, $t2 /* 06DB2C 8006CF2C 8C2AE8B4 */ lw $t2, %lo(jpt_800EE8B4)($at) /* 06DB30 8006CF30 01400008 */ jr $t2 -/* 06DB34 8006CF34 00000000 */ nop +/* 06DB34 8006CF34 00000000 */ nop glabel L8006CF38 /* 06DB38 8006CF38 83A60033 */ lb $a2, 0x33($sp) /* 06DB3C 8006CF3C 0C018B1D */ jal func_80062C74 @@ -115,7 +115,7 @@ glabel L8006CF88 /* 06DC5C 8006D05C 15800003 */ bnez $t4, .L8006D06C /* 06DC60 8006D060 304D0001 */ andi $t5, $v0, 1 /* 06DC64 8006D064 11A00008 */ beqz $t5, .L8006D088 -/* 06DC68 8006D068 00000000 */ nop +/* 06DC68 8006D068 00000000 */ nop .L8006D06C: /* 06DC6C 8006D06C 83AE0037 */ lb $t6, 0x37($sp) /* 06DC70 8006D070 8FA60020 */ lw $a2, 0x20($sp) @@ -125,8 +125,8 @@ glabel L8006CF88 /* 06DC80 8006D080 10000041 */ b .L8006D188 /* 06DC84 8006D084 8FBF001C */ lw $ra, 0x1c($sp) .L8006D088: -/* 06DC88 8006D088 3C02800E */ lui $v0, %hi(D_800DC52C) # $v0, 0x800e -/* 06DC8C 8006D08C 8C42C52C */ lw $v0, %lo(D_800DC52C)($v0) +/* 06DC88 8006D088 3C02800E */ lui $v0, %hi(gActiveScreenMode) # $v0, 0x800e +/* 06DC8C 8006D08C 8C42C52C */ lw $v0, %lo(gActiveScreenMode)($v0) /* 06DC90 8006D090 5040000A */ beql $v0, $zero, .L8006D0BC /* 06DC94 8006D094 3C020400 */ lui $v0, 0x400 /* 06DC98 8006D098 10470021 */ beq $v0, $a3, .L8006D120 @@ -134,7 +134,7 @@ glabel L8006CF88 /* 06DCA0 8006D0A0 1041001F */ beq $v0, $at, .L8006D120 /* 06DCA4 8006D0A4 24010003 */ li $at, 3 /* 06DCA8 8006D0A8 1041001D */ beq $v0, $at, .L8006D120 -/* 06DCAC 8006D0AC 00000000 */ nop +/* 06DCAC 8006D0AC 00000000 */ nop /* 06DCB0 8006D0B0 10000035 */ b .L8006D188 /* 06DCB4 8006D0B4 8FBF001C */ lw $ra, 0x1c($sp) /* 06DCB8 8006D0B8 3C020400 */ lui $v0, 0x400 @@ -196,4 +196,4 @@ glabel L8006D184 .L8006D188: /* 06DD88 8006D188 27BD0028 */ addiu $sp, $sp, 0x28 /* 06DD8C 8006D18C 03E00008 */ jr $ra -/* 06DD90 8006D190 00000000 */ nop +/* 06DD90 8006D190 00000000 */ nop diff --git a/asm/non_matchings/code_80057C60/func_8006D474.s b/asm/non_matchings/code_80057C60/func_8006D474.s index 1e9399e7c..b406d3ef0 100644 --- a/asm/non_matchings/code_80057C60/func_8006D474.s +++ b/asm/non_matchings/code_80057C60/func_8006D474.s @@ -24,8 +24,8 @@ glabel func_8006D474 /* 06E0CC 8006D4CC 00809825 */ move $s3, $a0 /* 06E0D0 8006D4D0 144A01C3 */ bne $v0, $t2, .L8006DBE0 /* 06E0D4 8006D4D4 01E08025 */ move $s0, $t7 -/* 06E0D8 8006D4D8 3C14800E */ lui $s4, %hi(D_800DC52C) # $s4, 0x800e -/* 06E0DC 8006D4DC 2694C52C */ addiu $s4, %lo(D_800DC52C) # addiu $s4, $s4, -0x3ad4 +/* 06E0D8 8006D4D8 3C14800E */ lui $s4, %hi(gActiveScreenMode) # $s4, 0x800e +/* 06E0DC 8006D4DC 2694C52C */ addiu $s4, %lo(gActiveScreenMode) # addiu $s4, $s4, -0x3ad4 /* 06E0E0 8006D4E0 00009025 */ move $s2, $zero /* 06E0E4 8006D4E4 24160003 */ li $s6, 3 /* 06E0E8 8006D4E8 001258C0 */ sll $t3, $s2, 3 @@ -75,7 +75,7 @@ glabel func_8006D474 /* 06E18C 8006D58C 8E890000 */ lw $t1, ($s4) .L8006D590: /* 06E190 8006D590 16C9000F */ bne $s6, $t1, .L8006D5D0 -/* 06E194 8006D594 00000000 */ nop +/* 06E194 8006D594 00000000 */ nop /* 06E198 8006D598 16110019 */ bne $s0, $s1, .L8006D600 /* 06E19C 8006D59C 02602025 */ move $a0, $s3 /* 06E1A0 8006D5A0 00112E00 */ sll $a1, $s1, 0x18 @@ -114,7 +114,7 @@ glabel func_8006D474 /* 06E218 8006D618 00280821 */ addu $at, $at, $t0 /* 06E21C 8006D61C 8C28E8E4 */ lw $t0, %lo(jpt_800EE8E4)($at) /* 06E220 8006D620 01000008 */ jr $t0 -/* 06E224 8006D624 00000000 */ nop +/* 06E224 8006D624 00000000 */ nop glabel L8006D628 /* 06E228 8006D628 8E990000 */ lw $t9, ($s4) /* 06E22C 8006D62C 00112E00 */ sll $a1, $s1, 0x18 @@ -376,7 +376,7 @@ glabel L8006D964 /* 06E5E8 8006D9E8 002F0821 */ addu $at, $at, $t7 /* 06E5EC 8006D9EC 8C2FE908 */ lw $t7, %lo(jpt_800EE908)($at) /* 06E5F0 8006D9F0 01E00008 */ jr $t7 -/* 06E5F4 8006D9F4 00000000 */ nop +/* 06E5F4 8006D9F4 00000000 */ nop glabel L8006D9F8 /* 06E5F8 8006D9F8 8E980000 */ lw $t8, ($s4) /* 06E5FC 8006D9FC 00112E00 */ sll $a1, $s1, 0x18 @@ -473,7 +473,7 @@ glabel L8006DAE0 glabel L8006DB54 /* 06E754 8006DB54 8E880000 */ lw $t0, ($s4) /* 06E758 8006DB58 16C8000F */ bne $s6, $t0, .L8006DB98 -/* 06E75C 8006DB5C 00000000 */ nop +/* 06E75C 8006DB5C 00000000 */ nop /* 06E760 8006DB60 16110019 */ bne $s0, $s1, .L8006DBC8 /* 06E764 8006DB64 02602025 */ move $a0, $s3 /* 06E768 8006DB68 00112E00 */ sll $a1, $s1, 0x18 diff --git a/asm/non_matchings/code_80057C60/func_8006DD3C.s b/asm/non_matchings/code_80057C60/func_8006DD3C.s index 9acf09d55..563bb66c2 100644 --- a/asm/non_matchings/code_80057C60/func_8006DD3C.s +++ b/asm/non_matchings/code_80057C60/func_8006DD3C.s @@ -24,8 +24,8 @@ glabel func_8006DD3C /* 06E994 8006DD94 01E09825 */ move $s3, $t7 /* 06E998 8006DD98 144900A4 */ bne $v0, $t1, .L8006E02C /* 06E99C 8006DD9C 00809025 */ move $s2, $a0 -/* 06E9A0 8006DDA0 3C16800E */ lui $s6, %hi(D_800DC52C) # $s6, 0x800e -/* 06E9A4 8006DDA4 26D6C52C */ addiu $s6, %lo(D_800DC52C) # addiu $s6, $s6, -0x3ad4 +/* 06E9A0 8006DDA0 3C16800E */ lui $s6, %hi(gActiveScreenMode) # $s6, 0x800e +/* 06E9A4 8006DDA4 26D6C52C */ addiu $s6, %lo(gActiveScreenMode) # addiu $s6, $s6, -0x3ad4 /* 06E9A8 8006DDA8 00008025 */ move $s0, $zero /* 06E9AC 8006DDAC 24170005 */ li $s7, 5 /* 06E9B0 8006DDB0 24150048 */ li $s5, 72 @@ -87,7 +87,7 @@ glabel func_8006DD3C /* 06EA7C 8006DE7C 000C8403 */ sra $s0, $t4, 0x10 /* 06EA80 8006DE80 2A01000A */ slti $at, $s0, 0xa /* 06EA84 8006DE84 1420FFCC */ bnez $at, .L8006DDB8 -/* 06EA88 8006DE88 00000000 */ nop +/* 06EA88 8006DE88 00000000 */ nop /* 06EA8C 8006DE8C 964E0000 */ lhu $t6, ($s2) /* 06EA90 8006DE90 24014000 */ li $at, 16384 /* 06EA94 8006DE94 31CF4000 */ andi $t7, $t6, 0x4000 @@ -104,7 +104,7 @@ glabel func_8006DD3C /* 06EAC0 8006DEC0 00380821 */ addu $at, $at, $t8 /* 06EAC4 8006DEC4 8C38E934 */ lw $t8, %lo(jpt_800EE934)($at) /* 06EAC8 8006DEC8 03000008 */ jr $t8 -/* 06EACC 8006DECC 00000000 */ nop +/* 06EACC 8006DECC 00000000 */ nop glabel L8006DED0 /* 06EAD0 8006DED0 00112E00 */ sll $a1, $s1, 0x18 /* 06EAD4 8006DED4 00133E00 */ sll $a3, $s3, 0x18 diff --git a/asm/non_matchings/code_80057C60/func_8006E058.s b/asm/non_matchings/code_80057C60/func_8006E058.s index 6a2f3171d..186b184ab 100644 --- a/asm/non_matchings/code_80057C60/func_8006E058.s +++ b/asm/non_matchings/code_80057C60/func_8006E058.s @@ -1,6 +1,6 @@ glabel func_8006E058 -/* 06EC58 8006E058 3C02800E */ lui $v0, %hi(D_800DC52C) # $v0, 0x800e -/* 06EC5C 8006E05C 8C42C52C */ lw $v0, %lo(D_800DC52C)($v0) +/* 06EC58 8006E058 3C02800E */ lui $v0, %hi(gActiveScreenMode) # $v0, 0x800e +/* 06EC5C 8006E05C 8C42C52C */ lw $v0, %lo(gActiveScreenMode)($v0) /* 06EC60 8006E060 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 06EC64 8006E064 AFBF0014 */ sw $ra, 0x14($sp) /* 06EC68 8006E068 1040000B */ beqz $v0, .L8006E098 diff --git a/asm/non_matchings/code_80071F00/func_8007B34C.s b/asm/non_matchings/code_80071F00/func_8007B34C.s index ad280e129..2d56b0b67 100644 --- a/asm/non_matchings/code_80071F00/func_8007B34C.s +++ b/asm/non_matchings/code_80071F00/func_8007B34C.s @@ -60,8 +60,8 @@ glabel L8007B41C /* 07C028 8007B428 1000015C */ b .L8007B99C /* 07C02C 8007B42C 02002025 */ move $a0, $s0 glabel L8007B430 -/* 07C030 8007B430 3C02800E */ lui $v0, %hi(D_800DC52C) # $v0, 0x800e -/* 07C034 8007B434 8C42C52C */ lw $v0, %lo(D_800DC52C)($v0) +/* 07C030 8007B430 3C02800E */ lui $v0, %hi(gActiveScreenMode) # $v0, 0x800e +/* 07C034 8007B434 8C42C52C */ lw $v0, %lo(gActiveScreenMode)($v0) /* 07C038 8007B438 8FA90048 */ lw $t1, 0x48($sp) /* 07C03C 8007B43C 24010003 */ li $at, 3 /* 07C040 8007B440 14400014 */ bnez $v0, .L8007B494 @@ -246,8 +246,8 @@ glabel L8007B6D4 /* 07C2E0 8007B6E0 100000AE */ b .L8007B99C /* 07C2E4 8007B6E4 02002025 */ move $a0, $s0 glabel L8007B6E8 -/* 07C2E8 8007B6E8 3C02800E */ lui $v0, %hi(D_800DC52C) # $v0, 0x800e -/* 07C2EC 8007B6EC 8C42C52C */ lw $v0, %lo(D_800DC52C)($v0) +/* 07C2E8 8007B6E8 3C02800E */ lui $v0, %hi(gActiveScreenMode) # $v0, 0x800e +/* 07C2EC 8007B6EC 8C42C52C */ lw $v0, %lo(gActiveScreenMode)($v0) /* 07C2F0 8007B6F0 8FAE0048 */ lw $t6, 0x48($sp) /* 07C2F4 8007B6F4 24010003 */ li $at, 3 /* 07C2F8 8007B6F8 14400010 */ bnez $v0, .L8007B73C diff --git a/asm/non_matchings/code_8028DF00/func_8028F588.s b/asm/non_matchings/code_8028DF00/func_8028F588.s index ff74c4673..47d28cd8c 100644 --- a/asm/non_matchings/code_8028DF00/func_8028F588.s +++ b/asm/non_matchings/code_8028DF00/func_8028F588.s @@ -1,6 +1,6 @@ glabel func_8028F588 -/* 0F8B98 8028F588 3C02800E */ lui $v0, %hi(D_800DC52C) # $v0, 0x800e -/* 0F8B9C 8028F58C 8C42C52C */ lw $v0, %lo(D_800DC52C)($v0) +/* 0F8B98 8028F588 3C02800E */ lui $v0, %hi(gActiveScreenMode) # $v0, 0x800e +/* 0F8B9C 8028F58C 8C42C52C */ lw $v0, %lo(gActiveScreenMode)($v0) /* 0F8BA0 8028F590 3C03802C */ lui $v1, %hi(D_802BA034) # $v1, 0x802c /* 0F8BA4 8028F594 2463A034 */ addiu $v1, %lo(D_802BA034) # addiu $v1, $v1, -0x5fcc /* 0F8BA8 8028F598 1040000A */ beqz $v0, .L8028F5C4 @@ -11,9 +11,9 @@ glabel func_8028F588 /* 0F8BBC 8028F5AC 10410023 */ beq $v0, $at, .L8028F63C /* 0F8BC0 8028F5B0 24010003 */ li $at, 3 /* 0F8BC4 8028F5B4 10410083 */ beq $v0, $at, .L8028F7C4 -/* 0F8BC8 8028F5B8 00000000 */ nop +/* 0F8BC8 8028F5B8 00000000 */ nop /* 0F8BCC 8028F5BC 03E00008 */ jr $ra -/* 0F8BD0 8028F5C0 00000000 */ nop +/* 0F8BD0 8028F5C0 00000000 */ nop .L8028F5C4: /* 0F8BD4 8028F5C4 44812000 */ mtc1 $at, $f4 @@ -23,7 +23,7 @@ glabel func_8028F588 /* 0F8BE4 8028F5D4 46062202 */ mul.s $f8, $f4, $f6 /* 0F8BE8 8028F5D8 4600428D */ trunc.w.s $f10, $f8 /* 0F8BEC 8028F5DC 44025000 */ mfc1 $v0, $f10 -/* 0F8BF0 8028F5E0 00000000 */ nop +/* 0F8BF0 8028F5E0 00000000 */ nop /* 0F8BF4 8028F5E4 00027C00 */ sll $t7, $v0, 0x10 /* 0F8BF8 8028F5E8 000F1403 */ sra $v0, $t7, 0x10 /* 0F8BFC 8028F5EC 04430003 */ bgezl $v0, .L8028F5FC @@ -38,7 +38,7 @@ glabel func_8028F588 /* 0F8C1C 8028F60C 46128102 */ mul.s $f4, $f16, $f18 /* 0F8C20 8028F610 4600218D */ trunc.w.s $f6, $f4 /* 0F8C24 8028F614 44023000 */ mfc1 $v0, $f6 -/* 0F8C28 8028F618 00000000 */ nop +/* 0F8C28 8028F618 00000000 */ nop /* 0F8C2C 8028F61C 00024C00 */ sll $t1, $v0, 0x10 /* 0F8C30 8028F620 00091403 */ sra $v0, $t1, 0x10 /* 0F8C34 8028F624 04430003 */ bgezl $v0, .L8028F634 @@ -60,7 +60,7 @@ glabel func_8028F588 /* 0F8C68 8028F658 460A4402 */ mul.s $f16, $f8, $f10 /* 0F8C6C 8028F65C 4600848D */ trunc.w.s $f18, $f16 /* 0F8C70 8028F660 44029000 */ mfc1 $v0, $f18 -/* 0F8C74 8028F664 00000000 */ nop +/* 0F8C74 8028F664 00000000 */ nop /* 0F8C78 8028F668 00026C00 */ sll $t5, $v0, 0x10 /* 0F8C7C 8028F66C 000D1403 */ sra $v0, $t5, 0x10 /* 0F8C80 8028F670 5C400004 */ bgtzl $v0, .L8028F684 @@ -86,7 +86,7 @@ glabel func_8028F588 /* 0F8CC4 8028F6B4 46062202 */ mul.s $f8, $f4, $f6 /* 0F8CC8 8028F6B8 4600428D */ trunc.w.s $f10, $f8 /* 0F8CCC 8028F6BC 44025000 */ mfc1 $v0, $f10 -/* 0F8CD0 8028F6C0 00000000 */ nop +/* 0F8CD0 8028F6C0 00000000 */ nop /* 0F8CD4 8028F6C4 00024400 */ sll $t0, $v0, 0x10 /* 0F8CD8 8028F6C8 00081403 */ sra $v0, $t0, 0x10 /* 0F8CDC 8028F6CC 5C400004 */ bgtzl $v0, .L8028F6E0 @@ -117,7 +117,7 @@ glabel func_8028F588 /* 0F8D2C 8028F71C 46128102 */ mul.s $f4, $f16, $f18 /* 0F8D30 8028F720 4600218D */ trunc.w.s $f6, $f4 /* 0F8D34 8028F724 44023000 */ mfc1 $v0, $f6 -/* 0F8D38 8028F728 00000000 */ nop +/* 0F8D38 8028F728 00000000 */ nop /* 0F8D3C 8028F72C 00026C00 */ sll $t5, $v0, 0x10 /* 0F8D40 8028F730 000D1403 */ sra $v0, $t5, 0x10 /* 0F8D44 8028F734 5C400004 */ bgtzl $v0, .L8028F748 @@ -143,7 +143,7 @@ glabel func_8028F588 /* 0F8D88 8028F778 460A4402 */ mul.s $f16, $f8, $f10 /* 0F8D8C 8028F77C 4600848D */ trunc.w.s $f18, $f16 /* 0F8D90 8028F780 44029000 */ mfc1 $v0, $f18 -/* 0F8D94 8028F784 00000000 */ nop +/* 0F8D94 8028F784 00000000 */ nop /* 0F8D98 8028F788 00024400 */ sll $t0, $v0, 0x10 /* 0F8D9C 8028F78C 00081403 */ sra $v0, $t0, 0x10 /* 0F8DA0 8028F790 5C400004 */ bgtzl $v0, .L8028F7A4 @@ -174,7 +174,7 @@ glabel func_8028F588 /* 0F8DF0 8028F7E0 46062202 */ mul.s $f8, $f4, $f6 /* 0F8DF4 8028F7E4 4600428D */ trunc.w.s $f10, $f8 /* 0F8DF8 8028F7E8 44025000 */ mfc1 $v0, $f10 -/* 0F8DFC 8028F7EC 00000000 */ nop +/* 0F8DFC 8028F7EC 00000000 */ nop /* 0F8E00 8028F7F0 00026C00 */ sll $t5, $v0, 0x10 /* 0F8E04 8028F7F4 000D1403 */ sra $v0, $t5, 0x10 /* 0F8E08 8028F7F8 5C400004 */ bgtzl $v0, .L8028F80C @@ -208,7 +208,7 @@ glabel func_8028F588 /* 0F8E6C 8028F85C 46128102 */ mul.s $f4, $f16, $f18 /* 0F8E70 8028F860 4600218D */ trunc.w.s $f6, $f4 /* 0F8E74 8028F864 44023000 */ mfc1 $v0, $f6 -/* 0F8E78 8028F868 00000000 */ nop +/* 0F8E78 8028F868 00000000 */ nop /* 0F8E7C 8028F86C 00025400 */ sll $t2, $v0, 0x10 /* 0F8E80 8028F870 000A1403 */ sra $v0, $t2, 0x10 /* 0F8E84 8028F874 5C400004 */ bgtzl $v0, .L8028F888 @@ -231,4 +231,4 @@ glabel func_8028F588 /* 0F8EBC 8028F8AC 8CEF0000 */ lw $t7, ($a3) /* 0F8EC0 8028F8B0 A5E2002E */ sh $v0, 0x2e($t7) /* 0F8EC4 8028F8B4 03E00008 */ jr $ra -/* 0F8EC8 8028F8B8 00000000 */ nop +/* 0F8EC8 8028F8B8 00000000 */ nop diff --git a/asm/non_matchings/code_8028DF00/func_8028F970.s b/asm/non_matchings/code_8028DF00/func_8028F970.s index d10266d4f..828b03ebc 100644 --- a/asm/non_matchings/code_8028DF00/func_8028F970.s +++ b/asm/non_matchings/code_8028DF00/func_8028F970.s @@ -20,8 +20,8 @@ glabel func_8028F970 /* 0F8FC4 8028F9B4 30581000 */ andi $t8, $v0, 0x1000 /* 0F8FC8 8028F9B8 17000054 */ bnez $t8, .L8028FB0C /* 0F8FCC 8028F9BC 0012C900 */ sll $t9, $s2, 4 -/* 0F8FD0 8028F9C0 3C09800E */ lui $t1, %hi(D_800DC52C) # $t1, 0x800e -/* 0F8FD4 8028F9C4 8D29C52C */ lw $t1, %lo(D_800DC52C)($t1) +/* 0F8FD0 8028F9C0 3C09800E */ lui $t1, %hi(gActiveScreenMode) # $t1, 0x800e +/* 0F8FD4 8028F9C4 8D29C52C */ lw $t1, %lo(gActiveScreenMode)($t1) /* 0F8FD8 8028F9C8 3C08800F */ lui $t0, %hi(gControllers) # $t0, 0x800f /* 0F8FDC 8028F9CC 25086910 */ addiu $t0, %lo(gControllers) # addiu $t0, $t0, 0x6910 /* 0F8FE0 8028F9D0 24010003 */ li $at, 3 diff --git a/asm/non_matchings/code_80290C20/func_8029122C.s b/asm/non_matchings/code_80290C20/func_8029122C.s index da7543b7d..57ae34b38 100644 --- a/asm/non_matchings/code_80290C20/func_8029122C.s +++ b/asm/non_matchings/code_80290C20/func_8029122C.s @@ -30,7 +30,7 @@ glabel func_8029122C /* 0FA8AC 8029129C 10A1004E */ beq $a1, $at, .L802913D8 /* 0FA8B0 802912A0 3C068015 */ lui $a2, %hi(gDisplayListHead) # $a2, 0x8015 /* 0FA8B4 802912A4 10000065 */ b .L8029143C -/* 0FA8B8 802912A8 00000000 */ nop +/* 0FA8B8 802912A8 00000000 */ nop .L802912AC: /* 0FA8BC 802912AC 8CC30000 */ lw $v1, ($a2) /* 0FA8C0 802912B0 3C058015 */ lui $a1, %hi(gGfxPool) # $a1, 0x8015 @@ -154,10 +154,10 @@ glabel func_8029122C /* 0FAA88 80291478 00380821 */ addu $at, $at, $t8 /* 0FAA8C 8029147C 8C3892C0 */ lw $t8, %lo(jpt_802B92C0)($at) /* 0FAA90 80291480 03000008 */ jr $t8 -/* 0FAA94 80291484 00000000 */ nop +/* 0FAA94 80291484 00000000 */ nop glabel L80291488 -/* 0FAA98 80291488 3C19800E */ lui $t9, %hi(D_800DC52C) # $t9, 0x800e -/* 0FAA9C 8029148C 8F39C52C */ lw $t9, %lo(D_800DC52C)($t9) +/* 0FAA98 80291488 3C19800E */ lui $t9, %hi(gActiveScreenMode) # $t9, 0x800e +/* 0FAA9C 8029148C 8F39C52C */ lw $t9, %lo(gActiveScreenMode)($t9) /* 0FAAA0 80291490 97A7021A */ lhu $a3, 0x21a($sp) /* 0FAAA4 80291494 172003EF */ bnez $t9, .L80292454 /* 0FAAA8 80291498 28E10006 */ slti $at, $a3, 6 @@ -307,7 +307,7 @@ glabel L80291600 /* 0FACDC 802916CC 00380821 */ addu $at, $at, $t8 /* 0FACE0 802916D0 8C389304 */ lw $t8, %lo(jpt_802B9304)($at) /* 0FACE4 802916D4 03000008 */ jr $t8 -/* 0FACE8 802916D8 00000000 */ nop +/* 0FACE8 802916D8 00000000 */ nop glabel L802916DC /* 0FACEC 802916DC 8CC30000 */ lw $v1, ($a2) /* 0FACF0 802916E0 240E2000 */ li $t6, 8192 @@ -498,7 +498,7 @@ glabel L80291870 /* 0FAFC8 802919B8 C7260018 */ lwc1 $f6, 0x18($t9) /* 0FAFCC 802919BC 3C1F0600 */ lui $ra, 0x600 /* 0FAFD0 802919C0 4606003C */ c.lt.s $f0, $f6 -/* 0FAFD4 802919C4 00000000 */ nop +/* 0FAFD4 802919C4 00000000 */ nop /* 0FAFD8 802919C8 45020022 */ bc1fl .L80291A54 /* 0FAFDC 802919CC 8CC30000 */ lw $v1, ($a2) /* 0FAFE0 802919D0 8CC30000 */ lw $v1, ($a2) @@ -829,7 +829,7 @@ glabel L80291D4C /* 0FB4E0 80291ED0 AC7F0000 */ sw $ra, ($v1) /* 0FB4E4 80291ED4 28E1000D */ slti $at, $a3, 0xd /* 0FB4E8 80291ED8 1020000F */ beqz $at, .L80291F18 -/* 0FB4EC 80291EDC 00000000 */ nop +/* 0FB4EC 80291EDC 00000000 */ nop /* 0FB4F0 80291EE0 8CC30000 */ lw $v1, ($a2) /* 0FB4F4 80291EE4 3C0EFF33 */ lui $t6, (0xFF33FFFF >> 16) # lui $t6, 0xff33 /* 0FB4F8 80291EE8 35CEFFFF */ ori $t6, (0xFF33FFFF & 0xFFFF) # ori $t6, $t6, 0xffff @@ -922,7 +922,7 @@ glabel L80291D4C /* 0FB638 80292028 11600003 */ beqz $t3, .L80292038 /* 0FB63C 8029202C 24010003 */ li $at, 3 /* 0FB640 80292030 15610011 */ bne $t3, $at, .L80292078 -/* 0FB644 80292034 00000000 */ nop +/* 0FB644 80292034 00000000 */ nop .L80292038: /* 0FB648 80292038 8CC30000 */ lw $v1, ($a2) /* 0FB64C 8029203C 3C19FC12 */ lui $t9, (0xFC127E24 >> 16) # lui $t9, 0xfc12 @@ -1009,7 +1009,7 @@ glabel L80291D4C /* 0FB77C 8029216C 002E0821 */ addu $at, $at, $t6 /* 0FB780 80292170 8C2E9344 */ lw $t6, %lo(jpt_802B9344)($at) /* 0FB784 80292174 01C00008 */ jr $t6 -/* 0FB788 80292178 00000000 */ nop +/* 0FB788 80292178 00000000 */ nop glabel L8029217C /* 0FB78C 8029217C 24010003 */ li $at, 3 /* 0FB790 80292180 516100A0 */ beql $t3, $at, .L80292404 @@ -1216,4 +1216,4 @@ glabel L80292454 .L80292458: /* 0FBA68 80292458 27BD0270 */ addiu $sp, $sp, 0x270 /* 0FBA6C 8029245C 03E00008 */ jr $ra -/* 0FBA70 80292460 00000000 */ nop +/* 0FBA70 80292460 00000000 */ nop diff --git a/asm/non_matchings/code_80290C20/render_luigi_raceway.s b/asm/non_matchings/code_80290C20/render_luigi_raceway.s index 701268528..ac008ce90 100644 --- a/asm/non_matchings/code_80290C20/render_luigi_raceway.s +++ b/asm/non_matchings/code_80290C20/render_luigi_raceway.s @@ -126,8 +126,8 @@ glabel render_luigi_raceway /* 0FD28C 80293C7C 24190048 */ li $t9, 72 /* 0FD290 80293C80 AD180000 */ sw $t8, ($t0) /* 0FD294 80293C84 AD390000 */ sw $t9, ($t1) -/* 0FD298 80293C88 3C0B800E */ lui $t3, %hi(D_800DC52C) # $t3, 0x800e -/* 0FD29C 80293C8C 8D6BC52C */ lw $t3, %lo(D_800DC52C)($t3) +/* 0FD298 80293C88 3C0B800E */ lui $t3, %hi(gActiveScreenMode) # $t3, 0x800e +/* 0FD29C 80293C8C 8D6BC52C */ lw $t3, %lo(gActiveScreenMode)($t3) /* 0FD2A0 80293C90 97A20022 */ lhu $v0, 0x22($sp) /* 0FD2A4 80293C94 156000A5 */ bnez $t3, .L80293F2C /* 0FD2A8 80293C98 2841000A */ slti $at, $v0, 0xa @@ -168,7 +168,7 @@ glabel render_luigi_raceway /* 0FD324 80293D14 00380821 */ addu $at, $at, $t8 /* 0FD328 80293D18 8C3893D4 */ lw $t8, %lo(jpt_802B93D4)($at) /* 0FD32C 80293D1C 03000008 */ jr $t8 -/* 0FD330 80293D20 00000000 */ nop +/* 0FD330 80293D20 00000000 */ nop glabel L80293D24 /* 0FD334 80293D24 0002C880 */ sll $t9, $v0, 2 /* 0FD338 80293D28 3C0B8015 */ lui $t3, %hi(gPhysicalFramebuffers) # 0x8015 @@ -310,4 +310,4 @@ glabel L80293ED8 .L80293F30: /* 0FD540 80293F30 27BD0028 */ addiu $sp, $sp, 0x28 /* 0FD544 80293F34 03E00008 */ jr $ra -/* 0FD548 80293F38 00000000 */ nop +/* 0FD548 80293F38 00000000 */ nop diff --git a/asm/non_matchings/code_80290C20/render_wario_stadium.s b/asm/non_matchings/code_80290C20/render_wario_stadium.s index de07601b2..0de6066ad 100644 --- a/asm/non_matchings/code_80290C20/render_wario_stadium.s +++ b/asm/non_matchings/code_80290C20/render_wario_stadium.s @@ -137,8 +137,8 @@ glabel render_wario_stadium /* 0FE354 80294D44 240E0048 */ li $t6, 72 /* 0FE358 80294D48 AD590000 */ sw $t9, ($t2) /* 0FE35C 80294D4C AD6E0000 */ sw $t6, ($t3) -/* 0FE360 80294D50 3C0F800E */ lui $t7, %hi(D_800DC52C) # $t7, 0x800e -/* 0FE364 80294D54 8DEFC52C */ lw $t7, %lo(D_800DC52C)($t7) +/* 0FE360 80294D50 3C0F800E */ lui $t7, %hi(gActiveScreenMode) # $t7, 0x800e +/* 0FE364 80294D54 8DEFC52C */ lw $t7, %lo(gActiveScreenMode)($t7) /* 0FE368 80294D58 3C04802C */ lui $a0, %hi(D_802B87D8) # $a0, 0x802c /* 0FE36C 80294D5C 3C02800E */ lui $v0, %hi(sRenderedFramebuffer) # $v0, 0x800e /* 0FE370 80294D60 15E0009A */ bnez $t7, .L80294FCC @@ -174,7 +174,7 @@ glabel render_wario_stadium /* 0FE3D8 80294DC8 00380821 */ addu $at, $at, $t8 /* 0FE3DC 80294DCC 8C3893EC */ lw $t8, %lo(jpt_802B93EC)($at) /* 0FE3E0 80294DD0 03000008 */ jr $t8 -/* 0FE3E4 80294DD4 00000000 */ nop +/* 0FE3E4 80294DD4 00000000 */ nop glabel L80294DD8 /* 0FE3E8 80294DD8 0002C880 */ sll $t9, $v0, 2 /* 0FE3EC 80294DDC 3C0E8015 */ lui $t6, %hi(gPhysicalFramebuffers) # 0x8015 @@ -311,4 +311,4 @@ glabel L80294F7C .L80294FD0: /* 0FE5E0 80294FD0 27BD0020 */ addiu $sp, $sp, 0x20 /* 0FE5E4 80294FD4 03E00008 */ jr $ra -/* 0FE5E8 80294FD8 00000000 */ nop +/* 0FE5E8 80294FD8 00000000 */ nop diff --git a/asm/non_matchings/code_802A3730/func_802A7728.s b/asm/non_matchings/code_802A3730/func_802A7728.s index e73237c2a..e490f4a13 100644 --- a/asm/non_matchings/code_802A3730/func_802A7728.s +++ b/asm/non_matchings/code_802A3730/func_802A7728.s @@ -1,7 +1,7 @@ glabel func_802A7728 /* 110D38 802A7728 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 110D3C 802A772C 3C0E800E */ lui $t6, %hi(D_800DC52C) # $t6, 0x800e -/* 110D40 802A7730 8DCEC52C */ lw $t6, %lo(D_800DC52C)($t6) +/* 110D3C 802A772C 3C0E800E */ lui $t6, %hi(gActiveScreenMode) # $t6, 0x800e +/* 110D40 802A7730 8DCEC52C */ lw $t6, %lo(gActiveScreenMode)($t6) /* 110D44 802A7734 24010003 */ li $at, 3 /* 110D48 802A7738 AFBF0034 */ sw $ra, 0x34($sp) /* 110D4C 802A773C AFB40030 */ sw $s4, 0x30($sp) @@ -37,7 +37,7 @@ glabel func_802A7728 .L802A77AC: /* 110DBC 802A77AC 28410003 */ slti $at, $v0, 3 /* 110DC0 802A77B0 14200002 */ bnez $at, .L802A77BC -/* 110DC4 802A77B4 00000000 */ nop +/* 110DC4 802A77B4 00000000 */ nop /* 110DC8 802A77B8 00001025 */ move $v0, $zero .L802A77BC: /* 110DCC 802A77BC 3C098015 */ lui $t1, %hi(gPhysicalFramebuffers) # $t1, 0x8015 diff --git a/asm/non_matchings/code_802A3730/func_802A7940.s b/asm/non_matchings/code_802A3730/func_802A7940.s index 500e95200..85c584a1c 100644 --- a/asm/non_matchings/code_802A3730/func_802A7940.s +++ b/asm/non_matchings/code_802A3730/func_802A7940.s @@ -1,7 +1,7 @@ glabel func_802A7940 /* 110F50 802A7940 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 110F54 802A7944 3C0E800E */ lui $t6, %hi(D_800DC52C) # $t6, 0x800e -/* 110F58 802A7948 8DCEC52C */ lw $t6, %lo(D_800DC52C)($t6) +/* 110F54 802A7944 3C0E800E */ lui $t6, %hi(gActiveScreenMode) # $t6, 0x800e +/* 110F58 802A7948 8DCEC52C */ lw $t6, %lo(gActiveScreenMode)($t6) /* 110F5C 802A794C 24010003 */ li $at, 3 /* 110F60 802A7950 AFBF0034 */ sw $ra, 0x34($sp) /* 110F64 802A7954 AFB40030 */ sw $s4, 0x30($sp) @@ -37,7 +37,7 @@ glabel func_802A7940 .L802A79C4: /* 110FD4 802A79C4 28410003 */ slti $at, $v0, 3 /* 110FD8 802A79C8 14200002 */ bnez $at, .L802A79D4 -/* 110FDC 802A79CC 00000000 */ nop +/* 110FDC 802A79CC 00000000 */ nop /* 110FE0 802A79D0 00001025 */ move $v0, $zero .L802A79D4: /* 110FE4 802A79D4 3C098015 */ lui $t1, %hi(gPhysicalFramebuffers) # $t1, 0x8015 @@ -143,4 +143,4 @@ glabel func_802A7940 /* 111174 802A7B64 03E00008 */ jr $ra /* 111178 802A7B68 27BD0038 */ addiu $sp, $sp, 0x38 -/* 11117C 802A7B6C 00000000 */ nop +/* 11117C 802A7B6C 00000000 */ nop diff --git a/asm/non_matchings/code_actors/func_8029B06C.s b/asm/non_matchings/code_actors/func_8029B06C.s index 6a0082c4e..8d80057a2 100644 --- a/asm/non_matchings/code_actors/func_8029B06C.s +++ b/asm/non_matchings/code_actors/func_8029B06C.s @@ -60,7 +60,7 @@ glabel func_8029B06C /* 104764 8029B154 3C050600 */ lui $a1, 0x600 /* 104768 8029B158 24010001 */ li $at, 1 /* 10476C 8029B15C 85E20006 */ lh $v0, 6($t7) -/* 104770 8029B160 3C0D800E */ lui $t5, %hi(D_800DC52C) # $t5, 0x800e +/* 104770 8029B160 3C0D800E */ lui $t5, %hi(gActiveScreenMode) # $t5, 0x800e /* 104774 8029B164 50400009 */ beql $v0, $zero, .L8029B18C /* 104778 8029B168 8C620000 */ lw $v0, ($v1) /* 10477C 8029B16C 1041000E */ beq $v0, $at, .L8029B1A8 @@ -97,17 +97,17 @@ glabel func_8029B06C /* 1047EC 8029B1DC AC4C0004 */ sw $t4, 4($v0) /* 1047F0 8029B1E0 AC450000 */ sw $a1, ($v0) .L8029B1E4: -/* 1047F4 8029B1E4 8DADC52C */ lw $t5, %lo(D_800DC52C)($t5) +/* 1047F4 8029B1E4 8DADC52C */ lw $t5, %lo(gActiveScreenMode)($t5) /* 1047F8 8029B1E8 3C01802C */ lui $at, %hi(D_802B96EC) /* 1047FC 8029B1EC 15A00025 */ bnez $t5, .L8029B284 -/* 104800 8029B1F0 00000000 */ nop +/* 104800 8029B1F0 00000000 */ nop /* 104804 8029B1F4 3C01802C */ lui $at, %hi(D_802B96E4) # $at, 0x802c /* 104808 8029B1F8 C42A96E4 */ lwc1 $f10, %lo(D_802B96E4)($at) /* 10480C 8029B1FC 3C01802C */ lui $at, %hi(D_802B96E8) # $at, 0x802c /* 104810 8029B200 460A103C */ c.lt.s $f2, $f10 -/* 104814 8029B204 00000000 */ nop +/* 104814 8029B204 00000000 */ nop /* 104818 8029B208 45000009 */ bc1f .L8029B230 -/* 10481C 8029B20C 00000000 */ nop +/* 10481C 8029B20C 00000000 */ nop /* 104820 8029B210 8C620000 */ lw $v0, ($v1) /* 104824 8029B214 3C0F0900 */ lui $t7, %hi(toads_turnpike_dl_0) # $t7, 0x900 /* 104828 8029B218 25EF0140 */ addiu $t7, %lo(toads_turnpike_dl_0) # addiu $t7, $t7, 0x140 @@ -119,7 +119,7 @@ glabel func_8029B06C .L8029B230: /* 104840 8029B230 C43096E8 */ lwc1 $f16, %lo(D_802B96E8)($at) /* 104844 8029B234 4610103C */ c.lt.s $f2, $f16 -/* 104848 8029B238 00000000 */ nop +/* 104848 8029B238 00000000 */ nop /* 10484C 8029B23C 4502000A */ bc1fl .L8029B268 /* 104850 8029B240 8C620000 */ lw $v0, ($v1) /* 104854 8029B244 8C620000 */ lw $v0, ($v1) @@ -142,7 +142,7 @@ glabel func_8029B06C .L8029B284: /* 104894 8029B284 C43296EC */ lwc1 $f18, %lo(D_802B96EC)($at) /* 104898 8029B288 4612103C */ c.lt.s $f2, $f18 -/* 10489C 8029B28C 00000000 */ nop +/* 10489C 8029B28C 00000000 */ nop /* 1048A0 8029B290 4502000A */ bc1fl .L8029B2BC /* 1048A4 8029B294 8C620000 */ lw $v0, ($v1) /* 1048A8 8029B298 8C620000 */ lw $v0, ($v1) @@ -165,4 +165,4 @@ glabel func_8029B06C /* 1048E4 8029B2D4 8FBF001C */ lw $ra, 0x1c($sp) /* 1048E8 8029B2D8 27BD0130 */ addiu $sp, $sp, 0x130 /* 1048EC 8029B2DC 03E00008 */ jr $ra -/* 1048F0 8029B2E0 00000000 */ nop +/* 1048F0 8029B2E0 00000000 */ nop diff --git a/asm/non_matchings/code_actors/func_8029B2E4.s b/asm/non_matchings/code_actors/func_8029B2E4.s index f4b829b4d..f889c03f6 100644 --- a/asm/non_matchings/code_actors/func_8029B2E4.s +++ b/asm/non_matchings/code_actors/func_8029B2E4.s @@ -56,19 +56,19 @@ glabel func_8029B2E4 /* 1049CC 8029B3BC 24630298 */ addiu $v1, %lo(gDisplayListHead) # addiu $v1, $v1, 0x298 /* 1049D0 8029B3C0 10400043 */ beqz $v0, .L8029B4D0 /* 1049D4 8029B3C4 C7A20044 */ lwc1 $f2, 0x44($sp) -/* 1049D8 8029B3C8 3C0F800E */ lui $t7, %hi(D_800DC52C) # $t7, 0x800e -/* 1049DC 8029B3CC 8DEFC52C */ lw $t7, %lo(D_800DC52C)($t7) +/* 1049D8 8029B3C8 3C0F800E */ lui $t7, %hi(gActiveScreenMode) # $t7, 0x800e +/* 1049DC 8029B3CC 8DEFC52C */ lw $t7, %lo(gActiveScreenMode)($t7) /* 1049E0 8029B3D0 3C01802C */ lui $at, %hi(D_802B96FC) /* 1049E4 8029B3D4 15E00028 */ bnez $t7, .L8029B478 -/* 1049E8 8029B3D8 00000000 */ nop +/* 1049E8 8029B3D8 00000000 */ nop /* 1049EC 8029B3DC 3C01802C */ lui $at, %hi(D_802B96F4) # $at, 0x802c /* 1049F0 8029B3E0 C42A96F4 */ lwc1 $f10, %lo(D_802B96F4)($at) /* 1049F4 8029B3E4 3C190600 */ lui $t9, 0x600 /* 1049F8 8029B3E8 3C01802C */ lui $at, %hi(D_802B96F8) # $at, 0x802c /* 1049FC 8029B3EC 460A103C */ c.lt.s $f2, $f10 -/* 104A00 8029B3F0 00000000 */ nop +/* 104A00 8029B3F0 00000000 */ nop /* 104A04 8029B3F4 45000009 */ bc1f .L8029B41C -/* 104A08 8029B3F8 00000000 */ nop +/* 104A08 8029B3F8 00000000 */ nop /* 104A0C 8029B3FC 8C620000 */ lw $v0, ($v1) /* 104A10 8029B400 3C090900 */ lui $t1, %hi(toads_turnpike_dl_3) # $t1, 0x900 /* 104A14 8029B404 252901F0 */ addiu $t1, %lo(toads_turnpike_dl_3) # addiu $t1, $t1, 0x1f0 @@ -82,7 +82,7 @@ glabel func_8029B2E4 /* 104A30 8029B420 3C0B0600 */ lui $t3, 0x600 /* 104A34 8029B424 3C0E0600 */ lui $t6, 0x600 /* 104A38 8029B428 4610103C */ c.lt.s $f2, $f16 -/* 104A3C 8029B42C 00000000 */ nop +/* 104A3C 8029B42C 00000000 */ nop /* 104A40 8029B430 4502000A */ bc1fl .L8029B45C /* 104A44 8029B434 8C620000 */ lw $v0, ($v1) /* 104A48 8029B438 8C620000 */ lw $v0, ($v1) @@ -107,7 +107,7 @@ glabel func_8029B2E4 /* 104A8C 8029B47C 3C190600 */ lui $t9, 0x600 /* 104A90 8029B480 3C0B0600 */ lui $t3, 0x600 /* 104A94 8029B484 4612103C */ c.lt.s $f2, $f18 -/* 104A98 8029B488 00000000 */ nop +/* 104A98 8029B488 00000000 */ nop /* 104A9C 8029B48C 4502000A */ bc1fl .L8029B4B8 /* 104AA0 8029B490 8C620000 */ lw $v0, ($v1) /* 104AA4 8029B494 8C620000 */ lw $v0, ($v1) @@ -130,4 +130,4 @@ glabel func_8029B2E4 /* 104AE0 8029B4D0 8FBF001C */ lw $ra, 0x1c($sp) /* 104AE4 8029B4D4 27BD0120 */ addiu $sp, $sp, 0x120 /* 104AE8 8029B4D8 03E00008 */ jr $ra -/* 104AEC 8029B4DC 00000000 */ nop +/* 104AEC 8029B4DC 00000000 */ nop diff --git a/asm/non_matchings/code_actors/func_8029B4E0.s b/asm/non_matchings/code_actors/func_8029B4E0.s index 200a60c11..fefbedfe0 100644 --- a/asm/non_matchings/code_actors/func_8029B4E0.s +++ b/asm/non_matchings/code_actors/func_8029B4E0.s @@ -60,19 +60,19 @@ glabel func_8029B4E0 /* 104BD8 8029B5C8 24630298 */ addiu $v1, %lo(gDisplayListHead) # addiu $v1, $v1, 0x298 /* 104BDC 8029B5CC 10400043 */ beqz $v0, .L8029B6DC /* 104BE0 8029B5D0 C7A20044 */ lwc1 $f2, 0x44($sp) -/* 104BE4 8029B5D4 3C0F800E */ lui $t7, %hi(D_800DC52C) # $t7, 0x800e -/* 104BE8 8029B5D8 8DEFC52C */ lw $t7, %lo(D_800DC52C)($t7) +/* 104BE4 8029B5D4 3C0F800E */ lui $t7, %hi(gActiveScreenMode) # $t7, 0x800e +/* 104BE8 8029B5D8 8DEFC52C */ lw $t7, %lo(gActiveScreenMode)($t7) /* 104BEC 8029B5DC 3C01802C */ lui $at, %hi(D_802B970C) /* 104BF0 8029B5E0 15E00028 */ bnez $t7, .L8029B684 -/* 104BF4 8029B5E4 00000000 */ nop +/* 104BF4 8029B5E4 00000000 */ nop /* 104BF8 8029B5E8 3C01802C */ lui $at, %hi(D_802B9704) # $at, 0x802c /* 104BFC 8029B5EC C42A9704 */ lwc1 $f10, %lo(D_802B9704)($at) /* 104C00 8029B5F0 3C190600 */ lui $t9, 0x600 /* 104C04 8029B5F4 3C01802C */ lui $at, %hi(D_802B9708) # $at, 0x802c /* 104C08 8029B5F8 460A103C */ c.lt.s $f2, $f10 -/* 104C0C 8029B5FC 00000000 */ nop +/* 104C0C 8029B5FC 00000000 */ nop /* 104C10 8029B600 45000009 */ bc1f .L8029B628 -/* 104C14 8029B604 00000000 */ nop +/* 104C14 8029B604 00000000 */ nop /* 104C18 8029B608 8C620000 */ lw $v0, ($v1) /* 104C1C 8029B60C 3C090900 */ lui $t1, %hi(toads_turnpike_dl_9) # $t1, 0x900 /* 104C20 8029B610 25290350 */ addiu $t1, %lo(toads_turnpike_dl_9) # addiu $t1, $t1, 0x350 @@ -86,7 +86,7 @@ glabel func_8029B4E0 /* 104C3C 8029B62C 3C0B0600 */ lui $t3, 0x600 /* 104C40 8029B630 3C0E0600 */ lui $t6, 0x600 /* 104C44 8029B634 4610103C */ c.lt.s $f2, $f16 -/* 104C48 8029B638 00000000 */ nop +/* 104C48 8029B638 00000000 */ nop /* 104C4C 8029B63C 4502000A */ bc1fl .L8029B668 /* 104C50 8029B640 8C620000 */ lw $v0, ($v1) /* 104C54 8029B644 8C620000 */ lw $v0, ($v1) @@ -111,7 +111,7 @@ glabel func_8029B4E0 /* 104C98 8029B688 3C190600 */ lui $t9, 0x600 /* 104C9C 8029B68C 3C0B0600 */ lui $t3, 0x600 /* 104CA0 8029B690 4612103C */ c.lt.s $f2, $f18 -/* 104CA4 8029B694 00000000 */ nop +/* 104CA4 8029B694 00000000 */ nop /* 104CA8 8029B698 4502000A */ bc1fl .L8029B6C4 /* 104CAC 8029B69C 8C620000 */ lw $v0, ($v1) /* 104CB0 8029B6A0 8C620000 */ lw $v0, ($v1) @@ -134,4 +134,4 @@ glabel func_8029B4E0 /* 104CEC 8029B6DC 8FBF001C */ lw $ra, 0x1c($sp) /* 104CF0 8029B6E0 27BD0120 */ addiu $sp, $sp, 0x120 /* 104CF4 8029B6E4 03E00008 */ jr $ra -/* 104CF8 8029B6E8 00000000 */ nop +/* 104CF8 8029B6E8 00000000 */ nop diff --git a/asm/non_matchings/code_actors/func_8029B6EC.s b/asm/non_matchings/code_actors/func_8029B6EC.s index 42130d79c..c43229619 100644 --- a/asm/non_matchings/code_actors/func_8029B6EC.s +++ b/asm/non_matchings/code_actors/func_8029B6EC.s @@ -56,19 +56,19 @@ glabel func_8029B6EC /* 104DD4 8029B7C4 24630298 */ addiu $v1, %lo(gDisplayListHead) # addiu $v1, $v1, 0x298 /* 104DD8 8029B7C8 10400043 */ beqz $v0, .L8029B8D8 /* 104DDC 8029B7CC C7A20044 */ lwc1 $f2, 0x44($sp) -/* 104DE0 8029B7D0 3C0F800E */ lui $t7, %hi(D_800DC52C) # $t7, 0x800e -/* 104DE4 8029B7D4 8DEFC52C */ lw $t7, %lo(D_800DC52C)($t7) +/* 104DE0 8029B7D0 3C0F800E */ lui $t7, %hi(gActiveScreenMode) # $t7, 0x800e +/* 104DE4 8029B7D4 8DEFC52C */ lw $t7, %lo(gActiveScreenMode)($t7) /* 104DE8 8029B7D8 3C01802C */ lui $at, %hi(D_802B971C) /* 104DEC 8029B7DC 15E00028 */ bnez $t7, .L8029B880 -/* 104DF0 8029B7E0 00000000 */ nop +/* 104DF0 8029B7E0 00000000 */ nop /* 104DF4 8029B7E4 3C01802C */ lui $at, %hi(D_802B9714) # $at, 0x802c /* 104DF8 8029B7E8 C42A9714 */ lwc1 $f10, %lo(D_802B9714)($at) /* 104DFC 8029B7EC 3C190600 */ lui $t9, 0x600 /* 104E00 8029B7F0 3C01802C */ lui $at, %hi(D_802B9718) # $at, 0x802c /* 104E04 8029B7F4 460A103C */ c.lt.s $f2, $f10 -/* 104E08 8029B7F8 00000000 */ nop +/* 104E08 8029B7F8 00000000 */ nop /* 104E0C 8029B7FC 45000009 */ bc1f .L8029B824 -/* 104E10 8029B800 00000000 */ nop +/* 104E10 8029B800 00000000 */ nop /* 104E14 8029B804 8C620000 */ lw $v0, ($v1) /* 104E18 8029B808 3C090900 */ lui $t1, %hi(toads_turnpike_dl_6) # $t1, 0x900 /* 104E1C 8029B80C 252902A0 */ addiu $t1, %lo(toads_turnpike_dl_6) # addiu $t1, $t1, 0x2a0 @@ -82,7 +82,7 @@ glabel func_8029B6EC /* 104E38 8029B828 3C0B0600 */ lui $t3, 0x600 /* 104E3C 8029B82C 3C0E0600 */ lui $t6, 0x600 /* 104E40 8029B830 4610103C */ c.lt.s $f2, $f16 -/* 104E44 8029B834 00000000 */ nop +/* 104E44 8029B834 00000000 */ nop /* 104E48 8029B838 4502000A */ bc1fl .L8029B864 /* 104E4C 8029B83C 8C620000 */ lw $v0, ($v1) /* 104E50 8029B840 8C620000 */ lw $v0, ($v1) @@ -107,7 +107,7 @@ glabel func_8029B6EC /* 104E94 8029B884 3C190600 */ lui $t9, 0x600 /* 104E98 8029B888 3C0B0600 */ lui $t3, 0x600 /* 104E9C 8029B88C 4612103C */ c.lt.s $f2, $f18 -/* 104EA0 8029B890 00000000 */ nop +/* 104EA0 8029B890 00000000 */ nop /* 104EA4 8029B894 4502000A */ bc1fl .L8029B8C0 /* 104EA8 8029B898 8C620000 */ lw $v0, ($v1) /* 104EAC 8029B89C 8C620000 */ lw $v0, ($v1) @@ -130,4 +130,4 @@ glabel func_8029B6EC /* 104EE8 8029B8D8 8FBF001C */ lw $ra, 0x1c($sp) /* 104EEC 8029B8DC 27BD0120 */ addiu $sp, $sp, 0x120 /* 104EF0 8029B8E0 03E00008 */ jr $ra -/* 104EF4 8029B8E4 00000000 */ nop +/* 104EF4 8029B8E4 00000000 */ nop diff --git a/asm/non_matchings/staff_ghosts/func_80005B18.s b/asm/non_matchings/staff_ghosts/func_80005B18.s index 8798b4b3c..8a232dac8 100644 --- a/asm/non_matchings/staff_ghosts/func_80005B18.s +++ b/asm/non_matchings/staff_ghosts/func_80005B18.s @@ -172,7 +172,7 @@ glabel func_80005B18 /* 0069B0 80005DB0 8C4A0000 */ lw $t2, ($v0) .L80005DB4: /* 0069B4 80005DB4 240D0064 */ li $t5, 100 -/* 0069B8 80005DB8 3C0E800E */ lui $t6, %hi(D_800DC52C) # $t6, 0x800e +/* 0069B8 80005DB8 3C0E800E */ lui $t6, %hi(gActiveScreenMode) # $t6, 0x800e /* 0069BC 80005DBC 254B0001 */ addiu $t3, $t2, 1 /* 0069C0 80005DC0 29610065 */ slti $at, $t3, 0x65 /* 0069C4 80005DC4 14200002 */ bnez $at, .L80005DD0 @@ -181,7 +181,7 @@ glabel func_80005B18 .L80005DD0: /* 0069D0 80005DD0 54640023 */ bnel $v1, $a0, .L80005E60 /* 0069D4 80005DD4 8FBF0014 */ lw $ra, 0x14($sp) -/* 0069D8 80005DD8 8DCEC52C */ lw $t6, %lo(D_800DC52C)($t6) +/* 0069D8 80005DD8 8DCEC52C */ lw $t6, %lo(gActiveScreenMode)($t6) /* 0069DC 80005DDC 3C078016 */ lui $a3, %hi(D_80162DD4) # $a3, 0x8016 /* 0069E0 80005DE0 24E72DD4 */ addiu $a3, %lo(D_80162DD4) # addiu $a3, $a3, 0x2dd4 /* 0069E4 80005DE4 55C0001E */ bnel $t6, $zero, .L80005E60 diff --git a/include/defines.h b/include/defines.h index 5c296b6d8..92942154c 100644 --- a/include/defines.h +++ b/include/defines.h @@ -154,7 +154,7 @@ #define DEBUG_GOTO_CREDITS_SEQUENCE_CC_EXTRA 3 /** - * Options for gScreenModeSelection + * Options for gScreenModeSelection and gActiveScreenMode */ #define SCREEN_MODE_1P 0 #define SCREEN_MODE_2P_SPLITSCREEN_HORIZONTAL 1 diff --git a/include/variables.h b/include/variables.h index 1b96bbddf..44e288cfb 100644 --- a/include/variables.h +++ b/include/variables.h @@ -103,7 +103,7 @@ extern Gfx D_0D0077A0[]; extern s32 D_800DC50C; extern u16 D_800DC51C; -extern s32 D_800DC52C; +extern s32 gActiveScreenMode; // D_800DC52C extern s32 D_800DC540; extern u16 D_800DC5FC; diff --git a/src/code_800029B0.c b/src/code_800029B0.c index 2f8097ede..5a0827562 100644 --- a/src/code_800029B0.c +++ b/src/code_800029B0.c @@ -143,7 +143,7 @@ void func_80002A18(void) { if (gModeSelection == GRAND_PRIX) { gCurrentCourseId = gCupCourseOrder[gCupSelection][gCupCourseSelection]; } - D_800DC52C = gScreenModeSelection; + gActiveScreenMode = gScreenModeSelection; if (gCurrentCourseId != gCurrentlyLoadedCourseId) { D_80150120 = 0; gCurrentlyLoadedCourseId = gCurrentCourseId; diff --git a/src/code_80005FD0.c b/src/code_80005FD0.c index 5e18b86b1..f61023346 100644 --- a/src/code_80005FD0.c +++ b/src/code_80005FD0.c @@ -137,7 +137,7 @@ s32 func_800061DC(void *arg0, f32 arg1, s32 arg2) { s32 phi_v1_9; s32 phi_v1_10; - temp_v0 = D_800DC52C; + temp_v0 = gActiveScreenMode; temp_f0 = arg0->unk0; temp_f2 = arg0->unk8; if (temp_v0 != 0) { diff --git a/src/code_8001C4D0.c b/src/code_8001C4D0.c index b3a0eda22..6e2589a7b 100644 --- a/src/code_8001C4D0.c +++ b/src/code_8001C4D0.c @@ -107,7 +107,7 @@ void func_8001C4D0(f32 x, f32 y, f32 z, s16 rot, u32 arg4, s32 cameraId) { *(&D_80164A90 + temp_t6_2) = 0.0f; *(&D_80164AA0 + temp_t6_2) = 0.0f; temp_t3 = temp_t6_2 + &D_80164A78; - *temp_t3 = *(&D_800DDB30 + (D_800DC52C * 4)); + *temp_t3 = *(&D_800DDB30 + (gActiveScreenMode * 4)); *(&D_80164A18 + temp_t6_2) = 0; *(&D_80164A08 + temp_t6_2) = 0; *(&D_80164498 + temp_t6_2) = 0.0f; @@ -116,7 +116,7 @@ void func_8001C4D0(f32 x, f32 y, f32 z, s16 rot, u32 arg4, s32 cameraId) { temp_v1 = gPlayerOne + (cameraId * 0xDD8); cameras[cameraId].unk2C = temp_v1->unk2E; cameras[cameraId].unk28 = temp_v1->unk2E; - temp_v0 = D_800DC52C; + temp_v0 = gActiveScreenMode; if (temp_v0 != 0) { if (temp_v0 != 1) { if (temp_v0 != 2) { @@ -464,7 +464,7 @@ void func_8001CCEC(void *arg0, void *arg1, void *arg2, f32 *arg3, f32 *arg4, f32 move_f32_towards((bitwise f32) temp_a0_4, 0.0f, 0x3DCCCCCD); temp_v1_3 = temp_s2_2 + &D_80164A78; *temp_v1_3 = *temp_v1_3 - D_800ED558; - temp_f0_4 = *(&D_800DDB30 + (D_800DC52C * 4)); + temp_f0_4 = *(&D_800DDB30 + (gActiveScreenMode * 4)); phi_s2 = temp_s2_2; phi_v1_2 = temp_v1_3; if (*temp_v1_3 <= temp_f0_4) { @@ -472,7 +472,7 @@ void func_8001CCEC(void *arg0, void *arg1, void *arg2, f32 *arg3, f32 *arg4, f32 } } if ((arg0->unkCA & 0x100) == 0x100) { - temp_v0_2 = D_800DC52C; + temp_v0_2 = gActiveScreenMode; if ((temp_v0_2 == 1) || (temp_v0_2 == 2) || (temp_v0_2 == 3)) { temp_a0_9 = phi_s2 + &D_80164A90; sp38 = temp_a0_9; @@ -811,7 +811,7 @@ void func_8001D944(void *arg0, void *arg1, void *arg2, f32 *arg3, f32 *arg4, f32 move_f32_towards((bitwise f32) temp_a0_4, 0.0f, 0x3DCCCCCD); temp_v0_3 = temp_s2_2 + &D_80164A78; *temp_v0_3 = *temp_v0_3 - D_800ED5B0; - temp_f0_4 = *(&D_800DDB30 + (D_800DC52C * 4)); + temp_f0_4 = *(&D_800DDB30 + (gActiveScreenMode * 4)); phi_s2 = temp_s2_2; phi_v0_2 = temp_v0_3; if (*temp_v0_3 <= temp_f0_4) { @@ -1532,7 +1532,7 @@ block_51: } break; } - temp_v0_4 = D_800DC52C; + temp_v0_4 = gActiveScreenMode; if (temp_v0_4 != 0) { if ((temp_v0_4 != 1) && (temp_v0_4 != 2) && (temp_v0_4 != 3)) { phi_f2 = sp34; @@ -1580,7 +1580,7 @@ void func_8001F87C(s32 arg0) { Player *phi_a2; s32 phi_a1; - if (D_800DC52C == 0) { + if (gActiveScreenMode == 0) { phi_a2 = gPlayerOne; phi_a1 = 0; if (gModeSelection == GRAND_PRIX) { diff --git a/src/code_8001F980.c b/src/code_8001F980.c index c1bd7d682..3c14e051a 100644 --- a/src/code_8001F980.c +++ b/src/code_8001F980.c @@ -5,7 +5,7 @@ #include "framebuffers.h" extern s32 D_800ED600, D_800ED608, D_800ED610, D_800ED618, D_800ED620, D_800ED628, D_800ED630; -extern s32 D_800DC52C; +extern s32 gActiveScreenMode; extern s32 D_800DDB58[]; extern s32 D_800ED638; extern s32 D_80164A28; @@ -136,7 +136,7 @@ u16 func_8001FB0C(void *arg0, void *arg1, f32 arg2, f32 arg3) { s32 temp_v0; s16 phi_v0; - temp_v0 = D_800DC52C; + temp_v0 = gActiveScreenMode; sp40 = 0; if (temp_v0 != 0) { if ((temp_v0 != 1) && (temp_v0 != 2)) { @@ -416,7 +416,7 @@ void func_80020524(void) { func_8006E5AC(gPlayerTwo, 1, 0); func_8006E5AC(gPlayerThree, 2, 0); func_8006E5AC(gPlayerFour, 3, 0); - if (D_800DC52C != 3) { + if (gActiveScreenMode != 3) { func_8006E5AC(gPlayerFive, 4, 0); func_8006E5AC(gPlayerSix, 5, 0); func_8006E5AC(gPlayerSeven, 6, 0); @@ -489,7 +489,7 @@ void func_8002088C(void) { func_8006E634(gPlayerTwo, 1, 1); func_8006E634(gPlayerThree, 2, 1); func_8006E634(gPlayerFour, 3, 1); - if (D_800DC52C != 3) { + if (gActiveScreenMode != 3) { func_8006E634(gPlayerFive, 4, 1); func_8006E634(gPlayerSix, 5, 1); func_8006E634(gPlayerSeven, 6, 1); @@ -711,7 +711,7 @@ void func_800212B4(void) { func_80020000(gPlayerTwo, camera1, 1, 0); func_80020000(gPlayerThree, camera1, 2, 0); func_80020000(gPlayerFour, camera1, 3, 0); - if (D_800DC52C != 3) { + if (gActiveScreenMode != 3) { func_80020000(gPlayerFive, camera1, 4, 0); func_80020000(gPlayerSix, camera1, 5, 0); func_80020000(gPlayerSeven, camera1, 6, 0); @@ -721,7 +721,7 @@ void func_800212B4(void) { func_80021244(gPlayerTwo, 1, 0); func_80021244(gPlayerThree, 2, 0); func_80021244(gPlayerFour, 3, 0); - if (D_800DC52C != 3) { + if (gActiveScreenMode != 3) { func_80021244(gPlayerFive, 4, 0); func_80021244(gPlayerSix, 5, 0); func_80021244(gPlayerSeven, 6, 0); @@ -734,7 +734,7 @@ void func_800212B4(void) { func_8006E5AC(gPlayerTwo, 1, 0); func_8006E5AC(gPlayerThree, 2, 0); func_8006E5AC(gPlayerFour, 3, 0); - if (D_800DC52C != 3) { + if (gActiveScreenMode != 3) { func_8006E5AC(gPlayerFive, 4, 0); func_8006E5AC(gPlayerSix, 5, 0); func_8006E5AC(gPlayerSeven, 6, 0); @@ -753,7 +753,7 @@ void func_800215DC(void) { func_80020000(gPlayerTwo, camera2, 1, 1); func_80020000(gPlayerThree, camera2, 2, 1); func_80020000(gPlayerFour, camera2, 3, 1); - if (D_800DC52C != 3) { + if (gActiveScreenMode != SCREEN_MODE_3P_4P_SPLITSCREEN) { func_80020000(gPlayerFive, camera2, 4, 1); func_80020000(gPlayerSix, camera2, 5, 1); func_80020000(gPlayerSeven, camera2, 6, 1); @@ -763,7 +763,7 @@ void func_800215DC(void) { func_80021244(gPlayerTwo, 1, 1); func_80021244(gPlayerThree, 2, 1); func_80021244(gPlayerFour, 3, 1); - if (D_800DC52C != 3) { + if (gActiveScreenMode != SCREEN_MODE_3P_4P_SPLITSCREEN) { func_80021244(gPlayerFive, 4, 1); func_80021244(gPlayerSix, 5, 1); func_80021244(gPlayerSeven, 6, 1); @@ -776,7 +776,7 @@ void func_800215DC(void) { func_8006E634(gPlayerTwo, 1, 1); func_8006E634(gPlayerThree, 2, 1); func_8006E634(gPlayerFour, 3, 1); - if (D_800DC52C != 3) { + if (gActiveScreenMode != SCREEN_MODE_3P_4P_SPLITSCREEN) { func_8006E634(gPlayerFive, 4, 1); func_8006E634(gPlayerSix, 5, 1); func_8006E634(gPlayerSeven, 6, 1); @@ -854,7 +854,7 @@ void func_80021B0C(void) { func_8006E7CC(gPlayerTwo, 1, 0); func_8006E7CC(gPlayerThree, 2, 0); func_8006E7CC(gPlayerFour, 3, 0); - if (D_800DC52C != 3) { + if (gActiveScreenMode != 3) { func_8006E7CC(gPlayerFive, 4, 0); func_8006E7CC(gPlayerSix, 5, 0); func_8006E7CC(gPlayerSeven, 6, 0); @@ -888,7 +888,7 @@ void func_80021C78(void) { func_8006E848(gPlayerTwo, 1, 1); func_8006E848(gPlayerThree, 2, 1); func_8006E848(gPlayerFour, 3, 1); - if (D_800DC52C != 3) { + if (gActiveScreenMode != SCREEN_MODE_3P_4P_SPLITSCREEN) { func_8006E848(gPlayerFive, 4, 1); func_8006E848(gPlayerSix, 5, 1); func_8006E848(gPlayerSeven, 6, 1); @@ -1107,7 +1107,7 @@ void func_8002276C(void) { s32 temp_v0_5; s32 phi_v0; - temp_v0 = D_800DC52C; + temp_v0 = gActiveScreenMode; if (temp_v0 != 0) { if ((temp_v0 != 1) && (temp_v0 != 2)) { if (temp_v0 != 3) { diff --git a/src/code_80027040.c b/src/code_80027040.c index f72a2d232..f0c08253b 100644 --- a/src/code_80027040.c +++ b/src/code_80027040.c @@ -14,7 +14,7 @@ extern u32 *D_802F1F80; extern u32 *D_802DFB80; extern s16 D_800DDEB0[]; -extern s32 D_800DC52C; +extern s32 gActiveScreenMode; // Structured like a 3D pointer array extern u32 ***gKartTextureTable0, ***gKartTextureTable1, **gKartTextureGroup18s; @@ -148,7 +148,7 @@ GLOBAL_ASM("asm/non_matchings/code_80027040/func_80027560.s") void func_80027A20(Player *player, s8 arg1, s8 arg2, s8 arg3) { void *temp_s0 = (arg3 << 0xE) + (arg2 << 0xC) + (arg1 << 9) + (s32)&D_802F1F80; - switch(D_800DC52C) { + switch(gActiveScreenMode) { case 0: case 1: case 2: osInvalDCache(temp_s0, 0x200); osPiStartDma(&gDmaIoMesg, 0, 0, &_kart_texturesSegmentRomStart[gKartPalettes[player->characterId] & 0x00FFFFFF], temp_s0, 0x200, &gDmaMesgQueue); diff --git a/src/code_80027D00.c b/src/code_80027D00.c index 97364efcd..4a4c89421 100644 --- a/src/code_80027D00.c +++ b/src/code_80027D00.c @@ -577,7 +577,7 @@ void func_80028864(Player *arg0, s32 arg1, s8 arg2, s8 arg3) { temp_v0 = arg0->unk_000; phi_a0 = arg0; if ((temp_v0 & PLAYER_START_SEQUENCE) == 0) { - temp_v0_2 = D_800DC52C; + temp_v0_2 = gActiveScreenMode; if (temp_v0_2 != 0) { if ((temp_v0_2 != 1) && (temp_v0_2 != 2)) { if (temp_v0_2 != 3) { @@ -3336,7 +3336,7 @@ void func_8002D268(Player *player, s32 arg1, s8 arg2, s8 arg3) { func_8008F5A4(player, arg3); } player->unk_074 = func_802ABE30(spFC, spF8, spF4, player->unk_11A); - if (((player->unk_000 & 0x4000) == 0x4000) && ((temp_v0_16 = D_800DC52C, (temp_v0_16 == 0)) || (temp_v0_16 == 2) || (temp_v0_16 == 1))) { + if (((player->unk_000 & 0x4000) == 0x4000) && ((temp_v0_16 = gActiveScreenMode, (temp_v0_16 == 0)) || (temp_v0_16 == 2) || (temp_v0_16 == 1))) { func_80029B4C(player, spFC, spF8, spF4); } else { func_8002A194(player, spFC, spF8, spF4); @@ -3772,7 +3772,7 @@ block_63: func_8008F5A4(arg0, arg3); } arg0->unk74 = func_802ABE30(spD0, spCC, spC8, arg0->unk11A); - if (((arg0->unk0 & 0x4000) == 0x4000) && ((temp_v0_13 = D_800DC52C, (temp_v0_13 == 0)) || (temp_v0_13 == 2) || (temp_v0_13 == 1))) { + if (((arg0->unk0 & 0x4000) == 0x4000) && ((temp_v0_13 = gActiveScreenMode, (temp_v0_13 == 0)) || (temp_v0_13 == 2) || (temp_v0_13 == 1))) { func_80029B4C(arg0, spD0, spCC, spC8); } else { func_8002A194(arg0, spD0, spCC, spC8); @@ -4072,7 +4072,7 @@ void func_8002F730(void *arg0, ? arg1, ? arg2, s8 arg3) { func_8003F46C(arg0, &sp5C, &sp68, &spE8, &sp78, &spCC, &spC8, &spC4); } arg0->unk74 = func_802ABE30(spCC, spC8, spC4, arg0->unk11A); - if (((arg0->unk0 & 0x4000) == 0x4000) && ((temp_v0 = D_800DC52C, (temp_v0 == 0)) || (temp_v0 == 2) || (temp_v0 == 1))) { + if (((arg0->unk0 & 0x4000) == 0x4000) && ((temp_v0 = gActiveScreenMode, (temp_v0 == 0)) || (temp_v0 == 2) || (temp_v0 == 1))) { func_80029B4C(arg0, spCC, spC8, spC4); } else { func_8002A194(arg0, spCC, spC8, spC4); @@ -7468,7 +7468,7 @@ void func_800382DC(void) { u16 temp_v0_5; u16 temp_v0_6; - temp_v0 = D_800DC52C; + temp_v0 = gActiveScreenMode; if (temp_v0 != 0) { if ((temp_v0 != 1) && (temp_v0 != 2)) { if (temp_v0 != 3) { diff --git a/src/code_800393C0.c b/src/code_800393C0.c index 0ef6e038c..67068cd0a 100644 --- a/src/code_800393C0.c +++ b/src/code_800393C0.c @@ -301,8 +301,8 @@ void spawn_player(Player *player, s8 playerIndex, f32 arg2, f32 arg3, f32 arg4, } void func_80039AE4(void) { - switch (D_800DC52C) { - case 0: + switch (gActiveScreenMode) { + case SCREEN_MODE_1P: if (D_800DC50C == ENDING_SEQUENCE) { D_80165578 = 0x898; D_8016557A = 0; @@ -328,8 +328,8 @@ void func_80039AE4(void) { } break; - case 1: - case 2: + case SCREEN_MODE_2P_SPLITSCREEN_HORIZONTAL: + case SCREEN_MODE_2P_SPLITSCREEN_VERTICAL: if (gModeSelection == BATTLE) { D_80165578 = 0x898; D_8016557A = 0; @@ -763,7 +763,7 @@ void func_8003C0F0(void) { case COURSE_RAINBOW_ROAD: case COURSE_WARIO_STADIUM: case COURSE_DK_JUNGLE: - switch (D_800DC52C) { + switch (gActiveScreenMode) { case 0: switch (gModeSelection) { case GRAND_PRIX: @@ -857,7 +857,7 @@ void func_8003C0F0(void) { break; case COURSE_BLOCK_FORT: - switch (D_800DC52C) { + switch (gActiveScreenMode) { case 1: case 2: temp = 5; @@ -896,7 +896,7 @@ void func_8003C0F0(void) { break; case COURSE_SKYSCRAPER: - switch (D_800DC52C) { + switch (gActiveScreenMode) { case 1: case 2: temp = 0x1E0; @@ -933,7 +933,7 @@ void func_8003C0F0(void) { break; case COURSE_DOUBLE_DECK: - switch (D_800DC52C) { + switch (gActiveScreenMode) { case 1: case 2: temp = 0x37; @@ -970,7 +970,7 @@ void func_8003C0F0(void) { break; case COURSE_BIG_DONUT: - switch (D_800DC52C) { + switch (gActiveScreenMode) { case 1: case 2: temp = 0xC8; @@ -1084,7 +1084,7 @@ void func_8003D080(void) { func_8003C0F0(); } if (D_800DC51C == 0) { - switch (D_800DC52C) { + switch (gActiveScreenMode) { case 0: switch (gModeSelection) { case GRAND_PRIX: @@ -1150,7 +1150,7 @@ void func_8003D080(void) { break; } } else { - switch (D_800DC52C) { + switch (gActiveScreenMode) { case 0: func_8001C4D0(gPlayerOne->unk_0A4, gPlayerOne->unk_0A8, gPlayerOne->unk_0AC, gPlayerOne->unk_0BC, 3, 0); break; @@ -1173,7 +1173,7 @@ void func_8003D080(void) { } } - switch (D_800DC52C) { + switch (gActiveScreenMode) { case 0: func_8003CD98(gPlayerTwo, camera1, 0, 0); // sic func_8003CD98(gPlayerTwo, camera1, 1, 0); diff --git a/src/code_80040E50.c b/src/code_80040E50.c index ff7767a79..507686cc7 100644 --- a/src/code_80040E50.c +++ b/src/code_80040E50.c @@ -117,7 +117,7 @@ s32 func_80041028(u16 *arg0, u16 arg1, u16 arg2) { s32 phi_v1 = 0; u16 temp_t6 = arg1; u16 temp_t8 = arg2; - + if (*arg0 < temp_t6) { *arg0 += temp_t8; if (*arg0 >= temp_t6) { @@ -281,7 +281,7 @@ UNUSED s32 func_8004132C(s32 *arg0, s32 arg1, s32 arg2) { *arg0 = arg1; phi_v1 = 1; } - + } else if (arg1 < temp_v0) { if (arg2 >= 0) { *arg0 = (s32) (temp_v0 - arg2); @@ -358,11 +358,11 @@ GLOBAL_ASM("asm/non_matchings/code_80040E50/func_80041530.s") #endif Vec3f *func_80041594(Vec3f arg0, Vec3f arg1, Vec3f arg2) { - + arg0[0] = (arg1[1] * arg2[2]) - (arg2[1] * arg1[2]); arg0[1] = (arg1[2] * arg2[0]) - (arg2[2] * arg1[0]); arg0[2] = (arg1[0] * arg2[1]) - (arg2[0] * arg1[1]); - + return &arg0; } @@ -701,13 +701,13 @@ GLOBAL_ASM("asm/non_matchings/code_80040E50/func_80041D24.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 5bd751fca3befef73d6a2e20d84a88cc918a77fe void guOrtho(Mtx *, f32, f32, f32, f32, f32, f32, f32); /* extern */ -extern s32 D_800DC52C; +extern s32 gActiveScreenMode; extern s8 D_801658FE; extern Mtx D_80183D60; void func_80041D34(void) { guOrtho(&D_80183D60, 0.0f, 320.0f, 240.0f, 0.0f, -1.0f, 1.0f, 1.0f); - switch (D_800DC52C) { /* irregular */ + switch (gActiveScreenMode) { /* irregular */ case 0: guOrtho(&gGfxPool->mtxPool[5], 0.0f, 320.0f, 240.0f, 0.0f, -1.0f, 1.0f, 1.0f); break; diff --git a/src/code_800431B0.c b/src/code_800431B0.c index 4052f3168..1ddc06de9 100644 --- a/src/code_800431B0.c +++ b/src/code_800431B0.c @@ -6454,7 +6454,7 @@ void func_800514BC(void) { } phi_s3 = 8; phi_s1 = 0; - if ((gPlayerCountSelection1 == 2) && (D_800DC52C == 2)) { + if ((gPlayerCountSelection1 == 2) && (gActiveScreenMode == SCREEN_MODE_2P_SPLITSCREEN_VERTICAL)) { phi_s3 = 0; } temp_s0 = phi_s3 - 1; diff --git a/src/code_80057C60.c b/src/code_80057C60.c index 9d79311a0..54528394d 100644 --- a/src/code_80057C60.c +++ b/src/code_80057C60.c @@ -10685,7 +10685,7 @@ void func_8006AFD0(void *arg0, s8 arg1, s16 arg2, s8 arg3) { temp_v0_2 = (arg3 * 0xB8) + &cameras; temp_f20 = arg0->unk14 - temp_v0_2->unk0; temp_f0 = arg0->unk1C - temp_v0_2->unk8; - if (D_800DC52C != 3) { + if (gActiveScreenMode != 3) { sp11C = temp_t1; phi_f20 = sqrtf((temp_f20 * temp_f20) + (temp_f0 * temp_f0)) / 300.0f; } else { @@ -11477,7 +11477,7 @@ void func_8006CEC0(void *arg0, s16 arg1, s8 arg2, s8 arg3) { goto block_22; } block_22: - temp_v0_4 = D_800DC52C; + temp_v0_4 = gActiveScreenMode; if (temp_v0_4 != 0) { if ((temp_v0_4 != 1) && (temp_v0_4 != 2) && (temp_v0_4 != 3)) { return; @@ -11621,14 +11621,14 @@ void func_8006D474(void *arg0, s8 arg1, s8 arg2) { if (temp_v0_2 != 1) { if (temp_v0_2 != 6) { - } else if (D_800DC52C == 3) { + } else if (gActiveScreenMode == 3) { if (arg2 == arg1) { func_80066BAC(arg0, arg1, phi_s2, arg2); } } else if (arg2 == arg1) { func_80066BAC(arg0, arg1, phi_s2, arg2); } - } else if (D_800DC52C == 3) { + } else if (gActiveScreenMode == 3) { if (arg2 == arg1) { func_8006538C(arg0, arg1, phi_s2, arg2); } @@ -11639,56 +11639,56 @@ void func_8006D474(void *arg0, s8 arg1, s8 arg2) { switch (temp_t8_2) { /* switch 1 */ case 1: /* switch 1 */ case 9: /* switch 1 */ - if (D_800DC52C == 0) { + if (gActiveScreenMode == 0) { func_800691B8(arg0, arg1, phi_s2, arg2); } else if (arg2 == arg1) { func_800691B8(arg0, arg1, phi_s2, arg2); } break; case 2: /* switch 1 */ - if (D_800DC52C == 0) { + if (gActiveScreenMode == 0) { func_800696CC(arg0, arg1, phi_s2, arg2, temp_s5->unkAD4); } else if (arg2 == arg1) { func_800696CC(arg0, arg1, phi_s2, arg2, temp_s5->unkAD4); } break; case 3: /* switch 1 */ - if (D_800DC52C == 0) { + if (gActiveScreenMode == 0) { func_80067280(arg0, arg1, phi_s2, arg2); } else if (arg2 == arg1) { func_80067280(arg0, arg1, phi_s2, arg2); } break; case 4: /* switch 1 */ - if (D_800DC52C == 0) { + if (gActiveScreenMode == 0) { func_80069444(arg0, arg1, phi_s2, arg2); } else if (arg2 == arg1) { func_80069444(arg0, arg1, phi_s2, arg2); } break; case 5: /* switch 1 */ - if (D_800DC52C == 0) { + if (gActiveScreenMode == 0) { func_80069938(arg0, arg1, phi_s2, arg2); } else if (arg2 == arg1) { func_80069938(arg0, arg1, phi_s2, arg2); } break; case 6: /* switch 1 */ - if (D_800DC52C == 0) { + if (gActiveScreenMode == 0) { func_80069BA8(arg0, arg1, phi_s2, arg2); } else if (arg2 == arg1) { func_80069BA8(arg0, arg1, phi_s2, arg2); } break; case 7: /* switch 1 */ - if (D_800DC52C == 0) { + if (gActiveScreenMode == 0) { func_80069DB8(arg0, arg1, phi_s2, arg2); } else if (arg2 == arg1) { func_80069DB8(arg0, arg1, phi_s2, arg2); } break; case 8: /* switch 1 */ - if (D_800DC52C == 0) { + if (gActiveScreenMode == 0) { func_80067604(arg0, arg1, phi_s2, arg2); } else if (arg2 == arg1) { func_80067604(arg0, arg1, phi_s2, arg2); @@ -11698,7 +11698,7 @@ void func_8006D474(void *arg0, s8 arg1, s8 arg2) { temp_t6 = temp_s5->unk53A; switch (temp_t6) { /* switch 2 */ case 1: /* switch 2 */ - if (D_800DC52C == 3) { + if (gActiveScreenMode == 3) { if (arg2 == arg1) { func_80065AB0(arg0, arg1, phi_s2, arg2); } @@ -11710,7 +11710,7 @@ void func_8006D474(void *arg0, s8 arg1, s8 arg2) { case 3: /* switch 2 */ case 4: /* switch 2 */ case 5: /* switch 2 */ - if (D_800DC52C == 3) { + if (gActiveScreenMode == 3) { if (arg2 == arg1) { func_80065F0C(arg0, arg1, phi_s2, arg2); } @@ -11719,7 +11719,7 @@ void func_8006D474(void *arg0, s8 arg1, s8 arg2) { } break; case 9: /* switch 2 */ - if (D_800DC52C == 3) { + if (gActiveScreenMode == 3) { if (arg2 == arg1) { func_800664E0(arg0, arg1, phi_s2, arg2); } @@ -11728,7 +11728,7 @@ void func_8006D474(void *arg0, s8 arg1, s8 arg2) { } break; case 11: /* switch 2 */ - if (D_800DC52C == 3) { + if (gActiveScreenMode == 3) { if (arg2 == arg1) { func_8006A01C(arg0, arg1, phi_s2, arg2); } @@ -11802,7 +11802,7 @@ void func_8006DD3C(void *arg0, s8 arg1, s8 arg2) { if (temp_v0_2 == 5) { func_8006A280(arg0, arg1, phi_s0, arg2); } - } else if (D_800DC52C == 3) { + } else if (gActiveScreenMode == 3) { if (arg2 == arg1) { func_80066998(arg0, arg1, phi_s0, arg2); } @@ -11857,7 +11857,7 @@ void func_8006E058(void) { s32 temp_v0_5; s32 phi_v0; - temp_v0 = D_800DC52C; + temp_v0 = gActiveScreenMode; if (temp_v0 != 0) { if ((temp_v0 != 1) && (temp_v0 != 2)) { if (temp_v0 != 3) { diff --git a/src/code_80071F00.c b/src/code_80071F00.c index ad15b8cb7..0b49cfdc4 100644 --- a/src/code_80071F00.c +++ b/src/code_80071F00.c @@ -6576,7 +6576,7 @@ void func_8007B34C(s32 playerId) { func_8007B254(temp_s0, playerId); break; case 0x2: - temp_v0 = D_800DC52C; + temp_v0 = gActiveScreenMode; if (temp_v0 == 0) { temp_v1 = (playerId * 0x84) + &D_8018CA70; sp28 = temp_v1; @@ -6640,7 +6640,7 @@ void func_8007B34C(s32 playerId) { func_8007278C(temp_s0, 0x14); break; case 0xB: - temp_v0_2 = D_800DC52C; + temp_v0_2 = gActiveScreenMode; if (temp_v0_2 == 0) { if (func_8004106C((playerId * 0x84) + 0x48 + &D_8018CA70, 0, 4) != 0) { func_80072488(temp_s0); diff --git a/src/code_80280000.c b/src/code_80280000.c index 4beb8d9db..fbf592c05 100644 --- a/src/code_80280000.c +++ b/src/code_80280000.c @@ -130,7 +130,7 @@ void func_80280420(void) { D_800DC5EC->screenStartX = 160; D_800DC5EC->screenStartY = 120; gScreenModeSelection = SCREEN_MODE_1P; - D_800DC52C = 0; + gActiveScreenMode = SCREEN_MODE_1P; gPrevLoadedAddress = D_8015F734; load_course(gCurrentCourseId); D_8015F730 = gPrevLoadedAddress; diff --git a/src/code_80281780.c b/src/code_80281780.c index 7c16b1c15..0c1e2fe56 100644 --- a/src/code_80281780.c +++ b/src/code_80281780.c @@ -92,7 +92,7 @@ void load_ending_sequence_royalraceway(void) { D_800DC5EC->screenStartY = 120; gScreenModeSelection = SCREEN_MODE_1P; gPrevLoadedAddress = (s32) D_8015F734; - D_800DC52C = 0; + gActiveScreenMode = SCREEN_MODE_1P; gModeSelection = GRAND_PRIX; load_course(gCurrentCourseId); D_8015F730 = (s32) gPrevLoadedAddress; diff --git a/src/code_80281780.h b/src/code_80281780.h index 635c9aaa4..7ba625082 100644 --- a/src/code_80281780.h +++ b/src/code_80281780.h @@ -24,7 +24,7 @@ extern u16 D_800DC5B4; extern s32 gIsMirrorMode; extern s32 gScreenModeSelection; -extern s32 D_800DC52C; +extern s32 gActiveScreenMode; extern s32 gModeSelection; extern u16 D_800DC5BC; extern u16 D_800DC5C8; diff --git a/src/code_8028DF00.c b/src/code_8028DF00.c index 3b0abfd43..86d8c4caa 100644 --- a/src/code_8028DF00.c +++ b/src/code_8028DF00.c @@ -67,7 +67,7 @@ extern float gCourseTimer; extern float D_800DC594; extern s32 gScreenModeSelection; extern s32 D_8018D2AC; -extern s32 D_800DC52C; +extern s32 gActiveScreenMode; extern s16 gCurrentCourseId; extern u16 D_80162DD4[]; extern u16 D_8015F890; @@ -300,7 +300,7 @@ void func_8028E438(void) { D_80150148 = (f32) ((f32) temp_v0->screenWidth / (f32) temp_v0->screenHeight); if (phi_v1_4 == 4) { D_8015F894 = 2; - D_800DC52C = 0; + gActiveScreenMode = 0; D_800DC5EC->screenWidth = temp_v0->screenWidth; D_800DC5EC->screenHeight = temp_v0->screenHeight; D_800DC5EC->screenStartX = temp_v0->screenStartX; @@ -435,7 +435,7 @@ void func_8028E678(void) { D_800DC5F0->screenStartX = D_800DC5EC->screenStartX; D_800DC5F0->screenStartY = D_800DC5EC->screenStartY; - D_800DC52C = 2; + gActiveScreenMode = 2; D_80150148 = 1.33333337; gPlayerCountSelection1 = 2; func_8003DB5C(); @@ -804,7 +804,7 @@ void func_8028F588(void) { s16 phi_v0_7; s16 phi_v0_8; - temp_v0 = D_800DC52C; + temp_v0 = gActiveScreenMode; if (temp_v0 != 0) { if (temp_v0 != 1) { if (temp_v0 != 2) { @@ -943,7 +943,7 @@ loop_2: temp_v0 = phi_s3->unk_000; if (((temp_v0 & PLAYER_HUMAN) != 0) && ((temp_v0 & PLAYER_CPU) == 0)) { temp_s0 = &gControllers[phi_s2]; - if (D_800DC52C != 3) { + if (gActiveScreenMode != 3) { temp_v0_2 = temp_s0->buttonPressed; if (((temp_v0_2 & 0x20) != 0) && ((temp_s0->button & 0x10) == 0)) { temp_s0->buttonPressed = temp_v0_2 & 0xFFDF; @@ -1096,7 +1096,7 @@ void func_8028FCBC(void) { case 1: func_8028F914(); if (D_802BA034 == 1.0f) { - if (D_800DC52C != 0) { + if (gActiveScreenMode != 0) { if (gCurrentCourseId == COURSE_LUIGI_RACEWAY) { func_802A7940(); } else if (gCurrentCourseId == COURSE_WARIO_STADIUM) { @@ -1437,7 +1437,7 @@ void func_80290B14(void) { func_80059C50(); - switch(D_800DC52C) { + switch(gActiveScreenMode) { case 0: func_8001EE98(gPlayerOneCopy, camera1, 0); break; diff --git a/src/code_80290C20.c b/src/code_80290C20.c index 73b797b48..fd51a4102 100644 --- a/src/code_80290C20.c +++ b/src/code_80290C20.c @@ -449,7 +449,7 @@ block_9: temp_t7 = gCurrentCourseId; switch (temp_t7) { /* switch 1 */ case 2: /* switch 1 */ - if ((D_800DC52C == 0) && (sp21A >= 6) && (sp21A < 0xA) && ((sp21A != 9) || ((sp218 >= 0xA000) && (sp218 < 0xE001)))) { + if ((gActiveScreenMode == 0) && (sp21A >= 6) && (sp21A < 0xA) && ((sp21A != 9) || ((sp218 >= 0xA000) && (sp218 < 0xE001)))) { temp_v1_9 = gDisplayListHead; gDisplayListHead = temp_v1_9 + 8; temp_v1_9->words.w1 = &D_06009228; @@ -1566,7 +1566,7 @@ extern Gfx luigi_raceway_dls[]; extern s32 D_800DC5DC; extern s32 D_800DC5E0; -extern s32 D_800DC52C; +extern s32 gActiveScreenMode; extern s16 D_802B87D8; void render_luigi_raceway(struct UnkStruct_800DC5EC *arg0) { @@ -1595,7 +1595,7 @@ void render_luigi_raceway(struct UnkStruct_800DC5EC *arg0) { D_800DC5DC = 88; D_800DC5E0 = 72; - if ((D_800DC52C == 0) && (sp22 >= 10) && (sp22 < 17)) { + if ((gActiveScreenMode == 0) && (sp22 >= 10) && (sp22 < 17)) { phi_v0 = sRenderedFramebuffer - 1; @@ -1884,7 +1884,7 @@ void render_wario_stadium(void *arg0) { temp_v0_14->words.w0 = 0xB7000000; D_800DC5DC = 0x58; D_800DC5E0 = 0x48; - if (D_800DC52C == 0) { + if (gActiveScreenMode == 0) { temp_v0_15 = sRenderedFramebuffer - 1; phi_v0 = temp_v0_15; if (temp_v0_15 < 0) { diff --git a/src/code_80296A50.c b/src/code_80296A50.c index 8043a6a20..a1f9d7e6c 100644 --- a/src/code_80296A50.c +++ b/src/code_80296A50.c @@ -2956,7 +2956,7 @@ block_9: *phi_v0 = 0x6000000; phi_a1 = 0x6000000; } - if (D_800DC52C == 0) { + if (gActiveScreenMode == 0) { if (temp_f2 < D_802B96E4) { temp_v0_7 = gDisplayListHead; gDisplayListHead = temp_v0_7 + 8; @@ -3027,7 +3027,7 @@ void func_8029B2E4(void *arg0, s32 arg1) { temp_f0 = func_802B80D0(temp_a1, arg0->unk26, 0x451C4000, (&D_80150130)[(arg0 - camera1) / 0xB8], D_802B96F0); temp_f2 = temp_f0; if (!(temp_f0 < 0.0f) && (temp_v0 = gDisplayListHead, gDisplayListHead = temp_v0 + 8, temp_v0->unk4 = -1, temp_v0->unk0 = 0xBB000001, temp_v0_2 = gDisplayListHead, gDisplayListHead = temp_v0_2 + 8, temp_v0_2->unk4 = 0x20000, temp_v0_2->unk0 = 0xB6000000, sp44 = temp_f2, func_802B5F74(&spC8, temp_a1, arg1 + 0x10), (func_802B4FF8(&spC8, 0) != 0))) { - if (D_800DC52C == 0) { + if (gActiveScreenMode == 0) { if (temp_f2 < D_802B96F4) { temp_v0_3 = gDisplayListHead; gDisplayListHead = temp_v0_3 + 8; @@ -3104,7 +3104,7 @@ void func_8029B4E0(void *arg0, s32 arg1) { temp_f0 = func_802B80D0(temp_a1, arg0->unk26, 0x451C4000, (&D_80150130)[(arg0 - camera1) / 0xB8], D_802B9700); temp_f2 = temp_f0; if (!(temp_f0 < 0.0f) && (temp_v0 = gDisplayListHead, gDisplayListHead = temp_v0 + 8, temp_v0->unk4 = -1, temp_v0->unk0 = 0xBB000001, temp_v0_2 = gDisplayListHead, gDisplayListHead = temp_v0_2 + 8, temp_v0_2->unk4 = 0x20000, temp_v0_2->unk0 = 0xB6000000, sp44 = temp_f2, func_802B5F74(&spC8, temp_a1, arg1 + 0x10), func_802B5F00(&spC8, 0x3DCCCCCD), (func_802B4FF8(&spC8, 0) != 0))) { - if (D_800DC52C == 0) { + if (gActiveScreenMode == 0) { if (temp_f2 < D_802B9704) { temp_v0_3 = gDisplayListHead; gDisplayListHead = temp_v0_3 + 8; @@ -3180,7 +3180,7 @@ void func_8029B6EC(void *arg0, s32 arg1) { temp_f0 = func_802B80D0(temp_a1, arg0->unk26, 0x451C4000, (&D_80150130)[(arg0 - camera1) / 0xB8], D_802B9710); temp_f2 = temp_f0; if (!(temp_f0 < 0.0f) && (temp_v0 = gDisplayListHead, gDisplayListHead = temp_v0 + 8, temp_v0->unk4 = -1, temp_v0->unk0 = 0xBB000001, temp_v0_2 = gDisplayListHead, gDisplayListHead = temp_v0_2 + 8, temp_v0_2->unk4 = 0x20000, temp_v0_2->unk0 = 0xB6000000, sp44 = temp_f2, func_802B5F74(&spC8, temp_a1, arg1 + 0x10), (func_802B4FF8(&spC8, 0) != 0))) { - if (D_800DC52C == 0) { + if (gActiveScreenMode == 0) { if (temp_f2 < D_802B9714) { temp_v0_3 = gDisplayListHead; gDisplayListHead = temp_v0_3 + 8; diff --git a/src/code_802A3730.c b/src/code_802A3730.c index ddfa1a8b2..b131d62d1 100644 --- a/src/code_802A3730.c +++ b/src/code_802A3730.c @@ -285,7 +285,7 @@ void func_802A41D4(void) { void func_802A4300(void) { - if ( D_800DC52C == 0) { + if (gActiveScreenMode == SCREEN_MODE_1P) { return; } if (D_800DC5B0 != 0) { @@ -300,14 +300,14 @@ void func_802A4300(void) { gDPSetScissor(gDisplayListHead++, G_SC_NON_INTERLACE, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT); gDPPipeSync(gDisplayListHead++); - switch(D_800DC52C) { - case 2: + switch(gActiveScreenMode) { + case SCREEN_MODE_2P_SPLITSCREEN_VERTICAL: gDPFillRectangle(gDisplayListHead++, 157, 0, 159, 239); break; - case 1: + case SCREEN_MODE_2P_SPLITSCREEN_HORIZONTAL: gDPFillRectangle(gDisplayListHead++, 0, 119, 319, 121); break; - case 3: + case SCREEN_MODE_3P_4P_SPLITSCREEN: gDPFillRectangle(gDisplayListHead++, 157, 0, 159, 239); gDPFillRectangle(gDisplayListHead++, 0, 119, 319, 121); break; @@ -761,7 +761,7 @@ extern f32 D_8015013C; extern f32 D_80150130; void func_802A4EF4(void) { - switch(D_800DC52C) { + switch(gActiveScreenMode) { case 0: func_8001F394(gPlayerOne, &D_80150130); break; @@ -1431,7 +1431,7 @@ void func_802A74BC(void) { wrapper->pathCounter = 1; - switch(D_800DC52C) { + switch(gActiveScreenMode) { case 0: if (i == 0) { wrapper->screenStartX = 160; @@ -1583,7 +1583,7 @@ extern u16 sRenderedFramebuffer; void func_802A7728(void) { s16 temp_v0; - if (D_800DC52C == 3) { + if (gActiveScreenMode == SCREEN_MODE_3P_4P_SPLITSCREEN) { D_800DC5DC = 0; } else { D_800DC5DC = 128; @@ -1606,7 +1606,7 @@ void func_802A7728(void) { void func_802A7940(void) { s16 temp_v0; - if (D_800DC52C == 3) { + if (gActiveScreenMode == SCREEN_MODE_3P_4P_SPLITSCREEN) { D_800DC5DC = 0; } else { D_800DC5DC = 128; diff --git a/src/main.c b/src/main.c index bbccb7747..3cc63bfe0 100644 --- a/src/main.c +++ b/src/main.c @@ -39,7 +39,7 @@ extern s32 func_802A7D70(u8 *arg0, u8 *arg1); extern void func_802A7CF0(u32 arg0, u32 arg1); extern s32 D_800DC524; -extern s32 D_800DC52C; +extern s32 gActiveScreenMode; extern f32 D_800DC594; @@ -170,7 +170,7 @@ u16 D_800DC51C = 0; u16 gEnableDebugMode = 0; s32 D_800DC524 = 7; // = COURSE_DATA_MENU?; UNUSED s32 D_800DC528 = 1; -s32 D_800DC52C = 0; +s32 gActiveScreenMode = SCREEN_MODE_1P; s32 gScreenModeSelection[2] = {0}; s32 gPlayerCountSelection1 = 2; @@ -597,7 +597,7 @@ void func_8000142C(void) { } func_802A4EF4(); - switch(D_800DC52C) { + switch(gActiveScreenMode) { case 0: D_80150114 = 2; func_80005F44(); @@ -1063,25 +1063,25 @@ void thread3_video(UNUSED void *arg0) { void func_800025D4(void) { func_80091B78(); - D_800DC52C = 0; + gActiveScreenMode = SCREEN_MODE_1P; func_802A4D18(); } void func_80002600(void) { func_80091B78(); - D_800DC52C = 0; + gActiveScreenMode = SCREEN_MODE_1P; func_802A4D18(); } void func_8000262C(void) { func_80091B78(); - D_800DC52C = 0; + gActiveScreenMode = SCREEN_MODE_1P; func_802A4D18(); } void func_80002658(void) { func_80091B78(); - D_800DC52C = 0; + gActiveScreenMode = SCREEN_MODE_1P; func_802A4D18(); } diff --git a/src/staff_ghosts.c b/src/staff_ghosts.c index 7d06b4507..55c828ad3 100644 --- a/src/staff_ghosts.c +++ b/src/staff_ghosts.c @@ -65,7 +65,7 @@ extern OSMesg gMainReceivedMesg; extern s16 gCurrentCourseId; extern s32 gModeSelection; -extern s32 D_800DC52C; +extern s32 gActiveScreenMode; extern u16 D_8015F890; extern s32 lapCount[]; extern s32 D_8018CA78; @@ -208,7 +208,7 @@ void func_80005310(void) { D_80162DEC = 0; D_80162DF8 = 0; - if (gModeSelection == TIME_TRIALS && D_800DC52C == 0) { + if (gModeSelection == TIME_TRIALS && gActiveScreenMode == SCREEN_MODE_1P) { if (D_8015F890 == 1) { func_80004FB0(); @@ -548,7 +548,7 @@ void func_80005B18(void) { if (D_80162DEC > 100) { D_80162DEC = 100; } - if ((gModeSelection == TIME_TRIALS) && (D_800DC52C == 0)) { + if ((gModeSelection == TIME_TRIALS) && (gActiveScreenMode == 0)) { if ((D_80162DD4 == 0) && (lapCount[4] != 3)) { func_800057DC(); //gModeSelection, &D_80162DDC, 3, &D_80162DD4); } @@ -567,7 +567,7 @@ GLOBAL_ASM("asm/non_matchings/staff_ghosts/func_80005B18.s") #endif void func_80005E6C(void) { - if ((gModeSelection == TIME_TRIALS) && (gModeSelection == TIME_TRIALS) && (D_800DC52C == 0)) { + if ((gModeSelection == TIME_TRIALS) && (gModeSelection == TIME_TRIALS) && (gActiveScreenMode == SCREEN_MODE_1P)) { if ((D_80162DD8 == 0) && (D_80164394 != 3)) { func_800057DC(); //3 }