mirror/perfect-dark
1
0
Fork 0
mirror of https://gitlab.com/ryandwyer/perfect-dark synced 2026-08-19 13:23:49 -04:00
Code Issues Packages Projects Releases Wiki Activity

Decompile bgunTickGunLoad

Browse Source
This commit is contained in:
Ryan Dwyer
2022-07-10 21:36:13 +10:00
parent 3b78245d9c
commit c94f0e196a
11 changed files with 346 additions and 616 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/bondgun.c
+302 -569
View File
File diff suppressed because it is too large Load Diff
src/game/bondgunreset.c
+2 -2
View File
@@ -151,8 +151,8 @@ void bgunReset(void)
g_Vars.currentplayer->gunctrl.handfilenum = 0;
g_Vars.currentplayer->gunctrl.unk15a0 = 0;
g_Vars.currentplayer->gunctrl.unk15a4 = 0;
g_Vars.currentplayer->gunctrl.unk15b0 = 0;
g_Vars.currentplayer->gunctrl.unk15b1 = 0;
g_Vars.currentplayer->gunctrl.masterloadstate = 0;
g_Vars.currentplayer->gunctrl.gunloadstate = 0;
g_Vars.currentplayer->gunctrl.gunmemtype = 0;
g_Vars.currentplayer->gunctrl.gunmemnew = -1;
g_Vars.currentplayer->gunctrl.gunmemowner = GUNMEMOWNER_CHRBODY;
src/game/gunfx.c
+2 -2
View File
@@ -2018,7 +2018,7 @@ glabel var7f1acd60
/* f0adf50: 8fa40148 */ lw $a0,0x148($sp)
/* f0adf54: 0c005746 */ jal mtx4Copy
/* f0adf58: 27a500ec */ addiu $a1,$sp,0xec
/* f0adf5c: 0fc27aef */ jal bgun0f09ebbc
/* f0adf5c: 0fc27aef */ jal bgunGetCartModeldef
/* f0adf60: 00000000 */ nop
/* f0adf64: 10400004 */ beqz $v0,.L0f0adf78
/* f0adf68: 00402025 */ or $a0,$v0,$zero
@@ -2849,7 +2849,7 @@ glabel var7f1acd60
/* f0adf50: 8fa40148 */ lw $a0,0x148($sp)
/* f0adf54: 0c005746 */ jal mtx4Copy
/* f0adf58: 27a500ec */ addiu $a1,$sp,0xec
/* f0adf5c: 0fc27aef */ jal bgun0f09ebbc
/* f0adf5c: 0fc27aef */ jal bgunGetCartModeldef
/* f0adf60: 00000000 */ nop
/* f0adf64: 10400004 */ beqz $v0,.L0f0adf78
/* f0adf68: 00402025 */ or $a0,$v0,$zero
src/game/texdecompress.c
+4 -4
View File
@@ -3214,7 +3214,7 @@ void texLoadFromDisplayList(Gfx *gdl, struct texturething *arg1, s32 arg2)
while (bytes[0] != (u8)G_ENDDL) {
// Look for GBI sequence: fd...... abcd....
if (bytes[0] == G_SETTIMG && bytes[4] == 0xab && bytes[5] == 0xcd) {
texLoad((u32 *)((s32)bytes + 4), arg1, arg2);
texLoad((s32 *)((s32)bytes + 4), arg1, arg2);
}
bytes += 8;
@@ -3701,11 +3701,11 @@ void texLoadFromConfigs(struct textureconfig *configs, s32 numconfigs, struct te
}
}
void texLoadFromTextureNum(u32 arg0, struct texturething *arg1)
void texLoadFromTextureNum(u32 texturenum, struct texturething *arg1)
{
u32 sp1c = arg0;
s32 texturenumcopy = texturenum;
texLoad(&sp1c, arg1, 1);
texLoad(&texturenumcopy, arg1, 1);
}
s32 func0f173510(s32 arg0, s32 arg1, s32 arg3)
src/game/texselect.c
+1 -1
View File
@@ -282,7 +282,7 @@ void texSelect(Gfx **gdlptr, struct textureconfig *tconfig, u32 arg2, s32 arg3,
s4 = NULL;
if (tconfig->texturenum < NUM_TEXTURES) {
if ((u32)tconfig->texturenum < NUM_TEXTURES) {
texLoadFromConfigs(tconfig, 1, arg6, 0);
}