Merge branch 'master' into doc-caves

2020-02-16 11:08:43 -05:00
parent 30f01c7df6 04130a97d9
commit 533df93dc1
252 changed files with 11583 additions and 12191 deletions
@@ -91,4 +91,8 @@
 #define METATILE_Cave_RockBarrier_Top    0x307
 #define METATILE_Cave_RockBarrier_Bottom 0x317

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