falso
/
perfect_dark
mirror of https://github.com/n64decomp/perfect_dark.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Attempt to decompile func0f0bd904

This commit is contained in:
Ryan Dwyer 2020-05-02 13:28:01 +10:00
parent 94e809ceaa
commit 26511167a8
40 changed files with 1491 additions and 494 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/game/bondbike.c
View File

@ -464,7 +464,7 @@ glabel func0f0d26ac
/* f0d26c8: 8c590288 */ lw $t9,0x288($v0)
/* f0d26cc: 8df80004 */ lw $t8,0x4($t7)
/* f0d26d0: afb8005c */ sw $t8,0x5c($sp)
/* f0d26d4: 0fc549d2 */ jal optionsGetUnk45
/* f0d26d4: 0fc549d2 */ jal optionsGetContpadNum1
/* f0d26d8: 8f240070 */ lw $a0,0x70($t9)
/* f0d26dc: 3c08800a */ lui $t0,%hi(g_Vars+0x288)
/* f0d26e0: 8d08a248 */ lw $t0,%lo(g_Vars+0x288)($t0)

4
src/game/bondeyespy.c
View File

@ -1730,7 +1730,7 @@ glabel var7f1adb00
/* f0d0954: 8f190004 */ lw $t9,0x4($t8)
/* f0d0958: e7a400e0 */ swc1 $f4,0xe0($sp)
/* f0d095c: afb900e4 */ sw $t9,0xe4($sp)
/* f0d0960: 0fc549d2 */ jal optionsGetUnk45
/* f0d0960: 0fc549d2 */ jal optionsGetContpadNum1
/* f0d0964: 8dc40070 */ lw $a0,0x70($t6)
/* f0d0968: 00022600 */ sll $a0,$v0,0x18
/* f0d096c: 00047e03 */ sra $t7,$a0,0x18
@ -1791,7 +1791,7 @@ glabel var7f1adb00
/* f0d0a40: a3bf00c2 */ sb $ra,0xc2($sp)
/* f0d0a44: afa200b0 */ sw $v0,0xb0($sp)
/* f0d0a48: a7a800bc */ sh $t0,0xbc($sp)
/* f0d0a4c: 0fc549d9 */ jal optionsGetUnk46
/* f0d0a4c: 0fc549d9 */ jal optionsGetContpadNum2
/* f0d0a50: a3a700c0 */ sb $a3,0xc0($sp)
/* f0d0a54: 00021e00 */ sll $v1,$v0,0x18
/* f0d0a58: 00037e03 */ sra $t7,$v1,0x18

6
src/game/bondmove.c
View File

@ -878,7 +878,7 @@ glabel var7f1ad8e4
/* f0c8bf4: 24050001 */ addiu $a1,$zero,0x1
/* f0c8bf8: 8e4f0288 */ lw $t7,0x288($s2)
/* f0c8bfc: afa201a8 */ sw $v0,0x1a8($sp)
/* f0c8c00: 0fc549d2 */ jal optionsGetUnk45
/* f0c8c00: 0fc549d2 */ jal optionsGetContpadNum1
/* f0c8c04: 8de40070 */ lw $a0,0x70($t7)
/* f0c8c08: 0002ae00 */ sll $s5,$v0,0x18
/* f0c8c0c: 0015c603 */ sra $t8,$s5,0x18
@ -1110,7 +1110,7 @@ glabel var7f1ad8e4
/* f0c8f34: 24010002 */ addiu $at,$zero,0x2
.L0f0c8f38:
/* f0c8f38: 8e4d0288 */ lw $t5,0x288($s2)
/* f0c8f3c: 0fc549d9 */ jal optionsGetUnk46
/* f0c8f3c: 0fc549d9 */ jal optionsGetContpadNum2
/* f0c8f40: 8da40070 */ lw $a0,0x70($t5)
/* f0c8f44: 0002a600 */ sll $s4,$v0,0x18
/* f0c8f48: 00022600 */ sll $a0,$v0,0x18
@ -4176,7 +4176,7 @@ void currentPlayerUpdateFootsteps(bool arg0, bool arg1, bool arg2, bool arg3)
&& (!g_Vars.normmplayerisrunning || PLAYERCOUNT() == 1)) {
chr = g_Vars.currentplayer->prop->chr;
if (g_Vars.currentplayer->cameramode == CAMERAMODE_0
if (g_Vars.currentplayer->cameramode == CAMERAMODE_DEFAULT
&& g_Vars.currentplayer->bdeltapos.y >= -6.0f) {
xdiff = g_Vars.currentplayer->bondprevpos.x - g_Vars.currentplayer->prop->pos.x;
ydiff = g_Vars.currentplayer->bondprevpos.y - g_Vars.currentplayer->prop->pos.y;

4
src/game/chr/chraicommands.c
View File

@ -5364,7 +5364,7 @@ bool aiSetCameraAnimation(void)
cameraDoAnimation(anim_id);
if (g_Vars.currentplayer->unk19c8 == 0) {
if (g_Vars.currentplayer->haschrbody == false) {
return true;
}
@ -10253,7 +10253,7 @@ bool aiClearInventory(void)
if (g_Vars.currentplayer == g_Vars.bond || g_Vars.currentplayer == g_Vars.coop) {
currentPlayerClearInventory();
g_Vars.currentplayer->unk00c4 = 0;
g_Vars.currentplayer->itemswitch = 0;
currentPlayerGiveWeapon(WEAPON_UNARMED);
currentPlayerEquipWeaponInCutscene(WEAPON_UNARMED);
}

4
src/game/data/data_0160b0.c
View File

@ -296,8 +296,8 @@ struct var800705c0 var800705c0[] = {
{ 0x0000, 0x0190, 0x0000, 0x012c, 0x00000190, 0x3f800000, 0x00000002, 0x0000012c, 0x00000000, 0x0000012c, 0x00000000, 0x0000012c, 0x00000000 },
};
s32 var800706c8 = 0;
bool g_HiRes = false;
s32 g_HiResActive = 0;
bool g_HiResEnabled = false;
u32 var800706d0 = 0x00000000;
u32 var800706d4 = 0x00000000;
u32 var800706d8 = 0x00000000;

4
src/game/game_01b0a0.c
View File

@ -190,7 +190,7 @@ glabel activemenuTick
/* f01b308: 3c0f800a */ lui $t7,%hi(g_Vars+0x288)
/* f01b30c: 8defa248 */ lw $t7,%lo(g_Vars+0x288)($t7)
/* f01b310: afa200d4 */ sw $v0,0xd4($sp)
/* f01b314: 0fc549d2 */ jal optionsGetUnk45
/* f01b314: 0fc549d2 */ jal optionsGetContpadNum1
/* f01b318: 8de40070 */ lw $a0,0x70($t7)
/* f01b31c: 0c005207 */ jal func0001481c
/* f01b320: a3a200d3 */ sb $v0,0xd3($sp)
@ -361,7 +361,7 @@ glabel activemenuTick
/* f01b568: 00000000 */ sll $zero,$zero,0x0
.L0f01b56c:
/* f01b56c: 8d4aa248 */ lw $t2,%lo(g_Vars+0x288)($t2)
/* f01b570: 0fc549d9 */ jal optionsGetUnk46
/* f01b570: 0fc549d9 */ jal optionsGetContpadNum2
/* f01b574: 8d440070 */ lw $a0,0x70($t2)
/* f01b578: 00028600 */ sll $s0,$v0,0x18
/* f01b57c: 00022e00 */ sll $a1,$v0,0x18

4
src/game/game_01bea0.c
View File

@ -108,8 +108,8 @@ glabel var7f1a863c
.word menuTick+0x168c # f01d5b4
.text
/* f01bf28: 27bdfe98 */ addiu $sp,$sp,-360
/* f01bf2c: 3c0e8007 */ lui $t6,%hi(var800706c8)
/* f01bf30: 8dce06c8 */ lw $t6,%lo(var800706c8)($t6)
/* f01bf2c: 3c0e8007 */ lui $t6,%hi(g_HiResActive)
/* f01bf30: 8dce06c8 */ lw $t6,%lo(g_HiResActive)($t6)
/* f01bf34: afb60040 */ sw $s6,0x40($sp)
/* f01bf38: 24160001 */ addiu $s6,$zero,0x1
/* f01bf3c: afb00028 */ sw $s0,0x28($sp)

6
src/game/game_097ba0.c
View File

@ -10505,7 +10505,7 @@ glabel var7f1ac740
/* f0a02f0: 318b0800 */ andi $t3,$t4,0x800
/* f0a02f4: 51600004 */ beqzl $t3,.L0f0a0308
/* f0a02f8: 8e050048 */ lw $a1,0x48($s0)
/* f0a02fc: 0fc2f52a */ jal func0f0bd4a8
/* f0a02fc: 0fc2f52a */ jal currentPlayerLaunchSlayerRocket
/* f0a0300: 02002025 */ or $a0,$s0,$zero
/* f0a0304: 8e050048 */ lw $a1,0x48($s0)
.L0f0a0308:
@ -22602,14 +22602,14 @@ glabel hudRenderAmmo
/* f0aa980: 8fa20130 */ lw $v0,0x130($sp)
/* f0aa984: 8c6e000c */ lw $t6,0xc($v1)
.L0f0aa988:
/* f0aa988: 3c0f8007 */ lui $t7,%hi(var800706c8)
/* f0aa988: 3c0f8007 */ lui $t7,%hi(g_HiResActive)
/* f0aa98c: 29c10005 */ slti $at,$t6,0x5
/* f0aa990: 10200003 */ beqz $at,.L0f0aa9a0
/* f0aa994: 00000000 */ sll $zero,$zero,0x0
/* f0aa998: 10000449 */ beqz $zero,.L0f0abac0
/* f0aa99c: 8fa20130 */ lw $v0,0x130($sp)
.L0f0aa9a0:
/* f0aa9a0: 8def06c8 */ lw $t7,%lo(var800706c8)($t7)
/* f0aa9a0: 8def06c8 */ lw $t7,%lo(g_HiResActive)($t7)
/* f0aa9a4: 24020001 */ addiu $v0,$zero,0x1
/* f0aa9a8: 144f0004 */ bne $v0,$t7,.L0f0aa9bc
/* f0aa9ac: 24180002 */ addiu $t8,$zero,0x2

1732
src/game/game_0b63b0.c
View File

File diff suppressed because it is too large Load Diff

4
src/game/game_0d7070.c
View File

@ -6344,14 +6344,14 @@ glabel var7f1ade74
/* f0dca78: 00801025 */ or $v0,$a0,$zero
/* f0dca7c: 8c4f1580 */ lw $t7,0x1580($v0)
.L0f0dca80:
/* f0dca80: 3c198007 */ lui $t9,%hi(var800706c8)
/* f0dca80: 3c198007 */ lui $t9,%hi(g_HiResActive)
/* f0dca84: 31f80001 */ andi $t8,$t7,0x1
/* f0dca88: 13000003 */ beqz $t8,.L0f0dca98
/* f0dca8c: 00000000 */ sll $zero,$zero,0x0
/* f0dca90: 100000c2 */ beqz $zero,.L0f0dcd9c
/* f0dca94: 8fa20030 */ lw $v0,0x30($sp)
.L0f0dca98:
/* f0dca98: 8f3906c8 */ lw $t9,%lo(var800706c8)($t9)
/* f0dca98: 8f3906c8 */ lw $t9,%lo(g_HiResActive)($t9)
/* f0dca9c: 24080001 */ addiu $t0,$zero,0x1
/* f0dcaa0: 24090002 */ addiu $t1,$zero,0x2
/* f0dcaa4: 15190004 */ bne $t0,$t9,.L0f0dcab8

18
src/game/game_0dcdb0.c
View File

@ -99,8 +99,8 @@ s32 func0f0dcdbc(void)
|| g_Vars.antiplayernum >= 0)
&& var80075d60 == 2
&& currentPlayerGetSight() == SIGHT_ZOOM
&& g_Vars.currentplayer->cameramode != CAMERAMODE_2
&& g_Vars.currentplayer->cameramode != CAMERAMODE_CUTSCENE;
&& g_Vars.currentplayer->cameramode != CAMERAMODE_EYESPY
&& g_Vars.currentplayer->cameramode != CAMERAMODE_THIRDPERSON;
}
GLOBAL_ASM(
@ -2674,8 +2674,8 @@ glabel hudmsgCreate
.L0f0defbc:
/* f0defbc: 04c100e3 */ bgez $a2,.L0f0df34c
.L0f0defc0:
/* f0defc0: 3c0a8007 */ lui $t2,%hi(var800706c8)
/* f0defc4: 8d4a06c8 */ lw $t2,%lo(var800706c8)($t2)
/* f0defc0: 3c0a8007 */ lui $t2,%hi(g_HiResActive)
/* f0defc4: 8d4a06c8 */ lw $t2,%lo(g_HiResActive)($t2)
/* f0defc8: 24030001 */ addiu $v1,$zero,0x1
/* f0defcc: 3c048007 */ lui $a0,%hi(g_NumHudMessages)
/* f0defd0: 8c840fe8 */ lw $a0,%lo(g_NumHudMessages)($a0)
@ -2977,7 +2977,7 @@ glabel hudmsgCreate
// }
// }
//
// var8007fac0 = var800706c8 == 1 ? 2 : 1;
// var8007fac0 = g_HiResActive == 1 ? 2 : 1;
//
// // Find an unused index for the new message
// for (index = 0; index < g_NumHudMessages; index++) {
@ -3090,8 +3090,8 @@ glabel var7f1aded8
.word func0f0df364+0x604 # f0df968
.text
/* f0df364: 27bdff90 */ addiu $sp,$sp,-112
/* f0df368: 3c0e8007 */ lui $t6,%hi(var800706c8)
/* f0df36c: 8dce06c8 */ lw $t6,%lo(var800706c8)($t6)
/* f0df368: 3c0e8007 */ lui $t6,%hi(g_HiResActive)
/* f0df36c: 8dce06c8 */ lw $t6,%lo(g_HiResActive)($t6)
/* f0df370: afb20030 */ sw $s2,0x30($sp)
/* f0df374: 24120001 */ addiu $s2,$zero,0x1
/* f0df378: 3c018007 */ lui $at,%hi(var80070fb0)
@ -3599,8 +3599,8 @@ glabel var7f1adef4
.word func0f0dfad0+0x7c8 # f0e0298
.text
/* f0dfad0: 27bdff00 */ addiu $sp,$sp,-256
/* f0dfad4: 3c0f8007 */ lui $t7,%hi(var800706c8)
/* f0dfad8: 8def06c8 */ lw $t7,%lo(var800706c8)($t7)
/* f0dfad4: 3c0f8007 */ lui $t7,%hi(g_HiResActive)
/* f0dfad8: 8def06c8 */ lw $t7,%lo(g_HiResActive)($t7)
/* f0dfadc: afb20060 */ sw $s2,0x60($sp)
/* f0dfae0: 24020001 */ addiu $v0,$zero,0x1
/* f0dfae4: 240e00ff */ addiu $t6,$zero,0xff

4
src/game/game_0e0770.c
View File

@ -82,8 +82,8 @@ glabel func0f0e0770
/* f0e079c: afb00018 */ sw $s0,0x18($sp)
/* f0e07a0: 0c002f02 */ jal func0000bc08
/* f0e07a4: 00408025 */ or $s0,$v0,$zero
/* f0e07a8: 3c0e8007 */ lui $t6,%hi(var800706c8)
/* f0e07ac: 8dce06c8 */ lw $t6,%lo(var800706c8)($t6)
/* f0e07a8: 3c0e8007 */ lui $t6,%hi(g_HiResActive)
/* f0e07ac: 8dce06c8 */ lw $t6,%lo(g_HiResActive)($t6)
/* f0e07b0: 24110001 */ addiu $s1,$zero,0x1
/* f0e07b4: 0002f840 */ sll $ra,$v0,0x1
/* f0e07b8: 162e0005 */ bne $s1,$t6,.L0f0e07d0

12
src/game/game_0f09f0.c
View File

@ -4197,7 +4197,7 @@ glabel var7f1b2948
/* f0f400c: 46046032 */ c.eq.s $f12,$f4
/* f0f4010: c4202938 */ lwc1 $f0,%lo(var7f1b2938)($at)
/* f0f4014: 24639fc0 */ addiu $v1,$v1,%lo(g_Vars)
/* f0f4018: 3c0b8007 */ lui $t3,%hi(var800706c8)
/* f0f4018: 3c0b8007 */ lui $t3,%hi(g_HiResActive)
/* f0f401c: 45030013 */ bc1tl .L0f0f406c
/* f0f4020: c60c0540 */ lwc1 $f12,0x540($s0)
/* f0f4024: 8c6d0000 */ lw $t5,0x0($v1)
@ -4271,7 +4271,7 @@ glabel var7f1b2948
/* f0f4120: c60e051c */ lwc1 $f14,0x51c($s0)
/* f0f4124: c60a0510 */ lwc1 $f10,0x510($s0)
.L0f0f4128:
/* f0f4128: 8d6b06c8 */ lw $t3,%lo(var800706c8)($t3)
/* f0f4128: 8d6b06c8 */ lw $t3,%lo(g_HiResActive)($t3)
/* f0f412c: 24010001 */ addiu $at,$zero,0x1
/* f0f4130: e7aa0430 */ swc1 $f10,0x430($sp)
/* f0f4134: c6120518 */ lwc1 $f18,0x518($s0)
@ -7839,7 +7839,7 @@ glabel var7f1b296c
/* f0f7500: 3c09800a */ lui $t1,%hi(g_Vars+0x288)
/* f0f7504: 8d29a248 */ lw $t1,%lo(g_Vars+0x288)($t1)
/* f0f7508: 8d240070 */ lw $a0,0x70($t1)
/* f0f750c: 0fc549d2 */ jal optionsGetUnk45
/* f0f750c: 0fc549d2 */ jal optionsGetContpadNum1
/* f0f7510: afa60018 */ sw $a2,0x18($sp)
/* f0f7514: 8fa60018 */ lw $a2,0x18($sp)
/* f0f7518: 3c03800a */ lui $v1,%hi(g_Vars)
@ -7866,7 +7866,7 @@ glabel var7f1b296c
/* f0f756c: 8fbf0014 */ lw $ra,0x14($sp)
.L0f0f7570:
/* f0f7570: 8dcea248 */ lw $t6,%lo(g_Vars+0x288)($t6)
/* f0f7574: 0fc549d9 */ jal optionsGetUnk46
/* f0f7574: 0fc549d9 */ jal optionsGetContpadNum2
/* f0f7578: 8dc40070 */ lw $a0,0x70($t6)
/* f0f757c: 8faf001c */ lw $t7,0x1c($sp)
/* f0f7580: a1e20000 */ sb $v0,0x0($t7)
@ -13033,8 +13033,8 @@ glabel var7f1b2afc
/* f0fbc38: 3c118007 */ lui $s1,%hi(g_MpPlayerNum)
/* f0fbc3c: 26311448 */ addiu $s1,$s1,%lo(g_MpPlayerNum)
/* f0fbc40: ae200000 */ sw $zero,0x0($s1)
/* f0fbc44: 3c0e8007 */ lui $t6,%hi(var800706c8)
/* f0fbc48: 8dce06c8 */ lw $t6,%lo(var800706c8)($t6)
/* f0fbc44: 3c0e8007 */ lui $t6,%hi(g_HiResActive)
/* f0fbc48: 8dce06c8 */ lw $t6,%lo(g_HiResActive)($t6)
/* f0fbc4c: afb50048 */ sw $s5,0x48($sp)
/* f0fbc50: 24020001 */ addiu $v0,$zero,0x1
/* f0fbc54: 0080a825 */ or $s5,$a0,$zero

4
src/game/game_0fd660.c
View File

@ -3087,8 +3087,8 @@ u32 var800719c0 = 0xff4f00ff;
GLOBAL_ASM(
glabel func0f100ad0
/* f100ad0: 27bdfe28 */ addiu $sp,$sp,-472
/* f100ad4: 3c0e8007 */ lui $t6,%hi(var800706c8)
/* f100ad8: 8dce06c8 */ lw $t6,%lo(var800706c8)($t6)
/* f100ad4: 3c0e8007 */ lui $t6,%hi(g_HiResActive)
/* f100ad8: 8dce06c8 */ lw $t6,%lo(g_HiResActive)($t6)
/* f100adc: 24010001 */ addiu $at,$zero,0x1
/* f100ae0: afbf004c */ sw $ra,0x4c($sp)
/* f100ae4: afbe0048 */ sw $s8,0x48($sp)

2
src/game/game_102240.c
View File

@ -390,7 +390,7 @@ s32 menuhandlerHiRes(u32 operation, struct menu_item *item, bool *enable)
}
break;
case MENUOP_GET:
return g_HiRes == true;
return g_HiResEnabled == true;
case MENUOP_SET:
optionsSetHiRes(*enable ? 1 : 0);
g_Vars.unk000458 |= 1;

8
src/game/game_11f000.c
View File

@ -7302,14 +7302,14 @@ glabel var7f1b5108
/* f125aec: 11e00005 */ beqz $t7,.L0f125b04
/* f125af0: 00000000 */ sll $zero,$zero,0x0
/* f125af4: 8f18a2d4 */ lw $t8,%lo(g_Vars+0x314)($t8)
/* f125af8: 3c198007 */ lui $t9,%hi(var800706c8)
/* f125af8: 3c198007 */ lui $t9,%hi(g_HiResActive)
/* f125afc: 13000003 */ beqz $t8,.L0f125b0c
/* f125b00: 00000000 */ sll $zero,$zero,0x0
.L0f125b04:
/* f125b04: 1000020d */ beqz $zero,.L0f12633c
/* f125b08: 8fa20170 */ lw $v0,0x170($sp)
.L0f125b0c:
/* f125b0c: 8f3906c8 */ lw $t9,%lo(var800706c8)($t9)
/* f125b0c: 8f3906c8 */ lw $t9,%lo(g_HiResActive)($t9)
/* f125b10: 24010001 */ addiu $at,$zero,0x1
/* f125b14: 17210002 */ bne $t9,$at,.L0f125b20
/* f125b18: 00000000 */ sll $zero,$zero,0x0
@ -7941,7 +7941,7 @@ glabel var7f1b511c
/* f126458: af210000 */ sw $at,0x0($t9)
/* f12645c: 8f010008 */ lw $at,0x8($t8)
/* f126460: 8f08000c */ lw $t0,0xc($t8)
/* f126464: 3c0c8007 */ lui $t4,%hi(var800706c8)
/* f126464: 3c0c8007 */ lui $t4,%hi(g_HiResActive)
/* f126468: af210008 */ sw $at,0x8($t9)
/* f12646c: af28000c */ sw $t0,0xc($t9)
/* f126470: 8f080014 */ lw $t0,0x14($t8)
@ -7949,7 +7949,7 @@ glabel var7f1b511c
/* f126478: 4487b000 */ mtc1 $a3,$f22
/* f12647c: af280014 */ sw $t0,0x14($t9)
/* f126480: af210010 */ sw $at,0x10($t9)
/* f126484: 8d8c06c8 */ lw $t4,%lo(var800706c8)($t4)
/* f126484: 8d8c06c8 */ lw $t4,%lo(g_HiResActive)($t4)
/* f126488: 4485d000 */ mtc1 $a1,$f26
/* f12648c: 4486e000 */ mtc1 $a2,$f28
/* f126490: 24010001 */ addiu $at,$zero,0x1

6
src/game/game_141820.c
View File

@ -3974,7 +3974,7 @@ glabel hudRenderEyespyUi
/* f14518c: 00402025 */ or $a0,$v0,$zero
/* f145190: 8ed90288 */ lw $t9,0x288($s6)
/* f145194: 0040a825 */ or $s5,$v0,$zero
/* f145198: 0fc549d2 */ jal optionsGetUnk45
/* f145198: 0fc549d2 */ jal optionsGetContpadNum1
/* f14519c: 8f240070 */ lw $a0,0x70($t9)
/* f1451a0: 00028600 */ sll $s0,$v0,0x18
/* f1451a4: 00022600 */ sll $a0,$v0,0x18
@ -7070,8 +7070,8 @@ glabel hudRenderHorizonScanner
.L0f147f30:
/* f147f30: 0c004c4c */ jal strcpy
/* f147f34: 24a55eb4 */ addiu $a1,$a1,%lo(var7f1b5eb4)
/* f147f38: 3c0e8007 */ lui $t6,%hi(var800706c8)
/* f147f3c: 8dce06c8 */ lw $t6,%lo(var800706c8)($t6)
/* f147f38: 3c0e8007 */ lui $t6,%hi(g_HiResActive)
/* f147f3c: 8dce06c8 */ lw $t6,%lo(g_HiResActive)($t6)
/* f147f40: 24060001 */ addiu $a2,$zero,0x1
/* f147f44: 14ce0002 */ bne $a2,$t6,.L0f147f50
/* f147f48: 240f0002 */ addiu $t7,$zero,0x2

4
src/game/game_18e5a0.c
View File

@ -1350,14 +1350,14 @@ glabel func0f18f874
/* f18f9c4: 17000005 */ bnez $t8,.L0f18f9dc
/* f18f9c8: 00000000 */ sll $zero,$zero,0x0
/* f18f9cc: 8d0f00d8 */ lw $t7,0xd8($t0)
/* f18f9d0: 3c198007 */ lui $t9,%hi(var800706c8)
/* f18f9d0: 3c198007 */ lui $t9,%hi(g_HiResActive)
/* f18f9d4: 11e00003 */ beqz $t7,.L0f18f9e4
/* f18f9d8: 00000000 */ sll $zero,$zero,0x0
.L0f18f9dc:
/* f18f9dc: 1000019a */ beqz $zero,.L0f190048
/* f18f9e0: 8fa20088 */ lw $v0,0x88($sp)
.L0f18f9e4:
/* f18f9e4: 8f3906c8 */ lw $t9,%lo(var800706c8)($t9)
/* f18f9e4: 8f3906c8 */ lw $t9,%lo(g_HiResActive)($t9)
/* f18f9e8: 24020001 */ addiu $v0,$zero,0x1
/* f18f9ec: 14590004 */ bne $v0,$t9,.L0f18fa00
/* f18f9f0: 240a0002 */ addiu $t2,$zero,0x2

2
src/game/game_19c990.c
View File

@ -4917,7 +4917,7 @@ void dtRestorePlayer(void)
func0f0926bc(g_Vars.currentplayer->eyespy->prop, 1, 0xffff);
g_Vars.currentplayer->unk00c4 &= ~0x04;
g_Vars.currentplayer->itemswitch &= ~0x04;
}
}

8
src/game/gamefile.c
View File

@ -145,8 +145,8 @@ void savefileLoadDefaults(struct savefile_solo *file)
audioSetSfxVolume(0x5000);
optionsSetMusicVolume(0x5000);
audioSetSoundMode(SOUNDMODE_STEREO);
optionsSetControlMode(player1, CONTROLMODE_SINGLE);
optionsSetControlMode(player2, CONTROLMODE_SINGLE);
optionsSetControlMode(player1, CONTROLMODE_11);
optionsSetControlMode(player2, CONTROLMODE_11);
func0f11e5bc(&file->flags);
bitSetByIndex(SAVEFILEFLAG_P1_FORWARDPITCH, &file->flags, false);
@ -731,8 +731,8 @@ glabel func0f10feac
/* f1101d0: 24040008 */ addiu $a0,$zero,0x8
/* f1101d4: 0fc4794c */ jal bitSetByIndex
/* f1101d8: 02002825 */ or $a1,$s0,$zero
/* f1101dc: 3c188007 */ lui $t8,%hi(var800706c8)
/* f1101e0: 8f1806c8 */ lw $t8,%lo(var800706c8)($t8)
/* f1101dc: 3c188007 */ lui $t8,%hi(g_HiResActive)
/* f1101e0: 8f1806c8 */ lw $t8,%lo(g_HiResActive)($t8)
/* f1101e4: 24040022 */ addiu $a0,$zero,0x22
/* f1101e8: 02002825 */ or $a1,$s0,$zero
/* f1101ec: 02583026 */ xor $a2,$s2,$t8

4
src/game/pdoptions.c
View File

@ -22,12 +22,12 @@ void optionsSetControlMode(s32 mpchrnum, s32 mode)
g_MpPlayers[mpchrnum].base.controlmode = mode;
}
s32 optionsGetUnk45(s32 mpchrnum)
s32 optionsGetContpadNum1(s32 mpchrnum)
{
return g_MpPlayers[mpchrnum].base.unk45;
}
s32 optionsGetUnk46(s32 mpchrnum)
s32 optionsGetContpadNum2(s32 mpchrnum)
{
return g_MpPlayers[mpchrnum].base.unk46;
}

4
src/game/propobj.c
View File

@ -48550,8 +48550,8 @@ glabel var7f1ab1a8
/* f090a10: 00000000 */ sll $zero,$zero,0x0
/* f090a14: 26100008 */ addiu $s0,$s0,0x8
.L0f090a18:
/* f090a18: 3c0a8007 */ lui $t2,%hi(var800706c8)
/* f090a1c: 8d4a06c8 */ lw $t2,%lo(var800706c8)($t2)
/* f090a18: 3c0a8007 */ lui $t2,%hi(g_HiResActive)
/* f090a1c: 8d4a06c8 */ lw $t2,%lo(g_HiResActive)($t2)
/* f090a20: 24010001 */ addiu $at,$zero,0x1
/* f090a24: 44803000 */ mtc1 $zero,$f6
/* f090a28: 55410008 */ bnel $t2,$at,.L0f090a4c

29
src/include/constants.h
View File

@ -190,9 +190,9 @@
#define BANK_2 2
#define BANK_3 3
#define CAMERAMODE_0 0
#define CAMERAMODE_CUTSCENE 1
#define CAMERAMODE_2 2
#define CAMERAMODE_DEFAULT 0
#define CAMERAMODE_THIRDPERSON 1
#define CAMERAMODE_EYESPY 2
#define CASING_NONE -1
#define CASING_STANDARD 0
@ -438,8 +438,15 @@
#define COLOR_08_RED 0x08
#define COLOR_09_BLUE 0x09
#define CONTROLMODE_SINGLE 0
#define CONTROLMODE_DOUBLE 1
// Control styles - 1.1, 1.2 etc
#define CONTROLMODE_11 0
#define CONTROLMODE_12 1
#define CONTROLMODE_13 2
#define CONTROLMODE_14 3
#define CONTROLMODE_21 4
#define CONTROLMODE_22 5
#define CONTROLMODE_23 6
#define CONTROLMODE_24 7
#define COVERFLAG_0001 0x0001
#define COVERFLAG_0002 0x0002
@ -570,8 +577,8 @@
#define GAILIST_HAND_COMBAT 0x000f
#define GAILIST_CIVILIAN_SAY_COMMENT 0x0010
#define GAILIST_FLEE_FROM_GRENADE 0x0011
#define GAILIST_INIT_COOP_100 0x0012 // unused
#define GAILIST_INIT_COOP_200 0x0013 // unused
#define GAILIST_INIT_COOP_100 0x0012
#define GAILIST_INIT_COOP_200 0x0013
#define GAILIST_COOP_BUDDY 0x0014
#define GAILIST_AIBUDDY_STEALTH 0x0015
#define GAILIST_SHOW_OBJ_FAILED_MSG 0x0016
@ -2097,6 +2104,7 @@
#define PAUSEMODE_0 0
#define PAUSEMODE_1 1
#define PAUSEMODE_2 2
#define PAUSEMODE_3 3
#define PDMODEPROP_REACTION 0
@ -2515,6 +2523,7 @@
#define TICKMODE_1 1
#define TICKMODE_3 3
#define TICKMODE_4 4
#define TICKMODE_5 5
#define TICKMODE_6 6
#define TICKMODE_AUTOWALK 7
@ -2526,6 +2535,7 @@
#define VISIONMODE_NORMAL 0
#define VISIONMODE_XRAY 1
#define VISIONMODE_SLAYERROCKET 2
#define VISIONMODE_3 3
#define WEAPON_NONE 0x00
#define WEAPON_UNARMED 0x01
@ -2797,6 +2807,11 @@
#define VERSION_PAL_FINAL 4
#define VERSION_JAP_FINAL 5
#define VOICEBOX_0 0
#define VOICEBOX_1 1
#define VOICEBOX_2 2
#define VOICEBOX_3 3
#if VERSION == VERSION_NTSC_1_0
#define CHECKSUM_7F0225CC 0x5874fe3a
#define CHECKSUM_7F02DC00 0x27be1bf0

2
src/include/game/bondeyespy.h
View File

@ -13,6 +13,6 @@ u32 func0f0cfafc(void);
s32 func0f0cfdd0(struct coord *arg0, struct coord *arg1, struct coord *arg2);
u32 func0f0cfe24(void);
u32 func0f0d0310(void);
u32 func0f0d0928(void);
void func0f0d0928(bool arg0);
#endif

2
src/include/game/chr/chraction.h
View File

@ -179,7 +179,7 @@ u32 func0f048fcc(void);
u32 func0f049068(struct chrdata *chr, u32 arg1, u32 arg2);
bool func0f04911c(struct chrdata *chr, struct coord *pos, u8 arg2);
f32 chrGetSameFloorDistanceToPad(struct chrdata *chr, s32 pad_id);
u32 func0f049644(void);
void func0f049644(u32 playernum);
s32 chrResolveId(struct chrdata *ref, s32 id);
f32 chrGetTimer(struct chrdata *chr);
u32 func0f049fcc(struct chrdata *chr);

4
src/include/game/data/data_0160b0.h
View File

@ -55,8 +55,8 @@ extern u32 var800705b4;
extern u32 var800705b8;
extern u32 var800705bc;
extern struct var800705c0 var800705c0[];
extern s32 var800706c8;
extern bool g_HiRes;
extern s32 g_HiResActive;
extern bool g_HiResEnabled;
extern u32 var8007072c;
extern u32 var80070738;
extern u32 var8007073c;

4
src/include/game/game_016100.h
View File

@ -42,8 +42,8 @@ u32 func0f01ab94(void);
u32 func0f01aba8(void);
u32 func0f01abf0(void);
u32 func0f01aca8(u32 arg0);
u32 func0f01ad5c(void);
u32 func0f01adb8(void);
bool func0f01ad5c(void);
void func0f01adb8(void);
void func0f01ae30(void);
u32 func0f01aef0(void);
void func0f016444(void);

6
src/include/game/game_096ca0.h
View File

@ -4,12 +4,12 @@
#include "types.h"
u32 func0f096ca0(void);
u32 func0f096ed4(void);
u32 func0f097044(void);
void func0f096ed4(f32 *arg0, f32 *arg1);
void func0f097044(f32 *matrix, f32 *arg1);
u32 func0f097264(void);
u32 func0f0972b8(void);
u32 func0f097518(void);
u32 func0f0976c0(void);
u32 func0f097738(void);
void func0f097738(f32 *arg0, f32 *arg1, f32 *arg2);
#endif

2
src/include/game/game_097ba0.h
View File

@ -172,7 +172,7 @@ u32 func0f0abb80(void);
u32 func0f0abba8(void);
u32 func0f0abbe8(void);
void func0f0abc28(void);
void func0f0abc74(u32 arg0, u32 arg1);
void func0f0abc74(u32 arg0, s32 arg1);
Gfx *func0f0abcb0(Gfx *gdl);
u32 func0f0abd30(void);
u32 getCurrentPlayerWeaponIdWrapper(u32 arg0);

42
src/include/game/game_0b63b0.h
View File

@ -19,45 +19,45 @@ void func0f0b802c(void);
void func0f0b85a0(f32 *arg0, struct coord *pos);
u32 func0f0b85f8(void);
void func0f0b872c(s32 *bodynum, s32 *headnum, s32 arg2);
u32 func0f0b8ba0(void);
u32 func0f0b9538(void);
u32 func0f0b96e8(void);
u32 func0f0b9cbc(void);
void func0f0b8ba0(void);
void func0f0b9538(void);
void func0f0b96e8(void);
void func0f0b9cbc(void);
void cameraDoAnimation(s16 anim_id);
u32 func0f0ba190(u32 arg0);
u32 func0f0ba29c(void);
void func0f0ba29c(bool arg0);
f32 getVar8009de1c(void);
void currentPlayerSetZoomFovY(f32 fovy, f32 timemax);
f32 currentPlayerGetZoomFovY(void);
void func0f0ba8b0(f32 value);
f32 currentPlayerGetTeleportFovY(void);
void currentPlayerUpdateZoom(void);
u32 func0f0bace0(void);
u32 func0f0bad6c(void);
void func0f0bace0(void);
void func0f0bad6c(void);
void currentPlayerPause(u32 mode);
void func0f0baf38(void);
Gfx *func0f0baf84(Gfx *gdl);
Gfx *fadeDraw(Gfx *gdl, u32 r, u32 g, u32 b, f32 frac);
Gfx *currentPlayerDrawFade(Gfx *gdl);
u32 func0f0bb42c(void);
u32 func0f0bb5ec(void);
void func0f0bb42c(void);
void func0f0bb5ec(void);
void func0f0bb69c(void);
u32 func0f0bb814(void);
void func0f0bb814(void);
u32 func0f0bbf14(void);
Gfx *func0f0bbf78(Gfx *gdl);
void currentPlayerSurroundWithExplosions(s32 arg0);
u32 func0f0bc120(void);
void func0f0bc120(void);
void func0f0bc3f0(void);
s16 func0f0bc44c(void);
s16 func0f0bc478(void);
u32 func0f0bc4c0(void);
u32 func0f0bc554(void);
u32 func0f0bc7ac(void);
u32 func0f0bcaa0(void);
u32 func0f0bce24(void);
u32 func0f0bd358(void);
u32 func0f0bd3c4(void);
u32 func0f0bd4e4(void);
s16 func0f0bc554(void);
s16 func0f0bc7ac(void);
s32 func0f0bcaa0(void);
s16 func0f0bce24(void);
f32 func0f0bd358(void);
void func0f0bd3c4(void);
void func0f0bd4e4(f32 *arg0);
u32 func0f0bd764(void);
void func0f0bd904(bool arg0);
u32 func0f0bfc7c(void);
@ -69,9 +69,9 @@ void currentPlayerDie(bool force);
void currentPlayerDieByShooter(u32 shooter, bool force);
u32 func0f0c160c(void);
u32 func0f0c16f4(void);
u32 func0f0c1840(void);
void func0f0c1840(struct coord *arg0, struct coord *arg1, struct coord *arg2, struct coord *pos, s16 *rooms);
u32 func0f0c1ba4(void);
u32 func0f0c1bd8(void);
void func0f0c1bd8(struct coord *pos, struct coord *up, struct coord *look);
void func0f0c1d20(void);
void func0f0c1e54(struct prop *prop, bool enable);
u32 func0f0c1f08(void);
@ -103,7 +103,7 @@ bool currentPlayerIsFadeComplete(void);
void func0f0bb57c(f32 arg0, f32 arg1);
void optionsSetHiRes(bool enable);
void currentPlayerAutoWalk(s16 aimpad, u8 walkspeed, u8 turnspeed, u8 lookup, u8 dist);
void func0f0bd4a8(u32 arg0);
void currentPlayerLaunchSlayerRocket(struct weaponobj *rocket);
void currentPlayerSetGlobalDrawWorldOffset(s32 room);
void currentPlayerSetGlobalDrawCameraOffset(void);
bool currentPlayerGet00fc(void);

2
src/include/game/game_1531a0.h
View File

@ -5,7 +5,7 @@
u32 func0f1531a0(void);
u32 func0f1531b8(void);
u32 func0f1531dc(void);
void func0f1531dc(bool arg0);
u32 func0f153204(void);
void func0f1532ec(void);
Gfx *func0f153628(Gfx *gdl);

2
src/include/game/game_157db0.h
View File

@ -75,7 +75,7 @@ u32 func0f161adc(void);
u32 func0f161c08(void);
u32 func0f161d30(void);
u32 func0f162128(void);
u32 func0f162194(void);
void func0f162194(struct coord *arg0, s16 *rooms, s16 *arg2, s32 arg3, s16 *arg4);
bool portalPushValue(bool value);
bool portalPopValue(void);
bool portalGetNthValueFromEnd(s32 offset);

4
src/include/game/pdoptions.h
View File

@ -5,8 +5,8 @@
s32 optionsGetControlMode(s32 mpchrnum);
void optionsSetControlMode(s32 mpchrnum, s32 mode);
s32 optionsGetUnk45(s32 mpchrnum);
s32 optionsGetUnk46(s32 mpchrnum);
s32 optionsGetContpadNum1(s32 mpchrnum);
s32 optionsGetContpadNum2(s32 mpchrnum);
s32 optionsGetForwardPitch(s32 mpchrnum);
s32 optionsGetAutoAim(s32 mpchrnum);
s32 optionsGetLookAhead(s32 mpchrnum);

2
src/include/game/propobj.h
View File

@ -277,7 +277,7 @@ u32 func0f08b658(void);
u32 func0f08b880(void);
void chrSetWeaponFlag4(struct chrdata *chr, s32 slot);
void func0f08b8e8(struct chrdata *chr, s32 weapon_id, s32 arg2, u32 flags, s32 arg4, s32 arg5);
struct prop *func0f08bad0(struct chrdata *chr, s32 arg1, s32 weapon_id, u32 flags);
struct prop *func0f08bad0(struct chrdata *chr, s32 model, s32 weapon_id, u32 flags);
u32 func0f08bb3c(void);
void func0f08bb5c(struct prop *prop, bool firing, s32 room);
s32 func0f08bc5c(struct prop *prop);

10
src/include/lib/lib_09660.h
View File

@ -20,7 +20,7 @@ void func00009ec4(s32 arg0);
u32 func00009ed4(void);
u32 func0000a044(void);
u32 func0000aa50(void);
u32 func0000aab0(void);
void func0000aab0(u32 arg0);
u32 func0000ab1c(void);
u32 func0000ab2c(void);
u32 func0000ab4c(void);
@ -35,23 +35,23 @@ u32 func0000b1d0(void);
u32 func0000b280(void);
u32 func0000b2c4(void);
u32 func0000b330(void);
u32 func0000bba0(void);
void func0000bba0(s16 arg0, s16 arg1);
u32 func0000bbc4(void);
u32 func0000bbd4(void);
u32 func0000bbe4(void);
void func0000bbe4(s16 arg0, s16 arg1);
s32 func0000bc08(void);
s32 func0000bc18(void);
u32 func0000bc28(void);
s16 func0000bc88(void);
s16 func0000bc98(void);
u32 func0000bca8(void);
void func0000bca8(s16 arg0, s16 arg1);
s16 func0000bd00(void);
s16 func0000bd10(void);
void func0000bd20(bool arg0);
void func0000bd30(f32 fovy);
u32 func0000bd7c(void);
u32 func0000bdc8(void);
u32 func0000bdd8(void);
void func0000bdd8(f32 arg0, f32 arg1, s16 viewx, s16 viewy);
f32 func0000be74(void);
u32 func0000be84(void);
void func0000bee0(f32 *arg0);

2
src/include/lib/lib_0d520.h
View File

@ -10,7 +10,7 @@ u32 mainTick(void);
u32 func0000e324(void);
void func0000e684(void);
void func0000e95c(s32 stagenum);
u32 func0000e990(void);
void func0000e990(void);
u32 func0000e9c0(void);
s32 getCurrentStageId(void);

2
src/include/lib/lib_159b0.h
View File

@ -15,7 +15,7 @@ u32 func00015be4(void);
u32 func00015cd8(void);
u32 func00015d18(void);
void func00015d54(f32 *realrot, f32 *matrix);
u32 func00015da0(void);
void func00015da0(f32 *arg0, f32 *arg1);
void func00015dd4(struct coord *pos, f32 *matrix);
u32 func00015df0(void);
u32 func00015e24(void);

2
src/include/lib/lib_16110.h
View File

@ -7,7 +7,7 @@ u8 *ailistFindById(s32 ailistid);
u32 func00016110(void);
u32 func00016140(void);
u32 func000161b0(void);
u32 func00016208(void);
void func00016208(f32 *matrix, struct coord *coord);
u32 func00016248(void);
u32 func000162e8(void);
void func00016374(f32 arg0, f32 *matrix);

3
src/include/math.h
View File

@ -8,4 +8,7 @@
#define M_BADTAU (M_BADPI * 2)
#define M_TAU (M_PI * 2)
#define DEG2RAD(deg) ((deg) * 0.01745f)
#define RAD2DEG(rad) ((rad) * 57.2958f)
#endif

19
src/include/types.h
View File

@ -745,7 +745,7 @@ struct chrdata {
struct obj48 {
/*0x00*/ u32 flags;
/*0x04*/ struct coord unk04;
/*0x04*/ struct coord unk04; // distance moved in last tick
/*0x10*/ u32 unk10;
/*0x14*/ u32 unk14;
/*0x18*/ u32 unk18;
@ -786,7 +786,8 @@ struct obj48 {
/*0xa4*/ u32 unka4;
/*0xa8*/ u32 unka8;
/*0xac*/ u32 unkac;
/*0xb0*/ u32 unkb0;
/*0xb0*/ u16 unkb0;
/*0xb2*/ u16 unkb2;
/*0xb4*/ u32 unkb4;
/*0xb8*/ u32 unkb8;
/*0xbc*/ u32 unkbc;
@ -1689,9 +1690,9 @@ struct player {
/*0x00b4*/ f32 crouchoffset;
/*0x00b8*/ f32 crouchspeed;
/*0x00bc*/ struct prop *prop;
/*0x00c0*/ u32 unk00c0;
/*0x00c4*/ u32 unk00c4;
/*0x00c8*/ u32 unk00c8;
/*0x00c0*/ bool bondperimenabled;
/*0x00c4*/ u32 itemswitch;
/*0x00c8*/ s32 badrockettime;
/*0x00cc*/ u32 unk00cc;
/*0x00d0*/ u32 unk00d0;
/*0x00d4*/ u32 unk00d4;
@ -1796,11 +1797,11 @@ struct player {
/*0x0258*/ u32 unk0258;
/*0x025c*/ u32 unk025c;
/*0x0260*/ u32 unk0260;
/*0x0264*/ u32 unk0264;
/*0x0264*/ struct weaponobj *slayerrocket;
/*0x0268*/ bool eyesshut;
/*0x026c*/ f32 eyesshutfrac;
/*0x0270*/ u32 unk0270;
/*0x0274*/ u32 unk0274;
/*0x0274*/ bool waitforzrelease;
/*0x0278*/ u32 unk0278;
/*0x027c*/ u32 unk027c;
/*0x0280*/ u32 unk0280;
@ -2209,7 +2210,7 @@ struct player {
/*0x19bc*/ f32 vv_height;
/*0x19c0*/ f32 vv_headheight;
/*0x19c4*/ f32 vv_eyeheight;
/*0x19c8*/ u32 unk19c8;
/*0x19c8*/ bool haschrbody;
/*0x19cc*/ u32 unk19cc;
/*0x19d0*/ u32 unk19d0;
/*0x19d4*/ u32 unk19d4;
@ -2290,7 +2291,7 @@ struct player {
/*0x1bbc*/ struct coord cam_look;
/*0x1bc8*/ struct coord cam_up;
/*0x1bd4*/ u32 unk1bd4;
/*0x1bd8*/ u32 unk1bd8;
/*0x1bd8*/ s32 unk1bd8;
/*0x1bdc*/ u32 unk1bdc;
/*0x1be0*/ u32 unk1be0;
/*0x1be4*/ u16 unk1be4;