Decompile aiDoPresetAnimation and fix mismatching setup files

This commit is contained in:
Ryan Dwyer
2020-02-09 00:24:18 +10:00
parent 8999da484e
commit 046877a518
79 changed files with 220 additions and 337 deletions
+5 -5
View File
@@ -3286,12 +3286,12 @@
channel,
/**
* If value is -2, either do 0x299 or 0x29a based on something.
* If value is -1, choose a random anim out of 8 from bank at 8006984c.
* If value is 3, choose a random anim out of 2 from bank at 80069844.
* Any other value is an index into bank at 80069840.
* If value is 0-2 or 4-14, do talking animation from g_PresetAnimations array.
* If value is 3, choose a random talking anim out of 2.
* If value is 254, do a gun jam animation.
* If value is 255, choose a random talking anim out of 8.
*/
#define do_special_animation(value) \
#define do_preset_animation(value) \
mkshort(0x01a3), \
value,
+2
View File
@@ -131,6 +131,8 @@
#define ANIM_SNIPING_026B 0x026b
#define ANIM_DRAW_PISTOL_0288 0x0288
#define ANIM_DRAW_PISTOL_0289 0x0289
#define ANIM_FIX_GUN_JAM_EASY 0x0299
#define ANIM_FIX_GUN_JAM_HARD 0x029a
#define ANIM_SKEDAR_COLLAPSE 0x0352
#define BANK_0 0
+1 -1
View File
@@ -125,7 +125,7 @@ struct prop *func0f02dbac(struct pad *pad, s16 room);
u32 func0f02ddbc(void);
u32 func0f02dff0(void);
u32 func0f02e064(struct chrdata *chr);
u32 func0f02e124(void);
bool func0f02e124(struct prop *prop);
u32 func0f02e15c(void);
u32 func0f02e1cc(void);
u32 func0f02e260(void);
+1 -1
View File
@@ -386,7 +386,7 @@
/*0x01a0*/ bool aiSetChrSpecialDeathAnimation(void);
/*0x01a1*/ bool aiSetRoomToSearch(void);
/*0x01a2*/ bool aiSayCiStaffQuip(void);
/*0x01a3*/ bool ai01a3(void);
/*0x01a3*/ bool aiDoPresetAnimation(void);
/*0x01a4*/ bool aiShowText(void);
/*0x01a5*/ bool ai01a5(void);
/*0x01a6*/ bool aiIfTargetYDifferenceLessThan(void);
+1 -1
View File
@@ -229,7 +229,7 @@ extern s16 ciquiptable_bank3[];
extern u16 g_InvestigationPadMap[40];
extern u32 var80069780;
extern u32 var8006978c;
extern u16 special_animations[];
extern u16 g_PresetAnimations[15];
extern u8 var80069860[8];
extern struct coord var80069868;
extern struct coord var80069874;