Decompile mpAibotApplyCommand

This commit is contained in:
Ryan Dwyer
2020-02-26 23:53:36 +10:00
parent cf45c85ac1
commit f54bb3bfd8
9 changed files with 191 additions and 199 deletions
+15
View File
@@ -53,6 +53,21 @@
#define ACT_PUNCH 36
#define ACT_CUTFIRE 37
#define AIBOTCMD_FOLLOW 0
#define AIBOTCMD_ATTACK 1
#define AIBOTCMD_DEFEND 2
#define AIBOTCMD_HOLD 3
#define AIBOTCMD_NORMAL 4
#define AIBOTCMD_DOWNLOAD 5
#define AIBOTCMD_GETCASE 6
#define AIBOTCMD_TAGBOX 7
#define AIBOTCMD_SAVECASE 8
#define AIBOTCMD_DEFHILL 9
#define AIBOTCMD_HOLDHILL 10
#define AIBOTCMD_GETCASE2 11
#define AIBOTCMD_POPCAP 12
#define AIBOTCMD_PROTECT 13
#define AIMCONTROL_HOLD 0
#define AIMCONTROL_TOGGLE 1
+1 -1
View File
@@ -3,7 +3,7 @@
#include <ultra64.h>
#include "types.h"
void func0f0fd660(void);
void mpOpenPickTarget(void);
void activemenuSetAiBuddyTemperament(bool aggressive);
void activemenuSetAiBuddyStealth(void);
s32 activemenuGetFirstBuddyIndex(void);
+8 -8
View File
@@ -33,22 +33,22 @@ s32 mpObjIsSafe(struct defaultobj *obj);
u32 func0f1915b4(struct chrdata *chr);
u8 func0f191600(struct chrdata *chr);
char *mpGetBotCommandName(s32 command);
void func0f192438(struct chrdata *chr, struct prop *prop);
void func0f192474(struct chrdata *chr, struct prop *prop);
void func0f1924ac(struct chrdata *chr, struct prop *prop);
void func0f1924e8(struct chrdata *chr, struct coord *pos, s16 *room, f32 arg3);
void func0f19257c(struct chrdata *chr, struct coord *pos, s16 *room, f32 arg3);
void func0f192610(struct chrdata *chr, s32 arg1);
void mpAibotApplyAttack(struct chrdata *chr, struct prop *prop);
void mpAibotApplyFollow(struct chrdata *chr, struct prop *prop);
void mpAibotApplyProtect(struct chrdata *chr, struct prop *prop);
void mpAibotApplyDefend(struct chrdata *chr, struct coord *pos, s16 *room, f32 arg3);
void mpAibotApplyHold(struct chrdata *chr, struct coord *pos, s16 *room, f32 arg3);
void mpAibotApplyScenarioCommand(struct chrdata *chr, u32 arg1);
bool mpIsChrFollowedByChr(struct chrdata *leader, struct chrdata *follower);
s32 func0f193530(struct chrdata *chr, f32 arg1);
bool func0f194670(struct chrdata *chr);
s32 func0f194694(struct chrdata *chr);
s32 func0f1946b4(struct chrdata *chr);
s32 mpGetNumPlayerTeammates(struct chrdata *chr);
s32 func0f194724(struct chrdata *self, s32 arg1, bool includeself);
s32 mpCountAibotsWithCommand(struct chrdata *self, u32 command, bool includeself);
s32 scenarioCtcIsChrsTokenHeld(struct chrdata *chr);
bool func0f19489c(struct chrdata *chr);
s32 mpGetNumTeammatesInRoomDoingSomething(struct chrdata *bot);
s32 mpGetNumTeammatesDefendingHill(struct chrdata *bot);
void func0f197544(struct chrdata *chr);
#endif
+1 -1
View File
@@ -4,7 +4,7 @@
#include "types.h"
u32 func0f197600(void);
void func0f197af4(struct chrdata *chr, s32 aibotcommand);
void mpAibotApplyCommand(struct chrdata *chr, u32 command);
void func0f197c00(struct chrdata *chr);
u32 func0f197c70(void);
u32 func0f197cf0(void);
+5 -5
View File
@@ -198,13 +198,13 @@ struct chr2d4 {
/*0x076*/ s8 unk076;
/*0x077*/ s8 unk077;
/*0x078*/ u8 unk078;
/*0x079*/ u8 unk079;
/*0x079*/ u8 command;
/*0x07a*/ s16 rooms[1];
/*0x07c*/ u32 unk07c;
/*0x080*/ u32 unk080;
/*0x084*/ u32 unk084;
/*0x088*/ u32 unk088;
/*0x08c*/ struct coord unk08c;
/*0x08c*/ struct coord defendholdpos;
/*0x098*/ f32 unk098;
/*0x09c*/ u8 unk09c_00 : 1;
/*0x09c*/ u8 unk09c_01 : 1;
@@ -223,12 +223,12 @@ struct chr2d4 {
/*0x0b4*/ f32 unk0b4;
/*0x0b8*/ f32 unk0b8;
/*0x0bc*/ s32 unk0bc;
/*0x0c0*/ s32 unk0c0_propindex;
/*0x0c0*/ s32 attackpropnum;
/*0x0c4*/ u32 unk0c4;
/*0x0c8*/ u32 unk0c8;
/*0x0cc*/ u32 unk0cc;
/*0x0d0*/ u32 unk0d0;
/*0x0d4*/ u32 unk0d4_propindex;
/*0x0d4*/ s32 followprotectpropnum;
/*0x0d8*/ s32 unk0d8;
/*0x0dc*/ u32 unk0dc;
/*0x0e0*/ u16 unk0e0;
@@ -4675,7 +4675,7 @@ struct scenariodata_cbt {
u32 unk04;
u32 unk08;
u16 unk0c;
s16 unk0e[1]; // possibly for a different scenario - see mpGetNumTeammatesInRoomDoingSomething
s16 unk0e[1]; // possibly for a different scenario - see mpGetNumTeammatesDefendingHill
};
struct scenariodata_htb {