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

2020-04-07 07:50:06 -04:00
parent a7d74b1779 7693c90e67
commit 31ecdcdd0a
277 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,
 };