diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-11-04 12:11:31 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-04 12:11:31 -0400 |
| commit | be7d0bd3b02727affddb422bdd868f2d219fe181 (patch) | |
| tree | 2a888fe548d140e37456f6916075cc963fb51cee /include/constants/metatile_behaviors.h | |
| parent | 17b657d83a29919253675b06c12a9ea5471385b2 (diff) | |
| parent | 7940f121f66bb0ebe0932bc642c3d9b4015f79a7 (diff) | |
Merge branch 'master' into doc-menu
Diffstat (limited to 'include/constants/metatile_behaviors.h')
| -rwxr-xr-x | include/constants/metatile_behaviors.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/constants/metatile_behaviors.h b/include/constants/metatile_behaviors.h index df2d28c7d..dde821358 100755 --- a/include/constants/metatile_behaviors.h +++ b/include/constants/metatile_behaviors.h @@ -127,8 +127,8 @@ #define MB_BRIDGE_OVER_POND_MED_EDGE_2 0x7B #define MB_BRIDGE_OVER_POND_HIGH_EDGE_1 0x7C #define MB_BRIDGE_OVER_POND_HIGH_EDGE_2 0x7D -#define MB_UNUSED_BRIDGE_1 0x7E -#define MB_UNUSED_BRIDGE_2 0x7F +#define MB_UNUSED_BRIDGE 0x7E +#define MB_BIKE_BRIDGE_OVER_BARRIER 0x7F #define MB_COUNTER 0x80 #define MB_UNUSED_81 0x81 #define MB_UNUSED_82 0x82 @@ -199,7 +199,7 @@ #define MB_HOLDS_LARGE_DECORATION 0xC3 #define MB_SECRET_BASE_TV_SHIELD 0xC4 #define MB_PLAYER_ROOM_PC_ON 0xC5 -#define MB_C6 0xC6 +#define MB_SECRET_BASE_DECORATION_BASE 0xC6 #define MB_SECRET_BASE_POSTER 0xC7 #define MB_UNUSED_C8 0xC8 #define MB_UNUSED_C9 0xC9 |