diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-01-22 11:41:40 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-22 11:41:40 -0500 |
| commit | d58a5decded55eb7311ea2e68a2e2dd24059db4a (patch) | |
| tree | 713464896261218ec711e3baa22bb883a4f50cd9 /include/constants/metatile_labels.h | |
| parent | fbf0c4616c397bf7d9d5a8d2dfda5c647fa18af7 (diff) | |
| parent | e97d3532d4d72a1fe9aec755cd2a3c6527484e27 (diff) | |
Merge branch 'master' into doc-cinnabar
Diffstat (limited to 'include/constants/metatile_labels.h')
| -rw-r--r-- | include/constants/metatile_labels.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/constants/metatile_labels.h b/include/constants/metatile_labels.h index 2d7600696..7cdfb25e5 100644 --- a/include/constants/metatile_labels.h +++ b/include/constants/metatile_labels.h @@ -1,6 +1,9 @@ #ifndef GUARD_METATILE_LABELS_H #define GUARD_METATILE_LABELS_H +// General +#define METATILE_General_CalmWater 0x12B + // Pokemon Mansion #define METATILE_PokemonMansion_Floor 0x284 #define METATILE_PokemonMansion_Floor_ShadeFull 0x285 @@ -44,5 +47,8 @@ #define METATILE_CinnabarGym_Floor_WallLeftEdge 0x2CF #define METATILE_CinnabarGym_Wall_RetractedBarrier 0x2D1 +// gTileset_82D504C. Below metatile probably needs generic name +#define METATILE_MtEmber_CaveEntrance 0x346 + #endif // GUARD_METATILE_LABELS_H |