Merge pull request #139 from lhearachel/json2bin_constgen

Migrate json2bin scripts to constgen headers
pret · Feb 7, 2024 · 393b24a · 393b24a
2 parents 390a04b + 05288e1
commit 393b24a
Show file tree

Hide file tree

Showing 1,018 changed files with 5,490 additions and 7,329 deletions.
diff --git a/consts/battle.json b/consts/battle.json
@@ -6,7 +6,9 @@
             "@MoveSubscriptPointer",
             "@SideEffectType",
             "@Terrain",
-            "@BattleAnimation"
+            "@BattleAnimation",
+            "@MoveRange",
+            "@MoveFlags"
         ],
         "btlcmd": [
             "@BattleScriptVar",
@@ -956,6 +958,48 @@
                 "YES_NO_CHANGE_MON",
                 "YES_NO_GIVE_NICKNAME"
             ]
+        },
+        "@MoveRange": {
+            "type": "flags",
+            "values": [
+                "RANGE_SINGLE_TARGET",
+                "RANGE_SINGLE_TARGET_SPECIAL",
+                "RANGE_RANDOM_OPPONENT",
+                "RANGE_ADJACENT_OPPONENTS",
+                "RANGE_ALL_ADJACENT",
+                "RANGE_USER",
+                "RANGE_USER_SIDE",
+                "RANGE_FIELD",
+                "RANGE_OPPONENT_SIDE",
+                "RANGE_ALLY",
+                "RANGE_USER_OR_ALLY",
+                "RANGE_SINGLE_TARGET_ME_FIRST"
+            ],
+            "composites": {
+                "RANGE_MY_SIDE": {
+                    "op": "OR",
+                    "components": [
+                        "RANGE_SINGLE_TARGET_SPECIAL",
+                        "RANGE_USER",
+                        "RANGE_FIELD",
+                        "RANGE_USER_OR_ALLY"
+                    ]
+                }
+            }
+        },
+        "@MoveFlags": {
+            "type": "flags",
+            "values": [
+                "MOVE_FLAG_NONE",
+                "MOVE_FLAG_MAKES_CONTACT",
+                "MOVE_FLAG_CAN_PROTECT",
+                "MOVE_FLAG_CAN_MAGIC_COAT",
+                "MOVE_FLAG_CAN_SNATCH",
+                "MOVE_FLAG_CAN_MIRROR_MOVE",
+                "MOVE_FLAG_TRIGGERS_KINGS_ROCK",
+                "MOVE_FLAG_HIDES_HP_GAUGES",
+                "MOVE_FLAG_HIDES_SHADOWS"
+            ]
         }
     }
 }