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

2020-04-07 11:05:48 -04:00
parent 1f113498c9 7693c90e67
commit fedb2f5c0b
276 changed files with 430 additions and 451 deletions
@@ -28,7 +28,7 @@ enum
 enum
 {
    TILE_ENCOUNTER_NONE,
-    TILE_ENCOUNTER_GRASS,
+    TILE_ENCOUNTER_LAND,
    TILE_ENCOUNTER_WATER,
 };