From bf138d94d42ba0d092d5028e40a85260c250a4ee Mon Sep 17 00:00:00 2001 From: Rangi Date: Sat, 3 Feb 2018 16:20:19 -0500 Subject: [PATCH] =?UTF-8?q?scene=5Fdef=20=E2=86=92=20scene=5Fvar=20(for=20?= =?UTF-8?q?"variable",=20like=20loadvar,=20copybytetovar,=20etc)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/maps/scenes.asm | 163 +++++++++++++++++++++---------------------- 1 file changed, 81 insertions(+), 82 deletions(-) diff --git a/data/maps/scenes.asm b/data/maps/scenes.asm index 0971208f1..e66b61a99 100644 --- a/data/maps/scenes.asm +++ b/data/maps/scenes.asm @@ -1,89 +1,88 @@ -scene_def: MACRO -; db group, map -; dw address +scene_var: MACRO +; map, variable map \1 dw \2 ENDM MapScenes:: ; 4d01e - scene_def POKECENTER_2F, wPokecenter2FSceneID - scene_def TRADE_CENTER, wTradeCenterSceneID - scene_def COLOSSEUM, wColosseumSceneID - scene_def TIME_CAPSULE, wTimeCapsuleSceneID - scene_def POWER_PLANT, wPowerPlantSceneID - scene_def CERULEAN_GYM, wCeruleanGymSceneID - scene_def ROUTE_25, wRoute25SceneID - scene_def TRAINER_HOUSE_B1F, wTrainerHouseB1FSceneID - scene_def VICTORY_ROAD_GATE, wVictoryRoadGateSceneID - scene_def SAFFRON_MAGNET_TRAIN_STATION, wSaffronMagnetTrainStationSceneID - scene_def ROUTE_16_GATE, wRoute16GateSceneID - scene_def ROUTE_17_ROUTE_18_GATE, wRoute17Route18GateSceneID - scene_def INDIGO_PLATEAU_POKECENTER_1F, wIndigoPlateauPokecenter1FSceneID - scene_def WILLS_ROOM, wWillsRoomSceneID - scene_def KOGAS_ROOM, wKogasRoomSceneID - scene_def BRUNOS_ROOM, wBrunosRoomSceneID - scene_def KARENS_ROOM, wKarensRoomSceneID - scene_def LANCES_ROOM, wLancesRoomSceneID - scene_def HALL_OF_FAME, wHallOfFameSceneID - scene_def ROUTE_27, wRoute27SceneID - scene_def NEW_BARK_TOWN, wNewBarkTownSceneID - scene_def ELMS_LAB, wElmsLabSceneID - scene_def PLAYERS_HOUSE_1F, wPlayersHouse1FSceneID - scene_def ROUTE_29, wRoute29SceneID - scene_def CHERRYGROVE_CITY, wCherrygroveCitySceneID - scene_def MR_POKEMONS_HOUSE, wMrPokemonsHouseSceneID - scene_def ROUTE_32, wRoute32SceneID - scene_def ROUTE_35_NATIONAL_PARK_GATE, wRoute35NationalParkGateSceneID - scene_def ROUTE_36, wRoute36SceneID - scene_def ROUTE_36_NATIONAL_PARK_GATE, wRoute36NationalParkGateSceneID - scene_def AZALEA_TOWN, wAzaleaTownSceneID - scene_def GOLDENROD_GYM, wGoldenrodGymSceneID - scene_def GOLDENROD_MAGNET_TRAIN_STATION, wGoldenrodMagnetTrainStationSceneID - scene_def GOLDENROD_POKECENTER_1F, wGoldenrodPokecenter1FSceneID - scene_def OLIVINE_CITY, wOlivineCitySceneID - scene_def ROUTE_34, wRoute34SceneID ; unused - scene_def ROUTE_34_ILEX_FOREST_GATE, wRoute34IlexForestGateSceneID ; unused - scene_def ECRUTEAK_TIN_TOWER_ENTRANCE, wEcruteakTinTowerEntranceSceneID - scene_def WISE_TRIOS_ROOM, wWiseTriosRoomSceneID - scene_def ECRUTEAK_POKECENTER_1F, wEcruteakPokecenter1FSceneID - scene_def ECRUTEAK_GYM, wEcruteakGymSceneID - scene_def MAHOGANY_TOWN, wMahoganyTownSceneID - scene_def ROUTE_42, wRoute42SceneID - scene_def CIANWOOD_CITY, wCianwoodCitySceneID - scene_def BATTLE_TOWER_1F, wBattleTower1FSceneID - scene_def BATTLE_TOWER_BATTLE_ROOM, wBattleTowerBattleRoomSceneID - scene_def BATTLE_TOWER_ELEVATOR, wBattleTowerElevatorSceneID - scene_def BATTLE_TOWER_HALLWAY, wBattleTowerHallwaySceneID - scene_def BATTLE_TOWER_OUTSIDE, wBattleTowerOutsideSceneID ; unused - scene_def ROUTE_43_GATE, wRoute43GateSceneID - scene_def MOUNT_MOON, wMountMoonSceneID - scene_def SPROUT_TOWER_3F, wSproutTower3FSceneID - scene_def TIN_TOWER_1F, wTinTower1FSceneID - scene_def BURNED_TOWER_1F, wBurnedTower1FSceneID - scene_def BURNED_TOWER_B1F, wBurnedTowerB1FSceneID - scene_def RADIO_TOWER_5F, wRadioTower5FSceneID - scene_def RUINS_OF_ALPH_OUTSIDE, wRuinsOfAlphOutsideSceneID - scene_def RUINS_OF_ALPH_RESEARCH_CENTER, wRuinsOfAlphResearchCenterSceneID - scene_def RUINS_OF_ALPH_HO_OH_CHAMBER, wRuinsOfAlphHoOhChamberSceneID - scene_def RUINS_OF_ALPH_KABUTO_CHAMBER, wRuinsOfAlphKabutoChamberSceneID - scene_def RUINS_OF_ALPH_OMANYTE_CHAMBER, wRuinsOfAlphOmanyteChamberSceneID - scene_def RUINS_OF_ALPH_AERODACTYL_CHAMBER, wRuinsOfAlphAerodactylChamberSceneID - scene_def RUINS_OF_ALPH_INNER_CHAMBER, wRuinsOfAlphInnerChamberSceneID - scene_def MAHOGANY_MART_1F, wMahoganyMart1FSceneID - scene_def TEAM_ROCKET_BASE_B1F, wTeamRocketBaseB1FSceneID - scene_def TEAM_ROCKET_BASE_B2F, wTeamRocketBaseB2FSceneID - scene_def TEAM_ROCKET_BASE_B3F, wTeamRocketBaseB3FSceneID - scene_def GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES, wGoldenrodUndergroundSwitchRoomEntrancesSceneID - scene_def SILVER_CAVE_ROOM_3, wSilverCaveRoom3SceneID ; unused - scene_def VICTORY_ROAD, wVictoryRoadSceneID - scene_def DRAGONS_DEN_B1F, wDragonsDenB1FSceneID - scene_def DRAGON_SHRINE, wDragonShrineSceneID - scene_def OLIVINE_PORT, wOlivinePortSceneID - scene_def VERMILION_PORT, wVermilionPortSceneID - scene_def FAST_SHIP_1F, wFastShip1FSceneID - scene_def FAST_SHIP_B1F, wFastShipB1FSceneID - scene_def MOUNT_MOON_SQUARE, wMountMoonSquareSceneID - scene_def MOBILE_TRADE_ROOM, wMobileTradeRoomSceneID - scene_def MOBILE_BATTLE_ROOM, wMobileBattleRoomSceneID + scene_var POKECENTER_2F, wPokecenter2FSceneID + scene_var TRADE_CENTER, wTradeCenterSceneID + scene_var COLOSSEUM, wColosseumSceneID + scene_var TIME_CAPSULE, wTimeCapsuleSceneID + scene_var POWER_PLANT, wPowerPlantSceneID + scene_var CERULEAN_GYM, wCeruleanGymSceneID + scene_var ROUTE_25, wRoute25SceneID + scene_var TRAINER_HOUSE_B1F, wTrainerHouseB1FSceneID + scene_var VICTORY_ROAD_GATE, wVictoryRoadGateSceneID + scene_var SAFFRON_MAGNET_TRAIN_STATION, wSaffronMagnetTrainStationSceneID + scene_var ROUTE_16_GATE, wRoute16GateSceneID + scene_var ROUTE_17_ROUTE_18_GATE, wRoute17Route18GateSceneID + scene_var INDIGO_PLATEAU_POKECENTER_1F, wIndigoPlateauPokecenter1FSceneID + scene_var WILLS_ROOM, wWillsRoomSceneID + scene_var KOGAS_ROOM, wKogasRoomSceneID + scene_var BRUNOS_ROOM, wBrunosRoomSceneID + scene_var KARENS_ROOM, wKarensRoomSceneID + scene_var LANCES_ROOM, wLancesRoomSceneID + scene_var HALL_OF_FAME, wHallOfFameSceneID + scene_var ROUTE_27, wRoute27SceneID + scene_var NEW_BARK_TOWN, wNewBarkTownSceneID + scene_var ELMS_LAB, wElmsLabSceneID + scene_var PLAYERS_HOUSE_1F, wPlayersHouse1FSceneID + scene_var ROUTE_29, wRoute29SceneID + scene_var CHERRYGROVE_CITY, wCherrygroveCitySceneID + scene_var MR_POKEMONS_HOUSE, wMrPokemonsHouseSceneID + scene_var ROUTE_32, wRoute32SceneID + scene_var ROUTE_35_NATIONAL_PARK_GATE, wRoute35NationalParkGateSceneID + scene_var ROUTE_36, wRoute36SceneID + scene_var ROUTE_36_NATIONAL_PARK_GATE, wRoute36NationalParkGateSceneID + scene_var AZALEA_TOWN, wAzaleaTownSceneID + scene_var GOLDENROD_GYM, wGoldenrodGymSceneID + scene_var GOLDENROD_MAGNET_TRAIN_STATION, wGoldenrodMagnetTrainStationSceneID + scene_var GOLDENROD_POKECENTER_1F, wGoldenrodPokecenter1FSceneID + scene_var OLIVINE_CITY, wOlivineCitySceneID + scene_var ROUTE_34, wRoute34SceneID ; unused + scene_var ROUTE_34_ILEX_FOREST_GATE, wRoute34IlexForestGateSceneID ; unused + scene_var ECRUTEAK_TIN_TOWER_ENTRANCE, wEcruteakTinTowerEntranceSceneID + scene_var WISE_TRIOS_ROOM, wWiseTriosRoomSceneID + scene_var ECRUTEAK_POKECENTER_1F, wEcruteakPokecenter1FSceneID + scene_var ECRUTEAK_GYM, wEcruteakGymSceneID + scene_var MAHOGANY_TOWN, wMahoganyTownSceneID + scene_var ROUTE_42, wRoute42SceneID + scene_var CIANWOOD_CITY, wCianwoodCitySceneID + scene_var BATTLE_TOWER_1F, wBattleTower1FSceneID + scene_var BATTLE_TOWER_BATTLE_ROOM, wBattleTowerBattleRoomSceneID + scene_var BATTLE_TOWER_ELEVATOR, wBattleTowerElevatorSceneID + scene_var BATTLE_TOWER_HALLWAY, wBattleTowerHallwaySceneID + scene_var BATTLE_TOWER_OUTSIDE, wBattleTowerOutsideSceneID ; unused + scene_var ROUTE_43_GATE, wRoute43GateSceneID + scene_var MOUNT_MOON, wMountMoonSceneID + scene_var SPROUT_TOWER_3F, wSproutTower3FSceneID + scene_var TIN_TOWER_1F, wTinTower1FSceneID + scene_var BURNED_TOWER_1F, wBurnedTower1FSceneID + scene_var BURNED_TOWER_B1F, wBurnedTowerB1FSceneID + scene_var RADIO_TOWER_5F, wRadioTower5FSceneID + scene_var RUINS_OF_ALPH_OUTSIDE, wRuinsOfAlphOutsideSceneID + scene_var RUINS_OF_ALPH_RESEARCH_CENTER, wRuinsOfAlphResearchCenterSceneID + scene_var RUINS_OF_ALPH_HO_OH_CHAMBER, wRuinsOfAlphHoOhChamberSceneID + scene_var RUINS_OF_ALPH_KABUTO_CHAMBER, wRuinsOfAlphKabutoChamberSceneID + scene_var RUINS_OF_ALPH_OMANYTE_CHAMBER, wRuinsOfAlphOmanyteChamberSceneID + scene_var RUINS_OF_ALPH_AERODACTYL_CHAMBER, wRuinsOfAlphAerodactylChamberSceneID + scene_var RUINS_OF_ALPH_INNER_CHAMBER, wRuinsOfAlphInnerChamberSceneID + scene_var MAHOGANY_MART_1F, wMahoganyMart1FSceneID + scene_var TEAM_ROCKET_BASE_B1F, wTeamRocketBaseB1FSceneID + scene_var TEAM_ROCKET_BASE_B2F, wTeamRocketBaseB2FSceneID + scene_var TEAM_ROCKET_BASE_B3F, wTeamRocketBaseB3FSceneID + scene_var GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES, wGoldenrodUndergroundSwitchRoomEntrancesSceneID + scene_var SILVER_CAVE_ROOM_3, wSilverCaveRoom3SceneID ; unused + scene_var VICTORY_ROAD, wVictoryRoadSceneID + scene_var DRAGONS_DEN_B1F, wDragonsDenB1FSceneID + scene_var DRAGON_SHRINE, wDragonShrineSceneID + scene_var OLIVINE_PORT, wOlivinePortSceneID + scene_var VERMILION_PORT, wVermilionPortSceneID + scene_var FAST_SHIP_1F, wFastShip1FSceneID + scene_var FAST_SHIP_B1F, wFastShipB1FSceneID + scene_var MOUNT_MOON_SQUARE, wMountMoonSquareSceneID + scene_var MOBILE_TRADE_ROOM, wMobileTradeRoomSceneID + scene_var MOBILE_BATTLE_ROOM, wMobileBattleRoomSceneID db -1 ; 4d15b