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_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": "Route115_EventScript_Woman",
"flag": "0"
@@ -46,7 +46,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": "6",
"script": "Route115_EventScript_Timothy",
"flag": "0"
@@ -59,7 +59,7 @@
"movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT",
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "1",
"trainer_type": "TRAINER_TYPE_NORMAL",
"trainer_sight_or_berry_tree_id": "4",
"script": "Route115_EventScript_Nob",
"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": "69",
"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": "70",
"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": "71",
"script": "BerryTreeScript",
"flag": "0"
@@ -111,7 +111,7 @@
"movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_DOWN",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "1",
"trainer_type": "TRAINER_TYPE_NORMAL",
"trainer_sight_or_berry_tree_id": "3",
"script": "Route115_EventScript_Cyndy",
"flag": "0"
@@ -124,7 +124,7 @@
"movement_type": "MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT",
"movement_range_x": 5,
"movement_range_y": 0,
"trainer_type": "1",
"trainer_type": "TRAINER_TYPE_NORMAL",
"trainer_sight_or_berry_tree_id": "2",
"script": "Route115_EventScript_Koichi",
"flag": "0"
@@ -137,7 +137,7 @@
"movement_type": "MOVEMENT_TYPE_FACE_DOWN_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": "Route115_EventScript_Hector",
"flag": "0"
@@ -150,7 +150,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": "Route115_EventScript_ItemSuperPotion",
"flag": "FLAG_ITEM_ROUTE_115_SUPER_POTION"
@@ -163,7 +163,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": "Route115_EventScript_ItemTM01",
"flag": "FLAG_ITEM_ROUTE_115_TM_01"
@@ -176,7 +176,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": "Route115_EventScript_ItemIron",
"flag": "FLAG_ITEM_ROUTE_115_IRON"
@@ -189,7 +189,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": "55",
"script": "BerryTreeScript",
"flag": "0"
@@ -202,7 +202,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": "56",
"script": "BerryTreeScript",
"flag": "0"
@@ -215,7 +215,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_RockSmash",
"flag": "FLAG_TEMP_11"
@@ -228,7 +228,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": "Route115_EventScript_ItemGreatBall",
"flag": "FLAG_ITEM_ROUTE_115_GREAT_BALL"
@@ -241,7 +241,7 @@
"movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT",
"movement_range_x": 3,
"movement_range_y": 3,
"trainer_type": "1",
"trainer_type": "TRAINER_TYPE_NORMAL",
"trainer_sight_or_berry_tree_id": "2",
"script": "Route115_EventScript_Kyra",
"flag": "0"
@@ -254,7 +254,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": "Route115_EventScript_Jaiden",
"flag": "0"
@@ -267,7 +267,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": "4",
"script": "Route115_EventScript_Helene",
"flag": "0"
@@ -280,7 +280,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": "4",
"script": "Route115_EventScript_Alix",
"flag": "0"
@@ -293,7 +293,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": "4",
"script": "Route115_EventScript_Marlene",
"flag": "0"
@@ -306,7 +306,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": "Route115_EventScript_ItemPPUp",
"flag": "FLAG_ITEM_ROUTE_115_PP_UP"
@@ -319,7 +319,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": "Route115_EventScript_ItemHealPowder",
"flag": "FLAG_ITEM_ROUTE_115_HEAL_POWDER"