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

Name some hand properties and functions

This commit is contained in:
Ryan Dwyer 2021-04-08 12:21:19 +10:00
parent d2d7b66f60
commit 06984dee34
8 changed files with 1084 additions and 1053 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/game/bondmove.c
View File

@ -3262,7 +3262,7 @@ glabel var7f1ad8e4
/* f0ca934: e7a001f0 */ swc1 $f0,0x1f0($sp)
/* f0ca938: e7a401ec */ swc1 $f4,0x1ec($sp)
.L0f0ca93c:
/* f0ca93c: 0fc2a34d */ jal currentPlayerTickInventory
/* f0ca93c: 0fc2a34d */ jal handsTick
/* f0ca940: 8fa401bc */ lw $a0,0x1bc($sp)
/* f0ca944: 8e580324 */ lw $t8,0x324($s2)
/* f0ca948: 5300002b */ beqzl $t8,.L0f0ca9f8
@ -6413,7 +6413,7 @@ glabel var7f1ad8e4
/* f0ca934: e7a001f0 */ swc1 $f0,0x1f0($sp)
/* f0ca938: e7a401ec */ swc1 $f4,0x1ec($sp)
.L0f0ca93c:
/* f0ca93c: 0fc2a34d */ jal currentPlayerTickInventory
/* f0ca93c: 0fc2a34d */ jal handsTick
/* f0ca940: 8fa401bc */ lw $a0,0x1bc($sp)
/* f0ca944: 8e580324 */ lw $t8,0x324($s2)
/* f0ca948: 5300002b */ beqzl $t8,.L0f0ca9f8
@ -9564,7 +9564,7 @@ glabel var7f1ad8e4
/* f0c8190: e7a001f0 */ swc1 $f0,0x1f0($sp)
/* f0c8194: e7a401ec */ swc1 $f4,0x1ec($sp)
.NB0f0c8198:
/* f0c8198: 0fc29ab5 */ jal currentPlayerTickInventory
/* f0c8198: 0fc29ab5 */ jal handsTick
/* f0c819c: 8fa401bc */ lw $a0,0x1bc($sp)
/* f0c81a0: 8e580324 */ lw $t8,0x324($s2)
/* f0c81a4: 5300002b */ beqzl $t8,.NB0f0c8254
@ -11507,7 +11507,7 @@ glabel var7f1ad8e4
// movedata.speedvertadown = tmp;
// }
//
// currentPlayerTickInventory(movedata.triggeron);
// handsTick(movedata.triggeron);
//
// // a944
// if (g_Vars.bondvisible && (handIsFiring(0) || handIsFiring(1))) {

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

@ -15759,7 +15759,7 @@ glabel func0f027e1c
/* f027efc: 27a50098 */ addiu $a1,$sp,0x98
/* f027f00: 0c0056da */ jal func00015b68
/* f027f04: 27a600a4 */ addiu $a2,$sp,0xa4
/* f027f08: 0fc2a519 */ jal func0f0a9464
/* f027f08: 0fc2a519 */ jal handSetHitPos
/* f027f0c: 27a400a4 */ addiu $a0,$sp,0xa4
/* f027f10: 8fa40048 */ lw $a0,0x48($sp)
/* f027f14: 8e250004 */ lw $a1,0x4($s1)
@ -16202,7 +16202,7 @@ glabel func0f027e1c
/* f027918: 27a50098 */ addiu $a1,$sp,0x98
/* f02791c: 0c005a96 */ jal func00015b68
/* f027920: 27a600a4 */ addiu $a2,$sp,0xa4
/* f027924: 0fc29c81 */ jal func0f0a9464
/* f027924: 0fc29c81 */ jal handSetHitPos
/* f027928: 27a400a4 */ addiu $a0,$sp,0xa4
/* f02792c: 8fa40048 */ lw $a0,0x48($sp)
/* f027930: 8e250004 */ lw $a1,0x4($s1)

2008
src/game/game_097ba0.c
View File

File diff suppressed because it is too large Load Diff

16
src/game/prop.c
View File

@ -1766,7 +1766,7 @@ glabel var7f1a9eb8
.L0f061754:
/* f061754: 8e104458 */ lw $s0,%lo(somethings)($s0)
.L0f061758:
/* f061758: 0fc2a519 */ jal func0f0a9464
/* f061758: 0fc2a519 */ jal handSetHitPos
/* f06175c: 27a40694 */ addiu $a0,$sp,0x694
/* f061760: 860c000a */ lh $t4,0xa($s0)
/* f061764: 8fb801f0 */ lw $t8,0x1f0($sp)
@ -2045,7 +2045,7 @@ glabel var7f1a9eb8
/* f061b44: 10000003 */ b .L0f061b54
/* f061b48: 00000000 */ nop
.L0f061b4c:
/* f061b4c: 0fc2a519 */ jal func0f0a9464
/* f061b4c: 0fc2a519 */ jal handSetHitPos
/* f061b50: 27a40648 */ addiu $a0,$sp,0x648
.L0f061b54:
/* f061b54: 10000079 */ b .L0f061d3c
@ -2313,21 +2313,21 @@ glabel var7f1a9ebc
void handCreateBulletRaycast(s32 handnum, bool arg1, bool dorandom, s32 arg3, bool arg4)
{
struct coord sp5c;
struct coord sp50;
struct coord shootdir;
struct coord shootpos;
struct coord sp44;
struct coord sp38;
handCalculateShotSpread(&sp38, &sp44, handnum, dorandom);
if (arg3 > 0) {
func00015b68(currentPlayerGetUnk174c(), &sp38, &sp50);
func00015b14(currentPlayerGetUnk174c(), &sp44, &sp5c);
func00015b68(currentPlayerGetUnk174c(), &sp38, &shootpos);
func00015b14(currentPlayerGetUnk174c(), &sp44, &shootdir);
func0f060db8(handnum, arg1, &sp38, &sp44, &sp50, &sp5c, 0, 4294836224, arg4);
func0f060db8(handnum, arg1, &sp38, &sp44, &shootpos, &shootdir, 0, 4294836224, arg4);
if (arg3 < 2) {
func0f0a12b0(&sp50, &sp5c, handnum);
handSetLastShootInfo(&shootpos, &shootdir, handnum);
}
}
}

4
src/game/propobj.c
View File

@ -60821,7 +60821,7 @@ glabel func0f085eac
/* f085fd4: 806e004c */ lb $t6,0x4c($v1)
/* f085fd8: 51c00005 */ beqzl $t6,.L0f085ff0
/* f085fdc: 8faf011c */ lw $t7,0x11c($sp)
/* f085fe0: 0fc2a519 */ jal func0f0a9464
/* f085fe0: 0fc2a519 */ jal handSetHitPos
/* f085fe4: 27a40110 */ addiu $a0,$sp,0x110
/* f085fe8: 8fa30124 */ lw $v1,0x124($sp)
/* f085fec: 8faf011c */ lw $t7,0x11c($sp)
@ -61552,7 +61552,7 @@ glabel func0f085eac
/* f084838: 804e004c */ lb $t6,0x4c($v0)
/* f08483c: 51c00005 */ beqzl $t6,.NB0f084854
/* f084840: 8faf011c */ lw $t7,0x11c($sp)
/* f084844: 0fc29c81 */ jal func0f0a9464
/* f084844: 0fc29c81 */ jal handSetHitPos
/* f084848: 27a40110 */ addiu $a0,$sp,0x110
/* f08484c: 8fa20124 */ lw $v0,0x124($sp)
/* f084850: 8faf011c */ lw $t7,0x11c($sp)

21
src/include/constants.h
View File

@ -954,6 +954,9 @@
#define HAND_RIGHT 0
#define HAND_LEFT 1
#define HANDANIMMODE_IDLE 0
#define HANDANIMMODE_BUSY 2
#define HANDATTACKTYPE_SHOOT 1
#define HANDATTACKTYPE_SHOOTPROJECTILE 2
#define HANDATTACKTYPE_THROWPROJECTILE 3
@ -966,6 +969,24 @@
#define HANDATTACKTYPE_CLOSERANGENOUNCLOAK 10
#define HANDATTACKTYPE_UPLINK 12
#define HANDSTATE_IDLE 0
#define HANDSTATE_RELOADING 1
#define HANDSTATE_2 2
#define HANDSTATE_ATTACKINGEMPTY 3
#define HANDSTATE_ATTACKING 4
#define HANDSTATE_CHANGINGGUN 5
#define HANDSTATE_6 6
#define HANDSTATE_CHANGINGFUNC 7
#define HANDSTATE_8 8
#define HANDSTATEFLAG_00000010 0x00000010
#define HANDSTATEFLAG_00000020 0x00000020
#define HANDSTATEMINOR_IDLE 0
#define HANDSTATEMINOR_START 1
#define HANDSTATEMINOR_ANIM 2
#define HANDSTATEMINOR_WAIT 55
#define HANGARBIO_INSTITUTE 0
#define HANGARBIO_DDTOWER 1
#define HANGARBIO_LABBASEMENT 2

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

@ -17,7 +17,7 @@ bool func0f098884(struct guncmd *cmd, struct shorthand *hand);
void func0f0988e0(struct guncmd *cmd, s32 handnum, struct hand *hand);
bool func0f098a44(struct hand *hand, s32 time);
u32 func0f098bfc(void);
void func0f098c0c(struct hand *hand);
void handResetAnim(struct hand *hand);
void handGetWeaponInfo(struct handweaponinfo *info, s32 handnum);
s32 func0f098ca0(s32 arg0, struct handweaponinfo *info, struct hand *hand);
u32 func0f098df8(void);
@ -25,30 +25,30 @@ u32 func0f098f8c(void);
bool func0f099008(s32 handnum);
bool func0f0990b0(struct weaponfunc *basefunc, struct weapon *weapon);
u32 func0f099188(void);
s32 func0f0991e4(struct handweaponinfo *info, s32 handnum, struct hand *hand, s32 lvupdate);
s32 handTickIncIdle(struct handweaponinfo *info, s32 handnum, struct hand *hand, s32 lvupdate);
u32 func0f099780(void);
s32 func0f099808(struct handweaponinfo *info, s32 handnum, struct hand *hand, s32 lvupdate);
s32 handTickIncState8(struct handweaponinfo *info, s32 handnum, struct hand *hand, s32 lvupdate);
u32 func0f099c24(void);
s32 func0f099c48(struct handweaponinfo *info, s32 handnum, struct hand *hand, s32 lvupdate);
s32 func0f09a310(struct handweaponinfo *info, s32 handnum, struct hand *hand, s32 lvupdate);
s32 handTickIncReloading(struct handweaponinfo *info, s32 handnum, struct hand *hand, s32 lvupdate);
s32 handTickIncChangingFunc(struct handweaponinfo *info, s32 handnum, struct hand *hand, s32 lvupdate);
s32 func0f09a3f8(struct hand *hand, struct weaponfunc *func);
void func0f09a6f8(struct handweaponinfo *info, s32 handnum, struct hand *hand, struct weaponfunc *func);
bool func0f09aba4(struct hand *hand, struct handweaponinfo *info, s32 handnum, struct weaponfunc *func);
bool func0f09afe4(struct handweaponinfo *info, s32 handnum, struct hand *hand);
bool func0f09b260(s32 handnum, struct hand *hand);
bool handTickIncAttackingShoot(struct handweaponinfo *info, s32 handnum, struct hand *hand);
bool handTickIncAttackingThrow(s32 handnum, struct hand *hand);
s32 weaponGetMinClipQty(s32 weaponnum, s32 funcnum);
bool func0f09b500(s32 handnum, struct hand *hand);
bool func0f09b828(struct hand *hand);
s32 func0f09b8e0(struct handweaponinfo *info, s32 handnum, struct hand *hand, s32 lvupdate);
s32 func0f09bc2c(struct handweaponinfo *info, s32 handnum, struct hand *hand, s32 lvupdate);
bool handTickIncAttackingClose(s32 handnum, struct hand *hand);
bool handTickIncAttackingSpecial(struct hand *hand);
s32 handTickIncAttackingEmpty(struct handweaponinfo *info, s32 handnum, struct hand *hand, s32 lvupdate);
s32 handTickIncAttacking(struct handweaponinfo *info, s32 handnum, struct hand *hand, s32 lvupdate);
u32 func0f09bd58(void);
bool func0f09bec8(s32 handnum);
u32 func0f09bf44(void);
s32 func0f09c01c(struct handweaponinfo *info, s32 handnum, struct hand *hand, s32 lvupdate);
s32 func0f09cb44(struct handweaponinfo *info, s32 handnum, struct hand *hand, s32 lvupdate);
s32 func0f09cb5c(struct handweaponinfo *info, s32 handnum, s32 lvupdate);
bool func0f09cd18(s32 handnum, s32 arg1);
void func0f09cdc4(s32 handnum);
s32 handTickIncChangingGun(struct handweaponinfo *info, s32 handnum, struct hand *hand, s32 lvupdate);
s32 handTickIncState2(struct handweaponinfo *info, s32 handnum, struct hand *hand, s32 lvupdate);
s32 handTickInc(struct handweaponinfo *info, s32 handnum, s32 lvupdate);
bool handSetState(s32 handnum, s32 state);
void handTick(s32 handnum);
void func0f09ce8c(void);
void func0f09ceac(void);
f32 handGetNoiseRadius(s32 handnum);
@ -85,7 +85,7 @@ void func0f0a0c08(struct coord *arg0, struct coord *arg1);
void func0f0a0c44(s32 handnum, struct coord *param_2, struct coord *arg2);
void handCalculateShotSpread(struct coord *arg0, struct coord *arg1, s32 handnum, bool dorandom);
u32 func0f0a0fac(void);
void func0f0a12b0(struct coord *arg0, struct coord *arg1, s32 handnum);
void handSetLastShootInfo(struct coord *pos, struct coord *dir, s32 handnum);
u32 handGetUnk0c30(s32 handnum);
void func0f0a134c(s32 handnum);
void func0f0a1528(void);
@ -144,11 +144,11 @@ void handSetTriggerOn(s32 handnum, bool on);
s32 currentPlayerConsiderToggleGunFunction(s32 usedowntime, bool firing, s32 arg2);
void func0f0a8c50(void);
bool currentPlayerIsUsingSecondaryFunction(void);
void currentPlayerTickInventory(bool triggeron);
void handsTick(bool triggeron);
void playersSetPassiveMode(bool enable);
void currentPlayerSetAimType(u32 aimtype);
void handSetAimPos(struct coord *coord);
void func0f0a9464(struct coord *coord);
void handSetHitPos(struct coord *coord);
void func0f0a9494(u32 operation);
void func0f0a94d0(u32 operation, struct coord *pos, struct coord *rot);
void func0f0a95ec(u32 arg0, bool enable);

38
src/include/types.h
View File

@ -2295,7 +2295,7 @@ struct hand {
/*0x0b88*/ u32 unk0b88;
/*0x0b8c*/ struct anim *unk0b8c;
/*0x0b90*/ s32 burstbullets;
/*0x0b94*/ struct coord unk0b94;
/*0x0b94*/ struct coord hitpos;
/*0x0ba0*/ u32 unk0ba0;
/*0x0ba4*/ u32 unk0ba4;
/*0x0ba8*/ u32 unk0ba8;
@ -2325,19 +2325,19 @@ struct hand {
/*0x0c08*/ u32 unk0c08;
/*0x0c0c*/ u32 unk0c0c;
/*0x0c10*/ u32 unk0c10;
/*0x0c14*/ u8 unk0c14;
/*0x0c18*/ struct coord unk0c18;
/*0x0c24*/ struct coord unk0c24;
/*0x0c14*/ u8 lastdirvalid;
/*0x0c18*/ struct coord lastshootdir;
/*0x0c24*/ struct coord lastshootpos;
/*0x0c30*/ u32 unk0c30;
/*0x0c34*/ u32 unk0c34;
/*0x0c38*/ u32 unk0c38;
/*0x0c3c*/ u32 unk0c3c;
/*0x0c40*/ s32 unk0c40;
/*0x0c44*/ u32 unk0c44;
/*0x0c3c*/ u32 state;
/*0x0c40*/ s32 stateminor;
/*0x0c44*/ u32 stateflags;
/*0x0c48*/ u32 unk0c48;
/*0x0c4c*/ s32 unk0c4c;
/*0x0c50*/ u32 unk0c50;
/*0x0c54*/ u32 unk0c54;
/*0x0c4c*/ s32 stateframes;
/*0x0c50*/ u32 statecycles;
/*0x0c54*/ u32 statelastframe;
/*0x0c58*/ u32 unk0c58;
/*0x0c5c*/ u32 unk0c5c;
/*0x0c60*/ u32 unk0c60;
@ -2354,7 +2354,7 @@ struct hand {
/*0x0c8c*/ u32 unk0c8c;
/*0x0c90*/ u32 unk0c90;
/*0x0c94*/ u32 unk0c94;
/*0x0c98*/ f32 unk0c98;
/*0x0c98*/ f32 gs_float1;
/*0x0c9c*/ u32 unk0c9c;
/*0x0ca0*/ u32 unk0ca0;
/*0x0ca4*/ u32 unk0ca4;
@ -2362,18 +2362,18 @@ struct hand {
/*0x0cac*/ u32 unk0cac;
/*0x0cb0*/ u32 unk0cb0;
/*0x0cb4*/ u32 unk0cb4;
/*0x0cb8*/ s32 unk0cb8;
/*0x0cbc*/ s32 unk0cbc;
/*0x0cb8*/ s32 animload;
/*0x0cbc*/ s32 animframeinc;
#if VERSION >= VERSION_PAL_FINAL
/*0x0cc0*/ f32 unk0cc0;
/*0x0cc0*/ f32 animframeincfreal;
#else
/*0x0cc0*/ u32 unk0cc0;
/*0x0cc0*/ u32 animframeincfreal;
#endif
/*0x0cc4*/ u32 unk0cc4;
/*0x0cc4*/ u32 animmode;
/*0x0cc8*/ u8 unk0cc8_01 : 1;
/*0x0cc8*/ u8 unk0cc8_02 : 1;
/*0x0cc8*/ u8 unk0cc8_03 : 1;
/*0x0cc9*/ u8 unk0cc9;
/*0x0cc9*/ u8 animloopcount;
/*0x0ccc*/ f32 crosspos[2];
/*0x0cd4*/ f32 unk0cd4;
/*0x0cd8*/ f32 unk0cd8;
@ -2384,8 +2384,8 @@ struct hand {
/*0x0cec*/ ubool unk0cec;
/*0x0cf0*/ struct coord unk0cf0;
/*0x0cfc*/ struct coord unk0cfc;
/*0x0d08*/ f32 unk0d08;
/*0x0d0c*/ s16 unk0d0c;
/*0x0d08*/ f32 ganstarot;
/*0x0d0c*/ s16 primetimer;
/*0x0d0e*/ u8 unk0d0e_00 : 4;
/*0x0d0e*/ u8 unk0d0e_04 : 3;
/*0x0d0e*/ u8 unk0d0e_07 : 1;