From 58fb53c2a45cec08e343a7a907be008f68451847 Mon Sep 17 00:00:00 2001 From: CoderStig <79828759+CoderStig@users.noreply.github.com> Date: Mon, 18 Oct 2021 13:48:48 -0600 Subject: [PATCH] Controller/Player struct data/bss in C (#37) * Controller/player structs ok --- asm/audio/external.s | 152 ++++++------- asm/bss_main.s | 102 +-------- asm/code_80091750.s | 12 +- asm/code_80290C20.s | 4 +- asm/code_80296A50.s | 52 ++--- asm/code_802A3730.s | 4 +- asm/code_802B0210.s | 116 +++++----- asm/non_matchings/code_80005FD0.s | 132 ++++++------ .../code_800393C0/func_8003D080.s | 200 +++++++++--------- .../code_8008C1D0/code_8008C1D0.s | 4 +- .../code_8028DF00/code_8028DF00.s | 20 +- .../code_8028DF00/func_8028DF00.s | 10 +- .../code_8028DF00/func_8028DF38.s | 20 +- .../code_8028DF00/func_8028E0F0.s | 6 +- .../code_8028DF00/func_8028E298.s | 6 +- .../code_8028DF00/func_8028EDA8.s | 6 +- .../code_8028DF00/func_8028EE8C.s | 4 +- asm/non_matchings/code_8028DF00/wip.s | 16 +- data/data_0DD0A0.s | 143 ------------- include/common_structs.h | 8 +- include/types.h | 39 +--- mk64.ld | 1 + src/code_800029B0.c | 8 +- src/code_800393C0.c | 55 ++--- src/code_8008C1D0.c | 18 +- src/code_80281780.c | 16 +- src/code_8028DF00.c | 69 +++--- src/main.c | 124 ++++++++--- 28 files changed, 569 insertions(+), 778 deletions(-) diff --git a/asm/audio/external.s b/asm/audio/external.s index c03480c22..6018bbd21 100644 --- a/asm/audio/external.s +++ b/asm/audio/external.s @@ -1239,11 +1239,11 @@ glabel func_800C2474 /* 0C31A0 800C25A0 3C1F8019 */ lui $ra, %hi(D_8018FBA8) # $ra, 0x8019 /* 0C31A4 800C25A4 3C0B800F */ lui $t3, %hi(D_800E9DF4) # $t3, 0x800f /* 0C31A8 800C25A8 3C0A800F */ lui $t2, %hi(D_800E9DB4) # $t2, 0x800f -/* 0C31AC 800C25AC 3C08800F */ lui $t0, %hi(D_800F6990) # $t0, 0x800f +/* 0C31AC 800C25AC 3C08800F */ lui $t0, %hi(gPlayers) # $t0, 0x800f /* 0C31B0 800C25B0 44806000 */ mtc1 $zero, $f12 /* 0C31B4 800C25B4 44800000 */ mtc1 $zero, $f0 /* 0C31B8 800C25B8 A420A184 */ sh $zero, %lo(D_800EA184)($at) -/* 0C31BC 800C25BC 25086990 */ addiu $t0, %lo(D_800F6990) # addiu $t0, $t0, 0x6990 +/* 0C31BC 800C25BC 25086990 */ addiu $t0, %lo(gPlayers) # addiu $t0, $t0, 0x6990 /* 0C31C0 800C25C0 254A9DB4 */ addiu $t2, %lo(D_800E9DB4) # addiu $t2, $t2, -0x624c /* 0C31C4 800C25C4 256B9DF4 */ addiu $t3, %lo(D_800E9DF4) # addiu $t3, $t3, -0x620c /* 0C31C8 800C25C8 27FFFBA8 */ addiu $ra, %lo(D_8018FBA8) # addiu $ra, $ra, -0x458 @@ -5023,8 +5023,8 @@ glabel func_800C5BD0 /* 0C67E0 800C5BE0 03A0F025 */ move $fp, $sp /* 0C67E4 800C5BE4 15C0000D */ bnez $t6, .L800C5C1C /* 0C67E8 800C5BE8 AFBF002C */ sw $ra, 0x2c($sp) -/* 0C67EC 800C5BEC 3C0F800F */ lui $t7, %hi(D_800F6BE4) # $t7, 0x800f -/* 0C67F0 800C5BF0 95EF6BE4 */ lhu $t7, %lo(D_800F6BE4)($t7) +/* 0C67EC 800C5BEC 3C0F800F */ lui $t7, %hi(gPlayers+0x254) # $t7, 0x800f +/* 0C67F0 800C5BF0 95EF6BE4 */ lhu $t7, %lo(gPlayers+0x254)($t7) /* 0C67F4 800C5BF4 3C04800F */ lui $a0, %hi(D_800EA154) /* 0C67F8 800C5BF8 3C01F300 */ lui $at, 0xf300 /* 0C67FC 800C5BFC 008F2021 */ addu $a0, $a0, $t7 @@ -5111,9 +5111,9 @@ glabel func_800C5D04 /* 0C6918 800C5D18 000E7080 */ sll $t6, $t6, 2 /* 0C691C 800C5D1C 01C57023 */ subu $t6, $t6, $a1 /* 0C6920 800C5D20 000E70C0 */ sll $t6, $t6, 3 -/* 0C6924 800C5D24 3C0F800F */ lui $t7, %hi(D_800F69D4) +/* 0C6924 800C5D24 3C0F800F */ lui $t7, %hi(gPlayers+0x44) /* 0C6928 800C5D28 01EE7821 */ addu $t7, $t7, $t6 -/* 0C692C 800C5D2C 85EF69D4 */ lh $t7, %lo(D_800F69D4)($t7) +/* 0C692C 800C5D2C 85EF69D4 */ lh $t7, %lo(gPlayers+0x44)($t7) /* 0C6930 800C5D30 27BDFFD0 */ addiu $sp, $sp, -0x30 /* 0C6934 800C5D34 AFBE0028 */ sw $fp, 0x28($sp) /* 0C6938 800C5D38 24010020 */ li $at, 32 @@ -5203,8 +5203,8 @@ glabel func_800C5E38 /* 0C6A68 800C5E68 01E67823 */ subu $t7, $t7, $a2 /* 0C6A6C 800C5E6C 000F7880 */ sll $t7, $t7, 2 /* 0C6A70 800C5E70 01E67823 */ subu $t7, $t7, $a2 -/* 0C6A74 800C5E74 3C18800F */ lui $t8, %hi(D_800F6990) # $t8, 0x800f -/* 0C6A78 800C5E78 27186990 */ addiu $t8, %lo(D_800F6990) # addiu $t8, $t8, 0x6990 +/* 0C6A74 800C5E74 3C18800F */ lui $t8, %hi(gPlayers) # $t8, 0x800f +/* 0C6A78 800C5E78 27186990 */ addiu $t8, %lo(gPlayers) # addiu $t8, $t8, 0x6990 /* 0C6A7C 800C5E7C 000F78C0 */ sll $t7, $t7, 3 /* 0C6A80 800C5E80 01F83821 */ addu $a3, $t7, $t8 /* 0C6A84 800C5E84 84F90044 */ lh $t9, 0x44($a3) @@ -5392,8 +5392,8 @@ glabel func_800C6108 /* 0C6D30 800C6130 000F7880 */ sll $t7, $t7, 2 /* 0C6D34 800C6134 C4249DD4 */ lwc1 $f4, %lo(D_800E9DD4)($at) /* 0C6D38 800C6138 01E67823 */ subu $t7, $t7, $a2 -/* 0C6D3C 800C613C 3C18800F */ lui $t8, %hi(D_800F6990) # $t8, 0x800f -/* 0C6D40 800C6140 27186990 */ addiu $t8, %lo(D_800F6990) # addiu $t8, $t8, 0x6990 +/* 0C6D3C 800C613C 3C18800F */ lui $t8, %hi(gPlayers) # $t8, 0x800f +/* 0C6D40 800C6140 27186990 */ addiu $t8, %lo(gPlayers) # addiu $t8, $t8, 0x6990 /* 0C6D44 800C6144 000F78C0 */ sll $t7, $t7, 3 /* 0C6D48 800C6148 3C01800F */ lui $at, %hi(D_800E9DC4) /* 0C6D4C 800C614C 00220821 */ addu $at, $at, $v0 @@ -5651,8 +5651,8 @@ glabel L800C64E4 /* 0C70F0 800C64F0 01044023 */ subu $t0, $t0, $a0 /* 0C70F4 800C64F4 00084080 */ sll $t0, $t0, 2 /* 0C70F8 800C64F8 01044023 */ subu $t0, $t0, $a0 -/* 0C70FC 800C64FC 3C09800F */ lui $t1, %hi(D_800F6990) # $t1, 0x800f -/* 0C7100 800C6500 25296990 */ addiu $t1, %lo(D_800F6990) # addiu $t1, $t1, 0x6990 +/* 0C70FC 800C64FC 3C09800F */ lui $t1, %hi(gPlayers) # $t1, 0x800f +/* 0C7100 800C6500 25296990 */ addiu $t1, %lo(gPlayers) # addiu $t1, $t1, 0x6990 /* 0C7104 800C6504 000840C0 */ sll $t0, $t0, 3 /* 0C7108 800C6508 01092821 */ addu $a1, $t0, $t1 /* 0C710C 800C650C 3C0140A0 */ li $at, 0x40A00000 # 5.000000 @@ -5690,9 +5690,9 @@ glabel L800C6544 /* 0C7188 800C6588 254A9EF4 */ addiu $t2, %lo(D_800E9EF4) # addiu $t2, $t2, -0x610c /* 0C718C 800C658C 01645823 */ subu $t3, $t3, $a0 /* 0C7190 800C6590 3C013F80 */ li $at, 0x3F800000 # 1.000000 -/* 0C7194 800C6594 3C0C800F */ lui $t4, %hi(D_800F6990) # $t4, 0x800f +/* 0C7194 800C6594 3C0C800F */ lui $t4, %hi(gPlayers) # $t4, 0x800f /* 0C7198 800C6598 004A1821 */ addu $v1, $v0, $t2 -/* 0C719C 800C659C 258C6990 */ addiu $t4, %lo(D_800F6990) # addiu $t4, $t4, 0x6990 +/* 0C719C 800C659C 258C6990 */ addiu $t4, %lo(gPlayers) # addiu $t4, $t4, 0x6990 /* 0C71A0 800C65A0 44811000 */ mtc1 $at, $f2 /* 0C71A4 800C65A4 000B58C0 */ sll $t3, $t3, 3 /* 0C71A8 800C65A8 016C2821 */ addu $a1, $t3, $t4 @@ -5706,8 +5706,8 @@ glabel L800C65B8 /* 0C71C4 800C65C4 01E47823 */ subu $t7, $t7, $a0 /* 0C71C8 800C65C8 000F7880 */ sll $t7, $t7, 2 /* 0C71CC 800C65CC 01E47823 */ subu $t7, $t7, $a0 -/* 0C71D0 800C65D0 3C18800F */ lui $t8, %hi(D_800F6990) # $t8, 0x800f -/* 0C71D4 800C65D4 27186990 */ addiu $t8, %lo(D_800F6990) # addiu $t8, $t8, 0x6990 +/* 0C71D0 800C65D0 3C18800F */ lui $t8, %hi(gPlayers) # $t8, 0x800f +/* 0C71D4 800C65D4 27186990 */ addiu $t8, %lo(gPlayers) # addiu $t8, $t8, 0x6990 /* 0C71D8 800C65D8 000F78C0 */ sll $t7, $t7, 3 /* 0C71DC 800C65DC 01F82821 */ addu $a1, $t7, $t8 /* 0C71E0 800C65E0 3C0140A0 */ li $at, 0x40A00000 # 5.000000 @@ -5736,9 +5736,9 @@ glabel L800C6618 /* 0C7234 800C6634 00084080 */ sll $t0, $t0, 2 /* 0C7238 800C6638 27399EF4 */ addiu $t9, %lo(D_800E9EF4) # addiu $t9, $t9, -0x610c /* 0C723C 800C663C 01044023 */ subu $t0, $t0, $a0 -/* 0C7240 800C6640 3C09800F */ lui $t1, %hi(D_800F6990) # $t1, 0x800f +/* 0C7240 800C6640 3C09800F */ lui $t1, %hi(gPlayers) # $t1, 0x800f /* 0C7244 800C6644 00591821 */ addu $v1, $v0, $t9 -/* 0C7248 800C6648 25296990 */ addiu $t1, %lo(D_800F6990) # addiu $t1, $t1, 0x6990 +/* 0C7248 800C6648 25296990 */ addiu $t1, %lo(gPlayers) # addiu $t1, $t1, 0x6990 /* 0C724C 800C664C 000840C0 */ sll $t0, $t0, 3 /* 0C7250 800C6650 01092821 */ addu $a1, $t0, $t1 /* 0C7254 800C6654 E4620000 */ swc1 $f2, ($v1) @@ -5846,9 +5846,9 @@ glabel func_800C6758 /* 0C73C4 800C67C4 000F7880 */ sll $t7, $t7, 2 /* 0C73C8 800C67C8 01E47823 */ subu $t7, $t7, $a0 /* 0C73CC 800C67CC 000F78C0 */ sll $t7, $t7, 3 -/* 0C73D0 800C67D0 3C01800F */ lui $at, %hi(D_800F6A24) +/* 0C73D0 800C67D0 3C01800F */ lui $at, %hi(gPlayers+0x94) /* 0C73D4 800C67D4 002F0821 */ addu $at, $at, $t7 -/* 0C73D8 800C67D8 C4266A24 */ lwc1 $f6, %lo(D_800F6A24)($at) +/* 0C73D8 800C67D8 C4266A24 */ lwc1 $f6, %lo(gPlayers+0x94)($at) /* 0C73DC 800C67DC 3C014110 */ li $at, 0x41100000 # 9.000000 /* 0C73E0 800C67E0 44814000 */ mtc1 $at, $f8 /* 0C73E4 800C67E4 3C01800F */ lui $at, %hi(D_800F3730) # $at, 0x800f @@ -6475,8 +6475,8 @@ glabel func_800C70A8 /* 0C7D00 800C7100 0018C080 */ sll $t8, $t8, 2 /* 0C7D04 800C7104 45010009 */ bc1t .L800C712C /* 0C7D08 800C7108 0305C023 */ subu $t8, $t8, $a1 -/* 0C7D0C 800C710C 3C19800F */ lui $t9, %hi(D_800F6990) # $t9, 0x800f -/* 0C7D10 800C7110 27396990 */ addiu $t9, %lo(D_800F6990) # addiu $t9, $t9, 0x6990 +/* 0C7D0C 800C710C 3C19800F */ lui $t9, %hi(gPlayers) # $t9, 0x800f +/* 0C7D10 800C7110 27396990 */ addiu $t9, %lo(gPlayers) # addiu $t9, $t9, 0x6990 /* 0C7D14 800C7114 0018C0C0 */ sll $t8, $t8, 3 /* 0C7D18 800C7118 03191821 */ addu $v1, $t8, $t9 /* 0C7D1C 800C711C 8C6400BC */ lw $a0, 0xbc($v1) @@ -6490,8 +6490,8 @@ glabel func_800C70A8 /* 0C7D38 800C7138 01856023 */ subu $t4, $t4, $a1 /* 0C7D3C 800C713C 000C6080 */ sll $t4, $t4, 2 /* 0C7D40 800C7140 01856023 */ subu $t4, $t4, $a1 -/* 0C7D44 800C7144 3C0E800F */ lui $t6, %hi(D_800F6990) # $t6, 0x800f -/* 0C7D48 800C7148 25CE6990 */ addiu $t6, %lo(D_800F6990) # addiu $t6, $t6, 0x6990 +/* 0C7D44 800C7144 3C0E800F */ lui $t6, %hi(gPlayers) # $t6, 0x800f +/* 0C7D48 800C7148 25CE6990 */ addiu $t6, %lo(gPlayers) # addiu $t6, $t6, 0x6990 /* 0C7D4C 800C714C 000C60C0 */ sll $t4, $t4, 3 /* 0C7D50 800C7150 018E1821 */ addu $v1, $t4, $t6 /* 0C7D54 800C7154 906F01D4 */ lbu $t7, 0x1d4($v1) @@ -7011,7 +7011,7 @@ glabel func_800C76C0 /* 0C8420 800C7820 0C03149E */ jal func_800C5278 /* 0C8424 800C7824 24040005 */ li $a0, 5 /* 0C8428 800C7828 93CA0043 */ lbu $t2, 0x43($fp) -/* 0C842C 800C782C 3C02800F */ lui $v0, %hi(D_800F6994) +/* 0C842C 800C782C 3C02800F */ lui $v0, %hi(gPlayers+0x4) /* 0C8430 800C7830 000A58C0 */ sll $t3, $t2, 3 /* 0C8434 800C7834 016A5823 */ subu $t3, $t3, $t2 /* 0C8438 800C7838 000B5900 */ sll $t3, $t3, 4 @@ -7020,7 +7020,7 @@ glabel func_800C76C0 /* 0C8444 800C7844 016A5823 */ subu $t3, $t3, $t2 /* 0C8448 800C7848 000B58C0 */ sll $t3, $t3, 3 /* 0C844C 800C784C 004B1021 */ addu $v0, $v0, $t3 -/* 0C8450 800C7850 84426994 */ lh $v0, %lo(D_800F6994)($v0) +/* 0C8450 800C7850 84426994 */ lh $v0, %lo(gPlayers+0x4)($v0) /* 0C8454 800C7854 1440000D */ bnez $v0, .L800C788C /* 0C8458 800C7858 28410004 */ slti $at, $v0, 4 /* 0C845C 800C785C 0C0325F1 */ jal func_800C97C4 @@ -7066,7 +7066,7 @@ glabel func_800C76C0 /* 0C84F0 800C78F0 0C032418 */ jal func_800C9060 /* 0C84F4 800C78F4 93C40043 */ lbu $a0, 0x43($fp) /* 0C84F8 800C78F8 93D80043 */ lbu $t8, 0x43($fp) -/* 0C84FC 800C78FC 3C02800F */ lui $v0, %hi(D_800F6994) +/* 0C84FC 800C78FC 3C02800F */ lui $v0, %hi(gPlayers+0x4) /* 0C8500 800C7900 3C041001 */ lui $a0, (0x100100FF >> 16) # lui $a0, 0x1001 /* 0C8504 800C7904 0018C8C0 */ sll $t9, $t8, 3 /* 0C8508 800C7908 0338C823 */ subu $t9, $t9, $t8 @@ -7076,7 +7076,7 @@ glabel func_800C76C0 /* 0C8518 800C7918 0338C823 */ subu $t9, $t9, $t8 /* 0C851C 800C791C 0019C8C0 */ sll $t9, $t9, 3 /* 0C8520 800C7920 00591021 */ addu $v0, $v0, $t9 -/* 0C8524 800C7924 84426994 */ lh $v0, %lo(D_800F6994)($v0) +/* 0C8524 800C7924 84426994 */ lh $v0, %lo(gPlayers+0x4)($v0) /* 0C8528 800C7928 14400013 */ bnez $v0, .L800C7978 /* 0C852C 800C792C 28410004 */ slti $at, $v0, 4 /* 0C8530 800C7930 0C030D12 */ jal func_800C3448 @@ -7395,7 +7395,7 @@ glabel func_800C76C0 /* 0C89B0 800C7DB0 3C19800E */ lui $t9, %hi(D_800DC5E8) # $t9, 0x800e /* 0C89B4 800C7DB4 8F39C5E8 */ lw $t9, %lo(D_800DC5E8)($t9) /* 0C89B8 800C7DB8 93C40043 */ lbu $a0, 0x43($fp) -/* 0C89BC 800C7DBC 3C05800F */ lui $a1, %hi(D_800F6BE4) +/* 0C89BC 800C7DBC 3C05800F */ lui $a1, %hi(gPlayers+0x254) /* 0C89C0 800C7DC0 001940C0 */ sll $t0, $t9, 3 /* 0C89C4 800C7DC4 01194023 */ subu $t0, $t0, $t9 /* 0C89C8 800C7DC8 00084100 */ sll $t0, $t0, 4 @@ -7405,7 +7405,7 @@ glabel func_800C76C0 /* 0C89D8 800C7DD8 000840C0 */ sll $t0, $t0, 3 /* 0C89DC 800C7DDC 3C01800F */ lui $at, %hi(D_800EA0EC) /* 0C89E0 800C7DE0 00A82821 */ addu $a1, $a1, $t0 -/* 0C89E4 800C7DE4 94A56BE4 */ lhu $a1, %lo(D_800F6BE4)($a1) +/* 0C89E4 800C7DE4 94A56BE4 */ lhu $a1, %lo(gPlayers+0x254)($a1) /* 0C89E8 800C7DE8 24180002 */ li $t8, 2 /* 0C89EC 800C7DEC 00240821 */ addu $at, $at, $a0 /* 0C89F0 800C7DF0 A038A0EC */ sb $t8, %lo(D_800EA0EC)($at) @@ -7439,7 +7439,7 @@ glabel func_800C76C0 /* 0C8A5C 800C7E5C 3C0E800E */ lui $t6, %hi(D_800DC5E8) # $t6, 0x800e /* 0C8A60 800C7E60 8DCEC5E8 */ lw $t6, %lo(D_800DC5E8)($t6) /* 0C8A64 800C7E64 93C40043 */ lbu $a0, 0x43($fp) -/* 0C8A68 800C7E68 3C05800F */ lui $a1, %hi(D_800F6BE4) +/* 0C8A68 800C7E68 3C05800F */ lui $a1, %hi(gPlayers+0x254) /* 0C8A6C 800C7E6C 000E78C0 */ sll $t7, $t6, 3 /* 0C8A70 800C7E70 01EE7823 */ subu $t7, $t7, $t6 /* 0C8A74 800C7E74 000F7900 */ sll $t7, $t7, 4 @@ -7449,7 +7449,7 @@ glabel func_800C76C0 /* 0C8A84 800C7E84 000F78C0 */ sll $t7, $t7, 3 /* 0C8A88 800C7E88 3C01800F */ lui $at, %hi(D_800EA0EC) /* 0C8A8C 800C7E8C 00AF2821 */ addu $a1, $a1, $t7 -/* 0C8A90 800C7E90 94A56BE4 */ lhu $a1, %lo(D_800F6BE4)($a1) +/* 0C8A90 800C7E90 94A56BE4 */ lhu $a1, %lo(gPlayers+0x254)($a1) /* 0C8A94 800C7E94 240D0002 */ li $t5, 2 /* 0C8A98 800C7E98 00240821 */ addu $at, $at, $a0 /* 0C8A9C 800C7E9C A02DA0EC */ sb $t5, %lo(D_800EA0EC)($at) @@ -7487,7 +7487,7 @@ glabel func_800C76C0 /* 0C8B18 800C7F18 3C0C800E */ lui $t4, %hi(D_800DC5E8) # $t4, 0x800e /* 0C8B1C 800C7F1C 8D8CC5E8 */ lw $t4, %lo(D_800DC5E8)($t4) /* 0C8B20 800C7F20 93C40043 */ lbu $a0, 0x43($fp) -/* 0C8B24 800C7F24 3C05800F */ lui $a1, %hi(D_800F6BE4) +/* 0C8B24 800C7F24 3C05800F */ lui $a1, %hi(gPlayers+0x254) /* 0C8B28 800C7F28 000C68C0 */ sll $t5, $t4, 3 /* 0C8B2C 800C7F2C 01AC6823 */ subu $t5, $t5, $t4 /* 0C8B30 800C7F30 000D6900 */ sll $t5, $t5, 4 @@ -7497,7 +7497,7 @@ glabel func_800C76C0 /* 0C8B40 800C7F40 000D68C0 */ sll $t5, $t5, 3 /* 0C8B44 800C7F44 3C01800F */ lui $at, %hi(D_800EA0EC) /* 0C8B48 800C7F48 00AD2821 */ addu $a1, $a1, $t5 -/* 0C8B4C 800C7F4C 94A56BE4 */ lhu $a1, %lo(D_800F6BE4)($a1) +/* 0C8B4C 800C7F4C 94A56BE4 */ lhu $a1, %lo(gPlayers+0x254)($a1) /* 0C8B50 800C7F50 240A0002 */ li $t2, 2 /* 0C8B54 800C7F54 00240821 */ addu $at, $at, $a0 /* 0C8B58 800C7F58 A02AA0EC */ sb $t2, %lo(D_800EA0EC)($at) @@ -7534,8 +7534,8 @@ glabel func_800C76C0 /* 0C8BC8 800C7FC8 0304C023 */ subu $t8, $t8, $a0 /* 0C8BCC 800C7FCC 0018C080 */ sll $t8, $t8, 2 /* 0C8BD0 800C7FD0 0304C023 */ subu $t8, $t8, $a0 -/* 0C8BD4 800C7FD4 3C19800F */ lui $t9, %hi(D_800F6990) # $t9, 0x800f -/* 0C8BD8 800C7FD8 27396990 */ addiu $t9, %lo(D_800F6990) # addiu $t9, $t9, 0x6990 +/* 0C8BD4 800C7FD4 3C19800F */ lui $t9, %hi(gPlayers) # $t9, 0x800f +/* 0C8BD8 800C7FD8 27396990 */ addiu $t9, %lo(gPlayers) # addiu $t9, $t9, 0x6990 /* 0C8BDC 800C7FDC 0018C0C0 */ sll $t8, $t8, 3 /* 0C8BE0 800C7FE0 03191821 */ addu $v1, $t8, $t9 /* 0C8BE4 800C7FE4 84620004 */ lh $v0, 4($v1) @@ -7590,8 +7590,8 @@ glabel func_800C76C0 /* 0C8C98 800C8098 01E47823 */ subu $t7, $t7, $a0 /* 0C8C9C 800C809C 000F7880 */ sll $t7, $t7, 2 /* 0C8CA0 800C80A0 01E47823 */ subu $t7, $t7, $a0 -/* 0C8CA4 800C80A4 3C18800F */ lui $t8, %hi(D_800F6990) # $t8, 0x800f -/* 0C8CA8 800C80A8 27186990 */ addiu $t8, %lo(D_800F6990) # addiu $t8, $t8, 0x6990 +/* 0C8CA4 800C80A4 3C18800F */ lui $t8, %hi(gPlayers) # $t8, 0x800f +/* 0C8CA8 800C80A8 27186990 */ addiu $t8, %lo(gPlayers) # addiu $t8, $t8, 0x6990 /* 0C8CAC 800C80AC 000F78C0 */ sll $t7, $t7, 3 /* 0C8CB0 800C80B0 01F81821 */ addu $v1, $t7, $t8 /* 0C8CB4 800C80B4 A3C40043 */ sb $a0, 0x43($fp) @@ -7627,9 +7627,9 @@ glabel func_800C76C0 /* 0C8D24 800C8124 000C6080 */ sll $t4, $t4, 2 /* 0C8D28 800C8128 01846023 */ subu $t4, $t4, $a0 /* 0C8D2C 800C812C 000C60C0 */ sll $t4, $t4, 3 -/* 0C8D30 800C8130 3C05800F */ lui $a1, %hi(D_800F6BE4) +/* 0C8D30 800C8130 3C05800F */ lui $a1, %hi(gPlayers+0x254) /* 0C8D34 800C8134 00AC2821 */ addu $a1, $a1, $t4 -/* 0C8D38 800C8138 94A56BE4 */ lhu $a1, %lo(D_800F6BE4)($a1) +/* 0C8D38 800C8138 94A56BE4 */ lhu $a1, %lo(gPlayers+0x254)($a1) /* 0C8D3C 800C813C 00240821 */ addu $at, $at, $a0 /* 0C8D40 800C8140 A02AA0EC */ sb $t2, %lo(D_800EA0EC)($at) /* 0C8D44 800C8144 3C012900 */ lui $at, (0x29008007 >> 16) # lui $at, 0x2900 @@ -7656,9 +7656,9 @@ glabel func_800C76C0 /* 0C8D94 800C8194 0018C080 */ sll $t8, $t8, 2 /* 0C8D98 800C8198 0304C023 */ subu $t8, $t8, $a0 /* 0C8D9C 800C819C 0018C0C0 */ sll $t8, $t8, 3 -/* 0C8DA0 800C81A0 3C05800F */ lui $a1, %hi(D_800F6BE4) +/* 0C8DA0 800C81A0 3C05800F */ lui $a1, %hi(gPlayers+0x254) /* 0C8DA4 800C81A4 00B82821 */ addu $a1, $a1, $t8 -/* 0C8DA8 800C81A8 94A56BE4 */ lhu $a1, %lo(D_800F6BE4)($a1) +/* 0C8DA8 800C81A8 94A56BE4 */ lhu $a1, %lo(gPlayers+0x254)($a1) /* 0C8DAC 800C81AC A02FA0EC */ sb $t7, %lo(D_800EA0EC)($at) /* 0C8DB0 800C81B0 3C012900 */ lui $at, (0x2900800D >> 16) # lui $at, 0x2900 /* 0C8DB4 800C81B4 3421800D */ ori $at, (0x2900800D & 0xFFFF) # ori $at, $at, 0x800d @@ -7690,9 +7690,9 @@ glabel func_800C76C0 /* 0C8E10 800C8210 00084080 */ sll $t0, $t0, 2 /* 0C8E14 800C8214 01044023 */ subu $t0, $t0, $a0 /* 0C8E18 800C8218 000840C0 */ sll $t0, $t0, 3 -/* 0C8E1C 800C821C 3C02800F */ lui $v0, %hi(D_800F6994) +/* 0C8E1C 800C821C 3C02800F */ lui $v0, %hi(gPlayers+0x4) /* 0C8E20 800C8220 00481021 */ addu $v0, $v0, $t0 -/* 0C8E24 800C8224 84426994 */ lh $v0, %lo(D_800F6994)($v0) +/* 0C8E24 800C8224 84426994 */ lh $v0, %lo(gPlayers+0x4)($v0) /* 0C8E28 800C8228 8FC90034 */ lw $t1, 0x34($fp) /* 0C8E2C 800C822C 14400014 */ bnez $v0, .L800C8280 /* 0C8E30 800C8230 8D230000 */ lw $v1, ($t1) @@ -7869,8 +7869,8 @@ glabel func_800C847C /* 0C9094 800C8494 01D07023 */ subu $t6, $t6, $s0 /* 0C9098 800C8498 000E7080 */ sll $t6, $t6, 2 /* 0C909C 800C849C 01D07023 */ subu $t6, $t6, $s0 -/* 0C90A0 800C84A0 3C0F800F */ lui $t7, %hi(D_800F6990) # $t7, 0x800f -/* 0C90A4 800C84A4 25EF6990 */ addiu $t7, %lo(D_800F6990) # addiu $t7, $t7, 0x6990 +/* 0C90A0 800C84A0 3C0F800F */ lui $t7, %hi(gPlayers) # $t7, 0x800f +/* 0C90A4 800C84A4 25EF6990 */ addiu $t7, %lo(gPlayers) # addiu $t7, $t7, 0x6990 /* 0C90A8 800C84A8 000E70C0 */ sll $t6, $t6, 3 /* 0C90AC 800C84AC 01CFC021 */ addu $t8, $t6, $t7 /* 0C90B0 800C84B0 AFBF0034 */ sw $ra, 0x34($sp) @@ -8026,8 +8026,8 @@ glabel func_800C86D8 /* 0C92E8 800C86E8 01EE7823 */ subu $t7, $t7, $t6 /* 0C92EC 800C86EC 000F7880 */ sll $t7, $t7, 2 /* 0C92F0 800C86F0 01EE7823 */ subu $t7, $t7, $t6 -/* 0C92F4 800C86F4 3C18800F */ lui $t8, %hi(D_800F6990) # $t8, 0x800f -/* 0C92F8 800C86F8 27186990 */ addiu $t8, %lo(D_800F6990) # addiu $t8, $t8, 0x6990 +/* 0C92F4 800C86F4 3C18800F */ lui $t8, %hi(gPlayers) # $t8, 0x800f +/* 0C92F8 800C86F8 27186990 */ addiu $t8, %lo(gPlayers) # addiu $t8, $t8, 0x6990 /* 0C92FC 800C86FC 000F78C0 */ sll $t7, $t7, 3 /* 0C9300 800C8700 01F81021 */ addu $v0, $t7, $t8 /* 0C9304 800C8704 8C5900BC */ lw $t9, 0xbc($v0) @@ -8070,10 +8070,10 @@ glabel func_800C8770 /* 0C9388 800C8788 01EE7823 */ subu $t7, $t7, $t6 /* 0C938C 800C878C 27ADFFF0 */ addiu $t5, $sp, -0x10 /* 0C9390 800C8790 000F78C0 */ sll $t7, $t7, 3 -/* 0C9394 800C8794 3C18800F */ lui $t8, %hi(D_800F6A4C) +/* 0C9394 800C8794 3C18800F */ lui $t8, %hi(gPlayers+0xBC) /* 0C9398 800C8798 ADA40010 */ sw $a0, 0x10($t5) /* 0C939C 800C879C 030FC021 */ addu $t8, $t8, $t7 -/* 0C93A0 800C87A0 8F186A4C */ lw $t8, %lo(D_800F6A4C)($t8) +/* 0C93A0 800C87A0 8F186A4C */ lw $t8, %lo(gPlayers+0xBC)($t8) /* 0C93A4 800C87A4 3C024000 */ lui $v0, 0x4000 /* 0C93A8 800C87A8 01C02025 */ move $a0, $t6 /* 0C93AC 800C87AC 0302C824 */ and $t9, $t8, $v0 @@ -8187,8 +8187,8 @@ glabel func_800C8920 /* 0C9530 800C8930 03A0F025 */ move $fp, $sp /* 0C9534 800C8934 11C00026 */ beqz $t6, .L800C89D0 /* 0C9538 800C8938 AFBF002C */ sw $ra, 0x2c($sp) -/* 0C953C 800C893C 3C03800F */ lui $v1, %hi(D_800F6990) # $v1, 0x800f -/* 0C9540 800C8940 24636990 */ addiu $v1, %lo(D_800F6990) # addiu $v1, $v1, 0x6990 +/* 0C953C 800C893C 3C03800F */ lui $v1, %hi(gPlayers) # $v1, 0x800f +/* 0C9540 800C8940 24636990 */ addiu $v1, %lo(gPlayers) # addiu $v1, $v1, 0x6990 /* 0C9544 800C8944 8C6F00BC */ lw $t7, 0xbc($v1) /* 0C9548 800C8948 3C024000 */ lui $v0, 0x4000 /* 0C954C 800C894C 01E2C024 */ and $t8, $t7, $v0 @@ -8780,9 +8780,9 @@ glabel func_800C90F4 /* 0C9D8C 800C918C 00094880 */ sll $t1, $t1, 2 /* 0C9D90 800C9190 01264823 */ subu $t1, $t1, $a2 /* 0C9D94 800C9194 000948C0 */ sll $t1, $t1, 3 -/* 0C9D98 800C9198 3C0A800F */ lui $t2, %hi(D_800F6A4C) +/* 0C9D98 800C9198 3C0A800F */ lui $t2, %hi(gPlayers+0xBC) /* 0C9D9C 800C919C 01495021 */ addu $t2, $t2, $t1 -/* 0C9DA0 800C91A0 8D4A6A4C */ lw $t2, %lo(D_800F6A4C)($t2) +/* 0C9DA0 800C91A0 8D4A6A4C */ lw $t2, %lo(gPlayers+0xBC)($t2) /* 0C9DA4 800C91A4 3C024000 */ lui $v0, 0x4000 /* 0C9DA8 800C91A8 3C0C800F */ lui $t4, %hi(D_800E9F2C) /* 0C9DAC 800C91AC 01425824 */ and $t3, $t2, $v0 @@ -8839,11 +8839,11 @@ glabel func_800C9250 /* 0C9E64 800C9264 000F7880 */ sll $t7, $t7, 2 /* 0C9E68 800C9268 01EE7823 */ subu $t7, $t7, $t6 /* 0C9E6C 800C926C 000F78C0 */ sll $t7, $t7, 3 -/* 0C9E70 800C9270 3C18800F */ lui $t8, %hi(D_800F6BE4) +/* 0C9E70 800C9270 3C18800F */ lui $t8, %hi(gPlayers+0x254) /* 0C9E74 800C9274 030FC021 */ addu $t8, $t8, $t7 /* 0C9E78 800C9278 3C08803B */ lui $t0, %hi(D_803B7194) # $t0, 0x803b /* 0C9E7C 800C927C 8D087194 */ lw $t0, %lo(D_803B7194)($t0) -/* 0C9E80 800C9280 97186BE4 */ lhu $t8, %lo(D_800F6BE4)($t8) +/* 0C9E80 800C9280 97186BE4 */ lhu $t8, %lo(gPlayers+0x254)($t8) /* 0C9E84 800C9284 27BDFFD0 */ addiu $sp, $sp, -0x30 /* 0C9E88 800C9288 3C012900 */ lui $at, (0x29008001 >> 16) # lui $at, 0x2900 /* 0C9E8C 800C928C 31090001 */ andi $t1, $t0, 1 @@ -8900,8 +8900,8 @@ glabel func_800C92CC /* 0C9F50 800C9350 0314C023 */ subu $t8, $t8, $s4 /* 0C9F54 800C9354 0018C080 */ sll $t8, $t8, 2 /* 0C9F58 800C9358 0314C023 */ subu $t8, $t8, $s4 -/* 0C9F5C 800C935C 3C19800F */ lui $t9, %hi(D_800F6990) # $t9, 0x800f -/* 0C9F60 800C9360 27396990 */ addiu $t9, %lo(D_800F6990) # addiu $t9, $t9, 0x6990 +/* 0C9F5C 800C935C 3C19800F */ lui $t9, %hi(gPlayers) # $t9, 0x800f +/* 0C9F60 800C9360 27396990 */ addiu $t9, %lo(gPlayers) # addiu $t9, $t9, 0x6990 /* 0C9F64 800C9364 0018C0C0 */ sll $t8, $t8, 3 /* 0C9F68 800C9368 03198821 */ addu $s1, $t8, $t9 /* 0C9F6C 800C936C 3C01432A */ li $at, 0x432A0000 # 170.000000 @@ -9024,11 +9024,11 @@ glabel func_800C94A4 /* 0CA120 800C9520 03282821 */ addu $a1, $t9, $t0 /* 0CA124 800C9524 01264823 */ subu $t1, $t1, $a2 /* 0CA128 800C9528 000948C0 */ sll $t1, $t1, 3 -/* 0CA12C 800C952C 3C03800F */ lui $v1, %hi(D_800F6BE4) +/* 0CA12C 800C952C 3C03800F */ lui $v1, %hi(gPlayers+0x254) /* 0CA130 800C9530 00691821 */ addu $v1, $v1, $t1 /* 0CA134 800C9534 E4A4000C */ swc1 $f4, 0xc($a1) /* 0CA138 800C9538 E4A60010 */ swc1 $f6, 0x10($a1) -/* 0CA13C 800C953C 94636BE4 */ lhu $v1, %lo(D_800F6BE4)($v1) +/* 0CA13C 800C953C 94636BE4 */ lhu $v1, %lo(gPlayers+0x254)($v1) /* 0CA140 800C9540 2C610008 */ sltiu $at, $v1, 8 /* 0CA144 800C9544 10200078 */ beqz $at, .L800C9728 /* 0CA148 800C9548 00035080 */ sll $t2, $v1, 2 @@ -9212,9 +9212,9 @@ glabel func_800C97C4 /* 0CA3D8 800C97D8 27BDFFC8 */ addiu $sp, $sp, -0x38 /* 0CA3DC 800C97DC 0018C080 */ sll $t8, $t8, 2 /* 0CA3E0 800C97E0 0306C023 */ subu $t8, $t8, $a2 -/* 0CA3E4 800C97E4 3C19800F */ lui $t9, %hi(D_800F6990) # $t9, 0x800f +/* 0CA3E4 800C97E4 3C19800F */ lui $t9, %hi(gPlayers) # $t9, 0x800f /* 0CA3E8 800C97E8 AFB1002C */ sw $s1, 0x2c($sp) -/* 0CA3EC 800C97EC 27396990 */ addiu $t9, %lo(D_800F6990) # addiu $t9, $t9, 0x6990 +/* 0CA3EC 800C97EC 27396990 */ addiu $t9, %lo(gPlayers) # addiu $t9, $t9, 0x6990 /* 0CA3F0 800C97F0 0018C0C0 */ sll $t8, $t8, 3 /* 0CA3F4 800C97F4 00067100 */ sll $t6, $a2, 4 /* 0CA3F8 800C97F8 01C67023 */ subu $t6, $t6, $a2 @@ -9427,8 +9427,8 @@ glabel func_800C9A88 /* 0CA6FC 800C9AFC 0313C023 */ subu $t8, $t8, $s3 /* 0CA700 800C9B00 0018C080 */ sll $t8, $t8, 2 /* 0CA704 800C9B04 0313C023 */ subu $t8, $t8, $s3 -/* 0CA708 800C9B08 3C19800F */ lui $t9, %hi(D_800F6990) # $t9, 0x800f -/* 0CA70C 800C9B0C 27396990 */ addiu $t9, %lo(D_800F6990) # addiu $t9, $t9, 0x6990 +/* 0CA708 800C9B08 3C19800F */ lui $t9, %hi(gPlayers) # $t9, 0x800f +/* 0CA70C 800C9B0C 27396990 */ addiu $t9, %lo(gPlayers) # addiu $t9, $t9, 0x6990 /* 0CA710 800C9B10 0018C0C0 */ sll $t8, $t8, 3 /* 0CA714 800C9B14 03191821 */ addu $v1, $t8, $t9 /* 0CA718 800C9B18 94680254 */ lhu $t0, 0x254($v1) @@ -9575,9 +9575,9 @@ glabel func_800C9D0C /* 0CA91C 800C9D1C 01C67023 */ subu $t6, $t6, $a2 /* 0CA920 800C9D20 000E7080 */ sll $t6, $t6, 2 /* 0CA924 800C9D24 01C67023 */ subu $t6, $t6, $a2 -/* 0CA928 800C9D28 3C0F800F */ lui $t7, %hi(D_800F6990) # $t7, 0x800f +/* 0CA928 800C9D28 3C0F800F */ lui $t7, %hi(gPlayers) # $t7, 0x800f /* 0CA92C 800C9D2C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 0CA930 800C9D30 25EF6990 */ addiu $t7, %lo(D_800F6990) # addiu $t7, $t7, 0x6990 +/* 0CA930 800C9D30 25EF6990 */ addiu $t7, %lo(gPlayers) # addiu $t7, $t7, 0x6990 /* 0CA934 800C9D34 000E70C0 */ sll $t6, $t6, 3 /* 0CA938 800C9D38 01CF1021 */ addu $v0, $t6, $t7 /* 0CA93C 800C9D3C 94450254 */ lhu $a1, 0x254($v0) @@ -10200,10 +10200,10 @@ glabel func_800CA59C /* 0CB1E8 800CA5E8 0018C080 */ sll $t8, $t8, 2 /* 0CB1EC 800CA5EC 0306C023 */ subu $t8, $t8, $a2 /* 0CB1F0 800CA5F0 0018C0C0 */ sll $t8, $t8, 3 -/* 0CB1F4 800CA5F4 3C04800F */ lui $a0, %hi(D_800F6BE4) +/* 0CB1F4 800CA5F4 3C04800F */ lui $a0, %hi(gPlayers+0x254) /* 0CB1F8 800CA5F8 00982021 */ addu $a0, $a0, $t8 /* 0CB1FC 800CA5FC 00064100 */ sll $t0, $a2, 4 -/* 0CB200 800CA600 94846BE4 */ lhu $a0, %lo(D_800F6BE4)($a0) +/* 0CB200 800CA600 94846BE4 */ lhu $a0, %lo(gPlayers+0x254)($a0) /* 0CB204 800CA604 01064023 */ subu $t0, $t0, $a2 /* 0CB208 800CA608 3C09800F */ lui $t1, %hi(D_800E9F7C) # $t1, 0x800f /* 0CB20C 800CA60C 25299F7C */ addiu $t1, %lo(D_800E9F7C) # addiu $t1, $t1, -0x6084 @@ -10315,10 +10315,10 @@ glabel func_800CA730 /* 0CB390 800CA790 0019C880 */ sll $t9, $t9, 2 /* 0CB394 800CA794 0326C823 */ subu $t9, $t9, $a2 /* 0CB398 800CA798 0019C8C0 */ sll $t9, $t9, 3 -/* 0CB39C 800CA79C 3C04800F */ lui $a0, %hi(D_800F6BE4) +/* 0CB39C 800CA79C 3C04800F */ lui $a0, %hi(gPlayers+0x254) /* 0CB3A0 800CA7A0 00992021 */ addu $a0, $a0, $t9 /* 0CB3A4 800CA7A4 00064900 */ sll $t1, $a2, 4 -/* 0CB3A8 800CA7A8 94846BE4 */ lhu $a0, %lo(D_800F6BE4)($a0) +/* 0CB3A8 800CA7A8 94846BE4 */ lhu $a0, %lo(gPlayers+0x254)($a0) /* 0CB3AC 800CA7AC 01264823 */ subu $t1, $t1, $a2 /* 0CB3B0 800CA7B0 3C0A800F */ lui $t2, %hi(D_800E9F7C) # $t2, 0x800f /* 0CB3B4 800CA7B4 254A9F7C */ addiu $t2, %lo(D_800E9F7C) # addiu $t2, $t2, -0x6084 @@ -10480,8 +10480,8 @@ glabel func_800CA984 /* 0CB5F8 800CA9F8 01154023 */ subu $t0, $t0, $s5 /* 0CB5FC 800CA9FC 00084080 */ sll $t0, $t0, 2 /* 0CB600 800CAA00 01154023 */ subu $t0, $t0, $s5 -/* 0CB604 800CAA04 3C09800F */ lui $t1, %hi(D_800F6990) # $t1, 0x800f -/* 0CB608 800CAA08 25296990 */ addiu $t1, %lo(D_800F6990) # addiu $t1, $t1, 0x6990 +/* 0CB604 800CAA04 3C09800F */ lui $t1, %hi(gPlayers) # $t1, 0x800f +/* 0CB608 800CAA08 25296990 */ addiu $t1, %lo(gPlayers) # addiu $t1, $t1, 0x6990 /* 0CB60C 800CAA0C 000840C0 */ sll $t0, $t0, 3 /* 0CB610 800CAA10 01091021 */ addu $v0, $t0, $t1 /* 0CB614 800CAA14 3C14800F */ lui $s4, %hi(D_800EA1DC) # $s4, 0x800f @@ -10552,8 +10552,8 @@ glabel func_800CAACC /* 0CB700 800CAB00 000F7880 */ sll $t7, $t7, 2 /* 0CB704 800CAB04 01E67823 */ subu $t7, $t7, $a2 /* 0CB708 800CAB08 000F78C0 */ sll $t7, $t7, 3 -/* 0CB70C 800CAB0C 3C19800F */ lui $t9, %hi(D_800F6990) # $t9, 0x800f -/* 0CB710 800CAB10 27396990 */ addiu $t9, %lo(D_800F6990) # addiu $t9, $t9, 0x6990 +/* 0CB70C 800CAB0C 3C19800F */ lui $t9, %hi(gPlayers) # $t9, 0x800f +/* 0CB710 800CAB10 27396990 */ addiu $t9, %lo(gPlayers) # addiu $t9, $t9, 0x6990 /* 0CB714 800CAB14 25F80014 */ addiu $t8, $t7, 0x14 /* 0CB718 800CAB18 3C053102 */ lui $a1, (0x31029008 >> 16) # lui $a1, 0x3102 /* 0CB71C 800CAB1C 34A59008 */ ori $a1, (0x31029008 & 0xFFFF) # ori $a1, $a1, 0x9008 @@ -10957,7 +10957,7 @@ glabel func_800CB064 /* 0CBCC4 800CB0C4 24070019 */ li $a3, 25 .L800CB0C8: /* 0CBCC8 800CB0C8 93C4003B */ lbu $a0, 0x3b($fp) -/* 0CBCCC 800CB0CC 3C05800F */ lui $a1, %hi(D_800F6BE4) +/* 0CBCCC 800CB0CC 3C05800F */ lui $a1, %hi(gPlayers+0x254) /* 0CBCD0 800CB0D0 3C012900 */ lui $at, (0x29008008 >> 16) # lui $at, 0x2900 /* 0CBCD4 800CB0D4 000458C0 */ sll $t3, $a0, 3 /* 0CBCD8 800CB0D8 01645823 */ subu $t3, $t3, $a0 @@ -10967,7 +10967,7 @@ glabel func_800CB064 /* 0CBCE8 800CB0E8 01645823 */ subu $t3, $t3, $a0 /* 0CBCEC 800CB0EC 000B58C0 */ sll $t3, $t3, 3 /* 0CBCF0 800CB0F0 00AB2821 */ addu $a1, $a1, $t3 -/* 0CBCF4 800CB0F4 94A56BE4 */ lhu $a1, %lo(D_800F6BE4)($a1) +/* 0CBCF4 800CB0F4 94A56BE4 */ lhu $a1, %lo(gPlayers+0x254)($a1) /* 0CBCF8 800CB0F8 34218008 */ ori $at, (0x29008008 & 0xFFFF) # ori $at, $at, 0x8008 /* 0CBCFC 800CB0FC 00056100 */ sll $t4, $a1, 4 /* 0CBD00 800CB100 0C03243D */ jal func_800C90F4 diff --git a/asm/bss_main.s b/asm/bss_main.s index 1054c08fa..16763478f 100644 --- a/asm/bss_main.s +++ b/asm/bss_main.s @@ -1,106 +1,6 @@ .include "macros.inc" .section .bss -glabel gControllers # 0x800F6910 -.word 0x00000000 - -glabel D_800F6914 -.hword 0x0000 - -glabel D_800F6916 -.hword 0x0000 - -glabel D_800F6918 -.word 0x00000000 -.word 0x00000000 - -glabel gPlayer2Controller # 0x800F6920 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 - -glabel gPlayer3Controller # 0x800F6930 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 - -glabel gPlayer4Controller # 0x800F6940 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 - -glabel D_800F6950 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 - -glabel D_800F6960 -.skip 16 - -glabel D_800F6970 -.skip 16 - -glabel D_800F6980 -.skip 16 - -glabel D_800F6990 -.word 0x00000000 - -glabel D_800F6994 -.skip 16 - -glabel gPlayer1PosX # 0x800F69A4 -.word 0x00000000 - -glabel gPlayer1PosY # 0x800F69A8 -.word 0x00000000 - -glabel gPlayer1PosZ # 0x800F69AC -.skip 18 - -glabel gPlayer1Rotation # 0x800F69BE -.skip 22 - -glabel D_800F69D4 -.skip 80 - -glabel D_800F6A24 -.skip 40 - -glabel D_800F6A4C -.skip 408 - -glabel D_800F6BE4 -.skip 2948 - -glabel D_800F7768 -.skip 3544 - -glabel D_800F8540 -.skip 3544 - -glabel D_800F9318 -.skip 3544 - -glabel D_800FA0F0 -.skip 3544 - -glabel D_800FAEC8 -.skip 3544 - -glabel D_800FBCA0 -.skip 3544 - -glabel D_800FCA78 -.skip 3544 - -glabel D_800FD850 -.skip 16 - glabel gGfxPools .skip 10616 @@ -271,7 +171,7 @@ glabel gIdleThread glabel gVideoThread .skip 8624 -glabel gVideoThreadStack +glabel D_80156820 .skip 8624 glabel D_801589D0 diff --git a/asm/code_80091750.s b/asm/code_80091750.s index dd8fa339f..0553b5882 100644 --- a/asm/code_80091750.s +++ b/asm/code_80091750.s @@ -19524,7 +19524,7 @@ glabel func_800A2EB8 /* 0A3AC8 800A2EC8 AFB10024 */ sw $s1, 0x24($sp) /* 0A3ACC 800A2ECC 3C108016 */ lui $s0, %hi(D_80164360) # $s0, 0x8016 /* 0A3AD0 800A2ED0 3C048016 */ lui $a0, %hi(D_80164370) # $a0, 0x8016 -/* 0A3AD4 800A2ED4 3C02800F */ lui $v0, %hi(D_800F6990) # $v0, 0x800f +/* 0A3AD4 800A2ED4 3C02800F */ lui $v0, %hi(gPlayers) # $v0, 0x800f /* 0A3AD8 800A2ED8 AFBF0044 */ sw $ra, 0x44($sp) /* 0A3ADC 800A2EDC AFBE0040 */ sw $fp, 0x40($sp) /* 0A3AE0 800A2EE0 AFB7003C */ sw $s7, 0x3c($sp) @@ -19532,7 +19532,7 @@ glabel func_800A2EB8 /* 0A3AE8 800A2EE8 AFB50034 */ sw $s5, 0x34($sp) /* 0A3AEC 800A2EEC AFB3002C */ sw $s3, 0x2c($sp) /* 0A3AF0 800A2EF0 AFB20028 */ sw $s2, 0x28($sp) -/* 0A3AF4 800A2EF4 24426990 */ addiu $v0, %lo(D_800F6990) # addiu $v0, $v0, 0x6990 +/* 0A3AF4 800A2EF4 24426990 */ addiu $v0, %lo(gPlayers) # addiu $v0, $v0, 0x6990 /* 0A3AF8 800A2EF8 24844370 */ addiu $a0, %lo(D_80164370) # addiu $a0, $a0, 0x4370 /* 0A3AFC 800A2EFC 26104360 */ addiu $s0, %lo(D_80164360) # addiu $s0, $s0, 0x4360 /* 0A3B00 800A2F00 27B10070 */ addiu $s1, $sp, 0x70 @@ -19928,8 +19928,8 @@ glabel func_800A34A8 /* 0A40E4 800A34E4 10200025 */ beqz $at, .L800A357C /* 0A40E8 800A34E8 3C048016 */ lui $a0, %hi(D_80164360) # $a0, 0x8016 /* 0A40EC 800A34EC 3C058016 */ lui $a1, %hi(D_80164370) # $a1, 0x8016 -/* 0A40F0 800A34F0 3C02800F */ lui $v0, %hi(D_800F6990) # $v0, 0x800f -/* 0A40F4 800A34F4 24426990 */ addiu $v0, %lo(D_800F6990) # addiu $v0, $v0, 0x6990 +/* 0A40F0 800A34F0 3C02800F */ lui $v0, %hi(gPlayers) # $v0, 0x800f +/* 0A40F4 800A34F4 24426990 */ addiu $v0, %lo(gPlayers) # addiu $v0, $v0, 0x6990 /* 0A40F8 800A34F8 24A54370 */ addiu $a1, %lo(D_80164370) # addiu $a1, $a1, 0x4370 /* 0A40FC 800A34FC 24844360 */ addiu $a0, %lo(D_80164360) # addiu $a0, $a0, 0x4360 /* 0A4100 800A3500 27B00080 */ addiu $s0, $sp, 0x80 @@ -30189,7 +30189,7 @@ glabel L800AC5D0 /* 0AD214 800AC614 01E53021 */ addu $a2, $t7, $a1 /* 0AD218 800AC618 90C80000 */ lbu $t0, ($a2) /* 0AD21C 800AC61C 01595021 */ addu $t2, $t2, $t9 -/* 0AD220 800AC620 3C0C800F */ lui $t4, %hi(D_800F6BE4) # 0x800f +/* 0AD220 800AC620 3C0C800F */ lui $t4, %hi(gPlayers+0x254) # 0x800f /* 0AD224 800AC624 19000028 */ blez $t0, .L800AC6C8 /* 0AD228 800AC628 2518FFFF */ addiu $t8, $t0, -1 /* 0AD22C 800AC62C A0D80000 */ sb $t8, ($a2) @@ -30204,7 +30204,7 @@ glabel L800AC5D0 /* 0AD250 800AC650 016A5823 */ subu $t3, $t3, $t2 /* 0AD254 800AC654 000B58C0 */ sll $t3, $t3, 3 /* 0AD258 800AC658 018B6021 */ addu $t4, $t4, $t3 -/* 0AD25C 800AC65C 958C6BE4 */ lhu $t4, %lo(D_800F6BE4)($t4) # 0x6be4($t4) +/* 0AD25C 800AC65C 958C6BE4 */ lhu $t4, %lo(gPlayers+0x254)($t4) # 0x6be4($t4) /* 0AD260 800AC660 3C044900 */ lui $a0, (0x49008017 >> 16) # lui $a0, 0x4900 /* 0AD264 800AC664 34848017 */ ori $a0, (0x49008017 & 0xFFFF) # ori $a0, $a0, 0x8017 /* 0AD268 800AC668 018D1821 */ addu $v1, $t4, $t5 diff --git a/asm/code_80290C20.s b/asm/code_80290C20.s index 141ff20d1..a4fa914d1 100644 --- a/asm/code_80290C20.s +++ b/asm/code_80290C20.s @@ -5407,9 +5407,9 @@ glabel func_80295BF8 /* 0FF214 80295C04 01C47023 */ subu $t6, $t6, $a0 /* 0FF218 80295C08 000E7080 */ sll $t6, $t6, 2 /* 0FF21C 80295C0C 01C47023 */ subu $t6, $t6, $a0 -/* 0FF220 80295C10 3C0F800F */ lui $t7, %hi(D_800F6990) # $t7, 0x800f +/* 0FF220 80295C10 3C0F800F */ lui $t7, %hi(gPlayers) # $t7, 0x800f /* 0FF224 80295C14 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 0FF228 80295C18 25EF6990 */ addiu $t7, %lo(D_800F6990) # addiu $t7, $t7, 0x6990 +/* 0FF228 80295C18 25EF6990 */ addiu $t7, %lo(gPlayers) # addiu $t7, $t7, 0x6990 /* 0FF22C 80295C1C 000E70C0 */ sll $t6, $t6, 3 /* 0FF230 80295C20 AFBF0014 */ sw $ra, 0x14($sp) /* 0FF234 80295C24 01CF1021 */ addu $v0, $t6, $t7 diff --git a/asm/code_80296A50.s b/asm/code_80296A50.s index e01fbb75c..60286eafd 100644 --- a/asm/code_80296A50.s +++ b/asm/code_80296A50.s @@ -1363,8 +1363,8 @@ glabel update_obj_kiwano_fruit /* 10136C 80297D5C 27BDFFD8 */ addiu $sp, $sp, -0x28 /* 101370 80297D60 AFBF0014 */ sw $ra, 0x14($sp) /* 101374 80297D64 848E0004 */ lh $t6, 4($a0) -/* 101378 80297D68 3C18800F */ lui $t8, %hi(D_800F6990) # $t8, 0x800f -/* 10137C 80297D6C 27186990 */ addiu $t8, %lo(D_800F6990) # addiu $t8, $t8, 0x6990 +/* 101378 80297D68 3C18800F */ lui $t8, %hi(gPlayers) # $t8, 0x800f +/* 10137C 80297D6C 27186990 */ addiu $t8, %lo(gPlayers) # addiu $t8, $t8, 0x6990 /* 101380 80297D70 000E78C0 */ sll $t7, $t6, 3 /* 101384 80297D74 01EE7823 */ subu $t7, $t7, $t6 /* 101388 80297D78 000F7900 */ sll $t7, $t7, 4 @@ -2421,11 +2421,11 @@ glabel func_80298C94 /* 1022A8 80298C98 AFB20020 */ sw $s2, 0x20($sp) /* 1022AC 80298C9C AFB00018 */ sw $s0, 0x18($sp) /* 1022B0 80298CA0 AFB1001C */ sw $s1, 0x1c($sp) -/* 1022B4 80298CA4 3C10800F */ lui $s0, %hi(D_800F6990) # $s0, 0x800f -/* 1022B8 80298CA8 3C128010 */ lui $s2, %hi(D_800FA0F0) # $s2, 0x8010 +/* 1022B4 80298CA4 3C10800F */ lui $s0, %hi(gPlayers) # $s0, 0x800f +/* 1022B8 80298CA8 3C128010 */ lui $s2, %hi(gPlayers+0x3760) # $s2, 0x8010 /* 1022BC 80298CAC AFBF0024 */ sw $ra, 0x24($sp) -/* 1022C0 80298CB0 2652A0F0 */ addiu $s2, %lo(D_800FA0F0) # addiu $s2, $s2, -0x5f10 -/* 1022C4 80298CB4 26106990 */ addiu $s0, %lo(D_800F6990) # addiu $s0, $s0, 0x6990 +/* 1022C0 80298CB0 2652A0F0 */ addiu $s2, %lo(gPlayers+0x3760) # addiu $s2, $s2, -0x5f10 +/* 1022C4 80298CB4 26106990 */ addiu $s0, %lo(gPlayers) # addiu $s0, $s0, 0x6990 /* 1022C8 80298CB8 24110008 */ li $s1, 8 /* 1022CC 80298CBC 960E0000 */ lhu $t6, ($s0) .L80298CC0: @@ -7642,11 +7642,11 @@ glabel func_8029D9F8 /* 107020 8029DA10 AFB30020 */ sw $s3, 0x20($sp) /* 107024 8029DA14 AFB2001C */ sw $s2, 0x1c($sp) /* 107028 8029DA18 AFB00014 */ sw $s0, 0x14($sp) -/* 10702C 8029DA1C 3C11800F */ lui $s1, %hi(D_800F6990) # $s1, 0x800f +/* 10702C 8029DA1C 3C11800F */ lui $s1, %hi(gPlayers) # $s1, 0x800f /* 107030 8029DA20 3C168016 */ lui $s6, %hi(D_8015F9B8) # $s6, 0x8016 /* 107034 8029DA24 AFBF0034 */ sw $ra, 0x34($sp) /* 107038 8029DA28 26D6F9B8 */ addiu $s6, %lo(D_8015F9B8) # addiu $s6, $s6, -0x648 -/* 10703C 8029DA2C 26316990 */ addiu $s1, %lo(D_800F6990) # addiu $s1, $s1, 0x6990 +/* 10703C 8029DA2C 26316990 */ addiu $s1, %lo(gPlayers) # addiu $s1, $s1, 0x6990 /* 107040 8029DA30 00008025 */ move $s0, $zero /* 107044 8029DA34 24120004 */ li $s2, 4 /* 107048 8029DA38 27B30064 */ addiu $s3, $sp, 0x64 @@ -10156,8 +10156,8 @@ glabel L8029FE38 /* 109454 8029FE44 8FBF0014 */ lw $ra, 0x14($sp) glabel L8029FE48 /* 109458 8029FE48 84CF0010 */ lh $t7, 0x10($a2) -/* 10945C 8029FE4C 3C19800F */ lui $t9, %hi(D_800F6990) # $t9, 0x800f -/* 109460 8029FE50 27396990 */ addiu $t9, %lo(D_800F6990) # addiu $t9, $t9, 0x6990 +/* 10945C 8029FE4C 3C19800F */ lui $t9, %hi(gPlayers) # $t9, 0x800f +/* 109460 8029FE50 27396990 */ addiu $t9, %lo(gPlayers) # addiu $t9, $t9, 0x6990 /* 109464 8029FE54 000FC0C0 */ sll $t8, $t7, 3 /* 109468 8029FE58 030FC023 */ subu $t8, $t8, $t7 /* 10946C 8029FE5C 0018C100 */ sll $t8, $t8, 4 @@ -10307,9 +10307,9 @@ glabel L802A0058 .L802A006C: /* 10967C 802A006C C4D00024 */ lwc1 $f16, 0x24($a2) /* 109680 802A0070 84CE0006 */ lh $t6, 6($a2) -/* 109684 802A0074 3C0D800F */ lui $t5, %hi(D_800F6990) # $t5, 0x800f +/* 109684 802A0074 3C0D800F */ lui $t5, %hi(gPlayers) # $t5, 0x800f /* 109688 802A0078 4600848D */ trunc.w.s $f18, $f16 -/* 10968C 802A007C 25AD6990 */ addiu $t5, %lo(D_800F6990) # addiu $t5, $t5, 0x6990 +/* 10968C 802A007C 25AD6990 */ addiu $t5, %lo(gPlayers) # addiu $t5, $t5, 0x6990 /* 109690 802A0080 24088000 */ li $t0, -32768 /* 109694 802A0084 44099000 */ mfc1 $t1, $f18 /* 109698 802A0088 00000000 */ nop @@ -10660,8 +10660,8 @@ glabel L802A04E0 /* 109B70 802A0560 0303C023 */ subu $t8, $t8, $v1 /* 109B74 802A0564 0018C080 */ sll $t8, $t8, 2 /* 109B78 802A0568 0303C023 */ subu $t8, $t8, $v1 -/* 109B7C 802A056C 3C19800F */ lui $t9, %hi(D_800F6990) # $t9, 0x800f -/* 109B80 802A0570 27396990 */ addiu $t9, %lo(D_800F6990) # addiu $t9, $t9, 0x6990 +/* 109B7C 802A056C 3C19800F */ lui $t9, %hi(gPlayers) # $t9, 0x800f +/* 109B80 802A0570 27396990 */ addiu $t9, %lo(gPlayers) # addiu $t9, $t9, 0x6990 /* 109B84 802A0574 0018C0C0 */ sll $t8, $t8, 3 /* 109B88 802A0578 35CF0001 */ ori $t7, $t6, 1 /* 109B8C 802A057C ACEF000C */ sw $t7, 0xc($a3) @@ -10755,8 +10755,8 @@ glabel L802A063C /* 109CDC 802A06CC 0C03262E */ jal func_800C98B8 /* 109CE0 802A06D0 24E50034 */ addiu $a1, $a3, 0x34 /* 109CE4 802A06D4 87A30036 */ lh $v1, 0x36($sp) -/* 109CE8 802A06D8 3C19800F */ lui $t9, %hi(D_800F6990) # $t9, 0x800f -/* 109CEC 802A06DC 27396990 */ addiu $t9, %lo(D_800F6990) # addiu $t9, $t9, 0x6990 +/* 109CE8 802A06D8 3C19800F */ lui $t9, %hi(gPlayers) # $t9, 0x800f +/* 109CEC 802A06DC 27396990 */ addiu $t9, %lo(gPlayers) # addiu $t9, $t9, 0x6990 /* 109CF0 802A06E0 0003C0C0 */ sll $t8, $v1, 3 /* 109CF4 802A06E4 0303C023 */ subu $t8, $t8, $v1 /* 109CF8 802A06E8 0018C100 */ sll $t8, $t8, 4 @@ -10830,8 +10830,8 @@ glabel L802A0744 /* 109DF8 802A07E8 01A36823 */ subu $t5, $t5, $v1 /* 109DFC 802A07EC 000D6880 */ sll $t5, $t5, 2 /* 109E00 802A07F0 01A36823 */ subu $t5, $t5, $v1 -/* 109E04 802A07F4 3C0E800F */ lui $t6, %hi(D_800F6990) # $t6, 0x800f -/* 109E08 802A07F8 25CE6990 */ addiu $t6, %lo(D_800F6990) # addiu $t6, $t6, 0x6990 +/* 109E04 802A07F4 3C0E800F */ lui $t6, %hi(gPlayers) # $t6, 0x800f +/* 109E08 802A07F8 25CE6990 */ addiu $t6, %lo(gPlayers) # addiu $t6, $t6, 0x6990 /* 109E0C 802A07FC 000D68C0 */ sll $t5, $t5, 3 /* 109E10 802A0800 01AE1021 */ addu $v0, $t5, $t6 /* 109E14 802A0804 944F0000 */ lhu $t7, ($v0) @@ -10908,8 +10908,8 @@ glabel L802A0858 /* 109F1C 802A090C 01A36823 */ subu $t5, $t5, $v1 /* 109F20 802A0910 000D6880 */ sll $t5, $t5, 2 /* 109F24 802A0914 01A36823 */ subu $t5, $t5, $v1 -/* 109F28 802A0918 3C0E800F */ lui $t6, %hi(D_800F6990) # $t6, 0x800f -/* 109F2C 802A091C 25CE6990 */ addiu $t6, %lo(D_800F6990) # addiu $t6, $t6, 0x6990 +/* 109F28 802A0918 3C0E800F */ lui $t6, %hi(gPlayers) # $t6, 0x800f +/* 109F2C 802A091C 25CE6990 */ addiu $t6, %lo(gPlayers) # addiu $t6, $t6, 0x6990 /* 109F30 802A0920 000D68C0 */ sll $t5, $t5, 3 /* 109F34 802A0924 01AE1021 */ addu $v0, $t5, $t6 /* 109F38 802A0928 944F0000 */ lhu $t7, ($v0) @@ -11052,8 +11052,8 @@ glabel L802A0AA4 /* 10A134 802A0B24 000E7080 */ sll $t6, $t6, 2 /* 10A138 802A0B28 3C010040 */ lui $at, 0x40 /* 10A13C 802A0B2C 01C37023 */ subu $t6, $t6, $v1 -/* 10A140 802A0B30 3C0F800F */ lui $t7, %hi(D_800F6990) # $t7, 0x800f -/* 10A144 802A0B34 25EF6990 */ addiu $t7, %lo(D_800F6990) # addiu $t7, $t7, 0x6990 +/* 10A140 802A0B30 3C0F800F */ lui $t7, %hi(gPlayers) # $t7, 0x800f +/* 10A144 802A0B34 25EF6990 */ addiu $t7, %lo(gPlayers) # addiu $t7, $t7, 0x6990 /* 10A148 802A0B38 000E70C0 */ sll $t6, $t6, 3 /* 10A14C 802A0B3C 01816825 */ or $t5, $t4, $at /* 10A150 802A0B40 ACED000C */ sw $t5, 0xc($a3) @@ -11208,14 +11208,14 @@ glabel func_802A0D54 /* 10A374 802A0D64 AFB5002C */ sw $s5, 0x2c($sp) /* 10A378 802A0D68 AFB40028 */ sw $s4, 0x28($sp) /* 10A37C 802A0D6C AFB20020 */ sw $s2, 0x20($sp) -/* 10A380 802A0D70 3C11800F */ lui $s1, %hi(D_800F6990) # $s1, 0x800f +/* 10A380 802A0D70 3C11800F */ lui $s1, %hi(gPlayers) # $s1, 0x800f /* 10A384 802A0D74 3C138016 */ lui $s3, %hi(D_8015F9B8) # $s3, 0x8016 /* 10A388 802A0D78 3C168010 */ lui $s6, %hi(D_800FD850) # $s6, 0x8010 /* 10A38C 802A0D7C AFBF0034 */ sw $ra, 0x34($sp) /* 10A390 802A0D80 AFB00018 */ sw $s0, 0x18($sp) /* 10A394 802A0D84 26D6D850 */ addiu $s6, %lo(D_800FD850) # addiu $s6, $s6, -0x27b0 /* 10A398 802A0D88 2673F9B8 */ addiu $s3, %lo(D_8015F9B8) # addiu $s3, $s3, -0x648 -/* 10A39C 802A0D8C 26316990 */ addiu $s1, %lo(D_800F6990) # addiu $s1, $s1, 0x6990 +/* 10A39C 802A0D8C 26316990 */ addiu $s1, %lo(gPlayers) # addiu $s1, $s1, 0x6990 /* 10A3A0 802A0D90 3C120400 */ lui $s2, 0x400 /* 10A3A4 802A0D94 24140070 */ li $s4, 112 /* 10A3A8 802A0D98 24150064 */ li $s5, 100 @@ -11467,11 +11467,11 @@ glabel update_obj_fake_item_box /* 10A710 802A1100 24030001 */ li $v1, 1 /* 10A714 802A1104 44C3F800 */ ctc1 $v1, $31 /* 10A718 802A1108 C4840024 */ lwc1 $f4, 0x24($a0) -/* 10A71C 802A110C 3C0C800F */ lui $t4, %hi(D_800F6990) # $t4, 0x800f +/* 10A71C 802A110C 3C0C800F */ lui $t4, %hi(gPlayers) # $t4, 0x800f /* 10A720 802A1110 00808025 */ move $s0, $a0 /* 10A724 802A1114 460021A4 */ cvt.w.s $f6, $f4 /* 10A728 802A1118 3C014F00 */ li $at, 0x4F000000 # 2147483648.000000 -/* 10A72C 802A111C 258C6990 */ addiu $t4, %lo(D_800F6990) # addiu $t4, $t4, 0x6990 +/* 10A72C 802A111C 258C6990 */ addiu $t4, %lo(gPlayers) # addiu $t4, $t4, 0x6990 /* 10A730 802A1120 4443F800 */ cfc1 $v1, $31 /* 10A734 802A1124 00000000 */ nop /* 10A738 802A1128 30630078 */ andi $v1, $v1, 0x78 diff --git a/asm/code_802A3730.s b/asm/code_802A3730.s index 3ecb3c2e0..3471e26d1 100644 --- a/asm/code_802A3730.s +++ b/asm/code_802A3730.s @@ -4150,13 +4150,13 @@ glabel func_802A74BC /* 110AE0 802A74D0 AFB1000C */ sw $s1, 0xc($sp) /* 110AE4 802A74D4 AFB00008 */ sw $s0, 8($sp) /* 110AE8 802A74D8 3C028016 */ lui $v0, %hi(D_8015F480) # $v0, 0x8016 -/* 110AEC 802A74DC 3C03800F */ lui $v1, %hi(D_800F6990) # $v1, 0x800f +/* 110AEC 802A74DC 3C03800F */ lui $v1, %hi(gPlayers) # $v1, 0x800f /* 110AF0 802A74E0 3C048016 */ lui $a0, %hi(D_801646F0) # $a0, 0x8016 /* 110AF4 802A74E4 3C058016 */ lui $a1, %hi(D_8015F790) # $a1, 0x8016 /* 110AF8 802A74E8 3C0B800E */ lui $t3, %hi(D_800DC52C) # $t3, 0x800e /* 110AFC 802A74EC 3C08800F */ lui $t0, %hi(gControllers) # $t0, 0x800f /* 110B00 802A74F0 2442F480 */ addiu $v0, %lo(D_8015F480) # addiu $v0, $v0, -0xb80 -/* 110B04 802A74F4 24636990 */ addiu $v1, %lo(D_800F6990) # addiu $v1, $v1, 0x6990 +/* 110B04 802A74F4 24636990 */ addiu $v1, %lo(gPlayers) # addiu $v1, $v1, 0x6990 /* 110B08 802A74F8 248446F0 */ addiu $a0, %lo(D_801646F0) # addiu $a0, $a0, 0x46f0 /* 110B0C 802A74FC 24A5F790 */ addiu $a1, %lo(D_8015F790) # addiu $a1, $a1, -0x870 /* 110B10 802A7500 25086910 */ addiu $t0, %lo(gControllers) # addiu $t0, $t0, 0x6910 diff --git a/asm/code_802B0210.s b/asm/code_802B0210.s index 026c471cc..efd7b95ab 100644 --- a/asm/code_802B0210.s +++ b/asm/code_802B0210.s @@ -261,7 +261,7 @@ glabel func_802B0570 /* 119B9C 802B058C 0C0AC13A */ jal func_802B04E8 /* 119BA0 802B0590 86050012 */ lh $a1, 0x12($s0) /* 119BA4 802B0594 86020010 */ lh $v0, 0x10($s0) -/* 119BA8 802B0598 3C0F800F */ lui $t7, %hi(D_800F6990) # 0x800f +/* 119BA8 802B0598 3C0F800F */ lui $t7, %hi(gPlayers) # 0x800f /* 119BAC 802B059C 3C051901 */ lui $a1, (0x19019053 >> 16) # lui $a1, 0x1901 /* 119BB0 802B05A0 000270C0 */ sll $t6, $v0, 3 /* 119BB4 802B05A4 01C27023 */ subu $t6, $t6, $v0 @@ -271,7 +271,7 @@ glabel func_802B0570 /* 119BC4 802B05B4 01C27023 */ subu $t6, $t6, $v0 /* 119BC8 802B05B8 000E70C0 */ sll $t6, $t6, 3 /* 119BCC 802B05BC 01EE7821 */ addu $t7, $t7, $t6 -/* 119BD0 802B05C0 95EF6990 */ lhu $t7, %lo(D_800F6990)($t7) # 0x6990 +/* 119BD0 802B05C0 95EF6990 */ lhu $t7, %lo(gPlayers)($t7) # 0x6990 /* 119BD4 802B05C4 304400FF */ andi $a0, $v0, 0xff /* 119BD8 802B05C8 31F84000 */ andi $t8, $t7, 0x4000 /* 119BDC 802B05CC 53000004 */ beql $t8, $zero, .L802B05E0 @@ -588,7 +588,7 @@ glabel update_obj_banana_bunch /* 11A040 802B0A30 AFB00018 */ sw $s0, 0x18($sp) /* 11A044 802B0A34 848E0010 */ lh $t6, 0x10($a0) /* 11A048 802B0A38 94990006 */ lhu $t9, 6($a0) -/* 11A04C 802B0A3C 3C18800F */ lui $t8, %hi(D_800F6990) # $t8, 0x800f +/* 11A04C 802B0A3C 3C18800F */ lui $t8, %hi(gPlayers) # $t8, 0x800f /* 11A050 802B0A40 000E78C0 */ sll $t7, $t6, 3 /* 11A054 802B0A44 01EE7823 */ subu $t7, $t7, $t6 /* 11A058 802B0A48 000F7900 */ sll $t7, $t7, 4 @@ -596,7 +596,7 @@ glabel update_obj_banana_bunch /* 11A060 802B0A50 000F7880 */ sll $t7, $t7, 2 /* 11A064 802B0A54 01EE7823 */ subu $t7, $t7, $t6 /* 11A068 802B0A58 000F78C0 */ sll $t7, $t7, 3 -/* 11A06C 802B0A5C 27186990 */ addiu $t8, %lo(D_800F6990) # addiu $t8, $t8, 0x6990 +/* 11A06C 802B0A5C 27186990 */ addiu $t8, %lo(gPlayers) # addiu $t8, $t8, 0x6990 /* 11A070 802B0A60 2F210007 */ sltiu $at, $t9, 7 /* 11A074 802B0A64 00808025 */ move $s0, $a0 /* 11A078 802B0A68 102000E5 */ beqz $at, .L802B0E00 @@ -925,8 +925,8 @@ glabel L802B0EF4 /* 11A510 802B0F00 01284823 */ subu $t1, $t1, $t0 /* 11A514 802B0F04 00094880 */ sll $t1, $t1, 2 /* 11A518 802B0F08 01284823 */ subu $t1, $t1, $t0 -/* 11A51C 802B0F0C 3C0A800F */ lui $t2, %hi(D_800F6990) # $t2, 0x800f -/* 11A520 802B0F10 254A6990 */ addiu $t2, %lo(D_800F6990) # addiu $t2, $t2, 0x6990 +/* 11A51C 802B0F0C 3C0A800F */ lui $t2, %hi(gPlayers) # $t2, 0x800f +/* 11A520 802B0F10 254A6990 */ addiu $t2, %lo(gPlayers) # addiu $t2, $t2, 0x6990 /* 11A524 802B0F14 000948C0 */ sll $t1, $t1, 3 /* 11A528 802B0F18 012A2821 */ addu $a1, $t1, $t2 /* 11A52C 802B0F1C 02002025 */ move $a0, $s0 @@ -960,8 +960,8 @@ glabel L802B0F60 /* 11A594 802B0F84 01C87023 */ subu $t6, $t6, $t0 /* 11A598 802B0F88 000E7080 */ sll $t6, $t6, 2 /* 11A59C 802B0F8C 01C87023 */ subu $t6, $t6, $t0 -/* 11A5A0 802B0F90 3C0F800F */ lui $t7, %hi(D_800F6990) # $t7, 0x800f -/* 11A5A4 802B0F94 25EF6990 */ addiu $t7, %lo(D_800F6990) # addiu $t7, $t7, 0x6990 +/* 11A5A0 802B0F90 3C0F800F */ lui $t7, %hi(gPlayers) # $t7, 0x800f +/* 11A5A4 802B0F94 25EF6990 */ addiu $t7, %lo(gPlayers) # addiu $t7, $t7, 0x6990 /* 11A5A8 802B0F98 000E70C0 */ sll $t6, $t6, 3 /* 11A5AC 802B0F9C 01CF2821 */ addu $a1, $t6, $t7 /* 11A5B0 802B0FA0 24070001 */ li $a3, 1 @@ -990,8 +990,8 @@ glabel L802B0F60 /* 11A604 802B0FF4 01485023 */ subu $t2, $t2, $t0 /* 11A608 802B0FF8 000A5080 */ sll $t2, $t2, 2 /* 11A60C 802B0FFC 01485023 */ subu $t2, $t2, $t0 -/* 11A610 802B1000 3C0B800F */ lui $t3, %hi(D_800F6990) # $t3, 0x800f -/* 11A614 802B1004 256B6990 */ addiu $t3, %lo(D_800F6990) # addiu $t3, $t3, 0x6990 +/* 11A610 802B1000 3C0B800F */ lui $t3, %hi(gPlayers) # $t3, 0x800f +/* 11A614 802B1004 256B6990 */ addiu $t3, %lo(gPlayers) # addiu $t3, $t3, 0x6990 /* 11A618 802B1008 000A50C0 */ sll $t2, $t2, 3 /* 11A61C 802B100C 014B2821 */ addu $a1, $t2, $t3 /* 11A620 802B1010 24070001 */ li $a3, 1 @@ -1025,8 +1025,8 @@ glabel L802B1050 /* 11A688 802B1078 01E87823 */ subu $t7, $t7, $t0 /* 11A68C 802B107C 000F7880 */ sll $t7, $t7, 2 /* 11A690 802B1080 01E87823 */ subu $t7, $t7, $t0 -/* 11A694 802B1084 3C18800F */ lui $t8, %hi(D_800F6990) # $t8, 0x800f -/* 11A698 802B1088 27186990 */ addiu $t8, %lo(D_800F6990) # addiu $t8, $t8, 0x6990 +/* 11A694 802B1084 3C18800F */ lui $t8, %hi(gPlayers) # $t8, 0x800f +/* 11A698 802B1088 27186990 */ addiu $t8, %lo(gPlayers) # addiu $t8, $t8, 0x6990 /* 11A69C 802B108C 000F78C0 */ sll $t7, $t7, 3 /* 11A6A0 802B1090 01F82821 */ addu $a1, $t7, $t8 /* 11A6A4 802B1094 24070002 */ li $a3, 2 @@ -1059,8 +1059,8 @@ glabel L802B1050 /* 11A708 802B10F8 01685823 */ subu $t3, $t3, $t0 /* 11A70C 802B10FC 000B5880 */ sll $t3, $t3, 2 /* 11A710 802B1100 01685823 */ subu $t3, $t3, $t0 -/* 11A714 802B1104 3C0C800F */ lui $t4, %hi(D_800F6990) # $t4, 0x800f -/* 11A718 802B1108 258C6990 */ addiu $t4, %lo(D_800F6990) # addiu $t4, $t4, 0x6990 +/* 11A714 802B1104 3C0C800F */ lui $t4, %hi(gPlayers) # $t4, 0x800f +/* 11A718 802B1108 258C6990 */ addiu $t4, %lo(gPlayers) # addiu $t4, $t4, 0x6990 /* 11A71C 802B110C 000B58C0 */ sll $t3, $t3, 3 /* 11A720 802B1110 016C2821 */ addu $a1, $t3, $t4 /* 11A724 802B1114 24070002 */ li $a3, 2 @@ -1242,8 +1242,8 @@ glabel L802B11FC /* 11A9B8 802B13A8 01284823 */ subu $t1, $t1, $t0 /* 11A9BC 802B13AC 00094880 */ sll $t1, $t1, 2 /* 11A9C0 802B13B0 01284823 */ subu $t1, $t1, $t0 -/* 11A9C4 802B13B4 3C0A800F */ lui $t2, %hi(D_800F6990) # $t2, 0x800f -/* 11A9C8 802B13B8 254A6990 */ addiu $t2, %lo(D_800F6990) # addiu $t2, $t2, 0x6990 +/* 11A9C4 802B13B4 3C0A800F */ lui $t2, %hi(gPlayers) # $t2, 0x800f +/* 11A9C8 802B13B8 254A6990 */ addiu $t2, %lo(gPlayers) # addiu $t2, $t2, 0x6990 /* 11A9CC 802B13BC 000948C0 */ sll $t1, $t1, 3 /* 11A9D0 802B13C0 0000C812 */ mflo $t9 /* 11A9D4 802B13C4 00991021 */ addu $v0, $a0, $t9 @@ -1342,8 +1342,8 @@ glabel L802B11FC /* 11AB38 802B1528 0018CC03 */ sra $t9, $t8, 0x10 /* 11AB3C 802B152C 03250019 */ multu $t9, $a1 /* 11AB40 802B1530 01485023 */ subu $t2, $t2, $t0 -/* 11AB44 802B1534 3C0B800F */ lui $t3, %hi(D_800F6990) # $t3, 0x800f -/* 11AB48 802B1538 256B6990 */ addiu $t3, %lo(D_800F6990) # addiu $t3, $t3, 0x6990 +/* 11AB44 802B1534 3C0B800F */ lui $t3, %hi(gPlayers) # $t3, 0x800f +/* 11AB48 802B1538 256B6990 */ addiu $t3, %lo(gPlayers) # addiu $t3, $t3, 0x6990 /* 11AB4C 802B153C 000A50C0 */ sll $t2, $t2, 3 /* 11AB50 802B1540 00004812 */ mflo $t1 /* 11AB54 802B1544 00891021 */ addu $v0, $a0, $t1 @@ -1440,8 +1440,8 @@ glabel L802B11FC /* 11ACB0 802B16A0 00194C03 */ sra $t1, $t9, 0x10 /* 11ACB4 802B16A4 01250019 */ multu $t1, $a1 /* 11ACB8 802B16A8 01685823 */ subu $t3, $t3, $t0 -/* 11ACBC 802B16AC 3C0C800F */ lui $t4, %hi(D_800F6990) # $t4, 0x800f -/* 11ACC0 802B16B0 258C6990 */ addiu $t4, %lo(D_800F6990) # addiu $t4, $t4, 0x6990 +/* 11ACBC 802B16AC 3C0C800F */ lui $t4, %hi(gPlayers) # $t4, 0x800f +/* 11ACC0 802B16B0 258C6990 */ addiu $t4, %lo(gPlayers) # addiu $t4, $t4, 0x6990 /* 11ACC4 802B16B4 000B58C0 */ sll $t3, $t3, 3 /* 11ACC8 802B16B8 00005012 */ mflo $t2 /* 11ACCC 802B16BC 008A1021 */ addu $v0, $a0, $t2 @@ -2093,7 +2093,7 @@ glabel update_obj_banana /* 11B64C 802B203C AFB00020 */ sw $s0, 0x20($sp) /* 11B650 802B2040 848E0010 */ lh $t6, 0x10($a0) /* 11B654 802B2044 94990006 */ lhu $t9, 6($a0) -/* 11B658 802B2048 3C18800F */ lui $t8, %hi(D_800F6990) # $t8, 0x800f +/* 11B658 802B2048 3C18800F */ lui $t8, %hi(gPlayers) # $t8, 0x800f /* 11B65C 802B204C 000E78C0 */ sll $t7, $t6, 3 /* 11B660 802B2050 01EE7823 */ subu $t7, $t7, $t6 /* 11B664 802B2054 000F7900 */ sll $t7, $t7, 4 @@ -2101,7 +2101,7 @@ glabel update_obj_banana /* 11B66C 802B205C 000F7880 */ sll $t7, $t7, 2 /* 11B670 802B2060 01EE7823 */ subu $t7, $t7, $t6 /* 11B674 802B2064 000F78C0 */ sll $t7, $t7, 3 -/* 11B678 802B2068 27186990 */ addiu $t8, %lo(D_800F6990) # addiu $t8, $t8, 0x6990 +/* 11B678 802B2068 27186990 */ addiu $t8, %lo(gPlayers) # addiu $t8, $t8, 0x6990 /* 11B67C 802B206C 2F210006 */ sltiu $at, $t9, 6 /* 11B680 802B2070 00808025 */ move $s0, $a0 /* 11B684 802B2074 10200222 */ beqz $at, .L802B2900 @@ -3090,16 +3090,16 @@ glabel func_802B2EBC /* 11C514 802B2F04 00000000 */ nop /* 11C518 802B2F08 8FA60018 */ lw $a2, 0x18($sp) .L802B2F0C: -/* 11C51C 802B2F0C 3C03800F */ lui $v1, %hi(D_800F6990) # $v1, 0x800f -/* 11C520 802B2F10 3C04800F */ lui $a0, %hi(D_800F7768) # $a0, 0x800f -/* 11C524 802B2F14 3C058010 */ lui $a1, %hi(D_800F8540) # $a1, 0x8010 -/* 11C528 802B2F18 3C028010 */ lui $v0, %hi(D_800F9318) # $v0, 0x8010 +/* 11C51C 802B2F0C 3C03800F */ lui $v1, %hi(gPlayers) # $v1, 0x800f +/* 11C520 802B2F10 3C04800F */ lui $a0, %hi(gPlayers+0xDD8) # $a0, 0x800f +/* 11C524 802B2F14 3C058010 */ lui $a1, %hi(gPlayers+0x1BB0) # $a1, 0x8010 +/* 11C528 802B2F18 3C028010 */ lui $v0, %hi(gPlayers+0x2988) # $v0, 0x8010 /* 11C52C 802B2F1C 3C078010 */ lui $a3, %hi(D_801001D8) # $a3, 0x8010 /* 11C530 802B2F20 24E701D8 */ addiu $a3, %lo(D_801001D8) # addiu $a3, $a3, 0x1d8 -/* 11C534 802B2F24 24429318 */ addiu $v0, %lo(D_800F9318) # addiu $v0, $v0, -0x6ce8 -/* 11C538 802B2F28 24A58540 */ addiu $a1, %lo(D_800F8540) # addiu $a1, $a1, -0x7ac0 -/* 11C53C 802B2F2C 24847768 */ addiu $a0, %lo(D_800F7768) # addiu $a0, $a0, 0x7768 -/* 11C540 802B2F30 24636990 */ addiu $v1, %lo(D_800F6990) # addiu $v1, $v1, 0x6990 +/* 11C534 802B2F24 24429318 */ addiu $v0, %lo(gPlayers+0x2988) # addiu $v0, $v0, -0x6ce8 +/* 11C538 802B2F28 24A58540 */ addiu $a1, %lo(gPlayers+0x1BB0) # addiu $a1, $a1, -0x7ac0 +/* 11C53C 802B2F2C 24847768 */ addiu $a0, %lo(gPlayers+0xDD8) # addiu $a0, $a0, 0x7768 +/* 11C540 802B2F30 24636990 */ addiu $v1, %lo(gPlayers) # addiu $v1, $v1, 0x6990 .L802B2F34: /* 11C544 802B2F34 10C30004 */ beq $a2, $v1, .L802B2F48 /* 11C548 802B2F38 00000000 */ nop @@ -3244,9 +3244,9 @@ glabel func_802B30EC /* 11C714 802B3104 AFB00018 */ sw $s0, 0x18($sp) /* 11C718 802B3108 AFB70034 */ sw $s7, 0x34($sp) /* 11C71C 802B310C AFB30024 */ sw $s3, 0x24($sp) -/* 11C720 802B3110 3C10800F */ lui $s0, %hi(D_800F6990) # $s0, 0x800f +/* 11C720 802B3110 3C10800F */ lui $s0, %hi(gPlayers) # $s0, 0x800f /* 11C724 802B3114 3C12800F */ lui $s2, %hi(gControllers) # $s2, 0x800f -/* 11C728 802B3118 3C14800F */ lui $s4, %hi(D_800F6950) # $s4, 0x800f +/* 11C728 802B3118 3C14800F */ lui $s4, %hi(gControllers+0x40) # $s4, 0x800f /* 11C72C 802B311C 3C15800E */ lui $s5, %hi(D_800DC4E0) # $s5, 0x800e /* 11C730 802B3120 3C16800E */ lui $s6, %hi(D_800DC4D0) # $s6, 0x800e /* 11C734 802B3124 3C1E800E */ lui $fp, %hi(D_800DC4E4) # $fp, 0x800e @@ -3255,9 +3255,9 @@ glabel func_802B30EC /* 11C740 802B3130 27DEC4E4 */ addiu $fp, %lo(D_800DC4E4) # addiu $fp, $fp, -0x3b1c /* 11C744 802B3134 26D6C4D0 */ addiu $s6, %lo(D_800DC4D0) # addiu $s6, $s6, -0x3b30 /* 11C748 802B3138 26B5C4E0 */ addiu $s5, %lo(D_800DC4E0) # addiu $s5, $s5, -0x3b20 -/* 11C74C 802B313C 26946950 */ addiu $s4, %lo(D_800F6950) # addiu $s4, $s4, 0x6950 +/* 11C74C 802B313C 26946950 */ addiu $s4, %lo(gControllers+0x40) # addiu $s4, $s4, 0x6950 /* 11C750 802B3140 26526910 */ addiu $s2, %lo(gControllers) # addiu $s2, $s2, 0x6910 -/* 11C754 802B3144 26106990 */ addiu $s0, %lo(D_800F6990) # addiu $s0, $s0, 0x6990 +/* 11C754 802B3144 26106990 */ addiu $s0, %lo(gPlayers) # addiu $s0, $s0, 0x6990 /* 11C758 802B3148 24130DD8 */ li $s3, 3544 /* 11C75C 802B314C 2417DFFF */ li $s7, -8193 .L802B3150: @@ -3438,8 +3438,8 @@ glabel update_obj_green_shell /* 11C9D8 802B33C8 00000000 */ nop glabel L802B33CC /* 11C9DC 802B33CC 860C0014 */ lh $t4, 0x14($s0) -/* 11C9E0 802B33D0 3C0E800F */ lui $t6, %hi(D_800F6990) # $t6, 0x800f -/* 11C9E4 802B33D4 25CE6990 */ addiu $t6, %lo(D_800F6990) # addiu $t6, $t6, 0x6990 +/* 11C9E0 802B33D0 3C0E800F */ lui $t6, %hi(gPlayers) # $t6, 0x800f +/* 11C9E4 802B33D4 25CE6990 */ addiu $t6, %lo(gPlayers) # addiu $t6, $t6, 0x6990 /* 11C9E8 802B33D8 000C68C0 */ sll $t5, $t4, 3 /* 11C9EC 802B33DC 01AC6823 */ subu $t5, $t5, $t4 /* 11C9F0 802B33E0 000D6900 */ sll $t5, $t5, 4 @@ -3590,7 +3590,7 @@ glabel L802B33CC glabel L802B3614 /* 11CC24 802B3614 860F0014 */ lh $t7, 0x14($s0) /* 11CC28 802B3618 86020012 */ lh $v0, 0x12($s0) -/* 11CC2C 802B361C 3C19800F */ lui $t9, %hi(D_800F6990) # $t9, 0x800f +/* 11CC2C 802B361C 3C19800F */ lui $t9, %hi(gPlayers) # $t9, 0x800f /* 11CC30 802B3620 000FC0C0 */ sll $t8, $t7, 3 /* 11CC34 802B3624 030FC023 */ subu $t8, $t8, $t7 /* 11CC38 802B3628 0018C100 */ sll $t8, $t8, 4 @@ -3598,7 +3598,7 @@ glabel L802B3614 /* 11CC40 802B3630 0018C080 */ sll $t8, $t8, 2 /* 11CC44 802B3634 030FC023 */ subu $t8, $t8, $t7 /* 11CC48 802B3638 0018C0C0 */ sll $t8, $t8, 3 -/* 11CC4C 802B363C 27396990 */ addiu $t9, %lo(D_800F6990) # addiu $t9, $t9, 0x6990 +/* 11CC4C 802B363C 27396990 */ addiu $t9, %lo(gPlayers) # addiu $t9, $t9, 0x6990 /* 11CC50 802B3640 1840001E */ blez $v0, .L802B36BC /* 11CC54 802B3644 03198821 */ addu $s1, $t8, $t9 /* 11CC58 802B3648 2448F1C8 */ addiu $t0, $v0, -0xe38 @@ -3829,10 +3829,10 @@ glabel L802B3974 /* 11CFB0 802B39A0 01CD7023 */ subu $t6, $t6, $t5 /* 11CFB4 802B39A4 84490000 */ lh $t1, ($v0) /* 11CFB8 802B39A8 000E7080 */ sll $t6, $t6, 2 -/* 11CFBC 802B39AC 3C0F800F */ lui $t7, %hi(D_800F6990) # $t7, 0x800f +/* 11CFBC 802B39AC 3C0F800F */ lui $t7, %hi(gPlayers) # $t7, 0x800f /* 11CFC0 802B39B0 01CD7023 */ subu $t6, $t6, $t5 /* 11CFC4 802B39B4 000E70C0 */ sll $t6, $t6, 3 -/* 11CFC8 802B39B8 25EF6990 */ addiu $t7, %lo(D_800F6990) # addiu $t7, $t7, 0x6990 +/* 11CFC8 802B39B8 25EF6990 */ addiu $t7, %lo(gPlayers) # addiu $t7, $t7, 0x6990 /* 11CFCC 802B39BC 24010015 */ li $at, 21 /* 11CFD0 802B39C0 11210005 */ beq $t1, $at, .L802B39D8 /* 11CFD4 802B39C4 01CF8821 */ addu $s1, $t6, $t7 @@ -4257,7 +4257,7 @@ glabel func_802B3FD0 /* 11D604 802B3FF4 AFB10024 */ sw $s1, 0x24($sp) /* 11D608 802B3FF8 F7B40018 */ sdc1 $f20, 0x18($sp) /* 11D60C 802B3FFC 3C01802C */ lui $at, %hi(D_802B9F68) # $at, 0x802c -/* 11D610 802B4000 3C10800F */ lui $s0, %hi(D_800F6990) # $s0, 0x800f +/* 11D610 802B4000 3C10800F */ lui $s0, %hi(gPlayers) # $s0, 0x800f /* 11D614 802B4004 3C158019 */ lui $s5, %hi(D_8018D8C0) # $s5, 0x8019 /* 11D618 802B4008 3C16800E */ lui $s6, %hi(D_800DC4DC) # $s6, 0x800e /* 11D61C 802B400C 00809025 */ move $s2, $a0 @@ -4267,7 +4267,7 @@ glabel func_802B3FD0 /* 11D62C 802B401C C4349F68 */ lwc1 $f20, %lo(D_802B9F68)($at) /* 11D630 802B4020 26D6C4DC */ addiu $s6, %lo(D_800DC4DC) # addiu $s6, $s6, -0x3b24 /* 11D634 802B4024 26B5D8C0 */ addiu $s5, %lo(D_8018D8C0) # addiu $s5, $s5, -0x2740 -/* 11D638 802B4028 26106990 */ addiu $s0, %lo(D_800F6990) # addiu $s0, $s0, 0x6990 +/* 11D638 802B4028 26106990 */ addiu $s0, %lo(gPlayers) # addiu $s0, $s0, 0x6990 /* 11D63C 802B402C 00008825 */ move $s1, $zero /* 11D640 802B4030 24140004 */ li $s4, 4 /* 11D644 802B4034 24170DD8 */ li $s7, 3544 @@ -4475,8 +4475,8 @@ glabel update_obj_red_blue_shell /* 11D930 802B4320 00000000 */ nop glabel L802B4324 /* 11D934 802B4324 860D0014 */ lh $t5, 0x14($s0) -/* 11D938 802B4328 3C0F800F */ lui $t7, %hi(D_800F6990) # $t7, 0x800f -/* 11D93C 802B432C 25EF6990 */ addiu $t7, %lo(D_800F6990) # addiu $t7, $t7, 0x6990 +/* 11D938 802B4328 3C0F800F */ lui $t7, %hi(gPlayers) # $t7, 0x800f +/* 11D93C 802B432C 25EF6990 */ addiu $t7, %lo(gPlayers) # addiu $t7, $t7, 0x6990 /* 11D940 802B4330 000D70C0 */ sll $t6, $t5, 3 /* 11D944 802B4334 01CD7023 */ subu $t6, $t6, $t5 /* 11D948 802B4338 000E7100 */ sll $t6, $t6, 4 @@ -4581,7 +4581,7 @@ glabel L802B4324 glabel L802B44B0 /* 11DAC0 802B44B0 86080014 */ lh $t0, 0x14($s0) /* 11DAC4 802B44B4 86020012 */ lh $v0, 0x12($s0) -/* 11DAC8 802B44B8 3C0A800F */ lui $t2, %hi(D_800F6990) # $t2, 0x800f +/* 11DAC8 802B44B8 3C0A800F */ lui $t2, %hi(gPlayers) # $t2, 0x800f /* 11DACC 802B44BC 000848C0 */ sll $t1, $t0, 3 /* 11DAD0 802B44C0 01284823 */ subu $t1, $t1, $t0 /* 11DAD4 802B44C4 00094900 */ sll $t1, $t1, 4 @@ -4589,7 +4589,7 @@ glabel L802B44B0 /* 11DADC 802B44CC 00094880 */ sll $t1, $t1, 2 /* 11DAE0 802B44D0 01284823 */ subu $t1, $t1, $t0 /* 11DAE4 802B44D4 000948C0 */ sll $t1, $t1, 3 -/* 11DAE8 802B44D8 254A6990 */ addiu $t2, %lo(D_800F6990) # addiu $t2, $t2, 0x6990 +/* 11DAE8 802B44D8 254A6990 */ addiu $t2, %lo(gPlayers) # addiu $t2, $t2, 0x6990 /* 11DAEC 802B44DC 1840002E */ blez $v0, .L802B4598 /* 11DAF0 802B44E0 012A8821 */ addu $s1, $t1, $t2 /* 11DAF4 802B44E4 244BF8E4 */ addiu $t3, $v0, -0x71c @@ -4757,7 +4757,7 @@ glabel L802B44B0 glabel L802B4750 /* 11DD60 802B4750 860F0014 */ lh $t7, 0x14($s0) /* 11DD64 802B4754 86080004 */ lh $t0, 4($s0) -/* 11DD68 802B4758 3C19800F */ lui $t9, %hi(D_800F6990) # $t9, 0x800f +/* 11DD68 802B4758 3C19800F */ lui $t9, %hi(gPlayers) # $t9, 0x800f /* 11DD6C 802B475C 000FC0C0 */ sll $t8, $t7, 3 /* 11DD70 802B4760 030FC023 */ subu $t8, $t8, $t7 /* 11DD74 802B4764 0018C100 */ sll $t8, $t8, 4 @@ -4768,7 +4768,7 @@ glabel L802B4750 /* 11DD88 802B4778 0018C080 */ sll $t8, $t8, 2 /* 11DD8C 802B477C 030FC023 */ subu $t8, $t8, $t7 /* 11DD90 802B4780 0018C0C0 */ sll $t8, $t8, 3 -/* 11DD94 802B4784 27396990 */ addiu $t9, %lo(D_800F6990) # addiu $t9, $t9, 0x6990 +/* 11DD94 802B4784 27396990 */ addiu $t9, %lo(gPlayers) # addiu $t9, $t9, 0x6990 /* 11DD98 802B4788 1540008F */ bnez $t2, .L802B49C8 /* 11DD9C 802B478C 03198821 */ addu $s1, $t8, $t9 /* 11DDA0 802B4790 860B0002 */ lh $t3, 2($s0) @@ -4978,8 +4978,8 @@ glabel L802B4750 /* 11E0A8 802B4A98 8FBF002C */ lw $ra, 0x2c($sp) glabel L802B4A9C /* 11E0AC 802B4A9C 86180004 */ lh $t8, 4($s0) -/* 11E0B0 802B4AA0 3C08800F */ lui $t0, %hi(D_800F6990) # $t0, 0x800f -/* 11E0B4 802B4AA4 25086990 */ addiu $t0, %lo(D_800F6990) # addiu $t0, $t0, 0x6990 +/* 11E0B0 802B4AA0 3C08800F */ lui $t0, %hi(gPlayers) # $t0, 0x800f +/* 11E0B4 802B4AA4 25086990 */ addiu $t0, %lo(gPlayers) # addiu $t0, $t0, 0x6990 /* 11E0B8 802B4AA8 0018C8C0 */ sll $t9, $t8, 3 /* 11E0BC 802B4AAC 0338C823 */ subu $t9, $t9, $t8 /* 11E0C0 802B4AB0 0019C900 */ sll $t9, $t9, 4 @@ -5014,8 +5014,8 @@ glabel L802B4B18 /* 11E128 802B4B18 0C0ACED1 */ jal func_802B3B44 /* 11E12C 802B4B1C 02002025 */ move $a0, $s0 /* 11E130 802B4B20 860C0004 */ lh $t4, 4($s0) -/* 11E134 802B4B24 3C0E800F */ lui $t6, %hi(D_800F6990) # $t6, 0x800f -/* 11E138 802B4B28 25CE6990 */ addiu $t6, %lo(D_800F6990) # addiu $t6, $t6, 0x6990 +/* 11E134 802B4B24 3C0E800F */ lui $t6, %hi(gPlayers) # $t6, 0x800f +/* 11E138 802B4B28 25CE6990 */ addiu $t6, %lo(gPlayers) # addiu $t6, $t6, 0x6990 /* 11E13C 802B4B2C 000C68C0 */ sll $t5, $t4, 3 /* 11E140 802B4B30 01AC6823 */ subu $t5, $t5, $t4 /* 11E144 802B4B34 000D6900 */ sll $t5, $t5, 4 @@ -5057,10 +5057,10 @@ glabel L802B4B94 /* 11E1D0 802B4BC0 030FC023 */ subu $t8, $t8, $t7 /* 11E1D4 802B4BC4 844B0000 */ lh $t3, ($v0) /* 11E1D8 802B4BC8 0018C080 */ sll $t8, $t8, 2 -/* 11E1DC 802B4BCC 3C19800F */ lui $t9, %hi(D_800F6990) # $t9, 0x800f +/* 11E1DC 802B4BCC 3C19800F */ lui $t9, %hi(gPlayers) # $t9, 0x800f /* 11E1E0 802B4BD0 030FC023 */ subu $t8, $t8, $t7 /* 11E1E4 802B4BD4 0018C0C0 */ sll $t8, $t8, 3 -/* 11E1E8 802B4BD8 27396990 */ addiu $t9, %lo(D_800F6990) # addiu $t9, $t9, 0x6990 +/* 11E1E8 802B4BD8 27396990 */ addiu $t9, %lo(gPlayers) # addiu $t9, $t9, 0x6990 /* 11E1EC 802B4BDC 24010016 */ li $at, 22 /* 11E1F0 802B4BE0 11610005 */ beq $t3, $at, .L802B4BF8 /* 11E1F4 802B4BE4 03198821 */ addu $s1, $t8, $t9 @@ -5165,8 +5165,8 @@ glabel L802B4D58 /* 11E370 802B4D60 3C048016 */ lui $a0, %hi(D_8015F8F0) # $a0, 0x8016 /* 11E374 802B4D64 2484F8F0 */ addiu $a0, %lo(D_8015F8F0) # addiu $a0, $a0, -0x710 /* 11E378 802B4D68 848A0000 */ lh $t2, ($a0) -/* 11E37C 802B4D6C 3C0D800F */ lui $t5, %hi(D_800F6990) # $t5, 0x800f -/* 11E380 802B4D70 25AD6990 */ addiu $t5, %lo(D_800F6990) # addiu $t5, $t5, 0x6990 +/* 11E37C 802B4D6C 3C0D800F */ lui $t5, %hi(gPlayers) # $t5, 0x800f +/* 11E380 802B4D70 25AD6990 */ addiu $t5, %lo(gPlayers) # addiu $t5, $t5, 0x6990 /* 11E384 802B4D74 A60A0004 */ sh $t2, 4($s0) /* 11E388 802B4D78 848B0000 */ lh $t3, ($a0) /* 11E38C 802B4D7C C6060018 */ lwc1 $f6, 0x18($s0) @@ -5198,8 +5198,8 @@ glabel L802B4D58 /* 11E3F4 802B4DE4 A60E0006 */ sh $t6, 6($s0) glabel L802B4DE8 /* 11E3F8 802B4DE8 860F0004 */ lh $t7, 4($s0) -/* 11E3FC 802B4DEC 3C19800F */ lui $t9, %hi(D_800F6990) # $t9, 0x800f -/* 11E400 802B4DF0 27396990 */ addiu $t9, %lo(D_800F6990) # addiu $t9, $t9, 0x6990 +/* 11E3FC 802B4DEC 3C19800F */ lui $t9, %hi(gPlayers) # $t9, 0x800f +/* 11E400 802B4DF0 27396990 */ addiu $t9, %lo(gPlayers) # addiu $t9, $t9, 0x6990 /* 11E404 802B4DF4 000FC0C0 */ sll $t8, $t7, 3 /* 11E408 802B4DF8 030FC023 */ subu $t8, $t8, $t7 /* 11E40C 802B4DFC 0018C100 */ sll $t8, $t8, 4 diff --git a/asm/non_matchings/code_80005FD0.s b/asm/non_matchings/code_80005FD0.s index eb7d7aa56..a2775d61e 100644 --- a/asm/non_matchings/code_80005FD0.s +++ b/asm/non_matchings/code_80005FD0.s @@ -484,9 +484,9 @@ glabel func_800065D0 /* 00731C 8000671C 0018C080 */ sll $t8, $t8, 2 /* 007320 80006720 3C018016 */ lui $at, %hi(D_80163270) # 0x8016 /* 007324 80006724 0304C023 */ subu $t8, $t8, $a0 -/* 007328 80006728 3C19800F */ lui $t9, %hi(D_800F6990) # $t9, 0x800f +/* 007328 80006728 3C19800F */ lui $t9, %hi(gPlayers) # $t9, 0x800f /* 00732C 8000672C 00220821 */ addu $at, $at, $v0 -/* 007330 80006730 27396990 */ addiu $t9, %lo(D_800F6990) # addiu $t9, $t9, 0x6990 +/* 007330 80006730 27396990 */ addiu $t9, %lo(gPlayers) # addiu $t9, $t9, 0x6990 /* 007334 80006734 0018C0C0 */ sll $t8, $t8, 3 /* 007338 80006738 A42E3270 */ sh $t6, %lo(D_80163270)($at) # 0x3270($at) /* 00733C 8000673C 03193821 */ addu $a3, $t8, $t9 @@ -512,9 +512,9 @@ glabel func_800065D0 /* 007384 80006784 000F7880 */ sll $t7, $t7, 2 /* 007388 80006788 3C018016 */ lui $at, %hi(D_80163258) # 0x8016 /* 00738C 8000678C 01E47823 */ subu $t7, $t7, $a0 -/* 007390 80006790 3C18800F */ lui $t8, %hi(D_800F6990) # $t8, 0x800f +/* 007390 80006790 3C18800F */ lui $t8, %hi(gPlayers) # $t8, 0x800f /* 007394 80006794 00220821 */ addu $at, $at, $v0 -/* 007398 80006798 27186990 */ addiu $t8, %lo(D_800F6990) # addiu $t8, $t8, 0x6990 +/* 007398 80006798 27186990 */ addiu $t8, %lo(gPlayers) # addiu $t8, $t8, 0x6990 /* 00739C 8000679C 000F78C0 */ sll $t7, $t7, 3 /* 0073A0 800067A0 A4203258 */ sh $zero, %lo(D_80163258)($at) # 0x3258($at) /* 0073A4 800067A4 01F83821 */ addu $a3, $t7, $t8 @@ -729,8 +729,8 @@ glabel set_places /* 0076A4 80006AA4 AFB80030 */ sw $t8, 0x30($sp) /* 0076A8 80006AA8 3C0A8016 */ lui $t2, %hi(D_80164360) # $t2, 0x8016 /* 0076AC 80006AAC 3C088016 */ lui $t0, %hi(D_80164360) # $t0, 0x8016 -/* 0076B0 80006AB0 3C06800F */ lui $a2, %hi(D_800F6990) # $a2, 0x800f -/* 0076B4 80006AB4 24C66990 */ addiu $a2, %lo(D_800F6990) # addiu $a2, $a2, 0x6990 +/* 0076B0 80006AB0 3C06800F */ lui $a2, %hi(gPlayers) # $a2, 0x800f +/* 0076B4 80006AB4 24C66990 */ addiu $a2, %lo(gPlayers) # addiu $a2, $a2, 0x6990 /* 0076B8 80006AB8 25084360 */ addiu $t0, %lo(D_80164360) # addiu $t0, $t0, 0x4360 /* 0076BC 80006ABC 254A4360 */ addiu $t2, %lo(D_80164360) # addiu $t2, $t2, 0x4360 /* 0076C0 80006AC0 24090001 */ li $t1, 1 @@ -1460,8 +1460,8 @@ glabel func_800074D4 /* 008124 80007524 01C07023 */ subu $t6, $t6, $zero /* 008128 80007528 000E7080 */ sll $t6, $t6, 2 /* 00812C 8000752C 01C07023 */ subu $t6, $t6, $zero -/* 008130 80007530 3C0F800F */ lui $t7, %hi(D_800F6990) # $t7, 0x800f -/* 008134 80007534 25EF6990 */ addiu $t7, %lo(D_800F6990) # addiu $t7, $t7, 0x6990 +/* 008130 80007530 3C0F800F */ lui $t7, %hi(gPlayers) # $t7, 0x800f +/* 008134 80007534 25EF6990 */ addiu $t7, %lo(gPlayers) # addiu $t7, $t7, 0x6990 /* 008138 80007538 000E70C0 */ sll $t6, $t6, 3 /* 00813C 8000753C 3C0C8016 */ lui $t4, %hi(D_80162FD8) # $t4, 0x8016 /* 008140 80007540 3C098016 */ lui $t1, %hi(D_8015F898) # $t1, 0x8016 @@ -1499,8 +1499,8 @@ glabel func_800074D4 /* 0081B4 800075B4 01C87023 */ subu $t6, $t6, $t0 /* 0081B8 800075B8 000E7080 */ sll $t6, $t6, 2 /* 0081BC 800075BC 01C87023 */ subu $t6, $t6, $t0 -/* 0081C0 800075C0 3C0F800F */ lui $t7, %hi(D_800F6990) # $t7, 0x800f -/* 0081C4 800075C4 25EF6990 */ addiu $t7, %lo(D_800F6990) # addiu $t7, $t7, 0x6990 +/* 0081C0 800075C0 3C0F800F */ lui $t7, %hi(gPlayers) # $t7, 0x800f +/* 0081C4 800075C4 25EF6990 */ addiu $t7, %lo(gPlayers) # addiu $t7, $t7, 0x6990 /* 0081C8 800075C8 000E70C0 */ sll $t6, $t6, 3 /* 0081CC 800075CC 3C098016 */ lui $t1, %hi(D_8015F898) # $t1, 0x8016 /* 0081D0 800075D0 3C0C8016 */ lui $t4, %hi(D_80162FD8) # $t4, 0x8016 @@ -1585,8 +1585,8 @@ glabel func_800074D4 /* 0082F4 800076F4 01E07823 */ subu $t7, $t7, $zero /* 0082F8 800076F8 000F7880 */ sll $t7, $t7, 2 /* 0082FC 800076FC 01E07823 */ subu $t7, $t7, $zero -/* 008300 80007700 3C18800F */ lui $t8, %hi(D_800F6990) # $t8, 0x800f -/* 008304 80007704 27186990 */ addiu $t8, %lo(D_800F6990) # addiu $t8, $t8, 0x6990 +/* 008300 80007700 3C18800F */ lui $t8, %hi(gPlayers) # $t8, 0x800f +/* 008304 80007704 27186990 */ addiu $t8, %lo(gPlayers) # addiu $t8, $t8, 0x6990 /* 008308 80007708 000F78C0 */ sll $t7, $t7, 3 /* 00830C 8000770C 3C0D8016 */ lui $t5, %hi(D_801644D0) # $t5, 0x8016 /* 008310 80007710 25AD44D0 */ addiu $t5, %lo(D_801644D0) # addiu $t5, $t5, 0x44d0 @@ -1619,8 +1619,8 @@ glabel func_800074D4 /* 008370 80007770 01E87823 */ subu $t7, $t7, $t0 /* 008374 80007774 000F7880 */ sll $t7, $t7, 2 /* 008378 80007778 01E87823 */ subu $t7, $t7, $t0 -/* 00837C 8000777C 3C18800F */ lui $t8, %hi(D_800F6990) # $t8, 0x800f -/* 008380 80007780 27186990 */ addiu $t8, %lo(D_800F6990) # addiu $t8, $t8, 0x6990 +/* 00837C 8000777C 3C18800F */ lui $t8, %hi(gPlayers) # $t8, 0x800f +/* 008380 80007780 27186990 */ addiu $t8, %lo(gPlayers) # addiu $t8, $t8, 0x6990 /* 008384 80007784 000F78C0 */ sll $t7, $t7, 3 /* 008388 80007788 3C0D8016 */ lui $t5, %hi(D_801644D0) # $t5, 0x8016 /* 00838C 8000778C 25AD44D0 */ addiu $t5, %lo(D_801644D0) # addiu $t5, $t5, 0x44d0 @@ -2877,8 +2877,8 @@ glabel func_800088D8 /* 009578 80008978 01C47023 */ subu $t6, $t6, $a0 /* 00957C 8000897C 000E7080 */ sll $t6, $t6, 2 /* 009580 80008980 01C47023 */ subu $t6, $t6, $a0 -/* 009584 80008984 3C0F800F */ lui $t7, %hi(D_800F6990) # $t7, 0x800f -/* 009588 80008988 25EF6990 */ addiu $t7, %lo(D_800F6990) # addiu $t7, $t7, 0x6990 +/* 009584 80008984 3C0F800F */ lui $t7, %hi(gPlayers) # $t7, 0x800f +/* 009588 80008988 25EF6990 */ addiu $t7, %lo(gPlayers) # addiu $t7, $t7, 0x6990 /* 00958C 8000898C 000E70C0 */ sll $t6, $t6, 3 /* 009590 80008990 01CF4821 */ addu $t1, $t6, $t7 /* 009594 80008994 95380000 */ lhu $t8, ($t1) @@ -3222,8 +3222,8 @@ glabel func_80008E58 /* 009A68 80008E68 000F7880 */ sll $t7, $t7, 2 /* 009A6C 80008E6C 27BDFFC0 */ addiu $sp, $sp, -0x40 /* 009A70 80008E70 01E47823 */ subu $t7, $t7, $a0 -/* 009A74 80008E74 3C18800F */ lui $t8, %hi(D_800F6990) # $t8, 0x800f -/* 009A78 80008E78 27186990 */ addiu $t8, %lo(D_800F6990) # addiu $t8, $t8, 0x6990 +/* 009A74 80008E74 3C18800F */ lui $t8, %hi(gPlayers) # $t8, 0x800f +/* 009A78 80008E78 27186990 */ addiu $t8, %lo(gPlayers) # addiu $t8, $t8, 0x6990 /* 009A7C 80008E7C 000F78C0 */ sll $t7, $t7, 3 /* 009A80 80008E80 01F81021 */ addu $v0, $t7, $t8 /* 009A84 80008E84 C4440014 */ lwc1 $f4, 0x14($v0) @@ -4162,8 +4162,8 @@ glabel func_80009B60 /* 00A7F0 80009BF0 01655823 */ subu $t3, $t3, $a1 /* 00A7F4 80009BF4 000B5880 */ sll $t3, $t3, 2 /* 00A7F8 80009BF8 01655823 */ subu $t3, $t3, $a1 -/* 00A7FC 80009BFC 3C0C800F */ lui $t4, %hi(D_800F6990) # $t4, 0x800f -/* 00A800 80009C00 258C6990 */ addiu $t4, %lo(D_800F6990) # addiu $t4, $t4, 0x6990 +/* 00A7FC 80009BFC 3C0C800F */ lui $t4, %hi(gPlayers) # $t4, 0x800f +/* 00A800 80009C00 258C6990 */ addiu $t4, %lo(gPlayers) # addiu $t4, $t4, 0x6990 /* 00A804 80009C04 000B58C0 */ sll $t3, $t3, 3 /* 00A808 80009C08 016C1821 */ addu $v1, $t3, $t4 /* 00A80C 80009C0C 946D0000 */ lhu $t5, ($v1) @@ -5639,8 +5639,8 @@ glabel func_8000B140 /* 00BD4C 8000B14C 01E47823 */ subu $t7, $t7, $a0 /* 00BD50 8000B150 000F7880 */ sll $t7, $t7, 2 /* 00BD54 8000B154 01E47823 */ subu $t7, $t7, $a0 -/* 00BD58 8000B158 3C18800F */ lui $t8, %hi(D_800F6990) # $t8, 0x800f -/* 00BD5C 8000B15C 27186990 */ addiu $t8, %lo(D_800F6990) # addiu $t8, $t8, 0x6990 +/* 00BD58 8000B158 3C18800F */ lui $t8, %hi(gPlayers) # $t8, 0x800f +/* 00BD5C 8000B15C 27186990 */ addiu $t8, %lo(gPlayers) # addiu $t8, $t8, 0x6990 /* 00BD60 8000B160 000F78C0 */ sll $t7, $t7, 3 /* 00BD64 8000B164 27BDFF00 */ addiu $sp, $sp, -0x100 /* 00BD68 8000B168 01F81821 */ addu $v1, $t7, $t8 @@ -5740,8 +5740,8 @@ glabel func_8000B140 /* 00BED4 8000B2D4 01A86823 */ subu $t5, $t5, $t0 /* 00BED8 8000B2D8 000D6880 */ sll $t5, $t5, 2 /* 00BEDC 8000B2DC 01A86823 */ subu $t5, $t5, $t0 -/* 00BEE0 8000B2E0 3C0F800F */ lui $t7, %hi(D_800F6990) # $t7, 0x800f -/* 00BEE4 8000B2E4 25EF6990 */ addiu $t7, %lo(D_800F6990) # addiu $t7, $t7, 0x6990 +/* 00BEE0 8000B2E0 3C0F800F */ lui $t7, %hi(gPlayers) # $t7, 0x800f +/* 00BEE4 8000B2E4 25EF6990 */ addiu $t7, %lo(gPlayers) # addiu $t7, $t7, 0x6990 /* 00BEE8 8000B2E8 000D68C0 */ sll $t5, $t5, 3 /* 00BEEC 8000B2EC 01AF1021 */ addu $v0, $t5, $t7 /* 00BEF0 8000B2F0 94580000 */ lhu $t8, ($v0) @@ -6224,8 +6224,8 @@ glabel func_8000B95C /* 00C5BC 8000B9BC 01645823 */ subu $t3, $t3, $a0 /* 00C5C0 8000B9C0 000B5880 */ sll $t3, $t3, 2 /* 00C5C4 8000B9C4 01645823 */ subu $t3, $t3, $a0 -/* 00C5C8 8000B9C8 3C0C800F */ lui $t4, %hi(D_800F6990) # $t4, 0x800f -/* 00C5CC 8000B9CC 258C6990 */ addiu $t4, %lo(D_800F6990) # addiu $t4, $t4, 0x6990 +/* 00C5C8 8000B9C8 3C0C800F */ lui $t4, %hi(gPlayers) # $t4, 0x800f +/* 00C5CC 8000B9CC 258C6990 */ addiu $t4, %lo(gPlayers) # addiu $t4, $t4, 0x6990 /* 00C5D0 8000B9D0 000B58C0 */ sll $t3, $t3, 3 /* 00C5D4 8000B9D4 016C1021 */ addu $v0, $t3, $t4 /* 00C5D8 8000B9D8 944D0000 */ lhu $t5, ($v0) @@ -8903,9 +8903,9 @@ glabel func_8000DF8C /* 00ED00 8000E100 3C0141C8 */ li $at, 0x41C80000 # 25.000000 /* 00ED04 8000E104 58600032 */ blezl $v1, .L8000E1D0 /* 00ED08 8000E108 8FB9004C */ lw $t9, 0x4c($sp) -/* 00ED0C 8000E10C 3C02800F */ lui $v0, %hi(D_800F6990) # $v0, 0x800f +/* 00ED0C 8000E10C 3C02800F */ lui $v0, %hi(gPlayers) # $v0, 0x800f /* 00ED10 8000E110 44817000 */ mtc1 $at, $f14 -/* 00ED14 8000E114 24426990 */ addiu $v0, %lo(D_800F6990) # addiu $v0, $v0, 0x6990 +/* 00ED14 8000E114 24426990 */ addiu $v0, %lo(gPlayers) # addiu $v0, $v0, 0x6990 /* 00ED18 8000E118 3C080100 */ lui $t0, 0x100 /* 00ED1C 8000E11C 24070005 */ li $a3, 5 /* 00ED20 8000E120 3C068000 */ lui $a2, 0x8000 @@ -10469,7 +10469,7 @@ glabel func_8000F628 /* 0103A0 8000F7A0 27184538 */ addiu $t8, %lo(D_80164538) # addiu $t8, $t8, 0x4538 /* 0103A4 8000F7A4 25CE34D8 */ addiu $t6, %lo(D_801634D8) # addiu $t6, $t6, 0x34d8 /* 0103A8 8000F7A8 25EF30B8 */ addiu $t7, %lo(D_801630B8) # addiu $t7, $t7, 0x30b8 -/* 0103AC 8000F7AC 3C11800F */ lui $s1, %hi(D_800F6990) # $s1, 0x800f +/* 0103AC 8000F7AC 3C11800F */ lui $s1, %hi(gPlayers) # $s1, 0x800f /* 0103B0 8000F7B0 3C128016 */ lui $s2, %hi(D_80163330) # $s2, 0x8016 /* 0103B4 8000F7B4 3C148016 */ lui $s4, %hi(D_801643B8) # $s4, 0x8016 /* 0103B8 8000F7B8 3C158016 */ lui $s5, %hi(D_801634F8) # $s5, 0x8016 @@ -10496,7 +10496,7 @@ glabel func_8000F628 /* 01040C 8000F80C 26B534F8 */ addiu $s5, %lo(D_801634F8) # addiu $s5, $s5, 0x34f8 /* 010410 8000F810 269443B8 */ addiu $s4, %lo(D_801643B8) # addiu $s4, $s4, 0x43b8 /* 010414 8000F814 26523330 */ addiu $s2, %lo(D_80163330) # addiu $s2, $s2, 0x3330 -/* 010418 8000F818 26316990 */ addiu $s1, %lo(D_800F6990) # addiu $s1, $s1, 0x6990 +/* 010418 8000F818 26316990 */ addiu $s1, %lo(gPlayers) # addiu $s1, $s1, 0x6990 /* 01041C 8000F81C AFAF004C */ sw $t7, 0x4c($sp) /* 010420 8000F820 AFAE0050 */ sw $t6, 0x50($sp) /* 010424 8000F824 AFB80058 */ sw $t8, 0x58($sp) @@ -11013,8 +11013,8 @@ glabel func_8000F628 /* 010BE8 8000FFE8 26523330 */ addiu $s2, %lo(D_80163330) # addiu $s2, $s2, 0x3330 /* 010BEC 8000FFEC 162E0031 */ bne $s1, $t6, .L800100B4 /* 010BF0 8000FFF0 00008025 */ move $s0, $zero -/* 010BF4 8000FFF4 3C02800F */ lui $v0, %hi(D_800F6990) # $v0, 0x800f -/* 010BF8 8000FFF8 24426990 */ addiu $v0, %lo(D_800F6990) # addiu $v0, $v0, 0x6990 +/* 010BF4 8000FFF4 3C02800F */ lui $v0, %hi(gPlayers) # $v0, 0x800f +/* 010BF8 8000FFF8 24426990 */ addiu $v0, %lo(gPlayers) # addiu $v0, $v0, 0x6990 /* 010BFC 8000FFFC 24050008 */ li $a1, 8 /* 010C00 80010000 3C040200 */ lui $a0, 0x200 /* 010C04 80010004 24030DD8 */ li $v1, 3544 @@ -13046,9 +13046,9 @@ glabel L80011CD4 /* 0128F4 80011CF4 0018C080 */ sll $t8, $t8, 2 /* 0128F8 80011CF8 3C018016 */ lui $at, %hi(D_801631E0) # 0x8016 /* 0128FC 80011CFC 0304C023 */ subu $t8, $t8, $a0 -/* 012900 80011D00 3C19800F */ lui $t9, %hi(D_800F6990) # $t9, 0x800f +/* 012900 80011D00 3C19800F */ lui $t9, %hi(gPlayers) # $t9, 0x800f /* 012904 80011D04 00230821 */ addu $at, $at, $v1 -/* 012908 80011D08 27396990 */ addiu $t9, %lo(D_800F6990) # addiu $t9, $t9, 0x6990 +/* 012908 80011D08 27396990 */ addiu $t9, %lo(gPlayers) # addiu $t9, $t9, 0x6990 /* 01290C 80011D0C 0018C0C0 */ sll $t8, $t8, 3 /* 012910 80011D10 A42031E0 */ sh $zero, %lo(D_801631E0)($at) # 0x31e0($at) /* 012914 80011D14 03191021 */ addu $v0, $t8, $t9 @@ -14508,8 +14508,8 @@ glabel func_800131DC /* 013E28 80013228 0019C880 */ sll $t9, $t9, 2 /* 013E2C 8001322C 0324C823 */ subu $t9, $t9, $a0 /* 013E30 80013230 0019C8C0 */ sll $t9, $t9, 3 -/* 013E34 80013234 3C09800F */ lui $t1, %hi(D_800F6990) # $t1, 0x800f -/* 013E38 80013238 25296990 */ addiu $t1, %lo(D_800F6990) # addiu $t1, $t1, 0x6990 +/* 013E34 80013234 3C09800F */ lui $t1, %hi(gPlayers) # $t1, 0x800f +/* 013E38 80013238 25296990 */ addiu $t1, %lo(gPlayers) # addiu $t1, $t1, 0x6990 /* 013E3C 8001323C 27280014 */ addiu $t0, $t9, 0x14 /* 013E40 80013240 01092021 */ addu $a0, $t0, $t1 /* 013E44 80013244 3C05447A */ lui $a1, 0x447a @@ -15951,9 +15951,9 @@ glabel func_800146B8 /* 0152C8 800146C8 000F7880 */ sll $t7, $t7, 2 /* 0152CC 800146CC 01E47823 */ subu $t7, $t7, $a0 /* 0152D0 800146D0 000F78C0 */ sll $t7, $t7, 3 -/* 0152D4 800146D4 3C01800F */ lui $at, %hi(D_800F6A24) +/* 0152D4 800146D4 3C01800F */ lui $at, %hi(gPlayers+0x94) /* 0152D8 800146D8 002F0821 */ addu $at, $at, $t7 -/* 0152DC 800146DC C4246A24 */ lwc1 $f4, %lo(D_800F6A24)($at) +/* 0152DC 800146DC C4246A24 */ lwc1 $f4, %lo(gPlayers+0x94)($at) /* 0152E0 800146E0 3C01800F */ lui $at, %hi(D_800ED1B0) /* 0152E4 800146E4 D428D1B0 */ ldc1 $f8, %lo(D_800ED1B0)($at) /* 0152E8 800146E8 460021A1 */ cvt.d.s $f6, $f4 @@ -17401,13 +17401,13 @@ glabel func_80015A9C /* 0167DC 80015BDC 25AD4638 */ addiu $t5, %lo(D_80164638) # addiu $t5, $t5, 0x4638 /* 0167E0 80015BE0 030FC023 */ subu $t8, $t8, $t7 /* 0167E4 80015BE4 0018C0C0 */ sll $t8, $t8, 3 -/* 0167E8 80015BE8 3C01800F */ lui $at, %hi(D_800F6A24) +/* 0167E8 80015BE8 3C01800F */ lui $at, %hi(gPlayers+0x94) /* 0167EC 80015BEC 004E2821 */ addu $a1, $v0, $t6 /* 0167F0 80015BF0 004D3021 */ addu $a2, $v0, $t5 /* 0167F4 80015BF4 E4A80000 */ swc1 $f8, ($a1) /* 0167F8 80015BF8 00380821 */ addu $at, $at, $t8 /* 0167FC 80015BFC E4CA0000 */ swc1 $f10, ($a2) -/* 016800 80015C00 C4306A24 */ lwc1 $f16, %lo(D_800F6A24)($at) +/* 016800 80015C00 C4306A24 */ lwc1 $f16, %lo(gPlayers+0x94)($at) /* 016804 80015C04 3C0140A0 */ li $at, 0x40A00000 # 5.000000 /* 016808 80015C08 44819000 */ mtc1 $at, $f18 /* 01680C 80015C0C 44803000 */ mtc1 $zero, $f6 @@ -17946,13 +17946,13 @@ glabel func_800162CC /* 017010 80016410 27394638 */ addiu $t9, %lo(D_80164638) # addiu $t9, $t9, 0x4638 /* 017014 80016414 01495023 */ subu $t2, $t2, $t1 /* 017018 80016418 000A50C0 */ sll $t2, $t2, 3 -/* 01701C 8001641C 3C01800F */ lui $at, %hi(D_800F6A24) +/* 01701C 8001641C 3C01800F */ lui $at, %hi(gPlayers+0x94) /* 017020 80016420 00792821 */ addu $a1, $v1, $t9 /* 017024 80016424 8FAB0030 */ lw $t3, 0x30($sp) /* 017028 80016428 E4860000 */ swc1 $f6, ($a0) /* 01702C 8001642C 002A0821 */ addu $at, $at, $t2 /* 017030 80016430 E4A80000 */ swc1 $f8, ($a1) -/* 017034 80016434 C4226A24 */ lwc1 $f2, %lo(D_800F6A24)($at) +/* 017034 80016434 C4226A24 */ lwc1 $f2, %lo(gPlayers+0x94)($at) /* 017038 80016438 3C018016 */ lui $at, %hi(D_80164658) /* 01703C 8001643C 000B6880 */ sll $t5, $t3, 2 /* 017040 80016440 00230821 */ addu $at, $at, $v1 @@ -18161,9 +18161,9 @@ glabel func_80016494 /* 017358 80016758 014BC023 */ subu $t8, $t2, $t3 /* 01735C 8001675C 2B01000A */ slti $at, $t8, 0xa /* 017360 80016760 10200009 */ beqz $at, .L80016788 -/* 017364 80016764 3C01800F */ lui $at, %hi(D_800F6A24) +/* 017364 80016764 3C01800F */ lui $at, %hi(gPlayers+0x94) /* 017368 80016768 003F0821 */ addu $at, $at, $ra -/* 01736C 8001676C C42A6A24 */ lwc1 $f10, %lo(D_800F6A24)($at) +/* 01736C 8001676C C42A6A24 */ lwc1 $f10, %lo(gPlayers+0x94)($at) /* 017370 80016770 3C01800F */ lui $at, %hi(D_800ED248) /* 017374 80016774 D426D248 */ ldc1 $f6, %lo(D_800ED248)($at) /* 017378 80016778 46005121 */ cvt.d.s $f4, $f10 @@ -18177,9 +18177,9 @@ glabel func_80016494 /* 017394 80016794 016A7823 */ subu $t7, $t3, $t2 /* 017398 80016798 29E1000A */ slti $at, $t7, 0xa /* 01739C 8001679C 10200009 */ beqz $at, .L800167C4 -/* 0173A0 800167A0 3C01800F */ lui $at, %hi(D_800F6A24) +/* 0173A0 800167A0 3C01800F */ lui $at, %hi(gPlayers+0x94) /* 0173A4 800167A4 003F0821 */ addu $at, $at, $ra -/* 0173A8 800167A8 C4246A24 */ lwc1 $f4, %lo(D_800F6A24)($at) +/* 0173A8 800167A8 C4246A24 */ lwc1 $f4, %lo(gPlayers+0x94)($at) /* 0173AC 800167AC 3C01800F */ lui $at, %hi(D_800ED250) /* 0173B0 800167B0 D428D250 */ ldc1 $f8, %lo(D_800ED250)($at) /* 0173B4 800167B4 460021A1 */ cvt.d.s $f6, $f4 @@ -19308,13 +19308,13 @@ glabel func_80017720 /* 018470 80017870 256B4638 */ addiu $t3, %lo(D_80164638) # addiu $t3, $t3, 0x4638 /* 018474 80017874 01AC6823 */ subu $t5, $t5, $t4 /* 018478 80017878 000D68C0 */ sll $t5, $t5, 3 -/* 01847C 8001787C 3C01800F */ lui $at, %hi(D_800F6A24) +/* 01847C 8001787C 3C01800F */ lui $at, %hi(gPlayers+0x94) /* 018480 80017880 006B2821 */ addu $a1, $v1, $t3 /* 018484 80017884 8FAE0030 */ lw $t6, 0x30($sp) /* 018488 80017888 E4860000 */ swc1 $f6, ($a0) /* 01848C 8001788C 002D0821 */ addu $at, $at, $t5 /* 018490 80017890 E4A80000 */ swc1 $f8, ($a1) -/* 018494 80017894 C4226A24 */ lwc1 $f2, %lo(D_800F6A24)($at) +/* 018494 80017894 C4226A24 */ lwc1 $f2, %lo(gPlayers+0x94)($at) /* 018498 80017898 3C018016 */ lui $at, %hi(D_80164658) /* 01849C 8001789C 000EC080 */ sll $t8, $t6, 2 /* 0184A0 800178A0 00230821 */ addu $at, $at, $v1 @@ -19471,9 +19471,9 @@ glabel func_800178F4 /* 0186E8 80017AE8 0109C023 */ subu $t8, $t0, $t1 /* 0186EC 80017AEC 2B010003 */ slti $at, $t8, 3 /* 0186F0 80017AF0 10200009 */ beqz $at, .L80017B18 -/* 0186F4 80017AF4 3C01800F */ lui $at, %hi(D_800F6A24) +/* 0186F4 80017AF4 3C01800F */ lui $at, %hi(gPlayers+0x94) /* 0186F8 80017AF8 002B0821 */ addu $at, $at, $t3 -/* 0186FC 80017AFC C4286A24 */ lwc1 $f8, %lo(D_800F6A24)($at) +/* 0186FC 80017AFC C4286A24 */ lwc1 $f8, %lo(gPlayers+0x94)($at) /* 018700 80017B00 3C01800F */ lui $at, %hi(D_800ED288) /* 018704 80017B04 D424D288 */ ldc1 $f4, %lo(D_800ED288)($at) /* 018708 80017B08 460042A1 */ cvt.d.s $f10, $f8 @@ -19488,9 +19488,9 @@ glabel func_800178F4 /* 018724 80017B24 01287823 */ subu $t7, $t1, $t0 /* 018728 80017B28 29E10003 */ slti $at, $t7, 3 /* 01872C 80017B2C 10200009 */ beqz $at, .L80017B54 -/* 018730 80017B30 3C01800F */ lui $at, %hi(D_800F6A24) +/* 018730 80017B30 3C01800F */ lui $at, %hi(gPlayers+0x94) /* 018734 80017B34 002B0821 */ addu $at, $at, $t3 -/* 018738 80017B38 C42A6A24 */ lwc1 $f10, %lo(D_800F6A24)($at) +/* 018738 80017B38 C42A6A24 */ lwc1 $f10, %lo(gPlayers+0x94)($at) /* 01873C 80017B3C 3C01800F */ lui $at, %hi(D_800ED290) /* 018740 80017B40 D426D290 */ ldc1 $f6, %lo(D_800ED290)($at) /* 018744 80017B44 46005121 */ cvt.d.s $f4, $f10 @@ -19841,13 +19841,13 @@ glabel func_80017F10 /* 018C6C 8001806C 256B4638 */ addiu $t3, %lo(D_80164638) # addiu $t3, $t3, 0x4638 /* 018C70 80018070 01AC6823 */ subu $t5, $t5, $t4 /* 018C74 80018074 000D68C0 */ sll $t5, $t5, 3 -/* 018C78 80018078 3C01800F */ lui $at, %hi(D_800F6A24) +/* 018C78 80018078 3C01800F */ lui $at, %hi(gPlayers+0x94) /* 018C7C 8001807C 006B2821 */ addu $a1, $v1, $t3 /* 018C80 80018080 8FAE0030 */ lw $t6, 0x30($sp) /* 018C84 80018084 E4860000 */ swc1 $f6, ($a0) /* 018C88 80018088 002D0821 */ addu $at, $at, $t5 /* 018C8C 8001808C E4A80000 */ swc1 $f8, ($a1) -/* 018C90 80018090 C4226A24 */ lwc1 $f2, %lo(D_800F6A24)($at) +/* 018C90 80018090 C4226A24 */ lwc1 $f2, %lo(gPlayers+0x94)($at) /* 018C94 80018094 3C018016 */ lui $at, %hi(D_80164658) /* 018C98 80018098 000EC080 */ sll $t8, $t6, 2 /* 018C9C 8001809C 00230821 */ addu $at, $at, $v1 @@ -20008,9 +20008,9 @@ glabel func_800180F0 /* 018EF4 800182F4 0109C023 */ subu $t8, $t0, $t1 /* 018EF8 800182F8 2B010003 */ slti $at, $t8, 3 /* 018EFC 800182FC 10200009 */ beqz $at, .L80018324 -/* 018F00 80018300 3C01800F */ lui $at, %hi(D_800F6A24) +/* 018F00 80018300 3C01800F */ lui $at, %hi(gPlayers+0x94) /* 018F04 80018304 002B0821 */ addu $at, $at, $t3 -/* 018F08 80018308 C4286A24 */ lwc1 $f8, %lo(D_800F6A24)($at) +/* 018F08 80018308 C4286A24 */ lwc1 $f8, %lo(gPlayers+0x94)($at) /* 018F0C 8001830C 3C01800F */ lui $at, %hi(D_800ED298) /* 018F10 80018310 D424D298 */ ldc1 $f4, %lo(D_800ED298)($at) /* 018F14 80018314 460042A1 */ cvt.d.s $f10, $f8 @@ -20025,9 +20025,9 @@ glabel func_800180F0 /* 018F30 80018330 01287823 */ subu $t7, $t1, $t0 /* 018F34 80018334 29E10003 */ slti $at, $t7, 3 /* 018F38 80018338 10200009 */ beqz $at, .L80018360 -/* 018F3C 8001833C 3C01800F */ lui $at, %hi(D_800F6A24) +/* 018F3C 8001833C 3C01800F */ lui $at, %hi(gPlayers+0x94) /* 018F40 80018340 002B0821 */ addu $at, $at, $t3 -/* 018F44 80018344 C42A6A24 */ lwc1 $f10, %lo(D_800F6A24)($at) +/* 018F44 80018344 C42A6A24 */ lwc1 $f10, %lo(gPlayers+0x94)($at) /* 018F48 80018348 3C01800F */ lui $at, %hi(D_800ED2A0) /* 018F4C 8001834C D426D2A0 */ ldc1 $f6, %lo(D_800ED2A0)($at) /* 018F50 80018350 46005121 */ cvt.d.s $f4, $f10 @@ -20373,12 +20373,12 @@ glabel func_80018718 /* 019464 80018864 25294638 */ addiu $t1, %lo(D_80164638) # addiu $t1, $t1, 0x4638 /* 019468 80018868 016A5823 */ subu $t3, $t3, $t2 /* 01946C 8001886C 000B58C0 */ sll $t3, $t3, 3 -/* 019470 80018870 3C01800F */ lui $at, %hi(D_800F6A24) +/* 019470 80018870 3C01800F */ lui $at, %hi(gPlayers+0x94) /* 019474 80018874 00692821 */ addu $a1, $v1, $t1 /* 019478 80018878 E4860000 */ swc1 $f6, ($a0) /* 01947C 8001887C 002B0821 */ addu $at, $at, $t3 /* 019480 80018880 E4A80000 */ swc1 $f8, ($a1) -/* 019484 80018884 C4226A24 */ lwc1 $f2, %lo(D_800F6A24)($at) +/* 019484 80018884 C4226A24 */ lwc1 $f2, %lo(gPlayers+0x94)($at) /* 019488 80018888 8FAE0030 */ lw $t6, 0x30($sp) /* 01948C 8001888C 3C018016 */ lui $at, %hi(D_80164658) /* 019490 80018890 00230821 */ addu $at, $at, $v1 @@ -20431,14 +20431,14 @@ glabel func_800188F4 /* 019544 80018944 01254823 */ subu $t1, $t1, $a1 /* 019548 80018948 2463448C */ addiu $v1, %lo(D_8016448C) # addiu $v1, $v1, 0x448c /* 01954C 8001894C 000948C0 */ sll $t1, $t1, 3 -/* 019550 80018950 3C01800F */ lui $at, %hi(D_800F6A24) +/* 019550 80018950 3C01800F */ lui $at, %hi(gPlayers+0x94) /* 019554 80018954 AFAF0068 */ sw $t7, 0x68($sp) /* 019558 80018958 000FC840 */ sll $t9, $t7, 1 /* 01955C 8001895C 8C780000 */ lw $t8, ($v1) /* 019560 80018960 3C0A8016 */ lui $t2, %hi(D_801645C8) # 0x8016 /* 019564 80018964 3C0F8016 */ lui $t7, %hi(D_80164648) # $t7, 0x8016 /* 019568 80018968 00290821 */ addu $at, $at, $t1 -/* 01956C 8001896C C42C6A24 */ lwc1 $f12, %lo(D_800F6A24)($at) +/* 01956C 8001896C C42C6A24 */ lwc1 $f12, %lo(gPlayers+0x94)($at) /* 019570 80018970 01595021 */ addu $t2, $t2, $t9 /* 019574 80018974 25EF4648 */ addiu $t7, %lo(D_80164648) # addiu $t7, $t7, 0x4648 /* 019578 80018978 00076080 */ sll $t4, $a3, 2 @@ -22303,9 +22303,9 @@ glabel func_8001A450 /* 01B060 8001A460 000E7080 */ sll $t6, $t6, 2 /* 01B064 8001A464 01C47023 */ subu $t6, $t6, $a0 /* 01B068 8001A468 000E70C0 */ sll $t6, $t6, 3 -/* 01B06C 8001A46C 3C0F800F */ lui $t7, %hi(D_800F6A4C) # 0x800f +/* 01B06C 8001A46C 3C0F800F */ lui $t7, %hi(gPlayers+0xBC) # 0x800f /* 01B070 8001A470 01EE7821 */ addu $t7, $t7, $t6 -/* 01B074 8001A474 8DEF6A4C */ lw $t7, %lo(D_800F6A4C)($t7) # 0x6a4c($t7) +/* 01B074 8001A474 8DEF6A4C */ lw $t7, %lo(gPlayers+0xBC)($t7) # 0x6a4c($t7) /* 01B078 8001A478 3C011000 */ lui $at, (0x1000000C >> 16) # lui $at, 0x1000 /* 01B07C 8001A47C 27BDFFD8 */ addiu $sp, $sp, -0x28 /* 01B080 8001A480 3421000C */ ori $at, (0x1000000C & 0xFFFF) # ori $at, $at, 0xc @@ -22583,9 +22583,9 @@ glabel func_8001A588 /* 01B464 8001A864 1000003F */ b .L8001A964 /* 01B468 8001A868 8FA70060 */ lw $a3, 0x60($sp) .L8001A86C: -/* 01B46C 8001A86C 3C04800F */ lui $a0, %hi(D_800F6990) # $a0, 0x800f +/* 01B46C 8001A86C 3C04800F */ lui $a0, %hi(gPlayers) # $a0, 0x800f /* 01B470 8001A870 AFB00044 */ sw $s0, 0x44($sp) -/* 01B474 8001A874 24846990 */ addiu $a0, %lo(D_800F6990) # addiu $a0, $a0, 0x6990 +/* 01B474 8001A874 24846990 */ addiu $a0, %lo(gPlayers) # addiu $a0, $a0, 0x6990 /* 01B478 8001A878 24050DD8 */ li $a1, 3544 /* 01B47C 8001A87C 26100001 */ addiu $s0, $s0, 1 .L8001A880: diff --git a/asm/non_matchings/code_800393C0/func_8003D080.s b/asm/non_matchings/code_800393C0/func_8003D080.s index b28593bce..c1ac9b433 100644 --- a/asm/non_matchings/code_800393C0/func_8003D080.s +++ b/asm/non_matchings/code_800393C0/func_8003D080.s @@ -42,9 +42,9 @@ glabel func_8003D080 /* 03DD14 8003D114 10400005 */ beqz $v0, .L8003D12C /* 03DD18 8003D118 00000000 */ nop /* 03DD1C 8003D11C 10410027 */ beq $v0, $at, .L8003D1BC -/* 03DD20 8003D120 3C06800F */ lui $a2, %hi(gPlayer1PosZ) # 0x800f +/* 03DD20 8003D120 3C06800F */ lui $a2, %hi(gPlayers+0x1C) # 0x800f /* 03DD24 8003D124 10000032 */ b .L8003D1F0 -/* 03DD28 8003D128 3C01800F */ lui $at, %hi(gPlayer1PosX) # 0x800f +/* 03DD28 8003D128 3C01800F */ lui $at, %hi(gPlayers+0x14) # 0x800f .L8003D12C: /* 03DD2C 8003D12C 8718C5A0 */ lh $t8, %lo(gCurrentCourseId)($t8) /* 03DD30 8003D130 2401000A */ li $at, 10 @@ -52,14 +52,14 @@ glabel func_8003D080 /* 03DD38 8003D138 1701000E */ bne $t8, $at, .L8003D174 /* 03DD3C 8003D13C 24425210 */ addiu $v0, %lo(D_80165210) # addiu $v0, $v0, 0x5210 /* 03DD40 8003D140 44806000 */ mtc1 $zero, $f12 -/* 03DD44 8003D144 3C01800F */ lui $at, %hi(gPlayer1PosY) # $at, 0x800f +/* 03DD44 8003D144 3C01800F */ lui $at, %hi(gPlayers+0x18) # $at, 0x800f /* 03DD48 8003D148 3C068016 */ lui $a2, %hi(D_8016524C) # $a2, 0x8016 -/* 03DD4C 8003D14C 3C07800F */ lui $a3, %hi(gPlayer1Rotation) # $a3, 0x800f +/* 03DD4C 8003D14C 3C07800F */ lui $a3, %hi(gPlayers+0x2E) # $a3, 0x800f /* 03DD50 8003D150 24190008 */ li $t9, 8 /* 03DD54 8003D154 AFB90010 */ sw $t9, 0x10($sp) -/* 03DD58 8003D158 84E769BE */ lh $a3, %lo(gPlayer1Rotation)($a3) +/* 03DD58 8003D158 84E769BE */ lh $a3, %lo(gPlayers+0x2E)($a3) /* 03DD5C 8003D15C 8CC6524C */ lw $a2, %lo(D_8016524C)($a2) -/* 03DD60 8003D160 C42E69A8 */ lwc1 $f14, %lo(gPlayer1PosY)($at) +/* 03DD60 8003D160 C42E69A8 */ lwc1 $f14, %lo(gPlayers+0x18)($at) /* 03DD64 8003D164 0C007134 */ jal func_8001C4D0 /* 03DD68 8003D168 AFA00014 */ sw $zero, 0x14($sp) /* 03DD6C 8003D16C 1000002B */ b .L8003D21C @@ -70,43 +70,43 @@ glabel func_8003D080 /* 03DD7C 8003D17C 3C014000 */ li $at, 0x40000000 # 2.000000 /* 03DD80 8003D180 44815000 */ mtc1 $at, $f10 /* 03DD84 8003D184 46062200 */ add.s $f8, $f4, $f6 -/* 03DD88 8003D188 3C01800F */ lui $at, %hi(gPlayer1PosY) # $at, 0x800f +/* 03DD88 8003D188 3C01800F */ lui $at, %hi(gPlayers+0x18) # $at, 0x800f /* 03DD8C 8003D18C 3C068016 */ lui $a2, %hi(D_8016524C) # $a2, 0x8016 -/* 03DD90 8003D190 3C07800F */ lui $a3, %hi(gPlayer1Rotation) # $a3, 0x800f +/* 03DD90 8003D190 3C07800F */ lui $a3, %hi(gPlayers+0x2E) # $a3, 0x800f /* 03DD94 8003D194 24080008 */ li $t0, 8 /* 03DD98 8003D198 AFA80010 */ sw $t0, 0x10($sp) -/* 03DD9C 8003D19C 84E769BE */ lh $a3, %lo(gPlayer1Rotation)($a3) +/* 03DD9C 8003D19C 84E769BE */ lh $a3, %lo(gPlayers+0x2E)($a3) /* 03DDA0 8003D1A0 8CC6524C */ lw $a2, %lo(D_8016524C)($a2) -/* 03DDA4 8003D1A4 C42E69A8 */ lwc1 $f14, %lo(gPlayer1PosY)($at) +/* 03DDA4 8003D1A4 C42E69A8 */ lwc1 $f14, %lo(gPlayers+0x18)($at) /* 03DDA8 8003D1A8 AFA00014 */ sw $zero, 0x14($sp) /* 03DDAC 8003D1AC 0C007134 */ jal func_8001C4D0 /* 03DDB0 8003D1B0 460A4303 */ div.s $f12, $f8, $f10 /* 03DDB4 8003D1B4 10000019 */ b .L8003D21C /* 03DDB8 8003D1B8 00000000 */ nop .L8003D1BC: -/* 03DDBC 8003D1BC 3C01800F */ lui $at, %hi(gPlayer1PosX) # $at, 0x800f -/* 03DDC0 8003D1C0 C42C69A4 */ lwc1 $f12, %lo(gPlayer1PosX)($at) -/* 03DDC4 8003D1C4 3C01800F */ lui $at, %hi(gPlayer1PosX) # $at, 0x800f -/* 03DDC8 8003D1C8 3C07800F */ lui $a3, %hi(gPlayer1Rotation) # $a3, 0x800f +/* 03DDBC 8003D1BC 3C01800F */ lui $at, %hi(gPlayers+0x14) # $at, 0x800f +/* 03DDC0 8003D1C0 C42C69A4 */ lwc1 $f12, %lo(gPlayers+0x14)($at) +/* 03DDC4 8003D1C4 3C01800F */ lui $at, %hi(gPlayers+0x14) # $at, 0x800f +/* 03DDC8 8003D1C8 3C07800F */ lui $a3, %hi(gPlayers+0x2E) # $a3, 0x800f /* 03DDCC 8003D1CC 24090001 */ li $t1, 1 /* 03DDD0 8003D1D0 AFA90010 */ sw $t1, 0x10($sp) -/* 03DDD4 8003D1D4 84E769BE */ lh $a3, %lo(gPlayer1Rotation)($a3) -/* 03DDD8 8003D1D8 C42E69A8 */ lwc1 $f14, %lo(gPlayer1PosY)($at) -/* 03DDDC 8003D1DC 8CC669AC */ lw $a2, %lo(gPlayer1PosZ)($a2) # 0x69ac($a2) +/* 03DDD4 8003D1D4 84E769BE */ lh $a3, %lo(gPlayers+0x2E)($a3) +/* 03DDD8 8003D1D8 C42E69A8 */ lwc1 $f14, %lo(gPlayers+0x18)($at) +/* 03DDDC 8003D1DC 8CC669AC */ lw $a2, %lo(gPlayers+0x1C)($a2) # 0x69ac($a2) /* 03DDE0 8003D1E0 0C007134 */ jal func_8001C4D0 /* 03DDE4 8003D1E4 AFA00014 */ sw $zero, 0x14($sp) /* 03DDE8 8003D1E8 1000000C */ b .L8003D21C /* 03DDEC 8003D1EC 00000000 */ nop .L8003D1F0: -/* 03DDF0 8003D1F0 C42C69A4 */ lwc1 $f12, %lo(gPlayer1PosX)($at) -/* 03DDF4 8003D1F4 3C01800F */ lui $at, %hi(gPlayer1PosY) # $at, 0x800f -/* 03DDF8 8003D1F8 3C06800F */ lui $a2, %hi(gPlayer1PosZ) # $a2, 0x800f -/* 03DDFC 8003D1FC 3C07800F */ lui $a3, %hi(gPlayer1Rotation) # $a3, 0x800f +/* 03DDF0 8003D1F0 C42C69A4 */ lwc1 $f12, %lo(gPlayers+0x14)($at) +/* 03DDF4 8003D1F4 3C01800F */ lui $at, %hi(gPlayers+0x18) # $at, 0x800f +/* 03DDF8 8003D1F8 3C06800F */ lui $a2, %hi(gPlayers+0x1C) # $a2, 0x800f +/* 03DDFC 8003D1FC 3C07800F */ lui $a3, %hi(gPlayers+0x2E) # $a3, 0x800f /* 03DE00 8003D200 240A000A */ li $t2, 10 /* 03DE04 8003D204 AFAA0010 */ sw $t2, 0x10($sp) -/* 03DE08 8003D208 84E769BE */ lh $a3, %lo(gPlayer1Rotation)($a3) -/* 03DE0C 8003D20C 8CC669AC */ lw $a2, %lo(gPlayer1PosZ)($a2) -/* 03DE10 8003D210 C42E69A8 */ lwc1 $f14, %lo(gPlayer1PosY)($at) +/* 03DE08 8003D208 84E769BE */ lh $a3, %lo(gPlayers+0x2E)($a3) +/* 03DE0C 8003D20C 8CC669AC */ lw $a2, %lo(gPlayers+0x1C)($a2) +/* 03DE10 8003D210 C42E69A8 */ lwc1 $f14, %lo(gPlayers+0x18)($at) /* 03DE14 8003D214 0C007134 */ jal func_8001C4D0 /* 03DE18 8003D218 AFA00014 */ sw $zero, 0x14($sp) .L8003D21C: @@ -116,27 +116,27 @@ glabel func_8003D080 .L8003D228: /* 03DE28 8003D228 3C02800E */ lui $v0, %hi(gModeSelection) # $v0, 0x800e /* 03DE2C 8003D22C 8C42C53C */ lw $v0, %lo(gModeSelection)($v0) -/* 03DE30 8003D230 3C01800F */ lui $at, %hi(gPlayer1PosX) # 0x800f -/* 03DE34 8003D234 3C06800F */ lui $a2, %hi(gPlayer1PosZ) # 0x800f +/* 03DE30 8003D230 3C01800F */ lui $at, %hi(gPlayers+0x14) # 0x800f +/* 03DE34 8003D234 3C06800F */ lui $a2, %hi(gPlayers+0x1C) # 0x800f /* 03DE38 8003D238 10400006 */ beqz $v0, .L8003D254 -/* 03DE3C 8003D23C 3C07800F */ lui $a3, %hi(gPlayer1Rotation) # $a3, 0x800f +/* 03DE3C 8003D23C 3C07800F */ lui $a3, %hi(gPlayers+0x2E) # $a3, 0x800f /* 03DE40 8003D240 24010003 */ li $at, 3 /* 03DE44 8003D244 10410019 */ beq $v0, $at, .L8003D2AC -/* 03DE48 8003D248 3C06800F */ lui $a2, %hi(gPlayer1PosZ) # $a2, 0x800f +/* 03DE48 8003D248 3C06800F */ lui $a2, %hi(gPlayers+0x1C) # $a2, 0x800f /* 03DE4C 8003D24C 1000002F */ b .L8003D30C -/* 03DE50 8003D250 3C01800F */ lui $at, %hi(gPlayer1PosX) # $at, 0x800f +/* 03DE50 8003D250 3C01800F */ lui $at, %hi(gPlayers+0x14) # $at, 0x800f .L8003D254: -/* 03DE54 8003D254 C42C69A4 */ lwc1 $f12, %lo(gPlayer1PosX)($at) -/* 03DE58 8003D258 3C01800F */ lui $at, %hi(gPlayer1PosY) # $at, 0x800f +/* 03DE54 8003D254 C42C69A4 */ lwc1 $f12, %lo(gPlayers+0x14)($at) +/* 03DE58 8003D258 3C01800F */ lui $at, %hi(gPlayers+0x18) # $at, 0x800f /* 03DE5C 8003D25C 240B0001 */ li $t3, 1 /* 03DE60 8003D260 AFAB0010 */ sw $t3, 0x10($sp) -/* 03DE64 8003D264 C42E69A8 */ lwc1 $f14, %lo(gPlayer1PosY)($at) -/* 03DE68 8003D268 8CC669AC */ lw $a2, %lo(gPlayer1PosZ)($a2) -/* 03DE6C 8003D26C 84E769BE */ lh $a3, %lo(gPlayer1Rotation)($a3) +/* 03DE64 8003D264 C42E69A8 */ lwc1 $f14, %lo(gPlayers+0x18)($at) +/* 03DE68 8003D268 8CC669AC */ lw $a2, %lo(gPlayers+0x1C)($a2) +/* 03DE6C 8003D26C 84E769BE */ lh $a3, %lo(gPlayers+0x2E)($a3) /* 03DE70 8003D270 0C007134 */ jal func_8001C4D0 /* 03DE74 8003D274 AFA00014 */ sw $zero, 0x14($sp) -/* 03DE78 8003D278 3C02800F */ lui $v0, %hi(D_800F7768) # $v0, 0x800f -/* 03DE7C 8003D27C 24427768 */ addiu $v0, %lo(D_800F7768) # addiu $v0, $v0, 0x7768 +/* 03DE78 8003D278 3C02800F */ lui $v0, %hi(gPlayers+0xDD8) # $v0, 0x800f +/* 03DE7C 8003D27C 24427768 */ addiu $v0, %lo(gPlayers+0xDD8) # addiu $v0, $v0, 0x7768 /* 03DE80 8003D280 C44C0014 */ lwc1 $f12, 0x14($v0) /* 03DE84 8003D284 C44E0018 */ lwc1 $f14, 0x18($v0) /* 03DE88 8003D288 8C46001C */ lw $a2, 0x1c($v0) @@ -149,19 +149,19 @@ glabel func_8003D080 /* 03DEA4 8003D2A4 1000002F */ b .L8003D364 /* 03DEA8 8003D2A8 00000000 */ nop .L8003D2AC: -/* 03DEAC 8003D2AC 3C01800F */ lui $at, %hi(gPlayer1PosX) # $at, 0x800f -/* 03DEB0 8003D2B0 C42C69A4 */ lwc1 $f12, %lo(gPlayer1PosX)($at) -/* 03DEB4 8003D2B4 3C01800F */ lui $at, %hi(gPlayer1PosX) # $at, 0x800f -/* 03DEB8 8003D2B8 3C07800F */ lui $a3, %hi(gPlayer1Rotation) # $a3, 0x800f +/* 03DEAC 8003D2AC 3C01800F */ lui $at, %hi(gPlayers+0x14) # $at, 0x800f +/* 03DEB0 8003D2B0 C42C69A4 */ lwc1 $f12, %lo(gPlayers+0x14)($at) +/* 03DEB4 8003D2B4 3C01800F */ lui $at, %hi(gPlayers+0x14) # $at, 0x800f +/* 03DEB8 8003D2B8 3C07800F */ lui $a3, %hi(gPlayers+0x2E) # $a3, 0x800f /* 03DEBC 8003D2BC 240E0009 */ li $t6, 9 /* 03DEC0 8003D2C0 AFAE0010 */ sw $t6, 0x10($sp) -/* 03DEC4 8003D2C4 84E769BE */ lh $a3, %lo(gPlayer1Rotation)($a3) -/* 03DEC8 8003D2C8 C42E69A8 */ lwc1 $f14, %lo(gPlayer1PosY)($at) +/* 03DEC4 8003D2C4 84E769BE */ lh $a3, %lo(gPlayers+0x2E)($a3) +/* 03DEC8 8003D2C8 C42E69A8 */ lwc1 $f14, %lo(gPlayers+0x18)($at) /* 03DECC 8003D2CC 8CC669AC */ lw $a2, 0x69ac($a2) /* 03DED0 8003D2D0 0C007134 */ jal func_8001C4D0 /* 03DED4 8003D2D4 AFA00014 */ sw $zero, 0x14($sp) -/* 03DED8 8003D2D8 3C02800F */ lui $v0, %hi(D_800F7768) # $v0, 0x800f -/* 03DEDC 8003D2DC 24427768 */ addiu $v0, %lo(D_800F7768) # addiu $v0, $v0, 0x7768 +/* 03DED8 8003D2D8 3C02800F */ lui $v0, %hi(gPlayers+0xDD8) # $v0, 0x800f +/* 03DEDC 8003D2DC 24427768 */ addiu $v0, %lo(gPlayers+0xDD8) # addiu $v0, $v0, 0x7768 /* 03DEE0 8003D2E0 C44C0014 */ lwc1 $f12, 0x14($v0) /* 03DEE4 8003D2E4 C44E0018 */ lwc1 $f14, 0x18($v0) /* 03DEE8 8003D2E8 8C46001C */ lw $a2, 0x1c($v0) @@ -174,19 +174,19 @@ glabel func_8003D080 /* 03DF04 8003D304 10000017 */ b .L8003D364 /* 03DF08 8003D308 00000000 */ nop .L8003D30C: -/* 03DF0C 8003D30C C42C69A4 */ lwc1 $f12, %lo(gPlayer1PosX)($at) -/* 03DF10 8003D310 3C01800F */ lui $at, %hi(gPlayer1PosY) # $at, 0x800f -/* 03DF14 8003D314 3C06800F */ lui $a2, %hi(gPlayer1PosZ) # $a2, 0x800f -/* 03DF18 8003D318 3C07800F */ lui $a3, %hi(gPlayer1Rotation) # $a3, 0x800f +/* 03DF0C 8003D30C C42C69A4 */ lwc1 $f12, %lo(gPlayers+0x14)($at) +/* 03DF10 8003D310 3C01800F */ lui $at, %hi(gPlayers+0x18) # $at, 0x800f +/* 03DF14 8003D314 3C06800F */ lui $a2, %hi(gPlayers+0x1C) # $a2, 0x800f +/* 03DF18 8003D318 3C07800F */ lui $a3, %hi(gPlayers+0x2E) # $a3, 0x800f /* 03DF1C 8003D31C 24190001 */ li $t9, 1 /* 03DF20 8003D320 AFB90010 */ sw $t9, 0x10($sp) -/* 03DF24 8003D324 84E769BE */ lh $a3, %lo(gPlayer1Rotation)($a3) -/* 03DF28 8003D328 8CC669AC */ lw $a2, %lo(gPlayer1PosZ)($a2) -/* 03DF2C 8003D32C C42E69A8 */ lwc1 $f14, %lo(gPlayer1PosY)($at) +/* 03DF24 8003D324 84E769BE */ lh $a3, %lo(gPlayers+0x2E)($a3) +/* 03DF28 8003D328 8CC669AC */ lw $a2, %lo(gPlayers+0x1C)($a2) +/* 03DF2C 8003D32C C42E69A8 */ lwc1 $f14, %lo(gPlayers+0x18)($at) /* 03DF30 8003D330 0C007134 */ jal func_8001C4D0 /* 03DF34 8003D334 AFA00014 */ sw $zero, 0x14($sp) -/* 03DF38 8003D338 3C02800F */ lui $v0, %hi(D_800F7768) # $v0, 0x800f -/* 03DF3C 8003D33C 24427768 */ addiu $v0, %lo(D_800F7768) # addiu $v0, $v0, 0x7768 +/* 03DF38 8003D338 3C02800F */ lui $v0, %hi(gPlayers+0xDD8) # $v0, 0x800f +/* 03DF3C 8003D33C 24427768 */ addiu $v0, %lo(gPlayers+0xDD8) # addiu $v0, $v0, 0x7768 /* 03DF40 8003D340 C44C0014 */ lwc1 $f12, 0x14($v0) /* 03DF44 8003D344 C44E0018 */ lwc1 $f14, 0x18($v0) /* 03DF48 8003D348 8C46001C */ lw $a2, 0x1c($v0) @@ -203,23 +203,23 @@ glabel func_8003D080 .L8003D370: /* 03DF70 8003D370 8D4AC53C */ lw $t2, %lo(gModeSelection)($t2) # -0x3ac4($t2) /* 03DF74 8003D374 24010003 */ li $at, 3 -/* 03DF78 8003D378 3C06800F */ lui $a2, %hi(gPlayer1PosZ) # 0x800f +/* 03DF78 8003D378 3C06800F */ lui $a2, %hi(gPlayers+0x1C) # 0x800f /* 03DF7C 8003D37C 15410036 */ bne $t2, $at, .L8003D458 -/* 03DF80 8003D380 3C07800F */ lui $a3, %hi(gPlayer1Rotation) # 0x800f -/* 03DF84 8003D384 3C01800F */ lui $at, %hi(gPlayer1PosX) # $at, 0x800f -/* 03DF88 8003D388 C42C69A4 */ lwc1 $f12, %lo(gPlayer1PosX)($at) -/* 03DF8C 8003D38C 3C01800F */ lui $at, %hi(gPlayer1PosY) # $at, 0x800f -/* 03DF90 8003D390 3C06800F */ lui $a2, %hi(gPlayer1PosZ) # $a2, 0x800f -/* 03DF94 8003D394 3C07800F */ lui $a3, %hi(gPlayer1Rotation) # $a3, 0x800f +/* 03DF80 8003D380 3C07800F */ lui $a3, %hi(gPlayers+0x2E) # 0x800f +/* 03DF84 8003D384 3C01800F */ lui $at, %hi(gPlayers+0x14) # $at, 0x800f +/* 03DF88 8003D388 C42C69A4 */ lwc1 $f12, %lo(gPlayers+0x14)($at) +/* 03DF8C 8003D38C 3C01800F */ lui $at, %hi(gPlayers+0x18) # $at, 0x800f +/* 03DF90 8003D390 3C06800F */ lui $a2, %hi(gPlayers+0x1C) # $a2, 0x800f +/* 03DF94 8003D394 3C07800F */ lui $a3, %hi(gPlayers+0x2E) # $a3, 0x800f /* 03DF98 8003D398 240B0009 */ li $t3, 9 /* 03DF9C 8003D39C AFAB0010 */ sw $t3, 0x10($sp) -/* 03DFA0 8003D3A0 84E769BE */ lh $a3, %lo(gPlayer1Rotation)($a3) -/* 03DFA4 8003D3A4 8CC669AC */ lw $a2, %lo(gPlayer1PosZ)($a2) -/* 03DFA8 8003D3A8 C42E69A8 */ lwc1 $f14, %lo(gPlayer1PosY)($at) +/* 03DFA0 8003D3A0 84E769BE */ lh $a3, %lo(gPlayers+0x2E)($a3) +/* 03DFA4 8003D3A4 8CC669AC */ lw $a2, %lo(gPlayers+0x1C)($a2) +/* 03DFA8 8003D3A8 C42E69A8 */ lwc1 $f14, %lo(gPlayers+0x18)($at) /* 03DFAC 8003D3AC 0C007134 */ jal func_8001C4D0 /* 03DFB0 8003D3B0 AFA00014 */ sw $zero, 0x14($sp) -/* 03DFB4 8003D3B4 3C02800F */ lui $v0, %hi(D_800F7768) # $v0, 0x800f -/* 03DFB8 8003D3B8 24427768 */ addiu $v0, %lo(D_800F7768) # addiu $v0, $v0, 0x7768 +/* 03DFB4 8003D3B4 3C02800F */ lui $v0, %hi(gPlayers+0xDD8) # $v0, 0x800f +/* 03DFB8 8003D3B8 24427768 */ addiu $v0, %lo(gPlayers+0xDD8) # addiu $v0, $v0, 0x7768 /* 03DFBC 8003D3BC C44C0014 */ lwc1 $f12, 0x14($v0) /* 03DFC0 8003D3C0 C44E0018 */ lwc1 $f14, 0x18($v0) /* 03DFC4 8003D3C4 8C46001C */ lw $a2, 0x1c($v0) @@ -260,18 +260,18 @@ glabel func_8003D080 /* 03E050 8003D450 10000032 */ b .L8003D51C /* 03E054 8003D454 00000000 */ nop .L8003D458: -/* 03E058 8003D458 3C01800F */ lui $at, %hi(gPlayer1PosX) # $at, 0x800f -/* 03E05C 8003D45C C42C69A4 */ lwc1 $f12, %lo(gPlayer1PosX)($at) -/* 03E060 8003D460 3C01800F */ lui $at, %hi(gPlayer1PosY) # $at, 0x800f +/* 03E058 8003D458 3C01800F */ lui $at, %hi(gPlayers+0x14) # $at, 0x800f +/* 03E05C 8003D45C C42C69A4 */ lwc1 $f12, %lo(gPlayers+0x14)($at) +/* 03E060 8003D460 3C01800F */ lui $at, %hi(gPlayers+0x18) # $at, 0x800f /* 03E064 8003D464 24090001 */ li $t1, 1 /* 03E068 8003D468 AFA90010 */ sw $t1, 0x10($sp) -/* 03E06C 8003D46C C42E69A8 */ lwc1 $f14, %lo(gPlayer1PosY)($at) -/* 03E070 8003D470 8CC669AC */ lw $a2, %lo(gPlayer1PosZ)($a2) # 0x69ac($a2) -/* 03E074 8003D474 84E769BE */ lh $a3, %lo(gPlayer1Rotation)($a3) +/* 03E06C 8003D46C C42E69A8 */ lwc1 $f14, %lo(gPlayers+0x18)($at) +/* 03E070 8003D470 8CC669AC */ lw $a2, %lo(gPlayers+0x1C)($a2) # 0x69ac($a2) +/* 03E074 8003D474 84E769BE */ lh $a3, %lo(gPlayers+0x2E)($a3) /* 03E078 8003D478 0C007134 */ jal func_8001C4D0 /* 03E07C 8003D47C AFA00014 */ sw $zero, 0x14($sp) -/* 03E080 8003D480 3C02800F */ lui $v0, %hi(D_800F7768) # $v0, 0x800f -/* 03E084 8003D484 24427768 */ addiu $v0, %lo(D_800F7768) # addiu $v0, $v0, 0x7768 +/* 03E080 8003D480 3C02800F */ lui $v0, %hi(gPlayers+0xDD8) # $v0, 0x800f +/* 03E084 8003D484 24427768 */ addiu $v0, %lo(gPlayers+0xDD8) # addiu $v0, $v0, 0x7768 /* 03E088 8003D488 C44C0014 */ lwc1 $f12, 0x14($v0) /* 03E08C 8003D48C C44E0018 */ lwc1 $f14, 0x18($v0) /* 03E090 8003D490 8C46001C */ lw $a2, 0x1c($v0) @@ -315,47 +315,47 @@ glabel func_8003D080 /* 03E124 8003D524 8C42C52C */ lw $v0, %lo(D_800DC52C)($v0) .L8003D528: /* 03E128 8003D528 8C42C52C */ lw $v0, %lo(D_800DC52C)($v0) # -0x3ad4($v0) -/* 03E12C 8003D52C 3C01800F */ lui $at, %hi(gPlayer1PosX) # $at, 0x800f -/* 03E130 8003D530 3C06800F */ lui $a2, %hi(gPlayer1PosZ) # 0x800f +/* 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 -/* 03E138 8003D538 3C07800F */ lui $a3, %hi(gPlayer1Rotation) # $a3, 0x800f +/* 03E138 8003D538 3C07800F */ lui $a3, %hi(gPlayers+0x2E) # $a3, 0x800f /* 03E13C 8003D53C 24010001 */ li $at, 1 /* 03E140 8003D540 10410014 */ beq $v0, $at, .L8003D594 -/* 03E144 8003D544 3C06800F */ lui $a2, %hi(gPlayer1PosZ) # 0x800f +/* 03E144 8003D544 3C06800F */ lui $a2, %hi(gPlayers+0x1C) # 0x800f /* 03E148 8003D548 24010002 */ li $at, 2 /* 03E14C 8003D54C 10410011 */ beq $v0, $at, .L8003D594 /* 03E150 8003D550 24010003 */ li $at, 3 /* 03E154 8003D554 10410028 */ beq $v0, $at, .L8003D5F8 -/* 03E158 8003D558 3C06800F */ lui $a2, %hi(gPlayer1PosZ) # $a2, 0x800f +/* 03E158 8003D558 3C06800F */ lui $a2, %hi(gPlayers+0x1C) # $a2, 0x800f /* 03E15C 8003D55C 10000056 */ b .L8003D6B8 /* 03E160 8003D560 00000000 */ nop .L8003D564: -/* 03E164 8003D564 C42C69A4 */ lwc1 $f12, %lo(gPlayer1PosX)($at) -/* 03E168 8003D568 3C01800F */ lui $at, %hi(gPlayer1PosY) # $at, 0x800f +/* 03E164 8003D564 C42C69A4 */ lwc1 $f12, %lo(gPlayers+0x14)($at) +/* 03E168 8003D568 3C01800F */ lui $at, %hi(gPlayers+0x18) # $at, 0x800f /* 03E16C 8003D56C 24190003 */ li $t9, 3 /* 03E170 8003D570 AFB90010 */ sw $t9, 0x10($sp) -/* 03E174 8003D574 C42E69A8 */ lwc1 $f14, %lo(gPlayer1PosY)($at) -/* 03E178 8003D578 8CC669AC */ lw $a2, %lo(gPlayer1PosZ)($a2) -/* 03E17C 8003D57C 84E769BE */ lh $a3, %lo(gPlayer1Rotation)($a3) +/* 03E174 8003D574 C42E69A8 */ lwc1 $f14, %lo(gPlayers+0x18)($at) +/* 03E178 8003D578 8CC669AC */ lw $a2, %lo(gPlayers+0x1C)($a2) +/* 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 /* 03E18C 8003D58C 1000004A */ b .L8003D6B8 /* 03E190 8003D590 8C42C52C */ lw $v0, %lo(D_800DC52C)($v0) .L8003D594: -/* 03E194 8003D594 3C01800F */ lui $at, %hi(gPlayer1PosX) # $at, 0x800f -/* 03E198 8003D598 C42C69A4 */ lwc1 $f12, %lo(gPlayer1PosX)($at) -/* 03E19C 8003D59C 3C01800F */ lui $at, %hi(gPlayer1PosY) # $at, 0x800f -/* 03E1A0 8003D5A0 3C07800F */ lui $a3, %hi(gPlayer1Rotation) # $a3, 0x800f +/* 03E194 8003D594 3C01800F */ lui $at, %hi(gPlayers+0x14) # $at, 0x800f +/* 03E198 8003D598 C42C69A4 */ lwc1 $f12, %lo(gPlayers+0x14)($at) +/* 03E19C 8003D59C 3C01800F */ lui $at, %hi(gPlayers+0x18) # $at, 0x800f +/* 03E1A0 8003D5A0 3C07800F */ lui $a3, %hi(gPlayers+0x2E) # $a3, 0x800f /* 03E1A4 8003D5A4 24080003 */ li $t0, 3 /* 03E1A8 8003D5A8 AFA80010 */ sw $t0, 0x10($sp) -/* 03E1AC 8003D5AC 84E769BE */ lh $a3, %lo(gPlayer1Rotation)($a3) -/* 03E1B0 8003D5B0 C42E69A8 */ lwc1 $f14, %lo(gPlayer1PosY)($at) -/* 03E1B4 8003D5B4 8CC669AC */ lw $a2, %lo(gPlayer1PosZ)($a2) # 0x69ac($a2) +/* 03E1AC 8003D5AC 84E769BE */ lh $a3, %lo(gPlayers+0x2E)($a3) +/* 03E1B0 8003D5B0 C42E69A8 */ lwc1 $f14, %lo(gPlayers+0x18)($at) +/* 03E1B4 8003D5B4 8CC669AC */ lw $a2, %lo(gPlayers+0x1C)($a2) # 0x69ac($a2) /* 03E1B8 8003D5B8 0C007134 */ jal func_8001C4D0 /* 03E1BC 8003D5BC AFA00014 */ sw $zero, 0x14($sp) -/* 03E1C0 8003D5C0 3C02800F */ lui $v0, %hi(D_800F7768) # $v0, 0x800f -/* 03E1C4 8003D5C4 24427768 */ addiu $v0, %lo(D_800F7768) # addiu $v0, $v0, 0x7768 +/* 03E1C0 8003D5C0 3C02800F */ lui $v0, %hi(gPlayers+0xDD8) # $v0, 0x800f +/* 03E1C4 8003D5C4 24427768 */ addiu $v0, %lo(gPlayers+0xDD8) # addiu $v0, $v0, 0x7768 /* 03E1C8 8003D5C8 C44C0014 */ lwc1 $f12, 0x14($v0) /* 03E1CC 8003D5CC C44E0018 */ lwc1 $f14, 0x18($v0) /* 03E1D0 8003D5D0 8C46001C */ lw $a2, 0x1c($v0) @@ -369,19 +369,19 @@ glabel func_8003D080 /* 03E1F0 8003D5F0 10000031 */ b .L8003D6B8 /* 03E1F4 8003D5F4 8C42C52C */ lw $v0, %lo(D_800DC52C)($v0) .L8003D5F8: -/* 03E1F8 8003D5F8 3C01800F */ lui $at, %hi(gPlayer1PosX) # $at, 0x800f -/* 03E1FC 8003D5FC C42C69A4 */ lwc1 $f12, %lo(gPlayer1PosX)($at) -/* 03E200 8003D600 3C01800F */ lui $at, %hi(gPlayer1PosY) # $at, 0x800f -/* 03E204 8003D604 3C07800F */ lui $a3, %hi(gPlayer1Rotation) # $a3, 0x800f +/* 03E1F8 8003D5F8 3C01800F */ lui $at, %hi(gPlayers+0x14) # $at, 0x800f +/* 03E1FC 8003D5FC C42C69A4 */ lwc1 $f12, %lo(gPlayers+0x14)($at) +/* 03E200 8003D600 3C01800F */ lui $at, %hi(gPlayers+0x18) # $at, 0x800f +/* 03E204 8003D604 3C07800F */ lui $a3, %hi(gPlayers+0x2E) # $a3, 0x800f /* 03E208 8003D608 240B0003 */ li $t3, 3 /* 03E20C 8003D60C AFAB0010 */ sw $t3, 0x10($sp) -/* 03E210 8003D610 84E769BE */ lh $a3, %lo(gPlayer1Rotation)($a3) -/* 03E214 8003D614 C42E69A8 */ lwc1 $f14, %lo(gPlayer1PosY)($at) +/* 03E210 8003D610 84E769BE */ lh $a3, %lo(gPlayers+0x2E)($a3) +/* 03E214 8003D614 C42E69A8 */ lwc1 $f14, %lo(gPlayers+0x18)($at) /* 03E218 8003D618 8CC669AC */ lw $a2, 0x69ac($a2) /* 03E21C 8003D61C 0C007134 */ jal func_8001C4D0 /* 03E220 8003D620 AFA00014 */ sw $zero, 0x14($sp) -/* 03E224 8003D624 3C02800F */ lui $v0, %hi(D_800F7768) # $v0, 0x800f -/* 03E228 8003D628 24427768 */ addiu $v0, %lo(D_800F7768) # addiu $v0, $v0, 0x7768 +/* 03E224 8003D624 3C02800F */ lui $v0, %hi(gPlayers+0xDD8) # $v0, 0x800f +/* 03E228 8003D628 24427768 */ addiu $v0, %lo(gPlayers+0xDD8) # addiu $v0, $v0, 0x7768 /* 03E22C 8003D62C C44C0014 */ lwc1 $f12, 0x14($v0) /* 03E230 8003D630 C44E0018 */ lwc1 $f14, 0x18($v0) /* 03E234 8003D634 8C46001C */ lw $a2, 0x1c($v0) diff --git a/asm/non_matchings/code_8008C1D0/code_8008C1D0.s b/asm/non_matchings/code_8008C1D0/code_8008C1D0.s index 5acbb6cbf..b793cca03 100644 --- a/asm/non_matchings/code_8008C1D0/code_8008C1D0.s +++ b/asm/non_matchings/code_8008C1D0/code_8008C1D0.s @@ -5152,8 +5152,8 @@ glabel func_80091440 /* 092054 80091454 030FC023 */ subu $t8, $t8, $t7 /* 092058 80091458 0018C080 */ sll $t8, $t8, 2 /* 09205C 8009145C 030FC023 */ subu $t8, $t8, $t7 -/* 092060 80091460 3C19800F */ lui $t9, %hi(D_800F6990) # $t9, 0x800f -/* 092064 80091464 27396990 */ addiu $t9, %lo(D_800F6990) # addiu $t9, $t9, 0x6990 +/* 092060 80091460 3C19800F */ lui $t9, %hi(gPlayers) # $t9, 0x800f +/* 092064 80091464 27396990 */ addiu $t9, %lo(gPlayers) # addiu $t9, $t9, 0x6990 /* 092068 80091468 0018C0C0 */ sll $t8, $t8, 3 /* 09206C 8009146C 03191021 */ addu $v0, $t8, $t9 /* 092070 80091470 84430044 */ lh $v1, 0x44($v0) diff --git a/asm/non_matchings/code_8028DF00/code_8028DF00.s b/asm/non_matchings/code_8028DF00/code_8028DF00.s index c820803a9..fbdaa9b2c 100644 --- a/asm/non_matchings/code_8028DF00/code_8028DF00.s +++ b/asm/non_matchings/code_8028DF00/code_8028DF00.s @@ -1,8 +1,8 @@ glabel func_8028F3F0 /* 0F8A00 8028F3F0 3C088016 */ lui $t0, %hi(D_8015F8F0) # $t0, 0x8016 /* 0F8A04 8028F3F4 3C078016 */ lui $a3, %hi(D_801643B8) # $a3, 0x8016 -/* 0F8A08 8028F3F8 3C05800F */ lui $a1, %hi(D_800F6990) # $a1, 0x800f -/* 0F8A0C 8028F3FC 24A56990 */ addiu $a1, %lo(D_800F6990) # addiu $a1, $a1, 0x6990 +/* 0F8A08 8028F3F8 3C05800F */ lui $a1, %hi(gPlayers) # $a1, 0x800f +/* 0F8A0C 8028F3FC 24A56990 */ addiu $a1, %lo(gPlayers) # addiu $a1, $a1, 0x6990 /* 0F8A10 8028F400 24E743B8 */ addiu $a3, %lo(D_801643B8) # addiu $a3, $a3, 0x43b8 /* 0F8A14 8028F404 2508F8F0 */ addiu $t0, %lo(D_8015F8F0) # addiu $t0, $t0, -0x710 /* 0F8A18 8028F408 00001025 */ move $v0, $zero @@ -411,10 +411,10 @@ glabel func_8028F970 /* 0F8F98 8028F988 AFB10018 */ sw $s1, 0x18($sp) /* 0F8F9C 8028F98C 15C0008A */ bnez $t6, .L8028FBB8 /* 0F8FA0 8028F990 AFB00014 */ sw $s0, 0x14($sp) -/* 0F8FA4 8028F994 3C13800F */ lui $s3, %hi(D_800F6990) # $s3, 0x800f +/* 0F8FA4 8028F994 3C13800F */ lui $s3, %hi(gPlayers) # $s3, 0x800f /* 0F8FA8 8028F998 3C11800E */ lui $s1, %hi(D_800DC5A8) # $s1, 0x800e /* 0F8FAC 8028F99C 2631C5A8 */ addiu $s1, %lo(D_800DC5A8) # addiu $s1, $s1, -0x3a58 -/* 0F8FB0 8028F9A0 26736990 */ addiu $s3, %lo(D_800F6990) # addiu $s3, $s3, 0x6990 +/* 0F8FB0 8028F9A0 26736990 */ addiu $s3, %lo(gPlayers) # addiu $s3, $s3, 0x6990 /* 0F8FB4 8028F9A4 00009025 */ move $s2, $zero .L8028F9A8: /* 0F8FB8 8028F9A8 96620000 */ lhu $v0, ($s3) @@ -638,10 +638,10 @@ glabel func_8028FCBC /* 0F92CC 8028FCBC 3C0E8019 */ lui $t6, %hi(D_8018EE08) # $t6, 0x8019 /* 0F92D0 8028FCC0 81CEEE08 */ lb $t6, %lo(D_8018EE08)($t6) /* 0F92D4 8028FCC4 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 0F92D8 8028FCC8 3C05800F */ lui $a1, %hi(D_800F6990) # $a1, 0x800f +/* 0F92D8 8028FCC8 3C05800F */ lui $a1, %hi(gPlayers) # $a1, 0x800f /* 0F92DC 8028FCCC AFBF0014 */ sw $ra, 0x14($sp) /* 0F92E0 8028FCD0 11C00004 */ beqz $t6, .L8028FCE4 -/* 0F92E4 8028FCD4 24A56990 */ addiu $a1, %lo(D_800F6990) # addiu $a1, $a1, 0x6990 +/* 0F92E4 8028FCD4 24A56990 */ addiu $a1, %lo(gPlayers) # addiu $a1, $a1, 0x6990 /* 0F92E8 8028FCD8 0C0A3F0D */ jal func_8028FC34 /* 0F92EC 8028FCDC AFA50024 */ sw $a1, 0x24($sp) /* 0F92F0 8028FCE0 8FA50024 */ lw $a1, 0x24($sp) @@ -1558,12 +1558,12 @@ glabel func_802909F0 /* 0FA010 80290A00 AFB5002C */ sw $s5, 0x2c($sp) /* 0FA014 80290A04 AFB30024 */ sw $s3, 0x24($sp) /* 0FA018 80290A08 AFB20020 */ sw $s2, 0x20($sp) -/* 0FA01C 80290A0C 3C11800F */ lui $s1, %hi(D_800F6990) # $s1, 0x800f +/* 0FA01C 80290A0C 3C11800F */ lui $s1, %hi(gPlayers) # $s1, 0x800f /* 0FA020 80290A10 3C148010 */ lui $s4, %hi(D_800FD850) # $s4, 0x8010 /* 0FA024 80290A14 AFBF0034 */ sw $ra, 0x34($sp) /* 0FA028 80290A18 AFB00018 */ sw $s0, 0x18($sp) /* 0FA02C 80290A1C 2694D850 */ addiu $s4, %lo(D_800FD850) # addiu $s4, $s4, -0x27b0 -/* 0FA030 80290A20 26316990 */ addiu $s1, %lo(D_800F6990) # addiu $s1, $s1, 0x6990 +/* 0FA030 80290A20 26316990 */ addiu $s1, %lo(gPlayers) # addiu $s1, $s1, 0x6990 /* 0FA034 80290A24 3C128000 */ lui $s2, 0x8000 /* 0FA038 80290A28 3C130400 */ lui $s3, 0x400 /* 0FA03C 80290A2C 0000A825 */ move $s5, $zero @@ -1590,8 +1590,8 @@ glabel func_802909F0 /* 0FA08C 80290A7C 01024023 */ subu $t0, $t0, $v0 /* 0FA090 80290A80 00084080 */ sll $t0, $t0, 2 /* 0FA094 80290A84 01024023 */ subu $t0, $t0, $v0 -/* 0FA098 80290A88 3C09800F */ lui $t1, %hi(D_800F6990) # $t1, 0x800f -/* 0FA09C 80290A8C 25296990 */ addiu $t1, %lo(D_800F6990) # addiu $t1, $t1, 0x6990 +/* 0FA098 80290A88 3C09800F */ lui $t1, %hi(gPlayers) # $t1, 0x800f +/* 0FA09C 80290A8C 25296990 */ addiu $t1, %lo(gPlayers) # addiu $t1, $t1, 0x6990 /* 0FA0A0 80290A90 000840C0 */ sll $t0, $t0, 3 /* 0FA0A4 80290A94 01098021 */ addu $s0, $t0, $t1 /* 0FA0A8 80290A98 96020000 */ lhu $v0, ($s0) diff --git a/asm/non_matchings/code_8028DF00/func_8028DF00.s b/asm/non_matchings/code_8028DF00/func_8028DF00.s index 2ffdd5040..7ba6562be 100644 --- a/asm/non_matchings/code_8028DF00/func_8028DF00.s +++ b/asm/non_matchings/code_8028DF00/func_8028DF00.s @@ -1,9 +1,9 @@ glabel func_8028DF00 -/* 0F7510 8028DF00 3C0E800F */ lui $t6, %hi(D_800F6914) # $t6, 0x800f -/* 0F7514 8028DF04 95CE6914 */ lhu $t6, %lo(D_800F6914)($t6) +/* 0F7510 8028DF00 3C0E800F */ lui $t6, %hi(gControllers+0x4) # $t6, 0x800f +/* 0F7514 8028DF04 95CE6914 */ lhu $t6, %lo(gControllers+0x4)($t6) /* 0F7518 8028DF08 3C01802C */ lui $at, %hi(D_802BA040) # $at, 0x802c -/* 0F751C 8028DF0C 3C02800F */ lui $v0, %hi(gPlayer2Controller) # $v0, 0x800f -/* 0F7520 8028DF10 24426920 */ addiu $v0, %lo(gPlayer2Controller) # addiu $v0, $v0, 0x6920 +/* 0F751C 8028DF0C 3C02800F */ lui $v0, %hi(gControllers+0x10) # $v0, 0x800f +/* 0F7520 8028DF10 24426920 */ addiu $v0, %lo(gControllers+0x10) # addiu $v0, $v0, 0x6920 /* 0F7524 8028DF14 A42EA040 */ sh $t6, %lo(D_802BA040)($at) /* 0F7528 8028DF18 944F0004 */ lhu $t7, 4($v0) /* 0F752C 8028DF1C 24420020 */ addiu $v0, $v0, 0x20 @@ -12,4 +12,4 @@ glabel func_8028DF00 /* 0F7538 8028DF28 A438A044 */ sh $t8, %lo(D_802BA040+0x4)($at) /* 0F753C 8028DF2C 94590004 */ lhu $t9, 4($v0) /* 0F7540 8028DF30 03E00008 */ jr $ra -/* 0F7544 8028DF34 A439A046 */ sh $t9, %lo(D_802BA040+0x6)($at) \ No newline at end of file +/* 0F7544 8028DF34 A439A046 */ sh $t9, %lo(D_802BA040+0x6)($at) diff --git a/asm/non_matchings/code_8028DF00/func_8028DF38.s b/asm/non_matchings/code_8028DF00/func_8028DF38.s index ea3f60d75..0d89685b6 100644 --- a/asm/non_matchings/code_8028DF00/func_8028DF38.s +++ b/asm/non_matchings/code_8028DF00/func_8028DF38.s @@ -1,21 +1,21 @@ glabel func_8028DF38 -/* 0F7548 8028DF38 3C04800F */ lui $a0, %hi(D_800F6914) # $a0, 0x800f +/* 0F7548 8028DF38 3C04800F */ lui $a0, %hi(gControllers+0x4) # $a0, 0x800f /* 0F754C 8028DF3C 3C0E802C */ lui $t6, %hi(D_802BA040) # $t6, 0x802c /* 0F7550 8028DF40 85CEA040 */ lh $t6, %lo(D_802BA040)($t6) -/* 0F7554 8028DF44 94846914 */ lhu $a0, %lo(D_800F6914)($a0) -/* 0F7558 8028DF48 3C01800F */ lui $at, %hi(D_800F6916) # $at, 0x800f -/* 0F755C 8028DF4C 3C02800F */ lui $v0, %hi(gPlayer2Controller) # $v0, 0x800f +/* 0F7554 8028DF44 94846914 */ lhu $a0, %lo(gControllers+0x4)($a0) +/* 0F7558 8028DF48 3C01800F */ lui $at, %hi(gControllers+0x6) # $at, 0x800f +/* 0F755C 8028DF4C 3C02800F */ lui $v0, %hi(gControllers+0x10) # $v0, 0x800f /* 0F7560 8028DF50 01C47826 */ xor $t7, $t6, $a0 /* 0F7564 8028DF54 01E4C024 */ and $t8, $t7, $a0 -/* 0F7568 8028DF58 A4386916 */ sh $t8, %lo(D_800F6916)($at) +/* 0F7568 8028DF58 A4386916 */ sh $t8, %lo(gControllers+0x6)($at) /* 0F756C 8028DF5C 01C4C826 */ xor $t9, $t6, $a0 -/* 0F7570 8028DF60 3C01800F */ lui $at, %hi(D_800F6918) # $at, 0x800f +/* 0F7570 8028DF60 3C01800F */ lui $at, %hi(gControllers+0x8) # $at, 0x800f /* 0F7574 8028DF64 032E4024 */ and $t0, $t9, $t6 -/* 0F7578 8028DF68 A4286918 */ sh $t0, %lo(D_800F6918)($at) -/* 0F757C 8028DF6C 3C01800F */ lui $at, %hi(D_800F6914) # $at, 0x800f +/* 0F7578 8028DF68 A4286918 */ sh $t0, %lo(gControllers+0x8)($at) +/* 0F757C 8028DF6C 3C01800F */ lui $at, %hi(gControllers+0x4) # $at, 0x800f /* 0F7580 8028DF70 3C09802C */ lui $t1, %hi(D_802BA042) # $t1, 0x802c -/* 0F7584 8028DF74 24426920 */ addiu $v0, %lo(gPlayer2Controller) # addiu $v0, $v0, 0x6920 -/* 0F7588 8028DF78 A42E6914 */ sh $t6, %lo(D_800F6914)($at) +/* 0F7584 8028DF74 24426920 */ addiu $v0, %lo(gControllers+0x10) # addiu $v0, $v0, 0x6920 +/* 0F7588 8028DF78 A42E6914 */ sh $t6, %lo(gControllers+0x4)($at) /* 0F758C 8028DF7C 94430004 */ lhu $v1, 4($v0) /* 0F7590 8028DF80 8529A042 */ lh $t1, %lo(D_802BA042)($t1) /* 0F7594 8028DF84 3C0C802C */ lui $t4, %hi(D_802BA042) # $t4, 0x802c diff --git a/asm/non_matchings/code_8028DF00/func_8028E0F0.s b/asm/non_matchings/code_8028DF00/func_8028E0F0.s index af581c523..f1b82247f 100644 --- a/asm/non_matchings/code_8028DF00/func_8028E0F0.s +++ b/asm/non_matchings/code_8028DF00/func_8028E0F0.s @@ -9,7 +9,7 @@ glabel func_8028E0F0 /* 0F771C 8028E10C AFB30024 */ sw $s3, 0x24($sp) /* 0F7720 8028E110 AFB20020 */ sw $s2, 0x20($sp) /* 0F7724 8028E114 AFB1001C */ sw $s1, 0x1c($sp) -/* 0F7728 8028E118 3C10800F */ lui $s0, %hi(D_800F6990) # $s0, 0x800f +/* 0F7728 8028E118 3C10800F */ lui $s0, %hi(gPlayers) # $s0, 0x800f /* 0F772C 8028E11C 3C14800E */ lui $s4, %hi(D_800DC4DC) # $s4, 0x800e /* 0F7730 8028E120 3C178019 */ lui $s7, %hi(D_8018D8C0) # $s7, 0x8019 /* 0F7734 8028E124 AFBF003C */ sw $ra, 0x3c($sp) @@ -17,7 +17,7 @@ glabel func_8028E0F0 /* 0F773C 8028E12C 00009025 */ move $s2, $zero /* 0F7740 8028E130 26F7D8C0 */ addiu $s7, %lo(D_8018D8C0) # addiu $s7, $s7, -0x2740 /* 0F7744 8028E134 2694C4DC */ addiu $s4, %lo(D_800DC4DC) # addiu $s4, $s4, -0x3b24 -/* 0F7748 8028E138 26106990 */ addiu $s0, %lo(D_800F6990) # addiu $s0, $s0, 0x6990 +/* 0F7748 8028E138 26106990 */ addiu $s0, %lo(gPlayers) # addiu $s0, $s0, 0x6990 /* 0F774C 8028E13C 00008825 */ move $s1, $zero /* 0F7750 8028E140 24150DD8 */ li $s5, 3544 /* 0F7754 8028E144 24160004 */ li $s6, 4 @@ -115,4 +115,4 @@ glabel func_8028E0F0 /* 0F7898 8028E288 8FB70034 */ lw $s7, 0x34($sp) /* 0F789C 8028E28C 8FBE0038 */ lw $fp, 0x38($sp) /* 0F78A0 8028E290 03E00008 */ jr $ra -/* 0F78A4 8028E294 27BD0068 */ addiu $sp, $sp, 0x68 \ No newline at end of file +/* 0F78A4 8028E294 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/asm/non_matchings/code_8028DF00/func_8028E298.s b/asm/non_matchings/code_8028DF00/func_8028E298.s index 93410c9ea..3e85d3d29 100644 --- a/asm/non_matchings/code_8028DF00/func_8028E298.s +++ b/asm/non_matchings/code_8028DF00/func_8028E298.s @@ -3,7 +3,7 @@ glabel func_8028E298 /* 0F78AC 8028E29C 44816000 */ mtc1 $at, $f12 /* 0F78B0 8028E2A0 3C013F80 */ li $at, 0x3F800000 # 1.000000 /* 0F78B4 8028E2A4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 0F78B8 8028E2A8 3C05800F */ lui $a1, %hi(D_800F6990) # $a1, 0x800f +/* 0F78B8 8028E2A8 3C05800F */ lui $a1, %hi(gPlayers) # $a1, 0x800f /* 0F78BC 8028E2AC 3C0D800E */ lui $t5, %hi(gCourseTimer) # $t5, 0x800e /* 0F78C0 8028E2B0 3C0C8016 */ lui $t4, %hi(D_8015F898) # $t4, 0x8016 /* 0F78C4 8028E2B4 3C0B8016 */ lui $t3, %hi(D_801644A8) # $t3, 0x8016 @@ -16,7 +16,7 @@ glabel func_8028E298 /* 0F78E0 8028E2D0 256B44A8 */ addiu $t3, %lo(D_801644A8) # addiu $t3, $t3, 0x44a8 /* 0F78E4 8028E2D4 258CF898 */ addiu $t4, %lo(D_8015F898) # addiu $t4, $t4, -0x768 /* 0F78E8 8028E2D8 25ADC598 */ addiu $t5, %lo(gCourseTimer) # addiu $t5, $t5, -0x3a68 -/* 0F78EC 8028E2DC 24A56990 */ addiu $a1, %lo(D_800F6990) # addiu $a1, $a1, 0x6990 +/* 0F78EC 8028E2DC 24A56990 */ addiu $a1, %lo(gPlayers) # addiu $a1, $a1, 0x6990 /* 0F78F0 8028E2E0 00002025 */ move $a0, $zero /* 0F78F4 8028E2E4 240A0002 */ li $t2, 2 /* 0F78F8 8028E2E8 24070008 */ li $a3, 8 @@ -67,4 +67,4 @@ glabel func_8028E298 /* 0F79A0 8028E390 8FBF0014 */ lw $ra, 0x14($sp) /* 0F79A4 8028E394 27BD0018 */ addiu $sp, $sp, 0x18 /* 0F79A8 8028E398 03E00008 */ jr $ra -/* 0F79AC 8028E39C 00000000 */ nop \ No newline at end of file +/* 0F79AC 8028E39C 00000000 */ nop diff --git a/asm/non_matchings/code_8028DF00/func_8028EDA8.s b/asm/non_matchings/code_8028DF00/func_8028EDA8.s index 6d3b9b9d2..4dbb5d7c7 100644 --- a/asm/non_matchings/code_8028DF00/func_8028EDA8.s +++ b/asm/non_matchings/code_8028DF00/func_8028EDA8.s @@ -15,9 +15,9 @@ glabel func_8028EDA8 /* 0F83E8 8028EDD8 2442C510 */ addiu $v0, %lo(D_800DC510) # addiu $v0, $v0, -0x3af0 /* 0F83EC 8028EDDC 8C580000 */ lw $t8, ($v0) /* 0F83F0 8028EDE0 24010002 */ li $at, 2 -/* 0F83F4 8028EDE4 3C03800F */ lui $v1, %hi(D_800F6990) # $v1, 0x800f +/* 0F83F4 8028EDE4 3C03800F */ lui $v1, %hi(gPlayers) # $v1, 0x800f /* 0F83F8 8028EDE8 17010003 */ bne $t8, $at, .L8028EDF8 -/* 0F83FC 8028EDEC 24636990 */ addiu $v1, %lo(D_800F6990) # addiu $v1, $v1, 0x6990 +/* 0F83FC 8028EDEC 24636990 */ addiu $v1, %lo(gPlayers) # addiu $v1, $v1, 0x6990 /* 0F8400 8028EDF0 24190003 */ li $t9, 3 /* 0F8404 8028EDF4 AC590000 */ sw $t9, ($v0) .L8028EDF8: @@ -62,4 +62,4 @@ glabel func_8028EDA8 /* 0F848C 8028EE7C 8FBF0014 */ lw $ra, 0x14($sp) /* 0F8490 8028EE80 27BD0018 */ addiu $sp, $sp, 0x18 /* 0F8494 8028EE84 03E00008 */ jr $ra -/* 0F8498 8028EE88 00000000 */ nop \ No newline at end of file +/* 0F8498 8028EE88 00000000 */ nop diff --git a/asm/non_matchings/code_8028DF00/func_8028EE8C.s b/asm/non_matchings/code_8028DF00/func_8028EE8C.s index a44c582eb..b0f549a6d 100644 --- a/asm/non_matchings/code_8028DF00/func_8028EE8C.s +++ b/asm/non_matchings/code_8028DF00/func_8028EE8C.s @@ -6,8 +6,8 @@ glabel func_8028EE8C /* 0F84A8 8028EE98 01C47023 */ subu $t6, $t6, $a0 /* 0F84AC 8028EE9C 000E7080 */ sll $t6, $t6, 2 /* 0F84B0 8028EEA0 01C47023 */ subu $t6, $t6, $a0 -/* 0F84B4 8028EEA4 3C0F800F */ lui $t7, %hi(D_800F6990) # $t7, 0x800f -/* 0F84B8 8028EEA8 25EF6990 */ addiu $t7, %lo(D_800F6990) # addiu $t7, $t7, 0x6990 +/* 0F84B4 8028EEA4 3C0F800F */ lui $t7, %hi(gPlayers) # $t7, 0x800f +/* 0F84B8 8028EEA8 25EF6990 */ addiu $t7, %lo(gPlayers) # addiu $t7, $t7, 0x6990 /* 0F84BC 8028EEAC 000E70C0 */ sll $t6, $t6, 3 /* 0F84C0 8028EEB0 01CF1021 */ addu $v0, $t6, $t7 /* 0F84C4 8028EEB4 3C018016 */ lui $at, %hi(D_8015F8D8) # $at, 0x8016 diff --git a/asm/non_matchings/code_8028DF00/wip.s b/asm/non_matchings/code_8028DF00/wip.s index 965a2d327..b49793f97 100644 --- a/asm/non_matchings/code_8028DF00/wip.s +++ b/asm/non_matchings/code_8028DF00/wip.s @@ -8,14 +8,14 @@ glabel func_8028EF28 /* 0F8550 8028EF40 AFB40028 */ sw $s4, 0x28($sp) /* 0F8554 8028EF44 AFB30024 */ sw $s3, 0x24($sp) /* 0F8558 8028EF48 AFB20020 */ sw $s2, 0x20($sp) -/* 0F855C 8028EF4C 3C10800F */ lui $s0, %hi(D_800F6990) # $s0, 0x800f +/* 0F855C 8028EF4C 3C10800F */ lui $s0, %hi(gPlayers) # $s0, 0x800f /* 0F8560 8028EF50 3C16802C */ lui $s6, %hi(D_802BA032) # $s6, 0x802c /* 0F8564 8028EF54 3C17800E */ lui $s7, %hi(D_800DC510) # $s7, 0x800e /* 0F8568 8028EF58 AFBF003C */ sw $ra, 0x3c($sp) /* 0F856C 8028EF5C AFB1001C */ sw $s1, 0x1c($sp) /* 0F8570 8028EF60 26F7C510 */ addiu $s7, %lo(D_800DC510) # addiu $s7, $s7, -0x3af0 /* 0F8574 8028EF64 26D6A032 */ addiu $s6, %lo(D_802BA032) # addiu $s6, $s6, -0x5fce -/* 0F8578 8028EF68 26106990 */ addiu $s0, %lo(D_800F6990) # addiu $s0, $s0, 0x6990 +/* 0F8578 8028EF68 26106990 */ addiu $s0, %lo(gPlayers) # addiu $s0, $s0, 0x6990 /* 0F857C 8028EF6C 00009025 */ move $s2, $zero /* 0F8580 8028EF70 24130002 */ li $s3, 2 /* 0F8584 8028EF74 24140003 */ li $s4, 3 @@ -125,7 +125,7 @@ glabel func_8028EF28 .L8028F0F0: /* 0F8700 8028F0F0 8DADF8B8 */ lw $t5, %lo(D_8015F8B8)($t5) /* 0F8704 8028F0F4 240F0005 */ li $t7, 5 -/* 0F8708 8028F0F8 3C19800F */ lui $t9, %hi(D_800F6990) # $t9, 0x800f +/* 0F8708 8028F0F8 3C19800F */ lui $t9, %hi(gPlayers) # $t9, 0x800f /* 0F870C 8028F0FC 01B21021 */ addu $v0, $t5, $s2 /* 0F8710 8028F100 904E0000 */ lbu $t6, ($v0) /* 0F8714 8028F104 3C128016 */ lui $s2, %hi(D_8015F8F2) # $s2, 0x8016 @@ -136,7 +136,7 @@ glabel func_8028EF28 /* 0F8728 8028F118 AEEF0000 */ sw $t7, ($s7) .L8028F11C: /* 0F872C 8028F11C 8652F8F2 */ lh $s2, %lo(D_8015F8F2)($s2) -/* 0F8730 8028F120 27396990 */ addiu $t9, %lo(D_800F6990) # addiu $t9, $t9, 0x6990 +/* 0F8730 8028F120 27396990 */ addiu $t9, %lo(gPlayers) # addiu $t9, $t9, 0x6990 /* 0F8734 8028F124 3C010020 */ lui $at, 0x20 /* 0F8738 8028F128 0012C0C0 */ sll $t8, $s2, 3 /* 0F873C 8028F12C 0312C023 */ subu $t8, $t8, $s2 @@ -174,8 +174,8 @@ glabel func_8028EF28 /* 0F87B4 8028F1A4 0058C821 */ addu $t9, $v0, $t8 /* 0F87B8 8028F1A8 03311821 */ addu $v1, $t9, $s1 /* 0F87BC 8028F1AC 90680000 */ lbu $t0, ($v1) -/* 0F87C0 8028F1B0 3C18800F */ lui $t8, %hi(D_800F6990) # $t8, 0x800f -/* 0F87C4 8028F1B4 27186990 */ addiu $t8, %lo(D_800F6990) # addiu $t8, $t8, 0x6990 +/* 0F87C0 8028F1B0 3C18800F */ lui $t8, %hi(gPlayers) # $t8, 0x800f +/* 0F87C4 8028F1B4 27186990 */ addiu $t8, %lo(gPlayers) # addiu $t8, $t8, 0x6990 /* 0F87C8 8028F1B8 29010064 */ slti $at, $t0, 0x64 /* 0F87CC 8028F1BC 14200002 */ bnez $at, .L8028F1C8 /* 0F87D0 8028F1C0 00000000 */ nop @@ -237,7 +237,7 @@ glabel func_8028EF28 /* 0F88A0 8028F290 3C0F8016 */ lui $t7, %hi(D_8015F8C0) # $t7, 0x8016 /* 0F88A4 8028F294 8DEFF8C0 */ lw $t7, %lo(D_8015F8C0)($t7) /* 0F88A8 8028F298 24080005 */ li $t0, 5 -/* 0F88AC 8028F29C 3C0A800F */ lui $t2, %hi(D_800F6990) # $t2, 0x800f +/* 0F88AC 8028F29C 3C0A800F */ lui $t2, %hi(gPlayers) # $t2, 0x800f /* 0F88B0 8028F2A0 004FC021 */ addu $t8, $v0, $t7 /* 0F88B4 8028F2A4 03111821 */ addu $v1, $t8, $s1 /* 0F88B8 8028F2A8 90790000 */ lbu $t9, ($v1) @@ -251,7 +251,7 @@ glabel func_8028EF28 /* 0F88D4 8028F2C4 AEE80000 */ sw $t0, ($s7) /* 0F88D8 8028F2C8 3C128016 */ lui $s2, %hi(D_8015F8F6) # $s2, 0x8016 /* 0F88DC 8028F2CC 8652F8F6 */ lh $s2, %lo(D_8015F8F6)($s2) -/* 0F88E0 8028F2D0 254A6990 */ addiu $t2, %lo(D_800F6990) # addiu $t2, $t2, 0x6990 +/* 0F88E0 8028F2D0 254A6990 */ addiu $t2, %lo(gPlayers) # addiu $t2, $t2, 0x6990 /* 0F88E4 8028F2D4 3C010020 */ lui $at, 0x20 /* 0F88E8 8028F2D8 001248C0 */ sll $t1, $s2, 3 /* 0F88EC 8028F2DC 01324823 */ subu $t1, $t1, $s2 diff --git a/data/data_0DD0A0.s b/data/data_0DD0A0.s index 5e5599213..cac29e4c3 100644 --- a/data/data_0DD0A0.s +++ b/data/data_0DD0A0.s @@ -5,149 +5,6 @@ .section .data -glabel gVblankHandler1 -.word 0x00000000 - -glabel gVblankHandler2 -.word 0x00000000 - -glabel gActiveSPTask -.word 0x00000000 - -glabel sCurrentAudioSPTask -.word 0x00000000 - -glabel sCurrentDisplaySPTask -.word 0x00000000 - -glabel D_800DC4B4 -.word 0x00000000 - -glabel sNextDisplaySPTask -.word 0x00000000 - -glabel D_800DC4BC -.word gControllers - -glabel D_800DC4C0 -.word gPlayer2Controller - -glabel D_800DC4C4 -.word gPlayer3Controller - -glabel D_800DC4C8 -.word gPlayer4Controller - -glabel D_800DC4CC -.word D_800F6950 - -glabel D_800DC4D0 -.word D_800F6960 - -glabel D_800DC4D4 -.word D_800F6970 - -glabel D_800DC4D8 -.word D_800F6980 - -glabel D_800DC4DC -.word D_800F6990 - -glabel D_800DC4E0 -.word D_800F7768 - -glabel D_800DC4E4 -.word D_800F8540 - -glabel D_800DC4E8 -.word D_800F9318 - -glabel D_800DC4EC -.word D_800FA0F0 - -glabel D_800DC4F0 -.word D_800FAEC8 - -glabel D_800DC4F4 -.word D_800FBCA0 - -glabel D_800DC4F8 -.word D_800FCA78 - -glabel D_800DC4FC -.word D_800F6990 - -glabel D_800DC500 -.word D_800F7768, D_800F8540, D_800F9318 - -glabel D_800DC50C -.word 0x0000ffff - -glabel D_800DC510 -.word 0x00000000 - -glabel D_800DC514 -.hword 0x0000, 0x0000 - -glabel D_800DC518 -.hword 0x0000, 0x0000 - -glabel D_800DC51C -.hword 0x0000, 0x0000 - -glabel gEnableDebugMode -.hword 0x0000, 0x0000 - -glabel D_800DC524 -.word 0x00000007, 0x00000001 - -glabel D_800DC52C -.word 0x00000000 - -glabel D_800DC530 -.word 0x00000000, 0x00000000 - -glabel gPlayerCountSelection1 -.word 0x00000002 - -glabel gModeSelection -.word 0x00000000 - -glabel D_800DC540 -.word 0x00000000 - -glabel D_800DC544 -.word 0x00000000 - -glabel D_800DC548 -.word 0x00000000 - -glabel gGlobalTimer -.word 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -glabel sRenderedFramebuffer -.hword 0x0000, 0x0000 - -glabel sRenderingFramebuffer -.hword 0x0000, 0x0000, 0x0000, 0x0000 - -glabel D_800DC568 -.word 0x00000000 - -glabel D_800DC56C -.word 0x00000000, 0x00000000, 0x00000000, 0x00000000 -.word 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -glabel sNumVBlanks -.hword 0x0000, 0x0000, 0x0000, 0x0000 - -glabel D_800DC594 -.float 0.0 - -glabel gCourseTimer -.float 0.0 -.word 0x00000000 - glabel gCurrentCourseId .hword 0x0000, 0x0000 diff --git a/include/common_structs.h b/include/common_structs.h index c46ddf3c3..42c2ea6dc 100644 --- a/include/common_structs.h +++ b/include/common_structs.h @@ -79,10 +79,10 @@ typedef struct { /* 0x0098 */ f32 unk_098; /* 0x009C */ f32 unk_09C; /* 0x00A0 */ f32 unk_0A0; - /* 0x00A4 */ f32 unk_0A4; - /* 0x00A8 */ s16 unk_0A8; + /* 0x00A4 */ f32 posX; + /* 0x00A8 */ s16 posY; /* 0x00AA */ s16 unk_0AA; - /* 0x00AC */ s16 unk_0AC; + /* 0x00AC */ s16 posZ; /* 0x00AE */ s16 unk_0AE; /* 0x00B0 */ s16 unk_0B0; /* 0x00B2 */ s16 unk_0B2; @@ -171,7 +171,7 @@ typedef struct { /* 0x01FC */ f32 unk_1FC; /* 0x0200 */ s32 unk_200; /* 0x0204 */ s16 unk_204; - /* 0x0206 */ s16 unk_206; + /* 0x0206 */ s16 unk_206; /* 0x0208 */ f32 unk_208; /* 0x020C */ f32 unk_20C; /* 0x0210 */ f32 unk_210; diff --git a/include/types.h b/include/types.h index 5a563cc4c..f43588176 100644 --- a/include/types.h +++ b/include/types.h @@ -25,15 +25,15 @@ struct VblankHandler OSMesg msg; }; -// TODO: populate with actual values struct Controller { - s16 unk0; - s16 unk2; - u16 unk4; // button held? - u16 buttonPressed; - u16 unk8; - u16 padA; // never used? - u32 pad; // never used? + s16 rawStickX; + s16 rawStickY; + u16 button; // HeldButton + u16 buttonPressed; // OnTriggered + u16 buttonDepressed; // OffTriggered + u16 stickDirection; + u16 stickPressed; // OffTriggered + u16 stickDepressed; // OnTriggered }; struct UnkStruct_800DC5EC { @@ -113,27 +113,4 @@ extern mk64_Vtx d_course_big_donut_vertex[]; extern struct courseTable gCourseTable[]; -/* -extern mk64_Vtx d_course_mario_raceway_vertex[5757]; -extern mk64_Vtx d_course_choco_mountain_vertex[5560]; -extern mk64_Vtx d_course_bowsers_castle_vertex[9527]; -extern mk64_Vtx d_course_banshee_boardwalk_vertex[4945]; -extern mk64_Vtx d_course_yoshi_valley_vertex[3720]; -extern mk64_Vtx d_course_frappe_snowland_vertex[5529]; -extern mk64_Vtx d_course_koopa_troopa_beach_vertex[9376]; -extern mk64_Vtx d_course_royal_raceway_vertex[8306]; -extern mk64_Vtx d_course_luigi_raceway_vertex[5936]; -extern mk64_Vtx d_course_moo_moo_farm_vertex[7972]; -extern mk64_Vtx d_course_toads_turnpike_vertex[6359]; -extern mk64_Vtx d_course_kalimari_desert_vertex[6393]; -extern mk64_Vtx d_course_sherbet_land_vertex[663]; -extern mk64_Vtx d_course_rainbow_road_vertex[3111]; -extern mk64_Vtx d_course_wario_stadium_vertex[6067]; -extern mk64_Vtx d_course_block_fort_vertex[1088]; -extern mk64_Vtx d_course_skyscraper_vertex[1086]; -extern mk64_Vtx d_course_double_deck_vertex[555]; -extern mk64_Vtx d_course_dks_jungle_parkway_vertex[5679]; -extern mk64_Vtx d_course_big_donut_vertex[1165]; -*/ - #endif /* TYPES_H */ diff --git a/mk64.ld b/mk64.ld index b8cd9a885..76bf2dd61 100644 --- a/mk64.ld +++ b/mk64.ld @@ -215,6 +215,7 @@ SECTIONS BUILD_DIR/src/os/ldiv.o(.text); BUILD_DIR/data/rsp.o(.text); + BUILD_DIR/src/main.o(.data); BUILD_DIR/data/data_0DD0A0.o(.data); BUILD_DIR/src/crash_screen.o(.data); BUILD_DIR/data/data_0DD0A0_1.o(.data); diff --git a/src/code_800029B0.c b/src/code_800029B0.c index 8d687f6a4..b9a501de5 100644 --- a/src/code_800029B0.c +++ b/src/code_800029B0.c @@ -172,11 +172,11 @@ void func_80002A18(void) { temp_v0 = *D_800DC4BC; for (tmp = 0; tmp < 7; tmp++, temp_v0++){ - temp_v0->unk0 = 0; - temp_v0->unk2 = 0; + temp_v0->rawStickX = 0; + temp_v0->rawStickY = 0; temp_v0->buttonPressed = 0; - temp_v0->unk8 = 0; - temp_v0->unk4 = 0; + temp_v0->buttonDepressed = 0; + temp_v0->button = 0; } } diff --git a/src/code_800393C0.c b/src/code_800393C0.c index 25920c180..aad30813c 100644 --- a/src/code_800393C0.c +++ b/src/code_800393C0.c @@ -8,7 +8,8 @@ extern struct_D_800E261C D_800E2400; extern struct_D_800E261C D_800E24B4; extern struct_D_800E261C D_800E2568; extern s16 D_80165340; -extern s32 gPlayer1PosZ; + +//GLOBAL_ASM("asm/non_matchings/code_800393C0/spawn_player.s") void spawn_player(Player *player, s8 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, u16 arg6, s16 arg7) { f32 ret; @@ -113,9 +114,9 @@ void spawn_player(Player *player, s8 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg player->unk_042 = 0; player->unk_078 = 0; - player->unk_0A8 = 0; + player->posY = 0; player->unk_0AA = 0; - player->unk_0AC = 0; + player->posZ = 0; player->unk_0AE = 0; player->unk_0B0 = 0; player->unk_0B2 = 0; @@ -165,7 +166,7 @@ void spawn_player(Player *player, s8 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg player->unk_098 = 0.0f; player->unk_09C = 0.0f; player->unk_0A0 = 0.0f; - player->unk_0A4 = 0.0f; + player->posX = 0.0f; player->unk_0B8 = 0.0f; player->unk_0E4 = 0.0f; player->unk_0E8 = 0.0f; @@ -1056,7 +1057,7 @@ void func_8003CD98(Player *player, s32 arg1, s8 arg2, s8 arg3) { D_801650D0[arg3][arg2] = player->unk_244[arg3]; D_80165110[arg3][arg2] = player->unk_24C[arg3]; - D_80165150[arg3][arg2] = player->unk_0A8; + D_80165150[arg3][arg2] = player->posY; D_801651D0[arg3][arg2] = 0; func_800267AC(player, arg2, arg3); } @@ -1081,18 +1082,18 @@ void func_8003D080(void) { switch (gModeSelection) { case 0: if (gCurrentCourseId == COURSE_TOADS_TURNPIKE) { - func_8001C4D0(0.0f, gPlayer1PosY, D_8016524C, gPlayer1Rotation, 8, 0); + func_8001C4D0(0.0f, D_800DC4DC->posY, D_8016524C, D_800DC4DC->unk_0BC, 8, 0); } else { - func_8001C4D0((D_80165210[6] + D_80165210[7]) / 2, gPlayer1PosY, D_8016524C, gPlayer1Rotation, 8, 0); + func_8001C4D0((D_80165210[6] + D_80165210[7]) / 2, D_800DC4DC->posY, D_8016524C, D_800DC4DC->unk_0BC, 8, 0); } break; case 1: - func_8001C4D0(gPlayer1PosX, gPlayer1PosY, D_8016524C, gPlayer1Rotation, 1, 0); + func_8001C4D0(D_800DC4DC->posX, D_800DC4DC->posY, D_8016524C, D_800DC4DC->unk_0BC, 1, 0); break; default: - func_8001C4D0(gPlayer1PosX, gPlayer1PosY, gPlayer1PosZ, gPlayer1Rotation, 10, 0); + func_8001C4D0(D_800DC4DC->posX, D_800DC4DC->posY, D_800DC4DC->posZ, D_800DC4DC->unk_0BC, 10, 0); break; } break; @@ -1101,27 +1102,27 @@ void func_8003D080(void) { case 2: switch (gModeSelection) { case 0: - func_8001C4D0(gPlayer1PosX, gPlayer1PosY, gPlayer1PosZ, gPlayer1Rotation, 1, 0); - func_8001C4D0(D_800F7768.unk_014, D_800F7768.unk_018, D_800F7768.unk_01C, D_800F7768.unk_02E, 1, 1); + func_8001C4D0(D_800DC4DC->posX, D_800DC4DC->posY, D_800DC4DC->posZ, D_800DC4DC->unk_0BC, 1, 0); + func_8001C4D0(D_800DC4E0->unk_014, D_800DC4E0->unk_018, D_800DC4E0->unk_01C, D_800DC4E0->unk_02E, 1, 1); break; case 3: - func_8001C4D0(gPlayer1PosX, gPlayer1PosY, gPlayer1PosZ, gPlayer1Rotation, 9, 0); - func_8001C4D0(D_800F7768.unk_014, D_800F7768.unk_018, D_800F7768.unk_01C, D_800F7768.unk_02E, 9, 1); + func_8001C4D0(D_800DC4DC->posX, D_800DC4DC->posY, D_800DC4DC->posZ, D_800DC4DC->unk_0BC, 9, 0); + func_8001C4D0(D_800DC4E0->unk_014, D_800DC4E0->unk_018, D_800DC4E0->unk_01C, D_800DC4E0->unk_02E, 9, 1); break; default: - func_8001C4D0(gPlayer1PosX, gPlayer1PosY, gPlayer1PosZ, gPlayer1Rotation, 1, 0); - func_8001C4D0(D_800F7768.unk_014, D_800F7768.unk_018, D_800F7768.unk_01C, D_800F7768.unk_02E, 1, 1); + func_8001C4D0(D_800DC4DC->posX, D_800DC4DC->posY, D_800DC4DC->posZ, D_800DC4DC->unk_0BC, 1, 0); + func_8001C4D0(D_800DC4E0->unk_014, D_800DC4E0->unk_018, D_800DC4E0->unk_01C, D_800DC4E0->unk_02E, 1, 1); break; } break; case 3: if (gModeSelection == 3) { - ptr = &D_800F8540; - func_8001C4D0(gPlayer1PosX, gPlayer1PosY, gPlayer1PosZ, gPlayer1Rotation, 9, 0); - func_8001C4D0(D_800F7768.unk_014, D_800F7768.unk_018, D_800F7768.unk_01C, D_800F7768.unk_02E, 9, 1); + ptr = &D_800DC4E4; + func_8001C4D0(D_800DC4DC->posX, D_800DC4DC->posY, D_800DC4DC->posZ, D_800DC4DC->unk_0BC, 9, 0); + func_8001C4D0(D_800DC4E0->unk_014, D_800DC4E0->unk_018, D_800DC4E0->unk_01C, D_800DC4E0->unk_02E, 9, 1); ptr++; func_8001C4D0(ptr->unk_014, ptr->unk_018, ptr->unk_01C, ptr->unk_02E, 9, 2); ptr++; @@ -1129,9 +1130,9 @@ void func_8003D080(void) { func_8001C4D0(ptr->unk_014, ptr->unk_018, ptr->unk_01C, ptr->unk_02E, 9, 3); } } else { - ptr = &D_800F8540; - func_8001C4D0(gPlayer1PosX, gPlayer1PosY, gPlayer1PosZ, gPlayer1Rotation, 1, 0); - func_8001C4D0(D_800F7768.unk_014, D_800F7768.unk_018, D_800F7768.unk_01C, D_800F7768.unk_02E, 1, 1); + ptr = &D_800DC4E4; + func_8001C4D0(D_800DC4DC->posX, D_800DC4DC->posY, D_800DC4DC->posZ, D_800DC4DC->unk_0BC, 1, 0); + func_8001C4D0(D_800DC4E0->unk_014, D_800DC4E0->unk_018, D_800DC4E0->unk_01C, D_800DC4E0->unk_02E, 1, 1); ptr++; func_8001C4D0(ptr->unk_014, ptr->unk_018, ptr->unk_01C, ptr->unk_02E, 1, 2); ptr++; @@ -1144,19 +1145,19 @@ void func_8003D080(void) { } else { switch (D_800DC52C) { case 0: - func_8001C4D0(gPlayer1PosX, gPlayer1PosY, gPlayer1PosZ, gPlayer1Rotation, 3, 0); + func_8001C4D0(D_800DC4DC->posX, D_800DC4DC->posY, D_800DC4DC->posZ, D_800DC4DC->unk_0BC, 3, 0); break; case 1: case 2: - func_8001C4D0(gPlayer1PosX, gPlayer1PosY, gPlayer1PosZ, gPlayer1Rotation, 3, 0); - func_8001C4D0(D_800F7768.unk_014, D_800F7768.unk_018, D_800F7768.unk_01C, D_800F7768.unk_02E, 3, 1); + func_8001C4D0(D_800DC4DC->posX, D_800DC4DC->posY, D_800DC4DC->posZ, D_800DC4DC->unk_0BC, 3, 0); + func_8001C4D0(D_800DC4E0->unk_014, D_800DC4E0->unk_018, D_800DC4E0->unk_01C, D_800DC4E0->unk_02E, 3, 1); break; case 3: - ptr = &D_800F8540; - func_8001C4D0(gPlayer1PosX, gPlayer1PosY, gPlayer1PosZ, gPlayer1Rotation, 3, 0); - func_8001C4D0(D_800F7768.unk_014, D_800F7768.unk_018, D_800F7768.unk_01C, D_800F7768.unk_02E, 3, 1); + ptr = &D_800DC4E4; + func_8001C4D0(D_800DC4DC->posX, D_800DC4DC->posY, D_800DC4DC->posZ, D_800DC4DC->unk_0BC, 3, 0); + func_8001C4D0(D_800DC4E0->unk_014, D_800DC4E0->unk_018, D_800DC4E0->unk_01C, D_800DC4E0->unk_02E, 3, 1); ptr++; func_8001C4D0(ptr->unk_014, ptr->unk_018, ptr->unk_01C, ptr->unk_02E, 3, 2); ptr++; diff --git a/src/code_8008C1D0.c b/src/code_8008C1D0.c index 5494ad5a8..0ebf01a73 100644 --- a/src/code_8008C1D0.c +++ b/src/code_8008C1D0.c @@ -263,7 +263,7 @@ void func_8008C528(Player *player, s8 arg1) { player->unk_0F4 = 0.0f; player->unk_0EC = D_800E3790[temp_v1]; - player->unk_0A8 = 0; + player->posY = 0; player->unk_0BC = player->unk_0BC | 0x400; player->unk_0BC = player->unk_0BC & ~0x10; player->unk_0C0 = 0; @@ -281,13 +281,13 @@ void func_8008C528(Player *player, s8 arg1) { void func_8008C62C(Player *player, s8 arg1) { func_80031F48(player, 5.0f); - player->unk_0A8 += (s16)0xA0; + player->posY += (s16)0xA0; player->unk_042 += (s16)0x71C; - if (player->unk_0A8 >= 0x2000) { - player->unk_0A8 = 0; + if (player->posY >= 0x2000) { + player->posY = 0; player->unk_236 = (s16) (player->unk_236 - 1); if (player->unk_236 == 0) { - player->unk_0A8 = 0x2000; + player->posY = 0x2000; func_8008C6D0(player, arg1); if (gModeSelection == 3) { func_8006B8B4(player, arg1); @@ -301,7 +301,7 @@ void func_8008C6D0(Player *player, s8 arg1) { player->unk_206 = 0; player->unk_0C4 = 0; player->unk_0BC = (s32) (player->unk_0BC & ~0x400); - player->unk_0A8 = 0; + player->posY = 0; player->unk_0C0 = 0; player->unk_07C = 0; player->unk_236 = 0; @@ -326,8 +326,8 @@ void func_8008C73C(Player *player, s8 arg1, s8 unk3, s8 unk4) { } else { player->unk_0BC = (s32) (player->unk_0BC | 0x80); } - player->unk_0B6 = (u16) (player->unk_0B6 | 0x80); - player->unk_0B2 = 2; + player->unk_0B4 = (u16) (player->unk_0B4 | 0x80); + player->unk_0B0 = 2; player->unk_0C0 = 0; player->unk_07C = 0; player->unk_078 = 0; @@ -364,7 +364,7 @@ void func_8008C8C4(Player *player, s8 arg1) { player->unk_02E = player->unk_0AE; - player->unk_0A8 = 0; + player->posY = 0; player->unk_07C = 0; player->unk_0C0 = 0; player->unk_0BC &= ~0x800; diff --git a/src/code_80281780.c b/src/code_80281780.c index 54d046a1d..27a26410f 100644 --- a/src/code_80281780.c +++ b/src/code_80281780.c @@ -10,26 +10,26 @@ extern s32 gPrevLoadedAddress; // unk4 is buttonDown? void func_80281780(void) { if (gEnableDebugMode != 0) { - if (D_800DC4BC->unk4 & 0x0F0F) { - if (D_800DC4BC->unk4 & 8) { + if (D_800DC4BC->button & 0x0F0F) { + if (D_800DC4BC->button & 8) { D_800E86A8[0] = 1; } - else if (D_800DC4BC->unk4 & 2) { + else if (D_800DC4BC->button & 2) { D_800E86A8[0] = 2; } - else if (D_800DC4BC->unk4 & 1) { + else if (D_800DC4BC->button & 1) { D_800E86A8[0] = 3; } - else if (D_800DC4BC->unk4 & 4) { + else if (D_800DC4BC->button & 4) { D_800E86A8[0] = 4; } - else if (D_800DC4BC->unk4 & 0x800) { + else if (D_800DC4BC->button & 0x800) { D_800E86A8[0] = 5; } - else if (D_800DC4BC->unk4 & 0x200) { + else if (D_800DC4BC->button & 0x200) { D_800E86A8[0] = 6; } - else if (D_800DC4BC->unk4 & 0x100) { + else if (D_800DC4BC->button & 0x100) { D_800E86A8[0] = 7; } else { D_800E86A8[0] = 0; diff --git a/src/code_8028DF00.c b/src/code_8028DF00.c index 3ece24985..b8a546057 100644 --- a/src/code_8028DF00.c +++ b/src/code_8028DF00.c @@ -5,12 +5,13 @@ extern s16 D_802BA040[4]; -extern struct Controller *D_800F6914; -extern struct Controller *gControllers; -extern struct Controller *gPlayer2Controller; -extern struct Controller *gPlayer3Controller; -extern struct Controller *gPlayer4Controller; -extern struct Controller *D_800F6950; +extern struct Controller gControllers[]; +extern struct Controller *D_800DC4BC; +extern struct Controller *D_800DC4C4; +extern struct Controller *D_800DC4C8; +extern struct Controller *D_800DC4CC; +extern struct Controller *D_800DC4D0; +extern struct Controller *D_800DC4D4; extern unsigned char *D_8015F8C4; extern unsigned char *D_8015F8C8; @@ -21,7 +22,7 @@ extern s32 D_8016348C; extern s8 gCourseSelection; extern s32 D_800DC544; -extern Player D_800F6990[]; +extern Player gPlayers[]; extern Player D_800DC4E0[]; extern Player D_800DC4DC[]; extern s32 lapCount[]; @@ -171,7 +172,7 @@ void func_8028E0F0(void) { s16 phi_s2 = 0; for(i = 0; i < 4; i++) { - ply = (Player *)&D_800F6990[i]; + ply = (Player *)&gPlayers[i]; if (!(ply->unk_000 & 0x8000)) { continue; } @@ -211,11 +212,11 @@ void func_8028E298(u16 arg2) { f32 phi_f8; u16 phi_a2; s32 i; - phi_a1 = &D_800F6990; + phi_a1 = &gPlayers; phi_a0 = 0; phi_a2 = arg2; for (i = 0; i < 8; i++) { - if ((D_800F6990[i].unk_000 & 0x800) == 0) { + if ((gPlayers[i].unk_000 & 0x800) == 0) { temp_a2 = *(&D_801645B0 + (phi_a0 * 2)); temp_v1 = phi_a0 * 4; temp_v0 = *(&D_801645C8 + (temp_a2 * 2)); @@ -606,7 +607,7 @@ void func_8028EDA8(void) { if (D_800DC510 == 2) { D_800DC510 = 3; } - phi_v1 = &D_800F6990; + phi_v1 = &gPlayers; do { temp_v0 = phi_v1->unk0; if (((temp_v0 & 0x8000) != 0) && ((temp_v0 & 0x2000) != 0)) { @@ -635,15 +636,15 @@ GLOBAL_ASM("asm/non_matchings/code_8028DF00/func_8028EDA8.s") /* f32 func_8028EE8C(s32 i) { f32 temp_f14; - temp_f14 = D_8015F8D8 - D_800F6990[i].unk_01C; - return gCourseTimer - ((D_802B9254 * temp_f14) / (temp_f14 + (D_800F6990[i].unk_028 - D_8015F8D8))); + temp_f14 = D_8015F8D8 - gPlayers[i].unk_01C; + return gCourseTimer - ((D_802B9254 * temp_f14) / (temp_f14 + (gPlayers[i].unk_028 - D_8015F8D8))); } */ GLOBAL_ASM("asm/non_matchings/code_8028DF00/func_8028EE8C.s") void func_8028EEF0(s32 i) { - D_800F6990[i].unk_000 |= 0x800; + gPlayers[i].unk_000 |= 0x800; } /* @@ -653,21 +654,21 @@ void func_8028EF28(void) { s32 i; for(i = 0; i < 8; i++) { - ply = (Player *)&D_800F6990[i]; - if ((D_800F6990[i].unk_000 & 0x8000) == 0) { + ply = (Player *)&gPlayers[i]; + if ((gPlayers[i].unk_000 & 0x8000) == 0) { continue; } - if (lapCount[i] < D_800F6990[i].unk_008) { - D_800F6990[i].unk_008--; - } else if (lapCount[i] > D_800F6990[i].unk_008) { - D_800F6990[i].unk_008++; + if (lapCount[i] < gPlayers[i].unk_008) { + gPlayers[i].unk_008--; + } else if (lapCount[i] > gPlayers[i].unk_008) { + gPlayers[i].unk_008++; } - if ((D_800F6990[i].unk_000 & 0x4000) != 0) { - if (D_800F6990[i].unk_008 == 3) { + if ((gPlayers[i].unk_000 & 0x4000) != 0) { + if (gPlayers[i].unk_008 == 3) { func_8028EEF0(i); - currentPosition = D_800F6990[i].unk_004; - D_800F6990[i].unk_000 |= 0x1000; + currentPosition = gPlayers[i].unk_004; + gPlayers[i].unk_000 |= 0x1000; if (currentPosition < 4) { D_80150120 = 1; } @@ -678,7 +679,7 @@ void func_8028EF28(void) { if (gModeSelection == 0 && gPlayerCountSelection1 == 2 && D_802BA048 == 0) { D_802BA048 = 1; } - if ((D_800F6990[i].unk_000 & 0x100) == 0) { + if ((gPlayers[i].unk_000 & 0x100) == 0) { D_800DC510 = 4; } if (gModeSelection == 1) { @@ -699,8 +700,8 @@ void func_8028EF28(void) { } D_800DC510 = 5; D_8015F8F6[1] = i; - D_800F6990->unk_00C |= 0x200000; - D_800F6990->unk_000 |= 0x1000; + gPlayers->unk_00C |= 0x200000; + gPlayers->unk_000 |= 0x1000; func_800CA118((u8)i); break; case 3: @@ -717,8 +718,8 @@ void func_8028EF28(void) { if (*(D_8015F8C8 + i * 3 + 2) > 99) { *(D_8015F8C8 + i * 3 + 2) == 99; } - D_800F6990->unk_00C |= 0x200000; - D_800F6990->unk_000 |= 0x1000; + gPlayers->unk_00C |= 0x200000; + gPlayers->unk_000 |= 0x1000; func_800CA118((u8)i); } break; @@ -732,8 +733,8 @@ void func_8028EF28(void) { if (currentPosition == 2) { D_800DC510 = 5; D_8015F8F6[3] = i; - D_800F6990->unk_00C |= 0x200000; - D_800F6990->unk_000 |= 0x1000; + gPlayers->unk_00C |= 0x200000; + gPlayers->unk_000 |= 0x1000; func_800CA118((u8)i); } break; @@ -741,8 +742,8 @@ void func_8028EF28(void) { } - } else if (D_800F6990[i].unk_008 == 2) { - if ((D_800F6990[i].unk_000 & 0x100) == 0) { + } else if (gPlayers[i].unk_008 == 2) { + if ((gPlayers[i].unk_000 & 0x100) == 0) { return; } if ((D_802BA032 & 0x4000) == 0) { @@ -750,7 +751,7 @@ void func_8028EF28(void) { func_800CA49C(i); } } - } else if (D_800F6990[i].unk_008 == 3) { + } else if (gPlayers[i].unk_008 == 3) { func_8028EEF0(i); if (gModeSelection == 1) { func_80005AE8(ply); diff --git a/src/main.c b/src/main.c index 683e89525..a9321e0cd 100644 --- a/src/main.c +++ b/src/main.c @@ -8,6 +8,7 @@ #include "memory.h" #include "segments.h" #include "segment_symbols.h" +#include "common_structs.h" // Declarations (not in this file) void func_8008C214(void); @@ -34,14 +35,80 @@ extern OSThread gVideoThread; extern u16 D_8015011C; extern OSMesgQueue D_8015F460; extern OSMesg D_8015F3E0; -extern s32 gVideoThreadStack; -extern struct SPTask *gActiveSPTask; -extern s16 sNumVBlanks; +extern s32 D_80156820; extern f32 D_800DC594; -extern struct SPTask *sCurrentAudioSPTask; -extern struct SPTask *sCurrentDisplaySPTask; -extern struct VblankHandler *gVblankHandler1; -extern struct VblankHandler *gVblankHandler2; + +struct VblankHandler *gVblankHandler1 = NULL; +struct VblankHandler *gVblankHandler2 = NULL; + +struct SPTask *gActiveSPTask = NULL; +struct SPTask *sCurrentAudioSPTask = NULL; +struct SPTask* sCurrentDisplaySPTask = NULL; +struct SPTask* D_800DC4B4 = NULL; +struct SPTask* sNextDisplaySPTask = NULL; + + +struct Controller gControllers[8]; +struct Controller *D_800DC4BC = &gControllers[0]; +struct Controller *D_800DC4C0 = &gControllers[1]; +struct Controller *D_800DC4C4 = &gControllers[2]; +struct Controller *D_800DC4C8 = &gControllers[3]; +struct Controller *D_800DC4CC = &gControllers[4]; +struct Controller *D_800DC4D0 = &gControllers[5]; +struct Controller *D_800DC4D4 = &gControllers[6]; +struct Controller *D_800DC4D8 = &gControllers[7]; + +Player gPlayers[8]; +Player *D_800DC4DC = &gPlayers[0]; +Player *D_800DC4E0 = &gPlayers[1]; +Player *D_800DC4E4 = &gPlayers[2]; +Player *D_800DC4E8 = &gPlayers[3]; +Player *D_800DC4EC = &gPlayers[4]; +Player *D_800DC4F0 = &gPlayers[5]; +Player *D_800DC4F4 = &gPlayers[6]; +Player *D_800DC4F8 = &gPlayers[7]; + +Player *D_800DC4FC = &gPlayers[0]; +Player *D_800DC500 = &gPlayers[1]; +Player *D_800DC504 = &gPlayers[2]; +Player *D_800DC508 = &gPlayers[3]; + +s32 D_800DC50C = 0xffff; +u16 D_800DC510 = 0; +u16 D_800DC514 = 0; +u16 D_800DC518 = 0; +u16 D_800DC51C = 0; +u16 gEnableDebugMode = 0; +s32 D_800DC524 = 7; +UNUSED s32 D_800DC528 = 1; +s32 D_800DC52C = 0; + +s32 D_800DC530[2] = {0}; +s32 gPlayerCountSelection1 = 2; +s32 gModeSelection = 0; +s32 D_800DC540 = 0; +s32 D_800DC544 = 0; +s32 D_800DC548 = 0; +s32 gGlobalTimer = 0; +UNUSED s32 D_800DC550 = 0; +UNUSED s32 D_800DC554 = 0; +UNUSED s32 D_800DC558 = 0; +// Framebuffer rendering values (max 3) +u16 sRenderedFramebuffer = 0; +u16 sRenderingFramebuffer = 0; +UNUSED u16 D_800DC564 = 0; +s32 D_800DC568 = 0; +s32 D_800DC56C[8] = {0}; +s16 sNumVBlanks = 0; +UNUSED s16 D_800DC590 = 0; +float D_800DC594 = 0.0f; +float gCourseTimer = 0.0f; + +extern u8 gControllerBits; +extern OSContStatus gControllerStatuses; +extern u16 sController1Unplugged; + + extern uintptr_t gPhysicalFramebuffers[3]; extern const f64 D_800EB640; extern struct VblankHandler sSoundVblankHandler; @@ -58,9 +125,6 @@ extern u64 gspF3DLXTextStart[], gspF3DLXTextEnd[]; extern u64 gspF3DEXDataStart[]; extern u64 gspF3DLXDataStart[]; -extern s32 gPlayerCountSelection1; -extern s32 D_800DC50C; - extern u32 gGfxSPTaskStack; extern u64 gGfxSPTaskOutputBuffer[]; extern u32 gGfxSPTaskOutputBufferSize; @@ -78,11 +142,9 @@ extern OSIoMesg *D_8014F0A0; extern u32 gHeapEndPtr; extern u32 *D_801978D0; + extern OSMesgQueue gSIEventMesgQueue; extern OSMesg gSIEventMesgBuf[3]; -extern u8 gControllerBits; -extern OSContStatus gControllerStatuses; -extern u16 sController1Unplugged; extern u32 D_801502B4; extern u32 D_802F9F80; @@ -100,16 +162,8 @@ extern f64 D_800EB610; extern s16 gCurrentlyLoadedCourseId; -extern struct SPTask* sNextDisplaySPTask; - -extern u16 sRenderingFramebuffer; - +s32 D_800FD850[4]; extern struct GfxPool gGfxPools[2]; -extern s32 gGlobalTimer; - -// Framebuffer rendering values (max 3) -extern u16 sRenderedFramebuffer; // = 0; -extern u16 sRenderingFramebuffer; // = 0; // Declarations (in this file) void thread1_idle(void *arg0); @@ -148,7 +202,7 @@ void thread1_idle(void *arg0) { D_8015011C = (s16) osResetType; create_debug_thread(); start_debug_thread(); - create_thread(&gVideoThread, 3, &thread3_video, arg0, &gVideoThreadStack, 100); + create_thread(&gVideoThread, 3, &thread3_video, arg0, &D_80156820, 100); osStartThread(&gVideoThread); osSetThreadPri(NULL, 0); @@ -1215,19 +1269,19 @@ void thread5_game_logic(s32 arg0) { rendering_init(); read_controllers(); func_800C5CB8(); - while(1) { - func_800CB2C4(); - if (D_800DC524 != D_800DC50C) { - D_800DC50C = (s32) D_800DC524; - func_80002684(); - } - profiler_log_thread5_time(0); - config_gfx_pool(); - read_controllers(); - func_80001ECC(); - func_80000CE8(); - display_and_vsync(); +loop_3: + func_800CB2C4(); + if (D_800DC524 != D_800DC50C) { + D_800DC50C = (s32) D_800DC524; + func_80002684(); } + profiler_log_thread5_time(0); + config_gfx_pool(); + read_controllers(); + func_80001ECC(); + func_80000CE8(); + display_and_vsync(); + goto loop_3; } void thread4_audio(UNUSED s32 arg0) {