Decompile aibotCreateSlayerRocket

This commit is contained in:
Ryan Dwyer
2020-05-20 17:49:23 +10:00
parent 13c170cb29
commit ff0420aa3a
11 changed files with 92 additions and 174 deletions
+2 -2
View File
@@ -125,8 +125,8 @@ void chrTickStartAlarm(struct chrdata *chr);
void chrTickSurprised(struct chrdata *chr);
void func0f03e29c(struct chrdata *chr, s32 arg1, s32 arg2, s32 arg3, struct coord *arg4, struct coord *arg5);
f32 func0f03e45c(struct chrdata *chr);
u32 func0f03e5f0(void);
u32 func0f03e754(void);
f32 func0f03e5f0(struct chrdata *chr);
f32 func0f03e754(struct chrdata *chr);
void func0f03e788(struct chrdata *chr, s32 arg1, f32 arg2, f32 arg3, f32 arg4);
u32 func0f03e9f4(void);
u32 func0f03f778(void);
+1 -1
View File
@@ -68,7 +68,7 @@ u32 func0f09e4e0(void);
u32 func0f09ea90(void);
u32 func0f09eae4(void);
u32 func0f09ebbc(void);
u32 func0f09ebcc(void);
void func0f09ebcc(struct defaultobj *obj, struct coord *coord, s16 *rooms, f32 *matrix1, f32 *arg4, f32 *matrix2, struct prop *prop, struct coord *pos);
u32 func0f09ed2c(void);
u32 func0f09ee18(void);
u32 func0f09f100(void);
+2 -2
View File
@@ -17,8 +17,8 @@ u32 func0f19a2dc(u32 value);
u32 ammotypeGetWeapon(u32 ammotype);
u32 func0f19a37c(void);
s32 func0f19a60c(s32 weaponnum, s32 funcnum);
u32 func0f19a6d0(void);
u32 func0f19a6d0(struct chrdata *chr, struct coord *frompos, struct coord *topos, s16 *fromrooms, s16 *torooms, struct obj48 *obj48);
void func0f19a7d0(u16 padnum, struct coord *pos);
u32 func0f19a850(void);
void aibotCreateSlayerRocket(struct chrdata *chr);
#endif
+1 -1
View File
@@ -274,7 +274,7 @@ u32 func0f08b208(void);
u32 func0f08b25c(void);
u32 func0f08b27c(void);
u32 func0f08b658(void);
u32 func0f08b880(void);
struct weaponobj *func0f08b880(u32 model, u32 weaponnum, struct chrdata *chr);
void chrSetWeaponFlag4(struct chrdata *chr, s32 slot);
struct prop *func0f08b8e8(struct chrdata *chr, s32 weapon_id, s32 arg2, u32 flags, s32 arg4, s32 arg5);
struct prop *chrGiveWeapon(struct chrdata *chr, s32 model, s32 weapon_id, u32 flags);
+2 -2
View File
@@ -3,14 +3,14 @@
#include <ultra64.h>
#include "types.h"
void func000159b0(u32 *obj48_20);
void func000159b0(f32 *matrix);
void func000159fc(f32 *matrix, f32 *arg1);
u32 func00015a00(void);
void func00015b10(f32 *matrix, struct coord *coord);
void func00015b14(f32 *matrix, struct coord *coord, s32 arg2);
void func00015b64(f32 *arg0, struct coord *coord);
void func00015b68(f32 *matrix, f32 *arg1, struct coord *arg2);
u32 func00015be0(void);
void func00015be0(f32 *matrix1, f32 *matrix2);
u32 func00015be4(void);
u32 func00015cd8(void);
u32 func00015d18(void);
+1 -1
View File
@@ -9,7 +9,7 @@ u32 func00016140(void);
u32 func000161b0(void);
void func00016208(f32 *matrix, struct coord *coord);
u32 func00016248(void);
void func000162e8(f32 arg0, f32 *arg1);
void func000162e8(f32 arg0, f32 *matrix);
void func00016374(f32 arg0, f32 *matrix);
u32 func00016400(void);
u32 func0001648c(void);
+28 -10
View File
@@ -156,7 +156,7 @@ struct aibot {
/*0x004*/ struct mpsim *simulant;
/*0x008*/ u16 unk008;
/*0x008*/ s16 followingplayernum;
/*0x00c*/ s16 unk00c;
/*0x00c*/ s16 dangerouspropnum; // index into g_DangerousProps
/*0x010*/ struct prop *prop;
/*0x014*/ u32 unk014;
/*0x018*/ u32 unk018;
@@ -170,7 +170,7 @@ struct aibot {
/*0x03c*/ u16 unk03c;
/*0x03e*/ s16 unk03e;
/*0x040*/ f32 unk040;
/*0x044*/ u32 unk044;
/*0x044*/ struct prop *unk044; // obj
/*0x048*/ s16 unk048;
/*0x04a*/ s16 unk04a;
/*0x04c*/ u8 unk04c_00 : 1;
@@ -197,7 +197,13 @@ struct aibot {
/*0x059*/ u8 unk059;
/*0x05c*/ u32 unk05c;
/*0x060*/ u32 unk060;
/**
* 0x0001 = has unlimited ammo (darksim?)
* 0x0004 = detected dangerous prop
*/
/*0x064*/ u16 unk064;
/*0x068*/ u32 unk068;
/*0x06c*/ f32 unk06c;
/*0x070*/ f32 unk070;
@@ -764,11 +770,11 @@ struct chrdata {
struct obj48 {
/*0x00*/ u32 flags;
/*0x04*/ struct coord unk04; // distance moved in last tick
/*0x10*/ u32 unk10;
/*0x14*/ u32 unk14;
/*0x18*/ u32 unk18;
/*0x10*/ f32 unk10;
/*0x14*/ f32 unk14;
/*0x18*/ f32 unk18;
/*0x1c*/ u32 unk1c;
/*0x20*/ u32 unk20;
/*0x20*/ f32 unk20;
/*0x24*/ u32 unk24;
/*0x28*/ u32 unk28;
/*0x2c*/ u32 unk2c;
@@ -810,13 +816,18 @@ struct obj48 {
/*0xb8*/ u32 unkb8;
/*0xbc*/ u32 unkbc;
/*0xc0*/ u32 unkc0;
/*0xc4*/ u32 unkc4;
/*0xc8*/ u32 unkc8;
/*0xcc*/ u32 unkcc;
/*0xc4*/ struct coord pos;
/*0xd0*/ u32 unkd0;
/*0xd4*/ u32 unkd4;
/*0xd8*/ u32 unkd8;
/*0xdc*/ f32 unkdc;
/*0xe0*/ u32 unke0;
/*0xe4*/ u32 unke4;
/*0xe8*/ u32 unke8;
/*0xec*/ u32 unkec;
/*0xf0*/ u32 unkf0;
/*0xf4*/ u32 unkf4;
/*0xf8*/ u16 padnum;
};
struct hov {
@@ -925,7 +936,14 @@ struct weaponobj { // objtype 0x08
/*0x5f*/ u8 dragonthrown;
/*0x60*/ s8 unk60;
/*0x61*/ s8 dualweaponnum;
/*0x62*/ s16 team;
/**
* Appears to have multiple uses:
* Grenades = timer?
* CTC briefcase = team index
*/
/*0x62*/ s16 unk62;
/*0x64*/ struct weaponobj *dualweapon; // other weapon when dual wielding
};