Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union

This commit is contained in:
GriffinR committed 2022-08-10 13:48:30 -04:00
commit 2b93687ade
1146 files changed
+40526 -38156

No files matched your search

+2 -2
View File
@@ -170,7 +170,7 @@
"x": 25,
"y": 11,
"elevation": 3,
"dest_map": "MAP_VIRIDIAN_CITY_HOUSE1",
"dest_map": "MAP_VIRIDIAN_CITY_HOUSE",
"dest_warp_id": 1
},
{
@@ -184,7 +184,7 @@
"x": 25,
"y": 18,
"elevation": 0,
"dest_map": "MAP_VIRIDIAN_CITY_HOUSE2",
"dest_map": "MAP_VIRIDIAN_CITY_SCHOOL",
"dest_warp_id": 1
},
{