popux/perfect_dark
1
0 Fork 0
forked from Ports/perfect_dark
Code Pull Requests Activity

Rename lib_159b0.c to mtxasm.s and lib_16110.c to mtx.c

Browse Source
This commit is contained in:
Ryan Dwyer committed 2021-10-11 21:46:17 +10:00
1 parent c1657dd95b
commit bba63fe1fd
90 files changed
+2043 -2115
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

docs/piracychecks.md
+1 -1
View File
@@ -118,7 +118,7 @@ The decomp project wraps all decompiled piracy checks in `#if PIRACYCHECKS` stat
**When Called:** When loading a normal stage (eg. CI Training).
**What It Checks:** Calls `func00015fd0` to get the value of `osRomBase` then compares it with a known value.
**What It Checks:** Calls `mtxGetObfuscatedRomBase` to get the value of `osRomBase` then compares it with a known value.
**Payload:** Copies 4KB from a random location in ROM to a random location in RAM.
ld/libfiles.ntsc-beta.inc
+2 -2
View File
@@ -52,8 +52,8 @@
build/ROMID/lib/joy.o (section); \
build/ROMID/lib/lib_15850.o (section); \
build/ROMID/lib/gvars.o (section); \
build/ROMID/lib/lib_159b0.o (section); \
build/ROMID/lib/lib_16110.o (section); \
build/ROMID/lib/mtxasm.o (section); \
build/ROMID/lib/mtx.o (section); \
build/ROMID/lib/lib_17ce0.o (section); \
build/ROMID/lib/lib_184d0.o (section); \
build/ROMID/lib/lib_18680.o (section); \
ld/libfiles.ntsc-final.inc
+2 -2
View File
@@ -50,8 +50,8 @@
build/ROMID/lib/joy.o (section); \
build/ROMID/lib/lib_15850.o (section); \
build/ROMID/lib/gvars.o (section); \
build/ROMID/lib/lib_159b0.o (section); \
build/ROMID/lib/lib_16110.o (section); \
build/ROMID/lib/mtxasm.o (section); \
build/ROMID/lib/mtx.o (section); \
build/ROMID/lib/lib_17ce0.o (section); \
build/ROMID/lib/lib_184d0.o (section); \
build/ROMID/lib/lib_18680.o (section); \
ld/libfiles.pal-final.inc
+2 -2
View File
@@ -50,8 +50,8 @@
build/ROMID/lib/joy.o (section); \
build/ROMID/lib/lib_15850.o (section); \
build/ROMID/lib/gvars.o (section); \
build/ROMID/lib/lib_159b0.o (section); \
build/ROMID/lib/lib_16110.o (section); \
build/ROMID/lib/mtxasm.o (section); \
build/ROMID/lib/mtx.o (section); \
build/ROMID/lib/lib_17ce0.o (section); \
build/ROMID/lib/lib_184d0.o (section); \
build/ROMID/lib/lib_18680.o (section); \
src/game/activemenu/activemenu.c
+1 -1
View File
@@ -20,7 +20,7 @@
#include "bss.h"
#include "lib/lib_09a80.h"
#include "lib/main.h"
#include "lib/lib_16110.h"
#include "lib/mtx.h"
#include "lib/lib_184d0.h"
#include "data.h"
#include "types.h"
src/game/bg.c
+10 -11
View File
@@ -35,8 +35,7 @@
#include "lib/memory.h"
#include "lib/lib_126b0.h"
#include "lib/rng.h"
#include "lib/lib_159b0.h"
#include "lib/lib_16110.h"
#include "lib/mtx.h"
#include "lib/lib_2f490.h"
#include "data.h"
#include "types.h"
@@ -5161,7 +5160,7 @@ glabel var7f1b75d0
/* f15bb40: e4400068 */ swc1 $f0,0x68($v0)
/* f15bb44: 3c013f80 */ lui $at,0x3f80
/* f15bb48: 44816000 */ mtc1 $at,$f12
/* f15bb4c: 0c0059d2 */ jal func00016748
/* f15bb4c: 0c0059d2 */ jal mtx00016748
/* f15bb50: 00000000 */ nop
/* f15bb54: 3c0e800a */ lui $t6,%hi(var800a4920)
/* f15bb58: 8dce4920 */ lw $t6,%lo(var800a4920)($t6)
@@ -6225,7 +6224,7 @@ glabel var7f1b75d0
/* f15b904: e4400068 */ swc1 $f0,0x68($v0)
/* f15b908: 3c013f80 */ lui $at,0x3f80
/* f15b90c: 44816000 */ mtc1 $at,$f12
/* f15b910: 0c0059d2 */ jal func00016748
/* f15b910: 0c0059d2 */ jal mtx00016748
/* f15b914: 00000000 */ nop
/* f15b918: 3c0e800a */ lui $t6,%hi(var800a4920)
/* f15b91c: 8dce4920 */ lw $t6,%lo(var800a4920)($t6)
@@ -7287,7 +7286,7 @@ glabel var7f1b75d0
/* f156298: e4400068 */ swc1 $f0,0x68($v0)
/* f15629c: 3c013f80 */ lui $at,0x3f80
/* f1562a0: 44816000 */ mtc1 $at,$f12
/* f1562a4: 0c005db6 */ jal func00016748
/* f1562a4: 0c005db6 */ jal mtx00016748
/* f1562a8: 00000000 */ sll $zero,$zero,0x0
/* f1562ac: 3c0e800b */ lui $t6,0x800b
/* f1562b0: 8dce90a0 */ lw $t6,-0x6f60($t6)
@@ -8255,7 +8254,7 @@ glabel var7f1b75d0
// g_Vars.playerstats[s4].scale_bg2gfx = g_Stages[g_StageIndex].unk18;
// }
//
// func00016748(1);
// mtx00016748(1);
//
// // b64
// if (var800a4920 == 0) {
@@ -8611,7 +8610,7 @@ glabel var7f1b75d0
void func0f15c850(void)
{
func0f15e538();
func00016748(1);
mtx00016748(1);
}
void func0f15c880(f32 arg0)
@@ -8632,7 +8631,7 @@ f32 currentPlayerGetScaleBg2Gfx(void)
void currentPlayerSetScaleBg2Gfx(f32 scale)
{
g_Vars.currentplayerstats->scale_bg2gfx = g_Stages[g_StageIndex].unk18 * scale;
func00016748(g_Vars.currentplayerstats->scale_bg2gfx);
mtx00016748(g_Vars.currentplayerstats->scale_bg2gfx);
}
void func0f15c920(void)
@@ -8949,7 +8948,7 @@ bool func0f15d08c(struct coord *a, struct coord *b)
b->y = a->y;
b->z = a->z;
func00015b64(matrix, b);
mtx00015b64(matrix, b);
func0f0b4d68(b, b);
if (b->z > 0) {
@@ -12696,7 +12695,7 @@ glabel func0f15ffdc
/* f160180: 468084a0 */ cvt.s.w $f18,$f16
/* f160184: e6120008 */ swc1 $f18,0x8($s0)
/* f160188: a7a800ee */ sh $t0,0xee($sp)
/* f16018c: 0c0056d9 */ jal func00015b64
/* f16018c: 0c0056d9 */ jal mtx00015b64
/* f160190: 8fa400a8 */ lw $a0,0xa8($sp)
/* f160194: 2631ffff */ addiu $s1,$s1,-1
/* f160198: 87a800ee */ lh $t0,0xee($sp)
@@ -16000,7 +15999,7 @@ glabel func0f162d9c
/* f162eb0: 0fc2d5de */ jal currentPlayerGetUnk174c
/* f162eb4: e7b2009c */ swc1 $f18,0x9c($sp)
/* f162eb8: 00402025 */ or $a0,$v0,$zero
/* f162ebc: 0c0056d9 */ jal func00015b64
/* f162ebc: 0c0056d9 */ jal mtx00015b64
/* f162ec0: 27a50094 */ addiu $a1,$sp,0x94
/* f162ec4: c7a40094 */ lwc1 $f4,0x94($sp)
/* f162ec8: 3c047f1b */ lui $a0,%hi(var7f1b75ac)
src/game/bondbike.c
+18 -19
View File
@@ -17,8 +17,7 @@
#include "game/options.h"
#include "game/propobj.h"
#include "bss.h"
#include "lib/lib_159b0.h"
#include "lib/lib_16110.h"
#include "lib/mtx.h"
#include "lib/lib_233c0.h"
#include "lib/lib_24e40.h"
#include "data.h"
@@ -43,10 +42,10 @@ void bbikeInit(void)
g_Vars.currentplayer->bondenterpos.y = g_Vars.currentplayer->prop->pos.y;
g_Vars.currentplayer->bondenterpos.z = g_Vars.currentplayer->prop->pos.z;
func00015d54(hoverbike->base.realrot, &matrix);
func00015dd4(&hoverbike->base.prop->pos, &matrix);
func00015b68(&matrix, &g_Vars.currentplayer->bondvehicleoffset, &g_Vars.currentplayer->bondenteraim);
func00016b58(&g_Vars.currentplayer->bondentermtx,
mtx00015d54(hoverbike->base.realrot, &matrix);
mtx00015dd4(&hoverbike->base.prop->pos, &matrix);
mtx00015b68(&matrix, &g_Vars.currentplayer->bondvehicleoffset, &g_Vars.currentplayer->bondenteraim);
mtx00016b58(&g_Vars.currentplayer->bondentermtx,
0, 0, 0,
-g_Vars.currentplayer->bond2.unk1c.x, -g_Vars.currentplayer->bond2.unk1c.y, -g_Vars.currentplayer->bond2.unk1c.z,
g_Vars.currentplayer->bond2.unk28.x, g_Vars.currentplayer->bond2.unk28.y, g_Vars.currentplayer->bond2.unk28.z);
@@ -1130,9 +1129,9 @@ s32 bbikeCalculateNewPosition(struct coord *vel, f32 angledelta)
hoverpropSetTurnAngle(&bike->base, newangle);
func00016374(newangle, &sp44);
func00015f04(bike->base.model->scale, &sp44);
func00015da0(&sp44, bike->base.realrot);
mtx00016374(newangle, &sp44);
mtx00015f04(bike->base.model->scale, &sp44);
mtx00015da0(&sp44, bike->base.realrot);
}
if (result == CDRESULT_NOCOLLISION && hasvel) {
@@ -1659,9 +1658,9 @@ void bbikeTick(void)
func0f0714b8(obj, &bike->hov);
func0f069c70(obj, true, true);
func00015d54(obj->realrot, &sp1a8);
func00015dd4(&obj->prop->pos, &sp1a8);
func00015b68(&sp1a8, &g_Vars.currentplayer->bondvehicleoffset, &sp1e8);
mtx00015d54(obj->realrot, &sp1a8);
mtx00015dd4(&obj->prop->pos, &sp1a8);
mtx00015b68(&sp1a8, &g_Vars.currentplayer->bondvehicleoffset, &sp1e8);
bbikeUpdateVertical(&sp1e8);
@@ -1681,22 +1680,22 @@ void bbikeTick(void)
bheadAdjustAnimation(0);
bheadUpdate(0, 0);
func000162e8((360.0f - g_Vars.currentplayer->vv_verta360) * 0.017450513318181f, &sp164);
mtx000162e8((360.0f - g_Vars.currentplayer->vv_verta360) * 0.017450513318181f, &sp164);
func00016d58(&sp124, 0.0f, 0.0f, 0.0f,
mtx00016d58(&sp124, 0.0f, 0.0f, 0.0f,
-g_Vars.currentplayer->headlook.x, -g_Vars.currentplayer->headlook.y, -g_Vars.currentplayer->headlook.z,
g_Vars.currentplayer->headup.x, g_Vars.currentplayer->headup.y, g_Vars.currentplayer->headup.z);
func000159fc(&sp124, &sp164);
func00015d54(obj->realrot, &sp124);
func00015f04(1.0f / obj->model->scale, &sp124);
func00016374(hoverpropGetTurnAngle(obj), &spe4);
mtx000159fc(&sp124, &sp164);
mtx00015d54(obj->realrot, &sp124);
mtx00015f04(1.0f / obj->model->scale, &sp124);
mtx00016374(hoverpropGetTurnAngle(obj), &spe4);
func0f097044(&spe4, &spd4);
func0f097044(&sp124, &spc4);
func0f0976c0(&spc4, &spd4);
func0f0972b8(&spd4, &spc4, 0.8f, spb4);
func0f096ed4(spb4, &sp124);
func000159fc(&sp124, &sp164);
mtx000159fc(&sp124, &sp164);
if (g_Vars.currentplayer->bondvehiclemode == VEHICLEMODE_OFF) {
g_Vars.currentplayer->bondentert += g_Vars.lvupdate240freal / 60.0f;
src/game/bondeyespy.c
+1 -1
View File
@@ -19,7 +19,7 @@
#include "lib/joy.h"
#include "lib/main.h"
#include "lib/snd.h"
#include "lib/lib_16110.h"
#include "lib/mtx.h"
#include "lib/lib_233c0.h"
#include "lib/lib_24e40.h"
#include "data.h"
src/game/bondgrab.c
+3 -4
View File
@@ -12,8 +12,7 @@
#include "game/bondhead.h"
#include "game/propobj.h"
#include "bss.h"
#include "lib/lib_159b0.h"
#include "lib/lib_16110.h"
#include "lib/mtx.h"
#include "lib/lib_233c0.h"
#include "lib/lib_24e40.h"
#include "data.h"
@@ -70,8 +69,8 @@ void bgrabInit(void)
g_Vars.currentplayer->gunextraaimx = 0;
g_Vars.currentplayer->gunextraaimy = 0;
func00016374((g_Vars.currentplayer->vv_theta * M_BADTAU) / 360.0f, &matrix);
func00015b10(&matrix, &g_Vars.currentplayer->grabbedposoffset);
mtx00016374((g_Vars.currentplayer->vv_theta * M_BADTAU) / 360.0f, &matrix);
mtx00015b10(&matrix, &g_Vars.currentplayer->grabbedposoffset);
g_Vars.currentplayer->bondprevtheta = g_Vars.currentplayer->vv_theta;
src/game/bondgun.c
+187 -188
View File
File diff suppressed because it is too large. Load diff
src/game/bondhead.c
+2 -2
View File
@@ -5,7 +5,7 @@
#include "game/bondhead.h"
#include "bss.h"
#include "lib/rng.h"
#include "lib/lib_159b0.h"
#include "lib/mtx.h"
#include "lib/lib_233c0.h"
#include "lib/model.h"
#include "data.h"
@@ -154,7 +154,7 @@ void bheadUpdate(f32 arg0, f32 arg1)
func0001ee18(&g_Vars.currentplayer->model, g_Vars.lvupdate240, true);
func0001e29c(somebool);
func0001b3bc(&g_Vars.currentplayer->model);
func000159b0(&sp40);
mtx000159b0(&sp40);
sp80.matrix = &sp40;
sp80.unk10 = g_Vars.currentplayer->bondheadmatrices;
src/game/bondmove.c
+7 -8
View File
@@ -31,8 +31,7 @@
#include "lib/joy.h"
#include "lib/snd.h"
#include "lib/rng.h"
#include "lib/lib_159b0.h"
#include "lib/lib_16110.h"
#include "lib/mtx.h"
#include "lib/lib_233c0.h"
#include "data.h"
#include "types.h"
@@ -1501,7 +1500,7 @@ void bmoveProcessInput(bool allowc1x, bool allowc1y, bool allowc1buttons, bool i
g_Vars.currentplayer->gunzoomfovs[1] = eraserfov;
func00015b68(currentPlayerGetMatrix1740(), &g_Vars.currentplayer->autoerasertarget->pos, &spa0);
mtx00015b68(currentPlayerGetMatrix1740(), &g_Vars.currentplayer->autoerasertarget->pos, &spa0);
func0f0b4eb8(&spa0, crosspos, eraserfov, g_Vars.currentplayer->c_perspaspect);
@@ -2095,18 +2094,18 @@ void bmoveUpdateHead(f32 arg0, f32 arg1, f32 arg2, Mtxf *arg3, f32 arg4)
}
bheadUpdate(sp244, arg2);
func000162e8(BADDEG2RAD(360 - g_Vars.currentplayer->vv_verta360), &sp180);
mtx000162e8(BADDEG2RAD(360 - g_Vars.currentplayer->vv_verta360), &sp180);
if (optionsGetHeadRoll(g_Vars.currentplayerstats->mpindex)) {
func00016d58(&sp116,
mtx00016d58(&sp116,
0, 0, 0,
-g_Vars.currentplayer->headlook.x, -g_Vars.currentplayer->headlook.y, -g_Vars.currentplayer->headlook.z,
g_Vars.currentplayer->headup.x, g_Vars.currentplayer->headup.y, g_Vars.currentplayer->headup.z);
func000159fc(&sp116, &sp180);
mtx000159fc(&sp116, &sp180);
}
func00016374(BADDEG2RAD(360 - g_Vars.currentplayer->vv_theta), &sp116);
func000159fc(&sp116, &sp180);
mtx00016374(BADDEG2RAD(360 - g_Vars.currentplayer->vv_theta), &sp116);
mtx000159fc(&sp116, &sp180);
if (arg3) {
func0f097044(&sp180, &sp100);
src/game/bondview.c
+1 -1
View File
@@ -14,7 +14,7 @@
#include "lib/lib_09a80.h"
#include "lib/main.h"
#include "lib/rng.h"
#include "lib/lib_16110.h"
#include "lib/mtx.h"
#include "data.h"
#include "types.h"
#include "gbiex.h"
src/game/bondwalk.c
+3 -3
View File
@@ -19,7 +19,7 @@
#include "bss.h"
#include "lib/snd.h"
#include "lib/rng.h"
#include "lib/lib_16110.h"
#include "lib/mtx.h"
#include "lib/lib_233c0.h"
#include "lib/lib_24e40.h"
#include "data.h"
@@ -88,7 +88,7 @@ void bwalkInit(void)
if (g_Vars.currentplayer->walkinitmove) {
struct coord delta;
func00016b58(&g_Vars.currentplayer->walkinitmtx,
mtx00016b58(&g_Vars.currentplayer->walkinitmtx,
0, 0, 0,
-g_Vars.currentplayer->bond2.unk1c.x, -g_Vars.currentplayer->bond2.unk1c.y, -g_Vars.currentplayer->bond2.unk1c.z,
g_Vars.currentplayer->bond2.unk28.x, g_Vars.currentplayer->bond2.unk28.y, g_Vars.currentplayer->bond2.unk28.z);
@@ -250,7 +250,7 @@ glabel var7f1a7ad0
/* f0c1590: c44a0398 */ lwc1 $f10,0x398($v0)
/* f0c1594: e7aa0020 */ swc1 $f10,0x20($sp)
/* f0c1598: c450039c */ lwc1 $f16,0x39c($v0)
/* f0c159c: 0c005eba */ jal func00016b58
/* f0c159c: 0c005eba */ jal mtx00016b58
/* f0c15a0: e7b00024 */ swc1 $f16,0x24($sp)
/* f0c15a4: 8e0d0284 */ lw $t5,0x284($s0)
/* f0c15a8: 00002825 */ or $a1,$zero,$zero
src/game/camdraw.c
+1 -1
View File
@@ -15,7 +15,7 @@
#include "lib/model.h"
#include "lib/lib_126b0.h"
#include "lib/rng.h"
#include "lib/lib_16110.h"
#include "lib/mtx.h"
#include "lib/libc/ll.h"
#include "data.h"
#include "types.h"
src/game/casing/tick.c
+3 -3
View File
@@ -4,7 +4,7 @@
#include "bss.h"
#include "lib/snd.h"
#include "lib/rng.h"
#include "lib/lib_16110.h"
#include "lib/mtx.h"
#include "lib/lib_317f0.h"
#include "data.h"
#include "types.h"
@@ -199,7 +199,7 @@ glabel casingTick
/* f01dca0: 27b2008c */ addiu $s2,$sp,0x8c
/* f01dca4: 02402025 */ or $a0,$s2,$zero
.L0f01dca8:
/* f01dca8: 0c005844 */ jal func00016110
/* f01dca8: 0c005844 */ jal mtx00016110
/* f01dcac: 02602825 */ or $a1,$s3,$zero
/* f01dcb0: 8e8c0034 */ lw $t4,0x34($s4)
/* f01dcb4: 26310001 */ addiu $s1,$s1,0x1
@@ -441,7 +441,7 @@ glabel casingTick
/* f01dca0: 27b2008c */ addiu $s2,$sp,0x8c
/* f01dca4: 02402025 */ or $a0,$s2,$zero
.L0f01dca8:
/* f01dca8: 0c005844 */ jal func00016110
/* f01dca8: 0c005844 */ jal mtx00016110
/* f01dcac: 02602825 */ or $a1,$s3,$zero
/* f01dcb0: 8e8c0034 */ lw $t4,0x34($s4)
/* f01dcb4: 26310001 */ addiu $s1,$s1,0x1
src/game/chr/chr.c
+105 -106
View File
@@ -40,8 +40,7 @@
#include "lib/main.h"
#include "lib/model.h"
#include "lib/rng.h"
#include "lib/lib_159b0.h"
#include "lib/lib_16110.h"
#include "lib/mtx.h"
#include "lib/lib_233c0.h"
#include "lib/lib_24e40.h"
#include "data.h"
@@ -4872,7 +4871,7 @@ glabel var7f1a879c
/* f0215c8: 0fc2d5de */ jal currentPlayerGetUnk174c
/* f0215cc: e7ae00b0 */ swc1 $f14,0xb0($sp)
/* f0215d0: 00402025 */ or $a0,$v0,$zero
/* f0215d4: 0c0056f8 */ jal func00015be0
/* f0215d4: 0c0056f8 */ jal mtx00015be0
/* f0215d8: 8fa5015c */ lw $a1,0x15c($sp)
/* f0215dc: 8fa2015c */ lw $v0,0x15c($sp)
/* f0215e0: c7ae00b0 */ lwc1 $f14,0xb0($sp)
@@ -4912,16 +4911,16 @@ glabel var7f1a879c
/* f021660: 46120301 */ sub.s $f12,$f0,$f18
/* f021664: e7a200b4 */ swc1 $f2,0xb4($sp)
.L0f021668:
/* f021668: 0c0058dd */ jal func00016374
/* f021668: 0c0058dd */ jal mtx00016374
/* f02166c: e7ae00b0 */ swc1 $f14,0xb0($sp)
/* f021670: 27a400b8 */ addiu $a0,$sp,0xb8
/* f021674: 0c0056f8 */ jal func00015be0
/* f021674: 0c0056f8 */ jal mtx00015be0
/* f021678: 8fa5015c */ lw $a1,0x15c($sp)
/* f02167c: c7ac00b0 */ lwc1 $f12,0xb0($sp)
/* f021680: 0c0058ba */ jal func000162e8
/* f021680: 0c0058ba */ jal mtx000162e8
/* f021684: 27a500f8 */ addiu $a1,$sp,0xf8
/* f021688: 27a400f8 */ addiu $a0,$sp,0xf8
/* f02168c: 0c0056f8 */ jal func00015be0
/* f02168c: 0c0056f8 */ jal mtx00015be0
/* f021690: 8fa5015c */ lw $a1,0x15c($sp)
/* f021694: c7a600b4 */ lwc1 $f6,0xb4($sp)
/* f021698: c7a800ac */ lwc1 $f8,0xac($sp)
@@ -4934,10 +4933,10 @@ glabel var7f1a879c
/* f0216b4: 00000000 */ nop
/* f0216b8: 46120301 */ sub.s $f12,$f0,$f18
.L0f0216bc:
/* f0216bc: 0c0058dd */ jal func00016374
/* f0216bc: 0c0058dd */ jal mtx00016374
/* f0216c0: 27a500b8 */ addiu $a1,$sp,0xb8
/* f0216c4: 27a400b8 */ addiu $a0,$sp,0xb8
/* f0216c8: 0c0056f8 */ jal func00015be0
/* f0216c8: 0c0056f8 */ jal mtx00015be0
/* f0216cc: 8fa5015c */ lw $a1,0x15c($sp)
/* f0216d0: 3c013f80 */ lui $at,0x3f80
/* f0216d4: 44816000 */ mtc1 $at,$f12
@@ -4946,7 +4945,7 @@ glabel var7f1a879c
/* f0216e0: 00000000 */ nop
/* f0216e4: 45030004 */ bc1tl .L0f0216f8
/* f0216e8: 8fa2015c */ lw $v0,0x15c($sp)
/* f0216ec: 0c0057c1 */ jal func00015f04
/* f0216ec: 0c0057c1 */ jal mtx00015f04
/* f0216f0: 8fa5015c */ lw $a1,0x15c($sp)
/* f0216f4: 8fa2015c */ lw $v0,0x15c($sp)
.L0f0216f8:
@@ -4958,7 +4957,7 @@ glabel var7f1a879c
/* f02170c: 0fc2d5be */ jal currentPlayerGetMatrix1740
/* f021710: e4460038 */ swc1 $f6,0x38($v0)
/* f021714: 00402025 */ or $a0,$v0,$zero
/* f021718: 0c0056f8 */ jal func00015be0
/* f021718: 0c0056f8 */ jal mtx00015be0
/* f02171c: 8fa5015c */ lw $a1,0x15c($sp)
/* f021720: 1000021e */ b .L0f021f9c
/* f021724: 8fbf0014 */ lw $ra,0x14($sp)
@@ -5459,7 +5458,7 @@ glabel var7f1a879c
/* f021e0c: 0fc2d5de */ jal currentPlayerGetUnk174c
/* f021e10: e7ae00a4 */ swc1 $f14,0xa4($sp)
/* f021e14: 00402025 */ or $a0,$v0,$zero
/* f021e18: 0c0056f8 */ jal func00015be0
/* f021e18: 0c0056f8 */ jal mtx00015be0
/* f021e1c: 8fa5015c */ lw $a1,0x15c($sp)
/* f021e20: 8fa2015c */ lw $v0,0x15c($sp)
/* f021e24: c7ae00a4 */ lwc1 $f14,0xa4($sp)
@@ -5493,10 +5492,10 @@ glabel var7f1a879c
/* f021e90: 00000000 */ nop
/* f021e94: 46126300 */ add.s $f12,$f12,$f18
.L0f021e98:
/* f021e98: 0c0058dd */ jal func00016374
/* f021e98: 0c0058dd */ jal mtx00016374
/* f021e9c: e7ae00a4 */ swc1 $f14,0xa4($sp)
/* f021ea0: 27a4002c */ addiu $a0,$sp,0x2c
/* f021ea4: 0c0056f8 */ jal func00015be0
/* f021ea4: 0c0056f8 */ jal mtx00015be0
/* f021ea8: 8fa5015c */ lw $a1,0x15c($sp)
/* f021eac: c7ae00a4 */ lwc1 $f14,0xa4($sp)
/* f021eb0: 44808000 */ mtc1 $zero,$f16
@@ -5505,10 +5504,10 @@ glabel var7f1a879c
/* f021ebc: 00000000 */ nop
/* f021ec0: 45030009 */ bc1tl .L0f021ee8
/* f021ec4: c7a6009c */ lwc1 $f6,0x9c($sp)
/* f021ec8: 0c0058ba */ jal func000162e8
/* f021ec8: 0c0058ba */ jal mtx000162e8
/* f021ecc: 46007306 */ mov.s $f12,$f14
/* f021ed0: 27a4002c */ addiu $a0,$sp,0x2c
/* f021ed4: 0c0056f8 */ jal func00015be0
/* f021ed4: 0c0056f8 */ jal mtx00015be0
/* f021ed8: 8fa5015c */ lw $a1,0x15c($sp)
/* f021edc: 44808000 */ mtc1 $zero,$f16
/* f021ee0: 00000000 */ nop
@@ -5519,25 +5518,25 @@ glabel var7f1a879c
/* f021ef0: 00000000 */ nop
/* f021ef4: 45030007 */ bc1tl .L0f021f14
/* f021ef8: c7ac006c */ lwc1 $f12,0x6c($sp)
/* f021efc: 0c005900 */ jal func00016400
/* f021efc: 0c005900 */ jal mtx00016400
/* f021f00: 46003306 */ mov.s $f12,$f6
/* f021f04: 27a4002c */ addiu $a0,$sp,0x2c
/* f021f08: 0c0056f8 */ jal func00015be0
/* f021f08: 0c0056f8 */ jal mtx00015be0
/* f021f0c: 8fa5015c */ lw $a1,0x15c($sp)
/* f021f10: c7ac006c */ lwc1 $f12,0x6c($sp)
.L0f021f14:
/* f021f14: 0c0058dd */ jal func00016374
/* f021f14: 0c0058dd */ jal mtx00016374
/* f021f18: 27a5002c */ addiu $a1,$sp,0x2c
/* f021f1c: 27a4002c */ addiu $a0,$sp,0x2c
/* f021f20: 0c0056f8 */ jal func00015be0
/* f021f20: 0c0056f8 */ jal mtx00015be0
/* f021f24: 8fa5015c */ lw $a1,0x15c($sp)
/* f021f28: 10000007 */ b .L0f021f48
/* f021f2c: 3c013f80 */ lui $at,0x3f80
.L0f021f30:
/* f021f30: 0c0058dd */ jal func00016374
/* f021f30: 0c0058dd */ jal mtx00016374
/* f021f34: 27a5002c */ addiu $a1,$sp,0x2c
/* f021f38: 27a4002c */ addiu $a0,$sp,0x2c
/* f021f3c: 0c0056f8 */ jal func00015be0
/* f021f3c: 0c0056f8 */ jal mtx00015be0
/* f021f40: 8fa5015c */ lw $a1,0x15c($sp)
/* f021f44: 3c013f80 */ lui $at,0x3f80
.L0f021f48:
@@ -5548,7 +5547,7 @@ glabel var7f1a879c
/* f021f58: 00000000 */ nop
/* f021f5c: 45030004 */ bc1tl .L0f021f70
/* f021f60: c7a80070 */ lwc1 $f8,0x70($sp)
/* f021f64: 0c0057c1 */ jal func00015f04
/* f021f64: 0c0057c1 */ jal mtx00015f04
/* f021f68: 46002306 */ mov.s $f12,$f4
/* f021f6c: c7a80070 */ lwc1 $f8,0x70($sp)
.L0f021f70:
@@ -5560,7 +5559,7 @@ glabel var7f1a879c
/* f021f84: 0fc2d5be */ jal currentPlayerGetMatrix1740
/* f021f88: e5aa0038 */ swc1 $f10,0x38($t5)
/* f021f8c: 00402025 */ or $a0,$v0,$zero
/* f021f90: 0c0056f8 */ jal func00015be0
/* f021f90: 0c0056f8 */ jal mtx00015be0
/* f021f94: 8fa5015c */ lw $a1,0x15c($sp)
.L0f021f98:
/* f021f98: 8fbf0014 */ lw $ra,0x14($sp)
@@ -5666,7 +5665,7 @@ glabel var7f1a879c
/* f0215c8: 0fc2d5de */ jal currentPlayerGetUnk174c
/* f0215cc: e7ae00b0 */ swc1 $f14,0xb0($sp)
/* f0215d0: 00402025 */ or $a0,$v0,$zero
/* f0215d4: 0c0056f8 */ jal func00015be0
/* f0215d4: 0c0056f8 */ jal mtx00015be0
/* f0215d8: 8fa5015c */ lw $a1,0x15c($sp)
/* f0215dc: 8fa2015c */ lw $v0,0x15c($sp)
/* f0215e0: c7ae00b0 */ lwc1 $f14,0xb0($sp)
@@ -5706,16 +5705,16 @@ glabel var7f1a879c
/* f021660: 46120301 */ sub.s $f12,$f0,$f18
/* f021664: e7a200b4 */ swc1 $f2,0xb4($sp)
.L0f021668:
/* f021668: 0c0058dd */ jal func00016374
/* f021668: 0c0058dd */ jal mtx00016374
/* f02166c: e7ae00b0 */ swc1 $f14,0xb0($sp)
/* f021670: 27a400b8 */ addiu $a0,$sp,0xb8
/* f021674: 0c0056f8 */ jal func00015be0
/* f021674: 0c0056f8 */ jal mtx00015be0
/* f021678: 8fa5015c */ lw $a1,0x15c($sp)
/* f02167c: c7ac00b0 */ lwc1 $f12,0xb0($sp)
/* f021680: 0c0058ba */ jal func000162e8
/* f021680: 0c0058ba */ jal mtx000162e8
/* f021684: 27a500f8 */ addiu $a1,$sp,0xf8
/* f021688: 27a400f8 */ addiu $a0,$sp,0xf8
/* f02168c: 0c0056f8 */ jal func00015be0
/* f02168c: 0c0056f8 */ jal mtx00015be0
/* f021690: 8fa5015c */ lw $a1,0x15c($sp)
/* f021694: c7a600b4 */ lwc1 $f6,0xb4($sp)
/* f021698: c7a800ac */ lwc1 $f8,0xac($sp)
@@ -5728,10 +5727,10 @@ glabel var7f1a879c
/* f0216b4: 00000000 */ nop
/* f0216b8: 46120301 */ sub.s $f12,$f0,$f18
.L0f0216bc:
/* f0216bc: 0c0058dd */ jal func00016374
/* f0216bc: 0c0058dd */ jal mtx00016374
/* f0216c0: 27a500b8 */ addiu $a1,$sp,0xb8
/* f0216c4: 27a400b8 */ addiu $a0,$sp,0xb8
/* f0216c8: 0c0056f8 */ jal func00015be0
/* f0216c8: 0c0056f8 */ jal mtx00015be0
/* f0216cc: 8fa5015c */ lw $a1,0x15c($sp)
/* f0216d0: 3c013f80 */ lui $at,0x3f80
/* f0216d4: 44816000 */ mtc1 $at,$f12
@@ -5740,7 +5739,7 @@ glabel var7f1a879c
/* f0216e0: 00000000 */ nop
/* f0216e4: 45030004 */ bc1tl .L0f0216f8
/* f0216e8: 8fa2015c */ lw $v0,0x15c($sp)
/* f0216ec: 0c0057c1 */ jal func00015f04
/* f0216ec: 0c0057c1 */ jal mtx00015f04
/* f0216f0: 8fa5015c */ lw $a1,0x15c($sp)
/* f0216f4: 8fa2015c */ lw $v0,0x15c($sp)
.L0f0216f8:
@@ -5752,7 +5751,7 @@ glabel var7f1a879c
/* f02170c: 0fc2d5be */ jal currentPlayerGetMatrix1740
/* f021710: e4460038 */ swc1 $f6,0x38($v0)
/* f021714: 00402025 */ or $a0,$v0,$zero
/* f021718: 0c0056f8 */ jal func00015be0
/* f021718: 0c0056f8 */ jal mtx00015be0
/* f02171c: 8fa5015c */ lw $a1,0x15c($sp)
/* f021720: 1000021e */ b .L0f021f9c
/* f021724: 8fbf0014 */ lw $ra,0x14($sp)
@@ -6253,7 +6252,7 @@ glabel var7f1a879c
/* f021e0c: 0fc2d5de */ jal currentPlayerGetUnk174c
/* f021e10: e7ae00a4 */ swc1 $f14,0xa4($sp)
/* f021e14: 00402025 */ or $a0,$v0,$zero
/* f021e18: 0c0056f8 */ jal func00015be0
/* f021e18: 0c0056f8 */ jal mtx00015be0
/* f021e1c: 8fa5015c */ lw $a1,0x15c($sp)
/* f021e20: 8fa2015c */ lw $v0,0x15c($sp)
/* f021e24: c7ae00a4 */ lwc1 $f14,0xa4($sp)
@@ -6287,10 +6286,10 @@ glabel var7f1a879c
/* f021e90: 00000000 */ nop
/* f021e94: 46126300 */ add.s $f12,$f12,$f18
.L0f021e98:
/* f021e98: 0c0058dd */ jal func00016374
/* f021e98: 0c0058dd */ jal mtx00016374
/* f021e9c: e7ae00a4 */ swc1 $f14,0xa4($sp)
/* f021ea0: 27a4002c */ addiu $a0,$sp,0x2c
/* f021ea4: 0c0056f8 */ jal func00015be0
/* f021ea4: 0c0056f8 */ jal mtx00015be0
/* f021ea8: 8fa5015c */ lw $a1,0x15c($sp)
/* f021eac: c7ae00a4 */ lwc1 $f14,0xa4($sp)
/* f021eb0: 44808000 */ mtc1 $zero,$f16
@@ -6299,10 +6298,10 @@ glabel var7f1a879c
/* f021ebc: 00000000 */ nop
/* f021ec0: 45030009 */ bc1tl .L0f021ee8
/* f021ec4: c7a6009c */ lwc1 $f6,0x9c($sp)
/* f021ec8: 0c0058ba */ jal func000162e8
/* f021ec8: 0c0058ba */ jal mtx000162e8
/* f021ecc: 46007306 */ mov.s $f12,$f14
/* f021ed0: 27a4002c */ addiu $a0,$sp,0x2c
/* f021ed4: 0c0056f8 */ jal func00015be0
/* f021ed4: 0c0056f8 */ jal mtx00015be0
/* f021ed8: 8fa5015c */ lw $a1,0x15c($sp)
/* f021edc: 44808000 */ mtc1 $zero,$f16
/* f021ee0: 00000000 */ nop
@@ -6313,25 +6312,25 @@ glabel var7f1a879c
/* f021ef0: 00000000 */ nop
/* f021ef4: 45030007 */ bc1tl .L0f021f14
/* f021ef8: c7ac006c */ lwc1 $f12,0x6c($sp)
/* f021efc: 0c005900 */ jal func00016400
/* f021efc: 0c005900 */ jal mtx00016400
/* f021f00: 46003306 */ mov.s $f12,$f6
/* f021f04: 27a4002c */ addiu $a0,$sp,0x2c
/* f021f08: 0c0056f8 */ jal func00015be0
/* f021f08: 0c0056f8 */ jal mtx00015be0
/* f021f0c: 8fa5015c */ lw $a1,0x15c($sp)
/* f021f10: c7ac006c */ lwc1 $f12,0x6c($sp)
.L0f021f14:
/* f021f14: 0c0058dd */ jal func00016374
/* f021f14: 0c0058dd */ jal mtx00016374
/* f021f18: 27a5002c */ addiu $a1,$sp,0x2c
/* f021f1c: 27a4002c */ addiu $a0,$sp,0x2c
/* f021f20: 0c0056f8 */ jal func00015be0
/* f021f20: 0c0056f8 */ jal mtx00015be0
/* f021f24: 8fa5015c */ lw $a1,0x15c($sp)
/* f021f28: 10000007 */ b .L0f021f48
/* f021f2c: 3c013f80 */ lui $at,0x3f80
.L0f021f30:
/* f021f30: 0c0058dd */ jal func00016374
/* f021f30: 0c0058dd */ jal mtx00016374
/* f021f34: 27a5002c */ addiu $a1,$sp,0x2c
/* f021f38: 27a4002c */ addiu $a0,$sp,0x2c
/* f021f3c: 0c0056f8 */ jal func00015be0
/* f021f3c: 0c0056f8 */ jal mtx00015be0
/* f021f40: 8fa5015c */ lw $a1,0x15c($sp)
/* f021f44: 3c013f80 */ lui $at,0x3f80
.L0f021f48:
@@ -6342,7 +6341,7 @@ glabel var7f1a879c
/* f021f58: 00000000 */ nop
/* f021f5c: 45030004 */ bc1tl .L0f021f70
/* f021f60: c7a80070 */ lwc1 $f8,0x70($sp)
/* f021f64: 0c0057c1 */ jal func00015f04
/* f021f64: 0c0057c1 */ jal mtx00015f04
/* f021f68: 46002306 */ mov.s $f12,$f4
/* f021f6c: c7a80070 */ lwc1 $f8,0x70($sp)
.L0f021f70:
@@ -6354,7 +6353,7 @@ glabel var7f1a879c
/* f021f84: 0fc2d5be */ jal currentPlayerGetMatrix1740
/* f021f88: e5aa0038 */ swc1 $f10,0x38($t5)
/* f021f8c: 00402025 */ or $a0,$v0,$zero
/* f021f90: 0c0056f8 */ jal func00015be0
/* f021f90: 0c0056f8 */ jal mtx00015be0
/* f021f94: 8fa5015c */ lw $a1,0x15c($sp)
.L0f021f98:
/* f021f98: 8fbf0014 */ lw $ra,0x14($sp)
@@ -6520,7 +6519,7 @@ glabel var7f1a87a8
/* f022318: 00000000 */ nop
/* f02231c: 8e050048 */ lw $a1,0x48($s0)
/* f022320: 02203025 */ or $a2,$s1,$zero
/* f022324: 0c0056f9 */ jal func00015be4
/* f022324: 0c0056f9 */ jal mtx00015be4
/* f022328: 24a50004 */ addiu $a1,$a1,0x4
/* f02232c: 10000025 */ b .L0f0223c4
/* f022330: afb100c4 */ sw $s1,0xc4($sp)
@@ -6534,18 +6533,18 @@ glabel var7f1a87a8
/* f022348: 27b10080 */ addiu $s1,$sp,0x80
/* f02234c: 3c017f1b */ lui $at,%hi(var7f1a87a0)
/* f022350: c42c87a0 */ lwc1 $f12,%lo(var7f1a87a0)($at)
/* f022354: 0c0058dd */ jal func00016374
/* f022354: 0c0058dd */ jal mtx00016374
/* f022358: 02202825 */ or $a1,$s1,$zero
/* f02235c: 27b00040 */ addiu $s0,$sp,0x40
/* f022360: 3c017f1b */ lui $at,%hi(var7f1a87a4)
/* f022364: c42c87a4 */ lwc1 $f12,%lo(var7f1a87a4)($at)
/* f022368: 0c005900 */ jal func00016400
/* f022368: 0c005900 */ jal mtx00016400
/* f02236c: 02002825 */ or $a1,$s0,$zero
/* f022370: 02002025 */ or $a0,$s0,$zero
/* f022374: 0c00567f */ jal func000159fc
/* f022374: 0c00567f */ jal mtx000159fc
/* f022378: 02202825 */ or $a1,$s1,$zero
/* f02237c: 8fa40104 */ lw $a0,0x104($sp)
/* f022380: 0c00567f */ jal func000159fc
/* f022380: 0c00567f */ jal mtx000159fc
/* f022384: 02202825 */ or $a1,$s1,$zero
/* f022388: 1000000e */ b .L0f0223c4
/* f02238c: afb100c4 */ sw $s1,0xc4($sp)
@@ -6555,10 +6554,10 @@ glabel var7f1a87a8
/* f022398: 02202825 */ or $a1,$s1,$zero
/* f02239c: 16480008 */ bne $s2,$t0,.L0f0223c0
/* f0223a0: 3c017f1b */ lui $at,%hi(var7f1a87a8)
/* f0223a4: 0c005900 */ jal func00016400
/* f0223a4: 0c005900 */ jal mtx00016400
/* f0223a8: c42c87a8 */ lwc1 $f12,%lo(var7f1a87a8)($at)
/* f0223ac: 8fa40104 */ lw $a0,0x104($sp)
/* f0223b0: 0c00567f */ jal func000159fc
/* f0223b0: 0c00567f */ jal mtx000159fc
/* f0223b4: 02202825 */ or $a1,$s1,$zero
/* f0223b8: 10000002 */ b .L0f0223c4
/* f0223bc: afb100c4 */ sw $s1,0xc4($sp)
@@ -7917,12 +7916,12 @@ glabel var7f1a99ecpf
/* f023f3c: 27a40190 */ addiu $a0,$sp,0x190
/* f023f40: 27a501a8 */ addiu $a1,$sp,0x1a8
/* f023f44: 46060282 */ mul.s $f10,$f0,$f6
/* f023f48: 0c00591b */ jal func000166dc
/* f023f48: 0c00591b */ jal mtx000166dc
/* f023f4c: e7aa0198 */ swc1 $f10,0x198($sp)
/* f023f50: 0fc2d706 */ jal currentPlayerGetMatrix1740
/* f023f54: 00000000 */ nop
/* f023f58: 00402025 */ move $a0,$v0
/* f023f5c: 0c0055e3 */ jal func000159fc
/* f023f5c: 0c0055e3 */ jal mtx000159fc
/* f023f60: 27a501a8 */ addiu $a1,$sp,0x1a8
/* f023f64: 27a901a8 */ addiu $t1,$sp,0x1a8
/* f023f68: 1000004b */ b .PF0f024098
@@ -7987,12 +7986,12 @@ glabel var7f1a99ecpf
/* f024048: 27a4017c */ addiu $a0,$sp,0x17c
/* f02404c: 27a501a8 */ addiu $a1,$sp,0x1a8
/* f024050: 46080482 */ mul.s $f18,$f0,$f8
/* f024054: 0c00591b */ jal func000166dc
/* f024054: 0c00591b */ jal mtx000166dc
/* f024058: e7b20184 */ swc1 $f18,0x184($sp)
/* f02405c: 0fc2d706 */ jal currentPlayerGetMatrix1740
/* f024060: 00000000 */ nop
/* f024064: 00402025 */ move $a0,$v0
/* f024068: 0c0055e3 */ jal func000159fc
/* f024068: 0c0055e3 */ jal mtx000159fc
/* f02406c: 27a501a8 */ addiu $a1,$sp,0x1a8
/* f024070: 27ae01a8 */ addiu $t6,$sp,0x1a8
/* f024074: 10000008 */ b .PF0f024098
@@ -8266,25 +8265,25 @@ glabel var7f1a99ecpf
/* f024464: e7ae00ec */ swc1 $f14,0xec($sp)
/* f024468: 27a400e8 */ addiu $a0,$sp,0xe8
/* f02446c: 27a5009c */ addiu $a1,$sp,0x9c
/* f024470: 0c00591b */ jal func000166dc
/* f024470: 0c00591b */ jal mtx000166dc
/* f024474: e7b200f0 */ swc1 $f18,0xf0($sp)
/* f024478: c7ac00e4 */ lwc1 $f12,0xe4($sp)
/* f02447c: 0c0056ed */ jal func00015e24
/* f02447c: 0c0056ed */ jal mtx00015e24
/* f024480: 27a5009c */ addiu $a1,$sp,0x9c
/* f024484: c7ac00e0 */ lwc1 $f12,0xe0($sp)
/* f024488: 0c005704 */ jal func00015e80
/* f024488: 0c005704 */ jal mtx00015e80
/* f02448c: 27a5009c */ addiu $a1,$sp,0x9c
/* f024490: c7ac00dc */ lwc1 $f12,0xdc($sp)
/* f024494: 0c00571b */ jal func00015edc
/* f024494: 0c00571b */ jal mtx00015edc
/* f024498: 27a5009c */ addiu $a1,$sp,0x9c
/* f02449c: 8faa00f4 */ lw $t2,0xf4($sp)
/* f0244a0: 27a5009c */ addiu $a1,$sp,0x9c
/* f0244a4: 27a6005c */ addiu $a2,$sp,0x5c
/* f0244a8: 0c00565d */ jal func00015be4
/* f0244a8: 0c00565d */ jal mtx00015be4
/* f0244ac: 8d44000c */ lw $a0,0xc($t2)
/* f0244b0: 8fac00f4 */ lw $t4,0xf4($sp)
/* f0244b4: 27a4005c */ addiu $a0,$sp,0x5c
/* f0244b8: 0c0056aa */ jal func00015d18
/* f0244b8: 0c0056aa */ jal mtx00015d18
/* f0244bc: 8d85000c */ lw $a1,0xc($t4)
/* f0244c0: 8fad0058 */ lw $t5,0x58($sp)
/* f0244c4: 24010002 */ li $at,0x2
@@ -9355,12 +9354,12 @@ glabel var7f1a87d8
/* f023e18: 27a40190 */ addiu $a0,$sp,0x190
/* f023e1c: 27a501a8 */ addiu $a1,$sp,0x1a8
/* f023e20: 46080482 */ mul.s $f18,$f0,$f8
/* f023e24: 0c0059b7 */ jal func000166dc
/* f023e24: 0c0059b7 */ jal mtx000166dc
/* f023e28: e7b20198 */ swc1 $f18,0x198($sp)
/* f023e2c: 0fc2d5be */ jal currentPlayerGetMatrix1740
/* f023e30: 00000000 */ nop
/* f023e34: 00402025 */ or $a0,$v0,$zero
/* f023e38: 0c00567f */ jal func000159fc
/* f023e38: 0c00567f */ jal mtx000159fc
/* f023e3c: 27a501a8 */ addiu $a1,$sp,0x1a8
/* f023e40: 27ab01a8 */ addiu $t3,$sp,0x1a8
/* f023e44: 1000004b */ b .L0f023f74
@@ -9425,12 +9424,12 @@ glabel var7f1a87d8
/* f023f24: 27a4017c */ addiu $a0,$sp,0x17c
/* f023f28: 27a501a8 */ addiu $a1,$sp,0x1a8
/* f023f2c: 460a0102 */ mul.s $f4,$f0,$f10
/* f023f30: 0c0059b7 */ jal func000166dc
/* f023f30: 0c0059b7 */ jal mtx000166dc
/* f023f34: e7a40184 */ swc1 $f4,0x184($sp)
/* f023f38: 0fc2d5be */ jal currentPlayerGetMatrix1740
/* f023f3c: 00000000 */ nop
/* f023f40: 00402025 */ or $a0,$v0,$zero
/* f023f44: 0c00567f */ jal func000159fc
/* f023f44: 0c00567f */ jal mtx000159fc
/* f023f48: 27a501a8 */ addiu $a1,$sp,0x1a8
/* f023f4c: 27aa01a8 */ addiu $t2,$sp,0x1a8
/* f023f50: 10000008 */ b .L0f023f74
@@ -9704,25 +9703,25 @@ glabel var7f1a87d8
/* f024340: e7ae00ec */ swc1 $f14,0xec($sp)
/* f024344: 27a400e8 */ addiu $a0,$sp,0xe8
/* f024348: 27a5009c */ addiu $a1,$sp,0x9c
/* f02434c: 0c0059b7 */ jal func000166dc
/* f02434c: 0c0059b7 */ jal mtx000166dc
/* f024350: e7b200f0 */ swc1 $f18,0xf0($sp)
/* f024354: c7ac00e4 */ lwc1 $f12,0xe4($sp)
/* f024358: 0c005789 */ jal func00015e24
/* f024358: 0c005789 */ jal mtx00015e24
/* f02435c: 27a5009c */ addiu $a1,$sp,0x9c
/* f024360: c7ac00e0 */ lwc1 $f12,0xe0($sp)
/* f024364: 0c0057a0 */ jal func00015e80
/* f024364: 0c0057a0 */ jal mtx00015e80
/* f024368: 27a5009c */ addiu $a1,$sp,0x9c
/* f02436c: c7ac00dc */ lwc1 $f12,0xdc($sp)
/* f024370: 0c0057b7 */ jal func00015edc
/* f024370: 0c0057b7 */ jal mtx00015edc
/* f024374: 27a5009c */ addiu $a1,$sp,0x9c
/* f024378: 8fac00f4 */ lw $t4,0xf4($sp)
/* f02437c: 27a5009c */ addiu $a1,$sp,0x9c
/* f024380: 27a6005c */ addiu $a2,$sp,0x5c
/* f024384: 0c0056f9 */ jal func00015be4
/* f024384: 0c0056f9 */ jal mtx00015be4
/* f024388: 8d84000c */ lw $a0,0xc($t4)
/* f02438c: 8fb800f4 */ lw $t8,0xf4($sp)
/* f024390: 27a4005c */ addiu $a0,$sp,0x5c
/* f024394: 0c005746 */ jal func00015d18
/* f024394: 0c005746 */ jal mtx00015d18
/* f024398: 8f05000c */ lw $a1,0xc($t8)
/* f02439c: 8faf0058 */ lw $t7,0x58($sp)
/* f0243a0: 24010002 */ addiu $at,$zero,0x2
@@ -10734,12 +10733,12 @@ glabel var7f1a87d8
/* f023830: 27a40190 */ addiu $a0,$sp,0x190
/* f023834: 27a501a8 */ addiu $a1,$sp,0x1a8
/* f023838: 46080482 */ mul.s $f18,$f0,$f8
/* f02383c: 0c005d9b */ jal func000166dc
/* f02383c: 0c005d9b */ jal mtx000166dc
/* f023840: e7b20198 */ swc1 $f18,0x198($sp)
/* f023844: 0fc2cd16 */ jal currentPlayerGetMatrix1740
/* f023848: 00000000 */ sll $zero,$zero,0x0
/* f02384c: 00402025 */ or $a0,$v0,$zero
/* f023850: 0c005a3b */ jal func000159fc
/* f023850: 0c005a3b */ jal mtx000159fc
/* f023854: 27a501a8 */ addiu $a1,$sp,0x1a8
/* f023858: 27a901a8 */ addiu $t1,$sp,0x1a8
/* f02385c: 1000004b */ beqz $zero,.NB0f02398c
@@ -10804,12 +10803,12 @@ glabel var7f1a87d8
/* f02393c: 27a4017c */ addiu $a0,$sp,0x17c
/* f023940: 27a501a8 */ addiu $a1,$sp,0x1a8
/* f023944: 460a0102 */ mul.s $f4,$f0,$f10
/* f023948: 0c005d9b */ jal func000166dc
/* f023948: 0c005d9b */ jal mtx000166dc
/* f02394c: e7a40184 */ swc1 $f4,0x184($sp)
/* f023950: 0fc2cd16 */ jal currentPlayerGetMatrix1740
/* f023954: 00000000 */ sll $zero,$zero,0x0
/* f023958: 00402025 */ or $a0,$v0,$zero
/* f02395c: 0c005a3b */ jal func000159fc
/* f02395c: 0c005a3b */ jal mtx000159fc
/* f023960: 27a501a8 */ addiu $a1,$sp,0x1a8
/* f023964: 27b901a8 */ addiu $t9,$sp,0x1a8
/* f023968: 10000008 */ beqz $zero,.NB0f02398c
@@ -11083,25 +11082,25 @@ glabel var7f1a87d8
/* f023d58: e7ae00ec */ swc1 $f14,0xec($sp)
/* f023d5c: 27a400e8 */ addiu $a0,$sp,0xe8
/* f023d60: 27a5009c */ addiu $a1,$sp,0x9c
/* f023d64: 0c005d9b */ jal func000166dc
/* f023d64: 0c005d9b */ jal mtx000166dc
/* f023d68: e7b200f0 */ swc1 $f18,0xf0($sp)
/* f023d6c: c7ac00e4 */ lwc1 $f12,0xe4($sp)
/* f023d70: 0c005b45 */ jal func00015e24
/* f023d70: 0c005b45 */ jal mtx00015e24
/* f023d74: 27a5009c */ addiu $a1,$sp,0x9c
/* f023d78: c7ac00e0 */ lwc1 $f12,0xe0($sp)
/* f023d7c: 0c005b5c */ jal func00015e80
/* f023d7c: 0c005b5c */ jal mtx00015e80
/* f023d80: 27a5009c */ addiu $a1,$sp,0x9c
/* f023d84: c7ac00dc */ lwc1 $f12,0xdc($sp)
/* f023d88: 0c005b73 */ jal func00015edc
/* f023d88: 0c005b73 */ jal mtx00015edc
/* f023d8c: 27a5009c */ addiu $a1,$sp,0x9c
/* f023d90: 8fae00f4 */ lw $t6,0xf4($sp)
/* f023d94: 27a5009c */ addiu $a1,$sp,0x9c
/* f023d98: 27a6005c */ addiu $a2,$sp,0x5c
/* f023d9c: 0c005ab5 */ jal func00015be4
/* f023d9c: 0c005ab5 */ jal mtx00015be4
/* f023da0: 8dc4000c */ lw $a0,0xc($t6)
/* f023da4: 8fab00f4 */ lw $t3,0xf4($sp)
/* f023da8: 27a4005c */ addiu $a0,$sp,0x5c
/* f023dac: 0c005b02 */ jal func00015d18
/* f023dac: 0c005b02 */ jal mtx00015d18
/* f023db0: 8d65000c */ lw $a1,0xc($t3)
/* f023db4: 8fad0058 */ lw $t5,0x58($sp)
/* f023db8: 24010002 */ addiu $at,$zero,0x2
@@ -11462,15 +11461,15 @@ glabel func0f024738
/* f0249a0: 8c4f0014 */ lw $t7,0x14($v0)
/* f0249a4: ae0f0024 */ sw $t7,0x24($s0)
/* f0249a8: 8c410018 */ lw $at,0x18($v0)
/* f0249ac: 0c005755 */ jal func00015d54
/* f0249ac: 0c005755 */ jal mtx00015d54
/* f0249b0: ae010028 */ sw $at,0x28($s0)
/* f0249b4: 8e440014 */ lw $a0,0x14($s2)
/* f0249b8: 02202825 */ or $a1,$s1,$zero
/* f0249bc: 0c005775 */ jal func00015dd4
/* f0249bc: 0c005775 */ jal mtx00015dd4
/* f0249c0: 24840008 */ addiu $a0,$a0,0x8
/* f0249c4: 2612006c */ addiu $s2,$s0,0x6c
/* f0249c8: 02402825 */ or $a1,$s2,$zero
/* f0249cc: 0c005cbc */ jal func000172f0
/* f0249cc: 0c005cbc */ jal mtx000172f0
/* f0249d0: 02202025 */ or $a0,$s1,$zero
/* f0249d4: 8ec20284 */ lw $v0,0x284($s6)
/* f0249d8: c6080074 */ lwc1 $f8,0x74($s0)
@@ -11491,7 +11490,7 @@ glabel func0f024738
/* f024a14: e60a012c */ swc1 $f10,0x12c($s0)
/* f024a18: 02402025 */ or $a0,$s2,$zero
/* f024a1c: 00402825 */ or $a1,$v0,$zero
/* f024a20: 0c0056f9 */ jal func00015be4
/* f024a20: 0c0056f9 */ jal mtx00015be4
/* f024a24: 260600ac */ addiu $a2,$s0,0xac
/* f024a28: ae1e000c */ sw $s8,0xc($s0)
/* f024a2c: 8fb90280 */ lw $t9,0x280($sp)
@@ -11655,7 +11654,7 @@ glabel var7f1a87f8
/* f024c20: 03c02825 */ or $a1,$s8,$zero
/* f024c24: 02e03025 */ or $a2,$s7,$zero
/* f024c28: 00009025 */ or $s2,$zero,$zero
/* f024c2c: 0c0056f9 */ jal func00015be4
/* f024c2c: 0c0056f9 */ jal mtx00015be4
/* f024c30: 8db50004 */ lw $s5,0x4($t5)
/* f024c34: 8e2e0130 */ lw $t6,0x130($s1)
/* f024c38: 55c0005e */ bnezl $t6,.L0f024db4
@@ -11708,25 +11707,25 @@ glabel var7f1a87f8
/* f024cec: 263500ec */ addiu $s5,$s1,0xec
/* f024cf0: 02a03025 */ or $a2,$s5,$zero
/* f024cf4: 00402025 */ or $a0,$v0,$zero
/* f024cf8: 0c0056f9 */ jal func00015be4
/* f024cf8: 0c0056f9 */ jal mtx00015be4
/* f024cfc: 2625002c */ addiu $a1,$s1,0x2c
/* f024d00: 02a02025 */ or $a0,$s5,$zero
/* f024d04: 27a500a0 */ addiu $a1,$sp,0xa0
/* f024d08: 0c0056da */ jal func00015b68
/* f024d08: 0c0056da */ jal mtx00015b68
/* f024d0c: 02603025 */ or $a2,$s3,$zero
/* f024d10: 02602025 */ or $a0,$s3,$zero
/* f024d14: 0fc2d37b */ jal func0f0b4dec
/* f024d18: 26250134 */ addiu $a1,$s1,0x134
/* f024d1c: 02a02025 */ or $a0,$s5,$zero
/* f024d20: 27a50094 */ addiu $a1,$sp,0x94
/* f024d24: 0c0056da */ jal func00015b68
/* f024d24: 0c0056da */ jal mtx00015b68
/* f024d28: 02603025 */ or $a2,$s3,$zero
/* f024d2c: 02602025 */ or $a0,$s3,$zero
/* f024d30: 0fc2d37b */ jal func0f0b4dec
/* f024d34: 2625013c */ addiu $a1,$s1,0x13c
/* f024d38: 02a02025 */ or $a0,$s5,$zero
/* f024d3c: 27a50088 */ addiu $a1,$sp,0x88
/* f024d40: 0c0056da */ jal func00015b68
/* f024d40: 0c0056da */ jal mtx00015b68
/* f024d44: 02603025 */ or $a2,$s3,$zero
/* f024d48: 02602025 */ or $a0,$s3,$zero
/* f024d4c: 0fc2d37b */ jal func0f0b4dec
@@ -11821,7 +11820,7 @@ glabel var7f1a87f8
.L0f024eac:
/* f024eac: 03c02025 */ or $a0,$s8,$zero
/* f024eb0: 02c02825 */ or $a1,$s6,$zero
/* f024eb4: 0c0056da */ jal func00015b68
/* f024eb4: 0c0056da */ jal mtx00015b68
/* f024eb8: 02603025 */ or $a2,$s3,$zero
/* f024ebc: 02602025 */ or $a0,$s3,$zero
/* f024ec0: 0fc2d37b */ jal func0f0b4dec
@@ -11858,7 +11857,7 @@ glabel var7f1a87f8
/* f024f30: 16800030 */ bnez $s4,.L0f024ff4
/* f024f34: 02e02025 */ or $a0,$s7,$zero
/* f024f38: 02c02825 */ or $a1,$s6,$zero
/* f024f3c: 0c0056da */ jal func00015b68
/* f024f3c: 0c0056da */ jal mtx00015b68
/* f024f40: 02603025 */ or $a2,$s3,$zero
/* f024f44: c7a60070 */ lwc1 $f6,0x70($sp)
/* f024f48: c62a0014 */ lwc1 $f10,0x14($s1)
@@ -14210,10 +14209,10 @@ void func0f027994(struct prop *prop, struct shotdata *shotdata, bool arg2, bool
while (spc0 > 0) {
if (func0f084594(model, node, &shotdata->unk00, &shotdata->unk0c, &sp88, &sp84, &sp80)) {
func00015b68(&model->matrices[sp84], &sp88.unk00, &spdc);
func00015b64(currentPlayerGetUnk174c(), &spdc);
func00015b14(&model->matrices[sp84], &sp88.unk0c, &spd0);
func00015b10(currentPlayerGetUnk174c(), &spd0);
mtx00015b68(&model->matrices[sp84], &sp88.unk00, &spdc);
mtx00015b64(currentPlayerGetUnk174c(), &spdc);
mtx00015b14(&model->matrices[sp84], &sp88.unk0c, &spd0);
mtx00015b10(currentPlayerGetUnk174c(), &spd0);
break;
}
@@ -14225,8 +14224,8 @@ void func0f027994(struct prop *prop, struct shotdata *shotdata, bool arg2, bool
if (spc0 > 0) {
if (func0f06bea0(model, model->filedata->rootnode, model->filedata->rootnode, &shotdata->unk00,
&shotdata->unk0c, &sp88.unk00, &sp70, &node, &spc0, &sp84, &sp80)) {
func00015b68(currentPlayerGetUnk174c(), &sp88.unk00, &spdc);
func00015b14(currentPlayerGetUnk174c(), &sp88.unk0c, &spd0);
mtx00015b68(currentPlayerGetUnk174c(), &sp88.unk00, &spdc);
mtx00015b14(currentPlayerGetUnk174c(), &sp88.unk0c, &spd0);
} else {
spc0 = 0;
}
@@ -14322,7 +14321,7 @@ glabel func0f027e1c
/* f027ef4: e7b200a0 */ swc1 $f18,0xa0($sp)
/* f027ef8: 00402025 */ or $a0,$v0,$zero
/* f027efc: 27a50098 */ addiu $a1,$sp,0x98
/* f027f00: 0c0056da */ jal func00015b68
/* f027f00: 0c0056da */ jal mtx00015b68
/* f027f04: 27a600a4 */ addiu $a2,$sp,0xa4
/* f027f08: 0fc2a519 */ jal bgunSetHitPos
/* f027f0c: 27a400a4 */ addiu $a0,$sp,0xa4
@@ -14630,11 +14629,11 @@ glabel func0f027e1c
/* f02837c: 0c006973 */ jal func0001a5cc
/* f028380: afa30068 */ sw $v1,0x68($sp)
/* f028384: 00402025 */ or $a0,$v0,$zero
/* f028388: 0c005c67 */ jal func0001719c
/* f028388: 0c005c67 */ jal mtx0001719c
/* f02838c: 27a500b0 */ addiu $a1,$sp,0xb0
/* f028390: 27a400b0 */ addiu $a0,$sp,0xb0
/* f028394: 27a50098 */ addiu $a1,$sp,0x98
/* f028398: 0c0056da */ jal func00015b68
/* f028398: 0c0056da */ jal mtx00015b68
/* f02839c: 27a6005c */ addiu $a2,$sp,0x5c
/* f0283a0: 8fb800f0 */ lw $t8,0xf0($sp)
/* f0283a4: 8fa30068 */ lw $v1,0x68($sp)
@@ -14765,7 +14764,7 @@ glabel func0f027e1c
/* f027910: e7b200a0 */ swc1 $f18,0xa0($sp)
/* f027914: 00402025 */ or $a0,$v0,$zero
/* f027918: 27a50098 */ addiu $a1,$sp,0x98
/* f02791c: 0c005a96 */ jal func00015b68
/* f02791c: 0c005a96 */ jal mtx00015b68
/* f027920: 27a600a4 */ addiu $a2,$sp,0xa4
/* f027924: 0fc29c81 */ jal bgunSetHitPos
/* f027928: 27a400a4 */ addiu $a0,$sp,0xa4
@@ -15071,11 +15070,11 @@ glabel func0f027e1c
/* f027d90: 0c006dcf */ jal func0001a5cc
/* f027d94: afa30068 */ sw $v1,0x68($sp)
/* f027d98: 00402025 */ or $a0,$v0,$zero
/* f027d9c: 0c006082 */ jal func0001719c
/* f027d9c: 0c006082 */ jal mtx0001719c
/* f027da0: 27a500b0 */ addiu $a1,$sp,0xb0
/* f027da4: 27a400b0 */ addiu $a0,$sp,0xb0
/* f027da8: 27a50098 */ addiu $a1,$sp,0x98
/* f027dac: 0c005a96 */ jal func00015b68
/* f027dac: 0c005a96 */ jal mtx00015b68
/* f027db0: 27a6005c */ addiu $a2,$sp,0x5c
/* f027db4: 3c18800a */ lui $t8,0x800a
/* f027db8: 8f18e944 */ lw $t8,-0x16bc($t8)
src/game/chr/chraction.c
+31 -32
View File
@@ -45,8 +45,7 @@
#include "lib/model.h"
#include "lib/snd.h"
#include "lib/rng.h"
#include "lib/lib_159b0.h"
#include "lib/lib_16110.h"
#include "lib/mtx.h"
#include "lib/lib_184d0.h"
#include "lib/lib_233c0.h"
#include "lib/lib_24e40.h"
@@ -10917,10 +10916,10 @@ glabel var7f1a8fc8
/* f03f340: 10400037 */ beqz $v0,.L0f03f420
/* f03f344: 8fa40108 */ lw $a0,0x108($sp)
/* f03f348: 27a500c8 */ addiu $a1,$sp,0xc8
/* f03f34c: 0c0059e6 */ jal func00016798
/* f03f34c: 0c0059e6 */ jal mtx00016798
/* f03f350: afa200b4 */ sw $v0,0xb4($sp)
/* f03f354: 8fa400b4 */ lw $a0,0xb4($sp)
/* f03f358: 0c0056f8 */ jal func00015be0
/* f03f358: 0c0056f8 */ jal mtx00015be0
/* f03f35c: 27a500c8 */ addiu $a1,$sp,0xc8
/* f03f360: 8fa200c4 */ lw $v0,0xc4($sp)
/* f03f364: 27a400c8 */ addiu $a0,$sp,0xc8
@@ -10930,7 +10929,7 @@ glabel var7f1a8fc8
/* f03f374: c4520004 */ lwc1 $f18,0x4($v0)
/* f03f378: e7b200bc */ swc1 $f18,0xbc($sp)
/* f03f37c: c4480008 */ lwc1 $f8,0x8($v0)
/* f03f380: 0c0056d9 */ jal func00015b64
/* f03f380: 0c0056d9 */ jal mtx00015b64
/* f03f384: e7a800c0 */ swc1 $f8,0xc0($sp)
/* f03f388: c7a600b8 */ lwc1 $f6,0xb8($sp)
/* f03f38c: c7a400bc */ lwc1 $f4,0xbc($sp)
@@ -10958,10 +10957,10 @@ glabel var7f1a8fc8
/* f03f3e0: 1040000f */ beqz $v0,.L0f03f420
/* f03f3e4: 8fa400b0 */ lw $a0,0xb0($sp)
/* f03f3e8: 27a50070 */ addiu $a1,$sp,0x70
/* f03f3ec: 0c0059e6 */ jal func00016798
/* f03f3ec: 0c0059e6 */ jal mtx00016798
/* f03f3f0: afa2006c */ sw $v0,0x6c($sp)
/* f03f3f4: 8fa4006c */ lw $a0,0x6c($sp)
/* f03f3f8: 0c0056f8 */ jal func00015be0
/* f03f3f8: 0c0056f8 */ jal mtx00015be0
/* f03f3fc: 27a50070 */ addiu $a1,$sp,0x70
/* f03f400: c7b200a0 */ lwc1 $f18,0xa0($sp)
/* f03f404: c7a800a4 */ lwc1 $f8,0xa4($sp)
@@ -11516,13 +11515,13 @@ bool func0f03fde4(struct chrdata *chr, s32 handnum, struct coord *arg2)
arg2->y = rodata->pos.y;
arg2->z = rodata->pos.z;
func00015be4(currentPlayerGetUnk174c(), spac, &sp6c);
func00015b64(&sp6c, arg2);
mtx00015be4(currentPlayerGetUnk174c(), spac, &sp6c);
mtx00015b64(&sp6c, arg2);
result = true;
} else if ((part1 = modelGetPart(model->filedata, MODELPART_0001))) {
sp64 = func0001a5cc(model, part1, 0);
func00015be4(currentPlayerGetUnk174c(), sp64, &sp24);
mtx00015be4(currentPlayerGetUnk174c(), sp64, &sp24);
arg2->x = sp24.m[3][0];
arg2->y = sp24.m[3][1];
@@ -11581,8 +11580,8 @@ void chrCalculateShieldHit(struct chrdata *chr, struct coord *pos, struct coord
lVar4 = func0f0b5050(chr->model->matrices);
if (lVar4) {
func00015b68(lVar4, pos, &sp124);
func00015b14(lVar4, vector, &sp118);
mtx00015b68(lVar4, pos, &sp124);
mtx00015b14(lVar4, vector, &sp118);
isdifferentmtx = (currentPlayerGetMatrix1740() != lVar4);
node = chr->model->filedata->rootnode;
@@ -11592,7 +11591,7 @@ void chrCalculateShieldHit(struct chrdata *chr, struct coord *pos, struct coord
mtxptr1 = func0001a5cc(chr->model, node, 0);
if (isdifferentmtx) {
func00016798(mtxptr1, &spc8);
mtx00016798(mtxptr1, &spc8);
mtxptr1 = &spc8;
}
@@ -11640,7 +11639,7 @@ void chrCalculateShieldHit(struct chrdata *chr, struct coord *pos, struct coord
mtxptr2 = func0001a5cc(chr->model, bestnode, 0);
if (isdifferentmtx) {
func00016798(mtxptr2, &sp48);
mtx00016798(mtxptr2, &sp48);
mtxptr2 = &sp48;
}
@@ -12690,16 +12689,16 @@ glabel var7f1a9184
/* f041154: 46085481 */ sub.s $f18,$f10,$f8
/* f041158: e7b201e8 */ swc1 $f18,0x1e8($sp)
.PF0f04115c:
/* f04115c: 0c0055d0 */ jal func000159b0
/* f04115c: 0c0055d0 */ jal mtx000159b0
/* f041160: 27a40178 */ addiu $a0,$sp,0x178
/* f041164: c7ac0200 */ lwc1 $f12,0x200($sp)
/* f041168: 0c00581e */ jal func000162e8
/* f041168: 0c00581e */ jal mtx000162e8
/* f04116c: 27a5011c */ addiu $a1,$sp,0x11c
/* f041170: c7ac0204 */ lwc1 $f12,0x204($sp)
/* f041174: 0c005841 */ jal func00016374
/* f041174: 0c005841 */ jal mtx00016374
/* f041178: 27a500dc */ addiu $a1,$sp,0xdc
/* f04117c: 27a400dc */ addiu $a0,$sp,0xdc
/* f041180: 0c00565c */ jal func00015be0
/* f041180: 0c00565c */ jal mtx00015be0
/* f041184: 27a5011c */ addiu $a1,$sp,0x11c
/* f041188: c7ac0168 */ lwc1 $f12,0x168($sp)
/* f04118c: c7a401e0 */ lwc1 $f4,0x1e0($sp)
@@ -14288,16 +14287,16 @@ glabel var7f1a9184
/* f040fd0: 46085481 */ sub.s $f18,$f10,$f8
/* f040fd4: e7b201e8 */ swc1 $f18,0x1e8($sp)
.L0f040fd8:
/* f040fd8: 0c00566c */ jal func000159b0
/* f040fd8: 0c00566c */ jal mtx000159b0
/* f040fdc: 27a40178 */ addiu $a0,$sp,0x178
/* f040fe0: c7ac0200 */ lwc1 $f12,0x200($sp)
/* f040fe4: 0c0058ba */ jal func000162e8
/* f040fe4: 0c0058ba */ jal mtx000162e8
/* f040fe8: 27a5011c */ addiu $a1,$sp,0x11c
/* f040fec: c7ac0204 */ lwc1 $f12,0x204($sp)
/* f040ff0: 0c0058dd */ jal func00016374
/* f040ff0: 0c0058dd */ jal mtx00016374
/* f040ff4: 27a500dc */ addiu $a1,$sp,0xdc
/* f040ff8: 27a400dc */ addiu $a0,$sp,0xdc
/* f040ffc: 0c0056f8 */ jal func00015be0
/* f040ffc: 0c0056f8 */ jal mtx00015be0
/* f041000: 27a5011c */ addiu $a1,$sp,0x11c
/* f041004: c7ac0168 */ lwc1 $f12,0x168($sp)
/* f041008: c7a401e0 */ lwc1 $f4,0x1e0($sp)
@@ -15878,16 +15877,16 @@ glabel var7f1a9184
/* f0407b0: 46085481 */ sub.s $f18,$f10,$f8
/* f0407b4: e7b201e8 */ swc1 $f18,0x1e8($sp)
.NB0f0407b8:
/* f0407b8: 0c005a28 */ jal func000159b0
/* f0407b8: 0c005a28 */ jal mtx000159b0
/* f0407bc: 27a40178 */ addiu $a0,$sp,0x178
/* f0407c0: c7ac0200 */ lwc1 $f12,0x200($sp)
/* f0407c4: 0c005c9e */ jal func000162e8
/* f0407c4: 0c005c9e */ jal mtx000162e8
/* f0407c8: 27a5011c */ addiu $a1,$sp,0x11c
/* f0407cc: c7ac0204 */ lwc1 $f12,0x204($sp)
/* f0407d0: 0c005cc1 */ jal func00016374
/* f0407d0: 0c005cc1 */ jal mtx00016374
/* f0407d4: 27a500dc */ addiu $a1,$sp,0xdc
/* f0407d8: 27a400dc */ addiu $a0,$sp,0xdc
/* f0407dc: 0c005ab4 */ jal func00015be0
/* f0407dc: 0c005ab4 */ jal mtx00015be0
/* f0407e0: 27a5011c */ addiu $a1,$sp,0x11c
/* f0407e4: c7ac0168 */ lwc1 $f12,0x168($sp)
/* f0407e8: c7a401e0 */ lwc1 $f4,0x1e0($sp)
@@ -17418,11 +17417,11 @@ glabel var7f1a91dc
/* f042cc4: e6060004 */ swc1 $f6,0x4($s0)
/* f042cc8: c4480008 */ lwc1 $f8,0x8($v0)
/* f042ccc: e6080008 */ swc1 $f8,0x8($s0)
/* f042cd0: 0c0058dd */ jal func00016374
/* f042cd0: 0c0058dd */ jal mtx00016374
/* f042cd4: c7ac00fc */ lwc1 $f12,0xfc($sp)
/* f042cd8: 27a400a4 */ addiu $a0,$sp,0xa4
/* f042cdc: 02002825 */ or $a1,$s0,$zero
/* f042ce0: 0c0056c5 */ jal func00015b14
/* f042ce0: 0c0056c5 */ jal mtx00015b14
/* f042ce4: 27a600e4 */ addiu $a2,$sp,0xe4
/* f042ce8: 8e4c0020 */ lw $t4,0x20($s2)
/* f042cec: c7aa00e4 */ lwc1 $f10,0xe4($sp)
@@ -17695,8 +17694,8 @@ glabel var7f1a91dc
// act->pos[i].y = rodata->position.pos.y - 300;
// act->pos[i].z = rodata->position.pos.z;
//
// func00016374(invtheta, &spa4);
// func00015b14(&spa4, &act->pos[i], &spe4);
// mtx00016374(invtheta, &spa4);
// mtx00015b14(&spa4, &act->pos[i], &spe4);
//
// spe4.x *= chr->model->scale;
// spe4.y *= chr->model->scale;
@@ -24552,7 +24551,7 @@ bool chrCanSeeTargetWithExtraCheck(struct chrdata *chr)
bgun0f0a0c08(&sp68, &sp56);
modelGetRootPosition(model, &sp44);
func00015b64(currentPlayerGetMatrix1740(), &sp44);
mtx00015b64(currentPlayerGetMatrix1740(), &sp44);
if (func0f06b39c(&sp68, &sp56, &sp44, somefloat)) {
return true;
@@ -27301,7 +27300,7 @@ glabel func0f04c1e8nb
/* f04c2c8: 8e19001c */ lw $t9,0x1c($s0)
/* f04c2cc: c7240010 */ lwc1 $f4,0x10($t9)
/* f04c2d0: e7a40214 */ swc1 $f4,0x214($sp)
/* f04c2d4: 0c005a95 */ jal func00015b64
/* f04c2d4: 0c005a95 */ jal mtx00015b64
/* f04c2d8: 8d241740 */ lw $a0,0x1740($t1)
/* f04c2dc: 3c01c2c8 */ lui $at,0xc2c8
/* f04c2e0: c7a00214 */ lwc1 $f0,0x214($sp)
src/game/chr/chraicommands.c
+3 -4
View File
@@ -45,8 +45,7 @@
#include "lib/snd.h"
#include "lib/lib_11420.h"
#include "lib/rng.h"
#include "lib/lib_159b0.h"
#include "lib/lib_16110.h"
#include "lib/mtx.h"
#include "lib/lib_184d0.h"
#include "lib/lib_233c0.h"
#include "lib/lib_317f0.h"
@@ -2410,13 +2409,13 @@ bool aiObjectMoveToPad(void)
if (obj && obj->prop) {
padUnpack(padnum, PADFIELD_POS | PADFIELD_LOOK | PADFIELD_UP | PADFIELD_ROOM, &pad);
func00016d58(&matrix,
mtx00016d58(&matrix,
0, 0, 0,
-pad.look.x, -pad.look.y, -pad.look.z,
pad.up.x, pad.up.y, pad.up.z);
if (obj->model) {
func00015f04(obj->model->scale, &matrix);
mtx00015f04(obj->model->scale, &matrix);
}
rooms[0] = pad.room;
src/game/credits.c
+9 -10
View File
@@ -19,8 +19,7 @@
#include "lib/main.h"
#include "lib/memory.h"
#include "lib/rng.h"
#include "lib/lib_159b0.h"
#include "lib/lib_16110.h"
#include "lib/mtx.h"
#include "data.h"
#include "types.h"
@@ -5211,10 +5210,10 @@ glabel var7f1b5948
/* f13be4c: ade20004 */ sw $v0,0x4($t7)
/* f13be50: 00408025 */ move $s0,$v0
.PF0f13be54:
/* f13be54: 0c0055d0 */ jal func000159b0
/* f13be54: 0c0055d0 */ jal mtx000159b0
/* f13be58: 27a40068 */ addiu $a0,$sp,0x68
/* f13be5c: 27a40068 */ addiu $a0,$sp,0x68
/* f13be60: 0c005779 */ jal func00016054
/* f13be60: 0c005779 */ jal mtx00016054
/* f13be64: 8fa50064 */ lw $a1,0x64($sp)
/* f13be68: 0fc2d54e */ jal currentPlayerSetMatrix1740
/* f13be6c: 27a40068 */ addiu $a0,$sp,0x68
@@ -5520,10 +5519,10 @@ glabel var7f1b5948
/* f13b2e8: ade20004 */ sw $v0,0x4($t7)
/* f13b2ec: 00408025 */ or $s0,$v0,$zero
.L0f13b2f0:
/* f13b2f0: 0c00566c */ jal func000159b0
/* f13b2f0: 0c00566c */ jal mtx000159b0
/* f13b2f4: 27a40068 */ addiu $a0,$sp,0x68
/* f13b2f8: 27a40068 */ addiu $a0,$sp,0x68
/* f13b2fc: 0c005815 */ jal func00016054
/* f13b2fc: 0c005815 */ jal mtx00016054
/* f13b300: 8fa50064 */ lw $a1,0x64($sp)
/* f13b304: 0fc2d406 */ jal currentPlayerSetMatrix1740
/* f13b308: 27a40068 */ addiu $a0,$sp,0x68
@@ -5829,10 +5828,10 @@ glabel var7f1b5948
/* 7f135de8: ade20004 */ sw $v0,0x4($t7)
/* 7f135dec: 00408025 */ or $s0,$v0,$zero
.NB7f135df0:
/* 7f135df0: 0c005a28 */ jal func000159b0
/* 7f135df0: 0c005a28 */ jal mtx000159b0
/* 7f135df4: 27a40068 */ addiu $a0,$sp,0x68
/* 7f135df8: 27a40068 */ addiu $a0,$sp,0x68
/* 7f135dfc: 0c005bd1 */ jal func00016054
/* 7f135dfc: 0c005bd1 */ jal mtx00016054
/* 7f135e00: 8fa50064 */ lw $a1,0x64($sp)
/* 7f135e04: 0fc2cb5e */ jal currentPlayerSetMatrix1740
/* 7f135e08: 27a40068 */ addiu $a0,$sp,0x68
@@ -6012,8 +6011,8 @@ glabel var7f1b5948
// gdl = creditsClearFramebuffer(gdl, 0x000000d8);
// }
//
// func000159b0(&sp68);
// func00016054(&sp68, matrix);
// mtx000159b0(&sp68);
// mtx00016054(&sp68, matrix);
// currentPlayerSetMatrix1740(&sp68);
//
// gSPMatrix(gdl++, osVirtualToPhysical(matrix), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
src/game/dlights.c
+1 -1
View File
@@ -19,7 +19,7 @@
#include "lib/snd.h"
#include "lib/memory.h"
#include "lib/rng.h"
#include "lib/lib_16110.h"
#include "lib/mtx.h"
#include "lib/lib_2f490.h"
#include "lib/lib_317f0.h"
#include "data.h"
src/game/explosions/explosions.c
+1 -1
View File
@@ -22,7 +22,7 @@
#include "lib/lib_09a80.h"
#include "lib/main.h"
#include "lib/rng.h"
#include "lib/lib_16110.h"
#include "lib/mtx.h"
#include "lib/lib_233c0.h"
#include "data.h"
#include "types.h"
src/game/game_005fd0.c
+1 -2
View File
@@ -6,8 +6,7 @@
#include "game/bg.h"
#include "bss.h"
#include "lib/rng.h"
#include "lib/lib_159b0.h"
#include "lib/lib_16110.h"
#include "lib/mtx.h"
#include "data.h"
#include "types.h"
src/game/game_006900.c
+3 -4
View File
@@ -6,8 +6,7 @@
#include "game/bg.h"
#include "bss.h"
#include "lib/rng.h"
#include "lib/lib_159b0.h"
#include "lib/lib_16110.h"
#include "lib/mtx.h"
#include "data.h"
#include "types.h"
@@ -54,8 +53,8 @@ void func0f0069dc(void)
#if PIRACYCHECKS
{
u32 *ptr = (u32 *)&func00015fd0;
u32 *end = (u32 *)&func00016054;
u32 *ptr = (u32 *)&mtxGetObfuscatedRomBase;
u32 *end = (u32 *)&mtx00016054;
u32 checksum = 0;
while (ptr < end) {
src/game/game_006bd0.c
+1 -2
View File
@@ -18,8 +18,7 @@
#include "lib/lib_09a80.h"
#include "lib/snd.h"
#include "lib/rng.h"
#include "lib/lib_159b0.h"
#include "lib/lib_16110.h"
#include "lib/mtx.h"
#include "lib/lib_317f0.h"
#include "data.h"
#include "types.h"
src/game/game_00c490.c
+43 -44
View File
@@ -31,8 +31,7 @@
#include "lib/memory.h"
#include "lib/model.h"
#include "lib/rng.h"
#include "lib/lib_159b0.h"
#include "lib/lib_16110.h"
#include "lib/mtx.h"
#include "lib/lib_184d0.h"
#include "lib/lib_233c0.h"
#include "lib/lib_24e40.h"
@@ -563,7 +562,7 @@ glabel var7f1a7f80
/* f00d158: e7aa0018 */ swc1 $f10,0x18($sp)
/* f00d15c: e7a80020 */ swc1 $f8,0x20($sp)
/* f00d160: e7a60024 */ swc1 $f6,0x24($sp)
/* f00d164: 0c005b56 */ jal func00016d58
/* f00d164: 0c005b56 */ jal mtx00016d58
/* f00d168: e7a4001c */ swc1 $f4,0x1c($sp)
/* f00d16c: c7aa00ec */ lwc1 $f10,0xec($sp)
/* f00d170: c7a400f0 */ lwc1 $f4,0xf0($sp)
@@ -841,13 +840,13 @@ glabel var7f1a7f80
/* f00d554: e7ae0054 */ swc1 $f14,0x54($sp)
.L0f00d558:
/* f00d558: e7b00060 */ swc1 $f16,0x60($sp)
/* f00d55c: 0c005789 */ jal func00015e24
/* f00d55c: 0c005789 */ jal mtx00015e24
/* f00d560: e7b2005c */ swc1 $f18,0x5c($sp)
/* f00d564: c7ac0060 */ lwc1 $f12,0x60($sp)
/* f00d568: 0c0057a0 */ jal func00015e80
/* f00d568: 0c0057a0 */ jal mtx00015e80
/* f00d56c: 27a500ac */ addiu $a1,$sp,0xac
/* f00d570: c7ac005c */ lwc1 $f12,0x5c($sp)
/* f00d574: 0c0057b7 */ jal func00015edc
/* f00d574: 0c0057b7 */ jal mtx00015edc
/* f00d578: 27a500ac */ addiu $a1,$sp,0xac
/* f00d57c: 8e040018 */ lw $a0,0x18($s0)
/* f00d580: c7ae0054 */ lwc1 $f14,0x54($sp)
@@ -867,7 +866,7 @@ glabel var7f1a7f80
/* f00d5b0: 00000000 */ nop
/* f00d5b4: 8e0e0018 */ lw $t6,0x18($s0)
/* f00d5b8: 27a500ac */ addiu $a1,$sp,0xac
/* f00d5bc: 0c0057c1 */ jal func00015f04
/* f00d5bc: 0c0057c1 */ jal mtx00015f04
/* f00d5c0: c5cc0014 */ lwc1 $f12,0x14($t6)
/* f00d5c4: 8e0f000c */ lw $t7,0xc($s0)
/* f00d5c8: 8fb9007c */ lw $t9,0x7c($sp)
@@ -1121,7 +1120,7 @@ void setupCctv(struct cctvobj *cctv, s32 cmdindex)
lenspos.y = lens->position.pos.y;
lenspos.z = lens->position.pos.z;
func00016208(obj->realrot, &lenspos);
mtx00016208(obj->realrot, &lenspos);
lenspos.x += obj->prop->pos.x;
lenspos.y += obj->prop->pos.y;
@@ -1135,8 +1134,8 @@ void setupCctv(struct cctvobj *cctv, s32 cmdindex)
// empty
}
func00016d58(&cctv->camrotm, 0.0f, 0.0f, 0.0f, xdiff, ydiff, zdiff, 0.0f, 1.0f, 0.0f);
func00015f04(obj->model->scale, &cctv->camrotm);
mtx00016d58(&cctv->camrotm, 0.0f, 0.0f, 0.0f, xdiff, ydiff, zdiff, 0.0f, 1.0f, 0.0f);
mtx00015f04(obj->model->scale, &cctv->camrotm);
cctv->toleft = 0;
cctv->yleft = *(s32 *)&cctv->yleft * M_BADTAU / 65536.0f;
@@ -1376,16 +1375,16 @@ void setupSingleMonitor(struct singlemonitorobj *monitor, s32 cmdindex)
}
propReparent(prop, owner->prop);
func000162e8(0.3664608001709f, &sp64);
func00015f04(monitor->base.model->scale / owner->model->scale, &sp64);
mtx000162e8(0.3664608001709f, &sp64);
mtx00015f04(monitor->base.model->scale / owner->model->scale, &sp64);
modelGetRootPosition(monitor->base.model, &spa4);
spa4.x = -spa4.x;
spa4.y = -spa4.y;
spa4.z = -spa4.z;
func000166dc(&spa4, &sp24);
func00015be4(&sp64, &sp24, &monitor->base.monitorthing->matrix);
mtx000166dc(&spa4, &sp24);
mtx00015be4(&sp64, &sp24, &monitor->base.monitorthing->matrix);
}
} else {
setupGenericObject(&monitor->base, cmdindex);
@@ -1632,21 +1631,21 @@ glabel var7f1a926cpf
/* f00e5ac: 27a40110 */ addiu $a0,$sp,0x110
/* f00e5b0: e7a40020 */ swc1 $f4,0x20($sp)
/* f00e5b4: e7aa0024 */ swc1 $f10,0x24($sp)
/* f00e5b8: 0c005aba */ jal func00016d58
/* f00e5b8: 0c005aba */ jal mtx00016d58
/* f00e5bc: e7b2001c */ swc1 $f18,0x1c($sp)
/* f00e5c0: 3c017f1b */ lui $at,0x7f1b
/* f00e5c4: c42c9260 */ lwc1 $f12,-0x6da0($at)
/* f00e5c8: 0c00581e */ jal func000162e8
/* f00e5c8: 0c00581e */ jal mtx000162e8
/* f00e5cc: 27a500ac */ addiu $a1,$sp,0xac
/* f00e5d0: 3c017f1b */ lui $at,0x7f1b
/* f00e5d4: c42c9264 */ lwc1 $f12,-0x6d9c($at)
/* f00e5d8: 0c005864 */ jal func00016400
/* f00e5d8: 0c005864 */ jal mtx00016400
/* f00e5dc: 27a50060 */ addiu $a1,$sp,0x60
/* f00e5e0: 27a40060 */ addiu $a0,$sp,0x60
/* f00e5e4: 0c0055e3 */ jal func000159fc
/* f00e5e4: 0c0055e3 */ jal mtx000159fc
/* f00e5e8: 27a500ac */ addiu $a1,$sp,0xac
/* f00e5ec: 27a40110 */ addiu $a0,$sp,0x110
/* f00e5f0: 0c0055e3 */ jal func000159fc
/* f00e5f0: 0c0055e3 */ jal mtx000159fc
/* f00e5f4: 27a500ac */ addiu $a1,$sp,0xac
/* f00e5f8: 86040006 */ lh $a0,0x6($s0)
/* f00e5fc: 0fc45a85 */ jal padGetCentre
@@ -1695,13 +1694,13 @@ glabel var7f1a926cpf
.PF0f00e6a0:
/* f00e6a0: e7a2004c */ swc1 $f2,0x4c($sp)
/* f00e6a4: e7ac0050 */ swc1 $f12,0x50($sp)
/* f00e6a8: 0c0056ed */ jal func00015e24
/* f00e6a8: 0c0056ed */ jal mtx00015e24
/* f00e6ac: e7ae0048 */ swc1 $f14,0x48($sp)
/* f00e6b0: c7ac004c */ lwc1 $f12,0x4c($sp)
/* f00e6b4: 0c005704 */ jal func00015e80
/* f00e6b4: 0c005704 */ jal mtx00015e80
/* f00e6b8: 27a500ac */ addiu $a1,$sp,0xac
/* f00e6bc: c7ac0048 */ lwc1 $f12,0x48($sp)
/* f00e6c0: 0c00571b */ jal func00015edc
/* f00e6c0: 0c00571b */ jal mtx00015edc
/* f00e6c4: 27a500ac */ addiu $a1,$sp,0xac
/* f00e6c8: c7a80168 */ lwc1 $f8,0x168($sp)
/* f00e6cc: c7b0016c */ lwc1 $f16,0x16c($sp)
@@ -2027,21 +2026,21 @@ glabel var7f1a8064
/* f00e5c4: 27a40110 */ addiu $a0,$sp,0x110
/* f00e5c8: e7a40020 */ swc1 $f4,0x20($sp)
/* f00e5cc: e7aa0024 */ swc1 $f10,0x24($sp)
/* f00e5d0: 0c005b56 */ jal func00016d58
/* f00e5d0: 0c005b56 */ jal mtx00016d58
/* f00e5d4: e7b2001c */ swc1 $f18,0x1c($sp)
/* f00e5d8: 3c017f1b */ lui $at,%hi(var7f1a805c)
/* f00e5dc: c42c805c */ lwc1 $f12,%lo(var7f1a805c)($at)
/* f00e5e0: 0c0058ba */ jal func000162e8
/* f00e5e0: 0c0058ba */ jal mtx000162e8
/* f00e5e4: 27a500ac */ addiu $a1,$sp,0xac
/* f00e5e8: 3c017f1b */ lui $at,%hi(var7f1a8060)
/* f00e5ec: c42c8060 */ lwc1 $f12,%lo(var7f1a8060)($at)
/* f00e5f0: 0c005900 */ jal func00016400
/* f00e5f0: 0c005900 */ jal mtx00016400
/* f00e5f4: 27a50060 */ addiu $a1,$sp,0x60
/* f00e5f8: 27a40060 */ addiu $a0,$sp,0x60
/* f00e5fc: 0c00567f */ jal func000159fc
/* f00e5fc: 0c00567f */ jal mtx000159fc
/* f00e600: 27a500ac */ addiu $a1,$sp,0xac
/* f00e604: 27a40110 */ addiu $a0,$sp,0x110
/* f00e608: 0c00567f */ jal func000159fc
/* f00e608: 0c00567f */ jal mtx000159fc
/* f00e60c: 27a500ac */ addiu $a1,$sp,0xac
/* f00e610: 86040006 */ lh $a0,0x6($s0)
/* f00e614: 0fc457cd */ jal padGetCentre
@@ -2090,13 +2089,13 @@ glabel var7f1a8064
.L0f00e6b8:
/* f00e6b8: e7a2004c */ swc1 $f2,0x4c($sp)
/* f00e6bc: e7ac0050 */ swc1 $f12,0x50($sp)
/* f00e6c0: 0c005789 */ jal func00015e24
/* f00e6c0: 0c005789 */ jal mtx00015e24
/* f00e6c4: e7ae0048 */ swc1 $f14,0x48($sp)
/* f00e6c8: c7ac004c */ lwc1 $f12,0x4c($sp)
/* f00e6cc: 0c0057a0 */ jal func00015e80
/* f00e6cc: 0c0057a0 */ jal mtx00015e80
/* f00e6d0: 27a500ac */ addiu $a1,$sp,0xac
/* f00e6d4: c7ac0048 */ lwc1 $f12,0x48($sp)
/* f00e6d8: 0c0057b7 */ jal func00015edc
/* f00e6d8: 0c0057b7 */ jal mtx00015edc
/* f00e6dc: 27a500ac */ addiu $a1,$sp,0xac
/* f00e6e0: c7a80168 */ lwc1 $f8,0x168($sp)
/* f00e6e4: c7b0016c */ lwc1 $f16,0x16c($sp)
@@ -2322,13 +2321,13 @@ glabel var7f1a8064
//
// floats = modelFileDataFindBboxRodata(g_ModelStates[modelnum].filedata);
//
// func00016d58(sp110, 0, 0, 0,
// mtx00016d58(sp110, 0, 0, 0,
// -pad.look.x, -pad.look.y, -pad.look.z,
// pad.up.x, pad.up.y, pad.up.z);
// func000162e8(1.5705462694168f, spac);
// func00016400(1.5705462694168f, sp60);
// func000159fc(sp60, spac);
// func000159fc(sp110, spac);
// mtx000162e8(1.5705462694168f, spac);
// mtx00016400(1.5705462694168f, sp60);
// mtx000159fc(sp60, spac);
// mtx000159fc(sp110, spac);
//
// padGetCentre(door->base.pad, &spa0);
//
@@ -2342,9 +2341,9 @@ glabel var7f1a8064
// sp48 = 1;
// }
//
// func00015e24(sp50, spac);
// func00015e80(sp4c, spac);
// func00015edc(sp48, spac);
// mtx00015e24(sp50, spac);
// mtx00015e80(sp4c, spac);
// mtx00015edc(sp48, spac);
//
// pos.x = pad.pos.x;
// pos.y = pad.pos.y;
@@ -3166,15 +3165,15 @@ void setupParseObjects(s32 stagenum)
if (obj->flags & OBJFLAG_DEACTIVATED) {
step->frame = escstepy;
escstepy += 40;
func00016374(4.7116389274597f, (Mtxf *)sp1a8);
func00015da0((Mtxf *)sp1a8, sp184);
func00016110(sp184, obj->realrot);
mtx00016374(4.7116389274597f, (Mtxf *)sp1a8);
mtx00015da0((Mtxf *)sp1a8, sp184);
mtx00016110(sp184, obj->realrot);
} else {
step->frame = escstepx;
escstepx += 40;
func00016374(M_BADPI, (Mtxf *)sp1a8);
func00015da0((Mtxf *)sp1a8, sp184);
func00016110(sp184, obj->realrot);
mtx00016374(M_BADPI, (Mtxf *)sp1a8);
mtx00015da0((Mtxf *)sp1a8, sp184);
mtx00016110(sp184, obj->realrot);
}
}
break;
src/game/game_011110.c
+1 -1
View File
@@ -18,7 +18,7 @@
#include "game/pad.h"
#include "bss.h"
#include "lib/memory.h"
#include "lib/lib_16110.h"
#include "lib/mtx.h"
#include "lib/lib_233c0.h"
#include "data.h"
#include "types.h"
src/game/game_0125a0.c
+2 -2
View File
@@ -6,7 +6,7 @@
#include "game/bg.h"
#include "game/pad.h"
#include "bss.h"
#include "lib/lib_159b0.h"
#include "lib/mtx.h"
#include "lib/lib_233c0.h"
#include "lib/model.h"
#include "data.h"
@@ -102,7 +102,7 @@ void currentPlayerInitAnimation(void)
modelSetAnimation(&g_Vars.currentplayer->model, 1, 0, 0, 0.5f, 0);
func0001b3bc(&g_Vars.currentplayer->model);
func000159b0(&sp48);
mtx000159b0(&sp48);
sp88.matrix = &sp48;
sp88.unk10 = g_Vars.currentplayer->bondheadmatrices;
func0001cebc(&sp88, &g_Vars.currentplayer->model);
src/game/game_012aa0.c
+1 -1
View File
@@ -6,7 +6,7 @@
#include "game/bg.h"
#include "game/pad.h"
#include "bss.h"
#include "lib/lib_159b0.h"
#include "lib/mtx.h"
#include "lib/lib_233c0.h"
#include "lib/model.h"
#include "data.h"
src/game/game_014e90.c
+1 -1
View File
@@ -10,7 +10,7 @@
#include "lib/memory.h"
#include "lib/model.h"
#include "lib/rng.h"
#include "lib/lib_16110.h"
#include "lib/mtx.h"
#include "data.h"
#include "types.h"
src/game/game_02cde0.c
+1 -1
View File
@@ -17,7 +17,7 @@
#include "lib/model.h"
#include "lib/lib_126b0.h"
#include "lib/rng.h"
#include "lib/lib_16110.h"
#include "lib/mtx.h"
#include "lib/lib_184d0.h"
#include "lib/lib_233c0.h"
#include "lib/lib_24e40.h"
src/game/game_092610.c
+1 -1
View File
@@ -12,7 +12,7 @@
#include "bss.h"
#include "lib/snd.h"
#include "lib/rng.h"
#include "lib/lib_16110.h"
#include "lib/mtx.h"
#include "lib/lib_317f0.h"
#include "data.h"
#include "types.h"
src/game/game_096360.c
+3 -4
View File
@@ -7,8 +7,7 @@
#include "game/propobj.h"
#include "bss.h"
#include "lib/rng.h"
#include "lib/lib_159b0.h"
#include "lib/lib_16110.h"
#include "lib/mtx.h"
#include "data.h"
#include "types.h"
@@ -20,7 +19,7 @@ void func0f096360(Mtxf *mtx)
coord.y = random() * (1.0f / U32_MAX) * PALUPF(M_BADTAU) * 0.0078125f - PALUPF(0.024539785459638f);
coord.z = random() * (1.0f / U32_MAX) * PALUPF(M_BADTAU) * 0.0078125f - PALUPF(0.024539785459638f);
func0001648c(&coord, mtx);
mtx0001648c(&coord, mtx);
}
void func0f0964b4(f32 *arg0, Mtxf *mtx)
@@ -52,6 +51,6 @@ void func0f096698(Mtxf *arg0, Mtxf *arg1, s32 count)
s32 i;
for (i = 0; i < count; i++) {
func00015be0(arg1, arg0);
mtx00015be0(arg1, arg0);
}
}
src/game/game_096700.c
+1 -1
View File
@@ -1,7 +1,7 @@
#include <ultra64.h>
#include "constants.h"
#include "bss.h"
#include "lib/lib_16110.h"
#include "lib/mtx.h"
#include "data.h"
#include "types.h"
src/game/game_096ca0.c
+1 -1
View File
@@ -3,7 +3,7 @@
#include "game/game_0969d0.h"
#include "game/game_096ca0.h"
#include "bss.h"
#include "lib/lib_16110.h"
#include "lib/mtx.h"
#include "data.h"
#include "types.h"
src/game/game_0abe70.c
+71 -72
View File
@@ -11,8 +11,7 @@
#include "bss.h"
#include "lib/main.h"
#include "lib/rng.h"
#include "lib/lib_159b0.h"
#include "lib/lib_16110.h"
#include "lib/mtx.h"
#include "data.h"
#include "types.h"
@@ -478,7 +477,7 @@ glabel var7f1acc68
/* f0ac5d4: e7aa00ec */ swc1 $f10,0xec($sp)
/* f0ac5d8: 00402025 */ or $a0,$v0,$zero
/* f0ac5dc: 8fa500fc */ lw $a1,0xfc($sp)
/* f0ac5e0: 0c0056da */ jal func00015b68
/* f0ac5e0: 0c0056da */ jal mtx00015b68
/* f0ac5e4: 27a6005c */ addiu $a2,$sp,0x5c
/* f0ac5e8: c7ae00f8 */ lwc1 $f14,0xf8($sp)
/* f0ac5ec: c7a8005c */ lwc1 $f8,0x5c($sp)
@@ -530,7 +529,7 @@ glabel var7f1acc68
/* f0ac68c: 00000000 */ nop
/* f0ac690: 00402025 */ or $a0,$v0,$zero
/* f0ac694: 8fa50108 */ lw $a1,0x108($sp)
/* f0ac698: 0c0056da */ jal func00015b68
/* f0ac698: 0c0056da */ jal mtx00015b68
/* f0ac69c: 27a6005c */ addiu $a2,$sp,0x5c
/* f0ac6a0: c7b000f8 */ lwc1 $f16,0xf8($sp)
/* f0ac6a4: c7a6005c */ lwc1 $f6,0x5c($sp)
@@ -657,19 +656,19 @@ glabel var7f1acc68
/* f0ac860: 00408025 */ or $s0,$v0,$zero
/* f0ac864: afa200c8 */ sw $v0,0xc8($sp)
/* f0ac868: 8fa400fc */ lw $a0,0xfc($sp)
/* f0ac86c: 0c0059b7 */ jal func000166dc
/* f0ac86c: 0c0059b7 */ jal mtx000166dc
/* f0ac870: 27a50084 */ addiu $a1,$sp,0x84
/* f0ac874: 3c013f80 */ lui $at,0x3f80
/* f0ac878: 44812000 */ mtc1 $at,$f4
/* f0ac87c: c7a800f8 */ lwc1 $f8,0xf8($sp)
/* f0ac880: 27a50084 */ addiu $a1,$sp,0x84
/* f0ac884: 0c0057c1 */ jal func00015f04
/* f0ac884: 0c0057c1 */ jal mtx00015f04
/* f0ac888: 46082303 */ div.s $f12,$f4,$f8
/* f0ac88c: 8fa40080 */ lw $a0,0x80($sp)
/* f0ac890: 0c0056f8 */ jal func00015be0
/* f0ac890: 0c0056f8 */ jal mtx00015be0
/* f0ac894: 27a50084 */ addiu $a1,$sp,0x84
/* f0ac898: 27a40084 */ addiu $a0,$sp,0x84
/* f0ac89c: 0c005815 */ jal func00016054
/* f0ac89c: 0c005815 */ jal mtx00016054
/* f0ac8a0: 8fa500c8 */ lw $a1,0xc8($sp)
/* f0ac8a4: c7b200e0 */ lwc1 $f18,0xe0($sp)
/* f0ac8a8: c7aa00f8 */ lwc1 $f10,0xf8($sp)
@@ -1322,14 +1321,14 @@ glabel var7f1accf4
/* f0ad14c: 27a50148 */ addiu $a1,$sp,0x148
/* f0ad150: 45020295 */ bc1fl .L0f0adba8
/* f0ad154: 8fbf002c */ lw $ra,0x2c($sp)
/* f0ad158: 0c0059b7 */ jal func000166dc
/* f0ad158: 0c0059b7 */ jal mtx000166dc
/* f0ad15c: afa800d8 */ sw $t0,0xd8($sp)
/* f0ad160: 3c017f1b */ lui $at,%hi(var7f1acccc)
/* f0ad164: c42ccccc */ lwc1 $f12,%lo(var7f1acccc)($at)
/* f0ad168: 0c0057c1 */ jal func00015f04
/* f0ad168: 0c0057c1 */ jal mtx00015f04
/* f0ad16c: 27a50148 */ addiu $a1,$sp,0x148
/* f0ad170: 8fa400e4 */ lw $a0,0xe4($sp)
/* f0ad174: 0c0056f8 */ jal func00015be0
/* f0ad174: 0c0056f8 */ jal mtx00015be0
/* f0ad178: 27a50148 */ addiu $a1,$sp,0x148
/* f0ad17c: 3c0146fa */ lui $at,0x46fa
/* f0ad180: 44811000 */ mtc1 $at,$f2
@@ -1365,7 +1364,7 @@ glabel var7f1accf4
/* f0ad1e4: 00001025 */ or $v0,$zero,$zero
/* f0ad1e8: 1100026e */ beqz $t0,.L0f0adba4
/* f0ad1ec: 27a40148 */ addiu $a0,$sp,0x148
/* f0ad1f0: 0c005815 */ jal func00016054
/* f0ad1f0: 0c005815 */ jal mtx00016054
/* f0ad1f4: 8fa50188 */ lw $a1,0x188($sp)
/* f0ad1f8: 82230001 */ lb $v1,0x1($s1)
/* f0ad1fc: 2401fffe */ addiu $at,$zero,-2
@@ -1422,7 +1421,7 @@ glabel var7f1accf4
/* f0ad2b8: c6240018 */ lwc1 $f4,0x18($s1)
/* f0ad2bc: 46002282 */ mul.s $f10,$f4,$f0
/* f0ad2c0: 46065200 */ add.s $f8,$f10,$f6
/* f0ad2c4: 0c0056d9 */ jal func00015b64
/* f0ad2c4: 0c0056d9 */ jal mtx00015b64
/* f0ad2c8: e7a800d4 */ swc1 $f8,0xd4($sp)
/* f0ad2cc: 3c014120 */ lui $at,0x4120
/* f0ad2d0: 44815000 */ mtc1 $at,$f10
@@ -1461,7 +1460,7 @@ glabel var7f1accf4
/* f0ad350: 0fc2d5de */ jal currentPlayerGetUnk174c
/* f0ad354: 00000000 */ nop
/* f0ad358: 00402025 */ or $a0,$v0,$zero
/* f0ad35c: 0c0056d9 */ jal func00015b64
/* f0ad35c: 0c0056d9 */ jal mtx00015b64
/* f0ad360: 27a500cc */ addiu $a1,$sp,0xcc
/* f0ad364: c7a200cc */ lwc1 $f2,0xcc($sp)
/* f0ad368: c7ac0138 */ lwc1 $f12,0x138($sp)
@@ -2068,7 +2067,7 @@ glabel func0f0adcc8
/* f0add3c: e5060008 */ swc1 $f6,0x8($t0)
/* f0add40: c4c80038 */ lwc1 $f8,0x38($a2)
/* f0add44: e508000c */ swc1 $f8,0xc($t0)
/* f0add48: 0c005768 */ jal func00015da0
/* f0add48: 0c005768 */ jal mtx00015da0
/* f0add4c: afa80030 */ sw $t0,0x30($sp)
/* f0add50: 8fa80030 */ lw $t0,0x30($sp)
/* f0add54: 3c014580 */ lui $at,0x4580
@@ -2271,7 +2270,7 @@ glabel var7f1acd60
/* f0adf48: 29c10002 */ slti $at,$t6,0x2
/* f0adf4c: 10200280 */ beqz $at,.L0f0ae950
/* f0adf50: 8fa40148 */ lw $a0,0x148($sp)
/* f0adf54: 0c005746 */ jal func00015d18
/* f0adf54: 0c005746 */ jal mtx00015d18
/* f0adf58: 27a500ec */ addiu $a1,$sp,0xec
/* f0adf5c: 0fc27aef */ jal bgun0f09ebbc
/* f0adf60: 00000000 */ nop
@@ -2352,7 +2351,7 @@ glabel var7f1acd60
/* f0ae07c: 46083282 */ mul.s $f10,$f6,$f8
/* f0ae080: 46005480 */ add.s $f18,$f10,$f0
/* f0ae084: e6120014 */ swc1 $f18,0x14($s0)
/* f0ae088: 0c0056c4 */ jal func00015b10
/* f0ae088: 0c0056c4 */ jal mtx00015b10
/* f0ae08c: 8fa40148 */ lw $a0,0x148($sp)
/* f0ae090: 0c004b70 */ jal random
/* f0ae094: 00000000 */ nop
@@ -2425,10 +2424,10 @@ glabel var7f1acd60
/* f0ae194: c428cd10 */ lwc1 $f8,%lo(var7f1acd10)($at)
/* f0ae198: 46069102 */ mul.s $f4,$f18,$f6
/* f0ae19c: 46082281 */ sub.s $f10,$f4,$f8
/* f0ae1a0: 0c005923 */ jal func0001648c
/* f0ae1a0: 0c005923 */ jal mtx0001648c
/* f0ae1a4: e7aa00ac */ swc1 $f10,0xac($sp)
/* f0ae1a8: 27a40064 */ addiu $a0,$sp,0x64
/* f0ae1ac: 0c005768 */ jal func00015da0
/* f0ae1ac: 0c005768 */ jal mtx00015da0
/* f0ae1b0: 27a500c8 */ addiu $a1,$sp,0xc8
/* f0ae1b4: 3c014580 */ lui $at,0x4580
/* f0ae1b8: 44810000 */ mtc1 $at,$f0
@@ -2665,7 +2664,7 @@ glabel var7f1acd60
/* f0ae520: e6040018 */ swc1 $f4,0x18($s0)
.L0f0ae524:
/* f0ae524: 8fa40148 */ lw $a0,0x148($sp)
/* f0ae528: 0c0056c4 */ jal func00015b10
/* f0ae528: 0c0056c4 */ jal mtx00015b10
/* f0ae52c: afa5002c */ sw $a1,0x2c($sp)
/* f0ae530: 8fab00c4 */ lw $t3,0xc4($sp)
/* f0ae534: 24010014 */ addiu $at,$zero,0x14
@@ -2742,10 +2741,10 @@ glabel var7f1acd60
/* f0ae644: c428cd40 */ lwc1 $f8,%lo(var7f1acd40)($at)
/* f0ae648: 460a2482 */ mul.s $f18,$f4,$f10
/* f0ae64c: 46089181 */ sub.s $f6,$f18,$f8
/* f0ae650: 0c005923 */ jal func0001648c
/* f0ae650: 0c005923 */ jal mtx0001648c
/* f0ae654: e7a600ac */ swc1 $f6,0xac($sp)
/* f0ae658: 27a40064 */ addiu $a0,$sp,0x64
/* f0ae65c: 0c0056c4 */ jal func00015b10
/* f0ae65c: 0c0056c4 */ jal mtx00015b10
/* f0ae660: 8fa5002c */ lw $a1,0x2c($sp)
.L0f0ae664:
/* f0ae664: 0c004b70 */ jal random
@@ -2819,10 +2818,10 @@ glabel var7f1acd60
/* f0ae768: c432cd58 */ lwc1 $f18,%lo(var7f1acd58)($at)
/* f0ae76c: 460a3102 */ mul.s $f4,$f6,$f10
/* f0ae770: 46122201 */ sub.s $f8,$f4,$f18
/* f0ae774: 0c005923 */ jal func0001648c
/* f0ae774: 0c005923 */ jal mtx0001648c
/* f0ae778: e7a800ac */ swc1 $f8,0xac($sp)
/* f0ae77c: 27a40064 */ addiu $a0,$sp,0x64
/* f0ae780: 0c005768 */ jal func00015da0
/* f0ae780: 0c005768 */ jal mtx00015da0
/* f0ae784: 27a500c8 */ addiu $a1,$sp,0xc8
/* f0ae788: 3c014580 */ lui $at,0x4580
/* f0ae78c: 44810000 */ mtc1 $at,$f0
@@ -3102,7 +3101,7 @@ glabel var7f1acd60
/* f0adf48: 29c10002 */ slti $at,$t6,0x2
/* f0adf4c: 10200280 */ beqz $at,.L0f0ae950
/* f0adf50: 8fa40148 */ lw $a0,0x148($sp)
/* f0adf54: 0c005746 */ jal func00015d18
/* f0adf54: 0c005746 */ jal mtx00015d18
/* f0adf58: 27a500ec */ addiu $a1,$sp,0xec
/* f0adf5c: 0fc27aef */ jal bgun0f09ebbc
/* f0adf60: 00000000 */ nop
@@ -3183,7 +3182,7 @@ glabel var7f1acd60
/* f0ae07c: 46083282 */ mul.s $f10,$f6,$f8
/* f0ae080: 46005480 */ add.s $f18,$f10,$f0
/* f0ae084: e6120014 */ swc1 $f18,0x14($s0)
/* f0ae088: 0c0056c4 */ jal func00015b10
/* f0ae088: 0c0056c4 */ jal mtx00015b10
/* f0ae08c: 8fa40148 */ lw $a0,0x148($sp)
/* f0ae090: 0c004b70 */ jal random
/* f0ae094: 00000000 */ nop
@@ -3256,10 +3255,10 @@ glabel var7f1acd60
/* f0ae194: c428cd10 */ lwc1 $f8,%lo(var7f1acd10)($at)
/* f0ae198: 46069102 */ mul.s $f4,$f18,$f6
/* f0ae19c: 46082281 */ sub.s $f10,$f4,$f8
/* f0ae1a0: 0c005923 */ jal func0001648c
/* f0ae1a0: 0c005923 */ jal mtx0001648c
/* f0ae1a4: e7aa00ac */ swc1 $f10,0xac($sp)
/* f0ae1a8: 27a40064 */ addiu $a0,$sp,0x64
/* f0ae1ac: 0c005768 */ jal func00015da0
/* f0ae1ac: 0c005768 */ jal mtx00015da0
/* f0ae1b0: 27a500c8 */ addiu $a1,$sp,0xc8
/* f0ae1b4: 3c014580 */ lui $at,0x4580
/* f0ae1b8: 44810000 */ mtc1 $at,$f0
@@ -3496,7 +3495,7 @@ glabel var7f1acd60
/* f0ae520: e6040018 */ swc1 $f4,0x18($s0)
.L0f0ae524:
/* f0ae524: 8fa40148 */ lw $a0,0x148($sp)
/* f0ae528: 0c0056c4 */ jal func00015b10
/* f0ae528: 0c0056c4 */ jal mtx00015b10
/* f0ae52c: afa5002c */ sw $a1,0x2c($sp)
/* f0ae530: 8fab00c4 */ lw $t3,0xc4($sp)
/* f0ae534: 24010014 */ addiu $at,$zero,0x14
@@ -3573,10 +3572,10 @@ glabel var7f1acd60
/* f0ae644: c428cd40 */ lwc1 $f8,%lo(var7f1acd40)($at)
/* f0ae648: 460a2482 */ mul.s $f18,$f4,$f10
/* f0ae64c: 46089181 */ sub.s $f6,$f18,$f8
/* f0ae650: 0c005923 */ jal func0001648c
/* f0ae650: 0c005923 */ jal mtx0001648c
/* f0ae654: e7a600ac */ swc1 $f6,0xac($sp)
/* f0ae658: 27a40064 */ addiu $a0,$sp,0x64
/* f0ae65c: 0c0056c4 */ jal func00015b10
/* f0ae65c: 0c0056c4 */ jal mtx00015b10
/* f0ae660: 8fa5002c */ lw $a1,0x2c($sp)
.L0f0ae664:
/* f0ae664: 0c004b70 */ jal random
@@ -3650,10 +3649,10 @@ glabel var7f1acd60
/* f0ae768: c432cd58 */ lwc1 $f18,%lo(var7f1acd58)($at)
/* f0ae76c: 460a3102 */ mul.s $f4,$f6,$f10
/* f0ae770: 46122201 */ sub.s $f8,$f4,$f18
/* f0ae774: 0c005923 */ jal func0001648c
/* f0ae774: 0c005923 */ jal mtx0001648c
/* f0ae778: e7a800ac */ swc1 $f8,0xac($sp)
/* f0ae77c: 27a40064 */ addiu $a0,$sp,0x64
/* f0ae780: 0c005768 */ jal func00015da0
/* f0ae780: 0c005768 */ jal mtx00015da0
/* f0ae784: 27a500c8 */ addiu $a1,$sp,0xc8
/* f0ae788: 3c014580 */ lui $at,0x4580
/* f0ae78c: 44810000 */ mtc1 $at,$f0
@@ -3886,16 +3885,16 @@ glabel var7f1acd6c
/* f0aeab8: e7a00054 */ swc1 $f0,0x54($sp)
/* f0aeabc: e7a00064 */ swc1 $f0,0x64($sp)
/* f0aeac0: e7a00074 */ swc1 $f0,0x74($sp)
/* f0aeac4: 0c0057c1 */ jal func00015f04
/* f0aeac4: 0c0057c1 */ jal mtx00015f04
/* f0aeac8: e7aa0084 */ swc1 $f10,0x84($sp)
/* f0aeacc: 26440004 */ addiu $a0,$s2,0x4
/* f0aead0: 0c005775 */ jal func00015dd4
/* f0aead0: 0c005775 */ jal mtx00015dd4
/* f0aead4: 02002825 */ or $a1,$s0,$zero
/* f0aead8: 0fc2d5be */ jal currentPlayerGetMatrix1740
/* f0aeadc: 00000000 */ nop
/* f0aeae0: 00402025 */ or $a0,$v0,$zero
/* f0aeae4: 02002825 */ or $a1,$s0,$zero
/* f0aeae8: 0c0056f9 */ jal func00015be4
/* f0aeae8: 0c0056f9 */ jal mtx00015be4
/* f0aeaec: 8fa600d4 */ lw $a2,0xd4($sp)
/* f0aeaf0: 3c017f1b */ lui $at,%hi(var7f1acd68)
/* f0aeaf4: c42ccd68 */ lwc1 $f12,%lo(var7f1acd68)($at)
@@ -4333,32 +4332,32 @@ glabel var7f1acd8c
/* f0af324: 27b10164 */ addiu $s1,$sp,0x164
/* f0af328: 02202025 */ or $a0,$s1,$zero
/* f0af32c: af090004 */ sw $t1,0x4($t8)
/* f0af330: 0c00566c */ jal func000159b0
/* f0af330: 0c00566c */ jal mtx000159b0
/* f0af334: af080000 */ sw $t0,0x0($t8)
/* f0af338: 0fc2d5be */ jal currentPlayerGetMatrix1740
/* f0af33c: 00000000 */ nop
/* f0af340: 00402025 */ or $a0,$v0,$zero
/* f0af344: 0c0056f8 */ jal func00015be0
/* f0af344: 0c0056f8 */ jal mtx00015be0
/* f0af348: 02202825 */ or $a1,$s1,$zero
/* f0af34c: 27b10124 */ addiu $s1,$sp,0x124
/* f0af350: 0c00566c */ jal func000159b0
/* f0af350: 0c00566c */ jal mtx000159b0
/* f0af354: 02202025 */ or $a0,$s1,$zero
/* f0af358: 0fc2d5de */ jal currentPlayerGetUnk174c
/* f0af35c: 00000000 */ nop
/* f0af360: 00402025 */ or $a0,$v0,$zero
/* f0af364: 0c0056f8 */ jal func00015be0
/* f0af364: 0c0056f8 */ jal mtx00015be0
/* f0af368: 02202825 */ or $a1,$s1,$zero
/* f0af36c: 44800000 */ mtc1 $zero,$f0
/* f0af370: 27b101b0 */ addiu $s1,$sp,0x1b0
/* f0af374: 02202025 */ or $a0,$s1,$zero
/* f0af378: e7a00158 */ swc1 $f0,0x158($sp)
/* f0af37c: e7a00154 */ swc1 $f0,0x154($sp)
/* f0af380: 0c00566c */ jal func000159b0
/* f0af380: 0c00566c */ jal mtx000159b0
/* f0af384: e7a0015c */ swc1 $f0,0x15c($sp)
/* f0af388: 0fc2d5be */ jal currentPlayerGetMatrix1740
/* f0af38c: 00000000 */ nop
/* f0af390: 00402025 */ or $a0,$v0,$zero
/* f0af394: 0c0056f8 */ jal func00015be0
/* f0af394: 0c0056f8 */ jal mtx00015be0
/* f0af398: 02202825 */ or $a1,$s1,$zero
/* f0af39c: c6041bb0 */ lwc1 $f4,0x1bb0($s0)
/* f0af3a0: 44805000 */ mtc1 $zero,$f10
@@ -4374,13 +4373,13 @@ glabel var7f1acd8c
/* f0af3c8: e7aa01e0 */ swc1 $f10,0x1e0($sp)
/* f0af3cc: e7a401e4 */ swc1 $f4,0x1e4($sp)
/* f0af3d0: e7a801ac */ swc1 $f8,0x1ac($sp)
/* f0af3d4: 0c0057e2 */ jal func00015f88
/* f0af3d4: 0c0057e2 */ jal mtx00015f88
/* f0af3d8: e7a601e8 */ swc1 $f6,0x1e8($sp)
/* f0af3dc: 0fc59e66 */ jal gfxAllocateMatrix
/* f0af3e0: 00000000 */ nop
/* f0af3e4: 00408025 */ or $s0,$v0,$zero
/* f0af3e8: 02202025 */ or $a0,$s1,$zero
/* f0af3ec: 0c005815 */ jal func00016054
/* f0af3ec: 0c005815 */ jal mtx00016054
/* f0af3f0: 00402825 */ or $a1,$v0,$zero
/* f0af3f4: 8fb10200 */ lw $s1,0x200($sp)
/* f0af3f8: 3c0c0102 */ lui $t4,0x102
@@ -4844,17 +4843,17 @@ glabel var7f1acd8c
// gDPSetTextureLUT(gdl++, G_TT_NONE);
// gDPSetCombineMode(gdl++, G_CC_BLENDIA, G_CC_BLENDIA);
//
// func000159b0(&sp164);
// func00015be0(currentPlayerGetMatrix1740(), &sp164);
// func000159b0(&sp124);
// func00015be0(currentPlayerGetUnk174c(), &sp124);
// mtx000159b0(&sp164);
// mtx00015be0(currentPlayerGetMatrix1740(), &sp164);
// mtx000159b0(&sp124);
// mtx00015be0(currentPlayerGetUnk174c(), &sp124);
//
// sp124.m[3][1] = 0;
// sp124.m[3][0] = 0;
// sp124.m[3][2] = 0;
//
// func000159b0(&sp1b0);
// func00015be0(currentPlayerGetMatrix1740(), &sp1b0);
// mtx000159b0(&sp1b0);
// mtx00015be0(currentPlayerGetMatrix1740(), &sp1b0);
//
// campos.x = player->cam_pos.x;
// campos.y = player->cam_pos.y;
@@ -4864,10 +4863,10 @@ glabel var7f1acd8c
// sp1b0.m[3][1] = 0.0f;
// sp1b0.m[3][2] = 0.0f;
//
// func00015f88(0.2f, &sp1b0);
// mtx00015f88(0.2f, &sp1b0);
//
// mtx = gfxAllocateMatrix();
// func00016054(&sp1b0, mtx);
// mtx00016054(&sp1b0, mtx);
//
// gSPMatrix(gdl++, osVirtualToPhysical(mtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
//
@@ -5135,31 +5134,31 @@ glabel var7f1acd90
/* f0afc10: 00003825 */ or $a3,$zero,$zero
/* f0afc14: 0fc2ce70 */ jal func0f0b39c0
/* f0afc18: 24a50024 */ addiu $a1,$a1,0x0024
/* f0afc1c: 0c00566c */ jal func000159b0
/* f0afc1c: 0c00566c */ jal mtx000159b0
/* f0afc20: 27a4014c */ addiu $a0,$sp,0x14c
/* f0afc24: 0fc2d5be */ jal currentPlayerGetMatrix1740
/* f0afc28: 00000000 */ nop
/* f0afc2c: 00402025 */ or $a0,$v0,$zero
/* f0afc30: 0c0056f8 */ jal func00015be0
/* f0afc30: 0c0056f8 */ jal mtx00015be0
/* f0afc34: 27a5014c */ addiu $a1,$sp,0x14c
/* f0afc38: 0c00566c */ jal func000159b0
/* f0afc38: 0c00566c */ jal mtx000159b0
/* f0afc3c: 27a4010c */ addiu $a0,$sp,0x10c
/* f0afc40: 0fc2d5de */ jal currentPlayerGetUnk174c
/* f0afc44: 00000000 */ nop
/* f0afc48: 00402025 */ or $a0,$v0,$zero
/* f0afc4c: 0c0056f8 */ jal func00015be0
/* f0afc4c: 0c0056f8 */ jal mtx00015be0
/* f0afc50: 27a5010c */ addiu $a1,$sp,0x10c
/* f0afc54: 4480a000 */ mtc1 $zero,$f20
/* f0afc58: 27b10198 */ addiu $s1,$sp,0x198
/* f0afc5c: 02202025 */ or $a0,$s1,$zero
/* f0afc60: e7b40140 */ swc1 $f20,0x140($sp)
/* f0afc64: e7b4013c */ swc1 $f20,0x13c($sp)
/* f0afc68: 0c00566c */ jal func000159b0
/* f0afc68: 0c00566c */ jal mtx000159b0
/* f0afc6c: e7b40144 */ swc1 $f20,0x144($sp)
/* f0afc70: 0fc2d5be */ jal currentPlayerGetMatrix1740
/* f0afc74: 00000000 */ nop
/* f0afc78: 00402025 */ or $a0,$v0,$zero
/* f0afc7c: 0c0056f8 */ jal func00015be0
/* f0afc7c: 0c0056f8 */ jal mtx00015be0
/* f0afc80: 02202825 */ or $a1,$s1,$zero
/* f0afc84: c6041bb0 */ lwc1 $f4,0x1bb0($s0)
/* f0afc88: 3c017f1b */ lui $at,%hi(var7f1acd90)
@@ -5172,13 +5171,13 @@ glabel var7f1acd90
/* f0afca4: e7b401c8 */ swc1 $f20,0x1c8($sp)
/* f0afca8: e7b401cc */ swc1 $f20,0x1cc($sp)
/* f0afcac: e7b401d0 */ swc1 $f20,0x1d0($sp)
/* f0afcb0: 0c0057e2 */ jal func00015f88
/* f0afcb0: 0c0057e2 */ jal mtx00015f88
/* f0afcb4: e7a80194 */ swc1 $f8,0x194($sp)
/* f0afcb8: 0fc59e66 */ jal gfxAllocateMatrix
/* f0afcbc: 00000000 */ nop
/* f0afcc0: 00408025 */ or $s0,$v0,$zero
/* f0afcc4: 02202025 */ or $a0,$s1,$zero
/* f0afcc8: 0c005815 */ jal func00016054
/* f0afcc8: 0c005815 */ jal mtx00016054
/* f0afccc: 00402825 */ or $a1,$v0,$zero
/* f0afcd0: 8fb101e8 */ lw $s1,0x1e8($sp)
/* f0afcd4: 3c080102 */ lui $t0,0x102
@@ -5217,7 +5216,7 @@ glabel var7f1acd90
/* f0afd54: c6060018 */ lwc1 $f6,0x18($s0)
/* f0afd58: e7aa0098 */ swc1 $f10,0x98($sp)
/* f0afd5c: e7a4009c */ swc1 $f4,0x9c($sp)
/* f0afd60: 0c0056d9 */ jal func00015b64
/* f0afd60: 0c0056d9 */ jal mtx00015b64
/* f0afd64: e7a600a0 */ swc1 $f6,0xa0($sp)
/* f0afd68: 4480e000 */ mtc1 $zero,$f28
/* f0afd6c: c7a80098 */ lwc1 $f8,0x98($sp)
@@ -5243,7 +5242,7 @@ glabel var7f1acd90
/* f0afdb4: 0c0011e4 */ jal guNormalize
/* f0afdb8: e7a600ac */ swc1 $f6,0xac($sp)
/* f0afdbc: 27a4010c */ addiu $a0,$sp,0x10c
/* f0afdc0: 0c0056c4 */ jal func00015b10
/* f0afdc0: 0c0056c4 */ jal mtx00015b10
/* f0afdc4: 02602825 */ or $a1,$s3,$zero
/* f0afdc8: c7bc018c */ lwc1 $f28,0x18c($sp)
/* f0afdcc: c6000010 */ lwc1 $f0,0x10($s0)
@@ -5569,18 +5568,18 @@ glabel var7f1acd90
// gSPClearGeometryMode(gdl++, G_CULL_BOTH);
//
// func0f0b39c0(&gdl, &var800ab5a8[3], 4, 0, 2, 1, NULL);
// func000159b0(&sp14c);
// mtx000159b0(&sp14c);
//
// func00015be0(currentPlayerGetMatrix1740(), &sp14c);
// func000159b0(&sp10c);
// func00015be0(currentPlayerGetUnk174c(), &sp10c);
// mtx00015be0(currentPlayerGetMatrix1740(), &sp14c);
// mtx000159b0(&sp10c);
// mtx00015be0(currentPlayerGetUnk174c(), &sp10c);
//
// sp10c.m[3][1] = 0;
// sp10c.m[3][0] = 0;
// sp10c.m[3][2] = 0;
//
// func000159b0(&sp198);
// func00015be0(currentPlayerGetMatrix1740(), &sp198);
// mtx000159b0(&sp198);
// mtx00015be0(currentPlayerGetMatrix1740(), &sp198);
//
// campos.x = player->cam_pos.x;
// campos.y = player->cam_pos.y;
@@ -5590,9 +5589,9 @@ glabel var7f1acd90
// sp198.m[3][1] = 0;
// sp198.m[3][2] = 0;
//
// func00015f88(0.2f, &sp198);
// mtx00015f88(0.2f, &sp198);
// mtx = gfxAllocateMatrix();
// func00016054(&sp198, mtx);
// mtx00016054(&sp198, mtx);
//
// gSPMatrix(gdl++, osVirtualToPhysical(mtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
//
@@ -5610,7 +5609,7 @@ glabel var7f1acd90
// sp98.f[1] = g_LaserSights[i].beamnear.f[1];
// sp98.f[2] = g_LaserSights[i].beamnear.f[2];
//
// func00015b64(&sp14c, &sp98);
// mtx00015b64(&sp14c, &sp98);
//
// spa8.f[0] = sp98.f[0] < 0.0f ? 1 : -1;
// spa8.f[1] = 2;
@@ -5618,7 +5617,7 @@ glabel var7f1acd90
//
// guNormalize(&spa8.x, &spa8.y, &spa8.z);
//
// func00015b10(&sp10c, &spa8);
// mtx00015b10(&sp10c, &spa8);
//
// spcc.f[0] = (g_LaserSights[i].beamnear.f[0] - campos.f[0]) * 5;
// spcc.f[1] = (g_LaserSights[i].beamnear.f[1] - campos.f[1]) * 5;
src/game/game_0b3350.c
+1 -1
View File
@@ -7,7 +7,7 @@
#include "game/texdecompress.h"
#include "game/game_173a00.h"
#include "bss.h"
#include "lib/lib_16110.h"
#include "lib/mtx.h"
#include "data.h"
#include "types.h"
src/game/game_0b4950.c
+1 -1
View File
@@ -7,7 +7,7 @@
#include "game/texdecompress.h"
#include "game/game_173a00.h"
#include "bss.h"
#include "lib/lib_16110.h"
#include "lib/mtx.h"
#include "data.h"
#include "types.h"
src/game/game_0b63b0.c
+1 -2
View File
@@ -55,8 +55,7 @@
#include "lib/snd.h"
#include "lib/memory.h"
#include "lib/rng.h"
#include "lib/lib_159b0.h"
#include "lib/lib_16110.h"
#include "lib/mtx.h"
#include "lib/lib_233c0.h"
#include "lib/lib_317f0.h"
#include "data.h"
src/game/game_0b69d0.c
+48 -49
View File
@@ -60,8 +60,7 @@
#include "lib/memory.h"
#include "lib/model.h"
#include "lib/rng.h"
#include "lib/lib_159b0.h"
#include "lib/lib_16110.h"
#include "lib/mtx.h"
#include "lib/lib_233c0.h"
#include "lib/lib_317f0.h"
#include "data.h"
@@ -1375,8 +1374,8 @@ void currentPlayerSpawn(void)
s32 prevplayernum = g_Vars.currentplayernum;
setCurrentPlayerNum(g_Vars.bondplayernum);
bgun0f0a0c08(&sp84, &sp9c);
func00015b14(currentPlayerGetUnk174c(), &sp9c, &sp90);
func00015b68(currentPlayerGetUnk174c(), &sp84, &sp78);
mtx00015b14(currentPlayerGetUnk174c(), &sp9c, &sp90);
mtx00015b68(currentPlayerGetUnk174c(), &sp84, &sp78);
setCurrentPlayerNum(prevplayernum);
}
@@ -3519,7 +3518,7 @@ void func0f0ba190(u32 arg0)
sp7f = func00023ab0(g_CutsceneAnimNum, lastframe);
func00023d0c();
func00024050(0, 0, &g_ModelType20, g_CutsceneAnimNum, sp7f, &sp94, &sp88, &sp7c);
func0001648c(&sp94, &sp38);
mtx0001648c(&sp94, &sp38);
theta = atan2f(-sp38.m[2][0], -sp38.m[2][2]);
theta = (M_BADTAU - theta) * 57.304901123047f;
@@ -3615,7 +3614,7 @@ void func0f0ba29c(bool arg0)
pos.y = sp16c.y * sp118;
pos.z = sp16c.z * sp118;
func0001648c(&sp178, &sp11c);
mtx0001648c(&sp178, &sp11c);
up.x = sp11c.m[1][0];
up.y = sp11c.m[1][1];
@@ -3641,8 +3640,8 @@ void func0f0ba29c(bool arg0)
pos.y += sp104 * (g_Vars.bond->bond2.unk10.y - pos.y);
pos.z += sp104 * (g_Vars.bond->bond2.unk10.z - pos.z);
func00016d58(&spc4, 0, 0, 0, -look.x, -look.y, -look.z, up.x, up.y, up.z);
func00016d58(&sp84, 0, 0, 0,
mtx00016d58(&spc4, 0, 0, 0, -look.x, -look.y, -look.z, up.x, up.y, up.z);
mtx00016d58(&sp84, 0, 0, 0,
-g_Vars.bond->bond2.unk1c.x, -g_Vars.bond->bond2.unk1c.y, -g_Vars.bond->bond2.unk1c.z,
g_Vars.bond->bond2.unk28.x, g_Vars.bond->bond2.unk28.y, g_Vars.bond->bond2.unk28.z);
func0f097044(&spc4, &sp74);
@@ -4336,8 +4335,8 @@ Gfx *hudRenderHealthBar(Gfx *gdl)
Mtxf matrix;
Mtxf *addr = gfxAllocateMatrix();
func00016ae4(&matrix, 0, 370, 0, 0, 0, 0, 0, 0, -1);
func00016054(&matrix, addr);
mtx00016ae4(&matrix, 0, 370, 0, 0, 0, 0, 0, 0, -1);
mtx00016054(&matrix, addr);
gSPMatrix(gdl++, osVirtualToPhysical((void *)addr), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gDPPipeSync(gdl++);
@@ -5930,10 +5929,10 @@ glabel var7f1ad6ac
/* f0be9b0: 00000000 */ nop
/* f0be9b4: ae0000c8 */ sw $zero,0xc8($s0)
.PF0f0be9b8:
/* f0be9b8: 0c0057e6 */ jal func00016208
/* f0be9b8: 0c0057e6 */ jal mtx00016208
/* f0be9bc: 27a502f0 */ addiu $a1,$sp,0x2f0
/* f0be9c0: 27a402b8 */ addiu $a0,$sp,0x2b8
/* f0be9c4: 0c0057e6 */ jal func00016208
/* f0be9c4: 0c0057e6 */ jal mtx00016208
/* f0be9c8: 27a502e4 */ addiu $a1,$sp,0x2e4
/* f0be9cc: 8e2f0040 */ lw $t7,0x40($s1)
/* f0be9d0: 31ee0080 */ andi $t6,$t7,0x80
@@ -6240,7 +6239,7 @@ glabel var7f1ad6ac
/* f0bee2c: 0fc25b7d */ jal func0f096ed4
/* f0bee30: 02a02025 */ move $a0,$s5
/* f0bee34: 02002025 */ move $a0,$s0
/* f0bee38: 0c005628 */ jal func00015b10
/* f0bee38: 0c005628 */ jal mtx00015b10
/* f0bee3c: 26850004 */ addiu $a1,$s4,0x4
/* f0bee40: 8e8b0000 */ lw $t3,0x0($s4)
/* f0bee44: 44808000 */ mtc1 $zero,$f16
@@ -6328,7 +6327,7 @@ glabel var7f1ad6ac
/* f0bef70: 46023482 */ mul.s $f18,$f6,$f2
/* f0bef74: 460e9203 */ div.s $f8,$f18,$f14
/* f0bef78: e6840008 */ swc1 $f4,0x8($s4)
/* f0bef7c: 0c0056b9 */ jal func00015d54
/* f0bef7c: 0c0056b9 */ jal mtx00015d54
/* f0bef80: e688000c */ swc1 $f8,0xc($s4)
/* f0bef84: 27b2012c */ addiu $s2,$sp,0x12c
/* f0bef88: 02402825 */ move $a1,$s2
@@ -6344,7 +6343,7 @@ glabel var7f1ad6ac
/* f0befb0: 0fc25b7d */ jal func0f096ed4
/* f0befb4: 02002025 */ move $a0,$s0
/* f0befb8: 02402025 */ move $a0,$s2
/* f0befbc: 0c0056cc */ jal func00015da0
/* f0befbc: 0c0056cc */ jal mtx00015da0
/* f0befc0: 27a502b8 */ addiu $a1,$sp,0x2b8
/* f0befc4: c7a002a8 */ lwc1 $f0,0x2a8($sp)
/* f0befc8: c7aa02b8 */ lwc1 $f10,0x2b8($sp)
@@ -8331,10 +8330,10 @@ glabel var7f1ad6ac
/* f0be444: 00000000 */ nop
/* f0be448: ae0000c8 */ sw $zero,0xc8($s0)
.L0f0be44c:
/* f0be44c: 0c005882 */ jal func00016208
/* f0be44c: 0c005882 */ jal mtx00016208
/* f0be450: 27a502f0 */ addiu $a1,$sp,0x2f0
/* f0be454: 27a402b8 */ addiu $a0,$sp,0x2b8
/* f0be458: 0c005882 */ jal func00016208
/* f0be458: 0c005882 */ jal mtx00016208
/* f0be45c: 27a502e4 */ addiu $a1,$sp,0x2e4
/* f0be460: 8e380040 */ lw $t8,0x40($s1)
/* f0be464: 330f0080 */ andi $t7,$t8,0x80
@@ -8641,7 +8640,7 @@ glabel var7f1ad6ac
/* f0be8c0: 0fc25bb5 */ jal func0f096ed4
/* f0be8c4: 02a02025 */ or $a0,$s5,$zero
/* f0be8c8: 02002025 */ or $a0,$s0,$zero
/* f0be8cc: 0c0056c4 */ jal func00015b10
/* f0be8cc: 0c0056c4 */ jal mtx00015b10
/* f0be8d0: 26850004 */ addiu $a1,$s4,0x4
/* f0be8d4: 8e8c0000 */ lw $t4,0x0($s4)
/* f0be8d8: 44808000 */ mtc1 $zero,$f16
@@ -8729,7 +8728,7 @@ glabel var7f1ad6ac
/* f0bea04: 46023482 */ mul.s $f18,$f6,$f2
/* f0bea08: 460e9203 */ div.s $f8,$f18,$f14
/* f0bea0c: e6840008 */ swc1 $f4,0x8($s4)
/* f0bea10: 0c005755 */ jal func00015d54
/* f0bea10: 0c005755 */ jal mtx00015d54
/* f0bea14: e688000c */ swc1 $f8,0xc($s4)
/* f0bea18: 27b2012c */ addiu $s2,$sp,0x12c
/* f0bea1c: 02402825 */ or $a1,$s2,$zero
@@ -8745,7 +8744,7 @@ glabel var7f1ad6ac
/* f0bea44: 0fc25bb5 */ jal func0f096ed4
/* f0bea48: 02002025 */ or $a0,$s0,$zero
/* f0bea4c: 02402025 */ or $a0,$s2,$zero
/* f0bea50: 0c005768 */ jal func00015da0
/* f0bea50: 0c005768 */ jal mtx00015da0
/* f0bea54: 27a502b8 */ addiu $a1,$sp,0x2b8
/* f0bea58: c7a002a8 */ lwc1 $f0,0x2a8($sp)
/* f0bea5c: c7aa02b8 */ lwc1 $f10,0x2b8($sp)
@@ -10690,10 +10689,10 @@ glabel var7f1ad6ac
/* f0bc018: 00000000 */ sll $zero,$zero,0x0
/* f0bc01c: ad0000c8 */ sw $zero,0xc8($t0)
.NB0f0bc020:
/* f0bc020: 0c005c3e */ jal func00016208
/* f0bc020: 0c005c3e */ jal mtx00016208
/* f0bc024: 27a502f4 */ addiu $a1,$sp,0x2f4
/* f0bc028: 27a402bc */ addiu $a0,$sp,0x2bc
/* f0bc02c: 0c005c3e */ jal func00016208
/* f0bc02c: 0c005c3e */ jal mtx00016208
/* f0bc030: 27a502e8 */ addiu $a1,$sp,0x2e8
/* f0bc034: 8e2e0040 */ lw $t6,0x40($s1)
/* f0bc038: 31d80080 */ andi $t8,$t6,0x80
@@ -11000,7 +10999,7 @@ glabel var7f1ad6ac
/* f0bc494: 0fc25399 */ jal func0f096ed4
/* f0bc498: 02a02025 */ or $a0,$s5,$zero
/* f0bc49c: 02002025 */ or $a0,$s0,$zero
/* f0bc4a0: 0c005a80 */ jal func00015b10
/* f0bc4a0: 0c005a80 */ jal mtx00015b10
/* f0bc4a4: 26850004 */ addiu $a1,$s4,0x4
/* f0bc4a8: 8e8f0000 */ lw $t7,0x0($s4)
/* f0bc4ac: 44808000 */ mtc1 $zero,$f16
@@ -11088,7 +11087,7 @@ glabel var7f1ad6ac
/* f0bc5d8: 46023482 */ mul.s $f18,$f6,$f2
/* f0bc5dc: 460e9203 */ div.s $f8,$f18,$f14
/* f0bc5e0: e6840008 */ swc1 $f4,0x8($s4)
/* f0bc5e4: 0c005b11 */ jal func00015d54
/* f0bc5e4: 0c005b11 */ jal mtx00015d54
/* f0bc5e8: e688000c */ swc1 $f8,0xc($s4)
/* f0bc5ec: 27b20130 */ addiu $s2,$sp,0x130
/* f0bc5f0: 02402825 */ or $a1,$s2,$zero
@@ -11104,7 +11103,7 @@ glabel var7f1ad6ac
/* f0bc618: 0fc25399 */ jal func0f096ed4
/* f0bc61c: 02002025 */ or $a0,$s0,$zero
/* f0bc620: 02402025 */ or $a0,$s2,$zero
/* f0bc624: 0c005b24 */ jal func00015da0
/* f0bc624: 0c005b24 */ jal mtx00015da0
/* f0bc628: 27a502bc */ addiu $a1,$sp,0x2bc
/* f0bc62c: c7a002ac */ lwc1 $f0,0x2ac($sp)
/* f0bc630: c7aa02bc */ lwc1 $f10,0x2bc($sp)
@@ -12570,8 +12569,8 @@ glabel var7f1ad6ac
// }
//
// // e44c
// func00016208(sp696, &sp752);
// func00016208(sp696, &sp740);
// mtx00016208(sp696, &sp752);
// mtx00016208(sp696, &sp740);
//
// if (rocket->base.hidden & OBJHFLAG_AIRBORNE) {
// // e470
@@ -12711,7 +12710,7 @@ glabel var7f1ad6ac
// // e8b0
// func0f097738(sp348, sp332, sp316);
// func0f096ed4(sp316, sp508);
// func00015b10(sp508, &projectile->unk04);
// mtx00015b10(sp508, &projectile->unk04);
//
// projectile->unkb2 = 0xffff;
// projectile->flags |= PROJECTILEFLAG_00004000;
@@ -12759,11 +12758,11 @@ glabel var7f1ad6ac
// projectile->unk04.z = (projectile->unk04.z * newspeed) / prevspeed;
//
// // ea10
// func00015d54(sp696, sp444);
// mtx00015d54(sp696, sp444);
// func0f097044(sp444, sp300);
// func0f097738(sp316, sp300, sp284);
// func0f096ed4(sp284, sp380);
// func00015da0(sp380, sp696);
// mtx00015da0(sp380, sp696);
//
// rocket->base.realrot[0] = sp696[0] * sp680;
// rocket->base.realrot[1] = sp696[1] * sp680;
@@ -13569,7 +13568,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(currentPlayerGetMatrix1740(), &g_Vars.currentplayer->globaldrawcameraoffset);
mtx00015b10(currentPlayerGetMatrix1740(), &g_Vars.currentplayer->globaldrawcameraoffset);
}
GLOBAL_ASM(
@@ -13647,7 +13646,7 @@ glabel func0f0bfc7c
/* f0bfd94: c6260004 */ lwc1 $f6,0x4($s1)
/* f0bfd98: e7a60020 */ swc1 $f6,0x20($sp)
/* f0bfd9c: c6240008 */ lwc1 $f4,0x8($s1)
/* f0bfda0: 0c005a1d */ jal func00016874
/* f0bfda0: 0c005a1d */ jal mtx00016874
/* f0bfda4: e7a40024 */ swc1 $f4,0x24($sp)
/* f0bfda8: c7a8007c */ lwc1 $f8,0x7c($sp)
/* f0bfdac: c7b00080 */ lwc1 $f16,0x80($sp)
@@ -13685,7 +13684,7 @@ glabel func0f0bfc7c
/* f0bfe2c: c6240004 */ lwc1 $f4,0x4($s1)
/* f0bfe30: e7a40020 */ swc1 $f4,0x20($sp)
/* f0bfe34: c6280008 */ lwc1 $f8,0x8($s1)
/* f0bfe38: 0c005a1d */ jal func00016874
/* f0bfe38: 0c005a1d */ jal mtx00016874
/* f0bfe3c: e7a80024 */ swc1 $f8,0x24($sp)
/* f0bfe40: 8fac0110 */ lw $t4,0x110($sp)
/* f0bfe44: 8e4b0284 */ lw $t3,0x284($s2)
@@ -13704,7 +13703,7 @@ glabel func0f0bfc7c
/* f0bfe78: c6240004 */ lwc1 $f4,0x4($s1)
/* f0bfe7c: e7a40020 */ swc1 $f4,0x20($sp)
/* f0bfe80: c6280008 */ lwc1 $f8,0x8($s1)
/* f0bfe84: 0c005ad6 */ jal func00016b58
/* f0bfe84: 0c005ad6 */ jal mtx00016b58
/* f0bfe88: e7a80024 */ swc1 $f8,0x24($sp)
/* f0bfe8c: 0fc59e66 */ jal gfxAllocateMatrix
/* f0bfe90: 00000000 */ nop
@@ -13714,7 +13713,7 @@ glabel func0f0bfc7c
/* f0bfea0: 00408025 */ or $s0,$v0,$zero
/* f0bfea4: 00402025 */ or $a0,$v0,$zero
/* f0bfea8: 27a5008c */ addiu $a1,$sp,0x8c
/* f0bfeac: 0c005680 */ jal func00015a00
/* f0bfeac: 0c005680 */ jal mtx00015a00
/* f0bfeb0: 02003025 */ or $a2,$s0,$zero
/* f0bfeb4: 3c01c6fa */ lui $at,0xc6fa
/* f0bfeb8: 44816000 */ mtc1 $at,$f12
@@ -13756,7 +13755,7 @@ glabel func0f0bfc7c
/* f0bff38: 0fc2d3fe */ jal currentPlayerSetUnk1758
/* f0bff3c: 02202025 */ or $a0,$s1,$zero
/* f0bff40: c7ac0070 */ lwc1 $f12,0x70($sp)
/* f0bff44: 0c0057c1 */ jal func00015f04
/* f0bff44: 0c0057c1 */ jal mtx00015f04
/* f0bff48: 27a5008c */ addiu $a1,$sp,0x8c
/* f0bff4c: 8e4d0284 */ lw $t5,0x284($s2)
/* f0bff50: 27a4008c */ addiu $a0,$sp,0x8c
@@ -13764,7 +13763,7 @@ glabel func0f0bfc7c
/* f0bff58: 8da5005c */ lw $a1,0x5c($t5)
/* f0bff5c: 8e430284 */ lw $v1,0x284($s2)
/* f0bff60: 8c64005c */ lw $a0,0x5c($v1)
/* f0bff64: 0c005a08 */ jal func00016820
/* f0bff64: 0c005a08 */ jal mtx00016820
/* f0bff68: 8c650060 */ lw $a1,0x60($v1)
/* f0bff6c: 8e4e0284 */ lw $t6,0x284($s2)
/* f0bff70: 0fc2d3e6 */ jal currentPlayerSetUnk173c
@@ -13792,7 +13791,7 @@ glabel func0f0bfc7c
/* f0bffc8: 27bd0110 */ addiu $sp,$sp,0x110
);
// Mismatch near first call to func00016874:
// Mismatch near first call to mtx00016874:
// - Goal seems to have less float registers available which causes it to
// reload cam_look properties for the function call
// - Because it has to reload, it then stores cam_look in a callee-save register
@@ -13827,7 +13826,7 @@ glabel func0f0bfc7c
// sp80.y = (cam_pos->y - g_Vars.currentplayer->globaldrawworldoffset.y) * scale + cam_look->y;
// sp80.z = (cam_pos->z - g_Vars.currentplayer->globaldrawworldoffset.z) * scale + cam_look->z;
//
// func00016874(&sp8c,
// mtx00016874(&sp8c,
// sp74.x, sp74.y, sp74.z,
// cam_look->x, cam_look->y, cam_look->z,
// cam_up->x, cam_up->y, cam_up->z);
@@ -13837,19 +13836,19 @@ glabel func0f0bfc7c
// sp80.x, sp80.y, sp80.z,
// cam_up->x, cam_up->y, cam_up->z);
//
// func00016874(g_Vars.currentplayer->matrix64,
// mtx00016874(g_Vars.currentplayer->matrix64,
// cam_pos->x, cam_pos->y, cam_pos->z,
// cam_look->x, cam_look->y, cam_look->z,
// cam_up->x, cam_up->y, cam_up->z);
//
// func00016b58(g_Vars.currentplayer->matrix68,
// mtx00016b58(g_Vars.currentplayer->matrix68,
// cam_pos->x, cam_pos->y, cam_pos->z,
// cam_look->x, cam_look->y, cam_look->z,
// cam_up->x, cam_up->y, cam_up->z);
//
// s1 = gfxAllocateMatrix();
// s0 = gfxAllocateMatrix();
// func00015a00(currentPlayerGetUnk1754(), &sp8c, s0);
// mtx00015a00(currentPlayerGetUnk1754(), &sp8c, s0);
//
// for (i = 0; i < 4; i++) {
// for (j = 0; j < 4; j++) {
@@ -13864,9 +13863,9 @@ glabel func0f0bfc7c
// currentPlayerSetUnk006c(s0);
// guMtxF2L(s0, s1);
// currentPlayerSetUnk1758(s1);
// func00015f04(scale, &sp8c);
// mtx00015f04(scale, &sp8c);
// guMtxF2L(&sp8c, g_Vars.currentplayer->matrix5c);
// func00016820(g_Vars.currentplayer->matrix5c, g_Vars.currentplayer->matrix60);
// mtx00016820(g_Vars.currentplayer->matrix5c, g_Vars.currentplayer->matrix60);
// currentPlayerSetUnk173c(g_Vars.currentplayer->matrix5c);
// currentPlayerSetUnk1738(g_Vars.currentplayer->matrix60);
// currentPlayerSetMatrix1740(g_Vars.currentplayer->matrix64);
@@ -14891,7 +14890,7 @@ s32 playerTick(struct prop *prop)
spe8 = player->model00d4->matrices;
}
func00015be4(currentPlayerGetUnk174c(), spe8, &spa8);
mtx00015be4(currentPlayerGetUnk174c(), spe8, &spa8);
sp9c.x = spa8.m[3][0] + spa8.m[1][0] * 7;
sp9c.y = spa8.m[3][1] + spa8.m[1][1] * 7;
@@ -15690,7 +15689,7 @@ glabel func0f0c3320
/* f0c3364: 00000000 */ nop
/* f0c3368: 00402025 */ or $a0,$v0,$zero
/* f0c336c: 02002825 */ or $a1,$s0,$zero
/* f0c3370: 0c0056f9 */ jal func00015be4
/* f0c3370: 0c0056f9 */ jal mtx00015be4
/* f0c3374: 02403025 */ or $a2,$s2,$zero
/* f0c3378: 8e620284 */ lw $v0,0x284($s3)
/* f0c337c: c7a40070 */ lwc1 $f4,0x70($sp)
@@ -15707,7 +15706,7 @@ glabel func0f0c3320
/* f0c33a8: e7b20074 */ swc1 $f18,0x74($sp)
/* f0c33ac: c4460040 */ lwc1 $f6,0x40($v0)
/* f0c33b0: 46062201 */ sub.s $f8,$f4,$f6
/* f0c33b4: 0c005815 */ jal func00016054
/* f0c33b4: 0c005815 */ jal mtx00016054
/* f0c33b8: e7a80078 */ swc1 $f8,0x78($sp)
/* f0c33bc: 26310001 */ addiu $s1,$s1,0x1
/* f0c33c0: 1634ffe7 */ bne $s1,$s4,.L0f0c3360
@@ -15734,12 +15733,12 @@ glabel func0f0c3320
// s32 i;
//
// for (i = 0; i < count; i++) {
// func00015be4(currentPlayerGetUnk174c(), &matrices[i], &sp40);
// mtx00015be4(currentPlayerGetUnk174c(), &matrices[i], &sp40);
//
// sp40.m[3][0] -= g_Vars.currentplayer->globaldrawworldoffset.x;
// sp40.m[3][1] -= g_Vars.currentplayer->globaldrawworldoffset.y;
// sp40.m[3][2] -= g_Vars.currentplayer->globaldrawworldoffset.z;
//
// func00016054(&sp40, &matrices[i]);
// mtx00016054(&sp40, &matrices[i]);
// }
//}
src/game/game_0e0770.c
+6 -7
View File
@@ -12,8 +12,7 @@
#include "lib/lib_09a80.h"
#include "lib/main.h"
#include "lib/rng.h"
#include "lib/lib_159b0.h"
#include "lib/lib_16110.h"
#include "lib/mtx.h"
#include "data.h"
#include "types.h"
@@ -986,7 +985,7 @@ glabel func0f0e0cbc
/* f0e0d4c: a6180004 */ sh $t8,0x4($s0)
/* f0e0d50: a2000007 */ sb $zero,0x7($s0)
/* f0e0d54: 8fa40044 */ lw $a0,0x44($sp)
/* f0e0d58: 0c0056d9 */ jal func00015b64
/* f0e0d58: 0c0056d9 */ jal mtx00015b64
/* f0e0d5c: 27a50024 */ addiu $a1,$sp,0x24
/* f0e0d60: 3c014200 */ lui $at,0x4200
/* f0e0d64: 44810000 */ mtc1 $at,$f0
@@ -5987,13 +5986,13 @@ glabel func0f0e5000
/* f0e5698: 3c0c0008 */ lui $t4,0x8
/* f0e569c: 02002025 */ or $a0,$s0,$zero
/* f0e56a0: ad2c0004 */ sw $t4,0x4($t1)
/* f0e56a4: 0c00566c */ jal func000159b0
/* f0e56a4: 0c00566c */ jal mtx000159b0
/* f0e56a8: ad2b0000 */ sw $t3,0x0($t1)
/* f0e56ac: 0fc59e66 */ jal gfxAllocateMatrix
/* f0e56b0: 00000000 */ nop
/* f0e56b4: 00409025 */ or $s2,$v0,$zero
/* f0e56b8: 02002025 */ or $a0,$s0,$zero
/* f0e56bc: 0c005815 */ jal func00016054
/* f0e56bc: 0c005815 */ jal mtx00016054
/* f0e56c0: 00402825 */ or $a1,$v0,$zero
/* f0e56c4: 8fb00150 */ lw $s0,0x150($sp)
/* f0e56c8: 3c0f0102 */ lui $t7,0x102
@@ -6854,13 +6853,13 @@ glabel func0f0e5000
/* f0e5698: 3c0c0008 */ lui $t4,0x8
/* f0e569c: 02002025 */ or $a0,$s0,$zero
/* f0e56a0: ad2c0004 */ sw $t4,0x4($t1)
/* f0e56a4: 0c00566c */ jal func000159b0
/* f0e56a4: 0c00566c */ jal mtx000159b0
/* f0e56a8: ad2b0000 */ sw $t3,0x0($t1)
/* f0e56ac: 0fc59e66 */ jal gfxAllocateMatrix
/* f0e56b0: 00000000 */ nop
/* f0e56b4: 00409025 */ or $s2,$v0,$zero
/* f0e56b8: 02002025 */ or $a0,$s0,$zero
/* f0e56bc: 0c005815 */ jal func00016054
/* f0e56bc: 0c005815 */ jal mtx00016054
/* f0e56c0: 00402825 */ or $a1,$v0,$zero
/* f0e56c4: 8fb00150 */ lw $s0,0x150($sp)
/* f0e56c8: 3c0f0102 */ lui $t7,0x102
src/game/game_0f09f0.c
+74 -75
View File
@@ -37,8 +37,7 @@
#include "lib/snd.h"
#include "lib/memory.h"
#include "lib/rng.h"
#include "lib/lib_159b0.h"
#include "lib/lib_16110.h"
#include "lib/mtx.h"
#include "lib/lib_317f0.h"
#include "data.h"
#include "types.h"
@@ -5656,7 +5655,7 @@ glabel var7f1b3c40pf
/* f0f46b4: 46065403 */ div.s $f16,$f10,$f6
/* f0f46b8: e7b002f8 */ swc1 $f16,0x2f8($sp)
.PF0f0f46bc:
/* f0f46bc: 0c0055d0 */ jal func000159b0
/* f0f46bc: 0c0055d0 */ jal mtx000159b0
/* f0f46c0: 27a40350 */ addiu $a0,$sp,0x350
/* f0f46c4: 8fad0448 */ lw $t5,0x448($sp)
/* f0f46c8: 24010001 */ li $at,0x1
@@ -5790,7 +5789,7 @@ glabel var7f1b3c40pf
/* f0f48a8: e6000528 */ swc1 $f0,0x528($s0)
/* f0f48ac: e7a20398 */ swc1 $f2,0x398($sp)
/* f0f48b0: e7ac039c */ swc1 $f12,0x39c($sp)
/* f0f48b4: 0c005887 */ jal func0001648c
/* f0f48b4: 0c005887 */ jal mtx0001648c
/* f0f48b8: e7a003a0 */ swc1 $f0,0x3a0($sp)
/* f0f48bc: 100000b4 */ b .PF0f0f4b90
/* f0f48c0: 3c01c2c8 */ lui $at,0xc2c8
@@ -5948,7 +5947,7 @@ glabel var7f1b3c40pf
/* f0f4b04: e6000528 */ swc1 $f0,0x528($s0)
/* f0f4b08: e7a20398 */ swc1 $f2,0x398($sp)
/* f0f4b0c: e7ac039c */ swc1 $f12,0x39c($sp)
/* f0f4b10: 0c005887 */ jal func0001648c
/* f0f4b10: 0c005887 */ jal mtx0001648c
/* f0f4b14: e7a003a0 */ swc1 $f0,0x3a0($sp)
/* f0f4b18: 8e0205b0 */ lw $v0,0x5b0($s0)
/* f0f4b1c: 00025300 */ sll $t2,$v0,0xc
@@ -5978,7 +5977,7 @@ glabel var7f1b3c40pf
/* f0f4b78: e6000528 */ swc1 $f0,0x528($s0)
/* f0f4b7c: e7a20398 */ swc1 $f2,0x398($sp)
/* f0f4b80: e7ac039c */ swc1 $f12,0x39c($sp)
/* f0f4b84: 0c005887 */ jal func0001648c
/* f0f4b84: 0c005887 */ jal mtx0001648c
/* f0f4b88: e7a003a0 */ swc1 $f0,0x3a0($sp)
/* f0f4b8c: 3c01c2c8 */ lui $at,0xc2c8
.PF0f0f4b90:
@@ -6050,7 +6049,7 @@ glabel var7f1b3c40pf
/* f0f4c88: 27a50398 */ addiu $a1,$sp,0x398
/* f0f4c8c: 0fc2d457 */ jal func0f0b4c3c
/* f0f4c90: 3c063f80 */ lui $a2,0x3f80
/* f0f4c94: 0c0055d0 */ jal func000159b0
/* f0f4c94: 0c0055d0 */ jal mtx000159b0
/* f0f4c98: 27a40310 */ addiu $a0,$sp,0x310
/* f0f4c9c: 8e0205b4 */ lw $v0,0x5b4($s0)
/* f0f4ca0: 5040001d */ beqzl $v0,.PF0f0f4d18
@@ -6112,7 +6111,7 @@ glabel var7f1b3c40pf
/* f0f4d70: e7aa039c */ swc1 $f10,0x39c($sp)
/* f0f4d74: e7a203a0 */ swc1 $f2,0x3a0($sp)
.PF0f0f4d78:
/* f0f4d78: 0c00591b */ jal func000166dc
/* f0f4d78: 0c00591b */ jal mtx000166dc
/* f0f4d7c: 27a50310 */ addiu $a1,$sp,0x310
/* f0f4d80: 8fac0308 */ lw $t4,0x308($sp)
/* f0f4d84: 5180000a */ beqzl $t4,.PF0f0f4db0
@@ -6121,19 +6120,19 @@ glabel var7f1b3c40pf
/* f0f4d90: c7a802f8 */ lwc1 $f8,0x2f8($sp)
/* f0f4d94: 27a50310 */ addiu $a1,$sp,0x310
/* f0f4d98: 46082302 */ mul.s $f12,$f4,$f8
/* f0f4d9c: 0c005725 */ jal func00015f04
/* f0f4d9c: 0c005725 */ jal mtx00015f04
/* f0f4da0: 00000000 */ nop
/* f0f4da4: 10000005 */ b .PF0f0f4dbc
/* f0f4da8: 8faf0308 */ lw $t7,0x308($sp)
/* f0f4dac: c7ac0424 */ lwc1 $f12,0x424($sp)
.PF0f0f4db0:
/* f0f4db0: 0c005725 */ jal func00015f04
/* f0f4db0: 0c005725 */ jal mtx00015f04
/* f0f4db4: 27a50310 */ addiu $a1,$sp,0x310
/* f0f4db8: 8faf0308 */ lw $t7,0x308($sp)
.PF0f0f4dbc:
/* f0f4dbc: 11e00005 */ beqz $t7,.PF0f0f4dd4
/* f0f4dc0: 27a402fc */ addiu $a0,$sp,0x2fc
/* f0f4dc4: 0c00591b */ jal func000166dc
/* f0f4dc4: 0c00591b */ jal mtx000166dc
/* f0f4dc8: 27a50204 */ addiu $a1,$sp,0x204
/* f0f4dcc: 1000000b */ b .PF0f0f4dfc
/* f0f4dd0: 27b10244 */ addiu $s1,$sp,0x244
@@ -6145,13 +6144,13 @@ glabel var7f1b3c40pf
/* f0f4de4: c6100530 */ lwc1 $f16,0x530($s0)
/* f0f4de8: e7b0039c */ swc1 $f16,0x39c($sp)
/* f0f4dec: c6060534 */ lwc1 $f6,0x534($s0)
/* f0f4df0: 0c00591b */ jal func000166dc
/* f0f4df0: 0c00591b */ jal mtx000166dc
/* f0f4df4: e7a603a0 */ swc1 $f6,0x3a0($sp)
/* f0f4df8: 27b10244 */ addiu $s1,$sp,0x244
.PF0f0f4dfc:
/* f0f4dfc: 02203025 */ move $a2,$s1
/* f0f4e00: 27a40310 */ addiu $a0,$sp,0x310
/* f0f4e04: 0c0055e4 */ jal func00015a00
/* f0f4e04: 0c0055e4 */ jal mtx00015a00
/* f0f4e08: 27a50350 */ addiu $a1,$sp,0x350
/* f0f4e0c: 8fb90448 */ lw $t9,0x448($sp)
/* f0f4e10: 24010003 */ li $at,0x3
@@ -6161,12 +6160,12 @@ glabel var7f1b3c40pf
/* f0f4e20: 27a401c4 */ addiu $a0,$sp,0x1c4
/* f0f4e24: 27a401c4 */ addiu $a0,$sp,0x1c4
/* f0f4e28: 02202825 */ move $a1,$s1
/* f0f4e2c: 0c0055e4 */ jal func00015a00
/* f0f4e2c: 0c0055e4 */ jal mtx00015a00
/* f0f4e30: 27a60184 */ addiu $a2,$sp,0x184
/* f0f4e34: 26060014 */ addiu $a2,$s0,0x14
/* f0f4e38: afa60040 */ sw $a2,0x40($sp)
/* f0f4e3c: 27a40184 */ addiu $a0,$sp,0x184
/* f0f4e40: 0c0055e4 */ jal func00015a00
/* f0f4e40: 0c0055e4 */ jal mtx00015a00
/* f0f4e44: 27a50204 */ addiu $a1,$sp,0x204
/* f0f4e48: 10000006 */ b .PF0f0f4e64
/* f0f4e4c: 00000000 */ nop
@@ -6174,7 +6173,7 @@ glabel var7f1b3c40pf
.PF0f0f4e54:
/* f0f4e54: afa60040 */ sw $a2,0x40($sp)
/* f0f4e58: 02202025 */ move $a0,$s1
/* f0f4e5c: 0c0055e4 */ jal func00015a00
/* f0f4e5c: 0c0055e4 */ jal mtx00015a00
/* f0f4e60: 27a50204 */ addiu $a1,$sp,0x204
.PF0f0f4e64:
/* f0f4e64: 0fc38a89 */ jal func0f0e2348
@@ -6312,7 +6311,7 @@ glabel var7f1b3c40pf
/* f0f5060: 8faf03b4 */ lw $t7,0x3b4($sp)
.PF0f0f5064:
/* f0f5064: 00116180 */ sll $t4,$s1,0x6
/* f0f5068: 0c0055d0 */ jal func000159b0
/* f0f5068: 0c0055d0 */ jal mtx000159b0
/* f0f506c: 018f2021 */ addu $a0,$t4,$t7
/* f0f5070: 8e190054 */ lw $t9,0x54($s0)
/* f0f5074: 26310001 */ addiu $s1,$s1,0x1
@@ -6409,7 +6408,7 @@ glabel var7f1b3c40pf
.PF0f0f51c4:
/* f0f51c4: 8fa40040 */ lw $a0,0x40($sp)
.PF0f0f51c8:
/* f0f51c8: 0c0056aa */ jal func00015d18
/* f0f51c8: 0c0056aa */ jal mtx00015d18
/* f0f51cc: 8fa503b4 */ lw $a1,0x3b4($sp)
/* f0f51d0: 8faa0040 */ lw $t2,0x40($sp)
/* f0f51d4: 27a403b8 */ addiu $a0,$sp,0x3b8
@@ -6488,14 +6487,14 @@ glabel var7f1b3c40pf
/* f0f52e8: 0c0068ad */ jal func0001a524
/* f0f52ec: 00002825 */ move $a1,$zero
/* f0f52f0: afa20160 */ sw $v0,0x160($sp)
/* f0f52f4: 0c0055d0 */ jal func000159b0
/* f0f52f4: 0c0055d0 */ jal mtx000159b0
/* f0f52f8: 27a40120 */ addiu $a0,$sp,0x120
/* f0f52fc: 3c014080 */ lui $at,0x4080
/* f0f5300: 44816000 */ mtc1 $at,$f12
/* f0f5304: 0fc01ad1 */ jal func0f006b54
/* f0f5308: 00000000 */ nop
/* f0f530c: 46000306 */ mov.s $f12,$f0
/* f0f5310: 0c00581e */ jal func000162e8
/* f0f5310: 0c00581e */ jal mtx000162e8
/* f0f5314: 27a50120 */ addiu $a1,$sp,0x120
/* f0f5318: 8fac0160 */ lw $t4,0x160($sp)
/* f0f531c: 8fab03b4 */ lw $t3,0x3b4($sp)
@@ -6504,10 +6503,10 @@ glabel var7f1b3c40pf
/* f0f5328: 016f3821 */ addu $a3,$t3,$t7
/* f0f532c: 00e02025 */ move $a0,$a3
/* f0f5330: afa70040 */ sw $a3,0x40($sp)
/* f0f5334: 0c0055e4 */ jal func00015a00
/* f0f5334: 0c0055e4 */ jal mtx00015a00
/* f0f5338: 27a600e0 */ addiu $a2,$sp,0xe0
/* f0f533c: 8fa50040 */ lw $a1,0x40($sp)
/* f0f5340: 0c0056aa */ jal func00015d18
/* f0f5340: 0c0056aa */ jal mtx00015d18
/* f0f5344: 27a400e0 */ addiu $a0,$sp,0xe0
.PF0f0f5348:
/* f0f5348: 8e040054 */ lw $a0,0x54($s0)
@@ -6653,7 +6652,7 @@ glabel var7f1b3c40pf
/* f0f555c: 0c0085fe */ jal modelRender
/* f0f5560: afa903c4 */ sw $t1,0x3c4($sp)
/* f0f5564: 8fb803c4 */ lw $t8,0x3c4($sp)
/* f0f5568: 0c00593c */ jal func00016760
/* f0f5568: 0c00593c */ jal mtx00016760
/* f0f556c: afb80440 */ sw $t8,0x440($sp)
/* f0f5570: 8e0a0054 */ lw $t2,0x54($s0)
/* f0f5574: 00001025 */ move $v0,$zero
@@ -6664,12 +6663,12 @@ glabel var7f1b3c40pf
.PF0f0f5588:
/* f0f5588: afa20040 */ sw $v0,0x40($sp)
/* f0f558c: 27a50070 */ addiu $a1,$sp,0x70
/* f0f5590: 0c0056aa */ jal func00015d18
/* f0f5590: 0c0056aa */ jal mtx00015d18
/* f0f5594: 01622021 */ addu $a0,$t3,$v0
/* f0f5598: 8e0f006c */ lw $t7,0x6c($s0)
/* f0f559c: 0011c980 */ sll $t9,$s1,0x6
/* f0f55a0: 27a40070 */ addiu $a0,$sp,0x70
/* f0f55a4: 0c005779 */ jal func00016054
/* f0f55a4: 0c005779 */ jal mtx00016054
/* f0f55a8: 01f92821 */ addu $a1,$t7,$t9
/* f0f55ac: 8e0e0054 */ lw $t6,0x54($s0)
/* f0f55b0: 8fa20040 */ lw $v0,0x40($sp)
@@ -6680,7 +6679,7 @@ glabel var7f1b3c40pf
/* f0f55c4: 5420fff0 */ bnezl $at,.PF0f0f5588
/* f0f55c8: 8e0b006c */ lw $t3,0x6c($s0)
.PF0f0f55cc:
/* f0f55cc: 0c005945 */ jal func00016784
/* f0f55cc: 0c005945 */ jal mtx00016784
/* f0f55d0: 00000000 */ nop
/* f0f55d4: 8fad0448 */ lw $t5,0x448($sp)
/* f0f55d8: 29a10003 */ slti $at,$t5,0x3
@@ -7258,7 +7257,7 @@ glabel var7f1b2948
/* f0f3f60: 46082283 */ div.s $f10,$f4,$f8
/* f0f3f64: e7aa02f8 */ swc1 $f10,0x2f8($sp)
.L0f0f3f68:
/* f0f3f68: 0c00566c */ jal func000159b0
/* f0f3f68: 0c00566c */ jal mtx000159b0
/* f0f3f6c: 27a40350 */ addiu $a0,$sp,0x350
/* f0f3f70: 8fb90448 */ lw $t9,0x448($sp)
/* f0f3f74: 24010001 */ addiu $at,$zero,0x1
@@ -7399,7 +7398,7 @@ glabel var7f1b2948
/* f0f416c: e6000528 */ swc1 $f0,0x528($s0)
/* f0f4170: e7a20398 */ swc1 $f2,0x398($sp)
/* f0f4174: e7ac039c */ swc1 $f12,0x39c($sp)
/* f0f4178: 0c005923 */ jal func0001648c
/* f0f4178: 0c005923 */ jal mtx0001648c
/* f0f417c: e7a003a0 */ swc1 $f0,0x3a0($sp)
/* f0f4180: 100000b4 */ b .L0f0f4454
/* f0f4184: 3c01c2c8 */ lui $at,0xc2c8
@@ -7557,7 +7556,7 @@ glabel var7f1b2948
/* f0f43c8: e6000528 */ swc1 $f0,0x528($s0)
/* f0f43cc: e7a20398 */ swc1 $f2,0x398($sp)
/* f0f43d0: e7ac039c */ swc1 $f12,0x39c($sp)
/* f0f43d4: 0c005923 */ jal func0001648c
/* f0f43d4: 0c005923 */ jal mtx0001648c
/* f0f43d8: e7a003a0 */ swc1 $f0,0x3a0($sp)
/* f0f43dc: 8e0205b0 */ lw $v0,0x5b0($s0)
/* f0f43e0: 00027b00 */ sll $t7,$v0,0xc
@@ -7587,7 +7586,7 @@ glabel var7f1b2948
/* f0f443c: e6000528 */ swc1 $f0,0x528($s0)
/* f0f4440: e7a20398 */ swc1 $f2,0x398($sp)
/* f0f4444: e7ac039c */ swc1 $f12,0x39c($sp)
/* f0f4448: 0c005923 */ jal func0001648c
/* f0f4448: 0c005923 */ jal mtx0001648c
/* f0f444c: e7a003a0 */ swc1 $f0,0x3a0($sp)
.L0f0f4450:
/* f0f4450: 3c01c2c8 */ lui $at,0xc2c8
@@ -7663,7 +7662,7 @@ glabel var7f1b2948
/* f0f4558: 27a50398 */ addiu $a1,$sp,0x398
/* f0f455c: 0fc2d30f */ jal func0f0b4c3c
/* f0f4560: 3c063f80 */ lui $a2,0x3f80
/* f0f4564: 0c00566c */ jal func000159b0
/* f0f4564: 0c00566c */ jal mtx000159b0
/* f0f4568: 27a40310 */ addiu $a0,$sp,0x310
/* f0f456c: 8e0205b4 */ lw $v0,0x5b4($s0)
/* f0f4570: 5040001d */ beqzl $v0,.L0f0f45e8
@@ -7725,7 +7724,7 @@ glabel var7f1b2948
/* f0f4640: e7a4039c */ swc1 $f4,0x39c($sp)
/* f0f4644: e7a203a0 */ swc1 $f2,0x3a0($sp)
.L0f0f4648:
/* f0f4648: 0c0059b7 */ jal func000166dc
/* f0f4648: 0c0059b7 */ jal mtx000166dc
/* f0f464c: 27a50310 */ addiu $a1,$sp,0x310
/* f0f4650: 8faa0308 */ lw $t2,0x308($sp)
/* f0f4654: 5140000a */ beqzl $t2,.L0f0f4680
@@ -7734,19 +7733,19 @@ glabel var7f1b2948
/* f0f4660: c7a802f8 */ lwc1 $f8,0x2f8($sp)
/* f0f4664: 27a50310 */ addiu $a1,$sp,0x310
/* f0f4668: 46085302 */ mul.s $f12,$f10,$f8
/* f0f466c: 0c0057c1 */ jal func00015f04
/* f0f466c: 0c0057c1 */ jal mtx00015f04
/* f0f4670: 00000000 */ nop
/* f0f4674: 10000005 */ b .L0f0f468c
/* f0f4678: 8fab0308 */ lw $t3,0x308($sp)
/* f0f467c: c7ac0424 */ lwc1 $f12,0x424($sp)
.L0f0f4680:
/* f0f4680: 0c0057c1 */ jal func00015f04
/* f0f4680: 0c0057c1 */ jal mtx00015f04
/* f0f4684: 27a50310 */ addiu $a1,$sp,0x310
/* f0f4688: 8fab0308 */ lw $t3,0x308($sp)
.L0f0f468c:
/* f0f468c: 11600005 */ beqz $t3,.L0f0f46a4
/* f0f4690: 27a402fc */ addiu $a0,$sp,0x2fc
/* f0f4694: 0c0059b7 */ jal func000166dc
/* f0f4694: 0c0059b7 */ jal mtx000166dc
/* f0f4698: 27a50204 */ addiu $a1,$sp,0x204
/* f0f469c: 1000000b */ b .L0f0f46cc
/* f0f46a0: 27b10244 */ addiu $s1,$sp,0x244
@@ -7758,13 +7757,13 @@ glabel var7f1b2948
/* f0f46b4: c6040530 */ lwc1 $f4,0x530($s0)
/* f0f46b8: e7a4039c */ swc1 $f4,0x39c($sp)
/* f0f46bc: c60a0534 */ lwc1 $f10,0x534($s0)
/* f0f46c0: 0c0059b7 */ jal func000166dc
/* f0f46c0: 0c0059b7 */ jal mtx000166dc
/* f0f46c4: e7aa03a0 */ swc1 $f10,0x3a0($sp)
/* f0f46c8: 27b10244 */ addiu $s1,$sp,0x244
.L0f0f46cc:
/* f0f46cc: 02203025 */ or $a2,$s1,$zero
/* f0f46d0: 27a40310 */ addiu $a0,$sp,0x310
/* f0f46d4: 0c005680 */ jal func00015a00
/* f0f46d4: 0c005680 */ jal mtx00015a00
/* f0f46d8: 27a50350 */ addiu $a1,$sp,0x350
/* f0f46dc: 8fae0448 */ lw $t6,0x448($sp)
/* f0f46e0: 24010003 */ addiu $at,$zero,0x3
@@ -7774,12 +7773,12 @@ glabel var7f1b2948
/* f0f46f0: 27a401c4 */ addiu $a0,$sp,0x1c4
/* f0f46f4: 27a401c4 */ addiu $a0,$sp,0x1c4
/* f0f46f8: 02202825 */ or $a1,$s1,$zero
/* f0f46fc: 0c005680 */ jal func00015a00
/* f0f46fc: 0c005680 */ jal mtx00015a00
/* f0f4700: 27a60184 */ addiu $a2,$sp,0x184
/* f0f4704: 26060014 */ addiu $a2,$s0,0x14
/* f0f4708: afa60040 */ sw $a2,0x40($sp)
/* f0f470c: 27a40184 */ addiu $a0,$sp,0x184
/* f0f4710: 0c005680 */ jal func00015a00
/* f0f4710: 0c005680 */ jal mtx00015a00
/* f0f4714: 27a50204 */ addiu $a1,$sp,0x204
/* f0f4718: 10000006 */ b .L0f0f4734
/* f0f471c: 00000000 */ nop
@@ -7787,7 +7786,7 @@ glabel var7f1b2948
.L0f0f4724:
/* f0f4724: afa60040 */ sw $a2,0x40($sp)
/* f0f4728: 02202025 */ or $a0,$s1,$zero
/* f0f472c: 0c005680 */ jal func00015a00
/* f0f472c: 0c005680 */ jal mtx00015a00
/* f0f4730: 27a50204 */ addiu $a1,$sp,0x204
.L0f0f4734:
/* f0f4734: 0fc388d2 */ jal func0f0e2348
@@ -7925,7 +7924,7 @@ glabel var7f1b2948
/* f0f4930: 8faf03b4 */ lw $t7,0x3b4($sp)
.L0f0f4934:
/* f0f4934: 00116180 */ sll $t4,$s1,0x6
/* f0f4938: 0c00566c */ jal func000159b0
/* f0f4938: 0c00566c */ jal mtx000159b0
/* f0f493c: 018f2021 */ addu $a0,$t4,$t7
/* f0f4940: 8e180054 */ lw $t8,0x54($s0)
/* f0f4944: 26310001 */ addiu $s1,$s1,0x1
@@ -8022,7 +8021,7 @@ glabel var7f1b2948
.L0f0f4a94:
/* f0f4a94: 8fa40040 */ lw $a0,0x40($sp)
.L0f0f4a98:
/* f0f4a98: 0c005746 */ jal func00015d18
/* f0f4a98: 0c005746 */ jal mtx00015d18
/* f0f4a9c: 8fa503b4 */ lw $a1,0x3b4($sp)
/* f0f4aa0: 8fac0040 */ lw $t4,0x40($sp)
/* f0f4aa4: 27a403b8 */ addiu $a0,$sp,0x3b8
@@ -8098,14 +8097,14 @@ glabel var7f1b2948
/* f0f4ba8: 0c006949 */ jal func0001a524
/* f0f4bac: 00002825 */ or $a1,$zero,$zero
/* f0f4bb0: afa20160 */ sw $v0,0x160($sp)
/* f0f4bb4: 0c00566c */ jal func000159b0
/* f0f4bb4: 0c00566c */ jal mtx000159b0
/* f0f4bb8: 27a40120 */ addiu $a0,$sp,0x120
/* f0f4bbc: 3c014080 */ lui $at,0x4080
/* f0f4bc0: 44816000 */ mtc1 $at,$f12
/* f0f4bc4: 0fc01ad5 */ jal func0f006b54
/* f0f4bc8: 00000000 */ nop
/* f0f4bcc: 46000306 */ mov.s $f12,$f0
/* f0f4bd0: 0c0058ba */ jal func000162e8
/* f0f4bd0: 0c0058ba */ jal mtx000162e8
/* f0f4bd4: 27a50120 */ addiu $a1,$sp,0x120
/* f0f4bd8: 8faa0160 */ lw $t2,0x160($sp)
/* f0f4bdc: 8fb903b4 */ lw $t9,0x3b4($sp)
@@ -8114,10 +8113,10 @@ glabel var7f1b2948
/* f0f4be8: 032b3821 */ addu $a3,$t9,$t3
/* f0f4bec: 00e02025 */ or $a0,$a3,$zero
/* f0f4bf0: afa70040 */ sw $a3,0x40($sp)
/* f0f4bf4: 0c005680 */ jal func00015a00
/* f0f4bf4: 0c005680 */ jal mtx00015a00
/* f0f4bf8: 27a600e0 */ addiu $a2,$sp,0xe0
/* f0f4bfc: 8fa50040 */ lw $a1,0x40($sp)
/* f0f4c00: 0c005746 */ jal func00015d18
/* f0f4c00: 0c005746 */ jal mtx00015d18
/* f0f4c04: 27a400e0 */ addiu $a0,$sp,0xe0
.L0f0f4c08:
/* f0f4c08: 8e040054 */ lw $a0,0x54($s0)
@@ -8262,7 +8261,7 @@ glabel var7f1b2948
/* f0f4e18: 0c0087bd */ jal modelRender
/* f0f4e1c: afb903c4 */ sw $t9,0x3c4($sp)
/* f0f4e20: 8fad03c4 */ lw $t5,0x3c4($sp)
/* f0f4e24: 0c0059d8 */ jal func00016760
/* f0f4e24: 0c0059d8 */ jal mtx00016760
/* f0f4e28: afad0440 */ sw $t5,0x440($sp)
/* f0f4e2c: 8e0e0054 */ lw $t6,0x54($s0)
/* f0f4e30: 00001025 */ or $v0,$zero,$zero
@@ -8273,12 +8272,12 @@ glabel var7f1b2948
.L0f0f4e44:
/* f0f4e44: afa20040 */ sw $v0,0x40($sp)
/* f0f4e48: 27a50070 */ addiu $a1,$sp,0x70
/* f0f4e4c: 0c005746 */ jal func00015d18
/* f0f4e4c: 0c005746 */ jal mtx00015d18
/* f0f4e50: 01e22021 */ addu $a0,$t7,$v0
/* f0f4e54: 8e18006c */ lw $t8,0x6c($s0)
/* f0f4e58: 00115180 */ sll $t2,$s1,0x6
/* f0f4e5c: 27a40070 */ addiu $a0,$sp,0x70
/* f0f4e60: 0c005815 */ jal func00016054
/* f0f4e60: 0c005815 */ jal mtx00016054
/* f0f4e64: 030a2821 */ addu $a1,$t8,$t2
/* f0f4e68: 8e190054 */ lw $t9,0x54($s0)
/* f0f4e6c: 8fa20040 */ lw $v0,0x40($sp)
@@ -8289,7 +8288,7 @@ glabel var7f1b2948
/* f0f4e80: 5420fff0 */ bnezl $at,.L0f0f4e44
/* f0f4e84: 8e0f006c */ lw $t7,0x6c($s0)
.L0f0f4e88:
/* f0f4e88: 0c0059e1 */ jal func00016784
/* f0f4e88: 0c0059e1 */ jal mtx00016784
/* f0f4e8c: 00000000 */ nop
/* f0f4e90: 8fad0448 */ lw $t5,0x448($sp)
/* f0f4e94: 29a10003 */ slti $at,$t5,0x3
@@ -8867,7 +8866,7 @@ glabel var7f1b2948
/* f0f0aa4: 46082283 */ div.s $f10,$f4,$f8
/* f0f0aa8: e7aa0320 */ swc1 $f10,0x320($sp)
.NB0f0f0aac:
/* f0f0aac: 0c005a28 */ jal func000159b0
/* f0f0aac: 0c005a28 */ jal mtx000159b0
/* f0f0ab0: 27a40378 */ addiu $a0,$sp,0x378
/* f0f0ab4: 8fb90470 */ lw $t9,0x470($sp)
/* f0f0ab8: 24010001 */ addiu $at,$zero,0x1
@@ -9008,7 +9007,7 @@ glabel var7f1b2948
/* f0f0cb0: e6200528 */ swc1 $f0,0x528($s1)
/* f0f0cb4: e7a203c0 */ swc1 $f2,0x3c0($sp)
/* f0f0cb8: e7ac03c4 */ swc1 $f12,0x3c4($sp)
/* f0f0cbc: 0c005d07 */ jal func0001648c
/* f0f0cbc: 0c005d07 */ jal mtx0001648c
/* f0f0cc0: e7a003c8 */ swc1 $f0,0x3c8($sp)
/* f0f0cc4: 100000b4 */ beqz $zero,.NB0f0f0f98
/* f0f0cc8: 3c01c2c8 */ lui $at,0xc2c8
@@ -9166,7 +9165,7 @@ glabel var7f1b2948
/* f0f0f0c: e6200528 */ swc1 $f0,0x528($s1)
/* f0f0f10: e7a203c0 */ swc1 $f2,0x3c0($sp)
/* f0f0f14: e7ac03c4 */ swc1 $f12,0x3c4($sp)
/* f0f0f18: 0c005d07 */ jal func0001648c
/* f0f0f18: 0c005d07 */ jal mtx0001648c
/* f0f0f1c: e7a003c8 */ swc1 $f0,0x3c8($sp)
/* f0f0f20: 8e2205b0 */ lw $v0,0x5b0($s1)
/* f0f0f24: 00027b00 */ sll $t7,$v0,0xc
@@ -9196,7 +9195,7 @@ glabel var7f1b2948
/* f0f0f80: e6200528 */ swc1 $f0,0x528($s1)
/* f0f0f84: e7a203c0 */ swc1 $f2,0x3c0($sp)
/* f0f0f88: e7ac03c4 */ swc1 $f12,0x3c4($sp)
/* f0f0f8c: 0c005d07 */ jal func0001648c
/* f0f0f8c: 0c005d07 */ jal mtx0001648c
/* f0f0f90: e7a003c8 */ swc1 $f0,0x3c8($sp)
.NB0f0f0f94:
/* f0f0f94: 3c01c2c8 */ lui $at,0xc2c8
@@ -9272,7 +9271,7 @@ glabel var7f1b2948
/* f0f109c: 27a503c0 */ addiu $a1,$sp,0x3c0
/* f0f10a0: 0fc2ca67 */ jal func0f0b4c3c
/* f0f10a4: 3c063f80 */ lui $a2,0x3f80
/* f0f10a8: 0c005a28 */ jal func000159b0
/* f0f10a8: 0c005a28 */ jal mtx000159b0
/* f0f10ac: 27a40338 */ addiu $a0,$sp,0x338
/* f0f10b0: 8e2205b4 */ lw $v0,0x5b4($s1)
/* f0f10b4: 5040001d */ beqzl $v0,.NB0f0f112c
@@ -9359,7 +9358,7 @@ glabel var7f1b2948
/* f0f11e4: 02002825 */ or $a1,$s0,$zero
.NB0f0f11e8:
/* f0f11e8: 27a403c0 */ addiu $a0,$sp,0x3c0
/* f0f11ec: 0c005d9b */ jal func000166dc
/* f0f11ec: 0c005d9b */ jal mtx000166dc
/* f0f11f0: 27a50338 */ addiu $a1,$sp,0x338
/* f0f11f4: 8faf0330 */ lw $t7,0x330($sp)
/* f0f11f8: 51e0000a */ beqzl $t7,.NB0f0f1224
@@ -9368,19 +9367,19 @@ glabel var7f1b2948
/* f0f1204: c7a80320 */ lwc1 $f8,0x320($sp)
/* f0f1208: 27a50338 */ addiu $a1,$sp,0x338
/* f0f120c: 46085302 */ mul.s $f12,$f10,$f8
/* f0f1210: 0c005b7d */ jal func00015f04
/* f0f1210: 0c005b7d */ jal mtx00015f04
/* f0f1214: 00000000 */ sll $zero,$zero,0x0
/* f0f1218: 10000005 */ beqz $zero,.NB0f0f1230
/* f0f121c: 8fb80330 */ lw $t8,0x330($sp)
/* f0f1220: c7ac044c */ lwc1 $f12,0x44c($sp)
.NB0f0f1224:
/* f0f1224: 0c005b7d */ jal func00015f04
/* f0f1224: 0c005b7d */ jal mtx00015f04
/* f0f1228: 27a50338 */ addiu $a1,$sp,0x338
/* f0f122c: 8fb80330 */ lw $t8,0x330($sp)
.NB0f0f1230:
/* f0f1230: 13000005 */ beqz $t8,.NB0f0f1248
/* f0f1234: 27a40324 */ addiu $a0,$sp,0x324
/* f0f1238: 0c005d9b */ jal func000166dc
/* f0f1238: 0c005d9b */ jal mtx000166dc
/* f0f123c: 27a50208 */ addiu $a1,$sp,0x208
/* f0f1240: 1000000b */ beqz $zero,.NB0f0f1270
/* f0f1244: 27b00248 */ addiu $s0,$sp,0x248
@@ -9392,13 +9391,13 @@ glabel var7f1b2948
/* f0f1258: c6240530 */ lwc1 $f4,0x530($s1)
/* f0f125c: e7a403c4 */ swc1 $f4,0x3c4($sp)
/* f0f1260: c62a0534 */ lwc1 $f10,0x534($s1)
/* f0f1264: 0c005d9b */ jal func000166dc
/* f0f1264: 0c005d9b */ jal mtx000166dc
/* f0f1268: e7aa03c8 */ swc1 $f10,0x3c8($sp)
/* f0f126c: 27b00248 */ addiu $s0,$sp,0x248
.NB0f0f1270:
/* f0f1270: 02003025 */ or $a2,$s0,$zero
/* f0f1274: 27a40338 */ addiu $a0,$sp,0x338
/* f0f1278: 0c005a3c */ jal func00015a00
/* f0f1278: 0c005a3c */ jal mtx00015a00
/* f0f127c: 27a50378 */ addiu $a1,$sp,0x378
/* f0f1280: 8fb90470 */ lw $t9,0x470($sp)
/* f0f1284: 24010003 */ addiu $at,$zero,0x3
@@ -9408,12 +9407,12 @@ glabel var7f1b2948
/* f0f1294: 27a401c8 */ addiu $a0,$sp,0x1c8
/* f0f1298: 27a401c8 */ addiu $a0,$sp,0x1c8
/* f0f129c: 02002825 */ or $a1,$s0,$zero
/* f0f12a0: 0c005a3c */ jal func00015a00
/* f0f12a0: 0c005a3c */ jal mtx00015a00
/* f0f12a4: 27a60188 */ addiu $a2,$sp,0x188
/* f0f12a8: 26260014 */ addiu $a2,$s1,0x14
/* f0f12ac: afa60044 */ sw $a2,0x44($sp)
/* f0f12b0: 27a40188 */ addiu $a0,$sp,0x188
/* f0f12b4: 0c005a3c */ jal func00015a00
/* f0f12b4: 0c005a3c */ jal mtx00015a00
/* f0f12b8: 27a50208 */ addiu $a1,$sp,0x208
/* f0f12bc: 10000006 */ beqz $zero,.NB0f0f12d8
/* f0f12c0: 00000000 */ sll $zero,$zero,0x0
@@ -9421,7 +9420,7 @@ glabel var7f1b2948
.NB0f0f12c8:
/* f0f12c8: afa60044 */ sw $a2,0x44($sp)
/* f0f12cc: 02002025 */ or $a0,$s0,$zero
/* f0f12d0: 0c005a3c */ jal func00015a00
/* f0f12d0: 0c005a3c */ jal mtx00015a00
/* f0f12d4: 27a50208 */ addiu $a1,$sp,0x208
.NB0f0f12d8:
/* f0f12d8: 0fc37df7 */ jal func0f0e2348
@@ -9559,7 +9558,7 @@ glabel var7f1b2948
/* f0f14d4: 8fad03dc */ lw $t5,0x3dc($sp)
.NB0f0f14d8:
/* f0f14d8: 00105980 */ sll $t3,$s0,0x6
/* f0f14dc: 0c005a28 */ jal func000159b0
/* f0f14dc: 0c005a28 */ jal mtx000159b0
/* f0f14e0: 016d2021 */ addu $a0,$t3,$t5
/* f0f14e4: 8e2e0054 */ lw $t6,0x54($s1)
/* f0f14e8: 26100001 */ addiu $s0,$s0,0x1
@@ -9656,7 +9655,7 @@ glabel var7f1b2948
.NB0f0f1638:
/* f0f1638: 8fa40044 */ lw $a0,0x44($sp)
.NB0f0f163c:
/* f0f163c: 0c005b02 */ jal func00015d18
/* f0f163c: 0c005b02 */ jal mtx00015d18
/* f0f1640: 8fa503dc */ lw $a1,0x3dc($sp)
/* f0f1644: 8fab0044 */ lw $t3,0x44($sp)
/* f0f1648: 27a403e0 */ addiu $a0,$sp,0x3e0
@@ -9732,14 +9731,14 @@ glabel var7f1b2948
/* f0f174c: 0c006da5 */ jal func0001a524
/* f0f1750: 00002825 */ or $a1,$zero,$zero
/* f0f1754: afa20164 */ sw $v0,0x164($sp)
/* f0f1758: 0c005a28 */ jal func000159b0
/* f0f1758: 0c005a28 */ jal mtx000159b0
/* f0f175c: 27a40124 */ addiu $a0,$sp,0x124
/* f0f1760: 3c014080 */ lui $at,0x4080
/* f0f1764: 44816000 */ mtc1 $at,$f12
/* f0f1768: 0fc019fe */ jal func0f006b54
/* f0f176c: 00000000 */ sll $zero,$zero,0x0
/* f0f1770: 46000306 */ mov.s $f12,$f0
/* f0f1774: 0c005c9e */ jal func000162e8
/* f0f1774: 0c005c9e */ jal mtx000162e8
/* f0f1778: 27a50124 */ addiu $a1,$sp,0x124
/* f0f177c: 8faf0164 */ lw $t7,0x164($sp)
/* f0f1780: 8fac03dc */ lw $t4,0x3dc($sp)
@@ -9748,10 +9747,10 @@ glabel var7f1b2948
/* f0f178c: 01983821 */ addu $a3,$t4,$t8
/* f0f1790: 00e02025 */ or $a0,$a3,$zero
/* f0f1794: afa70044 */ sw $a3,0x44($sp)
/* f0f1798: 0c005a3c */ jal func00015a00
/* f0f1798: 0c005a3c */ jal mtx00015a00
/* f0f179c: 27a600e4 */ addiu $a2,$sp,0xe4
/* f0f17a0: 8fa50044 */ lw $a1,0x44($sp)
/* f0f17a4: 0c005b02 */ jal func00015d18
/* f0f17a4: 0c005b02 */ jal mtx00015d18
/* f0f17a8: 27a400e4 */ addiu $a0,$sp,0xe4
.NB0f0f17ac:
/* f0f17ac: 8e240054 */ lw $a0,0x54($s1)
@@ -9896,7 +9895,7 @@ glabel var7f1b2948
/* f0f19bc: 0c008be3 */ jal modelRender
/* f0f19c0: afac03ec */ sw $t4,0x3ec($sp)
/* f0f19c4: 8faa03ec */ lw $t2,0x3ec($sp)
/* f0f19c8: 0c005dbc */ jal func00016760
/* f0f19c8: 0c005dbc */ jal mtx00016760
/* f0f19cc: afaa0468 */ sw $t2,0x468($sp)
/* f0f19d0: 8e390054 */ lw $t9,0x54($s1)
/* f0f19d4: 00001025 */ or $v0,$zero,$zero
@@ -9907,12 +9906,12 @@ glabel var7f1b2948
.NB0f0f19e8:
/* f0f19e8: afa20044 */ sw $v0,0x44($sp)
/* f0f19ec: 27a50074 */ addiu $a1,$sp,0x74
/* f0f19f0: 0c005b02 */ jal func00015d18
/* f0f19f0: 0c005b02 */ jal mtx00015d18
/* f0f19f4: 01a22021 */ addu $a0,$t5,$v0
/* f0f19f8: 8e2e006c */ lw $t6,0x6c($s1)
/* f0f19fc: 00107980 */ sll $t7,$s0,0x6
/* f0f1a00: 27a40074 */ addiu $a0,$sp,0x74
/* f0f1a04: 0c005bd1 */ jal func00016054
/* f0f1a04: 0c005bd1 */ jal mtx00016054
/* f0f1a08: 01cf2821 */ addu $a1,$t6,$t7
/* f0f1a0c: 8e2c0054 */ lw $t4,0x54($s1)
/* f0f1a10: 8fa20044 */ lw $v0,0x44($sp)
@@ -9923,7 +9922,7 @@ glabel var7f1b2948
/* f0f1a24: 5420fff0 */ bnezl $at,.NB0f0f19e8
/* f0f1a28: 8e2d006c */ lw $t5,0x6c($s1)
.NB0f0f1a2c:
/* f0f1a2c: 0c005dc5 */ jal func00016784
/* f0f1a2c: 0c005dc5 */ jal mtx00016784
/* f0f1a30: 00000000 */ sll $zero,$zero,0x0
/* f0f1a34: 8faa0470 */ lw $t2,0x470($sp)
/* f0f1a38: 29410003 */ slti $at,$t2,0x3
@@ -28039,7 +28038,7 @@ void func0f0fd494(struct coord *pos)
matrix = currentPlayerGetMatrix1740();
func00015b68(matrix, pos, &coord);
mtx00015b68(matrix, pos, &coord);
func0f0b4d04(&coord, xy);
g_MenuData.unk670 = (s32)xy[0] - viGetWidth() / 2;
src/game/game_11f000.c
+15 -16
View File
@@ -9,8 +9,7 @@
#include "game/pad.h"
#include "bss.h"
#include "lib/lib_09a80.h"
#include "lib/lib_159b0.h"
#include "lib/lib_16110.h"
#include "lib/mtx.h"
#include "data.h"
#include "types.h"
@@ -78,7 +77,7 @@ glabel func0f11f000
/* f11f058: 0fc2d30f */ jal func0f0b4c3c
/* f11f05c: e7a40020 */ swc1 $f4,0x20($sp)
/* f11f060: 8fa40024 */ lw $a0,0x24($sp)
/* f11f064: 0c0056c4 */ jal func00015b10
/* f11f064: 0c0056c4 */ jal mtx00015b10
/* f11f068: 8fa50030 */ lw $a1,0x30($sp)
/* f11f06c: 8fbf0014 */ lw $ra,0x14($sp)
/* f11f070: 27bd0028 */ addiu $sp,$sp,0x28
@@ -2169,7 +2168,7 @@ glabel var7f1b50c8
/* f120e04: 00408025 */ or $s0,$v0,$zero
/* f120e08: 02002025 */ or $a0,$s0,$zero
/* f120e0c: 00402825 */ or $a1,$v0,$zero
/* f120e10: 0c005680 */ jal func00015a00
/* f120e10: 0c005680 */ jal mtx00015a00
/* f120e14: 27a603cc */ addiu $a2,$sp,0x3cc
/* f120e18: 3c013f80 */ lui $at,0x3f80
/* f120e1c: 44813000 */ mtc1 $at,$f6
@@ -2184,7 +2183,7 @@ glabel var7f1b50c8
/* f120e40: 3c05800a */ lui $a1,%hi(var800a33a8)
/* f120e44: 24a533a8 */ addiu $a1,$a1,%lo(var800a33a8)
/* f120e48: 27a403cc */ addiu $a0,$sp,0x3cc
/* f120e4c: 0c005680 */ jal func00015a00
/* f120e4c: 0c005680 */ jal mtx00015a00
/* f120e50: 27a6038c */ addiu $a2,$sp,0x38c
/* f120e54: 1a20004e */ blez $s1,.L0f120f90
/* f120e58: afa00270 */ sw $zero,0x270($sp)
@@ -3611,7 +3610,7 @@ glabel var7f1b50c8
/* f122448: 00408025 */ or $s0,$v0,$zero
/* f12244c: 02002025 */ or $a0,$s0,$zero
/* f122450: 00402825 */ or $a1,$v0,$zero
/* f122454: 0c005680 */ jal func00015a00
/* f122454: 0c005680 */ jal mtx00015a00
/* f122458: 27a601ec */ addiu $a2,$sp,0x1ec
/* f12245c: c7a60064 */ lwc1 $f6,0x64($sp)
/* f122460: 3c04800a */ lui $a0,%hi(var800a33a8)
@@ -3624,7 +3623,7 @@ glabel var7f1b50c8
/* f12247c: 3c05800a */ lui $a1,%hi(var800a33a8)
/* f122480: 24a533a8 */ addiu $a1,$a1,%lo(var800a33a8)
/* f122484: 27a401ec */ addiu $a0,$sp,0x1ec
/* f122488: 0c005680 */ jal func00015a00
/* f122488: 0c005680 */ jal mtx00015a00
/* f12248c: 27a601ac */ addiu $a2,$sp,0x1ac
/* f122490: 1a200036 */ blez $s1,.L0f12256c
/* f122494: afa00090 */ sw $zero,0x90($sp)
@@ -7359,10 +7358,10 @@ glabel var7f1b5108
/* f1266a4: 92cb0003 */ lbu $t3,0x3($s6)
/* f1266a8: 158001d2 */ bnez $t4,.PF0f126df4
/* f1266ac: a3ab014a */ sb $t3,0x14a($sp)
/* f1266b0: 0c00563d */ jal func00015b64
/* f1266b0: 0c00563d */ jal mtx00015b64
/* f1266b4: 02802825 */ move $a1,$s4
/* f1266b8: 8fa40168 */ lw $a0,0x168($sp)
/* f1266bc: 0c00563d */ jal func00015b64
/* f1266bc: 0c00563d */ jal mtx00015b64
/* f1266c0: 02802825 */ move $a1,$s4
/* f1266c4: c6800008 */ lwc1 $f0,0x8($s4)
/* f1266c8: 4600d03c */ c.lt.s $f26,$f0
@@ -7969,10 +7968,10 @@ glabel var7f1b5108
/* f125bc0: 92cc0003 */ lbu $t4,0x3($s6)
/* f125bc4: 15a001d2 */ bnez $t5,.L0f126310
/* f125bc8: a3ac014a */ sb $t4,0x14a($sp)
/* f125bcc: 0c0056d9 */ jal func00015b64
/* f125bcc: 0c0056d9 */ jal mtx00015b64
/* f125bd0: 02802825 */ or $a1,$s4,$zero
/* f125bd4: 8fa40168 */ lw $a0,0x168($sp)
/* f125bd8: 0c0056d9 */ jal func00015b64
/* f125bd8: 0c0056d9 */ jal mtx00015b64
/* f125bdc: 02802825 */ or $a1,$s4,$zero
/* f125be0: c6800008 */ lwc1 $f0,0x8($s4)
/* f125be4: 4600d03c */ c.lt.s $f26,$f0
@@ -9663,12 +9662,12 @@ glabel func0f126c3c
/* f126c60: 0fc2d5be */ jal currentPlayerGetMatrix1740
/* f126c64: e7a4006c */ swc1 $f4,0x6c($sp)
/* f126c68: 00402025 */ or $a0,$v0,$zero
/* f126c6c: 0c0056d9 */ jal func00015b64
/* f126c6c: 0c0056d9 */ jal mtx00015b64
/* f126c70: 27a50064 */ addiu $a1,$sp,0x64
/* f126c74: 0fc2d5c6 */ jal currentPlayerGetUnk1754
/* f126c78: 00000000 */ nop
/* f126c7c: 00402025 */ or $a0,$v0,$zero
/* f126c80: 0c0056d9 */ jal func00015b64
/* f126c80: 0c0056d9 */ jal mtx00015b64
/* f126c84: 27a50064 */ addiu $a1,$sp,0x64
/* f126c88: 3c013f80 */ lui $at,0x3f80
/* f126c8c: 44813000 */ mtc1 $at,$f6
@@ -9776,12 +9775,12 @@ glabel func0f126c3c
/* f126c60: 0fc2d5be */ jal currentPlayerGetMatrix1740
/* f126c64: e7a4006c */ swc1 $f4,0x6c($sp)
/* f126c68: 00402025 */ or $a0,$v0,$zero
/* f126c6c: 0c0056d9 */ jal func00015b64
/* f126c6c: 0c0056d9 */ jal mtx00015b64
/* f126c70: 27a50064 */ addiu $a1,$sp,0x64
/* f126c74: 0fc2d5c6 */ jal currentPlayerGetUnk1754
/* f126c78: 00000000 */ nop
/* f126c7c: 00402025 */ or $a0,$v0,$zero
/* f126c80: 0c0056d9 */ jal func00015b64
/* f126c80: 0c0056d9 */ jal mtx00015b64
/* f126c84: 27a50064 */ addiu $a1,$sp,0x64
/* f126c88: 3c013f80 */ lui $at,0x3f80
/* f126c8c: 44813000 */ mtc1 $at,$f6
@@ -10083,7 +10082,7 @@ glabel var7f1b513c
/* f1270a8: 0fc25bb5 */ jal func0f096ed4
/* f1270ac: e7a600dc */ swc1 $f6,0xdc($sp)
/* f1270b0: 02802025 */ or $a0,$s4,$zero
/* f1270b4: 0c0056c4 */ jal func00015b10
/* f1270b4: 0c0056c4 */ jal mtx00015b10
/* f1270b8: 02e02825 */ or $a1,$s7,$zero
/* f1270bc: c7a000e0 */ lwc1 $f0,0xe0($sp)
/* f1270c0: c7a200e4 */ lwc1 $f2,0xe4($sp)
src/game/game_13b670.c
+1 -1
View File
@@ -5,7 +5,7 @@
#include "bss.h"
#include "lib/main.h"
#include "lib/memory.h"
#include "lib/lib_16110.h"
#include "lib/mtx.h"
#include "data.h"
#include "types.h"
src/game/game_13c510.c
+4 -5
View File
@@ -12,8 +12,7 @@
#include "game/game_1668e0.h"
#include "bss.h"
#include "lib/lib_09a80.h"
#include "lib/lib_159b0.h"
#include "lib/lib_16110.h"
#include "lib/mtx.h"
#include "data.h"
#include "types.h"
@@ -322,13 +321,13 @@ glabel func0f13c780
/* f13c868: 0fc5722e */ jal currentPlayerGetScaleBg2Gfx
/* f13c86c: 00000000 */ nop
/* f13c870: 46000306 */ mov.s $f12,$f0
/* f13c874: 0c0057e2 */ jal func00015f88
/* f13c874: 0c0057e2 */ jal mtx00015f88
/* f13c878: 02002825 */ or $a1,$s0,$zero
/* f13c87c: 0fc2d3f2 */ jal currentPlayerGetUnk006c
/* f13c880: 00000000 */ nop
/* f13c884: 00402025 */ or $a0,$v0,$zero
/* f13c888: 02002825 */ or $a1,$s0,$zero
/* f13c88c: 0c005680 */ jal func00015a00
/* f13c88c: 0c005680 */ jal mtx00015a00
/* f13c890: 27a600f8 */ addiu $a2,$sp,0xf8
/* f13c894: 0c002f22 */ jal viGetViewWidth
/* f13c898: 00000000 */ nop
@@ -1515,7 +1514,7 @@ glabel func0f13d568
/* f13daf0: 0fc2d5be */ jal currentPlayerGetMatrix1740
/* f13daf4: 00000000 */ nop
/* f13daf8: 00402025 */ or $a0,$v0,$zero
/* f13dafc: 0c0056c4 */ jal func00015b10
/* f13dafc: 0c0056c4 */ jal mtx00015b10
/* f13db00: 27a500e4 */ addiu $a1,$sp,0xe4
/* f13db04: 27a400e4 */ addiu $a0,$sp,0xe4
/* f13db08: 0fc2d341 */ jal func0f0b4d04
src/game/game_1668e0.c
+3 -3
View File
@@ -2,7 +2,7 @@
#include "constants.h"
#include "game/game_1668e0.h"
#include "bss.h"
#include "lib/lib_159b0.h"
#include "lib/mtx.h"
#include "data.h"
#include "types.h"
@@ -59,7 +59,7 @@ void func0f166a6c(Mtxf *mtx, s32 roomnum)
{
s32 stagenum = g_Vars.stagenum;
func000159b0(mtx);
mtx000159b0(mtx);
mtx->m[0][0] = 1;
mtx->m[1][1] = 1;
@@ -113,7 +113,7 @@ s32 func0f166c20(s32 roomnum)
var800a666c[index] = var8005ef10[0];
func0f166a6c(&mtx, roomnum);
func00016054(&mtx, &var800a6670[index]);
mtx00016054(&mtx, &var800a6670[index]);
return index;
}
src/game/game_190260.c
+1 -1
View File
@@ -27,7 +27,7 @@
#include "bss.h"
#include "lib/model.h"
#include "lib/rng.h"
#include "lib/lib_16110.h"
#include "lib/mtx.h"
#include "lib/lib_233c0.h"
#include "data.h"
#include "types.h"
src/game/game_1999b0.c
+13 -14
View File
@@ -13,8 +13,7 @@
#include "game/propobj.h"
#include "bss.h"
#include "lib/rng.h"
#include "lib/lib_159b0.h"
#include "lib/lib_16110.h"
#include "lib/mtx.h"
#include "lib/lib_233c0.h"
#include "lib/lib_24e40.h"
#include "data.h"
@@ -390,18 +389,18 @@ void func0f19a37c(struct chrdata *chr)
sp228.y = sp152[1] * mult;
sp228.z = sp152[2] * mult;
func000159b0(&sp164);
mtx000159b0(&sp164);
if (chr->aibot->weaponnum == WEAPON_COMBATKNIFE) {
func00016400(M_BADPI * 1.5f, &sp164);
func000162e8(M_BADPI, &sp84);
func000159fc(&sp84, &sp164);
mtx00016400(M_BADPI * 1.5f, &sp164);
mtx000162e8(M_BADPI, &sp84);
mtx000159fc(&sp84, &sp164);
}
func000162e8(0.34901028871536f, &sp84);
func00015be0(&sp84, &sp164);
func00016374(sp80, &sp84);
func00015be0(&sp84, &sp164);
mtx000162e8(0.34901028871536f, &sp84);
mtx00015be0(&sp84, &sp164);
mtx00016374(sp80, &sp84);
mtx00015be0(&sp84, &sp164);
bgun0f09ee18(chr, &gset, &prop->pos, prop->rooms, &sp164, &sp228);
@@ -505,10 +504,10 @@ void aibotCreateSlayerRocket(struct chrdata *chr)
sp100[1] = sinf(b);
sp100[2] = cosf(b) * cosf(a);
func000162e8(b, &sp196);
func00016374(a, &sp132);
func00015be0(&sp132, &sp196);
func000159b0(&sp260);
mtx000162e8(b, &sp196);
mtx00016374(a, &sp132);
mtx00015be0(&sp132, &sp196);
mtx000159b0(&sp260);
bgun0f09ebcc(&rocket->base, &chr->prop->pos, chr->prop->rooms, &sp196, sp100, &sp260, chr->prop, &chr->prop->pos);
src/game/hudmsg.c
+1 -1
View File
@@ -17,7 +17,7 @@
#include "lib/lib_09a80.h"
#include "lib/snd.h"
#include "lib/memory.h"
#include "lib/lib_16110.h"
#include "lib/mtx.h"
#include "data.h"
#include "types.h"
src/game/lv.c
+22 -22
View File
@@ -100,7 +100,7 @@
#include "lib/snd.h"
#include "lib/lib_11420.h"
#include "lib/rng.h"
#include "lib/lib_16110.h"
#include "lib/mtx.h"
#include "lib/lib_233c0.h"
#include "lib/lib_317f0.h"
#include "data.h"
@@ -1961,7 +1961,7 @@ glabel var7f1b8e7cpf
/* f16a5a8: 86070632 */ lh $a3,0x632($s0)
/* f16a5ac: 3c013f80 */ lui $at,0x3f80
/* f16a5b0: 44816000 */ mtc1 $at,$f12
/* f16a5b4: 0c005936 */ jal func00016748
/* f16a5b4: 0c005936 */ jal mtx00016748
/* f16a5b8: 00000000 */ nop
/* f16a5bc: 0c002bc5 */ jal vi0000b1d0
/* f16a5c0: 02602025 */ move $a0,$s3
@@ -2058,7 +2058,7 @@ glabel var7f1b8e7cpf
/* f16a728: 86070632 */ lh $a3,0x632($s0)
/* f16a72c: 3c013f80 */ lui $at,0x3f80
/* f16a730: 44816000 */ mtc1 $at,$f12
/* f16a734: 0c005936 */ jal func00016748
/* f16a734: 0c005936 */ jal mtx00016748
/* f16a738: 00000000 */ nop
/* f16a73c: 0c002bc5 */ jal vi0000b1d0
/* f16a740: 02602025 */ move $a0,$s3
@@ -2131,7 +2131,7 @@ glabel var7f1b8e7cpf
/* f16a848: 86070632 */ lh $a3,0x632($s0)
/* f16a84c: 3c013f80 */ lui $at,0x3f80
/* f16a850: 44816000 */ mtc1 $at,$f12
/* f16a854: 0c005936 */ jal func00016748
/* f16a854: 0c005936 */ jal mtx00016748
/* f16a858: 00000000 */ nop
/* f16a85c: 0c002bbb */ jal vi0000b1a8
/* f16a860: 02602025 */ move $a0,$s3
@@ -2341,7 +2341,7 @@ glabel var7f1b8e7cpf
/* f16ab4c: 0c002ec7 */ jal viSetFovAspectAndSize
/* f16ab50: 86070632 */ lh $a3,0x632($s0)
/* f16ab54: 8e4a0288 */ lw $t2,0x288($s2)
/* f16ab58: 0c005936 */ jal func00016748
/* f16ab58: 0c005936 */ jal mtx00016748
/* f16ab5c: c54c0074 */ lwc1 $f12,0x74($t2)
/* f16ab60: 0fc599de */ jal func0f1657f8
/* f16ab64: 00000000 */ nop
@@ -2444,7 +2444,7 @@ glabel var7f1b8e7cpf
/* f16acd0: 00402025 */ move $a0,$v0
/* f16acd4: 3c013f80 */ lui $at,0x3f80
/* f16acd8: 44816000 */ mtc1 $at,$f12
/* f16acdc: 0c005936 */ jal func00016748
/* f16acdc: 0c005936 */ jal mtx00016748
/* f16ace0: 00409825 */ move $s3,$v0
/* f16ace4: 8e4a0284 */ lw $t2,0x284($s2)
/* f16ace8: 8d581c50 */ lw $t8,0x1c50($t2)
@@ -3477,7 +3477,7 @@ glabel var7f1b8e7cpf
/* f16bbb0: 00402025 */ move $a0,$v0
/* f16bbb4: 3c013f80 */ lui $at,0x3f80
/* f16bbb8: 44816000 */ mtc1 $at,$f12
/* f16bbbc: 0c005936 */ jal func00016748
/* f16bbbc: 0c005936 */ jal mtx00016748
/* f16bbc0: 00409825 */ move $s3,$v0
/* f16bbc4: 8e4a0284 */ lw $t2,0x284($s2)
/* f16bbc8: 8d581c50 */ lw $t8,0x1c50($t2)
@@ -3489,7 +3489,7 @@ glabel var7f1b8e7cpf
/* f16bbe0: 00409825 */ move $s3,$v0
/* f16bbe4: 8e4b0288 */ lw $t3,0x288($s2)
.PF0f16bbe8:
/* f16bbe8: 0c005936 */ jal func00016748
/* f16bbe8: 0c005936 */ jal mtx00016748
/* f16bbec: c56c0074 */ lwc1 $f12,0x74($t3)
/* f16bbf0: 8e4c0314 */ lw $t4,0x314($s2)
/* f16bbf4: 51800005 */ beqzl $t4,.PF0f16bc0c
@@ -3732,7 +3732,7 @@ Gfx *lvRender(Gfx *gdl)
viSetViewPosition(g_Vars.currentplayer->viewleft, g_Vars.currentplayer->viewtop);
viSetFovAspectAndSize(g_Vars.currentplayer->fovy, g_Vars.currentplayer->aspect,
g_Vars.currentplayer->viewwidth, g_Vars.currentplayer->viewheight);
func00016748(1);
mtx00016748(1);
gdl = vi0000b1d0(gdl);
gdl = viRenderViewportEdges(gdl);
@@ -3747,7 +3747,7 @@ Gfx *lvRender(Gfx *gdl)
viSetViewPosition(g_Vars.currentplayer->viewleft, g_Vars.currentplayer->viewtop);
viSetFovAspectAndSize(g_Vars.currentplayer->fovy, g_Vars.currentplayer->aspect,
g_Vars.currentplayer->viewwidth, g_Vars.currentplayer->viewheight);
func00016748(1);
mtx00016748(1);
gdl = vi0000b1d0(gdl);
gdl = currentPlayerScissorToViewport(gdl);
@@ -3765,7 +3765,7 @@ Gfx *lvRender(Gfx *gdl)
viSetViewPosition(g_Vars.currentplayer->viewleft, g_Vars.currentplayer->viewtop);
viSetFovAspectAndSize(g_Vars.currentplayer->fovy, g_Vars.currentplayer->aspect,
g_Vars.currentplayer->viewwidth, g_Vars.currentplayer->viewheight);
func00016748(1);
mtx00016748(1);
gdl = vi0000b1a8(gdl);
gdl = vi0000b1d0(gdl);
@@ -3841,7 +3841,7 @@ Gfx *lvRender(Gfx *gdl)
viSetViewPosition(g_Vars.currentplayer->viewleft, g_Vars.currentplayer->viewtop);
viSetFovAspectAndSize(g_Vars.currentplayer->fovy, g_Vars.currentplayer->aspect,
g_Vars.currentplayer->viewwidth, g_Vars.currentplayer->viewheight);
func00016748(g_Vars.currentplayerstats->scale_bg2gfx);
mtx00016748(g_Vars.currentplayerstats->scale_bg2gfx);
func0f1657f8();
func0f176298();
gdl = vi0000b280(gdl);
@@ -3872,7 +3872,7 @@ Gfx *lvRender(Gfx *gdl)
} else if (var8009dfc0) {
gdl = viRenderViewportEdges(gdl);
gdl = currentPlayerScissorToViewport(gdl);
func00016748(1);
mtx00016748(1);
if (g_Vars.currentplayer->unk1c50_01) {
gdl = func0f0fbc30(gdl);
@@ -4289,13 +4289,13 @@ Gfx *lvRender(Gfx *gdl)
gdl = func0f1274d8(gdl);
gdl = amRender(gdl);
func00016748(1);
mtx00016748(1);
if (g_Vars.currentplayer->unk1c50_01) {
gdl = func0f0fbc30(gdl);
}
func00016748(g_Vars.currentplayerstats->scale_bg2gfx);
mtx00016748(g_Vars.currentplayerstats->scale_bg2gfx);
if (g_Vars.mplayerisrunning) {
gdl = mpRenderModalText(gdl);
@@ -4564,7 +4564,7 @@ glabel var7f1b1fd4nb
/* f1642f8: 86070632 */ lh $a3,0x632($s0)
/* f1642fc: 3c013f80 */ lui $at,0x3f80
/* f164300: 44816000 */ mtc1 $at,$f12
/* f164304: 0c005db6 */ jal func00016748
/* f164304: 0c005db6 */ jal mtx00016748
/* f164308: 00000000 */ sll $zero,$zero,0x0
/* f16430c: 0c002cd4 */ jal vi0000b1d0
/* f164310: 02602025 */ or $a0,$s3,$zero
@@ -4632,7 +4632,7 @@ glabel var7f1b1fd4nb
/* f164404: 86070632 */ lh $a3,0x632($s0)
/* f164408: 3c013f80 */ lui $at,0x3f80
/* f16440c: 44816000 */ mtc1 $at,$f12
/* f164410: 0c005db6 */ jal func00016748
/* f164410: 0c005db6 */ jal mtx00016748
/* f164414: 00000000 */ sll $zero,$zero,0x0
/* f164418: 0c002cd4 */ jal vi0000b1d0
/* f16441c: 02602025 */ or $a0,$s3,$zero
@@ -4705,7 +4705,7 @@ glabel var7f1b1fd4nb
/* f164524: 86070632 */ lh $a3,0x632($s0)
/* f164528: 3c013f80 */ lui $at,0x3f80
/* f16452c: 44816000 */ mtc1 $at,$f12
/* f164530: 0c005db6 */ jal func00016748
/* f164530: 0c005db6 */ jal mtx00016748
/* f164534: 00000000 */ sll $zero,$zero,0x0
/* f164538: 0c002cca */ jal vi0000b1a8
/* f16453c: 02602025 */ or $a0,$s3,$zero
@@ -4926,7 +4926,7 @@ glabel var7f1b1fd4nb
/* f164850: 0c002feb */ jal viSetFovAspectAndSize
/* f164854: 86070632 */ lh $a3,0x632($s0)
/* f164858: 8e580288 */ lw $t8,0x288($s2)
/* f16485c: 0c005db6 */ jal func00016748
/* f16485c: 0c005db6 */ jal mtx00016748
/* f164860: c70c0074 */ lwc1 $f12,0x74($t8)
/* f164864: 0fc57ffe */ jal func0f1657f8
/* f164868: 00000000 */ sll $zero,$zero,0x0
@@ -5030,7 +5030,7 @@ glabel var7f1b1fd4nb
/* f1649d8: 00402025 */ or $a0,$v0,$zero
/* f1649dc: 3c013f80 */ lui $at,0x3f80
/* f1649e0: 44816000 */ mtc1 $at,$f12
/* f1649e4: 0c005db6 */ jal func00016748
/* f1649e4: 0c005db6 */ jal mtx00016748
/* f1649e8: 00409825 */ or $s3,$v0,$zero
/* f1649ec: 8e4a0284 */ lw $t2,0x284($s2)
/* f1649f0: 8d581c50 */ lw $t8,0x1c50($t2)
@@ -6264,7 +6264,7 @@ glabel var7f1b1fd4nb
/* f165bac: 00402025 */ or $a0,$v0,$zero
/* f165bb0: 3c013f80 */ lui $at,0x3f80
/* f165bb4: 44816000 */ mtc1 $at,$f12
/* f165bb8: 0c005db6 */ jal func00016748
/* f165bb8: 0c005db6 */ jal mtx00016748
/* f165bbc: 00409825 */ or $s3,$v0,$zero
/* f165bc0: 8e4d0284 */ lw $t5,0x284($s2)
/* f165bc4: 8dac1c50 */ lw $t4,0x1c50($t5)
@@ -6276,7 +6276,7 @@ glabel var7f1b1fd4nb
/* f165bdc: 00409825 */ or $s3,$v0,$zero
/* f165be0: 8e580288 */ lw $t8,0x288($s2)
.NB0f165be4:
/* f165be4: 0c005db6 */ jal func00016748
/* f165be4: 0c005db6 */ jal mtx00016748
/* f165be8: c70c0074 */ lwc1 $f12,0x74($t8)
/* f165bec: 8e4a0314 */ lw $t2,0x314($s2)
/* f165bf0: 51400005 */ beqzl $t2,.NB0f165c08
src/game/mplayer/scenarios.c
+3 -4
View File
@@ -29,8 +29,7 @@
#include "lib/snd.h"
#include "lib/memory.h"
#include "lib/rng.h"
#include "lib/lib_159b0.h"
#include "lib/lib_16110.h"
#include "lib/mtx.h"
#include "lib/lib_233c0.h"
#include "lib/lib_24e40.h"
#include "data.h"
@@ -12355,13 +12354,13 @@ glabel func0f187288
/* f187378: 02a02025 */ or $a0,$s5,$zero
/* f18737c: e7a60020 */ swc1 $f6,0x20($sp)
/* f187380: e7a80024 */ swc1 $f8,0x24($sp)
/* f187384: 0c005b56 */ jal func00016d58
/* f187384: 0c005b56 */ jal mtx00016d58
/* f187388: e7a4001c */ swc1 $f4,0x1c($sp)
/* f18738c: 8e420018 */ lw $v0,0x18($s2)
/* f187390: 02a02825 */ or $a1,$s5,$zero
/* f187394: 50400004 */ beqzl $v0,.L0f1873a8
/* f187398: 8fab00f8 */ lw $t3,0xf8($sp)
/* f18739c: 0c0057c1 */ jal func00015f04
/* f18739c: 0c0057c1 */ jal mtx00015f04
/* f1873a0: c44c0014 */ lwc1 $f12,0x14($v0)
/* f1873a4: 8fab00f8 */ lw $t3,0xf8($sp)
.L0f1873a8:
src/game/nbomb.c
+12 -13
View File
@@ -19,8 +19,7 @@
#include "lib/lib_09a80.h"
#include "lib/snd.h"
#include "lib/rng.h"
#include "lib/lib_159b0.h"
#include "lib/lib_16110.h"
#include "lib/mtx.h"
#include "lib/lib_317f0.h"
#include "data.h"
#include "types.h"
@@ -607,18 +606,18 @@ glabel var7f1a7ee8
/* f00742c: e7a000f8 */ swc1 $f0,0xf8($sp)
/* f007430: e7a000fc */ swc1 $f0,0xfc($sp)
/* f007434: 02002025 */ or $a0,$s0,$zero
/* f007438: 0c00566c */ jal func000159b0
/* f007438: 0c00566c */ jal mtx000159b0
/* f00743c: e7a40100 */ swc1 $f4,0x100($sp)
/* f007440: 8fa40154 */ lw $a0,0x154($sp)
/* f007444: 0c0059b7 */ jal func000166dc
/* f007444: 0c0059b7 */ jal mtx000166dc
/* f007448: 02002825 */ or $a1,$s0,$zero
/* f00744c: 0fc2d5be */ jal currentPlayerGetMatrix1740
/* f007450: 00000000 */ nop
/* f007454: 00402025 */ or $a0,$v0,$zero
/* f007458: 0c0056f8 */ jal func00015be0
/* f007458: 0c0056f8 */ jal mtx00015be0
/* f00745c: 02002825 */ or $a1,$s0,$zero
/* f007460: 02002025 */ or $a0,$s0,$zero
/* f007464: 0c005815 */ jal func00016054
/* f007464: 0c005815 */ jal mtx00016054
/* f007468: 02202825 */ or $a1,$s1,$zero
/* f00746c: 8fb00150 */ lw $s0,0x150($sp)
/* f007470: 3c0f0102 */ lui $t7,0x102
@@ -2869,19 +2868,19 @@ Gfx *nbombRender(Gfx *gdl, struct nbomb *nbomb, Gfx *subgdl)
sp3c.y = 0;
sp3c.z = -100;
func000159b0(&sp48);
func000166dc(&nbomb->pos, &sp48);
mtx000159b0(&sp48);
mtx000166dc(&nbomb->pos, &sp48);
sp3c.x = 0;
sp3c.y = nbomb->unk14 / divider * M_TAU;
sp3c.z = 0;
func0001648c(&sp3c, &sp88);
func00015f04(nbomb->radius / 2000.0f, &sp88);
func00015a00(&sp48, &sp88, &spc8);
mtx0001648c(&sp3c, &sp88);
mtx00015f04(nbomb->radius / 2000.0f, &sp88);
mtx00015a00(&sp48, &sp88, &spc8);
func00015be0(currentPlayerGetMatrix1740(), &spc8);
func00016054(&spc8, mtx);
mtx00015be0(currentPlayerGetMatrix1740(), &spc8);
mtx00016054(&spc8, mtx);
gSPMatrix(gdl++, osVirtualToPhysical(mtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
src/game/objectives/objectives.c
+2 -2
View File
@@ -18,7 +18,7 @@
#include "lib/dma.h"
#include "lib/memory.h"
#include "lib/rng.h"
#include "lib/lib_159b0.h"
#include "lib/mtx.h"
#include "data.h"
#include "types.h"
@@ -109,7 +109,7 @@ void tagsAllocatePtrs(void)
u32 a = xorBaffbeff(0xb0000a5c ^ 0xbaffbeff);
u32 b = xorBabeffff(0x1740fff9 ^ 0xbabeffff);
if (func00015fd0() != b) {
if (mtxGetObfuscatedRomBase() != b) {
// Read 4KB from a random ROM location within 128KB from the start of
// the ROM, and write it to a random memory location between 0x80010000
// and 0x80030ff8. This will corrupt instructions in the lib segment.
src/game/prop.c
+7 -8
View File
@@ -31,8 +31,7 @@
#include "lib/model.h"
#include "lib/snd.h"
#include "lib/rng.h"
#include "lib/lib_159b0.h"
#include "lib/lib_16110.h"
#include "lib/mtx.h"
#include "lib/lib_233c0.h"
#include "lib/lib_317f0.h"
#include "data.h"
@@ -696,7 +695,7 @@ struct prop *shotCalculateHits(s32 handnum, bool arg1, struct coord *arg2, struc
}
if (hitbg && shotdata.gset.weaponnum != WEAPON_FARSIGHT) {
func00015b68(currentPlayerGetMatrix1740(), &sp694.unk00, &sp658);
mtx00015b68(currentPlayerGetMatrix1740(), &sp694.unk00, &sp658);
if (shotdata.unk34 > -sp658.z) {
shotdata.unk34 = -sp658.z;
@@ -966,8 +965,8 @@ struct prop *func0f061d54(s32 handnum, u32 arg1, u32 arg2)
sp58.y -= 15 * (random() * (1.0f / U32_MAX));
}
func00015b68(currentPlayerGetUnk174c(), &sp58, &sp40);
func00015b14(currentPlayerGetUnk174c(), &sp64, &sp4c);
mtx00015b68(currentPlayerGetUnk174c(), &sp58, &sp40);
mtx00015b14(currentPlayerGetUnk174c(), &sp64, &sp4c);
shotCalculateHits(handnum, arg1, &sp58, &sp64, &sp40, &sp4c, 0, 4294836224, PLAYERCOUNT() >= 2);
}
@@ -982,8 +981,8 @@ void handCreateBulletRaycast(s32 handnum, bool arg1, bool dorandom, s32 arg3, bo
bgunCalculateShotSpread(&sp38, &sp44, handnum, dorandom);
if (arg3 > 0) {
func00015b68(currentPlayerGetUnk174c(), &sp38, &shootpos);
func00015b14(currentPlayerGetUnk174c(), &sp44, &shootdir);
mtx00015b68(currentPlayerGetUnk174c(), &sp38, &shootpos);
mtx00015b14(currentPlayerGetUnk174c(), &sp44, &shootdir);
shotCalculateHits(handnum, arg1, &sp38, &sp44, &shootpos, &shootdir, 0, 4294836224, arg4);
@@ -1204,7 +1203,7 @@ void handInflictCloseRangeDamage(s32 handnum, struct gset *gset, bool arg2)
if (!chrIsAvoiding(chr)) {
bgunCalculateShotSpread(&spb8, &vector, handnum, true);
skipthething = true;
func00015b10(currentPlayerGetUnk174c(), &vector);
mtx00015b10(currentPlayerGetUnk174c(), &vector);
bgunPlayPropHitSound(gset, prop, -1);
if (chr->model && chrGetShield(chr) > 0) {
src/game/propobj.c
+407 -408
View File
File diff suppressed because it is too large. Load diff
src/game/radar.c
+1 -1
View File
@@ -12,7 +12,7 @@
#include "game/options.h"
#include "bss.h"
#include "lib/lib_09a80.h"
#include "lib/lib_16110.h"
#include "lib/mtx.h"
#include "data.h"
#include "types.h"
src/game/savebuffer.c
+16 -17
View File
@@ -9,8 +9,7 @@
#include "bss.h"
#include "lib/lib_09a80.h"
#include "lib/main.h"
#include "lib/lib_159b0.h"
#include "lib/lib_16110.h"
#include "lib/mtx.h"
#include "data.h"
#include "types.h"
@@ -39,7 +38,7 @@ void func0f0d4690(Mtxf *mtx)
{
struct coord pos;
func000159b0(mtx);
mtx000159b0(mtx);
pos.x = -159.75f;
pos.y = PAL ? 136.25f : 120.25f;
@@ -49,19 +48,19 @@ void func0f0d4690(Mtxf *mtx)
pos.y = (.5f + viGetHeight()) * 0.5f;
pos.z = 0;
func00015dd4(&pos, mtx);
func00015e4c(-1, mtx);
mtx00015dd4(&pos, mtx);
mtx00015e4c(-1, mtx);
if (g_ScaleX == 2) {
func00015df0(2, mtx);
mtx00015df0(2, mtx);
}
}
void func0f0d475c(Mtxf *mtx)
{
func0f0d4690(mtx);
func00015df0(0.1f, mtx);
func00015e4c(0.1f, mtx);
mtx00015df0(0.1f, mtx);
mtx00015e4c(0.1f, mtx);
}
Gfx *func0f0d479c(Gfx *gdl)
@@ -73,18 +72,18 @@ Gfx *func0f0d479c(Gfx *gdl)
mtx1 = gfxAllocateMatrix();
mtx2 = gfxAllocateMatrix();
func00016760();
mtx00016760();
func0f0d475c(&mtx);
func00016054(&mtx, mtx2);
func000159b0(&mtx);
mtx00016054(&mtx, mtx2);
mtx000159b0(&mtx);
guFrustumF(mtx.m,
-(f32) viGetWidth() * 0.5f, viGetWidth() * 0.5f,
-(f32) viGetHeight() * 0.5f, viGetHeight() * 0.5f,
10, 10000, 1);
func00016054(&mtx, mtx1);
func00016784();
mtx00016054(&mtx, mtx1);
mtx00016784();
gSPMatrix(gdl++, osVirtualToPhysical(mtx2), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPMatrix(gdl++, osVirtualToPhysical(mtx1), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION);
@@ -171,7 +170,7 @@ Gfx *func0f0d4a3c(Gfx *gdl, s32 arg1)
gDPSetTexturePersp(gdl++, G_TP_PERSP);
func0f0d4690(&mtx);
func00016054(&mtx, mtxptr);
mtx00016054(&mtx, mtxptr);
gSPMatrix(gdl++, osVirtualToPhysical(mtxptr), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
@@ -184,9 +183,9 @@ Gfx *func0f0d4c80(Gfx *gdl)
Mtxf *mtxptr = gfxAllocateMatrix();
func0f0d4690(&mtx);
func00015df0(0.1f, &mtx);
func00015e4c(0.1f, &mtx);
func00016054(&mtx, mtxptr);
mtx00015df0(0.1f, &mtx);
mtx00015e4c(0.1f, &mtx);
mtx00016054(&mtx, mtxptr);
gSPMatrix(gdl++, osVirtualToPhysical(mtxptr), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
src/game/shards/shards.c
+10 -11
View File
@@ -9,8 +9,7 @@
#include "game/game_0b4950.h"
#include "game/gfxmemory.h"
#include "bss.h"
#include "lib/lib_159b0.h"
#include "lib/lib_16110.h"
#include "lib/mtx.h"
#include "lib/rng.h"
#include "types.h"
@@ -259,13 +258,13 @@ Gfx *shardsRenderWood(Gfx *gdl)
/**
* The following function call is really just this:
*
* func000166a4(&g_Shards[i].pos, &g_Shards[i].rot, &shardmtx);
* mtx000166a4(&g_Shards[i].pos, &g_Shards[i].rot, &shardmtx);
*
* ... but that causes a mismatch, so I'm using a hacky but
* matching alternative. This hack is @dangerous because it
* assumes the offsets of pos and rot in the shard struct.
*/
func000166a4(
mtx000166a4(
(struct coord *)((u8 *)g_Shards + i * sizeof(struct shard) + 0x08),
(struct coord *)((u8 *)g_Shards + i * sizeof(struct shard) + 0x14),
&shardmtx);
@@ -277,7 +276,7 @@ Gfx *shardsRenderWood(Gfx *gdl)
if (shardmtx.m[3][0] < 10000 && shardmtx.m[3][0] > -10000
&& shardmtx.m[3][1] < 10000 && shardmtx.m[3][1] > -10000
&& shardmtx.m[3][2] < 10000 && shardmtx.m[3][2] > -10000) {
func00016054(&shardmtx, mtx);
mtx00016054(&shardmtx, mtx);
gSPMatrix(gdl++, osVirtualToPhysical(mtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
@@ -489,7 +488,7 @@ glabel shardsRenderWood
/* f14c198: 27a600e0 */ addiu $a2,$sp,0xe0
/* f14c19c: 01f41021 */ addu $v0,$t7,$s4
/* f14c1a0: 24440008 */ addiu $a0,$v0,0x8
/* f14c1a4: 0c005d8d */ jal func000166a4
/* f14c1a4: 0c005d8d */ jal mtx000166a4
/* f14c1a8: 24450014 */ addiu $a1,$v0,0x14
/* f14c1ac: 8ee30284 */ lw $v1,0x284($s7)
/* f14c1b0: c7a40110 */ lwc1 $f4,0x110($sp)
@@ -505,7 +504,7 @@ glabel shardsRenderWood
/* f14c1d8: e7b20114 */ swc1 $f18,0x114($sp)
/* f14c1dc: c4660040 */ lwc1 $f6,0x40($v1)
/* f14c1e0: 46062281 */ sub.s $f10,$f4,$f6
/* f14c1e4: 0c005bd1 */ jal func00016054
/* f14c1e4: 0c005bd1 */ jal mtx00016054
/* f14c1e8: e7aa0118 */ swc1 $f10,0x118($sp)
/* f14c1ec: 3c180102 */ lui $t8,0x102
/* f14c1f0: 37180040 */ ori $t8,$t8,0x40
@@ -859,7 +858,7 @@ Gfx *shardsRenderGlass(Gfx *gdl)
/**
* @dangerous: See comment for similar code in shardsRenderWood.
*/
func000166a4(
mtx000166a4(
(struct coord *)((u8 *)g_Shards + i * sizeof(struct shard) + 0x08),
(struct coord *)((u8 *)g_Shards + i * sizeof(struct shard) + 0x14),
&shardmtx);
@@ -871,7 +870,7 @@ Gfx *shardsRenderGlass(Gfx *gdl)
if (shardmtx.m[3][0] < 10000 && shardmtx.m[3][0] > -10000
&& shardmtx.m[3][1] < 10000 && shardmtx.m[3][1] > -10000
&& shardmtx.m[3][2] < 10000 && shardmtx.m[3][2] > -10000) {
func00016054(&shardmtx, mtx);
mtx00016054(&shardmtx, mtx);
gSPMatrix(gdl++, osVirtualToPhysical(mtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
@@ -1127,7 +1126,7 @@ glabel shardsRenderGlass
/* f14c918: 03c03025 */ or $a2,$s8,$zero
/* f14c91c: 03331021 */ addu $v0,$t9,$s3
/* f14c920: 24440008 */ addiu $a0,$v0,0x8
/* f14c924: 0c005d8d */ jal func000166a4
/* f14c924: 0c005d8d */ jal mtx000166a4
/* f14c928: 24450014 */ addiu $a1,$v0,0x14
/* f14c92c: 8ec30284 */ lw $v1,0x284($s6)
/* f14c930: c7a40120 */ lwc1 $f4,0x120($sp)
@@ -1143,7 +1142,7 @@ glabel shardsRenderGlass
/* f14c958: e7b20124 */ swc1 $f18,0x124($sp)
/* f14c95c: c4660040 */ lwc1 $f6,0x40($v1)
/* f14c960: 46062281 */ sub.s $f10,$f4,$f6
/* f14c964: 0c005bd1 */ jal func00016054
/* f14c964: 0c005bd1 */ jal mtx00016054
/* f14c968: e7aa0128 */ swc1 $f10,0x128($sp)
/* f14c96c: 8fb00138 */ lw $s0,0x138($sp)
/* f14c970: 3c0a0102 */ lui $t2,0x102
src/game/sky.c
+4 -5
View File
@@ -8,8 +8,7 @@
#include "lib/lib_09a80.h"
#include "lib/memory.h"
#include "lib/rng.h"
#include "lib/lib_159b0.h"
#include "lib/lib_16110.h"
#include "lib/mtx.h"
#include "data.h"
#include "types.h"
@@ -1024,12 +1023,12 @@ glabel var7f1b57bc
/* f136c88: 00000000 */ nop
/* f136c8c: 27b1016c */ addiu $s1,$sp,0x16c
/* f136c90: 02202025 */ or $a0,$s1,$zero
/* f136c94: 0c00566c */ jal func000159b0
/* f136c94: 0c00566c */ jal mtx000159b0
/* f136c98: e7a00154 */ swc1 $f0,0x154($sp)
/* f136c9c: 0fc2d5be */ jal currentPlayerGetMatrix1740
/* f136ca0: 00000000 */ nop
/* f136ca4: 00402025 */ or $a0,$v0,$zero
/* f136ca8: 0c0056f8 */ jal func00015be0
/* f136ca8: 0c0056f8 */ jal mtx00015be0
/* f136cac: 02202825 */ or $a1,$s1,$zero
/* f136cb0: 44800000 */ mtc1 $zero,$f0
/* f136cb4: 3c017f1b */ lui $at,%hi(var7f1b57bc)
@@ -1037,7 +1036,7 @@ glabel var7f1b57bc
/* f136cbc: 02202825 */ or $a1,$s1,$zero
/* f136cc0: e7a0019c */ swc1 $f0,0x19c($sp)
/* f136cc4: e7a001a0 */ swc1 $f0,0x1a0($sp)
/* f136cc8: 0c0057e2 */ jal func00015f88
/* f136cc8: 0c0057e2 */ jal mtx00015f88
/* f136ccc: e7a001a4 */ swc1 $f0,0x1a4($sp)
/* f136cd0: 8e630284 */ lw $v1,0x284($s3)
/* f136cd4: c7b20170 */ lwc1 $f18,0x170($sp)
src/game/smoke/smoke.c
+1 -1
View File
@@ -11,7 +11,7 @@
#include "game/propobj.h"
#include "bss.h"
#include "lib/rng.h"
#include "lib/lib_16110.h"
#include "lib/mtx.h"
#include "data.h"
#include "types.h"
src/game/sparks/sparks.c
+5 -5
View File
@@ -8,7 +8,7 @@
#include "bss.h"
#include "lib/lib_09a80.h"
#include "lib/rng.h"
#include "lib/lib_159b0.h"
#include "lib/mtx.h"
#include "data.h"
#include "types.h"
@@ -1631,25 +1631,25 @@ glabel sparksRender
/* f130a24: 27a400d4 */ addiu $a0,$sp,0xd4
/* f130a28: 46040283 */ div.s $f10,$f0,$f4
/* f130a2c: 460ab582 */ mul.s $f22,$f22,$f10
/* f130a30: 0c00566c */ jal func000159b0
/* f130a30: 0c00566c */ jal mtx000159b0
/* f130a34: 00000000 */ nop
/* f130a38: e7bc00d4 */ swc1 $f28,0xd4($sp)
/* f130a3c: e7bc00e8 */ swc1 $f28,0xe8($sp)
/* f130a40: e7bc00fc */ swc1 $f28,0xfc($sp)
/* f130a44: e7bc0110 */ swc1 $f28,0x110($sp)
/* f130a48: 02a02025 */ or $a0,$s5,$zero
/* f130a4c: 0c005775 */ jal func00015dd4
/* f130a4c: 0c005775 */ jal mtx00015dd4
/* f130a50: 27a500d4 */ addiu $a1,$sp,0xd4
/* f130a54: 0fc2d5be */ jal currentPlayerGetMatrix1740
/* f130a58: 00000000 */ nop
/* f130a5c: 00402025 */ or $a0,$v0,$zero
/* f130a60: 0c0056f8 */ jal func00015be0
/* f130a60: 0c0056f8 */ jal mtx00015be0
/* f130a64: 27a500d4 */ addiu $a1,$sp,0xd4
/* f130a68: 0fc59e66 */ jal gfxAllocateMatrix
/* f130a6c: 00000000 */ nop
/* f130a70: 00408825 */ or $s1,$v0,$zero
/* f130a74: 27a400d4 */ addiu $a0,$sp,0xd4
/* f130a78: 0c005815 */ jal func00016054
/* f130a78: 0c005815 */ jal mtx00016054
/* f130a7c: 00402825 */ or $a1,$v0,$zero
/* f130a80: 8fb00170 */ lw $s0,0x170($sp)
/* f130a84: 3c0d0102 */ lui $t5,0x102
src/game/splat.c
+4 -5
View File
@@ -9,8 +9,7 @@
#include "bss.h"
#include "lib/model.h"
#include "lib/rng.h"
#include "lib/lib_159b0.h"
#include "lib/lib_16110.h"
#include "lib/mtx.h"
#include "data.h"
#include "types.h"
@@ -165,9 +164,9 @@ s32 func0f148f18(s32 qty, f32 arg1, struct prop *prop, struct splat *arg3, struc
spe4[j] = (rand * var8007f8a8 + rand * var8007f8a8 - var8007f8a8) * 0.017453292384744f;
}
func0001648c((struct coord *)spe4, &spa4);
func00015b14(&spa4, (struct coord *)spfc, &splat->unk028);
func00015b14(&spa4, (struct coord *)spf0, &splat->unk00c);
mtx0001648c((struct coord *)spe4, &spa4);
mtx00015b14(&spa4, (struct coord *)spfc, &splat->unk028);
mtx00015b14(&spa4, (struct coord *)spf0, &splat->unk00c);
func0f177164(&splat->unk028, &splat->unk028, 403, "splat.c");
func0f177164(&splat->unk00c, &splat->unk00c, 404, "splat.c");
src/game/title.c
+56 -57
View File
@@ -23,8 +23,7 @@
#include "lib/main.h"
#include "lib/model.h"
#include "lib/snd.h"
#include "lib/lib_159b0.h"
#include "lib/lib_16110.h"
#include "lib/mtx.h"
#include "lib/lib_317f0.h"
#include "data.h"
#include "types.h"
@@ -2350,7 +2349,7 @@ glabel func0f017248
/* f0178a0: 01e02025 */ or $a0,$t7,$zero
/* f0178a4: afa20120 */ sw $v0,0x120($sp)
/* f0178a8: 02002025 */ or $a0,$s0,$zero
/* f0178ac: 0c005746 */ jal func00015d18
/* f0178ac: 0c005746 */ jal mtx00015d18
/* f0178b0: 00402825 */ or $a1,$v0,$zero
/* f0178b4: 8fb80120 */ lw $t8,0x120($sp)
/* f0178b8: 02e02025 */ or $a0,$s7,$zero
@@ -2375,12 +2374,12 @@ glabel func0f017248
/* f017904: 8eef000c */ lw $t7,0xc($s7)
.L0f017908:
/* f017908: 02202825 */ or $a1,$s1,$zero
/* f01790c: 0c005746 */ jal func00015d18
/* f01790c: 0c005746 */ jal mtx00015d18
/* f017910: 01f02021 */ addu $a0,$t7,$s0
/* f017914: 8ef8000c */ lw $t8,0xc($s7)
/* f017918: 00145980 */ sll $t3,$s4,0x6
/* f01791c: 02202025 */ or $a0,$s1,$zero
/* f017920: 0c005815 */ jal func00016054
/* f017920: 0c005815 */ jal mtx00016054
/* f017924: 030b2821 */ addu $a1,$t8,$t3
/* f017928: 8eec0008 */ lw $t4,0x8($s7)
/* f01792c: 26940001 */ addiu $s4,$s4,0x1
@@ -3244,7 +3243,7 @@ glabel var7f1a8468
/* f01868c: a02f225a */ sb $t7,0x225a($at)
/* f018690: 3c013f80 */ lui $at,0x3f80
/* f018694: 44812000 */ mtc1 $at,$f4
/* f018698: 0c005a1d */ jal func00016ae4
/* f018698: 0c005a1d */ jal mtx00016ae4
/* f01869c: e7a40020 */ swc1 $f4,0x20($sp)
/* f0186a0: 3c0e8006 */ lui $t6,0x8006
/* f0186a4: 8dce2490 */ lw $t6,0x2490($t6)
@@ -3261,22 +3260,22 @@ glabel var7f1a8468
/* f0186cc: afb9022c */ sw $t9,0x22c($sp)
.PF0f0186d0:
/* f0186d0: 3c018006 */ lui $at,0x8006
/* f0186d4: 0c005841 */ jal func00016374
/* f0186d4: 0c005841 */ jal mtx00016374
/* f0186d8: c42c2478 */ lwc1 $f12,0x2478($at)
/* f0186dc: 3c018006 */ lui $at,0x8006
/* f0186e0: c42c2480 */ lwc1 $f12,0x2480($at)
/* f0186e4: 0c00581e */ jal func000162e8
/* f0186e4: 0c00581e */ jal mtx000162e8
/* f0186e8: 27a501a8 */ addiu $a1,$sp,0x1a8
/* f0186ec: 27a401a8 */ addiu $a0,$sp,0x1a8
/* f0186f0: 0c0055e3 */ jal func000159fc
/* f0186f0: 0c0055e3 */ jal mtx000159fc
/* f0186f4: 27a501e8 */ addiu $a1,$sp,0x1e8
/* f0186f8: 27a402b0 */ addiu $a0,$sp,0x2b0
/* f0186fc: 27a501e8 */ addiu $a1,$sp,0x1e8
/* f018700: 0c0055e4 */ jal func00015a00
/* f018700: 0c0055e4 */ jal mtx00015a00
/* f018704: 27a60270 */ addiu $a2,$sp,0x270
/* f018708: 3c018006 */ lui $at,0x8006
/* f01870c: c42c2488 */ lwc1 $f12,0x2488($at)
/* f018710: 0c005725 */ jal func00015f04
/* f018710: 0c005725 */ jal mtx00015f04
/* f018714: 27a50270 */ addiu $a1,$sp,0x270
/* f018718: 3c01437f */ lui $at,0x437f
/* f01871c: 44814000 */ mtc1 $at,$f8
@@ -3610,21 +3609,21 @@ glabel var7f1a8468
/* f018c14: 8f2e0004 */ lw $t6,0x4($t9)
/* f018c18: ac8e0004 */ sw $t6,0x4($a0)
/* f018c1c: 8f210008 */ lw $at,0x8($t9)
/* f018c20: 0c00591b */ jal func000166dc
/* f018c20: 0c00591b */ jal mtx000166dc
/* f018c24: ac810008 */ sw $at,0x8($a0)
/* f018c28: 3c013f80 */ lui $at,0x3f80
/* f018c2c: 44814000 */ mtc1 $at,$f8
/* f018c30: c7aa013c */ lwc1 $f10,0x13c($sp)
/* f018c34: 27a501e8 */ addiu $a1,$sp,0x1e8
/* f018c38: 0c005746 */ jal func00015f88
/* f018c38: 0c005746 */ jal mtx00015f88
/* f018c3c: 460a4300 */ add.s $f12,$f8,$f10
/* f018c40: 27a402b0 */ addiu $a0,$sp,0x2b0
/* f018c44: 27a501e8 */ addiu $a1,$sp,0x1e8
/* f018c48: 0c0055e4 */ jal func00015a00
/* f018c48: 0c0055e4 */ jal mtx00015a00
/* f018c4c: 27a60230 */ addiu $a2,$sp,0x230
/* f018c50: 3c017f1b */ lui $at,0x7f1b
/* f018c54: c42c9678 */ lwc1 $f12,-0x6988($at)
/* f018c58: 0c005725 */ jal func00015f04
/* f018c58: 0c005725 */ jal mtx00015f04
/* f018c5c: 27a50230 */ addiu $a1,$sp,0x230
/* f018c60: 3c028006 */ lui $v0,0x8006
/* f018c64: 8c4224c8 */ lw $v0,0x24c8($v0)
@@ -4575,7 +4574,7 @@ glabel var7f1a8468
/* f0185a8: a039258a */ sb $t9,%lo(var80062588+0x2)($at)
/* f0185ac: 3c013f80 */ lui $at,0x3f80
/* f0185b0: 44812000 */ mtc1 $at,$f4
/* f0185b4: 0c005ab9 */ jal func00016ae4
/* f0185b4: 0c005ab9 */ jal mtx00016ae4
/* f0185b8: e7a40020 */ swc1 $f4,0x20($sp)
/* f0185bc: 3c0f8006 */ lui $t7,%hi(var800627c0)
/* f0185c0: 8def27c0 */ lw $t7,%lo(var800627c0)($t7)
@@ -4592,22 +4591,22 @@ glabel var7f1a8468
/* f0185e8: afb8022c */ sw $t8,0x22c($sp)
.L0f0185ec:
/* f0185ec: 3c018006 */ lui $at,%hi(var800627a8)
/* f0185f0: 0c0058dd */ jal func00016374
/* f0185f0: 0c0058dd */ jal mtx00016374
/* f0185f4: c42c27a8 */ lwc1 $f12,%lo(var800627a8)($at)
/* f0185f8: 3c018006 */ lui $at,%hi(var800627b0)
/* f0185fc: c42c27b0 */ lwc1 $f12,%lo(var800627b0)($at)
/* f018600: 0c0058ba */ jal func000162e8
/* f018600: 0c0058ba */ jal mtx000162e8
/* f018604: 27a501a8 */ addiu $a1,$sp,0x1a8
/* f018608: 27a401a8 */ addiu $a0,$sp,0x1a8
/* f01860c: 0c00567f */ jal func000159fc
/* f01860c: 0c00567f */ jal mtx000159fc
/* f018610: 27a501e8 */ addiu $a1,$sp,0x1e8
/* f018614: 27a402b0 */ addiu $a0,$sp,0x2b0
/* f018618: 27a501e8 */ addiu $a1,$sp,0x1e8
/* f01861c: 0c005680 */ jal func00015a00
/* f01861c: 0c005680 */ jal mtx00015a00
/* f018620: 27a60270 */ addiu $a2,$sp,0x270
/* f018624: 3c018006 */ lui $at,%hi(var800627b8)
/* f018628: c42c27b8 */ lwc1 $f12,%lo(var800627b8)($at)
/* f01862c: 0c0057c1 */ jal func00015f04
/* f01862c: 0c0057c1 */ jal mtx00015f04
/* f018630: 27a50270 */ addiu $a1,$sp,0x270
/* f018634: 3c01437f */ lui $at,0x437f
/* f018638: 44813000 */ mtc1 $at,$f6
@@ -4941,21 +4940,21 @@ glabel var7f1a8468
/* f018b30: 8f0f0004 */ lw $t7,0x4($t8)
/* f018b34: ac8f0004 */ sw $t7,0x4($a0)
/* f018b38: 8f010008 */ lw $at,0x8($t8)
/* f018b3c: 0c0059b7 */ jal func000166dc
/* f018b3c: 0c0059b7 */ jal mtx000166dc
/* f018b40: ac810008 */ sw $at,0x8($a0)
/* f018b44: 3c013f80 */ lui $at,0x3f80
/* f018b48: 44813000 */ mtc1 $at,$f6
/* f018b4c: c7a8013c */ lwc1 $f8,0x13c($sp)
/* f018b50: 27a501e8 */ addiu $a1,$sp,0x1e8
/* f018b54: 0c0057e2 */ jal func00015f88
/* f018b54: 0c0057e2 */ jal mtx00015f88
/* f018b58: 46083300 */ add.s $f12,$f6,$f8
/* f018b5c: 27a402b0 */ addiu $a0,$sp,0x2b0
/* f018b60: 27a501e8 */ addiu $a1,$sp,0x1e8
/* f018b64: 0c005680 */ jal func00015a00
/* f018b64: 0c005680 */ jal mtx00015a00
/* f018b68: 27a60230 */ addiu $a2,$sp,0x230
/* f018b6c: 3c017f1b */ lui $at,%hi(var7f1a8468)
/* f018b70: c42c8468 */ lwc1 $f12,%lo(var7f1a8468)($at)
/* f018b74: 0c0057c1 */ jal func00015f04
/* f018b74: 0c0057c1 */ jal mtx00015f04
/* f018b78: 27a50230 */ addiu $a1,$sp,0x230
/* f018b7c: 3c028006 */ lui $v0,%hi(var800627f8)
/* f018b80: 8c4227f8 */ lw $v0,%lo(var800627f8)($v0)
@@ -5619,7 +5618,7 @@ glabel var7f1a84a0
/* f0198fc: 46083280 */ add.s $f10,$f6,$f8
/* f019900: e7a200a4 */ swc1 $f2,0xa4($sp)
/* f019904: 46105482 */ mul.s $f18,$f10,$f16
/* f019908: 0c005923 */ jal func0001648c
/* f019908: 0c005923 */ jal mtx0001648c
/* f01990c: e7b200a0 */ swc1 $f18,0xa0($sp)
/* f019910: 3c017f1b */ lui $at,%hi(var7f1a84a0)
/* f019914: c42484a0 */ lwc1 $f4,%lo(var7f1a84a0)($at)
@@ -5627,7 +5626,7 @@ glabel var7f1a84a0
/* f01991c: 44814000 */ mtc1 $at,$f8
/* f019920: 4604a182 */ mul.s $f6,$f20,$f4
/* f019924: 02202825 */ or $a1,$s1,$zero
/* f019928: 0c0057e2 */ jal func00015f88
/* f019928: 0c0057e2 */ jal mtx00015f88
/* f01992c: 46083300 */ add.s $f12,$f6,$f8
/* f019930: 44801000 */ mtc1 $zero,$f2
/* f019934: 3c013f80 */ lui $at,0x3f80
@@ -5642,13 +5641,13 @@ glabel var7f1a84a0
/* f019958: e7a20018 */ swc1 $f2,0x18($sp)
/* f01995c: e7a2001c */ swc1 $f2,0x1c($sp)
/* f019960: e7a20024 */ swc1 $f2,0x24($sp)
/* f019964: 0c005ab9 */ jal func00016ae4
/* f019964: 0c005ab9 */ jal mtx00016ae4
/* f019968: e7aa0020 */ swc1 $f10,0x20($sp)
/* f01996c: 02002025 */ or $a0,$s0,$zero
/* f019970: 0c00567f */ jal func000159fc
/* f019970: 0c00567f */ jal mtx000159fc
/* f019974: 02202825 */ or $a1,$s1,$zero
/* f019978: 02202025 */ or $a0,$s1,$zero
/* f01997c: 0c005746 */ jal func00015d18
/* f01997c: 0c005746 */ jal mtx00015d18
/* f019980: 02002825 */ or $a1,$s0,$zero
/* f019984: 3c138006 */ lui $s3,%hi(g_TitleModel)
/* f019988: 267324f8 */ addiu $s3,$s3,%lo(g_TitleModel)
@@ -5661,7 +5660,7 @@ glabel var7f1a84a0
/* f0199a4: 03002025 */ or $a0,$t8,$zero
/* f0199a8: afa20160 */ sw $v0,0x160($sp)
/* f0199ac: 02002025 */ or $a0,$s0,$zero
/* f0199b0: 0c005746 */ jal func00015d18
/* f0199b0: 0c005746 */ jal mtx00015d18
/* f0199b4: 00402825 */ or $a1,$v0,$zero
/* f0199b8: 8faf0160 */ lw $t7,0x160($sp)
/* f0199bc: 8e790000 */ lw $t9,0x0($s3)
@@ -5689,13 +5688,13 @@ glabel var7f1a84a0
/* f019a14: 8c4a000c */ lw $t2,0xc($v0)
.L0f019a18:
/* f019a18: 02402825 */ or $a1,$s2,$zero
/* f019a1c: 0c005746 */ jal func00015d18
/* f019a1c: 0c005746 */ jal mtx00015d18
/* f019a20: 01512021 */ addu $a0,$t2,$s1
/* f019a24: 8e6d0000 */ lw $t5,0x0($s3)
/* f019a28: 00107980 */ sll $t7,$s0,0x6
/* f019a2c: 02402025 */ or $a0,$s2,$zero
/* f019a30: 8db8000c */ lw $t8,0xc($t5)
/* f019a34: 0c005815 */ jal func00016054
/* f019a34: 0c005815 */ jal mtx00016054
/* f019a38: 030f2821 */ addu $a1,$t8,$t7
/* f019a3c: 8e620000 */ lw $v0,0x0($s3)
/* f019a40: 26100001 */ addiu $s0,$s0,0x1
@@ -5919,7 +5918,7 @@ glabel var7f1a84a0
/* f0198fc: 46083280 */ add.s $f10,$f6,$f8
/* f019900: e7a200a4 */ swc1 $f2,0xa4($sp)
/* f019904: 46105482 */ mul.s $f18,$f10,$f16
/* f019908: 0c005923 */ jal func0001648c
/* f019908: 0c005923 */ jal mtx0001648c
/* f01990c: e7b200a0 */ swc1 $f18,0xa0($sp)
/* f019910: 3c017f1b */ lui $at,%hi(var7f1a84a0)
/* f019914: c42484a0 */ lwc1 $f4,%lo(var7f1a84a0)($at)
@@ -5927,7 +5926,7 @@ glabel var7f1a84a0
/* f01991c: 44814000 */ mtc1 $at,$f8
/* f019920: 4604a182 */ mul.s $f6,$f20,$f4
/* f019924: 02202825 */ or $a1,$s1,$zero
/* f019928: 0c0057e2 */ jal func00015f88
/* f019928: 0c0057e2 */ jal mtx00015f88
/* f01992c: 46083300 */ add.s $f12,$f6,$f8
/* f019930: 44801000 */ mtc1 $zero,$f2
/* f019934: 3c013f80 */ lui $at,0x3f80
@@ -5942,13 +5941,13 @@ glabel var7f1a84a0
/* f019958: e7a20018 */ swc1 $f2,0x18($sp)
/* f01995c: e7a2001c */ swc1 $f2,0x1c($sp)
/* f019960: e7a20024 */ swc1 $f2,0x24($sp)
/* f019964: 0c005ab9 */ jal func00016ae4
/* f019964: 0c005ab9 */ jal mtx00016ae4
/* f019968: e7aa0020 */ swc1 $f10,0x20($sp)
/* f01996c: 02002025 */ or $a0,$s0,$zero
/* f019970: 0c00567f */ jal func000159fc
/* f019970: 0c00567f */ jal mtx000159fc
/* f019974: 02202825 */ or $a1,$s1,$zero
/* f019978: 02202025 */ or $a0,$s1,$zero
/* f01997c: 0c005746 */ jal func00015d18
/* f01997c: 0c005746 */ jal mtx00015d18
/* f019980: 02002825 */ or $a1,$s0,$zero
/* f019984: 3c138006 */ lui $s3,%hi(g_TitleModel)
/* f019988: 267324f8 */ addiu $s3,$s3,%lo(g_TitleModel)
@@ -5961,7 +5960,7 @@ glabel var7f1a84a0
/* f0199a4: 03002025 */ or $a0,$t8,$zero
/* f0199a8: afa20160 */ sw $v0,0x160($sp)
/* f0199ac: 02002025 */ or $a0,$s0,$zero
/* f0199b0: 0c005746 */ jal func00015d18
/* f0199b0: 0c005746 */ jal mtx00015d18
/* f0199b4: 00402825 */ or $a1,$v0,$zero
/* f0199b8: 8faf0160 */ lw $t7,0x160($sp)
/* f0199bc: 8e790000 */ lw $t9,0x0($s3)
@@ -5989,13 +5988,13 @@ glabel var7f1a84a0
/* f019a14: 8c4a000c */ lw $t2,0xc($v0)
.L0f019a18:
/* f019a18: 02402825 */ or $a1,$s2,$zero
/* f019a1c: 0c005746 */ jal func00015d18
/* f019a1c: 0c005746 */ jal mtx00015d18
/* f019a20: 01512021 */ addu $a0,$t2,$s1
/* f019a24: 8e6d0000 */ lw $t5,0x0($s3)
/* f019a28: 00107980 */ sll $t7,$s0,0x6
/* f019a2c: 02402025 */ or $a0,$s2,$zero
/* f019a30: 8db8000c */ lw $t8,0xc($t5)
/* f019a34: 0c005815 */ jal func00016054
/* f019a34: 0c005815 */ jal mtx00016054
/* f019a38: 030f2821 */ addu $a1,$t8,$t7
/* f019a3c: 8e620000 */ lw $v0,0x0($s3)
/* f019a40: 26100001 */ addiu $s0,$s0,0x1
@@ -6336,7 +6335,7 @@ glabel var7f1a84bc
/* f01a024: 3c017f1b */ lui $at,%hi(var7f1a84bc)
/* f01a028: c43084bc */ lwc1 $f16,%lo(var7f1a84bc)($at)
/* f01a02c: 46088182 */ mul.s $f6,$f16,$f8
/* f01a030: 0c005923 */ jal func0001648c
/* f01a030: 0c005923 */ jal mtx0001648c
/* f01a034: e7a600b8 */ swc1 $f6,0xb8($sp)
/* f01a038: 3c013e80 */ lui $at,0x3e80
/* f01a03c: 44819000 */ mtc1 $at,$f18
@@ -6345,7 +6344,7 @@ glabel var7f1a84bc
/* f01a048: 44818000 */ mtc1 $at,$f16
/* f01a04c: 46125102 */ mul.s $f4,$f10,$f18
/* f01a050: 02202825 */ or $a1,$s1,$zero
/* f01a054: 0c0057e2 */ jal func00015f88
/* f01a054: 0c0057e2 */ jal mtx00015f88
/* f01a058: 46102300 */ add.s $f12,$f4,$f16
/* f01a05c: 44800000 */ mtc1 $zero,$f0
/* f01a060: 3c013f80 */ lui $at,0x3f80
@@ -6360,13 +6359,13 @@ glabel var7f1a84bc
/* f01a084: e7a00018 */ swc1 $f0,0x18($sp)
/* f01a088: e7a0001c */ swc1 $f0,0x1c($sp)
/* f01a08c: e7a00024 */ swc1 $f0,0x24($sp)
/* f01a090: 0c005ab9 */ jal func00016ae4
/* f01a090: 0c005ab9 */ jal mtx00016ae4
/* f01a094: e7a80020 */ swc1 $f8,0x20($sp)
/* f01a098: 02002025 */ or $a0,$s0,$zero
/* f01a09c: 0c00567f */ jal func000159fc
/* f01a09c: 0c00567f */ jal mtx000159fc
/* f01a0a0: 02202825 */ or $a1,$s1,$zero
/* f01a0a4: 02202025 */ or $a0,$s1,$zero
/* f01a0a8: 0c005746 */ jal func00015d18
/* f01a0a8: 0c005746 */ jal mtx00015d18
/* f01a0ac: 02002825 */ or $a1,$s0,$zero
/* f01a0b0: 3c138006 */ lui $s3,%hi(g_TitleModel)
/* f01a0b4: 267324f8 */ addiu $s3,$s3,%lo(g_TitleModel)
@@ -6379,7 +6378,7 @@ glabel var7f1a84bc
/* f01a0d0: 01802025 */ or $a0,$t4,$zero
/* f01a0d4: afa20170 */ sw $v0,0x170($sp)
/* f01a0d8: 02002025 */ or $a0,$s0,$zero
/* f01a0dc: 0c005746 */ jal func00015d18
/* f01a0dc: 0c005746 */ jal mtx00015d18
/* f01a0e0: 00402825 */ or $a1,$v0,$zero
/* f01a0e4: 8fab0170 */ lw $t3,0x170($sp)
/* f01a0e8: 8e6d0000 */ lw $t5,0x0($s3)
@@ -6516,13 +6515,13 @@ glabel var7f1a84bc
/* f01a2dc: 8c4d000c */ lw $t5,0xc($v0)
.L0f01a2e0:
/* f01a2e0: 02402825 */ or $a1,$s2,$zero
/* f01a2e4: 0c005746 */ jal func00015d18
/* f01a2e4: 0c005746 */ jal mtx00015d18
/* f01a2e8: 01b12021 */ addu $a0,$t5,$s1
/* f01a2ec: 8e790000 */ lw $t9,0x0($s3)
/* f01a2f0: 00104180 */ sll $t0,$s0,0x6
/* f01a2f4: 02402025 */ or $a0,$s2,$zero
/* f01a2f8: 8f38000c */ lw $t8,0xc($t9)
/* f01a2fc: 0c005815 */ jal func00016054
/* f01a2fc: 0c005815 */ jal mtx00016054
/* f01a300: 03082821 */ addu $a1,$t8,$t0
/* f01a304: 8e620000 */ lw $v0,0x0($s3)
/* f01a308: 26100001 */ addiu $s0,$s0,0x1
@@ -6754,7 +6753,7 @@ glabel var7f1a84bc
/* f01a024: 3c017f1b */ lui $at,%hi(var7f1a84bc)
/* f01a028: c43084bc */ lwc1 $f16,%lo(var7f1a84bc)($at)
/* f01a02c: 46088182 */ mul.s $f6,$f16,$f8
/* f01a030: 0c005923 */ jal func0001648c
/* f01a030: 0c005923 */ jal mtx0001648c
/* f01a034: e7a600b8 */ swc1 $f6,0xb8($sp)
/* f01a038: 3c013e80 */ lui $at,0x3e80
/* f01a03c: 44819000 */ mtc1 $at,$f18
@@ -6763,7 +6762,7 @@ glabel var7f1a84bc
/* f01a048: 44818000 */ mtc1 $at,$f16
/* f01a04c: 46125102 */ mul.s $f4,$f10,$f18
/* f01a050: 02202825 */ or $a1,$s1,$zero
/* f01a054: 0c0057e2 */ jal func00015f88
/* f01a054: 0c0057e2 */ jal mtx00015f88
/* f01a058: 46102300 */ add.s $f12,$f4,$f16
/* f01a05c: 44800000 */ mtc1 $zero,$f0
/* f01a060: 3c013f80 */ lui $at,0x3f80
@@ -6778,13 +6777,13 @@ glabel var7f1a84bc
/* f01a084: e7a00018 */ swc1 $f0,0x18($sp)
/* f01a088: e7a0001c */ swc1 $f0,0x1c($sp)
/* f01a08c: e7a00024 */ swc1 $f0,0x24($sp)
/* f01a090: 0c005ab9 */ jal func00016ae4
/* f01a090: 0c005ab9 */ jal mtx00016ae4
/* f01a094: e7a80020 */ swc1 $f8,0x20($sp)
/* f01a098: 02002025 */ or $a0,$s0,$zero
/* f01a09c: 0c00567f */ jal func000159fc
/* f01a09c: 0c00567f */ jal mtx000159fc
/* f01a0a0: 02202825 */ or $a1,$s1,$zero
/* f01a0a4: 02202025 */ or $a0,$s1,$zero
/* f01a0a8: 0c005746 */ jal func00015d18
/* f01a0a8: 0c005746 */ jal mtx00015d18
/* f01a0ac: 02002825 */ or $a1,$s0,$zero
/* f01a0b0: 3c138006 */ lui $s3,%hi(g_TitleModel)
/* f01a0b4: 267324f8 */ addiu $s3,$s3,%lo(g_TitleModel)
@@ -6797,7 +6796,7 @@ glabel var7f1a84bc
/* f01a0d0: 01802025 */ or $a0,$t4,$zero
/* f01a0d4: afa20170 */ sw $v0,0x170($sp)
/* f01a0d8: 02002025 */ or $a0,$s0,$zero
/* f01a0dc: 0c005746 */ jal func00015d18
/* f01a0dc: 0c005746 */ jal mtx00015d18
/* f01a0e0: 00402825 */ or $a1,$v0,$zero
/* f01a0e4: 8fab0170 */ lw $t3,0x170($sp)
/* f01a0e8: 8e6d0000 */ lw $t5,0x0($s3)
@@ -6934,13 +6933,13 @@ glabel var7f1a84bc
/* f01a2dc: 8c4d000c */ lw $t5,0xc($v0)
.L0f01a2e0:
/* f01a2e0: 02402825 */ or $a1,$s2,$zero
/* f01a2e4: 0c005746 */ jal func00015d18
/* f01a2e4: 0c005746 */ jal mtx00015d18
/* f01a2e8: 01b12021 */ addu $a0,$t5,$s1
/* f01a2ec: 8e790000 */ lw $t9,0x0($s3)
/* f01a2f0: 00104180 */ sll $t0,$s0,0x6
/* f01a2f4: 02402025 */ or $a0,$s2,$zero
/* f01a2f8: 8f38000c */ lw $t8,0xc($t9)
/* f01a2fc: 0c005815 */ jal func00016054
/* f01a2fc: 0c005815 */ jal mtx00016054
/* f01a300: 03082821 */ addu $a1,$t8,$t0
/* f01a304: 8e620000 */ lw $v0,0x0($s3)
/* f01a308: 26100001 */ addiu $s0,$s0,0x1
src/game/training/training.c
+27 -28
View File
@@ -31,8 +31,7 @@
#include "lib/snd.h"
#include "lib/memory.h"
#include "lib/rng.h"
#include "lib/lib_159b0.h"
#include "lib/lib_16110.h"
#include "lib/mtx.h"
#include "data.h"
#include "types.h"
@@ -2128,15 +2127,15 @@ void frInitTargets(void)
}
if (g_FrData.targets[i].flags & FRTARGETFLAG_SPAWNFACINGAWAY) {
func00016374(0.0f, &sp144);
mtx00016374(0.0f, &sp144);
g_FrData.targets[i].angle = M_PI;
} else {
func00016374(M_PI, &sp144);
mtx00016374(M_PI, &sp144);
}
func00015f04(obj->model->scale, &sp144);
func00015da0(&sp144, sp108);
func00015cd8(sp108, obj->realrot);
mtx00015f04(obj->model->scale, &sp144);
mtx00015da0(&sp144, sp108);
mtx00015cd8(sp108, obj->realrot);
prop->pos.x = pospad.pos.x;
prop->pos.y = pospad.pos.y;
@@ -2283,23 +2282,23 @@ glabel var7f1b3a44
/* f19863c: 11a00006 */ beqz $t5,.NB0f198658
/* f198640: 00000000 */ sll $zero,$zero,0x0
/* f198644: 4600a306 */ mov.s $f12,$f20
/* f198648: 0c005cc1 */ jal func00016374
/* f198648: 0c005cc1 */ jal mtx00016374
/* f19864c: 02802825 */ or $a1,$s4,$zero
/* f198650: 10000003 */ beqz $zero,.NB0f198660
/* f198654: e6160038 */ swc1 $f22,0x38($s0)
.NB0f198658:
/* f198658: 0c005cc1 */ jal func00016374
/* f198658: 0c005cc1 */ jal mtx00016374
/* f19865c: 4600b306 */ mov.s $f12,$f22
.NB0f198660:
/* f198660: 8e2e0018 */ lw $t6,0x18($s1)
/* f198664: 02802825 */ or $a1,$s4,$zero
/* f198668: 0c005b7d */ jal func00015f04
/* f198668: 0c005b7d */ jal mtx00015f04
/* f19866c: c5cc0014 */ lwc1 $f12,0x14($t6)
/* f198670: 02802025 */ or $a0,$s4,$zero
/* f198674: 0c005b24 */ jal func00015da0
/* f198674: 0c005b24 */ jal mtx00015da0
/* f198678: 27a50064 */ addiu $a1,$sp,0x64
/* f19867c: 27a40064 */ addiu $a0,$sp,0x64
/* f198680: 0c005af2 */ jal func00015cd8
/* f198680: 0c005af2 */ jal mtx00015cd8
/* f198684: 2625001c */ addiu $a1,$s1,0x1c
/* f198688: c7a600c8 */ lwc1 $f6,0xc8($sp)
/* f19868c: 02202025 */ or $a0,$s1,$zero
@@ -4049,17 +4048,17 @@ glabel var7f1b94e4
.PF0f1a1904:
/* f1a1904: c426ab44 */ lwc1 $f6,-0x54bc($at)
/* f1a1908: 02802825 */ move $a1,$s4
/* f1a190c: 0c005841 */ jal func00016374
/* f1a190c: 0c005841 */ jal mtx00016374
/* f1a1910: 46060300 */ add.s $f12,$f0,$f6
/* f1a1914: 8e6c0018 */ lw $t4,0x18($s3)
/* f1a1918: 02802825 */ move $a1,$s4
/* f1a191c: 0c005725 */ jal func00015f04
/* f1a191c: 0c005725 */ jal mtx00015f04
/* f1a1920: c58c0014 */ lwc1 $f12,0x14($t4)
/* f1a1924: 02802025 */ move $a0,$s4
/* f1a1928: 0c0056cc */ jal func00015da0
/* f1a1928: 0c0056cc */ jal mtx00015da0
/* f1a192c: 02a02825 */ move $a1,$s5
/* f1a1930: 02a02025 */ move $a0,$s5
/* f1a1934: 0c00569a */ jal func00015cd8
/* f1a1934: 0c00569a */ jal mtx00015cd8
/* f1a1938: 2665001c */ addiu $a1,$s3,0x1c
/* f1a193c: 8e020010 */ lw $v0,0x10($s0)
.PF0f1a1940:
@@ -5160,17 +5159,17 @@ glabel var7f1b94e4
.L0f1a081c:
/* f1a081c: c43294e4 */ lwc1 $f18,%lo(var7f1b94e4)($at)
/* f1a0820: 02802825 */ or $a1,$s4,$zero
/* f1a0824: 0c0058dd */ jal func00016374
/* f1a0824: 0c0058dd */ jal mtx00016374
/* f1a0828: 46120300 */ add.s $f12,$f0,$f18
/* f1a082c: 8e6e0018 */ lw $t6,0x18($s3)
/* f1a0830: 02802825 */ or $a1,$s4,$zero
/* f1a0834: 0c0057c1 */ jal func00015f04
/* f1a0834: 0c0057c1 */ jal mtx00015f04
/* f1a0838: c5cc0014 */ lwc1 $f12,0x14($t6)
/* f1a083c: 02802025 */ or $a0,$s4,$zero
/* f1a0840: 0c005768 */ jal func00015da0
/* f1a0840: 0c005768 */ jal mtx00015da0
/* f1a0844: 02a02825 */ or $a1,$s5,$zero
/* f1a0848: 02a02025 */ or $a0,$s5,$zero
/* f1a084c: 0c005736 */ jal func00015cd8
/* f1a084c: 0c005736 */ jal mtx00015cd8
/* f1a0850: 2665001c */ addiu $a1,$s3,0x1c
/* f1a0854: 8e020010 */ lw $v0,0x10($s0)
.L0f1a0858:
@@ -6275,17 +6274,17 @@ glabel var7f1b94e4
.NB0f19a82c:
/* f19a82c: c4243b04 */ lwc1 $f4,0x3b04($at)
/* f19a830: 02802825 */ or $a1,$s4,$zero
/* f19a834: 0c005cc1 */ jal func00016374
/* f19a834: 0c005cc1 */ jal mtx00016374
/* f19a838: 46040300 */ add.s $f12,$f0,$f4
/* f19a83c: 8e6f0018 */ lw $t7,0x18($s3)
/* f19a840: 02802825 */ or $a1,$s4,$zero
/* f19a844: 0c005b7d */ jal func00015f04
/* f19a844: 0c005b7d */ jal mtx00015f04
/* f19a848: c5ec0014 */ lwc1 $f12,0x14($t7)
/* f19a84c: 02802025 */ or $a0,$s4,$zero
/* f19a850: 0c005b24 */ jal func00015da0
/* f19a850: 0c005b24 */ jal mtx00015da0
/* f19a854: 02a02825 */ or $a1,$s5,$zero
/* f19a858: 02a02025 */ or $a0,$s5,$zero
/* f19a85c: 0c005af2 */ jal func00015cd8
/* f19a85c: 0c005af2 */ jal mtx00015cd8
/* f19a860: 2665001c */ addiu $a1,$s3,0x1c
/* f19a864: 8e020010 */ lw $v0,0x10($s0)
.NB0f19a868:
@@ -6851,10 +6850,10 @@ glabel var7f1b94e4
// }
//
// // 81c
// func00016374(g_FrData.targets[i].angle + M_PI, &spbc);
// func00015f04(obj->model->scale, &spbc);
// func00015da0(&spbc, sp98);
// func00015cd8(sp98, obj->realrot);
// mtx00016374(g_FrData.targets[i].angle + M_PI, &spbc);
// mtx00015f04(obj->model->scale, &spbc);
// mtx00015da0(&spbc, sp98);
// mtx00015cd8(sp98, obj->realrot);
// }
//
// // 854
src/game/wallhit.c
+7 -8
View File
@@ -13,8 +13,7 @@
#include "bss.h"
#include "lib/main.h"
#include "lib/rng.h"
#include "lib/lib_159b0.h"
#include "lib/lib_16110.h"
#include "lib/mtx.h"
#include "data.h"
#include "types.h"
@@ -2179,10 +2178,10 @@ glabel var7f1b5d6c
/* f13fdb0: e7b20080 */ swc1 $f18,0x80($sp)
/* f13fdb4: e7a00084 */ swc1 $f0,0x84($sp)
/* f13fdb8: e7a20088 */ swc1 $f2,0x88($sp)
/* f13fdbc: 0c0056c4 */ jal func00015b10
/* f13fdbc: 0c0056c4 */ jal mtx00015b10
/* f13fdc0: e7a6008c */ swc1 $f6,0x8c($sp)
/* f13fdc4: 02202025 */ or $a0,$s1,$zero
/* f13fdc8: 0c0056c4 */ jal func00015b10
/* f13fdc8: 0c0056c4 */ jal mtx00015b10
/* f13fdcc: 27a50078 */ addiu $a1,$sp,0x78
/* f13fdd0: c7a00084 */ lwc1 $f0,0x84($sp)
/* f13fdd4: c7a20088 */ lwc1 $f2,0x88($sp)
@@ -3478,10 +3477,10 @@ glabel var7f1b5d6c
/* f13fdb0: e7b20080 */ swc1 $f18,0x80($sp)
/* f13fdb4: e7a00084 */ swc1 $f0,0x84($sp)
/* f13fdb8: e7a20088 */ swc1 $f2,0x88($sp)
/* f13fdbc: 0c0056c4 */ jal func00015b10
/* f13fdbc: 0c0056c4 */ jal mtx00015b10
/* f13fdc0: e7a6008c */ swc1 $f6,0x8c($sp)
/* f13fdc4: 02202025 */ or $a0,$s1,$zero
/* f13fdc8: 0c0056c4 */ jal func00015b10
/* f13fdc8: 0c0056c4 */ jal mtx00015b10
/* f13fdcc: 27a50078 */ addiu $a1,$sp,0x78
/* f13fdd0: c7a00084 */ lwc1 $f0,0x84($sp)
/* f13fdd4: c7a20088 */ lwc1 $f2,0x88($sp)
@@ -4775,10 +4774,10 @@ glabel var7f1b02acnb
/* f13a8ac: e7b20084 */ swc1 $f18,0x84($sp)
/* f13a8b0: e7a00088 */ swc1 $f0,0x88($sp)
/* f13a8b4: e7a2008c */ swc1 $f2,0x8c($sp)
/* f13a8b8: 0c005a80 */ jal func00015b10
/* f13a8b8: 0c005a80 */ jal mtx00015b10
/* f13a8bc: e7a60090 */ swc1 $f6,0x90($sp)
/* f13a8c0: 02202025 */ or $a0,$s1,$zero
/* f13a8c4: 0c005a80 */ jal func00015b10
/* f13a8c4: 0c005a80 */ jal mtx00015b10
/* f13a8c8: 27a5007c */ addiu $a1,$sp,0x7c
/* f13a8cc: c7a00088 */ lwc1 $f0,0x88($sp)
/* f13a8d0: c7a2008c */ lwc1 $f2,0x8c($sp)
src/game/weather/weather.c
+7 -8
View File
@@ -12,8 +12,7 @@
#include "lib/snd.h"
#include "lib/memory.h"
#include "lib/rng.h"
#include "lib/lib_159b0.h"
#include "lib/lib_16110.h"
#include "lib/mtx.h"
#include "lib/lib_317f0.h"
#include "data.h"
#include "types.h"
@@ -987,12 +986,12 @@ glabel var7f1b5780
/* f133068: 01f8c821 */ addu $t9,$t7,$t8
/* f13306c: 8f370024 */ lw $s7,0x24($t9)
/* f133070: afa00194 */ sw $zero,0x194($sp)
/* f133074: 0c00566c */ jal func000159b0
/* f133074: 0c00566c */ jal mtx000159b0
/* f133078: 02002025 */ or $a0,$s0,$zero
/* f13307c: 0fc2d5be */ jal currentPlayerGetMatrix1740
/* f133080: 00000000 */ nop
/* f133084: 00402025 */ or $a0,$v0,$zero
/* f133088: 0c0056f8 */ jal func00015be0
/* f133088: 0c0056f8 */ jal mtx00015be0
/* f13308c: 02002825 */ or $a1,$s0,$zero
/* f133090: 4480a000 */ mtc1 $zero,$f20
/* f133094: 00000000 */ nop
@@ -1002,7 +1001,7 @@ glabel var7f1b5780
/* f1330a4: e7b40200 */ swc1 $f20,0x200($sp)
/* f1330a8: 00408825 */ or $s1,$v0,$zero
/* f1330ac: 02002025 */ or $a0,$s0,$zero
/* f1330b0: 0c005815 */ jal func00016054
/* f1330b0: 0c005815 */ jal mtx00016054
/* f1330b4: 00402825 */ or $a1,$v0,$zero
/* f1330b8: 8fb00de8 */ lw $s0,0xde8($sp)
/* f1330bc: 3c0d0102 */ lui $t5,0x102
@@ -2631,12 +2630,12 @@ glabel var7f1b5790
/* f134870: 27b001cc */ addiu $s0,$sp,0x1cc
/* f134874: 8dd20024 */ lw $s2,0x24($t6)
/* f134878: afa00198 */ sw $zero,0x198($sp)
/* f13487c: 0c00566c */ jal func000159b0
/* f13487c: 0c00566c */ jal mtx000159b0
/* f134880: 02002025 */ or $a0,$s0,$zero
/* f134884: 0fc2d5be */ jal currentPlayerGetMatrix1740
/* f134888: 00000000 */ nop
/* f13488c: 00402025 */ or $a0,$v0,$zero
/* f134890: 0c0056f8 */ jal func00015be0
/* f134890: 0c0056f8 */ jal mtx00015be0
/* f134894: 02002825 */ or $a1,$s0,$zero
/* f134898: 4480a000 */ mtc1 $zero,$f20
/* f13489c: 00000000 */ nop
@@ -2646,7 +2645,7 @@ glabel var7f1b5790
/* f1348ac: e7b40204 */ swc1 $f20,0x204($sp)
/* f1348b0: 00408825 */ or $s1,$v0,$zero
/* f1348b4: 02002025 */ or $a0,$s0,$zero
/* f1348b8: 0c005815 */ jal func00016054
/* f1348b8: 0c005815 */ jal mtx00016054
/* f1348bc: 00402825 */ or $a1,$v0,$zero
/* f1348c0: 8fb01398 */ lw $s0,0x1398($sp)
/* f1348c4: 3c190102 */ lui $t9,0x102
src/include/lib/lib_159b0.h
-33
View File
@@ -1,33 +0,0 @@
#ifndef _IN_LIB_LIB_159B0_H
#define _IN_LIB_LIB_159B0_H
#include <ultra64.h>
#include "data.h"
#include "types.h"
void func000159b0(Mtxf *matrix);
void func000159fc(Mtxf *matrix, Mtxf *arg1);
void func00015a00(Mtxf *matrix, Mtxf *arg1, Mtxf *arg2);
void func00015b10(Mtxf *matrix, struct coord *coord);
void func00015b14(Mtxf *matrix, struct coord *coord, struct coord *arg2);
void func00015b64(Mtxf *arg0, struct coord *coord);
void func00015b68(Mtxf *matrix, struct coord *arg1, struct coord *arg2);
void func00015be0(Mtxf *matrix1, Mtxf *matrix2);
void func00015be4(Mtxf *arg0, Mtxf *arg1, Mtxf *arg2);
void func00015cd8(f32 *arg0, f32 *realrot);
void func00015d18(Mtxf *matrix, Mtxf *arg1);
void func00015d54(f32 *realrot, Mtxf *matrix);
void func00015da0(Mtxf *arg0, f32 *arg1);
void func00015dd4(struct coord *pos, Mtxf *matrix);
void func00015df0(f32 arg0, Mtxf *matrix);
void func00015e24(f32 mult, f32 *matrix);
void func00015e4c(f32 arg0, Mtxf *matrix);
void func00015e80(f32 mult, f32 *matrix);
u32 func00015ea8(void);
void func00015edc(f32 mult, Mtxf *matrix);
void func00015f04(f32 scale, Mtxf *arg1);
void func00015f4c(f32 scale, Mtxf *arg1);
void func00015f88(f32 arg0, Mtxf *arg1);
u32 func00015fd0(void);
void func00016054(Mtxf *matrix, Mtxf *arg1);
#endif
src/include/lib/lib_16110.h
-42
View File
@@ -1,42 +0,0 @@
#ifndef _IN_LIB_LIB_16110_H
#define _IN_LIB_LIB_16110_H
#include <ultra64.h>
#include "data.h"
#include "types.h"
void func00016110(f32 *matrix1, f32 *matrix2);
void func00016140(f32 *realrot, f32 *arg1, f32 *arg2);
void func000161b0(f32 *matrix, f32 src[3], f32 dest[3]);
void func00016208(f32 *matrix, struct coord *coord);
void func00016248(struct coord *coord, f32 angle, Mtxf *matrix);
void func000162e8(f32 angle, Mtxf *matrix);
void func00016374(f32 angle, Mtxf *matrix);
void func00016400(f32 angle, Mtxf *matrix);
void func0001648c(struct coord *coord, Mtxf *dest);
u32 func000165d8(void);
void func000166a4(struct coord *pos, struct coord *rot, Mtxf *matrix);
void func000166dc(struct coord *pos, Mtxf *matrix);
u32 func00016710(void);
void func00016748(f32 arg0);
void func00016760(void);
void func00016784(void);
void func00016798(Mtxf *arg0, Mtxf *arg1);
void func00016820(Mtx *arg0, Mtx *arg1);
void func00016874(Mtxf *matrix, f32 posx, f32 posy, f32 posz, f32 lookx, f32 looky, f32 lookz, f32 upx, f32 upy, f32 upz);
void func00016ae4(Mtxf *matrix, f32 posx, f32 posy, f32 posz, f32 lookx, f32 looky, f32 lookz, f32 upx, f32 upy, f32 upz);
void func00016b58(Mtxf *matrix, f32 posx, f32 posy, f32 posz, f32 lookx, f32 looky, f32 lookz, f32 upx, f32 upy, f32 upz);
void func00016d58(Mtxf *matrix, f32 posx, f32 posy, f32 posz, f32 lookx, f32 looky, f32 lookz, f32 upx, f32 upy, f32 upz);
u32 func00016dcc(f32 arg0, f32 arg1);
u32 func00016e98(void);
u32 func00017028(void);
u32 func00017070(void);
u32 func000170e4(void);
u32 func0001719c(void);
u32 func000172f0(void);
u32 func00017588(void);
u32 func00017614(void);
u32 func00017a78(void);
f32 func00017c2c(f32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6, f32 arg7, f32 arg8);
f32 func00017cbc(f32 arg0, f32 arg1, f32 arg2, f32 arg3);
#endif
src/include/lib/mtx.h
+67
View File
@@ -0,0 +1,67 @@
#ifndef _IN_LIB_MTX_H
#define _IN_LIB_MTX_H
#include <ultra64.h>
#include "data.h"
#include "types.h"
void mtx000159b0(Mtxf *matrix);
void mtx000159fc(Mtxf *matrix, Mtxf *arg1);
void mtx00015a00(Mtxf *matrix, Mtxf *arg1, Mtxf *arg2);
void mtx00015b10(Mtxf *matrix, struct coord *coord);
void mtx00015b14(Mtxf *matrix, struct coord *coord, struct coord *arg2);
void mtx00015b64(Mtxf *arg0, struct coord *coord);
void mtx00015b68(Mtxf *matrix, struct coord *arg1, struct coord *arg2);
void mtx00015be0(Mtxf *matrix1, Mtxf *matrix2);
void mtx00015be4(Mtxf *arg0, Mtxf *arg1, Mtxf *arg2);
void mtx00015cd8(f32 *arg0, f32 *realrot);
void mtx00015d18(Mtxf *matrix, Mtxf *arg1);
void mtx00015d54(f32 *realrot, Mtxf *matrix);
void mtx00015da0(Mtxf *arg0, f32 *arg1);
void mtx00015dd4(struct coord *pos, Mtxf *matrix);
void mtx00015df0(f32 arg0, Mtxf *matrix);
void mtx00015e24(f32 mult, f32 *matrix);
void mtx00015e4c(f32 arg0, Mtxf *matrix);
void mtx00015e80(f32 mult, f32 *matrix);
u32 mtx00015ea8(void);
void mtx00015edc(f32 mult, Mtxf *matrix);
void mtx00015f04(f32 scale, Mtxf *arg1);
void mtx00015f4c(f32 scale, Mtxf *arg1);
void mtx00015f88(f32 arg0, Mtxf *arg1);
u32 mtxGetObfuscatedRomBase(void);
void mtx00016054(Mtxf *matrix, Mtxf *arg1);
void mtx00016110(f32 *matrix1, f32 *matrix2);
void mtx00016140(f32 *realrot, f32 *arg1, f32 *arg2);
void mtx000161b0(f32 *matrix, f32 src[3], f32 dest[3]);
void mtx00016208(f32 *matrix, struct coord *coord);
void mtx00016248(struct coord *coord, f32 angle, Mtxf *matrix);
void mtx000162e8(f32 angle, Mtxf *matrix);
void mtx00016374(f32 angle, Mtxf *matrix);
void mtx00016400(f32 angle, Mtxf *matrix);
void mtx0001648c(struct coord *coord, Mtxf *dest);
u32 mtx000165d8(void);
void mtx000166a4(struct coord *pos, struct coord *rot, Mtxf *matrix);
void mtx000166dc(struct coord *pos, Mtxf *matrix);
u32 mtx00016710(void);
void mtx00016748(f32 arg0);
void mtx00016760(void);
void mtx00016784(void);
void mtx00016798(Mtxf *arg0, Mtxf *arg1);
void mtx00016820(Mtx *arg0, Mtx *arg1);
void mtx00016874(Mtxf *matrix, f32 posx, f32 posy, f32 posz, f32 lookx, f32 looky, f32 lookz, f32 upx, f32 upy, f32 upz);
void mtx00016ae4(Mtxf *matrix, f32 posx, f32 posy, f32 posz, f32 lookx, f32 looky, f32 lookz, f32 upx, f32 upy, f32 upz);
void mtx00016b58(Mtxf *matrix, f32 posx, f32 posy, f32 posz, f32 lookx, f32 looky, f32 lookz, f32 upx, f32 upy, f32 upz);
void mtx00016d58(Mtxf *matrix, f32 posx, f32 posy, f32 posz, f32 lookx, f32 looky, f32 lookz, f32 upx, f32 upy, f32 upz);
u32 mtx00016dcc(f32 arg0, f32 arg1);
u32 mtx00016e98(void);
u32 mtx00017028(void);
u32 mtx00017070(void);
u32 mtx000170e4(void);
u32 mtx0001719c(void);
u32 mtx000172f0(void);
u32 mtx00017588(void);
u32 mtx00017614(void);
u32 mtx00017a78(void);
f32 mtx00017c2c(f32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6, f32 arg7, f32 arg8);
f32 mtx00017cbc(f32 arg0, f32 arg1, f32 arg2, f32 arg3);
#endif
src/lib/lib_04f60nb.c
+1 -1
View File
@@ -1,5 +1,5 @@
#include <ultra64.h>
#include "lib/lib_16110.h"
#include "lib/mtx.h"
GLOBAL_ASM(
glabel func00004f60nb
src/lib/lib_09660.c
+1 -1
View File
@@ -8,7 +8,7 @@
#include "bss.h"
#include "lib/lib_09660.h"
#include "lib/memory.h"
#include "lib/lib_159b0.h"
#include "lib/mtx.h"
#include "lib/lib_30ce0.h"
#include "data.h"
#include "types.h"
src/lib/lib_09a80.c
+4 -4
View File
@@ -11,7 +11,7 @@
#include "lib/lib_09660.h"
#include "lib/lib_09a80.h"
#include "lib/memory.h"
#include "lib/lib_159b0.h"
#include "lib/mtx.h"
#include "lib/lib_30ce0.h"
#include "data.h"
#include "types.h"
@@ -1829,17 +1829,17 @@ Gfx *vi0000ab78(Gfx *gdl)
u16 sp46;
guPerspectiveF(sp110.m, &sp46, g_ViBackData->fovy, g_ViBackData->aspect, g_ViBackData->znear, g_ViBackData->zfar + g_ViBackData->zfar, 1);
func00015d18(currentPlayerGetMatrix1740(), &sp90);
mtx00015d18(currentPlayerGetMatrix1740(), &sp90);
sp90.m[3][0] = 0;
sp90.m[3][1] = 0;
sp90.m[3][2] = 0;
func00015a00(&sp110, &sp90, &spd0);
mtx00015a00(&sp110, &sp90, &spd0);
sp4c = gfxAllocateMatrix();
guMtxF2L(spd0.m, sp4c);
func000159b0(&sp50);
mtx000159b0(&sp50);
sp48 = gfxAllocateMatrix();
guMtxF2L(sp50.m, sp48);
src/lib/lib_159b0.c
-577
View File
@@ -1,577 +0,0 @@
#include <ultra64.h>
#include "constants.h"
#include "bss.h"
#include "data.h"
#include "types.h"
f32 var8005ef10[] = {65536, 65536};
GLOBAL_ASM(
glabel func000159b0
/* 159b0: 3c013f80 */ lui $at,0x3f80
/* 159b4: 44810000 */ mtc1 $at,$f0
/* 159b8: ac800004 */ sw $zero,0x4($a0)
/* 159bc: ac800008 */ sw $zero,0x8($a0)
/* 159c0: ac80000c */ sw $zero,0xc($a0)
/* 159c4: ac800010 */ sw $zero,0x10($a0)
/* 159c8: ac800018 */ sw $zero,0x18($a0)
/* 159cc: ac80001c */ sw $zero,0x1c($a0)
/* 159d0: ac800020 */ sw $zero,0x20($a0)
/* 159d4: ac800024 */ sw $zero,0x24($a0)
/* 159d8: ac80002c */ sw $zero,0x2c($a0)
/* 159dc: ac800030 */ sw $zero,0x30($a0)
/* 159e0: ac800034 */ sw $zero,0x34($a0)
/* 159e4: ac800038 */ sw $zero,0x38($a0)
/* 159e8: e4800000 */ swc1 $f0,0x0($a0)
/* 159ec: e4800014 */ swc1 $f0,0x14($a0)
/* 159f0: e4800028 */ swc1 $f0,0x28($a0)
/* 159f4: 03e00008 */ jr $ra
/* 159f8: e480003c */ swc1 $f0,0x3c($a0)
);
GLOBAL_ASM(
glabel func000159fc
/* 159fc: 00a03020 */ add $a2,$a1,$zero
glabel func00015a00
/* 15a00: 4409a000 */ mfc1 $t1,$f20
/* 15a04: 440aa800 */ mfc1 $t2,$f21
/* 15a08: 440bb000 */ mfc1 $t3,$f22
/* 15a0c: 440cb800 */ mfc1 $t4,$f23
/* 15a10: 440dc000 */ mfc1 $t5,$f24
/* 15a14: 24080004 */ addiu $t0,$zero,0x4
/* 15a18: c4a00000 */ lwc1 $f0,0x0($a1)
/* 15a1c: c4a10004 */ lwc1 $f1,0x4($a1)
/* 15a20: c4a20008 */ lwc1 $f2,0x8($a1)
/* 15a24: c4a3000c */ lwc1 $f3,0xc($a1)
/* 15a28: c4a40010 */ lwc1 $f4,0x10($a1)
/* 15a2c: c4a50014 */ lwc1 $f5,0x14($a1)
/* 15a30: c4a60018 */ lwc1 $f6,0x18($a1)
/* 15a34: c4a7001c */ lwc1 $f7,0x1c($a1)
/* 15a38: c4a80020 */ lwc1 $f8,0x20($a1)
/* 15a3c: c4a90024 */ lwc1 $f9,0x24($a1)
/* 15a40: c4aa0028 */ lwc1 $f10,0x28($a1)
/* 15a44: c4ab002c */ lwc1 $f11,0x2c($a1)
/* 15a48: c4ac0030 */ lwc1 $f12,0x30($a1)
/* 15a4c: c4ad0034 */ lwc1 $f13,0x34($a1)
/* 15a50: c4ae0038 */ lwc1 $f14,0x38($a1)
/* 15a54: c4af003c */ lwc1 $f15,0x3c($a1)
.L00015a58:
/* 15a58: c4900000 */ lwc1 $f16,0x0($a0)
/* 15a5c: 46008502 */ mul.s $f20,$f16,$f0
/* 15a60: c4910010 */ lwc1 $f17,0x10($a0)
/* 15a64: c4920020 */ lwc1 $f18,0x20($a0)
/* 15a68: 46018d42 */ mul.s $f21,$f17,$f1
/* 15a6c: c4930030 */ lwc1 $f19,0x30($a0)
/* 15a70: 46029582 */ mul.s $f22,$f18,$f2
/* 15a74: 4615a500 */ add.s $f20,$f20,$f21
/* 15a78: 46039d42 */ mul.s $f21,$f19,$f3
/* 15a7c: 4616a500 */ add.s $f20,$f20,$f22
/* 15a80: 46048582 */ mul.s $f22,$f16,$f4
/* 15a84: 4615a500 */ add.s $f20,$f20,$f21
/* 15a88: 46058d42 */ mul.s $f21,$f17,$f5
/* 15a8c: e4d40000 */ swc1 $f20,0x0($a2)
/* 15a90: 46069502 */ mul.s $f20,$f18,$f6
/* 15a94: 4615b580 */ add.s $f22,$f22,$f21
/* 15a98: 46079d42 */ mul.s $f21,$f19,$f7
/* 15a9c: 24c60004 */ addiu $a2,$a2,0x4
/* 15aa0: 460885c2 */ mul.s $f23,$f16,$f8
/* 15aa4: 4614b580 */ add.s $f22,$f22,$f20
/* 15aa8: 46098d02 */ mul.s $f20,$f17,$f9
/* 15aac: 4615b580 */ add.s $f22,$f22,$f21
/* 15ab0: 460a9542 */ mul.s $f21,$f18,$f10
/* 15ab4: e4d6000c */ swc1 $f22,0xc($a2)
/* 15ab8: 460b9e02 */ mul.s $f24,$f19,$f11
/* 15abc: 4614bdc0 */ add.s $f23,$f23,$f20
/* 15ac0: 460c8582 */ mul.s $f22,$f16,$f12
/* 15ac4: 4615bdc0 */ add.s $f23,$f23,$f21
/* 15ac8: 460d8d42 */ mul.s $f21,$f17,$f13
/* 15acc: 4618bdc0 */ add.s $f23,$f23,$f24
/* 15ad0: 460e9602 */ mul.s $f24,$f18,$f14
/* 15ad4: e4d7001c */ swc1 $f23,0x1c($a2)
/* 15ad8: 460f9dc2 */ mul.s $f23,$f19,$f15
/* 15adc: 4615b580 */ add.s $f22,$f22,$f21
/* 15ae0: 2508ffff */ addiu $t0,$t0,-1
/* 15ae4: 4618b580 */ add.s $f22,$f22,$f24
/* 15ae8: 24840004 */ addiu $a0,$a0,0x4
/* 15aec: 4617b580 */ add.s $f22,$f22,$f23
/* 15af0: 1500ffd9 */ bnez $t0,.L00015a58
/* 15af4: e4d6002c */ swc1 $f22,0x2c($a2)
/* 15af8: 4489a000 */ mtc1 $t1,$f20
/* 15afc: 448aa800 */ mtc1 $t2,$f21
/* 15b00: 448bb000 */ mtc1 $t3,$f22
/* 15b04: 448cb800 */ mtc1 $t4,$f23
/* 15b08: 03e00008 */ jr $ra
/* 15b0c: 448dc000 */ mtc1 $t5,$f24
);
GLOBAL_ASM(
glabel func00015b10
/* 15b10: 00a03020 */ add $a2,$a1,$zero
glabel func00015b14
/* 15b14: c4a00000 */ lwc1 $f0,0x0($a1)
/* 15b18: c4a10004 */ lwc1 $f1,0x4($a1)
/* 15b1c: c4a20008 */ lwc1 $f2,0x8($a1)
/* 15b20: 24080003 */ addiu $t0,$zero,0x3
/* 15b24: c4830000 */ lwc1 $f3,0x0($a0)
.L00015b28:
/* 15b28: c4840010 */ lwc1 $f4,0x10($a0)
/* 15b2c: 46001982 */ mul.s $f6,$f3,$f0
/* 15b30: c4850020 */ lwc1 $f5,0x20($a0)
/* 15b34: 460121c2 */ mul.s $f7,$f4,$f1
/* 15b38: 24840004 */ addiu $a0,$a0,0x4
/* 15b3c: 46073240 */ add.s $f9,$f6,$f7
/* 15b40: 46022a02 */ mul.s $f8,$f5,$f2
/* 15b44: 24c60004 */ addiu $a2,$a2,0x4
/* 15b48: 46084c00 */ add.s $f16,$f9,$f8
/* 15b4c: 2508ffff */ addiu $t0,$t0,-1
/* 15b50: e4d0fffc */ swc1 $f16,-0x4($a2)
/* 15b54: 1500fff4 */ bnez $t0,.L00015b28
/* 15b58: c4830000 */ lwc1 $f3,0x0($a0)
/* 15b5c: 03e00008 */ jr $ra
/* 15b60: 00000000 */ nop
);
GLOBAL_ASM(
glabel func00015b64
/* 15b64: 00a03020 */ add $a2,$a1,$zero
glabel func00015b68
/* 15b68: c4a00000 */ lwc1 $f0,0x0($a1)
/* 15b6c: c4a10004 */ lwc1 $f1,0x4($a1)
/* 15b70: c4a20008 */ lwc1 $f2,0x8($a1)
/* 15b74: 24080003 */ addiu $t0,$zero,0x3
/* 15b78: c4830000 */ lwc1 $f3,0x0($a0)
.L00015b7c:
/* 15b7c: c4840010 */ lwc1 $f4,0x10($a0)
/* 15b80: 46001982 */ mul.s $f6,$f3,$f0
/* 15b84: c4850020 */ lwc1 $f5,0x20($a0)
/* 15b88: 460121c2 */ mul.s $f7,$f4,$f1
/* 15b8c: 24840004 */ addiu $a0,$a0,0x4
/* 15b90: 46073240 */ add.s $f9,$f6,$f7
/* 15b94: 46022a02 */ mul.s $f8,$f5,$f2
/* 15b98: 24c60004 */ addiu $a2,$a2,0x4
/* 15b9c: 46084c00 */ add.s $f16,$f9,$f8
/* 15ba0: 2508ffff */ addiu $t0,$t0,-1
/* 15ba4: e4d0fffc */ swc1 $f16,-0x4($a2)
/* 15ba8: 1500fff4 */ bnez $t0,.L00015b7c
/* 15bac: c4830000 */ lwc1 $f3,0x0($a0)
/* 15bb0: c4c0fff4 */ lwc1 $f0,-0xc($a2)
/* 15bb4: c4c1fff8 */ lwc1 $f1,-0x8($a2)
/* 15bb8: c4830024 */ lwc1 $f3,0x24($a0)
/* 15bbc: c4840028 */ lwc1 $f4,0x28($a0)
/* 15bc0: c485002c */ lwc1 $f5,0x2c($a0)
/* 15bc4: 46030000 */ add.s $f0,$f0,$f3
/* 15bc8: 46040840 */ add.s $f1,$f1,$f4
/* 15bcc: 46058080 */ add.s $f2,$f16,$f5
/* 15bd0: e4c0fff4 */ swc1 $f0,-0xc($a2)
/* 15bd4: e4c1fff8 */ swc1 $f1,-0x8($a2)
/* 15bd8: 03e00008 */ jr $ra
/* 15bdc: e4c2fffc */ swc1 $f2,-0x4($a2)
);
GLOBAL_ASM(
glabel func00015be0
/* 15be0: 00a03020 */ add $a2,$a1,$zero
glabel func00015be4
/* 15be4: 4409a000 */ mfc1 $t1,$f20
/* 15be8: 440aa800 */ mfc1 $t2,$f21
/* 15bec: 440bb000 */ mfc1 $t3,$f22
/* 15bf0: 440cb800 */ mfc1 $t4,$f23
/* 15bf4: c4a00000 */ lwc1 $f0,0x0($a1)
/* 15bf8: c4a10004 */ lwc1 $f1,0x4($a1)
/* 15bfc: c4a20008 */ lwc1 $f2,0x8($a1)
/* 15c00: c4a30010 */ lwc1 $f3,0x10($a1)
/* 15c04: c4a40014 */ lwc1 $f4,0x14($a1)
/* 15c08: c4a50018 */ lwc1 $f5,0x18($a1)
/* 15c0c: c4a60020 */ lwc1 $f6,0x20($a1)
/* 15c10: c4a70024 */ lwc1 $f7,0x24($a1)
/* 15c14: c4a80028 */ lwc1 $f8,0x28($a1)
/* 15c18: c4a90030 */ lwc1 $f9,0x30($a1)
/* 15c1c: c4aa0034 */ lwc1 $f10,0x34($a1)
/* 15c20: c4ab0038 */ lwc1 $f11,0x38($a1)
/* 15c24: 24080003 */ addiu $t0,$zero,0x3
.L00015c28:
/* 15c28: c48c0000 */ lwc1 $f12,0x0($a0)
/* 15c2c: 24840004 */ addiu $a0,$a0,0x4
/* 15c30: 46006402 */ mul.s $f16,$f12,$f0
/* 15c34: c48d000c */ lwc1 $f13,0xc($a0)
/* 15c38: c48e001c */ lwc1 $f14,0x1c($a0)
/* 15c3c: 46016c42 */ mul.s $f17,$f13,$f1
/* 15c40: c48f002c */ lwc1 $f15,0x2c($a0)
/* 15c44: 46027482 */ mul.s $f18,$f14,$f2
/* 15c48: 461184c0 */ add.s $f19,$f16,$f17
/* 15c4c: 46036502 */ mul.s $f20,$f12,$f3
/* 15c50: 46129cc0 */ add.s $f19,$f19,$f18
/* 15c54: 46046d42 */ mul.s $f21,$f13,$f4
/* 15c58: e4d30000 */ swc1 $f19,0x0($a2)
/* 15c5c: 46057582 */ mul.s $f22,$f14,$f5
/* 15c60: 4615a5c0 */ add.s $f23,$f20,$f21
/* 15c64: 46066402 */ mul.s $f16,$f12,$f6
/* 15c68: 4616bdc0 */ add.s $f23,$f23,$f22
/* 15c6c: 46076c42 */ mul.s $f17,$f13,$f7
/* 15c70: e4d70010 */ swc1 $f23,0x10($a2)
/* 15c74: 46087482 */ mul.s $f18,$f14,$f8
/* 15c78: 461184c0 */ add.s $f19,$f16,$f17
/* 15c7c: 46096502 */ mul.s $f20,$f12,$f9
/* 15c80: 46129cc0 */ add.s $f19,$f19,$f18
/* 15c84: 460a6d42 */ mul.s $f21,$f13,$f10
/* 15c88: e4d30020 */ swc1 $f19,0x20($a2)
/* 15c8c: 460b7582 */ mul.s $f22,$f14,$f11
/* 15c90: 4615a500 */ add.s $f20,$f20,$f21
/* 15c94: 460fb580 */ add.s $f22,$f22,$f15
/* 15c98: 2508ffff */ addiu $t0,$t0,-1
/* 15c9c: 4616a580 */ add.s $f22,$f20,$f22
/* 15ca0: 24c60004 */ addiu $a2,$a2,0x4
/* 15ca4: 1500ffe0 */ bnez $t0,.L00015c28
/* 15ca8: e4d6002c */ swc1 $f22,0x2c($a2)
/* 15cac: 3c013f80 */ lui $at,0x3f80
/* 15cb0: 44810000 */ mtc1 $at,$f0
/* 15cb4: acc00000 */ sw $zero,0x0($a2)
/* 15cb8: acc00010 */ sw $zero,0x10($a2)
/* 15cbc: acc00020 */ sw $zero,0x20($a2)
/* 15cc0: e4c00030 */ swc1 $f0,0x30($a2)
/* 15cc4: 4489a000 */ mtc1 $t1,$f20
/* 15cc8: 448aa800 */ mtc1 $t2,$f21
/* 15ccc: 448bb000 */ mtc1 $t3,$f22
/* 15cd0: 03e00008 */ jr $ra
/* 15cd4: 448cb800 */ mtc1 $t4,$f23
);
GLOBAL_ASM(
glabel func00015cd8
/* 15cd8: 24080002 */ addiu $t0,$zero,0x2
.L00015cdc:
/* 15cdc: 8c890000 */ lw $t1,0x0($a0)
/* 15ce0: 8c8a0004 */ lw $t2,0x4($a0)
/* 15ce4: 8c8b0008 */ lw $t3,0x8($a0)
/* 15ce8: 8c8c000c */ lw $t4,0xc($a0)
/* 15cec: aca90000 */ sw $t1,0x0($a1)
/* 15cf0: acaa0004 */ sw $t2,0x4($a1)
/* 15cf4: acab0008 */ sw $t3,0x8($a1)
/* 15cf8: acac000c */ sw $t4,0xc($a1)
/* 15cfc: 2508ffff */ addiu $t0,$t0,-1
/* 15d00: 24840010 */ addiu $a0,$a0,0x10
/* 15d04: 1500fff5 */ bnez $t0,.L00015cdc
/* 15d08: 24a50010 */ addiu $a1,$a1,0x10
/* 15d0c: 8c880000 */ lw $t0,0x0($a0)
/* 15d10: 03e00008 */ jr $ra
/* 15d14: aca80000 */ sw $t0,0x0($a1)
);
GLOBAL_ASM(
glabel func00015d18
/* 15d18: 24080004 */ addiu $t0,$zero,0x4
.L00015d1c:
/* 15d1c: 8c890000 */ lw $t1,0x0($a0)
/* 15d20: 8c8a0004 */ lw $t2,0x4($a0)
/* 15d24: 8c8b0008 */ lw $t3,0x8($a0)
/* 15d28: 8c8c000c */ lw $t4,0xc($a0)
/* 15d2c: aca90000 */ sw $t1,0x0($a1)
/* 15d30: acaa0004 */ sw $t2,0x4($a1)
/* 15d34: acab0008 */ sw $t3,0x8($a1)
/* 15d38: acac000c */ sw $t4,0xc($a1)
/* 15d3c: 2508ffff */ addiu $t0,$t0,-1
/* 15d40: 24840010 */ addiu $a0,$a0,0x10
/* 15d44: 1500fff5 */ bnez $t0,.L00015d1c
/* 15d48: 24a50010 */ addiu $a1,$a1,0x10
/* 15d4c: 03e00008 */ jr $ra
/* 15d50: 00000000 */ nop
);
GLOBAL_ASM(
glabel func00015d54
/* 15d54: 24080003 */ addiu $t0,$zero,0x3
/* 15d58: 3c013f80 */ lui $at,0x3f80
/* 15d5c: 44812000 */ mtc1 $at,$f4
.L00015d60:
/* 15d60: 8c890000 */ lw $t1,0x0($a0)
/* 15d64: 8c8a0004 */ lw $t2,0x4($a0)
/* 15d68: 8c8b0008 */ lw $t3,0x8($a0)
/* 15d6c: aca90000 */ sw $t1,0x0($a1)
/* 15d70: acaa0004 */ sw $t2,0x4($a1)
/* 15d74: acab0008 */ sw $t3,0x8($a1)
/* 15d78: aca0000c */ sw $zero,0xc($a1)
/* 15d7c: 2508ffff */ addiu $t0,$t0,-1
/* 15d80: 24a50010 */ addiu $a1,$a1,0x10
/* 15d84: 1500fff6 */ bnez $t0,.L00015d60
/* 15d88: 2484000c */ addiu $a0,$a0,0xc
/* 15d8c: aca00000 */ sw $zero,0x0($a1)
/* 15d90: aca00004 */ sw $zero,0x4($a1)
/* 15d94: aca00008 */ sw $zero,0x8($a1)
/* 15d98: 03e00008 */ jr $ra
/* 15d9c: e4a4000c */ swc1 $f4,0xc($a1)
);
GLOBAL_ASM(
glabel func00015da0
/* 15da0: 24080003 */ addiu $t0,$zero,0x3
.L00015da4:
/* 15da4: 8c890000 */ lw $t1,0x0($a0)
/* 15da8: 8c8a0004 */ lw $t2,0x4($a0)
/* 15dac: 8c8b0008 */ lw $t3,0x8($a0)
/* 15db0: aca90000 */ sw $t1,0x0($a1)
/* 15db4: acaa0004 */ sw $t2,0x4($a1)
/* 15db8: acab0008 */ sw $t3,0x8($a1)
/* 15dbc: 2508ffff */ addiu $t0,$t0,-1
/* 15dc0: 24840010 */ addiu $a0,$a0,0x10
/* 15dc4: 1500fff7 */ bnez $t0,.L00015da4
/* 15dc8: 24a5000c */ addiu $a1,$a1,0xc
/* 15dcc: 03e00008 */ jr $ra
/* 15dd0: 00000000 */ nop
);
GLOBAL_ASM(
glabel func00015dd4
/* 15dd4: 8c880000 */ lw $t0,0x0($a0)
/* 15dd8: 8c890004 */ lw $t1,0x4($a0)
/* 15ddc: 8c8a0008 */ lw $t2,0x8($a0)
/* 15de0: aca80030 */ sw $t0,0x30($a1)
/* 15de4: aca90034 */ sw $t1,0x34($a1)
/* 15de8: 03e00008 */ jr $ra
/* 15dec: acaa0038 */ sw $t2,0x38($a1)
);
GLOBAL_ASM(
glabel func00015df0
/* 15df0: c4a40000 */ lwc1 $f4,0x0($a1)
/* 15df4: c4a60004 */ lwc1 $f6,0x4($a1)
/* 15df8: 460c2202 */ mul.s $f8,$f4,$f12
/* 15dfc: c4aa0008 */ lwc1 $f10,0x8($a1)
/* 15e00: 460c3102 */ mul.s $f4,$f6,$f12
/* 15e04: c4a6000c */ lwc1 $f6,0xc($a1)
/* 15e08: 460c5282 */ mul.s $f10,$f10,$f12
/* 15e0c: e4a80000 */ swc1 $f8,0x0($a1)
/* 15e10: 460c3182 */ mul.s $f6,$f6,$f12
/* 15e14: e4a40004 */ swc1 $f4,0x4($a1)
/* 15e18: e4aa0008 */ swc1 $f10,0x8($a1)
/* 15e1c: 03e00008 */ jr $ra
/* 15e20: e4a6000c */ swc1 $f6,0xc($a1)
);
GLOBAL_ASM(
glabel func00015e24
/* 15e24: c4a40000 */ lwc1 $f4,0x0($a1)
/* 15e28: c4a60004 */ lwc1 $f6,0x4($a1)
/* 15e2c: 460c2202 */ mul.s $f8,$f4,$f12
/* 15e30: c4aa0008 */ lwc1 $f10,0x8($a1)
/* 15e34: 460c3102 */ mul.s $f4,$f6,$f12
/* 15e38: e4a80000 */ swc1 $f8,0x0($a1)
/* 15e3c: 460c5282 */ mul.s $f10,$f10,$f12
/* 15e40: e4a40004 */ swc1 $f4,0x4($a1)
/* 15e44: 03e00008 */ jr $ra
/* 15e48: e4aa0008 */ swc1 $f10,0x8($a1)
);
GLOBAL_ASM(
glabel func00015e4c
/* 15e4c: c4a40010 */ lwc1 $f4,0x10($a1)
/* 15e50: c4a60014 */ lwc1 $f6,0x14($a1)
/* 15e54: 460c2202 */ mul.s $f8,$f4,$f12
/* 15e58: c4aa0018 */ lwc1 $f10,0x18($a1)
/* 15e5c: 460c3102 */ mul.s $f4,$f6,$f12
/* 15e60: c4a6001c */ lwc1 $f6,0x1c($a1)
/* 15e64: 460c5282 */ mul.s $f10,$f10,$f12
/* 15e68: e4a80010 */ swc1 $f8,0x10($a1)
/* 15e6c: 460c3182 */ mul.s $f6,$f6,$f12
/* 15e70: e4a40014 */ swc1 $f4,0x14($a1)
/* 15e74: e4aa0018 */ swc1 $f10,0x18($a1)
/* 15e78: 03e00008 */ jr $ra
/* 15e7c: e4a6001c */ swc1 $f6,0x1c($a1)
);
GLOBAL_ASM(
glabel func00015e80
/* 15e80: c4a40010 */ lwc1 $f4,0x10($a1)
/* 15e84: c4a60014 */ lwc1 $f6,0x14($a1)
/* 15e88: 460c2202 */ mul.s $f8,$f4,$f12
/* 15e8c: c4aa0018 */ lwc1 $f10,0x18($a1)
/* 15e90: 460c3102 */ mul.s $f4,$f6,$f12
/* 15e94: e4a80010 */ swc1 $f8,0x10($a1)
/* 15e98: 460c5282 */ mul.s $f10,$f10,$f12
/* 15e9c: e4a40014 */ swc1 $f4,0x14($a1)
/* 15ea0: 03e00008 */ jr $ra
/* 15ea4: e4aa0018 */ swc1 $f10,0x18($a1)
);
GLOBAL_ASM(
glabel func00015ea8
/* 15ea8: c4a40020 */ lwc1 $f4,0x20($a1)
/* 15eac: c4a60024 */ lwc1 $f6,0x24($a1)
/* 15eb0: 460c2202 */ mul.s $f8,$f4,$f12
/* 15eb4: c4aa0028 */ lwc1 $f10,0x28($a1)
/* 15eb8: 460c3102 */ mul.s $f4,$f6,$f12
/* 15ebc: c4a6002c */ lwc1 $f6,0x2c($a1)
/* 15ec0: 460c5282 */ mul.s $f10,$f10,$f12
/* 15ec4: e4a80020 */ swc1 $f8,0x20($a1)
/* 15ec8: 460c3182 */ mul.s $f6,$f6,$f12
/* 15ecc: e4a40024 */ swc1 $f4,0x24($a1)
/* 15ed0: e4aa0028 */ swc1 $f10,0x28($a1)
/* 15ed4: 03e00008 */ jr $ra
/* 15ed8: e4a6002c */ swc1 $f6,0x2c($a1)
);
GLOBAL_ASM(
glabel func00015edc
/* 15edc: c4a40020 */ lwc1 $f4,0x20($a1)
/* 15ee0: c4a60024 */ lwc1 $f6,0x24($a1)
/* 15ee4: 460c2202 */ mul.s $f8,$f4,$f12
/* 15ee8: c4aa0028 */ lwc1 $f10,0x28($a1)
/* 15eec: 460c3102 */ mul.s $f4,$f6,$f12
/* 15ef0: e4a80020 */ swc1 $f8,0x20($a1)
/* 15ef4: 460c5282 */ mul.s $f10,$f10,$f12
/* 15ef8: e4a40024 */ swc1 $f4,0x24($a1)
/* 15efc: 03e00008 */ jr $ra
/* 15f00: e4aa0028 */ swc1 $f10,0x28($a1)
);
GLOBAL_ASM(
glabel func00015f04
/* 15f04: 24080003 */ addiu $t0,$zero,0x3
.L00015f08:
/* 15f08: c4a40000 */ lwc1 $f4,0x0($a1)
/* 15f0c: c4a60004 */ lwc1 $f6,0x4($a1)
/* 15f10: 460c2102 */ mul.s $f4,$f4,$f12
/* 15f14: c4a80008 */ lwc1 $f8,0x8($a1)
/* 15f18: 460c3182 */ mul.s $f6,$f6,$f12
/* 15f1c: c4aa000c */ lwc1 $f10,0xc($a1)
/* 15f20: 460c4202 */ mul.s $f8,$f8,$f12
/* 15f24: 24a50010 */ addiu $a1,$a1,0x10
/* 15f28: 460c5282 */ mul.s $f10,$f10,$f12
/* 15f2c: 2508ffff */ addiu $t0,$t0,-1
/* 15f30: e4a4fff0 */ swc1 $f4,-0x10($a1)
/* 15f34: e4a6fff4 */ swc1 $f6,-0xc($a1)
/* 15f38: e4a8fff8 */ swc1 $f8,-0x8($a1)
/* 15f3c: 1500fff2 */ bnez $t0,.L00015f08
/* 15f40: e4aafffc */ swc1 $f10,-0x4($a1)
/* 15f44: 03e00008 */ jr $ra
/* 15f48: 00000000 */ nop
);
GLOBAL_ASM(
glabel func00015f4c
/* 15f4c: 24080003 */ addiu $t0,$zero,0x3
.L00015f50:
/* 15f50: c4a40000 */ lwc1 $f4,0x0($a1)
/* 15f54: c4a60004 */ lwc1 $f6,0x4($a1)
/* 15f58: 460c2102 */ mul.s $f4,$f4,$f12
/* 15f5c: c4a80008 */ lwc1 $f8,0x8($a1)
/* 15f60: 460c3182 */ mul.s $f6,$f6,$f12
/* 15f64: 24a50010 */ addiu $a1,$a1,0x10
/* 15f68: 460c4202 */ mul.s $f8,$f8,$f12
/* 15f6c: 2508ffff */ addiu $t0,$t0,-1
/* 15f70: e4a4fff0 */ swc1 $f4,-0x10($a1)
/* 15f74: e4a6fff4 */ swc1 $f6,-0xc($a1)
/* 15f78: 1500fff5 */ bnez $t0,.L00015f50
/* 15f7c: e4a8fff8 */ swc1 $f8,-0x8($a1)
/* 15f80: 03e00008 */ jr $ra
/* 15f84: 00000000 */ nop
);
GLOBAL_ASM(
glabel func00015f88
/* 15f88: 24080003 */ addiu $t0,$zero,0x3
.L00015f8c:
/* 15f8c: c4a40000 */ lwc1 $f4,0x0($a1)
/* 15f90: c4a60010 */ lwc1 $f6,0x10($a1)
/* 15f94: 460c2102 */ mul.s $f4,$f4,$f12
/* 15f98: c4a80020 */ lwc1 $f8,0x20($a1)
/* 15f9c: 460c3182 */ mul.s $f6,$f6,$f12
/* 15fa0: c4aa0030 */ lwc1 $f10,0x30($a1)
/* 15fa4: 460c4202 */ mul.s $f8,$f8,$f12
/* 15fa8: 24a50004 */ addiu $a1,$a1,0x4
/* 15fac: 460c5282 */ mul.s $f10,$f10,$f12
/* 15fb0: 2508ffff */ addiu $t0,$t0,-1
/* 15fb4: e4a4fffc */ swc1 $f4,-0x4($a1)
/* 15fb8: e4a6000c */ swc1 $f6,0xc($a1)
/* 15fbc: e4a8001c */ swc1 $f8,0x1c($a1)
/* 15fc0: 1500fff2 */ bnez $t0,.L00015f8c
/* 15fc4: e4aa002c */ swc1 $f10,0x2c($a1)
/* 15fc8: 03e00008 */ jr $ra
/* 15fcc: 00000000 */ nop
);
GLOBAL_ASM(
glabel func00015fd0
/* 15fd0: 27bdffe0 */ addiu $sp,$sp,-32
/* 15fd4: afbf0014 */ sw $ra,0x14($sp)
/* 15fd8: 3c04800a */ lui $a0,%hi(__osPiAccessQueue)
/* 15fdc: 2484c7a8 */ addiu $a0,$a0,%lo(__osPiAccessQueue)
/* 15fe0: 24050000 */ addiu $a1,$zero,0x0
/* 15fe4: 0c0121bc */ jal osRecvMesg
/* 15fe8: 3c060001 */ lui $a2,0x1
/* 15fec: 3c04a45f */ lui $a0,0xa45f
/* 15ff0: 3484ffff */ ori $a0,$a0,0xffff
/* 15ff4: 24840011 */ addiu $a0,$a0,0x11
.L00015ff8:
/* 15ff8: 8c880000 */ lw $t0,0x0($a0)
/* 15ffc: 31080003 */ andi $t0,$t0,0x3
/* 16000: 1500fffd */ bnez $t0,.L00015ff8
/* 16004: 00000000 */ nop
/* 16008: 3c058000 */ lui $a1,0x8000
/* 1600c: 8ca50308 */ lw $a1,0x308($a1)
/* 16010: 3c04b764 */ lui $a0,0xb764
/* 16014: 3484b4fd */ ori $a0,$a0,0xb4fd
/* 16018: 00852025 */ or $a0,$a0,$a1
/* 1601c: 3c050764 */ lui $a1,0x764
/* 16020: 34a5bea1 */ ori $a1,$a1,0xbea1
/* 16024: 00852026 */ xor $a0,$a0,$a1
/* 16028: 8c820000 */ lw $v0,0x0($a0)
/* 1602c: afa20018 */ sw $v0,0x18($sp)
/* 16030: 3c04800a */ lui $a0,%hi(__osPiAccessQueue)
/* 16034: 2484c7a8 */ addiu $a0,$a0,%lo(__osPiAccessQueue)
/* 16038: 24050000 */ addiu $a1,$zero,0x0
/* 1603c: 0c012238 */ jal osSendMesg
/* 16040: 3c060000 */ lui $a2,0x0
/* 16044: 8fa20018 */ lw $v0,0x18($sp)
/* 16048: 8fbf0014 */ lw $ra,0x14($sp)
/* 1604c: 03e00008 */ jr $ra
/* 16050: 27bd0020 */ addiu $sp,$sp,0x20
);
GLOBAL_ASM(
glabel func00016054
/* 16054: 3c0a8006 */ lui $t2,%hi(var8005ef10)
/* 16058: 254aef10 */ addiu $t2,$t2,%lo(var8005ef10)
/* 1605c: 24080004 */ addiu $t0,$zero,0x4
/* 16060: 3c09ffff */ lui $t1,0xffff
/* 16064: c5400000 */ lwc1 $f0,0x0($t2)
/* 16068: c5420004 */ lwc1 $f2,0x4($t2)
.L0001606c:
/* 1606c: c4840000 */ lwc1 $f4,0x0($a0)
/* 16070: c4860004 */ lwc1 $f6,0x4($a0)
/* 16074: 46002102 */ mul.s $f4,$f4,$f0
/* 16078: c4880008 */ lwc1 $f8,0x8($a0)
/* 1607c: 46003182 */ mul.s $f6,$f6,$f0
/* 16080: c48a000c */ lwc1 $f10,0xc($a0)
/* 16084: 4600210d */ trunc.w.s $f4,$f4
/* 16088: 46004202 */ mul.s $f8,$f8,$f0
/* 1608c: 440a2000 */ mfc1 $t2,$f4
/* 16090: 4600318d */ trunc.w.s $f6,$f6
/* 16094: 46025282 */ mul.s $f10,$f10,$f2
/* 16098: 440b3000 */ mfc1 $t3,$f6
/* 1609c: 4600420d */ trunc.w.s $f8,$f8
/* 160a0: 01496024 */ and $t4,$t2,$t1
/* 160a4: 000b6c02 */ srl $t5,$t3,0x10
/* 160a8: 4600528d */ trunc.w.s $f10,$f10
/* 160ac: 018d6025 */ or $t4,$t4,$t5
/* 160b0: 440d4000 */ mfc1 $t5,$f8
/* 160b4: 000a5400 */ sll $t2,$t2,0x10
/* 160b8: 316bffff */ andi $t3,$t3,0xffff
/* 160bc: 440e5000 */ mfc1 $t6,$f10
/* 160c0: 014b5025 */ or $t2,$t2,$t3
/* 160c4: 01a97824 */ and $t7,$t5,$t1
/* 160c8: 000d6c00 */ sll $t5,$t5,0x10
/* 160cc: 000ec402 */ srl $t8,$t6,0x10
/* 160d0: 31ceffff */ andi $t6,$t6,0xffff
/* 160d4: 01f87825 */ or $t7,$t7,$t8
/* 160d8: 01ae6825 */ or $t5,$t5,$t6
/* 160dc: 24840010 */ addiu $a0,$a0,0x10
/* 160e0: acac0000 */ sw $t4,0x0($a1)
/* 160e4: acaf0004 */ sw $t7,0x4($a1)
/* 160e8: acaa0020 */ sw $t2,0x20($a1)
/* 160ec: acad0024 */ sw $t5,0x24($a1)
/* 160f0: 2508ffff */ addiu $t0,$t0,-1
/* 160f4: 1500ffdd */ bnez $t0,.L0001606c
/* 160f8: 24a50008 */ addiu $a1,$a1,0x8
/* 160fc: 03e00008 */ jr $ra
/* 16100: 00000000 */ nop
);
src/lib/lib_17ce0.c
+1 -2
View File
@@ -3,8 +3,7 @@
#include "game/atan2f.h"
#include "game/padhalllv.h"
#include "bss.h"
#include "lib/lib_159b0.h"
#include "lib/lib_16110.h"
#include "lib/mtx.h"
#include "data.h"
#include "types.h"
src/lib/lib_184d0.c
+1 -2
View File
@@ -3,8 +3,7 @@
#include "game/atan2f.h"
#include "game/padhalllv.h"
#include "bss.h"
#include "lib/lib_159b0.h"
#include "lib/lib_16110.h"
#include "lib/mtx.h"
#include "lib/lib_184d0.h"
#include "data.h"
#include "types.h"
src/lib/lib_233c0.c
+1 -1
View File
@@ -6,7 +6,7 @@
#include "bss.h"
#include "lib/dma.h"
#include "lib/memory.h"
#include "lib/lib_16110.h"
#include "lib/mtx.h"
#include "lib/lib_233c0.h"
#include "lib/lib_2f490.h"
#include "lib/libc/ll.h"
src/lib/lib_24e40.c
+1 -1
View File
@@ -7,7 +7,7 @@
#include "bss.h"
#include "lib/dma.h"
#include "lib/memory.h"
#include "lib/lib_16110.h"
#include "lib/mtx.h"
#include "lib/lib_17ce0.h"
#include "lib/lib_233c0.h"
#include "lib/lib_24e40.h"
src/lib/lib_2fc60.c
+1 -1
View File
@@ -1,7 +1,7 @@
#include <ultra64.h>
#include "constants.h"
#include "bss.h"
#include "lib/lib_16110.h"
#include "lib/mtx.h"
#include "lib/lib_2fc60.h"
#include "lib/lib_39fe0.h"
#include "data.h"
src/lib/lib_3e730.c
+1 -1
View File
@@ -1,7 +1,7 @@
#include <ultra64.h>
#include "constants.h"
#include "bss.h"
#include "lib/lib_16110.h"
#include "lib/mtx.h"
#include "lib/lib_30ce0.h"
#include "lib/lib_3e730.h"
#include "lib/lib_43dd0.h"
src/lib/lib_3e8c0.c
+1 -1
View File
@@ -2,7 +2,7 @@
#include "PR/synthInternals.h"
#include "constants.h"
#include "bss.h"
#include "lib/lib_16110.h"
#include "lib/mtx.h"
#include "lib/lib_30ce0.h"
#include "lib/lib_3e8c0.h"
#include "lib/lib_43dd0.h"
src/lib/lib_3f8a0.c
+1 -1
View File
@@ -2,7 +2,7 @@
#include "PR/synthInternals.h"
#include "constants.h"
#include "bss.h"
#include "lib/lib_16110.h"
#include "lib/mtx.h"
#include "lib/lib_30ce0.h"
#include "lib/lib_3e8c0.h"
#include "lib/lib_43dd0.h"
src/lib/model.c
+50 -51
View File
@@ -12,8 +12,7 @@
#include "game/file.h"
#include "bss.h"
#include "lib/rng.h"
#include "lib/lib_159b0.h"
#include "lib/lib_16110.h"
#include "lib/mtx.h"
#include "lib/lib_233c0.h"
#include "lib/model.h"
#include "data.h"
@@ -728,9 +727,9 @@ void func0001b400(struct objticksp476 *arg0, struct model *model, struct modelno
}
if ((g_Anims[anim->animnum].flags & ANIMFLAG_02) && (g_Anims[anim->animnum2].flags & ANIMFLAG_02) == 0) {
func00016374(rwdata->chrinfo.unk14, &sp78);
func0001648c(&sp124, &sp38);
func00015be0(&sp78, &sp38);
mtx00016374(rwdata->chrinfo.unk14, &sp78);
mtx0001648c(&sp124, &sp38);
mtx00015be0(&sp78, &sp38);
func0f097044(&sp38, &spec);
} else {
func0f096ca0(&sp124, &spec);
@@ -741,29 +740,29 @@ void func0001b400(struct objticksp476 *arg0, struct model *model, struct modelno
func0f0972b8(&spfc, &spec, anim->fracmerge, &spdc);
func0f096ed4(&spdc, &sp1d8);
} else {
func0001648c(&sp230, &sp1d8);
mtx0001648c(&sp230, &sp1d8);
}
if (g_Anims[anim->animnum].flags & ANIMFLAG_02) {
func000166dc(sp254, &sp198);
mtx000166dc(sp254, &sp198);
} else {
if (rwdata->chrinfo.unk18 != 0.0f) {
sp250 = func0001afe8(sp250, rwdata->chrinfo.unk1c, rwdata->chrinfo.unk18);
}
func00016248(sp254, sp250, &sp198);
mtx00016248(sp254, sp250, &sp198);
}
func00015be4(&sp198, &sp1d8, &sp158);
mtx00015be4(&sp198, &sp1d8, &sp158);
if (scale != 1.0f) {
func00015f4c(scale, &sp158);
mtx00015f4c(scale, &sp158);
}
if (sp24c) {
func00015be4(sp24c, &sp158, mtx);
mtx00015be4(sp24c, &sp158, mtx);
} else {
func00015d18(&sp158, mtx);
mtx00015d18(&sp158, mtx);
}
}
@@ -818,7 +817,7 @@ glabel var70054308
/* 1b884: 8fae0058 */ lw $t6,0x58($sp)
/* 1b888: 8fa400c8 */ lw $a0,0xc8($sp)
/* 1b88c: 8fa500c4 */ lw $a1,0xc4($sp)
/* 1b890: 0c0059a9 */ jal func000166a4
/* 1b890: 0c0059a9 */ jal mtx000166a4
/* 1b894: 27a60068 */ addiu $a2,$sp,0x68
/* 1b898: 8fae00cc */ lw $t6,0xcc($sp)
/* 1b89c: 8faf00bc */ lw $t7,0xbc($sp)
@@ -832,7 +831,7 @@ glabel var70054308
/* 1b8bc: 00000000 */ nop
/* 1b8c0: 45030004 */ bc1tl .L0001b8d4
/* 1b8c4: 8fb800d0 */ lw $t8,0xd0($sp)
/* 1b8c8: 0c0057c1 */ jal func00015f04
/* 1b8c8: 0c0057c1 */ jal mtx00015f04
/* 1b8cc: 27a50068 */ addiu $a1,$sp,0x68
/* 1b8d0: 8fb800d0 */ lw $t8,0xd0($sp)
.L0001b8d4:
@@ -843,7 +842,7 @@ glabel var70054308
/* 1b8e4: 00000000 */ nop
/* 1b8e8: 45030004 */ bc1tl .L0001b8fc
/* 1b8ec: 8fb900d0 */ lw $t9,0xd0($sp)
/* 1b8f0: 0c00577c */ jal func00015df0
/* 1b8f0: 0c00577c */ jal mtx00015df0
/* 1b8f4: 27a50068 */ addiu $a1,$sp,0x68
/* 1b8f8: 8fb900d0 */ lw $t9,0xd0($sp)
.L0001b8fc:
@@ -854,7 +853,7 @@ glabel var70054308
/* 1b90c: 00000000 */ nop
/* 1b910: 45030004 */ bc1tl .L0001b924
/* 1b914: 8fa900d0 */ lw $t1,0xd0($sp)
/* 1b918: 0c005793 */ jal func00015e4c
/* 1b918: 0c005793 */ jal mtx00015e4c
/* 1b91c: 27a50068 */ addiu $a1,$sp,0x68
/* 1b920: 8fa900d0 */ lw $t1,0xd0($sp)
.L0001b924:
@@ -865,7 +864,7 @@ glabel var70054308
/* 1b934: 00000000 */ nop
/* 1b938: 45030004 */ bc1tl .L0001b94c
/* 1b93c: 8faa0064 */ lw $t2,0x64($sp)
/* 1b940: 0c0057aa */ jal func00015ea8
/* 1b940: 0c0057aa */ jal mtx00015ea8
/* 1b944: 27a50068 */ addiu $a1,$sp,0x68
/* 1b948: 8faa0064 */ lw $t2,0x64($sp)
.L0001b94c:
@@ -874,7 +873,7 @@ glabel var70054308
/* 1b954: 000a4180 */ sll $t0,$t2,0x6
/* 1b958: 010b3021 */ addu $a2,$t0,$t3
/* 1b95c: afa6001c */ sw $a2,0x1c($sp)
/* 1b960: 0c0056f9 */ jal func00015be4
/* 1b960: 0c0056f9 */ jal mtx00015be4
/* 1b964: 27a50068 */ addiu $a1,$sp,0x68
/* 1b968: 3c028006 */ lui $v0,%hi(var8005efcc)
/* 1b96c: 8c42efcc */ lw $v0,%lo(var8005efcc)($v0)
@@ -889,7 +888,7 @@ glabel var70054308
/* 1b98c: 000c6980 */ sll $t5,$t4,0x6
/* 1b990: 01ae3021 */ addu $a2,$t5,$t6
/* 1b994: afa6001c */ sw $a2,0x1c($sp)
/* 1b998: 0c0059a9 */ jal func000166a4
/* 1b998: 0c0059a9 */ jal mtx000166a4
/* 1b99c: 8fa500c4 */ lw $a1,0xc4($sp)
/* 1b9a0: 8faf00cc */ lw $t7,0xcc($sp)
/* 1b9a4: 8fb800bc */ lw $t8,0xbc($sp)
@@ -903,7 +902,7 @@ glabel var70054308
/* 1b9c4: 00000000 */ nop
/* 1b9c8: 45030004 */ bc1tl .L0001b9dc
/* 1b9cc: 8fb900d0 */ lw $t9,0xd0($sp)
/* 1b9d0: 0c0057c1 */ jal func00015f04
/* 1b9d0: 0c0057c1 */ jal mtx00015f04
/* 1b9d4: 8fa5001c */ lw $a1,0x1c($sp)
/* 1b9d8: 8fb900d0 */ lw $t9,0xd0($sp)
.L0001b9dc:
@@ -914,7 +913,7 @@ glabel var70054308
/* 1b9ec: 00000000 */ nop
/* 1b9f0: 45030004 */ bc1tl .L0001ba04
/* 1b9f4: 8fa900d0 */ lw $t1,0xd0($sp)
/* 1b9f8: 0c00577c */ jal func00015df0
/* 1b9f8: 0c00577c */ jal mtx00015df0
/* 1b9fc: 8fa5001c */ lw $a1,0x1c($sp)
/* 1ba00: 8fa900d0 */ lw $t1,0xd0($sp)
.L0001ba04:
@@ -925,7 +924,7 @@ glabel var70054308
/* 1ba14: 00000000 */ nop
/* 1ba18: 45030004 */ bc1tl .L0001ba2c
/* 1ba1c: 8faa00d0 */ lw $t2,0xd0($sp)
/* 1ba20: 0c005793 */ jal func00015e4c
/* 1ba20: 0c005793 */ jal mtx00015e4c
/* 1ba24: 8fa5001c */ lw $a1,0x1c($sp)
/* 1ba28: 8faa00d0 */ lw $t2,0xd0($sp)
.L0001ba2c:
@@ -936,7 +935,7 @@ glabel var70054308
/* 1ba3c: 00000000 */ nop
/* 1ba40: 45030004 */ bc1tl .L0001ba54
/* 1ba44: 8fa800b4 */ lw $t0,0xb4($sp)
/* 1ba48: 0c0057aa */ jal func00015ea8
/* 1ba48: 0c0057aa */ jal mtx00015ea8
/* 1ba4c: 8fa5001c */ lw $a1,0x1c($sp)
/* 1ba50: 8fa800b4 */ lw $t0,0xb4($sp)
.L0001ba54:
@@ -963,7 +962,7 @@ glabel var70054308
/* 1baa4: 8fa400ac */ lw $a0,0xac($sp)
/* 1baa8: 000d7180 */ sll $t6,$t5,0x6
/* 1baac: 27a50068 */ addiu $a1,$sp,0x68
/* 1bab0: 0c0056f9 */ jal func00015be4
/* 1bab0: 0c0056f9 */ jal mtx00015be4
/* 1bab4: 01cf3021 */ addu $a2,$t6,$t7
/* 1bab8: 10000006 */ b .L0001bad4
/* 1babc: 8faa00b4 */ lw $t2,0xb4($sp)
@@ -1015,7 +1014,7 @@ glabel var70054308
/* 1bb60: 46049182 */ mul.s $f6,$f18,$f4
/* 1bb64: 46064301 */ sub.s $f12,$f8,$f6
.L0001bb68:
/* 1bb68: 0c0058dd */ jal func00016374
/* 1bb68: 0c0058dd */ jal mtx00016374
/* 1bb6c: e7ac0024 */ swc1 $f12,0x24($sp)
/* 1bb70: 3c017005 */ lui $at,%hi(var70054300)
/* 1bb74: c7ac0024 */ lwc1 $f12,0x24($sp)
@@ -1043,10 +1042,10 @@ glabel var70054308
.L0001bbc8:
/* 1bbc8: 00000000 */ nop
.L0001bbcc:
/* 1bbcc: 0c0057b7 */ jal func00015edc
/* 1bbcc: 0c0057b7 */ jal mtx00015edc
/* 1bbd0: 8fa50028 */ lw $a1,0x28($sp)
/* 1bbd4: 8fa400c8 */ lw $a0,0xc8($sp)
/* 1bbd8: 0c005775 */ jal func00015dd4
/* 1bbd8: 0c005775 */ jal mtx00015dd4
/* 1bbdc: 8fa50028 */ lw $a1,0x28($sp)
/* 1bbe0: 8fa900ac */ lw $t1,0xac($sp)
/* 1bbe4: 8faa005c */ lw $t2,0x5c($sp)
@@ -1055,7 +1054,7 @@ glabel var70054308
/* 1bbf0: 01202025 */ or $a0,$t1,$zero
/* 1bbf4: 000a4180 */ sll $t0,$t2,0x6
/* 1bbf8: 010b3021 */ addu $a2,$t0,$t3
/* 1bbfc: 0c0056f9 */ jal func00015be4
/* 1bbfc: 0c0056f9 */ jal mtx00015be4
/* 1bc00: 8fa50028 */ lw $a1,0x28($sp)
.L0001bc04:
/* 1bc04: 8fbf0014 */ lw $ra,0x14($sp)
@@ -1126,7 +1125,7 @@ glabel var70054320
/* 1bcb4: 00000000 */ nop
/* 1bcb8: 45030004 */ bc1tl .L0001bccc
/* 1bcbc: 8faf00bc */ lw $t7,0xbc($sp)
/* 1bcc0: 0c00577c */ jal func00015df0
/* 1bcc0: 0c00577c */ jal mtx00015df0
/* 1bcc4: 27a50058 */ addiu $a1,$sp,0x58
/* 1bcc8: 8faf00bc */ lw $t7,0xbc($sp)
.L0001bccc:
@@ -1137,7 +1136,7 @@ glabel var70054320
/* 1bcdc: 00000000 */ nop
/* 1bce0: 45030004 */ bc1tl .L0001bcf4
/* 1bce4: 8fb800bc */ lw $t8,0xbc($sp)
/* 1bce8: 0c005793 */ jal func00015e4c
/* 1bce8: 0c005793 */ jal mtx00015e4c
/* 1bcec: 27a50058 */ addiu $a1,$sp,0x58
/* 1bcf0: 8fb800bc */ lw $t8,0xbc($sp)
.L0001bcf4:
@@ -1148,7 +1147,7 @@ glabel var70054320
/* 1bd04: 00000000 */ nop
/* 1bd08: 45030004 */ bc1tl .L0001bd1c
/* 1bd0c: 8fb90054 */ lw $t9,0x54($sp)
/* 1bd10: 0c0057aa */ jal func00015ea8
/* 1bd10: 0c0057aa */ jal mtx00015ea8
/* 1bd14: 27a50058 */ addiu $a1,$sp,0x58
/* 1bd18: 8fb90054 */ lw $t9,0x54($sp)
.L0001bd1c:
@@ -1157,7 +1156,7 @@ glabel var70054320
/* 1bd24: 00194980 */ sll $t1,$t9,0x6
/* 1bd28: 012a3021 */ addu $a2,$t1,$t2
/* 1bd2c: afa6001c */ sw $a2,0x1c($sp)
/* 1bd30: 0c0056f9 */ jal func00015be4
/* 1bd30: 0c0056f9 */ jal mtx00015be4
/* 1bd34: 27a50058 */ addiu $a1,$sp,0x58
/* 1bd38: 3c028006 */ lui $v0,%hi(var8005efcc)
/* 1bd3c: 8c42efcc */ lw $v0,%lo(var8005efcc)($v0)
@@ -1182,7 +1181,7 @@ glabel var70054320
/* 1bd84: 00000000 */ nop
/* 1bd88: 45030004 */ bc1tl .L0001bd9c
/* 1bd8c: 8fae00bc */ lw $t6,0xbc($sp)
/* 1bd90: 0c00577c */ jal func00015df0
/* 1bd90: 0c00577c */ jal mtx00015df0
/* 1bd94: 8fa5001c */ lw $a1,0x1c($sp)
/* 1bd98: 8fae00bc */ lw $t6,0xbc($sp)
.L0001bd9c:
@@ -1193,7 +1192,7 @@ glabel var70054320
/* 1bdac: 00000000 */ nop
/* 1bdb0: 45030004 */ bc1tl .L0001bdc4
/* 1bdb4: 8faf00bc */ lw $t7,0xbc($sp)
/* 1bdb8: 0c005793 */ jal func00015e4c
/* 1bdb8: 0c005793 */ jal mtx00015e4c
/* 1bdbc: 8fa5001c */ lw $a1,0x1c($sp)
/* 1bdc0: 8faf00bc */ lw $t7,0xbc($sp)
.L0001bdc4:
@@ -1204,7 +1203,7 @@ glabel var70054320
/* 1bdd4: 00000000 */ nop
/* 1bdd8: 45030004 */ bc1tl .L0001bdec
/* 1bddc: 8fb800a4 */ lw $t8,0xa4($sp)
/* 1bde0: 0c0057aa */ jal func00015ea8
/* 1bde0: 0c0057aa */ jal mtx00015ea8
/* 1bde4: 8fa5001c */ lw $a1,0x1c($sp)
/* 1bde8: 8fb800a4 */ lw $t8,0xa4($sp)
.L0001bdec:
@@ -1228,7 +1227,7 @@ glabel var70054320
/* 1be30: 8fa4009c */ lw $a0,0x9c($sp)
/* 1be34: 000a4180 */ sll $t0,$t2,0x6
/* 1be38: 27a50058 */ addiu $a1,$sp,0x58
/* 1be3c: 0c0056f9 */ jal func00015be4
/* 1be3c: 0c0056f9 */ jal mtx00015be4
/* 1be40: 010b3021 */ addu $a2,$t0,$t3
/* 1be44: 10000006 */ b .L0001be60
/* 1be48: 8faf00a4 */ lw $t7,0xa4($sp)
@@ -1282,7 +1281,7 @@ glabel var70054320
/* 1bef4: 46105482 */ mul.s $f18,$f10,$f16
/* 1bef8: 46122301 */ sub.s $f12,$f4,$f18
.L0001befc:
/* 1befc: 0c0058dd */ jal func00016374
/* 1befc: 0c0058dd */ jal mtx00016374
/* 1bf00: e7ac0024 */ swc1 $f12,0x24($sp)
/* 1bf04: 3c017005 */ lui $at,%hi(var70054318)
/* 1bf08: c7ac0024 */ lwc1 $f12,0x24($sp)
@@ -1310,10 +1309,10 @@ glabel var70054320
.L0001bf5c:
/* 1bf5c: 00000000 */ nop
.L0001bf60:
/* 1bf60: 0c0057b7 */ jal func00015edc
/* 1bf60: 0c0057b7 */ jal mtx00015edc
/* 1bf64: 8fa50028 */ lw $a1,0x28($sp)
/* 1bf68: 8fa400b8 */ lw $a0,0xb8($sp)
/* 1bf6c: 0c005775 */ jal func00015dd4
/* 1bf6c: 0c005775 */ jal mtx00015dd4
/* 1bf70: 8fa50028 */ lw $a1,0x28($sp)
/* 1bf74: 8fae009c */ lw $t6,0x9c($sp)
/* 1bf78: 8faf004c */ lw $t7,0x4c($sp)
@@ -1322,7 +1321,7 @@ glabel var70054320
/* 1bf84: 01c02025 */ or $a0,$t6,$zero
/* 1bf88: 000fc180 */ sll $t8,$t7,0x6
/* 1bf8c: 03193021 */ addu $a2,$t8,$t9
/* 1bf90: 0c0056f9 */ jal func00015be4
/* 1bf90: 0c0056f9 */ jal mtx00015be4
/* 1bf94: 8fa50028 */ lw $a1,0x28($sp)
.L0001bf98:
/* 1bf98: 8fbf0014 */ lw $ra,0x14($sp)
@@ -1730,7 +1729,7 @@ glabel var70053fc0pf
/* 1c308: 1200000f */ beqz $s0,.PF0001c348
/* 1c30c: 8fa40158 */ lw $a0,0x158($sp)
/* 1c310: 8fa40158 */ lw $a0,0x158($sp)
/* 1c314: 0c00591b */ jal func000166dc
/* 1c314: 0c00591b */ jal mtx000166dc
/* 1c318: 27a500e8 */ addiu $a1,$sp,0xe8
/* 1c31c: 8fa80158 */ lw $t0,0x158($sp)
/* 1c320: 8faa0164 */ lw $t2,0x164($sp)
@@ -1739,7 +1738,7 @@ glabel var70053fc0pf
/* 1c32c: 8d49000c */ lw $t1,0xc($t2)
/* 1c330: 27a500e8 */ addiu $a1,$sp,0xe8
/* 1c334: 00186180 */ sll $t4,$t8,0x6
/* 1c338: 0c00565d */ jal func00015be4
/* 1c338: 0c00565d */ jal mtx00015be4
/* 1c33c: 012c3021 */ addu $a2,$t1,$t4
/* 1c340: 10000008 */ b .PF0001c364
/* 1c344: 8fbf002c */ lw $ra,0x2c($sp)
@@ -1748,7 +1747,7 @@ glabel var70053fc0pf
/* 1c34c: 848f000e */ lh $t7,0xe($a0)
/* 1c350: 8dae000c */ lw $t6,0xc($t5)
/* 1c354: 000fc980 */ sll $t9,$t7,0x6
/* 1c358: 0c00591b */ jal func000166dc
/* 1c358: 0c00591b */ jal mtx000166dc
/* 1c35c: 01d92821 */ addu $a1,$t6,$t9
/* 1c360: 8fbf002c */ lw $ra,0x2c($sp)
.PF0001c364:
@@ -2144,7 +2143,7 @@ glabel func0001bfa8
/* 1c548: 1200000f */ beqz $s0,.L0001c588
/* 1c54c: 8fa40158 */ lw $a0,0x158($sp)
/* 1c550: 8fa40158 */ lw $a0,0x158($sp)
/* 1c554: 0c0059b7 */ jal func000166dc
/* 1c554: 0c0059b7 */ jal mtx000166dc
/* 1c558: 27a500e8 */ addiu $a1,$sp,0xe8
/* 1c55c: 8fb80158 */ lw $t8,0x158($sp)
/* 1c560: 8fa90164 */ lw $t1,0x164($sp)
@@ -2153,7 +2152,7 @@ glabel func0001bfa8
/* 1c56c: 8d28000c */ lw $t0,0xc($t1)
/* 1c570: 27a500e8 */ addiu $a1,$sp,0xe8
/* 1c574: 00195980 */ sll $t3,$t9,0x6
/* 1c578: 0c0056f9 */ jal func00015be4
/* 1c578: 0c0056f9 */ jal mtx00015be4
/* 1c57c: 010b3021 */ addu $a2,$t0,$t3
/* 1c580: 10000008 */ b .L0001c5a4
/* 1c584: 8fbf002c */ lw $ra,0x2c($sp)
@@ -2162,7 +2161,7 @@ glabel func0001bfa8
/* 1c58c: 848e000e */ lh $t6,0xe($a0)
/* 1c590: 8d8d000c */ lw $t5,0xc($t4)
/* 1c594: 000e7980 */ sll $t7,$t6,0x6
/* 1c598: 0c0059b7 */ jal func000166dc
/* 1c598: 0c0059b7 */ jal mtx000166dc
/* 1c59c: 01af2821 */ addu $a1,$t5,$t7
/* 1c5a0: 8fbf002c */ lw $ra,0x2c($sp)
.L0001c5a4:
@@ -2188,10 +2187,10 @@ void func0001c5b4(struct objticksp476 *arg0, struct model *model, struct modelno
}
if (sp68) {
func000166dc(&rodata->positionheld.pos, &sp28);
func00015be4(sp68, &sp28, &matrices[mtxindex]);
mtx000166dc(&rodata->positionheld.pos, &sp28);
mtx00015be4(sp68, &sp28, &matrices[mtxindex]);
} else {
func000166dc(&rodata->positionheld.pos, &matrices[mtxindex]);
mtx000166dc(&rodata->positionheld.pos, &matrices[mtxindex]);
}
}
@@ -2346,7 +2345,7 @@ void func0001c950(struct model *model, struct modelnode *node)
sp38.x = rodata->reorder.unk0c[0];
sp38.y = rodata->reorder.unk0c[1];
sp38.z = rodata->reorder.unk0c[2];
func00015b10(mtx, &sp38);
mtx00015b10(mtx, &sp38);
} else if (rodata->reorder.unk20 == 2) {
sp38.x = mtx->m[1][0] * rodata->reorder.unk0c[1];
sp38.y = mtx->m[1][1] * rodata->reorder.unk0c[1];
@@ -2365,7 +2364,7 @@ void func0001c950(struct model *model, struct modelnode *node)
sp2c.y = rodata->reorder.unk04;
sp2c.z = rodata->reorder.unk08;
func00015b64(mtx, &sp2c);
mtx00015b64(mtx, &sp2c);
tmp = sp38.f[0] * sp2c.f[0] + sp38.f[1] * sp2c.f[1] + sp38.f[2] * sp2c.f[2];
src/lib/lib_16110.c → src/lib/mtx.c
+70 -71
View File
@@ -3,8 +3,7 @@
#include "game/atan2f.h"
#include "game/padhalllv.h"
#include "bss.h"
#include "lib/lib_159b0.h"
#include "lib/lib_16110.h"
#include "lib/mtx.h"
#include "data.h"
#include "types.h"
@@ -19,14 +18,14 @@ const char var70055998nb[] = " )\n";
const u32 var70054200[] = {0x42652ee0};
GLOBAL_ASM(
glabel func00016110
glabel mtx00016110
/* 16110: 27bdffc0 */ addiu $sp,$sp,-64
/* 16114: afbf0014 */ sw $ra,0x14($sp)
/* 16118: afa50044 */ sw $a1,0x44($sp)
/* 1611c: 0c005850 */ jal func00016140
/* 1611c: 0c005850 */ jal mtx00016140
/* 16120: 27a6001c */ addiu $a2,$sp,0x1c
/* 16124: 27a4001c */ addiu $a0,$sp,0x1c
/* 16128: 0c005736 */ jal func00015cd8
/* 16128: 0c005736 */ jal mtx00015cd8
/* 1612c: 8fa50044 */ lw $a1,0x44($sp)
/* 16130: 8fbf0014 */ lw $ra,0x14($sp)
/* 16134: 27bd0040 */ addiu $sp,$sp,0x40
@@ -35,7 +34,7 @@ glabel func00016110
);
GLOBAL_ASM(
glabel func00016140
glabel mtx00016140
/* 16140: 00001825 */ or $v1,$zero,$zero
/* 16144: 00804025 */ or $t0,$a0,$zero
/* 16148: 240a000c */ addiu $t2,$zero,0xc
@@ -68,7 +67,7 @@ glabel func00016140
/* 161ac: 00000000 */ nop
);
void func000161b0(f32 *matrix, f32 src[3], f32 dest[3])
void mtx000161b0(f32 *matrix, f32 src[3], f32 dest[3])
{
s32 i;
@@ -77,18 +76,18 @@ void func000161b0(f32 *matrix, f32 src[3], f32 dest[3])
}
}
void func00016208(f32 *matrix, struct coord *coord)
void mtx00016208(f32 *matrix, struct coord *coord)
{
f32 tmp[3];
func000161b0(matrix, (f32 *)coord, tmp);
mtx000161b0(matrix, (f32 *)coord, tmp);
coord->x = tmp[0];
coord->y = tmp[1];
coord->z = tmp[2];
}
void func00016248(struct coord *coord, f32 angle, Mtxf *matrix)
void mtx00016248(struct coord *coord, f32 angle, Mtxf *matrix)
{
f32 cos = cosf(angle);
f32 sin = sinf(angle);
@@ -160,7 +159,7 @@ glabel func000171d8nb
);
#endif
void func000162e8(f32 angle, Mtxf *matrix)
void mtx000162e8(f32 angle, Mtxf *matrix)
{
f32 cos = cosf(angle);
f32 sin = sinf(angle);
@@ -186,7 +185,7 @@ void func000162e8(f32 angle, Mtxf *matrix)
matrix->m[3][3] = 1;
}
void func00016374(f32 angle, Mtxf *matrix)
void mtx00016374(f32 angle, Mtxf *matrix)
{
f32 cos = cosf(angle);
f32 sin = sinf(angle);
@@ -212,7 +211,7 @@ void func00016374(f32 angle, Mtxf *matrix)
matrix->m[3][3] = 1;
}
void func00016400(f32 angle, Mtxf *matrix)
void mtx00016400(f32 angle, Mtxf *matrix)
{
f32 cos = cosf(angle);
f32 sin = (float)sinf(angle);
@@ -238,7 +237,7 @@ void func00016400(f32 angle, Mtxf *matrix)
matrix->m[3][3] = 1;
}
void func0001648c(struct coord *src, Mtxf *dest)
void mtx0001648c(struct coord *src, Mtxf *dest)
{
f32 xcos = cosf(src->x);
f32 xsin = sinf(src->x);
@@ -273,7 +272,7 @@ void func0001648c(struct coord *src, Mtxf *dest)
}
GLOBAL_ASM(
glabel func000165d8
glabel mtx000165d8
/* 165d8: 27bdffd8 */ addiu $sp,$sp,-40
/* 165dc: afbf001c */ sw $ra,0x1c($sp)
/* 165e0: afb10018 */ sw $s1,0x18($sp)
@@ -329,20 +328,20 @@ glabel func000165d8
/* 166a0: 27bd0028 */ addiu $sp,$sp,0x28
);
void func000166a4(struct coord *pos, struct coord *rot, Mtxf *matrix)
void mtx000166a4(struct coord *pos, struct coord *rot, Mtxf *matrix)
{
func0001648c(rot, matrix);
func00015dd4(pos, matrix);
mtx0001648c(rot, matrix);
mtx00015dd4(pos, matrix);
}
void func000166dc(struct coord *pos, Mtxf *matrix)
void mtx000166dc(struct coord *pos, Mtxf *matrix)
{
func000159b0(matrix);
func00015dd4(pos, matrix);
mtx000159b0(matrix);
mtx00015dd4(pos, matrix);
}
GLOBAL_ASM(
glabel func00016710
glabel mtx00016710
/* 16710: c4a40008 */ lwc1 $f4,0x8($a1)
/* 16714: c4a80018 */ lwc1 $f8,0x18($a1)
/* 16718: c4b00028 */ lwc1 $f16,0x28($a1)
@@ -359,24 +358,24 @@ glabel func00016710
/* 16744: e4a60038 */ swc1 $f6,0x38($a1)
);
void func00016748(f32 arg0)
void mtx00016748(f32 arg0)
{
var8005ef10[0] = 65536 * arg0;
}
void func00016760(void)
void mtx00016760(void)
{
g_Vars.unk000510 = var8005ef10[0];
var8005ef10[0] = 65536;
}
void func00016784(void)
void mtx00016784(void)
{
var8005ef10[0] = g_Vars.unk000510;
}
GLOBAL_ASM(
glabel func00016798
glabel mtx00016798
/* 16798: 3c0a8006 */ lui $t2,%hi(var8005ef10)
/* 1679c: 254aef10 */ addiu $t2,$t2,%lo(var8005ef10)
/* 167a0: 00001025 */ or $v0,$zero,$zero
@@ -415,7 +414,7 @@ glabel func00016798
);
GLOBAL_ASM(
glabel func00016820
glabel mtx00016820
/* 16820: 00001025 */ or $v0,$zero,$zero
/* 16824: 00803825 */ or $a3,$a0,$zero
/* 16828: 240a0008 */ addiu $t2,$zero,0x8
@@ -441,7 +440,7 @@ glabel func00016820
);
GLOBAL_ASM(
glabel func00016874
glabel mtx00016874
/* 16874: 27bdffb8 */ addiu $sp,$sp,-72
/* 16878: f7b40010 */ sdc1 $f20,0x10($sp)
/* 1687c: c7b40058 */ lwc1 $f20,0x58($sp)
@@ -600,13 +599,13 @@ glabel func00016874
/* 16ae0: 27bd0048 */ addiu $sp,$sp,0x48
);
void func00016ae4(Mtxf *matrix, f32 posx, f32 posy, f32 posz, f32 lookx, f32 looky, f32 lookz, f32 upx, f32 upy, f32 upz)
void mtx00016ae4(Mtxf *matrix, f32 posx, f32 posy, f32 posz, f32 lookx, f32 looky, f32 lookz, f32 upx, f32 upy, f32 upz)
{
func00016874(matrix, posx, posy, posz, lookx - posx, looky - posy, lookz - posz, upx, upy, upz);
mtx00016874(matrix, posx, posy, posz, lookx - posx, looky - posy, lookz - posz, upx, upy, upz);
}
GLOBAL_ASM(
glabel func00016b58
glabel mtx00016b58
/* 16b58: 27bdffb8 */ addiu $sp,$sp,-72
/* 16b5c: f7b40010 */ sdc1 $f20,0x10($sp)
/* 16b60: c7b40058 */ lwc1 $f20,0x58($sp)
@@ -737,12 +736,12 @@ glabel func00016b58
/* 16d54: 27bd0048 */ addiu $sp,$sp,0x48
);
void func00016d58(Mtxf *matrix, f32 posx, f32 posy, f32 posz, f32 lookx, f32 looky, f32 lookz, f32 upx, f32 upy, f32 upz)
void mtx00016d58(Mtxf *matrix, f32 posx, f32 posy, f32 posz, f32 lookx, f32 looky, f32 lookz, f32 upx, f32 upy, f32 upz)
{
func00016b58(matrix, posx, posy, posz, lookx - posx, looky - posy, lookz - posz, upx, upy, upz);
mtx00016b58(matrix, posx, posy, posz, lookx - posx, looky - posy, lookz - posz, upx, upy, upz);
}
u32 func00016dcc(f32 arg0, f32 arg1)
u32 mtx00016dcc(f32 arg0, f32 arg1)
{
f32 sum = arg0 + arg1;
u16 result;
@@ -761,7 +760,7 @@ u32 func00016dcc(f32 arg0, f32 arg1)
}
GLOBAL_ASM(
glabel func00016e98
glabel mtx00016e98
/* 16e98: 27bdffb8 */ addiu $sp,$sp,-72
/* 16e9c: afb00020 */ sw $s0,0x20($sp)
/* 16ea0: f7b40018 */ sdc1 $f20,0x18($sp)
@@ -856,7 +855,7 @@ glabel func00016e98
/* 17004: 10000003 */ b .L00017014
/* 17008: e606003c */ swc1 $f6,0x3c($s0)
.L0001700c:
/* 1700c: 0c00566c */ jal func000159b0
/* 1700c: 0c00566c */ jal mtx000159b0
/* 17010: 02002025 */ or $a0,$s0,$zero
.L00017014:
/* 17014: 8fbf0024 */ lw $ra,0x24($sp)
@@ -867,7 +866,7 @@ glabel func00016e98
);
GLOBAL_ASM(
glabel func00017028
glabel mtx00017028
/* 17028: 3c017005 */ lui $at,%hi(var70054200)
/* 1702c: 44856000 */ mtc1 $a1,$f12
/* 17030: c4244200 */ lwc1 $f4,%lo(var70054200)($at)
@@ -952,7 +951,7 @@ glabel func00018000nb
#endif
GLOBAL_ASM(
glabel func00017070
glabel mtx00017070
/* 17070: c4840000 */ lwc1 $f4,0x0($a0)
/* 17074: 44800000 */ mtc1 $zero,$f0
/* 17078: 3c013f80 */ lui $at,0x3f80
@@ -985,7 +984,7 @@ glabel func00017070
);
GLOBAL_ASM(
glabel func000170e4
glabel mtx000170e4
/* 170e4: c48c0000 */ lwc1 $f12,0x0($a0)
/* 170e8: c48e0010 */ lwc1 $f14,0x10($a0)
/* 170ec: c4820020 */ lwc1 $f2,0x20($a0)
@@ -1035,7 +1034,7 @@ glabel func000170e4
);
GLOBAL_ASM(
glabel func0001719c
glabel mtx0001719c
/* 1719c: c48c0000 */ lwc1 $f12,0x0($a0)
/* 171a0: c48e0010 */ lwc1 $f14,0x10($a0)
/* 171a4: c4820020 */ lwc1 $f2,0x20($a0)
@@ -1124,7 +1123,7 @@ glabel func0001719c
);
GLOBAL_ASM(
glabel func000172f0
glabel mtx000172f0
/* 172f0: c4820000 */ lwc1 $f2,0x0($a0)
/* 172f4: c48c0014 */ lwc1 $f12,0x14($a0)
/* 172f8: c48e0028 */ lwc1 $f14,0x28($a0)
@@ -1294,13 +1293,13 @@ glabel func000172f0
);
GLOBAL_ASM(
glabel func00017588
glabel mtx00017588
/* 17588: 27bdffe8 */ addiu $sp,$sp,-24
/* 1758c: afbf0014 */ sw $ra,0x14($sp)
/* 17590: afa40018 */ sw $a0,0x18($sp)
/* 17594: 0c005d85 */ jal func00017614
/* 17594: 0c005d85 */ jal mtx00017614
/* 17598: afa5001c */ sw $a1,0x1c($sp)
/* 1759c: 0c005e9e */ jal func00017a78
/* 1759c: 0c005e9e */ jal mtx00017a78
/* 175a0: 8fa40018 */ lw $a0,0x18($sp)
/* 175a4: 3c013f80 */ lui $at,0x3f80
/* 175a8: 44812000 */ mtc1 $at,$f4
@@ -1336,7 +1335,7 @@ glabel func00017588
);
GLOBAL_ASM(
glabel func00017614
glabel mtx00017614
/* 17614: 27bdff58 */ addiu $sp,$sp,-168
/* 17618: afbf0064 */ sw $ra,0x64($sp)
/* 1761c: afb00060 */ sw $s0,0x60($sp)
@@ -1379,7 +1378,7 @@ glabel func00017614
/* 176b0: e7b0007c */ swc1 $f16,0x7c($sp)
/* 176b4: e7b00010 */ swc1 $f16,0x10($sp)
/* 176b8: e7ba0020 */ swc1 $f26,0x20($sp)
/* 176bc: 0c005f0b */ jal func00017c2c
/* 176bc: 0c005f0b */ jal mtx00017c2c
/* 176c0: e7b80014 */ swc1 $f24,0x14($sp)
/* 176c4: e6000000 */ swc1 $f0,0x0($s0)
/* 176c8: c7a8006c */ lwc1 $f8,0x6c($sp)
@@ -1393,7 +1392,7 @@ glabel func00017614
/* 176e8: c7ac00a0 */ lwc1 $f12,0xa0($sp)
/* 176ec: e7a8001c */ swc1 $f8,0x1c($sp)
/* 176f0: e7a60018 */ swc1 $f6,0x18($sp)
/* 176f4: 0c005f0b */ jal func00017c2c
/* 176f4: 0c005f0b */ jal mtx00017c2c
/* 176f8: e7a40010 */ swc1 $f4,0x10($sp)
/* 176fc: 46000287 */ neg.s $f10,$f0
/* 17700: 4406a000 */ mfc1 $a2,$f20
@@ -1408,7 +1407,7 @@ glabel func00017614
/* 17724: c7ac00a0 */ lwc1 $f12,0xa0($sp)
/* 17728: e7a8001c */ swc1 $f8,0x1c($sp)
/* 1772c: e7a60018 */ swc1 $f6,0x18($sp)
/* 17730: 0c005f0b */ jal func00017c2c
/* 17730: 0c005f0b */ jal mtx00017c2c
/* 17734: e7a40010 */ swc1 $f4,0x10($sp)
/* 17738: e6000020 */ swc1 $f0,0x20($s0)
/* 1773c: c7a6007c */ lwc1 $f6,0x7c($sp)
@@ -1422,7 +1421,7 @@ glabel func00017614
/* 1775c: c7ac00a0 */ lwc1 $f12,0xa0($sp)
/* 17760: e7a6001c */ swc1 $f6,0x1c($sp)
/* 17764: e7a40018 */ swc1 $f4,0x18($sp)
/* 17768: 0c005f0b */ jal func00017c2c
/* 17768: 0c005f0b */ jal mtx00017c2c
/* 1776c: e7aa0010 */ swc1 $f10,0x10($sp)
/* 17770: 46000207 */ neg.s $f8,$f0
/* 17774: 4406b000 */ mfc1 $a2,$f22
@@ -1437,7 +1436,7 @@ glabel func00017614
/* 17798: 4600f306 */ mov.s $f12,$f30
/* 1779c: e7a6001c */ swc1 $f6,0x1c($sp)
/* 177a0: e7a40018 */ swc1 $f4,0x18($sp)
/* 177a4: 0c005f0b */ jal func00017c2c
/* 177a4: 0c005f0b */ jal mtx00017c2c
/* 177a8: e7aa0010 */ swc1 $f10,0x10($sp)
/* 177ac: 46000207 */ neg.s $f8,$f0
/* 177b0: 4406a000 */ mfc1 $a2,$f20
@@ -1452,7 +1451,7 @@ glabel func00017614
/* 177d4: 4600e306 */ mov.s $f12,$f28
/* 177d8: e7a6001c */ swc1 $f6,0x1c($sp)
/* 177dc: e7a40018 */ swc1 $f4,0x18($sp)
/* 177e0: 0c005f0b */ jal func00017c2c
/* 177e0: 0c005f0b */ jal mtx00017c2c
/* 177e4: e7aa0010 */ swc1 $f10,0x10($sp)
/* 177e8: e6000014 */ swc1 $f0,0x14($s0)
/* 177ec: c7a4006c */ lwc1 $f4,0x6c($sp)
@@ -1466,7 +1465,7 @@ glabel func00017614
/* 1780c: 4600e306 */ mov.s $f12,$f28
/* 17810: e7a4001c */ swc1 $f4,0x1c($sp)
/* 17814: e7aa0018 */ swc1 $f10,0x18($sp)
/* 17818: 0c005f0b */ jal func00017c2c
/* 17818: 0c005f0b */ jal mtx00017c2c
/* 1781c: e7a80010 */ swc1 $f8,0x10($sp)
/* 17820: 46000187 */ neg.s $f6,$f0
/* 17824: 4406a000 */ mfc1 $a2,$f20
@@ -1481,7 +1480,7 @@ glabel func00017614
/* 17848: 4600e306 */ mov.s $f12,$f28
/* 1784c: e7a4001c */ swc1 $f4,0x1c($sp)
/* 17850: e7aa0018 */ swc1 $f10,0x18($sp)
/* 17854: 0c005f0b */ jal func00017c2c
/* 17854: 0c005f0b */ jal mtx00017c2c
/* 17858: e7a80010 */ swc1 $f8,0x10($sp)
/* 1785c: e6000034 */ swc1 $f0,0x34($s0)
/* 17860: c7aa0070 */ lwc1 $f10,0x70($sp)
@@ -1495,7 +1494,7 @@ glabel func00017614
/* 17880: 4600f306 */ mov.s $f12,$f30
/* 17884: e7aa001c */ swc1 $f10,0x1c($sp)
/* 17888: e7a80018 */ swc1 $f8,0x18($sp)
/* 1788c: 0c005f0b */ jal func00017c2c
/* 1788c: 0c005f0b */ jal mtx00017c2c
/* 17890: e7a60010 */ swc1 $f6,0x10($sp)
/* 17894: e6000008 */ swc1 $f0,0x8($s0)
/* 17898: c7a80070 */ lwc1 $f8,0x70($sp)
@@ -1509,7 +1508,7 @@ glabel func00017614
/* 178b8: 4600e306 */ mov.s $f12,$f28
/* 178bc: e7a8001c */ swc1 $f8,0x1c($sp)
/* 178c0: e7a60018 */ swc1 $f6,0x18($sp)
/* 178c4: 0c005f0b */ jal func00017c2c
/* 178c4: 0c005f0b */ jal mtx00017c2c
/* 178c8: e7a40010 */ swc1 $f4,0x10($sp)
/* 178cc: 46000287 */ neg.s $f10,$f0
/* 178d0: 4406a000 */ mfc1 $a2,$f20
@@ -1524,7 +1523,7 @@ glabel func00017614
/* 178f4: 4600e306 */ mov.s $f12,$f28
/* 178f8: e7a8001c */ swc1 $f8,0x1c($sp)
/* 178fc: e7a60018 */ swc1 $f6,0x18($sp)
/* 17900: 0c005f0b */ jal func00017c2c
/* 17900: 0c005f0b */ jal mtx00017c2c
/* 17904: e7a40010 */ swc1 $f4,0x10($sp)
/* 17908: e6000028 */ swc1 $f0,0x28($s0)
/* 1790c: c7a60080 */ lwc1 $f6,0x80($sp)
@@ -1538,7 +1537,7 @@ glabel func00017614
/* 1792c: 4600e306 */ mov.s $f12,$f28
/* 17930: e7a6001c */ swc1 $f6,0x1c($sp)
/* 17934: e7a40018 */ swc1 $f4,0x18($sp)
/* 17938: 0c005f0b */ jal func00017c2c
/* 17938: 0c005f0b */ jal mtx00017c2c
/* 1793c: e7aa0010 */ swc1 $f10,0x10($sp)
/* 17940: 46000207 */ neg.s $f8,$f0
/* 17944: 4600f306 */ mov.s $f12,$f30
@@ -1555,7 +1554,7 @@ glabel func00017614
/* 17970: e7a8001c */ swc1 $f8,0x1c($sp)
/* 17974: e7a60018 */ swc1 $f6,0x18($sp)
/* 17978: e7aa0020 */ swc1 $f10,0x20($sp)
/* 1797c: 0c005f0b */ jal func00017c2c
/* 1797c: 0c005f0b */ jal mtx00017c2c
/* 17980: e7a40014 */ swc1 $f4,0x14($sp)
/* 17984: 46000107 */ neg.s $f4,$f0
/* 17988: 4600e306 */ mov.s $f12,$f28
@@ -1572,7 +1571,7 @@ glabel func00017614
/* 179b4: e7a4001c */ swc1 $f4,0x1c($sp)
/* 179b8: e7aa0018 */ swc1 $f10,0x18($sp)
/* 179bc: e7a60020 */ swc1 $f6,0x20($sp)
/* 179c0: 0c005f0b */ jal func00017c2c
/* 179c0: 0c005f0b */ jal mtx00017c2c
/* 179c4: e7a80014 */ swc1 $f8,0x14($sp)
/* 179c8: e600001c */ swc1 $f0,0x1c($s0)
/* 179cc: c7a80090 */ lwc1 $f8,0x90($sp)
@@ -1588,7 +1587,7 @@ glabel func00017614
/* 179f4: e7a6001c */ swc1 $f6,0x1c($sp)
/* 179f8: e7a40018 */ swc1 $f4,0x18($sp)
/* 179fc: e7a80020 */ swc1 $f8,0x20($sp)
/* 17a00: 0c005f0b */ jal func00017c2c
/* 17a00: 0c005f0b */ jal mtx00017c2c
/* 17a04: e7aa0014 */ swc1 $f10,0x14($sp)
/* 17a08: 46000287 */ neg.s $f10,$f0
/* 17a0c: 4407f000 */ mfc1 $a3,$f30
@@ -1605,7 +1604,7 @@ glabel func00017614
/* 17a38: e7aa001c */ swc1 $f10,0x1c($sp)
/* 17a3c: e7a80018 */ swc1 $f8,0x18($sp)
/* 17a40: e7a40020 */ swc1 $f4,0x20($sp)
/* 17a44: 0c005f0b */ jal func00017c2c
/* 17a44: 0c005f0b */ jal mtx00017c2c
/* 17a48: e7a60014 */ swc1 $f6,0x14($sp)
/* 17a4c: e600003c */ swc1 $f0,0x3c($s0)
/* 17a50: 8fbf0064 */ lw $ra,0x64($sp)
@@ -1621,7 +1620,7 @@ glabel func00017614
);
GLOBAL_ASM(
glabel func00017a78
glabel mtx00017a78
/* 17a78: 27bdff80 */ addiu $sp,$sp,-128
/* 17a7c: afbf002c */ sw $ra,0x2c($sp)
/* 17a80: c4840000 */ lwc1 $f4,0x0($a0)
@@ -1664,7 +1663,7 @@ glabel func00017a78
/* 17b14: e7b20040 */ swc1 $f18,0x40($sp)
/* 17b18: e7b2001c */ swc1 $f18,0x1c($sp)
/* 17b1c: e7a80014 */ swc1 $f8,0x14($sp)
/* 17b20: 0c005f0b */ jal func00017c2c
/* 17b20: 0c005f0b */ jal mtx00017c2c
/* 17b24: e7aa0020 */ swc1 $f10,0x20($sp)
/* 17b28: c7a40050 */ lwc1 $f4,0x50($sp)
/* 17b2c: c7a6004c */ lwc1 $f6,0x4c($sp)
@@ -1680,7 +1679,7 @@ glabel func00017a78
/* 17b54: e7a60014 */ swc1 $f6,0x14($sp)
/* 17b58: e7a80018 */ swc1 $f8,0x18($sp)
/* 17b5c: e7a40020 */ swc1 $f4,0x20($sp)
/* 17b60: 0c005f0b */ jal func00017c2c
/* 17b60: 0c005f0b */ jal mtx00017c2c
/* 17b64: e7aa001c */ swc1 $f10,0x1c($sp)
/* 17b68: c7a60050 */ lwc1 $f6,0x50($sp)
/* 17b6c: c7a8004c */ lwc1 $f8,0x4c($sp)
@@ -1696,7 +1695,7 @@ glabel func00017a78
/* 17b94: e7a80014 */ swc1 $f8,0x14($sp)
/* 17b98: e7aa0018 */ swc1 $f10,0x18($sp)
/* 17b9c: e7a60020 */ swc1 $f6,0x20($sp)
/* 17ba0: 0c005f0b */ jal func00017c2c
/* 17ba0: 0c005f0b */ jal mtx00017c2c
/* 17ba4: e7a4001c */ swc1 $f4,0x1c($sp)
/* 17ba8: c7a80060 */ lwc1 $f8,0x60($sp)
/* 17bac: c7aa005c */ lwc1 $f10,0x5c($sp)
@@ -1712,7 +1711,7 @@ glabel func00017a78
/* 17bd4: e7aa0014 */ swc1 $f10,0x14($sp)
/* 17bd8: e7a40018 */ swc1 $f4,0x18($sp)
/* 17bdc: e7a80020 */ swc1 $f8,0x20($sp)
/* 17be0: 0c005f0b */ jal func00017c2c
/* 17be0: 0c005f0b */ jal mtx00017c2c
/* 17be4: e7a6001c */ swc1 $f6,0x1c($sp)
/* 17be8: c7aa0078 */ lwc1 $f10,0x78($sp)
/* 17bec: c7a40038 */ lwc1 $f4,0x38($sp)
@@ -1733,20 +1732,20 @@ glabel func00017a78
/* 17c28: 46085001 */ sub.s $f0,$f10,$f8
);
f32 func00017c2c(f32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6, f32 arg7, f32 arg8)
f32 mtx00017c2c(f32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6, f32 arg7, f32 arg8)
{
f32 sp24;
f32 sp20;
f32 sp1c;
sp1c = func00017cbc(arg1, arg2, arg7, arg8);
sp20 = func00017cbc(arg4, arg5, arg7, arg8);
sp24 = func00017cbc(arg1, arg2, arg4, arg5);
sp1c = mtx00017cbc(arg1, arg2, arg7, arg8);
sp20 = mtx00017cbc(arg4, arg5, arg7, arg8);
sp24 = mtx00017cbc(arg1, arg2, arg4, arg5);
return sp24 * arg6 + (arg0 * sp20 - arg3 * sp1c);
}
f32 func00017cbc(f32 arg0, f32 arg1, f32 arg2, f32 arg3)
f32 mtx00017cbc(f32 arg0, f32 arg1, f32 arg2, f32 arg3)
{
return arg0 * arg3 - arg1 * arg2;
}
src/lib/mtxasm.s
+551
View File
@@ -0,0 +1,551 @@
#include "asm_helper.h"
#include "macros.inc"
.set noat
.set noreorder
.data
glabel var8005ef10
.float 65536
.float 65536
.text
glabel mtx000159b0
lui $at, 0x3f80
mtc1 $at, $f0
sw $zero, 0x4($a0)
sw $zero, 0x8($a0)
sw $zero, 0xc($a0)
sw $zero, 0x10($a0)
sw $zero, 0x18($a0)
sw $zero, 0x1c($a0)
sw $zero, 0x20($a0)
sw $zero, 0x24($a0)
sw $zero, 0x2c($a0)
sw $zero, 0x30($a0)
sw $zero, 0x34($a0)
sw $zero, 0x38($a0)
swc1 $f0, 0x0($a0)
swc1 $f0, 0x14($a0)
swc1 $f0, 0x28($a0)
jr $ra
swc1 $f0, 0x3c($a0)
glabel mtx000159fc
add $a2, $a1, $zero
glabel mtx00015a00
mfc1 $t1, $f20
mfc1 $t2, $f21
mfc1 $t3, $f22
mfc1 $t4, $f23
mfc1 $t5, $f24
addiu $t0, $zero, 0x4
lwc1 $f0, 0x0($a1)
lwc1 $f1, 0x4($a1)
lwc1 $f2, 0x8($a1)
lwc1 $f3, 0xc($a1)
lwc1 $f4, 0x10($a1)
lwc1 $f5, 0x14($a1)
lwc1 $f6, 0x18($a1)
lwc1 $f7, 0x1c($a1)
lwc1 $f8, 0x20($a1)
lwc1 $f9, 0x24($a1)
lwc1 $f10, 0x28($a1)
lwc1 $f11, 0x2c($a1)
lwc1 $f12, 0x30($a1)
lwc1 $f13, 0x34($a1)
lwc1 $f14, 0x38($a1)
lwc1 $f15, 0x3c($a1)
.L00015a58:
lwc1 $f16, 0x0($a0)
mul.s $f20, $f16, $f0
lwc1 $f17, 0x10($a0)
lwc1 $f18, 0x20($a0)
mul.s $f21, $f17, $f1
lwc1 $f19, 0x30($a0)
mul.s $f22, $f18, $f2
add.s $f20, $f20, $f21
mul.s $f21, $f19, $f3
add.s $f20, $f20, $f22
mul.s $f22, $f16, $f4
add.s $f20, $f20, $f21
mul.s $f21, $f17, $f5
swc1 $f20, 0x0($a2)
mul.s $f20, $f18, $f6
add.s $f22, $f22, $f21
mul.s $f21, $f19, $f7
addiu $a2, $a2, 0x4
mul.s $f23, $f16, $f8
add.s $f22, $f22, $f20
mul.s $f20, $f17, $f9
add.s $f22, $f22, $f21
mul.s $f21, $f18, $f10
swc1 $f22, 0xc($a2)
mul.s $f24, $f19, $f11
add.s $f23, $f23, $f20
mul.s $f22, $f16, $f12
add.s $f23, $f23, $f21
mul.s $f21, $f17, $f13
add.s $f23, $f23, $f24
mul.s $f24, $f18, $f14
swc1 $f23, 0x1c($a2)
mul.s $f23, $f19, $f15
add.s $f22, $f22, $f21
addiu $t0, $t0, -1
add.s $f22, $f22, $f24
addiu $a0, $a0, 0x4
add.s $f22, $f22, $f23
bnez $t0, .L00015a58
swc1 $f22, 0x2c($a2)
mtc1 $t1, $f20
mtc1 $t2, $f21
mtc1 $t3, $f22
mtc1 $t4, $f23
jr $ra
mtc1 $t5, $f24
glabel mtx00015b10
add $a2, $a1, $zero
glabel mtx00015b14
lwc1 $f0, 0x0($a1)
lwc1 $f1, 0x4($a1)
lwc1 $f2, 0x8($a1)
addiu $t0, $zero, 0x3
lwc1 $f3, 0x0($a0)
.L00015b28:
lwc1 $f4, 0x10($a0)
mul.s $f6, $f3, $f0
lwc1 $f5, 0x20($a0)
mul.s $f7, $f4, $f1
addiu $a0, $a0, 0x4
add.s $f9, $f6, $f7
mul.s $f8, $f5, $f2
addiu $a2, $a2, 0x4
add.s $f16, $f9, $f8
addiu $t0, $t0, -1
swc1 $f16, -0x4($a2)
bnez $t0, .L00015b28
lwc1 $f3, 0x0($a0)
jr $ra
nop
glabel mtx00015b64
add $a2, $a1, $zero
glabel mtx00015b68
lwc1 $f0, 0x0($a1)
lwc1 $f1, 0x4($a1)
lwc1 $f2, 0x8($a1)
addiu $t0, $zero, 0x3
lwc1 $f3, 0x0($a0)
.L00015b7c:
lwc1 $f4, 0x10($a0)
mul.s $f6, $f3, $f0
lwc1 $f5, 0x20($a0)
mul.s $f7, $f4, $f1
addiu $a0, $a0, 0x4
add.s $f9, $f6, $f7
mul.s $f8, $f5, $f2
addiu $a2, $a2, 0x4
add.s $f16, $f9, $f8
addiu $t0, $t0, -1
swc1 $f16, -0x4($a2)
bnez $t0, .L00015b7c
lwc1 $f3, 0x0($a0)
lwc1 $f0, -0xc($a2)
lwc1 $f1, -0x8($a2)
lwc1 $f3, 0x24($a0)
lwc1 $f4, 0x28($a0)
lwc1 $f5, 0x2c($a0)
add.s $f0, $f0, $f3
add.s $f1, $f1, $f4
add.s $f2, $f16, $f5
swc1 $f0, -0xc($a2)
swc1 $f1, -0x8($a2)
jr $ra
swc1 $f2, -0x4($a2)
glabel mtx00015be0
add $a2, $a1, $zero
glabel mtx00015be4
mfc1 $t1, $f20
mfc1 $t2, $f21
mfc1 $t3, $f22
mfc1 $t4, $f23
lwc1 $f0, 0x0($a1)
lwc1 $f1, 0x4($a1)
lwc1 $f2, 0x8($a1)
lwc1 $f3, 0x10($a1)
lwc1 $f4, 0x14($a1)
lwc1 $f5, 0x18($a1)
lwc1 $f6, 0x20($a1)
lwc1 $f7, 0x24($a1)
lwc1 $f8, 0x28($a1)
lwc1 $f9, 0x30($a1)
lwc1 $f10, 0x34($a1)
lwc1 $f11, 0x38($a1)
addiu $t0, $zero, 0x3
.L00015c28:
lwc1 $f12, 0x0($a0)
addiu $a0, $a0, 0x4
mul.s $f16, $f12, $f0
lwc1 $f13, 0xc($a0)
lwc1 $f14, 0x1c($a0)
mul.s $f17, $f13, $f1
lwc1 $f15, 0x2c($a0)
mul.s $f18, $f14, $f2
add.s $f19, $f16, $f17
mul.s $f20, $f12, $f3
add.s $f19, $f19, $f18
mul.s $f21, $f13, $f4
swc1 $f19, 0x0($a2)
mul.s $f22, $f14, $f5
add.s $f23, $f20, $f21
mul.s $f16, $f12, $f6
add.s $f23, $f23, $f22
mul.s $f17, $f13, $f7
swc1 $f23, 0x10($a2)
mul.s $f18, $f14, $f8
add.s $f19, $f16, $f17
mul.s $f20, $f12, $f9
add.s $f19, $f19, $f18
mul.s $f21, $f13, $f10
swc1 $f19, 0x20($a2)
mul.s $f22, $f14, $f11
add.s $f20, $f20, $f21
add.s $f22, $f22, $f15
addiu $t0, $t0, -1
add.s $f22, $f20, $f22
addiu $a2, $a2, 0x4
bnez $t0, .L00015c28
swc1 $f22, 0x2c($a2)
lui $at, 0x3f80
mtc1 $at, $f0
sw $zero, 0x0($a2)
sw $zero, 0x10($a2)
sw $zero, 0x20($a2)
swc1 $f0, 0x30($a2)
mtc1 $t1, $f20
mtc1 $t2, $f21
mtc1 $t3, $f22
jr $ra
mtc1 $t4, $f23
glabel mtx00015cd8
addiu $t0, $zero, 0x2
.L00015cdc:
lw $t1, 0x0($a0)
lw $t2, 0x4($a0)
lw $t3, 0x8($a0)
lw $t4, 0xc($a0)
sw $t1, 0x0($a1)
sw $t2, 0x4($a1)
sw $t3, 0x8($a1)
sw $t4, 0xc($a1)
addiu $t0, $t0, -1
addiu $a0, $a0, 0x10
bnez $t0, .L00015cdc
addiu $a1, $a1, 0x10
lw $t0, 0x0($a0)
jr $ra
sw $t0, 0x0($a1)
glabel mtx00015d18
addiu $t0, $zero, 0x4
.L00015d1c:
lw $t1, 0x0($a0)
lw $t2, 0x4($a0)
lw $t3, 0x8($a0)
lw $t4, 0xc($a0)
sw $t1, 0x0($a1)
sw $t2, 0x4($a1)
sw $t3, 0x8($a1)
sw $t4, 0xc($a1)
addiu $t0, $t0, -1
addiu $a0, $a0, 0x10
bnez $t0, .L00015d1c
addiu $a1, $a1, 0x10
jr $ra
nop
glabel mtx00015d54
addiu $t0, $zero, 0x3
lui $at, 0x3f80
mtc1 $at, $f4
.L00015d60:
lw $t1, 0x0($a0)
lw $t2, 0x4($a0)
lw $t3, 0x8($a0)
sw $t1, 0x0($a1)
sw $t2, 0x4($a1)
sw $t3, 0x8($a1)
sw $zero, 0xc($a1)
addiu $t0, $t0, -1
addiu $a1, $a1, 0x10
bnez $t0, .L00015d60
addiu $a0, $a0, 0xc
sw $zero, 0x0($a1)
sw $zero, 0x4($a1)
sw $zero, 0x8($a1)
jr $ra
swc1 $f4, 0xc($a1)
glabel mtx00015da0
addiu $t0, $zero, 0x3
.L00015da4:
lw $t1, 0x0($a0)
lw $t2, 0x4($a0)
lw $t3, 0x8($a0)
sw $t1, 0x0($a1)
sw $t2, 0x4($a1)
sw $t3, 0x8($a1)
addiu $t0, $t0, -1
addiu $a0, $a0, 0x10
bnez $t0, .L00015da4
addiu $a1, $a1, 0xc
jr $ra
nop
glabel mtx00015dd4
lw $t0, 0x0($a0)
lw $t1, 0x4($a0)
lw $t2, 0x8($a0)
sw $t0, 0x30($a1)
sw $t1, 0x34($a1)
jr $ra
sw $t2, 0x38($a1)
glabel mtx00015df0
lwc1 $f4, 0x0($a1)
lwc1 $f6, 0x4($a1)
mul.s $f8, $f4, $f12
lwc1 $f10, 0x8($a1)
mul.s $f4, $f6, $f12
lwc1 $f6, 0xc($a1)
mul.s $f10, $f10, $f12
swc1 $f8, 0x0($a1)
mul.s $f6, $f6, $f12
swc1 $f4, 0x4($a1)
swc1 $f10, 0x8($a1)
jr $ra
swc1 $f6, 0xc($a1)
glabel mtx00015e24
lwc1 $f4, 0x0($a1)
lwc1 $f6, 0x4($a1)
mul.s $f8, $f4, $f12
lwc1 $f10, 0x8($a1)
mul.s $f4, $f6, $f12
swc1 $f8, 0x0($a1)
mul.s $f10, $f10, $f12
swc1 $f4, 0x4($a1)
jr $ra
swc1 $f10, 0x8($a1)
glabel mtx00015e4c
lwc1 $f4, 0x10($a1)
lwc1 $f6, 0x14($a1)
mul.s $f8, $f4, $f12
lwc1 $f10, 0x18($a1)
mul.s $f4, $f6, $f12
lwc1 $f6, 0x1c($a1)
mul.s $f10, $f10, $f12
swc1 $f8, 0x10($a1)
mul.s $f6, $f6, $f12
swc1 $f4, 0x14($a1)
swc1 $f10, 0x18($a1)
jr $ra
swc1 $f6, 0x1c($a1)
glabel mtx00015e80
lwc1 $f4, 0x10($a1)
lwc1 $f6, 0x14($a1)
mul.s $f8, $f4, $f12
lwc1 $f10, 0x18($a1)
mul.s $f4, $f6, $f12
swc1 $f8, 0x10($a1)
mul.s $f10, $f10, $f12
swc1 $f4, 0x14($a1)
jr $ra
swc1 $f10, 0x18($a1)
glabel mtx00015ea8
lwc1 $f4, 0x20($a1)
lwc1 $f6, 0x24($a1)
mul.s $f8, $f4, $f12
lwc1 $f10, 0x28($a1)
mul.s $f4, $f6, $f12
lwc1 $f6, 0x2c($a1)
mul.s $f10, $f10, $f12
swc1 $f8, 0x20($a1)
mul.s $f6, $f6, $f12
swc1 $f4, 0x24($a1)
swc1 $f10, 0x28($a1)
jr $ra
swc1 $f6, 0x2c($a1)
glabel mtx00015edc
lwc1 $f4, 0x20($a1)
lwc1 $f6, 0x24($a1)
mul.s $f8, $f4, $f12
lwc1 $f10, 0x28($a1)
mul.s $f4, $f6, $f12
swc1 $f8, 0x20($a1)
mul.s $f10, $f10, $f12
swc1 $f4, 0x24($a1)
jr $ra
swc1 $f10, 0x28($a1)
glabel mtx00015f04
addiu $t0, $zero, 0x3
.L00015f08:
lwc1 $f4, 0x0($a1)
lwc1 $f6, 0x4($a1)
mul.s $f4, $f4, $f12
lwc1 $f8, 0x8($a1)
mul.s $f6, $f6, $f12
lwc1 $f10, 0xc($a1)
mul.s $f8, $f8, $f12
addiu $a1, $a1, 0x10
mul.s $f10, $f10, $f12
addiu $t0, $t0, -1
swc1 $f4, -0x10($a1)
swc1 $f6, -0xc($a1)
swc1 $f8, -0x8($a1)
bnez $t0, .L00015f08
swc1 $f10, -0x4($a1)
jr $ra
nop
glabel mtx00015f4c
addiu $t0, $zero, 0x3
.L00015f50:
lwc1 $f4, 0x0($a1)
lwc1 $f6, 0x4($a1)
mul.s $f4, $f4, $f12
lwc1 $f8, 0x8($a1)
mul.s $f6, $f6, $f12
addiu $a1, $a1, 0x10
mul.s $f8, $f8, $f12
addiu $t0, $t0, -1
swc1 $f4, -0x10($a1)
swc1 $f6, -0xc($a1)
bnez $t0, .L00015f50
swc1 $f8, -0x8($a1)
jr $ra
nop
glabel mtx00015f88
addiu $t0, $zero, 0x3
.L00015f8c:
lwc1 $f4, 0x0($a1)
lwc1 $f6, 0x10($a1)
mul.s $f4, $f4, $f12
lwc1 $f8, 0x20($a1)
mul.s $f6, $f6, $f12
lwc1 $f10, 0x30($a1)
mul.s $f8, $f8, $f12
addiu $a1, $a1, 0x4
mul.s $f10, $f10, $f12
addiu $t0, $t0, -1
swc1 $f4, -0x4($a1)
swc1 $f6, 0xc($a1)
swc1 $f8, 0x1c($a1)
bnez $t0, .L00015f8c
swc1 $f10, 0x2c($a1)
jr $ra
nop
/**
* Wait for the PI to be idle, then read the osRomBase variable, obfuscate its
* value and return it.
*
* The returned value is (osRomBase | 0xb764b4fd) ^ 0x0764bea1.
*
* The source of this is definitely ASM:
* - Minimal use of temporary registers
* - The load of a1 for osRecvMesg and osSendMesg should be li, not addiu
* - The load of a2 for osRecvMesg and osSendMesg use lui instead of li
*/
glabel mtxGetObfuscatedRomBase
addiu $sp, $sp, -0x20
sw $ra, 0x14($sp)
lui $a0, %hi(__osPiAccessQueue)
addiu $a0, $a0, %lo(__osPiAccessQueue)
addiu $a1, $zero, 0
jal osRecvMesg
lui $a2, 1
lui $a0, 0xa45f
ori $a0, $a0, 0xffff
addiu $a0, $a0, 0x11
.L00015ff8:
lw $t0, 0x0($a0)
andi $t0, $t0, 3
bnez $t0, .L00015ff8
nop
lui $a1, %hi(osRomBase)
lw $a1, %lo(osRomBase)($a1)
lui $a0, 0xb764
ori $a0, $a0, 0xb4fd
or $a0, $a0, $a1
lui $a1, 0x764
ori $a1, $a1, 0xbea1
xor $a0, $a0, $a1
lw $v0, 0x0($a0)
sw $v0, 0x18($sp)
lui $a0, %hi(__osPiAccessQueue)
addiu $a0, $a0, %lo(__osPiAccessQueue)
addiu $a1, $zero, 0
jal osSendMesg
lui $a2, 0
lw $v0, 0x18($sp)
lw $ra, 0x14($sp)
jr $ra
addiu $sp, $sp, 0x20
glabel mtx00016054
lui $t2, %hi(var8005ef10)
addiu $t2, $t2, %lo(var8005ef10)
addiu $t0, $zero, 0x4
lui $t1, 0xffff
lwc1 $f0, 0x0($t2)
lwc1 $f2, 0x4($t2)
.L0001606c:
lwc1 $f4, 0x0($a0)
lwc1 $f6, 0x4($a0)
mul.s $f4, $f4, $f0
lwc1 $f8, 0x8($a0)
mul.s $f6, $f6, $f0
lwc1 $f10, 0xc($a0)
trunc.w.s $f4, $f4
mul.s $f8, $f8, $f0
mfc1 $t2, $f4
trunc.w.s $f6, $f6
mul.s $f10, $f10, $f2
mfc1 $t3, $f6
trunc.w.s $f8, $f8
and $t4, $t2, $t1
srl $t5, $t3, 0x10
trunc.w.s $f10, $f10
or $t4, $t4, $t5
mfc1 $t5, $f8
sll $t2, $t2, 0x10
andi $t3, $t3, 0xffff
mfc1 $t6, $f10
or $t2, $t2, $t3
and $t7, $t5, $t1
sll $t5, $t5, 0x10
srl $t8, $t6, 0x10
andi $t6, $t6, 0xffff
or $t7, $t7, $t8
or $t5, $t5, $t6
addiu $a0, $a0, 0x10
sw $t4, 0x0($a1)
sw $t7, 0x4($a1)
sw $t2, 0x20($a1)
sw $t5, 0x24($a1)
addiu $t0, $t0, -1
bnez $t0, .L0001606c
addiu $a1, $a1, 0x8
jr $ra
nop
src/lib/ultra/gu/align.c
+1 -1
View File
@@ -1,7 +1,7 @@
#include <ultra64.h>
#include "constants.h"
#include "bss.h"
#include "lib/lib_16110.h"
#include "lib/mtx.h"
#include "data.h"
#include "types.h"
src/lib/ultra/gu/coss.c
+1 -1
View File
@@ -1,7 +1,7 @@
#include <ultra64.h>
#include "constants.h"
#include "bss.h"
#include "lib/lib_16110.h"
#include "lib/mtx.h"
#include "data.h"
#include "types.h"
src/lib/ultra/gu/rotate.c
+1 -1
View File
@@ -1,5 +1,5 @@
#include <ultra64.h>
#include "lib/lib_16110.h"
#include "lib/mtx.h"
void guRotateF(float mf[4][4], float a, float x, float y, float z)
{
src/lib/ultra/gu/sins.c
+1 -1
View File
@@ -1,7 +1,7 @@
#include <ultra64.h>
#include "constants.h"
#include "bss.h"
#include "lib/lib_16110.h"
#include "lib/mtx.h"
#include "data.h"
#include "types.h"
src/lib/ultra/io/motor.c
+1 -1
View File
@@ -1,7 +1,7 @@
#include <ultra64.h>
#include "constants.h"
#include "bss.h"
#include "lib/lib_16110.h"
#include "lib/mtx.h"
#include "data.h"
#include "types.h"
tools/patchpiracysums
+1 -1
View File
@@ -195,7 +195,7 @@ class Tool:
self.patch(algo08, 'chrConsiderGrenadeThrow', 'bgInit')
self.patch(algo09, 'bgun0f09e144', 'tagsAllocatePtrs')
self.patch(algo10, 'explosionAlertChrs', 'glassDestroy')
self.patch(algo11, 'func0f0069dc', 'func00015fd0')
self.patch(algo11, 'func0f0069dc', 'mtxGetObfuscatedRomBase')
self.patch(algo12, 'func0f15c920', 'func0f0069dc')
self.fd.close()