diff options
| author | Phlosioneer <mattmdrr2@gmail.com> | 2019-04-07 01:56:36 -0400 |
|---|---|---|
| committer | Phlosioneer <mattmdrr2@gmail.com> | 2019-04-07 01:56:36 -0400 |
| commit | d84d94e29a1424dd1d12ff821957bb6b1bc847d6 (patch) | |
| tree | c5ba0778afca66a91f71815cd53fe9abef1bdac6 /include/constants/metatile_behaviors.h | |
| parent | ad2a97935e1c1f4362f0dffa58ef437d191bab4e (diff) | |
| parent | c3cfd6065825ec8ddd5e1782998071518efaa322 (diff) | |
Merge branch 'master' into pokenav-decomp-again
Diffstat (limited to 'include/constants/metatile_behaviors.h')
| -rwxr-xr-x | include/constants/metatile_behaviors.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/constants/metatile_behaviors.h b/include/constants/metatile_behaviors.h index d8d75066c..44bbd9729 100755 --- a/include/constants/metatile_behaviors.h +++ b/include/constants/metatile_behaviors.h @@ -182,7 +182,7 @@ #define MB_SECRET_BASE_UNUSED 0xB2 #define MB_BLOCK_DECORATION 0xB3 #define MB_SECRET_BASE_DECORATION 0xB4 -#define MB_SECRET_BASE_LARGE_MAT_EDGE 0xB5 +#define MB_HOLDS_SMALL_DECORATION 0xB5 #define MB_UNUSED_B6 0xB6 #define MB_SECRET_BASE_NORTH_WALL 0xB7 #define MB_SECRET_BASE_BALLOON 0xB8 @@ -196,7 +196,7 @@ #define MB_IMPASSABLE_SOUTH_AND_NORTH 0xC0 #define MB_IMPASSABLE_WEST_AND_EAST 0xC1 #define MB_SECRET_BASE_HOLE 0xC2 -#define MB_LARGE_MAT_CENTER 0xC3 +#define MB_HOLDS_LARGE_DECORATION 0xC3 #define MB_SECRET_BASE_TV_SHIELD 0xC4 #define MB_PLAYER_ROOM_PC_ON 0xC5 #define MB_C6 0xC6 |