diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-02-16 12:20:58 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-16 12:20:58 -0500 |
| commit | 1d2c452a6a81661ded1c73f32cb861d2a11978be (patch) | |
| tree | 6353fcce9f9b95fd5c7d8b4900ea26fc04c71052 /include/constants/metatile_labels.h | |
| parent | 9addd6a6b6703f5d0810ce191a43869927cb9974 (diff) | |
| parent | 2c92f89adc58f7e6d4538645895818b27e1f2583 (diff) | |
Merge pull request #249 from GriffinRichards/doc-tilesets
Label tilesets and remaining layouts
Diffstat (limited to 'include/constants/metatile_labels.h')
| -rw-r--r-- | include/constants/metatile_labels.h | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/include/constants/metatile_labels.h b/include/constants/metatile_labels.h index cac87984d..b71e7d08f 100644 --- a/include/constants/metatile_labels.h +++ b/include/constants/metatile_labels.h @@ -1,14 +1,14 @@ #ifndef GUARD_METATILE_LABELS_H #define GUARD_METATILE_LABELS_H -// General +// gTileset_General #define METATILE_General_CalmWater 0x12B -// PokeMart -#define METATILE_Shop_CounterMid_Top 0x2BF -#define METATILE_Shop_CounterMid_Bottom 0x2C0 +// gTileset_Mart +#define METATILE_Mart_CounterMid_Top 0x2BF +#define METATILE_Mart_CounterMid_Bottom 0x2C0 -// Vermilion Gym +// gTileset_VermilionGym #define METATILE_VermilionGym_Floor 0x281 #define METATILE_VermilionGym_Beam_MidTop 0x285 #define METATILE_VermilionGym_Beam_MidBottom 0x28D @@ -39,7 +39,7 @@ #define METATILE_VermilionGym_Beam_Node_BottomRight_Edge_HalfOn 0x2C6 #define METATILE_VermilionGym_Beam_Node_BottomRight_HalfOn 0x2C7 -// Celadon Game Corner +// gTileset_GameCorner #define METATILE_GameCorner_Floor_ShadeFull 0x292 #define METATILE_GameCorner_Floor_StairsTop 0x29D #define METATILE_GameCorner_StairsTop 0x29E @@ -48,7 +48,7 @@ #define METATILE_GameCorner_PurpleWall_StairsTop 0x2A6 #define METATILE_GameCorner_PurpleWall_stairsBottom 0x2A7 -// Pokemon Mansion +// gTileset_PokemonMansion #define METATILE_PokemonMansion_Floor 0x284 #define METATILE_PokemonMansion_Floor_ShadeFull 0x285 #define METATILE_PokemonMansion_BasementFloor 0x286 @@ -81,7 +81,7 @@ #define METATILE_PokemonMansion_Statue_RedEyes_Shade 0x34E #define METATILE_PokemonMansion_Statue_RedEyes_Basement 0x34F -// Rocket Hideout, Rocket Warehouse, Silph Co, elevators +// 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 @@ -93,7 +93,7 @@ #define METATILE_Hideout_Floor 0x281 #define METATILE_Hideout_Floor_ShadeFull 0x282 -// Cinnabar Gym +// gTileset_CinnabarGym #define METATILE_CinnabarGym_Floor 0x281 #define METATILE_CinnabarGym_Floor_ShadeDiagonal 0x282 #define METATILE_CinnabarGym_Floor_ShadeFull 0x289 @@ -103,7 +103,7 @@ #define METATILE_CinnabarGym_Floor_WallLeftEdge 0x2CF #define METATILE_CinnabarGym_Wall_RetractedBarrier 0x2D1 -// Pokemon League +// gTileset_PokemonLeague #define METATILE_PokemonLeague_Door_Top_Open 0x28E #define METATILE_PokemonLeague_Door_Mid_Open 0x296 #define METATILE_PokemonLeague_Entry_TopLeft_Closed 0x29D @@ -114,16 +114,16 @@ #define METATILE_PokemonLeague_Entry_BottomRight_Closed 0x2A7 #define METATILE_PokemonLeague_Floor_ShadeFull_Lance 0x311 -// gTileset_82D504C. Below metatile probably needs generic name +// gTileset_MtEmber #define METATILE_MtEmber_CaveEntrance 0x346 -// gTileset_82D4BFC +// gTileset_Cave #define METATILE_Cave_Floor_Ledge_Top 0x2D1 #define METATILE_Cave_Floor_Ledge_Bottom 0x2E1 #define METATILE_Cave_RockBarrier_Top 0x307 #define METATILE_Cave_RockBarrier_Bottom 0x317 -// Trainer Tower +// gTileset_TrainerTower #define METATILE_TrainerTower_Floor_ShadeBottomLeft 0x287 #define METATILE_TrainerTower_CounterBarrier 0x2B4 |