Use trainer type constants

This commit is contained in:
GriffinR
2020-03-27 10:24:10 -04:00
committed by huderlem
parent 09b39527ff
commit e5757a3def
429 changed files with 2775 additions and 2766 deletions

View File

@@ -33,7 +33,7 @@
"movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "0",
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "46",
"script": "BerryTreeScript",
"flag": "0"
@@ -46,7 +46,7 @@
"movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "0",
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "45",
"script": "BerryTreeScript",
"flag": "0"
@@ -59,7 +59,7 @@
"movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "0",
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "44",
"script": "BerryTreeScript",
"flag": "0"
@@ -72,7 +72,7 @@
"movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "0",
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "43",
"script": "BerryTreeScript",
"flag": "0"
@@ -85,7 +85,7 @@
"movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "0",
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "37",
"script": "BerryTreeScript",
"flag": "0"
@@ -98,7 +98,7 @@
"movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "0",
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "38",
"script": "BerryTreeScript",
"flag": "0"
@@ -111,7 +111,7 @@
"movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "0",
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "39",
"script": "BerryTreeScript",
"flag": "0"
@@ -124,7 +124,7 @@
"movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "0",
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "40",
"script": "BerryTreeScript",
"flag": "0"
@@ -137,7 +137,7 @@
"movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "0",
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "41",
"script": "BerryTreeScript",
"flag": "0"
@@ -150,7 +150,7 @@
"movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "0",
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "42",
"script": "BerryTreeScript",
"flag": "0"
@@ -163,7 +163,7 @@
"movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "1",
"trainer_type": "TRAINER_TYPE_NORMAL",
"trainer_sight_or_berry_tree_id": "3",
"script": "Route120_EventScript_Colin",
"flag": "0"
@@ -176,7 +176,7 @@
"movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "1",
"trainer_type": "TRAINER_TYPE_NORMAL",
"trainer_sight_or_berry_tree_id": "3",
"script": "Route120_EventScript_Robert",
"flag": "0"
@@ -189,7 +189,7 @@
"movement_type": "MOVEMENT_TYPE_FACE_LEFT",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "1",
"trainer_type": "TRAINER_TYPE_NORMAL",
"trainer_sight_or_berry_tree_id": "7",
"script": "Route120_EventScript_Lorenzo",
"flag": "0"
@@ -202,7 +202,7 @@
"movement_type": "MOVEMENT_TYPE_FACE_LEFT",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "1",
"trainer_type": "TRAINER_TYPE_NORMAL",
"trainer_sight_or_berry_tree_id": "2",
"script": "Route120_EventScript_Jenna",
"flag": "0"
@@ -215,7 +215,7 @@
"movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "1",
"trainer_type": "TRAINER_TYPE_NORMAL",
"trainer_sight_or_berry_tree_id": "3",
"script": "Route120_EventScript_Jeffrey",
"flag": "0"
@@ -228,7 +228,7 @@
"movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "0",
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route120_EventScript_ItemNugget",
"flag": "FLAG_ITEM_ROUTE_120_NUGGET"
@@ -241,7 +241,7 @@
"movement_type": "MOVEMENT_TYPE_FACE_DOWN",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "0",
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "GabbyAndTy_EventScript_TyBattle3",
"flag": "FLAG_HIDE_ROUTE_120_GABBY_AND_TY_1"
@@ -254,7 +254,7 @@
"movement_type": "MOVEMENT_TYPE_FACE_DOWN",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "0",
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "GabbyAndTy_EventScript_GabbyBattle3",
"flag": "FLAG_HIDE_ROUTE_120_GABBY_AND_TY_1"
@@ -267,7 +267,7 @@
"movement_type": "MOVEMENT_TYPE_FACE_DOWN",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "0",
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "GabbyAndTy_EventScript_GabbyBattle6",
"flag": "FLAG_HIDE_ROUTE_120_GABBY_AND_TY_2"
@@ -280,7 +280,7 @@
"movement_type": "MOVEMENT_TYPE_FACE_DOWN",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "0",
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "GabbyAndTy_EventScript_TyBattle6",
"flag": "FLAG_HIDE_ROUTE_120_GABBY_AND_TY_2"
@@ -293,7 +293,7 @@
"movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "0",
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "EventScript_CutTree",
"flag": "FLAG_TEMP_11"
@@ -306,7 +306,7 @@
"movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "0",
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route120_EventScript_ItemFullHeal",
"flag": "FLAG_ITEM_ROUTE_120_FULL_HEAL"
@@ -319,7 +319,7 @@
"movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT",
"movement_range_x": 1,
"movement_range_y": 0,
"trainer_type": "0",
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route120_EventScript_BerryBeauty",
"flag": "0"
@@ -332,7 +332,7 @@
"movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "1",
"trainer_type": "TRAINER_TYPE_NORMAL",
"trainer_sight_or_berry_tree_id": "4",
"script": "Route120_EventScript_Jennifer",
"flag": "0"
@@ -345,7 +345,7 @@
"movement_type": "MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "1",
"trainer_type": "TRAINER_TYPE_NORMAL",
"trainer_sight_or_berry_tree_id": "4",
"script": "Route120_EventScript_Chip",
"flag": "0"
@@ -358,7 +358,7 @@
"movement_type": "MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "1",
"trainer_type": "TRAINER_TYPE_NORMAL",
"trainer_sight_or_berry_tree_id": "4",
"script": "Route120_EventScript_Clarissa",
"flag": "0"
@@ -371,7 +371,7 @@
"movement_type": "MOVEMENT_TYPE_FACE_LEFT",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "1",
"trainer_type": "TRAINER_TYPE_NORMAL",
"trainer_sight_or_berry_tree_id": "3",
"script": "Route120_EventScript_Angelica",
"flag": "0"
@@ -384,7 +384,7 @@
"movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "0",
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route120_EventScript_ItemNestBall",
"flag": "FLAG_ITEM_ROUTE_120_NEST_BALL"
@@ -397,7 +397,7 @@
"movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "0",
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route120_EventScript_ItemHyperPotion",
"flag": "FLAG_ITEM_ROUTE_120_HYPER_POTION"
@@ -410,7 +410,7 @@
"movement_type": "MOVEMENT_TYPE_INVISIBLE",
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "0",
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route120_EventScript_InvisibleBridgeKecleon",
"flag": "FLAG_HIDE_ROUTE_120_KECLEON_BRIDGE_INVISIBLE"
@@ -423,7 +423,7 @@
"movement_type": "MOVEMENT_TYPE_FACE_DOWN",
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "0",
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route120_EventScript_Steven",
"flag": "FLAG_HIDE_ROUTE_120_STEVEN"
@@ -436,7 +436,7 @@
"movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "0",
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "EventScript_CutTree",
"flag": "FLAG_TEMP_14"
@@ -449,7 +449,7 @@
"movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "0",
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "EventScript_CutTree",
"flag": "FLAG_TEMP_12"
@@ -462,7 +462,7 @@
"movement_type": "MOVEMENT_TYPE_MOUNTAIN_DISGUISE",
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "1",
"trainer_type": "TRAINER_TYPE_NORMAL",
"trainer_sight_or_berry_tree_id": "3",
"script": "Route120_EventScript_Keigo",
"flag": "0"
@@ -475,7 +475,7 @@
"movement_type": "MOVEMENT_TYPE_TREE_DISGUISE",
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "1",
"trainer_type": "TRAINER_TYPE_NORMAL",
"trainer_sight_or_berry_tree_id": "3",
"script": "Route120_EventScript_Riley",
"flag": "0"
@@ -488,7 +488,7 @@
"movement_type": "MOVEMENT_TYPE_FACE_DOWN",
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "0",
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "0x0",
"flag": "FLAG_HIDE_ROUTE_120_KECLEON_BRIDGE_VISIBLE"
@@ -501,7 +501,7 @@
"movement_type": "MOVEMENT_TYPE_INVISIBLE",
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "0",
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route120_EventScript_Kecleon1",
"flag": "FLAG_HIDE_ROUTE_120_KECLEON_1"
@@ -514,7 +514,7 @@
"movement_type": "MOVEMENT_TYPE_INVISIBLE",
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "0",
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route120_EventScript_Kecleon2",
"flag": "FLAG_HIDE_ROUTE_120_KECLEON_2"
@@ -527,7 +527,7 @@
"movement_type": "MOVEMENT_TYPE_INVISIBLE",
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "0",
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route120_EventScript_Kecleon3",
"flag": "FLAG_HIDE_ROUTE_120_KECLEON_3"
@@ -540,7 +540,7 @@
"movement_type": "MOVEMENT_TYPE_INVISIBLE",
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "0",
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route120_EventScript_Kecleon5",
"flag": "FLAG_HIDE_ROUTE_120_KECLEON_5"
@@ -553,7 +553,7 @@
"movement_type": "MOVEMENT_TYPE_INVISIBLE",
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "0",
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route120_EventScript_Kecleon4",
"flag": "FLAG_HIDE_ROUTE_120_KECLEON_4"
@@ -566,7 +566,7 @@
"movement_type": "MOVEMENT_TYPE_FACE_UP",
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "1",
"trainer_type": "TRAINER_TYPE_NORMAL",
"trainer_sight_or_berry_tree_id": "3",
"script": "Route120_EventScript_Callie",
"flag": "0"
@@ -579,7 +579,7 @@
"movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "1",
"trainer_type": "TRAINER_TYPE_NORMAL",
"trainer_sight_or_berry_tree_id": "3",
"script": "Route120_EventScript_Leonel",
"flag": "0"
@@ -592,7 +592,7 @@
"movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "0",
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route120_EventScript_ItemRevive",
"flag": "FLAG_ITEM_ROUTE_120_REVIVE"