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

@@ -38,7 +38,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": "Route111_EventScript_Victor",
"flag": "FLAG_HIDE_ROUTE_111_VICTOR_WINSTRATE"
@@ -51,7 +51,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": "0x0",
"flag": "FLAG_HIDE_ROUTE_111_VICTORIA_WINSTRATE"
@@ -64,7 +64,7 @@
"movement_type": "MOVEMENT_TYPE_FACE_DOWN",
"movement_range_x": 1,
"movement_range_y": 0,
"trainer_type": "0",
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "0x0",
"flag": "FLAG_HIDE_ROUTE_111_VIVI_WINSTRATE"
@@ -77,7 +77,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": "0x0",
"flag": "FLAG_HIDE_ROUTE_111_VICKY_WINSTRATE"
@@ -90,7 +90,7 @@
"movement_type": "MOVEMENT_TYPE_FACE_DOWN_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": "Route111_EventScript_Heidi",
"flag": "0"
@@ -103,7 +103,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": "19",
"script": "BerryTreeScript",
"flag": "0"
@@ -116,7 +116,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": "20",
"script": "BerryTreeScript",
"flag": "0"
@@ -129,7 +129,7 @@
"movement_type": "MOVEMENT_TYPE_WANDER_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": "Route111_EventScript_Man1",
"flag": "0"
@@ -142,7 +142,7 @@
"movement_type": "MOVEMENT_TYPE_FACE_DOWN_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": "Route111_EventScript_Drew",
"flag": "0"
@@ -155,7 +155,7 @@
"movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT",
"movement_range_x": 2,
"movement_range_y": 2,
"trainer_type": "1",
"trainer_type": "TRAINER_TYPE_NORMAL",
"trainer_sight_or_berry_tree_id": "2",
"script": "Route111_EventScript_Dusty",
"flag": "0"
@@ -168,7 +168,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": "4",
"script": "Route111_EventScript_Beau",
"flag": "0"
@@ -181,7 +181,7 @@
"movement_type": "MOVEMENT_TYPE_ROTATE_CLOCKWISE",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "1",
"trainer_type": "TRAINER_TYPE_NORMAL",
"trainer_sight_or_berry_tree_id": "3",
"script": "Route111_EventScript_Becky",
"flag": "0"
@@ -194,7 +194,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_TyBattle1",
"flag": "FLAG_HIDE_ROUTE_111_GABBY_AND_TY_1"
@@ -207,7 +207,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_GabbyBattle1",
"flag": "FLAG_HIDE_ROUTE_111_GABBY_AND_TY_1"
@@ -220,7 +220,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_RockSmash",
"flag": "FLAG_TEMP_11"
@@ -233,7 +233,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_RockSmash",
"flag": "FLAG_TEMP_12"
@@ -246,7 +246,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": "Route111_EventScript_Girl",
"flag": "0"
@@ -259,7 +259,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": "Route111_EventScript_ItemTM37",
"flag": "FLAG_ITEM_ROUTE_111_TM_37"
@@ -272,7 +272,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": "80",
"script": "BerryTreeScript",
"flag": "0"
@@ -285,7 +285,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": "81",
"script": "BerryTreeScript",
"flag": "0"
@@ -298,7 +298,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_GabbyBattle4",
"flag": "FLAG_HIDE_ROUTE_111_GABBY_AND_TY_3"
@@ -311,7 +311,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_TyBattle4",
"flag": "FLAG_HIDE_ROUTE_111_GABBY_AND_TY_3"
@@ -324,7 +324,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_111_GABBY_AND_TY_2"
@@ -337,7 +337,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_111_GABBY_AND_TY_2"
@@ -350,7 +350,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": "Route111_EventScript_ItemStardust",
"flag": "FLAG_ITEM_ROUTE_111_STARDUST"
@@ -363,7 +363,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": "Route111_EventScript_ItemHPUp",
"flag": "FLAG_ITEM_ROUTE_111_HP_UP"
@@ -376,7 +376,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_13"
@@ -389,7 +389,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": "2",
"script": "Route111_EventScript_Irene",
"flag": "0"
@@ -402,7 +402,7 @@
"movement_type": "MOVEMENT_TYPE_FACE_DOWN_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": "Route111_EventScript_Travis",
"flag": "0"
@@ -415,7 +415,7 @@
"movement_type": "MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT",
"movement_range_x": 1,
"movement_range_y": 0,
"trainer_type": "1",
"trainer_type": "TRAINER_TYPE_NORMAL",
"trainer_sight_or_berry_tree_id": "2",
"script": "Route111_EventScript_Daisuke",
"flag": "0"
@@ -428,7 +428,7 @@
"movement_type": "MOVEMENT_TYPE_FACE_UP",
"movement_range_x": 4,
"movement_range_y": 0,
"trainer_type": "1",
"trainer_type": "TRAINER_TYPE_NORMAL",
"trainer_sight_or_berry_tree_id": "4",
"script": "Route111_EventScript_Brooke",
"flag": "0"
@@ -441,7 +441,7 @@
"movement_type": "MOVEMENT_TYPE_FACE_DOWN_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": "Route111_EventScript_Wilton",
"flag": "0"
@@ -454,7 +454,7 @@
"movement_type": "MOVEMENT_TYPE_FACE_UP",
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "0",
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route111_EventScript_SecretPowerMan",
"flag": "FLAG_HIDE_ROUTE_111_SECRET_POWER_MAN"
@@ -467,7 +467,7 @@
"movement_type": "MOVEMENT_TYPE_WANDER_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": "Route111_EventScript_Man2",
"flag": "0"
@@ -480,7 +480,7 @@
"movement_type": "MOVEMENT_TYPE_FACE_LEFT",
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "1",
"trainer_type": "TRAINER_TYPE_NORMAL",
"trainer_sight_or_berry_tree_id": "5",
"script": "Route111_EventScript_Tyron",
"flag": "0"
@@ -493,7 +493,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": "5",
"script": "Route111_EventScript_Celina",
"flag": "0"
@@ -506,7 +506,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": "2",
"script": "Route111_EventScript_Bianca",
"flag": "0"
@@ -519,7 +519,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": "Route111_EventScript_Hayden",
"flag": "0"
@@ -532,7 +532,7 @@
"movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT",
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "1",
"trainer_type": "TRAINER_TYPE_NORMAL",
"trainer_sight_or_berry_tree_id": "7",
"script": "Route111_EventScript_Bryan",
"flag": "0"
@@ -545,7 +545,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": "6",
"script": "Route111_EventScript_Celia",
"flag": "0"
@@ -558,7 +558,7 @@
"movement_type": "MOVEMENT_TYPE_FACE_LEFT",
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "1",
"trainer_type": "TRAINER_TYPE_NORMAL",
"trainer_sight_or_berry_tree_id": "7",
"script": "Route111_EventScript_Branden",
"flag": "0"
@@ -571,7 +571,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": "Route111_EventScript_ItemElixir",
"flag": "FLAG_ITEM_ROUTE_111_ELIXIR"
@@ -584,7 +584,7 @@
"movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT",
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "0",
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route111_EventScript_Hiker",
"flag": "0"
@@ -597,7 +597,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_111_DESERT_FOSSIL"
@@ -610,7 +610,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_111_PLAYER_DESCENT"
@@ -623,7 +623,7 @@
"movement_type": "MOVEMENT_TYPE_FACE_UP",
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "0",
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route111_EventScript_RockSmashTipFatMan",
"flag": "FLAG_HIDE_ROUTE_111_ROCK_SMASH_TIP_GUY"