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

Decompile bgunCreateFiredProjectile

This commit is contained in:
Ryan Dwyer 2022-04-03 15:12:32 +10:00
parent bf9aa0911e
commit df0ed10d15
7 changed files with 442 additions and 2609 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2775
src/game/bondgun.c
View File

File diff suppressed because it is too large Load Diff

2
src/game/botact.c
View File

@ -497,7 +497,7 @@ void botactGetRocketSpawnPos(u16 padnum, struct coord *pos)
*/
void botactCreateSlayerRocket(struct chrdata *chr)
{
struct weaponobj *rocket = func0f08b880(MODEL_CHRSKROCKETMIS, WEAPON_SKROCKET, chr);
struct weaponobj *rocket = weaponCreateProjectileFromWeaponNum(MODEL_CHRSKROCKETMIS, WEAPON_SKROCKET, chr);
if (rocket) {
Mtxf sp260;

64
src/game/chraction.c
View File

@ -7683,7 +7683,7 @@ bool chrDropItem(struct chrdata *chr, u32 modelnum, u32 weaponnum)
return false;
}
weapon = func0f08b880(modelnum, (u8)weaponnum, chr);
weapon = weaponCreateProjectileFromWeaponNum(modelnum, (u8)weaponnum, chr);
if (weapon && weapon->base.prop) {
modelSetScale(weapon->base.model, weapon->base.model->scale);
@ -11165,7 +11165,7 @@ glabel var7f1a90e0
/* f040cb0: 24050054 */ addiu $a1,$zero,0x54
/* f040cb4: 8c640040 */ lw $a0,0x40($v1)
.L0f040cb8:
/* f040cb8: 0fc22e20 */ jal func0f08b880
/* f040cb8: 0fc22e20 */ jal weaponCreateProjectileFromWeaponNum
/* f040cbc: afa300d4 */ sw $v1,0xd4($sp)
/* f040cc0: 1000002e */ b .L0f040d7c
/* f040cc4: afa201b8 */ sw $v0,0x1b8($sp)
@ -11175,7 +11175,7 @@ glabel var7f1a90e0
/* f040cd0: 24050056 */ addiu $a1,$zero,0x56
/* f040cd4: 8c640040 */ lw $a0,0x40($v1)
/* f040cd8: afa300d4 */ sw $v1,0xd4($sp)
/* f040cdc: 0fc22e20 */ jal func0f08b880
/* f040cdc: 0fc22e20 */ jal weaponCreateProjectileFromWeaponNum
/* f040ce0: 8fa60278 */ lw $a2,0x278($sp)
/* f040ce4: 10400025 */ beqz $v0,.L0f040d7c
/* f040ce8: afa201b8 */ sw $v0,0x1b8($sp)
@ -11188,7 +11188,7 @@ glabel var7f1a90e0
/* f040d00: 24050055 */ addiu $a1,$zero,0x55
/* f040d04: 8c640040 */ lw $a0,0x40($v1)
/* f040d08: afa300d4 */ sw $v1,0xd4($sp)
/* f040d0c: 0fc22e20 */ jal func0f08b880
/* f040d0c: 0fc22e20 */ jal weaponCreateProjectileFromWeaponNum
/* f040d10: 8fa60278 */ lw $a2,0x278($sp)
/* f040d14: 10400019 */ beqz $v0,.L0f040d7c
/* f040d18: afa201b8 */ sw $v0,0x1b8($sp)
@ -11202,7 +11202,7 @@ glabel var7f1a90e0
/* f040d34: 8c640040 */ lw $a0,0x40($v1)
/* f040d38: afa300d4 */ sw $v1,0xd4($sp)
/* f040d3c: 24050055 */ addiu $a1,$zero,0x55
/* f040d40: 0fc22e20 */ jal func0f08b880
/* f040d40: 0fc22e20 */ jal weaponCreateProjectileFromWeaponNum
/* f040d44: 8fa60278 */ lw $a2,0x278($sp)
/* f040d48: 1040000c */ beqz $v0,.L0f040d7c
/* f040d4c: afa201b8 */ sw $v0,0x1b8($sp)
@ -11215,7 +11215,7 @@ glabel var7f1a90e0
/* f040d64: 27a50260 */ addiu $a1,$sp,0x260
/* f040d68: 8dae00bc */ lw $t6,0xbc($t5)
/* f040d6c: 8dc60004 */ lw $a2,0x4($t6)
/* f040d70: 0fc22d96 */ jal func0f08b658
/* f040d70: 0fc22d96 */ jal weaponCreateProjectileFromGset
/* f040d74: afa300d4 */ sw $v1,0xd4($sp)
/* f040d78: afa201b8 */ sw $v0,0x1b8($sp)
.L0f040d7c:
@ -12755,7 +12755,7 @@ glabel var7f1a9184
/* f040e34: 24050054 */ li $a1,0x54
/* f040e38: 8c640040 */ lw $a0,0x40($v1)
.PF0f040e3c:
/* f040e3c: 0fc22deb */ jal func0f08b880
/* f040e3c: 0fc22deb */ jal weaponCreateProjectileFromWeaponNum
/* f040e40: afa300d4 */ sw $v1,0xd4($sp)
/* f040e44: 1000002e */ b .PF0f040f00
/* f040e48: afa201b8 */ sw $v0,0x1b8($sp)
@ -12765,7 +12765,7 @@ glabel var7f1a9184
/* f040e54: 24050056 */ li $a1,0x56
/* f040e58: 8c640040 */ lw $a0,0x40($v1)
/* f040e5c: afa300d4 */ sw $v1,0xd4($sp)
/* f040e60: 0fc22deb */ jal func0f08b880
/* f040e60: 0fc22deb */ jal weaponCreateProjectileFromWeaponNum
/* f040e64: 8fa60278 */ lw $a2,0x278($sp)
/* f040e68: 10400025 */ beqz $v0,.PF0f040f00
/* f040e6c: afa201b8 */ sw $v0,0x1b8($sp)
@ -12778,7 +12778,7 @@ glabel var7f1a9184
/* f040e84: 24050055 */ li $a1,0x55
/* f040e88: 8c640040 */ lw $a0,0x40($v1)
/* f040e8c: afa300d4 */ sw $v1,0xd4($sp)
/* f040e90: 0fc22deb */ jal func0f08b880
/* f040e90: 0fc22deb */ jal weaponCreateProjectileFromWeaponNum
/* f040e94: 8fa60278 */ lw $a2,0x278($sp)
/* f040e98: 10400019 */ beqz $v0,.PF0f040f00
/* f040e9c: afa201b8 */ sw $v0,0x1b8($sp)
@ -12792,7 +12792,7 @@ glabel var7f1a9184
/* f040eb8: 8c640040 */ lw $a0,0x40($v1)
/* f040ebc: afa300d4 */ sw $v1,0xd4($sp)
/* f040ec0: 24050055 */ li $a1,0x55
/* f040ec4: 0fc22deb */ jal func0f08b880
/* f040ec4: 0fc22deb */ jal weaponCreateProjectileFromWeaponNum
/* f040ec8: 8fa60278 */ lw $a2,0x278($sp)
/* f040ecc: 1040000c */ beqz $v0,.PF0f040f00
/* f040ed0: afa201b8 */ sw $v0,0x1b8($sp)
@ -12805,7 +12805,7 @@ glabel var7f1a9184
/* f040ee8: 27a50260 */ addiu $a1,$sp,0x260
/* f040eec: 8dae00bc */ lw $t6,0xbc($t5)
/* f040ef0: 8dc60004 */ lw $a2,0x4($t6)
/* f040ef4: 0fc22d61 */ jal func0f08b658
/* f040ef4: 0fc22d61 */ jal weaponCreateProjectileFromGset
/* f040ef8: afa300d4 */ sw $v1,0xd4($sp)
/* f040efc: afa201b8 */ sw $v0,0x1b8($sp)
.PF0f040f00:
@ -14353,7 +14353,7 @@ glabel var7f1a9184
/* f040dc0: 24050054 */ li $a1,0x54
/* f040dc4: 8c640040 */ lw $a0,0x40($v1)
.PB0f040dc8:
/* f040dc8: 0fc22dbf */ jal func0f08b880
/* f040dc8: 0fc22dbf */ jal weaponCreateProjectileFromWeaponNum
/* f040dcc: afa300d4 */ sw $v1,0xd4($sp)
/* f040dd0: 1000002e */ b .PB0f040e8c
/* f040dd4: afa201b8 */ sw $v0,0x1b8($sp)
@ -14363,7 +14363,7 @@ glabel var7f1a9184
/* f040de0: 24050056 */ li $a1,0x56
/* f040de4: 8c640040 */ lw $a0,0x40($v1)
/* f040de8: afa300d4 */ sw $v1,0xd4($sp)
/* f040dec: 0fc22dbf */ jal func0f08b880
/* f040dec: 0fc22dbf */ jal weaponCreateProjectileFromWeaponNum
/* f040df0: 8fa60278 */ lw $a2,0x278($sp)
/* f040df4: 10400025 */ beqz $v0,.PB0f040e8c
/* f040df8: afa201b8 */ sw $v0,0x1b8($sp)
@ -14376,7 +14376,7 @@ glabel var7f1a9184
/* f040e10: 24050055 */ li $a1,0x55
/* f040e14: 8c640040 */ lw $a0,0x40($v1)
/* f040e18: afa300d4 */ sw $v1,0xd4($sp)
/* f040e1c: 0fc22dbf */ jal func0f08b880
/* f040e1c: 0fc22dbf */ jal weaponCreateProjectileFromWeaponNum
/* f040e20: 8fa60278 */ lw $a2,0x278($sp)
/* f040e24: 10400019 */ beqz $v0,.PB0f040e8c
/* f040e28: afa201b8 */ sw $v0,0x1b8($sp)
@ -14390,7 +14390,7 @@ glabel var7f1a9184
/* f040e44: 8c640040 */ lw $a0,0x40($v1)
/* f040e48: afa300d4 */ sw $v1,0xd4($sp)
/* f040e4c: 24050055 */ li $a1,0x55
/* f040e50: 0fc22dbf */ jal func0f08b880
/* f040e50: 0fc22dbf */ jal weaponCreateProjectileFromWeaponNum
/* f040e54: 8fa60278 */ lw $a2,0x278($sp)
/* f040e58: 1040000c */ beqz $v0,.PB0f040e8c
/* f040e5c: afa201b8 */ sw $v0,0x1b8($sp)
@ -14403,7 +14403,7 @@ glabel var7f1a9184
/* f040e74: 27a50260 */ addiu $a1,$sp,0x260
/* f040e78: 8dae00bc */ lw $t6,0xbc($t5)
/* f040e7c: 8dc60004 */ lw $a2,0x4($t6)
/* f040e80: 0fc22d35 */ jal func0f08b658
/* f040e80: 0fc22d35 */ jal weaponCreateProjectileFromGset
/* f040e84: afa300d4 */ sw $v1,0xd4($sp)
/* f040e88: afa201b8 */ sw $v0,0x1b8($sp)
.PB0f040e8c:
@ -15951,7 +15951,7 @@ glabel var7f1a9184
/* f040cb0: 24050054 */ addiu $a1,$zero,0x54
/* f040cb4: 8c640040 */ lw $a0,0x40($v1)
.L0f040cb8:
/* f040cb8: 0fc22e20 */ jal func0f08b880
/* f040cb8: 0fc22e20 */ jal weaponCreateProjectileFromWeaponNum
/* f040cbc: afa300d4 */ sw $v1,0xd4($sp)
/* f040cc0: 1000002e */ b .L0f040d7c
/* f040cc4: afa201b8 */ sw $v0,0x1b8($sp)
@ -15961,7 +15961,7 @@ glabel var7f1a9184
/* f040cd0: 24050056 */ addiu $a1,$zero,0x56
/* f040cd4: 8c640040 */ lw $a0,0x40($v1)
/* f040cd8: afa300d4 */ sw $v1,0xd4($sp)
/* f040cdc: 0fc22e20 */ jal func0f08b880
/* f040cdc: 0fc22e20 */ jal weaponCreateProjectileFromWeaponNum
/* f040ce0: 8fa60278 */ lw $a2,0x278($sp)
/* f040ce4: 10400025 */ beqz $v0,.L0f040d7c
/* f040ce8: afa201b8 */ sw $v0,0x1b8($sp)
@ -15974,7 +15974,7 @@ glabel var7f1a9184
/* f040d00: 24050055 */ addiu $a1,$zero,0x55
/* f040d04: 8c640040 */ lw $a0,0x40($v1)
/* f040d08: afa300d4 */ sw $v1,0xd4($sp)
/* f040d0c: 0fc22e20 */ jal func0f08b880
/* f040d0c: 0fc22e20 */ jal weaponCreateProjectileFromWeaponNum
/* f040d10: 8fa60278 */ lw $a2,0x278($sp)
/* f040d14: 10400019 */ beqz $v0,.L0f040d7c
/* f040d18: afa201b8 */ sw $v0,0x1b8($sp)
@ -15988,7 +15988,7 @@ glabel var7f1a9184
/* f040d34: 8c640040 */ lw $a0,0x40($v1)
/* f040d38: afa300d4 */ sw $v1,0xd4($sp)
/* f040d3c: 24050055 */ addiu $a1,$zero,0x55
/* f040d40: 0fc22e20 */ jal func0f08b880
/* f040d40: 0fc22e20 */ jal weaponCreateProjectileFromWeaponNum
/* f040d44: 8fa60278 */ lw $a2,0x278($sp)
/* f040d48: 1040000c */ beqz $v0,.L0f040d7c
/* f040d4c: afa201b8 */ sw $v0,0x1b8($sp)
@ -16001,7 +16001,7 @@ glabel var7f1a9184
/* f040d64: 27a50260 */ addiu $a1,$sp,0x260
/* f040d68: 8dae00bc */ lw $t6,0xbc($t5)
/* f040d6c: 8dc60004 */ lw $a2,0x4($t6)
/* f040d70: 0fc22d96 */ jal func0f08b658
/* f040d70: 0fc22d96 */ jal weaponCreateProjectileFromGset
/* f040d74: afa300d4 */ sw $v1,0xd4($sp)
/* f040d78: afa201b8 */ sw $v0,0x1b8($sp)
.L0f040d7c:
@ -17541,7 +17541,7 @@ glabel var7f1a9184
/* f040490: 24050053 */ addiu $a1,$zero,0x53
/* f040494: 8c640040 */ lw $a0,0x40($v1)
.NB0f040498:
/* f040498: 0fc2282a */ jal func0f08b880
/* f040498: 0fc2282a */ jal weaponCreateProjectileFromWeaponNum
/* f04049c: afa300d4 */ sw $v1,0xd4($sp)
/* f0404a0: 1000002e */ beqz $zero,.NB0f04055c
/* f0404a4: afa201b8 */ sw $v0,0x1b8($sp)
@ -17551,7 +17551,7 @@ glabel var7f1a9184
/* f0404b0: 24050055 */ addiu $a1,$zero,0x55
/* f0404b4: 8c640040 */ lw $a0,0x40($v1)
/* f0404b8: afa300d4 */ sw $v1,0xd4($sp)
/* f0404bc: 0fc2282a */ jal func0f08b880
/* f0404bc: 0fc2282a */ jal weaponCreateProjectileFromWeaponNum
/* f0404c0: 8fa60278 */ lw $a2,0x278($sp)
/* f0404c4: 10400025 */ beqz $v0,.NB0f04055c
/* f0404c8: afa201b8 */ sw $v0,0x1b8($sp)
@ -17564,7 +17564,7 @@ glabel var7f1a9184
/* f0404e0: 24050054 */ addiu $a1,$zero,0x54
/* f0404e4: 8c640040 */ lw $a0,0x40($v1)
/* f0404e8: afa300d4 */ sw $v1,0xd4($sp)
/* f0404ec: 0fc2282a */ jal func0f08b880
/* f0404ec: 0fc2282a */ jal weaponCreateProjectileFromWeaponNum
/* f0404f0: 8fa60278 */ lw $a2,0x278($sp)
/* f0404f4: 10400019 */ beqz $v0,.NB0f04055c
/* f0404f8: afa201b8 */ sw $v0,0x1b8($sp)
@ -17578,7 +17578,7 @@ glabel var7f1a9184
/* f040514: 8c640040 */ lw $a0,0x40($v1)
/* f040518: afa300d4 */ sw $v1,0xd4($sp)
/* f04051c: 24050054 */ addiu $a1,$zero,0x54
/* f040520: 0fc2282a */ jal func0f08b880
/* f040520: 0fc2282a */ jal weaponCreateProjectileFromWeaponNum
/* f040524: 8fa60278 */ lw $a2,0x278($sp)
/* f040528: 1040000c */ beqz $v0,.NB0f04055c
/* f04052c: afa201b8 */ sw $v0,0x1b8($sp)
@ -17591,7 +17591,7 @@ glabel var7f1a9184
/* f040544: 27a50260 */ addiu $a1,$sp,0x260
/* f040548: 8dae00bc */ lw $t6,0xbc($t5)
/* f04054c: 8dc60004 */ lw $a2,0x4($t6)
/* f040550: 0fc227a4 */ jal func0f08b658
/* f040550: 0fc227a4 */ jal weaponCreateProjectileFromGset
/* f040554: afa300d4 */ sw $v1,0xd4($sp)
/* f040558: afa201b8 */ sw $v0,0x1b8($sp)
.NB0f04055c:
@ -18737,28 +18737,28 @@ glabel var7f1a9184
// rockettype = WEAPON_HOMINGROCKET;
// }
//
// projectileobj = func0f08b880(func->projectilemodelnum, rockettype, chr);
// projectileobj = weaponCreateProjectileFromWeaponNum(func->projectilemodelnum, rockettype, chr);
// } else if (gset.weaponnum == WEAPON_CROSSBOW) {
// projectileobj = func0f08b880(func->projectilemodelnum, WEAPON_BOLT, chr);
// projectileobj = weaponCreateProjectileFromWeaponNum(func->projectilemodelnum, WEAPON_BOLT, chr);
//
// if (projectileobj) {
// projectileobj->gunfunc = gset.weaponfunc;
// }
// } else if (gset.weaponnum == WEAPON_DEVASTATOR) {
// projectileobj = func0f08b880(func->projectilemodelnum, WEAPON_GRENADEROUND, chr);
// projectileobj = weaponCreateProjectileFromWeaponNum(func->projectilemodelnum, WEAPON_GRENADEROUND, chr);
//
// if (projectileobj) {
// projectileobj->gunfunc = gset.weaponfunc;
// }
// } else if (gset.weaponnum == WEAPON_SUPERDRAGON) {
// projectileobj = func0f08b880(func->projectilemodelnum, WEAPON_GRENADEROUND, chr);
// projectileobj = weaponCreateProjectileFromWeaponNum(func->projectilemodelnum, WEAPON_GRENADEROUND, chr);
//
// if (projectileobj) {
// projectileobj->gunfunc = FUNC_2;
// }
// } else {
// // Unreachable
// projectileobj = func0f08b658(func->projectilemodelnum, &gset, g_Vars.currentplayer->prop->chr);
// projectileobj = weaponCreateProjectileFromGset(func->projectilemodelnum, &gset, g_Vars.currentplayer->prop->chr);
// }
//
// if (projectileobj) {
@ -18870,7 +18870,7 @@ glabel var7f1a9184
// projectileobj->base.projectile->unk08c = func->unk5c;
// projectileobj->base.projectile->unk098 = func->unk50 * (1.0f / 0.6f);
//
// projectileobj->base.projectile->unk0e8 = chrGetTargetProp(chr);
// projectileobj->base.projectile->targetprop = chrGetTargetProp(chr);
//
// // Play sound
// if (func->unk60 > 0) {

36
src/game/invitems.c
View File

@ -1955,13 +1955,13 @@ struct weaponfunc_shootprojectile invfunc_superdragon_grenadelauncher = {
1,
0x00000123,
0x00000000,
0x3f800000,
1,
0x00000000,
0.08,
0x0000001e,
0x000004b0,
0.1,
0x8053,
SFX_LAUNCH_ROCKET_8053,
};
struct inventory_ammo invammo_superdragon = {
@ -2720,13 +2720,13 @@ struct weaponfunc_shootprojectile invfunc_rockerlauncher_shoot = {
1,
0x0000011f,
0x00000000,
0x40066666,
2.1,
0x0000003c,
0,
0x00000000,
0xffffffff,
0.05,
0x8053,
SFX_LAUNCH_ROCKET_8053,
};
struct weaponfunc_shootprojectile invfunc_rocketlauncher_homing = {
@ -2751,13 +2751,13 @@ struct weaponfunc_shootprojectile invfunc_rocketlauncher_homing = {
1,
0x0000011f,
0x00000000,
0x40066666,
2.1,
0x00000000,
0,
0x00000005,
0xffffffff,
0.05,
0x8053,
SFX_LAUNCH_ROCKET_8053,
};
struct inventory_ammo invammo_rocketlauncher = {
@ -2830,13 +2830,13 @@ struct weaponfunc_shootprojectile invfunc_slayer_shoot = {
1,
0x00000120,
0x00000000,
0x40833333,
4.1,
0x0000000a,
0,
0x00000000,
0xffffffff,
0.05,
0x8053,
SFX_LAUNCH_ROCKET_8053,
};
struct weaponfunc_shootprojectile invfunc_slayer_flybywire = {
@ -2861,13 +2861,13 @@ struct weaponfunc_shootprojectile invfunc_slayer_flybywire = {
1,
0x00000120,
0x00000000,
0x40833333,
4.1,
0x0000000a,
0,
0x00000000,
0xffffffff,
0.05,
0x8068,
SFX_SLAYER_WHIR,
};
struct inventory_ammo invammo_slayer = {
@ -2950,13 +2950,13 @@ struct weaponfunc_shootprojectile invfunc_devastator_shoot = {
1,
0x00000122,
0x00000000,
0x3f800000,
1,
0x00000000,
0.08,
0x00000028,
0x000004b0,
0.3,
0x8053,
SFX_LAUNCH_ROCKET_8053,
};
struct weaponfunc_shootprojectile invfunc_devastator_wallhugger = {
@ -2981,13 +2981,13 @@ struct weaponfunc_shootprojectile invfunc_devastator_wallhugger = {
1,
0x00000122,
0x00000000,
0x3f800000,
1,
0x00000000,
0.08,
0x00000028,
0x00000168,
0.3,
0x8053,
SFX_LAUNCH_ROCKET_8053,
};
struct inventory_ammo invammo_devastator = {
@ -3658,7 +3658,7 @@ struct weaponfunc_shootprojectile invfunc_crossbow_lethal = {
1,
0x00000121,
0x00000000,
0x40066666,
2.1,
0x00000000,
0,
0x0000003c,
@ -3689,7 +3689,7 @@ struct weaponfunc_shootprojectile invfunc_crossbow_shoot = {
1,
0x00000121,
0x00000000,
0x40066666,
2.1,
0x00000000,
0,
0x0000003c,
@ -6022,13 +6022,13 @@ struct weaponfunc_shootprojectile invfunc_rocketlauncher34_primary = {
1,
0x0000011f,
0x00000000,
0x40066666,
2.1,
0x00000014,
0,
0x00000000,
0xffffffff,
0.05,
0x8053,
SFX_LAUNCH_ROCKET_8053,
};
struct inventory_ammo invammo_rocketlauncher34 = {

158
src/game/propobj.c
View File

@ -2334,7 +2334,7 @@ void projectileReset(struct projectile *projectile)
projectile->obj = NULL;
projectile->unk0d8 = 0;
projectile->unk0f4 = 0;
projectile->unk0e8 = 0;
projectile->targetprop = NULL;
projectile->unk108 = 0;
projectile->unk0b2 = 0xffff;
projectile->unk0b8 = 1;
@ -79006,78 +79006,78 @@ struct autogunobj *laptopDeploy(s32 modelnum, struct gset *gset, struct chrdata
#if VERSION >= VERSION_NTSC_1_0
GLOBAL_ASM(
glabel func0f08b658
glabel weaponCreateProjectileFromGset
.late_rodata
glabel var7f1aae9c
.word func0f08b658+0x174 # f08b7cc
.word weaponCreateProjectileFromGset+0x174 # f08b7cc
glabel var7f1aaea0
.word func0f08b658+0x174 # f08b7cc
.word weaponCreateProjectileFromGset+0x174 # f08b7cc
glabel var7f1aaea4
.word func0f08b658+0x174 # f08b7cc
.word weaponCreateProjectileFromGset+0x174 # f08b7cc
glabel var7f1aaea8
.word func0f08b658+0x174 # f08b7cc
.word weaponCreateProjectileFromGset+0x174 # f08b7cc
glabel var7f1aaeac
.word func0f08b658+0x174 # f08b7cc
.word weaponCreateProjectileFromGset+0x174 # f08b7cc
glabel var7f1aaeb0
.word func0f08b658+0x174 # f08b7cc
.word weaponCreateProjectileFromGset+0x174 # f08b7cc
glabel var7f1aaeb4
.word func0f08b658+0x174 # f08b7cc
.word weaponCreateProjectileFromGset+0x174 # f08b7cc
glabel var7f1aaeb8
.word func0f08b658+0x174 # f08b7cc
.word weaponCreateProjectileFromGset+0x174 # f08b7cc
glabel var7f1aaebc
.word func0f08b658+0x174 # f08b7cc
.word weaponCreateProjectileFromGset+0x174 # f08b7cc
glabel var7f1aaec0
.word func0f08b658+0x174 # f08b7cc
.word weaponCreateProjectileFromGset+0x174 # f08b7cc
glabel var7f1aaec4
.word func0f08b658+0x174 # f08b7cc
.word weaponCreateProjectileFromGset+0x174 # f08b7cc
glabel var7f1aaec8
.word func0f08b658+0x174 # f08b7cc
.word weaponCreateProjectileFromGset+0x174 # f08b7cc
glabel var7f1aaecc
.word func0f08b658+0x174 # f08b7cc
.word weaponCreateProjectileFromGset+0x174 # f08b7cc
glabel var7f1aaed0
.word func0f08b658+0x174 # f08b7cc
.word weaponCreateProjectileFromGset+0x174 # f08b7cc
glabel var7f1aaed4
.word func0f08b658+0x174 # f08b7cc
.word weaponCreateProjectileFromGset+0x174 # f08b7cc
glabel var7f1aaed8
.word func0f08b658+0x174 # f08b7cc
.word weaponCreateProjectileFromGset+0x174 # f08b7cc
glabel var7f1aaedc
.word func0f08b658+0x174 # f08b7cc
.word weaponCreateProjectileFromGset+0x174 # f08b7cc
glabel var7f1aaee0
.word func0f08b658+0x174 # f08b7cc
.word weaponCreateProjectileFromGset+0x174 # f08b7cc
glabel var7f1aaee4
.word func0f08b658+0x174 # f08b7cc
.word weaponCreateProjectileFromGset+0x174 # f08b7cc
glabel var7f1aaee8
.word func0f08b658+0x174 # f08b7cc
.word weaponCreateProjectileFromGset+0x174 # f08b7cc
glabel var7f1aaeec
.word func0f08b658+0x174 # f08b7cc
.word weaponCreateProjectileFromGset+0x174 # f08b7cc
glabel var7f1aaef0
.word func0f08b658+0x174 # f08b7cc
.word weaponCreateProjectileFromGset+0x174 # f08b7cc
glabel var7f1aaef4
.word func0f08b658+0x174 # f08b7cc
.word weaponCreateProjectileFromGset+0x174 # f08b7cc
glabel var7f1aaef8
.word func0f08b658+0x174 # f08b7cc
.word weaponCreateProjectileFromGset+0x174 # f08b7cc
glabel var7f1aaefc
.word func0f08b658+0x174 # f08b7cc
.word weaponCreateProjectileFromGset+0x174 # f08b7cc
glabel var7f1aaf00
.word func0f08b658+0x174 # f08b7cc
.word weaponCreateProjectileFromGset+0x174 # f08b7cc
glabel var7f1aaf04
.word func0f08b658+0x174 # f08b7cc
.word weaponCreateProjectileFromGset+0x174 # f08b7cc
glabel var7f1aaf08
.word func0f08b658+0x174 # f08b7cc
.word weaponCreateProjectileFromGset+0x174 # f08b7cc
glabel var7f1aaf0c
.word func0f08b658+0x174 # f08b7cc
.word weaponCreateProjectileFromGset+0x174 # f08b7cc
glabel var7f1aaf10
.word func0f08b658+0x174 # f08b7cc
.word weaponCreateProjectileFromGset+0x174 # f08b7cc
glabel var7f1aaf14
.word func0f08b658+0x174 # f08b7cc
.word weaponCreateProjectileFromGset+0x174 # f08b7cc
glabel var7f1aaf18
.word func0f08b658+0x174 # f08b7cc
.word weaponCreateProjectileFromGset+0x174 # f08b7cc
glabel var7f1aaf1c
.word func0f08b658+0x174 # f08b7cc
.word weaponCreateProjectileFromGset+0x174 # f08b7cc
glabel var7f1aaf20
.word func0f08b658+0x174 # f08b7cc
.word weaponCreateProjectileFromGset+0x174 # f08b7cc
glabel var7f1aaf24
.word func0f08b658+0x174 # f08b7cc
.word weaponCreateProjectileFromGset+0x174 # f08b7cc
.text
/* f08b658: 27bdff60 */ addiu $sp,$sp,-160
/* f08b65c: afbf001c */ sw $ra,0x1c($sp)
@ -79231,78 +79231,78 @@ glabel var7f1aaf24
);
#else
GLOBAL_ASM(
glabel func0f08b658
glabel weaponCreateProjectileFromGset
.late_rodata
glabel var7f1aae9c
.word func0f08b658+0x174 # f08b7cc
.word weaponCreateProjectileFromGset+0x174 # f08b7cc
glabel var7f1aaea0
.word func0f08b658+0x174 # f08b7cc
.word weaponCreateProjectileFromGset+0x174 # f08b7cc
glabel var7f1aaea4
.word func0f08b658+0x174 # f08b7cc
.word weaponCreateProjectileFromGset+0x174 # f08b7cc
glabel var7f1aaea8
.word func0f08b658+0x174 # f08b7cc
.word weaponCreateProjectileFromGset+0x174 # f08b7cc
glabel var7f1aaeac
.word func0f08b658+0x174 # f08b7cc
.word weaponCreateProjectileFromGset+0x174 # f08b7cc
glabel var7f1aaeb0
.word func0f08b658+0x174 # f08b7cc
.word weaponCreateProjectileFromGset+0x174 # f08b7cc
glabel var7f1aaeb4
.word func0f08b658+0x174 # f08b7cc
.word weaponCreateProjectileFromGset+0x174 # f08b7cc
glabel var7f1aaeb8
.word func0f08b658+0x174 # f08b7cc
.word weaponCreateProjectileFromGset+0x174 # f08b7cc
glabel var7f1aaebc
.word func0f08b658+0x174 # f08b7cc
.word weaponCreateProjectileFromGset+0x174 # f08b7cc
glabel var7f1aaec0
.word func0f08b658+0x174 # f08b7cc
.word weaponCreateProjectileFromGset+0x174 # f08b7cc
glabel var7f1aaec4
.word func0f08b658+0x174 # f08b7cc
.word weaponCreateProjectileFromGset+0x174 # f08b7cc
glabel var7f1aaec8
.word func0f08b658+0x174 # f08b7cc
.word weaponCreateProjectileFromGset+0x174 # f08b7cc
glabel var7f1aaecc
.word func0f08b658+0x174 # f08b7cc
.word weaponCreateProjectileFromGset+0x174 # f08b7cc
glabel var7f1aaed0
.word func0f08b658+0x174 # f08b7cc
.word weaponCreateProjectileFromGset+0x174 # f08b7cc
glabel var7f1aaed4
.word func0f08b658+0x174 # f08b7cc
.word weaponCreateProjectileFromGset+0x174 # f08b7cc
glabel var7f1aaed8
.word func0f08b658+0x174 # f08b7cc
.word weaponCreateProjectileFromGset+0x174 # f08b7cc
glabel var7f1aaedc
.word func0f08b658+0x174 # f08b7cc
.word weaponCreateProjectileFromGset+0x174 # f08b7cc
glabel var7f1aaee0
.word func0f08b658+0x174 # f08b7cc
.word weaponCreateProjectileFromGset+0x174 # f08b7cc
glabel var7f1aaee4
.word func0f08b658+0x174 # f08b7cc
.word weaponCreateProjectileFromGset+0x174 # f08b7cc
glabel var7f1aaee8
.word func0f08b658+0x174 # f08b7cc
.word weaponCreateProjectileFromGset+0x174 # f08b7cc
glabel var7f1aaeec
.word func0f08b658+0x174 # f08b7cc
.word weaponCreateProjectileFromGset+0x174 # f08b7cc
glabel var7f1aaef0
.word func0f08b658+0x174 # f08b7cc
.word weaponCreateProjectileFromGset+0x174 # f08b7cc
glabel var7f1aaef4
.word func0f08b658+0x174 # f08b7cc
.word weaponCreateProjectileFromGset+0x174 # f08b7cc
glabel var7f1aaef8
.word func0f08b658+0x174 # f08b7cc
.word weaponCreateProjectileFromGset+0x174 # f08b7cc
glabel var7f1aaefc
.word func0f08b658+0x174 # f08b7cc
.word weaponCreateProjectileFromGset+0x174 # f08b7cc
glabel var7f1aaf00
.word func0f08b658+0x174 # f08b7cc
.word weaponCreateProjectileFromGset+0x174 # f08b7cc
glabel var7f1aaf04
.word func0f08b658+0x174 # f08b7cc
.word weaponCreateProjectileFromGset+0x174 # f08b7cc
glabel var7f1aaf08
.word func0f08b658+0x174 # f08b7cc
.word weaponCreateProjectileFromGset+0x174 # f08b7cc
glabel var7f1aaf0c
.word func0f08b658+0x174 # f08b7cc
.word weaponCreateProjectileFromGset+0x174 # f08b7cc
glabel var7f1aaf10
.word func0f08b658+0x174 # f08b7cc
.word weaponCreateProjectileFromGset+0x174 # f08b7cc
glabel var7f1aaf14
.word func0f08b658+0x174 # f08b7cc
.word weaponCreateProjectileFromGset+0x174 # f08b7cc
glabel var7f1aaf18
.word func0f08b658+0x174 # f08b7cc
.word weaponCreateProjectileFromGset+0x174 # f08b7cc
glabel var7f1aaf1c
.word func0f08b658+0x174 # f08b7cc
.word weaponCreateProjectileFromGset+0x174 # f08b7cc
glabel var7f1aaf20
.word func0f08b658+0x174 # f08b7cc
.word weaponCreateProjectileFromGset+0x174 # f08b7cc
glabel var7f1aaf24
.word func0f08b658+0x174 # f08b7cc
.word weaponCreateProjectileFromGset+0x174 # f08b7cc
.text
/* f089e90: 27bdff60 */ addiu $sp,$sp,-160
/* f089e94: afbf001c */ sw $ra,0x1c($sp)
@ -79478,12 +79478,12 @@ u32 var8006ad80 = 0x00000000;
u32 var8006ad84 = 0x00ffffff;
u32 var8006ad88 = 0x00000000;
struct weaponobj *func0f08b880(s32 modelnum, s32 weaponnum, struct chrdata *chr)
struct weaponobj *weaponCreateProjectileFromWeaponNum(s32 modelnum, s32 weaponnum, struct chrdata *chr)
{
struct gset gset = {0};
gset.weaponnum = weaponnum;
return func0f08b658(modelnum, &gset, chr);
return weaponCreateProjectileFromGset(modelnum, &gset, chr);
}
void weaponDeleteFromChr(struct chrdata *chr, s32 hand)
@ -83159,7 +83159,7 @@ glabel var7f1ab214
/* f091678: e7aa009c */ swc1 $f10,0x9c($sp)
/* f09167c: c446007c */ lwc1 $f6,0x7c($v0)
/* f091680: 00003025 */ or $a2,$zero,$zero
/* f091684: 0fc22e20 */ jal func0f08b880
/* f091684: 0fc22e20 */ jal weaponCreateProjectileFromWeaponNum
/* f091688: e7a60098 */ swc1 $f6,0x98($sp)
/* f09168c: 104001b9 */ beqz $v0,.L0f091d74
/* f091690: afa2017c */ sw $v0,0x17c($sp)
@ -83888,7 +83888,7 @@ glabel var7f1ab214
/* f091678: e7aa009c */ swc1 $f10,0x9c($sp)
/* f09167c: c446007c */ lwc1 $f6,0x7c($v0)
/* f091680: 00003025 */ or $a2,$zero,$zero
/* f091684: 0fc22e20 */ jal func0f08b880
/* f091684: 0fc22e20 */ jal weaponCreateProjectileFromWeaponNum
/* f091688: e7a60098 */ swc1 $f6,0x98($sp)
/* f09168c: 104001b9 */ beqz $v0,.L0f091d74
/* f091690: afa2017c */ sw $v0,0x17c($sp)
@ -84617,7 +84617,7 @@ glabel var7f1ab214
/* f091678: e7aa009c */ swc1 $f10,0x9c($sp)
/* f09167c: c446007c */ lwc1 $f6,0x7c($v0)
/* f091680: 00003025 */ or $a2,$zero,$zero
/* f091684: 0fc22e20 */ jal func0f08b880
/* f091684: 0fc22e20 */ jal weaponCreateProjectileFromWeaponNum
/* f091688: e7a60098 */ swc1 $f6,0x98($sp)
/* f09168c: 104001b9 */ beqz $v0,.L0f091d74
/* f091690: afa2017c */ sw $v0,0x17c($sp)
@ -85346,7 +85346,7 @@ glabel var7f1ab214
/* f091678: e7aa009c */ swc1 $f10,0x9c($sp)
/* f09167c: c446007c */ lwc1 $f6,0x7c($v0)
/* f091680: 00003025 */ or $a2,$zero,$zero
/* f091684: 0fc22e20 */ jal func0f08b880
/* f091684: 0fc22e20 */ jal weaponCreateProjectileFromWeaponNum
/* f091688: e7a60098 */ swc1 $f6,0x98($sp)
/* f09168c: 104001b9 */ beqz $v0,.L0f091d74
/* f091690: afa2017c */ sw $v0,0x17c($sp)

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

@ -157,7 +157,7 @@ u32 func0f0727d4(void);
void hoverbikeUpdateMovement(struct hoverbikeobj *hoverbike, f32 arg1, f32 arg2, f32 arg3);
u32 func0f0732d4(void);
u32 func0f073478(void);
u32 func0f073ae8(void);
void func0f073ae8(struct weaponobj *weapon, struct projectile *projectile, struct coord *arg2, struct coord *arg3);
s32 func0f073c6c(struct defaultobj *obj, bool *arg1);
void doorTick(struct prop *doorprop);
void doorUpdatePortalIfWindowed(struct prop *door, s32 playercount);
@ -285,8 +285,8 @@ struct prop *func0f08b108(struct weaponobj *weapon, struct chrdata *chr, struct
void func0f08b208(struct weaponobj *weapon, struct chrdata *chr);
void func0f08b25c(struct weaponobj *weapon, struct chrdata *chr);
struct autogunobj *laptopDeploy(s32 modelnum, struct gset *gset, struct chrdata *chr);
struct weaponobj *func0f08b658(s32 modelnum, struct gset *gset, struct chrdata *chr);
struct weaponobj *func0f08b880(s32 modelnum, s32 weaponnum, struct chrdata *chr);
struct weaponobj *weaponCreateProjectileFromGset(s32 modelnum, struct gset *gset, struct chrdata *chr);
struct weaponobj *weaponCreateProjectileFromWeaponNum(s32 modelnum, s32 weaponnum, struct chrdata *chr);
void weaponDeleteFromChr(struct chrdata *chr, s32 hand);
struct prop *weaponCreateForChr(struct chrdata *chr, s32 modelnum, s32 weaponnum, u32 flags, struct weaponobj *obj, struct modelfiledata *filedata);
struct prop *chrGiveWeapon(struct chrdata *chr, s32 model, s32 weaponnum, u32 flags);

10
src/include/types.h
View File

@ -1511,8 +1511,8 @@ struct projectile {
/*0x09c*/ s32 unk09c;
/*0x0a0*/ u32 unk0a0;
/*0x0a4*/ s32 unk0a4;
/*0x0a8*/ u32 unk0a8;
/*0x0ac*/ u32 unk0ac;
/*0x0a8*/ f32 unk0a8;
/*0x0ac*/ f32 unk0ac;
/*0x0b0*/ s16 droptype;
/*0x0b2*/ s16 unk0b2;
/*0x0b4*/ s32 unk0b4;
@ -1526,7 +1526,7 @@ struct projectile {
/*0x0dc*/ f32 unk0dc;
/*0x0e0*/ f32 unk0e0;
/*0x0e4*/ f32 unk0e4;
/*0x0e8*/ struct prop *unk0e8;
/*0x0e8*/ struct prop *targetprop; // for homing rockets
/*0x0ec*/ f32 unk0ec;
/*0x0f0*/ f32 unk0f0;
/*0x0f4*/ u32 unk0f4;
@ -3071,13 +3071,13 @@ struct weaponfunc_shootprojectile {
struct weaponfunc_shoot base;
/*0x40*/ s32 projectilemodelnum;
/*0x44*/ u32 unk44;
/*0x48*/ u32 unk48;
/*0x48*/ f32 scale;
/*0x4c*/ s32 unk4c;
/*0x50*/ f32 unk50;
/*0x54*/ s32 unk54;
/*0x58*/ s32 timer60;
/*0x5c*/ f32 unk5c;
/*0x60*/ s16 unk60;
/*0x60*/ s16 soundnum;
};
struct weaponfunc_throw {