Merge branch 'master' into doc-ttower

This commit is contained in:
GriffinR
2020-01-24 03:03:45 -05:00
committed by GitHub
121 changed files with 10876 additions and 19297 deletions
+10
View File
@@ -37,6 +37,16 @@
#define METATILE_PokemonMansion_Statue_RedEyes_Shade 0x34E
#define METATILE_PokemonMansion_Statue_RedEyes_Basement 0x34F
// Cinnabar Gym
#define METATILE_CinnabarGym_Floor 0x281
#define METATILE_CinnabarGym_Floor_ShadeDiagonal 0x282
#define METATILE_CinnabarGym_Floor_ShadeFull 0x289
#define METATILE_CinnabarGym_Floor_WallRightCorner 0x2C6
#define METATILE_CinnabarGym_Floor_WallLeftCorner 0x2C7
#define METATILE_CinnabarGym_Floor_WallRightEdge 0x2CE
#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