diff options
| -rw-r--r-- | main.asm | 167 | ||||
| -rw-r--r-- | wram.asm | 83 |
2 files changed, 170 insertions, 80 deletions
@@ -53817,86 +53817,93 @@ Function4cffe:: ; 4cffe Unknown_4d01e:: ; 4d01e ; Map triggers -; dbbw group, map, address - dbbw GROUP_POKECENTER_2F, MAP_POKECENTER_2F, $d972 - dbbw GROUP_TRADE_CENTER, MAP_TRADE_CENTER, $d973 - dbbw GROUP_COLOSSEUM, MAP_COLOSSEUM, $d974 - dbbw GROUP_TIME_CAPSULE, MAP_TIME_CAPSULE, $d975 - dbbw GROUP_POWER_PLANT, MAP_POWER_PLANT, $d976 - dbbw GROUP_CERULEAN_GYM, MAP_CERULEAN_GYM, $d977 - dbbw GROUP_ROUTE_25, MAP_ROUTE_25, $d978 - dbbw GROUP_TRAINER_HOUSE_B1F, MAP_TRAINER_HOUSE_B1F, $d979 - dbbw GROUP_VICTORY_ROAD_GATE, MAP_VICTORY_ROAD_GATE, $d97a - dbbw GROUP_SAFFRON_TRAIN_STATION, MAP_SAFFRON_TRAIN_STATION, $d97b - dbbw GROUP_ROUTE_16_GATE, MAP_ROUTE_16_GATE, $d97c - dbbw GROUP_ROUTE_17_18_GATE, MAP_ROUTE_17_18_GATE, $d97d - dbbw GROUP_INDIGO_PLATEAU_POKECENTER_1F, MAP_INDIGO_PLATEAU_POKECENTER_1F, $d97e - dbbw GROUP_WILLS_ROOM, MAP_WILLS_ROOM, $d97f - dbbw GROUP_KOGAS_ROOM, MAP_KOGAS_ROOM, $d980 - dbbw GROUP_BRUNOS_ROOM, MAP_BRUNOS_ROOM, $d981 - dbbw GROUP_KARENS_ROOM, MAP_KARENS_ROOM, $d982 - dbbw GROUP_LANCES_ROOM, MAP_LANCES_ROOM, $d983 - dbbw GROUP_HALL_OF_FAME, MAP_HALL_OF_FAME, $d984 - dbbw GROUP_ROUTE_27, MAP_ROUTE_27, $d985 - dbbw GROUP_NEW_BARK_TOWN, MAP_NEW_BARK_TOWN, $d986 - dbbw GROUP_ELMS_LAB, MAP_ELMS_LAB, $d987 - dbbw GROUP_KRISS_HOUSE_1F, MAP_KRISS_HOUSE_1F, $d988 - dbbw GROUP_ROUTE_29, MAP_ROUTE_29, $d989 - dbbw GROUP_CHERRYGROVE_CITY, MAP_CHERRYGROVE_CITY, $d98a - dbbw GROUP_MR_POKEMONS_HOUSE, MAP_MR_POKEMONS_HOUSE, $d98b - dbbw GROUP_ROUTE_32, MAP_ROUTE_32, $d98c - dbbw GROUP_ROUTE_35_NATIONAL_PARK_GATE, MAP_ROUTE_35_NATIONAL_PARK_GATE, $d98d - dbbw GROUP_ROUTE_36, MAP_ROUTE_36, $d98e - dbbw GROUP_ROUTE_36_NATIONAL_PARK_GATE, MAP_ROUTE_36_NATIONAL_PARK_GATE, $d98f - dbbw GROUP_AZALEA_TOWN, MAP_AZALEA_TOWN, $d990 - dbbw GROUP_GOLDENROD_GYM, MAP_GOLDENROD_GYM, $d991 - dbbw GROUP_GOLDENROD_MAGNET_TRAIN_STATION, MAP_GOLDENROD_MAGNET_TRAIN_STATION, $d992 - dbbw GROUP_GOLDENROD_POKECENTER_1F, MAP_GOLDENROD_POKECENTER_1F, $d993 - dbbw GROUP_OLIVINE_CITY, MAP_OLIVINE_CITY, $d994 - dbbw GROUP_ROUTE_34, MAP_ROUTE_34, $d995 - dbbw GROUP_ROUTE_34_ILEX_FOREST_GATE, MAP_ROUTE_34_ILEX_FOREST_GATE, $d996 - dbbw GROUP_ECRUTEAK_HOUSE, MAP_ECRUTEAK_HOUSE, $d997 - dbbw GROUP_WISE_TRIOS_ROOM, MAP_WISE_TRIOS_ROOM, $d998 - dbbw GROUP_ECRUTEAK_POKECENTER_1F, MAP_ECRUTEAK_POKECENTER_1F, $d999 - dbbw GROUP_ECRUTEAK_GYM, MAP_ECRUTEAK_GYM, $d99a - dbbw GROUP_MAHOGANY_TOWN, MAP_MAHOGANY_TOWN, $d99b - dbbw GROUP_ROUTE_42, MAP_ROUTE_42, $d99c - dbbw GROUP_CIANWOOD_CITY, MAP_CIANWOOD_CITY, $d99d - dbbw GROUP_BATTLE_TOWER_1F, MAP_BATTLE_TOWER_1F, $d99e - dbbw GROUP_BATTLE_TOWER_BATTLE_ROOM, MAP_BATTLE_TOWER_BATTLE_ROOM, $d99f - dbbw GROUP_BATTLE_TOWER_ELEVATOR, MAP_BATTLE_TOWER_ELEVATOR, $d9a0 - dbbw GROUP_BATTLE_TOWER_HALLWAY, MAP_BATTLE_TOWER_HALLWAY, $d9a1 - dbbw GROUP_BATTLE_TOWER_OUTSIDE, MAP_BATTLE_TOWER_OUTSIDE, $d9a2 - dbbw GROUP_ROUTE_43_GATE, MAP_ROUTE_43_GATE, $d9a3 - dbbw GROUP_MOUNT_MOON, MAP_MOUNT_MOON, $d9a4 - dbbw GROUP_SPROUT_TOWER_3F, MAP_SPROUT_TOWER_3F, $d9a5 - dbbw GROUP_TIN_TOWER_1F, MAP_TIN_TOWER_1F, $d9a6 - dbbw GROUP_BURNED_TOWER_1F, MAP_BURNED_TOWER_1F, $d9a7 - dbbw GROUP_BURNED_TOWER_B1F, MAP_BURNED_TOWER_B1F, $d9a8 - dbbw GROUP_RADIO_TOWER_5F, MAP_RADIO_TOWER_5F, $d9a9 - dbbw GROUP_RUINS_OF_ALPH_OUTSIDE, MAP_RUINS_OF_ALPH_OUTSIDE, $d9aa - dbbw GROUP_RUINS_OF_ALPH_RESEARCH_CENTER, MAP_RUINS_OF_ALPH_RESEARCH_CENTER, $d9ab - dbbw GROUP_RUINS_OF_ALPH_HO_OH_CHAMBER, MAP_RUINS_OF_ALPH_HO_OH_CHAMBER, $d9ac - dbbw GROUP_RUINS_OF_ALPH_KABUTO_CHAMBER, MAP_RUINS_OF_ALPH_KABUTO_CHAMBER, $d9ad - dbbw GROUP_RUINS_OF_ALPH_OMANYTE_CHAMBER, MAP_RUINS_OF_ALPH_OMANYTE_CHAMBER, $d9ae - dbbw GROUP_RUINS_OF_ALPH_AERODACTYL_CHAMBER, MAP_RUINS_OF_ALPH_AERODACTYL_CHAMBER, $d9af - dbbw GROUP_RUINS_OF_ALPH_INNER_CHAMBER, MAP_RUINS_OF_ALPH_INNER_CHAMBER, $d9b0 - dbbw GROUP_MAHOGANY_MART_1F, MAP_MAHOGANY_MART_1F, $d9b1 - dbbw GROUP_TEAM_ROCKET_BASE_B1F, MAP_TEAM_ROCKET_BASE_B1F, $d9b2 - dbbw GROUP_TEAM_ROCKET_BASE_B2F, MAP_TEAM_ROCKET_BASE_B2F, $d9b3 - dbbw GROUP_TEAM_ROCKET_BASE_B3F, MAP_TEAM_ROCKET_BASE_B3F, $d9b4 - dbbw GROUP_UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES, MAP_UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES, $d9b5 - dbbw GROUP_SILVER_CAVE_ROOM_3, MAP_SILVER_CAVE_ROOM_3, $d9b6 - dbbw GROUP_VICTORY_ROAD, MAP_VICTORY_ROAD, $d9b7 - dbbw GROUP_DRAGONS_DEN_B1F, MAP_DRAGONS_DEN_B1F, $d9b8 - dbbw GROUP_DRAGON_SHRINE, MAP_DRAGON_SHRINE, $d9b9 - dbbw GROUP_OLIVINE_PORT, MAP_OLIVINE_PORT, $d9ba - dbbw GROUP_VERMILION_PORT, MAP_VERMILION_PORT, $d9bb - dbbw GROUP_FAST_SHIP_1F, MAP_FAST_SHIP_1F, $d9bc - dbbw GROUP_FAST_SHIP_B1F, MAP_FAST_SHIP_B1F, $d9bd - dbbw GROUP_MOUNT_MOON_SQUARE, MAP_MOUNT_MOON_SQUARE, $d9be - dbbw GROUP_MOBILE_TRADE_ROOM_MOBILE, MAP_MOBILE_TRADE_ROOM_MOBILE, $d9bf - dbbw GROUP_MOBILE_BATTLE_ROOM, MAP_MOBILE_BATTLE_ROOM, $d9c0 + +trigger_def: MACRO +; db group, map +; dw address + map \1 + dw \2 +ENDM + + trigger_def POKECENTER_2F, wPokecenter2FTrigger + trigger_def TRADE_CENTER, wTradeCenterTrigger + trigger_def COLOSSEUM, wColosseumTrigger + trigger_def TIME_CAPSULE, wTimeCapsuleTrigger + trigger_def POWER_PLANT, wPowerPlantTrigger + trigger_def CERULEAN_GYM, wCeruleanGymTrigger + trigger_def ROUTE_25, wRoute25Trigger + trigger_def TRAINER_HOUSE_B1F, wTrainerHouseB1FTrigger + trigger_def VICTORY_ROAD_GATE, wVictoryRoadGateTrigger + trigger_def SAFFRON_TRAIN_STATION, wSaffronTrainStationTrigger + trigger_def ROUTE_16_GATE, wRoute16GateTrigger + trigger_def ROUTE_17_18_GATE, wRoute1718GateTrigger + trigger_def INDIGO_PLATEAU_POKECENTER_1F, wIndigoPlateauPokecenter1FTrigger + trigger_def WILLS_ROOM, wWillsRoomTrigger + trigger_def KOGAS_ROOM, wKogasRoomTrigger + trigger_def BRUNOS_ROOM, wBrunosRoomTrigger + trigger_def KARENS_ROOM, wKarensRoomTrigger + trigger_def LANCES_ROOM, wLancesRoomTrigger + trigger_def HALL_OF_FAME, wHallOfFameTrigger + trigger_def ROUTE_27, wRoute27Trigger + trigger_def NEW_BARK_TOWN, wNewBarkTownTrigger + trigger_def ELMS_LAB, wElmsLabTrigger + trigger_def KRISS_HOUSE_1F, wKrissHouse1FTrigger + trigger_def ROUTE_29, wRoute29Trigger + trigger_def CHERRYGROVE_CITY, wCherrygroveCityTrigger + trigger_def MR_POKEMONS_HOUSE, wMrPokemonsHouseTrigger + trigger_def ROUTE_32, wRoute32Trigger + trigger_def ROUTE_35_NATIONAL_PARK_GATE, wRoute35NationalParkGateTrigger + trigger_def ROUTE_36, wRoute36Trigger + trigger_def ROUTE_36_NATIONAL_PARK_GATE, wRoute36NationalParkGateTrigger + trigger_def AZALEA_TOWN, wAzaleaTownTrigger + trigger_def GOLDENROD_GYM, wGoldenrodGymTrigger + trigger_def GOLDENROD_MAGNET_TRAIN_STATION, wGoldenrodMagnetTrainStationTrigger + trigger_def GOLDENROD_POKECENTER_1F, wGoldenrodPokecenter1FTrigger + trigger_def OLIVINE_CITY, wOlivineCityTrigger + trigger_def ROUTE_34, wRoute34Trigger + trigger_def ROUTE_34_ILEX_FOREST_GATE, wRoute34IlexForestGateTrigger + trigger_def ECRUTEAK_HOUSE, wEcruteakHouseTrigger + trigger_def WISE_TRIOS_ROOM, wWiseTriosRoomTrigger + trigger_def ECRUTEAK_POKECENTER_1F, wEcruteakPokecenter1FTrigger + trigger_def ECRUTEAK_GYM, wEcruteakGymTrigger + trigger_def MAHOGANY_TOWN, wMahoganyTownTrigger + trigger_def ROUTE_42, wRoute42Trigger + trigger_def CIANWOOD_CITY, wCianwoodCityTrigger + trigger_def BATTLE_TOWER_1F, wBattleTower1FTrigger + trigger_def BATTLE_TOWER_BATTLE_ROOM, wBattleTowerBattleRoomTrigger + trigger_def BATTLE_TOWER_ELEVATOR, wBattleTowerElevatorTrigger + trigger_def BATTLE_TOWER_HALLWAY, wBattleTowerHallwayTrigger + trigger_def BATTLE_TOWER_OUTSIDE, wBattleTowerOutsideTrigger + trigger_def ROUTE_43_GATE, wRoute43GateTrigger + trigger_def MOUNT_MOON, wMountMoonTrigger + trigger_def SPROUT_TOWER_3F, wSproutTower3FTrigger + trigger_def TIN_TOWER_1F, wTinTower1FTrigger + trigger_def BURNED_TOWER_1F, wBurnedTower1FTrigger + trigger_def BURNED_TOWER_B1F, wBurnedTowerB1FTrigger + trigger_def RADIO_TOWER_5F, wRadioTower5FTrigger + trigger_def RUINS_OF_ALPH_OUTSIDE, wRuinsOfAlphOutsideTrigger + trigger_def RUINS_OF_ALPH_RESEARCH_CENTER, wRuinsOfAlphResearchCenterTrigger + trigger_def RUINS_OF_ALPH_HO_OH_CHAMBER, wRuinsOfAlphHoOhChamberTrigger + trigger_def RUINS_OF_ALPH_KABUTO_CHAMBER, wRuinsOfAlphKabutoChamberTrigger + trigger_def RUINS_OF_ALPH_OMANYTE_CHAMBER, wRuinsOfAlphOmanyteChamberTrigger + trigger_def RUINS_OF_ALPH_AERODACTYL_CHAMBER, wRuinsOfAlphAerodactylChamberTrigger + trigger_def RUINS_OF_ALPH_INNER_CHAMBER, wRuinsOfAlphInnerChamberTrigger + trigger_def MAHOGANY_MART_1F, wMahoganyMart1FTrigger + trigger_def TEAM_ROCKET_BASE_B1F, wTeamRocketBaseB1FTrigger + trigger_def TEAM_ROCKET_BASE_B2F, wTeamRocketBaseB2FTrigger + trigger_def TEAM_ROCKET_BASE_B3F, wTeamRocketBaseB3FTrigger + trigger_def UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES, wUndergroundPathSwitchRoomEntrancesTrigger + trigger_def SILVER_CAVE_ROOM_3, wSilverCaveRoom3Trigger + trigger_def VICTORY_ROAD, wVictoryRoadTrigger + trigger_def DRAGONS_DEN_B1F, wDragonsDenB1FTrigger + trigger_def DRAGON_SHRINE, wDragonShrineTrigger + trigger_def OLIVINE_PORT, wOlivinePortTrigger + trigger_def VERMILION_PORT, wVermilionPortTrigger + trigger_def FAST_SHIP_1F, wFastShip1FTrigger + trigger_def FAST_SHIP_B1F, wFastShipB1FTrigger + trigger_def MOUNT_MOON_SQUARE, wMountMoonSquareTrigger + trigger_def MOBILE_TRADE_ROOM_MOBILE, wMobileTradeRoomMobileTrigger + trigger_def MOBILE_BATTLE_ROOM, wMobileBattleRoomTrigger db $ff ; 4d15b @@ -1782,6 +1782,89 @@ UndergroundSwitchPositions:: ; d963 FarfetchdPosition:: ; d964 ds 1 ; which position the ilex farfetch'd is in +SECTION "Map Triggers", WRAMX[$d972], BANK[1] + +wPokecenter2FTrigger:: ds 1 ; d972 +wTradeCenterTrigger:: ds 1 ; d973 +wColosseumTrigger:: ds 1 ; d974 +wTimeCapsuleTrigger:: ds 1 ; d975 +wPowerPlantTrigger:: ds 1 ; d976 +wCeruleanGymTrigger:: ds 1 ; d977 +wRoute25Trigger:: ds 1 ; d978 +wTrainerHouseB1FTrigger:: ds 1 ; d979 +wVictoryRoadGateTrigger:: ds 1 ; d97a +wSaffronTrainStationTrigger:: ds 1 ; d97b +wRoute16GateTrigger:: ds 1 ; d97c +wRoute1718GateTrigger:: ds 1 ; d97d +wIndigoPlateauPokecenter1FTrigger:: ds 1 ; d97e +wWillsRoomTrigger:: ds 1 ; d97f +wKogasRoomTrigger:: ds 1 ; d980 +wBrunosRoomTrigger:: ds 1 ; d981 +wKarensRoomTrigger:: ds 1 ; d982 +wLancesRoomTrigger:: ds 1 ; d983 +wHallOfFameTrigger:: ds 1 ; d984 +wRoute27Trigger:: ds 1 ; d985 +wNewBarkTownTrigger:: ds 1 ; d986 +wElmsLabTrigger:: ds 1 ; d987 +wKrissHouse1FTrigger:: ds 1 ; d988 +wRoute29Trigger:: ds 1 ; d989 +wCherrygroveCityTrigger:: ds 1 ; d98a +wMrPokemonsHouseTrigger:: ds 1 ; d98b +wRoute32Trigger:: ds 1 ; d98c +wRoute35NationalParkGateTrigger:: ds 1 ; d98d +wRoute36Trigger:: ds 1 ; d98e +wRoute36NationalParkGateTrigger:: ds 1 ; d98f +wAzaleaTownTrigger:: ds 1 ; d990 +wGoldenrodGymTrigger:: ds 1 ; d991 +wGoldenrodMagnetTrainStationTrigger:: ds 1 ; d992 +wGoldenrodPokecenter1FTrigger:: ds 1 ; d993 +wOlivineCityTrigger:: ds 1 ; d994 +wRoute34Trigger:: ds 1 ; d995 +wRoute34IlexForestGateTrigger:: ds 1 ; d996 +wEcruteakHouseTrigger:: ds 1 ; d997 +wWiseTriosRoomTrigger:: ds 1 ; d998 +wEcruteakPokecenter1FTrigger:: ds 1 ; d999 +wEcruteakGymTrigger:: ds 1 ; d99a +wMahoganyTownTrigger:: ds 1 ; d99b +wRoute42Trigger:: ds 1 ; d99c +wCianwoodCityTrigger:: ds 1 ; d99d +wBattleTower1FTrigger:: ds 1 ; d99e +wBattleTowerBattleRoomTrigger:: ds 1 ; d99f +wBattleTowerElevatorTrigger:: ds 1 ; d9a0 +wBattleTowerHallwayTrigger:: ds 1 ; d9a1 +wBattleTowerOutsideTrigger:: ds 1 ; d9a2 +wRoute43GateTrigger:: ds 1 ; d9a3 +wMountMoonTrigger:: ds 1 ; d9a4 +wSproutTower3FTrigger:: ds 1 ; d9a5 +wTinTower1FTrigger:: ds 1 ; d9a6 +wBurnedTower1FTrigger:: ds 1 ; d9a7 +wBurnedTowerB1FTrigger:: ds 1 ; d9a8 +wRadioTower5FTrigger:: ds 1 ; d9a9 +wRuinsOfAlphOutsideTrigger:: ds 1 ; d9aa +wRuinsOfAlphResearchCenterTrigger:: ds 1 ; d9ab +wRuinsOfAlphHoOhChamberTrigger:: ds 1 ; d9ac +wRuinsOfAlphKabutoChamberTrigger:: ds 1 ; d9ad +wRuinsOfAlphOmanyteChamberTrigger:: ds 1 ; d9ae +wRuinsOfAlphAerodactylChamberTrigger:: ds 1 ; d9af +wRuinsOfAlphInnerChamberTrigger:: ds 1 ; d9b0 +wMahoganyMart1FTrigger:: ds 1 ; d9b1 +wTeamRocketBaseB1FTrigger:: ds 1 ; d9b2 +wTeamRocketBaseB2FTrigger:: ds 1 ; d9b3 +wTeamRocketBaseB3FTrigger:: ds 1 ; d9b4 +wUndergroundPathSwitchRoomEntrancesTrigger:: ds 1 ; d9b5 +wSilverCaveRoom3Trigger:: ds 1 ; d9b6 +wVictoryRoadTrigger:: ds 1 ; d9b7 +wDragonsDenB1FTrigger:: ds 1 ; d9b8 +wDragonShrineTrigger:: ds 1 ; d9b9 +wOlivinePortTrigger:: ds 1 ; d9ba +wVermilionPortTrigger:: ds 1 ; d9bb +wFastShip1FTrigger:: ds 1 ; d9bc +wFastShipB1FTrigger:: ds 1 ; d9bd +wMountMoonSquareTrigger:: ds 1 ; d9be +wMobileTradeRoomMobileTrigger:: ds 1 ; d9bf +wMobileBattleRoomTrigger:: ds 1 ; d9c0 + + SECTION "Events",WRAMX[$da72],BANK[1] EventFlags:: ; da72 |