From efdae01b4b367b1321d366c2385f0efbfc3e8dda Mon Sep 17 00:00:00 2001 From: GriffinR Date: Thu, 18 Jan 2024 14:42:20 -0500 Subject: [PATCH] Remove non-existent tilesets from label comments and alphabetize --- include/constants/metatile_labels.h | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/include/constants/metatile_labels.h b/include/constants/metatile_labels.h index 53de3a62c..7f4226923 100644 --- a/include/constants/metatile_labels.h +++ b/include/constants/metatile_labels.h @@ -35,10 +35,6 @@ // gTileset_DepartmentStore #define METATILE_DepartmentStore_ElevatorDoor 0x28D -// gTileset_Fallarbor -#define METATILE_Fallarbor_AshGrass 0x20A -#define METATILE_Fallarbor_NormalGrass 0x212 - // gTileset_FuchsiaCity #define METATILE_FuchsiaCity_Door 0x2BF #define METATILE_FuchsiaCity_SafariZoneDoor 0x2D2 @@ -78,9 +74,6 @@ #define METATILE_GenericBuilding1_PlayersPCOff 0x28F #define METATILE_GenericBuilding1_PlayersPCOn 0x28A -// gTileset_Lavaridge -#define METATILE_Lavaridge_NormalGrass 0x206 - // gTileset_LavenderTown #define METATILE_LavenderTown_Door 0x2A2 @@ -91,9 +84,6 @@ // gTileset_MtEmber #define METATILE_MtEmber_CaveEntrance 0x346 -// gTileset_Pacifidlog -#define METATILE_Pacifidlog_SkyPillar_CrackedFloor_Hole 0x237 - // gTileset_PalletTown #define METATILE_PalletTown_Door 0x2A3 #define METATILE_PalletTown_OaksLabDoor 0x2AC @@ -175,10 +165,6 @@ #define METATILE_PokemonMansion_Wall_EndPost_Bottom 0x2AD #define METATILE_PokemonMansion_Wall_EndPost_Mid 0x2A5 -// gTileset_RSCave -#define METATILE_RSCave_CrackedFloor 0x22F -#define METATILE_RSCave_CrackedFloor_Hole 0x206 - // gTileset_SSAnne #define METATILE_SSAnne_Door 0x281 @@ -309,4 +295,12 @@ #define METATILE_ViridianForest_HugeTreeTopMiddle_Grass 0x284 #define METATILE_ViridianForest_HugeTreeTopMiddle_Mowed 0x281 +// Other +#define METATILE_Fallarbor_AshGrass 0x20A +#define METATILE_Fallarbor_NormalGrass 0x212 +#define METATILE_Lavaridge_NormalGrass 0x206 +#define METATILE_Pacifidlog_SkyPillar_CrackedFloor_Hole 0x237 +#define METATILE_RSCave_CrackedFloor 0x22F +#define METATILE_RSCave_CrackedFloor_Hole 0x206 + #endif // GUARD_METATILE_LABELS_H