Merge branch 'master' of github.com:pret/pokefirered into overworld

This commit is contained in:
PikalaxALT
2020-03-28 12:26:00 -04:00
360 changed files with 1733 additions and 1720 deletions
@@ -23,7 +23,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": "CinnabarIsland_PokemonCenter_1F_EventScript_Nurse",
"flag": "0"
@@ -36,7 +36,7 @@
"movement_type": "MOVEMENT_TYPE_WANDER_LEFT_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": "CinnabarIsland_PokemonCenter_1F_EventScript_CooltrainerF",
"flag": "0"
@@ -49,7 +49,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": "CinnabarIsland_PokemonCenter_1F_EventScript_Gentleman",
"flag": "0"
@@ -62,7 +62,7 @@
"movement_type": "MOVEMENT_TYPE_FACE_LEFT",
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "0",
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "CinnabarIsland_PokemonCenter_1F_EventScript_Youngster",
"flag": "0"
@@ -75,7 +75,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": "CinnabarIsland_PokemonCenter_1F_EventScript_PokemonJournalMrFuji",
"flag": "FLAG_HIDE_POSTGAME_GOSSIPERS"
@@ -88,7 +88,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": "CinnabarIsland_PokemonCenter_1F_EventScript_PokemonJournalMrFuji",
"flag": "FLAG_HIDE_POSTGAME_GOSSIPERS"
@@ -101,7 +101,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": "CinnabarIsland_PokemonCenter_1F_EventScript_Bill",
"flag": "FLAG_HIDE_CINNABAR_POKECENTER_BILL"