GriffinR 0400ee2124 Merge branch 'master' into clone-union		2022-09-03 14:31:04 -04:00
..
BattleColosseum_2P	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
BattleColosseum_4P	Remove address comments	2022-06-24 21:10:48 -04:00
BirthIsland_Exterior	Merge branch 'master' into clone-union	2022-08-17 15:41:50 -04:00
BirthIsland_Harbor	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
CeladonCity	Merge branch 'master' into clone-union	2022-09-03 14:31:04 -04:00
CeladonCity_Condominiums_1F	Merge branch 'master' into clone-union	2022-08-17 15:41:50 -04:00
CeladonCity_Condominiums_2F	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
CeladonCity_Condominiums_3F	Merge branch 'master' into clone-union	2022-08-17 15:41:50 -04:00
CeladonCity_Condominiums_Roof	Remove address comments	2022-06-24 21:10:48 -04:00
CeladonCity_Condominiums_RoofRoom	Merge branch 'master' into clone-union	2022-08-17 15:41:50 -04:00
CeladonCity_DepartmentStore_1F	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
CeladonCity_DepartmentStore_2F	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
CeladonCity_DepartmentStore_3F	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
CeladonCity_DepartmentStore_4F	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
CeladonCity_DepartmentStore_5F	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
CeladonCity_DepartmentStore_Elevator	Use 'goto_if_eq VAR, value, Script' syntax	2022-08-09 20:41:54 -04:00
CeladonCity_DepartmentStore_Roof	Merge branch 'master' into clone-union	2022-08-17 15:41:50 -04:00
CeladonCity_GameCorner	Merge branch 'master' into clone-union	2022-09-03 14:31:04 -04:00
CeladonCity_GameCorner_PrizeRoom	Merge branch 'master' into clone-union	2022-08-17 15:41:50 -04:00
CeladonCity_Gym	Merge branch 'master' into clone-union	2022-08-17 15:41:50 -04:00
CeladonCity_Hotel	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
CeladonCity_House1	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
CeladonCity_PokemonCenter_1F	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
CeladonCity_PokemonCenter_2F	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
CeladonCity_Restaurant	Merge branch 'master' into clone-union	2022-08-17 15:41:50 -04:00
CeruleanCave_1F	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
CeruleanCave_2F	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
CeruleanCave_B1F	Merge branch 'master' into clone-union	2022-08-17 15:41:50 -04:00
CeruleanCity	Merge branch 'master' into clone-union	2022-09-03 14:31:04 -04:00
CeruleanCity_BikeShop	Merge branch 'master' into clone-union	2022-08-17 15:41:50 -04:00
CeruleanCity_Gym	Merge branch 'master' into clone-union	2022-08-17 15:41:50 -04:00
CeruleanCity_House1	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
CeruleanCity_House2	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
CeruleanCity_House3	Merge branch 'master' into clone-union	2022-08-17 15:41:50 -04:00
CeruleanCity_House4	Merge branch 'master' into clone-union	2022-09-03 14:31:04 -04:00
CeruleanCity_House5	Merge branch 'master' into clone-union	2022-08-17 15:41:50 -04:00
CeruleanCity_Mart	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
CeruleanCity_PokemonCenter_1F	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
CeruleanCity_PokemonCenter_2F	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
CinnabarIsland	Merge branch 'master' into clone-union	2022-09-03 14:31:04 -04:00
CinnabarIsland_Gym	Merge branch 'master' into clone-union	2022-09-03 14:31:04 -04:00
CinnabarIsland_Mart	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
CinnabarIsland_PokemonCenter_1F	Merge branch 'master' into clone-union	2022-08-17 15:41:50 -04:00
CinnabarIsland_PokemonCenter_2F	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
CinnabarIsland_PokemonLab_Entrance	Merge branch 'master' into clone-union	2022-08-17 15:41:50 -04:00
CinnabarIsland_PokemonLab_ExperimentRoom	Merge branch 'master' into clone-union	2022-08-17 15:41:50 -04:00
CinnabarIsland_PokemonLab_Lounge	Merge branch 'master' into clone-union	2022-08-17 15:41:50 -04:00
CinnabarIsland_PokemonLab_ResearchRoom	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
DiglettsCave_B1F	Remove address comments	2022-06-24 21:10:48 -04:00
DiglettsCave_NorthEntrance	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
DiglettsCave_SouthEntrance	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
FiveIsland	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
FiveIsland_Harbor	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
FiveIsland_House1	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
FiveIsland_House2	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
FiveIsland_LostCave_Entrance	Remove address comments	2022-06-24 21:10:48 -04:00
FiveIsland_LostCave_Room1	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
FiveIsland_LostCave_Room2	Remove address comments	2022-06-24 21:10:48 -04:00
FiveIsland_LostCave_Room3	Remove address comments	2022-06-24 21:10:48 -04:00
FiveIsland_LostCave_Room4	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
FiveIsland_LostCave_Room5	Remove address comments	2022-06-24 21:10:48 -04:00
FiveIsland_LostCave_Room6	Remove address comments	2022-06-24 21:10:48 -04:00
FiveIsland_LostCave_Room7	Remove address comments	2022-06-24 21:10:48 -04:00
FiveIsland_LostCave_Room8	Remove address comments	2022-06-24 21:10:48 -04:00
FiveIsland_LostCave_Room9	Remove address comments	2022-06-24 21:10:48 -04:00
FiveIsland_LostCave_Room10	Merge branch 'master' into clone-union	2022-08-17 15:41:50 -04:00
FiveIsland_LostCave_Room11	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
FiveIsland_LostCave_Room12	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
FiveIsland_LostCave_Room13	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
FiveIsland_LostCave_Room14	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
FiveIsland_Meadow	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
FiveIsland_MemorialPillar	Merge branch 'master' into clone-union	2022-09-03 14:31:04 -04:00
FiveIsland_PokemonCenter_1F	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
FiveIsland_PokemonCenter_2F	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
FiveIsland_ResortGorgeous	Merge branch 'master' into clone-union	2022-09-03 14:31:04 -04:00
FiveIsland_ResortGorgeous_House	Merge branch 'master' into clone-union	2022-09-03 14:31:04 -04:00
FiveIsland_RocketWarehouse	Merge branch 'master' into clone-union	2022-09-03 14:31:04 -04:00
FiveIsland_WaterLabyrinth	Merge branch 'master' into clone-union	2022-08-17 15:41:50 -04:00
FourIsland	Merge branch 'master' into clone-union	2022-09-03 14:31:04 -04:00
FourIsland_Harbor	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
FourIsland_House1	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
FourIsland_House2	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
FourIsland_IcefallCave_1F	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
FourIsland_IcefallCave_B1F	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
FourIsland_IcefallCave_Back	Merge branch 'master' into clone-union	2022-09-03 14:31:04 -04:00
FourIsland_IcefallCave_Entrance	Remove address comments	2022-06-24 21:10:48 -04:00
FourIsland_LoreleisHouse	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
FourIsland_Mart	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
FourIsland_PokemonCenter_1F	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
FourIsland_PokemonCenter_2F	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
FourIsland_PokemonDayCare	Merge branch 'master' into clone-union	2022-08-17 15:41:50 -04:00
FuchsiaCity	Merge branch 'master' into clone-union	2022-08-17 15:41:50 -04:00
FuchsiaCity_Gym	Merge branch 'master' into clone-union	2022-08-17 15:41:50 -04:00
FuchsiaCity_House1	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
FuchsiaCity_House2	Merge branch 'master' into clone-union	2022-08-17 15:41:50 -04:00
FuchsiaCity_House3	Merge branch 'master' into clone-union	2022-08-17 15:41:50 -04:00
FuchsiaCity_Mart	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
FuchsiaCity_PokemonCenter_1F	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
FuchsiaCity_PokemonCenter_2F	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
FuchsiaCity_SafariZone_Entrance	Merge branch 'master' into clone-union	2022-09-03 14:31:04 -04:00
FuchsiaCity_SafariZone_Office	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
FuchsiaCity_WardensHouse	Merge branch 'master' into clone-union	2022-08-17 15:41:50 -04:00
IndigoPlateau_Exterior	Merge branch 'master' into clone-union	2022-08-17 15:41:50 -04:00
IndigoPlateau_PokemonCenter_1F	Merge branch 'master' into clone-union	2022-08-17 15:41:50 -04:00
IndigoPlateau_PokemonCenter_2F	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
LavenderTown	Merge branch 'master' into clone-union	2022-08-17 15:41:50 -04:00
LavenderTown_House1	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
LavenderTown_House2	Merge branch 'master' into clone-union	2022-08-17 15:41:50 -04:00
LavenderTown_Mart	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
LavenderTown_PokemonCenter_1F	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
LavenderTown_PokemonCenter_2F	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
LavenderTown_VolunteerPokemonHouse	Merge branch 'master' into clone-union	2022-08-17 15:41:50 -04:00
MtEmber_Exterior	Merge branch 'master' into clone-union	2022-09-03 14:31:04 -04:00
MtEmber_RubyPath_1F	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
MtEmber_RubyPath_B1F	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
MtEmber_RubyPath_B1F_Stairs	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
MtEmber_RubyPath_B2F	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
MtEmber_RubyPath_B2F_Stairs	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
MtEmber_RubyPath_B3F	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
MtEmber_RubyPath_B4F	Remove address comments	2022-06-24 21:10:48 -04:00
MtEmber_RubyPath_B5F	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
MtEmber_Summit	Merge branch 'master' into clone-union	2022-08-17 15:41:50 -04:00
MtEmber_SummitPath_1F	Remove address comments	2022-06-24 21:10:48 -04:00
MtEmber_SummitPath_2F	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
MtEmber_SummitPath_3F	Remove address comments	2022-06-24 21:10:48 -04:00
MtMoon_1F	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
MtMoon_B1F	Remove address comments	2022-06-24 21:10:48 -04:00
MtMoon_B2F	Merge branch 'master' into clone-union	2022-09-03 14:31:04 -04:00
NavelRock_1F	Remove address comments	2022-06-24 21:10:48 -04:00
NavelRock_B1F	Remove address comments	2022-06-24 21:10:48 -04:00
NavelRock_Base	Merge branch 'master' into clone-union	2022-08-17 15:41:50 -04:00
NavelRock_BasePath_B1F	Remove address comments	2022-06-24 21:10:48 -04:00
NavelRock_BasePath_B2F	Remove address comments	2022-06-24 21:10:48 -04:00
NavelRock_BasePath_B3F	Remove address comments	2022-06-24 21:10:48 -04:00
NavelRock_BasePath_B4F	Remove address comments	2022-06-24 21:10:48 -04:00
NavelRock_BasePath_B5F	Remove address comments	2022-06-24 21:10:48 -04:00
NavelRock_BasePath_B6F	Remove address comments	2022-06-24 21:10:48 -04:00
NavelRock_BasePath_B7F	Remove address comments	2022-06-24 21:10:48 -04:00
NavelRock_BasePath_B8F	Remove address comments	2022-06-24 21:10:48 -04:00
NavelRock_BasePath_B9F	Remove address comments	2022-06-24 21:10:48 -04:00
NavelRock_BasePath_B10F	Remove address comments	2022-06-24 21:10:48 -04:00
NavelRock_BasePath_B11F	Remove address comments	2022-06-24 21:10:48 -04:00
NavelRock_Exterior	Remove address comments	2022-06-24 21:10:48 -04:00
NavelRock_Fork	Remove address comments	2022-06-24 21:10:48 -04:00
NavelRock_Harbor	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
NavelRock_Summit	Merge branch 'master' into clone-union	2022-08-17 15:41:50 -04:00
NavelRock_SummitPath_2F	Remove address comments	2022-06-24 21:10:48 -04:00
NavelRock_SummitPath_3F	Remove address comments	2022-06-24 21:10:48 -04:00
NavelRock_SummitPath_4F	Remove address comments	2022-06-24 21:10:48 -04:00
NavelRock_SummitPath_5F	Remove address comments	2022-06-24 21:10:48 -04:00
OneIsland	Merge branch 'master' into clone-union	2022-08-17 15:41:50 -04:00
OneIsland_Harbor	Merge branch 'master' into clone-union	2022-08-17 15:41:50 -04:00
OneIsland_House1	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
OneIsland_House2	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
OneIsland_KindleRoad	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
OneIsland_KindleRoad_EmberSpa	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
OneIsland_PokemonCenter_1F	Merge branch 'master' into clone-union	2022-09-03 14:31:04 -04:00
OneIsland_PokemonCenter_2F	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
OneIsland_TreasureBeach	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
PalletTown	Merge branch 'master' into clone-union	2022-09-03 14:31:04 -04:00
PalletTown_PlayersHouse_1F	Merge branch 'master' into clone-union	2022-09-03 14:31:04 -04:00
PalletTown_PlayersHouse_2F	Use 'goto_if_eq VAR, value, Script' syntax	2022-08-09 20:41:54 -04:00
PalletTown_ProfessorOaksLab	Merge branch 'master' into clone-union	2022-09-03 14:31:04 -04:00
PalletTown_RivalsHouse	Merge branch 'master' into clone-union	2022-09-03 14:31:04 -04:00
PewterCity	Merge branch 'master' into clone-union	2022-09-03 14:31:04 -04:00
PewterCity_Gym	Merge branch 'master' into clone-union	2022-08-17 15:41:50 -04:00
PewterCity_House1	Merge branch 'master' into clone-union	2022-09-03 14:31:04 -04:00
PewterCity_House2	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
PewterCity_Mart	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
PewterCity_Museum_1F	Merge branch 'master' into clone-union	2022-09-03 14:31:04 -04:00
PewterCity_Museum_2F	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
PewterCity_PokemonCenter_1F	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
PewterCity_PokemonCenter_2F	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
PokemonLeague_AgathasRoom	Merge branch 'master' into clone-union	2022-08-17 15:41:50 -04:00
PokemonLeague_BrunosRoom	Merge branch 'master' into clone-union	2022-09-03 14:31:04 -04:00
PokemonLeague_ChampionsRoom	Merge branch 'master' into clone-union	2022-09-03 14:31:04 -04:00
PokemonLeague_HallOfFame	Merge branch 'master' into clone-union	2022-09-03 14:31:04 -04:00
PokemonLeague_LancesRoom	Merge branch 'master' into clone-union	2022-08-17 15:41:50 -04:00
PokemonLeague_LoreleisRoom	Merge branch 'master' into clone-union	2022-08-17 15:41:50 -04:00
PokemonMansion_1F	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
PokemonMansion_2F	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
PokemonMansion_3F	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
PokemonMansion_B1F	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
PokemonTower_1F	Merge branch 'master' into clone-union	2022-08-17 15:41:50 -04:00
PokemonTower_2F	Merge branch 'master' into clone-union	2022-09-03 14:31:04 -04:00
PokemonTower_3F	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
PokemonTower_4F	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
PokemonTower_5F	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
PokemonTower_6F	Merge branch 'master' into clone-union	2022-08-17 15:41:50 -04:00
PokemonTower_7F	Merge branch 'master' into clone-union	2022-08-17 15:41:50 -04:00
PowerPlant	Merge branch 'master' into clone-union	2022-08-17 15:41:50 -04:00
Prototype_SeviiIsle_6	Remove address comments	2022-06-24 21:10:48 -04:00
Prototype_SeviiIsle_7	Remove address comments	2022-06-24 21:10:48 -04:00
Prototype_SeviiIsle_8	Remove address comments	2022-06-24 21:10:48 -04:00
Prototype_SeviiIsle_9	Remove address comments	2022-06-24 21:10:48 -04:00
RecordCorner	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
RocketHideout_B1F	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
RocketHideout_B2F	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
RocketHideout_B3F	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
RocketHideout_B4F	Merge branch 'master' into clone-union	2022-08-17 15:41:50 -04:00
RocketHideout_Elevator	Use 'goto_if_eq VAR, value, Script' syntax	2022-08-09 20:41:54 -04:00
RockTunnel_1F	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
RockTunnel_B1F	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
Route1	Merge branch 'master' into clone-union	2022-08-17 15:41:50 -04:00
Route2	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
Route2_EastBuilding	Merge branch 'master' into clone-union	2022-08-17 15:41:50 -04:00
Route2_House	Merge branch 'master' into clone-union	2022-08-17 15:41:50 -04:00
Route2_ViridianForest_NorthEntrance	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
Route2_ViridianForest_SouthEntrance	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
Route3	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
Route4	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
Route4_PokemonCenter_1F	Merge branch 'master' into clone-union	2022-08-17 15:41:50 -04:00
Route4_PokemonCenter_2F	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
Route5	Remove address comments	2022-06-24 21:10:48 -04:00
Route5_PokemonDayCare	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
Route5_SouthEntrance	Merge branch 'master' into clone-union	2022-09-03 14:31:04 -04:00
Route6	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
Route6_NorthEntrance	Merge branch 'master' into clone-union	2022-09-03 14:31:04 -04:00
Route6_UnusedHouse	Remove address comments	2022-06-24 21:10:48 -04:00
Route7	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
Route7_EastEntrance	Merge branch 'master' into clone-union	2022-09-03 14:31:04 -04:00
Route8	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
Route8_WestEntrance	Merge branch 'master' into clone-union	2022-09-03 14:31:04 -04:00
Route9	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
Route10	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
Route10_PokemonCenter_1F	Merge branch 'master' into clone-union	2022-08-17 15:41:50 -04:00
Route10_PokemonCenter_2F	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
Route11	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
Route11_EastEntrance_1F	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
Route11_EastEntrance_2F	Merge branch 'master' into clone-union	2022-08-17 15:41:50 -04:00
Route12	Merge branch 'master' into clone-union	2022-08-17 15:41:50 -04:00
Route12_FishingHouse	Merge branch 'master' into clone-union	2022-08-17 15:41:50 -04:00
Route12_NorthEntrance_1F	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
Route12_NorthEntrance_2F	Merge branch 'master' into clone-union	2022-08-17 15:41:50 -04:00
Route13	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
Route14	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
Route15	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
Route15_WestEntrance_1F	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
Route15_WestEntrance_2F	Merge branch 'master' into clone-union	2022-08-17 15:41:50 -04:00
Route16	Merge branch 'master' into clone-union	2022-08-17 15:41:50 -04:00
Route16_House	Merge branch 'master' into clone-union	2022-08-17 15:41:50 -04:00
Route16_NorthEntrance_1F	Merge branch 'master' into clone-union	2022-09-03 14:31:04 -04:00
Route16_NorthEntrance_2F	Merge branch 'master' into clone-union	2022-08-17 15:41:50 -04:00
Route17	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
Route18	Merge branch 'master' into clone-union	2022-08-17 15:41:50 -04:00
Route18_EastEntrance_1F	Merge branch 'master' into clone-union	2022-09-03 14:31:04 -04:00
Route18_EastEntrance_2F	Merge branch 'master' into clone-union	2022-08-17 15:41:50 -04:00
Route19	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
Route19_UnusedHouse	Remove address comments	2022-06-24 21:10:48 -04:00
Route20	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
Route21_North	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
Route21_South	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
Route22	Merge branch 'master' into clone-union	2022-08-17 15:41:50 -04:00
Route22_NorthEntrance	Merge branch 'master' into clone-union	2022-08-17 15:41:50 -04:00
Route23	Merge branch 'master' into clone-union	2022-08-17 15:41:50 -04:00
Route23_UnusedHouse	Remove address comments	2022-06-24 21:10:48 -04:00
Route24	Merge branch 'master' into clone-union	2022-09-03 14:31:04 -04:00
Route25	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
Route25_SeaCottage	Merge branch 'master' into clone-union	2022-08-17 15:41:50 -04:00
SafariZone_Center	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
SafariZone_Center_RestHouse	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
SafariZone_East	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
SafariZone_East_RestHouse	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
SafariZone_North	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
SafariZone_North_RestHouse	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
SafariZone_SecretHouse	Merge branch 'master' into clone-union	2022-08-17 15:41:50 -04:00
SafariZone_West	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
SafariZone_West_RestHouse	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
SaffronCity	Merge branch 'master' into clone-union	2022-09-03 14:31:04 -04:00
SaffronCity_Connection	Remove address comments	2022-06-24 21:10:48 -04:00
SaffronCity_CopycatsHouse_1F	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
SaffronCity_CopycatsHouse_2F	Merge branch 'master' into clone-union	2022-08-17 15:41:50 -04:00
SaffronCity_Dojo	Merge branch 'master' into clone-union	2022-09-03 14:31:04 -04:00
SaffronCity_Gym	Merge branch 'master' into clone-union	2022-08-17 15:41:50 -04:00
SaffronCity_House	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
SaffronCity_Mart	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
SaffronCity_MrPsychicsHouse	Merge branch 'master' into clone-union	2022-08-17 15:41:50 -04:00
SaffronCity_PokemonCenter_1F	Merge branch 'master' into clone-union	2022-08-17 15:41:50 -04:00
SaffronCity_PokemonCenter_2F	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
SaffronCity_PokemonTrainerFanClub	Merge branch 'master' into clone-union	2022-09-03 14:31:04 -04:00
SeafoamIslands_1F	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
SeafoamIslands_B1F	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
SeafoamIslands_B2F	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
SeafoamIslands_B3F	Merge branch 'master' into clone-union	2022-08-17 15:41:50 -04:00
SeafoamIslands_B4F	Merge branch 'master' into clone-union	2022-08-17 15:41:50 -04:00
SevenIsland	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
SevenIsland_Harbor	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
SevenIsland_House_Room1	Merge branch 'master' into clone-union	2022-09-03 14:31:04 -04:00
SevenIsland_House_Room2	Merge branch 'master' into clone-union	2022-08-17 15:41:50 -04:00
SevenIsland_Mart	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
SevenIsland_PokemonCenter_1F	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
SevenIsland_PokemonCenter_2F	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
SevenIsland_SevaultCanyon	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
SevenIsland_SevaultCanyon_Entrance	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
SevenIsland_SevaultCanyon_House	Merge branch 'master' into clone-union	2022-09-03 14:31:04 -04:00
SevenIsland_SevaultCanyon_TanobyKey	Merge branch 'master' into clone-union	2022-08-17 15:41:50 -04:00
SevenIsland_TanobyRuins	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
SevenIsland_TanobyRuins_DilfordChamber	Remove address comments	2022-06-24 21:10:48 -04:00
SevenIsland_TanobyRuins_LiptooChamber	Remove address comments	2022-06-24 21:10:48 -04:00
SevenIsland_TanobyRuins_MoneanChamber	Remove address comments	2022-06-24 21:10:48 -04:00
SevenIsland_TanobyRuins_RixyChamber	Remove address comments	2022-06-24 21:10:48 -04:00
SevenIsland_TanobyRuins_ScufibChamber	Remove address comments	2022-06-24 21:10:48 -04:00
SevenIsland_TanobyRuins_ViapoisChamber	Remove address comments	2022-06-24 21:10:48 -04:00
SevenIsland_TanobyRuins_WeepthChamber	Remove address comments	2022-06-24 21:10:48 -04:00
SevenIsland_TrainerTower	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
SevenIsland_UnusedHouse	Remove address comments	2022-06-24 21:10:48 -04:00
SilphCo_1F	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
SilphCo_2F	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
SilphCo_3F	Merge branch 'master' into clone-union	2022-08-17 15:41:50 -04:00
SilphCo_4F	Merge branch 'master' into clone-union	2022-08-17 15:41:50 -04:00
SilphCo_5F	Merge branch 'master' into clone-union	2022-08-17 15:41:50 -04:00
SilphCo_6F	Merge branch 'master' into clone-union	2022-08-17 15:41:50 -04:00
SilphCo_7F	Merge branch 'master' into clone-union	2022-09-03 14:31:04 -04:00
SilphCo_8F	Merge branch 'master' into clone-union	2022-08-17 15:41:50 -04:00
SilphCo_9F	Merge branch 'master' into clone-union	2022-08-17 15:41:50 -04:00
SilphCo_10F	Merge branch 'master' into clone-union	2022-08-17 15:41:50 -04:00
SilphCo_11F	Merge branch 'master' into clone-union	2022-09-03 14:31:04 -04:00
SilphCo_Elevator	Use 'goto_if_eq VAR, value, Script' syntax	2022-08-09 20:41:54 -04:00
SixIsland	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
SixIsland_AlteringCave	Remove address comments	2022-06-24 21:10:48 -04:00
SixIsland_DottedHole_1F	Remove address comments	2022-06-24 21:10:48 -04:00
SixIsland_DottedHole_B1F	Remove address comments	2022-06-24 21:10:48 -04:00
SixIsland_DottedHole_B2F	Remove address comments	2022-06-24 21:10:48 -04:00
SixIsland_DottedHole_B3F	Remove address comments	2022-06-24 21:10:48 -04:00
SixIsland_DottedHole_B4F	Remove address comments	2022-06-24 21:10:48 -04:00
SixIsland_DottedHole_SapphireRoom	Merge branch 'master' into clone-union	2022-09-03 14:31:04 -04:00
SixIsland_GreenPath	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
SixIsland_Harbor	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
SixIsland_House	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
SixIsland_Mart	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
SixIsland_OutcastIsland	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
SixIsland_PatternBush	Merge branch 'master' into clone-union	2022-08-17 15:41:50 -04:00
SixIsland_PokemonCenter_1F	Merge branch 'master' into clone-union	2022-09-03 14:31:04 -04:00
SixIsland_PokemonCenter_2F	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
SixIsland_RuinValley	Merge branch 'master' into clone-union	2022-09-03 14:31:04 -04:00
SixIsland_WaterPath	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
SixIsland_WaterPath_House1	Merge branch 'master' into clone-union	2022-08-17 15:41:50 -04:00
SixIsland_WaterPath_House2	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
SSAnne_1F_Corridor	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
SSAnne_1F_Room1	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
SSAnne_1F_Room2	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
SSAnne_1F_Room3	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
SSAnne_1F_Room4	Merge branch 'master' into clone-union	2022-08-17 15:41:50 -04:00
SSAnne_1F_Room5	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
SSAnne_1F_Room6	Merge branch 'master' into clone-union	2022-08-17 15:41:50 -04:00
SSAnne_1F_Room7	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
SSAnne_2F_Corridor	Merge branch 'master' into clone-union	2022-09-03 14:31:04 -04:00
SSAnne_2F_Room1	Merge branch 'master' into clone-union	2022-08-17 15:41:50 -04:00
SSAnne_2F_Room2	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
SSAnne_2F_Room3	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
SSAnne_2F_Room4	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
SSAnne_2F_Room5	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
SSAnne_2F_Room6	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
SSAnne_3F_Corridor	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
SSAnne_B1F_Corridor	Remove address comments	2022-06-24 21:10:48 -04:00
SSAnne_B1F_Room1	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
SSAnne_B1F_Room2	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
SSAnne_B1F_Room3	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
SSAnne_B1F_Room4	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
SSAnne_B1F_Room5	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
SSAnne_CaptainsOffice	Merge branch 'master' into clone-union	2022-09-03 14:31:04 -04:00
SSAnne_Deck	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
SSAnne_Exterior	Merge branch 'master' into clone-union	2022-09-03 14:31:04 -04:00
SSAnne_Kitchen	Merge branch 'master' into clone-union	2022-08-17 15:41:50 -04:00
ThreeIsland	Merge branch 'master' into clone-union	2022-09-03 14:31:04 -04:00
ThreeIsland_BerryForest	Merge branch 'master' into clone-union	2022-09-03 14:31:04 -04:00
ThreeIsland_BondBridge	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
ThreeIsland_DunsparceTunnel	Merge branch 'master' into clone-union	2022-09-03 14:31:04 -04:00
ThreeIsland_Harbor	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
ThreeIsland_House1	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
ThreeIsland_House2	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
ThreeIsland_House3	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
ThreeIsland_House4	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
ThreeIsland_House5	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
ThreeIsland_Mart	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
ThreeIsland_PokemonCenter_1F	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
ThreeIsland_PokemonCenter_2F	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
ThreeIsland_Port	Merge branch 'master' into clone-union	2022-08-17 15:41:50 -04:00
TradeCenter	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
TrainerTower_1F	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
TrainerTower_2F	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
TrainerTower_3F	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
TrainerTower_4F	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
TrainerTower_5F	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
TrainerTower_6F	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
TrainerTower_7F	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
TrainerTower_8F	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
TrainerTower_Elevator	Merge branch 'master' into movement-action	2022-08-15 12:54:47 +08:00
TrainerTower_Lobby	Merge branch 'master' into clone-union	2022-08-17 15:41:50 -04:00
TrainerTower_Roof	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
TwoIsland	Merge branch 'master' into clone-union	2022-08-17 15:41:50 -04:00
TwoIsland_CapeBrink	Remove address comments	2022-06-24 21:10:48 -04:00
TwoIsland_CapeBrink_House	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
TwoIsland_Harbor	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
TwoIsland_House	Merge branch 'master' into clone-union	2022-08-17 15:41:50 -04:00
TwoIsland_JoyfulGameCorner	Merge branch 'master' into clone-union	2022-09-03 14:31:04 -04:00
TwoIsland_PokemonCenter_1F	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
TwoIsland_PokemonCenter_2F	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
UndergroundPath_EastEntrance	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
UndergroundPath_EastWestTunnel	Remove address comments	2022-06-24 21:10:48 -04:00
UndergroundPath_NorthEntrance	Merge branch 'master' into clone-union	2022-08-17 15:41:50 -04:00
UndergroundPath_NorthSouthTunnel	Remove address comments	2022-06-24 21:10:48 -04:00
UndergroundPath_SouthEntrance	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
UndergroundPath_WestEntrance	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
UnionRoom	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
VermilionCity	Merge branch 'master' into clone-union	2022-09-03 14:31:04 -04:00
VermilionCity_Gym	Merge branch 'master' into clone-union	2022-08-17 15:41:50 -04:00
VermilionCity_House1	Merge branch 'master' into clone-union	2022-08-17 15:41:50 -04:00
VermilionCity_House2	Merge branch 'master' into clone-union	2022-08-17 15:41:50 -04:00
VermilionCity_House3	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
VermilionCity_Mart	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
VermilionCity_PokemonCenter_1F	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
VermilionCity_PokemonCenter_2F	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
VermilionCity_PokemonFanClub	Merge branch 'master' into clone-union	2022-09-03 14:31:04 -04:00
VictoryRoad_1F	Merge branch 'master' into clone-union	2022-08-17 15:41:50 -04:00
VictoryRoad_2F	Merge branch 'master' into clone-union	2022-08-17 15:41:50 -04:00
VictoryRoad_3F	Merge branch 'master' into clone-union	2022-08-17 15:41:50 -04:00
ViridianCity	Merge branch 'master' into clone-union	2022-09-03 14:31:04 -04:00
ViridianCity_Gym	Merge branch 'master' into clone-union	2022-08-17 15:41:50 -04:00
ViridianCity_House	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
ViridianCity_Mart	Merge branch 'master' into clone-union	2022-09-03 14:31:04 -04:00
ViridianCity_PokemonCenter_1F	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
ViridianCity_PokemonCenter_2F	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
ViridianCity_School	Merge branch 'master' into clone-union	2022-09-03 14:31:04 -04:00
ViridianForest	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
.gitignore	convert map data to json	2019-05-13 19:44:24 -04:00
map_groups.json	Rename Viridian City houses	2022-08-05 15:51:27 -04:00