From ac1d02ccdbb5f8d81dede759c1e462fbd2ed5017 Mon Sep 17 00:00:00 2001 From: David Benepe Date: Wed, 9 Jun 2021 17:45:44 -0500 Subject: [PATCH] Added bss for unknown_07B870 & unknown_080500 --- .../unknown_080500/MenuCharacterSelectLoop.s | 12 +- .../unknown_080500/MenuFileSelectLoop.s | 8 +- .../unknown_080500/MenuLoadNewAreaInit.s | 4 +- .../unknown_080500/MenuLoadNewAreaLoop.s | 12 +- .../unknown_080500/MenuOptionsLoop.s | 4 +- .../unknown_080500/MenuTrophyRaceRoundInit.s | 4 +- .../unknown_080500/func_8007F900.s | 4 +- .../unknown_080500/func_80081218.s | 34 +- .../unknown_080500/func_800862C4.s | 4 +- .../unknown_080500/func_8008D5F8.s | 8 +- .../unknown_080500/func_8008D8BC.s | 4 +- .../unknown_080500/func_8008DC7C.s | 4 +- .../unknown_080500/func_8008F00C.s | 4 +- .../unknown_080500/func_8008FF1C.s | 4 +- .../unknown_080500/func_80090F30.s | 32 +- .../unknown_080500/func_80092188.s | 8 +- .../unknown_080500/func_80092E94.s | 24 +- .../unknown_080500/func_80095728.s | 16 +- bss.txt | 46 -- src/unknown_07B870.c | 31 +- src/unknown_080500.c | 386 ++++++++++----- undefined_syms.txt | 453 ++++++++---------- 22 files changed, 592 insertions(+), 514 deletions(-) diff --git a/asm/non_matchings/unknown_080500/MenuCharacterSelectLoop.s b/asm/non_matchings/unknown_080500/MenuCharacterSelectLoop.s index dd5f6368..e790367d 100644 --- a/asm/non_matchings/unknown_080500/MenuCharacterSelectLoop.s +++ b/asm/non_matchings/unknown_080500/MenuCharacterSelectLoop.s @@ -32,13 +32,13 @@ glabel MenuCharacterSelectLoop /* 08C994 8008BD94 8C620000 */ lw $v0, ($v1) /* 08C998 8008BD98 3C0F8012 */ lui $t7, %hi(D_801263D4) # $t7, 0x8012 /* 08C99C 8008BD9C 1440001B */ bnez $v0, .L8008BE0C -/* 08C9A0 8008BDA0 3C188012 */ lui $t8, %hi(D_801263D5) # $t8, 0x8012 -/* 08C9A4 8008BDA4 3C198012 */ lui $t9, %hi(D_801263D6) # $t9, 0x8012 -/* 08C9A8 8008BDA8 3C0C8012 */ lui $t4, %hi(D_801263D7) # $t4, 0x8012 -/* 08C9AC 8008BDAC 818C63D7 */ lb $t4, %lo(D_801263D7)($t4) -/* 08C9B0 8008BDB0 833963D6 */ lb $t9, %lo(D_801263D6)($t9) +/* 08C9A0 8008BDA0 3C188012 */ lui $t8, %hi(D_801263D4+1) # $t8, 0x8012 +/* 08C9A4 8008BDA4 3C198012 */ lui $t9, %hi(D_801263D4+2) # $t9, 0x8012 +/* 08C9A8 8008BDA8 3C0C8012 */ lui $t4, %hi(D_801263D4+3) # $t4, 0x8012 +/* 08C9AC 8008BDAC 818C63D7 */ lb $t4, %lo(D_801263D4+3)($t4) +/* 08C9B0 8008BDB0 833963D6 */ lb $t9, %lo(D_801263D4+2)($t9) /* 08C9B4 8008BDB4 81EF63D4 */ lb $t7, %lo(D_801263D4)($t7) -/* 08C9B8 8008BDB8 831863D5 */ lb $t8, %lo(D_801263D5)($t8) +/* 08C9B8 8008BDB8 831863D5 */ lb $t8, %lo(D_801263D4+1)($t8) /* 08C9BC 8008BDBC A3AC0023 */ sb $t4, 0x23($sp) /* 08C9C0 8008BDC0 A3B90022 */ sb $t9, 0x22($sp) /* 08C9C4 8008BDC4 A3AF0020 */ sb $t7, 0x20($sp) diff --git a/asm/non_matchings/unknown_080500/MenuFileSelectLoop.s b/asm/non_matchings/unknown_080500/MenuFileSelectLoop.s index 54146090..d4ff9c24 100644 --- a/asm/non_matchings/unknown_080500/MenuFileSelectLoop.s +++ b/asm/non_matchings/unknown_080500/MenuFileSelectLoop.s @@ -72,9 +72,9 @@ glabel MenuFileSelectLoop /* 08D4C0 8008C8C0 AC22F494 */ sw $v0, %lo(gIsInAdventureTwo)($at) /* 08D4C4 8008C8C4 3C01800E */ lui $at, %hi(D_800DF4B8) # $at, 0x800e /* 08D4C8 8008C8C8 AC20F4B8 */ sw $zero, %lo(D_800DF4B8)($at) -/* 08D4CC 8008C8CC 3C018012 */ lui $at, %hi(p1_vehicle) # $at, 0x8012 +/* 08D4CC 8008C8CC 3C018012 */ lui $at, %hi(gPlayerVehicle) # $at, 0x8012 /* 08D4D0 8008C8D0 0C01B6C5 */ jal func_8006DB14 -/* 08D4D4 8008C8D4 A02069C0 */ sb $zero, %lo(p1_vehicle)($at) +/* 08D4D4 8008C8D4 A02069C0 */ sb $zero, %lo(gPlayerVehicle)($at) /* 08D4D8 8008C8D8 0C0204F4 */ jal MenuInit /* 08D4DC 8008C8DC 24040006 */ li $a0, 6 /* 08D4E0 8008C8E0 10000076 */ b .L8008CABC @@ -134,10 +134,10 @@ glabel MenuFileSelectLoop /* 08D5A8 8008C9A8 AFA20024 */ sw $v0, 0x24($sp) /* 08D5AC 8008C9AC 0C01A955 */ jal func_8006A554 /* 08D5B0 8008C9B0 AFA60020 */ sw $a2, 0x20($sp) -/* 08D5B4 8008C9B4 3C198012 */ lui $t9, %hi(D_80126465) # $t9, 0x8012 +/* 08D5B4 8008C9B4 3C198012 */ lui $t9, %hi(D_80126464+1) # $t9, 0x8012 /* 08D5B8 8008C9B8 8FA30024 */ lw $v1, 0x24($sp) /* 08D5BC 8008C9BC 8FA60020 */ lw $a2, 0x20($sp) -/* 08D5C0 8008C9C0 83396465 */ lb $t9, %lo(D_80126465)($t9) +/* 08D5C0 8008C9C0 83396465 */ lb $t9, %lo(D_80126464+1)($t9) /* 08D5C4 8008C9C4 00621825 */ or $v1, $v1, $v0 /* 08D5C8 8008C9C8 00D93021 */ addu $a2, $a2, $t9 .L8008C9CC: diff --git a/asm/non_matchings/unknown_080500/MenuLoadNewAreaInit.s b/asm/non_matchings/unknown_080500/MenuLoadNewAreaInit.s index 1a029385..7d6e7857 100644 --- a/asm/non_matchings/unknown_080500/MenuLoadNewAreaInit.s +++ b/asm/non_matchings/unknown_080500/MenuLoadNewAreaInit.s @@ -15,8 +15,8 @@ glabel MenuLoadNewAreaInit /* 0938B8 80092CB8 81D00002 */ lb $s0, 2($t6) /* 0938BC 80092CBC 0C01AC2B */ jal func_8006B0AC /* 0938C0 80092CC0 02002025 */ move $a0, $s0 -/* 0938C4 80092CC4 3C018012 */ lui $at, %hi(p1_vehicle) # $at, 0x8012 -/* 0938C8 80092CC8 A02269C0 */ sb $v0, %lo(p1_vehicle)($at) +/* 0938C4 80092CC4 3C018012 */ lui $at, %hi(gPlayerVehicle) # $at, 0x8012 +/* 0938C8 80092CC8 A02269C0 */ sb $v0, %lo(gPlayerVehicle)($at) /* 0938CC 80092CCC 0C01AC53 */ jal func_8006B14C /* 0938D0 80092CD0 02002025 */ move $a0, $s0 /* 0938D4 80092CD4 24010005 */ li $at, 5 diff --git a/asm/non_matchings/unknown_080500/MenuLoadNewAreaLoop.s b/asm/non_matchings/unknown_080500/MenuLoadNewAreaLoop.s index 09750dd8..493aad1a 100644 --- a/asm/non_matchings/unknown_080500/MenuLoadNewAreaLoop.s +++ b/asm/non_matchings/unknown_080500/MenuLoadNewAreaLoop.s @@ -84,11 +84,11 @@ glabel MenuLoadNewAreaLoop /* 094330 80093730 00000000 */ nop /* 094334 80093734 0C01AC2B */ jal func_8006B0AC /* 094338 80093738 00000000 */ nop -/* 09433C 8009373C 3C018012 */ lui $at, %hi(p1_vehicle) # $at, 0x8012 -/* 094340 80093740 A02269C0 */ sb $v0, %lo(p1_vehicle)($at) +/* 09433C 8009373C 3C018012 */ lui $at, %hi(gPlayerVehicle) # $at, 0x8012 +/* 094340 80093740 A02269C0 */ sb $v0, %lo(gPlayerVehicle)($at) .L80093744: -/* 094344 80093744 3C038012 */ lui $v1, %hi(p1_vehicle) # $v1, 0x8012 -/* 094348 80093748 806369C0 */ lb $v1, %lo(p1_vehicle)($v1) +/* 094344 80093744 3C038012 */ lui $v1, %hi(gPlayerVehicle) # $v1, 0x8012 +/* 094348 80093748 806369C0 */ lb $v1, %lo(gPlayerVehicle)($v1) /* 09434C 8009374C 8FA40024 */ lw $a0, 0x24($sp) /* 094350 80093750 0C01AC3E */ jal func_8006B0F8 /* 094354 80093754 AFA30034 */ sw $v1, 0x34($sp) @@ -238,9 +238,9 @@ glabel MenuLoadNewAreaLoop /* 094558 80093958 0C000741 */ jal func_80001D04 /* 09455C 8009395C AFA30034 */ sw $v1, 0x34($sp) /* 094560 80093960 8FA30034 */ lw $v1, 0x34($sp) -/* 094564 80093964 3C018012 */ lui $at, %hi(p1_vehicle) # $at, 0x8012 +/* 094564 80093964 3C018012 */ lui $at, %hi(gPlayerVehicle) # $at, 0x8012 /* 094568 80093968 10000021 */ b .L800939F0 -/* 09456C 8009396C A02369C0 */ sb $v1, %lo(p1_vehicle)($at) +/* 09456C 8009396C A02369C0 */ sb $v1, %lo(gPlayerVehicle)($at) .L80093970: /* 094570 80093970 04410007 */ bgez $v0, .L80093990 /* 094574 80093974 8FAA0038 */ lw $t2, 0x38($sp) diff --git a/asm/non_matchings/unknown_080500/MenuOptionsLoop.s b/asm/non_matchings/unknown_080500/MenuOptionsLoop.s index a71c4304..399f89f0 100644 --- a/asm/non_matchings/unknown_080500/MenuOptionsLoop.s +++ b/asm/non_matchings/unknown_080500/MenuOptionsLoop.s @@ -147,8 +147,8 @@ glabel MenuOptionsLoop /* 085174 80084574 14410028 */ bne $v0, $at, .L80084618 /* 085178 80084578 00000000 */ nop /* 08517C 8008457C 10E00026 */ beqz $a3, .L80084618 -/* 085180 80084580 3C0F8012 */ lui $t7, %hi(D_8012644C) # $t7, 0x8012 -/* 085184 80084584 8DEF644C */ lw $t7, %lo(D_8012644C)($t7) +/* 085180 80084580 3C0F8012 */ lui $t7, %hi(D_80126448+4) # $t7, 0x8012 +/* 085184 80084584 8DEF644C */ lw $t7, %lo(D_80126448+4)($t7) /* 085188 80084588 3C010200 */ lui $at, 0x200 /* 08518C 8008458C 01E1C824 */ and $t9, $t7, $at /* 085190 80084590 1320000F */ beqz $t9, .L800845D0 diff --git a/asm/non_matchings/unknown_080500/MenuTrophyRaceRoundInit.s b/asm/non_matchings/unknown_080500/MenuTrophyRaceRoundInit.s index 122bcd55..99b68125 100644 --- a/asm/non_matchings/unknown_080500/MenuTrophyRaceRoundInit.s +++ b/asm/non_matchings/unknown_080500/MenuTrophyRaceRoundInit.s @@ -50,8 +50,8 @@ glabel MenuTrophyRaceRoundInit /* 098F1C 8009831C 8E690000 */ lw $t1, ($s3) /* 098F20 80098320 00008825 */ move $s1, $zero /* 098F24 80098324 1920000A */ blez $t1, .L80098350 -/* 098F28 80098328 3C128012 */ lui $s2, %hi(p1_vehicle) # $s2, 0x8012 -/* 098F2C 8009832C 265269C0 */ addiu $s2, %lo(p1_vehicle) # addiu $s2, $s2, 0x69c0 +/* 098F28 80098328 3C128012 */ lui $s2, %hi(gPlayerVehicle) # $s2, 0x8012 +/* 098F2C 8009832C 265269C0 */ addiu $s2, %lo(gPlayerVehicle) # addiu $s2, $s2, 0x69c0 .L80098330: /* 098F30 80098330 0C01AC2B */ jal func_8006B0AC /* 098F34 80098334 02002025 */ move $a0, $s0 diff --git a/asm/non_matchings/unknown_080500/func_8007F900.s b/asm/non_matchings/unknown_080500/func_8007F900.s index 8d6f187b..0ce18a38 100644 --- a/asm/non_matchings/unknown_080500/func_8007F900.s +++ b/asm/non_matchings/unknown_080500/func_8007F900.s @@ -126,7 +126,7 @@ glabel func_8007F900 /* 0806D0 8007FAD0 00000000 */ nop /* 0806D4 8007FAD4 AD2B0114 */ sw $t3, 0x114($t1) /* 0806D8 8007FAD8 8C8C007C */ lw $t4, 0x7c($a0) -/* 0806DC 8007FADC 3C0B8012 */ lui $t3, %hi(D_8012644C) # $t3, 0x8012 +/* 0806DC 8007FADC 3C0B8012 */ lui $t3, %hi(D_80126448+4) # $t3, 0x8012 /* 0806E0 8007FAE0 AD2C0134 */ sw $t4, 0x134($t1) /* 0806E4 8007FAE4 8C8D0080 */ lw $t5, 0x80($a0) /* 0806E8 8007FAE8 00000000 */ nop @@ -143,7 +143,7 @@ glabel func_8007F900 /* 080714 8007FB14 8C990088 */ lw $t9, 0x88($a0) /* 080718 8007FB18 00000000 */ nop /* 08071C 8007FB1C AC590000 */ sw $t9, ($v0) -/* 080720 8007FB20 8D6B644C */ lw $t3, %lo(D_8012644C)($t3) +/* 080720 8007FB20 8D6B644C */ lw $t3, %lo(D_80126448+4)($t3) /* 080724 8007FB24 00000000 */ nop /* 080728 8007FB28 01616824 */ and $t5, $t3, $at /* 08072C 8007FB2C 11A00004 */ beqz $t5, .L8007FB40 diff --git a/asm/non_matchings/unknown_080500/func_80081218.s b/asm/non_matchings/unknown_080500/func_80081218.s index 16bc0f5f..7e12e3cb 100644 --- a/asm/non_matchings/unknown_080500/func_80081218.s +++ b/asm/non_matchings/unknown_080500/func_80081218.s @@ -20,7 +20,7 @@ glabel func_80081218 /* 081E60 80081260 3C048012 */ lui $a0, %hi(D_80126530) # $a0, 0x8012 /* 081E64 80081264 24846530 */ addiu $a0, %lo(D_80126530) # addiu $a0, $a0, 0x6530 /* 081E68 80081268 AC820000 */ sw $v0, ($a0) -/* 081E6C 8008126C 3C018012 */ lui $at, %hi(D_80126534) # $at, 0x8012 +/* 081E6C 8008126C 3C018012 */ lui $at, %hi(D_80126530+4) # $at, 0x8012 /* 081E70 80081270 AC226530 */ sw $v0, %lo(D_80126530)($at) /* 081E74 80081274 3C098012 */ lui $t1, %hi(D_80126530) # $t1, 0x8012 /* 081E78 80081278 8D296530 */ lw $t1, %lo(D_80126530)($t1) @@ -30,35 +30,35 @@ glabel func_80081218 /* 081E88 80081288 3C0B8012 */ lui $t3, %hi(D_80126530) # $t3, 0x8012 /* 081E8C 8008128C AD2A0004 */ sw $t2, 4($t1) /* 081E90 80081290 8D6B6530 */ lw $t3, %lo(D_80126530)($t3) -/* 081E94 80081294 3C188012 */ lui $t8, %hi(D_80126534) # $t8, 0x8012 +/* 081E94 80081294 3C188012 */ lui $t8, %hi(D_80126530+4) # $t8, 0x8012 /* 081E98 80081298 8D6C0004 */ lw $t4, 4($t3) -/* 081E9C 8008129C 3C088012 */ lui $t0, %hi(D_80126534) # $t0, 0x8012 +/* 081E9C 8008129C 3C088012 */ lui $t0, %hi(D_80126530+4) # $t0, 0x8012 /* 081EA0 800812A0 01866821 */ addu $t5, $t4, $a2 /* 081EA4 800812A4 AD6D0000 */ sw $t5, ($t3) /* 081EA8 800812A8 8C8E0000 */ lw $t6, ($a0) /* 081EAC 800812AC 00E71821 */ addu $v1, $a3, $a3 /* 081EB0 800812B0 01C77821 */ addu $t7, $t6, $a3 -/* 081EB4 800812B4 AC2F6534 */ sw $t7, %lo(D_80126534)($at) -/* 081EB8 800812B8 8F186534 */ lw $t8, %lo(D_80126534)($t8) -/* 081EBC 800812BC 3C018012 */ lui $at, %hi(D_8012653C) # $at, 0x8012 +/* 081EB4 800812B4 AC2F6534 */ sw $t7, %lo(D_80126530+4)($at) +/* 081EB8 800812B8 8F186534 */ lw $t8, %lo(D_80126530+4)($t8) +/* 081EBC 800812BC 3C018012 */ lui $at, %hi(D_80126530+12) # $at, 0x8012 /* 081EC0 800812C0 27190118 */ addiu $t9, $t8, 0x118 /* 081EC4 800812C4 AF190004 */ sw $t9, 4($t8) -/* 081EC8 800812C8 8D086534 */ lw $t0, %lo(D_80126534)($t0) -/* 081ECC 800812CC 3C0B8012 */ lui $t3, %hi(D_80126538) # $t3, 0x8012 +/* 081EC8 800812C8 8D086534 */ lw $t0, %lo(D_80126530+4)($t0) +/* 081ECC 800812CC 3C0B8012 */ lui $t3, %hi(D_80126530+8) # $t3, 0x8012 /* 081ED0 800812D0 8D0A0004 */ lw $t2, 4($t0) -/* 081ED4 800812D4 3C0F8012 */ lui $t7, %hi(D_80126538) # $t7, 0x8012 +/* 081ED4 800812D4 3C0F8012 */ lui $t7, %hi(D_80126530+8) # $t7, 0x8012 /* 081ED8 800812D8 01464821 */ addu $t1, $t2, $a2 /* 081EDC 800812DC AD090000 */ sw $t1, ($t0) /* 081EE0 800812E0 8C8C0000 */ lw $t4, ($a0) -/* 081EE4 800812E4 3C088012 */ lui $t0, %hi(D_8012653C) # $t0, 0x8012 +/* 081EE4 800812E4 3C088012 */ lui $t0, %hi(D_80126530+12) # $t0, 0x8012 /* 081EE8 800812E8 01836821 */ addu $t5, $t4, $v1 -/* 081EEC 800812EC AC2D6538 */ sw $t5, %lo(D_80126538)($at) -/* 081EF0 800812F0 8D6B6538 */ lw $t3, %lo(D_80126538)($t3) +/* 081EEC 800812EC AC2D6538 */ sw $t5, %lo(D_80126530+8)($at) +/* 081EF0 800812F0 8D6B6538 */ lw $t3, %lo(D_80126530+8)($t3) /* 081EF4 800812F4 00671821 */ addu $v1, $v1, $a3 /* 081EF8 800812F8 256E0118 */ addiu $t6, $t3, 0x118 /* 081EFC 800812FC AD6E0004 */ sw $t6, 4($t3) -/* 081F00 80081300 8DEF6538 */ lw $t7, %lo(D_80126538)($t7) -/* 081F04 80081304 3C0D8012 */ lui $t5, %hi(D_8012653C) # $t5, 0x8012 +/* 081F00 80081300 8DEF6538 */ lw $t7, %lo(D_80126530+8)($t7) +/* 081F04 80081304 3C0D8012 */ lui $t5, %hi(D_80126530+12) # $t5, 0x8012 /* 081F08 80081308 8DF90004 */ lw $t9, 4($t7) /* 081F0C 8008130C 00000000 */ nop /* 081F10 80081310 0326C021 */ addu $t8, $t9, $a2 @@ -66,12 +66,12 @@ glabel func_80081218 /* 081F18 80081318 8C8A0000 */ lw $t2, ($a0) /* 081F1C 8008131C 24040041 */ li $a0, 65 /* 081F20 80081320 01434821 */ addu $t1, $t2, $v1 -/* 081F24 80081324 AC29653C */ sw $t1, %lo(D_8012653C)($at) -/* 081F28 80081328 8D08653C */ lw $t0, %lo(D_8012653C)($t0) +/* 081F24 80081324 AC29653C */ sw $t1, %lo(D_80126530+12)($at) +/* 081F28 80081328 8D08653C */ lw $t0, %lo(D_80126530+12)($t0) /* 081F2C 8008132C 00000000 */ nop /* 081F30 80081330 250C0118 */ addiu $t4, $t0, 0x118 /* 081F34 80081334 AD0C0004 */ sw $t4, 4($t0) -/* 081F38 80081338 8DAD653C */ lw $t5, %lo(D_8012653C)($t5) +/* 081F38 80081338 8DAD653C */ lw $t5, %lo(D_80126530+12)($t5) /* 081F3C 8008133C 00000000 */ nop /* 081F40 80081340 8DAE0004 */ lw $t6, 4($t5) /* 081F44 80081344 00000000 */ nop diff --git a/asm/non_matchings/unknown_080500/func_800862C4.s b/asm/non_matchings/unknown_080500/func_800862C4.s index f0914be9..43f4130a 100644 --- a/asm/non_matchings/unknown_080500/func_800862C4.s +++ b/asm/non_matchings/unknown_080500/func_800862C4.s @@ -3,9 +3,9 @@ glabel func_800862C4 /* 086EC8 800862C8 AFB60038 */ sw $s6, 0x38($sp) /* 086ECC 800862CC AFB20028 */ sw $s2, 0x28($sp) /* 086ED0 800862D0 3C128012 */ lui $s2, %hi(D_80126A08) # $s2, 0x8012 -/* 086ED4 800862D4 3C168012 */ lui $s6, %hi(D_8012653C) # $s6, 0x8012 +/* 086ED4 800862D4 3C168012 */ lui $s6, %hi(D_80126530+12) # $s6, 0x8012 /* 086ED8 800862D8 26526A08 */ addiu $s2, %lo(D_80126A08) # addiu $s2, $s2, 0x6a08 -/* 086EDC 800862DC 8ED6653C */ lw $s6, %lo(D_8012653C)($s6) +/* 086EDC 800862DC 8ED6653C */ lw $s6, %lo(D_80126530+12)($s6) /* 086EE0 800862E0 AE400000 */ sw $zero, ($s2) /* 086EE4 800862E4 3C018012 */ lui $at, %hi(D_80126BD4) # $at, 0x8012 /* 086EE8 800862E8 44802000 */ mtc1 $zero, $f4 diff --git a/asm/non_matchings/unknown_080500/func_8008D5F8.s b/asm/non_matchings/unknown_080500/func_8008D5F8.s index bcfd2b0c..2e37b253 100644 --- a/asm/non_matchings/unknown_080500/func_8008D5F8.s +++ b/asm/non_matchings/unknown_080500/func_8008D5F8.s @@ -18,13 +18,13 @@ glabel func_8008D5F8 /* 08E238 8008D638 AFA60020 */ sw $a2, 0x20($sp) /* 08E23C 8008D63C 0C01A955 */ jal func_8006A554 /* 08E240 8008D640 AFA7001C */ sw $a3, 0x1c($sp) -/* 08E244 8008D644 3C0F8012 */ lui $t7, %hi(D_8012645D) # $t7, 0x8012 -/* 08E248 8008D648 3C188012 */ lui $t8, %hi(D_80126465) # $t8, 0x8012 +/* 08E244 8008D644 3C0F8012 */ lui $t7, %hi(D_8012645C+1) # $t7, 0x8012 +/* 08E248 8008D648 3C188012 */ lui $t8, %hi(D_80126464+1) # $t8, 0x8012 /* 08E24C 8008D64C 8FA30024 */ lw $v1, 0x24($sp) /* 08E250 8008D650 8FA60020 */ lw $a2, 0x20($sp) /* 08E254 8008D654 8FA7001C */ lw $a3, 0x1c($sp) -/* 08E258 8008D658 81EF645D */ lb $t7, %lo(D_8012645D)($t7) -/* 08E25C 8008D65C 83186465 */ lb $t8, %lo(D_80126465)($t8) +/* 08E258 8008D658 81EF645D */ lb $t7, %lo(D_8012645C+1)($t7) +/* 08E25C 8008D65C 83186465 */ lb $t8, %lo(D_80126464+1)($t8) /* 08E260 8008D660 24080002 */ li $t0, 2 /* 08E264 8008D664 00621825 */ or $v1, $v1, $v0 /* 08E268 8008D668 00CF3021 */ addu $a2, $a2, $t7 diff --git a/asm/non_matchings/unknown_080500/func_8008D8BC.s b/asm/non_matchings/unknown_080500/func_8008D8BC.s index e54cef79..86385bdc 100644 --- a/asm/non_matchings/unknown_080500/func_8008D8BC.s +++ b/asm/non_matchings/unknown_080500/func_8008D8BC.s @@ -17,10 +17,10 @@ glabel func_8008D8BC /* 08E4F8 8008D8F8 AFA20028 */ sw $v0, 0x28($sp) /* 08E4FC 8008D8FC 0C01A955 */ jal func_8006A554 /* 08E500 8008D900 AFA50024 */ sw $a1, 0x24($sp) -/* 08E504 8008D904 3C0F8012 */ lui $t7, %hi(D_8012645D) # $t7, 0x8012 +/* 08E504 8008D904 3C0F8012 */ lui $t7, %hi(D_8012645C+1) # $t7, 0x8012 /* 08E508 8008D908 8FA30028 */ lw $v1, 0x28($sp) /* 08E50C 8008D90C 8FA50024 */ lw $a1, 0x24($sp) -/* 08E510 8008D910 81EF645D */ lb $t7, %lo(D_8012645D)($t7) +/* 08E510 8008D910 81EF645D */ lb $t7, %lo(D_8012645C+1)($t7) /* 08E514 8008D914 00621825 */ or $v1, $v1, $v0 /* 08E518 8008D918 00AF2821 */ addu $a1, $a1, $t7 .L8008D91C: diff --git a/asm/non_matchings/unknown_080500/func_8008DC7C.s b/asm/non_matchings/unknown_080500/func_8008DC7C.s index 16aa02c3..186d7b01 100644 --- a/asm/non_matchings/unknown_080500/func_8008DC7C.s +++ b/asm/non_matchings/unknown_080500/func_8008DC7C.s @@ -15,10 +15,10 @@ glabel func_8008DC7C /* 08E8B0 8008DCB0 AFA2001C */ sw $v0, 0x1c($sp) /* 08E8B4 8008DCB4 0C01A955 */ jal func_8006A554 /* 08E8B8 8008DCB8 AFA50018 */ sw $a1, 0x18($sp) -/* 08E8BC 8008DCBC 3C0F8012 */ lui $t7, %hi(D_8012645D) # $t7, 0x8012 +/* 08E8BC 8008DCBC 3C0F8012 */ lui $t7, %hi(D_8012645C+1) # $t7, 0x8012 /* 08E8C0 8008DCC0 8FA3001C */ lw $v1, 0x1c($sp) /* 08E8C4 8008DCC4 8FA50018 */ lw $a1, 0x18($sp) -/* 08E8C8 8008DCC8 81EF645D */ lb $t7, %lo(D_8012645D)($t7) +/* 08E8C8 8008DCC8 81EF645D */ lb $t7, %lo(D_8012645C+1)($t7) /* 08E8CC 8008DCCC 00621825 */ or $v1, $v1, $v0 /* 08E8D0 8008DCD0 00AF2821 */ addu $a1, $a1, $t7 .L8008DCD4: diff --git a/asm/non_matchings/unknown_080500/func_8008F00C.s b/asm/non_matchings/unknown_080500/func_8008F00C.s index 4900eef6..23eb4373 100644 --- a/asm/non_matchings/unknown_080500/func_8008F00C.s +++ b/asm/non_matchings/unknown_080500/func_8008F00C.s @@ -48,8 +48,8 @@ glabel func_8008F00C /* 08FCB8 8008F0B8 3C048012 */ lui $a0, %hi(D_801269C4) # $a0, 0x8012 /* 08FCBC 8008F0BC 18C0000B */ blez $a2, .L8008F0EC /* 08FCC0 8008F0C0 24180001 */ li $t8, 1 -/* 08FCC4 8008F0C4 3C0F8012 */ lui $t7, %hi(p1_vehicle) # $t7, 0x8012 -/* 08FCC8 8008F0C8 25E369C0 */ addiu $v1, $t7, %lo(p1_vehicle) +/* 08FCC4 8008F0C4 3C0F8012 */ lui $t7, %hi(gPlayerVehicle) # $t7, 0x8012 +/* 08FCC8 8008F0C8 25E369C0 */ addiu $v1, $t7, %lo(gPlayerVehicle) /* 08FCCC 8008F0CC 00C32821 */ addu $a1, $a2, $v1 /* 08FCD0 8008F0D0 248469C4 */ addiu $a0, %lo(D_801269C4) # addiu $a0, $a0, 0x69c4 .L8008F0D4: diff --git a/asm/non_matchings/unknown_080500/func_8008FF1C.s b/asm/non_matchings/unknown_080500/func_8008FF1C.s index 75591292..72129030 100644 --- a/asm/non_matchings/unknown_080500/func_8008FF1C.s +++ b/asm/non_matchings/unknown_080500/func_8008FF1C.s @@ -335,11 +335,11 @@ glabel func_8008FF1C /* 091000 80090400 3C018012 */ lui $at, %hi(D_801269F0) # $at, 0x8012 /* 091004 80090404 3C108012 */ lui $s0, %hi(D_80126930) # $s0, 0x8012 /* 091008 80090408 3C14800E */ lui $s4, %hi(D_800E05F4) # $s4, 0x800e -/* 09100C 8009040C 3C138012 */ lui $s3, %hi(p1_vehicle) # $s3, 0x8012 +/* 09100C 8009040C 3C138012 */ lui $s3, %hi(gPlayerVehicle) # $s3, 0x8012 /* 091010 80090410 3C12800E */ lui $s2, %hi(D_800E05D4) # $s2, 0x800e /* 091014 80090414 AC2069F0 */ sw $zero, %lo(D_801269F0)($at) /* 091018 80090418 265205D4 */ addiu $s2, %lo(D_800E05D4) # addiu $s2, $s2, 0x5d4 -/* 09101C 8009041C 267369C0 */ addiu $s3, %lo(p1_vehicle) # addiu $s3, $s3, 0x69c0 +/* 09101C 8009041C 267369C0 */ addiu $s3, %lo(gPlayerVehicle) # addiu $s3, $s3, 0x69c0 /* 091020 80090420 269405F4 */ addiu $s4, %lo(D_800E05F4) # addiu $s4, $s4, 0x5f4 /* 091024 80090424 26106930 */ addiu $s0, %lo(D_80126930) # addiu $s0, $s0, 0x6930 /* 091028 80090428 AFA0007C */ sw $zero, 0x7c($sp) diff --git a/asm/non_matchings/unknown_080500/func_80090F30.s b/asm/non_matchings/unknown_080500/func_80090F30.s index e73a5d9b..708e7fab 100644 --- a/asm/non_matchings/unknown_080500/func_80090F30.s +++ b/asm/non_matchings/unknown_080500/func_80090F30.s @@ -352,8 +352,8 @@ glabel func_80090F30 /* 092040 80091440 24070060 */ li $a3, 96 /* 092044 80091444 0C0310E1 */ jal func_800C4384 /* 092048 80091448 AFAE0010 */ sw $t6, 0x10($sp) -/* 09204C 8009144C 3C188012 */ lui $t8, %hi(p1_vehicle) # $t8, 0x8012 -/* 092050 80091450 831869C0 */ lb $t8, %lo(p1_vehicle)($t8) +/* 09204C 8009144C 3C188012 */ lui $t8, %hi(gPlayerVehicle) # $t8, 0x8012 +/* 092050 80091450 831869C0 */ lb $t8, %lo(gPlayerVehicle)($t8) /* 092054 80091454 8FAF0070 */ lw $t7, 0x70($sp) /* 092058 80091458 3C09800E */ lui $t1, %hi(D_800DF4C4) # $t1, 0x800e /* 09205C 8009145C 0018C880 */ sll $t9, $t8, 2 @@ -375,8 +375,8 @@ glabel func_80090F30 /* 09209C 8009149C 02003025 */ move $a2, $s0 /* 0920A0 800914A0 0C031110 */ jal func_800C4440 /* 0920A4 800914A4 02203825 */ move $a3, $s1 -/* 0920A8 800914A8 3C188012 */ lui $t8, %hi(p1_vehicle) # $t8, 0x8012 -/* 0920AC 800914AC 831869C0 */ lb $t8, %lo(p1_vehicle)($t8) +/* 0920A8 800914A8 3C188012 */ lui $t8, %hi(gPlayerVehicle) # $t8, 0x8012 +/* 0920AC 800914AC 831869C0 */ lb $t8, %lo(gPlayerVehicle)($t8) /* 0920B0 800914B0 8FAE0070 */ lw $t6, 0x70($sp) /* 0920B4 800914B4 3C09800E */ lui $t1, %hi(D_800DF4C4) # $t1, 0x800e /* 0920B8 800914B8 00187880 */ sll $t7, $t8, 2 @@ -397,8 +397,8 @@ glabel func_80090F30 /* 0920F4 800914F4 02403025 */ move $a2, $s2 /* 0920F8 800914F8 0C031110 */ jal func_800C4440 /* 0920FC 800914FC 02203825 */ move $a3, $s1 -/* 092100 80091500 3C188012 */ lui $t8, %hi(p1_vehicle) # $t8, 0x8012 -/* 092104 80091504 831869C0 */ lb $t8, %lo(p1_vehicle)($t8) +/* 092100 80091500 3C188012 */ lui $t8, %hi(gPlayerVehicle) # $t8, 0x8012 +/* 092104 80091504 831869C0 */ lb $t8, %lo(gPlayerVehicle)($t8) /* 092108 80091508 8FAD0070 */ lw $t5, 0x70($sp) /* 09210C 8009150C 3C09800E */ lui $t1, %hi(D_800DF4C4) # $t1, 0x800e /* 092110 80091510 00187080 */ sll $t6, $t8, 2 @@ -417,8 +417,8 @@ glabel func_80090F30 /* 092144 80091544 24060035 */ li $a2, 53 /* 092148 80091548 0C020600 */ jal func_80081800 /* 09214C 8009154C 24070080 */ li $a3, 128 -/* 092150 80091550 3C0D8012 */ lui $t5, %hi(p1_vehicle) # $t5, 0x8012 -/* 092154 80091554 81AD69C0 */ lb $t5, %lo(p1_vehicle)($t5) +/* 092150 80091550 3C0D8012 */ lui $t5, %hi(gPlayerVehicle) # $t5, 0x8012 +/* 092154 80091554 81AD69C0 */ lb $t5, %lo(gPlayerVehicle)($t5) /* 092158 80091558 8FB80070 */ lw $t8, 0x70($sp) /* 09215C 8009155C 3C19800E */ lui $t9, %hi(D_800DF4C4) # $t9, 0x800e /* 092160 80091560 000D7080 */ sll $t6, $t5, 2 @@ -664,10 +664,10 @@ glabel func_80090F30 /* 0924E8 800918E8 258C06B0 */ addiu $t4, %lo(D_800E06B0) # addiu $t4, $t4, 0x6b0 /* 0924EC 800918EC 254A0624 */ addiu $t2, %lo(D_800E0624) # addiu $t2, $t2, 0x624 /* 0924F0 800918F0 00094080 */ sll $t0, $t1, 2 -/* 0924F4 800918F4 3C118012 */ lui $s1, %hi(p1_vehicle) # $s1, 0x8012 +/* 0924F4 800918F4 3C118012 */ lui $s1, %hi(gPlayerVehicle) # $s1, 0x8012 /* 0924F8 800918F8 00135840 */ sll $t3, $s3, 1 /* 0924FC 800918FC 016C8021 */ addu $s0, $t3, $t4 -/* 092500 80091900 263169C0 */ addiu $s1, %lo(p1_vehicle) # addiu $s1, $s1, 0x69c0 +/* 092500 80091900 263169C0 */ addiu $s1, %lo(gPlayerVehicle) # addiu $s1, $s1, 0x69c0 /* 092504 80091904 010A9021 */ addu $s2, $t0, $t2 .L80091908: /* 092508 80091908 822D0000 */ lb $t5, ($s1) @@ -750,8 +750,8 @@ glabel func_80090F30 /* 092624 80091A24 8FAF007C */ lw $t7, 0x7c($sp) /* 092628 80091A28 8FB00080 */ lw $s0, 0x80($sp) .L80091A2C: -/* 09262C 80091A2C 3C038012 */ lui $v1, %hi(p1_vehicle) # $v1, 0x8012 -/* 092630 80091A30 806369C0 */ lb $v1, %lo(p1_vehicle)($v1) +/* 09262C 80091A2C 3C038012 */ lui $v1, %hi(gPlayerVehicle) # $v1, 0x8012 +/* 092630 80091A30 806369C0 */ lb $v1, %lo(gPlayerVehicle)($v1) /* 092634 80091A34 24010002 */ li $at, 2 /* 092638 80091A38 2610008B */ addiu $s0, $s0, 0x8b /* 09263C 80091A3C 24160003 */ li $s6, 3 @@ -821,10 +821,10 @@ glabel func_80090F30 /* 092730 80091B30 14410031 */ bne $v0, $at, .L80091BF8 /* 092734 80091B34 26310624 */ addiu $s1, %lo(D_800E0624) # addiu $s1, $s1, 0x624 /* 092738 80091B38 8FAA0074 */ lw $t2, 0x74($sp) -/* 09273C 80091B3C 3C088012 */ lui $t0, %hi(p1_vehicle) # $t0, 0x8012 +/* 09273C 80091B3C 3C088012 */ lui $t0, %hi(gPlayerVehicle) # $t0, 0x8012 /* 092740 80091B40 1540002D */ bnez $t2, .L80091BF8 /* 092744 80091B44 00000000 */ nop -/* 092748 80091B48 810869C0 */ lb $t0, %lo(p1_vehicle)($t0) +/* 092748 80091B48 810869C0 */ lb $t0, %lo(gPlayerVehicle)($t0) /* 09274C 80091B4C 8FD90000 */ lw $t9, ($fp) /* 092750 80091B50 01160019 */ multu $t0, $s6 /* 092754 80091B54 3C048012 */ lui $a0, %hi(D_801263A0) # $a0, 0x8012 @@ -844,8 +844,8 @@ glabel func_80090F30 /* 09278C 80091B8C AFB80010 */ sw $t8, 0x10($sp) /* 092790 80091B90 0C01E2AE */ jal func_80078AB8 /* 092794 80091B94 AFB9001C */ sw $t9, 0x1c($sp) -/* 092798 80091B98 3C028012 */ lui $v0, %hi(p2_vehicle) # $v0, 0x8012 -/* 09279C 80091B9C 804269C1 */ lb $v0, %lo(p2_vehicle)($v0) +/* 092798 80091B98 3C028012 */ lui $v0, %hi(gPlayerVehicle+1) # $v0, 0x8012 +/* 09279C 80091B9C 804269C1 */ lb $v0, %lo(gPlayerVehicle+1)($v0) /* 0927A0 80091BA0 24010002 */ li $at, 2 /* 0927A4 80091BA4 14410002 */ bne $v0, $at, .L80091BB0 /* 0927A8 80091BA8 00000000 */ nop diff --git a/asm/non_matchings/unknown_080500/func_80092188.s b/asm/non_matchings/unknown_080500/func_80092188.s index 2d3317a0..1fa5d86b 100644 --- a/asm/non_matchings/unknown_080500/func_80092188.s +++ b/asm/non_matchings/unknown_080500/func_80092188.s @@ -329,10 +329,10 @@ glabel L8009251C /* 093230 80092630 000FC080 */ sll $t8, $t7, 2 /* 093234 80092634 03387021 */ addu $t6, $t9, $t8 /* 093238 80092638 8DCF0000 */ lw $t7, ($t6) -/* 09323C 8009263C 3C188012 */ lui $t8, %hi(p1_vehicle) # $t8, 0x8012 +/* 09323C 8009263C 3C188012 */ lui $t8, %hi(gPlayerVehicle) # $t8, 0x8012 /* 093240 80092640 31F90002 */ andi $t9, $t7, 2 /* 093244 80092644 13200027 */ beqz $t9, .L800926E4 -/* 093248 80092648 271869C0 */ addiu $t8, %lo(p1_vehicle) # addiu $t8, $t8, 0x69c0 +/* 093248 80092648 271869C0 */ addiu $t8, %lo(gPlayerVehicle) # addiu $t8, $t8, 0x69c0 /* 09324C 8009264C 00057040 */ sll $t6, $a1, 1 /* 093250 80092650 3C068012 */ lui $a2, %hi(D_80126830) # $a2, 0x8012 /* 093254 80092654 00B81821 */ addu $v1, $a1, $t8 @@ -700,8 +700,8 @@ glabel L8009287C /* 093760 80092B60 0C000741 */ jal func_80001D04 /* 093764 80092B64 00002825 */ move $a1, $zero .L80092B68: -/* 093768 80092B68 3C048012 */ lui $a0, %hi(p1_vehicle) # $a0, 0x8012 -/* 09376C 80092B6C 808469C0 */ lb $a0, %lo(p1_vehicle)($a0) +/* 093768 80092B68 3C048012 */ lui $a0, %hi(gPlayerVehicle) # $a0, 0x8012 +/* 09376C 80092B6C 808469C0 */ lb $a0, %lo(gPlayerVehicle)($a0) /* 093770 80092B70 0C01B6C5 */ jal func_8006DB14 /* 093774 80092B74 00000000 */ nop /* 093778 80092B78 3C0E800E */ lui $t6, %hi(D_800DF4BC) # $t6, 0x800e diff --git a/asm/non_matchings/unknown_080500/func_80092E94.s b/asm/non_matchings/unknown_080500/func_80092E94.s index 791b120b..ce229fb0 100644 --- a/asm/non_matchings/unknown_080500/func_80092E94.s +++ b/asm/non_matchings/unknown_080500/func_80092E94.s @@ -159,8 +159,8 @@ glabel func_80092E94 /* 093D00 80093100 240600FF */ li $a2, 255 /* 093D04 80093104 0C0310E1 */ jal func_800C4384 /* 093D08 80093108 24070060 */ li $a3, 96 -/* 093D0C 8009310C 3C098012 */ lui $t1, %hi(p1_vehicle) # $t1, 0x8012 -/* 093D10 80093110 812969C0 */ lb $t1, %lo(p1_vehicle)($t1) +/* 093D0C 8009310C 3C098012 */ lui $t1, %hi(gPlayerVehicle) # $t1, 0x8012 +/* 093D10 80093110 812969C0 */ lb $t1, %lo(gPlayerVehicle)($t1) /* 093D14 80093114 8FA80050 */ lw $t0, 0x50($sp) /* 093D18 80093118 00095080 */ sll $t2, $t1, 2 /* 093D1C 8009311C 8FB10058 */ lw $s1, 0x58($sp) @@ -180,8 +180,8 @@ glabel func_80092E94 /* 093D54 80093154 02003025 */ move $a2, $s0 /* 093D58 80093158 0C031110 */ jal func_800C4440 /* 093D5C 8009315C 27A70054 */ addiu $a3, $sp, 0x54 -/* 093D60 80093160 3C188012 */ lui $t8, %hi(p1_vehicle) # $t8, 0x8012 -/* 093D64 80093164 831869C0 */ lb $t8, %lo(p1_vehicle)($t8) +/* 093D60 80093160 3C188012 */ lui $t8, %hi(gPlayerVehicle) # $t8, 0x8012 +/* 093D64 80093164 831869C0 */ lb $t8, %lo(gPlayerVehicle)($t8) /* 093D68 80093168 8FAF0050 */ lw $t7, 0x50($sp) /* 093D6C 8009316C 0018C880 */ sll $t9, $t8, 2 /* 093D70 80093170 01F94821 */ addu $t1, $t7, $t9 @@ -201,8 +201,8 @@ glabel func_80092E94 /* 093DA8 800931A8 02003825 */ move $a3, $s0 /* 093DAC 800931AC 8FA20050 */ lw $v0, 0x50($sp) /* 093DB0 800931B0 3C0D800E */ lui $t5, %hi(D_800DF4C4) # $t5, 0x800e -/* 093DB4 800931B4 3C198012 */ lui $t9, %hi(p1_vehicle) # $t9, 0x8012 -/* 093DB8 800931B8 833969C0 */ lb $t9, %lo(p1_vehicle)($t9) +/* 093DB4 800931B4 3C198012 */ lui $t9, %hi(gPlayerVehicle) # $t9, 0x8012 +/* 093DB8 800931B8 833969C0 */ lb $t9, %lo(gPlayerVehicle)($t9) /* 093DBC 800931BC 8DADF4C4 */ lw $t5, %lo(D_800DF4C4)($t5) /* 093DC0 800931C0 8C4C004C */ lw $t4, 0x4c($v0) /* 093DC4 800931C4 00194880 */ sll $t1, $t9, 2 @@ -223,10 +223,10 @@ glabel func_80092E94 /* 093E00 80093200 0C020600 */ jal func_80081800 /* 093E04 80093204 24070080 */ li $a3, 128 /* 093E08 80093208 8FAE0050 */ lw $t6, 0x50($sp) -/* 093E0C 8009320C 3C188012 */ lui $t8, %hi(p1_vehicle) # $t8, 0x8012 +/* 093E0C 8009320C 3C188012 */ lui $t8, %hi(gPlayerVehicle) # $t8, 0x8012 /* 093E10 80093210 3C0F800E */ lui $t7, %hi(D_800DF4C4) # $t7, 0x800e /* 093E14 80093214 8DEFF4C4 */ lw $t7, %lo(D_800DF4C4)($t7) -/* 093E18 80093218 831869C0 */ lb $t8, %lo(p1_vehicle)($t8) +/* 093E18 80093218 831869C0 */ lb $t8, %lo(gPlayerVehicle)($t8) /* 093E1C 8009321C 8DCA004C */ lw $t2, 0x4c($t6) /* 093E20 80093220 0018C880 */ sll $t9, $t8, 2 /* 093E24 80093224 014F5821 */ addu $t3, $t2, $t7 @@ -313,8 +313,8 @@ glabel func_80092E94 /* 093F58 80093358 01EB6024 */ and $t4, $t7, $t3 /* 093F5C 8009335C 11800025 */ beqz $t4, .L800933F4 /* 093F60 80093360 00104080 */ sll $t0, $s0, 2 -/* 093F64 80093364 3C198012 */ lui $t9, %hi(p1_vehicle) # $t9, 0x8012 -/* 093F68 80093368 833969C0 */ lb $t9, %lo(p1_vehicle)($t9) +/* 093F64 80093364 3C198012 */ lui $t9, %hi(gPlayerVehicle) # $t9, 0x8012 +/* 093F68 80093368 833969C0 */ lb $t9, %lo(gPlayerVehicle)($t9) /* 093F6C 8009336C 01104023 */ subu $t0, $t0, $s0 /* 093F70 80093370 3C18800E */ lui $t8, %hi(D_800E0624) # $t8, 0x800e /* 093F74 80093374 27180624 */ addiu $t8, %lo(D_800E0624) # addiu $t8, $t8, 0x624 @@ -355,8 +355,8 @@ glabel func_80092E94 /* 093FF8 800933F8 24010003 */ li $at, 3 /* 093FFC 800933FC 1601FFC8 */ bne $s0, $at, .L80093320 /* 094000 80093400 8FAE007C */ lw $t6, 0x7c($sp) -/* 094004 80093404 3C028012 */ lui $v0, %hi(p1_vehicle) # $v0, 0x8012 -/* 094008 80093408 804269C0 */ lb $v0, %lo(p1_vehicle)($v0) +/* 094004 80093404 3C028012 */ lui $v0, %hi(gPlayerVehicle) # $v0, 0x8012 +/* 094008 80093408 804269C0 */ lb $v0, %lo(gPlayerVehicle)($v0) /* 09400C 8009340C 8FB10040 */ lw $s1, 0x40($sp) /* 094010 80093410 24010002 */ li $at, 2 /* 094014 80093414 14410002 */ bne $v0, $at, .L80093420 diff --git a/asm/non_matchings/unknown_080500/func_80095728.s b/asm/non_matchings/unknown_080500/func_80095728.s index 312c9350..115ce018 100644 --- a/asm/non_matchings/unknown_080500/func_80095728.s +++ b/asm/non_matchings/unknown_080500/func_80095728.s @@ -306,8 +306,8 @@ glabel L80095B34 /* 096780 80095B80 3C013F00 */ lui $at, 0x3f00 /* 096784 80095B84 11C0005B */ beqz $t6, .L80095CF4 /* 096788 80095B88 240D0003 */ li $t5, 3 -/* 09678C 80095B8C 3C0F8012 */ lui $t7, %hi(p1_vehicle) # $t7, 0x8012 -/* 096790 80095B90 81EF69C0 */ lb $t7, %lo(p1_vehicle)($t7) +/* 09678C 80095B8C 3C0F8012 */ lui $t7, %hi(gPlayerVehicle) # $t7, 0x8012 +/* 096790 80095B90 81EF69C0 */ lb $t7, %lo(gPlayerVehicle)($t7) /* 096794 80095B94 90EC0049 */ lbu $t4, 0x49($a3) /* 096798 80095B98 000FC080 */ sll $t8, $t7, 2 /* 09679C 80095B9C 00F81021 */ addu $v0, $a3, $t8 @@ -331,9 +331,9 @@ glabel L80095B34 /* 0967E4 80095BE4 24A56390 */ addiu $a1, %lo(D_80126390) # addiu $a1, $a1, 0x6390 /* 0967E8 80095BE8 0C025DBE */ jal func_800976F8 /* 0967EC 80095BEC 24060003 */ li $a2, 3 -/* 0967F0 80095BF0 3C0C8012 */ lui $t4, %hi(p1_vehicle) # $t4, 0x8012 +/* 0967F0 80095BF0 3C0C8012 */ lui $t4, %hi(gPlayerVehicle) # $t4, 0x8012 /* 0967F4 80095BF4 8FA2002C */ lw $v0, 0x2c($sp) -/* 0967F8 80095BF8 818C69C0 */ lb $t4, %lo(p1_vehicle)($t4) +/* 0967F8 80095BF8 818C69C0 */ lb $t4, %lo(gPlayerVehicle)($t4) /* 0967FC 80095BFC 90580049 */ lbu $t8, 0x49($v0) /* 096800 80095C00 000CC880 */ sll $t9, $t4, 2 /* 096804 80095C04 00597021 */ addu $t6, $v0, $t9 @@ -438,8 +438,8 @@ glabel L80095D50 /* 09697C 80095D7C 304E0080 */ andi $t6, $v0, 0x80 /* 096980 80095D80 0C025DD1 */ jal func_80097744 /* 096984 80095D84 24050003 */ li $a1, 3 -/* 096988 80095D88 3C078012 */ lui $a3, %hi(p1_vehicle) # $a3, 0x8012 -/* 09698C 80095D8C 24E769C0 */ addiu $a3, %lo(p1_vehicle) # addiu $a3, $a3, 0x69c0 +/* 096988 80095D88 3C078012 */ lui $a3, %hi(gPlayerVehicle) # $a3, 0x8012 +/* 09698C 80095D8C 24E769C0 */ addiu $a3, %lo(gPlayerVehicle) # addiu $a3, $a3, 0x69c0 /* 096990 80095D90 80ED0000 */ lb $t5, ($a3) /* 096994 80095D94 8FA3002C */ lw $v1, 0x2c($sp) /* 096998 80095D98 000D7880 */ sll $t7, $t5, 2 @@ -472,8 +472,8 @@ glabel L80095D50 /* 096A00 80095E00 24840FA8 */ addiu $a0, %lo(D_800E0FA8) # addiu $a0, $a0, 0xfa8 /* 096A04 80095E04 0C025DD1 */ jal func_80097744 /* 096A08 80095E08 24050003 */ li $a1, 3 -/* 096A0C 80095E0C 3C078012 */ lui $a3, %hi(p1_vehicle) # $a3, 0x8012 -/* 096A10 80095E10 24E769C0 */ addiu $a3, %lo(p1_vehicle) # addiu $a3, $a3, 0x69c0 +/* 096A0C 80095E0C 3C078012 */ lui $a3, %hi(gPlayerVehicle) # $a3, 0x8012 +/* 096A10 80095E10 24E769C0 */ addiu $a3, %lo(gPlayerVehicle) # addiu $a3, $a3, 0x69c0 /* 096A14 80095E14 80F80000 */ lb $t8, ($a3) /* 096A18 80095E18 8FA3002C */ lw $v1, 0x2c($sp) /* 096A1C 80095E1C 0018C880 */ sll $t9, $t8, 2 diff --git a/bss.txt b/bss.txt index 096cf296..76d0a240 100644 --- a/bss.txt +++ b/bss.txt @@ -38,55 +38,9 @@ unknown_078050 unknown_079F50 - unknown_07AF10 -D_80126178; -D_80126180; -D_801261A0; -D_80126260; -D_801262B0; -D_801262B8; -D_801262C0; -D_801262C8; -D_801262CC; -D_801262D0; -D_801262D4; -D_801262D8; -D_801262DC; -D_801262E0; -D_801262E4; -D_80126308; -D_80126309; -D_80126310; - unknown_07B870 -D_80126320; -D_80126328; -D_8012632C; -D_80126330; -D_80126338; -D_8012633C; -D_80126340; -D_80126344; -D_80126348; -D_8012634C; -D_80126350; -D_80126354; -D_80126358; -D_8012635C; -D_80126360; -D_80126364; -D_80126368; -D_8012636C; -D_80126370; -D_80126374; -D_80126378; -D_8012637C; -D_80126380; -D_80126382; -D_80126384; - unknown_080500 D_80126390; diff --git a/src/unknown_07B870.c b/src/unknown_07B870.c index c304859e..8b02b6d1 100644 --- a/src/unknown_07B870.c +++ b/src/unknown_07B870.c @@ -483,12 +483,31 @@ const char D_800E7C50[] = "TEXSPR Error: Tryed to deallocate non-existent sprite /************ .bss ************/ -extern s32 D_80126338; -extern s32 D_8012633C; -extern s32 D_80126354; -extern s32 D_80126378; -extern s16 D_80126382; -extern s16 D_80126384; +s32 D_80126320[2]; +s32 D_80126328; +s32 D_8012632C; +s32 D_80126330[2]; +s32 D_80126338; +s32 D_8012633C; +s32 D_80126340; +s32 D_80126344; +s32 D_80126348; +s32 D_8012634C; +s32 D_80126350; +s32 D_80126354; +s32 D_80126358; +s32 D_8012635C; +s32 D_80126360; +s32 D_80126364; +s32 D_80126368; +s32 D_8012636C; +s32 D_80126370; +s32 D_80126374; +s32 D_80126378; +s32 D_8012637C; +s16 D_80126380; +s16 D_80126382; +s16 D_80126384; /*******************************/ diff --git a/src/unknown_080500.c b/src/unknown_080500.c index a4dff02b..35c93b4b 100644 --- a/src/unknown_080500.c +++ b/src/unknown_080500.c @@ -40,6 +40,255 @@ typedef enum MENU_ID { extern s32 osTvType; +typedef struct unk800DFC10 { + u32 *unk0; + s16 unk4; + s16 unk6; + u32 *unk8; + s32 unkC; +} unk800DFC10; + +/************ .bss ************/ + +// The bss section needs to stay above the data section! +// Otherwise the bss variables will get reordered, which is bad. + +unk800DFC10 *D_80126390; +unk800DFC10 *D_80126394; +s32 D_80126398; +s32 D_8012639C; +Gfx *D_801263A0; +s32 D_801263A4; +s32 D_801263A8; +s32 D_801263AC; +s32 D_801263B0; +s8 D_801263B4; +s32 D_801263B8; +s32 D_801263BC; +s32 D_801263C0; +s32 D_801263C4; +s32 D_801263C8; +s32 D_801263CC; +s32 D_801263D0; +s8 D_801263D4[4]; +s32 D_801263D8; +s8 D_801263DC[4]; +s32 D_801263E0; +s32 D_801263E4; +s8 players_character_array[8]; +s8 D_801263F0[8]; +s32 D_801263F8[8]; +u8 D_80126418[8]; +u8 D_80126420[8]; +u8 D_80126428[8]; +s8 D_80126430; +s8 D_80126431; +s32 D_80126434; +s32 D_80126438[4]; +s64 D_80126448; +f32 D_80126450; +u8 D_80126454[4]; +u8 D_80126458[4]; +s8 D_8012645C[4]; +s8 D_80126460[4]; +s8 D_80126464[4]; +u8 D_80126468[4]; +u8 D_8012646C[4]; +s32 D_80126470; +s32 D_80126474; +s32 D_80126478; +s32 D_8012647C; +s32 D_80126480; +s32 D_80126484; +s32 D_80126488; +s32 D_8012648C; +s32 D_80126490; +s32 D_80126494; +s32 D_80126498; +s32 D_8012649C; +s32 D_801264A0[12]; +s32 D_801264D0; +s32 D_801264D4; +s8 D_801264D8; +s32 D_801264DC; +s8 D_801264E0; +s8 D_801264E1; +s8 D_801264E2; +s32 D_801264E4; +s32 D_801264E8; +s32 D_801264EC; +s32 D_801264F0[2]; +s32 D_801264F8[2]; +s32 D_80126500; +s8 D_80126504; +s32 D_80126508; +s16 D_8012650C; +s8 D_8012650E; +s32 D_80126510; +s16 D_80126514; +s8 D_80126516; +s32 D_80126518; +s32 D_8012651C; +s32 D_80126520; +s32 D_80126524; +s32 D_80126528; +s32 D_8012652C; +Settings *D_80126530[4]; +s8 D_80126540; +s8 D_80126541; +s32 D_80126544; +s32 D_80126548; +u32* D_80126550[67]; // lookup table? +s32 D_8012665C; +s32 D_80126660; +s32 D_80126664; +s32 D_80126668[58]; +u8 D_80126750[128]; +s32 D_801267D0; +s32 D_801267D4; +s32 D_801267D8[3]; +s32 D_801267E4; +s32 D_801267E8; +s8* D_801267EC; +s32 D_801267F0[5]; +s32 D_80126804; +s32 D_80126808; +s32 D_8012680C; +s32 D_80126810; +s32 D_80126814; +s32 D_80126818; +s32 D_8012681C; +s32 D_80126820; +s32 D_80126824; +s32 D_80126828; +s32 D_8012682C; +s32 D_80126830; +s32 D_80126834; +s16 D_80126838; +s16 D_8012683A; +s32 D_8012683C; +s32 D_80126840; +s32 D_80126844; +s32 D_80126848; +s32 D_8012684C; +s32 D_80126850; +s32 D_80126854; +s32 D_80126858; +s32 D_8012685C; +s32 D_80126860; +s32 D_80126864; +s32 D_80126868; +s32 D_8012686C; +s32 D_80126870; +s32 D_80126874; +s32 D_80126878[24]; +s32 D_801268D8; +s32 D_801268DC; +s32 D_801268E0; +s32 D_801268E4; +s32 D_801268E8[12]; +s32 D_80126918[3]; +s32 D_80126924; +s32 D_80126928; +s32 D_8012692C; +s32 D_80126930[36]; +s8 gPlayerVehicle[4]; // Unknown number of entries. +s32 D_801269C4; +s32 D_801269C8; +s32 D_801269CC; +s32 D_801269D0[3]; +s32 D_801269DC; +u32* D_801269E0; +s32 D_801269E4; +s32 D_801269E8; +s32 D_801269EC; +s32 D_801269F0; +s32 D_801269F4; +s32 D_801269F8; +s32 D_801269FC; +s32 D_80126A00; +s32 D_80126A04; +s32 D_80126A08; +s32 D_80126A0C; +s32 D_80126A10; +s32 D_80126A14; +s32 D_80126A18; +s32 D_80126A1C; +s32 D_80126A20[4]; +s32 D_80126A30; +s32 D_80126A34; +s32 D_80126A38; +s32 D_80126A3C; +s32 D_80126A40[8]; +s8 D_80126A60[2]; +s32 D_80126A64; +s32 D_80126A68; +s32 D_80126A6C; +s32 D_80126A70; +s32 D_80126A74; +s32 D_80126A78; +s32 D_80126A7C; +s32 D_80126A80[4]; +s32 D_80126A90; +s32 D_80126A94; +s32 D_80126A98; +s32 D_80126A9C; +s32* D_80126AA0[16]; +s32 D_80126AE0[16]; +s32 D_80126B20[16]; +s32 D_80126B60[4]; +s32 D_80126B70[16]; +s32 D_80126BB0; +s32 D_80126BB4; +s32 D_80126BB8; +s32 D_80126BBC; +s32 D_80126BC0; +s32 D_80126BC4; +s32 D_80126BC8; +s32 D_80126BCC; +s32 D_80126BD0; +s32 D_80126BD4; +s32 D_80126BD8; +f32 D_80126BDC; +s32 D_80126BE0; +s32 D_80126BE4; +s32 D_80126BE8; +f32 D_80126BEC; +s32 D_80126BF0[8]; +s32 D_80126C10; +s32 D_80126C14; +s32 D_80126C18; +s32 D_80126C1C; +s32 D_80126C20; +s32 D_80126C24; +s32 D_80126C28; +s32 *D_80126C2C; +u16 (*D_80126C30)[30]; // Cheat table. +s32 D_80126C34; +s32 D_80126C38; +s32 D_80126C3C; +u16 D_80126C40; +u16 D_80126C42; +u16 D_80126C44; +s16 D_80126C46; +s32 D_80126C48; +s16 D_80126C4C; +f32 D_80126C50; +s8 D_80126C54; +s8 D_80126C55; +s8 D_80126C56; +s8 D_80126C57; +u8 D_80126C58[20]; +s32 *D_80126C6C; +s32 D_80126C70; +s32 D_80126C74; +s32 D_80126C78; +s32 D_80126C7C; +s32 D_80126C80[16]; +s32 D_80126CC0; + +/******************************/ + /************ .data ************/ s8 D_800DF450 = 0; @@ -330,14 +579,6 @@ s32* D_800DFBE0[10] = { s32 D_800DFC08 = 0; // Currently unknown, might be a different type. s32 D_800DFC0C = 0xFFFF; // Currently unknown, might be a different type. -typedef struct unk800DFC10 { - u32 *unk0; - s16 unk4; - s16 unk6; - u32 *unk8; - s32 unkC; -} unk800DFC10; - unk800DFC10 D_800DFC10 = { NULL, 0, 0, NULL, 0 }; unk800DFC10 D_800DFC20 = { NULL, 0, 0, NULL, 0 }; unk800DFC10 D_800DFC30 = { NULL, 0, 0, NULL, 0 }; @@ -859,15 +1100,17 @@ MenuElement D_800E0CEC[11] = { }; + + MenuElement D_800E0E4C[9] = { { 481, 174, 161, 174, -159, 174, 0, 0, 0, 255, 128, 0, 12, 0, NULL, 0, 0, 0, 0 }, { 479, 172, 159, 172, -161, 172, 255, 255, 255, 0, 255, 0, 12, 0, NULL, 0, 0, 0, 0 }, { 368, 192, 48, 192, -272, 192, 255, 64, 64, 96, 255, 0, 8, 0, NULL, 0, 0, 0, 0 }, { 506, 187, 186, 187, -134, 187, 255, 192, 255, 0, 255, 0, 0, 1, NULL, 0, 0, 0, 0 }, - { 578, 192, 258, 192, -62, 192, 255, 128, 255, 96, 255, 0, 12, 0, (s32*)0x80126390, 0, 0, 0, 0 }, + { 578, 192, 258, 192, -62, 192, 255, 128, 255, 96, 255, 0, 12, 0, &D_80126390, 0, 0, 0, 0 }, { 368, 212, 48, 212, -272, 212, 255, 64, 64, 96, 255, 0, 8, 0, NULL, 0, 0, 0, 0 }, { 506, 207, 186, 207, -134, 207, 128, 255, 255, 0, 255, 0, 0, 1, NULL, 0, 0, 0, 0 }, - { 578, 212, 258, 212, -62, 212, 255, 128, 255, 96, 255, 0, 12, 0, (s32*)0x80126394, 0, 0, 0, 0 }, + { 578, 212, 258, 212, -62, 212, 255, 128, 255, 96, 255, 0, 12, 0, &D_80126394, 0, 0, 0, 0 }, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, 0, 0, 0, 0 }, }; @@ -1309,7 +1552,7 @@ s16 D_800E1E08[4] = { 0, 0, 0x34, -1 }; -s32 *D_800E1E10 = (s32 *)0x800E8200; +s32 *D_800E1E10 = " (ADV."; s32 D_800E1E14 = 0; s32 D_800E1E18 = 0; @@ -1335,7 +1578,6 @@ s16 D_800E1E40[10] = { /************ .rodata ************/ -const char D_800E8200[] = " (ADV."; const char D_800E8208[] = "OK?"; const char D_800E820C[] = "~"; const char D_800E8210[] = "DEL"; @@ -1353,110 +1595,6 @@ const char D_800E8250[] = "loadFrontEndItem() - Item no %d out of range 0-%d\n"; /*********************************/ -/************ .bss ************/ - -extern Gfx *D_801263A0; -extern s32 D_801263A8; -extern s32 D_801263AC; -extern s8 D_801263B4; -extern s32 D_801263BC; -extern s32 D_801263C4; -extern s8 D_801263D4[4]; -extern s8 D_801263DC[4]; -extern s32 D_801263D8; -extern s32 D_801263E0; -extern s8 players_character_array[8]; -extern s8 D_801263F0[8]; -extern u8 D_80126418[8]; -extern u8 D_80126420[8]; -extern s64 D_80126448; -extern f32 D_80126450; -extern u8 D_80126454[4]; -extern u8 D_80126458[4]; -extern s8 D_8012645C[4]; -extern s8 D_80126464[4]; -extern u8 D_80126468[4]; -extern u8 D_8012646C[4]; -extern s32 D_80126470; -extern s32 D_80126484; -extern s32 D_80126488; -extern s8 D_801264D8; -extern s8 D_801264E2; -extern s8 D_80126504; -extern s8 D_8012650E; -extern s8 D_80126516; -extern Settings *D_80126530[3]; -extern s32 D_80126548; -extern u32* D_80126550[1]; // lookup table? Unknown number of entries. -extern u8 D_80126750[1]; // unknown number of entries -extern s32 D_801267D0; -extern s8* D_801267EC; -extern s32 D_80126804; -extern s32 D_80126824; -extern s32 D_8012683C; -extern s32 D_80126840; -extern s32 D_80126844; -extern s32 D_8012684C; -extern s32 D_80126854; -extern s32 D_80126858; -extern s32 D_8012685C; -extern s32 D_80126860; -extern s8 p1_vehicle[4]; // Unknown number of entries. -extern s32 D_801269C8; -extern s32 D_801269CC; -extern u32* D_801269E0; -extern s32 D_801269FC; -extern s32 D_80126A00; -extern s32 D_80126A04; -extern s32 D_80126A08; -extern s32 D_80126A0C; -extern s32 D_80126A10; -extern s32 D_80126A14; -extern s32 D_80126A18; -extern s32 D_80126A1C; -extern s32 D_80126A20[8]; // Unknown number of entries. -extern s8 D_80126A60[2]; -extern s32 D_80126A64; -extern s32 D_80126A68; -extern s32 D_80126A6C; -extern s32 D_80126A94; -extern s32* D_80126AA0[16]; -extern s32 D_80126BB4; -extern s32 D_80126BB8; -extern s32 D_80126BBC; -extern s32 D_80126BC4; -extern s32 D_80126BC8; -extern s32 D_80126BCC; -extern s32 D_80126BD0; -extern s32 D_80126BD4; -extern s32 D_80126BD8; -extern f32 D_80126BDC; -extern s32 D_80126BE0; -extern f32 D_80126BEC; -extern s32 D_80126BE4; -extern s32 D_80126BF0[3]; -extern s32 D_80126C10; -extern s32 D_80126C14; -extern s32 *D_80126C2C; -extern u16 *D_80126C30[30]; // Cheat table. -extern s32 D_80126C34; -extern s32 D_80126C3C; -extern u16 D_80126C40; -extern u16 D_80126C42; -extern s16 D_80126C46; -extern u16 D_80126C44; -extern s32 D_80126C48; -extern s16 D_80126C4C; -extern u8 D_80126C58; -extern f32 D_80126C50; -extern s32 *D_80126C6C; -extern s32 D_80126C70; -extern s32 D_80126C74; -extern s32 D_80126C78; -extern s32 D_80126CC0; - -/******************************/ - Settings *get_settings(void); void func_8009C4A8(s16 *arg0); void func_8009C674(s16 *arg0); @@ -1738,8 +1876,6 @@ void func_800841B8(s32 arg0) { #if 1 GLOBAL_ASM("asm/non_matchings/unknown_080500/MenuOptionsLoop.s") #else - -extern s32 D_8012644C; void func_80084734(void); void set_language(s32 language); @@ -1797,7 +1933,7 @@ s32 MenuOptionsLoop(s32 arg0) { func_80001D04(0xEB, 0); } else if (D_800DF460 == 1 && analogX != 0) { // Enable/Disable subtitles. - if (D_8012644C & 0x2000000) { + if (D_80126448+4 & 0x2000000) { func_80001D04(0xEB, 0); func_8009EABC(0, 0x2000000); func_800C2AF4(0); @@ -2367,7 +2503,7 @@ void menu_magic_codes_init(void) { D_80126C44 = 0; D_80126470 = 0; D_80126C4C = -1; - D_80126C58 = 0; + D_80126C58[0] = 0; D_801263BC = 0; D_800DF47C = 0; D_801263D8 = 0; @@ -2949,7 +3085,7 @@ void func_8008DC7C(s32 arg0) { temp_a1 = D_8012645C; if (D_800DF4BC == 2) { phi_v1 = phi_v1 | func_8006A554(1); - temp_a1 += D_8012645D; + temp_a1 += D_8012645C+1; } if (D_80126494 == 0) { @@ -3249,7 +3385,7 @@ void MenuLoadNewAreaInit(void) { D_801263BC = 0; D_800DF47C = 0; temp_s0 = settings->unk4C->unk2; - p1_vehicle = func_8006B0AC(temp_s0); + gPlayerVehicle = func_8006B0AC(temp_s0); temp_v0_2 = func_8006B14C(temp_s0); if (temp_v0_2 != 5) { if (temp_v0_2 != 8) { @@ -3586,7 +3722,7 @@ void MenuTrophyRaceRoundInit(void) { } for(i = 0; i < D_800DF4BC; i++){ - p1_vehicle[i] = func_8006B0AC(temp); + gPlayerVehicle[i] = func_8006B0AC(temp); } func_8006DB14(func_8006B0AC(temp)); @@ -3918,11 +4054,11 @@ s8 func_8009C23C(s32 arg0) { } s8 func_8009C250(s32 arg0) { - return p1_vehicle[arg0]; + return gPlayerVehicle[arg0]; } void func_8009C264(s32 arg0, s32 arg1) { - p1_vehicle[arg0] = arg1; + gPlayerVehicle[arg0] = arg1; } s8* func_8009C274(void) { diff --git a/undefined_syms.txt b/undefined_syms.txt index e8afc62c..1219c778 100755 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -25,248 +25,217 @@ osAppNMIBuffer = 0x8000031C; D_800E0001 = 0x800E0001; eqpower = 0x800E37A0; -D_80126320 = 0x80126320; -D_80126328 = 0x80126328; -D_8012632C = 0x8012632C; -D_80126330 = 0x80126330; -D_80126338 = 0x80126338; -D_8012633C = 0x8012633C; -D_80126340 = 0x80126340; -D_80126344 = 0x80126344; -D_80126348 = 0x80126348; -D_8012634C = 0x8012634C; -D_80126350 = 0x80126350; -D_80126354 = 0x80126354; -D_80126358 = 0x80126358; -D_8012635C = 0x8012635C; -D_80126360 = 0x80126360; -D_80126364 = 0x80126364; -D_80126368 = 0x80126368; -D_8012636C = 0x8012636C; -D_80126370 = 0x80126370; -D_80126374 = 0x80126374; -D_80126378 = 0x80126378; -D_8012637C = 0x8012637C; -D_80126380 = 0x80126380; -D_80126382 = 0x80126382; -D_80126384 = 0x80126384; -D_80126390 = 0x80126390; -D_80126394 = 0x80126394; -D_80126398 = 0x80126398; -D_8012639C = 0x8012639C; -D_801263A0 = 0x801263A0; -D_801263A4 = 0x801263A4; -D_801263A8 = 0x801263A8; -D_801263AC = 0x801263AC; -D_801263B0 = 0x801263B0; -D_801263B4 = 0x801263B4; -D_801263B8 = 0x801263B8; -D_801263BC = 0x801263BC; -D_801263C0 = 0x801263C0; -D_801263C4 = 0x801263C4; -D_801263C8 = 0x801263C8; -D_801263CC = 0x801263CC; -D_801263D0 = 0x801263D0; -D_801263D4 = 0x801263D4; -D_801263D5 = 0x801263D5; -D_801263D6 = 0x801263D6; -D_801263D7 = 0x801263D7; -D_801263D8 = 0x801263D8; -D_801263DC = 0x801263DC; -D_801263E0 = 0x801263E0; -players_character_array = 0x801263E8; -D_801263F0 = 0x801263F0; -D_801263F8 = 0x801263F8; -D_80126418 = 0x80126418; -D_80126420 = 0x80126420; -D_80126428 = 0x80126428; -D_80126430 = 0x80126430; -D_80126431 = 0x80126431; -D_80126438 = 0x80126438; -D_80126448 = 0x80126448; -D_8012644C = 0x8012644C; -D_80126450 = 0x80126450; -D_80126454 = 0x80126454; -D_80126458 = 0x80126458; -D_8012645C = 0x8012645C; -D_8012645D = 0x8012645D; -D_80126460 = 0x80126460; -D_80126464 = 0x80126464; -D_80126465 = 0x80126465; -D_80126468 = 0x80126468; -D_8012646C = 0x8012646C; -D_80126470 = 0x80126470; -D_80126474 = 0x80126474; -D_80126478 = 0x80126478; -D_8012647C = 0x8012647C; -D_80126480 = 0x80126480; -D_80126484 = 0x80126484; -D_80126488 = 0x80126488; -D_8012648C = 0x8012648C; -D_80126490 = 0x80126490; -D_80126494 = 0x80126494; -D_80126498 = 0x80126498; -D_801264A0 = 0x801264A0; -D_801264D0 = 0x801264D0; -D_801264D4 = 0x801264D4; -D_801264D8 = 0x801264D8; -D_801264DC = 0x801264DC; -D_801264E2 = 0x801264E2; -D_801264E4 = 0x801264E4; -D_801264EC = 0x801264EC; -D_801264F8 = 0x801264F8; -D_80126504 = 0x80126504; -D_80126508 = 0x80126508; -D_8012650E = 0x8012650E; -D_80126510 = 0x80126510; -D_80126516 = 0x80126516; -D_80126518 = 0x80126518; -D_80126520 = 0x80126520; -D_80126530 = 0x80126530; -D_80126534 = 0x80126534; -D_80126538 = 0x80126538; -D_8012653C = 0x8012653C; -D_80126540 = 0x80126540; -D_80126541 = 0x80126541; -D_80126548 = 0x80126548; -D_80126550 = 0x80126550; -D_8012665C = 0x8012665C; -D_80126660 = 0x80126660; -D_80126664 = 0x80126664; -D_80126750 = 0x80126750; -D_801267D0 = 0x801267D0; -D_801267D8 = 0x801267D8; -D_801267E4 = 0x801267E4; -D_801267E8 = 0x801267E8; -D_801267EC = 0x801267EC; -D_801267F0 = 0x801267F0; -D_80126804 = 0x80126804; -D_80126808 = 0x80126808; -D_8012680C = 0x8012680C; -D_80126810 = 0x80126810; -D_80126814 = 0x80126814; -D_80126818 = 0x80126818; -D_80126820 = 0x80126820; -D_80126824 = 0x80126824; -D_80126828 = 0x80126828; -D_80126830 = 0x80126830; -D_80126838 = 0x80126838; -D_8012683A = 0x8012683A; -D_8012683C = 0x8012683C; -D_80126840 = 0x80126840; -D_80126844 = 0x80126844; -D_80126848 = 0x80126848; -D_8012684C = 0x8012684C; -D_80126850 = 0x80126850; -D_80126854 = 0x80126854; -D_80126858 = 0x80126858; -D_8012685C = 0x8012685C; -D_80126860 = 0x80126860; -D_80126864 = 0x80126864; -D_80126868 = 0x80126868; -D_8012686C = 0x8012686C; -D_80126870 = 0x80126870; -D_80126874 = 0x80126874; -D_80126878 = 0x80126878; -D_801268D8 = 0x801268D8; -D_801268DC = 0x801268DC; -D_801268E0 = 0x801268E0; -D_801268E8 = 0x801268E8; -D_80126918 = 0x80126918; -D_80126924 = 0x80126924; -D_80126928 = 0x80126928; -D_8012692C = 0x8012692C; -D_80126930 = 0x80126930; -p1_vehicle = 0x801269C0; -p2_vehicle = 0x801269C1; -D_801269C4 = 0x801269C4; -D_801269C8 = 0x801269C8; -D_801269CC = 0x801269CC; -D_801269D0 = 0x801269D0; -D_801269DC = 0x801269DC; -D_801269E0 = 0x801269E0; -D_801269E4 = 0x801269E4; -D_801269E8 = 0x801269E8; -D_801269EC = 0x801269EC; -D_801269F0 = 0x801269F0; -D_801269F4 = 0x801269F4; -D_801269F8 = 0x801269F8; -D_801269FC = 0x801269FC; -D_80126A00 = 0x80126A00; -D_80126A04 = 0x80126A04; -D_80126A08 = 0x80126A08; -D_80126A0C = 0x80126A0C; -D_80126A10 = 0x80126A10; -D_80126A14 = 0x80126A14; -D_80126A18 = 0x80126A18; -D_80126A1C = 0x80126A1C; -D_80126A20 = 0x80126A20; -D_80126A30 = 0x80126A30; -D_80126A34 = 0x80126A34; -D_80126A38 = 0x80126A38; -D_80126A3C = 0x80126A3C; -D_80126A40 = 0x80126A40; -D_80126A60 = 0x80126A60; -D_80126A64 = 0x80126A64; -D_80126A68 = 0x80126A68; -D_80126A6C = 0x80126A6C; -D_80126A70 = 0x80126A70; -D_80126A74 = 0x80126A74; -D_80126A78 = 0x80126A78; -D_80126A80 = 0x80126A80; -D_80126A90 = 0x80126A90; -D_80126A94 = 0x80126A94; -D_80126A98 = 0x80126A98; -D_80126AA0 = 0x80126AA0; -D_80126AE0 = 0x80126AE0; -D_80126B20 = 0x80126B20; -D_80126B60 = 0x80126B60; -D_80126B70 = 0x80126B70; -D_80126BB0 = 0x80126BB0; -D_80126BB4 = 0x80126BB4; -D_80126BB8 = 0x80126BB8; -D_80126BBC = 0x80126BBC; -D_80126BC0 = 0x80126BC0; -D_80126BC4 = 0x80126BC4; -D_80126BC8 = 0x80126BC8; -D_80126BCC = 0x80126BCC; -D_80126BD0 = 0x80126BD0; -D_80126BD4 = 0x80126BD4; -D_80126BD8 = 0x80126BD8; -D_80126BDC = 0x80126BDC; -D_80126BE0 = 0x80126BE0; -D_80126BE4 = 0x80126BE4; -D_80126BE8 = 0x80126BE8; -D_80126BEC = 0x80126BEC; -D_80126BF0 = 0x80126BF0; -D_80126C10 = 0x80126C10; -D_80126C14 = 0x80126C14; -D_80126C18 = 0x80126C18; -D_80126C1C = 0x80126C1C; -D_80126C20 = 0x80126C20; -D_80126C24 = 0x80126C24; -D_80126C28 = 0x80126C28; -D_80126C2C = 0x80126C2C; -D_80126C30 = 0x80126C30; -D_80126C34 = 0x80126C34; -D_80126C38 = 0x80126C38; -D_80126C3C = 0x80126C3C; -D_80126C40 = 0x80126C40; -D_80126C42 = 0x80126C42; -D_80126C44 = 0x80126C44; -D_80126C46 = 0x80126C46; -D_80126C48 = 0x80126C48; -D_80126C4C = 0x80126C4C; -D_80126C50 = 0x80126C50; -D_80126C54 = 0x80126C54; -D_80126C57 = 0x80126C57; -D_80126C58 = 0x80126C58; -D_80126C6C = 0x80126C6C; -D_80126C70 = 0x80126C70; -D_80126C74 = 0x80126C74; -D_80126C78 = 0x80126C78; -D_80126C80 = 0x80126C80; -D_80126CC0 = 0x80126CC0; +/D_80126390 = 0x80126390; +/D_80126394 = 0x80126394; +/D_80126398 = 0x80126398; +/D_8012639C = 0x8012639C; +/D_801263A0 = 0x801263A0; +/D_801263A4 = 0x801263A4; +/D_801263A8 = 0x801263A8; +/D_801263AC = 0x801263AC; +/D_801263B0 = 0x801263B0; +/D_801263B4 = 0x801263B4; +/D_801263B8 = 0x801263B8; +/D_801263BC = 0x801263BC; +/D_801263C0 = 0x801263C0; +/D_801263C4 = 0x801263C4; +/D_801263C8 = 0x801263C8; +/D_801263CC = 0x801263CC; +/D_801263D0 = 0x801263D0; +/D_801263D4 = 0x801263D4; +/D_801263D8 = 0x801263D8; +/D_801263DC = 0x801263DC; +/D_801263E0 = 0x801263E0; +/players_character_array = 0x801263E8; +/D_801263F0 = 0x801263F0; +/D_801263F8 = 0x801263F8; +/D_80126418 = 0x80126418; +/D_80126420 = 0x80126420; +/D_80126428 = 0x80126428; +/D_80126430 = 0x80126430; +/D_80126431 = 0x80126431; +/D_80126438 = 0x80126438; +/D_80126448 = 0x80126448; +/D_80126450 = 0x80126450; +/D_80126454 = 0x80126454; +/D_80126458 = 0x80126458; +/D_8012645C = 0x8012645C; +/D_80126460 = 0x80126460; +/D_80126464 = 0x80126464; +/D_80126468 = 0x80126468; +/D_8012646C = 0x8012646C; +/D_80126470 = 0x80126470; +/D_80126474 = 0x80126474; +/D_80126478 = 0x80126478; +/D_8012647C = 0x8012647C; +/D_80126480 = 0x80126480; +/D_80126484 = 0x80126484; +/D_80126488 = 0x80126488; +/D_8012648C = 0x8012648C; +/D_80126490 = 0x80126490; +/D_80126494 = 0x80126494; +/D_80126498 = 0x80126498; + +/D_801264A0 = 0x801264A0; +/D_801264D0 = 0x801264D0; +/D_801264D4 = 0x801264D4; +/D_801264D8 = 0x801264D8; +/D_801264DC = 0x801264DC; +/D_801264E2 = 0x801264E2; +/D_801264E4 = 0x801264E4; +/D_801264EC = 0x801264EC; +/D_801264F8 = 0x801264F8; + +/D_80126504 = 0x80126504; +/D_80126508 = 0x80126508; +/D_8012650E = 0x8012650E; +/D_80126510 = 0x80126510; +/D_80126516 = 0x80126516; +/D_80126518 = 0x80126518; +/D_80126520 = 0x80126520; + +/D_80126530 = 0x80126530; +/D_80126540 = 0x80126540; +/D_80126541 = 0x80126541; +/D_80126548 = 0x80126548; +/D_80126550 = 0x80126550; +/D_8012665C = 0x8012665C; +/D_80126660 = 0x80126660; +/D_80126664 = 0x80126664; +/D_80126750 = 0x80126750; +/D_801267D0 = 0x801267D0; +/D_801267D8 = 0x801267D8; +/D_801267E4 = 0x801267E4; +/D_801267E8 = 0x801267E8; +/D_801267EC = 0x801267EC; +/D_801267F0 = 0x801267F0; +/D_80126804 = 0x80126804; +/D_80126808 = 0x80126808; +/D_8012680C = 0x8012680C; +/D_80126810 = 0x80126810; +/D_80126814 = 0x80126814; +/D_80126818 = 0x80126818; +/D_80126820 = 0x80126820; +/D_80126824 = 0x80126824; +/D_80126828 = 0x80126828; +/D_80126830 = 0x80126830; +/D_80126838 = 0x80126838; +/D_8012683A = 0x8012683A; +/D_8012683C = 0x8012683C; +/D_80126840 = 0x80126840; +/D_80126844 = 0x80126844; +/D_80126848 = 0x80126848; +/D_8012684C = 0x8012684C; +/D_80126850 = 0x80126850; +/D_80126854 = 0x80126854; +/D_80126858 = 0x80126858; +/D_8012685C = 0x8012685C; +/D_80126860 = 0x80126860; +/D_80126864 = 0x80126864; +/D_80126868 = 0x80126868; +/D_8012686C = 0x8012686C; +/D_80126870 = 0x80126870; +/D_80126874 = 0x80126874; +/D_80126878 = 0x80126878; +/D_801268D8 = 0x801268D8; +/D_801268DC = 0x801268DC; +/D_801268E0 = 0x801268E0; +/D_801268E8 = 0x801268E8; +/D_80126918 = 0x80126918; +/D_80126924 = 0x80126924; +/D_80126928 = 0x80126928; +/D_8012692C = 0x8012692C; +/D_80126930 = 0x80126930; +/gPlayerVehicle = 0x801269C0; +/D_801269C4 = 0x801269C4; +/D_801269C8 = 0x801269C8; +/D_801269CC = 0x801269CC; +/D_801269D0 = 0x801269D0; +/D_801269DC = 0x801269DC; +/D_801269E0 = 0x801269E0; +/D_801269E4 = 0x801269E4; +/D_801269E8 = 0x801269E8; +/D_801269EC = 0x801269EC; +/D_801269F0 = 0x801269F0; +/D_801269F4 = 0x801269F4; +/D_801269F8 = 0x801269F8; +/D_801269FC = 0x801269FC; +/D_80126A00 = 0x80126A00; +/D_80126A04 = 0x80126A04; +/D_80126A08 = 0x80126A08; +/D_80126A0C = 0x80126A0C; +/D_80126A10 = 0x80126A10; +/D_80126A14 = 0x80126A14; +/D_80126A18 = 0x80126A18; +/D_80126A1C = 0x80126A1C; +/D_80126A20 = 0x80126A20; +/D_80126A30 = 0x80126A30; +/D_80126A34 = 0x80126A34; +/D_80126A38 = 0x80126A38; +/D_80126A3C = 0x80126A3C; +/D_80126A40 = 0x80126A40; +/D_80126A60 = 0x80126A60; +/D_80126A64 = 0x80126A64; +/D_80126A68 = 0x80126A68; +/D_80126A6C = 0x80126A6C; +/D_80126A70 = 0x80126A70; +/D_80126A74 = 0x80126A74; +/D_80126A78 = 0x80126A78; +/D_80126A80 = 0x80126A80; +/D_80126A90 = 0x80126A90; +/D_80126A94 = 0x80126A94; +/D_80126A98 = 0x80126A98; +/D_80126AA0 = 0x80126AA0; +/D_80126AE0 = 0x80126AE0; +/D_80126B20 = 0x80126B20; +/D_80126B60 = 0x80126B60; +/D_80126B70 = 0x80126B70; +/D_80126BB0 = 0x80126BB0; +/D_80126BB4 = 0x80126BB4; +/D_80126BB8 = 0x80126BB8; +/D_80126BBC = 0x80126BBC; +/D_80126BC0 = 0x80126BC0; +/D_80126BC4 = 0x80126BC4; +/D_80126BC8 = 0x80126BC8; +/D_80126BCC = 0x80126BCC; +/D_80126BD0 = 0x80126BD0; +/D_80126BD4 = 0x80126BD4; +/D_80126BD8 = 0x80126BD8; +/D_80126BDC = 0x80126BDC; +/D_80126BE0 = 0x80126BE0; +/D_80126BE4 = 0x80126BE4; +/D_80126BE8 = 0x80126BE8; +/D_80126BEC = 0x80126BEC; +/D_80126BF0 = 0x80126BF0; +/D_80126C10 = 0x80126C10; +/D_80126C14 = 0x80126C14; +/D_80126C18 = 0x80126C18; +/D_80126C1C = 0x80126C1C; +/D_80126C20 = 0x80126C20; +/D_80126C24 = 0x80126C24; +/D_80126C28 = 0x80126C28; +/D_80126C2C = 0x80126C2C; +/D_80126C30 = 0x80126C30; +/D_80126C34 = 0x80126C34; +/D_80126C38 = 0x80126C38; +/D_80126C3C = 0x80126C3C; +/D_80126C40 = 0x80126C40; +/D_80126C42 = 0x80126C42; +/D_80126C44 = 0x80126C44; +/D_80126C46 = 0x80126C46; +/D_80126C48 = 0x80126C48; +/D_80126C4C = 0x80126C4C; +/D_80126C50 = 0x80126C50; +/D_80126C54 = 0x80126C54; +/D_80126C57 = 0x80126C57; +/D_80126C58 = 0x80126C58; +/D_80126C6C = 0x80126C6C; +/D_80126C70 = 0x80126C70; +/D_80126C74 = 0x80126C74; +/D_80126C78 = 0x80126C78; +/D_80126C80 = 0x80126C80; +/D_80126CC0 = 0x80126CC0; + D_80126CD0 = 0x80126CD0; D_80126CD1 = 0x80126CD1; D_80126CD2 = 0x80126CD2;