diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-02-16 12:07:24 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-16 12:07:24 -0500 |
| commit | 01de877fc86e8fe369314b7bda490b610342af6f (patch) | |
| tree | 996f86f889d7977b7210b15ebba6fef61748cc40 /include | |
| parent | b4fce4020d218e9c246fda91339e660a46182393 (diff) | |
| parent | b6899a0de1d64b97bcbaa4239b1d87ced98d005a (diff) | |
Merge branch 'master' into doc-tilesets
Diffstat (limited to 'include')
| -rw-r--r-- | include/constants/metatile_labels.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/include/constants/metatile_labels.h b/include/constants/metatile_labels.h index 3d74c6c25..1b3af7b96 100644 --- a/include/constants/metatile_labels.h +++ b/include/constants/metatile_labels.h @@ -81,6 +81,18 @@ #define METATILE_PokemonMansion_Statue_RedEyes_Shade 0x34E #define METATILE_PokemonMansion_Statue_RedEyes_Basement 0x34F +// gTileset_SilphCo TODO: Bring below metatile labels in line with new tileset name +#define METATILE_Hideout_Arrow_Up 0x2A0 +#define METATILE_Hideout_Arrow_Left 0x2A1 +#define METATILE_Hideout_Arrow_Down 0x2A8 +#define METATILE_Hideout_Arrow_RIght 0x2A9 +#define METATILE_Hideout_Barrier_TopLeft_Floor 0x2CE +#define METATILE_Hideout_Barrier_TopRight_Floor 0x2CF +#define METATILE_Hideout_Barrier_BottomLeft 0x2D6 +#define METATILE_Hideout_Barrier_BottomRight 0x2D7 +#define METATILE_Hideout_Floor 0x281 +#define METATILE_Hideout_Floor_ShadeFull 0x282 + // gTileset_CinnabarGym #define METATILE_CinnabarGym_Floor 0x281 #define METATILE_CinnabarGym_Floor_ShadeDiagonal 0x282 |