Decompile chrDoSurprisedThing and rename AI commands 000d, 000e and 00ff

src/include/commands.h

@@ -145,15 +145,19 @@
 	label,
 
 /**
- * Makes the chr do a surprised animation.
+ * Makes the chr raise one hand briefly.
+ * This isn't used, but was copied from GoldenEye and still works.
  */
-#define be_surprised_000d \
+#define be_surprised_one_hand \
 	mkshort(0x000d),
 
 /**
- * Makes the chr do a surprised animation.
+ * Makes the chr look over their shoulder.
+ *
+ * This command isn't used. The "surprised" part of the name is there because
+ * this is internally implemented using the ACT_SURPRISED action.
  */
-#define be_surprised_000e \
+#define be_surprised_look_around \
 	mkshort(0x000e),
 
 /**
@@ -2189,9 +2193,15 @@
 	mkshort(0x00fe),
 
 /**
- * Make the current chr do a surprised animation.
+ * Makes the chr raise their hands in a surrendering pose.
+ *
+ * This should not be used to make a chr surrender. Use the `surrender` command
+ * instead.
+ *
+ * This command isn't used. The "surprised" part of the name is there because
+ * this is internally implemented using the ACT_SURPRISED action.
  */
-#define be_surprised_00ff \
+#define be_surprised_surrender \
 	mkshort(0x00ff),
 
 #define cmd0100_noop(u1) \

src/include/game/chr/chraction.h

@@ -21,8 +21,8 @@ u32 func0f02ec94(struct chrdata *chr);
 void func0f02ed88(struct chrdata *chr);
 void func0f02ef40(struct chrdata *chr);
 void func0f02f070(struct chrdata *chr);
-void func0f02f314(struct chrdata *chr);
-void func0f02f530(struct chrdata *chr);
+void chrDoSurprisedThing(struct chrdata *chr);
+void chrDoSurprisedOneHand(struct chrdata *chr);
 void chrSurrenderStartAnim(struct chrdata *chr);
 void func0f02f8a4(struct chrdata *chr);
 void func0f02fc2c(struct chrdata *chr);
@@ -212,8 +212,8 @@ void chrStop(struct chrdata *chr);
 void chrKneel(struct chrdata *chr);
 void func0f02effc(struct chrdata *chr);
 void chrThrowGrenade(struct chrdata *chr, s32 arg1, s32 arg2);
-void func0f02f60c(struct chrdata *chr);
-void func0f02f688(struct chrdata *chr);
+void chrDoSurprisedSurrender(struct chrdata *chr);
+void chrDoSurprisedLookAround(struct chrdata *chr);
 void chrSurrender(struct chrdata *chr);
 void chrSidestep(struct chrdata *chr, s32 arg1);
 void chrJumpOut(struct chrdata *chr, s32 arg1);
@@ -243,9 +243,9 @@ bool chrGoToTarget(struct chrdata *chr, u32 speed);
 bool chrGoToChr(struct chrdata *chr, u32 dst_chrnum, u32 speed);
 bool chrGoToProp(struct chrdata *chr, struct prop *prop, s32 speed);
 bool chrTryStop(struct chrdata *chr);
-bool func0f03adf4(struct chrdata *chr);
-bool func0f03ae48(struct chrdata *chr);
-bool func0f03ae9c(struct chrdata *chr);
+bool chrTrySurprisedOneHand(struct chrdata *chr);
+bool chrTrySurprisedSurrender(struct chrdata *chr);
+bool chrTrySurprisedLookAround(struct chrdata *chr);
 bool chrTryKneel(struct chrdata *chr);
 bool func0f03af44(struct chrdata *chr, u32 anim_id, f32 fstartframe, f32 fendframe, u8 flags, u32 transition, f32 result);
 bool func0f03b5f0(struct chrdata *chr, s32 pad_id);

src/include/game/chr/chraicommands.h

@@ -16,8 +16,8 @@
 /*0x000a*/ bool aiKneel(void);
 /*0x000b*/ bool aiChrDoAnimation(void);
 /*0x000c*/ bool aiIfIdle(void);
-/*0x000d*/ bool aiBeSurprised000d(void);
-/*0x000e*/ bool aiBeSurprised000e(void);
+/*0x000d*/ bool aiBeSurprisedOneHand(void);
+/*0x000e*/ bool aiBeSurprisedLookAround(void);
 /*0x000f*/ bool aiStepSideways(void);
 /*0x0010*/ bool aiHopSideways(void);
 /*0x0011*/ bool aiRunSideways(void);
@@ -255,7 +255,7 @@
 /*0x00fc*/ bool aiIfKillCountGreaterThan(void);
 /*0x00fd*/ bool ai00fd(void);
 /*0x00fe*/ bool aiKillBond(void);
-/*0x00ff*/ bool aiBeSurprised00ff(void);
+/*0x00ff*/ bool aiBeSurprisedSurrender(void);
 /*0x0100*/ bool aiNoOp0100(void);
 /*0x0101*/ bool aiNoOp0101(void);
 /*0x0102*/ bool aiSetLights(void);

src/include/types.h

@@ -478,7 +478,7 @@ struct act_gopos {
 };
 
 struct act_surprised {
-	/*0x2c*/ u32 unk02c;
+	/*0x2c*/ u32 type;
 };
 
 struct act_throwgrenade {