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

2020-03-26 17:07:52 -04:00
parent d69a051df5 7a6d4525c4
commit 402f2643bd
207 changed files with 10677 additions and 9902 deletions
@@ -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,
@@ -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,
@@ -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,
--- a/Show More
+++ b/Show More