Merge branch 'master' into doc-oneisland

This commit is contained in:
GriffinR
2020-02-26 13:58:26 -05:00
committed by GitHub
89 changed files with 2360 additions and 2501 deletions
+61 -4
View File
@@ -2,6 +2,14 @@
#define GUARD_METATILE_LABELS_H
// gTileset_General
#define METATILE_General_Plain_Mowed 0x001
#define METATILE_General_ThinTreeTop_Grass 0x00A
#define METATILE_General_WideTreeTopLeft_Grass 0x00B
#define METATILE_General_WideTreeTopRight_Grass 0x00C
#define METATILE_General_Plain_Grass 0x00D
#define METATILE_General_WideTreeTopLeft_Mowed 0x00E
#define METATILE_General_WideTreeTopRight_Mowed 0x00F
#define METATILE_General_ThinTreeTop_Mowed 0x013
#define METATILE_General_CalmWater 0x12B
// gTileset_Mart
@@ -9,10 +17,31 @@
#define METATILE_Mart_CounterMid_Bottom 0x2C0
// gTileset_PokemonCenter
#define METATILE_PokemonCenter_NetworkMachine_ScreenLeft_On 0x35A
#define METATILE_PokemonCenter_NetworkMachine_ScreenRight_On 0x35B
#define METATILE_PokemonCenter_NetworkMachine_Ruby 0x35D
#define METATILE_PokemonCenter_NetworkMachine_Sapphire 0x35F
#define METATILE_PokemonCenter_NetworkMachine_ScreenLeft_On 0x35A
#define METATILE_PokemonCenter_NetworkMachine_ScreenRight_On 0x35B
#define METATILE_PokemonCenter_NetworkMachine_Ruby 0x35D
#define METATILE_PokemonCenter_NetworkMachine_Sapphire 0x35F
#define METATILE_PokemonCenter_Escalator_Top_Normal 0x2E4
#define METATILE_PokemonCenter_Escalator_Top_Transition1 0x317
#define METATILE_PokemonCenter_Escalator_Top_Transition2 0x315
#define METATILE_PokemonCenter_Escalator_TopNext_Normal 0x2E3
#define METATILE_PokemonCenter_Escalator_TopNext_Transition1 0x316
#define METATILE_PokemonCenter_Escalator_TopNext_Transition2 0x314
#define METATILE_PokemonCenter_Escalator_TopNextRail_Normal 0x2EB
#define METATILE_PokemonCenter_Escalator_TopNextRail_Transition1 0x31E
#define METATILE_PokemonCenter_Escalator_TopNextRail_Transition2 0x31C
#define METATILE_PokemonCenter_Escalator_Bottom_Normal 0x2D9
#define METATILE_PokemonCenter_Escalator_Bottom_Transition1 0x313
#define METATILE_PokemonCenter_Escalator_Bottom_Transition2 0x311
#define METATILE_PokemonCenter_Escalator_BottomRail_Normal 0x2D1
#define METATILE_PokemonCenter_Escalator_BottomRail_Transition1 0x30B
#define METATILE_PokemonCenter_Escalator_BottomRail_Transition2 0x309
#define METATILE_PokemonCenter_Escalator_BottomNext_Normal 0x2D8
#define METATILE_PokemonCenter_Escalator_BottomNext_Transition1 0x312
#define METATILE_PokemonCenter_Escalator_BottomNext_Transition2 0x310
#define METATILE_PokemonCenter_Escalator_BottomNextRail_Normal 0x2D0
#define METATILE_PokemonCenter_Escalator_BottomNextRail_Transition1 0x30A
#define METATILE_PokemonCenter_Escalator_BottomNextRail_Transition2 0x308
// gTileset_VermilionGym
#define METATILE_VermilionGym_Floor 0x281
@@ -45,6 +74,18 @@
#define METATILE_VermilionGym_Beam_Node_BottomRight_Edge_HalfOn 0x2C6
#define METATILE_VermilionGym_Beam_Node_BottomRight_HalfOn 0x2C7
// gTileset_SeaCottage
#define METATILE_SeaCottage_Teleporter_Light_Green 0x28A
#define METATILE_SeaCottage_Teleporter_Light_Yellow 0x2B5
#define METATILE_SeaCottage_Teleporter_Light_Red 0x2B6
#define METATILE_SeaCottage_Teleporter_Cable_Top 0x285
#define METATILE_SeaCottage_Teleporter_Cable_Bottom 0x2B4
#define METATILE_SeaCottage_Teleporter_CableBall_Top 0x2B9
#define METATILE_SeaCottage_Teleporter_CableBall_Bottom 0x2BA
#define METATILE_SeaCottage_Teleporter_Door 0x296
#define METATILE_SeaCottage_Teleporter_Door_HalfGlowing 0x2B7
#define METATILE_SeaCottage_Teleporter_Door_FullGlowing 0x2B8
// gTileset_GameCorner
#define METATILE_GameCorner_Floor_ShadeFull 0x292
#define METATILE_GameCorner_Floor_StairsTop 0x29D
@@ -133,4 +174,20 @@
#define METATILE_TrainerTower_Floor_ShadeBottomLeft 0x287
#define METATILE_TrainerTower_CounterBarrier 0x2B4
// gTileset_ViridianForest
#define METATILE_ViridianForest_HugeTreeTopMiddle_Grass 0x284
#define METATILE_ViridianForest_HugeTreeTopMiddle_Mowed 0x281
// gTileset_CeladonCity
#define METATILE_CeladonCity_CyclingRoad_Grass 0x352
#define METATILE_CeladonCity_CyclingRoad_Mowed 0x33E
// gTileset_FuchsiaCity
#define METATILE_FuchsiaCity_SafariZoneTreeTopLeft_Grass 0x300
#define METATILE_FuchsiaCity_SafariZoneTreeTopMiddle_Grass 0x301
#define METATILE_FuchsiaCity_SafariZoneTreeTopRight_Grass 0x302
#define METATILE_FuchsiaCity_SafariZoneTreeTopLeft_Mowed 0x310
#define METATILE_FuchsiaCity_SafariZoneTreeTopMiddle_Mowed 0x311
#define METATILE_FuchsiaCity_SafariZoneTreeTopRight_Mowed 0x312
#endif // GUARD_METATILE_LABELS_H