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_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": "31",
"script": "BerryTreeScript",
"flag": "0"
@@ -51,7 +51,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": "32",
"script": "BerryTreeScript",
"flag": "0"
@@ -64,7 +64,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": "33",
"script": "BerryTreeScript",
"flag": "0"
@@ -77,7 +77,7 @@
"movement_type": "MOVEMENT_TYPE_FACE_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": "Route118_EventScript_Perry",
"flag": "0"
@@ -90,7 +90,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_GabbyBattle2",
"flag": "FLAG_HIDE_ROUTE_118_GABBY_AND_TY_1"
@@ -103,7 +103,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_TyBattle2",
"flag": "FLAG_HIDE_ROUTE_118_GABBY_AND_TY_1"
@@ -116,7 +116,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": "Route118_EventScript_Girl",
"flag": "0"
@@ -129,7 +129,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_GabbyBattle5",
"flag": "FLAG_HIDE_ROUTE_118_GABBY_AND_TY_2"
@@ -142,7 +142,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_TyBattle5",
"flag": "FLAG_HIDE_ROUTE_118_GABBY_AND_TY_2"
@@ -155,7 +155,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_118_GABBY_AND_TY_3"
@@ -168,7 +168,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_118_GABBY_AND_TY_3"
@@ -181,7 +181,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"
@@ -194,7 +194,7 @@
"movement_type": "MOVEMENT_TYPE_FACE_LEFT",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "0",
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route118_EventScript_GoodRodFisherman",
"flag": "0"
@@ -207,7 +207,7 @@
"movement_type": "MOVEMENT_TYPE_FACE_UP",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "1",
"trainer_type": "TRAINER_TYPE_NORMAL",
"trainer_sight_or_berry_tree_id": "4",
"script": "Route118_EventScript_Rose",
"flag": "0"
@@ -220,7 +220,7 @@
"movement_type": "MOVEMENT_TYPE_FACE_DOWN",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "1",
"trainer_type": "TRAINER_TYPE_NORMAL",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route118_EventScript_Wade",
"flag": "0"
@@ -233,7 +233,7 @@
"movement_type": "MOVEMENT_TYPE_FACE_UP_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": "Route118_EventScript_Chester",
"flag": "0"
@@ -246,7 +246,7 @@
"movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "1",
"trainer_type": "TRAINER_TYPE_NORMAL",
"trainer_sight_or_berry_tree_id": "2",
"script": "Route118_EventScript_Barny",
"flag": "0"
@@ -259,7 +259,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": "3",
"script": "Route118_EventScript_Dalton",
"flag": "0"
@@ -272,7 +272,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_118_STEVEN"
@@ -285,7 +285,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": "Route118_EventScript_ItemHyperPotion",
"flag": "FLAG_ITEM_ROUTE_118_HYPER_POTION"
@@ -298,7 +298,7 @@
"movement_type": "MOVEMENT_TYPE_FACE_DOWN",
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "1",
"trainer_type": "TRAINER_TYPE_NORMAL",
"trainer_sight_or_berry_tree_id": "4",
"script": "Route118_EventScript_Deandre",
"flag": "0"