Decompile aiSetDrCarollImages

src/include/commands.h

@@ -2315,7 +2315,16 @@
 	mkshort(0x01d2), \
 	chr,
 
-#define set_drcaroll_image(chr, left, right) \
+/**
+ * Set the images for Dr Caroll.
+ *
+ * The chr argument must be Dr Caroll. The left and right arguments can be:
+ *
+ * 0-6 = set directly to that image ID
+ * 7 = 25% chance of changing the image to a random one in range 0-5
+ * 8 = 100% chance of changing the image to a random one in range 0-5
+ */
+#define set_drcaroll_images(chr, left, right) \
 	mkshort(0x01d3), \
 	chr, \
 	left, \

src/include/constants.h

@@ -337,6 +337,8 @@
 #define DOORSTATEBIT_CLOSING 4
 #define DOORSTATEBIT_OPENING 8
 
+#define DRCAROLLIMAGE_DEAD 4
+
 #define EEPROMFLAG_USED_TRANSFERPAK     0x23
 #define EEPROMFLAG_CI_TOUR_DONE         0x24
 #define EEPROMFLAG_CI_HOLO7_DONE        0x29
@@ -693,11 +695,11 @@
 #define PROPTYPE_EYESPY 5
 #define PROPTYPE_PLAYER 6
 
-#define RACE_HUMAN  0
-#define RACE_SKEDAR 1
-#define RACE_MAIAN  2
-#define RACE_ROBOT  3
-#define RACE_4      4
+#define RACE_HUMAN    0
+#define RACE_SKEDAR   1
+#define RACE_DRCAROLL 2
+#define RACE_ROBOT    3
+#define RACE_4        4
 
 #define SPEED_WALK 0
 #define SPEED_JOG  1

src/include/game/chr/chraicommands.h

@@ -430,7 +430,7 @@
 /*0x01d0*/ bool ai01d0(void);
 /*0x01d1*/ bool aiSetObjPartVisible(void);
 /*0x01d2*/ bool aiChrEmitSparks(void);
-/*0x01d3*/ bool ai01d3(void);
+/*0x01d3*/ bool aiSetDrCarollImages(void);
 /*0x01d4*/ bool ai01d4(void);
 /*0x01d5*/ bool aiShowCutsceneChrs(void);
 /*0x01d6*/ bool aiMiscellaneous(void);

src/include/gvars/gvars.h

@@ -20,7 +20,7 @@ struct g_vars {
 	/*000000*/ u32 unk000000;
 	/*000004*/ u32 unk000004;
 	/*000008*/ s32 tickcount;
-	/*00000c*/ u32 unk00000c;
+	/*00000c*/ s32 unk00000c;
 	/*000010*/ u32 unk000010;
 	/*000014*/ u32 unk000014;
 	/*000018*/ u32 unk000018;

src/include/types.h

@@ -485,8 +485,8 @@ struct chrdata {
 	/*0x35f*/ u8 maxdodgerating;
 	/*0x360*/ u8 unarmeddodgerating;
 	/*0x361*/ u8 lastfootsample;
-	/*0x362*/ u8 onlift_00 : 4;
-	/*0x362*/ u8 onlift_04 : 4;
+	/*0x362*/ u8 drcarollimage_left : 4;
+	/*0x362*/ u8 drcarollimage_right : 4;
 	/*0x364*/ u32 unk364;
 };