From a6c30ba9513ccbd202fec8e628c9336c5c3a4aa4 Mon Sep 17 00:00:00 2001 From: Diegoisawesome Date: Fri, 10 Nov 2017 13:20:27 -0600 Subject: [PATCH] More file organization --- asm/battle_frontier_2.s | 2 +- asm/rom4.s | 2 +- constants/constants.inc | 2 - constants/{vars.inc => variables.inc} | 0 data/battle_anim_80A9C70.s | 23 + data/event_script_command_function_table.inc | 3 + data/event_scripts.s | 5 +- data/map_events.s | 526 +++++++++++++++++ data/maps/attributes_table.inc | 2 +- .../Route124_DivingTreasureHuntersHouse.inc | 12 + data/rom_8525F58.s | 554 ------------------ ld_script.txt | 2 + 12 files changed, 571 insertions(+), 562 deletions(-) rename constants/{vars.inc => variables.inc} (100%) create mode 100644 data/battle_anim_80A9C70.s create mode 100644 data/map_events.s create mode 100644 data/maps/events/Route124_DivingTreasureHuntersHouse.inc diff --git a/asm/battle_frontier_2.s b/asm/battle_frontier_2.s index 0dd4d6a26..7aa048431 100755 --- a/asm/battle_frontier_2.s +++ b/asm/battle_frontier_2.s @@ -29962,7 +29962,7 @@ _081AA0A6: ldr r2, =0x00000169 adds r0, r2 lsls r0, 2 - ldr r1, =gUnknown_08481DD4 + ldr r1, =gMapAttributes adds r0, r1 ldr r6, [r0] ldr r2, [r6, 0xC] diff --git a/asm/rom4.s b/asm/rom4.s index b344f13fa..2ebf6746a 100644 --- a/asm/rom4.s +++ b/asm/rom4.s @@ -419,7 +419,7 @@ get_mapdata_header: @ 80849A8 b _080849C6 .pool _080849BC: - ldr r0, =gUnknown_08481DD4 + ldr r0, =gMapAttributes subs r1, 0x1 lsls r1, 2 adds r1, r0 diff --git a/constants/constants.inc b/constants/constants.inc index db0a4ec30..fbd4e8af0 100644 --- a/constants/constants.inc +++ b/constants/constants.inc @@ -18,5 +18,3 @@ .include "constants/field_object_constants.inc" .include "constants/contest_move_effects.inc" .include "constants/songs.inc" - .include "constants/flags.inc" - .include "constants/vars.inc" diff --git a/constants/vars.inc b/constants/variables.inc similarity index 100% rename from constants/vars.inc rename to constants/variables.inc diff --git a/data/battle_anim_80A9C70.s b/data/battle_anim_80A9C70.s new file mode 100644 index 000000000..1b27b1044 --- /dev/null +++ b/data/battle_anim_80A9C70.s @@ -0,0 +1,23 @@ + .include "asm/macros.inc" + .include "constants/constants.inc" + + .section .rodata + + .incbin "baserom.gba", 0x53ede4, 0x14c + + .align 2 +gUnknown_0853EF30:: @ 853EF30 + .byte 0xf0, 0xf0, 0x0c, 0x80, 0xf0, 0x30, 0x0d, 0x84, 0x30, 0xf0, 0x0e, 0x86, 0x30, 0x30, 0x08, 0x88 + + .align 2 +gUnknown_0853EF40:: @ 853EF40 + .4byte 0x00000004, gUnknown_0853EF30 + + .align 2 +gUnknown_0853EF48:: @ 853EF48 + spr_template 0x271a, 0x271a, gUnknown_08524A3C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + + .align 2 +gUnknown_0853EF60:: @ 853EF60 + spr_template 0x2798, 0x2798, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A9E44 + diff --git a/data/event_script_command_function_table.inc b/data/event_script_command_function_table.inc index bef236c9a..b33db9218 100644 --- a/data/event_script_command_function_table.inc +++ b/data/event_script_command_function_table.inc @@ -227,3 +227,6 @@ gScriptCmdTable:: @ 81DB67C .4byte ScrCmd_warpE0 .4byte ScrCmd_buffercontesttype .4byte ScrCmd_bufferitemnameplural + +gScriptCmdTableEnd:: @ 81DBA08 + .4byte ScrCmd_nop diff --git a/data/event_scripts.s b/data/event_scripts.s index f8a108a00..f9b074e19 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1,15 +1,14 @@ .include "asm/macros.inc" .include "asm/macros/event.inc" .include "constants/constants.inc" + .include "constants/variables.inc" + .include "constants/flags.inc" .section script_data, "aw", %progbits @ 81DB67C .include "data/event_script_command_function_table.inc" -gScriptCmdTableEnd:: @ 81DBA08 - .incbin "baserom.gba", 0x1dba08, 0x4 - gSpecialVars:: @ 81DBA0C .incbin "baserom.gba", 0x1dba0c, 0x58 diff --git a/data/map_events.s b/data/map_events.s new file mode 100644 index 000000000..805c4d255 --- /dev/null +++ b/data/map_events.s @@ -0,0 +1,526 @@ + .include "asm/macros.inc" + .include "constants/constants.inc" + .include "constants/flags.inc" + .include "constants/variables.inc" + + .section .rodata + + .include "data/maps/events/PetalburgCity.inc" + .include "data/maps/events/SlateportCity.inc" + .include "data/maps/events/MauvilleCity.inc" + .include "data/maps/events/RustboroCity.inc" + .include "data/maps/events/FortreeCity.inc" + .include "data/maps/events/LilycoveCity.inc" + .include "data/maps/events/MossdeepCity.inc" + .include "data/maps/events/SootopolisCity.inc" + .include "data/maps/events/EverGrandeCity.inc" + .include "data/maps/events/LittlerootTown.inc" + .include "data/maps/events/OldaleTown.inc" + .include "data/maps/events/DewfordTown.inc" + .include "data/maps/events/LavaridgeTown.inc" + .include "data/maps/events/FallarborTown.inc" + .include "data/maps/events/VerdanturfTown.inc" + .include "data/maps/events/PacifidlogTown.inc" + .include "data/maps/events/Route101.inc" + .include "data/maps/events/Route102.inc" + .include "data/maps/events/Route103.inc" + .include "data/maps/events/Route104.inc" + .include "data/maps/events/Route105.inc" + .include "data/maps/events/Route106.inc" + .include "data/maps/events/Route107.inc" + .include "data/maps/events/Route108.inc" + .include "data/maps/events/Route109.inc" + .include "data/maps/events/Route110.inc" + .include "data/maps/events/Route111.inc" + .include "data/maps/events/Route112.inc" + .include "data/maps/events/Route113.inc" + .include "data/maps/events/Route114.inc" + .include "data/maps/events/Route115.inc" + .include "data/maps/events/Route116.inc" + .include "data/maps/events/Route117.inc" + .include "data/maps/events/Route118.inc" + .include "data/maps/events/Route119.inc" + .include "data/maps/events/Route120.inc" + .include "data/maps/events/Route121.inc" + .include "data/maps/events/Route122.inc" + .include "data/maps/events/Route123.inc" + .include "data/maps/events/Route124.inc" + .include "data/maps/events/Route125.inc" + .include "data/maps/events/Route126.inc" + .include "data/maps/events/Route127.inc" + .include "data/maps/events/Route128.inc" + .include "data/maps/events/Route129.inc" + .include "data/maps/events/Route130.inc" + .include "data/maps/events/Route131.inc" + .include "data/maps/events/Route132.inc" + .include "data/maps/events/Route133.inc" + .include "data/maps/events/Route134.inc" + .include "data/maps/events/Underwater1.inc" + .include "data/maps/events/Underwater2.inc" + .include "data/maps/events/Underwater3.inc" + .include "data/maps/events/Underwater4.inc" + .include "data/maps/events/Underwater5.inc" + .include "data/maps/events/Underwater6.inc" + .include "data/maps/events/Underwater7.inc" + .include "data/maps/events/LittlerootTown_BrendansHouse_1F.inc" + .include "data/maps/events/LittlerootTown_BrendansHouse_2F.inc" + .include "data/maps/events/LittlerootTown_MaysHouse_1F.inc" + .include "data/maps/events/LittlerootTown_MaysHouse_2F.inc" + .include "data/maps/events/LittlerootTown_ProfessorBirchsLab.inc" + .include "data/maps/events/OldaleTown_House1.inc" + .include "data/maps/events/OldaleTown_House2.inc" + .include "data/maps/events/OldaleTown_PokemonCenter_1F.inc" + .include "data/maps/events/OldaleTown_PokemonCenter_2F.inc" + .include "data/maps/events/OldaleTown_Mart.inc" + .include "data/maps/events/DewfordTown_House1.inc" + .include "data/maps/events/DewfordTown_PokemonCenter_1F.inc" + .include "data/maps/events/DewfordTown_PokemonCenter_2F.inc" + .include "data/maps/events/DewfordTown_Gym.inc" + .include "data/maps/events/DewfordTown_Hall.inc" + .include "data/maps/events/DewfordTown_House2.inc" + .include "data/maps/events/LavaridgeTown_HerbShop.inc" + .include "data/maps/events/LavaridgeTown_Gym_1F.inc" + .include "data/maps/events/LavaridgeTown_Gym_B1F.inc" + .include "data/maps/events/LavaridgeTown_House.inc" + .include "data/maps/events/LavaridgeTown_Mart.inc" + .include "data/maps/events/LavaridgeTown_PokemonCenter_1F.inc" + .include "data/maps/events/LavaridgeTown_PokemonCenter_2F.inc" + .include "data/maps/events/FallarborTown_Mart.inc" + .include "data/maps/events/FallarborTown_BattleTentLobby.inc" + .include "data/maps/events/FallarborTown_BattleTentCorridor.inc" + .include "data/maps/events/FallarborTown_BattleTentBattleRoom.inc" + .include "data/maps/events/FallarborTown_PokemonCenter_1F.inc" + .include "data/maps/events/FallarborTown_PokemonCenter_2F.inc" + .include "data/maps/events/FallarborTown_House1.inc" + .include "data/maps/events/FallarborTown_House2.inc" + .include "data/maps/events/VerdanturfTown_BattleTentLobby.inc" + .include "data/maps/events/VerdanturfTown_BattleTentCorridor.inc" + .include "data/maps/events/VerdanturfTown_BattleTentBattleRoom.inc" + .include "data/maps/events/VerdanturfTown_Mart.inc" + .include "data/maps/events/VerdanturfTown_PokemonCenter_1F.inc" + .include "data/maps/events/VerdanturfTown_PokemonCenter_2F.inc" + .include "data/maps/events/VerdanturfTown_WandasHouse.inc" + .include "data/maps/events/VerdanturfTown_FriendshipRatersHouse.inc" + .include "data/maps/events/VerdanturfTown_House.inc" + .include "data/maps/events/PacifidlogTown_PokemonCenter_1F.inc" + .include "data/maps/events/PacifidlogTown_PokemonCenter_2F.inc" + .include "data/maps/events/PacifidlogTown_House1.inc" + .include "data/maps/events/PacifidlogTown_House2.inc" + .include "data/maps/events/PacifidlogTown_House3.inc" + .include "data/maps/events/PacifidlogTown_House4.inc" + .include "data/maps/events/PacifidlogTown_House5.inc" + .include "data/maps/events/PetalburgCity_WallysHouse.inc" + .include "data/maps/events/PetalburgCity_Gym.inc" + .include "data/maps/events/PetalburgCity_House1.inc" + .include "data/maps/events/PetalburgCity_House2.inc" + .include "data/maps/events/PetalburgCity_PokemonCenter_1F.inc" + .include "data/maps/events/PetalburgCity_PokemonCenter_2F.inc" + .include "data/maps/events/PetalburgCity_Mart.inc" + .include "data/maps/events/SlateportCity_SternsShipyard_1F.inc" + .include "data/maps/events/SlateportCity_SternsShipyard_2F.inc" + .include "data/maps/events/SlateportCity_BattleTentLobby.inc" + .include "data/maps/events/SlateportCity_BattleTentCorridor.inc" + .include "data/maps/events/SlateportCity_BattleTentBattleRoom.inc" + .include "data/maps/events/SlateportCity_House1.inc" + .include "data/maps/events/SlateportCity_PokemonFanClub.inc" + .include "data/maps/events/SlateportCity_OceanicMuseum_1F.inc" + .include "data/maps/events/SlateportCity_OceanicMuseum_2F.inc" + .include "data/maps/events/SlateportCity_Harbor.inc" + .include "data/maps/events/SlateportCity_House2.inc" + .include "data/maps/events/SlateportCity_PokemonCenter_1F.inc" + .include "data/maps/events/SlateportCity_PokemonCenter_2F.inc" + .include "data/maps/events/SlateportCity_Mart.inc" + .include "data/maps/events/MauvilleCity_Gym.inc" + .include "data/maps/events/MauvilleCity_BikeShop.inc" + .include "data/maps/events/MauvilleCity_House1.inc" + .include "data/maps/events/MauvilleCity_GameCorner.inc" + .include "data/maps/events/MauvilleCity_House2.inc" + .include "data/maps/events/MauvilleCity_PokemonCenter_1F.inc" + .include "data/maps/events/MauvilleCity_PokemonCenter_2F.inc" + .include "data/maps/events/MauvilleCity_Mart.inc" + .include "data/maps/events/RustboroCity_DevonCorp_1F.inc" + .include "data/maps/events/RustboroCity_DevonCorp_2F.inc" + .include "data/maps/events/RustboroCity_DevonCorp_3F.inc" + .include "data/maps/events/RustboroCity_Gym.inc" + .include "data/maps/events/RustboroCity_PokemonSchool.inc" + .include "data/maps/events/RustboroCity_PokemonCenter_1F.inc" + .include "data/maps/events/RustboroCity_PokemonCenter_2F.inc" + .include "data/maps/events/RustboroCity_Mart.inc" + .include "data/maps/events/RustboroCity_Flat1_1F.inc" + .include "data/maps/events/RustboroCity_Flat1_2F.inc" + .include "data/maps/events/RustboroCity_House1.inc" + .include "data/maps/events/RustboroCity_CuttersHouse.inc" + .include "data/maps/events/RustboroCity_House2.inc" + .include "data/maps/events/RustboroCity_Flat2_1F.inc" + .include "data/maps/events/RustboroCity_Flat2_2F.inc" + .include "data/maps/events/RustboroCity_Flat2_3F.inc" + .include "data/maps/events/RustboroCity_House3.inc" + .include "data/maps/events/FortreeCity_House1.inc" + .include "data/maps/events/FortreeCity_Gym.inc" + .include "data/maps/events/FortreeCity_PokemonCenter_1F.inc" + .include "data/maps/events/FortreeCity_PokemonCenter_2F.inc" + .include "data/maps/events/FortreeCity_Mart.inc" + .include "data/maps/events/FortreeCity_House2.inc" + .include "data/maps/events/FortreeCity_House3.inc" + .include "data/maps/events/FortreeCity_House4.inc" + .include "data/maps/events/FortreeCity_House5.inc" + .include "data/maps/events/FortreeCity_DecorationShop.inc" + .include "data/maps/events/LilycoveCity_CoveLilyMotel_1F.inc" + .include "data/maps/events/LilycoveCity_CoveLilyMotel_2F.inc" + .include "data/maps/events/LilycoveCity_LilycoveMuseum_1F.inc" + .include "data/maps/events/LilycoveCity_LilycoveMuseum_2F.inc" + .include "data/maps/events/LilycoveCity_ContestLobby.inc" + .include "data/maps/events/LilycoveCity_ContestHall.inc" + .include "data/maps/events/LilycoveCity_PokemonCenter_1F.inc" + .include "data/maps/events/LilycoveCity_PokemonCenter_2F.inc" + .include "data/maps/events/LilycoveCity_UnusedMart.inc" + .include "data/maps/events/LilycoveCity_PokemonTrainerFanClub.inc" + .include "data/maps/events/LilycoveCity_Harbor.inc" + .include "data/maps/events/LilycoveCity_MoveDeletersHouse.inc" + .include "data/maps/events/LilycoveCity_House1.inc" + .include "data/maps/events/LilycoveCity_House2.inc" + .include "data/maps/events/LilycoveCity_House3.inc" + .include "data/maps/events/LilycoveCity_House4.inc" + .include "data/maps/events/LilycoveCity_DepartmentStore_1F.inc" + .include "data/maps/events/LilycoveCity_DepartmentStore_2F.inc" + .include "data/maps/events/LilycoveCity_DepartmentStore_3F.inc" + .include "data/maps/events/LilycoveCity_DepartmentStore_4F.inc" + .include "data/maps/events/LilycoveCity_DepartmentStore_5F.inc" + .include "data/maps/events/LilycoveCity_DepartmentStoreRooftop.inc" + .include "data/maps/events/LilycoveCity_DepartmentStoreElevator.inc" + .include "data/maps/events/MossdeepCity_Gym.inc" + .include "data/maps/events/MossdeepCity_House1.inc" + .include "data/maps/events/MossdeepCity_House2.inc" + .include "data/maps/events/MossdeepCity_PokemonCenter_1F.inc" + .include "data/maps/events/MossdeepCity_PokemonCenter_2F.inc" + .include "data/maps/events/MossdeepCity_Mart.inc" + .include "data/maps/events/MossdeepCity_House3.inc" + .include "data/maps/events/MossdeepCity_StevensHouse.inc" + .include "data/maps/events/MossdeepCity_House4.inc" + .include "data/maps/events/MossdeepCity_SpaceCenter_1F.inc" + .include "data/maps/events/MossdeepCity_SpaceCenter_2F.inc" + .include "data/maps/events/MossdeepCity_GameCorner_1F.inc" + .include "data/maps/events/MossdeepCity_GameCorner_B1F.inc" + .include "data/maps/events/SootopolisCity_Gym_1F.inc" + .include "data/maps/events/SootopolisCity_Gym_B1F.inc" + .include "data/maps/events/SootopolisCity_PokemonCenter_1F.inc" + .include "data/maps/events/SootopolisCity_PokemonCenter_2F.inc" + .include "data/maps/events/SootopolisCity_Mart.inc" + .include "data/maps/events/SootopolisCity_House1.inc" + .include "data/maps/events/SootopolisCity_House2.inc" + .include "data/maps/events/SootopolisCity_House3.inc" + .include "data/maps/events/SootopolisCity_House4.inc" + .include "data/maps/events/SootopolisCity_House5.inc" + .include "data/maps/events/SootopolisCity_House6.inc" + .include "data/maps/events/SootopolisCity_House7.inc" + .include "data/maps/events/SootopolisCity_LotadAndSeedotHouse.inc" + .include "data/maps/events/SootopolisCity_MysteryEventsHouse_1F.inc" + .include "data/maps/events/SootopolisCity_MysteryEventsHouse_B1F.inc" + .include "data/maps/events/EverGrandeCity_SidneysRoom.inc" + .include "data/maps/events/EverGrandeCity_PhoebesRoom.inc" + .include "data/maps/events/EverGrandeCity_GlaciasRoom.inc" + .include "data/maps/events/EverGrandeCity_DrakesRoom.inc" + .include "data/maps/events/EverGrandeCity_ChampionsRoom.inc" + .include "data/maps/events/EverGrandeCity_Hall1.inc" + .include "data/maps/events/EverGrandeCity_Hall2.inc" + .include "data/maps/events/EverGrandeCity_Hall3.inc" + .include "data/maps/events/EverGrandeCity_Hall4.inc" + .include "data/maps/events/EverGrandeCity_Hall5.inc" + .include "data/maps/events/EverGrandeCity_PokemonLeague_1F.inc" + .include "data/maps/events/EverGrandeCity_HallOfFame.inc" + .include "data/maps/events/EverGrandeCity_PokemonCenter_1F.inc" + .include "data/maps/events/EverGrandeCity_PokemonCenter_2F.inc" + .include "data/maps/events/EverGrandeCity_PokemonLeague_2F.inc" + .include "data/maps/events/Route104_MrBrineysHouse.inc" + .include "data/maps/events/Route104_PrettyPetalFlowerShop.inc" + .include "data/maps/events/Route111_WinstrateFamilysHouse.inc" + .include "data/maps/events/Route111_OldLadysRestStop.inc" + .include "data/maps/events/Route112_CableCarStation.inc" + .include "data/maps/events/MtChimney_CableCarStation.inc" + .include "data/maps/events/Route114_FossilManiacsHouse.inc" + .include "data/maps/events/Route114_FossilManiacsTunnel.inc" + .include "data/maps/events/Route114_LanettesHouse.inc" + .include "data/maps/events/Route116_TunnelersRestHouse.inc" + .include "data/maps/events/Route117_PokemonDayCare.inc" + .include "data/maps/events/Route121_SafariZoneEntrance.inc" + .include "data/maps/events/MeteorFalls_1F_1R.inc" + .include "data/maps/events/MeteorFalls_1F_2R.inc" + .include "data/maps/events/MeteorFalls_B1F_1R.inc" + .include "data/maps/events/MeteorFalls_B1F_2R.inc" + .include "data/maps/events/RusturfTunnel.inc" + .include "data/maps/events/Underwater_SootopolisCity.inc" + .include "data/maps/events/DesertRuins.inc" + .include "data/maps/events/GraniteCave_1F.inc" + .include "data/maps/events/GraniteCave_B1F.inc" + .include "data/maps/events/GraniteCave_B2F.inc" + .include "data/maps/events/GraniteCave_StevensRoom.inc" + .include "data/maps/events/PetalburgWoods.inc" + .include "data/maps/events/MtChimney.inc" + .include "data/maps/events/JaggedPass.inc" + .include "data/maps/events/FieryPath.inc" + .include "data/maps/events/MtPyre_1F.inc" + .include "data/maps/events/MtPyre_2F.inc" + .include "data/maps/events/MtPyre_3F.inc" + .include "data/maps/events/MtPyre_4F.inc" + .include "data/maps/events/MtPyre_5F.inc" + .include "data/maps/events/MtPyre_6F.inc" + .include "data/maps/events/MtPyre_Exterior.inc" + .include "data/maps/events/MtPyre_Summit.inc" + .include "data/maps/events/AquaHideout_1F.inc" + .include "data/maps/events/AquaHideout_B1F.inc" + .include "data/maps/events/AquaHideout_B2F.inc" + .include "data/maps/events/Underwater_SeafloorCavern.inc" + .include "data/maps/events/SeafloorCavern_Entrance.inc" + .include "data/maps/events/SeafloorCavern_Room1.inc" + .include "data/maps/events/SeafloorCavern_Room2.inc" + .include "data/maps/events/SeafloorCavern_Room3.inc" + .include "data/maps/events/SeafloorCavern_Room4.inc" + .include "data/maps/events/SeafloorCavern_Room5.inc" + .include "data/maps/events/SeafloorCavern_Room6.inc" + .include "data/maps/events/SeafloorCavern_Room7.inc" + .include "data/maps/events/SeafloorCavern_Room8.inc" + .include "data/maps/events/SeafloorCavern_Room9.inc" + .include "data/maps/events/CaveOfOrigin_Entrance.inc" + .include "data/maps/events/CaveOfOrigin_1F.inc" + .include "data/maps/events/CaveOfOrigin_UnusedRubySapphireMap1.inc" + .include "data/maps/events/CaveOfOrigin_UnusedRubySapphireMap2.inc" + .include "data/maps/events/CaveOfOrigin_UnusedRubySapphireMap3.inc" + .include "data/maps/events/CaveOfOrigin_B1F.inc" + .include "data/maps/events/VictoryRoad_1F.inc" + .include "data/maps/events/VictoryRoad_B1F.inc" + .include "data/maps/events/VictoryRoad_B2F.inc" + .include "data/maps/events/ShoalCave_LowTideEntranceRoom.inc" + .include "data/maps/events/ShoalCave_LowTideInnerRoom.inc" + .include "data/maps/events/ShoalCave_LowTideStairsRoom.inc" + .include "data/maps/events/ShoalCave_LowTideLowerRoom.inc" + .include "data/maps/events/ShoalCave_HighTideEntranceRoom.inc" + .include "data/maps/events/ShoalCave_HighTideInnerRoom.inc" + .include "data/maps/events/NewMauville_Entrance.inc" + .include "data/maps/events/NewMauville_Inside.inc" + .include "data/maps/events/AbandonedShip_Deck.inc" + .include "data/maps/events/AbandonedShip_Corridors_1F.inc" + .include "data/maps/events/AbandonedShip_Rooms_1F.inc" + .include "data/maps/events/AbandonedShip_Corridors_B1F.inc" + .include "data/maps/events/AbandonedShip_Rooms_B1F.inc" + .include "data/maps/events/AbandonedShip_Rooms2_B1F.inc" + .include "data/maps/events/AbandonedShip_Underwater1.inc" + .include "data/maps/events/AbandonedShip_Room_B1F.inc" + .include "data/maps/events/AbandonedShip_Rooms2_1F.inc" + .include "data/maps/events/AbandonedShip_CaptainsOffice.inc" + .include "data/maps/events/AbandonedShip_Underwater2.inc" + .include "data/maps/events/AbandonedShip_HiddenFloorCorridors.inc" + .include "data/maps/events/AbandonedShip_HiddenFloorRooms.inc" + .include "data/maps/events/IslandCave.inc" + .include "data/maps/events/AncientTomb.inc" + .include "data/maps/events/Underwater_Route134.inc" + .include "data/maps/events/Underwater_SealedChamber.inc" + .include "data/maps/events/SealedChamber_OuterRoom.inc" + .include "data/maps/events/SealedChamber_InnerRoom.inc" + .include "data/maps/events/ScorchedSlab.inc" + .include "data/maps/events/AquaHideout_UnusedRubyMap1.inc" + .include "data/maps/events/AquaHideout_UnusedRubyMap2.inc" + .include "data/maps/events/AquaHideout_UnusedRubyMap3.inc" + .include "data/maps/events/SkyPillar_Entrance.inc" + .include "data/maps/events/SkyPillar_Outside.inc" + .include "data/maps/events/SkyPillar_1F.inc" + .include "data/maps/events/SkyPillar_2F.inc" + .include "data/maps/events/SkyPillar_3F.inc" + .include "data/maps/events/SkyPillar_4F.inc" + .include "data/maps/events/ShoalCave_LowTideIceRoom.inc" + .include "data/maps/events/SkyPillar_5F.inc" + .include "data/maps/events/SkyPillar_Top.inc" + .include "data/maps/events/MagmaHideout_1F.inc" + .include "data/maps/events/MagmaHideout_2F_1R.inc" + .include "data/maps/events/MagmaHideout_2F_2R.inc" + .include "data/maps/events/MagmaHideout_3F_1R.inc" + .include "data/maps/events/MagmaHideout_3F_2R.inc" + .include "data/maps/events/MagmaHideout_4F.inc" + .include "data/maps/events/MagmaHideout_3F_3R.inc" + .include "data/maps/events/MagmaHideout_2F_3R.inc" + .include "data/maps/events/MirageTower_1F.inc" + .include "data/maps/events/MirageTower_2F.inc" + .include "data/maps/events/MirageTower_3F.inc" + .include "data/maps/events/MirageTower_4F.inc" + .include "data/maps/events/DesertUnderpass.inc" + .include "data/maps/events/ArtisanCave_B1F.inc" + .include "data/maps/events/ArtisanCave_1F.inc" + .include "data/maps/events/Underwater_MarineCave.inc" + .include "data/maps/events/MarineCave_Entrance.inc" + .include "data/maps/events/MarineCave_End.inc" + .include "data/maps/events/TerraCave_Entrance.inc" + .include "data/maps/events/TerraCave_End.inc" + .include "data/maps/events/AlteringCave.inc" + .include "data/maps/events/MeteorFalls_StevensCave.inc" + .include "data/maps/events/SecretBase_RedCave1.inc" + .include "data/maps/events/SecretBase_BrownCave1.inc" + .include "data/maps/events/SecretBase_BlueCave1.inc" + .include "data/maps/events/SecretBase_YellowCave1.inc" + .include "data/maps/events/SecretBase_Tree1.inc" + .include "data/maps/events/SecretBase_Shrub1.inc" + .include "data/maps/events/SecretBase_RedCave2.inc" + .include "data/maps/events/SecretBase_BrownCave2.inc" + .include "data/maps/events/SecretBase_BlueCave2.inc" + .include "data/maps/events/SecretBase_YellowCave2.inc" + .include "data/maps/events/SecretBase_Tree2.inc" + .include "data/maps/events/SecretBase_Shrub2.inc" + .include "data/maps/events/SecretBase_RedCave3.inc" + .include "data/maps/events/SecretBase_BrownCave3.inc" + .include "data/maps/events/SecretBase_BlueCave3.inc" + .include "data/maps/events/SecretBase_YellowCave3.inc" + .include "data/maps/events/SecretBase_Tree3.inc" + .include "data/maps/events/SecretBase_Shrub3.inc" + .include "data/maps/events/SecretBase_RedCave4.inc" + .include "data/maps/events/SecretBase_BrownCave4.inc" + .include "data/maps/events/SecretBase_BlueCave4.inc" + .include "data/maps/events/SecretBase_YellowCave4.inc" + .include "data/maps/events/SecretBase_Tree4.inc" + .include "data/maps/events/SecretBase_Shrub4.inc" + .include "data/maps/events/SingleBattleColosseum.inc" + .include "data/maps/events/TradeCenter.inc" + .include "data/maps/events/RecordCorner.inc" + .include "data/maps/events/DoubleBattleColosseum.inc" + .include "data/maps/events/LinkContestRoom1.inc" + .include "data/maps/events/LinkContestRoom2.inc" + .include "data/maps/events/LinkContestRoom3.inc" + .include "data/maps/events/LinkContestRoom4.inc" + .include "data/maps/events/LinkContestRoom5.inc" + .include "data/maps/events/LinkContestRoom6.inc" + .include "data/maps/events/UnknownMap_25_29.inc" + .include "data/maps/events/UnknownMap_25_30.inc" + .include "data/maps/events/UnknownMap_25_31.inc" + .include "data/maps/events/UnknownMap_25_32.inc" + .include "data/maps/events/UnknownMap_25_33.inc" + .include "data/maps/events/UnknownMap_25_34.inc" + .include "data/maps/events/InsideOfTruck.inc" + .include "data/maps/events/SSTidalCorridor.inc" + .include "data/maps/events/SSTidalLowerDeck.inc" + .include "data/maps/events/SSTidalRooms.inc" + .include "data/maps/events/BattlePyramidSquare01.inc" + .include "data/maps/events/BattlePyramidSquare02.inc" + .include "data/maps/events/BattlePyramidSquare03.inc" + .include "data/maps/events/BattlePyramidSquare04.inc" + .include "data/maps/events/BattlePyramidSquare05.inc" + .include "data/maps/events/BattlePyramidSquare06.inc" + .include "data/maps/events/BattlePyramidSquare07.inc" + .include "data/maps/events/BattlePyramidSquare08.inc" + .include "data/maps/events/BattlePyramidSquare09.inc" + .include "data/maps/events/BattlePyramidSquare10.inc" + .include "data/maps/events/BattlePyramidSquare11.inc" + .include "data/maps/events/BattlePyramidSquare12.inc" + .include "data/maps/events/BattlePyramidSquare13.inc" + .include "data/maps/events/BattlePyramidSquare14.inc" + .include "data/maps/events/BattlePyramidSquare15.inc" + .include "data/maps/events/BattlePyramidSquare16.inc" + .include "data/maps/events/UnionRoom.inc" + .include "data/maps/events/SafariZone_Northwest.inc" + .include "data/maps/events/SafariZone_North.inc" + .include "data/maps/events/SafariZone_Southwest.inc" + .include "data/maps/events/SafariZone_South.inc" + .include "data/maps/events/BattleFrontier_OutsideWest.inc" + .include "data/maps/events/BattleFrontier_BattleTowerLobby.inc" + .include "data/maps/events/BattleFrontier_BattleTowerElevator.inc" + .include "data/maps/events/BattleFrontier_BattleTowerCorridor.inc" + .include "data/maps/events/BattleFrontier_BattleTowerBattleRoom.inc" + .include "data/maps/events/SouthernIsland_Exterior.inc" + .include "data/maps/events/SouthernIsland_Interior.inc" + .include "data/maps/events/SafariZone_RestHouse.inc" + .include "data/maps/events/SafariZone_Northeast.inc" + .include "data/maps/events/SafariZone_Southeast.inc" + .include "data/maps/events/BattleFrontier_OutsideEast.inc" + .include "data/maps/events/BattleFrontier_BattleTowerMultiBattleRoom.inc" + .include "data/maps/events/BattleFrontier_BattleTowerCorridor2.inc" + .include "data/maps/events/BattleFrontier_BattleTowerBattleRoom2.inc" + .include "data/maps/events/BattleFrontier_BattleDomeLobby.inc" + .include "data/maps/events/BattleFrontier_BattleDomeCorridor.inc" + .include "data/maps/events/BattleFrontier_BattleDomePreBattleRoom.inc" + .include "data/maps/events/BattleFrontier_BattleDomeBattleRoom.inc" + .include "data/maps/events/BattleFrontier_BattlePalaceLobby.inc" + .include "data/maps/events/BattleFrontier_BattlePalaceCorridor.inc" + .include "data/maps/events/BattleFrontier_BattlePalaceBattleRoom.inc" + .include "data/maps/events/BattleFrontier_BattlePyramidLobby.inc" + .include "data/maps/events/BattleFrontier_BattlePyramidEmptySquare.inc" + .include "data/maps/events/BattleFrontier_BattlePyramidTop.inc" + .include "data/maps/events/BattleFrontier_BattleArenaLobby.inc" + .include "data/maps/events/BattleFrontier_BattleArenaCorridor.inc" + .include "data/maps/events/BattleFrontier_BattleArenaBattleRoom.inc" + .include "data/maps/events/BattleFrontier_BattleFactoryLobby.inc" + .include "data/maps/events/BattleFrontier_BattleFactoryPreBattleRoom.inc" + .include "data/maps/events/BattleFrontier_BattleFactoryBattleRoom.inc" + .include "data/maps/events/BattleFrontier_BattlePikeLobby.inc" + .include "data/maps/events/BattleFrontier_BattlePikeCorridor.inc" + .include "data/maps/events/BattleFrontier_BattlePikeThreePathRoom.inc" + .include "data/maps/events/BattleFrontier_BattlePikeRandomRoom1.inc" + .include "data/maps/events/BattleFrontier_BattlePikeRandomRoom2.inc" + .include "data/maps/events/BattleFrontier_BattlePikeRandomRoom3.inc" + .include "data/maps/events/BattleFrontier_RankingHall.inc" + .include "data/maps/events/BattleFrontier_Lounge1.inc" + .include "data/maps/events/BattleFrontier_BattlePointExchangeServiceCorner.inc" + .include "data/maps/events/BattleFrontier_Lounge2.inc" + .include "data/maps/events/BattleFrontier_Lounge3.inc" + .include "data/maps/events/BattleFrontier_Lounge4.inc" + .include "data/maps/events/BattleFrontier_ScottsHouse.inc" + .include "data/maps/events/BattleFrontier_Lounge5.inc" + .include "data/maps/events/BattleFrontier_Lounge6.inc" + .include "data/maps/events/BattleFrontier_Lounge7.inc" + .include "data/maps/events/BattleFrontier_ReceptionGate.inc" + .include "data/maps/events/BattleFrontier_Lounge8.inc" + .include "data/maps/events/BattleFrontier_Lounge9.inc" + .include "data/maps/events/BattleFrontier_PokemonCenter_1F.inc" + .include "data/maps/events/BattleFrontier_PokemonCenter_2F.inc" + .include "data/maps/events/BattleFrontier_Mart.inc" + .include "data/maps/events/FarawayIsland_Entrance.inc" + .include "data/maps/events/FarawayIsland_Interior.inc" + .include "data/maps/events/BirthIsland_Exterior.inc" + .include "data/maps/events/BirthIsland_Harbor.inc" + .include "data/maps/events/TrainerHill_Entrance.inc" + .include "data/maps/events/TrainerHill_1F.inc" + .include "data/maps/events/TrainerHill_2F.inc" + .include "data/maps/events/TrainerHill_3F.inc" + .include "data/maps/events/TrainerHill_4F.inc" + .include "data/maps/events/TrainerHill_Roof.inc" + .include "data/maps/events/NavelRock_Exterior.inc" + .include "data/maps/events/NavelRock_Harbor.inc" + .include "data/maps/events/NavelRock_Entrance.inc" + .include "data/maps/events/NavelRock_B1F.inc" + .include "data/maps/events/NavelRock_Fork.inc" + .include "data/maps/events/NavelRock_Up1.inc" + .include "data/maps/events/NavelRock_Up2.inc" + .include "data/maps/events/NavelRock_Up3.inc" + .include "data/maps/events/NavelRock_Up4.inc" + .include "data/maps/events/NavelRock_Top.inc" + .include "data/maps/events/NavelRock_Down01.inc" + .include "data/maps/events/NavelRock_Down02.inc" + .include "data/maps/events/NavelRock_Down03.inc" + .include "data/maps/events/NavelRock_Down04.inc" + .include "data/maps/events/NavelRock_Down05.inc" + .include "data/maps/events/NavelRock_Down06.inc" + .include "data/maps/events/NavelRock_Down07.inc" + .include "data/maps/events/NavelRock_Down08.inc" + .include "data/maps/events/NavelRock_Down09.inc" + .include "data/maps/events/NavelRock_Down10.inc" + .include "data/maps/events/NavelRock_Down11.inc" + .include "data/maps/events/NavelRock_Bottom.inc" + .include "data/maps/events/TrainerHill_Elevator.inc" + .include "data/maps/events/Route104_Prototype.inc" + .include "data/maps/events/Route104_PrototypePrettyPetalFlowerShop.inc" + .include "data/maps/events/Route109_SeashoreHouse.inc" + .include "data/maps/events/Route110_TrickHouseEntrance.inc" + .include "data/maps/events/Route110_TrickHouseEnd.inc" + .include "data/maps/events/Route110_TrickHouseCorridor.inc" + .include "data/maps/events/Route110_TrickHousePuzzle1.inc" + .include "data/maps/events/Route110_TrickHousePuzzle2.inc" + .include "data/maps/events/Route110_TrickHousePuzzle3.inc" + .include "data/maps/events/Route110_TrickHousePuzzle4.inc" + .include "data/maps/events/Route110_TrickHousePuzzle5.inc" + .include "data/maps/events/Route110_TrickHousePuzzle6.inc" + .include "data/maps/events/Route110_TrickHousePuzzle7.inc" + .include "data/maps/events/Route110_TrickHousePuzzle8.inc" + .include "data/maps/events/Route110_SeasideCyclingRoadEntrance1.inc" + .include "data/maps/events/Route110_SeasideCyclingRoadEntrance2.inc" + .include "data/maps/events/Route113_GlassWorkshop.inc" + .include "data/maps/events/Route123_BerryMastersHouse.inc" + .include "data/maps/events/Route119_WeatherInstitute_1F.inc" + .include "data/maps/events/Route119_WeatherInstitute_2F.inc" + .include "data/maps/events/Route119_House.inc" + .include "data/maps/events/Route124_DivingTreasureHuntersHouse.inc" + diff --git a/data/maps/attributes_table.inc b/data/maps/attributes_table.inc index 925f1c3ee..ef25ba2b5 100644 --- a/data/maps/attributes_table.inc +++ b/data/maps/attributes_table.inc @@ -1,5 +1,5 @@ .align 2 -gUnknown_08481DD4:: @ 8481DD4 +gMapAttributes:: @ 8481DD4 .4byte PetalburgCity_MapAttributes .4byte SlateportCity_MapAttributes .4byte MauvilleCity_MapAttributes diff --git a/data/maps/events/Route124_DivingTreasureHuntersHouse.inc b/data/maps/events/Route124_DivingTreasureHuntersHouse.inc new file mode 100644 index 000000000..43c364e8d --- /dev/null +++ b/data/maps/events/Route124_DivingTreasureHuntersHouse.inc @@ -0,0 +1,12 @@ +Route124_DivingTreasureHuntersHouse_MapObjects: @ 853ED9C + object_event 1, MAP_OBJ_GFX_MAN_6, 0, 0, 5, 4, 0, 9, 0, 0, 0, 0, Route124_DivingTreasureHuntersHouse_EventScript_270A32, 0, 0, 0 + +Route124_DivingTreasureHuntersHouse_MapWarps: @ 853EDB4 + warp_def 3, 8, 0, 0, ROUTE_124 + warp_def 4, 8, 0, 0, ROUTE_124 + +Route124_DivingTreasureHuntersHouse_MapBGEvents: @ 853EDC4 + bg_event 7, 1, 0, 0, 0, Route124_DivingTreasureHuntersHouse_EventScript_270F63 + +Route124_DivingTreasureHuntersHouse_MapEvents:: @ 853EDD0 + map_events Route124_DivingTreasureHuntersHouse_MapObjects, Route124_DivingTreasureHuntersHouse_MapWarps, 0x0, Route124_DivingTreasureHuntersHouse_MapBGEvents diff --git a/data/rom_8525F58.s b/data/rom_8525F58.s index 294970b7d..808300deb 100644 --- a/data/rom_8525F58.s +++ b/data/rom_8525F58.s @@ -4,8 +4,6 @@ .section .rodata .align 2 - - gUnknown_08525F58:: @ 8525F58 .byte 0x48, 0x50, 0x00, 0x00, 0xb0, 0x28, 0x00, 0x00 .byte 0x30, 0x28, 0x00, 0x00, 0x70, 0x50, 0x00, 0x00 @@ -34,555 +32,3 @@ gUnknown_08525F90:: @ 8525F90 gUnknown_08525FC0:: @ 8525FC0 obj_tiles gMiscBlank_Gfx, 0x0800, 0xd755 obj_tiles gMiscBlank_Gfx, 0x0800, 0xd756 - - .align 2 -@ the mother of all baserom includes - - .include "data/maps/events/PetalburgCity.inc" - .include "data/maps/events/SlateportCity.inc" - .include "data/maps/events/MauvilleCity.inc" - .include "data/maps/events/RustboroCity.inc" - .include "data/maps/events/FortreeCity.inc" - .include "data/maps/events/LilycoveCity.inc" - .include "data/maps/events/MossdeepCity.inc" - .include "data/maps/events/SootopolisCity.inc" - .include "data/maps/events/EverGrandeCity.inc" - .include "data/maps/events/LittlerootTown.inc" - .include "data/maps/events/OldaleTown.inc" - .include "data/maps/events/DewfordTown.inc" - .include "data/maps/events/LavaridgeTown.inc" - .include "data/maps/events/FallarborTown.inc" - .include "data/maps/events/VerdanturfTown.inc" - .include "data/maps/events/PacifidlogTown.inc" - .include "data/maps/events/Route101.inc" - .include "data/maps/events/Route102.inc" - .include "data/maps/events/Route103.inc" - .include "data/maps/events/Route104.inc" - .include "data/maps/events/Route105.inc" - .include "data/maps/events/Route106.inc" - .include "data/maps/events/Route107.inc" - .include "data/maps/events/Route108.inc" - .include "data/maps/events/Route109.inc" - .include "data/maps/events/Route110.inc" - .include "data/maps/events/Route111.inc" - .include "data/maps/events/Route112.inc" - .include "data/maps/events/Route113.inc" - .include "data/maps/events/Route114.inc" - .include "data/maps/events/Route115.inc" - .include "data/maps/events/Route116.inc" - .include "data/maps/events/Route117.inc" - .include "data/maps/events/Route118.inc" - .include "data/maps/events/Route119.inc" - .include "data/maps/events/Route120.inc" - .include "data/maps/events/Route121.inc" - .include "data/maps/events/Route122.inc" - .include "data/maps/events/Route123.inc" - .include "data/maps/events/Route124.inc" - .include "data/maps/events/Route125.inc" - .include "data/maps/events/Route126.inc" - .include "data/maps/events/Route127.inc" - .include "data/maps/events/Route128.inc" - .include "data/maps/events/Route129.inc" - .include "data/maps/events/Route130.inc" - .include "data/maps/events/Route131.inc" - .include "data/maps/events/Route132.inc" - .include "data/maps/events/Route133.inc" - .include "data/maps/events/Route134.inc" - .include "data/maps/events/Underwater1.inc" - .include "data/maps/events/Underwater2.inc" - .include "data/maps/events/Underwater3.inc" - .include "data/maps/events/Underwater4.inc" - .include "data/maps/events/Underwater5.inc" - .include "data/maps/events/Underwater6.inc" - .include "data/maps/events/Underwater7.inc" - .include "data/maps/events/LittlerootTown_BrendansHouse_1F.inc" - .include "data/maps/events/LittlerootTown_BrendansHouse_2F.inc" - .include "data/maps/events/LittlerootTown_MaysHouse_1F.inc" - .include "data/maps/events/LittlerootTown_MaysHouse_2F.inc" - .include "data/maps/events/LittlerootTown_ProfessorBirchsLab.inc" - .include "data/maps/events/OldaleTown_House1.inc" - .include "data/maps/events/OldaleTown_House2.inc" - .include "data/maps/events/OldaleTown_PokemonCenter_1F.inc" - .include "data/maps/events/OldaleTown_PokemonCenter_2F.inc" - .include "data/maps/events/OldaleTown_Mart.inc" - .include "data/maps/events/DewfordTown_House1.inc" - .include "data/maps/events/DewfordTown_PokemonCenter_1F.inc" - .include "data/maps/events/DewfordTown_PokemonCenter_2F.inc" - .include "data/maps/events/DewfordTown_Gym.inc" - .include "data/maps/events/DewfordTown_Hall.inc" - .include "data/maps/events/DewfordTown_House2.inc" - .include "data/maps/events/LavaridgeTown_HerbShop.inc" - .include "data/maps/events/LavaridgeTown_Gym_1F.inc" - .include "data/maps/events/LavaridgeTown_Gym_B1F.inc" - .include "data/maps/events/LavaridgeTown_House.inc" - .include "data/maps/events/LavaridgeTown_Mart.inc" - .include "data/maps/events/LavaridgeTown_PokemonCenter_1F.inc" - .include "data/maps/events/LavaridgeTown_PokemonCenter_2F.inc" - .include "data/maps/events/FallarborTown_Mart.inc" - .include "data/maps/events/FallarborTown_BattleTentLobby.inc" - .include "data/maps/events/FallarborTown_BattleTentCorridor.inc" - .include "data/maps/events/FallarborTown_BattleTentBattleRoom.inc" - .include "data/maps/events/FallarborTown_PokemonCenter_1F.inc" - .include "data/maps/events/FallarborTown_PokemonCenter_2F.inc" - .include "data/maps/events/FallarborTown_House1.inc" - .include "data/maps/events/FallarborTown_House2.inc" - .include "data/maps/events/VerdanturfTown_BattleTentLobby.inc" - .include "data/maps/events/VerdanturfTown_BattleTentCorridor.inc" - .include "data/maps/events/VerdanturfTown_BattleTentBattleRoom.inc" - .include "data/maps/events/VerdanturfTown_Mart.inc" - .include "data/maps/events/VerdanturfTown_PokemonCenter_1F.inc" - .include "data/maps/events/VerdanturfTown_PokemonCenter_2F.inc" - .include "data/maps/events/VerdanturfTown_WandasHouse.inc" - .include "data/maps/events/VerdanturfTown_FriendshipRatersHouse.inc" - .include "data/maps/events/VerdanturfTown_House.inc" - .include "data/maps/events/PacifidlogTown_PokemonCenter_1F.inc" - .include "data/maps/events/PacifidlogTown_PokemonCenter_2F.inc" - .include "data/maps/events/PacifidlogTown_House1.inc" - .include "data/maps/events/PacifidlogTown_House2.inc" - .include "data/maps/events/PacifidlogTown_House3.inc" - .include "data/maps/events/PacifidlogTown_House4.inc" - .include "data/maps/events/PacifidlogTown_House5.inc" - .include "data/maps/events/PetalburgCity_WallysHouse.inc" - .include "data/maps/events/PetalburgCity_Gym.inc" - .include "data/maps/events/PetalburgCity_House1.inc" - .include "data/maps/events/PetalburgCity_House2.inc" - .include "data/maps/events/PetalburgCity_PokemonCenter_1F.inc" - .include "data/maps/events/PetalburgCity_PokemonCenter_2F.inc" - .include "data/maps/events/PetalburgCity_Mart.inc" - .include "data/maps/events/SlateportCity_SternsShipyard_1F.inc" - .include "data/maps/events/SlateportCity_SternsShipyard_2F.inc" - .include "data/maps/events/SlateportCity_BattleTentLobby.inc" - .include "data/maps/events/SlateportCity_BattleTentCorridor.inc" - .include "data/maps/events/SlateportCity_BattleTentBattleRoom.inc" - .include "data/maps/events/SlateportCity_House1.inc" - .include "data/maps/events/SlateportCity_PokemonFanClub.inc" - .include "data/maps/events/SlateportCity_OceanicMuseum_1F.inc" - .include "data/maps/events/SlateportCity_OceanicMuseum_2F.inc" - .include "data/maps/events/SlateportCity_Harbor.inc" - .include "data/maps/events/SlateportCity_House2.inc" - .include "data/maps/events/SlateportCity_PokemonCenter_1F.inc" - .include "data/maps/events/SlateportCity_PokemonCenter_2F.inc" - .include "data/maps/events/SlateportCity_Mart.inc" - .include "data/maps/events/MauvilleCity_Gym.inc" - .include "data/maps/events/MauvilleCity_BikeShop.inc" - .include "data/maps/events/MauvilleCity_House1.inc" - .include "data/maps/events/MauvilleCity_GameCorner.inc" - .include "data/maps/events/MauvilleCity_House2.inc" - .include "data/maps/events/MauvilleCity_PokemonCenter_1F.inc" - .include "data/maps/events/MauvilleCity_PokemonCenter_2F.inc" - .include "data/maps/events/MauvilleCity_Mart.inc" - .include "data/maps/events/RustboroCity_DevonCorp_1F.inc" - .include "data/maps/events/RustboroCity_DevonCorp_2F.inc" - .include "data/maps/events/RustboroCity_DevonCorp_3F.inc" - .include "data/maps/events/RustboroCity_Gym.inc" - .include "data/maps/events/RustboroCity_PokemonSchool.inc" - .include "data/maps/events/RustboroCity_PokemonCenter_1F.inc" - .include "data/maps/events/RustboroCity_PokemonCenter_2F.inc" - .include "data/maps/events/RustboroCity_Mart.inc" - .include "data/maps/events/RustboroCity_Flat1_1F.inc" - .include "data/maps/events/RustboroCity_Flat1_2F.inc" - .include "data/maps/events/RustboroCity_House1.inc" - .include "data/maps/events/RustboroCity_CuttersHouse.inc" - .include "data/maps/events/RustboroCity_House2.inc" - .include "data/maps/events/RustboroCity_Flat2_1F.inc" - .include "data/maps/events/RustboroCity_Flat2_2F.inc" - .include "data/maps/events/RustboroCity_Flat2_3F.inc" - .include "data/maps/events/RustboroCity_House3.inc" - .include "data/maps/events/FortreeCity_House1.inc" - .include "data/maps/events/FortreeCity_Gym.inc" - .include "data/maps/events/FortreeCity_PokemonCenter_1F.inc" - .include "data/maps/events/FortreeCity_PokemonCenter_2F.inc" - .include "data/maps/events/FortreeCity_Mart.inc" - .include "data/maps/events/FortreeCity_House2.inc" - .include "data/maps/events/FortreeCity_House3.inc" - .include "data/maps/events/FortreeCity_House4.inc" - .include "data/maps/events/FortreeCity_House5.inc" - .include "data/maps/events/FortreeCity_DecorationShop.inc" - .include "data/maps/events/LilycoveCity_CoveLilyMotel_1F.inc" - .include "data/maps/events/LilycoveCity_CoveLilyMotel_2F.inc" - .include "data/maps/events/LilycoveCity_LilycoveMuseum_1F.inc" - .include "data/maps/events/LilycoveCity_LilycoveMuseum_2F.inc" - .include "data/maps/events/LilycoveCity_ContestLobby.inc" - .include "data/maps/events/LilycoveCity_ContestHall.inc" - .include "data/maps/events/LilycoveCity_PokemonCenter_1F.inc" - .include "data/maps/events/LilycoveCity_PokemonCenter_2F.inc" - .include "data/maps/events/LilycoveCity_UnusedMart.inc" - .include "data/maps/events/LilycoveCity_PokemonTrainerFanClub.inc" - .include "data/maps/events/LilycoveCity_Harbor.inc" - .include "data/maps/events/LilycoveCity_MoveDeletersHouse.inc" - .include "data/maps/events/LilycoveCity_House1.inc" - .include "data/maps/events/LilycoveCity_House2.inc" - .include "data/maps/events/LilycoveCity_House3.inc" - .include "data/maps/events/LilycoveCity_House4.inc" - .include "data/maps/events/LilycoveCity_DepartmentStore_1F.inc" - .include "data/maps/events/LilycoveCity_DepartmentStore_2F.inc" - .include "data/maps/events/LilycoveCity_DepartmentStore_3F.inc" - .include "data/maps/events/LilycoveCity_DepartmentStore_4F.inc" - .include "data/maps/events/LilycoveCity_DepartmentStore_5F.inc" - .include "data/maps/events/LilycoveCity_DepartmentStoreRooftop.inc" - .include "data/maps/events/LilycoveCity_DepartmentStoreElevator.inc" - .include "data/maps/events/MossdeepCity_Gym.inc" - .include "data/maps/events/MossdeepCity_House1.inc" - .include "data/maps/events/MossdeepCity_House2.inc" - .include "data/maps/events/MossdeepCity_PokemonCenter_1F.inc" - .include "data/maps/events/MossdeepCity_PokemonCenter_2F.inc" - .include "data/maps/events/MossdeepCity_Mart.inc" - .include "data/maps/events/MossdeepCity_House3.inc" - .include "data/maps/events/MossdeepCity_StevensHouse.inc" - .include "data/maps/events/MossdeepCity_House4.inc" - .include "data/maps/events/MossdeepCity_SpaceCenter_1F.inc" - .include "data/maps/events/MossdeepCity_SpaceCenter_2F.inc" - .include "data/maps/events/MossdeepCity_GameCorner_1F.inc" - .include "data/maps/events/MossdeepCity_GameCorner_B1F.inc" - .include "data/maps/events/SootopolisCity_Gym_1F.inc" - .include "data/maps/events/SootopolisCity_Gym_B1F.inc" - .include "data/maps/events/SootopolisCity_PokemonCenter_1F.inc" - .include "data/maps/events/SootopolisCity_PokemonCenter_2F.inc" - .include "data/maps/events/SootopolisCity_Mart.inc" - .include "data/maps/events/SootopolisCity_House1.inc" - .include "data/maps/events/SootopolisCity_House2.inc" - .include "data/maps/events/SootopolisCity_House3.inc" - .include "data/maps/events/SootopolisCity_House4.inc" - .include "data/maps/events/SootopolisCity_House5.inc" - .include "data/maps/events/SootopolisCity_House6.inc" - .include "data/maps/events/SootopolisCity_House7.inc" - .include "data/maps/events/SootopolisCity_LotadAndSeedotHouse.inc" - .include "data/maps/events/SootopolisCity_MysteryEventsHouse_1F.inc" - .include "data/maps/events/SootopolisCity_MysteryEventsHouse_B1F.inc" - .include "data/maps/events/EverGrandeCity_SidneysRoom.inc" - .include "data/maps/events/EverGrandeCity_PhoebesRoom.inc" - .include "data/maps/events/EverGrandeCity_GlaciasRoom.inc" - .include "data/maps/events/EverGrandeCity_DrakesRoom.inc" - .include "data/maps/events/EverGrandeCity_ChampionsRoom.inc" - .include "data/maps/events/EverGrandeCity_Hall1.inc" - .include "data/maps/events/EverGrandeCity_Hall2.inc" - .include "data/maps/events/EverGrandeCity_Hall3.inc" - .include "data/maps/events/EverGrandeCity_Hall4.inc" - .include "data/maps/events/EverGrandeCity_Hall5.inc" - .include "data/maps/events/EverGrandeCity_PokemonLeague_1F.inc" - .include "data/maps/events/EverGrandeCity_HallOfFame.inc" - .include "data/maps/events/EverGrandeCity_PokemonCenter_1F.inc" - .include "data/maps/events/EverGrandeCity_PokemonCenter_2F.inc" - .include "data/maps/events/EverGrandeCity_PokemonLeague_2F.inc" - .include "data/maps/events/Route104_MrBrineysHouse.inc" - .include "data/maps/events/Route104_PrettyPetalFlowerShop.inc" - .include "data/maps/events/Route111_WinstrateFamilysHouse.inc" - .include "data/maps/events/Route111_OldLadysRestStop.inc" - .include "data/maps/events/Route112_CableCarStation.inc" - .include "data/maps/events/MtChimney_CableCarStation.inc" - .include "data/maps/events/Route114_FossilManiacsHouse.inc" - .include "data/maps/events/Route114_FossilManiacsTunnel.inc" - .include "data/maps/events/Route114_LanettesHouse.inc" - .include "data/maps/events/Route116_TunnelersRestHouse.inc" - .include "data/maps/events/Route117_PokemonDayCare.inc" - .include "data/maps/events/Route121_SafariZoneEntrance.inc" - .include "data/maps/events/MeteorFalls_1F_1R.inc" - .include "data/maps/events/MeteorFalls_1F_2R.inc" - .include "data/maps/events/MeteorFalls_B1F_1R.inc" - .include "data/maps/events/MeteorFalls_B1F_2R.inc" - .include "data/maps/events/RusturfTunnel.inc" - .include "data/maps/events/Underwater_SootopolisCity.inc" - .include "data/maps/events/DesertRuins.inc" - .include "data/maps/events/GraniteCave_1F.inc" - .include "data/maps/events/GraniteCave_B1F.inc" - .include "data/maps/events/GraniteCave_B2F.inc" - .include "data/maps/events/GraniteCave_StevensRoom.inc" - .include "data/maps/events/PetalburgWoods.inc" - .include "data/maps/events/MtChimney.inc" - .include "data/maps/events/JaggedPass.inc" - .include "data/maps/events/FieryPath.inc" - .include "data/maps/events/MtPyre_1F.inc" - .include "data/maps/events/MtPyre_2F.inc" - .include "data/maps/events/MtPyre_3F.inc" - .include "data/maps/events/MtPyre_4F.inc" - .include "data/maps/events/MtPyre_5F.inc" - .include "data/maps/events/MtPyre_6F.inc" - .include "data/maps/events/MtPyre_Exterior.inc" - .include "data/maps/events/MtPyre_Summit.inc" - .include "data/maps/events/AquaHideout_1F.inc" - .include "data/maps/events/AquaHideout_B1F.inc" - .include "data/maps/events/AquaHideout_B2F.inc" - .include "data/maps/events/Underwater_SeafloorCavern.inc" - .include "data/maps/events/SeafloorCavern_Entrance.inc" - .include "data/maps/events/SeafloorCavern_Room1.inc" - .include "data/maps/events/SeafloorCavern_Room2.inc" - .include "data/maps/events/SeafloorCavern_Room3.inc" - .include "data/maps/events/SeafloorCavern_Room4.inc" - .include "data/maps/events/SeafloorCavern_Room5.inc" - .include "data/maps/events/SeafloorCavern_Room6.inc" - .include "data/maps/events/SeafloorCavern_Room7.inc" - .include "data/maps/events/SeafloorCavern_Room8.inc" - .include "data/maps/events/SeafloorCavern_Room9.inc" - .include "data/maps/events/CaveOfOrigin_Entrance.inc" - .include "data/maps/events/CaveOfOrigin_1F.inc" - .include "data/maps/events/CaveOfOrigin_UnusedRubySapphireMap1.inc" - .include "data/maps/events/CaveOfOrigin_UnusedRubySapphireMap2.inc" - .include "data/maps/events/CaveOfOrigin_UnusedRubySapphireMap3.inc" - .include "data/maps/events/CaveOfOrigin_B1F.inc" - .include "data/maps/events/VictoryRoad_1F.inc" - .include "data/maps/events/VictoryRoad_B1F.inc" - .include "data/maps/events/VictoryRoad_B2F.inc" - .include "data/maps/events/ShoalCave_LowTideEntranceRoom.inc" - .include "data/maps/events/ShoalCave_LowTideInnerRoom.inc" - .include "data/maps/events/ShoalCave_LowTideStairsRoom.inc" - .include "data/maps/events/ShoalCave_LowTideLowerRoom.inc" - .include "data/maps/events/ShoalCave_HighTideEntranceRoom.inc" - .include "data/maps/events/ShoalCave_HighTideInnerRoom.inc" - .include "data/maps/events/NewMauville_Entrance.inc" - .include "data/maps/events/NewMauville_Inside.inc" - .include "data/maps/events/AbandonedShip_Deck.inc" - .include "data/maps/events/AbandonedShip_Corridors_1F.inc" - .include "data/maps/events/AbandonedShip_Rooms_1F.inc" - .include "data/maps/events/AbandonedShip_Corridors_B1F.inc" - .include "data/maps/events/AbandonedShip_Rooms_B1F.inc" - .include "data/maps/events/AbandonedShip_Rooms2_B1F.inc" - .include "data/maps/events/AbandonedShip_Underwater1.inc" - .include "data/maps/events/AbandonedShip_Room_B1F.inc" - .include "data/maps/events/AbandonedShip_Rooms2_1F.inc" - .include "data/maps/events/AbandonedShip_CaptainsOffice.inc" - .include "data/maps/events/AbandonedShip_Underwater2.inc" - .include "data/maps/events/AbandonedShip_HiddenFloorCorridors.inc" - .include "data/maps/events/AbandonedShip_HiddenFloorRooms.inc" - .include "data/maps/events/IslandCave.inc" - .include "data/maps/events/AncientTomb.inc" - .include "data/maps/events/Underwater_Route134.inc" - .include "data/maps/events/Underwater_SealedChamber.inc" - .include "data/maps/events/SealedChamber_OuterRoom.inc" - .include "data/maps/events/SealedChamber_InnerRoom.inc" - .include "data/maps/events/ScorchedSlab.inc" - .include "data/maps/events/AquaHideout_UnusedRubyMap1.inc" - .include "data/maps/events/AquaHideout_UnusedRubyMap2.inc" - .include "data/maps/events/AquaHideout_UnusedRubyMap3.inc" - .include "data/maps/events/SkyPillar_Entrance.inc" - .include "data/maps/events/SkyPillar_Outside.inc" - .include "data/maps/events/SkyPillar_1F.inc" - .include "data/maps/events/SkyPillar_2F.inc" - .include "data/maps/events/SkyPillar_3F.inc" - .include "data/maps/events/SkyPillar_4F.inc" - .include "data/maps/events/ShoalCave_LowTideIceRoom.inc" - .include "data/maps/events/SkyPillar_5F.inc" - .include "data/maps/events/SkyPillar_Top.inc" - .include "data/maps/events/MagmaHideout_1F.inc" - .include "data/maps/events/MagmaHideout_2F_1R.inc" - .include "data/maps/events/MagmaHideout_2F_2R.inc" - .include "data/maps/events/MagmaHideout_3F_1R.inc" - .include "data/maps/events/MagmaHideout_3F_2R.inc" - .include "data/maps/events/MagmaHideout_4F.inc" - .include "data/maps/events/MagmaHideout_3F_3R.inc" - .include "data/maps/events/MagmaHideout_2F_3R.inc" - .include "data/maps/events/MirageTower_1F.inc" - .include "data/maps/events/MirageTower_2F.inc" - .include "data/maps/events/MirageTower_3F.inc" - .include "data/maps/events/MirageTower_4F.inc" - .include "data/maps/events/DesertUnderpass.inc" - .include "data/maps/events/ArtisanCave_B1F.inc" - .include "data/maps/events/ArtisanCave_1F.inc" - .include "data/maps/events/Underwater_MarineCave.inc" - .include "data/maps/events/MarineCave_Entrance.inc" - .include "data/maps/events/MarineCave_End.inc" - .include "data/maps/events/TerraCave_Entrance.inc" - .include "data/maps/events/TerraCave_End.inc" - .include "data/maps/events/AlteringCave.inc" - .include "data/maps/events/MeteorFalls_StevensCave.inc" - .include "data/maps/events/SecretBase_RedCave1.inc" - .include "data/maps/events/SecretBase_BrownCave1.inc" - .include "data/maps/events/SecretBase_BlueCave1.inc" - .include "data/maps/events/SecretBase_YellowCave1.inc" - .include "data/maps/events/SecretBase_Tree1.inc" - .include "data/maps/events/SecretBase_Shrub1.inc" - .include "data/maps/events/SecretBase_RedCave2.inc" - .include "data/maps/events/SecretBase_BrownCave2.inc" - .include "data/maps/events/SecretBase_BlueCave2.inc" - .include "data/maps/events/SecretBase_YellowCave2.inc" - .include "data/maps/events/SecretBase_Tree2.inc" - .include "data/maps/events/SecretBase_Shrub2.inc" - .include "data/maps/events/SecretBase_RedCave3.inc" - .include "data/maps/events/SecretBase_BrownCave3.inc" - .include "data/maps/events/SecretBase_BlueCave3.inc" - .include "data/maps/events/SecretBase_YellowCave3.inc" - .include "data/maps/events/SecretBase_Tree3.inc" - .include "data/maps/events/SecretBase_Shrub3.inc" - .include "data/maps/events/SecretBase_RedCave4.inc" - .include "data/maps/events/SecretBase_BrownCave4.inc" - .include "data/maps/events/SecretBase_BlueCave4.inc" - .include "data/maps/events/SecretBase_YellowCave4.inc" - .include "data/maps/events/SecretBase_Tree4.inc" - .include "data/maps/events/SecretBase_Shrub4.inc" - .include "data/maps/events/SingleBattleColosseum.inc" - .include "data/maps/events/TradeCenter.inc" - .include "data/maps/events/RecordCorner.inc" - .include "data/maps/events/DoubleBattleColosseum.inc" - .include "data/maps/events/LinkContestRoom1.inc" - .include "data/maps/events/LinkContestRoom2.inc" - .include "data/maps/events/LinkContestRoom3.inc" - .include "data/maps/events/LinkContestRoom4.inc" - .include "data/maps/events/LinkContestRoom5.inc" - .include "data/maps/events/LinkContestRoom6.inc" - .include "data/maps/events/UnknownMap_25_29.inc" - .include "data/maps/events/UnknownMap_25_30.inc" - .include "data/maps/events/UnknownMap_25_31.inc" - .include "data/maps/events/UnknownMap_25_32.inc" - .include "data/maps/events/UnknownMap_25_33.inc" - .include "data/maps/events/UnknownMap_25_34.inc" - .include "data/maps/events/InsideOfTruck.inc" - .include "data/maps/events/SSTidalCorridor.inc" - .include "data/maps/events/SSTidalLowerDeck.inc" - .include "data/maps/events/SSTidalRooms.inc" - .include "data/maps/events/BattlePyramidSquare01.inc" - .include "data/maps/events/BattlePyramidSquare02.inc" - .include "data/maps/events/BattlePyramidSquare03.inc" - .include "data/maps/events/BattlePyramidSquare04.inc" - .include "data/maps/events/BattlePyramidSquare05.inc" - .include "data/maps/events/BattlePyramidSquare06.inc" - .include "data/maps/events/BattlePyramidSquare07.inc" - .include "data/maps/events/BattlePyramidSquare08.inc" - .include "data/maps/events/BattlePyramidSquare09.inc" - .include "data/maps/events/BattlePyramidSquare10.inc" - .include "data/maps/events/BattlePyramidSquare11.inc" - .include "data/maps/events/BattlePyramidSquare12.inc" - .include "data/maps/events/BattlePyramidSquare13.inc" - .include "data/maps/events/BattlePyramidSquare14.inc" - .include "data/maps/events/BattlePyramidSquare15.inc" - .include "data/maps/events/BattlePyramidSquare16.inc" - .include "data/maps/events/UnionRoom.inc" - .include "data/maps/events/SafariZone_Northwest.inc" - .include "data/maps/events/SafariZone_North.inc" - .include "data/maps/events/SafariZone_Southwest.inc" - .include "data/maps/events/SafariZone_South.inc" - .include "data/maps/events/BattleFrontier_OutsideWest.inc" - .include "data/maps/events/BattleFrontier_BattleTowerLobby.inc" - .include "data/maps/events/BattleFrontier_BattleTowerElevator.inc" - .include "data/maps/events/BattleFrontier_BattleTowerCorridor.inc" - .include "data/maps/events/BattleFrontier_BattleTowerBattleRoom.inc" - .include "data/maps/events/SouthernIsland_Exterior.inc" - .include "data/maps/events/SouthernIsland_Interior.inc" - .include "data/maps/events/SafariZone_RestHouse.inc" - .include "data/maps/events/SafariZone_Northeast.inc" - .include "data/maps/events/SafariZone_Southeast.inc" - .include "data/maps/events/BattleFrontier_OutsideEast.inc" - .include "data/maps/events/BattleFrontier_BattleTowerMultiBattleRoom.inc" - .include "data/maps/events/BattleFrontier_BattleTowerCorridor2.inc" - .include "data/maps/events/BattleFrontier_BattleTowerBattleRoom2.inc" - .include "data/maps/events/BattleFrontier_BattleDomeLobby.inc" - .include "data/maps/events/BattleFrontier_BattleDomeCorridor.inc" - .include "data/maps/events/BattleFrontier_BattleDomePreBattleRoom.inc" - .include "data/maps/events/BattleFrontier_BattleDomeBattleRoom.inc" - .include "data/maps/events/BattleFrontier_BattlePalaceLobby.inc" - .include "data/maps/events/BattleFrontier_BattlePalaceCorridor.inc" - .include "data/maps/events/BattleFrontier_BattlePalaceBattleRoom.inc" - .include "data/maps/events/BattleFrontier_BattlePyramidLobby.inc" - .include "data/maps/events/BattleFrontier_BattlePyramidEmptySquare.inc" - .include "data/maps/events/BattleFrontier_BattlePyramidTop.inc" - .include "data/maps/events/BattleFrontier_BattleArenaLobby.inc" - .include "data/maps/events/BattleFrontier_BattleArenaCorridor.inc" - .include "data/maps/events/BattleFrontier_BattleArenaBattleRoom.inc" - .include "data/maps/events/BattleFrontier_BattleFactoryLobby.inc" - .include "data/maps/events/BattleFrontier_BattleFactoryPreBattleRoom.inc" - .include "data/maps/events/BattleFrontier_BattleFactoryBattleRoom.inc" - .include "data/maps/events/BattleFrontier_BattlePikeLobby.inc" - .include "data/maps/events/BattleFrontier_BattlePikeCorridor.inc" - .include "data/maps/events/BattleFrontier_BattlePikeThreePathRoom.inc" - .include "data/maps/events/BattleFrontier_BattlePikeRandomRoom1.inc" - .include "data/maps/events/BattleFrontier_BattlePikeRandomRoom2.inc" - .include "data/maps/events/BattleFrontier_BattlePikeRandomRoom3.inc" - .include "data/maps/events/BattleFrontier_RankingHall.inc" - .include "data/maps/events/BattleFrontier_Lounge1.inc" - .include "data/maps/events/BattleFrontier_BattlePointExchangeServiceCorner.inc" - .include "data/maps/events/BattleFrontier_Lounge2.inc" - .include "data/maps/events/BattleFrontier_Lounge3.inc" - .include "data/maps/events/BattleFrontier_Lounge4.inc" - .include "data/maps/events/BattleFrontier_ScottsHouse.inc" - .include "data/maps/events/BattleFrontier_Lounge5.inc" - .include "data/maps/events/BattleFrontier_Lounge6.inc" - .include "data/maps/events/BattleFrontier_Lounge7.inc" - .include "data/maps/events/BattleFrontier_ReceptionGate.inc" - .include "data/maps/events/BattleFrontier_Lounge8.inc" - .include "data/maps/events/BattleFrontier_Lounge9.inc" - .include "data/maps/events/BattleFrontier_PokemonCenter_1F.inc" - .include "data/maps/events/BattleFrontier_PokemonCenter_2F.inc" - .include "data/maps/events/BattleFrontier_Mart.inc" - .include "data/maps/events/FarawayIsland_Entrance.inc" - .include "data/maps/events/FarawayIsland_Interior.inc" - .include "data/maps/events/BirthIsland_Exterior.inc" - .include "data/maps/events/BirthIsland_Harbor.inc" - .include "data/maps/events/TrainerHill_Entrance.inc" - .include "data/maps/events/TrainerHill_1F.inc" - .include "data/maps/events/TrainerHill_2F.inc" - .include "data/maps/events/TrainerHill_3F.inc" - .include "data/maps/events/TrainerHill_4F.inc" - .include "data/maps/events/TrainerHill_Roof.inc" - .include "data/maps/events/NavelRock_Exterior.inc" - .include "data/maps/events/NavelRock_Harbor.inc" - .include "data/maps/events/NavelRock_Entrance.inc" - .include "data/maps/events/NavelRock_B1F.inc" - .include "data/maps/events/NavelRock_Fork.inc" - .include "data/maps/events/NavelRock_Up1.inc" - .include "data/maps/events/NavelRock_Up2.inc" - .include "data/maps/events/NavelRock_Up3.inc" - .include "data/maps/events/NavelRock_Up4.inc" - .include "data/maps/events/NavelRock_Top.inc" - .include "data/maps/events/NavelRock_Down01.inc" - .include "data/maps/events/NavelRock_Down02.inc" - .include "data/maps/events/NavelRock_Down03.inc" - .include "data/maps/events/NavelRock_Down04.inc" - .include "data/maps/events/NavelRock_Down05.inc" - .include "data/maps/events/NavelRock_Down06.inc" - .include "data/maps/events/NavelRock_Down07.inc" - .include "data/maps/events/NavelRock_Down08.inc" - .include "data/maps/events/NavelRock_Down09.inc" - .include "data/maps/events/NavelRock_Down10.inc" - .include "data/maps/events/NavelRock_Down11.inc" - .include "data/maps/events/NavelRock_Bottom.inc" - .include "data/maps/events/TrainerHill_Elevator.inc" - .include "data/maps/events/Route104_Prototype.inc" - .include "data/maps/events/Route104_PrototypePrettyPetalFlowerShop.inc" - .include "data/maps/events/Route109_SeashoreHouse.inc" - .include "data/maps/events/Route110_TrickHouseEntrance.inc" - .include "data/maps/events/Route110_TrickHouseEnd.inc" - .include "data/maps/events/Route110_TrickHouseCorridor.inc" - .include "data/maps/events/Route110_TrickHousePuzzle1.inc" - .include "data/maps/events/Route110_TrickHousePuzzle2.inc" - .include "data/maps/events/Route110_TrickHousePuzzle3.inc" - .include "data/maps/events/Route110_TrickHousePuzzle4.inc" - .include "data/maps/events/Route110_TrickHousePuzzle5.inc" - .include "data/maps/events/Route110_TrickHousePuzzle6.inc" - .include "data/maps/events/Route110_TrickHousePuzzle7.inc" - .include "data/maps/events/Route110_TrickHousePuzzle8.inc" - .include "data/maps/events/Route110_SeasideCyclingRoadEntrance1.inc" - .include "data/maps/events/Route110_SeasideCyclingRoadEntrance2.inc" - .include "data/maps/events/Route113_GlassWorkshop.inc" - .include "data/maps/events/Route123_BerryMastersHouse.inc" - .include "data/maps/events/Route119_WeatherInstitute_1F.inc" - .include "data/maps/events/Route119_WeatherInstitute_2F.inc" - .include "data/maps/events/Route119_House.inc" -Route124_DivingTreasureHuntersHouse_MapObjects: @ 853ED9C - object_event 1, MAP_OBJ_GFX_MAN_6, 0, 0, 5, 4, 0, 9, 0, 0, 0, 0, Route124_DivingTreasureHuntersHouse_EventScript_270A32, 0, 0, 0 - -Route124_DivingTreasureHuntersHouse_MapWarps: @ 853EDB4 - warp_def 3, 8, 0, 0, ROUTE_124 - warp_def 4, 8, 0, 0, ROUTE_124 - -Route124_DivingTreasureHuntersHouse_MapBGEvents: @ 853EDC4 - bg_event 7, 1, 0, 0, 0, Route124_DivingTreasureHuntersHouse_EventScript_270F63 - -Route124_DivingTreasureHuntersHouse_MapEvents:: @ 853EDD0 - map_events Route124_DivingTreasureHuntersHouse_MapObjects, Route124_DivingTreasureHuntersHouse_MapWarps, 0x0, Route124_DivingTreasureHuntersHouse_MapBGEvents - - .incbin "baserom.gba", 0x53ede4, 0x14c - - .align 2 -gUnknown_0853EF30:: @ 853EF30 - .byte 0xf0, 0xf0, 0x0c, 0x80, 0xf0, 0x30, 0x0d, 0x84, 0x30, 0xf0, 0x0e, 0x86, 0x30, 0x30, 0x08, 0x88 - - .align 2 -gUnknown_0853EF40:: @ 853EF40 - .4byte 0x00000004, gUnknown_0853EF30 - - .align 2 -gUnknown_0853EF48:: @ 853EF48 - spr_template 0x271a, 0x271a, gUnknown_08524A3C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gUnknown_0853EF60:: @ 853EF60 - spr_template 0x2798, 0x2798, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A9E44 - diff --git a/ld_script.txt b/ld_script.txt index ea67966b9..25c20e534 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -373,6 +373,8 @@ SECTIONS { data/battle_anims.o(.rodata); src/battle_anim.o(.rodata); data/rom_8525F58.o(.rodata); + data/map_events.o(.rodata); + data/battle_anim_80A9C70.o(.rodata); data/title_screen.o(.rodata); data/field_screen.o(.rodata); data/battle_setup.o(.rodata);