diff options
| author | yenatch <yenatch@gmail.com> | 2017-03-22 18:34:29 -0400 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2017-03-22 18:34:29 -0400 |
| commit | 7acbfe40778bfbd03b0e2d357efef9ee9b0a34e9 (patch) | |
| tree | 90c0b95146f3d768b536658eac6a63ff9adcaaec /include/metatile_behaviors.h | |
| parent | c0a27d5455014bfe54f7ea73e8a38ce0ed8da6da (diff) | |
| parent | e3c26e52ae6ab881ade913ca1fad2cd9629bbcb1 (diff) | |
Merge remote-tracking branch 'origin/master'
Conflicts:
Makefile
Diffstat (limited to 'include/metatile_behaviors.h')
| -rw-r--r-- | include/metatile_behaviors.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/metatile_behaviors.h b/include/metatile_behaviors.h index ea705054e..1241fbb81 100644 --- a/include/metatile_behaviors.h +++ b/include/metatile_behaviors.h @@ -32,7 +32,7 @@ #define MB_ICE 0x20 #define MB_SAND 0x21 #define MB_SEAWEED 0x22 -#define MB_ASH 0x24 +#define MB_ASHGRASS 0x24 #define MB_25 0x25 #define MB_THIN_ICE 0x26 #define MB_CRACKED_ICE 0x27 |