Merge branch 'master' into event-vars

This commit is contained in:
Phlosioneer
2019-02-25 02:24:20 -05:00
201 changed files with 4075 additions and 7997 deletions
+2 -2
View File
@@ -152,7 +152,7 @@
"y": 10,
"elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
"script": "DewfordTown_EventScript_271E73"
"script": "Common_EventScript_ShowPokemonCenterSign"
},
{
"type": "sign",
@@ -160,7 +160,7 @@
"y": 10,
"elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
"script": "DewfordTown_EventScript_271E73"
"script": "Common_EventScript_ShowPokemonCenterSign"
},
{
"type": "sign",