From e919f9e0f92dda3e8869a053d4df275f1321caf3 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Thu, 4 May 2017 23:17:32 -0500 Subject: rename extension of included .s files to .inc --- data/experience_tables/erratic_growth_rate.inc | 101 +++ data/experience_tables/erratic_growth_rate.s | 101 --- data/experience_tables/fast_growth_rate.inc | 101 +++ data/experience_tables/fast_growth_rate.s | 101 --- data/experience_tables/fluctuating_growth_rate.inc | 101 +++ data/experience_tables/fluctuating_growth_rate.s | 101 --- data/experience_tables/medium_fast_growth_rate.inc | 101 +++ data/experience_tables/medium_fast_growth_rate.s | 101 --- data/experience_tables/medium_slow_growth_rate.inc | 101 +++ data/experience_tables/medium_slow_growth_rate.s | 101 --- data/experience_tables/slow_growth_rate.inc | 101 +++ data/experience_tables/slow_growth_rate.s | 101 --- data/experience_tables/tables.inc | 16 +- data/maps/AbandonedShip_CaptainsOffice/header.inc | 14 + data/maps/AbandonedShip_CaptainsOffice/header.s | 14 - data/maps/AbandonedShip_Corridors_1F/header.inc | 14 + data/maps/AbandonedShip_Corridors_1F/header.s | 14 - data/maps/AbandonedShip_Corridors_B1F/header.inc | 14 + data/maps/AbandonedShip_Corridors_B1F/header.s | 14 - data/maps/AbandonedShip_Deck/header.inc | 14 + data/maps/AbandonedShip_Deck/header.s | 14 - .../AbandonedShip_HiddenFloorCorridors/header.inc | 14 + .../AbandonedShip_HiddenFloorCorridors/header.s | 14 - .../maps/AbandonedShip_HiddenFloorRooms/header.inc | 14 + data/maps/AbandonedShip_HiddenFloorRooms/header.s | 14 - data/maps/AbandonedShip_Room_B1F/header.inc | 14 + data/maps/AbandonedShip_Room_B1F/header.s | 14 - data/maps/AbandonedShip_Rooms2_1F/header.inc | 14 + data/maps/AbandonedShip_Rooms2_1F/header.s | 14 - data/maps/AbandonedShip_Rooms2_B1F/header.inc | 14 + data/maps/AbandonedShip_Rooms2_B1F/header.s | 14 - data/maps/AbandonedShip_Rooms_1F/header.inc | 14 + data/maps/AbandonedShip_Rooms_1F/header.s | 14 - data/maps/AbandonedShip_Rooms_B1F/header.inc | 14 + data/maps/AbandonedShip_Rooms_B1F/header.s | 14 - data/maps/AbandonedShip_Underwater1/header.inc | 14 + data/maps/AbandonedShip_Underwater1/header.s | 14 - data/maps/AbandonedShip_Underwater2/header.inc | 14 + data/maps/AbandonedShip_Underwater2/header.s | 14 - data/maps/AncientTomb/header.inc | 14 + data/maps/AncientTomb/header.s | 14 - data/maps/AquaHideout_1F/header.inc | 14 + data/maps/AquaHideout_1F/header.s | 14 - data/maps/AquaHideout_B1F/header.inc | 14 + data/maps/AquaHideout_B1F/header.s | 14 - data/maps/AquaHideout_B2F/header.inc | 14 + data/maps/AquaHideout_B2F/header.s | 14 - data/maps/BattleTower_BattleRoom/header.inc | 14 + data/maps/BattleTower_BattleRoom/header.s | 14 - data/maps/BattleTower_Corridor/header.inc | 14 + data/maps/BattleTower_Corridor/header.s | 14 - data/maps/BattleTower_Elevator/header.inc | 14 + data/maps/BattleTower_Elevator/header.s | 14 - data/maps/BattleTower_Lobby/header.inc | 14 + data/maps/BattleTower_Lobby/header.s | 14 - data/maps/BattleTower_Outside/header.inc | 14 + data/maps/BattleTower_Outside/header.s | 14 - data/maps/CaveOfOrigin_1F/header.inc | 14 + data/maps/CaveOfOrigin_1F/header.s | 14 - data/maps/CaveOfOrigin_B1F/header.inc | 14 + data/maps/CaveOfOrigin_B1F/header.s | 14 - data/maps/CaveOfOrigin_B2F/header.inc | 14 + data/maps/CaveOfOrigin_B2F/header.s | 14 - data/maps/CaveOfOrigin_B3F/header.inc | 14 + data/maps/CaveOfOrigin_B3F/header.s | 14 - data/maps/CaveOfOrigin_B4F/header.inc | 14 + data/maps/CaveOfOrigin_B4F/header.s | 14 - data/maps/CaveOfOrigin_Entrance/header.inc | 14 + data/maps/CaveOfOrigin_Entrance/header.s | 14 - data/maps/DesertRuins/header.inc | 14 + data/maps/DesertRuins/header.s | 14 - data/maps/DewfordTown/connections.inc | 7 + data/maps/DewfordTown/connections.s | 7 - data/maps/DewfordTown/header.inc | 14 + data/maps/DewfordTown/header.s | 14 - data/maps/DewfordTown_Gym/header.inc | 14 + data/maps/DewfordTown_Gym/header.s | 14 - data/maps/DewfordTown_Hall/header.inc | 14 + data/maps/DewfordTown_Hall/header.s | 14 - data/maps/DewfordTown_House1/header.inc | 14 + data/maps/DewfordTown_House1/header.s | 14 - data/maps/DewfordTown_House2/header.inc | 14 + data/maps/DewfordTown_House2/header.s | 14 - data/maps/DewfordTown_PokemonCenter_1F/header.inc | 14 + data/maps/DewfordTown_PokemonCenter_1F/header.s | 14 - data/maps/DewfordTown_PokemonCenter_2F/header.inc | 14 + data/maps/DewfordTown_PokemonCenter_2F/header.s | 14 - data/maps/DoubleBattleColosseum/header.inc | 14 + data/maps/DoubleBattleColosseum/header.s | 14 - data/maps/EverGrandeCity/connections.inc | 6 + data/maps/EverGrandeCity/connections.s | 6 - data/maps/EverGrandeCity/header.inc | 14 + data/maps/EverGrandeCity/header.s | 14 - data/maps/EverGrandeCity_ChampionsRoom/header.inc | 14 + data/maps/EverGrandeCity_ChampionsRoom/header.s | 14 - data/maps/EverGrandeCity_Corridor1/header.inc | 14 + data/maps/EverGrandeCity_Corridor1/header.s | 14 - data/maps/EverGrandeCity_Corridor2/header.inc | 14 + data/maps/EverGrandeCity_Corridor2/header.s | 14 - data/maps/EverGrandeCity_Corridor3/header.inc | 14 + data/maps/EverGrandeCity_Corridor3/header.s | 14 - data/maps/EverGrandeCity_Corridor4/header.inc | 14 + data/maps/EverGrandeCity_Corridor4/header.s | 14 - data/maps/EverGrandeCity_Corridor5/header.inc | 14 + data/maps/EverGrandeCity_Corridor5/header.s | 14 - data/maps/EverGrandeCity_DrakesRoom/header.inc | 14 + data/maps/EverGrandeCity_DrakesRoom/header.s | 14 - data/maps/EverGrandeCity_GlaciasRoom/header.inc | 14 + data/maps/EverGrandeCity_GlaciasRoom/header.s | 14 - data/maps/EverGrandeCity_HallOfFame/header.inc | 14 + data/maps/EverGrandeCity_HallOfFame/header.s | 14 - data/maps/EverGrandeCity_PhoebesRoom/header.inc | 14 + data/maps/EverGrandeCity_PhoebesRoom/header.s | 14 - .../EverGrandeCity_PokemonCenter_1F/header.inc | 14 + data/maps/EverGrandeCity_PokemonCenter_1F/header.s | 14 - .../EverGrandeCity_PokemonCenter_2F/header.inc | 14 + data/maps/EverGrandeCity_PokemonCenter_2F/header.s | 14 - data/maps/EverGrandeCity_PokemonLeague/header.inc | 14 + data/maps/EverGrandeCity_PokemonLeague/header.s | 14 - data/maps/EverGrandeCity_SidneysRoom/header.inc | 14 + data/maps/EverGrandeCity_SidneysRoom/header.s | 14 - data/maps/FallarborTown/connections.inc | 7 + data/maps/FallarborTown/connections.s | 7 - data/maps/FallarborTown/header.inc | 14 + data/maps/FallarborTown/header.s | 14 - data/maps/FallarborTown_ContestHall/header.inc | 14 + data/maps/FallarborTown_ContestHall/header.s | 14 - data/maps/FallarborTown_ContestLobby/header.inc | 14 + data/maps/FallarborTown_ContestLobby/header.s | 14 - data/maps/FallarborTown_House1/header.inc | 14 + data/maps/FallarborTown_House1/header.s | 14 - data/maps/FallarborTown_House2/header.inc | 14 + data/maps/FallarborTown_House2/header.s | 14 - data/maps/FallarborTown_Mart/header.inc | 14 + data/maps/FallarborTown_Mart/header.s | 14 - .../maps/FallarborTown_PokemonCenter_1F/header.inc | 14 + data/maps/FallarborTown_PokemonCenter_1F/header.s | 14 - .../maps/FallarborTown_PokemonCenter_2F/header.inc | 14 + data/maps/FallarborTown_PokemonCenter_2F/header.s | 14 - data/maps/FieryPath/header.inc | 14 + data/maps/FieryPath/header.s | 14 - data/maps/FortreeCity/connections.inc | 7 + data/maps/FortreeCity/connections.s | 7 - data/maps/FortreeCity/header.inc | 14 + data/maps/FortreeCity/header.s | 14 - data/maps/FortreeCity_DecorationShop/header.inc | 14 + data/maps/FortreeCity_DecorationShop/header.s | 14 - data/maps/FortreeCity_Gym/header.inc | 14 + data/maps/FortreeCity_Gym/header.s | 14 - data/maps/FortreeCity_House1/header.inc | 14 + data/maps/FortreeCity_House1/header.s | 14 - data/maps/FortreeCity_House2/header.inc | 14 + data/maps/FortreeCity_House2/header.s | 14 - data/maps/FortreeCity_House3/header.inc | 14 + data/maps/FortreeCity_House3/header.s | 14 - data/maps/FortreeCity_House4/header.inc | 14 + data/maps/FortreeCity_House4/header.s | 14 - data/maps/FortreeCity_House5/header.inc | 14 + data/maps/FortreeCity_House5/header.s | 14 - data/maps/FortreeCity_Mart/header.inc | 14 + data/maps/FortreeCity_Mart/header.s | 14 - data/maps/FortreeCity_PokemonCenter_1F/header.inc | 14 + data/maps/FortreeCity_PokemonCenter_1F/header.s | 14 - data/maps/FortreeCity_PokemonCenter_2F/header.inc | 14 + data/maps/FortreeCity_PokemonCenter_2F/header.s | 14 - data/maps/GraniteCave_1F/header.inc | 14 + data/maps/GraniteCave_1F/header.s | 14 - data/maps/GraniteCave_B1F/header.inc | 14 + data/maps/GraniteCave_B1F/header.s | 14 - data/maps/GraniteCave_B2F/header.inc | 14 + data/maps/GraniteCave_B2F/header.s | 14 - data/maps/GraniteCave_StevensRoom/header.inc | 14 + data/maps/GraniteCave_StevensRoom/header.s | 14 - data/maps/InsideOfTruck/header.inc | 14 + data/maps/InsideOfTruck/header.s | 14 - data/maps/IslandCave/header.inc | 14 + data/maps/IslandCave/header.s | 14 - data/maps/JaggedPass/header.inc | 14 + data/maps/JaggedPass/header.s | 14 - data/maps/LavaridgeTown/connections.inc | 6 + data/maps/LavaridgeTown/connections.s | 6 - data/maps/LavaridgeTown/header.inc | 14 + data/maps/LavaridgeTown/header.s | 14 - data/maps/LavaridgeTown_Gym_1F/header.inc | 14 + data/maps/LavaridgeTown_Gym_1F/header.s | 14 - data/maps/LavaridgeTown_Gym_B1F/header.inc | 14 + data/maps/LavaridgeTown_Gym_B1F/header.s | 14 - data/maps/LavaridgeTown_HerbShop/header.inc | 14 + data/maps/LavaridgeTown_HerbShop/header.s | 14 - data/maps/LavaridgeTown_House/header.inc | 14 + data/maps/LavaridgeTown_House/header.s | 14 - data/maps/LavaridgeTown_Mart/header.inc | 14 + data/maps/LavaridgeTown_Mart/header.s | 14 - .../maps/LavaridgeTown_PokemonCenter_1F/header.inc | 14 + data/maps/LavaridgeTown_PokemonCenter_1F/header.s | 14 - .../maps/LavaridgeTown_PokemonCenter_2F/header.inc | 14 + data/maps/LavaridgeTown_PokemonCenter_2F/header.s | 14 - data/maps/LilycoveCity/connections.inc | 7 + data/maps/LilycoveCity/connections.s | 7 - data/maps/LilycoveCity/header.inc | 14 + data/maps/LilycoveCity/header.s | 14 - data/maps/LilycoveCity_ContestHall/header.inc | 14 + data/maps/LilycoveCity_ContestHall/header.s | 14 - data/maps/LilycoveCity_ContestLobby/header.inc | 14 + data/maps/LilycoveCity_ContestLobby/header.s | 14 - data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc | 14 + data/maps/LilycoveCity_CoveLilyMotel_1F/header.s | 14 - data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc | 14 + data/maps/LilycoveCity_CoveLilyMotel_2F/header.s | 14 - .../header.inc | 14 + .../LilycoveCity_DepartmentStoreElevator/header.s | 14 - .../LilycoveCity_DepartmentStoreRooftop/header.inc | 14 + .../LilycoveCity_DepartmentStoreRooftop/header.s | 14 - .../LilycoveCity_DepartmentStore_1F/header.inc | 14 + data/maps/LilycoveCity_DepartmentStore_1F/header.s | 14 - .../LilycoveCity_DepartmentStore_2F/header.inc | 14 + data/maps/LilycoveCity_DepartmentStore_2F/header.s | 14 - .../LilycoveCity_DepartmentStore_3F/header.inc | 14 + data/maps/LilycoveCity_DepartmentStore_3F/header.s | 14 - .../LilycoveCity_DepartmentStore_4F/header.inc | 14 + data/maps/LilycoveCity_DepartmentStore_4F/header.s | 14 - .../LilycoveCity_DepartmentStore_5F/header.inc | 14 + data/maps/LilycoveCity_DepartmentStore_5F/header.s | 14 - data/maps/LilycoveCity_EmptyMap/header.inc | 14 + data/maps/LilycoveCity_EmptyMap/header.s | 14 - data/maps/LilycoveCity_Harbor/header.inc | 14 + data/maps/LilycoveCity_Harbor/header.s | 14 - data/maps/LilycoveCity_House1/header.inc | 14 + data/maps/LilycoveCity_House1/header.s | 14 - data/maps/LilycoveCity_House2/header.inc | 14 + data/maps/LilycoveCity_House2/header.s | 14 - data/maps/LilycoveCity_House3/header.inc | 14 + data/maps/LilycoveCity_House3/header.s | 14 - data/maps/LilycoveCity_House4/header.inc | 14 + data/maps/LilycoveCity_House4/header.s | 14 - .../maps/LilycoveCity_LilycoveMuseum_1F/header.inc | 14 + data/maps/LilycoveCity_LilycoveMuseum_1F/header.s | 14 - .../maps/LilycoveCity_LilycoveMuseum_2F/header.inc | 14 + data/maps/LilycoveCity_LilycoveMuseum_2F/header.s | 14 - .../maps/LilycoveCity_MoveDeletersHouse/header.inc | 14 + data/maps/LilycoveCity_MoveDeletersHouse/header.s | 14 - data/maps/LilycoveCity_PokemonCenter_1F/header.inc | 14 + data/maps/LilycoveCity_PokemonCenter_1F/header.s | 14 - data/maps/LilycoveCity_PokemonCenter_2F/header.inc | 14 + data/maps/LilycoveCity_PokemonCenter_2F/header.s | 14 - .../LilycoveCity_PokemonTrainerFanClub/header.inc | 14 + .../LilycoveCity_PokemonTrainerFanClub/header.s | 14 - data/maps/LilycoveCity_UnusedMart/header.inc | 14 + data/maps/LilycoveCity_UnusedMart/header.s | 14 - data/maps/LinkContestRoom1/header.inc | 14 + data/maps/LinkContestRoom1/header.s | 14 - data/maps/LinkContestRoom2/header.inc | 14 + data/maps/LinkContestRoom2/header.s | 14 - data/maps/LinkContestRoom3/header.inc | 14 + data/maps/LinkContestRoom3/header.s | 14 - data/maps/LinkContestRoom4/header.inc | 14 + data/maps/LinkContestRoom4/header.s | 14 - data/maps/LinkContestRoom5/header.inc | 14 + data/maps/LinkContestRoom5/header.s | 14 - data/maps/LinkContestRoom6/header.inc | 14 + data/maps/LinkContestRoom6/header.s | 14 - data/maps/LittlerootTown/connections.inc | 6 + data/maps/LittlerootTown/connections.s | 6 - data/maps/LittlerootTown/header.inc | 14 + data/maps/LittlerootTown/header.s | 14 - .../LittlerootTown_BrendansHouse_1F/header.inc | 14 + data/maps/LittlerootTown_BrendansHouse_1F/header.s | 14 - .../LittlerootTown_BrendansHouse_2F/header.inc | 14 + data/maps/LittlerootTown_BrendansHouse_2F/header.s | 14 - data/maps/LittlerootTown_MaysHouse_1F/header.inc | 14 + data/maps/LittlerootTown_MaysHouse_1F/header.s | 14 - data/maps/LittlerootTown_MaysHouse_2F/header.inc | 14 + data/maps/LittlerootTown_MaysHouse_2F/header.s | 14 - .../LittlerootTown_ProfessorBirchsLab/header.inc | 14 + .../LittlerootTown_ProfessorBirchsLab/header.s | 14 - data/maps/MagmaHideout_1F/header.inc | 14 + data/maps/MagmaHideout_1F/header.s | 14 - data/maps/MagmaHideout_B1F/header.inc | 14 + data/maps/MagmaHideout_B1F/header.s | 14 - data/maps/MagmaHideout_B2F/header.inc | 14 + data/maps/MagmaHideout_B2F/header.s | 14 - data/maps/MauvilleCity/connections.inc | 9 + data/maps/MauvilleCity/connections.s | 9 - data/maps/MauvilleCity/header.inc | 14 + data/maps/MauvilleCity/header.s | 14 - data/maps/MauvilleCity_BikeShop/header.inc | 14 + data/maps/MauvilleCity_BikeShop/header.s | 14 - data/maps/MauvilleCity_GameCorner/header.inc | 14 + data/maps/MauvilleCity_GameCorner/header.s | 14 - data/maps/MauvilleCity_Gym/header.inc | 14 + data/maps/MauvilleCity_Gym/header.s | 14 - data/maps/MauvilleCity_House1/header.inc | 14 + data/maps/MauvilleCity_House1/header.s | 14 - data/maps/MauvilleCity_House2/header.inc | 14 + data/maps/MauvilleCity_House2/header.s | 14 - data/maps/MauvilleCity_Mart/header.inc | 14 + data/maps/MauvilleCity_Mart/header.s | 14 - data/maps/MauvilleCity_PokemonCenter_1F/header.inc | 14 + data/maps/MauvilleCity_PokemonCenter_1F/header.s | 14 - data/maps/MauvilleCity_PokemonCenter_2F/header.inc | 14 + data/maps/MauvilleCity_PokemonCenter_2F/header.s | 14 - data/maps/MeteorFalls_1F_1R/header.inc | 14 + data/maps/MeteorFalls_1F_1R/header.s | 14 - data/maps/MeteorFalls_1F_2R/header.inc | 14 + data/maps/MeteorFalls_1F_2R/header.s | 14 - data/maps/MeteorFalls_B1F_1R/header.inc | 14 + data/maps/MeteorFalls_B1F_1R/header.s | 14 - data/maps/MeteorFalls_B1F_2R/header.inc | 14 + data/maps/MeteorFalls_B1F_2R/header.s | 14 - data/maps/MossdeepCity/connections.inc | 8 + data/maps/MossdeepCity/connections.s | 8 - data/maps/MossdeepCity/header.inc | 14 + data/maps/MossdeepCity/header.s | 14 - data/maps/MossdeepCity_GameCorner_1F/header.inc | 14 + data/maps/MossdeepCity_GameCorner_1F/header.s | 14 - data/maps/MossdeepCity_GameCorner_B1F/header.inc | 14 + data/maps/MossdeepCity_GameCorner_B1F/header.s | 14 - data/maps/MossdeepCity_Gym/header.inc | 14 + data/maps/MossdeepCity_Gym/header.s | 14 - data/maps/MossdeepCity_House1/header.inc | 14 + data/maps/MossdeepCity_House1/header.s | 14 - data/maps/MossdeepCity_House2/header.inc | 14 + data/maps/MossdeepCity_House2/header.s | 14 - data/maps/MossdeepCity_House3/header.inc | 14 + data/maps/MossdeepCity_House3/header.s | 14 - data/maps/MossdeepCity_House4/header.inc | 14 + data/maps/MossdeepCity_House4/header.s | 14 - data/maps/MossdeepCity_Mart/header.inc | 14 + data/maps/MossdeepCity_Mart/header.s | 14 - data/maps/MossdeepCity_PokemonCenter_1F/header.inc | 14 + data/maps/MossdeepCity_PokemonCenter_1F/header.s | 14 - data/maps/MossdeepCity_PokemonCenter_2F/header.inc | 14 + data/maps/MossdeepCity_PokemonCenter_2F/header.s | 14 - data/maps/MossdeepCity_SpaceCenter_1F/header.inc | 14 + data/maps/MossdeepCity_SpaceCenter_1F/header.s | 14 - data/maps/MossdeepCity_SpaceCenter_2F/header.inc | 14 + data/maps/MossdeepCity_SpaceCenter_2F/header.s | 14 - data/maps/MossdeepCity_StevensHouse/header.inc | 14 + data/maps/MossdeepCity_StevensHouse/header.s | 14 - data/maps/MtChimney/header.inc | 14 + data/maps/MtChimney/header.s | 14 - data/maps/MtChimney_CableCarStation/header.inc | 14 + data/maps/MtChimney_CableCarStation/header.s | 14 - data/maps/MtPyre_1F/header.inc | 14 + data/maps/MtPyre_1F/header.s | 14 - data/maps/MtPyre_2F/header.inc | 14 + data/maps/MtPyre_2F/header.s | 14 - data/maps/MtPyre_3F/header.inc | 14 + data/maps/MtPyre_3F/header.s | 14 - data/maps/MtPyre_4F/header.inc | 14 + data/maps/MtPyre_4F/header.s | 14 - data/maps/MtPyre_5F/header.inc | 14 + data/maps/MtPyre_5F/header.s | 14 - data/maps/MtPyre_6F/header.inc | 14 + data/maps/MtPyre_6F/header.s | 14 - data/maps/MtPyre_Exterior/header.inc | 14 + data/maps/MtPyre_Exterior/header.s | 14 - data/maps/MtPyre_Summit/header.inc | 14 + data/maps/MtPyre_Summit/header.s | 14 - data/maps/NewMauville_Entrance/header.inc | 14 + data/maps/NewMauville_Entrance/header.s | 14 - data/maps/NewMauville_Inside/header.inc | 14 + data/maps/NewMauville_Inside/header.s | 14 - data/maps/OldaleTown/connections.inc | 8 + data/maps/OldaleTown/connections.s | 8 - data/maps/OldaleTown/header.inc | 14 + data/maps/OldaleTown/header.s | 14 - data/maps/OldaleTown_House1/header.inc | 14 + data/maps/OldaleTown_House1/header.s | 14 - data/maps/OldaleTown_House2/header.inc | 14 + data/maps/OldaleTown_House2/header.s | 14 - data/maps/OldaleTown_Mart/header.inc | 14 + data/maps/OldaleTown_Mart/header.s | 14 - data/maps/OldaleTown_PokemonCenter_1F/header.inc | 14 + data/maps/OldaleTown_PokemonCenter_1F/header.s | 14 - data/maps/OldaleTown_PokemonCenter_2F/header.inc | 14 + data/maps/OldaleTown_PokemonCenter_2F/header.s | 14 - data/maps/PacifidlogTown/connections.inc | 7 + data/maps/PacifidlogTown/connections.s | 7 - data/maps/PacifidlogTown/header.inc | 14 + data/maps/PacifidlogTown/header.s | 14 - data/maps/PacifidlogTown_House1/header.inc | 14 + data/maps/PacifidlogTown_House1/header.s | 14 - data/maps/PacifidlogTown_House2/header.inc | 14 + data/maps/PacifidlogTown_House2/header.s | 14 - data/maps/PacifidlogTown_House3/header.inc | 14 + data/maps/PacifidlogTown_House3/header.s | 14 - data/maps/PacifidlogTown_House4/header.inc | 14 + data/maps/PacifidlogTown_House4/header.s | 14 - data/maps/PacifidlogTown_House5/header.inc | 14 + data/maps/PacifidlogTown_House5/header.s | 14 - .../PacifidlogTown_PokemonCenter_1F/header.inc | 14 + data/maps/PacifidlogTown_PokemonCenter_1F/header.s | 14 - .../PacifidlogTown_PokemonCenter_2F/header.inc | 14 + data/maps/PacifidlogTown_PokemonCenter_2F/header.s | 14 - data/maps/PetalburgCity/connections.inc | 7 + data/maps/PetalburgCity/connections.s | 7 - data/maps/PetalburgCity/header.inc | 14 + data/maps/PetalburgCity/header.s | 14 - data/maps/PetalburgCity_Gym/header.inc | 14 + data/maps/PetalburgCity_Gym/header.s | 14 - data/maps/PetalburgCity_House1/header.inc | 14 + data/maps/PetalburgCity_House1/header.s | 14 - data/maps/PetalburgCity_House2/header.inc | 14 + data/maps/PetalburgCity_House2/header.s | 14 - data/maps/PetalburgCity_Mart/header.inc | 14 + data/maps/PetalburgCity_Mart/header.s | 14 - .../maps/PetalburgCity_PokemonCenter_1F/header.inc | 14 + data/maps/PetalburgCity_PokemonCenter_1F/header.s | 14 - .../maps/PetalburgCity_PokemonCenter_2F/header.inc | 14 + data/maps/PetalburgCity_PokemonCenter_2F/header.s | 14 - data/maps/PetalburgCity_WallysHouse/header.inc | 14 + data/maps/PetalburgCity_WallysHouse/header.s | 14 - data/maps/PetalburgWoods/header.inc | 14 + data/maps/PetalburgWoods/header.s | 14 - data/maps/RecordCorner/header.inc | 14 + data/maps/RecordCorner/header.s | 14 - data/maps/Route101/connections.inc | 7 + data/maps/Route101/connections.s | 7 - data/maps/Route101/header.inc | 14 + data/maps/Route101/header.s | 14 - data/maps/Route102/connections.inc | 7 + data/maps/Route102/connections.s | 7 - data/maps/Route102/header.inc | 14 + data/maps/Route102/header.s | 14 - data/maps/Route103/connections.inc | 7 + data/maps/Route103/connections.s | 7 - data/maps/Route103/header.inc | 14 + data/maps/Route103/header.s | 14 - data/maps/Route104/connections.inc | 8 + data/maps/Route104/connections.s | 8 - data/maps/Route104/header.inc | 14 + data/maps/Route104/header.s | 14 - data/maps/Route104_MrBrineysHouse/header.inc | 14 + data/maps/Route104_MrBrineysHouse/header.s | 14 - .../maps/Route104_PrettyPetalFlowerShop/header.inc | 14 + data/maps/Route104_PrettyPetalFlowerShop/header.s | 14 - data/maps/Route104_Prototype/header.inc | 14 + data/maps/Route104_Prototype/header.s | 14 - .../header.inc | 14 + .../header.s | 14 - data/maps/Route105/connections.inc | 7 + data/maps/Route105/connections.s | 7 - data/maps/Route105/header.inc | 14 + data/maps/Route105/header.s | 14 - data/maps/Route106/connections.inc | 7 + data/maps/Route106/connections.s | 7 - data/maps/Route106/header.inc | 14 + data/maps/Route106/header.s | 14 - data/maps/Route107/connections.inc | 7 + data/maps/Route107/connections.s | 7 - data/maps/Route107/header.inc | 14 + data/maps/Route107/header.s | 14 - data/maps/Route108/connections.inc | 7 + data/maps/Route108/connections.s | 7 - data/maps/Route108/header.inc | 14 + data/maps/Route108/header.s | 14 - data/maps/Route109/connections.inc | 7 + data/maps/Route109/connections.s | 7 - data/maps/Route109/header.inc | 14 + data/maps/Route109/header.s | 14 - data/maps/Route109_SeashoreHouse/header.inc | 14 + data/maps/Route109_SeashoreHouse/header.s | 14 - data/maps/Route110/connections.inc | 8 + data/maps/Route110/connections.s | 8 - data/maps/Route110/header.inc | 14 + data/maps/Route110/header.s | 14 - .../header.inc | 14 + .../header.s | 14 - .../header.inc | 14 + .../header.s | 14 - data/maps/Route110_TrickHouseCorridor/header.inc | 14 + data/maps/Route110_TrickHouseCorridor/header.s | 14 - data/maps/Route110_TrickHouseEnd/header.inc | 14 + data/maps/Route110_TrickHouseEnd/header.s | 14 - data/maps/Route110_TrickHouseEntrance/header.inc | 14 + data/maps/Route110_TrickHouseEntrance/header.s | 14 - data/maps/Route110_TrickHousePuzzle1/header.inc | 14 + data/maps/Route110_TrickHousePuzzle1/header.s | 14 - data/maps/Route110_TrickHousePuzzle2/header.inc | 14 + data/maps/Route110_TrickHousePuzzle2/header.s | 14 - data/maps/Route110_TrickHousePuzzle3/header.inc | 14 + data/maps/Route110_TrickHousePuzzle3/header.s | 14 - data/maps/Route110_TrickHousePuzzle4/header.inc | 14 + data/maps/Route110_TrickHousePuzzle4/header.s | 14 - data/maps/Route110_TrickHousePuzzle5/header.inc | 14 + data/maps/Route110_TrickHousePuzzle5/header.s | 14 - data/maps/Route110_TrickHousePuzzle6/header.inc | 14 + data/maps/Route110_TrickHousePuzzle6/header.s | 14 - data/maps/Route110_TrickHousePuzzle7/header.inc | 14 + data/maps/Route110_TrickHousePuzzle7/header.s | 14 - data/maps/Route110_TrickHousePuzzle8/header.inc | 14 + data/maps/Route110_TrickHousePuzzle8/header.s | 14 - data/maps/Route111/connections.inc | 8 + data/maps/Route111/connections.s | 8 - data/maps/Route111/header.inc | 14 + data/maps/Route111/header.s | 14 - data/maps/Route111_OldLadysRestStop/header.inc | 14 + data/maps/Route111_OldLadysRestStop/header.s | 14 - .../maps/Route111_WinstrateFamilysHouse/header.inc | 14 + data/maps/Route111_WinstrateFamilysHouse/header.s | 14 - data/maps/Route112/connections.inc | 8 + data/maps/Route112/connections.s | 8 - data/maps/Route112/header.inc | 14 + data/maps/Route112/header.s | 14 - data/maps/Route112_CableCarStation/header.inc | 14 + data/maps/Route112_CableCarStation/header.s | 14 - data/maps/Route113/connections.inc | 8 + data/maps/Route113/connections.s | 8 - data/maps/Route113/header.inc | 14 + data/maps/Route113/header.s | 14 - data/maps/Route113_GlassWorkshop/header.inc | 14 + data/maps/Route113_GlassWorkshop/header.s | 14 - data/maps/Route114/connections.inc | 7 + data/maps/Route114/connections.s | 7 - data/maps/Route114/header.inc | 14 + data/maps/Route114/header.s | 14 - data/maps/Route114_FossilManiacsHouse/header.inc | 14 + data/maps/Route114_FossilManiacsHouse/header.s | 14 - data/maps/Route114_FossilManiacsTunnel/header.inc | 14 + data/maps/Route114_FossilManiacsTunnel/header.s | 14 - data/maps/Route114_LanettesHouse/header.inc | 14 + data/maps/Route114_LanettesHouse/header.s | 14 - data/maps/Route115/connections.inc | 7 + data/maps/Route115/connections.s | 7 - data/maps/Route115/header.inc | 14 + data/maps/Route115/header.s | 14 - data/maps/Route116/connections.inc | 7 + data/maps/Route116/connections.s | 7 - data/maps/Route116/header.inc | 14 + data/maps/Route116/header.s | 14 - data/maps/Route116_TunnelersRestHouse/header.inc | 14 + data/maps/Route116_TunnelersRestHouse/header.s | 14 - data/maps/Route117/connections.inc | 7 + data/maps/Route117/connections.s | 7 - data/maps/Route117/header.inc | 14 + data/maps/Route117/header.s | 14 - data/maps/Route117_PokemonDayCare/header.inc | 14 + data/maps/Route117_PokemonDayCare/header.s | 14 - data/maps/Route118/connections.inc | 8 + data/maps/Route118/connections.s | 8 - data/maps/Route118/header.inc | 14 + data/maps/Route118/header.s | 14 - data/maps/Route119/connections.inc | 7 + data/maps/Route119/connections.s | 7 - data/maps/Route119/header.inc | 14 + data/maps/Route119/header.s | 14 - data/maps/Route119_House/header.inc | 14 + data/maps/Route119_House/header.s | 14 - data/maps/Route119_WeatherInstitute_1F/header.inc | 14 + data/maps/Route119_WeatherInstitute_1F/header.s | 14 - data/maps/Route119_WeatherInstitute_2F/header.inc | 14 + data/maps/Route119_WeatherInstitute_2F/header.s | 14 - data/maps/Route120/connections.inc | 7 + data/maps/Route120/connections.s | 7 - data/maps/Route120/header.inc | 14 + data/maps/Route120/header.s | 14 - data/maps/Route121/connections.inc | 8 + data/maps/Route121/connections.s | 8 - data/maps/Route121/header.inc | 14 + data/maps/Route121/header.s | 14 - data/maps/Route121_SafariZoneEntrance/header.inc | 14 + data/maps/Route121_SafariZoneEntrance/header.s | 14 - data/maps/Route122/connections.inc | 7 + data/maps/Route122/connections.s | 7 - data/maps/Route122/header.inc | 14 + data/maps/Route122/header.s | 14 - data/maps/Route123/connections.inc | 7 + data/maps/Route123/connections.s | 7 - data/maps/Route123/header.inc | 14 + data/maps/Route123/header.s | 14 - data/maps/Route123_BerryMastersHouse/header.inc | 14 + data/maps/Route123_BerryMastersHouse/header.s | 14 - data/maps/Route124/connections.inc | 10 + data/maps/Route124/connections.s | 10 - data/maps/Route124/header.inc | 14 + data/maps/Route124/header.s | 14 - .../Route124_DivingTreasureHuntersHouse/header.inc | 14 + .../Route124_DivingTreasureHuntersHouse/header.s | 14 - data/maps/Route125/connections.inc | 7 + data/maps/Route125/connections.s | 7 - data/maps/Route125/header.inc | 14 + data/maps/Route125/header.s | 14 - data/maps/Route126/connections.inc | 8 + data/maps/Route126/connections.s | 8 - data/maps/Route126/header.inc | 14 + data/maps/Route126/header.s | 14 - data/maps/Route127/connections.inc | 9 + data/maps/Route127/connections.s | 9 - data/maps/Route127/header.inc | 14 + data/maps/Route127/header.s | 14 - data/maps/Route128/connections.inc | 9 + data/maps/Route128/connections.s | 9 - data/maps/Route128/header.inc | 14 + data/maps/Route128/header.s | 14 - data/maps/Route129/connections.inc | 7 + data/maps/Route129/connections.s | 7 - data/maps/Route129/header.inc | 14 + data/maps/Route129/header.s | 14 - data/maps/Route130/connections.inc | 7 + data/maps/Route130/connections.s | 7 - data/maps/Route130/header.inc | 14 + data/maps/Route130/header.s | 14 - data/maps/Route131/connections.inc | 7 + data/maps/Route131/connections.s | 7 - data/maps/Route131/header.inc | 14 + data/maps/Route131/header.s | 14 - data/maps/Route132/connections.inc | 7 + data/maps/Route132/connections.s | 7 - data/maps/Route132/header.inc | 14 + data/maps/Route132/header.s | 14 - data/maps/Route133/connections.inc | 7 + data/maps/Route133/connections.s | 7 - data/maps/Route133/header.inc | 14 + data/maps/Route133/header.s | 14 - data/maps/Route134/connections.inc | 7 + data/maps/Route134/connections.s | 7 - data/maps/Route134/header.inc | 14 + data/maps/Route134/header.s | 14 - data/maps/RustboroCity/connections.inc | 8 + data/maps/RustboroCity/connections.s | 8 - data/maps/RustboroCity/header.inc | 14 + data/maps/RustboroCity/header.s | 14 - data/maps/RustboroCity_CuttersHouse/header.inc | 14 + data/maps/RustboroCity_CuttersHouse/header.s | 14 - data/maps/RustboroCity_DevonCorp_1F/header.inc | 14 + data/maps/RustboroCity_DevonCorp_1F/header.s | 14 - data/maps/RustboroCity_DevonCorp_2F/header.inc | 14 + data/maps/RustboroCity_DevonCorp_2F/header.s | 14 - data/maps/RustboroCity_DevonCorp_3F/header.inc | 14 + data/maps/RustboroCity_DevonCorp_3F/header.s | 14 - data/maps/RustboroCity_Flat1_1F/header.inc | 14 + data/maps/RustboroCity_Flat1_1F/header.s | 14 - data/maps/RustboroCity_Flat1_2F/header.inc | 14 + data/maps/RustboroCity_Flat1_2F/header.s | 14 - data/maps/RustboroCity_Flat2_1F/header.inc | 14 + data/maps/RustboroCity_Flat2_1F/header.s | 14 - data/maps/RustboroCity_Flat2_2F/header.inc | 14 + data/maps/RustboroCity_Flat2_2F/header.s | 14 - data/maps/RustboroCity_Flat2_3F/header.inc | 14 + data/maps/RustboroCity_Flat2_3F/header.s | 14 - data/maps/RustboroCity_Gym/header.inc | 14 + data/maps/RustboroCity_Gym/header.s | 14 - data/maps/RustboroCity_House1/header.inc | 14 + data/maps/RustboroCity_House1/header.s | 14 - data/maps/RustboroCity_House2/header.inc | 14 + data/maps/RustboroCity_House2/header.s | 14 - data/maps/RustboroCity_House3/header.inc | 14 + data/maps/RustboroCity_House3/header.s | 14 - data/maps/RustboroCity_Mart/header.inc | 14 + data/maps/RustboroCity_Mart/header.s | 14 - data/maps/RustboroCity_PokemonCenter_1F/header.inc | 14 + data/maps/RustboroCity_PokemonCenter_1F/header.s | 14 - data/maps/RustboroCity_PokemonCenter_2F/header.inc | 14 + data/maps/RustboroCity_PokemonCenter_2F/header.s | 14 - data/maps/RustboroCity_PokemonSchool/header.inc | 14 + data/maps/RustboroCity_PokemonSchool/header.s | 14 - data/maps/RusturfTunnel/header.inc | 14 + data/maps/RusturfTunnel/header.s | 14 - data/maps/SSTidalCorridor/header.inc | 14 + data/maps/SSTidalCorridor/header.s | 14 - data/maps/SSTidalLowerDeck/header.inc | 14 + data/maps/SSTidalLowerDeck/header.s | 14 - data/maps/SSTidalRooms/header.inc | 14 + data/maps/SSTidalRooms/header.s | 14 - data/maps/SafariZone_Northeast/connections.inc | 7 + data/maps/SafariZone_Northeast/connections.s | 7 - data/maps/SafariZone_Northeast/header.inc | 14 + data/maps/SafariZone_Northeast/header.s | 14 - data/maps/SafariZone_Northwest/connections.inc | 7 + data/maps/SafariZone_Northwest/connections.s | 7 - data/maps/SafariZone_Northwest/header.inc | 14 + data/maps/SafariZone_Northwest/header.s | 14 - data/maps/SafariZone_RestHouse/header.inc | 14 + data/maps/SafariZone_RestHouse/header.s | 14 - data/maps/SafariZone_Southeast/connections.inc | 7 + data/maps/SafariZone_Southeast/connections.s | 7 - data/maps/SafariZone_Southeast/header.inc | 14 + data/maps/SafariZone_Southeast/header.s | 14 - data/maps/SafariZone_Southwest/connections.inc | 7 + data/maps/SafariZone_Southwest/connections.s | 7 - data/maps/SafariZone_Southwest/header.inc | 14 + data/maps/SafariZone_Southwest/header.s | 14 - data/maps/ScorchedSlab/header.inc | 14 + data/maps/ScorchedSlab/header.s | 14 - data/maps/SeafloorCavern_Entrance/header.inc | 14 + data/maps/SeafloorCavern_Entrance/header.s | 14 - data/maps/SeafloorCavern_Room1/header.inc | 14 + data/maps/SeafloorCavern_Room1/header.s | 14 - data/maps/SeafloorCavern_Room2/header.inc | 14 + data/maps/SeafloorCavern_Room2/header.s | 14 - data/maps/SeafloorCavern_Room3/header.inc | 14 + data/maps/SeafloorCavern_Room3/header.s | 14 - data/maps/SeafloorCavern_Room4/header.inc | 14 + data/maps/SeafloorCavern_Room4/header.s | 14 - data/maps/SeafloorCavern_Room5/header.inc | 14 + data/maps/SeafloorCavern_Room5/header.s | 14 - data/maps/SeafloorCavern_Room6/header.inc | 14 + data/maps/SeafloorCavern_Room6/header.s | 14 - data/maps/SeafloorCavern_Room7/header.inc | 14 + data/maps/SeafloorCavern_Room7/header.s | 14 - data/maps/SeafloorCavern_Room8/header.inc | 14 + data/maps/SeafloorCavern_Room8/header.s | 14 - data/maps/SeafloorCavern_Room9/header.inc | 14 + data/maps/SeafloorCavern_Room9/header.s | 14 - data/maps/SealedChamber_InnerRoom/header.inc | 14 + data/maps/SealedChamber_InnerRoom/header.s | 14 - data/maps/SealedChamber_OuterRoom/header.inc | 14 + data/maps/SealedChamber_OuterRoom/header.s | 14 - data/maps/SecretBase_BlueCave1/header.inc | 14 + data/maps/SecretBase_BlueCave1/header.s | 14 - data/maps/SecretBase_BlueCave2/header.inc | 14 + data/maps/SecretBase_BlueCave2/header.s | 14 - data/maps/SecretBase_BlueCave3/header.inc | 14 + data/maps/SecretBase_BlueCave3/header.s | 14 - data/maps/SecretBase_BlueCave4/header.inc | 14 + data/maps/SecretBase_BlueCave4/header.s | 14 - data/maps/SecretBase_BrownCave1/header.inc | 14 + data/maps/SecretBase_BrownCave1/header.s | 14 - data/maps/SecretBase_BrownCave2/header.inc | 14 + data/maps/SecretBase_BrownCave2/header.s | 14 - data/maps/SecretBase_BrownCave3/header.inc | 14 + data/maps/SecretBase_BrownCave3/header.s | 14 - data/maps/SecretBase_BrownCave4/header.inc | 14 + data/maps/SecretBase_BrownCave4/header.s | 14 - data/maps/SecretBase_RedCave1/header.inc | 14 + data/maps/SecretBase_RedCave1/header.s | 14 - data/maps/SecretBase_RedCave2/header.inc | 14 + data/maps/SecretBase_RedCave2/header.s | 14 - data/maps/SecretBase_RedCave3/header.inc | 14 + data/maps/SecretBase_RedCave3/header.s | 14 - data/maps/SecretBase_RedCave4/header.inc | 14 + data/maps/SecretBase_RedCave4/header.s | 14 - data/maps/SecretBase_Shrub1/header.inc | 14 + data/maps/SecretBase_Shrub1/header.s | 14 - data/maps/SecretBase_Shrub2/header.inc | 14 + data/maps/SecretBase_Shrub2/header.s | 14 - data/maps/SecretBase_Shrub3/header.inc | 14 + data/maps/SecretBase_Shrub3/header.s | 14 - data/maps/SecretBase_Shrub4/header.inc | 14 + data/maps/SecretBase_Shrub4/header.s | 14 - data/maps/SecretBase_Tree1/header.inc | 14 + data/maps/SecretBase_Tree1/header.s | 14 - data/maps/SecretBase_Tree2/header.inc | 14 + data/maps/SecretBase_Tree2/header.s | 14 - data/maps/SecretBase_Tree3/header.inc | 14 + data/maps/SecretBase_Tree3/header.s | 14 - data/maps/SecretBase_Tree4/header.inc | 14 + data/maps/SecretBase_Tree4/header.s | 14 - data/maps/SecretBase_YellowCave1/header.inc | 14 + data/maps/SecretBase_YellowCave1/header.s | 14 - data/maps/SecretBase_YellowCave2/header.inc | 14 + data/maps/SecretBase_YellowCave2/header.s | 14 - data/maps/SecretBase_YellowCave3/header.inc | 14 + data/maps/SecretBase_YellowCave3/header.s | 14 - data/maps/SecretBase_YellowCave4/header.inc | 14 + data/maps/SecretBase_YellowCave4/header.s | 14 - .../maps/ShoalCave_HighTideEntranceRoom/header.inc | 14 + data/maps/ShoalCave_HighTideEntranceRoom/header.s | 14 - data/maps/ShoalCave_HighTideInnerRoom/header.inc | 14 + data/maps/ShoalCave_HighTideInnerRoom/header.s | 14 - data/maps/ShoalCave_LowTideEntranceRoom/header.inc | 14 + data/maps/ShoalCave_LowTideEntranceRoom/header.s | 14 - data/maps/ShoalCave_LowTideIceRoom/header.inc | 14 + data/maps/ShoalCave_LowTideIceRoom/header.s | 14 - data/maps/ShoalCave_LowTideInnerRoom/header.inc | 14 + data/maps/ShoalCave_LowTideInnerRoom/header.s | 14 - data/maps/ShoalCave_LowTideLowerRoom/header.inc | 14 + data/maps/ShoalCave_LowTideLowerRoom/header.s | 14 - data/maps/ShoalCave_LowTideStairsRoom/header.inc | 14 + data/maps/ShoalCave_LowTideStairsRoom/header.s | 14 - data/maps/SingleBattleColosseum/header.inc | 14 + data/maps/SingleBattleColosseum/header.s | 14 - data/maps/SkyPillar_1F/header.inc | 14 + data/maps/SkyPillar_1F/header.s | 14 - data/maps/SkyPillar_2F/header.inc | 14 + data/maps/SkyPillar_2F/header.s | 14 - data/maps/SkyPillar_3F/header.inc | 14 + data/maps/SkyPillar_3F/header.s | 14 - data/maps/SkyPillar_4F/header.inc | 14 + data/maps/SkyPillar_4F/header.s | 14 - data/maps/SkyPillar_5F/header.inc | 14 + data/maps/SkyPillar_5F/header.s | 14 - data/maps/SkyPillar_Entrance/header.inc | 14 + data/maps/SkyPillar_Entrance/header.s | 14 - data/maps/SkyPillar_Outside/header.inc | 14 + data/maps/SkyPillar_Outside/header.s | 14 - data/maps/SkyPillar_Top/header.inc | 14 + data/maps/SkyPillar_Top/header.s | 14 - data/maps/SlateportCity/connections.inc | 8 + data/maps/SlateportCity/connections.s | 8 - data/maps/SlateportCity/header.inc | 14 + data/maps/SlateportCity/header.s | 14 - data/maps/SlateportCity_ContestHall/header.inc | 14 + data/maps/SlateportCity_ContestHall/header.s | 14 - data/maps/SlateportCity_ContestLobby/header.inc | 14 + data/maps/SlateportCity_ContestLobby/header.s | 14 - data/maps/SlateportCity_Harbor/header.inc | 14 + data/maps/SlateportCity_Harbor/header.s | 14 - data/maps/SlateportCity_House1/header.inc | 14 + data/maps/SlateportCity_House1/header.s | 14 - data/maps/SlateportCity_House2/header.inc | 14 + data/maps/SlateportCity_House2/header.s | 14 - data/maps/SlateportCity_Mart/header.inc | 14 + data/maps/SlateportCity_Mart/header.s | 14 - .../maps/SlateportCity_OceanicMuseum_1F/header.inc | 14 + data/maps/SlateportCity_OceanicMuseum_1F/header.s | 14 - .../maps/SlateportCity_OceanicMuseum_2F/header.inc | 14 + data/maps/SlateportCity_OceanicMuseum_2F/header.s | 14 - .../maps/SlateportCity_PokemonCenter_1F/header.inc | 14 + data/maps/SlateportCity_PokemonCenter_1F/header.s | 14 - .../maps/SlateportCity_PokemonCenter_2F/header.inc | 14 + data/maps/SlateportCity_PokemonCenter_2F/header.s | 14 - data/maps/SlateportCity_PokemonFanClub/header.inc | 14 + data/maps/SlateportCity_PokemonFanClub/header.s | 14 - .../SlateportCity_SternsShipyard_1F/header.inc | 14 + data/maps/SlateportCity_SternsShipyard_1F/header.s | 14 - .../SlateportCity_SternsShipyard_2F/header.inc | 14 + data/maps/SlateportCity_SternsShipyard_2F/header.s | 14 - data/maps/SootopolisCity/connections.inc | 6 + data/maps/SootopolisCity/connections.s | 6 - data/maps/SootopolisCity/header.inc | 14 + data/maps/SootopolisCity/header.s | 14 - data/maps/SootopolisCity_Gym_1F/header.inc | 14 + data/maps/SootopolisCity_Gym_1F/header.s | 14 - data/maps/SootopolisCity_Gym_B1F/header.inc | 14 + data/maps/SootopolisCity_Gym_B1F/header.s | 14 - data/maps/SootopolisCity_House1/header.inc | 14 + data/maps/SootopolisCity_House1/header.s | 14 - data/maps/SootopolisCity_House2/header.inc | 14 + data/maps/SootopolisCity_House2/header.s | 14 - data/maps/SootopolisCity_House3/header.inc | 14 + data/maps/SootopolisCity_House3/header.s | 14 - data/maps/SootopolisCity_House4/header.inc | 14 + data/maps/SootopolisCity_House4/header.s | 14 - data/maps/SootopolisCity_House5/header.inc | 14 + data/maps/SootopolisCity_House5/header.s | 14 - data/maps/SootopolisCity_House6/header.inc | 14 + data/maps/SootopolisCity_House6/header.s | 14 - data/maps/SootopolisCity_House7/header.inc | 14 + data/maps/SootopolisCity_House7/header.s | 14 - data/maps/SootopolisCity_House8/header.inc | 14 + data/maps/SootopolisCity_House8/header.s | 14 - data/maps/SootopolisCity_Mart/header.inc | 14 + data/maps/SootopolisCity_Mart/header.s | 14 - .../SootopolisCity_PokemonCenter_1F/header.inc | 14 + data/maps/SootopolisCity_PokemonCenter_1F/header.s | 14 - .../SootopolisCity_PokemonCenter_2F/header.inc | 14 + data/maps/SootopolisCity_PokemonCenter_2F/header.s | 14 - data/maps/SouthernIsland_Exterior/header.inc | 14 + data/maps/SouthernIsland_Exterior/header.s | 14 - data/maps/SouthernIsland_Interior/header.inc | 14 + data/maps/SouthernIsland_Interior/header.s | 14 - data/maps/TradeCenter/header.inc | 14 + data/maps/TradeCenter/header.s | 14 - data/maps/Underwater1/connections.inc | 7 + data/maps/Underwater1/connections.s | 7 - data/maps/Underwater1/header.inc | 14 + data/maps/Underwater1/header.s | 14 - data/maps/Underwater2/connections.inc | 8 + data/maps/Underwater2/connections.s | 8 - data/maps/Underwater2/header.inc | 14 + data/maps/Underwater2/header.s | 14 - data/maps/Underwater3/connections.inc | 8 + data/maps/Underwater3/connections.s | 8 - data/maps/Underwater3/header.inc | 14 + data/maps/Underwater3/header.s | 14 - data/maps/Underwater4/connections.inc | 7 + data/maps/Underwater4/connections.s | 7 - data/maps/Underwater4/header.inc | 14 + data/maps/Underwater4/header.s | 14 - data/maps/Underwater_Route134/header.inc | 14 + data/maps/Underwater_Route134/header.s | 14 - data/maps/Underwater_SeafloorCavern/header.inc | 14 + data/maps/Underwater_SeafloorCavern/header.s | 14 - data/maps/Underwater_SealedChamber/header.inc | 14 + data/maps/Underwater_SealedChamber/header.s | 14 - data/maps/Underwater_SootopolisCity/header.inc | 14 + data/maps/Underwater_SootopolisCity/header.s | 14 - data/maps/UnknownMap_25_29/header.inc | 14 + data/maps/UnknownMap_25_29/header.s | 14 - data/maps/UnknownMap_25_30/header.inc | 14 + data/maps/UnknownMap_25_30/header.s | 14 - data/maps/UnknownMap_25_31/header.inc | 14 + data/maps/UnknownMap_25_31/header.s | 14 - data/maps/UnknownMap_25_32/header.inc | 14 + data/maps/UnknownMap_25_32/header.s | 14 - data/maps/UnknownMap_25_33/header.inc | 14 + data/maps/UnknownMap_25_33/header.s | 14 - data/maps/UnknownMap_25_34/header.inc | 14 + data/maps/UnknownMap_25_34/header.s | 14 - data/maps/VerdanturfTown/connections.inc | 7 + data/maps/VerdanturfTown/connections.s | 7 - data/maps/VerdanturfTown/header.inc | 14 + data/maps/VerdanturfTown/header.s | 14 - data/maps/VerdanturfTown_ContestHall/header.inc | 14 + data/maps/VerdanturfTown_ContestHall/header.s | 14 - data/maps/VerdanturfTown_ContestLobby/header.inc | 14 + data/maps/VerdanturfTown_ContestLobby/header.s | 14 - .../header.inc | 14 + .../VerdanturfTown_FriendshipRatersHouse/header.s | 14 - data/maps/VerdanturfTown_House/header.inc | 14 + data/maps/VerdanturfTown_House/header.s | 14 - data/maps/VerdanturfTown_Mart/header.inc | 14 + data/maps/VerdanturfTown_Mart/header.s | 14 - .../VerdanturfTown_PokemonCenter_1F/header.inc | 14 + data/maps/VerdanturfTown_PokemonCenter_1F/header.s | 14 - .../VerdanturfTown_PokemonCenter_2F/header.inc | 14 + data/maps/VerdanturfTown_PokemonCenter_2F/header.s | 14 - data/maps/VerdanturfTown_WandasHouse/header.inc | 14 + data/maps/VerdanturfTown_WandasHouse/header.s | 14 - data/maps/VictoryRoad_1F/header.inc | 14 + data/maps/VictoryRoad_1F/header.s | 14 - data/maps/VictoryRoad_B1F/header.inc | 14 + data/maps/VictoryRoad_B1F/header.s | 14 - data/maps/VictoryRoad_B2F/header.inc | 14 + data/maps/VictoryRoad_B2F/header.s | 14 - data/maps/connections.inc | 116 +-- data/maps/headers.inc | 788 ++++++++++----------- data/text/easy_chat/group_orders.inc | 44 +- data/text/easy_chat/group_words.inc | 44 +- data/text/easy_chat/groups/actions/order.inc | 81 +++ data/text/easy_chat/groups/actions/order.s | 81 --- data/text/easy_chat/groups/actions/words.inc | 80 +++ data/text/easy_chat/groups/actions/words.s | 80 --- data/text/easy_chat/groups/adjectives/order.inc | 39 + data/text/easy_chat/groups/adjectives/order.s | 39 - data/text/easy_chat/groups/adjectives/words.inc | 38 + data/text/easy_chat/groups/adjectives/words.s | 38 - data/text/easy_chat/groups/battle/order.inc | 66 ++ data/text/easy_chat/groups/battle/order.s | 66 -- data/text/easy_chat/groups/battle/words.inc | 65 ++ data/text/easy_chat/groups/battle/words.s | 65 -- data/text/easy_chat/groups/conditions/order.inc | 72 ++ data/text/easy_chat/groups/conditions/order.s | 72 -- data/text/easy_chat/groups/conditions/words.inc | 71 ++ data/text/easy_chat/groups/conditions/words.s | 71 -- data/text/easy_chat/groups/endings/order.inc | 72 ++ data/text/easy_chat/groups/endings/order.s | 72 -- data/text/easy_chat/groups/endings/words.inc | 71 ++ data/text/easy_chat/groups/endings/words.s | 71 -- data/text/easy_chat/groups/events/order.inc | 25 + data/text/easy_chat/groups/events/order.s | 25 - data/text/easy_chat/groups/events/words.inc | 24 + data/text/easy_chat/groups/events/words.s | 24 - data/text/easy_chat/groups/feelings/order.inc | 72 ++ data/text/easy_chat/groups/feelings/order.s | 72 -- data/text/easy_chat/groups/feelings/words.inc | 71 ++ data/text/easy_chat/groups/feelings/words.s | 71 -- data/text/easy_chat/groups/greetings/order.inc | 45 ++ data/text/easy_chat/groups/greetings/order.s | 45 -- data/text/easy_chat/groups/greetings/words.inc | 44 ++ data/text/easy_chat/groups/greetings/words.s | 44 -- data/text/easy_chat/groups/hobbies/order.inc | 57 ++ data/text/easy_chat/groups/hobbies/order.s | 57 -- data/text/easy_chat/groups/hobbies/words.inc | 56 ++ data/text/easy_chat/groups/hobbies/words.s | 56 -- data/text/easy_chat/groups/lifestyle/order.inc | 48 ++ data/text/easy_chat/groups/lifestyle/order.s | 48 -- data/text/easy_chat/groups/lifestyle/words.inc | 47 ++ data/text/easy_chat/groups/lifestyle/words.s | 47 -- data/text/easy_chat/groups/misc/order.inc | 45 ++ data/text/easy_chat/groups/misc/order.s | 45 -- data/text/easy_chat/groups/misc/words.inc | 44 ++ data/text/easy_chat/groups/misc/words.s | 44 -- data/text/easy_chat/groups/move_1/order.inc | 156 ++++ data/text/easy_chat/groups/move_1/order.s | 156 ---- data/text/easy_chat/groups/move_1/words.inc | 156 ++++ data/text/easy_chat/groups/move_1/words.s | 156 ---- data/text/easy_chat/groups/move_2/order.inc | 197 ++++++ data/text/easy_chat/groups/move_2/order.s | 197 ------ data/text/easy_chat/groups/move_2/words.inc | 197 ++++++ data/text/easy_chat/groups/move_2/words.s | 197 ------ data/text/easy_chat/groups/people/order.inc | 78 ++ data/text/easy_chat/groups/people/order.s | 78 -- data/text/easy_chat/groups/people/words.inc | 77 ++ data/text/easy_chat/groups/people/words.s | 77 -- data/text/easy_chat/groups/pokemon/order.inc | 205 ++++++ data/text/easy_chat/groups/pokemon/order.s | 205 ------ data/text/easy_chat/groups/pokemon/words.inc | 205 ++++++ data/text/easy_chat/groups/pokemon/words.s | 205 ------ data/text/easy_chat/groups/pokemon_2/order.inc | 254 +++++++ data/text/easy_chat/groups/pokemon_2/order.s | 254 ------- data/text/easy_chat/groups/pokemon_2/words.inc | 254 +++++++ data/text/easy_chat/groups/pokemon_2/words.s | 254 ------- data/text/easy_chat/groups/speech/order.inc | 63 ++ data/text/easy_chat/groups/speech/order.s | 63 -- data/text/easy_chat/groups/speech/words.inc | 62 ++ data/text/easy_chat/groups/speech/words.s | 62 -- data/text/easy_chat/groups/status/order.inc | 112 +++ data/text/easy_chat/groups/status/order.s | 112 --- data/text/easy_chat/groups/status/words.inc | 111 +++ data/text/easy_chat/groups/status/words.s | 111 --- data/text/easy_chat/groups/time/order.inc | 48 ++ data/text/easy_chat/groups/time/order.s | 48 -- data/text/easy_chat/groups/time/words.inc | 47 ++ data/text/easy_chat/groups/time/words.s | 47 -- data/text/easy_chat/groups/trainer/order.inc | 22 + data/text/easy_chat/groups/trainer/order.s | 22 - data/text/easy_chat/groups/trainer/words.inc | 21 + data/text/easy_chat/groups/trainer/words.s | 21 - data/text/easy_chat/groups/trendy_saying/order.inc | 36 + data/text/easy_chat/groups/trendy_saying/order.s | 36 - data/text/easy_chat/groups/trendy_saying/words.inc | 35 + data/text/easy_chat/groups/trendy_saying/words.s | 35 - data/text/easy_chat/groups/voices/order.inc | 66 ++ data/text/easy_chat/groups/voices/order.s | 66 -- data/text/easy_chat/groups/voices/words.inc | 65 ++ data/text/easy_chat/groups/voices/words.s | 65 -- data/text/gabby_and_ty.inc | 244 +++++++ data/text/gabby_and_ty.s | 244 ------- data/text/pokemon_news.inc | 146 ++++ data/text/pokemon_news.s | 146 ---- data/text/tv.inc | 4 +- 1014 files changed, 11143 insertions(+), 11143 deletions(-) create mode 100644 data/experience_tables/erratic_growth_rate.inc delete mode 100644 data/experience_tables/erratic_growth_rate.s create mode 100644 data/experience_tables/fast_growth_rate.inc delete mode 100644 data/experience_tables/fast_growth_rate.s create mode 100644 data/experience_tables/fluctuating_growth_rate.inc delete mode 100644 data/experience_tables/fluctuating_growth_rate.s create mode 100644 data/experience_tables/medium_fast_growth_rate.inc delete mode 100644 data/experience_tables/medium_fast_growth_rate.s create mode 100644 data/experience_tables/medium_slow_growth_rate.inc delete mode 100644 data/experience_tables/medium_slow_growth_rate.s create mode 100644 data/experience_tables/slow_growth_rate.inc delete mode 100644 data/experience_tables/slow_growth_rate.s create mode 100644 data/maps/AbandonedShip_CaptainsOffice/header.inc delete mode 100644 data/maps/AbandonedShip_CaptainsOffice/header.s create mode 100644 data/maps/AbandonedShip_Corridors_1F/header.inc delete mode 100644 data/maps/AbandonedShip_Corridors_1F/header.s create mode 100644 data/maps/AbandonedShip_Corridors_B1F/header.inc delete mode 100644 data/maps/AbandonedShip_Corridors_B1F/header.s create mode 100644 data/maps/AbandonedShip_Deck/header.inc delete mode 100644 data/maps/AbandonedShip_Deck/header.s create mode 100644 data/maps/AbandonedShip_HiddenFloorCorridors/header.inc delete mode 100644 data/maps/AbandonedShip_HiddenFloorCorridors/header.s create mode 100644 data/maps/AbandonedShip_HiddenFloorRooms/header.inc delete mode 100644 data/maps/AbandonedShip_HiddenFloorRooms/header.s create mode 100644 data/maps/AbandonedShip_Room_B1F/header.inc delete mode 100644 data/maps/AbandonedShip_Room_B1F/header.s create mode 100644 data/maps/AbandonedShip_Rooms2_1F/header.inc delete mode 100644 data/maps/AbandonedShip_Rooms2_1F/header.s create mode 100644 data/maps/AbandonedShip_Rooms2_B1F/header.inc delete mode 100644 data/maps/AbandonedShip_Rooms2_B1F/header.s create mode 100644 data/maps/AbandonedShip_Rooms_1F/header.inc delete mode 100644 data/maps/AbandonedShip_Rooms_1F/header.s create mode 100644 data/maps/AbandonedShip_Rooms_B1F/header.inc delete mode 100644 data/maps/AbandonedShip_Rooms_B1F/header.s create mode 100644 data/maps/AbandonedShip_Underwater1/header.inc delete mode 100644 data/maps/AbandonedShip_Underwater1/header.s create mode 100644 data/maps/AbandonedShip_Underwater2/header.inc delete mode 100644 data/maps/AbandonedShip_Underwater2/header.s create mode 100644 data/maps/AncientTomb/header.inc delete mode 100644 data/maps/AncientTomb/header.s create mode 100644 data/maps/AquaHideout_1F/header.inc delete mode 100644 data/maps/AquaHideout_1F/header.s create mode 100644 data/maps/AquaHideout_B1F/header.inc delete mode 100644 data/maps/AquaHideout_B1F/header.s create mode 100644 data/maps/AquaHideout_B2F/header.inc delete mode 100644 data/maps/AquaHideout_B2F/header.s create mode 100644 data/maps/BattleTower_BattleRoom/header.inc delete mode 100644 data/maps/BattleTower_BattleRoom/header.s create mode 100644 data/maps/BattleTower_Corridor/header.inc delete mode 100644 data/maps/BattleTower_Corridor/header.s create mode 100644 data/maps/BattleTower_Elevator/header.inc delete mode 100644 data/maps/BattleTower_Elevator/header.s create mode 100644 data/maps/BattleTower_Lobby/header.inc delete mode 100644 data/maps/BattleTower_Lobby/header.s create mode 100644 data/maps/BattleTower_Outside/header.inc delete mode 100644 data/maps/BattleTower_Outside/header.s create mode 100644 data/maps/CaveOfOrigin_1F/header.inc delete mode 100644 data/maps/CaveOfOrigin_1F/header.s create mode 100644 data/maps/CaveOfOrigin_B1F/header.inc delete mode 100644 data/maps/CaveOfOrigin_B1F/header.s create mode 100644 data/maps/CaveOfOrigin_B2F/header.inc delete mode 100644 data/maps/CaveOfOrigin_B2F/header.s create mode 100644 data/maps/CaveOfOrigin_B3F/header.inc delete mode 100644 data/maps/CaveOfOrigin_B3F/header.s create mode 100644 data/maps/CaveOfOrigin_B4F/header.inc delete mode 100644 data/maps/CaveOfOrigin_B4F/header.s create mode 100644 data/maps/CaveOfOrigin_Entrance/header.inc delete mode 100644 data/maps/CaveOfOrigin_Entrance/header.s create mode 100644 data/maps/DesertRuins/header.inc delete mode 100644 data/maps/DesertRuins/header.s create mode 100644 data/maps/DewfordTown/connections.inc delete mode 100644 data/maps/DewfordTown/connections.s create mode 100644 data/maps/DewfordTown/header.inc delete mode 100644 data/maps/DewfordTown/header.s create mode 100644 data/maps/DewfordTown_Gym/header.inc delete mode 100644 data/maps/DewfordTown_Gym/header.s create mode 100644 data/maps/DewfordTown_Hall/header.inc delete mode 100644 data/maps/DewfordTown_Hall/header.s create mode 100644 data/maps/DewfordTown_House1/header.inc delete mode 100644 data/maps/DewfordTown_House1/header.s create mode 100644 data/maps/DewfordTown_House2/header.inc delete mode 100644 data/maps/DewfordTown_House2/header.s create mode 100644 data/maps/DewfordTown_PokemonCenter_1F/header.inc delete mode 100644 data/maps/DewfordTown_PokemonCenter_1F/header.s create mode 100644 data/maps/DewfordTown_PokemonCenter_2F/header.inc delete mode 100644 data/maps/DewfordTown_PokemonCenter_2F/header.s create mode 100644 data/maps/DoubleBattleColosseum/header.inc delete mode 100644 data/maps/DoubleBattleColosseum/header.s create mode 100644 data/maps/EverGrandeCity/connections.inc delete mode 100644 data/maps/EverGrandeCity/connections.s create mode 100644 data/maps/EverGrandeCity/header.inc delete mode 100644 data/maps/EverGrandeCity/header.s create mode 100644 data/maps/EverGrandeCity_ChampionsRoom/header.inc delete mode 100644 data/maps/EverGrandeCity_ChampionsRoom/header.s create mode 100644 data/maps/EverGrandeCity_Corridor1/header.inc delete mode 100644 data/maps/EverGrandeCity_Corridor1/header.s create mode 100644 data/maps/EverGrandeCity_Corridor2/header.inc delete mode 100644 data/maps/EverGrandeCity_Corridor2/header.s create mode 100644 data/maps/EverGrandeCity_Corridor3/header.inc delete mode 100644 data/maps/EverGrandeCity_Corridor3/header.s create mode 100644 data/maps/EverGrandeCity_Corridor4/header.inc delete mode 100644 data/maps/EverGrandeCity_Corridor4/header.s create mode 100644 data/maps/EverGrandeCity_Corridor5/header.inc delete mode 100644 data/maps/EverGrandeCity_Corridor5/header.s create mode 100644 data/maps/EverGrandeCity_DrakesRoom/header.inc delete mode 100644 data/maps/EverGrandeCity_DrakesRoom/header.s create mode 100644 data/maps/EverGrandeCity_GlaciasRoom/header.inc delete mode 100644 data/maps/EverGrandeCity_GlaciasRoom/header.s create mode 100644 data/maps/EverGrandeCity_HallOfFame/header.inc delete mode 100644 data/maps/EverGrandeCity_HallOfFame/header.s create mode 100644 data/maps/EverGrandeCity_PhoebesRoom/header.inc delete mode 100644 data/maps/EverGrandeCity_PhoebesRoom/header.s create mode 100644 data/maps/EverGrandeCity_PokemonCenter_1F/header.inc delete mode 100644 data/maps/EverGrandeCity_PokemonCenter_1F/header.s create mode 100644 data/maps/EverGrandeCity_PokemonCenter_2F/header.inc delete mode 100644 data/maps/EverGrandeCity_PokemonCenter_2F/header.s create mode 100644 data/maps/EverGrandeCity_PokemonLeague/header.inc delete mode 100644 data/maps/EverGrandeCity_PokemonLeague/header.s create mode 100644 data/maps/EverGrandeCity_SidneysRoom/header.inc delete mode 100644 data/maps/EverGrandeCity_SidneysRoom/header.s create mode 100644 data/maps/FallarborTown/connections.inc delete mode 100644 data/maps/FallarborTown/connections.s create mode 100644 data/maps/FallarborTown/header.inc delete mode 100644 data/maps/FallarborTown/header.s create mode 100644 data/maps/FallarborTown_ContestHall/header.inc delete mode 100644 data/maps/FallarborTown_ContestHall/header.s create mode 100644 data/maps/FallarborTown_ContestLobby/header.inc delete mode 100644 data/maps/FallarborTown_ContestLobby/header.s create mode 100644 data/maps/FallarborTown_House1/header.inc delete mode 100644 data/maps/FallarborTown_House1/header.s create mode 100644 data/maps/FallarborTown_House2/header.inc delete mode 100644 data/maps/FallarborTown_House2/header.s create mode 100644 data/maps/FallarborTown_Mart/header.inc delete mode 100644 data/maps/FallarborTown_Mart/header.s create mode 100644 data/maps/FallarborTown_PokemonCenter_1F/header.inc delete mode 100644 data/maps/FallarborTown_PokemonCenter_1F/header.s create mode 100644 data/maps/FallarborTown_PokemonCenter_2F/header.inc delete mode 100644 data/maps/FallarborTown_PokemonCenter_2F/header.s create mode 100644 data/maps/FieryPath/header.inc delete mode 100644 data/maps/FieryPath/header.s create mode 100644 data/maps/FortreeCity/connections.inc delete mode 100644 data/maps/FortreeCity/connections.s create mode 100644 data/maps/FortreeCity/header.inc delete mode 100644 data/maps/FortreeCity/header.s create mode 100644 data/maps/FortreeCity_DecorationShop/header.inc delete mode 100644 data/maps/FortreeCity_DecorationShop/header.s create mode 100644 data/maps/FortreeCity_Gym/header.inc delete mode 100644 data/maps/FortreeCity_Gym/header.s create mode 100644 data/maps/FortreeCity_House1/header.inc delete mode 100644 data/maps/FortreeCity_House1/header.s create mode 100644 data/maps/FortreeCity_House2/header.inc delete mode 100644 data/maps/FortreeCity_House2/header.s create mode 100644 data/maps/FortreeCity_House3/header.inc delete mode 100644 data/maps/FortreeCity_House3/header.s create mode 100644 data/maps/FortreeCity_House4/header.inc delete mode 100644 data/maps/FortreeCity_House4/header.s create mode 100644 data/maps/FortreeCity_House5/header.inc delete mode 100644 data/maps/FortreeCity_House5/header.s create mode 100644 data/maps/FortreeCity_Mart/header.inc delete mode 100644 data/maps/FortreeCity_Mart/header.s create mode 100644 data/maps/FortreeCity_PokemonCenter_1F/header.inc delete mode 100644 data/maps/FortreeCity_PokemonCenter_1F/header.s create mode 100644 data/maps/FortreeCity_PokemonCenter_2F/header.inc delete mode 100644 data/maps/FortreeCity_PokemonCenter_2F/header.s create mode 100644 data/maps/GraniteCave_1F/header.inc delete mode 100644 data/maps/GraniteCave_1F/header.s create mode 100644 data/maps/GraniteCave_B1F/header.inc delete mode 100644 data/maps/GraniteCave_B1F/header.s create mode 100644 data/maps/GraniteCave_B2F/header.inc delete mode 100644 data/maps/GraniteCave_B2F/header.s create mode 100644 data/maps/GraniteCave_StevensRoom/header.inc delete mode 100644 data/maps/GraniteCave_StevensRoom/header.s create mode 100644 data/maps/InsideOfTruck/header.inc delete mode 100644 data/maps/InsideOfTruck/header.s create mode 100644 data/maps/IslandCave/header.inc delete mode 100644 data/maps/IslandCave/header.s create mode 100644 data/maps/JaggedPass/header.inc delete mode 100644 data/maps/JaggedPass/header.s create mode 100644 data/maps/LavaridgeTown/connections.inc delete mode 100644 data/maps/LavaridgeTown/connections.s create mode 100644 data/maps/LavaridgeTown/header.inc delete mode 100644 data/maps/LavaridgeTown/header.s create mode 100644 data/maps/LavaridgeTown_Gym_1F/header.inc delete mode 100644 data/maps/LavaridgeTown_Gym_1F/header.s create mode 100644 data/maps/LavaridgeTown_Gym_B1F/header.inc delete mode 100644 data/maps/LavaridgeTown_Gym_B1F/header.s create mode 100644 data/maps/LavaridgeTown_HerbShop/header.inc delete mode 100644 data/maps/LavaridgeTown_HerbShop/header.s create mode 100644 data/maps/LavaridgeTown_House/header.inc delete mode 100644 data/maps/LavaridgeTown_House/header.s create mode 100644 data/maps/LavaridgeTown_Mart/header.inc delete mode 100644 data/maps/LavaridgeTown_Mart/header.s create mode 100644 data/maps/LavaridgeTown_PokemonCenter_1F/header.inc delete mode 100644 data/maps/LavaridgeTown_PokemonCenter_1F/header.s create mode 100644 data/maps/LavaridgeTown_PokemonCenter_2F/header.inc delete mode 100644 data/maps/LavaridgeTown_PokemonCenter_2F/header.s create mode 100644 data/maps/LilycoveCity/connections.inc delete mode 100644 data/maps/LilycoveCity/connections.s create mode 100644 data/maps/LilycoveCity/header.inc delete mode 100644 data/maps/LilycoveCity/header.s create mode 100644 data/maps/LilycoveCity_ContestHall/header.inc delete mode 100644 data/maps/LilycoveCity_ContestHall/header.s create mode 100644 data/maps/LilycoveCity_ContestLobby/header.inc delete mode 100644 data/maps/LilycoveCity_ContestLobby/header.s create mode 100644 data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc delete mode 100644 data/maps/LilycoveCity_CoveLilyMotel_1F/header.s create mode 100644 data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc delete mode 100644 data/maps/LilycoveCity_CoveLilyMotel_2F/header.s create mode 100644 data/maps/LilycoveCity_DepartmentStoreElevator/header.inc delete mode 100644 data/maps/LilycoveCity_DepartmentStoreElevator/header.s create mode 100644 data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc delete mode 100644 data/maps/LilycoveCity_DepartmentStoreRooftop/header.s create mode 100644 data/maps/LilycoveCity_DepartmentStore_1F/header.inc delete mode 100644 data/maps/LilycoveCity_DepartmentStore_1F/header.s create mode 100644 data/maps/LilycoveCity_DepartmentStore_2F/header.inc delete mode 100644 data/maps/LilycoveCity_DepartmentStore_2F/header.s create mode 100644 data/maps/LilycoveCity_DepartmentStore_3F/header.inc delete mode 100644 data/maps/LilycoveCity_DepartmentStore_3F/header.s create mode 100644 data/maps/LilycoveCity_DepartmentStore_4F/header.inc delete mode 100644 data/maps/LilycoveCity_DepartmentStore_4F/header.s create mode 100644 data/maps/LilycoveCity_DepartmentStore_5F/header.inc delete mode 100644 data/maps/LilycoveCity_DepartmentStore_5F/header.s create mode 100644 data/maps/LilycoveCity_EmptyMap/header.inc delete mode 100644 data/maps/LilycoveCity_EmptyMap/header.s create mode 100644 data/maps/LilycoveCity_Harbor/header.inc delete mode 100644 data/maps/LilycoveCity_Harbor/header.s create mode 100644 data/maps/LilycoveCity_House1/header.inc delete mode 100644 data/maps/LilycoveCity_House1/header.s create mode 100644 data/maps/LilycoveCity_House2/header.inc delete mode 100644 data/maps/LilycoveCity_House2/header.s create mode 100644 data/maps/LilycoveCity_House3/header.inc delete mode 100644 data/maps/LilycoveCity_House3/header.s create mode 100644 data/maps/LilycoveCity_House4/header.inc delete mode 100644 data/maps/LilycoveCity_House4/header.s create mode 100644 data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc delete mode 100644 data/maps/LilycoveCity_LilycoveMuseum_1F/header.s create mode 100644 data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc delete mode 100644 data/maps/LilycoveCity_LilycoveMuseum_2F/header.s create mode 100644 data/maps/LilycoveCity_MoveDeletersHouse/header.inc delete mode 100644 data/maps/LilycoveCity_MoveDeletersHouse/header.s create mode 100644 data/maps/LilycoveCity_PokemonCenter_1F/header.inc delete mode 100644 data/maps/LilycoveCity_PokemonCenter_1F/header.s create mode 100644 data/maps/LilycoveCity_PokemonCenter_2F/header.inc delete mode 100644 data/maps/LilycoveCity_PokemonCenter_2F/header.s create mode 100644 data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc delete mode 100644 data/maps/LilycoveCity_PokemonTrainerFanClub/header.s create mode 100644 data/maps/LilycoveCity_UnusedMart/header.inc delete mode 100644 data/maps/LilycoveCity_UnusedMart/header.s create mode 100644 data/maps/LinkContestRoom1/header.inc delete mode 100644 data/maps/LinkContestRoom1/header.s create mode 100644 data/maps/LinkContestRoom2/header.inc delete mode 100644 data/maps/LinkContestRoom2/header.s create mode 100644 data/maps/LinkContestRoom3/header.inc delete mode 100644 data/maps/LinkContestRoom3/header.s create mode 100644 data/maps/LinkContestRoom4/header.inc delete mode 100644 data/maps/LinkContestRoom4/header.s create mode 100644 data/maps/LinkContestRoom5/header.inc delete mode 100644 data/maps/LinkContestRoom5/header.s create mode 100644 data/maps/LinkContestRoom6/header.inc delete mode 100644 data/maps/LinkContestRoom6/header.s create mode 100644 data/maps/LittlerootTown/connections.inc delete mode 100644 data/maps/LittlerootTown/connections.s create mode 100644 data/maps/LittlerootTown/header.inc delete mode 100644 data/maps/LittlerootTown/header.s create mode 100644 data/maps/LittlerootTown_BrendansHouse_1F/header.inc delete mode 100644 data/maps/LittlerootTown_BrendansHouse_1F/header.s create mode 100644 data/maps/LittlerootTown_BrendansHouse_2F/header.inc delete mode 100644 data/maps/LittlerootTown_BrendansHouse_2F/header.s create mode 100644 data/maps/LittlerootTown_MaysHouse_1F/header.inc delete mode 100644 data/maps/LittlerootTown_MaysHouse_1F/header.s create mode 100644 data/maps/LittlerootTown_MaysHouse_2F/header.inc delete mode 100644 data/maps/LittlerootTown_MaysHouse_2F/header.s create mode 100644 data/maps/LittlerootTown_ProfessorBirchsLab/header.inc delete mode 100644 data/maps/LittlerootTown_ProfessorBirchsLab/header.s create mode 100644 data/maps/MagmaHideout_1F/header.inc delete mode 100644 data/maps/MagmaHideout_1F/header.s create mode 100644 data/maps/MagmaHideout_B1F/header.inc delete mode 100644 data/maps/MagmaHideout_B1F/header.s create mode 100644 data/maps/MagmaHideout_B2F/header.inc delete mode 100644 data/maps/MagmaHideout_B2F/header.s create mode 100644 data/maps/MauvilleCity/connections.inc delete mode 100644 data/maps/MauvilleCity/connections.s create mode 100644 data/maps/MauvilleCity/header.inc delete mode 100644 data/maps/MauvilleCity/header.s create mode 100644 data/maps/MauvilleCity_BikeShop/header.inc delete mode 100644 data/maps/MauvilleCity_BikeShop/header.s create mode 100644 data/maps/MauvilleCity_GameCorner/header.inc delete mode 100644 data/maps/MauvilleCity_GameCorner/header.s create mode 100644 data/maps/MauvilleCity_Gym/header.inc delete mode 100644 data/maps/MauvilleCity_Gym/header.s create mode 100644 data/maps/MauvilleCity_House1/header.inc delete mode 100644 data/maps/MauvilleCity_House1/header.s create mode 100644 data/maps/MauvilleCity_House2/header.inc delete mode 100644 data/maps/MauvilleCity_House2/header.s create mode 100644 data/maps/MauvilleCity_Mart/header.inc delete mode 100644 data/maps/MauvilleCity_Mart/header.s create mode 100644 data/maps/MauvilleCity_PokemonCenter_1F/header.inc delete mode 100644 data/maps/MauvilleCity_PokemonCenter_1F/header.s create mode 100644 data/maps/MauvilleCity_PokemonCenter_2F/header.inc delete mode 100644 data/maps/MauvilleCity_PokemonCenter_2F/header.s create mode 100644 data/maps/MeteorFalls_1F_1R/header.inc delete mode 100644 data/maps/MeteorFalls_1F_1R/header.s create mode 100644 data/maps/MeteorFalls_1F_2R/header.inc delete mode 100644 data/maps/MeteorFalls_1F_2R/header.s create mode 100644 data/maps/MeteorFalls_B1F_1R/header.inc delete mode 100644 data/maps/MeteorFalls_B1F_1R/header.s create mode 100644 data/maps/MeteorFalls_B1F_2R/header.inc delete mode 100644 data/maps/MeteorFalls_B1F_2R/header.s create mode 100644 data/maps/MossdeepCity/connections.inc delete mode 100644 data/maps/MossdeepCity/connections.s create mode 100644 data/maps/MossdeepCity/header.inc delete mode 100644 data/maps/MossdeepCity/header.s create mode 100644 data/maps/MossdeepCity_GameCorner_1F/header.inc delete mode 100644 data/maps/MossdeepCity_GameCorner_1F/header.s create mode 100644 data/maps/MossdeepCity_GameCorner_B1F/header.inc delete mode 100644 data/maps/MossdeepCity_GameCorner_B1F/header.s create mode 100644 data/maps/MossdeepCity_Gym/header.inc delete mode 100644 data/maps/MossdeepCity_Gym/header.s create mode 100644 data/maps/MossdeepCity_House1/header.inc delete mode 100644 data/maps/MossdeepCity_House1/header.s create mode 100644 data/maps/MossdeepCity_House2/header.inc delete mode 100644 data/maps/MossdeepCity_House2/header.s create mode 100644 data/maps/MossdeepCity_House3/header.inc delete mode 100644 data/maps/MossdeepCity_House3/header.s create mode 100644 data/maps/MossdeepCity_House4/header.inc delete mode 100644 data/maps/MossdeepCity_House4/header.s create mode 100644 data/maps/MossdeepCity_Mart/header.inc delete mode 100644 data/maps/MossdeepCity_Mart/header.s create mode 100644 data/maps/MossdeepCity_PokemonCenter_1F/header.inc delete mode 100644 data/maps/MossdeepCity_PokemonCenter_1F/header.s create mode 100644 data/maps/MossdeepCity_PokemonCenter_2F/header.inc delete mode 100644 data/maps/MossdeepCity_PokemonCenter_2F/header.s create mode 100644 data/maps/MossdeepCity_SpaceCenter_1F/header.inc delete mode 100644 data/maps/MossdeepCity_SpaceCenter_1F/header.s create mode 100644 data/maps/MossdeepCity_SpaceCenter_2F/header.inc delete mode 100644 data/maps/MossdeepCity_SpaceCenter_2F/header.s create mode 100644 data/maps/MossdeepCity_StevensHouse/header.inc delete mode 100644 data/maps/MossdeepCity_StevensHouse/header.s create mode 100644 data/maps/MtChimney/header.inc delete mode 100644 data/maps/MtChimney/header.s create mode 100644 data/maps/MtChimney_CableCarStation/header.inc delete mode 100644 data/maps/MtChimney_CableCarStation/header.s create mode 100644 data/maps/MtPyre_1F/header.inc delete mode 100644 data/maps/MtPyre_1F/header.s create mode 100644 data/maps/MtPyre_2F/header.inc delete mode 100644 data/maps/MtPyre_2F/header.s create mode 100644 data/maps/MtPyre_3F/header.inc delete mode 100644 data/maps/MtPyre_3F/header.s create mode 100644 data/maps/MtPyre_4F/header.inc delete mode 100644 data/maps/MtPyre_4F/header.s create mode 100644 data/maps/MtPyre_5F/header.inc delete mode 100644 data/maps/MtPyre_5F/header.s create mode 100644 data/maps/MtPyre_6F/header.inc delete mode 100644 data/maps/MtPyre_6F/header.s create mode 100644 data/maps/MtPyre_Exterior/header.inc delete mode 100644 data/maps/MtPyre_Exterior/header.s create mode 100644 data/maps/MtPyre_Summit/header.inc delete mode 100644 data/maps/MtPyre_Summit/header.s create mode 100644 data/maps/NewMauville_Entrance/header.inc delete mode 100644 data/maps/NewMauville_Entrance/header.s create mode 100644 data/maps/NewMauville_Inside/header.inc delete mode 100644 data/maps/NewMauville_Inside/header.s create mode 100644 data/maps/OldaleTown/connections.inc delete mode 100644 data/maps/OldaleTown/connections.s create mode 100644 data/maps/OldaleTown/header.inc delete mode 100644 data/maps/OldaleTown/header.s create mode 100644 data/maps/OldaleTown_House1/header.inc delete mode 100644 data/maps/OldaleTown_House1/header.s create mode 100644 data/maps/OldaleTown_House2/header.inc delete mode 100644 data/maps/OldaleTown_House2/header.s create mode 100644 data/maps/OldaleTown_Mart/header.inc delete mode 100644 data/maps/OldaleTown_Mart/header.s create mode 100644 data/maps/OldaleTown_PokemonCenter_1F/header.inc delete mode 100644 data/maps/OldaleTown_PokemonCenter_1F/header.s create mode 100644 data/maps/OldaleTown_PokemonCenter_2F/header.inc delete mode 100644 data/maps/OldaleTown_PokemonCenter_2F/header.s create mode 100644 data/maps/PacifidlogTown/connections.inc delete mode 100644 data/maps/PacifidlogTown/connections.s create mode 100644 data/maps/PacifidlogTown/header.inc delete mode 100644 data/maps/PacifidlogTown/header.s create mode 100644 data/maps/PacifidlogTown_House1/header.inc delete mode 100644 data/maps/PacifidlogTown_House1/header.s create mode 100644 data/maps/PacifidlogTown_House2/header.inc delete mode 100644 data/maps/PacifidlogTown_House2/header.s create mode 100644 data/maps/PacifidlogTown_House3/header.inc delete mode 100644 data/maps/PacifidlogTown_House3/header.s create mode 100644 data/maps/PacifidlogTown_House4/header.inc delete mode 100644 data/maps/PacifidlogTown_House4/header.s create mode 100644 data/maps/PacifidlogTown_House5/header.inc delete mode 100644 data/maps/PacifidlogTown_House5/header.s create mode 100644 data/maps/PacifidlogTown_PokemonCenter_1F/header.inc delete mode 100644 data/maps/PacifidlogTown_PokemonCenter_1F/header.s create mode 100644 data/maps/PacifidlogTown_PokemonCenter_2F/header.inc delete mode 100644 data/maps/PacifidlogTown_PokemonCenter_2F/header.s create mode 100644 data/maps/PetalburgCity/connections.inc delete mode 100644 data/maps/PetalburgCity/connections.s create mode 100644 data/maps/PetalburgCity/header.inc delete mode 100644 data/maps/PetalburgCity/header.s create mode 100644 data/maps/PetalburgCity_Gym/header.inc delete mode 100644 data/maps/PetalburgCity_Gym/header.s create mode 100644 data/maps/PetalburgCity_House1/header.inc delete mode 100644 data/maps/PetalburgCity_House1/header.s create mode 100644 data/maps/PetalburgCity_House2/header.inc delete mode 100644 data/maps/PetalburgCity_House2/header.s create mode 100644 data/maps/PetalburgCity_Mart/header.inc delete mode 100644 data/maps/PetalburgCity_Mart/header.s create mode 100644 data/maps/PetalburgCity_PokemonCenter_1F/header.inc delete mode 100644 data/maps/PetalburgCity_PokemonCenter_1F/header.s create mode 100644 data/maps/PetalburgCity_PokemonCenter_2F/header.inc delete mode 100644 data/maps/PetalburgCity_PokemonCenter_2F/header.s create mode 100644 data/maps/PetalburgCity_WallysHouse/header.inc delete mode 100644 data/maps/PetalburgCity_WallysHouse/header.s create mode 100644 data/maps/PetalburgWoods/header.inc delete mode 100644 data/maps/PetalburgWoods/header.s create mode 100644 data/maps/RecordCorner/header.inc delete mode 100644 data/maps/RecordCorner/header.s create mode 100644 data/maps/Route101/connections.inc delete mode 100644 data/maps/Route101/connections.s create mode 100644 data/maps/Route101/header.inc delete mode 100644 data/maps/Route101/header.s create mode 100644 data/maps/Route102/connections.inc delete mode 100644 data/maps/Route102/connections.s create mode 100644 data/maps/Route102/header.inc delete mode 100644 data/maps/Route102/header.s create mode 100644 data/maps/Route103/connections.inc delete mode 100644 data/maps/Route103/connections.s create mode 100644 data/maps/Route103/header.inc delete mode 100644 data/maps/Route103/header.s create mode 100644 data/maps/Route104/connections.inc delete mode 100644 data/maps/Route104/connections.s create mode 100644 data/maps/Route104/header.inc delete mode 100644 data/maps/Route104/header.s create mode 100644 data/maps/Route104_MrBrineysHouse/header.inc delete mode 100644 data/maps/Route104_MrBrineysHouse/header.s create mode 100644 data/maps/Route104_PrettyPetalFlowerShop/header.inc delete mode 100644 data/maps/Route104_PrettyPetalFlowerShop/header.s create mode 100644 data/maps/Route104_Prototype/header.inc delete mode 100644 data/maps/Route104_Prototype/header.s create mode 100644 data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc delete mode 100644 data/maps/Route104_PrototypePrettyPetalFlowerShop/header.s create mode 100644 data/maps/Route105/connections.inc delete mode 100644 data/maps/Route105/connections.s create mode 100644 data/maps/Route105/header.inc delete mode 100644 data/maps/Route105/header.s create mode 100644 data/maps/Route106/connections.inc delete mode 100644 data/maps/Route106/connections.s create mode 100644 data/maps/Route106/header.inc delete mode 100644 data/maps/Route106/header.s create mode 100644 data/maps/Route107/connections.inc delete mode 100644 data/maps/Route107/connections.s create mode 100644 data/maps/Route107/header.inc delete mode 100644 data/maps/Route107/header.s create mode 100644 data/maps/Route108/connections.inc delete mode 100644 data/maps/Route108/connections.s create mode 100644 data/maps/Route108/header.inc delete mode 100644 data/maps/Route108/header.s create mode 100644 data/maps/Route109/connections.inc delete mode 100644 data/maps/Route109/connections.s create mode 100644 data/maps/Route109/header.inc delete mode 100644 data/maps/Route109/header.s create mode 100644 data/maps/Route109_SeashoreHouse/header.inc delete mode 100644 data/maps/Route109_SeashoreHouse/header.s create mode 100644 data/maps/Route110/connections.inc delete mode 100644 data/maps/Route110/connections.s create mode 100644 data/maps/Route110/header.inc delete mode 100644 data/maps/Route110/header.s create mode 100644 data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc delete mode 100644 data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.s create mode 100644 data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc delete mode 100644 data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.s create mode 100644 data/maps/Route110_TrickHouseCorridor/header.inc delete mode 100644 data/maps/Route110_TrickHouseCorridor/header.s create mode 100644 data/maps/Route110_TrickHouseEnd/header.inc delete mode 100644 data/maps/Route110_TrickHouseEnd/header.s create mode 100644 data/maps/Route110_TrickHouseEntrance/header.inc delete mode 100644 data/maps/Route110_TrickHouseEntrance/header.s create mode 100644 data/maps/Route110_TrickHousePuzzle1/header.inc delete mode 100644 data/maps/Route110_TrickHousePuzzle1/header.s create mode 100644 data/maps/Route110_TrickHousePuzzle2/header.inc delete mode 100644 data/maps/Route110_TrickHousePuzzle2/header.s create mode 100644 data/maps/Route110_TrickHousePuzzle3/header.inc delete mode 100644 data/maps/Route110_TrickHousePuzzle3/header.s create mode 100644 data/maps/Route110_TrickHousePuzzle4/header.inc delete mode 100644 data/maps/Route110_TrickHousePuzzle4/header.s create mode 100644 data/maps/Route110_TrickHousePuzzle5/header.inc delete mode 100644 data/maps/Route110_TrickHousePuzzle5/header.s create mode 100644 data/maps/Route110_TrickHousePuzzle6/header.inc delete mode 100644 data/maps/Route110_TrickHousePuzzle6/header.s create mode 100644 data/maps/Route110_TrickHousePuzzle7/header.inc delete mode 100644 data/maps/Route110_TrickHousePuzzle7/header.s create mode 100644 data/maps/Route110_TrickHousePuzzle8/header.inc delete mode 100644 data/maps/Route110_TrickHousePuzzle8/header.s create mode 100644 data/maps/Route111/connections.inc delete mode 100644 data/maps/Route111/connections.s create mode 100644 data/maps/Route111/header.inc delete mode 100644 data/maps/Route111/header.s create mode 100644 data/maps/Route111_OldLadysRestStop/header.inc delete mode 100644 data/maps/Route111_OldLadysRestStop/header.s create mode 100644 data/maps/Route111_WinstrateFamilysHouse/header.inc delete mode 100644 data/maps/Route111_WinstrateFamilysHouse/header.s create mode 100644 data/maps/Route112/connections.inc delete mode 100644 data/maps/Route112/connections.s create mode 100644 data/maps/Route112/header.inc delete mode 100644 data/maps/Route112/header.s create mode 100644 data/maps/Route112_CableCarStation/header.inc delete mode 100644 data/maps/Route112_CableCarStation/header.s create mode 100644 data/maps/Route113/connections.inc delete mode 100644 data/maps/Route113/connections.s create mode 100644 data/maps/Route113/header.inc delete mode 100644 data/maps/Route113/header.s create mode 100644 data/maps/Route113_GlassWorkshop/header.inc delete mode 100644 data/maps/Route113_GlassWorkshop/header.s create mode 100644 data/maps/Route114/connections.inc delete mode 100644 data/maps/Route114/connections.s create mode 100644 data/maps/Route114/header.inc delete mode 100644 data/maps/Route114/header.s create mode 100644 data/maps/Route114_FossilManiacsHouse/header.inc delete mode 100644 data/maps/Route114_FossilManiacsHouse/header.s create mode 100644 data/maps/Route114_FossilManiacsTunnel/header.inc delete mode 100644 data/maps/Route114_FossilManiacsTunnel/header.s create mode 100644 data/maps/Route114_LanettesHouse/header.inc delete mode 100644 data/maps/Route114_LanettesHouse/header.s create mode 100644 data/maps/Route115/connections.inc delete mode 100644 data/maps/Route115/connections.s create mode 100644 data/maps/Route115/header.inc delete mode 100644 data/maps/Route115/header.s create mode 100644 data/maps/Route116/connections.inc delete mode 100644 data/maps/Route116/connections.s create mode 100644 data/maps/Route116/header.inc delete mode 100644 data/maps/Route116/header.s create mode 100644 data/maps/Route116_TunnelersRestHouse/header.inc delete mode 100644 data/maps/Route116_TunnelersRestHouse/header.s create mode 100644 data/maps/Route117/connections.inc delete mode 100644 data/maps/Route117/connections.s create mode 100644 data/maps/Route117/header.inc delete mode 100644 data/maps/Route117/header.s create mode 100644 data/maps/Route117_PokemonDayCare/header.inc delete mode 100644 data/maps/Route117_PokemonDayCare/header.s create mode 100644 data/maps/Route118/connections.inc delete mode 100644 data/maps/Route118/connections.s create mode 100644 data/maps/Route118/header.inc delete mode 100644 data/maps/Route118/header.s create mode 100644 data/maps/Route119/connections.inc delete mode 100644 data/maps/Route119/connections.s create mode 100644 data/maps/Route119/header.inc delete mode 100644 data/maps/Route119/header.s create mode 100644 data/maps/Route119_House/header.inc delete mode 100644 data/maps/Route119_House/header.s create mode 100644 data/maps/Route119_WeatherInstitute_1F/header.inc delete mode 100644 data/maps/Route119_WeatherInstitute_1F/header.s create mode 100644 data/maps/Route119_WeatherInstitute_2F/header.inc delete mode 100644 data/maps/Route119_WeatherInstitute_2F/header.s create mode 100644 data/maps/Route120/connections.inc delete mode 100644 data/maps/Route120/connections.s create mode 100644 data/maps/Route120/header.inc delete mode 100644 data/maps/Route120/header.s create mode 100644 data/maps/Route121/connections.inc delete mode 100644 data/maps/Route121/connections.s create mode 100644 data/maps/Route121/header.inc delete mode 100644 data/maps/Route121/header.s create mode 100644 data/maps/Route121_SafariZoneEntrance/header.inc delete mode 100644 data/maps/Route121_SafariZoneEntrance/header.s create mode 100644 data/maps/Route122/connections.inc delete mode 100644 data/maps/Route122/connections.s create mode 100644 data/maps/Route122/header.inc delete mode 100644 data/maps/Route122/header.s create mode 100644 data/maps/Route123/connections.inc delete mode 100644 data/maps/Route123/connections.s create mode 100644 data/maps/Route123/header.inc delete mode 100644 data/maps/Route123/header.s create mode 100644 data/maps/Route123_BerryMastersHouse/header.inc delete mode 100644 data/maps/Route123_BerryMastersHouse/header.s create mode 100644 data/maps/Route124/connections.inc delete mode 100644 data/maps/Route124/connections.s create mode 100644 data/maps/Route124/header.inc delete mode 100644 data/maps/Route124/header.s create mode 100644 data/maps/Route124_DivingTreasureHuntersHouse/header.inc delete mode 100644 data/maps/Route124_DivingTreasureHuntersHouse/header.s create mode 100644 data/maps/Route125/connections.inc delete mode 100644 data/maps/Route125/connections.s create mode 100644 data/maps/Route125/header.inc delete mode 100644 data/maps/Route125/header.s create mode 100644 data/maps/Route126/connections.inc delete mode 100644 data/maps/Route126/connections.s create mode 100644 data/maps/Route126/header.inc delete mode 100644 data/maps/Route126/header.s create mode 100644 data/maps/Route127/connections.inc delete mode 100644 data/maps/Route127/connections.s create mode 100644 data/maps/Route127/header.inc delete mode 100644 data/maps/Route127/header.s create mode 100644 data/maps/Route128/connections.inc delete mode 100644 data/maps/Route128/connections.s create mode 100644 data/maps/Route128/header.inc delete mode 100644 data/maps/Route128/header.s create mode 100644 data/maps/Route129/connections.inc delete mode 100644 data/maps/Route129/connections.s create mode 100644 data/maps/Route129/header.inc delete mode 100644 data/maps/Route129/header.s create mode 100644 data/maps/Route130/connections.inc delete mode 100644 data/maps/Route130/connections.s create mode 100644 data/maps/Route130/header.inc delete mode 100644 data/maps/Route130/header.s create mode 100644 data/maps/Route131/connections.inc delete mode 100644 data/maps/Route131/connections.s create mode 100644 data/maps/Route131/header.inc delete mode 100644 data/maps/Route131/header.s create mode 100644 data/maps/Route132/connections.inc delete mode 100644 data/maps/Route132/connections.s create mode 100644 data/maps/Route132/header.inc delete mode 100644 data/maps/Route132/header.s create mode 100644 data/maps/Route133/connections.inc delete mode 100644 data/maps/Route133/connections.s create mode 100644 data/maps/Route133/header.inc delete mode 100644 data/maps/Route133/header.s create mode 100644 data/maps/Route134/connections.inc delete mode 100644 data/maps/Route134/connections.s create mode 100644 data/maps/Route134/header.inc delete mode 100644 data/maps/Route134/header.s create mode 100644 data/maps/RustboroCity/connections.inc delete mode 100644 data/maps/RustboroCity/connections.s create mode 100644 data/maps/RustboroCity/header.inc delete mode 100644 data/maps/RustboroCity/header.s create mode 100644 data/maps/RustboroCity_CuttersHouse/header.inc delete mode 100644 data/maps/RustboroCity_CuttersHouse/header.s create mode 100644 data/maps/RustboroCity_DevonCorp_1F/header.inc delete mode 100644 data/maps/RustboroCity_DevonCorp_1F/header.s create mode 100644 data/maps/RustboroCity_DevonCorp_2F/header.inc delete mode 100644 data/maps/RustboroCity_DevonCorp_2F/header.s create mode 100644 data/maps/RustboroCity_DevonCorp_3F/header.inc delete mode 100644 data/maps/RustboroCity_DevonCorp_3F/header.s create mode 100644 data/maps/RustboroCity_Flat1_1F/header.inc delete mode 100644 data/maps/RustboroCity_Flat1_1F/header.s create mode 100644 data/maps/RustboroCity_Flat1_2F/header.inc delete mode 100644 data/maps/RustboroCity_Flat1_2F/header.s create mode 100644 data/maps/RustboroCity_Flat2_1F/header.inc delete mode 100644 data/maps/RustboroCity_Flat2_1F/header.s create mode 100644 data/maps/RustboroCity_Flat2_2F/header.inc delete mode 100644 data/maps/RustboroCity_Flat2_2F/header.s create mode 100644 data/maps/RustboroCity_Flat2_3F/header.inc delete mode 100644 data/maps/RustboroCity_Flat2_3F/header.s create mode 100644 data/maps/RustboroCity_Gym/header.inc delete mode 100644 data/maps/RustboroCity_Gym/header.s create mode 100644 data/maps/RustboroCity_House1/header.inc delete mode 100644 data/maps/RustboroCity_House1/header.s create mode 100644 data/maps/RustboroCity_House2/header.inc delete mode 100644 data/maps/RustboroCity_House2/header.s create mode 100644 data/maps/RustboroCity_House3/header.inc delete mode 100644 data/maps/RustboroCity_House3/header.s create mode 100644 data/maps/RustboroCity_Mart/header.inc delete mode 100644 data/maps/RustboroCity_Mart/header.s create mode 100644 data/maps/RustboroCity_PokemonCenter_1F/header.inc delete mode 100644 data/maps/RustboroCity_PokemonCenter_1F/header.s create mode 100644 data/maps/RustboroCity_PokemonCenter_2F/header.inc delete mode 100644 data/maps/RustboroCity_PokemonCenter_2F/header.s create mode 100644 data/maps/RustboroCity_PokemonSchool/header.inc delete mode 100644 data/maps/RustboroCity_PokemonSchool/header.s create mode 100644 data/maps/RusturfTunnel/header.inc delete mode 100644 data/maps/RusturfTunnel/header.s create mode 100644 data/maps/SSTidalCorridor/header.inc delete mode 100644 data/maps/SSTidalCorridor/header.s create mode 100644 data/maps/SSTidalLowerDeck/header.inc delete mode 100644 data/maps/SSTidalLowerDeck/header.s create mode 100644 data/maps/SSTidalRooms/header.inc delete mode 100644 data/maps/SSTidalRooms/header.s create mode 100644 data/maps/SafariZone_Northeast/connections.inc delete mode 100644 data/maps/SafariZone_Northeast/connections.s create mode 100644 data/maps/SafariZone_Northeast/header.inc delete mode 100644 data/maps/SafariZone_Northeast/header.s create mode 100644 data/maps/SafariZone_Northwest/connections.inc delete mode 100644 data/maps/SafariZone_Northwest/connections.s create mode 100644 data/maps/SafariZone_Northwest/header.inc delete mode 100644 data/maps/SafariZone_Northwest/header.s create mode 100644 data/maps/SafariZone_RestHouse/header.inc delete mode 100644 data/maps/SafariZone_RestHouse/header.s create mode 100644 data/maps/SafariZone_Southeast/connections.inc delete mode 100644 data/maps/SafariZone_Southeast/connections.s create mode 100644 data/maps/SafariZone_Southeast/header.inc delete mode 100644 data/maps/SafariZone_Southeast/header.s create mode 100644 data/maps/SafariZone_Southwest/connections.inc delete mode 100644 data/maps/SafariZone_Southwest/connections.s create mode 100644 data/maps/SafariZone_Southwest/header.inc delete mode 100644 data/maps/SafariZone_Southwest/header.s create mode 100644 data/maps/ScorchedSlab/header.inc delete mode 100644 data/maps/ScorchedSlab/header.s create mode 100644 data/maps/SeafloorCavern_Entrance/header.inc delete mode 100644 data/maps/SeafloorCavern_Entrance/header.s create mode 100644 data/maps/SeafloorCavern_Room1/header.inc delete mode 100644 data/maps/SeafloorCavern_Room1/header.s create mode 100644 data/maps/SeafloorCavern_Room2/header.inc delete mode 100644 data/maps/SeafloorCavern_Room2/header.s create mode 100644 data/maps/SeafloorCavern_Room3/header.inc delete mode 100644 data/maps/SeafloorCavern_Room3/header.s create mode 100644 data/maps/SeafloorCavern_Room4/header.inc delete mode 100644 data/maps/SeafloorCavern_Room4/header.s create mode 100644 data/maps/SeafloorCavern_Room5/header.inc delete mode 100644 data/maps/SeafloorCavern_Room5/header.s create mode 100644 data/maps/SeafloorCavern_Room6/header.inc delete mode 100644 data/maps/SeafloorCavern_Room6/header.s create mode 100644 data/maps/SeafloorCavern_Room7/header.inc delete mode 100644 data/maps/SeafloorCavern_Room7/header.s create mode 100644 data/maps/SeafloorCavern_Room8/header.inc delete mode 100644 data/maps/SeafloorCavern_Room8/header.s create mode 100644 data/maps/SeafloorCavern_Room9/header.inc delete mode 100644 data/maps/SeafloorCavern_Room9/header.s create mode 100644 data/maps/SealedChamber_InnerRoom/header.inc delete mode 100644 data/maps/SealedChamber_InnerRoom/header.s create mode 100644 data/maps/SealedChamber_OuterRoom/header.inc delete mode 100644 data/maps/SealedChamber_OuterRoom/header.s create mode 100644 data/maps/SecretBase_BlueCave1/header.inc delete mode 100644 data/maps/SecretBase_BlueCave1/header.s create mode 100644 data/maps/SecretBase_BlueCave2/header.inc delete mode 100644 data/maps/SecretBase_BlueCave2/header.s create mode 100644 data/maps/SecretBase_BlueCave3/header.inc delete mode 100644 data/maps/SecretBase_BlueCave3/header.s create mode 100644 data/maps/SecretBase_BlueCave4/header.inc delete mode 100644 data/maps/SecretBase_BlueCave4/header.s create mode 100644 data/maps/SecretBase_BrownCave1/header.inc delete mode 100644 data/maps/SecretBase_BrownCave1/header.s create mode 100644 data/maps/SecretBase_BrownCave2/header.inc delete mode 100644 data/maps/SecretBase_BrownCave2/header.s create mode 100644 data/maps/SecretBase_BrownCave3/header.inc delete mode 100644 data/maps/SecretBase_BrownCave3/header.s create mode 100644 data/maps/SecretBase_BrownCave4/header.inc delete mode 100644 data/maps/SecretBase_BrownCave4/header.s create mode 100644 data/maps/SecretBase_RedCave1/header.inc delete mode 100644 data/maps/SecretBase_RedCave1/header.s create mode 100644 data/maps/SecretBase_RedCave2/header.inc delete mode 100644 data/maps/SecretBase_RedCave2/header.s create mode 100644 data/maps/SecretBase_RedCave3/header.inc delete mode 100644 data/maps/SecretBase_RedCave3/header.s create mode 100644 data/maps/SecretBase_RedCave4/header.inc delete mode 100644 data/maps/SecretBase_RedCave4/header.s create mode 100644 data/maps/SecretBase_Shrub1/header.inc delete mode 100644 data/maps/SecretBase_Shrub1/header.s create mode 100644 data/maps/SecretBase_Shrub2/header.inc delete mode 100644 data/maps/SecretBase_Shrub2/header.s create mode 100644 data/maps/SecretBase_Shrub3/header.inc delete mode 100644 data/maps/SecretBase_Shrub3/header.s create mode 100644 data/maps/SecretBase_Shrub4/header.inc delete mode 100644 data/maps/SecretBase_Shrub4/header.s create mode 100644 data/maps/SecretBase_Tree1/header.inc delete mode 100644 data/maps/SecretBase_Tree1/header.s create mode 100644 data/maps/SecretBase_Tree2/header.inc delete mode 100644 data/maps/SecretBase_Tree2/header.s create mode 100644 data/maps/SecretBase_Tree3/header.inc delete mode 100644 data/maps/SecretBase_Tree3/header.s create mode 100644 data/maps/SecretBase_Tree4/header.inc delete mode 100644 data/maps/SecretBase_Tree4/header.s create mode 100644 data/maps/SecretBase_YellowCave1/header.inc delete mode 100644 data/maps/SecretBase_YellowCave1/header.s create mode 100644 data/maps/SecretBase_YellowCave2/header.inc delete mode 100644 data/maps/SecretBase_YellowCave2/header.s create mode 100644 data/maps/SecretBase_YellowCave3/header.inc delete mode 100644 data/maps/SecretBase_YellowCave3/header.s create mode 100644 data/maps/SecretBase_YellowCave4/header.inc delete mode 100644 data/maps/SecretBase_YellowCave4/header.s create mode 100644 data/maps/ShoalCave_HighTideEntranceRoom/header.inc delete mode 100644 data/maps/ShoalCave_HighTideEntranceRoom/header.s create mode 100644 data/maps/ShoalCave_HighTideInnerRoom/header.inc delete mode 100644 data/maps/ShoalCave_HighTideInnerRoom/header.s create mode 100644 data/maps/ShoalCave_LowTideEntranceRoom/header.inc delete mode 100644 data/maps/ShoalCave_LowTideEntranceRoom/header.s create mode 100644 data/maps/ShoalCave_LowTideIceRoom/header.inc delete mode 100644 data/maps/ShoalCave_LowTideIceRoom/header.s create mode 100644 data/maps/ShoalCave_LowTideInnerRoom/header.inc delete mode 100644 data/maps/ShoalCave_LowTideInnerRoom/header.s create mode 100644 data/maps/ShoalCave_LowTideLowerRoom/header.inc delete mode 100644 data/maps/ShoalCave_LowTideLowerRoom/header.s create mode 100644 data/maps/ShoalCave_LowTideStairsRoom/header.inc delete mode 100644 data/maps/ShoalCave_LowTideStairsRoom/header.s create mode 100644 data/maps/SingleBattleColosseum/header.inc delete mode 100644 data/maps/SingleBattleColosseum/header.s create mode 100644 data/maps/SkyPillar_1F/header.inc delete mode 100644 data/maps/SkyPillar_1F/header.s create mode 100644 data/maps/SkyPillar_2F/header.inc delete mode 100644 data/maps/SkyPillar_2F/header.s create mode 100644 data/maps/SkyPillar_3F/header.inc delete mode 100644 data/maps/SkyPillar_3F/header.s create mode 100644 data/maps/SkyPillar_4F/header.inc delete mode 100644 data/maps/SkyPillar_4F/header.s create mode 100644 data/maps/SkyPillar_5F/header.inc delete mode 100644 data/maps/SkyPillar_5F/header.s create mode 100644 data/maps/SkyPillar_Entrance/header.inc delete mode 100644 data/maps/SkyPillar_Entrance/header.s create mode 100644 data/maps/SkyPillar_Outside/header.inc delete mode 100644 data/maps/SkyPillar_Outside/header.s create mode 100644 data/maps/SkyPillar_Top/header.inc delete mode 100644 data/maps/SkyPillar_Top/header.s create mode 100644 data/maps/SlateportCity/connections.inc delete mode 100644 data/maps/SlateportCity/connections.s create mode 100644 data/maps/SlateportCity/header.inc delete mode 100644 data/maps/SlateportCity/header.s create mode 100644 data/maps/SlateportCity_ContestHall/header.inc delete mode 100644 data/maps/SlateportCity_ContestHall/header.s create mode 100644 data/maps/SlateportCity_ContestLobby/header.inc delete mode 100644 data/maps/SlateportCity_ContestLobby/header.s create mode 100644 data/maps/SlateportCity_Harbor/header.inc delete mode 100644 data/maps/SlateportCity_Harbor/header.s create mode 100644 data/maps/SlateportCity_House1/header.inc delete mode 100644 data/maps/SlateportCity_House1/header.s create mode 100644 data/maps/SlateportCity_House2/header.inc delete mode 100644 data/maps/SlateportCity_House2/header.s create mode 100644 data/maps/SlateportCity_Mart/header.inc delete mode 100644 data/maps/SlateportCity_Mart/header.s create mode 100644 data/maps/SlateportCity_OceanicMuseum_1F/header.inc delete mode 100644 data/maps/SlateportCity_OceanicMuseum_1F/header.s create mode 100644 data/maps/SlateportCity_OceanicMuseum_2F/header.inc delete mode 100644 data/maps/SlateportCity_OceanicMuseum_2F/header.s create mode 100644 data/maps/SlateportCity_PokemonCenter_1F/header.inc delete mode 100644 data/maps/SlateportCity_PokemonCenter_1F/header.s create mode 100644 data/maps/SlateportCity_PokemonCenter_2F/header.inc delete mode 100644 data/maps/SlateportCity_PokemonCenter_2F/header.s create mode 100644 data/maps/SlateportCity_PokemonFanClub/header.inc delete mode 100644 data/maps/SlateportCity_PokemonFanClub/header.s create mode 100644 data/maps/SlateportCity_SternsShipyard_1F/header.inc delete mode 100644 data/maps/SlateportCity_SternsShipyard_1F/header.s create mode 100644 data/maps/SlateportCity_SternsShipyard_2F/header.inc delete mode 100644 data/maps/SlateportCity_SternsShipyard_2F/header.s create mode 100644 data/maps/SootopolisCity/connections.inc delete mode 100644 data/maps/SootopolisCity/connections.s create mode 100644 data/maps/SootopolisCity/header.inc delete mode 100644 data/maps/SootopolisCity/header.s create mode 100644 data/maps/SootopolisCity_Gym_1F/header.inc delete mode 100644 data/maps/SootopolisCity_Gym_1F/header.s create mode 100644 data/maps/SootopolisCity_Gym_B1F/header.inc delete mode 100644 data/maps/SootopolisCity_Gym_B1F/header.s create mode 100644 data/maps/SootopolisCity_House1/header.inc delete mode 100644 data/maps/SootopolisCity_House1/header.s create mode 100644 data/maps/SootopolisCity_House2/header.inc delete mode 100644 data/maps/SootopolisCity_House2/header.s create mode 100644 data/maps/SootopolisCity_House3/header.inc delete mode 100644 data/maps/SootopolisCity_House3/header.s create mode 100644 data/maps/SootopolisCity_House4/header.inc delete mode 100644 data/maps/SootopolisCity_House4/header.s create mode 100644 data/maps/SootopolisCity_House5/header.inc delete mode 100644 data/maps/SootopolisCity_House5/header.s create mode 100644 data/maps/SootopolisCity_House6/header.inc delete mode 100644 data/maps/SootopolisCity_House6/header.s create mode 100644 data/maps/SootopolisCity_House7/header.inc delete mode 100644 data/maps/SootopolisCity_House7/header.s create mode 100644 data/maps/SootopolisCity_House8/header.inc delete mode 100644 data/maps/SootopolisCity_House8/header.s create mode 100644 data/maps/SootopolisCity_Mart/header.inc delete mode 100644 data/maps/SootopolisCity_Mart/header.s create mode 100644 data/maps/SootopolisCity_PokemonCenter_1F/header.inc delete mode 100644 data/maps/SootopolisCity_PokemonCenter_1F/header.s create mode 100644 data/maps/SootopolisCity_PokemonCenter_2F/header.inc delete mode 100644 data/maps/SootopolisCity_PokemonCenter_2F/header.s create mode 100644 data/maps/SouthernIsland_Exterior/header.inc delete mode 100644 data/maps/SouthernIsland_Exterior/header.s create mode 100644 data/maps/SouthernIsland_Interior/header.inc delete mode 100644 data/maps/SouthernIsland_Interior/header.s create mode 100644 data/maps/TradeCenter/header.inc delete mode 100644 data/maps/TradeCenter/header.s create mode 100644 data/maps/Underwater1/connections.inc delete mode 100644 data/maps/Underwater1/connections.s create mode 100644 data/maps/Underwater1/header.inc delete mode 100644 data/maps/Underwater1/header.s create mode 100644 data/maps/Underwater2/connections.inc delete mode 100644 data/maps/Underwater2/connections.s create mode 100644 data/maps/Underwater2/header.inc delete mode 100644 data/maps/Underwater2/header.s create mode 100644 data/maps/Underwater3/connections.inc delete mode 100644 data/maps/Underwater3/connections.s create mode 100644 data/maps/Underwater3/header.inc delete mode 100644 data/maps/Underwater3/header.s create mode 100644 data/maps/Underwater4/connections.inc delete mode 100644 data/maps/Underwater4/connections.s create mode 100644 data/maps/Underwater4/header.inc delete mode 100644 data/maps/Underwater4/header.s create mode 100644 data/maps/Underwater_Route134/header.inc delete mode 100644 data/maps/Underwater_Route134/header.s create mode 100644 data/maps/Underwater_SeafloorCavern/header.inc delete mode 100644 data/maps/Underwater_SeafloorCavern/header.s create mode 100644 data/maps/Underwater_SealedChamber/header.inc delete mode 100644 data/maps/Underwater_SealedChamber/header.s create mode 100644 data/maps/Underwater_SootopolisCity/header.inc delete mode 100644 data/maps/Underwater_SootopolisCity/header.s create mode 100644 data/maps/UnknownMap_25_29/header.inc delete mode 100644 data/maps/UnknownMap_25_29/header.s create mode 100644 data/maps/UnknownMap_25_30/header.inc delete mode 100644 data/maps/UnknownMap_25_30/header.s create mode 100644 data/maps/UnknownMap_25_31/header.inc delete mode 100644 data/maps/UnknownMap_25_31/header.s create mode 100644 data/maps/UnknownMap_25_32/header.inc delete mode 100644 data/maps/UnknownMap_25_32/header.s create mode 100644 data/maps/UnknownMap_25_33/header.inc delete mode 100644 data/maps/UnknownMap_25_33/header.s create mode 100644 data/maps/UnknownMap_25_34/header.inc delete mode 100644 data/maps/UnknownMap_25_34/header.s create mode 100644 data/maps/VerdanturfTown/connections.inc delete mode 100644 data/maps/VerdanturfTown/connections.s create mode 100644 data/maps/VerdanturfTown/header.inc delete mode 100644 data/maps/VerdanturfTown/header.s create mode 100644 data/maps/VerdanturfTown_ContestHall/header.inc delete mode 100644 data/maps/VerdanturfTown_ContestHall/header.s create mode 100644 data/maps/VerdanturfTown_ContestLobby/header.inc delete mode 100644 data/maps/VerdanturfTown_ContestLobby/header.s create mode 100644 data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc delete mode 100644 data/maps/VerdanturfTown_FriendshipRatersHouse/header.s create mode 100644 data/maps/VerdanturfTown_House/header.inc delete mode 100644 data/maps/VerdanturfTown_House/header.s create mode 100644 data/maps/VerdanturfTown_Mart/header.inc delete mode 100644 data/maps/VerdanturfTown_Mart/header.s create mode 100644 data/maps/VerdanturfTown_PokemonCenter_1F/header.inc delete mode 100644 data/maps/VerdanturfTown_PokemonCenter_1F/header.s create mode 100644 data/maps/VerdanturfTown_PokemonCenter_2F/header.inc delete mode 100644 data/maps/VerdanturfTown_PokemonCenter_2F/header.s create mode 100644 data/maps/VerdanturfTown_WandasHouse/header.inc delete mode 100644 data/maps/VerdanturfTown_WandasHouse/header.s create mode 100644 data/maps/VictoryRoad_1F/header.inc delete mode 100644 data/maps/VictoryRoad_1F/header.s create mode 100644 data/maps/VictoryRoad_B1F/header.inc delete mode 100644 data/maps/VictoryRoad_B1F/header.s create mode 100644 data/maps/VictoryRoad_B2F/header.inc delete mode 100644 data/maps/VictoryRoad_B2F/header.s create mode 100644 data/text/easy_chat/groups/actions/order.inc delete mode 100644 data/text/easy_chat/groups/actions/order.s create mode 100644 data/text/easy_chat/groups/actions/words.inc delete mode 100644 data/text/easy_chat/groups/actions/words.s create mode 100644 data/text/easy_chat/groups/adjectives/order.inc delete mode 100644 data/text/easy_chat/groups/adjectives/order.s create mode 100644 data/text/easy_chat/groups/adjectives/words.inc delete mode 100644 data/text/easy_chat/groups/adjectives/words.s create mode 100644 data/text/easy_chat/groups/battle/order.inc delete mode 100644 data/text/easy_chat/groups/battle/order.s create mode 100644 data/text/easy_chat/groups/battle/words.inc delete mode 100644 data/text/easy_chat/groups/battle/words.s create mode 100644 data/text/easy_chat/groups/conditions/order.inc delete mode 100644 data/text/easy_chat/groups/conditions/order.s create mode 100644 data/text/easy_chat/groups/conditions/words.inc delete mode 100644 data/text/easy_chat/groups/conditions/words.s create mode 100644 data/text/easy_chat/groups/endings/order.inc delete mode 100644 data/text/easy_chat/groups/endings/order.s create mode 100644 data/text/easy_chat/groups/endings/words.inc delete mode 100644 data/text/easy_chat/groups/endings/words.s create mode 100644 data/text/easy_chat/groups/events/order.inc delete mode 100644 data/text/easy_chat/groups/events/order.s create mode 100644 data/text/easy_chat/groups/events/words.inc delete mode 100644 data/text/easy_chat/groups/events/words.s create mode 100644 data/text/easy_chat/groups/feelings/order.inc delete mode 100644 data/text/easy_chat/groups/feelings/order.s create mode 100644 data/text/easy_chat/groups/feelings/words.inc delete mode 100644 data/text/easy_chat/groups/feelings/words.s create mode 100644 data/text/easy_chat/groups/greetings/order.inc delete mode 100644 data/text/easy_chat/groups/greetings/order.s create mode 100644 data/text/easy_chat/groups/greetings/words.inc delete mode 100644 data/text/easy_chat/groups/greetings/words.s create mode 100644 data/text/easy_chat/groups/hobbies/order.inc delete mode 100644 data/text/easy_chat/groups/hobbies/order.s create mode 100644 data/text/easy_chat/groups/hobbies/words.inc delete mode 100644 data/text/easy_chat/groups/hobbies/words.s create mode 100644 data/text/easy_chat/groups/lifestyle/order.inc delete mode 100644 data/text/easy_chat/groups/lifestyle/order.s create mode 100644 data/text/easy_chat/groups/lifestyle/words.inc delete mode 100644 data/text/easy_chat/groups/lifestyle/words.s create mode 100644 data/text/easy_chat/groups/misc/order.inc delete mode 100644 data/text/easy_chat/groups/misc/order.s create mode 100644 data/text/easy_chat/groups/misc/words.inc delete mode 100644 data/text/easy_chat/groups/misc/words.s create mode 100644 data/text/easy_chat/groups/move_1/order.inc delete mode 100644 data/text/easy_chat/groups/move_1/order.s create mode 100644 data/text/easy_chat/groups/move_1/words.inc delete mode 100644 data/text/easy_chat/groups/move_1/words.s create mode 100644 data/text/easy_chat/groups/move_2/order.inc delete mode 100644 data/text/easy_chat/groups/move_2/order.s create mode 100644 data/text/easy_chat/groups/move_2/words.inc delete mode 100644 data/text/easy_chat/groups/move_2/words.s create mode 100644 data/text/easy_chat/groups/people/order.inc delete mode 100644 data/text/easy_chat/groups/people/order.s create mode 100644 data/text/easy_chat/groups/people/words.inc delete mode 100644 data/text/easy_chat/groups/people/words.s create mode 100644 data/text/easy_chat/groups/pokemon/order.inc delete mode 100644 data/text/easy_chat/groups/pokemon/order.s create mode 100644 data/text/easy_chat/groups/pokemon/words.inc delete mode 100644 data/text/easy_chat/groups/pokemon/words.s create mode 100644 data/text/easy_chat/groups/pokemon_2/order.inc delete mode 100644 data/text/easy_chat/groups/pokemon_2/order.s create mode 100644 data/text/easy_chat/groups/pokemon_2/words.inc delete mode 100644 data/text/easy_chat/groups/pokemon_2/words.s create mode 100644 data/text/easy_chat/groups/speech/order.inc delete mode 100644 data/text/easy_chat/groups/speech/order.s create mode 100644 data/text/easy_chat/groups/speech/words.inc delete mode 100644 data/text/easy_chat/groups/speech/words.s create mode 100644 data/text/easy_chat/groups/status/order.inc delete mode 100644 data/text/easy_chat/groups/status/order.s create mode 100644 data/text/easy_chat/groups/status/words.inc delete mode 100644 data/text/easy_chat/groups/status/words.s create mode 100644 data/text/easy_chat/groups/time/order.inc delete mode 100644 data/text/easy_chat/groups/time/order.s create mode 100644 data/text/easy_chat/groups/time/words.inc delete mode 100644 data/text/easy_chat/groups/time/words.s create mode 100644 data/text/easy_chat/groups/trainer/order.inc delete mode 100644 data/text/easy_chat/groups/trainer/order.s create mode 100644 data/text/easy_chat/groups/trainer/words.inc delete mode 100644 data/text/easy_chat/groups/trainer/words.s create mode 100644 data/text/easy_chat/groups/trendy_saying/order.inc delete mode 100644 data/text/easy_chat/groups/trendy_saying/order.s create mode 100644 data/text/easy_chat/groups/trendy_saying/words.inc delete mode 100644 data/text/easy_chat/groups/trendy_saying/words.s create mode 100644 data/text/easy_chat/groups/voices/order.inc delete mode 100644 data/text/easy_chat/groups/voices/order.s create mode 100644 data/text/easy_chat/groups/voices/words.inc delete mode 100644 data/text/easy_chat/groups/voices/words.s create mode 100644 data/text/gabby_and_ty.inc delete mode 100644 data/text/gabby_and_ty.s create mode 100644 data/text/pokemon_news.inc delete mode 100644 data/text/pokemon_news.s diff --git a/data/experience_tables/erratic_growth_rate.inc b/data/experience_tables/erratic_growth_rate.inc new file mode 100644 index 000000000..d3a455a9f --- /dev/null +++ b/data/experience_tables/erratic_growth_rate.inc @@ -0,0 +1,101 @@ + .4byte 0 @ 0 + .4byte 1 @ 1 + .4byte 15 @ 2 + .4byte 52 @ 3 + .4byte 122 @ 4 + .4byte 237 @ 5 + .4byte 406 @ 6 + .4byte 637 @ 7 + .4byte 942 @ 8 + .4byte 1326 @ 9 + .4byte 1800 @ 10 + .4byte 2369 @ 11 + .4byte 3041 @ 12 + .4byte 3822 @ 13 + .4byte 4719 @ 14 + .4byte 5737 @ 15 + .4byte 6881 @ 16 + .4byte 8155 @ 17 + .4byte 9564 @ 18 + .4byte 11111 @ 19 + .4byte 12800 @ 20 + .4byte 14632 @ 21 + .4byte 16610 @ 22 + .4byte 18737 @ 23 + .4byte 21012 @ 24 + .4byte 23437 @ 25 + .4byte 26012 @ 26 + .4byte 28737 @ 27 + .4byte 31610 @ 28 + .4byte 34632 @ 29 + .4byte 37800 @ 30 + .4byte 41111 @ 31 + .4byte 44564 @ 32 + .4byte 48155 @ 33 + .4byte 51881 @ 34 + .4byte 55737 @ 35 + .4byte 59719 @ 36 + .4byte 63822 @ 37 + .4byte 68041 @ 38 + .4byte 72369 @ 39 + .4byte 76800 @ 40 + .4byte 81326 @ 41 + .4byte 85942 @ 42 + .4byte 90637 @ 43 + .4byte 95406 @ 44 + .4byte 100237 @ 45 + .4byte 105122 @ 46 + .4byte 110052 @ 47 + .4byte 115015 @ 48 + .4byte 120001 @ 49 + .4byte 125000 @ 50 + .4byte 131324 @ 51 + .4byte 137795 @ 52 + .4byte 144410 @ 53 + .4byte 151165 @ 54 + .4byte 158056 @ 55 + .4byte 165079 @ 56 + .4byte 172229 @ 57 + .4byte 179503 @ 58 + .4byte 186894 @ 59 + .4byte 194400 @ 60 + .4byte 202013 @ 61 + .4byte 209728 @ 62 + .4byte 217540 @ 63 + .4byte 225443 @ 64 + .4byte 233431 @ 65 + .4byte 241496 @ 66 + .4byte 249633 @ 67 + .4byte 257834 @ 68 + .4byte 267406 @ 69 + .4byte 276458 @ 70 + .4byte 286328 @ 71 + .4byte 296358 @ 72 + .4byte 305767 @ 73 + .4byte 316074 @ 74 + .4byte 326531 @ 75 + .4byte 336255 @ 76 + .4byte 346965 @ 77 + .4byte 357812 @ 78 + .4byte 367807 @ 79 + .4byte 378880 @ 80 + .4byte 390077 @ 81 + .4byte 400293 @ 82 + .4byte 411686 @ 83 + .4byte 423190 @ 84 + .4byte 433572 @ 85 + .4byte 445239 @ 86 + .4byte 457001 @ 87 + .4byte 467489 @ 88 + .4byte 479378 @ 89 + .4byte 491346 @ 90 + .4byte 501878 @ 91 + .4byte 513934 @ 92 + .4byte 526049 @ 93 + .4byte 536557 @ 94 + .4byte 548720 @ 95 + .4byte 560922 @ 96 + .4byte 571333 @ 97 + .4byte 583539 @ 98 + .4byte 591882 @ 99 + .4byte 600000 @ 100 diff --git a/data/experience_tables/erratic_growth_rate.s b/data/experience_tables/erratic_growth_rate.s deleted file mode 100644 index d3a455a9f..000000000 --- a/data/experience_tables/erratic_growth_rate.s +++ /dev/null @@ -1,101 +0,0 @@ - .4byte 0 @ 0 - .4byte 1 @ 1 - .4byte 15 @ 2 - .4byte 52 @ 3 - .4byte 122 @ 4 - .4byte 237 @ 5 - .4byte 406 @ 6 - .4byte 637 @ 7 - .4byte 942 @ 8 - .4byte 1326 @ 9 - .4byte 1800 @ 10 - .4byte 2369 @ 11 - .4byte 3041 @ 12 - .4byte 3822 @ 13 - .4byte 4719 @ 14 - .4byte 5737 @ 15 - .4byte 6881 @ 16 - .4byte 8155 @ 17 - .4byte 9564 @ 18 - .4byte 11111 @ 19 - .4byte 12800 @ 20 - .4byte 14632 @ 21 - .4byte 16610 @ 22 - .4byte 18737 @ 23 - .4byte 21012 @ 24 - .4byte 23437 @ 25 - .4byte 26012 @ 26 - .4byte 28737 @ 27 - .4byte 31610 @ 28 - .4byte 34632 @ 29 - .4byte 37800 @ 30 - .4byte 41111 @ 31 - .4byte 44564 @ 32 - .4byte 48155 @ 33 - .4byte 51881 @ 34 - .4byte 55737 @ 35 - .4byte 59719 @ 36 - .4byte 63822 @ 37 - .4byte 68041 @ 38 - .4byte 72369 @ 39 - .4byte 76800 @ 40 - .4byte 81326 @ 41 - .4byte 85942 @ 42 - .4byte 90637 @ 43 - .4byte 95406 @ 44 - .4byte 100237 @ 45 - .4byte 105122 @ 46 - .4byte 110052 @ 47 - .4byte 115015 @ 48 - .4byte 120001 @ 49 - .4byte 125000 @ 50 - .4byte 131324 @ 51 - .4byte 137795 @ 52 - .4byte 144410 @ 53 - .4byte 151165 @ 54 - .4byte 158056 @ 55 - .4byte 165079 @ 56 - .4byte 172229 @ 57 - .4byte 179503 @ 58 - .4byte 186894 @ 59 - .4byte 194400 @ 60 - .4byte 202013 @ 61 - .4byte 209728 @ 62 - .4byte 217540 @ 63 - .4byte 225443 @ 64 - .4byte 233431 @ 65 - .4byte 241496 @ 66 - .4byte 249633 @ 67 - .4byte 257834 @ 68 - .4byte 267406 @ 69 - .4byte 276458 @ 70 - .4byte 286328 @ 71 - .4byte 296358 @ 72 - .4byte 305767 @ 73 - .4byte 316074 @ 74 - .4byte 326531 @ 75 - .4byte 336255 @ 76 - .4byte 346965 @ 77 - .4byte 357812 @ 78 - .4byte 367807 @ 79 - .4byte 378880 @ 80 - .4byte 390077 @ 81 - .4byte 400293 @ 82 - .4byte 411686 @ 83 - .4byte 423190 @ 84 - .4byte 433572 @ 85 - .4byte 445239 @ 86 - .4byte 457001 @ 87 - .4byte 467489 @ 88 - .4byte 479378 @ 89 - .4byte 491346 @ 90 - .4byte 501878 @ 91 - .4byte 513934 @ 92 - .4byte 526049 @ 93 - .4byte 536557 @ 94 - .4byte 548720 @ 95 - .4byte 560922 @ 96 - .4byte 571333 @ 97 - .4byte 583539 @ 98 - .4byte 591882 @ 99 - .4byte 600000 @ 100 diff --git a/data/experience_tables/fast_growth_rate.inc b/data/experience_tables/fast_growth_rate.inc new file mode 100644 index 000000000..d8675fdc0 --- /dev/null +++ b/data/experience_tables/fast_growth_rate.inc @@ -0,0 +1,101 @@ + .4byte 0 @ 0 + .4byte 1 @ 1 + .4byte 6 @ 2 + .4byte 21 @ 3 + .4byte 51 @ 4 + .4byte 100 @ 5 + .4byte 172 @ 6 + .4byte 274 @ 7 + .4byte 409 @ 8 + .4byte 583 @ 9 + .4byte 800 @ 10 + .4byte 1064 @ 11 + .4byte 1382 @ 12 + .4byte 1757 @ 13 + .4byte 2195 @ 14 + .4byte 2700 @ 15 + .4byte 3276 @ 16 + .4byte 3930 @ 17 + .4byte 4665 @ 18 + .4byte 5487 @ 19 + .4byte 6400 @ 20 + .4byte 7408 @ 21 + .4byte 8518 @ 22 + .4byte 9733 @ 23 + .4byte 11059 @ 24 + .4byte 12500 @ 25 + .4byte 14060 @ 26 + .4byte 15746 @ 27 + .4byte 17561 @ 28 + .4byte 19511 @ 29 + .4byte 21600 @ 30 + .4byte 23832 @ 31 + .4byte 26214 @ 32 + .4byte 28749 @ 33 + .4byte 31443 @ 34 + .4byte 34300 @ 35 + .4byte 37324 @ 36 + .4byte 40522 @ 37 + .4byte 43897 @ 38 + .4byte 47455 @ 39 + .4byte 51200 @ 40 + .4byte 55136 @ 41 + .4byte 59270 @ 42 + .4byte 63605 @ 43 + .4byte 68147 @ 44 + .4byte 72900 @ 45 + .4byte 77868 @ 46 + .4byte 83058 @ 47 + .4byte 88473 @ 48 + .4byte 94119 @ 49 + .4byte 100000 @ 50 + .4byte 106120 @ 51 + .4byte 112486 @ 52 + .4byte 119101 @ 53 + .4byte 125971 @ 54 + .4byte 133100 @ 55 + .4byte 140492 @ 56 + .4byte 148154 @ 57 + .4byte 156089 @ 58 + .4byte 164303 @ 59 + .4byte 172800 @ 60 + .4byte 181584 @ 61 + .4byte 190662 @ 62 + .4byte 200037 @ 63 + .4byte 209715 @ 64 + .4byte 219700 @ 65 + .4byte 229996 @ 66 + .4byte 240610 @ 67 + .4byte 251545 @ 68 + .4byte 262807 @ 69 + .4byte 274400 @ 70 + .4byte 286328 @ 71 + .4byte 298598 @ 72 + .4byte 311213 @ 73 + .4byte 324179 @ 74 + .4byte 337500 @ 75 + .4byte 351180 @ 76 + .4byte 365226 @ 77 + .4byte 379641 @ 78 + .4byte 394431 @ 79 + .4byte 409600 @ 80 + .4byte 425152 @ 81 + .4byte 441094 @ 82 + .4byte 457429 @ 83 + .4byte 474163 @ 84 + .4byte 491300 @ 85 + .4byte 508844 @ 86 + .4byte 526802 @ 87 + .4byte 545177 @ 88 + .4byte 563975 @ 89 + .4byte 583200 @ 90 + .4byte 602856 @ 91 + .4byte 622950 @ 92 + .4byte 643485 @ 93 + .4byte 664467 @ 94 + .4byte 685900 @ 95 + .4byte 707788 @ 96 + .4byte 730138 @ 97 + .4byte 752953 @ 98 + .4byte 776239 @ 99 + .4byte 800000 @ 100 diff --git a/data/experience_tables/fast_growth_rate.s b/data/experience_tables/fast_growth_rate.s deleted file mode 100644 index d8675fdc0..000000000 --- a/data/experience_tables/fast_growth_rate.s +++ /dev/null @@ -1,101 +0,0 @@ - .4byte 0 @ 0 - .4byte 1 @ 1 - .4byte 6 @ 2 - .4byte 21 @ 3 - .4byte 51 @ 4 - .4byte 100 @ 5 - .4byte 172 @ 6 - .4byte 274 @ 7 - .4byte 409 @ 8 - .4byte 583 @ 9 - .4byte 800 @ 10 - .4byte 1064 @ 11 - .4byte 1382 @ 12 - .4byte 1757 @ 13 - .4byte 2195 @ 14 - .4byte 2700 @ 15 - .4byte 3276 @ 16 - .4byte 3930 @ 17 - .4byte 4665 @ 18 - .4byte 5487 @ 19 - .4byte 6400 @ 20 - .4byte 7408 @ 21 - .4byte 8518 @ 22 - .4byte 9733 @ 23 - .4byte 11059 @ 24 - .4byte 12500 @ 25 - .4byte 14060 @ 26 - .4byte 15746 @ 27 - .4byte 17561 @ 28 - .4byte 19511 @ 29 - .4byte 21600 @ 30 - .4byte 23832 @ 31 - .4byte 26214 @ 32 - .4byte 28749 @ 33 - .4byte 31443 @ 34 - .4byte 34300 @ 35 - .4byte 37324 @ 36 - .4byte 40522 @ 37 - .4byte 43897 @ 38 - .4byte 47455 @ 39 - .4byte 51200 @ 40 - .4byte 55136 @ 41 - .4byte 59270 @ 42 - .4byte 63605 @ 43 - .4byte 68147 @ 44 - .4byte 72900 @ 45 - .4byte 77868 @ 46 - .4byte 83058 @ 47 - .4byte 88473 @ 48 - .4byte 94119 @ 49 - .4byte 100000 @ 50 - .4byte 106120 @ 51 - .4byte 112486 @ 52 - .4byte 119101 @ 53 - .4byte 125971 @ 54 - .4byte 133100 @ 55 - .4byte 140492 @ 56 - .4byte 148154 @ 57 - .4byte 156089 @ 58 - .4byte 164303 @ 59 - .4byte 172800 @ 60 - .4byte 181584 @ 61 - .4byte 190662 @ 62 - .4byte 200037 @ 63 - .4byte 209715 @ 64 - .4byte 219700 @ 65 - .4byte 229996 @ 66 - .4byte 240610 @ 67 - .4byte 251545 @ 68 - .4byte 262807 @ 69 - .4byte 274400 @ 70 - .4byte 286328 @ 71 - .4byte 298598 @ 72 - .4byte 311213 @ 73 - .4byte 324179 @ 74 - .4byte 337500 @ 75 - .4byte 351180 @ 76 - .4byte 365226 @ 77 - .4byte 379641 @ 78 - .4byte 394431 @ 79 - .4byte 409600 @ 80 - .4byte 425152 @ 81 - .4byte 441094 @ 82 - .4byte 457429 @ 83 - .4byte 474163 @ 84 - .4byte 491300 @ 85 - .4byte 508844 @ 86 - .4byte 526802 @ 87 - .4byte 545177 @ 88 - .4byte 563975 @ 89 - .4byte 583200 @ 90 - .4byte 602856 @ 91 - .4byte 622950 @ 92 - .4byte 643485 @ 93 - .4byte 664467 @ 94 - .4byte 685900 @ 95 - .4byte 707788 @ 96 - .4byte 730138 @ 97 - .4byte 752953 @ 98 - .4byte 776239 @ 99 - .4byte 800000 @ 100 diff --git a/data/experience_tables/fluctuating_growth_rate.inc b/data/experience_tables/fluctuating_growth_rate.inc new file mode 100644 index 000000000..81a962327 --- /dev/null +++ b/data/experience_tables/fluctuating_growth_rate.inc @@ -0,0 +1,101 @@ + .4byte 0 @ 0 + .4byte 1 @ 1 + .4byte 4 @ 2 + .4byte 13 @ 3 + .4byte 32 @ 4 + .4byte 65 @ 5 + .4byte 112 @ 6 + .4byte 178 @ 7 + .4byte 276 @ 8 + .4byte 393 @ 9 + .4byte 540 @ 10 + .4byte 745 @ 11 + .4byte 967 @ 12 + .4byte 1230 @ 13 + .4byte 1591 @ 14 + .4byte 1957 @ 15 + .4byte 2457 @ 16 + .4byte 3046 @ 17 + .4byte 3732 @ 18 + .4byte 4526 @ 19 + .4byte 5440 @ 20 + .4byte 6482 @ 21 + .4byte 7666 @ 22 + .4byte 9003 @ 23 + .4byte 10506 @ 24 + .4byte 12187 @ 25 + .4byte 14060 @ 26 + .4byte 16140 @ 27 + .4byte 18439 @ 28 + .4byte 20974 @ 29 + .4byte 23760 @ 30 + .4byte 26811 @ 31 + .4byte 30146 @ 32 + .4byte 33780 @ 33 + .4byte 37731 @ 34 + .4byte 42017 @ 35 + .4byte 46656 @ 36 + .4byte 50653 @ 37 + .4byte 55969 @ 38 + .4byte 60505 @ 39 + .4byte 66560 @ 40 + .4byte 71677 @ 41 + .4byte 78533 @ 42 + .4byte 84277 @ 43 + .4byte 91998 @ 44 + .4byte 98415 @ 45 + .4byte 107069 @ 46 + .4byte 114205 @ 47 + .4byte 123863 @ 48 + .4byte 131766 @ 49 + .4byte 142500 @ 50 + .4byte 151222 @ 51 + .4byte 163105 @ 52 + .4byte 172697 @ 53 + .4byte 185807 @ 54 + .4byte 196322 @ 55 + .4byte 210739 @ 56 + .4byte 222231 @ 57 + .4byte 238036 @ 58 + .4byte 250562 @ 59 + .4byte 267840 @ 60 + .4byte 281456 @ 61 + .4byte 300293 @ 62 + .4byte 315059 @ 63 + .4byte 335544 @ 64 + .4byte 351520 @ 65 + .4byte 373744 @ 66 + .4byte 390991 @ 67 + .4byte 415050 @ 68 + .4byte 433631 @ 69 + .4byte 459620 @ 70 + .4byte 479600 @ 71 + .4byte 507617 @ 72 + .4byte 529063 @ 73 + .4byte 559209 @ 74 + .4byte 582187 @ 75 + .4byte 614566 @ 76 + .4byte 639146 @ 77 + .4byte 673863 @ 78 + .4byte 700115 @ 79 + .4byte 737280 @ 80 + .4byte 765275 @ 81 + .4byte 804997 @ 82 + .4byte 834809 @ 83 + .4byte 877201 @ 84 + .4byte 908905 @ 85 + .4byte 954084 @ 86 + .4byte 987754 @ 87 + .4byte 1035837 @ 88 + .4byte 1071552 @ 89 + .4byte 1122660 @ 90 + .4byte 1160499 @ 91 + .4byte 1214753 @ 92 + .4byte 1254796 @ 93 + .4byte 1312322 @ 94 + .4byte 1354652 @ 95 + .4byte 1415577 @ 96 + .4byte 1460276 @ 97 + .4byte 1524731 @ 98 + .4byte 1571884 @ 99 + .4byte 1640000 @ 100 diff --git a/data/experience_tables/fluctuating_growth_rate.s b/data/experience_tables/fluctuating_growth_rate.s deleted file mode 100644 index 81a962327..000000000 --- a/data/experience_tables/fluctuating_growth_rate.s +++ /dev/null @@ -1,101 +0,0 @@ - .4byte 0 @ 0 - .4byte 1 @ 1 - .4byte 4 @ 2 - .4byte 13 @ 3 - .4byte 32 @ 4 - .4byte 65 @ 5 - .4byte 112 @ 6 - .4byte 178 @ 7 - .4byte 276 @ 8 - .4byte 393 @ 9 - .4byte 540 @ 10 - .4byte 745 @ 11 - .4byte 967 @ 12 - .4byte 1230 @ 13 - .4byte 1591 @ 14 - .4byte 1957 @ 15 - .4byte 2457 @ 16 - .4byte 3046 @ 17 - .4byte 3732 @ 18 - .4byte 4526 @ 19 - .4byte 5440 @ 20 - .4byte 6482 @ 21 - .4byte 7666 @ 22 - .4byte 9003 @ 23 - .4byte 10506 @ 24 - .4byte 12187 @ 25 - .4byte 14060 @ 26 - .4byte 16140 @ 27 - .4byte 18439 @ 28 - .4byte 20974 @ 29 - .4byte 23760 @ 30 - .4byte 26811 @ 31 - .4byte 30146 @ 32 - .4byte 33780 @ 33 - .4byte 37731 @ 34 - .4byte 42017 @ 35 - .4byte 46656 @ 36 - .4byte 50653 @ 37 - .4byte 55969 @ 38 - .4byte 60505 @ 39 - .4byte 66560 @ 40 - .4byte 71677 @ 41 - .4byte 78533 @ 42 - .4byte 84277 @ 43 - .4byte 91998 @ 44 - .4byte 98415 @ 45 - .4byte 107069 @ 46 - .4byte 114205 @ 47 - .4byte 123863 @ 48 - .4byte 131766 @ 49 - .4byte 142500 @ 50 - .4byte 151222 @ 51 - .4byte 163105 @ 52 - .4byte 172697 @ 53 - .4byte 185807 @ 54 - .4byte 196322 @ 55 - .4byte 210739 @ 56 - .4byte 222231 @ 57 - .4byte 238036 @ 58 - .4byte 250562 @ 59 - .4byte 267840 @ 60 - .4byte 281456 @ 61 - .4byte 300293 @ 62 - .4byte 315059 @ 63 - .4byte 335544 @ 64 - .4byte 351520 @ 65 - .4byte 373744 @ 66 - .4byte 390991 @ 67 - .4byte 415050 @ 68 - .4byte 433631 @ 69 - .4byte 459620 @ 70 - .4byte 479600 @ 71 - .4byte 507617 @ 72 - .4byte 529063 @ 73 - .4byte 559209 @ 74 - .4byte 582187 @ 75 - .4byte 614566 @ 76 - .4byte 639146 @ 77 - .4byte 673863 @ 78 - .4byte 700115 @ 79 - .4byte 737280 @ 80 - .4byte 765275 @ 81 - .4byte 804997 @ 82 - .4byte 834809 @ 83 - .4byte 877201 @ 84 - .4byte 908905 @ 85 - .4byte 954084 @ 86 - .4byte 987754 @ 87 - .4byte 1035837 @ 88 - .4byte 1071552 @ 89 - .4byte 1122660 @ 90 - .4byte 1160499 @ 91 - .4byte 1214753 @ 92 - .4byte 1254796 @ 93 - .4byte 1312322 @ 94 - .4byte 1354652 @ 95 - .4byte 1415577 @ 96 - .4byte 1460276 @ 97 - .4byte 1524731 @ 98 - .4byte 1571884 @ 99 - .4byte 1640000 @ 100 diff --git a/data/experience_tables/medium_fast_growth_rate.inc b/data/experience_tables/medium_fast_growth_rate.inc new file mode 100644 index 000000000..5a51dd381 --- /dev/null +++ b/data/experience_tables/medium_fast_growth_rate.inc @@ -0,0 +1,101 @@ + .4byte 0 @ 0 + .4byte 1 @ 1 + .4byte 8 @ 2 + .4byte 27 @ 3 + .4byte 64 @ 4 + .4byte 125 @ 5 + .4byte 216 @ 6 + .4byte 343 @ 7 + .4byte 512 @ 8 + .4byte 729 @ 9 + .4byte 1000 @ 10 + .4byte 1331 @ 11 + .4byte 1728 @ 12 + .4byte 2197 @ 13 + .4byte 2744 @ 14 + .4byte 3375 @ 15 + .4byte 4096 @ 16 + .4byte 4913 @ 17 + .4byte 5832 @ 18 + .4byte 6859 @ 19 + .4byte 8000 @ 20 + .4byte 9261 @ 21 + .4byte 10648 @ 22 + .4byte 12167 @ 23 + .4byte 13824 @ 24 + .4byte 15625 @ 25 + .4byte 17576 @ 26 + .4byte 19683 @ 27 + .4byte 21952 @ 28 + .4byte 24389 @ 29 + .4byte 27000 @ 30 + .4byte 29791 @ 31 + .4byte 32768 @ 32 + .4byte 35937 @ 33 + .4byte 39304 @ 34 + .4byte 42875 @ 35 + .4byte 46656 @ 36 + .4byte 50653 @ 37 + .4byte 54872 @ 38 + .4byte 59319 @ 39 + .4byte 64000 @ 40 + .4byte 68921 @ 41 + .4byte 74088 @ 42 + .4byte 79507 @ 43 + .4byte 85184 @ 44 + .4byte 91125 @ 45 + .4byte 97336 @ 46 + .4byte 103823 @ 47 + .4byte 110592 @ 48 + .4byte 117649 @ 49 + .4byte 125000 @ 50 + .4byte 132651 @ 51 + .4byte 140608 @ 52 + .4byte 148877 @ 53 + .4byte 157464 @ 54 + .4byte 166375 @ 55 + .4byte 175616 @ 56 + .4byte 185193 @ 57 + .4byte 195112 @ 58 + .4byte 205379 @ 59 + .4byte 216000 @ 60 + .4byte 226981 @ 61 + .4byte 238328 @ 62 + .4byte 250047 @ 63 + .4byte 262144 @ 64 + .4byte 274625 @ 65 + .4byte 287496 @ 66 + .4byte 300763 @ 67 + .4byte 314432 @ 68 + .4byte 328509 @ 69 + .4byte 343000 @ 70 + .4byte 357911 @ 71 + .4byte 373248 @ 72 + .4byte 389017 @ 73 + .4byte 405224 @ 74 + .4byte 421875 @ 75 + .4byte 438976 @ 76 + .4byte 456533 @ 77 + .4byte 474552 @ 78 + .4byte 493039 @ 79 + .4byte 512000 @ 80 + .4byte 531441 @ 81 + .4byte 551368 @ 82 + .4byte 571787 @ 83 + .4byte 592704 @ 84 + .4byte 614125 @ 85 + .4byte 636056 @ 86 + .4byte 658503 @ 87 + .4byte 681472 @ 88 + .4byte 704969 @ 89 + .4byte 729000 @ 90 + .4byte 753571 @ 91 + .4byte 778688 @ 92 + .4byte 804357 @ 93 + .4byte 830584 @ 94 + .4byte 857375 @ 95 + .4byte 884736 @ 96 + .4byte 912673 @ 97 + .4byte 941192 @ 98 + .4byte 970299 @ 99 + .4byte 1000000 @ 100 diff --git a/data/experience_tables/medium_fast_growth_rate.s b/data/experience_tables/medium_fast_growth_rate.s deleted file mode 100644 index 5a51dd381..000000000 --- a/data/experience_tables/medium_fast_growth_rate.s +++ /dev/null @@ -1,101 +0,0 @@ - .4byte 0 @ 0 - .4byte 1 @ 1 - .4byte 8 @ 2 - .4byte 27 @ 3 - .4byte 64 @ 4 - .4byte 125 @ 5 - .4byte 216 @ 6 - .4byte 343 @ 7 - .4byte 512 @ 8 - .4byte 729 @ 9 - .4byte 1000 @ 10 - .4byte 1331 @ 11 - .4byte 1728 @ 12 - .4byte 2197 @ 13 - .4byte 2744 @ 14 - .4byte 3375 @ 15 - .4byte 4096 @ 16 - .4byte 4913 @ 17 - .4byte 5832 @ 18 - .4byte 6859 @ 19 - .4byte 8000 @ 20 - .4byte 9261 @ 21 - .4byte 10648 @ 22 - .4byte 12167 @ 23 - .4byte 13824 @ 24 - .4byte 15625 @ 25 - .4byte 17576 @ 26 - .4byte 19683 @ 27 - .4byte 21952 @ 28 - .4byte 24389 @ 29 - .4byte 27000 @ 30 - .4byte 29791 @ 31 - .4byte 32768 @ 32 - .4byte 35937 @ 33 - .4byte 39304 @ 34 - .4byte 42875 @ 35 - .4byte 46656 @ 36 - .4byte 50653 @ 37 - .4byte 54872 @ 38 - .4byte 59319 @ 39 - .4byte 64000 @ 40 - .4byte 68921 @ 41 - .4byte 74088 @ 42 - .4byte 79507 @ 43 - .4byte 85184 @ 44 - .4byte 91125 @ 45 - .4byte 97336 @ 46 - .4byte 103823 @ 47 - .4byte 110592 @ 48 - .4byte 117649 @ 49 - .4byte 125000 @ 50 - .4byte 132651 @ 51 - .4byte 140608 @ 52 - .4byte 148877 @ 53 - .4byte 157464 @ 54 - .4byte 166375 @ 55 - .4byte 175616 @ 56 - .4byte 185193 @ 57 - .4byte 195112 @ 58 - .4byte 205379 @ 59 - .4byte 216000 @ 60 - .4byte 226981 @ 61 - .4byte 238328 @ 62 - .4byte 250047 @ 63 - .4byte 262144 @ 64 - .4byte 274625 @ 65 - .4byte 287496 @ 66 - .4byte 300763 @ 67 - .4byte 314432 @ 68 - .4byte 328509 @ 69 - .4byte 343000 @ 70 - .4byte 357911 @ 71 - .4byte 373248 @ 72 - .4byte 389017 @ 73 - .4byte 405224 @ 74 - .4byte 421875 @ 75 - .4byte 438976 @ 76 - .4byte 456533 @ 77 - .4byte 474552 @ 78 - .4byte 493039 @ 79 - .4byte 512000 @ 80 - .4byte 531441 @ 81 - .4byte 551368 @ 82 - .4byte 571787 @ 83 - .4byte 592704 @ 84 - .4byte 614125 @ 85 - .4byte 636056 @ 86 - .4byte 658503 @ 87 - .4byte 681472 @ 88 - .4byte 704969 @ 89 - .4byte 729000 @ 90 - .4byte 753571 @ 91 - .4byte 778688 @ 92 - .4byte 804357 @ 93 - .4byte 830584 @ 94 - .4byte 857375 @ 95 - .4byte 884736 @ 96 - .4byte 912673 @ 97 - .4byte 941192 @ 98 - .4byte 970299 @ 99 - .4byte 1000000 @ 100 diff --git a/data/experience_tables/medium_slow_growth_rate.inc b/data/experience_tables/medium_slow_growth_rate.inc new file mode 100644 index 000000000..d4c16b8c0 --- /dev/null +++ b/data/experience_tables/medium_slow_growth_rate.inc @@ -0,0 +1,101 @@ + .4byte 0 @ 0 + .4byte 1 @ 1 + .4byte 9 @ 2 + .4byte 57 @ 3 + .4byte 96 @ 4 + .4byte 135 @ 5 + .4byte 179 @ 6 + .4byte 236 @ 7 + .4byte 314 @ 8 + .4byte 419 @ 9 + .4byte 560 @ 10 + .4byte 742 @ 11 + .4byte 973 @ 12 + .4byte 1261 @ 13 + .4byte 1612 @ 14 + .4byte 2035 @ 15 + .4byte 2535 @ 16 + .4byte 3120 @ 17 + .4byte 3798 @ 18 + .4byte 4575 @ 19 + .4byte 5460 @ 20 + .4byte 6458 @ 21 + .4byte 7577 @ 22 + .4byte 8825 @ 23 + .4byte 10208 @ 24 + .4byte 11735 @ 25 + .4byte 13411 @ 26 + .4byte 15244 @ 27 + .4byte 17242 @ 28 + .4byte 19411 @ 29 + .4byte 21760 @ 30 + .4byte 24294 @ 31 + .4byte 27021 @ 32 + .4byte 29949 @ 33 + .4byte 33084 @ 34 + .4byte 36435 @ 35 + .4byte 40007 @ 36 + .4byte 43808 @ 37 + .4byte 47846 @ 38 + .4byte 52127 @ 39 + .4byte 56660 @ 40 + .4byte 61450 @ 41 + .4byte 66505 @ 42 + .4byte 71833 @ 43 + .4byte 77440 @ 44 + .4byte 83335 @ 45 + .4byte 89523 @ 46 + .4byte 96012 @ 47 + .4byte 102810 @ 48 + .4byte 109923 @ 49 + .4byte 117360 @ 50 + .4byte 125126 @ 51 + .4byte 133229 @ 52 + .4byte 141677 @ 53 + .4byte 150476 @ 54 + .4byte 159635 @ 55 + .4byte 169159 @ 56 + .4byte 179056 @ 57 + .4byte 189334 @ 58 + .4byte 199999 @ 59 + .4byte 211060 @ 60 + .4byte 222522 @ 61 + .4byte 234393 @ 62 + .4byte 246681 @ 63 + .4byte 259392 @ 64 + .4byte 272535 @ 65 + .4byte 286115 @ 66 + .4byte 300140 @ 67 + .4byte 314618 @ 68 + .4byte 329555 @ 69 + .4byte 344960 @ 70 + .4byte 360838 @ 71 + .4byte 377197 @ 72 + .4byte 394045 @ 73 + .4byte 411388 @ 74 + .4byte 429235 @ 75 + .4byte 447591 @ 76 + .4byte 466464 @ 77 + .4byte 485862 @ 78 + .4byte 505791 @ 79 + .4byte 526260 @ 80 + .4byte 547274 @ 81 + .4byte 568841 @ 82 + .4byte 590969 @ 83 + .4byte 613664 @ 84 + .4byte 636935 @ 85 + .4byte 660787 @ 86 + .4byte 685228 @ 87 + .4byte 710266 @ 88 + .4byte 735907 @ 89 + .4byte 762160 @ 90 + .4byte 789030 @ 91 + .4byte 816525 @ 92 + .4byte 844653 @ 93 + .4byte 873420 @ 94 + .4byte 902835 @ 95 + .4byte 932903 @ 96 + .4byte 963632 @ 97 + .4byte 995030 @ 98 + .4byte 1027103 @ 99 + .4byte 1059860 @ 100 diff --git a/data/experience_tables/medium_slow_growth_rate.s b/data/experience_tables/medium_slow_growth_rate.s deleted file mode 100644 index d4c16b8c0..000000000 --- a/data/experience_tables/medium_slow_growth_rate.s +++ /dev/null @@ -1,101 +0,0 @@ - .4byte 0 @ 0 - .4byte 1 @ 1 - .4byte 9 @ 2 - .4byte 57 @ 3 - .4byte 96 @ 4 - .4byte 135 @ 5 - .4byte 179 @ 6 - .4byte 236 @ 7 - .4byte 314 @ 8 - .4byte 419 @ 9 - .4byte 560 @ 10 - .4byte 742 @ 11 - .4byte 973 @ 12 - .4byte 1261 @ 13 - .4byte 1612 @ 14 - .4byte 2035 @ 15 - .4byte 2535 @ 16 - .4byte 3120 @ 17 - .4byte 3798 @ 18 - .4byte 4575 @ 19 - .4byte 5460 @ 20 - .4byte 6458 @ 21 - .4byte 7577 @ 22 - .4byte 8825 @ 23 - .4byte 10208 @ 24 - .4byte 11735 @ 25 - .4byte 13411 @ 26 - .4byte 15244 @ 27 - .4byte 17242 @ 28 - .4byte 19411 @ 29 - .4byte 21760 @ 30 - .4byte 24294 @ 31 - .4byte 27021 @ 32 - .4byte 29949 @ 33 - .4byte 33084 @ 34 - .4byte 36435 @ 35 - .4byte 40007 @ 36 - .4byte 43808 @ 37 - .4byte 47846 @ 38 - .4byte 52127 @ 39 - .4byte 56660 @ 40 - .4byte 61450 @ 41 - .4byte 66505 @ 42 - .4byte 71833 @ 43 - .4byte 77440 @ 44 - .4byte 83335 @ 45 - .4byte 89523 @ 46 - .4byte 96012 @ 47 - .4byte 102810 @ 48 - .4byte 109923 @ 49 - .4byte 117360 @ 50 - .4byte 125126 @ 51 - .4byte 133229 @ 52 - .4byte 141677 @ 53 - .4byte 150476 @ 54 - .4byte 159635 @ 55 - .4byte 169159 @ 56 - .4byte 179056 @ 57 - .4byte 189334 @ 58 - .4byte 199999 @ 59 - .4byte 211060 @ 60 - .4byte 222522 @ 61 - .4byte 234393 @ 62 - .4byte 246681 @ 63 - .4byte 259392 @ 64 - .4byte 272535 @ 65 - .4byte 286115 @ 66 - .4byte 300140 @ 67 - .4byte 314618 @ 68 - .4byte 329555 @ 69 - .4byte 344960 @ 70 - .4byte 360838 @ 71 - .4byte 377197 @ 72 - .4byte 394045 @ 73 - .4byte 411388 @ 74 - .4byte 429235 @ 75 - .4byte 447591 @ 76 - .4byte 466464 @ 77 - .4byte 485862 @ 78 - .4byte 505791 @ 79 - .4byte 526260 @ 80 - .4byte 547274 @ 81 - .4byte 568841 @ 82 - .4byte 590969 @ 83 - .4byte 613664 @ 84 - .4byte 636935 @ 85 - .4byte 660787 @ 86 - .4byte 685228 @ 87 - .4byte 710266 @ 88 - .4byte 735907 @ 89 - .4byte 762160 @ 90 - .4byte 789030 @ 91 - .4byte 816525 @ 92 - .4byte 844653 @ 93 - .4byte 873420 @ 94 - .4byte 902835 @ 95 - .4byte 932903 @ 96 - .4byte 963632 @ 97 - .4byte 995030 @ 98 - .4byte 1027103 @ 99 - .4byte 1059860 @ 100 diff --git a/data/experience_tables/slow_growth_rate.inc b/data/experience_tables/slow_growth_rate.inc new file mode 100644 index 000000000..8d10b34ed --- /dev/null +++ b/data/experience_tables/slow_growth_rate.inc @@ -0,0 +1,101 @@ + .4byte 0 @ 0 + .4byte 1 @ 1 + .4byte 10 @ 2 + .4byte 33 @ 3 + .4byte 80 @ 4 + .4byte 156 @ 5 + .4byte 270 @ 6 + .4byte 428 @ 7 + .4byte 640 @ 8 + .4byte 911 @ 9 + .4byte 1250 @ 10 + .4byte 1663 @ 11 + .4byte 2160 @ 12 + .4byte 2746 @ 13 + .4byte 3430 @ 14 + .4byte 4218 @ 15 + .4byte 5120 @ 16 + .4byte 6141 @ 17 + .4byte 7290 @ 18 + .4byte 8573 @ 19 + .4byte 10000 @ 20 + .4byte 11576 @ 21 + .4byte 13310 @ 22 + .4byte 15208 @ 23 + .4byte 17280 @ 24 + .4byte 19531 @ 25 + .4byte 21970 @ 26 + .4byte 24603 @ 27 + .4byte 27440 @ 28 + .4byte 30486 @ 29 + .4byte 33750 @ 30 + .4byte 37238 @ 31 + .4byte 40960 @ 32 + .4byte 44921 @ 33 + .4byte 49130 @ 34 + .4byte 53593 @ 35 + .4byte 58320 @ 36 + .4byte 63316 @ 37 + .4byte 68590 @ 38 + .4byte 74148 @ 39 + .4byte 80000 @ 40 + .4byte 86151 @ 41 + .4byte 92610 @ 42 + .4byte 99383 @ 43 + .4byte 106480 @ 44 + .4byte 113906 @ 45 + .4byte 121670 @ 46 + .4byte 129778 @ 47 + .4byte 138240 @ 48 + .4byte 147061 @ 49 + .4byte 156250 @ 50 + .4byte 165813 @ 51 + .4byte 175760 @ 52 + .4byte 186096 @ 53 + .4byte 196830 @ 54 + .4byte 207968 @ 55 + .4byte 219520 @ 56 + .4byte 231491 @ 57 + .4byte 243890 @ 58 + .4byte 256723 @ 59 + .4byte 270000 @ 60 + .4byte 283726 @ 61 + .4byte 297910 @ 62 + .4byte 312558 @ 63 + .4byte 327680 @ 64 + .4byte 343281 @ 65 + .4byte 359370 @ 66 + .4byte 375953 @ 67 + .4byte 393040 @ 68 + .4byte 410636 @ 69 + .4byte 428750 @ 70 + .4byte 447388 @ 71 + .4byte 466560 @ 72 + .4byte 486271 @ 73 + .4byte 506530 @ 74 + .4byte 527343 @ 75 + .4byte 548720 @ 76 + .4byte 570666 @ 77 + .4byte 593190 @ 78 + .4byte 616298 @ 79 + .4byte 640000 @ 80 + .4byte 664301 @ 81 + .4byte 689210 @ 82 + .4byte 714733 @ 83 + .4byte 740880 @ 84 + .4byte 767656 @ 85 + .4byte 795070 @ 86 + .4byte 823128 @ 87 + .4byte 851840 @ 88 + .4byte 881211 @ 89 + .4byte 911250 @ 90 + .4byte 941963 @ 91 + .4byte 973360 @ 92 + .4byte 1005446 @ 93 + .4byte 1038230 @ 94 + .4byte 1071718 @ 95 + .4byte 1105920 @ 96 + .4byte 1140841 @ 97 + .4byte 1176490 @ 98 + .4byte 1212873 @ 99 + .4byte 1250000 @ 100 diff --git a/data/experience_tables/slow_growth_rate.s b/data/experience_tables/slow_growth_rate.s deleted file mode 100644 index 8d10b34ed..000000000 --- a/data/experience_tables/slow_growth_rate.s +++ /dev/null @@ -1,101 +0,0 @@ - .4byte 0 @ 0 - .4byte 1 @ 1 - .4byte 10 @ 2 - .4byte 33 @ 3 - .4byte 80 @ 4 - .4byte 156 @ 5 - .4byte 270 @ 6 - .4byte 428 @ 7 - .4byte 640 @ 8 - .4byte 911 @ 9 - .4byte 1250 @ 10 - .4byte 1663 @ 11 - .4byte 2160 @ 12 - .4byte 2746 @ 13 - .4byte 3430 @ 14 - .4byte 4218 @ 15 - .4byte 5120 @ 16 - .4byte 6141 @ 17 - .4byte 7290 @ 18 - .4byte 8573 @ 19 - .4byte 10000 @ 20 - .4byte 11576 @ 21 - .4byte 13310 @ 22 - .4byte 15208 @ 23 - .4byte 17280 @ 24 - .4byte 19531 @ 25 - .4byte 21970 @ 26 - .4byte 24603 @ 27 - .4byte 27440 @ 28 - .4byte 30486 @ 29 - .4byte 33750 @ 30 - .4byte 37238 @ 31 - .4byte 40960 @ 32 - .4byte 44921 @ 33 - .4byte 49130 @ 34 - .4byte 53593 @ 35 - .4byte 58320 @ 36 - .4byte 63316 @ 37 - .4byte 68590 @ 38 - .4byte 74148 @ 39 - .4byte 80000 @ 40 - .4byte 86151 @ 41 - .4byte 92610 @ 42 - .4byte 99383 @ 43 - .4byte 106480 @ 44 - .4byte 113906 @ 45 - .4byte 121670 @ 46 - .4byte 129778 @ 47 - .4byte 138240 @ 48 - .4byte 147061 @ 49 - .4byte 156250 @ 50 - .4byte 165813 @ 51 - .4byte 175760 @ 52 - .4byte 186096 @ 53 - .4byte 196830 @ 54 - .4byte 207968 @ 55 - .4byte 219520 @ 56 - .4byte 231491 @ 57 - .4byte 243890 @ 58 - .4byte 256723 @ 59 - .4byte 270000 @ 60 - .4byte 283726 @ 61 - .4byte 297910 @ 62 - .4byte 312558 @ 63 - .4byte 327680 @ 64 - .4byte 343281 @ 65 - .4byte 359370 @ 66 - .4byte 375953 @ 67 - .4byte 393040 @ 68 - .4byte 410636 @ 69 - .4byte 428750 @ 70 - .4byte 447388 @ 71 - .4byte 466560 @ 72 - .4byte 486271 @ 73 - .4byte 506530 @ 74 - .4byte 527343 @ 75 - .4byte 548720 @ 76 - .4byte 570666 @ 77 - .4byte 593190 @ 78 - .4byte 616298 @ 79 - .4byte 640000 @ 80 - .4byte 664301 @ 81 - .4byte 689210 @ 82 - .4byte 714733 @ 83 - .4byte 740880 @ 84 - .4byte 767656 @ 85 - .4byte 795070 @ 86 - .4byte 823128 @ 87 - .4byte 851840 @ 88 - .4byte 881211 @ 89 - .4byte 911250 @ 90 - .4byte 941963 @ 91 - .4byte 973360 @ 92 - .4byte 1005446 @ 93 - .4byte 1038230 @ 94 - .4byte 1071718 @ 95 - .4byte 1105920 @ 96 - .4byte 1140841 @ 97 - .4byte 1176490 @ 98 - .4byte 1212873 @ 99 - .4byte 1250000 @ 100 diff --git a/data/experience_tables/tables.inc b/data/experience_tables/tables.inc index 5018efc0f..763d6f8bb 100644 --- a/data/experience_tables/tables.inc +++ b/data/experience_tables/tables.inc @@ -1,11 +1,11 @@ .align 2 gExperienceTables:: @ 81FDF78 - .include "data/experience_tables/medium_fast_growth_rate.s" - .include "data/experience_tables/erratic_growth_rate.s" - .include "data/experience_tables/fluctuating_growth_rate.s" - .include "data/experience_tables/medium_slow_growth_rate.s" - .include "data/experience_tables/fast_growth_rate.s" - .include "data/experience_tables/slow_growth_rate.s" + .include "data/experience_tables/medium_fast_growth_rate.inc" + .include "data/experience_tables/erratic_growth_rate.inc" + .include "data/experience_tables/fluctuating_growth_rate.inc" + .include "data/experience_tables/medium_slow_growth_rate.inc" + .include "data/experience_tables/fast_growth_rate.inc" + .include "data/experience_tables/slow_growth_rate.inc" @ TODO: find out if these copies are used - .include "data/experience_tables/medium_fast_growth_rate.s" - .include "data/experience_tables/medium_fast_growth_rate.s" + .include "data/experience_tables/medium_fast_growth_rate.inc" + .include "data/experience_tables/medium_fast_growth_rate.inc" diff --git a/data/maps/AbandonedShip_CaptainsOffice/header.inc b/data/maps/AbandonedShip_CaptainsOffice/header.inc new file mode 100644 index 000000000..e5e3adc3a --- /dev/null +++ b/data/maps/AbandonedShip_CaptainsOffice/header.inc @@ -0,0 +1,14 @@ +AbandonedShip_CaptainsOffice:: @ 8307454 + .4byte AbandonedShip_CaptainsOffice_MapAttributes + .4byte AbandonedShip_CaptainsOffice_MapEvents + .4byte AbandonedShip_CaptainsOffice_MapScripts + .4byte 0x0 + .2byte BGM_DAN02 + .2byte 196 + .byte 61 + .byte 0 + .byte 11 + .byte 4 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/AbandonedShip_CaptainsOffice/header.s b/data/maps/AbandonedShip_CaptainsOffice/header.s deleted file mode 100644 index e5e3adc3a..000000000 --- a/data/maps/AbandonedShip_CaptainsOffice/header.s +++ /dev/null @@ -1,14 +0,0 @@ -AbandonedShip_CaptainsOffice:: @ 8307454 - .4byte AbandonedShip_CaptainsOffice_MapAttributes - .4byte AbandonedShip_CaptainsOffice_MapEvents - .4byte AbandonedShip_CaptainsOffice_MapScripts - .4byte 0x0 - .2byte BGM_DAN02 - .2byte 196 - .byte 61 - .byte 0 - .byte 11 - .byte 4 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/AbandonedShip_Corridors_1F/header.inc b/data/maps/AbandonedShip_Corridors_1F/header.inc new file mode 100644 index 000000000..e2bd23252 --- /dev/null +++ b/data/maps/AbandonedShip_Corridors_1F/header.inc @@ -0,0 +1,14 @@ +AbandonedShip_Corridors_1F:: @ 8307374 + .4byte AbandonedShip_Corridors_1F_MapAttributes + .4byte AbandonedShip_Corridors_1F_MapEvents + .4byte AbandonedShip_Corridors_1F_MapScripts + .4byte 0x0 + .2byte BGM_DAN02 + .2byte 188 + .byte 61 + .byte 0 + .byte 11 + .byte 4 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/AbandonedShip_Corridors_1F/header.s b/data/maps/AbandonedShip_Corridors_1F/header.s deleted file mode 100644 index e2bd23252..000000000 --- a/data/maps/AbandonedShip_Corridors_1F/header.s +++ /dev/null @@ -1,14 +0,0 @@ -AbandonedShip_Corridors_1F:: @ 8307374 - .4byte AbandonedShip_Corridors_1F_MapAttributes - .4byte AbandonedShip_Corridors_1F_MapEvents - .4byte AbandonedShip_Corridors_1F_MapScripts - .4byte 0x0 - .2byte BGM_DAN02 - .2byte 188 - .byte 61 - .byte 0 - .byte 11 - .byte 4 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/AbandonedShip_Corridors_B1F/header.inc b/data/maps/AbandonedShip_Corridors_B1F/header.inc new file mode 100644 index 000000000..064e24e92 --- /dev/null +++ b/data/maps/AbandonedShip_Corridors_B1F/header.inc @@ -0,0 +1,14 @@ +AbandonedShip_Corridors_B1F:: @ 83073AC + .4byte AbandonedShip_Corridors_B1F_MapAttributes + .4byte AbandonedShip_Corridors_B1F_MapEvents + .4byte AbandonedShip_Corridors_B1F_MapScripts + .4byte 0x0 + .2byte BGM_DAN02 + .2byte 190 + .byte 61 + .byte 0 + .byte 11 + .byte 4 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/AbandonedShip_Corridors_B1F/header.s b/data/maps/AbandonedShip_Corridors_B1F/header.s deleted file mode 100644 index 064e24e92..000000000 --- a/data/maps/AbandonedShip_Corridors_B1F/header.s +++ /dev/null @@ -1,14 +0,0 @@ -AbandonedShip_Corridors_B1F:: @ 83073AC - .4byte AbandonedShip_Corridors_B1F_MapAttributes - .4byte AbandonedShip_Corridors_B1F_MapEvents - .4byte AbandonedShip_Corridors_B1F_MapScripts - .4byte 0x0 - .2byte BGM_DAN02 - .2byte 190 - .byte 61 - .byte 0 - .byte 11 - .byte 4 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/AbandonedShip_Deck/header.inc b/data/maps/AbandonedShip_Deck/header.inc new file mode 100644 index 000000000..1db367db8 --- /dev/null +++ b/data/maps/AbandonedShip_Deck/header.inc @@ -0,0 +1,14 @@ +AbandonedShip_Deck:: @ 8307358 + .4byte AbandonedShip_Deck_MapAttributes + .4byte AbandonedShip_Deck_MapEvents + .4byte AbandonedShip_Deck_MapScripts + .4byte 0x0 + .2byte BGM_DAN02 + .2byte 187 + .byte 61 + .byte 0 + .byte 0 + .byte 4 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/AbandonedShip_Deck/header.s b/data/maps/AbandonedShip_Deck/header.s deleted file mode 100644 index 1db367db8..000000000 --- a/data/maps/AbandonedShip_Deck/header.s +++ /dev/null @@ -1,14 +0,0 @@ -AbandonedShip_Deck:: @ 8307358 - .4byte AbandonedShip_Deck_MapAttributes - .4byte AbandonedShip_Deck_MapEvents - .4byte AbandonedShip_Deck_MapScripts - .4byte 0x0 - .2byte BGM_DAN02 - .2byte 187 - .byte 61 - .byte 0 - .byte 0 - .byte 4 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc b/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc new file mode 100644 index 000000000..a841ee87c --- /dev/null +++ b/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc @@ -0,0 +1,14 @@ +AbandonedShip_HiddenFloorCorridors:: @ 830748C + .4byte AbandonedShip_HiddenFloorCorridors_MapAttributes + .4byte AbandonedShip_HiddenFloorCorridors_MapEvents + .4byte AbandonedShip_HiddenFloorCorridors_MapScripts + .4byte 0x0 + .2byte BGM_DAN02 + .2byte 290 + .byte 61 + .byte 0 + .byte 11 + .byte 4 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/AbandonedShip_HiddenFloorCorridors/header.s b/data/maps/AbandonedShip_HiddenFloorCorridors/header.s deleted file mode 100644 index a841ee87c..000000000 --- a/data/maps/AbandonedShip_HiddenFloorCorridors/header.s +++ /dev/null @@ -1,14 +0,0 @@ -AbandonedShip_HiddenFloorCorridors:: @ 830748C - .4byte AbandonedShip_HiddenFloorCorridors_MapAttributes - .4byte AbandonedShip_HiddenFloorCorridors_MapEvents - .4byte AbandonedShip_HiddenFloorCorridors_MapScripts - .4byte 0x0 - .2byte BGM_DAN02 - .2byte 290 - .byte 61 - .byte 0 - .byte 11 - .byte 4 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/header.inc b/data/maps/AbandonedShip_HiddenFloorRooms/header.inc new file mode 100644 index 000000000..647b22977 --- /dev/null +++ b/data/maps/AbandonedShip_HiddenFloorRooms/header.inc @@ -0,0 +1,14 @@ +AbandonedShip_HiddenFloorRooms:: @ 83074A8 + .4byte AbandonedShip_HiddenFloorRooms_MapAttributes + .4byte AbandonedShip_HiddenFloorRooms_MapEvents + .4byte AbandonedShip_HiddenFloorRooms_MapScripts + .4byte 0x0 + .2byte BGM_DAN02 + .2byte 311 + .byte 61 + .byte 0 + .byte 11 + .byte 4 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/header.s b/data/maps/AbandonedShip_HiddenFloorRooms/header.s deleted file mode 100644 index 647b22977..000000000 --- a/data/maps/AbandonedShip_HiddenFloorRooms/header.s +++ /dev/null @@ -1,14 +0,0 @@ -AbandonedShip_HiddenFloorRooms:: @ 83074A8 - .4byte AbandonedShip_HiddenFloorRooms_MapAttributes - .4byte AbandonedShip_HiddenFloorRooms_MapEvents - .4byte AbandonedShip_HiddenFloorRooms_MapScripts - .4byte 0x0 - .2byte BGM_DAN02 - .2byte 311 - .byte 61 - .byte 0 - .byte 11 - .byte 4 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/AbandonedShip_Room_B1F/header.inc b/data/maps/AbandonedShip_Room_B1F/header.inc new file mode 100644 index 000000000..7b88baf94 --- /dev/null +++ b/data/maps/AbandonedShip_Room_B1F/header.inc @@ -0,0 +1,14 @@ +AbandonedShip_Room_B1F:: @ 830741C + .4byte AbandonedShip_Room_B1F_MapAttributes + .4byte AbandonedShip_Room_B1F_MapEvents + .4byte AbandonedShip_Room_B1F_MapScripts + .4byte 0x0 + .2byte BGM_DAN02 + .2byte 194 + .byte 61 + .byte 0 + .byte 11 + .byte 4 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/AbandonedShip_Room_B1F/header.s b/data/maps/AbandonedShip_Room_B1F/header.s deleted file mode 100644 index 7b88baf94..000000000 --- a/data/maps/AbandonedShip_Room_B1F/header.s +++ /dev/null @@ -1,14 +0,0 @@ -AbandonedShip_Room_B1F:: @ 830741C - .4byte AbandonedShip_Room_B1F_MapAttributes - .4byte AbandonedShip_Room_B1F_MapEvents - .4byte AbandonedShip_Room_B1F_MapScripts - .4byte 0x0 - .2byte BGM_DAN02 - .2byte 194 - .byte 61 - .byte 0 - .byte 11 - .byte 4 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/AbandonedShip_Rooms2_1F/header.inc b/data/maps/AbandonedShip_Rooms2_1F/header.inc new file mode 100644 index 000000000..44bcd4733 --- /dev/null +++ b/data/maps/AbandonedShip_Rooms2_1F/header.inc @@ -0,0 +1,14 @@ +AbandonedShip_Rooms2_1F:: @ 8307438 + .4byte AbandonedShip_Rooms2_1F_MapAttributes + .4byte AbandonedShip_Rooms2_1F_MapEvents + .4byte AbandonedShip_Rooms2_1F_MapScripts + .4byte 0x0 + .2byte BGM_DAN02 + .2byte 195 + .byte 61 + .byte 0 + .byte 11 + .byte 4 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/AbandonedShip_Rooms2_1F/header.s b/data/maps/AbandonedShip_Rooms2_1F/header.s deleted file mode 100644 index 44bcd4733..000000000 --- a/data/maps/AbandonedShip_Rooms2_1F/header.s +++ /dev/null @@ -1,14 +0,0 @@ -AbandonedShip_Rooms2_1F:: @ 8307438 - .4byte AbandonedShip_Rooms2_1F_MapAttributes - .4byte AbandonedShip_Rooms2_1F_MapEvents - .4byte AbandonedShip_Rooms2_1F_MapScripts - .4byte 0x0 - .2byte BGM_DAN02 - .2byte 195 - .byte 61 - .byte 0 - .byte 11 - .byte 4 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/AbandonedShip_Rooms2_B1F/header.inc b/data/maps/AbandonedShip_Rooms2_B1F/header.inc new file mode 100644 index 000000000..017b1382b --- /dev/null +++ b/data/maps/AbandonedShip_Rooms2_B1F/header.inc @@ -0,0 +1,14 @@ +AbandonedShip_Rooms2_B1F:: @ 83073E4 + .4byte AbandonedShip_Rooms2_B1F_MapAttributes + .4byte AbandonedShip_Rooms2_B1F_MapEvents + .4byte AbandonedShip_Rooms2_B1F_MapScripts + .4byte 0x0 + .2byte BGM_DAN02 + .2byte 192 + .byte 61 + .byte 0 + .byte 11 + .byte 4 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/AbandonedShip_Rooms2_B1F/header.s b/data/maps/AbandonedShip_Rooms2_B1F/header.s deleted file mode 100644 index 017b1382b..000000000 --- a/data/maps/AbandonedShip_Rooms2_B1F/header.s +++ /dev/null @@ -1,14 +0,0 @@ -AbandonedShip_Rooms2_B1F:: @ 83073E4 - .4byte AbandonedShip_Rooms2_B1F_MapAttributes - .4byte AbandonedShip_Rooms2_B1F_MapEvents - .4byte AbandonedShip_Rooms2_B1F_MapScripts - .4byte 0x0 - .2byte BGM_DAN02 - .2byte 192 - .byte 61 - .byte 0 - .byte 11 - .byte 4 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/AbandonedShip_Rooms_1F/header.inc b/data/maps/AbandonedShip_Rooms_1F/header.inc new file mode 100644 index 000000000..7e8dbd5b8 --- /dev/null +++ b/data/maps/AbandonedShip_Rooms_1F/header.inc @@ -0,0 +1,14 @@ +AbandonedShip_Rooms_1F:: @ 8307390 + .4byte AbandonedShip_Rooms_1F_MapAttributes + .4byte AbandonedShip_Rooms_1F_MapEvents + .4byte AbandonedShip_Rooms_1F_MapScripts + .4byte 0x0 + .2byte BGM_DAN02 + .2byte 189 + .byte 61 + .byte 0 + .byte 11 + .byte 4 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/AbandonedShip_Rooms_1F/header.s b/data/maps/AbandonedShip_Rooms_1F/header.s deleted file mode 100644 index 7e8dbd5b8..000000000 --- a/data/maps/AbandonedShip_Rooms_1F/header.s +++ /dev/null @@ -1,14 +0,0 @@ -AbandonedShip_Rooms_1F:: @ 8307390 - .4byte AbandonedShip_Rooms_1F_MapAttributes - .4byte AbandonedShip_Rooms_1F_MapEvents - .4byte AbandonedShip_Rooms_1F_MapScripts - .4byte 0x0 - .2byte BGM_DAN02 - .2byte 189 - .byte 61 - .byte 0 - .byte 11 - .byte 4 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/AbandonedShip_Rooms_B1F/header.inc b/data/maps/AbandonedShip_Rooms_B1F/header.inc new file mode 100644 index 000000000..6ac6e3794 --- /dev/null +++ b/data/maps/AbandonedShip_Rooms_B1F/header.inc @@ -0,0 +1,14 @@ +AbandonedShip_Rooms_B1F:: @ 83073C8 + .4byte AbandonedShip_Rooms_B1F_MapAttributes + .4byte AbandonedShip_Rooms_B1F_MapEvents + .4byte AbandonedShip_Rooms_B1F_MapScripts + .4byte 0x0 + .2byte BGM_DAN02 + .2byte 191 + .byte 61 + .byte 0 + .byte 11 + .byte 4 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/AbandonedShip_Rooms_B1F/header.s b/data/maps/AbandonedShip_Rooms_B1F/header.s deleted file mode 100644 index 6ac6e3794..000000000 --- a/data/maps/AbandonedShip_Rooms_B1F/header.s +++ /dev/null @@ -1,14 +0,0 @@ -AbandonedShip_Rooms_B1F:: @ 83073C8 - .4byte AbandonedShip_Rooms_B1F_MapAttributes - .4byte AbandonedShip_Rooms_B1F_MapEvents - .4byte AbandonedShip_Rooms_B1F_MapScripts - .4byte 0x0 - .2byte BGM_DAN02 - .2byte 191 - .byte 61 - .byte 0 - .byte 11 - .byte 4 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/AbandonedShip_Underwater1/header.inc b/data/maps/AbandonedShip_Underwater1/header.inc new file mode 100644 index 000000000..6313cf6f1 --- /dev/null +++ b/data/maps/AbandonedShip_Underwater1/header.inc @@ -0,0 +1,14 @@ +AbandonedShip_Underwater1:: @ 8307400 + .4byte AbandonedShip_Underwater1_MapAttributes + .4byte AbandonedShip_Underwater1_MapEvents + .4byte AbandonedShip_Underwater1_MapScripts + .4byte 0x0 + .2byte BGM_DEEPDEEP + .2byte 193 + .byte 61 + .byte 0 + .byte 14 + .byte 5 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/AbandonedShip_Underwater1/header.s b/data/maps/AbandonedShip_Underwater1/header.s deleted file mode 100644 index 6313cf6f1..000000000 --- a/data/maps/AbandonedShip_Underwater1/header.s +++ /dev/null @@ -1,14 +0,0 @@ -AbandonedShip_Underwater1:: @ 8307400 - .4byte AbandonedShip_Underwater1_MapAttributes - .4byte AbandonedShip_Underwater1_MapEvents - .4byte AbandonedShip_Underwater1_MapScripts - .4byte 0x0 - .2byte BGM_DEEPDEEP - .2byte 193 - .byte 61 - .byte 0 - .byte 14 - .byte 5 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/AbandonedShip_Underwater2/header.inc b/data/maps/AbandonedShip_Underwater2/header.inc new file mode 100644 index 000000000..c81b78357 --- /dev/null +++ b/data/maps/AbandonedShip_Underwater2/header.inc @@ -0,0 +1,14 @@ +AbandonedShip_Underwater2:: @ 8307470 + .4byte AbandonedShip_Underwater2_MapAttributes + .4byte AbandonedShip_Underwater2_MapEvents + .4byte AbandonedShip_Underwater2_MapScripts + .4byte 0x0 + .2byte BGM_DEEPDEEP + .2byte 197 + .byte 61 + .byte 0 + .byte 14 + .byte 5 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/AbandonedShip_Underwater2/header.s b/data/maps/AbandonedShip_Underwater2/header.s deleted file mode 100644 index c81b78357..000000000 --- a/data/maps/AbandonedShip_Underwater2/header.s +++ /dev/null @@ -1,14 +0,0 @@ -AbandonedShip_Underwater2:: @ 8307470 - .4byte AbandonedShip_Underwater2_MapAttributes - .4byte AbandonedShip_Underwater2_MapEvents - .4byte AbandonedShip_Underwater2_MapScripts - .4byte 0x0 - .2byte BGM_DEEPDEEP - .2byte 197 - .byte 61 - .byte 0 - .byte 14 - .byte 5 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/AncientTomb/header.inc b/data/maps/AncientTomb/header.inc new file mode 100644 index 000000000..82ac0555d --- /dev/null +++ b/data/maps/AncientTomb/header.inc @@ -0,0 +1,14 @@ +AncientTomb:: @ 83074E0 + .4byte AncientTomb_MapAttributes + .4byte AncientTomb_MapEvents + .4byte AncientTomb_MapScripts + .4byte 0x0 + .2byte BGM_MABOROSI + .2byte 282 + .byte 83 + .byte 0 + .byte 0 + .byte 4 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/AncientTomb/header.s b/data/maps/AncientTomb/header.s deleted file mode 100644 index 82ac0555d..000000000 --- a/data/maps/AncientTomb/header.s +++ /dev/null @@ -1,14 +0,0 @@ -AncientTomb:: @ 83074E0 - .4byte AncientTomb_MapAttributes - .4byte AncientTomb_MapEvents - .4byte AncientTomb_MapScripts - .4byte 0x0 - .2byte BGM_MABOROSI - .2byte 282 - .byte 83 - .byte 0 - .byte 0 - .byte 4 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/AquaHideout_1F/header.inc b/data/maps/AquaHideout_1F/header.inc new file mode 100644 index 000000000..94650821d --- /dev/null +++ b/data/maps/AquaHideout_1F/header.inc @@ -0,0 +1,14 @@ +AquaHideout_1F:: @ 8306FF4 + .4byte AquaHideout_1F_MapAttributes + .4byte AquaHideout_1F_MapEvents + .4byte AquaHideout_1F_MapScripts + .4byte 0x0 + .2byte BGM_AJITO + .2byte 144 + .byte 66 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 1 + .byte 3 diff --git a/data/maps/AquaHideout_1F/header.s b/data/maps/AquaHideout_1F/header.s deleted file mode 100644 index 94650821d..000000000 --- a/data/maps/AquaHideout_1F/header.s +++ /dev/null @@ -1,14 +0,0 @@ -AquaHideout_1F:: @ 8306FF4 - .4byte AquaHideout_1F_MapAttributes - .4byte AquaHideout_1F_MapEvents - .4byte AquaHideout_1F_MapScripts - .4byte 0x0 - .2byte BGM_AJITO - .2byte 144 - .byte 66 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 1 - .byte 3 diff --git a/data/maps/AquaHideout_B1F/header.inc b/data/maps/AquaHideout_B1F/header.inc new file mode 100644 index 000000000..ef7f4cfdf --- /dev/null +++ b/data/maps/AquaHideout_B1F/header.inc @@ -0,0 +1,14 @@ +AquaHideout_B1F:: @ 8307010 + .4byte AquaHideout_B1F_MapAttributes + .4byte AquaHideout_B1F_MapEvents + .4byte AquaHideout_B1F_MapScripts + .4byte 0x0 + .2byte BGM_AJITO + .2byte 145 + .byte 66 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 1 + .byte 3 diff --git a/data/maps/AquaHideout_B1F/header.s b/data/maps/AquaHideout_B1F/header.s deleted file mode 100644 index ef7f4cfdf..000000000 --- a/data/maps/AquaHideout_B1F/header.s +++ /dev/null @@ -1,14 +0,0 @@ -AquaHideout_B1F:: @ 8307010 - .4byte AquaHideout_B1F_MapAttributes - .4byte AquaHideout_B1F_MapEvents - .4byte AquaHideout_B1F_MapScripts - .4byte 0x0 - .2byte BGM_AJITO - .2byte 145 - .byte 66 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 1 - .byte 3 diff --git a/data/maps/AquaHideout_B2F/header.inc b/data/maps/AquaHideout_B2F/header.inc new file mode 100644 index 000000000..38b3f546f --- /dev/null +++ b/data/maps/AquaHideout_B2F/header.inc @@ -0,0 +1,14 @@ +AquaHideout_B2F:: @ 830702C + .4byte AquaHideout_B2F_MapAttributes + .4byte AquaHideout_B2F_MapEvents + .4byte AquaHideout_B2F_MapScripts + .4byte 0x0 + .2byte BGM_AJITO + .2byte 146 + .byte 66 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 1 + .byte 3 diff --git a/data/maps/AquaHideout_B2F/header.s b/data/maps/AquaHideout_B2F/header.s deleted file mode 100644 index 38b3f546f..000000000 --- a/data/maps/AquaHideout_B2F/header.s +++ /dev/null @@ -1,14 +0,0 @@ -AquaHideout_B2F:: @ 830702C - .4byte AquaHideout_B2F_MapAttributes - .4byte AquaHideout_B2F_MapEvents - .4byte AquaHideout_B2F_MapScripts - .4byte 0x0 - .2byte BGM_AJITO - .2byte 146 - .byte 66 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 1 - .byte 3 diff --git a/data/maps/BattleTower_BattleRoom/header.inc b/data/maps/BattleTower_BattleRoom/header.inc new file mode 100644 index 000000000..3104824ed --- /dev/null +++ b/data/maps/BattleTower_BattleRoom/header.inc @@ -0,0 +1,14 @@ +BattleTower_BattleRoom:: @ 8307C88 + .4byte BattleTower_BattleRoom_MapAttributes + .4byte BattleTower_BattleRoom_MapEvents + .4byte BattleTower_BattleRoom_MapScripts + .4byte 0x0 + .2byte BGM_B_TOWER + .2byte 269 + .byte 58 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 8 diff --git a/data/maps/BattleTower_BattleRoom/header.s b/data/maps/BattleTower_BattleRoom/header.s deleted file mode 100644 index 3104824ed..000000000 --- a/data/maps/BattleTower_BattleRoom/header.s +++ /dev/null @@ -1,14 +0,0 @@ -BattleTower_BattleRoom:: @ 8307C88 - .4byte BattleTower_BattleRoom_MapAttributes - .4byte BattleTower_BattleRoom_MapEvents - .4byte BattleTower_BattleRoom_MapScripts - .4byte 0x0 - .2byte BGM_B_TOWER - .2byte 269 - .byte 58 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 8 diff --git a/data/maps/BattleTower_Corridor/header.inc b/data/maps/BattleTower_Corridor/header.inc new file mode 100644 index 000000000..016e178ac --- /dev/null +++ b/data/maps/BattleTower_Corridor/header.inc @@ -0,0 +1,14 @@ +BattleTower_Corridor:: @ 8307C6C + .4byte BattleTower_Corridor_MapAttributes + .4byte BattleTower_Corridor_MapEvents + .4byte BattleTower_Corridor_MapScripts + .4byte 0x0 + .2byte BGM_B_TOWER + .2byte 268 + .byte 58 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/BattleTower_Corridor/header.s b/data/maps/BattleTower_Corridor/header.s deleted file mode 100644 index 016e178ac..000000000 --- a/data/maps/BattleTower_Corridor/header.s +++ /dev/null @@ -1,14 +0,0 @@ -BattleTower_Corridor:: @ 8307C6C - .4byte BattleTower_Corridor_MapAttributes - .4byte BattleTower_Corridor_MapEvents - .4byte BattleTower_Corridor_MapScripts - .4byte 0x0 - .2byte BGM_B_TOWER - .2byte 268 - .byte 58 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/BattleTower_Elevator/header.inc b/data/maps/BattleTower_Elevator/header.inc new file mode 100644 index 000000000..0a7285261 --- /dev/null +++ b/data/maps/BattleTower_Elevator/header.inc @@ -0,0 +1,14 @@ +BattleTower_Elevator:: @ 8307C50 + .4byte BattleTower_Elevator_MapAttributes + .4byte BattleTower_Elevator_MapEvents + .4byte BattleTower_Elevator_MapScripts + .4byte 0x0 + .2byte BGM_B_TOWER + .2byte 267 + .byte 58 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/BattleTower_Elevator/header.s b/data/maps/BattleTower_Elevator/header.s deleted file mode 100644 index 0a7285261..000000000 --- a/data/maps/BattleTower_Elevator/header.s +++ /dev/null @@ -1,14 +0,0 @@ -BattleTower_Elevator:: @ 8307C50 - .4byte BattleTower_Elevator_MapAttributes - .4byte BattleTower_Elevator_MapEvents - .4byte BattleTower_Elevator_MapScripts - .4byte 0x0 - .2byte BGM_B_TOWER - .2byte 267 - .byte 58 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/BattleTower_Lobby/header.inc b/data/maps/BattleTower_Lobby/header.inc new file mode 100644 index 000000000..c8c0b0473 --- /dev/null +++ b/data/maps/BattleTower_Lobby/header.inc @@ -0,0 +1,14 @@ +BattleTower_Lobby:: @ 8307C34 + .4byte BattleTower_Lobby_MapAttributes + .4byte BattleTower_Lobby_MapEvents + .4byte BattleTower_Lobby_MapScripts + .4byte 0x0 + .2byte BGM_B_TOWER + .2byte 265 + .byte 58 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/BattleTower_Lobby/header.s b/data/maps/BattleTower_Lobby/header.s deleted file mode 100644 index c8c0b0473..000000000 --- a/data/maps/BattleTower_Lobby/header.s +++ /dev/null @@ -1,14 +0,0 @@ -BattleTower_Lobby:: @ 8307C34 - .4byte BattleTower_Lobby_MapAttributes - .4byte BattleTower_Lobby_MapEvents - .4byte BattleTower_Lobby_MapScripts - .4byte 0x0 - .2byte BGM_B_TOWER - .2byte 265 - .byte 58 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/BattleTower_Outside/header.inc b/data/maps/BattleTower_Outside/header.inc new file mode 100644 index 000000000..01bbc2fd9 --- /dev/null +++ b/data/maps/BattleTower_Outside/header.inc @@ -0,0 +1,14 @@ +BattleTower_Outside:: @ 8307C18 + .4byte BattleTower_Outside_MapAttributes + .4byte BattleTower_Outside_MapEvents + .4byte BattleTower_Outside_MapScripts + .4byte 0x0 + .2byte BGM_B_TOWER + .2byte 266 + .byte 58 + .byte 0 + .byte 0 + .byte 3 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/BattleTower_Outside/header.s b/data/maps/BattleTower_Outside/header.s deleted file mode 100644 index 01bbc2fd9..000000000 --- a/data/maps/BattleTower_Outside/header.s +++ /dev/null @@ -1,14 +0,0 @@ -BattleTower_Outside:: @ 8307C18 - .4byte BattleTower_Outside_MapAttributes - .4byte BattleTower_Outside_MapEvents - .4byte BattleTower_Outside_MapScripts - .4byte 0x0 - .2byte BGM_B_TOWER - .2byte 266 - .byte 58 - .byte 0 - .byte 0 - .byte 3 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/CaveOfOrigin_1F/header.inc b/data/maps/CaveOfOrigin_1F/header.inc new file mode 100644 index 000000000..b49287535 --- /dev/null +++ b/data/maps/CaveOfOrigin_1F/header.inc @@ -0,0 +1,14 @@ +CaveOfOrigin_1F:: @ 8307198 + .4byte CaveOfOrigin_1F_MapAttributes + .4byte CaveOfOrigin_1F_MapEvents + .4byte CaveOfOrigin_1F_MapScripts + .4byte 0x0 + .2byte BGM_DAN03 + .2byte 159 + .byte 72 + .byte 1 + .byte 0 + .byte 4 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/CaveOfOrigin_1F/header.s b/data/maps/CaveOfOrigin_1F/header.s deleted file mode 100644 index b49287535..000000000 --- a/data/maps/CaveOfOrigin_1F/header.s +++ /dev/null @@ -1,14 +0,0 @@ -CaveOfOrigin_1F:: @ 8307198 - .4byte CaveOfOrigin_1F_MapAttributes - .4byte CaveOfOrigin_1F_MapEvents - .4byte CaveOfOrigin_1F_MapScripts - .4byte 0x0 - .2byte BGM_DAN03 - .2byte 159 - .byte 72 - .byte 1 - .byte 0 - .byte 4 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/CaveOfOrigin_B1F/header.inc b/data/maps/CaveOfOrigin_B1F/header.inc new file mode 100644 index 000000000..97e5e68c8 --- /dev/null +++ b/data/maps/CaveOfOrigin_B1F/header.inc @@ -0,0 +1,14 @@ +CaveOfOrigin_B1F:: @ 83071B4 + .4byte CaveOfOrigin_B1F_MapAttributes + .4byte CaveOfOrigin_B1F_MapEvents + .4byte CaveOfOrigin_B1F_MapScripts + .4byte 0x0 + .2byte BGM_DAN03 + .2byte 160 + .byte 72 + .byte 1 + .byte 0 + .byte 4 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/CaveOfOrigin_B1F/header.s b/data/maps/CaveOfOrigin_B1F/header.s deleted file mode 100644 index 97e5e68c8..000000000 --- a/data/maps/CaveOfOrigin_B1F/header.s +++ /dev/null @@ -1,14 +0,0 @@ -CaveOfOrigin_B1F:: @ 83071B4 - .4byte CaveOfOrigin_B1F_MapAttributes - .4byte CaveOfOrigin_B1F_MapEvents - .4byte CaveOfOrigin_B1F_MapScripts - .4byte 0x0 - .2byte BGM_DAN03 - .2byte 160 - .byte 72 - .byte 1 - .byte 0 - .byte 4 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/CaveOfOrigin_B2F/header.inc b/data/maps/CaveOfOrigin_B2F/header.inc new file mode 100644 index 000000000..79e76f693 --- /dev/null +++ b/data/maps/CaveOfOrigin_B2F/header.inc @@ -0,0 +1,14 @@ +CaveOfOrigin_B2F:: @ 83071D0 + .4byte CaveOfOrigin_B2F_MapAttributes + .4byte CaveOfOrigin_B2F_MapEvents + .4byte CaveOfOrigin_B2F_MapScripts + .4byte 0x0 + .2byte BGM_DAN03 + .2byte 161 + .byte 72 + .byte 1 + .byte 6 + .byte 4 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/CaveOfOrigin_B2F/header.s b/data/maps/CaveOfOrigin_B2F/header.s deleted file mode 100644 index 79e76f693..000000000 --- a/data/maps/CaveOfOrigin_B2F/header.s +++ /dev/null @@ -1,14 +0,0 @@ -CaveOfOrigin_B2F:: @ 83071D0 - .4byte CaveOfOrigin_B2F_MapAttributes - .4byte CaveOfOrigin_B2F_MapEvents - .4byte CaveOfOrigin_B2F_MapScripts - .4byte 0x0 - .2byte BGM_DAN03 - .2byte 161 - .byte 72 - .byte 1 - .byte 6 - .byte 4 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/CaveOfOrigin_B3F/header.inc b/data/maps/CaveOfOrigin_B3F/header.inc new file mode 100644 index 000000000..746d187f3 --- /dev/null +++ b/data/maps/CaveOfOrigin_B3F/header.inc @@ -0,0 +1,14 @@ +CaveOfOrigin_B3F:: @ 83071EC + .4byte CaveOfOrigin_B3F_MapAttributes + .4byte CaveOfOrigin_B3F_MapEvents + .4byte CaveOfOrigin_B3F_MapScripts + .4byte 0x0 + .2byte BGM_DAN03 + .2byte 162 + .byte 72 + .byte 1 + .byte 6 + .byte 4 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/CaveOfOrigin_B3F/header.s b/data/maps/CaveOfOrigin_B3F/header.s deleted file mode 100644 index 746d187f3..000000000 --- a/data/maps/CaveOfOrigin_B3F/header.s +++ /dev/null @@ -1,14 +0,0 @@ -CaveOfOrigin_B3F:: @ 83071EC - .4byte CaveOfOrigin_B3F_MapAttributes - .4byte CaveOfOrigin_B3F_MapEvents - .4byte CaveOfOrigin_B3F_MapScripts - .4byte 0x0 - .2byte BGM_DAN03 - .2byte 162 - .byte 72 - .byte 1 - .byte 6 - .byte 4 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/CaveOfOrigin_B4F/header.inc b/data/maps/CaveOfOrigin_B4F/header.inc new file mode 100644 index 000000000..0cb1ad83b --- /dev/null +++ b/data/maps/CaveOfOrigin_B4F/header.inc @@ -0,0 +1,14 @@ +CaveOfOrigin_B4F:: @ 8307208 + .4byte CaveOfOrigin_B4F_MapAttributes + .4byte CaveOfOrigin_B4F_MapEvents + .4byte CaveOfOrigin_B4F_MapScripts + .4byte 0x0 + .2byte SE_STOP + .2byte 163 + .byte 72 + .byte 0 + .byte 6 + .byte 4 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/CaveOfOrigin_B4F/header.s b/data/maps/CaveOfOrigin_B4F/header.s deleted file mode 100644 index 0cb1ad83b..000000000 --- a/data/maps/CaveOfOrigin_B4F/header.s +++ /dev/null @@ -1,14 +0,0 @@ -CaveOfOrigin_B4F:: @ 8307208 - .4byte CaveOfOrigin_B4F_MapAttributes - .4byte CaveOfOrigin_B4F_MapEvents - .4byte CaveOfOrigin_B4F_MapScripts - .4byte 0x0 - .2byte SE_STOP - .2byte 163 - .byte 72 - .byte 0 - .byte 6 - .byte 4 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/CaveOfOrigin_Entrance/header.inc b/data/maps/CaveOfOrigin_Entrance/header.inc new file mode 100644 index 000000000..606997174 --- /dev/null +++ b/data/maps/CaveOfOrigin_Entrance/header.inc @@ -0,0 +1,14 @@ +CaveOfOrigin_Entrance:: @ 830717C + .4byte CaveOfOrigin_Entrance_MapAttributes + .4byte CaveOfOrigin_Entrance_MapEvents + .4byte CaveOfOrigin_Entrance_MapScripts + .4byte 0x0 + .2byte BGM_DAN03 + .2byte 158 + .byte 72 + .byte 0 + .byte 0 + .byte 4 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/CaveOfOrigin_Entrance/header.s b/data/maps/CaveOfOrigin_Entrance/header.s deleted file mode 100644 index 606997174..000000000 --- a/data/maps/CaveOfOrigin_Entrance/header.s +++ /dev/null @@ -1,14 +0,0 @@ -CaveOfOrigin_Entrance:: @ 830717C - .4byte CaveOfOrigin_Entrance_MapAttributes - .4byte CaveOfOrigin_Entrance_MapEvents - .4byte CaveOfOrigin_Entrance_MapScripts - .4byte 0x0 - .2byte BGM_DAN03 - .2byte 158 - .byte 72 - .byte 0 - .byte 0 - .byte 4 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/DesertRuins/header.inc b/data/maps/DesertRuins/header.inc new file mode 100644 index 000000000..79e681666 --- /dev/null +++ b/data/maps/DesertRuins/header.inc @@ -0,0 +1,14 @@ +DesertRuins:: @ 8306E18 + .4byte DesertRuins_MapAttributes + .4byte DesertRuins_MapEvents + .4byte DesertRuins_MapScripts + .4byte 0x0 + .2byte BGM_MABOROSI + .2byte 132 + .byte 82 + .byte 0 + .byte 0 + .byte 4 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/DesertRuins/header.s b/data/maps/DesertRuins/header.s deleted file mode 100644 index 79e681666..000000000 --- a/data/maps/DesertRuins/header.s +++ /dev/null @@ -1,14 +0,0 @@ -DesertRuins:: @ 8306E18 - .4byte DesertRuins_MapAttributes - .4byte DesertRuins_MapEvents - .4byte DesertRuins_MapScripts - .4byte 0x0 - .2byte BGM_MABOROSI - .2byte 132 - .byte 82 - .byte 0 - .byte 0 - .byte 4 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/DewfordTown/connections.inc b/data/maps/DewfordTown/connections.inc new file mode 100644 index 000000000..4f47ce304 --- /dev/null +++ b/data/maps/DewfordTown/connections.inc @@ -0,0 +1,7 @@ +DewfordTown_MapConnectionsList:: @ 8308650 + connection up, -60, Route106 + connection right, 0, Route107 + +DewfordTown_MapConnections:: @ 8308668 + .4byte 0x2 + .4byte DewfordTown_MapConnectionsList diff --git a/data/maps/DewfordTown/connections.s b/data/maps/DewfordTown/connections.s deleted file mode 100644 index 4f47ce304..000000000 --- a/data/maps/DewfordTown/connections.s +++ /dev/null @@ -1,7 +0,0 @@ -DewfordTown_MapConnectionsList:: @ 8308650 - connection up, -60, Route106 - connection right, 0, Route107 - -DewfordTown_MapConnections:: @ 8308668 - .4byte 0x2 - .4byte DewfordTown_MapConnectionsList diff --git a/data/maps/DewfordTown/header.inc b/data/maps/DewfordTown/header.inc new file mode 100644 index 000000000..7aed01d94 --- /dev/null +++ b/data/maps/DewfordTown/header.inc @@ -0,0 +1,14 @@ +DewfordTown:: @ 830557C + .4byte DewfordTown_MapAttributes + .4byte DewfordTown_MapEvents + .4byte DewfordTown_MapScripts + .4byte DewfordTown_MapConnections + .2byte BGM_HIGHTOWN + .2byte 12 + .byte 2 + .byte 0 + .byte 2 + .byte 1 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/DewfordTown/header.s b/data/maps/DewfordTown/header.s deleted file mode 100644 index 7aed01d94..000000000 --- a/data/maps/DewfordTown/header.s +++ /dev/null @@ -1,14 +0,0 @@ -DewfordTown:: @ 830557C - .4byte DewfordTown_MapAttributes - .4byte DewfordTown_MapEvents - .4byte DewfordTown_MapScripts - .4byte DewfordTown_MapConnections - .2byte BGM_HIGHTOWN - .2byte 12 - .byte 2 - .byte 0 - .byte 2 - .byte 1 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/DewfordTown_Gym/header.inc b/data/maps/DewfordTown_Gym/header.inc new file mode 100644 index 000000000..79227e545 --- /dev/null +++ b/data/maps/DewfordTown_Gym/header.inc @@ -0,0 +1,14 @@ +DewfordTown_Gym:: @ 8305B9C + .4byte DewfordTown_Gym_MapAttributes + .4byte DewfordTown_Gym_MapEvents + .4byte DewfordTown_Gym_MapScripts + .4byte 0x0 + .2byte BGM_GIM + .2byte 65 + .byte 2 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 1 diff --git a/data/maps/DewfordTown_Gym/header.s b/data/maps/DewfordTown_Gym/header.s deleted file mode 100644 index 79227e545..000000000 --- a/data/maps/DewfordTown_Gym/header.s +++ /dev/null @@ -1,14 +0,0 @@ -DewfordTown_Gym:: @ 8305B9C - .4byte DewfordTown_Gym_MapAttributes - .4byte DewfordTown_Gym_MapEvents - .4byte DewfordTown_Gym_MapScripts - .4byte 0x0 - .2byte BGM_GIM - .2byte 65 - .byte 2 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 1 diff --git a/data/maps/DewfordTown_Hall/header.inc b/data/maps/DewfordTown_Hall/header.inc new file mode 100644 index 000000000..975a257d8 --- /dev/null +++ b/data/maps/DewfordTown_Hall/header.inc @@ -0,0 +1,14 @@ +DewfordTown_Hall:: @ 8305BB8 + .4byte DewfordTown_Hall_MapAttributes + .4byte DewfordTown_Hall_MapEvents + .4byte DewfordTown_Hall_MapScripts + .4byte 0x0 + .2byte BGM_HIGHTOWN + .2byte 66 + .byte 2 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/DewfordTown_Hall/header.s b/data/maps/DewfordTown_Hall/header.s deleted file mode 100644 index 975a257d8..000000000 --- a/data/maps/DewfordTown_Hall/header.s +++ /dev/null @@ -1,14 +0,0 @@ -DewfordTown_Hall:: @ 8305BB8 - .4byte DewfordTown_Hall_MapAttributes - .4byte DewfordTown_Hall_MapEvents - .4byte DewfordTown_Hall_MapScripts - .4byte 0x0 - .2byte BGM_HIGHTOWN - .2byte 66 - .byte 2 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/DewfordTown_House1/header.inc b/data/maps/DewfordTown_House1/header.inc new file mode 100644 index 000000000..95a8a8339 --- /dev/null +++ b/data/maps/DewfordTown_House1/header.inc @@ -0,0 +1,14 @@ +DewfordTown_House1:: @ 8305B48 + .4byte DewfordTown_House1_MapAttributes + .4byte DewfordTown_House1_MapEvents + .4byte DewfordTown_House1_MapScripts + .4byte 0x0 + .2byte BGM_HIGHTOWN + .2byte 64 + .byte 2 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/DewfordTown_House1/header.s b/data/maps/DewfordTown_House1/header.s deleted file mode 100644 index 95a8a8339..000000000 --- a/data/maps/DewfordTown_House1/header.s +++ /dev/null @@ -1,14 +0,0 @@ -DewfordTown_House1:: @ 8305B48 - .4byte DewfordTown_House1_MapAttributes - .4byte DewfordTown_House1_MapEvents - .4byte DewfordTown_House1_MapScripts - .4byte 0x0 - .2byte BGM_HIGHTOWN - .2byte 64 - .byte 2 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/DewfordTown_House2/header.inc b/data/maps/DewfordTown_House2/header.inc new file mode 100644 index 000000000..37aac2ead --- /dev/null +++ b/data/maps/DewfordTown_House2/header.inc @@ -0,0 +1,14 @@ +DewfordTown_House2:: @ 8305BD4 + .4byte DewfordTown_House2_MapAttributes + .4byte DewfordTown_House2_MapEvents + .4byte DewfordTown_House2_MapScripts + .4byte 0x0 + .2byte BGM_HIGHTOWN + .2byte 67 + .byte 2 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/DewfordTown_House2/header.s b/data/maps/DewfordTown_House2/header.s deleted file mode 100644 index 37aac2ead..000000000 --- a/data/maps/DewfordTown_House2/header.s +++ /dev/null @@ -1,14 +0,0 @@ -DewfordTown_House2:: @ 8305BD4 - .4byte DewfordTown_House2_MapAttributes - .4byte DewfordTown_House2_MapEvents - .4byte DewfordTown_House2_MapScripts - .4byte 0x0 - .2byte BGM_HIGHTOWN - .2byte 67 - .byte 2 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/DewfordTown_PokemonCenter_1F/header.inc b/data/maps/DewfordTown_PokemonCenter_1F/header.inc new file mode 100644 index 000000000..9cf0a8f46 --- /dev/null +++ b/data/maps/DewfordTown_PokemonCenter_1F/header.inc @@ -0,0 +1,14 @@ +DewfordTown_PokemonCenter_1F:: @ 8305B64 + .4byte PokemonCenter_1F_MapAttributes + .4byte DewfordTown_PokemonCenter_1F_MapEvents + .4byte DewfordTown_PokemonCenter_1F_MapScripts + .4byte 0x0 + .2byte BGM_POKECEN + .2byte 61 + .byte 2 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/DewfordTown_PokemonCenter_1F/header.s b/data/maps/DewfordTown_PokemonCenter_1F/header.s deleted file mode 100644 index 9cf0a8f46..000000000 --- a/data/maps/DewfordTown_PokemonCenter_1F/header.s +++ /dev/null @@ -1,14 +0,0 @@ -DewfordTown_PokemonCenter_1F:: @ 8305B64 - .4byte PokemonCenter_1F_MapAttributes - .4byte DewfordTown_PokemonCenter_1F_MapEvents - .4byte DewfordTown_PokemonCenter_1F_MapScripts - .4byte 0x0 - .2byte BGM_POKECEN - .2byte 61 - .byte 2 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/DewfordTown_PokemonCenter_2F/header.inc b/data/maps/DewfordTown_PokemonCenter_2F/header.inc new file mode 100644 index 000000000..a54a51c94 --- /dev/null +++ b/data/maps/DewfordTown_PokemonCenter_2F/header.inc @@ -0,0 +1,14 @@ +DewfordTown_PokemonCenter_2F:: @ 8305B80 + .4byte PokemonCenter_2F_MapAttributes + .4byte DewfordTown_PokemonCenter_2F_MapEvents + .4byte DewfordTown_PokemonCenter_2F_MapScripts + .4byte 0x0 + .2byte BGM_POKECEN + .2byte 62 + .byte 2 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/DewfordTown_PokemonCenter_2F/header.s b/data/maps/DewfordTown_PokemonCenter_2F/header.s deleted file mode 100644 index a54a51c94..000000000 --- a/data/maps/DewfordTown_PokemonCenter_2F/header.s +++ /dev/null @@ -1,14 +0,0 @@ -DewfordTown_PokemonCenter_2F:: @ 8305B80 - .4byte PokemonCenter_2F_MapAttributes - .4byte DewfordTown_PokemonCenter_2F_MapEvents - .4byte DewfordTown_PokemonCenter_2F_MapScripts - .4byte 0x0 - .2byte BGM_POKECEN - .2byte 62 - .byte 2 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/DoubleBattleColosseum/header.inc b/data/maps/DoubleBattleColosseum/header.inc new file mode 100644 index 000000000..baf1b8076 --- /dev/null +++ b/data/maps/DoubleBattleColosseum/header.inc @@ -0,0 +1,14 @@ +DoubleBattleColosseum:: @ 83079CC + .4byte DoubleBattleColosseum_MapAttributes + .4byte DoubleBattleColosseum_MapEvents + .4byte DoubleBattleColosseum_MapScripts + .4byte 0x0 + .2byte BGM_RAINBOW + .2byte 225 + .byte 87 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 8 diff --git a/data/maps/DoubleBattleColosseum/header.s b/data/maps/DoubleBattleColosseum/header.s deleted file mode 100644 index baf1b8076..000000000 --- a/data/maps/DoubleBattleColosseum/header.s +++ /dev/null @@ -1,14 +0,0 @@ -DoubleBattleColosseum:: @ 83079CC - .4byte DoubleBattleColosseum_MapAttributes - .4byte DoubleBattleColosseum_MapEvents - .4byte DoubleBattleColosseum_MapScripts - .4byte 0x0 - .2byte BGM_RAINBOW - .2byte 225 - .byte 87 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 8 diff --git a/data/maps/EverGrandeCity/connections.inc b/data/maps/EverGrandeCity/connections.inc new file mode 100644 index 000000000..fd81ce46b --- /dev/null +++ b/data/maps/EverGrandeCity/connections.inc @@ -0,0 +1,6 @@ +EverGrandeCity_MapConnectionsList:: @ 8308808 + connection left, 40, Route128 + +EverGrandeCity_MapConnections:: @ 8308814 + .4byte 0x1 + .4byte EverGrandeCity_MapConnectionsList diff --git a/data/maps/EverGrandeCity/connections.s b/data/maps/EverGrandeCity/connections.s deleted file mode 100644 index fd81ce46b..000000000 --- a/data/maps/EverGrandeCity/connections.s +++ /dev/null @@ -1,6 +0,0 @@ -EverGrandeCity_MapConnectionsList:: @ 8308808 - connection left, 40, Route128 - -EverGrandeCity_MapConnections:: @ 8308814 - .4byte 0x1 - .4byte EverGrandeCity_MapConnectionsList diff --git a/data/maps/EverGrandeCity/header.inc b/data/maps/EverGrandeCity/header.inc new file mode 100644 index 000000000..0c1f6eab0 --- /dev/null +++ b/data/maps/EverGrandeCity/header.inc @@ -0,0 +1,14 @@ +EverGrandeCity:: @ 8305528 + .4byte EverGrandeCity_MapAttributes + .4byte EverGrandeCity_MapEvents + .4byte EverGrandeCity_MapScripts + .4byte EverGrandeCity_MapConnections + .2byte BGM_RAINBOW + .2byte 9 + .byte 15 + .byte 0 + .byte 2 + .byte 2 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/EverGrandeCity/header.s b/data/maps/EverGrandeCity/header.s deleted file mode 100644 index 0c1f6eab0..000000000 --- a/data/maps/EverGrandeCity/header.s +++ /dev/null @@ -1,14 +0,0 @@ -EverGrandeCity:: @ 8305528 - .4byte EverGrandeCity_MapAttributes - .4byte EverGrandeCity_MapEvents - .4byte EverGrandeCity_MapScripts - .4byte EverGrandeCity_MapConnections - .2byte BGM_RAINBOW - .2byte 9 - .byte 15 - .byte 0 - .byte 2 - .byte 2 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/EverGrandeCity_ChampionsRoom/header.inc b/data/maps/EverGrandeCity_ChampionsRoom/header.inc new file mode 100644 index 000000000..154d5ba29 --- /dev/null +++ b/data/maps/EverGrandeCity_ChampionsRoom/header.inc @@ -0,0 +1,14 @@ +EverGrandeCity_ChampionsRoom:: @ 8306B08 + .4byte EverGrandeCity_ChampionsRoom_MapAttributes + .4byte EverGrandeCity_ChampionsRoom_MapEvents + .4byte EverGrandeCity_ChampionsRoom_MapScripts + .4byte 0x0 + .2byte BGM_C_ROAD + .2byte 116 + .byte 15 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/EverGrandeCity_ChampionsRoom/header.s b/data/maps/EverGrandeCity_ChampionsRoom/header.s deleted file mode 100644 index 154d5ba29..000000000 --- a/data/maps/EverGrandeCity_ChampionsRoom/header.s +++ /dev/null @@ -1,14 +0,0 @@ -EverGrandeCity_ChampionsRoom:: @ 8306B08 - .4byte EverGrandeCity_ChampionsRoom_MapAttributes - .4byte EverGrandeCity_ChampionsRoom_MapEvents - .4byte EverGrandeCity_ChampionsRoom_MapScripts - .4byte 0x0 - .2byte BGM_C_ROAD - .2byte 116 - .byte 15 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/EverGrandeCity_Corridor1/header.inc b/data/maps/EverGrandeCity_Corridor1/header.inc new file mode 100644 index 000000000..68d16484e --- /dev/null +++ b/data/maps/EverGrandeCity_Corridor1/header.inc @@ -0,0 +1,14 @@ +EverGrandeCity_Corridor1:: @ 8306B24 + .4byte EverGrandeCity_Corridor1_MapAttributes + .4byte EverGrandeCity_Corridor1_MapEvents + .4byte EverGrandeCity_Corridor1_MapScripts + .4byte 0x0 + .2byte BGM_C_ROAD + .2byte 117 + .byte 15 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/EverGrandeCity_Corridor1/header.s b/data/maps/EverGrandeCity_Corridor1/header.s deleted file mode 100644 index 68d16484e..000000000 --- a/data/maps/EverGrandeCity_Corridor1/header.s +++ /dev/null @@ -1,14 +0,0 @@ -EverGrandeCity_Corridor1:: @ 8306B24 - .4byte EverGrandeCity_Corridor1_MapAttributes - .4byte EverGrandeCity_Corridor1_MapEvents - .4byte EverGrandeCity_Corridor1_MapScripts - .4byte 0x0 - .2byte BGM_C_ROAD - .2byte 117 - .byte 15 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/EverGrandeCity_Corridor2/header.inc b/data/maps/EverGrandeCity_Corridor2/header.inc new file mode 100644 index 000000000..0dab21f9a --- /dev/null +++ b/data/maps/EverGrandeCity_Corridor2/header.inc @@ -0,0 +1,14 @@ +EverGrandeCity_Corridor2:: @ 8306B40 + .4byte EverGrandeCity_Corridor2_MapAttributes + .4byte EverGrandeCity_Corridor2_MapEvents + .4byte EverGrandeCity_Corridor2_MapScripts + .4byte 0x0 + .2byte BGM_C_ROAD + .2byte 117 + .byte 15 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/EverGrandeCity_Corridor2/header.s b/data/maps/EverGrandeCity_Corridor2/header.s deleted file mode 100644 index 0dab21f9a..000000000 --- a/data/maps/EverGrandeCity_Corridor2/header.s +++ /dev/null @@ -1,14 +0,0 @@ -EverGrandeCity_Corridor2:: @ 8306B40 - .4byte EverGrandeCity_Corridor2_MapAttributes - .4byte EverGrandeCity_Corridor2_MapEvents - .4byte EverGrandeCity_Corridor2_MapScripts - .4byte 0x0 - .2byte BGM_C_ROAD - .2byte 117 - .byte 15 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/EverGrandeCity_Corridor3/header.inc b/data/maps/EverGrandeCity_Corridor3/header.inc new file mode 100644 index 000000000..3d20a6a41 --- /dev/null +++ b/data/maps/EverGrandeCity_Corridor3/header.inc @@ -0,0 +1,14 @@ +EverGrandeCity_Corridor3:: @ 8306B5C + .4byte EverGrandeCity_Corridor3_MapAttributes + .4byte EverGrandeCity_Corridor3_MapEvents + .4byte EverGrandeCity_Corridor3_MapScripts + .4byte 0x0 + .2byte BGM_C_ROAD + .2byte 117 + .byte 15 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/EverGrandeCity_Corridor3/header.s b/data/maps/EverGrandeCity_Corridor3/header.s deleted file mode 100644 index 3d20a6a41..000000000 --- a/data/maps/EverGrandeCity_Corridor3/header.s +++ /dev/null @@ -1,14 +0,0 @@ -EverGrandeCity_Corridor3:: @ 8306B5C - .4byte EverGrandeCity_Corridor3_MapAttributes - .4byte EverGrandeCity_Corridor3_MapEvents - .4byte EverGrandeCity_Corridor3_MapScripts - .4byte 0x0 - .2byte BGM_C_ROAD - .2byte 117 - .byte 15 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/EverGrandeCity_Corridor4/header.inc b/data/maps/EverGrandeCity_Corridor4/header.inc new file mode 100644 index 000000000..56a5297d7 --- /dev/null +++ b/data/maps/EverGrandeCity_Corridor4/header.inc @@ -0,0 +1,14 @@ +EverGrandeCity_Corridor4:: @ 8306B78 + .4byte EverGrandeCity_Corridor4_MapAttributes + .4byte EverGrandeCity_Corridor4_MapEvents + .4byte EverGrandeCity_Corridor4_MapScripts + .4byte 0x0 + .2byte BGM_C_ROAD + .2byte 316 + .byte 15 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/EverGrandeCity_Corridor4/header.s b/data/maps/EverGrandeCity_Corridor4/header.s deleted file mode 100644 index 56a5297d7..000000000 --- a/data/maps/EverGrandeCity_Corridor4/header.s +++ /dev/null @@ -1,14 +0,0 @@ -EverGrandeCity_Corridor4:: @ 8306B78 - .4byte EverGrandeCity_Corridor4_MapAttributes - .4byte EverGrandeCity_Corridor4_MapEvents - .4byte EverGrandeCity_Corridor4_MapScripts - .4byte 0x0 - .2byte BGM_C_ROAD - .2byte 316 - .byte 15 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/EverGrandeCity_Corridor5/header.inc b/data/maps/EverGrandeCity_Corridor5/header.inc new file mode 100644 index 000000000..2ca1fef86 --- /dev/null +++ b/data/maps/EverGrandeCity_Corridor5/header.inc @@ -0,0 +1,14 @@ +EverGrandeCity_Corridor5:: @ 8306B94 + .4byte EverGrandeCity_Corridor5_MapAttributes + .4byte EverGrandeCity_Corridor5_MapEvents + .4byte EverGrandeCity_Corridor5_MapScripts + .4byte 0x0 + .2byte BGM_C_ROAD + .2byte 117 + .byte 15 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/EverGrandeCity_Corridor5/header.s b/data/maps/EverGrandeCity_Corridor5/header.s deleted file mode 100644 index 2ca1fef86..000000000 --- a/data/maps/EverGrandeCity_Corridor5/header.s +++ /dev/null @@ -1,14 +0,0 @@ -EverGrandeCity_Corridor5:: @ 8306B94 - .4byte EverGrandeCity_Corridor5_MapAttributes - .4byte EverGrandeCity_Corridor5_MapEvents - .4byte EverGrandeCity_Corridor5_MapScripts - .4byte 0x0 - .2byte BGM_C_ROAD - .2byte 117 - .byte 15 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/EverGrandeCity_DrakesRoom/header.inc b/data/maps/EverGrandeCity_DrakesRoom/header.inc new file mode 100644 index 000000000..04c1d9f32 --- /dev/null +++ b/data/maps/EverGrandeCity_DrakesRoom/header.inc @@ -0,0 +1,14 @@ +EverGrandeCity_DrakesRoom:: @ 8306AEC + .4byte EverGrandeCity_DrakesRoom_MapAttributes + .4byte EverGrandeCity_DrakesRoom_MapEvents + .4byte EverGrandeCity_DrakesRoom_MapScripts + .4byte 0x0 + .2byte BGM_C_ROAD + .2byte 115 + .byte 15 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 7 diff --git a/data/maps/EverGrandeCity_DrakesRoom/header.s b/data/maps/EverGrandeCity_DrakesRoom/header.s deleted file mode 100644 index 04c1d9f32..000000000 --- a/data/maps/EverGrandeCity_DrakesRoom/header.s +++ /dev/null @@ -1,14 +0,0 @@ -EverGrandeCity_DrakesRoom:: @ 8306AEC - .4byte EverGrandeCity_DrakesRoom_MapAttributes - .4byte EverGrandeCity_DrakesRoom_MapEvents - .4byte EverGrandeCity_DrakesRoom_MapScripts - .4byte 0x0 - .2byte BGM_C_ROAD - .2byte 115 - .byte 15 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 7 diff --git a/data/maps/EverGrandeCity_GlaciasRoom/header.inc b/data/maps/EverGrandeCity_GlaciasRoom/header.inc new file mode 100644 index 000000000..e0a48f9a6 --- /dev/null +++ b/data/maps/EverGrandeCity_GlaciasRoom/header.inc @@ -0,0 +1,14 @@ +EverGrandeCity_GlaciasRoom:: @ 8306AD0 + .4byte EverGrandeCity_GlaciasRoom_MapAttributes + .4byte EverGrandeCity_GlaciasRoom_MapEvents + .4byte EverGrandeCity_GlaciasRoom_MapScripts + .4byte 0x0 + .2byte BGM_C_ROAD + .2byte 114 + .byte 15 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 6 diff --git a/data/maps/EverGrandeCity_GlaciasRoom/header.s b/data/maps/EverGrandeCity_GlaciasRoom/header.s deleted file mode 100644 index e0a48f9a6..000000000 --- a/data/maps/EverGrandeCity_GlaciasRoom/header.s +++ /dev/null @@ -1,14 +0,0 @@ -EverGrandeCity_GlaciasRoom:: @ 8306AD0 - .4byte EverGrandeCity_GlaciasRoom_MapAttributes - .4byte EverGrandeCity_GlaciasRoom_MapEvents - .4byte EverGrandeCity_GlaciasRoom_MapScripts - .4byte 0x0 - .2byte BGM_C_ROAD - .2byte 114 - .byte 15 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 6 diff --git a/data/maps/EverGrandeCity_HallOfFame/header.inc b/data/maps/EverGrandeCity_HallOfFame/header.inc new file mode 100644 index 000000000..b7816ea86 --- /dev/null +++ b/data/maps/EverGrandeCity_HallOfFame/header.inc @@ -0,0 +1,14 @@ +EverGrandeCity_HallOfFame:: @ 8306BCC + .4byte EverGrandeCity_HallOfFame_MapAttributes + .4byte EverGrandeCity_HallOfFame_MapEvents + .4byte EverGrandeCity_HallOfFame_MapScripts + .4byte 0x0 + .2byte BGM_EIKOU_R + .2byte 299 + .byte 15 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/EverGrandeCity_HallOfFame/header.s b/data/maps/EverGrandeCity_HallOfFame/header.s deleted file mode 100644 index b7816ea86..000000000 --- a/data/maps/EverGrandeCity_HallOfFame/header.s +++ /dev/null @@ -1,14 +0,0 @@ -EverGrandeCity_HallOfFame:: @ 8306BCC - .4byte EverGrandeCity_HallOfFame_MapAttributes - .4byte EverGrandeCity_HallOfFame_MapEvents - .4byte EverGrandeCity_HallOfFame_MapScripts - .4byte 0x0 - .2byte BGM_EIKOU_R - .2byte 299 - .byte 15 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/EverGrandeCity_PhoebesRoom/header.inc b/data/maps/EverGrandeCity_PhoebesRoom/header.inc new file mode 100644 index 000000000..f9ef5a516 --- /dev/null +++ b/data/maps/EverGrandeCity_PhoebesRoom/header.inc @@ -0,0 +1,14 @@ +EverGrandeCity_PhoebesRoom:: @ 8306AB4 + .4byte EverGrandeCity_PhoebesRoom_MapAttributes + .4byte EverGrandeCity_PhoebesRoom_MapEvents + .4byte EverGrandeCity_PhoebesRoom_MapScripts + .4byte 0x0 + .2byte BGM_C_ROAD + .2byte 113 + .byte 15 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 5 diff --git a/data/maps/EverGrandeCity_PhoebesRoom/header.s b/data/maps/EverGrandeCity_PhoebesRoom/header.s deleted file mode 100644 index f9ef5a516..000000000 --- a/data/maps/EverGrandeCity_PhoebesRoom/header.s +++ /dev/null @@ -1,14 +0,0 @@ -EverGrandeCity_PhoebesRoom:: @ 8306AB4 - .4byte EverGrandeCity_PhoebesRoom_MapAttributes - .4byte EverGrandeCity_PhoebesRoom_MapEvents - .4byte EverGrandeCity_PhoebesRoom_MapScripts - .4byte 0x0 - .2byte BGM_C_ROAD - .2byte 113 - .byte 15 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 5 diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc b/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc new file mode 100644 index 000000000..2b72fc661 --- /dev/null +++ b/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc @@ -0,0 +1,14 @@ +EverGrandeCity_PokemonCenter_1F:: @ 8306BE8 + .4byte PokemonCenter_1F_MapAttributes + .4byte EverGrandeCity_PokemonCenter_1F_MapEvents + .4byte EverGrandeCity_PokemonCenter_1F_MapScripts + .4byte 0x0 + .2byte BGM_POKECEN + .2byte 61 + .byte 15 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/header.s b/data/maps/EverGrandeCity_PokemonCenter_1F/header.s deleted file mode 100644 index 2b72fc661..000000000 --- a/data/maps/EverGrandeCity_PokemonCenter_1F/header.s +++ /dev/null @@ -1,14 +0,0 @@ -EverGrandeCity_PokemonCenter_1F:: @ 8306BE8 - .4byte PokemonCenter_1F_MapAttributes - .4byte EverGrandeCity_PokemonCenter_1F_MapEvents - .4byte EverGrandeCity_PokemonCenter_1F_MapScripts - .4byte 0x0 - .2byte BGM_POKECEN - .2byte 61 - .byte 15 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc b/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc new file mode 100644 index 000000000..b60e3c3df --- /dev/null +++ b/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc @@ -0,0 +1,14 @@ +EverGrandeCity_PokemonCenter_2F:: @ 8306C04 + .4byte PokemonCenter_2F_MapAttributes + .4byte EverGrandeCity_PokemonCenter_2F_MapEvents + .4byte EverGrandeCity_PokemonCenter_2F_MapScripts + .4byte 0x0 + .2byte BGM_POKECEN + .2byte 62 + .byte 15 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/EverGrandeCity_PokemonCenter_2F/header.s b/data/maps/EverGrandeCity_PokemonCenter_2F/header.s deleted file mode 100644 index b60e3c3df..000000000 --- a/data/maps/EverGrandeCity_PokemonCenter_2F/header.s +++ /dev/null @@ -1,14 +0,0 @@ -EverGrandeCity_PokemonCenter_2F:: @ 8306C04 - .4byte PokemonCenter_2F_MapAttributes - .4byte EverGrandeCity_PokemonCenter_2F_MapEvents - .4byte EverGrandeCity_PokemonCenter_2F_MapScripts - .4byte 0x0 - .2byte BGM_POKECEN - .2byte 62 - .byte 15 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/EverGrandeCity_PokemonLeague/header.inc b/data/maps/EverGrandeCity_PokemonLeague/header.inc new file mode 100644 index 000000000..cf24b61dc --- /dev/null +++ b/data/maps/EverGrandeCity_PokemonLeague/header.inc @@ -0,0 +1,14 @@ +EverGrandeCity_PokemonLeague:: @ 8306BB0 + .4byte EverGrandeCity_PokemonLeague_MapAttributes + .4byte EverGrandeCity_PokemonLeague_MapEvents + .4byte EverGrandeCity_PokemonLeague_MapScripts + .4byte 0x0 + .2byte BGM_POKECEN + .2byte 271 + .byte 15 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/EverGrandeCity_PokemonLeague/header.s b/data/maps/EverGrandeCity_PokemonLeague/header.s deleted file mode 100644 index cf24b61dc..000000000 --- a/data/maps/EverGrandeCity_PokemonLeague/header.s +++ /dev/null @@ -1,14 +0,0 @@ -EverGrandeCity_PokemonLeague:: @ 8306BB0 - .4byte EverGrandeCity_PokemonLeague_MapAttributes - .4byte EverGrandeCity_PokemonLeague_MapEvents - .4byte EverGrandeCity_PokemonLeague_MapScripts - .4byte 0x0 - .2byte BGM_POKECEN - .2byte 271 - .byte 15 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/EverGrandeCity_SidneysRoom/header.inc b/data/maps/EverGrandeCity_SidneysRoom/header.inc new file mode 100644 index 000000000..7c2ee11f8 --- /dev/null +++ b/data/maps/EverGrandeCity_SidneysRoom/header.inc @@ -0,0 +1,14 @@ +EverGrandeCity_SidneysRoom:: @ 8306A98 + .4byte EverGrandeCity_SidneysRoom_MapAttributes + .4byte EverGrandeCity_SidneysRoom_MapEvents + .4byte EverGrandeCity_SidneysRoom_MapScripts + .4byte 0x0 + .2byte BGM_C_ROAD + .2byte 112 + .byte 15 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 4 diff --git a/data/maps/EverGrandeCity_SidneysRoom/header.s b/data/maps/EverGrandeCity_SidneysRoom/header.s deleted file mode 100644 index 7c2ee11f8..000000000 --- a/data/maps/EverGrandeCity_SidneysRoom/header.s +++ /dev/null @@ -1,14 +0,0 @@ -EverGrandeCity_SidneysRoom:: @ 8306A98 - .4byte EverGrandeCity_SidneysRoom_MapAttributes - .4byte EverGrandeCity_SidneysRoom_MapEvents - .4byte EverGrandeCity_SidneysRoom_MapScripts - .4byte 0x0 - .2byte BGM_C_ROAD - .2byte 112 - .byte 15 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 4 diff --git a/data/maps/FallarborTown/connections.inc b/data/maps/FallarborTown/connections.inc new file mode 100644 index 000000000..259d5adf0 --- /dev/null +++ b/data/maps/FallarborTown/connections.inc @@ -0,0 +1,7 @@ +FallarborTown_MapConnectionsList:: @ 8308684 + connection left, 0, Route114 + connection right, 0, Route113 + +FallarborTown_MapConnections:: @ 830869C + .4byte 0x2 + .4byte FallarborTown_MapConnectionsList diff --git a/data/maps/FallarborTown/connections.s b/data/maps/FallarborTown/connections.s deleted file mode 100644 index 259d5adf0..000000000 --- a/data/maps/FallarborTown/connections.s +++ /dev/null @@ -1,7 +0,0 @@ -FallarborTown_MapConnectionsList:: @ 8308684 - connection left, 0, Route114 - connection right, 0, Route113 - -FallarborTown_MapConnections:: @ 830869C - .4byte 0x2 - .4byte FallarborTown_MapConnectionsList diff --git a/data/maps/FallarborTown/header.inc b/data/maps/FallarborTown/header.inc new file mode 100644 index 000000000..bd719a36b --- /dev/null +++ b/data/maps/FallarborTown/header.inc @@ -0,0 +1,14 @@ +FallarborTown:: @ 83055B4 + .4byte FallarborTown_MapAttributes + .4byte FallarborTown_MapEvents + .4byte FallarborTown_MapScripts + .4byte FallarborTown_MapConnections + .2byte BGM_TONEKUSA + .2byte 14 + .byte 4 + .byte 0 + .byte 2 + .byte 1 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/FallarborTown/header.s b/data/maps/FallarborTown/header.s deleted file mode 100644 index bd719a36b..000000000 --- a/data/maps/FallarborTown/header.s +++ /dev/null @@ -1,14 +0,0 @@ -FallarborTown:: @ 83055B4 - .4byte FallarborTown_MapAttributes - .4byte FallarborTown_MapEvents - .4byte FallarborTown_MapScripts - .4byte FallarborTown_MapConnections - .2byte BGM_TONEKUSA - .2byte 14 - .byte 4 - .byte 0 - .byte 2 - .byte 1 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/FallarborTown_ContestHall/header.inc b/data/maps/FallarborTown_ContestHall/header.inc new file mode 100644 index 000000000..aa540e338 --- /dev/null +++ b/data/maps/FallarborTown_ContestHall/header.inc @@ -0,0 +1,14 @@ +FallarborTown_ContestHall:: @ 8305CEC + .4byte FallarborTown_ContestHall_MapAttributes + .4byte FallarborTown_ContestHall_MapEvents + .4byte FallarborTown_ContestHall_MapScripts + .4byte 0x0 + .2byte BGM_CONLOBBY + .2byte 73 + .byte 4 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/FallarborTown_ContestHall/header.s b/data/maps/FallarborTown_ContestHall/header.s deleted file mode 100644 index aa540e338..000000000 --- a/data/maps/FallarborTown_ContestHall/header.s +++ /dev/null @@ -1,14 +0,0 @@ -FallarborTown_ContestHall:: @ 8305CEC - .4byte FallarborTown_ContestHall_MapAttributes - .4byte FallarborTown_ContestHall_MapEvents - .4byte FallarborTown_ContestHall_MapScripts - .4byte 0x0 - .2byte BGM_CONLOBBY - .2byte 73 - .byte 4 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/FallarborTown_ContestLobby/header.inc b/data/maps/FallarborTown_ContestLobby/header.inc new file mode 100644 index 000000000..2f25d3675 --- /dev/null +++ b/data/maps/FallarborTown_ContestLobby/header.inc @@ -0,0 +1,14 @@ +FallarborTown_ContestLobby:: @ 8305CD0 + .4byte FallarborTown_ContestLobby_MapAttributes + .4byte FallarborTown_ContestLobby_MapEvents + .4byte FallarborTown_ContestLobby_MapScripts + .4byte 0x0 + .2byte BGM_CONLOBBY + .2byte 72 + .byte 4 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/FallarborTown_ContestLobby/header.s b/data/maps/FallarborTown_ContestLobby/header.s deleted file mode 100644 index 2f25d3675..000000000 --- a/data/maps/FallarborTown_ContestLobby/header.s +++ /dev/null @@ -1,14 +0,0 @@ -FallarborTown_ContestLobby:: @ 8305CD0 - .4byte FallarborTown_ContestLobby_MapAttributes - .4byte FallarborTown_ContestLobby_MapEvents - .4byte FallarborTown_ContestLobby_MapScripts - .4byte 0x0 - .2byte BGM_CONLOBBY - .2byte 72 - .byte 4 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/FallarborTown_House1/header.inc b/data/maps/FallarborTown_House1/header.inc new file mode 100644 index 000000000..2761536b6 --- /dev/null +++ b/data/maps/FallarborTown_House1/header.inc @@ -0,0 +1,14 @@ +FallarborTown_House1:: @ 8305D40 + .4byte House1_MapAttributes + .4byte FallarborTown_House1_MapEvents + .4byte FallarborTown_House1_MapScripts + .4byte 0x0 + .2byte BGM_TONEKUSA + .2byte 59 + .byte 4 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/FallarborTown_House1/header.s b/data/maps/FallarborTown_House1/header.s deleted file mode 100644 index 2761536b6..000000000 --- a/data/maps/FallarborTown_House1/header.s +++ /dev/null @@ -1,14 +0,0 @@ -FallarborTown_House1:: @ 8305D40 - .4byte House1_MapAttributes - .4byte FallarborTown_House1_MapEvents - .4byte FallarborTown_House1_MapScripts - .4byte 0x0 - .2byte BGM_TONEKUSA - .2byte 59 - .byte 4 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/FallarborTown_House2/header.inc b/data/maps/FallarborTown_House2/header.inc new file mode 100644 index 000000000..0366c201a --- /dev/null +++ b/data/maps/FallarborTown_House2/header.inc @@ -0,0 +1,14 @@ +FallarborTown_House2:: @ 8305D5C + .4byte House2_MapAttributes + .4byte FallarborTown_House2_MapEvents + .4byte FallarborTown_House2_MapScripts + .4byte 0x0 + .2byte BGM_TONEKUSA + .2byte 60 + .byte 4 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/FallarborTown_House2/header.s b/data/maps/FallarborTown_House2/header.s deleted file mode 100644 index 0366c201a..000000000 --- a/data/maps/FallarborTown_House2/header.s +++ /dev/null @@ -1,14 +0,0 @@ -FallarborTown_House2:: @ 8305D5C - .4byte House2_MapAttributes - .4byte FallarborTown_House2_MapEvents - .4byte FallarborTown_House2_MapScripts - .4byte 0x0 - .2byte BGM_TONEKUSA - .2byte 60 - .byte 4 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/FallarborTown_Mart/header.inc b/data/maps/FallarborTown_Mart/header.inc new file mode 100644 index 000000000..b60fa85c8 --- /dev/null +++ b/data/maps/FallarborTown_Mart/header.inc @@ -0,0 +1,14 @@ +FallarborTown_Mart:: @ 8305CB4 + .4byte PokeMart_MapAttributes + .4byte FallarborTown_Mart_MapEvents + .4byte FallarborTown_Mart_MapScripts + .4byte 0x0 + .2byte BGM_FRIENDLY + .2byte 63 + .byte 4 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/FallarborTown_Mart/header.s b/data/maps/FallarborTown_Mart/header.s deleted file mode 100644 index b60fa85c8..000000000 --- a/data/maps/FallarborTown_Mart/header.s +++ /dev/null @@ -1,14 +0,0 @@ -FallarborTown_Mart:: @ 8305CB4 - .4byte PokeMart_MapAttributes - .4byte FallarborTown_Mart_MapEvents - .4byte FallarborTown_Mart_MapScripts - .4byte 0x0 - .2byte BGM_FRIENDLY - .2byte 63 - .byte 4 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/FallarborTown_PokemonCenter_1F/header.inc b/data/maps/FallarborTown_PokemonCenter_1F/header.inc new file mode 100644 index 000000000..8ffb95e0c --- /dev/null +++ b/data/maps/FallarborTown_PokemonCenter_1F/header.inc @@ -0,0 +1,14 @@ +FallarborTown_PokemonCenter_1F:: @ 8305D08 + .4byte PokemonCenter_1F_MapAttributes + .4byte FallarborTown_PokemonCenter_1F_MapEvents + .4byte FallarborTown_PokemonCenter_1F_MapScripts + .4byte 0x0 + .2byte BGM_POKECEN + .2byte 61 + .byte 4 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/FallarborTown_PokemonCenter_1F/header.s b/data/maps/FallarborTown_PokemonCenter_1F/header.s deleted file mode 100644 index 8ffb95e0c..000000000 --- a/data/maps/FallarborTown_PokemonCenter_1F/header.s +++ /dev/null @@ -1,14 +0,0 @@ -FallarborTown_PokemonCenter_1F:: @ 8305D08 - .4byte PokemonCenter_1F_MapAttributes - .4byte FallarborTown_PokemonCenter_1F_MapEvents - .4byte FallarborTown_PokemonCenter_1F_MapScripts - .4byte 0x0 - .2byte BGM_POKECEN - .2byte 61 - .byte 4 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/FallarborTown_PokemonCenter_2F/header.inc b/data/maps/FallarborTown_PokemonCenter_2F/header.inc new file mode 100644 index 000000000..45120890d --- /dev/null +++ b/data/maps/FallarborTown_PokemonCenter_2F/header.inc @@ -0,0 +1,14 @@ +FallarborTown_PokemonCenter_2F:: @ 8305D24 + .4byte PokemonCenter_2F_MapAttributes + .4byte FallarborTown_PokemonCenter_2F_MapEvents + .4byte FallarborTown_PokemonCenter_2F_MapScripts + .4byte 0x0 + .2byte BGM_POKECEN + .2byte 62 + .byte 4 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/FallarborTown_PokemonCenter_2F/header.s b/data/maps/FallarborTown_PokemonCenter_2F/header.s deleted file mode 100644 index 45120890d..000000000 --- a/data/maps/FallarborTown_PokemonCenter_2F/header.s +++ /dev/null @@ -1,14 +0,0 @@ -FallarborTown_PokemonCenter_2F:: @ 8305D24 - .4byte PokemonCenter_2F_MapAttributes - .4byte FallarborTown_PokemonCenter_2F_MapEvents - .4byte FallarborTown_PokemonCenter_2F_MapScripts - .4byte 0x0 - .2byte BGM_POKECEN - .2byte 62 - .byte 4 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/FieryPath/header.inc b/data/maps/FieryPath/header.inc new file mode 100644 index 000000000..ccca2e656 --- /dev/null +++ b/data/maps/FieryPath/header.inc @@ -0,0 +1,14 @@ +FieryPath:: @ 8306EF8 + .4byte FieryPath_MapAttributes + .4byte FieryPath_MapEvents + .4byte FieryPath_MapScripts + .4byte 0x0 + .2byte BGM_DAN01 + .2byte 294 + .byte 74 + .byte 0 + .byte 0 + .byte 4 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/FieryPath/header.s b/data/maps/FieryPath/header.s deleted file mode 100644 index ccca2e656..000000000 --- a/data/maps/FieryPath/header.s +++ /dev/null @@ -1,14 +0,0 @@ -FieryPath:: @ 8306EF8 - .4byte FieryPath_MapAttributes - .4byte FieryPath_MapEvents - .4byte FieryPath_MapScripts - .4byte 0x0 - .2byte BGM_DAN01 - .2byte 294 - .byte 74 - .byte 0 - .byte 0 - .byte 4 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/FortreeCity/connections.inc b/data/maps/FortreeCity/connections.inc new file mode 100644 index 000000000..3012973d8 --- /dev/null +++ b/data/maps/FortreeCity/connections.inc @@ -0,0 +1,7 @@ +FortreeCity_MapConnectionsList:: @ 8308794 + connection left, 0, Route119 + connection right, 0, Route120 + +FortreeCity_MapConnections:: @ 83087AC + .4byte 0x2 + .4byte FortreeCity_MapConnectionsList diff --git a/data/maps/FortreeCity/connections.s b/data/maps/FortreeCity/connections.s deleted file mode 100644 index 3012973d8..000000000 --- a/data/maps/FortreeCity/connections.s +++ /dev/null @@ -1,7 +0,0 @@ -FortreeCity_MapConnectionsList:: @ 8308794 - connection left, 0, Route119 - connection right, 0, Route120 - -FortreeCity_MapConnections:: @ 83087AC - .4byte 0x2 - .4byte FortreeCity_MapConnectionsList diff --git a/data/maps/FortreeCity/header.inc b/data/maps/FortreeCity/header.inc new file mode 100644 index 000000000..4c96de2b2 --- /dev/null +++ b/data/maps/FortreeCity/header.inc @@ -0,0 +1,14 @@ +FortreeCity:: @ 83054B8 + .4byte FortreeCity_MapAttributes + .4byte FortreeCity_MapEvents + .4byte FortreeCity_MapScripts + .4byte FortreeCity_MapConnections + .2byte BGM_MACHI_S3 + .2byte 5 + .byte 11 + .byte 0 + .byte 2 + .byte 2 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/FortreeCity/header.s b/data/maps/FortreeCity/header.s deleted file mode 100644 index 4c96de2b2..000000000 --- a/data/maps/FortreeCity/header.s +++ /dev/null @@ -1,14 +0,0 @@ -FortreeCity:: @ 83054B8 - .4byte FortreeCity_MapAttributes - .4byte FortreeCity_MapEvents - .4byte FortreeCity_MapScripts - .4byte FortreeCity_MapConnections - .2byte BGM_MACHI_S3 - .2byte 5 - .byte 11 - .byte 0 - .byte 2 - .byte 2 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/FortreeCity_DecorationShop/header.inc b/data/maps/FortreeCity_DecorationShop/header.inc new file mode 100644 index 000000000..5334ca92c --- /dev/null +++ b/data/maps/FortreeCity_DecorationShop/header.inc @@ -0,0 +1,14 @@ +FortreeCity_DecorationShop:: @ 8306504 + .4byte FortreeCity_DecorationShop_MapAttributes + .4byte FortreeCity_DecorationShop_MapEvents + .4byte FortreeCity_DecorationShop_MapScripts + .4byte 0x0 + .2byte BGM_MACHI_S3 + .2byte 256 + .byte 11 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/FortreeCity_DecorationShop/header.s b/data/maps/FortreeCity_DecorationShop/header.s deleted file mode 100644 index 5334ca92c..000000000 --- a/data/maps/FortreeCity_DecorationShop/header.s +++ /dev/null @@ -1,14 +0,0 @@ -FortreeCity_DecorationShop:: @ 8306504 - .4byte FortreeCity_DecorationShop_MapAttributes - .4byte FortreeCity_DecorationShop_MapEvents - .4byte FortreeCity_DecorationShop_MapScripts - .4byte 0x0 - .2byte BGM_MACHI_S3 - .2byte 256 - .byte 11 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/FortreeCity_Gym/header.inc b/data/maps/FortreeCity_Gym/header.inc new file mode 100644 index 000000000..378a73b52 --- /dev/null +++ b/data/maps/FortreeCity_Gym/header.inc @@ -0,0 +1,14 @@ +FortreeCity_Gym:: @ 8306424 + .4byte FortreeCity_Gym_MapAttributes + .4byte FortreeCity_Gym_MapEvents + .4byte FortreeCity_Gym_MapScripts + .4byte 0x0 + .2byte BGM_GIM + .2byte 100 + .byte 11 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 1 diff --git a/data/maps/FortreeCity_Gym/header.s b/data/maps/FortreeCity_Gym/header.s deleted file mode 100644 index 378a73b52..000000000 --- a/data/maps/FortreeCity_Gym/header.s +++ /dev/null @@ -1,14 +0,0 @@ -FortreeCity_Gym:: @ 8306424 - .4byte FortreeCity_Gym_MapAttributes - .4byte FortreeCity_Gym_MapEvents - .4byte FortreeCity_Gym_MapScripts - .4byte 0x0 - .2byte BGM_GIM - .2byte 100 - .byte 11 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 1 diff --git a/data/maps/FortreeCity_House1/header.inc b/data/maps/FortreeCity_House1/header.inc new file mode 100644 index 000000000..ad8198c43 --- /dev/null +++ b/data/maps/FortreeCity_House1/header.inc @@ -0,0 +1,14 @@ +FortreeCity_House1:: @ 8306408 + .4byte FortreeCity_House1_MapAttributes + .4byte FortreeCity_House1_MapEvents + .4byte FortreeCity_House1_MapScripts + .4byte 0x0 + .2byte BGM_MACHI_S3 + .2byte 99 + .byte 11 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/FortreeCity_House1/header.s b/data/maps/FortreeCity_House1/header.s deleted file mode 100644 index ad8198c43..000000000 --- a/data/maps/FortreeCity_House1/header.s +++ /dev/null @@ -1,14 +0,0 @@ -FortreeCity_House1:: @ 8306408 - .4byte FortreeCity_House1_MapAttributes - .4byte FortreeCity_House1_MapEvents - .4byte FortreeCity_House1_MapScripts - .4byte 0x0 - .2byte BGM_MACHI_S3 - .2byte 99 - .byte 11 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/FortreeCity_House2/header.inc b/data/maps/FortreeCity_House2/header.inc new file mode 100644 index 000000000..3c803636b --- /dev/null +++ b/data/maps/FortreeCity_House2/header.inc @@ -0,0 +1,14 @@ +FortreeCity_House2:: @ 8306494 + .4byte FortreeCity_House2_MapAttributes + .4byte FortreeCity_House2_MapEvents + .4byte FortreeCity_House2_MapScripts + .4byte 0x0 + .2byte BGM_MACHI_S3 + .2byte 101 + .byte 11 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/FortreeCity_House2/header.s b/data/maps/FortreeCity_House2/header.s deleted file mode 100644 index 3c803636b..000000000 --- a/data/maps/FortreeCity_House2/header.s +++ /dev/null @@ -1,14 +0,0 @@ -FortreeCity_House2:: @ 8306494 - .4byte FortreeCity_House2_MapAttributes - .4byte FortreeCity_House2_MapEvents - .4byte FortreeCity_House2_MapScripts - .4byte 0x0 - .2byte BGM_MACHI_S3 - .2byte 101 - .byte 11 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/FortreeCity_House3/header.inc b/data/maps/FortreeCity_House3/header.inc new file mode 100644 index 000000000..40bf85478 --- /dev/null +++ b/data/maps/FortreeCity_House3/header.inc @@ -0,0 +1,14 @@ +FortreeCity_House3:: @ 83064B0 + .4byte FortreeCity_House3_MapAttributes + .4byte FortreeCity_House3_MapEvents + .4byte FortreeCity_House3_MapScripts + .4byte 0x0 + .2byte BGM_MACHI_S3 + .2byte 99 + .byte 11 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/FortreeCity_House3/header.s b/data/maps/FortreeCity_House3/header.s deleted file mode 100644 index 40bf85478..000000000 --- a/data/maps/FortreeCity_House3/header.s +++ /dev/null @@ -1,14 +0,0 @@ -FortreeCity_House3:: @ 83064B0 - .4byte FortreeCity_House3_MapAttributes - .4byte FortreeCity_House3_MapEvents - .4byte FortreeCity_House3_MapScripts - .4byte 0x0 - .2byte BGM_MACHI_S3 - .2byte 99 - .byte 11 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/FortreeCity_House4/header.inc b/data/maps/FortreeCity_House4/header.inc new file mode 100644 index 000000000..bed750ecb --- /dev/null +++ b/data/maps/FortreeCity_House4/header.inc @@ -0,0 +1,14 @@ +FortreeCity_House4:: @ 83064CC + .4byte FortreeCity_House4_MapAttributes + .4byte FortreeCity_House4_MapEvents + .4byte FortreeCity_House4_MapScripts + .4byte 0x0 + .2byte BGM_MACHI_S3 + .2byte 101 + .byte 11 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/FortreeCity_House4/header.s b/data/maps/FortreeCity_House4/header.s deleted file mode 100644 index bed750ecb..000000000 --- a/data/maps/FortreeCity_House4/header.s +++ /dev/null @@ -1,14 +0,0 @@ -FortreeCity_House4:: @ 83064CC - .4byte FortreeCity_House4_MapAttributes - .4byte FortreeCity_House4_MapEvents - .4byte FortreeCity_House4_MapScripts - .4byte 0x0 - .2byte BGM_MACHI_S3 - .2byte 101 - .byte 11 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/FortreeCity_House5/header.inc b/data/maps/FortreeCity_House5/header.inc new file mode 100644 index 000000000..a8bb67d65 --- /dev/null +++ b/data/maps/FortreeCity_House5/header.inc @@ -0,0 +1,14 @@ +FortreeCity_House5:: @ 83064E8 + .4byte FortreeCity_House5_MapAttributes + .4byte FortreeCity_House5_MapEvents + .4byte FortreeCity_House5_MapScripts + .4byte 0x0 + .2byte BGM_MACHI_S3 + .2byte 99 + .byte 11 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/FortreeCity_House5/header.s b/data/maps/FortreeCity_House5/header.s deleted file mode 100644 index a8bb67d65..000000000 --- a/data/maps/FortreeCity_House5/header.s +++ /dev/null @@ -1,14 +0,0 @@ -FortreeCity_House5:: @ 83064E8 - .4byte FortreeCity_House5_MapAttributes - .4byte FortreeCity_House5_MapEvents - .4byte FortreeCity_House5_MapScripts - .4byte 0x0 - .2byte BGM_MACHI_S3 - .2byte 99 - .byte 11 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/FortreeCity_Mart/header.inc b/data/maps/FortreeCity_Mart/header.inc new file mode 100644 index 000000000..4b8793d36 --- /dev/null +++ b/data/maps/FortreeCity_Mart/header.inc @@ -0,0 +1,14 @@ +FortreeCity_Mart:: @ 8306478 + .4byte PokeMart_MapAttributes + .4byte FortreeCity_Mart_MapEvents + .4byte FortreeCity_Mart_MapScripts + .4byte 0x0 + .2byte BGM_FRIENDLY + .2byte 63 + .byte 11 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/FortreeCity_Mart/header.s b/data/maps/FortreeCity_Mart/header.s deleted file mode 100644 index 4b8793d36..000000000 --- a/data/maps/FortreeCity_Mart/header.s +++ /dev/null @@ -1,14 +0,0 @@ -FortreeCity_Mart:: @ 8306478 - .4byte PokeMart_MapAttributes - .4byte FortreeCity_Mart_MapEvents - .4byte FortreeCity_Mart_MapScripts - .4byte 0x0 - .2byte BGM_FRIENDLY - .2byte 63 - .byte 11 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/FortreeCity_PokemonCenter_1F/header.inc b/data/maps/FortreeCity_PokemonCenter_1F/header.inc new file mode 100644 index 000000000..fcafbe2af --- /dev/null +++ b/data/maps/FortreeCity_PokemonCenter_1F/header.inc @@ -0,0 +1,14 @@ +FortreeCity_PokemonCenter_1F:: @ 8306440 + .4byte PokemonCenter_1F_MapAttributes + .4byte FortreeCity_PokemonCenter_1F_MapEvents + .4byte FortreeCity_PokemonCenter_1F_MapScripts + .4byte 0x0 + .2byte BGM_POKECEN + .2byte 61 + .byte 11 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/FortreeCity_PokemonCenter_1F/header.s b/data/maps/FortreeCity_PokemonCenter_1F/header.s deleted file mode 100644 index fcafbe2af..000000000 --- a/data/maps/FortreeCity_PokemonCenter_1F/header.s +++ /dev/null @@ -1,14 +0,0 @@ -FortreeCity_PokemonCenter_1F:: @ 8306440 - .4byte PokemonCenter_1F_MapAttributes - .4byte FortreeCity_PokemonCenter_1F_MapEvents - .4byte FortreeCity_PokemonCenter_1F_MapScripts - .4byte 0x0 - .2byte BGM_POKECEN - .2byte 61 - .byte 11 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/FortreeCity_PokemonCenter_2F/header.inc b/data/maps/FortreeCity_PokemonCenter_2F/header.inc new file mode 100644 index 000000000..0421b7880 --- /dev/null +++ b/data/maps/FortreeCity_PokemonCenter_2F/header.inc @@ -0,0 +1,14 @@ +FortreeCity_PokemonCenter_2F:: @ 830645C + .4byte PokemonCenter_2F_MapAttributes + .4byte FortreeCity_PokemonCenter_2F_MapEvents + .4byte FortreeCity_PokemonCenter_2F_MapScripts + .4byte 0x0 + .2byte BGM_POKECEN + .2byte 62 + .byte 11 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/FortreeCity_PokemonCenter_2F/header.s b/data/maps/FortreeCity_PokemonCenter_2F/header.s deleted file mode 100644 index 0421b7880..000000000 --- a/data/maps/FortreeCity_PokemonCenter_2F/header.s +++ /dev/null @@ -1,14 +0,0 @@ -FortreeCity_PokemonCenter_2F:: @ 830645C - .4byte PokemonCenter_2F_MapAttributes - .4byte FortreeCity_PokemonCenter_2F_MapEvents - .4byte FortreeCity_PokemonCenter_2F_MapScripts - .4byte 0x0 - .2byte BGM_POKECEN - .2byte 62 - .byte 11 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/GraniteCave_1F/header.inc b/data/maps/GraniteCave_1F/header.inc new file mode 100644 index 000000000..cf22ded8a --- /dev/null +++ b/data/maps/GraniteCave_1F/header.inc @@ -0,0 +1,14 @@ +GraniteCave_1F:: @ 8306E34 + .4byte GraniteCave_1F_MapAttributes + .4byte GraniteCave_1F_MapEvents + .4byte GraniteCave_1F_MapScripts + .4byte 0x0 + .2byte BGM_DAN01 + .2byte 133 + .byte 55 + .byte 0 + .byte 0 + .byte 4 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/GraniteCave_1F/header.s b/data/maps/GraniteCave_1F/header.s deleted file mode 100644 index cf22ded8a..000000000 --- a/data/maps/GraniteCave_1F/header.s +++ /dev/null @@ -1,14 +0,0 @@ -GraniteCave_1F:: @ 8306E34 - .4byte GraniteCave_1F_MapAttributes - .4byte GraniteCave_1F_MapEvents - .4byte GraniteCave_1F_MapScripts - .4byte 0x0 - .2byte BGM_DAN01 - .2byte 133 - .byte 55 - .byte 0 - .byte 0 - .byte 4 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/GraniteCave_B1F/header.inc b/data/maps/GraniteCave_B1F/header.inc new file mode 100644 index 000000000..654803312 --- /dev/null +++ b/data/maps/GraniteCave_B1F/header.inc @@ -0,0 +1,14 @@ +GraniteCave_B1F:: @ 8306E50 + .4byte GraniteCave_B1F_MapAttributes + .4byte GraniteCave_B1F_MapEvents + .4byte GraniteCave_B1F_MapScripts + .4byte 0x0 + .2byte BGM_DAN01 + .2byte 134 + .byte 55 + .byte 1 + .byte 0 + .byte 4 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/GraniteCave_B1F/header.s b/data/maps/GraniteCave_B1F/header.s deleted file mode 100644 index 654803312..000000000 --- a/data/maps/GraniteCave_B1F/header.s +++ /dev/null @@ -1,14 +0,0 @@ -GraniteCave_B1F:: @ 8306E50 - .4byte GraniteCave_B1F_MapAttributes - .4byte GraniteCave_B1F_MapEvents - .4byte GraniteCave_B1F_MapScripts - .4byte 0x0 - .2byte BGM_DAN01 - .2byte 134 - .byte 55 - .byte 1 - .byte 0 - .byte 4 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/GraniteCave_B2F/header.inc b/data/maps/GraniteCave_B2F/header.inc new file mode 100644 index 000000000..4d243f3da --- /dev/null +++ b/data/maps/GraniteCave_B2F/header.inc @@ -0,0 +1,14 @@ +GraniteCave_B2F:: @ 8306E6C + .4byte GraniteCave_B2F_MapAttributes + .4byte GraniteCave_B2F_MapEvents + .4byte GraniteCave_B2F_MapScripts + .4byte 0x0 + .2byte BGM_DAN01 + .2byte 135 + .byte 55 + .byte 1 + .byte 0 + .byte 4 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/GraniteCave_B2F/header.s b/data/maps/GraniteCave_B2F/header.s deleted file mode 100644 index 4d243f3da..000000000 --- a/data/maps/GraniteCave_B2F/header.s +++ /dev/null @@ -1,14 +0,0 @@ -GraniteCave_B2F:: @ 8306E6C - .4byte GraniteCave_B2F_MapAttributes - .4byte GraniteCave_B2F_MapEvents - .4byte GraniteCave_B2F_MapScripts - .4byte 0x0 - .2byte BGM_DAN01 - .2byte 135 - .byte 55 - .byte 1 - .byte 0 - .byte 4 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/GraniteCave_StevensRoom/header.inc b/data/maps/GraniteCave_StevensRoom/header.inc new file mode 100644 index 000000000..fb9b18436 --- /dev/null +++ b/data/maps/GraniteCave_StevensRoom/header.inc @@ -0,0 +1,14 @@ +GraniteCave_StevensRoom:: @ 8306E88 + .4byte GraniteCave_StevensRoom_MapAttributes + .4byte GraniteCave_StevensRoom_MapEvents + .4byte GraniteCave_StevensRoom_MapScripts + .4byte 0x0 + .2byte BGM_DAN01 + .2byte 289 + .byte 55 + .byte 0 + .byte 0 + .byte 4 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/GraniteCave_StevensRoom/header.s b/data/maps/GraniteCave_StevensRoom/header.s deleted file mode 100644 index fb9b18436..000000000 --- a/data/maps/GraniteCave_StevensRoom/header.s +++ /dev/null @@ -1,14 +0,0 @@ -GraniteCave_StevensRoom:: @ 8306E88 - .4byte GraniteCave_StevensRoom_MapAttributes - .4byte GraniteCave_StevensRoom_MapEvents - .4byte GraniteCave_StevensRoom_MapScripts - .4byte 0x0 - .2byte BGM_DAN01 - .2byte 289 - .byte 55 - .byte 0 - .byte 0 - .byte 4 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/InsideOfTruck/header.inc b/data/maps/InsideOfTruck/header.inc new file mode 100644 index 000000000..ee88d280d --- /dev/null +++ b/data/maps/InsideOfTruck/header.inc @@ -0,0 +1,14 @@ +InsideOfTruck:: @ 8307B38 + .4byte InsideOfTruck_MapAttributes + .4byte InsideOfTruck_MapEvents + .4byte InsideOfTruck_MapScripts + .4byte 0x0 + .2byte SE_STOP + .2byte 238 + .byte 84 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/InsideOfTruck/header.s b/data/maps/InsideOfTruck/header.s deleted file mode 100644 index ee88d280d..000000000 --- a/data/maps/InsideOfTruck/header.s +++ /dev/null @@ -1,14 +0,0 @@ -InsideOfTruck:: @ 8307B38 - .4byte InsideOfTruck_MapAttributes - .4byte InsideOfTruck_MapEvents - .4byte InsideOfTruck_MapScripts - .4byte 0x0 - .2byte SE_STOP - .2byte 238 - .byte 84 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/IslandCave/header.inc b/data/maps/IslandCave/header.inc new file mode 100644 index 000000000..f811fe3da --- /dev/null +++ b/data/maps/IslandCave/header.inc @@ -0,0 +1,14 @@ +IslandCave:: @ 83074C4 + .4byte IslandCave_MapAttributes + .4byte IslandCave_MapEvents + .4byte IslandCave_MapScripts + .4byte 0x0 + .2byte BGM_MABOROSI + .2byte 281 + .byte 81 + .byte 0 + .byte 0 + .byte 4 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/IslandCave/header.s b/data/maps/IslandCave/header.s deleted file mode 100644 index f811fe3da..000000000 --- a/data/maps/IslandCave/header.s +++ /dev/null @@ -1,14 +0,0 @@ -IslandCave:: @ 83074C4 - .4byte IslandCave_MapAttributes - .4byte IslandCave_MapEvents - .4byte IslandCave_MapScripts - .4byte 0x0 - .2byte BGM_MABOROSI - .2byte 281 - .byte 81 - .byte 0 - .byte 0 - .byte 4 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/JaggedPass/header.inc b/data/maps/JaggedPass/header.inc new file mode 100644 index 000000000..6770756e8 --- /dev/null +++ b/data/maps/JaggedPass/header.inc @@ -0,0 +1,14 @@ +JaggedPass:: @ 8306EDC + .4byte JaggedPass_MapAttributes + .4byte JaggedPass_MapEvents + .4byte JaggedPass_MapScripts + .4byte 0x0 + .2byte BGM_DAN01 + .2byte 293 + .byte 76 + .byte 0 + .byte 0 + .byte 3 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/JaggedPass/header.s b/data/maps/JaggedPass/header.s deleted file mode 100644 index 6770756e8..000000000 --- a/data/maps/JaggedPass/header.s +++ /dev/null @@ -1,14 +0,0 @@ -JaggedPass:: @ 8306EDC - .4byte JaggedPass_MapAttributes - .4byte JaggedPass_MapEvents - .4byte JaggedPass_MapScripts - .4byte 0x0 - .2byte BGM_DAN01 - .2byte 293 - .byte 76 - .byte 0 - .byte 0 - .byte 3 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/LavaridgeTown/connections.inc b/data/maps/LavaridgeTown/connections.inc new file mode 100644 index 000000000..b31155ae3 --- /dev/null +++ b/data/maps/LavaridgeTown/connections.inc @@ -0,0 +1,6 @@ +LavaridgeTown_MapConnectionsList:: @ 8308670 + connection right, -40, Route112 + +LavaridgeTown_MapConnections:: @ 830867C + .4byte 0x1 + .4byte LavaridgeTown_MapConnectionsList diff --git a/data/maps/LavaridgeTown/connections.s b/data/maps/LavaridgeTown/connections.s deleted file mode 100644 index b31155ae3..000000000 --- a/data/maps/LavaridgeTown/connections.s +++ /dev/null @@ -1,6 +0,0 @@ -LavaridgeTown_MapConnectionsList:: @ 8308670 - connection right, -40, Route112 - -LavaridgeTown_MapConnections:: @ 830867C - .4byte 0x1 - .4byte LavaridgeTown_MapConnectionsList diff --git a/data/maps/LavaridgeTown/header.inc b/data/maps/LavaridgeTown/header.inc new file mode 100644 index 000000000..e34eec863 --- /dev/null +++ b/data/maps/LavaridgeTown/header.inc @@ -0,0 +1,14 @@ +LavaridgeTown:: @ 8305598 + .4byte LavaridgeTown_MapAttributes + .4byte LavaridgeTown_MapEvents + .4byte LavaridgeTown_MapScripts + .4byte LavaridgeTown_MapConnections + .2byte BGM_MACHI_S4 + .2byte 13 + .byte 3 + .byte 0 + .byte 2 + .byte 1 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/LavaridgeTown/header.s b/data/maps/LavaridgeTown/header.s deleted file mode 100644 index e34eec863..000000000 --- a/data/maps/LavaridgeTown/header.s +++ /dev/null @@ -1,14 +0,0 @@ -LavaridgeTown:: @ 8305598 - .4byte LavaridgeTown_MapAttributes - .4byte LavaridgeTown_MapEvents - .4byte LavaridgeTown_MapScripts - .4byte LavaridgeTown_MapConnections - .2byte BGM_MACHI_S4 - .2byte 13 - .byte 3 - .byte 0 - .byte 2 - .byte 1 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/LavaridgeTown_Gym_1F/header.inc b/data/maps/LavaridgeTown_Gym_1F/header.inc new file mode 100644 index 000000000..929b07ae7 --- /dev/null +++ b/data/maps/LavaridgeTown_Gym_1F/header.inc @@ -0,0 +1,14 @@ +LavaridgeTown_Gym_1F:: @ 8305C0C + .4byte LavaridgeTown_Gym_1F_MapAttributes + .4byte LavaridgeTown_Gym_1F_MapEvents + .4byte LavaridgeTown_Gym_1F_MapScripts + .4byte 0x0 + .2byte BGM_GIM + .2byte 69 + .byte 3 + .byte 0 + .byte 6 + .byte 8 + .2byte 0 + .byte 0 + .byte 1 diff --git a/data/maps/LavaridgeTown_Gym_1F/header.s b/data/maps/LavaridgeTown_Gym_1F/header.s deleted file mode 100644 index 929b07ae7..000000000 --- a/data/maps/LavaridgeTown_Gym_1F/header.s +++ /dev/null @@ -1,14 +0,0 @@ -LavaridgeTown_Gym_1F:: @ 8305C0C - .4byte LavaridgeTown_Gym_1F_MapAttributes - .4byte LavaridgeTown_Gym_1F_MapEvents - .4byte LavaridgeTown_Gym_1F_MapScripts - .4byte 0x0 - .2byte BGM_GIM - .2byte 69 - .byte 3 - .byte 0 - .byte 6 - .byte 8 - .2byte 0 - .byte 0 - .byte 1 diff --git a/data/maps/LavaridgeTown_Gym_B1F/header.inc b/data/maps/LavaridgeTown_Gym_B1F/header.inc new file mode 100644 index 000000000..d8a747789 --- /dev/null +++ b/data/maps/LavaridgeTown_Gym_B1F/header.inc @@ -0,0 +1,14 @@ +LavaridgeTown_Gym_B1F:: @ 8305C28 + .4byte LavaridgeTown_Gym_B1F_MapAttributes + .4byte LavaridgeTown_Gym_B1F_MapEvents + .4byte LavaridgeTown_Gym_B1F_MapScripts + .4byte 0x0 + .2byte BGM_GIM + .2byte 70 + .byte 3 + .byte 0 + .byte 6 + .byte 8 + .2byte 0 + .byte 0 + .byte 1 diff --git a/data/maps/LavaridgeTown_Gym_B1F/header.s b/data/maps/LavaridgeTown_Gym_B1F/header.s deleted file mode 100644 index d8a747789..000000000 --- a/data/maps/LavaridgeTown_Gym_B1F/header.s +++ /dev/null @@ -1,14 +0,0 @@ -LavaridgeTown_Gym_B1F:: @ 8305C28 - .4byte LavaridgeTown_Gym_B1F_MapAttributes - .4byte LavaridgeTown_Gym_B1F_MapEvents - .4byte LavaridgeTown_Gym_B1F_MapScripts - .4byte 0x0 - .2byte BGM_GIM - .2byte 70 - .byte 3 - .byte 0 - .byte 6 - .byte 8 - .2byte 0 - .byte 0 - .byte 1 diff --git a/data/maps/LavaridgeTown_HerbShop/header.inc b/data/maps/LavaridgeTown_HerbShop/header.inc new file mode 100644 index 000000000..f44118c5c --- /dev/null +++ b/data/maps/LavaridgeTown_HerbShop/header.inc @@ -0,0 +1,14 @@ +LavaridgeTown_HerbShop:: @ 8305BF0 + .4byte LavaridgeTown_HerbShop_MapAttributes + .4byte LavaridgeTown_HerbShop_MapEvents + .4byte LavaridgeTown_HerbShop_MapScripts + .4byte 0x0 + .2byte BGM_MACHI_S4 + .2byte 68 + .byte 3 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/LavaridgeTown_HerbShop/header.s b/data/maps/LavaridgeTown_HerbShop/header.s deleted file mode 100644 index f44118c5c..000000000 --- a/data/maps/LavaridgeTown_HerbShop/header.s +++ /dev/null @@ -1,14 +0,0 @@ -LavaridgeTown_HerbShop:: @ 8305BF0 - .4byte LavaridgeTown_HerbShop_MapAttributes - .4byte LavaridgeTown_HerbShop_MapEvents - .4byte LavaridgeTown_HerbShop_MapScripts - .4byte 0x0 - .2byte BGM_MACHI_S4 - .2byte 68 - .byte 3 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/LavaridgeTown_House/header.inc b/data/maps/LavaridgeTown_House/header.inc new file mode 100644 index 000000000..f43ea0bc4 --- /dev/null +++ b/data/maps/LavaridgeTown_House/header.inc @@ -0,0 +1,14 @@ +LavaridgeTown_House:: @ 8305C44 + .4byte LavaridgeTown_House_MapAttributes + .4byte LavaridgeTown_House_MapEvents + .4byte LavaridgeTown_House_MapScripts + .4byte 0x0 + .2byte BGM_MACHI_S4 + .2byte 64 + .byte 3 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/LavaridgeTown_House/header.s b/data/maps/LavaridgeTown_House/header.s deleted file mode 100644 index f43ea0bc4..000000000 --- a/data/maps/LavaridgeTown_House/header.s +++ /dev/null @@ -1,14 +0,0 @@ -LavaridgeTown_House:: @ 8305C44 - .4byte LavaridgeTown_House_MapAttributes - .4byte LavaridgeTown_House_MapEvents - .4byte LavaridgeTown_House_MapScripts - .4byte 0x0 - .2byte BGM_MACHI_S4 - .2byte 64 - .byte 3 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/LavaridgeTown_Mart/header.inc b/data/maps/LavaridgeTown_Mart/header.inc new file mode 100644 index 000000000..0882a6bf0 --- /dev/null +++ b/data/maps/LavaridgeTown_Mart/header.inc @@ -0,0 +1,14 @@ +LavaridgeTown_Mart:: @ 8305C60 + .4byte PokeMart_MapAttributes + .4byte LavaridgeTown_Mart_MapEvents + .4byte LavaridgeTown_Mart_MapScripts + .4byte 0x0 + .2byte BGM_FRIENDLY + .2byte 63 + .byte 3 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/LavaridgeTown_Mart/header.s b/data/maps/LavaridgeTown_Mart/header.s deleted file mode 100644 index 0882a6bf0..000000000 --- a/data/maps/LavaridgeTown_Mart/header.s +++ /dev/null @@ -1,14 +0,0 @@ -LavaridgeTown_Mart:: @ 8305C60 - .4byte PokeMart_MapAttributes - .4byte LavaridgeTown_Mart_MapEvents - .4byte LavaridgeTown_Mart_MapScripts - .4byte 0x0 - .2byte BGM_FRIENDLY - .2byte 63 - .byte 3 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc b/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc new file mode 100644 index 000000000..78576d740 --- /dev/null +++ b/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc @@ -0,0 +1,14 @@ +LavaridgeTown_PokemonCenter_1F:: @ 8305C7C + .4byte LavaridgeTown_PokemonCenter_1F_MapAttributes + .4byte LavaridgeTown_PokemonCenter_1F_MapEvents + .4byte LavaridgeTown_PokemonCenter_1F_MapScripts + .4byte 0x0 + .2byte BGM_POKECEN + .2byte 71 + .byte 3 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/LavaridgeTown_PokemonCenter_1F/header.s b/data/maps/LavaridgeTown_PokemonCenter_1F/header.s deleted file mode 100644 index 78576d740..000000000 --- a/data/maps/LavaridgeTown_PokemonCenter_1F/header.s +++ /dev/null @@ -1,14 +0,0 @@ -LavaridgeTown_PokemonCenter_1F:: @ 8305C7C - .4byte LavaridgeTown_PokemonCenter_1F_MapAttributes - .4byte LavaridgeTown_PokemonCenter_1F_MapEvents - .4byte LavaridgeTown_PokemonCenter_1F_MapScripts - .4byte 0x0 - .2byte BGM_POKECEN - .2byte 71 - .byte 3 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc b/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc new file mode 100644 index 000000000..3d86fa588 --- /dev/null +++ b/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc @@ -0,0 +1,14 @@ +LavaridgeTown_PokemonCenter_2F:: @ 8305C98 + .4byte PokemonCenter_2F_MapAttributes + .4byte LavaridgeTown_PokemonCenter_2F_MapEvents + .4byte LavaridgeTown_PokemonCenter_2F_MapScripts + .4byte 0x0 + .2byte BGM_POKECEN + .2byte 62 + .byte 3 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/LavaridgeTown_PokemonCenter_2F/header.s b/data/maps/LavaridgeTown_PokemonCenter_2F/header.s deleted file mode 100644 index 3d86fa588..000000000 --- a/data/maps/LavaridgeTown_PokemonCenter_2F/header.s +++ /dev/null @@ -1,14 +0,0 @@ -LavaridgeTown_PokemonCenter_2F:: @ 8305C98 - .4byte PokemonCenter_2F_MapAttributes - .4byte LavaridgeTown_PokemonCenter_2F_MapEvents - .4byte LavaridgeTown_PokemonCenter_2F_MapScripts - .4byte 0x0 - .2byte BGM_POKECEN - .2byte 62 - .byte 3 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/LilycoveCity/connections.inc b/data/maps/LilycoveCity/connections.inc new file mode 100644 index 000000000..a476e2de2 --- /dev/null +++ b/data/maps/LilycoveCity/connections.inc @@ -0,0 +1,7 @@ +LilycoveCity_MapConnectionsList:: @ 83087B4 + connection left, 10, Route121 + connection right, -10, Route124 + +LilycoveCity_MapConnections:: @ 83087CC + .4byte 0x2 + .4byte LilycoveCity_MapConnectionsList diff --git a/data/maps/LilycoveCity/connections.s b/data/maps/LilycoveCity/connections.s deleted file mode 100644 index a476e2de2..000000000 --- a/data/maps/LilycoveCity/connections.s +++ /dev/null @@ -1,7 +0,0 @@ -LilycoveCity_MapConnectionsList:: @ 83087B4 - connection left, 10, Route121 - connection right, -10, Route124 - -LilycoveCity_MapConnections:: @ 83087CC - .4byte 0x2 - .4byte LilycoveCity_MapConnectionsList diff --git a/data/maps/LilycoveCity/header.inc b/data/maps/LilycoveCity/header.inc new file mode 100644 index 000000000..204e2098d --- /dev/null +++ b/data/maps/LilycoveCity/header.inc @@ -0,0 +1,14 @@ +LilycoveCity:: @ 83054D4 + .4byte LilycoveCity_MapAttributes + .4byte LilycoveCity_MapEvents + .4byte LilycoveCity_MapScripts + .4byte LilycoveCity_MapConnections + .2byte BGM_MINAMO + .2byte 6 + .byte 12 + .byte 0 + .byte 2 + .byte 2 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/LilycoveCity/header.s b/data/maps/LilycoveCity/header.s deleted file mode 100644 index 204e2098d..000000000 --- a/data/maps/LilycoveCity/header.s +++ /dev/null @@ -1,14 +0,0 @@ -LilycoveCity:: @ 83054D4 - .4byte LilycoveCity_MapAttributes - .4byte LilycoveCity_MapEvents - .4byte LilycoveCity_MapScripts - .4byte LilycoveCity_MapConnections - .2byte BGM_MINAMO - .2byte 6 - .byte 12 - .byte 0 - .byte 2 - .byte 2 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/LilycoveCity_ContestHall/header.inc b/data/maps/LilycoveCity_ContestHall/header.inc new file mode 100644 index 000000000..47329e0f7 --- /dev/null +++ b/data/maps/LilycoveCity_ContestHall/header.inc @@ -0,0 +1,14 @@ +LilycoveCity_ContestHall:: @ 83065AC + .4byte LilycoveCity_ContestHall_MapAttributes + .4byte LilycoveCity_ContestHall_MapEvents + .4byte LilycoveCity_ContestHall_MapScripts + .4byte 0x0 + .2byte BGM_CONLOBBY + .2byte 106 + .byte 12 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/LilycoveCity_ContestHall/header.s b/data/maps/LilycoveCity_ContestHall/header.s deleted file mode 100644 index 47329e0f7..000000000 --- a/data/maps/LilycoveCity_ContestHall/header.s +++ /dev/null @@ -1,14 +0,0 @@ -LilycoveCity_ContestHall:: @ 83065AC - .4byte LilycoveCity_ContestHall_MapAttributes - .4byte LilycoveCity_ContestHall_MapEvents - .4byte LilycoveCity_ContestHall_MapScripts - .4byte 0x0 - .2byte BGM_CONLOBBY - .2byte 106 - .byte 12 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/LilycoveCity_ContestLobby/header.inc b/data/maps/LilycoveCity_ContestLobby/header.inc new file mode 100644 index 000000000..5bf98a32b --- /dev/null +++ b/data/maps/LilycoveCity_ContestLobby/header.inc @@ -0,0 +1,14 @@ +LilycoveCity_ContestLobby:: @ 8306590 + .4byte LilycoveCity_ContestLobby_MapAttributes + .4byte LilycoveCity_ContestLobby_MapEvents + .4byte LilycoveCity_ContestLobby_MapScripts + .4byte 0x0 + .2byte BGM_CONLOBBY + .2byte 105 + .byte 12 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/LilycoveCity_ContestLobby/header.s b/data/maps/LilycoveCity_ContestLobby/header.s deleted file mode 100644 index 5bf98a32b..000000000 --- a/data/maps/LilycoveCity_ContestLobby/header.s +++ /dev/null @@ -1,14 +0,0 @@ -LilycoveCity_ContestLobby:: @ 8306590 - .4byte LilycoveCity_ContestLobby_MapAttributes - .4byte LilycoveCity_ContestLobby_MapEvents - .4byte LilycoveCity_ContestLobby_MapScripts - .4byte 0x0 - .2byte BGM_CONLOBBY - .2byte 105 - .byte 12 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc b/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc new file mode 100644 index 000000000..141fda863 --- /dev/null +++ b/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc @@ -0,0 +1,14 @@ +LilycoveCity_CoveLilyMotel_1F:: @ 8306520 + .4byte LilycoveCity_CoveLilyMotel_1F_MapAttributes + .4byte LilycoveCity_CoveLilyMotel_1F_MapEvents + .4byte LilycoveCity_CoveLilyMotel_1F_MapScripts + .4byte 0x0 + .2byte BGM_MINAMO + .2byte 300 + .byte 12 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/header.s b/data/maps/LilycoveCity_CoveLilyMotel_1F/header.s deleted file mode 100644 index 141fda863..000000000 --- a/data/maps/LilycoveCity_CoveLilyMotel_1F/header.s +++ /dev/null @@ -1,14 +0,0 @@ -LilycoveCity_CoveLilyMotel_1F:: @ 8306520 - .4byte LilycoveCity_CoveLilyMotel_1F_MapAttributes - .4byte LilycoveCity_CoveLilyMotel_1F_MapEvents - .4byte LilycoveCity_CoveLilyMotel_1F_MapScripts - .4byte 0x0 - .2byte BGM_MINAMO - .2byte 300 - .byte 12 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc b/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc new file mode 100644 index 000000000..2d6f9de4b --- /dev/null +++ b/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc @@ -0,0 +1,14 @@ +LilycoveCity_CoveLilyMotel_2F:: @ 830653C + .4byte LilycoveCity_CoveLilyMotel_2F_MapAttributes + .4byte LilycoveCity_CoveLilyMotel_2F_MapEvents + .4byte LilycoveCity_CoveLilyMotel_2F_MapScripts + .4byte 0x0 + .2byte BGM_MINAMO + .2byte 301 + .byte 12 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/header.s b/data/maps/LilycoveCity_CoveLilyMotel_2F/header.s deleted file mode 100644 index 2d6f9de4b..000000000 --- a/data/maps/LilycoveCity_CoveLilyMotel_2F/header.s +++ /dev/null @@ -1,14 +0,0 @@ -LilycoveCity_CoveLilyMotel_2F:: @ 830653C - .4byte LilycoveCity_CoveLilyMotel_2F_MapAttributes - .4byte LilycoveCity_CoveLilyMotel_2F_MapEvents - .4byte LilycoveCity_CoveLilyMotel_2F_MapScripts - .4byte 0x0 - .2byte BGM_MINAMO - .2byte 301 - .byte 12 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc b/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc new file mode 100644 index 000000000..3f1a8ada9 --- /dev/null +++ b/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc @@ -0,0 +1,14 @@ +LilycoveCity_DepartmentStoreElevator:: @ 83067A4 + .4byte LilycoveCity_DepartmentStoreElevator_MapAttributes + .4byte LilycoveCity_DepartmentStoreElevator_MapEvents + .4byte LilycoveCity_DepartmentStoreElevator_MapScripts + .4byte 0x0 + .2byte BGM_MINAMO + .2byte 274 + .byte 12 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/LilycoveCity_DepartmentStoreElevator/header.s b/data/maps/LilycoveCity_DepartmentStoreElevator/header.s deleted file mode 100644 index 3f1a8ada9..000000000 --- a/data/maps/LilycoveCity_DepartmentStoreElevator/header.s +++ /dev/null @@ -1,14 +0,0 @@ -LilycoveCity_DepartmentStoreElevator:: @ 83067A4 - .4byte LilycoveCity_DepartmentStoreElevator_MapAttributes - .4byte LilycoveCity_DepartmentStoreElevator_MapEvents - .4byte LilycoveCity_DepartmentStoreElevator_MapScripts - .4byte 0x0 - .2byte BGM_MINAMO - .2byte 274 - .byte 12 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc b/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc new file mode 100644 index 000000000..292c621d3 --- /dev/null +++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc @@ -0,0 +1,14 @@ +LilycoveCity_DepartmentStoreRooftop:: @ 8306788 + .4byte LilycoveCity_DepartmentStoreRooftop_MapAttributes + .4byte LilycoveCity_DepartmentStoreRooftop_MapEvents + .4byte LilycoveCity_DepartmentStoreRooftop_MapScripts + .4byte 0x0 + .2byte BGM_MINAMO + .2byte 263 + .byte 12 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/header.s b/data/maps/LilycoveCity_DepartmentStoreRooftop/header.s deleted file mode 100644 index 292c621d3..000000000 --- a/data/maps/LilycoveCity_DepartmentStoreRooftop/header.s +++ /dev/null @@ -1,14 +0,0 @@ -LilycoveCity_DepartmentStoreRooftop:: @ 8306788 - .4byte LilycoveCity_DepartmentStoreRooftop_MapAttributes - .4byte LilycoveCity_DepartmentStoreRooftop_MapEvents - .4byte LilycoveCity_DepartmentStoreRooftop_MapScripts - .4byte 0x0 - .2byte BGM_MINAMO - .2byte 263 - .byte 12 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/header.inc b/data/maps/LilycoveCity_DepartmentStore_1F/header.inc new file mode 100644 index 000000000..ecfb77604 --- /dev/null +++ b/data/maps/LilycoveCity_DepartmentStore_1F/header.inc @@ -0,0 +1,14 @@ +LilycoveCity_DepartmentStore_1F:: @ 83066FC + .4byte LilycoveCity_DepartmentStore_1F_MapAttributes + .4byte LilycoveCity_DepartmentStore_1F_MapEvents + .4byte LilycoveCity_DepartmentStore_1F_MapScripts + .4byte 0x0 + .2byte BGM_MINAMO + .2byte 258 + .byte 12 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/header.s b/data/maps/LilycoveCity_DepartmentStore_1F/header.s deleted file mode 100644 index ecfb77604..000000000 --- a/data/maps/LilycoveCity_DepartmentStore_1F/header.s +++ /dev/null @@ -1,14 +0,0 @@ -LilycoveCity_DepartmentStore_1F:: @ 83066FC - .4byte LilycoveCity_DepartmentStore_1F_MapAttributes - .4byte LilycoveCity_DepartmentStore_1F_MapEvents - .4byte LilycoveCity_DepartmentStore_1F_MapScripts - .4byte 0x0 - .2byte BGM_MINAMO - .2byte 258 - .byte 12 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/LilycoveCity_DepartmentStore_2F/header.inc b/data/maps/LilycoveCity_DepartmentStore_2F/header.inc new file mode 100644 index 000000000..f10428935 --- /dev/null +++ b/data/maps/LilycoveCity_DepartmentStore_2F/header.inc @@ -0,0 +1,14 @@ +LilycoveCity_DepartmentStore_2F:: @ 8306718 + .4byte LilycoveCity_DepartmentStore_2F_MapAttributes + .4byte LilycoveCity_DepartmentStore_2F_MapEvents + .4byte LilycoveCity_DepartmentStore_2F_MapScripts + .4byte 0x0 + .2byte BGM_FRIENDLY + .2byte 259 + .byte 12 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/LilycoveCity_DepartmentStore_2F/header.s b/data/maps/LilycoveCity_DepartmentStore_2F/header.s deleted file mode 100644 index f10428935..000000000 --- a/data/maps/LilycoveCity_DepartmentStore_2F/header.s +++ /dev/null @@ -1,14 +0,0 @@ -LilycoveCity_DepartmentStore_2F:: @ 8306718 - .4byte LilycoveCity_DepartmentStore_2F_MapAttributes - .4byte LilycoveCity_DepartmentStore_2F_MapEvents - .4byte LilycoveCity_DepartmentStore_2F_MapScripts - .4byte 0x0 - .2byte BGM_FRIENDLY - .2byte 259 - .byte 12 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/LilycoveCity_DepartmentStore_3F/header.inc b/data/maps/LilycoveCity_DepartmentStore_3F/header.inc new file mode 100644 index 000000000..16f453da0 --- /dev/null +++ b/data/maps/LilycoveCity_DepartmentStore_3F/header.inc @@ -0,0 +1,14 @@ +LilycoveCity_DepartmentStore_3F:: @ 8306734 + .4byte LilycoveCity_DepartmentStore_3F_MapAttributes + .4byte LilycoveCity_DepartmentStore_3F_MapEvents + .4byte LilycoveCity_DepartmentStore_3F_MapScripts + .4byte 0x0 + .2byte BGM_FRIENDLY + .2byte 260 + .byte 12 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/LilycoveCity_DepartmentStore_3F/header.s b/data/maps/LilycoveCity_DepartmentStore_3F/header.s deleted file mode 100644 index 16f453da0..000000000 --- a/data/maps/LilycoveCity_DepartmentStore_3F/header.s +++ /dev/null @@ -1,14 +0,0 @@ -LilycoveCity_DepartmentStore_3F:: @ 8306734 - .4byte LilycoveCity_DepartmentStore_3F_MapAttributes - .4byte LilycoveCity_DepartmentStore_3F_MapEvents - .4byte LilycoveCity_DepartmentStore_3F_MapScripts - .4byte 0x0 - .2byte BGM_FRIENDLY - .2byte 260 - .byte 12 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/LilycoveCity_DepartmentStore_4F/header.inc b/data/maps/LilycoveCity_DepartmentStore_4F/header.inc new file mode 100644 index 000000000..169f21d92 --- /dev/null +++ b/data/maps/LilycoveCity_DepartmentStore_4F/header.inc @@ -0,0 +1,14 @@ +LilycoveCity_DepartmentStore_4F:: @ 8306750 + .4byte LilycoveCity_DepartmentStore_4F_MapAttributes + .4byte LilycoveCity_DepartmentStore_4F_MapEvents + .4byte LilycoveCity_DepartmentStore_4F_MapScripts + .4byte 0x0 + .2byte BGM_FRIENDLY + .2byte 261 + .byte 12 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/LilycoveCity_DepartmentStore_4F/header.s b/data/maps/LilycoveCity_DepartmentStore_4F/header.s deleted file mode 100644 index 169f21d92..000000000 --- a/data/maps/LilycoveCity_DepartmentStore_4F/header.s +++ /dev/null @@ -1,14 +0,0 @@ -LilycoveCity_DepartmentStore_4F:: @ 8306750 - .4byte LilycoveCity_DepartmentStore_4F_MapAttributes - .4byte LilycoveCity_DepartmentStore_4F_MapEvents - .4byte LilycoveCity_DepartmentStore_4F_MapScripts - .4byte 0x0 - .2byte BGM_FRIENDLY - .2byte 261 - .byte 12 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/header.inc b/data/maps/LilycoveCity_DepartmentStore_5F/header.inc new file mode 100644 index 000000000..19b45696c --- /dev/null +++ b/data/maps/LilycoveCity_DepartmentStore_5F/header.inc @@ -0,0 +1,14 @@ +LilycoveCity_DepartmentStore_5F:: @ 830676C + .4byte LilycoveCity_DepartmentStore_5F_MapAttributes + .4byte LilycoveCity_DepartmentStore_5F_MapEvents + .4byte LilycoveCity_DepartmentStore_5F_MapScripts + .4byte 0x0 + .2byte BGM_FRIENDLY + .2byte 262 + .byte 12 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/header.s b/data/maps/LilycoveCity_DepartmentStore_5F/header.s deleted file mode 100644 index 19b45696c..000000000 --- a/data/maps/LilycoveCity_DepartmentStore_5F/header.s +++ /dev/null @@ -1,14 +0,0 @@ -LilycoveCity_DepartmentStore_5F:: @ 830676C - .4byte LilycoveCity_DepartmentStore_5F_MapAttributes - .4byte LilycoveCity_DepartmentStore_5F_MapEvents - .4byte LilycoveCity_DepartmentStore_5F_MapScripts - .4byte 0x0 - .2byte BGM_FRIENDLY - .2byte 262 - .byte 12 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/LilycoveCity_EmptyMap/header.inc b/data/maps/LilycoveCity_EmptyMap/header.inc new file mode 100644 index 000000000..a83e7139d --- /dev/null +++ b/data/maps/LilycoveCity_EmptyMap/header.inc @@ -0,0 +1,14 @@ +LilycoveCity_EmptyMap:: @ 8306654 + .4byte LilycoveCity_EmptyMap_MapAttributes + .4byte LilycoveCity_EmptyMap_MapEvents + .4byte LilycoveCity_EmptyMap_MapScripts + .4byte 0x0 + .2byte BGM_MINAMO + .2byte 108 + .byte 12 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/LilycoveCity_EmptyMap/header.s b/data/maps/LilycoveCity_EmptyMap/header.s deleted file mode 100644 index a83e7139d..000000000 --- a/data/maps/LilycoveCity_EmptyMap/header.s +++ /dev/null @@ -1,14 +0,0 @@ -LilycoveCity_EmptyMap:: @ 8306654 - .4byte LilycoveCity_EmptyMap_MapAttributes - .4byte LilycoveCity_EmptyMap_MapEvents - .4byte LilycoveCity_EmptyMap_MapScripts - .4byte 0x0 - .2byte BGM_MINAMO - .2byte 108 - .byte 12 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/LilycoveCity_Harbor/header.inc b/data/maps/LilycoveCity_Harbor/header.inc new file mode 100644 index 000000000..022eb0356 --- /dev/null +++ b/data/maps/LilycoveCity_Harbor/header.inc @@ -0,0 +1,14 @@ +LilycoveCity_Harbor:: @ 8306638 + .4byte LilycoveCity_Harbor_MapAttributes + .4byte LilycoveCity_Harbor_MapEvents + .4byte LilycoveCity_Harbor_MapScripts + .4byte 0x0 + .2byte BGM_MINAMO + .2byte 88 + .byte 12 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/LilycoveCity_Harbor/header.s b/data/maps/LilycoveCity_Harbor/header.s deleted file mode 100644 index 022eb0356..000000000 --- a/data/maps/LilycoveCity_Harbor/header.s +++ /dev/null @@ -1,14 +0,0 @@ -LilycoveCity_Harbor:: @ 8306638 - .4byte LilycoveCity_Harbor_MapAttributes - .4byte LilycoveCity_Harbor_MapEvents - .4byte LilycoveCity_Harbor_MapScripts - .4byte 0x0 - .2byte BGM_MINAMO - .2byte 88 - .byte 12 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/LilycoveCity_House1/header.inc b/data/maps/LilycoveCity_House1/header.inc new file mode 100644 index 000000000..5cfc8540b --- /dev/null +++ b/data/maps/LilycoveCity_House1/header.inc @@ -0,0 +1,14 @@ +LilycoveCity_House1:: @ 830668C + .4byte House1_MapAttributes + .4byte LilycoveCity_House1_MapEvents + .4byte LilycoveCity_House1_MapScripts + .4byte 0x0 + .2byte BGM_MINAMO + .2byte 59 + .byte 12 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/LilycoveCity_House1/header.s b/data/maps/LilycoveCity_House1/header.s deleted file mode 100644 index 5cfc8540b..000000000 --- a/data/maps/LilycoveCity_House1/header.s +++ /dev/null @@ -1,14 +0,0 @@ -LilycoveCity_House1:: @ 830668C - .4byte House1_MapAttributes - .4byte LilycoveCity_House1_MapEvents - .4byte LilycoveCity_House1_MapScripts - .4byte 0x0 - .2byte BGM_MINAMO - .2byte 59 - .byte 12 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/LilycoveCity_House2/header.inc b/data/maps/LilycoveCity_House2/header.inc new file mode 100644 index 000000000..8aac9185c --- /dev/null +++ b/data/maps/LilycoveCity_House2/header.inc @@ -0,0 +1,14 @@ +LilycoveCity_House2:: @ 83066A8 + .4byte LilycoveCity_House2_MapAttributes + .4byte LilycoveCity_House2_MapEvents + .4byte LilycoveCity_House2_MapScripts + .4byte 0x0 + .2byte BGM_MINAMO + .2byte 74 + .byte 12 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/LilycoveCity_House2/header.s b/data/maps/LilycoveCity_House2/header.s deleted file mode 100644 index 8aac9185c..000000000 --- a/data/maps/LilycoveCity_House2/header.s +++ /dev/null @@ -1,14 +0,0 @@ -LilycoveCity_House2:: @ 83066A8 - .4byte LilycoveCity_House2_MapAttributes - .4byte LilycoveCity_House2_MapEvents - .4byte LilycoveCity_House2_MapScripts - .4byte 0x0 - .2byte BGM_MINAMO - .2byte 74 - .byte 12 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/LilycoveCity_House3/header.inc b/data/maps/LilycoveCity_House3/header.inc new file mode 100644 index 000000000..599e904d5 --- /dev/null +++ b/data/maps/LilycoveCity_House3/header.inc @@ -0,0 +1,14 @@ +LilycoveCity_House3:: @ 83066C4 + .4byte House2_MapAttributes + .4byte LilycoveCity_House3_MapEvents + .4byte LilycoveCity_House3_MapScripts + .4byte 0x0 + .2byte BGM_MINAMO + .2byte 60 + .byte 12 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/LilycoveCity_House3/header.s b/data/maps/LilycoveCity_House3/header.s deleted file mode 100644 index 599e904d5..000000000 --- a/data/maps/LilycoveCity_House3/header.s +++ /dev/null @@ -1,14 +0,0 @@ -LilycoveCity_House3:: @ 83066C4 - .4byte House2_MapAttributes - .4byte LilycoveCity_House3_MapEvents - .4byte LilycoveCity_House3_MapScripts - .4byte 0x0 - .2byte BGM_MINAMO - .2byte 60 - .byte 12 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/LilycoveCity_House4/header.inc b/data/maps/LilycoveCity_House4/header.inc new file mode 100644 index 000000000..d9cd2c7f0 --- /dev/null +++ b/data/maps/LilycoveCity_House4/header.inc @@ -0,0 +1,14 @@ +LilycoveCity_House4:: @ 83066E0 + .4byte House1_MapAttributes + .4byte LilycoveCity_House4_MapEvents + .4byte LilycoveCity_House4_MapScripts + .4byte 0x0 + .2byte BGM_MINAMO + .2byte 59 + .byte 12 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/LilycoveCity_House4/header.s b/data/maps/LilycoveCity_House4/header.s deleted file mode 100644 index d9cd2c7f0..000000000 --- a/data/maps/LilycoveCity_House4/header.s +++ /dev/null @@ -1,14 +0,0 @@ -LilycoveCity_House4:: @ 83066E0 - .4byte House1_MapAttributes - .4byte LilycoveCity_House4_MapEvents - .4byte LilycoveCity_House4_MapScripts - .4byte 0x0 - .2byte BGM_MINAMO - .2byte 59 - .byte 12 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc b/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc new file mode 100644 index 000000000..d48ffc94f --- /dev/null +++ b/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc @@ -0,0 +1,14 @@ +LilycoveCity_LilycoveMuseum_1F:: @ 8306558 + .4byte LilycoveCity_LilycoveMuseum_1F_MapAttributes + .4byte LilycoveCity_LilycoveMuseum_1F_MapEvents + .4byte LilycoveCity_LilycoveMuseum_1F_MapScripts + .4byte 0x0 + .2byte BGM_BIJYUTU + .2byte 103 + .byte 12 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/header.s b/data/maps/LilycoveCity_LilycoveMuseum_1F/header.s deleted file mode 100644 index d48ffc94f..000000000 --- a/data/maps/LilycoveCity_LilycoveMuseum_1F/header.s +++ /dev/null @@ -1,14 +0,0 @@ -LilycoveCity_LilycoveMuseum_1F:: @ 8306558 - .4byte LilycoveCity_LilycoveMuseum_1F_MapAttributes - .4byte LilycoveCity_LilycoveMuseum_1F_MapEvents - .4byte LilycoveCity_LilycoveMuseum_1F_MapScripts - .4byte 0x0 - .2byte BGM_BIJYUTU - .2byte 103 - .byte 12 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc new file mode 100644 index 000000000..460ed87f9 --- /dev/null +++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc @@ -0,0 +1,14 @@ +LilycoveCity_LilycoveMuseum_2F:: @ 8306574 + .4byte LilycoveCity_LilycoveMuseum_2F_MapAttributes + .4byte LilycoveCity_LilycoveMuseum_2F_MapEvents + .4byte LilycoveCity_LilycoveMuseum_2F_MapScripts + .4byte 0x0 + .2byte BGM_BIJYUTU + .2byte 104 + .byte 12 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/header.s b/data/maps/LilycoveCity_LilycoveMuseum_2F/header.s deleted file mode 100644 index 460ed87f9..000000000 --- a/data/maps/LilycoveCity_LilycoveMuseum_2F/header.s +++ /dev/null @@ -1,14 +0,0 @@ -LilycoveCity_LilycoveMuseum_2F:: @ 8306574 - .4byte LilycoveCity_LilycoveMuseum_2F_MapAttributes - .4byte LilycoveCity_LilycoveMuseum_2F_MapEvents - .4byte LilycoveCity_LilycoveMuseum_2F_MapScripts - .4byte 0x0 - .2byte BGM_BIJYUTU - .2byte 104 - .byte 12 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/LilycoveCity_MoveDeletersHouse/header.inc b/data/maps/LilycoveCity_MoveDeletersHouse/header.inc new file mode 100644 index 000000000..bcfc3435f --- /dev/null +++ b/data/maps/LilycoveCity_MoveDeletersHouse/header.inc @@ -0,0 +1,14 @@ +LilycoveCity_MoveDeletersHouse:: @ 8306670 + .4byte House2_MapAttributes + .4byte LilycoveCity_MoveDeletersHouse_MapEvents + .4byte LilycoveCity_MoveDeletersHouse_MapScripts + .4byte 0x0 + .2byte BGM_MINAMO + .2byte 60 + .byte 12 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/LilycoveCity_MoveDeletersHouse/header.s b/data/maps/LilycoveCity_MoveDeletersHouse/header.s deleted file mode 100644 index bcfc3435f..000000000 --- a/data/maps/LilycoveCity_MoveDeletersHouse/header.s +++ /dev/null @@ -1,14 +0,0 @@ -LilycoveCity_MoveDeletersHouse:: @ 8306670 - .4byte House2_MapAttributes - .4byte LilycoveCity_MoveDeletersHouse_MapEvents - .4byte LilycoveCity_MoveDeletersHouse_MapScripts - .4byte 0x0 - .2byte BGM_MINAMO - .2byte 60 - .byte 12 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/LilycoveCity_PokemonCenter_1F/header.inc b/data/maps/LilycoveCity_PokemonCenter_1F/header.inc new file mode 100644 index 000000000..a1eb040ae --- /dev/null +++ b/data/maps/LilycoveCity_PokemonCenter_1F/header.inc @@ -0,0 +1,14 @@ +LilycoveCity_PokemonCenter_1F:: @ 83065C8 + .4byte PokemonCenter_1F_MapAttributes + .4byte LilycoveCity_PokemonCenter_1F_MapEvents + .4byte LilycoveCity_PokemonCenter_1F_MapScripts + .4byte 0x0 + .2byte BGM_POKECEN + .2byte 61 + .byte 12 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/LilycoveCity_PokemonCenter_1F/header.s b/data/maps/LilycoveCity_PokemonCenter_1F/header.s deleted file mode 100644 index a1eb040ae..000000000 --- a/data/maps/LilycoveCity_PokemonCenter_1F/header.s +++ /dev/null @@ -1,14 +0,0 @@ -LilycoveCity_PokemonCenter_1F:: @ 83065C8 - .4byte PokemonCenter_1F_MapAttributes - .4byte LilycoveCity_PokemonCenter_1F_MapEvents - .4byte LilycoveCity_PokemonCenter_1F_MapScripts - .4byte 0x0 - .2byte BGM_POKECEN - .2byte 61 - .byte 12 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/LilycoveCity_PokemonCenter_2F/header.inc b/data/maps/LilycoveCity_PokemonCenter_2F/header.inc new file mode 100644 index 000000000..341ce8590 --- /dev/null +++ b/data/maps/LilycoveCity_PokemonCenter_2F/header.inc @@ -0,0 +1,14 @@ +LilycoveCity_PokemonCenter_2F:: @ 83065E4 + .4byte PokemonCenter_2F_MapAttributes + .4byte LilycoveCity_PokemonCenter_2F_MapEvents + .4byte LilycoveCity_PokemonCenter_2F_MapScripts + .4byte 0x0 + .2byte BGM_POKECEN + .2byte 62 + .byte 12 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/LilycoveCity_PokemonCenter_2F/header.s b/data/maps/LilycoveCity_PokemonCenter_2F/header.s deleted file mode 100644 index 341ce8590..000000000 --- a/data/maps/LilycoveCity_PokemonCenter_2F/header.s +++ /dev/null @@ -1,14 +0,0 @@ -LilycoveCity_PokemonCenter_2F:: @ 83065E4 - .4byte PokemonCenter_2F_MapAttributes - .4byte LilycoveCity_PokemonCenter_2F_MapEvents - .4byte LilycoveCity_PokemonCenter_2F_MapScripts - .4byte 0x0 - .2byte BGM_POKECEN - .2byte 62 - .byte 12 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc b/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc new file mode 100644 index 000000000..4e75b2193 --- /dev/null +++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc @@ -0,0 +1,14 @@ +LilycoveCity_PokemonTrainerFanClub:: @ 830661C + .4byte LilycoveCity_PokemonTrainerFanClub_MapAttributes + .4byte LilycoveCity_PokemonTrainerFanClub_MapEvents + .4byte LilycoveCity_PokemonTrainerFanClub_MapScripts + .4byte 0x0 + .2byte BGM_MINAMO + .2byte 107 + .byte 12 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/header.s b/data/maps/LilycoveCity_PokemonTrainerFanClub/header.s deleted file mode 100644 index 4e75b2193..000000000 --- a/data/maps/LilycoveCity_PokemonTrainerFanClub/header.s +++ /dev/null @@ -1,14 +0,0 @@ -LilycoveCity_PokemonTrainerFanClub:: @ 830661C - .4byte LilycoveCity_PokemonTrainerFanClub_MapAttributes - .4byte LilycoveCity_PokemonTrainerFanClub_MapEvents - .4byte LilycoveCity_PokemonTrainerFanClub_MapScripts - .4byte 0x0 - .2byte BGM_MINAMO - .2byte 107 - .byte 12 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/LilycoveCity_UnusedMart/header.inc b/data/maps/LilycoveCity_UnusedMart/header.inc new file mode 100644 index 000000000..43137d33b --- /dev/null +++ b/data/maps/LilycoveCity_UnusedMart/header.inc @@ -0,0 +1,14 @@ +LilycoveCity_UnusedMart:: @ 8306600 + .4byte PokeMart_MapAttributes + .4byte LilycoveCity_UnusedMart_MapEvents + .4byte LilycoveCity_UnusedMart_MapScripts + .4byte 0x0 + .2byte BGM_FRIENDLY + .2byte 63 + .byte 12 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/LilycoveCity_UnusedMart/header.s b/data/maps/LilycoveCity_UnusedMart/header.s deleted file mode 100644 index 43137d33b..000000000 --- a/data/maps/LilycoveCity_UnusedMart/header.s +++ /dev/null @@ -1,14 +0,0 @@ -LilycoveCity_UnusedMart:: @ 8306600 - .4byte PokeMart_MapAttributes - .4byte LilycoveCity_UnusedMart_MapEvents - .4byte LilycoveCity_UnusedMart_MapScripts - .4byte 0x0 - .2byte BGM_FRIENDLY - .2byte 63 - .byte 12 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/LinkContestRoom1/header.inc b/data/maps/LinkContestRoom1/header.inc new file mode 100644 index 000000000..9e265d9c9 --- /dev/null +++ b/data/maps/LinkContestRoom1/header.inc @@ -0,0 +1,14 @@ +LinkContestRoom1:: @ 83079E8 + .4byte LinkContestRoom1_MapAttributes + .4byte LinkContestRoom1_MapEvents + .4byte LinkContestRoom1_MapScripts + .4byte 0x0 + .2byte BGM_CONTEST0 + .2byte 226 + .byte 87 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/LinkContestRoom1/header.s b/data/maps/LinkContestRoom1/header.s deleted file mode 100644 index 9e265d9c9..000000000 --- a/data/maps/LinkContestRoom1/header.s +++ /dev/null @@ -1,14 +0,0 @@ -LinkContestRoom1:: @ 83079E8 - .4byte LinkContestRoom1_MapAttributes - .4byte LinkContestRoom1_MapEvents - .4byte LinkContestRoom1_MapScripts - .4byte 0x0 - .2byte BGM_CONTEST0 - .2byte 226 - .byte 87 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/LinkContestRoom2/header.inc b/data/maps/LinkContestRoom2/header.inc new file mode 100644 index 000000000..f492eab03 --- /dev/null +++ b/data/maps/LinkContestRoom2/header.inc @@ -0,0 +1,14 @@ +LinkContestRoom2:: @ 8307AAC + .4byte LinkContestRoom2_MapAttributes + .4byte LinkContestRoom2_MapEvents + .4byte LinkContestRoom2_MapScripts + .4byte 0x0 + .2byte BGM_CONTEST0 + .2byte 233 + .byte 87 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/LinkContestRoom2/header.s b/data/maps/LinkContestRoom2/header.s deleted file mode 100644 index f492eab03..000000000 --- a/data/maps/LinkContestRoom2/header.s +++ /dev/null @@ -1,14 +0,0 @@ -LinkContestRoom2:: @ 8307AAC - .4byte LinkContestRoom2_MapAttributes - .4byte LinkContestRoom2_MapEvents - .4byte LinkContestRoom2_MapScripts - .4byte 0x0 - .2byte BGM_CONTEST0 - .2byte 233 - .byte 87 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/LinkContestRoom3/header.inc b/data/maps/LinkContestRoom3/header.inc new file mode 100644 index 000000000..90de4491d --- /dev/null +++ b/data/maps/LinkContestRoom3/header.inc @@ -0,0 +1,14 @@ +LinkContestRoom3:: @ 8307AC8 + .4byte LinkContestRoom3_MapAttributes + .4byte LinkContestRoom3_MapEvents + .4byte LinkContestRoom3_MapScripts + .4byte 0x0 + .2byte BGM_CONTEST0 + .2byte 234 + .byte 87 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/LinkContestRoom3/header.s b/data/maps/LinkContestRoom3/header.s deleted file mode 100644 index 90de4491d..000000000 --- a/data/maps/LinkContestRoom3/header.s +++ /dev/null @@ -1,14 +0,0 @@ -LinkContestRoom3:: @ 8307AC8 - .4byte LinkContestRoom3_MapAttributes - .4byte LinkContestRoom3_MapEvents - .4byte LinkContestRoom3_MapScripts - .4byte 0x0 - .2byte BGM_CONTEST0 - .2byte 234 - .byte 87 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/LinkContestRoom4/header.inc b/data/maps/LinkContestRoom4/header.inc new file mode 100644 index 000000000..774e55abc --- /dev/null +++ b/data/maps/LinkContestRoom4/header.inc @@ -0,0 +1,14 @@ +LinkContestRoom4:: @ 8307AE4 + .4byte LinkContestRoom4_MapAttributes + .4byte LinkContestRoom4_MapEvents + .4byte LinkContestRoom4_MapScripts + .4byte 0x0 + .2byte BGM_CONTEST0 + .2byte 235 + .byte 87 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/LinkContestRoom4/header.s b/data/maps/LinkContestRoom4/header.s deleted file mode 100644 index 774e55abc..000000000 --- a/data/maps/LinkContestRoom4/header.s +++ /dev/null @@ -1,14 +0,0 @@ -LinkContestRoom4:: @ 8307AE4 - .4byte LinkContestRoom4_MapAttributes - .4byte LinkContestRoom4_MapEvents - .4byte LinkContestRoom4_MapScripts - .4byte 0x0 - .2byte BGM_CONTEST0 - .2byte 235 - .byte 87 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/LinkContestRoom5/header.inc b/data/maps/LinkContestRoom5/header.inc new file mode 100644 index 000000000..22b90f6c9 --- /dev/null +++ b/data/maps/LinkContestRoom5/header.inc @@ -0,0 +1,14 @@ +LinkContestRoom5:: @ 8307B00 + .4byte LinkContestRoom5_MapAttributes + .4byte LinkContestRoom5_MapEvents + .4byte LinkContestRoom5_MapScripts + .4byte 0x0 + .2byte BGM_CONTEST0 + .2byte 236 + .byte 87 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/LinkContestRoom5/header.s b/data/maps/LinkContestRoom5/header.s deleted file mode 100644 index 22b90f6c9..000000000 --- a/data/maps/LinkContestRoom5/header.s +++ /dev/null @@ -1,14 +0,0 @@ -LinkContestRoom5:: @ 8307B00 - .4byte LinkContestRoom5_MapAttributes - .4byte LinkContestRoom5_MapEvents - .4byte LinkContestRoom5_MapScripts - .4byte 0x0 - .2byte BGM_CONTEST0 - .2byte 236 - .byte 87 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/LinkContestRoom6/header.inc b/data/maps/LinkContestRoom6/header.inc new file mode 100644 index 000000000..773912080 --- /dev/null +++ b/data/maps/LinkContestRoom6/header.inc @@ -0,0 +1,14 @@ +LinkContestRoom6:: @ 8307B1C + .4byte LinkContestRoom6_MapAttributes + .4byte LinkContestRoom6_MapEvents + .4byte LinkContestRoom6_MapScripts + .4byte 0x0 + .2byte BGM_CONTEST0 + .2byte 237 + .byte 87 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/LinkContestRoom6/header.s b/data/maps/LinkContestRoom6/header.s deleted file mode 100644 index 773912080..000000000 --- a/data/maps/LinkContestRoom6/header.s +++ /dev/null @@ -1,14 +0,0 @@ -LinkContestRoom6:: @ 8307B1C - .4byte LinkContestRoom6_MapAttributes - .4byte LinkContestRoom6_MapEvents - .4byte LinkContestRoom6_MapScripts - .4byte 0x0 - .2byte BGM_CONTEST0 - .2byte 237 - .byte 87 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/LittlerootTown/connections.inc b/data/maps/LittlerootTown/connections.inc new file mode 100644 index 000000000..d045d04d7 --- /dev/null +++ b/data/maps/LittlerootTown/connections.inc @@ -0,0 +1,6 @@ +LittlerootTown_MapConnectionsList:: @ 8308610 + connection up, 0, Route101 + +LittlerootTown_MapConnections:: @ 830861C + .4byte 0x1 + .4byte LittlerootTown_MapConnectionsList diff --git a/data/maps/LittlerootTown/connections.s b/data/maps/LittlerootTown/connections.s deleted file mode 100644 index d045d04d7..000000000 --- a/data/maps/LittlerootTown/connections.s +++ /dev/null @@ -1,6 +0,0 @@ -LittlerootTown_MapConnectionsList:: @ 8308610 - connection up, 0, Route101 - -LittlerootTown_MapConnections:: @ 830861C - .4byte 0x1 - .4byte LittlerootTown_MapConnectionsList diff --git a/data/maps/LittlerootTown/header.inc b/data/maps/LittlerootTown/header.inc new file mode 100644 index 000000000..5493f6005 --- /dev/null +++ b/data/maps/LittlerootTown/header.inc @@ -0,0 +1,14 @@ +LittlerootTown:: @ 8305544 + .4byte LittlerootTown_MapAttributes + .4byte LittlerootTown_MapEvents + .4byte LittlerootTown_MapScripts + .4byte LittlerootTown_MapConnections + .2byte BGM_MISHIRO + .2byte 10 + .byte 0 + .byte 0 + .byte 2 + .byte 1 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/LittlerootTown/header.s b/data/maps/LittlerootTown/header.s deleted file mode 100644 index 5493f6005..000000000 --- a/data/maps/LittlerootTown/header.s +++ /dev/null @@ -1,14 +0,0 @@ -LittlerootTown:: @ 8305544 - .4byte LittlerootTown_MapAttributes - .4byte LittlerootTown_MapEvents - .4byte LittlerootTown_MapScripts - .4byte LittlerootTown_MapConnections - .2byte BGM_MISHIRO - .2byte 10 - .byte 0 - .byte 0 - .byte 2 - .byte 1 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/header.inc b/data/maps/LittlerootTown_BrendansHouse_1F/header.inc new file mode 100644 index 000000000..122fdc82a --- /dev/null +++ b/data/maps/LittlerootTown_BrendansHouse_1F/header.inc @@ -0,0 +1,14 @@ +LittlerootTown_BrendansHouse_1F:: @ 8305A30 + .4byte LittlerootTown_BrendansHouse_1F_MapAttributes + .4byte LittlerootTown_BrendansHouse_1F_MapEvents + .4byte LittlerootTown_BrendansHouse_1F_MapScripts + .4byte 0x0 + .2byte BGM_MISHIRO + .2byte 54 + .byte 0 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/header.s b/data/maps/LittlerootTown_BrendansHouse_1F/header.s deleted file mode 100644 index 122fdc82a..000000000 --- a/data/maps/LittlerootTown_BrendansHouse_1F/header.s +++ /dev/null @@ -1,14 +0,0 @@ -LittlerootTown_BrendansHouse_1F:: @ 8305A30 - .4byte LittlerootTown_BrendansHouse_1F_MapAttributes - .4byte LittlerootTown_BrendansHouse_1F_MapEvents - .4byte LittlerootTown_BrendansHouse_1F_MapScripts - .4byte 0x0 - .2byte BGM_MISHIRO - .2byte 54 - .byte 0 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/header.inc b/data/maps/LittlerootTown_BrendansHouse_2F/header.inc new file mode 100644 index 000000000..449a883cb --- /dev/null +++ b/data/maps/LittlerootTown_BrendansHouse_2F/header.inc @@ -0,0 +1,14 @@ +LittlerootTown_BrendansHouse_2F:: @ 8305A4C + .4byte LittlerootTown_BrendansHouse_2F_MapAttributes + .4byte LittlerootTown_BrendansHouse_2F_MapEvents + .4byte LittlerootTown_BrendansHouse_2F_MapScripts + .4byte 0x0 + .2byte BGM_MISHIRO + .2byte 55 + .byte 0 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/header.s b/data/maps/LittlerootTown_BrendansHouse_2F/header.s deleted file mode 100644 index 449a883cb..000000000 --- a/data/maps/LittlerootTown_BrendansHouse_2F/header.s +++ /dev/null @@ -1,14 +0,0 @@ -LittlerootTown_BrendansHouse_2F:: @ 8305A4C - .4byte LittlerootTown_BrendansHouse_2F_MapAttributes - .4byte LittlerootTown_BrendansHouse_2F_MapEvents - .4byte LittlerootTown_BrendansHouse_2F_MapScripts - .4byte 0x0 - .2byte BGM_MISHIRO - .2byte 55 - .byte 0 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/LittlerootTown_MaysHouse_1F/header.inc b/data/maps/LittlerootTown_MaysHouse_1F/header.inc new file mode 100644 index 000000000..6d6220086 --- /dev/null +++ b/data/maps/LittlerootTown_MaysHouse_1F/header.inc @@ -0,0 +1,14 @@ +LittlerootTown_MaysHouse_1F:: @ 8305A68 + .4byte LittlerootTown_MaysHouse_1F_MapAttributes + .4byte LittlerootTown_MaysHouse_1F_MapEvents + .4byte LittlerootTown_MaysHouse_1F_MapScripts + .4byte 0x0 + .2byte BGM_MISHIRO + .2byte 56 + .byte 0 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/LittlerootTown_MaysHouse_1F/header.s b/data/maps/LittlerootTown_MaysHouse_1F/header.s deleted file mode 100644 index 6d6220086..000000000 --- a/data/maps/LittlerootTown_MaysHouse_1F/header.s +++ /dev/null @@ -1,14 +0,0 @@ -LittlerootTown_MaysHouse_1F:: @ 8305A68 - .4byte LittlerootTown_MaysHouse_1F_MapAttributes - .4byte LittlerootTown_MaysHouse_1F_MapEvents - .4byte LittlerootTown_MaysHouse_1F_MapScripts - .4byte 0x0 - .2byte BGM_MISHIRO - .2byte 56 - .byte 0 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/LittlerootTown_MaysHouse_2F/header.inc b/data/maps/LittlerootTown_MaysHouse_2F/header.inc new file mode 100644 index 000000000..44859dd4c --- /dev/null +++ b/data/maps/LittlerootTown_MaysHouse_2F/header.inc @@ -0,0 +1,14 @@ +LittlerootTown_MaysHouse_2F:: @ 8305A84 + .4byte LittlerootTown_MaysHouse_2F_MapAttributes + .4byte LittlerootTown_MaysHouse_2F_MapEvents + .4byte LittlerootTown_MaysHouse_2F_MapScripts + .4byte 0x0 + .2byte BGM_MISHIRO + .2byte 57 + .byte 0 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/LittlerootTown_MaysHouse_2F/header.s b/data/maps/LittlerootTown_MaysHouse_2F/header.s deleted file mode 100644 index 44859dd4c..000000000 --- a/data/maps/LittlerootTown_MaysHouse_2F/header.s +++ /dev/null @@ -1,14 +0,0 @@ -LittlerootTown_MaysHouse_2F:: @ 8305A84 - .4byte LittlerootTown_MaysHouse_2F_MapAttributes - .4byte LittlerootTown_MaysHouse_2F_MapEvents - .4byte LittlerootTown_MaysHouse_2F_MapScripts - .4byte 0x0 - .2byte BGM_MISHIRO - .2byte 57 - .byte 0 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc new file mode 100644 index 000000000..31fb03c64 --- /dev/null +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc @@ -0,0 +1,14 @@ +LittlerootTown_ProfessorBirchsLab:: @ 8305AA0 + .4byte LittlerootTown_ProfessorBirchsLab_MapAttributes + .4byte LittlerootTown_ProfessorBirchsLab_MapEvents + .4byte LittlerootTown_ProfessorBirchsLab_MapScripts + .4byte 0x0 + .2byte BGM_ODAMAKI + .2byte 58 + .byte 0 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/header.s b/data/maps/LittlerootTown_ProfessorBirchsLab/header.s deleted file mode 100644 index 31fb03c64..000000000 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/header.s +++ /dev/null @@ -1,14 +0,0 @@ -LittlerootTown_ProfessorBirchsLab:: @ 8305AA0 - .4byte LittlerootTown_ProfessorBirchsLab_MapAttributes - .4byte LittlerootTown_ProfessorBirchsLab_MapEvents - .4byte LittlerootTown_ProfessorBirchsLab_MapScripts - .4byte 0x0 - .2byte BGM_ODAMAKI - .2byte 58 - .byte 0 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/MagmaHideout_1F/header.inc b/data/maps/MagmaHideout_1F/header.inc new file mode 100644 index 000000000..3876e17ec --- /dev/null +++ b/data/maps/MagmaHideout_1F/header.inc @@ -0,0 +1,14 @@ +MagmaHideout_1F:: @ 8307588 + .4byte MagmaHideout_1F_MapAttributes + .4byte MagmaHideout_1F_MapEvents + .4byte MagmaHideout_1F_MapScripts + .4byte 0x0 + .2byte BGM_AJITO + .2byte 317 + .byte 66 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 1 + .byte 2 diff --git a/data/maps/MagmaHideout_1F/header.s b/data/maps/MagmaHideout_1F/header.s deleted file mode 100644 index 3876e17ec..000000000 --- a/data/maps/MagmaHideout_1F/header.s +++ /dev/null @@ -1,14 +0,0 @@ -MagmaHideout_1F:: @ 8307588 - .4byte MagmaHideout_1F_MapAttributes - .4byte MagmaHideout_1F_MapEvents - .4byte MagmaHideout_1F_MapScripts - .4byte 0x0 - .2byte BGM_AJITO - .2byte 317 - .byte 66 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 1 - .byte 2 diff --git a/data/maps/MagmaHideout_B1F/header.inc b/data/maps/MagmaHideout_B1F/header.inc new file mode 100644 index 000000000..16fe3f2ba --- /dev/null +++ b/data/maps/MagmaHideout_B1F/header.inc @@ -0,0 +1,14 @@ +MagmaHideout_B1F:: @ 83075A4 + .4byte MagmaHideout_B1F_MapAttributes + .4byte MagmaHideout_B1F_MapEvents + .4byte MagmaHideout_B1F_MapScripts + .4byte 0x0 + .2byte BGM_AJITO + .2byte 318 + .byte 66 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 1 + .byte 2 diff --git a/data/maps/MagmaHideout_B1F/header.s b/data/maps/MagmaHideout_B1F/header.s deleted file mode 100644 index 16fe3f2ba..000000000 --- a/data/maps/MagmaHideout_B1F/header.s +++ /dev/null @@ -1,14 +0,0 @@ -MagmaHideout_B1F:: @ 83075A4 - .4byte MagmaHideout_B1F_MapAttributes - .4byte MagmaHideout_B1F_MapEvents - .4byte MagmaHideout_B1F_MapScripts - .4byte 0x0 - .2byte BGM_AJITO - .2byte 318 - .byte 66 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 1 - .byte 2 diff --git a/data/maps/MagmaHideout_B2F/header.inc b/data/maps/MagmaHideout_B2F/header.inc new file mode 100644 index 000000000..3aee695b4 --- /dev/null +++ b/data/maps/MagmaHideout_B2F/header.inc @@ -0,0 +1,14 @@ +MagmaHideout_B2F:: @ 83075C0 + .4byte MagmaHideout_B2F_MapAttributes + .4byte MagmaHideout_B2F_MapEvents + .4byte MagmaHideout_B2F_MapScripts + .4byte 0x0 + .2byte BGM_AJITO + .2byte 319 + .byte 66 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 1 + .byte 2 diff --git a/data/maps/MagmaHideout_B2F/header.s b/data/maps/MagmaHideout_B2F/header.s deleted file mode 100644 index 3aee695b4..000000000 --- a/data/maps/MagmaHideout_B2F/header.s +++ /dev/null @@ -1,14 +0,0 @@ -MagmaHideout_B2F:: @ 83075C0 - .4byte MagmaHideout_B2F_MapAttributes - .4byte MagmaHideout_B2F_MapEvents - .4byte MagmaHideout_B2F_MapScripts - .4byte 0x0 - .2byte BGM_AJITO - .2byte 319 - .byte 66 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 1 - .byte 2 diff --git a/data/maps/MauvilleCity/connections.inc b/data/maps/MauvilleCity/connections.inc new file mode 100644 index 000000000..07f3649cd --- /dev/null +++ b/data/maps/MauvilleCity/connections.inc @@ -0,0 +1,9 @@ +MauvilleCity_MapConnectionsList:: @ 8308730 + connection up, 0, Route111 + connection down, 0, Route110 + connection left, 0, Route117 + connection right, 0, Route118 + +MauvilleCity_MapConnections:: @ 8308760 + .4byte 0x4 + .4byte MauvilleCity_MapConnectionsList diff --git a/data/maps/MauvilleCity/connections.s b/data/maps/MauvilleCity/connections.s deleted file mode 100644 index 07f3649cd..000000000 --- a/data/maps/MauvilleCity/connections.s +++ /dev/null @@ -1,9 +0,0 @@ -MauvilleCity_MapConnectionsList:: @ 8308730 - connection up, 0, Route111 - connection down, 0, Route110 - connection left, 0, Route117 - connection right, 0, Route118 - -MauvilleCity_MapConnections:: @ 8308760 - .4byte 0x4 - .4byte MauvilleCity_MapConnectionsList diff --git a/data/maps/MauvilleCity/header.inc b/data/maps/MauvilleCity/header.inc new file mode 100644 index 000000000..e0e2c4f22 --- /dev/null +++ b/data/maps/MauvilleCity/header.inc @@ -0,0 +1,14 @@ +MauvilleCity:: @ 8305480 + .4byte MauvilleCity_MapAttributes + .4byte MauvilleCity_MapEvents + .4byte MauvilleCity_MapScripts + .4byte MauvilleCity_MapConnections + .2byte BGM_GOTOWN + .2byte 3 + .byte 9 + .byte 0 + .byte 2 + .byte 2 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/MauvilleCity/header.s b/data/maps/MauvilleCity/header.s deleted file mode 100644 index e0e2c4f22..000000000 --- a/data/maps/MauvilleCity/header.s +++ /dev/null @@ -1,14 +0,0 @@ -MauvilleCity:: @ 8305480 - .4byte MauvilleCity_MapAttributes - .4byte MauvilleCity_MapEvents - .4byte MauvilleCity_MapScripts - .4byte MauvilleCity_MapConnections - .2byte BGM_GOTOWN - .2byte 3 - .byte 9 - .byte 0 - .byte 2 - .byte 2 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/MauvilleCity_BikeShop/header.inc b/data/maps/MauvilleCity_BikeShop/header.inc new file mode 100644 index 000000000..c99124794 --- /dev/null +++ b/data/maps/MauvilleCity_BikeShop/header.inc @@ -0,0 +1,14 @@ +MauvilleCity_BikeShop:: @ 8306168 + .4byte MauvilleCity_BikeShop_MapAttributes + .4byte MauvilleCity_BikeShop_MapEvents + .4byte MauvilleCity_BikeShop_MapScripts + .4byte 0x0 + .2byte BGM_GOTOWN + .2byte 90 + .byte 9 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/MauvilleCity_BikeShop/header.s b/data/maps/MauvilleCity_BikeShop/header.s deleted file mode 100644 index c99124794..000000000 --- a/data/maps/MauvilleCity_BikeShop/header.s +++ /dev/null @@ -1,14 +0,0 @@ -MauvilleCity_BikeShop:: @ 8306168 - .4byte MauvilleCity_BikeShop_MapAttributes - .4byte MauvilleCity_BikeShop_MapEvents - .4byte MauvilleCity_BikeShop_MapScripts - .4byte 0x0 - .2byte BGM_GOTOWN - .2byte 90 - .byte 9 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/MauvilleCity_GameCorner/header.inc b/data/maps/MauvilleCity_GameCorner/header.inc new file mode 100644 index 000000000..653a41544 --- /dev/null +++ b/data/maps/MauvilleCity_GameCorner/header.inc @@ -0,0 +1,14 @@ +MauvilleCity_GameCorner:: @ 83061A0 + .4byte MauvilleCity_GameCorner_MapAttributes + .4byte MauvilleCity_GameCorner_MapEvents + .4byte MauvilleCity_GameCorner_MapScripts + .4byte 0x0 + .2byte BGM_CASINO + .2byte 91 + .byte 9 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/MauvilleCity_GameCorner/header.s b/data/maps/MauvilleCity_GameCorner/header.s deleted file mode 100644 index 653a41544..000000000 --- a/data/maps/MauvilleCity_GameCorner/header.s +++ /dev/null @@ -1,14 +0,0 @@ -MauvilleCity_GameCorner:: @ 83061A0 - .4byte MauvilleCity_GameCorner_MapAttributes - .4byte MauvilleCity_GameCorner_MapEvents - .4byte MauvilleCity_GameCorner_MapScripts - .4byte 0x0 - .2byte BGM_CASINO - .2byte 91 - .byte 9 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/MauvilleCity_Gym/header.inc b/data/maps/MauvilleCity_Gym/header.inc new file mode 100644 index 000000000..efbd61fe0 --- /dev/null +++ b/data/maps/MauvilleCity_Gym/header.inc @@ -0,0 +1,14 @@ +MauvilleCity_Gym:: @ 830614C + .4byte MauvilleCity_Gym_MapAttributes + .4byte MauvilleCity_Gym_MapEvents + .4byte MauvilleCity_Gym_MapScripts + .4byte 0x0 + .2byte BGM_GIM + .2byte 89 + .byte 9 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 1 diff --git a/data/maps/MauvilleCity_Gym/header.s b/data/maps/MauvilleCity_Gym/header.s deleted file mode 100644 index efbd61fe0..000000000 --- a/data/maps/MauvilleCity_Gym/header.s +++ /dev/null @@ -1,14 +0,0 @@ -MauvilleCity_Gym:: @ 830614C - .4byte MauvilleCity_Gym_MapAttributes - .4byte MauvilleCity_Gym_MapEvents - .4byte MauvilleCity_Gym_MapScripts - .4byte 0x0 - .2byte BGM_GIM - .2byte 89 - .byte 9 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 1 diff --git a/data/maps/MauvilleCity_House1/header.inc b/data/maps/MauvilleCity_House1/header.inc new file mode 100644 index 000000000..30c59da1e --- /dev/null +++ b/data/maps/MauvilleCity_House1/header.inc @@ -0,0 +1,14 @@ +MauvilleCity_House1:: @ 8306184 + .4byte House2_MapAttributes + .4byte MauvilleCity_House1_MapEvents + .4byte MauvilleCity_House1_MapScripts + .4byte 0x0 + .2byte BGM_GOTOWN + .2byte 60 + .byte 9 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/MauvilleCity_House1/header.s b/data/maps/MauvilleCity_House1/header.s deleted file mode 100644 index 30c59da1e..000000000 --- a/data/maps/MauvilleCity_House1/header.s +++ /dev/null @@ -1,14 +0,0 @@ -MauvilleCity_House1:: @ 8306184 - .4byte House2_MapAttributes - .4byte MauvilleCity_House1_MapEvents - .4byte MauvilleCity_House1_MapScripts - .4byte 0x0 - .2byte BGM_GOTOWN - .2byte 60 - .byte 9 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/MauvilleCity_House2/header.inc b/data/maps/MauvilleCity_House2/header.inc new file mode 100644 index 000000000..9bd7d9c11 --- /dev/null +++ b/data/maps/MauvilleCity_House2/header.inc @@ -0,0 +1,14 @@ +MauvilleCity_House2:: @ 83061BC + .4byte House1_MapAttributes + .4byte MauvilleCity_House2_MapEvents + .4byte MauvilleCity_House2_MapScripts + .4byte 0x0 + .2byte BGM_GOTOWN + .2byte 59 + .byte 9 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/MauvilleCity_House2/header.s b/data/maps/MauvilleCity_House2/header.s deleted file mode 100644 index 9bd7d9c11..000000000 --- a/data/maps/MauvilleCity_House2/header.s +++ /dev/null @@ -1,14 +0,0 @@ -MauvilleCity_House2:: @ 83061BC - .4byte House1_MapAttributes - .4byte MauvilleCity_House2_MapEvents - .4byte MauvilleCity_House2_MapScripts - .4byte 0x0 - .2byte BGM_GOTOWN - .2byte 59 - .byte 9 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/MauvilleCity_Mart/header.inc b/data/maps/MauvilleCity_Mart/header.inc new file mode 100644 index 000000000..7712e16df --- /dev/null +++ b/data/maps/MauvilleCity_Mart/header.inc @@ -0,0 +1,14 @@ +MauvilleCity_Mart:: @ 8306210 + .4byte PokeMart_MapAttributes + .4byte MauvilleCity_Mart_MapEvents + .4byte MauvilleCity_Mart_MapScripts + .4byte 0x0 + .2byte BGM_FRIENDLY + .2byte 63 + .byte 9 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/MauvilleCity_Mart/header.s b/data/maps/MauvilleCity_Mart/header.s deleted file mode 100644 index 7712e16df..000000000 --- a/data/maps/MauvilleCity_Mart/header.s +++ /dev/null @@ -1,14 +0,0 @@ -MauvilleCity_Mart:: @ 8306210 - .4byte PokeMart_MapAttributes - .4byte MauvilleCity_Mart_MapEvents - .4byte MauvilleCity_Mart_MapScripts - .4byte 0x0 - .2byte BGM_FRIENDLY - .2byte 63 - .byte 9 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/MauvilleCity_PokemonCenter_1F/header.inc b/data/maps/MauvilleCity_PokemonCenter_1F/header.inc new file mode 100644 index 000000000..b6e0a1628 --- /dev/null +++ b/data/maps/MauvilleCity_PokemonCenter_1F/header.inc @@ -0,0 +1,14 @@ +MauvilleCity_PokemonCenter_1F:: @ 83061D8 + .4byte PokemonCenter_1F_MapAttributes + .4byte MauvilleCity_PokemonCenter_1F_MapEvents + .4byte MauvilleCity_PokemonCenter_1F_MapScripts + .4byte 0x0 + .2byte BGM_POKECEN + .2byte 61 + .byte 9 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/MauvilleCity_PokemonCenter_1F/header.s b/data/maps/MauvilleCity_PokemonCenter_1F/header.s deleted file mode 100644 index b6e0a1628..000000000 --- a/data/maps/MauvilleCity_PokemonCenter_1F/header.s +++ /dev/null @@ -1,14 +0,0 @@ -MauvilleCity_PokemonCenter_1F:: @ 83061D8 - .4byte PokemonCenter_1F_MapAttributes - .4byte MauvilleCity_PokemonCenter_1F_MapEvents - .4byte MauvilleCity_PokemonCenter_1F_MapScripts - .4byte 0x0 - .2byte BGM_POKECEN - .2byte 61 - .byte 9 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/MauvilleCity_PokemonCenter_2F/header.inc b/data/maps/MauvilleCity_PokemonCenter_2F/header.inc new file mode 100644 index 000000000..8787c975e --- /dev/null +++ b/data/maps/MauvilleCity_PokemonCenter_2F/header.inc @@ -0,0 +1,14 @@ +MauvilleCity_PokemonCenter_2F:: @ 83061F4 + .4byte PokemonCenter_2F_MapAttributes + .4byte MauvilleCity_PokemonCenter_2F_MapEvents + .4byte MauvilleCity_PokemonCenter_2F_MapScripts + .4byte 0x0 + .2byte BGM_POKECEN + .2byte 62 + .byte 9 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/MauvilleCity_PokemonCenter_2F/header.s b/data/maps/MauvilleCity_PokemonCenter_2F/header.s deleted file mode 100644 index 8787c975e..000000000 --- a/data/maps/MauvilleCity_PokemonCenter_2F/header.s +++ /dev/null @@ -1,14 +0,0 @@ -MauvilleCity_PokemonCenter_2F:: @ 83061F4 - .4byte PokemonCenter_2F_MapAttributes - .4byte MauvilleCity_PokemonCenter_2F_MapEvents - .4byte MauvilleCity_PokemonCenter_2F_MapScripts - .4byte 0x0 - .2byte BGM_POKECEN - .2byte 62 - .byte 9 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/MeteorFalls_1F_1R/header.inc b/data/maps/MeteorFalls_1F_1R/header.inc new file mode 100644 index 000000000..dcb3fbbde --- /dev/null +++ b/data/maps/MeteorFalls_1F_1R/header.inc @@ -0,0 +1,14 @@ +MeteorFalls_1F_1R:: @ 8306D70 + .4byte MeteorFalls_1F_1R_MapAttributes + .4byte MeteorFalls_1F_1R_MapEvents + .4byte MeteorFalls_1F_1R_MapScripts + .4byte 0x0 + .2byte BGM_DAN03 + .2byte 126 + .byte 63 + .byte 0 + .byte 0 + .byte 4 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/MeteorFalls_1F_1R/header.s b/data/maps/MeteorFalls_1F_1R/header.s deleted file mode 100644 index dcb3fbbde..000000000 --- a/data/maps/MeteorFalls_1F_1R/header.s +++ /dev/null @@ -1,14 +0,0 @@ -MeteorFalls_1F_1R:: @ 8306D70 - .4byte MeteorFalls_1F_1R_MapAttributes - .4byte MeteorFalls_1F_1R_MapEvents - .4byte MeteorFalls_1F_1R_MapScripts - .4byte 0x0 - .2byte BGM_DAN03 - .2byte 126 - .byte 63 - .byte 0 - .byte 0 - .byte 4 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/MeteorFalls_1F_2R/header.inc b/data/maps/MeteorFalls_1F_2R/header.inc new file mode 100644 index 000000000..0d9d797aa --- /dev/null +++ b/data/maps/MeteorFalls_1F_2R/header.inc @@ -0,0 +1,14 @@ +MeteorFalls_1F_2R:: @ 8306D8C + .4byte MeteorFalls_1F_2R_MapAttributes + .4byte MeteorFalls_1F_2R_MapEvents + .4byte MeteorFalls_1F_2R_MapScripts + .4byte 0x0 + .2byte BGM_DAN03 + .2byte 127 + .byte 63 + .byte 0 + .byte 0 + .byte 4 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/MeteorFalls_1F_2R/header.s b/data/maps/MeteorFalls_1F_2R/header.s deleted file mode 100644 index 0d9d797aa..000000000 --- a/data/maps/MeteorFalls_1F_2R/header.s +++ /dev/null @@ -1,14 +0,0 @@ -MeteorFalls_1F_2R:: @ 8306D8C - .4byte MeteorFalls_1F_2R_MapAttributes - .4byte MeteorFalls_1F_2R_MapEvents - .4byte MeteorFalls_1F_2R_MapScripts - .4byte 0x0 - .2byte BGM_DAN03 - .2byte 127 - .byte 63 - .byte 0 - .byte 0 - .byte 4 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/MeteorFalls_B1F_1R/header.inc b/data/maps/MeteorFalls_B1F_1R/header.inc new file mode 100644 index 000000000..f67ab9ea7 --- /dev/null +++ b/data/maps/MeteorFalls_B1F_1R/header.inc @@ -0,0 +1,14 @@ +MeteorFalls_B1F_1R:: @ 8306DA8 + .4byte MeteorFalls_B1F_1R_MapAttributes + .4byte MeteorFalls_B1F_1R_MapEvents + .4byte MeteorFalls_B1F_1R_MapScripts + .4byte 0x0 + .2byte BGM_DAN03 + .2byte 128 + .byte 63 + .byte 0 + .byte 0 + .byte 4 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/MeteorFalls_B1F_1R/header.s b/data/maps/MeteorFalls_B1F_1R/header.s deleted file mode 100644 index f67ab9ea7..000000000 --- a/data/maps/MeteorFalls_B1F_1R/header.s +++ /dev/null @@ -1,14 +0,0 @@ -MeteorFalls_B1F_1R:: @ 8306DA8 - .4byte MeteorFalls_B1F_1R_MapAttributes - .4byte MeteorFalls_B1F_1R_MapEvents - .4byte MeteorFalls_B1F_1R_MapScripts - .4byte 0x0 - .2byte BGM_DAN03 - .2byte 128 - .byte 63 - .byte 0 - .byte 0 - .byte 4 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/MeteorFalls_B1F_2R/header.inc b/data/maps/MeteorFalls_B1F_2R/header.inc new file mode 100644 index 000000000..779e6d23a --- /dev/null +++ b/data/maps/MeteorFalls_B1F_2R/header.inc @@ -0,0 +1,14 @@ +MeteorFalls_B1F_2R:: @ 8306DC4 + .4byte MeteorFalls_B1F_2R_MapAttributes + .4byte MeteorFalls_B1F_2R_MapEvents + .4byte MeteorFalls_B1F_2R_MapScripts + .4byte 0x0 + .2byte BGM_DAN03 + .2byte 129 + .byte 63 + .byte 0 + .byte 0 + .byte 4 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/MeteorFalls_B1F_2R/header.s b/data/maps/MeteorFalls_B1F_2R/header.s deleted file mode 100644 index 779e6d23a..000000000 --- a/data/maps/MeteorFalls_B1F_2R/header.s +++ /dev/null @@ -1,14 +0,0 @@ -MeteorFalls_B1F_2R:: @ 8306DC4 - .4byte MeteorFalls_B1F_2R_MapAttributes - .4byte MeteorFalls_B1F_2R_MapEvents - .4byte MeteorFalls_B1F_2R_MapScripts - .4byte 0x0 - .2byte BGM_DAN03 - .2byte 129 - .byte 63 - .byte 0 - .byte 0 - .byte 4 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/MossdeepCity/connections.inc b/data/maps/MossdeepCity/connections.inc new file mode 100644 index 000000000..0e654d9cc --- /dev/null +++ b/data/maps/MossdeepCity/connections.inc @@ -0,0 +1,8 @@ +MossdeepCity_MapConnectionsList:: @ 83087D4 + connection up, 0, Route125 + connection down, 0, Route127 + connection left, -40, Route124 + +MossdeepCity_MapConnections:: @ 83087F8 + .4byte 0x3 + .4byte MossdeepCity_MapConnectionsList diff --git a/data/maps/MossdeepCity/connections.s b/data/maps/MossdeepCity/connections.s deleted file mode 100644 index 0e654d9cc..000000000 --- a/data/maps/MossdeepCity/connections.s +++ /dev/null @@ -1,8 +0,0 @@ -MossdeepCity_MapConnectionsList:: @ 83087D4 - connection up, 0, Route125 - connection down, 0, Route127 - connection left, -40, Route124 - -MossdeepCity_MapConnections:: @ 83087F8 - .4byte 0x3 - .4byte MossdeepCity_MapConnectionsList diff --git a/data/maps/MossdeepCity/header.inc b/data/maps/MossdeepCity/header.inc new file mode 100644 index 000000000..26b3e1db0 --- /dev/null +++ b/data/maps/MossdeepCity/header.inc @@ -0,0 +1,14 @@ +MossdeepCity:: @ 83054F0 + .4byte MossdeepCity_MapAttributes + .4byte MossdeepCity_MapEvents + .4byte MossdeepCity_MapScripts + .4byte MossdeepCity_MapConnections + .2byte BGM_GOTOWN + .2byte 7 + .byte 13 + .byte 0 + .byte 2 + .byte 2 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/MossdeepCity/header.s b/data/maps/MossdeepCity/header.s deleted file mode 100644 index 26b3e1db0..000000000 --- a/data/maps/MossdeepCity/header.s +++ /dev/null @@ -1,14 +0,0 @@ -MossdeepCity:: @ 83054F0 - .4byte MossdeepCity_MapAttributes - .4byte MossdeepCity_MapEvents - .4byte MossdeepCity_MapScripts - .4byte MossdeepCity_MapConnections - .2byte BGM_GOTOWN - .2byte 7 - .byte 13 - .byte 0 - .byte 2 - .byte 2 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/MossdeepCity_GameCorner_1F/header.inc b/data/maps/MossdeepCity_GameCorner_1F/header.inc new file mode 100644 index 000000000..d96d383ea --- /dev/null +++ b/data/maps/MossdeepCity_GameCorner_1F/header.inc @@ -0,0 +1,14 @@ +MossdeepCity_GameCorner_1F:: @ 83068F4 + .4byte MossdeepCity_GameCorner_1F_MapAttributes + .4byte MossdeepCity_GameCorner_1F_MapEvents + .4byte MossdeepCity_GameCorner_1F_MapScripts + .4byte 0x0 + .2byte BGM_GOTOWN + .2byte 306 + .byte 13 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/MossdeepCity_GameCorner_1F/header.s b/data/maps/MossdeepCity_GameCorner_1F/header.s deleted file mode 100644 index d96d383ea..000000000 --- a/data/maps/MossdeepCity_GameCorner_1F/header.s +++ /dev/null @@ -1,14 +0,0 @@ -MossdeepCity_GameCorner_1F:: @ 83068F4 - .4byte MossdeepCity_GameCorner_1F_MapAttributes - .4byte MossdeepCity_GameCorner_1F_MapEvents - .4byte MossdeepCity_GameCorner_1F_MapScripts - .4byte 0x0 - .2byte BGM_GOTOWN - .2byte 306 - .byte 13 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/MossdeepCity_GameCorner_B1F/header.inc b/data/maps/MossdeepCity_GameCorner_B1F/header.inc new file mode 100644 index 000000000..7692281f0 --- /dev/null +++ b/data/maps/MossdeepCity_GameCorner_B1F/header.inc @@ -0,0 +1,14 @@ +MossdeepCity_GameCorner_B1F:: @ 8306910 + .4byte MossdeepCity_GameCorner_B1F_MapAttributes + .4byte MossdeepCity_GameCorner_B1F_MapEvents + .4byte MossdeepCity_GameCorner_B1F_MapScripts + .4byte 0x0 + .2byte BGM_GOTOWN + .2byte 307 + .byte 13 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/MossdeepCity_GameCorner_B1F/header.s b/data/maps/MossdeepCity_GameCorner_B1F/header.s deleted file mode 100644 index 7692281f0..000000000 --- a/data/maps/MossdeepCity_GameCorner_B1F/header.s +++ /dev/null @@ -1,14 +0,0 @@ -MossdeepCity_GameCorner_B1F:: @ 8306910 - .4byte MossdeepCity_GameCorner_B1F_MapAttributes - .4byte MossdeepCity_GameCorner_B1F_MapEvents - .4byte MossdeepCity_GameCorner_B1F_MapScripts - .4byte 0x0 - .2byte BGM_GOTOWN - .2byte 307 - .byte 13 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/MossdeepCity_Gym/header.inc b/data/maps/MossdeepCity_Gym/header.inc new file mode 100644 index 000000000..b72bdf62e --- /dev/null +++ b/data/maps/MossdeepCity_Gym/header.inc @@ -0,0 +1,14 @@ +MossdeepCity_Gym:: @ 83067C0 + .4byte MossdeepCity_Gym_MapAttributes + .4byte MossdeepCity_Gym_MapEvents + .4byte MossdeepCity_Gym_MapScripts + .4byte 0x0 + .2byte BGM_GIM + .2byte 109 + .byte 13 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 1 diff --git a/data/maps/MossdeepCity_Gym/header.s b/data/maps/MossdeepCity_Gym/header.s deleted file mode 100644 index b72bdf62e..000000000 --- a/data/maps/MossdeepCity_Gym/header.s +++ /dev/null @@ -1,14 +0,0 @@ -MossdeepCity_Gym:: @ 83067C0 - .4byte MossdeepCity_Gym_MapAttributes - .4byte MossdeepCity_Gym_MapEvents - .4byte MossdeepCity_Gym_MapScripts - .4byte 0x0 - .2byte BGM_GIM - .2byte 109 - .byte 13 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 1 diff --git a/data/maps/MossdeepCity_House1/header.inc b/data/maps/MossdeepCity_House1/header.inc new file mode 100644 index 000000000..70f681e7a --- /dev/null +++ b/data/maps/MossdeepCity_House1/header.inc @@ -0,0 +1,14 @@ +MossdeepCity_House1:: @ 83067DC + .4byte House2_MapAttributes + .4byte MossdeepCity_House1_MapEvents + .4byte MossdeepCity_House1_MapScripts + .4byte 0x0 + .2byte BGM_GOTOWN + .2byte 60 + .byte 13 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/MossdeepCity_House1/header.s b/data/maps/MossdeepCity_House1/header.s deleted file mode 100644 index 70f681e7a..000000000 --- a/data/maps/MossdeepCity_House1/header.s +++ /dev/null @@ -1,14 +0,0 @@ -MossdeepCity_House1:: @ 83067DC - .4byte House2_MapAttributes - .4byte MossdeepCity_House1_MapEvents - .4byte MossdeepCity_House1_MapScripts - .4byte 0x0 - .2byte BGM_GOTOWN - .2byte 60 - .byte 13 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/MossdeepCity_House2/header.inc b/data/maps/MossdeepCity_House2/header.inc new file mode 100644 index 000000000..62bd6bdec --- /dev/null +++ b/data/maps/MossdeepCity_House2/header.inc @@ -0,0 +1,14 @@ +MossdeepCity_House2:: @ 83067F8 + .4byte House1_MapAttributes + .4byte MossdeepCity_House2_MapEvents + .4byte MossdeepCity_House2_MapScripts + .4byte 0x0 + .2byte BGM_GOTOWN + .2byte 59 + .byte 13 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/MossdeepCity_House2/header.s b/data/maps/MossdeepCity_House2/header.s deleted file mode 100644 index 62bd6bdec..000000000 --- a/data/maps/MossdeepCity_House2/header.s +++ /dev/null @@ -1,14 +0,0 @@ -MossdeepCity_House2:: @ 83067F8 - .4byte House1_MapAttributes - .4byte MossdeepCity_House2_MapEvents - .4byte MossdeepCity_House2_MapScripts - .4byte 0x0 - .2byte BGM_GOTOWN - .2byte 59 - .byte 13 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/MossdeepCity_House3/header.inc b/data/maps/MossdeepCity_House3/header.inc new file mode 100644 index 000000000..54c6641b6 --- /dev/null +++ b/data/maps/MossdeepCity_House3/header.inc @@ -0,0 +1,14 @@ +MossdeepCity_House3:: @ 8306868 + .4byte House2_MapAttributes + .4byte MossdeepCity_House3_MapEvents + .4byte MossdeepCity_House3_MapScripts + .4byte 0x0 + .2byte BGM_GOTOWN + .2byte 60 + .byte 13 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/MossdeepCity_House3/header.s b/data/maps/MossdeepCity_House3/header.s deleted file mode 100644 index 54c6641b6..000000000 --- a/data/maps/MossdeepCity_House3/header.s +++ /dev/null @@ -1,14 +0,0 @@ -MossdeepCity_House3:: @ 8306868 - .4byte House2_MapAttributes - .4byte MossdeepCity_House3_MapEvents - .4byte MossdeepCity_House3_MapScripts - .4byte 0x0 - .2byte BGM_GOTOWN - .2byte 60 - .byte 13 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/MossdeepCity_House4/header.inc b/data/maps/MossdeepCity_House4/header.inc new file mode 100644 index 000000000..1c0e433bb --- /dev/null +++ b/data/maps/MossdeepCity_House4/header.inc @@ -0,0 +1,14 @@ +MossdeepCity_House4:: @ 83068A0 + .4byte MossdeepCity_House4_MapAttributes + .4byte MossdeepCity_House4_MapEvents + .4byte MossdeepCity_House4_MapScripts + .4byte 0x0 + .2byte BGM_GOTOWN + .2byte 80 + .byte 13 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/MossdeepCity_House4/header.s b/data/maps/MossdeepCity_House4/header.s deleted file mode 100644 index 1c0e433bb..000000000 --- a/data/maps/MossdeepCity_House4/header.s +++ /dev/null @@ -1,14 +0,0 @@ -MossdeepCity_House4:: @ 83068A0 - .4byte MossdeepCity_House4_MapAttributes - .4byte MossdeepCity_House4_MapEvents - .4byte MossdeepCity_House4_MapScripts - .4byte 0x0 - .2byte BGM_GOTOWN - .2byte 80 - .byte 13 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/MossdeepCity_Mart/header.inc b/data/maps/MossdeepCity_Mart/header.inc new file mode 100644 index 000000000..c18fca0e3 --- /dev/null +++ b/data/maps/MossdeepCity_Mart/header.inc @@ -0,0 +1,14 @@ +MossdeepCity_Mart:: @ 830684C + .4byte PokeMart_MapAttributes + .4byte MossdeepCity_Mart_MapEvents + .4byte MossdeepCity_Mart_MapScripts + .4byte 0x0 + .2byte BGM_FRIENDLY + .2byte 63 + .byte 13 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/MossdeepCity_Mart/header.s b/data/maps/MossdeepCity_Mart/header.s deleted file mode 100644 index c18fca0e3..000000000 --- a/data/maps/MossdeepCity_Mart/header.s +++ /dev/null @@ -1,14 +0,0 @@ -MossdeepCity_Mart:: @ 830684C - .4byte PokeMart_MapAttributes - .4byte MossdeepCity_Mart_MapEvents - .4byte MossdeepCity_Mart_MapScripts - .4byte 0x0 - .2byte BGM_FRIENDLY - .2byte 63 - .byte 13 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/MossdeepCity_PokemonCenter_1F/header.inc b/data/maps/MossdeepCity_PokemonCenter_1F/header.inc new file mode 100644 index 000000000..036604eff --- /dev/null +++ b/data/maps/MossdeepCity_PokemonCenter_1F/header.inc @@ -0,0 +1,14 @@ +MossdeepCity_PokemonCenter_1F:: @ 8306814 + .4byte PokemonCenter_1F_MapAttributes + .4byte MossdeepCity_PokemonCenter_1F_MapEvents + .4byte MossdeepCity_PokemonCenter_1F_MapScripts + .4byte 0x0 + .2byte BGM_POKECEN + .2byte 61 + .byte 13 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/MossdeepCity_PokemonCenter_1F/header.s b/data/maps/MossdeepCity_PokemonCenter_1F/header.s deleted file mode 100644 index 036604eff..000000000 --- a/data/maps/MossdeepCity_PokemonCenter_1F/header.s +++ /dev/null @@ -1,14 +0,0 @@ -MossdeepCity_PokemonCenter_1F:: @ 8306814 - .4byte PokemonCenter_1F_MapAttributes - .4byte MossdeepCity_PokemonCenter_1F_MapEvents - .4byte MossdeepCity_PokemonCenter_1F_MapScripts - .4byte 0x0 - .2byte BGM_POKECEN - .2byte 61 - .byte 13 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/MossdeepCity_PokemonCenter_2F/header.inc b/data/maps/MossdeepCity_PokemonCenter_2F/header.inc new file mode 100644 index 000000000..cb42c5c80 --- /dev/null +++ b/data/maps/MossdeepCity_PokemonCenter_2F/header.inc @@ -0,0 +1,14 @@ +MossdeepCity_PokemonCenter_2F:: @ 8306830 + .4byte PokemonCenter_2F_MapAttributes + .4byte MossdeepCity_PokemonCenter_2F_MapEvents + .4byte MossdeepCity_PokemonCenter_2F_MapScripts + .4byte 0x0 + .2byte BGM_POKECEN + .2byte 62 + .byte 13 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/MossdeepCity_PokemonCenter_2F/header.s b/data/maps/MossdeepCity_PokemonCenter_2F/header.s deleted file mode 100644 index cb42c5c80..000000000 --- a/data/maps/MossdeepCity_PokemonCenter_2F/header.s +++ /dev/null @@ -1,14 +0,0 @@ -MossdeepCity_PokemonCenter_2F:: @ 8306830 - .4byte PokemonCenter_2F_MapAttributes - .4byte MossdeepCity_PokemonCenter_2F_MapEvents - .4byte MossdeepCity_PokemonCenter_2F_MapScripts - .4byte 0x0 - .2byte BGM_POKECEN - .2byte 62 - .byte 13 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/header.inc b/data/maps/MossdeepCity_SpaceCenter_1F/header.inc new file mode 100644 index 000000000..65ba897fb --- /dev/null +++ b/data/maps/MossdeepCity_SpaceCenter_1F/header.inc @@ -0,0 +1,14 @@ +MossdeepCity_SpaceCenter_1F:: @ 83068BC + .4byte MossdeepCity_SpaceCenter_1F_MapAttributes + .4byte MossdeepCity_SpaceCenter_1F_MapEvents + .4byte MossdeepCity_SpaceCenter_1F_MapScripts + .4byte 0x0 + .2byte BGM_GOTOWN + .2byte 276 + .byte 13 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/header.s b/data/maps/MossdeepCity_SpaceCenter_1F/header.s deleted file mode 100644 index 65ba897fb..000000000 --- a/data/maps/MossdeepCity_SpaceCenter_1F/header.s +++ /dev/null @@ -1,14 +0,0 @@ -MossdeepCity_SpaceCenter_1F:: @ 83068BC - .4byte MossdeepCity_SpaceCenter_1F_MapAttributes - .4byte MossdeepCity_SpaceCenter_1F_MapEvents - .4byte MossdeepCity_SpaceCenter_1F_MapScripts - .4byte 0x0 - .2byte BGM_GOTOWN - .2byte 276 - .byte 13 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/header.inc b/data/maps/MossdeepCity_SpaceCenter_2F/header.inc new file mode 100644 index 000000000..2195ee8e2 --- /dev/null +++ b/data/maps/MossdeepCity_SpaceCenter_2F/header.inc @@ -0,0 +1,14 @@ +MossdeepCity_SpaceCenter_2F:: @ 83068D8 + .4byte MossdeepCity_SpaceCenter_2F_MapAttributes + .4byte MossdeepCity_SpaceCenter_2F_MapEvents + .4byte MossdeepCity_SpaceCenter_2F_MapScripts + .4byte 0x0 + .2byte BGM_GOTOWN + .2byte 277 + .byte 13 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/header.s b/data/maps/MossdeepCity_SpaceCenter_2F/header.s deleted file mode 100644 index 2195ee8e2..000000000 --- a/data/maps/MossdeepCity_SpaceCenter_2F/header.s +++ /dev/null @@ -1,14 +0,0 @@ -MossdeepCity_SpaceCenter_2F:: @ 83068D8 - .4byte MossdeepCity_SpaceCenter_2F_MapAttributes - .4byte MossdeepCity_SpaceCenter_2F_MapEvents - .4byte MossdeepCity_SpaceCenter_2F_MapScripts - .4byte 0x0 - .2byte BGM_GOTOWN - .2byte 277 - .byte 13 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/MossdeepCity_StevensHouse/header.inc b/data/maps/MossdeepCity_StevensHouse/header.inc new file mode 100644 index 000000000..761ea9b73 --- /dev/null +++ b/data/maps/MossdeepCity_StevensHouse/header.inc @@ -0,0 +1,14 @@ +MossdeepCity_StevensHouse:: @ 8306884 + .4byte MossdeepCity_StevensHouse_MapAttributes + .4byte MossdeepCity_StevensHouse_MapEvents + .4byte MossdeepCity_StevensHouse_MapScripts + .4byte 0x0 + .2byte BGM_GOTOWN + .2byte 328 + .byte 13 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/MossdeepCity_StevensHouse/header.s b/data/maps/MossdeepCity_StevensHouse/header.s deleted file mode 100644 index 761ea9b73..000000000 --- a/data/maps/MossdeepCity_StevensHouse/header.s +++ /dev/null @@ -1,14 +0,0 @@ -MossdeepCity_StevensHouse:: @ 8306884 - .4byte MossdeepCity_StevensHouse_MapAttributes - .4byte MossdeepCity_StevensHouse_MapEvents - .4byte MossdeepCity_StevensHouse_MapScripts - .4byte 0x0 - .2byte BGM_GOTOWN - .2byte 328 - .byte 13 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/MtChimney/header.inc b/data/maps/MtChimney/header.inc new file mode 100644 index 000000000..cdc29ce7f --- /dev/null +++ b/data/maps/MtChimney/header.inc @@ -0,0 +1,14 @@ +MtChimney:: @ 8306EC0 + .4byte MtChimney_MapAttributes + .4byte MtChimney_MapEvents + .4byte MtChimney_MapScripts + .4byte 0x0 + .2byte BGM_TOZAN + .2byte 137 + .byte 56 + .byte 0 + .byte 7 + .byte 3 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/MtChimney/header.s b/data/maps/MtChimney/header.s deleted file mode 100644 index cdc29ce7f..000000000 --- a/data/maps/MtChimney/header.s +++ /dev/null @@ -1,14 +0,0 @@ -MtChimney:: @ 8306EC0 - .4byte MtChimney_MapAttributes - .4byte MtChimney_MapEvents - .4byte MtChimney_MapScripts - .4byte 0x0 - .2byte BGM_TOZAN - .2byte 137 - .byte 56 - .byte 0 - .byte 7 - .byte 3 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/MtChimney_CableCarStation/header.inc b/data/maps/MtChimney_CableCarStation/header.inc new file mode 100644 index 000000000..f5207578b --- /dev/null +++ b/data/maps/MtChimney_CableCarStation/header.inc @@ -0,0 +1,14 @@ +MtChimney_CableCarStation:: @ 8306CAC + .4byte MtChimney_CableCarStation_MapAttributes + .4byte MtChimney_CableCarStation_MapEvents + .4byte MtChimney_CableCarStation_MapScripts + .4byte 0x0 + .2byte BGM_DOORO_X1 + .2byte 119 + .byte 56 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/MtChimney_CableCarStation/header.s b/data/maps/MtChimney_CableCarStation/header.s deleted file mode 100644 index f5207578b..000000000 --- a/data/maps/MtChimney_CableCarStation/header.s +++ /dev/null @@ -1,14 +0,0 @@ -MtChimney_CableCarStation:: @ 8306CAC - .4byte MtChimney_CableCarStation_MapAttributes - .4byte MtChimney_CableCarStation_MapEvents - .4byte MtChimney_CableCarStation_MapScripts - .4byte 0x0 - .2byte BGM_DOORO_X1 - .2byte 119 - .byte 56 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/MtPyre_1F/header.inc b/data/maps/MtPyre_1F/header.inc new file mode 100644 index 000000000..cfdff9591 --- /dev/null +++ b/data/maps/MtPyre_1F/header.inc @@ -0,0 +1,14 @@ +MtPyre_1F:: @ 8306F14 + .4byte MtPyre_1F_MapAttributes + .4byte MtPyre_1F_MapEvents + .4byte MtPyre_1F_MapScripts + .4byte 0x0 + .2byte BGM_M_DUNGON + .2byte 138 + .byte 65 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/MtPyre_1F/header.s b/data/maps/MtPyre_1F/header.s deleted file mode 100644 index cfdff9591..000000000 --- a/data/maps/MtPyre_1F/header.s +++ /dev/null @@ -1,14 +0,0 @@ -MtPyre_1F:: @ 8306F14 - .4byte MtPyre_1F_MapAttributes - .4byte MtPyre_1F_MapEvents - .4byte MtPyre_1F_MapScripts - .4byte 0x0 - .2byte BGM_M_DUNGON - .2byte 138 - .byte 65 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/MtPyre_2F/header.inc b/data/maps/MtPyre_2F/header.inc new file mode 100644 index 000000000..914fdabd4 --- /dev/null +++ b/data/maps/MtPyre_2F/header.inc @@ -0,0 +1,14 @@ +MtPyre_2F:: @ 8306F30 + .4byte MtPyre_2F_MapAttributes + .4byte MtPyre_2F_MapEvents + .4byte MtPyre_2F_MapScripts + .4byte 0x0 + .2byte BGM_M_DUNGON + .2byte 139 + .byte 65 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/MtPyre_2F/header.s b/data/maps/MtPyre_2F/header.s deleted file mode 100644 index 914fdabd4..000000000 --- a/data/maps/MtPyre_2F/header.s +++ /dev/null @@ -1,14 +0,0 @@ -MtPyre_2F:: @ 8306F30 - .4byte MtPyre_2F_MapAttributes - .4byte MtPyre_2F_MapEvents - .4byte MtPyre_2F_MapScripts - .4byte 0x0 - .2byte BGM_M_DUNGON - .2byte 139 - .byte 65 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/MtPyre_3F/header.inc b/data/maps/MtPyre_3F/header.inc new file mode 100644 index 000000000..b4a59adbd --- /dev/null +++ b/data/maps/MtPyre_3F/header.inc @@ -0,0 +1,14 @@ +MtPyre_3F:: @ 8306F4C + .4byte MtPyre_3F_MapAttributes + .4byte MtPyre_3F_MapEvents + .4byte MtPyre_3F_MapScripts + .4byte 0x0 + .2byte BGM_M_DUNGON + .2byte 140 + .byte 65 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/MtPyre_3F/header.s b/data/maps/MtPyre_3F/header.s deleted file mode 100644 index b4a59adbd..000000000 --- a/data/maps/MtPyre_3F/header.s +++ /dev/null @@ -1,14 +0,0 @@ -MtPyre_3F:: @ 8306F4C - .4byte MtPyre_3F_MapAttributes - .4byte MtPyre_3F_MapEvents - .4byte MtPyre_3F_MapScripts - .4byte 0x0 - .2byte BGM_M_DUNGON - .2byte 140 - .byte 65 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/MtPyre_4F/header.inc b/data/maps/MtPyre_4F/header.inc new file mode 100644 index 000000000..8dcbd4e64 --- /dev/null +++ b/data/maps/MtPyre_4F/header.inc @@ -0,0 +1,14 @@ +MtPyre_4F:: @ 8306F68 + .4byte MtPyre_4F_MapAttributes + .4byte MtPyre_4F_MapEvents + .4byte MtPyre_4F_MapScripts + .4byte 0x0 + .2byte BGM_M_DUNGON + .2byte 141 + .byte 65 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/MtPyre_4F/header.s b/data/maps/MtPyre_4F/header.s deleted file mode 100644 index 8dcbd4e64..000000000 --- a/data/maps/MtPyre_4F/header.s +++ /dev/null @@ -1,14 +0,0 @@ -MtPyre_4F:: @ 8306F68 - .4byte MtPyre_4F_MapAttributes - .4byte MtPyre_4F_MapEvents - .4byte MtPyre_4F_MapScripts - .4byte 0x0 - .2byte BGM_M_DUNGON - .2byte 141 - .byte 65 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/MtPyre_5F/header.inc b/data/maps/MtPyre_5F/header.inc new file mode 100644 index 000000000..0eb7f7bba --- /dev/null +++ b/data/maps/MtPyre_5F/header.inc @@ -0,0 +1,14 @@ +MtPyre_5F:: @ 8306F84 + .4byte MtPyre_5F_MapAttributes + .4byte MtPyre_5F_MapEvents + .4byte MtPyre_5F_MapScripts + .4byte 0x0 + .2byte BGM_M_DUNGON + .2byte 142 + .byte 65 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/MtPyre_5F/header.s b/data/maps/MtPyre_5F/header.s deleted file mode 100644 index 0eb7f7bba..000000000 --- a/data/maps/MtPyre_5F/header.s +++ /dev/null @@ -1,14 +0,0 @@ -MtPyre_5F:: @ 8306F84 - .4byte MtPyre_5F_MapAttributes - .4byte MtPyre_5F_MapEvents - .4byte MtPyre_5F_MapScripts - .4byte 0x0 - .2byte BGM_M_DUNGON - .2byte 142 - .byte 65 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/MtPyre_6F/header.inc b/data/maps/MtPyre_6F/header.inc new file mode 100644 index 000000000..3cab722cd --- /dev/null +++ b/data/maps/MtPyre_6F/header.inc @@ -0,0 +1,14 @@ +MtPyre_6F:: @ 8306FA0 + .4byte MtPyre_6F_MapAttributes + .4byte MtPyre_6F_MapEvents + .4byte MtPyre_6F_MapScripts + .4byte 0x0 + .2byte BGM_M_DUNGON + .2byte 143 + .byte 65 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/MtPyre_6F/header.s b/data/maps/MtPyre_6F/header.s deleted file mode 100644 index 3cab722cd..000000000 --- a/data/maps/MtPyre_6F/header.s +++ /dev/null @@ -1,14 +0,0 @@ -MtPyre_6F:: @ 8306FA0 - .4byte MtPyre_6F_MapAttributes - .4byte MtPyre_6F_MapEvents - .4byte MtPyre_6F_MapScripts - .4byte 0x0 - .2byte BGM_M_DUNGON - .2byte 143 - .byte 65 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/MtPyre_Exterior/header.inc b/data/maps/MtPyre_Exterior/header.inc new file mode 100644 index 000000000..543e090f0 --- /dev/null +++ b/data/maps/MtPyre_Exterior/header.inc @@ -0,0 +1,14 @@ +MtPyre_Exterior:: @ 8306FBC + .4byte MtPyre_Exterior_MapAttributes + .4byte MtPyre_Exterior_MapEvents + .4byte MtPyre_Exterior_MapScripts + .4byte 0x0 + .2byte BGM_MACHUPI + .2byte 303 + .byte 65 + .byte 0 + .byte 0 + .byte 3 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/MtPyre_Exterior/header.s b/data/maps/MtPyre_Exterior/header.s deleted file mode 100644 index 543e090f0..000000000 --- a/data/maps/MtPyre_Exterior/header.s +++ /dev/null @@ -1,14 +0,0 @@ -MtPyre_Exterior:: @ 8306FBC - .4byte MtPyre_Exterior_MapAttributes - .4byte MtPyre_Exterior_MapEvents - .4byte MtPyre_Exterior_MapScripts - .4byte 0x0 - .2byte BGM_MACHUPI - .2byte 303 - .byte 65 - .byte 0 - .byte 0 - .byte 3 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/MtPyre_Summit/header.inc b/data/maps/MtPyre_Summit/header.inc new file mode 100644 index 000000000..e07d849a6 --- /dev/null +++ b/data/maps/MtPyre_Summit/header.inc @@ -0,0 +1,14 @@ +MtPyre_Summit:: @ 8306FD8 + .4byte MtPyre_Summit_MapAttributes + .4byte MtPyre_Summit_MapEvents + .4byte MtPyre_Summit_MapScripts + .4byte 0x0 + .2byte BGM_MACHUPI + .2byte 304 + .byte 65 + .byte 0 + .byte 6 + .byte 3 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/MtPyre_Summit/header.s b/data/maps/MtPyre_Summit/header.s deleted file mode 100644 index e07d849a6..000000000 --- a/data/maps/MtPyre_Summit/header.s +++ /dev/null @@ -1,14 +0,0 @@ -MtPyre_Summit:: @ 8306FD8 - .4byte MtPyre_Summit_MapAttributes - .4byte MtPyre_Summit_MapEvents - .4byte MtPyre_Summit_MapScripts - .4byte 0x0 - .2byte BGM_MACHUPI - .2byte 304 - .byte 65 - .byte 0 - .byte 6 - .byte 3 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/NewMauville_Entrance/header.inc b/data/maps/NewMauville_Entrance/header.inc new file mode 100644 index 000000000..28ac26ccf --- /dev/null +++ b/data/maps/NewMauville_Entrance/header.inc @@ -0,0 +1,14 @@ +NewMauville_Entrance:: @ 8307320 + .4byte NewMauville_Entrance_MapAttributes + .4byte NewMauville_Entrance_MapEvents + .4byte NewMauville_Entrance_MapScripts + .4byte 0x0 + .2byte BGM_M_DUNGON + .2byte 185 + .byte 62 + .byte 0 + .byte 0 + .byte 4 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/NewMauville_Entrance/header.s b/data/maps/NewMauville_Entrance/header.s deleted file mode 100644 index 28ac26ccf..000000000 --- a/data/maps/NewMauville_Entrance/header.s +++ /dev/null @@ -1,14 +0,0 @@ -NewMauville_Entrance:: @ 8307320 - .4byte NewMauville_Entrance_MapAttributes - .4byte NewMauville_Entrance_MapEvents - .4byte NewMauville_Entrance_MapScripts - .4byte 0x0 - .2byte BGM_M_DUNGON - .2byte 185 - .byte 62 - .byte 0 - .byte 0 - .byte 4 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/NewMauville_Inside/header.inc b/data/maps/NewMauville_Inside/header.inc new file mode 100644 index 000000000..9771d7ec7 --- /dev/null +++ b/data/maps/NewMauville_Inside/header.inc @@ -0,0 +1,14 @@ +NewMauville_Inside:: @ 830733C + .4byte NewMauville_Inside_MapAttributes + .4byte NewMauville_Inside_MapEvents + .4byte NewMauville_Inside_MapScripts + .4byte 0x0 + .2byte BGM_M_DUNGON + .2byte 186 + .byte 62 + .byte 0 + .byte 0 + .byte 4 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/NewMauville_Inside/header.s b/data/maps/NewMauville_Inside/header.s deleted file mode 100644 index 9771d7ec7..000000000 --- a/data/maps/NewMauville_Inside/header.s +++ /dev/null @@ -1,14 +0,0 @@ -NewMauville_Inside:: @ 830733C - .4byte NewMauville_Inside_MapAttributes - .4byte NewMauville_Inside_MapEvents - .4byte NewMauville_Inside_MapScripts - .4byte 0x0 - .2byte BGM_M_DUNGON - .2byte 186 - .byte 62 - .byte 0 - .byte 0 - .byte 4 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/OldaleTown/connections.inc b/data/maps/OldaleTown/connections.inc new file mode 100644 index 000000000..fc5495101 --- /dev/null +++ b/data/maps/OldaleTown/connections.inc @@ -0,0 +1,8 @@ +OldaleTown_MapConnectionsList:: @ 8308624 + connection up, 0, Route103 + connection down, 0, Route101 + connection left, 0, Route102 + +OldaleTown_MapConnections:: @ 8308648 + .4byte 0x3 + .4byte OldaleTown_MapConnectionsList diff --git a/data/maps/OldaleTown/connections.s b/data/maps/OldaleTown/connections.s deleted file mode 100644 index fc5495101..000000000 --- a/data/maps/OldaleTown/connections.s +++ /dev/null @@ -1,8 +0,0 @@ -OldaleTown_MapConnectionsList:: @ 8308624 - connection up, 0, Route103 - connection down, 0, Route101 - connection left, 0, Route102 - -OldaleTown_MapConnections:: @ 8308648 - .4byte 0x3 - .4byte OldaleTown_MapConnectionsList diff --git a/data/maps/OldaleTown/header.inc b/data/maps/OldaleTown/header.inc new file mode 100644 index 000000000..22965da3d --- /dev/null +++ b/data/maps/OldaleTown/header.inc @@ -0,0 +1,14 @@ +OldaleTown:: @ 8305560 + .4byte OldaleTown_MapAttributes + .4byte OldaleTown_MapEvents + .4byte OldaleTown_MapScripts + .4byte OldaleTown_MapConnections + .2byte BGM_MACHI_S4 + .2byte 11 + .byte 1 + .byte 0 + .byte 2 + .byte 1 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/OldaleTown/header.s b/data/maps/OldaleTown/header.s deleted file mode 100644 index 22965da3d..000000000 --- a/data/maps/OldaleTown/header.s +++ /dev/null @@ -1,14 +0,0 @@ -OldaleTown:: @ 8305560 - .4byte OldaleTown_MapAttributes - .4byte OldaleTown_MapEvents - .4byte OldaleTown_MapScripts - .4byte OldaleTown_MapConnections - .2byte BGM_MACHI_S4 - .2byte 11 - .byte 1 - .byte 0 - .byte 2 - .byte 1 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/OldaleTown_House1/header.inc b/data/maps/OldaleTown_House1/header.inc new file mode 100644 index 000000000..550ff5a75 --- /dev/null +++ b/data/maps/OldaleTown_House1/header.inc @@ -0,0 +1,14 @@ +OldaleTown_House1:: @ 8305ABC + .4byte House1_MapAttributes + .4byte OldaleTown_House1_MapEvents + .4byte OldaleTown_House1_MapScripts + .4byte 0x0 + .2byte BGM_MACHI_S4 + .2byte 59 + .byte 1 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/OldaleTown_House1/header.s b/data/maps/OldaleTown_House1/header.s deleted file mode 100644 index 550ff5a75..000000000 --- a/data/maps/OldaleTown_House1/header.s +++ /dev/null @@ -1,14 +0,0 @@ -OldaleTown_House1:: @ 8305ABC - .4byte House1_MapAttributes - .4byte OldaleTown_House1_MapEvents - .4byte OldaleTown_House1_MapScripts - .4byte 0x0 - .2byte BGM_MACHI_S4 - .2byte 59 - .byte 1 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/OldaleTown_House2/header.inc b/data/maps/OldaleTown_House2/header.inc new file mode 100644 index 000000000..eb1660cf9 --- /dev/null +++ b/data/maps/OldaleTown_House2/header.inc @@ -0,0 +1,14 @@ +OldaleTown_House2:: @ 8305AD8 + .4byte House2_MapAttributes + .4byte OldaleTown_House2_MapEvents + .4byte OldaleTown_House2_MapScripts + .4byte 0x0 + .2byte BGM_MACHI_S4 + .2byte 60 + .byte 1 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/OldaleTown_House2/header.s b/data/maps/OldaleTown_House2/header.s deleted file mode 100644 index eb1660cf9..000000000 --- a/data/maps/OldaleTown_House2/header.s +++ /dev/null @@ -1,14 +0,0 @@ -OldaleTown_House2:: @ 8305AD8 - .4byte House2_MapAttributes - .4byte OldaleTown_House2_MapEvents - .4byte OldaleTown_House2_MapScripts - .4byte 0x0 - .2byte BGM_MACHI_S4 - .2byte 60 - .byte 1 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/OldaleTown_Mart/header.inc b/data/maps/OldaleTown_Mart/header.inc new file mode 100644 index 000000000..a0e8a8851 --- /dev/null +++ b/data/maps/OldaleTown_Mart/header.inc @@ -0,0 +1,14 @@ +OldaleTown_Mart:: @ 8305B2C + .4byte PokeMart_MapAttributes + .4byte OldaleTown_Mart_MapEvents + .4byte OldaleTown_Mart_MapScripts + .4byte 0x0 + .2byte BGM_FRIENDLY + .2byte 63 + .byte 1 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/OldaleTown_Mart/header.s b/data/maps/OldaleTown_Mart/header.s deleted file mode 100644 index a0e8a8851..000000000 --- a/data/maps/OldaleTown_Mart/header.s +++ /dev/null @@ -1,14 +0,0 @@ -OldaleTown_Mart:: @ 8305B2C - .4byte PokeMart_MapAttributes - .4byte OldaleTown_Mart_MapEvents - .4byte OldaleTown_Mart_MapScripts - .4byte 0x0 - .2byte BGM_FRIENDLY - .2byte 63 - .byte 1 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/OldaleTown_PokemonCenter_1F/header.inc b/data/maps/OldaleTown_PokemonCenter_1F/header.inc new file mode 100644 index 000000000..82ced7328 --- /dev/null +++ b/data/maps/OldaleTown_PokemonCenter_1F/header.inc @@ -0,0 +1,14 @@ +OldaleTown_PokemonCenter_1F:: @ 8305AF4 + .4byte PokemonCenter_1F_MapAttributes + .4byte OldaleTown_PokemonCenter_1F_MapEvents + .4byte OldaleTown_PokemonCenter_1F_MapScripts + .4byte 0x0 + .2byte BGM_POKECEN + .2byte 61 + .byte 1 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/OldaleTown_PokemonCenter_1F/header.s b/data/maps/OldaleTown_PokemonCenter_1F/header.s deleted file mode 100644 index 82ced7328..000000000 --- a/data/maps/OldaleTown_PokemonCenter_1F/header.s +++ /dev/null @@ -1,14 +0,0 @@ -OldaleTown_PokemonCenter_1F:: @ 8305AF4 - .4byte PokemonCenter_1F_MapAttributes - .4byte OldaleTown_PokemonCenter_1F_MapEvents - .4byte OldaleTown_PokemonCenter_1F_MapScripts - .4byte 0x0 - .2byte BGM_POKECEN - .2byte 61 - .byte 1 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/OldaleTown_PokemonCenter_2F/header.inc b/data/maps/OldaleTown_PokemonCenter_2F/header.inc new file mode 100644 index 000000000..79e6ca99d --- /dev/null +++ b/data/maps/OldaleTown_PokemonCenter_2F/header.inc @@ -0,0 +1,14 @@ +OldaleTown_PokemonCenter_2F:: @ 8305B10 + .4byte PokemonCenter_2F_MapAttributes + .4byte OldaleTown_PokemonCenter_2F_MapEvents + .4byte OldaleTown_PokemonCenter_2F_MapScripts + .4byte 0x0 + .2byte BGM_POKECEN + .2byte 62 + .byte 1 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/OldaleTown_PokemonCenter_2F/header.s b/data/maps/OldaleTown_PokemonCenter_2F/header.s deleted file mode 100644 index 79e6ca99d..000000000 --- a/data/maps/OldaleTown_PokemonCenter_2F/header.s +++ /dev/null @@ -1,14 +0,0 @@ -OldaleTown_PokemonCenter_2F:: @ 8305B10 - .4byte PokemonCenter_2F_MapAttributes - .4byte OldaleTown_PokemonCenter_2F_MapEvents - .4byte OldaleTown_PokemonCenter_2F_MapScripts - .4byte 0x0 - .2byte BGM_POKECEN - .2byte 62 - .byte 1 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/PacifidlogTown/connections.inc b/data/maps/PacifidlogTown/connections.inc new file mode 100644 index 000000000..3c0ae1a62 --- /dev/null +++ b/data/maps/PacifidlogTown/connections.inc @@ -0,0 +1,7 @@ +PacifidlogTown_MapConnectionsList:: @ 83086C4 + connection left, 0, Route132 + connection right, 0, Route131 + +PacifidlogTown_MapConnections:: @ 83086DC + .4byte 0x2 + .4byte PacifidlogTown_MapConnectionsList diff --git a/data/maps/PacifidlogTown/connections.s b/data/maps/PacifidlogTown/connections.s deleted file mode 100644 index 3c0ae1a62..000000000 --- a/data/maps/PacifidlogTown/connections.s +++ /dev/null @@ -1,7 +0,0 @@ -PacifidlogTown_MapConnectionsList:: @ 83086C4 - connection left, 0, Route132 - connection right, 0, Route131 - -PacifidlogTown_MapConnections:: @ 83086DC - .4byte 0x2 - .4byte PacifidlogTown_MapConnectionsList diff --git a/data/maps/PacifidlogTown/header.inc b/data/maps/PacifidlogTown/header.inc new file mode 100644 index 000000000..057e83264 --- /dev/null +++ b/data/maps/PacifidlogTown/header.inc @@ -0,0 +1,14 @@ +PacifidlogTown:: @ 83055EC + .4byte PacifidlogTown_MapAttributes + .4byte PacifidlogTown_MapEvents + .4byte PacifidlogTown_MapScripts + .4byte PacifidlogTown_MapConnections + .2byte BGM_MINAMO + .2byte 16 + .byte 6 + .byte 0 + .byte 2 + .byte 1 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/PacifidlogTown/header.s b/data/maps/PacifidlogTown/header.s deleted file mode 100644 index 057e83264..000000000 --- a/data/maps/PacifidlogTown/header.s +++ /dev/null @@ -1,14 +0,0 @@ -PacifidlogTown:: @ 83055EC - .4byte PacifidlogTown_MapAttributes - .4byte PacifidlogTown_MapEvents - .4byte PacifidlogTown_MapScripts - .4byte PacifidlogTown_MapConnections - .2byte BGM_MINAMO - .2byte 16 - .byte 6 - .byte 0 - .byte 2 - .byte 1 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/PacifidlogTown_House1/header.inc b/data/maps/PacifidlogTown_House1/header.inc new file mode 100644 index 000000000..7842574f9 --- /dev/null +++ b/data/maps/PacifidlogTown_House1/header.inc @@ -0,0 +1,14 @@ +PacifidlogTown_House1:: @ 8305E90 + .4byte PacifidlogTown_House1_MapAttributes + .4byte PacifidlogTown_House1_MapEvents + .4byte PacifidlogTown_House1_MapScripts + .4byte 0x0 + .2byte BGM_MINAMO + .2byte 77 + .byte 6 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/PacifidlogTown_House1/header.s b/data/maps/PacifidlogTown_House1/header.s deleted file mode 100644 index 7842574f9..000000000 --- a/data/maps/PacifidlogTown_House1/header.s +++ /dev/null @@ -1,14 +0,0 @@ -PacifidlogTown_House1:: @ 8305E90 - .4byte PacifidlogTown_House1_MapAttributes - .4byte PacifidlogTown_House1_MapEvents - .4byte PacifidlogTown_House1_MapScripts - .4byte 0x0 - .2byte BGM_MINAMO - .2byte 77 - .byte 6 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/PacifidlogTown_House2/header.inc b/data/maps/PacifidlogTown_House2/header.inc new file mode 100644 index 000000000..3fc2aba99 --- /dev/null +++ b/data/maps/PacifidlogTown_House2/header.inc @@ -0,0 +1,14 @@ +PacifidlogTown_House2:: @ 8305EAC + .4byte PacifidlogTown_House2_MapAttributes + .4byte PacifidlogTown_House2_MapEvents + .4byte PacifidlogTown_House2_MapScripts + .4byte 0x0 + .2byte BGM_MINAMO + .2byte 78 + .byte 6 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/PacifidlogTown_House2/header.s b/data/maps/PacifidlogTown_House2/header.s deleted file mode 100644 index 3fc2aba99..000000000 --- a/data/maps/PacifidlogTown_House2/header.s +++ /dev/null @@ -1,14 +0,0 @@ -PacifidlogTown_House2:: @ 8305EAC - .4byte PacifidlogTown_House2_MapAttributes - .4byte PacifidlogTown_House2_MapEvents - .4byte PacifidlogTown_House2_MapScripts - .4byte 0x0 - .2byte BGM_MINAMO - .2byte 78 - .byte 6 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/PacifidlogTown_House3/header.inc b/data/maps/PacifidlogTown_House3/header.inc new file mode 100644 index 000000000..6bf1e6bd6 --- /dev/null +++ b/data/maps/PacifidlogTown_House3/header.inc @@ -0,0 +1,14 @@ +PacifidlogTown_House3:: @ 8305EC8 + .4byte PacifidlogTown_House3_MapAttributes + .4byte PacifidlogTown_House3_MapEvents + .4byte PacifidlogTown_House3_MapScripts + .4byte 0x0 + .2byte BGM_MINAMO + .2byte 77 + .byte 6 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/PacifidlogTown_House3/header.s b/data/maps/PacifidlogTown_House3/header.s deleted file mode 100644 index 6bf1e6bd6..000000000 --- a/data/maps/PacifidlogTown_House3/header.s +++ /dev/null @@ -1,14 +0,0 @@ -PacifidlogTown_House3:: @ 8305EC8 - .4byte PacifidlogTown_House3_MapAttributes - .4byte PacifidlogTown_House3_MapEvents - .4byte PacifidlogTown_House3_MapScripts - .4byte 0x0 - .2byte BGM_MINAMO - .2byte 77 - .byte 6 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/PacifidlogTown_House4/header.inc b/data/maps/PacifidlogTown_House4/header.inc new file mode 100644 index 000000000..df930a533 --- /dev/null +++ b/data/maps/PacifidlogTown_House4/header.inc @@ -0,0 +1,14 @@ +PacifidlogTown_House4:: @ 8305EE4 + .4byte PacifidlogTown_House4_MapAttributes + .4byte PacifidlogTown_House4_MapEvents + .4byte PacifidlogTown_House4_MapScripts + .4byte 0x0 + .2byte BGM_MINAMO + .2byte 78 + .byte 6 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/PacifidlogTown_House4/header.s b/data/maps/PacifidlogTown_House4/header.s deleted file mode 100644 index df930a533..000000000 --- a/data/maps/PacifidlogTown_House4/header.s +++ /dev/null @@ -1,14 +0,0 @@ -PacifidlogTown_House4:: @ 8305EE4 - .4byte PacifidlogTown_House4_MapAttributes - .4byte PacifidlogTown_House4_MapEvents - .4byte PacifidlogTown_House4_MapScripts - .4byte 0x0 - .2byte BGM_MINAMO - .2byte 78 - .byte 6 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/PacifidlogTown_House5/header.inc b/data/maps/PacifidlogTown_House5/header.inc new file mode 100644 index 000000000..d0fca156f --- /dev/null +++ b/data/maps/PacifidlogTown_House5/header.inc @@ -0,0 +1,14 @@ +PacifidlogTown_House5:: @ 8305F00 + .4byte PacifidlogTown_House5_MapAttributes + .4byte PacifidlogTown_House5_MapEvents + .4byte PacifidlogTown_House5_MapScripts + .4byte 0x0 + .2byte BGM_MINAMO + .2byte 77 + .byte 6 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/PacifidlogTown_House5/header.s b/data/maps/PacifidlogTown_House5/header.s deleted file mode 100644 index d0fca156f..000000000 --- a/data/maps/PacifidlogTown_House5/header.s +++ /dev/null @@ -1,14 +0,0 @@ -PacifidlogTown_House5:: @ 8305F00 - .4byte PacifidlogTown_House5_MapAttributes - .4byte PacifidlogTown_House5_MapEvents - .4byte PacifidlogTown_House5_MapScripts - .4byte 0x0 - .2byte BGM_MINAMO - .2byte 77 - .byte 6 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc b/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc new file mode 100644 index 000000000..ef2ddbf4c --- /dev/null +++ b/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc @@ -0,0 +1,14 @@ +PacifidlogTown_PokemonCenter_1F:: @ 8305E58 + .4byte PokemonCenter_1F_MapAttributes + .4byte PacifidlogTown_PokemonCenter_1F_MapEvents + .4byte PacifidlogTown_PokemonCenter_1F_MapScripts + .4byte 0x0 + .2byte BGM_POKECEN + .2byte 61 + .byte 6 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/PacifidlogTown_PokemonCenter_1F/header.s b/data/maps/PacifidlogTown_PokemonCenter_1F/header.s deleted file mode 100644 index ef2ddbf4c..000000000 --- a/data/maps/PacifidlogTown_PokemonCenter_1F/header.s +++ /dev/null @@ -1,14 +0,0 @@ -PacifidlogTown_PokemonCenter_1F:: @ 8305E58 - .4byte PokemonCenter_1F_MapAttributes - .4byte PacifidlogTown_PokemonCenter_1F_MapEvents - .4byte PacifidlogTown_PokemonCenter_1F_MapScripts - .4byte 0x0 - .2byte BGM_POKECEN - .2byte 61 - .byte 6 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc b/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc new file mode 100644 index 000000000..b985545a8 --- /dev/null +++ b/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc @@ -0,0 +1,14 @@ +PacifidlogTown_PokemonCenter_2F:: @ 8305E74 + .4byte PokemonCenter_2F_MapAttributes + .4byte PacifidlogTown_PokemonCenter_2F_MapEvents + .4byte PacifidlogTown_PokemonCenter_2F_MapScripts + .4byte 0x0 + .2byte BGM_POKECEN + .2byte 62 + .byte 6 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/PacifidlogTown_PokemonCenter_2F/header.s b/data/maps/PacifidlogTown_PokemonCenter_2F/header.s deleted file mode 100644 index b985545a8..000000000 --- a/data/maps/PacifidlogTown_PokemonCenter_2F/header.s +++ /dev/null @@ -1,14 +0,0 @@ -PacifidlogTown_PokemonCenter_2F:: @ 8305E74 - .4byte PokemonCenter_2F_MapAttributes - .4byte PacifidlogTown_PokemonCenter_2F_MapEvents - .4byte PacifidlogTown_PokemonCenter_2F_MapScripts - .4byte 0x0 - .2byte BGM_POKECEN - .2byte 62 - .byte 6 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/PetalburgCity/connections.inc b/data/maps/PetalburgCity/connections.inc new file mode 100644 index 000000000..cabded017 --- /dev/null +++ b/data/maps/PetalburgCity/connections.inc @@ -0,0 +1,7 @@ +PetalburgCity_MapConnectionsList:: @ 83086E4 + connection left, -50, Route104 + connection right, 10, Route102 + +PetalburgCity_MapConnections:: @ 83086FC + .4byte 0x2 + .4byte PetalburgCity_MapConnectionsList diff --git a/data/maps/PetalburgCity/connections.s b/data/maps/PetalburgCity/connections.s deleted file mode 100644 index cabded017..000000000 --- a/data/maps/PetalburgCity/connections.s +++ /dev/null @@ -1,7 +0,0 @@ -PetalburgCity_MapConnectionsList:: @ 83086E4 - connection left, -50, Route104 - connection right, 10, Route102 - -PetalburgCity_MapConnections:: @ 83086FC - .4byte 0x2 - .4byte PetalburgCity_MapConnectionsList diff --git a/data/maps/PetalburgCity/header.inc b/data/maps/PetalburgCity/header.inc new file mode 100644 index 000000000..c1706a55a --- /dev/null +++ b/data/maps/PetalburgCity/header.inc @@ -0,0 +1,14 @@ +PetalburgCity:: @ 8305448 + .4byte PetalburgCity_MapAttributes + .4byte PetalburgCity_MapEvents + .4byte PetalburgCity_MapScripts + .4byte PetalburgCity_MapConnections + .2byte BGM_MACHI_S2 + .2byte 1 + .byte 7 + .byte 0 + .byte 2 + .byte 2 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/PetalburgCity/header.s b/data/maps/PetalburgCity/header.s deleted file mode 100644 index c1706a55a..000000000 --- a/data/maps/PetalburgCity/header.s +++ /dev/null @@ -1,14 +0,0 @@ -PetalburgCity:: @ 8305448 - .4byte PetalburgCity_MapAttributes - .4byte PetalburgCity_MapEvents - .4byte PetalburgCity_MapScripts - .4byte PetalburgCity_MapConnections - .2byte BGM_MACHI_S2 - .2byte 1 - .byte 7 - .byte 0 - .byte 2 - .byte 2 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/PetalburgCity_Gym/header.inc b/data/maps/PetalburgCity_Gym/header.inc new file mode 100644 index 000000000..af00ed5f0 --- /dev/null +++ b/data/maps/PetalburgCity_Gym/header.inc @@ -0,0 +1,14 @@ +PetalburgCity_Gym:: @ 8305F38 + .4byte PetalburgCity_Gym_MapAttributes + .4byte PetalburgCity_Gym_MapEvents + .4byte PetalburgCity_Gym_MapScripts + .4byte 0x0 + .2byte BGM_GIM + .2byte 79 + .byte 7 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 1 diff --git a/data/maps/PetalburgCity_Gym/header.s b/data/maps/PetalburgCity_Gym/header.s deleted file mode 100644 index af00ed5f0..000000000 --- a/data/maps/PetalburgCity_Gym/header.s +++ /dev/null @@ -1,14 +0,0 @@ -PetalburgCity_Gym:: @ 8305F38 - .4byte PetalburgCity_Gym_MapAttributes - .4byte PetalburgCity_Gym_MapEvents - .4byte PetalburgCity_Gym_MapScripts - .4byte 0x0 - .2byte BGM_GIM - .2byte 79 - .byte 7 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 1 diff --git a/data/maps/PetalburgCity_House1/header.inc b/data/maps/PetalburgCity_House1/header.inc new file mode 100644 index 000000000..e1f5c1f63 --- /dev/null +++ b/data/maps/PetalburgCity_House1/header.inc @@ -0,0 +1,14 @@ +PetalburgCity_House1:: @ 8305F54 + .4byte House1_MapAttributes + .4byte PetalburgCity_House1_MapEvents + .4byte PetalburgCity_House1_MapScripts + .4byte 0x0 + .2byte BGM_MACHI_S2 + .2byte 59 + .byte 7 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/PetalburgCity_House1/header.s b/data/maps/PetalburgCity_House1/header.s deleted file mode 100644 index e1f5c1f63..000000000 --- a/data/maps/PetalburgCity_House1/header.s +++ /dev/null @@ -1,14 +0,0 @@ -PetalburgCity_House1:: @ 8305F54 - .4byte House1_MapAttributes - .4byte PetalburgCity_House1_MapEvents - .4byte PetalburgCity_House1_MapScripts - .4byte 0x0 - .2byte BGM_MACHI_S2 - .2byte 59 - .byte 7 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/PetalburgCity_House2/header.inc b/data/maps/PetalburgCity_House2/header.inc new file mode 100644 index 000000000..fb76b1bfe --- /dev/null +++ b/data/maps/PetalburgCity_House2/header.inc @@ -0,0 +1,14 @@ +PetalburgCity_House2:: @ 8305F70 + .4byte PetalburgCity_House2_MapAttributes + .4byte PetalburgCity_House2_MapEvents + .4byte PetalburgCity_House2_MapScripts + .4byte 0x0 + .2byte BGM_MACHI_S2 + .2byte 80 + .byte 7 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/PetalburgCity_House2/header.s b/data/maps/PetalburgCity_House2/header.s deleted file mode 100644 index fb76b1bfe..000000000 --- a/data/maps/PetalburgCity_House2/header.s +++ /dev/null @@ -1,14 +0,0 @@ -PetalburgCity_House2:: @ 8305F70 - .4byte PetalburgCity_House2_MapAttributes - .4byte PetalburgCity_House2_MapEvents - .4byte PetalburgCity_House2_MapScripts - .4byte 0x0 - .2byte BGM_MACHI_S2 - .2byte 80 - .byte 7 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/PetalburgCity_Mart/header.inc b/data/maps/PetalburgCity_Mart/header.inc new file mode 100644 index 000000000..56275cfaf --- /dev/null +++ b/data/maps/PetalburgCity_Mart/header.inc @@ -0,0 +1,14 @@ +PetalburgCity_Mart:: @ 8305FC4 + .4byte PokeMart_MapAttributes + .4byte PetalburgCity_Mart_MapEvents + .4byte PetalburgCity_Mart_MapScripts + .4byte 0x0 + .2byte BGM_FRIENDLY + .2byte 63 + .byte 7 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/PetalburgCity_Mart/header.s b/data/maps/PetalburgCity_Mart/header.s deleted file mode 100644 index 56275cfaf..000000000 --- a/data/maps/PetalburgCity_Mart/header.s +++ /dev/null @@ -1,14 +0,0 @@ -PetalburgCity_Mart:: @ 8305FC4 - .4byte PokeMart_MapAttributes - .4byte PetalburgCity_Mart_MapEvents - .4byte PetalburgCity_Mart_MapScripts - .4byte 0x0 - .2byte BGM_FRIENDLY - .2byte 63 - .byte 7 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/PetalburgCity_PokemonCenter_1F/header.inc b/data/maps/PetalburgCity_PokemonCenter_1F/header.inc new file mode 100644 index 000000000..2596fb65d --- /dev/null +++ b/data/maps/PetalburgCity_PokemonCenter_1F/header.inc @@ -0,0 +1,14 @@ +PetalburgCity_PokemonCenter_1F:: @ 8305F8C + .4byte PokemonCenter_1F_MapAttributes + .4byte PetalburgCity_PokemonCenter_1F_MapEvents + .4byte PetalburgCity_PokemonCenter_1F_MapScripts + .4byte 0x0 + .2byte BGM_POKECEN + .2byte 61 + .byte 7 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/PetalburgCity_PokemonCenter_1F/header.s b/data/maps/PetalburgCity_PokemonCenter_1F/header.s deleted file mode 100644 index 2596fb65d..000000000 --- a/data/maps/PetalburgCity_PokemonCenter_1F/header.s +++ /dev/null @@ -1,14 +0,0 @@ -PetalburgCity_PokemonCenter_1F:: @ 8305F8C - .4byte PokemonCenter_1F_MapAttributes - .4byte PetalburgCity_PokemonCenter_1F_MapEvents - .4byte PetalburgCity_PokemonCenter_1F_MapScripts - .4byte 0x0 - .2byte BGM_POKECEN - .2byte 61 - .byte 7 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/PetalburgCity_PokemonCenter_2F/header.inc b/data/maps/PetalburgCity_PokemonCenter_2F/header.inc new file mode 100644 index 000000000..ac6c77b6a --- /dev/null +++ b/data/maps/PetalburgCity_PokemonCenter_2F/header.inc @@ -0,0 +1,14 @@ +PetalburgCity_PokemonCenter_2F:: @ 8305FA8 + .4byte PokemonCenter_2F_MapAttributes + .4byte PetalburgCity_PokemonCenter_2F_MapEvents + .4byte PetalburgCity_PokemonCenter_2F_MapScripts + .4byte 0x0 + .2byte BGM_POKECEN + .2byte 62 + .byte 7 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/PetalburgCity_PokemonCenter_2F/header.s b/data/maps/PetalburgCity_PokemonCenter_2F/header.s deleted file mode 100644 index ac6c77b6a..000000000 --- a/data/maps/PetalburgCity_PokemonCenter_2F/header.s +++ /dev/null @@ -1,14 +0,0 @@ -PetalburgCity_PokemonCenter_2F:: @ 8305FA8 - .4byte PokemonCenter_2F_MapAttributes - .4byte PetalburgCity_PokemonCenter_2F_MapEvents - .4byte PetalburgCity_PokemonCenter_2F_MapScripts - .4byte 0x0 - .2byte BGM_POKECEN - .2byte 62 - .byte 7 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/PetalburgCity_WallysHouse/header.inc b/data/maps/PetalburgCity_WallysHouse/header.inc new file mode 100644 index 000000000..e16ac5a7f --- /dev/null +++ b/data/maps/PetalburgCity_WallysHouse/header.inc @@ -0,0 +1,14 @@ +PetalburgCity_WallysHouse:: @ 8305F1C + .4byte House2_MapAttributes + .4byte PetalburgCity_WallysHouse_MapEvents + .4byte PetalburgCity_WallysHouse_MapScripts + .4byte 0x0 + .2byte BGM_MACHI_S2 + .2byte 60 + .byte 7 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/PetalburgCity_WallysHouse/header.s b/data/maps/PetalburgCity_WallysHouse/header.s deleted file mode 100644 index e16ac5a7f..000000000 --- a/data/maps/PetalburgCity_WallysHouse/header.s +++ /dev/null @@ -1,14 +0,0 @@ -PetalburgCity_WallysHouse:: @ 8305F1C - .4byte House2_MapAttributes - .4byte PetalburgCity_WallysHouse_MapEvents - .4byte PetalburgCity_WallysHouse_MapScripts - .4byte 0x0 - .2byte BGM_MACHI_S2 - .2byte 60 - .byte 7 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/PetalburgWoods/header.inc b/data/maps/PetalburgWoods/header.inc new file mode 100644 index 000000000..b3a981af9 --- /dev/null +++ b/data/maps/PetalburgWoods/header.inc @@ -0,0 +1,14 @@ +PetalburgWoods:: @ 8306EA4 + .4byte PetalburgWoods_MapAttributes + .4byte PetalburgWoods_MapEvents + .4byte PetalburgWoods_MapScripts + .4byte 0x0 + .2byte BGM_DAN01 + .2byte 136 + .byte 59 + .byte 0 + .byte 11 + .byte 3 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/PetalburgWoods/header.s b/data/maps/PetalburgWoods/header.s deleted file mode 100644 index b3a981af9..000000000 --- a/data/maps/PetalburgWoods/header.s +++ /dev/null @@ -1,14 +0,0 @@ -PetalburgWoods:: @ 8306EA4 - .4byte PetalburgWoods_MapAttributes - .4byte PetalburgWoods_MapEvents - .4byte PetalburgWoods_MapScripts - .4byte 0x0 - .2byte BGM_DAN01 - .2byte 136 - .byte 59 - .byte 0 - .byte 11 - .byte 3 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/RecordCorner/header.inc b/data/maps/RecordCorner/header.inc new file mode 100644 index 000000000..a8322ebee --- /dev/null +++ b/data/maps/RecordCorner/header.inc @@ -0,0 +1,14 @@ +RecordCorner:: @ 83079B0 + .4byte RecordCorner_MapAttributes + .4byte RecordCorner_MapEvents + .4byte RecordCorner_MapScripts + .4byte 0x0 + .2byte BGM_RAINBOW + .2byte 224 + .byte 87 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/RecordCorner/header.s b/data/maps/RecordCorner/header.s deleted file mode 100644 index a8322ebee..000000000 --- a/data/maps/RecordCorner/header.s +++ /dev/null @@ -1,14 +0,0 @@ -RecordCorner:: @ 83079B0 - .4byte RecordCorner_MapAttributes - .4byte RecordCorner_MapEvents - .4byte RecordCorner_MapScripts - .4byte 0x0 - .2byte BGM_RAINBOW - .2byte 224 - .byte 87 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/Route101/connections.inc b/data/maps/Route101/connections.inc new file mode 100644 index 000000000..78f73238b --- /dev/null +++ b/data/maps/Route101/connections.inc @@ -0,0 +1,7 @@ +Route101_MapConnectionsList:: @ 830881C + connection up, 0, OldaleTown + connection down, 0, LittlerootTown + +Route101_MapConnections:: @ 8308834 + .4byte 0x2 + .4byte Route101_MapConnectionsList diff --git a/data/maps/Route101/connections.s b/data/maps/Route101/connections.s deleted file mode 100644 index 78f73238b..000000000 --- a/data/maps/Route101/connections.s +++ /dev/null @@ -1,7 +0,0 @@ -Route101_MapConnectionsList:: @ 830881C - connection up, 0, OldaleTown - connection down, 0, LittlerootTown - -Route101_MapConnections:: @ 8308834 - .4byte 0x2 - .4byte Route101_MapConnectionsList diff --git a/data/maps/Route101/header.inc b/data/maps/Route101/header.inc new file mode 100644 index 000000000..1b4b6b1c4 --- /dev/null +++ b/data/maps/Route101/header.inc @@ -0,0 +1,14 @@ +Route101:: @ 8305608 + .4byte Route101_MapAttributes + .4byte Route101_MapEvents + .4byte Route101_MapScripts + .4byte Route101_MapConnections + .2byte BGM_DOORO1 + .2byte 17 + .byte 16 + .byte 0 + .byte 2 + .byte 3 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/Route101/header.s b/data/maps/Route101/header.s deleted file mode 100644 index 1b4b6b1c4..000000000 --- a/data/maps/Route101/header.s +++ /dev/null @@ -1,14 +0,0 @@ -Route101:: @ 8305608 - .4byte Route101_MapAttributes - .4byte Route101_MapEvents - .4byte Route101_MapScripts - .4byte Route101_MapConnections - .2byte BGM_DOORO1 - .2byte 17 - .byte 16 - .byte 0 - .byte 2 - .byte 3 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/Route102/connections.inc b/data/maps/Route102/connections.inc new file mode 100644 index 000000000..c132f5fa7 --- /dev/null +++ b/data/maps/Route102/connections.inc @@ -0,0 +1,7 @@ +Route102_MapConnectionsList:: @ 830883C + connection left, -10, PetalburgCity + connection right, 0, OldaleTown + +Route102_MapConnections:: @ 8308854 + .4byte 0x2 + .4byte Route102_MapConnectionsList diff --git a/data/maps/Route102/connections.s b/data/maps/Route102/connections.s deleted file mode 100644 index c132f5fa7..000000000 --- a/data/maps/Route102/connections.s +++ /dev/null @@ -1,7 +0,0 @@ -Route102_MapConnectionsList:: @ 830883C - connection left, -10, PetalburgCity - connection right, 0, OldaleTown - -Route102_MapConnections:: @ 8308854 - .4byte 0x2 - .4byte Route102_MapConnectionsList diff --git a/data/maps/Route102/header.inc b/data/maps/Route102/header.inc new file mode 100644 index 000000000..a4318e2d2 --- /dev/null +++ b/data/maps/Route102/header.inc @@ -0,0 +1,14 @@ +Route102:: @ 8305624 + .4byte Route102_MapAttributes + .4byte Route102_MapEvents + .4byte Route102_MapScripts + .4byte Route102_MapConnections + .2byte BGM_DOORO1 + .2byte 18 + .byte 17 + .byte 0 + .byte 2 + .byte 3 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/Route102/header.s b/data/maps/Route102/header.s deleted file mode 100644 index a4318e2d2..000000000 --- a/data/maps/Route102/header.s +++ /dev/null @@ -1,14 +0,0 @@ -Route102:: @ 8305624 - .4byte Route102_MapAttributes - .4byte Route102_MapEvents - .4byte Route102_MapScripts - .4byte Route102_MapConnections - .2byte BGM_DOORO1 - .2byte 18 - .byte 17 - .byte 0 - .byte 2 - .byte 3 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/Route103/connections.inc b/data/maps/Route103/connections.inc new file mode 100644 index 000000000..1510b33d2 --- /dev/null +++ b/data/maps/Route103/connections.inc @@ -0,0 +1,7 @@ +Route103_MapConnectionsList:: @ 830885C + connection down, 0, OldaleTown + connection right, -60, Route110 + +Route103_MapConnections:: @ 8308874 + .4byte 0x2 + .4byte Route103_MapConnectionsList diff --git a/data/maps/Route103/connections.s b/data/maps/Route103/connections.s deleted file mode 100644 index 1510b33d2..000000000 --- a/data/maps/Route103/connections.s +++ /dev/null @@ -1,7 +0,0 @@ -Route103_MapConnectionsList:: @ 830885C - connection down, 0, OldaleTown - connection right, -60, Route110 - -Route103_MapConnections:: @ 8308874 - .4byte 0x2 - .4byte Route103_MapConnectionsList diff --git a/data/maps/Route103/header.inc b/data/maps/Route103/header.inc new file mode 100644 index 000000000..b23f9d523 --- /dev/null +++ b/data/maps/Route103/header.inc @@ -0,0 +1,14 @@ +Route103:: @ 8305640 + .4byte Route103_MapAttributes + .4byte Route103_MapEvents + .4byte Route103_MapScripts + .4byte Route103_MapConnections + .2byte BGM_DOORO1 + .2byte 19 + .byte 18 + .byte 0 + .byte 2 + .byte 3 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/Route103/header.s b/data/maps/Route103/header.s deleted file mode 100644 index b23f9d523..000000000 --- a/data/maps/Route103/header.s +++ /dev/null @@ -1,14 +0,0 @@ -Route103:: @ 8305640 - .4byte Route103_MapAttributes - .4byte Route103_MapEvents - .4byte Route103_MapScripts - .4byte Route103_MapConnections - .2byte BGM_DOORO1 - .2byte 19 - .byte 18 - .byte 0 - .byte 2 - .byte 3 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/Route104/connections.inc b/data/maps/Route104/connections.inc new file mode 100644 index 000000000..38085d1a8 --- /dev/null +++ b/data/maps/Route104/connections.inc @@ -0,0 +1,8 @@ +Route104_MapConnectionsList:: @ 830887C + connection up, 0, RustboroCity + connection down, 0, Route105 + connection right, 50, PetalburgCity + +Route104_MapConnections:: @ 83088A0 + .4byte 0x3 + .4byte Route104_MapConnectionsList diff --git a/data/maps/Route104/connections.s b/data/maps/Route104/connections.s deleted file mode 100644 index 38085d1a8..000000000 --- a/data/maps/Route104/connections.s +++ /dev/null @@ -1,8 +0,0 @@ -Route104_MapConnectionsList:: @ 830887C - connection up, 0, RustboroCity - connection down, 0, Route105 - connection right, 50, PetalburgCity - -Route104_MapConnections:: @ 83088A0 - .4byte 0x3 - .4byte Route104_MapConnectionsList diff --git a/data/maps/Route104/header.inc b/data/maps/Route104/header.inc new file mode 100644 index 000000000..71e7059b5 --- /dev/null +++ b/data/maps/Route104/header.inc @@ -0,0 +1,14 @@ +Route104:: @ 830565C + .4byte Route104_MapAttributes + .4byte Route104_MapEvents + .4byte Route104_MapScripts + .4byte Route104_MapConnections + .2byte BGM_NEXTROAD + .2byte 20 + .byte 19 + .byte 0 + .byte 2 + .byte 3 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/Route104/header.s b/data/maps/Route104/header.s deleted file mode 100644 index 71e7059b5..000000000 --- a/data/maps/Route104/header.s +++ /dev/null @@ -1,14 +0,0 @@ -Route104:: @ 830565C - .4byte Route104_MapAttributes - .4byte Route104_MapEvents - .4byte Route104_MapScripts - .4byte Route104_MapConnections - .2byte BGM_NEXTROAD - .2byte 20 - .byte 19 - .byte 0 - .byte 2 - .byte 3 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/Route104_MrBrineysHouse/header.inc b/data/maps/Route104_MrBrineysHouse/header.inc new file mode 100644 index 000000000..3055a73d6 --- /dev/null +++ b/data/maps/Route104_MrBrineysHouse/header.inc @@ -0,0 +1,14 @@ +Route104_MrBrineysHouse:: @ 8306C20 + .4byte Route104_MrBrineysHouse_MapAttributes + .4byte Route104_MrBrineysHouse_MapEvents + .4byte Route104_MrBrineysHouse_MapScripts + .4byte 0x0 + .2byte BGM_MACHI_S2 + .2byte 102 + .byte 19 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/Route104_MrBrineysHouse/header.s b/data/maps/Route104_MrBrineysHouse/header.s deleted file mode 100644 index 3055a73d6..000000000 --- a/data/maps/Route104_MrBrineysHouse/header.s +++ /dev/null @@ -1,14 +0,0 @@ -Route104_MrBrineysHouse:: @ 8306C20 - .4byte Route104_MrBrineysHouse_MapAttributes - .4byte Route104_MrBrineysHouse_MapEvents - .4byte Route104_MrBrineysHouse_MapScripts - .4byte 0x0 - .2byte BGM_MACHI_S2 - .2byte 102 - .byte 19 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/Route104_PrettyPetalFlowerShop/header.inc b/data/maps/Route104_PrettyPetalFlowerShop/header.inc new file mode 100644 index 000000000..3dae6a068 --- /dev/null +++ b/data/maps/Route104_PrettyPetalFlowerShop/header.inc @@ -0,0 +1,14 @@ +Route104_PrettyPetalFlowerShop:: @ 8306C3C + .4byte Route104_PrettyPetalFlowerShop_MapAttributes + .4byte Route104_PrettyPetalFlowerShop_MapEvents + .4byte Route104_PrettyPetalFlowerShop_MapScripts + .4byte 0x0 + .2byte BGM_MACHI_S2 + .2byte 118 + .byte 19 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/Route104_PrettyPetalFlowerShop/header.s b/data/maps/Route104_PrettyPetalFlowerShop/header.s deleted file mode 100644 index 3dae6a068..000000000 --- a/data/maps/Route104_PrettyPetalFlowerShop/header.s +++ /dev/null @@ -1,14 +0,0 @@ -Route104_PrettyPetalFlowerShop:: @ 8306C3C - .4byte Route104_PrettyPetalFlowerShop_MapAttributes - .4byte Route104_PrettyPetalFlowerShop_MapEvents - .4byte Route104_PrettyPetalFlowerShop_MapScripts - .4byte 0x0 - .2byte BGM_MACHI_S2 - .2byte 118 - .byte 19 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/Route104_Prototype/header.inc b/data/maps/Route104_Prototype/header.inc new file mode 100644 index 000000000..7f5115386 --- /dev/null +++ b/data/maps/Route104_Prototype/header.inc @@ -0,0 +1,14 @@ +Route104_Prototype:: @ 8307CF8 + .4byte Route104_Prototype_MapAttributes + .4byte Route104_Prototype_MapEvents + .4byte Route104_Prototype_MapScripts + .4byte 0x0 + .2byte BGM_NEXTROAD + .2byte 288 + .byte 19 + .byte 0 + .byte 2 + .byte 3 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/Route104_Prototype/header.s b/data/maps/Route104_Prototype/header.s deleted file mode 100644 index 7f5115386..000000000 --- a/data/maps/Route104_Prototype/header.s +++ /dev/null @@ -1,14 +0,0 @@ -Route104_Prototype:: @ 8307CF8 - .4byte Route104_Prototype_MapAttributes - .4byte Route104_Prototype_MapEvents - .4byte Route104_Prototype_MapScripts - .4byte 0x0 - .2byte BGM_NEXTROAD - .2byte 288 - .byte 19 - .byte 0 - .byte 2 - .byte 3 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc b/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc new file mode 100644 index 000000000..51b27eb0a --- /dev/null +++ b/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc @@ -0,0 +1,14 @@ +Route104_PrototypePrettyPetalFlowerShop:: @ 8307D14 + .4byte Route104_PrototypePrettyPetalFlowerShop_MapAttributes + .4byte Route104_PrototypePrettyPetalFlowerShop_MapEvents + .4byte Route104_PrototypePrettyPetalFlowerShop_MapScripts + .4byte 0x0 + .2byte BGM_NEXTROAD + .2byte 118 + .byte 19 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.s b/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.s deleted file mode 100644 index 51b27eb0a..000000000 --- a/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.s +++ /dev/null @@ -1,14 +0,0 @@ -Route104_PrototypePrettyPetalFlowerShop:: @ 8307D14 - .4byte Route104_PrototypePrettyPetalFlowerShop_MapAttributes - .4byte Route104_PrototypePrettyPetalFlowerShop_MapEvents - .4byte Route104_PrototypePrettyPetalFlowerShop_MapScripts - .4byte 0x0 - .2byte BGM_NEXTROAD - .2byte 118 - .byte 19 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/Route105/connections.inc b/data/maps/Route105/connections.inc new file mode 100644 index 000000000..6915b9d08 --- /dev/null +++ b/data/maps/Route105/connections.inc @@ -0,0 +1,7 @@ +Route105_MapConnectionsList:: @ 83088A8 + connection up, 0, Route104 + connection down, 0, Route106 + +Route105_MapConnections:: @ 83088C0 + .4byte 0x2 + .4byte Route105_MapConnectionsList diff --git a/data/maps/Route105/connections.s b/data/maps/Route105/connections.s deleted file mode 100644 index 6915b9d08..000000000 --- a/data/maps/Route105/connections.s +++ /dev/null @@ -1,7 +0,0 @@ -Route105_MapConnectionsList:: @ 83088A8 - connection up, 0, Route104 - connection down, 0, Route106 - -Route105_MapConnections:: @ 83088C0 - .4byte 0x2 - .4byte Route105_MapConnectionsList diff --git a/data/maps/Route105/header.inc b/data/maps/Route105/header.inc new file mode 100644 index 000000000..344b8f634 --- /dev/null +++ b/data/maps/Route105/header.inc @@ -0,0 +1,14 @@ +Route105:: @ 8305678 + .4byte Route105_MapAttributes + .4byte Route105_MapEvents + .4byte Route105_MapScripts + .4byte Route105_MapConnections + .2byte BGM_NEXTROAD + .2byte 21 + .byte 20 + .byte 0 + .byte 2 + .byte 3 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/Route105/header.s b/data/maps/Route105/header.s deleted file mode 100644 index 344b8f634..000000000 --- a/data/maps/Route105/header.s +++ /dev/null @@ -1,14 +0,0 @@ -Route105:: @ 8305678 - .4byte Route105_MapAttributes - .4byte Route105_MapEvents - .4byte Route105_MapScripts - .4byte Route105_MapConnections - .2byte BGM_NEXTROAD - .2byte 21 - .byte 20 - .byte 0 - .byte 2 - .byte 3 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/Route106/connections.inc b/data/maps/Route106/connections.inc new file mode 100644 index 000000000..4d041e65c --- /dev/null +++ b/data/maps/Route106/connections.inc @@ -0,0 +1,7 @@ +Route106_MapConnectionsList:: @ 83088C8 + connection up, 0, Route105 + connection down, 60, DewfordTown + +Route106_MapConnections:: @ 83088E0 + .4byte 0x2 + .4byte Route106_MapConnectionsList diff --git a/data/maps/Route106/connections.s b/data/maps/Route106/connections.s deleted file mode 100644 index 4d041e65c..000000000 --- a/data/maps/Route106/connections.s +++ /dev/null @@ -1,7 +0,0 @@ -Route106_MapConnectionsList:: @ 83088C8 - connection up, 0, Route105 - connection down, 60, DewfordTown - -Route106_MapConnections:: @ 83088E0 - .4byte 0x2 - .4byte Route106_MapConnectionsList diff --git a/data/maps/Route106/header.inc b/data/maps/Route106/header.inc new file mode 100644 index 000000000..494690340 --- /dev/null +++ b/data/maps/Route106/header.inc @@ -0,0 +1,14 @@ +Route106:: @ 8305694 + .4byte Route106_MapAttributes + .4byte Route106_MapEvents + .4byte Route106_MapScripts + .4byte Route106_MapConnections + .2byte BGM_NEXTROAD + .2byte 22 + .byte 21 + .byte 0 + .byte 2 + .byte 3 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/Route106/header.s b/data/maps/Route106/header.s deleted file mode 100644 index 494690340..000000000 --- a/data/maps/Route106/header.s +++ /dev/null @@ -1,14 +0,0 @@ -Route106:: @ 8305694 - .4byte Route106_MapAttributes - .4byte Route106_MapEvents - .4byte Route106_MapScripts - .4byte Route106_MapConnections - .2byte BGM_NEXTROAD - .2byte 22 - .byte 21 - .byte 0 - .byte 2 - .byte 3 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/Route107/connections.inc b/data/maps/Route107/connections.inc new file mode 100644 index 000000000..a3da84672 --- /dev/null +++ b/data/maps/Route107/connections.inc @@ -0,0 +1,7 @@ +Route107_MapConnectionsList:: @ 83088E8 + connection left, 0, DewfordTown + connection right, 0, Route108 + +Route107_MapConnections:: @ 8308900 + .4byte 0x2 + .4byte Route107_MapConnectionsList diff --git a/data/maps/Route107/connections.s b/data/maps/Route107/connections.s deleted file mode 100644 index a3da84672..000000000 --- a/data/maps/Route107/connections.s +++ /dev/null @@ -1,7 +0,0 @@ -Route107_MapConnectionsList:: @ 83088E8 - connection left, 0, DewfordTown - connection right, 0, Route108 - -Route107_MapConnections:: @ 8308900 - .4byte 0x2 - .4byte Route107_MapConnectionsList diff --git a/data/maps/Route107/header.inc b/data/maps/Route107/header.inc new file mode 100644 index 000000000..382b617ba --- /dev/null +++ b/data/maps/Route107/header.inc @@ -0,0 +1,14 @@ +Route107:: @ 83056B0 + .4byte Route107_MapAttributes + .4byte Route107_MapEvents + .4byte Route107_MapScripts + .4byte Route107_MapConnections + .2byte BGM_NEXTROAD + .2byte 23 + .byte 22 + .byte 0 + .byte 2 + .byte 3 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/Route107/header.s b/data/maps/Route107/header.s deleted file mode 100644 index 382b617ba..000000000 --- a/data/maps/Route107/header.s +++ /dev/null @@ -1,14 +0,0 @@ -Route107:: @ 83056B0 - .4byte Route107_MapAttributes - .4byte Route107_MapEvents - .4byte Route107_MapScripts - .4byte Route107_MapConnections - .2byte BGM_NEXTROAD - .2byte 23 - .byte 22 - .byte 0 - .byte 2 - .byte 3 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/Route108/connections.inc b/data/maps/Route108/connections.inc new file mode 100644 index 000000000..aba43d804 --- /dev/null +++ b/data/maps/Route108/connections.inc @@ -0,0 +1,7 @@ +Route108_MapConnectionsList:: @ 8308908 + connection left, 0, Route107 + connection right, -40, Route109 + +Route108_MapConnections:: @ 8308920 + .4byte 0x2 + .4byte Route108_MapConnectionsList diff --git a/data/maps/Route108/connections.s b/data/maps/Route108/connections.s deleted file mode 100644 index aba43d804..000000000 --- a/data/maps/Route108/connections.s +++ /dev/null @@ -1,7 +0,0 @@ -Route108_MapConnectionsList:: @ 8308908 - connection left, 0, Route107 - connection right, -40, Route109 - -Route108_MapConnections:: @ 8308920 - .4byte 0x2 - .4byte Route108_MapConnectionsList diff --git a/data/maps/Route108/header.inc b/data/maps/Route108/header.inc new file mode 100644 index 000000000..3214f7b89 --- /dev/null +++ b/data/maps/Route108/header.inc @@ -0,0 +1,14 @@ +Route108:: @ 83056CC + .4byte Route108_MapAttributes + .4byte Route108_MapEvents + .4byte Route108_MapScripts + .4byte Route108_MapConnections + .2byte BGM_NEXTROAD + .2byte 24 + .byte 23 + .byte 0 + .byte 2 + .byte 3 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/Route108/header.s b/data/maps/Route108/header.s deleted file mode 100644 index 3214f7b89..000000000 --- a/data/maps/Route108/header.s +++ /dev/null @@ -1,14 +0,0 @@ -Route108:: @ 83056CC - .4byte Route108_MapAttributes - .4byte Route108_MapEvents - .4byte Route108_MapScripts - .4byte Route108_MapConnections - .2byte BGM_NEXTROAD - .2byte 24 - .byte 23 - .byte 0 - .byte 2 - .byte 3 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/Route109/connections.inc b/data/maps/Route109/connections.inc new file mode 100644 index 000000000..5135e8e8b --- /dev/null +++ b/data/maps/Route109/connections.inc @@ -0,0 +1,7 @@ +Route109_MapConnectionsList:: @ 8308928 + connection up, 0, SlateportCity + connection left, 40, Route108 + +Route109_MapConnections:: @ 8308940 + .4byte 0x2 + .4byte Route109_MapConnectionsList diff --git a/data/maps/Route109/connections.s b/data/maps/Route109/connections.s deleted file mode 100644 index 5135e8e8b..000000000 --- a/data/maps/Route109/connections.s +++ /dev/null @@ -1,7 +0,0 @@ -Route109_MapConnectionsList:: @ 8308928 - connection up, 0, SlateportCity - connection left, 40, Route108 - -Route109_MapConnections:: @ 8308940 - .4byte 0x2 - .4byte Route109_MapConnectionsList diff --git a/data/maps/Route109/header.inc b/data/maps/Route109/header.inc new file mode 100644 index 000000000..db91d1368 --- /dev/null +++ b/data/maps/Route109/header.inc @@ -0,0 +1,14 @@ +Route109:: @ 83056E8 + .4byte Route109_MapAttributes + .4byte Route109_MapEvents + .4byte Route109_MapScripts + .4byte Route109_MapConnections + .2byte BGM_NEXTROAD + .2byte 25 + .byte 24 + .byte 0 + .byte 2 + .byte 3 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/Route109/header.s b/data/maps/Route109/header.s deleted file mode 100644 index db91d1368..000000000 --- a/data/maps/Route109/header.s +++ /dev/null @@ -1,14 +0,0 @@ -Route109:: @ 83056E8 - .4byte Route109_MapAttributes - .4byte Route109_MapEvents - .4byte Route109_MapScripts - .4byte Route109_MapConnections - .2byte BGM_NEXTROAD - .2byte 25 - .byte 24 - .byte 0 - .byte 2 - .byte 3 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/Route109_SeashoreHouse/header.inc b/data/maps/Route109_SeashoreHouse/header.inc new file mode 100644 index 000000000..064d428bd --- /dev/null +++ b/data/maps/Route109_SeashoreHouse/header.inc @@ -0,0 +1,14 @@ +Route109_SeashoreHouse:: @ 8307D30 + .4byte Route109_SeashoreHouse_MapAttributes + .4byte Route109_SeashoreHouse_MapEvents + .4byte Route109_SeashoreHouse_MapScripts + .4byte 0x0 + .2byte BGM_HIGHTOWN + .2byte 244 + .byte 24 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/Route109_SeashoreHouse/header.s b/data/maps/Route109_SeashoreHouse/header.s deleted file mode 100644 index 064d428bd..000000000 --- a/data/maps/Route109_SeashoreHouse/header.s +++ /dev/null @@ -1,14 +0,0 @@ -Route109_SeashoreHouse:: @ 8307D30 - .4byte Route109_SeashoreHouse_MapAttributes - .4byte Route109_SeashoreHouse_MapEvents - .4byte Route109_SeashoreHouse_MapScripts - .4byte 0x0 - .2byte BGM_HIGHTOWN - .2byte 244 - .byte 24 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/Route110/connections.inc b/data/maps/Route110/connections.inc new file mode 100644 index 000000000..d0f88deb3 --- /dev/null +++ b/data/maps/Route110/connections.inc @@ -0,0 +1,8 @@ +Route110_MapConnectionsList:: @ 8308948 + connection up, 0, MauvilleCity + connection down, 0, SlateportCity + connection left, 60, Route103 + +Route110_MapConnections:: @ 830896C + .4byte 0x3 + .4byte Route110_MapConnectionsList diff --git a/data/maps/Route110/connections.s b/data/maps/Route110/connections.s deleted file mode 100644 index d0f88deb3..000000000 --- a/data/maps/Route110/connections.s +++ /dev/null @@ -1,8 +0,0 @@ -Route110_MapConnectionsList:: @ 8308948 - connection up, 0, MauvilleCity - connection down, 0, SlateportCity - connection left, 60, Route103 - -Route110_MapConnections:: @ 830896C - .4byte 0x3 - .4byte Route110_MapConnectionsList diff --git a/data/maps/Route110/header.inc b/data/maps/Route110/header.inc new file mode 100644 index 000000000..442a02ccb --- /dev/null +++ b/data/maps/Route110/header.inc @@ -0,0 +1,14 @@ +Route110:: @ 8305704 + .4byte Route110_MapAttributes + .4byte Route110_MapEvents + .4byte Route110_MapScripts + .4byte Route110_MapConnections + .2byte BGM_DOORO_X1 + .2byte 26 + .byte 25 + .byte 0 + .byte 2 + .byte 3 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/Route110/header.s b/data/maps/Route110/header.s deleted file mode 100644 index 442a02ccb..000000000 --- a/data/maps/Route110/header.s +++ /dev/null @@ -1,14 +0,0 @@ -Route110:: @ 8305704 - .4byte Route110_MapAttributes - .4byte Route110_MapEvents - .4byte Route110_MapScripts - .4byte Route110_MapConnections - .2byte BGM_DOORO_X1 - .2byte 26 - .byte 25 - .byte 0 - .byte 2 - .byte 3 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc new file mode 100644 index 000000000..749ab18e9 --- /dev/null +++ b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc @@ -0,0 +1,14 @@ +Route110_SeasideCyclingRoadNorthEntrance:: @ 8307E9C + .4byte Route110_SeasideCyclingRoadNorthEntrance_MapAttributes + .4byte Route110_SeasideCyclingRoadNorthEntrance_MapEvents + .4byte Route110_SeasideCyclingRoadNorthEntrance_MapScripts + .4byte 0x0 + .2byte BGM_FINECITY + .2byte 257 + .byte 25 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.s b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.s deleted file mode 100644 index 749ab18e9..000000000 --- a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.s +++ /dev/null @@ -1,14 +0,0 @@ -Route110_SeasideCyclingRoadNorthEntrance:: @ 8307E9C - .4byte Route110_SeasideCyclingRoadNorthEntrance_MapAttributes - .4byte Route110_SeasideCyclingRoadNorthEntrance_MapEvents - .4byte Route110_SeasideCyclingRoadNorthEntrance_MapScripts - .4byte 0x0 - .2byte BGM_FINECITY - .2byte 257 - .byte 25 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc new file mode 100644 index 000000000..a4bd0cbd7 --- /dev/null +++ b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc @@ -0,0 +1,14 @@ +Route110_SeasideCyclingRoadSouthEntrance:: @ 8307E80 + .4byte Route110_SeasideCyclingRoadSouthEntrance_MapAttributes + .4byte Route110_SeasideCyclingRoadSouthEntrance_MapEvents + .4byte Route110_SeasideCyclingRoadSouthEntrance_MapScripts + .4byte 0x0 + .2byte BGM_FINECITY + .2byte 257 + .byte 25 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.s b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.s deleted file mode 100644 index a4bd0cbd7..000000000 --- a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.s +++ /dev/null @@ -1,14 +0,0 @@ -Route110_SeasideCyclingRoadSouthEntrance:: @ 8307E80 - .4byte Route110_SeasideCyclingRoadSouthEntrance_MapAttributes - .4byte Route110_SeasideCyclingRoadSouthEntrance_MapEvents - .4byte Route110_SeasideCyclingRoadSouthEntrance_MapScripts - .4byte 0x0 - .2byte BGM_FINECITY - .2byte 257 - .byte 25 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/Route110_TrickHouseCorridor/header.inc b/data/maps/Route110_TrickHouseCorridor/header.inc new file mode 100644 index 000000000..f2b2c691d --- /dev/null +++ b/data/maps/Route110_TrickHouseCorridor/header.inc @@ -0,0 +1,14 @@ +Route110_TrickHouseCorridor:: @ 8307D84 + .4byte Route110_TrickHouseCorridor_MapAttributes + .4byte Route110_TrickHouseCorridor_MapEvents + .4byte Route110_TrickHouseCorridor_MapScripts + .4byte 0x0 + .2byte BGM_KARAKURI + .2byte 247 + .byte 25 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/Route110_TrickHouseCorridor/header.s b/data/maps/Route110_TrickHouseCorridor/header.s deleted file mode 100644 index f2b2c691d..000000000 --- a/data/maps/Route110_TrickHouseCorridor/header.s +++ /dev/null @@ -1,14 +0,0 @@ -Route110_TrickHouseCorridor:: @ 8307D84 - .4byte Route110_TrickHouseCorridor_MapAttributes - .4byte Route110_TrickHouseCorridor_MapEvents - .4byte Route110_TrickHouseCorridor_MapScripts - .4byte 0x0 - .2byte BGM_KARAKURI - .2byte 247 - .byte 25 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/Route110_TrickHouseEnd/header.inc b/data/maps/Route110_TrickHouseEnd/header.inc new file mode 100644 index 000000000..d61808d7f --- /dev/null +++ b/data/maps/Route110_TrickHouseEnd/header.inc @@ -0,0 +1,14 @@ +Route110_TrickHouseEnd:: @ 8307D68 + .4byte Route110_TrickHouseEnd_MapAttributes + .4byte Route110_TrickHouseEnd_MapEvents + .4byte Route110_TrickHouseEnd_MapScripts + .4byte 0x0 + .2byte BGM_KARAKURI + .2byte 246 + .byte 25 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/Route110_TrickHouseEnd/header.s b/data/maps/Route110_TrickHouseEnd/header.s deleted file mode 100644 index d61808d7f..000000000 --- a/data/maps/Route110_TrickHouseEnd/header.s +++ /dev/null @@ -1,14 +0,0 @@ -Route110_TrickHouseEnd:: @ 8307D68 - .4byte Route110_TrickHouseEnd_MapAttributes - .4byte Route110_TrickHouseEnd_MapEvents - .4byte Route110_TrickHouseEnd_MapScripts - .4byte 0x0 - .2byte BGM_KARAKURI - .2byte 246 - .byte 25 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/Route110_TrickHouseEntrance/header.inc b/data/maps/Route110_TrickHouseEntrance/header.inc new file mode 100644 index 000000000..80d6c597f --- /dev/null +++ b/data/maps/Route110_TrickHouseEntrance/header.inc @@ -0,0 +1,14 @@ +Route110_TrickHouseEntrance:: @ 8307D4C + .4byte Route110_TrickHouseEntrance_MapAttributes + .4byte Route110_TrickHouseEntrance_MapEvents + .4byte Route110_TrickHouseEntrance_MapScripts + .4byte 0x0 + .2byte BGM_KARAKURI + .2byte 245 + .byte 25 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/Route110_TrickHouseEntrance/header.s b/data/maps/Route110_TrickHouseEntrance/header.s deleted file mode 100644 index 80d6c597f..000000000 --- a/data/maps/Route110_TrickHouseEntrance/header.s +++ /dev/null @@ -1,14 +0,0 @@ -Route110_TrickHouseEntrance:: @ 8307D4C - .4byte Route110_TrickHouseEntrance_MapAttributes - .4byte Route110_TrickHouseEntrance_MapEvents - .4byte Route110_TrickHouseEntrance_MapScripts - .4byte 0x0 - .2byte BGM_KARAKURI - .2byte 245 - .byte 25 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/Route110_TrickHousePuzzle1/header.inc b/data/maps/Route110_TrickHousePuzzle1/header.inc new file mode 100644 index 000000000..c4c87877c --- /dev/null +++ b/data/maps/Route110_TrickHousePuzzle1/header.inc @@ -0,0 +1,14 @@ +Route110_TrickHousePuzzle1:: @ 8307DA0 + .4byte Route110_TrickHousePuzzle1_MapAttributes + .4byte Route110_TrickHousePuzzle1_MapEvents + .4byte Route110_TrickHousePuzzle1_MapScripts + .4byte 0x0 + .2byte BGM_KARAKURI + .2byte 248 + .byte 25 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/Route110_TrickHousePuzzle1/header.s b/data/maps/Route110_TrickHousePuzzle1/header.s deleted file mode 100644 index c4c87877c..000000000 --- a/data/maps/Route110_TrickHousePuzzle1/header.s +++ /dev/null @@ -1,14 +0,0 @@ -Route110_TrickHousePuzzle1:: @ 8307DA0 - .4byte Route110_TrickHousePuzzle1_MapAttributes - .4byte Route110_TrickHousePuzzle1_MapEvents - .4byte Route110_TrickHousePuzzle1_MapScripts - .4byte 0x0 - .2byte BGM_KARAKURI - .2byte 248 - .byte 25 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/Route110_TrickHousePuzzle2/header.inc b/data/maps/Route110_TrickHousePuzzle2/header.inc new file mode 100644 index 000000000..d278ca3aa --- /dev/null +++ b/data/maps/Route110_TrickHousePuzzle2/header.inc @@ -0,0 +1,14 @@ +Route110_TrickHousePuzzle2:: @ 8307DBC + .4byte Route110_TrickHousePuzzle2_MapAttributes + .4byte Route110_TrickHousePuzzle2_MapEvents + .4byte Route110_TrickHousePuzzle2_MapScripts + .4byte 0x0 + .2byte BGM_KARAKURI + .2byte 249 + .byte 25 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/Route110_TrickHousePuzzle2/header.s b/data/maps/Route110_TrickHousePuzzle2/header.s deleted file mode 100644 index d278ca3aa..000000000 --- a/data/maps/Route110_TrickHousePuzzle2/header.s +++ /dev/null @@ -1,14 +0,0 @@ -Route110_TrickHousePuzzle2:: @ 8307DBC - .4byte Route110_TrickHousePuzzle2_MapAttributes - .4byte Route110_TrickHousePuzzle2_MapEvents - .4byte Route110_TrickHousePuzzle2_MapScripts - .4byte 0x0 - .2byte BGM_KARAKURI - .2byte 249 - .byte 25 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/Route110_TrickHousePuzzle3/header.inc b/data/maps/Route110_TrickHousePuzzle3/header.inc new file mode 100644 index 000000000..736a1dc19 --- /dev/null +++ b/data/maps/Route110_TrickHousePuzzle3/header.inc @@ -0,0 +1,14 @@ +Route110_TrickHousePuzzle3:: @ 8307DD8 + .4byte Route110_TrickHousePuzzle3_MapAttributes + .4byte Route110_TrickHousePuzzle3_MapEvents + .4byte Route110_TrickHousePuzzle3_MapScripts + .4byte 0x0 + .2byte BGM_KARAKURI + .2byte 250 + .byte 25 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/Route110_TrickHousePuzzle3/header.s b/data/maps/Route110_TrickHousePuzzle3/header.s deleted file mode 100644 index 736a1dc19..000000000 --- a/data/maps/Route110_TrickHousePuzzle3/header.s +++ /dev/null @@ -1,14 +0,0 @@ -Route110_TrickHousePuzzle3:: @ 8307DD8 - .4byte Route110_TrickHousePuzzle3_MapAttributes - .4byte Route110_TrickHousePuzzle3_MapEvents - .4byte Route110_TrickHousePuzzle3_MapScripts - .4byte 0x0 - .2byte BGM_KARAKURI - .2byte 250 - .byte 25 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/Route110_TrickHousePuzzle4/header.inc b/data/maps/Route110_TrickHousePuzzle4/header.inc new file mode 100644 index 000000000..f4117a578 --- /dev/null +++ b/data/maps/Route110_TrickHousePuzzle4/header.inc @@ -0,0 +1,14 @@ +Route110_TrickHousePuzzle4:: @ 8307DF4 + .4byte Route110_TrickHousePuzzle4_MapAttributes + .4byte Route110_TrickHousePuzzle4_MapEvents + .4byte Route110_TrickHousePuzzle4_MapScripts + .4byte 0x0 + .2byte BGM_KARAKURI + .2byte 251 + .byte 25 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/Route110_TrickHousePuzzle4/header.s b/data/maps/Route110_TrickHousePuzzle4/header.s deleted file mode 100644 index f4117a578..000000000 --- a/data/maps/Route110_TrickHousePuzzle4/header.s +++ /dev/null @@ -1,14 +0,0 @@ -Route110_TrickHousePuzzle4:: @ 8307DF4 - .4byte Route110_TrickHousePuzzle4_MapAttributes - .4byte Route110_TrickHousePuzzle4_MapEvents - .4byte Route110_TrickHousePuzzle4_MapScripts - .4byte 0x0 - .2byte BGM_KARAKURI - .2byte 251 - .byte 25 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/Route110_TrickHousePuzzle5/header.inc b/data/maps/Route110_TrickHousePuzzle5/header.inc new file mode 100644 index 000000000..7216f556e --- /dev/null +++ b/data/maps/Route110_TrickHousePuzzle5/header.inc @@ -0,0 +1,14 @@ +Route110_TrickHousePuzzle5:: @ 8307E10 + .4byte Route110_TrickHousePuzzle5_MapAttributes + .4byte Route110_TrickHousePuzzle5_MapEvents + .4byte Route110_TrickHousePuzzle5_MapScripts + .4byte 0x0 + .2byte BGM_KARAKURI + .2byte 252 + .byte 25 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/Route110_TrickHousePuzzle5/header.s b/data/maps/Route110_TrickHousePuzzle5/header.s deleted file mode 100644 index 7216f556e..000000000 --- a/data/maps/Route110_TrickHousePuzzle5/header.s +++ /dev/null @@ -1,14 +0,0 @@ -Route110_TrickHousePuzzle5:: @ 8307E10 - .4byte Route110_TrickHousePuzzle5_MapAttributes - .4byte Route110_TrickHousePuzzle5_MapEvents - .4byte Route110_TrickHousePuzzle5_MapScripts - .4byte 0x0 - .2byte BGM_KARAKURI - .2byte 252 - .byte 25 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/Route110_TrickHousePuzzle6/header.inc b/data/maps/Route110_TrickHousePuzzle6/header.inc new file mode 100644 index 000000000..5ffc844bd --- /dev/null +++ b/data/maps/Route110_TrickHousePuzzle6/header.inc @@ -0,0 +1,14 @@ +Route110_TrickHousePuzzle6:: @ 8307E2C + .4byte Route110_TrickHousePuzzle6_MapAttributes + .4byte Route110_TrickHousePuzzle6_MapEvents + .4byte Route110_TrickHousePuzzle6_MapScripts + .4byte 0x0 + .2byte BGM_KARAKURI + .2byte 253 + .byte 25 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/Route110_TrickHousePuzzle6/header.s b/data/maps/Route110_TrickHousePuzzle6/header.s deleted file mode 100644 index 5ffc844bd..000000000 --- a/data/maps/Route110_TrickHousePuzzle6/header.s +++ /dev/null @@ -1,14 +0,0 @@ -Route110_TrickHousePuzzle6:: @ 8307E2C - .4byte Route110_TrickHousePuzzle6_MapAttributes - .4byte Route110_TrickHousePuzzle6_MapEvents - .4byte Route110_TrickHousePuzzle6_MapScripts - .4byte 0x0 - .2byte BGM_KARAKURI - .2byte 253 - .byte 25 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/Route110_TrickHousePuzzle7/header.inc b/data/maps/Route110_TrickHousePuzzle7/header.inc new file mode 100644 index 000000000..cea170daa --- /dev/null +++ b/data/maps/Route110_TrickHousePuzzle7/header.inc @@ -0,0 +1,14 @@ +Route110_TrickHousePuzzle7:: @ 8307E48 + .4byte Route110_TrickHousePuzzle7_MapAttributes + .4byte Route110_TrickHousePuzzle7_MapEvents + .4byte Route110_TrickHousePuzzle7_MapScripts + .4byte 0x0 + .2byte BGM_KARAKURI + .2byte 254 + .byte 25 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/Route110_TrickHousePuzzle7/header.s b/data/maps/Route110_TrickHousePuzzle7/header.s deleted file mode 100644 index cea170daa..000000000 --- a/data/maps/Route110_TrickHousePuzzle7/header.s +++ /dev/null @@ -1,14 +0,0 @@ -Route110_TrickHousePuzzle7:: @ 8307E48 - .4byte Route110_TrickHousePuzzle7_MapAttributes - .4byte Route110_TrickHousePuzzle7_MapEvents - .4byte Route110_TrickHousePuzzle7_MapScripts - .4byte 0x0 - .2byte BGM_KARAKURI - .2byte 254 - .byte 25 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/Route110_TrickHousePuzzle8/header.inc b/data/maps/Route110_TrickHousePuzzle8/header.inc new file mode 100644 index 000000000..6a4dc7051 --- /dev/null +++ b/data/maps/Route110_TrickHousePuzzle8/header.inc @@ -0,0 +1,14 @@ +Route110_TrickHousePuzzle8:: @ 8307E64 + .4byte Route110_TrickHousePuzzle8_MapAttributes + .4byte Route110_TrickHousePuzzle8_MapEvents + .4byte Route110_TrickHousePuzzle8_MapScripts + .4byte 0x0 + .2byte BGM_KARAKURI + .2byte 255 + .byte 25 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/Route110_TrickHousePuzzle8/header.s b/data/maps/Route110_TrickHousePuzzle8/header.s deleted file mode 100644 index 6a4dc7051..000000000 --- a/data/maps/Route110_TrickHousePuzzle8/header.s +++ /dev/null @@ -1,14 +0,0 @@ -Route110_TrickHousePuzzle8:: @ 8307E64 - .4byte Route110_TrickHousePuzzle8_MapAttributes - .4byte Route110_TrickHousePuzzle8_MapEvents - .4byte Route110_TrickHousePuzzle8_MapScripts - .4byte 0x0 - .2byte BGM_KARAKURI - .2byte 255 - .byte 25 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/Route111/connections.inc b/data/maps/Route111/connections.inc new file mode 100644 index 000000000..411dea34b --- /dev/null +++ b/data/maps/Route111/connections.inc @@ -0,0 +1,8 @@ +Route111_MapConnectionsList:: @ 8308974 + connection down, 0, MauvilleCity + connection left, 0, Route113 + connection left, 20, Route112 + +Route111_MapConnections:: @ 8308998 + .4byte 0x3 + .4byte Route111_MapConnectionsList diff --git a/data/maps/Route111/connections.s b/data/maps/Route111/connections.s deleted file mode 100644 index 411dea34b..000000000 --- a/data/maps/Route111/connections.s +++ /dev/null @@ -1,8 +0,0 @@ -Route111_MapConnectionsList:: @ 8308974 - connection down, 0, MauvilleCity - connection left, 0, Route113 - connection left, 20, Route112 - -Route111_MapConnections:: @ 8308998 - .4byte 0x3 - .4byte Route111_MapConnectionsList diff --git a/data/maps/Route111/header.inc b/data/maps/Route111/header.inc new file mode 100644 index 000000000..5af1fb1c2 --- /dev/null +++ b/data/maps/Route111/header.inc @@ -0,0 +1,14 @@ +Route111:: @ 8305720 + .4byte Route111_MapAttributes + .4byte Route111_MapEvents + .4byte Route111_MapScripts + .4byte Route111_MapConnections + .2byte BGM_DOORO_X1 + .2byte 27 + .byte 26 + .byte 0 + .byte 2 + .byte 3 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/Route111/header.s b/data/maps/Route111/header.s deleted file mode 100644 index 5af1fb1c2..000000000 --- a/data/maps/Route111/header.s +++ /dev/null @@ -1,14 +0,0 @@ -Route111:: @ 8305720 - .4byte Route111_MapAttributes - .4byte Route111_MapEvents - .4byte Route111_MapScripts - .4byte Route111_MapConnections - .2byte BGM_DOORO_X1 - .2byte 27 - .byte 26 - .byte 0 - .byte 2 - .byte 3 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/Route111_OldLadysRestStop/header.inc b/data/maps/Route111_OldLadysRestStop/header.inc new file mode 100644 index 000000000..23f4959a3 --- /dev/null +++ b/data/maps/Route111_OldLadysRestStop/header.inc @@ -0,0 +1,14 @@ +Route111_OldLadysRestStop:: @ 8306C74 + .4byte Route111_OldLadysRestStop_MapAttributes + .4byte Route111_OldLadysRestStop_MapEvents + .4byte Route111_OldLadysRestStop_MapScripts + .4byte 0x0 + .2byte BGM_GOTOWN + .2byte 64 + .byte 26 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/Route111_OldLadysRestStop/header.s b/data/maps/Route111_OldLadysRestStop/header.s deleted file mode 100644 index 23f4959a3..000000000 --- a/data/maps/Route111_OldLadysRestStop/header.s +++ /dev/null @@ -1,14 +0,0 @@ -Route111_OldLadysRestStop:: @ 8306C74 - .4byte Route111_OldLadysRestStop_MapAttributes - .4byte Route111_OldLadysRestStop_MapEvents - .4byte Route111_OldLadysRestStop_MapScripts - .4byte 0x0 - .2byte BGM_GOTOWN - .2byte 64 - .byte 26 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/Route111_WinstrateFamilysHouse/header.inc b/data/maps/Route111_WinstrateFamilysHouse/header.inc new file mode 100644 index 000000000..d7333f070 --- /dev/null +++ b/data/maps/Route111_WinstrateFamilysHouse/header.inc @@ -0,0 +1,14 @@ +Route111_WinstrateFamilysHouse:: @ 8306C58 + .4byte House2_MapAttributes + .4byte Route111_WinstrateFamilysHouse_MapEvents + .4byte Route111_WinstrateFamilysHouse_MapScripts + .4byte 0x0 + .2byte BGM_GOTOWN + .2byte 60 + .byte 26 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/Route111_WinstrateFamilysHouse/header.s b/data/maps/Route111_WinstrateFamilysHouse/header.s deleted file mode 100644 index d7333f070..000000000 --- a/data/maps/Route111_WinstrateFamilysHouse/header.s +++ /dev/null @@ -1,14 +0,0 @@ -Route111_WinstrateFamilysHouse:: @ 8306C58 - .4byte House2_MapAttributes - .4byte Route111_WinstrateFamilysHouse_MapEvents - .4byte Route111_WinstrateFamilysHouse_MapScripts - .4byte 0x0 - .2byte BGM_GOTOWN - .2byte 60 - .byte 26 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/Route112/connections.inc b/data/maps/Route112/connections.inc new file mode 100644 index 000000000..eee04163c --- /dev/null +++ b/data/maps/Route112/connections.inc @@ -0,0 +1,8 @@ +Route112_MapConnectionsList:: @ 83089A0 + connection up, -60, Route113 + connection left, 40, LavaridgeTown + connection right, -20, Route111 + +Route112_MapConnections:: @ 83089C4 + .4byte 0x3 + .4byte Route112_MapConnectionsList diff --git a/data/maps/Route112/connections.s b/data/maps/Route112/connections.s deleted file mode 100644 index eee04163c..000000000 --- a/data/maps/Route112/connections.s +++ /dev/null @@ -1,8 +0,0 @@ -Route112_MapConnectionsList:: @ 83089A0 - connection up, -60, Route113 - connection left, 40, LavaridgeTown - connection right, -20, Route111 - -Route112_MapConnections:: @ 83089C4 - .4byte 0x3 - .4byte Route112_MapConnectionsList diff --git a/data/maps/Route112/header.inc b/data/maps/Route112/header.inc new file mode 100644 index 000000000..f798451d6 --- /dev/null +++ b/data/maps/Route112/header.inc @@ -0,0 +1,14 @@ +Route112:: @ 830573C + .4byte Route112_MapAttributes + .4byte Route112_MapEvents + .4byte Route112_MapScripts + .4byte Route112_MapConnections + .2byte BGM_DOORO_X1 + .2byte 28 + .byte 27 + .byte 0 + .byte 2 + .byte 3 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/Route112/header.s b/data/maps/Route112/header.s deleted file mode 100644 index f798451d6..000000000 --- a/data/maps/Route112/header.s +++ /dev/null @@ -1,14 +0,0 @@ -Route112:: @ 830573C - .4byte Route112_MapAttributes - .4byte Route112_MapEvents - .4byte Route112_MapScripts - .4byte Route112_MapConnections - .2byte BGM_DOORO_X1 - .2byte 28 - .byte 27 - .byte 0 - .byte 2 - .byte 3 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/Route112_CableCarStation/header.inc b/data/maps/Route112_CableCarStation/header.inc new file mode 100644 index 000000000..3d025fb7b --- /dev/null +++ b/data/maps/Route112_CableCarStation/header.inc @@ -0,0 +1,14 @@ +Route112_CableCarStation:: @ 8306C90 + .4byte Route112_CableCarStation_MapAttributes + .4byte Route112_CableCarStation_MapEvents + .4byte Route112_CableCarStation_MapScripts + .4byte 0x0 + .2byte BGM_DOORO_X1 + .2byte 119 + .byte 27 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/Route112_CableCarStation/header.s b/data/maps/Route112_CableCarStation/header.s deleted file mode 100644 index 3d025fb7b..000000000 --- a/data/maps/Route112_CableCarStation/header.s +++ /dev/null @@ -1,14 +0,0 @@ -Route112_CableCarStation:: @ 8306C90 - .4byte Route112_CableCarStation_MapAttributes - .4byte Route112_CableCarStation_MapEvents - .4byte Route112_CableCarStation_MapScripts - .4byte 0x0 - .2byte BGM_DOORO_X1 - .2byte 119 - .byte 27 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/Route113/connections.inc b/data/maps/Route113/connections.inc new file mode 100644 index 000000000..ffa7b231d --- /dev/null +++ b/data/maps/Route113/connections.inc @@ -0,0 +1,8 @@ +Route113_MapConnectionsList:: @ 83089CC + connection down, 60, Route112 + connection left, 0, FallarborTown + connection right, 0, Route111 + +Route113_MapConnections:: @ 83089F0 + .4byte 0x3 + .4byte Route113_MapConnectionsList diff --git a/data/maps/Route113/connections.s b/data/maps/Route113/connections.s deleted file mode 100644 index ffa7b231d..000000000 --- a/data/maps/Route113/connections.s +++ /dev/null @@ -1,8 +0,0 @@ -Route113_MapConnectionsList:: @ 83089CC - connection down, 60, Route112 - connection left, 0, FallarborTown - connection right, 0, Route111 - -Route113_MapConnections:: @ 83089F0 - .4byte 0x3 - .4byte Route113_MapConnectionsList diff --git a/data/maps/Route113/header.inc b/data/maps/Route113/header.inc new file mode 100644 index 000000000..5792f97c3 --- /dev/null +++ b/data/maps/Route113/header.inc @@ -0,0 +1,14 @@ +Route113:: @ 8305758 + .4byte Route113_MapAttributes + .4byte Route113_MapEvents + .4byte Route113_MapScripts + .4byte Route113_MapConnections + .2byte BGM_KAZANBAI + .2byte 29 + .byte 28 + .byte 0 + .byte 2 + .byte 3 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/Route113/header.s b/data/maps/Route113/header.s deleted file mode 100644 index 5792f97c3..000000000 --- a/data/maps/Route113/header.s +++ /dev/null @@ -1,14 +0,0 @@ -Route113:: @ 8305758 - .4byte Route113_MapAttributes - .4byte Route113_MapEvents - .4byte Route113_MapScripts - .4byte Route113_MapConnections - .2byte BGM_KAZANBAI - .2byte 29 - .byte 28 - .byte 0 - .byte 2 - .byte 3 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/Route113_GlassWorkshop/header.inc b/data/maps/Route113_GlassWorkshop/header.inc new file mode 100644 index 000000000..a8bfdd35d --- /dev/null +++ b/data/maps/Route113_GlassWorkshop/header.inc @@ -0,0 +1,14 @@ +Route113_GlassWorkshop:: @ 8307EB8 + .4byte Route113_GlassWorkshop_MapAttributes + .4byte Route113_GlassWorkshop_MapEvents + .4byte Route113_GlassWorkshop_MapScripts + .4byte 0x0 + .2byte BGM_GOTOWN + .2byte 67 + .byte 28 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/Route113_GlassWorkshop/header.s b/data/maps/Route113_GlassWorkshop/header.s deleted file mode 100644 index a8bfdd35d..000000000 --- a/data/maps/Route113_GlassWorkshop/header.s +++ /dev/null @@ -1,14 +0,0 @@ -Route113_GlassWorkshop:: @ 8307EB8 - .4byte Route113_GlassWorkshop_MapAttributes - .4byte Route113_GlassWorkshop_MapEvents - .4byte Route113_GlassWorkshop_MapScripts - .4byte 0x0 - .2byte BGM_GOTOWN - .2byte 67 - .byte 28 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/Route114/connections.inc b/data/maps/Route114/connections.inc new file mode 100644 index 000000000..603c5e4b1 --- /dev/null +++ b/data/maps/Route114/connections.inc @@ -0,0 +1,7 @@ +Route114_MapConnectionsList:: @ 83089F8 + connection left, 40, Route115 + connection right, 0, FallarborTown + +Route114_MapConnections:: @ 8308A10 + .4byte 0x2 + .4byte Route114_MapConnectionsList diff --git a/data/maps/Route114/connections.s b/data/maps/Route114/connections.s deleted file mode 100644 index 603c5e4b1..000000000 --- a/data/maps/Route114/connections.s +++ /dev/null @@ -1,7 +0,0 @@ -Route114_MapConnectionsList:: @ 83089F8 - connection left, 40, Route115 - connection right, 0, FallarborTown - -Route114_MapConnections:: @ 8308A10 - .4byte 0x2 - .4byte Route114_MapConnectionsList diff --git a/data/maps/Route114/header.inc b/data/maps/Route114/header.inc new file mode 100644 index 000000000..cfb5f4114 --- /dev/null +++ b/data/maps/Route114/header.inc @@ -0,0 +1,14 @@ +Route114:: @ 8305774 + .4byte Route114_MapAttributes + .4byte Route114_MapEvents + .4byte Route114_MapScripts + .4byte Route114_MapConnections + .2byte BGM_DOORO_X1 + .2byte 30 + .byte 29 + .byte 0 + .byte 2 + .byte 3 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/Route114/header.s b/data/maps/Route114/header.s deleted file mode 100644 index cfb5f4114..000000000 --- a/data/maps/Route114/header.s +++ /dev/null @@ -1,14 +0,0 @@ -Route114:: @ 8305774 - .4byte Route114_MapAttributes - .4byte Route114_MapEvents - .4byte Route114_MapScripts - .4byte Route114_MapConnections - .2byte BGM_DOORO_X1 - .2byte 30 - .byte 29 - .byte 0 - .byte 2 - .byte 3 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/Route114_FossilManiacsHouse/header.inc b/data/maps/Route114_FossilManiacsHouse/header.inc new file mode 100644 index 000000000..2da95c284 --- /dev/null +++ b/data/maps/Route114_FossilManiacsHouse/header.inc @@ -0,0 +1,14 @@ +Route114_FossilManiacsHouse:: @ 8306CC8 + .4byte Route114_FossilManiacsHouse_MapAttributes + .4byte Route114_FossilManiacsHouse_MapEvents + .4byte Route114_FossilManiacsHouse_MapScripts + .4byte 0x0 + .2byte BGM_TONEKUSA + .2byte 120 + .byte 29 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/Route114_FossilManiacsHouse/header.s b/data/maps/Route114_FossilManiacsHouse/header.s deleted file mode 100644 index 2da95c284..000000000 --- a/data/maps/Route114_FossilManiacsHouse/header.s +++ /dev/null @@ -1,14 +0,0 @@ -Route114_FossilManiacsHouse:: @ 8306CC8 - .4byte Route114_FossilManiacsHouse_MapAttributes - .4byte Route114_FossilManiacsHouse_MapEvents - .4byte Route114_FossilManiacsHouse_MapScripts - .4byte 0x0 - .2byte BGM_TONEKUSA - .2byte 120 - .byte 29 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/Route114_FossilManiacsTunnel/header.inc b/data/maps/Route114_FossilManiacsTunnel/header.inc new file mode 100644 index 000000000..b410c822c --- /dev/null +++ b/data/maps/Route114_FossilManiacsTunnel/header.inc @@ -0,0 +1,14 @@ +Route114_FossilManiacsTunnel:: @ 8306CE4 + .4byte Route114_FossilManiacsTunnel_MapAttributes + .4byte Route114_FossilManiacsTunnel_MapEvents + .4byte Route114_FossilManiacsTunnel_MapScripts + .4byte 0x0 + .2byte BGM_TONEKUSA + .2byte 121 + .byte 29 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/Route114_FossilManiacsTunnel/header.s b/data/maps/Route114_FossilManiacsTunnel/header.s deleted file mode 100644 index b410c822c..000000000 --- a/data/maps/Route114_FossilManiacsTunnel/header.s +++ /dev/null @@ -1,14 +0,0 @@ -Route114_FossilManiacsTunnel:: @ 8306CE4 - .4byte Route114_FossilManiacsTunnel_MapAttributes - .4byte Route114_FossilManiacsTunnel_MapEvents - .4byte Route114_FossilManiacsTunnel_MapScripts - .4byte 0x0 - .2byte BGM_TONEKUSA - .2byte 121 - .byte 29 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/Route114_LanettesHouse/header.inc b/data/maps/Route114_LanettesHouse/header.inc new file mode 100644 index 000000000..a5b7eea50 --- /dev/null +++ b/data/maps/Route114_LanettesHouse/header.inc @@ -0,0 +1,14 @@ +Route114_LanettesHouse:: @ 8306D00 + .4byte Route114_LanettesHouse_MapAttributes + .4byte Route114_LanettesHouse_MapEvents + .4byte Route114_LanettesHouse_MapScripts + .4byte 0x0 + .2byte BGM_TONEKUSA + .2byte 122 + .byte 29 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/Route114_LanettesHouse/header.s b/data/maps/Route114_LanettesHouse/header.s deleted file mode 100644 index a5b7eea50..000000000 --- a/data/maps/Route114_LanettesHouse/header.s +++ /dev/null @@ -1,14 +0,0 @@ -Route114_LanettesHouse:: @ 8306D00 - .4byte Route114_LanettesHouse_MapAttributes - .4byte Route114_LanettesHouse_MapEvents - .4byte Route114_LanettesHouse_MapScripts - .4byte 0x0 - .2byte BGM_TONEKUSA - .2byte 122 - .byte 29 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/Route115/connections.inc b/data/maps/Route115/connections.inc new file mode 100644 index 000000000..3886f114f --- /dev/null +++ b/data/maps/Route115/connections.inc @@ -0,0 +1,7 @@ +Route115_MapConnectionsList:: @ 8308A18 + connection down, 0, RustboroCity + connection right, -40, Route114 + +Route115_MapConnections:: @ 8308A30 + .4byte 0x2 + .4byte Route115_MapConnectionsList diff --git a/data/maps/Route115/connections.s b/data/maps/Route115/connections.s deleted file mode 100644 index 3886f114f..000000000 --- a/data/maps/Route115/connections.s +++ /dev/null @@ -1,7 +0,0 @@ -Route115_MapConnectionsList:: @ 8308A18 - connection down, 0, RustboroCity - connection right, -40, Route114 - -Route115_MapConnections:: @ 8308A30 - .4byte 0x2 - .4byte Route115_MapConnectionsList diff --git a/data/maps/Route115/header.inc b/data/maps/Route115/header.inc new file mode 100644 index 000000000..b11134e28 --- /dev/null +++ b/data/maps/Route115/header.inc @@ -0,0 +1,14 @@ +Route115:: @ 8305790 + .4byte Route115_MapAttributes + .4byte Route115_MapEvents + .4byte Route115_MapScripts + .4byte Route115_MapConnections + .2byte BGM_NEXTROAD + .2byte 31 + .byte 30 + .byte 0 + .byte 2 + .byte 3 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/Route115/header.s b/data/maps/Route115/header.s deleted file mode 100644 index b11134e28..000000000 --- a/data/maps/Route115/header.s +++ /dev/null @@ -1,14 +0,0 @@ -Route115:: @ 8305790 - .4byte Route115_MapAttributes - .4byte Route115_MapEvents - .4byte Route115_MapScripts - .4byte Route115_MapConnections - .2byte BGM_NEXTROAD - .2byte 31 - .byte 30 - .byte 0 - .byte 2 - .byte 3 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/Route116/connections.inc b/data/maps/Route116/connections.inc new file mode 100644 index 000000000..787314054 --- /dev/null +++ b/data/maps/Route116/connections.inc @@ -0,0 +1,7 @@ +Route116_MapConnectionsList:: @ 8308A38 + connection down, 80, VerdanturfTown + connection left, 0, RustboroCity + +Route116_MapConnections:: @ 8308A50 + .4byte 0x2 + .4byte Route116_MapConnectionsList diff --git a/data/maps/Route116/connections.s b/data/maps/Route116/connections.s deleted file mode 100644 index 787314054..000000000 --- a/data/maps/Route116/connections.s +++ /dev/null @@ -1,7 +0,0 @@ -Route116_MapConnectionsList:: @ 8308A38 - connection down, 80, VerdanturfTown - connection left, 0, RustboroCity - -Route116_MapConnections:: @ 8308A50 - .4byte 0x2 - .4byte Route116_MapConnectionsList diff --git a/data/maps/Route116/header.inc b/data/maps/Route116/header.inc new file mode 100644 index 000000000..f4e145bf1 --- /dev/null +++ b/data/maps/Route116/header.inc @@ -0,0 +1,14 @@ +Route116:: @ 83057AC + .4byte Route116_MapAttributes + .4byte Route116_MapEvents + .4byte Route116_MapScripts + .4byte Route116_MapConnections + .2byte BGM_NEXTROAD + .2byte 32 + .byte 31 + .byte 0 + .byte 2 + .byte 3 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/Route116/header.s b/data/maps/Route116/header.s deleted file mode 100644 index f4e145bf1..000000000 --- a/data/maps/Route116/header.s +++ /dev/null @@ -1,14 +0,0 @@ -Route116:: @ 83057AC - .4byte Route116_MapAttributes - .4byte Route116_MapEvents - .4byte Route116_MapScripts - .4byte Route116_MapConnections - .2byte BGM_NEXTROAD - .2byte 32 - .byte 31 - .byte 0 - .byte 2 - .byte 3 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/Route116_TunnelersRestHouse/header.inc b/data/maps/Route116_TunnelersRestHouse/header.inc new file mode 100644 index 000000000..a52c6cada --- /dev/null +++ b/data/maps/Route116_TunnelersRestHouse/header.inc @@ -0,0 +1,14 @@ +Route116_TunnelersRestHouse:: @ 8306D1C + .4byte Route116_TunnelersRestHouse_MapAttributes + .4byte Route116_TunnelersRestHouse_MapEvents + .4byte Route116_TunnelersRestHouse_MapScripts + .4byte 0x0 + .2byte BGM_GOTOWN + .2byte 123 + .byte 31 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/Route116_TunnelersRestHouse/header.s b/data/maps/Route116_TunnelersRestHouse/header.s deleted file mode 100644 index a52c6cada..000000000 --- a/data/maps/Route116_TunnelersRestHouse/header.s +++ /dev/null @@ -1,14 +0,0 @@ -Route116_TunnelersRestHouse:: @ 8306D1C - .4byte Route116_TunnelersRestHouse_MapAttributes - .4byte Route116_TunnelersRestHouse_MapEvents - .4byte Route116_TunnelersRestHouse_MapScripts - .4byte 0x0 - .2byte BGM_GOTOWN - .2byte 123 - .byte 31 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/Route117/connections.inc b/data/maps/Route117/connections.inc new file mode 100644 index 000000000..2de505e01 --- /dev/null +++ b/data/maps/Route117/connections.inc @@ -0,0 +1,7 @@ +Route117_MapConnectionsList:: @ 8308A58 + connection left, 0, VerdanturfTown + connection right, 0, MauvilleCity + +Route117_MapConnections:: @ 8308A70 + .4byte 0x2 + .4byte Route117_MapConnectionsList diff --git a/data/maps/Route117/connections.s b/data/maps/Route117/connections.s deleted file mode 100644 index 2de505e01..000000000 --- a/data/maps/Route117/connections.s +++ /dev/null @@ -1,7 +0,0 @@ -Route117_MapConnectionsList:: @ 8308A58 - connection left, 0, VerdanturfTown - connection right, 0, MauvilleCity - -Route117_MapConnections:: @ 8308A70 - .4byte 0x2 - .4byte Route117_MapConnectionsList diff --git a/data/maps/Route117/header.inc b/data/maps/Route117/header.inc new file mode 100644 index 000000000..9649f4728 --- /dev/null +++ b/data/maps/Route117/header.inc @@ -0,0 +1,14 @@ +Route117:: @ 83057C8 + .4byte Route117_MapAttributes + .4byte Route117_MapEvents + .4byte Route117_MapScripts + .4byte Route117_MapConnections + .2byte BGM_DOORO_X1 + .2byte 33 + .byte 32 + .byte 0 + .byte 2 + .byte 3 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/Route117/header.s b/data/maps/Route117/header.s deleted file mode 100644 index 9649f4728..000000000 --- a/data/maps/Route117/header.s +++ /dev/null @@ -1,14 +0,0 @@ -Route117:: @ 83057C8 - .4byte Route117_MapAttributes - .4byte Route117_MapEvents - .4byte Route117_MapScripts - .4byte Route117_MapConnections - .2byte BGM_DOORO_X1 - .2byte 33 - .byte 32 - .byte 0 - .byte 2 - .byte 3 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/Route117_PokemonDayCare/header.inc b/data/maps/Route117_PokemonDayCare/header.inc new file mode 100644 index 000000000..567819b48 --- /dev/null +++ b/data/maps/Route117_PokemonDayCare/header.inc @@ -0,0 +1,14 @@ +Route117_PokemonDayCare:: @ 8306D38 + .4byte Route117_PokemonDayCare_MapAttributes + .4byte Route117_PokemonDayCare_MapEvents + .4byte Route117_PokemonDayCare_MapScripts + .4byte 0x0 + .2byte BGM_GOTOWN + .2byte 124 + .byte 32 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/Route117_PokemonDayCare/header.s b/data/maps/Route117_PokemonDayCare/header.s deleted file mode 100644 index 567819b48..000000000 --- a/data/maps/Route117_PokemonDayCare/header.s +++ /dev/null @@ -1,14 +0,0 @@ -Route117_PokemonDayCare:: @ 8306D38 - .4byte Route117_PokemonDayCare_MapAttributes - .4byte Route117_PokemonDayCare_MapEvents - .4byte Route117_PokemonDayCare_MapScripts - .4byte 0x0 - .2byte BGM_GOTOWN - .2byte 124 - .byte 32 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/Route118/connections.inc b/data/maps/Route118/connections.inc new file mode 100644 index 000000000..764071baf --- /dev/null +++ b/data/maps/Route118/connections.inc @@ -0,0 +1,8 @@ +Route118_MapConnectionsList:: @ 8308A78 + connection up, 40, Route119 + connection left, 0, MauvilleCity + connection right, 0, Route123 + +Route118_MapConnections:: @ 8308A9C + .4byte 0x3 + .4byte Route118_MapConnectionsList diff --git a/data/maps/Route118/connections.s b/data/maps/Route118/connections.s deleted file mode 100644 index 764071baf..000000000 --- a/data/maps/Route118/connections.s +++ /dev/null @@ -1,8 +0,0 @@ -Route118_MapConnectionsList:: @ 8308A78 - connection up, 40, Route119 - connection left, 0, MauvilleCity - connection right, 0, Route123 - -Route118_MapConnections:: @ 8308A9C - .4byte 0x3 - .4byte Route118_MapConnectionsList diff --git a/data/maps/Route118/header.inc b/data/maps/Route118/header.inc new file mode 100644 index 000000000..5b1190621 --- /dev/null +++ b/data/maps/Route118/header.inc @@ -0,0 +1,14 @@ +Route118:: @ 83057E4 + .4byte Route118_MapAttributes + .4byte Route118_MapEvents + .4byte Route118_MapScripts + .4byte Route118_MapConnections + .2byte BGM_ROUTE_118 + .2byte 34 + .byte 33 + .byte 0 + .byte 2 + .byte 3 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/Route118/header.s b/data/maps/Route118/header.s deleted file mode 100644 index 5b1190621..000000000 --- a/data/maps/Route118/header.s +++ /dev/null @@ -1,14 +0,0 @@ -Route118:: @ 83057E4 - .4byte Route118_MapAttributes - .4byte Route118_MapEvents - .4byte Route118_MapScripts - .4byte Route118_MapConnections - .2byte BGM_ROUTE_118 - .2byte 34 - .byte 33 - .byte 0 - .byte 2 - .byte 3 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/Route119/connections.inc b/data/maps/Route119/connections.inc new file mode 100644 index 000000000..26ce12a01 --- /dev/null +++ b/data/maps/Route119/connections.inc @@ -0,0 +1,7 @@ +Route119_MapConnectionsList:: @ 8308AA4 + connection down, -40, Route118 + connection right, 0, FortreeCity + +Route119_MapConnections:: @ 8308ABC + .4byte 0x2 + .4byte Route119_MapConnectionsList diff --git a/data/maps/Route119/connections.s b/data/maps/Route119/connections.s deleted file mode 100644 index 26ce12a01..000000000 --- a/data/maps/Route119/connections.s +++ /dev/null @@ -1,7 +0,0 @@ -Route119_MapConnectionsList:: @ 8308AA4 - connection down, -40, Route118 - connection right, 0, FortreeCity - -Route119_MapConnections:: @ 8308ABC - .4byte 0x2 - .4byte Route119_MapConnectionsList diff --git a/data/maps/Route119/header.inc b/data/maps/Route119/header.inc new file mode 100644 index 000000000..ef5887676 --- /dev/null +++ b/data/maps/Route119/header.inc @@ -0,0 +1,14 @@ +Route119:: @ 8305800 + .4byte Route119_MapAttributes + .4byte Route119_MapEvents + .4byte Route119_MapScripts + .4byte Route119_MapConnections + .2byte BGM_GRANROAD + .2byte 35 + .byte 34 + .byte 0 + .byte 2 + .byte 3 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/Route119/header.s b/data/maps/Route119/header.s deleted file mode 100644 index ef5887676..000000000 --- a/data/maps/Route119/header.s +++ /dev/null @@ -1,14 +0,0 @@ -Route119:: @ 8305800 - .4byte Route119_MapAttributes - .4byte Route119_MapEvents - .4byte Route119_MapScripts - .4byte Route119_MapConnections - .2byte BGM_GRANROAD - .2byte 35 - .byte 34 - .byte 0 - .byte 2 - .byte 3 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/Route119_House/header.inc b/data/maps/Route119_House/header.inc new file mode 100644 index 000000000..d64c4b804 --- /dev/null +++ b/data/maps/Route119_House/header.inc @@ -0,0 +1,14 @@ +Route119_House:: @ 8307F28 + .4byte House1_MapAttributes + .4byte Route119_House_MapEvents + .4byte Route119_House_MapScripts + .4byte 0x0 + .2byte BGM_GOTOWN + .2byte 59 + .byte 34 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/Route119_House/header.s b/data/maps/Route119_House/header.s deleted file mode 100644 index d64c4b804..000000000 --- a/data/maps/Route119_House/header.s +++ /dev/null @@ -1,14 +0,0 @@ -Route119_House:: @ 8307F28 - .4byte House1_MapAttributes - .4byte Route119_House_MapEvents - .4byte Route119_House_MapScripts - .4byte 0x0 - .2byte BGM_GOTOWN - .2byte 59 - .byte 34 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/Route119_WeatherInstitute_1F/header.inc b/data/maps/Route119_WeatherInstitute_1F/header.inc new file mode 100644 index 000000000..b392fbc41 --- /dev/null +++ b/data/maps/Route119_WeatherInstitute_1F/header.inc @@ -0,0 +1,14 @@ +Route119_WeatherInstitute_1F:: @ 8307EF0 + .4byte Route119_WeatherInstitute_1F_MapAttributes + .4byte Route119_WeatherInstitute_1F_MapEvents + .4byte Route119_WeatherInstitute_1F_MapScripts + .4byte 0x0 + .2byte BGM_GOTOWN + .2byte 272 + .byte 34 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/Route119_WeatherInstitute_1F/header.s b/data/maps/Route119_WeatherInstitute_1F/header.s deleted file mode 100644 index b392fbc41..000000000 --- a/data/maps/Route119_WeatherInstitute_1F/header.s +++ /dev/null @@ -1,14 +0,0 @@ -Route119_WeatherInstitute_1F:: @ 8307EF0 - .4byte Route119_WeatherInstitute_1F_MapAttributes - .4byte Route119_WeatherInstitute_1F_MapEvents - .4byte Route119_WeatherInstitute_1F_MapScripts - .4byte 0x0 - .2byte BGM_GOTOWN - .2byte 272 - .byte 34 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/Route119_WeatherInstitute_2F/header.inc b/data/maps/Route119_WeatherInstitute_2F/header.inc new file mode 100644 index 000000000..9a5c3d9d8 --- /dev/null +++ b/data/maps/Route119_WeatherInstitute_2F/header.inc @@ -0,0 +1,14 @@ +Route119_WeatherInstitute_2F:: @ 8307F0C + .4byte Route119_WeatherInstitute_2F_MapAttributes + .4byte Route119_WeatherInstitute_2F_MapEvents + .4byte Route119_WeatherInstitute_2F_MapScripts + .4byte 0x0 + .2byte BGM_GOTOWN + .2byte 273 + .byte 34 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/Route119_WeatherInstitute_2F/header.s b/data/maps/Route119_WeatherInstitute_2F/header.s deleted file mode 100644 index 9a5c3d9d8..000000000 --- a/data/maps/Route119_WeatherInstitute_2F/header.s +++ /dev/null @@ -1,14 +0,0 @@ -Route119_WeatherInstitute_2F:: @ 8307F0C - .4byte Route119_WeatherInstitute_2F_MapAttributes - .4byte Route119_WeatherInstitute_2F_MapEvents - .4byte Route119_WeatherInstitute_2F_MapScripts - .4byte 0x0 - .2byte BGM_GOTOWN - .2byte 273 - .byte 34 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/Route120/connections.inc b/data/maps/Route120/connections.inc new file mode 100644 index 000000000..a0f747c68 --- /dev/null +++ b/data/maps/Route120/connections.inc @@ -0,0 +1,7 @@ +Route120_MapConnectionsList:: @ 8308AC4 + connection left, 0, FortreeCity + connection right, 80, Route121 + +Route120_MapConnections:: @ 8308ADC + .4byte 0x2 + .4byte Route120_MapConnectionsList diff --git a/data/maps/Route120/connections.s b/data/maps/Route120/connections.s deleted file mode 100644 index a0f747c68..000000000 --- a/data/maps/Route120/connections.s +++ /dev/null @@ -1,7 +0,0 @@ -Route120_MapConnectionsList:: @ 8308AC4 - connection left, 0, FortreeCity - connection right, 80, Route121 - -Route120_MapConnections:: @ 8308ADC - .4byte 0x2 - .4byte Route120_MapConnectionsList diff --git a/data/maps/Route120/header.inc b/data/maps/Route120/header.inc new file mode 100644 index 000000000..3f8be7e95 --- /dev/null +++ b/data/maps/Route120/header.inc @@ -0,0 +1,14 @@ +Route120:: @ 830581C + .4byte Route120_MapAttributes + .4byte Route120_MapEvents + .4byte Route120_MapScripts + .4byte Route120_MapConnections + .2byte BGM_DOORO_X3 + .2byte 36 + .byte 35 + .byte 0 + .byte 2 + .byte 3 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/Route120/header.s b/data/maps/Route120/header.s deleted file mode 100644 index 3f8be7e95..000000000 --- a/data/maps/Route120/header.s +++ /dev/null @@ -1,14 +0,0 @@ -Route120:: @ 830581C - .4byte Route120_MapAttributes - .4byte Route120_MapEvents - .4byte Route120_MapScripts - .4byte Route120_MapConnections - .2byte BGM_DOORO_X3 - .2byte 36 - .byte 35 - .byte 0 - .byte 2 - .byte 3 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/Route121/connections.inc b/data/maps/Route121/connections.inc new file mode 100644 index 000000000..a77f1b828 --- /dev/null +++ b/data/maps/Route121/connections.inc @@ -0,0 +1,8 @@ +Route121_MapConnectionsList:: @ 8308AE4 + connection down, 20, Route122 + connection left, -80, Route120 + connection right, -10, LilycoveCity + +Route121_MapConnections:: @ 8308B08 + .4byte 0x3 + .4byte Route121_MapConnectionsList diff --git a/data/maps/Route121/connections.s b/data/maps/Route121/connections.s deleted file mode 100644 index a77f1b828..000000000 --- a/data/maps/Route121/connections.s +++ /dev/null @@ -1,8 +0,0 @@ -Route121_MapConnectionsList:: @ 8308AE4 - connection down, 20, Route122 - connection left, -80, Route120 - connection right, -10, LilycoveCity - -Route121_MapConnections:: @ 8308B08 - .4byte 0x3 - .4byte Route121_MapConnectionsList diff --git a/data/maps/Route121/header.inc b/data/maps/Route121/header.inc new file mode 100644 index 000000000..ba2c3d2da --- /dev/null +++ b/data/maps/Route121/header.inc @@ -0,0 +1,14 @@ +Route121:: @ 8305838 + .4byte Route121_MapAttributes + .4byte Route121_MapEvents + .4byte Route121_MapScripts + .4byte Route121_MapConnections + .2byte BGM_DOORO_X3 + .2byte 37 + .byte 36 + .byte 0 + .byte 2 + .byte 3 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/Route121/header.s b/data/maps/Route121/header.s deleted file mode 100644 index ba2c3d2da..000000000 --- a/data/maps/Route121/header.s +++ /dev/null @@ -1,14 +0,0 @@ -Route121:: @ 8305838 - .4byte Route121_MapAttributes - .4byte Route121_MapEvents - .4byte Route121_MapScripts - .4byte Route121_MapConnections - .2byte BGM_DOORO_X3 - .2byte 37 - .byte 36 - .byte 0 - .byte 2 - .byte 3 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/Route121_SafariZoneEntrance/header.inc b/data/maps/Route121_SafariZoneEntrance/header.inc new file mode 100644 index 000000000..4a0bbe244 --- /dev/null +++ b/data/maps/Route121_SafariZoneEntrance/header.inc @@ -0,0 +1,14 @@ +Route121_SafariZoneEntrance:: @ 8306D54 + .4byte Route121_SafariZoneEntrance_MapAttributes + .4byte Route121_SafariZoneEntrance_MapEvents + .4byte Route121_SafariZoneEntrance_MapScripts + .4byte 0x0 + .2byte BGM_MACHI_S3 + .2byte 125 + .byte 36 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/Route121_SafariZoneEntrance/header.s b/data/maps/Route121_SafariZoneEntrance/header.s deleted file mode 100644 index 4a0bbe244..000000000 --- a/data/maps/Route121_SafariZoneEntrance/header.s +++ /dev/null @@ -1,14 +0,0 @@ -Route121_SafariZoneEntrance:: @ 8306D54 - .4byte Route121_SafariZoneEntrance_MapAttributes - .4byte Route121_SafariZoneEntrance_MapEvents - .4byte Route121_SafariZoneEntrance_MapScripts - .4byte 0x0 - .2byte BGM_MACHI_S3 - .2byte 125 - .byte 36 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/Route122/connections.inc b/data/maps/Route122/connections.inc new file mode 100644 index 000000000..214826c04 --- /dev/null +++ b/data/maps/Route122/connections.inc @@ -0,0 +1,7 @@ +Route122_MapConnectionsList:: @ 8308B10 + connection up, -20, Route121 + connection down, -100, Route123 + +Route122_MapConnections:: @ 8308B28 + .4byte 0x2 + .4byte Route122_MapConnectionsList diff --git a/data/maps/Route122/connections.s b/data/maps/Route122/connections.s deleted file mode 100644 index 214826c04..000000000 --- a/data/maps/Route122/connections.s +++ /dev/null @@ -1,7 +0,0 @@ -Route122_MapConnectionsList:: @ 8308B10 - connection up, -20, Route121 - connection down, -100, Route123 - -Route122_MapConnections:: @ 8308B28 - .4byte 0x2 - .4byte Route122_MapConnectionsList diff --git a/data/maps/Route122/header.inc b/data/maps/Route122/header.inc new file mode 100644 index 000000000..9889cc813 --- /dev/null +++ b/data/maps/Route122/header.inc @@ -0,0 +1,14 @@ +Route122:: @ 8305854 + .4byte Route122_MapAttributes + .4byte Route122_MapEvents + .4byte Route122_MapScripts + .4byte Route122_MapConnections + .2byte BGM_DOORO_X4 + .2byte 38 + .byte 37 + .byte 0 + .byte 2 + .byte 3 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/Route122/header.s b/data/maps/Route122/header.s deleted file mode 100644 index 9889cc813..000000000 --- a/data/maps/Route122/header.s +++ /dev/null @@ -1,14 +0,0 @@ -Route122:: @ 8305854 - .4byte Route122_MapAttributes - .4byte Route122_MapEvents - .4byte Route122_MapScripts - .4byte Route122_MapConnections - .2byte BGM_DOORO_X4 - .2byte 38 - .byte 37 - .byte 0 - .byte 2 - .byte 3 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/Route123/connections.inc b/data/maps/Route123/connections.inc new file mode 100644 index 000000000..cc54683f4 --- /dev/null +++ b/data/maps/Route123/connections.inc @@ -0,0 +1,7 @@ +Route123_MapConnectionsList:: @ 8308B30 + connection up, 100, Route122 + connection left, 0, Route118 + +Route123_MapConnections:: @ 8308B48 + .4byte 0x2 + .4byte Route123_MapConnectionsList diff --git a/data/maps/Route123/connections.s b/data/maps/Route123/connections.s deleted file mode 100644 index cc54683f4..000000000 --- a/data/maps/Route123/connections.s +++ /dev/null @@ -1,7 +0,0 @@ -Route123_MapConnectionsList:: @ 8308B30 - connection up, 100, Route122 - connection left, 0, Route118 - -Route123_MapConnections:: @ 8308B48 - .4byte 0x2 - .4byte Route123_MapConnectionsList diff --git a/data/maps/Route123/header.inc b/data/maps/Route123/header.inc new file mode 100644 index 000000000..f33ab3e98 --- /dev/null +++ b/data/maps/Route123/header.inc @@ -0,0 +1,14 @@ +Route123:: @ 8305870 + .4byte Route123_MapAttributes + .4byte Route123_MapEvents + .4byte Route123_MapScripts + .4byte Route123_MapConnections + .2byte BGM_DOORO_X4 + .2byte 39 + .byte 38 + .byte 0 + .byte 2 + .byte 3 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/Route123/header.s b/data/maps/Route123/header.s deleted file mode 100644 index f33ab3e98..000000000 --- a/data/maps/Route123/header.s +++ /dev/null @@ -1,14 +0,0 @@ -Route123:: @ 8305870 - .4byte Route123_MapAttributes - .4byte Route123_MapEvents - .4byte Route123_MapScripts - .4byte Route123_MapConnections - .2byte BGM_DOORO_X4 - .2byte 39 - .byte 38 - .byte 0 - .byte 2 - .byte 3 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/Route123_BerryMastersHouse/header.inc b/data/maps/Route123_BerryMastersHouse/header.inc new file mode 100644 index 000000000..0eb77ca2e --- /dev/null +++ b/data/maps/Route123_BerryMastersHouse/header.inc @@ -0,0 +1,14 @@ +Route123_BerryMastersHouse:: @ 8307ED4 + .4byte House2_MapAttributes + .4byte Route123_BerryMastersHouse_MapEvents + .4byte Route123_BerryMastersHouse_MapScripts + .4byte 0x0 + .2byte BGM_GOTOWN + .2byte 60 + .byte 38 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/Route123_BerryMastersHouse/header.s b/data/maps/Route123_BerryMastersHouse/header.s deleted file mode 100644 index 0eb77ca2e..000000000 --- a/data/maps/Route123_BerryMastersHouse/header.s +++ /dev/null @@ -1,14 +0,0 @@ -Route123_BerryMastersHouse:: @ 8307ED4 - .4byte House2_MapAttributes - .4byte Route123_BerryMastersHouse_MapEvents - .4byte Route123_BerryMastersHouse_MapScripts - .4byte 0x0 - .2byte BGM_GOTOWN - .2byte 60 - .byte 38 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/Route124/connections.inc b/data/maps/Route124/connections.inc new file mode 100644 index 000000000..5384926b0 --- /dev/null +++ b/data/maps/Route124/connections.inc @@ -0,0 +1,10 @@ +Route124_MapConnectionsList:: @ 8308B50 + connection down, 0, Route126 + connection left, 10, LilycoveCity + connection right, 0, Route125 + connection right, 40, MossdeepCity + connection dive, 0, Underwater1 + +Route124_MapConnections:: @ 8308B8C + .4byte 0x5 + .4byte Route124_MapConnectionsList diff --git a/data/maps/Route124/connections.s b/data/maps/Route124/connections.s deleted file mode 100644 index 5384926b0..000000000 --- a/data/maps/Route124/connections.s +++ /dev/null @@ -1,10 +0,0 @@ -Route124_MapConnectionsList:: @ 8308B50 - connection down, 0, Route126 - connection left, 10, LilycoveCity - connection right, 0, Route125 - connection right, 40, MossdeepCity - connection dive, 0, Underwater1 - -Route124_MapConnections:: @ 8308B8C - .4byte 0x5 - .4byte Route124_MapConnectionsList diff --git a/data/maps/Route124/header.inc b/data/maps/Route124/header.inc new file mode 100644 index 000000000..6e4466225 --- /dev/null +++ b/data/maps/Route124/header.inc @@ -0,0 +1,14 @@ +Route124:: @ 830588C + .4byte Route124_MapAttributes + .4byte Route124_MapEvents + .4byte Route124_MapScripts + .4byte Route124_MapConnections + .2byte BGM_DOORO_X3 + .2byte 40 + .byte 39 + .byte 0 + .byte 2 + .byte 6 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/Route124/header.s b/data/maps/Route124/header.s deleted file mode 100644 index 6e4466225..000000000 --- a/data/maps/Route124/header.s +++ /dev/null @@ -1,14 +0,0 @@ -Route124:: @ 830588C - .4byte Route124_MapAttributes - .4byte Route124_MapEvents - .4byte Route124_MapScripts - .4byte Route124_MapConnections - .2byte BGM_DOORO_X3 - .2byte 40 - .byte 39 - .byte 0 - .byte 2 - .byte 6 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/header.inc b/data/maps/Route124_DivingTreasureHuntersHouse/header.inc new file mode 100644 index 000000000..472ebc45a --- /dev/null +++ b/data/maps/Route124_DivingTreasureHuntersHouse/header.inc @@ -0,0 +1,14 @@ +Route124_DivingTreasureHuntersHouse:: @ 8307F44 + .4byte Route124_DivingTreasureHuntersHouse_MapAttributes + .4byte Route124_DivingTreasureHuntersHouse_MapEvents + .4byte Route124_DivingTreasureHuntersHouse_MapScripts + .4byte 0x0 + .2byte BGM_MINAMO + .2byte 302 + .byte 39 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/header.s b/data/maps/Route124_DivingTreasureHuntersHouse/header.s deleted file mode 100644 index 472ebc45a..000000000 --- a/data/maps/Route124_DivingTreasureHuntersHouse/header.s +++ /dev/null @@ -1,14 +0,0 @@ -Route124_DivingTreasureHuntersHouse:: @ 8307F44 - .4byte Route124_DivingTreasureHuntersHouse_MapAttributes - .4byte Route124_DivingTreasureHuntersHouse_MapEvents - .4byte Route124_DivingTreasureHuntersHouse_MapScripts - .4byte 0x0 - .2byte BGM_MINAMO - .2byte 302 - .byte 39 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/Route125/connections.inc b/data/maps/Route125/connections.inc new file mode 100644 index 000000000..33b7c705c --- /dev/null +++ b/data/maps/Route125/connections.inc @@ -0,0 +1,7 @@ +Route125_MapConnectionsList:: @ 8308B94 + connection down, 0, MossdeepCity + connection left, 0, Route124 + +Route125_MapConnections:: @ 8308BAC + .4byte 0x2 + .4byte Route125_MapConnectionsList diff --git a/data/maps/Route125/connections.s b/data/maps/Route125/connections.s deleted file mode 100644 index 33b7c705c..000000000 --- a/data/maps/Route125/connections.s +++ /dev/null @@ -1,7 +0,0 @@ -Route125_MapConnectionsList:: @ 8308B94 - connection down, 0, MossdeepCity - connection left, 0, Route124 - -Route125_MapConnections:: @ 8308BAC - .4byte 0x2 - .4byte Route125_MapConnectionsList diff --git a/data/maps/Route125/header.inc b/data/maps/Route125/header.inc new file mode 100644 index 000000000..e7a43a64d --- /dev/null +++ b/data/maps/Route125/header.inc @@ -0,0 +1,14 @@ +Route125:: @ 83058A8 + .4byte Route125_MapAttributes + .4byte Route125_MapEvents + .4byte Route125_MapScripts + .4byte Route125_MapConnections + .2byte BGM_DOORO_X3 + .2byte 41 + .byte 40 + .byte 0 + .byte 2 + .byte 6 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/Route125/header.s b/data/maps/Route125/header.s deleted file mode 100644 index e7a43a64d..000000000 --- a/data/maps/Route125/header.s +++ /dev/null @@ -1,14 +0,0 @@ -Route125:: @ 83058A8 - .4byte Route125_MapAttributes - .4byte Route125_MapEvents - .4byte Route125_MapScripts - .4byte Route125_MapConnections - .2byte BGM_DOORO_X3 - .2byte 41 - .byte 40 - .byte 0 - .byte 2 - .byte 6 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/Route126/connections.inc b/data/maps/Route126/connections.inc new file mode 100644 index 000000000..9ff9688af --- /dev/null +++ b/data/maps/Route126/connections.inc @@ -0,0 +1,8 @@ +Route126_MapConnectionsList:: @ 8308BB4 + connection up, 0, Route124 + connection right, 0, Route127 + connection dive, 0, Underwater2 + +Route126_MapConnections:: @ 8308BD8 + .4byte 0x3 + .4byte Route126_MapConnectionsList diff --git a/data/maps/Route126/connections.s b/data/maps/Route126/connections.s deleted file mode 100644 index 9ff9688af..000000000 --- a/data/maps/Route126/connections.s +++ /dev/null @@ -1,8 +0,0 @@ -Route126_MapConnectionsList:: @ 8308BB4 - connection up, 0, Route124 - connection right, 0, Route127 - connection dive, 0, Underwater2 - -Route126_MapConnections:: @ 8308BD8 - .4byte 0x3 - .4byte Route126_MapConnectionsList diff --git a/data/maps/Route126/header.inc b/data/maps/Route126/header.inc new file mode 100644 index 000000000..a973af531 --- /dev/null +++ b/data/maps/Route126/header.inc @@ -0,0 +1,14 @@ +Route126:: @ 83058C4 + .4byte Route126_MapAttributes + .4byte Route126_MapEvents + .4byte Route126_MapScripts + .4byte Route126_MapConnections + .2byte BGM_DOORO_X3 + .2byte 42 + .byte 41 + .byte 0 + .byte 2 + .byte 6 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/Route126/header.s b/data/maps/Route126/header.s deleted file mode 100644 index a973af531..000000000 --- a/data/maps/Route126/header.s +++ /dev/null @@ -1,14 +0,0 @@ -Route126:: @ 83058C4 - .4byte Route126_MapAttributes - .4byte Route126_MapEvents - .4byte Route126_MapScripts - .4byte Route126_MapConnections - .2byte BGM_DOORO_X3 - .2byte 42 - .byte 41 - .byte 0 - .byte 2 - .byte 6 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/Route127/connections.inc b/data/maps/Route127/connections.inc new file mode 100644 index 000000000..997c98c61 --- /dev/null +++ b/data/maps/Route127/connections.inc @@ -0,0 +1,9 @@ +Route127_MapConnectionsList:: @ 8308BE0 + connection up, 0, MossdeepCity + connection down, 0, Route128 + connection left, 0, Route126 + connection dive, 0, Underwater3 + +Route127_MapConnections:: @ 8308C10 + .4byte 0x4 + .4byte Route127_MapConnectionsList diff --git a/data/maps/Route127/connections.s b/data/maps/Route127/connections.s deleted file mode 100644 index 997c98c61..000000000 --- a/data/maps/Route127/connections.s +++ /dev/null @@ -1,9 +0,0 @@ -Route127_MapConnectionsList:: @ 8308BE0 - connection up, 0, MossdeepCity - connection down, 0, Route128 - connection left, 0, Route126 - connection dive, 0, Underwater3 - -Route127_MapConnections:: @ 8308C10 - .4byte 0x4 - .4byte Route127_MapConnectionsList diff --git a/data/maps/Route127/header.inc b/data/maps/Route127/header.inc new file mode 100644 index 000000000..a9f887a2b --- /dev/null +++ b/data/maps/Route127/header.inc @@ -0,0 +1,14 @@ +Route127:: @ 83058E0 + .4byte Route127_MapAttributes + .4byte Route127_MapEvents + .4byte Route127_MapScripts + .4byte Route127_MapConnections + .2byte BGM_DOORO_X3 + .2byte 43 + .byte 42 + .byte 0 + .byte 2 + .byte 6 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/Route127/header.s b/data/maps/Route127/header.s deleted file mode 100644 index a9f887a2b..000000000 --- a/data/maps/Route127/header.s +++ /dev/null @@ -1,14 +0,0 @@ -Route127:: @ 83058E0 - .4byte Route127_MapAttributes - .4byte Route127_MapEvents - .4byte Route127_MapScripts - .4byte Route127_MapConnections - .2byte BGM_DOORO_X3 - .2byte 43 - .byte 42 - .byte 0 - .byte 2 - .byte 6 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/Route128/connections.inc b/data/maps/Route128/connections.inc new file mode 100644 index 000000000..b187c7f64 --- /dev/null +++ b/data/maps/Route128/connections.inc @@ -0,0 +1,9 @@ +Route128_MapConnectionsList:: @ 8308C18 + connection up, 0, Route127 + connection down, 0, Route129 + connection right, -40, EverGrandeCity + connection dive, 0, Underwater4 + +Route128_MapConnections:: @ 8308C48 + .4byte 0x4 + .4byte Route128_MapConnectionsList diff --git a/data/maps/Route128/connections.s b/data/maps/Route128/connections.s deleted file mode 100644 index b187c7f64..000000000 --- a/data/maps/Route128/connections.s +++ /dev/null @@ -1,9 +0,0 @@ -Route128_MapConnectionsList:: @ 8308C18 - connection up, 0, Route127 - connection down, 0, Route129 - connection right, -40, EverGrandeCity - connection dive, 0, Underwater4 - -Route128_MapConnections:: @ 8308C48 - .4byte 0x4 - .4byte Route128_MapConnectionsList diff --git a/data/maps/Route128/header.inc b/data/maps/Route128/header.inc new file mode 100644 index 000000000..9ecc76fb7 --- /dev/null +++ b/data/maps/Route128/header.inc @@ -0,0 +1,14 @@ +Route128:: @ 83058FC + .4byte Route128_MapAttributes + .4byte Route128_MapEvents + .4byte Route128_MapScripts + .4byte Route128_MapConnections + .2byte BGM_DOORO_X3 + .2byte 44 + .byte 43 + .byte 0 + .byte 2 + .byte 6 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/Route128/header.s b/data/maps/Route128/header.s deleted file mode 100644 index 9ecc76fb7..000000000 --- a/data/maps/Route128/header.s +++ /dev/null @@ -1,14 +0,0 @@ -Route128:: @ 83058FC - .4byte Route128_MapAttributes - .4byte Route128_MapEvents - .4byte Route128_MapScripts - .4byte Route128_MapConnections - .2byte BGM_DOORO_X3 - .2byte 44 - .byte 43 - .byte 0 - .byte 2 - .byte 6 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/Route129/connections.inc b/data/maps/Route129/connections.inc new file mode 100644 index 000000000..7a1db2bc7 --- /dev/null +++ b/data/maps/Route129/connections.inc @@ -0,0 +1,7 @@ +Route129_MapConnectionsList:: @ 8308C50 + connection up, 0, Route128 + connection left, 0, Route130 + +Route129_MapConnections:: @ 8308C68 + .4byte 0x2 + .4byte Route129_MapConnectionsList diff --git a/data/maps/Route129/connections.s b/data/maps/Route129/connections.s deleted file mode 100644 index 7a1db2bc7..000000000 --- a/data/maps/Route129/connections.s +++ /dev/null @@ -1,7 +0,0 @@ -Route129_MapConnectionsList:: @ 8308C50 - connection up, 0, Route128 - connection left, 0, Route130 - -Route129_MapConnections:: @ 8308C68 - .4byte 0x2 - .4byte Route129_MapConnectionsList diff --git a/data/maps/Route129/header.inc b/data/maps/Route129/header.inc new file mode 100644 index 000000000..580d69fc7 --- /dev/null +++ b/data/maps/Route129/header.inc @@ -0,0 +1,14 @@ +Route129:: @ 8305918 + .4byte Route129_MapAttributes + .4byte Route129_MapEvents + .4byte Route129_MapScripts + .4byte Route129_MapConnections + .2byte BGM_GRANROAD + .2byte 45 + .byte 44 + .byte 0 + .byte 2 + .byte 6 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/Route129/header.s b/data/maps/Route129/header.s deleted file mode 100644 index 580d69fc7..000000000 --- a/data/maps/Route129/header.s +++ /dev/null @@ -1,14 +0,0 @@ -Route129:: @ 8305918 - .4byte Route129_MapAttributes - .4byte Route129_MapEvents - .4byte Route129_MapScripts - .4byte Route129_MapConnections - .2byte BGM_GRANROAD - .2byte 45 - .byte 44 - .byte 0 - .byte 2 - .byte 6 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/Route130/connections.inc b/data/maps/Route130/connections.inc new file mode 100644 index 000000000..211eba7f1 --- /dev/null +++ b/data/maps/Route130/connections.inc @@ -0,0 +1,7 @@ +Route130_MapConnectionsList:: @ 8308C70 + connection left, 0, Route131 + connection right, 0, Route129 + +Route130_MapConnections:: @ 8308C88 + .4byte 0x2 + .4byte Route130_MapConnectionsList diff --git a/data/maps/Route130/connections.s b/data/maps/Route130/connections.s deleted file mode 100644 index 211eba7f1..000000000 --- a/data/maps/Route130/connections.s +++ /dev/null @@ -1,7 +0,0 @@ -Route130_MapConnectionsList:: @ 8308C70 - connection left, 0, Route131 - connection right, 0, Route129 - -Route130_MapConnections:: @ 8308C88 - .4byte 0x2 - .4byte Route130_MapConnectionsList diff --git a/data/maps/Route130/header.inc b/data/maps/Route130/header.inc new file mode 100644 index 000000000..a788bf9b5 --- /dev/null +++ b/data/maps/Route130/header.inc @@ -0,0 +1,14 @@ +Route130:: @ 8305934 + .4byte Route130_MapAttributes + .4byte Route130_MapEvents + .4byte Route130_MapScripts + .4byte Route130_MapConnections + .2byte BGM_GRANROAD + .2byte 264 + .byte 45 + .byte 0 + .byte 2 + .byte 6 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/Route130/header.s b/data/maps/Route130/header.s deleted file mode 100644 index a788bf9b5..000000000 --- a/data/maps/Route130/header.s +++ /dev/null @@ -1,14 +0,0 @@ -Route130:: @ 8305934 - .4byte Route130_MapAttributes - .4byte Route130_MapEvents - .4byte Route130_MapScripts - .4byte Route130_MapConnections - .2byte BGM_GRANROAD - .2byte 264 - .byte 45 - .byte 0 - .byte 2 - .byte 6 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/Route131/connections.inc b/data/maps/Route131/connections.inc new file mode 100644 index 000000000..a1b1adff7 --- /dev/null +++ b/data/maps/Route131/connections.inc @@ -0,0 +1,7 @@ +Route131_MapConnectionsList:: @ 8308C90 + connection left, 0, PacifidlogTown + connection right, 0, Route130 + +Route131_MapConnections:: @ 8308CA8 + .4byte 0x2 + .4byte Route131_MapConnectionsList diff --git a/data/maps/Route131/connections.s b/data/maps/Route131/connections.s deleted file mode 100644 index a1b1adff7..000000000 --- a/data/maps/Route131/connections.s +++ /dev/null @@ -1,7 +0,0 @@ -Route131_MapConnectionsList:: @ 8308C90 - connection left, 0, PacifidlogTown - connection right, 0, Route130 - -Route131_MapConnections:: @ 8308CA8 - .4byte 0x2 - .4byte Route131_MapConnectionsList diff --git a/data/maps/Route131/header.inc b/data/maps/Route131/header.inc new file mode 100644 index 000000000..e7d9ea231 --- /dev/null +++ b/data/maps/Route131/header.inc @@ -0,0 +1,14 @@ +Route131:: @ 8305950 + .4byte Route131_MapAttributes + .4byte Route131_MapEvents + .4byte Route131_MapScripts + .4byte Route131_MapConnections + .2byte BGM_GRANROAD + .2byte 47 + .byte 46 + .byte 0 + .byte 2 + .byte 6 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/Route131/header.s b/data/maps/Route131/header.s deleted file mode 100644 index e7d9ea231..000000000 --- a/data/maps/Route131/header.s +++ /dev/null @@ -1,14 +0,0 @@ -Route131:: @ 8305950 - .4byte Route131_MapAttributes - .4byte Route131_MapEvents - .4byte Route131_MapScripts - .4byte Route131_MapConnections - .2byte BGM_GRANROAD - .2byte 47 - .byte 46 - .byte 0 - .byte 2 - .byte 6 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/Route132/connections.inc b/data/maps/Route132/connections.inc new file mode 100644 index 000000000..a0aff0a42 --- /dev/null +++ b/data/maps/Route132/connections.inc @@ -0,0 +1,7 @@ +Route132_MapConnectionsList:: @ 8308CB0 + connection left, 0, Route133 + connection right, 0, PacifidlogTown + +Route132_MapConnections:: @ 8308CC8 + .4byte 0x2 + .4byte Route132_MapConnectionsList diff --git a/data/maps/Route132/connections.s b/data/maps/Route132/connections.s deleted file mode 100644 index a0aff0a42..000000000 --- a/data/maps/Route132/connections.s +++ /dev/null @@ -1,7 +0,0 @@ -Route132_MapConnectionsList:: @ 8308CB0 - connection left, 0, Route133 - connection right, 0, PacifidlogTown - -Route132_MapConnections:: @ 8308CC8 - .4byte 0x2 - .4byte Route132_MapConnectionsList diff --git a/data/maps/Route132/header.inc b/data/maps/Route132/header.inc new file mode 100644 index 000000000..d7ad0b2a4 --- /dev/null +++ b/data/maps/Route132/header.inc @@ -0,0 +1,14 @@ +Route132:: @ 830596C + .4byte Route132_MapAttributes + .4byte Route132_MapEvents + .4byte Route132_MapScripts + .4byte Route132_MapConnections + .2byte BGM_GRANROAD + .2byte 48 + .byte 47 + .byte 0 + .byte 2 + .byte 6 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/Route132/header.s b/data/maps/Route132/header.s deleted file mode 100644 index d7ad0b2a4..000000000 --- a/data/maps/Route132/header.s +++ /dev/null @@ -1,14 +0,0 @@ -Route132:: @ 830596C - .4byte Route132_MapAttributes - .4byte Route132_MapEvents - .4byte Route132_MapScripts - .4byte Route132_MapConnections - .2byte BGM_GRANROAD - .2byte 48 - .byte 47 - .byte 0 - .byte 2 - .byte 6 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/Route133/connections.inc b/data/maps/Route133/connections.inc new file mode 100644 index 000000000..979b49ee9 --- /dev/null +++ b/data/maps/Route133/connections.inc @@ -0,0 +1,7 @@ +Route133_MapConnectionsList:: @ 8308CD0 + connection left, 0, Route134 + connection right, 0, Route132 + +Route133_MapConnections:: @ 8308CE8 + .4byte 0x2 + .4byte Route133_MapConnectionsList diff --git a/data/maps/Route133/connections.s b/data/maps/Route133/connections.s deleted file mode 100644 index 979b49ee9..000000000 --- a/data/maps/Route133/connections.s +++ /dev/null @@ -1,7 +0,0 @@ -Route133_MapConnectionsList:: @ 8308CD0 - connection left, 0, Route134 - connection right, 0, Route132 - -Route133_MapConnections:: @ 8308CE8 - .4byte 0x2 - .4byte Route133_MapConnectionsList diff --git a/data/maps/Route133/header.inc b/data/maps/Route133/header.inc new file mode 100644 index 000000000..4c0f718ec --- /dev/null +++ b/data/maps/Route133/header.inc @@ -0,0 +1,14 @@ +Route133:: @ 8305988 + .4byte Route133_MapAttributes + .4byte Route133_MapEvents + .4byte Route133_MapScripts + .4byte Route133_MapConnections + .2byte BGM_GRANROAD + .2byte 49 + .byte 48 + .byte 0 + .byte 2 + .byte 6 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/Route133/header.s b/data/maps/Route133/header.s deleted file mode 100644 index 4c0f718ec..000000000 --- a/data/maps/Route133/header.s +++ /dev/null @@ -1,14 +0,0 @@ -Route133:: @ 8305988 - .4byte Route133_MapAttributes - .4byte Route133_MapEvents - .4byte Route133_MapScripts - .4byte Route133_MapConnections - .2byte BGM_GRANROAD - .2byte 49 - .byte 48 - .byte 0 - .byte 2 - .byte 6 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/Route134/connections.inc b/data/maps/Route134/connections.inc new file mode 100644 index 000000000..aba5c2c9a --- /dev/null +++ b/data/maps/Route134/connections.inc @@ -0,0 +1,7 @@ +Route134_MapConnectionsList:: @ 8308CF0 + connection left, 0, SlateportCity + connection right, 0, Route133 + +Route134_MapConnections:: @ 8308D08 + .4byte 0x2 + .4byte Route134_MapConnectionsList diff --git a/data/maps/Route134/connections.s b/data/maps/Route134/connections.s deleted file mode 100644 index aba5c2c9a..000000000 --- a/data/maps/Route134/connections.s +++ /dev/null @@ -1,7 +0,0 @@ -Route134_MapConnectionsList:: @ 8308CF0 - connection left, 0, SlateportCity - connection right, 0, Route133 - -Route134_MapConnections:: @ 8308D08 - .4byte 0x2 - .4byte Route134_MapConnectionsList diff --git a/data/maps/Route134/header.inc b/data/maps/Route134/header.inc new file mode 100644 index 000000000..2ca22c40e --- /dev/null +++ b/data/maps/Route134/header.inc @@ -0,0 +1,14 @@ +Route134:: @ 83059A4 + .4byte Route134_MapAttributes + .4byte Route134_MapEvents + .4byte Route134_MapScripts + .4byte Route134_MapConnections + .2byte BGM_GRANROAD + .2byte 50 + .byte 49 + .byte 0 + .byte 2 + .byte 6 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/Route134/header.s b/data/maps/Route134/header.s deleted file mode 100644 index 2ca22c40e..000000000 --- a/data/maps/Route134/header.s +++ /dev/null @@ -1,14 +0,0 @@ -Route134:: @ 83059A4 - .4byte Route134_MapAttributes - .4byte Route134_MapEvents - .4byte Route134_MapScripts - .4byte Route134_MapConnections - .2byte BGM_GRANROAD - .2byte 50 - .byte 49 - .byte 0 - .byte 2 - .byte 6 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/RustboroCity/connections.inc b/data/maps/RustboroCity/connections.inc new file mode 100644 index 000000000..fd1fa519c --- /dev/null +++ b/data/maps/RustboroCity/connections.inc @@ -0,0 +1,8 @@ +RustboroCity_MapConnectionsList:: @ 8308768 + connection up, 0, Route115 + connection down, 0, Route104 + connection right, 0, Route116 + +RustboroCity_MapConnections:: @ 830878C + .4byte 0x3 + .4byte RustboroCity_MapConnectionsList diff --git a/data/maps/RustboroCity/connections.s b/data/maps/RustboroCity/connections.s deleted file mode 100644 index fd1fa519c..000000000 --- a/data/maps/RustboroCity/connections.s +++ /dev/null @@ -1,8 +0,0 @@ -RustboroCity_MapConnectionsList:: @ 8308768 - connection up, 0, Route115 - connection down, 0, Route104 - connection right, 0, Route116 - -RustboroCity_MapConnections:: @ 830878C - .4byte 0x3 - .4byte RustboroCity_MapConnectionsList diff --git a/data/maps/RustboroCity/header.inc b/data/maps/RustboroCity/header.inc new file mode 100644 index 000000000..d1352ea3e --- /dev/null +++ b/data/maps/RustboroCity/header.inc @@ -0,0 +1,14 @@ +RustboroCity:: @ 830549C + .4byte RustboroCity_MapAttributes + .4byte RustboroCity_MapEvents + .4byte RustboroCity_MapScripts + .4byte RustboroCity_MapConnections + .2byte BGM_GOTOWN + .2byte 4 + .byte 10 + .byte 0 + .byte 2 + .byte 2 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/RustboroCity/header.s b/data/maps/RustboroCity/header.s deleted file mode 100644 index d1352ea3e..000000000 --- a/data/maps/RustboroCity/header.s +++ /dev/null @@ -1,14 +0,0 @@ -RustboroCity:: @ 830549C - .4byte RustboroCity_MapAttributes - .4byte RustboroCity_MapEvents - .4byte RustboroCity_MapScripts - .4byte RustboroCity_MapConnections - .2byte BGM_GOTOWN - .2byte 4 - .byte 10 - .byte 0 - .byte 2 - .byte 2 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/RustboroCity_CuttersHouse/header.inc b/data/maps/RustboroCity_CuttersHouse/header.inc new file mode 100644 index 000000000..c3b5a6d7c --- /dev/null +++ b/data/maps/RustboroCity_CuttersHouse/header.inc @@ -0,0 +1,14 @@ +RustboroCity_CuttersHouse:: @ 8306360 + .4byte RustboroCity_CuttersHouse_MapAttributes + .4byte RustboroCity_CuttersHouse_MapEvents + .4byte RustboroCity_CuttersHouse_MapScripts + .4byte 0x0 + .2byte BGM_GOTOWN + .2byte 98 + .byte 10 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/RustboroCity_CuttersHouse/header.s b/data/maps/RustboroCity_CuttersHouse/header.s deleted file mode 100644 index c3b5a6d7c..000000000 --- a/data/maps/RustboroCity_CuttersHouse/header.s +++ /dev/null @@ -1,14 +0,0 @@ -RustboroCity_CuttersHouse:: @ 8306360 - .4byte RustboroCity_CuttersHouse_MapAttributes - .4byte RustboroCity_CuttersHouse_MapEvents - .4byte RustboroCity_CuttersHouse_MapScripts - .4byte 0x0 - .2byte BGM_GOTOWN - .2byte 98 - .byte 10 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/RustboroCity_DevonCorp_1F/header.inc b/data/maps/RustboroCity_DevonCorp_1F/header.inc new file mode 100644 index 000000000..5539006ff --- /dev/null +++ b/data/maps/RustboroCity_DevonCorp_1F/header.inc @@ -0,0 +1,14 @@ +RustboroCity_DevonCorp_1F:: @ 830622C + .4byte RustboroCity_DevonCorp_1F_MapAttributes + .4byte RustboroCity_DevonCorp_1F_MapEvents + .4byte RustboroCity_DevonCorp_1F_MapScripts + .4byte 0x0 + .2byte BGM_GOTOWN + .2byte 92 + .byte 10 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/RustboroCity_DevonCorp_1F/header.s b/data/maps/RustboroCity_DevonCorp_1F/header.s deleted file mode 100644 index 5539006ff..000000000 --- a/data/maps/RustboroCity_DevonCorp_1F/header.s +++ /dev/null @@ -1,14 +0,0 @@ -RustboroCity_DevonCorp_1F:: @ 830622C - .4byte RustboroCity_DevonCorp_1F_MapAttributes - .4byte RustboroCity_DevonCorp_1F_MapEvents - .4byte RustboroCity_DevonCorp_1F_MapScripts - .4byte 0x0 - .2byte BGM_GOTOWN - .2byte 92 - .byte 10 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/RustboroCity_DevonCorp_2F/header.inc b/data/maps/RustboroCity_DevonCorp_2F/header.inc new file mode 100644 index 000000000..76bbea60b --- /dev/null +++ b/data/maps/RustboroCity_DevonCorp_2F/header.inc @@ -0,0 +1,14 @@ +RustboroCity_DevonCorp_2F:: @ 8306248 + .4byte RustboroCity_DevonCorp_2F_MapAttributes + .4byte RustboroCity_DevonCorp_2F_MapEvents + .4byte RustboroCity_DevonCorp_2F_MapScripts + .4byte 0x0 + .2byte BGM_GOTOWN + .2byte 93 + .byte 10 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/RustboroCity_DevonCorp_2F/header.s b/data/maps/RustboroCity_DevonCorp_2F/header.s deleted file mode 100644 index 76bbea60b..000000000 --- a/data/maps/RustboroCity_DevonCorp_2F/header.s +++ /dev/null @@ -1,14 +0,0 @@ -RustboroCity_DevonCorp_2F:: @ 8306248 - .4byte RustboroCity_DevonCorp_2F_MapAttributes - .4byte RustboroCity_DevonCorp_2F_MapEvents - .4byte RustboroCity_DevonCorp_2F_MapScripts - .4byte 0x0 - .2byte BGM_GOTOWN - .2byte 93 - .byte 10 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/RustboroCity_DevonCorp_3F/header.inc b/data/maps/RustboroCity_DevonCorp_3F/header.inc new file mode 100644 index 000000000..c3d4549de --- /dev/null +++ b/data/maps/RustboroCity_DevonCorp_3F/header.inc @@ -0,0 +1,14 @@ +RustboroCity_DevonCorp_3F:: @ 8306264 + .4byte RustboroCity_DevonCorp_3F_MapAttributes + .4byte RustboroCity_DevonCorp_3F_MapEvents + .4byte RustboroCity_DevonCorp_3F_MapScripts + .4byte 0x0 + .2byte BGM_GOTOWN + .2byte 270 + .byte 10 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/RustboroCity_DevonCorp_3F/header.s b/data/maps/RustboroCity_DevonCorp_3F/header.s deleted file mode 100644 index c3d4549de..000000000 --- a/data/maps/RustboroCity_DevonCorp_3F/header.s +++ /dev/null @@ -1,14 +0,0 @@ -RustboroCity_DevonCorp_3F:: @ 8306264 - .4byte RustboroCity_DevonCorp_3F_MapAttributes - .4byte RustboroCity_DevonCorp_3F_MapEvents - .4byte RustboroCity_DevonCorp_3F_MapScripts - .4byte 0x0 - .2byte BGM_GOTOWN - .2byte 270 - .byte 10 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/RustboroCity_Flat1_1F/header.inc b/data/maps/RustboroCity_Flat1_1F/header.inc new file mode 100644 index 000000000..68a5697be --- /dev/null +++ b/data/maps/RustboroCity_Flat1_1F/header.inc @@ -0,0 +1,14 @@ +RustboroCity_Flat1_1F:: @ 830630C + .4byte RustboroCity_Flat1_1F_MapAttributes + .4byte RustboroCity_Flat1_1F_MapEvents + .4byte RustboroCity_Flat1_1F_MapScripts + .4byte 0x0 + .2byte BGM_GOTOWN + .2byte 314 + .byte 10 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/RustboroCity_Flat1_1F/header.s b/data/maps/RustboroCity_Flat1_1F/header.s deleted file mode 100644 index 68a5697be..000000000 --- a/data/maps/RustboroCity_Flat1_1F/header.s +++ /dev/null @@ -1,14 +0,0 @@ -RustboroCity_Flat1_1F:: @ 830630C - .4byte RustboroCity_Flat1_1F_MapAttributes - .4byte RustboroCity_Flat1_1F_MapEvents - .4byte RustboroCity_Flat1_1F_MapScripts - .4byte 0x0 - .2byte BGM_GOTOWN - .2byte 314 - .byte 10 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/RustboroCity_Flat1_2F/header.inc b/data/maps/RustboroCity_Flat1_2F/header.inc new file mode 100644 index 000000000..f0b29ae0d --- /dev/null +++ b/data/maps/RustboroCity_Flat1_2F/header.inc @@ -0,0 +1,14 @@ +RustboroCity_Flat1_2F:: @ 8306328 + .4byte RustboroCity_Flat1_2F_MapAttributes + .4byte RustboroCity_Flat1_2F_MapEvents + .4byte RustboroCity_Flat1_2F_MapScripts + .4byte 0x0 + .2byte BGM_GOTOWN + .2byte 315 + .byte 10 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/RustboroCity_Flat1_2F/header.s b/data/maps/RustboroCity_Flat1_2F/header.s deleted file mode 100644 index f0b29ae0d..000000000 --- a/data/maps/RustboroCity_Flat1_2F/header.s +++ /dev/null @@ -1,14 +0,0 @@ -RustboroCity_Flat1_2F:: @ 8306328 - .4byte RustboroCity_Flat1_2F_MapAttributes - .4byte RustboroCity_Flat1_2F_MapEvents - .4byte RustboroCity_Flat1_2F_MapScripts - .4byte 0x0 - .2byte BGM_GOTOWN - .2byte 315 - .byte 10 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/RustboroCity_Flat2_1F/header.inc b/data/maps/RustboroCity_Flat2_1F/header.inc new file mode 100644 index 000000000..5f54f2624 --- /dev/null +++ b/data/maps/RustboroCity_Flat2_1F/header.inc @@ -0,0 +1,14 @@ +RustboroCity_Flat2_1F:: @ 8306398 + .4byte RustboroCity_Flat2_1F_MapAttributes + .4byte RustboroCity_Flat2_1F_MapEvents + .4byte RustboroCity_Flat2_1F_MapScripts + .4byte 0x0 + .2byte BGM_GOTOWN + .2byte 295 + .byte 10 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/RustboroCity_Flat2_1F/header.s b/data/maps/RustboroCity_Flat2_1F/header.s deleted file mode 100644 index 5f54f2624..000000000 --- a/data/maps/RustboroCity_Flat2_1F/header.s +++ /dev/null @@ -1,14 +0,0 @@ -RustboroCity_Flat2_1F:: @ 8306398 - .4byte RustboroCity_Flat2_1F_MapAttributes - .4byte RustboroCity_Flat2_1F_MapEvents - .4byte RustboroCity_Flat2_1F_MapScripts - .4byte 0x0 - .2byte BGM_GOTOWN - .2byte 295 - .byte 10 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/RustboroCity_Flat2_2F/header.inc b/data/maps/RustboroCity_Flat2_2F/header.inc new file mode 100644 index 000000000..086947abf --- /dev/null +++ b/data/maps/RustboroCity_Flat2_2F/header.inc @@ -0,0 +1,14 @@ +RustboroCity_Flat2_2F:: @ 83063B4 + .4byte RustboroCity_Flat2_2F_MapAttributes + .4byte RustboroCity_Flat2_2F_MapEvents + .4byte RustboroCity_Flat2_2F_MapScripts + .4byte 0x0 + .2byte BGM_GOTOWN + .2byte 296 + .byte 10 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/RustboroCity_Flat2_2F/header.s b/data/maps/RustboroCity_Flat2_2F/header.s deleted file mode 100644 index 086947abf..000000000 --- a/data/maps/RustboroCity_Flat2_2F/header.s +++ /dev/null @@ -1,14 +0,0 @@ -RustboroCity_Flat2_2F:: @ 83063B4 - .4byte RustboroCity_Flat2_2F_MapAttributes - .4byte RustboroCity_Flat2_2F_MapEvents - .4byte RustboroCity_Flat2_2F_MapScripts - .4byte 0x0 - .2byte BGM_GOTOWN - .2byte 296 - .byte 10 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/RustboroCity_Flat2_3F/header.inc b/data/maps/RustboroCity_Flat2_3F/header.inc new file mode 100644 index 000000000..42866ebf2 --- /dev/null +++ b/data/maps/RustboroCity_Flat2_3F/header.inc @@ -0,0 +1,14 @@ +RustboroCity_Flat2_3F:: @ 83063D0 + .4byte RustboroCity_Flat2_3F_MapAttributes + .4byte RustboroCity_Flat2_3F_MapEvents + .4byte RustboroCity_Flat2_3F_MapScripts + .4byte 0x0 + .2byte BGM_GOTOWN + .2byte 297 + .byte 10 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/RustboroCity_Flat2_3F/header.s b/data/maps/RustboroCity_Flat2_3F/header.s deleted file mode 100644 index 42866ebf2..000000000 --- a/data/maps/RustboroCity_Flat2_3F/header.s +++ /dev/null @@ -1,14 +0,0 @@ -RustboroCity_Flat2_3F:: @ 83063D0 - .4byte RustboroCity_Flat2_3F_MapAttributes - .4byte RustboroCity_Flat2_3F_MapEvents - .4byte RustboroCity_Flat2_3F_MapScripts - .4byte 0x0 - .2byte BGM_GOTOWN - .2byte 297 - .byte 10 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/RustboroCity_Gym/header.inc b/data/maps/RustboroCity_Gym/header.inc new file mode 100644 index 000000000..5d18e933b --- /dev/null +++ b/data/maps/RustboroCity_Gym/header.inc @@ -0,0 +1,14 @@ +RustboroCity_Gym:: @ 8306280 + .4byte RustboroCity_Gym_MapAttributes + .4byte RustboroCity_Gym_MapEvents + .4byte RustboroCity_Gym_MapScripts + .4byte 0x0 + .2byte BGM_GIM + .2byte 94 + .byte 10 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 1 diff --git a/data/maps/RustboroCity_Gym/header.s b/data/maps/RustboroCity_Gym/header.s deleted file mode 100644 index 5d18e933b..000000000 --- a/data/maps/RustboroCity_Gym/header.s +++ /dev/null @@ -1,14 +0,0 @@ -RustboroCity_Gym:: @ 8306280 - .4byte RustboroCity_Gym_MapAttributes - .4byte RustboroCity_Gym_MapEvents - .4byte RustboroCity_Gym_MapScripts - .4byte 0x0 - .2byte BGM_GIM - .2byte 94 - .byte 10 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 1 diff --git a/data/maps/RustboroCity_House1/header.inc b/data/maps/RustboroCity_House1/header.inc new file mode 100644 index 000000000..9ee09b4e3 --- /dev/null +++ b/data/maps/RustboroCity_House1/header.inc @@ -0,0 +1,14 @@ +RustboroCity_House1:: @ 8306344 + .4byte RustboroCity_House1_MapAttributes + .4byte RustboroCity_House1_MapEvents + .4byte RustboroCity_House1_MapScripts + .4byte 0x0 + .2byte BGM_GOTOWN + .2byte 97 + .byte 10 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/RustboroCity_House1/header.s b/data/maps/RustboroCity_House1/header.s deleted file mode 100644 index 9ee09b4e3..000000000 --- a/data/maps/RustboroCity_House1/header.s +++ /dev/null @@ -1,14 +0,0 @@ -RustboroCity_House1:: @ 8306344 - .4byte RustboroCity_House1_MapAttributes - .4byte RustboroCity_House1_MapEvents - .4byte RustboroCity_House1_MapScripts - .4byte 0x0 - .2byte BGM_GOTOWN - .2byte 97 - .byte 10 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/RustboroCity_House2/header.inc b/data/maps/RustboroCity_House2/header.inc new file mode 100644 index 000000000..0122c6a92 --- /dev/null +++ b/data/maps/RustboroCity_House2/header.inc @@ -0,0 +1,14 @@ +RustboroCity_House2:: @ 830637C + .4byte RustboroCity_House2_MapAttributes + .4byte RustboroCity_House2_MapEvents + .4byte RustboroCity_House2_MapScripts + .4byte 0x0 + .2byte BGM_GOTOWN + .2byte 96 + .byte 10 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/RustboroCity_House2/header.s b/data/maps/RustboroCity_House2/header.s deleted file mode 100644 index 0122c6a92..000000000 --- a/data/maps/RustboroCity_House2/header.s +++ /dev/null @@ -1,14 +0,0 @@ -RustboroCity_House2:: @ 830637C - .4byte RustboroCity_House2_MapAttributes - .4byte RustboroCity_House2_MapEvents - .4byte RustboroCity_House2_MapScripts - .4byte 0x0 - .2byte BGM_GOTOWN - .2byte 96 - .byte 10 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/RustboroCity_House3/header.inc b/data/maps/RustboroCity_House3/header.inc new file mode 100644 index 000000000..8876f8499 --- /dev/null +++ b/data/maps/RustboroCity_House3/header.inc @@ -0,0 +1,14 @@ +RustboroCity_House3:: @ 83063EC + .4byte RustboroCity_House3_MapAttributes + .4byte RustboroCity_House3_MapEvents + .4byte RustboroCity_House3_MapScripts + .4byte 0x0 + .2byte BGM_GOTOWN + .2byte 96 + .byte 10 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/RustboroCity_House3/header.s b/data/maps/RustboroCity_House3/header.s deleted file mode 100644 index 8876f8499..000000000 --- a/data/maps/RustboroCity_House3/header.s +++ /dev/null @@ -1,14 +0,0 @@ -RustboroCity_House3:: @ 83063EC - .4byte RustboroCity_House3_MapAttributes - .4byte RustboroCity_House3_MapEvents - .4byte RustboroCity_House3_MapScripts - .4byte 0x0 - .2byte BGM_GOTOWN - .2byte 96 - .byte 10 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/RustboroCity_Mart/header.inc b/data/maps/RustboroCity_Mart/header.inc new file mode 100644 index 000000000..535c3e2fc --- /dev/null +++ b/data/maps/RustboroCity_Mart/header.inc @@ -0,0 +1,14 @@ +RustboroCity_Mart:: @ 83062F0 + .4byte PokeMart_MapAttributes + .4byte RustboroCity_Mart_MapEvents + .4byte RustboroCity_Mart_MapScripts + .4byte 0x0 + .2byte BGM_FRIENDLY + .2byte 63 + .byte 10 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/RustboroCity_Mart/header.s b/data/maps/RustboroCity_Mart/header.s deleted file mode 100644 index 535c3e2fc..000000000 --- a/data/maps/RustboroCity_Mart/header.s +++ /dev/null @@ -1,14 +0,0 @@ -RustboroCity_Mart:: @ 83062F0 - .4byte PokeMart_MapAttributes - .4byte RustboroCity_Mart_MapEvents - .4byte RustboroCity_Mart_MapScripts - .4byte 0x0 - .2byte BGM_FRIENDLY - .2byte 63 - .byte 10 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/RustboroCity_PokemonCenter_1F/header.inc b/data/maps/RustboroCity_PokemonCenter_1F/header.inc new file mode 100644 index 000000000..57cb84729 --- /dev/null +++ b/data/maps/RustboroCity_PokemonCenter_1F/header.inc @@ -0,0 +1,14 @@ +RustboroCity_PokemonCenter_1F:: @ 83062B8 + .4byte PokemonCenter_1F_MapAttributes + .4byte RustboroCity_PokemonCenter_1F_MapEvents + .4byte RustboroCity_PokemonCenter_1F_MapScripts + .4byte 0x0 + .2byte BGM_POKECEN + .2byte 61 + .byte 10 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/RustboroCity_PokemonCenter_1F/header.s b/data/maps/RustboroCity_PokemonCenter_1F/header.s deleted file mode 100644 index 57cb84729..000000000 --- a/data/maps/RustboroCity_PokemonCenter_1F/header.s +++ /dev/null @@ -1,14 +0,0 @@ -RustboroCity_PokemonCenter_1F:: @ 83062B8 - .4byte PokemonCenter_1F_MapAttributes - .4byte RustboroCity_PokemonCenter_1F_MapEvents - .4byte RustboroCity_PokemonCenter_1F_MapScripts - .4byte 0x0 - .2byte BGM_POKECEN - .2byte 61 - .byte 10 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/RustboroCity_PokemonCenter_2F/header.inc b/data/maps/RustboroCity_PokemonCenter_2F/header.inc new file mode 100644 index 000000000..838a5e5a9 --- /dev/null +++ b/data/maps/RustboroCity_PokemonCenter_2F/header.inc @@ -0,0 +1,14 @@ +RustboroCity_PokemonCenter_2F:: @ 83062D4 + .4byte PokemonCenter_2F_MapAttributes + .4byte RustboroCity_PokemonCenter_2F_MapEvents + .4byte RustboroCity_PokemonCenter_2F_MapScripts + .4byte 0x0 + .2byte BGM_POKECEN + .2byte 62 + .byte 10 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/RustboroCity_PokemonCenter_2F/header.s b/data/maps/RustboroCity_PokemonCenter_2F/header.s deleted file mode 100644 index 838a5e5a9..000000000 --- a/data/maps/RustboroCity_PokemonCenter_2F/header.s +++ /dev/null @@ -1,14 +0,0 @@ -RustboroCity_PokemonCenter_2F:: @ 83062D4 - .4byte PokemonCenter_2F_MapAttributes - .4byte RustboroCity_PokemonCenter_2F_MapEvents - .4byte RustboroCity_PokemonCenter_2F_MapScripts - .4byte 0x0 - .2byte BGM_POKECEN - .2byte 62 - .byte 10 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/RustboroCity_PokemonSchool/header.inc b/data/maps/RustboroCity_PokemonSchool/header.inc new file mode 100644 index 000000000..dfb46b6f1 --- /dev/null +++ b/data/maps/RustboroCity_PokemonSchool/header.inc @@ -0,0 +1,14 @@ +RustboroCity_PokemonSchool:: @ 830629C + .4byte RustboroCity_PokemonSchool_MapAttributes + .4byte RustboroCity_PokemonSchool_MapEvents + .4byte RustboroCity_PokemonSchool_MapScripts + .4byte 0x0 + .2byte BGM_P_SCHOOL + .2byte 95 + .byte 10 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/RustboroCity_PokemonSchool/header.s b/data/maps/RustboroCity_PokemonSchool/header.s deleted file mode 100644 index dfb46b6f1..000000000 --- a/data/maps/RustboroCity_PokemonSchool/header.s +++ /dev/null @@ -1,14 +0,0 @@ -RustboroCity_PokemonSchool:: @ 830629C - .4byte RustboroCity_PokemonSchool_MapAttributes - .4byte RustboroCity_PokemonSchool_MapEvents - .4byte RustboroCity_PokemonSchool_MapScripts - .4byte 0x0 - .2byte BGM_P_SCHOOL - .2byte 95 - .byte 10 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/RusturfTunnel/header.inc b/data/maps/RusturfTunnel/header.inc new file mode 100644 index 000000000..3e497a1e5 --- /dev/null +++ b/data/maps/RusturfTunnel/header.inc @@ -0,0 +1,14 @@ +RusturfTunnel:: @ 8306DE0 + .4byte RusturfTunnel_MapAttributes + .4byte RusturfTunnel_MapEvents + .4byte RusturfTunnel_MapScripts + .4byte 0x0 + .2byte BGM_DAN01 + .2byte 130 + .byte 60 + .byte 0 + .byte 6 + .byte 4 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/RusturfTunnel/header.s b/data/maps/RusturfTunnel/header.s deleted file mode 100644 index 3e497a1e5..000000000 --- a/data/maps/RusturfTunnel/header.s +++ /dev/null @@ -1,14 +0,0 @@ -RusturfTunnel:: @ 8306DE0 - .4byte RusturfTunnel_MapAttributes - .4byte RusturfTunnel_MapEvents - .4byte RusturfTunnel_MapScripts - .4byte 0x0 - .2byte BGM_DAN01 - .2byte 130 - .byte 60 - .byte 0 - .byte 6 - .byte 4 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/SSTidalCorridor/header.inc b/data/maps/SSTidalCorridor/header.inc new file mode 100644 index 000000000..6370e81ca --- /dev/null +++ b/data/maps/SSTidalCorridor/header.inc @@ -0,0 +1,14 @@ +SSTidalCorridor:: @ 8307B54 + .4byte SSTidalCorridor_MapAttributes + .4byte SSTidalCorridor_MapEvents + .4byte SSTidalCorridor_MapScripts + .4byte 0x0 + .2byte BGM_M_BOAT + .2byte 278 + .byte 87 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/SSTidalCorridor/header.s b/data/maps/SSTidalCorridor/header.s deleted file mode 100644 index 6370e81ca..000000000 --- a/data/maps/SSTidalCorridor/header.s +++ /dev/null @@ -1,14 +0,0 @@ -SSTidalCorridor:: @ 8307B54 - .4byte SSTidalCorridor_MapAttributes - .4byte SSTidalCorridor_MapEvents - .4byte SSTidalCorridor_MapScripts - .4byte 0x0 - .2byte BGM_M_BOAT - .2byte 278 - .byte 87 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/SSTidalLowerDeck/header.inc b/data/maps/SSTidalLowerDeck/header.inc new file mode 100644 index 000000000..5b6bec321 --- /dev/null +++ b/data/maps/SSTidalLowerDeck/header.inc @@ -0,0 +1,14 @@ +SSTidalLowerDeck:: @ 8307B70 + .4byte SSTidalLowerDeck_MapAttributes + .4byte SSTidalLowerDeck_MapEvents + .4byte SSTidalLowerDeck_MapScripts + .4byte 0x0 + .2byte BGM_M_BOAT + .2byte 279 + .byte 87 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/SSTidalLowerDeck/header.s b/data/maps/SSTidalLowerDeck/header.s deleted file mode 100644 index 5b6bec321..000000000 --- a/data/maps/SSTidalLowerDeck/header.s +++ /dev/null @@ -1,14 +0,0 @@ -SSTidalLowerDeck:: @ 8307B70 - .4byte SSTidalLowerDeck_MapAttributes - .4byte SSTidalLowerDeck_MapEvents - .4byte SSTidalLowerDeck_MapScripts - .4byte 0x0 - .2byte BGM_M_BOAT - .2byte 279 - .byte 87 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/SSTidalRooms/header.inc b/data/maps/SSTidalRooms/header.inc new file mode 100644 index 000000000..36bcab75e --- /dev/null +++ b/data/maps/SSTidalRooms/header.inc @@ -0,0 +1,14 @@ +SSTidalRooms:: @ 8307B8C + .4byte SSTidalRooms_MapAttributes + .4byte SSTidalRooms_MapEvents + .4byte SSTidalRooms_MapScripts + .4byte 0x0 + .2byte BGM_M_BOAT + .2byte 280 + .byte 87 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/SSTidalRooms/header.s b/data/maps/SSTidalRooms/header.s deleted file mode 100644 index 36bcab75e..000000000 --- a/data/maps/SSTidalRooms/header.s +++ /dev/null @@ -1,14 +0,0 @@ -SSTidalRooms:: @ 8307B8C - .4byte SSTidalRooms_MapAttributes - .4byte SSTidalRooms_MapEvents - .4byte SSTidalRooms_MapScripts - .4byte 0x0 - .2byte BGM_M_BOAT - .2byte 280 - .byte 87 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/SafariZone_Northeast/connections.inc b/data/maps/SafariZone_Northeast/connections.inc new file mode 100644 index 000000000..5c9c47793 --- /dev/null +++ b/data/maps/SafariZone_Northeast/connections.inc @@ -0,0 +1,7 @@ +SafariZone_Northeast_MapConnectionsList:: @ 8308DC8 + connection left, 0, SafariZone_Northwest + connection down, 0, SafariZone_Southeast + +SafariZone_Northeast_MapConnections:: @ 8308DE0 + .4byte 0x2 + .4byte SafariZone_Northeast_MapConnectionsList diff --git a/data/maps/SafariZone_Northeast/connections.s b/data/maps/SafariZone_Northeast/connections.s deleted file mode 100644 index 5c9c47793..000000000 --- a/data/maps/SafariZone_Northeast/connections.s +++ /dev/null @@ -1,7 +0,0 @@ -SafariZone_Northeast_MapConnectionsList:: @ 8308DC8 - connection left, 0, SafariZone_Northwest - connection down, 0, SafariZone_Southeast - -SafariZone_Northeast_MapConnections:: @ 8308DE0 - .4byte 0x2 - .4byte SafariZone_Northeast_MapConnectionsList diff --git a/data/maps/SafariZone_Northeast/header.inc b/data/maps/SafariZone_Northeast/header.inc new file mode 100644 index 000000000..55bef875f --- /dev/null +++ b/data/maps/SafariZone_Northeast/header.inc @@ -0,0 +1,14 @@ +SafariZone_Northeast:: @ 8307BC4 + .4byte SafariZone_Northeast_MapAttributes + .4byte SafariZone_Northeast_MapEvents + .4byte SafariZone_Northeast_MapScripts + .4byte SafariZone_Northeast_MapConnections + .2byte BGM_SAFARI + .2byte 240 + .byte 57 + .byte 0 + .byte 0 + .byte 3 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/SafariZone_Northeast/header.s b/data/maps/SafariZone_Northeast/header.s deleted file mode 100644 index 55bef875f..000000000 --- a/data/maps/SafariZone_Northeast/header.s +++ /dev/null @@ -1,14 +0,0 @@ -SafariZone_Northeast:: @ 8307BC4 - .4byte SafariZone_Northeast_MapAttributes - .4byte SafariZone_Northeast_MapEvents - .4byte SafariZone_Northeast_MapScripts - .4byte SafariZone_Northeast_MapConnections - .2byte BGM_SAFARI - .2byte 240 - .byte 57 - .byte 0 - .byte 0 - .byte 3 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/SafariZone_Northwest/connections.inc b/data/maps/SafariZone_Northwest/connections.inc new file mode 100644 index 000000000..b36d15bad --- /dev/null +++ b/data/maps/SafariZone_Northwest/connections.inc @@ -0,0 +1,7 @@ +SafariZone_Northwest_MapConnectionsList:: @ 8308DA8 + connection right, 0, SafariZone_Northeast + connection down, 0, SafariZone_Southwest + +SafariZone_Northwest_MapConnections:: @ 8308DC0 + .4byte 0x2 + .4byte SafariZone_Northwest_MapConnectionsList diff --git a/data/maps/SafariZone_Northwest/connections.s b/data/maps/SafariZone_Northwest/connections.s deleted file mode 100644 index b36d15bad..000000000 --- a/data/maps/SafariZone_Northwest/connections.s +++ /dev/null @@ -1,7 +0,0 @@ -SafariZone_Northwest_MapConnectionsList:: @ 8308DA8 - connection right, 0, SafariZone_Northeast - connection down, 0, SafariZone_Southwest - -SafariZone_Northwest_MapConnections:: @ 8308DC0 - .4byte 0x2 - .4byte SafariZone_Northwest_MapConnectionsList diff --git a/data/maps/SafariZone_Northwest/header.inc b/data/maps/SafariZone_Northwest/header.inc new file mode 100644 index 000000000..a3c85c6ed --- /dev/null +++ b/data/maps/SafariZone_Northwest/header.inc @@ -0,0 +1,14 @@ +SafariZone_Northwest:: @ 8307BA8 + .4byte SafariZone_Northwest_MapAttributes + .4byte SafariZone_Northwest_MapEvents + .4byte SafariZone_Northwest_MapScripts + .4byte SafariZone_Northwest_MapConnections + .2byte BGM_SAFARI + .2byte 239 + .byte 57 + .byte 0 + .byte 0 + .byte 3 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/SafariZone_Northwest/header.s b/data/maps/SafariZone_Northwest/header.s deleted file mode 100644 index a3c85c6ed..000000000 --- a/data/maps/SafariZone_Northwest/header.s +++ /dev/null @@ -1,14 +0,0 @@ -SafariZone_Northwest:: @ 8307BA8 - .4byte SafariZone_Northwest_MapAttributes - .4byte SafariZone_Northwest_MapEvents - .4byte SafariZone_Northwest_MapScripts - .4byte SafariZone_Northwest_MapConnections - .2byte BGM_SAFARI - .2byte 239 - .byte 57 - .byte 0 - .byte 0 - .byte 3 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/SafariZone_RestHouse/header.inc b/data/maps/SafariZone_RestHouse/header.inc new file mode 100644 index 000000000..3db84b0b7 --- /dev/null +++ b/data/maps/SafariZone_RestHouse/header.inc @@ -0,0 +1,14 @@ +SafariZone_RestHouse:: @ 8307CDC + .4byte SafariZone_RestHouse_MapAttributes + .4byte SafariZone_RestHouse_MapEvents + .4byte SafariZone_RestHouse_MapScripts + .4byte 0x0 + .2byte BGM_SAFARI + .2byte 330 + .byte 57 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/SafariZone_RestHouse/header.s b/data/maps/SafariZone_RestHouse/header.s deleted file mode 100644 index 3db84b0b7..000000000 --- a/data/maps/SafariZone_RestHouse/header.s +++ /dev/null @@ -1,14 +0,0 @@ -SafariZone_RestHouse:: @ 8307CDC - .4byte SafariZone_RestHouse_MapAttributes - .4byte SafariZone_RestHouse_MapEvents - .4byte SafariZone_RestHouse_MapScripts - .4byte 0x0 - .2byte BGM_SAFARI - .2byte 330 - .byte 57 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/SafariZone_Southeast/connections.inc b/data/maps/SafariZone_Southeast/connections.inc new file mode 100644 index 000000000..e4782d1aa --- /dev/null +++ b/data/maps/SafariZone_Southeast/connections.inc @@ -0,0 +1,7 @@ +SafariZone_Southeast_MapConnectionsList:: @ 8308E08 + connection up, 0, SafariZone_Northeast + connection left, 0, SafariZone_Southwest + +SafariZone_Southeast_MapConnections:: @ 8308E20 + .4byte 0x2 + .4byte SafariZone_Southeast_MapConnectionsList diff --git a/data/maps/SafariZone_Southeast/connections.s b/data/maps/SafariZone_Southeast/connections.s deleted file mode 100644 index e4782d1aa..000000000 --- a/data/maps/SafariZone_Southeast/connections.s +++ /dev/null @@ -1,7 +0,0 @@ -SafariZone_Southeast_MapConnectionsList:: @ 8308E08 - connection up, 0, SafariZone_Northeast - connection left, 0, SafariZone_Southwest - -SafariZone_Southeast_MapConnections:: @ 8308E20 - .4byte 0x2 - .4byte SafariZone_Southeast_MapConnectionsList diff --git a/data/maps/SafariZone_Southeast/header.inc b/data/maps/SafariZone_Southeast/header.inc new file mode 100644 index 000000000..1307c9700 --- /dev/null +++ b/data/maps/SafariZone_Southeast/header.inc @@ -0,0 +1,14 @@ +SafariZone_Southeast:: @ 8307BFC + .4byte SafariZone_Southeast_MapAttributes + .4byte SafariZone_Southeast_MapEvents + .4byte SafariZone_Southeast_MapScripts + .4byte SafariZone_Southeast_MapConnections + .2byte BGM_SAFARI + .2byte 242 + .byte 57 + .byte 0 + .byte 0 + .byte 3 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/SafariZone_Southeast/header.s b/data/maps/SafariZone_Southeast/header.s deleted file mode 100644 index 1307c9700..000000000 --- a/data/maps/SafariZone_Southeast/header.s +++ /dev/null @@ -1,14 +0,0 @@ -SafariZone_Southeast:: @ 8307BFC - .4byte SafariZone_Southeast_MapAttributes - .4byte SafariZone_Southeast_MapEvents - .4byte SafariZone_Southeast_MapScripts - .4byte SafariZone_Southeast_MapConnections - .2byte BGM_SAFARI - .2byte 242 - .byte 57 - .byte 0 - .byte 0 - .byte 3 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/SafariZone_Southwest/connections.inc b/data/maps/SafariZone_Southwest/connections.inc new file mode 100644 index 000000000..a0fea0609 --- /dev/null +++ b/data/maps/SafariZone_Southwest/connections.inc @@ -0,0 +1,7 @@ +SafariZone_Southwest_MapConnectionsList:: @ 8308DE8 + connection up, 0, SafariZone_Northwest + connection right, 0, SafariZone_Southeast + +SafariZone_Southwest_MapConnections:: @ 8308E00 + .4byte 0x2 + .4byte SafariZone_Southwest_MapConnectionsList diff --git a/data/maps/SafariZone_Southwest/connections.s b/data/maps/SafariZone_Southwest/connections.s deleted file mode 100644 index a0fea0609..000000000 --- a/data/maps/SafariZone_Southwest/connections.s +++ /dev/null @@ -1,7 +0,0 @@ -SafariZone_Southwest_MapConnectionsList:: @ 8308DE8 - connection up, 0, SafariZone_Northwest - connection right, 0, SafariZone_Southeast - -SafariZone_Southwest_MapConnections:: @ 8308E00 - .4byte 0x2 - .4byte SafariZone_Southwest_MapConnectionsList diff --git a/data/maps/SafariZone_Southwest/header.inc b/data/maps/SafariZone_Southwest/header.inc new file mode 100644 index 000000000..548dc24b7 --- /dev/null +++ b/data/maps/SafariZone_Southwest/header.inc @@ -0,0 +1,14 @@ +SafariZone_Southwest:: @ 8307BE0 + .4byte SafariZone_Southwest_MapAttributes + .4byte SafariZone_Southwest_MapEvents + .4byte SafariZone_Southwest_MapScripts + .4byte SafariZone_Southwest_MapConnections + .2byte BGM_SAFARI + .2byte 241 + .byte 57 + .byte 0 + .byte 0 + .byte 3 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/SafariZone_Southwest/header.s b/data/maps/SafariZone_Southwest/header.s deleted file mode 100644 index 548dc24b7..000000000 --- a/data/maps/SafariZone_Southwest/header.s +++ /dev/null @@ -1,14 +0,0 @@ -SafariZone_Southwest:: @ 8307BE0 - .4byte SafariZone_Southwest_MapAttributes - .4byte SafariZone_Southwest_MapEvents - .4byte SafariZone_Southwest_MapScripts - .4byte SafariZone_Southwest_MapConnections - .2byte BGM_SAFARI - .2byte 241 - .byte 57 - .byte 0 - .byte 0 - .byte 3 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/ScorchedSlab/header.inc b/data/maps/ScorchedSlab/header.inc new file mode 100644 index 000000000..16e45546e --- /dev/null +++ b/data/maps/ScorchedSlab/header.inc @@ -0,0 +1,14 @@ +ScorchedSlab:: @ 830756C + .4byte ScorchedSlab_MapAttributes + .4byte ScorchedSlab_MapEvents + .4byte ScorchedSlab_MapScripts + .4byte 0x0 + .2byte BGM_DAN01 + .2byte 312 + .byte 80 + .byte 0 + .byte 0 + .byte 4 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/ScorchedSlab/header.s b/data/maps/ScorchedSlab/header.s deleted file mode 100644 index 16e45546e..000000000 --- a/data/maps/ScorchedSlab/header.s +++ /dev/null @@ -1,14 +0,0 @@ -ScorchedSlab:: @ 830756C - .4byte ScorchedSlab_MapAttributes - .4byte ScorchedSlab_MapEvents - .4byte ScorchedSlab_MapScripts - .4byte 0x0 - .2byte BGM_DAN01 - .2byte 312 - .byte 80 - .byte 0 - .byte 0 - .byte 4 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/SeafloorCavern_Entrance/header.inc b/data/maps/SeafloorCavern_Entrance/header.inc new file mode 100644 index 000000000..d768c1099 --- /dev/null +++ b/data/maps/SeafloorCavern_Entrance/header.inc @@ -0,0 +1,14 @@ +SeafloorCavern_Entrance:: @ 8307064 + .4byte SeafloorCavern_Entrance_MapAttributes + .4byte SeafloorCavern_Entrance_MapEvents + .4byte SeafloorCavern_Entrance_MapScripts + .4byte 0x0 + .2byte BGM_TOZAN + .2byte 148 + .byte 68 + .byte 0 + .byte 0 + .byte 4 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/SeafloorCavern_Entrance/header.s b/data/maps/SeafloorCavern_Entrance/header.s deleted file mode 100644 index d768c1099..000000000 --- a/data/maps/SeafloorCavern_Entrance/header.s +++ /dev/null @@ -1,14 +0,0 @@ -SeafloorCavern_Entrance:: @ 8307064 - .4byte SeafloorCavern_Entrance_MapAttributes - .4byte SeafloorCavern_Entrance_MapEvents - .4byte SeafloorCavern_Entrance_MapScripts - .4byte 0x0 - .2byte BGM_TOZAN - .2byte 148 - .byte 68 - .byte 0 - .byte 0 - .byte 4 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/SeafloorCavern_Room1/header.inc b/data/maps/SeafloorCavern_Room1/header.inc new file mode 100644 index 000000000..affbaf21c --- /dev/null +++ b/data/maps/SeafloorCavern_Room1/header.inc @@ -0,0 +1,14 @@ +SeafloorCavern_Room1:: @ 8307080 + .4byte SeafloorCavern_Room1_MapAttributes + .4byte SeafloorCavern_Room1_MapEvents + .4byte SeafloorCavern_Room1_MapScripts + .4byte 0x0 + .2byte BGM_TOZAN + .2byte 149 + .byte 68 + .byte 0 + .byte 0 + .byte 4 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/SeafloorCavern_Room1/header.s b/data/maps/SeafloorCavern_Room1/header.s deleted file mode 100644 index affbaf21c..000000000 --- a/data/maps/SeafloorCavern_Room1/header.s +++ /dev/null @@ -1,14 +0,0 @@ -SeafloorCavern_Room1:: @ 8307080 - .4byte SeafloorCavern_Room1_MapAttributes - .4byte SeafloorCavern_Room1_MapEvents - .4byte SeafloorCavern_Room1_MapScripts - .4byte 0x0 - .2byte BGM_TOZAN - .2byte 149 - .byte 68 - .byte 0 - .byte 0 - .byte 4 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/SeafloorCavern_Room2/header.inc b/data/maps/SeafloorCavern_Room2/header.inc new file mode 100644 index 000000000..6e0e7455d --- /dev/null +++ b/data/maps/SeafloorCavern_Room2/header.inc @@ -0,0 +1,14 @@ +SeafloorCavern_Room2:: @ 830709C + .4byte SeafloorCavern_Room2_MapAttributes + .4byte SeafloorCavern_Room2_MapEvents + .4byte SeafloorCavern_Room2_MapScripts + .4byte 0x0 + .2byte BGM_TOZAN + .2byte 150 + .byte 68 + .byte 0 + .byte 0 + .byte 4 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/SeafloorCavern_Room2/header.s b/data/maps/SeafloorCavern_Room2/header.s deleted file mode 100644 index 6e0e7455d..000000000 --- a/data/maps/SeafloorCavern_Room2/header.s +++ /dev/null @@ -1,14 +0,0 @@ -SeafloorCavern_Room2:: @ 830709C - .4byte SeafloorCavern_Room2_MapAttributes - .4byte SeafloorCavern_Room2_MapEvents - .4byte SeafloorCavern_Room2_MapScripts - .4byte 0x0 - .2byte BGM_TOZAN - .2byte 150 - .byte 68 - .byte 0 - .byte 0 - .byte 4 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/SeafloorCavern_Room3/header.inc b/data/maps/SeafloorCavern_Room3/header.inc new file mode 100644 index 000000000..e2a432cd9 --- /dev/null +++ b/data/maps/SeafloorCavern_Room3/header.inc @@ -0,0 +1,14 @@ +SeafloorCavern_Room3:: @ 83070B8 + .4byte SeafloorCavern_Room3_MapAttributes + .4byte SeafloorCavern_Room3_MapEvents + .4byte SeafloorCavern_Room3_MapScripts + .4byte 0x0 + .2byte BGM_TOZAN + .2byte 151 + .byte 68 + .byte 0 + .byte 0 + .byte 4 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/SeafloorCavern_Room3/header.s b/data/maps/SeafloorCavern_Room3/header.s deleted file mode 100644 index e2a432cd9..000000000 --- a/data/maps/SeafloorCavern_Room3/header.s +++ /dev/null @@ -1,14 +0,0 @@ -SeafloorCavern_Room3:: @ 83070B8 - .4byte SeafloorCavern_Room3_MapAttributes - .4byte SeafloorCavern_Room3_MapEvents - .4byte SeafloorCavern_Room3_MapScripts - .4byte 0x0 - .2byte BGM_TOZAN - .2byte 151 - .byte 68 - .byte 0 - .byte 0 - .byte 4 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/SeafloorCavern_Room4/header.inc b/data/maps/SeafloorCavern_Room4/header.inc new file mode 100644 index 000000000..0416091d4 --- /dev/null +++ b/data/maps/SeafloorCavern_Room4/header.inc @@ -0,0 +1,14 @@ +SeafloorCavern_Room4:: @ 83070D4 + .4byte SeafloorCavern_Room4_MapAttributes + .4byte SeafloorCavern_Room4_MapEvents + .4byte SeafloorCavern_Room4_MapScripts + .4byte 0x0 + .2byte BGM_TOZAN + .2byte 152 + .byte 68 + .byte 0 + .byte 0 + .byte 4 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/SeafloorCavern_Room4/header.s b/data/maps/SeafloorCavern_Room4/header.s deleted file mode 100644 index 0416091d4..000000000 --- a/data/maps/SeafloorCavern_Room4/header.s +++ /dev/null @@ -1,14 +0,0 @@ -SeafloorCavern_Room4:: @ 83070D4 - .4byte SeafloorCavern_Room4_MapAttributes - .4byte SeafloorCavern_Room4_MapEvents - .4byte SeafloorCavern_Room4_MapScripts - .4byte 0x0 - .2byte BGM_TOZAN - .2byte 152 - .byte 68 - .byte 0 - .byte 0 - .byte 4 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/SeafloorCavern_Room5/header.inc b/data/maps/SeafloorCavern_Room5/header.inc new file mode 100644 index 000000000..3272c7021 --- /dev/null +++ b/data/maps/SeafloorCavern_Room5/header.inc @@ -0,0 +1,14 @@ +SeafloorCavern_Room5:: @ 83070F0 + .4byte SeafloorCavern_Room5_MapAttributes + .4byte SeafloorCavern_Room5_MapEvents + .4byte SeafloorCavern_Room5_MapScripts + .4byte 0x0 + .2byte BGM_TOZAN + .2byte 153 + .byte 68 + .byte 0 + .byte 0 + .byte 4 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/SeafloorCavern_Room5/header.s b/data/maps/SeafloorCavern_Room5/header.s deleted file mode 100644 index 3272c7021..000000000 --- a/data/maps/SeafloorCavern_Room5/header.s +++ /dev/null @@ -1,14 +0,0 @@ -SeafloorCavern_Room5:: @ 83070F0 - .4byte SeafloorCavern_Room5_MapAttributes - .4byte SeafloorCavern_Room5_MapEvents - .4byte SeafloorCavern_Room5_MapScripts - .4byte 0x0 - .2byte BGM_TOZAN - .2byte 153 - .byte 68 - .byte 0 - .byte 0 - .byte 4 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/SeafloorCavern_Room6/header.inc b/data/maps/SeafloorCavern_Room6/header.inc new file mode 100644 index 000000000..18fab912d --- /dev/null +++ b/data/maps/SeafloorCavern_Room6/header.inc @@ -0,0 +1,14 @@ +SeafloorCavern_Room6:: @ 830710C + .4byte SeafloorCavern_Room6_MapAttributes + .4byte SeafloorCavern_Room6_MapEvents + .4byte SeafloorCavern_Room6_MapScripts + .4byte 0x0 + .2byte BGM_TOZAN + .2byte 154 + .byte 68 + .byte 0 + .byte 0 + .byte 4 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/SeafloorCavern_Room6/header.s b/data/maps/SeafloorCavern_Room6/header.s deleted file mode 100644 index 18fab912d..000000000 --- a/data/maps/SeafloorCavern_Room6/header.s +++ /dev/null @@ -1,14 +0,0 @@ -SeafloorCavern_Room6:: @ 830710C - .4byte SeafloorCavern_Room6_MapAttributes - .4byte SeafloorCavern_Room6_MapEvents - .4byte SeafloorCavern_Room6_MapScripts - .4byte 0x0 - .2byte BGM_TOZAN - .2byte 154 - .byte 68 - .byte 0 - .byte 0 - .byte 4 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/SeafloorCavern_Room7/header.inc b/data/maps/SeafloorCavern_Room7/header.inc new file mode 100644 index 000000000..ff7579206 --- /dev/null +++ b/data/maps/SeafloorCavern_Room7/header.inc @@ -0,0 +1,14 @@ +SeafloorCavern_Room7:: @ 8307128 + .4byte SeafloorCavern_Room7_MapAttributes + .4byte SeafloorCavern_Room7_MapEvents + .4byte SeafloorCavern_Room7_MapScripts + .4byte 0x0 + .2byte BGM_TOZAN + .2byte 155 + .byte 68 + .byte 0 + .byte 0 + .byte 4 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/SeafloorCavern_Room7/header.s b/data/maps/SeafloorCavern_Room7/header.s deleted file mode 100644 index ff7579206..000000000 --- a/data/maps/SeafloorCavern_Room7/header.s +++ /dev/null @@ -1,14 +0,0 @@ -SeafloorCavern_Room7:: @ 8307128 - .4byte SeafloorCavern_Room7_MapAttributes - .4byte SeafloorCavern_Room7_MapEvents - .4byte SeafloorCavern_Room7_MapScripts - .4byte 0x0 - .2byte BGM_TOZAN - .2byte 155 - .byte 68 - .byte 0 - .byte 0 - .byte 4 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/SeafloorCavern_Room8/header.inc b/data/maps/SeafloorCavern_Room8/header.inc new file mode 100644 index 000000000..f443c8530 --- /dev/null +++ b/data/maps/SeafloorCavern_Room8/header.inc @@ -0,0 +1,14 @@ +SeafloorCavern_Room8:: @ 8307144 + .4byte SeafloorCavern_Room8_MapAttributes + .4byte SeafloorCavern_Room8_MapEvents + .4byte SeafloorCavern_Room8_MapScripts + .4byte 0x0 + .2byte BGM_TOZAN + .2byte 156 + .byte 68 + .byte 0 + .byte 0 + .byte 4 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/SeafloorCavern_Room8/header.s b/data/maps/SeafloorCavern_Room8/header.s deleted file mode 100644 index f443c8530..000000000 --- a/data/maps/SeafloorCavern_Room8/header.s +++ /dev/null @@ -1,14 +0,0 @@ -SeafloorCavern_Room8:: @ 8307144 - .4byte SeafloorCavern_Room8_MapAttributes - .4byte SeafloorCavern_Room8_MapEvents - .4byte SeafloorCavern_Room8_MapScripts - .4byte 0x0 - .2byte BGM_TOZAN - .2byte 156 - .byte 68 - .byte 0 - .byte 0 - .byte 4 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/SeafloorCavern_Room9/header.inc b/data/maps/SeafloorCavern_Room9/header.inc new file mode 100644 index 000000000..10303ec46 --- /dev/null +++ b/data/maps/SeafloorCavern_Room9/header.inc @@ -0,0 +1,14 @@ +SeafloorCavern_Room9:: @ 8307160 + .4byte SeafloorCavern_Room9_MapAttributes + .4byte SeafloorCavern_Room9_MapEvents + .4byte SeafloorCavern_Room9_MapScripts + .4byte 0x0 + .2byte BGM_TOZAN + .2byte 157 + .byte 68 + .byte 0 + .byte 6 + .byte 4 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/SeafloorCavern_Room9/header.s b/data/maps/SeafloorCavern_Room9/header.s deleted file mode 100644 index 10303ec46..000000000 --- a/data/maps/SeafloorCavern_Room9/header.s +++ /dev/null @@ -1,14 +0,0 @@ -SeafloorCavern_Room9:: @ 8307160 - .4byte SeafloorCavern_Room9_MapAttributes - .4byte SeafloorCavern_Room9_MapEvents - .4byte SeafloorCavern_Room9_MapScripts - .4byte 0x0 - .2byte BGM_TOZAN - .2byte 157 - .byte 68 - .byte 0 - .byte 6 - .byte 4 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/SealedChamber_InnerRoom/header.inc b/data/maps/SealedChamber_InnerRoom/header.inc new file mode 100644 index 000000000..6ae714a1f --- /dev/null +++ b/data/maps/SealedChamber_InnerRoom/header.inc @@ -0,0 +1,14 @@ +SealedChamber_InnerRoom:: @ 8307550 + .4byte SealedChamber_InnerRoom_MapAttributes + .4byte SealedChamber_InnerRoom_MapEvents + .4byte SealedChamber_InnerRoom_MapScripts + .4byte 0x0 + .2byte BGM_MABOROSI + .2byte 305 + .byte 78 + .byte 0 + .byte 0 + .byte 4 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/SealedChamber_InnerRoom/header.s b/data/maps/SealedChamber_InnerRoom/header.s deleted file mode 100644 index 6ae714a1f..000000000 --- a/data/maps/SealedChamber_InnerRoom/header.s +++ /dev/null @@ -1,14 +0,0 @@ -SealedChamber_InnerRoom:: @ 8307550 - .4byte SealedChamber_InnerRoom_MapAttributes - .4byte SealedChamber_InnerRoom_MapEvents - .4byte SealedChamber_InnerRoom_MapScripts - .4byte 0x0 - .2byte BGM_MABOROSI - .2byte 305 - .byte 78 - .byte 0 - .byte 0 - .byte 4 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/SealedChamber_OuterRoom/header.inc b/data/maps/SealedChamber_OuterRoom/header.inc new file mode 100644 index 000000000..fe35a8210 --- /dev/null +++ b/data/maps/SealedChamber_OuterRoom/header.inc @@ -0,0 +1,14 @@ +SealedChamber_OuterRoom:: @ 8307534 + .4byte SealedChamber_OuterRoom_MapAttributes + .4byte SealedChamber_OuterRoom_MapEvents + .4byte SealedChamber_OuterRoom_MapScripts + .4byte 0x0 + .2byte BGM_MABOROSI + .2byte 285 + .byte 78 + .byte 0 + .byte 0 + .byte 4 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/SealedChamber_OuterRoom/header.s b/data/maps/SealedChamber_OuterRoom/header.s deleted file mode 100644 index fe35a8210..000000000 --- a/data/maps/SealedChamber_OuterRoom/header.s +++ /dev/null @@ -1,14 +0,0 @@ -SealedChamber_OuterRoom:: @ 8307534 - .4byte SealedChamber_OuterRoom_MapAttributes - .4byte SealedChamber_OuterRoom_MapEvents - .4byte SealedChamber_OuterRoom_MapScripts - .4byte 0x0 - .2byte BGM_MABOROSI - .2byte 285 - .byte 78 - .byte 0 - .byte 0 - .byte 4 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/SecretBase_BlueCave1/header.inc b/data/maps/SecretBase_BlueCave1/header.inc new file mode 100644 index 000000000..24641e4e6 --- /dev/null +++ b/data/maps/SecretBase_BlueCave1/header.inc @@ -0,0 +1,14 @@ +SecretBase_BlueCave1:: @ 8307710 + .4byte SecretBase_BlueCave1_MapAttributes + .4byte SecretBase_BlueCave1_MapEvents + .4byte SecretBase_BlueCave1_MapScripts + .4byte 0x0 + .2byte BGM_MACHI_S3 + .2byte 200 + .byte 86 + .byte 0 + .byte 0 + .byte 9 + .2byte 0 + .byte 1 + .byte 8 diff --git a/data/maps/SecretBase_BlueCave1/header.s b/data/maps/SecretBase_BlueCave1/header.s deleted file mode 100644 index 24641e4e6..000000000 --- a/data/maps/SecretBase_BlueCave1/header.s +++ /dev/null @@ -1,14 +0,0 @@ -SecretBase_BlueCave1:: @ 8307710 - .4byte SecretBase_BlueCave1_MapAttributes - .4byte SecretBase_BlueCave1_MapEvents - .4byte SecretBase_BlueCave1_MapScripts - .4byte 0x0 - .2byte BGM_MACHI_S3 - .2byte 200 - .byte 86 - .byte 0 - .byte 0 - .byte 9 - .2byte 0 - .byte 1 - .byte 8 diff --git a/data/maps/SecretBase_BlueCave2/header.inc b/data/maps/SecretBase_BlueCave2/header.inc new file mode 100644 index 000000000..599abd34a --- /dev/null +++ b/data/maps/SecretBase_BlueCave2/header.inc @@ -0,0 +1,14 @@ +SecretBase_BlueCave2:: @ 83077B8 + .4byte SecretBase_BlueCave2_MapAttributes + .4byte SecretBase_BlueCave2_MapEvents + .4byte SecretBase_BlueCave2_MapScripts + .4byte 0x0 + .2byte BGM_MACHI_S3 + .2byte 206 + .byte 86 + .byte 0 + .byte 0 + .byte 9 + .2byte 0 + .byte 1 + .byte 8 diff --git a/data/maps/SecretBase_BlueCave2/header.s b/data/maps/SecretBase_BlueCave2/header.s deleted file mode 100644 index 599abd34a..000000000 --- a/data/maps/SecretBase_BlueCave2/header.s +++ /dev/null @@ -1,14 +0,0 @@ -SecretBase_BlueCave2:: @ 83077B8 - .4byte SecretBase_BlueCave2_MapAttributes - .4byte SecretBase_BlueCave2_MapEvents - .4byte SecretBase_BlueCave2_MapScripts - .4byte 0x0 - .2byte BGM_MACHI_S3 - .2byte 206 - .byte 86 - .byte 0 - .byte 0 - .byte 9 - .2byte 0 - .byte 1 - .byte 8 diff --git a/data/maps/SecretBase_BlueCave3/header.inc b/data/maps/SecretBase_BlueCave3/header.inc new file mode 100644 index 000000000..2adbdb4e5 --- /dev/null +++ b/data/maps/SecretBase_BlueCave3/header.inc @@ -0,0 +1,14 @@ +SecretBase_BlueCave3:: @ 8307860 + .4byte SecretBase_BlueCave3_MapAttributes + .4byte SecretBase_BlueCave3_MapEvents + .4byte SecretBase_BlueCave3_MapScripts + .4byte 0x0 + .2byte BGM_MACHI_S3 + .2byte 212 + .byte 86 + .byte 0 + .byte 0 + .byte 9 + .2byte 0 + .byte 1 + .byte 8 diff --git a/data/maps/SecretBase_BlueCave3/header.s b/data/maps/SecretBase_BlueCave3/header.s deleted file mode 100644 index 2adbdb4e5..000000000 --- a/data/maps/SecretBase_BlueCave3/header.s +++ /dev/null @@ -1,14 +0,0 @@ -SecretBase_BlueCave3:: @ 8307860 - .4byte SecretBase_BlueCave3_MapAttributes - .4byte SecretBase_BlueCave3_MapEvents - .4byte SecretBase_BlueCave3_MapScripts - .4byte 0x0 - .2byte BGM_MACHI_S3 - .2byte 212 - .byte 86 - .byte 0 - .byte 0 - .byte 9 - .2byte 0 - .byte 1 - .byte 8 diff --git a/data/maps/SecretBase_BlueCave4/header.inc b/data/maps/SecretBase_BlueCave4/header.inc new file mode 100644 index 000000000..269a276ef --- /dev/null +++ b/data/maps/SecretBase_BlueCave4/header.inc @@ -0,0 +1,14 @@ +SecretBase_BlueCave4:: @ 8307908 + .4byte SecretBase_BlueCave4_MapAttributes + .4byte SecretBase_BlueCave4_MapEvents + .4byte SecretBase_BlueCave4_MapScripts + .4byte 0x0 + .2byte BGM_MACHI_S3 + .2byte 218 + .byte 86 + .byte 0 + .byte 0 + .byte 9 + .2byte 0 + .byte 1 + .byte 8 diff --git a/data/maps/SecretBase_BlueCave4/header.s b/data/maps/SecretBase_BlueCave4/header.s deleted file mode 100644 index 269a276ef..000000000 --- a/data/maps/SecretBase_BlueCave4/header.s +++ /dev/null @@ -1,14 +0,0 @@ -SecretBase_BlueCave4:: @ 8307908 - .4byte SecretBase_BlueCave4_MapAttributes - .4byte SecretBase_BlueCave4_MapEvents - .4byte SecretBase_BlueCave4_MapScripts - .4byte 0x0 - .2byte BGM_MACHI_S3 - .2byte 218 - .byte 86 - .byte 0 - .byte 0 - .byte 9 - .2byte 0 - .byte 1 - .byte 8 diff --git a/data/maps/SecretBase_BrownCave1/header.inc b/data/maps/SecretBase_BrownCave1/header.inc new file mode 100644 index 000000000..b54737d93 --- /dev/null +++ b/data/maps/SecretBase_BrownCave1/header.inc @@ -0,0 +1,14 @@ +SecretBase_BrownCave1:: @ 83076F4 + .4byte SecretBase_BrownCave1_MapAttributes + .4byte SecretBase_BrownCave1_MapEvents + .4byte SecretBase_BrownCave1_MapScripts + .4byte 0x0 + .2byte BGM_MACHI_S3 + .2byte 199 + .byte 86 + .byte 0 + .byte 0 + .byte 9 + .2byte 0 + .byte 1 + .byte 8 diff --git a/data/maps/SecretBase_BrownCave1/header.s b/data/maps/SecretBase_BrownCave1/header.s deleted file mode 100644 index b54737d93..000000000 --- a/data/maps/SecretBase_BrownCave1/header.s +++ /dev/null @@ -1,14 +0,0 @@ -SecretBase_BrownCave1:: @ 83076F4 - .4byte SecretBase_BrownCave1_MapAttributes - .4byte SecretBase_BrownCave1_MapEvents - .4byte SecretBase_BrownCave1_MapScripts - .4byte 0x0 - .2byte BGM_MACHI_S3 - .2byte 199 - .byte 86 - .byte 0 - .byte 0 - .byte 9 - .2byte 0 - .byte 1 - .byte 8 diff --git a/data/maps/SecretBase_BrownCave2/header.inc b/data/maps/SecretBase_BrownCave2/header.inc new file mode 100644 index 000000000..e84bfd2eb --- /dev/null +++ b/data/maps/SecretBase_BrownCave2/header.inc @@ -0,0 +1,14 @@ +SecretBase_BrownCave2:: @ 830779C + .4byte SecretBase_BrownCave2_MapAttributes + .4byte SecretBase_BrownCave2_MapEvents + .4byte SecretBase_BrownCave2_MapScripts + .4byte 0x0 + .2byte BGM_MACHI_S3 + .2byte 205 + .byte 86 + .byte 0 + .byte 0 + .byte 9 + .2byte 0 + .byte 1 + .byte 8 diff --git a/data/maps/SecretBase_BrownCave2/header.s b/data/maps/SecretBase_BrownCave2/header.s deleted file mode 100644 index e84bfd2eb..000000000 --- a/data/maps/SecretBase_BrownCave2/header.s +++ /dev/null @@ -1,14 +0,0 @@ -SecretBase_BrownCave2:: @ 830779C - .4byte SecretBase_BrownCave2_MapAttributes - .4byte SecretBase_BrownCave2_MapEvents - .4byte SecretBase_BrownCave2_MapScripts - .4byte 0x0 - .2byte BGM_MACHI_S3 - .2byte 205 - .byte 86 - .byte 0 - .byte 0 - .byte 9 - .2byte 0 - .byte 1 - .byte 8 diff --git a/data/maps/SecretBase_BrownCave3/header.inc b/data/maps/SecretBase_BrownCave3/header.inc new file mode 100644 index 000000000..9e0dc78e0 --- /dev/null +++ b/data/maps/SecretBase_BrownCave3/header.inc @@ -0,0 +1,14 @@ +SecretBase_BrownCave3:: @ 8307844 + .4byte SecretBase_BrownCave3_MapAttributes + .4byte SecretBase_BrownCave3_MapEvents + .4byte SecretBase_BrownCave3_MapScripts + .4byte 0x0 + .2byte BGM_MACHI_S3 + .2byte 211 + .byte 86 + .byte 0 + .byte 0 + .byte 9 + .2byte 0 + .byte 1 + .byte 8 diff --git a/data/maps/SecretBase_BrownCave3/header.s b/data/maps/SecretBase_BrownCave3/header.s deleted file mode 100644 index 9e0dc78e0..000000000 --- a/data/maps/SecretBase_BrownCave3/header.s +++ /dev/null @@ -1,14 +0,0 @@ -SecretBase_BrownCave3:: @ 8307844 - .4byte SecretBase_BrownCave3_MapAttributes - .4byte SecretBase_BrownCave3_MapEvents - .4byte SecretBase_BrownCave3_MapScripts - .4byte 0x0 - .2byte BGM_MACHI_S3 - .2byte 211 - .byte 86 - .byte 0 - .byte 0 - .byte 9 - .2byte 0 - .byte 1 - .byte 8 diff --git a/data/maps/SecretBase_BrownCave4/header.inc b/data/maps/SecretBase_BrownCave4/header.inc new file mode 100644 index 000000000..d21c844da --- /dev/null +++ b/data/maps/SecretBase_BrownCave4/header.inc @@ -0,0 +1,14 @@ +SecretBase_BrownCave4:: @ 83078EC + .4byte SecretBase_BrownCave4_MapAttributes + .4byte SecretBase_BrownCave4_MapEvents + .4byte SecretBase_BrownCave4_MapScripts + .4byte 0x0 + .2byte BGM_MACHI_S3 + .2byte 217 + .byte 86 + .byte 0 + .byte 0 + .byte 9 + .2byte 0 + .byte 1 + .byte 8 diff --git a/data/maps/SecretBase_BrownCave4/header.s b/data/maps/SecretBase_BrownCave4/header.s deleted file mode 100644 index d21c844da..000000000 --- a/data/maps/SecretBase_BrownCave4/header.s +++ /dev/null @@ -1,14 +0,0 @@ -SecretBase_BrownCave4:: @ 83078EC - .4byte SecretBase_BrownCave4_MapAttributes - .4byte SecretBase_BrownCave4_MapEvents - .4byte SecretBase_BrownCave4_MapScripts - .4byte 0x0 - .2byte BGM_MACHI_S3 - .2byte 217 - .byte 86 - .byte 0 - .byte 0 - .byte 9 - .2byte 0 - .byte 1 - .byte 8 diff --git a/data/maps/SecretBase_RedCave1/header.inc b/data/maps/SecretBase_RedCave1/header.inc new file mode 100644 index 000000000..60df36c7e --- /dev/null +++ b/data/maps/SecretBase_RedCave1/header.inc @@ -0,0 +1,14 @@ +SecretBase_RedCave1:: @ 83076D8 + .4byte SecretBase_RedCave1_MapAttributes + .4byte SecretBase_RedCave1_MapEvents + .4byte SecretBase_RedCave1_MapScripts + .4byte 0x0 + .2byte BGM_MACHI_S3 + .2byte 198 + .byte 86 + .byte 0 + .byte 0 + .byte 9 + .2byte 0 + .byte 1 + .byte 8 diff --git a/data/maps/SecretBase_RedCave1/header.s b/data/maps/SecretBase_RedCave1/header.s deleted file mode 100644 index 60df36c7e..000000000 --- a/data/maps/SecretBase_RedCave1/header.s +++ /dev/null @@ -1,14 +0,0 @@ -SecretBase_RedCave1:: @ 83076D8 - .4byte SecretBase_RedCave1_MapAttributes - .4byte SecretBase_RedCave1_MapEvents - .4byte SecretBase_RedCave1_MapScripts - .4byte 0x0 - .2byte BGM_MACHI_S3 - .2byte 198 - .byte 86 - .byte 0 - .byte 0 - .byte 9 - .2byte 0 - .byte 1 - .byte 8 diff --git a/data/maps/SecretBase_RedCave2/header.inc b/data/maps/SecretBase_RedCave2/header.inc new file mode 100644 index 000000000..5325c424e --- /dev/null +++ b/data/maps/SecretBase_RedCave2/header.inc @@ -0,0 +1,14 @@ +SecretBase_RedCave2:: @ 8307780 + .4byte SecretBase_RedCave2_MapAttributes + .4byte SecretBase_RedCave2_MapEvents + .4byte SecretBase_RedCave2_MapScripts + .4byte 0x0 + .2byte BGM_MACHI_S3 + .2byte 204 + .byte 86 + .byte 0 + .byte 0 + .byte 9 + .2byte 0 + .byte 1 + .byte 8 diff --git a/data/maps/SecretBase_RedCave2/header.s b/data/maps/SecretBase_RedCave2/header.s deleted file mode 100644 index 5325c424e..000000000 --- a/data/maps/SecretBase_RedCave2/header.s +++ /dev/null @@ -1,14 +0,0 @@ -SecretBase_RedCave2:: @ 8307780 - .4byte SecretBase_RedCave2_MapAttributes - .4byte SecretBase_RedCave2_MapEvents - .4byte SecretBase_RedCave2_MapScripts - .4byte 0x0 - .2byte BGM_MACHI_S3 - .2byte 204 - .byte 86 - .byte 0 - .byte 0 - .byte 9 - .2byte 0 - .byte 1 - .byte 8 diff --git a/data/maps/SecretBase_RedCave3/header.inc b/data/maps/SecretBase_RedCave3/header.inc new file mode 100644 index 000000000..a86997805 --- /dev/null +++ b/data/maps/SecretBase_RedCave3/header.inc @@ -0,0 +1,14 @@ +SecretBase_RedCave3:: @ 8307828 + .4byte SecretBase_RedCave3_MapAttributes + .4byte SecretBase_RedCave3_MapEvents + .4byte SecretBase_RedCave3_MapScripts + .4byte 0x0 + .2byte BGM_MACHI_S3 + .2byte 210 + .byte 86 + .byte 0 + .byte 0 + .byte 9 + .2byte 0 + .byte 1 + .byte 8 diff --git a/data/maps/SecretBase_RedCave3/header.s b/data/maps/SecretBase_RedCave3/header.s deleted file mode 100644 index a86997805..000000000 --- a/data/maps/SecretBase_RedCave3/header.s +++ /dev/null @@ -1,14 +0,0 @@ -SecretBase_RedCave3:: @ 8307828 - .4byte SecretBase_RedCave3_MapAttributes - .4byte SecretBase_RedCave3_MapEvents - .4byte SecretBase_RedCave3_MapScripts - .4byte 0x0 - .2byte BGM_MACHI_S3 - .2byte 210 - .byte 86 - .byte 0 - .byte 0 - .byte 9 - .2byte 0 - .byte 1 - .byte 8 diff --git a/data/maps/SecretBase_RedCave4/header.inc b/data/maps/SecretBase_RedCave4/header.inc new file mode 100644 index 000000000..40e830726 --- /dev/null +++ b/data/maps/SecretBase_RedCave4/header.inc @@ -0,0 +1,14 @@ +SecretBase_RedCave4:: @ 83078D0 + .4byte SecretBase_RedCave4_MapAttributes + .4byte SecretBase_RedCave4_MapEvents + .4byte SecretBase_RedCave4_MapScripts + .4byte 0x0 + .2byte BGM_MACHI_S3 + .2byte 216 + .byte 86 + .byte 0 + .byte 0 + .byte 9 + .2byte 0 + .byte 1 + .byte 8 diff --git a/data/maps/SecretBase_RedCave4/header.s b/data/maps/SecretBase_RedCave4/header.s deleted file mode 100644 index 40e830726..000000000 --- a/data/maps/SecretBase_RedCave4/header.s +++ /dev/null @@ -1,14 +0,0 @@ -SecretBase_RedCave4:: @ 83078D0 - .4byte SecretBase_RedCave4_MapAttributes - .4byte SecretBase_RedCave4_MapEvents - .4byte SecretBase_RedCave4_MapScripts - .4byte 0x0 - .2byte BGM_MACHI_S3 - .2byte 216 - .byte 86 - .byte 0 - .byte 0 - .byte 9 - .2byte 0 - .byte 1 - .byte 8 diff --git a/data/maps/SecretBase_Shrub1/header.inc b/data/maps/SecretBase_Shrub1/header.inc new file mode 100644 index 000000000..3b634c729 --- /dev/null +++ b/data/maps/SecretBase_Shrub1/header.inc @@ -0,0 +1,14 @@ +SecretBase_Shrub1:: @ 8307764 + .4byte SecretBase_Shrub1_MapAttributes + .4byte SecretBase_Shrub1_MapEvents + .4byte SecretBase_Shrub1_MapScripts + .4byte 0x0 + .2byte BGM_MACHI_S3 + .2byte 203 + .byte 86 + .byte 0 + .byte 0 + .byte 9 + .2byte 0 + .byte 1 + .byte 8 diff --git a/data/maps/SecretBase_Shrub1/header.s b/data/maps/SecretBase_Shrub1/header.s deleted file mode 100644 index 3b634c729..000000000 --- a/data/maps/SecretBase_Shrub1/header.s +++ /dev/null @@ -1,14 +0,0 @@ -SecretBase_Shrub1:: @ 8307764 - .4byte SecretBase_Shrub1_MapAttributes - .4byte SecretBase_Shrub1_MapEvents - .4byte SecretBase_Shrub1_MapScripts - .4byte 0x0 - .2byte BGM_MACHI_S3 - .2byte 203 - .byte 86 - .byte 0 - .byte 0 - .byte 9 - .2byte 0 - .byte 1 - .byte 8 diff --git a/data/maps/SecretBase_Shrub2/header.inc b/data/maps/SecretBase_Shrub2/header.inc new file mode 100644 index 000000000..1c27f8945 --- /dev/null +++ b/data/maps/SecretBase_Shrub2/header.inc @@ -0,0 +1,14 @@ +SecretBase_Shrub2:: @ 830780C + .4byte SecretBase_Shrub2_MapAttributes + .4byte SecretBase_Shrub2_MapEvents + .4byte SecretBase_Shrub2_MapScripts + .4byte 0x0 + .2byte BGM_MACHI_S3 + .2byte 209 + .byte 86 + .byte 0 + .byte 0 + .byte 9 + .2byte 0 + .byte 1 + .byte 8 diff --git a/data/maps/SecretBase_Shrub2/header.s b/data/maps/SecretBase_Shrub2/header.s deleted file mode 100644 index 1c27f8945..000000000 --- a/data/maps/SecretBase_Shrub2/header.s +++ /dev/null @@ -1,14 +0,0 @@ -SecretBase_Shrub2:: @ 830780C - .4byte SecretBase_Shrub2_MapAttributes - .4byte SecretBase_Shrub2_MapEvents - .4byte SecretBase_Shrub2_MapScripts - .4byte 0x0 - .2byte BGM_MACHI_S3 - .2byte 209 - .byte 86 - .byte 0 - .byte 0 - .byte 9 - .2byte 0 - .byte 1 - .byte 8 diff --git a/data/maps/SecretBase_Shrub3/header.inc b/data/maps/SecretBase_Shrub3/header.inc new file mode 100644 index 000000000..e6e85c9ed --- /dev/null +++ b/data/maps/SecretBase_Shrub3/header.inc @@ -0,0 +1,14 @@ +SecretBase_Shrub3:: @ 83078B4 + .4byte SecretBase_Shrub3_MapAttributes + .4byte SecretBase_Shrub3_MapEvents + .4byte SecretBase_Shrub3_MapScripts + .4byte 0x0 + .2byte BGM_MACHI_S3 + .2byte 215 + .byte 86 + .byte 0 + .byte 0 + .byte 9 + .2byte 0 + .byte 1 + .byte 8 diff --git a/data/maps/SecretBase_Shrub3/header.s b/data/maps/SecretBase_Shrub3/header.s deleted file mode 100644 index e6e85c9ed..000000000 --- a/data/maps/SecretBase_Shrub3/header.s +++ /dev/null @@ -1,14 +0,0 @@ -SecretBase_Shrub3:: @ 83078B4 - .4byte SecretBase_Shrub3_MapAttributes - .4byte SecretBase_Shrub3_MapEvents - .4byte SecretBase_Shrub3_MapScripts - .4byte 0x0 - .2byte BGM_MACHI_S3 - .2byte 215 - .byte 86 - .byte 0 - .byte 0 - .byte 9 - .2byte 0 - .byte 1 - .byte 8 diff --git a/data/maps/SecretBase_Shrub4/header.inc b/data/maps/SecretBase_Shrub4/header.inc new file mode 100644 index 000000000..1e610463f --- /dev/null +++ b/data/maps/SecretBase_Shrub4/header.inc @@ -0,0 +1,14 @@ +SecretBase_Shrub4:: @ 830795C + .4byte SecretBase_Shrub4_MapAttributes + .4byte SecretBase_Shrub4_MapEvents + .4byte SecretBase_Shrub4_MapScripts + .4byte 0x0 + .2byte BGM_MACHI_S3 + .2byte 221 + .byte 86 + .byte 0 + .byte 0 + .byte 9 + .2byte 0 + .byte 1 + .byte 8 diff --git a/data/maps/SecretBase_Shrub4/header.s b/data/maps/SecretBase_Shrub4/header.s deleted file mode 100644 index 1e610463f..000000000 --- a/data/maps/SecretBase_Shrub4/header.s +++ /dev/null @@ -1,14 +0,0 @@ -SecretBase_Shrub4:: @ 830795C - .4byte SecretBase_Shrub4_MapAttributes - .4byte SecretBase_Shrub4_MapEvents - .4byte SecretBase_Shrub4_MapScripts - .4byte 0x0 - .2byte BGM_MACHI_S3 - .2byte 221 - .byte 86 - .byte 0 - .byte 0 - .byte 9 - .2byte 0 - .byte 1 - .byte 8 diff --git a/data/maps/SecretBase_Tree1/header.inc b/data/maps/SecretBase_Tree1/header.inc new file mode 100644 index 000000000..64722268c --- /dev/null +++ b/data/maps/SecretBase_Tree1/header.inc @@ -0,0 +1,14 @@ +SecretBase_Tree1:: @ 8307748 + .4byte SecretBase_Tree1_MapAttributes + .4byte SecretBase_Tree1_MapEvents + .4byte SecretBase_Tree1_MapScripts + .4byte 0x0 + .2byte BGM_MACHI_S3 + .2byte 202 + .byte 86 + .byte 0 + .byte 0 + .byte 9 + .2byte 0 + .byte 1 + .byte 8 diff --git a/data/maps/SecretBase_Tree1/header.s b/data/maps/SecretBase_Tree1/header.s deleted file mode 100644 index 64722268c..000000000 --- a/data/maps/SecretBase_Tree1/header.s +++ /dev/null @@ -1,14 +0,0 @@ -SecretBase_Tree1:: @ 8307748 - .4byte SecretBase_Tree1_MapAttributes - .4byte SecretBase_Tree1_MapEvents - .4byte SecretBase_Tree1_MapScripts - .4byte 0x0 - .2byte BGM_MACHI_S3 - .2byte 202 - .byte 86 - .byte 0 - .byte 0 - .byte 9 - .2byte 0 - .byte 1 - .byte 8 diff --git a/data/maps/SecretBase_Tree2/header.inc b/data/maps/SecretBase_Tree2/header.inc new file mode 100644 index 000000000..fefd54e68 --- /dev/null +++ b/data/maps/SecretBase_Tree2/header.inc @@ -0,0 +1,14 @@ +SecretBase_Tree2:: @ 83077F0 + .4byte SecretBase_Tree2_MapAttributes + .4byte SecretBase_Tree2_MapEvents + .4byte SecretBase_Tree2_MapScripts + .4byte 0x0 + .2byte BGM_MACHI_S3 + .2byte 208 + .byte 86 + .byte 0 + .byte 0 + .byte 9 + .2byte 0 + .byte 1 + .byte 8 diff --git a/data/maps/SecretBase_Tree2/header.s b/data/maps/SecretBase_Tree2/header.s deleted file mode 100644 index fefd54e68..000000000 --- a/data/maps/SecretBase_Tree2/header.s +++ /dev/null @@ -1,14 +0,0 @@ -SecretBase_Tree2:: @ 83077F0 - .4byte SecretBase_Tree2_MapAttributes - .4byte SecretBase_Tree2_MapEvents - .4byte SecretBase_Tree2_MapScripts - .4byte 0x0 - .2byte BGM_MACHI_S3 - .2byte 208 - .byte 86 - .byte 0 - .byte 0 - .byte 9 - .2byte 0 - .byte 1 - .byte 8 diff --git a/data/maps/SecretBase_Tree3/header.inc b/data/maps/SecretBase_Tree3/header.inc new file mode 100644 index 000000000..09e55e66d --- /dev/null +++ b/data/maps/SecretBase_Tree3/header.inc @@ -0,0 +1,14 @@ +SecretBase_Tree3:: @ 8307898 + .4byte SecretBase_Tree3_MapAttributes + .4byte SecretBase_Tree3_MapEvents + .4byte SecretBase_Tree3_MapScripts + .4byte 0x0 + .2byte BGM_MACHI_S3 + .2byte 214 + .byte 86 + .byte 0 + .byte 0 + .byte 9 + .2byte 0 + .byte 1 + .byte 8 diff --git a/data/maps/SecretBase_Tree3/header.s b/data/maps/SecretBase_Tree3/header.s deleted file mode 100644 index 09e55e66d..000000000 --- a/data/maps/SecretBase_Tree3/header.s +++ /dev/null @@ -1,14 +0,0 @@ -SecretBase_Tree3:: @ 8307898 - .4byte SecretBase_Tree3_MapAttributes - .4byte SecretBase_Tree3_MapEvents - .4byte SecretBase_Tree3_MapScripts - .4byte 0x0 - .2byte BGM_MACHI_S3 - .2byte 214 - .byte 86 - .byte 0 - .byte 0 - .byte 9 - .2byte 0 - .byte 1 - .byte 8 diff --git a/data/maps/SecretBase_Tree4/header.inc b/data/maps/SecretBase_Tree4/header.inc new file mode 100644 index 000000000..cfb58242e --- /dev/null +++ b/data/maps/SecretBase_Tree4/header.inc @@ -0,0 +1,14 @@ +SecretBase_Tree4:: @ 8307940 + .4byte SecretBase_Tree4_MapAttributes + .4byte SecretBase_Tree4_MapEvents + .4byte SecretBase_Tree4_MapScripts + .4byte 0x0 + .2byte BGM_MACHI_S3 + .2byte 220 + .byte 86 + .byte 0 + .byte 0 + .byte 9 + .2byte 0 + .byte 1 + .byte 8 diff --git a/data/maps/SecretBase_Tree4/header.s b/data/maps/SecretBase_Tree4/header.s deleted file mode 100644 index cfb58242e..000000000 --- a/data/maps/SecretBase_Tree4/header.s +++ /dev/null @@ -1,14 +0,0 @@ -SecretBase_Tree4:: @ 8307940 - .4byte SecretBase_Tree4_MapAttributes - .4byte SecretBase_Tree4_MapEvents - .4byte SecretBase_Tree4_MapScripts - .4byte 0x0 - .2byte BGM_MACHI_S3 - .2byte 220 - .byte 86 - .byte 0 - .byte 0 - .byte 9 - .2byte 0 - .byte 1 - .byte 8 diff --git a/data/maps/SecretBase_YellowCave1/header.inc b/data/maps/SecretBase_YellowCave1/header.inc new file mode 100644 index 000000000..42a63256f --- /dev/null +++ b/data/maps/SecretBase_YellowCave1/header.inc @@ -0,0 +1,14 @@ +SecretBase_YellowCave1:: @ 830772C + .4byte SecretBase_YellowCave1_MapAttributes + .4byte SecretBase_YellowCave1_MapEvents + .4byte SecretBase_YellowCave1_MapScripts + .4byte 0x0 + .2byte BGM_MACHI_S3 + .2byte 201 + .byte 86 + .byte 0 + .byte 0 + .byte 9 + .2byte 0 + .byte 1 + .byte 8 diff --git a/data/maps/SecretBase_YellowCave1/header.s b/data/maps/SecretBase_YellowCave1/header.s deleted file mode 100644 index 42a63256f..000000000 --- a/data/maps/SecretBase_YellowCave1/header.s +++ /dev/null @@ -1,14 +0,0 @@ -SecretBase_YellowCave1:: @ 830772C - .4byte SecretBase_YellowCave1_MapAttributes - .4byte SecretBase_YellowCave1_MapEvents - .4byte SecretBase_YellowCave1_MapScripts - .4byte 0x0 - .2byte BGM_MACHI_S3 - .2byte 201 - .byte 86 - .byte 0 - .byte 0 - .byte 9 - .2byte 0 - .byte 1 - .byte 8 diff --git a/data/maps/SecretBase_YellowCave2/header.inc b/data/maps/SecretBase_YellowCave2/header.inc new file mode 100644 index 000000000..d57acde5c --- /dev/null +++ b/data/maps/SecretBase_YellowCave2/header.inc @@ -0,0 +1,14 @@ +SecretBase_YellowCave2:: @ 83077D4 + .4byte SecretBase_YellowCave2_MapAttributes + .4byte SecretBase_YellowCave2_MapEvents + .4byte SecretBase_YellowCave2_MapScripts + .4byte 0x0 + .2byte BGM_MACHI_S3 + .2byte 207 + .byte 86 + .byte 0 + .byte 0 + .byte 9 + .2byte 0 + .byte 1 + .byte 8 diff --git a/data/maps/SecretBase_YellowCave2/header.s b/data/maps/SecretBase_YellowCave2/header.s deleted file mode 100644 index d57acde5c..000000000 --- a/data/maps/SecretBase_YellowCave2/header.s +++ /dev/null @@ -1,14 +0,0 @@ -SecretBase_YellowCave2:: @ 83077D4 - .4byte SecretBase_YellowCave2_MapAttributes - .4byte SecretBase_YellowCave2_MapEvents - .4byte SecretBase_YellowCave2_MapScripts - .4byte 0x0 - .2byte BGM_MACHI_S3 - .2byte 207 - .byte 86 - .byte 0 - .byte 0 - .byte 9 - .2byte 0 - .byte 1 - .byte 8 diff --git a/data/maps/SecretBase_YellowCave3/header.inc b/data/maps/SecretBase_YellowCave3/header.inc new file mode 100644 index 000000000..ecb6b7086 --- /dev/null +++ b/data/maps/SecretBase_YellowCave3/header.inc @@ -0,0 +1,14 @@ +SecretBase_YellowCave3:: @ 830787C + .4byte SecretBase_YellowCave3_MapAttributes + .4byte SecretBase_YellowCave3_MapEvents + .4byte SecretBase_YellowCave3_MapScripts + .4byte 0x0 + .2byte BGM_MACHI_S3 + .2byte 213 + .byte 86 + .byte 0 + .byte 0 + .byte 9 + .2byte 0 + .byte 1 + .byte 8 diff --git a/data/maps/SecretBase_YellowCave3/header.s b/data/maps/SecretBase_YellowCave3/header.s deleted file mode 100644 index ecb6b7086..000000000 --- a/data/maps/SecretBase_YellowCave3/header.s +++ /dev/null @@ -1,14 +0,0 @@ -SecretBase_YellowCave3:: @ 830787C - .4byte SecretBase_YellowCave3_MapAttributes - .4byte SecretBase_YellowCave3_MapEvents - .4byte SecretBase_YellowCave3_MapScripts - .4byte 0x0 - .2byte BGM_MACHI_S3 - .2byte 213 - .byte 86 - .byte 0 - .byte 0 - .byte 9 - .2byte 0 - .byte 1 - .byte 8 diff --git a/data/maps/SecretBase_YellowCave4/header.inc b/data/maps/SecretBase_YellowCave4/header.inc new file mode 100644 index 000000000..97de9362b --- /dev/null +++ b/data/maps/SecretBase_YellowCave4/header.inc @@ -0,0 +1,14 @@ +SecretBase_YellowCave4:: @ 8307924 + .4byte SecretBase_YellowCave4_MapAttributes + .4byte SecretBase_YellowCave4_MapEvents + .4byte SecretBase_YellowCave4_MapScripts + .4byte 0x0 + .2byte BGM_MACHI_S3 + .2byte 219 + .byte 86 + .byte 0 + .byte 0 + .byte 9 + .2byte 0 + .byte 1 + .byte 8 diff --git a/data/maps/SecretBase_YellowCave4/header.s b/data/maps/SecretBase_YellowCave4/header.s deleted file mode 100644 index 97de9362b..000000000 --- a/data/maps/SecretBase_YellowCave4/header.s +++ /dev/null @@ -1,14 +0,0 @@ -SecretBase_YellowCave4:: @ 8307924 - .4byte SecretBase_YellowCave4_MapAttributes - .4byte SecretBase_YellowCave4_MapEvents - .4byte SecretBase_YellowCave4_MapScripts - .4byte 0x0 - .2byte BGM_MACHI_S3 - .2byte 219 - .byte 86 - .byte 0 - .byte 0 - .byte 9 - .2byte 0 - .byte 1 - .byte 8 diff --git a/data/maps/ShoalCave_HighTideEntranceRoom/header.inc b/data/maps/ShoalCave_HighTideEntranceRoom/header.inc new file mode 100644 index 000000000..e012b1a69 --- /dev/null +++ b/data/maps/ShoalCave_HighTideEntranceRoom/header.inc @@ -0,0 +1,14 @@ +ShoalCave_HighTideEntranceRoom:: @ 83072E8 + .4byte ShoalCave_HighTideEntranceRoom_MapAttributes + .4byte ShoalCave_HighTideEntranceRoom_MapEvents + .4byte ShoalCave_HighTideEntranceRoom_MapScripts + .4byte 0x0 + .2byte BGM_M_DUNGON + .2byte 169 + .byte 67 + .byte 0 + .byte 0 + .byte 4 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/ShoalCave_HighTideEntranceRoom/header.s b/data/maps/ShoalCave_HighTideEntranceRoom/header.s deleted file mode 100644 index e012b1a69..000000000 --- a/data/maps/ShoalCave_HighTideEntranceRoom/header.s +++ /dev/null @@ -1,14 +0,0 @@ -ShoalCave_HighTideEntranceRoom:: @ 83072E8 - .4byte ShoalCave_HighTideEntranceRoom_MapAttributes - .4byte ShoalCave_HighTideEntranceRoom_MapEvents - .4byte ShoalCave_HighTideEntranceRoom_MapScripts - .4byte 0x0 - .2byte BGM_M_DUNGON - .2byte 169 - .byte 67 - .byte 0 - .byte 0 - .byte 4 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/ShoalCave_HighTideInnerRoom/header.inc b/data/maps/ShoalCave_HighTideInnerRoom/header.inc new file mode 100644 index 000000000..c3f16869b --- /dev/null +++ b/data/maps/ShoalCave_HighTideInnerRoom/header.inc @@ -0,0 +1,14 @@ +ShoalCave_HighTideInnerRoom:: @ 8307304 + .4byte ShoalCave_HighTideInnerRoom_MapAttributes + .4byte ShoalCave_HighTideInnerRoom_MapEvents + .4byte ShoalCave_HighTideInnerRoom_MapScripts + .4byte 0x0 + .2byte BGM_M_DUNGON + .2byte 170 + .byte 67 + .byte 0 + .byte 0 + .byte 4 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/ShoalCave_HighTideInnerRoom/header.s b/data/maps/ShoalCave_HighTideInnerRoom/header.s deleted file mode 100644 index c3f16869b..000000000 --- a/data/maps/ShoalCave_HighTideInnerRoom/header.s +++ /dev/null @@ -1,14 +0,0 @@ -ShoalCave_HighTideInnerRoom:: @ 8307304 - .4byte ShoalCave_HighTideInnerRoom_MapAttributes - .4byte ShoalCave_HighTideInnerRoom_MapEvents - .4byte ShoalCave_HighTideInnerRoom_MapScripts - .4byte 0x0 - .2byte BGM_M_DUNGON - .2byte 170 - .byte 67 - .byte 0 - .byte 0 - .byte 4 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/header.inc b/data/maps/ShoalCave_LowTideEntranceRoom/header.inc new file mode 100644 index 000000000..db63a0f9d --- /dev/null +++ b/data/maps/ShoalCave_LowTideEntranceRoom/header.inc @@ -0,0 +1,14 @@ +ShoalCave_LowTideEntranceRoom:: @ 8307278 + .4byte ShoalCave_LowTideEntranceRoom_MapAttributes + .4byte ShoalCave_LowTideEntranceRoom_MapEvents + .4byte ShoalCave_LowTideEntranceRoom_MapScripts + .4byte 0x0 + .2byte BGM_M_DUNGON + .2byte 165 + .byte 67 + .byte 0 + .byte 0 + .byte 4 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/header.s b/data/maps/ShoalCave_LowTideEntranceRoom/header.s deleted file mode 100644 index db63a0f9d..000000000 --- a/data/maps/ShoalCave_LowTideEntranceRoom/header.s +++ /dev/null @@ -1,14 +0,0 @@ -ShoalCave_LowTideEntranceRoom:: @ 8307278 - .4byte ShoalCave_LowTideEntranceRoom_MapAttributes - .4byte ShoalCave_LowTideEntranceRoom_MapEvents - .4byte ShoalCave_LowTideEntranceRoom_MapScripts - .4byte 0x0 - .2byte BGM_M_DUNGON - .2byte 165 - .byte 67 - .byte 0 - .byte 0 - .byte 4 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/ShoalCave_LowTideIceRoom/header.inc b/data/maps/ShoalCave_LowTideIceRoom/header.inc new file mode 100644 index 000000000..ba36a090d --- /dev/null +++ b/data/maps/ShoalCave_LowTideIceRoom/header.inc @@ -0,0 +1,14 @@ +ShoalCave_LowTideIceRoom:: @ 8307684 + .4byte ShoalCave_LowTideIceRoom_MapAttributes + .4byte ShoalCave_LowTideIceRoom_MapEvents + .4byte ShoalCave_LowTideIceRoom_MapScripts + .4byte 0x0 + .2byte BGM_M_DUNGON + .2byte 329 + .byte 67 + .byte 0 + .byte 0 + .byte 4 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/ShoalCave_LowTideIceRoom/header.s b/data/maps/ShoalCave_LowTideIceRoom/header.s deleted file mode 100644 index ba36a090d..000000000 --- a/data/maps/ShoalCave_LowTideIceRoom/header.s +++ /dev/null @@ -1,14 +0,0 @@ -ShoalCave_LowTideIceRoom:: @ 8307684 - .4byte ShoalCave_LowTideIceRoom_MapAttributes - .4byte ShoalCave_LowTideIceRoom_MapEvents - .4byte ShoalCave_LowTideIceRoom_MapScripts - .4byte 0x0 - .2byte BGM_M_DUNGON - .2byte 329 - .byte 67 - .byte 0 - .byte 0 - .byte 4 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/ShoalCave_LowTideInnerRoom/header.inc b/data/maps/ShoalCave_LowTideInnerRoom/header.inc new file mode 100644 index 000000000..c038dafcd --- /dev/null +++ b/data/maps/ShoalCave_LowTideInnerRoom/header.inc @@ -0,0 +1,14 @@ +ShoalCave_LowTideInnerRoom:: @ 8307294 + .4byte ShoalCave_LowTideInnerRoom_MapAttributes + .4byte ShoalCave_LowTideInnerRoom_MapEvents + .4byte ShoalCave_LowTideInnerRoom_MapScripts + .4byte 0x0 + .2byte BGM_M_DUNGON + .2byte 166 + .byte 67 + .byte 0 + .byte 0 + .byte 4 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/ShoalCave_LowTideInnerRoom/header.s b/data/maps/ShoalCave_LowTideInnerRoom/header.s deleted file mode 100644 index c038dafcd..000000000 --- a/data/maps/ShoalCave_LowTideInnerRoom/header.s +++ /dev/null @@ -1,14 +0,0 @@ -ShoalCave_LowTideInnerRoom:: @ 8307294 - .4byte ShoalCave_LowTideInnerRoom_MapAttributes - .4byte ShoalCave_LowTideInnerRoom_MapEvents - .4byte ShoalCave_LowTideInnerRoom_MapScripts - .4byte 0x0 - .2byte BGM_M_DUNGON - .2byte 166 - .byte 67 - .byte 0 - .byte 0 - .byte 4 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/ShoalCave_LowTideLowerRoom/header.inc b/data/maps/ShoalCave_LowTideLowerRoom/header.inc new file mode 100644 index 000000000..6fe4efb01 --- /dev/null +++ b/data/maps/ShoalCave_LowTideLowerRoom/header.inc @@ -0,0 +1,14 @@ +ShoalCave_LowTideLowerRoom:: @ 83072CC + .4byte ShoalCave_LowTideLowerRoom_MapAttributes + .4byte ShoalCave_LowTideLowerRoom_MapEvents + .4byte ShoalCave_LowTideLowerRoom_MapScripts + .4byte 0x0 + .2byte BGM_M_DUNGON + .2byte 168 + .byte 67 + .byte 0 + .byte 0 + .byte 4 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/ShoalCave_LowTideLowerRoom/header.s b/data/maps/ShoalCave_LowTideLowerRoom/header.s deleted file mode 100644 index 6fe4efb01..000000000 --- a/data/maps/ShoalCave_LowTideLowerRoom/header.s +++ /dev/null @@ -1,14 +0,0 @@ -ShoalCave_LowTideLowerRoom:: @ 83072CC - .4byte ShoalCave_LowTideLowerRoom_MapAttributes - .4byte ShoalCave_LowTideLowerRoom_MapEvents - .4byte ShoalCave_LowTideLowerRoom_MapScripts - .4byte 0x0 - .2byte BGM_M_DUNGON - .2byte 168 - .byte 67 - .byte 0 - .byte 0 - .byte 4 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/ShoalCave_LowTideStairsRoom/header.inc b/data/maps/ShoalCave_LowTideStairsRoom/header.inc new file mode 100644 index 000000000..d3d904731 --- /dev/null +++ b/data/maps/ShoalCave_LowTideStairsRoom/header.inc @@ -0,0 +1,14 @@ +ShoalCave_LowTideStairsRoom:: @ 83072B0 + .4byte ShoalCave_LowTideStairsRoom_MapAttributes + .4byte ShoalCave_LowTideStairsRoom_MapEvents + .4byte ShoalCave_LowTideStairsRoom_MapScripts + .4byte 0x0 + .2byte BGM_M_DUNGON + .2byte 167 + .byte 67 + .byte 0 + .byte 0 + .byte 4 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/ShoalCave_LowTideStairsRoom/header.s b/data/maps/ShoalCave_LowTideStairsRoom/header.s deleted file mode 100644 index d3d904731..000000000 --- a/data/maps/ShoalCave_LowTideStairsRoom/header.s +++ /dev/null @@ -1,14 +0,0 @@ -ShoalCave_LowTideStairsRoom:: @ 83072B0 - .4byte ShoalCave_LowTideStairsRoom_MapAttributes - .4byte ShoalCave_LowTideStairsRoom_MapEvents - .4byte ShoalCave_LowTideStairsRoom_MapScripts - .4byte 0x0 - .2byte BGM_M_DUNGON - .2byte 167 - .byte 67 - .byte 0 - .byte 0 - .byte 4 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/SingleBattleColosseum/header.inc b/data/maps/SingleBattleColosseum/header.inc new file mode 100644 index 000000000..f62205a55 --- /dev/null +++ b/data/maps/SingleBattleColosseum/header.inc @@ -0,0 +1,14 @@ +SingleBattleColosseum:: @ 8307978 + .4byte SingleBattleColosseum_MapAttributes + .4byte SingleBattleColosseum_MapEvents + .4byte SingleBattleColosseum_MapScripts + .4byte 0x0 + .2byte BGM_RAINBOW + .2byte 222 + .byte 87 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 8 diff --git a/data/maps/SingleBattleColosseum/header.s b/data/maps/SingleBattleColosseum/header.s deleted file mode 100644 index f62205a55..000000000 --- a/data/maps/SingleBattleColosseum/header.s +++ /dev/null @@ -1,14 +0,0 @@ -SingleBattleColosseum:: @ 8307978 - .4byte SingleBattleColosseum_MapAttributes - .4byte SingleBattleColosseum_MapEvents - .4byte SingleBattleColosseum_MapScripts - .4byte 0x0 - .2byte BGM_RAINBOW - .2byte 222 - .byte 87 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 8 diff --git a/data/maps/SkyPillar_1F/header.inc b/data/maps/SkyPillar_1F/header.inc new file mode 100644 index 000000000..4ccc410da --- /dev/null +++ b/data/maps/SkyPillar_1F/header.inc @@ -0,0 +1,14 @@ +SkyPillar_1F:: @ 8307614 + .4byte SkyPillar_1F_MapAttributes + .4byte SkyPillar_1F_MapEvents + .4byte SkyPillar_1F_MapScripts + .4byte 0x0 + .2byte BGM_TOZAN + .2byte 323 + .byte 85 + .byte 0 + .byte 0 + .byte 4 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/SkyPillar_1F/header.s b/data/maps/SkyPillar_1F/header.s deleted file mode 100644 index 4ccc410da..000000000 --- a/data/maps/SkyPillar_1F/header.s +++ /dev/null @@ -1,14 +0,0 @@ -SkyPillar_1F:: @ 8307614 - .4byte SkyPillar_1F_MapAttributes - .4byte SkyPillar_1F_MapEvents - .4byte SkyPillar_1F_MapScripts - .4byte 0x0 - .2byte BGM_TOZAN - .2byte 323 - .byte 85 - .byte 0 - .byte 0 - .byte 4 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/SkyPillar_2F/header.inc b/data/maps/SkyPillar_2F/header.inc new file mode 100644 index 000000000..1e3b0393d --- /dev/null +++ b/data/maps/SkyPillar_2F/header.inc @@ -0,0 +1,14 @@ +SkyPillar_2F:: @ 8307630 + .4byte SkyPillar_2F_MapAttributes + .4byte SkyPillar_2F_MapEvents + .4byte SkyPillar_2F_MapScripts + .4byte 0x0 + .2byte BGM_TOZAN + .2byte 324 + .byte 85 + .byte 0 + .byte 0 + .byte 4 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/SkyPillar_2F/header.s b/data/maps/SkyPillar_2F/header.s deleted file mode 100644 index 1e3b0393d..000000000 --- a/data/maps/SkyPillar_2F/header.s +++ /dev/null @@ -1,14 +0,0 @@ -SkyPillar_2F:: @ 8307630 - .4byte SkyPillar_2F_MapAttributes - .4byte SkyPillar_2F_MapEvents - .4byte SkyPillar_2F_MapScripts - .4byte 0x0 - .2byte BGM_TOZAN - .2byte 324 - .byte 85 - .byte 0 - .byte 0 - .byte 4 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/SkyPillar_3F/header.inc b/data/maps/SkyPillar_3F/header.inc new file mode 100644 index 000000000..bd6d9cb86 --- /dev/null +++ b/data/maps/SkyPillar_3F/header.inc @@ -0,0 +1,14 @@ +SkyPillar_3F:: @ 830764C + .4byte SkyPillar_3F_MapAttributes + .4byte SkyPillar_3F_MapEvents + .4byte SkyPillar_3F_MapScripts + .4byte 0x0 + .2byte BGM_TOZAN + .2byte 325 + .byte 85 + .byte 0 + .byte 0 + .byte 4 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/SkyPillar_3F/header.s b/data/maps/SkyPillar_3F/header.s deleted file mode 100644 index bd6d9cb86..000000000 --- a/data/maps/SkyPillar_3F/header.s +++ /dev/null @@ -1,14 +0,0 @@ -SkyPillar_3F:: @ 830764C - .4byte SkyPillar_3F_MapAttributes - .4byte SkyPillar_3F_MapEvents - .4byte SkyPillar_3F_MapScripts - .4byte 0x0 - .2byte BGM_TOZAN - .2byte 325 - .byte 85 - .byte 0 - .byte 0 - .byte 4 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/SkyPillar_4F/header.inc b/data/maps/SkyPillar_4F/header.inc new file mode 100644 index 000000000..50869e629 --- /dev/null +++ b/data/maps/SkyPillar_4F/header.inc @@ -0,0 +1,14 @@ +SkyPillar_4F:: @ 8307668 + .4byte SkyPillar_4F_MapAttributes + .4byte SkyPillar_4F_MapEvents + .4byte SkyPillar_4F_MapScripts + .4byte 0x0 + .2byte BGM_TOZAN + .2byte 326 + .byte 85 + .byte 0 + .byte 0 + .byte 4 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/SkyPillar_4F/header.s b/data/maps/SkyPillar_4F/header.s deleted file mode 100644 index 50869e629..000000000 --- a/data/maps/SkyPillar_4F/header.s +++ /dev/null @@ -1,14 +0,0 @@ -SkyPillar_4F:: @ 8307668 - .4byte SkyPillar_4F_MapAttributes - .4byte SkyPillar_4F_MapEvents - .4byte SkyPillar_4F_MapScripts - .4byte 0x0 - .2byte BGM_TOZAN - .2byte 326 - .byte 85 - .byte 0 - .byte 0 - .byte 4 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/SkyPillar_5F/header.inc b/data/maps/SkyPillar_5F/header.inc new file mode 100644 index 000000000..16da8bcf4 --- /dev/null +++ b/data/maps/SkyPillar_5F/header.inc @@ -0,0 +1,14 @@ +SkyPillar_5F:: @ 83076A0 + .4byte SkyPillar_5F_MapAttributes + .4byte SkyPillar_5F_MapEvents + .4byte SkyPillar_5F_MapScripts + .4byte 0x0 + .2byte BGM_TOZAN + .2byte 331 + .byte 85 + .byte 0 + .byte 0 + .byte 4 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/SkyPillar_5F/header.s b/data/maps/SkyPillar_5F/header.s deleted file mode 100644 index 16da8bcf4..000000000 --- a/data/maps/SkyPillar_5F/header.s +++ /dev/null @@ -1,14 +0,0 @@ -SkyPillar_5F:: @ 83076A0 - .4byte SkyPillar_5F_MapAttributes - .4byte SkyPillar_5F_MapEvents - .4byte SkyPillar_5F_MapScripts - .4byte 0x0 - .2byte BGM_TOZAN - .2byte 331 - .byte 85 - .byte 0 - .byte 0 - .byte 4 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/SkyPillar_Entrance/header.inc b/data/maps/SkyPillar_Entrance/header.inc new file mode 100644 index 000000000..89d9becd9 --- /dev/null +++ b/data/maps/SkyPillar_Entrance/header.inc @@ -0,0 +1,14 @@ +SkyPillar_Entrance:: @ 83075DC + .4byte SkyPillar_Entrance_MapAttributes + .4byte SkyPillar_Entrance_MapEvents + .4byte SkyPillar_Entrance_MapScripts + .4byte 0x0 + .2byte BGM_TOZAN + .2byte 321 + .byte 85 + .byte 0 + .byte 0 + .byte 4 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/SkyPillar_Entrance/header.s b/data/maps/SkyPillar_Entrance/header.s deleted file mode 100644 index 89d9becd9..000000000 --- a/data/maps/SkyPillar_Entrance/header.s +++ /dev/null @@ -1,14 +0,0 @@ -SkyPillar_Entrance:: @ 83075DC - .4byte SkyPillar_Entrance_MapAttributes - .4byte SkyPillar_Entrance_MapEvents - .4byte SkyPillar_Entrance_MapScripts - .4byte 0x0 - .2byte BGM_TOZAN - .2byte 321 - .byte 85 - .byte 0 - .byte 0 - .byte 4 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/SkyPillar_Outside/header.inc b/data/maps/SkyPillar_Outside/header.inc new file mode 100644 index 000000000..44e9a5991 --- /dev/null +++ b/data/maps/SkyPillar_Outside/header.inc @@ -0,0 +1,14 @@ +SkyPillar_Outside:: @ 83075F8 + .4byte SkyPillar_Outside_MapAttributes + .4byte SkyPillar_Outside_MapEvents + .4byte SkyPillar_Outside_MapScripts + .4byte 0x0 + .2byte BGM_TOZAN + .2byte 322 + .byte 85 + .byte 0 + .byte 0 + .byte 3 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/SkyPillar_Outside/header.s b/data/maps/SkyPillar_Outside/header.s deleted file mode 100644 index 44e9a5991..000000000 --- a/data/maps/SkyPillar_Outside/header.s +++ /dev/null @@ -1,14 +0,0 @@ -SkyPillar_Outside:: @ 83075F8 - .4byte SkyPillar_Outside_MapAttributes - .4byte SkyPillar_Outside_MapEvents - .4byte SkyPillar_Outside_MapScripts - .4byte 0x0 - .2byte BGM_TOZAN - .2byte 322 - .byte 85 - .byte 0 - .byte 0 - .byte 3 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/SkyPillar_Top/header.inc b/data/maps/SkyPillar_Top/header.inc new file mode 100644 index 000000000..0c241fe27 --- /dev/null +++ b/data/maps/SkyPillar_Top/header.inc @@ -0,0 +1,14 @@ +SkyPillar_Top:: @ 83076BC + .4byte SkyPillar_Top_MapAttributes + .4byte SkyPillar_Top_MapEvents + .4byte SkyPillar_Top_MapScripts + .4byte 0x0 + .2byte BGM_TOZAN + .2byte 332 + .byte 85 + .byte 0 + .byte 0 + .byte 3 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/SkyPillar_Top/header.s b/data/maps/SkyPillar_Top/header.s deleted file mode 100644 index 0c241fe27..000000000 --- a/data/maps/SkyPillar_Top/header.s +++ /dev/null @@ -1,14 +0,0 @@ -SkyPillar_Top:: @ 83076BC - .4byte SkyPillar_Top_MapAttributes - .4byte SkyPillar_Top_MapEvents - .4byte SkyPillar_Top_MapScripts - .4byte 0x0 - .2byte BGM_TOZAN - .2byte 332 - .byte 85 - .byte 0 - .byte 0 - .byte 3 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/SlateportCity/connections.inc b/data/maps/SlateportCity/connections.inc new file mode 100644 index 000000000..2d3980a8c --- /dev/null +++ b/data/maps/SlateportCity/connections.inc @@ -0,0 +1,8 @@ +SlateportCity_MapConnectionsList:: @ 8308704 + connection up, 0, Route110 + connection down, 0, Route109 + connection right, 0, Route134 + +SlateportCity_MapConnections:: @ 8308728 + .4byte 0x3 + .4byte SlateportCity_MapConnectionsList diff --git a/data/maps/SlateportCity/connections.s b/data/maps/SlateportCity/connections.s deleted file mode 100644 index 2d3980a8c..000000000 --- a/data/maps/SlateportCity/connections.s +++ /dev/null @@ -1,8 +0,0 @@ -SlateportCity_MapConnectionsList:: @ 8308704 - connection up, 0, Route110 - connection down, 0, Route109 - connection right, 0, Route134 - -SlateportCity_MapConnections:: @ 8308728 - .4byte 0x3 - .4byte SlateportCity_MapConnectionsList diff --git a/data/maps/SlateportCity/header.inc b/data/maps/SlateportCity/header.inc new file mode 100644 index 000000000..6575e0de5 --- /dev/null +++ b/data/maps/SlateportCity/header.inc @@ -0,0 +1,14 @@ +SlateportCity:: @ 8305464 + .4byte SlateportCity_MapAttributes + .4byte SlateportCity_MapEvents + .4byte SlateportCity_MapScripts + .4byte SlateportCity_MapConnections + .2byte BGM_FINECITY + .2byte 2 + .byte 8 + .byte 0 + .byte 2 + .byte 2 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/SlateportCity/header.s b/data/maps/SlateportCity/header.s deleted file mode 100644 index 6575e0de5..000000000 --- a/data/maps/SlateportCity/header.s +++ /dev/null @@ -1,14 +0,0 @@ -SlateportCity:: @ 8305464 - .4byte SlateportCity_MapAttributes - .4byte SlateportCity_MapEvents - .4byte SlateportCity_MapScripts - .4byte SlateportCity_MapConnections - .2byte BGM_FINECITY - .2byte 2 - .byte 8 - .byte 0 - .byte 2 - .byte 2 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/SlateportCity_ContestHall/header.inc b/data/maps/SlateportCity_ContestHall/header.inc new file mode 100644 index 000000000..64cc06565 --- /dev/null +++ b/data/maps/SlateportCity_ContestHall/header.inc @@ -0,0 +1,14 @@ +SlateportCity_ContestHall:: @ 8306034 + .4byte SlateportCity_ContestHall_MapAttributes + .4byte SlateportCity_ContestHall_MapEvents + .4byte SlateportCity_ContestHall_MapScripts + .4byte 0x0 + .2byte BGM_CONLOBBY + .2byte 73 + .byte 8 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/SlateportCity_ContestHall/header.s b/data/maps/SlateportCity_ContestHall/header.s deleted file mode 100644 index 64cc06565..000000000 --- a/data/maps/SlateportCity_ContestHall/header.s +++ /dev/null @@ -1,14 +0,0 @@ -SlateportCity_ContestHall:: @ 8306034 - .4byte SlateportCity_ContestHall_MapAttributes - .4byte SlateportCity_ContestHall_MapEvents - .4byte SlateportCity_ContestHall_MapScripts - .4byte 0x0 - .2byte BGM_CONLOBBY - .2byte 73 - .byte 8 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/SlateportCity_ContestLobby/header.inc b/data/maps/SlateportCity_ContestLobby/header.inc new file mode 100644 index 000000000..440139e64 --- /dev/null +++ b/data/maps/SlateportCity_ContestLobby/header.inc @@ -0,0 +1,14 @@ +SlateportCity_ContestLobby:: @ 8306018 + .4byte SlateportCity_ContestLobby_MapAttributes + .4byte SlateportCity_ContestLobby_MapEvents + .4byte SlateportCity_ContestLobby_MapScripts + .4byte 0x0 + .2byte BGM_CONLOBBY + .2byte 72 + .byte 8 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/SlateportCity_ContestLobby/header.s b/data/maps/SlateportCity_ContestLobby/header.s deleted file mode 100644 index 440139e64..000000000 --- a/data/maps/SlateportCity_ContestLobby/header.s +++ /dev/null @@ -1,14 +0,0 @@ -SlateportCity_ContestLobby:: @ 8306018 - .4byte SlateportCity_ContestLobby_MapAttributes - .4byte SlateportCity_ContestLobby_MapEvents - .4byte SlateportCity_ContestLobby_MapScripts - .4byte 0x0 - .2byte BGM_CONLOBBY - .2byte 72 - .byte 8 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/SlateportCity_Harbor/header.inc b/data/maps/SlateportCity_Harbor/header.inc new file mode 100644 index 000000000..d7da07b49 --- /dev/null +++ b/data/maps/SlateportCity_Harbor/header.inc @@ -0,0 +1,14 @@ +SlateportCity_Harbor:: @ 83060C0 + .4byte SlateportCity_Harbor_MapAttributes + .4byte SlateportCity_Harbor_MapEvents + .4byte SlateportCity_Harbor_MapScripts + .4byte 0x0 + .2byte BGM_FINECITY + .2byte 88 + .byte 8 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/SlateportCity_Harbor/header.s b/data/maps/SlateportCity_Harbor/header.s deleted file mode 100644 index d7da07b49..000000000 --- a/data/maps/SlateportCity_Harbor/header.s +++ /dev/null @@ -1,14 +0,0 @@ -SlateportCity_Harbor:: @ 83060C0 - .4byte SlateportCity_Harbor_MapAttributes - .4byte SlateportCity_Harbor_MapEvents - .4byte SlateportCity_Harbor_MapScripts - .4byte 0x0 - .2byte BGM_FINECITY - .2byte 88 - .byte 8 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/SlateportCity_House1/header.inc b/data/maps/SlateportCity_House1/header.inc new file mode 100644 index 000000000..75a5cdb72 --- /dev/null +++ b/data/maps/SlateportCity_House1/header.inc @@ -0,0 +1,14 @@ +SlateportCity_House1:: @ 8306050 + .4byte SlateportCity_House1_MapAttributes + .4byte SlateportCity_House1_MapEvents + .4byte SlateportCity_House1_MapScripts + .4byte 0x0 + .2byte BGM_FINECITY + .2byte 80 + .byte 8 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/SlateportCity_House1/header.s b/data/maps/SlateportCity_House1/header.s deleted file mode 100644 index 75a5cdb72..000000000 --- a/data/maps/SlateportCity_House1/header.s +++ /dev/null @@ -1,14 +0,0 @@ -SlateportCity_House1:: @ 8306050 - .4byte SlateportCity_House1_MapAttributes - .4byte SlateportCity_House1_MapEvents - .4byte SlateportCity_House1_MapScripts - .4byte 0x0 - .2byte BGM_FINECITY - .2byte 80 - .byte 8 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/SlateportCity_House2/header.inc b/data/maps/SlateportCity_House2/header.inc new file mode 100644 index 000000000..00b9399a3 --- /dev/null +++ b/data/maps/SlateportCity_House2/header.inc @@ -0,0 +1,14 @@ +SlateportCity_House2:: @ 83060DC + .4byte House2_MapAttributes + .4byte SlateportCity_House2_MapEvents + .4byte SlateportCity_House2_MapScripts + .4byte 0x0 + .2byte BGM_FINECITY + .2byte 60 + .byte 8 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/SlateportCity_House2/header.s b/data/maps/SlateportCity_House2/header.s deleted file mode 100644 index 00b9399a3..000000000 --- a/data/maps/SlateportCity_House2/header.s +++ /dev/null @@ -1,14 +0,0 @@ -SlateportCity_House2:: @ 83060DC - .4byte House2_MapAttributes - .4byte SlateportCity_House2_MapEvents - .4byte SlateportCity_House2_MapScripts - .4byte 0x0 - .2byte BGM_FINECITY - .2byte 60 - .byte 8 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/SlateportCity_Mart/header.inc b/data/maps/SlateportCity_Mart/header.inc new file mode 100644 index 000000000..12f2172be --- /dev/null +++ b/data/maps/SlateportCity_Mart/header.inc @@ -0,0 +1,14 @@ +SlateportCity_Mart:: @ 8306130 + .4byte PokeMart_MapAttributes + .4byte SlateportCity_Mart_MapEvents + .4byte SlateportCity_Mart_MapScripts + .4byte 0x0 + .2byte BGM_FRIENDLY + .2byte 63 + .byte 8 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/SlateportCity_Mart/header.s b/data/maps/SlateportCity_Mart/header.s deleted file mode 100644 index 12f2172be..000000000 --- a/data/maps/SlateportCity_Mart/header.s +++ /dev/null @@ -1,14 +0,0 @@ -SlateportCity_Mart:: @ 8306130 - .4byte PokeMart_MapAttributes - .4byte SlateportCity_Mart_MapEvents - .4byte SlateportCity_Mart_MapScripts - .4byte 0x0 - .2byte BGM_FRIENDLY - .2byte 63 - .byte 8 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/header.inc b/data/maps/SlateportCity_OceanicMuseum_1F/header.inc new file mode 100644 index 000000000..7aaa2ff91 --- /dev/null +++ b/data/maps/SlateportCity_OceanicMuseum_1F/header.inc @@ -0,0 +1,14 @@ +SlateportCity_OceanicMuseum_1F:: @ 8306088 + .4byte SlateportCity_OceanicMuseum_1F_MapAttributes + .4byte SlateportCity_OceanicMuseum_1F_MapEvents + .4byte SlateportCity_OceanicMuseum_1F_MapScripts + .4byte 0x0 + .2byte BGM_FUNE_KAN + .2byte 86 + .byte 8 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/header.s b/data/maps/SlateportCity_OceanicMuseum_1F/header.s deleted file mode 100644 index 7aaa2ff91..000000000 --- a/data/maps/SlateportCity_OceanicMuseum_1F/header.s +++ /dev/null @@ -1,14 +0,0 @@ -SlateportCity_OceanicMuseum_1F:: @ 8306088 - .4byte SlateportCity_OceanicMuseum_1F_MapAttributes - .4byte SlateportCity_OceanicMuseum_1F_MapEvents - .4byte SlateportCity_OceanicMuseum_1F_MapScripts - .4byte 0x0 - .2byte BGM_FUNE_KAN - .2byte 86 - .byte 8 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/header.inc b/data/maps/SlateportCity_OceanicMuseum_2F/header.inc new file mode 100644 index 000000000..3d9153f56 --- /dev/null +++ b/data/maps/SlateportCity_OceanicMuseum_2F/header.inc @@ -0,0 +1,14 @@ +SlateportCity_OceanicMuseum_2F:: @ 83060A4 + .4byte SlateportCity_OceanicMuseum_2F_MapAttributes + .4byte SlateportCity_OceanicMuseum_2F_MapEvents + .4byte SlateportCity_OceanicMuseum_2F_MapScripts + .4byte 0x0 + .2byte BGM_FUNE_KAN + .2byte 87 + .byte 8 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/header.s b/data/maps/SlateportCity_OceanicMuseum_2F/header.s deleted file mode 100644 index 3d9153f56..000000000 --- a/data/maps/SlateportCity_OceanicMuseum_2F/header.s +++ /dev/null @@ -1,14 +0,0 @@ -SlateportCity_OceanicMuseum_2F:: @ 83060A4 - .4byte SlateportCity_OceanicMuseum_2F_MapAttributes - .4byte SlateportCity_OceanicMuseum_2F_MapEvents - .4byte SlateportCity_OceanicMuseum_2F_MapScripts - .4byte 0x0 - .2byte BGM_FUNE_KAN - .2byte 87 - .byte 8 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/SlateportCity_PokemonCenter_1F/header.inc b/data/maps/SlateportCity_PokemonCenter_1F/header.inc new file mode 100644 index 000000000..d668f0efc --- /dev/null +++ b/data/maps/SlateportCity_PokemonCenter_1F/header.inc @@ -0,0 +1,14 @@ +SlateportCity_PokemonCenter_1F:: @ 83060F8 + .4byte PokemonCenter_1F_MapAttributes + .4byte SlateportCity_PokemonCenter_1F_MapEvents + .4byte SlateportCity_PokemonCenter_1F_MapScripts + .4byte 0x0 + .2byte BGM_POKECEN + .2byte 61 + .byte 8 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/SlateportCity_PokemonCenter_1F/header.s b/data/maps/SlateportCity_PokemonCenter_1F/header.s deleted file mode 100644 index d668f0efc..000000000 --- a/data/maps/SlateportCity_PokemonCenter_1F/header.s +++ /dev/null @@ -1,14 +0,0 @@ -SlateportCity_PokemonCenter_1F:: @ 83060F8 - .4byte PokemonCenter_1F_MapAttributes - .4byte SlateportCity_PokemonCenter_1F_MapEvents - .4byte SlateportCity_PokemonCenter_1F_MapScripts - .4byte 0x0 - .2byte BGM_POKECEN - .2byte 61 - .byte 8 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/SlateportCity_PokemonCenter_2F/header.inc b/data/maps/SlateportCity_PokemonCenter_2F/header.inc new file mode 100644 index 000000000..36c726d7f --- /dev/null +++ b/data/maps/SlateportCity_PokemonCenter_2F/header.inc @@ -0,0 +1,14 @@ +SlateportCity_PokemonCenter_2F:: @ 8306114 + .4byte PokemonCenter_2F_MapAttributes + .4byte SlateportCity_PokemonCenter_2F_MapEvents + .4byte SlateportCity_PokemonCenter_2F_MapScripts + .4byte 0x0 + .2byte BGM_POKECEN + .2byte 62 + .byte 8 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/SlateportCity_PokemonCenter_2F/header.s b/data/maps/SlateportCity_PokemonCenter_2F/header.s deleted file mode 100644 index 36c726d7f..000000000 --- a/data/maps/SlateportCity_PokemonCenter_2F/header.s +++ /dev/null @@ -1,14 +0,0 @@ -SlateportCity_PokemonCenter_2F:: @ 8306114 - .4byte PokemonCenter_2F_MapAttributes - .4byte SlateportCity_PokemonCenter_2F_MapEvents - .4byte SlateportCity_PokemonCenter_2F_MapScripts - .4byte 0x0 - .2byte BGM_POKECEN - .2byte 62 - .byte 8 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/SlateportCity_PokemonFanClub/header.inc b/data/maps/SlateportCity_PokemonFanClub/header.inc new file mode 100644 index 000000000..1672d21b1 --- /dev/null +++ b/data/maps/SlateportCity_PokemonFanClub/header.inc @@ -0,0 +1,14 @@ +SlateportCity_PokemonFanClub:: @ 830606C + .4byte SlateportCity_PokemonFanClub_MapAttributes + .4byte SlateportCity_PokemonFanClub_MapEvents + .4byte SlateportCity_PokemonFanClub_MapScripts + .4byte 0x0 + .2byte BGM_FINECITY + .2byte 85 + .byte 8 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/SlateportCity_PokemonFanClub/header.s b/data/maps/SlateportCity_PokemonFanClub/header.s deleted file mode 100644 index 1672d21b1..000000000 --- a/data/maps/SlateportCity_PokemonFanClub/header.s +++ /dev/null @@ -1,14 +0,0 @@ -SlateportCity_PokemonFanClub:: @ 830606C - .4byte SlateportCity_PokemonFanClub_MapAttributes - .4byte SlateportCity_PokemonFanClub_MapEvents - .4byte SlateportCity_PokemonFanClub_MapScripts - .4byte 0x0 - .2byte BGM_FINECITY - .2byte 85 - .byte 8 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/SlateportCity_SternsShipyard_1F/header.inc b/data/maps/SlateportCity_SternsShipyard_1F/header.inc new file mode 100644 index 000000000..c3516151e --- /dev/null +++ b/data/maps/SlateportCity_SternsShipyard_1F/header.inc @@ -0,0 +1,14 @@ +SlateportCity_SternsShipyard_1F:: @ 8305FE0 + .4byte SlateportCity_SternsShipyard_1F_MapAttributes + .4byte SlateportCity_SternsShipyard_1F_MapEvents + .4byte SlateportCity_SternsShipyard_1F_MapScripts + .4byte 0x0 + .2byte BGM_FINECITY + .2byte 81 + .byte 8 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/SlateportCity_SternsShipyard_1F/header.s b/data/maps/SlateportCity_SternsShipyard_1F/header.s deleted file mode 100644 index c3516151e..000000000 --- a/data/maps/SlateportCity_SternsShipyard_1F/header.s +++ /dev/null @@ -1,14 +0,0 @@ -SlateportCity_SternsShipyard_1F:: @ 8305FE0 - .4byte SlateportCity_SternsShipyard_1F_MapAttributes - .4byte SlateportCity_SternsShipyard_1F_MapEvents - .4byte SlateportCity_SternsShipyard_1F_MapScripts - .4byte 0x0 - .2byte BGM_FINECITY - .2byte 81 - .byte 8 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/SlateportCity_SternsShipyard_2F/header.inc b/data/maps/SlateportCity_SternsShipyard_2F/header.inc new file mode 100644 index 000000000..242e061aa --- /dev/null +++ b/data/maps/SlateportCity_SternsShipyard_2F/header.inc @@ -0,0 +1,14 @@ +SlateportCity_SternsShipyard_2F:: @ 8305FFC + .4byte SlateportCity_SternsShipyard_2F_MapAttributes + .4byte SlateportCity_SternsShipyard_2F_MapEvents + .4byte SlateportCity_SternsShipyard_2F_MapScripts + .4byte 0x0 + .2byte BGM_FINECITY + .2byte 82 + .byte 8 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/SlateportCity_SternsShipyard_2F/header.s b/data/maps/SlateportCity_SternsShipyard_2F/header.s deleted file mode 100644 index 242e061aa..000000000 --- a/data/maps/SlateportCity_SternsShipyard_2F/header.s +++ /dev/null @@ -1,14 +0,0 @@ -SlateportCity_SternsShipyard_2F:: @ 8305FFC - .4byte SlateportCity_SternsShipyard_2F_MapAttributes - .4byte SlateportCity_SternsShipyard_2F_MapEvents - .4byte SlateportCity_SternsShipyard_2F_MapScripts - .4byte 0x0 - .2byte BGM_FINECITY - .2byte 82 - .byte 8 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/SootopolisCity/connections.inc b/data/maps/SootopolisCity/connections.inc new file mode 100644 index 000000000..dcf558dcd --- /dev/null +++ b/data/maps/SootopolisCity/connections.inc @@ -0,0 +1,6 @@ +SootopolisCity_MapConnectionsList:: @ 8308800 + @ empty + +SootopolisCity_MapConnections:: @ 8308800 + .4byte 0 + .4byte SootopolisCity_MapConnectionsList diff --git a/data/maps/SootopolisCity/connections.s b/data/maps/SootopolisCity/connections.s deleted file mode 100644 index dcf558dcd..000000000 --- a/data/maps/SootopolisCity/connections.s +++ /dev/null @@ -1,6 +0,0 @@ -SootopolisCity_MapConnectionsList:: @ 8308800 - @ empty - -SootopolisCity_MapConnections:: @ 8308800 - .4byte 0 - .4byte SootopolisCity_MapConnectionsList diff --git a/data/maps/SootopolisCity/header.inc b/data/maps/SootopolisCity/header.inc new file mode 100644 index 000000000..d5cbae0be --- /dev/null +++ b/data/maps/SootopolisCity/header.inc @@ -0,0 +1,14 @@ +SootopolisCity:: @ 830550C + .4byte SootopolisCity_MapAttributes + .4byte SootopolisCity_MapEvents + .4byte SootopolisCity_MapScripts + .4byte 0x0 + .2byte BGM_RUNECITY + .2byte 8 + .byte 14 + .byte 0 + .byte 2 + .byte 2 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/SootopolisCity/header.s b/data/maps/SootopolisCity/header.s deleted file mode 100644 index d5cbae0be..000000000 --- a/data/maps/SootopolisCity/header.s +++ /dev/null @@ -1,14 +0,0 @@ -SootopolisCity:: @ 830550C - .4byte SootopolisCity_MapAttributes - .4byte SootopolisCity_MapEvents - .4byte SootopolisCity_MapScripts - .4byte 0x0 - .2byte BGM_RUNECITY - .2byte 8 - .byte 14 - .byte 0 - .byte 2 - .byte 2 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/SootopolisCity_Gym_1F/header.inc b/data/maps/SootopolisCity_Gym_1F/header.inc new file mode 100644 index 000000000..185bdc970 --- /dev/null +++ b/data/maps/SootopolisCity_Gym_1F/header.inc @@ -0,0 +1,14 @@ +SootopolisCity_Gym_1F:: @ 830692C + .4byte SootopolisCity_Gym_1F_MapAttributes + .4byte SootopolisCity_Gym_1F_MapEvents + .4byte SootopolisCity_Gym_1F_MapScripts + .4byte 0x0 + .2byte BGM_GIM + .2byte 110 + .byte 14 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 1 diff --git a/data/maps/SootopolisCity_Gym_1F/header.s b/data/maps/SootopolisCity_Gym_1F/header.s deleted file mode 100644 index 185bdc970..000000000 --- a/data/maps/SootopolisCity_Gym_1F/header.s +++ /dev/null @@ -1,14 +0,0 @@ -SootopolisCity_Gym_1F:: @ 830692C - .4byte SootopolisCity_Gym_1F_MapAttributes - .4byte SootopolisCity_Gym_1F_MapEvents - .4byte SootopolisCity_Gym_1F_MapScripts - .4byte 0x0 - .2byte BGM_GIM - .2byte 110 - .byte 14 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 1 diff --git a/data/maps/SootopolisCity_Gym_B1F/header.inc b/data/maps/SootopolisCity_Gym_B1F/header.inc new file mode 100644 index 000000000..104ee8215 --- /dev/null +++ b/data/maps/SootopolisCity_Gym_B1F/header.inc @@ -0,0 +1,14 @@ +SootopolisCity_Gym_B1F:: @ 8306948 + .4byte SootopolisCity_Gym_B1F_MapAttributes + .4byte SootopolisCity_Gym_B1F_MapEvents + .4byte SootopolisCity_Gym_B1F_MapScripts + .4byte 0x0 + .2byte BGM_GIM + .2byte 111 + .byte 14 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 1 diff --git a/data/maps/SootopolisCity_Gym_B1F/header.s b/data/maps/SootopolisCity_Gym_B1F/header.s deleted file mode 100644 index 104ee8215..000000000 --- a/data/maps/SootopolisCity_Gym_B1F/header.s +++ /dev/null @@ -1,14 +0,0 @@ -SootopolisCity_Gym_B1F:: @ 8306948 - .4byte SootopolisCity_Gym_B1F_MapAttributes - .4byte SootopolisCity_Gym_B1F_MapEvents - .4byte SootopolisCity_Gym_B1F_MapScripts - .4byte 0x0 - .2byte BGM_GIM - .2byte 111 - .byte 14 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 1 diff --git a/data/maps/SootopolisCity_House1/header.inc b/data/maps/SootopolisCity_House1/header.inc new file mode 100644 index 000000000..5ff1eb351 --- /dev/null +++ b/data/maps/SootopolisCity_House1/header.inc @@ -0,0 +1,14 @@ +SootopolisCity_House1:: @ 83069B8 + .4byte SootopolisCity_House1_MapAttributes + .4byte SootopolisCity_House1_MapEvents + .4byte SootopolisCity_House1_MapScripts + .4byte 0x0 + .2byte BGM_RUNECITY + .2byte 308 + .byte 14 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/SootopolisCity_House1/header.s b/data/maps/SootopolisCity_House1/header.s deleted file mode 100644 index 5ff1eb351..000000000 --- a/data/maps/SootopolisCity_House1/header.s +++ /dev/null @@ -1,14 +0,0 @@ -SootopolisCity_House1:: @ 83069B8 - .4byte SootopolisCity_House1_MapAttributes - .4byte SootopolisCity_House1_MapEvents - .4byte SootopolisCity_House1_MapScripts - .4byte 0x0 - .2byte BGM_RUNECITY - .2byte 308 - .byte 14 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/SootopolisCity_House2/header.inc b/data/maps/SootopolisCity_House2/header.inc new file mode 100644 index 000000000..1ff5a7df1 --- /dev/null +++ b/data/maps/SootopolisCity_House2/header.inc @@ -0,0 +1,14 @@ +SootopolisCity_House2:: @ 83069D4 + .4byte SootopolisCity_House2_MapAttributes + .4byte SootopolisCity_House2_MapEvents + .4byte SootopolisCity_House2_MapScripts + .4byte 0x0 + .2byte BGM_RUNECITY + .2byte 309 + .byte 14 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/SootopolisCity_House2/header.s b/data/maps/SootopolisCity_House2/header.s deleted file mode 100644 index 1ff5a7df1..000000000 --- a/data/maps/SootopolisCity_House2/header.s +++ /dev/null @@ -1,14 +0,0 @@ -SootopolisCity_House2:: @ 83069D4 - .4byte SootopolisCity_House2_MapAttributes - .4byte SootopolisCity_House2_MapEvents - .4byte SootopolisCity_House2_MapScripts - .4byte 0x0 - .2byte BGM_RUNECITY - .2byte 309 - .byte 14 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/SootopolisCity_House3/header.inc b/data/maps/SootopolisCity_House3/header.inc new file mode 100644 index 000000000..3c6075fe7 --- /dev/null +++ b/data/maps/SootopolisCity_House3/header.inc @@ -0,0 +1,14 @@ +SootopolisCity_House3:: @ 83069F0 + .4byte SootopolisCity_House3_MapAttributes + .4byte SootopolisCity_House3_MapEvents + .4byte SootopolisCity_House3_MapScripts + .4byte 0x0 + .2byte BGM_RUNECITY + .2byte 310 + .byte 14 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/SootopolisCity_House3/header.s b/data/maps/SootopolisCity_House3/header.s deleted file mode 100644 index 3c6075fe7..000000000 --- a/data/maps/SootopolisCity_House3/header.s +++ /dev/null @@ -1,14 +0,0 @@ -SootopolisCity_House3:: @ 83069F0 - .4byte SootopolisCity_House3_MapAttributes - .4byte SootopolisCity_House3_MapEvents - .4byte SootopolisCity_House3_MapScripts - .4byte 0x0 - .2byte BGM_RUNECITY - .2byte 310 - .byte 14 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/SootopolisCity_House4/header.inc b/data/maps/SootopolisCity_House4/header.inc new file mode 100644 index 000000000..f155d1980 --- /dev/null +++ b/data/maps/SootopolisCity_House4/header.inc @@ -0,0 +1,14 @@ +SootopolisCity_House4:: @ 8306A0C + .4byte SootopolisCity_House4_MapAttributes + .4byte SootopolisCity_House4_MapEvents + .4byte SootopolisCity_House4_MapScripts + .4byte 0x0 + .2byte BGM_RUNECITY + .2byte 308 + .byte 14 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/SootopolisCity_House4/header.s b/data/maps/SootopolisCity_House4/header.s deleted file mode 100644 index f155d1980..000000000 --- a/data/maps/SootopolisCity_House4/header.s +++ /dev/null @@ -1,14 +0,0 @@ -SootopolisCity_House4:: @ 8306A0C - .4byte SootopolisCity_House4_MapAttributes - .4byte SootopolisCity_House4_MapEvents - .4byte SootopolisCity_House4_MapScripts - .4byte 0x0 - .2byte BGM_RUNECITY - .2byte 308 - .byte 14 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/SootopolisCity_House5/header.inc b/data/maps/SootopolisCity_House5/header.inc new file mode 100644 index 000000000..7cfe101ac --- /dev/null +++ b/data/maps/SootopolisCity_House5/header.inc @@ -0,0 +1,14 @@ +SootopolisCity_House5:: @ 8306A28 + .4byte SootopolisCity_House5_MapAttributes + .4byte SootopolisCity_House5_MapEvents + .4byte SootopolisCity_House5_MapScripts + .4byte 0x0 + .2byte BGM_RUNECITY + .2byte 309 + .byte 14 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/SootopolisCity_House5/header.s b/data/maps/SootopolisCity_House5/header.s deleted file mode 100644 index 7cfe101ac..000000000 --- a/data/maps/SootopolisCity_House5/header.s +++ /dev/null @@ -1,14 +0,0 @@ -SootopolisCity_House5:: @ 8306A28 - .4byte SootopolisCity_House5_MapAttributes - .4byte SootopolisCity_House5_MapEvents - .4byte SootopolisCity_House5_MapScripts - .4byte 0x0 - .2byte BGM_RUNECITY - .2byte 309 - .byte 14 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/SootopolisCity_House6/header.inc b/data/maps/SootopolisCity_House6/header.inc new file mode 100644 index 000000000..536872e88 --- /dev/null +++ b/data/maps/SootopolisCity_House6/header.inc @@ -0,0 +1,14 @@ +SootopolisCity_House6:: @ 8306A44 + .4byte SootopolisCity_House6_MapAttributes + .4byte SootopolisCity_House6_MapEvents + .4byte SootopolisCity_House6_MapScripts + .4byte 0x0 + .2byte BGM_RUNECITY + .2byte 310 + .byte 14 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/SootopolisCity_House6/header.s b/data/maps/SootopolisCity_House6/header.s deleted file mode 100644 index 536872e88..000000000 --- a/data/maps/SootopolisCity_House6/header.s +++ /dev/null @@ -1,14 +0,0 @@ -SootopolisCity_House6:: @ 8306A44 - .4byte SootopolisCity_House6_MapAttributes - .4byte SootopolisCity_House6_MapEvents - .4byte SootopolisCity_House6_MapScripts - .4byte 0x0 - .2byte BGM_RUNECITY - .2byte 310 - .byte 14 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/SootopolisCity_House7/header.inc b/data/maps/SootopolisCity_House7/header.inc new file mode 100644 index 000000000..598a84316 --- /dev/null +++ b/data/maps/SootopolisCity_House7/header.inc @@ -0,0 +1,14 @@ +SootopolisCity_House7:: @ 8306A60 + .4byte SootopolisCity_House7_MapAttributes + .4byte SootopolisCity_House7_MapEvents + .4byte SootopolisCity_House7_MapScripts + .4byte 0x0 + .2byte BGM_RUNECITY + .2byte 308 + .byte 14 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/SootopolisCity_House7/header.s b/data/maps/SootopolisCity_House7/header.s deleted file mode 100644 index 598a84316..000000000 --- a/data/maps/SootopolisCity_House7/header.s +++ /dev/null @@ -1,14 +0,0 @@ -SootopolisCity_House7:: @ 8306A60 - .4byte SootopolisCity_House7_MapAttributes - .4byte SootopolisCity_House7_MapEvents - .4byte SootopolisCity_House7_MapScripts - .4byte 0x0 - .2byte BGM_RUNECITY - .2byte 308 - .byte 14 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/SootopolisCity_House8/header.inc b/data/maps/SootopolisCity_House8/header.inc new file mode 100644 index 000000000..4d6619797 --- /dev/null +++ b/data/maps/SootopolisCity_House8/header.inc @@ -0,0 +1,14 @@ +SootopolisCity_House8:: @ 8306A7C + .4byte SootopolisCity_House8_MapAttributes + .4byte SootopolisCity_House8_MapEvents + .4byte SootopolisCity_House8_MapScripts + .4byte 0x0 + .2byte BGM_RUNECITY + .2byte 298 + .byte 14 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/SootopolisCity_House8/header.s b/data/maps/SootopolisCity_House8/header.s deleted file mode 100644 index 4d6619797..000000000 --- a/data/maps/SootopolisCity_House8/header.s +++ /dev/null @@ -1,14 +0,0 @@ -SootopolisCity_House8:: @ 8306A7C - .4byte SootopolisCity_House8_MapAttributes - .4byte SootopolisCity_House8_MapEvents - .4byte SootopolisCity_House8_MapScripts - .4byte 0x0 - .2byte BGM_RUNECITY - .2byte 298 - .byte 14 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/SootopolisCity_Mart/header.inc b/data/maps/SootopolisCity_Mart/header.inc new file mode 100644 index 000000000..47505e04d --- /dev/null +++ b/data/maps/SootopolisCity_Mart/header.inc @@ -0,0 +1,14 @@ +SootopolisCity_Mart:: @ 830699C + .4byte PokeMart_MapAttributes + .4byte SootopolisCity_Mart_MapEvents + .4byte SootopolisCity_Mart_MapScripts + .4byte 0x0 + .2byte BGM_FRIENDLY + .2byte 63 + .byte 14 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/SootopolisCity_Mart/header.s b/data/maps/SootopolisCity_Mart/header.s deleted file mode 100644 index 47505e04d..000000000 --- a/data/maps/SootopolisCity_Mart/header.s +++ /dev/null @@ -1,14 +0,0 @@ -SootopolisCity_Mart:: @ 830699C - .4byte PokeMart_MapAttributes - .4byte SootopolisCity_Mart_MapEvents - .4byte SootopolisCity_Mart_MapScripts - .4byte 0x0 - .2byte BGM_FRIENDLY - .2byte 63 - .byte 14 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/SootopolisCity_PokemonCenter_1F/header.inc b/data/maps/SootopolisCity_PokemonCenter_1F/header.inc new file mode 100644 index 000000000..d0cef1039 --- /dev/null +++ b/data/maps/SootopolisCity_PokemonCenter_1F/header.inc @@ -0,0 +1,14 @@ +SootopolisCity_PokemonCenter_1F:: @ 8306964 + .4byte PokemonCenter_1F_MapAttributes + .4byte SootopolisCity_PokemonCenter_1F_MapEvents + .4byte SootopolisCity_PokemonCenter_1F_MapScripts + .4byte 0x0 + .2byte BGM_POKECEN + .2byte 61 + .byte 14 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/SootopolisCity_PokemonCenter_1F/header.s b/data/maps/SootopolisCity_PokemonCenter_1F/header.s deleted file mode 100644 index d0cef1039..000000000 --- a/data/maps/SootopolisCity_PokemonCenter_1F/header.s +++ /dev/null @@ -1,14 +0,0 @@ -SootopolisCity_PokemonCenter_1F:: @ 8306964 - .4byte PokemonCenter_1F_MapAttributes - .4byte SootopolisCity_PokemonCenter_1F_MapEvents - .4byte SootopolisCity_PokemonCenter_1F_MapScripts - .4byte 0x0 - .2byte BGM_POKECEN - .2byte 61 - .byte 14 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/SootopolisCity_PokemonCenter_2F/header.inc b/data/maps/SootopolisCity_PokemonCenter_2F/header.inc new file mode 100644 index 000000000..4bdb48a7d --- /dev/null +++ b/data/maps/SootopolisCity_PokemonCenter_2F/header.inc @@ -0,0 +1,14 @@ +SootopolisCity_PokemonCenter_2F:: @ 8306980 + .4byte PokemonCenter_2F_MapAttributes + .4byte SootopolisCity_PokemonCenter_2F_MapEvents + .4byte SootopolisCity_PokemonCenter_2F_MapScripts + .4byte 0x0 + .2byte BGM_POKECEN + .2byte 62 + .byte 14 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/SootopolisCity_PokemonCenter_2F/header.s b/data/maps/SootopolisCity_PokemonCenter_2F/header.s deleted file mode 100644 index 4bdb48a7d..000000000 --- a/data/maps/SootopolisCity_PokemonCenter_2F/header.s +++ /dev/null @@ -1,14 +0,0 @@ -SootopolisCity_PokemonCenter_2F:: @ 8306980 - .4byte PokemonCenter_2F_MapAttributes - .4byte SootopolisCity_PokemonCenter_2F_MapEvents - .4byte SootopolisCity_PokemonCenter_2F_MapScripts - .4byte 0x0 - .2byte BGM_POKECEN - .2byte 62 - .byte 14 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/SouthernIsland_Exterior/header.inc b/data/maps/SouthernIsland_Exterior/header.inc new file mode 100644 index 000000000..0579c81bc --- /dev/null +++ b/data/maps/SouthernIsland_Exterior/header.inc @@ -0,0 +1,14 @@ +SouthernIsland_Exterior:: @ 8307CA4 + .4byte SouthernIsland_Exterior_MapAttributes + .4byte SouthernIsland_Exterior_MapEvents + .4byte SouthernIsland_Exterior_MapScripts + .4byte 0x0 + .2byte BGM_DAN02 + .2byte 291 + .byte 73 + .byte 0 + .byte 0 + .byte 3 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/SouthernIsland_Exterior/header.s b/data/maps/SouthernIsland_Exterior/header.s deleted file mode 100644 index 0579c81bc..000000000 --- a/data/maps/SouthernIsland_Exterior/header.s +++ /dev/null @@ -1,14 +0,0 @@ -SouthernIsland_Exterior:: @ 8307CA4 - .4byte SouthernIsland_Exterior_MapAttributes - .4byte SouthernIsland_Exterior_MapEvents - .4byte SouthernIsland_Exterior_MapScripts - .4byte 0x0 - .2byte BGM_DAN02 - .2byte 291 - .byte 73 - .byte 0 - .byte 0 - .byte 3 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/SouthernIsland_Interior/header.inc b/data/maps/SouthernIsland_Interior/header.inc new file mode 100644 index 000000000..42cf6db66 --- /dev/null +++ b/data/maps/SouthernIsland_Interior/header.inc @@ -0,0 +1,14 @@ +SouthernIsland_Interior:: @ 8307CC0 + .4byte SouthernIsland_Interior_MapAttributes + .4byte SouthernIsland_Interior_MapEvents + .4byte SouthernIsland_Interior_MapScripts + .4byte 0x0 + .2byte BGM_DAN02 + .2byte 292 + .byte 73 + .byte 0 + .byte 11 + .byte 3 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/SouthernIsland_Interior/header.s b/data/maps/SouthernIsland_Interior/header.s deleted file mode 100644 index 42cf6db66..000000000 --- a/data/maps/SouthernIsland_Interior/header.s +++ /dev/null @@ -1,14 +0,0 @@ -SouthernIsland_Interior:: @ 8307CC0 - .4byte SouthernIsland_Interior_MapAttributes - .4byte SouthernIsland_Interior_MapEvents - .4byte SouthernIsland_Interior_MapScripts - .4byte 0x0 - .2byte BGM_DAN02 - .2byte 292 - .byte 73 - .byte 0 - .byte 11 - .byte 3 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/TradeCenter/header.inc b/data/maps/TradeCenter/header.inc new file mode 100644 index 000000000..62bac5400 --- /dev/null +++ b/data/maps/TradeCenter/header.inc @@ -0,0 +1,14 @@ +TradeCenter:: @ 8307994 + .4byte TradeCenter_MapAttributes + .4byte TradeCenter_MapEvents + .4byte TradeCenter_MapScripts + .4byte 0x0 + .2byte BGM_RAINBOW + .2byte 223 + .byte 87 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/TradeCenter/header.s b/data/maps/TradeCenter/header.s deleted file mode 100644 index 62bac5400..000000000 --- a/data/maps/TradeCenter/header.s +++ /dev/null @@ -1,14 +0,0 @@ -TradeCenter:: @ 8307994 - .4byte TradeCenter_MapAttributes - .4byte TradeCenter_MapEvents - .4byte TradeCenter_MapScripts - .4byte 0x0 - .2byte BGM_RAINBOW - .2byte 223 - .byte 87 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/Underwater1/connections.inc b/data/maps/Underwater1/connections.inc new file mode 100644 index 000000000..65c1db901 --- /dev/null +++ b/data/maps/Underwater1/connections.inc @@ -0,0 +1,7 @@ +Underwater1_MapConnectionsList:: @ 8308D10 + connection down, 0, Underwater2 + connection emerge, 0, Route124 + +Underwater1_MapConnections:: @ 8308D28 + .4byte 0x2 + .4byte Underwater1_MapConnectionsList diff --git a/data/maps/Underwater1/connections.s b/data/maps/Underwater1/connections.s deleted file mode 100644 index 65c1db901..000000000 --- a/data/maps/Underwater1/connections.s +++ /dev/null @@ -1,7 +0,0 @@ -Underwater1_MapConnectionsList:: @ 8308D10 - connection down, 0, Underwater2 - connection emerge, 0, Route124 - -Underwater1_MapConnections:: @ 8308D28 - .4byte 0x2 - .4byte Underwater1_MapConnectionsList diff --git a/data/maps/Underwater1/header.inc b/data/maps/Underwater1/header.inc new file mode 100644 index 000000000..cfd06e4ce --- /dev/null +++ b/data/maps/Underwater1/header.inc @@ -0,0 +1,14 @@ +Underwater1:: @ 83059C0 + .4byte Underwater1_MapAttributes + .4byte Underwater1_MapEvents + .4byte Underwater1_MapScripts + .4byte Underwater1_MapConnections + .2byte BGM_DEEPDEEP + .2byte 275 + .byte 50 + .byte 0 + .byte 14 + .byte 5 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/Underwater1/header.s b/data/maps/Underwater1/header.s deleted file mode 100644 index cfd06e4ce..000000000 --- a/data/maps/Underwater1/header.s +++ /dev/null @@ -1,14 +0,0 @@ -Underwater1:: @ 83059C0 - .4byte Underwater1_MapAttributes - .4byte Underwater1_MapEvents - .4byte Underwater1_MapScripts - .4byte Underwater1_MapConnections - .2byte BGM_DEEPDEEP - .2byte 275 - .byte 50 - .byte 0 - .byte 14 - .byte 5 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/Underwater2/connections.inc b/data/maps/Underwater2/connections.inc new file mode 100644 index 000000000..58a4db314 --- /dev/null +++ b/data/maps/Underwater2/connections.inc @@ -0,0 +1,8 @@ +Underwater2_MapConnectionsList:: @ 8308D30 + connection up, 0, Underwater1 + connection right, 0, Underwater3 + connection emerge, 0, Route126 + +Underwater2_MapConnections:: @ 8308D54 + .4byte 0x3 + .4byte Underwater2_MapConnectionsList diff --git a/data/maps/Underwater2/connections.s b/data/maps/Underwater2/connections.s deleted file mode 100644 index 58a4db314..000000000 --- a/data/maps/Underwater2/connections.s +++ /dev/null @@ -1,8 +0,0 @@ -Underwater2_MapConnectionsList:: @ 8308D30 - connection up, 0, Underwater1 - connection right, 0, Underwater3 - connection emerge, 0, Route126 - -Underwater2_MapConnections:: @ 8308D54 - .4byte 0x3 - .4byte Underwater2_MapConnectionsList diff --git a/data/maps/Underwater2/header.inc b/data/maps/Underwater2/header.inc new file mode 100644 index 000000000..38446fecc --- /dev/null +++ b/data/maps/Underwater2/header.inc @@ -0,0 +1,14 @@ +Underwater2:: @ 83059DC + .4byte Underwater2_MapAttributes + .4byte Underwater2_MapEvents + .4byte Underwater2_MapScripts + .4byte Underwater2_MapConnections + .2byte BGM_DEEPDEEP + .2byte 51 + .byte 51 + .byte 0 + .byte 14 + .byte 5 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/Underwater2/header.s b/data/maps/Underwater2/header.s deleted file mode 100644 index 38446fecc..000000000 --- a/data/maps/Underwater2/header.s +++ /dev/null @@ -1,14 +0,0 @@ -Underwater2:: @ 83059DC - .4byte Underwater2_MapAttributes - .4byte Underwater2_MapEvents - .4byte Underwater2_MapScripts - .4byte Underwater2_MapConnections - .2byte BGM_DEEPDEEP - .2byte 51 - .byte 51 - .byte 0 - .byte 14 - .byte 5 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/Underwater3/connections.inc b/data/maps/Underwater3/connections.inc new file mode 100644 index 000000000..7d6401826 --- /dev/null +++ b/data/maps/Underwater3/connections.inc @@ -0,0 +1,8 @@ +Underwater3_MapConnectionsList:: @ 8308D5C + connection emerge, 0, Route127 + connection left, 0, Underwater2 + connection down, 0, Underwater4 + +Underwater3_MapConnections:: @ 8308D80 + .4byte 0x3 + .4byte Underwater3_MapConnectionsList diff --git a/data/maps/Underwater3/connections.s b/data/maps/Underwater3/connections.s deleted file mode 100644 index 7d6401826..000000000 --- a/data/maps/Underwater3/connections.s +++ /dev/null @@ -1,8 +0,0 @@ -Underwater3_MapConnectionsList:: @ 8308D5C - connection emerge, 0, Route127 - connection left, 0, Underwater2 - connection down, 0, Underwater4 - -Underwater3_MapConnections:: @ 8308D80 - .4byte 0x3 - .4byte Underwater3_MapConnectionsList diff --git a/data/maps/Underwater3/header.inc b/data/maps/Underwater3/header.inc new file mode 100644 index 000000000..3cc773730 --- /dev/null +++ b/data/maps/Underwater3/header.inc @@ -0,0 +1,14 @@ +Underwater3:: @ 83059F8 + .4byte Underwater3_MapAttributes + .4byte Underwater3_MapEvents + .4byte Underwater3_MapScripts + .4byte Underwater3_MapConnections + .2byte BGM_DEEPDEEP + .2byte 52 + .byte 52 + .byte 0 + .byte 14 + .byte 5 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/Underwater3/header.s b/data/maps/Underwater3/header.s deleted file mode 100644 index 3cc773730..000000000 --- a/data/maps/Underwater3/header.s +++ /dev/null @@ -1,14 +0,0 @@ -Underwater3:: @ 83059F8 - .4byte Underwater3_MapAttributes - .4byte Underwater3_MapEvents - .4byte Underwater3_MapScripts - .4byte Underwater3_MapConnections - .2byte BGM_DEEPDEEP - .2byte 52 - .byte 52 - .byte 0 - .byte 14 - .byte 5 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/Underwater4/connections.inc b/data/maps/Underwater4/connections.inc new file mode 100644 index 000000000..0b9a523ea --- /dev/null +++ b/data/maps/Underwater4/connections.inc @@ -0,0 +1,7 @@ +Underwater4_MapConnectionsList:: @ 8308D88 + connection up, 0, Underwater3 + connection emerge, 0, Route128 + +Underwater4_MapConnections:: @ 8308DA0 + .4byte 0x2 + .4byte Underwater4_MapConnectionsList diff --git a/data/maps/Underwater4/connections.s b/data/maps/Underwater4/connections.s deleted file mode 100644 index 0b9a523ea..000000000 --- a/data/maps/Underwater4/connections.s +++ /dev/null @@ -1,7 +0,0 @@ -Underwater4_MapConnectionsList:: @ 8308D88 - connection up, 0, Underwater3 - connection emerge, 0, Route128 - -Underwater4_MapConnections:: @ 8308DA0 - .4byte 0x2 - .4byte Underwater4_MapConnectionsList diff --git a/data/maps/Underwater4/header.inc b/data/maps/Underwater4/header.inc new file mode 100644 index 000000000..8fb1e6faa --- /dev/null +++ b/data/maps/Underwater4/header.inc @@ -0,0 +1,14 @@ +Underwater4:: @ 8305A14 + .4byte Underwater4_MapAttributes + .4byte Underwater4_MapEvents + .4byte Underwater4_MapScripts + .4byte Underwater4_MapConnections + .2byte BGM_DEEPDEEP + .2byte 53 + .byte 53 + .byte 0 + .byte 14 + .byte 5 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/Underwater4/header.s b/data/maps/Underwater4/header.s deleted file mode 100644 index 8fb1e6faa..000000000 --- a/data/maps/Underwater4/header.s +++ /dev/null @@ -1,14 +0,0 @@ -Underwater4:: @ 8305A14 - .4byte Underwater4_MapAttributes - .4byte Underwater4_MapEvents - .4byte Underwater4_MapScripts - .4byte Underwater4_MapConnections - .2byte BGM_DEEPDEEP - .2byte 53 - .byte 53 - .byte 0 - .byte 14 - .byte 5 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/Underwater_Route134/header.inc b/data/maps/Underwater_Route134/header.inc new file mode 100644 index 000000000..fbc90290c --- /dev/null +++ b/data/maps/Underwater_Route134/header.inc @@ -0,0 +1,14 @@ +Underwater_Route134:: @ 83074FC + .4byte Underwater_Route134_MapAttributes + .4byte Underwater_Route134_MapEvents + .4byte Underwater_Route134_MapScripts + .4byte 0x0 + .2byte BGM_DEEPDEEP + .2byte 283 + .byte 79 + .byte 0 + .byte 14 + .byte 5 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/Underwater_Route134/header.s b/data/maps/Underwater_Route134/header.s deleted file mode 100644 index fbc90290c..000000000 --- a/data/maps/Underwater_Route134/header.s +++ /dev/null @@ -1,14 +0,0 @@ -Underwater_Route134:: @ 83074FC - .4byte Underwater_Route134_MapAttributes - .4byte Underwater_Route134_MapEvents - .4byte Underwater_Route134_MapScripts - .4byte 0x0 - .2byte BGM_DEEPDEEP - .2byte 283 - .byte 79 - .byte 0 - .byte 14 - .byte 5 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/Underwater_SeafloorCavern/header.inc b/data/maps/Underwater_SeafloorCavern/header.inc new file mode 100644 index 000000000..09f36c16f --- /dev/null +++ b/data/maps/Underwater_SeafloorCavern/header.inc @@ -0,0 +1,14 @@ +Underwater_SeafloorCavern:: @ 8307048 + .4byte Underwater_SeafloorCavern_MapAttributes + .4byte Underwater_SeafloorCavern_MapEvents + .4byte Underwater_SeafloorCavern_MapScripts + .4byte 0x0 + .2byte BGM_DEEPDEEP + .2byte 147 + .byte 69 + .byte 0 + .byte 14 + .byte 5 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/Underwater_SeafloorCavern/header.s b/data/maps/Underwater_SeafloorCavern/header.s deleted file mode 100644 index 09f36c16f..000000000 --- a/data/maps/Underwater_SeafloorCavern/header.s +++ /dev/null @@ -1,14 +0,0 @@ -Underwater_SeafloorCavern:: @ 8307048 - .4byte Underwater_SeafloorCavern_MapAttributes - .4byte Underwater_SeafloorCavern_MapEvents - .4byte Underwater_SeafloorCavern_MapScripts - .4byte 0x0 - .2byte BGM_DEEPDEEP - .2byte 147 - .byte 69 - .byte 0 - .byte 14 - .byte 5 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/Underwater_SealedChamber/header.inc b/data/maps/Underwater_SealedChamber/header.inc new file mode 100644 index 000000000..86ff3384d --- /dev/null +++ b/data/maps/Underwater_SealedChamber/header.inc @@ -0,0 +1,14 @@ +Underwater_SealedChamber:: @ 8307518 + .4byte Underwater_SealedChamber_MapAttributes + .4byte Underwater_SealedChamber_MapEvents + .4byte Underwater_SealedChamber_MapScripts + .4byte 0x0 + .2byte BGM_DEEPDEEP + .2byte 284 + .byte 79 + .byte 0 + .byte 14 + .byte 5 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/Underwater_SealedChamber/header.s b/data/maps/Underwater_SealedChamber/header.s deleted file mode 100644 index 86ff3384d..000000000 --- a/data/maps/Underwater_SealedChamber/header.s +++ /dev/null @@ -1,14 +0,0 @@ -Underwater_SealedChamber:: @ 8307518 - .4byte Underwater_SealedChamber_MapAttributes - .4byte Underwater_SealedChamber_MapEvents - .4byte Underwater_SealedChamber_MapScripts - .4byte 0x0 - .2byte BGM_DEEPDEEP - .2byte 284 - .byte 79 - .byte 0 - .byte 14 - .byte 5 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/Underwater_SootopolisCity/header.inc b/data/maps/Underwater_SootopolisCity/header.inc new file mode 100644 index 000000000..8aa8bb316 --- /dev/null +++ b/data/maps/Underwater_SootopolisCity/header.inc @@ -0,0 +1,14 @@ +Underwater_SootopolisCity:: @ 8306DFC + .4byte Underwater_SootopolisCity_MapAttributes + .4byte Underwater_SootopolisCity_MapEvents + .4byte Underwater_SootopolisCity_MapScripts + .4byte 0x0 + .2byte BGM_DEEPDEEP + .2byte 131 + .byte 54 + .byte 0 + .byte 14 + .byte 5 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/Underwater_SootopolisCity/header.s b/data/maps/Underwater_SootopolisCity/header.s deleted file mode 100644 index 8aa8bb316..000000000 --- a/data/maps/Underwater_SootopolisCity/header.s +++ /dev/null @@ -1,14 +0,0 @@ -Underwater_SootopolisCity:: @ 8306DFC - .4byte Underwater_SootopolisCity_MapAttributes - .4byte Underwater_SootopolisCity_MapEvents - .4byte Underwater_SootopolisCity_MapScripts - .4byte 0x0 - .2byte BGM_DEEPDEEP - .2byte 131 - .byte 54 - .byte 0 - .byte 14 - .byte 5 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/UnknownMap_25_29/header.inc b/data/maps/UnknownMap_25_29/header.inc new file mode 100644 index 000000000..93d3ab03f --- /dev/null +++ b/data/maps/UnknownMap_25_29/header.inc @@ -0,0 +1,14 @@ +UnknownMap_25_29:: @ 8307A04 + .4byte UnknownMap_25_29_MapAttributes + .4byte UnknownMap_25_29_MapEvents + .4byte UnknownMap_25_29_MapScripts + .4byte 0x0 + .2byte BGM_NIBI + .2byte 227 + .byte 87 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/UnknownMap_25_29/header.s b/data/maps/UnknownMap_25_29/header.s deleted file mode 100644 index 93d3ab03f..000000000 --- a/data/maps/UnknownMap_25_29/header.s +++ /dev/null @@ -1,14 +0,0 @@ -UnknownMap_25_29:: @ 8307A04 - .4byte UnknownMap_25_29_MapAttributes - .4byte UnknownMap_25_29_MapEvents - .4byte UnknownMap_25_29_MapScripts - .4byte 0x0 - .2byte BGM_NIBI - .2byte 227 - .byte 87 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/UnknownMap_25_30/header.inc b/data/maps/UnknownMap_25_30/header.inc new file mode 100644 index 000000000..96f2e3de2 --- /dev/null +++ b/data/maps/UnknownMap_25_30/header.inc @@ -0,0 +1,14 @@ +UnknownMap_25_30:: @ 8307A20 + .4byte UnknownMap_25_30_MapAttributes + .4byte UnknownMap_25_30_MapEvents + .4byte UnknownMap_25_30_MapScripts + .4byte 0x0 + .2byte BGM_NIBI + .2byte 228 + .byte 87 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/UnknownMap_25_30/header.s b/data/maps/UnknownMap_25_30/header.s deleted file mode 100644 index 96f2e3de2..000000000 --- a/data/maps/UnknownMap_25_30/header.s +++ /dev/null @@ -1,14 +0,0 @@ -UnknownMap_25_30:: @ 8307A20 - .4byte UnknownMap_25_30_MapAttributes - .4byte UnknownMap_25_30_MapEvents - .4byte UnknownMap_25_30_MapScripts - .4byte 0x0 - .2byte BGM_NIBI - .2byte 228 - .byte 87 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/UnknownMap_25_31/header.inc b/data/maps/UnknownMap_25_31/header.inc new file mode 100644 index 000000000..135e1c4b1 --- /dev/null +++ b/data/maps/UnknownMap_25_31/header.inc @@ -0,0 +1,14 @@ +UnknownMap_25_31:: @ 8307A3C + .4byte UnknownMap_25_31_MapAttributes + .4byte UnknownMap_25_31_MapEvents + .4byte UnknownMap_25_31_MapScripts + .4byte 0x0 + .2byte BGM_NIBI + .2byte 229 + .byte 87 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/UnknownMap_25_31/header.s b/data/maps/UnknownMap_25_31/header.s deleted file mode 100644 index 135e1c4b1..000000000 --- a/data/maps/UnknownMap_25_31/header.s +++ /dev/null @@ -1,14 +0,0 @@ -UnknownMap_25_31:: @ 8307A3C - .4byte UnknownMap_25_31_MapAttributes - .4byte UnknownMap_25_31_MapEvents - .4byte UnknownMap_25_31_MapScripts - .4byte 0x0 - .2byte BGM_NIBI - .2byte 229 - .byte 87 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/UnknownMap_25_32/header.inc b/data/maps/UnknownMap_25_32/header.inc new file mode 100644 index 000000000..4aaae9710 --- /dev/null +++ b/data/maps/UnknownMap_25_32/header.inc @@ -0,0 +1,14 @@ +UnknownMap_25_32:: @ 8307A58 + .4byte UnknownMap_25_32_MapAttributes + .4byte UnknownMap_25_32_MapEvents + .4byte UnknownMap_25_32_MapScripts + .4byte 0x0 + .2byte BGM_NIBI + .2byte 230 + .byte 87 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/UnknownMap_25_32/header.s b/data/maps/UnknownMap_25_32/header.s deleted file mode 100644 index 4aaae9710..000000000 --- a/data/maps/UnknownMap_25_32/header.s +++ /dev/null @@ -1,14 +0,0 @@ -UnknownMap_25_32:: @ 8307A58 - .4byte UnknownMap_25_32_MapAttributes - .4byte UnknownMap_25_32_MapEvents - .4byte UnknownMap_25_32_MapScripts - .4byte 0x0 - .2byte BGM_NIBI - .2byte 230 - .byte 87 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/UnknownMap_25_33/header.inc b/data/maps/UnknownMap_25_33/header.inc new file mode 100644 index 000000000..e0bebe753 --- /dev/null +++ b/data/maps/UnknownMap_25_33/header.inc @@ -0,0 +1,14 @@ +UnknownMap_25_33:: @ 8307A74 + .4byte UnknownMap_25_33_MapAttributes + .4byte UnknownMap_25_33_MapEvents + .4byte UnknownMap_25_33_MapScripts + .4byte 0x0 + .2byte BGM_NIBI + .2byte 231 + .byte 87 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/UnknownMap_25_33/header.s b/data/maps/UnknownMap_25_33/header.s deleted file mode 100644 index e0bebe753..000000000 --- a/data/maps/UnknownMap_25_33/header.s +++ /dev/null @@ -1,14 +0,0 @@ -UnknownMap_25_33:: @ 8307A74 - .4byte UnknownMap_25_33_MapAttributes - .4byte UnknownMap_25_33_MapEvents - .4byte UnknownMap_25_33_MapScripts - .4byte 0x0 - .2byte BGM_NIBI - .2byte 231 - .byte 87 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/UnknownMap_25_34/header.inc b/data/maps/UnknownMap_25_34/header.inc new file mode 100644 index 000000000..b2c174c06 --- /dev/null +++ b/data/maps/UnknownMap_25_34/header.inc @@ -0,0 +1,14 @@ +UnknownMap_25_34:: @ 8307A90 + .4byte UnknownMap_25_34_MapAttributes + .4byte UnknownMap_25_34_MapEvents + .4byte UnknownMap_25_34_MapScripts + .4byte 0x0 + .2byte BGM_NIBI + .2byte 232 + .byte 87 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/UnknownMap_25_34/header.s b/data/maps/UnknownMap_25_34/header.s deleted file mode 100644 index b2c174c06..000000000 --- a/data/maps/UnknownMap_25_34/header.s +++ /dev/null @@ -1,14 +0,0 @@ -UnknownMap_25_34:: @ 8307A90 - .4byte UnknownMap_25_34_MapAttributes - .4byte UnknownMap_25_34_MapEvents - .4byte UnknownMap_25_34_MapScripts - .4byte 0x0 - .2byte BGM_NIBI - .2byte 232 - .byte 87 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/VerdanturfTown/connections.inc b/data/maps/VerdanturfTown/connections.inc new file mode 100644 index 000000000..e1c9c2418 --- /dev/null +++ b/data/maps/VerdanturfTown/connections.inc @@ -0,0 +1,7 @@ +VerdanturfTown_MapConnectionsList:: @ 83086A4 + connection up, -80, Route116 + connection right, 0, Route117 + +VerdanturfTown_MapConnections:: @ 83086BC + .4byte 0x2 + .4byte VerdanturfTown_MapConnectionsList diff --git a/data/maps/VerdanturfTown/connections.s b/data/maps/VerdanturfTown/connections.s deleted file mode 100644 index e1c9c2418..000000000 --- a/data/maps/VerdanturfTown/connections.s +++ /dev/null @@ -1,7 +0,0 @@ -VerdanturfTown_MapConnectionsList:: @ 83086A4 - connection up, -80, Route116 - connection right, 0, Route117 - -VerdanturfTown_MapConnections:: @ 83086BC - .4byte 0x2 - .4byte VerdanturfTown_MapConnectionsList diff --git a/data/maps/VerdanturfTown/header.inc b/data/maps/VerdanturfTown/header.inc new file mode 100644 index 000000000..ee41c767f --- /dev/null +++ b/data/maps/VerdanturfTown/header.inc @@ -0,0 +1,14 @@ +VerdanturfTown:: @ 83055D0 + .4byte VerdanturfTown_MapAttributes + .4byte VerdanturfTown_MapEvents + .4byte VerdanturfTown_MapScripts + .4byte VerdanturfTown_MapConnections + .2byte BGM_GOMACHI0 + .2byte 15 + .byte 5 + .byte 0 + .byte 2 + .byte 1 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/VerdanturfTown/header.s b/data/maps/VerdanturfTown/header.s deleted file mode 100644 index ee41c767f..000000000 --- a/data/maps/VerdanturfTown/header.s +++ /dev/null @@ -1,14 +0,0 @@ -VerdanturfTown:: @ 83055D0 - .4byte VerdanturfTown_MapAttributes - .4byte VerdanturfTown_MapEvents - .4byte VerdanturfTown_MapScripts - .4byte VerdanturfTown_MapConnections - .2byte BGM_GOMACHI0 - .2byte 15 - .byte 5 - .byte 0 - .byte 2 - .byte 1 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/VerdanturfTown_ContestHall/header.inc b/data/maps/VerdanturfTown_ContestHall/header.inc new file mode 100644 index 000000000..1c0179afb --- /dev/null +++ b/data/maps/VerdanturfTown_ContestHall/header.inc @@ -0,0 +1,14 @@ +VerdanturfTown_ContestHall:: @ 8305D94 + .4byte VerdanturfTown_ContestHall_MapAttributes + .4byte VerdanturfTown_ContestHall_MapEvents + .4byte VerdanturfTown_ContestHall_MapScripts + .4byte 0x0 + .2byte BGM_CONLOBBY + .2byte 73 + .byte 5 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/VerdanturfTown_ContestHall/header.s b/data/maps/VerdanturfTown_ContestHall/header.s deleted file mode 100644 index 1c0179afb..000000000 --- a/data/maps/VerdanturfTown_ContestHall/header.s +++ /dev/null @@ -1,14 +0,0 @@ -VerdanturfTown_ContestHall:: @ 8305D94 - .4byte VerdanturfTown_ContestHall_MapAttributes - .4byte VerdanturfTown_ContestHall_MapEvents - .4byte VerdanturfTown_ContestHall_MapScripts - .4byte 0x0 - .2byte BGM_CONLOBBY - .2byte 73 - .byte 5 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/VerdanturfTown_ContestLobby/header.inc b/data/maps/VerdanturfTown_ContestLobby/header.inc new file mode 100644 index 000000000..31274e19f --- /dev/null +++ b/data/maps/VerdanturfTown_ContestLobby/header.inc @@ -0,0 +1,14 @@ +VerdanturfTown_ContestLobby:: @ 8305D78 + .4byte VerdanturfTown_ContestLobby_MapAttributes + .4byte VerdanturfTown_ContestLobby_MapEvents + .4byte VerdanturfTown_ContestLobby_MapScripts + .4byte 0x0 + .2byte BGM_CONLOBBY + .2byte 72 + .byte 5 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/VerdanturfTown_ContestLobby/header.s b/data/maps/VerdanturfTown_ContestLobby/header.s deleted file mode 100644 index 31274e19f..000000000 --- a/data/maps/VerdanturfTown_ContestLobby/header.s +++ /dev/null @@ -1,14 +0,0 @@ -VerdanturfTown_ContestLobby:: @ 8305D78 - .4byte VerdanturfTown_ContestLobby_MapAttributes - .4byte VerdanturfTown_ContestLobby_MapEvents - .4byte VerdanturfTown_ContestLobby_MapScripts - .4byte 0x0 - .2byte BGM_CONLOBBY - .2byte 72 - .byte 5 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc b/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc new file mode 100644 index 000000000..f1aae5a19 --- /dev/null +++ b/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc @@ -0,0 +1,14 @@ +VerdanturfTown_FriendshipRatersHouse:: @ 8305E20 + .4byte House2_MapAttributes + .4byte VerdanturfTown_FriendshipRatersHouse_MapEvents + .4byte VerdanturfTown_FriendshipRatersHouse_MapScripts + .4byte 0x0 + .2byte BGM_GOMACHI0 + .2byte 60 + .byte 5 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/VerdanturfTown_FriendshipRatersHouse/header.s b/data/maps/VerdanturfTown_FriendshipRatersHouse/header.s deleted file mode 100644 index f1aae5a19..000000000 --- a/data/maps/VerdanturfTown_FriendshipRatersHouse/header.s +++ /dev/null @@ -1,14 +0,0 @@ -VerdanturfTown_FriendshipRatersHouse:: @ 8305E20 - .4byte House2_MapAttributes - .4byte VerdanturfTown_FriendshipRatersHouse_MapEvents - .4byte VerdanturfTown_FriendshipRatersHouse_MapScripts - .4byte 0x0 - .2byte BGM_GOMACHI0 - .2byte 60 - .byte 5 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/VerdanturfTown_House/header.inc b/data/maps/VerdanturfTown_House/header.inc new file mode 100644 index 000000000..e81adee1b --- /dev/null +++ b/data/maps/VerdanturfTown_House/header.inc @@ -0,0 +1,14 @@ +VerdanturfTown_House:: @ 8305E3C + .4byte House1_MapAttributes + .4byte VerdanturfTown_House_MapEvents + .4byte VerdanturfTown_House_MapScripts + .4byte 0x0 + .2byte BGM_GOMACHI0 + .2byte 59 + .byte 5 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/VerdanturfTown_House/header.s b/data/maps/VerdanturfTown_House/header.s deleted file mode 100644 index e81adee1b..000000000 --- a/data/maps/VerdanturfTown_House/header.s +++ /dev/null @@ -1,14 +0,0 @@ -VerdanturfTown_House:: @ 8305E3C - .4byte House1_MapAttributes - .4byte VerdanturfTown_House_MapEvents - .4byte VerdanturfTown_House_MapScripts - .4byte 0x0 - .2byte BGM_GOMACHI0 - .2byte 59 - .byte 5 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/VerdanturfTown_Mart/header.inc b/data/maps/VerdanturfTown_Mart/header.inc new file mode 100644 index 000000000..db037960c --- /dev/null +++ b/data/maps/VerdanturfTown_Mart/header.inc @@ -0,0 +1,14 @@ +VerdanturfTown_Mart:: @ 8305DB0 + .4byte PokeMart_MapAttributes + .4byte VerdanturfTown_Mart_MapEvents + .4byte VerdanturfTown_Mart_MapScripts + .4byte 0x0 + .2byte BGM_FRIENDLY + .2byte 63 + .byte 5 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/VerdanturfTown_Mart/header.s b/data/maps/VerdanturfTown_Mart/header.s deleted file mode 100644 index db037960c..000000000 --- a/data/maps/VerdanturfTown_Mart/header.s +++ /dev/null @@ -1,14 +0,0 @@ -VerdanturfTown_Mart:: @ 8305DB0 - .4byte PokeMart_MapAttributes - .4byte VerdanturfTown_Mart_MapEvents - .4byte VerdanturfTown_Mart_MapScripts - .4byte 0x0 - .2byte BGM_FRIENDLY - .2byte 63 - .byte 5 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc b/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc new file mode 100644 index 000000000..384c8719e --- /dev/null +++ b/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc @@ -0,0 +1,14 @@ +VerdanturfTown_PokemonCenter_1F:: @ 8305DCC + .4byte PokemonCenter_1F_MapAttributes + .4byte VerdanturfTown_PokemonCenter_1F_MapEvents + .4byte VerdanturfTown_PokemonCenter_1F_MapScripts + .4byte 0x0 + .2byte BGM_POKECEN + .2byte 61 + .byte 5 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/VerdanturfTown_PokemonCenter_1F/header.s b/data/maps/VerdanturfTown_PokemonCenter_1F/header.s deleted file mode 100644 index 384c8719e..000000000 --- a/data/maps/VerdanturfTown_PokemonCenter_1F/header.s +++ /dev/null @@ -1,14 +0,0 @@ -VerdanturfTown_PokemonCenter_1F:: @ 8305DCC - .4byte PokemonCenter_1F_MapAttributes - .4byte VerdanturfTown_PokemonCenter_1F_MapEvents - .4byte VerdanturfTown_PokemonCenter_1F_MapScripts - .4byte 0x0 - .2byte BGM_POKECEN - .2byte 61 - .byte 5 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc b/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc new file mode 100644 index 000000000..518c11352 --- /dev/null +++ b/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc @@ -0,0 +1,14 @@ +VerdanturfTown_PokemonCenter_2F:: @ 8305DE8 + .4byte PokemonCenter_2F_MapAttributes + .4byte VerdanturfTown_PokemonCenter_2F_MapEvents + .4byte VerdanturfTown_PokemonCenter_2F_MapScripts + .4byte 0x0 + .2byte BGM_POKECEN + .2byte 62 + .byte 5 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/VerdanturfTown_PokemonCenter_2F/header.s b/data/maps/VerdanturfTown_PokemonCenter_2F/header.s deleted file mode 100644 index 518c11352..000000000 --- a/data/maps/VerdanturfTown_PokemonCenter_2F/header.s +++ /dev/null @@ -1,14 +0,0 @@ -VerdanturfTown_PokemonCenter_2F:: @ 8305DE8 - .4byte PokemonCenter_2F_MapAttributes - .4byte VerdanturfTown_PokemonCenter_2F_MapEvents - .4byte VerdanturfTown_PokemonCenter_2F_MapScripts - .4byte 0x0 - .2byte BGM_POKECEN - .2byte 62 - .byte 5 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/VerdanturfTown_WandasHouse/header.inc b/data/maps/VerdanturfTown_WandasHouse/header.inc new file mode 100644 index 000000000..bc31f5457 --- /dev/null +++ b/data/maps/VerdanturfTown_WandasHouse/header.inc @@ -0,0 +1,14 @@ +VerdanturfTown_WandasHouse:: @ 8305E04 + .4byte VerdanturfTown_WandasHouse_MapAttributes + .4byte VerdanturfTown_WandasHouse_MapEvents + .4byte VerdanturfTown_WandasHouse_MapScripts + .4byte 0x0 + .2byte BGM_GOMACHI0 + .2byte 76 + .byte 5 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 diff --git a/data/maps/VerdanturfTown_WandasHouse/header.s b/data/maps/VerdanturfTown_WandasHouse/header.s deleted file mode 100644 index bc31f5457..000000000 --- a/data/maps/VerdanturfTown_WandasHouse/header.s +++ /dev/null @@ -1,14 +0,0 @@ -VerdanturfTown_WandasHouse:: @ 8305E04 - .4byte VerdanturfTown_WandasHouse_MapAttributes - .4byte VerdanturfTown_WandasHouse_MapEvents - .4byte VerdanturfTown_WandasHouse_MapScripts - .4byte 0x0 - .2byte BGM_GOMACHI0 - .2byte 76 - .byte 5 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 0 - .byte 0 diff --git a/data/maps/VictoryRoad_1F/header.inc b/data/maps/VictoryRoad_1F/header.inc new file mode 100644 index 000000000..21937891e --- /dev/null +++ b/data/maps/VictoryRoad_1F/header.inc @@ -0,0 +1,14 @@ +VictoryRoad_1F:: @ 8307224 + .4byte VictoryRoad_1F_MapAttributes + .4byte VictoryRoad_1F_MapEvents + .4byte VictoryRoad_1F_MapScripts + .4byte 0x0 + .2byte BGM_C_ROAD + .2byte 164 + .byte 70 + .byte 0 + .byte 0 + .byte 4 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/VictoryRoad_1F/header.s b/data/maps/VictoryRoad_1F/header.s deleted file mode 100644 index 21937891e..000000000 --- a/data/maps/VictoryRoad_1F/header.s +++ /dev/null @@ -1,14 +0,0 @@ -VictoryRoad_1F:: @ 8307224 - .4byte VictoryRoad_1F_MapAttributes - .4byte VictoryRoad_1F_MapEvents - .4byte VictoryRoad_1F_MapScripts - .4byte 0x0 - .2byte BGM_C_ROAD - .2byte 164 - .byte 70 - .byte 0 - .byte 0 - .byte 4 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/VictoryRoad_B1F/header.inc b/data/maps/VictoryRoad_B1F/header.inc new file mode 100644 index 000000000..ebaa67358 --- /dev/null +++ b/data/maps/VictoryRoad_B1F/header.inc @@ -0,0 +1,14 @@ +VictoryRoad_B1F:: @ 8307240 + .4byte VictoryRoad_B1F_MapAttributes + .4byte VictoryRoad_B1F_MapEvents + .4byte VictoryRoad_B1F_MapScripts + .4byte 0x0 + .2byte BGM_C_ROAD + .2byte 286 + .byte 70 + .byte 1 + .byte 0 + .byte 4 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/VictoryRoad_B1F/header.s b/data/maps/VictoryRoad_B1F/header.s deleted file mode 100644 index ebaa67358..000000000 --- a/data/maps/VictoryRoad_B1F/header.s +++ /dev/null @@ -1,14 +0,0 @@ -VictoryRoad_B1F:: @ 8307240 - .4byte VictoryRoad_B1F_MapAttributes - .4byte VictoryRoad_B1F_MapEvents - .4byte VictoryRoad_B1F_MapScripts - .4byte 0x0 - .2byte BGM_C_ROAD - .2byte 286 - .byte 70 - .byte 1 - .byte 0 - .byte 4 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/VictoryRoad_B2F/header.inc b/data/maps/VictoryRoad_B2F/header.inc new file mode 100644 index 000000000..4690acbb7 --- /dev/null +++ b/data/maps/VictoryRoad_B2F/header.inc @@ -0,0 +1,14 @@ +VictoryRoad_B2F:: @ 830725C + .4byte VictoryRoad_B2F_MapAttributes + .4byte VictoryRoad_B2F_MapEvents + .4byte VictoryRoad_B2F_MapScripts + .4byte 0x0 + .2byte BGM_C_ROAD + .2byte 287 + .byte 70 + .byte 1 + .byte 0 + .byte 4 + .2byte 0 + .byte 1 + .byte 0 diff --git a/data/maps/VictoryRoad_B2F/header.s b/data/maps/VictoryRoad_B2F/header.s deleted file mode 100644 index 4690acbb7..000000000 --- a/data/maps/VictoryRoad_B2F/header.s +++ /dev/null @@ -1,14 +0,0 @@ -VictoryRoad_B2F:: @ 830725C - .4byte VictoryRoad_B2F_MapAttributes - .4byte VictoryRoad_B2F_MapEvents - .4byte VictoryRoad_B2F_MapScripts - .4byte 0x0 - .2byte BGM_C_ROAD - .2byte 287 - .byte 70 - .byte 1 - .byte 0 - .byte 4 - .2byte 0 - .byte 1 - .byte 0 diff --git a/data/maps/connections.inc b/data/maps/connections.inc index 9e5f3a5a5..ab2ffb7b9 100644 --- a/data/maps/connections.inc +++ b/data/maps/connections.inc @@ -1,58 +1,58 @@ - .include "data/maps/LittlerootTown/connections.s" - .include "data/maps/OldaleTown/connections.s" - .include "data/maps/DewfordTown/connections.s" - .include "data/maps/LavaridgeTown/connections.s" - .include "data/maps/FallarborTown/connections.s" - .include "data/maps/VerdanturfTown/connections.s" - .include "data/maps/PacifidlogTown/connections.s" - .include "data/maps/PetalburgCity/connections.s" - .include "data/maps/SlateportCity/connections.s" - .include "data/maps/MauvilleCity/connections.s" - .include "data/maps/RustboroCity/connections.s" - .include "data/maps/FortreeCity/connections.s" - .include "data/maps/LilycoveCity/connections.s" - .include "data/maps/MossdeepCity/connections.s" - .include "data/maps/SootopolisCity/connections.s" - .include "data/maps/EverGrandeCity/connections.s" - .include "data/maps/Route101/connections.s" - .include "data/maps/Route102/connections.s" - .include "data/maps/Route103/connections.s" - .include "data/maps/Route104/connections.s" - .include "data/maps/Route105/connections.s" - .include "data/maps/Route106/connections.s" - .include "data/maps/Route107/connections.s" - .include "data/maps/Route108/connections.s" - .include "data/maps/Route109/connections.s" - .include "data/maps/Route110/connections.s" - .include "data/maps/Route111/connections.s" - .include "data/maps/Route112/connections.s" - .include "data/maps/Route113/connections.s" - .include "data/maps/Route114/connections.s" - .include "data/maps/Route115/connections.s" - .include "data/maps/Route116/connections.s" - .include "data/maps/Route117/connections.s" - .include "data/maps/Route118/connections.s" - .include "data/maps/Route119/connections.s" - .include "data/maps/Route120/connections.s" - .include "data/maps/Route121/connections.s" - .include "data/maps/Route122/connections.s" - .include "data/maps/Route123/connections.s" - .include "data/maps/Route124/connections.s" - .include "data/maps/Route125/connections.s" - .include "data/maps/Route126/connections.s" - .include "data/maps/Route127/connections.s" - .include "data/maps/Route128/connections.s" - .include "data/maps/Route129/connections.s" - .include "data/maps/Route130/connections.s" - .include "data/maps/Route131/connections.s" - .include "data/maps/Route132/connections.s" - .include "data/maps/Route133/connections.s" - .include "data/maps/Route134/connections.s" - .include "data/maps/Underwater1/connections.s" - .include "data/maps/Underwater2/connections.s" - .include "data/maps/Underwater3/connections.s" - .include "data/maps/Underwater4/connections.s" - .include "data/maps/SafariZone_Northwest/connections.s" - .include "data/maps/SafariZone_Northeast/connections.s" - .include "data/maps/SafariZone_Southwest/connections.s" - .include "data/maps/SafariZone_Southeast/connections.s" + .include "data/maps/LittlerootTown/connections.inc" + .include "data/maps/OldaleTown/connections.inc" + .include "data/maps/DewfordTown/connections.inc" + .include "data/maps/LavaridgeTown/connections.inc" + .include "data/maps/FallarborTown/connections.inc" + .include "data/maps/VerdanturfTown/connections.inc" + .include "data/maps/PacifidlogTown/connections.inc" + .include "data/maps/PetalburgCity/connections.inc" + .include "data/maps/SlateportCity/connections.inc" + .include "data/maps/MauvilleCity/connections.inc" + .include "data/maps/RustboroCity/connections.inc" + .include "data/maps/FortreeCity/connections.inc" + .include "data/maps/LilycoveCity/connections.inc" + .include "data/maps/MossdeepCity/connections.inc" + .include "data/maps/SootopolisCity/connections.inc" + .include "data/maps/EverGrandeCity/connections.inc" + .include "data/maps/Route101/connections.inc" + .include "data/maps/Route102/connections.inc" + .include "data/maps/Route103/connections.inc" + .include "data/maps/Route104/connections.inc" + .include "data/maps/Route105/connections.inc" + .include "data/maps/Route106/connections.inc" + .include "data/maps/Route107/connections.inc" + .include "data/maps/Route108/connections.inc" + .include "data/maps/Route109/connections.inc" + .include "data/maps/Route110/connections.inc" + .include "data/maps/Route111/connections.inc" + .include "data/maps/Route112/connections.inc" + .include "data/maps/Route113/connections.inc" + .include "data/maps/Route114/connections.inc" + .include "data/maps/Route115/connections.inc" + .include "data/maps/Route116/connections.inc" + .include "data/maps/Route117/connections.inc" + .include "data/maps/Route118/connections.inc" + .include "data/maps/Route119/connections.inc" + .include "data/maps/Route120/connections.inc" + .include "data/maps/Route121/connections.inc" + .include "data/maps/Route122/connections.inc" + .include "data/maps/Route123/connections.inc" + .include "data/maps/Route124/connections.inc" + .include "data/maps/Route125/connections.inc" + .include "data/maps/Route126/connections.inc" + .include "data/maps/Route127/connections.inc" + .include "data/maps/Route128/connections.inc" + .include "data/maps/Route129/connections.inc" + .include "data/maps/Route130/connections.inc" + .include "data/maps/Route131/connections.inc" + .include "data/maps/Route132/connections.inc" + .include "data/maps/Route133/connections.inc" + .include "data/maps/Route134/connections.inc" + .include "data/maps/Underwater1/connections.inc" + .include "data/maps/Underwater2/connections.inc" + .include "data/maps/Underwater3/connections.inc" + .include "data/maps/Underwater4/connections.inc" + .include "data/maps/SafariZone_Northwest/connections.inc" + .include "data/maps/SafariZone_Northeast/connections.inc" + .include "data/maps/SafariZone_Southwest/connections.inc" + .include "data/maps/SafariZone_Southeast/connections.inc" diff --git a/data/maps/headers.inc b/data/maps/headers.inc index 71b2936d7..1dce8aba3 100644 --- a/data/maps/headers.inc +++ b/data/maps/headers.inc @@ -1,394 +1,394 @@ - .include "data/maps/PetalburgCity/header.s" - .include "data/maps/SlateportCity/header.s" - .include "data/maps/MauvilleCity/header.s" - .include "data/maps/RustboroCity/header.s" - .include "data/maps/FortreeCity/header.s" - .include "data/maps/LilycoveCity/header.s" - .include "data/maps/MossdeepCity/header.s" - .include "data/maps/SootopolisCity/header.s" - .include "data/maps/EverGrandeCity/header.s" - .include "data/maps/LittlerootTown/header.s" - .include "data/maps/OldaleTown/header.s" - .include "data/maps/DewfordTown/header.s" - .include "data/maps/LavaridgeTown/header.s" - .include "data/maps/FallarborTown/header.s" - .include "data/maps/VerdanturfTown/header.s" - .include "data/maps/PacifidlogTown/header.s" - .include "data/maps/Route101/header.s" - .include "data/maps/Route102/header.s" - .include "data/maps/Route103/header.s" - .include "data/maps/Route104/header.s" - .include "data/maps/Route105/header.s" - .include "data/maps/Route106/header.s" - .include "data/maps/Route107/header.s" - .include "data/maps/Route108/header.s" - .include "data/maps/Route109/header.s" - .include "data/maps/Route110/header.s" - .include "data/maps/Route111/header.s" - .include "data/maps/Route112/header.s" - .include "data/maps/Route113/header.s" - .include "data/maps/Route114/header.s" - .include "data/maps/Route115/header.s" - .include "data/maps/Route116/header.s" - .include "data/maps/Route117/header.s" - .include "data/maps/Route118/header.s" - .include "data/maps/Route119/header.s" - .include "data/maps/Route120/header.s" - .include "data/maps/Route121/header.s" - .include "data/maps/Route122/header.s" - .include "data/maps/Route123/header.s" - .include "data/maps/Route124/header.s" - .include "data/maps/Route125/header.s" - .include "data/maps/Route126/header.s" - .include "data/maps/Route127/header.s" - .include "data/maps/Route128/header.s" - .include "data/maps/Route129/header.s" - .include "data/maps/Route130/header.s" - .include "data/maps/Route131/header.s" - .include "data/maps/Route132/header.s" - .include "data/maps/Route133/header.s" - .include "data/maps/Route134/header.s" - .include "data/maps/Underwater1/header.s" - .include "data/maps/Underwater2/header.s" - .include "data/maps/Underwater3/header.s" - .include "data/maps/Underwater4/header.s" - .include "data/maps/LittlerootTown_BrendansHouse_1F/header.s" - .include "data/maps/LittlerootTown_BrendansHouse_2F/header.s" - .include "data/maps/LittlerootTown_MaysHouse_1F/header.s" - .include "data/maps/LittlerootTown_MaysHouse_2F/header.s" - .include "data/maps/LittlerootTown_ProfessorBirchsLab/header.s" - .include "data/maps/OldaleTown_House1/header.s" - .include "data/maps/OldaleTown_House2/header.s" - .include "data/maps/OldaleTown_PokemonCenter_1F/header.s" - .include "data/maps/OldaleTown_PokemonCenter_2F/header.s" - .include "data/maps/OldaleTown_Mart/header.s" - .include "data/maps/DewfordTown_House1/header.s" - .include "data/maps/DewfordTown_PokemonCenter_1F/header.s" - .include "data/maps/DewfordTown_PokemonCenter_2F/header.s" - .include "data/maps/DewfordTown_Gym/header.s" - .include "data/maps/DewfordTown_Hall/header.s" - .include "data/maps/DewfordTown_House2/header.s" - .include "data/maps/LavaridgeTown_HerbShop/header.s" - .include "data/maps/LavaridgeTown_Gym_1F/header.s" - .include "data/maps/LavaridgeTown_Gym_B1F/header.s" - .include "data/maps/LavaridgeTown_House/header.s" - .include "data/maps/LavaridgeTown_Mart/header.s" - .include "data/maps/LavaridgeTown_PokemonCenter_1F/header.s" - .include "data/maps/LavaridgeTown_PokemonCenter_2F/header.s" - .include "data/maps/FallarborTown_Mart/header.s" - .include "data/maps/FallarborTown_ContestLobby/header.s" - .include "data/maps/FallarborTown_ContestHall/header.s" - .include "data/maps/FallarborTown_PokemonCenter_1F/header.s" - .include "data/maps/FallarborTown_PokemonCenter_2F/header.s" - .include "data/maps/FallarborTown_House1/header.s" - .include "data/maps/FallarborTown_House2/header.s" - .include "data/maps/VerdanturfTown_ContestLobby/header.s" - .include "data/maps/VerdanturfTown_ContestHall/header.s" - .include "data/maps/VerdanturfTown_Mart/header.s" - .include "data/maps/VerdanturfTown_PokemonCenter_1F/header.s" - .include "data/maps/VerdanturfTown_PokemonCenter_2F/header.s" - .include "data/maps/VerdanturfTown_WandasHouse/header.s" - .include "data/maps/VerdanturfTown_FriendshipRatersHouse/header.s" - .include "data/maps/VerdanturfTown_House/header.s" - .include "data/maps/PacifidlogTown_PokemonCenter_1F/header.s" - .include "data/maps/PacifidlogTown_PokemonCenter_2F/header.s" - .include "data/maps/PacifidlogTown_House1/header.s" - .include "data/maps/PacifidlogTown_House2/header.s" - .include "data/maps/PacifidlogTown_House3/header.s" - .include "data/maps/PacifidlogTown_House4/header.s" - .include "data/maps/PacifidlogTown_House5/header.s" - .include "data/maps/PetalburgCity_WallysHouse/header.s" - .include "data/maps/PetalburgCity_Gym/header.s" - .include "data/maps/PetalburgCity_House1/header.s" - .include "data/maps/PetalburgCity_House2/header.s" - .include "data/maps/PetalburgCity_PokemonCenter_1F/header.s" - .include "data/maps/PetalburgCity_PokemonCenter_2F/header.s" - .include "data/maps/PetalburgCity_Mart/header.s" - .include "data/maps/SlateportCity_SternsShipyard_1F/header.s" - .include "data/maps/SlateportCity_SternsShipyard_2F/header.s" - .include "data/maps/SlateportCity_ContestLobby/header.s" - .include "data/maps/SlateportCity_ContestHall/header.s" - .include "data/maps/SlateportCity_House1/header.s" - .include "data/maps/SlateportCity_PokemonFanClub/header.s" - .include "data/maps/SlateportCity_OceanicMuseum_1F/header.s" - .include "data/maps/SlateportCity_OceanicMuseum_2F/header.s" - .include "data/maps/SlateportCity_Harbor/header.s" - .include "data/maps/SlateportCity_House2/header.s" - .include "data/maps/SlateportCity_PokemonCenter_1F/header.s" - .include "data/maps/SlateportCity_PokemonCenter_2F/header.s" - .include "data/maps/SlateportCity_Mart/header.s" - .include "data/maps/MauvilleCity_Gym/header.s" - .include "data/maps/MauvilleCity_BikeShop/header.s" - .include "data/maps/MauvilleCity_House1/header.s" - .include "data/maps/MauvilleCity_GameCorner/header.s" - .include "data/maps/MauvilleCity_House2/header.s" - .include "data/maps/MauvilleCity_PokemonCenter_1F/header.s" - .include "data/maps/MauvilleCity_PokemonCenter_2F/header.s" - .include "data/maps/MauvilleCity_Mart/header.s" - .include "data/maps/RustboroCity_DevonCorp_1F/header.s" - .include "data/maps/RustboroCity_DevonCorp_2F/header.s" - .include "data/maps/RustboroCity_DevonCorp_3F/header.s" - .include "data/maps/RustboroCity_Gym/header.s" - .include "data/maps/RustboroCity_PokemonSchool/header.s" - .include "data/maps/RustboroCity_PokemonCenter_1F/header.s" - .include "data/maps/RustboroCity_PokemonCenter_2F/header.s" - .include "data/maps/RustboroCity_Mart/header.s" - .include "data/maps/RustboroCity_Flat1_1F/header.s" - .include "data/maps/RustboroCity_Flat1_2F/header.s" - .include "data/maps/RustboroCity_House1/header.s" - .include "data/maps/RustboroCity_CuttersHouse/header.s" - .include "data/maps/RustboroCity_House2/header.s" - .include "data/maps/RustboroCity_Flat2_1F/header.s" - .include "data/maps/RustboroCity_Flat2_2F/header.s" - .include "data/maps/RustboroCity_Flat2_3F/header.s" - .include "data/maps/RustboroCity_House3/header.s" - .include "data/maps/FortreeCity_House1/header.s" - .include "data/maps/FortreeCity_Gym/header.s" - .include "data/maps/FortreeCity_PokemonCenter_1F/header.s" - .include "data/maps/FortreeCity_PokemonCenter_2F/header.s" - .include "data/maps/FortreeCity_Mart/header.s" - .include "data/maps/FortreeCity_House2/header.s" - .include "data/maps/FortreeCity_House3/header.s" - .include "data/maps/FortreeCity_House4/header.s" - .include "data/maps/FortreeCity_House5/header.s" - .include "data/maps/FortreeCity_DecorationShop/header.s" - .include "data/maps/LilycoveCity_CoveLilyMotel_1F/header.s" - .include "data/maps/LilycoveCity_CoveLilyMotel_2F/header.s" - .include "data/maps/LilycoveCity_LilycoveMuseum_1F/header.s" - .include "data/maps/LilycoveCity_LilycoveMuseum_2F/header.s" - .include "data/maps/LilycoveCity_ContestLobby/header.s" - .include "data/maps/LilycoveCity_ContestHall/header.s" - .include "data/maps/LilycoveCity_PokemonCenter_1F/header.s" - .include "data/maps/LilycoveCity_PokemonCenter_2F/header.s" - .include "data/maps/LilycoveCity_UnusedMart/header.s" - .include "data/maps/LilycoveCity_PokemonTrainerFanClub/header.s" - .include "data/maps/LilycoveCity_Harbor/header.s" - .include "data/maps/LilycoveCity_EmptyMap/header.s" - .include "data/maps/LilycoveCity_MoveDeletersHouse/header.s" - .include "data/maps/LilycoveCity_House1/header.s" - .include "data/maps/LilycoveCity_House2/header.s" - .include "data/maps/LilycoveCity_House3/header.s" - .include "data/maps/LilycoveCity_House4/header.s" - .include "data/maps/LilycoveCity_DepartmentStore_1F/header.s" - .include "data/maps/LilycoveCity_DepartmentStore_2F/header.s" - .include "data/maps/LilycoveCity_DepartmentStore_3F/header.s" - .include "data/maps/LilycoveCity_DepartmentStore_4F/header.s" - .include "data/maps/LilycoveCity_DepartmentStore_5F/header.s" - .include "data/maps/LilycoveCity_DepartmentStoreRooftop/header.s" - .include "data/maps/LilycoveCity_DepartmentStoreElevator/header.s" - .include "data/maps/MossdeepCity_Gym/header.s" - .include "data/maps/MossdeepCity_House1/header.s" - .include "data/maps/MossdeepCity_House2/header.s" - .include "data/maps/MossdeepCity_PokemonCenter_1F/header.s" - .include "data/maps/MossdeepCity_PokemonCenter_2F/header.s" - .include "data/maps/MossdeepCity_Mart/header.s" - .include "data/maps/MossdeepCity_House3/header.s" - .include "data/maps/MossdeepCity_StevensHouse/header.s" - .include "data/maps/MossdeepCity_House4/header.s" - .include "data/maps/MossdeepCity_SpaceCenter_1F/header.s" - .include "data/maps/MossdeepCity_SpaceCenter_2F/header.s" - .include "data/maps/MossdeepCity_GameCorner_1F/header.s" - .include "data/maps/MossdeepCity_GameCorner_B1F/header.s" - .include "data/maps/SootopolisCity_Gym_1F/header.s" - .include "data/maps/SootopolisCity_Gym_B1F/header.s" - .include "data/maps/SootopolisCity_PokemonCenter_1F/header.s" - .include "data/maps/SootopolisCity_PokemonCenter_2F/header.s" - .include "data/maps/SootopolisCity_Mart/header.s" - .include "data/maps/SootopolisCity_House1/header.s" - .include "data/maps/SootopolisCity_House2/header.s" - .include "data/maps/SootopolisCity_House3/header.s" - .include "data/maps/SootopolisCity_House4/header.s" - .include "data/maps/SootopolisCity_House5/header.s" - .include "data/maps/SootopolisCity_House6/header.s" - .include "data/maps/SootopolisCity_House7/header.s" - .include "data/maps/SootopolisCity_House8/header.s" - .include "data/maps/EverGrandeCity_SidneysRoom/header.s" - .include "data/maps/EverGrandeCity_PhoebesRoom/header.s" - .include "data/maps/EverGrandeCity_GlaciasRoom/header.s" - .include "data/maps/EverGrandeCity_DrakesRoom/header.s" - .include "data/maps/EverGrandeCity_ChampionsRoom/header.s" - .include "data/maps/EverGrandeCity_Corridor1/header.s" - .include "data/maps/EverGrandeCity_Corridor2/header.s" - .include "data/maps/EverGrandeCity_Corridor3/header.s" - .include "data/maps/EverGrandeCity_Corridor4/header.s" - .include "data/maps/EverGrandeCity_Corridor5/header.s" - .include "data/maps/EverGrandeCity_PokemonLeague/header.s" - .include "data/maps/EverGrandeCity_HallOfFame/header.s" - .include "data/maps/EverGrandeCity_PokemonCenter_1F/header.s" - .include "data/maps/EverGrandeCity_PokemonCenter_2F/header.s" - .include "data/maps/Route104_MrBrineysHouse/header.s" - .include "data/maps/Route104_PrettyPetalFlowerShop/header.s" - .include "data/maps/Route111_WinstrateFamilysHouse/header.s" - .include "data/maps/Route111_OldLadysRestStop/header.s" - .include "data/maps/Route112_CableCarStation/header.s" - .include "data/maps/MtChimney_CableCarStation/header.s" - .include "data/maps/Route114_FossilManiacsHouse/header.s" - .include "data/maps/Route114_FossilManiacsTunnel/header.s" - .include "data/maps/Route114_LanettesHouse/header.s" - .include "data/maps/Route116_TunnelersRestHouse/header.s" - .include "data/maps/Route117_PokemonDayCare/header.s" - .include "data/maps/Route121_SafariZoneEntrance/header.s" - .include "data/maps/MeteorFalls_1F_1R/header.s" - .include "data/maps/MeteorFalls_1F_2R/header.s" - .include "data/maps/MeteorFalls_B1F_1R/header.s" - .include "data/maps/MeteorFalls_B1F_2R/header.s" - .include "data/maps/RusturfTunnel/header.s" - .include "data/maps/Underwater_SootopolisCity/header.s" - .include "data/maps/DesertRuins/header.s" - .include "data/maps/GraniteCave_1F/header.s" - .include "data/maps/GraniteCave_B1F/header.s" - .include "data/maps/GraniteCave_B2F/header.s" - .include "data/maps/GraniteCave_StevensRoom/header.s" - .include "data/maps/PetalburgWoods/header.s" - .include "data/maps/MtChimney/header.s" - .include "data/maps/JaggedPass/header.s" - .include "data/maps/FieryPath/header.s" - .include "data/maps/MtPyre_1F/header.s" - .include "data/maps/MtPyre_2F/header.s" - .include "data/maps/MtPyre_3F/header.s" - .include "data/maps/MtPyre_4F/header.s" - .include "data/maps/MtPyre_5F/header.s" - .include "data/maps/MtPyre_6F/header.s" - .include "data/maps/MtPyre_Exterior/header.s" - .include "data/maps/MtPyre_Summit/header.s" - .include "data/maps/AquaHideout_1F/header.s" - .include "data/maps/AquaHideout_B1F/header.s" - .include "data/maps/AquaHideout_B2F/header.s" - .include "data/maps/Underwater_SeafloorCavern/header.s" - .include "data/maps/SeafloorCavern_Entrance/header.s" - .include "data/maps/SeafloorCavern_Room1/header.s" - .include "data/maps/SeafloorCavern_Room2/header.s" - .include "data/maps/SeafloorCavern_Room3/header.s" - .include "data/maps/SeafloorCavern_Room4/header.s" - .include "data/maps/SeafloorCavern_Room5/header.s" - .include "data/maps/SeafloorCavern_Room6/header.s" - .include "data/maps/SeafloorCavern_Room7/header.s" - .include "data/maps/SeafloorCavern_Room8/header.s" - .include "data/maps/SeafloorCavern_Room9/header.s" - .include "data/maps/CaveOfOrigin_Entrance/header.s" - .include "data/maps/CaveOfOrigin_1F/header.s" - .include "data/maps/CaveOfOrigin_B1F/header.s" - .include "data/maps/CaveOfOrigin_B2F/header.s" - .include "data/maps/CaveOfOrigin_B3F/header.s" - .include "data/maps/CaveOfOrigin_B4F/header.s" - .include "data/maps/VictoryRoad_1F/header.s" - .include "data/maps/VictoryRoad_B1F/header.s" - .include "data/maps/VictoryRoad_B2F/header.s" - .include "data/maps/ShoalCave_LowTideEntranceRoom/header.s" - .include "data/maps/ShoalCave_LowTideInnerRoom/header.s" - .include "data/maps/ShoalCave_LowTideStairsRoom/header.s" - .include "data/maps/ShoalCave_LowTideLowerRoom/header.s" - .include "data/maps/ShoalCave_HighTideEntranceRoom/header.s" - .include "data/maps/ShoalCave_HighTideInnerRoom/header.s" - .include "data/maps/NewMauville_Entrance/header.s" - .include "data/maps/NewMauville_Inside/header.s" - .include "data/maps/AbandonedShip_Deck/header.s" - .include "data/maps/AbandonedShip_Corridors_1F/header.s" - .include "data/maps/AbandonedShip_Rooms_1F/header.s" - .include "data/maps/AbandonedShip_Corridors_B1F/header.s" - .include "data/maps/AbandonedShip_Rooms_B1F/header.s" - .include "data/maps/AbandonedShip_Rooms2_B1F/header.s" - .include "data/maps/AbandonedShip_Underwater1/header.s" - .include "data/maps/AbandonedShip_Room_B1F/header.s" - .include "data/maps/AbandonedShip_Rooms2_1F/header.s" - .include "data/maps/AbandonedShip_CaptainsOffice/header.s" - .include "data/maps/AbandonedShip_Underwater2/header.s" - .include "data/maps/AbandonedShip_HiddenFloorCorridors/header.s" - .include "data/maps/AbandonedShip_HiddenFloorRooms/header.s" - .include "data/maps/IslandCave/header.s" - .include "data/maps/AncientTomb/header.s" - .include "data/maps/Underwater_Route134/header.s" - .include "data/maps/Underwater_SealedChamber/header.s" - .include "data/maps/SealedChamber_OuterRoom/header.s" - .include "data/maps/SealedChamber_InnerRoom/header.s" - .include "data/maps/ScorchedSlab/header.s" - .include "data/maps/MagmaHideout_1F/header.s" - .include "data/maps/MagmaHideout_B1F/header.s" - .include "data/maps/MagmaHideout_B2F/header.s" - .include "data/maps/SkyPillar_Entrance/header.s" - .include "data/maps/SkyPillar_Outside/header.s" - .include "data/maps/SkyPillar_1F/header.s" - .include "data/maps/SkyPillar_2F/header.s" - .include "data/maps/SkyPillar_3F/header.s" - .include "data/maps/SkyPillar_4F/header.s" - .include "data/maps/ShoalCave_LowTideIceRoom/header.s" - .include "data/maps/SkyPillar_5F/header.s" - .include "data/maps/SkyPillar_Top/header.s" - .include "data/maps/SecretBase_RedCave1/header.s" - .include "data/maps/SecretBase_BrownCave1/header.s" - .include "data/maps/SecretBase_BlueCave1/header.s" - .include "data/maps/SecretBase_YellowCave1/header.s" - .include "data/maps/SecretBase_Tree1/header.s" - .include "data/maps/SecretBase_Shrub1/header.s" - .include "data/maps/SecretBase_RedCave2/header.s" - .include "data/maps/SecretBase_BrownCave2/header.s" - .include "data/maps/SecretBase_BlueCave2/header.s" - .include "data/maps/SecretBase_YellowCave2/header.s" - .include "data/maps/SecretBase_Tree2/header.s" - .include "data/maps/SecretBase_Shrub2/header.s" - .include "data/maps/SecretBase_RedCave3/header.s" - .include "data/maps/SecretBase_BrownCave3/header.s" - .include "data/maps/SecretBase_BlueCave3/header.s" - .include "data/maps/SecretBase_YellowCave3/header.s" - .include "data/maps/SecretBase_Tree3/header.s" - .include "data/maps/SecretBase_Shrub3/header.s" - .include "data/maps/SecretBase_RedCave4/header.s" - .include "data/maps/SecretBase_BrownCave4/header.s" - .include "data/maps/SecretBase_BlueCave4/header.s" - .include "data/maps/SecretBase_YellowCave4/header.s" - .include "data/maps/SecretBase_Tree4/header.s" - .include "data/maps/SecretBase_Shrub4/header.s" - .include "data/maps/SingleBattleColosseum/header.s" - .include "data/maps/TradeCenter/header.s" - .include "data/maps/RecordCorner/header.s" - .include "data/maps/DoubleBattleColosseum/header.s" - .include "data/maps/LinkContestRoom1/header.s" - .include "data/maps/UnknownMap_25_29/header.s" - .include "data/maps/UnknownMap_25_30/header.s" - .include "data/maps/UnknownMap_25_31/header.s" - .include "data/maps/UnknownMap_25_32/header.s" - .include "data/maps/UnknownMap_25_33/header.s" - .include "data/maps/UnknownMap_25_34/header.s" - .include "data/maps/LinkContestRoom2/header.s" - .include "data/maps/LinkContestRoom3/header.s" - .include "data/maps/LinkContestRoom4/header.s" - .include "data/maps/LinkContestRoom5/header.s" - .include "data/maps/LinkContestRoom6/header.s" - .include "data/maps/InsideOfTruck/header.s" - .include "data/maps/SSTidalCorridor/header.s" - .include "data/maps/SSTidalLowerDeck/header.s" - .include "data/maps/SSTidalRooms/header.s" - .include "data/maps/SafariZone_Northwest/header.s" - .include "data/maps/SafariZone_Northeast/header.s" - .include "data/maps/SafariZone_Southwest/header.s" - .include "data/maps/SafariZone_Southeast/header.s" - .include "data/maps/BattleTower_Outside/header.s" - .include "data/maps/BattleTower_Lobby/header.s" - .include "data/maps/BattleTower_Elevator/header.s" - .include "data/maps/BattleTower_Corridor/header.s" - .include "data/maps/BattleTower_BattleRoom/header.s" - .include "data/maps/SouthernIsland_Exterior/header.s" - .include "data/maps/SouthernIsland_Interior/header.s" - .include "data/maps/SafariZone_RestHouse/header.s" - .include "data/maps/Route104_Prototype/header.s" - .include "data/maps/Route104_PrototypePrettyPetalFlowerShop/header.s" - .include "data/maps/Route109_SeashoreHouse/header.s" - .include "data/maps/Route110_TrickHouseEntrance/header.s" - .include "data/maps/Route110_TrickHouseEnd/header.s" - .include "data/maps/Route110_TrickHouseCorridor/header.s" - .include "data/maps/Route110_TrickHousePuzzle1/header.s" - .include "data/maps/Route110_TrickHousePuzzle2/header.s" - .include "data/maps/Route110_TrickHousePuzzle3/header.s" - .include "data/maps/Route110_TrickHousePuzzle4/header.s" - .include "data/maps/Route110_TrickHousePuzzle5/header.s" - .include "data/maps/Route110_TrickHousePuzzle6/header.s" - .include "data/maps/Route110_TrickHousePuzzle7/header.s" - .include "data/maps/Route110_TrickHousePuzzle8/header.s" - .include "data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.s" - .include "data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.s" - .include "data/maps/Route113_GlassWorkshop/header.s" - .include "data/maps/Route123_BerryMastersHouse/header.s" - .include "data/maps/Route119_WeatherInstitute_1F/header.s" - .include "data/maps/Route119_WeatherInstitute_2F/header.s" - .include "data/maps/Route119_House/header.s" - .include "data/maps/Route124_DivingTreasureHuntersHouse/header.s" + .include "data/maps/PetalburgCity/header.inc" + .include "data/maps/SlateportCity/header.inc" + .include "data/maps/MauvilleCity/header.inc" + .include "data/maps/RustboroCity/header.inc" + .include "data/maps/FortreeCity/header.inc" + .include "data/maps/LilycoveCity/header.inc" + .include "data/maps/MossdeepCity/header.inc" + .include "data/maps/SootopolisCity/header.inc" + .include "data/maps/EverGrandeCity/header.inc" + .include "data/maps/LittlerootTown/header.inc" + .include "data/maps/OldaleTown/header.inc" + .include "data/maps/DewfordTown/header.inc" + .include "data/maps/LavaridgeTown/header.inc" + .include "data/maps/FallarborTown/header.inc" + .include "data/maps/VerdanturfTown/header.inc" + .include "data/maps/PacifidlogTown/header.inc" + .include "data/maps/Route101/header.inc" + .include "data/maps/Route102/header.inc" + .include "data/maps/Route103/header.inc" + .include "data/maps/Route104/header.inc" + .include "data/maps/Route105/header.inc" + .include "data/maps/Route106/header.inc" + .include "data/maps/Route107/header.inc" + .include "data/maps/Route108/header.inc" + .include "data/maps/Route109/header.inc" + .include "data/maps/Route110/header.inc" + .include "data/maps/Route111/header.inc" + .include "data/maps/Route112/header.inc" + .include "data/maps/Route113/header.inc" + .include "data/maps/Route114/header.inc" + .include "data/maps/Route115/header.inc" + .include "data/maps/Route116/header.inc" + .include "data/maps/Route117/header.inc" + .include "data/maps/Route118/header.inc" + .include "data/maps/Route119/header.inc" + .include "data/maps/Route120/header.inc" + .include "data/maps/Route121/header.inc" + .include "data/maps/Route122/header.inc" + .include "data/maps/Route123/header.inc" + .include "data/maps/Route124/header.inc" + .include "data/maps/Route125/header.inc" + .include "data/maps/Route126/header.inc" + .include "data/maps/Route127/header.inc" + .include "data/maps/Route128/header.inc" + .include "data/maps/Route129/header.inc" + .include "data/maps/Route130/header.inc" + .include "data/maps/Route131/header.inc" + .include "data/maps/Route132/header.inc" + .include "data/maps/Route133/header.inc" + .include "data/maps/Route134/header.inc" + .include "data/maps/Underwater1/header.inc" + .include "data/maps/Underwater2/header.inc" + .include "data/maps/Underwater3/header.inc" + .include "data/maps/Underwater4/header.inc" + .include "data/maps/LittlerootTown_BrendansHouse_1F/header.inc" + .include "data/maps/LittlerootTown_BrendansHouse_2F/header.inc" + .include "data/maps/LittlerootTown_MaysHouse_1F/header.inc" + .include "data/maps/LittlerootTown_MaysHouse_2F/header.inc" + .include "data/maps/LittlerootTown_ProfessorBirchsLab/header.inc" + .include "data/maps/OldaleTown_House1/header.inc" + .include "data/maps/OldaleTown_House2/header.inc" + .include "data/maps/OldaleTown_PokemonCenter_1F/header.inc" + .include "data/maps/OldaleTown_PokemonCenter_2F/header.inc" + .include "data/maps/OldaleTown_Mart/header.inc" + .include "data/maps/DewfordTown_House1/header.inc" + .include "data/maps/DewfordTown_PokemonCenter_1F/header.inc" + .include "data/maps/DewfordTown_PokemonCenter_2F/header.inc" + .include "data/maps/DewfordTown_Gym/header.inc" + .include "data/maps/DewfordTown_Hall/header.inc" + .include "data/maps/DewfordTown_House2/header.inc" + .include "data/maps/LavaridgeTown_HerbShop/header.inc" + .include "data/maps/LavaridgeTown_Gym_1F/header.inc" + .include "data/maps/LavaridgeTown_Gym_B1F/header.inc" + .include "data/maps/LavaridgeTown_House/header.inc" + .include "data/maps/LavaridgeTown_Mart/header.inc" + .include "data/maps/LavaridgeTown_PokemonCenter_1F/header.inc" + .include "data/maps/LavaridgeTown_PokemonCenter_2F/header.inc" + .include "data/maps/FallarborTown_Mart/header.inc" + .include "data/maps/FallarborTown_ContestLobby/header.inc" + .include "data/maps/FallarborTown_ContestHall/header.inc" + .include "data/maps/FallarborTown_PokemonCenter_1F/header.inc" + .include "data/maps/FallarborTown_PokemonCenter_2F/header.inc" + .include "data/maps/FallarborTown_House1/header.inc" + .include "data/maps/FallarborTown_House2/header.inc" + .include "data/maps/VerdanturfTown_ContestLobby/header.inc" + .include "data/maps/VerdanturfTown_ContestHall/header.inc" + .include "data/maps/VerdanturfTown_Mart/header.inc" + .include "data/maps/VerdanturfTown_PokemonCenter_1F/header.inc" + .include "data/maps/VerdanturfTown_PokemonCenter_2F/header.inc" + .include "data/maps/VerdanturfTown_WandasHouse/header.inc" + .include "data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc" + .include "data/maps/VerdanturfTown_House/header.inc" + .include "data/maps/PacifidlogTown_PokemonCenter_1F/header.inc" + .include "data/maps/PacifidlogTown_PokemonCenter_2F/header.inc" + .include "data/maps/PacifidlogTown_House1/header.inc" + .include "data/maps/PacifidlogTown_House2/header.inc" + .include "data/maps/PacifidlogTown_House3/header.inc" + .include "data/maps/PacifidlogTown_House4/header.inc" + .include "data/maps/PacifidlogTown_House5/header.inc" + .include "data/maps/PetalburgCity_WallysHouse/header.inc" + .include "data/maps/PetalburgCity_Gym/header.inc" + .include "data/maps/PetalburgCity_House1/header.inc" + .include "data/maps/PetalburgCity_House2/header.inc" + .include "data/maps/PetalburgCity_PokemonCenter_1F/header.inc" + .include "data/maps/PetalburgCity_PokemonCenter_2F/header.inc" + .include "data/maps/PetalburgCity_Mart/header.inc" + .include "data/maps/SlateportCity_SternsShipyard_1F/header.inc" + .include "data/maps/SlateportCity_SternsShipyard_2F/header.inc" + .include "data/maps/SlateportCity_ContestLobby/header.inc" + .include "data/maps/SlateportCity_ContestHall/header.inc" + .include "data/maps/SlateportCity_House1/header.inc" + .include "data/maps/SlateportCity_PokemonFanClub/header.inc" + .include "data/maps/SlateportCity_OceanicMuseum_1F/header.inc" + .include "data/maps/SlateportCity_OceanicMuseum_2F/header.inc" + .include "data/maps/SlateportCity_Harbor/header.inc" + .include "data/maps/SlateportCity_House2/header.inc" + .include "data/maps/SlateportCity_PokemonCenter_1F/header.inc" + .include "data/maps/SlateportCity_PokemonCenter_2F/header.inc" + .include "data/maps/SlateportCity_Mart/header.inc" + .include "data/maps/MauvilleCity_Gym/header.inc" + .include "data/maps/MauvilleCity_BikeShop/header.inc" + .include "data/maps/MauvilleCity_House1/header.inc" + .include "data/maps/MauvilleCity_GameCorner/header.inc" + .include "data/maps/MauvilleCity_House2/header.inc" + .include "data/maps/MauvilleCity_PokemonCenter_1F/header.inc" + .include "data/maps/MauvilleCity_PokemonCenter_2F/header.inc" + .include "data/maps/MauvilleCity_Mart/header.inc" + .include "data/maps/RustboroCity_DevonCorp_1F/header.inc" + .include "data/maps/RustboroCity_DevonCorp_2F/header.inc" + .include "data/maps/RustboroCity_DevonCorp_3F/header.inc" + .include "data/maps/RustboroCity_Gym/header.inc" + .include "data/maps/RustboroCity_PokemonSchool/header.inc" + .include "data/maps/RustboroCity_PokemonCenter_1F/header.inc" + .include "data/maps/RustboroCity_PokemonCenter_2F/header.inc" + .include "data/maps/RustboroCity_Mart/header.inc" + .include "data/maps/RustboroCity_Flat1_1F/header.inc" + .include "data/maps/RustboroCity_Flat1_2F/header.inc" + .include "data/maps/RustboroCity_House1/header.inc" + .include "data/maps/RustboroCity_CuttersHouse/header.inc" + .include "data/maps/RustboroCity_House2/header.inc" + .include "data/maps/RustboroCity_Flat2_1F/header.inc" + .include "data/maps/RustboroCity_Flat2_2F/header.inc" + .include "data/maps/RustboroCity_Flat2_3F/header.inc" + .include "data/maps/RustboroCity_House3/header.inc" + .include "data/maps/FortreeCity_House1/header.inc" + .include "data/maps/FortreeCity_Gym/header.inc" + .include "data/maps/FortreeCity_PokemonCenter_1F/header.inc" + .include "data/maps/FortreeCity_PokemonCenter_2F/header.inc" + .include "data/maps/FortreeCity_Mart/header.inc" + .include "data/maps/FortreeCity_House2/header.inc" + .include "data/maps/FortreeCity_House3/header.inc" + .include "data/maps/FortreeCity_House4/header.inc" + .include "data/maps/FortreeCity_House5/header.inc" + .include "data/maps/FortreeCity_DecorationShop/header.inc" + .include "data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc" + .include "data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc" + .include "data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc" + .include "data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc" + .include "data/maps/LilycoveCity_ContestLobby/header.inc" + .include "data/maps/LilycoveCity_ContestHall/header.inc" + .include "data/maps/LilycoveCity_PokemonCenter_1F/header.inc" + .include "data/maps/LilycoveCity_PokemonCenter_2F/header.inc" + .include "data/maps/LilycoveCity_UnusedMart/header.inc" + .include "data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc" + .include "data/maps/LilycoveCity_Harbor/header.inc" + .include "data/maps/LilycoveCity_EmptyMap/header.inc" + .include "data/maps/LilycoveCity_MoveDeletersHouse/header.inc" + .include "data/maps/LilycoveCity_House1/header.inc" + .include "data/maps/LilycoveCity_House2/header.inc" + .include "data/maps/LilycoveCity_House3/header.inc" + .include "data/maps/LilycoveCity_House4/header.inc" + .include "data/maps/LilycoveCity_DepartmentStore_1F/header.inc" + .include "data/maps/LilycoveCity_DepartmentStore_2F/header.inc" + .include "data/maps/LilycoveCity_DepartmentStore_3F/header.inc" + .include "data/maps/LilycoveCity_DepartmentStore_4F/header.inc" + .include "data/maps/LilycoveCity_DepartmentStore_5F/header.inc" + .include "data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc" + .include "data/maps/LilycoveCity_DepartmentStoreElevator/header.inc" + .include "data/maps/MossdeepCity_Gym/header.inc" + .include "data/maps/MossdeepCity_House1/header.inc" + .include "data/maps/MossdeepCity_House2/header.inc" + .include "data/maps/MossdeepCity_PokemonCenter_1F/header.inc" + .include "data/maps/MossdeepCity_PokemonCenter_2F/header.inc" + .include "data/maps/MossdeepCity_Mart/header.inc" + .include "data/maps/MossdeepCity_House3/header.inc" + .include "data/maps/MossdeepCity_StevensHouse/header.inc" + .include "data/maps/MossdeepCity_House4/header.inc" + .include "data/maps/MossdeepCity_SpaceCenter_1F/header.inc" + .include "data/maps/MossdeepCity_SpaceCenter_2F/header.inc" + .include "data/maps/MossdeepCity_GameCorner_1F/header.inc" + .include "data/maps/MossdeepCity_GameCorner_B1F/header.inc" + .include "data/maps/SootopolisCity_Gym_1F/header.inc" + .include "data/maps/SootopolisCity_Gym_B1F/header.inc" + .include "data/maps/SootopolisCity_PokemonCenter_1F/header.inc" + .include "data/maps/SootopolisCity_PokemonCenter_2F/header.inc" + .include "data/maps/SootopolisCity_Mart/header.inc" + .include "data/maps/SootopolisCity_House1/header.inc" + .include "data/maps/SootopolisCity_House2/header.inc" + .include "data/maps/SootopolisCity_House3/header.inc" + .include "data/maps/SootopolisCity_House4/header.inc" + .include "data/maps/SootopolisCity_House5/header.inc" + .include "data/maps/SootopolisCity_House6/header.inc" + .include "data/maps/SootopolisCity_House7/header.inc" + .include "data/maps/SootopolisCity_House8/header.inc" + .include "data/maps/EverGrandeCity_SidneysRoom/header.inc" + .include "data/maps/EverGrandeCity_PhoebesRoom/header.inc" + .include "data/maps/EverGrandeCity_GlaciasRoom/header.inc" + .include "data/maps/EverGrandeCity_DrakesRoom/header.inc" + .include "data/maps/EverGrandeCity_ChampionsRoom/header.inc" + .include "data/maps/EverGrandeCity_Corridor1/header.inc" + .include "data/maps/EverGrandeCity_Corridor2/header.inc" + .include "data/maps/EverGrandeCity_Corridor3/header.inc" + .include "data/maps/EverGrandeCity_Corridor4/header.inc" + .include "data/maps/EverGrandeCity_Corridor5/header.inc" + .include "data/maps/EverGrandeCity_PokemonLeague/header.inc" + .include "data/maps/EverGrandeCity_HallOfFame/header.inc" + .include "data/maps/EverGrandeCity_PokemonCenter_1F/header.inc" + .include "data/maps/EverGrandeCity_PokemonCenter_2F/header.inc" + .include "data/maps/Route104_MrBrineysHouse/header.inc" + .include "data/maps/Route104_PrettyPetalFlowerShop/header.inc" + .include "data/maps/Route111_WinstrateFamilysHouse/header.inc" + .include "data/maps/Route111_OldLadysRestStop/header.inc" + .include "data/maps/Route112_CableCarStation/header.inc" + .include "data/maps/MtChimney_CableCarStation/header.inc" + .include "data/maps/Route114_FossilManiacsHouse/header.inc" + .include "data/maps/Route114_FossilManiacsTunnel/header.inc" + .include "data/maps/Route114_LanettesHouse/header.inc" + .include "data/maps/Route116_TunnelersRestHouse/header.inc" + .include "data/maps/Route117_PokemonDayCare/header.inc" + .include "data/maps/Route121_SafariZoneEntrance/header.inc" + .include "data/maps/MeteorFalls_1F_1R/header.inc" + .include "data/maps/MeteorFalls_1F_2R/header.inc" + .include "data/maps/MeteorFalls_B1F_1R/header.inc" + .include "data/maps/MeteorFalls_B1F_2R/header.inc" + .include "data/maps/RusturfTunnel/header.inc" + .include "data/maps/Underwater_SootopolisCity/header.inc" + .include "data/maps/DesertRuins/header.inc" + .include "data/maps/GraniteCave_1F/header.inc" + .include "data/maps/GraniteCave_B1F/header.inc" + .include "data/maps/GraniteCave_B2F/header.inc" + .include "data/maps/GraniteCave_StevensRoom/header.inc" + .include "data/maps/PetalburgWoods/header.inc" + .include "data/maps/MtChimney/header.inc" + .include "data/maps/JaggedPass/header.inc" + .include "data/maps/FieryPath/header.inc" + .include "data/maps/MtPyre_1F/header.inc" + .include "data/maps/MtPyre_2F/header.inc" + .include "data/maps/MtPyre_3F/header.inc" + .include "data/maps/MtPyre_4F/header.inc" + .include "data/maps/MtPyre_5F/header.inc" + .include "data/maps/MtPyre_6F/header.inc" + .include "data/maps/MtPyre_Exterior/header.inc" + .include "data/maps/MtPyre_Summit/header.inc" + .include "data/maps/AquaHideout_1F/header.inc" + .include "data/maps/AquaHideout_B1F/header.inc" + .include "data/maps/AquaHideout_B2F/header.inc" + .include "data/maps/Underwater_SeafloorCavern/header.inc" + .include "data/maps/SeafloorCavern_Entrance/header.inc" + .include "data/maps/SeafloorCavern_Room1/header.inc" + .include "data/maps/SeafloorCavern_Room2/header.inc" + .include "data/maps/SeafloorCavern_Room3/header.inc" + .include "data/maps/SeafloorCavern_Room4/header.inc" + .include "data/maps/SeafloorCavern_Room5/header.inc" + .include "data/maps/SeafloorCavern_Room6/header.inc" + .include "data/maps/SeafloorCavern_Room7/header.inc" + .include "data/maps/SeafloorCavern_Room8/header.inc" + .include "data/maps/SeafloorCavern_Room9/header.inc" + .include "data/maps/CaveOfOrigin_Entrance/header.inc" + .include "data/maps/CaveOfOrigin_1F/header.inc" + .include "data/maps/CaveOfOrigin_B1F/header.inc" + .include "data/maps/CaveOfOrigin_B2F/header.inc" + .include "data/maps/CaveOfOrigin_B3F/header.inc" + .include "data/maps/CaveOfOrigin_B4F/header.inc" + .include "data/maps/VictoryRoad_1F/header.inc" + .include "data/maps/VictoryRoad_B1F/header.inc" + .include "data/maps/VictoryRoad_B2F/header.inc" + .include "data/maps/ShoalCave_LowTideEntranceRoom/header.inc" + .include "data/maps/ShoalCave_LowTideInnerRoom/header.inc" + .include "data/maps/ShoalCave_LowTideStairsRoom/header.inc" + .include "data/maps/ShoalCave_LowTideLowerRoom/header.inc" + .include "data/maps/ShoalCave_HighTideEntranceRoom/header.inc" + .include "data/maps/ShoalCave_HighTideInnerRoom/header.inc" + .include "data/maps/NewMauville_Entrance/header.inc" + .include "data/maps/NewMauville_Inside/header.inc" + .include "data/maps/AbandonedShip_Deck/header.inc" + .include "data/maps/AbandonedShip_Corridors_1F/header.inc" + .include "data/maps/AbandonedShip_Rooms_1F/header.inc" + .include "data/maps/AbandonedShip_Corridors_B1F/header.inc" + .include "data/maps/AbandonedShip_Rooms_B1F/header.inc" + .include "data/maps/AbandonedShip_Rooms2_B1F/header.inc" + .include "data/maps/AbandonedShip_Underwater1/header.inc" + .include "data/maps/AbandonedShip_Room_B1F/header.inc" + .include "data/maps/AbandonedShip_Rooms2_1F/header.inc" + .include "data/maps/AbandonedShip_CaptainsOffice/header.inc" + .include "data/maps/AbandonedShip_Underwater2/header.inc" + .include "data/maps/AbandonedShip_HiddenFloorCorridors/header.inc" + .include "data/maps/AbandonedShip_HiddenFloorRooms/header.inc" + .include "data/maps/IslandCave/header.inc" + .include "data/maps/AncientTomb/header.inc" + .include "data/maps/Underwater_Route134/header.inc" + .include "data/maps/Underwater_SealedChamber/header.inc" + .include "data/maps/SealedChamber_OuterRoom/header.inc" + .include "data/maps/SealedChamber_InnerRoom/header.inc" + .include "data/maps/ScorchedSlab/header.inc" + .include "data/maps/MagmaHideout_1F/header.inc" + .include "data/maps/MagmaHideout_B1F/header.inc" + .include "data/maps/MagmaHideout_B2F/header.inc" + .include "data/maps/SkyPillar_Entrance/header.inc" + .include "data/maps/SkyPillar_Outside/header.inc" + .include "data/maps/SkyPillar_1F/header.inc" + .include "data/maps/SkyPillar_2F/header.inc" + .include "data/maps/SkyPillar_3F/header.inc" + .include "data/maps/SkyPillar_4F/header.inc" + .include "data/maps/ShoalCave_LowTideIceRoom/header.inc" + .include "data/maps/SkyPillar_5F/header.inc" + .include "data/maps/SkyPillar_Top/header.inc" + .include "data/maps/SecretBase_RedCave1/header.inc" + .include "data/maps/SecretBase_BrownCave1/header.inc" + .include "data/maps/SecretBase_BlueCave1/header.inc" + .include "data/maps/SecretBase_YellowCave1/header.inc" + .include "data/maps/SecretBase_Tree1/header.inc" + .include "data/maps/SecretBase_Shrub1/header.inc" + .include "data/maps/SecretBase_RedCave2/header.inc" + .include "data/maps/SecretBase_BrownCave2/header.inc" + .include "data/maps/SecretBase_BlueCave2/header.inc" + .include "data/maps/SecretBase_YellowCave2/header.inc" + .include "data/maps/SecretBase_Tree2/header.inc" + .include "data/maps/SecretBase_Shrub2/header.inc" + .include "data/maps/SecretBase_RedCave3/header.inc" + .include "data/maps/SecretBase_BrownCave3/header.inc" + .include "data/maps/SecretBase_BlueCave3/header.inc" + .include "data/maps/SecretBase_YellowCave3/header.inc" + .include "data/maps/SecretBase_Tree3/header.inc" + .include "data/maps/SecretBase_Shrub3/header.inc" + .include "data/maps/SecretBase_RedCave4/header.inc" + .include "data/maps/SecretBase_BrownCave4/header.inc" + .include "data/maps/SecretBase_BlueCave4/header.inc" + .include "data/maps/SecretBase_YellowCave4/header.inc" + .include "data/maps/SecretBase_Tree4/header.inc" + .include "data/maps/SecretBase_Shrub4/header.inc" + .include "data/maps/SingleBattleColosseum/header.inc" + .include "data/maps/TradeCenter/header.inc" + .include "data/maps/RecordCorner/header.inc" + .include "data/maps/DoubleBattleColosseum/header.inc" + .include "data/maps/LinkContestRoom1/header.inc" + .include "data/maps/UnknownMap_25_29/header.inc" + .include "data/maps/UnknownMap_25_30/header.inc" + .include "data/maps/UnknownMap_25_31/header.inc" + .include "data/maps/UnknownMap_25_32/header.inc" + .include "data/maps/UnknownMap_25_33/header.inc" + .include "data/maps/UnknownMap_25_34/header.inc" + .include "data/maps/LinkContestRoom2/header.inc" + .include "data/maps/LinkContestRoom3/header.inc" + .include "data/maps/LinkContestRoom4/header.inc" + .include "data/maps/LinkContestRoom5/header.inc" + .include "data/maps/LinkContestRoom6/header.inc" + .include "data/maps/InsideOfTruck/header.inc" + .include "data/maps/SSTidalCorridor/header.inc" + .include "data/maps/SSTidalLowerDeck/header.inc" + .include "data/maps/SSTidalRooms/header.inc" + .include "data/maps/SafariZone_Northwest/header.inc" + .include "data/maps/SafariZone_Northeast/header.inc" + .include "data/maps/SafariZone_Southwest/header.inc" + .include "data/maps/SafariZone_Southeast/header.inc" + .include "data/maps/BattleTower_Outside/header.inc" + .include "data/maps/BattleTower_Lobby/header.inc" + .include "data/maps/BattleTower_Elevator/header.inc" + .include "data/maps/BattleTower_Corridor/header.inc" + .include "data/maps/BattleTower_BattleRoom/header.inc" + .include "data/maps/SouthernIsland_Exterior/header.inc" + .include "data/maps/SouthernIsland_Interior/header.inc" + .include "data/maps/SafariZone_RestHouse/header.inc" + .include "data/maps/Route104_Prototype/header.inc" + .include "data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc" + .include "data/maps/Route109_SeashoreHouse/header.inc" + .include "data/maps/Route110_TrickHouseEntrance/header.inc" + .include "data/maps/Route110_TrickHouseEnd/header.inc" + .include "data/maps/Route110_TrickHouseCorridor/header.inc" + .include "data/maps/Route110_TrickHousePuzzle1/header.inc" + .include "data/maps/Route110_TrickHousePuzzle2/header.inc" + .include "data/maps/Route110_TrickHousePuzzle3/header.inc" + .include "data/maps/Route110_TrickHousePuzzle4/header.inc" + .include "data/maps/Route110_TrickHousePuzzle5/header.inc" + .include "data/maps/Route110_TrickHousePuzzle6/header.inc" + .include "data/maps/Route110_TrickHousePuzzle7/header.inc" + .include "data/maps/Route110_TrickHousePuzzle8/header.inc" + .include "data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc" + .include "data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc" + .include "data/maps/Route113_GlassWorkshop/header.inc" + .include "data/maps/Route123_BerryMastersHouse/header.inc" + .include "data/maps/Route119_WeatherInstitute_1F/header.inc" + .include "data/maps/Route119_WeatherInstitute_2F/header.inc" + .include "data/maps/Route119_House/header.inc" + .include "data/maps/Route124_DivingTreasureHuntersHouse/header.inc" diff --git a/data/text/easy_chat/group_orders.inc b/data/text/easy_chat/group_orders.inc index d08f70a2a..494bf5f7a 100644 --- a/data/text/easy_chat/group_orders.inc +++ b/data/text/easy_chat/group_orders.inc @@ -1,25 +1,25 @@ - .include "data/text/easy_chat/groups/pokemon/order.s" - .include "data/text/easy_chat/groups/trainer/order.s" - .include "data/text/easy_chat/groups/status/order.s" - .include "data/text/easy_chat/groups/battle/order.s" - .include "data/text/easy_chat/groups/greetings/order.s" - .include "data/text/easy_chat/groups/people/order.s" - .include "data/text/easy_chat/groups/voices/order.s" - .include "data/text/easy_chat/groups/speech/order.s" - .include "data/text/easy_chat/groups/endings/order.s" - .include "data/text/easy_chat/groups/feelings/order.s" - .include "data/text/easy_chat/groups/conditions/order.s" - .include "data/text/easy_chat/groups/actions/order.s" - .include "data/text/easy_chat/groups/lifestyle/order.s" - .include "data/text/easy_chat/groups/hobbies/order.s" - .include "data/text/easy_chat/groups/time/order.s" - .include "data/text/easy_chat/groups/misc/order.s" - .include "data/text/easy_chat/groups/adjectives/order.s" - .include "data/text/easy_chat/groups/events/order.s" - .include "data/text/easy_chat/groups/move_1/order.s" - .include "data/text/easy_chat/groups/move_2/order.s" - .include "data/text/easy_chat/groups/trendy_saying/order.s" - .include "data/text/easy_chat/groups/pokemon_2/order.s" + .include "data/text/easy_chat/groups/pokemon/order.inc" + .include "data/text/easy_chat/groups/trainer/order.inc" + .include "data/text/easy_chat/groups/status/order.inc" + .include "data/text/easy_chat/groups/battle/order.inc" + .include "data/text/easy_chat/groups/greetings/order.inc" + .include "data/text/easy_chat/groups/people/order.inc" + .include "data/text/easy_chat/groups/voices/order.inc" + .include "data/text/easy_chat/groups/speech/order.inc" + .include "data/text/easy_chat/groups/endings/order.inc" + .include "data/text/easy_chat/groups/feelings/order.inc" + .include "data/text/easy_chat/groups/conditions/order.inc" + .include "data/text/easy_chat/groups/actions/order.inc" + .include "data/text/easy_chat/groups/lifestyle/order.inc" + .include "data/text/easy_chat/groups/hobbies/order.inc" + .include "data/text/easy_chat/groups/time/order.inc" + .include "data/text/easy_chat/groups/misc/order.inc" + .include "data/text/easy_chat/groups/adjectives/order.inc" + .include "data/text/easy_chat/groups/events/order.inc" + .include "data/text/easy_chat/groups/move_1/order.inc" + .include "data/text/easy_chat/groups/move_2/order.inc" + .include "data/text/easy_chat/groups/trendy_saying/order.inc" + .include "data/text/easy_chat/groups/pokemon_2/order.inc" @ This table is used to find the alphabetical order of each group of words @ when listing them. The words must be reordered because they are stored in diff --git a/data/text/easy_chat/group_words.inc b/data/text/easy_chat/group_words.inc index b45b767b8..a4ba6bacb 100644 --- a/data/text/easy_chat/group_words.inc +++ b/data/text/easy_chat/group_words.inc @@ -1,25 +1,25 @@ - .include "data/text/easy_chat/groups/pokemon/words.s" - .include "data/text/easy_chat/groups/trainer/words.s" - .include "data/text/easy_chat/groups/status/words.s" - .include "data/text/easy_chat/groups/battle/words.s" - .include "data/text/easy_chat/groups/greetings/words.s" - .include "data/text/easy_chat/groups/people/words.s" - .include "data/text/easy_chat/groups/voices/words.s" - .include "data/text/easy_chat/groups/speech/words.s" - .include "data/text/easy_chat/groups/endings/words.s" - .include "data/text/easy_chat/groups/feelings/words.s" - .include "data/text/easy_chat/groups/conditions/words.s" - .include "data/text/easy_chat/groups/actions/words.s" - .include "data/text/easy_chat/groups/lifestyle/words.s" - .include "data/text/easy_chat/groups/hobbies/words.s" - .include "data/text/easy_chat/groups/time/words.s" - .include "data/text/easy_chat/groups/misc/words.s" - .include "data/text/easy_chat/groups/adjectives/words.s" - .include "data/text/easy_chat/groups/events/words.s" - .include "data/text/easy_chat/groups/move_1/words.s" - .include "data/text/easy_chat/groups/move_2/words.s" - .include "data/text/easy_chat/groups/trendy_saying/words.s" - .include "data/text/easy_chat/groups/pokemon_2/words.s" + .include "data/text/easy_chat/groups/pokemon/words.inc" + .include "data/text/easy_chat/groups/trainer/words.inc" + .include "data/text/easy_chat/groups/status/words.inc" + .include "data/text/easy_chat/groups/battle/words.inc" + .include "data/text/easy_chat/groups/greetings/words.inc" + .include "data/text/easy_chat/groups/people/words.inc" + .include "data/text/easy_chat/groups/voices/words.inc" + .include "data/text/easy_chat/groups/speech/words.inc" + .include "data/text/easy_chat/groups/endings/words.inc" + .include "data/text/easy_chat/groups/feelings/words.inc" + .include "data/text/easy_chat/groups/conditions/words.inc" + .include "data/text/easy_chat/groups/actions/words.inc" + .include "data/text/easy_chat/groups/lifestyle/words.inc" + .include "data/text/easy_chat/groups/hobbies/words.inc" + .include "data/text/easy_chat/groups/time/words.inc" + .include "data/text/easy_chat/groups/misc/words.inc" + .include "data/text/easy_chat/groups/adjectives/words.inc" + .include "data/text/easy_chat/groups/events/words.inc" + .include "data/text/easy_chat/groups/move_1/words.inc" + .include "data/text/easy_chat/groups/move_2/words.inc" + .include "data/text/easy_chat/groups/trendy_saying/words.inc" + .include "data/text/easy_chat/groups/pokemon_2/words.inc" .align 2 gEasyChatGroupWords:: @ 83DE0E0 diff --git a/data/text/easy_chat/groups/actions/order.inc b/data/text/easy_chat/groups/actions/order.inc new file mode 100644 index 000000000..ffe2ec4e0 --- /dev/null +++ b/data/text/easy_chat/groups/actions/order.inc @@ -0,0 +1,81 @@ + .align 1 + +gEasyChatGroupOrder_Actions: @ 83DF6A0 + .2byte 72 + .2byte 14 + .2byte 48 + .2byte 75 + .2byte 39 + .2byte 36 + .2byte 28 + .2byte 46 + .2byte 31 + .2byte 19 + .2byte 26 + .2byte 6 + .2byte 27 + .2byte 1 + .2byte 45 + .2byte 47 + .2byte 54 + .2byte 41 + .2byte 76 + .2byte 77 + .2byte 73 + .2byte 74 + .2byte 2 + .2byte 3 + .2byte 24 + .2byte 37 + .2byte 32 + .2byte 33 + .2byte 22 + .2byte 18 + .2byte 23 + .2byte 67 + .2byte 30 + .2byte 0 + .2byte 65 + .2byte 70 + .2byte 4 + .2byte 5 + .2byte 17 + .2byte 64 + .2byte 63 + .2byte 34 + .2byte 53 + .2byte 56 + .2byte 55 + .2byte 11 + .2byte 9 + .2byte 29 + .2byte 69 + .2byte 68 + .2byte 66 + .2byte 61 + .2byte 52 + .2byte 51 + .2byte 40 + .2byte 62 + .2byte 35 + .2byte 20 + .2byte 71 + .2byte 60 + .2byte 59 + .2byte 15 + .2byte 16 + .2byte 38 + .2byte 49 + .2byte 25 + .2byte 21 + .2byte 42 + .2byte 43 + .2byte 44 + .2byte 12 + .2byte 13 + .2byte 7 + .2byte 8 + .2byte 10 + .2byte 58 + .2byte 57 + .2byte 50 diff --git a/data/text/easy_chat/groups/actions/order.s b/data/text/easy_chat/groups/actions/order.s deleted file mode 100644 index ffe2ec4e0..000000000 --- a/data/text/easy_chat/groups/actions/order.s +++ /dev/null @@ -1,81 +0,0 @@ - .align 1 - -gEasyChatGroupOrder_Actions: @ 83DF6A0 - .2byte 72 - .2byte 14 - .2byte 48 - .2byte 75 - .2byte 39 - .2byte 36 - .2byte 28 - .2byte 46 - .2byte 31 - .2byte 19 - .2byte 26 - .2byte 6 - .2byte 27 - .2byte 1 - .2byte 45 - .2byte 47 - .2byte 54 - .2byte 41 - .2byte 76 - .2byte 77 - .2byte 73 - .2byte 74 - .2byte 2 - .2byte 3 - .2byte 24 - .2byte 37 - .2byte 32 - .2byte 33 - .2byte 22 - .2byte 18 - .2byte 23 - .2byte 67 - .2byte 30 - .2byte 0 - .2byte 65 - .2byte 70 - .2byte 4 - .2byte 5 - .2byte 17 - .2byte 64 - .2byte 63 - .2byte 34 - .2byte 53 - .2byte 56 - .2byte 55 - .2byte 11 - .2byte 9 - .2byte 29 - .2byte 69 - .2byte 68 - .2byte 66 - .2byte 61 - .2byte 52 - .2byte 51 - .2byte 40 - .2byte 62 - .2byte 35 - .2byte 20 - .2byte 71 - .2byte 60 - .2byte 59 - .2byte 15 - .2byte 16 - .2byte 38 - .2byte 49 - .2byte 25 - .2byte 21 - .2byte 42 - .2byte 43 - .2byte 44 - .2byte 12 - .2byte 13 - .2byte 7 - .2byte 8 - .2byte 10 - .2byte 58 - .2byte 57 - .2byte 50 diff --git a/data/text/easy_chat/groups/actions/words.inc b/data/text/easy_chat/groups/actions/words.inc new file mode 100644 index 000000000..39f10f896 --- /dev/null +++ b/data/text/easy_chat/groups/actions/words.inc @@ -0,0 +1,80 @@ +gEasyChatGroupWords_Actions: @ 83DD26E + .string "MEETS$" + .string "CONCEDE$" + .string "GIVE$" + .string "GIVES$" + .string "PLAYED$" + .string "PLAYS$" + .string "COLLECT$" + .string "WALKING$" + .string "WALKS$" + .string "SAYS$" + .string "WENT$" + .string "SAID$" + .string "WAKE UP$" + .string "WAKES UP$" + .string "ANGERS$" + .string "TEACH$" + .string "TEACHES$" + .string "PLEASE$" + .string "LEARN$" + .string "CHANGE$" + .string "STORY$" + .string "TRUST$" + .string "LAVISH$" + .string "LISTENS$" + .string "HEARING$" + .string "TRAINS$" + .string "CHOOSE$" + .string "COME$" + .string "CAME$" + .string "SEARCH$" + .string "MAKE$" + .string "CAUSE$" + .string "KNOW$" + .string "KNOWS$" + .string "REFUSE$" + .string "STORES$" + .string "BRAG$" + .string "IGNORANT$" + .string "THINKS$" + .string "BELIEVE$" + .string "SLIDE$" + .string "EATS$" + .string "USE$" + .string "USES$" + .string "USING$" + .string "COULDN’T$" + .string "CAPABLE$" + .string "DISAPPEAR$" + .string "APPEAR$" + .string "THROW$" + .string "WORRY$" + .string "SLEPT$" + .string "SLEEP$" + .string "RELEASE$" + .string "DRINKS$" + .string "RUNS$" + .string "RUN$" + .string "WORKS$" + .string "WORKING$" + .string "TALKING$" + .string "TALK$" + .string "SINK$" + .string "SMACK$" + .string "PRETEND$" + .string "PRAISE$" + .string "OVERDO$" + .string "SHOW$" + .string "LOOKS$" + .string "SEES$" + .string "SEEK$" + .string "OWN$" + .string "TAKE$" + .string "ALLOW$" + .string "FORGET$" + .string "FORGETS$" + .string "APPEARS$" + .string "FAINT$" + .string "FAINTED$" + .string "$" diff --git a/data/text/easy_chat/groups/actions/words.s b/data/text/easy_chat/groups/actions/words.s deleted file mode 100644 index 39f10f896..000000000 --- a/data/text/easy_chat/groups/actions/words.s +++ /dev/null @@ -1,80 +0,0 @@ -gEasyChatGroupWords_Actions: @ 83DD26E - .string "MEETS$" - .string "CONCEDE$" - .string "GIVE$" - .string "GIVES$" - .string "PLAYED$" - .string "PLAYS$" - .string "COLLECT$" - .string "WALKING$" - .string "WALKS$" - .string "SAYS$" - .string "WENT$" - .string "SAID$" - .string "WAKE UP$" - .string "WAKES UP$" - .string "ANGERS$" - .string "TEACH$" - .string "TEACHES$" - .string "PLEASE$" - .string "LEARN$" - .string "CHANGE$" - .string "STORY$" - .string "TRUST$" - .string "LAVISH$" - .string "LISTENS$" - .string "HEARING$" - .string "TRAINS$" - .string "CHOOSE$" - .string "COME$" - .string "CAME$" - .string "SEARCH$" - .string "MAKE$" - .string "CAUSE$" - .string "KNOW$" - .string "KNOWS$" - .string "REFUSE$" - .string "STORES$" - .string "BRAG$" - .string "IGNORANT$" - .string "THINKS$" - .string "BELIEVE$" - .string "SLIDE$" - .string "EATS$" - .string "USE$" - .string "USES$" - .string "USING$" - .string "COULDN’T$" - .string "CAPABLE$" - .string "DISAPPEAR$" - .string "APPEAR$" - .string "THROW$" - .string "WORRY$" - .string "SLEPT$" - .string "SLEEP$" - .string "RELEASE$" - .string "DRINKS$" - .string "RUNS$" - .string "RUN$" - .string "WORKS$" - .string "WORKING$" - .string "TALKING$" - .string "TALK$" - .string "SINK$" - .string "SMACK$" - .string "PRETEND$" - .string "PRAISE$" - .string "OVERDO$" - .string "SHOW$" - .string "LOOKS$" - .string "SEES$" - .string "SEEK$" - .string "OWN$" - .string "TAKE$" - .string "ALLOW$" - .string "FORGET$" - .string "FORGETS$" - .string "APPEARS$" - .string "FAINT$" - .string "FAINTED$" - .string "$" diff --git a/data/text/easy_chat/groups/adjectives/order.inc b/data/text/easy_chat/groups/adjectives/order.inc new file mode 100644 index 000000000..886d6e466 --- /dev/null +++ b/data/text/easy_chat/groups/adjectives/order.inc @@ -0,0 +1,39 @@ + .align 1 + +gEasyChatGroupOrder_Adjectives: @ 83DF8B0 + .2byte 35 + .2byte 23 + .2byte 20 + .2byte 31 + .2byte 14 + .2byte 15 + .2byte 32 + .2byte 34 + .2byte 12 + .2byte 3 + .2byte 29 + .2byte 9 + .2byte 33 + .2byte 1 + .2byte 27 + .2byte 2 + .2byte 11 + .2byte 22 + .2byte 26 + .2byte 28 + .2byte 10 + .2byte 18 + .2byte 17 + .2byte 7 + .2byte 16 + .2byte 19 + .2byte 8 + .2byte 5 + .2byte 4 + .2byte 6 + .2byte 13 + .2byte 21 + .2byte 0 + .2byte 24 + .2byte 25 + .2byte 30 diff --git a/data/text/easy_chat/groups/adjectives/order.s b/data/text/easy_chat/groups/adjectives/order.s deleted file mode 100644 index 886d6e466..000000000 --- a/data/text/easy_chat/groups/adjectives/order.s +++ /dev/null @@ -1,39 +0,0 @@ - .align 1 - -gEasyChatGroupOrder_Adjectives: @ 83DF8B0 - .2byte 35 - .2byte 23 - .2byte 20 - .2byte 31 - .2byte 14 - .2byte 15 - .2byte 32 - .2byte 34 - .2byte 12 - .2byte 3 - .2byte 29 - .2byte 9 - .2byte 33 - .2byte 1 - .2byte 27 - .2byte 2 - .2byte 11 - .2byte 22 - .2byte 26 - .2byte 28 - .2byte 10 - .2byte 18 - .2byte 17 - .2byte 7 - .2byte 16 - .2byte 19 - .2byte 8 - .2byte 5 - .2byte 4 - .2byte 6 - .2byte 13 - .2byte 21 - .2byte 0 - .2byte 24 - .2byte 25 - .2byte 30 diff --git a/data/text/easy_chat/groups/adjectives/words.inc b/data/text/easy_chat/groups/adjectives/words.inc new file mode 100644 index 000000000..ca1762a5b --- /dev/null +++ b/data/text/easy_chat/groups/adjectives/words.inc @@ -0,0 +1,38 @@ +gEasyChatGroupWords_Adjectives: @ 83DD96C + .string "WANDERING$" + .string "RICKETY$" + .string "ROCK-SOLID$" + .string "HUNGRY$" + .string "TIGHT$" + .string "TICKLISH$" + .string "TWIRLING$" + .string "SPIRALING$" + .string "THIRSTY$" + .string "LOLLING$" + .string "SILKY$" + .string "SADLY$" + .string "HOPELESS$" + .string "USELESS$" + .string "DROOLING$" + .string "EXCITING$" + .string "THICK$" + .string "SMOOTH$" + .string "SLIMY$" + .string "THIN$" + .string "BREAK$" + .string "VORACIOUS$" + .string "SCATTER$" + .string "AWESOME$" + .string "WIMPY$" + .string "WOBBLY$" + .string "SHAKY$" + .string "RIPPED$" + .string "SHREDDED$" + .string "INCREASING$" + .string "YET$" + .string "DESTROYED$" + .string "FIERY$" + .string "LOVEY-DOVEY$" + .string "HAPPILY$" + .string "ANTICIPATION$" + .string "$" diff --git a/data/text/easy_chat/groups/adjectives/words.s b/data/text/easy_chat/groups/adjectives/words.s deleted file mode 100644 index ca1762a5b..000000000 --- a/data/text/easy_chat/groups/adjectives/words.s +++ /dev/null @@ -1,38 +0,0 @@ -gEasyChatGroupWords_Adjectives: @ 83DD96C - .string "WANDERING$" - .string "RICKETY$" - .string "ROCK-SOLID$" - .string "HUNGRY$" - .string "TIGHT$" - .string "TICKLISH$" - .string "TWIRLING$" - .string "SPIRALING$" - .string "THIRSTY$" - .string "LOLLING$" - .string "SILKY$" - .string "SADLY$" - .string "HOPELESS$" - .string "USELESS$" - .string "DROOLING$" - .string "EXCITING$" - .string "THICK$" - .string "SMOOTH$" - .string "SLIMY$" - .string "THIN$" - .string "BREAK$" - .string "VORACIOUS$" - .string "SCATTER$" - .string "AWESOME$" - .string "WIMPY$" - .string "WOBBLY$" - .string "SHAKY$" - .string "RIPPED$" - .string "SHREDDED$" - .string "INCREASING$" - .string "YET$" - .string "DESTROYED$" - .string "FIERY$" - .string "LOVEY-DOVEY$" - .string "HAPPILY$" - .string "ANTICIPATION$" - .string "$" diff --git a/data/text/easy_chat/groups/battle/order.inc b/data/text/easy_chat/groups/battle/order.inc new file mode 100644 index 000000000..f47f4b43e --- /dev/null +++ b/data/text/easy_chat/groups/battle/order.inc @@ -0,0 +1,66 @@ + .align 1 + +gEasyChatGroupOrder_Battle: @ 83DF2A4 + .2byte 53 + .2byte 39 + .2byte 18 + .2byte 40 + .2byte 11 + .2byte 10 + .2byte 31 + .2byte 17 + .2byte 3 + .2byte 14 + .2byte 56 + .2byte 38 + .2byte 41 + .2byte 29 + .2byte 35 + .2byte 36 + .2byte 45 + .2byte 1 + .2byte 34 + .2byte 50 + .2byte 20 + .2byte 47 + .2byte 8 + .2byte 54 + .2byte 60 + .2byte 37 + .2byte 4 + .2byte 49 + .2byte 46 + .2byte 48 + .2byte 24 + .2byte 0 + .2byte 62 + .2byte 12 + .2byte 2 + .2byte 26 + .2byte 51 + .2byte 43 + .2byte 30 + .2byte 59 + .2byte 55 + .2byte 52 + .2byte 42 + .2byte 61 + .2byte 27 + .2byte 44 + .2byte 23 + .2byte 13 + .2byte 22 + .2byte 32 + .2byte 19 + .2byte 16 + .2byte 21 + .2byte 33 + .2byte 58 + .2byte 15 + .2byte 28 + .2byte 25 + .2byte 57 + .2byte 9 + .2byte 6 + .2byte 5 + .2byte 7 diff --git a/data/text/easy_chat/groups/battle/order.s b/data/text/easy_chat/groups/battle/order.s deleted file mode 100644 index f47f4b43e..000000000 --- a/data/text/easy_chat/groups/battle/order.s +++ /dev/null @@ -1,66 +0,0 @@ - .align 1 - -gEasyChatGroupOrder_Battle: @ 83DF2A4 - .2byte 53 - .2byte 39 - .2byte 18 - .2byte 40 - .2byte 11 - .2byte 10 - .2byte 31 - .2byte 17 - .2byte 3 - .2byte 14 - .2byte 56 - .2byte 38 - .2byte 41 - .2byte 29 - .2byte 35 - .2byte 36 - .2byte 45 - .2byte 1 - .2byte 34 - .2byte 50 - .2byte 20 - .2byte 47 - .2byte 8 - .2byte 54 - .2byte 60 - .2byte 37 - .2byte 4 - .2byte 49 - .2byte 46 - .2byte 48 - .2byte 24 - .2byte 0 - .2byte 62 - .2byte 12 - .2byte 2 - .2byte 26 - .2byte 51 - .2byte 43 - .2byte 30 - .2byte 59 - .2byte 55 - .2byte 52 - .2byte 42 - .2byte 61 - .2byte 27 - .2byte 44 - .2byte 23 - .2byte 13 - .2byte 22 - .2byte 32 - .2byte 19 - .2byte 16 - .2byte 21 - .2byte 33 - .2byte 58 - .2byte 15 - .2byte 28 - .2byte 25 - .2byte 57 - .2byte 9 - .2byte 6 - .2byte 5 - .2byte 7 diff --git a/data/text/easy_chat/groups/battle/words.inc b/data/text/easy_chat/groups/battle/words.inc new file mode 100644 index 000000000..cdea8c7b8 --- /dev/null +++ b/data/text/easy_chat/groups/battle/words.inc @@ -0,0 +1,65 @@ +gEasyChatGroupWords_Battle: @ 83DC53C + .string "MATCH UP$" + .string "GO$" + .string "NO. 1$" + .string "DECIDE$" + .string "LET ME WIN$" + .string "WINS$" + .string "WIN$" + .string "WON$" + .string "IF I WIN$" + .string "WHEN I WIN$" + .string "CAN’T WIN$" + .string "CAN WIN$" + .string "NO MATCH$" + .string "SPIRIT$" + .string "DECIDED$" + .string "TRUMP CARD$" + .string "TAKE THAT$" + .string "COME ON$" + .string "ATTACK$" + .string "SURRENDER$" + .string "GUTSY$" + .string "TALENT$" + .string "STRATEGY$" + .string "SMITE$" + .string "MATCH$" + .string "VICTORY$" + .string "OFFENSIVE$" + .string "SENSE$" + .string "VERSUS$" + .string "FIGHTS$" + .string "POWER$" + .string "CHALLENGE$" + .string "STRONG$" + .string "TOO STRONG$" + .string "GO EASY$" + .string "FOE$" + .string "GENIUS$" + .string "LEGEND$" + .string "ESCAPE$" + .string "AIM$" + .string "BATTLE$" + .string "FIGHT$" + .string "RESUSCITATE$" + .string "POINTS$" + .string "SERIOUS$" + .string "GIVE UP$" + .string "LOSS$" + .string "IF I LOSE$" + .string "LOST$" + .string "LOSE$" + .string "GUARD$" + .string "PARTNER$" + .string "REJECT$" + .string "ACCEPT$" + .string "INVINCIBLE$" + .string "RECEIVED$" + .string "EASY$" + .string "WEAK$" + .string "TOO WEAK$" + .string "PUSHOVER$" + .string "LEADER$" + .string "RULE$" + .string "MOVE$" + .string "$" diff --git a/data/text/easy_chat/groups/battle/words.s b/data/text/easy_chat/groups/battle/words.s deleted file mode 100644 index cdea8c7b8..000000000 --- a/data/text/easy_chat/groups/battle/words.s +++ /dev/null @@ -1,65 +0,0 @@ -gEasyChatGroupWords_Battle: @ 83DC53C - .string "MATCH UP$" - .string "GO$" - .string "NO. 1$" - .string "DECIDE$" - .string "LET ME WIN$" - .string "WINS$" - .string "WIN$" - .string "WON$" - .string "IF I WIN$" - .string "WHEN I WIN$" - .string "CAN’T WIN$" - .string "CAN WIN$" - .string "NO MATCH$" - .string "SPIRIT$" - .string "DECIDED$" - .string "TRUMP CARD$" - .string "TAKE THAT$" - .string "COME ON$" - .string "ATTACK$" - .string "SURRENDER$" - .string "GUTSY$" - .string "TALENT$" - .string "STRATEGY$" - .string "SMITE$" - .string "MATCH$" - .string "VICTORY$" - .string "OFFENSIVE$" - .string "SENSE$" - .string "VERSUS$" - .string "FIGHTS$" - .string "POWER$" - .string "CHALLENGE$" - .string "STRONG$" - .string "TOO STRONG$" - .string "GO EASY$" - .string "FOE$" - .string "GENIUS$" - .string "LEGEND$" - .string "ESCAPE$" - .string "AIM$" - .string "BATTLE$" - .string "FIGHT$" - .string "RESUSCITATE$" - .string "POINTS$" - .string "SERIOUS$" - .string "GIVE UP$" - .string "LOSS$" - .string "IF I LOSE$" - .string "LOST$" - .string "LOSE$" - .string "GUARD$" - .string "PARTNER$" - .string "REJECT$" - .string "ACCEPT$" - .string "INVINCIBLE$" - .string "RECEIVED$" - .string "EASY$" - .string "WEAK$" - .string "TOO WEAK$" - .string "PUSHOVER$" - .string "LEADER$" - .string "RULE$" - .string "MOVE$" - .string "$" diff --git a/data/text/easy_chat/groups/conditions/order.inc b/data/text/easy_chat/groups/conditions/order.inc new file mode 100644 index 000000000..6705f9ff6 --- /dev/null +++ b/data/text/easy_chat/groups/conditions/order.inc @@ -0,0 +1,72 @@ + .align 1 + +gEasyChatGroupOrder_Conditions: @ 83DF616 + .2byte 13 + .2byte 55 + .2byte 23 + .2byte 3 + .2byte 54 + .2byte 68 + .2byte 50 + .2byte 14 + .2byte 60 + .2byte 19 + .2byte 56 + .2byte 10 + .2byte 21 + .2byte 30 + .2byte 38 + .2byte 41 + .2byte 22 + .2byte 36 + .2byte 24 + .2byte 28 + .2byte 2 + .2byte 1 + .2byte 37 + .2byte 35 + .2byte 52 + .2byte 12 + .2byte 8 + .2byte 5 + .2byte 4 + .2byte 27 + .2byte 0 + .2byte 39 + .2byte 63 + .2byte 59 + .2byte 20 + .2byte 6 + .2byte 61 + .2byte 53 + .2byte 51 + .2byte 62 + .2byte 7 + .2byte 33 + .2byte 58 + .2byte 49 + .2byte 15 + .2byte 18 + .2byte 45 + .2byte 47 + .2byte 48 + .2byte 34 + .2byte 25 + .2byte 46 + .2byte 26 + .2byte 31 + .2byte 57 + .2byte 67 + .2byte 66 + .2byte 43 + .2byte 17 + .2byte 40 + .2byte 16 + .2byte 42 + .2byte 11 + .2byte 44 + .2byte 32 + .2byte 29 + .2byte 65 + .2byte 9 + .2byte 64 diff --git a/data/text/easy_chat/groups/conditions/order.s b/data/text/easy_chat/groups/conditions/order.s deleted file mode 100644 index 6705f9ff6..000000000 --- a/data/text/easy_chat/groups/conditions/order.s +++ /dev/null @@ -1,72 +0,0 @@ - .align 1 - -gEasyChatGroupOrder_Conditions: @ 83DF616 - .2byte 13 - .2byte 55 - .2byte 23 - .2byte 3 - .2byte 54 - .2byte 68 - .2byte 50 - .2byte 14 - .2byte 60 - .2byte 19 - .2byte 56 - .2byte 10 - .2byte 21 - .2byte 30 - .2byte 38 - .2byte 41 - .2byte 22 - .2byte 36 - .2byte 24 - .2byte 28 - .2byte 2 - .2byte 1 - .2byte 37 - .2byte 35 - .2byte 52 - .2byte 12 - .2byte 8 - .2byte 5 - .2byte 4 - .2byte 27 - .2byte 0 - .2byte 39 - .2byte 63 - .2byte 59 - .2byte 20 - .2byte 6 - .2byte 61 - .2byte 53 - .2byte 51 - .2byte 62 - .2byte 7 - .2byte 33 - .2byte 58 - .2byte 49 - .2byte 15 - .2byte 18 - .2byte 45 - .2byte 47 - .2byte 48 - .2byte 34 - .2byte 25 - .2byte 46 - .2byte 26 - .2byte 31 - .2byte 57 - .2byte 67 - .2byte 66 - .2byte 43 - .2byte 17 - .2byte 40 - .2byte 16 - .2byte 42 - .2byte 11 - .2byte 44 - .2byte 32 - .2byte 29 - .2byte 65 - .2byte 9 - .2byte 64 diff --git a/data/text/easy_chat/groups/conditions/words.inc b/data/text/easy_chat/groups/conditions/words.inc new file mode 100644 index 000000000..fd9b9a29d --- /dev/null +++ b/data/text/easy_chat/groups/conditions/words.inc @@ -0,0 +1,71 @@ +gEasyChatGroupWords_Conditions: @ 83DD07D + .string "HOT$" + .string "EXISTS$" + .string "EXCESS$" + .string "APPROVED$" + .string "HAS$" + .string "GOOD$" + .string "LESS$" + .string "MOMENTUM$" + .string "GOING$" + .string "WEIRD$" + .string "BUSY$" + .string "TOGETHER$" + .string "FULL$" + .string "ABSENT$" + .string "BEING$" + .string "NEED$" + .string "TASTY$" + .string "SKILLED$" + .string "NOISY$" + .string "BIG$" + .string "LATE$" + .string "CLOSE$" + .string "DOCILE$" + .string "AMUSING$" + .string "ENTERTAINING$" + .string "PERFECTION$" + .string "PRETTY$" + .string "HEALTHY$" + .string "EXCELLENT$" + .string "UPSIDE DOWN$" + .string "COLD$" + .string "REFRESHING$" + .string "UNAVOIDABLE$" + .string "MUCH$" + .string "OVERWHELMING$" + .string "FABULOUS$" + .string "ELSE$" + .string "EXPENSIVE$" + .string "CORRECT$" + .string "IMPOSSIBLE$" + .string "SMALL$" + .string "DIFFERENT$" + .string "TIRED$" + .string "SKILL$" + .string "TOP$" + .string "NON-STOP$" + .string "PREPOSTEROUS$" + .string "NONE$" + .string "NOTHING$" + .string "NATURAL$" + .string "BECOMES$" + .string "LUKEWARM$" + .string "FAST$" + .string "LOW$" + .string "AWFUL$" + .string "ALONE$" + .string "BORED$" + .string "SECRET$" + .string "MYSTERY$" + .string "LACKS$" + .string "BEST$" + .string "LOUSY$" + .string "MISTAKE$" + .string "KIND$" + .string "WELL$" + .string "WEAKENED$" + .string "SIMPLE$" + .string "SEEMS$" + .string "BADLY$" + .string "$" diff --git a/data/text/easy_chat/groups/conditions/words.s b/data/text/easy_chat/groups/conditions/words.s deleted file mode 100644 index fd9b9a29d..000000000 --- a/data/text/easy_chat/groups/conditions/words.s +++ /dev/null @@ -1,71 +0,0 @@ -gEasyChatGroupWords_Conditions: @ 83DD07D - .string "HOT$" - .string "EXISTS$" - .string "EXCESS$" - .string "APPROVED$" - .string "HAS$" - .string "GOOD$" - .string "LESS$" - .string "MOMENTUM$" - .string "GOING$" - .string "WEIRD$" - .string "BUSY$" - .string "TOGETHER$" - .string "FULL$" - .string "ABSENT$" - .string "BEING$" - .string "NEED$" - .string "TASTY$" - .string "SKILLED$" - .string "NOISY$" - .string "BIG$" - .string "LATE$" - .string "CLOSE$" - .string "DOCILE$" - .string "AMUSING$" - .string "ENTERTAINING$" - .string "PERFECTION$" - .string "PRETTY$" - .string "HEALTHY$" - .string "EXCELLENT$" - .string "UPSIDE DOWN$" - .string "COLD$" - .string "REFRESHING$" - .string "UNAVOIDABLE$" - .string "MUCH$" - .string "OVERWHELMING$" - .string "FABULOUS$" - .string "ELSE$" - .string "EXPENSIVE$" - .string "CORRECT$" - .string "IMPOSSIBLE$" - .string "SMALL$" - .string "DIFFERENT$" - .string "TIRED$" - .string "SKILL$" - .string "TOP$" - .string "NON-STOP$" - .string "PREPOSTEROUS$" - .string "NONE$" - .string "NOTHING$" - .string "NATURAL$" - .string "BECOMES$" - .string "LUKEWARM$" - .string "FAST$" - .string "LOW$" - .string "AWFUL$" - .string "ALONE$" - .string "BORED$" - .string "SECRET$" - .string "MYSTERY$" - .string "LACKS$" - .string "BEST$" - .string "LOUSY$" - .string "MISTAKE$" - .string "KIND$" - .string "WELL$" - .string "WEAKENED$" - .string "SIMPLE$" - .string "SEEMS$" - .string "BADLY$" - .string "$" diff --git a/data/text/easy_chat/groups/endings/order.inc b/data/text/easy_chat/groups/endings/order.inc new file mode 100644 index 000000000..403a02523 --- /dev/null +++ b/data/text/easy_chat/groups/endings/order.inc @@ -0,0 +1,72 @@ + .align 1 + +gEasyChatGroupOrder_Endings: @ 83DF502 + .2byte 32 + .2byte 39 + .2byte 63 + .2byte 42 + .2byte 33 + .2byte 68 + .2byte 15 + .2byte 46 + .2byte 54 + .2byte 6 + .2byte 64 + .2byte 53 + .2byte 49 + .2byte 22 + .2byte 21 + .2byte 8 + .2byte 59 + .2byte 60 + .2byte 24 + .2byte 25 + .2byte 61 + .2byte 23 + .2byte 50 + .2byte 43 + .2byte 7 + .2byte 30 + .2byte 31 + .2byte 55 + .2byte 11 + .2byte 5 + .2byte 19 + .2byte 12 + .2byte 41 + .2byte 13 + .2byte 58 + .2byte 9 + .2byte 38 + .2byte 34 + .2byte 52 + .2byte 45 + .2byte 36 + .2byte 44 + .2byte 67 + .2byte 2 + .2byte 14 + .2byte 56 + .2byte 40 + .2byte 51 + .2byte 37 + .2byte 66 + .2byte 35 + .2byte 18 + .2byte 3 + .2byte 47 + .2byte 57 + .2byte 16 + .2byte 28 + .2byte 17 + .2byte 29 + .2byte 27 + .2byte 65 + .2byte 26 + .2byte 0 + .2byte 1 + .2byte 48 + .2byte 62 + .2byte 20 + .2byte 4 + .2byte 10 diff --git a/data/text/easy_chat/groups/endings/order.s b/data/text/easy_chat/groups/endings/order.s deleted file mode 100644 index 403a02523..000000000 --- a/data/text/easy_chat/groups/endings/order.s +++ /dev/null @@ -1,72 +0,0 @@ - .align 1 - -gEasyChatGroupOrder_Endings: @ 83DF502 - .2byte 32 - .2byte 39 - .2byte 63 - .2byte 42 - .2byte 33 - .2byte 68 - .2byte 15 - .2byte 46 - .2byte 54 - .2byte 6 - .2byte 64 - .2byte 53 - .2byte 49 - .2byte 22 - .2byte 21 - .2byte 8 - .2byte 59 - .2byte 60 - .2byte 24 - .2byte 25 - .2byte 61 - .2byte 23 - .2byte 50 - .2byte 43 - .2byte 7 - .2byte 30 - .2byte 31 - .2byte 55 - .2byte 11 - .2byte 5 - .2byte 19 - .2byte 12 - .2byte 41 - .2byte 13 - .2byte 58 - .2byte 9 - .2byte 38 - .2byte 34 - .2byte 52 - .2byte 45 - .2byte 36 - .2byte 44 - .2byte 67 - .2byte 2 - .2byte 14 - .2byte 56 - .2byte 40 - .2byte 51 - .2byte 37 - .2byte 66 - .2byte 35 - .2byte 18 - .2byte 3 - .2byte 47 - .2byte 57 - .2byte 16 - .2byte 28 - .2byte 17 - .2byte 29 - .2byte 27 - .2byte 65 - .2byte 26 - .2byte 0 - .2byte 1 - .2byte 48 - .2byte 62 - .2byte 20 - .2byte 4 - .2byte 10 diff --git a/data/text/easy_chat/groups/endings/words.inc b/data/text/easy_chat/groups/endings/words.inc new file mode 100644 index 000000000..e7ca49996 --- /dev/null +++ b/data/text/easy_chat/groups/endings/words.inc @@ -0,0 +1,71 @@ +gEasyChatGroupWords_Endings: @ 83DCD23 + .string "WILL$" + .string "WILL BE HERE$" + .string "OR$" + .string "TIMES$" + .string "WONDER$" + .string "IS IT?$" + .string "BE$" + .string "GIMME$" + .string "COULD$" + .string "LIKELY TO$" + .string "WOULD$" + .string "IS$" + .string "ISN’T IT?$" + .string "LET’S$" + .string "OTHER$" + .string "ARE$" + .string "WAS$" + .string "WERE$" + .string "THOSE$" + .string "ISN’T$" + .string "WON’T$" + .string "CAN’T$" + .string "CAN$" + .string "DON’T$" + .string "DO$" + .string "DOES$" + .string "WHOM$" + .string "WHICH$" + .string "WASN’T$" + .string "WEREN’T$" + .string "HAVE$" + .string "HAVEN’T$" + .string "A$" + .string "AN$" + .string "NOT$" + .string "THERE$" + .string "OK?$" + .string "SO$" + .string "MAYBE$" + .string "ABOUT$" + .string "OVER$" + .string "IT$" + .string "ALL$" + .string "FOR$" + .string "ON$" + .string "OFF$" + .string "AS$" + .string "TO$" + .string "WITH$" + .string "BETTER$" + .string "EVER$" + .string "SINCE$" + .string "OF$" + .string "BELONGS TO$" + .string "AT$" + .string "IN$" + .string "OUT$" + .string "TOO$" + .string "LIKE$" + .string "DID$" + .string "DIDN’T$" + .string "DOESN’T$" + .string "WITHOUT$" + .string "AFTER$" + .string "BEFORE$" + .string "WHILE$" + .string "THAN$" + .string "ONCE$" + .string "ANYWHERE$" + .string "$" diff --git a/data/text/easy_chat/groups/endings/words.s b/data/text/easy_chat/groups/endings/words.s deleted file mode 100644 index e7ca49996..000000000 --- a/data/text/easy_chat/groups/endings/words.s +++ /dev/null @@ -1,71 +0,0 @@ -gEasyChatGroupWords_Endings: @ 83DCD23 - .string "WILL$" - .string "WILL BE HERE$" - .string "OR$" - .string "TIMES$" - .string "WONDER$" - .string "IS IT?$" - .string "BE$" - .string "GIMME$" - .string "COULD$" - .string "LIKELY TO$" - .string "WOULD$" - .string "IS$" - .string "ISN’T IT?$" - .string "LET’S$" - .string "OTHER$" - .string "ARE$" - .string "WAS$" - .string "WERE$" - .string "THOSE$" - .string "ISN’T$" - .string "WON’T$" - .string "CAN’T$" - .string "CAN$" - .string "DON’T$" - .string "DO$" - .string "DOES$" - .string "WHOM$" - .string "WHICH$" - .string "WASN’T$" - .string "WEREN’T$" - .string "HAVE$" - .string "HAVEN’T$" - .string "A$" - .string "AN$" - .string "NOT$" - .string "THERE$" - .string "OK?$" - .string "SO$" - .string "MAYBE$" - .string "ABOUT$" - .string "OVER$" - .string "IT$" - .string "ALL$" - .string "FOR$" - .string "ON$" - .string "OFF$" - .string "AS$" - .string "TO$" - .string "WITH$" - .string "BETTER$" - .string "EVER$" - .string "SINCE$" - .string "OF$" - .string "BELONGS TO$" - .string "AT$" - .string "IN$" - .string "OUT$" - .string "TOO$" - .string "LIKE$" - .string "DID$" - .string "DIDN’T$" - .string "DOESN’T$" - .string "WITHOUT$" - .string "AFTER$" - .string "BEFORE$" - .string "WHILE$" - .string "THAN$" - .string "ONCE$" - .string "ANYWHERE$" - .string "$" diff --git a/data/text/easy_chat/groups/events/order.inc b/data/text/easy_chat/groups/events/order.inc new file mode 100644 index 000000000..0b48d0f0b --- /dev/null +++ b/data/text/easy_chat/groups/events/order.inc @@ -0,0 +1,25 @@ + .align 1 + +gEasyChatGroupOrder_Events: @ 83DF8F8 + .2byte 0 + .2byte 14 + .2byte 12 + .2byte 3 + .2byte 17 + .2byte 4 + .2byte 1 + .2byte 10 + .2byte 9 + .2byte 15 + .2byte 11 + .2byte 6 + .2byte 13 + .2byte 19 + .2byte 5 + .2byte 18 + .2byte 20 + .2byte 21 + .2byte 16 + .2byte 8 + .2byte 2 + .2byte 7 diff --git a/data/text/easy_chat/groups/events/order.s b/data/text/easy_chat/groups/events/order.s deleted file mode 100644 index 0b48d0f0b..000000000 --- a/data/text/easy_chat/groups/events/order.s +++ /dev/null @@ -1,25 +0,0 @@ - .align 1 - -gEasyChatGroupOrder_Events: @ 83DF8F8 - .2byte 0 - .2byte 14 - .2byte 12 - .2byte 3 - .2byte 17 - .2byte 4 - .2byte 1 - .2byte 10 - .2byte 9 - .2byte 15 - .2byte 11 - .2byte 6 - .2byte 13 - .2byte 19 - .2byte 5 - .2byte 18 - .2byte 20 - .2byte 21 - .2byte 16 - .2byte 8 - .2byte 2 - .2byte 7 diff --git a/data/text/easy_chat/groups/events/words.inc b/data/text/easy_chat/groups/events/words.inc new file mode 100644 index 000000000..6bfe9c296 --- /dev/null +++ b/data/text/easy_chat/groups/events/words.inc @@ -0,0 +1,24 @@ +gEasyChatGroupWords_Events: @ 83DDA8D + .string "APPEAL$" + .string "EVENTS$" + .string "STAY-AT-HOME$" + .string "BERRY$" + .string "CONTEST$" + .string "MC$" + .string "JUDGE$" + .string "SUPER$" + .string "STAGE$" + .string "HALL OF FAME$" + .string "EVOLUTION$" + .string "HYPER$" + .string "BATTLE TOWER$" + .string "LEADERS$" + .string "BATTLE ROOM$" + .string "HIDDEN$" + .string "SECRET BASE$" + .string "BLEND$" + .string "{POKEBLOCK}$" + .string "MASTER$" + .string "RANK$" + .string "RIBBON$" + .string "$" diff --git a/data/text/easy_chat/groups/events/words.s b/data/text/easy_chat/groups/events/words.s deleted file mode 100644 index 6bfe9c296..000000000 --- a/data/text/easy_chat/groups/events/words.s +++ /dev/null @@ -1,24 +0,0 @@ -gEasyChatGroupWords_Events: @ 83DDA8D - .string "APPEAL$" - .string "EVENTS$" - .string "STAY-AT-HOME$" - .string "BERRY$" - .string "CONTEST$" - .string "MC$" - .string "JUDGE$" - .string "SUPER$" - .string "STAGE$" - .string "HALL OF FAME$" - .string "EVOLUTION$" - .string "HYPER$" - .string "BATTLE TOWER$" - .string "LEADERS$" - .string "BATTLE ROOM$" - .string "HIDDEN$" - .string "SECRET BASE$" - .string "BLEND$" - .string "{POKEBLOCK}$" - .string "MASTER$" - .string "RANK$" - .string "RIBBON$" - .string "$" diff --git a/data/text/easy_chat/groups/feelings/order.inc b/data/text/easy_chat/groups/feelings/order.inc new file mode 100644 index 000000000..0570ae7dc --- /dev/null +++ b/data/text/easy_chat/groups/feelings/order.inc @@ -0,0 +1,72 @@ + .align 1 + +gEasyChatGroupOrder_Feelings: @ 83DF58C + .2byte 40 + .2byte 39 + .2byte 24 + .2byte 23 + .2byte 46 + .2byte 63 + .2byte 36 + .2byte 37 + .2byte 38 + .2byte 61 + .2byte 31 + .2byte 62 + .2byte 27 + .2byte 12 + .2byte 13 + .2byte 41 + .2byte 22 + .2byte 35 + .2byte 60 + .2byte 32 + .2byte 51 + .2byte 44 + .2byte 42 + .2byte 43 + .2byte 7 + .2byte 53 + .2byte 9 + .2byte 29 + .2byte 4 + .2byte 11 + .2byte 3 + .2byte 10 + .2byte 64 + .2byte 6 + .2byte 5 + .2byte 47 + .2byte 19 + .2byte 17 + .2byte 2 + .2byte 8 + .2byte 33 + .2byte 28 + .2byte 45 + .2byte 34 + .2byte 26 + .2byte 0 + .2byte 21 + .2byte 59 + .2byte 30 + .2byte 50 + .2byte 1 + .2byte 66 + .2byte 58 + .2byte 65 + .2byte 14 + .2byte 56 + .2byte 25 + .2byte 57 + .2byte 49 + .2byte 52 + .2byte 48 + .2byte 18 + .2byte 16 + .2byte 15 + .2byte 67 + .2byte 68 + .2byte 55 + .2byte 54 + .2byte 20 diff --git a/data/text/easy_chat/groups/feelings/order.s b/data/text/easy_chat/groups/feelings/order.s deleted file mode 100644 index 0570ae7dc..000000000 --- a/data/text/easy_chat/groups/feelings/order.s +++ /dev/null @@ -1,72 +0,0 @@ - .align 1 - -gEasyChatGroupOrder_Feelings: @ 83DF58C - .2byte 40 - .2byte 39 - .2byte 24 - .2byte 23 - .2byte 46 - .2byte 63 - .2byte 36 - .2byte 37 - .2byte 38 - .2byte 61 - .2byte 31 - .2byte 62 - .2byte 27 - .2byte 12 - .2byte 13 - .2byte 41 - .2byte 22 - .2byte 35 - .2byte 60 - .2byte 32 - .2byte 51 - .2byte 44 - .2byte 42 - .2byte 43 - .2byte 7 - .2byte 53 - .2byte 9 - .2byte 29 - .2byte 4 - .2byte 11 - .2byte 3 - .2byte 10 - .2byte 64 - .2byte 6 - .2byte 5 - .2byte 47 - .2byte 19 - .2byte 17 - .2byte 2 - .2byte 8 - .2byte 33 - .2byte 28 - .2byte 45 - .2byte 34 - .2byte 26 - .2byte 0 - .2byte 21 - .2byte 59 - .2byte 30 - .2byte 50 - .2byte 1 - .2byte 66 - .2byte 58 - .2byte 65 - .2byte 14 - .2byte 56 - .2byte 25 - .2byte 57 - .2byte 49 - .2byte 52 - .2byte 48 - .2byte 18 - .2byte 16 - .2byte 15 - .2byte 67 - .2byte 68 - .2byte 55 - .2byte 54 - .2byte 20 diff --git a/data/text/easy_chat/groups/feelings/words.inc b/data/text/easy_chat/groups/feelings/words.inc new file mode 100644 index 000000000..510d285c2 --- /dev/null +++ b/data/text/easy_chat/groups/feelings/words.inc @@ -0,0 +1,71 @@ +gEasyChatGroupWords_Feelings: @ 83DCE9B + .string "MEET$" + .string "PLAY$" + .string "HURRIED$" + .string "GOES$" + .string "GIDDY$" + .string "HAPPY$" + .string "HAPPINESS$" + .string "EXCITE$" + .string "IMPORTANT$" + .string "FUNNY$" + .string "GOT$" + .string "GO HOME$" + .string "DISAPPOINTED$" + .string "DISAPPOINTS$" + .string "SAD$" + .string "TRY$" + .string "TRIES$" + .string "HEARS$" + .string "THINK$" + .string "HEAR$" + .string "WANTS$" + .string "MISHEARD$" + .string "DISLIKE$" + .string "ANGRY$" + .string "ANGER$" + .string "SCARY$" + .string "LONESOME$" + .string "DISAPPOINT$" + .string "JOY$" + .string "GETS$" + .string "NEVER$" + .string "DARN$" + .string "DOWNCAST$" + .string "INCREDIBLE$" + .string "LIKES$" + .string "DISLIKES$" + .string "BORING$" + .string "CARE$" + .string "CARES$" + .string "ALL RIGHT$" + .string "ADORE$" + .string "DISASTER$" + .string "ENJOY$" + .string "ENJOYS$" + .string "EAT$" + .string "LACKING$" + .string "BAD$" + .string "HARD$" + .string "TERRIBLE$" + .string "SHOULD$" + .string "NICE$" + .string "DRINK$" + .string "SURPRISE$" + .string "FEAR$" + .string "WANT$" + .string "WAIT$" + .string "SATISFIED$" + .string "SEE$" + .string "RARE$" + .string "NEGATIVE$" + .string "DONE$" + .string "DANGER$" + .string "DEFEATED$" + .string "BEAT$" + .string "GREAT$" + .string "ROMANTIC$" + .string "QUESTION$" + .string "UNDERSTAND$" + .string "UNDERSTANDS$" + .string "$" diff --git a/data/text/easy_chat/groups/feelings/words.s b/data/text/easy_chat/groups/feelings/words.s deleted file mode 100644 index 510d285c2..000000000 --- a/data/text/easy_chat/groups/feelings/words.s +++ /dev/null @@ -1,71 +0,0 @@ -gEasyChatGroupWords_Feelings: @ 83DCE9B - .string "MEET$" - .string "PLAY$" - .string "HURRIED$" - .string "GOES$" - .string "GIDDY$" - .string "HAPPY$" - .string "HAPPINESS$" - .string "EXCITE$" - .string "IMPORTANT$" - .string "FUNNY$" - .string "GOT$" - .string "GO HOME$" - .string "DISAPPOINTED$" - .string "DISAPPOINTS$" - .string "SAD$" - .string "TRY$" - .string "TRIES$" - .string "HEARS$" - .string "THINK$" - .string "HEAR$" - .string "WANTS$" - .string "MISHEARD$" - .string "DISLIKE$" - .string "ANGRY$" - .string "ANGER$" - .string "SCARY$" - .string "LONESOME$" - .string "DISAPPOINT$" - .string "JOY$" - .string "GETS$" - .string "NEVER$" - .string "DARN$" - .string "DOWNCAST$" - .string "INCREDIBLE$" - .string "LIKES$" - .string "DISLIKES$" - .string "BORING$" - .string "CARE$" - .string "CARES$" - .string "ALL RIGHT$" - .string "ADORE$" - .string "DISASTER$" - .string "ENJOY$" - .string "ENJOYS$" - .string "EAT$" - .string "LACKING$" - .string "BAD$" - .string "HARD$" - .string "TERRIBLE$" - .string "SHOULD$" - .string "NICE$" - .string "DRINK$" - .string "SURPRISE$" - .string "FEAR$" - .string "WANT$" - .string "WAIT$" - .string "SATISFIED$" - .string "SEE$" - .string "RARE$" - .string "NEGATIVE$" - .string "DONE$" - .string "DANGER$" - .string "DEFEATED$" - .string "BEAT$" - .string "GREAT$" - .string "ROMANTIC$" - .string "QUESTION$" - .string "UNDERSTAND$" - .string "UNDERSTANDS$" - .string "$" diff --git a/data/text/easy_chat/groups/greetings/order.inc b/data/text/easy_chat/groups/greetings/order.inc new file mode 100644 index 000000000..8310ebd07 --- /dev/null +++ b/data/text/easy_chat/groups/greetings/order.inc @@ -0,0 +1,45 @@ + .align 1 + +gEasyChatGroupOrder_Greetings: @ 83DF322 + .2byte 12 + .2byte 25 + .2byte 32 + .2byte 40 + .2byte 9 + .2byte 41 + .2byte 20 + .2byte 22 + .2byte 13 + .2byte 10 + .2byte 24 + .2byte 16 + .2byte 15 + .2byte 2 + .2byte 3 + .2byte 4 + .2byte 34 + .2byte 14 + .2byte 26 + .2byte 30 + .2byte 37 + .2byte 8 + .2byte 28 + .2byte 18 + .2byte 36 + .2byte 33 + .2byte 29 + .2byte 7 + .2byte 19 + .2byte 21 + .2byte 35 + .2byte 11 + .2byte 17 + .2byte 0 + .2byte 6 + .2byte 23 + .2byte 27 + .2byte 38 + .2byte 5 + .2byte 31 + .2byte 1 + .2byte 39 diff --git a/data/text/easy_chat/groups/greetings/order.s b/data/text/easy_chat/groups/greetings/order.s deleted file mode 100644 index 8310ebd07..000000000 --- a/data/text/easy_chat/groups/greetings/order.s +++ /dev/null @@ -1,45 +0,0 @@ - .align 1 - -gEasyChatGroupOrder_Greetings: @ 83DF322 - .2byte 12 - .2byte 25 - .2byte 32 - .2byte 40 - .2byte 9 - .2byte 41 - .2byte 20 - .2byte 22 - .2byte 13 - .2byte 10 - .2byte 24 - .2byte 16 - .2byte 15 - .2byte 2 - .2byte 3 - .2byte 4 - .2byte 34 - .2byte 14 - .2byte 26 - .2byte 30 - .2byte 37 - .2byte 8 - .2byte 28 - .2byte 18 - .2byte 36 - .2byte 33 - .2byte 29 - .2byte 7 - .2byte 19 - .2byte 21 - .2byte 35 - .2byte 11 - .2byte 17 - .2byte 0 - .2byte 6 - .2byte 23 - .2byte 27 - .2byte 38 - .2byte 5 - .2byte 31 - .2byte 1 - .2byte 39 diff --git a/data/text/easy_chat/groups/greetings/words.inc b/data/text/easy_chat/groups/greetings/words.inc new file mode 100644 index 000000000..b283168ca --- /dev/null +++ b/data/text/easy_chat/groups/greetings/words.inc @@ -0,0 +1,44 @@ +gEasyChatGroupWords_Greetings: @ 83DC70F + .string "THANKS$" + .string "YES$" + .string "HERE GOES$" + .string "HERE I COME$" + .string "HERE IT IS$" + .string "YEAH$" + .string "WELCOME$" + .string "OI$" + .string "HOW DO$" + .string "CONGRATS$" + .string "GIVE ME$" + .string "SORRY$" + .string "APOLOGIZE$" + .string "FORGIVE$" + .string "HEY, THERE$" + .string "HELLO$" + .string "GOOD-BYE$" + .string "THANK YOU$" + .string "I’VE ARRIVED$" + .string "PARDON$" + .string "EXCUSE$" + .string "SEE YA$" + .string "EXCUSE ME$" + .string "WELL, THEN$" + .string "GO AHEAD$" + .string "APPRECIATE$" + .string "HEY?$" + .string "WHAT’S UP?$" + .string "HUH?$" + .string "NO$" + .string "HI$" + .string "YEAH, YEAH$" + .string "BYE-BYE$" + .string "MEET YOU$" + .string "HEY$" + .string "SMELL$" + .string "LISTENING$" + .string "HOO-HAH$" + .string "YAHOO$" + .string "YO$" + .string "COME OVER$" + .string "COUNT ON$" + .string "$" diff --git a/data/text/easy_chat/groups/greetings/words.s b/data/text/easy_chat/groups/greetings/words.s deleted file mode 100644 index b283168ca..000000000 --- a/data/text/easy_chat/groups/greetings/words.s +++ /dev/null @@ -1,44 +0,0 @@ -gEasyChatGroupWords_Greetings: @ 83DC70F - .string "THANKS$" - .string "YES$" - .string "HERE GOES$" - .string "HERE I COME$" - .string "HERE IT IS$" - .string "YEAH$" - .string "WELCOME$" - .string "OI$" - .string "HOW DO$" - .string "CONGRATS$" - .string "GIVE ME$" - .string "SORRY$" - .string "APOLOGIZE$" - .string "FORGIVE$" - .string "HEY, THERE$" - .string "HELLO$" - .string "GOOD-BYE$" - .string "THANK YOU$" - .string "I’VE ARRIVED$" - .string "PARDON$" - .string "EXCUSE$" - .string "SEE YA$" - .string "EXCUSE ME$" - .string "WELL, THEN$" - .string "GO AHEAD$" - .string "APPRECIATE$" - .string "HEY?$" - .string "WHAT’S UP?$" - .string "HUH?$" - .string "NO$" - .string "HI$" - .string "YEAH, YEAH$" - .string "BYE-BYE$" - .string "MEET YOU$" - .string "HEY$" - .string "SMELL$" - .string "LISTENING$" - .string "HOO-HAH$" - .string "YAHOO$" - .string "YO$" - .string "COME OVER$" - .string "COUNT ON$" - .string "$" diff --git a/data/text/easy_chat/groups/hobbies/order.inc b/data/text/easy_chat/groups/hobbies/order.inc new file mode 100644 index 000000000..41ced1099 --- /dev/null +++ b/data/text/easy_chat/groups/hobbies/order.inc @@ -0,0 +1,57 @@ + .align 1 + +gEasyChatGroupOrder_Hobbies: @ 83DF796 + .2byte 43 + .2byte 1 + .2byte 45 + .2byte 21 + .2byte 44 + .2byte 46 + .2byte 11 + .2byte 9 + .2byte 30 + .2byte 5 + .2byte 6 + .2byte 17 + .2byte 48 + .2byte 18 + .2byte 29 + .2byte 33 + .2byte 34 + .2byte 26 + .2byte 42 + .2byte 47 + .2byte 32 + .2byte 38 + .2byte 15 + .2byte 14 + .2byte 39 + .2byte 41 + .2byte 22 + .2byte 49 + .2byte 0 + .2byte 35 + .2byte 53 + .2byte 19 + .2byte 31 + .2byte 3 + .2byte 8 + .2byte 40 + .2byte 37 + .2byte 50 + .2byte 36 + .2byte 16 + .2byte 10 + .2byte 24 + .2byte 2 + .2byte 25 + .2byte 13 + .2byte 23 + .2byte 4 + .2byte 7 + .2byte 28 + .2byte 27 + .2byte 51 + .2byte 52 + .2byte 12 + .2byte 20 diff --git a/data/text/easy_chat/groups/hobbies/order.s b/data/text/easy_chat/groups/hobbies/order.s deleted file mode 100644 index 41ced1099..000000000 --- a/data/text/easy_chat/groups/hobbies/order.s +++ /dev/null @@ -1,57 +0,0 @@ - .align 1 - -gEasyChatGroupOrder_Hobbies: @ 83DF796 - .2byte 43 - .2byte 1 - .2byte 45 - .2byte 21 - .2byte 44 - .2byte 46 - .2byte 11 - .2byte 9 - .2byte 30 - .2byte 5 - .2byte 6 - .2byte 17 - .2byte 48 - .2byte 18 - .2byte 29 - .2byte 33 - .2byte 34 - .2byte 26 - .2byte 42 - .2byte 47 - .2byte 32 - .2byte 38 - .2byte 15 - .2byte 14 - .2byte 39 - .2byte 41 - .2byte 22 - .2byte 49 - .2byte 0 - .2byte 35 - .2byte 53 - .2byte 19 - .2byte 31 - .2byte 3 - .2byte 8 - .2byte 40 - .2byte 37 - .2byte 50 - .2byte 36 - .2byte 16 - .2byte 10 - .2byte 24 - .2byte 2 - .2byte 25 - .2byte 13 - .2byte 23 - .2byte 4 - .2byte 7 - .2byte 28 - .2byte 27 - .2byte 51 - .2byte 52 - .2byte 12 - .2byte 20 diff --git a/data/text/easy_chat/groups/hobbies/words.inc b/data/text/easy_chat/groups/hobbies/words.inc new file mode 100644 index 000000000..3aa4f2887 --- /dev/null +++ b/data/text/easy_chat/groups/hobbies/words.inc @@ -0,0 +1,56 @@ +gEasyChatGroupWords_Hobbies: @ 83DD5B1 + .string "IDOL$" + .string "ANIME$" + .string "SONG$" + .string "MOVIE$" + .string "SWEETS$" + .string "CHAT$" + .string "CHILD’S PLAY$" + .string "TOYS$" + .string "MUSIC$" + .string "CARDS$" + .string "SHOPPING$" + .string "CAMERA$" + .string "VIEWING$" + .string "SPECTATOR$" + .string "GOURMET$" + .string "GAME$" + .string "RPG$" + .string "COLLECTION$" + .string "COMPLETE$" + .string "MAGAZINE$" + .string "WALK$" + .string "BIKE$" + .string "HOBBY$" + .string "SPORTS$" + .string "SOFTWARE$" + .string "SONGS$" + .string "DIET$" + .string "TREASURE$" + .string "TRAVEL$" + .string "DANCE$" + .string "CHANNEL$" + .string "MAKING$" + .string "FISHING$" + .string "DATE$" + .string "DESIGN$" + .string "LOCOMOTIVE$" + .string "PLUSH DOLL$" + .string "PC$" + .string "FLOWERS$" + .string "HERO$" + .string "NAP$" + .string "HEROINE$" + .string "FASHION$" + .string "ADVENTURE$" + .string "BOARD$" + .string "BALL$" + .string "BOOK$" + .string "FESTIVAL$" + .string "COMICS$" + .string "HOLIDAY$" + .string "PLANS$" + .string "TRENDY$" + .string "VACATION$" + .string "LOOK$" + .string "$" diff --git a/data/text/easy_chat/groups/hobbies/words.s b/data/text/easy_chat/groups/hobbies/words.s deleted file mode 100644 index 3aa4f2887..000000000 --- a/data/text/easy_chat/groups/hobbies/words.s +++ /dev/null @@ -1,56 +0,0 @@ -gEasyChatGroupWords_Hobbies: @ 83DD5B1 - .string "IDOL$" - .string "ANIME$" - .string "SONG$" - .string "MOVIE$" - .string "SWEETS$" - .string "CHAT$" - .string "CHILD’S PLAY$" - .string "TOYS$" - .string "MUSIC$" - .string "CARDS$" - .string "SHOPPING$" - .string "CAMERA$" - .string "VIEWING$" - .string "SPECTATOR$" - .string "GOURMET$" - .string "GAME$" - .string "RPG$" - .string "COLLECTION$" - .string "COMPLETE$" - .string "MAGAZINE$" - .string "WALK$" - .string "BIKE$" - .string "HOBBY$" - .string "SPORTS$" - .string "SOFTWARE$" - .string "SONGS$" - .string "DIET$" - .string "TREASURE$" - .string "TRAVEL$" - .string "DANCE$" - .string "CHANNEL$" - .string "MAKING$" - .string "FISHING$" - .string "DATE$" - .string "DESIGN$" - .string "LOCOMOTIVE$" - .string "PLUSH DOLL$" - .string "PC$" - .string "FLOWERS$" - .string "HERO$" - .string "NAP$" - .string "HEROINE$" - .string "FASHION$" - .string "ADVENTURE$" - .string "BOARD$" - .string "BALL$" - .string "BOOK$" - .string "FESTIVAL$" - .string "COMICS$" - .string "HOLIDAY$" - .string "PLANS$" - .string "TRENDY$" - .string "VACATION$" - .string "LOOK$" - .string "$" diff --git a/data/text/easy_chat/groups/lifestyle/order.inc b/data/text/easy_chat/groups/lifestyle/order.inc new file mode 100644 index 000000000..c0aff2d7b --- /dev/null +++ b/data/text/easy_chat/groups/lifestyle/order.inc @@ -0,0 +1,48 @@ + .align 1 + +gEasyChatGroupOrder_Lifestyle: @ 83DF73C + .2byte 3 + .2byte 4 + .2byte 0 + .2byte 16 + .2byte 7 + .2byte 5 + .2byte 26 + .2byte 24 + .2byte 39 + .2byte 23 + .2byte 9 + .2byte 8 + .2byte 1 + .2byte 18 + .2byte 29 + .2byte 40 + .2byte 17 + .2byte 22 + .2byte 41 + .2byte 19 + .2byte 35 + .2byte 36 + .2byte 37 + .2byte 2 + .2byte 30 + .2byte 31 + .2byte 33 + .2byte 28 + .2byte 32 + .2byte 38 + .2byte 42 + .2byte 43 + .2byte 6 + .2byte 12 + .2byte 11 + .2byte 34 + .2byte 14 + .2byte 20 + .2byte 27 + .2byte 25 + .2byte 21 + .2byte 15 + .2byte 10 + .2byte 13 + .2byte 44 diff --git a/data/text/easy_chat/groups/lifestyle/order.s b/data/text/easy_chat/groups/lifestyle/order.s deleted file mode 100644 index c0aff2d7b..000000000 --- a/data/text/easy_chat/groups/lifestyle/order.s +++ /dev/null @@ -1,48 +0,0 @@ - .align 1 - -gEasyChatGroupOrder_Lifestyle: @ 83DF73C - .2byte 3 - .2byte 4 - .2byte 0 - .2byte 16 - .2byte 7 - .2byte 5 - .2byte 26 - .2byte 24 - .2byte 39 - .2byte 23 - .2byte 9 - .2byte 8 - .2byte 1 - .2byte 18 - .2byte 29 - .2byte 40 - .2byte 17 - .2byte 22 - .2byte 41 - .2byte 19 - .2byte 35 - .2byte 36 - .2byte 37 - .2byte 2 - .2byte 30 - .2byte 31 - .2byte 33 - .2byte 28 - .2byte 32 - .2byte 38 - .2byte 42 - .2byte 43 - .2byte 6 - .2byte 12 - .2byte 11 - .2byte 34 - .2byte 14 - .2byte 20 - .2byte 27 - .2byte 25 - .2byte 21 - .2byte 15 - .2byte 10 - .2byte 13 - .2byte 44 diff --git a/data/text/easy_chat/groups/lifestyle/words.inc b/data/text/easy_chat/groups/lifestyle/words.inc new file mode 100644 index 000000000..64cc1cd86 --- /dev/null +++ b/data/text/easy_chat/groups/lifestyle/words.inc @@ -0,0 +1,47 @@ +gEasyChatGroupWords_Lifestyle: @ 83DD468 + .string "CHORES$" + .string "HOME$" + .string "MONEY$" + .string "ALLOWANCE$" + .string "BATH$" + .string "CONVERSATION$" + .string "SCHOOL$" + .string "COMMEMORATE$" + .string "HABIT$" + .string "GROUP$" + .string "WORD$" + .string "STORE$" + .string "SERVICE$" + .string "WORK$" + .string "SYSTEM$" + .string "TRAIN$" + .string "CLASS$" + .string "LESSONS$" + .string "INFORMATION$" + .string "LIVING$" + .string "TEACHER$" + .string "TOURNAMENT$" + .string "LETTER$" + .string "EVENT$" + .string "DIGITAL$" + .string "TEST$" + .string "DEPT. STORE$" + .string "TELEVISION$" + .string "PHONE$" + .string "ITEM$" + .string "NAME$" + .string "NEWS$" + .string "POPULAR$" + .string "PARTY$" + .string "STUDY$" + .string "MACHINE$" + .string "MAIL$" + .string "MESSAGE$" + .string "PROMISE$" + .string "DREAM$" + .string "KINDERGARTEN$" + .string "LIFE$" + .string "RADIO$" + .string "RENTAL$" + .string "WORLD$" + .string "$" diff --git a/data/text/easy_chat/groups/lifestyle/words.s b/data/text/easy_chat/groups/lifestyle/words.s deleted file mode 100644 index 64cc1cd86..000000000 --- a/data/text/easy_chat/groups/lifestyle/words.s +++ /dev/null @@ -1,47 +0,0 @@ -gEasyChatGroupWords_Lifestyle: @ 83DD468 - .string "CHORES$" - .string "HOME$" - .string "MONEY$" - .string "ALLOWANCE$" - .string "BATH$" - .string "CONVERSATION$" - .string "SCHOOL$" - .string "COMMEMORATE$" - .string "HABIT$" - .string "GROUP$" - .string "WORD$" - .string "STORE$" - .string "SERVICE$" - .string "WORK$" - .string "SYSTEM$" - .string "TRAIN$" - .string "CLASS$" - .string "LESSONS$" - .string "INFORMATION$" - .string "LIVING$" - .string "TEACHER$" - .string "TOURNAMENT$" - .string "LETTER$" - .string "EVENT$" - .string "DIGITAL$" - .string "TEST$" - .string "DEPT. STORE$" - .string "TELEVISION$" - .string "PHONE$" - .string "ITEM$" - .string "NAME$" - .string "NEWS$" - .string "POPULAR$" - .string "PARTY$" - .string "STUDY$" - .string "MACHINE$" - .string "MAIL$" - .string "MESSAGE$" - .string "PROMISE$" - .string "DREAM$" - .string "KINDERGARTEN$" - .string "LIFE$" - .string "RADIO$" - .string "RENTAL$" - .string "WORLD$" - .string "$" diff --git a/data/text/easy_chat/groups/misc/order.inc b/data/text/easy_chat/groups/misc/order.inc new file mode 100644 index 000000000..95184c8fb --- /dev/null +++ b/data/text/easy_chat/groups/misc/order.inc @@ -0,0 +1,45 @@ + .align 1 + +gEasyChatGroupOrder_Misc: @ 83DF85C + .2byte 7 + .2byte 24 + .2byte 30 + .2byte 8 + .2byte 6 + .2byte 13 + .2byte 28 + .2byte 38 + .2byte 35 + .2byte 19 + .2byte 16 + .2byte 29 + .2byte 26 + .2byte 10 + .2byte 9 + .2byte 0 + .2byte 11 + .2byte 40 + .2byte 1 + .2byte 31 + .2byte 39 + .2byte 12 + .2byte 3 + .2byte 41 + .2byte 36 + .2byte 20 + .2byte 25 + .2byte 23 + .2byte 17 + .2byte 18 + .2byte 5 + .2byte 4 + .2byte 15 + .2byte 14 + .2byte 21 + .2byte 22 + .2byte 2 + .2byte 27 + .2byte 34 + .2byte 33 + .2byte 32 + .2byte 37 diff --git a/data/text/easy_chat/groups/misc/order.s b/data/text/easy_chat/groups/misc/order.s deleted file mode 100644 index 95184c8fb..000000000 --- a/data/text/easy_chat/groups/misc/order.s +++ /dev/null @@ -1,45 +0,0 @@ - .align 1 - -gEasyChatGroupOrder_Misc: @ 83DF85C - .2byte 7 - .2byte 24 - .2byte 30 - .2byte 8 - .2byte 6 - .2byte 13 - .2byte 28 - .2byte 38 - .2byte 35 - .2byte 19 - .2byte 16 - .2byte 29 - .2byte 26 - .2byte 10 - .2byte 9 - .2byte 0 - .2byte 11 - .2byte 40 - .2byte 1 - .2byte 31 - .2byte 39 - .2byte 12 - .2byte 3 - .2byte 41 - .2byte 36 - .2byte 20 - .2byte 25 - .2byte 23 - .2byte 17 - .2byte 18 - .2byte 5 - .2byte 4 - .2byte 15 - .2byte 14 - .2byte 21 - .2byte 22 - .2byte 2 - .2byte 27 - .2byte 34 - .2byte 33 - .2byte 32 - .2byte 37 diff --git a/data/text/easy_chat/groups/misc/words.inc b/data/text/easy_chat/groups/misc/words.inc new file mode 100644 index 000000000..9e52baf07 --- /dev/null +++ b/data/text/easy_chat/groups/misc/words.inc @@ -0,0 +1,44 @@ +gEasyChatGroupWords_Misc: @ 83DD860 + .string "HIGHS$" + .string "LOWS$" + .string "UM$" + .string "REAR$" + .string "THINGS$" + .string "THING$" + .string "BELOW$" + .string "ABOVE$" + .string "BACK$" + .string "HIGH$" + .string "HERE$" + .string "INSIDE$" + .string "OUTSIDE$" + .string "BESIDE$" + .string "THIS IS IT!$" + .string "THIS$" + .string "EVERY$" + .string "THESE$" + .string "THESE WERE$" + .string "DOWN$" + .string "THAT$" + .string "THOSE ARE$" + .string "THOSE WERE$" + .string "THAT’S IT!$" + .string "AM$" + .string "THAT WAS$" + .string "FRONT$" + .string "UP$" + .string "CHOICE$" + .string "FAR$" + .string "AWAY$" + .string "NEAR$" + .string "WHERE$" + .string "WHEN$" + .string "WHAT$" + .string "DEEP$" + .string "SHALLOW$" + .string "WHY$" + .string "CONFUSED$" + .string "OPPOSITE$" + .string "LEFT$" + .string "RIGHT$" + .string "$" diff --git a/data/text/easy_chat/groups/misc/words.s b/data/text/easy_chat/groups/misc/words.s deleted file mode 100644 index 9e52baf07..000000000 --- a/data/text/easy_chat/groups/misc/words.s +++ /dev/null @@ -1,44 +0,0 @@ -gEasyChatGroupWords_Misc: @ 83DD860 - .string "HIGHS$" - .string "LOWS$" - .string "UM$" - .string "REAR$" - .string "THINGS$" - .string "THING$" - .string "BELOW$" - .string "ABOVE$" - .string "BACK$" - .string "HIGH$" - .string "HERE$" - .string "INSIDE$" - .string "OUTSIDE$" - .string "BESIDE$" - .string "THIS IS IT!$" - .string "THIS$" - .string "EVERY$" - .string "THESE$" - .string "THESE WERE$" - .string "DOWN$" - .string "THAT$" - .string "THOSE ARE$" - .string "THOSE WERE$" - .string "THAT’S IT!$" - .string "AM$" - .string "THAT WAS$" - .string "FRONT$" - .string "UP$" - .string "CHOICE$" - .string "FAR$" - .string "AWAY$" - .string "NEAR$" - .string "WHERE$" - .string "WHEN$" - .string "WHAT$" - .string "DEEP$" - .string "SHALLOW$" - .string "WHY$" - .string "CONFUSED$" - .string "OPPOSITE$" - .string "LEFT$" - .string "RIGHT$" - .string "$" diff --git a/data/text/easy_chat/groups/move_1/order.inc b/data/text/easy_chat/groups/move_1/order.inc new file mode 100644 index 000000000..08a250dab --- /dev/null +++ b/data/text/easy_chat/groups/move_1/order.inc @@ -0,0 +1,156 @@ + .align 1 + +gEasyChatGroupOrder_Move1: @ 83DF924 + .2byte 71 + .2byte 177 + .2byte 97 + .2byte 314 + .2byte 246 + .2byte 312 + .2byte 310 + .2byte 62 + .2byte 117 + .2byte 20 + .2byte 44 + .2byte 280 + .2byte 145 + .2byte 268 + .2byte 204 + .2byte 128 + .2byte 109 + .2byte 132 + .2byte 322 + .2byte 68 + .2byte 152 + .2byte 238 + .2byte 242 + .2byte 15 + .2byte 91 + .2byte 50 + .2byte 104 + .2byte 38 + .2byte 3 + .2byte 89 + .2byte 227 + .2byte 283 + .2byte 203 + .2byte 326 + .2byte 245 + .2byte 263 + .2byte 313 + .2byte 90 + .2byte 175 + .2byte 172 + .2byte 53 + .2byte 260 + .2byte 19 + .2byte 116 + .2byte 264 + .2byte 266 + .2byte 202 + .2byte 320 + .2byte 74 + .2byte 288 + .2byte 16 + .2byte 258 + .2byte 106 + .2byte 114 + .2byte 29 + .2byte 215 + .2byte 95 + .2byte 301 + .2byte 196 + .2byte 231 + .2byte 2 + .2byte 134 + .2byte 141 + .2byte 122 + .2byte 142 + .2byte 67 + .2byte 212 + .2byte 262 + .2byte 319 + .2byte 309 + .2byte 170 + .2byte 119 + .2byte 54 + .2byte 234 + .2byte 267 + .2byte 171 + .2byte 190 + .2byte 316 + .2byte 200 + .2byte 315 + .2byte 220 + .2byte 181 + .2byte 60 + .2byte 244 + .2byte 94 + .2byte 149 + .2byte 228 + .2byte 99 + .2byte 240 + .2byte 229 + .2byte 13 + .2byte 105 + .2byte 216 + .2byte 179 + .2byte 157 + .2byte 249 + .2byte 88 + .2byte 317 + .2byte 205 + .2byte 221 + .2byte 219 + .2byte 328 + .2byte 28 + .2byte 201 + .2byte 184 + .2byte 103 + .2byte 120 + .2byte 247 + .2byte 325 + .2byte 159 + .2byte 329 + .2byte 324 + .2byte 318 + .2byte 47 + .2byte 166 + .2byte 285 + .2byte 143 + .2byte 327 + .2byte 163 + .2byte 265 + .2byte 123 + .2byte 108 + .2byte 173 + .2byte 76 + .2byte 49 + .2byte 209 + .2byte 169 + .2byte 180 + .2byte 147 + .2byte 70 + .2byte 81 + .2byte 78 + .2byte 66 + .2byte 162 + .2byte 207 + .2byte 230 + .2byte 129 + .2byte 235 + .2byte 39 + .2byte 37 + .2byte 87 + .2byte 85 + .2byte 9 + .2byte 321 + .2byte 259 + .2byte 253 + .2byte 233 + .2byte 323 + .2byte 311 + .2byte 250 + .2byte 261 + .2byte 110 + .2byte 281 diff --git a/data/text/easy_chat/groups/move_1/order.s b/data/text/easy_chat/groups/move_1/order.s deleted file mode 100644 index 08a250dab..000000000 --- a/data/text/easy_chat/groups/move_1/order.s +++ /dev/null @@ -1,156 +0,0 @@ - .align 1 - -gEasyChatGroupOrder_Move1: @ 83DF924 - .2byte 71 - .2byte 177 - .2byte 97 - .2byte 314 - .2byte 246 - .2byte 312 - .2byte 310 - .2byte 62 - .2byte 117 - .2byte 20 - .2byte 44 - .2byte 280 - .2byte 145 - .2byte 268 - .2byte 204 - .2byte 128 - .2byte 109 - .2byte 132 - .2byte 322 - .2byte 68 - .2byte 152 - .2byte 238 - .2byte 242 - .2byte 15 - .2byte 91 - .2byte 50 - .2byte 104 - .2byte 38 - .2byte 3 - .2byte 89 - .2byte 227 - .2byte 283 - .2byte 203 - .2byte 326 - .2byte 245 - .2byte 263 - .2byte 313 - .2byte 90 - .2byte 175 - .2byte 172 - .2byte 53 - .2byte 260 - .2byte 19 - .2byte 116 - .2byte 264 - .2byte 266 - .2byte 202 - .2byte 320 - .2byte 74 - .2byte 288 - .2byte 16 - .2byte 258 - .2byte 106 - .2byte 114 - .2byte 29 - .2byte 215 - .2byte 95 - .2byte 301 - .2byte 196 - .2byte 231 - .2byte 2 - .2byte 134 - .2byte 141 - .2byte 122 - .2byte 142 - .2byte 67 - .2byte 212 - .2byte 262 - .2byte 319 - .2byte 309 - .2byte 170 - .2byte 119 - .2byte 54 - .2byte 234 - .2byte 267 - .2byte 171 - .2byte 190 - .2byte 316 - .2byte 200 - .2byte 315 - .2byte 220 - .2byte 181 - .2byte 60 - .2byte 244 - .2byte 94 - .2byte 149 - .2byte 228 - .2byte 99 - .2byte 240 - .2byte 229 - .2byte 13 - .2byte 105 - .2byte 216 - .2byte 179 - .2byte 157 - .2byte 249 - .2byte 88 - .2byte 317 - .2byte 205 - .2byte 221 - .2byte 219 - .2byte 328 - .2byte 28 - .2byte 201 - .2byte 184 - .2byte 103 - .2byte 120 - .2byte 247 - .2byte 325 - .2byte 159 - .2byte 329 - .2byte 324 - .2byte 318 - .2byte 47 - .2byte 166 - .2byte 285 - .2byte 143 - .2byte 327 - .2byte 163 - .2byte 265 - .2byte 123 - .2byte 108 - .2byte 173 - .2byte 76 - .2byte 49 - .2byte 209 - .2byte 169 - .2byte 180 - .2byte 147 - .2byte 70 - .2byte 81 - .2byte 78 - .2byte 66 - .2byte 162 - .2byte 207 - .2byte 230 - .2byte 129 - .2byte 235 - .2byte 39 - .2byte 37 - .2byte 87 - .2byte 85 - .2byte 9 - .2byte 321 - .2byte 259 - .2byte 253 - .2byte 233 - .2byte 323 - .2byte 311 - .2byte 250 - .2byte 261 - .2byte 110 - .2byte 281 diff --git a/data/text/easy_chat/groups/move_1/words.inc b/data/text/easy_chat/groups/move_1/words.inc new file mode 100644 index 000000000..52261e34a --- /dev/null +++ b/data/text/easy_chat/groups/move_1/words.inc @@ -0,0 +1,156 @@ + .align 1 + +gEasyChatGroupWords_Move1: @ 83DDB3C + .2byte MOVE_THUNDERBOLT + .2byte MOVE_IRON_TAIL + .2byte MOVE_ICE_BALL + .2byte MOVE_YAWN + .2byte MOVE_LOVELY_KISS + .2byte MOVE_NIGHTMARE + .2byte MOVE_MORNING_SUN + .2byte MOVE_VITAL_THROW + .2byte MOVE_DIG + .2byte MOVE_THRASH + .2byte MOVE_SWEET_SCENT + .2byte MOVE_CHARM + .2byte MOVE_RAIN_DANCE + .2byte MOVE_CONFUSE_RAY + .2byte MOVE_HAIL + .2byte MOVE_AROMATHERAPY + .2byte MOVE_BUBBLE + .2byte MOVE_ENCORE + .2byte MOVE_CUT + .2byte MOVE_RAGE + .2byte MOVE_SUPER_FANG + .2byte MOVE_PAIN_SPLIT + .2byte MOVE_TORMENT + .2byte MOVE_STRING_SHOT + .2byte MOVE_SWAGGER + .2byte MOVE_SNORE + .2byte MOVE_HEAL_BELL + .2byte MOVE_SCREECH + .2byte MOVE_ROCK_THROW + .2byte MOVE_ROCK_SMASH + .2byte MOVE_ROCK_SLIDE + .2byte MOVE_WEATHER_BALL + .2byte MOVE_WHIRLPOOL + .2byte MOVE_FAKE_TEARS + .2byte MOVE_SING + .2byte MOVE_SPITE + .2byte MOVE_AIR_CUTTER + .2byte MOVE_AEROBLAST + .2byte MOVE_SMOKESCREEN + .2byte MOVE_PURSUIT + .2byte MOVE_DOUBLE_SLAP + .2byte MOVE_MIRROR_MOVE + .2byte MOVE_OVERHEAT + .2byte MOVE_AURORA_BEAM + .2byte MOVE_MEMENTO + .2byte MOVE_OCTAZOOKA + .2byte MOVE_FLATTER + .2byte MOVE_ASTONISH + .2byte MOVE_WILL_O_WISP + .2byte MOVE_RETURN + .2byte MOVE_GRUDGE + .2byte MOVE_STRENGTH + .2byte MOVE_COUNTER + .2byte MOVE_FLAME_WHEEL + .2byte MOVE_FLAMETHROWER + .2byte MOVE_ODOR_SLEUTH + .2byte MOVE_SHARPEN + .2byte MOVE_DOUBLE_TEAM + .2byte MOVE_GUST + .2byte MOVE_HARDEN + .2byte MOVE_DISABLE + .2byte MOVE_RAZOR_WIND + .2byte MOVE_BIDE + .2byte MOVE_CRUNCH + .2byte MOVE_BITE + .2byte MOVE_THUNDER + .2byte MOVE_THUNDER_PUNCH + .2byte MOVE_ENDEAVOR + .2byte MOVE_FACADE + .2byte MOVE_KARATE_CHOP + .2byte MOVE_CLAMP + .2byte MOVE_WITHDRAW + .2byte MOVE_CONSTRICT + .2byte MOVE_BRICK_BREAK + .2byte MOVE_ROCK_TOMB + .2byte MOVE_FOCUS_ENERGY + .2byte MOVE_FOCUS_PUNCH + .2byte MOVE_GIGA_DRAIN + .2byte MOVE_REVERSAL + .2byte MOVE_SMELLING_SALT + .2byte MOVE_SPORE + .2byte MOVE_LEECH_LIFE + .2byte MOVE_SLASH + .2byte MOVE_SILVER_WIND + .2byte MOVE_METAL_SOUND + .2byte MOVE_GRASS_WHISTLE + .2byte MOVE_TICKLE + .2byte MOVE_SPIDER_WEB + .2byte MOVE_CRABHAMMER + .2byte MOVE_HAZE + .2byte MOVE_MEAN_LOOK + .2byte MOVE_CROSS_CHOP + .2byte MOVE_OUTRAGE + .2byte MOVE_LOW_KICK + .2byte MOVE_ANCIENT_POWER + .2byte MOVE_SYNTHESIS + .2byte MOVE_AGILITY + .2byte MOVE_RAPID_SPIN + .2byte MOVE_ICY_WIND + .2byte MOVE_MIND_READER + .2byte MOVE_COSMIC_POWER + .2byte MOVE_SKY_ATTACK + .2byte MOVE_POWDER_SNOW + .2byte MOVE_FOLLOW_ME + .2byte MOVE_METEOR_MASH + .2byte MOVE_ENDURE + .2byte MOVE_ROLLOUT + .2byte MOVE_SCARY_FACE + .2byte MOVE_PSYBEAM + .2byte MOVE_PSYWAVE + .2byte MOVE_PSYCHIC + .2byte MOVE_HYPNOSIS + .2byte MOVE_UPROAR + .2byte MOVE_WATER_SPOUT + .2byte MOVE_SIGNAL_BEAM + .2byte MOVE_PSYCH_UP + .2byte MOVE_SUBMISSION + .2byte MOVE_RECOVER + .2byte MOVE_EARTHQUAKE + .2byte MOVE_NATURE_POWER + .2byte MOVE_LICK + .2byte MOVE_FLAIL + .2byte MOVE_TAIL_WHIP + .2byte MOVE_SELF_DESTRUCT + .2byte MOVE_STUN_SPORE + .2byte MOVE_BIND + .2byte MOVE_SHADOW_PUNCH + .2byte MOVE_SHADOW_BALL + .2byte MOVE_CHARGE + .2byte MOVE_MIST + .2byte MOVE_FISSURE + .2byte MOVE_EXTREME_SPEED + .2byte MOVE_EXTRASENSORY + .2byte MOVE_SAFEGUARD + .2byte MOVE_ABSORB + .2byte MOVE_SKY_UPPERCUT + .2byte MOVE_SKILL_SWAP + .2byte MOVE_SKETCH + .2byte MOVE_HEADBUTT + .2byte MOVE_DOUBLE_EDGE + .2byte MOVE_SANDSTORM + .2byte MOVE_SAND_ATTACK + .2byte MOVE_SAND_TOMB + .2byte MOVE_SPARK + .2byte MOVE_SWIFT + .2byte MOVE_KINESIS + .2byte MOVE_SMOG + .2byte MOVE_GROWTH + .2byte MOVE_SACRED_FIRE + .2byte MOVE_SHEER_COLD + .2byte MOVE_SOLAR_BEAM + .2byte MOVE_SONIC_BOOM + .2byte MOVE_FLY diff --git a/data/text/easy_chat/groups/move_1/words.s b/data/text/easy_chat/groups/move_1/words.s deleted file mode 100644 index 52261e34a..000000000 --- a/data/text/easy_chat/groups/move_1/words.s +++ /dev/null @@ -1,156 +0,0 @@ - .align 1 - -gEasyChatGroupWords_Move1: @ 83DDB3C - .2byte MOVE_THUNDERBOLT - .2byte MOVE_IRON_TAIL - .2byte MOVE_ICE_BALL - .2byte MOVE_YAWN - .2byte MOVE_LOVELY_KISS - .2byte MOVE_NIGHTMARE - .2byte MOVE_MORNING_SUN - .2byte MOVE_VITAL_THROW - .2byte MOVE_DIG - .2byte MOVE_THRASH - .2byte MOVE_SWEET_SCENT - .2byte MOVE_CHARM - .2byte MOVE_RAIN_DANCE - .2byte MOVE_CONFUSE_RAY - .2byte MOVE_HAIL - .2byte MOVE_AROMATHERAPY - .2byte MOVE_BUBBLE - .2byte MOVE_ENCORE - .2byte MOVE_CUT - .2byte MOVE_RAGE - .2byte MOVE_SUPER_FANG - .2byte MOVE_PAIN_SPLIT - .2byte MOVE_TORMENT - .2byte MOVE_STRING_SHOT - .2byte MOVE_SWAGGER - .2byte MOVE_SNORE - .2byte MOVE_HEAL_BELL - .2byte MOVE_SCREECH - .2byte MOVE_ROCK_THROW - .2byte MOVE_ROCK_SMASH - .2byte MOVE_ROCK_SLIDE - .2byte MOVE_WEATHER_BALL - .2byte MOVE_WHIRLPOOL - .2byte MOVE_FAKE_TEARS - .2byte MOVE_SING - .2byte MOVE_SPITE - .2byte MOVE_AIR_CUTTER - .2byte MOVE_AEROBLAST - .2byte MOVE_SMOKESCREEN - .2byte MOVE_PURSUIT - .2byte MOVE_DOUBLE_SLAP - .2byte MOVE_MIRROR_MOVE - .2byte MOVE_OVERHEAT - .2byte MOVE_AURORA_BEAM - .2byte MOVE_MEMENTO - .2byte MOVE_OCTAZOOKA - .2byte MOVE_FLATTER - .2byte MOVE_ASTONISH - .2byte MOVE_WILL_O_WISP - .2byte MOVE_RETURN - .2byte MOVE_GRUDGE - .2byte MOVE_STRENGTH - .2byte MOVE_COUNTER - .2byte MOVE_FLAME_WHEEL - .2byte MOVE_FLAMETHROWER - .2byte MOVE_ODOR_SLEUTH - .2byte MOVE_SHARPEN - .2byte MOVE_DOUBLE_TEAM - .2byte MOVE_GUST - .2byte MOVE_HARDEN - .2byte MOVE_DISABLE - .2byte MOVE_RAZOR_WIND - .2byte MOVE_BIDE - .2byte MOVE_CRUNCH - .2byte MOVE_BITE - .2byte MOVE_THUNDER - .2byte MOVE_THUNDER_PUNCH - .2byte MOVE_ENDEAVOR - .2byte MOVE_FACADE - .2byte MOVE_KARATE_CHOP - .2byte MOVE_CLAMP - .2byte MOVE_WITHDRAW - .2byte MOVE_CONSTRICT - .2byte MOVE_BRICK_BREAK - .2byte MOVE_ROCK_TOMB - .2byte MOVE_FOCUS_ENERGY - .2byte MOVE_FOCUS_PUNCH - .2byte MOVE_GIGA_DRAIN - .2byte MOVE_REVERSAL - .2byte MOVE_SMELLING_SALT - .2byte MOVE_SPORE - .2byte MOVE_LEECH_LIFE - .2byte MOVE_SLASH - .2byte MOVE_SILVER_WIND - .2byte MOVE_METAL_SOUND - .2byte MOVE_GRASS_WHISTLE - .2byte MOVE_TICKLE - .2byte MOVE_SPIDER_WEB - .2byte MOVE_CRABHAMMER - .2byte MOVE_HAZE - .2byte MOVE_MEAN_LOOK - .2byte MOVE_CROSS_CHOP - .2byte MOVE_OUTRAGE - .2byte MOVE_LOW_KICK - .2byte MOVE_ANCIENT_POWER - .2byte MOVE_SYNTHESIS - .2byte MOVE_AGILITY - .2byte MOVE_RAPID_SPIN - .2byte MOVE_ICY_WIND - .2byte MOVE_MIND_READER - .2byte MOVE_COSMIC_POWER - .2byte MOVE_SKY_ATTACK - .2byte MOVE_POWDER_SNOW - .2byte MOVE_FOLLOW_ME - .2byte MOVE_METEOR_MASH - .2byte MOVE_ENDURE - .2byte MOVE_ROLLOUT - .2byte MOVE_SCARY_FACE - .2byte MOVE_PSYBEAM - .2byte MOVE_PSYWAVE - .2byte MOVE_PSYCHIC - .2byte MOVE_HYPNOSIS - .2byte MOVE_UPROAR - .2byte MOVE_WATER_SPOUT - .2byte MOVE_SIGNAL_BEAM - .2byte MOVE_PSYCH_UP - .2byte MOVE_SUBMISSION - .2byte MOVE_RECOVER - .2byte MOVE_EARTHQUAKE - .2byte MOVE_NATURE_POWER - .2byte MOVE_LICK - .2byte MOVE_FLAIL - .2byte MOVE_TAIL_WHIP - .2byte MOVE_SELF_DESTRUCT - .2byte MOVE_STUN_SPORE - .2byte MOVE_BIND - .2byte MOVE_SHADOW_PUNCH - .2byte MOVE_SHADOW_BALL - .2byte MOVE_CHARGE - .2byte MOVE_MIST - .2byte MOVE_FISSURE - .2byte MOVE_EXTREME_SPEED - .2byte MOVE_EXTRASENSORY - .2byte MOVE_SAFEGUARD - .2byte MOVE_ABSORB - .2byte MOVE_SKY_UPPERCUT - .2byte MOVE_SKILL_SWAP - .2byte MOVE_SKETCH - .2byte MOVE_HEADBUTT - .2byte MOVE_DOUBLE_EDGE - .2byte MOVE_SANDSTORM - .2byte MOVE_SAND_ATTACK - .2byte MOVE_SAND_TOMB - .2byte MOVE_SPARK - .2byte MOVE_SWIFT - .2byte MOVE_KINESIS - .2byte MOVE_SMOG - .2byte MOVE_GROWTH - .2byte MOVE_SACRED_FIRE - .2byte MOVE_SHEER_COLD - .2byte MOVE_SOLAR_BEAM - .2byte MOVE_SONIC_BOOM - .2byte MOVE_FLY diff --git a/data/text/easy_chat/groups/move_2/order.inc b/data/text/easy_chat/groups/move_2/order.inc new file mode 100644 index 000000000..114d799b1 --- /dev/null +++ b/data/text/easy_chat/groups/move_2/order.inc @@ -0,0 +1,197 @@ + .align 1 + +gEasyChatGroupOrder_Move2: @ 83DFA56 + .2byte 51 + .2byte 151 + .2byte 332 + .2byte 133 + .2byte 292 + .2byte 274 + .2byte 213 + .2byte 140 + .2byte 112 + .2byte 226 + .2byte 251 + .2byte 187 + .2byte 299 + .2byte 59 + .2byte 335 + .2byte 34 + .2byte 125 + .2byte 198 + .2byte 155 + .2byte 340 + .2byte 61 + .2byte 339 + .2byte 331 + .2byte 347 + .2byte 293 + .2byte 4 + .2byte 93 + .2byte 160 + .2byte 176 + .2byte 178 + .2byte 343 + .2byte 306 + .2byte 174 + .2byte 111 + .2byte 194 + .2byte 197 + .2byte 291 + .2byte 146 + .2byte 24 + .2byte 337 + .2byte 349 + .2byte 82 + .2byte 225 + .2byte 138 + .2byte 65 + .2byte 223 + .2byte 121 + .2byte 52 + .2byte 284 + .2byte 153 + .2byte 185 + .2byte 252 + .2byte 206 + .2byte 297 + .2byte 126 + .2byte 7 + .2byte 83 + .2byte 148 + .2byte 193 + .2byte 218 + .2byte 31 + .2byte 210 + .2byte 154 + .2byte 248 + .2byte 137 + .2byte 45 + .2byte 12 + .2byte 257 + .2byte 270 + .2byte 136 + .2byte 237 + .2byte 30 + .2byte 32 + .2byte 336 + .2byte 56 + .2byte 63 + .2byte 158 + .2byte 304 + .2byte 58 + .2byte 8 + .2byte 286 + .2byte 275 + .2byte 334 + .2byte 26 + .2byte 282 + .2byte 348 + .2byte 73 + .2byte 43 + .2byte 113 + .2byte 199 + .2byte 295 + .2byte 183 + .2byte 277 + .2byte 345 + .2byte 222 + .2byte 96 + .2byte 72 + .2byte 25 + .2byte 5 + .2byte 224 + .2byte 232 + .2byte 118 + .2byte 208 + .2byte 102 + .2byte 107 + .2byte 243 + .2byte 296 + .2byte 236 + .2byte 341 + .2byte 300 + .2byte 189 + .2byte 330 + .2byte 302 + .2byte 101 + .2byte 6 + .2byte 64 + .2byte 195 + .2byte 80 + .2byte 42 + .2byte 305 + .2byte 139 + .2byte 40 + .2byte 342 + .2byte 77 + .2byte 1 + .2byte 217 + .2byte 182 + .2byte 98 + .2byte 75 + .2byte 278 + .2byte 115 + .2byte 287 + .2byte 156 + .2byte 279 + .2byte 46 + .2byte 350 + .2byte 272 + .2byte 27 + .2byte 10 + .2byte 290 + .2byte 69 + .2byte 351 + .2byte 130 + .2byte 303 + .2byte 21 + .2byte 79 + .2byte 214 + .2byte 124 + .2byte 188 + .2byte 289 + .2byte 135 + .2byte 131 + .2byte 191 + .2byte 255 + .2byte 150 + .2byte 211 + .2byte 254 + .2byte 23 + .2byte 165 + .2byte 164 + .2byte 241 + .2byte 276 + .2byte 48 + .2byte 57 + .2byte 256 + .2byte 186 + .2byte 14 + .2byte 33 + .2byte 294 + .2byte 36 + .2byte 269 + .2byte 298 + .2byte 100 + .2byte 168 + .2byte 86 + .2byte 84 + .2byte 92 + .2byte 144 + .2byte 161 + .2byte 271 + .2byte 167 + .2byte 41 + .2byte 239 + .2byte 11 + .2byte 22 + .2byte 55 + .2byte 352 + .2byte 346 + .2byte 127 + .2byte 18 + .2byte 17 + .2byte 273 + .2byte 35 + .2byte 192 diff --git a/data/text/easy_chat/groups/move_2/order.s b/data/text/easy_chat/groups/move_2/order.s deleted file mode 100644 index 114d799b1..000000000 --- a/data/text/easy_chat/groups/move_2/order.s +++ /dev/null @@ -1,197 +0,0 @@ - .align 1 - -gEasyChatGroupOrder_Move2: @ 83DFA56 - .2byte 51 - .2byte 151 - .2byte 332 - .2byte 133 - .2byte 292 - .2byte 274 - .2byte 213 - .2byte 140 - .2byte 112 - .2byte 226 - .2byte 251 - .2byte 187 - .2byte 299 - .2byte 59 - .2byte 335 - .2byte 34 - .2byte 125 - .2byte 198 - .2byte 155 - .2byte 340 - .2byte 61 - .2byte 339 - .2byte 331 - .2byte 347 - .2byte 293 - .2byte 4 - .2byte 93 - .2byte 160 - .2byte 176 - .2byte 178 - .2byte 343 - .2byte 306 - .2byte 174 - .2byte 111 - .2byte 194 - .2byte 197 - .2byte 291 - .2byte 146 - .2byte 24 - .2byte 337 - .2byte 349 - .2byte 82 - .2byte 225 - .2byte 138 - .2byte 65 - .2byte 223 - .2byte 121 - .2byte 52 - .2byte 284 - .2byte 153 - .2byte 185 - .2byte 252 - .2byte 206 - .2byte 297 - .2byte 126 - .2byte 7 - .2byte 83 - .2byte 148 - .2byte 193 - .2byte 218 - .2byte 31 - .2byte 210 - .2byte 154 - .2byte 248 - .2byte 137 - .2byte 45 - .2byte 12 - .2byte 257 - .2byte 270 - .2byte 136 - .2byte 237 - .2byte 30 - .2byte 32 - .2byte 336 - .2byte 56 - .2byte 63 - .2byte 158 - .2byte 304 - .2byte 58 - .2byte 8 - .2byte 286 - .2byte 275 - .2byte 334 - .2byte 26 - .2byte 282 - .2byte 348 - .2byte 73 - .2byte 43 - .2byte 113 - .2byte 199 - .2byte 295 - .2byte 183 - .2byte 277 - .2byte 345 - .2byte 222 - .2byte 96 - .2byte 72 - .2byte 25 - .2byte 5 - .2byte 224 - .2byte 232 - .2byte 118 - .2byte 208 - .2byte 102 - .2byte 107 - .2byte 243 - .2byte 296 - .2byte 236 - .2byte 341 - .2byte 300 - .2byte 189 - .2byte 330 - .2byte 302 - .2byte 101 - .2byte 6 - .2byte 64 - .2byte 195 - .2byte 80 - .2byte 42 - .2byte 305 - .2byte 139 - .2byte 40 - .2byte 342 - .2byte 77 - .2byte 1 - .2byte 217 - .2byte 182 - .2byte 98 - .2byte 75 - .2byte 278 - .2byte 115 - .2byte 287 - .2byte 156 - .2byte 279 - .2byte 46 - .2byte 350 - .2byte 272 - .2byte 27 - .2byte 10 - .2byte 290 - .2byte 69 - .2byte 351 - .2byte 130 - .2byte 303 - .2byte 21 - .2byte 79 - .2byte 214 - .2byte 124 - .2byte 188 - .2byte 289 - .2byte 135 - .2byte 131 - .2byte 191 - .2byte 255 - .2byte 150 - .2byte 211 - .2byte 254 - .2byte 23 - .2byte 165 - .2byte 164 - .2byte 241 - .2byte 276 - .2byte 48 - .2byte 57 - .2byte 256 - .2byte 186 - .2byte 14 - .2byte 33 - .2byte 294 - .2byte 36 - .2byte 269 - .2byte 298 - .2byte 100 - .2byte 168 - .2byte 86 - .2byte 84 - .2byte 92 - .2byte 144 - .2byte 161 - .2byte 271 - .2byte 167 - .2byte 41 - .2byte 239 - .2byte 11 - .2byte 22 - .2byte 55 - .2byte 352 - .2byte 346 - .2byte 127 - .2byte 18 - .2byte 17 - .2byte 273 - .2byte 35 - .2byte 192 diff --git a/data/text/easy_chat/groups/move_2/words.inc b/data/text/easy_chat/groups/move_2/words.inc new file mode 100644 index 000000000..cd31397d0 --- /dev/null +++ b/data/text/easy_chat/groups/move_2/words.inc @@ -0,0 +1,197 @@ + .align 1 + +gEasyChatGroupWords_Move2: @ 83DDC6E + .2byte MOVE_TACKLE + .2byte MOVE_EXPLOSION + .2byte MOVE_DIVE + .2byte MOVE_FIRE_BLAST + .2byte MOVE_WATERFALL + .2byte MOVE_MUDDY_WATER + .2byte MOVE_STOCKPILE + .2byte MOVE_SLAM + .2byte MOVE_TWISTER + .2byte MOVE_BULLET_SEED + .2byte MOVE_TWINEEDLE + .2byte MOVE_SOFT_BOILED + .2byte MOVE_EGG_BOMB + .2byte MOVE_FAINT_ATTACK + .2byte MOVE_BARRAGE + .2byte MOVE_MINIMIZE + .2byte MOVE_SEISMIC_TOSS + .2byte MOVE_SUPERSONIC + .2byte MOVE_TAUNT + .2byte MOVE_MOONLIGHT + .2byte MOVE_PECK + .2byte MOVE_ARM_THRUST + .2byte MOVE_HORN_ATTACK + .2byte MOVE_HORN_DRILL + .2byte MOVE_WING_ATTACK + .2byte MOVE_AERIAL_ACE + .2byte MOVE_SWORDS_DANCE + .2byte MOVE_VINE_WHIP + .2byte MOVE_CONVERSION + .2byte MOVE_CONVERSION_2 + .2byte MOVE_HELPING_HAND + .2byte MOVE_IRON_DEFENSE + .2byte MOVE_TELEPORT + .2byte MOVE_THUNDER_SHOCK + .2byte MOVE_SHOCK_WAVE + .2byte MOVE_QUICK_ATTACK + .2byte MOVE_SWEET_KISS + .2byte MOVE_THUNDER_WAVE + .2byte MOVE_ZAP_CANNON + .2byte MOVE_BLOCK + .2byte MOVE_HOWL + .2byte MOVE_POISON_GAS + .2byte MOVE_TOXIC + .2byte MOVE_POISON_FANG + .2byte MOVE_POISON_POWDER + .2byte MOVE_POISON_STING + .2byte MOVE_SPIKE_CANNON + .2byte MOVE_ACID_ARMOR + .2byte MOVE_TAKE_DOWN + .2byte MOVE_JUMP_KICK + .2byte MOVE_BOUNCE + .2byte MOVE_HI_JUMP_KICK + .2byte MOVE_TRI_ATTACK + .2byte MOVE_DRAGON_CLAW + .2byte MOVE_TRICK + .2byte MOVE_TRIPLE_KICK + .2byte MOVE_DRILL_PECK + .2byte MOVE_MUD_SPORT + .2byte MOVE_MUD_SLAP + .2byte MOVE_THIEF + .2byte MOVE_AMNESIA + .2byte MOVE_NIGHT_SHADE + .2byte MOVE_GROWL + .2byte MOVE_SLACK_OFF + .2byte MOVE_SURF + .2byte MOVE_ROLE_PLAY + .2byte MOVE_NEEDLE_ARM + .2byte MOVE_DOUBLE_KICK + .2byte MOVE_SUNNY_DAY + .2byte MOVE_LEER + .2byte MOVE_WISH + .2byte MOVE_FAKE_OUT + .2byte MOVE_SLEEP_TALK + .2byte MOVE_PAY_DAY + .2byte MOVE_ASSIST + .2byte MOVE_HEAT_WAVE + .2byte MOVE_SLEEP_POWDER + .2byte MOVE_REST + .2byte MOVE_INGRAIN + .2byte MOVE_CONFUSION + .2byte MOVE_BODY_SLAM + .2byte MOVE_SWALLOW + .2byte MOVE_CURSE + .2byte MOVE_HYDRO_PUMP + .2byte MOVE_HYPER_VOICE + .2byte MOVE_HYPER_BEAM + .2byte MOVE_SUPERPOWER + .2byte MOVE_STEEL_WING + .2byte MOVE_SPIT_UP + .2byte MOVE_DYNAMIC_PUNCH + .2byte MOVE_GUILLOTINE + .2byte MOVE_VICE_GRIP + .2byte MOVE_KNOCK_OFF + .2byte MOVE_POUND + .2byte MOVE_RAZOR_LEAF + .2byte MOVE_BATON_PASS + .2byte MOVE_PETAL_DANCE + .2byte MOVE_SPLASH + .2byte MOVE_BUBBLE_BEAM + .2byte MOVE_BELLY_DRUM + .2byte MOVE_BARRIER + .2byte MOVE_LIGHT_SCREEN + .2byte MOVE_SCRATCH + .2byte MOVE_HYPER_FANG + .2byte MOVE_EMBER + .2byte MOVE_SECRET_POWER + .2byte MOVE_DIZZY_PUNCH + .2byte MOVE_BULK_UP + .2byte MOVE_IMPRISON + .2byte MOVE_FEATHER_DANCE + .2byte MOVE_WHIRLWIND + .2byte MOVE_BEAT_UP + .2byte MOVE_BLIZZARD + .2byte MOVE_STOMP + .2byte MOVE_FLASH + .2byte MOVE_TEETER_DANCE + .2byte MOVE_CRUSH_CLAW + .2byte MOVE_BLAZE_KICK + .2byte MOVE_PRESENT + .2byte MOVE_ERUPTION + .2byte MOVE_SLUDGE + .2byte MOVE_SLUDGE_BOMB + .2byte MOVE_GLARE + .2byte MOVE_TRANSFORM + .2byte MOVE_POISON_TAIL + .2byte MOVE_ROAR + .2byte MOVE_BONE_RUSH + .2byte MOVE_CAMOUFLAGE + .2byte MOVE_COVET + .2byte MOVE_TAIL_GLOW + .2byte MOVE_BONE_CLUB + .2byte MOVE_BONEMERANG + .2byte MOVE_FIRE_SPIN + .2byte MOVE_FIRE_PUNCH + .2byte MOVE_PERISH_SONG + .2byte MOVE_WRAP + .2byte MOVE_SPIKES + .2byte MOVE_MAGNITUDE + .2byte MOVE_MAGICAL_LEAF + .2byte MOVE_MAGIC_COAT + .2byte MOVE_MUD_SHOT + .2byte MOVE_MACH_PUNCH + .2byte MOVE_PROTECT + .2byte MOVE_DEFENSE_CURL + .2byte MOVE_ROLLING_KICK + .2byte MOVE_SUBSTITUTE + .2byte MOVE_DETECT + .2byte MOVE_PIN_MISSILE + .2byte MOVE_WATER_SPORT + .2byte MOVE_WATER_GUN + .2byte MOVE_MIST_BALL + .2byte MOVE_WATER_PULSE + .2byte MOVE_FURY_ATTACK + .2byte MOVE_FURY_SWIPES + .2byte MOVE_DESTINY_BOND + .2byte MOVE_FALSE_SWIPE + .2byte MOVE_FORESIGHT + .2byte MOVE_MIRROR_COAT + .2byte MOVE_FUTURE_SIGHT + .2byte MOVE_MILK_DRINK + .2byte MOVE_CALM_MIND + .2byte MOVE_MEGA_DRAIN + .2byte MOVE_MEGA_KICK + .2byte MOVE_MEGA_PUNCH + .2byte MOVE_MEGAHORN + .2byte MOVE_HIDDEN_POWER + .2byte MOVE_METAL_CLAW + .2byte MOVE_ATTRACT + .2byte MOVE_MIMIC + .2byte MOVE_FRUSTRATION + .2byte MOVE_LEECH_SEED + .2byte MOVE_METRONOME + .2byte MOVE_DREAM_EATER + .2byte MOVE_ACID + .2byte MOVE_MEDITATE + .2byte MOVE_SNATCH + .2byte MOVE_LUSTER_PURGE + .2byte MOVE_LEAF_BLADE + .2byte MOVE_RECYCLE + .2byte MOVE_REFLECT + .2byte MOVE_REFRESH + .2byte MOVE_REVENGE + .2byte MOVE_DRAGON_RAGE + .2byte MOVE_DRAGON_BREATH + .2byte MOVE_DRAGON_DANCE + .2byte MOVE_ICE_PUNCH + .2byte MOVE_ICE_BEAM + .2byte MOVE_FURY_CUTTER + .2byte MOVE_COMET_PUNCH + .2byte MOVE_SKULL_BASH + .2byte MOVE_LOCK_ON + .2byte MOVE_ROCK_BLAST + .2byte MOVE_COTTON_SPORE + .2byte MOVE_STRUGGLE diff --git a/data/text/easy_chat/groups/move_2/words.s b/data/text/easy_chat/groups/move_2/words.s deleted file mode 100644 index cd31397d0..000000000 --- a/data/text/easy_chat/groups/move_2/words.s +++ /dev/null @@ -1,197 +0,0 @@ - .align 1 - -gEasyChatGroupWords_Move2: @ 83DDC6E - .2byte MOVE_TACKLE - .2byte MOVE_EXPLOSION - .2byte MOVE_DIVE - .2byte MOVE_FIRE_BLAST - .2byte MOVE_WATERFALL - .2byte MOVE_MUDDY_WATER - .2byte MOVE_STOCKPILE - .2byte MOVE_SLAM - .2byte MOVE_TWISTER - .2byte MOVE_BULLET_SEED - .2byte MOVE_TWINEEDLE - .2byte MOVE_SOFT_BOILED - .2byte MOVE_EGG_BOMB - .2byte MOVE_FAINT_ATTACK - .2byte MOVE_BARRAGE - .2byte MOVE_MINIMIZE - .2byte MOVE_SEISMIC_TOSS - .2byte MOVE_SUPERSONIC - .2byte MOVE_TAUNT - .2byte MOVE_MOONLIGHT - .2byte MOVE_PECK - .2byte MOVE_ARM_THRUST - .2byte MOVE_HORN_ATTACK - .2byte MOVE_HORN_DRILL - .2byte MOVE_WING_ATTACK - .2byte MOVE_AERIAL_ACE - .2byte MOVE_SWORDS_DANCE - .2byte MOVE_VINE_WHIP - .2byte MOVE_CONVERSION - .2byte MOVE_CONVERSION_2 - .2byte MOVE_HELPING_HAND - .2byte MOVE_IRON_DEFENSE - .2byte MOVE_TELEPORT - .2byte MOVE_THUNDER_SHOCK - .2byte MOVE_SHOCK_WAVE - .2byte MOVE_QUICK_ATTACK - .2byte MOVE_SWEET_KISS - .2byte MOVE_THUNDER_WAVE - .2byte MOVE_ZAP_CANNON - .2byte MOVE_BLOCK - .2byte MOVE_HOWL - .2byte MOVE_POISON_GAS - .2byte MOVE_TOXIC - .2byte MOVE_POISON_FANG - .2byte MOVE_POISON_POWDER - .2byte MOVE_POISON_STING - .2byte MOVE_SPIKE_CANNON - .2byte MOVE_ACID_ARMOR - .2byte MOVE_TAKE_DOWN - .2byte MOVE_JUMP_KICK - .2byte MOVE_BOUNCE - .2byte MOVE_HI_JUMP_KICK - .2byte MOVE_TRI_ATTACK - .2byte MOVE_DRAGON_CLAW - .2byte MOVE_TRICK - .2byte MOVE_TRIPLE_KICK - .2byte MOVE_DRILL_PECK - .2byte MOVE_MUD_SPORT - .2byte MOVE_MUD_SLAP - .2byte MOVE_THIEF - .2byte MOVE_AMNESIA - .2byte MOVE_NIGHT_SHADE - .2byte MOVE_GROWL - .2byte MOVE_SLACK_OFF - .2byte MOVE_SURF - .2byte MOVE_ROLE_PLAY - .2byte MOVE_NEEDLE_ARM - .2byte MOVE_DOUBLE_KICK - .2byte MOVE_SUNNY_DAY - .2byte MOVE_LEER - .2byte MOVE_WISH - .2byte MOVE_FAKE_OUT - .2byte MOVE_SLEEP_TALK - .2byte MOVE_PAY_DAY - .2byte MOVE_ASSIST - .2byte MOVE_HEAT_WAVE - .2byte MOVE_SLEEP_POWDER - .2byte MOVE_REST - .2byte MOVE_INGRAIN - .2byte MOVE_CONFUSION - .2byte MOVE_BODY_SLAM - .2byte MOVE_SWALLOW - .2byte MOVE_CURSE - .2byte MOVE_HYDRO_PUMP - .2byte MOVE_HYPER_VOICE - .2byte MOVE_HYPER_BEAM - .2byte MOVE_SUPERPOWER - .2byte MOVE_STEEL_WING - .2byte MOVE_SPIT_UP - .2byte MOVE_DYNAMIC_PUNCH - .2byte MOVE_GUILLOTINE - .2byte MOVE_VICE_GRIP - .2byte MOVE_KNOCK_OFF - .2byte MOVE_POUND - .2byte MOVE_RAZOR_LEAF - .2byte MOVE_BATON_PASS - .2byte MOVE_PETAL_DANCE - .2byte MOVE_SPLASH - .2byte MOVE_BUBBLE_BEAM - .2byte MOVE_BELLY_DRUM - .2byte MOVE_BARRIER - .2byte MOVE_LIGHT_SCREEN - .2byte MOVE_SCRATCH - .2byte MOVE_HYPER_FANG - .2byte MOVE_EMBER - .2byte MOVE_SECRET_POWER - .2byte MOVE_DIZZY_PUNCH - .2byte MOVE_BULK_UP - .2byte MOVE_IMPRISON - .2byte MOVE_FEATHER_DANCE - .2byte MOVE_WHIRLWIND - .2byte MOVE_BEAT_UP - .2byte MOVE_BLIZZARD - .2byte MOVE_STOMP - .2byte MOVE_FLASH - .2byte MOVE_TEETER_DANCE - .2byte MOVE_CRUSH_CLAW - .2byte MOVE_BLAZE_KICK - .2byte MOVE_PRESENT - .2byte MOVE_ERUPTION - .2byte MOVE_SLUDGE - .2byte MOVE_SLUDGE_BOMB - .2byte MOVE_GLARE - .2byte MOVE_TRANSFORM - .2byte MOVE_POISON_TAIL - .2byte MOVE_ROAR - .2byte MOVE_BONE_RUSH - .2byte MOVE_CAMOUFLAGE - .2byte MOVE_COVET - .2byte MOVE_TAIL_GLOW - .2byte MOVE_BONE_CLUB - .2byte MOVE_BONEMERANG - .2byte MOVE_FIRE_SPIN - .2byte MOVE_FIRE_PUNCH - .2byte MOVE_PERISH_SONG - .2byte MOVE_WRAP - .2byte MOVE_SPIKES - .2byte MOVE_MAGNITUDE - .2byte MOVE_MAGICAL_LEAF - .2byte MOVE_MAGIC_COAT - .2byte MOVE_MUD_SHOT - .2byte MOVE_MACH_PUNCH - .2byte MOVE_PROTECT - .2byte MOVE_DEFENSE_CURL - .2byte MOVE_ROLLING_KICK - .2byte MOVE_SUBSTITUTE - .2byte MOVE_DETECT - .2byte MOVE_PIN_MISSILE - .2byte MOVE_WATER_SPORT - .2byte MOVE_WATER_GUN - .2byte MOVE_MIST_BALL - .2byte MOVE_WATER_PULSE - .2byte MOVE_FURY_ATTACK - .2byte MOVE_FURY_SWIPES - .2byte MOVE_DESTINY_BOND - .2byte MOVE_FALSE_SWIPE - .2byte MOVE_FORESIGHT - .2byte MOVE_MIRROR_COAT - .2byte MOVE_FUTURE_SIGHT - .2byte MOVE_MILK_DRINK - .2byte MOVE_CALM_MIND - .2byte MOVE_MEGA_DRAIN - .2byte MOVE_MEGA_KICK - .2byte MOVE_MEGA_PUNCH - .2byte MOVE_MEGAHORN - .2byte MOVE_HIDDEN_POWER - .2byte MOVE_METAL_CLAW - .2byte MOVE_ATTRACT - .2byte MOVE_MIMIC - .2byte MOVE_FRUSTRATION - .2byte MOVE_LEECH_SEED - .2byte MOVE_METRONOME - .2byte MOVE_DREAM_EATER - .2byte MOVE_ACID - .2byte MOVE_MEDITATE - .2byte MOVE_SNATCH - .2byte MOVE_LUSTER_PURGE - .2byte MOVE_LEAF_BLADE - .2byte MOVE_RECYCLE - .2byte MOVE_REFLECT - .2byte MOVE_REFRESH - .2byte MOVE_REVENGE - .2byte MOVE_DRAGON_RAGE - .2byte MOVE_DRAGON_BREATH - .2byte MOVE_DRAGON_DANCE - .2byte MOVE_ICE_PUNCH - .2byte MOVE_ICE_BEAM - .2byte MOVE_FURY_CUTTER - .2byte MOVE_COMET_PUNCH - .2byte MOVE_SKULL_BASH - .2byte MOVE_LOCK_ON - .2byte MOVE_ROCK_BLAST - .2byte MOVE_COTTON_SPORE - .2byte MOVE_STRUGGLE diff --git a/data/text/easy_chat/groups/people/order.inc b/data/text/easy_chat/groups/people/order.inc new file mode 100644 index 000000000..6144d7ba3 --- /dev/null +++ b/data/text/easy_chat/groups/people/order.inc @@ -0,0 +1,78 @@ + .align 1 + +gEasyChatGroupOrder_People: @ 83DF376 + .2byte 13 + .2byte 52 + .2byte 31 + .2byte 17 + .2byte 22 + .2byte 62 + .2byte 12 + .2byte 14 + .2byte 34 + .2byte 28 + .2byte 54 + .2byte 23 + .2byte 11 + .2byte 51 + .2byte 21 + .2byte 9 + .2byte 16 + .2byte 26 + .2byte 30 + .2byte 24 + .2byte 72 + .2byte 25 + .2byte 29 + .2byte 1 + .2byte 41 + .2byte 38 + .2byte 42 + .2byte 49 + .2byte 33 + .2byte 50 + .2byte 19 + .2byte 20 + .2byte 8 + .2byte 35 + .2byte 36 + .2byte 40 + .2byte 37 + .2byte 0 + .2byte 64 + .2byte 18 + .2byte 53 + .2byte 27 + .2byte 66 + .2byte 69 + .2byte 73 + .2byte 70 + .2byte 32 + .2byte 15 + .2byte 74 + .2byte 44 + .2byte 4 + .2byte 58 + .2byte 55 + .2byte 56 + .2byte 59 + .2byte 60 + .2byte 71 + .2byte 39 + .2byte 57 + .2byte 63 + .2byte 46 + .2byte 10 + .2byte 61 + .2byte 65 + .2byte 67 + .2byte 43 + .2byte 48 + .2byte 45 + .2byte 47 + .2byte 68 + .2byte 2 + .2byte 6 + .2byte 7 + .2byte 5 + .2byte 3 diff --git a/data/text/easy_chat/groups/people/order.s b/data/text/easy_chat/groups/people/order.s deleted file mode 100644 index 6144d7ba3..000000000 --- a/data/text/easy_chat/groups/people/order.s +++ /dev/null @@ -1,78 +0,0 @@ - .align 1 - -gEasyChatGroupOrder_People: @ 83DF376 - .2byte 13 - .2byte 52 - .2byte 31 - .2byte 17 - .2byte 22 - .2byte 62 - .2byte 12 - .2byte 14 - .2byte 34 - .2byte 28 - .2byte 54 - .2byte 23 - .2byte 11 - .2byte 51 - .2byte 21 - .2byte 9 - .2byte 16 - .2byte 26 - .2byte 30 - .2byte 24 - .2byte 72 - .2byte 25 - .2byte 29 - .2byte 1 - .2byte 41 - .2byte 38 - .2byte 42 - .2byte 49 - .2byte 33 - .2byte 50 - .2byte 19 - .2byte 20 - .2byte 8 - .2byte 35 - .2byte 36 - .2byte 40 - .2byte 37 - .2byte 0 - .2byte 64 - .2byte 18 - .2byte 53 - .2byte 27 - .2byte 66 - .2byte 69 - .2byte 73 - .2byte 70 - .2byte 32 - .2byte 15 - .2byte 74 - .2byte 44 - .2byte 4 - .2byte 58 - .2byte 55 - .2byte 56 - .2byte 59 - .2byte 60 - .2byte 71 - .2byte 39 - .2byte 57 - .2byte 63 - .2byte 46 - .2byte 10 - .2byte 61 - .2byte 65 - .2byte 67 - .2byte 43 - .2byte 48 - .2byte 45 - .2byte 47 - .2byte 68 - .2byte 2 - .2byte 6 - .2byte 7 - .2byte 5 - .2byte 3 diff --git a/data/text/easy_chat/groups/people/words.inc b/data/text/easy_chat/groups/people/words.inc new file mode 100644 index 000000000..89f370251 --- /dev/null +++ b/data/text/easy_chat/groups/people/words.inc @@ -0,0 +1,77 @@ +gEasyChatGroupWords_People: @ 83DC85A + .string "OPPONENT$" + .string "I$" + .string "YOU$" + .string "YOURS$" + .string "SON$" + .string "YOUR$" + .string "YOU’RE$" + .string "YOU’VE$" + .string "MOTHER$" + .string "GRANDFATHER$" + .string "UNCLE$" + .string "FATHER$" + .string "BOY$" + .string "ADULT$" + .string "BROTHER$" + .string "SISTER$" + .string "GRANDMOTHER$" + .string "AUNT$" + .string "PARENT$" + .string "MAN$" + .string "ME$" + .string "GIRL$" + .string "BABE$" + .string "FAMILY$" + .string "HER$" + .string "HIM$" + .string "HE$" + .string "PLACE$" + .string "DAUGHTER$" + .string "HIS$" + .string "HE’S$" + .string "AREN’T$" + .string "SIBLINGS$" + .string "KID$" + .string "CHILDREN$" + .string "MR.$" + .string "MRS.$" + .string "MYSELF$" + .string "I WAS$" + .string "TO ME$" + .string "MY$" + .string "I AM$" + .string "I’VE$" + .string "WHO$" + .string "SOMEONE$" + .string "WHO WAS$" + .string "TO WHOM$" + .string "WHOSE$" + .string "WHO IS$" + .string "IT’S$" + .string "LADY$" + .string "FRIEND$" + .string "ALLY$" + .string "PERSON$" + .string "DUDE$" + .string "THEY$" + .string "THEY WERE$" + .string "TO THEM$" + .string "THEIR$" + .string "THEY’RE$" + .string "THEY’VE$" + .string "WE$" + .string "BEEN$" + .string "TO US$" + .string "OUR$" + .string "WE’RE$" + .string "RIVAL$" + .string "WE’VE$" + .string "WOMAN$" + .string "SHE$" + .string "SHE WAS$" + .string "TO HER$" + .string "HER’S$" + .string "SHE IS$" + .string "SOME$" + .string "$" diff --git a/data/text/easy_chat/groups/people/words.s b/data/text/easy_chat/groups/people/words.s deleted file mode 100644 index 89f370251..000000000 --- a/data/text/easy_chat/groups/people/words.s +++ /dev/null @@ -1,77 +0,0 @@ -gEasyChatGroupWords_People: @ 83DC85A - .string "OPPONENT$" - .string "I$" - .string "YOU$" - .string "YOURS$" - .string "SON$" - .string "YOUR$" - .string "YOU’RE$" - .string "YOU’VE$" - .string "MOTHER$" - .string "GRANDFATHER$" - .string "UNCLE$" - .string "FATHER$" - .string "BOY$" - .string "ADULT$" - .string "BROTHER$" - .string "SISTER$" - .string "GRANDMOTHER$" - .string "AUNT$" - .string "PARENT$" - .string "MAN$" - .string "ME$" - .string "GIRL$" - .string "BABE$" - .string "FAMILY$" - .string "HER$" - .string "HIM$" - .string "HE$" - .string "PLACE$" - .string "DAUGHTER$" - .string "HIS$" - .string "HE’S$" - .string "AREN’T$" - .string "SIBLINGS$" - .string "KID$" - .string "CHILDREN$" - .string "MR.$" - .string "MRS.$" - .string "MYSELF$" - .string "I WAS$" - .string "TO ME$" - .string "MY$" - .string "I AM$" - .string "I’VE$" - .string "WHO$" - .string "SOMEONE$" - .string "WHO WAS$" - .string "TO WHOM$" - .string "WHOSE$" - .string "WHO IS$" - .string "IT’S$" - .string "LADY$" - .string "FRIEND$" - .string "ALLY$" - .string "PERSON$" - .string "DUDE$" - .string "THEY$" - .string "THEY WERE$" - .string "TO THEM$" - .string "THEIR$" - .string "THEY’RE$" - .string "THEY’VE$" - .string "WE$" - .string "BEEN$" - .string "TO US$" - .string "OUR$" - .string "WE’RE$" - .string "RIVAL$" - .string "WE’VE$" - .string "WOMAN$" - .string "SHE$" - .string "SHE WAS$" - .string "TO HER$" - .string "HER’S$" - .string "SHE IS$" - .string "SOME$" - .string "$" diff --git a/data/text/easy_chat/groups/pokemon/order.inc b/data/text/easy_chat/groups/pokemon/order.inc new file mode 100644 index 000000000..b39d5bd28 --- /dev/null +++ b/data/text/easy_chat/groups/pokemon/order.inc @@ -0,0 +1,205 @@ + .align 1 + +gEasyChatGroupOrder_Pokemon: @ 83DF010 + .2byte 63 + .2byte 376 + .2byte 384 + .2byte 65 + .2byte 359 + .2byte 390 + .2byte 391 + .2byte 382 + .2byte 184 + .2byte 350 + .2byte 395 + .2byte 318 + .2byte 378 + .2byte 323 + .2byte 292 + .2byte 398 + .2byte 182 + .2byte 282 + .2byte 307 + .2byte 344 + .2byte 345 + .2byte 340 + .2byte 330 + .2byte 293 + .2byte 385 + .2byte 411 + .2byte 170 + .2byte 373 + .2byte 319 + .2byte 281 + .2byte 326 + .2byte 222 + .2byte 389 + .2byte 327 + .2byte 169 + .2byte 316 + .2byte 410 + .2byte 85 + .2byte 84 + .2byte 232 + .2byte 362 + .2byte 361 + .2byte 294 + .2byte 337 + .2byte 101 + .2byte 372 + .2byte 328 + .2byte 334 + .2byte 394 + .2byte 74 + .2byte 203 + .2byte 347 + .2byte 44 + .2byte 42 + .2byte 118 + .2byte 55 + .2byte 76 + .2byte 375 + .2byte 75 + .2byte 88 + .2byte 405 + .2byte 278 + .2byte 352 + .2byte 367 + .2byte 130 + .2byte 336 + .2byte 214 + .2byte 116 + .2byte 374 + .2byte 174 + .2byte 387 + .2byte 39 + .2byte 409 + .2byte 64 + .2byte 317 + .2byte 230 + .2byte 393 + .2byte 109 + .2byte 404 + .2byte 383 + .2byte 171 + .2byte 407 + .2byte 408 + .2byte 388 + .2byte 289 + .2byte 296 + .2byte 295 + .2byte 371 + .2byte 297 + .2byte 348 + .2byte 325 + .2byte 68 + .2byte 67 + .2byte 66 + .2byte 219 + .2byte 129 + .2byte 81 + .2byte 82 + .2byte 335 + .2byte 338 + .2byte 183 + .2byte 284 + .2byte 312 + .2byte 355 + .2byte 357 + .2byte 356 + .2byte 400 + .2byte 399 + .2byte 287 + .2byte 329 + .2byte 354 + .2byte 283 + .2byte 89 + .2byte 177 + .2byte 301 + .2byte 38 + .2byte 302 + .2byte 320 + .2byte 339 + .2byte 299 + .2byte 43 + .2byte 310 + .2byte 231 + .2byte 172 + .2byte 25 + .2byte 127 + .2byte 353 + .2byte 286 + .2byte 54 + .2byte 26 + .2byte 392 + .2byte 406 + .2byte 402 + .2byte 401 + .2byte 403 + .2byte 381 + .2byte 112 + .2byte 111 + .2byte 363 + .2byte 322 + .2byte 397 + .2byte 27 + .2byte 28 + .2byte 279 + .2byte 117 + .2byte 119 + .2byte 342 + .2byte 298 + .2byte 379 + .2byte 331 + .2byte 303 + .2byte 396 + .2byte 300 + .2byte 306 + .2byte 377 + .2byte 291 + .2byte 227 + .2byte 315 + .2byte 366 + .2byte 364 + .2byte 218 + .2byte 346 + .2byte 349 + .2byte 341 + .2byte 308 + .2byte 351 + .2byte 121 + .2byte 120 + .2byte 311 + .2byte 358 + .2byte 368 + .2byte 285 + .2byte 305 + .2byte 304 + .2byte 72 + .2byte 73 + .2byte 280 + .2byte 321 + .2byte 332 + .2byte 277 + .2byte 369 + .2byte 333 + .2byte 365 + .2byte 45 + .2byte 386 + .2byte 100 + .2byte 37 + .2byte 313 + .2byte 314 + .2byte 343 + .2byte 110 + .2byte 324 + .2byte 370 + .2byte 40 + .2byte 309 + .2byte 202 + .2byte 290 + .2byte 360 + .2byte 178 + .2byte 380 + .2byte 288 + .2byte 41 diff --git a/data/text/easy_chat/groups/pokemon/order.s b/data/text/easy_chat/groups/pokemon/order.s deleted file mode 100644 index b39d5bd28..000000000 --- a/data/text/easy_chat/groups/pokemon/order.s +++ /dev/null @@ -1,205 +0,0 @@ - .align 1 - -gEasyChatGroupOrder_Pokemon: @ 83DF010 - .2byte 63 - .2byte 376 - .2byte 384 - .2byte 65 - .2byte 359 - .2byte 390 - .2byte 391 - .2byte 382 - .2byte 184 - .2byte 350 - .2byte 395 - .2byte 318 - .2byte 378 - .2byte 323 - .2byte 292 - .2byte 398 - .2byte 182 - .2byte 282 - .2byte 307 - .2byte 344 - .2byte 345 - .2byte 340 - .2byte 330 - .2byte 293 - .2byte 385 - .2byte 411 - .2byte 170 - .2byte 373 - .2byte 319 - .2byte 281 - .2byte 326 - .2byte 222 - .2byte 389 - .2byte 327 - .2byte 169 - .2byte 316 - .2byte 410 - .2byte 85 - .2byte 84 - .2byte 232 - .2byte 362 - .2byte 361 - .2byte 294 - .2byte 337 - .2byte 101 - .2byte 372 - .2byte 328 - .2byte 334 - .2byte 394 - .2byte 74 - .2byte 203 - .2byte 347 - .2byte 44 - .2byte 42 - .2byte 118 - .2byte 55 - .2byte 76 - .2byte 375 - .2byte 75 - .2byte 88 - .2byte 405 - .2byte 278 - .2byte 352 - .2byte 367 - .2byte 130 - .2byte 336 - .2byte 214 - .2byte 116 - .2byte 374 - .2byte 174 - .2byte 387 - .2byte 39 - .2byte 409 - .2byte 64 - .2byte 317 - .2byte 230 - .2byte 393 - .2byte 109 - .2byte 404 - .2byte 383 - .2byte 171 - .2byte 407 - .2byte 408 - .2byte 388 - .2byte 289 - .2byte 296 - .2byte 295 - .2byte 371 - .2byte 297 - .2byte 348 - .2byte 325 - .2byte 68 - .2byte 67 - .2byte 66 - .2byte 219 - .2byte 129 - .2byte 81 - .2byte 82 - .2byte 335 - .2byte 338 - .2byte 183 - .2byte 284 - .2byte 312 - .2byte 355 - .2byte 357 - .2byte 356 - .2byte 400 - .2byte 399 - .2byte 287 - .2byte 329 - .2byte 354 - .2byte 283 - .2byte 89 - .2byte 177 - .2byte 301 - .2byte 38 - .2byte 302 - .2byte 320 - .2byte 339 - .2byte 299 - .2byte 43 - .2byte 310 - .2byte 231 - .2byte 172 - .2byte 25 - .2byte 127 - .2byte 353 - .2byte 286 - .2byte 54 - .2byte 26 - .2byte 392 - .2byte 406 - .2byte 402 - .2byte 401 - .2byte 403 - .2byte 381 - .2byte 112 - .2byte 111 - .2byte 363 - .2byte 322 - .2byte 397 - .2byte 27 - .2byte 28 - .2byte 279 - .2byte 117 - .2byte 119 - .2byte 342 - .2byte 298 - .2byte 379 - .2byte 331 - .2byte 303 - .2byte 396 - .2byte 300 - .2byte 306 - .2byte 377 - .2byte 291 - .2byte 227 - .2byte 315 - .2byte 366 - .2byte 364 - .2byte 218 - .2byte 346 - .2byte 349 - .2byte 341 - .2byte 308 - .2byte 351 - .2byte 121 - .2byte 120 - .2byte 311 - .2byte 358 - .2byte 368 - .2byte 285 - .2byte 305 - .2byte 304 - .2byte 72 - .2byte 73 - .2byte 280 - .2byte 321 - .2byte 332 - .2byte 277 - .2byte 369 - .2byte 333 - .2byte 365 - .2byte 45 - .2byte 386 - .2byte 100 - .2byte 37 - .2byte 313 - .2byte 314 - .2byte 343 - .2byte 110 - .2byte 324 - .2byte 370 - .2byte 40 - .2byte 309 - .2byte 202 - .2byte 290 - .2byte 360 - .2byte 178 - .2byte 380 - .2byte 288 - .2byte 41 diff --git a/data/text/easy_chat/groups/pokemon/words.inc b/data/text/easy_chat/groups/pokemon/words.inc new file mode 100644 index 000000000..a157e2364 --- /dev/null +++ b/data/text/easy_chat/groups/pokemon/words.inc @@ -0,0 +1,205 @@ + .align 1 + +gEasyChatGroupWords_Pokemon: @ 83DBF2C + .2byte SPECIES_ARMALDO + .2byte SPECIES_BEAUTIFLY + .2byte SPECIES_MEDITITE + .2byte SPECIES_SEAKING + .2byte SPECIES_TORCHIC + .2byte SPECIES_ANORITH + .2byte SPECIES_ABSOL + .2byte SPECIES_SURSKIT + .2byte SPECIES_MASQUERAIN + .2byte SPECIES_GEODUDE + .2byte SPECIES_ILLUMISE + .2byte SPECIES_SKARMORY + .2byte SPECIES_SKITTY + .2byte SPECIES_DELCATTY + .2byte SPECIES_SWELLOW + .2byte SPECIES_GLALIE + .2byte SPECIES_KYOGRE + .2byte SPECIES_MACHAMP + .2byte SPECIES_PINSIR + .2byte SPECIES_KECLEON + .2byte SPECIES_SHUPPET + .2byte SPECIES_SILCOON + .2byte SPECIES_BRELOOM + .2byte SPECIES_SHROOMISH + .2byte SPECIES_CARVANHA + .2byte SPECIES_TREECKO + .2byte SPECIES_WINGULL + .2byte SPECIES_GYARADOS + .2byte SPECIES_NINETALES + .2byte SPECIES_GIRAFARIG + .2byte SPECIES_KIRLIA + .2byte SPECIES_BELLOSSOM + .2byte SPECIES_KINGDRA + .2byte SPECIES_GLOOM + .2byte SPECIES_MAWILE + .2byte SPECIES_GROUDON + .2byte SPECIES_MIGHTYENA + .2byte SPECIES_CROBAT + .2byte SPECIES_ABRA + .2byte SPECIES_SLAKING + .2byte SPECIES_WURMPLE + .2byte SPECIES_MAGIKARP + .2byte SPECIES_MAGNEMITE + .2byte SPECIES_TORKOAL + .2byte SPECIES_MACHOKE + .2byte SPECIES_GULPIN + .2byte SPECIES_ARON + .2byte SPECIES_PSYDUCK + .2byte SPECIES_LAIRON + .2byte SPECIES_WHISMUR + .2byte SPECIES_NUZLEAF + .2byte SPECIES_PHANPY + .2byte SPECIES_SHELGON + .2byte SPECIES_GOLDUCK + .2byte SPECIES_GOLBAT + .2byte SPECIES_GOLEM + .2byte SPECIES_GRAVELER + .2byte SPECIES_GARDEVOIR + .2byte SPECIES_RHYDON + .2byte SPECIES_RHYHORN + .2byte SPECIES_GOREBYSS + .2byte SPECIES_CORSOLA + .2byte SPECIES_CACNEA + .2byte SPECIES_DUSCLOPS + .2byte SPECIES_SHARPEDO + .2byte SPECIES_ZANGOOSE + .2byte SPECIES_SANDSHREW + .2byte SPECIES_SANDSLASH + .2byte SPECIES_SEADRA + .2byte SPECIES_RELICANTH + .2byte SPECIES_ZIGZAGOON + .2byte SPECIES_CRAWDAUNT + .2byte SPECIES_SCEPTILE + .2byte SPECIES_GROVYLE + .2byte SPECIES_BANETTE + .2byte SPECIES_JIRACHI + .2byte SPECIES_STARMIE + .2byte SPECIES_ZUBAT + .2byte SPECIES_TAILLOW + .2byte SPECIES_WYNAUT + .2byte SPECIES_WOBBUFFET + .2byte SPECIES_SOLROCK + .2byte SPECIES_SHIFTRY + .2byte SPECIES_HORSEA + .2byte SPECIES_BAGON + .2byte SPECIES_SEEDOT + .2byte SPECIES_SPHEAL + .2byte SPECIES_BELDUM + .2byte SPECIES_MEDICHAM + .2byte SPECIES_CHINCHOU + .2byte SPECIES_CHIMECHO + .2byte SPECIES_ALTARIA + .2byte SPECIES_SWABLU + .2byte SPECIES_NINCADA + .2byte SPECIES_DEOXYS + .2byte SPECIES_NINJASK + .2byte SPECIES_DODUO + .2byte SPECIES_DODRIO + .2byte SPECIES_KOFFING + .2byte SPECIES_TENTACRUEL + .2byte SPECIES_DUSTOX + .2byte SPECIES_LOUDRED + .2byte SPECIES_GOLDEEN + .2byte SPECIES_BARBOACH + .2byte SPECIES_SEALEO + .2byte SPECIES_WALREIN + .2byte SPECIES_TROPIUS + .2byte SPECIES_DONPHAN + .2byte SPECIES_NUMEL + .2byte SPECIES_ODDISH + .2byte SPECIES_TRAPINCH + .2byte SPECIES_SLAKOTH + .2byte SPECIES_WHISCASH + .2byte SPECIES_SHEDINJA + .2byte SPECIES_MARSHTOMP + .2byte SPECIES_NATU + .2byte SPECIES_XATU + .2byte SPECIES_CLAYDOL + .2byte SPECIES_CACTURNE + .2byte SPECIES_NOSEPASS + .2byte SPECIES_CLAMPERL + .2byte SPECIES_CAMERUPT + .2byte SPECIES_EXPLOUD + .2byte SPECIES_BLAZIKEN + .2byte SPECIES_LOMBRE + .2byte SPECIES_LOTAD + .2byte SPECIES_SPINDA + .2byte SPECIES_SPOINK + .2byte SPECIES_SEVIPER + .2byte SPECIES_HARIYAMA + .2byte SPECIES_VOLBEAT + .2byte SPECIES_HUNTAIL + .2byte SPECIES_PIKACHU + .2byte SPECIES_PICHU + .2byte SPECIES_STARYU + .2byte SPECIES_VIBRAVA + .2byte SPECIES_VOLTORB + .2byte SPECIES_FEEBAS + .2byte SPECIES_ALAKAZAM + .2byte SPECIES_GRUMPIG + .2byte SPECIES_WIGGLYTUFF + .2byte SPECIES_IGGLYBUFF + .2byte SPECIES_FLYGON + .2byte SPECIES_PLUSLE + .2byte SPECIES_JIGGLYPUFF + .2byte SPECIES_CORPHISH + .2byte SPECIES_GRIMER + .2byte SPECIES_MUK + .2byte SPECIES_HERACROSS + .2byte SPECIES_PELIPPER + .2byte SPECIES_WAILORD + .2byte SPECIES_WAILMER + .2byte SPECIES_SALAMENCE + .2byte SPECIES_AGGRON + .2byte SPECIES_POOCHYENA + .2byte SPECIES_CASTFORM + .2byte SPECIES_MINUN + .2byte SPECIES_MAGCARGO + .2byte SPECIES_MAKUHITA + .2byte SPECIES_SLUGMA + .2byte SPECIES_WEEZING + .2byte SPECIES_LINOONE + .2byte SPECIES_CASCOON + .2byte SPECIES_MARILL + .2byte SPECIES_AZUMARILL + .2byte SPECIES_SWALOT + .2byte SPECIES_ELECTRODE + .2byte SPECIES_MUDKIP + .2byte SPECIES_MILOTIC + .2byte SPECIES_METAGROSS + .2byte SPECIES_METANG + .2byte SPECIES_TENTACOOL + .2byte SPECIES_BALTOY + .2byte SPECIES_SABLEYE + .2byte SPECIES_VIGOROTH + .2byte SPECIES_SNORUNT + .2byte SPECIES_CRADILY + .2byte SPECIES_KADABRA + .2byte SPECIES_DUSKULL + .2byte SPECIES_RAICHU + .2byte SPECIES_MANECTRIC + .2byte SPECIES_SWAMPERT + .2byte SPECIES_ELECTRIKE + .2byte SPECIES_LATIAS + .2byte SPECIES_LATIOS + .2byte SPECIES_LUVDISC + .2byte SPECIES_VILEPLUME + .2byte SPECIES_RALTS + .2byte SPECIES_LANTURN + .2byte SPECIES_LILEEP + .2byte SPECIES_LUNATONE + .2byte SPECIES_AZURILL + .2byte SPECIES_LUDICOLO + .2byte SPECIES_MAGNETON + .2byte SPECIES_REGICE + .2byte SPECIES_REGISTEEL + .2byte SPECIES_REGIROCK + .2byte SPECIES_RAYQUAZA + .2byte SPECIES_VULPIX + .2byte SPECIES_ROSELIA + .2byte SPECIES_COMBUSKEN + .2byte SPECIES_MACHOP diff --git a/data/text/easy_chat/groups/pokemon/words.s b/data/text/easy_chat/groups/pokemon/words.s deleted file mode 100644 index a157e2364..000000000 --- a/data/text/easy_chat/groups/pokemon/words.s +++ /dev/null @@ -1,205 +0,0 @@ - .align 1 - -gEasyChatGroupWords_Pokemon: @ 83DBF2C - .2byte SPECIES_ARMALDO - .2byte SPECIES_BEAUTIFLY - .2byte SPECIES_MEDITITE - .2byte SPECIES_SEAKING - .2byte SPECIES_TORCHIC - .2byte SPECIES_ANORITH - .2byte SPECIES_ABSOL - .2byte SPECIES_SURSKIT - .2byte SPECIES_MASQUERAIN - .2byte SPECIES_GEODUDE - .2byte SPECIES_ILLUMISE - .2byte SPECIES_SKARMORY - .2byte SPECIES_SKITTY - .2byte SPECIES_DELCATTY - .2byte SPECIES_SWELLOW - .2byte SPECIES_GLALIE - .2byte SPECIES_KYOGRE - .2byte SPECIES_MACHAMP - .2byte SPECIES_PINSIR - .2byte SPECIES_KECLEON - .2byte SPECIES_SHUPPET - .2byte SPECIES_SILCOON - .2byte SPECIES_BRELOOM - .2byte SPECIES_SHROOMISH - .2byte SPECIES_CARVANHA - .2byte SPECIES_TREECKO - .2byte SPECIES_WINGULL - .2byte SPECIES_GYARADOS - .2byte SPECIES_NINETALES - .2byte SPECIES_GIRAFARIG - .2byte SPECIES_KIRLIA - .2byte SPECIES_BELLOSSOM - .2byte SPECIES_KINGDRA - .2byte SPECIES_GLOOM - .2byte SPECIES_MAWILE - .2byte SPECIES_GROUDON - .2byte SPECIES_MIGHTYENA - .2byte SPECIES_CROBAT - .2byte SPECIES_ABRA - .2byte SPECIES_SLAKING - .2byte SPECIES_WURMPLE - .2byte SPECIES_MAGIKARP - .2byte SPECIES_MAGNEMITE - .2byte SPECIES_TORKOAL - .2byte SPECIES_MACHOKE - .2byte SPECIES_GULPIN - .2byte SPECIES_ARON - .2byte SPECIES_PSYDUCK - .2byte SPECIES_LAIRON - .2byte SPECIES_WHISMUR - .2byte SPECIES_NUZLEAF - .2byte SPECIES_PHANPY - .2byte SPECIES_SHELGON - .2byte SPECIES_GOLDUCK - .2byte SPECIES_GOLBAT - .2byte SPECIES_GOLEM - .2byte SPECIES_GRAVELER - .2byte SPECIES_GARDEVOIR - .2byte SPECIES_RHYDON - .2byte SPECIES_RHYHORN - .2byte SPECIES_GOREBYSS - .2byte SPECIES_CORSOLA - .2byte SPECIES_CACNEA - .2byte SPECIES_DUSCLOPS - .2byte SPECIES_SHARPEDO - .2byte SPECIES_ZANGOOSE - .2byte SPECIES_SANDSHREW - .2byte SPECIES_SANDSLASH - .2byte SPECIES_SEADRA - .2byte SPECIES_RELICANTH - .2byte SPECIES_ZIGZAGOON - .2byte SPECIES_CRAWDAUNT - .2byte SPECIES_SCEPTILE - .2byte SPECIES_GROVYLE - .2byte SPECIES_BANETTE - .2byte SPECIES_JIRACHI - .2byte SPECIES_STARMIE - .2byte SPECIES_ZUBAT - .2byte SPECIES_TAILLOW - .2byte SPECIES_WYNAUT - .2byte SPECIES_WOBBUFFET - .2byte SPECIES_SOLROCK - .2byte SPECIES_SHIFTRY - .2byte SPECIES_HORSEA - .2byte SPECIES_BAGON - .2byte SPECIES_SEEDOT - .2byte SPECIES_SPHEAL - .2byte SPECIES_BELDUM - .2byte SPECIES_MEDICHAM - .2byte SPECIES_CHINCHOU - .2byte SPECIES_CHIMECHO - .2byte SPECIES_ALTARIA - .2byte SPECIES_SWABLU - .2byte SPECIES_NINCADA - .2byte SPECIES_DEOXYS - .2byte SPECIES_NINJASK - .2byte SPECIES_DODUO - .2byte SPECIES_DODRIO - .2byte SPECIES_KOFFING - .2byte SPECIES_TENTACRUEL - .2byte SPECIES_DUSTOX - .2byte SPECIES_LOUDRED - .2byte SPECIES_GOLDEEN - .2byte SPECIES_BARBOACH - .2byte SPECIES_SEALEO - .2byte SPECIES_WALREIN - .2byte SPECIES_TROPIUS - .2byte SPECIES_DONPHAN - .2byte SPECIES_NUMEL - .2byte SPECIES_ODDISH - .2byte SPECIES_TRAPINCH - .2byte SPECIES_SLAKOTH - .2byte SPECIES_WHISCASH - .2byte SPECIES_SHEDINJA - .2byte SPECIES_MARSHTOMP - .2byte SPECIES_NATU - .2byte SPECIES_XATU - .2byte SPECIES_CLAYDOL - .2byte SPECIES_CACTURNE - .2byte SPECIES_NOSEPASS - .2byte SPECIES_CLAMPERL - .2byte SPECIES_CAMERUPT - .2byte SPECIES_EXPLOUD - .2byte SPECIES_BLAZIKEN - .2byte SPECIES_LOMBRE - .2byte SPECIES_LOTAD - .2byte SPECIES_SPINDA - .2byte SPECIES_SPOINK - .2byte SPECIES_SEVIPER - .2byte SPECIES_HARIYAMA - .2byte SPECIES_VOLBEAT - .2byte SPECIES_HUNTAIL - .2byte SPECIES_PIKACHU - .2byte SPECIES_PICHU - .2byte SPECIES_STARYU - .2byte SPECIES_VIBRAVA - .2byte SPECIES_VOLTORB - .2byte SPECIES_FEEBAS - .2byte SPECIES_ALAKAZAM - .2byte SPECIES_GRUMPIG - .2byte SPECIES_WIGGLYTUFF - .2byte SPECIES_IGGLYBUFF - .2byte SPECIES_FLYGON - .2byte SPECIES_PLUSLE - .2byte SPECIES_JIGGLYPUFF - .2byte SPECIES_CORPHISH - .2byte SPECIES_GRIMER - .2byte SPECIES_MUK - .2byte SPECIES_HERACROSS - .2byte SPECIES_PELIPPER - .2byte SPECIES_WAILORD - .2byte SPECIES_WAILMER - .2byte SPECIES_SALAMENCE - .2byte SPECIES_AGGRON - .2byte SPECIES_POOCHYENA - .2byte SPECIES_CASTFORM - .2byte SPECIES_MINUN - .2byte SPECIES_MAGCARGO - .2byte SPECIES_MAKUHITA - .2byte SPECIES_SLUGMA - .2byte SPECIES_WEEZING - .2byte SPECIES_LINOONE - .2byte SPECIES_CASCOON - .2byte SPECIES_MARILL - .2byte SPECIES_AZUMARILL - .2byte SPECIES_SWALOT - .2byte SPECIES_ELECTRODE - .2byte SPECIES_MUDKIP - .2byte SPECIES_MILOTIC - .2byte SPECIES_METAGROSS - .2byte SPECIES_METANG - .2byte SPECIES_TENTACOOL - .2byte SPECIES_BALTOY - .2byte SPECIES_SABLEYE - .2byte SPECIES_VIGOROTH - .2byte SPECIES_SNORUNT - .2byte SPECIES_CRADILY - .2byte SPECIES_KADABRA - .2byte SPECIES_DUSKULL - .2byte SPECIES_RAICHU - .2byte SPECIES_MANECTRIC - .2byte SPECIES_SWAMPERT - .2byte SPECIES_ELECTRIKE - .2byte SPECIES_LATIAS - .2byte SPECIES_LATIOS - .2byte SPECIES_LUVDISC - .2byte SPECIES_VILEPLUME - .2byte SPECIES_RALTS - .2byte SPECIES_LANTURN - .2byte SPECIES_LILEEP - .2byte SPECIES_LUNATONE - .2byte SPECIES_AZURILL - .2byte SPECIES_LUDICOLO - .2byte SPECIES_MAGNETON - .2byte SPECIES_REGICE - .2byte SPECIES_REGISTEEL - .2byte SPECIES_REGIROCK - .2byte SPECIES_RAYQUAZA - .2byte SPECIES_VULPIX - .2byte SPECIES_ROSELIA - .2byte SPECIES_COMBUSKEN - .2byte SPECIES_MACHOP diff --git a/data/text/easy_chat/groups/pokemon_2/order.inc b/data/text/easy_chat/groups/pokemon_2/order.inc new file mode 100644 index 000000000..219e7dfb0 --- /dev/null +++ b/data/text/easy_chat/groups/pokemon_2/order.inc @@ -0,0 +1,254 @@ + .align 1 + +gEasyChatGroupOrder_Pokemon2: @ 83DFC1C + .2byte 63 + .2byte 142 + .2byte 190 + .2byte 65 + .2byte 181 + .2byte 24 + .2byte 59 + .2byte 168 + .2byte 144 + .2byte 184 + .2byte 153 + .2byte 15 + .2byte 182 + .2byte 69 + .2byte 9 + .2byte 242 + .2byte 1 + .2byte 12 + .2byte 10 + .2byte 251 + .2byte 113 + .2byte 6 + .2byte 4 + .2byte 5 + .2byte 152 + .2byte 170 + .2byte 36 + .2byte 35 + .2byte 173 + .2byte 91 + .2byte 222 + .2byte 169 + .2byte 159 + .2byte 104 + .2byte 155 + .2byte 225 + .2byte 87 + .2byte 50 + .2byte 132 + .2byte 85 + .2byte 84 + .2byte 232 + .2byte 148 + .2byte 149 + .2byte 147 + .2byte 96 + .2byte 51 + .2byte 206 + .2byte 133 + .2byte 23 + .2byte 125 + .2byte 101 + .2byte 239 + .2byte 244 + .2byte 196 + .2byte 102 + .2byte 103 + .2byte 83 + .2byte 22 + .2byte 160 + .2byte 180 + .2byte 136 + .2byte 205 + .2byte 162 + .2byte 92 + .2byte 94 + .2byte 74 + .2byte 203 + .2byte 207 + .2byte 44 + .2byte 42 + .2byte 118 + .2byte 55 + .2byte 76 + .2byte 210 + .2byte 75 + .2byte 88 + .2byte 58 + .2byte 130 + .2byte 93 + .2byte 214 + .2byte 107 + .2byte 106 + .2byte 237 + .2byte 250 + .2byte 163 + .2byte 187 + .2byte 116 + .2byte 229 + .2byte 228 + .2byte 97 + .2byte 174 + .2byte 2 + .2byte 39 + .2byte 135 + .2byte 189 + .2byte 124 + .2byte 140 + .2byte 141 + .2byte 64 + .2byte 14 + .2byte 115 + .2byte 230 + .2byte 99 + .2byte 109 + .2byte 98 + .2byte 171 + .2byte 131 + .2byte 246 + .2byte 166 + .2byte 165 + .2byte 108 + .2byte 249 + .2byte 68 + .2byte 67 + .2byte 66 + .2byte 240 + .2byte 219 + .2byte 129 + .2byte 126 + .2byte 81 + .2byte 82 + .2byte 56 + .2byte 226 + .2byte 179 + .2byte 183 + .2byte 105 + .2byte 154 + .2byte 52 + .2byte 11 + .2byte 151 + .2byte 150 + .2byte 241 + .2byte 200 + .2byte 146 + .2byte 122 + .2byte 89 + .2byte 198 + .2byte 177 + .2byte 34 + .2byte 31 + .2byte 29 + .2byte 32 + .2byte 30 + .2byte 33 + .2byte 38 + .2byte 164 + .2byte 224 + .2byte 43 + .2byte 138 + .2byte 139 + .2byte 95 + .2byte 46 + .2byte 47 + .2byte 53 + .2byte 231 + .2byte 172 + .2byte 18 + .2byte 17 + .2byte 16 + .2byte 25 + .2byte 221 + .2byte 204 + .2byte 127 + .2byte 186 + .2byte 60 + .2byte 61 + .2byte 62 + .2byte 77 + .2byte 137 + .2byte 233 + .2byte 57 + .2byte 54 + .2byte 247 + .2byte 195 + .2byte 156 + .2byte 211 + .2byte 26 + .2byte 243 + .2byte 78 + .2byte 20 + .2byte 19 + .2byte 223 + .2byte 112 + .2byte 111 + .2byte 27 + .2byte 28 + .2byte 212 + .2byte 123 + .2byte 117 + .2byte 119 + .2byte 86 + .2byte 161 + .2byte 90 + .2byte 213 + .2byte 227 + .2byte 188 + .2byte 80 + .2byte 199 + .2byte 79 + .2byte 218 + .2byte 235 + .2byte 238 + .2byte 215 + .2byte 143 + .2byte 209 + .2byte 21 + .2byte 167 + .2byte 7 + .2byte 234 + .2byte 121 + .2byte 120 + .2byte 208 + .2byte 185 + .2byte 245 + .2byte 192 + .2byte 191 + .2byte 220 + .2byte 114 + .2byte 128 + .2byte 216 + .2byte 72 + .2byte 73 + .2byte 175 + .2byte 176 + .2byte 158 + .2byte 157 + .2byte 248 + .2byte 236 + .2byte 197 + .2byte 201 + .2byte 217 + .2byte 134 + .2byte 49 + .2byte 48 + .2byte 3 + .2byte 71 + .2byte 45 + .2byte 100 + .2byte 37 + .2byte 8 + .2byte 13 + .2byte 70 + .2byte 110 + .2byte 40 + .2byte 202 + .2byte 194 + .2byte 178 + .2byte 193 + .2byte 145 + .2byte 41 diff --git a/data/text/easy_chat/groups/pokemon_2/order.s b/data/text/easy_chat/groups/pokemon_2/order.s deleted file mode 100644 index 219e7dfb0..000000000 --- a/data/text/easy_chat/groups/pokemon_2/order.s +++ /dev/null @@ -1,254 +0,0 @@ - .align 1 - -gEasyChatGroupOrder_Pokemon2: @ 83DFC1C - .2byte 63 - .2byte 142 - .2byte 190 - .2byte 65 - .2byte 181 - .2byte 24 - .2byte 59 - .2byte 168 - .2byte 144 - .2byte 184 - .2byte 153 - .2byte 15 - .2byte 182 - .2byte 69 - .2byte 9 - .2byte 242 - .2byte 1 - .2byte 12 - .2byte 10 - .2byte 251 - .2byte 113 - .2byte 6 - .2byte 4 - .2byte 5 - .2byte 152 - .2byte 170 - .2byte 36 - .2byte 35 - .2byte 173 - .2byte 91 - .2byte 222 - .2byte 169 - .2byte 159 - .2byte 104 - .2byte 155 - .2byte 225 - .2byte 87 - .2byte 50 - .2byte 132 - .2byte 85 - .2byte 84 - .2byte 232 - .2byte 148 - .2byte 149 - .2byte 147 - .2byte 96 - .2byte 51 - .2byte 206 - .2byte 133 - .2byte 23 - .2byte 125 - .2byte 101 - .2byte 239 - .2byte 244 - .2byte 196 - .2byte 102 - .2byte 103 - .2byte 83 - .2byte 22 - .2byte 160 - .2byte 180 - .2byte 136 - .2byte 205 - .2byte 162 - .2byte 92 - .2byte 94 - .2byte 74 - .2byte 203 - .2byte 207 - .2byte 44 - .2byte 42 - .2byte 118 - .2byte 55 - .2byte 76 - .2byte 210 - .2byte 75 - .2byte 88 - .2byte 58 - .2byte 130 - .2byte 93 - .2byte 214 - .2byte 107 - .2byte 106 - .2byte 237 - .2byte 250 - .2byte 163 - .2byte 187 - .2byte 116 - .2byte 229 - .2byte 228 - .2byte 97 - .2byte 174 - .2byte 2 - .2byte 39 - .2byte 135 - .2byte 189 - .2byte 124 - .2byte 140 - .2byte 141 - .2byte 64 - .2byte 14 - .2byte 115 - .2byte 230 - .2byte 99 - .2byte 109 - .2byte 98 - .2byte 171 - .2byte 131 - .2byte 246 - .2byte 166 - .2byte 165 - .2byte 108 - .2byte 249 - .2byte 68 - .2byte 67 - .2byte 66 - .2byte 240 - .2byte 219 - .2byte 129 - .2byte 126 - .2byte 81 - .2byte 82 - .2byte 56 - .2byte 226 - .2byte 179 - .2byte 183 - .2byte 105 - .2byte 154 - .2byte 52 - .2byte 11 - .2byte 151 - .2byte 150 - .2byte 241 - .2byte 200 - .2byte 146 - .2byte 122 - .2byte 89 - .2byte 198 - .2byte 177 - .2byte 34 - .2byte 31 - .2byte 29 - .2byte 32 - .2byte 30 - .2byte 33 - .2byte 38 - .2byte 164 - .2byte 224 - .2byte 43 - .2byte 138 - .2byte 139 - .2byte 95 - .2byte 46 - .2byte 47 - .2byte 53 - .2byte 231 - .2byte 172 - .2byte 18 - .2byte 17 - .2byte 16 - .2byte 25 - .2byte 221 - .2byte 204 - .2byte 127 - .2byte 186 - .2byte 60 - .2byte 61 - .2byte 62 - .2byte 77 - .2byte 137 - .2byte 233 - .2byte 57 - .2byte 54 - .2byte 247 - .2byte 195 - .2byte 156 - .2byte 211 - .2byte 26 - .2byte 243 - .2byte 78 - .2byte 20 - .2byte 19 - .2byte 223 - .2byte 112 - .2byte 111 - .2byte 27 - .2byte 28 - .2byte 212 - .2byte 123 - .2byte 117 - .2byte 119 - .2byte 86 - .2byte 161 - .2byte 90 - .2byte 213 - .2byte 227 - .2byte 188 - .2byte 80 - .2byte 199 - .2byte 79 - .2byte 218 - .2byte 235 - .2byte 238 - .2byte 215 - .2byte 143 - .2byte 209 - .2byte 21 - .2byte 167 - .2byte 7 - .2byte 234 - .2byte 121 - .2byte 120 - .2byte 208 - .2byte 185 - .2byte 245 - .2byte 192 - .2byte 191 - .2byte 220 - .2byte 114 - .2byte 128 - .2byte 216 - .2byte 72 - .2byte 73 - .2byte 175 - .2byte 176 - .2byte 158 - .2byte 157 - .2byte 248 - .2byte 236 - .2byte 197 - .2byte 201 - .2byte 217 - .2byte 134 - .2byte 49 - .2byte 48 - .2byte 3 - .2byte 71 - .2byte 45 - .2byte 100 - .2byte 37 - .2byte 8 - .2byte 13 - .2byte 70 - .2byte 110 - .2byte 40 - .2byte 202 - .2byte 194 - .2byte 178 - .2byte 193 - .2byte 145 - .2byte 41 diff --git a/data/text/easy_chat/groups/pokemon_2/words.inc b/data/text/easy_chat/groups/pokemon_2/words.inc new file mode 100644 index 000000000..621ef6635 --- /dev/null +++ b/data/text/easy_chat/groups/pokemon_2/words.inc @@ -0,0 +1,254 @@ + .align 1 + +gEasyChatGroupWords_Pokemon2: @ 83DDEE8 + .2byte SPECIES_EKANS + .2byte SPECIES_ARBOK + .2byte SPECIES_SEAKING + .2byte SPECIES_ARIADOS + .2byte SPECIES_CROCONAW + .2byte SPECIES_UNOWN + .2byte SPECIES_EEVEE + .2byte SPECIES_GEODUDE + .2byte SPECIES_SPINARAK + .2byte SPECIES_PILOSWINE + .2byte SPECIES_ONIX + .2byte SPECIES_ARCANINE + .2byte SPECIES_SUDOWOODO + .2byte SPECIES_WEEPINBELL + .2byte SPECIES_VICTREEBEL + .2byte SPECIES_WOOPER + .2byte SPECIES_SWINUB + .2byte SPECIES_SKARMORY + .2byte SPECIES_AIPOM + .2byte SPECIES_ESPEON + .2byte SPECIES_HITMONCHAN + .2byte SPECIES_ELEKID + .2byte SPECIES_ELECTABUZZ + .2byte SPECIES_ENTEI + .2byte SPECIES_FERALIGATR + .2byte SPECIES_FURRET + .2byte SPECIES_OCTILLERY + .2byte SPECIES_PRIMEAPE + .2byte SPECIES_SENTRET + .2byte SPECIES_STANTLER + .2byte SPECIES_SPEAROW + .2byte SPECIES_FEAROW + .2byte SPECIES_OMASTAR + .2byte SPECIES_OMANYTE + .2byte SPECIES_GROWLITHE + .2byte SPECIES_MACHAMP + .2byte SPECIES_DRAGONITE + .2byte SPECIES_PINSIR + .2byte SPECIES_SNORLAX + .2byte SPECIES_KABUTO + .2byte SPECIES_KABUTOPS + .2byte SPECIES_HITMONTOP + .2byte SPECIES_WARTORTLE + .2byte SPECIES_BLASTOISE + .2byte SPECIES_FARFETCHD + .2byte SPECIES_CUBONE + .2byte SPECIES_MAROWAK + .2byte SPECIES_KANGASKHAN + .2byte SPECIES_SUNFLORA + .2byte SPECIES_CATERPIE + .2byte SPECIES_GYARADOS + .2byte SPECIES_RAPIDASH + .2byte SPECIES_NINETALES + .2byte SPECIES_GIRAFARIG + .2byte SPECIES_BELLOSSOM + .2byte SPECIES_KINGDRA + .2byte SPECIES_KINGLER + .2byte SPECIES_GLOOM + .2byte SPECIES_PINECO + .2byte SPECIES_GLIGAR + .2byte SPECIES_KRABBY + .2byte SPECIES_GRANBULL + .2byte SPECIES_CROBAT + .2byte SPECIES_ABRA + .2byte SPECIES_GENGAR + .2byte SPECIES_TAUROS + .2byte SPECIES_MAGIKARP + .2byte SPECIES_MAGNEMITE + .2byte SPECIES_GASTLY + .2byte SPECIES_HAUNTER + .2byte SPECIES_MACHOKE + .2byte SPECIES_KAKUNA + .2byte SPECIES_PSYDUCK + .2byte SPECIES_PHANPY + .2byte SPECIES_RATTATA + .2byte SPECIES_GOLDUCK + .2byte SPECIES_GOLBAT + .2byte SPECIES_GOLEM + .2byte SPECIES_GRAVELER + .2byte SPECIES_VENONAT + .2byte SPECIES_RHYDON + .2byte SPECIES_RHYHORN + .2byte SPECIES_PUPITAR + .2byte SPECIES_CORSOLA + .2byte SPECIES_HITMONLEE + .2byte SPECIES_ZAPDOS + .2byte SPECIES_JOLTEON + .2byte SPECIES_SANDSHREW + .2byte SPECIES_SANDSLASH + .2byte SPECIES_SEADRA + .2byte SPECIES_SHELLDER + .2byte SPECIES_VAPOREON + .2byte SPECIES_DEWGONG + .2byte SPECIES_SUICUNE + .2byte SPECIES_STARMIE + .2byte SPECIES_SCYTHER + .2byte SPECIES_ZUBAT + .2byte SPECIES_BEEDRILL + .2byte SPECIES_HYPNO + .2byte SPECIES_DROWZEE + .2byte SPECIES_SQUIRTLE + .2byte SPECIES_CELEBI + .2byte SPECIES_WOBBUFFET + .2byte SPECIES_DUGTRIO + .2byte SPECIES_HORSEA + .2byte SPECIES_EXEGGCUTE + .2byte SPECIES_CHIKORITA + .2byte SPECIES_CHINCHOU + .2byte SPECIES_SHUCKLE + .2byte SPECIES_DIGLETT + .2byte SPECIES_REMORAID + .2byte SPECIES_DELIBIRD + .2byte SPECIES_HOUNDOUR + .2byte SPECIES_AMPHAROS + .2byte SPECIES_DODUO + .2byte SPECIES_DODRIO + .2byte SPECIES_SMEARGLE + .2byte SPECIES_KOFFING + .2byte SPECIES_TENTACRUEL + .2byte SPECIES_TOGETIC + .2byte SPECIES_TOGEPI + .2byte SPECIES_GOLDEEN + .2byte SPECIES_METAPOD + .2byte SPECIES_DONPHAN + .2byte SPECIES_ODDISH + .2byte SPECIES_EXEGGUTOR + .2byte SPECIES_NIDOKING + .2byte SPECIES_NIDOQUEEN + .2byte SPECIES_NIDORAN_F + .2byte SPECIES_NIDORAN_M + .2byte SPECIES_NIDORINA + .2byte SPECIES_NIDORINO + .2byte SPECIES_MEOWTH + .2byte SPECIES_SNEASEL + .2byte SPECIES_POLIWHIRL + .2byte SPECIES_POLITOED + .2byte SPECIES_POLIWRATH + .2byte SPECIES_POLIWAG + .2byte SPECIES_QUAGSIRE + .2byte SPECIES_NATU + .2byte SPECIES_XATU + .2byte SPECIES_DUNSPARCE + .2byte SPECIES_SEEL + .2byte SPECIES_STEELIX + .2byte SPECIES_TYPHLOSION + .2byte SPECIES_DRAGONAIR + .2byte SPECIES_BUTTERFREE + .2byte SPECIES_SCIZOR + .2byte SPECIES_HOPPIP + .2byte SPECIES_BLISSEY + .2byte SPECIES_PARAS + .2byte SPECIES_PARASECT + .2byte SPECIES_QWILFISH + .2byte SPECIES_MR_MIME + .2byte SPECIES_TYROGUE + .2byte SPECIES_CLOYSTER + .2byte SPECIES_TYRANITAR + .2byte SPECIES_CLEFFA + .2byte SPECIES_WEEDLE + .2byte SPECIES_PIKACHU + .2byte SPECIES_CLEFABLE + .2byte SPECIES_PIDGEOT + .2byte SPECIES_PIDGEOTTO + .2byte SPECIES_PICHU + .2byte SPECIES_CLEFAIRY + .2byte SPECIES_CHARMANDER + .2byte SPECIES_STARYU + .2byte SPECIES_CYNDAQUIL + .2byte SPECIES_SUNKERN + .2byte SPECIES_TEDDIURSA + .2byte SPECIES_VOLTORB + .2byte SPECIES_MOLTRES + .2byte SPECIES_FLAREON + .2byte SPECIES_ALAKAZAM + .2byte SPECIES_MAGMAR + .2byte SPECIES_FORRETRESS + .2byte SPECIES_WIGGLYTUFF + .2byte SPECIES_IVYSAUR + .2byte SPECIES_BULBASAUR + .2byte SPECIES_VENUSAUR + .2byte SPECIES_AERODACTYL + .2byte SPECIES_MAGBY + .2byte SPECIES_IGGLYBUFF + .2byte SPECIES_UMBREON + .2byte SPECIES_ARTICUNO + .2byte SPECIES_JIGGLYPUFF + .2byte SPECIES_SNUBBULL + .2byte SPECIES_BAYLEEF + .2byte SPECIES_GRIMER + .2byte SPECIES_MUK + .2byte SPECIES_HERACROSS + .2byte SPECIES_HOUNDOOM + .2byte SPECIES_PERSIAN + .2byte SPECIES_LICKITUNG + .2byte SPECIES_HO_OH + .2byte SPECIES_HOOTHOOT + .2byte SPECIES_PIDGEY + .2byte SPECIES_PONYTA + .2byte SPECIES_SKIPLOOM + .2byte SPECIES_PORYGON + .2byte SPECIES_PORYGON2 + .2byte SPECIES_MAGCARGO + .2byte SPECIES_SLUGMA + .2byte SPECIES_QUILAVA + .2byte SPECIES_BELLSPROUT + .2byte SPECIES_WEEZING + .2byte SPECIES_MARILL + .2byte SPECIES_AZUMARILL + .2byte SPECIES_ELECTRODE + .2byte SPECIES_MANKEY + .2byte SPECIES_MANTINE + .2byte SPECIES_DRATINI + .2byte SPECIES_MEW + .2byte SPECIES_MEWTWO + .2byte SPECIES_MILTANK + .2byte SPECIES_MISDREAVUS + .2byte SPECIES_SMOOCHUM + .2byte SPECIES_MEGANIUM + .2byte SPECIES_DITTO + .2byte SPECIES_TENTACOOL + .2byte SPECIES_MAREEP + .2byte SPECIES_FLAAFFY + .2byte SPECIES_VENOMOTH + .2byte SPECIES_TANGELA + .2byte SPECIES_SLOWKING + .2byte SPECIES_SLOWBRO + .2byte SPECIES_SLOWPOKE + .2byte SPECIES_MURKROW + .2byte SPECIES_YANMA + .2byte SPECIES_KADABRA + .2byte SPECIES_LARVITAR + .2byte SPECIES_NOCTOWL + .2byte SPECIES_RAIKOU + .2byte SPECIES_RAICHU + .2byte SPECIES_CHANSEY + .2byte SPECIES_RATICATE + .2byte SPECIES_LAPRAS + .2byte SPECIES_VILEPLUME + .2byte SPECIES_LANTURN + .2byte SPECIES_CHARMELEON + .2byte SPECIES_CHARIZARD + .2byte SPECIES_URSARING + .2byte SPECIES_JYNX + .2byte SPECIES_LUGIA + .2byte SPECIES_MAGNETON + .2byte SPECIES_LEDIAN + .2byte SPECIES_LEDYBA + .2byte SPECIES_VULPIX + .2byte SPECIES_JUMPLUFF + .2byte SPECIES_TOTODILE + .2byte SPECIES_MACHOP diff --git a/data/text/easy_chat/groups/pokemon_2/words.s b/data/text/easy_chat/groups/pokemon_2/words.s deleted file mode 100644 index 621ef6635..000000000 --- a/data/text/easy_chat/groups/pokemon_2/words.s +++ /dev/null @@ -1,254 +0,0 @@ - .align 1 - -gEasyChatGroupWords_Pokemon2: @ 83DDEE8 - .2byte SPECIES_EKANS - .2byte SPECIES_ARBOK - .2byte SPECIES_SEAKING - .2byte SPECIES_ARIADOS - .2byte SPECIES_CROCONAW - .2byte SPECIES_UNOWN - .2byte SPECIES_EEVEE - .2byte SPECIES_GEODUDE - .2byte SPECIES_SPINARAK - .2byte SPECIES_PILOSWINE - .2byte SPECIES_ONIX - .2byte SPECIES_ARCANINE - .2byte SPECIES_SUDOWOODO - .2byte SPECIES_WEEPINBELL - .2byte SPECIES_VICTREEBEL - .2byte SPECIES_WOOPER - .2byte SPECIES_SWINUB - .2byte SPECIES_SKARMORY - .2byte SPECIES_AIPOM - .2byte SPECIES_ESPEON - .2byte SPECIES_HITMONCHAN - .2byte SPECIES_ELEKID - .2byte SPECIES_ELECTABUZZ - .2byte SPECIES_ENTEI - .2byte SPECIES_FERALIGATR - .2byte SPECIES_FURRET - .2byte SPECIES_OCTILLERY - .2byte SPECIES_PRIMEAPE - .2byte SPECIES_SENTRET - .2byte SPECIES_STANTLER - .2byte SPECIES_SPEAROW - .2byte SPECIES_FEAROW - .2byte SPECIES_OMASTAR - .2byte SPECIES_OMANYTE - .2byte SPECIES_GROWLITHE - .2byte SPECIES_MACHAMP - .2byte SPECIES_DRAGONITE - .2byte SPECIES_PINSIR - .2byte SPECIES_SNORLAX - .2byte SPECIES_KABUTO - .2byte SPECIES_KABUTOPS - .2byte SPECIES_HITMONTOP - .2byte SPECIES_WARTORTLE - .2byte SPECIES_BLASTOISE - .2byte SPECIES_FARFETCHD - .2byte SPECIES_CUBONE - .2byte SPECIES_MAROWAK - .2byte SPECIES_KANGASKHAN - .2byte SPECIES_SUNFLORA - .2byte SPECIES_CATERPIE - .2byte SPECIES_GYARADOS - .2byte SPECIES_RAPIDASH - .2byte SPECIES_NINETALES - .2byte SPECIES_GIRAFARIG - .2byte SPECIES_BELLOSSOM - .2byte SPECIES_KINGDRA - .2byte SPECIES_KINGLER - .2byte SPECIES_GLOOM - .2byte SPECIES_PINECO - .2byte SPECIES_GLIGAR - .2byte SPECIES_KRABBY - .2byte SPECIES_GRANBULL - .2byte SPECIES_CROBAT - .2byte SPECIES_ABRA - .2byte SPECIES_GENGAR - .2byte SPECIES_TAUROS - .2byte SPECIES_MAGIKARP - .2byte SPECIES_MAGNEMITE - .2byte SPECIES_GASTLY - .2byte SPECIES_HAUNTER - .2byte SPECIES_MACHOKE - .2byte SPECIES_KAKUNA - .2byte SPECIES_PSYDUCK - .2byte SPECIES_PHANPY - .2byte SPECIES_RATTATA - .2byte SPECIES_GOLDUCK - .2byte SPECIES_GOLBAT - .2byte SPECIES_GOLEM - .2byte SPECIES_GRAVELER - .2byte SPECIES_VENONAT - .2byte SPECIES_RHYDON - .2byte SPECIES_RHYHORN - .2byte SPECIES_PUPITAR - .2byte SPECIES_CORSOLA - .2byte SPECIES_HITMONLEE - .2byte SPECIES_ZAPDOS - .2byte SPECIES_JOLTEON - .2byte SPECIES_SANDSHREW - .2byte SPECIES_SANDSLASH - .2byte SPECIES_SEADRA - .2byte SPECIES_SHELLDER - .2byte SPECIES_VAPOREON - .2byte SPECIES_DEWGONG - .2byte SPECIES_SUICUNE - .2byte SPECIES_STARMIE - .2byte SPECIES_SCYTHER - .2byte SPECIES_ZUBAT - .2byte SPECIES_BEEDRILL - .2byte SPECIES_HYPNO - .2byte SPECIES_DROWZEE - .2byte SPECIES_SQUIRTLE - .2byte SPECIES_CELEBI - .2byte SPECIES_WOBBUFFET - .2byte SPECIES_DUGTRIO - .2byte SPECIES_HORSEA - .2byte SPECIES_EXEGGCUTE - .2byte SPECIES_CHIKORITA - .2byte SPECIES_CHINCHOU - .2byte SPECIES_SHUCKLE - .2byte SPECIES_DIGLETT - .2byte SPECIES_REMORAID - .2byte SPECIES_DELIBIRD - .2byte SPECIES_HOUNDOUR - .2byte SPECIES_AMPHAROS - .2byte SPECIES_DODUO - .2byte SPECIES_DODRIO - .2byte SPECIES_SMEARGLE - .2byte SPECIES_KOFFING - .2byte SPECIES_TENTACRUEL - .2byte SPECIES_TOGETIC - .2byte SPECIES_TOGEPI - .2byte SPECIES_GOLDEEN - .2byte SPECIES_METAPOD - .2byte SPECIES_DONPHAN - .2byte SPECIES_ODDISH - .2byte SPECIES_EXEGGUTOR - .2byte SPECIES_NIDOKING - .2byte SPECIES_NIDOQUEEN - .2byte SPECIES_NIDORAN_F - .2byte SPECIES_NIDORAN_M - .2byte SPECIES_NIDORINA - .2byte SPECIES_NIDORINO - .2byte SPECIES_MEOWTH - .2byte SPECIES_SNEASEL - .2byte SPECIES_POLIWHIRL - .2byte SPECIES_POLITOED - .2byte SPECIES_POLIWRATH - .2byte SPECIES_POLIWAG - .2byte SPECIES_QUAGSIRE - .2byte SPECIES_NATU - .2byte SPECIES_XATU - .2byte SPECIES_DUNSPARCE - .2byte SPECIES_SEEL - .2byte SPECIES_STEELIX - .2byte SPECIES_TYPHLOSION - .2byte SPECIES_DRAGONAIR - .2byte SPECIES_BUTTERFREE - .2byte SPECIES_SCIZOR - .2byte SPECIES_HOPPIP - .2byte SPECIES_BLISSEY - .2byte SPECIES_PARAS - .2byte SPECIES_PARASECT - .2byte SPECIES_QWILFISH - .2byte SPECIES_MR_MIME - .2byte SPECIES_TYROGUE - .2byte SPECIES_CLOYSTER - .2byte SPECIES_TYRANITAR - .2byte SPECIES_CLEFFA - .2byte SPECIES_WEEDLE - .2byte SPECIES_PIKACHU - .2byte SPECIES_CLEFABLE - .2byte SPECIES_PIDGEOT - .2byte SPECIES_PIDGEOTTO - .2byte SPECIES_PICHU - .2byte SPECIES_CLEFAIRY - .2byte SPECIES_CHARMANDER - .2byte SPECIES_STARYU - .2byte SPECIES_CYNDAQUIL - .2byte SPECIES_SUNKERN - .2byte SPECIES_TEDDIURSA - .2byte SPECIES_VOLTORB - .2byte SPECIES_MOLTRES - .2byte SPECIES_FLAREON - .2byte SPECIES_ALAKAZAM - .2byte SPECIES_MAGMAR - .2byte SPECIES_FORRETRESS - .2byte SPECIES_WIGGLYTUFF - .2byte SPECIES_IVYSAUR - .2byte SPECIES_BULBASAUR - .2byte SPECIES_VENUSAUR - .2byte SPECIES_AERODACTYL - .2byte SPECIES_MAGBY - .2byte SPECIES_IGGLYBUFF - .2byte SPECIES_UMBREON - .2byte SPECIES_ARTICUNO - .2byte SPECIES_JIGGLYPUFF - .2byte SPECIES_SNUBBULL - .2byte SPECIES_BAYLEEF - .2byte SPECIES_GRIMER - .2byte SPECIES_MUK - .2byte SPECIES_HERACROSS - .2byte SPECIES_HOUNDOOM - .2byte SPECIES_PERSIAN - .2byte SPECIES_LICKITUNG - .2byte SPECIES_HO_OH - .2byte SPECIES_HOOTHOOT - .2byte SPECIES_PIDGEY - .2byte SPECIES_PONYTA - .2byte SPECIES_SKIPLOOM - .2byte SPECIES_PORYGON - .2byte SPECIES_PORYGON2 - .2byte SPECIES_MAGCARGO - .2byte SPECIES_SLUGMA - .2byte SPECIES_QUILAVA - .2byte SPECIES_BELLSPROUT - .2byte SPECIES_WEEZING - .2byte SPECIES_MARILL - .2byte SPECIES_AZUMARILL - .2byte SPECIES_ELECTRODE - .2byte SPECIES_MANKEY - .2byte SPECIES_MANTINE - .2byte SPECIES_DRATINI - .2byte SPECIES_MEW - .2byte SPECIES_MEWTWO - .2byte SPECIES_MILTANK - .2byte SPECIES_MISDREAVUS - .2byte SPECIES_SMOOCHUM - .2byte SPECIES_MEGANIUM - .2byte SPECIES_DITTO - .2byte SPECIES_TENTACOOL - .2byte SPECIES_MAREEP - .2byte SPECIES_FLAAFFY - .2byte SPECIES_VENOMOTH - .2byte SPECIES_TANGELA - .2byte SPECIES_SLOWKING - .2byte SPECIES_SLOWBRO - .2byte SPECIES_SLOWPOKE - .2byte SPECIES_MURKROW - .2byte SPECIES_YANMA - .2byte SPECIES_KADABRA - .2byte SPECIES_LARVITAR - .2byte SPECIES_NOCTOWL - .2byte SPECIES_RAIKOU - .2byte SPECIES_RAICHU - .2byte SPECIES_CHANSEY - .2byte SPECIES_RATICATE - .2byte SPECIES_LAPRAS - .2byte SPECIES_VILEPLUME - .2byte SPECIES_LANTURN - .2byte SPECIES_CHARMELEON - .2byte SPECIES_CHARIZARD - .2byte SPECIES_URSARING - .2byte SPECIES_JYNX - .2byte SPECIES_LUGIA - .2byte SPECIES_MAGNETON - .2byte SPECIES_LEDIAN - .2byte SPECIES_LEDYBA - .2byte SPECIES_VULPIX - .2byte SPECIES_JUMPLUFF - .2byte SPECIES_TOTODILE - .2byte SPECIES_MACHOP diff --git a/data/text/easy_chat/groups/speech/order.inc b/data/text/easy_chat/groups/speech/order.inc new file mode 100644 index 000000000..c2cd47835 --- /dev/null +++ b/data/text/easy_chat/groups/speech/order.inc @@ -0,0 +1,63 @@ + .align 1 + +gEasyChatGroupOrder_Speech: @ 83DF48A + .2byte 19 + .2byte 18 + .2byte 27 + .2byte 20 + .2byte 41 + .2byte 40 + .2byte 21 + .2byte 57 + .2byte 23 + .2byte 49 + .2byte 43 + .2byte 52 + .2byte 10 + .2byte 12 + .2byte 17 + .2byte 31 + .2byte 59 + .2byte 9 + .2byte 56 + .2byte 34 + .2byte 8 + .2byte 16 + .2byte 15 + .2byte 11 + .2byte 25 + .2byte 58 + .2byte 36 + .2byte 30 + .2byte 4 + .2byte 3 + .2byte 0 + .2byte 2 + .2byte 14 + .2byte 53 + .2byte 50 + .2byte 54 + .2byte 32 + .2byte 33 + .2byte 6 + .2byte 1 + .2byte 22 + .2byte 42 + .2byte 24 + .2byte 7 + .2byte 51 + .2byte 37 + .2byte 44 + .2byte 5 + .2byte 46 + .2byte 39 + .2byte 38 + .2byte 29 + .2byte 13 + .2byte 55 + .2byte 47 + .2byte 45 + .2byte 35 + .2byte 48 + .2byte 26 + .2byte 28 diff --git a/data/text/easy_chat/groups/speech/order.s b/data/text/easy_chat/groups/speech/order.s deleted file mode 100644 index c2cd47835..000000000 --- a/data/text/easy_chat/groups/speech/order.s +++ /dev/null @@ -1,63 +0,0 @@ - .align 1 - -gEasyChatGroupOrder_Speech: @ 83DF48A - .2byte 19 - .2byte 18 - .2byte 27 - .2byte 20 - .2byte 41 - .2byte 40 - .2byte 21 - .2byte 57 - .2byte 23 - .2byte 49 - .2byte 43 - .2byte 52 - .2byte 10 - .2byte 12 - .2byte 17 - .2byte 31 - .2byte 59 - .2byte 9 - .2byte 56 - .2byte 34 - .2byte 8 - .2byte 16 - .2byte 15 - .2byte 11 - .2byte 25 - .2byte 58 - .2byte 36 - .2byte 30 - .2byte 4 - .2byte 3 - .2byte 0 - .2byte 2 - .2byte 14 - .2byte 53 - .2byte 50 - .2byte 54 - .2byte 32 - .2byte 33 - .2byte 6 - .2byte 1 - .2byte 22 - .2byte 42 - .2byte 24 - .2byte 7 - .2byte 51 - .2byte 37 - .2byte 44 - .2byte 5 - .2byte 46 - .2byte 39 - .2byte 38 - .2byte 29 - .2byte 13 - .2byte 55 - .2byte 47 - .2byte 45 - .2byte 35 - .2byte 48 - .2byte 26 - .2byte 28 diff --git a/data/text/easy_chat/groups/speech/words.inc b/data/text/easy_chat/groups/speech/words.inc new file mode 100644 index 000000000..becfd03d0 --- /dev/null +++ b/data/text/easy_chat/groups/speech/words.inc @@ -0,0 +1,62 @@ +gEasyChatGroupWords_Speech: @ 83DCB82 + .string "LISTEN$" + .string "NOT VERY$" + .string "MEAN$" + .string "LIE$" + .string "LAY$" + .string "RECOMMEND$" + .string "NITWIT$" + .string "QUITE$" + .string "FROM$" + .string "FEELING$" + .string "BUT$" + .string "HOWEVER$" + .string "CASE$" + .string "THE$" + .string "MISS$" + .string "HOW$" + .string "HIT$" + .string "ENOUGH$" + .string "A LOT$" + .string "A LITTLE$" + .string "ABSOLUTELY$" + .string "AND$" + .string "ONLY$" + .string "AROUND$" + .string "PROBABLY$" + .string "IF$" + .string "VERY$" + .string "A TINY BIT$" + .string "WILD$" + .string "THAT’S$" + .string "JUST$" + .string "EVEN SO,$" + .string "MUST BE$" + .string "NATURALLY$" + .string "FOR NOW,$" + .string "UNDERSTOOD$" + .string "JOKING$" + .string "READY$" + .string "SOMETHING$" + .string "SOMEHOW$" + .string "ALTHOUGH$" + .string "ALSO$" + .string "PERFECT$" + .string "AS MUCH AS$" + .string "REALLY$" + .string "TRULY$" + .string "SERIOUSLY$" + .string "TOTALLY$" + .string "UNTIL$" + .string "AS IF$" + .string "MOOD$" + .string "RATHER$" + .string "AWFULLY$" + .string "MODE$" + .string "MORE$" + .string "TOO LATE$" + .string "FINALLY$" + .string "ANY$" + .string "INSTEAD$" + .string "FANTASTIC$" + .string "$" diff --git a/data/text/easy_chat/groups/speech/words.s b/data/text/easy_chat/groups/speech/words.s deleted file mode 100644 index becfd03d0..000000000 --- a/data/text/easy_chat/groups/speech/words.s +++ /dev/null @@ -1,62 +0,0 @@ -gEasyChatGroupWords_Speech: @ 83DCB82 - .string "LISTEN$" - .string "NOT VERY$" - .string "MEAN$" - .string "LIE$" - .string "LAY$" - .string "RECOMMEND$" - .string "NITWIT$" - .string "QUITE$" - .string "FROM$" - .string "FEELING$" - .string "BUT$" - .string "HOWEVER$" - .string "CASE$" - .string "THE$" - .string "MISS$" - .string "HOW$" - .string "HIT$" - .string "ENOUGH$" - .string "A LOT$" - .string "A LITTLE$" - .string "ABSOLUTELY$" - .string "AND$" - .string "ONLY$" - .string "AROUND$" - .string "PROBABLY$" - .string "IF$" - .string "VERY$" - .string "A TINY BIT$" - .string "WILD$" - .string "THAT’S$" - .string "JUST$" - .string "EVEN SO,$" - .string "MUST BE$" - .string "NATURALLY$" - .string "FOR NOW,$" - .string "UNDERSTOOD$" - .string "JOKING$" - .string "READY$" - .string "SOMETHING$" - .string "SOMEHOW$" - .string "ALTHOUGH$" - .string "ALSO$" - .string "PERFECT$" - .string "AS MUCH AS$" - .string "REALLY$" - .string "TRULY$" - .string "SERIOUSLY$" - .string "TOTALLY$" - .string "UNTIL$" - .string "AS IF$" - .string "MOOD$" - .string "RATHER$" - .string "AWFULLY$" - .string "MODE$" - .string "MORE$" - .string "TOO LATE$" - .string "FINALLY$" - .string "ANY$" - .string "INSTEAD$" - .string "FANTASTIC$" - .string "$" diff --git a/data/text/easy_chat/groups/status/order.inc b/data/text/easy_chat/groups/status/order.inc new file mode 100644 index 000000000..1f1c32fd5 --- /dev/null +++ b/data/text/easy_chat/groups/status/order.inc @@ -0,0 +1,112 @@ + .align 1 + +gEasyChatGroupOrder_Status: @ 83DF1CA + .2byte 13 + .2byte 9 + .2byte 5 + .2byte 23 + .2byte 11 + .2byte 12 + .2byte 101 + .2byte 97 + .2byte 106 + .2byte 29 + .2byte 68 + .2byte 8 + .2byte 86 + .2byte 78 + .2byte 21 + .2byte 22 + .2byte 24 + .2byte 99 + .2byte 25 + .2byte 37 + .2byte 0 + .2byte 62 + .2byte 4 + .2byte 76 + .2byte 72 + .2byte 88 + .2byte 57 + .2byte 16 + .2byte 90 + .2byte 91 + .2byte 104 + .2byte 75 + .2byte 58 + .2byte 31 + .2byte 28 + .2byte 38 + .2byte 33 + .2byte 54 + .2byte 73 + .2byte 15 + .2byte 32 + .2byte 71 + .2byte 100 + .2byte 48 + .2byte 81 + .2byte 6 + .2byte 47 + .2byte 82 + .2byte 77 + .2byte 39 + .2byte 85 + .2byte 94 + .2byte 40 + .2byte 79 + .2byte 92 + .2byte 36 + .2byte 69 + .2byte 64 + .2byte 43 + .2byte 93 + .2byte 103 + .2byte 102 + .2byte 89 + .2byte 83 + .2byte 60 + .2byte 61 + .2byte 84 + .2byte 14 + .2byte 107 + .2byte 3 + .2byte 10 + .2byte 7 + .2byte 34 + .2byte 66 + .2byte 45 + .2byte 46 + .2byte 59 + .2byte 17 + .2byte 53 + .2byte 35 + .2byte 108 + .2byte 74 + .2byte 18 + .2byte 19 + .2byte 87 + .2byte 20 + .2byte 49 + .2byte 70 + .2byte 1 + .2byte 67 + .2byte 26 + .2byte 27 + .2byte 98 + .2byte 44 + .2byte 42 + .2byte 2 + .2byte 30 + .2byte 51 + .2byte 52 + .2byte 63 + .2byte 65 + .2byte 50 + .2byte 105 + .2byte 55 + .2byte 95 + .2byte 56 + .2byte 96 + .2byte 41 + .2byte 80 diff --git a/data/text/easy_chat/groups/status/order.s b/data/text/easy_chat/groups/status/order.s deleted file mode 100644 index 1f1c32fd5..000000000 --- a/data/text/easy_chat/groups/status/order.s +++ /dev/null @@ -1,112 +0,0 @@ - .align 1 - -gEasyChatGroupOrder_Status: @ 83DF1CA - .2byte 13 - .2byte 9 - .2byte 5 - .2byte 23 - .2byte 11 - .2byte 12 - .2byte 101 - .2byte 97 - .2byte 106 - .2byte 29 - .2byte 68 - .2byte 8 - .2byte 86 - .2byte 78 - .2byte 21 - .2byte 22 - .2byte 24 - .2byte 99 - .2byte 25 - .2byte 37 - .2byte 0 - .2byte 62 - .2byte 4 - .2byte 76 - .2byte 72 - .2byte 88 - .2byte 57 - .2byte 16 - .2byte 90 - .2byte 91 - .2byte 104 - .2byte 75 - .2byte 58 - .2byte 31 - .2byte 28 - .2byte 38 - .2byte 33 - .2byte 54 - .2byte 73 - .2byte 15 - .2byte 32 - .2byte 71 - .2byte 100 - .2byte 48 - .2byte 81 - .2byte 6 - .2byte 47 - .2byte 82 - .2byte 77 - .2byte 39 - .2byte 85 - .2byte 94 - .2byte 40 - .2byte 79 - .2byte 92 - .2byte 36 - .2byte 69 - .2byte 64 - .2byte 43 - .2byte 93 - .2byte 103 - .2byte 102 - .2byte 89 - .2byte 83 - .2byte 60 - .2byte 61 - .2byte 84 - .2byte 14 - .2byte 107 - .2byte 3 - .2byte 10 - .2byte 7 - .2byte 34 - .2byte 66 - .2byte 45 - .2byte 46 - .2byte 59 - .2byte 17 - .2byte 53 - .2byte 35 - .2byte 108 - .2byte 74 - .2byte 18 - .2byte 19 - .2byte 87 - .2byte 20 - .2byte 49 - .2byte 70 - .2byte 1 - .2byte 67 - .2byte 26 - .2byte 27 - .2byte 98 - .2byte 44 - .2byte 42 - .2byte 2 - .2byte 30 - .2byte 51 - .2byte 52 - .2byte 63 - .2byte 65 - .2byte 50 - .2byte 105 - .2byte 55 - .2byte 95 - .2byte 56 - .2byte 96 - .2byte 41 - .2byte 80 diff --git a/data/text/easy_chat/groups/status/words.inc b/data/text/easy_chat/groups/status/words.inc new file mode 100644 index 000000000..28109b361 --- /dev/null +++ b/data/text/easy_chat/groups/status/words.inc @@ -0,0 +1,111 @@ +gEasyChatGroupWords_Status: @ 83DC152 + .string "DARK$" + .string "STENCH$" + .string "THICK FAT$" + .string "RAIN DISH$" + .string "DRIZZLE$" + .string "ARENA TRAP$" + .string "INTIMIDATE$" + .string "ROCK HEAD$" + .string "COLOR$" + .string "ALT. COLOR$" + .string "ROCK$" + .string "BEAUTIFUL$" + .string "BEAUTY$" + .string "AIR LOCK$" + .string "PSYCHIC$" + .string "HYPER CUTTER$" + .string "FIGHTING$" + .string "SHADOW TAG$" + .string "SMART$" + .string "SMARTNESS$" + .string "SPEED BOOST$" + .string "COOL$" + .string "COOLNESS$" + .string "BATTLE ARMOR$" + .string "CUTE$" + .string "CUTENESS$" + .string "STURDY$" + .string "SUCTION CUPS$" + .string "GRASS$" + .string "CLEAR BODY$" + .string "TORRENT$" + .string "GHOST$" + .string "ICE$" + .string "GUTS$" + .string "ROUGH SKIN$" + .string "SHELL ARMOR$" + .string "NATURAL CURE$" + .string "DAMP$" + .string "GROUND$" + .string "LIMBER$" + .string "MAGNET PULL$" + .string "WHITE SMOKE$" + .string "SYNCHRONIZE$" + .string "OVERGROW$" + .string "SWIFT SWIM$" + .string "SAND STREAM$" + .string "SAND VEIL$" + .string "KEEN EYE$" + .string "INNERFOCUS$" + .string "STATIC$" + .string "TYPE$" + .string "TOUGH$" + .string "TOUGHNESS$" + .string "SHED SKIN$" + .string "HUGE POWER$" + .string "VOLT ABSORB$" + .string "WATER ABSORB$" + .string "ELECTRIC$" + .string "FORECAST$" + .string "SERENE GRACE$" + .string "POISON$" + .string "POISON POINT$" + .string "DRAGON$" + .string "TRACE$" + .string "OBLIVIOUS$" + .string "TRUANT$" + .string "RUN AWAY$" + .string "STICKY HOLD$" + .string "CLOUD NINE$" + .string "NORMAL$" + .string "STEEL$" + .string "ILLUMINATE$" + .string "EARLY BIRD$" + .string "HUSTLE$" + .string "SHINE$" + .string "FLYING$" + .string "DROUGHT$" + .string "LIGHTNINGROD$" + .string "COMPOUNDEYES$" + .string "MARVEL SCALE$" + .string "WONDER GUARD$" + .string "INSOMNIA$" + .string "LEVITATE$" + .string "PLUS$" + .string "PRESSURE$" + .string "LIQUID OOZE$" + .string "COLOR CHANGE$" + .string "SOUNDPROOF$" + .string "EFFECT SPORE$" + .string "{PK}RS$" + .string "FIRE$" + .string "FLAME BODY$" + .string "MINUS$" + .string "OWN TEMPO$" + .string "MAGMA ARMOR$" + .string "WATER$" + .string "WATER VEIL$" + .string "BUG$" + .string "SWARM$" + .string "CUTE CHARM$" + .string "IMMUNITY$" + .string "BLAZE$" + .string "PICKUP$" + .string "PATTERN$" + .string "FLASH FIRE$" + .string "VITAL SPIRIT$" + .string "CHLOROPHYLL$" + .string "PURE POWER$" + .string "SHIELD DUST$" + .string "$" diff --git a/data/text/easy_chat/groups/status/words.s b/data/text/easy_chat/groups/status/words.s deleted file mode 100644 index 28109b361..000000000 --- a/data/text/easy_chat/groups/status/words.s +++ /dev/null @@ -1,111 +0,0 @@ -gEasyChatGroupWords_Status: @ 83DC152 - .string "DARK$" - .string "STENCH$" - .string "THICK FAT$" - .string "RAIN DISH$" - .string "DRIZZLE$" - .string "ARENA TRAP$" - .string "INTIMIDATE$" - .string "ROCK HEAD$" - .string "COLOR$" - .string "ALT. COLOR$" - .string "ROCK$" - .string "BEAUTIFUL$" - .string "BEAUTY$" - .string "AIR LOCK$" - .string "PSYCHIC$" - .string "HYPER CUTTER$" - .string "FIGHTING$" - .string "SHADOW TAG$" - .string "SMART$" - .string "SMARTNESS$" - .string "SPEED BOOST$" - .string "COOL$" - .string "COOLNESS$" - .string "BATTLE ARMOR$" - .string "CUTE$" - .string "CUTENESS$" - .string "STURDY$" - .string "SUCTION CUPS$" - .string "GRASS$" - .string "CLEAR BODY$" - .string "TORRENT$" - .string "GHOST$" - .string "ICE$" - .string "GUTS$" - .string "ROUGH SKIN$" - .string "SHELL ARMOR$" - .string "NATURAL CURE$" - .string "DAMP$" - .string "GROUND$" - .string "LIMBER$" - .string "MAGNET PULL$" - .string "WHITE SMOKE$" - .string "SYNCHRONIZE$" - .string "OVERGROW$" - .string "SWIFT SWIM$" - .string "SAND STREAM$" - .string "SAND VEIL$" - .string "KEEN EYE$" - .string "INNERFOCUS$" - .string "STATIC$" - .string "TYPE$" - .string "TOUGH$" - .string "TOUGHNESS$" - .string "SHED SKIN$" - .string "HUGE POWER$" - .string "VOLT ABSORB$" - .string "WATER ABSORB$" - .string "ELECTRIC$" - .string "FORECAST$" - .string "SERENE GRACE$" - .string "POISON$" - .string "POISON POINT$" - .string "DRAGON$" - .string "TRACE$" - .string "OBLIVIOUS$" - .string "TRUANT$" - .string "RUN AWAY$" - .string "STICKY HOLD$" - .string "CLOUD NINE$" - .string "NORMAL$" - .string "STEEL$" - .string "ILLUMINATE$" - .string "EARLY BIRD$" - .string "HUSTLE$" - .string "SHINE$" - .string "FLYING$" - .string "DROUGHT$" - .string "LIGHTNINGROD$" - .string "COMPOUNDEYES$" - .string "MARVEL SCALE$" - .string "WONDER GUARD$" - .string "INSOMNIA$" - .string "LEVITATE$" - .string "PLUS$" - .string "PRESSURE$" - .string "LIQUID OOZE$" - .string "COLOR CHANGE$" - .string "SOUNDPROOF$" - .string "EFFECT SPORE$" - .string "{PK}RS$" - .string "FIRE$" - .string "FLAME BODY$" - .string "MINUS$" - .string "OWN TEMPO$" - .string "MAGMA ARMOR$" - .string "WATER$" - .string "WATER VEIL$" - .string "BUG$" - .string "SWARM$" - .string "CUTE CHARM$" - .string "IMMUNITY$" - .string "BLAZE$" - .string "PICKUP$" - .string "PATTERN$" - .string "FLASH FIRE$" - .string "VITAL SPIRIT$" - .string "CHLOROPHYLL$" - .string "PURE POWER$" - .string "SHIELD DUST$" - .string "$" diff --git a/data/text/easy_chat/groups/time/order.inc b/data/text/easy_chat/groups/time/order.inc new file mode 100644 index 000000000..c8be7bc3b --- /dev/null +++ b/data/text/easy_chat/groups/time/order.inc @@ -0,0 +1,48 @@ + .align 1 + +gEasyChatGroupOrder_Time: @ 83DF802 + .2byte 29 + .2byte 39 + .2byte 6 + .2byte 18 + .2byte 33 + .2byte 7 + .2byte 37 + .2byte 4 + .2byte 9 + .2byte 35 + .2byte 17 + .2byte 10 + .2byte 0 + .2byte 27 + .2byte 20 + .2byte 8 + .2byte 14 + .2byte 3 + .2byte 16 + .2byte 15 + .2byte 24 + .2byte 1 + .2byte 40 + .2byte 28 + .2byte 43 + .2byte 42 + .2byte 26 + .2byte 38 + .2byte 30 + .2byte 5 + .2byte 22 + .2byte 34 + .2byte 23 + .2byte 25 + .2byte 31 + .2byte 32 + .2byte 41 + .2byte 19 + .2byte 13 + .2byte 2 + .2byte 11 + .2byte 21 + .2byte 44 + .2byte 36 + .2byte 12 diff --git a/data/text/easy_chat/groups/time/order.s b/data/text/easy_chat/groups/time/order.s deleted file mode 100644 index c8be7bc3b..000000000 --- a/data/text/easy_chat/groups/time/order.s +++ /dev/null @@ -1,48 +0,0 @@ - .align 1 - -gEasyChatGroupOrder_Time: @ 83DF802 - .2byte 29 - .2byte 39 - .2byte 6 - .2byte 18 - .2byte 33 - .2byte 7 - .2byte 37 - .2byte 4 - .2byte 9 - .2byte 35 - .2byte 17 - .2byte 10 - .2byte 0 - .2byte 27 - .2byte 20 - .2byte 8 - .2byte 14 - .2byte 3 - .2byte 16 - .2byte 15 - .2byte 24 - .2byte 1 - .2byte 40 - .2byte 28 - .2byte 43 - .2byte 42 - .2byte 26 - .2byte 38 - .2byte 30 - .2byte 5 - .2byte 22 - .2byte 34 - .2byte 23 - .2byte 25 - .2byte 31 - .2byte 32 - .2byte 41 - .2byte 19 - .2byte 13 - .2byte 2 - .2byte 11 - .2byte 21 - .2byte 44 - .2byte 36 - .2byte 12 diff --git a/data/text/easy_chat/groups/time/words.inc b/data/text/easy_chat/groups/time/words.inc new file mode 100644 index 000000000..4048d3714 --- /dev/null +++ b/data/text/easy_chat/groups/time/words.inc @@ -0,0 +1,47 @@ +gEasyChatGroupWords_Time: @ 83DD72D + .string "FALL$" + .string "MORNING$" + .string "TOMORROW$" + .string "LAST$" + .string "DAY$" + .string "SOMETIME$" + .string "ALWAYS$" + .string "CURRENT$" + .string "FOREVER$" + .string "DAYS$" + .string "END$" + .string "TUESDAY$" + .string "YESTERDAY$" + .string "TODAY$" + .string "FRIDAY$" + .string "MONDAY$" + .string "LATER$" + .string "EARLIER$" + .string "ANOTHER$" + .string "TIME$" + .string "FINISH$" + .string "WEDNESDAY$" + .string "SOON$" + .string "START$" + .string "MONTH$" + .string "STOP$" + .string "NOW$" + .string "FINAL$" + .string "NEXT$" + .string "AGE$" + .string "SATURDAY$" + .string "SUMMER$" + .string "SUNDAY$" + .string "BEGINNING$" + .string "SPRING$" + .string "DAYTIME$" + .string "WINTER$" + .string "DAILY$" + .string "OLDEN$" + .string "ALMOST$" + .string "NEARLY$" + .string "THURSDAY$" + .string "NIGHTTIME$" + .string "NIGHT$" + .string "WEEK$" + .string "$" diff --git a/data/text/easy_chat/groups/time/words.s b/data/text/easy_chat/groups/time/words.s deleted file mode 100644 index 4048d3714..000000000 --- a/data/text/easy_chat/groups/time/words.s +++ /dev/null @@ -1,47 +0,0 @@ -gEasyChatGroupWords_Time: @ 83DD72D - .string "FALL$" - .string "MORNING$" - .string "TOMORROW$" - .string "LAST$" - .string "DAY$" - .string "SOMETIME$" - .string "ALWAYS$" - .string "CURRENT$" - .string "FOREVER$" - .string "DAYS$" - .string "END$" - .string "TUESDAY$" - .string "YESTERDAY$" - .string "TODAY$" - .string "FRIDAY$" - .string "MONDAY$" - .string "LATER$" - .string "EARLIER$" - .string "ANOTHER$" - .string "TIME$" - .string "FINISH$" - .string "WEDNESDAY$" - .string "SOON$" - .string "START$" - .string "MONTH$" - .string "STOP$" - .string "NOW$" - .string "FINAL$" - .string "NEXT$" - .string "AGE$" - .string "SATURDAY$" - .string "SUMMER$" - .string "SUNDAY$" - .string "BEGINNING$" - .string "SPRING$" - .string "DAYTIME$" - .string "WINTER$" - .string "DAILY$" - .string "OLDEN$" - .string "ALMOST$" - .string "NEARLY$" - .string "THURSDAY$" - .string "NIGHTTIME$" - .string "NIGHT$" - .string "WEEK$" - .string "$" diff --git a/data/text/easy_chat/groups/trainer/order.inc b/data/text/easy_chat/groups/trainer/order.inc new file mode 100644 index 000000000..4238e578a --- /dev/null +++ b/data/text/easy_chat/groups/trainer/order.inc @@ -0,0 +1,22 @@ + .align 1 + +gEasyChatGroupOrder_Trainer: @ 83DF1A4 + .2byte 7 + .2byte 8 + .2byte 5 + .2byte 4 + .2byte 15 + .2byte 1 + .2byte 0 + .2byte 18 + .2byte 9 + .2byte 6 + .2byte 16 + .2byte 14 + .2byte 13 + .2byte 17 + .2byte 3 + .2byte 10 + .2byte 2 + .2byte 11 + .2byte 12 diff --git a/data/text/easy_chat/groups/trainer/order.s b/data/text/easy_chat/groups/trainer/order.s deleted file mode 100644 index 4238e578a..000000000 --- a/data/text/easy_chat/groups/trainer/order.s +++ /dev/null @@ -1,22 +0,0 @@ - .align 1 - -gEasyChatGroupOrder_Trainer: @ 83DF1A4 - .2byte 7 - .2byte 8 - .2byte 5 - .2byte 4 - .2byte 15 - .2byte 1 - .2byte 0 - .2byte 18 - .2byte 9 - .2byte 6 - .2byte 16 - .2byte 14 - .2byte 13 - .2byte 17 - .2byte 3 - .2byte 10 - .2byte 2 - .2byte 11 - .2byte 12 diff --git a/data/text/easy_chat/groups/trainer/words.inc b/data/text/easy_chat/groups/trainer/words.inc new file mode 100644 index 000000000..8a1a40c76 --- /dev/null +++ b/data/text/easy_chat/groups/trainer/words.inc @@ -0,0 +1,21 @@ +gEasyChatGroupWords_Trainer: @ 83DC0C0 + .string "I CHOOSE YOU$" + .string "GOTCHA$" + .string "TRADE$" + .string "SAPPHIRE$" + .string "EVOLVE$" + .string "ENCYCLOPEDIA$" + .string "NATURE$" + .string "CENTER$" + .string "EGG$" + .string "LINK$" + .string "SP. ABILITY$" + .string "TRAINER$" + .string "VERSION$" + .string "POKéNAV$" + .string "POKéMON$" + .string "GET$" + .string "POKéDEX$" + .string "RUBY$" + .string "LEVEL$" + .string "$" diff --git a/data/text/easy_chat/groups/trainer/words.s b/data/text/easy_chat/groups/trainer/words.s deleted file mode 100644 index 8a1a40c76..000000000 --- a/data/text/easy_chat/groups/trainer/words.s +++ /dev/null @@ -1,21 +0,0 @@ -gEasyChatGroupWords_Trainer: @ 83DC0C0 - .string "I CHOOSE YOU$" - .string "GOTCHA$" - .string "TRADE$" - .string "SAPPHIRE$" - .string "EVOLVE$" - .string "ENCYCLOPEDIA$" - .string "NATURE$" - .string "CENTER$" - .string "EGG$" - .string "LINK$" - .string "SP. ABILITY$" - .string "TRAINER$" - .string "VERSION$" - .string "POKéNAV$" - .string "POKéMON$" - .string "GET$" - .string "POKéDEX$" - .string "RUBY$" - .string "LEVEL$" - .string "$" diff --git a/data/text/easy_chat/groups/trendy_saying/order.inc b/data/text/easy_chat/groups/trendy_saying/order.inc new file mode 100644 index 000000000..5b4cd031a --- /dev/null +++ b/data/text/easy_chat/groups/trendy_saying/order.inc @@ -0,0 +1,36 @@ + .align 1 + +gEasyChatGroupOrder_TrendySaying: @ 83DFBDA + .2byte 7 + .2byte 2 + .2byte 28 + .2byte 22 + .2byte 9 + .2byte 3 + .2byte 8 + .2byte 26 + .2byte 11 + .2byte 15 + .2byte 24 + .2byte 29 + .2byte 16 + .2byte 12 + .2byte 23 + .2byte 0 + .2byte 13 + .2byte 14 + .2byte 6 + .2byte 20 + .2byte 4 + .2byte 10 + .2byte 30 + .2byte 18 + .2byte 17 + .2byte 21 + .2byte 32 + .2byte 19 + .2byte 27 + .2byte 25 + .2byte 5 + .2byte 1 + .2byte 31 diff --git a/data/text/easy_chat/groups/trendy_saying/order.s b/data/text/easy_chat/groups/trendy_saying/order.s deleted file mode 100644 index 5b4cd031a..000000000 --- a/data/text/easy_chat/groups/trendy_saying/order.s +++ /dev/null @@ -1,36 +0,0 @@ - .align 1 - -gEasyChatGroupOrder_TrendySaying: @ 83DFBDA - .2byte 7 - .2byte 2 - .2byte 28 - .2byte 22 - .2byte 9 - .2byte 3 - .2byte 8 - .2byte 26 - .2byte 11 - .2byte 15 - .2byte 24 - .2byte 29 - .2byte 16 - .2byte 12 - .2byte 23 - .2byte 0 - .2byte 13 - .2byte 14 - .2byte 6 - .2byte 20 - .2byte 4 - .2byte 10 - .2byte 30 - .2byte 18 - .2byte 17 - .2byte 21 - .2byte 32 - .2byte 19 - .2byte 27 - .2byte 25 - .2byte 5 - .2byte 1 - .2byte 31 diff --git a/data/text/easy_chat/groups/trendy_saying/words.inc b/data/text/easy_chat/groups/trendy_saying/words.inc new file mode 100644 index 000000000..d69a5213c --- /dev/null +++ b/data/text/easy_chat/groups/trendy_saying/words.inc @@ -0,0 +1,35 @@ +gEasyChatGroupWords_TrendySaying: @ 83DDDF2 + .string "KTHX, BYE.$" + .string "YES, SIR!$" + .string "AVANT GARDE$" + .string "COUPLE$" + .string "MUCH OBLIGED$" + .string "YEEHAW!$" + .string "MEGA$" + .string "1-HIT KO!$" + .string "DESTINY$" + .string "CANCEL$" + .string "NEW$" + .string "FLATTEN$" + .string "KIDDING$" + .string "LOSER$" + .string "LOSING$" + .string "HAPPENING$" + .string "HIP AND$" + .string "SHAKE$" + .string "SHADY$" + .string "UPBEAT$" + .string "MODERN$" + .string "SMELL YA$" + .string "BANG$" + .string "KNOCKOUT$" + .string "HASSLE$" + .string "WINNER$" + .string "FEVER$" + .string "WANNABE$" + .string "BABY$" + .string "HEART$" + .string "OLD$" + .string "YOUNG$" + .string "UGLY$" + .string "$" diff --git a/data/text/easy_chat/groups/trendy_saying/words.s b/data/text/easy_chat/groups/trendy_saying/words.s deleted file mode 100644 index d69a5213c..000000000 --- a/data/text/easy_chat/groups/trendy_saying/words.s +++ /dev/null @@ -1,35 +0,0 @@ -gEasyChatGroupWords_TrendySaying: @ 83DDDF2 - .string "KTHX, BYE.$" - .string "YES, SIR!$" - .string "AVANT GARDE$" - .string "COUPLE$" - .string "MUCH OBLIGED$" - .string "YEEHAW!$" - .string "MEGA$" - .string "1-HIT KO!$" - .string "DESTINY$" - .string "CANCEL$" - .string "NEW$" - .string "FLATTEN$" - .string "KIDDING$" - .string "LOSER$" - .string "LOSING$" - .string "HAPPENING$" - .string "HIP AND$" - .string "SHAKE$" - .string "SHADY$" - .string "UPBEAT$" - .string "MODERN$" - .string "SMELL YA$" - .string "BANG$" - .string "KNOCKOUT$" - .string "HASSLE$" - .string "WINNER$" - .string "FEVER$" - .string "WANNABE$" - .string "BABY$" - .string "HEART$" - .string "OLD$" - .string "YOUNG$" - .string "UGLY$" - .string "$" diff --git a/data/text/easy_chat/groups/voices/order.inc b/data/text/easy_chat/groups/voices/order.inc new file mode 100644 index 000000000..563abcb09 --- /dev/null +++ b/data/text/easy_chat/groups/voices/order.inc @@ -0,0 +1,66 @@ + .align 1 + +gEasyChatGroupOrder_Voices: @ 83DF40C + .2byte 0 + .2byte 1 + .2byte 7 + .2byte 8 + .2byte 4 + .2byte 5 + .2byte 6 + .2byte 3 + .2byte 2 + .2byte 23 + .2byte 11 + .2byte 41 + .2byte 52 + .2byte 59 + .2byte 22 + .2byte 25 + .2byte 32 + .2byte 24 + .2byte 26 + .2byte 43 + .2byte 19 + .2byte 33 + .2byte 61 + .2byte 34 + .2byte 38 + .2byte 40 + .2byte 48 + .2byte 37 + .2byte 47 + .2byte 42 + .2byte 15 + .2byte 49 + .2byte 46 + .2byte 57 + .2byte 44 + .2byte 54 + .2byte 53 + .2byte 13 + .2byte 29 + .2byte 51 + .2byte 28 + .2byte 55 + .2byte 12 + .2byte 27 + .2byte 56 + .2byte 30 + .2byte 31 + .2byte 20 + .2byte 45 + .2byte 36 + .2byte 50 + .2byte 9 + .2byte 21 + .2byte 14 + .2byte 10 + .2byte 62 + .2byte 35 + .2byte 16 + .2byte 18 + .2byte 60 + .2byte 17 + .2byte 58 + .2byte 39 diff --git a/data/text/easy_chat/groups/voices/order.s b/data/text/easy_chat/groups/voices/order.s deleted file mode 100644 index 563abcb09..000000000 --- a/data/text/easy_chat/groups/voices/order.s +++ /dev/null @@ -1,66 +0,0 @@ - .align 1 - -gEasyChatGroupOrder_Voices: @ 83DF40C - .2byte 0 - .2byte 1 - .2byte 7 - .2byte 8 - .2byte 4 - .2byte 5 - .2byte 6 - .2byte 3 - .2byte 2 - .2byte 23 - .2byte 11 - .2byte 41 - .2byte 52 - .2byte 59 - .2byte 22 - .2byte 25 - .2byte 32 - .2byte 24 - .2byte 26 - .2byte 43 - .2byte 19 - .2byte 33 - .2byte 61 - .2byte 34 - .2byte 38 - .2byte 40 - .2byte 48 - .2byte 37 - .2byte 47 - .2byte 42 - .2byte 15 - .2byte 49 - .2byte 46 - .2byte 57 - .2byte 44 - .2byte 54 - .2byte 53 - .2byte 13 - .2byte 29 - .2byte 51 - .2byte 28 - .2byte 55 - .2byte 12 - .2byte 27 - .2byte 56 - .2byte 30 - .2byte 31 - .2byte 20 - .2byte 45 - .2byte 36 - .2byte 50 - .2byte 9 - .2byte 21 - .2byte 14 - .2byte 10 - .2byte 62 - .2byte 35 - .2byte 16 - .2byte 18 - .2byte 60 - .2byte 17 - .2byte 58 - .2byte 39 diff --git a/data/text/easy_chat/groups/voices/words.inc b/data/text/easy_chat/groups/voices/words.inc new file mode 100644 index 000000000..1dde075b9 --- /dev/null +++ b/data/text/easy_chat/groups/voices/words.inc @@ -0,0 +1,65 @@ +gEasyChatGroupWords_Voices: @ 83DCA20 + .string "!$" + .string "!!$" + .string "?!$" + .string "?$" + .string "…$" + .string "…!$" + .string "………$" + .string "-$" + .string "- - -$" + .string "UH-OH$" + .string "WAAAH$" + .string "AHAHA$" + .string "OH?$" + .string "NOPE$" + .string "URGH$" + .string "HMM$" + .string "WHOAH$" + .string "WROOOAAR!$" + .string "WOW$" + .string "GIGGLE$" + .string "SIGH$" + .string "UNBELIEVABLE$" + .string "CRIES$" + .string "AGREE$" + .string "EH?$" + .string "CRY$" + .string "EHEHE$" + .string "OI, OI, OI$" + .string "OH, YEAH$" + .string "OH$" + .string "OOPS$" + .string "SHOCKED$" + .string "EEK$" + .string "GRAAAH$" + .string "GWAHAHAHA$" + .string "WAY$" + .string "TCH$" + .string "HEHE$" + .string "HAH$" + .string "YUP$" + .string "HAHAHA$" + .string "AIYEEH$" + .string "HIYAH$" + .string "FUFUFU$" + .string "LOL$" + .string "SNORT$" + .string "HUMPH$" + .string "HEHEHE$" + .string "HEH$" + .string "HOHOHO$" + .string "UH-HUH$" + .string "OH, DEAR$" + .string "ARRGH$" + .string "MUFUFU$" + .string "MMM$" + .string "OH-KAY$" + .string "OKAY$" + .string "LALALA$" + .string "YAY$" + .string "AWW$" + .string "WOWEE$" + .string "GWAH$" + .string "WAHAHAHA$" + .string "$" diff --git a/data/text/easy_chat/groups/voices/words.s b/data/text/easy_chat/groups/voices/words.s deleted file mode 100644 index 1dde075b9..000000000 --- a/data/text/easy_chat/groups/voices/words.s +++ /dev/null @@ -1,65 +0,0 @@ -gEasyChatGroupWords_Voices: @ 83DCA20 - .string "!$" - .string "!!$" - .string "?!$" - .string "?$" - .string "…$" - .string "…!$" - .string "………$" - .string "-$" - .string "- - -$" - .string "UH-OH$" - .string "WAAAH$" - .string "AHAHA$" - .string "OH?$" - .string "NOPE$" - .string "URGH$" - .string "HMM$" - .string "WHOAH$" - .string "WROOOAAR!$" - .string "WOW$" - .string "GIGGLE$" - .string "SIGH$" - .string "UNBELIEVABLE$" - .string "CRIES$" - .string "AGREE$" - .string "EH?$" - .string "CRY$" - .string "EHEHE$" - .string "OI, OI, OI$" - .string "OH, YEAH$" - .string "OH$" - .string "OOPS$" - .string "SHOCKED$" - .string "EEK$" - .string "GRAAAH$" - .string "GWAHAHAHA$" - .string "WAY$" - .string "TCH$" - .string "HEHE$" - .string "HAH$" - .string "YUP$" - .string "HAHAHA$" - .string "AIYEEH$" - .string "HIYAH$" - .string "FUFUFU$" - .string "LOL$" - .string "SNORT$" - .string "HUMPH$" - .string "HEHEHE$" - .string "HEH$" - .string "HOHOHO$" - .string "UH-HUH$" - .string "OH, DEAR$" - .string "ARRGH$" - .string "MUFUFU$" - .string "MMM$" - .string "OH-KAY$" - .string "OKAY$" - .string "LALALA$" - .string "YAY$" - .string "AWW$" - .string "WOWEE$" - .string "GWAH$" - .string "WAHAHAHA$" - .string "$" diff --git a/data/text/gabby_and_ty.inc b/data/text/gabby_and_ty.inc new file mode 100644 index 000000000..d0eb413be --- /dev/null +++ b/data/text/gabby_and_ty.inc @@ -0,0 +1,244 @@ +Route111_Text_1ABED8:: @ 81ABED8 + .string "GABBY: Oh! We’ve just spotted a tough-\n" + .string "looking TRAINER here of all places!\p" + .string "Okay, roll camera!\n" + .string "Let’s get this interview.$" + +Route111_Text_1ABF50:: @ 81ABF50 +Route118_Text_1ABF50:: @ 81ABF50 +Route120_Text_1ABF50:: @ 81ABF50 + .string "GABBY: Oh! You’re {PLAYER}! Hi!\n" + .string "Do you remember us from last time?\p" + .string "Can you show us how much stronger\n" + .string "you’ve become? Okay, cue interview!$" + +Route111_Text_1ABFD3:: @ 81ABFD3 + .string "GABBY: My eyes didn’t lie!\n" + .string "I did discover an astonishing TRAINER!$" + +Route111_Text_1AC015:: @ 81AC015 + .string "GABBY: Awesome! Awesome!\n" + .string "Who are you?!\p" + .string "I knew we were onto something wild\n" + .string "when we spotted you!\p" + .string "Oh, please let me explain. We travel\n" + .string "around everywhere interviewing all\l" + .string "sorts of TRAINERS.\p" + .string "So, would you give us a bit of your time\n" + .string "for an interview?$" + +Route111_Text_1AC10A:: @ 81AC10A + .string "GABBY: “{STR_VAR_1}!”\p" + .string "Do you remember? That’s the quote you\n" + .string "gave us as the battle clincher last time.\p" + .string "I never, ever forget stuff like that!$" + +Route111_Text_1AC18D:: @ 81AC18D + .string "The last time we battled, you stomped\n" + .string "us before we could brace ourselves...\p" + .string "Anyway, what do you think?\n" + .string "Do you want to be interviewed again?$" + +Route111_Text_1AC219:: @ 81AC219 + .string "The last time we battled, didn’t you\n" + .string "throw a POKé BALL at us?\p" + .string "We were shocked! So we told everyone,\n" + .string "just everyone, about it!\p" + .string "Anyway, what do you think?\n" + .string "Do you want to be interviewed again?$" + +Route111_Text_1AC2D6:: @ 81AC2D6 + .string "The last time we battled, your item\n" + .string "skills cleverly did us in.\p" + .string "Anyway, what do you think?\n" + .string "Do you want to be interviewed again?$" + +Route111_Text_1AC355:: @ 81AC355 + .string "The last time we battled, we managed\n" + .string "to look respectable.\p" + .string "Anyway, what do you think?\n" + .string "Do you want to be interviewed again?$" + +Route111_Text_1AC3CF:: @ 81AC3CF + .string "Anyway, what do you think?\n" + .string "Do you want to be interviewed again?$" + +Route111_Text_1AC40F:: @ 81AC40F + .string "You will?\n" + .string "Thank you!\p" + .string "Okay, I need you to describe your\n" + .string "feelings about our battle, but it\l" + .string "has to be short and sweet. Go!$" + +Route111_Text_1AC487:: @ 81AC487 + .string "GABBY: Mmm, yeah!\n" + .string "That’s the perfect clincher!\p" + .string "I get the feeling that this will make\n" + .string "a great TV show.\p" + .string "There’s a chance that they’ll air this\n" + .string "on TV, so make sure to look for us!\p" + .string "Okay!\n" + .string "We’ll be seeing you!$" + +Route111_Text_1AC553:: @ 81AC553 + .string "GABBY: Oh...\p" + .string "Okay, but don’t give up!\n" + .string "We’ll be keeping an eye out for you!$" + +Route111_Text_1AC59E:: @ 81AC59E +Route118_Text_1AC59E:: @ 81AC59E +Route120_Text_1AC59E:: @ 81AC59E + .string "GABBY: We’ll be keeping an eye out\n" + .string "for you!$" + +Route111_Text_1AC5CA:: @ 81AC5CA +Route118_Text_1AC5CA:: @ 81AC5CA +Route120_Text_1AC5CA:: @ 81AC5CA + .string "GABBY: Is there a strong TRAINER\n" + .string "anywhere with a lot of POKéMON?$" + +Route111_Text_1AC60B:: @ 81AC60B + .string "GABBY: Wow, you are something!\p" + .string "You’ve gotten a lot stronger - a lot -\n" + .string "since we last battled.\p" + .string "We were right about you when we\n" + .string "spotted you as a hot TRAINER.\p" + .string "So, anyway, what do you think?\n" + .string "Are you willing to give us an interview\l" + .string "this time?$" + +Route111_Text_1AC6F8:: @ 81AC6F8 +Route118_Text_1AC6F8:: @ 81AC6F8 +Route120_Text_1AC6F8:: @ 81AC6F8 + .string "GABBY: That was an intense battle!\n" + .string "Did you get all that on camera?$" + +Route111_Text_1AC73B:: @ 81AC73B + .string "TY: Hey, lookie here! A tough-looking\n" + .string "TRAINER here, of all places!\l" + .string "Camera’s rolling!$" + +Route111_Text_1AC790:: @ 81AC790 +Route118_Text_1AC790:: @ 81AC790 +Route120_Text_1AC790:: @ 81AC790 + .string "TY: Hey, lookie here!\n" + .string "I remember you!\p" + .string "I’ll get this battle all on this\n" + .string "here camera!$" + +Route111_Text_1AC7E4:: @ 81AC7E4 +Route118_Text_1AC7E4:: @ 81AC7E4 +Route120_Text_1AC7E4:: @ 81AC7E4 + .string "TY: You’re a natural!\n" + .string "Got me some prime footage right here!$" + +Route111_Text_1AC820:: @ 81AC820 +Route118_Text_1AC820:: @ 81AC820 +Route120_Text_1AC820:: @ 81AC820 + .string "TY: Do you only have the one POKéMON\n" + .string "and that’s it?\p" + .string "If you had more POKéMON, it’d make for\n" + .string "better footage, but...$" + +Route111_Text_1AC892:: @ 81AC892 + .string "TY: Yep, we sure spotted a hot TRAINER.\n" + .string "This is a huge scoop for us!$" + +Route111_Text_1AC8D7:: @ 81AC8D7 +Route118_Text_1AC8D7:: @ 81AC8D7 +Route120_Text_1AC8D7:: @ 81AC8D7 + .string "TY: Yep, I got it all.\n" + .string "That whole battle’s on camera.$" + +gTVGabbyAndTyText1:: @ 81AC90D + .string "IN SEARCH OF TRAINERS...\p" + .string "GABBY: Hi! Today I’m visiting an area\n" + .string "near {STR_VAR_1}.\p" + .string "We’re trying to spot some up-and-coming\n" + .string "new talent in the field.\p" + .string "Today, we turned our lens on the\n" + .string "TRAINER {PLAYER}.\p" + .string "There’s something about this TRAINER\n" + .string "that piqued our interest.$" + +gTVGabbyAndTyText2:: @ 81ACA02 + .string "We’ve battled {PLAYER} before, but we\n" + .string "can attest that the TRAINER has most\l" + .string "definitely improved from before.\p" + .string "I knew we were onto someone special\n" + .string "when we spotted this TRAINER!$" + +gTVGabbyAndTyText3:: @ 81ACAAA + .string "The best way to determine how strong\n" + .string "a TRAINER is...\p" + .string "Well, the fastest way is to battle.\n" + .string "And so we began our investigation!\p" + .string "... ...\p" + .string "That’s how we ended up in battle\n" + .string "with {PLAYER}.\p" + .string "In a dominating performance, we were\n" + .string "flattened, rolled up, and tossed aside!\p" + .string "{PLAYER} is ruthlessly strong...\p" + .string "We asked the TRAINER for a succinct\n" + .string "summation of the battle we shared.$" + +gTVGabbyAndTyText4:: @ 81ACC07 + .string "The combination of {STR_VAR_1} and\n" + .string "{STR_VAR_3} was divine!\p" + .string "The sight of them - {STR_VAR_1} and\n" + .string "{STR_VAR_3} - selflessly supporting\l" + .string "each other in the thick of battle...\p" + .string "It was a marvelous sight to behold!\p" + .string "{STR_VAR_2} was the move the TRAINER\n" + .string "used last in our battle.\p" + .string "The move {STR_VAR_2} is {STR_VAR_1}\n" + .string "and {STR_VAR_3}’s sign of friendship!$" + +gTVGabbyAndTyText5:: @ 81ACD13 + .string "...I lost confidence in myself as\n" + .string "a result of our encounter.\p" + .string "We were beaten before we could launch\n" + .string "a single attack.\l" + .string "Ohhh... Snivel...\p" + .string "In spite of that, {PLAYER}’s battles\n" + .string "are worth seeing.\p" + .string "I recommend confident TRAINERS to\n" + .string "challenge {PLAYER}.$" + +gTVGabbyAndTyText6:: @ 81ACDFA + .string "There’s only one thing to be said.\n" + .string "Don’t you dare throw a POKé BALL during\l" + .string "a TRAINER battle!\p" + .string "{PLAYER} is certainly strong, but has\n" + .string "no clue about the basic rules.\p" + .string "To our TV audience, I have a request.\p" + .string "If you see {PLAYER}, please caution\n" + .string "the TRAINER!$" + +gTVGabbyAndTyText7:: @ 81ACEE7 + .string "{PLAYER} is adept at reading the\n" + .string "opponent’s actions.\p" + .string "The timing of item usage was remarkably\n" + .string "effective!$" + +gTVGabbyAndTyText8:: @ 81ACF49 + .string "Honestly speaking, I thought that\n" + .string "I might even be pretty good.\p" + .string "While we did end up losing, we did have\n" + .string "a hotly contested battle.\p" + .string "But if you’re struggling against me,\n" + .string "you have a ways to go, {PLAYER}!$" + +gTVGabbyAndTyText9:: @ 81AD00A + .string "After our battle, we asked {PLAYER} for\n" + .string "a succinct summary.\p" + .string "The TRAINER replied, “{STR_VAR_1}.”\p" + .string "{PLAYER}’s POKéMON {STR_VAR_2} and\n" + .string "{STR_VAR_3}...\l" + .string "And “{STR_VAR_1}”...\p" + .string "Mmm! That’s deep! There’s deep\n" + .string "significance behind that quote!\p" + .string "It’s no surprise - a good TRAINER has\n" + .string "good things to say.\p" + .string "That’s all for today!\n" + .string "See you again on our next broadcast!$" diff --git a/data/text/gabby_and_ty.s b/data/text/gabby_and_ty.s deleted file mode 100644 index d0eb413be..000000000 --- a/data/text/gabby_and_ty.s +++ /dev/null @@ -1,244 +0,0 @@ -Route111_Text_1ABED8:: @ 81ABED8 - .string "GABBY: Oh! We’ve just spotted a tough-\n" - .string "looking TRAINER here of all places!\p" - .string "Okay, roll camera!\n" - .string "Let’s get this interview.$" - -Route111_Text_1ABF50:: @ 81ABF50 -Route118_Text_1ABF50:: @ 81ABF50 -Route120_Text_1ABF50:: @ 81ABF50 - .string "GABBY: Oh! You’re {PLAYER}! Hi!\n" - .string "Do you remember us from last time?\p" - .string "Can you show us how much stronger\n" - .string "you’ve become? Okay, cue interview!$" - -Route111_Text_1ABFD3:: @ 81ABFD3 - .string "GABBY: My eyes didn’t lie!\n" - .string "I did discover an astonishing TRAINER!$" - -Route111_Text_1AC015:: @ 81AC015 - .string "GABBY: Awesome! Awesome!\n" - .string "Who are you?!\p" - .string "I knew we were onto something wild\n" - .string "when we spotted you!\p" - .string "Oh, please let me explain. We travel\n" - .string "around everywhere interviewing all\l" - .string "sorts of TRAINERS.\p" - .string "So, would you give us a bit of your time\n" - .string "for an interview?$" - -Route111_Text_1AC10A:: @ 81AC10A - .string "GABBY: “{STR_VAR_1}!”\p" - .string "Do you remember? That’s the quote you\n" - .string "gave us as the battle clincher last time.\p" - .string "I never, ever forget stuff like that!$" - -Route111_Text_1AC18D:: @ 81AC18D - .string "The last time we battled, you stomped\n" - .string "us before we could brace ourselves...\p" - .string "Anyway, what do you think?\n" - .string "Do you want to be interviewed again?$" - -Route111_Text_1AC219:: @ 81AC219 - .string "The last time we battled, didn’t you\n" - .string "throw a POKé BALL at us?\p" - .string "We were shocked! So we told everyone,\n" - .string "just everyone, about it!\p" - .string "Anyway, what do you think?\n" - .string "Do you want to be interviewed again?$" - -Route111_Text_1AC2D6:: @ 81AC2D6 - .string "The last time we battled, your item\n" - .string "skills cleverly did us in.\p" - .string "Anyway, what do you think?\n" - .string "Do you want to be interviewed again?$" - -Route111_Text_1AC355:: @ 81AC355 - .string "The last time we battled, we managed\n" - .string "to look respectable.\p" - .string "Anyway, what do you think?\n" - .string "Do you want to be interviewed again?$" - -Route111_Text_1AC3CF:: @ 81AC3CF - .string "Anyway, what do you think?\n" - .string "Do you want to be interviewed again?$" - -Route111_Text_1AC40F:: @ 81AC40F - .string "You will?\n" - .string "Thank you!\p" - .string "Okay, I need you to describe your\n" - .string "feelings about our battle, but it\l" - .string "has to be short and sweet. Go!$" - -Route111_Text_1AC487:: @ 81AC487 - .string "GABBY: Mmm, yeah!\n" - .string "That’s the perfect clincher!\p" - .string "I get the feeling that this will make\n" - .string "a great TV show.\p" - .string "There’s a chance that they’ll air this\n" - .string "on TV, so make sure to look for us!\p" - .string "Okay!\n" - .string "We’ll be seeing you!$" - -Route111_Text_1AC553:: @ 81AC553 - .string "GABBY: Oh...\p" - .string "Okay, but don’t give up!\n" - .string "We’ll be keeping an eye out for you!$" - -Route111_Text_1AC59E:: @ 81AC59E -Route118_Text_1AC59E:: @ 81AC59E -Route120_Text_1AC59E:: @ 81AC59E - .string "GABBY: We’ll be keeping an eye out\n" - .string "for you!$" - -Route111_Text_1AC5CA:: @ 81AC5CA -Route118_Text_1AC5CA:: @ 81AC5CA -Route120_Text_1AC5CA:: @ 81AC5CA - .string "GABBY: Is there a strong TRAINER\n" - .string "anywhere with a lot of POKéMON?$" - -Route111_Text_1AC60B:: @ 81AC60B - .string "GABBY: Wow, you are something!\p" - .string "You’ve gotten a lot stronger - a lot -\n" - .string "since we last battled.\p" - .string "We were right about you when we\n" - .string "spotted you as a hot TRAINER.\p" - .string "So, anyway, what do you think?\n" - .string "Are you willing to give us an interview\l" - .string "this time?$" - -Route111_Text_1AC6F8:: @ 81AC6F8 -Route118_Text_1AC6F8:: @ 81AC6F8 -Route120_Text_1AC6F8:: @ 81AC6F8 - .string "GABBY: That was an intense battle!\n" - .string "Did you get all that on camera?$" - -Route111_Text_1AC73B:: @ 81AC73B - .string "TY: Hey, lookie here! A tough-looking\n" - .string "TRAINER here, of all places!\l" - .string "Camera’s rolling!$" - -Route111_Text_1AC790:: @ 81AC790 -Route118_Text_1AC790:: @ 81AC790 -Route120_Text_1AC790:: @ 81AC790 - .string "TY: Hey, lookie here!\n" - .string "I remember you!\p" - .string "I’ll get this battle all on this\n" - .string "here camera!$" - -Route111_Text_1AC7E4:: @ 81AC7E4 -Route118_Text_1AC7E4:: @ 81AC7E4 -Route120_Text_1AC7E4:: @ 81AC7E4 - .string "TY: You’re a natural!\n" - .string "Got me some prime footage right here!$" - -Route111_Text_1AC820:: @ 81AC820 -Route118_Text_1AC820:: @ 81AC820 -Route120_Text_1AC820:: @ 81AC820 - .string "TY: Do you only have the one POKéMON\n" - .string "and that’s it?\p" - .string "If you had more POKéMON, it’d make for\n" - .string "better footage, but...$" - -Route111_Text_1AC892:: @ 81AC892 - .string "TY: Yep, we sure spotted a hot TRAINER.\n" - .string "This is a huge scoop for us!$" - -Route111_Text_1AC8D7:: @ 81AC8D7 -Route118_Text_1AC8D7:: @ 81AC8D7 -Route120_Text_1AC8D7:: @ 81AC8D7 - .string "TY: Yep, I got it all.\n" - .string "That whole battle’s on camera.$" - -gTVGabbyAndTyText1:: @ 81AC90D - .string "IN SEARCH OF TRAINERS...\p" - .string "GABBY: Hi! Today I’m visiting an area\n" - .string "near {STR_VAR_1}.\p" - .string "We’re trying to spot some up-and-coming\n" - .string "new talent in the field.\p" - .string "Today, we turned our lens on the\n" - .string "TRAINER {PLAYER}.\p" - .string "There’s something about this TRAINER\n" - .string "that piqued our interest.$" - -gTVGabbyAndTyText2:: @ 81ACA02 - .string "We’ve battled {PLAYER} before, but we\n" - .string "can attest that the TRAINER has most\l" - .string "definitely improved from before.\p" - .string "I knew we were onto someone special\n" - .string "when we spotted this TRAINER!$" - -gTVGabbyAndTyText3:: @ 81ACAAA - .string "The best way to determine how strong\n" - .string "a TRAINER is...\p" - .string "Well, the fastest way is to battle.\n" - .string "And so we began our investigation!\p" - .string "... ...\p" - .string "That’s how we ended up in battle\n" - .string "with {PLAYER}.\p" - .string "In a dominating performance, we were\n" - .string "flattened, rolled up, and tossed aside!\p" - .string "{PLAYER} is ruthlessly strong...\p" - .string "We asked the TRAINER for a succinct\n" - .string "summation of the battle we shared.$" - -gTVGabbyAndTyText4:: @ 81ACC07 - .string "The combination of {STR_VAR_1} and\n" - .string "{STR_VAR_3} was divine!\p" - .string "The sight of them - {STR_VAR_1} and\n" - .string "{STR_VAR_3} - selflessly supporting\l" - .string "each other in the thick of battle...\p" - .string "It was a marvelous sight to behold!\p" - .string "{STR_VAR_2} was the move the TRAINER\n" - .string "used last in our battle.\p" - .string "The move {STR_VAR_2} is {STR_VAR_1}\n" - .string "and {STR_VAR_3}’s sign of friendship!$" - -gTVGabbyAndTyText5:: @ 81ACD13 - .string "...I lost confidence in myself as\n" - .string "a result of our encounter.\p" - .string "We were beaten before we could launch\n" - .string "a single attack.\l" - .string "Ohhh... Snivel...\p" - .string "In spite of that, {PLAYER}’s battles\n" - .string "are worth seeing.\p" - .string "I recommend confident TRAINERS to\n" - .string "challenge {PLAYER}.$" - -gTVGabbyAndTyText6:: @ 81ACDFA - .string "There’s only one thing to be said.\n" - .string "Don’t you dare throw a POKé BALL during\l" - .string "a TRAINER battle!\p" - .string "{PLAYER} is certainly strong, but has\n" - .string "no clue about the basic rules.\p" - .string "To our TV audience, I have a request.\p" - .string "If you see {PLAYER}, please caution\n" - .string "the TRAINER!$" - -gTVGabbyAndTyText7:: @ 81ACEE7 - .string "{PLAYER} is adept at reading the\n" - .string "opponent’s actions.\p" - .string "The timing of item usage was remarkably\n" - .string "effective!$" - -gTVGabbyAndTyText8:: @ 81ACF49 - .string "Honestly speaking, I thought that\n" - .string "I might even be pretty good.\p" - .string "While we did end up losing, we did have\n" - .string "a hotly contested battle.\p" - .string "But if you’re struggling against me,\n" - .string "you have a ways to go, {PLAYER}!$" - -gTVGabbyAndTyText9:: @ 81AD00A - .string "After our battle, we asked {PLAYER} for\n" - .string "a succinct summary.\p" - .string "The TRAINER replied, “{STR_VAR_1}.”\p" - .string "{PLAYER}’s POKéMON {STR_VAR_2} and\n" - .string "{STR_VAR_3}...\l" - .string "And “{STR_VAR_1}”...\p" - .string "Mmm! That’s deep! There’s deep\n" - .string "significance behind that quote!\p" - .string "It’s no surprise - a good TRAINER has\n" - .string "good things to say.\p" - .string "That’s all for today!\n" - .string "See you again on our next broadcast!$" diff --git a/data/text/pokemon_news.inc b/data/text/pokemon_news.inc new file mode 100644 index 000000000..95bb0888a --- /dev/null +++ b/data/text/pokemon_news.inc @@ -0,0 +1,146 @@ +gTVNewsText_EnergyGuru1:: @ 81AD135 + .string "Greetings!\n" + .string "It’s time for POKéMON NEWS.\p" + .string "SLATEPORT’s most popular kind of guy,\n" + .string "the ENERGY GURU, is in the news again!\p" + .string "He promises to, “Stupendously go for\n" + .string "it in just this many days: {STR_VAR_1}!”\p" + .string "While he refused to elaborate on what\n" + .string "he will stupendously go for, the\l" + .string "ENERGY GURU advised, “Save up your\l" + .string "money. That’ll be good...”\p" + .string "It sounds like a trip to SLATEPORT\n" + .string "would be well worth your while that day.\p" + .string "That’s the news on POKéMON NEWS.$" + +gTVNewsText_EnergyGuru2:: @ 81AD2E0 + .string "Greetings!\n" + .string "It’s time for POKéMON NEWS.\p" + .string "This is the news you’ve all been\n" + .string "waiting for!\p" + .string "SLATEPORT’S ENERGY GURU is going\n" + .string "for it stupendously in the MARKET!\p" + .string "He promises unbeatable bargain\n" + .string "prices on CALCIUM and PROTEIN!\p" + .string "A trip to SLATEPORT CITY sounds\n" + .string "worthwhile. Why not visit and shop\l" + .string "to your heart’s content?\p" + .string "That’s the news on POKéMON NEWS.$" + +gTVNewsText_EnergyGuru3:: @ 81AD434 + .string "Greetings!\n" + .string "It’s time for POKéMON NEWS.\p" + .string "This is the news you’ve all been\n" + .string "waiting for!\p" + .string "SLATEPORT’S ENERGY GURU is going\n" + .string "for it stupendously in the MARKET!\p" + .string "He promises unbeatable bargain\n" + .string "prices on CALCIUM and PROTEIN!\p" + .string "According to the ENERGY GURU, he\n" + .string "still has ample merchandise left.\p" + .string "Why not visit SLATEPORT CITY for\n" + .string "a most enjoyable shopping trip?\p" + .string "That’s the news on POKéMON NEWS.$" + +gTVNewsText_GameCorner1:: @ 81AD5B0 + .string "Greetings!\n" + .string "It’s time for POKéMON NEWS.\p" + .string "It’s approaching!\n" + .string "It’s finally coming!\p" + .string "The GAME CORNER’s service day will be\n" + .string "here in just this many days: {STR_VAR_1}!\p" + .string "Even those who are usually unlucky\n" + .string "may be lucky on this particular day!\p" + .string "That’s the news on POKéMON NEWS.$" + +gTVNewsText_GameCorner2:: @ 81AD6AE + .string "Greetings!\n" + .string "It’s time for POKéMON NEWS.\p" + .string "It’s here!\n" + .string "It’s finally arrived!\p" + .string "GAME CORNER’s service day has finally\n" + .string "arrived!\p" + .string "Could you be lucky at the SLOTS \n" + .string "and ROULETTE?\p" + .string "The location is MAUVILLE CITY.\n" + .string "This is the place!\p" + .string "That’s the news on POKéMON NEWS.$" + +gTVNewsText_GameCorner3:: @ 81AD7A7 + .string "Greetings!\n" + .string "It’s time for POKéMON NEWS.\p" + .string "It’s here!\n" + .string "It’s finally arrived!\p" + .string "GAME CORNER’s service day has finally\n" + .string "arrived!\p" + .string "Could you be lucky at the SLOTS\n" + .string "and ROULETTE?\p" + .string "Time is limited and has almost run out.\n" + .string "The location is MAUVILLE CITY.\p" + .string "That’s the news on POKéMON NEWS.$" + +gTVNewsText_LilycoveDepartment1:: @ 81AD8B4 + .string "Greetings!\n" + .string "It’s time for POKéMON NEWS.\p" + .string "We’ve just received wonderful news\n" + .string "from LILYCOVE DEPARTMENT STORE.\p" + .string "The DEPARTMENT STORE’s clear-out sale\n" + .string "will be in just this many days: {STR_VAR_1}!\p" + .string "That thingamajig or that doodad that\n" + .string "you’ve always wanted could be yours!\p" + .string "That’s the news on POKéMON NEWS.$" + +gTVNewsText_LilycoveDepartment2:: @ 81AD9D3 + .string "Greetings!\n" + .string "It’s time for POKéMON NEWS.\p" + .string "This is the news you’ve all been\n" + .string "waiting for!\p" + .string "LILYCOVE DEPARTMENT STORE’s clear-out\n" + .string "sale has finally arrived!\p" + .string "All the thingamajigs and doodads that\n" + .string "you’ve always dreamt about...\p" + .string "You may be in for fateful encounters\n" + .string "with them all!\p" + .string "That’s the news on POKéMON NEWS.$" + +gTVNewsText_LilycoveDepartment3:: @ 81ADB01 + .string "Greetings!\n" + .string "It’s time for POKéMON NEWS.\p" + .string "This is the news you’ve all been\n" + .string "waiting for!\p" + .string "LILYCOVE DEPARTMENT STORE’s clear-out\n" + .string "sale has finally arrived!\p" + .string "All the thingamajigs and doodads that\n" + .string "you’ve always dreamt about...\p" + .string "You may be in for fateful encounters\n" + .string "with them all!\p" + .string "That’s the news on POKéMON NEWS.$" + + @ all text advertisements below are unused. +gTVUnusedText_DevonCorporation:: @ 81ADC2F + .string "This program has been brought to you\n" + .string "by the DEVON CORPORATION.$" + +gTVUnusedText_Contests:: @ 81ADC6E + .string "What’s important is love for POKéMON.\p" + .string "What you need is a little courage.\p" + .string "Let your cherished POKéMON take\n" + .string "center stage! POKéMON CONTESTS!$" + +gTVUnusedText_DayCare:: @ 81ADCF7 + .string "We raise your beloved POKéMON with\n" + .string "all of our love!\p" + .string "For all your POKéMON-training needs,\n" + .string "visit our DAY CARE on ROUTE 117.$" + +gTVUnusedText_LavaridgeSpa:: @ 81ADD71 + .string "The cauldron of good times and laughs!\n" + .string "LAVARIDGE SPA.$" + +gTVUnusedText_LilycoveDepartment:: @ 81ADDA7 + .string "Overflowing with great merchandise\n" + .string "and excitement!\p" + .string "A great place to find that something\n" + .string "you need!\p" + .string "Visit LILYCOVE DEPARTMENT STORE for\n" + .string "all your shopping needs!$" diff --git a/data/text/pokemon_news.s b/data/text/pokemon_news.s deleted file mode 100644 index 95bb0888a..000000000 --- a/data/text/pokemon_news.s +++ /dev/null @@ -1,146 +0,0 @@ -gTVNewsText_EnergyGuru1:: @ 81AD135 - .string "Greetings!\n" - .string "It’s time for POKéMON NEWS.\p" - .string "SLATEPORT’s most popular kind of guy,\n" - .string "the ENERGY GURU, is in the news again!\p" - .string "He promises to, “Stupendously go for\n" - .string "it in just this many days: {STR_VAR_1}!”\p" - .string "While he refused to elaborate on what\n" - .string "he will stupendously go for, the\l" - .string "ENERGY GURU advised, “Save up your\l" - .string "money. That’ll be good...”\p" - .string "It sounds like a trip to SLATEPORT\n" - .string "would be well worth your while that day.\p" - .string "That’s the news on POKéMON NEWS.$" - -gTVNewsText_EnergyGuru2:: @ 81AD2E0 - .string "Greetings!\n" - .string "It’s time for POKéMON NEWS.\p" - .string "This is the news you’ve all been\n" - .string "waiting for!\p" - .string "SLATEPORT’S ENERGY GURU is going\n" - .string "for it stupendously in the MARKET!\p" - .string "He promises unbeatable bargain\n" - .string "prices on CALCIUM and PROTEIN!\p" - .string "A trip to SLATEPORT CITY sounds\n" - .string "worthwhile. Why not visit and shop\l" - .string "to your heart’s content?\p" - .string "That’s the news on POKéMON NEWS.$" - -gTVNewsText_EnergyGuru3:: @ 81AD434 - .string "Greetings!\n" - .string "It’s time for POKéMON NEWS.\p" - .string "This is the news you’ve all been\n" - .string "waiting for!\p" - .string "SLATEPORT’S ENERGY GURU is going\n" - .string "for it stupendously in the MARKET!\p" - .string "He promises unbeatable bargain\n" - .string "prices on CALCIUM and PROTEIN!\p" - .string "According to the ENERGY GURU, he\n" - .string "still has ample merchandise left.\p" - .string "Why not visit SLATEPORT CITY for\n" - .string "a most enjoyable shopping trip?\p" - .string "That’s the news on POKéMON NEWS.$" - -gTVNewsText_GameCorner1:: @ 81AD5B0 - .string "Greetings!\n" - .string "It’s time for POKéMON NEWS.\p" - .string "It’s approaching!\n" - .string "It’s finally coming!\p" - .string "The GAME CORNER’s service day will be\n" - .string "here in just this many days: {STR_VAR_1}!\p" - .string "Even those who are usually unlucky\n" - .string "may be lucky on this particular day!\p" - .string "That’s the news on POKéMON NEWS.$" - -gTVNewsText_GameCorner2:: @ 81AD6AE - .string "Greetings!\n" - .string "It’s time for POKéMON NEWS.\p" - .string "It’s here!\n" - .string "It’s finally arrived!\p" - .string "GAME CORNER’s service day has finally\n" - .string "arrived!\p" - .string "Could you be lucky at the SLOTS \n" - .string "and ROULETTE?\p" - .string "The location is MAUVILLE CITY.\n" - .string "This is the place!\p" - .string "That’s the news on POKéMON NEWS.$" - -gTVNewsText_GameCorner3:: @ 81AD7A7 - .string "Greetings!\n" - .string "It’s time for POKéMON NEWS.\p" - .string "It’s here!\n" - .string "It’s finally arrived!\p" - .string "GAME CORNER’s service day has finally\n" - .string "arrived!\p" - .string "Could you be lucky at the SLOTS\n" - .string "and ROULETTE?\p" - .string "Time is limited and has almost run out.\n" - .string "The location is MAUVILLE CITY.\p" - .string "That’s the news on POKéMON NEWS.$" - -gTVNewsText_LilycoveDepartment1:: @ 81AD8B4 - .string "Greetings!\n" - .string "It’s time for POKéMON NEWS.\p" - .string "We’ve just received wonderful news\n" - .string "from LILYCOVE DEPARTMENT STORE.\p" - .string "The DEPARTMENT STORE’s clear-out sale\n" - .string "will be in just this many days: {STR_VAR_1}!\p" - .string "That thingamajig or that doodad that\n" - .string "you’ve always wanted could be yours!\p" - .string "That’s the news on POKéMON NEWS.$" - -gTVNewsText_LilycoveDepartment2:: @ 81AD9D3 - .string "Greetings!\n" - .string "It’s time for POKéMON NEWS.\p" - .string "This is the news you’ve all been\n" - .string "waiting for!\p" - .string "LILYCOVE DEPARTMENT STORE’s clear-out\n" - .string "sale has finally arrived!\p" - .string "All the thingamajigs and doodads that\n" - .string "you’ve always dreamt about...\p" - .string "You may be in for fateful encounters\n" - .string "with them all!\p" - .string "That’s the news on POKéMON NEWS.$" - -gTVNewsText_LilycoveDepartment3:: @ 81ADB01 - .string "Greetings!\n" - .string "It’s time for POKéMON NEWS.\p" - .string "This is the news you’ve all been\n" - .string "waiting for!\p" - .string "LILYCOVE DEPARTMENT STORE’s clear-out\n" - .string "sale has finally arrived!\p" - .string "All the thingamajigs and doodads that\n" - .string "you’ve always dreamt about...\p" - .string "You may be in for fateful encounters\n" - .string "with them all!\p" - .string "That’s the news on POKéMON NEWS.$" - - @ all text advertisements below are unused. -gTVUnusedText_DevonCorporation:: @ 81ADC2F - .string "This program has been brought to you\n" - .string "by the DEVON CORPORATION.$" - -gTVUnusedText_Contests:: @ 81ADC6E - .string "What’s important is love for POKéMON.\p" - .string "What you need is a little courage.\p" - .string "Let your cherished POKéMON take\n" - .string "center stage! POKéMON CONTESTS!$" - -gTVUnusedText_DayCare:: @ 81ADCF7 - .string "We raise your beloved POKéMON with\n" - .string "all of our love!\p" - .string "For all your POKéMON-training needs,\n" - .string "visit our DAY CARE on ROUTE 117.$" - -gTVUnusedText_LavaridgeSpa:: @ 81ADD71 - .string "The cauldron of good times and laughs!\n" - .string "LAVARIDGE SPA.$" - -gTVUnusedText_LilycoveDepartment:: @ 81ADDA7 - .string "Overflowing with great merchandise\n" - .string "and excitement!\p" - .string "A great place to find that something\n" - .string "you need!\p" - .string "Visit LILYCOVE DEPARTMENT STORE for\n" - .string "all your shopping needs!$" diff --git a/data/text/tv.inc b/data/text/tv.inc index f1f078405..c27559abd 100644 --- a/data/text/tv.inc +++ b/data/text/tv.inc @@ -1046,5 +1046,5 @@ gTVWorldOfMastersText3:: @ 81ABDF2 .string "That’s all for today.\n" .string "Please tune in next time.$" - .include "data/text/gabby_and_ty.s" - .include "data/text/pokemon_news.s" + .include "data/text/gabby_and_ty.inc" + .include "data/text/pokemon_news.inc" -- cgit v1.2.3