Merge branch 'master' into doc-cinnabar

2020-01-22 11:41:40 -05:00
parent fbf0c4616c e97d3532d4
commit d58a5decde
126 changed files with 1878 additions and 1914 deletions
@@ -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