Merge branch 'master' into doc-tilesets

This commit is contained in:
GriffinR
2020-02-16 12:07:24 -05:00
committed by GitHub
61 changed files with 1077 additions and 1098 deletions
+12
View File
@@ -81,6 +81,18 @@
#define METATILE_PokemonMansion_Statue_RedEyes_Shade 0x34E
#define METATILE_PokemonMansion_Statue_RedEyes_Basement 0x34F
// gTileset_SilphCo TODO: Bring below metatile labels in line with new tileset name
#define METATILE_Hideout_Arrow_Up 0x2A0
#define METATILE_Hideout_Arrow_Left 0x2A1
#define METATILE_Hideout_Arrow_Down 0x2A8
#define METATILE_Hideout_Arrow_RIght 0x2A9
#define METATILE_Hideout_Barrier_TopLeft_Floor 0x2CE
#define METATILE_Hideout_Barrier_TopRight_Floor 0x2CF
#define METATILE_Hideout_Barrier_BottomLeft 0x2D6
#define METATILE_Hideout_Barrier_BottomRight 0x2D7
#define METATILE_Hideout_Floor 0x281
#define METATILE_Hideout_Floor_ShadeFull 0x282
// gTileset_CinnabarGym
#define METATILE_CinnabarGym_Floor 0x281
#define METATILE_CinnabarGym_Floor_ShadeDiagonal 0x282