Merge pull request #113 from lhearachel/battle-dev

Document post-KO switch-in AI and some other simple battle functions
pret · Nov 15, 2023 · a3b37d7 · a3b37d7
2 parents f816d09 + 15b528b
commit a3b37d7
Show file tree

Hide file tree

Showing 10 changed files with 748 additions and 433 deletions.
diff --git a/include/constants/battle/condition.h b/include/constants/battle/condition.h
@@ -45,6 +45,8 @@
                                         | VOLATILE_CONDITION_CONFUSION \
                                         | VOLATILE_CONDITION_CURSE \
                                         | VOLATILE_CONDITION_SUBSTITUTE)
+#define VOLATILE_CONDITION_TRAPPED      (VOLATILE_CONDITION_BIND \
+                                        | VOLATILE_CONDITION_MEAN_LOOK)
 
 #define VOLATILE_CONDITION_CONFUSION_SHIFT  0
 #define VOLATILE_CONDITION_UPROAR_SHIFT     4

diff --git a/include/constants/battle/moves.h b/include/constants/battle/moves.h
@@ -98,6 +98,7 @@
                                         | MOVE_STATUS_NO_MORE_WORK)
 
 #define MOVE_STATUS_DID_NOT_AFFECT      (MOVE_STATUS_INEFFECTIVE | MOVE_STATUS_WONDER_GUARD)
+#define MOVE_STATUS_IMMUNE              (MOVE_STATUS_DID_NOT_AFFECT | MOVE_STATUS_LEVITATED | MOVE_STATUS_MAGNET_RISE)
 #define MOVE_STATUS_GENERAL_MISS        (MOVE_STATUS_MISSED | MOVE_STATUS_SEMI_INVULNERABLE)
 #define MOVE_STATUS_BASIC_EFFECTIVENESS (MOVE_STATUS_SUPER_EFFECTIVE | MOVE_STATUS_NOT_VERY_EFFECTIVE)
 

diff --git a/include/constants/battle/system_control.h b/include/constants/battle/system_control.h
@@ -61,4 +61,3 @@
 #define BATTLER_STATUS_SWITCHING        1
 
 #endif // POKEPLATINUM_CONSTANTS_BATTLE_SYSTEM_CONTROL_H
-
Original file line number	Diff line number	Diff line change
Expand Up		@@ -61,4 +61,3 @@
		#define BATTLER_STATUS_SWITCHING 1

		#endif // POKEPLATINUM_CONSTANTS_BATTLE_SYSTEM_CONTROL_H