diff options
Diffstat (limited to 'main.asm')
-rwxr-xr-x | main.asm | 2985 |
1 files changed, 1510 insertions, 1475 deletions
@@ -1,10 +1,9 @@ -INCLUDE "charmap.asm" INCLUDE "constants.asm" INCLUDE "home.asm" -SECTION "bank01", ROMX +SECTION "bank1", ROMX INCLUDE "data/facing.asm" @@ -22,14 +21,17 @@ INCLUDE "engine/overworld/oam.asm" INCLUDE "engine/print_waiting_text.asm" INCLUDE "engine/overworld/map_sprite_functions1.asm" + INCLUDE "engine/overworld/item.asm" INCLUDE "engine/overworld/movement.asm" + INCLUDE "engine/cable_club.asm" + INCLUDE "engine/menu/main_menu.asm" + INCLUDE "engine/oak_speech.asm" -INCLUDE "engine/overworld/special_warps.asm" -INCLUDE "data/special_warps.asm" +INCLUDE "engine/special_warps.asm" INCLUDE "engine/debug1.asm" @@ -42,63 +44,64 @@ INCLUDE "engine/subtract_paid_money.asm" INCLUDE "engine/menu/swap_items.asm" INCLUDE "engine/overworld/pokemart.asm" + INCLUDE "engine/learn_move.asm" + INCLUDE "engine/overworld/pokecenter.asm" + INCLUDE "engine/overworld/set_blackout_map.asm" -INCLUDE "engine/menu/text_ids1.asm" +INCLUDE "engine/display_text_id_init.asm" +INCLUDE "engine/menu/draw_start_menu.asm" + INCLUDE "engine/overworld/cable_club_npc.asm" -INCLUDE "engine/menu/text_ids2.asm" + +INCLUDE "engine/menu/text_box.asm" INCLUDE "engine/battle/moveEffects/drain_hp_effect.asm" + INCLUDE "engine/menu/players_pc.asm" + INCLUDE "engine/remove_pokemon.asm" + INCLUDE "engine/display_pokedex.asm" -SECTION "bank03", ROMX +SECTION "bank3", ROMX INCLUDE "engine/joypad.asm" -INCLUDE "engine/overworld/clear_loadmapdata_vars.asm" -INCLUDE "engine/overworld/check_player_state.asm" -INCLUDE "engine/overworld/print_safari_steps.asm" -INCLUDE "engine/overworld/get_coords_tile_in_front_of_player.asm" -INCLUDE "engine/overworld/boulders.asm" -INCLUDE "engine/overworld/step_functions.asm" -INCLUDE "engine/overworld/load_tileset_header.asm" +INCLUDE "engine/overworld/clear_variables.asm" +INCLUDE "engine/overworld/player_state.asm" +INCLUDE "engine/overworld/poison.asm" +INCLUDE "engine/overworld/tileset_header.asm" INCLUDE "engine/overworld/daycare_exp.asm" INCLUDE "data/hide_show_data.asm" -INCLUDE "engine/overworld/load_wild_data.asm" +INCLUDE "engine/overworld/wild_mons.asm" INCLUDE "engine/items/items.asm" -INCLUDE "engine/draw_badges.asm" +INCLUDE "engine/menu/draw_badges.asm" -INCLUDE "engine/overworld/replace_tile_block.asm" +INCLUDE "engine/overworld/update_map.asm" INCLUDE "engine/overworld/cut.asm" INCLUDE "engine/overworld/missable_objects.asm" -INCLUDE "engine/overworld/try_pushing_boulder.asm" +INCLUDE "engine/overworld/push_boulder.asm" -INCLUDE "engine/add_party_mon.asm" -INCLUDE "engine/move_mon.asm" -INCLUDE "engine/flag_action_predef.asm" +INCLUDE "engine/add_mon.asm" +INCLUDE "engine/flag_action.asm" INCLUDE "engine/heal_party.asm" INCLUDE "engine/bcd.asm" - INCLUDE "engine/init_player_data.asm" - INCLUDE "engine/get_bag_item_quantity.asm" - -INCLUDE "engine/overworld/npc_pathfinding.asm" - +INCLUDE "engine/pathfinding.asm" INCLUDE "engine/hp_bar.asm" INCLUDE "engine/hidden_object_functions3.asm" -SECTION "Graphics", ROMX ; BANK $04 +SECTION "Graphics (BANK 4)", ROMX PokemonLogoJapanGraphics: INCBIN "gfx/pokemon_logo_japan.2bpp" FontGraphics: INCBIN "gfx/font.1bpp" @@ -222,246 +225,254 @@ INCLUDE "engine/battle/moveEffects/substitute_effect.asm" INCLUDE "engine/menu/pc.asm" -SECTION "bank06", ROMX +SECTION "bank6", ROMX -INCLUDE "data/mapHeaders/celadoncity.asm" -INCLUDE "data/mapObjects/celadoncity.asm" -CeladonCityBlocks: INCBIN "maps/celadoncity.blk" +INCLUDE "data/mapHeaders/CeladonCity.asm" +INCLUDE "data/mapObjects/CeladonCity.asm" +CeladonCity_Blocks: INCBIN "maps/CeladonCity.blk" -INCLUDE "data/mapHeaders/pallettown.asm" -INCLUDE "data/mapObjects/pallettown.asm" -PalletTownBlocks: INCBIN "maps/pallettown.blk" +INCLUDE "data/mapHeaders/PalletTown.asm" +INCLUDE "data/mapObjects/PalletTown.asm" +PalletTown_Blocks: INCBIN "maps/PalletTown.blk" -INCLUDE "data/mapHeaders/viridiancity.asm" -INCLUDE "data/mapObjects/viridiancity.asm" -ViridianCityBlocks: INCBIN "maps/viridiancity.blk" +INCLUDE "data/mapHeaders/ViridianCity.asm" +INCLUDE "data/mapObjects/ViridianCity.asm" +ViridianCity_Blocks: INCBIN "maps/ViridianCity.blk" -INCLUDE "data/mapHeaders/pewtercity.asm" -INCLUDE "data/mapObjects/pewtercity.asm" -PewterCityBlocks: INCBIN "maps/pewtercity.blk" +INCLUDE "data/mapHeaders/PewterCity.asm" + ds 1 +INCLUDE "data/mapObjects/PewterCity.asm" +PewterCity_Blocks: INCBIN "maps/PewterCity.blk" -INCLUDE "data/mapHeaders/ceruleancity.asm" -INCLUDE "data/mapObjects/ceruleancity.asm" -CeruleanCityBlocks: INCBIN "maps/ceruleancity.blk" +INCLUDE "data/mapHeaders/CeruleanCity.asm" +INCLUDE "data/mapObjects/CeruleanCity.asm" +CeruleanCity_Blocks: INCBIN "maps/CeruleanCity.blk" -INCLUDE "data/mapHeaders/vermilioncity.asm" -INCLUDE "data/mapObjects/vermilioncity.asm" -VermilionCityBlocks: INCBIN "maps/vermilioncity.blk" -INCLUDE "data/mapHeaders/fuchsiacity.asm" -INCLUDE "data/mapObjects/fuchsiacity.asm" -FuchsiaCityBlocks: INCBIN "maps/fuchsiacity.blk" +INCLUDE "data/mapHeaders/VermilionCity.asm" +INCLUDE "data/mapObjects/VermilionCity.asm" +VermilionCity_Blocks: INCBIN "maps/VermilionCity.blk" +INCLUDE "data/mapHeaders/FuchsiaCity.asm" +INCLUDE "data/mapObjects/FuchsiaCity.asm" +FuchsiaCity_Blocks: INCBIN "maps/FuchsiaCity.blk" -INCLUDE "scripts/pallettown.asm" -INCLUDE "scripts/viridiancity.asm" -INCLUDE "scripts/pewtercity.asm" -INCLUDE "scripts/ceruleancity.asm" -INCLUDE "scripts/vermilioncity.asm" -INCLUDE "scripts/celadoncity.asm" -INCLUDE "scripts/fuchsiacity.asm" +INCLUDE "scripts/PalletTown.asm" +INCLUDE "scripts/ViridianCity.asm" +INCLUDE "scripts/PewterCity.asm" +INCLUDE "scripts/CeruleanCity.asm" +INCLUDE "scripts/VermilionCity.asm" +INCLUDE "scripts/CeladonCity.asm" +INCLUDE "scripts/FuchsiaCity.asm" -INCLUDE "data/mapHeaders/blueshouse.asm" -INCLUDE "scripts/blueshouse.asm" -INCLUDE "data/mapObjects/blueshouse.asm" -BluesHouseBlocks: INCBIN "maps/blueshouse.blk" +INCLUDE "data/mapHeaders/BluesHouse.asm" +INCLUDE "scripts/BluesHouse.asm" +INCLUDE "data/mapObjects/BluesHouse.asm" +BluesHouse_Blocks: INCBIN "maps/BluesHouse.blk" -INCLUDE "data/mapHeaders/vermilionhouse3.asm" -INCLUDE "scripts/vermilionhouse3.asm" -INCLUDE "data/mapObjects/vermilionhouse3.asm" -VermilionHouse3Blocks: INCBIN "maps/vermilionhouse3.blk" +INCLUDE "data/mapHeaders/VermilionTradeHouse.asm" +INCLUDE "scripts/VermilionTradeHouse.asm" +INCLUDE "data/mapObjects/VermilionTradeHouse.asm" +VermilionTradeHouse_Blocks: INCBIN "maps/VermilionTradeHouse.blk" -INCLUDE "data/mapHeaders/indigoplateaulobby.asm" -INCLUDE "scripts/indigoplateaulobby.asm" -INCLUDE "data/mapObjects/indigoplateaulobby.asm" -IndigoPlateauLobbyBlocks: INCBIN "maps/indigoplateaulobby.blk" +INCLUDE "data/mapHeaders/IndigoPlateauLobby.asm" +INCLUDE "scripts/IndigoPlateauLobby.asm" +INCLUDE "data/mapObjects/IndigoPlateauLobby.asm" +IndigoPlateauLobby_Blocks: INCBIN "maps/IndigoPlateauLobby.blk" -INCLUDE "data/mapHeaders/silphco4.asm" -INCLUDE "scripts/silphco4.asm" -INCLUDE "data/mapObjects/silphco4.asm" -SilphCo4Blocks: INCBIN "maps/silphco4.blk" +INCLUDE "data/mapHeaders/SilphCo4F.asm" +INCLUDE "scripts/SilphCo4F.asm" +INCLUDE "data/mapObjects/SilphCo4F.asm" +SilphCo4F_Blocks: INCBIN "maps/SilphCo4F.blk" -INCLUDE "data/mapHeaders/silphco5.asm" -INCLUDE "scripts/silphco5.asm" -INCLUDE "data/mapObjects/silphco5.asm" -SilphCo5Blocks: INCBIN "maps/silphco5.blk" +INCLUDE "data/mapHeaders/SilphCo5F.asm" +INCLUDE "scripts/SilphCo5F.asm" +INCLUDE "data/mapObjects/SilphCo5F.asm" +SilphCo5F_Blocks: INCBIN "maps/SilphCo5F.blk" -INCLUDE "data/mapHeaders/silphco6.asm" -INCLUDE "scripts/silphco6.asm" -INCLUDE "data/mapObjects/silphco6.asm" -SilphCo6Blocks: INCBIN "maps/silphco6.blk" +INCLUDE "data/mapHeaders/SilphCo6F.asm" +INCLUDE "scripts/SilphCo6F.asm" +INCLUDE "data/mapObjects/SilphCo6F.asm" +SilphCo6F_Blocks: INCBIN "maps/SilphCo6F.blk" INCLUDE "engine/overworld/npc_movement.asm" INCLUDE "engine/overworld/doors.asm" INCLUDE "engine/overworld/ledges.asm" -SECTION "bank07", ROMX - -INCLUDE "data/mapHeaders/cinnabarisland.asm" -INCLUDE "data/mapObjects/cinnabarisland.asm" -CinnabarIslandBlocks: INCBIN "maps/cinnabarisland.blk" - -INCLUDE "data/mapHeaders/route1.asm" -INCLUDE "data/mapObjects/route1.asm" -Route1Blocks: INCBIN "maps/route1.blk" - -UndergroundPathEntranceRoute8Blocks: INCBIN "maps/undergroundpathentranceroute8.blk" -OaksLabBlocks: INCBIN "maps/oakslab.blk" -ViridianHouseBlocks: -Route2HouseBlocks: -PewterHouse1Blocks: -PewterHouse2Blocks: -CeruleanHouse1Blocks: -VermilionHouse1Blocks: -LavenderHouse1Blocks: -LavenderHouse2Blocks: -SaffronHouse1Blocks: -SaffronHouse2Blocks: -Route16HouseBlocks: -NameRaterBlocks: INCBIN "maps/viridianhouse.blk" -SchoolBlocks: -CeladonMansion5Blocks: INCBIN "maps/school.blk" -CeruleanHouseTrashedBlocks: INCBIN "maps/ceruleanhousetrashed.blk" -DiglettsCaveRoute2Blocks: -DiglettsCaveEntranceRoute11Blocks: INCBIN "maps/diglettscaveroute2.blk" +SECTION "bank7", ROMX + +INCLUDE "data/mapHeaders/CinnabarIsland.asm" +INCLUDE "data/mapObjects/CinnabarIsland.asm" +CinnabarIsland_Blocks: INCBIN "maps/CinnabarIsland.blk" + +INCLUDE "data/mapHeaders/Route1.asm" +INCLUDE "data/mapObjects/Route1.asm" +Route1_Blocks: INCBIN "maps/Route1.blk" + +UndergroundPathRoute8_Blocks: INCBIN "maps/UndergroundPathRoute8.blk" + +OaksLab_Blocks: INCBIN "maps/OaksLab.blk" + +MrPsychicsHouse_Blocks: +NameRatersHouse_Blocks: +MrFujisHouse_Blocks: +Route16FlyHouse_Blocks: +Route2TradeHouse_Blocks: +SaffronPidgeyHouse_Blocks: +VermilionPidgeyHouse_Blocks: +LavenderCuboneHouse_Blocks: +CeruleanTradeHouse_Blocks: +PewterNidoranHouse_Blocks: +PewterSpeechHouse_Blocks: +ViridianNicknameHouse_Blocks: INCBIN "maps/ViridianNicknameHouse.blk" + +CeladonMansionRoofHouse_Blocks: +ViridianSchoolHouse_Blocks: INCBIN "maps/ViridianSchoolHouse.blk" + +CeruleanTrashedHouse_Blocks: INCBIN "maps/CeruleanTrashedHouse.blk" + +DiglettsCaveRoute11_Blocks: +DiglettsCaveRoute2_Blocks: INCBIN "maps/DiglettsCaveRoute2.blk" INCLUDE "engine/clear_save.asm" + INCLUDE "engine/predefs7.asm" -INCLUDE "scripts/cinnabarisland.asm" -INCLUDE "scripts/route1.asm" - -INCLUDE "data/mapHeaders/oakslab.asm" -INCLUDE "scripts/oakslab.asm" -INCLUDE "data/mapObjects/oakslab.asm" - -INCLUDE "data/mapHeaders/viridianmart.asm" -INCLUDE "scripts/viridianmart.asm" -INCLUDE "data/mapObjects/viridianmart.asm" -ViridianMartBlocks: -CeladonMartBlocks: INCBIN "maps/viridianmart.blk" - -INCLUDE "data/mapHeaders/school.asm" -INCLUDE "scripts/school.asm" -INCLUDE "data/mapObjects/school.asm" - -INCLUDE "data/mapHeaders/viridianhouse.asm" -INCLUDE "scripts/viridianhouse.asm" -INCLUDE "data/mapObjects/viridianhouse.asm" - -INCLUDE "data/mapHeaders/pewterhouse1.asm" -INCLUDE "scripts/pewterhouse1.asm" -INCLUDE "data/mapObjects/pewterhouse1.asm" - -INCLUDE "data/mapHeaders/pewterhouse2.asm" -INCLUDE "scripts/pewterhouse2.asm" -INCLUDE "data/mapObjects/pewterhouse2.asm" - -INCLUDE "data/mapHeaders/ceruleanhousetrashed.asm" -INCLUDE "scripts/ceruleanhousetrashed.asm" -INCLUDE "data/mapObjects/ceruleanhousetrashed.asm" - -INCLUDE "data/mapHeaders/ceruleanhouse1.asm" -INCLUDE "scripts/ceruleanhouse1.asm" -INCLUDE "data/mapObjects/ceruleanhouse1.asm" - -INCLUDE "data/mapHeaders/bikeshop.asm" -INCLUDE "scripts/bikeshop.asm" -INCLUDE "data/mapObjects/bikeshop.asm" -BikeShopBlocks: INCBIN "maps/bikeshop.blk" - -INCLUDE "data/mapHeaders/lavenderhouse1.asm" -INCLUDE "scripts/lavenderhouse1.asm" -INCLUDE "data/mapObjects/lavenderhouse1.asm" - -INCLUDE "data/mapHeaders/lavenderhouse2.asm" -INCLUDE "scripts/lavenderhouse2.asm" -INCLUDE "data/mapObjects/lavenderhouse2.asm" - -INCLUDE "data/mapHeaders/namerater.asm" -INCLUDE "scripts/namerater.asm" -INCLUDE "data/mapObjects/namerater.asm" - -INCLUDE "data/mapHeaders/vermilionhouse1.asm" -INCLUDE "scripts/vermilionhouse1.asm" -INCLUDE "data/mapObjects/vermilionhouse1.asm" - -INCLUDE "data/mapHeaders/vermiliondock.asm" -INCLUDE "scripts/vermiliondock.asm" -INCLUDE "data/mapObjects/vermiliondock.asm" -VermilionDockBlocks: INCBIN "maps/vermiliondock.blk" - -INCLUDE "data/mapHeaders/celadonmansion5.asm" -INCLUDE "scripts/celadonmansion5.asm" -INCLUDE "data/mapObjects/celadonmansion5.asm" - -INCLUDE "data/mapHeaders/fuchsiamart.asm" -INCLUDE "scripts/fuchsiamart.asm" -INCLUDE "data/mapObjects/fuchsiamart.asm" -FuchsiaMartBlocks: INCBIN "maps/fuchsiamart.blk" - -INCLUDE "data/mapHeaders/saffronhouse1.asm" -INCLUDE "scripts/saffronhouse1.asm" -INCLUDE "data/mapObjects/saffronhouse1.asm" - -INCLUDE "data/mapHeaders/saffronhouse2.asm" -INCLUDE "scripts/saffronhouse2.asm" -INCLUDE "data/mapObjects/saffronhouse2.asm" - -INCLUDE "data/mapHeaders/diglettscaveroute2.asm" -INCLUDE "scripts/diglettscaveroute2.asm" -INCLUDE "data/mapObjects/diglettscaveroute2.asm" - -INCLUDE "data/mapHeaders/route2house.asm" -INCLUDE "scripts/route2house.asm" -INCLUDE "data/mapObjects/route2house.asm" - -INCLUDE "data/mapHeaders/route5gate.asm" -INCLUDE "scripts/route5gate.asm" -INCLUDE "data/mapObjects/route5gate.asm" -Route5GateBlocks: INCBIN "maps/route5gate.blk" - -INCLUDE "data/mapHeaders/route6gate.asm" -INCLUDE "scripts/route6gate.asm" -INCLUDE "data/mapObjects/route6gate.asm" -Route6GateBlocks: INCBIN "maps/route6gate.blk" - -INCLUDE "data/mapHeaders/route7gate.asm" -INCLUDE "scripts/route7gate.asm" -INCLUDE "data/mapObjects/route7gate.asm" -Route7GateBlocks: INCBIN "maps/route7gate.blk" - -INCLUDE "data/mapHeaders/route8gate.asm" -INCLUDE "scripts/route8gate.asm" -INCLUDE "data/mapObjects/route8gate.asm" -Route8GateBlocks: INCBIN "maps/route8gate.blk" - -INCLUDE "data/mapHeaders/undergroundpathentranceroute8.asm" -INCLUDE "scripts/undergroundpathentranceroute8.asm" -INCLUDE "data/mapObjects/undergroundpathentranceroute8.asm" - -INCLUDE "data/mapHeaders/powerplant.asm" -INCLUDE "scripts/powerplant.asm" -INCLUDE "data/mapObjects/powerplant.asm" -PowerPlantBlocks: INCBIN "maps/powerplant.blk" - -INCLUDE "data/mapHeaders/diglettscaveroute11.asm" -INCLUDE "scripts/diglettscaveroute11.asm" -INCLUDE "data/mapObjects/diglettscaveroute11.asm" - -INCLUDE "data/mapHeaders/route16house.asm" -INCLUDE "scripts/route16house.asm" -INCLUDE "data/mapObjects/route16house.asm" - -INCLUDE "data/mapHeaders/route22gate.asm" -INCLUDE "scripts/route22gate.asm" -INCLUDE "data/mapObjects/route22gate.asm" -Route22GateBlocks: INCBIN "maps/route22gate.blk" - -INCLUDE "data/mapHeaders/billshouse.asm" -INCLUDE "scripts/billshouse.asm" -INCLUDE "data/mapObjects/billshouse.asm" -BillsHouseBlocks: INCBIN "maps/billshouse.blk" +INCLUDE "scripts/CinnabarIsland.asm" + +INCLUDE "scripts/Route1.asm" + +INCLUDE "data/mapHeaders/OaksLab.asm" +INCLUDE "scripts/OaksLab.asm" +INCLUDE "data/mapObjects/OaksLab.asm" + +INCLUDE "data/mapHeaders/ViridianMart.asm" +INCLUDE "scripts/ViridianMart.asm" +INCLUDE "data/mapObjects/ViridianMart.asm" +ViridianMart_Blocks: INCBIN "maps/ViridianMart.blk" + +INCLUDE "data/mapHeaders/ViridianSchoolHouse.asm" +INCLUDE "scripts/ViridianSchoolHouse.asm" +INCLUDE "data/mapObjects/ViridianSchoolHouse.asm" + +INCLUDE "data/mapHeaders/ViridianNicknameHouse.asm" + ds 1 +INCLUDE "scripts/ViridianNicknameHouse.asm" +INCLUDE "data/mapObjects/ViridianNicknameHouse.asm" + +INCLUDE "data/mapHeaders/PewterNidoranHouse.asm" +INCLUDE "scripts/PewterNidoranHouse.asm" +INCLUDE "data/mapObjects/PewterNidoranHouse.asm" + +INCLUDE "data/mapHeaders/PewterSpeechHouse.asm" +INCLUDE "scripts/PewterSpeechHouse.asm" +INCLUDE "data/mapObjects/PewterSpeechHouse.asm" + +INCLUDE "data/mapHeaders/CeruleanTrashedHouse.asm" +INCLUDE "scripts/CeruleanTrashedHouse.asm" +INCLUDE "data/mapObjects/CeruleanTrashedHouse.asm" + +INCLUDE "data/mapHeaders/CeruleanTradeHouse.asm" +INCLUDE "scripts/CeruleanTradeHouse.asm" +INCLUDE "data/mapObjects/CeruleanTradeHouse.asm" + +INCLUDE "data/mapHeaders/BikeShop.asm" +INCLUDE "scripts/BikeShop.asm" +INCLUDE "data/mapObjects/BikeShop.asm" +BikeShop_Blocks: INCBIN "maps/BikeShop.blk" + +INCLUDE "data/mapHeaders/MrFujisHouse.asm" +INCLUDE "scripts/MrFujisHouse.asm" +INCLUDE "data/mapObjects/MrFujisHouse.asm" + +INCLUDE "data/mapHeaders/LavenderCuboneHouse.asm" +INCLUDE "scripts/LavenderCuboneHouse.asm" +INCLUDE "data/mapObjects/LavenderCuboneHouse.asm" + +INCLUDE "data/mapHeaders/NameRatersHouse.asm" +INCLUDE "scripts/NameRatersHouse.asm" +INCLUDE "data/mapObjects/NameRatersHouse.asm" + +INCLUDE "data/mapHeaders/VermilionPidgeyHouse.asm" +INCLUDE "scripts/VermilionPidgeyHouse.asm" +INCLUDE "data/mapObjects/VermilionPidgeyHouse.asm" + +INCLUDE "data/mapHeaders/VermilionDock.asm" +INCLUDE "scripts/VermilionDock.asm" +INCLUDE "data/mapObjects/VermilionDock.asm" +VermilionDock_Blocks: INCBIN "maps/VermilionDock.blk" + +INCLUDE "data/mapHeaders/CeladonMansionRoofHouse.asm" +INCLUDE "scripts/CeladonMansionRoofHouse.asm" +INCLUDE "data/mapObjects/CeladonMansionRoofHouse.asm" + +INCLUDE "data/mapHeaders/FuchsiaMart.asm" +INCLUDE "scripts/FuchsiaMart.asm" +INCLUDE "data/mapObjects/FuchsiaMart.asm" +FuchsiaMart_Blocks: INCBIN "maps/FuchsiaMart.blk" + +INCLUDE "data/mapHeaders/SaffronPidgeyHouse.asm" +INCLUDE "scripts/SaffronPidgeyHouse.asm" +INCLUDE "data/mapObjects/SaffronPidgeyHouse.asm" + +INCLUDE "data/mapHeaders/MrPsychicsHouse.asm" +INCLUDE "scripts/MrPsychicsHouse.asm" +INCLUDE "data/mapObjects/MrPsychicsHouse.asm" + +INCLUDE "data/mapHeaders/DiglettsCaveRoute2.asm" +INCLUDE "scripts/DiglettsCaveRoute2.asm" +INCLUDE "data/mapObjects/DiglettsCaveRoute2.asm" + +INCLUDE "data/mapHeaders/Route2TradeHouse.asm" +INCLUDE "scripts/Route2TradeHouse.asm" +INCLUDE "data/mapObjects/Route2TradeHouse.asm" + +INCLUDE "data/mapHeaders/Route5Gate.asm" +INCLUDE "scripts/Route5Gate.asm" +INCLUDE "data/mapObjects/Route5Gate.asm" +Route5Gate_Blocks: INCBIN "maps/Route5Gate.blk" + +INCLUDE "data/mapHeaders/Route6Gate.asm" +INCLUDE "scripts/Route6Gate.asm" +INCLUDE "data/mapObjects/Route6Gate.asm" +Route6Gate_Blocks: INCBIN "maps/Route6Gate.blk" + +INCLUDE "data/mapHeaders/Route7Gate.asm" +INCLUDE "scripts/Route7Gate.asm" +INCLUDE "data/mapObjects/Route7Gate.asm" +Route7Gate_Blocks: INCBIN "maps/Route7Gate.blk" + +INCLUDE "data/mapHeaders/Route8Gate.asm" +INCLUDE "scripts/Route8Gate.asm" +INCLUDE "data/mapObjects/Route8Gate.asm" +Route8Gate_Blocks: INCBIN "maps/Route8Gate.blk" + +INCLUDE "data/mapHeaders/UndergroundPathRoute8.asm" +INCLUDE "scripts/UndergroundPathRoute8.asm" +INCLUDE "data/mapObjects/UndergroundPathRoute8.asm" + +INCLUDE "data/mapHeaders/PowerPlant.asm" +INCLUDE "scripts/PowerPlant.asm" +INCLUDE "data/mapObjects/PowerPlant.asm" +PowerPlant_Blocks: INCBIN "maps/PowerPlant.blk" + +INCLUDE "data/mapHeaders/DiglettsCaveRoute11.asm" +INCLUDE "scripts/DiglettsCaveRoute11.asm" +INCLUDE "data/mapObjects/DiglettsCaveRoute11.asm" + +INCLUDE "data/mapHeaders/Route16FlyHouse.asm" +INCLUDE "scripts/Route16FlyHouse.asm" +INCLUDE "data/mapObjects/Route16FlyHouse.asm" + +INCLUDE "data/mapHeaders/Route22Gate.asm" +INCLUDE "scripts/Route22Gate.asm" +INCLUDE "data/mapObjects/Route22Gate.asm" +Route22Gate_Blocks: INCBIN "maps/Route22Gate.blk" + +INCLUDE "data/mapHeaders/BillsHouse.asm" +INCLUDE "scripts/BillsHouse.asm" +INCLUDE "data/mapObjects/BillsHouse.asm" +BillsHouse_Blocks: INCBIN "maps/BillsHouse.blk" INCLUDE "engine/menu/oaks_pc.asm" @@ -470,66 +481,66 @@ INCLUDE "engine/hidden_object_functions7.asm" SECTION "Pics 1", ROMX ; BANK $09 -RhydonPicFront: INCBIN "pic/ymon/rhydon.pic" -RhydonPicBack: INCBIN "pic/monback/rhydonb.pic" -KangaskhanPicFront: INCBIN "pic/ymon/kangaskhan.pic" -KangaskhanPicBack: INCBIN "pic/monback/kangaskhanb.pic" -NidoranMPicFront: INCBIN "pic/ymon/nidoranm.pic" -NidoranMPicBack: INCBIN "pic/monback/nidoranmb.pic" -ClefairyPicFront: INCBIN "pic/ymon/clefairy.pic" -ClefairyPicBack: INCBIN "pic/monback/clefairyb.pic" -SpearowPicFront: INCBIN "pic/ymon/spearow.pic" -SpearowPicBack: INCBIN "pic/monback/spearowb.pic" -VoltorbPicFront: INCBIN "pic/ymon/voltorb.pic" -VoltorbPicBack: INCBIN "pic/monback/voltorbb.pic" -NidokingPicFront: INCBIN "pic/ymon/nidoking.pic" -NidokingPicBack: INCBIN "pic/monback/nidokingb.pic" -SlowbroPicFront: INCBIN "pic/ymon/slowbro.pic" -SlowbroPicBack: INCBIN "pic/monback/slowbrob.pic" -IvysaurPicFront: INCBIN "pic/ymon/ivysaur.pic" -IvysaurPicBack: INCBIN "pic/monback/ivysaurb.pic" -ExeggutorPicFront: INCBIN "pic/ymon/exeggutor.pic" -ExeggutorPicBack: INCBIN "pic/monback/exeggutorb.pic" -LickitungPicFront: INCBIN "pic/ymon/lickitung.pic" -LickitungPicBack: INCBIN "pic/monback/lickitungb.pic" -ExeggcutePicFront: INCBIN "pic/ymon/exeggcute.pic" -ExeggcutePicBack: INCBIN "pic/monback/exeggcuteb.pic" -GrimerPicFront: INCBIN "pic/ymon/grimer.pic" -GrimerPicBack: INCBIN "pic/monback/grimerb.pic" -GengarPicFront: INCBIN "pic/ymon/gengar.pic" -GengarPicBack: INCBIN "pic/monback/gengarb.pic" -NidoranFPicFront: INCBIN "pic/ymon/nidoranf.pic" -NidoranFPicBack: INCBIN "pic/monback/nidoranfb.pic" -NidoqueenPicFront: INCBIN "pic/ymon/nidoqueen.pic" -NidoqueenPicBack: INCBIN "pic/monback/nidoqueenb.pic" -CubonePicFront: INCBIN "pic/ymon/cubone.pic" -CubonePicBack: INCBIN "pic/monback/cuboneb.pic" -RhyhornPicFront: INCBIN "pic/ymon/rhyhorn.pic" -RhyhornPicBack: INCBIN "pic/monback/rhyhornb.pic" -LaprasPicFront: INCBIN "pic/ymon/lapras.pic" -LaprasPicBack: INCBIN "pic/monback/laprasb.pic" -ArcaninePicFront: INCBIN "pic/ymon/arcanine.pic" -ArcaninePicBack: INCBIN "pic/monback/arcanineb.pic" -MewPicFront: INCBIN "pic/ymon/mew.pic" -MewPicBack: INCBIN "pic/monback/mewb.pic" -GyaradosPicFront: INCBIN "pic/ymon/gyarados.pic" -GyaradosPicBack: INCBIN "pic/monback/gyaradosb.pic" -ShellderPicFront: INCBIN "pic/ymon/shellder.pic" -ShellderPicBack: INCBIN "pic/monback/shellderb.pic" -TentacoolPicFront: INCBIN "pic/ymon/tentacool.pic" -TentacoolPicBack: INCBIN "pic/monback/tentacoolb.pic" -GastlyPicFront: INCBIN "pic/ymon/gastly.pic" -GastlyPicBack: INCBIN "pic/monback/gastlyb.pic" -ScytherPicFront: INCBIN "pic/ymon/scyther.pic" -ScytherPicBack: INCBIN "pic/monback/scytherb.pic" -StaryuPicFront: INCBIN "pic/ymon/staryu.pic" -StaryuPicBack: INCBIN "pic/monback/staryub.pic" -BlastoisePicFront: INCBIN "pic/ymon/blastoise.pic" -BlastoisePicBack: INCBIN "pic/monback/blastoiseb.pic" -PinsirPicFront: INCBIN "pic/ymon/pinsir.pic" -PinsirPicBack: INCBIN "pic/monback/pinsirb.pic" -TangelaPicFront: INCBIN "pic/ymon/tangela.pic" -TangelaPicBack: INCBIN "pic/monback/tangelab.pic" +RhydonPicFront:: INCBIN "pic/ymon/rhydon.pic" +RhydonPicBack:: INCBIN "pic/monback/rhydonb.pic" +KangaskhanPicFront:: INCBIN "pic/ymon/kangaskhan.pic" +KangaskhanPicBack:: INCBIN "pic/monback/kangaskhanb.pic" +NidoranMPicFront:: INCBIN "pic/ymon/nidoranm.pic" +NidoranMPicBack:: INCBIN "pic/monback/nidoranmb.pic" +ClefairyPicFront:: INCBIN "pic/ymon/clefairy.pic" +ClefairyPicBack:: INCBIN "pic/monback/clefairyb.pic" +SpearowPicFront:: INCBIN "pic/ymon/spearow.pic" +SpearowPicBack:: INCBIN "pic/monback/spearowb.pic" +VoltorbPicFront:: INCBIN "pic/ymon/voltorb.pic" +VoltorbPicBack:: INCBIN "pic/monback/voltorbb.pic" +NidokingPicFront:: INCBIN "pic/ymon/nidoking.pic" +NidokingPicBack:: INCBIN "pic/monback/nidokingb.pic" +SlowbroPicFront:: INCBIN "pic/ymon/slowbro.pic" +SlowbroPicBack:: INCBIN "pic/monback/slowbrob.pic" +IvysaurPicFront:: INCBIN "pic/ymon/ivysaur.pic" +IvysaurPicBack:: INCBIN "pic/monback/ivysaurb.pic" +ExeggutorPicFront:: INCBIN "pic/ymon/exeggutor.pic" +ExeggutorPicBack:: INCBIN "pic/monback/exeggutorb.pic" +LickitungPicFront:: INCBIN "pic/ymon/lickitung.pic" +LickitungPicBack:: INCBIN "pic/monback/lickitungb.pic" +ExeggcutePicFront:: INCBIN "pic/ymon/exeggcute.pic" +ExeggcutePicBack:: INCBIN "pic/monback/exeggcuteb.pic" +GrimerPicFront:: INCBIN "pic/ymon/grimer.pic" +GrimerPicBack:: INCBIN "pic/monback/grimerb.pic" +GengarPicFront:: INCBIN "pic/ymon/gengar.pic" +GengarPicBack:: INCBIN "pic/monback/gengarb.pic" +NidoranFPicFront:: INCBIN "pic/ymon/nidoranf.pic" +NidoranFPicBack:: INCBIN "pic/monback/nidoranfb.pic" +NidoqueenPicFront:: INCBIN "pic/ymon/nidoqueen.pic" +NidoqueenPicBack:: INCBIN "pic/monback/nidoqueenb.pic" +CubonePicFront:: INCBIN "pic/ymon/cubone.pic" +CubonePicBack:: INCBIN "pic/monback/cuboneb.pic" +RhyhornPicFront:: INCBIN "pic/ymon/rhyhorn.pic" +RhyhornPicBack:: INCBIN "pic/monback/rhyhornb.pic" +LaprasPicFront:: INCBIN "pic/ymon/lapras.pic" +LaprasPicBack:: INCBIN "pic/monback/laprasb.pic" +ArcaninePicFront:: INCBIN "pic/ymon/arcanine.pic" +ArcaninePicBack:: INCBIN "pic/monback/arcanineb.pic" +MewPicFront:: INCBIN "pic/ymon/mew.pic" +MewPicBack:: INCBIN "pic/monback/mewb.pic" +GyaradosPicFront:: INCBIN "pic/ymon/gyarados.pic" +GyaradosPicBack:: INCBIN "pic/monback/gyaradosb.pic" +ShellderPicFront:: INCBIN "pic/ymon/shellder.pic" +ShellderPicBack:: INCBIN "pic/monback/shellderb.pic" +TentacoolPicFront:: INCBIN "pic/ymon/tentacool.pic" +TentacoolPicBack:: INCBIN "pic/monback/tentacoolb.pic" +GastlyPicFront:: INCBIN "pic/ymon/gastly.pic" +GastlyPicBack:: INCBIN "pic/monback/gastlyb.pic" +ScytherPicFront:: INCBIN "pic/ymon/scyther.pic" +ScytherPicBack:: INCBIN "pic/monback/scytherb.pic" +StaryuPicFront:: INCBIN "pic/ymon/staryu.pic" +StaryuPicBack:: INCBIN "pic/monback/staryub.pic" +BlastoisePicFront:: INCBIN "pic/ymon/blastoise.pic" +BlastoisePicBack:: INCBIN "pic/monback/blastoiseb.pic" +PinsirPicFront:: INCBIN "pic/ymon/pinsir.pic" +PinsirPicBack:: INCBIN "pic/monback/pinsirb.pic" +TangelaPicFront:: INCBIN "pic/ymon/tangela.pic" +TangelaPicBack:: INCBIN "pic/monback/tangelab.pic" INCLUDE "engine/battle/print_type.asm" INCLUDE "engine/battle/save_trainer_name.asm" @@ -537,70 +548,70 @@ INCLUDE "engine/battle/save_trainer_name.asm" SECTION "Pics 2", ROMX ; BANK $0A -GrowlithePicFront: INCBIN "pic/ymon/growlithe.pic" -GrowlithePicBack: INCBIN "pic/monback/growlitheb.pic" -OnixPicFront: INCBIN "pic/ymon/onix.pic" -OnixPicBack: INCBIN "pic/monback/onixb.pic" -FearowPicFront: INCBIN "pic/ymon/fearow.pic" -FearowPicBack: INCBIN "pic/monback/fearowb.pic" -PidgeyPicFront: INCBIN "pic/ymon/pidgey.pic" -PidgeyPicBack: INCBIN "pic/monback/pidgeyb.pic" -SlowpokePicFront: INCBIN "pic/ymon/slowpoke.pic" -SlowpokePicBack: INCBIN "pic/monback/slowpokeb.pic" -KadabraPicFront: INCBIN "pic/ymon/kadabra.pic" -KadabraPicBack: INCBIN "pic/monback/kadabrab.pic" -GravelerPicFront: INCBIN "pic/ymon/graveler.pic" -GravelerPicBack: INCBIN "pic/monback/gravelerb.pic" -ChanseyPicFront: INCBIN "pic/ymon/chansey.pic" -ChanseyPicBack: INCBIN "pic/monback/chanseyb.pic" -MachokePicFront: INCBIN "pic/ymon/machoke.pic" -MachokePicBack: INCBIN "pic/monback/machokeb.pic" -MrMimePicFront: INCBIN "pic/ymon/mr.mime.pic" -MrMimePicBack: INCBIN "pic/monback/mr.mimeb.pic" -HitmonleePicFront: INCBIN "pic/ymon/hitmonlee.pic" -HitmonleePicBack: INCBIN "pic/monback/hitmonleeb.pic" -HitmonchanPicFront: INCBIN "pic/ymon/hitmonchan.pic" -HitmonchanPicBack: INCBIN "pic/monback/hitmonchanb.pic" -ArbokPicFront: INCBIN "pic/ymon/arbok.pic" -ArbokPicBack: INCBIN "pic/monback/arbokb.pic" -ParasectPicFront: INCBIN "pic/ymon/parasect.pic" -ParasectPicBack: INCBIN "pic/monback/parasectb.pic" -PsyduckPicFront: INCBIN "pic/ymon/psyduck.pic" -PsyduckPicBack: INCBIN "pic/monback/psyduckb.pic" -DrowzeePicFront: INCBIN "pic/ymon/drowzee.pic" -DrowzeePicBack: INCBIN "pic/monback/drowzeeb.pic" -GolemPicFront: INCBIN "pic/ymon/golem.pic" -GolemPicBack: INCBIN "pic/monback/golemb.pic" -MagmarPicFront: INCBIN "pic/ymon/magmar.pic" -MagmarPicBack: INCBIN "pic/monback/magmarb.pic" -ElectabuzzPicFront: INCBIN "pic/ymon/electabuzz.pic" -ElectabuzzPicBack: INCBIN "pic/monback/electabuzzb.pic" -MagnetonPicFront: INCBIN "pic/ymon/magneton.pic" -MagnetonPicBack: INCBIN "pic/monback/magnetonb.pic" -KoffingPicFront: INCBIN "pic/ymon/koffing.pic" -KoffingPicBack: INCBIN "pic/monback/koffingb.pic" -MankeyPicFront: INCBIN "pic/ymon/mankey.pic" -MankeyPicBack: INCBIN "pic/monback/mankeyb.pic" -SeelPicFront: INCBIN "pic/ymon/seel.pic" -SeelPicBack: INCBIN "pic/monback/seelb.pic" -DiglettPicFront: INCBIN "pic/ymon/diglett.pic" -DiglettPicBack: INCBIN "pic/monback/diglettb.pic" -TaurosPicFront: INCBIN "pic/ymon/tauros.pic" -TaurosPicBack: INCBIN "pic/monback/taurosb.pic" -FarfetchdPicFront: INCBIN "pic/ymon/farfetchd.pic" -FarfetchdPicBack: INCBIN "pic/monback/farfetchdb.pic" -VenonatPicFront: INCBIN "pic/ymon/venonat.pic" -VenonatPicBack: INCBIN "pic/monback/venonatb.pic" -DragonitePicFront: INCBIN "pic/ymon/dragonite.pic" -DragonitePicBack: INCBIN "pic/monback/dragoniteb.pic" -DoduoPicFront: INCBIN "pic/ymon/doduo.pic" -DoduoPicBack: INCBIN "pic/monback/doduob.pic" -PoliwagPicFront: INCBIN "pic/ymon/poliwag.pic" -PoliwagPicBack: INCBIN "pic/monback/poliwagb.pic" -JynxPicFront: INCBIN "pic/ymon/jynx.pic" -JynxPicBack: INCBIN "pic/monback/jynxb.pic" -MoltresPicFront: INCBIN "pic/ymon/moltres.pic" -MoltresPicBack: INCBIN "pic/monback/moltresb.pic" +GrowlithePicFront:: INCBIN "pic/ymon/growlithe.pic" +GrowlithePicBack:: INCBIN "pic/monback/growlitheb.pic" +OnixPicFront:: INCBIN "pic/ymon/onix.pic" +OnixPicBack:: INCBIN "pic/monback/onixb.pic" +FearowPicFront:: INCBIN "pic/ymon/fearow.pic" +FearowPicBack:: INCBIN "pic/monback/fearowb.pic" +PidgeyPicFront:: INCBIN "pic/ymon/pidgey.pic" +PidgeyPicBack:: INCBIN "pic/monback/pidgeyb.pic" +SlowpokePicFront:: INCBIN "pic/ymon/slowpoke.pic" +SlowpokePicBack:: INCBIN "pic/monback/slowpokeb.pic" +KadabraPicFront:: INCBIN "pic/ymon/kadabra.pic" +KadabraPicBack:: INCBIN "pic/monback/kadabrab.pic" +GravelerPicFront:: INCBIN "pic/ymon/graveler.pic" +GravelerPicBack:: INCBIN "pic/monback/gravelerb.pic" +ChanseyPicFront:: INCBIN "pic/ymon/chansey.pic" +ChanseyPicBack:: INCBIN "pic/monback/chanseyb.pic" +MachokePicFront:: INCBIN "pic/ymon/machoke.pic" +MachokePicBack:: INCBIN "pic/monback/machokeb.pic" +MrMimePicFront:: INCBIN "pic/ymon/mr.mime.pic" +MrMimePicBack:: INCBIN "pic/monback/mr.mimeb.pic" +HitmonleePicFront:: INCBIN "pic/ymon/hitmonlee.pic" +HitmonleePicBack:: INCBIN "pic/monback/hitmonleeb.pic" +HitmonchanPicFront:: INCBIN "pic/ymon/hitmonchan.pic" +HitmonchanPicBack:: INCBIN "pic/monback/hitmonchanb.pic" +ArbokPicFront:: INCBIN "pic/ymon/arbok.pic" +ArbokPicBack:: INCBIN "pic/monback/arbokb.pic" +ParasectPicFront:: INCBIN "pic/ymon/parasect.pic" +ParasectPicBack:: INCBIN "pic/monback/parasectb.pic" +PsyduckPicFront:: INCBIN "pic/ymon/psyduck.pic" +PsyduckPicBack:: INCBIN "pic/monback/psyduckb.pic" +DrowzeePicFront:: INCBIN "pic/ymon/drowzee.pic" +DrowzeePicBack:: INCBIN "pic/monback/drowzeeb.pic" +GolemPicFront:: INCBIN "pic/ymon/golem.pic" +GolemPicBack:: INCBIN "pic/monback/golemb.pic" +MagmarPicFront:: INCBIN "pic/ymon/magmar.pic" +MagmarPicBack:: INCBIN "pic/monback/magmarb.pic" +ElectabuzzPicFront:: INCBIN "pic/ymon/electabuzz.pic" +ElectabuzzPicBack:: INCBIN "pic/monback/electabuzzb.pic" +MagnetonPicFront:: INCBIN "pic/ymon/magneton.pic" +MagnetonPicBack:: INCBIN "pic/monback/magnetonb.pic" +KoffingPicFront:: INCBIN "pic/ymon/koffing.pic" +KoffingPicBack:: INCBIN "pic/monback/koffingb.pic" +MankeyPicFront:: INCBIN "pic/ymon/mankey.pic" +MankeyPicBack:: INCBIN "pic/monback/mankeyb.pic" +SeelPicFront:: INCBIN "pic/ymon/seel.pic" +SeelPicBack:: INCBIN "pic/monback/seelb.pic" +DiglettPicFront:: INCBIN "pic/ymon/diglett.pic" +DiglettPicBack:: INCBIN "pic/monback/diglettb.pic" +TaurosPicFront:: INCBIN "pic/ymon/tauros.pic" +TaurosPicBack:: INCBIN "pic/monback/taurosb.pic" +FarfetchdPicFront:: INCBIN "pic/ymon/farfetchd.pic" +FarfetchdPicBack:: INCBIN "pic/monback/farfetchdb.pic" +VenonatPicFront:: INCBIN "pic/ymon/venonat.pic" +VenonatPicBack:: INCBIN "pic/monback/venonatb.pic" +DragonitePicFront:: INCBIN "pic/ymon/dragonite.pic" +DragonitePicBack:: INCBIN "pic/monback/dragoniteb.pic" +DoduoPicFront:: INCBIN "pic/ymon/doduo.pic" +DoduoPicBack:: INCBIN "pic/monback/doduob.pic" +PoliwagPicFront:: INCBIN "pic/ymon/poliwag.pic" +PoliwagPicBack:: INCBIN "pic/monback/poliwagb.pic" +JynxPicFront:: INCBIN "pic/ymon/jynx.pic" +JynxPicBack:: INCBIN "pic/monback/jynxb.pic" +MoltresPicFront:: INCBIN "pic/ymon/moltres.pic" +MoltresPicBack:: INCBIN "pic/monback/moltresb.pic" INCLUDE "engine/predefsA.asm" INCLUDE "engine/battle/moveEffects/leech_seed_effect.asm" @@ -608,76 +619,76 @@ INCLUDE "engine/battle/moveEffects/leech_seed_effect.asm" SECTION "Pics 3", ROMX ; BANK $0B -ArticunoPicFront: INCBIN "pic/ymon/articuno.pic" -ArticunoPicBack: INCBIN "pic/monback/articunob.pic" -ZapdosPicFront: INCBIN "pic/ymon/zapdos.pic" -ZapdosPicBack: INCBIN "pic/monback/zapdosb.pic" -DittoPicFront: INCBIN "pic/ymon/ditto.pic" -DittoPicBack: INCBIN "pic/monback/dittob.pic" -MeowthPicFront: INCBIN "pic/ymon/meowth.pic" -MeowthPicBack: INCBIN "pic/monback/meowthb.pic" -KrabbyPicFront: INCBIN "pic/ymon/krabby.pic" -KrabbyPicBack: INCBIN "pic/monback/krabbyb.pic" -VulpixPicFront: INCBIN "pic/ymon/vulpix.pic" -VulpixPicBack: INCBIN "pic/monback/vulpixb.pic" -NinetalesPicFront: INCBIN "pic/ymon/ninetales.pic" -NinetalesPicBack: INCBIN "pic/monback/ninetalesb.pic" -PikachuPicFront: INCBIN "pic/ymon/pikachu.pic" -PikachuPicBack: INCBIN "pic/monback/pikachub.pic" -RaichuPicFront: INCBIN "pic/ymon/raichu.pic" -RaichuPicBack: INCBIN "pic/monback/raichub.pic" -DratiniPicFront: INCBIN "pic/ymon/dratini.pic" -DratiniPicBack: INCBIN "pic/monback/dratinib.pic" -DragonairPicFront: INCBIN "pic/ymon/dragonair.pic" -DragonairPicBack: INCBIN "pic/monback/dragonairb.pic" -KabutoPicFront: INCBIN "pic/ymon/kabuto.pic" -KabutoPicBack: INCBIN "pic/monback/kabutob.pic" -KabutopsPicFront: INCBIN "pic/ymon/kabutops.pic" -KabutopsPicBack: INCBIN "pic/monback/kabutopsb.pic" -HorseaPicFront: INCBIN "pic/ymon/horsea.pic" -HorseaPicBack: INCBIN "pic/monback/horseab.pic" -SeadraPicFront: INCBIN "pic/ymon/seadra.pic" -SeadraPicBack: INCBIN "pic/monback/seadrab.pic" -SandshrewPicFront: INCBIN "pic/ymon/sandshrew.pic" -SandshrewPicBack: INCBIN "pic/monback/sandshrewb.pic" -SandslashPicFront: INCBIN "pic/ymon/sandslash.pic" -SandslashPicBack: INCBIN "pic/monback/sandslashb.pic" -OmanytePicFront: INCBIN "pic/ymon/omanyte.pic" -OmanytePicBack: INCBIN "pic/monback/omanyteb.pic" -OmastarPicFront: INCBIN "pic/ymon/omastar.pic" -OmastarPicBack: INCBIN "pic/monback/omastarb.pic" -JigglypuffPicFront: INCBIN "pic/ymon/jigglypuff.pic" -JigglypuffPicBack: INCBIN "pic/monback/jigglypuffb.pic" -WigglytuffPicFront: INCBIN "pic/ymon/wigglytuff.pic" -WigglytuffPicBack: INCBIN "pic/monback/wigglytuffb.pic" -EeveePicFront: INCBIN "pic/ymon/eevee.pic" -EeveePicBack: INCBIN "pic/monback/eeveeb.pic" -FlareonPicFront: INCBIN "pic/ymon/flareon.pic" -FlareonPicBack: INCBIN "pic/monback/flareonb.pic" -JolteonPicFront: INCBIN "pic/ymon/jolteon.pic" -JolteonPicBack: INCBIN "pic/monback/jolteonb.pic" -VaporeonPicFront: INCBIN "pic/ymon/vaporeon.pic" -VaporeonPicBack: INCBIN "pic/monback/vaporeonb.pic" -MachopPicFront: INCBIN "pic/ymon/machop.pic" -MachopPicBack: INCBIN "pic/monback/machopb.pic" -ZubatPicFront: INCBIN "pic/ymon/zubat.pic" -ZubatPicBack: INCBIN "pic/monback/zubatb.pic" -EkansPicFront: INCBIN "pic/ymon/ekans.pic" -EkansPicBack: INCBIN "pic/monback/ekansb.pic" -ParasPicFront: INCBIN "pic/ymon/paras.pic" -ParasPicBack: INCBIN "pic/monback/parasb.pic" -PoliwhirlPicFront: INCBIN "pic/ymon/poliwhirl.pic" -PoliwhirlPicBack: INCBIN "pic/monback/poliwhirlb.pic" -PoliwrathPicFront: INCBIN "pic/ymon/poliwrath.pic" -PoliwrathPicBack: INCBIN "pic/monback/poliwrathb.pic" -WeedlePicFront: INCBIN "pic/ymon/weedle.pic" -WeedlePicBack: INCBIN "pic/monback/weedleb.pic" -KakunaPicFront: INCBIN "pic/ymon/kakuna.pic" -KakunaPicBack: INCBIN "pic/monback/kakunab.pic" -BeedrillPicFront: INCBIN "pic/ymon/beedrill.pic" -BeedrillPicBack: INCBIN "pic/monback/beedrillb.pic" - -FossilKabutopsPic: INCBIN "pic/ymon/fossilkabutops.pic" +ArticunoPicFront:: INCBIN "pic/ymon/articuno.pic" +ArticunoPicBack:: INCBIN "pic/monback/articunob.pic" +ZapdosPicFront:: INCBIN "pic/ymon/zapdos.pic" +ZapdosPicBack:: INCBIN "pic/monback/zapdosb.pic" +DittoPicFront:: INCBIN "pic/ymon/ditto.pic" +DittoPicBack:: INCBIN "pic/monback/dittob.pic" +MeowthPicFront:: INCBIN "pic/ymon/meowth.pic" +MeowthPicBack:: INCBIN "pic/monback/meowthb.pic" +KrabbyPicFront:: INCBIN "pic/ymon/krabby.pic" +KrabbyPicBack:: INCBIN "pic/monback/krabbyb.pic" +VulpixPicFront:: INCBIN "pic/ymon/vulpix.pic" +VulpixPicBack:: INCBIN "pic/monback/vulpixb.pic" +NinetalesPicFront:: INCBIN "pic/ymon/ninetales.pic" +NinetalesPicBack:: INCBIN "pic/monback/ninetalesb.pic" +PikachuPicFront:: INCBIN "pic/ymon/pikachu.pic" +PikachuPicBack:: INCBIN "pic/monback/pikachub.pic" +RaichuPicFront:: INCBIN "pic/ymon/raichu.pic" +RaichuPicBack:: INCBIN "pic/monback/raichub.pic" +DratiniPicFront:: INCBIN "pic/ymon/dratini.pic" +DratiniPicBack:: INCBIN "pic/monback/dratinib.pic" +DragonairPicFront:: INCBIN "pic/ymon/dragonair.pic" +DragonairPicBack:: INCBIN "pic/monback/dragonairb.pic" +KabutoPicFront:: INCBIN "pic/ymon/kabuto.pic" +KabutoPicBack:: INCBIN "pic/monback/kabutob.pic" +KabutopsPicFront:: INCBIN "pic/ymon/kabutops.pic" +KabutopsPicBack:: INCBIN "pic/monback/kabutopsb.pic" +HorseaPicFront:: INCBIN "pic/ymon/horsea.pic" +HorseaPicBack:: INCBIN "pic/monback/horseab.pic" +SeadraPicFront:: INCBIN "pic/ymon/seadra.pic" +SeadraPicBack:: INCBIN "pic/monback/seadrab.pic" +SandshrewPicFront:: INCBIN "pic/ymon/sandshrew.pic" +SandshrewPicBack:: INCBIN "pic/monback/sandshrewb.pic" +SandslashPicFront:: INCBIN "pic/ymon/sandslash.pic" +SandslashPicBack:: INCBIN "pic/monback/sandslashb.pic" +OmanytePicFront:: INCBIN "pic/ymon/omanyte.pic" +OmanytePicBack:: INCBIN "pic/monback/omanyteb.pic" +OmastarPicFront:: INCBIN "pic/ymon/omastar.pic" +OmastarPicBack:: INCBIN "pic/monback/omastarb.pic" +JigglypuffPicFront:: INCBIN "pic/ymon/jigglypuff.pic" +JigglypuffPicBack:: INCBIN "pic/monback/jigglypuffb.pic" +WigglytuffPicFront:: INCBIN "pic/ymon/wigglytuff.pic" +WigglytuffPicBack:: INCBIN "pic/monback/wigglytuffb.pic" +EeveePicFront:: INCBIN "pic/ymon/eevee.pic" +EeveePicBack:: INCBIN "pic/monback/eeveeb.pic" +FlareonPicFront:: INCBIN "pic/ymon/flareon.pic" +FlareonPicBack:: INCBIN "pic/monback/flareonb.pic" +JolteonPicFront:: INCBIN "pic/ymon/jolteon.pic" +JolteonPicBack:: INCBIN "pic/monback/jolteonb.pic" +VaporeonPicFront:: INCBIN "pic/ymon/vaporeon.pic" +VaporeonPicBack:: INCBIN "pic/monback/vaporeonb.pic" +MachopPicFront:: INCBIN "pic/ymon/machop.pic" +MachopPicBack:: INCBIN "pic/monback/machopb.pic" +ZubatPicFront:: INCBIN "pic/ymon/zubat.pic" +ZubatPicBack:: INCBIN "pic/monback/zubatb.pic" +EkansPicFront:: INCBIN "pic/ymon/ekans.pic" +EkansPicBack:: INCBIN "pic/monback/ekansb.pic" +ParasPicFront:: INCBIN "pic/ymon/paras.pic" +ParasPicBack:: INCBIN "pic/monback/parasb.pic" +PoliwhirlPicFront:: INCBIN "pic/ymon/poliwhirl.pic" +PoliwhirlPicBack:: INCBIN "pic/monback/poliwhirlb.pic" +PoliwrathPicFront:: INCBIN "pic/ymon/poliwrath.pic" +PoliwrathPicBack:: INCBIN "pic/monback/poliwrathb.pic" +WeedlePicFront:: INCBIN "pic/ymon/weedle.pic" +WeedlePicBack:: INCBIN "pic/monback/weedleb.pic" +KakunaPicFront:: INCBIN "pic/ymon/kakuna.pic" +KakunaPicBack:: INCBIN "pic/monback/kakunab.pic" +BeedrillPicFront:: INCBIN "pic/ymon/beedrill.pic" +BeedrillPicBack:: INCBIN "pic/monback/beedrillb.pic" + +FossilKabutopsPic:: INCBIN "pic/ymon/fossilkabutops.pic" INCLUDE "engine/battle/display_effectiveness.asm" INCLUDE "engine/items/tmhm.asm" @@ -695,129 +706,129 @@ INCLUDE "engine/game_corner_slots2.asm" SECTION "Pics 4", ROMX ; BANK $0C -DodrioPicFront: INCBIN "pic/ymon/dodrio.pic" -DodrioPicBack: INCBIN "pic/monback/dodriob.pic" -PrimeapePicFront: INCBIN "pic/ymon/primeape.pic" -PrimeapePicBack: INCBIN "pic/monback/primeapeb.pic" -DugtrioPicFront: INCBIN "pic/ymon/dugtrio.pic" -DugtrioPicBack: INCBIN "pic/monback/dugtriob.pic" -VenomothPicFront: INCBIN "pic/ymon/venomoth.pic" -VenomothPicBack: INCBIN "pic/monback/venomothb.pic" -DewgongPicFront: INCBIN "pic/ymon/dewgong.pic" -DewgongPicBack: INCBIN "pic/monback/dewgongb.pic" -CaterpiePicFront: INCBIN "pic/ymon/caterpie.pic" -CaterpiePicBack: INCBIN "pic/monback/caterpieb.pic" -MetapodPicFront: INCBIN "pic/ymon/metapod.pic" -MetapodPicBack: INCBIN "pic/monback/metapodb.pic" -ButterfreePicFront: INCBIN "pic/ymon/butterfree.pic" -ButterfreePicBack: INCBIN "pic/monback/butterfreeb.pic" -MachampPicFront: INCBIN "pic/ymon/machamp.pic" -MachampPicBack: INCBIN "pic/monback/machampb.pic" -GolduckPicFront: INCBIN "pic/ymon/golduck.pic" -GolduckPicBack: INCBIN "pic/monback/golduckb.pic" -HypnoPicFront: INCBIN "pic/ymon/hypno.pic" -HypnoPicBack: INCBIN "pic/monback/hypnob.pic" -GolbatPicFront: INCBIN "pic/ymon/golbat.pic" -GolbatPicBack: INCBIN "pic/monback/golbatb.pic" -MewtwoPicFront: INCBIN "pic/ymon/mewtwo.pic" -MewtwoPicBack: INCBIN "pic/monback/mewtwob.pic" -SnorlaxPicFront: INCBIN "pic/ymon/snorlax.pic" -SnorlaxPicBack: INCBIN "pic/monback/snorlaxb.pic" -MagikarpPicFront: INCBIN "pic/ymon/magikarp.pic" -MagikarpPicBack: INCBIN "pic/monback/magikarpb.pic" -MukPicFront: INCBIN "pic/ymon/muk.pic" -MukPicBack: INCBIN "pic/monback/mukb.pic" -KinglerPicFront: INCBIN "pic/ymon/kingler.pic" -KinglerPicBack: INCBIN "pic/monback/kinglerb.pic" -CloysterPicFront: INCBIN "pic/ymon/cloyster.pic" -CloysterPicBack: INCBIN "pic/monback/cloysterb.pic" -ElectrodePicFront: INCBIN "pic/ymon/electrode.pic" -ElectrodePicBack: INCBIN "pic/monback/electrodeb.pic" -ClefablePicFront: INCBIN "pic/ymon/clefable.pic" -ClefablePicBack: INCBIN "pic/monback/clefableb.pic" -WeezingPicFront: INCBIN "pic/ymon/weezing.pic" -WeezingPicBack: INCBIN "pic/monback/weezingb.pic" -PersianPicFront: INCBIN "pic/ymon/persian.pic" -PersianPicBack: INCBIN "pic/monback/persianb.pic" -MarowakPicFront: INCBIN "pic/ymon/marowak.pic" -MarowakPicBack: INCBIN "pic/monback/marowakb.pic" -HaunterPicFront: INCBIN "pic/ymon/haunter.pic" -HaunterPicBack: INCBIN "pic/monback/haunterb.pic" -AbraPicFront: INCBIN "pic/ymon/abra.pic" -AbraPicBack: INCBIN "pic/monback/abrab.pic" -AlakazamPicFront: INCBIN "pic/ymon/alakazam.pic" -AlakazamPicBack: INCBIN "pic/monback/alakazamb.pic" -PidgeottoPicFront: INCBIN "pic/ymon/pidgeotto.pic" -PidgeottoPicBack: INCBIN "pic/monback/pidgeottob.pic" -PidgeotPicFront: INCBIN "pic/ymon/pidgeot.pic" -PidgeotPicBack: INCBIN "pic/monback/pidgeotb.pic" -StarmiePicFront: INCBIN "pic/ymon/starmie.pic" -StarmiePicBack: INCBIN "pic/monback/starmieb.pic" +DodrioPicFront:: INCBIN "pic/ymon/dodrio.pic" +DodrioPicBack:: INCBIN "pic/monback/dodriob.pic" +PrimeapePicFront:: INCBIN "pic/ymon/primeape.pic" +PrimeapePicBack:: INCBIN "pic/monback/primeapeb.pic" +DugtrioPicFront:: INCBIN "pic/ymon/dugtrio.pic" +DugtrioPicBack:: INCBIN "pic/monback/dugtriob.pic" +VenomothPicFront:: INCBIN "pic/ymon/venomoth.pic" +VenomothPicBack:: INCBIN "pic/monback/venomothb.pic" +DewgongPicFront:: INCBIN "pic/ymon/dewgong.pic" +DewgongPicBack:: INCBIN "pic/monback/dewgongb.pic" +CaterpiePicFront:: INCBIN "pic/ymon/caterpie.pic" +CaterpiePicBack:: INCBIN "pic/monback/caterpieb.pic" +MetapodPicFront:: INCBIN "pic/ymon/metapod.pic" +MetapodPicBack:: INCBIN "pic/monback/metapodb.pic" +ButterfreePicFront:: INCBIN "pic/ymon/butterfree.pic" +ButterfreePicBack:: INCBIN "pic/monback/butterfreeb.pic" +MachampPicFront:: INCBIN "pic/ymon/machamp.pic" +MachampPicBack:: INCBIN "pic/monback/machampb.pic" +GolduckPicFront:: INCBIN "pic/ymon/golduck.pic" +GolduckPicBack:: INCBIN "pic/monback/golduckb.pic" +HypnoPicFront:: INCBIN "pic/ymon/hypno.pic" +HypnoPicBack:: INCBIN "pic/monback/hypnob.pic" +GolbatPicFront:: INCBIN "pic/ymon/golbat.pic" +GolbatPicBack:: INCBIN "pic/monback/golbatb.pic" +MewtwoPicFront:: INCBIN "pic/ymon/mewtwo.pic" +MewtwoPicBack:: INCBIN "pic/monback/mewtwob.pic" +SnorlaxPicFront:: INCBIN "pic/ymon/snorlax.pic" +SnorlaxPicBack:: INCBIN "pic/monback/snorlaxb.pic" +MagikarpPicFront:: INCBIN "pic/ymon/magikarp.pic" +MagikarpPicBack:: INCBIN "pic/monback/magikarpb.pic" +MukPicFront:: INCBIN "pic/ymon/muk.pic" +MukPicBack:: INCBIN "pic/monback/mukb.pic" +KinglerPicFront:: INCBIN "pic/ymon/kingler.pic" +KinglerPicBack:: INCBIN "pic/monback/kinglerb.pic" +CloysterPicFront:: INCBIN "pic/ymon/cloyster.pic" +CloysterPicBack:: INCBIN "pic/monback/cloysterb.pic" +ElectrodePicFront:: INCBIN "pic/ymon/electrode.pic" +ElectrodePicBack:: INCBIN "pic/monback/electrodeb.pic" +ClefablePicFront:: INCBIN "pic/ymon/clefable.pic" +ClefablePicBack:: INCBIN "pic/monback/clefableb.pic" +WeezingPicFront:: INCBIN "pic/ymon/weezing.pic" +WeezingPicBack:: INCBIN "pic/monback/weezingb.pic" +PersianPicFront:: INCBIN "pic/ymon/persian.pic" +PersianPicBack:: INCBIN "pic/monback/persianb.pic" +MarowakPicFront:: INCBIN "pic/ymon/marowak.pic" +MarowakPicBack:: INCBIN "pic/monback/marowakb.pic" +HaunterPicFront:: INCBIN "pic/ymon/haunter.pic" +HaunterPicBack:: INCBIN "pic/monback/haunterb.pic" +AbraPicFront:: INCBIN "pic/ymon/abra.pic" +AbraPicBack:: INCBIN "pic/monback/abrab.pic" +AlakazamPicFront:: INCBIN "pic/ymon/alakazam.pic" +AlakazamPicBack:: INCBIN "pic/monback/alakazamb.pic" +PidgeottoPicFront:: INCBIN "pic/ymon/pidgeotto.pic" +PidgeottoPicBack:: INCBIN "pic/monback/pidgeottob.pic" +PidgeotPicFront:: INCBIN "pic/ymon/pidgeot.pic" +PidgeotPicBack:: INCBIN "pic/monback/pidgeotb.pic" +StarmiePicFront:: INCBIN "pic/ymon/starmie.pic" +StarmiePicBack:: INCBIN "pic/monback/starmieb.pic" SECTION "Pics 5", ROMX ; BANK $0D -BulbasaurPicFront: INCBIN "pic/ymon/bulbasaur.pic" -BulbasaurPicBack: INCBIN "pic/monback/bulbasaurb.pic" -VenusaurPicFront: INCBIN "pic/ymon/venusaur.pic" -VenusaurPicBack: INCBIN "pic/monback/venusaurb.pic" -TentacruelPicFront: INCBIN "pic/ymon/tentacruel.pic" -TentacruelPicBack: INCBIN "pic/monback/tentacruelb.pic" -GoldeenPicFront: INCBIN "pic/ymon/goldeen.pic" -GoldeenPicBack: INCBIN "pic/monback/goldeenb.pic" -SeakingPicFront: INCBIN "pic/ymon/seaking.pic" -SeakingPicBack: INCBIN "pic/monback/seakingb.pic" -PonytaPicFront: INCBIN "pic/ymon/ponyta.pic" -RapidashPicFront: INCBIN "pic/ymon/rapidash.pic" -PonytaPicBack: INCBIN "pic/monback/ponytab.pic" -RapidashPicBack: INCBIN "pic/monback/rapidashb.pic" -RattataPicFront: INCBIN "pic/ymon/rattata.pic" -RattataPicBack: INCBIN "pic/monback/rattatab.pic" -RaticatePicFront: INCBIN "pic/ymon/raticate.pic" -RaticatePicBack: INCBIN "pic/monback/raticateb.pic" -NidorinoPicFront: INCBIN "pic/ymon/nidorino.pic" -NidorinoPicBack: INCBIN "pic/monback/nidorinob.pic" -NidorinaPicFront: INCBIN "pic/ymon/nidorina.pic" -NidorinaPicBack: INCBIN "pic/monback/nidorinab.pic" -GeodudePicFront: INCBIN "pic/ymon/geodude.pic" -GeodudePicBack: INCBIN "pic/monback/geodudeb.pic" -PorygonPicFront: INCBIN "pic/ymon/porygon.pic" -PorygonPicBack: INCBIN "pic/monback/porygonb.pic" -AerodactylPicFront: INCBIN "pic/ymon/aerodactyl.pic" -AerodactylPicBack: INCBIN "pic/monback/aerodactylb.pic" -MagnemitePicFront: INCBIN "pic/ymon/magnemite.pic" -MagnemitePicBack: INCBIN "pic/monback/magnemiteb.pic" -CharmanderPicFront: INCBIN "pic/ymon/charmander.pic" -CharmanderPicBack: INCBIN "pic/monback/charmanderb.pic" -SquirtlePicFront: INCBIN "pic/ymon/squirtle.pic" -SquirtlePicBack: INCBIN "pic/monback/squirtleb.pic" -CharmeleonPicFront: INCBIN "pic/ymon/charmeleon.pic" -CharmeleonPicBack: INCBIN "pic/monback/charmeleonb.pic" -WartortlePicFront: INCBIN "pic/ymon/wartortle.pic" -WartortlePicBack: INCBIN "pic/monback/wartortleb.pic" -CharizardPicFront: INCBIN "pic/ymon/charizard.pic" -CharizardPicBack: INCBIN "pic/monback/charizardb.pic" -FossilAerodactylPic: INCBIN "pic/ymon/fossilaerodactyl.pic" -GhostPic: INCBIN "pic/other/ghost.pic" -OddishPicFront: INCBIN "pic/ymon/oddish.pic" -OddishPicBack: INCBIN "pic/monback/oddishb.pic" -GloomPicFront: INCBIN "pic/ymon/gloom.pic" -GloomPicBack: INCBIN "pic/monback/gloomb.pic" -VileplumePicFront: INCBIN "pic/ymon/vileplume.pic" -VileplumePicBack: INCBIN "pic/monback/vileplumeb.pic" -BellsproutPicFront: INCBIN "pic/ymon/bellsprout.pic" -BellsproutPicBack: INCBIN "pic/monback/bellsproutb.pic" -WeepinbellPicFront: INCBIN "pic/ymon/weepinbell.pic" -WeepinbellPicBack: INCBIN "pic/monback/weepinbellb.pic" -VictreebelPicFront: INCBIN "pic/ymon/victreebel.pic" -VictreebelPicBack: INCBIN "pic/monback/victreebelb.pic" +BulbasaurPicFront:: INCBIN "pic/ymon/bulbasaur.pic" +BulbasaurPicBack:: INCBIN "pic/monback/bulbasaurb.pic" +VenusaurPicFront:: INCBIN "pic/ymon/venusaur.pic" +VenusaurPicBack:: INCBIN "pic/monback/venusaurb.pic" +TentacruelPicFront:: INCBIN "pic/ymon/tentacruel.pic" +TentacruelPicBack:: INCBIN "pic/monback/tentacruelb.pic" +GoldeenPicFront:: INCBIN "pic/ymon/goldeen.pic" +GoldeenPicBack:: INCBIN "pic/monback/goldeenb.pic" +SeakingPicFront:: INCBIN "pic/ymon/seaking.pic" +SeakingPicBack:: INCBIN "pic/monback/seakingb.pic" +PonytaPicFront:: INCBIN "pic/ymon/ponyta.pic" +RapidashPicFront:: INCBIN "pic/ymon/rapidash.pic" +PonytaPicBack:: INCBIN "pic/monback/ponytab.pic" +RapidashPicBack:: INCBIN "pic/monback/rapidashb.pic" +RattataPicFront:: INCBIN "pic/ymon/rattata.pic" +RattataPicBack:: INCBIN "pic/monback/rattatab.pic" +RaticatePicFront:: INCBIN "pic/ymon/raticate.pic" +RaticatePicBack:: INCBIN "pic/monback/raticateb.pic" +NidorinoPicFront:: INCBIN "pic/ymon/nidorino.pic" +NidorinoPicBack:: INCBIN "pic/monback/nidorinob.pic" +NidorinaPicFront:: INCBIN "pic/ymon/nidorina.pic" +NidorinaPicBack:: INCBIN "pic/monback/nidorinab.pic" +GeodudePicFront:: INCBIN "pic/ymon/geodude.pic" +GeodudePicBack:: INCBIN "pic/monback/geodudeb.pic" +PorygonPicFront:: INCBIN "pic/ymon/porygon.pic" +PorygonPicBack:: INCBIN "pic/monback/porygonb.pic" +AerodactylPicFront:: INCBIN "pic/ymon/aerodactyl.pic" +AerodactylPicBack:: INCBIN "pic/monback/aerodactylb.pic" +MagnemitePicFront:: INCBIN "pic/ymon/magnemite.pic" +MagnemitePicBack:: INCBIN "pic/monback/magnemiteb.pic" +CharmanderPicFront:: INCBIN "pic/ymon/charmander.pic" +CharmanderPicBack:: INCBIN "pic/monback/charmanderb.pic" +SquirtlePicFront:: INCBIN "pic/ymon/squirtle.pic" +SquirtlePicBack:: INCBIN "pic/monback/squirtleb.pic" +CharmeleonPicFront:: INCBIN "pic/ymon/charmeleon.pic" +CharmeleonPicBack:: INCBIN "pic/monback/charmeleonb.pic" +WartortlePicFront:: INCBIN "pic/ymon/wartortle.pic" +WartortlePicBack:: INCBIN "pic/monback/wartortleb.pic" +CharizardPicFront:: INCBIN "pic/ymon/charizard.pic" +CharizardPicBack:: INCBIN "pic/monback/charizardb.pic" +FossilAerodactylPic:: INCBIN "pic/ymon/fossilaerodactyl.pic" +GhostPic:: INCBIN "pic/other/ghost.pic" +OddishPicFront:: INCBIN "pic/ymon/oddish.pic" +OddishPicBack:: INCBIN "pic/monback/oddishb.pic" +GloomPicFront:: INCBIN "pic/ymon/gloom.pic" +GloomPicBack:: INCBIN "pic/monback/gloomb.pic" +VileplumePicFront:: INCBIN "pic/ymon/vileplume.pic" +VileplumePicBack:: INCBIN "pic/monback/vileplumeb.pic" +BellsproutPicFront:: INCBIN "pic/ymon/bellsprout.pic" +BellsproutPicBack:: INCBIN "pic/monback/bellsproutb.pic" +WeepinbellPicFront:: INCBIN "pic/ymon/weepinbell.pic" +WeepinbellPicBack:: INCBIN "pic/monback/weepinbellb.pic" +VictreebelPicFront:: INCBIN "pic/ymon/victreebel.pic" +VictreebelPicBack:: INCBIN "pic/monback/victreebelb.pic" INCLUDE "engine/titlescreen2.asm" INCLUDE "engine/slot_machine.asm" INCLUDE "engine/game_corner_slots.asm" -SECTION "bank0E", ROMX +SECTION "bankE", ROMX INCLUDE "data/moves.asm" BaseStats: INCLUDE "data/base_stats.asm" @@ -825,19 +836,19 @@ INCLUDE "data/cries.asm" INCLUDE "engine/battle/trainer_ai.asm" INCLUDE "engine/battle/draw_hud_pokeball_gfx.asm" -TradingAnimationGraphics: INCBIN "gfx/game_boy.2bpp" - INCBIN "gfx/link_cable.2bpp" +TradingAnimationGraphics: +INCBIN "gfx/game_boy.2bpp" +INCBIN "gfx/link_cable.2bpp" TradingAnimationGraphicsEnd: -TradingAnimationGraphics2: ; Pokeball traveling through the link cable. - INCBIN "gfx/trade2.2bpp" +TradingAnimationGraphics2: INCBIN "gfx/trade2.2bpp" TradingAnimationGraphics2End: INCLUDE "engine/evos_moves.asm" -SECTION "bank0F", ROMX +SECTION "bankF", ROMX INCLUDE "engine/battle/core.asm" @@ -854,454 +865,461 @@ INCLUDE "engine/menu/options.asm" SECTION "bank11", ROMX -INCLUDE "data/mapHeaders/lavendertown.asm" -INCLUDE "data/mapObjects/lavendertown.asm" -LavenderTownBlocks: INCBIN "maps/lavendertown.blk" -ViridianPokecenterBlocks: INCBIN "maps/viridianpokecenter.blk" -SafariZoneRestHouse1Blocks: -SafariZoneRestHouse2Blocks: -SafariZoneRestHouse3Blocks: -SafariZoneRestHouse4Blocks: INCBIN "maps/safarizoneresthouse1.blk" +INCLUDE "data/mapHeaders/LavenderTown.asm" +INCLUDE "data/mapObjects/LavenderTown.asm" +LavenderTown_Blocks: INCBIN "maps/LavenderTown.blk" + +ViridianPokecenter_Blocks: INCBIN "maps/ViridianPokecenter.blk" + +SafariZoneCenterRestHouse_Blocks: +SafariZoneWestRestHouse_Blocks: +SafariZoneEastRestHouse_Blocks: +SafariZoneNorthRestHouse_Blocks: INCBIN "maps/SafariZoneCenterRestHouse.blk" -INCLUDE "scripts/lavendertown.asm" +INCLUDE "scripts/LavenderTown.asm" INCLUDE "engine/pokedex_rating.asm" -INCLUDE "data/mapHeaders/viridianpokecenter.asm" -INCLUDE "scripts/viridianpokecenter.asm" -INCLUDE "data/mapObjects/viridianpokecenter.asm" - -INCLUDE "data/mapHeaders/celadonmart1.asm" -INCLUDE "scripts/celadonmart1.asm" -INCLUDE "data/mapObjects/celadonmart1.asm" -CeladonMart1Blocks: INCBIN "maps/celadonmart1.blk" - -INCLUDE "data/mapHeaders/mansion1.asm" -INCLUDE "scripts/mansion1.asm" -INCLUDE "data/mapObjects/mansion1.asm" -Mansion1Blocks: INCBIN "maps/mansion1.blk" - -INCLUDE "data/mapHeaders/rocktunnel1.asm" -INCLUDE "scripts/rocktunnel1.asm" -INCLUDE "data/mapObjects/rocktunnel1.asm" -RockTunnel1Blocks: INCBIN "maps/rocktunnel1.blk" - -INCLUDE "data/mapHeaders/seafoamislands1.asm" -INCLUDE "scripts/seafoamislands1.asm" -INCLUDE "data/mapObjects/seafoamislands1.asm" -SeafoamIslands1Blocks: INCBIN "maps/seafoamislands1.blk" - -INCLUDE "data/mapHeaders/ssanne3.asm" -INCLUDE "scripts/ssanne3.asm" -INCLUDE "data/mapObjects/ssanne3.asm" -SSAnne3Blocks: INCBIN "maps/ssanne3.blk" - -INCLUDE "data/mapHeaders/victoryroad3.asm" -INCLUDE "scripts/victoryroad3.asm" -INCLUDE "data/mapObjects/victoryroad3.asm" -VictoryRoad3Blocks: INCBIN "maps/victoryroad3.blk" - -INCLUDE "data/mapHeaders/rockethideout1.asm" -INCLUDE "scripts/rockethideout1.asm" -INCLUDE "data/mapObjects/rockethideout1.asm" -RocketHideout1Blocks: INCBIN "maps/rockethideout1.blk" - -INCLUDE "data/mapHeaders/rockethideout2.asm" -INCLUDE "scripts/rockethideout2.asm" -INCLUDE "data/mapObjects/rockethideout2.asm" -RocketHideout2Blocks: INCBIN "maps/rockethideout2.blk" - -INCLUDE "data/mapHeaders/rockethideout3.asm" -INCLUDE "scripts/rockethideout3.asm" -INCLUDE "data/mapObjects/rockethideout3.asm" -RocketHideout3Blocks: INCBIN "maps/rockethideout3.blk" - -INCLUDE "data/mapHeaders/rockethideout4.asm" -INCLUDE "scripts/rockethideout4.asm" -INCLUDE "data/mapObjects/rockethideout4.asm" -RocketHideout4Blocks: INCBIN "maps/rockethideout4.blk" - -INCLUDE "data/mapHeaders/rockethideoutelevator.asm" -INCLUDE "scripts/rockethideoutelevator.asm" -INCLUDE "data/mapObjects/rockethideoutelevator.asm" -RocketHideoutElevatorBlocks: INCBIN "maps/rockethideoutelevator.blk" - -INCLUDE "data/mapHeaders/silphcoelevator.asm" -INCLUDE "scripts/silphcoelevator.asm" -INCLUDE "data/mapObjects/silphcoelevator.asm" -SilphCoElevatorBlocks: INCBIN "maps/silphcoelevator.blk" - -INCLUDE "data/mapHeaders/safarizoneeast.asm" -INCLUDE "scripts/safarizoneeast.asm" -INCLUDE "data/mapObjects/safarizoneeast.asm" -SafariZoneEastBlocks: INCBIN "maps/safarizoneeast.blk" - -INCLUDE "data/mapHeaders/safarizonenorth.asm" -INCLUDE "scripts/safarizonenorth.asm" -INCLUDE "data/mapObjects/safarizonenorth.asm" -SafariZoneNorthBlocks: INCBIN "maps/safarizonenorth.blk" - -INCLUDE "data/mapHeaders/safarizonecenter.asm" -INCLUDE "scripts/safarizonecenter.asm" -INCLUDE "data/mapObjects/safarizonecenter.asm" -SafariZoneCenterBlocks: INCBIN "maps/safarizonecenter.blk" - -INCLUDE "data/mapHeaders/safarizoneresthouse1.asm" -INCLUDE "scripts/safarizoneresthouse1.asm" -INCLUDE "data/mapObjects/safarizoneresthouse1.asm" - -INCLUDE "data/mapHeaders/safarizoneresthouse2.asm" -INCLUDE "scripts/safarizoneresthouse2.asm" -INCLUDE "data/mapObjects/safarizoneresthouse2.asm" - -INCLUDE "data/mapHeaders/safarizoneresthouse3.asm" -INCLUDE "scripts/safarizoneresthouse3.asm" -INCLUDE "data/mapObjects/safarizoneresthouse3.asm" - -INCLUDE "data/mapHeaders/safarizoneresthouse4.asm" -INCLUDE "scripts/safarizoneresthouse4.asm" -INCLUDE "data/mapObjects/safarizoneresthouse4.asm" - -INCLUDE "data/mapHeaders/unknowndungeon2.asm" -INCLUDE "scripts/unknowndungeon2.asm" -INCLUDE "data/mapObjects/unknowndungeon2.asm" -UnknownDungeon2Blocks: INCBIN "maps/unknowndungeon2.blk" - -INCLUDE "data/mapHeaders/unknowndungeon3.asm" -INCLUDE "scripts/unknowndungeon3.asm" -INCLUDE "data/mapObjects/unknowndungeon3.asm" -UnknownDungeon3Blocks: INCBIN "maps/unknowndungeon3.blk" - -INCLUDE "data/mapHeaders/rocktunnel2.asm" -INCLUDE "scripts/rocktunnel2.asm" -INCLUDE "data/mapObjects/rocktunnel2.asm" -RockTunnel2Blocks: INCBIN "maps/rocktunnel2.blk" - -INCLUDE "data/mapHeaders/seafoamislands2.asm" -INCLUDE "scripts/seafoamislands2.asm" -INCLUDE "data/mapObjects/seafoamislands2.asm" -SeafoamIslands2Blocks: INCBIN "maps/seafoamislands2.blk" - -INCLUDE "data/mapHeaders/seafoamislands3.asm" -INCLUDE "scripts/seafoamislands3.asm" -INCLUDE "data/mapObjects/seafoamislands3.asm" -SeafoamIslands3Blocks: INCBIN "maps/seafoamislands3.blk" - -INCLUDE "data/mapHeaders/seafoamislands4.asm" -INCLUDE "scripts/seafoamislands4.asm" -INCLUDE "data/mapObjects/seafoamislands4.asm" -SeafoamIslands4Blocks: INCBIN "maps/seafoamislands4.blk" - -INCLUDE "data/mapHeaders/seafoamislands5.asm" -INCLUDE "scripts/seafoamislands5.asm" -INCLUDE "data/mapObjects/seafoamislands5.asm" -SeafoamIslands5Blocks: INCBIN "maps/seafoamislands5.blk" +INCLUDE "data/mapHeaders/ViridianPokecenter.asm" +INCLUDE "scripts/ViridianPokecenter.asm" +INCLUDE "data/mapObjects/ViridianPokecenter.asm" + +INCLUDE "data/mapHeaders/CeladonMart1F.asm" +INCLUDE "scripts/CeladonMart1F.asm" +INCLUDE "data/mapObjects/CeladonMart1F.asm" +CeladonMart1F_Blocks: INCBIN "maps/CeladonMart1F.blk" + +INCLUDE "data/mapHeaders/PokemonMansion1F.asm" +INCLUDE "scripts/PokemonMansion1F.asm" +INCLUDE "data/mapObjects/PokemonMansion1F.asm" +PokemonMansion1F_Blocks: INCBIN "maps/PokemonMansion1F.blk" + +INCLUDE "data/mapHeaders/RockTunnel1F.asm" +INCLUDE "scripts/RockTunnel1F.asm" +INCLUDE "data/mapObjects/RockTunnel1F.asm" +RockTunnel1F_Blocks: INCBIN "maps/RockTunnel1F.blk" + +INCLUDE "data/mapHeaders/SeafoamIslands1F.asm" +INCLUDE "scripts/SeafoamIslands1F.asm" +INCLUDE "data/mapObjects/SeafoamIslands1F.asm" +SeafoamIslands1F_Blocks: INCBIN "maps/SeafoamIslands1F.blk" + +INCLUDE "data/mapHeaders/SSAnne3F.asm" +INCLUDE "scripts/SSAnne3F.asm" +INCLUDE "data/mapObjects/SSAnne3F.asm" +SSAnne3F_Blocks: INCBIN "maps/SSAnne3F.blk" + +INCLUDE "data/mapHeaders/VictoryRoad3F.asm" +INCLUDE "scripts/VictoryRoad3F.asm" +INCLUDE "data/mapObjects/VictoryRoad3F.asm" +VictoryRoad3F_Blocks: INCBIN "maps/VictoryRoad3F.blk" + +INCLUDE "data/mapHeaders/RocketHideoutB1F.asm" +INCLUDE "scripts/RocketHideoutB1F.asm" +INCLUDE "data/mapObjects/RocketHideoutB1F.asm" +RocketHideoutB1F_Blocks: INCBIN "maps/RocketHideoutB1F.blk" + +INCLUDE "data/mapHeaders/RocketHideoutB2F.asm" +INCLUDE "scripts/RocketHideoutB2F.asm" +INCLUDE "data/mapObjects/RocketHideoutB2F.asm" +RocketHideoutB2F_Blocks: INCBIN "maps/RocketHideoutB2F.blk" + +INCLUDE "data/mapHeaders/RocketHideoutB3F.asm" +INCLUDE "scripts/RocketHideoutB3F.asm" +INCLUDE "data/mapObjects/RocketHideoutB3F.asm" +RocketHideoutB3F_Blocks: INCBIN "maps/RocketHideoutB3F.blk" + +INCLUDE "data/mapHeaders/RocketHideoutB4F.asm" +INCLUDE "scripts/RocketHideoutB4F.asm" +INCLUDE "data/mapObjects/RocketHideoutB4F.asm" +RocketHideoutB4F_Blocks: INCBIN "maps/RocketHideoutB4F.blk" + +INCLUDE "data/mapHeaders/RocketHideoutElevator.asm" +INCLUDE "scripts/RocketHideoutElevator.asm" +INCLUDE "data/mapObjects/RocketHideoutElevator.asm" +RocketHideoutElevator_Blocks: INCBIN "maps/RocketHideoutElevator.blk" + +INCLUDE "data/mapHeaders/SilphCoElevator.asm" +INCLUDE "scripts/SilphCoElevator.asm" +INCLUDE "data/mapObjects/SilphCoElevator.asm" +SilphCoElevator_Blocks: INCBIN "maps/SilphCoElevator.blk" + +INCLUDE "data/mapHeaders/SafariZoneEast.asm" +INCLUDE "scripts/SafariZoneEast.asm" +INCLUDE "data/mapObjects/SafariZoneEast.asm" +SafariZoneEast_Blocks: INCBIN "maps/SafariZoneEast.blk" + +INCLUDE "data/mapHeaders/SafariZoneNorth.asm" +INCLUDE "scripts/SafariZoneNorth.asm" +INCLUDE "data/mapObjects/SafariZoneNorth.asm" +SafariZoneNorth_Blocks: INCBIN "maps/SafariZoneNorth.blk" + +INCLUDE "data/mapHeaders/SafariZoneCenter.asm" +INCLUDE "scripts/SafariZoneCenter.asm" +INCLUDE "data/mapObjects/SafariZoneCenter.asm" +SafariZoneCenter_Blocks: INCBIN "maps/SafariZoneCenter.blk" + +INCLUDE "data/mapHeaders/SafariZoneCenterRestHouse.asm" +INCLUDE "scripts/SafariZoneCenterRestHouse.asm" +INCLUDE "data/mapObjects/SafariZoneCenterRestHouse.asm" + +INCLUDE "data/mapHeaders/SafariZoneWestRestHouse.asm" +INCLUDE "scripts/SafariZoneWestRestHouse.asm" +INCLUDE "data/mapObjects/SafariZoneWestRestHouse.asm" + +INCLUDE "data/mapHeaders/SafariZoneEastRestHouse.asm" +INCLUDE "scripts/SafariZoneEastRestHouse.asm" +INCLUDE "data/mapObjects/SafariZoneEastRestHouse.asm" + +INCLUDE "data/mapHeaders/SafariZoneNorthRestHouse.asm" +INCLUDE "scripts/SafariZoneNorthRestHouse.asm" +INCLUDE "data/mapObjects/SafariZoneNorthRestHouse.asm" + +INCLUDE "data/mapHeaders/CeruleanCave2F.asm" +INCLUDE "scripts/CeruleanCave2F.asm" +INCLUDE "data/mapObjects/CeruleanCave2F.asm" +CeruleanCave2F_Blocks: INCBIN "maps/CeruleanCave2F.blk" + +INCLUDE "data/mapHeaders/CeruleanCaveB1F.asm" +INCLUDE "scripts/CeruleanCaveB1F.asm" +INCLUDE "data/mapObjects/CeruleanCaveB1F.asm" +CeruleanCaveB1F_Blocks: INCBIN "maps/CeruleanCaveB1F.blk" + +INCLUDE "data/mapHeaders/RockTunnelB1F.asm" +INCLUDE "scripts/RockTunnelB1F.asm" +INCLUDE "data/mapObjects/RockTunnelB1F.asm" +RockTunnelB1F_Blocks: INCBIN "maps/RockTunnelB1F.blk" + +INCLUDE "data/mapHeaders/SeafoamIslandsB1F.asm" +INCLUDE "scripts/SeafoamIslandsB1F.asm" +INCLUDE "data/mapObjects/SeafoamIslandsB1F.asm" +SeafoamIslandsB1F_Blocks: INCBIN "maps/SeafoamIslandsB1F.blk" + +INCLUDE "data/mapHeaders/SeafoamIslandsB2F.asm" +INCLUDE "scripts/SeafoamIslandsB2F.asm" +INCLUDE "data/mapObjects/SeafoamIslandsB2F.asm" +SeafoamIslandsB2F_Blocks: INCBIN "maps/SeafoamIslandsB2F.blk" + +INCLUDE "data/mapHeaders/SeafoamIslandsB3F.asm" +INCLUDE "scripts/SeafoamIslandsB3F.asm" +INCLUDE "data/mapObjects/SeafoamIslandsB3F.asm" +SeafoamIslandsB3F_Blocks: INCBIN "maps/SeafoamIslandsB3F.blk" + +INCLUDE "data/mapHeaders/SeafoamIslandsB4F.asm" +INCLUDE "scripts/SeafoamIslandsB4F.asm" +INCLUDE "data/mapObjects/SeafoamIslandsB4F.asm" +SeafoamIslandsB4F_Blocks: INCBIN "maps/SeafoamIslandsB4F.blk" INCLUDE "engine/overworld/dungeon_warps.asm" SECTION "bank12", ROMX -INCLUDE "data/mapHeaders/route7.asm" -INCLUDE "data/mapObjects/route7.asm" -Route7Blocks: INCBIN "maps/route7.blk" -MtMoonPokecenterBlocks: -RockTunnelPokecenterBlocks: -CeladonPokecenterBlocks: INCBIN "maps/mtmoonpokecenter.blk" -Route11GateBlocks: -Route15GateBlocks: -Route18GateBlocks: INCBIN "maps/route11gate.blk" -Route11GateUpstairsBlocks: -Route12GateUpstairsBlocks: -Route15GateUpstairsBlocks: -Route16GateUpstairsBlocks: -Route18GateUpstairsBlocks: INCBIN "maps/route11gateupstairs.blk" -INCLUDE "scripts/route7.asm" - -INCLUDE "data/mapHeaders/redshouse1f.asm" -INCLUDE "scripts/redshouse1f.asm" -INCLUDE "data/mapObjects/redshouse1f.asm" -RedsHouse1FBlocks: INCBIN "maps/redshouse1f.blk" - -INCLUDE "data/mapHeaders/celadonmart3.asm" -INCLUDE "scripts/celadonmart3.asm" -INCLUDE "data/mapObjects/celadonmart3.asm" -CeladonMart3Blocks: INCBIN "maps/celadonmart3.blk" - -INCLUDE "data/mapHeaders/celadonmart4.asm" -INCLUDE "scripts/celadonmart4.asm" -INCLUDE "data/mapObjects/celadonmart4.asm" -CeladonMart4Blocks: INCBIN "maps/celadonmart4.blk" - -INCLUDE "data/mapHeaders/celadonmartroof.asm" -INCLUDE "scripts/celadonmartroof.asm" -INCLUDE "data/mapObjects/celadonmartroof.asm" -CeladonMartRoofBlocks: INCBIN "maps/celadonmartroof.blk" - -INCLUDE "data/mapHeaders/celadonmartelevator.asm" -INCLUDE "scripts/celadonmartelevator.asm" -INCLUDE "data/mapObjects/celadonmartelevator.asm" -CeladonMartElevatorBlocks: INCBIN "maps/celadonmartelevator.blk" - -INCLUDE "data/mapHeaders/celadonmansion1.asm" -INCLUDE "scripts/celadonmansion1.asm" -INCLUDE "data/mapObjects/celadonmansion1.asm" -CeladonMansion1Blocks: INCBIN "maps/celadonmansion1.blk" - -INCLUDE "data/mapHeaders/celadonmansion2.asm" -INCLUDE "scripts/celadonmansion2.asm" -INCLUDE "data/mapObjects/celadonmansion2.asm" -CeladonMansion2Blocks: INCBIN "maps/celadonmansion2.blk" - -INCLUDE "data/mapHeaders/celadonmansion3.asm" -INCLUDE "scripts/celadonmansion3.asm" -INCLUDE "data/mapObjects/celadonmansion3.asm" -CeladonMansion3Blocks: INCBIN "maps/celadonmansion3.blk" - -INCLUDE "data/mapHeaders/celadonmansion4.asm" -INCLUDE "scripts/celadonmansion4.asm" -INCLUDE "data/mapObjects/celadonmansion4.asm" -CeladonMansion4Blocks: INCBIN "maps/celadonmansion4.blk" - -INCLUDE "data/mapHeaders/celadonpokecenter.asm" -INCLUDE "scripts/celadonpokecenter.asm" -INCLUDE "data/mapObjects/celadonpokecenter.asm" - -INCLUDE "data/mapHeaders/celadongym.asm" -INCLUDE "scripts/celadongym.asm" -INCLUDE "data/mapObjects/celadongym.asm" -CeladonGymBlocks: INCBIN "maps/celadongym.blk" - -INCLUDE "data/mapHeaders/celadongamecorner.asm" -INCLUDE "scripts/celadongamecorner.asm" -INCLUDE "data/mapObjects/celadongamecorner.asm" -CeladonGameCornerBlocks: INCBIN "maps/celadongamecorner.blk" - -INCLUDE "data/mapHeaders/celadonmart5.asm" -INCLUDE "scripts/celadonmart5.asm" -INCLUDE "data/mapObjects/celadonmart5.asm" -CeladonMart5Blocks: INCBIN "maps/celadonmart5.blk" - -INCLUDE "data/mapHeaders/celadonprizeroom.asm" -INCLUDE "scripts/celadonprizeroom.asm" -INCLUDE "data/mapObjects/celadonprizeroom.asm" -CeladonPrizeRoomBlocks: INCBIN "maps/celadonprizeroom.blk" - -INCLUDE "data/mapHeaders/celadondiner.asm" -INCLUDE "scripts/celadondiner.asm" -INCLUDE "data/mapObjects/celadondiner.asm" -CeladonDinerBlocks: INCBIN "maps/celadondiner.blk" - -INCLUDE "data/mapHeaders/celadonhouse.asm" -INCLUDE "scripts/celadonhouse.asm" -INCLUDE "data/mapObjects/celadonhouse.asm" -CeladonHouseBlocks: INCBIN "maps/celadonhouse.blk" - -INCLUDE "data/mapHeaders/celadonhotel.asm" -INCLUDE "scripts/celadonhotel.asm" -INCLUDE "data/mapObjects/celadonhotel.asm" -CeladonHotelBlocks: INCBIN "maps/celadonhotel.blk" - -INCLUDE "data/mapHeaders/mtmoonpokecenter.asm" -INCLUDE "scripts/mtmoonpokecenter.asm" -INCLUDE "data/mapObjects/mtmoonpokecenter.asm" - -INCLUDE "data/mapHeaders/rocktunnelpokecenter.asm" -INCLUDE "scripts/rocktunnelpokecenter.asm" -INCLUDE "data/mapObjects/rocktunnelpokecenter.asm" - -INCLUDE "data/mapHeaders/route11gate.asm" -INCLUDE "scripts/route11gate.asm" -INCLUDE "data/mapObjects/route11gate.asm" - -INCLUDE "data/mapHeaders/route11gateupstairs.asm" -INCLUDE "scripts/route11gateupstairs.asm" -INCLUDE "data/mapObjects/route11gateupstairs.asm" - -INCLUDE "data/mapHeaders/route12gate.asm" -INCLUDE "scripts/route12gate.asm" -INCLUDE "data/mapObjects/route12gate.asm" -Route12GateBlocks: INCBIN "maps/route12gate.blk" - -INCLUDE "data/mapHeaders/route12gateupstairs.asm" -INCLUDE "scripts/route12gateupstairs.asm" -INCLUDE "data/mapObjects/route12gateupstairs.asm" - -INCLUDE "data/mapHeaders/route15gate.asm" -INCLUDE "scripts/route15gate.asm" -INCLUDE "data/mapObjects/route15gate.asm" - -INCLUDE "data/mapHeaders/route15gateupstairs.asm" -INCLUDE "scripts/route15gateupstairs.asm" -INCLUDE "data/mapObjects/route15gateupstairs.asm" - -INCLUDE "data/mapHeaders/route16gate.asm" -INCLUDE "scripts/route16gate.asm" -INCLUDE "data/mapObjects/route16gate.asm" -Route16GateBlocks: INCBIN "maps/route16gate.blk" - -INCLUDE "data/mapHeaders/route16gateupstairs.asm" -INCLUDE "scripts/route16gateupstairs.asm" -INCLUDE "data/mapObjects/route16gateupstairs.asm" - -INCLUDE "data/mapHeaders/route18gate.asm" -INCLUDE "scripts/route18gate.asm" -INCLUDE "data/mapObjects/route18gate.asm" - -INCLUDE "data/mapHeaders/route18gateupstairs.asm" -INCLUDE "scripts/route18gateupstairs.asm" -INCLUDE "data/mapObjects/route18gateupstairs.asm" - -INCLUDE "data/mapHeaders/mtmoon1.asm" -INCLUDE "scripts/mtmoon1.asm" -INCLUDE "data/mapObjects/mtmoon1.asm" -MtMoon1Blocks: INCBIN "maps/mtmoon1.blk" - -INCLUDE "data/mapHeaders/mtmoon3.asm" -INCLUDE "scripts/mtmoon3.asm" -INCLUDE "data/mapObjects/mtmoon3.asm" -MtMoon3Blocks: INCBIN "maps/mtmoon3.blk" -INCLUDE "scripts/mtmoon3_2.asm" - -INCLUDE "data/mapHeaders/safarizonewest.asm" -INCLUDE "scripts/safarizonewest.asm" -INCLUDE "data/mapObjects/safarizonewest.asm" -SafariZoneWestBlocks: INCBIN "maps/safarizonewest.blk" - -INCLUDE "data/mapHeaders/safarizonesecrethouse.asm" -INCLUDE "scripts/safarizonesecrethouse.asm" -INCLUDE "data/mapObjects/safarizonesecrethouse.asm" -SafariZoneSecretHouseBlocks: INCBIN "maps/safarizonesecrethouse.blk" +INCLUDE "data/mapHeaders/Route7.asm" +INCLUDE "data/mapObjects/Route7.asm" +Route7_Blocks: INCBIN "maps/Route7.blk" + +CeladonPokecenter_Blocks: +RockTunnelPokecenter_Blocks: +MtMoonPokecenter_Blocks: INCBIN "maps/MtMoonPokecenter.blk" + +Route18Gate1F_Blocks: +Route15Gate1F_Blocks: +Route11Gate1F_Blocks: INCBIN "maps/Route11Gate1F.blk" + +Route18Gate2F_Blocks: +Route16Gate2F_Blocks: +Route15Gate2F_Blocks: +Route12Gate2F_Blocks: +Route11Gate2F_Blocks: INCBIN "maps/Route11Gate2F.blk" + +INCLUDE "scripts/Route7.asm" + +INCLUDE "data/mapHeaders/RedsHouse1F.asm" +INCLUDE "scripts/RedsHouse1F.asm" +INCLUDE "data/mapObjects/RedsHouse1F.asm" +RedsHouse1F_Blocks: INCBIN "maps/RedsHouse1F.blk" + +INCLUDE "data/mapHeaders/CeladonMart3F.asm" +INCLUDE "scripts/CeladonMart3F.asm" +INCLUDE "data/mapObjects/CeladonMart3F.asm" +CeladonMart3F_Blocks: INCBIN "maps/CeladonMart3F.blk" + +INCLUDE "data/mapHeaders/CeladonMart4F.asm" +INCLUDE "scripts/CeladonMart4F.asm" +INCLUDE "data/mapObjects/CeladonMart4F.asm" +CeladonMart4F_Blocks: INCBIN "maps/CeladonMart4F.blk" + +INCLUDE "data/mapHeaders/CeladonMartRoof.asm" +INCLUDE "scripts/CeladonMartRoof.asm" +INCLUDE "data/mapObjects/CeladonMartRoof.asm" +CeladonMartRoof_Blocks: INCBIN "maps/CeladonMartRoof.blk" + +INCLUDE "data/mapHeaders/CeladonMartElevator.asm" +INCLUDE "scripts/CeladonMartElevator.asm" +INCLUDE "data/mapObjects/CeladonMartElevator.asm" +CeladonMartElevator_Blocks: INCBIN "maps/CeladonMartElevator.blk" + +INCLUDE "data/mapHeaders/CeladonMansion1F.asm" +INCLUDE "scripts/CeladonMansion1F.asm" +INCLUDE "data/mapObjects/CeladonMansion1F.asm" +CeladonMansion1F_Blocks: INCBIN "maps/CeladonMansion1F.blk" + +INCLUDE "data/mapHeaders/CeladonMansion2F.asm" +INCLUDE "scripts/CeladonMansion2F.asm" +INCLUDE "data/mapObjects/CeladonMansion2F.asm" +CeladonMansion2F_Blocks: INCBIN "maps/CeladonMansion2F.blk" + +INCLUDE "data/mapHeaders/CeladonMansion3F.asm" +INCLUDE "scripts/CeladonMansion3F.asm" +INCLUDE "data/mapObjects/CeladonMansion3F.asm" +CeladonMansion3F_Blocks: INCBIN "maps/CeladonMansion3F.blk" + +INCLUDE "data/mapHeaders/CeladonMansionRoof.asm" +INCLUDE "scripts/CeladonMansionRoof.asm" +INCLUDE "data/mapObjects/CeladonMansionRoof.asm" +CeladonMansionRoof_Blocks: INCBIN "maps/CeladonMansionRoof.blk" + +INCLUDE "data/mapHeaders/CeladonPokecenter.asm" +INCLUDE "scripts/CeladonPokecenter.asm" +INCLUDE "data/mapObjects/CeladonPokecenter.asm" + +INCLUDE "data/mapHeaders/CeladonGym.asm" +INCLUDE "scripts/CeladonGym.asm" +INCLUDE "data/mapObjects/CeladonGym.asm" +CeladonGym_Blocks: INCBIN "maps/CeladonGym.blk" + +INCLUDE "data/mapHeaders/GameCorner.asm" +INCLUDE "scripts/GameCorner.asm" +INCLUDE "data/mapObjects/GameCorner.asm" +GameCorner_Blocks: INCBIN "maps/GameCorner.blk" + +INCLUDE "data/mapHeaders/CeladonMart5F.asm" +INCLUDE "scripts/CeladonMart5F.asm" +INCLUDE "data/mapObjects/CeladonMart5F.asm" +CeladonMart5F_Blocks: INCBIN "maps/CeladonMart5F.blk" + +INCLUDE "data/mapHeaders/GameCornerPrizeRoom.asm" +INCLUDE "scripts/GameCornerPrizeRoom.asm" +INCLUDE "data/mapObjects/GameCornerPrizeRoom.asm" +GameCornerPrizeRoom_Blocks: INCBIN "maps/GameCornerPrizeRoom.blk" + +INCLUDE "data/mapHeaders/CeladonDiner.asm" +INCLUDE "scripts/CeladonDiner.asm" +INCLUDE "data/mapObjects/CeladonDiner.asm" +CeladonDiner_Blocks: INCBIN "maps/CeladonDiner.blk" + +INCLUDE "data/mapHeaders/CeladonChiefHouse.asm" +INCLUDE "scripts/CeladonChiefHouse.asm" +INCLUDE "data/mapObjects/CeladonChiefHouse.asm" +CeladonChiefHouse_Blocks: INCBIN "maps/CeladonChiefHouse.blk" + +INCLUDE "data/mapHeaders/CeladonHotel.asm" +INCLUDE "scripts/CeladonHotel.asm" +INCLUDE "data/mapObjects/CeladonHotel.asm" +CeladonHotel_Blocks: INCBIN "maps/CeladonHotel.blk" + +INCLUDE "data/mapHeaders/MtMoonPokecenter.asm" +INCLUDE "scripts/MtMoonPokecenter.asm" +INCLUDE "data/mapObjects/MtMoonPokecenter.asm" + +INCLUDE "data/mapHeaders/RockTunnelPokecenter.asm" +INCLUDE "scripts/RockTunnelPokecenter.asm" +INCLUDE "data/mapObjects/RockTunnelPokecenter.asm" + +INCLUDE "data/mapHeaders/Route11Gate1F.asm" +INCLUDE "scripts/Route11Gate1F.asm" +INCLUDE "data/mapObjects/Route11Gate1F.asm" + +INCLUDE "data/mapHeaders/Route11Gate2F.asm" +INCLUDE "scripts/Route11Gate2F.asm" +INCLUDE "data/mapObjects/Route11Gate2F.asm" + +INCLUDE "data/mapHeaders/Route12Gate1F.asm" +INCLUDE "scripts/Route12Gate1F.asm" +INCLUDE "data/mapObjects/Route12Gate1F.asm" +Route12Gate1F_Blocks: INCBIN "maps/Route12Gate1F.blk" + +INCLUDE "data/mapHeaders/Route12Gate2F.asm" +INCLUDE "scripts/Route12Gate2F.asm" +INCLUDE "data/mapObjects/Route12Gate2F.asm" + +INCLUDE "data/mapHeaders/Route15Gate1F.asm" +INCLUDE "scripts/Route15Gate1F.asm" +INCLUDE "data/mapObjects/Route15Gate1F.asm" + +INCLUDE "data/mapHeaders/Route15Gate2F.asm" +INCLUDE "scripts/Route15Gate2F.asm" +INCLUDE "data/mapObjects/Route15Gate2F.asm" + +INCLUDE "data/mapHeaders/Route16Gate1F.asm" +INCLUDE "scripts/Route16Gate1F.asm" +INCLUDE "data/mapObjects/Route16Gate1F.asm" +Route16Gate1F_Blocks: INCBIN "maps/Route16Gate1F.blk" + +INCLUDE "data/mapHeaders/Route16Gate2F.asm" +INCLUDE "scripts/Route16Gate2F.asm" +INCLUDE "data/mapObjects/Route16Gate2F.asm" + +INCLUDE "data/mapHeaders/Route18Gate1F.asm" +INCLUDE "scripts/Route18Gate1F.asm" +INCLUDE "data/mapObjects/Route18Gate1F.asm" + +INCLUDE "data/mapHeaders/Route18Gate2F.asm" +INCLUDE "scripts/Route18Gate2F.asm" +INCLUDE "data/mapObjects/Route18Gate2F.asm" + +INCLUDE "data/mapHeaders/MtMoon1F.asm" +INCLUDE "scripts/MtMoon1F.asm" +INCLUDE "data/mapObjects/MtMoon1F.asm" +MtMoon1F_Blocks: INCBIN "maps/MtMoon1F.blk" + +INCLUDE "data/mapHeaders/MtMoonB2F.asm" +INCLUDE "scripts/MtMoonB2F.asm" +INCLUDE "data/mapObjects/MtMoonB2F.asm" +MtMoonB2F_Blocks: INCBIN "maps/MtMoonB2F.blk" +INCLUDE "scripts/MtMoonB2F_2.asm" + +INCLUDE "data/mapHeaders/SafariZoneWest.asm" +INCLUDE "scripts/SafariZoneWest.asm" +INCLUDE "data/mapObjects/SafariZoneWest.asm" +SafariZoneWest_Blocks: INCBIN "maps/SafariZoneWest.blk" + +INCLUDE "data/mapHeaders/SafariZoneSecretHouse.asm" +INCLUDE "scripts/SafariZoneSecretHouse.asm" +INCLUDE "data/mapObjects/SafariZoneSecretHouse.asm" +SafariZoneSecretHouse_Blocks: INCBIN "maps/SafariZoneSecretHouse.blk" SECTION "bank13", ROMX -TrainerPics: -YoungsterPic: INCBIN "pic/trainer/youngster.pic" -BugCatcherPic: INCBIN "pic/trainer/bugcatcher.pic" -LassPic: INCBIN "pic/trainer/lass.pic" -SailorPic: INCBIN "pic/trainer/sailor.pic" -JrTrainerMPic: INCBIN "pic/trainer/jr.trainerm.pic" -JrTrainerFPic: INCBIN "pic/trainer/jr.trainerf.pic" -PokemaniacPic: INCBIN "pic/trainer/pokemaniac.pic" -SuperNerdPic: INCBIN "pic/trainer/supernerd.pic" -HikerPic: INCBIN "pic/trainer/hiker.pic" -BikerPic: INCBIN "pic/trainer/biker.pic" -BurglarPic: INCBIN "pic/trainer/burglar.pic" -EngineerPic: INCBIN "pic/trainer/engineer.pic" -FisherPic: INCBIN "pic/trainer/fisher.pic" -SwimmerPic: INCBIN "pic/trainer/swimmer.pic" -CueBallPic: INCBIN "pic/trainer/cueball.pic" -GamblerPic: INCBIN "pic/trainer/gambler.pic" -BeautyPic: INCBIN "pic/trainer/beauty.pic" -PsychicPic: INCBIN "pic/trainer/psychic.pic" -RockerPic: INCBIN "pic/trainer/rocker.pic" -JugglerPic: INCBIN "pic/trainer/juggler.pic" -TamerPic: INCBIN "pic/trainer/tamer.pic" -BirdKeeperPic: INCBIN "pic/trainer/birdkeeper.pic" -BlackbeltPic: INCBIN "pic/trainer/blackbelt.pic" -Rival1Pic: INCBIN "pic/ytrainer/rival1.pic" -ProfOakPic: INCBIN "pic/trainer/prof.oak.pic" -ChiefPic: -ScientistPic: INCBIN "pic/trainer/scientist.pic" -GiovanniPic: INCBIN "pic/trainer/giovanni.pic" -RocketPic: INCBIN "pic/trainer/rocket.pic" -CooltrainerMPic: INCBIN "pic/trainer/cooltrainerm.pic" -CooltrainerFPic: INCBIN "pic/trainer/cooltrainerf.pic" -BrunoPic: INCBIN "pic/trainer/bruno.pic" -BrockPic: INCBIN "pic/ytrainer/brock.pic" -MistyPic: INCBIN "pic/ytrainer/misty.pic" -LtSurgePic: INCBIN "pic/trainer/lt.surge.pic" -ErikaPic: INCBIN "pic/ytrainer/erika.pic" -KogaPic: INCBIN "pic/trainer/koga.pic" -BlainePic: INCBIN "pic/trainer/blaine.pic" -SabrinaPic: INCBIN "pic/trainer/sabrina.pic" -GentlemanPic: INCBIN "pic/trainer/gentleman.pic" -Rival2Pic: INCBIN "pic/ytrainer/rival2.pic" -Rival3Pic: INCBIN "pic/ytrainer/rival3.pic" -LoreleiPic: INCBIN "pic/trainer/lorelei.pic" -ChannelerPic: INCBIN "pic/trainer/channeler.pic" -AgathaPic: INCBIN "pic/trainer/agatha.pic" -LancePic: INCBIN "pic/trainer/lance.pic" -JessieJamesPic: INCBIN "pic/ytrainer/jessiejames.pic" - -INCLUDE "data/mapHeaders/tradecenter.asm" -INCLUDE "scripts/tradecenter.asm" -INCLUDE "data/mapObjects/tradecenter.asm" -TradeCenterBlocks: INCBIN "maps/tradecenter.blk" - -INCLUDE "data/mapHeaders/colosseum.asm" -INCLUDE "scripts/colosseum.asm" -INCLUDE "data/mapObjects/colosseum.asm" -ColosseumBlocks: INCBIN "maps/colosseum.blk" +TrainerPics:: +YoungsterPic:: INCBIN "pic/trainer/youngster.pic" +BugCatcherPic:: INCBIN "pic/trainer/bugcatcher.pic" +LassPic:: INCBIN "pic/trainer/lass.pic" +SailorPic:: INCBIN "pic/trainer/sailor.pic" +JrTrainerMPic:: INCBIN "pic/trainer/jr.trainerm.pic" +JrTrainerFPic:: INCBIN "pic/trainer/jr.trainerf.pic" +PokemaniacPic:: INCBIN "pic/trainer/pokemaniac.pic" +SuperNerdPic:: INCBIN "pic/trainer/supernerd.pic" +HikerPic:: INCBIN "pic/trainer/hiker.pic" +BikerPic:: INCBIN "pic/trainer/biker.pic" +BurglarPic:: INCBIN "pic/trainer/burglar.pic" +EngineerPic:: INCBIN "pic/trainer/engineer.pic" +FisherPic:: INCBIN "pic/trainer/fisher.pic" +SwimmerPic:: INCBIN "pic/trainer/swimmer.pic" +CueBallPic:: INCBIN "pic/trainer/cueball.pic" +GamblerPic:: INCBIN "pic/trainer/gambler.pic" +BeautyPic:: INCBIN "pic/trainer/beauty.pic" +PsychicPic:: INCBIN "pic/trainer/psychic.pic" +RockerPic:: INCBIN "pic/trainer/rocker.pic" +JugglerPic:: INCBIN "pic/trainer/juggler.pic" +TamerPic:: INCBIN "pic/trainer/tamer.pic" +BirdKeeperPic:: INCBIN "pic/trainer/birdkeeper.pic" +BlackbeltPic:: INCBIN "pic/trainer/blackbelt.pic" +Rival1Pic:: INCBIN "pic/ytrainer/rival1.pic" +ProfOakPic:: INCBIN "pic/trainer/prof.oak.pic" +ChiefPic:: +ScientistPic:: INCBIN "pic/trainer/scientist.pic" +GiovanniPic:: INCBIN "pic/trainer/giovanni.pic" +RocketPic:: INCBIN "pic/trainer/rocket.pic" +CooltrainerMPic:: INCBIN "pic/trainer/cooltrainerm.pic" +CooltrainerFPic:: INCBIN "pic/trainer/cooltrainerf.pic" +BrunoPic:: INCBIN "pic/trainer/bruno.pic" +BrockPic:: INCBIN "pic/ytrainer/brock.pic" +MistyPic:: INCBIN "pic/ytrainer/misty.pic" +LtSurgePic:: INCBIN "pic/trainer/lt.surge.pic" +ErikaPic:: INCBIN "pic/ytrainer/erika.pic" +KogaPic:: INCBIN "pic/trainer/koga.pic" +BlainePic:: INCBIN "pic/trainer/blaine.pic" +SabrinaPic:: INCBIN "pic/trainer/sabrina.pic" +GentlemanPic:: INCBIN "pic/trainer/gentleman.pic" +Rival2Pic:: INCBIN "pic/ytrainer/rival2.pic" +Rival3Pic:: INCBIN "pic/ytrainer/rival3.pic" +LoreleiPic:: INCBIN "pic/trainer/lorelei.pic" +ChannelerPic:: INCBIN "pic/trainer/channeler.pic" +AgathaPic:: INCBIN "pic/trainer/agatha.pic" +LancePic:: INCBIN "pic/trainer/lance.pic" +JessieJamesPic:: INCBIN "pic/ytrainer/jessiejames.pic" + +INCLUDE "data/mapHeaders/TradeCenter.asm" +INCLUDE "scripts/TradeCenter.asm" +INCLUDE "data/mapObjects/TradeCenter.asm" +TradeCenter_Blocks: INCBIN "maps/TradeCenter.blk" + +INCLUDE "data/mapHeaders/Colosseum.asm" +INCLUDE "scripts/Colosseum.asm" +INCLUDE "data/mapObjects/Colosseum.asm" +Colosseum_Blocks: INCBIN "maps/Colosseum.blk" SECTION "bank14", ROMX -INCLUDE "data/mapHeaders/route22.asm" -INCLUDE "data/mapObjects/route22.asm" -Route22Blocks: INCBIN "maps/route22.blk" -INCLUDE "data/mapHeaders/route20.asm" -INCLUDE "data/mapObjects/route20.asm" -Route20Blocks: INCBIN "maps/route20.blk" - -INCLUDE "data/mapHeaders/route23.asm" -INCLUDE "data/mapObjects/route23.asm" -Route23Blocks: INCBIN "maps/route23.blk" - -INCLUDE "data/mapHeaders/route24.asm" -INCLUDE "data/mapObjects/route24.asm" -Route24Blocks: INCBIN "maps/route24.blk" - -INCLUDE "data/mapHeaders/route25.asm" -INCLUDE "data/mapObjects/route25.asm" -Route25Blocks: INCBIN "maps/route25.blk" - -; indigoplateau -INCLUDE "data/mapHeaders/indigoplateau.asm" -INCLUDE "scripts/indigoplateau.asm" -INCLUDE "data/mapObjects/indigoplateau.asm" -IndigoPlateauBlocks: INCBIN "maps/indigoplateau.blk" - -INCLUDE "data/mapHeaders/saffroncity.asm" -INCLUDE "data/mapObjects/saffroncity.asm" -SaffronCityBlocks: INCBIN "maps/saffroncity.blk" -INCLUDE "scripts/saffroncity.asm" -INCLUDE "scripts/route20.asm" -INCLUDE "scripts/route22.asm" -INCLUDE "scripts/route23.asm" -INCLUDE "scripts/route24.asm" -INCLUDE "scripts/route25.asm" - -INCLUDE "data/mapHeaders/victoryroad2.asm" -INCLUDE "scripts/victoryroad2.asm" -INCLUDE "data/mapObjects/victoryroad2.asm" -VictoryRoad2Blocks: INCBIN "maps/victoryroad2.blk" - -INCLUDE "data/mapHeaders/mtmoon2.asm" -INCLUDE "scripts/mtmoon2.asm" -INCLUDE "data/mapObjects/mtmoon2.asm" -MtMoon2Blocks: INCBIN "maps/mtmoon2.blk" - -INCLUDE "data/mapHeaders/silphco7.asm" -INCLUDE "scripts/silphco7.asm" -INCLUDE "data/mapObjects/silphco7.asm" -SilphCo7Blocks: INCBIN "maps/silphco7.blk" - -INCLUDE "data/mapHeaders/mansion2.asm" -INCLUDE "scripts/mansion2.asm" -INCLUDE "data/mapObjects/mansion2.asm" -Mansion2Blocks: INCBIN "maps/mansion2.blk" - -INCLUDE "data/mapHeaders/mansion3.asm" -INCLUDE "scripts/mansion3.asm" -INCLUDE "data/mapObjects/mansion3.asm" -Mansion3Blocks: INCBIN "maps/mansion3.blk" - -INCLUDE "data/mapHeaders/mansion4.asm" -INCLUDE "scripts/mansion4.asm" -INCLUDE "data/mapObjects/mansion4.asm" -Mansion4Blocks: INCBIN "maps/mansion4.blk" +INCLUDE "data/mapHeaders/Route22.asm" +INCLUDE "data/mapObjects/Route22.asm" +Route22_Blocks: INCBIN "maps/Route22.blk" + +INCLUDE "data/mapHeaders/Route20.asm" +INCLUDE "data/mapObjects/Route20.asm" +Route20_Blocks: INCBIN "maps/Route20.blk" + +INCLUDE "data/mapHeaders/Route23.asm" +INCLUDE "data/mapObjects/Route23.asm" +Route23_Blocks: INCBIN "maps/Route23.blk" + +INCLUDE "data/mapHeaders/Route24.asm" +INCLUDE "data/mapObjects/Route24.asm" +Route24_Blocks: INCBIN "maps/Route24.blk" + +INCLUDE "data/mapHeaders/Route25.asm" +INCLUDE "data/mapObjects/Route25.asm" +Route25_Blocks: INCBIN "maps/Route25.blk" + +INCLUDE "data/mapHeaders/IndigoPlateau.asm" +INCLUDE "scripts/IndigoPlateau.asm" +INCLUDE "data/mapObjects/IndigoPlateau.asm" +IndigoPlateau_Blocks: INCBIN "maps/IndigoPlateau.blk" + +INCLUDE "data/mapHeaders/SaffronCity.asm" +INCLUDE "data/mapObjects/SaffronCity.asm" +SaffronCity_Blocks: INCBIN "maps/SaffronCity.blk" +INCLUDE "scripts/SaffronCity.asm" + +INCLUDE "scripts/Route20.asm" +INCLUDE "scripts/Route22.asm" +INCLUDE "scripts/Route23.asm" +INCLUDE "scripts/Route24.asm" +INCLUDE "scripts/Route25.asm" + +INCLUDE "data/mapHeaders/VictoryRoad2F.asm" +INCLUDE "scripts/VictoryRoad2F.asm" +INCLUDE "data/mapObjects/VictoryRoad2F.asm" +VictoryRoad2F_Blocks: INCBIN "maps/VictoryRoad2F.blk" + +INCLUDE "data/mapHeaders/MtMoonB1F.asm" +INCLUDE "scripts/MtMoonB1F.asm" +INCLUDE "data/mapObjects/MtMoonB1F.asm" +MtMoonB1F_Blocks: INCBIN "maps/MtMoonB1F.blk" + +INCLUDE "data/mapHeaders/SilphCo7F.asm" +INCLUDE "scripts/SilphCo7F.asm" +INCLUDE "data/mapObjects/SilphCo7F.asm" +SilphCo7F_Blocks: INCBIN "maps/SilphCo7F.blk" + +INCLUDE "data/mapHeaders/PokemonMansion2F.asm" +INCLUDE "scripts/PokemonMansion2F.asm" +INCLUDE "data/mapObjects/PokemonMansion2F.asm" +PokemonMansion2F_Blocks: INCBIN "maps/PokemonMansion2F.blk" + +INCLUDE "data/mapHeaders/PokemonMansion3F.asm" +INCLUDE "scripts/PokemonMansion3F.asm" +INCLUDE "data/mapObjects/PokemonMansion3F.asm" +PokemonMansion3F_Blocks: INCBIN "maps/PokemonMansion3F.blk" + +INCLUDE "data/mapHeaders/PokemonMansionB1F.asm" +INCLUDE "scripts/PokemonMansionB1F.asm" +INCLUDE "data/mapObjects/PokemonMansionB1F.asm" +PokemonMansionB1F_Blocks: INCBIN "maps/PokemonMansionB1F.blk" INCLUDE "engine/overworld/card_key.asm" @@ -1312,130 +1330,131 @@ INCLUDE "engine/hidden_object_functions14.asm" SECTION "bank15", ROMX -INCLUDE "data/mapHeaders/route2.asm" -INCLUDE "data/mapObjects/route2.asm" -Route2Blocks: INCBIN "maps/route2.blk" +INCLUDE "data/mapHeaders/Route2.asm" +INCLUDE "data/mapObjects/Route2.asm" +Route2_Blocks: INCBIN "maps/Route2.blk" -INCLUDE "data/mapHeaders/route3.asm" -INCLUDE "data/mapObjects/route3.asm" -Route3Blocks: INCBIN "maps/route3.blk" +INCLUDE "data/mapHeaders/Route3.asm" +INCLUDE "data/mapObjects/Route3.asm" +Route3_Blocks: INCBIN "maps/Route3.blk" -INCLUDE "data/mapHeaders/route4.asm" -INCLUDE "data/mapObjects/route4.asm" -Route4Blocks: INCBIN "maps/route4.blk" +INCLUDE "data/mapHeaders/Route4.asm" +INCLUDE "data/mapObjects/Route4.asm" +Route4_Blocks: INCBIN "maps/Route4.blk" -INCLUDE "data/mapHeaders/route5.asm" -INCLUDE "data/mapObjects/route5.asm" -Route5Blocks: INCBIN "maps/route5.blk" +INCLUDE "data/mapHeaders/Route5.asm" +INCLUDE "data/mapObjects/Route5.asm" +Route5_Blocks: INCBIN "maps/Route5.blk" -INCLUDE "data/mapHeaders/route9.asm" -INCLUDE "data/mapObjects/route9.asm" -Route9Blocks: INCBIN "maps/route9.blk" +INCLUDE "data/mapHeaders/Route9.asm" +INCLUDE "data/mapObjects/Route9.asm" +Route9_Blocks: INCBIN "maps/Route9.blk" -INCLUDE "data/mapHeaders/route13.asm" -INCLUDE "data/mapObjects/route13.asm" -Route13Blocks: INCBIN "maps/route13.blk" +INCLUDE "data/mapHeaders/Route13.asm" +INCLUDE "data/mapObjects/Route13.asm" +Route13_Blocks: INCBIN "maps/Route13.blk" -INCLUDE "data/mapHeaders/route14.asm" -INCLUDE "data/mapObjects/route14.asm" -Route14Blocks: INCBIN "maps/route14.blk" +INCLUDE "data/mapHeaders/Route14.asm" +INCLUDE "data/mapObjects/Route14.asm" +Route14_Blocks: INCBIN "maps/Route14.blk" -INCLUDE "data/mapHeaders/route17.asm" -INCLUDE "data/mapObjects/route17.asm" -Route17Blocks: INCBIN "maps/route17.blk" +INCLUDE "data/mapHeaders/Route17.asm" +INCLUDE "data/mapObjects/Route17.asm" +Route17_Blocks: INCBIN "maps/Route17.blk" -INCLUDE "data/mapHeaders/route19.asm" -INCLUDE "data/mapObjects/route19.asm" -Route19Blocks: INCBIN "maps/route19.blk" +INCLUDE "data/mapHeaders/Route19.asm" +INCLUDE "data/mapObjects/Route19.asm" +Route19_Blocks: INCBIN "maps/Route19.blk" -INCLUDE "data/mapHeaders/route21.asm" -INCLUDE "data/mapObjects/route21.asm" -Route21Blocks: INCBIN "maps/route21.blk" +INCLUDE "data/mapHeaders/Route21.asm" +INCLUDE "data/mapObjects/Route21.asm" +Route21_Blocks: INCBIN "maps/Route21.blk" -DayCareMBlocks: -VermilionHouse2Blocks: -Route12HouseBlocks: INCBIN "maps/daycarem.blk" -FuchsiaHouse3Blocks: INCBIN "maps/fuchsiahouse3.blk" +VermilionOldRodHouse_Blocks: +Route12SuperRodHouse_Blocks: +Daycare_Blocks: INCBIN "maps/Daycare.blk" + +FuchsiaGoodRodHouse_Blocks: INCBIN "maps/FuchsiaGoodRodHouse.blk" INCLUDE "engine/battle/experience.asm" -INCLUDE "scripts/route2.asm" -INCLUDE "scripts/route3.asm" -INCLUDE "scripts/route4.asm" -INCLUDE "scripts/route5.asm" -INCLUDE "scripts/route9.asm" -INCLUDE "scripts/route13.asm" -INCLUDE "scripts/route14.asm" -INCLUDE "scripts/route17.asm" -INCLUDE "scripts/route19.asm" -INCLUDE "scripts/route21.asm" - -INCLUDE "data/mapHeaders/vermilionhouse2.asm" -INCLUDE "scripts/vermilionhouse2.asm" -INCLUDE "data/mapObjects/vermilionhouse2.asm" - -INCLUDE "data/mapHeaders/celadonmart2.asm" -INCLUDE "scripts/celadonmart2.asm" -INCLUDE "data/mapObjects/celadonmart2.asm" -CeladonMart2Blocks: INCBIN "maps/celadonmart2.blk" - -INCLUDE "data/mapHeaders/fuchsiahouse3.asm" -INCLUDE "scripts/fuchsiahouse3.asm" -INCLUDE "data/mapObjects/fuchsiahouse3.asm" - -INCLUDE "data/mapHeaders/daycarem.asm" -INCLUDE "scripts/daycarem.asm" -INCLUDE "data/mapObjects/daycarem.asm" - -INCLUDE "data/mapHeaders/route12house.asm" -INCLUDE "scripts/route12house.asm" -INCLUDE "data/mapObjects/route12house.asm" - -INCLUDE "data/mapHeaders/silphco8.asm" -INCLUDE "scripts/silphco8.asm" -INCLUDE "data/mapObjects/silphco8.asm" -SilphCo8Blocks: INCBIN "maps/silphco8.blk" - -INCLUDE "engine/menu/diploma_1.asm" +INCLUDE "scripts/Route2.asm" +INCLUDE "scripts/Route3.asm" +INCLUDE "scripts/Route4.asm" +INCLUDE "scripts/Route5.asm" +INCLUDE "scripts/Route9.asm" +INCLUDE "scripts/Route13.asm" +INCLUDE "scripts/Route14.asm" +INCLUDE "scripts/Route17.asm" +INCLUDE "scripts/Route19.asm" +INCLUDE "scripts/Route21.asm" + +INCLUDE "data/mapHeaders/VermilionOldRodHouse.asm" +INCLUDE "scripts/VermilionOldRodHouse.asm" +INCLUDE "data/mapObjects/VermilionOldRodHouse.asm" + +INCLUDE "data/mapHeaders/CeladonMart2F.asm" +INCLUDE "scripts/CeladonMart2F.asm" +INCLUDE "data/mapObjects/CeladonMart2F.asm" +CeladonMart2F_Blocks: INCBIN "maps/CeladonMart2F.blk" + +INCLUDE "data/mapHeaders/FuchsiaGoodRodHouse.asm" +INCLUDE "scripts/FuchsiaGoodRodHouse.asm" +INCLUDE "data/mapObjects/FuchsiaGoodRodHouse.asm" + +INCLUDE "data/mapHeaders/Daycare.asm" +INCLUDE "scripts/Daycare.asm" +INCLUDE "data/mapObjects/Daycare.asm" + +INCLUDE "data/mapHeaders/Route12SuperRodHouse.asm" +INCLUDE "scripts/Route12SuperRodHouse.asm" +INCLUDE "data/mapObjects/Route12SuperRodHouse.asm" + +INCLUDE "data/mapHeaders/SilphCo8F.asm" +INCLUDE "scripts/SilphCo8F.asm" +INCLUDE "data/mapObjects/SilphCo8F.asm" +SilphCo8F_Blocks: INCBIN "maps/SilphCo8F.blk" + +INCLUDE "engine/menu/diploma.asm" INCLUDE "engine/overworld/trainers.asm" SECTION "bank16", ROMX -INCLUDE "data/mapHeaders/route6.asm" -INCLUDE "data/mapObjects/route6.asm" -Route6Blocks: INCBIN "maps/route6.blk" +INCLUDE "data/mapHeaders/Route6.asm" +INCLUDE "data/mapObjects/Route6.asm" +Route6_Blocks: INCBIN "maps/Route6.blk" -INCLUDE "data/mapHeaders/route8.asm" -INCLUDE "data/mapObjects/route8.asm" -Route8Blocks: INCBIN "maps/route8.blk" +INCLUDE "data/mapHeaders/Route8.asm" +INCLUDE "data/mapObjects/Route8.asm" +Route8_Blocks: INCBIN "maps/Route8.blk" -INCLUDE "data/mapHeaders/route10.asm" -INCLUDE "data/mapObjects/route10.asm" -Route10Blocks: INCBIN "maps/route10.blk" +INCLUDE "data/mapHeaders/Route10.asm" +INCLUDE "data/mapObjects/Route10.asm" +Route10_Blocks: INCBIN "maps/Route10.blk" -INCLUDE "data/mapHeaders/route11.asm" -INCLUDE "data/mapObjects/route11.asm" -Route11Blocks: INCBIN "maps/route11.blk" +INCLUDE "data/mapHeaders/Route11.asm" +INCLUDE "data/mapObjects/Route11.asm" +Route11_Blocks: INCBIN "maps/Route11.blk" -INCLUDE "data/mapHeaders/route12.asm" -INCLUDE "data/mapObjects/route12.asm" -Route12Blocks: INCBIN "maps/route12.blk" +INCLUDE "data/mapHeaders/Route12.asm" +INCLUDE "data/mapObjects/Route12.asm" +Route12_Blocks: INCBIN "maps/Route12.blk" -INCLUDE "data/mapHeaders/route15.asm" -INCLUDE "data/mapObjects/route15.asm" -Route15Blocks: INCBIN "maps/route15.blk" +INCLUDE "data/mapHeaders/Route15.asm" +INCLUDE "data/mapObjects/Route15.asm" +Route15_Blocks: INCBIN "maps/Route15.blk" -INCLUDE "data/mapHeaders/route16.asm" -INCLUDE "data/mapObjects/route16.asm" -Route16Blocks: INCBIN "maps/route16.blk" +INCLUDE "data/mapHeaders/Route16.asm" +INCLUDE "data/mapObjects/Route16.asm" +Route16_Blocks: INCBIN "maps/Route16.blk" -INCLUDE "data/mapHeaders/route18.asm" -INCLUDE "data/mapObjects/route18.asm" -Route18Blocks: INCBIN "maps/route18.blk" +INCLUDE "data/mapHeaders/Route18.asm" +INCLUDE "data/mapObjects/Route18.asm" +Route18_Blocks: INCBIN "maps/Route18.blk" -INCBIN "maps/unusedblocks58d7d.blk" + INCBIN "maps/UnusedPokecenterCopy.blk" INCLUDE "engine/experience.asm" @@ -1443,192 +1462,198 @@ INCLUDE "engine/status_ailments.asm" INCLUDE "engine/overworld/oaks_aide.asm" -INCLUDE "scripts/route6.asm" -INCLUDE "scripts/route8.asm" -INCLUDE "scripts/route10.asm" -INCLUDE "scripts/route11.asm" -INCLUDE "scripts/route12.asm" -INCLUDE "scripts/route15.asm" -INCLUDE "scripts/route16.asm" -INCLUDE "scripts/route18.asm" - -INCLUDE "data/mapHeaders/fanclub.asm" -INCLUDE "scripts/fanclub.asm" -INCLUDE "data/mapObjects/fanclub.asm" -FanClubBlocks: INCBIN "maps/fanclub.blk" - -INCLUDE "data/mapHeaders/silphco2.asm" -INCLUDE "scripts/silphco2.asm" -INCLUDE "data/mapObjects/silphco2.asm" -SilphCo2Blocks: INCBIN "maps/silphco2.blk" - -INCLUDE "data/mapHeaders/silphco3.asm" -INCLUDE "scripts/silphco3.asm" -INCLUDE "data/mapObjects/silphco3.asm" -SilphCo3Blocks: INCBIN "maps/silphco3.blk" - -INCLUDE "data/mapHeaders/silphco10.asm" -INCLUDE "scripts/silphco10.asm" -INCLUDE "data/mapObjects/silphco10.asm" -SilphCo10Blocks: INCBIN "maps/silphco10.blk" - -INCLUDE "data/mapHeaders/lance.asm" -INCLUDE "scripts/lance.asm" -INCLUDE "data/mapObjects/lance.asm" -LanceBlocks: INCBIN "maps/lance.blk" - -INCLUDE "data/mapHeaders/halloffameroom.asm" -INCLUDE "scripts/halloffameroom.asm" -INCLUDE "data/mapObjects/halloffameroom.asm" -HallofFameRoomBlocks: INCBIN "maps/halloffameroom.blk" +INCLUDE "scripts/Route6.asm" +INCLUDE "scripts/Route8.asm" +INCLUDE "scripts/Route10.asm" +INCLUDE "scripts/Route11.asm" +INCLUDE "scripts/Route12.asm" +INCLUDE "scripts/Route15.asm" +INCLUDE "scripts/Route16.asm" +INCLUDE "scripts/Route18.asm" + +INCLUDE "data/mapHeaders/PokemonFanClub.asm" +INCLUDE "scripts/PokemonFanClub.asm" +INCLUDE "data/mapObjects/PokemonFanClub.asm" +PokemonFanClub_Blocks: INCBIN "maps/PokemonFanClub.blk" + +INCLUDE "data/mapHeaders/SilphCo2F.asm" +INCLUDE "scripts/SilphCo2F.asm" +INCLUDE "data/mapObjects/SilphCo2F.asm" +SilphCo2F_Blocks: INCBIN "maps/SilphCo2F.blk" + +INCLUDE "data/mapHeaders/SilphCo3F.asm" +INCLUDE "scripts/SilphCo3F.asm" +INCLUDE "data/mapObjects/SilphCo3F.asm" +SilphCo3F_Blocks: INCBIN "maps/SilphCo3F.blk" + +INCLUDE "data/mapHeaders/SilphCo10F.asm" +INCLUDE "scripts/SilphCo10F.asm" +INCLUDE "data/mapObjects/SilphCo10F.asm" +SilphCo10F_Blocks: INCBIN "maps/SilphCo10F.blk" + +INCLUDE "data/mapHeaders/LancesRoom.asm" +INCLUDE "scripts/LancesRoom.asm" +INCLUDE "data/mapObjects/LancesRoom.asm" +LancesRoom_Blocks: INCBIN "maps/LancesRoom.blk" + +INCLUDE "data/mapHeaders/HallOfFame.asm" +INCLUDE "scripts/HallOfFame.asm" +INCLUDE "data/mapObjects/HallOfFame.asm" +HallOfFame_Blocks: INCBIN "maps/HallOfFame.blk" INCLUDE "engine/overworld/saffron_guards.asm" SECTION "bank17", ROMX -CeruleanMartBlocks: -VermilionMartBlocks: -LavenderMartBlocks: -SaffronMartBlocks: INCBIN "maps/ceruleanmart.blk" -RedsHouse2FBlocks: -CopycatsHouse2FBlocks: INCBIN "maps/redshouse2f.blk" -Museum1FBlocks: INCBIN "maps/museum1f.blk" -Museum2FBlocks: INCBIN "maps/museum2f.blk" -PewterPokecenterBlocks: -VermilionPokecenterBlocks: -LavenderPokecenterBlocks: -SaffronPokecenterBlocks: INCBIN "maps/pewterpokecenter.blk" -UndergroundPathEntranceRoute5Blocks: -UndergroundPathEntranceRoute6Blocks: -UndergroundPathEntranceRoute7Blocks: -UndergroundPathEntranceRoute7CopyBlocks: INCBIN "maps/undergroundpathentranceroute5.blk" -ViridianForestEntranceBlocks: -ViridianForestExitBlocks: -Route2GateBlocks: INCBIN "maps/viridianforestentrance.blk" - -INCLUDE "data/mapHeaders/redshouse2f.asm" -INCLUDE "scripts/redshouse2f.asm" -INCLUDE "data/mapObjects/redshouse2f.asm" +SaffronMart_Blocks: +LavenderMart_Blocks: +CeruleanMart_Blocks: +VermilionMart_Blocks: INCBIN "maps/VermilionMart.blk" + +CopycatsHouse2F_Blocks: +RedsHouse2F_Blocks: INCBIN "maps/RedsHouse2F.blk" + +Museum1F_Blocks: INCBIN "maps/Museum1F.blk" + +Museum2F_Blocks: INCBIN "maps/Museum2F.blk" + +SaffronPokecenter_Blocks: +VermilionPokecenter_Blocks: +LavenderPokecenter_Blocks: +PewterPokecenter_Blocks: INCBIN "maps/PewterPokecenter.blk" + +UndergroundPathRoute7_Blocks: +UndergroundPathRoute7Copy_Blocks: +UndergroundPathRoute6_Blocks: +UndergroundPathRoute5_Blocks: INCBIN "maps/UndergroundPathRoute5.blk" + +Route2Gate_Blocks: +ViridianForestSouthGate_Blocks: +ViridianForestNorthGate_Blocks: INCBIN "maps/ViridianForestNorthGate.blk" + +INCLUDE "data/mapHeaders/RedsHouse2F.asm" +INCLUDE "scripts/RedsHouse2F.asm" +INCLUDE "data/mapObjects/RedsHouse2F.asm" INCLUDE "engine/predefs17.asm" -INCLUDE "data/mapHeaders/museum1f.asm" -INCLUDE "scripts/museum1f.asm" -INCLUDE "data/mapObjects/museum1f.asm" - -INCLUDE "data/mapHeaders/museum2f.asm" -INCLUDE "scripts/museum2f.asm" -INCLUDE "data/mapObjects/museum2f.asm" - -INCLUDE "data/mapHeaders/pewtergym.asm" -INCLUDE "scripts/pewtergym.asm" -INCLUDE "data/mapObjects/pewtergym.asm" -PewterGymBlocks: INCBIN "maps/pewtergym.blk" - -INCLUDE "data/mapHeaders/pewterpokecenter.asm" -INCLUDE "scripts/pewterpokecenter.asm" -INCLUDE "data/mapObjects/pewterpokecenter.asm" - -INCLUDE "data/mapHeaders/ceruleanpokecenter.asm" -INCLUDE "scripts/ceruleanpokecenter.asm" -INCLUDE "data/mapObjects/ceruleanpokecenter.asm" -CeruleanPokecenterBlocks: INCBIN "maps/ceruleanpokecenter.blk" - -INCLUDE "data/mapHeaders/ceruleangym.asm" -INCLUDE "scripts/ceruleangym.asm" -INCLUDE "data/mapObjects/ceruleangym.asm" -CeruleanGymBlocks: INCBIN "maps/ceruleangym.blk" - -INCLUDE "data/mapHeaders/ceruleanmart.asm" -INCLUDE "scripts/ceruleanmart.asm" -INCLUDE "data/mapObjects/ceruleanmart.asm" - -INCLUDE "data/mapHeaders/lavenderpokecenter.asm" -INCLUDE "scripts/lavenderpokecenter.asm" -INCLUDE "data/mapObjects/lavenderpokecenter.asm" - -INCLUDE "data/mapHeaders/lavendermart.asm" -INCLUDE "scripts/lavendermart.asm" -INCLUDE "data/mapObjects/lavendermart.asm" - -INCLUDE "data/mapHeaders/vermilionpokecenter.asm" -INCLUDE "scripts/vermilionpokecenter.asm" -INCLUDE "data/mapObjects/vermilionpokecenter.asm" - -INCLUDE "data/mapHeaders/vermilionmart.asm" -INCLUDE "scripts/vermilionmart.asm" -INCLUDE "data/mapObjects/vermilionmart.asm" - -INCLUDE "data/mapHeaders/vermiliongym.asm" -INCLUDE "scripts/vermiliongym.asm" -INCLUDE "data/mapObjects/vermiliongym.asm" -VermilionGymBlocks: INCBIN "maps/vermiliongym.blk" - -INCLUDE "data/mapHeaders/copycatshouse2f.asm" -INCLUDE "scripts/copycatshouse2f.asm" -INCLUDE "data/mapObjects/copycatshouse2f.asm" - -INCLUDE "data/mapHeaders/fightingdojo.asm" -INCLUDE "scripts/fightingdojo.asm" -INCLUDE "data/mapObjects/fightingdojo.asm" -FightingDojoBlocks: INCBIN "maps/fightingdojo.blk" - -INCLUDE "data/mapHeaders/saffrongym.asm" -INCLUDE "scripts/saffrongym.asm" -INCLUDE "data/mapObjects/saffrongym.asm" -SaffronGymBlocks: INCBIN "maps/saffrongym.blk" - -INCLUDE "data/mapHeaders/saffronmart.asm" -INCLUDE "scripts/saffronmart.asm" -INCLUDE "data/mapObjects/saffronmart.asm" - -INCLUDE "data/mapHeaders/silphco1.asm" -INCLUDE "scripts/silphco1.asm" -INCLUDE "data/mapObjects/silphco1.asm" -SilphCo1Blocks: INCBIN "maps/silphco1.blk" - -INCLUDE "data/mapHeaders/saffronpokecenter.asm" -INCLUDE "scripts/saffronpokecenter.asm" -INCLUDE "data/mapObjects/saffronpokecenter.asm" - -INCLUDE "data/mapHeaders/viridianforestexit.asm" -INCLUDE "scripts/viridianforestexit.asm" -INCLUDE "data/mapObjects/viridianforestexit.asm" - -INCLUDE "data/mapHeaders/route2gate.asm" -INCLUDE "scripts/route2gate.asm" -INCLUDE "data/mapObjects/route2gate.asm" - -INCLUDE "data/mapHeaders/viridianforestentrance.asm" -INCLUDE "scripts/viridianforestentrance.asm" -INCLUDE "data/mapObjects/viridianforestentrance.asm" - -INCLUDE "data/mapHeaders/undergroundpathentranceroute5.asm" -INCLUDE "scripts/undergroundpathentranceroute5.asm" -INCLUDE "data/mapObjects/undergroundpathentranceroute5.asm" - -INCLUDE "data/mapHeaders/undergroundpathentranceroute6.asm" -INCLUDE "scripts/undergroundpathentranceroute6.asm" -INCLUDE "data/mapObjects/undergroundpathentranceroute6.asm" - -INCLUDE "data/mapHeaders/undergroundpathentranceroute7.asm" -INCLUDE "scripts/undergroundpathentranceroute7.asm" -INCLUDE "data/mapObjects/undergroundpathentranceroute7.asm" - -INCLUDE "data/mapHeaders/undergroundpathentranceroute7copy.asm" -INCLUDE "scripts/undergroundpathentranceroute7copy.asm" -INCLUDE "data/mapObjects/undergroundpathentranceroute7copy.asm" - -INCLUDE "data/mapHeaders/silphco9.asm" -INCLUDE "scripts/silphco9.asm" -INCLUDE "data/mapObjects/silphco9.asm" -SilphCo9Blocks: INCBIN "maps/silphco9.blk" - -INCLUDE "data/mapHeaders/victoryroad1.asm" -INCLUDE "scripts/victoryroad1.asm" -INCLUDE "data/mapObjects/victoryroad1.asm" -VictoryRoad1Blocks: INCBIN "maps/victoryroad1.blk" +INCLUDE "data/mapHeaders/Museum1F.asm" +INCLUDE "scripts/Museum1F.asm" +INCLUDE "data/mapObjects/Museum1F.asm" + +INCLUDE "data/mapHeaders/Museum2F.asm" +INCLUDE "scripts/Museum2F.asm" +INCLUDE "data/mapObjects/Museum2F.asm" + +INCLUDE "data/mapHeaders/PewterGym.asm" +INCLUDE "scripts/PewterGym.asm" +INCLUDE "data/mapObjects/PewterGym.asm" +PewterGym_Blocks: INCBIN "maps/PewterGym.blk" + +INCLUDE "data/mapHeaders/PewterPokecenter.asm" +INCLUDE "scripts/PewterPokecenter.asm" +INCLUDE "data/mapObjects/PewterPokecenter.asm" + +INCLUDE "data/mapHeaders/CeruleanPokecenter.asm" +INCLUDE "scripts/CeruleanPokecenter.asm" +INCLUDE "data/mapObjects/CeruleanPokecenter.asm" +CeruleanPokecenter_Blocks: INCBIN "maps/CeruleanPokecenter.blk" + +INCLUDE "data/mapHeaders/CeruleanGym.asm" +INCLUDE "scripts/CeruleanGym.asm" +INCLUDE "data/mapObjects/CeruleanGym.asm" +CeruleanGym_Blocks: INCBIN "maps/CeruleanGym.blk" + +INCLUDE "data/mapHeaders/CeruleanMart.asm" +INCLUDE "scripts/CeruleanMart.asm" +INCLUDE "data/mapObjects/CeruleanMart.asm" + +INCLUDE "data/mapHeaders/LavenderPokecenter.asm" +INCLUDE "scripts/LavenderPokecenter.asm" +INCLUDE "data/mapObjects/LavenderPokecenter.asm" + +INCLUDE "data/mapHeaders/LavenderMart.asm" +INCLUDE "scripts/LavenderMart.asm" +INCLUDE "data/mapObjects/LavenderMart.asm" + +INCLUDE "data/mapHeaders/VermilionPokecenter.asm" +INCLUDE "scripts/VermilionPokecenter.asm" +INCLUDE "data/mapObjects/VermilionPokecenter.asm" + +INCLUDE "data/mapHeaders/VermilionMart.asm" +INCLUDE "scripts/VermilionMart.asm" +INCLUDE "data/mapObjects/VermilionMart.asm" + +INCLUDE "data/mapHeaders/VermilionGym.asm" +INCLUDE "scripts/VermilionGym.asm" +INCLUDE "data/mapObjects/VermilionGym.asm" +VermilionGym_Blocks: INCBIN "maps/VermilionGym.blk" + +INCLUDE "data/mapHeaders/CopycatsHouse2F.asm" +INCLUDE "scripts/CopycatsHouse2F.asm" +INCLUDE "data/mapObjects/CopycatsHouse2F.asm" + +INCLUDE "data/mapHeaders/FightingDojo.asm" +INCLUDE "scripts/FightingDojo.asm" +INCLUDE "data/mapObjects/FightingDojo.asm" +FightingDojo_Blocks: INCBIN "maps/FightingDojo.blk" + +INCLUDE "data/mapHeaders/SaffronGym.asm" +INCLUDE "scripts/SaffronGym.asm" +INCLUDE "data/mapObjects/SaffronGym.asm" +SaffronGym_Blocks: INCBIN "maps/SaffronGym.blk" + +INCLUDE "data/mapHeaders/SaffronMart.asm" +INCLUDE "scripts/SaffronMart.asm" +INCLUDE "data/mapObjects/SaffronMart.asm" + +INCLUDE "data/mapHeaders/SilphCo1F.asm" +INCLUDE "scripts/SilphCo1F.asm" +INCLUDE "data/mapObjects/SilphCo1F.asm" +SilphCo1F_Blocks: INCBIN "maps/SilphCo1F.blk" + +INCLUDE "data/mapHeaders/SaffronPokecenter.asm" +INCLUDE "scripts/SaffronPokecenter.asm" +INCLUDE "data/mapObjects/SaffronPokecenter.asm" + +INCLUDE "data/mapHeaders/ViridianForestNorthGate.asm" +INCLUDE "scripts/ViridianForestNorthGate.asm" +INCLUDE "data/mapObjects/ViridianForestNorthGate.asm" + +INCLUDE "data/mapHeaders/Route2Gate.asm" +INCLUDE "scripts/Route2Gate.asm" +INCLUDE "data/mapObjects/Route2Gate.asm" + +INCLUDE "data/mapHeaders/ViridianForestSouthGate.asm" +INCLUDE "scripts/ViridianForestSouthGate.asm" +INCLUDE "data/mapObjects/ViridianForestSouthGate.asm" + +INCLUDE "data/mapHeaders/UndergroundPathRoute5.asm" +INCLUDE "scripts/UndergroundPathRoute5.asm" +INCLUDE "data/mapObjects/UndergroundPathRoute5.asm" + +INCLUDE "data/mapHeaders/UndergroundPathRoute6.asm" +INCLUDE "scripts/UndergroundPathRoute6.asm" +INCLUDE "data/mapObjects/UndergroundPathRoute6.asm" + +INCLUDE "data/mapHeaders/UndergroundPathRoute7.asm" +INCLUDE "scripts/UndergroundPathRoute7.asm" +INCLUDE "data/mapObjects/UndergroundPathRoute7.asm" + +INCLUDE "data/mapHeaders/UndergroundPathRoute7Copy.asm" +INCLUDE "scripts/UndergroundPathRoute7Copy.asm" +INCLUDE "data/mapObjects/UndergroundPathRoute7Copy.asm" + +INCLUDE "data/mapHeaders/SilphCo9F.asm" +INCLUDE "scripts/SilphCo9F.asm" +INCLUDE "data/mapObjects/SilphCo9F.asm" +SilphCo9F_Blocks: INCBIN "maps/SilphCo9F.blk" + +INCLUDE "data/mapHeaders/VictoryRoad1F.asm" +INCLUDE "scripts/VictoryRoad1F.asm" +INCLUDE "data/mapObjects/VictoryRoad1F.asm" +VictoryRoad1F_Blocks: INCBIN "maps/VictoryRoad1F.blk" INCLUDE "engine/evolution.asm" @@ -1639,118 +1664,118 @@ INCLUDE "engine/hidden_object_functions17.asm" SECTION "bank18", ROMX -ViridianForestBlocks: INCBIN "maps/viridianforest.blk" -UndergroundPathNSBlocks: INCBIN "maps/undergroundpathns.blk" -UndergroundPathWEBlocks: INCBIN "maps/undergroundpathwe.blk" +ViridianForest_Blocks: INCBIN "maps/ViridianForest.blk" +UndergroundPathNorthSouth_Blocks: INCBIN "maps/UndergroundPathNorthSouth.blk" +UndergroundPathWestEast_Blocks: INCBIN "maps/UndergroundPathWestEast.blk" -INCBIN "maps/unusedblocks60258.blk" + INCBIN "maps/UnusedDiglettsCaveCopy.blk" -SSAnne9Blocks: -SSAnne10Blocks: INCBIN "maps/ssanne9.blk" +SSAnneB1FRooms_Blocks: +SSAnne2FRooms_Blocks: INCBIN "maps/SSAnne2FRooms.blk" -INCLUDE "data/mapHeaders/pokemontower1.asm" -INCLUDE "scripts/pokemontower1.asm" -INCLUDE "data/mapObjects/pokemontower1.asm" -PokemonTower1Blocks: INCBIN "maps/pokemontower1.blk" +INCLUDE "data/mapHeaders/PokemonTower1F.asm" +INCLUDE "scripts/PokemonTower1F.asm" +INCLUDE "data/mapObjects/PokemonTower1F.asm" +PokemonTower1F_Blocks: INCBIN "maps/PokemonTower1F.blk" -INCLUDE "data/mapHeaders/pokemontower2.asm" -INCLUDE "scripts/pokemontower2.asm" -INCLUDE "data/mapObjects/pokemontower2.asm" -PokemonTower2Blocks: INCBIN "maps/pokemontower2.blk" +INCLUDE "data/mapHeaders/PokemonTower2F.asm" +INCLUDE "scripts/PokemonTower2F.asm" +INCLUDE "data/mapObjects/PokemonTower2F.asm" +PokemonTower2F_Blocks: INCBIN "maps/PokemonTower2F.blk" -INCLUDE "data/mapHeaders/pokemontower3.asm" -INCLUDE "scripts/pokemontower3.asm" -INCLUDE "data/mapObjects/pokemontower3.asm" -PokemonTower3Blocks: INCBIN "maps/pokemontower3.blk" +INCLUDE "data/mapHeaders/PokemonTower3F.asm" +INCLUDE "scripts/PokemonTower3F.asm" +INCLUDE "data/mapObjects/PokemonTower3F.asm" +PokemonTower3F_Blocks: INCBIN "maps/PokemonTower3F.blk" -INCLUDE "data/mapHeaders/pokemontower4.asm" -INCLUDE "scripts/pokemontower4.asm" -INCLUDE "data/mapObjects/pokemontower4.asm" -PokemonTower4Blocks: INCBIN "maps/pokemontower4.blk" +INCLUDE "data/mapHeaders/PokemonTower4F.asm" +INCLUDE "scripts/PokemonTower4F.asm" +INCLUDE "data/mapObjects/PokemonTower4F.asm" +PokemonTower4F_Blocks: INCBIN "maps/PokemonTower4F.blk" -INCLUDE "data/mapHeaders/pokemontower5.asm" -INCLUDE "scripts/pokemontower5.asm" -INCLUDE "data/mapObjects/pokemontower5.asm" -PokemonTower5Blocks: INCBIN "maps/pokemontower5.blk" +INCLUDE "data/mapHeaders/PokemonTower5F.asm" +INCLUDE "scripts/PokemonTower5F.asm" +INCLUDE "data/mapObjects/PokemonTower5F.asm" +PokemonTower5F_Blocks: INCBIN "maps/PokemonTower5F.blk" -INCLUDE "data/mapHeaders/pokemontower6.asm" -INCLUDE "scripts/pokemontower6.asm" -INCLUDE "data/mapObjects/pokemontower6.asm" -PokemonTower6Blocks: INCBIN "maps/pokemontower6.blk" +INCLUDE "data/mapHeaders/PokemonTower6F.asm" +INCLUDE "scripts/PokemonTower6F.asm" +INCLUDE "data/mapObjects/PokemonTower6F.asm" +PokemonTower6F_Blocks: INCBIN "maps/PokemonTower6F.blk" -INCBIN "maps/unusedblocks60cef.blk" + INCBIN "maps/UnusedEmptyMap.blk" -INCLUDE "data/mapHeaders/pokemontower7.asm" -INCLUDE "scripts/pokemontower7.asm" -INCLUDE "data/mapObjects/pokemontower7.asm" -PokemonTower7Blocks: INCBIN "maps/pokemontower7.blk" +INCLUDE "data/mapHeaders/PokemonTower7F.asm" +INCLUDE "scripts/PokemonTower7F.asm" +INCLUDE "data/mapObjects/PokemonTower7F.asm" +PokemonTower7F_Blocks: INCBIN "maps/PokemonTower7F.blk" INCLUDE "engine/overworld/cinnabar_lab.asm" -INCLUDE "data/mapHeaders/viridianforest.asm" -INCLUDE "scripts/viridianforest.asm" -INCLUDE "data/mapObjects/viridianforest.asm" - -INCLUDE "data/mapHeaders/ssanne1.asm" -INCLUDE "scripts/ssanne1.asm" -INCLUDE "data/mapObjects/ssanne1.asm" -SSAnne1Blocks: INCBIN "maps/ssanne1.blk" - -INCLUDE "data/mapHeaders/ssanne2.asm" -INCLUDE "scripts/ssanne2.asm" -INCLUDE "data/mapObjects/ssanne2.asm" -SSAnne2Blocks: INCBIN "maps/ssanne2.blk" - -INCLUDE "data/mapHeaders/ssanne4.asm" -INCLUDE "scripts/ssanne4.asm" -INCLUDE "data/mapObjects/ssanne4.asm" -SSAnne4Blocks: INCBIN "maps/ssanne4.blk" - -INCLUDE "data/mapHeaders/ssanne5.asm" -INCLUDE "scripts/ssanne5.asm" -INCLUDE "data/mapObjects/ssanne5.asm" -SSAnne5Blocks: INCBIN "maps/ssanne5.blk" - -INCLUDE "data/mapHeaders/ssanne6.asm" -INCLUDE "scripts/ssanne6.asm" -INCLUDE "data/mapObjects/ssanne6.asm" -SSAnne6Blocks: INCBIN "maps/ssanne6.blk" - -INCLUDE "data/mapHeaders/ssanne7.asm" -INCLUDE "scripts/ssanne7.asm" -INCLUDE "data/mapObjects/ssanne7.asm" -SSAnne7Blocks: INCBIN "maps/ssanne7.blk" - -INCLUDE "data/mapHeaders/ssanne8.asm" -INCLUDE "scripts/ssanne8.asm" -INCLUDE "data/mapObjects/ssanne8.asm" -SSAnne8Blocks: INCBIN "maps/ssanne8.blk" - -INCLUDE "data/mapHeaders/ssanne9.asm" -INCLUDE "scripts/ssanne9.asm" -INCLUDE "data/mapObjects/ssanne9.asm" - -INCLUDE "data/mapHeaders/ssanne10.asm" -INCLUDE "scripts/ssanne10.asm" -INCLUDE "data/mapObjects/ssanne10.asm" - -INCLUDE "data/mapHeaders/undergroundpathns.asm" -INCLUDE "scripts/undergroundpathns.asm" -INCLUDE "data/mapObjects/undergroundpathns.asm" - -INCLUDE "data/mapHeaders/undergroundpathwe.asm" -INCLUDE "scripts/undergroundpathwe.asm" -INCLUDE "data/mapObjects/undergroundpathwe.asm" - -INCLUDE "data/mapHeaders/diglettscave.asm" -INCLUDE "scripts/diglettscave.asm" -INCLUDE "data/mapObjects/diglettscave.asm" -DiglettsCaveBlocks: INCBIN "maps/diglettscave.blk" - -INCLUDE "data/mapHeaders/silphco11.asm" -INCLUDE "scripts/silphco11.asm" -INCLUDE "data/mapObjects/silphco11.asm" -SilphCo11Blocks: INCBIN "maps/silphco11.blk" +INCLUDE "data/mapHeaders/ViridianForest.asm" +INCLUDE "scripts/ViridianForest.asm" +INCLUDE "data/mapObjects/ViridianForest.asm" + +INCLUDE "data/mapHeaders/SSAnne1F.asm" +INCLUDE "scripts/SSAnne1F.asm" +INCLUDE "data/mapObjects/SSAnne1F.asm" +SSAnne1F_Blocks: INCBIN "maps/SSAnne1F.blk" + +INCLUDE "data/mapHeaders/SSAnne2F.asm" +INCLUDE "scripts/SSAnne2F.asm" +INCLUDE "data/mapObjects/SSAnne2F.asm" +SSAnne2F_Blocks: INCBIN "maps/SSAnne2F.blk" + +INCLUDE "data/mapHeaders/SSAnneB1F.asm" +INCLUDE "scripts/SSAnneB1F.asm" +INCLUDE "data/mapObjects/SSAnneB1F.asm" +SSAnneB1F_Blocks: INCBIN "maps/SSAnneB1F.blk" + +INCLUDE "data/mapHeaders/SSAnneBow.asm" +INCLUDE "scripts/SSAnneBow.asm" +INCLUDE "data/mapObjects/SSAnneBow.asm" +SSAnneBow_Blocks: INCBIN "maps/SSAnneBow.blk" + +INCLUDE "data/mapHeaders/SSAnneKitchen.asm" +INCLUDE "scripts/SSAnneKitchen.asm" +INCLUDE "data/mapObjects/SSAnneKitchen.asm" +SSAnneKitchen_Blocks: INCBIN "maps/SSAnneKitchen.blk" + +INCLUDE "data/mapHeaders/SSAnneCaptainsRoom.asm" +INCLUDE "scripts/SSAnneCaptainsRoom.asm" +INCLUDE "data/mapObjects/SSAnneCaptainsRoom.asm" +SSAnneCaptainsRoom_Blocks: INCBIN "maps/SSAnneCaptainsRoom.blk" + +INCLUDE "data/mapHeaders/SSAnne1FRooms.asm" +INCLUDE "scripts/SSAnne1FRooms.asm" +INCLUDE "data/mapObjects/SSAnne1FRooms.asm" +SSAnne1FRooms_Blocks: INCBIN "maps/SSAnne1FRooms.blk" + +INCLUDE "data/mapHeaders/SSAnne2FRooms.asm" +INCLUDE "scripts/SSAnne2FRooms.asm" +INCLUDE "data/mapObjects/SSAnne2FRooms.asm" + +INCLUDE "data/mapHeaders/SSAnneB1FRooms.asm" +INCLUDE "scripts/SSAnneB1FRooms.asm" +INCLUDE "data/mapObjects/SSAnneB1FRooms.asm" + +INCLUDE "data/mapHeaders/UndergroundPathNorthSouth.asm" +INCLUDE "scripts/UndergroundPathNorthSouth.asm" +INCLUDE "data/mapObjects/UndergroundPathNorthSouth.asm" + +INCLUDE "data/mapHeaders/UndergroundPathWestEast.asm" +INCLUDE "scripts/UndergroundPathWestEast.asm" +INCLUDE "data/mapObjects/UndergroundPathWestEast.asm" + +INCLUDE "data/mapHeaders/DiglettsCave.asm" +INCLUDE "scripts/DiglettsCave.asm" +INCLUDE "data/mapObjects/DiglettsCave.asm" +DiglettsCave_Blocks: INCBIN "maps/DiglettsCave.blk" + +INCLUDE "data/mapHeaders/SilphCo11F.asm" +INCLUDE "scripts/SilphCo11F.asm" +INCLUDE "data/mapObjects/SilphCo11F.asm" +SilphCo11F_Blocks: INCBIN "maps/SilphCo11F.blk" INCLUDE "engine/hidden_object_functions18.asm" @@ -1758,19 +1783,21 @@ INCLUDE "engine/hidden_object_functions18.asm" SECTION "bank19", ROMX Overworld_GFX: INCBIN "gfx/tilesets/overworld.2bpp" -ds 32 + ds 32 Overworld_Block: INCBIN "gfx/blocksets/overworld.bst" + RedsHouse1_GFX: -RedsHouse2_GFX: INCBIN "gfx/tilesets/redshouse2.2bpp" -ds 16 +RedsHouse2_GFX: INCBIN "gfx/tilesets/reds_house.2bpp" + ds 16 RedsHouse1_Block: -RedsHouse2_Block: INCBIN "gfx/blocksets/redshouse2.bst" +RedsHouse2_Block: INCBIN "gfx/blocksets/reds_house.bst" + House_GFX: INCBIN "gfx/tilesets/house.2bpp" House_Block: INCBIN "gfx/blocksets/house.bst" Mansion_GFX: INCBIN "gfx/tilesets/mansion.2bpp" Mansion_Block: INCBIN "gfx/blocksets/mansion.bst" -ShipPort_GFX: INCBIN "gfx/tilesets/shipport.2bpp" -ShipPort_Block: INCBIN "gfx/blocksets/shipport.bst" +ShipPort_GFX: INCBIN "gfx/tilesets/ship_port.2bpp" +ShipPort_Block: INCBIN "gfx/blocksets/ship_port.bst" Interior_GFX: INCBIN "gfx/tilesets/interior.2bpp" Interior_Block: INCBIN "gfx/blocksets/interior.bst" Plateau_GFX: INCBIN "gfx/tilesets/plateau.2bpp" @@ -1785,16 +1812,19 @@ Dojo_GFX: Gym_GFX: INCBIN "gfx/tilesets/gym.2bpp" Dojo_Block: Gym_Block: INCBIN "gfx/blocksets/gym.bst" + Mart_GFX: Pokecenter_GFX: INCBIN "gfx/tilesets/pokecenter.2bpp" Mart_Block: Pokecenter_Block: INCBIN "gfx/blocksets/pokecenter.bst" + ForestGate_GFX: -Gate_GFX: -Museum_GFX: INCBIN "gfx/tilesets/museum.2bpp" +Museum_GFX: +Gate_GFX: INCBIN "gfx/tilesets/gate.2bpp" ForestGate_Block: -Gate_Block: -Museum_Block: INCBIN "gfx/blocksets/museum.bst" +Museum_Block: +Gate_Block: INCBIN "gfx/blocksets/gate.bst" + Forest_GFX: INCBIN "gfx/tilesets/forest.2bpp" Forest_Block: INCBIN "gfx/blocksets/forest.bst" Facility_GFX: INCBIN "gfx/tilesets/facility.2bpp" @@ -1836,122 +1866,127 @@ INCLUDE "engine/save.asm" SECTION "bank1D", ROMX -CopycatsHouse1FBlocks: INCBIN "maps/copycatshouse1f.blk" -PewterMartBlocks: -CinnabarMartBlocks: INCBIN "maps/pewtermart.blk" -FuchsiaHouse1Blocks: INCBIN "maps/fuchsiahouse1.blk" -FuchsiaPokecenterBlocks: -CinnabarPokecenterBlocks: INCBIN "maps/fuchsiapokecenter.blk" -CeruleanHouse2Blocks: INCBIN "maps/ceruleanhouse2.blk" +CopycatsHouse1F_Blocks: INCBIN "maps/CopycatsHouse1F.blk" + +CinnabarMart_Blocks: +PewterMart_Blocks: INCBIN "maps/PewterMart.blk" + +FuchsiaBillsGrandpasHouse_Blocks: INCBIN "maps/FuchsiaBillsGrandpasHouse.blk" + +CinnabarPokecenter_Blocks: +FuchsiaPokecenter_Blocks: INCBIN "maps/FuchsiaPokecenter.blk" + +CeruleanBadgeHouse_Blocks: INCBIN "maps/CeruleanBadgeHouse.blk" INCLUDE "engine/items/itemfinder.asm" -INCLUDE "scripts/ceruleancity2.asm" -INCLUDE "data/mapHeaders/viridiangym.asm" -INCLUDE "scripts/viridiangym.asm" -INCLUDE "data/mapObjects/viridiangym.asm" -ViridianGymBlocks: INCBIN "maps/viridiangym.blk" +INCLUDE "scripts/CeruleanCity_2.asm" + +INCLUDE "data/mapHeaders/ViridianGym.asm" +INCLUDE "scripts/ViridianGym.asm" +INCLUDE "data/mapObjects/ViridianGym.asm" +ViridianGym_Blocks: INCBIN "maps/ViridianGym.blk" -INCLUDE "data/mapHeaders/pewtermart.asm" -INCLUDE "scripts/pewtermart.asm" -INCLUDE "data/mapObjects/pewtermart.asm" +INCLUDE "data/mapHeaders/PewterMart.asm" +INCLUDE "scripts/PewterMart.asm" +INCLUDE "data/mapObjects/PewterMart.asm" -INCLUDE "data/mapHeaders/unknowndungeon1.asm" -INCLUDE "scripts/unknowndungeon1.asm" -INCLUDE "data/mapObjects/unknowndungeon1.asm" -UnknownDungeon1Blocks: INCBIN "maps/unknowndungeon1.blk" +INCLUDE "data/mapHeaders/CeruleanCave1F.asm" +INCLUDE "scripts/CeruleanCave1F.asm" +INCLUDE "data/mapObjects/CeruleanCave1F.asm" +CeruleanCave1F_Blocks: INCBIN "maps/CeruleanCave1F.blk" -INCLUDE "data/mapHeaders/ceruleanhouse2.asm" -INCLUDE "scripts/ceruleanhouse2.asm" -INCLUDE "data/mapObjects/ceruleanhouse2.asm" +INCLUDE "data/mapHeaders/CeruleanBadgeHouse.asm" +INCLUDE "scripts/CeruleanBadgeHouse.asm" +INCLUDE "data/mapObjects/CeruleanBadgeHouse.asm" INCLUDE "engine/menu/vending_machine.asm" -INCLUDE "data/mapHeaders/fuchsiahouse1.asm" -INCLUDE "scripts/fuchsiahouse1.asm" -INCLUDE "data/mapObjects/fuchsiahouse1.asm" - -INCLUDE "data/mapHeaders/fuchsiapokecenter.asm" -INCLUDE "scripts/fuchsiapokecenter.asm" -INCLUDE "data/mapObjects/fuchsiapokecenter.asm" - -INCLUDE "data/mapHeaders/fuchsiahouse2.asm" -INCLUDE "scripts/fuchsiahouse2.asm" -INCLUDE "data/mapObjects/fuchsiahouse2.asm" -FuchsiaHouse2Blocks: INCBIN "maps/fuchsiahouse2.blk" - -INCLUDE "data/mapHeaders/safarizoneentrance.asm" -INCLUDE "data/mapObjects/safarizoneentrance.asm" -SafariZoneEntranceBlocks: INCBIN "maps/safarizoneentrance.blk" -INCLUDE "scripts/safarizoneentrance.asm" - -INCLUDE "data/mapHeaders/fuchsiagym.asm" -INCLUDE "scripts/fuchsiagym.asm" -INCLUDE "data/mapObjects/fuchsiagym.asm" -FuchsiaGymBlocks: INCBIN "maps/fuchsiagym.blk" - -INCLUDE "data/mapHeaders/fuchsiameetingroom.asm" -INCLUDE "scripts/fuchsiameetingroom.asm" -INCLUDE "data/mapObjects/fuchsiameetingroom.asm" -FuchsiaMeetingRoomBlocks: INCBIN "maps/fuchsiameetingroom.blk" - -INCLUDE "data/mapHeaders/cinnabargym.asm" -INCLUDE "scripts/cinnabargym.asm" -INCLUDE "data/mapObjects/cinnabargym.asm" -CinnabarGymBlocks: INCBIN "maps/cinnabargym.blk" -INCLUDE "scripts/cinnabargym2.asm" - -INCLUDE "data/mapHeaders/lab1.asm" -INCLUDE "scripts/lab1.asm" -INCLUDE "data/mapObjects/lab1.asm" -Lab1Blocks: INCBIN "maps/lab1.blk" - -INCLUDE "data/mapHeaders/lab2.asm" -INCLUDE "scripts/lab2.asm" -INCLUDE "data/mapObjects/lab2.asm" -Lab2Blocks: INCBIN "maps/lab2.blk" - -INCLUDE "data/mapHeaders/lab3.asm" -INCLUDE "scripts/lab3.asm" -INCLUDE "data/mapObjects/lab3.asm" -Lab3Blocks: INCBIN "maps/lab3.blk" - -INCLUDE "data/mapHeaders/lab4.asm" -INCLUDE "scripts/lab4.asm" -INCLUDE "data/mapObjects/lab4.asm" -Lab4Blocks: INCBIN "maps/lab4.blk" - -INCLUDE "data/mapHeaders/cinnabarpokecenter.asm" -INCLUDE "scripts/cinnabarpokecenter.asm" -INCLUDE "data/mapObjects/cinnabarpokecenter.asm" - -INCLUDE "data/mapHeaders/cinnabarmart.asm" -INCLUDE "scripts/cinnabarmart.asm" -INCLUDE "data/mapObjects/cinnabarmart.asm" - -INCLUDE "data/mapHeaders/copycatshouse1f.asm" -INCLUDE "scripts/copycatshouse1f.asm" -INCLUDE "data/mapObjects/copycatshouse1f.asm" - -INCLUDE "data/mapHeaders/gary.asm" -INCLUDE "scripts/gary.asm" -INCLUDE "data/mapObjects/gary.asm" -GaryBlocks: INCBIN "maps/gary.blk" - -INCLUDE "data/mapHeaders/lorelei.asm" -INCLUDE "scripts/lorelei.asm" -INCLUDE "data/mapObjects/lorelei.asm" -LoreleiBlocks: INCBIN "maps/lorelei.blk" - -INCLUDE "data/mapHeaders/bruno.asm" -INCLUDE "scripts/bruno.asm" -INCLUDE "data/mapObjects/bruno.asm" -BrunoBlocks: INCBIN "maps/bruno.blk" - -INCLUDE "data/mapHeaders/agatha.asm" -INCLUDE "scripts/agatha.asm" -INCLUDE "data/mapObjects/agatha.asm" -AgathaBlocks: INCBIN "maps/agatha.blk" +INCLUDE "data/mapHeaders/FuchsiaBillsGrandpasHouse.asm" +INCLUDE "scripts/FuchsiaBillsGrandpasHouse.asm" +INCLUDE "data/mapObjects/FuchsiaBillsGrandpasHouse.asm" + +INCLUDE "data/mapHeaders/FuchsiaPokecenter.asm" +INCLUDE "scripts/FuchsiaPokecenter.asm" +INCLUDE "data/mapObjects/FuchsiaPokecenter.asm" + +INCLUDE "data/mapHeaders/WardensHouse.asm" +INCLUDE "scripts/WardensHouse.asm" +INCLUDE "data/mapObjects/WardensHouse.asm" +WardensHouse_Blocks: INCBIN "maps/WardensHouse.blk" + +INCLUDE "data/mapHeaders/SafariZoneGate.asm" +INCLUDE "data/mapObjects/SafariZoneGate.asm" +SafariZoneGate_Blocks: INCBIN "maps/SafariZoneGate.blk" +INCLUDE "scripts/SafariZoneGate.asm" + +INCLUDE "data/mapHeaders/FuchsiaGym.asm" +INCLUDE "scripts/FuchsiaGym.asm" +INCLUDE "data/mapObjects/FuchsiaGym.asm" +FuchsiaGym_Blocks: INCBIN "maps/FuchsiaGym.blk" + +INCLUDE "data/mapHeaders/FuchsiaMeetingRoom.asm" +INCLUDE "scripts/FuchsiaMeetingRoom.asm" +INCLUDE "data/mapObjects/FuchsiaMeetingRoom.asm" +FuchsiaMeetingRoom_Blocks: INCBIN "maps/FuchsiaMeetingRoom.blk" + +INCLUDE "data/mapHeaders/CinnabarGym.asm" +INCLUDE "scripts/CinnabarGym.asm" +INCLUDE "data/mapObjects/CinnabarGym.asm" +CinnabarGym_Blocks: INCBIN "maps/CinnabarGym.blk" +INCLUDE "scripts/CinnabarGym_2.asm" + +INCLUDE "data/mapHeaders/CinnabarLab.asm" +INCLUDE "scripts/CinnabarLab.asm" +INCLUDE "data/mapObjects/CinnabarLab.asm" +CinnabarLab_Blocks: INCBIN "maps/CinnabarLab.blk" + +INCLUDE "data/mapHeaders/CinnabarLabTradeRoom.asm" +INCLUDE "scripts/CinnabarLabTradeRoom.asm" +INCLUDE "data/mapObjects/CinnabarLabTradeRoom.asm" +CinnabarLabTradeRoom_Blocks: INCBIN "maps/CinnabarLabTradeRoom.blk" + +INCLUDE "data/mapHeaders/CinnabarLabMetronomeRoom.asm" +INCLUDE "scripts/CinnabarLabMetronomeRoom.asm" +INCLUDE "data/mapObjects/CinnabarLabMetronomeRoom.asm" +CinnabarLabMetronomeRoom_Blocks: INCBIN "maps/CinnabarLabMetronomeRoom.blk" + +INCLUDE "data/mapHeaders/CinnabarLabFossilRoom.asm" +INCLUDE "scripts/CinnabarLabFossilRoom.asm" +INCLUDE "data/mapObjects/CinnabarLabFossilRoom.asm" +CinnabarLabFossilRoom_Blocks: INCBIN "maps/CinnabarLabFossilRoom.blk" + +INCLUDE "data/mapHeaders/CinnabarPokecenter.asm" +INCLUDE "scripts/CinnabarPokecenter.asm" +INCLUDE "data/mapObjects/CinnabarPokecenter.asm" + +INCLUDE "data/mapHeaders/CinnabarMart.asm" +INCLUDE "scripts/CinnabarMart.asm" +INCLUDE "data/mapObjects/CinnabarMart.asm" + +INCLUDE "data/mapHeaders/CopycatsHouse1F.asm" +INCLUDE "scripts/CopycatsHouse1F.asm" +INCLUDE "data/mapObjects/CopycatsHouse1F.asm" + +INCLUDE "data/mapHeaders/ChampionsRoom.asm" +INCLUDE "scripts/ChampionsRoom.asm" +INCLUDE "data/mapObjects/ChampionsRoom.asm" +ChampionsRoom_Blocks: INCBIN "maps/ChampionsRoom.blk" + +INCLUDE "data/mapHeaders/LoreleisRoom.asm" +INCLUDE "scripts/LoreleisRoom.asm" +INCLUDE "data/mapObjects/LoreleisRoom.asm" +LoreleisRoom_Blocks: INCBIN "maps/LoreleisRoom.blk" + +INCLUDE "data/mapHeaders/BrunosRoom.asm" +INCLUDE "scripts/BrunosRoom.asm" +INCLUDE "data/mapObjects/BrunosRoom.asm" +BrunosRoom_Blocks: INCBIN "maps/BrunosRoom.blk" + +INCLUDE "data/mapHeaders/AgathasRoom.asm" +INCLUDE "scripts/AgathasRoom.asm" +INCLUDE "data/mapObjects/AgathasRoom.asm" +AgathasRoom_Blocks: INCBIN "maps/AgathasRoom.blk" INCLUDE "engine/menu/league_pc.asm" |