From b5a8e3b3b32b2734d8fc642c77d96a0d4ef9c6d1 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Mon, 25 Dec 2017 23:45:54 -0500 Subject: Follow the X_constants/X_data_constants convention --- data/maps/environment_colors.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/maps') diff --git a/data/maps/environment_colors.asm b/data/maps/environment_colors.asm index 92d788fe1..aeddb83bc 100644 --- a/data/maps/environment_colors.asm +++ b/data/maps/environment_colors.asm @@ -1,5 +1,5 @@ EnvironmentColorsPointers: -; entries correspond to environment constants (see constants/map_constants.asm) +; entries correspond to environment constants (see constants/map_data_constants.asm) dw .OutdoorColors ; unused dw .OutdoorColors ; TOWN dw .OutdoorColors ; ROUTE -- cgit v1.2.3 From b5417fafec7dd37cb4be391f3bd3d4541a2a381e Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Tue, 26 Dec 2017 17:47:05 -0500 Subject: Split battle/ into data/ and engine/ components --- data/maps/flypoints.asm | 38 +++++++++ data/maps/map_setup_scripts.asm | 177 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 215 insertions(+) create mode 100644 data/maps/flypoints.asm create mode 100644 data/maps/map_setup_scripts.asm (limited to 'data/maps') diff --git a/data/maps/flypoints.asm b/data/maps/flypoints.asm new file mode 100644 index 000000000..b41db0ea1 --- /dev/null +++ b/data/maps/flypoints.asm @@ -0,0 +1,38 @@ +flypoint: MACRO + const FLY_\1 + db \2, SPAWN_\1 +ENDM + +Flypoints: ; 91c5e +; landmark, spawn point + const_def +; Johto + flypoint NEW_BARK, NEW_BARK_TOWN + flypoint CHERRYGROVE, CHERRYGROVE_CITY + flypoint VIOLET, VIOLET_CITY + flypoint AZALEA, AZALEA_TOWN + flypoint GOLDENROD, GOLDENROD_CITY + flypoint ECRUTEAK, ECRUTEAK_CITY + flypoint OLIVINE, OLIVINE_CITY + flypoint CIANWOOD, CIANWOOD_CITY + flypoint MAHOGANY, MAHOGANY_TOWN + flypoint LAKE, LAKE_OF_RAGE + flypoint BLACKTHORN, BLACKTHORN_CITY + flypoint MT_SILVER, SILVER_CAVE + +; Kanto +KANTO_FLYPOINT EQU const_value + flypoint PALLET, PALLET_TOWN + flypoint VIRIDIAN, VIRIDIAN_CITY + flypoint PEWTER, PEWTER_CITY + flypoint CERULEAN, CERULEAN_CITY + flypoint VERMILION, VERMILION_CITY + flypoint ROCK_TUNNEL, ROCK_TUNNEL + flypoint LAVENDER, LAVENDER_TOWN + flypoint CELADON, CELADON_CITY + flypoint SAFFRON, SAFFRON_CITY + flypoint FUCHSIA, FUCHSIA_CITY + flypoint CINNABAR, CINNABAR_ISLAND + flypoint INDIGO, INDIGO_PLATEAU + db -1 +; 91c8f diff --git a/data/maps/map_setup_scripts.asm b/data/maps/map_setup_scripts.asm new file mode 100644 index 000000000..47895b609 --- /dev/null +++ b/data/maps/map_setup_scripts.asm @@ -0,0 +1,177 @@ +MapSetupScripts: ; 15377 +; entries correspond to MAPSETUP_* constants (see constants/map_setup_constants.asm) + dw MapSetupScript_Warp + dw MapSetupScript_Continue + dw MapSetupScript_ReloadMap + dw MapSetupScript_Teleport + dw MapSetupScript_Door + dw MapSetupScript_Fall + dw MapSetupScript_Connection + dw MapSetupScript_LinkReturn + dw MapSetupScript_Train + dw MapSetupScript_Submenu + dw MapSetupScript_BadWarp + dw MapSetupScript_Fly +; 1538f + +MapSetupScript_Teleport: ; 1538f + db map_prolong_sprites +MapSetupScript_Fly: ; 15390 + db map_fade_out_palettes + db map_keep_roam +MapSetupScript_Warp: ; 15392 + db map_lcd_off + db map_sound_off + db map_load_spawn + db map_attributes + db map_change_callback + db map_spawn_coord + db map_player_coord + db map_anchor_screen + db map_load_blocks + db map_buffer_screen + db map_load_graphics + db map_time_of_day + db map_load_objects + db map_lcd_on + db map_palettes + db map_face_down + db map_sprites + db map_bike_music + db map_max_volume + db map_fade_in_palettes + db map_animations_on + db map_wildmons + db map_end + +MapSetupScript_BadWarp: ; 153a9 + db map_load_spawn + db map_attributes + db map_change_callback + db map_spawn_coord + db map_player_coord + db map_anchor_screen + db map_load_blocks + db map_buffer_screen + db map_lcd_off + db map_load_graphics + db map_time_of_day + db map_fade_out_music + db map_lcd_on + db map_load_objects + db map_palettes + db map_face_down + db map_sprites + db map_fade_music + db map_fade_in_palettes + db map_animations_on + db map_wildmons + db map_end + +MapSetupScript_Connection: ; 153bf + db map_animations_off + db map_load_connection + db map_attributes + db map_change_callback + db map_player_coord + db map_load_blocks + db map_load_tileset + db map_save_screen + db map_load_objects + db map_fade_music + db map_palettes + db map_stop_script + db map_keep_palettes + db map_wildmons + db map_update_roam + db map_animations_on + db map_end + +MapSetupScript_Fall: ; 153d0 + db map_prolong_sprites +MapSetupScript_Door: ; 153d1 + db map_fade_out_palettes +MapSetupScript_Train: ; 153d2 + db map_load_warp + db map_attributes + db map_warp_face + db map_change_callback + db map_player_coord + db map_load_blocks + db map_buffer_screen + db map_lcd_off + db map_load_graphics + db map_time_of_day + db map_fade_out_music + db map_lcd_on + db map_load_objects + db map_palettes + db map_sprites + db map_fade_music + db map_fade_in_palettes + db map_animations_on + db map_wildmons + db map_update_roam + db map_end + +MapSetupScript_ReloadMap: ; 153e7 + db map_fade + db map_clear_bg_palettes + db map_lcd_off + db map_sound_off + db map_load_blocks + db map_connection_blocks + db map_load_graphics + db map_time_of_day + db map_lcd_on + db map_palettes + db map_sprites + db map_music_force + db map_fade_in_palettes + db map_animations_on + db map_wildmons + db map_end + +MapSetupScript_LinkReturn: ; 153f7 + db map_fade + db map_lcd_off + db map_sound_off + db map_change_callback + db map_load_blocks + db map_buffer_screen + db map_load_graphics + db map_time_of_day + db map_lcd_on + db map_palettes + db map_sprites + db map_bike_music + db map_fade_in_palettes + db map_animations_on + db map_wildmons + db map_text_scroll_off + db map_end + +MapSetupScript_Continue: ; 15408 + db map_lcd_off + db map_sound_off + db map_attributes_2 + db map_anchor_screen + db map_start_callback + db map_load_blocks + db map_connection_blocks + db map_buffer_screen + db map_load_graphics + db map_time_of_day + db map_lcd_on + db map_palettes + db map_sprites + db map_bike_music + db map_fade_in_palettes + db map_animations_on + db map_wildmons + db map_end + +MapSetupScript_Submenu: ; 1541a + db map_load_blocks + db map_connection_blocks + db map_end -- cgit v1.2.3 From 7a4d64125176d9bd946682a3f9440de0f71324af Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Wed, 27 Dec 2017 01:29:15 -0500 Subject: Remove redundant data/ filename prefixes --- data/maps/map_scenes.asm | 89 -------------------- data/maps/map_setup_scripts.asm | 177 ---------------------------------------- data/maps/mapgroup_roofs.asm | 38 --------- data/maps/roofs.asm | 38 +++++++++ data/maps/scenes.asm | 89 ++++++++++++++++++++ data/maps/setup_scripts.asm | 177 ++++++++++++++++++++++++++++++++++++++++ 6 files changed, 304 insertions(+), 304 deletions(-) delete mode 100644 data/maps/map_scenes.asm delete mode 100644 data/maps/map_setup_scripts.asm delete mode 100644 data/maps/mapgroup_roofs.asm create mode 100644 data/maps/roofs.asm create mode 100644 data/maps/scenes.asm create mode 100644 data/maps/setup_scripts.asm (limited to 'data/maps') diff --git a/data/maps/map_scenes.asm b/data/maps/map_scenes.asm deleted file mode 100644 index 3d9600407..000000000 --- a/data/maps/map_scenes.asm +++ /dev/null @@ -1,89 +0,0 @@ -scene_def: MACRO -; db group, map -; dw address - 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_TRAIN_STATION, wSaffronTrainStationSceneID - scene_def ROUTE_16_GATE, wRoute16GateSceneID - scene_def ROUTE_17_18_GATE, wRoute1718GateSceneID - 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 KRISS_HOUSE_1F, wKrissHouse1FSceneID - 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 - scene_def ROUTE_34_ILEX_FOREST_GATE, wRoute34IlexForestGateSceneID - scene_def ECRUTEAK_HOUSE, wEcruteakHouseSceneID - 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 - 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 - 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_MOBILE, wMobileTradeRoomMobileSceneID - scene_def MOBILE_BATTLE_ROOM, wMobileBattleRoomSceneID - db -1 -; 4d15b diff --git a/data/maps/map_setup_scripts.asm b/data/maps/map_setup_scripts.asm deleted file mode 100644 index 47895b609..000000000 --- a/data/maps/map_setup_scripts.asm +++ /dev/null @@ -1,177 +0,0 @@ -MapSetupScripts: ; 15377 -; entries correspond to MAPSETUP_* constants (see constants/map_setup_constants.asm) - dw MapSetupScript_Warp - dw MapSetupScript_Continue - dw MapSetupScript_ReloadMap - dw MapSetupScript_Teleport - dw MapSetupScript_Door - dw MapSetupScript_Fall - dw MapSetupScript_Connection - dw MapSetupScript_LinkReturn - dw MapSetupScript_Train - dw MapSetupScript_Submenu - dw MapSetupScript_BadWarp - dw MapSetupScript_Fly -; 1538f - -MapSetupScript_Teleport: ; 1538f - db map_prolong_sprites -MapSetupScript_Fly: ; 15390 - db map_fade_out_palettes - db map_keep_roam -MapSetupScript_Warp: ; 15392 - db map_lcd_off - db map_sound_off - db map_load_spawn - db map_attributes - db map_change_callback - db map_spawn_coord - db map_player_coord - db map_anchor_screen - db map_load_blocks - db map_buffer_screen - db map_load_graphics - db map_time_of_day - db map_load_objects - db map_lcd_on - db map_palettes - db map_face_down - db map_sprites - db map_bike_music - db map_max_volume - db map_fade_in_palettes - db map_animations_on - db map_wildmons - db map_end - -MapSetupScript_BadWarp: ; 153a9 - db map_load_spawn - db map_attributes - db map_change_callback - db map_spawn_coord - db map_player_coord - db map_anchor_screen - db map_load_blocks - db map_buffer_screen - db map_lcd_off - db map_load_graphics - db map_time_of_day - db map_fade_out_music - db map_lcd_on - db map_load_objects - db map_palettes - db map_face_down - db map_sprites - db map_fade_music - db map_fade_in_palettes - db map_animations_on - db map_wildmons - db map_end - -MapSetupScript_Connection: ; 153bf - db map_animations_off - db map_load_connection - db map_attributes - db map_change_callback - db map_player_coord - db map_load_blocks - db map_load_tileset - db map_save_screen - db map_load_objects - db map_fade_music - db map_palettes - db map_stop_script - db map_keep_palettes - db map_wildmons - db map_update_roam - db map_animations_on - db map_end - -MapSetupScript_Fall: ; 153d0 - db map_prolong_sprites -MapSetupScript_Door: ; 153d1 - db map_fade_out_palettes -MapSetupScript_Train: ; 153d2 - db map_load_warp - db map_attributes - db map_warp_face - db map_change_callback - db map_player_coord - db map_load_blocks - db map_buffer_screen - db map_lcd_off - db map_load_graphics - db map_time_of_day - db map_fade_out_music - db map_lcd_on - db map_load_objects - db map_palettes - db map_sprites - db map_fade_music - db map_fade_in_palettes - db map_animations_on - db map_wildmons - db map_update_roam - db map_end - -MapSetupScript_ReloadMap: ; 153e7 - db map_fade - db map_clear_bg_palettes - db map_lcd_off - db map_sound_off - db map_load_blocks - db map_connection_blocks - db map_load_graphics - db map_time_of_day - db map_lcd_on - db map_palettes - db map_sprites - db map_music_force - db map_fade_in_palettes - db map_animations_on - db map_wildmons - db map_end - -MapSetupScript_LinkReturn: ; 153f7 - db map_fade - db map_lcd_off - db map_sound_off - db map_change_callback - db map_load_blocks - db map_buffer_screen - db map_load_graphics - db map_time_of_day - db map_lcd_on - db map_palettes - db map_sprites - db map_bike_music - db map_fade_in_palettes - db map_animations_on - db map_wildmons - db map_text_scroll_off - db map_end - -MapSetupScript_Continue: ; 15408 - db map_lcd_off - db map_sound_off - db map_attributes_2 - db map_anchor_screen - db map_start_callback - db map_load_blocks - db map_connection_blocks - db map_buffer_screen - db map_load_graphics - db map_time_of_day - db map_lcd_on - db map_palettes - db map_sprites - db map_bike_music - db map_fade_in_palettes - db map_animations_on - db map_wildmons - db map_end - -MapSetupScript_Submenu: ; 1541a - db map_load_blocks - db map_connection_blocks - db map_end diff --git a/data/maps/mapgroup_roofs.asm b/data/maps/mapgroup_roofs.asm deleted file mode 100644 index 8c79e6f82..000000000 --- a/data/maps/mapgroup_roofs.asm +++ /dev/null @@ -1,38 +0,0 @@ -MapGroupRoofs: ; 1c021i -; entries correspond to Roofs (see below) - db -1 ; group 0 (unused) - db 3 ; group 1 (Olivine) - db 2 ; group 2 (Mahogany) - db -1 ; group 3 - db 1 ; group 4 (Ecruteak) - db 2 ; group 5 (Blackthorn) - db -1 ; group 6 - db -1 ; group 7 - db 2 ; group 8 (Azalea) - db 2 ; group 9 (Lake of Rage) - db 1 ; group 10 (Violet) - db 4 ; group 11 (Goldenrod) - db -1 ; group 12 - db -1 ; group 13 - db -1 ; group 14 - db -1 ; group 15 - db -1 ; group 16 - db -1 ; group 17 - db -1 ; group 18 - db 0 ; group 19 (Silver Cave) - db -1 ; group 20 - db -1 ; group 21 - db 3 ; group 22 (Cianwood) - db -1 ; group 23 - db 0 ; group 24 (New Bark) - db -1 ; group 25 - db 0 ; group 26 (Cherrygrove) -; 1c03c - -Roofs: ; 1c03c -INCBIN "gfx/tilesets/roofs/0.2bpp" -INCBIN "gfx/tilesets/roofs/1.2bpp" -INCBIN "gfx/tilesets/roofs/2.2bpp" -INCBIN "gfx/tilesets/roofs/3.2bpp" -INCBIN "gfx/tilesets/roofs/4.2bpp" -; 1c30c diff --git a/data/maps/roofs.asm b/data/maps/roofs.asm new file mode 100644 index 000000000..8c79e6f82 --- /dev/null +++ b/data/maps/roofs.asm @@ -0,0 +1,38 @@ +MapGroupRoofs: ; 1c021i +; entries correspond to Roofs (see below) + db -1 ; group 0 (unused) + db 3 ; group 1 (Olivine) + db 2 ; group 2 (Mahogany) + db -1 ; group 3 + db 1 ; group 4 (Ecruteak) + db 2 ; group 5 (Blackthorn) + db -1 ; group 6 + db -1 ; group 7 + db 2 ; group 8 (Azalea) + db 2 ; group 9 (Lake of Rage) + db 1 ; group 10 (Violet) + db 4 ; group 11 (Goldenrod) + db -1 ; group 12 + db -1 ; group 13 + db -1 ; group 14 + db -1 ; group 15 + db -1 ; group 16 + db -1 ; group 17 + db -1 ; group 18 + db 0 ; group 19 (Silver Cave) + db -1 ; group 20 + db -1 ; group 21 + db 3 ; group 22 (Cianwood) + db -1 ; group 23 + db 0 ; group 24 (New Bark) + db -1 ; group 25 + db 0 ; group 26 (Cherrygrove) +; 1c03c + +Roofs: ; 1c03c +INCBIN "gfx/tilesets/roofs/0.2bpp" +INCBIN "gfx/tilesets/roofs/1.2bpp" +INCBIN "gfx/tilesets/roofs/2.2bpp" +INCBIN "gfx/tilesets/roofs/3.2bpp" +INCBIN "gfx/tilesets/roofs/4.2bpp" +; 1c30c diff --git a/data/maps/scenes.asm b/data/maps/scenes.asm new file mode 100644 index 000000000..3d9600407 --- /dev/null +++ b/data/maps/scenes.asm @@ -0,0 +1,89 @@ +scene_def: MACRO +; db group, map +; dw address + 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_TRAIN_STATION, wSaffronTrainStationSceneID + scene_def ROUTE_16_GATE, wRoute16GateSceneID + scene_def ROUTE_17_18_GATE, wRoute1718GateSceneID + 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 KRISS_HOUSE_1F, wKrissHouse1FSceneID + 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 + scene_def ROUTE_34_ILEX_FOREST_GATE, wRoute34IlexForestGateSceneID + scene_def ECRUTEAK_HOUSE, wEcruteakHouseSceneID + 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 + 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 + 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_MOBILE, wMobileTradeRoomMobileSceneID + scene_def MOBILE_BATTLE_ROOM, wMobileBattleRoomSceneID + db -1 +; 4d15b diff --git a/data/maps/setup_scripts.asm b/data/maps/setup_scripts.asm new file mode 100644 index 000000000..47895b609 --- /dev/null +++ b/data/maps/setup_scripts.asm @@ -0,0 +1,177 @@ +MapSetupScripts: ; 15377 +; entries correspond to MAPSETUP_* constants (see constants/map_setup_constants.asm) + dw MapSetupScript_Warp + dw MapSetupScript_Continue + dw MapSetupScript_ReloadMap + dw MapSetupScript_Teleport + dw MapSetupScript_Door + dw MapSetupScript_Fall + dw MapSetupScript_Connection + dw MapSetupScript_LinkReturn + dw MapSetupScript_Train + dw MapSetupScript_Submenu + dw MapSetupScript_BadWarp + dw MapSetupScript_Fly +; 1538f + +MapSetupScript_Teleport: ; 1538f + db map_prolong_sprites +MapSetupScript_Fly: ; 15390 + db map_fade_out_palettes + db map_keep_roam +MapSetupScript_Warp: ; 15392 + db map_lcd_off + db map_sound_off + db map_load_spawn + db map_attributes + db map_change_callback + db map_spawn_coord + db map_player_coord + db map_anchor_screen + db map_load_blocks + db map_buffer_screen + db map_load_graphics + db map_time_of_day + db map_load_objects + db map_lcd_on + db map_palettes + db map_face_down + db map_sprites + db map_bike_music + db map_max_volume + db map_fade_in_palettes + db map_animations_on + db map_wildmons + db map_end + +MapSetupScript_BadWarp: ; 153a9 + db map_load_spawn + db map_attributes + db map_change_callback + db map_spawn_coord + db map_player_coord + db map_anchor_screen + db map_load_blocks + db map_buffer_screen + db map_lcd_off + db map_load_graphics + db map_time_of_day + db map_fade_out_music + db map_lcd_on + db map_load_objects + db map_palettes + db map_face_down + db map_sprites + db map_fade_music + db map_fade_in_palettes + db map_animations_on + db map_wildmons + db map_end + +MapSetupScript_Connection: ; 153bf + db map_animations_off + db map_load_connection + db map_attributes + db map_change_callback + db map_player_coord + db map_load_blocks + db map_load_tileset + db map_save_screen + db map_load_objects + db map_fade_music + db map_palettes + db map_stop_script + db map_keep_palettes + db map_wildmons + db map_update_roam + db map_animations_on + db map_end + +MapSetupScript_Fall: ; 153d0 + db map_prolong_sprites +MapSetupScript_Door: ; 153d1 + db map_fade_out_palettes +MapSetupScript_Train: ; 153d2 + db map_load_warp + db map_attributes + db map_warp_face + db map_change_callback + db map_player_coord + db map_load_blocks + db map_buffer_screen + db map_lcd_off + db map_load_graphics + db map_time_of_day + db map_fade_out_music + db map_lcd_on + db map_load_objects + db map_palettes + db map_sprites + db map_fade_music + db map_fade_in_palettes + db map_animations_on + db map_wildmons + db map_update_roam + db map_end + +MapSetupScript_ReloadMap: ; 153e7 + db map_fade + db map_clear_bg_palettes + db map_lcd_off + db map_sound_off + db map_load_blocks + db map_connection_blocks + db map_load_graphics + db map_time_of_day + db map_lcd_on + db map_palettes + db map_sprites + db map_music_force + db map_fade_in_palettes + db map_animations_on + db map_wildmons + db map_end + +MapSetupScript_LinkReturn: ; 153f7 + db map_fade + db map_lcd_off + db map_sound_off + db map_change_callback + db map_load_blocks + db map_buffer_screen + db map_load_graphics + db map_time_of_day + db map_lcd_on + db map_palettes + db map_sprites + db map_bike_music + db map_fade_in_palettes + db map_animations_on + db map_wildmons + db map_text_scroll_off + db map_end + +MapSetupScript_Continue: ; 15408 + db map_lcd_off + db map_sound_off + db map_attributes_2 + db map_anchor_screen + db map_start_callback + db map_load_blocks + db map_connection_blocks + db map_buffer_screen + db map_load_graphics + db map_time_of_day + db map_lcd_on + db map_palettes + db map_sprites + db map_bike_music + db map_fade_in_palettes + db map_animations_on + db map_wildmons + db map_end + +MapSetupScript_Submenu: ; 1541a + db map_load_blocks + db map_connection_blocks + db map_end -- cgit v1.2.3