From 41f149c7f13a3b54c8ecc4101258fccc5a5ab184 Mon Sep 17 00:00:00 2001 From: yenatch Date: Tue, 26 Nov 2013 05:23:56 -0500 Subject: [PATCH] maps.o and stats/pokedex/entries.o --- Makefile | 4 +- contents.asm | 69 ++-- main.asm | 532 +----------------------------- maps.asm | 494 +++++++++++++++++++++++++++ maps_crystal.asm | 5 + stats/pokedex/entries.asm | 24 ++ stats/pokedex/entries_crystal.asm | 5 + 7 files changed, 576 insertions(+), 557 deletions(-) create mode 100644 maps.asm create mode 100644 maps_crystal.asm create mode 100644 stats/pokedex/entries.asm create mode 100644 stats/pokedex/entries_crystal.asm diff --git a/Makefile b/Makefile index 7723602c8..d1d80e315 100644 --- a/Makefile +++ b/Makefile @@ -9,11 +9,13 @@ TEXTQUEUE := CRYSTAL_OBJS := \ wram.o \ main.o \ +maps_crystal.o \ engine/events.o \ engine/scripting_crystal.o \ engine/events_2.o \ stats/egg_moves_crystal.o \ -stats/evos_attacks_crystal.o +stats/evos_attacks_crystal.o \ +stats/pokedex/entries_crystal.o OBJS := $(CRYSTAL_OBJS) diff --git a/contents.asm b/contents.asm index 298ef936c..6b85c75df 100644 --- a/contents.asm +++ b/contents.asm @@ -3,43 +3,56 @@ ; stats/egg_moves.o -EGG_MOVES EQU $8 +EGG_MOVES EQU $8 + + +; stats/evos_attacks.o + +EVOS_ATTACKS EQU $10 + + +; stats/pokedex/entries.o + +POKEDEX_ENTRIES_1 EQU $60 +POKEDEX_ENTRIES_2 EQU $6E +POKEDEX_ENTRIES_3 EQU $73 +POKEDEX_ENTRIES_4 EQU $74 ; engine/events.o ; engine/scripting.o ; engine/events_2.o -EVENTS EQU $25 +EVENTS EQU $25 ; maps.o -MAP_HEADERS EQU $25 +MAP_HEADERS EQU $25 -MAP_SCRIPTS_1 EQU $15 -MAP_SCRIPTS_2 EQU $16 -MAP_SCRIPTS_3 EQU $17 -MAP_SCRIPTS_4 EQU $18 -MAP_SCRIPTS_5 EQU $1A -MAP_SCRIPTS_6 EQU $1B -MAP_SCRIPTS_7 EQU $1C -MAP_SCRIPTS_8 EQU $1D -MAP_SCRIPTS_9 EQU $1E -MAP_SCRIPTS_10 EQU $1F -MAP_SCRIPTS_11 EQU $26 -MAP_SCRIPTS_12 EQU $27 -MAP_SCRIPTS_13 EQU $60 -MAP_SCRIPTS_14 EQU $61 -MAP_SCRIPTS_15 EQU $62 -MAP_SCRIPTS_16 EQU $63 -MAP_SCRIPTS_17 EQU $64 -MAP_SCRIPTS_18 EQU $65 -MAP_SCRIPTS_19 EQU $66 -MAP_SCRIPTS_20 EQU $67 -MAP_SCRIPTS_21 EQU $68 -MAP_SCRIPTS_22 EQU $69 -MAP_SCRIPTS_23 EQU $6A -MAP_SCRIPTS_24 EQU $6B -MAP_SCRIPTS_25 EQU $6C +MAP_SCRIPTS_1 EQU $15 +MAP_SCRIPTS_2 EQU $16 +MAP_SCRIPTS_3 EQU $17 +MAP_SCRIPTS_4 EQU $18 +MAP_SCRIPTS_5 EQU $1A +MAP_SCRIPTS_6 EQU $1B +MAP_SCRIPTS_7 EQU $1C +MAP_SCRIPTS_8 EQU $1D +MAP_SCRIPTS_9 EQU $1E +MAP_SCRIPTS_10 EQU $1F +MAP_SCRIPTS_11 EQU $26 +MAP_SCRIPTS_12 EQU $27 +MAP_SCRIPTS_13 EQU $60 +MAP_SCRIPTS_14 EQU $61 +MAP_SCRIPTS_15 EQU $62 +MAP_SCRIPTS_16 EQU $63 +MAP_SCRIPTS_17 EQU $64 +MAP_SCRIPTS_18 EQU $65 +MAP_SCRIPTS_19 EQU $66 +MAP_SCRIPTS_20 EQU $67 +MAP_SCRIPTS_21 EQU $68 +MAP_SCRIPTS_22 EQU $69 +MAP_SCRIPTS_23 EQU $6A +MAP_SCRIPTS_24 EQU $6B +MAP_SCRIPTS_25 EQU $6C diff --git a/main.asm b/main.asm index 7d04e4fb6..263c95fd0 100644 --- a/main.asm +++ b/main.asm @@ -67261,201 +67261,12 @@ INCLUDE "stats/pokemon_names.asm" INCBIN "baserom.gbc",$53d84,$53e2e - $53d84 -SECTION "Map Scripts 1", ROMX, BANK[MAP_SCRIPTS_1] - -INCLUDE "maps/GoldenrodGym.asm" -INCLUDE "maps/GoldenrodBikeShop.asm" -INCLUDE "maps/GoldenrodHappinessRater.asm" -INCLUDE "maps/GoldenrodBillsHouse.asm" -INCLUDE "maps/GoldenrodMagnetTrainStation.asm" -INCLUDE "maps/GoldenrodFlowerShop.asm" -INCLUDE "maps/GoldenrodPPSpeechHouse.asm" -INCLUDE "maps/GoldenrodNameRatersHouse.asm" -INCLUDE "maps/GoldenrodDeptStore1F.asm" -INCLUDE "maps/GoldenrodDeptStore2F.asm" -INCLUDE "maps/GoldenrodDeptStore3F.asm" -INCLUDE "maps/GoldenrodDeptStore4F.asm" -INCLUDE "maps/GoldenrodDeptStore5F.asm" -INCLUDE "maps/GoldenrodDeptStore6F.asm" -INCLUDE "maps/GoldenrodDeptStoreElevator.asm" -INCLUDE "maps/GoldenrodDeptStoreRoof.asm" -INCLUDE "maps/GoldenrodGameCorner.asm" - - -SECTION "Map Scripts 2", ROMX, BANK[MAP_SCRIPTS_2] - -INCLUDE "maps/RuinsofAlphOutside.asm" -INCLUDE "maps/RuinsofAlphHoOhChamber.asm" -INCLUDE "maps/RuinsofAlphKabutoChamber.asm" -INCLUDE "maps/RuinsofAlphOmanyteChamber.asm" -INCLUDE "maps/RuinsofAlphAerodactylChamber.asm" -INCLUDE "maps/RuinsofAlphInnerChamber.asm" -INCLUDE "maps/RuinsofAlphResearchCenter.asm" -INCLUDE "maps/RuinsofAlphHoOhItemRoom.asm" -INCLUDE "maps/RuinsofAlphKabutoItemRoom.asm" -INCLUDE "maps/RuinsofAlphOmanyteItemRoom.asm" -INCLUDE "maps/RuinsofAlphAerodactylItemRoom.asm" -INCLUDE "maps/RuinsofAlphHoOhWordRoom.asm" -INCLUDE "maps/RuinsofAlphKabutoWordRoom.asm" -INCLUDE "maps/RuinsofAlphOmanyteWordRoom.asm" -INCLUDE "maps/RuinsofAlphAerodactylWordRoom.asm" -INCLUDE "maps/UnionCave1F.asm" -INCLUDE "maps/UnionCaveB1F.asm" -INCLUDE "maps/UnionCaveB2F.asm" -INCLUDE "maps/SlowpokeWellB1F.asm" -INCLUDE "maps/SlowpokeWellB2F.asm" -INCLUDE "maps/OlivineLighthouse1F.asm" -INCLUDE "maps/OlivineLighthouse2F.asm" -INCLUDE "maps/OlivineLighthouse3F.asm" -INCLUDE "maps/OlivineLighthouse4F.asm" - - -SECTION "Map Scripts 3", ROMX, BANK[MAP_SCRIPTS_3] - -INCLUDE "maps/NationalPark.asm" -INCLUDE "maps/NationalParkBugContest.asm" -INCLUDE "maps/RadioTower1F.asm" -INCLUDE "maps/RadioTower2F.asm" -INCLUDE "maps/RadioTower3F.asm" -INCLUDE "maps/RadioTower4F.asm" - - -SECTION "Map Scripts 4", ROMX, BANK[MAP_SCRIPTS_4] - -INCLUDE "maps/RadioTower5F.asm" -INCLUDE "maps/OlivineLighthouse5F.asm" -INCLUDE "maps/OlivineLighthouse6F.asm" -INCLUDE "maps/GoldenrodPokeCenter1F.asm" -INCLUDE "maps/GoldenrodPokeComCenter2FMobile.asm" -INCLUDE "maps/IlexForestAzaleaGate.asm" -INCLUDE "maps/Route34IlexForestGate.asm" -INCLUDE "maps/DayCare.asm" - SECTION "bank19", ROMX, BANK[$19] INCLUDE "text/phone/extra.asm" -SECTION "Map Scripts 5", ROMX, BANK[MAP_SCRIPTS_5] - -INCLUDE "maps/Route11.asm" -INCLUDE "maps/VioletMart.asm" -INCLUDE "maps/VioletGym.asm" -INCLUDE "maps/EarlsPokemonAcademy.asm" -INCLUDE "maps/VioletNicknameSpeechHouse.asm" -INCLUDE "maps/VioletPokeCenter1F.asm" -INCLUDE "maps/VioletOnixTradeHouse.asm" -INCLUDE "maps/Route32RuinsofAlphGate.asm" -INCLUDE "maps/Route32PokeCenter1F.asm" -INCLUDE "maps/Route35Goldenrodgate.asm" -INCLUDE "maps/Route35NationalParkgate.asm" -INCLUDE "maps/Route36RuinsofAlphgate.asm" -INCLUDE "maps/Route36NationalParkgate.asm" - - -SECTION "Map Scripts 6", ROMX, BANK[MAP_SCRIPTS_6] - -INCLUDE "maps/Route8.asm" -INCLUDE "maps/MahoganyMart1F.asm" -INCLUDE "maps/TeamRocketBaseB1F.asm" -INCLUDE "maps/TeamRocketBaseB2F.asm" -INCLUDE "maps/TeamRocketBaseB3F.asm" -INCLUDE "maps/IlexForest.asm" - - -SECTION "Map Scripts 7", ROMX, BANK[MAP_SCRIPTS_7] - -INCLUDE "maps/LakeofRage.asm" -INCLUDE "maps/CeladonDeptStore1F.asm" -INCLUDE "maps/CeladonDeptStore2F.asm" -INCLUDE "maps/CeladonDeptStore3F.asm" -INCLUDE "maps/CeladonDeptStore4F.asm" -INCLUDE "maps/CeladonDeptStore5F.asm" -INCLUDE "maps/CeladonDeptStore6F.asm" -INCLUDE "maps/CeladonDeptStoreElevator.asm" -INCLUDE "maps/CeladonMansion1F.asm" -INCLUDE "maps/CeladonMansion2F.asm" -INCLUDE "maps/CeladonMansion3F.asm" -INCLUDE "maps/CeladonMansionRoof.asm" -INCLUDE "maps/CeladonMansionRoofHouse.asm" -INCLUDE "maps/CeladonPokeCenter1F.asm" -INCLUDE "maps/CeladonPokeCenter2FBeta.asm" -INCLUDE "maps/CeladonGameCorner.asm" -INCLUDE "maps/CeladonGameCornerPrizeRoom.asm" -INCLUDE "maps/CeladonGym.asm" -INCLUDE "maps/CeladonCafe.asm" -INCLUDE "maps/Route16FuchsiaSpeechHouse.asm" -INCLUDE "maps/Route16Gate.asm" -INCLUDE "maps/Route7SaffronGate.asm" -INCLUDE "maps/Route1718Gate.asm" - - -SECTION "Map Scripts 8", ROMX, BANK[MAP_SCRIPTS_8] - -INCLUDE "maps/DiglettsCave.asm" -INCLUDE "maps/MountMoon.asm" -INCLUDE "maps/Underground.asm" -INCLUDE "maps/RockTunnel1F.asm" -INCLUDE "maps/RockTunnelB1F.asm" -INCLUDE "maps/SafariZoneFuchsiaGateBeta.asm" -INCLUDE "maps/SafariZoneBeta.asm" -INCLUDE "maps/VictoryRoad.asm" -INCLUDE "maps/OlivinePort.asm" -INCLUDE "maps/VermilionPort.asm" -INCLUDE "maps/FastShip1F.asm" -INCLUDE "maps/FastShipCabins_NNW_NNE_NE.asm" -INCLUDE "maps/FastShipCabins_SW_SSW_NW.asm" -INCLUDE "maps/FastShipCabins_SE_SSE_CaptainsCabin.asm" -INCLUDE "maps/FastShipB1F.asm" -INCLUDE "maps/OlivinePortPassage.asm" -INCLUDE "maps/VermilionPortPassage.asm" -INCLUDE "maps/MountMoonSquare.asm" -INCLUDE "maps/MountMoonGiftShop.asm" -INCLUDE "maps/TinTowerRoof.asm" - - -SECTION "Map Scripts 9", ROMX, BANK[MAP_SCRIPTS_9] - -INCLUDE "maps/Route34.asm" -INCLUDE "maps/ElmsLab.asm" -INCLUDE "maps/KrissHouse1F.asm" -INCLUDE "maps/KrissHouse2F.asm" -INCLUDE "maps/KrissNeighborsHouse.asm" -INCLUDE "maps/ElmsHouse.asm" -INCLUDE "maps/Route26HealSpeechHouse.asm" -INCLUDE "maps/Route26DayofWeekSiblingsHouse.asm" -INCLUDE "maps/Route27SandstormHouse.asm" -INCLUDE "maps/Route2946Gate.asm" - - -SECTION "Map Scripts 10", ROMX, BANK[MAP_SCRIPTS_10] - -INCLUDE "maps/Route22.asm" -INCLUDE "maps/WarehouseEntrance.asm" -INCLUDE "maps/UndergroundPathSwitchRoomEntrances.asm" -INCLUDE "maps/GoldenrodDeptStoreB1F.asm" -INCLUDE "maps/UndergroundWarehouse.asm" -INCLUDE "maps/MountMortar1FOutside.asm" -INCLUDE "maps/MountMortar1FInside.asm" -INCLUDE "maps/MountMortar2FInside.asm" -INCLUDE "maps/MountMortarB1F.asm" -INCLUDE "maps/IcePath1F.asm" -INCLUDE "maps/IcePathB1F.asm" -INCLUDE "maps/IcePathB2FMahoganySide.asm" -INCLUDE "maps/IcePathB2FBlackthornSide.asm" -INCLUDE "maps/IcePathB3F.asm" -INCLUDE "maps/LavenderPokeCenter1F.asm" -INCLUDE "maps/LavenderPokeCenter2FBeta.asm" -INCLUDE "maps/MrFujisHouse.asm" -INCLUDE "maps/LavenderTownSpeechHouse.asm" -INCLUDE "maps/LavenderNameRater.asm" -INCLUDE "maps/LavenderMart.asm" -INCLUDE "maps/SoulHouse.asm" -INCLUDE "maps/LavRadioTower1F.asm" -INCLUDE "maps/Route8SaffronGate.asm" -INCLUDE "maps/Route12SuperRodHouse.asm" - SECTION "bank20", ROMX, BANK[$20] @@ -85519,61 +85330,6 @@ Function9331e: ; 9331e (24:731e) INCBIN "baserom.gbc",$93327,$93a31 - $93327 -SECTION "Map Headers", ROMX, BANK[MAP_HEADERS] - -INCLUDE "maps/map_headers.asm" -INCLUDE "maps/second_map_headers.asm" - - -SECTION "Map Scripts 11", ROMX, BANK[MAP_SCRIPTS_11] - -INCLUDE "maps/EcruteakHouse.asm" -INCLUDE "maps/WiseTriosRoom.asm" -INCLUDE "maps/EcruteakPokeCenter1F.asm" -INCLUDE "maps/EcruteakLugiaSpeechHouse.asm" -INCLUDE "maps/DanceTheatre.asm" -INCLUDE "maps/EcruteakMart.asm" -INCLUDE "maps/EcruteakGym.asm" -INCLUDE "maps/EcruteakItemfinderHouse.asm" -INCLUDE "maps/ViridianGym.asm" -INCLUDE "maps/ViridianNicknameSpeechHouse.asm" -INCLUDE "maps/TrainerHouse1F.asm" -INCLUDE "maps/TrainerHouseB1F.asm" -INCLUDE "maps/ViridianMart.asm" -INCLUDE "maps/ViridianPokeCenter1F.asm" -INCLUDE "maps/ViridianPokeCenter2FBeta.asm" -INCLUDE "maps/Route2NuggetSpeechHouse.asm" -INCLUDE "maps/Route2Gate.asm" -INCLUDE "maps/VictoryRoadGate.asm" - - -SECTION "Map Scripts 12", ROMX, BANK[MAP_SCRIPTS_12] - -INCLUDE "maps/OlivinePokeCenter1F.asm" -INCLUDE "maps/OlivineGym.asm" -INCLUDE "maps/OlivineVoltorbHouse.asm" -INCLUDE "maps/OlivineHouseBeta.asm" -INCLUDE "maps/OlivinePunishmentSpeechHouse.asm" -INCLUDE "maps/OlivineGoodRodHouse.asm" -INCLUDE "maps/OlivineCafe.asm" -INCLUDE "maps/OlivineMart.asm" -INCLUDE "maps/Route38EcruteakGate.asm" -INCLUDE "maps/Route39Barn.asm" -INCLUDE "maps/Route39Farmhouse.asm" -INCLUDE "maps/ManiasHouse.asm" -INCLUDE "maps/CianwoodGym.asm" -INCLUDE "maps/CianwoodPokeCenter1F.asm" -INCLUDE "maps/CianwoodPharmacy.asm" -INCLUDE "maps/CianwoodCityPhotoStudio.asm" -INCLUDE "maps/CianwoodLugiaSpeechHouse.asm" -INCLUDE "maps/PokeSeersHouse.asm" -INCLUDE "maps/BattleTower1F.asm" -INCLUDE "maps/BattleTowerBattleRoom.asm" -INCLUDE "maps/BattleTowerElevator.asm" -INCLUDE "maps/BattleTowerHallway.asm" -INCLUDE "maps/Route40BattleTowerGate.asm" -INCLUDE "maps/BattleTowerOutside.asm" - SECTION "bank28", ROMX, BANK[$28] @@ -125040,264 +124796,12 @@ Function17ff3c: ; 17ff3c INCBIN "baserom.gbc",$17ff68,$17ff6c - $17ff68 -SECTION "Map Scripts 13", ROMX, BANK[MAP_SCRIPTS_13] -INCLUDE "maps/IndigoPlateauPokeCenter1F.asm" -INCLUDE "maps/WillsRoom.asm" -INCLUDE "maps/KogasRoom.asm" -INCLUDE "maps/BrunosRoom.asm" -INCLUDE "maps/KarensRoom.asm" -INCLUDE "maps/LancesRoom.asm" -INCLUDE "maps/HallOfFame.asm" - - -; Pokedex entries 001-064 -PokedexEntries1: -INCLUDE "stats/pokedex/entries_1.asm" - - -SECTION "Map Scripts 14", ROMX, BANK[MAP_SCRIPTS_14] - -INCLUDE "maps/CeruleanCity.asm" -INCLUDE "maps/SproutTower1F.asm" -INCLUDE "maps/SproutTower2F.asm" -INCLUDE "maps/SproutTower3F.asm" -INCLUDE "maps/TinTower1F.asm" -INCLUDE "maps/TinTower2F.asm" -INCLUDE "maps/TinTower3F.asm" -INCLUDE "maps/TinTower4F.asm" -INCLUDE "maps/TinTower5F.asm" -INCLUDE "maps/TinTower6F.asm" -INCLUDE "maps/TinTower7F.asm" -INCLUDE "maps/TinTower8F.asm" -INCLUDE "maps/TinTower9F.asm" -INCLUDE "maps/BurnedTower1F.asm" -INCLUDE "maps/BurnedTowerB1F.asm" - - -SECTION "Map Scripts 15", ROMX, BANK[MAP_SCRIPTS_15] - -INCLUDE "maps/CeruleanGymBadgeSpeechHouse.asm" -INCLUDE "maps/CeruleanPoliceStation.asm" -INCLUDE "maps/CeruleanTradeSpeechHouse.asm" -INCLUDE "maps/CeruleanPokeCenter1F.asm" -INCLUDE "maps/CeruleanPokeCenter2FBeta.asm" -INCLUDE "maps/CeruleanGym.asm" -INCLUDE "maps/CeruleanMart.asm" -INCLUDE "maps/Route10PokeCenter1F.asm" -INCLUDE "maps/Route10PokeCenter2FBeta.asm" -INCLUDE "maps/PowerPlant.asm" -INCLUDE "maps/BillsHouse.asm" -INCLUDE "maps/FightingDojo.asm" -INCLUDE "maps/SaffronGym.asm" -INCLUDE "maps/SaffronMart.asm" -INCLUDE "maps/SaffronPokeCenter1F.asm" -INCLUDE "maps/SaffronPokeCenter2FBeta.asm" -INCLUDE "maps/MrPsychicsHouse.asm" -INCLUDE "maps/SaffronTrainStation.asm" -INCLUDE "maps/SilphCo1F.asm" -INCLUDE "maps/CopycatsHouse1F.asm" -INCLUDE "maps/CopycatsHouse2F.asm" -INCLUDE "maps/Route5UndergroundEntrance.asm" -INCLUDE "maps/Route5SaffronCityGate.asm" -INCLUDE "maps/Route5CleanseTagSpeechHouse.asm" - - -SECTION "Map Scripts 16", ROMX, BANK[MAP_SCRIPTS_16] - -INCLUDE "maps/PewterCity.asm" -INCLUDE "maps/WhirlIslandNW.asm" -INCLUDE "maps/WhirlIslandNE.asm" -INCLUDE "maps/WhirlIslandSW.asm" -INCLUDE "maps/WhirlIslandCave.asm" -INCLUDE "maps/WhirlIslandSE.asm" -INCLUDE "maps/WhirlIslandB1F.asm" -INCLUDE "maps/WhirlIslandB2F.asm" -INCLUDE "maps/WhirlIslandLugiaChamber.asm" -INCLUDE "maps/SilverCaveRoom1.asm" -INCLUDE "maps/SilverCaveRoom2.asm" -INCLUDE "maps/SilverCaveRoom3.asm" -INCLUDE "maps/SilverCaveItemRooms.asm" -INCLUDE "maps/DarkCaveVioletEntrance.asm" -INCLUDE "maps/DarkCaveBlackthornEntrance.asm" -INCLUDE "maps/DragonsDen1F.asm" -INCLUDE "maps/DragonsDenB1F.asm" -INCLUDE "maps/DragonShrine.asm" -INCLUDE "maps/TohjoFalls.asm" -INCLUDE "maps/AzaleaPokeCenter1F.asm" -INCLUDE "maps/CharcoalKiln.asm" -INCLUDE "maps/AzaleaMart.asm" -INCLUDE "maps/KurtsHouse.asm" -INCLUDE "maps/AzaleaGym.asm" - - -SECTION "Map Scripts 17", ROMX, BANK[MAP_SCRIPTS_17] - -INCLUDE "maps/MahoganyTown.asm" -INCLUDE "maps/Route32.asm" -INCLUDE "maps/VermilionHouseFishingSpeechHouse.asm" -INCLUDE "maps/VermilionPokeCenter1F.asm" -INCLUDE "maps/VermilionPokeCenter2FBeta.asm" -INCLUDE "maps/PokemonFanClub.asm" -INCLUDE "maps/VermilionMagnetTrainSpeechHouse.asm" -INCLUDE "maps/VermilionMart.asm" -INCLUDE "maps/VermilionHouseDiglettsCaveSpeechHouse.asm" -INCLUDE "maps/VermilionGym.asm" -INCLUDE "maps/Route6SaffronGate.asm" -INCLUDE "maps/Route6UndergroundEntrance.asm" -INCLUDE "maps/PokeCenter2F.asm" -INCLUDE "maps/TradeCenter.asm" -INCLUDE "maps/Colosseum.asm" -INCLUDE "maps/TimeCapsule.asm" -INCLUDE "maps/MobileTradeRoomMobile.asm" -INCLUDE "maps/MobileBattleRoom.asm" - - -SECTION "Map Scripts 18", ROMX, BANK[MAP_SCRIPTS_18] - -INCLUDE "maps/Route36.asm" -INCLUDE "maps/FuchsiaCity.asm" -INCLUDE "maps/BlackthornGym1F.asm" -INCLUDE "maps/BlackthornGym2F.asm" -INCLUDE "maps/BlackthornDragonSpeechHouse.asm" -INCLUDE "maps/BlackthornDodrioTradeHouse.asm" -INCLUDE "maps/BlackthornMart.asm" -INCLUDE "maps/BlackthornPokeCenter1F.asm" -INCLUDE "maps/MoveDeletersHouse.asm" -INCLUDE "maps/FuchsiaMart.asm" -INCLUDE "maps/SafariZoneMainOffice.asm" -INCLUDE "maps/FuchsiaGym.asm" -INCLUDE "maps/FuchsiaBillSpeechHouse.asm" -INCLUDE "maps/FuchsiaPokeCenter1F.asm" -INCLUDE "maps/FuchsiaPokeCenter2FBeta.asm" -INCLUDE "maps/SafariZoneWardensHome.asm" -INCLUDE "maps/Route15FuchsiaGate.asm" -INCLUDE "maps/CherrygroveMart.asm" -INCLUDE "maps/CherrygrovePokeCenter1F.asm" -INCLUDE "maps/CherrygroveGymSpeechHouse.asm" -INCLUDE "maps/GuideGentsHouse.asm" -INCLUDE "maps/CherrygroveEvolutionSpeechHouse.asm" -INCLUDE "maps/Route30BerrySpeechHouse.asm" -INCLUDE "maps/MrPokemonsHouse.asm" -INCLUDE "maps/Route31VioletGate.asm" - - -SECTION "Map Scripts 19", ROMX, BANK[MAP_SCRIPTS_19] - -INCLUDE "maps/AzaleaTown.asm" -INCLUDE "maps/GoldenrodCity.asm" -INCLUDE "maps/SaffronCity.asm" -INCLUDE "maps/MahoganyRedGyaradosSpeechHouse.asm" -INCLUDE "maps/MahoganyGym.asm" -INCLUDE "maps/MahoganyPokeCenter1F.asm" -INCLUDE "maps/Route42EcruteakGate.asm" -INCLUDE "maps/LakeofRageHiddenPowerHouse.asm" -INCLUDE "maps/LakeofRageMagikarpHouse.asm" -INCLUDE "maps/Route43MahoganyGate.asm" -INCLUDE "maps/Route43Gate.asm" -INCLUDE "maps/RedsHouse1F.asm" -INCLUDE "maps/RedsHouse2F.asm" -INCLUDE "maps/BluesHouse.asm" -INCLUDE "maps/OaksLab.asm" - - -SECTION "Map Scripts 20", ROMX, BANK[MAP_SCRIPTS_20] - -INCLUDE "maps/CherrygroveCity.asm" -INCLUDE "maps/Route35.asm" -INCLUDE "maps/Route43.asm" -INCLUDE "maps/Route44.asm" -INCLUDE "maps/Route45.asm" -INCLUDE "maps/Route19.asm" -INCLUDE "maps/Route25.asm" - - -SECTION "Map Scripts 21", ROMX, BANK[MAP_SCRIPTS_21] - -INCLUDE "maps/CianwoodCity.asm" -INCLUDE "maps/Route27.asm" -INCLUDE "maps/Route29.asm" -INCLUDE "maps/Route30.asm" -INCLUDE "maps/Route38.asm" -INCLUDE "maps/Route13.asm" -INCLUDE "maps/PewterNidoranSpeechHouse.asm" -INCLUDE "maps/PewterGym.asm" -INCLUDE "maps/PewterMart.asm" -INCLUDE "maps/PewterPokeCenter1F.asm" -INCLUDE "maps/PewterPokeCEnter2FBeta.asm" -INCLUDE "maps/PewterSnoozeSpeechHouse.asm" - - -SECTION "Map Scripts 22", ROMX, BANK[MAP_SCRIPTS_22] - -INCLUDE "maps/EcruteakCity.asm" -INCLUDE "maps/BlackthornCity.asm" -INCLUDE "maps/Route26.asm" -INCLUDE "maps/Route28.asm" -INCLUDE "maps/Route31.asm" -INCLUDE "maps/Route39.asm" -INCLUDE "maps/Route40.asm" -INCLUDE "maps/Route41.asm" -INCLUDE "maps/Route12.asm" - - -SECTION "Map Scripts 23", ROMX, BANK[MAP_SCRIPTS_23] - -INCLUDE "maps/NewBarkTown.asm" -INCLUDE "maps/VioletCity.asm" -INCLUDE "maps/OlivineCity.asm" -INCLUDE "maps/Route37.asm" -INCLUDE "maps/Route42.asm" -INCLUDE "maps/Route46.asm" -INCLUDE "maps/ViridianCity.asm" -INCLUDE "maps/CeladonCity.asm" -INCLUDE "maps/Route15.asm" -INCLUDE "maps/VermilionCity.asm" -INCLUDE "maps/Route9.asm" -INCLUDE "maps/CinnabarPokeCenter1F.asm" -INCLUDE "maps/CinnabarPokeCenter2FBeta.asm" -INCLUDE "maps/Route19FuchsiaGate.asm" -INCLUDE "maps/SeafoamGym.asm" - - -SECTION "Map Scripts 24", ROMX, BANK[MAP_SCRIPTS_24] - -INCLUDE "maps/Route33.asm" -INCLUDE "maps/Route2.asm" -INCLUDE "maps/Route1.asm" -INCLUDE "maps/PalletTown.asm" -INCLUDE "maps/Route21.asm" -INCLUDE "maps/CinnabarIsland.asm" -INCLUDE "maps/Route20.asm" -INCLUDE "maps/Route18.asm" -INCLUDE "maps/Route17.asm" -INCLUDE "maps/Route16.asm" -INCLUDE "maps/Route7.asm" -INCLUDE "maps/Route14.asm" -INCLUDE "maps/LavenderTown.asm" -INCLUDE "maps/Route6.asm" -INCLUDE "maps/Route5.asm" -INCLUDE "maps/Route24.asm" -INCLUDE "maps/Route3.asm" -INCLUDE "maps/Route4.asm" -INCLUDE "maps/Route10South.asm" -INCLUDE "maps/Route23.asm" -INCLUDE "maps/SilverCavePokeCenter1F.asm" -INCLUDE "maps/Route28FamousSpeechHouse.asm" - - -SECTION "bank6C", ROMX, BANK[$6C] - -; Common text I +SECTION "Common Text 1", ROMX, BANK[$6C] INCLUDE "text/common.asm" -SECTION "Map Scripts 25", ROMX, BANK[MAP_SCRIPTS_25] - -INCLUDE "maps/SilverCaveOutside.asm" -INCLUDE "maps/Route10North.asm" - SECTION "bank6D", ROMX, BANK[$6D] @@ -125307,31 +124811,18 @@ INCLUDE "text/phone/elm.asm" INCLUDE "text/phone/trainers1.asm" -SECTION "bank6E", ROMX, BANK[$6E] -; Pokedex entries II -; 065-128 -PokedexEntries2: -INCLUDE "stats/pokedex/entries_2.asm" - - -SECTION "bank6F", ROMX, BANK[$6F] - -; Common text II +SECTION "Common Text 2", ROMX, BANK[$6F] INCLUDE "text/common_2.asm" -SECTION "bank70", ROMX, BANK[$70] - -; Common text III +SECTION "Common Text 3", ROMX, BANK[$70] INCLUDE "text/common_3.asm" -SECTION "bank71", ROMX, BANK[$71] - -; Common text IV +SECTION "Common Text 4", ROMX, BANK[$71] INCLUDE "text/common_4.asm" @@ -125386,21 +124877,6 @@ RegionCheck: ; 0x1caea1 ret -SECTION "bank73", ROMX, BANK[$73] - -; Pokedex entries III - ; 129-192 -PokedexEntries3: -INCLUDE "stats/pokedex/entries_3.asm" - - -SECTION "bank74", ROMX, BANK[$74] - -; Pokedex entries IV - ; 193-251 -PokedexEntries4: -INCLUDE "stats/pokedex/entries_4.asm" - SECTION "bank75", ROMX, BANK[$75] diff --git a/maps.asm b/maps.asm new file mode 100644 index 000000000..51e5c00cd --- /dev/null +++ b/maps.asm @@ -0,0 +1,494 @@ + +SECTION "Map Headers", ROMX, BANK[MAP_HEADERS] + +INCLUDE "maps/map_headers.asm" +INCLUDE "maps/second_map_headers.asm" + + +SECTION "Map Scripts 1", ROMX, BANK[MAP_SCRIPTS_1] + +INCLUDE "maps/GoldenrodGym.asm" +INCLUDE "maps/GoldenrodBikeShop.asm" +INCLUDE "maps/GoldenrodHappinessRater.asm" +INCLUDE "maps/GoldenrodBillsHouse.asm" +INCLUDE "maps/GoldenrodMagnetTrainStation.asm" +INCLUDE "maps/GoldenrodFlowerShop.asm" +INCLUDE "maps/GoldenrodPPSpeechHouse.asm" +INCLUDE "maps/GoldenrodNameRatersHouse.asm" +INCLUDE "maps/GoldenrodDeptStore1F.asm" +INCLUDE "maps/GoldenrodDeptStore2F.asm" +INCLUDE "maps/GoldenrodDeptStore3F.asm" +INCLUDE "maps/GoldenrodDeptStore4F.asm" +INCLUDE "maps/GoldenrodDeptStore5F.asm" +INCLUDE "maps/GoldenrodDeptStore6F.asm" +INCLUDE "maps/GoldenrodDeptStoreElevator.asm" +INCLUDE "maps/GoldenrodDeptStoreRoof.asm" +INCLUDE "maps/GoldenrodGameCorner.asm" + + +SECTION "Map Scripts 2", ROMX, BANK[MAP_SCRIPTS_2] + +INCLUDE "maps/RuinsofAlphOutside.asm" +INCLUDE "maps/RuinsofAlphHoOhChamber.asm" +INCLUDE "maps/RuinsofAlphKabutoChamber.asm" +INCLUDE "maps/RuinsofAlphOmanyteChamber.asm" +INCLUDE "maps/RuinsofAlphAerodactylChamber.asm" +INCLUDE "maps/RuinsofAlphInnerChamber.asm" +INCLUDE "maps/RuinsofAlphResearchCenter.asm" +INCLUDE "maps/RuinsofAlphHoOhItemRoom.asm" +INCLUDE "maps/RuinsofAlphKabutoItemRoom.asm" +INCLUDE "maps/RuinsofAlphOmanyteItemRoom.asm" +INCLUDE "maps/RuinsofAlphAerodactylItemRoom.asm" +INCLUDE "maps/RuinsofAlphHoOhWordRoom.asm" +INCLUDE "maps/RuinsofAlphKabutoWordRoom.asm" +INCLUDE "maps/RuinsofAlphOmanyteWordRoom.asm" +INCLUDE "maps/RuinsofAlphAerodactylWordRoom.asm" +INCLUDE "maps/UnionCave1F.asm" +INCLUDE "maps/UnionCaveB1F.asm" +INCLUDE "maps/UnionCaveB2F.asm" +INCLUDE "maps/SlowpokeWellB1F.asm" +INCLUDE "maps/SlowpokeWellB2F.asm" +INCLUDE "maps/OlivineLighthouse1F.asm" +INCLUDE "maps/OlivineLighthouse2F.asm" +INCLUDE "maps/OlivineLighthouse3F.asm" +INCLUDE "maps/OlivineLighthouse4F.asm" + + +SECTION "Map Scripts 3", ROMX, BANK[MAP_SCRIPTS_3] + +INCLUDE "maps/NationalPark.asm" +INCLUDE "maps/NationalParkBugContest.asm" +INCLUDE "maps/RadioTower1F.asm" +INCLUDE "maps/RadioTower2F.asm" +INCLUDE "maps/RadioTower3F.asm" +INCLUDE "maps/RadioTower4F.asm" + + +SECTION "Map Scripts 4", ROMX, BANK[MAP_SCRIPTS_4] + +INCLUDE "maps/RadioTower5F.asm" +INCLUDE "maps/OlivineLighthouse5F.asm" +INCLUDE "maps/OlivineLighthouse6F.asm" +INCLUDE "maps/GoldenrodPokeCenter1F.asm" +INCLUDE "maps/GoldenrodPokeComCenter2FMobile.asm" +INCLUDE "maps/IlexForestAzaleaGate.asm" +INCLUDE "maps/Route34IlexForestGate.asm" +INCLUDE "maps/DayCare.asm" + + +SECTION "Map Scripts 5", ROMX, BANK[MAP_SCRIPTS_5] + +INCLUDE "maps/Route11.asm" +INCLUDE "maps/VioletMart.asm" +INCLUDE "maps/VioletGym.asm" +INCLUDE "maps/EarlsPokemonAcademy.asm" +INCLUDE "maps/VioletNicknameSpeechHouse.asm" +INCLUDE "maps/VioletPokeCenter1F.asm" +INCLUDE "maps/VioletOnixTradeHouse.asm" +INCLUDE "maps/Route32RuinsofAlphGate.asm" +INCLUDE "maps/Route32PokeCenter1F.asm" +INCLUDE "maps/Route35Goldenrodgate.asm" +INCLUDE "maps/Route35NationalParkgate.asm" +INCLUDE "maps/Route36RuinsofAlphgate.asm" +INCLUDE "maps/Route36NationalParkgate.asm" + + +SECTION "Map Scripts 6", ROMX, BANK[MAP_SCRIPTS_6] + +INCLUDE "maps/Route8.asm" +INCLUDE "maps/MahoganyMart1F.asm" +INCLUDE "maps/TeamRocketBaseB1F.asm" +INCLUDE "maps/TeamRocketBaseB2F.asm" +INCLUDE "maps/TeamRocketBaseB3F.asm" +INCLUDE "maps/IlexForest.asm" + + +SECTION "Map Scripts 7", ROMX, BANK[MAP_SCRIPTS_7] + +INCLUDE "maps/LakeofRage.asm" +INCLUDE "maps/CeladonDeptStore1F.asm" +INCLUDE "maps/CeladonDeptStore2F.asm" +INCLUDE "maps/CeladonDeptStore3F.asm" +INCLUDE "maps/CeladonDeptStore4F.asm" +INCLUDE "maps/CeladonDeptStore5F.asm" +INCLUDE "maps/CeladonDeptStore6F.asm" +INCLUDE "maps/CeladonDeptStoreElevator.asm" +INCLUDE "maps/CeladonMansion1F.asm" +INCLUDE "maps/CeladonMansion2F.asm" +INCLUDE "maps/CeladonMansion3F.asm" +INCLUDE "maps/CeladonMansionRoof.asm" +INCLUDE "maps/CeladonMansionRoofHouse.asm" +INCLUDE "maps/CeladonPokeCenter1F.asm" +INCLUDE "maps/CeladonPokeCenter2FBeta.asm" +INCLUDE "maps/CeladonGameCorner.asm" +INCLUDE "maps/CeladonGameCornerPrizeRoom.asm" +INCLUDE "maps/CeladonGym.asm" +INCLUDE "maps/CeladonCafe.asm" +INCLUDE "maps/Route16FuchsiaSpeechHouse.asm" +INCLUDE "maps/Route16Gate.asm" +INCLUDE "maps/Route7SaffronGate.asm" +INCLUDE "maps/Route1718Gate.asm" + + +SECTION "Map Scripts 8", ROMX, BANK[MAP_SCRIPTS_8] + +INCLUDE "maps/DiglettsCave.asm" +INCLUDE "maps/MountMoon.asm" +INCLUDE "maps/Underground.asm" +INCLUDE "maps/RockTunnel1F.asm" +INCLUDE "maps/RockTunnelB1F.asm" +INCLUDE "maps/SafariZoneFuchsiaGateBeta.asm" +INCLUDE "maps/SafariZoneBeta.asm" +INCLUDE "maps/VictoryRoad.asm" +INCLUDE "maps/OlivinePort.asm" +INCLUDE "maps/VermilionPort.asm" +INCLUDE "maps/FastShip1F.asm" +INCLUDE "maps/FastShipCabins_NNW_NNE_NE.asm" +INCLUDE "maps/FastShipCabins_SW_SSW_NW.asm" +INCLUDE "maps/FastShipCabins_SE_SSE_CaptainsCabin.asm" +INCLUDE "maps/FastShipB1F.asm" +INCLUDE "maps/OlivinePortPassage.asm" +INCLUDE "maps/VermilionPortPassage.asm" +INCLUDE "maps/MountMoonSquare.asm" +INCLUDE "maps/MountMoonGiftShop.asm" +INCLUDE "maps/TinTowerRoof.asm" + + +SECTION "Map Scripts 9", ROMX, BANK[MAP_SCRIPTS_9] + +INCLUDE "maps/Route34.asm" +INCLUDE "maps/ElmsLab.asm" +INCLUDE "maps/KrissHouse1F.asm" +INCLUDE "maps/KrissHouse2F.asm" +INCLUDE "maps/KrissNeighborsHouse.asm" +INCLUDE "maps/ElmsHouse.asm" +INCLUDE "maps/Route26HealSpeechHouse.asm" +INCLUDE "maps/Route26DayofWeekSiblingsHouse.asm" +INCLUDE "maps/Route27SandstormHouse.asm" +INCLUDE "maps/Route2946Gate.asm" + + +SECTION "Map Scripts 10", ROMX, BANK[MAP_SCRIPTS_10] + +INCLUDE "maps/Route22.asm" +INCLUDE "maps/WarehouseEntrance.asm" +INCLUDE "maps/UndergroundPathSwitchRoomEntrances.asm" +INCLUDE "maps/GoldenrodDeptStoreB1F.asm" +INCLUDE "maps/UndergroundWarehouse.asm" +INCLUDE "maps/MountMortar1FOutside.asm" +INCLUDE "maps/MountMortar1FInside.asm" +INCLUDE "maps/MountMortar2FInside.asm" +INCLUDE "maps/MountMortarB1F.asm" +INCLUDE "maps/IcePath1F.asm" +INCLUDE "maps/IcePathB1F.asm" +INCLUDE "maps/IcePathB2FMahoganySide.asm" +INCLUDE "maps/IcePathB2FBlackthornSide.asm" +INCLUDE "maps/IcePathB3F.asm" +INCLUDE "maps/LavenderPokeCenter1F.asm" +INCLUDE "maps/LavenderPokeCenter2FBeta.asm" +INCLUDE "maps/MrFujisHouse.asm" +INCLUDE "maps/LavenderTownSpeechHouse.asm" +INCLUDE "maps/LavenderNameRater.asm" +INCLUDE "maps/LavenderMart.asm" +INCLUDE "maps/SoulHouse.asm" +INCLUDE "maps/LavRadioTower1F.asm" +INCLUDE "maps/Route8SaffronGate.asm" +INCLUDE "maps/Route12SuperRodHouse.asm" + + +SECTION "Map Scripts 11", ROMX, BANK[MAP_SCRIPTS_11] + +INCLUDE "maps/EcruteakHouse.asm" +INCLUDE "maps/WiseTriosRoom.asm" +INCLUDE "maps/EcruteakPokeCenter1F.asm" +INCLUDE "maps/EcruteakLugiaSpeechHouse.asm" +INCLUDE "maps/DanceTheatre.asm" +INCLUDE "maps/EcruteakMart.asm" +INCLUDE "maps/EcruteakGym.asm" +INCLUDE "maps/EcruteakItemfinderHouse.asm" +INCLUDE "maps/ViridianGym.asm" +INCLUDE "maps/ViridianNicknameSpeechHouse.asm" +INCLUDE "maps/TrainerHouse1F.asm" +INCLUDE "maps/TrainerHouseB1F.asm" +INCLUDE "maps/ViridianMart.asm" +INCLUDE "maps/ViridianPokeCenter1F.asm" +INCLUDE "maps/ViridianPokeCenter2FBeta.asm" +INCLUDE "maps/Route2NuggetSpeechHouse.asm" +INCLUDE "maps/Route2Gate.asm" +INCLUDE "maps/VictoryRoadGate.asm" + + +SECTION "Map Scripts 12", ROMX, BANK[MAP_SCRIPTS_12] + +INCLUDE "maps/OlivinePokeCenter1F.asm" +INCLUDE "maps/OlivineGym.asm" +INCLUDE "maps/OlivineVoltorbHouse.asm" +INCLUDE "maps/OlivineHouseBeta.asm" +INCLUDE "maps/OlivinePunishmentSpeechHouse.asm" +INCLUDE "maps/OlivineGoodRodHouse.asm" +INCLUDE "maps/OlivineCafe.asm" +INCLUDE "maps/OlivineMart.asm" +INCLUDE "maps/Route38EcruteakGate.asm" +INCLUDE "maps/Route39Barn.asm" +INCLUDE "maps/Route39Farmhouse.asm" +INCLUDE "maps/ManiasHouse.asm" +INCLUDE "maps/CianwoodGym.asm" +INCLUDE "maps/CianwoodPokeCenter1F.asm" +INCLUDE "maps/CianwoodPharmacy.asm" +INCLUDE "maps/CianwoodCityPhotoStudio.asm" +INCLUDE "maps/CianwoodLugiaSpeechHouse.asm" +INCLUDE "maps/PokeSeersHouse.asm" +INCLUDE "maps/BattleTower1F.asm" +INCLUDE "maps/BattleTowerBattleRoom.asm" +INCLUDE "maps/BattleTowerElevator.asm" +INCLUDE "maps/BattleTowerHallway.asm" +INCLUDE "maps/Route40BattleTowerGate.asm" +INCLUDE "maps/BattleTowerOutside.asm" + + +SECTION "Map Scripts 13", ROMX, BANK[MAP_SCRIPTS_13] + +INCLUDE "maps/IndigoPlateauPokeCenter1F.asm" +INCLUDE "maps/WillsRoom.asm" +INCLUDE "maps/KogasRoom.asm" +INCLUDE "maps/BrunosRoom.asm" +INCLUDE "maps/KarensRoom.asm" +INCLUDE "maps/LancesRoom.asm" +INCLUDE "maps/HallOfFame.asm" + + +SECTION "Map Scripts 14", ROMX, BANK[MAP_SCRIPTS_14] + +INCLUDE "maps/CeruleanCity.asm" +INCLUDE "maps/SproutTower1F.asm" +INCLUDE "maps/SproutTower2F.asm" +INCLUDE "maps/SproutTower3F.asm" +INCLUDE "maps/TinTower1F.asm" +INCLUDE "maps/TinTower2F.asm" +INCLUDE "maps/TinTower3F.asm" +INCLUDE "maps/TinTower4F.asm" +INCLUDE "maps/TinTower5F.asm" +INCLUDE "maps/TinTower6F.asm" +INCLUDE "maps/TinTower7F.asm" +INCLUDE "maps/TinTower8F.asm" +INCLUDE "maps/TinTower9F.asm" +INCLUDE "maps/BurnedTower1F.asm" +INCLUDE "maps/BurnedTowerB1F.asm" + + +SECTION "Map Scripts 15", ROMX, BANK[MAP_SCRIPTS_15] + +INCLUDE "maps/CeruleanGymBadgeSpeechHouse.asm" +INCLUDE "maps/CeruleanPoliceStation.asm" +INCLUDE "maps/CeruleanTradeSpeechHouse.asm" +INCLUDE "maps/CeruleanPokeCenter1F.asm" +INCLUDE "maps/CeruleanPokeCenter2FBeta.asm" +INCLUDE "maps/CeruleanGym.asm" +INCLUDE "maps/CeruleanMart.asm" +INCLUDE "maps/Route10PokeCenter1F.asm" +INCLUDE "maps/Route10PokeCenter2FBeta.asm" +INCLUDE "maps/PowerPlant.asm" +INCLUDE "maps/BillsHouse.asm" +INCLUDE "maps/FightingDojo.asm" +INCLUDE "maps/SaffronGym.asm" +INCLUDE "maps/SaffronMart.asm" +INCLUDE "maps/SaffronPokeCenter1F.asm" +INCLUDE "maps/SaffronPokeCenter2FBeta.asm" +INCLUDE "maps/MrPsychicsHouse.asm" +INCLUDE "maps/SaffronTrainStation.asm" +INCLUDE "maps/SilphCo1F.asm" +INCLUDE "maps/CopycatsHouse1F.asm" +INCLUDE "maps/CopycatsHouse2F.asm" +INCLUDE "maps/Route5UndergroundEntrance.asm" +INCLUDE "maps/Route5SaffronCityGate.asm" +INCLUDE "maps/Route5CleanseTagSpeechHouse.asm" + + +SECTION "Map Scripts 16", ROMX, BANK[MAP_SCRIPTS_16] + +INCLUDE "maps/PewterCity.asm" +INCLUDE "maps/WhirlIslandNW.asm" +INCLUDE "maps/WhirlIslandNE.asm" +INCLUDE "maps/WhirlIslandSW.asm" +INCLUDE "maps/WhirlIslandCave.asm" +INCLUDE "maps/WhirlIslandSE.asm" +INCLUDE "maps/WhirlIslandB1F.asm" +INCLUDE "maps/WhirlIslandB2F.asm" +INCLUDE "maps/WhirlIslandLugiaChamber.asm" +INCLUDE "maps/SilverCaveRoom1.asm" +INCLUDE "maps/SilverCaveRoom2.asm" +INCLUDE "maps/SilverCaveRoom3.asm" +INCLUDE "maps/SilverCaveItemRooms.asm" +INCLUDE "maps/DarkCaveVioletEntrance.asm" +INCLUDE "maps/DarkCaveBlackthornEntrance.asm" +INCLUDE "maps/DragonsDen1F.asm" +INCLUDE "maps/DragonsDenB1F.asm" +INCLUDE "maps/DragonShrine.asm" +INCLUDE "maps/TohjoFalls.asm" +INCLUDE "maps/AzaleaPokeCenter1F.asm" +INCLUDE "maps/CharcoalKiln.asm" +INCLUDE "maps/AzaleaMart.asm" +INCLUDE "maps/KurtsHouse.asm" +INCLUDE "maps/AzaleaGym.asm" + + +SECTION "Map Scripts 17", ROMX, BANK[MAP_SCRIPTS_17] + +INCLUDE "maps/MahoganyTown.asm" +INCLUDE "maps/Route32.asm" +INCLUDE "maps/VermilionHouseFishingSpeechHouse.asm" +INCLUDE "maps/VermilionPokeCenter1F.asm" +INCLUDE "maps/VermilionPokeCenter2FBeta.asm" +INCLUDE "maps/PokemonFanClub.asm" +INCLUDE "maps/VermilionMagnetTrainSpeechHouse.asm" +INCLUDE "maps/VermilionMart.asm" +INCLUDE "maps/VermilionHouseDiglettsCaveSpeechHouse.asm" +INCLUDE "maps/VermilionGym.asm" +INCLUDE "maps/Route6SaffronGate.asm" +INCLUDE "maps/Route6UndergroundEntrance.asm" +INCLUDE "maps/PokeCenter2F.asm" +INCLUDE "maps/TradeCenter.asm" +INCLUDE "maps/Colosseum.asm" +INCLUDE "maps/TimeCapsule.asm" +INCLUDE "maps/MobileTradeRoomMobile.asm" +INCLUDE "maps/MobileBattleRoom.asm" + + +SECTION "Map Scripts 18", ROMX, BANK[MAP_SCRIPTS_18] + +INCLUDE "maps/Route36.asm" +INCLUDE "maps/FuchsiaCity.asm" +INCLUDE "maps/BlackthornGym1F.asm" +INCLUDE "maps/BlackthornGym2F.asm" +INCLUDE "maps/BlackthornDragonSpeechHouse.asm" +INCLUDE "maps/BlackthornDodrioTradeHouse.asm" +INCLUDE "maps/BlackthornMart.asm" +INCLUDE "maps/BlackthornPokeCenter1F.asm" +INCLUDE "maps/MoveDeletersHouse.asm" +INCLUDE "maps/FuchsiaMart.asm" +INCLUDE "maps/SafariZoneMainOffice.asm" +INCLUDE "maps/FuchsiaGym.asm" +INCLUDE "maps/FuchsiaBillSpeechHouse.asm" +INCLUDE "maps/FuchsiaPokeCenter1F.asm" +INCLUDE "maps/FuchsiaPokeCenter2FBeta.asm" +INCLUDE "maps/SafariZoneWardensHome.asm" +INCLUDE "maps/Route15FuchsiaGate.asm" +INCLUDE "maps/CherrygroveMart.asm" +INCLUDE "maps/CherrygrovePokeCenter1F.asm" +INCLUDE "maps/CherrygroveGymSpeechHouse.asm" +INCLUDE "maps/GuideGentsHouse.asm" +INCLUDE "maps/CherrygroveEvolutionSpeechHouse.asm" +INCLUDE "maps/Route30BerrySpeechHouse.asm" +INCLUDE "maps/MrPokemonsHouse.asm" +INCLUDE "maps/Route31VioletGate.asm" + + +SECTION "Map Scripts 19", ROMX, BANK[MAP_SCRIPTS_19] + +INCLUDE "maps/AzaleaTown.asm" +INCLUDE "maps/GoldenrodCity.asm" +INCLUDE "maps/SaffronCity.asm" +INCLUDE "maps/MahoganyRedGyaradosSpeechHouse.asm" +INCLUDE "maps/MahoganyGym.asm" +INCLUDE "maps/MahoganyPokeCenter1F.asm" +INCLUDE "maps/Route42EcruteakGate.asm" +INCLUDE "maps/LakeofRageHiddenPowerHouse.asm" +INCLUDE "maps/LakeofRageMagikarpHouse.asm" +INCLUDE "maps/Route43MahoganyGate.asm" +INCLUDE "maps/Route43Gate.asm" +INCLUDE "maps/RedsHouse1F.asm" +INCLUDE "maps/RedsHouse2F.asm" +INCLUDE "maps/BluesHouse.asm" +INCLUDE "maps/OaksLab.asm" + + +SECTION "Map Scripts 20", ROMX, BANK[MAP_SCRIPTS_20] + +INCLUDE "maps/CherrygroveCity.asm" +INCLUDE "maps/Route35.asm" +INCLUDE "maps/Route43.asm" +INCLUDE "maps/Route44.asm" +INCLUDE "maps/Route45.asm" +INCLUDE "maps/Route19.asm" +INCLUDE "maps/Route25.asm" + + +SECTION "Map Scripts 21", ROMX, BANK[MAP_SCRIPTS_21] + +INCLUDE "maps/CianwoodCity.asm" +INCLUDE "maps/Route27.asm" +INCLUDE "maps/Route29.asm" +INCLUDE "maps/Route30.asm" +INCLUDE "maps/Route38.asm" +INCLUDE "maps/Route13.asm" +INCLUDE "maps/PewterNidoranSpeechHouse.asm" +INCLUDE "maps/PewterGym.asm" +INCLUDE "maps/PewterMart.asm" +INCLUDE "maps/PewterPokeCenter1F.asm" +INCLUDE "maps/PewterPokeCEnter2FBeta.asm" +INCLUDE "maps/PewterSnoozeSpeechHouse.asm" + + +SECTION "Map Scripts 22", ROMX, BANK[MAP_SCRIPTS_22] + +INCLUDE "maps/EcruteakCity.asm" +INCLUDE "maps/BlackthornCity.asm" +INCLUDE "maps/Route26.asm" +INCLUDE "maps/Route28.asm" +INCLUDE "maps/Route31.asm" +INCLUDE "maps/Route39.asm" +INCLUDE "maps/Route40.asm" +INCLUDE "maps/Route41.asm" +INCLUDE "maps/Route12.asm" + + +SECTION "Map Scripts 23", ROMX, BANK[MAP_SCRIPTS_23] + +INCLUDE "maps/NewBarkTown.asm" +INCLUDE "maps/VioletCity.asm" +INCLUDE "maps/OlivineCity.asm" +INCLUDE "maps/Route37.asm" +INCLUDE "maps/Route42.asm" +INCLUDE "maps/Route46.asm" +INCLUDE "maps/ViridianCity.asm" +INCLUDE "maps/CeladonCity.asm" +INCLUDE "maps/Route15.asm" +INCLUDE "maps/VermilionCity.asm" +INCLUDE "maps/Route9.asm" +INCLUDE "maps/CinnabarPokeCenter1F.asm" +INCLUDE "maps/CinnabarPokeCenter2FBeta.asm" +INCLUDE "maps/Route19FuchsiaGate.asm" +INCLUDE "maps/SeafoamGym.asm" + + +SECTION "Map Scripts 24", ROMX, BANK[MAP_SCRIPTS_24] + +INCLUDE "maps/Route33.asm" +INCLUDE "maps/Route2.asm" +INCLUDE "maps/Route1.asm" +INCLUDE "maps/PalletTown.asm" +INCLUDE "maps/Route21.asm" +INCLUDE "maps/CinnabarIsland.asm" +INCLUDE "maps/Route20.asm" +INCLUDE "maps/Route18.asm" +INCLUDE "maps/Route17.asm" +INCLUDE "maps/Route16.asm" +INCLUDE "maps/Route7.asm" +INCLUDE "maps/Route14.asm" +INCLUDE "maps/LavenderTown.asm" +INCLUDE "maps/Route6.asm" +INCLUDE "maps/Route5.asm" +INCLUDE "maps/Route24.asm" +INCLUDE "maps/Route3.asm" +INCLUDE "maps/Route4.asm" +INCLUDE "maps/Route10South.asm" +INCLUDE "maps/Route23.asm" +INCLUDE "maps/SilverCavePokeCenter1F.asm" +INCLUDE "maps/Route28FamousSpeechHouse.asm" + + +SECTION "Map Scripts 25", ROMX, BANK[MAP_SCRIPTS_25] + +INCLUDE "maps/SilverCaveOutside.asm" +INCLUDE "maps/Route10North.asm" + diff --git a/maps_crystal.asm b/maps_crystal.asm new file mode 100644 index 000000000..0379ca4b8 --- /dev/null +++ b/maps_crystal.asm @@ -0,0 +1,5 @@ +INCLUDE "pokecrystal.asm" +INCLUDE "includes.asm" + +INCLUDE "maps.asm" + diff --git a/stats/pokedex/entries.asm b/stats/pokedex/entries.asm new file mode 100644 index 000000000..7cfaa254d --- /dev/null +++ b/stats/pokedex/entries.asm @@ -0,0 +1,24 @@ + +SECTION "Pokedex Entries 001-064", ROMX, BANK[POKEDEX_ENTRIES_1] + +PokedexEntries1: +INCLUDE "stats/pokedex/entries_1.asm" + + +SECTION "Pokedex Entries 065-128", ROMX, BANK[POKEDEX_ENTRIES_2] + +PokedexEntries2: +INCLUDE "stats/pokedex/entries_2.asm" + + +SECTION "Pokedex Entries 129-192", ROMX, BANK[POKEDEX_ENTRIES_3] + +PokedexEntries3: +INCLUDE "stats/pokedex/entries_3.asm" + + +SECTION "Pokedex Entries 193-251", ROMX, BANK[POKEDEX_ENTRIES_4] + +PokedexEntries4: +INCLUDE "stats/pokedex/entries_4.asm" + diff --git a/stats/pokedex/entries_crystal.asm b/stats/pokedex/entries_crystal.asm new file mode 100644 index 000000000..f66d52350 --- /dev/null +++ b/stats/pokedex/entries_crystal.asm @@ -0,0 +1,5 @@ +INCLUDE "pokecrystal.asm" +INCLUDE "includes.asm" + +INCLUDE "stats/pokedex/entries.asm" +