Merge branch 'master' into doc-tilesets

This commit is contained in:
GriffinR authored and GitHub committed 2020-02-16 11:13:58 -05:00
commit 1d006c2661
249 files changed
+11504 -11961

No files matched your search

+3
View File
@@ -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