Merge branch 'master' into event-vars

This commit is contained in:
Phlosioneer committed 2019-02-25 02:24:20 -05:00
commit 4e5fae0086
201 files changed
+4075 -7997

No files matched your search

+4 -4
View File
@@ -123,7 +123,7 @@
"y": 15,
"elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
"script": "FallarborTown_EventScript_271E6A"
"script": "Common_EventScript_ShowPokemartSign"
},
{
"type": "sign",
@@ -131,7 +131,7 @@
"y": 7,
"elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
"script": "FallarborTown_EventScript_271E73"
"script": "Common_EventScript_ShowPokemonCenterSign"
},
{
"type": "sign",
@@ -147,7 +147,7 @@
"y": 7,
"elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
"script": "FallarborTown_EventScript_271E73"
"script": "Common_EventScript_ShowPokemonCenterSign"
},
{
"type": "sign",
@@ -163,7 +163,7 @@
"y": 15,
"elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
"script": "FallarborTown_EventScript_271E6A"
"script": "Common_EventScript_ShowPokemartSign"
},
{
"type": "sign",