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
+10 -10
View File
@@ -23,7 +23,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": "PalletTown_ProfessorOaksLab_EventScript_Aide1",
"flag": "0"
@@ -36,7 +36,7 @@
"movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN",
"movement_range_x": 0,
"movement_range_y": 4,
"trainer_type": "0",
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "PalletTown_ProfessorOaksLab_EventScript_Aide3",
"flag": "0"
@@ -49,7 +49,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": "PalletTown_ProfessorOaksLab_EventScript_Aide2",
"flag": "0"
@@ -62,7 +62,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": "PalletTown_ProfessorOaksLab_EventScript_ProfOak",
"flag": "FLAG_HIDE_OAK_IN_HIS_LAB"
@@ -75,7 +75,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": "PalletTown_ProfessorOaksLab_EventScript_BulbasaurBall",
"flag": "FLAG_HIDE_BULBASAUR_BALL"
@@ -88,7 +88,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": "PalletTown_ProfessorOaksLab_EventScript_SquirtleBall",
"flag": "FLAG_HIDE_SQUIRTLE_BALL"
@@ -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": "PalletTown_ProfessorOaksLab_EventScript_CharmanderBall",
"flag": "FLAG_HIDE_CHARMANDER_BALL"
@@ -114,7 +114,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": "PalletTown_ProfessorOaksLab_EventScript_Rival",
"flag": "FLAG_HIDE_RIVAL_IN_LAB"
@@ -127,7 +127,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": "PalletTown_ProfessorOaksLab_EventScript_Pokedex",
"flag": "FLAG_HIDE_POKEDEX"
@@ -140,7 +140,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": "PalletTown_ProfessorOaksLab_EventScript_Pokedex",
"flag": "FLAG_HIDE_POKEDEX"