Merge remote-tracking branch 'upstream/master' into use_pokeblock

# Conflicts:
#	src/use_pokeblock.c

1 files changed, 5 insertions, 4 deletions

diff --git a/include/battle.h b/include/battle.h
index 9295a3548..d155ca5a0 100644
--- a/include/battle.h
+++ b/include/battle.h
@@ -28,10 +28,11 @@
 #define B_ACTION_SAFARI_GO_NEAR         7
 #define B_ACTION_SAFARI_RUN             8
 #define B_ACTION_WALLY_THROW            9
-// The exact purposes of these are unclear
-#define B_ACTION_EXEC_SCRIPT            10 // when executing an action
+#define B_ACTION_EXEC_SCRIPT            10
+#define B_ACTION_TRY_FINISH             11
+#define B_ACTION_FINISHED               12
+
 #define B_ACTION_CANCEL_PARTNER         12 // when choosing an action
-#define B_ACTION_FINISHED               12 // when executing an action
 #define B_ACTION_NOTHING_FAINTED        13 // when choosing an action
 #define B_ACTION_NONE                   0xFF
 
@@ -174,7 +175,7 @@ struct ProtectStruct
     u32 targetNotAffected:1;
     u32 chargingTurn:1;
     u32 fleeFlag:2; // For RunAway and Smoke Ball.
-    u32 usedImprisionedMove:1;
+    u32 usedImprisonedMove:1;
     u32 loveImmobility:1;
     u32 usedDisabledMove:1;
     u32 usedTauntedMove:1;