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

This commit is contained in:
PikalaxALT committed 2020-03-26 17:07:52 -04:00
commit 402f2643bd
207 files changed
+10677 -9902

No files matched your search

File diff suppressed because it is too large. Load diff
+1 -1
View File
@@ -170,7 +170,7 @@
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_TUBER_M_1",
"graphics_id": "OBJ_EVENT_GFX_TUBER_M_WATER",
"x": 9,
"y": 41,
"elevation": 1,
+1 -1
View File
@@ -79,7 +79,7 @@
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_TUBER_M_1",
"graphics_id": "OBJ_EVENT_GFX_TUBER_M_WATER",
"x": 15,
"y": 35,
"elevation": 1,
+1 -1
View File
@@ -87,7 +87,7 @@
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_TUBER_M_1",
"graphics_id": "OBJ_EVENT_GFX_TUBER_M_WATER",
"x": 11,
"y": 44,
"elevation": 1,