Merge pull request #1972 from GriffinRichards/metatile-labels
Remove non-existent tilesets from label comments and alphabetize
This commit is contained in:
GriffinR
GitHub
commit
bcd5fc1481
1 changed files with 71 additions and 71 deletions
|
|
@ -9,18 +9,6 @@
|
|||
#define METATILE_BattleDome_Door_Lobby 0x209
|
||||
#define METATILE_BattleDome_Door_PreBattleRoom 0x20A
|
||||
|
||||
// gTileset_BattleFrontierOutsideEast
|
||||
#define METATILE_BattleFrontierOutsideEast_Door 0x3FC
|
||||
#define METATILE_BattleFrontierOutsideEast_Door_BattleArena 0x291
|
||||
#define METATILE_BattleFrontierOutsideEast_Door_BattleTower 0x329
|
||||
#define METATILE_BattleFrontierOutsideEast_Door_Sliding 0x396
|
||||
|
||||
// gTileset_BattleFrontierOutsideWest
|
||||
#define METATILE_BattleFrontierOutsideWest_Door 0x3FC
|
||||
#define METATILE_BattleFrontierOutsideWest_Door_BattleDome 0x28A
|
||||
#define METATILE_BattleFrontierOutsideWest_Door_BattleFactory 0x263
|
||||
#define METATILE_BattleFrontierOutsideWest_Door_Sliding 0x396
|
||||
|
||||
// gTileset_BattleFrontier
|
||||
#define METATILE_BattleFrontier_CorridorOpenDoor_Bottom 0x20F
|
||||
#define METATILE_BattleFrontier_CorridorOpenDoor_Top 0x207
|
||||
|
|
@ -36,6 +24,18 @@
|
|||
#define METATILE_BattleFrontier_Elevator_Top1 0x32A
|
||||
#define METATILE_BattleFrontier_Elevator_Top2 0x32B
|
||||
|
||||
// gTileset_BattleFrontierOutsideEast
|
||||
#define METATILE_BattleFrontierOutsideEast_Door 0x3FC
|
||||
#define METATILE_BattleFrontierOutsideEast_Door_BattleArena 0x291
|
||||
#define METATILE_BattleFrontierOutsideEast_Door_BattleTower 0x329
|
||||
#define METATILE_BattleFrontierOutsideEast_Door_Sliding 0x396
|
||||
|
||||
// gTileset_BattleFrontierOutsideWest
|
||||
#define METATILE_BattleFrontierOutsideWest_Door 0x3FC
|
||||
#define METATILE_BattleFrontierOutsideWest_Door_BattleDome 0x28A
|
||||
#define METATILE_BattleFrontierOutsideWest_Door_BattleFactory 0x263
|
||||
#define METATILE_BattleFrontierOutsideWest_Door_Sliding 0x396
|
||||
|
||||
// gTileset_BattlePalace
|
||||
#define METATILE_BattlePalace_Door 0x219
|
||||
|
||||
|
|
@ -272,6 +272,18 @@
|
|||
#define METATILE_Lavaridge_NormalGrass 0x206
|
||||
#define METATILE_Lavaridge_RockWall 0x274
|
||||
|
||||
// gTileset_Lilycove
|
||||
#define METATILE_Lilycove_Door 0x246
|
||||
#define METATILE_Lilycove_Door_DeptStore 0x30C
|
||||
#define METATILE_Lilycove_Door_SafariZone 0x32D
|
||||
#define METATILE_Lilycove_Door_Wooden 0x28E
|
||||
#define METATILE_Lilycove_Wailmer0 0x290
|
||||
#define METATILE_Lilycove_Wailmer0_Alt 0x298
|
||||
#define METATILE_Lilycove_Wailmer1 0x291
|
||||
#define METATILE_Lilycove_Wailmer1_Alt 0x299
|
||||
#define METATILE_Lilycove_Wailmer2 0x2A0
|
||||
#define METATILE_Lilycove_Wailmer3 0x2A1
|
||||
|
||||
// gTileset_LilycoveMuseum
|
||||
#define METATILE_LilycoveMuseum_Painting0_Left 0x25A
|
||||
#define METATILE_LilycoveMuseum_Painting0_Right 0x25B
|
||||
|
|
@ -284,17 +296,31 @@
|
|||
#define METATILE_LilycoveMuseum_Painting4_Left 0x262
|
||||
#define METATILE_LilycoveMuseum_Painting4_Right 0x263
|
||||
|
||||
// gTileset_Lilycove
|
||||
#define METATILE_Lilycove_Door 0x246
|
||||
#define METATILE_Lilycove_Door_DeptStore 0x30C
|
||||
#define METATILE_Lilycove_Door_SafariZone 0x32D
|
||||
#define METATILE_Lilycove_Door_Wooden 0x28E
|
||||
#define METATILE_Lilycove_Wailmer0 0x290
|
||||
#define METATILE_Lilycove_Wailmer0_Alt 0x298
|
||||
#define METATILE_Lilycove_Wailmer1 0x291
|
||||
#define METATILE_Lilycove_Wailmer1_Alt 0x299
|
||||
#define METATILE_Lilycove_Wailmer2 0x2A0
|
||||
#define METATILE_Lilycove_Wailmer3 0x2A1
|
||||
// gTileset_Mauville
|
||||
#define METATILE_Mauville_DeepSand_BottomMid 0x259
|
||||
#define METATILE_Mauville_DeepSand_Center 0x251
|
||||
#define METATILE_Mauville_Door 0x2AC
|
||||
#define METATILE_Mauville_Door_BattleTent 0x3D4
|
||||
#define METATILE_Mauville_Door_CyclingRoad 0x289
|
||||
#define METATILE_Mauville_Door_Verdanturf 0x3A1
|
||||
#define METATILE_Mauville_MirageTower_Tile0 0x3D8
|
||||
#define METATILE_Mauville_MirageTower_Tile1 0x3D9
|
||||
#define METATILE_Mauville_MirageTower_Tile10 0x3E4
|
||||
#define METATILE_Mauville_MirageTower_Tile11 0x3E5
|
||||
#define METATILE_Mauville_MirageTower_Tile2 0x3DA
|
||||
#define METATILE_Mauville_MirageTower_Tile3 0x3E0
|
||||
#define METATILE_Mauville_MirageTower_Tile4 0x3E1
|
||||
#define METATILE_Mauville_MirageTower_Tile5 0x3E2
|
||||
#define METATILE_Mauville_MirageTower_Tile6 0x3E8
|
||||
#define METATILE_Mauville_MirageTower_Tile7 0x3E9
|
||||
#define METATILE_Mauville_MirageTower_Tile8 0x3EA
|
||||
#define METATILE_Mauville_MirageTower_Tile9 0x3F0
|
||||
#define METATILE_Mauville_MirageTower_TileA 0x3F1
|
||||
#define METATILE_Mauville_MirageTower_TileB 0x3F2
|
||||
#define METATILE_Mauville_MirageTower_TileC 0x3DB
|
||||
#define METATILE_Mauville_MirageTower_TileD 0x3DC
|
||||
#define METATILE_Mauville_MirageTower_TileE 0x3DD
|
||||
#define METATILE_Mauville_MirageTower_TileF 0x3E3
|
||||
|
||||
// gTileset_MauvilleGym
|
||||
#define METATILE_MauvilleGym_FloorTile 0x21A
|
||||
|
|
@ -325,38 +351,16 @@
|
|||
#define METATILE_MauvilleGym_RedBeamV1_On 0x241
|
||||
#define METATILE_MauvilleGym_RedBeamV2_On 0x249
|
||||
|
||||
// gTileset_Mauville
|
||||
#define METATILE_Mauville_DeepSand_BottomMid 0x259
|
||||
#define METATILE_Mauville_DeepSand_Center 0x251
|
||||
#define METATILE_Mauville_Door 0x2AC
|
||||
#define METATILE_Mauville_Door_BattleTent 0x3D4
|
||||
#define METATILE_Mauville_Door_CyclingRoad 0x289
|
||||
#define METATILE_Mauville_Door_Verdanturf 0x3A1
|
||||
#define METATILE_Mauville_MirageTower_Tile0 0x3D8
|
||||
#define METATILE_Mauville_MirageTower_Tile1 0x3D9
|
||||
#define METATILE_Mauville_MirageTower_Tile10 0x3E4
|
||||
#define METATILE_Mauville_MirageTower_Tile11 0x3E5
|
||||
#define METATILE_Mauville_MirageTower_Tile2 0x3DA
|
||||
#define METATILE_Mauville_MirageTower_Tile3 0x3E0
|
||||
#define METATILE_Mauville_MirageTower_Tile4 0x3E1
|
||||
#define METATILE_Mauville_MirageTower_Tile5 0x3E2
|
||||
#define METATILE_Mauville_MirageTower_Tile6 0x3E8
|
||||
#define METATILE_Mauville_MirageTower_Tile7 0x3E9
|
||||
#define METATILE_Mauville_MirageTower_Tile8 0x3EA
|
||||
#define METATILE_Mauville_MirageTower_Tile9 0x3F0
|
||||
#define METATILE_Mauville_MirageTower_TileA 0x3F1
|
||||
#define METATILE_Mauville_MirageTower_TileB 0x3F2
|
||||
#define METATILE_Mauville_MirageTower_TileC 0x3DB
|
||||
#define METATILE_Mauville_MirageTower_TileD 0x3DC
|
||||
#define METATILE_Mauville_MirageTower_TileE 0x3DD
|
||||
#define METATILE_Mauville_MirageTower_TileF 0x3E3
|
||||
|
||||
// gTileset_MeteorFalls
|
||||
#define METATILE_MeteorFalls_CaveEntrance_Bottom 0x24E
|
||||
#define METATILE_MeteorFalls_CaveEntrance_Left 0x24D
|
||||
#define METATILE_MeteorFalls_CaveEntrance_Right 0x24F
|
||||
#define METATILE_MeteorFalls_CaveEntrance_Top 0x246
|
||||
|
||||
// gTileset_Mossdeep
|
||||
#define METATILE_Mossdeep_Door 0x2A1
|
||||
#define METATILE_Mossdeep_Door_SpaceCenter 0x2ED
|
||||
|
||||
// gTileset_MossdeepGameCorner
|
||||
#define METATILE_MossdeepGameCorner_CounterClosed_Bottom 0x232
|
||||
#define METATILE_MossdeepGameCorner_CounterClosed_Top 0x22A
|
||||
|
|
@ -366,10 +370,6 @@
|
|||
// gTileset_MossdeepGym
|
||||
#define METATILE_MossdeepGym_YellowArrow_Right 0x250
|
||||
|
||||
// gTileset_Mossdeep
|
||||
#define METATILE_Mossdeep_Door 0x2A1
|
||||
#define METATILE_Mossdeep_Door_SpaceCenter 0x2ED
|
||||
|
||||
// gTileset_Pacifidlog
|
||||
#define METATILE_Pacifidlog_Door 0x21A
|
||||
#define METATILE_Pacifidlog_FloatingLogs_HorizontalLeft 0x250
|
||||
|
|
@ -388,6 +388,11 @@
|
|||
#define METATILE_Pacifidlog_SubmergedLogs_VerticalBottom 0x262
|
||||
#define METATILE_Pacifidlog_SubmergedLogs_VerticalTop 0x25A
|
||||
|
||||
// gTileset_Petalburg
|
||||
#define METATILE_Petalburg_Door_BirchsLab 0x249
|
||||
#define METATILE_Petalburg_Door_Littleroot 0x248
|
||||
#define METATILE_Petalburg_Door_Oldale 0x287
|
||||
|
||||
// gTileset_PetalburgGym
|
||||
#define METATILE_PetalburgGym_Door 0x224
|
||||
#define METATILE_PetalburgGym_RoomEntrance_Left 0x210
|
||||
|
|
@ -398,11 +403,6 @@
|
|||
#define METATILE_PetalburgGym_SlidingDoor_Frame3 0x21B
|
||||
#define METATILE_PetalburgGym_SlidingDoor_Frame4 0x21C
|
||||
|
||||
// gTileset_Petalburg
|
||||
#define METATILE_Petalburg_Door_BirchsLab 0x249
|
||||
#define METATILE_Petalburg_Door_Littleroot 0x248
|
||||
#define METATILE_Petalburg_Door_Oldale 0x287
|
||||
|
||||
// gTileset_PokemonCenter
|
||||
#define METATILE_PokemonCenter_CounterBarrier 0x25D
|
||||
#define METATILE_PokemonCenter_Door_CableClub 0x264
|
||||
|
|
@ -431,14 +431,6 @@
|
|||
#define METATILE_PokemonCenter_Floor_ShadowTop 0x21E
|
||||
#define METATILE_PokemonCenter_Floor_ShadowTop_Alt 0x2DC
|
||||
|
||||
// gTileset_RSMossdeepGym
|
||||
#define METATILE_RSMossdeepGym_RedArrow_Down 0x205
|
||||
#define METATILE_RSMossdeepGym_RedArrow_Left 0x20C
|
||||
#define METATILE_RSMossdeepGym_RedArrow_Right 0x204
|
||||
#define METATILE_RSMossdeepGym_RedArrow_Up 0x20D
|
||||
#define METATILE_RSMossdeepGym_Switch_Down 0x239
|
||||
#define METATILE_RSMossdeepGym_Switch_Up 0x238
|
||||
|
||||
// gTileset_Rustboro
|
||||
#define METATILE_Rustboro_Door_Gray 0x21F
|
||||
#define METATILE_Rustboro_Door_Tan 0x22F
|
||||
|
|
@ -726,11 +718,6 @@
|
|||
#define METATILE_Slateport_Door 0x2DC
|
||||
#define METATILE_Slateport_Door_BattleTent 0x393
|
||||
|
||||
// gTileset_SootopolisGym
|
||||
#define METATILE_SootopolisGym_Ice_Broken 0x206
|
||||
#define METATILE_SootopolisGym_Ice_Cracked 0x20E
|
||||
#define METATILE_SootopolisGym_Stairs 0x207
|
||||
|
||||
// gTileset_Sootopolis
|
||||
#define METATILE_Sootopolis_Door 0x21E
|
||||
#define METATILE_Sootopolis_Door_Closed 0x248
|
||||
|
|
@ -738,6 +725,11 @@
|
|||
#define METATILE_Sootopolis_GymDoor_Closed 0x250
|
||||
#define METATILE_Sootopolis_RoughWater 0x290
|
||||
|
||||
// gTileset_SootopolisGym
|
||||
#define METATILE_SootopolisGym_Ice_Broken 0x206
|
||||
#define METATILE_SootopolisGym_Ice_Cracked 0x20E
|
||||
#define METATILE_SootopolisGym_Stairs 0x207
|
||||
|
||||
// gTileset_TrainerHill
|
||||
#define METATILE_TrainerHill_CounterDoor 0x334
|
||||
#define METATILE_TrainerHill_Door_Elevator_Lobby 0x32C
|
||||
|
|
@ -787,4 +779,12 @@
|
|||
#define METATILE_Underwater_FloorShadow 0x228
|
||||
#define METATILE_Underwater_RockWall 0x21E
|
||||
|
||||
// Other
|
||||
#define METATILE_RSMossdeepGym_RedArrow_Down 0x205
|
||||
#define METATILE_RSMossdeepGym_RedArrow_Left 0x20C
|
||||
#define METATILE_RSMossdeepGym_RedArrow_Right 0x204
|
||||
#define METATILE_RSMossdeepGym_RedArrow_Up 0x20D
|
||||
#define METATILE_RSMossdeepGym_Switch_Down 0x239
|
||||
#define METATILE_RSMossdeepGym_Switch_Up 0x238
|
||||
|
||||
#endif // GUARD_METATILE_LABELS_H
|
||||
|
|
|
|||
Loading…
Reference in a new issue