Decompile func0f0a1528

This commit is contained in:
Ryan Dwyer
2021-03-02 12:15:09 +10:00
parent 8913306df8
commit 1175fdae70
7 changed files with 189 additions and 363 deletions
+1 -1
View File
@@ -454,7 +454,7 @@
#define CHRHFLAG_00000200 0x00000200 // Not used in scripts
#define CHRHFLAG_PASSIVE 0x00000400
#define CHRHFLAG_KEEP_CORPSE 0x00000800 // Appears to be misnamed
#define CHRHFLAG_BUDDY_PLACED 0x00001000
#define CHRHFLAG_UNTARGETABLE 0x00001000
#define CHRHFLAG_00002000 0x00002000 // Globals, Rescue guards once disguised
#define CHRHFLAG_TRIGGER_BUDDY_WARP 0x00004000
#define CHRHFLAG_00008000 0x00008000 // Duel only. Set on each opponent when they start combat.
+5 -5
View File
@@ -42,7 +42,7 @@ u32 func0f09b828(void);
u32 func0f09b8e0(void);
u32 func0f09bc2c(void);
u32 func0f09bd58(void);
u32 func0f09bec8(void);
bool func0f09bec8(s32 handnum);
u32 func0f09bf44(void);
u32 func0f09c01c(void);
u32 func0f09cb44(void);
@@ -61,7 +61,7 @@ u32 func0f09ddcc(void);
u32 func0f09ddec(void);
u32 func0f09ddfc(void);
void func0f09df50(void);
void func0f09df64(s32 arg0);
void func0f09df64(s32 weaponnum);
void func0f09df9c(void);
u32 func0f09e004(void);
u32 func0f09e144(void);
@@ -87,8 +87,8 @@ void func0f0a0cb0(struct coord *arg0, struct coord *arg1, s32 handnum, bool arg3
u32 func0f0a0fac(void);
void func0f0a12b0(struct coord *arg0, struct coord *arg1, s32 handnum);
bool func0f0a1318(s32 handnum);
u32 func0f0a134c(void);
u32 func0f0a1528(void);
void func0f0a134c(s32 handnum);
void func0f0a1528(void);
void currentPlayerEquipWeapon(s32 weaponnum);
s32 handGetWeaponNum(s32 handnum);
bool func0f0a1a10(s32 weaponnum);
@@ -175,7 +175,7 @@ void cboostRevert(void);
void speedpillTick(void);
void currentPlayerSetGunSightVisible(u32 bits, bool visible);
Gfx *func0f0abcb0(Gfx *gdl);
u32 func0f0abd30(void);
void func0f0abd30(s32 handnum);
s32 getCurrentPlayerWeaponIdWrapper(s32 handnum);
s8 freeFireslotWrapper(s32 fireslot);
s8 freeFireslot(s32 fireslot);
+1
View File
@@ -266,6 +266,7 @@
#define SFX_M2_WERE_GONNA_DIE 0x0421
#define SFX_DOOR_042B 0x042b
#define SFX_DOOR_042C 0x042c
#define SFX_DISGUISE_ON 0x042e
#define SFX_RELOAD_FARSIGHT 0x0433
#define SFX_MENU_SUBFOCUS 0x043e
#define SFX_MENU_FOCUS 0x0441
+11 -43
View File
@@ -1858,15 +1858,15 @@ struct hand {
/*0x0854*/ u32 unk0854;
/*0x0858*/ s32 loadedammo[2];
/*0x0860*/ s32 clipsizes[2];
/*0x0868*/ u32 unk0868;
/*0x0868*/ f32 unk0868;
/*0x086c*/ u32 unk086c;
/*0x0870*/ u32 unk0870;
/*0x0874*/ f32 unk0874; // Mauler charge amount? Or a timer
/*0x0878*/ u32 unk0878;
/*0x087c*/ u32 unk087c;
/*0x0878*/ f32 unk0878;
/*0x087c*/ f32 unk087c;
/*0x0880*/ u32 unk0880;
/*0x0884*/ u32 unk0884;
/*0x0888*/ u32 unk0888;
/*0x0888*/ f32 unk0888;
/*0x088c*/ u32 unk088c;
/*0x0890*/ u32 unk0890;
/*0x0894*/ u32 unk0894;
@@ -1952,41 +1952,7 @@ struct hand {
/*0x09d4*/ u32 unk09d4;
/*0x09d8*/ u32 unk09d8;
/*0x09dc*/ u32 unk09dc;
/*0x09e0*/ u32 unk09e0;
/*0x09e4*/ u32 unk09e4;
/*0x09e8*/ u32 unk09e8;
/*0x09ec*/ u32 unk09ec;
/*0x09f0*/ u32 unk09f0;
/*0x09f4*/ u32 unk09f4;
/*0x09f8*/ u32 unk09f8;
/*0x09fc*/ u32 unk09fc;
/*0x0a00*/ u32 unk0a00;
/*0x0a04*/ u32 unk0a04;
/*0x0a08*/ u32 unk0a08;
/*0x0a0c*/ u32 unk0a0c;
/*0x0a10*/ u32 unk0a10;
/*0x0a14*/ u32 unk0a14;
/*0x0a18*/ u32 unk0a18;
/*0x0a1c*/ u32 unk0a1c;
/*0x0a20*/ u32 unk0a20;
/*0x0a24*/ u32 unk0a24;
/*0x0a28*/ u32 unk0a28;
/*0x0a2c*/ u32 unk0a2c;
/*0x0a30*/ u32 unk0a30;
/*0x0a34*/ u32 unk0a34;
/*0x0a38*/ u32 unk0a38;
/*0x0a3c*/ u32 unk0a3c;
/*0x0a40*/ u32 unk0a40;
/*0x0a44*/ u32 unk0a44;
/*0x0a48*/ u32 unk0a48;
/*0x0a4c*/ u32 unk0a4c;
/*0x0a50*/ u32 unk0a50;
/*0x0a54*/ u32 unk0a54;
/*0x0a58*/ u32 unk0a58;
/*0x0a5c*/ u32 unk0a5c;
/*0x0a60*/ u32 unk0a60;
/*0x0a64*/ u32 unk0a64;
/*0x0a68*/ u32 unk0a68;
/*0x09e0*/ struct anim anim;
/*0x0a6c*/ u32 unk0a6c;
/*0x0a70*/ u32 unk0a70;
/*0x0a74*/ u32 unk0a74;
@@ -2150,7 +2116,7 @@ struct hand {
/*0x0cec*/ ubool unk0cec;
/*0x0cf0*/ struct coord unk0cf0;
/*0x0cfc*/ struct coord unk0cfc;
/*0x0d08*/ u32 unk0d08;
/*0x0d08*/ f32 unk0d08;
/*0x0d0c*/ u8 unk0d0c;
/*0x0d0d*/ u8 unk0d0d;
/*0x0d0e*/ u8 unk0d0e_00 : 4;
@@ -2201,7 +2167,7 @@ struct hand {
/*0x0dac*/ u32 unk0dac;
/*0x0db0*/ u32 unk0db0;
/*0x0db4*/ u32 unk0db4;
/*0x0db8*/ u32 unk0db8;
/*0x0db8*/ f32 unk0db8;
/*0x0dbc*/ u32 unk0dbc;
/*0x0dc0*/ u32 unk0dc0;
/*0x0dc4*/ u32 unk0dc4;
@@ -2263,10 +2229,12 @@ struct gunctrl {
/*0x15e4*/ s8 totalammo[2];
/*0x15e6*/ u8 unk15e6;
/*0x15e7*/ u8 unk15e7;
/*0x15e8*/ u16 unk15e8;
/*0x15e8*/ u8 unk15e8;
/*0x15e9*/ u8 unk15e9;
/*0x15ea*/ u8 unk15ea;
/*0x15eb*/ s8 unk15eb;
/*0x15ec*/ u32 unk15ec;
/*0x15ec*/ u16 unk15ec;
/*0x15ee*/ u8 unk15ee;
/*0x15f0*/ u16 unk15f0;
/*0x15f2*/ u16 unk15f2;
/*0x15f4*/ u32 unk15f4;