mirror of
https://gitlab.com/ryandwyer/perfect-dark
synced 2026-09-13 04:25:18 -04:00
Decompile explosionUpdateZ
This commit is contained in:
+2
-2
@@ -3041,7 +3041,7 @@ glabel var7f1ad8e4
|
||||
/* f0cab10: 8e4d0284 */ lw $t5,0x284($s2)
|
||||
.L0f0cab14:
|
||||
/* f0cab14: e5a216f8 */ swc1 $f2,0x16f8($t5)
|
||||
/* f0cab18: 0fc2d5be */ jal currentPlayerGetUnk1740
|
||||
/* f0cab18: 0fc2d5be */ jal currentPlayerGetMatrix
|
||||
/* f0cab1c: e7a200ac */ swc1 $f2,0xac($sp)
|
||||
/* f0cab20: 8e4e0284 */ lw $t6,0x284($s2)
|
||||
/* f0cab24: 27b000a0 */ addiu $s0,$sp,0xa0
|
||||
@@ -4846,7 +4846,7 @@ glabel var7f1ad8e4
|
||||
//
|
||||
// g_Vars.currentplayer->gunzoomfovs[1] = fStack436;
|
||||
//
|
||||
// func00015b68(currentPlayerGetUnk1740(),
|
||||
// func00015b68(currentPlayerGetMatrix(),
|
||||
// &g_Vars.currentplayer->unk025c->pos, &fStack456.pos);
|
||||
//
|
||||
// func0f0b4eb8(&fStack456.pos, (struct coord *)&fStack456, fStack436,
|
||||
|
||||
+8
-8
@@ -3315,7 +3315,7 @@ glabel var7f1a879c
|
||||
/* f021700: c7a4013c */ lwc1 $f4,0x13c($sp)
|
||||
/* f021704: e4440034 */ swc1 $f4,0x34($v0)
|
||||
/* f021708: c7a60140 */ lwc1 $f6,0x140($sp)
|
||||
/* f02170c: 0fc2d5be */ jal currentPlayerGetUnk1740
|
||||
/* f02170c: 0fc2d5be */ jal currentPlayerGetMatrix
|
||||
/* f021710: e4460038 */ swc1 $f6,0x38($v0)
|
||||
/* f021714: 00402025 */ or $a0,$v0,$zero
|
||||
/* f021718: 0c0056f8 */ jal func00015be0
|
||||
@@ -3917,7 +3917,7 @@ glabel var7f1a879c
|
||||
/* f021f78: c7a60074 */ lwc1 $f6,0x74($sp)
|
||||
/* f021f7c: e5a60034 */ swc1 $f6,0x34($t5)
|
||||
/* f021f80: c7aa0078 */ lwc1 $f10,0x78($sp)
|
||||
/* f021f84: 0fc2d5be */ jal currentPlayerGetUnk1740
|
||||
/* f021f84: 0fc2d5be */ jal currentPlayerGetMatrix
|
||||
/* f021f88: e5aa0038 */ swc1 $f10,0x38($t5)
|
||||
/* f021f8c: 00402025 */ or $a0,$v0,$zero
|
||||
/* f021f90: 0c0056f8 */ jal func00015be0
|
||||
@@ -5728,7 +5728,7 @@ glabel var7f1a87d8
|
||||
/* f023e20: 46080482 */ mul.s $f18,$f0,$f8
|
||||
/* f023e24: 0c0059b7 */ jal func000166dc
|
||||
/* f023e28: e7b20198 */ swc1 $f18,0x198($sp)
|
||||
/* f023e2c: 0fc2d5be */ jal currentPlayerGetUnk1740
|
||||
/* f023e2c: 0fc2d5be */ jal currentPlayerGetMatrix
|
||||
/* f023e30: 00000000 */ sll $zero,$zero,0x0
|
||||
/* f023e34: 00402025 */ or $a0,$v0,$zero
|
||||
/* f023e38: 0c00567f */ jal func000159fc
|
||||
@@ -5798,7 +5798,7 @@ glabel var7f1a87d8
|
||||
/* f023f2c: 460a0102 */ mul.s $f4,$f0,$f10
|
||||
/* f023f30: 0c0059b7 */ jal func000166dc
|
||||
/* f023f34: e7a40184 */ swc1 $f4,0x184($sp)
|
||||
/* f023f38: 0fc2d5be */ jal currentPlayerGetUnk1740
|
||||
/* f023f38: 0fc2d5be */ jal currentPlayerGetMatrix
|
||||
/* f023f3c: 00000000 */ sll $zero,$zero,0x0
|
||||
/* f023f40: 00402025 */ or $a0,$v0,$zero
|
||||
/* f023f44: 0c00567f */ jal func000159fc
|
||||
@@ -5807,12 +5807,12 @@ glabel var7f1a87d8
|
||||
/* f023f50: 10000008 */ beqz $zero,.L0f023f74
|
||||
/* f023f54: afaa0210 */ sw $t2,0x210($sp)
|
||||
.L0f023f58:
|
||||
/* f023f58: 0fc2d5be */ jal currentPlayerGetUnk1740
|
||||
/* f023f58: 0fc2d5be */ jal currentPlayerGetMatrix
|
||||
/* f023f5c: 00000000 */ sll $zero,$zero,0x0
|
||||
/* f023f60: 10000004 */ beqz $zero,.L0f023f74
|
||||
/* f023f64: afa20210 */ sw $v0,0x210($sp)
|
||||
.L0f023f68:
|
||||
/* f023f68: 0fc2d5be */ jal currentPlayerGetUnk1740
|
||||
/* f023f68: 0fc2d5be */ jal currentPlayerGetMatrix
|
||||
/* f023f6c: 00000000 */ sll $zero,$zero,0x0
|
||||
/* f023f70: afa20210 */ sw $v0,0x210($sp)
|
||||
.L0f023f74:
|
||||
@@ -6717,7 +6717,7 @@ glabel var7f1a87f8
|
||||
/* f024cdc: c6280024 */ lwc1 $f8,0x24($s1)
|
||||
/* f024ce0: e7a80090 */ swc1 $f8,0x90($sp)
|
||||
.L0f024ce4:
|
||||
/* f024ce4: 0fc2d5be */ jal currentPlayerGetUnk1740
|
||||
/* f024ce4: 0fc2d5be */ jal currentPlayerGetMatrix
|
||||
/* f024ce8: 00000000 */ sll $zero,$zero,0x0
|
||||
/* f024cec: 263500ec */ addiu $s5,$s1,0xec
|
||||
/* f024cf0: 02a03025 */ or $a2,$s5,$zero
|
||||
@@ -10092,7 +10092,7 @@ glabel func0f027994
|
||||
.L0f027cb0:
|
||||
/* f027cb0: 5b000035 */ blezl $t8,.L0f027d88
|
||||
/* f027cb4: 8fb900b8 */ lw $t9,0xb8($sp)
|
||||
/* f027cb8: 0fc2d5be */ jal currentPlayerGetUnk1740
|
||||
/* f027cb8: 0fc2d5be */ jal currentPlayerGetMatrix
|
||||
/* f027cbc: 00000000 */ sll $zero,$zero,0x0
|
||||
/* f027cc0: c7a400dc */ lwc1 $f4,0xdc($sp)
|
||||
/* f027cc4: c4460008 */ lwc1 $f6,0x8($v0)
|
||||
|
||||
@@ -18014,7 +18014,7 @@ glabel var7f1a90b8
|
||||
/* f03ffe4: 02602825 */ or $a1,$s3,$zero
|
||||
/* f03ffe8: 0c0056c5 */ jal func00015b14
|
||||
/* f03ffec: 27a60118 */ addiu $a2,$sp,0x118
|
||||
/* f03fff0: 0fc2d5be */ jal currentPlayerGetUnk1740
|
||||
/* f03fff0: 0fc2d5be */ jal currentPlayerGetMatrix
|
||||
/* f03fff4: 00000000 */ sll $zero,$zero,0x0
|
||||
/* f03fff8: 00514826 */ xor $t1,$v0,$s1
|
||||
/* f03fffc: 0009482b */ sltu $t1,$zero,$t1
|
||||
@@ -27784,7 +27784,7 @@ bool chrCanSeeTargetWithExtraCheck(struct chrdata *chr)
|
||||
|
||||
func0f0a0c08(&sp68, &sp56);
|
||||
func0001ad0c(model, &sp44);
|
||||
func00015b64(currentPlayerGetUnk1740(), &sp44);
|
||||
func00015b64(currentPlayerGetMatrix(), &sp44);
|
||||
|
||||
if (func0f06b39c(&sp68, &sp56, &sp44, somefloat)) {
|
||||
return true;
|
||||
|
||||
@@ -6264,6 +6264,20 @@ u32 var8007e4b0 = 0x000001e0;
|
||||
u32 var8007e4b4 = 0x000000a8;
|
||||
|
||||
struct explosiontype g_ExplosionTypes[NUM_EXPLOSIONTYPES] = {
|
||||
// rangeh
|
||||
// | rangev
|
||||
// | | changerateh
|
||||
// | | | changeratev
|
||||
// | | | | innersize
|
||||
// | | | | | blastradius
|
||||
// | | | | | | damageradius
|
||||
// | | | | | | | duration
|
||||
// | | | | | | | | propagationrate
|
||||
// | | | | | | | | | flarespeed
|
||||
// | | | | | | | | | | smoketype
|
||||
// | | | | | | | | | | | sound
|
||||
// | | | | | | | | | | | | damage
|
||||
// | | | | | | | | | | | | |
|
||||
/*00*/ { 0.1, 0.1, 0, 0, 0.1, 0, 0, 1, 1, 1, SMOKETYPE_0, 0x0000, 0 },
|
||||
/*01*/ { 1, 1, 0, 0, 1, 0, 0, 30, 1, 1, SMOKETYPE_7, 0x0000, 0 },
|
||||
/*02*/ { 20, 20, 0, 0, 30, 50, 50, 40, 1, 3, SMOKETYPE_2, 0x8099, 0.125 },
|
||||
|
||||
+16
-48
@@ -2928,54 +2928,22 @@ glabel var7f1b55a8
|
||||
/* f12c5a4: 27bd0168 */ addiu $sp,$sp,0x168
|
||||
);
|
||||
|
||||
GLOBAL_ASM(
|
||||
glabel func0f12c5a8
|
||||
/* f12c5a8: 27bdffe8 */ addiu $sp,$sp,-24
|
||||
/* f12c5ac: afbf0014 */ sw $ra,0x14($sp)
|
||||
/* f12c5b0: 0fc2d5be */ jal currentPlayerGetUnk1740
|
||||
/* f12c5b4: afa40018 */ sw $a0,0x18($sp)
|
||||
/* f12c5b8: 8fa40018 */ lw $a0,0x18($sp)
|
||||
/* f12c5bc: c4440008 */ lwc1 $f4,0x8($v0)
|
||||
/* f12c5c0: c44a0018 */ lwc1 $f10,0x18($v0)
|
||||
/* f12c5c4: c4860008 */ lwc1 $f6,0x8($a0)
|
||||
/* f12c5c8: c490000c */ lwc1 $f16,0xc($a0)
|
||||
/* f12c5cc: 3c0142c8 */ lui $at,0x42c8
|
||||
/* f12c5d0: 46062202 */ mul.s $f8,$f4,$f6
|
||||
/* f12c5d4: c4460028 */ lwc1 $f6,0x28($v0)
|
||||
/* f12c5d8: 44811000 */ mtc1 $at,$f2
|
||||
/* f12c5dc: 46105482 */ mul.s $f18,$f10,$f16
|
||||
/* f12c5e0: c48a0010 */ lwc1 $f10,0x10($a0)
|
||||
/* f12c5e4: 3c013f00 */ lui $at,0x3f00
|
||||
/* f12c5e8: 460a3402 */ mul.s $f16,$f6,$f10
|
||||
/* f12c5ec: 46124100 */ add.s $f4,$f8,$f18
|
||||
/* f12c5f0: c4520038 */ lwc1 $f18,0x38($v0)
|
||||
/* f12c5f4: 46102200 */ add.s $f8,$f4,$f16
|
||||
/* f12c5f8: 46089180 */ add.s $f6,$f18,$f8
|
||||
/* f12c5fc: 46003287 */ neg.s $f10,$f6
|
||||
/* f12c600: e48a0014 */ swc1 $f10,0x14($a0)
|
||||
/* f12c604: c4800014 */ lwc1 $f0,0x14($a0)
|
||||
/* f12c608: 4602003c */ c.lt.s $f0,$f2
|
||||
/* f12c60c: 00000000 */ sll $zero,$zero,0x0
|
||||
/* f12c610: 45020007 */ bc1fl .L0f12c630
|
||||
/* f12c614: 46020481 */ sub.s $f18,$f0,$f2
|
||||
/* f12c618: 44812000 */ mtc1 $at,$f4
|
||||
/* f12c61c: 00000000 */ sll $zero,$zero,0x0
|
||||
/* f12c620: 46040402 */ mul.s $f16,$f0,$f4
|
||||
/* f12c624: 10000003 */ beqz $zero,.L0f12c634
|
||||
/* f12c628: e4900014 */ swc1 $f16,0x14($a0)
|
||||
/* f12c62c: 46020481 */ sub.s $f18,$f0,$f2
|
||||
.L0f12c630:
|
||||
/* f12c630: e4920014 */ swc1 $f18,0x14($a0)
|
||||
.L0f12c634:
|
||||
/* f12c634: 908e0001 */ lbu $t6,0x1($a0)
|
||||
/* f12c638: 00001025 */ or $v0,$zero,$zero
|
||||
/* f12c63c: 35cf0042 */ ori $t7,$t6,0x42
|
||||
/* f12c640: a08f0001 */ sb $t7,0x1($a0)
|
||||
/* f12c644: 8fbf0014 */ lw $ra,0x14($sp)
|
||||
/* f12c648: 27bd0018 */ addiu $sp,$sp,0x18
|
||||
/* f12c64c: 03e00008 */ jr $ra
|
||||
/* f12c650: 00000000 */ sll $zero,$zero,0x0
|
||||
);
|
||||
u32 explosionUpdateZ(struct prop *prop)
|
||||
{
|
||||
f32 *matrix = currentPlayerGetMatrix();
|
||||
|
||||
prop->z = -(matrix[2] * prop->pos.x + matrix[6] * prop->pos.y + matrix[10] * prop->pos.z + matrix[14]);
|
||||
|
||||
if (prop->z < 100) {
|
||||
prop->z *= 0.5f;
|
||||
} else {
|
||||
prop->z -= 100;
|
||||
}
|
||||
|
||||
prop->flags |= PROPFLAG_40 | PROPFLAG_02;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
GLOBAL_ASM(
|
||||
glabel func0f12c654
|
||||
|
||||
@@ -651,7 +651,7 @@ glabel func0f006c80
|
||||
/* f007440: 8fa40154 */ lw $a0,0x154($sp)
|
||||
/* f007444: 0c0059b7 */ jal func000166dc
|
||||
/* f007448: 02002825 */ or $a1,$s0,$zero
|
||||
/* f00744c: 0fc2d5be */ jal currentPlayerGetUnk1740
|
||||
/* f00744c: 0fc2d5be */ jal currentPlayerGetMatrix
|
||||
/* f007450: 00000000 */ sll $zero,$zero,0x0
|
||||
/* f007454: 00402025 */ or $a0,$v0,$zero
|
||||
/* f007458: 0c0056f8 */ jal func00015be0
|
||||
@@ -3082,7 +3082,7 @@ glabel func0f009818
|
||||
/* f009924: 27a50088 */ addiu $a1,$sp,0x88
|
||||
/* f009928: 0c005680 */ jal func00015a00
|
||||
/* f00992c: 27a600c8 */ addiu $a2,$sp,0xc8
|
||||
/* f009930: 0fc2d5be */ jal currentPlayerGetUnk1740
|
||||
/* f009930: 0fc2d5be */ jal currentPlayerGetMatrix
|
||||
/* f009934: 00000000 */ sll $zero,$zero,0x0
|
||||
/* f009938: 00402025 */ or $a0,$v0,$zero
|
||||
/* f00993c: 0c0056f8 */ jal func00015be0
|
||||
|
||||
@@ -1298,7 +1298,7 @@ glabel var7f1a9eb8
|
||||
/* f061338: 24010016 */ addiu $at,$zero,0x16
|
||||
/* f06133c: 1161000f */ beq $t3,$at,.L0f06137c
|
||||
/* f061340: 00000000 */ sll $zero,$zero,0x0
|
||||
/* f061344: 0fc2d5be */ jal currentPlayerGetUnk1740
|
||||
/* f061344: 0fc2d5be */ jal currentPlayerGetMatrix
|
||||
/* f061348: 00000000 */ sll $zero,$zero,0x0
|
||||
/* f06134c: 00402025 */ or $a0,$v0,$zero
|
||||
/* f061350: 27a50694 */ addiu $a1,$sp,0x694
|
||||
@@ -3821,7 +3821,7 @@ glabel func0f06302c
|
||||
.L0f063574:
|
||||
/* f063574: 54610006 */ bnel $v1,$at,.L0f063590
|
||||
/* f063578: 24010008 */ addiu $at,$zero,0x8
|
||||
/* f06357c: 0fc4b16a */ jal func0f12c5a8
|
||||
/* f06357c: 0fc4b16a */ jal explosionUpdateZ
|
||||
/* f063580: 02002025 */ or $a0,$s0,$zero
|
||||
/* f063584: 10000010 */ beqz $zero,.L0f0635c8
|
||||
/* f063588: 00403025 */ or $a2,$v0,$zero
|
||||
@@ -3990,7 +3990,7 @@ glabel func0f06302c
|
||||
.L0f0637dc:
|
||||
/* f0637dc: 54610006 */ bnel $v1,$at,.L0f0637f8
|
||||
/* f0637e0: 24010008 */ addiu $at,$zero,0x8
|
||||
/* f0637e4: 0fc4b16a */ jal func0f12c5a8
|
||||
/* f0637e4: 0fc4b16a */ jal explosionUpdateZ
|
||||
/* f0637e8: 02002025 */ or $a0,$s0,$zero
|
||||
/* f0637ec: 10000010 */ beqz $zero,.L0f063830
|
||||
/* f0637f0: 00403025 */ or $a2,$v0,$zero
|
||||
|
||||
@@ -10892,7 +10892,7 @@ glabel var7f1ac764
|
||||
/* f0a05f8: c44606bc */ lwc1 $f6,0x6bc($v0)
|
||||
/* f0a05fc: e7a60098 */ swc1 $f6,0x98($sp)
|
||||
/* f0a0600: c44806c0 */ lwc1 $f8,0x6c0($v0)
|
||||
/* f0a0604: 0fc2d5be */ jal currentPlayerGetUnk1740
|
||||
/* f0a0604: 0fc2d5be */ jal currentPlayerGetMatrix
|
||||
/* f0a0608: e7a8009c */ swc1 $f8,0x9c($sp)
|
||||
/* f0a060c: 00402025 */ or $a0,$v0,$zero
|
||||
/* f0a0610: 0c0056d9 */ jal func00015b64
|
||||
@@ -14617,7 +14617,7 @@ glabel func0f0a37b4
|
||||
/* f0a3894: e7a40050 */ swc1 $f4,0x50($sp)
|
||||
/* f0a3898: e7a6003c */ swc1 $f6,0x3c($sp)
|
||||
/* f0a389c: e7a80040 */ swc1 $f8,0x40($sp)
|
||||
/* f0a38a0: 0fc2d5be */ jal currentPlayerGetUnk1740
|
||||
/* f0a38a0: 0fc2d5be */ jal currentPlayerGetMatrix
|
||||
/* f0a38a4: e7aa0044 */ swc1 $f10,0x44($sp)
|
||||
/* f0a38a8: 00402025 */ or $a0,$v0,$zero
|
||||
/* f0a38ac: 27a5003c */ addiu $a1,$sp,0x3c
|
||||
|
||||
+10
-10
@@ -254,7 +254,7 @@ glabel func0f0ac138
|
||||
/* f0ac140: 27bdff88 */ addiu $sp,$sp,-120
|
||||
/* f0ac144: afbf0014 */ sw $ra,0x14($sp)
|
||||
/* f0ac148: afa40078 */ sw $a0,0x78($sp)
|
||||
/* f0ac14c: 0fc2d5be */ jal currentPlayerGetUnk1740
|
||||
/* f0ac14c: 0fc2d5be */ jal currentPlayerGetMatrix
|
||||
/* f0ac150: afae0074 */ sw $t6,0x74($sp)
|
||||
/* f0ac154: 8fa40078 */ lw $a0,0x78($sp)
|
||||
/* f0ac158: 8faf0074 */ lw $t7,0x74($sp)
|
||||
@@ -500,7 +500,7 @@ glabel func0f0ac4b8
|
||||
/* f0ac4dc: 24040002 */ addiu $a0,$zero,0x2
|
||||
/* f0ac4e0: 0fc59e73 */ jal func0f1679cc
|
||||
/* f0ac4e4: 26101bb0 */ addiu $s0,$s0,7088
|
||||
/* f0ac4e8: 0fc2d5be */ jal currentPlayerGetUnk1740
|
||||
/* f0ac4e8: 0fc2d5be */ jal currentPlayerGetMatrix
|
||||
/* f0ac4ec: afa200c4 */ sw $v0,0xc4($sp)
|
||||
/* f0ac4f0: 3c0c8007 */ lui $t4,%hi(var80070500)
|
||||
/* f0ac4f4: afa20080 */ sw $v0,0x80($sp)
|
||||
@@ -559,7 +559,7 @@ glabel func0f0ac4b8
|
||||
/* f0ac5c4: e7a800e4 */ swc1 $f8,0xe4($sp)
|
||||
/* f0ac5c8: 46023283 */ div.s $f10,$f6,$f2
|
||||
/* f0ac5cc: e7a400e8 */ swc1 $f4,0xe8($sp)
|
||||
/* f0ac5d0: 0fc2d5be */ jal currentPlayerGetUnk1740
|
||||
/* f0ac5d0: 0fc2d5be */ jal currentPlayerGetMatrix
|
||||
/* f0ac5d4: e7aa00ec */ swc1 $f10,0xec($sp)
|
||||
/* f0ac5d8: 00402025 */ or $a0,$v0,$zero
|
||||
/* f0ac5dc: 8fa500fc */ lw $a1,0xfc($sp)
|
||||
@@ -611,7 +611,7 @@ glabel func0f0ac4b8
|
||||
/* f0ac680: 1000013e */ beqz $zero,.L0f0acb7c
|
||||
/* f0ac684: 8fa200f0 */ lw $v0,0xf0($sp)
|
||||
.L0f0ac688:
|
||||
/* f0ac688: 0fc2d5be */ jal currentPlayerGetUnk1740
|
||||
/* f0ac688: 0fc2d5be */ jal currentPlayerGetMatrix
|
||||
/* f0ac68c: 00000000 */ sll $zero,$zero,0x0
|
||||
/* f0ac690: 00402025 */ or $a0,$v0,$zero
|
||||
/* f0ac694: 8fa50108 */ lw $a1,0x108($sp)
|
||||
@@ -1070,7 +1070,7 @@ glabel var7f1accf4
|
||||
/* f0acc54: 01cf6821 */ addu $t5,$t6,$t7
|
||||
/* f0acc58: afad00ec */ sw $t5,0xec($sp)
|
||||
/* f0acc5c: e7a20124 */ swc1 $f2,0x124($sp)
|
||||
/* f0acc60: 0fc2d5be */ jal currentPlayerGetUnk1740
|
||||
/* f0acc60: 0fc2d5be */ jal currentPlayerGetMatrix
|
||||
/* f0acc64: e7aa00f0 */ swc1 $f10,0xf0($sp)
|
||||
/* f0acc68: afa200e4 */ sw $v0,0xe4($sp)
|
||||
/* f0acc6c: 82230001 */ lb $v1,0x1($s1)
|
||||
@@ -3193,7 +3193,7 @@ glabel var7f1acd6c
|
||||
/* f0aeacc: 26440004 */ addiu $a0,$s2,0x4
|
||||
/* f0aead0: 0c005775 */ jal func00015dd4
|
||||
/* f0aead4: 02002825 */ or $a1,$s0,$zero
|
||||
/* f0aead8: 0fc2d5be */ jal currentPlayerGetUnk1740
|
||||
/* f0aead8: 0fc2d5be */ jal currentPlayerGetMatrix
|
||||
/* f0aeadc: 00000000 */ sll $zero,$zero,0x0
|
||||
/* f0aeae0: 00402025 */ or $a0,$v0,$zero
|
||||
/* f0aeae4: 02002825 */ or $a1,$s0,$zero
|
||||
@@ -3815,7 +3815,7 @@ glabel var7f1acd8c
|
||||
/* f0af32c: af090004 */ sw $t1,0x4($t8)
|
||||
/* f0af330: 0c00566c */ jal func000159b0
|
||||
/* f0af334: af080000 */ sw $t0,0x0($t8)
|
||||
/* f0af338: 0fc2d5be */ jal currentPlayerGetUnk1740
|
||||
/* f0af338: 0fc2d5be */ jal currentPlayerGetMatrix
|
||||
/* f0af33c: 00000000 */ sll $zero,$zero,0x0
|
||||
/* f0af340: 00402025 */ or $a0,$v0,$zero
|
||||
/* f0af344: 0c0056f8 */ jal func00015be0
|
||||
@@ -3835,7 +3835,7 @@ glabel var7f1acd8c
|
||||
/* f0af37c: e7a00154 */ swc1 $f0,0x154($sp)
|
||||
/* f0af380: 0c00566c */ jal func000159b0
|
||||
/* f0af384: e7a0015c */ swc1 $f0,0x15c($sp)
|
||||
/* f0af388: 0fc2d5be */ jal currentPlayerGetUnk1740
|
||||
/* f0af388: 0fc2d5be */ jal currentPlayerGetMatrix
|
||||
/* f0af38c: 00000000 */ sll $zero,$zero,0x0
|
||||
/* f0af390: 00402025 */ or $a0,$v0,$zero
|
||||
/* f0af394: 0c0056f8 */ jal func00015be0
|
||||
@@ -4409,7 +4409,7 @@ glabel var7f1acd90
|
||||
/* f0afc18: 24a50024 */ addiu $a1,$a1,0x0024
|
||||
/* f0afc1c: 0c00566c */ jal func000159b0
|
||||
/* f0afc20: 27a4014c */ addiu $a0,$sp,0x14c
|
||||
/* f0afc24: 0fc2d5be */ jal currentPlayerGetUnk1740
|
||||
/* f0afc24: 0fc2d5be */ jal currentPlayerGetMatrix
|
||||
/* f0afc28: 00000000 */ sll $zero,$zero,0x0
|
||||
/* f0afc2c: 00402025 */ or $a0,$v0,$zero
|
||||
/* f0afc30: 0c0056f8 */ jal func00015be0
|
||||
@@ -4428,7 +4428,7 @@ glabel var7f1acd90
|
||||
/* f0afc64: e7b4013c */ swc1 $f20,0x13c($sp)
|
||||
/* f0afc68: 0c00566c */ jal func000159b0
|
||||
/* f0afc6c: e7b40144 */ swc1 $f20,0x144($sp)
|
||||
/* f0afc70: 0fc2d5be */ jal currentPlayerGetUnk1740
|
||||
/* f0afc70: 0fc2d5be */ jal currentPlayerGetMatrix
|
||||
/* f0afc74: 00000000 */ sll $zero,$zero,0x0
|
||||
/* f0afc78: 00402025 */ or $a0,$v0,$zero
|
||||
/* f0afc7c: 0c0056f8 */ jal func00015be0
|
||||
|
||||
@@ -1864,12 +1864,12 @@ u32 currentPlayerGetUnk1758(void)
|
||||
return g_Vars.currentplayer->unk1758;
|
||||
}
|
||||
|
||||
void currentPlayerSetUnk1740(f32 *value)
|
||||
void currentPlayerSetMatrix(f32 *matrix)
|
||||
{
|
||||
struct player *player = g_Vars.currentplayer;
|
||||
|
||||
player->unk1760 = player->unk1740;
|
||||
player->unk1740 = value;
|
||||
player->prevmatrix = player->matrix;
|
||||
player->matrix = matrix;
|
||||
player->unk1744 = var80084008;
|
||||
player->unk0488 = player->unk0484;
|
||||
player->unk0484 = var800aa59c;
|
||||
@@ -2361,9 +2361,9 @@ glabel func0f0b53a4
|
||||
/* f0b56f4: 27bd0050 */ addiu $sp,$sp,0x50
|
||||
);
|
||||
|
||||
f32 *currentPlayerGetUnk1740(void)
|
||||
f32 *currentPlayerGetMatrix(void)
|
||||
{
|
||||
return g_Vars.currentplayer->unk1740;
|
||||
return g_Vars.currentplayer->matrix;
|
||||
}
|
||||
|
||||
void currentPlayerSetUnk1754(u32 value)
|
||||
@@ -2376,9 +2376,9 @@ u32 currentPlayerGetUnk1754(void)
|
||||
return g_Vars.currentplayer->unk1754;
|
||||
}
|
||||
|
||||
f32 *currentPlayerGetUnk1760(void)
|
||||
f32 *currentPlayerGetPrevMatrix(void)
|
||||
{
|
||||
return g_Vars.currentplayer->unk1760;
|
||||
return g_Vars.currentplayer->prevmatrix;
|
||||
}
|
||||
|
||||
void currentPlayerSetUnk1748(u32 value)
|
||||
|
||||
@@ -11868,7 +11868,7 @@ void currentPlayerSetGlobalDrawCameraOffset(void)
|
||||
g_Vars.currentplayer->globaldrawcameraoffset.y = g_Vars.currentplayer->globaldrawworldoffset.y;
|
||||
g_Vars.currentplayer->globaldrawcameraoffset.z = g_Vars.currentplayer->globaldrawworldoffset.z;
|
||||
|
||||
func00015b10(currentPlayerGetUnk1740(), &g_Vars.currentplayer->globaldrawcameraoffset);
|
||||
func00015b10(currentPlayerGetMatrix(), &g_Vars.currentplayer->globaldrawcameraoffset);
|
||||
}
|
||||
|
||||
GLOBAL_ASM(
|
||||
@@ -12072,7 +12072,7 @@ glabel func0f0bfc7c
|
||||
/* f0bff7c: 0fc2d3de */ jal currentPlayerSetUnk1738
|
||||
/* f0bff80: 8de40060 */ lw $a0,0x60($t7)
|
||||
/* f0bff84: 8e580284 */ lw $t8,0x284($s2)
|
||||
/* f0bff88: 0fc2d406 */ jal currentPlayerSetUnk1740
|
||||
/* f0bff88: 0fc2d406 */ jal currentPlayerSetMatrix
|
||||
/* f0bff8c: 8f040064 */ lw $a0,0x64($t8)
|
||||
/* f0bff90: 8e590284 */ lw $t9,0x284($s2)
|
||||
/* f0bff94: 0fc2d5d6 */ jal currentPlayerSetUnk174c
|
||||
@@ -15103,7 +15103,7 @@ glabel func0f0c32a0
|
||||
|
||||
Gfx *currentPlayerLoadMatrix(Gfx *gdl)
|
||||
{
|
||||
gSPMatrix(gdl++, g_Vars.currentplayer->matrix, G_MTX_LOAD);
|
||||
gSPMatrix(gdl++, g_Vars.currentplayer->matrix5c, G_MTX_LOAD);
|
||||
return gdl;
|
||||
}
|
||||
|
||||
|
||||
@@ -14648,7 +14648,7 @@ glabel func0f0fd494
|
||||
/* f0fd4a8: afbf001c */ sw $ra,0x1c($sp)
|
||||
/* f0fd4ac: afa40038 */ sw $a0,0x38($sp)
|
||||
/* f0fd4b0: 35f80010 */ ori $t8,$t7,0x10
|
||||
/* f0fd4b4: 0fc2d5be */ jal currentPlayerGetUnk1740
|
||||
/* f0fd4b4: 0fc2d5be */ jal currentPlayerGetMatrix
|
||||
/* f0fd4b8: a21805d5 */ sb $t8,0x5d5($s0)
|
||||
/* f0fd4bc: 00402025 */ or $a0,$v0,$zero
|
||||
/* f0fd4c0: 8fa50038 */ lw $a1,0x38($sp)
|
||||
|
||||
@@ -2158,7 +2158,7 @@ glabel var7f1b50c8
|
||||
/* f120df4: 8fae0068 */ lw $t6,0x68($sp)
|
||||
/* f120df8: 0fc2d5c6 */ jal currentPlayerGetUnk1754
|
||||
/* f120dfc: 00000000 */ sll $zero,$zero,0x0
|
||||
/* f120e00: 0fc2d5be */ jal currentPlayerGetUnk1740
|
||||
/* f120e00: 0fc2d5be */ jal currentPlayerGetMatrix
|
||||
/* f120e04: 00408025 */ or $s0,$v0,$zero
|
||||
/* f120e08: 02002025 */ or $a0,$s0,$zero
|
||||
/* f120e0c: 00402825 */ or $a1,$v0,$zero
|
||||
@@ -3600,7 +3600,7 @@ glabel var7f1b50c8
|
||||
/* f122438: af0b0004 */ sw $t3,0x4($t8)
|
||||
/* f12243c: 0fc2d5c6 */ jal currentPlayerGetUnk1754
|
||||
/* f122440: af190000 */ sw $t9,0x0($t8)
|
||||
/* f122444: 0fc2d5be */ jal currentPlayerGetUnk1740
|
||||
/* f122444: 0fc2d5be */ jal currentPlayerGetMatrix
|
||||
/* f122448: 00408025 */ or $s0,$v0,$zero
|
||||
/* f12244c: 02002025 */ or $a0,$s0,$zero
|
||||
/* f122450: 00402825 */ or $a1,$v0,$zero
|
||||
@@ -7285,7 +7285,7 @@ glabel var7f1b5108
|
||||
/* f125aa8: f7b60040 */ sdc1 $f22,0x40($sp)
|
||||
/* f125aac: f7b40038 */ sdc1 $f20,0x38($sp)
|
||||
/* f125ab0: afa40170 */ sw $a0,0x170($sp)
|
||||
/* f125ab4: 0fc2d5be */ jal currentPlayerGetUnk1740
|
||||
/* f125ab4: 0fc2d5be */ jal currentPlayerGetMatrix
|
||||
/* f125ab8: afa50174 */ sw $a1,0x174($sp)
|
||||
/* f125abc: 0fc2d5c6 */ jal currentPlayerGetUnk1754
|
||||
/* f125ac0: afa2016c */ sw $v0,0x16c($sp)
|
||||
@@ -8467,7 +8467,7 @@ glabel func0f126c3c
|
||||
/* f126c54: afa40070 */ sw $a0,0x70($sp)
|
||||
/* f126c58: e7ac0064 */ swc1 $f12,0x64($sp)
|
||||
/* f126c5c: e7ae0068 */ swc1 $f14,0x68($sp)
|
||||
/* f126c60: 0fc2d5be */ jal currentPlayerGetUnk1740
|
||||
/* f126c60: 0fc2d5be */ jal currentPlayerGetMatrix
|
||||
/* f126c64: e7a4006c */ swc1 $f4,0x6c($sp)
|
||||
/* f126c68: 00402025 */ or $a0,$v0,$zero
|
||||
/* f126c6c: 0c0056d9 */ jal func00015b64
|
||||
|
||||
@@ -2091,7 +2091,7 @@ GLOBAL_ASM(
|
||||
glabel func0f12f184
|
||||
/* f12f184: 27bdffe8 */ addiu $sp,$sp,-24
|
||||
/* f12f188: afbf0014 */ sw $ra,0x14($sp)
|
||||
/* f12f18c: 0fc2d5be */ jal currentPlayerGetUnk1740
|
||||
/* f12f18c: 0fc2d5be */ jal currentPlayerGetMatrix
|
||||
/* f12f190: afa40018 */ sw $a0,0x18($sp)
|
||||
/* f12f194: 8fa40018 */ lw $a0,0x18($sp)
|
||||
/* f12f198: c4440008 */ lwc1 $f4,0x8($v0)
|
||||
|
||||
@@ -1395,7 +1395,7 @@ glabel func0f130044
|
||||
/* f130a48: 02a02025 */ or $a0,$s5,$zero
|
||||
/* f130a4c: 0c005775 */ jal func00015dd4
|
||||
/* f130a50: 27a500d4 */ addiu $a1,$sp,0xd4
|
||||
/* f130a54: 0fc2d5be */ jal currentPlayerGetUnk1740
|
||||
/* f130a54: 0fc2d5be */ jal currentPlayerGetMatrix
|
||||
/* f130a58: 00000000 */ sll $zero,$zero,0x0
|
||||
/* f130a5c: 00402025 */ or $a0,$v0,$zero
|
||||
/* f130a60: 0c0056f8 */ jal func00015be0
|
||||
|
||||
@@ -1174,7 +1174,7 @@ glabel var7f1b57bc
|
||||
/* f136c90: 02202025 */ or $a0,$s1,$zero
|
||||
/* f136c94: 0c00566c */ jal func000159b0
|
||||
/* f136c98: e7a00154 */ swc1 $f0,0x154($sp)
|
||||
/* f136c9c: 0fc2d5be */ jal currentPlayerGetUnk1740
|
||||
/* f136c9c: 0fc2d5be */ jal currentPlayerGetMatrix
|
||||
/* f136ca0: 00000000 */ sll $zero,$zero,0x0
|
||||
/* f136ca4: 00402025 */ or $a0,$v0,$zero
|
||||
/* f136ca8: 0c0056f8 */ jal func00015be0
|
||||
|
||||
@@ -4738,7 +4738,7 @@ glabel var7f1b5948
|
||||
/* f13b2f8: 27a40068 */ addiu $a0,$sp,0x68
|
||||
/* f13b2fc: 0c005815 */ jal func00016054
|
||||
/* f13b300: 8fa50064 */ lw $a1,0x64($sp)
|
||||
/* f13b304: 0fc2d406 */ jal currentPlayerSetUnk1740
|
||||
/* f13b304: 0fc2d406 */ jal currentPlayerSetMatrix
|
||||
/* f13b308: 27a40068 */ addiu $a0,$sp,0x68
|
||||
/* f13b30c: 3c180102 */ lui $t8,0x102
|
||||
/* f13b310: 37180040 */ ori $t8,$t8,0x40
|
||||
|
||||
@@ -1575,7 +1575,7 @@ glabel func0f13d568
|
||||
/* f13dae4: 460a3481 */ sub.s $f18,$f6,$f10
|
||||
/* f13dae8: 14a8ffe4 */ bne $a1,$t0,.L0f13da7c
|
||||
/* f13daec: e4b2fffc */ swc1 $f18,-0x4($a1)
|
||||
/* f13daf0: 0fc2d5be */ jal currentPlayerGetUnk1740
|
||||
/* f13daf0: 0fc2d5be */ jal currentPlayerGetMatrix
|
||||
/* f13daf4: 00000000 */ sll $zero,$zero,0x0
|
||||
/* f13daf8: 00402025 */ or $a0,$v0,$zero
|
||||
/* f13dafc: 0c0056c4 */ jal func00015b10
|
||||
|
||||
@@ -7009,7 +7009,7 @@ bool func0f15cd90(u32 room, struct screenbox *screen)
|
||||
|
||||
bool func0f15d08c(struct coord *a, struct coord *b)
|
||||
{
|
||||
f32 *matrixmaybe = currentPlayerGetUnk1740();
|
||||
f32 *matrixmaybe = currentPlayerGetMatrix();
|
||||
|
||||
b->x = a->x;
|
||||
b->y = a->y;
|
||||
|
||||
@@ -1229,7 +1229,7 @@ glabel func0f1666f8
|
||||
/* f166738: 24020001 */ addiu $v0,$zero,0x1
|
||||
/* f16673c: afa3001c */ sw $v1,0x1c($sp)
|
||||
.L0f166740:
|
||||
/* f166740: 0fc2d5be */ jal currentPlayerGetUnk1740
|
||||
/* f166740: 0fc2d5be */ jal currentPlayerGetMatrix
|
||||
/* f166744: afa40030 */ sw $a0,0x30($sp)
|
||||
/* f166748: 8fa3001c */ lw $v1,0x1c($sp)
|
||||
/* f16674c: 8fa40030 */ lw $a0,0x30($sp)
|
||||
|
||||
+11
-11
@@ -7848,7 +7848,7 @@ glabel func0f06c8ac
|
||||
/* f06c9a8: c6880004 */ lwc1 $f8,0x4($s4)
|
||||
/* f06c9ac: e7a8008c */ swc1 $f8,0x8c($sp)
|
||||
/* f06c9b0: c68a0008 */ lwc1 $f10,0x8($s4)
|
||||
/* f06c9b4: 0fc2d5be */ jal currentPlayerGetUnk1740
|
||||
/* f06c9b4: 0fc2d5be */ jal currentPlayerGetMatrix
|
||||
/* f06c9b8: e7aa0090 */ swc1 $f10,0x90($sp)
|
||||
/* f06c9bc: 00402025 */ or $a0,$v0,$zero
|
||||
/* f06c9c0: 0c0056d9 */ jal func00015b64
|
||||
@@ -7858,7 +7858,7 @@ glabel func0f06c8ac
|
||||
/* f06c9d0: c7b000a0 */ lwc1 $f16,0xa0($sp)
|
||||
/* f06c9d4: e7a6007c */ swc1 $f6,0x7c($sp)
|
||||
/* f06c9d8: e7b20080 */ swc1 $f18,0x80($sp)
|
||||
/* f06c9dc: 0fc2d5be */ jal currentPlayerGetUnk1740
|
||||
/* f06c9dc: 0fc2d5be */ jal currentPlayerGetMatrix
|
||||
/* f06c9e0: e7b00084 */ swc1 $f16,0x84($sp)
|
||||
/* f06c9e4: 00402025 */ or $a0,$v0,$zero
|
||||
/* f06c9e8: 0c0056c4 */ jal func00015b10
|
||||
@@ -17947,7 +17947,7 @@ glabel var7f1aa438
|
||||
/* f0758e0: 8ca5ce74 */ lw $a1,%lo(var8009ce74)($a1)
|
||||
/* f0758e4: 0c006973 */ jal func0001a5cc
|
||||
/* f0758e8: 00003025 */ or $a2,$zero,$zero
|
||||
/* f0758ec: 0fc2d5be */ jal currentPlayerGetUnk1740
|
||||
/* f0758ec: 0fc2d5be */ jal currentPlayerGetMatrix
|
||||
/* f0758f0: afa20184 */ sw $v0,0x184($sp)
|
||||
/* f0758f4: 00402025 */ or $a0,$v0,$zero
|
||||
/* f0758f8: 27a505e8 */ addiu $a1,$sp,0x5e8
|
||||
@@ -20011,7 +20011,7 @@ glabel var7f1aa44c
|
||||
/* f077484: 8ed5000c */ lw $s5,0xc($s6)
|
||||
/* f077488: 0fc23109 */ jal func0f08c424
|
||||
/* f07748c: 02a02825 */ or $a1,$s5,$zero
|
||||
/* f077490: 0fc2d5be */ jal currentPlayerGetUnk1740
|
||||
/* f077490: 0fc2d5be */ jal currentPlayerGetMatrix
|
||||
/* f077494: 00000000 */ sll $zero,$zero,0x0
|
||||
/* f077498: 00402025 */ or $a0,$v0,$zero
|
||||
/* f07749c: 0c0056f8 */ jal func00015be0
|
||||
@@ -21547,7 +21547,7 @@ glabel var7f1aa4ac
|
||||
/* f0789fc: 27a40064 */ addiu $a0,$sp,0x64
|
||||
/* f078a00: 0c005775 */ jal func00015dd4
|
||||
/* f078a04: 8fa50018 */ lw $a1,0x18($sp)
|
||||
/* f078a08: 0fc2d5be */ jal currentPlayerGetUnk1740
|
||||
/* f078a08: 0fc2d5be */ jal currentPlayerGetMatrix
|
||||
/* f078a0c: 00000000 */ sll $zero,$zero,0x0
|
||||
/* f078a10: 00402025 */ or $a0,$v0,$zero
|
||||
/* f078a14: 0c0056f8 */ jal func00015be0
|
||||
@@ -22935,7 +22935,7 @@ glabel var7f1aa588
|
||||
/* f079d5c: 8df80018 */ lw $t8,0x18($t7)
|
||||
/* f079d60: 0c0057c1 */ jal func00015f04
|
||||
/* f079d64: c70c0014 */ lwc1 $f12,0x14($t8)
|
||||
/* f079d68: 0fc2d5be */ jal currentPlayerGetUnk1740
|
||||
/* f079d68: 0fc2d5be */ jal currentPlayerGetMatrix
|
||||
/* f079d6c: 00000000 */ sll $zero,$zero,0x0
|
||||
/* f079d70: 00402025 */ or $a0,$v0,$zero
|
||||
/* f079d74: 0c0056f8 */ jal func00015be0
|
||||
@@ -27794,7 +27794,7 @@ glabel func0f07e2cc
|
||||
/* f07e314: 27a500ac */ addiu $a1,$sp,0xac
|
||||
/* f07e318: 0c005775 */ jal func00015dd4
|
||||
/* f07e31c: 24e40008 */ addiu $a0,$a3,0x8
|
||||
/* f07e320: 0fc2d5be */ jal currentPlayerGetUnk1740
|
||||
/* f07e320: 0fc2d5be */ jal currentPlayerGetMatrix
|
||||
/* f07e324: 00000000 */ sll $zero,$zero,0x0
|
||||
/* f07e328: 8e0f0018 */ lw $t7,0x18($s0)
|
||||
/* f07e32c: 00402025 */ or $a0,$v0,$zero
|
||||
@@ -28199,7 +28199,7 @@ s32 objTick(struct prop *prop)
|
||||
|
||||
sp556 = true;
|
||||
sp476.model0c = func0f1679f4(model->unk08->unk0e * 64);
|
||||
sp476.matrix = currentPlayerGetUnk1740();
|
||||
sp476.matrix = currentPlayerGetMatrix();
|
||||
func0001cebc(&sp476, model);
|
||||
|
||||
if (sp572) {
|
||||
@@ -28293,7 +28293,7 @@ s32 objTick(struct prop *prop)
|
||||
|
||||
func00015d54(obj->realrot, sp248);
|
||||
func00015dd4(&prop->pos, sp248);
|
||||
func00015a00(currentPlayerGetUnk1740(), sp248, sp152);
|
||||
func00015a00(currentPlayerGetMatrix(), sp248, sp152);
|
||||
|
||||
sp556 = true;
|
||||
sp312.model0c = func0f1679f4(model->unk08->unk0e * 64);
|
||||
@@ -30390,7 +30390,7 @@ glabel func0f080f8c
|
||||
/* f081004: 8fa50110 */ lw $a1,0x110($sp)
|
||||
/* f081008: 0c005892 */ jal func00016248
|
||||
/* f08100c: 27a600c0 */ addiu $a2,$sp,0xc0
|
||||
/* f081010: 0fc2d5be */ jal currentPlayerGetUnk1740
|
||||
/* f081010: 0fc2d5be */ jal currentPlayerGetMatrix
|
||||
/* f081014: 00000000 */ sll $zero,$zero,0x0
|
||||
/* f081018: 00402025 */ or $a0,$v0,$zero
|
||||
/* f08101c: 27a500c0 */ addiu $a1,$sp,0xc0
|
||||
@@ -45000,7 +45000,7 @@ glabel func0f08e794
|
||||
/* f08e7b8: 8c84a244 */ lw $a0,%lo(g_Vars+0x284)($a0)
|
||||
/* f08e7bc: afa20030 */ sw $v0,0x30($sp)
|
||||
/* f08e7c0: 24841bb0 */ addiu $a0,$a0,7088
|
||||
/* f08e7c4: 0fc2d5be */ jal currentPlayerGetUnk1740
|
||||
/* f08e7c4: 0fc2d5be */ jal currentPlayerGetMatrix
|
||||
/* f08e7c8: afa4001c */ sw $a0,0x1c($sp)
|
||||
/* f08e7cc: 8fa4001c */ lw $a0,0x1c($sp)
|
||||
/* f08e7d0: 8fa50038 */ lw $a1,0x38($sp)
|
||||
|
||||
+2
-2
@@ -2217,7 +2217,7 @@ glabel var7f1b5780
|
||||
/* f133070: afa00194 */ sw $zero,0x194($sp)
|
||||
/* f133074: 0c00566c */ jal func000159b0
|
||||
/* f133078: 02002025 */ or $a0,$s0,$zero
|
||||
/* f13307c: 0fc2d5be */ jal currentPlayerGetUnk1740
|
||||
/* f13307c: 0fc2d5be */ jal currentPlayerGetMatrix
|
||||
/* f133080: 00000000 */ sll $zero,$zero,0x0
|
||||
/* f133084: 00402025 */ or $a0,$v0,$zero
|
||||
/* f133088: 0c0056f8 */ jal func00015be0
|
||||
@@ -3861,7 +3861,7 @@ glabel var7f1b5790
|
||||
/* f134878: afa00198 */ sw $zero,0x198($sp)
|
||||
/* f13487c: 0c00566c */ jal func000159b0
|
||||
/* f134880: 02002025 */ or $a0,$s0,$zero
|
||||
/* f134884: 0fc2d5be */ jal currentPlayerGetUnk1740
|
||||
/* f134884: 0fc2d5be */ jal currentPlayerGetMatrix
|
||||
/* f134888: 00000000 */ sll $zero,$zero,0x0
|
||||
/* f13488c: 00402025 */ or $a0,$v0,$zero
|
||||
/* f134890: 0c0056f8 */ jal func00015be0
|
||||
|
||||
@@ -14,7 +14,7 @@ u32 func0f12acec(void);
|
||||
u32 func0f12af5c(void);
|
||||
u32 func0f12b0e0(void);
|
||||
u32 func0f12bbdc(void);
|
||||
u32 func0f12c5a8(void);
|
||||
u32 explosionUpdateZ(struct prop *prop);
|
||||
u32 func0f12c654(void);
|
||||
u32 func0f12cd64(void);
|
||||
|
||||
|
||||
@@ -31,10 +31,10 @@ void currentPlayerSetUnk1750(u32 value);
|
||||
u32 currentPlayerGetUnk1750(void);
|
||||
void currentPlayerSetUnk1758(u32 value);
|
||||
u32 currentPlayerGetUnk1758(void);
|
||||
void currentPlayerSetUnk1740(f32 *value);
|
||||
void currentPlayerSetMatrix(f32 *value);
|
||||
u32 func0f0b5050(void);
|
||||
u32 func0f0b53a4(void);
|
||||
f32 *currentPlayerGetUnk1740(void);
|
||||
f32 *currentPlayerGetMatrix(void);
|
||||
void currentPlayerSetUnk1754(u32 value);
|
||||
u32 currentPlayerGetUnk1754(void);
|
||||
void currentPlayerSetUnk174c(u32 value);
|
||||
|
||||
+3
-3
@@ -1782,7 +1782,7 @@ struct player {
|
||||
/*0x0038*/ struct coord globaldrawworldoffset;
|
||||
/*0x0044*/ struct coord globaldrawcameraoffset;
|
||||
/*0x0050*/ struct coord globaldrawworldbgoffset;
|
||||
/*0x005c*/ f32 *matrix;
|
||||
/*0x005c*/ f32 *matrix5c;
|
||||
/*0x0060*/ u32 unk0060;
|
||||
/*0x0064*/ u32 unk0064;
|
||||
/*0x0068*/ u32 unk0068;
|
||||
@@ -2205,7 +2205,7 @@ struct player {
|
||||
/*0x1734*/ f32 c_recipscaley;
|
||||
/*0x1738*/ u32 unk1738;
|
||||
/*0x173c*/ u32 unk173c;
|
||||
/*0x1740*/ f32 *unk1740;
|
||||
/*0x1740*/ f32 *matrix;
|
||||
/*0x1744*/ u32 unk1744;
|
||||
/*0x1748*/ u32 unk1748;
|
||||
/*0x174c*/ u32 unk174c;
|
||||
@@ -2213,7 +2213,7 @@ struct player {
|
||||
/*0x1754*/ u32 unk1754;
|
||||
/*0x1758*/ u32 unk1758;
|
||||
/*0x175c*/ u32 unk175c;
|
||||
/*0x1760*/ f32 *unk1760;
|
||||
/*0x1760*/ f32 *prevmatrix;
|
||||
/*0x1764*/ u32 unk1764;
|
||||
/*0x1768*/ u32 unk1768;
|
||||
/*0x176c*/ f32 c_scalelod60;
|
||||
|
||||
+1
-1
@@ -1606,7 +1606,7 @@ glabel func0000ab78
|
||||
/* abb8: e7a60014 */ swc1 $f6,0x14($sp)
|
||||
/* abbc: 0c001210 */ jal func00004840
|
||||
/* abc0: e7a80018 */ swc1 $f8,0x18($sp)
|
||||
/* abc4: 0fc2d5be */ jal currentPlayerGetUnk1740
|
||||
/* abc4: 0fc2d5be */ jal currentPlayerGetMatrix
|
||||
/* abc8: 00000000 */ sll $zero,$zero,0x0
|
||||
/* abcc: 00402025 */ or $a0,$v0,$zero
|
||||
/* abd0: 0c005746 */ jal func00015d18
|
||||
|
||||
Reference in New Issue
Block a user