Merge branch 'master' into doc-tilesets

2020-02-16 11:13:58 -05:00
parent 4ab216f309 04130a97d9
commit 1d006c2661
249 changed files with 11504 additions and 11961 deletions
@@ -85,5 +85,8 @@
 // gTileset_MtEmber
 #define METATILE_MtEmber_CaveEntrance  0x346

+// Trainer Tower
+#define METATILE_TrainerTower_Floor_ShadeBottomLeft  0x287
+#define METATILE_TrainerTower_CounterBarrier         0x2B4

 #endif // GUARD_METATILE_LABELS_H