diff options
| author | garak <garakmon@gmail.com> | 2019-05-13 19:44:24 -0400 |
|---|---|---|
| committer | garak <garakmon@gmail.com> | 2019-05-13 19:44:24 -0400 |
| commit | 55d66b51770b4f657ed55822e7e76f6d6e3261d8 (patch) | |
| tree | 1c324c7d2108afb678d2260e63b5591a04571b0d | |
| parent | 4b98d7d07a681279022cec9f082071a374ddbdb9 (diff) | |
convert map data to json
2117 files changed, 53867 insertions, 19940 deletions
@@ -45,6 +45,7 @@ SCANINC := tools/scaninc/scaninc PREPROC := tools/preproc/preproc RAMSCRGEN := tools/ramscrgen/ramscrgen FIX := tools/gbafix/gbafix +MAPJSON := tools/mapjson/mapjson # Clear the default suffixes .SUFFIXES: @@ -85,6 +86,9 @@ clean: tidy rm -f sound/direct_sound_samples/*.bin rm -f $(SONG_OBJS) find . \( -iname '*.1bpp' -o -iname '*.4bpp' -o -iname '*.8bpp' -o -iname '*.gbapal' -o -iname '*.lz' -o -iname '*.latfont' -o -iname '*.hwjpnfont' -o -iname '*.fwjpnfont' \) -exec rm {} + + rm -f $(DATA_ASM_SUBDIR)/layouts/layouts.inc $(DATA_ASM_SUBDIR)/layouts/layouts_table.inc + rm -f $(DATA_ASM_SUBDIR)/maps/connections.inc $(DATA_ASM_SUBDIR)/maps/events.inc $(DATA_ASM_SUBDIR)/maps/groups.inc $(DATA_ASM_SUBDIR)/maps/headers.inc + find $(DATA_ASM_SUBDIR)/maps \( -iname 'connections.inc' -o -iname 'events.inc' -o -iname 'header.inc' \) -exec rm {} + @$(MAKE) -C berry_fix clean tidy: @@ -94,6 +98,7 @@ tidy: include graphics_file_rules.mk include tileset_rules.mk +include map_data_rules.mk %.s: ; %.png: ; diff --git a/asm/macros/map.inc b/asm/macros/map.inc index 9c68e8414..deea44a42 100644 --- a/asm/macros/map.inc +++ b/asm/macros/map.inc @@ -53,6 +53,10 @@ inc _num_signs .endm + .macro bg_hidden_item_event x, y, height, item, flag, unknown + bg_event \x, \y, \height, 7, 0, \item, \flag, \unknown + .endm + .macro map_events npcs, warps, traps, signs .byte _num_npcs, _num_warps, _num_traps, _num_signs .4byte \npcs, \warps, \traps, \signs diff --git a/build_tools.sh b/build_tools.sh index f384c2d99..212df96e7 100755 --- a/build_tools.sh +++ b/build_tools.sh @@ -7,3 +7,4 @@ make -C tools/preproc CXX=${1:-g++} make -C tools/ramscrgen CXX=${1:-g++} make -C tools/rsfont CXX=${1:-g++} make -C tools/scaninc CXX=${1:-g++} +make -C tools/mapjson CXX=${1:-g++} diff --git a/constants/constants.inc b/constants/constants.inc index 1ec25462f..4365e90e1 100644 --- a/constants/constants.inc +++ b/constants/constants.inc @@ -2,7 +2,7 @@ .include "constants/misc_constants.inc" .include "constants/type_constants.inc" .include "constants/contest_constants.inc" - .include "constants/item_data_constants.inc" +@ .include "constants/item_data_constants.inc" .include "constants/battle_move_constants.inc" .include "constants/trainer_constants.inc" .include "constants/berry_constants.inc" diff --git a/data/layouts/.gitignore b/data/layouts/.gitignore new file mode 100644 index 000000000..eaa83a6f1 --- /dev/null +++ b/data/layouts/.gitignore @@ -0,0 +1,2 @@ +layouts.inc +layouts_table.inc diff --git a/data/layouts/BirthIsland_Exterior_Layout/border.bin b/data/layouts/BirthIsland_Exterior/border.bin index 75f2c916c..75f2c916c 100644 --- a/data/layouts/BirthIsland_Exterior_Layout/border.bin +++ b/data/layouts/BirthIsland_Exterior/border.bin diff --git a/data/layouts/BirthIsland_Exterior_Layout/map.bin b/data/layouts/BirthIsland_Exterior/map.bin index 98502708b..98502708b 100644 --- a/data/layouts/BirthIsland_Exterior_Layout/map.bin +++ b/data/layouts/BirthIsland_Exterior/map.bin diff --git a/data/layouts/CeladonCity_Layout/border.bin b/data/layouts/CeladonCity/border.bin Binary files differindex a701312cf..a701312cf 100644 --- a/data/layouts/CeladonCity_Layout/border.bin +++ b/data/layouts/CeladonCity/border.bin diff --git a/data/layouts/CeladonCity_Layout/map.bin b/data/layouts/CeladonCity/map.bin Binary files differindex 45bad7034..45bad7034 100644 --- a/data/layouts/CeladonCity_Layout/map.bin +++ b/data/layouts/CeladonCity/map.bin diff --git a/data/layouts/CeladonCity_Condominiums_1F_Layout/border.bin b/data/layouts/CeladonCity_Condominiums_1F/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/CeladonCity_Condominiums_1F_Layout/border.bin +++ b/data/layouts/CeladonCity_Condominiums_1F/border.bin diff --git a/data/layouts/CeladonCity_Condominiums_1F_Layout/map.bin b/data/layouts/CeladonCity_Condominiums_1F/map.bin index d396e1116..d396e1116 100644 --- a/data/layouts/CeladonCity_Condominiums_1F_Layout/map.bin +++ b/data/layouts/CeladonCity_Condominiums_1F/map.bin diff --git a/data/layouts/CeladonCity_Condominiums_2F_Layout/border.bin b/data/layouts/CeladonCity_Condominiums_2F/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/CeladonCity_Condominiums_2F_Layout/border.bin +++ b/data/layouts/CeladonCity_Condominiums_2F/border.bin diff --git a/data/layouts/CeladonCity_Condominiums_2F_Layout/map.bin b/data/layouts/CeladonCity_Condominiums_2F/map.bin Binary files differindex 8dcec2456..8dcec2456 100644 --- a/data/layouts/CeladonCity_Condominiums_2F_Layout/map.bin +++ b/data/layouts/CeladonCity_Condominiums_2F/map.bin diff --git a/data/layouts/CeladonCity_Condominiums_3F_Layout/border.bin b/data/layouts/CeladonCity_Condominiums_3F/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/CeladonCity_Condominiums_3F_Layout/border.bin +++ b/data/layouts/CeladonCity_Condominiums_3F/border.bin diff --git a/data/layouts/CeladonCity_Condominiums_3F_Layout/map.bin b/data/layouts/CeladonCity_Condominiums_3F/map.bin index 5e44c90c6..5e44c90c6 100644 --- a/data/layouts/CeladonCity_Condominiums_3F_Layout/map.bin +++ b/data/layouts/CeladonCity_Condominiums_3F/map.bin diff --git a/data/layouts/CeladonCity_Condominiums_Roof_Layout/border.bin b/data/layouts/CeladonCity_Condominiums_Roof/border.bin index cbaea0adc..cbaea0adc 100644 --- a/data/layouts/CeladonCity_Condominiums_Roof_Layout/border.bin +++ b/data/layouts/CeladonCity_Condominiums_Roof/border.bin diff --git a/data/layouts/CeladonCity_Condominiums_Roof_Layout/map.bin b/data/layouts/CeladonCity_Condominiums_Roof/map.bin index 8f044c89a..8f044c89a 100644 --- a/data/layouts/CeladonCity_Condominiums_Roof_Layout/map.bin +++ b/data/layouts/CeladonCity_Condominiums_Roof/map.bin diff --git a/data/layouts/CeladonCity_Condominiums_RoofRoom_Layout/border.bin b/data/layouts/CeladonCity_Condominiums_RoofRoom/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/CeladonCity_Condominiums_RoofRoom_Layout/border.bin +++ b/data/layouts/CeladonCity_Condominiums_RoofRoom/border.bin diff --git a/data/layouts/CeladonCity_Condominiums_RoofRoom_Layout/map.bin b/data/layouts/CeladonCity_Condominiums_RoofRoom/map.bin index a6aaf9a0c..a6aaf9a0c 100644 --- a/data/layouts/CeladonCity_Condominiums_RoofRoom_Layout/map.bin +++ b/data/layouts/CeladonCity_Condominiums_RoofRoom/map.bin diff --git a/data/layouts/CeladonCity_DepartmentStore_1F_Layout/border.bin b/data/layouts/CeladonCity_DepartmentStore_1F/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/CeladonCity_DepartmentStore_1F_Layout/border.bin +++ b/data/layouts/CeladonCity_DepartmentStore_1F/border.bin diff --git a/data/layouts/CeladonCity_DepartmentStore_1F_Layout/map.bin b/data/layouts/CeladonCity_DepartmentStore_1F/map.bin index 3c09fa172..3c09fa172 100644 --- a/data/layouts/CeladonCity_DepartmentStore_1F_Layout/map.bin +++ b/data/layouts/CeladonCity_DepartmentStore_1F/map.bin diff --git a/data/layouts/CeladonCity_DepartmentStore_2F_Layout/border.bin b/data/layouts/CeladonCity_DepartmentStore_2F/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/CeladonCity_DepartmentStore_2F_Layout/border.bin +++ b/data/layouts/CeladonCity_DepartmentStore_2F/border.bin diff --git a/data/layouts/CeladonCity_DepartmentStore_2F_Layout/map.bin b/data/layouts/CeladonCity_DepartmentStore_2F/map.bin Binary files differindex 41c334718..41c334718 100644 --- a/data/layouts/CeladonCity_DepartmentStore_2F_Layout/map.bin +++ b/data/layouts/CeladonCity_DepartmentStore_2F/map.bin diff --git a/data/layouts/CeladonCity_DepartmentStore_3F_Layout/border.bin b/data/layouts/CeladonCity_DepartmentStore_3F/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/CeladonCity_DepartmentStore_3F_Layout/border.bin +++ b/data/layouts/CeladonCity_DepartmentStore_3F/border.bin diff --git a/data/layouts/CeladonCity_DepartmentStore_3F_Layout/map.bin b/data/layouts/CeladonCity_DepartmentStore_3F/map.bin index 1640da24e..1640da24e 100644 --- a/data/layouts/CeladonCity_DepartmentStore_3F_Layout/map.bin +++ b/data/layouts/CeladonCity_DepartmentStore_3F/map.bin diff --git a/data/layouts/CeladonCity_DepartmentStore_4F_Layout/border.bin b/data/layouts/CeladonCity_DepartmentStore_4F/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/CeladonCity_DepartmentStore_4F_Layout/border.bin +++ b/data/layouts/CeladonCity_DepartmentStore_4F/border.bin diff --git a/data/layouts/CeladonCity_DepartmentStore_4F_Layout/map.bin b/data/layouts/CeladonCity_DepartmentStore_4F/map.bin Binary files differindex f3f558069..f3f558069 100644 --- a/data/layouts/CeladonCity_DepartmentStore_4F_Layout/map.bin +++ b/data/layouts/CeladonCity_DepartmentStore_4F/map.bin diff --git a/data/layouts/CeladonCity_DepartmentStore_5F_Layout/border.bin b/data/layouts/CeladonCity_DepartmentStore_5F/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/CeladonCity_DepartmentStore_5F_Layout/border.bin +++ b/data/layouts/CeladonCity_DepartmentStore_5F/border.bin diff --git a/data/layouts/CeladonCity_DepartmentStore_5F_Layout/map.bin b/data/layouts/CeladonCity_DepartmentStore_5F/map.bin index 5374a18ee..5374a18ee 100644 --- a/data/layouts/CeladonCity_DepartmentStore_5F_Layout/map.bin +++ b/data/layouts/CeladonCity_DepartmentStore_5F/map.bin diff --git a/data/layouts/CeladonCity_DepartmentStore_Elevator_Layout/border.bin b/data/layouts/CeladonCity_DepartmentStore_Elevator/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/CeladonCity_DepartmentStore_Elevator_Layout/border.bin +++ b/data/layouts/CeladonCity_DepartmentStore_Elevator/border.bin diff --git a/data/layouts/CeladonCity_DepartmentStore_Elevator_Layout/map.bin b/data/layouts/CeladonCity_DepartmentStore_Elevator/map.bin index 42e08c38d..42e08c38d 100644 --- a/data/layouts/CeladonCity_DepartmentStore_Elevator_Layout/map.bin +++ b/data/layouts/CeladonCity_DepartmentStore_Elevator/map.bin diff --git a/data/layouts/CeladonCity_DepartmentStore_Roof_Layout/border.bin b/data/layouts/CeladonCity_DepartmentStore_Roof/border.bin index 87ae772ca..87ae772ca 100644 --- a/data/layouts/CeladonCity_DepartmentStore_Roof_Layout/border.bin +++ b/data/layouts/CeladonCity_DepartmentStore_Roof/border.bin diff --git a/data/layouts/CeladonCity_DepartmentStore_Roof_Layout/map.bin b/data/layouts/CeladonCity_DepartmentStore_Roof/map.bin index f92a0a330..f92a0a330 100644 --- a/data/layouts/CeladonCity_DepartmentStore_Roof_Layout/map.bin +++ b/data/layouts/CeladonCity_DepartmentStore_Roof/map.bin diff --git a/data/layouts/CeladonCity_GameCorner_Layout/border.bin b/data/layouts/CeladonCity_GameCorner/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/CeladonCity_GameCorner_Layout/border.bin +++ b/data/layouts/CeladonCity_GameCorner/border.bin diff --git a/data/layouts/CeladonCity_GameCorner_Layout/map.bin b/data/layouts/CeladonCity_GameCorner/map.bin index 00280b8a4..00280b8a4 100644 --- a/data/layouts/CeladonCity_GameCorner_Layout/map.bin +++ b/data/layouts/CeladonCity_GameCorner/map.bin diff --git a/data/layouts/CeladonCity_GameCorner_PrizeRoom_Layout/border.bin b/data/layouts/CeladonCity_GameCorner_PrizeRoom/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/CeladonCity_GameCorner_PrizeRoom_Layout/border.bin +++ b/data/layouts/CeladonCity_GameCorner_PrizeRoom/border.bin diff --git a/data/layouts/CeladonCity_GameCorner_PrizeRoom_Layout/map.bin b/data/layouts/CeladonCity_GameCorner_PrizeRoom/map.bin index 475ca451c..475ca451c 100644 --- a/data/layouts/CeladonCity_GameCorner_PrizeRoom_Layout/map.bin +++ b/data/layouts/CeladonCity_GameCorner_PrizeRoom/map.bin diff --git a/data/layouts/CeladonCity_Gym_Layout/border.bin b/data/layouts/CeladonCity_Gym/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/CeladonCity_Gym_Layout/border.bin +++ b/data/layouts/CeladonCity_Gym/border.bin diff --git a/data/layouts/CeladonCity_Gym_Layout/map.bin b/data/layouts/CeladonCity_Gym/map.bin index 19338125c..19338125c 100644 --- a/data/layouts/CeladonCity_Gym_Layout/map.bin +++ b/data/layouts/CeladonCity_Gym/map.bin diff --git a/data/layouts/CeladonCity_Hotel_Layout/border.bin b/data/layouts/CeladonCity_Hotel/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/CeladonCity_Hotel_Layout/border.bin +++ b/data/layouts/CeladonCity_Hotel/border.bin diff --git a/data/layouts/CeladonCity_Hotel_Layout/map.bin b/data/layouts/CeladonCity_Hotel/map.bin index 4573c1444..4573c1444 100644 --- a/data/layouts/CeladonCity_Hotel_Layout/map.bin +++ b/data/layouts/CeladonCity_Hotel/map.bin diff --git a/data/layouts/CeladonCity_Restaurant_Layout/border.bin b/data/layouts/CeladonCity_Restaurant/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/CeladonCity_Restaurant_Layout/border.bin +++ b/data/layouts/CeladonCity_Restaurant/border.bin diff --git a/data/layouts/CeladonCity_Restaurant_Layout/map.bin b/data/layouts/CeladonCity_Restaurant/map.bin index a5391187c..a5391187c 100644 --- a/data/layouts/CeladonCity_Restaurant_Layout/map.bin +++ b/data/layouts/CeladonCity_Restaurant/map.bin diff --git a/data/layouts/CeruleanCave_1F_Layout/border.bin b/data/layouts/CeruleanCave_1F/border.bin index a021ddd4e..a021ddd4e 100644 --- a/data/layouts/CeruleanCave_1F_Layout/border.bin +++ b/data/layouts/CeruleanCave_1F/border.bin diff --git a/data/layouts/CeruleanCave_1F_Layout/map.bin b/data/layouts/CeruleanCave_1F/map.bin Binary files differindex 33a822337..33a822337 100644 --- a/data/layouts/CeruleanCave_1F_Layout/map.bin +++ b/data/layouts/CeruleanCave_1F/map.bin diff --git a/data/layouts/CeruleanCave_2F_Layout/border.bin b/data/layouts/CeruleanCave_2F/border.bin index a021ddd4e..a021ddd4e 100644 --- a/data/layouts/CeruleanCave_2F_Layout/border.bin +++ b/data/layouts/CeruleanCave_2F/border.bin diff --git a/data/layouts/CeruleanCave_2F_Layout/map.bin b/data/layouts/CeruleanCave_2F/map.bin index f2b9dcb9c..f2b9dcb9c 100644 --- a/data/layouts/CeruleanCave_2F_Layout/map.bin +++ b/data/layouts/CeruleanCave_2F/map.bin diff --git a/data/layouts/CeruleanCave_B1F_Layout/border.bin b/data/layouts/CeruleanCave_B1F/border.bin index a021ddd4e..a021ddd4e 100644 --- a/data/layouts/CeruleanCave_B1F_Layout/border.bin +++ b/data/layouts/CeruleanCave_B1F/border.bin diff --git a/data/layouts/CeruleanCave_B1F_Layout/map.bin b/data/layouts/CeruleanCave_B1F/map.bin Binary files differindex f423b6e0e..f423b6e0e 100644 --- a/data/layouts/CeruleanCave_B1F_Layout/map.bin +++ b/data/layouts/CeruleanCave_B1F/map.bin diff --git a/data/layouts/CeruleanCity_Layout/border.bin b/data/layouts/CeruleanCity/border.bin Binary files differindex 4531975c7..4531975c7 100644 --- a/data/layouts/CeruleanCity_Layout/border.bin +++ b/data/layouts/CeruleanCity/border.bin diff --git a/data/layouts/CeruleanCity_Layout/map.bin b/data/layouts/CeruleanCity/map.bin index de72d4e87..de72d4e87 100644 --- a/data/layouts/CeruleanCity_Layout/map.bin +++ b/data/layouts/CeruleanCity/map.bin diff --git a/data/layouts/CeruleanCity_BikeShop_Layout/border.bin b/data/layouts/CeruleanCity_BikeShop/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/CeruleanCity_BikeShop_Layout/border.bin +++ b/data/layouts/CeruleanCity_BikeShop/border.bin diff --git a/data/layouts/CeruleanCity_BikeShop_Layout/map.bin b/data/layouts/CeruleanCity_BikeShop/map.bin index 7bfc92082..7bfc92082 100644 --- a/data/layouts/CeruleanCity_BikeShop_Layout/map.bin +++ b/data/layouts/CeruleanCity_BikeShop/map.bin diff --git a/data/layouts/CeruleanCity_Gym_Layout/border.bin b/data/layouts/CeruleanCity_Gym/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/CeruleanCity_Gym_Layout/border.bin +++ b/data/layouts/CeruleanCity_Gym/border.bin diff --git a/data/layouts/CeruleanCity_Gym_Layout/map.bin b/data/layouts/CeruleanCity_Gym/map.bin index ee6d65165..ee6d65165 100644 --- a/data/layouts/CeruleanCity_Gym_Layout/map.bin +++ b/data/layouts/CeruleanCity_Gym/map.bin diff --git a/data/layouts/CeruleanCity_House1_Layout/border.bin b/data/layouts/CeruleanCity_House1/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/CeruleanCity_House1_Layout/border.bin +++ b/data/layouts/CeruleanCity_House1/border.bin diff --git a/data/layouts/CeruleanCity_House1_Layout/map.bin b/data/layouts/CeruleanCity_House1/map.bin index 83ebe0b15..83ebe0b15 100644 --- a/data/layouts/CeruleanCity_House1_Layout/map.bin +++ b/data/layouts/CeruleanCity_House1/map.bin diff --git a/data/layouts/CeruleanCity_House2_Layout/border.bin b/data/layouts/CeruleanCity_House2/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/CeruleanCity_House2_Layout/border.bin +++ b/data/layouts/CeruleanCity_House2/border.bin diff --git a/data/layouts/CeruleanCity_House2_Layout/map.bin b/data/layouts/CeruleanCity_House2/map.bin index 21a7d4178..21a7d4178 100644 --- a/data/layouts/CeruleanCity_House2_Layout/map.bin +++ b/data/layouts/CeruleanCity_House2/map.bin diff --git a/data/layouts/CeruleanCity_House5_Layout/border.bin b/data/layouts/CeruleanCity_House5/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/CeruleanCity_House5_Layout/border.bin +++ b/data/layouts/CeruleanCity_House5/border.bin diff --git a/data/layouts/CeruleanCity_House5_Layout/map.bin b/data/layouts/CeruleanCity_House5/map.bin index 1f06133b3..1f06133b3 100644 --- a/data/layouts/CeruleanCity_House5_Layout/map.bin +++ b/data/layouts/CeruleanCity_House5/map.bin diff --git a/data/layouts/CinnabarIsland_Layout/border.bin b/data/layouts/CinnabarIsland/border.bin index 730aab996..730aab996 100644 --- a/data/layouts/CinnabarIsland_Layout/border.bin +++ b/data/layouts/CinnabarIsland/border.bin diff --git a/data/layouts/CinnabarIsland_Layout/map.bin b/data/layouts/CinnabarIsland/map.bin index 7631ea1d8..7631ea1d8 100644 --- a/data/layouts/CinnabarIsland_Layout/map.bin +++ b/data/layouts/CinnabarIsland/map.bin diff --git a/data/layouts/CinnabarIsland_Gym_Layout/border.bin b/data/layouts/CinnabarIsland_Gym/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/CinnabarIsland_Gym_Layout/border.bin +++ b/data/layouts/CinnabarIsland_Gym/border.bin diff --git a/data/layouts/CinnabarIsland_Gym_Layout/map.bin b/data/layouts/CinnabarIsland_Gym/map.bin index 39cd83f5a..39cd83f5a 100644 --- a/data/layouts/CinnabarIsland_Gym_Layout/map.bin +++ b/data/layouts/CinnabarIsland_Gym/map.bin diff --git a/data/layouts/CinnabarIsland_PokemonLab_Entrance_Layout/border.bin b/data/layouts/CinnabarIsland_PokemonLab_Entrance/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/CinnabarIsland_PokemonLab_Entrance_Layout/border.bin +++ b/data/layouts/CinnabarIsland_PokemonLab_Entrance/border.bin diff --git a/data/layouts/CinnabarIsland_PokemonLab_Entrance_Layout/map.bin b/data/layouts/CinnabarIsland_PokemonLab_Entrance/map.bin index 39ca3b4d7..39ca3b4d7 100644 --- a/data/layouts/CinnabarIsland_PokemonLab_Entrance_Layout/map.bin +++ b/data/layouts/CinnabarIsland_PokemonLab_Entrance/map.bin diff --git a/data/layouts/CinnabarIsland_PokemonLab_ExperimentRoom_Layout/border.bin b/data/layouts/CinnabarIsland_PokemonLab_ExperimentRoom/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/CinnabarIsland_PokemonLab_ExperimentRoom_Layout/border.bin +++ b/data/layouts/CinnabarIsland_PokemonLab_ExperimentRoom/border.bin diff --git a/data/layouts/CinnabarIsland_PokemonLab_ExperimentRoom_Layout/map.bin b/data/layouts/CinnabarIsland_PokemonLab_ExperimentRoom/map.bin Binary files differindex 1dbda8fd5..1dbda8fd5 100644 --- a/data/layouts/CinnabarIsland_PokemonLab_ExperimentRoom_Layout/map.bin +++ b/data/layouts/CinnabarIsland_PokemonLab_ExperimentRoom/map.bin diff --git a/data/layouts/CinnabarIsland_PokemonLab_Lounge_Layout/border.bin b/data/layouts/CinnabarIsland_PokemonLab_Lounge/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/CinnabarIsland_PokemonLab_Lounge_Layout/border.bin +++ b/data/layouts/CinnabarIsland_PokemonLab_Lounge/border.bin diff --git a/data/layouts/CinnabarIsland_PokemonLab_Lounge_Layout/map.bin b/data/layouts/CinnabarIsland_PokemonLab_Lounge/map.bin index a84c9d1ab..a84c9d1ab 100644 --- a/data/layouts/CinnabarIsland_PokemonLab_Lounge_Layout/map.bin +++ b/data/layouts/CinnabarIsland_PokemonLab_Lounge/map.bin diff --git a/data/layouts/CinnabarIsland_PokemonLab_ResearchRoom_Layout/border.bin b/data/layouts/CinnabarIsland_PokemonLab_ResearchRoom/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/CinnabarIsland_PokemonLab_ResearchRoom_Layout/border.bin +++ b/data/layouts/CinnabarIsland_PokemonLab_ResearchRoom/border.bin diff --git a/data/layouts/CinnabarIsland_PokemonLab_ResearchRoom_Layout/map.bin b/data/layouts/CinnabarIsland_PokemonLab_ResearchRoom/map.bin Binary files differindex 6032e183f..6032e183f 100644 --- a/data/layouts/CinnabarIsland_PokemonLab_ResearchRoom_Layout/map.bin +++ b/data/layouts/CinnabarIsland_PokemonLab_ResearchRoom/map.bin diff --git a/data/layouts/DiglettsCave_B1F_Layout/border.bin b/data/layouts/DiglettsCave_B1F/border.bin index a021ddd4e..a021ddd4e 100644 --- a/data/layouts/DiglettsCave_B1F_Layout/border.bin +++ b/data/layouts/DiglettsCave_B1F/border.bin diff --git a/data/layouts/DiglettsCave_B1F_Layout/map.bin b/data/layouts/DiglettsCave_B1F/map.bin index d29e66e00..d29e66e00 100644 --- a/data/layouts/DiglettsCave_B1F_Layout/map.bin +++ b/data/layouts/DiglettsCave_B1F/map.bin diff --git a/data/layouts/DiglettsCave_NorthEntrance_Layout/border.bin b/data/layouts/DiglettsCave_NorthEntrance/border.bin index a021ddd4e..a021ddd4e 100644 --- a/data/layouts/DiglettsCave_NorthEntrance_Layout/border.bin +++ b/data/layouts/DiglettsCave_NorthEntrance/border.bin diff --git a/data/layouts/DiglettsCave_NorthEntrance_Layout/map.bin b/data/layouts/DiglettsCave_NorthEntrance/map.bin index 39007d306..39007d306 100644 --- a/data/layouts/DiglettsCave_NorthEntrance_Layout/map.bin +++ b/data/layouts/DiglettsCave_NorthEntrance/map.bin diff --git a/data/layouts/DiglettsCave_SouthEntrance_Layout/border.bin b/data/layouts/DiglettsCave_SouthEntrance/border.bin index a021ddd4e..a021ddd4e 100644 --- a/data/layouts/DiglettsCave_SouthEntrance_Layout/border.bin +++ b/data/layouts/DiglettsCave_SouthEntrance/border.bin diff --git a/data/layouts/DiglettsCave_SouthEntrance_Layout/map.bin b/data/layouts/DiglettsCave_SouthEntrance/map.bin Binary files differindex 9d2c75793..9d2c75793 100644 --- a/data/layouts/DiglettsCave_SouthEntrance_Layout/map.bin +++ b/data/layouts/DiglettsCave_SouthEntrance/map.bin diff --git a/data/layouts/Entrance_1F_Layout/border.bin b/data/layouts/Entrance_1F/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/Entrance_1F_Layout/border.bin +++ b/data/layouts/Entrance_1F/border.bin diff --git a/data/layouts/Entrance_1F_Layout/map.bin b/data/layouts/Entrance_1F/map.bin index e39d586e9..e39d586e9 100644 --- a/data/layouts/Entrance_1F_Layout/map.bin +++ b/data/layouts/Entrance_1F/map.bin diff --git a/data/layouts/Entrance_2F_Layout/border.bin b/data/layouts/Entrance_2F/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/Entrance_2F_Layout/border.bin +++ b/data/layouts/Entrance_2F/border.bin diff --git a/data/layouts/Entrance_2F_Layout/map.bin b/data/layouts/Entrance_2F/map.bin index bfac6e348..bfac6e348 100644 --- a/data/layouts/Entrance_2F_Layout/map.bin +++ b/data/layouts/Entrance_2F/map.bin diff --git a/data/layouts/FiveIsland_Layout/border.bin b/data/layouts/FiveIsland/border.bin index 730aab996..730aab996 100644 --- a/data/layouts/FiveIsland_Layout/border.bin +++ b/data/layouts/FiveIsland/border.bin diff --git a/data/layouts/FiveIsland_Layout/map.bin b/data/layouts/FiveIsland/map.bin Binary files differindex 98fa499f8..98fa499f8 100644 --- a/data/layouts/FiveIsland_Layout/map.bin +++ b/data/layouts/FiveIsland/map.bin diff --git a/data/layouts/FiveIsland_LostCave_Entrance_Layout/border.bin b/data/layouts/FiveIsland_LostCave_Entrance/border.bin index a021ddd4e..a021ddd4e 100644 --- a/data/layouts/FiveIsland_LostCave_Entrance_Layout/border.bin +++ b/data/layouts/FiveIsland_LostCave_Entrance/border.bin diff --git a/data/layouts/FiveIsland_LostCave_Entrance_Layout/map.bin b/data/layouts/FiveIsland_LostCave_Entrance/map.bin index 7e68d2dd4..7e68d2dd4 100644 --- a/data/layouts/FiveIsland_LostCave_Entrance_Layout/map.bin +++ b/data/layouts/FiveIsland_LostCave_Entrance/map.bin diff --git a/data/layouts/FiveIsland_LostCave_Room10_Layout/border.bin b/data/layouts/FiveIsland_LostCave_Room1/border.bin index a021ddd4e..a021ddd4e 100644 --- a/data/layouts/FiveIsland_LostCave_Room10_Layout/border.bin +++ b/data/layouts/FiveIsland_LostCave_Room1/border.bin diff --git a/data/layouts/FiveIsland_LostCave_Room1_Layout/map.bin b/data/layouts/FiveIsland_LostCave_Room1/map.bin index 1683057f5..1683057f5 100644 --- a/data/layouts/FiveIsland_LostCave_Room1_Layout/map.bin +++ b/data/layouts/FiveIsland_LostCave_Room1/map.bin diff --git a/data/layouts/FiveIsland_LostCave_Room11_Layout/border.bin b/data/layouts/FiveIsland_LostCave_Room10/border.bin index a021ddd4e..a021ddd4e 100644 --- a/data/layouts/FiveIsland_LostCave_Room11_Layout/border.bin +++ b/data/layouts/FiveIsland_LostCave_Room10/border.bin diff --git a/data/layouts/FiveIsland_LostCave_Room10_Layout/map.bin b/data/layouts/FiveIsland_LostCave_Room10/map.bin index 9e26501cb..9e26501cb 100644 --- a/data/layouts/FiveIsland_LostCave_Room10_Layout/map.bin +++ b/data/layouts/FiveIsland_LostCave_Room10/map.bin diff --git a/data/layouts/FiveIsland_LostCave_Room12_Layout/border.bin b/data/layouts/FiveIsland_LostCave_Room11/border.bin index a021ddd4e..a021ddd4e 100644 --- a/data/layouts/FiveIsland_LostCave_Room12_Layout/border.bin +++ b/data/layouts/FiveIsland_LostCave_Room11/border.bin diff --git a/data/layouts/FiveIsland_LostCave_Room11_Layout/map.bin b/data/layouts/FiveIsland_LostCave_Room11/map.bin index 6af11f8cc..6af11f8cc 100644 --- a/data/layouts/FiveIsland_LostCave_Room11_Layout/map.bin +++ b/data/layouts/FiveIsland_LostCave_Room11/map.bin diff --git a/data/layouts/FiveIsland_LostCave_Room13_Layout/border.bin b/data/layouts/FiveIsland_LostCave_Room12/border.bin index a021ddd4e..a021ddd4e 100644 --- a/data/layouts/FiveIsland_LostCave_Room13_Layout/border.bin +++ b/data/layouts/FiveIsland_LostCave_Room12/border.bin diff --git a/data/layouts/FiveIsland_LostCave_Room12_Layout/map.bin b/data/layouts/FiveIsland_LostCave_Room12/map.bin index 6f77bfda9..6f77bfda9 100644 --- a/data/layouts/FiveIsland_LostCave_Room12_Layout/map.bin +++ b/data/layouts/FiveIsland_LostCave_Room12/map.bin diff --git a/data/layouts/FiveIsland_LostCave_Room14_Layout/border.bin b/data/layouts/FiveIsland_LostCave_Room13/border.bin index a021ddd4e..a021ddd4e 100644 --- a/data/layouts/FiveIsland_LostCave_Room14_Layout/border.bin +++ b/data/layouts/FiveIsland_LostCave_Room13/border.bin diff --git a/data/layouts/FiveIsland_LostCave_Room13_Layout/map.bin b/data/layouts/FiveIsland_LostCave_Room13/map.bin index bb1a69aa2..bb1a69aa2 100644 --- a/data/layouts/FiveIsland_LostCave_Room13_Layout/map.bin +++ b/data/layouts/FiveIsland_LostCave_Room13/map.bin diff --git a/data/layouts/FiveIsland_LostCave_Room1_Layout/border.bin b/data/layouts/FiveIsland_LostCave_Room14/border.bin index a021ddd4e..a021ddd4e 100644 --- a/data/layouts/FiveIsland_LostCave_Room1_Layout/border.bin +++ b/data/layouts/FiveIsland_LostCave_Room14/border.bin diff --git a/data/layouts/FiveIsland_LostCave_Room14_Layout/map.bin b/data/layouts/FiveIsland_LostCave_Room14/map.bin index a4849c5d4..a4849c5d4 100644 --- a/data/layouts/FiveIsland_LostCave_Room14_Layout/map.bin +++ b/data/layouts/FiveIsland_LostCave_Room14/map.bin diff --git a/data/layouts/FiveIsland_LostCave_Room2_Layout/border.bin b/data/layouts/FiveIsland_LostCave_Room2/border.bin index a021ddd4e..a021ddd4e 100644 --- a/data/layouts/FiveIsland_LostCave_Room2_Layout/border.bin +++ b/data/layouts/FiveIsland_LostCave_Room2/border.bin diff --git a/data/layouts/FiveIsland_LostCave_Room2_Layout/map.bin b/data/layouts/FiveIsland_LostCave_Room2/map.bin index f89ec37f3..f89ec37f3 100644 --- a/data/layouts/FiveIsland_LostCave_Room2_Layout/map.bin +++ b/data/layouts/FiveIsland_LostCave_Room2/map.bin diff --git a/data/layouts/FiveIsland_LostCave_Room3_Layout/border.bin b/data/layouts/FiveIsland_LostCave_Room3/border.bin index a021ddd4e..a021ddd4e 100644 --- a/data/layouts/FiveIsland_LostCave_Room3_Layout/border.bin +++ b/data/layouts/FiveIsland_LostCave_Room3/border.bin diff --git a/data/layouts/FiveIsland_LostCave_Room3_Layout/map.bin b/data/layouts/FiveIsland_LostCave_Room3/map.bin index 24073548c..24073548c 100644 --- a/data/layouts/FiveIsland_LostCave_Room3_Layout/map.bin +++ b/data/layouts/FiveIsland_LostCave_Room3/map.bin diff --git a/data/layouts/FiveIsland_LostCave_Room4_Layout/border.bin b/data/layouts/FiveIsland_LostCave_Room4/border.bin index a021ddd4e..a021ddd4e 100644 --- a/data/layouts/FiveIsland_LostCave_Room4_Layout/border.bin +++ b/data/layouts/FiveIsland_LostCave_Room4/border.bin diff --git a/data/layouts/FiveIsland_LostCave_Room4_Layout/map.bin b/data/layouts/FiveIsland_LostCave_Room4/map.bin index af2e57bb2..af2e57bb2 100644 --- a/data/layouts/FiveIsland_LostCave_Room4_Layout/map.bin +++ b/data/layouts/FiveIsland_LostCave_Room4/map.bin diff --git a/data/layouts/FiveIsland_LostCave_Room5_Layout/border.bin b/data/layouts/FiveIsland_LostCave_Room5/border.bin index a021ddd4e..a021ddd4e 100644 --- a/data/layouts/FiveIsland_LostCave_Room5_Layout/border.bin +++ b/data/layouts/FiveIsland_LostCave_Room5/border.bin diff --git a/data/layouts/FiveIsland_LostCave_Room5_Layout/map.bin b/data/layouts/FiveIsland_LostCave_Room5/map.bin index b8db9de80..b8db9de80 100644 --- a/data/layouts/FiveIsland_LostCave_Room5_Layout/map.bin +++ b/data/layouts/FiveIsland_LostCave_Room5/map.bin diff --git a/data/layouts/FiveIsland_LostCave_Room6_Layout/border.bin b/data/layouts/FiveIsland_LostCave_Room6/border.bin index a021ddd4e..a021ddd4e 100644 --- a/data/layouts/FiveIsland_LostCave_Room6_Layout/border.bin +++ b/data/layouts/FiveIsland_LostCave_Room6/border.bin diff --git a/data/layouts/FiveIsland_LostCave_Room6_Layout/map.bin b/data/layouts/FiveIsland_LostCave_Room6/map.bin index ddf7f4402..ddf7f4402 100644 --- a/data/layouts/FiveIsland_LostCave_Room6_Layout/map.bin +++ b/data/layouts/FiveIsland_LostCave_Room6/map.bin diff --git a/data/layouts/FiveIsland_LostCave_Room7_Layout/border.bin b/data/layouts/FiveIsland_LostCave_Room7/border.bin index a021ddd4e..a021ddd4e 100644 --- a/data/layouts/FiveIsland_LostCave_Room7_Layout/border.bin +++ b/data/layouts/FiveIsland_LostCave_Room7/border.bin diff --git a/data/layouts/FiveIsland_LostCave_Room7_Layout/map.bin b/data/layouts/FiveIsland_LostCave_Room7/map.bin index ff3353201..ff3353201 100644 --- a/data/layouts/FiveIsland_LostCave_Room7_Layout/map.bin +++ b/data/layouts/FiveIsland_LostCave_Room7/map.bin diff --git a/data/layouts/FiveIsland_LostCave_Room8_Layout/border.bin b/data/layouts/FiveIsland_LostCave_Room8/border.bin index a021ddd4e..a021ddd4e 100644 --- a/data/layouts/FiveIsland_LostCave_Room8_Layout/border.bin +++ b/data/layouts/FiveIsland_LostCave_Room8/border.bin diff --git a/data/layouts/FiveIsland_LostCave_Room8_Layout/map.bin b/data/layouts/FiveIsland_LostCave_Room8/map.bin index 452a62af2..452a62af2 100644 --- a/data/layouts/FiveIsland_LostCave_Room8_Layout/map.bin +++ b/data/layouts/FiveIsland_LostCave_Room8/map.bin diff --git a/data/layouts/FiveIsland_LostCave_Room9_Layout/border.bin b/data/layouts/FiveIsland_LostCave_Room9/border.bin index a021ddd4e..a021ddd4e 100644 --- a/data/layouts/FiveIsland_LostCave_Room9_Layout/border.bin +++ b/data/layouts/FiveIsland_LostCave_Room9/border.bin diff --git a/data/layouts/FiveIsland_LostCave_Room9_Layout/map.bin b/data/layouts/FiveIsland_LostCave_Room9/map.bin index ec3f1ac6e..ec3f1ac6e 100644 --- a/data/layouts/FiveIsland_LostCave_Room9_Layout/map.bin +++ b/data/layouts/FiveIsland_LostCave_Room9/map.bin diff --git a/data/layouts/FiveIsland_Meadow_Layout/border.bin b/data/layouts/FiveIsland_Meadow/border.bin index 730aab996..730aab996 100644 --- a/data/layouts/FiveIsland_Meadow_Layout/border.bin +++ b/data/layouts/FiveIsland_Meadow/border.bin diff --git a/data/layouts/FiveIsland_Meadow_Layout/map.bin b/data/layouts/FiveIsland_Meadow/map.bin index 6126a6fa4..6126a6fa4 100644 --- a/data/layouts/FiveIsland_Meadow_Layout/map.bin +++ b/data/layouts/FiveIsland_Meadow/map.bin diff --git a/data/layouts/FiveIsland_MemorialPillar_Layout/border.bin b/data/layouts/FiveIsland_MemorialPillar/border.bin index 730aab996..730aab996 100644 --- a/data/layouts/FiveIsland_MemorialPillar_Layout/border.bin +++ b/data/layouts/FiveIsland_MemorialPillar/border.bin diff --git a/data/layouts/FiveIsland_MemorialPillar_Layout/map.bin b/data/layouts/FiveIsland_MemorialPillar/map.bin Binary files differindex a5aae1ecc..a5aae1ecc 100644 --- a/data/layouts/FiveIsland_MemorialPillar_Layout/map.bin +++ b/data/layouts/FiveIsland_MemorialPillar/map.bin diff --git a/data/layouts/FiveIsland_ResortGorgeous_Layout/border.bin b/data/layouts/FiveIsland_ResortGorgeous/border.bin index 730aab996..730aab996 100644 --- a/data/layouts/FiveIsland_ResortGorgeous_Layout/border.bin +++ b/data/layouts/FiveIsland_ResortGorgeous/border.bin diff --git a/data/layouts/FiveIsland_ResortGorgeous_Layout/map.bin b/data/layouts/FiveIsland_ResortGorgeous/map.bin index aaf0ec4db..aaf0ec4db 100644 --- a/data/layouts/FiveIsland_ResortGorgeous_Layout/map.bin +++ b/data/layouts/FiveIsland_ResortGorgeous/map.bin diff --git a/data/layouts/FiveIsland_ResortGorgeous_House_Layout/border.bin b/data/layouts/FiveIsland_ResortGorgeous_House/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/FiveIsland_ResortGorgeous_House_Layout/border.bin +++ b/data/layouts/FiveIsland_ResortGorgeous_House/border.bin diff --git a/data/layouts/FiveIsland_ResortGorgeous_House_Layout/map.bin b/data/layouts/FiveIsland_ResortGorgeous_House/map.bin Binary files differindex f313d50eb..f313d50eb 100644 --- a/data/layouts/FiveIsland_ResortGorgeous_House_Layout/map.bin +++ b/data/layouts/FiveIsland_ResortGorgeous_House/map.bin diff --git a/data/layouts/FourIsland_LoreleisHouse_Layout/border.bin b/data/layouts/FiveIsland_RocketWarehouse/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/FourIsland_LoreleisHouse_Layout/border.bin +++ b/data/layouts/FiveIsland_RocketWarehouse/border.bin diff --git a/data/layouts/SSAnne_CaptainsOffice4_Layout/map.bin b/data/layouts/FiveIsland_RocketWarehouse/map.bin index aef63eaf1..aef63eaf1 100644 --- a/data/layouts/SSAnne_CaptainsOffice4_Layout/map.bin +++ b/data/layouts/FiveIsland_RocketWarehouse/map.bin diff --git a/data/layouts/FiveIsland_WaterLabyrinth_Layout/border.bin b/data/layouts/FiveIsland_WaterLabyrinth/border.bin index 730aab996..730aab996 100644 --- a/data/layouts/FiveIsland_WaterLabyrinth_Layout/border.bin +++ b/data/layouts/FiveIsland_WaterLabyrinth/border.bin diff --git a/data/layouts/FiveIsland_WaterLabyrinth_Layout/map.bin b/data/layouts/FiveIsland_WaterLabyrinth/map.bin index 66a91da60..66a91da60 100644 --- a/data/layouts/FiveIsland_WaterLabyrinth_Layout/map.bin +++ b/data/layouts/FiveIsland_WaterLabyrinth/map.bin diff --git a/data/layouts/FourIsland_Layout/border.bin b/data/layouts/FourIsland/border.bin index 75f2c916c..75f2c916c 100644 --- a/data/layouts/FourIsland_Layout/border.bin +++ b/data/layouts/FourIsland/border.bin diff --git a/data/layouts/FourIsland_Layout/map.bin b/data/layouts/FourIsland/map.bin index dd45ba9bd..dd45ba9bd 100644 --- a/data/layouts/FourIsland_Layout/map.bin +++ b/data/layouts/FourIsland/map.bin diff --git a/data/layouts/FourIsland_IcefallCave_1F_Layout/border.bin b/data/layouts/FourIsland_IcefallCave_1F/border.bin index a021ddd4e..a021ddd4e 100644 --- a/data/layouts/FourIsland_IcefallCave_1F_Layout/border.bin +++ b/data/layouts/FourIsland_IcefallCave_1F/border.bin diff --git a/data/layouts/FourIsland_IcefallCave_1F_Layout/map.bin b/data/layouts/FourIsland_IcefallCave_1F/map.bin Binary files differindex 22cfdf42e..22cfdf42e 100644 --- a/data/layouts/FourIsland_IcefallCave_1F_Layout/map.bin +++ b/data/layouts/FourIsland_IcefallCave_1F/map.bin diff --git a/data/layouts/FourIsland_IcefallCave_Entrance_Layout/border.bin b/data/layouts/FourIsland_IcefallCave_B1F/border.bin index a021ddd4e..a021ddd4e 100644 --- a/data/layouts/FourIsland_IcefallCave_Entrance_Layout/border.bin +++ b/data/layouts/FourIsland_IcefallCave_B1F/border.bin diff --git a/data/layouts/SSAnne_CaptainsOffice2_Layout/map.bin b/data/layouts/FourIsland_IcefallCave_B1F/map.bin index b3db8d893..b3db8d893 100644 --- a/data/layouts/SSAnne_CaptainsOffice2_Layout/map.bin +++ b/data/layouts/FourIsland_IcefallCave_B1F/map.bin diff --git a/data/layouts/MtEmber_RubyPath_B1F_Layout/border.bin b/data/layouts/FourIsland_IcefallCave_Back/border.bin index a021ddd4e..a021ddd4e 100644 --- a/data/layouts/MtEmber_RubyPath_B1F_Layout/border.bin +++ b/data/layouts/FourIsland_IcefallCave_Back/border.bin diff --git a/data/layouts/SSAnne_CaptainsOffice3_Layout/map.bin b/data/layouts/FourIsland_IcefallCave_Back/map.bin index aa44dd119..aa44dd119 100644 --- a/data/layouts/SSAnne_CaptainsOffice3_Layout/map.bin +++ b/data/layouts/FourIsland_IcefallCave_Back/map.bin diff --git a/data/layouts/MtEmber_RubyPath_B1F_Stairs_Layout/border.bin b/data/layouts/FourIsland_IcefallCave_Entrance/border.bin index a021ddd4e..a021ddd4e 100644 --- a/data/layouts/MtEmber_RubyPath_B1F_Stairs_Layout/border.bin +++ b/data/layouts/FourIsland_IcefallCave_Entrance/border.bin diff --git a/data/layouts/FourIsland_IcefallCave_Entrance_Layout/map.bin b/data/layouts/FourIsland_IcefallCave_Entrance/map.bin index b37ddd800..b37ddd800 100644 --- a/data/layouts/FourIsland_IcefallCave_Entrance_Layout/map.bin +++ b/data/layouts/FourIsland_IcefallCave_Entrance/map.bin diff --git a/data/layouts/FourIsland_PokemonDayCare_Layout/border.bin b/data/layouts/FourIsland_LoreleisHouse/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/FourIsland_PokemonDayCare_Layout/border.bin +++ b/data/layouts/FourIsland_LoreleisHouse/border.bin diff --git a/data/layouts/FourIsland_LoreleisHouse_Layout/map.bin b/data/layouts/FourIsland_LoreleisHouse/map.bin index 5ce78023d..5ce78023d 100644 --- a/data/layouts/FourIsland_LoreleisHouse_Layout/map.bin +++ b/data/layouts/FourIsland_LoreleisHouse/map.bin diff --git a/data/layouts/FuchsiaCity_Building1_Layout/border.bin b/data/layouts/FourIsland_PokemonDayCare/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/FuchsiaCity_Building1_Layout/border.bin +++ b/data/layouts/FourIsland_PokemonDayCare/border.bin diff --git a/data/layouts/FourIsland_PokemonDayCare_Layout/map.bin b/data/layouts/FourIsland_PokemonDayCare/map.bin index d7207d8ff..d7207d8ff 100644 --- a/data/layouts/FourIsland_PokemonDayCare_Layout/map.bin +++ b/data/layouts/FourIsland_PokemonDayCare/map.bin diff --git a/data/layouts/FuchsiaCity_Layout/border.bin b/data/layouts/FuchsiaCity/border.bin Binary files differindex a701312cf..a701312cf 100644 --- a/data/layouts/FuchsiaCity_Layout/border.bin +++ b/data/layouts/FuchsiaCity/border.bin diff --git a/data/layouts/FuchsiaCity_Layout/map.bin b/data/layouts/FuchsiaCity/map.bin index e1517ef1d..e1517ef1d 100644 --- a/data/layouts/FuchsiaCity_Layout/map.bin +++ b/data/layouts/FuchsiaCity/map.bin diff --git a/data/layouts/FuchsiaCity_Gym_Layout/border.bin b/data/layouts/FuchsiaCity_Building1/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/FuchsiaCity_Gym_Layout/border.bin +++ b/data/layouts/FuchsiaCity_Building1/border.bin diff --git a/data/layouts/FuchsiaCity_Building1_Layout/map.bin b/data/layouts/FuchsiaCity_Building1/map.bin index 4efd7d891..4efd7d891 100644 --- a/data/layouts/FuchsiaCity_Building1_Layout/map.bin +++ b/data/layouts/FuchsiaCity_Building1/map.bin diff --git a/data/layouts/FuchsiaCity_House2_Layout/border.bin b/data/layouts/FuchsiaCity_Gym/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/FuchsiaCity_House2_Layout/border.bin +++ b/data/layouts/FuchsiaCity_Gym/border.bin diff --git a/data/layouts/FuchsiaCity_Gym_Layout/map.bin b/data/layouts/FuchsiaCity_Gym/map.bin index 390ee14be..390ee14be 100644 --- a/data/layouts/FuchsiaCity_Gym_Layout/map.bin +++ b/data/layouts/FuchsiaCity_Gym/map.bin diff --git a/data/layouts/FuchsiaCity_SafariZone_Entrance_Layout/border.bin b/data/layouts/FuchsiaCity_House2/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/FuchsiaCity_SafariZone_Entrance_Layout/border.bin +++ b/data/layouts/FuchsiaCity_House2/border.bin diff --git a/data/layouts/FuchsiaCity_House2_Layout/map.bin b/data/layouts/FuchsiaCity_House2/map.bin index 83ebe0b15..83ebe0b15 100644 --- a/data/layouts/FuchsiaCity_House2_Layout/map.bin +++ b/data/layouts/FuchsiaCity_House2/map.bin diff --git a/data/layouts/FuchsiaCity_ZooBuilding_Layout/border.bin b/data/layouts/FuchsiaCity_SafariZone_Entrance/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/FuchsiaCity_ZooBuilding_Layout/border.bin +++ b/data/layouts/FuchsiaCity_SafariZone_Entrance/border.bin diff --git a/data/layouts/FuchsiaCity_SafariZone_Entrance_Layout/map.bin b/data/layouts/FuchsiaCity_SafariZone_Entrance/map.bin index e84271730..e84271730 100644 --- a/data/layouts/FuchsiaCity_SafariZone_Entrance_Layout/map.bin +++ b/data/layouts/FuchsiaCity_SafariZone_Entrance/map.bin diff --git a/data/layouts/House1_Layout/border.bin b/data/layouts/FuchsiaCity_ZooBuilding/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/House1_Layout/border.bin +++ b/data/layouts/FuchsiaCity_ZooBuilding/border.bin diff --git a/data/layouts/FuchsiaCity_ZooBuilding_Layout/map.bin b/data/layouts/FuchsiaCity_ZooBuilding/map.bin index d18ddbd61..d18ddbd61 100644 --- a/data/layouts/FuchsiaCity_ZooBuilding_Layout/map.bin +++ b/data/layouts/FuchsiaCity_ZooBuilding/map.bin diff --git a/data/layouts/House2_Layout/border.bin b/data/layouts/House1/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/House2_Layout/border.bin +++ b/data/layouts/House1/border.bin diff --git a/data/layouts/House1_Layout/map.bin b/data/layouts/House1/map.bin index 7fb8f8319..7fb8f8319 100644 --- a/data/layouts/House1_Layout/map.bin +++ b/data/layouts/House1/map.bin diff --git a/data/layouts/House3_Layout/border.bin b/data/layouts/House2/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/House3_Layout/border.bin +++ b/data/layouts/House2/border.bin diff --git a/data/layouts/House2_Layout/map.bin b/data/layouts/House2/map.bin index 2f2d83996..2f2d83996 100644 --- a/data/layouts/House2_Layout/map.bin +++ b/data/layouts/House2/map.bin diff --git a/data/layouts/House4_Layout/border.bin b/data/layouts/House3/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/House4_Layout/border.bin +++ b/data/layouts/House3/border.bin diff --git a/data/layouts/House3_Layout/map.bin b/data/layouts/House3/map.bin index 73c6abf89..73c6abf89 100644 --- a/data/layouts/House3_Layout/map.bin +++ b/data/layouts/House3/map.bin diff --git a/data/layouts/House5_Layout/border.bin b/data/layouts/House4/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/House5_Layout/border.bin +++ b/data/layouts/House4/border.bin diff --git a/data/layouts/House4_Layout/map.bin b/data/layouts/House4/map.bin index f74c83441..f74c83441 100644 --- a/data/layouts/House4_Layout/map.bin +++ b/data/layouts/House4/map.bin diff --git a/data/layouts/IndigoPlateau_PokemonCenter_1F_Layout/border.bin b/data/layouts/House5/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/IndigoPlateau_PokemonCenter_1F_Layout/border.bin +++ b/data/layouts/House5/border.bin diff --git a/data/layouts/House5_Layout/map.bin b/data/layouts/House5/map.bin index 4daf805f7..4daf805f7 100644 --- a/data/layouts/House5_Layout/map.bin +++ b/data/layouts/House5/map.bin diff --git a/data/layouts/IndigoPlateau_Exterior_Layout/border.bin b/data/layouts/IndigoPlateau_Exterior/border.bin Binary files differindex a701312cf..a701312cf 100644 --- a/data/layouts/IndigoPlateau_Exterior_Layout/border.bin +++ b/data/layouts/IndigoPlateau_Exterior/border.bin diff --git a/data/layouts/IndigoPlateau_Exterior_Layout/map.bin b/data/layouts/IndigoPlateau_Exterior/map.bin Binary files differindex 2bfc01f42..2bfc01f42 100644 --- a/data/layouts/IndigoPlateau_Exterior_Layout/map.bin +++ b/data/layouts/IndigoPlateau_Exterior/map.bin diff --git a/data/layouts/LavenderTown_VolunteerPokemonHouse_Layout/border.bin b/data/layouts/IndigoPlateau_PokemonCenter_1F/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/LavenderTown_VolunteerPokemonHouse_Layout/border.bin +++ b/data/layouts/IndigoPlateau_PokemonCenter_1F/border.bin diff --git a/data/layouts/IndigoPlateau_PokemonCenter_1F_Layout/map.bin b/data/layouts/IndigoPlateau_PokemonCenter_1F/map.bin Binary files differindex 9a9319f8e..9a9319f8e 100644 --- a/data/layouts/IndigoPlateau_PokemonCenter_1F_Layout/map.bin +++ b/data/layouts/IndigoPlateau_PokemonCenter_1F/map.bin diff --git a/data/layouts/Island_Harbor_Layout/border.bin b/data/layouts/Island_Harbor/border.bin index 536a722ec..536a722ec 100644 --- a/data/layouts/Island_Harbor_Layout/border.bin +++ b/data/layouts/Island_Harbor/border.bin diff --git a/data/layouts/Island_Harbor_Layout/map.bin b/data/layouts/Island_Harbor/map.bin index 353d5f450..353d5f450 100644 --- a/data/layouts/Island_Harbor_Layout/map.bin +++ b/data/layouts/Island_Harbor/map.bin diff --git a/data/layouts/LavenderTown_Layout/border.bin b/data/layouts/LavenderTown/border.bin Binary files differindex 4531975c7..4531975c7 100644 --- a/data/layouts/LavenderTown_Layout/border.bin +++ b/data/layouts/LavenderTown/border.bin diff --git a/data/layouts/LavenderTown_Layout/map.bin b/data/layouts/LavenderTown/map.bin index 9bba130ef..9bba130ef 100644 --- a/data/layouts/LavenderTown_Layout/map.bin +++ b/data/layouts/LavenderTown/map.bin diff --git a/data/layouts/Mart_Layout/border.bin b/data/layouts/LavenderTown_VolunteerPokemonHouse/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/Mart_Layout/border.bin +++ b/data/layouts/LavenderTown_VolunteerPokemonHouse/border.bin diff --git a/data/layouts/LavenderTown_VolunteerPokemonHouse_Layout/map.bin b/data/layouts/LavenderTown_VolunteerPokemonHouse/map.bin index 3e5dc6dda..3e5dc6dda 100644 --- a/data/layouts/LavenderTown_VolunteerPokemonHouse_Layout/map.bin +++ b/data/layouts/LavenderTown_VolunteerPokemonHouse/map.bin diff --git a/data/layouts/OneIsland_PokemonCenter_1F_Layout/border.bin b/data/layouts/Mart/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/OneIsland_PokemonCenter_1F_Layout/border.bin +++ b/data/layouts/Mart/border.bin diff --git a/data/layouts/Mart_Layout/map.bin b/data/layouts/Mart/map.bin index dee537e49..dee537e49 100644 --- a/data/layouts/Mart_Layout/map.bin +++ b/data/layouts/Mart/map.bin diff --git a/data/layouts/MtEmber_Exterior_Layout/border.bin b/data/layouts/MtEmber_Exterior/border.bin Binary files differindex 4531975c7..4531975c7 100644 --- a/data/layouts/MtEmber_Exterior_Layout/border.bin +++ b/data/layouts/MtEmber_Exterior/border.bin diff --git a/data/layouts/MtEmber_Exterior_Layout/map.bin b/data/layouts/MtEmber_Exterior/map.bin index 28f5cc749..28f5cc749 100644 --- a/data/layouts/MtEmber_Exterior_Layout/map.bin +++ b/data/layouts/MtEmber_Exterior/map.bin diff --git a/data/layouts/MtEmber_RubyPath_B2F_Layout/border.bin b/data/layouts/MtEmber_RubyPath_1F/border.bin index a021ddd4e..a021ddd4e 100644 --- a/data/layouts/MtEmber_RubyPath_B2F_Layout/border.bin +++ b/data/layouts/MtEmber_RubyPath_1F/border.bin diff --git a/data/layouts/SSAnne_Kitchen3_Layout/map.bin b/data/layouts/MtEmber_RubyPath_1F/map.bin index bfa5e7637..bfa5e7637 100644 --- a/data/layouts/SSAnne_Kitchen3_Layout/map.bin +++ b/data/layouts/MtEmber_RubyPath_1F/map.bin diff --git a/data/layouts/MtEmber_RubyPath_B2F_Stairs_Layout/border.bin b/data/layouts/MtEmber_RubyPath_B1F/border.bin index a021ddd4e..a021ddd4e 100644 --- a/data/layouts/MtEmber_RubyPath_B2F_Stairs_Layout/border.bin +++ b/data/layouts/MtEmber_RubyPath_B1F/border.bin diff --git a/data/layouts/MtEmber_RubyPath_B1F_Layout/map.bin b/data/layouts/MtEmber_RubyPath_B1F/map.bin index e92a27510..e92a27510 100644 --- a/data/layouts/MtEmber_RubyPath_B1F_Layout/map.bin +++ b/data/layouts/MtEmber_RubyPath_B1F/map.bin diff --git a/data/layouts/MtEmber_RubyPath_B3F_Layout/border.bin b/data/layouts/MtEmber_RubyPath_B1F_Stairs/border.bin index a021ddd4e..a021ddd4e 100644 --- a/data/layouts/MtEmber_RubyPath_B3F_Layout/border.bin +++ b/data/layouts/MtEmber_RubyPath_B1F_Stairs/border.bin diff --git a/data/layouts/MtEmber_RubyPath_B1F_Stairs_Layout/map.bin b/data/layouts/MtEmber_RubyPath_B1F_Stairs/map.bin index 1ac916e78..1ac916e78 100644 --- a/data/layouts/MtEmber_RubyPath_B1F_Stairs_Layout/map.bin +++ b/data/layouts/MtEmber_RubyPath_B1F_Stairs/map.bin diff --git a/data/layouts/MtEmber_RubyPath_B4F_Layout/border.bin b/data/layouts/MtEmber_RubyPath_B2F/border.bin index a021ddd4e..a021ddd4e 100644 --- a/data/layouts/MtEmber_RubyPath_B4F_Layout/border.bin +++ b/data/layouts/MtEmber_RubyPath_B2F/border.bin diff --git a/data/layouts/MtEmber_RubyPath_B2F_Layout/map.bin b/data/layouts/MtEmber_RubyPath_B2F/map.bin index 09813c497..09813c497 100644 --- a/data/layouts/MtEmber_RubyPath_B2F_Layout/map.bin +++ b/data/layouts/MtEmber_RubyPath_B2F/map.bin diff --git a/data/layouts/MtEmber_RubyPath_B5F_Layout/border.bin b/data/layouts/MtEmber_RubyPath_B2F_Stairs/border.bin index a021ddd4e..a021ddd4e 100644 --- a/data/layouts/MtEmber_RubyPath_B5F_Layout/border.bin +++ b/data/layouts/MtEmber_RubyPath_B2F_Stairs/border.bin diff --git a/data/layouts/MtEmber_RubyPath_B2F_Stairs_Layout/map.bin b/data/layouts/MtEmber_RubyPath_B2F_Stairs/map.bin index 4c7388aa5..4c7388aa5 100644 --- a/data/layouts/MtEmber_RubyPath_B2F_Stairs_Layout/map.bin +++ b/data/layouts/MtEmber_RubyPath_B2F_Stairs/map.bin diff --git a/data/layouts/MtEmber_SummitPath_1F_Layout/border.bin b/data/layouts/MtEmber_RubyPath_B3F/border.bin index a021ddd4e..a021ddd4e 100644 --- a/data/layouts/MtEmber_SummitPath_1F_Layout/border.bin +++ b/data/layouts/MtEmber_RubyPath_B3F/border.bin diff --git a/data/layouts/MtEmber_RubyPath_B3F_Layout/map.bin b/data/layouts/MtEmber_RubyPath_B3F/map.bin index 882838538..882838538 100644 --- a/data/layouts/MtEmber_RubyPath_B3F_Layout/map.bin +++ b/data/layouts/MtEmber_RubyPath_B3F/map.bin diff --git a/data/layouts/MtEmber_SummitPath_2F_Layout/border.bin b/data/layouts/MtEmber_RubyPath_B4F/border.bin index a021ddd4e..a021ddd4e 100644 --- a/data/layouts/MtEmber_SummitPath_2F_Layout/border.bin +++ b/data/layouts/MtEmber_RubyPath_B4F/border.bin diff --git a/data/layouts/MtEmber_RubyPath_B4F_Layout/map.bin b/data/layouts/MtEmber_RubyPath_B4F/map.bin Binary files differindex ea974a47e..ea974a47e 100644 --- a/data/layouts/MtEmber_RubyPath_B4F_Layout/map.bin +++ b/data/layouts/MtEmber_RubyPath_B4F/map.bin diff --git a/data/layouts/MtEmber_SummitPath_3F_Layout/border.bin b/data/layouts/MtEmber_RubyPath_B5F/border.bin index a021ddd4e..a021ddd4e 100644 --- a/data/layouts/MtEmber_SummitPath_3F_Layout/border.bin +++ b/data/layouts/MtEmber_RubyPath_B5F/border.bin diff --git a/data/layouts/MtEmber_RubyPath_B5F_Layout/map.bin b/data/layouts/MtEmber_RubyPath_B5F/map.bin Binary files differindex e67aaa03d..e67aaa03d 100644 --- a/data/layouts/MtEmber_RubyPath_B5F_Layout/map.bin +++ b/data/layouts/MtEmber_RubyPath_B5F/map.bin diff --git a/data/layouts/MtEmber_Summit_Layout/border.bin b/data/layouts/MtEmber_Summit/border.bin Binary files differindex 4531975c7..4531975c7 100644 --- a/data/layouts/MtEmber_Summit_Layout/border.bin +++ b/data/layouts/MtEmber_Summit/border.bin diff --git a/data/layouts/MtEmber_Summit_Layout/map.bin b/data/layouts/MtEmber_Summit/map.bin index 603170671..603170671 100644 --- a/data/layouts/MtEmber_Summit_Layout/map.bin +++ b/data/layouts/MtEmber_Summit/map.bin diff --git a/data/layouts/MtMoon_1F_Layout/border.bin b/data/layouts/MtEmber_SummitPath_1F/border.bin index a021ddd4e..a021ddd4e 100644 --- a/data/layouts/MtMoon_1F_Layout/border.bin +++ b/data/layouts/MtEmber_SummitPath_1F/border.bin diff --git a/data/layouts/MtEmber_SummitPath_1F_Layout/map.bin b/data/layouts/MtEmber_SummitPath_1F/map.bin index 40ec58172..40ec58172 100644 --- a/data/layouts/MtEmber_SummitPath_1F_Layout/map.bin +++ b/data/layouts/MtEmber_SummitPath_1F/map.bin diff --git a/data/layouts/NavelRock_1F_Layout/border.bin b/data/layouts/MtEmber_SummitPath_2F/border.bin index a021ddd4e..a021ddd4e 100644 --- a/data/layouts/NavelRock_1F_Layout/border.bin +++ b/data/layouts/MtEmber_SummitPath_2F/border.bin diff --git a/data/layouts/MtEmber_SummitPath_2F_Layout/map.bin b/data/layouts/MtEmber_SummitPath_2F/map.bin index 960c58b68..960c58b68 100644 --- a/data/layouts/MtEmber_SummitPath_2F_Layout/map.bin +++ b/data/layouts/MtEmber_SummitPath_2F/map.bin diff --git a/data/layouts/NavelRock_B1F_Layout/border.bin b/data/layouts/MtEmber_SummitPath_3F/border.bin index a021ddd4e..a021ddd4e 100644 --- a/data/layouts/NavelRock_B1F_Layout/border.bin +++ b/data/layouts/MtEmber_SummitPath_3F/border.bin diff --git a/data/layouts/MtEmber_SummitPath_3F_Layout/map.bin b/data/layouts/MtEmber_SummitPath_3F/map.bin index b107b027e..b107b027e 100644 --- a/data/layouts/MtEmber_SummitPath_3F_Layout/map.bin +++ b/data/layouts/MtEmber_SummitPath_3F/map.bin diff --git a/data/layouts/NavelRock_BasePath_B10F_Layout/border.bin b/data/layouts/MtMoon_1F/border.bin index a021ddd4e..a021ddd4e 100644 --- a/data/layouts/NavelRock_BasePath_B10F_Layout/border.bin +++ b/data/layouts/MtMoon_1F/border.bin diff --git a/data/layouts/MtMoon_1F_Layout/map.bin b/data/layouts/MtMoon_1F/map.bin Binary files differindex 0a2146855..0a2146855 100644 --- a/data/layouts/MtMoon_1F_Layout/map.bin +++ b/data/layouts/MtMoon_1F/map.bin diff --git a/data/layouts/MtMoon_B1F_Layout/border.bin b/data/layouts/MtMoon_B1F/border.bin index 23857cf75..23857cf75 100644 --- a/data/layouts/MtMoon_B1F_Layout/border.bin +++ b/data/layouts/MtMoon_B1F/border.bin diff --git a/data/layouts/MtMoon_B1F_Layout/map.bin b/data/layouts/MtMoon_B1F/map.bin Binary files differindex 89714677c..89714677c 100644 --- a/data/layouts/MtMoon_B1F_Layout/map.bin +++ b/data/layouts/MtMoon_B1F/map.bin diff --git a/data/layouts/MtMoon_B2F_Layout/border.bin b/data/layouts/MtMoon_B2F/border.bin index 23857cf75..23857cf75 100644 --- a/data/layouts/MtMoon_B2F_Layout/border.bin +++ b/data/layouts/MtMoon_B2F/border.bin diff --git a/data/layouts/MtMoon_B2F_Layout/map.bin b/data/layouts/MtMoon_B2F/map.bin index 9b546adb5..9b546adb5 100644 --- a/data/layouts/MtMoon_B2F_Layout/map.bin +++ b/data/layouts/MtMoon_B2F/map.bin diff --git a/data/layouts/NavelRock_BasePath_B11F_Layout/border.bin b/data/layouts/NavelRock_1F/border.bin index a021ddd4e..a021ddd4e 100644 --- a/data/layouts/NavelRock_BasePath_B11F_Layout/border.bin +++ b/data/layouts/NavelRock_1F/border.bin diff --git a/data/layouts/NavelRock_1F_Layout/map.bin b/data/layouts/NavelRock_1F/map.bin index 6398304c9..6398304c9 100644 --- a/data/layouts/NavelRock_1F_Layout/map.bin +++ b/data/layouts/NavelRock_1F/map.bin diff --git a/data/layouts/NavelRock_BasePath_B1F_Layout/border.bin b/data/layouts/NavelRock_B1F/border.bin index a021ddd4e..a021ddd4e 100644 --- a/data/layouts/NavelRock_BasePath_B1F_Layout/border.bin +++ b/data/layouts/NavelRock_B1F/border.bin diff --git a/data/layouts/NavelRock_B1F_Layout/map.bin b/data/layouts/NavelRock_B1F/map.bin index 856e2a21f..856e2a21f 100644 --- a/data/layouts/NavelRock_B1F_Layout/map.bin +++ b/data/layouts/NavelRock_B1F/map.bin diff --git a/data/layouts/NavelRock_BasePath_B2F_Layout/border.bin b/data/layouts/NavelRock_Base/border.bin index a021ddd4e..a021ddd4e 100644 --- a/data/layouts/NavelRock_BasePath_B2F_Layout/border.bin +++ b/data/layouts/NavelRock_Base/border.bin diff --git a/data/layouts/NavelRock_Base_Layout/map.bin b/data/layouts/NavelRock_Base/map.bin index dcfeee21e..dcfeee21e 100644 --- a/data/layouts/NavelRock_Base_Layout/map.bin +++ b/data/layouts/NavelRock_Base/map.bin diff --git a/data/layouts/NavelRock_BasePath_B3F_Layout/border.bin b/data/layouts/NavelRock_BasePath_B10F/border.bin index a021ddd4e..a021ddd4e 100644 --- a/data/layouts/NavelRock_BasePath_B3F_Layout/border.bin +++ b/data/layouts/NavelRock_BasePath_B10F/border.bin diff --git a/data/layouts/NavelRock_BasePath_B10F_Layout/map.bin b/data/layouts/NavelRock_BasePath_B10F/map.bin index 3f718d185..3f718d185 100644 --- a/data/layouts/NavelRock_BasePath_B10F_Layout/map.bin +++ b/data/layouts/NavelRock_BasePath_B10F/map.bin diff --git a/data/layouts/NavelRock_BasePath_B4F_Layout/border.bin b/data/layouts/NavelRock_BasePath_B11F/border.bin index a021ddd4e..a021ddd4e 100644 --- a/data/layouts/NavelRock_BasePath_B4F_Layout/border.bin +++ b/data/layouts/NavelRock_BasePath_B11F/border.bin diff --git a/data/layouts/NavelRock_BasePath_B11F_Layout/map.bin b/data/layouts/NavelRock_BasePath_B11F/map.bin index 48a1246d4..48a1246d4 100644 --- a/data/layouts/NavelRock_BasePath_B11F_Layout/map.bin +++ b/data/layouts/NavelRock_BasePath_B11F/map.bin diff --git a/data/layouts/NavelRock_BasePath_B5F_Layout/border.bin b/data/layouts/NavelRock_BasePath_B1F/border.bin index a021ddd4e..a021ddd4e 100644 --- a/data/layouts/NavelRock_BasePath_B5F_Layout/border.bin +++ b/data/layouts/NavelRock_BasePath_B1F/border.bin diff --git a/data/layouts/NavelRock_BasePath_B1F_Layout/map.bin b/data/layouts/NavelRock_BasePath_B1F/map.bin index 48a1246d4..48a1246d4 100644 --- a/data/layouts/NavelRock_BasePath_B1F_Layout/map.bin +++ b/data/layouts/NavelRock_BasePath_B1F/map.bin diff --git a/data/layouts/NavelRock_BasePath_B6F_Layout/border.bin b/data/layouts/NavelRock_BasePath_B2F/border.bin index a021ddd4e..a021ddd4e 100644 --- a/data/layouts/NavelRock_BasePath_B6F_Layout/border.bin +++ b/data/layouts/NavelRock_BasePath_B2F/border.bin diff --git a/data/layouts/NavelRock_BasePath_B2F_Layout/map.bin b/data/layouts/NavelRock_BasePath_B2F/map.bin index 3f718d185..3f718d185 100644 --- a/data/layouts/NavelRock_BasePath_B2F_Layout/map.bin +++ b/data/layouts/NavelRock_BasePath_B2F/map.bin diff --git a/data/layouts/NavelRock_BasePath_B7F_Layout/border.bin b/data/layouts/NavelRock_BasePath_B3F/border.bin index a021ddd4e..a021ddd4e 100644 --- a/data/layouts/NavelRock_BasePath_B7F_Layout/border.bin +++ b/data/layouts/NavelRock_BasePath_B3F/border.bin diff --git a/data/layouts/NavelRock_BasePath_B3F_Layout/map.bin b/data/layouts/NavelRock_BasePath_B3F/map.bin index 48a1246d4..48a1246d4 100644 --- a/data/layouts/NavelRock_BasePath_B3F_Layout/map.bin +++ b/data/layouts/NavelRock_BasePath_B3F/map.bin diff --git a/data/layouts/NavelRock_BasePath_B8F_Layout/border.bin b/data/layouts/NavelRock_BasePath_B4F/border.bin index a021ddd4e..a021ddd4e 100644 --- a/data/layouts/NavelRock_BasePath_B8F_Layout/border.bin +++ b/data/layouts/NavelRock_BasePath_B4F/border.bin diff --git a/data/layouts/NavelRock_BasePath_B4F_Layout/map.bin b/data/layouts/NavelRock_BasePath_B4F/map.bin index 3f718d185..3f718d185 100644 --- a/data/layouts/NavelRock_BasePath_B4F_Layout/map.bin +++ b/data/layouts/NavelRock_BasePath_B4F/map.bin diff --git a/data/layouts/NavelRock_BasePath_B9F_Layout/border.bin b/data/layouts/NavelRock_BasePath_B5F/border.bin index a021ddd4e..a021ddd4e 100644 --- a/data/layouts/NavelRock_BasePath_B9F_Layout/border.bin +++ b/data/layouts/NavelRock_BasePath_B5F/border.bin diff --git a/data/layouts/NavelRock_BasePath_B5F_Layout/map.bin b/data/layouts/NavelRock_BasePath_B5F/map.bin index 48a1246d4..48a1246d4 100644 --- a/data/layouts/NavelRock_BasePath_B5F_Layout/map.bin +++ b/data/layouts/NavelRock_BasePath_B5F/map.bin diff --git a/data/layouts/NavelRock_Base_Layout/border.bin b/data/layouts/NavelRock_BasePath_B6F/border.bin index a021ddd4e..a021ddd4e 100644 --- a/data/layouts/NavelRock_Base_Layout/border.bin +++ b/data/layouts/NavelRock_BasePath_B6F/border.bin diff --git a/data/layouts/NavelRock_BasePath_B6F_Layout/map.bin b/data/layouts/NavelRock_BasePath_B6F/map.bin index 3f718d185..3f718d185 100644 --- a/data/layouts/NavelRock_BasePath_B6F_Layout/map.bin +++ b/data/layouts/NavelRock_BasePath_B6F/map.bin diff --git a/data/layouts/NavelRock_Fork_Layout/border.bin b/data/layouts/NavelRock_BasePath_B7F/border.bin index a021ddd4e..a021ddd4e 100644 --- a/data/layouts/NavelRock_Fork_Layout/border.bin +++ b/data/layouts/NavelRock_BasePath_B7F/border.bin diff --git a/data/layouts/NavelRock_BasePath_B7F_Layout/map.bin b/data/layouts/NavelRock_BasePath_B7F/map.bin index 48a1246d4..48a1246d4 100644 --- a/data/layouts/NavelRock_BasePath_B7F_Layout/map.bin +++ b/data/layouts/NavelRock_BasePath_B7F/map.bin diff --git a/data/layouts/NavelRock_SummitPath_2F_Layout/border.bin b/data/layouts/NavelRock_BasePath_B8F/border.bin index a021ddd4e..a021ddd4e 100644 --- a/data/layouts/NavelRock_SummitPath_2F_Layout/border.bin +++ b/data/layouts/NavelRock_BasePath_B8F/border.bin diff --git a/data/layouts/NavelRock_BasePath_B8F_Layout/map.bin b/data/layouts/NavelRock_BasePath_B8F/map.bin index 3f718d185..3f718d185 100644 --- a/data/layouts/NavelRock_BasePath_B8F_Layout/map.bin +++ b/data/layouts/NavelRock_BasePath_B8F/map.bin diff --git a/data/layouts/NavelRock_SummitPath_3F_Layout/border.bin b/data/layouts/NavelRock_BasePath_B9F/border.bin index a021ddd4e..a021ddd4e 100644 --- a/data/layouts/NavelRock_SummitPath_3F_Layout/border.bin +++ b/data/layouts/NavelRock_BasePath_B9F/border.bin diff --git a/data/layouts/NavelRock_BasePath_B9F_Layout/map.bin b/data/layouts/NavelRock_BasePath_B9F/map.bin index 48a1246d4..48a1246d4 100644 --- a/data/layouts/NavelRock_BasePath_B9F_Layout/map.bin +++ b/data/layouts/NavelRock_BasePath_B9F/map.bin diff --git a/data/layouts/NavelRock_Exterior_Layout/border.bin b/data/layouts/NavelRock_Exterior/border.bin index 75f2c916c..75f2c916c 100644 --- a/data/layouts/NavelRock_Exterior_Layout/border.bin +++ b/data/layouts/NavelRock_Exterior/border.bin diff --git a/data/layouts/NavelRock_Exterior_Layout/map.bin b/data/layouts/NavelRock_Exterior/map.bin Binary files differindex 4d169ee3a..4d169ee3a 100644 --- a/data/layouts/NavelRock_Exterior_Layout/map.bin +++ b/data/layouts/NavelRock_Exterior/map.bin diff --git a/data/layouts/NavelRock_SummitPath_4F_Layout/border.bin b/data/layouts/NavelRock_Fork/border.bin index a021ddd4e..a021ddd4e 100644 --- a/data/layouts/NavelRock_SummitPath_4F_Layout/border.bin +++ b/data/layouts/NavelRock_Fork/border.bin diff --git a/data/layouts/NavelRock_Fork_Layout/map.bin b/data/layouts/NavelRock_Fork/map.bin index e6ce2d331..e6ce2d331 100644 --- a/data/layouts/NavelRock_Fork_Layout/map.bin +++ b/data/layouts/NavelRock_Fork/map.bin diff --git a/data/layouts/NavelRock_Summit_Layout/border.bin b/data/layouts/NavelRock_Summit/border.bin index 4ecad6cd2..4ecad6cd2 100644 --- a/data/layouts/NavelRock_Summit_Layout/border.bin +++ b/data/layouts/NavelRock_Summit/border.bin diff --git a/data/layouts/NavelRock_Summit_Layout/map.bin b/data/layouts/NavelRock_Summit/map.bin index d49777f32..d49777f32 100644 --- a/data/layouts/NavelRock_Summit_Layout/map.bin +++ b/data/layouts/NavelRock_Summit/map.bin diff --git a/data/layouts/NavelRock_SummitPath_5F_Layout/border.bin b/data/layouts/NavelRock_SummitPath_2F/border.bin index a021ddd4e..a021ddd4e 100644 --- a/data/layouts/NavelRock_SummitPath_5F_Layout/border.bin +++ b/data/layouts/NavelRock_SummitPath_2F/border.bin diff --git a/data/layouts/NavelRock_SummitPath_2F_Layout/map.bin b/data/layouts/NavelRock_SummitPath_2F/map.bin index 48a1246d4..48a1246d4 100644 --- a/data/layouts/NavelRock_SummitPath_2F_Layout/map.bin +++ b/data/layouts/NavelRock_SummitPath_2F/map.bin diff --git a/data/layouts/OneIsland_KindleRoad_EmberSpa_Layout/border.bin b/data/layouts/NavelRock_SummitPath_3F/border.bin index a021ddd4e..a021ddd4e 100644 --- a/data/layouts/OneIsland_KindleRoad_EmberSpa_Layout/border.bin +++ b/data/layouts/NavelRock_SummitPath_3F/border.bin diff --git a/data/layouts/NavelRock_SummitPath_3F_Layout/map.bin b/data/layouts/NavelRock_SummitPath_3F/map.bin index 3f718d185..3f718d185 100644 --- a/data/layouts/NavelRock_SummitPath_3F_Layout/map.bin +++ b/data/layouts/NavelRock_SummitPath_3F/map.bin diff --git a/data/layouts/RockTunnel_1F_Layout/border.bin b/data/layouts/NavelRock_SummitPath_4F/border.bin index a021ddd4e..a021ddd4e 100644 --- a/data/layouts/RockTunnel_1F_Layout/border.bin +++ b/data/layouts/NavelRock_SummitPath_4F/border.bin diff --git a/data/layouts/NavelRock_SummitPath_4F_Layout/map.bin b/data/layouts/NavelRock_SummitPath_4F/map.bin index 48a1246d4..48a1246d4 100644 --- a/data/layouts/NavelRock_SummitPath_4F_Layout/map.bin +++ b/data/layouts/NavelRock_SummitPath_4F/map.bin diff --git a/data/layouts/RockTunnel_B1F_Layout/border.bin b/data/layouts/NavelRock_SummitPath_5F/border.bin index a021ddd4e..a021ddd4e 100644 --- a/data/layouts/RockTunnel_B1F_Layout/border.bin +++ b/data/layouts/NavelRock_SummitPath_5F/border.bin diff --git a/data/layouts/NavelRock_SummitPath_5F_Layout/map.bin b/data/layouts/NavelRock_SummitPath_5F/map.bin index 3f718d185..3f718d185 100644 --- a/data/layouts/NavelRock_SummitPath_5F_Layout/map.bin +++ b/data/layouts/NavelRock_SummitPath_5F/map.bin diff --git a/data/layouts/OneIsland_KindleRoad_Layout/border.bin b/data/layouts/OneIsland/border.bin index 730aab996..730aab996 100644 --- a/data/layouts/OneIsland_KindleRoad_Layout/border.bin +++ b/data/layouts/OneIsland/border.bin diff --git a/data/layouts/OneIsland_Layout/map.bin b/data/layouts/OneIsland/map.bin index 26fbb1b50..26fbb1b50 100644 --- a/data/layouts/OneIsland_Layout/map.bin +++ b/data/layouts/OneIsland/map.bin diff --git a/data/layouts/OneIsland_Layout/border.bin b/data/layouts/OneIsland_KindleRoad/border.bin index 730aab996..730aab996 100644 --- a/data/layouts/OneIsland_Layout/border.bin +++ b/data/layouts/OneIsland_KindleRoad/border.bin diff --git a/data/layouts/OneIsland_KindleRoad_Layout/map.bin b/data/layouts/OneIsland_KindleRoad/map.bin Binary files differindex 4d4abca6d..4d4abca6d 100644 --- a/data/layouts/OneIsland_KindleRoad_Layout/map.bin +++ b/data/layouts/OneIsland_KindleRoad/map.bin diff --git a/data/layouts/SSAnne_1F_Room12_Layout/border.bin b/data/layouts/OneIsland_KindleRoad_EmberSpa/border.bin index a021ddd4e..a021ddd4e 100644 --- a/data/layouts/SSAnne_1F_Room12_Layout/border.bin +++ b/data/layouts/OneIsland_KindleRoad_EmberSpa/border.bin diff --git a/data/layouts/OneIsland_KindleRoad_EmberSpa_Layout/map.bin b/data/layouts/OneIsland_KindleRoad_EmberSpa/map.bin index 9817d8614..9817d8614 100644 --- a/data/layouts/OneIsland_KindleRoad_EmberSpa_Layout/map.bin +++ b/data/layouts/OneIsland_KindleRoad_EmberSpa/map.bin diff --git a/data/layouts/OneIsland_PokemonCenter_2F_Layout/border.bin b/data/layouts/OneIsland_PokemonCenter_1F/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/OneIsland_PokemonCenter_2F_Layout/border.bin +++ b/data/layouts/OneIsland_PokemonCenter_1F/border.bin diff --git a/data/layouts/OneIsland_PokemonCenter_1F_Layout/map.bin b/data/layouts/OneIsland_PokemonCenter_1F/map.bin index a9016b670..a9016b670 100644 --- a/data/layouts/OneIsland_PokemonCenter_1F_Layout/map.bin +++ b/data/layouts/OneIsland_PokemonCenter_1F/map.bin diff --git a/data/layouts/PalletTown_GarysHouse_Layout/border.bin b/data/layouts/OneIsland_PokemonCenter_2F/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/PalletTown_GarysHouse_Layout/border.bin +++ b/data/layouts/OneIsland_PokemonCenter_2F/border.bin diff --git a/data/layouts/OneIsland_PokemonCenter_2F_Layout/map.bin b/data/layouts/OneIsland_PokemonCenter_2F/map.bin Binary files differindex a1b551a73..a1b551a73 100644 --- a/data/layouts/OneIsland_PokemonCenter_2F_Layout/map.bin +++ b/data/layouts/OneIsland_PokemonCenter_2F/map.bin diff --git a/data/layouts/OneIsland_TreasureBeach_Layout/border.bin b/data/layouts/OneIsland_TreasureBeach/border.bin index 730aab996..730aab996 100644 --- a/data/layouts/OneIsland_TreasureBeach_Layout/border.bin +++ b/data/layouts/OneIsland_TreasureBeach/border.bin diff --git a/data/layouts/OneIsland_TreasureBeach_Layout/map.bin b/data/layouts/OneIsland_TreasureBeach/map.bin Binary files differindex fe6ef01a7..fe6ef01a7 100644 --- a/data/layouts/OneIsland_TreasureBeach_Layout/map.bin +++ b/data/layouts/OneIsland_TreasureBeach/map.bin diff --git a/data/layouts/PalletTown_Layout/border.bin b/data/layouts/PalletTown/border.bin Binary files differindex a701312cf..a701312cf 100644 --- a/data/layouts/PalletTown_Layout/border.bin +++ b/data/layouts/PalletTown/border.bin diff --git a/data/layouts/PalletTown_Layout/map.bin b/data/layouts/PalletTown/map.bin index f2113394f..f2113394f 100644 --- a/data/layouts/PalletTown_Layout/map.bin +++ b/data/layouts/PalletTown/map.bin diff --git a/data/layouts/PalletTown_PlayersHouse_1F_Layout/border.bin b/data/layouts/PalletTown_GarysHouse/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/PalletTown_PlayersHouse_1F_Layout/border.bin +++ b/data/layouts/PalletTown_GarysHouse/border.bin diff --git a/data/layouts/PalletTown_GarysHouse_Layout/map.bin b/data/layouts/PalletTown_GarysHouse/map.bin index a29b5dbdc..a29b5dbdc 100644 --- a/data/layouts/PalletTown_GarysHouse_Layout/map.bin +++ b/data/layouts/PalletTown_GarysHouse/map.bin diff --git a/data/layouts/PalletTown_PlayersHouse_2F_Layout/border.bin b/data/layouts/PalletTown_PlayersHouse_1F/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/PalletTown_PlayersHouse_2F_Layout/border.bin +++ b/data/layouts/PalletTown_PlayersHouse_1F/border.bin diff --git a/data/layouts/PalletTown_PlayersHouse_1F_Layout/map.bin b/data/layouts/PalletTown_PlayersHouse_1F/map.bin index b93d823c9..b93d823c9 100644 --- a/data/layouts/PalletTown_PlayersHouse_1F_Layout/map.bin +++ b/data/layouts/PalletTown_PlayersHouse_1F/map.bin diff --git a/data/layouts/PalletTown_ProfessorOaksLab_Layout/border.bin b/data/layouts/PalletTown_PlayersHouse_2F/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/PalletTown_ProfessorOaksLab_Layout/border.bin +++ b/data/layouts/PalletTown_PlayersHouse_2F/border.bin diff --git a/data/layouts/PalletTown_PlayersHouse_2F_Layout/map.bin b/data/layouts/PalletTown_PlayersHouse_2F/map.bin Binary files differindex b5d3bee2d..b5d3bee2d 100644 --- a/data/layouts/PalletTown_PlayersHouse_2F_Layout/map.bin +++ b/data/layouts/PalletTown_PlayersHouse_2F/map.bin diff --git a/data/layouts/PewterCity_Gym_Layout/border.bin b/data/layouts/PalletTown_ProfessorOaksLab/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/PewterCity_Gym_Layout/border.bin +++ b/data/layouts/PalletTown_ProfessorOaksLab/border.bin diff --git a/data/layouts/PalletTown_ProfessorOaksLab_Layout/map.bin b/data/layouts/PalletTown_ProfessorOaksLab/map.bin index 1067109ab..1067109ab 100644 --- a/data/layouts/PalletTown_ProfessorOaksLab_Layout/map.bin +++ b/data/layouts/PalletTown_ProfessorOaksLab/map.bin diff --git a/data/layouts/PewterCity_Layout/border.bin b/data/layouts/PewterCity/border.bin Binary files differindex a701312cf..a701312cf 100644 --- a/data/layouts/PewterCity_Layout/border.bin +++ b/data/layouts/PewterCity/border.bin diff --git a/data/layouts/PewterCity_Layout/map.bin b/data/layouts/PewterCity/map.bin index fc42368cb..fc42368cb 100644 --- a/data/layouts/PewterCity_Layout/map.bin +++ b/data/layouts/PewterCity/map.bin diff --git a/data/layouts/PewterCity_Museum_1F_Layout/border.bin b/data/layouts/PewterCity_Gym/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/PewterCity_Museum_1F_Layout/border.bin +++ b/data/layouts/PewterCity_Gym/border.bin diff --git a/data/layouts/PewterCity_Gym_Layout/map.bin b/data/layouts/PewterCity_Gym/map.bin index 7a22de0f9..7a22de0f9 100644 --- a/data/layouts/PewterCity_Gym_Layout/map.bin +++ b/data/layouts/PewterCity_Gym/map.bin diff --git a/data/layouts/PewterCity_Museum_2F_Layout/border.bin b/data/layouts/PewterCity_Museum_1F/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/PewterCity_Museum_2F_Layout/border.bin +++ b/data/layouts/PewterCity_Museum_1F/border.bin diff --git a/data/layouts/PewterCity_Museum_1F_Layout/map.bin b/data/layouts/PewterCity_Museum_1F/map.bin index 1485da6ef..1485da6ef 100644 --- a/data/layouts/PewterCity_Museum_1F_Layout/map.bin +++ b/data/layouts/PewterCity_Museum_1F/map.bin diff --git a/data/layouts/PokemonCenter_1F_Layout/border.bin b/data/layouts/PewterCity_Museum_2F/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/PokemonCenter_1F_Layout/border.bin +++ b/data/layouts/PewterCity_Museum_2F/border.bin diff --git a/data/layouts/PewterCity_Museum_2F_Layout/map.bin b/data/layouts/PewterCity_Museum_2F/map.bin index d8d372f70..d8d372f70 100644 --- a/data/layouts/PewterCity_Museum_2F_Layout/map.bin +++ b/data/layouts/PewterCity_Museum_2F/map.bin diff --git a/data/layouts/PokemonCenter_2F_Layout/border.bin b/data/layouts/PokemonCenter_1F/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/PokemonCenter_2F_Layout/border.bin +++ b/data/layouts/PokemonCenter_1F/border.bin diff --git a/data/layouts/PokemonCenter_1F_Layout/map.bin b/data/layouts/PokemonCenter_1F/map.bin index 590f47989..590f47989 100644 --- a/data/layouts/PokemonCenter_1F_Layout/map.bin +++ b/data/layouts/PokemonCenter_1F/map.bin diff --git a/data/layouts/PokemonLeague_AgathasRoom_Layout/border.bin b/data/layouts/PokemonCenter_2F/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/PokemonLeague_AgathasRoom_Layout/border.bin +++ b/data/layouts/PokemonCenter_2F/border.bin diff --git a/data/layouts/PokemonCenter_2F_Layout/map.bin b/data/layouts/PokemonCenter_2F/map.bin Binary files differindex a1b551a73..a1b551a73 100644 --- a/data/layouts/PokemonCenter_2F_Layout/map.bin +++ b/data/layouts/PokemonCenter_2F/map.bin diff --git a/data/layouts/PokemonLeague_BrunosRoom_Layout/border.bin b/data/layouts/PokemonLeague_AgathasRoom/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/PokemonLeague_BrunosRoom_Layout/border.bin +++ b/data/layouts/PokemonLeague_AgathasRoom/border.bin diff --git a/data/layouts/PokemonLeague_AgathasRoom_Layout/map.bin b/data/layouts/PokemonLeague_AgathasRoom/map.bin Binary files differindex 718b7678c..718b7678c 100644 --- a/data/layouts/PokemonLeague_AgathasRoom_Layout/map.bin +++ b/data/layouts/PokemonLeague_AgathasRoom/map.bin diff --git a/data/layouts/PokemonLeague_ChampionsRoom_Layout/border.bin b/data/layouts/PokemonLeague_BrunosRoom/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/PokemonLeague_ChampionsRoom_Layout/border.bin +++ b/data/layouts/PokemonLeague_BrunosRoom/border.bin diff --git a/data/layouts/PokemonLeague_BrunosRoom_Layout/map.bin b/data/layouts/PokemonLeague_BrunosRoom/map.bin index 96107bfa1..96107bfa1 100644 --- a/data/layouts/PokemonLeague_BrunosRoom_Layout/map.bin +++ b/data/layouts/PokemonLeague_BrunosRoom/map.bin diff --git a/data/layouts/PokemonLeague_HallOfFame_Layout/border.bin b/data/layouts/PokemonLeague_ChampionsRoom/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/PokemonLeague_HallOfFame_Layout/border.bin +++ b/data/layouts/PokemonLeague_ChampionsRoom/border.bin diff --git a/data/layouts/PokemonLeague_ChampionsRoom_Layout/map.bin b/data/layouts/PokemonLeague_ChampionsRoom/map.bin index 3e83caa24..3e83caa24 100644 --- a/data/layouts/PokemonLeague_ChampionsRoom_Layout/map.bin +++ b/data/layouts/PokemonLeague_ChampionsRoom/map.bin diff --git a/data/layouts/PokemonLeague_LancesRoom_Layout/border.bin b/data/layouts/PokemonLeague_HallOfFame/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/PokemonLeague_LancesRoom_Layout/border.bin +++ b/data/layouts/PokemonLeague_HallOfFame/border.bin diff --git a/data/layouts/PokemonLeague_HallOfFame_Layout/map.bin b/data/layouts/PokemonLeague_HallOfFame/map.bin index e8a598e9b..e8a598e9b 100644 --- a/data/layouts/PokemonLeague_HallOfFame_Layout/map.bin +++ b/data/layouts/PokemonLeague_HallOfFame/map.bin diff --git a/data/layouts/PokemonLeague_LoreleisRoom_Layout/border.bin b/data/layouts/PokemonLeague_LancesRoom/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/PokemonLeague_LoreleisRoom_Layout/border.bin +++ b/data/layouts/PokemonLeague_LancesRoom/border.bin diff --git a/data/layouts/PokemonLeague_LancesRoom_Layout/map.bin b/data/layouts/PokemonLeague_LancesRoom/map.bin index 0ba5c9ff0..0ba5c9ff0 100644 --- a/data/layouts/PokemonLeague_LancesRoom_Layout/map.bin +++ b/data/layouts/PokemonLeague_LancesRoom/map.bin diff --git a/data/layouts/PokemonMansion_1F_Layout/border.bin b/data/layouts/PokemonLeague_LoreleisRoom/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/PokemonMansion_1F_Layout/border.bin +++ b/data/layouts/PokemonLeague_LoreleisRoom/border.bin diff --git a/data/layouts/PokemonLeague_LoreleisRoom_Layout/map.bin b/data/layouts/PokemonLeague_LoreleisRoom/map.bin index 340b78d78..340b78d78 100644 --- a/data/layouts/PokemonLeague_LoreleisRoom_Layout/map.bin +++ b/data/layouts/PokemonLeague_LoreleisRoom/map.bin diff --git a/data/layouts/PokemonMansion_2F_Layout/border.bin b/data/layouts/PokemonMansion_1F/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/PokemonMansion_2F_Layout/border.bin +++ b/data/layouts/PokemonMansion_1F/border.bin diff --git a/data/layouts/PokemonMansion_1F_Layout/map.bin b/data/layouts/PokemonMansion_1F/map.bin Binary files differindex 491753551..491753551 100644 --- a/data/layouts/PokemonMansion_1F_Layout/map.bin +++ b/data/layouts/PokemonMansion_1F/map.bin diff --git a/data/layouts/PokemonMansion_3F_Layout/border.bin b/data/layouts/PokemonMansion_2F/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/PokemonMansion_3F_Layout/border.bin +++ b/data/layouts/PokemonMansion_2F/border.bin diff --git a/data/layouts/PokemonMansion_2F_Layout/map.bin b/data/layouts/PokemonMansion_2F/map.bin Binary files differindex 87db6b0ea..87db6b0ea 100644 --- a/data/layouts/PokemonMansion_2F_Layout/map.bin +++ b/data/layouts/PokemonMansion_2F/map.bin diff --git a/data/layouts/PokemonMansion_B1F_Layout/border.bin b/data/layouts/PokemonMansion_3F/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/PokemonMansion_B1F_Layout/border.bin +++ b/data/layouts/PokemonMansion_3F/border.bin diff --git a/data/layouts/PokemonMansion_3F_Layout/map.bin b/data/layouts/PokemonMansion_3F/map.bin Binary files differindex 9a05ce1b8..9a05ce1b8 100644 --- a/data/layouts/PokemonMansion_3F_Layout/map.bin +++ b/data/layouts/PokemonMansion_3F/map.bin diff --git a/data/layouts/PowerPlant_Layout/border.bin b/data/layouts/PokemonMansion_B1F/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/PowerPlant_Layout/border.bin +++ b/data/layouts/PokemonMansion_B1F/border.bin diff --git a/data/layouts/PokemonMansion_B1F_Layout/map.bin b/data/layouts/PokemonMansion_B1F/map.bin index a7b0eeeb1..a7b0eeeb1 100644 --- a/data/layouts/PokemonMansion_B1F_Layout/map.bin +++ b/data/layouts/PokemonMansion_B1F/map.bin diff --git a/data/layouts/PokemonTower_1F_Layout/border.bin b/data/layouts/PokemonTower_1F/border.bin index efef023e6..efef023e6 100644 --- a/data/layouts/PokemonTower_1F_Layout/border.bin +++ b/data/layouts/PokemonTower_1F/border.bin diff --git a/data/layouts/PokemonTower_1F_Layout/map.bin b/data/layouts/PokemonTower_1F/map.bin index f393c9f34..f393c9f34 100644 --- a/data/layouts/PokemonTower_1F_Layout/map.bin +++ b/data/layouts/PokemonTower_1F/map.bin diff --git a/data/layouts/PokemonTower_2F_Layout/border.bin b/data/layouts/PokemonTower_2F/border.bin index efef023e6..efef023e6 100644 --- a/data/layouts/PokemonTower_2F_Layout/border.bin +++ b/data/layouts/PokemonTower_2F/border.bin diff --git a/data/layouts/PokemonTower_2F_Layout/map.bin b/data/layouts/PokemonTower_2F/map.bin index 0d1e67b03..0d1e67b03 100644 --- a/data/layouts/PokemonTower_2F_Layout/map.bin +++ b/data/layouts/PokemonTower_2F/map.bin diff --git a/data/layouts/PokemonTower_3F_Layout/border.bin b/data/layouts/PokemonTower_3F/border.bin index efef023e6..efef023e6 100644 --- a/data/layouts/PokemonTower_3F_Layout/border.bin +++ b/data/layouts/PokemonTower_3F/border.bin diff --git a/data/layouts/PokemonTower_3F_Layout/map.bin b/data/layouts/PokemonTower_3F/map.bin index c591995c1..c591995c1 100644 --- a/data/layouts/PokemonTower_3F_Layout/map.bin +++ b/data/layouts/PokemonTower_3F/map.bin diff --git a/data/layouts/PokemonTower_4F_Layout/border.bin b/data/layouts/PokemonTower_4F/border.bin index efef023e6..efef023e6 100644 --- a/data/layouts/PokemonTower_4F_Layout/border.bin +++ b/data/layouts/PokemonTower_4F/border.bin diff --git a/data/layouts/PokemonTower_4F_Layout/map.bin b/data/layouts/PokemonTower_4F/map.bin index eebe48c13..eebe48c13 100644 --- a/data/layouts/PokemonTower_4F_Layout/map.bin +++ b/data/layouts/PokemonTower_4F/map.bin diff --git a/data/layouts/PokemonTower_5F_Layout/border.bin b/data/layouts/PokemonTower_5F/border.bin index efef023e6..efef023e6 100644 --- a/data/layouts/PokemonTower_5F_Layout/border.bin +++ b/data/layouts/PokemonTower_5F/border.bin diff --git a/data/layouts/PokemonTower_5F_Layout/map.bin b/data/layouts/PokemonTower_5F/map.bin index efc99cca9..efc99cca9 100644 --- a/data/layouts/PokemonTower_5F_Layout/map.bin +++ b/data/layouts/PokemonTower_5F/map.bin diff --git a/data/layouts/PokemonTower_6F_Layout/border.bin b/data/layouts/PokemonTower_6F/border.bin index efef023e6..efef023e6 100644 --- a/data/layouts/PokemonTower_6F_Layout/border.bin +++ b/data/layouts/PokemonTower_6F/border.bin diff --git a/data/layouts/PokemonTower_6F_Layout/map.bin b/data/layouts/PokemonTower_6F/map.bin index fb8746f20..fb8746f20 100644 --- a/data/layouts/PokemonTower_6F_Layout/map.bin +++ b/data/layouts/PokemonTower_6F/map.bin diff --git a/data/layouts/PokemonTower_7F_Layout/border.bin b/data/layouts/PokemonTower_7F/border.bin index efef023e6..efef023e6 100644 --- a/data/layouts/PokemonTower_7F_Layout/border.bin +++ b/data/layouts/PokemonTower_7F/border.bin diff --git a/data/layouts/PokemonTower_7F_Layout/map.bin b/data/layouts/PokemonTower_7F/map.bin index 7554673cf..7554673cf 100644 --- a/data/layouts/PokemonTower_7F_Layout/map.bin +++ b/data/layouts/PokemonTower_7F/map.bin diff --git a/data/layouts/RocketHideout_B1F_Layout/border.bin b/data/layouts/PowerPlant/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/RocketHideout_B1F_Layout/border.bin +++ b/data/layouts/PowerPlant/border.bin diff --git a/data/layouts/PowerPlant_Layout/map.bin b/data/layouts/PowerPlant/map.bin Binary files differindex 48a6e1984..48a6e1984 100644 --- a/data/layouts/PowerPlant_Layout/map.bin +++ b/data/layouts/PowerPlant/map.bin diff --git a/data/layouts/SSAnne_CaptainsOffice2_Layout/border.bin b/data/layouts/RockTunnel_1F/border.bin index a021ddd4e..a021ddd4e 100644 --- a/data/layouts/SSAnne_CaptainsOffice2_Layout/border.bin +++ b/data/layouts/RockTunnel_1F/border.bin diff --git a/data/layouts/RockTunnel_1F_Layout/map.bin b/data/layouts/RockTunnel_1F/map.bin Binary files differindex 80a6a266c..80a6a266c 100644 --- a/data/layouts/RockTunnel_1F_Layout/map.bin +++ b/data/layouts/RockTunnel_1F/map.bin diff --git a/data/layouts/SSAnne_CaptainsOffice3_Layout/border.bin b/data/layouts/RockTunnel_B1F/border.bin index a021ddd4e..a021ddd4e 100644 --- a/data/layouts/SSAnne_CaptainsOffice3_Layout/border.bin +++ b/data/layouts/RockTunnel_B1F/border.bin diff --git a/data/layouts/RockTunnel_B1F_Layout/map.bin b/data/layouts/RockTunnel_B1F/map.bin Binary files differindex 68eed9a4c..68eed9a4c 100644 --- a/data/layouts/RockTunnel_B1F_Layout/map.bin +++ b/data/layouts/RockTunnel_B1F/map.bin diff --git a/data/layouts/RocketHideout_B2F_Layout/border.bin b/data/layouts/RocketHideout_B1F/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/RocketHideout_B2F_Layout/border.bin +++ b/data/layouts/RocketHideout_B1F/border.bin diff --git a/data/layouts/RocketHideout_B1F_Layout/map.bin b/data/layouts/RocketHideout_B1F/map.bin Binary files differindex 4a2ed565f..4a2ed565f 100644 --- a/data/layouts/RocketHideout_B1F_Layout/map.bin +++ b/data/layouts/RocketHideout_B1F/map.bin diff --git a/data/layouts/RocketHideout_B3F_Layout/border.bin b/data/layouts/RocketHideout_B2F/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/RocketHideout_B3F_Layout/border.bin +++ b/data/layouts/RocketHideout_B2F/border.bin diff --git a/data/layouts/RocketHideout_B2F_Layout/map.bin b/data/layouts/RocketHideout_B2F/map.bin index f849a0642..f849a0642 100644 --- a/data/layouts/RocketHideout_B2F_Layout/map.bin +++ b/data/layouts/RocketHideout_B2F/map.bin diff --git a/data/layouts/RocketHideout_B4F_Layout/border.bin b/data/layouts/RocketHideout_B3F/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/RocketHideout_B4F_Layout/border.bin +++ b/data/layouts/RocketHideout_B3F/border.bin diff --git a/data/layouts/RocketHideout_B3F_Layout/map.bin b/data/layouts/RocketHideout_B3F/map.bin index bdd886346..bdd886346 100644 --- a/data/layouts/RocketHideout_B3F_Layout/map.bin +++ b/data/layouts/RocketHideout_B3F/map.bin diff --git a/data/layouts/RocketHideout_Elevator_Layout/border.bin b/data/layouts/RocketHideout_B4F/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/RocketHideout_Elevator_Layout/border.bin +++ b/data/layouts/RocketHideout_B4F/border.bin diff --git a/data/layouts/RocketHideout_B4F_Layout/map.bin b/data/layouts/RocketHideout_B4F/map.bin Binary files differindex 0e0b8ec93..0e0b8ec93 100644 --- a/data/layouts/RocketHideout_B4F_Layout/map.bin +++ b/data/layouts/RocketHideout_B4F/map.bin diff --git a/data/layouts/Route12_NorthEntrance_1F_Layout/border.bin b/data/layouts/RocketHideout_Elevator/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/Route12_NorthEntrance_1F_Layout/border.bin +++ b/data/layouts/RocketHideout_Elevator/border.bin diff --git a/data/layouts/RocketHideout_Elevator_Layout/map.bin b/data/layouts/RocketHideout_Elevator/map.bin index 42e08c38d..42e08c38d 100644 --- a/data/layouts/RocketHideout_Elevator_Layout/map.bin +++ b/data/layouts/RocketHideout_Elevator/map.bin diff --git a/data/layouts/Route11_Layout/border.bin b/data/layouts/Route1/border.bin Binary files differindex a701312cf..a701312cf 100644 --- a/data/layouts/Route11_Layout/border.bin +++ b/data/layouts/Route1/border.bin diff --git a/data/layouts/Route1_Layout/map.bin b/data/layouts/Route1/map.bin index 02ee26860..02ee26860 100644 --- a/data/layouts/Route1_Layout/map.bin +++ b/data/layouts/Route1/map.bin diff --git a/data/layouts/Route10_Layout/border.bin b/data/layouts/Route10/border.bin Binary files differindex 4531975c7..4531975c7 100644 --- a/data/layouts/Route10_Layout/border.bin +++ b/data/layouts/Route10/border.bin diff --git a/data/layouts/Route10_Layout/map.bin b/data/layouts/Route10/map.bin index 7e40aae43..7e40aae43 100644 --- a/data/layouts/Route10_Layout/map.bin +++ b/data/layouts/Route10/map.bin diff --git a/data/layouts/Route15_Layout/border.bin b/data/layouts/Route11/border.bin Binary files differindex a701312cf..a701312cf 100644 --- a/data/layouts/Route15_Layout/border.bin +++ b/data/layouts/Route11/border.bin diff --git a/data/layouts/Route11_Layout/map.bin b/data/layouts/Route11/map.bin index 6062ac7f3..6062ac7f3 100644 --- a/data/layouts/Route11_Layout/map.bin +++ b/data/layouts/Route11/map.bin diff --git a/data/layouts/Route12_Layout/border.bin b/data/layouts/Route12/border.bin index 730aab996..730aab996 100644 --- a/data/layouts/Route12_Layout/border.bin +++ b/data/layouts/Route12/border.bin diff --git a/data/layouts/Route12_Layout/map.bin b/data/layouts/Route12/map.bin Binary files differindex ca203b565..ca203b565 100644 --- a/data/layouts/Route12_Layout/map.bin +++ b/data/layouts/Route12/map.bin diff --git a/data/layouts/Route16_NorthEntrance_1F_Layout/border.bin b/data/layouts/Route12_NorthEntrance_1F/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/Route16_NorthEntrance_1F_Layout/border.bin +++ b/data/layouts/Route12_NorthEntrance_1F/border.bin diff --git a/data/layouts/Route12_NorthEntrance_1F_Layout/map.bin b/data/layouts/Route12_NorthEntrance_1F/map.bin index f723c9817..f723c9817 100644 --- a/data/layouts/Route12_NorthEntrance_1F_Layout/map.bin +++ b/data/layouts/Route12_NorthEntrance_1F/map.bin diff --git a/data/layouts/Route13_Layout/border.bin b/data/layouts/Route13/border.bin index 730aab996..730aab996 100644 --- a/data/layouts/Route13_Layout/border.bin +++ b/data/layouts/Route13/border.bin diff --git a/data/layouts/Route13_Layout/map.bin b/data/layouts/Route13/map.bin Binary files differindex b1f55a645..b1f55a645 100644 --- a/data/layouts/Route13_Layout/map.bin +++ b/data/layouts/Route13/map.bin diff --git a/data/layouts/Route14_Layout/border.bin b/data/layouts/Route14/border.bin index 730aab996..730aab996 100644 --- a/data/layouts/Route14_Layout/border.bin +++ b/data/layouts/Route14/border.bin diff --git a/data/layouts/Route14_Layout/map.bin b/data/layouts/Route14/map.bin index 48d7c0dcd..48d7c0dcd 100644 --- a/data/layouts/Route14_Layout/map.bin +++ b/data/layouts/Route14/map.bin diff --git a/data/layouts/Route1_Layout/border.bin b/data/layouts/Route15/border.bin Binary files differindex a701312cf..a701312cf 100644 --- a/data/layouts/Route1_Layout/border.bin +++ b/data/layouts/Route15/border.bin diff --git a/data/layouts/Route15_Layout/map.bin b/data/layouts/Route15/map.bin index 786f67988..786f67988 100644 --- a/data/layouts/Route15_Layout/map.bin +++ b/data/layouts/Route15/map.bin diff --git a/data/layouts/Route16_Layout/border.bin b/data/layouts/Route16/border.bin index 730aab996..730aab996 100644 --- a/data/layouts/Route16_Layout/border.bin +++ b/data/layouts/Route16/border.bin diff --git a/data/layouts/Route16_Layout/map.bin b/data/layouts/Route16/map.bin index a88b95a6a..a88b95a6a 100644 --- a/data/layouts/Route16_Layout/map.bin +++ b/data/layouts/Route16/map.bin diff --git a/data/layouts/Route22_NorthEntrance_Layout/border.bin b/data/layouts/Route16_NorthEntrance_1F/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/Route22_NorthEntrance_Layout/border.bin +++ b/data/layouts/Route16_NorthEntrance_1F/border.bin diff --git a/data/layouts/Route16_NorthEntrance_1F_Layout/map.bin b/data/layouts/Route16_NorthEntrance_1F/map.bin index c41db67b6..c41db67b6 100644 --- a/data/layouts/Route16_NorthEntrance_1F_Layout/map.bin +++ b/data/layouts/Route16_NorthEntrance_1F/map.bin diff --git a/data/layouts/Route17_Layout/border.bin b/data/layouts/Route17/border.bin index 730aab996..730aab996 100644 --- a/data/layouts/Route17_Layout/border.bin +++ b/data/layouts/Route17/border.bin diff --git a/data/layouts/Route17_Layout/map.bin b/data/layouts/Route17/map.bin index 24ce3c11f..24ce3c11f 100644 --- a/data/layouts/Route17_Layout/map.bin +++ b/data/layouts/Route17/map.bin diff --git a/data/layouts/Route18_Layout/border.bin b/data/layouts/Route18/border.bin index 730aab996..730aab996 100644 --- a/data/layouts/Route18_Layout/border.bin +++ b/data/layouts/Route18/border.bin diff --git a/data/layouts/Route18_Layout/map.bin b/data/layouts/Route18/map.bin index 9e246b459..9e246b459 100644 --- a/data/layouts/Route18_Layout/map.bin +++ b/data/layouts/Route18/map.bin diff --git a/data/layouts/Route19_Layout/border.bin b/data/layouts/Route19/border.bin index 730aab996..730aab996 100644 --- a/data/layouts/Route19_Layout/border.bin +++ b/data/layouts/Route19/border.bin diff --git a/data/layouts/Route19_Layout/map.bin b/data/layouts/Route19/map.bin index 54388bc49..54388bc49 100644 --- a/data/layouts/Route19_Layout/map.bin +++ b/data/layouts/Route19/map.bin diff --git a/data/layouts/Route23_Layout/border.bin b/data/layouts/Route2/border.bin Binary files differindex a701312cf..a701312cf 100644 --- a/data/layouts/Route23_Layout/border.bin +++ b/data/layouts/Route2/border.bin diff --git a/data/layouts/Route2_Layout/map.bin b/data/layouts/Route2/map.bin index 1d093f92b..1d093f92b 100644 --- a/data/layouts/Route2_Layout/map.bin +++ b/data/layouts/Route2/map.bin diff --git a/data/layouts/Route20_Layout/border.bin b/data/layouts/Route20/border.bin index 730aab996..730aab996 100644 --- a/data/layouts/Route20_Layout/border.bin +++ b/data/layouts/Route20/border.bin diff --git a/data/layouts/Route20_Layout/map.bin b/data/layouts/Route20/map.bin index 534a7034d..534a7034d 100644 --- a/data/layouts/Route20_Layout/map.bin +++ b/data/layouts/Route20/map.bin diff --git a/data/layouts/Route21_North_Layout/border.bin b/data/layouts/Route21_North/border.bin index 730aab996..730aab996 100644 --- a/data/layouts/Route21_North_Layout/border.bin +++ b/data/layouts/Route21_North/border.bin diff --git a/data/layouts/Route21_North_Layout/map.bin b/data/layouts/Route21_North/map.bin index 02a4bcd54..02a4bcd54 100644 --- a/data/layouts/Route21_North_Layout/map.bin +++ b/data/layouts/Route21_North/map.bin diff --git a/data/layouts/Route21_South_Layout/border.bin b/data/layouts/Route21_South/border.bin index 730aab996..730aab996 100644 --- a/data/layouts/Route21_South_Layout/border.bin +++ b/data/layouts/Route21_South/border.bin diff --git a/data/layouts/Route21_South_Layout/map.bin b/data/layouts/Route21_South/map.bin index 30c2cba6f..30c2cba6f 100644 --- a/data/layouts/Route21_South_Layout/map.bin +++ b/data/layouts/Route21_South/map.bin diff --git a/data/layouts/Route22_Layout/border.bin b/data/layouts/Route22/border.bin Binary files differindex 4531975c7..4531975c7 100644 --- a/data/layouts/Route22_Layout/border.bin +++ b/data/layouts/Route22/border.bin diff --git a/data/layouts/Route22_Layout/map.bin b/data/layouts/Route22/map.bin index 1caf49cc7..1caf49cc7 100644 --- a/data/layouts/Route22_Layout/map.bin +++ b/data/layouts/Route22/map.bin diff --git a/data/layouts/Route25_SeaCottage_Layout/border.bin b/data/layouts/Route22_NorthEntrance/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/Route25_SeaCottage_Layout/border.bin +++ b/data/layouts/Route22_NorthEntrance/border.bin diff --git a/data/layouts/Route22_NorthEntrance_Layout/map.bin b/data/layouts/Route22_NorthEntrance/map.bin index 1452ebb13..1452ebb13 100644 --- a/data/layouts/Route22_NorthEntrance_Layout/map.bin +++ b/data/layouts/Route22_NorthEntrance/map.bin diff --git a/data/layouts/Route2_Layout/border.bin b/data/layouts/Route23/border.bin Binary files differindex a701312cf..a701312cf 100644 --- a/data/layouts/Route2_Layout/border.bin +++ b/data/layouts/Route23/border.bin diff --git a/data/layouts/Route23_Layout/map.bin b/data/layouts/Route23/map.bin index f6f5f5662..f6f5f5662 100644 --- a/data/layouts/Route23_Layout/map.bin +++ b/data/layouts/Route23/map.bin diff --git a/data/layouts/Route24_Layout/border.bin b/data/layouts/Route24/border.bin Binary files differindex 4531975c7..4531975c7 100644 --- a/data/layouts/Route24_Layout/border.bin +++ b/data/layouts/Route24/border.bin diff --git a/data/layouts/Route24_Layout/map.bin b/data/layouts/Route24/map.bin index 80de4b1f1..80de4b1f1 100644 --- a/data/layouts/Route24_Layout/map.bin +++ b/data/layouts/Route24/map.bin diff --git a/data/layouts/Route25_Layout/border.bin b/data/layouts/Route25/border.bin Binary files differindex 4531975c7..4531975c7 100644 --- a/data/layouts/Route25_Layout/border.bin +++ b/data/layouts/Route25/border.bin diff --git a/data/layouts/Route25_Layout/map.bin b/data/layouts/Route25/map.bin index 9ec2e35d4..9ec2e35d4 100644 --- a/data/layouts/Route25_Layout/map.bin +++ b/data/layouts/Route25/map.bin diff --git a/data/layouts/Route2_Entrance_Layout/border.bin b/data/layouts/Route25_SeaCottage/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/Route2_Entrance_Layout/border.bin +++ b/data/layouts/Route25_SeaCottage/border.bin diff --git a/data/layouts/Route25_SeaCottage_Layout/map.bin b/data/layouts/Route25_SeaCottage/map.bin index dbf7d06ba..dbf7d06ba 100644 --- a/data/layouts/Route25_SeaCottage_Layout/map.bin +++ b/data/layouts/Route25_SeaCottage/map.bin diff --git a/data/layouts/Route5_PokemonDayCare_Layout/border.bin b/data/layouts/Route2_Entrance/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/Route5_PokemonDayCare_Layout/border.bin +++ b/data/layouts/Route2_Entrance/border.bin diff --git a/data/layouts/Route2_Entrance_Layout/map.bin b/data/layouts/Route2_Entrance/map.bin index dfde7c299..dfde7c299 100644 --- a/data/layouts/Route2_Entrance_Layout/map.bin +++ b/data/layouts/Route2_Entrance/map.bin diff --git a/data/layouts/Route3_Layout/border.bin b/data/layouts/Route3/border.bin Binary files differindex 4531975c7..4531975c7 100644 --- a/data/layouts/Route3_Layout/border.bin +++ b/data/layouts/Route3/border.bin diff --git a/data/layouts/Route3_Layout/map.bin b/data/layouts/Route3/map.bin index 7e4fd76ff..7e4fd76ff 100644 --- a/data/layouts/Route3_Layout/map.bin +++ b/data/layouts/Route3/map.bin diff --git a/data/layouts/Route4_Layout/border.bin b/data/layouts/Route4/border.bin Binary files differindex 4531975c7..4531975c7 100644 --- a/data/layouts/Route4_Layout/border.bin +++ b/data/layouts/Route4/border.bin diff --git a/data/layouts/Route4_Layout/map.bin b/data/layouts/Route4/map.bin index 447d87b5c..447d87b5c 100644 --- a/data/layouts/Route4_Layout/map.bin +++ b/data/layouts/Route4/map.bin diff --git a/data/layouts/Route5_Layout/border.bin b/data/layouts/Route5/border.bin Binary files differindex a701312cf..a701312cf 100644 --- a/data/layouts/Route5_Layout/border.bin +++ b/data/layouts/Route5/border.bin diff --git a/data/layouts/Route5_Layout/map.bin b/data/layouts/Route5/map.bin Binary files differindex 3c357908f..3c357908f 100644 --- a/data/layouts/Route5_Layout/map.bin +++ b/data/layouts/Route5/map.bin diff --git a/data/layouts/SSAnne_CaptainsOffice4_Layout/border.bin b/data/layouts/Route5_PokemonDayCare/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/SSAnne_CaptainsOffice4_Layout/border.bin +++ b/data/layouts/Route5_PokemonDayCare/border.bin diff --git a/data/layouts/Route5_PokemonDayCare_Layout/map.bin b/data/layouts/Route5_PokemonDayCare/map.bin index 85114f523..85114f523 100644 --- a/data/layouts/Route5_PokemonDayCare_Layout/map.bin +++ b/data/layouts/Route5_PokemonDayCare/map.bin diff --git a/data/layouts/Route6_Layout/border.bin b/data/layouts/Route6/border.bin Binary files differindex a701312cf..a701312cf 100644 --- a/data/layouts/Route6_Layout/border.bin +++ b/data/layouts/Route6/border.bin diff --git a/data/layouts/Route6_Layout/map.bin b/data/layouts/Route6/map.bin index c4e9b6b92..c4e9b6b92 100644 --- a/data/layouts/Route6_Layout/map.bin +++ b/data/layouts/Route6/map.bin diff --git a/data/layouts/Route7_Layout/border.bin b/data/layouts/Route7/border.bin Binary files differindex a701312cf..a701312cf 100644 --- a/data/layouts/Route7_Layout/border.bin +++ b/data/layouts/Route7/border.bin diff --git a/data/layouts/Route7_Layout/map.bin b/data/layouts/Route7/map.bin index 08212179a..08212179a 100644 --- a/data/layouts/Route7_Layout/map.bin +++ b/data/layouts/Route7/map.bin diff --git a/data/layouts/Route8_Layout/border.bin b/data/layouts/Route8/border.bin Binary files differindex 4531975c7..4531975c7 100644 --- a/data/layouts/Route8_Layout/border.bin +++ b/data/layouts/Route8/border.bin diff --git a/data/layouts/Route8_Layout/map.bin b/data/layouts/Route8/map.bin index 9d370b135..9d370b135 100644 --- a/data/layouts/Route8_Layout/map.bin +++ b/data/layouts/Route8/map.bin diff --git a/data/layouts/Route9_Layout/border.bin b/data/layouts/Route9/border.bin Binary files differindex 4531975c7..4531975c7 100644 --- a/data/layouts/Route9_Layout/border.bin +++ b/data/layouts/Route9/border.bin diff --git a/data/layouts/Route9_Layout/map.bin b/data/layouts/Route9/map.bin index 6ac9ccccd..6ac9ccccd 100644 --- a/data/layouts/Route9_Layout/map.bin +++ b/data/layouts/Route9/map.bin diff --git a/data/layouts/SSAnne_1F_Corridor_Layout/border.bin b/data/layouts/SSAnne_1F_Corridor/border.bin index b90547a3e..b90547a3e 100644 --- a/data/layouts/SSAnne_1F_Corridor_Layout/border.bin +++ b/data/layouts/SSAnne_1F_Corridor/border.bin diff --git a/data/layouts/SSAnne_1F_Corridor_Layout/map.bin b/data/layouts/SSAnne_1F_Corridor/map.bin index b9fde8c26..b9fde8c26 100644 --- a/data/layouts/SSAnne_1F_Corridor_Layout/map.bin +++ b/data/layouts/SSAnne_1F_Corridor/map.bin diff --git a/data/layouts/SSAnne_2F_Corridor_Layout/border.bin b/data/layouts/SSAnne_2F_Corridor/border.bin index b90547a3e..b90547a3e 100644 --- a/data/layouts/SSAnne_2F_Corridor_Layout/border.bin +++ b/data/layouts/SSAnne_2F_Corridor/border.bin diff --git a/data/layouts/SSAnne_2F_Corridor_Layout/map.bin b/data/layouts/SSAnne_2F_Corridor/map.bin index 9fa53735c..9fa53735c 100644 --- a/data/layouts/SSAnne_2F_Corridor_Layout/map.bin +++ b/data/layouts/SSAnne_2F_Corridor/map.bin diff --git a/data/layouts/SSAnne_3F_Corridor_Layout/border.bin b/data/layouts/SSAnne_3F_Corridor/border.bin index b90547a3e..b90547a3e 100644 --- a/data/layouts/SSAnne_3F_Corridor_Layout/border.bin +++ b/data/layouts/SSAnne_3F_Corridor/border.bin diff --git a/data/layouts/SSAnne_3F_Corridor_Layout/map.bin b/data/layouts/SSAnne_3F_Corridor/map.bin index 336e034fa..336e034fa 100644 --- a/data/layouts/SSAnne_3F_Corridor_Layout/map.bin +++ b/data/layouts/SSAnne_3F_Corridor/map.bin diff --git a/data/layouts/SSAnne_B1F_Corridor_Layout/border.bin b/data/layouts/SSAnne_B1F_Corridor/border.bin index b90547a3e..b90547a3e 100644 --- a/data/layouts/SSAnne_B1F_Corridor_Layout/border.bin +++ b/data/layouts/SSAnne_B1F_Corridor/border.bin diff --git a/data/layouts/SSAnne_B1F_Corridor_Layout/map.bin b/data/layouts/SSAnne_B1F_Corridor/map.bin index db24bfff4..db24bfff4 100644 --- a/data/layouts/SSAnne_B1F_Corridor_Layout/map.bin +++ b/data/layouts/SSAnne_B1F_Corridor/map.bin diff --git a/data/layouts/SSAnne_CaptainsOffice_Layout/border.bin b/data/layouts/SSAnne_CaptainsOffice/border.bin index b90547a3e..b90547a3e 100644 --- a/data/layouts/SSAnne_CaptainsOffice_Layout/border.bin +++ b/data/layouts/SSAnne_CaptainsOffice/border.bin diff --git a/data/layouts/SSAnne_CaptainsOffice_Layout/map.bin b/data/layouts/SSAnne_CaptainsOffice/map.bin index 75c9eb2d3..75c9eb2d3 100644 --- a/data/layouts/SSAnne_CaptainsOffice_Layout/map.bin +++ b/data/layouts/SSAnne_CaptainsOffice/map.bin diff --git a/data/layouts/SSAnne_Deck_Layout/border.bin b/data/layouts/SSAnne_Deck/border.bin index d9994d6cd..d9994d6cd 100644 --- a/data/layouts/SSAnne_Deck_Layout/border.bin +++ b/data/layouts/SSAnne_Deck/border.bin diff --git a/data/layouts/SSAnne_Deck_Layout/map.bin b/data/layouts/SSAnne_Deck/map.bin index bf3fb5e80..bf3fb5e80 100644 --- a/data/layouts/SSAnne_Deck_Layout/map.bin +++ b/data/layouts/SSAnne_Deck/map.bin diff --git a/data/layouts/SSAnne_Exterior_Layout/border.bin b/data/layouts/SSAnne_Exterior/border.bin index 730aab996..730aab996 100644 --- a/data/layouts/SSAnne_Exterior_Layout/border.bin +++ b/data/layouts/SSAnne_Exterior/border.bin diff --git a/data/layouts/SSAnne_Exterior_Layout/map.bin b/data/layouts/SSAnne_Exterior/map.bin index a76275227..a76275227 100644 --- a/data/layouts/SSAnne_Exterior_Layout/map.bin +++ b/data/layouts/SSAnne_Exterior/map.bin diff --git a/data/layouts/SSAnne_Kitchen_Layout/border.bin b/data/layouts/SSAnne_Kitchen/border.bin index b90547a3e..b90547a3e 100644 --- a/data/layouts/SSAnne_Kitchen_Layout/border.bin +++ b/data/layouts/SSAnne_Kitchen/border.bin diff --git a/data/layouts/SSAnne_Kitchen_Layout/map.bin b/data/layouts/SSAnne_Kitchen/map.bin index f74655d33..f74655d33 100644 --- a/data/layouts/SSAnne_Kitchen_Layout/map.bin +++ b/data/layouts/SSAnne_Kitchen/map.bin diff --git a/data/layouts/SSAnne_Room1_Layout/border.bin b/data/layouts/SSAnne_Room1/border.bin index b90547a3e..b90547a3e 100644 --- a/data/layouts/SSAnne_Room1_Layout/border.bin +++ b/data/layouts/SSAnne_Room1/border.bin diff --git a/data/layouts/SSAnne_Room1_Layout/map.bin b/data/layouts/SSAnne_Room1/map.bin index b5cfa38c4..b5cfa38c4 100644 --- a/data/layouts/SSAnne_Room1_Layout/map.bin +++ b/data/layouts/SSAnne_Room1/map.bin diff --git a/data/layouts/SSAnne_Room2_Layout/border.bin b/data/layouts/SSAnne_Room2/border.bin index b90547a3e..b90547a3e 100644 --- a/data/layouts/SSAnne_Room2_Layout/border.bin +++ b/data/layouts/SSAnne_Room2/border.bin diff --git a/data/layouts/SSAnne_Room2_Layout/map.bin b/data/layouts/SSAnne_Room2/map.bin index e1509b523..e1509b523 100644 --- a/data/layouts/SSAnne_Room2_Layout/map.bin +++ b/data/layouts/SSAnne_Room2/map.bin diff --git a/data/layouts/SafariZone_Building_Layout/border.bin b/data/layouts/SafariZone_Building/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/SafariZone_Building_Layout/border.bin +++ b/data/layouts/SafariZone_Building/border.bin diff --git a/data/layouts/SafariZone_Building_Layout/map.bin b/data/layouts/SafariZone_Building/map.bin index caec48cdc..caec48cdc 100644 --- a/data/layouts/SafariZone_Building_Layout/map.bin +++ b/data/layouts/SafariZone_Building/map.bin diff --git a/data/layouts/SafariZone_Center_Layout/border.bin b/data/layouts/SafariZone_Center/border.bin index 964b51edb..964b51edb 100644 --- a/data/layouts/SafariZone_Center_Layout/border.bin +++ b/data/layouts/SafariZone_Center/border.bin diff --git a/data/layouts/SafariZone_Center_Layout/map.bin b/data/layouts/SafariZone_Center/map.bin index f1fe437e9..f1fe437e9 100644 --- a/data/layouts/SafariZone_Center_Layout/map.bin +++ b/data/layouts/SafariZone_Center/map.bin diff --git a/data/layouts/SafariZone_East_Layout/border.bin b/data/layouts/SafariZone_East/border.bin index 964b51edb..964b51edb 100644 --- a/data/layouts/SafariZone_East_Layout/border.bin +++ b/data/layouts/SafariZone_East/border.bin diff --git a/data/layouts/SafariZone_East_Layout/map.bin b/data/layouts/SafariZone_East/map.bin Binary files differindex 28a9cafb7..28a9cafb7 100644 --- a/data/layouts/SafariZone_East_Layout/map.bin +++ b/data/layouts/SafariZone_East/map.bin diff --git a/data/layouts/SafariZone_North_Layout/border.bin b/data/layouts/SafariZone_North/border.bin index 964b51edb..964b51edb 100644 --- a/data/layouts/SafariZone_North_Layout/border.bin +++ b/data/layouts/SafariZone_North/border.bin diff --git a/data/layouts/SafariZone_North_Layout/map.bin b/data/layouts/SafariZone_North/map.bin Binary files differindex 03319e72c..03319e72c 100644 --- a/data/layouts/SafariZone_North_Layout/map.bin +++ b/data/layouts/SafariZone_North/map.bin diff --git a/data/layouts/SafariZone_SecretHouse_Layout/border.bin b/data/layouts/SafariZone_SecretHouse/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/SafariZone_SecretHouse_Layout/border.bin +++ b/data/layouts/SafariZone_SecretHouse/border.bin diff --git a/data/layouts/SafariZone_SecretHouse_Layout/map.bin b/data/layouts/SafariZone_SecretHouse/map.bin index 8acbf7b90..8acbf7b90 100644 --- a/data/layouts/SafariZone_SecretHouse_Layout/map.bin +++ b/data/layouts/SafariZone_SecretHouse/map.bin diff --git a/data/layouts/SafariZone_West_Layout/border.bin b/data/layouts/SafariZone_West/border.bin index 964b51edb..964b51edb 100644 --- a/data/layouts/SafariZone_West_Layout/border.bin +++ b/data/layouts/SafariZone_West/border.bin diff --git a/data/layouts/SafariZone_West_Layout/map.bin b/data/layouts/SafariZone_West/map.bin Binary files differindex f2f943b69..f2f943b69 100644 --- a/data/layouts/SafariZone_West_Layout/map.bin +++ b/data/layouts/SafariZone_West/map.bin diff --git a/data/layouts/SaffronCity_Duplicate_Layout/border.bin b/data/layouts/SaffronCity/border.bin Binary files differindex a701312cf..a701312cf 100644 --- a/data/layouts/SaffronCity_Duplicate_Layout/border.bin +++ b/data/layouts/SaffronCity/border.bin diff --git a/data/layouts/SaffronCity_Layout/map.bin b/data/layouts/SaffronCity/map.bin Binary files differindex dd7aea1cf..dd7aea1cf 100644 --- a/data/layouts/SaffronCity_Layout/map.bin +++ b/data/layouts/SaffronCity/map.bin diff --git a/data/layouts/SaffronCity_Dojo_Layout/border.bin b/data/layouts/SaffronCity_Dojo/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/SaffronCity_Dojo_Layout/border.bin +++ b/data/layouts/SaffronCity_Dojo/border.bin diff --git a/data/layouts/SaffronCity_Dojo_Layout/map.bin b/data/layouts/SaffronCity_Dojo/map.bin index 55b1548aa..55b1548aa 100644 --- a/data/layouts/SaffronCity_Dojo_Layout/map.bin +++ b/data/layouts/SaffronCity_Dojo/map.bin diff --git a/data/layouts/SaffronCity_Layout/border.bin b/data/layouts/SaffronCity_Duplicate/border.bin Binary files differindex a701312cf..a701312cf 100644 --- a/data/layouts/SaffronCity_Layout/border.bin +++ b/data/layouts/SaffronCity_Duplicate/border.bin diff --git a/data/layouts/SaffronCity_Duplicate_Layout/map.bin b/data/layouts/SaffronCity_Duplicate/map.bin Binary files differindex 001fb4e2f..001fb4e2f 100644 --- a/data/layouts/SaffronCity_Duplicate_Layout/map.bin +++ b/data/layouts/SaffronCity_Duplicate/map.bin diff --git a/data/layouts/SaffronCity_EastWestEntrance_Layout/border.bin b/data/layouts/SaffronCity_EastWestEntrance/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/SaffronCity_EastWestEntrance_Layout/border.bin +++ b/data/layouts/SaffronCity_EastWestEntrance/border.bin diff --git a/data/layouts/SaffronCity_EastWestEntrance_Layout/map.bin b/data/layouts/SaffronCity_EastWestEntrance/map.bin index 8b9683b99..8b9683b99 100644 --- a/data/layouts/SaffronCity_EastWestEntrance_Layout/map.bin +++ b/data/layouts/SaffronCity_EastWestEntrance/map.bin diff --git a/data/layouts/SaffronCity_Gym_Layout/border.bin b/data/layouts/SaffronCity_Gym/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/SaffronCity_Gym_Layout/border.bin +++ b/data/layouts/SaffronCity_Gym/border.bin diff --git a/data/layouts/SaffronCity_Gym_Layout/map.bin b/data/layouts/SaffronCity_Gym/map.bin index 2eee32447..2eee32447 100644 --- a/data/layouts/SaffronCity_Gym_Layout/map.bin +++ b/data/layouts/SaffronCity_Gym/map.bin diff --git a/data/layouts/SaffronCity_House1_1F_Layout/border.bin b/data/layouts/SaffronCity_House1_1F/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/SaffronCity_House1_1F_Layout/border.bin +++ b/data/layouts/SaffronCity_House1_1F/border.bin diff --git a/data/layouts/SaffronCity_House1_1F_Layout/map.bin b/data/layouts/SaffronCity_House1_1F/map.bin index 6db070ab7..6db070ab7 100644 --- a/data/layouts/SaffronCity_House1_1F_Layout/map.bin +++ b/data/layouts/SaffronCity_House1_1F/map.bin diff --git a/data/layouts/SaffronCity_House1_2F_Layout/border.bin b/data/layouts/SaffronCity_House1_2F/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/SaffronCity_House1_2F_Layout/border.bin +++ b/data/layouts/SaffronCity_House1_2F/border.bin diff --git a/data/layouts/SaffronCity_House1_2F_Layout/map.bin b/data/layouts/SaffronCity_House1_2F/map.bin Binary files differindex c3090f485..c3090f485 100644 --- a/data/layouts/SaffronCity_House1_2F_Layout/map.bin +++ b/data/layouts/SaffronCity_House1_2F/map.bin diff --git a/data/layouts/SaffronCity_NorthSouthEntrance_Layout/border.bin b/data/layouts/SaffronCity_NorthSouthEntrance/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/SaffronCity_NorthSouthEntrance_Layout/border.bin +++ b/data/layouts/SaffronCity_NorthSouthEntrance/border.bin diff --git a/data/layouts/SaffronCity_NorthSouthEntrance_Layout/map.bin b/data/layouts/SaffronCity_NorthSouthEntrance/map.bin index 138b62d0f..138b62d0f 100644 --- a/data/layouts/SaffronCity_NorthSouthEntrance_Layout/map.bin +++ b/data/layouts/SaffronCity_NorthSouthEntrance/map.bin diff --git a/data/layouts/SaffronCity_PokemonTrainerFanClub_Layout/border.bin b/data/layouts/SaffronCity_PokemonTrainerFanClub/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/SaffronCity_PokemonTrainerFanClub_Layout/border.bin +++ b/data/layouts/SaffronCity_PokemonTrainerFanClub/border.bin diff --git a/data/layouts/SaffronCity_PokemonTrainerFanClub_Layout/map.bin b/data/layouts/SaffronCity_PokemonTrainerFanClub/map.bin index 1f0a70d65..1f0a70d65 100644 --- a/data/layouts/SaffronCity_PokemonTrainerFanClub_Layout/map.bin +++ b/data/layouts/SaffronCity_PokemonTrainerFanClub/map.bin diff --git a/data/layouts/SSAnne_CaptainsOffice5_Layout/border.bin b/data/layouts/SeafoamIslands_1F/border.bin index a021ddd4e..a021ddd4e 100644 --- a/data/layouts/SSAnne_CaptainsOffice5_Layout/border.bin +++ b/data/layouts/SeafoamIslands_1F/border.bin diff --git a/data/layouts/SeafoamIslands_1F_Layout/map.bin b/data/layouts/SeafoamIslands_1F/map.bin Binary files differindex 00e113364..00e113364 100644 --- a/data/layouts/SeafoamIslands_1F_Layout/map.bin +++ b/data/layouts/SeafoamIslands_1F/map.bin diff --git a/data/layouts/SSAnne_CaptainsOffice9_Layout/border.bin b/data/layouts/SeafoamIslands_B1F/border.bin index a021ddd4e..a021ddd4e 100644 --- a/data/layouts/SSAnne_CaptainsOffice9_Layout/border.bin +++ b/data/layouts/SeafoamIslands_B1F/border.bin diff --git a/data/layouts/SeafoamIslands_B1F_Layout/map.bin b/data/layouts/SeafoamIslands_B1F/map.bin index 8735540c7..8735540c7 100644 --- a/data/layouts/SeafoamIslands_B1F_Layout/map.bin +++ b/data/layouts/SeafoamIslands_B1F/map.bin diff --git a/data/layouts/SSAnne_Kitchen3_Layout/border.bin b/data/layouts/SeafoamIslands_B2F/border.bin index a021ddd4e..a021ddd4e 100644 --- a/data/layouts/SSAnne_Kitchen3_Layout/border.bin +++ b/data/layouts/SeafoamIslands_B2F/border.bin diff --git a/data/layouts/SeafoamIslands_B2F_Layout/map.bin b/data/layouts/SeafoamIslands_B2F/map.bin Binary files differindex 968163399..968163399 100644 --- a/data/layouts/SeafoamIslands_B2F_Layout/map.bin +++ b/data/layouts/SeafoamIslands_B2F/map.bin diff --git a/data/layouts/SeafoamIslands_1F_Layout/border.bin b/data/layouts/SeafoamIslands_B3F/border.bin index a021ddd4e..a021ddd4e 100644 --- a/data/layouts/SeafoamIslands_1F_Layout/border.bin +++ b/data/layouts/SeafoamIslands_B3F/border.bin diff --git a/data/layouts/SeafoamIslands_B3F_Layout/map.bin b/data/layouts/SeafoamIslands_B3F/map.bin index f6803677d..f6803677d 100644 --- a/data/layouts/SeafoamIslands_B3F_Layout/map.bin +++ b/data/layouts/SeafoamIslands_B3F/map.bin diff --git a/data/layouts/SeafoamIslands_B1F_Layout/border.bin b/data/layouts/SeafoamIslands_B4F/border.bin index a021ddd4e..a021ddd4e 100644 --- a/data/layouts/SeafoamIslands_B1F_Layout/border.bin +++ b/data/layouts/SeafoamIslands_B4F/border.bin diff --git a/data/layouts/SeafoamIslands_B4F_Layout/map.bin b/data/layouts/SeafoamIslands_B4F/map.bin index 668ac2580..668ac2580 100644 --- a/data/layouts/SeafoamIslands_B4F_Layout/map.bin +++ b/data/layouts/SeafoamIslands_B4F/map.bin diff --git a/data/layouts/SevenIsland_Layout/border.bin b/data/layouts/SevenIsland/border.bin index 75f2c916c..75f2c916c 100644 --- a/data/layouts/SevenIsland_Layout/border.bin +++ b/data/layouts/SevenIsland/border.bin diff --git a/data/layouts/SevenIsland_Layout/map.bin b/data/layouts/SevenIsland/map.bin index 05be06e76..05be06e76 100644 --- a/data/layouts/SevenIsland_Layout/map.bin +++ b/data/layouts/SevenIsland/map.bin diff --git a/data/layouts/SevenIsland_House_Room1_Layout/border.bin b/data/layouts/SevenIsland_House_Room1/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/SevenIsland_House_Room1_Layout/border.bin +++ b/data/layouts/SevenIsland_House_Room1/border.bin diff --git a/data/layouts/SevenIsland_House_Room1_Layout/map.bin b/data/layouts/SevenIsland_House_Room1/map.bin index e439b6d6f..e439b6d6f 100644 --- a/data/layouts/SevenIsland_House_Room1_Layout/map.bin +++ b/data/layouts/SevenIsland_House_Room1/map.bin diff --git a/data/layouts/SevenIsland_House_Room2_Layout/border.bin b/data/layouts/SevenIsland_House_Room2/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/SevenIsland_House_Room2_Layout/border.bin +++ b/data/layouts/SevenIsland_House_Room2/border.bin diff --git a/data/layouts/SevenIsland_House_Room2_Layout/map.bin b/data/layouts/SevenIsland_House_Room2/map.bin index 7ed3a8c8a..7ed3a8c8a 100644 --- a/data/layouts/SevenIsland_House_Room2_Layout/map.bin +++ b/data/layouts/SevenIsland_House_Room2/map.bin diff --git a/data/layouts/SevenIsland_SeavaultCanyon_TanobyKey_Layout/border.bin b/data/layouts/SevenIsland_SeavaultCanyon_TanobyKey/border.bin index 56b76feec..56b76feec 100644 --- a/data/layouts/SevenIsland_SeavaultCanyon_TanobyKey_Layout/border.bin +++ b/data/layouts/SevenIsland_SeavaultCanyon_TanobyKey/border.bin diff --git a/data/layouts/SevenIsland_SeavaultCanyon_TanobyKey_Layout/map.bin b/data/layouts/SevenIsland_SeavaultCanyon_TanobyKey/map.bin Binary files differindex 77ec431c8..77ec431c8 100644 --- a/data/layouts/SevenIsland_SeavaultCanyon_TanobyKey_Layout/map.bin +++ b/data/layouts/SevenIsland_SeavaultCanyon_TanobyKey/map.bin diff --git a/data/layouts/SevenIsland_SevaultCanyon_Layout/border.bin b/data/layouts/SevenIsland_SevaultCanyon/border.bin Binary files differindex 4531975c7..4531975c7 100644 --- a/data/layouts/SevenIsland_SevaultCanyon_Layout/border.bin +++ b/data/layouts/SevenIsland_SevaultCanyon/border.bin diff --git a/data/layouts/SevenIsland_SevaultCanyon_Layout/map.bin b/data/layouts/SevenIsland_SevaultCanyon/map.bin Binary files differindex d2414a683..d2414a683 100644 --- a/data/layouts/SevenIsland_SevaultCanyon_Layout/map.bin +++ b/data/layouts/SevenIsland_SevaultCanyon/map.bin diff --git a/data/layouts/SevenIsland_SevaultCanyon_Entrance_Layout/border.bin b/data/layouts/SevenIsland_SevaultCanyon_Entrance/border.bin index 75f2c916c..75f2c916c 100644 --- a/data/layouts/SevenIsland_SevaultCanyon_Entrance_Layout/border.bin +++ b/data/layouts/SevenIsland_SevaultCanyon_Entrance/border.bin diff --git a/data/layouts/SevenIsland_SevaultCanyon_Entrance_Layout/map.bin b/data/layouts/SevenIsland_SevaultCanyon_Entrance/map.bin Binary files differindex 080fac6fb..080fac6fb 100644 --- a/data/layouts/SevenIsland_SevaultCanyon_Entrance_Layout/map.bin +++ b/data/layouts/SevenIsland_SevaultCanyon_Entrance/map.bin diff --git a/data/layouts/SevenIsland_TanobyRuins_Layout/border.bin b/data/layouts/SevenIsland_TanobyRuins/border.bin index 730aab996..730aab996 100644 --- a/data/layouts/SevenIsland_TanobyRuins_Layout/border.bin +++ b/data/layouts/SevenIsland_TanobyRuins/border.bin diff --git a/data/layouts/SevenIsland_TanobyRuins_Layout/map.bin b/data/layouts/SevenIsland_TanobyRuins/map.bin index 0bf51a581..0bf51a581 100644 --- a/data/layouts/SevenIsland_TanobyRuins_Layout/map.bin +++ b/data/layouts/SevenIsland_TanobyRuins/map.bin diff --git a/data/layouts/SevenIsland_TanobyRuins_DilfordChamber_Layout/border.bin b/data/layouts/SevenIsland_TanobyRuins_DilfordChamber/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/SevenIsland_TanobyRuins_DilfordChamber_Layout/border.bin +++ b/data/layouts/SevenIsland_TanobyRuins_DilfordChamber/border.bin diff --git a/data/layouts/SevenIsland_TanobyRuins_DilfordChamber_Layout/map.bin b/data/layouts/SevenIsland_TanobyRuins_DilfordChamber/map.bin index 50d04c4d3..50d04c4d3 100644 --- a/data/layouts/SevenIsland_TanobyRuins_DilfordChamber_Layout/map.bin +++ b/data/layouts/SevenIsland_TanobyRuins_DilfordChamber/map.bin diff --git a/data/layouts/SevenIsland_TanobyRuins_LiptooChamber_Layout/border.bin b/data/layouts/SevenIsland_TanobyRuins_LiptooChamber/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/SevenIsland_TanobyRuins_LiptooChamber_Layout/border.bin +++ b/data/layouts/SevenIsland_TanobyRuins_LiptooChamber/border.bin diff --git a/data/layouts/SevenIsland_TanobyRuins_LiptooChamber_Layout/map.bin b/data/layouts/SevenIsland_TanobyRuins_LiptooChamber/map.bin index 0dd265d65..0dd265d65 100644 --- a/data/layouts/SevenIsland_TanobyRuins_LiptooChamber_Layout/map.bin +++ b/data/layouts/SevenIsland_TanobyRuins_LiptooChamber/map.bin diff --git a/data/layouts/SevenIsland_TanobyRuins_MoneanChamber_Layout/border.bin b/data/layouts/SevenIsland_TanobyRuins_MoneanChamber/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/SevenIsland_TanobyRuins_MoneanChamber_Layout/border.bin +++ b/data/layouts/SevenIsland_TanobyRuins_MoneanChamber/border.bin diff --git a/data/layouts/SevenIsland_TanobyRuins_MoneanChamber_Layout/map.bin b/data/layouts/SevenIsland_TanobyRuins_MoneanChamber/map.bin index 38f818e71..38f818e71 100644 --- a/data/layouts/SevenIsland_TanobyRuins_MoneanChamber_Layout/map.bin +++ b/data/layouts/SevenIsland_TanobyRuins_MoneanChamber/map.bin diff --git a/data/layouts/SevenIsland_TanobyRuins_RixyChamber_Layout/border.bin b/data/layouts/SevenIsland_TanobyRuins_RixyChamber/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/SevenIsland_TanobyRuins_RixyChamber_Layout/border.bin +++ b/data/layouts/SevenIsland_TanobyRuins_RixyChamber/border.bin diff --git a/data/layouts/SevenIsland_TanobyRuins_RixyChamber_Layout/map.bin b/data/layouts/SevenIsland_TanobyRuins_RixyChamber/map.bin index e98187c67..e98187c67 100644 --- a/data/layouts/SevenIsland_TanobyRuins_RixyChamber_Layout/map.bin +++ b/data/layouts/SevenIsland_TanobyRuins_RixyChamber/map.bin diff --git a/data/layouts/SevenIsland_TanobyRuins_ScufibChamber_Layout/border.bin b/data/layouts/SevenIsland_TanobyRuins_ScufibChamber/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/SevenIsland_TanobyRuins_ScufibChamber_Layout/border.bin +++ b/data/layouts/SevenIsland_TanobyRuins_ScufibChamber/border.bin diff --git a/data/layouts/SevenIsland_TanobyRuins_ScufibChamber_Layout/map.bin b/data/layouts/SevenIsland_TanobyRuins_ScufibChamber/map.bin index bdd65c306..bdd65c306 100644 --- a/data/layouts/SevenIsland_TanobyRuins_ScufibChamber_Layout/map.bin +++ b/data/layouts/SevenIsland_TanobyRuins_ScufibChamber/map.bin diff --git a/data/layouts/SevenIsland_TanobyRuins_ViapoisChamber_Layout/border.bin b/data/layouts/SevenIsland_TanobyRuins_ViapoisChamber/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/SevenIsland_TanobyRuins_ViapoisChamber_Layout/border.bin +++ b/data/layouts/SevenIsland_TanobyRuins_ViapoisChamber/border.bin diff --git a/data/layouts/SevenIsland_TanobyRuins_ViapoisChamber_Layout/map.bin b/data/layouts/SevenIsland_TanobyRuins_ViapoisChamber/map.bin index 4d4d0e886..4d4d0e886 100644 --- a/data/layouts/SevenIsland_TanobyRuins_ViapoisChamber_Layout/map.bin +++ b/data/layouts/SevenIsland_TanobyRuins_ViapoisChamber/map.bin diff --git a/data/layouts/SevenIsland_TanobyRuins_WeepthChamber_Layout/border.bin b/data/layouts/SevenIsland_TanobyRuins_WeepthChamber/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/SevenIsland_TanobyRuins_WeepthChamber_Layout/border.bin +++ b/data/layouts/SevenIsland_TanobyRuins_WeepthChamber/border.bin diff --git a/data/layouts/SevenIsland_TanobyRuins_WeepthChamber_Layout/map.bin b/data/layouts/SevenIsland_TanobyRuins_WeepthChamber/map.bin index acb0469fc..acb0469fc 100644 --- a/data/layouts/SevenIsland_TanobyRuins_WeepthChamber_Layout/map.bin +++ b/data/layouts/SevenIsland_TanobyRuins_WeepthChamber/map.bin diff --git a/data/layouts/SevenIsland_TrainerTower_Layout/border.bin b/data/layouts/SevenIsland_TrainerTower/border.bin index 730aab996..730aab996 100644 --- a/data/layouts/SevenIsland_TrainerTower_Layout/border.bin +++ b/data/layouts/SevenIsland_TrainerTower/border.bin diff --git a/data/layouts/SevenIsland_TrainerTower_Layout/map.bin b/data/layouts/SevenIsland_TrainerTower/map.bin index c6a77c452..c6a77c452 100644 --- a/data/layouts/SevenIsland_TrainerTower_Layout/map.bin +++ b/data/layouts/SevenIsland_TrainerTower/map.bin diff --git a/data/layouts/SevenIsland_TrainerTower_1F_Layout/border.bin b/data/layouts/SevenIsland_TrainerTower_1F/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/SevenIsland_TrainerTower_1F_Layout/border.bin +++ b/data/layouts/SevenIsland_TrainerTower_1F/border.bin diff --git a/data/layouts/SevenIsland_TrainerTower_1F_Layout/map.bin b/data/layouts/SevenIsland_TrainerTower_1F/map.bin Binary files differindex 812cea451..812cea451 100644 --- a/data/layouts/SevenIsland_TrainerTower_1F_Layout/map.bin +++ b/data/layouts/SevenIsland_TrainerTower_1F/map.bin diff --git a/data/layouts/SevenIsland_TrainerTower_2F_Layout/border.bin b/data/layouts/SevenIsland_TrainerTower_2F/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/SevenIsland_TrainerTower_2F_Layout/border.bin +++ b/data/layouts/SevenIsland_TrainerTower_2F/border.bin diff --git a/data/layouts/SevenIsland_TrainerTower_2F_Layout/map.bin b/data/layouts/SevenIsland_TrainerTower_2F/map.bin Binary files differindex 7ae889af1..7ae889af1 100644 --- a/data/layouts/SevenIsland_TrainerTower_2F_Layout/map.bin +++ b/data/layouts/SevenIsland_TrainerTower_2F/map.bin diff --git a/data/layouts/SevenIsland_TrainerTower_3F_Layout/border.bin b/data/layouts/SevenIsland_TrainerTower_3F/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/SevenIsland_TrainerTower_3F_Layout/border.bin +++ b/data/layouts/SevenIsland_TrainerTower_3F/border.bin diff --git a/data/layouts/SevenIsland_TrainerTower_3F_Layout/map.bin b/data/layouts/SevenIsland_TrainerTower_3F/map.bin Binary files differindex c01e70c2f..c01e70c2f 100644 --- a/data/layouts/SevenIsland_TrainerTower_3F_Layout/map.bin +++ b/data/layouts/SevenIsland_TrainerTower_3F/map.bin diff --git a/data/layouts/SevenIsland_TrainerTower_4F_Layout/border.bin b/data/layouts/SevenIsland_TrainerTower_4F/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/SevenIsland_TrainerTower_4F_Layout/border.bin +++ b/data/layouts/SevenIsland_TrainerTower_4F/border.bin diff --git a/data/layouts/SevenIsland_TrainerTower_4F_Layout/map.bin b/data/layouts/SevenIsland_TrainerTower_4F/map.bin Binary files differindex 057d7f955..057d7f955 100644 --- a/data/layouts/SevenIsland_TrainerTower_4F_Layout/map.bin +++ b/data/layouts/SevenIsland_TrainerTower_4F/map.bin diff --git a/data/layouts/SevenIsland_TrainerTower_5F_Layout/border.bin b/data/layouts/SevenIsland_TrainerTower_5F/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/SevenIsland_TrainerTower_5F_Layout/border.bin +++ b/data/layouts/SevenIsland_TrainerTower_5F/border.bin diff --git a/data/layouts/SevenIsland_TrainerTower_5F_Layout/map.bin b/data/layouts/SevenIsland_TrainerTower_5F/map.bin Binary files differindex d580e7d2d..d580e7d2d 100644 --- a/data/layouts/SevenIsland_TrainerTower_5F_Layout/map.bin +++ b/data/layouts/SevenIsland_TrainerTower_5F/map.bin diff --git a/data/layouts/SevenIsland_TrainerTower_6F_Layout/border.bin b/data/layouts/SevenIsland_TrainerTower_6F/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/SevenIsland_TrainerTower_6F_Layout/border.bin +++ b/data/layouts/SevenIsland_TrainerTower_6F/border.bin diff --git a/data/layouts/SevenIsland_TrainerTower_6F_Layout/map.bin b/data/layouts/SevenIsland_TrainerTower_6F/map.bin Binary files differindex 3c2c3165c..3c2c3165c 100644 --- a/data/layouts/SevenIsland_TrainerTower_6F_Layout/map.bin +++ b/data/layouts/SevenIsland_TrainerTower_6F/map.bin diff --git a/data/layouts/SevenIsland_TrainerTower_7F_Layout/border.bin b/data/layouts/SevenIsland_TrainerTower_7F/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/SevenIsland_TrainerTower_7F_Layout/border.bin +++ b/data/layouts/SevenIsland_TrainerTower_7F/border.bin diff --git a/data/layouts/SevenIsland_TrainerTower_7F_Layout/map.bin b/data/layouts/SevenIsland_TrainerTower_7F/map.bin Binary files differindex d9bb110cf..d9bb110cf 100644 --- a/data/layouts/SevenIsland_TrainerTower_7F_Layout/map.bin +++ b/data/layouts/SevenIsland_TrainerTower_7F/map.bin diff --git a/data/layouts/SevenIsland_TrainerTower_8F_Layout/border.bin b/data/layouts/SevenIsland_TrainerTower_8F/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/SevenIsland_TrainerTower_8F_Layout/border.bin +++ b/data/layouts/SevenIsland_TrainerTower_8F/border.bin diff --git a/data/layouts/SevenIsland_TrainerTower_8F_Layout/map.bin b/data/layouts/SevenIsland_TrainerTower_8F/map.bin Binary files differindex 6ba6588be..6ba6588be 100644 --- a/data/layouts/SevenIsland_TrainerTower_8F_Layout/map.bin +++ b/data/layouts/SevenIsland_TrainerTower_8F/map.bin diff --git a/data/layouts/SevenIsland_TrainerTower_Elevator_Layout/border.bin b/data/layouts/SevenIsland_TrainerTower_Elevator/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/SevenIsland_TrainerTower_Elevator_Layout/border.bin +++ b/data/layouts/SevenIsland_TrainerTower_Elevator/border.bin diff --git a/data/layouts/SevenIsland_TrainerTower_Elevator_Layout/map.bin b/data/layouts/SevenIsland_TrainerTower_Elevator/map.bin index 42e08c38d..42e08c38d 100644 --- a/data/layouts/SevenIsland_TrainerTower_Elevator_Layout/map.bin +++ b/data/layouts/SevenIsland_TrainerTower_Elevator/map.bin diff --git a/data/layouts/SevenIsland_TrainerTower_Lobby_Layout/border.bin b/data/layouts/SevenIsland_TrainerTower_Lobby/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/SevenIsland_TrainerTower_Lobby_Layout/border.bin +++ b/data/layouts/SevenIsland_TrainerTower_Lobby/border.bin diff --git a/data/layouts/SevenIsland_TrainerTower_Lobby_Layout/map.bin b/data/layouts/SevenIsland_TrainerTower_Lobby/map.bin index b98077279..b98077279 100644 --- a/data/layouts/SevenIsland_TrainerTower_Lobby_Layout/map.bin +++ b/data/layouts/SevenIsland_TrainerTower_Lobby/map.bin diff --git a/data/layouts/SevenIsland_TrainerTower_Roof_Layout/border.bin b/data/layouts/SevenIsland_TrainerTower_Roof/border.bin index f94adee61..f94adee61 100644 --- a/data/layouts/SevenIsland_TrainerTower_Roof_Layout/border.bin +++ b/data/layouts/SevenIsland_TrainerTower_Roof/border.bin diff --git a/data/layouts/SevenIsland_TrainerTower_Roof_Layout/map.bin b/data/layouts/SevenIsland_TrainerTower_Roof/map.bin index 37d57f3fe..37d57f3fe 100644 --- a/data/layouts/SevenIsland_TrainerTower_Roof_Layout/map.bin +++ b/data/layouts/SevenIsland_TrainerTower_Roof/map.bin diff --git a/data/layouts/SilphCo_10F_Layout/border.bin b/data/layouts/SilphCo_10F/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/SilphCo_10F_Layout/border.bin +++ b/data/layouts/SilphCo_10F/border.bin diff --git a/data/layouts/SilphCo_10F_Layout/map.bin b/data/layouts/SilphCo_10F/map.bin index 1ca95017c..1ca95017c 100644 --- a/data/layouts/SilphCo_10F_Layout/map.bin +++ b/data/layouts/SilphCo_10F/map.bin diff --git a/data/layouts/SilphCo_11F_Layout/border.bin b/data/layouts/SilphCo_11F/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/SilphCo_11F_Layout/border.bin +++ b/data/layouts/SilphCo_11F/border.bin diff --git a/data/layouts/SilphCo_11F_Layout/map.bin b/data/layouts/SilphCo_11F/map.bin index 027e0a7db..027e0a7db 100644 --- a/data/layouts/SilphCo_11F_Layout/map.bin +++ b/data/layouts/SilphCo_11F/map.bin diff --git a/data/layouts/SilphCo_1F_Layout/border.bin b/data/layouts/SilphCo_1F/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/SilphCo_1F_Layout/border.bin +++ b/data/layouts/SilphCo_1F/border.bin diff --git a/data/layouts/SilphCo_1F_Layout/map.bin b/data/layouts/SilphCo_1F/map.bin index fb7be168b..fb7be168b 100644 --- a/data/layouts/SilphCo_1F_Layout/map.bin +++ b/data/layouts/SilphCo_1F/map.bin diff --git a/data/layouts/SilphCo_2F_Layout/border.bin b/data/layouts/SilphCo_2F/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/SilphCo_2F_Layout/border.bin +++ b/data/layouts/SilphCo_2F/border.bin diff --git a/data/layouts/SilphCo_2F_Layout/map.bin b/data/layouts/SilphCo_2F/map.bin index 97ada04d8..97ada04d8 100644 --- a/data/layouts/SilphCo_2F_Layout/map.bin +++ b/data/layouts/SilphCo_2F/map.bin diff --git a/data/layouts/SilphCo_3F_Layout/border.bin b/data/layouts/SilphCo_3F/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/SilphCo_3F_Layout/border.bin +++ b/data/layouts/SilphCo_3F/border.bin diff --git a/data/layouts/SilphCo_3F_Layout/map.bin b/data/layouts/SilphCo_3F/map.bin index e0a18ff16..e0a18ff16 100644 --- a/data/layouts/SilphCo_3F_Layout/map.bin +++ b/data/layouts/SilphCo_3F/map.bin diff --git a/data/layouts/SilphCo_4F_Layout/border.bin b/data/layouts/SilphCo_4F/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/SilphCo_4F_Layout/border.bin +++ b/data/layouts/SilphCo_4F/border.bin diff --git a/data/layouts/SilphCo_4F_Layout/map.bin b/data/layouts/SilphCo_4F/map.bin index b6a91deb8..b6a91deb8 100644 --- a/data/layouts/SilphCo_4F_Layout/map.bin +++ b/data/layouts/SilphCo_4F/map.bin diff --git a/data/layouts/SilphCo_5F_Layout/border.bin b/data/layouts/SilphCo_5F/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/SilphCo_5F_Layout/border.bin +++ b/data/layouts/SilphCo_5F/border.bin diff --git a/data/layouts/SilphCo_5F_Layout/map.bin b/data/layouts/SilphCo_5F/map.bin index 0a4f53ad7..0a4f53ad7 100644 --- a/data/layouts/SilphCo_5F_Layout/map.bin +++ b/data/layouts/SilphCo_5F/map.bin diff --git a/data/layouts/SilphCo_6F_Layout/border.bin b/data/layouts/SilphCo_6F/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/SilphCo_6F_Layout/border.bin +++ b/data/layouts/SilphCo_6F/border.bin diff --git a/data/layouts/SilphCo_6F_Layout/map.bin b/data/layouts/SilphCo_6F/map.bin index cf0b384e7..cf0b384e7 100644 --- a/data/layouts/SilphCo_6F_Layout/map.bin +++ b/data/layouts/SilphCo_6F/map.bin diff --git a/data/layouts/SilphCo_7F_Layout/border.bin b/data/layouts/SilphCo_7F/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/SilphCo_7F_Layout/border.bin +++ b/data/layouts/SilphCo_7F/border.bin diff --git a/data/layouts/SilphCo_7F_Layout/map.bin b/data/layouts/SilphCo_7F/map.bin index 373fa1f17..373fa1f17 100644 --- a/data/layouts/SilphCo_7F_Layout/map.bin +++ b/data/layouts/SilphCo_7F/map.bin diff --git a/data/layouts/SilphCo_8F_Layout/border.bin b/data/layouts/SilphCo_8F/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/SilphCo_8F_Layout/border.bin +++ b/data/layouts/SilphCo_8F/border.bin diff --git a/data/layouts/SilphCo_8F_Layout/map.bin b/data/layouts/SilphCo_8F/map.bin index 73efec7e1..73efec7e1 100644 --- a/data/layouts/SilphCo_8F_Layout/map.bin +++ b/data/layouts/SilphCo_8F/map.bin diff --git a/data/layouts/SilphCo_9F_Layout/border.bin b/data/layouts/SilphCo_9F/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/SilphCo_9F_Layout/border.bin +++ b/data/layouts/SilphCo_9F/border.bin diff --git a/data/layouts/SilphCo_9F_Layout/map.bin b/data/layouts/SilphCo_9F/map.bin index 95d58dafb..95d58dafb 100644 --- a/data/layouts/SilphCo_9F_Layout/map.bin +++ b/data/layouts/SilphCo_9F/map.bin diff --git a/data/layouts/SilphCo_Elevator_Layout/border.bin b/data/layouts/SilphCo_Elevator/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/SilphCo_Elevator_Layout/border.bin +++ b/data/layouts/SilphCo_Elevator/border.bin diff --git a/data/layouts/SilphCo_Elevator_Layout/map.bin b/data/layouts/SilphCo_Elevator/map.bin index 42e08c38d..42e08c38d 100644 --- a/data/layouts/SilphCo_Elevator_Layout/map.bin +++ b/data/layouts/SilphCo_Elevator/map.bin diff --git a/data/layouts/SixIsland_Layout/border.bin b/data/layouts/SixIsland/border.bin index d9994d6cd..d9994d6cd 100644 --- a/data/layouts/SixIsland_Layout/border.bin +++ b/data/layouts/SixIsland/border.bin diff --git a/data/layouts/SixIsland_Layout/map.bin b/data/layouts/SixIsland/map.bin index a82f268bd..a82f268bd 100644 --- a/data/layouts/SixIsland_Layout/map.bin +++ b/data/layouts/SixIsland/map.bin diff --git a/data/layouts/SeafoamIslands_B2F_Layout/border.bin b/data/layouts/SixIsland_AlteringCave/border.bin index a021ddd4e..a021ddd4e 100644 --- a/data/layouts/SeafoamIslands_B2F_Layout/border.bin +++ b/data/layouts/SixIsland_AlteringCave/border.bin diff --git a/data/layouts/SSAnne_1F_Room12_Layout/map.bin b/data/layouts/SixIsland_AlteringCave/map.bin Binary files differindex 7dde0cb15..7dde0cb15 100644 --- a/data/layouts/SSAnne_1F_Room12_Layout/map.bin +++ b/data/layouts/SixIsland_AlteringCave/map.bin diff --git a/data/layouts/SeafoamIslands_B3F_Layout/border.bin b/data/layouts/SixIsland_DottedHole_1F/border.bin index a021ddd4e..a021ddd4e 100644 --- a/data/layouts/SeafoamIslands_B3F_Layout/border.bin +++ b/data/layouts/SixIsland_DottedHole_1F/border.bin diff --git a/data/layouts/SSAnne_CaptainsOffice5_Layout/map.bin b/data/layouts/SixIsland_DottedHole_1F/map.bin index ea33c9ead..ea33c9ead 100644 --- a/data/layouts/SSAnne_CaptainsOffice5_Layout/map.bin +++ b/data/layouts/SixIsland_DottedHole_1F/map.bin diff --git a/data/layouts/SeafoamIslands_B4F_Layout/border.bin b/data/layouts/SixIsland_DottedHole_B1F/border.bin index a021ddd4e..a021ddd4e 100644 --- a/data/layouts/SeafoamIslands_B4F_Layout/border.bin +++ b/data/layouts/SixIsland_DottedHole_B1F/border.bin diff --git a/data/layouts/SixIsland_DottedHole_B1F_Layout/map.bin b/data/layouts/SixIsland_DottedHole_B1F/map.bin index a610cdd58..a610cdd58 100644 --- a/data/layouts/SixIsland_DottedHole_B1F_Layout/map.bin +++ b/data/layouts/SixIsland_DottedHole_B1F/map.bin diff --git a/data/layouts/SixIsland_DottedHole_B1F_Layout/border.bin b/data/layouts/SixIsland_DottedHole_B2F/border.bin index a021ddd4e..a021ddd4e 100644 --- a/data/layouts/SixIsland_DottedHole_B1F_Layout/border.bin +++ b/data/layouts/SixIsland_DottedHole_B2F/border.bin diff --git a/data/layouts/SixIsland_DottedHole_B2F_Layout/map.bin b/data/layouts/SixIsland_DottedHole_B2F/map.bin index 3abe860dd..3abe860dd 100644 --- a/data/layouts/SixIsland_DottedHole_B2F_Layout/map.bin +++ b/data/layouts/SixIsland_DottedHole_B2F/map.bin diff --git a/data/layouts/SixIsland_DottedHole_B2F_Layout/border.bin b/data/layouts/SixIsland_DottedHole_B3F/border.bin index a021ddd4e..a021ddd4e 100644 --- a/data/layouts/SixIsland_DottedHole_B2F_Layout/border.bin +++ b/data/layouts/SixIsland_DottedHole_B3F/border.bin diff --git a/data/layouts/SixIsland_DottedHole_B3F_Layout/map.bin b/data/layouts/SixIsland_DottedHole_B3F/map.bin index c72c26c5c..c72c26c5c 100644 --- a/data/layouts/SixIsland_DottedHole_B3F_Layout/map.bin +++ b/data/layouts/SixIsland_DottedHole_B3F/map.bin diff --git a/data/layouts/SixIsland_DottedHole_B3F_Layout/border.bin b/data/layouts/SixIsland_DottedHole_B4F/border.bin index a021ddd4e..a021ddd4e 100644 --- a/data/layouts/SixIsland_DottedHole_B3F_Layout/border.bin +++ b/data/layouts/SixIsland_DottedHole_B4F/border.bin diff --git a/data/layouts/SSAnne_CaptainsOffice9_Layout/map.bin b/data/layouts/SixIsland_DottedHole_B4F/map.bin index a0c7e44e3..a0c7e44e3 100644 --- a/data/layouts/SSAnne_CaptainsOffice9_Layout/map.bin +++ b/data/layouts/SixIsland_DottedHole_B4F/map.bin diff --git a/data/layouts/SixIsland_DottedHole_SapphireRoom_Layout/border.bin b/data/layouts/SixIsland_DottedHole_SapphireRoom/border.bin index a021ddd4e..a021ddd4e 100644 --- a/data/layouts/SixIsland_DottedHole_SapphireRoom_Layout/border.bin +++ b/data/layouts/SixIsland_DottedHole_SapphireRoom/border.bin diff --git a/data/layouts/SixIsland_DottedHole_SapphireRoom_Layout/map.bin b/data/layouts/SixIsland_DottedHole_SapphireRoom/map.bin index 67a89d25e..67a89d25e 100644 --- a/data/layouts/SixIsland_DottedHole_SapphireRoom_Layout/map.bin +++ b/data/layouts/SixIsland_DottedHole_SapphireRoom/map.bin diff --git a/data/layouts/SixIsland_GreenPath_Layout/border.bin b/data/layouts/SixIsland_GreenPath/border.bin index 730aab996..730aab996 100644 --- a/data/layouts/SixIsland_GreenPath_Layout/border.bin +++ b/data/layouts/SixIsland_GreenPath/border.bin diff --git a/data/layouts/SixIsland_GreenPath_Layout/map.bin b/data/layouts/SixIsland_GreenPath/map.bin Binary files differindex 647978c02..647978c02 100644 --- a/data/layouts/SixIsland_GreenPath_Layout/map.bin +++ b/data/layouts/SixIsland_GreenPath/map.bin diff --git a/data/layouts/SixIsland_OutcastIsland_Layout/border.bin b/data/layouts/SixIsland_OutcastIsland/border.bin index 730aab996..730aab996 100644 --- a/data/layouts/SixIsland_OutcastIsland_Layout/border.bin +++ b/data/layouts/SixIsland_OutcastIsland/border.bin diff --git a/data/layouts/SixIsland_OutcastIsland_Layout/map.bin b/data/layouts/SixIsland_OutcastIsland/map.bin index 53e933378..53e933378 100644 --- a/data/layouts/SixIsland_OutcastIsland_Layout/map.bin +++ b/data/layouts/SixIsland_OutcastIsland/map.bin diff --git a/data/layouts/SSAnne_1F_Room11_Layout/border.bin b/data/layouts/SixIsland_PatternBush/border.bin index c1fe47df7..c1fe47df7 100644 --- a/data/layouts/SSAnne_1F_Room11_Layout/border.bin +++ b/data/layouts/SixIsland_PatternBush/border.bin diff --git a/data/layouts/SSAnne_1F_Room11_Layout/map.bin b/data/layouts/SixIsland_PatternBush/map.bin index 7cd07c6c8..7cd07c6c8 100644 --- a/data/layouts/SSAnne_1F_Room11_Layout/map.bin +++ b/data/layouts/SixIsland_PatternBush/map.bin diff --git a/data/layouts/SixIsland_RuinValley_Layout/border.bin b/data/layouts/SixIsland_RuinValley/border.bin Binary files differindex 4531975c7..4531975c7 100644 --- a/data/layouts/SixIsland_RuinValley_Layout/border.bin +++ b/data/layouts/SixIsland_RuinValley/border.bin diff --git a/data/layouts/SixIsland_RuinValley_Layout/map.bin b/data/layouts/SixIsland_RuinValley/map.bin Binary files differindex 848cbec26..848cbec26 100644 --- a/data/layouts/SixIsland_RuinValley_Layout/map.bin +++ b/data/layouts/SixIsland_RuinValley/map.bin diff --git a/data/layouts/SixIsland_WaterPath_Layout/border.bin b/data/layouts/SixIsland_WaterPath/border.bin index 730aab996..730aab996 100644 --- a/data/layouts/SixIsland_WaterPath_Layout/border.bin +++ b/data/layouts/SixIsland_WaterPath/border.bin diff --git a/data/layouts/SixIsland_WaterPath_Layout/map.bin b/data/layouts/SixIsland_WaterPath/map.bin Binary files differindex 42f48165b..42f48165b 100644 --- a/data/layouts/SixIsland_WaterPath_Layout/map.bin +++ b/data/layouts/SixIsland_WaterPath/map.bin diff --git a/data/layouts/ThreeIsland_Layout/border.bin b/data/layouts/ThreeIsland/border.bin Binary files differindex a701312cf..a701312cf 100644 --- a/data/layouts/ThreeIsland_Layout/border.bin +++ b/data/layouts/ThreeIsland/border.bin diff --git a/data/layouts/ThreeIsland_Layout/map.bin b/data/layouts/ThreeIsland/map.bin index 523f3e70c..523f3e70c 100644 --- a/data/layouts/ThreeIsland_Layout/map.bin +++ b/data/layouts/ThreeIsland/map.bin diff --git a/data/layouts/ThreeIsland_BerryForest_Layout/border.bin b/data/layouts/ThreeIsland_BerryForest/border.bin index 7797e033b..7797e033b 100644 --- a/data/layouts/ThreeIsland_BerryForest_Layout/border.bin +++ b/data/layouts/ThreeIsland_BerryForest/border.bin diff --git a/data/layouts/ThreeIsland_BerryForest_Layout/map.bin b/data/layouts/ThreeIsland_BerryForest/map.bin index e98d91119..e98d91119 100644 --- a/data/layouts/ThreeIsland_BerryForest_Layout/map.bin +++ b/data/layouts/ThreeIsland_BerryForest/map.bin diff --git a/data/layouts/ThreeIsland_BondBridge_Layout/border.bin b/data/layouts/ThreeIsland_BondBridge/border.bin index 730aab996..730aab996 100644 --- a/data/layouts/ThreeIsland_BondBridge_Layout/border.bin +++ b/data/layouts/ThreeIsland_BondBridge/border.bin diff --git a/data/layouts/ThreeIsland_BondBridge_Layout/map.bin b/data/layouts/ThreeIsland_BondBridge/map.bin Binary files differindex c554c03e3..c554c03e3 100644 --- a/data/layouts/ThreeIsland_BondBridge_Layout/map.bin +++ b/data/layouts/ThreeIsland_BondBridge/map.bin diff --git a/data/layouts/ThreeIsland_DunsparceTunnel_Layout/border.bin b/data/layouts/ThreeIsland_DunsparceTunnel/border.bin index a021ddd4e..a021ddd4e 100644 --- a/data/layouts/ThreeIsland_DunsparceTunnel_Layout/border.bin +++ b/data/layouts/ThreeIsland_DunsparceTunnel/border.bin diff --git a/data/layouts/ThreeIsland_DunsparceTunnel_Layout/map.bin b/data/layouts/ThreeIsland_DunsparceTunnel/map.bin index 4623ea1b3..4623ea1b3 100644 --- a/data/layouts/ThreeIsland_DunsparceTunnel_Layout/map.bin +++ b/data/layouts/ThreeIsland_DunsparceTunnel/map.bin diff --git a/data/layouts/ThreeIsland_House1_Layout/border.bin b/data/layouts/ThreeIsland_House1/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/ThreeIsland_House1_Layout/border.bin +++ b/data/layouts/ThreeIsland_House1/border.bin diff --git a/data/layouts/ThreeIsland_House1_Layout/map.bin b/data/layouts/ThreeIsland_House1/map.bin index 871205cfa..871205cfa 100644 --- a/data/layouts/ThreeIsland_House1_Layout/map.bin +++ b/data/layouts/ThreeIsland_House1/map.bin diff --git a/data/layouts/ThreeIsland_Port_Layout/border.bin b/data/layouts/ThreeIsland_Port/border.bin index 75f2c916c..75f2c916c 100644 --- a/data/layouts/ThreeIsland_Port_Layout/border.bin +++ b/data/layouts/ThreeIsland_Port/border.bin diff --git a/data/layouts/ThreeIsland_Port_Layout/map.bin b/data/layouts/ThreeIsland_Port/map.bin Binary files differindex 44f29053c..44f29053c 100644 --- a/data/layouts/ThreeIsland_Port_Layout/map.bin +++ b/data/layouts/ThreeIsland_Port/map.bin diff --git a/data/layouts/TwoIsland_Layout/border.bin b/data/layouts/TwoIsland/border.bin Binary files differindex 4531975c7..4531975c7 100644 --- a/data/layouts/TwoIsland_Layout/border.bin +++ b/data/layouts/TwoIsland/border.bin diff --git a/data/layouts/TwoIsland_Layout/map.bin b/data/layouts/TwoIsland/map.bin Binary files differindex 60e9c0bc9..60e9c0bc9 100644 --- a/data/layouts/TwoIsland_Layout/map.bin +++ b/data/layouts/TwoIsland/map.bin diff --git a/data/layouts/TwoIsland_CapeBrink_Layout/border.bin b/data/layouts/TwoIsland_CapeBrink/border.bin index 75f2c916c..75f2c916c 100644 --- a/data/layouts/TwoIsland_CapeBrink_Layout/border.bin +++ b/data/layouts/TwoIsland_CapeBrink/border.bin diff --git a/data/layouts/TwoIsland_CapeBrink_Layout/map.bin b/data/layouts/TwoIsland_CapeBrink/map.bin index d48f75cd4..d48f75cd4 100644 --- a/data/layouts/TwoIsland_CapeBrink_Layout/map.bin +++ b/data/layouts/TwoIsland_CapeBrink/map.bin diff --git a/data/layouts/TwoIsland_JoyfulGameCorner_Layout/border.bin b/data/layouts/TwoIsland_JoyfulGameCorner/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/TwoIsland_JoyfulGameCorner_Layout/border.bin +++ b/data/layouts/TwoIsland_JoyfulGameCorner/border.bin diff --git a/data/layouts/TwoIsland_JoyfulGameCorner_Layout/map.bin b/data/layouts/TwoIsland_JoyfulGameCorner/map.bin Binary files differindex c445c5cb3..c445c5cb3 100644 --- a/data/layouts/TwoIsland_JoyfulGameCorner_Layout/map.bin +++ b/data/layouts/TwoIsland_JoyfulGameCorner/map.bin diff --git a/data/layouts/UndergroundPath_EastWestTunnel_Layout/border.bin b/data/layouts/UndergroundPath_EastWestTunnel/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/UndergroundPath_EastWestTunnel_Layout/border.bin +++ b/data/layouts/UndergroundPath_EastWestTunnel/border.bin diff --git a/data/layouts/UndergroundPath_EastWestTunnel_Layout/map.bin b/data/layouts/UndergroundPath_EastWestTunnel/map.bin index b6890bacd..b6890bacd 100644 --- a/data/layouts/UndergroundPath_EastWestTunnel_Layout/map.bin +++ b/data/layouts/UndergroundPath_EastWestTunnel/map.bin diff --git a/data/layouts/UndergroundPath_Entrance_Layout/border.bin b/data/layouts/UndergroundPath_Entrance/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/UndergroundPath_Entrance_Layout/border.bin +++ b/data/layouts/UndergroundPath_Entrance/border.bin diff --git a/data/layouts/UndergroundPath_Entrance_Layout/map.bin b/data/layouts/UndergroundPath_Entrance/map.bin index 58cc0f850..58cc0f850 100644 --- a/data/layouts/UndergroundPath_Entrance_Layout/map.bin +++ b/data/layouts/UndergroundPath_Entrance/map.bin diff --git a/data/layouts/UndergroundPath_NorthSouthTunnel_Layout/border.bin b/data/layouts/UndergroundPath_NorthSouthTunnel/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/UndergroundPath_NorthSouthTunnel_Layout/border.bin +++ b/data/layouts/UndergroundPath_NorthSouthTunnel/border.bin diff --git a/data/layouts/UndergroundPath_NorthSouthTunnel_Layout/map.bin b/data/layouts/UndergroundPath_NorthSouthTunnel/map.bin index 4772a43cd..4772a43cd 100644 --- a/data/layouts/UndergroundPath_NorthSouthTunnel_Layout/map.bin +++ b/data/layouts/UndergroundPath_NorthSouthTunnel/map.bin diff --git a/data/layouts/UnknownMap_00_00_Layout/border.bin b/data/layouts/UnknownMap_00_00/border.bin index efef023e6..efef023e6 100644 --- a/data/layouts/UnknownMap_00_00_Layout/border.bin +++ b/data/layouts/UnknownMap_00_00/border.bin diff --git a/data/layouts/UnknownMap_00_00_Layout/map.bin b/data/layouts/UnknownMap_00_00/map.bin Binary files differindex 8616a5f1b..8616a5f1b 100644 --- a/data/layouts/UnknownMap_00_00_Layout/map.bin +++ b/data/layouts/UnknownMap_00_00/map.bin diff --git a/data/layouts/UnknownMap_00_01_Layout/border.bin b/data/layouts/UnknownMap_00_01/border.bin index efef023e6..efef023e6 100644 --- a/data/layouts/UnknownMap_00_01_Layout/border.bin +++ b/data/layouts/UnknownMap_00_01/border.bin diff --git a/data/layouts/UnknownMap_00_01_Layout/map.bin b/data/layouts/UnknownMap_00_01/map.bin index 93050f0f5..93050f0f5 100644 --- a/data/layouts/UnknownMap_00_01_Layout/map.bin +++ b/data/layouts/UnknownMap_00_01/map.bin diff --git a/data/layouts/UnknownMap_00_02_Layout/border.bin b/data/layouts/UnknownMap_00_02/border.bin index efef023e6..efef023e6 100644 --- a/data/layouts/UnknownMap_00_02_Layout/border.bin +++ b/data/layouts/UnknownMap_00_02/border.bin diff --git a/data/layouts/UnknownMap_00_02_Layout/map.bin b/data/layouts/UnknownMap_00_02/map.bin index 08209eaca..08209eaca 100644 --- a/data/layouts/UnknownMap_00_02_Layout/map.bin +++ b/data/layouts/UnknownMap_00_02/map.bin diff --git a/data/layouts/UnknownMap_00_03_Layout/border.bin b/data/layouts/UnknownMap_00_03/border.bin index efef023e6..efef023e6 100644 --- a/data/layouts/UnknownMap_00_03_Layout/border.bin +++ b/data/layouts/UnknownMap_00_03/border.bin diff --git a/data/layouts/UnknownMap_00_03_Layout/map.bin b/data/layouts/UnknownMap_00_03/map.bin Binary files differindex c68e13ec3..c68e13ec3 100644 --- a/data/layouts/UnknownMap_00_03_Layout/map.bin +++ b/data/layouts/UnknownMap_00_03/map.bin diff --git a/data/layouts/UnknownMap_00_04_Layout/border.bin b/data/layouts/UnknownMap_00_04/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/UnknownMap_00_04_Layout/border.bin +++ b/data/layouts/UnknownMap_00_04/border.bin diff --git a/data/layouts/UnknownMap_00_04_Layout/map.bin b/data/layouts/UnknownMap_00_04/map.bin index 829e21554..829e21554 100644 --- a/data/layouts/UnknownMap_00_04_Layout/map.bin +++ b/data/layouts/UnknownMap_00_04/map.bin diff --git a/data/layouts/UnknownMap_03_50_Layout/border.bin b/data/layouts/UnknownMap_03_50/border.bin index d9994d6cd..d9994d6cd 100644 --- a/data/layouts/UnknownMap_03_50_Layout/border.bin +++ b/data/layouts/UnknownMap_03_50/border.bin diff --git a/data/layouts/UnknownMap_03_50_Layout/map.bin b/data/layouts/UnknownMap_03_50/map.bin index cbd97e361..cbd97e361 100644 --- a/data/layouts/UnknownMap_03_50_Layout/map.bin +++ b/data/layouts/UnknownMap_03_50/map.bin diff --git a/data/layouts/UnknownMap_03_51_Layout/border.bin b/data/layouts/UnknownMap_03_51/border.bin index d9994d6cd..d9994d6cd 100644 --- a/data/layouts/UnknownMap_03_51_Layout/border.bin +++ b/data/layouts/UnknownMap_03_51/border.bin diff --git a/data/layouts/UnknownMap_03_51_Layout/map.bin b/data/layouts/UnknownMap_03_51/map.bin index e6859e745..e6859e745 100644 --- a/data/layouts/UnknownMap_03_51_Layout/map.bin +++ b/data/layouts/UnknownMap_03_51/map.bin diff --git a/data/layouts/UnknownMap_03_52_Layout/border.bin b/data/layouts/UnknownMap_03_52/border.bin index d9994d6cd..d9994d6cd 100644 --- a/data/layouts/UnknownMap_03_52_Layout/border.bin +++ b/data/layouts/UnknownMap_03_52/border.bin diff --git a/data/layouts/UnknownMap_03_52_Layout/map.bin b/data/layouts/UnknownMap_03_52/map.bin Binary files differindex 7f730c596..7f730c596 100644 --- a/data/layouts/UnknownMap_03_52_Layout/map.bin +++ b/data/layouts/UnknownMap_03_52/map.bin diff --git a/data/layouts/UnknownMap_03_53_Layout/border.bin b/data/layouts/UnknownMap_03_53/border.bin index d9994d6cd..d9994d6cd 100644 --- a/data/layouts/UnknownMap_03_53_Layout/border.bin +++ b/data/layouts/UnknownMap_03_53/border.bin diff --git a/data/layouts/UnknownMap_03_53_Layout/map.bin b/data/layouts/UnknownMap_03_53/map.bin index 616f50967..616f50967 100644 --- a/data/layouts/UnknownMap_03_53_Layout/map.bin +++ b/data/layouts/UnknownMap_03_53/map.bin diff --git a/data/layouts/UnusedLayout_82D54D8_Layout/border.bin b/data/layouts/UnusedLayout_82D54D8/border.bin index c1b82435c..c1b82435c 100644 --- a/data/layouts/UnusedLayout_82D54D8_Layout/border.bin +++ b/data/layouts/UnusedLayout_82D54D8/border.bin diff --git a/data/layouts/UnusedLayout_82D54D8_Layout/map.bin b/data/layouts/UnusedLayout_82D54D8/map.bin index b51210332..b51210332 100644 --- a/data/layouts/UnusedLayout_82D54D8_Layout/map.bin +++ b/data/layouts/UnusedLayout_82D54D8/map.bin diff --git a/data/layouts/UnusedLayout_82D6144_Layout/border.bin b/data/layouts/UnusedLayout_82D6144/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/layouts/UnusedLayout_82D6144_Layout/border.bin +++ b/data/layouts/UnusedLayout_82D6144/border.bin diff --git a/data/layouts/UnusedLayout_82D6144_Layout/map.bin b/data/layouts/UnusedLayout_82D6144/map.bin index cc0294a80..cc0294a80 100644 --- a/data/layouts/UnusedLayout_82D6144_Layout/map.bin +++ b/data/layouts/UnusedLayout_82D6144/map.bin diff --git a/data/layouts/UnusedLayout_82D6490_Layout/border.bin b/data/layouts/UnusedLayout_82D6490/border.bin index efef023e6..efef023e6 100644 --- a/data/layouts/UnusedLayout_82D6490_Layout/border.bin +++ b/data/layouts/UnusedLayout_82D6490/border.bin diff --git a/data/layouts/UnusedLayout_82D6490_Layout/map.bin b/data/layouts/UnusedLayout_82D6490/map.bin index f84061f08..f84061f08 100644 --- a/data/layouts/UnusedLayout_82D6490_Layout/map.bin +++ b/data/layouts/UnusedLayout_82D6490/map.bin diff --git a/data/layouts/UnusedLayout_82D6654_Layout/border.bin b/data/layouts/UnusedLayout_82D6654/border.bin index 19d906679..19d906679 100644 --- a/data/layouts/UnusedLayout_82D6654_Layout/border.bin +++ b/data/layouts/UnusedLayout_82D6654/border.bin diff --git a/data/layouts/UnusedLayout_82D6654_Layout/map.bin b/data/layouts/UnusedLayout_82D6654/map.bin index 7865fdc7c..7865fdc7c 100644 --- a/data/layouts/UnusedLayout_82D6654_Layout/map.bin +++ b/data/layouts/UnusedLayout_82D6654/map.bin diff --git a/data/layouts/UnusedLayout_82D672C_Layout/border.bin b/data/layouts/UnusedLayout_82D672C/border.bin index 19d906679..19d906679 100644 --- a/data/layouts/UnusedLayout_82D672C_Layout/border.bin +++ b/data/layouts/UnusedLayout_82D672C/border.bin diff --git a/data/layouts/UnusedLayout_82D672C_Layout/map.bin b/data/layouts/UnusedLayout_82D672C/map.bin index 617346322..617346322 100644 --- a/data/layouts/UnusedLayout_82D672C_Layout/map.bin +++ b/data/layouts/UnusedLayout_82D672C/map.bin diff --git a/data/layouts/UnusedLayout_82D6C34_Layout/border.bin b/data/layouts/UnusedLayout_82D6C34/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/UnusedLayout_82D6C34_Layout/border.bin +++ b/data/layouts/UnusedLayout_82D6C34/border.bin diff --git a/data/layouts/UnusedLayout_82D6C34_Layout/map.bin b/data/layouts/UnusedLayout_82D6C34/map.bin Binary files differindex 35968a7fd..35968a7fd 100644 --- a/data/layouts/UnusedLayout_82D6C34_Layout/map.bin +++ b/data/layouts/UnusedLayout_82D6C34/map.bin diff --git a/data/layouts/UnusedLayout_82D75F0_Layout/border.bin b/data/layouts/UnusedLayout_82D75F0/border.bin index 19d906679..19d906679 100644 --- a/data/layouts/UnusedLayout_82D75F0_Layout/border.bin +++ b/data/layouts/UnusedLayout_82D75F0/border.bin diff --git a/data/layouts/UnusedLayout_82D75F0_Layout/map.bin b/data/layouts/UnusedLayout_82D75F0/map.bin index 5515d00cf..5515d00cf 100644 --- a/data/layouts/UnusedLayout_82D75F0_Layout/map.bin +++ b/data/layouts/UnusedLayout_82D75F0/map.bin diff --git a/data/layouts/UnusedLayout_82D7674_Layout/border.bin b/data/layouts/UnusedLayout_82D7674/border.bin index 19d906679..19d906679 100644 --- a/data/layouts/UnusedLayout_82D7674_Layout/border.bin +++ b/data/layouts/UnusedLayout_82D7674/border.bin diff --git a/data/layouts/UnusedLayout_82D7674_Layout/map.bin b/data/layouts/UnusedLayout_82D7674/map.bin index 5a3ac8cb6..5a3ac8cb6 100644 --- a/data/layouts/UnusedLayout_82D7674_Layout/map.bin +++ b/data/layouts/UnusedLayout_82D7674/map.bin diff --git a/data/layouts/UnusedLayout_82D7CC8_Layout/border.bin b/data/layouts/UnusedLayout_82D7CC8/border.bin index 19d906679..19d906679 100644 --- a/data/layouts/UnusedLayout_82D7CC8_Layout/border.bin +++ b/data/layouts/UnusedLayout_82D7CC8/border.bin diff --git a/data/layouts/UnusedLayout_82D7CC8_Layout/map.bin b/data/layouts/UnusedLayout_82D7CC8/map.bin index 3fbcd6043..3fbcd6043 100644 --- a/data/layouts/UnusedLayout_82D7CC8_Layout/map.bin +++ b/data/layouts/UnusedLayout_82D7CC8/map.bin diff --git a/data/layouts/UnusedLayout_82D88C8_Layout/border.bin b/data/layouts/UnusedLayout_82D88C8/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/layouts/UnusedLayout_82D88C8_Layout/border.bin +++ b/data/layouts/UnusedLayout_82D88C8/border.bin diff --git a/data/layouts/UnusedLayout_82D88C8_Layout/map.bin b/data/layouts/UnusedLayout_82D88C8/map.bin index 35c1badac..35c1badac 100644 --- a/data/layouts/UnusedLayout_82D88C8_Layout/map.bin +++ b/data/layouts/UnusedLayout_82D88C8/map.bin diff --git a/data/layouts/UnusedLayout_82D9B24_Layout/border.bin b/data/layouts/UnusedLayout_82D9B24/border.bin index 03bcafef1..03bcafef1 100644 --- a/data/layouts/UnusedLayout_82D9B24_Layout/border.bin +++ b/data/layouts/UnusedLayout_82D9B24/border.bin diff --git a/data/layouts/UnusedLayout_82D9B24_Layout/map.bin b/data/layouts/UnusedLayout_82D9B24/map.bin Binary files differindex d5e7fd825..d5e7fd825 100644 --- a/data/layouts/UnusedLayout_82D9B24_Layout/map.bin +++ b/data/layouts/UnusedLayout_82D9B24/map.bin diff --git a/data/layouts/UnusedLayout_82DA7C8_Layout/border.bin b/data/layouts/UnusedLayout_82DA7C8/border.bin index 03bcafef1..03bcafef1 100644 --- a/data/layouts/UnusedLayout_82DA7C8_Layout/border.bin +++ b/data/layouts/UnusedLayout_82DA7C8/border.bin diff --git a/data/layouts/UnusedLayout_82DA7C8_Layout/map.bin b/data/layouts/UnusedLayout_82DA7C8/map.bin Binary files differindex 0074b6e55..0074b6e55 100644 --- a/data/layouts/UnusedLayout_82DA7C8_Layout/map.bin +++ b/data/layouts/UnusedLayout_82DA7C8/map.bin diff --git a/data/layouts/UnusedLayout_82DB46C_Layout/border.bin b/data/layouts/UnusedLayout_82DB46C/border.bin index 03bcafef1..03bcafef1 100644 --- a/data/layouts/UnusedLayout_82DB46C_Layout/border.bin +++ b/data/layouts/UnusedLayout_82DB46C/border.bin diff --git a/data/layouts/UnusedLayout_82DB46C_Layout/map.bin b/data/layouts/UnusedLayout_82DB46C/map.bin Binary files differindex 540798144..540798144 100644 --- a/data/layouts/UnusedLayout_82DB46C_Layout/map.bin +++ b/data/layouts/UnusedLayout_82DB46C/map.bin diff --git a/data/layouts/UnusedLayout_82DB4F0_Layout/border.bin b/data/layouts/UnusedLayout_82DB4F0/border.bin index 19d906679..19d906679 100644 --- a/data/layouts/UnusedLayout_82DB4F0_Layout/border.bin +++ b/data/layouts/UnusedLayout_82DB4F0/border.bin diff --git a/data/layouts/UnusedLayout_82DB4F0_Layout/map.bin b/data/layouts/UnusedLayout_82DB4F0/map.bin index 6ca8b4e61..6ca8b4e61 100644 --- a/data/layouts/UnusedLayout_82DB4F0_Layout/map.bin +++ b/data/layouts/UnusedLayout_82DB4F0/map.bin diff --git a/data/layouts/UnusedLayout_82DBBE0_Layout/border.bin b/data/layouts/UnusedLayout_82DBBE0/border.bin index c3fe51511..c3fe51511 100644 --- a/data/layouts/UnusedLayout_82DBBE0_Layout/border.bin +++ b/data/layouts/UnusedLayout_82DBBE0/border.bin diff --git a/data/layouts/UnusedLayout_82DBBE0_Layout/map.bin b/data/layouts/UnusedLayout_82DBBE0/map.bin index 6e9f6adb6..6e9f6adb6 100644 --- a/data/layouts/UnusedLayout_82DBBE0_Layout/map.bin +++ b/data/layouts/UnusedLayout_82DBBE0/map.bin diff --git a/data/layouts/UnusedLayout_82DBDD8_Layout/border.bin b/data/layouts/UnusedLayout_82DBDD8/border.bin index 19d906679..19d906679 100644 --- a/data/layouts/UnusedLayout_82DBDD8_Layout/border.bin +++ b/data/layouts/UnusedLayout_82DBDD8/border.bin diff --git a/data/layouts/UnusedLayout_82DBDD8_Layout/map.bin b/data/layouts/UnusedLayout_82DBDD8/map.bin index f8cf1725d..f8cf1725d 100644 --- a/data/layouts/UnusedLayout_82DBDD8_Layout/map.bin +++ b/data/layouts/UnusedLayout_82DBDD8/map.bin diff --git a/data/layouts/UnusedLayout_82DBFB8_Layout/border.bin b/data/layouts/UnusedLayout_82DBFB8/border.bin index 19d906679..19d906679 100644 --- a/data/layouts/UnusedLayout_82DBFB8_Layout/border.bin +++ b/data/layouts/UnusedLayout_82DBFB8/border.bin diff --git a/data/layouts/UnusedLayout_82DBFB8_Layout/map.bin b/data/layouts/UnusedLayout_82DBFB8/map.bin index 059ce30fe..059ce30fe 100644 --- a/data/layouts/UnusedLayout_82DBFB8_Layout/map.bin +++ b/data/layouts/UnusedLayout_82DBFB8/map.bin diff --git a/data/layouts/UnusedLayout_82DC4EC_Layout/border.bin b/data/layouts/UnusedLayout_82DC4EC/border.bin index 19d906679..19d906679 100644 --- a/data/layouts/UnusedLayout_82DC4EC_Layout/border.bin +++ b/data/layouts/UnusedLayout_82DC4EC/border.bin diff --git a/data/layouts/UnusedLayout_82DC4EC_Layout/map.bin b/data/layouts/UnusedLayout_82DC4EC/map.bin index 6103ad0c2..6103ad0c2 100644 --- a/data/layouts/UnusedLayout_82DC4EC_Layout/map.bin +++ b/data/layouts/UnusedLayout_82DC4EC/map.bin diff --git a/data/layouts/UnusedLayout_82DC60C_Layout/border.bin b/data/layouts/UnusedLayout_82DC60C/border.bin index 19d906679..19d906679 100644 --- a/data/layouts/UnusedLayout_82DC60C_Layout/border.bin +++ b/data/layouts/UnusedLayout_82DC60C/border.bin diff --git a/data/layouts/UnusedLayout_82DC60C_Layout/map.bin b/data/layouts/UnusedLayout_82DC60C/map.bin Binary files differindex 0f6829f9c..0f6829f9c 100644 --- a/data/layouts/UnusedLayout_82DC60C_Layout/map.bin +++ b/data/layouts/UnusedLayout_82DC60C/map.bin diff --git a/data/layouts/UnusedLayout_82DC72C_Layout/border.bin b/data/layouts/UnusedLayout_82DC72C/border.bin index 19d906679..19d906679 100644 --- a/data/layouts/UnusedLayout_82DC72C_Layout/border.bin +++ b/data/layouts/UnusedLayout_82DC72C/border.bin diff --git a/data/layouts/UnusedLayout_82DC72C_Layout/map.bin b/data/layouts/UnusedLayout_82DC72C/map.bin Binary files differindex 9f3750fb4..9f3750fb4 100644 --- a/data/layouts/UnusedLayout_82DC72C_Layout/map.bin +++ b/data/layouts/UnusedLayout_82DC72C/map.bin diff --git a/data/layouts/UnusedLayout_82DC84C_Layout/border.bin b/data/layouts/UnusedLayout_82DC84C/border.bin index 19d906679..19d906679 100644 --- a/data/layouts/UnusedLayout_82DC84C_Layout/border.bin +++ b/data/layouts/UnusedLayout_82DC84C/border.bin diff --git a/data/layouts/UnusedLayout_82DC84C_Layout/map.bin b/data/layouts/UnusedLayout_82DC84C/map.bin Binary files differindex 2112fe799..2112fe799 100644 --- a/data/layouts/UnusedLayout_82DC84C_Layout/map.bin +++ b/data/layouts/UnusedLayout_82DC84C/map.bin diff --git a/data/layouts/UnusedLayout_82DCA70_Layout/border.bin b/data/layouts/UnusedLayout_82DCA70/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/layouts/UnusedLayout_82DCA70_Layout/border.bin +++ b/data/layouts/UnusedLayout_82DCA70/border.bin diff --git a/data/layouts/UnusedLayout_82DCA70_Layout/map.bin b/data/layouts/UnusedLayout_82DCA70/map.bin index 1df9e4804..1df9e4804 100644 --- a/data/layouts/UnusedLayout_82DCA70_Layout/map.bin +++ b/data/layouts/UnusedLayout_82DCA70/map.bin diff --git a/data/layouts/UnusedLayout_82DCB44_Layout/border.bin b/data/layouts/UnusedLayout_82DCB44/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/layouts/UnusedLayout_82DCB44_Layout/border.bin +++ b/data/layouts/UnusedLayout_82DCB44/border.bin diff --git a/data/layouts/UnusedLayout_82DCB44_Layout/map.bin b/data/layouts/UnusedLayout_82DCB44/map.bin index bad63f412..bad63f412 100644 --- a/data/layouts/UnusedLayout_82DCB44_Layout/map.bin +++ b/data/layouts/UnusedLayout_82DCB44/map.bin diff --git a/data/layouts/UnusedLayout_82DCC40_Layout/border.bin b/data/layouts/UnusedLayout_82DCC40/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/layouts/UnusedLayout_82DCC40_Layout/border.bin +++ b/data/layouts/UnusedLayout_82DCC40/border.bin diff --git a/data/layouts/UnusedLayout_82DCC40_Layout/map.bin b/data/layouts/UnusedLayout_82DCC40/map.bin index 399d05705..399d05705 100644 --- a/data/layouts/UnusedLayout_82DCC40_Layout/map.bin +++ b/data/layouts/UnusedLayout_82DCC40/map.bin diff --git a/data/layouts/UnusedLayout_82DCCD4_Layout/border.bin b/data/layouts/UnusedLayout_82DCCD4/border.bin index 19d906679..19d906679 100644 --- a/data/layouts/UnusedLayout_82DCCD4_Layout/border.bin +++ b/data/layouts/UnusedLayout_82DCCD4/border.bin diff --git a/data/layouts/UnusedLayout_82DCCD4_Layout/map.bin b/data/layouts/UnusedLayout_82DCCD4/map.bin index 43f11b194..43f11b194 100644 --- a/data/layouts/UnusedLayout_82DCCD4_Layout/map.bin +++ b/data/layouts/UnusedLayout_82DCCD4/map.bin diff --git a/data/layouts/UnusedLayout_82DCD68_Layout/border.bin b/data/layouts/UnusedLayout_82DCD68/border.bin index 19d906679..19d906679 100644 --- a/data/layouts/UnusedLayout_82DCD68_Layout/border.bin +++ b/data/layouts/UnusedLayout_82DCD68/border.bin diff --git a/data/layouts/UnusedLayout_82DCD68_Layout/map.bin b/data/layouts/UnusedLayout_82DCD68/map.bin index 632e1e36a..632e1e36a 100644 --- a/data/layouts/UnusedLayout_82DCD68_Layout/map.bin +++ b/data/layouts/UnusedLayout_82DCD68/map.bin diff --git a/data/layouts/UnusedLayout_82DCDFC_Layout/border.bin b/data/layouts/UnusedLayout_82DCDFC/border.bin index 19d906679..19d906679 100644 --- a/data/layouts/UnusedLayout_82DCDFC_Layout/border.bin +++ b/data/layouts/UnusedLayout_82DCDFC/border.bin diff --git a/data/layouts/UnusedLayout_82DCDFC_Layout/map.bin b/data/layouts/UnusedLayout_82DCDFC/map.bin index 8bbd6c517..8bbd6c517 100644 --- a/data/layouts/UnusedLayout_82DCDFC_Layout/map.bin +++ b/data/layouts/UnusedLayout_82DCDFC/map.bin diff --git a/data/layouts/UnusedLayout_82DCF00_Layout/border.bin b/data/layouts/UnusedLayout_82DCF00/border.bin index 19d906679..19d906679 100644 --- a/data/layouts/UnusedLayout_82DCF00_Layout/border.bin +++ b/data/layouts/UnusedLayout_82DCF00/border.bin diff --git a/data/layouts/UnusedLayout_82DCF00_Layout/map.bin b/data/layouts/UnusedLayout_82DCF00/map.bin index 017298e71..017298e71 100644 --- a/data/layouts/UnusedLayout_82DCF00_Layout/map.bin +++ b/data/layouts/UnusedLayout_82DCF00/map.bin diff --git a/data/layouts/UnusedLayout_82DD004_Layout/border.bin b/data/layouts/UnusedLayout_82DD004/border.bin index 19d906679..19d906679 100644 --- a/data/layouts/UnusedLayout_82DD004_Layout/border.bin +++ b/data/layouts/UnusedLayout_82DD004/border.bin diff --git a/data/layouts/UnusedLayout_82DD004_Layout/map.bin b/data/layouts/UnusedLayout_82DD004/map.bin index 17a611343..17a611343 100644 --- a/data/layouts/UnusedLayout_82DD004_Layout/map.bin +++ b/data/layouts/UnusedLayout_82DD004/map.bin diff --git a/data/layouts/UnusedLayout_82DD0DC_Layout/border.bin b/data/layouts/UnusedLayout_82DD0DC/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/layouts/UnusedLayout_82DD0DC_Layout/border.bin +++ b/data/layouts/UnusedLayout_82DD0DC/border.bin diff --git a/data/layouts/UnusedLayout_82DD0DC_Layout/map.bin b/data/layouts/UnusedLayout_82DD0DC/map.bin index c57c99c7b..c57c99c7b 100644 --- a/data/layouts/UnusedLayout_82DD0DC_Layout/map.bin +++ b/data/layouts/UnusedLayout_82DD0DC/map.bin diff --git a/data/layouts/UnusedLayout_833614C_Layout/border.bin b/data/layouts/UnusedLayout_833614C/border.bin index d9994d6cd..d9994d6cd 100644 --- a/data/layouts/UnusedLayout_833614C_Layout/border.bin +++ b/data/layouts/UnusedLayout_833614C/border.bin diff --git a/data/layouts/UnusedLayout_833614C_Layout/map.bin b/data/layouts/UnusedLayout_833614C/map.bin index a4b5b8b85..a4b5b8b85 100644 --- a/data/layouts/UnusedLayout_833614C_Layout/map.bin +++ b/data/layouts/UnusedLayout_833614C/map.bin diff --git a/data/layouts/UnusedLayout_83377F0_Layout/border.bin b/data/layouts/UnusedLayout_83377F0/border.bin index d9994d6cd..d9994d6cd 100644 --- a/data/layouts/UnusedLayout_83377F0_Layout/border.bin +++ b/data/layouts/UnusedLayout_83377F0/border.bin diff --git a/data/layouts/UnusedLayout_83377F0_Layout/map.bin b/data/layouts/UnusedLayout_83377F0/map.bin index 5bc807eea..5bc807eea 100644 --- a/data/layouts/UnusedLayout_83377F0_Layout/map.bin +++ b/data/layouts/UnusedLayout_83377F0/map.bin diff --git a/data/layouts/UnusedLayout_8338354_Layout/border.bin b/data/layouts/UnusedLayout_8338354/border.bin index d9994d6cd..d9994d6cd 100644 --- a/data/layouts/UnusedLayout_8338354_Layout/border.bin +++ b/data/layouts/UnusedLayout_8338354/border.bin diff --git a/data/layouts/UnusedLayout_8338354_Layout/map.bin b/data/layouts/UnusedLayout_8338354/map.bin index 667f4a779..667f4a779 100644 --- a/data/layouts/UnusedLayout_8338354_Layout/map.bin +++ b/data/layouts/UnusedLayout_8338354/map.bin diff --git a/data/layouts/UnusedLayout_8338738_Layout/border.bin b/data/layouts/UnusedLayout_8338738/border.bin index d9994d6cd..d9994d6cd 100644 --- a/data/layouts/UnusedLayout_8338738_Layout/border.bin +++ b/data/layouts/UnusedLayout_8338738/border.bin diff --git a/data/layouts/UnusedLayout_8338738_Layout/map.bin b/data/layouts/UnusedLayout_8338738/map.bin index ce93426c5..ce93426c5 100644 --- a/data/layouts/UnusedLayout_8338738_Layout/map.bin +++ b/data/layouts/UnusedLayout_8338738/map.bin diff --git a/data/layouts/UnusedLayout_8338B4C_Layout/border.bin b/data/layouts/UnusedLayout_8338B4C/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/UnusedLayout_8338B4C_Layout/border.bin +++ b/data/layouts/UnusedLayout_8338B4C/border.bin diff --git a/data/layouts/UnusedLayout_8338B4C_Layout/map.bin b/data/layouts/UnusedLayout_8338B4C/map.bin index b9381326f..b9381326f 100644 --- a/data/layouts/UnusedLayout_8338B4C_Layout/map.bin +++ b/data/layouts/UnusedLayout_8338B4C/map.bin diff --git a/data/layouts/UnusedLayout_8338E90_Layout/border.bin b/data/layouts/UnusedLayout_8338E90/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/UnusedLayout_8338E90_Layout/border.bin +++ b/data/layouts/UnusedLayout_8338E90/border.bin diff --git a/data/layouts/UnusedLayout_8338E90_Layout/map.bin b/data/layouts/UnusedLayout_8338E90/map.bin index a5391187c..a5391187c 100644 --- a/data/layouts/UnusedLayout_8338E90_Layout/map.bin +++ b/data/layouts/UnusedLayout_8338E90/map.bin diff --git a/data/layouts/UnusedLayout_833902C_Layout/border.bin b/data/layouts/UnusedLayout_833902C/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/UnusedLayout_833902C_Layout/border.bin +++ b/data/layouts/UnusedLayout_833902C/border.bin diff --git a/data/layouts/UnusedLayout_833902C_Layout/map.bin b/data/layouts/UnusedLayout_833902C/map.bin index 4573c1444..4573c1444 100644 --- a/data/layouts/UnusedLayout_833902C_Layout/map.bin +++ b/data/layouts/UnusedLayout_833902C/map.bin diff --git a/data/layouts/UnusedLayout_833B6EC_Layout/border.bin b/data/layouts/UnusedLayout_833B6EC/border.bin index a021ddd4e..a021ddd4e 100644 --- a/data/layouts/UnusedLayout_833B6EC_Layout/border.bin +++ b/data/layouts/UnusedLayout_833B6EC/border.bin diff --git a/data/layouts/UnusedLayout_833B6EC_Layout/map.bin b/data/layouts/UnusedLayout_833B6EC/map.bin index d1385e8cb..d1385e8cb 100644 --- a/data/layouts/UnusedLayout_833B6EC_Layout/map.bin +++ b/data/layouts/UnusedLayout_833B6EC/map.bin diff --git a/data/layouts/UnusedLayout_833BE30_Layout/border.bin b/data/layouts/UnusedLayout_833BE30/border.bin index a021ddd4e..a021ddd4e 100644 --- a/data/layouts/UnusedLayout_833BE30_Layout/border.bin +++ b/data/layouts/UnusedLayout_833BE30/border.bin diff --git a/data/layouts/UnusedLayout_833BE30_Layout/map.bin b/data/layouts/UnusedLayout_833BE30/map.bin index 13a635e49..13a635e49 100644 --- a/data/layouts/UnusedLayout_833BE30_Layout/map.bin +++ b/data/layouts/UnusedLayout_833BE30/map.bin diff --git a/data/layouts/UnusedLayout_83453C0_Layout/border.bin b/data/layouts/UnusedLayout_83453C0/border.bin index a021ddd4e..a021ddd4e 100644 --- a/data/layouts/UnusedLayout_83453C0_Layout/border.bin +++ b/data/layouts/UnusedLayout_83453C0/border.bin diff --git a/data/layouts/UnusedLayout_83453C0_Layout/map.bin b/data/layouts/UnusedLayout_83453C0/map.bin index ffc668ba5..ffc668ba5 100644 --- a/data/layouts/UnusedLayout_83453C0_Layout/map.bin +++ b/data/layouts/UnusedLayout_83453C0/map.bin diff --git a/data/layouts/UnusedLayout_834BC2C_Layout/border.bin b/data/layouts/UnusedLayout_834BC2C/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/UnusedLayout_834BC2C_Layout/border.bin +++ b/data/layouts/UnusedLayout_834BC2C/border.bin diff --git a/data/layouts/UnusedLayout_834BC2C_Layout/map.bin b/data/layouts/UnusedLayout_834BC2C/map.bin Binary files differindex 891ae066e..891ae066e 100644 --- a/data/layouts/UnusedLayout_834BC2C_Layout/map.bin +++ b/data/layouts/UnusedLayout_834BC2C/map.bin diff --git a/data/layouts/UnusedLayout_834BEB4_Layout/border.bin b/data/layouts/UnusedLayout_834BEB4/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/UnusedLayout_834BEB4_Layout/border.bin +++ b/data/layouts/UnusedLayout_834BEB4/border.bin diff --git a/data/layouts/UnusedLayout_834BEB4_Layout/map.bin b/data/layouts/UnusedLayout_834BEB4/map.bin Binary files differindex ab44abb18..ab44abb18 100644 --- a/data/layouts/UnusedLayout_834BEB4_Layout/map.bin +++ b/data/layouts/UnusedLayout_834BEB4/map.bin diff --git a/data/layouts/UnusedLayout_834C13C_Layout/border.bin b/data/layouts/UnusedLayout_834C13C/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/UnusedLayout_834C13C_Layout/border.bin +++ b/data/layouts/UnusedLayout_834C13C/border.bin diff --git a/data/layouts/UnusedLayout_834C13C_Layout/map.bin b/data/layouts/UnusedLayout_834C13C/map.bin Binary files differindex 514cb7239..514cb7239 100644 --- a/data/layouts/UnusedLayout_834C13C_Layout/map.bin +++ b/data/layouts/UnusedLayout_834C13C/map.bin diff --git a/data/layouts/UnusedLayout_834C3C4_Layout/border.bin b/data/layouts/UnusedLayout_834C3C4/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/UnusedLayout_834C3C4_Layout/border.bin +++ b/data/layouts/UnusedLayout_834C3C4/border.bin diff --git a/data/layouts/UnusedLayout_834C3C4_Layout/map.bin b/data/layouts/UnusedLayout_834C3C4/map.bin Binary files differindex d9a50b7a1..d9a50b7a1 100644 --- a/data/layouts/UnusedLayout_834C3C4_Layout/map.bin +++ b/data/layouts/UnusedLayout_834C3C4/map.bin diff --git a/data/layouts/UnusedLayout_834C64C_Layout/border.bin b/data/layouts/UnusedLayout_834C64C/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/UnusedLayout_834C64C_Layout/border.bin +++ b/data/layouts/UnusedLayout_834C64C/border.bin diff --git a/data/layouts/UnusedLayout_834C64C_Layout/map.bin b/data/layouts/UnusedLayout_834C64C/map.bin Binary files differindex 37b4aba85..37b4aba85 100644 --- a/data/layouts/UnusedLayout_834C64C_Layout/map.bin +++ b/data/layouts/UnusedLayout_834C64C/map.bin diff --git a/data/layouts/UnusedLayout_834C8D4_Layout/border.bin b/data/layouts/UnusedLayout_834C8D4/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/UnusedLayout_834C8D4_Layout/border.bin +++ b/data/layouts/UnusedLayout_834C8D4/border.bin diff --git a/data/layouts/UnusedLayout_834C8D4_Layout/map.bin b/data/layouts/UnusedLayout_834C8D4/map.bin Binary files differindex 2df5cd891..2df5cd891 100644 --- a/data/layouts/UnusedLayout_834C8D4_Layout/map.bin +++ b/data/layouts/UnusedLayout_834C8D4/map.bin diff --git a/data/layouts/UnusedLayout_834CB5C_Layout/border.bin b/data/layouts/UnusedLayout_834CB5C/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/UnusedLayout_834CB5C_Layout/border.bin +++ b/data/layouts/UnusedLayout_834CB5C/border.bin diff --git a/data/layouts/UnusedLayout_834CB5C_Layout/map.bin b/data/layouts/UnusedLayout_834CB5C/map.bin Binary files differindex e977b7e26..e977b7e26 100644 --- a/data/layouts/UnusedLayout_834CB5C_Layout/map.bin +++ b/data/layouts/UnusedLayout_834CB5C/map.bin diff --git a/data/layouts/UnusedLayout_834CDE4_Layout/border.bin b/data/layouts/UnusedLayout_834CDE4/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/UnusedLayout_834CDE4_Layout/border.bin +++ b/data/layouts/UnusedLayout_834CDE4/border.bin diff --git a/data/layouts/UnusedLayout_834CDE4_Layout/map.bin b/data/layouts/UnusedLayout_834CDE4/map.bin Binary files differindex e358d2f3d..e358d2f3d 100644 --- a/data/layouts/UnusedLayout_834CDE4_Layout/map.bin +++ b/data/layouts/UnusedLayout_834CDE4/map.bin diff --git a/data/layouts/UnusedLayout_834D06C_Layout/border.bin b/data/layouts/UnusedLayout_834D06C/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/UnusedLayout_834D06C_Layout/border.bin +++ b/data/layouts/UnusedLayout_834D06C/border.bin diff --git a/data/layouts/UnusedLayout_834D06C_Layout/map.bin b/data/layouts/UnusedLayout_834D06C/map.bin Binary files differindex 3e3ebcc94..3e3ebcc94 100644 --- a/data/layouts/UnusedLayout_834D06C_Layout/map.bin +++ b/data/layouts/UnusedLayout_834D06C/map.bin diff --git a/data/layouts/UnusedLayout_834D2F4_Layout/border.bin b/data/layouts/UnusedLayout_834D2F4/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/UnusedLayout_834D2F4_Layout/border.bin +++ b/data/layouts/UnusedLayout_834D2F4/border.bin diff --git a/data/layouts/UnusedLayout_834D2F4_Layout/map.bin b/data/layouts/UnusedLayout_834D2F4/map.bin Binary files differindex cfc96995c..cfc96995c 100644 --- a/data/layouts/UnusedLayout_834D2F4_Layout/map.bin +++ b/data/layouts/UnusedLayout_834D2F4/map.bin diff --git a/data/layouts/UnusedLayout_834D57C_Layout/border.bin b/data/layouts/UnusedLayout_834D57C/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/UnusedLayout_834D57C_Layout/border.bin +++ b/data/layouts/UnusedLayout_834D57C/border.bin diff --git a/data/layouts/UnusedLayout_834D57C_Layout/map.bin b/data/layouts/UnusedLayout_834D57C/map.bin Binary files differindex da9cc3f75..da9cc3f75 100644 --- a/data/layouts/UnusedLayout_834D57C_Layout/map.bin +++ b/data/layouts/UnusedLayout_834D57C/map.bin diff --git a/data/layouts/UnusedLayout_834D804_Layout/border.bin b/data/layouts/UnusedLayout_834D804/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/UnusedLayout_834D804_Layout/border.bin +++ b/data/layouts/UnusedLayout_834D804/border.bin diff --git a/data/layouts/UnusedLayout_834D804_Layout/map.bin b/data/layouts/UnusedLayout_834D804/map.bin Binary files differindex cf5e1e94e..cf5e1e94e 100644 --- a/data/layouts/UnusedLayout_834D804_Layout/map.bin +++ b/data/layouts/UnusedLayout_834D804/map.bin diff --git a/data/layouts/UnusedLayout_834DA8C_Layout/border.bin b/data/layouts/UnusedLayout_834DA8C/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/UnusedLayout_834DA8C_Layout/border.bin +++ b/data/layouts/UnusedLayout_834DA8C/border.bin diff --git a/data/layouts/UnusedLayout_834DA8C_Layout/map.bin b/data/layouts/UnusedLayout_834DA8C/map.bin Binary files differindex 1f10bfff1..1f10bfff1 100644 --- a/data/layouts/UnusedLayout_834DA8C_Layout/map.bin +++ b/data/layouts/UnusedLayout_834DA8C/map.bin diff --git a/data/layouts/UnusedLayout_834DD14_Layout/border.bin b/data/layouts/UnusedLayout_834DD14/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/UnusedLayout_834DD14_Layout/border.bin +++ b/data/layouts/UnusedLayout_834DD14/border.bin diff --git a/data/layouts/UnusedLayout_834DD14_Layout/map.bin b/data/layouts/UnusedLayout_834DD14/map.bin Binary files differindex fe3d6f908..fe3d6f908 100644 --- a/data/layouts/UnusedLayout_834DD14_Layout/map.bin +++ b/data/layouts/UnusedLayout_834DD14/map.bin diff --git a/data/layouts/UnusedLayout_834DF9C_Layout/border.bin b/data/layouts/UnusedLayout_834DF9C/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/UnusedLayout_834DF9C_Layout/border.bin +++ b/data/layouts/UnusedLayout_834DF9C/border.bin diff --git a/data/layouts/UnusedLayout_834DF9C_Layout/map.bin b/data/layouts/UnusedLayout_834DF9C/map.bin Binary files differindex 241077797..241077797 100644 --- a/data/layouts/UnusedLayout_834DF9C_Layout/map.bin +++ b/data/layouts/UnusedLayout_834DF9C/map.bin diff --git a/data/layouts/UnusedLayout_834E224_Layout/border.bin b/data/layouts/UnusedLayout_834E224/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/UnusedLayout_834E224_Layout/border.bin +++ b/data/layouts/UnusedLayout_834E224/border.bin diff --git a/data/layouts/UnusedLayout_834E224_Layout/map.bin b/data/layouts/UnusedLayout_834E224/map.bin Binary files differindex bb5ccf05c..bb5ccf05c 100644 --- a/data/layouts/UnusedLayout_834E224_Layout/map.bin +++ b/data/layouts/UnusedLayout_834E224/map.bin diff --git a/data/layouts/VermilionCity_Layout/border.bin b/data/layouts/VermilionCity/border.bin index 730aab996..730aab996 100644 --- a/data/layouts/VermilionCity_Layout/border.bin +++ b/data/layouts/VermilionCity/border.bin diff --git a/data/layouts/VermilionCity_Layout/map.bin b/data/layouts/VermilionCity/map.bin index 1c90e0240..1c90e0240 100644 --- a/data/layouts/VermilionCity_Layout/map.bin +++ b/data/layouts/VermilionCity/map.bin diff --git a/data/layouts/VermilionCity_Gym_Layout/border.bin b/data/layouts/VermilionCity_Gym/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/VermilionCity_Gym_Layout/border.bin +++ b/data/layouts/VermilionCity_Gym/border.bin diff --git a/data/layouts/VermilionCity_Gym_Layout/map.bin b/data/layouts/VermilionCity_Gym/map.bin index 6389bf603..6389bf603 100644 --- a/data/layouts/VermilionCity_Gym_Layout/map.bin +++ b/data/layouts/VermilionCity_Gym/map.bin diff --git a/data/layouts/VermilionCity_PokemonFanClub_Layout/border.bin b/data/layouts/VermilionCity_PokemonFanClub/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/VermilionCity_PokemonFanClub_Layout/border.bin +++ b/data/layouts/VermilionCity_PokemonFanClub/border.bin diff --git a/data/layouts/VermilionCity_PokemonFanClub_Layout/map.bin b/data/layouts/VermilionCity_PokemonFanClub/map.bin index 9e7443ba6..9e7443ba6 100644 --- a/data/layouts/VermilionCity_PokemonFanClub_Layout/map.bin +++ b/data/layouts/VermilionCity_PokemonFanClub/map.bin diff --git a/data/layouts/VictoryRoad_1F_Layout/border.bin b/data/layouts/VictoryRoad_1F/border.bin index a021ddd4e..a021ddd4e 100644 --- a/data/layouts/VictoryRoad_1F_Layout/border.bin +++ b/data/layouts/VictoryRoad_1F/border.bin diff --git a/data/layouts/VictoryRoad_1F_Layout/map.bin b/data/layouts/VictoryRoad_1F/map.bin index fe99f6f05..fe99f6f05 100644 --- a/data/layouts/VictoryRoad_1F_Layout/map.bin +++ b/data/layouts/VictoryRoad_1F/map.bin diff --git a/data/layouts/VictoryRoad_2F_Layout/border.bin b/data/layouts/VictoryRoad_2F/border.bin index a021ddd4e..a021ddd4e 100644 --- a/data/layouts/VictoryRoad_2F_Layout/border.bin +++ b/data/layouts/VictoryRoad_2F/border.bin diff --git a/data/layouts/VictoryRoad_2F_Layout/map.bin b/data/layouts/VictoryRoad_2F/map.bin Binary files differindex fa39935e6..fa39935e6 100644 --- a/data/layouts/VictoryRoad_2F_Layout/map.bin +++ b/data/layouts/VictoryRoad_2F/map.bin diff --git a/data/layouts/VictoryRoad_3F_Layout/border.bin b/data/layouts/VictoryRoad_3F/border.bin index a021ddd4e..a021ddd4e 100644 --- a/data/layouts/VictoryRoad_3F_Layout/border.bin +++ b/data/layouts/VictoryRoad_3F/border.bin diff --git a/data/layouts/VictoryRoad_3F_Layout/map.bin b/data/layouts/VictoryRoad_3F/map.bin index 3ca93972e..3ca93972e 100644 --- a/data/layouts/VictoryRoad_3F_Layout/map.bin +++ b/data/layouts/VictoryRoad_3F/map.bin diff --git a/data/layouts/ViridianCity_Layout/border.bin b/data/layouts/ViridianCity/border.bin Binary files differindex a701312cf..a701312cf 100644 --- a/data/layouts/ViridianCity_Layout/border.bin +++ b/data/layouts/ViridianCity/border.bin diff --git a/data/layouts/ViridianCity_Layout/map.bin b/data/layouts/ViridianCity/map.bin index d633641ca..d633641ca 100644 --- a/data/layouts/ViridianCity_Layout/map.bin +++ b/data/layouts/ViridianCity/map.bin diff --git a/data/layouts/ViridianCity_Gym_Layout/border.bin b/data/layouts/ViridianCity_Gym/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/ViridianCity_Gym_Layout/border.bin +++ b/data/layouts/ViridianCity_Gym/border.bin diff --git a/data/layouts/ViridianCity_Gym_Layout/map.bin b/data/layouts/ViridianCity_Gym/map.bin index ea13b0280..ea13b0280 100644 --- a/data/layouts/ViridianCity_Gym_Layout/map.bin +++ b/data/layouts/ViridianCity_Gym/map.bin diff --git a/data/layouts/ViridianCity_House1_Layout/border.bin b/data/layouts/ViridianCity_House1/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/ViridianCity_House1_Layout/border.bin +++ b/data/layouts/ViridianCity_House1/border.bin diff --git a/data/layouts/ViridianCity_House1_Layout/map.bin b/data/layouts/ViridianCity_House1/map.bin index 888436add..888436add 100644 --- a/data/layouts/ViridianCity_House1_Layout/map.bin +++ b/data/layouts/ViridianCity_House1/map.bin diff --git a/data/layouts/ViridianCity_House2_Layout/border.bin b/data/layouts/ViridianCity_House2/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/ViridianCity_House2_Layout/border.bin +++ b/data/layouts/ViridianCity_House2/border.bin diff --git a/data/layouts/ViridianCity_House2_Layout/map.bin b/data/layouts/ViridianCity_House2/map.bin index b6e23003b..b6e23003b 100644 --- a/data/layouts/ViridianCity_House2_Layout/map.bin +++ b/data/layouts/ViridianCity_House2/map.bin diff --git a/data/layouts/ViridianForest_Layout/border.bin b/data/layouts/ViridianForest/border.bin index 7797e033b..7797e033b 100644 --- a/data/layouts/ViridianForest_Layout/border.bin +++ b/data/layouts/ViridianForest/border.bin diff --git a/data/layouts/ViridianForest_Layout/map.bin b/data/layouts/ViridianForest/map.bin index 74a9e6f5d..74a9e6f5d 100644 --- a/data/layouts/ViridianForest_Layout/map.bin +++ b/data/layouts/ViridianForest/map.bin diff --git a/data/layouts/layouts.inc b/data/layouts/layouts.inc deleted file mode 100644 index 66bb2c421..000000000 --- a/data/layouts/layouts.inc +++ /dev/null @@ -1,6569 +0,0 @@ -PalletTown_PlayersHouse_1F_Layout_Border:: @ 82D50F4 - .incbin "data/layouts/PalletTown_PlayersHouse_1F_Layout/border.bin" - -PalletTown_PlayersHouse_1F_Layout_Blockdata:: @ 82D50FC - .incbin "data/layouts/PalletTown_PlayersHouse_1F_Layout/map.bin" - - .align 2 -PalletTown_PlayersHouse_1F_Layout:: @ 82D5200 - .4byte 13 - .4byte 10 - .4byte PalletTown_PlayersHouse_1F_Layout_Border - .4byte PalletTown_PlayersHouse_1F_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4C74 - .byte 2 - .byte 2 - .2byte 0 - -PalletTown_PlayersHouse_2F_Layout_Border:: @ 82D521C - .incbin "data/layouts/PalletTown_PlayersHouse_2F_Layout/border.bin" - -PalletTown_PlayersHouse_2F_Layout_Blockdata:: @ 82D5224 - .incbin "data/layouts/PalletTown_PlayersHouse_2F_Layout/map.bin" - - .align 2 -PalletTown_PlayersHouse_2F_Layout:: @ 82D52FC - .4byte 12 - .4byte 9 - .4byte PalletTown_PlayersHouse_2F_Layout_Border - .4byte PalletTown_PlayersHouse_2F_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4C74 - .byte 2 - .byte 2 - .2byte 0 - -PalletTown_GarysHouse_Layout_Border:: @ 82D5318 - .incbin "data/layouts/PalletTown_GarysHouse_Layout/border.bin" - -PalletTown_GarysHouse_Layout_Blockdata:: @ 82D5320 - .incbin "data/layouts/PalletTown_GarysHouse_Layout/map.bin" - - .align 2 -PalletTown_GarysHouse_Layout:: @ 82D5424 - .4byte 13 - .4byte 10 - .4byte PalletTown_GarysHouse_Layout_Border - .4byte PalletTown_GarysHouse_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4E84 - .byte 2 - .byte 2 - .2byte 0 - -UnusedLayout_82D54D8_Layout_Border:: @ 82D5440 - .incbin "data/layouts/UnusedLayout_82D54D8_Layout/border.bin" - -UnusedLayout_82D54D8_Layout_Blockdata:: @ 82D5448 - .incbin "data/layouts/UnusedLayout_82D54D8_Layout/map.bin" - - .align 2 -UnusedLayout_82D54D8_Layout:: @ 82D54D8 - .4byte 9 - .4byte 8 - .4byte UnusedLayout_82D54D8_Layout_Border - .4byte UnusedLayout_82D54D8_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4C74 - .byte 0 - .byte 0 - .2byte 0 - -PalletTown_ProfessorOaksLab_Layout_Border:: @ 82D54F4 - .incbin "data/layouts/PalletTown_ProfessorOaksLab_Layout/border.bin" - -PalletTown_ProfessorOaksLab_Layout_Blockdata:: @ 82D54FC - .incbin "data/layouts/PalletTown_ProfessorOaksLab_Layout/map.bin" - - .align 2 -PalletTown_ProfessorOaksLab_Layout:: @ 82D5668 - .4byte 13 - .4byte 14 - .4byte PalletTown_ProfessorOaksLab_Layout_Border - .4byte PalletTown_ProfessorOaksLab_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4C8C - .byte 2 - .byte 2 - .2byte 0 - -House1_Layout_Border:: @ 82D5684 - .incbin "data/layouts/House1_Layout/border.bin" - -House1_Layout_Blockdata:: @ 82D568C - .incbin "data/layouts/House1_Layout/map.bin" - - .align 2 -House1_Layout:: @ 82D5754 - .4byte 11 - .4byte 9 - .4byte House1_Layout_Border - .4byte House1_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4C74 - .byte 2 - .byte 2 - .2byte 0 - -House2_Layout_Border:: @ 82D5770 - .incbin "data/layouts/House2_Layout/border.bin" - -House2_Layout_Blockdata:: @ 82D5778 - .incbin "data/layouts/House2_Layout/map.bin" - - .align 2 -House2_Layout:: @ 82D5840 - .4byte 11 - .4byte 9 - .4byte House2_Layout_Border - .4byte House2_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4E84 - .byte 2 - .byte 2 - .2byte 0 - -PokemonCenter_1F_Layout_Border:: @ 82D585C - .incbin "data/layouts/PokemonCenter_1F_Layout/border.bin" - -PokemonCenter_1F_Layout_Blockdata:: @ 82D5864 - .incbin "data/layouts/PokemonCenter_1F_Layout/map.bin" - - .align 2 -PokemonCenter_1F_Layout:: @ 82D5990 - .4byte 15 - .4byte 10 - .4byte PokemonCenter_1F_Layout_Border - .4byte PokemonCenter_1F_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4BE4 - .byte 2 - .byte 2 - .2byte 0 - -PokemonCenter_2F_Layout_Border:: @ 82D59AC - .incbin "data/layouts/PokemonCenter_2F_Layout/border.bin" - -PokemonCenter_2F_Layout_Blockdata:: @ 82D59B4 - .incbin "data/layouts/PokemonCenter_2F_Layout/map.bin" - - .align 2 -PokemonCenter_2F_Layout:: @ 82D5AE0 - .4byte 15 - .4byte 10 - .4byte PokemonCenter_2F_Layout_Border - .4byte PokemonCenter_2F_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4BE4 - .byte 2 - .byte 2 - .2byte 0 - -Mart_Layout_Border:: @ 82D5AFC - .incbin "data/layouts/Mart_Layout/border.bin" - -Mart_Layout_Blockdata:: @ 82D5B04 - .incbin "data/layouts/Mart_Layout/map.bin" - - .align 2 -Mart_Layout:: @ 82D5BCC - .4byte 11 - .4byte 9 - .4byte Mart_Layout_Border - .4byte Mart_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4BCC - .byte 2 - .byte 2 - .2byte 0 - -House3_Layout_Border:: @ 82D5BE8 - .incbin "data/layouts/House3_Layout/border.bin" - -House3_Layout_Blockdata:: @ 82D5BF0 - .incbin "data/layouts/House3_Layout/map.bin" - - .align 2 -House3_Layout:: @ 82D5CB8 - .4byte 11 - .4byte 9 - .4byte House3_Layout_Border - .4byte House3_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4E84 - .byte 2 - .byte 2 - .2byte 0 - -CeruleanCity_Gym_Layout_Border:: @ 82D5CD4 - .incbin "data/layouts/CeruleanCity_Gym_Layout/border.bin" - -CeruleanCity_Gym_Layout_Blockdata:: @ 82D5CDC - .incbin "data/layouts/CeruleanCity_Gym_Layout/map.bin" - - .align 2 -CeruleanCity_Gym_Layout:: @ 82D5F84 - .4byte 17 - .4byte 20 - .4byte CeruleanCity_Gym_Layout_Border - .4byte CeruleanCity_Gym_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4D1C - .byte 2 - .byte 2 - .2byte 0 - -House4_Layout_Border:: @ 82D5FA0 - .incbin "data/layouts/House4_Layout/border.bin" - -House4_Layout_Blockdata:: @ 82D5FA8 - .incbin "data/layouts/House4_Layout/map.bin" - - .align 2 -House4_Layout:: @ 82D6070 - .4byte 11 - .4byte 9 - .4byte House4_Layout_Border - .4byte House4_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4E84 - .byte 2 - .byte 2 - .2byte 0 - -UnusedLayout_82D6144_Layout_Border:: @ 82D608C - .incbin "data/layouts/UnusedLayout_82D6144_Layout/border.bin" - -UnusedLayout_82D6144_Layout_Blockdata:: @ 82D6094 - .incbin "data/layouts/UnusedLayout_82D6144_Layout/map.bin" - - .align 2 -UnusedLayout_82D6144_Layout:: @ 82D6144 - .4byte 11 - .4byte 8 - .4byte UnusedLayout_82D6144_Layout_Border - .4byte UnusedLayout_82D6144_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4BCC - .byte 0 - .byte 0 - .2byte 0 - -CeladonCity_Gym_Layout_Border:: @ 82D6160 - .incbin "data/layouts/CeladonCity_Gym_Layout/border.bin" - -CeladonCity_Gym_Layout_Blockdata:: @ 82D6168 - .incbin "data/layouts/CeladonCity_Gym_Layout/map.bin" - - .align 2 -CeladonCity_Gym_Layout:: @ 82D6370 - .4byte 13 - .4byte 20 - .4byte CeladonCity_Gym_Layout_Border - .4byte CeladonCity_Gym_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4D4C - .byte 2 - .byte 2 - .2byte 0 - -UnusedLayout_82D6490_Layout_Border:: @ 82D638C - .incbin "data/layouts/UnusedLayout_82D6490_Layout/border.bin" - -UnusedLayout_82D6490_Layout_Blockdata:: @ 82D6394 - .incbin "data/layouts/UnusedLayout_82D6490_Layout/map.bin" - - .align 2 -UnusedLayout_82D6490_Layout:: @ 82D6490 - .4byte 14 - .4byte 9 - .4byte UnusedLayout_82D6490_Layout_Border - .4byte UnusedLayout_82D6490_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4BE4 - .byte 2 - .byte 2 - .2byte 0 - -FiveIsland_ResortGorgeous_House_Layout_Border:: @ 82D64AC - .incbin "data/layouts/FiveIsland_ResortGorgeous_House_Layout/border.bin" - -FiveIsland_ResortGorgeous_House_Layout_Blockdata:: @ 82D64B4 - .incbin "data/layouts/FiveIsland_ResortGorgeous_House_Layout/map.bin" - - .align 2 -FiveIsland_ResortGorgeous_House_Layout:: @ 82D657C - .4byte 11 - .4byte 9 - .4byte FiveIsland_ResortGorgeous_House_Layout_Border - .4byte FiveIsland_ResortGorgeous_House_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4C2C - .byte 2 - .byte 2 - .2byte 0 - -UnusedLayout_82D6654_Layout_Border:: @ 82D6598 - .incbin "data/layouts/UnusedLayout_82D6654_Layout/border.bin" - -UnusedLayout_82D6654_Layout_Blockdata:: @ 82D65A0 - .incbin "data/layouts/UnusedLayout_82D6654_Layout/map.bin" - - .align 2 -UnusedLayout_82D6654_Layout:: @ 82D6654 - .4byte 10 - .4byte 9 - .4byte UnusedLayout_82D6654_Layout_Border - .4byte UnusedLayout_82D6654_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4CD4 - .byte 0 - .byte 0 - .2byte 0 - -UnusedLayout_82D672C_Layout_Border:: @ 82D6670 - .incbin "data/layouts/UnusedLayout_82D672C_Layout/border.bin" - -UnusedLayout_82D672C_Layout_Blockdata:: @ 82D6678 - .incbin "data/layouts/UnusedLayout_82D672C_Layout/map.bin" - - .align 2 -UnusedLayout_82D672C_Layout:: @ 82D672C - .4byte 10 - .4byte 9 - .4byte UnusedLayout_82D672C_Layout_Border - .4byte UnusedLayout_82D672C_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4CD4 - .byte 0 - .byte 0 - .2byte 0 - -FuchsiaCity_Gym_Layout_Border:: @ 82D6748 - .incbin "data/layouts/FuchsiaCity_Gym_Layout/border.bin" - -FuchsiaCity_Gym_Layout_Blockdata:: @ 82D6750 - .incbin "data/layouts/FuchsiaCity_Gym_Layout/map.bin" - - .align 2 -FuchsiaCity_Gym_Layout:: @ 82D6A04 - .4byte 15 - .4byte 23 - .4byte FuchsiaCity_Gym_Layout_Border - .4byte FuchsiaCity_Gym_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4CA4 - .byte 2 - .byte 2 - .2byte 0 - -House5_Layout_Border:: @ 82D6A20 - .incbin "data/layouts/House5_Layout/border.bin" - -House5_Layout_Blockdata:: @ 82D6A28 - .incbin "data/layouts/House5_Layout/map.bin" - - .align 2 -House5_Layout:: @ 82D6AF0 - .4byte 11 - .4byte 9 - .4byte House5_Layout_Border - .4byte House5_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4C74 - .byte 2 - .byte 2 - .2byte 0 - -UnusedLayout_82D6C34_Layout_Border:: @ 82D6B0C - .incbin "data/layouts/UnusedLayout_82D6C34_Layout/border.bin" - -UnusedLayout_82D6C34_Layout_Blockdata:: @ 82D6B14 - .incbin "data/layouts/UnusedLayout_82D6C34_Layout/map.bin" - - .align 2 -UnusedLayout_82D6C34_Layout:: @ 82D6C34 - .4byte 12 - .4byte 12 - .4byte UnusedLayout_82D6C34_Layout_Border - .4byte UnusedLayout_82D6C34_Layout_Blockdata - .4byte NULL - .4byte gTileset_82D4C14 - .byte 2 - .byte 2 - .2byte 0 - -VermilionCity_Gym_Layout_Border:: @ 82D6C50 - .incbin "data/layouts/VermilionCity_Gym_Layout/border.bin" - -VermilionCity_Gym_Layout_Blockdata:: @ 82D6C58 - .incbin "data/layouts/VermilionCity_Gym_Layout/map.bin" - - .align 2 -VermilionCity_Gym_Layout:: @ 82D6E28 - .4byte 11 - .4byte 21 - .4byte VermilionCity_Gym_Layout_Border - .4byte VermilionCity_Gym_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4D34 - .byte 2 - .byte 2 - .2byte 0 - -CeruleanCity_BikeShop_Layout_Border:: @ 82D6E44 - .incbin "data/layouts/CeruleanCity_BikeShop_Layout/border.bin" - -CeruleanCity_BikeShop_Layout_Blockdata:: @ 82D6E4C - .incbin "data/layouts/CeruleanCity_BikeShop_Layout/map.bin" - - .align 2 -CeruleanCity_BikeShop_Layout:: @ 82D6F28 - .4byte 11 - .4byte 10 - .4byte CeruleanCity_BikeShop_Layout_Border - .4byte CeruleanCity_BikeShop_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4C5C - .byte 2 - .byte 2 - .2byte 0 - -CeladonCity_GameCorner_Layout_Border:: @ 82D6F44 - .incbin "data/layouts/CeladonCity_GameCorner_Layout/border.bin" - -CeladonCity_GameCorner_Layout_Blockdata:: @ 82D6F4C - .incbin "data/layouts/CeladonCity_GameCorner_Layout/map.bin" - - .align 2 -CeladonCity_GameCorner_Layout:: @ 82D7168 - .4byte 18 - .4byte 15 - .4byte CeladonCity_GameCorner_Layout_Border - .4byte CeladonCity_GameCorner_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4CEC - .byte 2 - .byte 2 - .2byte 0 - -PewterCity_Gym_Layout_Border:: @ 82D7184 - .incbin "data/layouts/PewterCity_Gym_Layout/border.bin" - -PewterCity_Gym_Layout_Blockdata:: @ 82D718C - .incbin "data/layouts/PewterCity_Gym_Layout/map.bin" - - .align 2 -PewterCity_Gym_Layout:: @ 82D732C - .4byte 13 - .4byte 16 - .4byte PewterCity_Gym_Layout_Border - .4byte PewterCity_Gym_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4D04 - .byte 2 - .byte 2 - .2byte 0 - -FourIsland_LoreleisHouse_Layout_Border:: @ 82D7348 - .incbin "data/layouts/FourIsland_LoreleisHouse_Layout/border.bin" - -FourIsland_LoreleisHouse_Layout_Blockdata:: @ 82D7350 - .incbin "data/layouts/FourIsland_LoreleisHouse_Layout/map.bin" - - .align 2 -FourIsland_LoreleisHouse_Layout:: @ 82D7418 - .4byte 11 - .4byte 9 - .4byte FourIsland_LoreleisHouse_Layout_Border - .4byte FourIsland_LoreleisHouse_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4F14 - .byte 2 - .byte 2 - .2byte 0 - -ThreeIsland_House1_Layout_Border:: @ 82D7434 - .incbin "data/layouts/ThreeIsland_House1_Layout/border.bin" - -ThreeIsland_House1_Layout_Blockdata:: @ 82D743C - .incbin "data/layouts/ThreeIsland_House1_Layout/map.bin" - - .align 2 -ThreeIsland_House1_Layout:: @ 82D7504 - .4byte 11 - .4byte 9 - .4byte ThreeIsland_House1_Layout_Border - .4byte ThreeIsland_House1_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4C8C - .byte 2 - .byte 2 - .2byte 0 - -UnusedLayout_82D75F0_Layout_Border:: @ 82D7520 - .incbin "data/layouts/UnusedLayout_82D75F0_Layout/border.bin" - -UnusedLayout_82D75F0_Layout_Blockdata:: @ 82D7528 - .incbin "data/layouts/UnusedLayout_82D75F0_Layout/map.bin" - - .align 2 -UnusedLayout_82D75F0_Layout:: @ 82D75F0 - .4byte 11 - .4byte 9 - .4byte UnusedLayout_82D75F0_Layout_Border - .4byte UnusedLayout_82D75F0_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4CD4 - .byte 0 - .byte 0 - .2byte 0 - -UnusedLayout_82D7674_Layout_Border:: @ 82D760C - .incbin "data/layouts/UnusedLayout_82D7674_Layout/border.bin" - -UnusedLayout_82D7674_Layout_Blockdata:: @ 82D7614 - .incbin "data/layouts/UnusedLayout_82D7674_Layout/map.bin" - - .align 2 -UnusedLayout_82D7674_Layout:: @ 82D7674 - .4byte 8 - .4byte 6 - .4byte UnusedLayout_82D7674_Layout_Border - .4byte UnusedLayout_82D7674_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4CD4 - .byte 0 - .byte 0 - .2byte 0 - -SaffronCity_Gym_Layout_Border:: @ 82D7690 - .incbin "data/layouts/SaffronCity_Gym_Layout/border.bin" - -SaffronCity_Gym_Layout_Blockdata:: @ 82D7698 - .incbin "data/layouts/SaffronCity_Gym_Layout/map.bin" - - .align 2 -SaffronCity_Gym_Layout:: @ 82D7C44 - .4byte 29 - .4byte 25 - .4byte SaffronCity_Gym_Layout_Border - .4byte SaffronCity_Gym_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4D64 - .byte 2 - .byte 2 - .2byte 0 - -UnusedLayout_82D7CC8_Layout_Border:: @ 82D7C60 - .incbin "data/layouts/UnusedLayout_82D7CC8_Layout/border.bin" - -UnusedLayout_82D7CC8_Layout_Blockdata:: @ 82D7C68 - .incbin "data/layouts/UnusedLayout_82D7CC8_Layout/map.bin" - - .align 2 -UnusedLayout_82D7CC8_Layout:: @ 82D7CC8 - .4byte 8 - .4byte 6 - .4byte UnusedLayout_82D7CC8_Layout_Border - .4byte UnusedLayout_82D7CC8_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4CD4 - .byte 0 - .byte 0 - .2byte 0 - -CinnabarIsland_Gym_Layout_Border:: @ 82D7CE4 - .incbin "data/layouts/CinnabarIsland_Gym_Layout/border.bin" - -CinnabarIsland_Gym_Layout_Blockdata:: @ 82D7CEC - .incbin "data/layouts/CinnabarIsland_Gym_Layout/map.bin" - - .align 2 -CinnabarIsland_Gym_Layout:: @ 82D82C8 - .4byte 30 - .4byte 25 - .4byte CinnabarIsland_Gym_Layout_Border - .4byte CinnabarIsland_Gym_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4D7C - .byte 2 - .byte 2 - .2byte 0 - -ViridianCity_Gym_Layout_Border:: @ 82D82E4 - .incbin "data/layouts/ViridianCity_Gym_Layout/border.bin" - -ViridianCity_Gym_Layout_Blockdata:: @ 82D82EC - .incbin "data/layouts/ViridianCity_Gym_Layout/map.bin" - - .align 2 -ViridianCity_Gym_Layout:: @ 82D86AC - .4byte 20 - .4byte 24 - .4byte ViridianCity_Gym_Layout_Border - .4byte ViridianCity_Gym_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4CBC - .byte 2 - .byte 2 - .2byte 0 - -UnusedLayout_82D88C8_Layout_Border:: @ 82D86C8 - .incbin "data/layouts/UnusedLayout_82D88C8_Layout/border.bin" - -UnusedLayout_82D88C8_Layout_Blockdata:: @ 82D86D0 - .incbin "data/layouts/UnusedLayout_82D88C8_Layout/map.bin" - - .align 2 -UnusedLayout_82D88C8_Layout:: @ 82D88C8 - .4byte 18 - .4byte 14 - .4byte UnusedLayout_82D88C8_Layout_Border - .4byte UnusedLayout_82D88C8_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4BCC - .byte 0 - .byte 0 - .2byte 0 - -UnknownMap_00_00_Layout_Border:: @ 82D88E4 - .incbin "data/layouts/UnknownMap_00_00_Layout/border.bin" - -UnknownMap_00_00_Layout_Blockdata:: @ 82D88EC - .incbin "data/layouts/UnknownMap_00_00_Layout/map.bin" - - .align 2 -UnknownMap_00_00_Layout:: @ 82D89E8 - .4byte 14 - .4byte 9 - .4byte UnknownMap_00_00_Layout_Border - .4byte UnknownMap_00_00_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4C44 - .byte 2 - .byte 2 - .2byte 0 - -UnknownMap_00_01_Layout_Border:: @ 82D8A04 - .incbin "data/layouts/UnknownMap_00_01_Layout/border.bin" - -UnknownMap_00_01_Layout_Blockdata:: @ 82D8A0C - .incbin "data/layouts/UnknownMap_00_01_Layout/map.bin" - - .align 2 -UnknownMap_00_01_Layout:: @ 82D8AE4 - .4byte 12 - .4byte 9 - .4byte UnknownMap_00_01_Layout_Border - .4byte UnknownMap_00_01_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4C44 - .byte 2 - .byte 2 - .2byte 0 - -UnknownMap_00_02_Layout_Border:: @ 82D8B00 - .incbin "data/layouts/UnknownMap_00_02_Layout/border.bin" - -UnknownMap_00_02_Layout_Blockdata:: @ 82D8B08 - .incbin "data/layouts/UnknownMap_00_02_Layout/map.bin" - - .align 2 -UnknownMap_00_02_Layout:: @ 82D8C98 - .4byte 20 - .4byte 10 - .4byte UnknownMap_00_02_Layout_Border - .4byte UnknownMap_00_02_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4C44 - .byte 2 - .byte 2 - .2byte 0 - -UnknownMap_00_03_Layout_Border:: @ 82D8CB4 - .incbin "data/layouts/UnknownMap_00_03_Layout/border.bin" - -UnknownMap_00_03_Layout_Blockdata:: @ 82D8CBC - .incbin "data/layouts/UnknownMap_00_03_Layout/map.bin" - - .align 2 -UnknownMap_00_03_Layout:: @ 82D8DB8 - .4byte 14 - .4byte 9 - .4byte UnknownMap_00_03_Layout_Border - .4byte UnknownMap_00_03_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4C44 - .byte 2 - .byte 2 - .2byte 0 - -FuchsiaCity_SafariZone_Entrance_Layout_Border:: @ 82D8DD4 - .incbin "data/layouts/FuchsiaCity_SafariZone_Entrance_Layout/border.bin" - -FuchsiaCity_SafariZone_Entrance_Layout_Blockdata:: @ 82D8DDC - .incbin "data/layouts/FuchsiaCity_SafariZone_Entrance_Layout/map.bin" - - .align 2 -FuchsiaCity_SafariZone_Entrance_Layout:: @ 82D8E80 - .4byte 9 - .4byte 9 - .4byte FuchsiaCity_SafariZone_Entrance_Layout_Border - .4byte FuchsiaCity_SafariZone_Entrance_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4F14 - .byte 2 - .byte 2 - .2byte 0 - -UnusedLayout_82D9B24_Layout_Border:: @ 82D8E9C - .incbin "data/layouts/UnusedLayout_82D9B24_Layout/border.bin" - -UnusedLayout_82D9B24_Layout_Blockdata:: @ 82D8EA4 - .incbin "data/layouts/UnusedLayout_82D9B24_Layout/map.bin" - - .align 2 -UnusedLayout_82D9B24_Layout:: @ 82D9B24 - .4byte 40 - .4byte 40 - .4byte UnusedLayout_82D9B24_Layout_Border - .4byte UnusedLayout_82D9B24_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D4B6C - .byte 0 - .byte 0 - .2byte 0 - -UnusedLayout_82DA7C8_Layout_Border:: @ 82D9B40 - .incbin "data/layouts/UnusedLayout_82DA7C8_Layout/border.bin" - -UnusedLayout_82DA7C8_Layout_Blockdata:: @ 82D9B48 - .incbin "data/layouts/UnusedLayout_82DA7C8_Layout/map.bin" - - .align 2 -UnusedLayout_82DA7C8_Layout:: @ 82DA7C8 - .4byte 40 - .4byte 40 - .4byte UnusedLayout_82DA7C8_Layout_Border - .4byte UnusedLayout_82DA7C8_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D4B6C - .byte 0 - .byte 0 - .2byte 0 - -UnusedLayout_82DB46C_Layout_Border:: @ 82DA7E4 - .incbin "data/layouts/UnusedLayout_82DB46C_Layout/border.bin" - -UnusedLayout_82DB46C_Layout_Blockdata:: @ 82DA7EC - .incbin "data/layouts/UnusedLayout_82DB46C_Layout/map.bin" - - .align 2 -UnusedLayout_82DB46C_Layout:: @ 82DB46C - .4byte 40 - .4byte 40 - .4byte UnusedLayout_82DB46C_Layout_Border - .4byte UnusedLayout_82DB46C_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D4B6C - .byte 0 - .byte 0 - .2byte 0 - -UnusedLayout_82DB4F0_Layout_Border:: @ 82DB488 - .incbin "data/layouts/UnusedLayout_82DB4F0_Layout/border.bin" - -UnusedLayout_82DB4F0_Layout_Blockdata:: @ 82DB490 - .incbin "data/layouts/UnusedLayout_82DB4F0_Layout/map.bin" - - .align 2 -UnusedLayout_82DB4F0_Layout:: @ 82DB4F0 - .4byte 8 - .4byte 6 - .4byte UnusedLayout_82DB4F0_Layout_Border - .4byte UnusedLayout_82DB4F0_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4CD4 - .byte 0 - .byte 0 - .2byte 0 - -UnusedLayout_82DBBE0_Layout_Border:: @ 82DB50C - .incbin "data/layouts/UnusedLayout_82DBBE0_Layout/border.bin" - -UnusedLayout_82DBBE0_Layout_Blockdata:: @ 82DB514 - .incbin "data/layouts/UnusedLayout_82DBBE0_Layout/map.bin" - - .align 2 -UnusedLayout_82DBBE0_Layout:: @ 82DBBE0 - .4byte 29 - .4byte 30 - .4byte UnusedLayout_82DBBE0_Layout_Border - .4byte UnusedLayout_82DBBE0_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D4ADC - .byte 0 - .byte 0 - .2byte 0 - -UnusedLayout_82DBDD8_Layout_Border:: @ 82DBBFC - .incbin "data/layouts/UnusedLayout_82DBDD8_Layout/border.bin" - -UnusedLayout_82DBDD8_Layout_Blockdata:: @ 82DBC04 - .incbin "data/layouts/UnusedLayout_82DBDD8_Layout/map.bin" - - .align 2 -UnusedLayout_82DBDD8_Layout:: @ 82DBDD8 - .4byte 18 - .4byte 13 - .4byte UnusedLayout_82DBDD8_Layout_Border - .4byte UnusedLayout_82DBDD8_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D4D94 - .byte 0 - .byte 0 - .2byte 0 - -UnusedLayout_82DBFB8_Layout_Border:: @ 82DBDF4 - .incbin "data/layouts/UnusedLayout_82DBFB8_Layout/border.bin" - -UnusedLayout_82DBFB8_Layout_Blockdata:: @ 82DBDFC - .incbin "data/layouts/UnusedLayout_82DBFB8_Layout/map.bin" - - .align 2 -UnusedLayout_82DBFB8_Layout:: @ 82DBFB8 - .4byte 17 - .4byte 13 - .4byte UnusedLayout_82DBFB8_Layout_Border - .4byte UnusedLayout_82DBFB8_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D4D94 - .byte 0 - .byte 0 - .2byte 0 - -UnusedLayout_82DC4EC_Layout_Border:: @ 82DBFD4 - .incbin "data/layouts/UnusedLayout_82DC4EC_Layout/border.bin" - -UnusedLayout_82DC4EC_Layout_Blockdata:: @ 82DBFDC - .incbin "data/layouts/UnusedLayout_82DC4EC_Layout/map.bin" - - .align 2 -UnusedLayout_82DC4EC_Layout:: @ 82DC4EC - .4byte 36 - .4byte 18 - .4byte UnusedLayout_82DC4EC_Layout_Border - .4byte UnusedLayout_82DC4EC_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D4D94 - .byte 0 - .byte 0 - .2byte 0 - -UnusedLayout_82DC60C_Layout_Border:: @ 82DC508 - .incbin "data/layouts/UnusedLayout_82DC60C_Layout/border.bin" - -UnusedLayout_82DC60C_Layout_Blockdata:: @ 82DC510 - .incbin "data/layouts/UnusedLayout_82DC60C_Layout/map.bin" - - .align 2 -UnusedLayout_82DC60C_Layout:: @ 82DC60C - .4byte 14 - .4byte 9 - .4byte UnusedLayout_82DC60C_Layout_Border - .4byte UnusedLayout_82DC60C_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4CD4 - .byte 0 - .byte 0 - .2byte 0 - -UnusedLayout_82DC72C_Layout_Border:: @ 82DC628 - .incbin "data/layouts/UnusedLayout_82DC72C_Layout/border.bin" - -UnusedLayout_82DC72C_Layout_Blockdata:: @ 82DC630 - .incbin "data/layouts/UnusedLayout_82DC72C_Layout/map.bin" - - .align 2 -UnusedLayout_82DC72C_Layout:: @ 82DC72C - .4byte 14 - .4byte 9 - .4byte UnusedLayout_82DC72C_Layout_Border - .4byte UnusedLayout_82DC72C_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4CD4 - .byte 0 - .byte 0 - .2byte 0 - -UnusedLayout_82DC84C_Layout_Border:: @ 82DC748 - .incbin "data/layouts/UnusedLayout_82DC84C_Layout/border.bin" - -UnusedLayout_82DC84C_Layout_Blockdata:: @ 82DC750 - .incbin "data/layouts/UnusedLayout_82DC84C_Layout/map.bin" - - .align 2 -UnusedLayout_82DC84C_Layout:: @ 82DC84C - .4byte 14 - .4byte 9 - .4byte UnusedLayout_82DC84C_Layout_Border - .4byte UnusedLayout_82DC84C_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4CD4 - .byte 0 - .byte 0 - .2byte 0 - -UnusedLayout_82DCA70_Layout_Border:: @ 82DC868 - .incbin "data/layouts/UnusedLayout_82DCA70_Layout/border.bin" - -UnusedLayout_82DCA70_Layout_Blockdata:: @ 82DC870 - .incbin "data/layouts/UnusedLayout_82DCA70_Layout/map.bin" - - .align 2 -UnusedLayout_82DCA70_Layout:: @ 82DCA70 - .4byte 15 - .4byte 17 - .4byte UnusedLayout_82DCA70_Layout_Border - .4byte UnusedLayout_82DCA70_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4C44 - .byte 0 - .byte 0 - .2byte 0 - -UnusedLayout_82DCB44_Layout_Border:: @ 82DCA8C - .incbin "data/layouts/UnusedLayout_82DCB44_Layout/border.bin" - -UnusedLayout_82DCB44_Layout_Blockdata:: @ 82DCA94 - .incbin "data/layouts/UnusedLayout_82DCB44_Layout/map.bin" - - .align 2 -UnusedLayout_82DCB44_Layout:: @ 82DCB44 - .4byte 11 - .4byte 8 - .4byte UnusedLayout_82DCB44_Layout_Border - .4byte UnusedLayout_82DCB44_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4CD4 - .byte 0 - .byte 0 - .2byte 0 - -UnusedLayout_82DCC40_Layout_Border:: @ 82DCB60 - .incbin "data/layouts/UnusedLayout_82DCC40_Layout/border.bin" - -UnusedLayout_82DCC40_Layout_Blockdata:: @ 82DCB68 - .incbin "data/layouts/UnusedLayout_82DCC40_Layout/map.bin" - - .align 2 -UnusedLayout_82DCC40_Layout:: @ 82DCC40 - .4byte 12 - .4byte 9 - .4byte UnusedLayout_82DCC40_Layout_Border - .4byte UnusedLayout_82DCC40_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4CD4 - .byte 0 - .byte 0 - .2byte 0 - -UnusedLayout_82DCCD4_Layout_Border:: @ 82DCC5C - .incbin "data/layouts/UnusedLayout_82DCCD4_Layout/border.bin" - -UnusedLayout_82DCCD4_Layout_Blockdata:: @ 82DCC64 - .incbin "data/layouts/UnusedLayout_82DCCD4_Layout/map.bin" - - .align 2 -UnusedLayout_82DCCD4_Layout:: @ 82DCCD4 - .4byte 8 - .4byte 7 - .4byte UnusedLayout_82DCCD4_Layout_Border - .4byte UnusedLayout_82DCCD4_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4CD4 - .byte 0 - .byte 0 - .2byte 0 - -UnusedLayout_82DCD68_Layout_Border:: @ 82DCCF0 - .incbin "data/layouts/UnusedLayout_82DCD68_Layout/border.bin" - -UnusedLayout_82DCD68_Layout_Blockdata:: @ 82DCCF8 - .incbin "data/layouts/UnusedLayout_82DCD68_Layout/map.bin" - - .align 2 -UnusedLayout_82DCD68_Layout:: @ 82DCD68 - .4byte 8 - .4byte 7 - .4byte UnusedLayout_82DCD68_Layout_Border - .4byte UnusedLayout_82DCD68_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4CD4 - .byte 0 - .byte 0 - .2byte 0 - -UnusedLayout_82DCDFC_Layout_Border:: @ 82DCD84 - .incbin "data/layouts/UnusedLayout_82DCDFC_Layout/border.bin" - -UnusedLayout_82DCDFC_Layout_Blockdata:: @ 82DCD8C - .incbin "data/layouts/UnusedLayout_82DCDFC_Layout/map.bin" - - .align 2 -UnusedLayout_82DCDFC_Layout:: @ 82DCDFC - .4byte 8 - .4byte 7 - .4byte UnusedLayout_82DCDFC_Layout_Border - .4byte UnusedLayout_82DCDFC_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4CD4 - .byte 0 - .byte 0 - .2byte 0 - -UnusedLayout_82DCF00_Layout_Border:: @ 82DCE18 - .incbin "data/layouts/UnusedLayout_82DCF00_Layout/border.bin" - -UnusedLayout_82DCF00_Layout_Blockdata:: @ 82DCE20 - .incbin "data/layouts/UnusedLayout_82DCF00_Layout/map.bin" - - .align 2 -UnusedLayout_82DCF00_Layout:: @ 82DCF00 - .4byte 14 - .4byte 8 - .4byte UnusedLayout_82DCF00_Layout_Border - .4byte UnusedLayout_82DCF00_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4CD4 - .byte 0 - .byte 0 - .2byte 0 - -UnusedLayout_82DD004_Layout_Border:: @ 82DCF1C - .incbin "data/layouts/UnusedLayout_82DD004_Layout/border.bin" - -UnusedLayout_82DD004_Layout_Blockdata:: @ 82DCF24 - .incbin "data/layouts/UnusedLayout_82DD004_Layout/map.bin" - - .align 2 -UnusedLayout_82DD004_Layout:: @ 82DD004 - .4byte 14 - .4byte 8 - .4byte UnusedLayout_82DD004_Layout_Border - .4byte UnusedLayout_82DD004_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4CD4 - .byte 0 - .byte 0 - .2byte 0 - -UnusedLayout_82DD0DC_Layout_Border:: @ 82DD020 - .incbin "data/layouts/UnusedLayout_82DD0DC_Layout/border.bin" - -UnusedLayout_82DD0DC_Layout_Blockdata:: @ 82DD028 - .incbin "data/layouts/UnusedLayout_82DD0DC_Layout/map.bin" - - .align 2 -UnusedLayout_82DD0DC_Layout:: @ 82DD0DC - .4byte 10 - .4byte 9 - .4byte UnusedLayout_82DD0DC_Layout_Border - .4byte UnusedLayout_82DD0DC_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4CD4 - .byte 0 - .byte 0 - .2byte 0 - -PalletTown_Layout_Border:: @ 82DD0F8 - .incbin "data/layouts/PalletTown_Layout/border.bin" - -PalletTown_Layout_Blockdata:: @ 82DD100 - .incbin "data/layouts/PalletTown_Layout/map.bin" - - .align 2 -PalletTown_Layout:: @ 82DD4C0 - .4byte 24 - .4byte 20 - .4byte PalletTown_Layout_Border - .4byte PalletTown_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D4AAC - .byte 2 - .byte 2 - .2byte 0 - -ViridianCity_Layout_Border:: @ 82DD4DC - .incbin "data/layouts/ViridianCity_Layout/border.bin" - -ViridianCity_Layout_Blockdata:: @ 82DD4E4 - .incbin "data/layouts/ViridianCity_Layout/map.bin" - - .align 2 -ViridianCity_Layout:: @ 82DE3E4 - .4byte 48 - .4byte 40 - .4byte ViridianCity_Layout_Border - .4byte ViridianCity_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D4AC4 - .byte 2 - .byte 2 - .2byte 0 - -PewterCity_Layout_Border:: @ 82DE400 - .incbin "data/layouts/PewterCity_Layout/border.bin" - -PewterCity_Layout_Blockdata:: @ 82DE408 - .incbin "data/layouts/PewterCity_Layout/map.bin" - - .align 2 -PewterCity_Layout:: @ 82DF308 - .4byte 48 - .4byte 40 - .4byte PewterCity_Layout_Border - .4byte PewterCity_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D4ADC - .byte 2 - .byte 2 - .2byte 0 - -CeruleanCity_Layout_Border:: @ 82DF324 - .incbin "data/layouts/CeruleanCity_Layout/border.bin" - -CeruleanCity_Layout_Blockdata:: @ 82DF32C - .incbin "data/layouts/CeruleanCity_Layout/map.bin" - - .align 2 -CeruleanCity_Layout:: @ 82E022C - .4byte 48 - .4byte 40 - .4byte CeruleanCity_Layout_Border - .4byte CeruleanCity_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D4AF4 - .byte 2 - .byte 2 - .2byte 0 - -LavenderTown_Layout_Border:: @ 82E0248 - .incbin "data/layouts/LavenderTown_Layout/border.bin" - -LavenderTown_Layout_Blockdata:: @ 82E0250 - .incbin "data/layouts/LavenderTown_Layout/map.bin" - - .align 2 -LavenderTown_Layout:: @ 82E0610 - .4byte 24 - .4byte 20 - .4byte LavenderTown_Layout_Border - .4byte LavenderTown_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D4B0C - .byte 2 - .byte 2 - .2byte 0 - -VermilionCity_Layout_Border:: @ 82E062C - .incbin "data/layouts/VermilionCity_Layout/border.bin" - -VermilionCity_Layout_Blockdata:: @ 82E0634 - .incbin "data/layouts/VermilionCity_Layout/map.bin" - - .align 2 -VermilionCity_Layout:: @ 82E1534 - .4byte 48 - .4byte 40 - .4byte VermilionCity_Layout_Border - .4byte VermilionCity_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D4B24 - .byte 2 - .byte 2 - .2byte 0 - -CeladonCity_Layout_Border:: @ 82E1550 - .incbin "data/layouts/CeladonCity_Layout/border.bin" - -CeladonCity_Layout_Blockdata:: @ 82E1558 - .incbin "data/layouts/CeladonCity_Layout/map.bin" - - .align 2 -CeladonCity_Layout:: @ 82E2818 - .4byte 60 - .4byte 40 - .4byte CeladonCity_Layout_Border - .4byte CeladonCity_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D4B3C - .byte 2 - .byte 2 - .2byte 0 - -FuchsiaCity_Layout_Border:: @ 82E2834 - .incbin "data/layouts/FuchsiaCity_Layout/border.bin" - -FuchsiaCity_Layout_Blockdata:: @ 82E283C - .incbin "data/layouts/FuchsiaCity_Layout/map.bin" - - .align 2 -FuchsiaCity_Layout:: @ 82E373C - .4byte 48 - .4byte 40 - .4byte FuchsiaCity_Layout_Border - .4byte FuchsiaCity_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D4B54 - .byte 2 - .byte 2 - .2byte 0 - -CinnabarIsland_Layout_Border:: @ 82E3758 - .incbin "data/layouts/CinnabarIsland_Layout/border.bin" - -CinnabarIsland_Layout_Blockdata:: @ 82E3760 - .incbin "data/layouts/CinnabarIsland_Layout/map.bin" - - .align 2 -CinnabarIsland_Layout:: @ 82E3B20 - .4byte 24 - .4byte 20 - .4byte CinnabarIsland_Layout_Border - .4byte CinnabarIsland_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D4B6C - .byte 2 - .byte 2 - .2byte 0 - -IndigoPlateau_Exterior_Layout_Border:: @ 82E3B3C - .incbin "data/layouts/IndigoPlateau_Exterior_Layout/border.bin" - -IndigoPlateau_Exterior_Layout_Blockdata:: @ 82E3B44 - .incbin "data/layouts/IndigoPlateau_Exterior_Layout/map.bin" - - .align 2 -IndigoPlateau_Exterior_Layout:: @ 82E3F04 - .4byte 24 - .4byte 20 - .4byte IndigoPlateau_Exterior_Layout_Border - .4byte IndigoPlateau_Exterior_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D4B84 - .byte 2 - .byte 2 - .2byte 0 - -SaffronCity_Layout_Border:: @ 82E3F20 - .incbin "data/layouts/SaffronCity_Layout/border.bin" - -SaffronCity_Layout_Blockdata:: @ 82E3F28 - .incbin "data/layouts/SaffronCity_Layout/map.bin" - - .align 2 -SaffronCity_Layout:: @ 82E4E28 - .4byte 48 - .4byte 40 - .4byte SaffronCity_Layout_Border - .4byte SaffronCity_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D4B9C - .byte 2 - .byte 2 - .2byte 0 - -Route1_Layout_Border:: @ 82E4E44 - .incbin "data/layouts/Route1_Layout/border.bin" - -Route1_Layout_Blockdata:: @ 82E4E4C - .incbin "data/layouts/Route1_Layout/map.bin" - - .align 2 -Route1_Layout:: @ 82E55CC - .4byte 24 - .4byte 40 - .4byte Route1_Layout_Border - .4byte Route1_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D4AAC - .byte 2 - .byte 2 - .2byte 0 - -Route2_Layout_Border:: @ 82E55E8 - .incbin "data/layouts/Route2_Layout/border.bin" - -Route2_Layout_Blockdata:: @ 82E55F0 - .incbin "data/layouts/Route2_Layout/map.bin" - - .align 2 -Route2_Layout:: @ 82E64F0 - .4byte 24 - .4byte 80 - .4byte Route2_Layout_Border - .4byte Route2_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D4AC4 - .byte 2 - .byte 2 - .2byte 0 - -Route3_Layout_Border:: @ 82E650C - .incbin "data/layouts/Route3_Layout/border.bin" - -Route3_Layout_Blockdata:: @ 82E6514 - .incbin "data/layouts/Route3_Layout/map.bin" - - .align 2 -Route3_Layout:: @ 82E7234 - .4byte 84 - .4byte 20 - .4byte Route3_Layout_Border - .4byte Route3_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D4ADC - .byte 2 - .byte 2 - .2byte 0 - -Route4_Layout_Border:: @ 82E7250 - .incbin "data/layouts/Route4_Layout/border.bin" - -Route4_Layout_Blockdata:: @ 82E7258 - .incbin "data/layouts/Route4_Layout/map.bin" - - .align 2 -Route4_Layout:: @ 82E8338 - .4byte 108 - .4byte 20 - .4byte Route4_Layout_Border - .4byte Route4_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D4AF4 - .byte 2 - .byte 2 - .2byte 0 - -Route5_Layout_Border:: @ 82E8354 - .incbin "data/layouts/Route5_Layout/border.bin" - -Route5_Layout_Blockdata:: @ 82E835C - .incbin "data/layouts/Route5_Layout/map.bin" - - .align 2 -Route5_Layout:: @ 82E925C - .4byte 48 - .4byte 40 - .4byte Route5_Layout_Border - .4byte Route5_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D4AF4 - .byte 2 - .byte 2 - .2byte 0 - -Route6_Layout_Border:: @ 82E9278 - .incbin "data/layouts/Route6_Layout/border.bin" - -Route6_Layout_Blockdata:: @ 82E9280 - .incbin "data/layouts/Route6_Layout/map.bin" - - .align 2 -Route6_Layout:: @ 82E9A00 - .4byte 24 - .4byte 40 - .4byte Route6_Layout_Border - .4byte Route6_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D4B24 - .byte 2 - .byte 2 - .2byte 0 - -Route7_Layout_Border:: @ 82E9A1C - .incbin "data/layouts/Route7_Layout/border.bin" - -Route7_Layout_Blockdata:: @ 82E9A24 - .incbin "data/layouts/Route7_Layout/map.bin" - - .align 2 -Route7_Layout:: @ 82E9DE4 - .4byte 24 - .4byte 20 - .4byte Route7_Layout_Border - .4byte Route7_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D4B3C - .byte 2 - .byte 2 - .2byte 0 - -Route8_Layout_Border:: @ 82E9E00 - .incbin "data/layouts/Route8_Layout/border.bin" - -Route8_Layout_Blockdata:: @ 82E9E08 - .incbin "data/layouts/Route8_Layout/map.bin" - - .align 2 -Route8_Layout:: @ 82EA948 - .4byte 72 - .4byte 20 - .4byte Route8_Layout_Border - .4byte Route8_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D4B0C - .byte 2 - .byte 2 - .2byte 0 - -Route9_Layout_Border:: @ 82EA964 - .incbin "data/layouts/Route9_Layout/border.bin" - -Route9_Layout_Blockdata:: @ 82EA96C - .incbin "data/layouts/Route9_Layout/map.bin" - - .align 2 -Route9_Layout:: @ 82EB4AC - .4byte 72 - .4byte 20 - .4byte Route9_Layout_Border - .4byte Route9_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D4AF4 - .byte 2 - .byte 2 - .2byte 0 - -Route10_Layout_Border:: @ 82EB4C8 - .incbin "data/layouts/Route10_Layout/border.bin" - -Route10_Layout_Blockdata:: @ 82EB4D0 - .incbin "data/layouts/Route10_Layout/map.bin" - - .align 2 -Route10_Layout:: @ 82EC3D0 - .4byte 24 - .4byte 80 - .4byte Route10_Layout_Border - .4byte Route10_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D4B0C - .byte 2 - .byte 2 - .2byte 0 - -Route11_Layout_Border:: @ 82EC3EC - .incbin "data/layouts/Route11_Layout/border.bin" - -Route11_Layout_Blockdata:: @ 82EC3F4 - .incbin "data/layouts/Route11_Layout/map.bin" - - .align 2 -Route11_Layout:: @ 82ECF34 - .4byte 72 - .4byte 20 - .4byte Route11_Layout_Border - .4byte Route11_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D4B24 - .byte 2 - .byte 2 - .2byte 0 - -Route12_Layout_Border:: @ 82ECF50 - .incbin "data/layouts/Route12_Layout/border.bin" - -Route12_Layout_Blockdata:: @ 82ECF58 - .incbin "data/layouts/Route12_Layout/map.bin" - - .align 2 -Route12_Layout:: @ 82EE5D8 - .4byte 24 - .4byte 120 - .4byte Route12_Layout_Border - .4byte Route12_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D4B0C - .byte 2 - .byte 2 - .2byte 0 - -Route13_Layout_Border:: @ 82EE5F4 - .incbin "data/layouts/Route13_Layout/border.bin" - -Route13_Layout_Blockdata:: @ 82EE5FC - .incbin "data/layouts/Route13_Layout/map.bin" - - .align 2 -Route13_Layout:: @ 82EF13C - .4byte 72 - .4byte 20 - .4byte Route13_Layout_Border - .4byte Route13_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D4B0C - .byte 2 - .byte 2 - .2byte 0 - -Route14_Layout_Border:: @ 82EF158 - .incbin "data/layouts/Route14_Layout/border.bin" - -Route14_Layout_Blockdata:: @ 82EF160 - .incbin "data/layouts/Route14_Layout/map.bin" - - .align 2 -Route14_Layout:: @ 82EFCA0 - .4byte 24 - .4byte 60 - .4byte Route14_Layout_Border - .4byte Route14_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D4B0C - .byte 2 - .byte 2 - .2byte 0 - -Route15_Layout_Border:: @ 82EFCBC - .incbin "data/layouts/Route15_Layout/border.bin" - -Route15_Layout_Blockdata:: @ 82EFCC4 - .incbin "data/layouts/Route15_Layout/map.bin" - - .align 2 -Route15_Layout:: @ 82F0804 - .4byte 72 - .4byte 20 - .4byte Route15_Layout_Border - .4byte Route15_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D4B54 - .byte 2 - .byte 2 - .2byte 0 - -Route16_Layout_Border:: @ 82F0820 - .incbin "data/layouts/Route16_Layout/border.bin" - -Route16_Layout_Blockdata:: @ 82F0828 - .incbin "data/layouts/Route16_Layout/map.bin" - - .align 2 -Route16_Layout:: @ 82F0FA8 - .4byte 48 - .4byte 20 - .4byte Route16_Layout_Border - .4byte Route16_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D4B3C - .byte 2 - .byte 2 - .2byte 0 - -Route17_Layout_Border:: @ 82F0FC4 - .incbin "data/layouts/Route17_Layout/border.bin" - -Route17_Layout_Blockdata:: @ 82F0FCC - .incbin "data/layouts/Route17_Layout/map.bin" - - .align 2 -Route17_Layout:: @ 82F2DCC - .4byte 24 - .4byte 160 - .4byte Route17_Layout_Border - .4byte Route17_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D4B3C - .byte 2 - .byte 2 - .2byte 0 - -Route18_Layout_Border:: @ 82F2DE8 - .incbin "data/layouts/Route18_Layout/border.bin" - -Route18_Layout_Blockdata:: @ 82F2DF0 - .incbin "data/layouts/Route18_Layout/map.bin" - - .align 2 -Route18_Layout:: @ 82F3750 - .4byte 60 - .4byte 20 - .4byte Route18_Layout_Border - .4byte Route18_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D4B3C - .byte 2 - .byte 2 - .2byte 0 - -Route19_Layout_Border:: @ 82F376C - .incbin "data/layouts/Route19_Layout/border.bin" - -Route19_Layout_Blockdata:: @ 82F3774 - .incbin "data/layouts/Route19_Layout/map.bin" - - .align 2 -Route19_Layout:: @ 82F42B4 - .4byte 24 - .4byte 60 - .4byte Route19_Layout_Border - .4byte Route19_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D4B54 - .byte 2 - .byte 2 - .2byte 0 - -Route20_Layout_Border:: @ 82F42D0 - .incbin "data/layouts/Route20_Layout/border.bin" - -Route20_Layout_Blockdata:: @ 82F42D8 - .incbin "data/layouts/Route20_Layout/map.bin" - - .align 2 -Route20_Layout:: @ 82F5598 - .4byte 120 - .4byte 20 - .4byte Route20_Layout_Border - .4byte Route20_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D4B6C - .byte 2 - .byte 2 - .2byte 0 - -Route21_North_Layout_Border:: @ 82F55B4 - .incbin "data/layouts/Route21_North_Layout/border.bin" - -Route21_North_Layout_Blockdata:: @ 82F55BC - .incbin "data/layouts/Route21_North_Layout/map.bin" - - .align 2 -Route21_North_Layout:: @ 82F5F1C - .4byte 24 - .4byte 50 - .4byte Route21_North_Layout_Border - .4byte Route21_North_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D4AAC - .byte 2 - .byte 2 - .2byte 0 - -Route22_Layout_Border:: @ 82F5F38 - .incbin "data/layouts/Route22_Layout/border.bin" - -Route22_Layout_Blockdata:: @ 82F5F40 - .incbin "data/layouts/Route22_Layout/map.bin" - - .align 2 -Route22_Layout:: @ 82F6840 - .4byte 48 - .4byte 24 - .4byte Route22_Layout_Border - .4byte Route22_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D4AC4 - .byte 2 - .byte 2 - .2byte 0 - -Route23_Layout_Border:: @ 82F685C - .incbin "data/layouts/Route23_Layout/border.bin" - -Route23_Layout_Blockdata:: @ 82F6864 - .incbin "data/layouts/Route23_Layout/map.bin" - - .align 2 -Route23_Layout:: @ 82F8664 - .4byte 24 - .4byte 160 - .4byte Route23_Layout_Border - .4byte Route23_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D4B84 - .byte 2 - .byte 2 - .2byte 0 - -Route24_Layout_Border:: @ 82F8680 - .incbin "data/layouts/Route24_Layout/border.bin" - -Route24_Layout_Blockdata:: @ 82F8688 - .incbin "data/layouts/Route24_Layout/map.bin" - - .align 2 -Route24_Layout:: @ 82F8E08 - .4byte 24 - .4byte 40 - .4byte Route24_Layout_Border - .4byte Route24_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D4AF4 - .byte 2 - .byte 2 - .2byte 0 - -Route25_Layout_Border:: @ 82F8E24 - .incbin "data/layouts/Route25_Layout/border.bin" - -Route25_Layout_Blockdata:: @ 82F8E2C - .incbin "data/layouts/Route25_Layout/map.bin" - - .align 2 -Route25_Layout:: @ 82F996C - .4byte 72 - .4byte 20 - .4byte Route25_Layout_Border - .4byte Route25_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D4AF4 - .byte 2 - .byte 2 - .2byte 0 - -MtMoon_1F_Layout_Border:: @ 82F9988 - .incbin "data/layouts/MtMoon_1F_Layout/border.bin" - -MtMoon_1F_Layout_Blockdata:: @ 82F9990 - .incbin "data/layouts/MtMoon_1F_Layout/map.bin" - - .align 2 -MtMoon_1F_Layout:: @ 82FA890 - .4byte 48 - .4byte 40 - .4byte MtMoon_1F_Layout_Border - .4byte MtMoon_1F_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D4BFC - .byte 2 - .byte 2 - .2byte 0 - -MtMoon_B1F_Layout_Border:: @ 82FA8AC - .incbin "data/layouts/MtMoon_B1F_Layout/border.bin" - -MtMoon_B1F_Layout_Blockdata:: @ 82FA8B4 - .incbin "data/layouts/MtMoon_B1F_Layout/map.bin" - - .align 2 -MtMoon_B1F_Layout:: @ 82FB804 - .4byte 49 - .4byte 40 - .4byte MtMoon_B1F_Layout_Border - .4byte MtMoon_B1F_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D4BFC - .byte 2 - .byte 2 - .2byte 0 - -MtMoon_B2F_Layout_Border:: @ 82FB820 - .incbin "data/layouts/MtMoon_B2F_Layout/border.bin" - -MtMoon_B2F_Layout_Blockdata:: @ 82FB828 - .incbin "data/layouts/MtMoon_B2F_Layout/map.bin" - - .align 2 -MtMoon_B2F_Layout:: @ 82FC728 - .4byte 48 - .4byte 40 - .4byte MtMoon_B2F_Layout_Border - .4byte MtMoon_B2F_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D4BFC - .byte 2 - .byte 2 - .2byte 0 - -ViridianForest_Layout_Border:: @ 82FC744 - .incbin "data/layouts/ViridianForest_Layout/border.bin" - -ViridianForest_Layout_Blockdata:: @ 82FC750 - .incbin "data/layouts/ViridianForest_Layout/map.bin" - - .align 2 -ViridianForest_Layout:: @ 82FE46C - .4byte 54 - .4byte 69 - .4byte ViridianForest_Layout_Border - .4byte ViridianForest_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D4DC4 - .byte 3 - .byte 2 - .2byte 0 - -SSAnne_Exterior_Layout_Border:: @ 82FE488 - .incbin "data/layouts/SSAnne_Exterior_Layout/border.bin" - -SSAnne_Exterior_Layout_Blockdata:: @ 82FE490 - .incbin "data/layouts/SSAnne_Exterior_Layout/map.bin" - - .align 2 -SSAnne_Exterior_Layout:: @ 82FF610 - .4byte 70 - .4byte 32 - .4byte SSAnne_Exterior_Layout_Border - .4byte SSAnne_Exterior_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D4B24 - .byte 2 - .byte 2 - .2byte 0 - -SSAnne_1F_Corridor_Layout_Border:: @ 82FF62C - .incbin "data/layouts/SSAnne_1F_Corridor_Layout/border.bin" - -SSAnne_1F_Corridor_Layout_Blockdata:: @ 82FF634 - .incbin "data/layouts/SSAnne_1F_Corridor_Layout/map.bin" - - .align 2 -SSAnne_1F_Corridor_Layout:: @ 82FFB4C - .4byte 31 - .4byte 21 - .4byte SSAnne_1F_Corridor_Layout_Border - .4byte SSAnne_1F_Corridor_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D4D94 - .byte 2 - .byte 2 - .2byte 0 - -SSAnne_2F_Corridor_Layout_Border:: @ 82FFB68 - .incbin "data/layouts/SSAnne_2F_Corridor_Layout/border.bin" - -SSAnne_2F_Corridor_Layout_Blockdata:: @ 82FFB70 - .incbin "data/layouts/SSAnne_2F_Corridor_Layout/map.bin" - - .align 2 -SSAnne_2F_Corridor_Layout:: @ 82FFFB0 - .4byte 34 - .4byte 16 - .4byte SSAnne_2F_Corridor_Layout_Border - .4byte SSAnne_2F_Corridor_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D4D94 - .byte 2 - .byte 2 - .2byte 0 - -SSAnne_3F_Corridor_Layout_Border:: @ 82FFFCC - .incbin "data/layouts/SSAnne_3F_Corridor_Layout/border.bin" - -SSAnne_3F_Corridor_Layout_Blockdata:: @ 82FFFD4 - .incbin "data/layouts/SSAnne_3F_Corridor_Layout/map.bin" - - .align 2 -SSAnne_3F_Corridor_Layout:: @ 8300108 - .4byte 22 - .4byte 7 - .4byte SSAnne_3F_Corridor_Layout_Border - .4byte SSAnne_3F_Corridor_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D4D94 - .byte 2 - .byte 2 - .2byte 0 - -SSAnne_B1F_Corridor_Layout_Border:: @ 8300124 - .incbin "data/layouts/SSAnne_B1F_Corridor_Layout/border.bin" - -SSAnne_B1F_Corridor_Layout_Blockdata:: @ 830012C - .incbin "data/layouts/SSAnne_B1F_Corridor_Layout/map.bin" - - .align 2 -SSAnne_B1F_Corridor_Layout:: @ 8300270 - .4byte 23 - .4byte 7 - .4byte SSAnne_B1F_Corridor_Layout_Border - .4byte SSAnne_B1F_Corridor_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D4D94 - .byte 2 - .byte 2 - .2byte 0 - -SSAnne_Deck_Layout_Border:: @ 830028C - .incbin "data/layouts/SSAnne_Deck_Layout/border.bin" - -SSAnne_Deck_Layout_Blockdata:: @ 8300294 - .incbin "data/layouts/SSAnne_Deck_Layout/map.bin" - - .align 2 -SSAnne_Deck_Layout:: @ 8300624 - .4byte 24 - .4byte 19 - .4byte SSAnne_Deck_Layout_Border - .4byte SSAnne_Deck_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D4D94 - .byte 2 - .byte 2 - .2byte 0 - -DiglettsCave_B1F_Layout_Border:: @ 8300640 - .incbin "data/layouts/DiglettsCave_B1F_Layout/border.bin" - -DiglettsCave_B1F_Layout_Blockdata:: @ 8300648 - .incbin "data/layouts/DiglettsCave_B1F_Layout/map.bin" - - .align 2 -DiglettsCave_B1F_Layout:: @ 8303B68 - .4byte 85 - .4byte 80 - .4byte DiglettsCave_B1F_Layout_Border - .4byte DiglettsCave_B1F_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D4E0C - .byte 2 - .byte 2 - .2byte 0 - -VictoryRoad_1F_Layout_Border:: @ 8303B84 - .incbin "data/layouts/VictoryRoad_1F_Layout/border.bin" - -VictoryRoad_1F_Layout_Blockdata:: @ 8303B8C - .incbin "data/layouts/VictoryRoad_1F_Layout/map.bin" - - .align 2 -VictoryRoad_1F_Layout:: @ 83043CC - .4byte 48 - .4byte 22 - .4byte VictoryRoad_1F_Layout_Border - .4byte VictoryRoad_1F_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D4BFC - .byte 2 - .byte 2 - .2byte 0 - -VictoryRoad_2F_Layout_Border:: @ 83043E8 - .incbin "data/layouts/VictoryRoad_2F_Layout/border.bin" - -VictoryRoad_2F_Layout_Blockdata:: @ 83043F0 - .incbin "data/layouts/VictoryRoad_2F_Layout/map.bin" - - .align 2 -VictoryRoad_2F_Layout:: @ 8304CB4 - .4byte 51 - .4byte 22 - .4byte VictoryRoad_2F_Layout_Border - .4byte VictoryRoad_2F_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D4BFC - .byte 2 - .byte 2 - .2byte 0 - -VictoryRoad_3F_Layout_Border:: @ 8304CD0 - .incbin "data/layouts/VictoryRoad_3F_Layout/border.bin" - -VictoryRoad_3F_Layout_Blockdata:: @ 8304CD8 - .incbin "data/layouts/VictoryRoad_3F_Layout/map.bin" - - .align 2 -VictoryRoad_3F_Layout:: @ 8305494 - .4byte 45 - .4byte 22 - .4byte VictoryRoad_3F_Layout_Border - .4byte VictoryRoad_3F_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D4BFC - .byte 2 - .byte 2 - .2byte 0 - -RocketHideout_B1F_Layout_Border:: @ 83054B0 - .incbin "data/layouts/RocketHideout_B1F_Layout/border.bin" - -RocketHideout_B1F_Layout_Blockdata:: @ 83054B8 - .incbin "data/layouts/RocketHideout_B1F_Layout/map.bin" - - .align 2 -RocketHideout_B1F_Layout:: @ 8305C28 - .4byte 28 - .4byte 34 - .4byte RocketHideout_B1F_Layout_Border - .4byte RocketHideout_B1F_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4ECC - .byte 2 - .byte 2 - .2byte 0 - -RocketHideout_B2F_Layout_Border:: @ 8305C44 - .incbin "data/layouts/RocketHideout_B2F_Layout/border.bin" - -RocketHideout_B2F_Layout_Blockdata:: @ 8305C4C - .incbin "data/layouts/RocketHideout_B2F_Layout/map.bin" - - .align 2 -RocketHideout_B2F_Layout:: @ 83061CC - .4byte 32 - .4byte 22 - .4byte RocketHideout_B2F_Layout_Border - .4byte RocketHideout_B2F_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4ECC - .byte 2 - .byte 2 - .2byte 0 - -RocketHideout_B3F_Layout_Border:: @ 83061E8 - .incbin "data/layouts/RocketHideout_B3F_Layout/border.bin" - -RocketHideout_B3F_Layout_Blockdata:: @ 83061F0 - .incbin "data/layouts/RocketHideout_B3F_Layout/map.bin" - - .align 2 -RocketHideout_B3F_Layout:: @ 8306694 - .4byte 22 - .4byte 27 - .4byte RocketHideout_B3F_Layout_Border - .4byte RocketHideout_B3F_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4ECC - .byte 2 - .byte 2 - .2byte 0 - -RocketHideout_B4F_Layout_Border:: @ 83066B0 - .incbin "data/layouts/RocketHideout_B4F_Layout/border.bin" - -RocketHideout_B4F_Layout_Blockdata:: @ 83066B8 - .incbin "data/layouts/RocketHideout_B4F_Layout/map.bin" - - .align 2 -RocketHideout_B4F_Layout:: @ 8306B98 - .4byte 24 - .4byte 26 - .4byte RocketHideout_B4F_Layout_Border - .4byte RocketHideout_B4F_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4ECC - .byte 2 - .byte 2 - .2byte 0 - -SilphCo_1F_Layout_Border:: @ 8306BB4 - .incbin "data/layouts/SilphCo_1F_Layout/border.bin" - -SilphCo_1F_Layout_Blockdata:: @ 8306BBC - .incbin "data/layouts/SilphCo_1F_Layout/map.bin" - - .align 2 -SilphCo_1F_Layout:: @ 83071EC - .4byte 36 - .4byte 22 - .4byte SilphCo_1F_Layout_Border - .4byte SilphCo_1F_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4ECC - .byte 2 - .byte 2 - .2byte 0 - -SilphCo_2F_Layout_Border:: @ 8307208 - .incbin "data/layouts/SilphCo_2F_Layout/border.bin" - -SilphCo_2F_Layout_Blockdata:: @ 8307210 - .incbin "data/layouts/SilphCo_2F_Layout/map.bin" - - .align 2 -SilphCo_2F_Layout:: @ 8307840 - .4byte 36 - .4byte 22 - .4byte SilphCo_2F_Layout_Border - .4byte SilphCo_2F_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4ECC - .byte 2 - .byte 2 - .2byte 0 - -SilphCo_3F_Layout_Border:: @ 830785C - .incbin "data/layouts/SilphCo_3F_Layout/border.bin" - -SilphCo_3F_Layout_Blockdata:: @ 8307864 - .incbin "data/layouts/SilphCo_3F_Layout/map.bin" - - .align 2 -SilphCo_3F_Layout:: @ 8307E94 - .4byte 36 - .4byte 22 - .4byte SilphCo_3F_Layout_Border - .4byte SilphCo_3F_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4ECC - .byte 2 - .byte 2 - .2byte 0 - -SilphCo_4F_Layout_Border:: @ 8307EB0 - .incbin "data/layouts/SilphCo_4F_Layout/border.bin" - -SilphCo_4F_Layout_Blockdata:: @ 8307EB8 - .incbin "data/layouts/SilphCo_4F_Layout/map.bin" - - .align 2 -SilphCo_4F_Layout:: @ 83084E8 - .4byte 36 - .4byte 22 - .4byte SilphCo_4F_Layout_Border - .4byte SilphCo_4F_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4ECC - .byte 2 - .byte 2 - .2byte 0 - -SilphCo_5F_Layout_Border:: @ 8308504 - .incbin "data/layouts/SilphCo_5F_Layout/border.bin" - -SilphCo_5F_Layout_Blockdata:: @ 830850C - .incbin "data/layouts/SilphCo_5F_Layout/map.bin" - - .align 2 -SilphCo_5F_Layout:: @ 8308B3C - .4byte 36 - .4byte 22 - .4byte SilphCo_5F_Layout_Border - .4byte SilphCo_5F_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4ECC - .byte 2 - .byte 2 - .2byte 0 - -SilphCo_6F_Layout_Border:: @ 8308B58 - .incbin "data/layouts/SilphCo_6F_Layout/border.bin" - -SilphCo_6F_Layout_Blockdata:: @ 8308B60 - .incbin "data/layouts/SilphCo_6F_Layout/map.bin" - - .align 2 -SilphCo_6F_Layout:: @ 8308FFC - .4byte 31 - .4byte 19 - .4byte SilphCo_6F_Layout_Border - .4byte SilphCo_6F_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4ECC - .byte 2 - .byte 2 - .2byte 0 - -SilphCo_7F_Layout_Border:: @ 8309018 - .incbin "data/layouts/SilphCo_7F_Layout/border.bin" - -SilphCo_7F_Layout_Blockdata:: @ 8309020 - .incbin "data/layouts/SilphCo_7F_Layout/map.bin" - - .align 2 -SilphCo_7F_Layout:: @ 83094BC - .4byte 31 - .4byte 19 - .4byte SilphCo_7F_Layout_Border - .4byte SilphCo_7F_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4ECC - .byte 2 - .byte 2 - .2byte 0 - -SilphCo_8F_Layout_Border:: @ 83094D8 - .incbin "data/layouts/SilphCo_8F_Layout/border.bin" - -SilphCo_8F_Layout_Blockdata:: @ 83094E0 - .incbin "data/layouts/SilphCo_8F_Layout/map.bin" - - .align 2 -SilphCo_8F_Layout:: @ 830997C - .4byte 31 - .4byte 19 - .4byte SilphCo_8F_Layout_Border - .4byte SilphCo_8F_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4ECC - .byte 2 - .byte 2 - .2byte 0 - -SilphCo_9F_Layout_Border:: @ 8309998 - .incbin "data/layouts/SilphCo_9F_Layout/border.bin" - -SilphCo_9F_Layout_Blockdata:: @ 83099A0 - .incbin "data/layouts/SilphCo_9F_Layout/map.bin" - - .align 2 -SilphCo_9F_Layout:: @ 8309E3C - .4byte 31 - .4byte 19 - .4byte SilphCo_9F_Layout_Border - .4byte SilphCo_9F_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4ECC - .byte 2 - .byte 2 - .2byte 0 - -SilphCo_10F_Layout_Border:: @ 8309E58 - .incbin "data/layouts/SilphCo_10F_Layout/border.bin" - -SilphCo_10F_Layout_Blockdata:: @ 8309E60 - .incbin "data/layouts/SilphCo_10F_Layout/map.bin" - - .align 2 -SilphCo_10F_Layout:: @ 830A0E8 - .4byte 17 - .4byte 19 - .4byte SilphCo_10F_Layout_Border - .4byte SilphCo_10F_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4ECC - .byte 2 - .byte 2 - .2byte 0 - -SilphCo_11F_Layout_Border:: @ 830A104 - .incbin "data/layouts/SilphCo_11F_Layout/border.bin" - -SilphCo_11F_Layout_Blockdata:: @ 830A10C - .incbin "data/layouts/SilphCo_11F_Layout/map.bin" - - .align 2 -SilphCo_11F_Layout:: @ 830A3B4 - .4byte 17 - .4byte 20 - .4byte SilphCo_11F_Layout_Border - .4byte SilphCo_11F_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4ECC - .byte 2 - .byte 2 - .2byte 0 - -PokemonMansion_1F_Layout_Border:: @ 830A3D0 - .incbin "data/layouts/PokemonMansion_1F_Layout/border.bin" - -PokemonMansion_1F_Layout_Blockdata:: @ 830A3D8 - .incbin "data/layouts/PokemonMansion_1F_Layout/map.bin" - - .align 2 -PokemonMansion_1F_Layout:: @ 830AE3C - .4byte 38 - .4byte 35 - .4byte PokemonMansion_1F_Layout_Border - .4byte PokemonMansion_1F_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4F2C - .byte 2 - .byte 2 - .2byte 0 - -PokemonMansion_2F_Layout_Border:: @ 830AE58 - .incbin "data/layouts/PokemonMansion_2F_Layout/border.bin" - -PokemonMansion_2F_Layout_Blockdata:: @ 830AE60 - .incbin "data/layouts/PokemonMansion_2F_Layout/map.bin" - - .align 2 -PokemonMansion_2F_Layout:: @ 830B9A8 - .4byte 38 - .4byte 38 - .4byte PokemonMansion_2F_Layout_Border - .4byte PokemonMansion_2F_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4F2C - .byte 2 - .byte 2 - .2byte 0 - -PokemonMansion_3F_Layout_Border:: @ 830B9C4 - .incbin "data/layouts/PokemonMansion_3F_Layout/border.bin" - -PokemonMansion_3F_Layout_Blockdata:: @ 830B9CC - .incbin "data/layouts/PokemonMansion_3F_Layout/map.bin" - - .align 2 -PokemonMansion_3F_Layout:: @ 830C430 - .4byte 38 - .4byte 35 - .4byte PokemonMansion_3F_Layout_Border - .4byte PokemonMansion_3F_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4F2C - .byte 2 - .byte 2 - .2byte 0 - -PokemonMansion_B1F_Layout_Border:: @ 830C44C - .incbin "data/layouts/PokemonMansion_B1F_Layout/border.bin" - -PokemonMansion_B1F_Layout_Blockdata:: @ 830C454 - .incbin "data/layouts/PokemonMansion_B1F_Layout/map.bin" - - .align 2 -PokemonMansion_B1F_Layout:: @ 830CEB8 - .4byte 38 - .4byte 35 - .4byte PokemonMansion_B1F_Layout_Border - .4byte PokemonMansion_B1F_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4F2C - .byte 2 - .byte 2 - .2byte 0 - -SafariZone_Center_Layout_Border:: @ 830CED4 - .incbin "data/layouts/SafariZone_Center_Layout/border.bin" - -SafariZone_Center_Layout_Blockdata:: @ 830CEE0 - .incbin "data/layouts/SafariZone_Center_Layout/map.bin" - - .align 2 -SafariZone_Center_Layout:: @ 830DD38 - .4byte 51 - .4byte 36 - .4byte SafariZone_Center_Layout_Border - .4byte SafariZone_Center_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D4B54 - .byte 3 - .byte 2 - .2byte 0 - -SafariZone_East_Layout_Border:: @ 830DD54 - .incbin "data/layouts/SafariZone_East_Layout/border.bin" - -SafariZone_East_Layout_Blockdata:: @ 830DD60 - .incbin "data/layouts/SafariZone_East_Layout/map.bin" - - .align 2 -SafariZone_East_Layout:: @ 830EC24 - .4byte 54 - .4byte 35 - .4byte SafariZone_East_Layout_Border - .4byte SafariZone_East_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D4B54 - .byte 3 - .byte 2 - .2byte 0 - -SafariZone_North_Layout_Border:: @ 830EC40 - .incbin "data/layouts/SafariZone_North_Layout/border.bin" - -SafariZone_North_Layout_Blockdata:: @ 830EC4C - .incbin "data/layouts/SafariZone_North_Layout/map.bin" - - .align 2 -SafariZone_North_Layout:: @ 830FE1C - .4byte 57 - .4byte 40 - .4byte SafariZone_North_Layout_Border - .4byte SafariZone_North_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D4B54 - .byte 3 - .byte 2 - .2byte 0 - -SafariZone_West_Layout_Border:: @ 830FE38 - .incbin "data/layouts/SafariZone_West_Layout/border.bin" - -SafariZone_West_Layout_Blockdata:: @ 830FE44 - .incbin "data/layouts/SafariZone_West_Layout/map.bin" - - .align 2 -SafariZone_West_Layout:: @ 8310BC4 - .4byte 48 - .4byte 36 - .4byte SafariZone_West_Layout_Border - .4byte SafariZone_West_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D4B54 - .byte 3 - .byte 2 - .2byte 0 - -CeruleanCave_1F_Layout_Border:: @ 8310BE0 - .incbin "data/layouts/CeruleanCave_1F_Layout/border.bin" - -CeruleanCave_1F_Layout_Blockdata:: @ 8310BE8 - .incbin "data/layouts/CeruleanCave_1F_Layout/map.bin" - - .align 2 -CeruleanCave_1F_Layout:: @ 8311318 - .4byte 40 - .4byte 23 - .4byte CeruleanCave_1F_Layout_Border - .4byte CeruleanCave_1F_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D4E54 - .byte 2 - .byte 2 - .2byte 0 - -CeruleanCave_2F_Layout_Border:: @ 8311334 - .incbin "data/layouts/CeruleanCave_2F_Layout/border.bin" - -CeruleanCave_2F_Layout_Blockdata:: @ 831133C - .incbin "data/layouts/CeruleanCave_2F_Layout/map.bin" - - .align 2 -CeruleanCave_2F_Layout:: @ 8311A6C - .4byte 40 - .4byte 23 - .4byte CeruleanCave_2F_Layout_Border - .4byte CeruleanCave_2F_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D4E54 - .byte 2 - .byte 2 - .2byte 0 - -CeruleanCave_B1F_Layout_Border:: @ 8311A88 - .incbin "data/layouts/CeruleanCave_B1F_Layout/border.bin" - -CeruleanCave_B1F_Layout_Blockdata:: @ 8311A90 - .incbin "data/layouts/CeruleanCave_B1F_Layout/map.bin" - - .align 2 -CeruleanCave_B1F_Layout:: @ 83121C0 - .4byte 40 - .4byte 23 - .4byte CeruleanCave_B1F_Layout_Border - .4byte CeruleanCave_B1F_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D4E54 - .byte 2 - .byte 2 - .2byte 0 - -RockTunnel_1F_Layout_Border:: @ 83121DC - .incbin "data/layouts/RockTunnel_1F_Layout/border.bin" - -RockTunnel_1F_Layout_Blockdata:: @ 83121E4 - .incbin "data/layouts/RockTunnel_1F_Layout/map.bin" - - .align 2 -RockTunnel_1F_Layout:: @ 83130E4 - .4byte 48 - .4byte 40 - .4byte RockTunnel_1F_Layout_Border - .4byte RockTunnel_1F_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D4DF4 - .byte 2 - .byte 2 - .2byte 0 - -RockTunnel_B1F_Layout_Border:: @ 8313100 - .incbin "data/layouts/RockTunnel_B1F_Layout/border.bin" - -RockTunnel_B1F_Layout_Blockdata:: @ 8313108 - .incbin "data/layouts/RockTunnel_B1F_Layout/map.bin" - - .align 2 -RockTunnel_B1F_Layout:: @ 8314008 - .4byte 48 - .4byte 40 - .4byte RockTunnel_B1F_Layout_Border - .4byte RockTunnel_B1F_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D4DF4 - .byte 2 - .byte 2 - .2byte 0 - -SeafoamIslands_1F_Layout_Border:: @ 8314024 - .incbin "data/layouts/SeafoamIslands_1F_Layout/border.bin" - -SeafoamIslands_1F_Layout_Blockdata:: @ 831402C - .incbin "data/layouts/SeafoamIslands_1F_Layout/map.bin" - - .align 2 -SeafoamIslands_1F_Layout:: @ 831474C - .4byte 38 - .4byte 24 - .4byte SeafoamIslands_1F_Layout_Border - .4byte SeafoamIslands_1F_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D4E24 - .byte 2 - .byte 2 - .2byte 0 - -SeafoamIslands_B1F_Layout_Border:: @ 8314768 - .incbin "data/layouts/SeafoamIslands_B1F_Layout/border.bin" - -SeafoamIslands_B1F_Layout_Blockdata:: @ 8314770 - .incbin "data/layouts/SeafoamIslands_B1F_Layout/map.bin" - - .align 2 -SeafoamIslands_B1F_Layout:: @ 8314E44 - .4byte 38 - .4byte 23 - .4byte SeafoamIslands_B1F_Layout_Border - .4byte SeafoamIslands_B1F_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D4E24 - .byte 2 - .byte 2 - .2byte 0 - -SeafoamIslands_B2F_Layout_Border:: @ 8314E60 - .incbin "data/layouts/SeafoamIslands_B2F_Layout/border.bin" - -SeafoamIslands_B2F_Layout_Blockdata:: @ 8314E68 - .incbin "data/layouts/SeafoamIslands_B2F_Layout/map.bin" - - .align 2 -SeafoamIslands_B2F_Layout:: @ 8315588 - .4byte 38 - .4byte 24 - .4byte SeafoamIslands_B2F_Layout_Border - .4byte SeafoamIslands_B2F_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D4E24 - .byte 2 - .byte 2 - .2byte 0 - -SeafoamIslands_B3F_Layout_Border:: @ 83155A4 - .incbin "data/layouts/SeafoamIslands_B3F_Layout/border.bin" - -SeafoamIslands_B3F_Layout_Blockdata:: @ 83155AC - .incbin "data/layouts/SeafoamIslands_B3F_Layout/map.bin" - - .align 2 -SeafoamIslands_B3F_Layout:: @ 8315CCC - .4byte 38 - .4byte 24 - .4byte SeafoamIslands_B3F_Layout_Border - .4byte SeafoamIslands_B3F_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D4E24 - .byte 2 - .byte 2 - .2byte 0 - -SeafoamIslands_B4F_Layout_Border:: @ 8315CE8 - .incbin "data/layouts/SeafoamIslands_B4F_Layout/border.bin" - -SeafoamIslands_B4F_Layout_Blockdata:: @ 8315CF0 - .incbin "data/layouts/SeafoamIslands_B4F_Layout/map.bin" - - .align 2 -SeafoamIslands_B4F_Layout:: @ 8316410 - .4byte 38 - .4byte 24 - .4byte SeafoamIslands_B4F_Layout_Border - .4byte SeafoamIslands_B4F_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D4E24 - .byte 2 - .byte 2 - .2byte 0 - -PokemonTower_1F_Layout_Border:: @ 831642C - .incbin "data/layouts/PokemonTower_1F_Layout/border.bin" - -PokemonTower_1F_Layout_Blockdata:: @ 8316434 - .incbin "data/layouts/PokemonTower_1F_Layout/map.bin" - - .align 2 -PokemonTower_1F_Layout:: @ 83167F4 - .4byte 24 - .4byte 20 - .4byte PokemonTower_1F_Layout_Border - .4byte PokemonTower_1F_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4EFC - .byte 2 - .byte 2 - .2byte 0 - -PokemonTower_2F_Layout_Border:: @ 8316810 - .incbin "data/layouts/PokemonTower_2F_Layout/border.bin" - -PokemonTower_2F_Layout_Blockdata:: @ 8316818 - .incbin "data/layouts/PokemonTower_2F_Layout/map.bin" - - .align 2 -PokemonTower_2F_Layout:: @ 8316BD8 - .4byte 24 - .4byte 20 - .4byte PokemonTower_2F_Layout_Border - .4byte PokemonTower_2F_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4EFC - .byte 2 - .byte 2 - .2byte 0 - -PokemonTower_3F_Layout_Border:: @ 8316BF4 - .incbin "data/layouts/PokemonTower_3F_Layout/border.bin" - -PokemonTower_3F_Layout_Blockdata:: @ 8316BFC - .incbin "data/layouts/PokemonTower_3F_Layout/map.bin" - - .align 2 -PokemonTower_3F_Layout:: @ 8316FBC - .4byte 24 - .4byte 20 - .4byte PokemonTower_3F_Layout_Border - .4byte PokemonTower_3F_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4EFC - .byte 2 - .byte 2 - .2byte 0 - -PokemonTower_4F_Layout_Border:: @ 8316FD8 - .incbin "data/layouts/PokemonTower_4F_Layout/border.bin" - -PokemonTower_4F_Layout_Blockdata:: @ 8316FE0 - .incbin "data/layouts/PokemonTower_4F_Layout/map.bin" - - .align 2 -PokemonTower_4F_Layout:: @ 83173A0 - .4byte 24 - .4byte 20 - .4byte PokemonTower_4F_Layout_Border - .4byte PokemonTower_4F_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4EFC - .byte 2 - .byte 2 - .2byte 0 - -PokemonTower_5F_Layout_Border:: @ 83173BC - .incbin "data/layouts/PokemonTower_5F_Layout/border.bin" - -PokemonTower_5F_Layout_Blockdata:: @ 83173C4 - .incbin "data/layouts/PokemonTower_5F_Layout/map.bin" - - .align 2 -PokemonTower_5F_Layout:: @ 8317784 - .4byte 24 - .4byte 20 - .4byte PokemonTower_5F_Layout_Border - .4byte PokemonTower_5F_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4EFC - .byte 2 - .byte 2 - .2byte 0 - -PokemonTower_6F_Layout_Border:: @ 83177A0 - .incbin "data/layouts/PokemonTower_6F_Layout/border.bin" - -PokemonTower_6F_Layout_Blockdata:: @ 83177A8 - .incbin "data/layouts/PokemonTower_6F_Layout/map.bin" - - .align 2 -PokemonTower_6F_Layout:: @ 8317B68 - .4byte 24 - .4byte 20 - .4byte PokemonTower_6F_Layout_Border - .4byte PokemonTower_6F_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4EFC - .byte 2 - .byte 2 - .2byte 0 - -PokemonTower_7F_Layout_Border:: @ 8317B84 - .incbin "data/layouts/PokemonTower_7F_Layout/border.bin" - -PokemonTower_7F_Layout_Blockdata:: @ 8317B8C - .incbin "data/layouts/PokemonTower_7F_Layout/map.bin" - - .align 2 -PokemonTower_7F_Layout:: @ 8317F4C - .4byte 24 - .4byte 20 - .4byte PokemonTower_7F_Layout_Border - .4byte PokemonTower_7F_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4EFC - .byte 2 - .byte 2 - .2byte 0 - -PowerPlant_Layout_Border:: @ 8317F68 - .incbin "data/layouts/PowerPlant_Layout/border.bin" - -PowerPlant_Layout_Blockdata:: @ 8317F70 - .incbin "data/layouts/PowerPlant_Layout/map.bin" - - .align 2 -PowerPlant_Layout:: @ 8318EC0 - .4byte 49 - .4byte 40 - .4byte PowerPlant_Layout_Border - .4byte PowerPlant_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4E9C - .byte 2 - .byte 2 - .2byte 0 - -Route25_SeaCottage_Layout_Border:: @ 8318EDC - .incbin "data/layouts/Route25_SeaCottage_Layout/border.bin" - -Route25_SeaCottage_Layout_Blockdata:: @ 8318EE4 - .incbin "data/layouts/Route25_SeaCottage_Layout/map.bin" - - .align 2 -Route25_SeaCottage_Layout:: @ 8319030 - .4byte 15 - .4byte 11 - .4byte Route25_SeaCottage_Layout_Border - .4byte Route25_SeaCottage_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4EB4 - .byte 2 - .byte 2 - .2byte 0 - -SSAnne_Kitchen_Layout_Border:: @ 831904C - .incbin "data/layouts/SSAnne_Kitchen_Layout/border.bin" - -SSAnne_Kitchen_Layout_Blockdata:: @ 8319054 - .incbin "data/layouts/SSAnne_Kitchen_Layout/map.bin" - - .align 2 -SSAnne_Kitchen_Layout:: @ 8319214 - .4byte 16 - .4byte 14 - .4byte SSAnne_Kitchen_Layout_Border - .4byte SSAnne_Kitchen_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D4D94 - .byte 2 - .byte 2 - .2byte 0 - -SSAnne_CaptainsOffice_Layout_Border:: @ 8319230 - .incbin "data/layouts/SSAnne_CaptainsOffice_Layout/border.bin" - -SSAnne_CaptainsOffice_Layout_Blockdata:: @ 8319238 - .incbin "data/layouts/SSAnne_CaptainsOffice_Layout/map.bin" - - .align 2 -SSAnne_CaptainsOffice_Layout:: @ 83192EC - .4byte 9 - .4byte 10 - .4byte SSAnne_CaptainsOffice_Layout_Border - .4byte SSAnne_CaptainsOffice_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D4D94 - .byte 2 - .byte 2 - .2byte 0 - -UndergroundPath_Entrance_Layout_Border:: @ 8319308 - .incbin "data/layouts/UndergroundPath_Entrance_Layout/border.bin" - -UndergroundPath_Entrance_Layout_Blockdata:: @ 8319310 - .incbin "data/layouts/UndergroundPath_Entrance_Layout/map.bin" - - .align 2 -UndergroundPath_Entrance_Layout:: @ 8319414 - .4byte 13 - .4byte 10 - .4byte UndergroundPath_Entrance_Layout_Border - .4byte UndergroundPath_Entrance_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4E84 - .byte 2 - .byte 2 - .2byte 0 - -UndergroundPath_EastWestTunnel_Layout_Border:: @ 8319430 - .incbin "data/layouts/UndergroundPath_EastWestTunnel_Layout/border.bin" - -UndergroundPath_EastWestTunnel_Layout_Blockdata:: @ 8319438 - .incbin "data/layouts/UndergroundPath_EastWestTunnel_Layout/map.bin" - - .align 2 -UndergroundPath_EastWestTunnel_Layout:: @ 8319898 - .4byte 80 - .4byte 7 - .4byte UndergroundPath_EastWestTunnel_Layout_Border - .4byte UndergroundPath_EastWestTunnel_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4EE4 - .byte 2 - .byte 2 - .2byte 0 - -UndergroundPath_NorthSouthTunnel_Layout_Border:: @ 83198B4 - .incbin "data/layouts/UndergroundPath_NorthSouthTunnel_Layout/border.bin" - -UndergroundPath_NorthSouthTunnel_Layout_Blockdata:: @ 83198BC - .incbin "data/layouts/UndergroundPath_NorthSouthTunnel_Layout/map.bin" - - .align 2 -UndergroundPath_NorthSouthTunnel_Layout:: @ 8319CAC - .4byte 8 - .4byte 63 - .4byte UndergroundPath_NorthSouthTunnel_Layout_Border - .4byte UndergroundPath_NorthSouthTunnel_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4EE4 - .byte 2 - .byte 2 - .2byte 0 - -Route12_NorthEntrance_1F_Layout_Border:: @ 8319CC8 - .incbin "data/layouts/Route12_NorthEntrance_1F_Layout/border.bin" - -Route12_NorthEntrance_1F_Layout_Blockdata:: @ 8319CD0 - .incbin "data/layouts/Route12_NorthEntrance_1F_Layout/map.bin" - - .align 2 -Route12_NorthEntrance_1F_Layout:: @ 8319DF0 - .4byte 11 - .4byte 13 - .4byte Route12_NorthEntrance_1F_Layout_Border - .4byte Route12_NorthEntrance_1F_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4E84 - .byte 2 - .byte 2 - .2byte 0 - -SSAnne_Room1_Layout_Border:: @ 8319E0C - .incbin "data/layouts/SSAnne_Room1_Layout/border.bin" - -SSAnne_Room1_Layout_Blockdata:: @ 8319E14 - .incbin "data/layouts/SSAnne_Room1_Layout/map.bin" - - .align 2 -SSAnne_Room1_Layout:: @ 8319E74 - .4byte 6 - .4byte 8 - .4byte SSAnne_Room1_Layout_Border - .4byte SSAnne_Room1_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D4D94 - .byte 2 - .byte 2 - .2byte 0 - -SSAnne_Room2_Layout_Border:: @ 8319E90 - .incbin "data/layouts/SSAnne_Room2_Layout/border.bin" - -SSAnne_Room2_Layout_Blockdata:: @ 8319E98 - .incbin "data/layouts/SSAnne_Room2_Layout/map.bin" - - .align 2 -SSAnne_Room2_Layout:: @ 8319F04 - .4byte 6 - .4byte 9 - .4byte SSAnne_Room2_Layout_Border - .4byte SSAnne_Room2_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D4D94 - .byte 2 - .byte 2 - .2byte 0 - -CeladonCity_DepartmentStore_Elevator_Layout_Border:: @ 8319F20 - .incbin "data/layouts/CeladonCity_DepartmentStore_Elevator_Layout/border.bin" - -CeladonCity_DepartmentStore_Elevator_Layout_Blockdata:: @ 8319F28 - .incbin "data/layouts/CeladonCity_DepartmentStore_Elevator_Layout/map.bin" - - .align 2 -CeladonCity_DepartmentStore_Elevator_Layout:: @ 8319F70 - .4byte 5 - .4byte 7 - .4byte CeladonCity_DepartmentStore_Elevator_Layout_Border - .4byte CeladonCity_DepartmentStore_Elevator_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4ECC - .byte 2 - .byte 2 - .2byte 0 - -PewterCity_Museum_1F_Layout_Border:: @ 8319F8C - .incbin "data/layouts/PewterCity_Museum_1F_Layout/border.bin" - -PewterCity_Museum_1F_Layout_Blockdata:: @ 8319F94 - .incbin "data/layouts/PewterCity_Museum_1F_Layout/map.bin" - - .align 2 -PewterCity_Museum_1F_Layout:: @ 831A1FC - .4byte 28 - .4byte 11 - .4byte PewterCity_Museum_1F_Layout_Border - .4byte PewterCity_Museum_1F_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4C2C - .byte 2 - .byte 2 - .2byte 0 - -PewterCity_Museum_2F_Layout_Border:: @ 831A218 - .incbin "data/layouts/PewterCity_Museum_2F_Layout/border.bin" - -PewterCity_Museum_2F_Layout_Blockdata:: @ 831A220 - .incbin "data/layouts/PewterCity_Museum_2F_Layout/map.bin" - - .align 2 -PewterCity_Museum_2F_Layout:: @ 831A39C - .4byte 19 - .4byte 10 - .4byte PewterCity_Museum_2F_Layout_Border - .4byte PewterCity_Museum_2F_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4C2C - .byte 2 - .byte 2 - .2byte 0 - -CeruleanCity_House2_Layout_Border:: @ 831A3B8 - .incbin "data/layouts/CeruleanCity_House2_Layout/border.bin" - -CeruleanCity_House2_Layout_Blockdata:: @ 831A3C0 - .incbin "data/layouts/CeruleanCity_House2_Layout/map.bin" - - .align 2 -CeruleanCity_House2_Layout:: @ 831A474 - .4byte 10 - .4byte 9 - .4byte CeruleanCity_House2_Layout_Border - .4byte CeruleanCity_House2_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4FA4 - .byte 2 - .byte 2 - .2byte 0 - -CeruleanCity_House1_Layout_Border:: @ 831A490 - .incbin "data/layouts/CeruleanCity_House1_Layout/border.bin" - -CeruleanCity_House1_Layout_Blockdata:: @ 831A498 - .incbin "data/layouts/CeruleanCity_House1_Layout/map.bin" - - .align 2 -CeruleanCity_House1_Layout:: @ 831A560 - .4byte 10 - .4byte 10 - .4byte CeruleanCity_House1_Layout_Border - .4byte CeruleanCity_House1_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4E84 - .byte 2 - .byte 2 - .2byte 0 - -CeladonCity_Condominiums_1F_Layout_Border:: @ 831A57C - .incbin "data/layouts/CeladonCity_Condominiums_1F_Layout/border.bin" - -CeladonCity_Condominiums_1F_Layout_Blockdata:: @ 831A584 - .incbin "data/layouts/CeladonCity_Condominiums_1F_Layout/map.bin" - - .align 2 -CeladonCity_Condominiums_1F_Layout:: @ 831A7DC - .4byte 15 - .4byte 20 - .4byte CeladonCity_Condominiums_1F_Layout_Border - .4byte CeladonCity_Condominiums_1F_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4F8C - .byte 2 - .byte 2 - .2byte 0 - -CeladonCity_Condominiums_2F_Layout_Border:: @ 831A7F8 - .incbin "data/layouts/CeladonCity_Condominiums_2F_Layout/border.bin" - -CeladonCity_Condominiums_2F_Layout_Blockdata:: @ 831A800 - .incbin "data/layouts/CeladonCity_Condominiums_2F_Layout/map.bin" - - .align 2 -CeladonCity_Condominiums_2F_Layout:: @ 831AA58 - .4byte 15 - .4byte 20 - .4byte CeladonCity_Condominiums_2F_Layout_Border - .4byte CeladonCity_Condominiums_2F_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4F8C - .byte 2 - .byte 2 - .2byte 0 - -CeladonCity_Condominiums_3F_Layout_Border:: @ 831AA74 - .incbin "data/layouts/CeladonCity_Condominiums_3F_Layout/border.bin" - -CeladonCity_Condominiums_3F_Layout_Blockdata:: @ 831AA7C - .incbin "data/layouts/CeladonCity_Condominiums_3F_Layout/map.bin" - - .align 2 -CeladonCity_Condominiums_3F_Layout:: @ 831ACD4 - .4byte 15 - .4byte 20 - .4byte CeladonCity_Condominiums_3F_Layout_Border - .4byte CeladonCity_Condominiums_3F_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4F8C - .byte 2 - .byte 2 - .2byte 0 - -CeladonCity_Condominiums_Roof_Layout_Border:: @ 831ACF0 - .incbin "data/layouts/CeladonCity_Condominiums_Roof_Layout/border.bin" - -CeladonCity_Condominiums_Roof_Layout_Blockdata:: @ 831ACF8 - .incbin "data/layouts/CeladonCity_Condominiums_Roof_Layout/map.bin" - - .align 2 -CeladonCity_Condominiums_Roof_Layout:: @ 831AF7C - .4byte 14 - .4byte 23 - .4byte CeladonCity_Condominiums_Roof_Layout_Border - .4byte CeladonCity_Condominiums_Roof_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4F8C - .byte 2 - .byte 2 - .2byte 0 - -CeladonCity_Condominiums_RoofRoom_Layout_Border:: @ 831AF98 - .incbin "data/layouts/CeladonCity_Condominiums_RoofRoom_Layout/border.bin" - -CeladonCity_Condominiums_RoofRoom_Layout_Blockdata:: @ 831AFA0 - .incbin "data/layouts/CeladonCity_Condominiums_RoofRoom_Layout/map.bin" - - .align 2 -CeladonCity_Condominiums_RoofRoom_Layout:: @ 831B054 - .4byte 10 - .4byte 9 - .4byte CeladonCity_Condominiums_RoofRoom_Layout_Border - .4byte CeladonCity_Condominiums_RoofRoom_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4F5C - .byte 2 - .byte 2 - .2byte 0 - -CeladonCity_GameCorner_PrizeRoom_Layout_Border:: @ 831B070 - .incbin "data/layouts/CeladonCity_GameCorner_PrizeRoom_Layout/border.bin" - -CeladonCity_GameCorner_PrizeRoom_Layout_Blockdata:: @ 831B078 - .incbin "data/layouts/CeladonCity_GameCorner_PrizeRoom_Layout/map.bin" - - .align 2 -CeladonCity_GameCorner_PrizeRoom_Layout:: @ 831B12C - .4byte 9 - .4byte 10 - .4byte CeladonCity_GameCorner_PrizeRoom_Layout_Border - .4byte CeladonCity_GameCorner_PrizeRoom_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4CEC - .byte 2 - .byte 2 - .2byte 0 - -CeladonCity_Restaurant_Layout_Border:: @ 831B148 - .incbin "data/layouts/CeladonCity_Restaurant_Layout/border.bin" - -CeladonCity_Restaurant_Layout_Blockdata:: @ 831B150 - .incbin "data/layouts/CeladonCity_Restaurant_Layout/map.bin" - - .align 2 -CeladonCity_Restaurant_Layout:: @ 831B29C - .4byte 15 - .4byte 11 - .4byte CeladonCity_Restaurant_Layout_Border - .4byte CeladonCity_Restaurant_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4F44 - .byte 2 - .byte 2 - .2byte 0 - -CeladonCity_Hotel_Layout_Border:: @ 831B2B8 - .incbin "data/layouts/CeladonCity_Hotel_Layout/border.bin" - -CeladonCity_Hotel_Layout_Blockdata:: @ 831B2C0 - .incbin "data/layouts/CeladonCity_Hotel_Layout/map.bin" - - .align 2 -CeladonCity_Hotel_Layout:: @ 831B438 - .4byte 17 - .4byte 11 - .4byte CeladonCity_Hotel_Layout_Border - .4byte CeladonCity_Hotel_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4F44 - .byte 2 - .byte 2 - .2byte 0 - -CeladonCity_DepartmentStore_1F_Layout_Border:: @ 831B454 - .incbin "data/layouts/CeladonCity_DepartmentStore_1F_Layout/border.bin" - -CeladonCity_DepartmentStore_1F_Layout_Blockdata:: @ 831B45C - .incbin "data/layouts/CeladonCity_DepartmentStore_1F_Layout/map.bin" - - .align 2 -CeladonCity_DepartmentStore_1F_Layout:: @ 831B5FC - .4byte 13 - .4byte 16 - .4byte CeladonCity_DepartmentStore_1F_Layout_Border - .4byte CeladonCity_DepartmentStore_1F_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4E6C - .byte 2 - .byte 2 - .2byte 0 - -CeladonCity_DepartmentStore_2F_Layout_Border:: @ 831B618 - .incbin "data/layouts/CeladonCity_DepartmentStore_2F_Layout/border.bin" - -CeladonCity_DepartmentStore_2F_Layout_Blockdata:: @ 831B620 - .incbin "data/layouts/CeladonCity_DepartmentStore_2F_Layout/map.bin" - - .align 2 -CeladonCity_DepartmentStore_2F_Layout:: @ 831B7A8 - .4byte 13 - .4byte 15 - .4byte CeladonCity_DepartmentStore_2F_Layout_Border - .4byte CeladonCity_DepartmentStore_2F_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4E6C - .byte 2 - .byte 2 - .2byte 0 - -CeladonCity_DepartmentStore_3F_Layout_Border:: @ 831B7C4 - .incbin "data/layouts/CeladonCity_DepartmentStore_3F_Layout/border.bin" - -CeladonCity_DepartmentStore_3F_Layout_Blockdata:: @ 831B7CC - .incbin "data/layouts/CeladonCity_DepartmentStore_3F_Layout/map.bin" - - .align 2 -CeladonCity_DepartmentStore_3F_Layout:: @ 831B954 - .4byte 13 - .4byte 15 - .4byte CeladonCity_DepartmentStore_3F_Layout_Border - .4byte CeladonCity_DepartmentStore_3F_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4E6C - .byte 2 - .byte 2 - .2byte 0 - -CeladonCity_DepartmentStore_4F_Layout_Border:: @ 831B970 - .incbin "data/layouts/CeladonCity_DepartmentStore_4F_Layout/border.bin" - -CeladonCity_DepartmentStore_4F_Layout_Blockdata:: @ 831B978 - .incbin "data/layouts/CeladonCity_DepartmentStore_4F_Layout/map.bin" - - .align 2 -CeladonCity_DepartmentStore_4F_Layout:: @ 831BB00 - .4byte 13 - .4byte 15 - .4byte CeladonCity_DepartmentStore_4F_Layout_Border - .4byte CeladonCity_DepartmentStore_4F_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4E6C - .byte 2 - .byte 2 - .2byte 0 - -CeladonCity_DepartmentStore_5F_Layout_Border:: @ 831BB1C - .incbin "data/layouts/CeladonCity_DepartmentStore_5F_Layout/border.bin" - -CeladonCity_DepartmentStore_5F_Layout_Blockdata:: @ 831BB24 - .incbin "data/layouts/CeladonCity_DepartmentStore_5F_Layout/map.bin" - - .align 2 -CeladonCity_DepartmentStore_5F_Layout:: @ 831BCAC - .4byte 13 - .4byte 15 - .4byte CeladonCity_DepartmentStore_5F_Layout_Border - .4byte CeladonCity_DepartmentStore_5F_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4E6C - .byte 2 - .byte 2 - .2byte 0 - -CeladonCity_DepartmentStore_Roof_Layout_Border:: @ 831BCC8 - .incbin "data/layouts/CeladonCity_DepartmentStore_Roof_Layout/border.bin" - -CeladonCity_DepartmentStore_Roof_Layout_Blockdata:: @ 831BCD0 - .incbin "data/layouts/CeladonCity_DepartmentStore_Roof_Layout/map.bin" - - .align 2 -CeladonCity_DepartmentStore_Roof_Layout:: @ 831BEE4 - .4byte 19 - .4byte 14 - .4byte CeladonCity_DepartmentStore_Roof_Layout_Border - .4byte CeladonCity_DepartmentStore_Roof_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4E6C - .byte 2 - .byte 2 - .2byte 0 - -SafariZone_Building_Layout_Border:: @ 831BF00 - .incbin "data/layouts/SafariZone_Building_Layout/border.bin" - -SafariZone_Building_Layout_Blockdata:: @ 831BF08 - .incbin "data/layouts/SafariZone_Building_Layout/map.bin" - - .align 2 -SafariZone_Building_Layout:: @ 831C028 - .4byte 13 - .4byte 11 - .4byte SafariZone_Building_Layout_Border - .4byte SafariZone_Building_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4F14 - .byte 2 - .byte 2 - .2byte 0 - -SafariZone_SecretHouse_Layout_Border:: @ 831C044 - .incbin "data/layouts/SafariZone_SecretHouse_Layout/border.bin" - -SafariZone_SecretHouse_Layout_Blockdata:: @ 831C04C - .incbin "data/layouts/SafariZone_SecretHouse_Layout/map.bin" - - .align 2 -SafariZone_SecretHouse_Layout:: @ 831C16C - .4byte 13 - .4byte 11 - .4byte SafariZone_SecretHouse_Layout_Border - .4byte SafariZone_SecretHouse_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4F14 - .byte 2 - .byte 2 - .2byte 0 - -FuchsiaCity_ZooBuilding_Layout_Border:: @ 831C188 - .incbin "data/layouts/FuchsiaCity_ZooBuilding_Layout/border.bin" - -FuchsiaCity_ZooBuilding_Layout_Blockdata:: @ 831C190 - .incbin "data/layouts/FuchsiaCity_ZooBuilding_Layout/map.bin" - - .align 2 -FuchsiaCity_ZooBuilding_Layout:: @ 831C348 - .4byte 20 - .4byte 11 - .4byte FuchsiaCity_ZooBuilding_Layout_Border - .4byte FuchsiaCity_ZooBuilding_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4F14 - .byte 2 - .byte 2 - .2byte 0 - -FuchsiaCity_Building1_Layout_Border:: @ 831C364 - .incbin "data/layouts/FuchsiaCity_Building1_Layout/border.bin" - -FuchsiaCity_Building1_Layout_Blockdata:: @ 831C36C - .incbin "data/layouts/FuchsiaCity_Building1_Layout/map.bin" - - .align 2 -FuchsiaCity_Building1_Layout:: @ 831C48C - .4byte 13 - .4byte 11 - .4byte FuchsiaCity_Building1_Layout_Border - .4byte FuchsiaCity_Building1_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4C2C - .byte 2 - .byte 2 - .2byte 0 - -FuchsiaCity_House2_Layout_Border:: @ 831C4A8 - .incbin "data/layouts/FuchsiaCity_House2_Layout/border.bin" - -FuchsiaCity_House2_Layout_Blockdata:: @ 831C4B0 - .incbin "data/layouts/FuchsiaCity_House2_Layout/map.bin" - - .align 2 -FuchsiaCity_House2_Layout:: @ 831C578 - .4byte 10 - .4byte 10 - .4byte FuchsiaCity_House2_Layout_Border - .4byte FuchsiaCity_House2_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4C2C - .byte 2 - .byte 2 - .2byte 0 - -CinnabarIsland_PokemonLab_Entrance_Layout_Border:: @ 831C594 - .incbin "data/layouts/CinnabarIsland_PokemonLab_Entrance_Layout/border.bin" - -CinnabarIsland_PokemonLab_Entrance_Layout_Blockdata:: @ 831C59C - .incbin "data/layouts/CinnabarIsland_PokemonLab_Entrance_Layout/map.bin" - - .align 2 -CinnabarIsland_PokemonLab_Entrance_Layout:: @ 831C804 - .4byte 28 - .4byte 11 - .4byte CinnabarIsland_PokemonLab_Entrance_Layout_Border - .4byte CinnabarIsland_PokemonLab_Entrance_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4C8C - .byte 2 - .byte 2 - .2byte 0 - -CinnabarIsland_PokemonLab_Lounge_Layout_Border:: @ 831C820 - .incbin "data/layouts/CinnabarIsland_PokemonLab_Lounge_Layout/border.bin" - -CinnabarIsland_PokemonLab_Lounge_Layout_Blockdata:: @ 831C828 - .incbin "data/layouts/CinnabarIsland_PokemonLab_Lounge_Layout/map.bin" - - .align 2 -CinnabarIsland_PokemonLab_Lounge_Layout:: @ 831C974 - .4byte 15 - .4byte 11 - .4byte CinnabarIsland_PokemonLab_Lounge_Layout_Border - .4byte CinnabarIsland_PokemonLab_Lounge_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4C8C - .byte 2 - .byte 2 - .2byte 0 - -CinnabarIsland_PokemonLab_ResearchRoom_Layout_Border:: @ 831C990 - .incbin "data/layouts/CinnabarIsland_PokemonLab_ResearchRoom_Layout/border.bin" - -CinnabarIsland_PokemonLab_ResearchRoom_Layout_Blockdata:: @ 831C998 - .incbin "data/layouts/CinnabarIsland_PokemonLab_ResearchRoom_Layout/map.bin" - - .align 2 -CinnabarIsland_PokemonLab_ResearchRoom_Layout:: @ 831CAE4 - .4byte 15 - .4byte 11 - .4byte CinnabarIsland_PokemonLab_ResearchRoom_Layout_Border - .4byte CinnabarIsland_PokemonLab_ResearchRoom_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4C8C - .byte 2 - .byte 2 - .2byte 0 - -CinnabarIsland_PokemonLab_ExperimentRoom_Layout_Border:: @ 831CB00 - .incbin "data/layouts/CinnabarIsland_PokemonLab_ExperimentRoom_Layout/border.bin" - -CinnabarIsland_PokemonLab_ExperimentRoom_Layout_Blockdata:: @ 831CB08 - .incbin "data/layouts/CinnabarIsland_PokemonLab_ExperimentRoom_Layout/map.bin" - - .align 2 -CinnabarIsland_PokemonLab_ExperimentRoom_Layout:: @ 831CC54 - .4byte 15 - .4byte 11 - .4byte CinnabarIsland_PokemonLab_ExperimentRoom_Layout_Border - .4byte CinnabarIsland_PokemonLab_ExperimentRoom_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4C8C - .byte 2 - .byte 2 - .2byte 0 - -SaffronCity_Duplicate_Layout_Border:: @ 831CC70 - .incbin "data/layouts/SaffronCity_Duplicate_Layout/border.bin" - -SaffronCity_Duplicate_Layout_Blockdata:: @ 831CC78 - .incbin "data/layouts/SaffronCity_Duplicate_Layout/map.bin" - - .align 2 -SaffronCity_Duplicate_Layout:: @ 831E8D4 - .4byte 66 - .4byte 55 - .4byte SaffronCity_Duplicate_Layout_Border - .4byte SaffronCity_Duplicate_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D4B9C - .byte 2 - .byte 2 - .2byte 0 - -SaffronCity_NorthSouthEntrance_Layout_Border:: @ 831E8F0 - .incbin "data/layouts/SaffronCity_NorthSouthEntrance_Layout/border.bin" - -SaffronCity_NorthSouthEntrance_Layout_Blockdata:: @ 831E8F8 - .incbin "data/layouts/SaffronCity_NorthSouthEntrance_Layout/map.bin" - - .align 2 -SaffronCity_NorthSouthEntrance_Layout:: @ 831E9C0 - .4byte 9 - .4byte 11 - .4byte SaffronCity_NorthSouthEntrance_Layout_Border - .4byte SaffronCity_NorthSouthEntrance_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4E84 - .byte 2 - .byte 2 - .2byte 0 - -SaffronCity_EastWestEntrance_Layout_Border:: @ 831E9DC - .incbin "data/layouts/SaffronCity_EastWestEntrance_Layout/border.bin" - -SaffronCity_EastWestEntrance_Layout_Blockdata:: @ 831E9E4 - .incbin "data/layouts/SaffronCity_EastWestEntrance_Layout/map.bin" - - .align 2 -SaffronCity_EastWestEntrance_Layout:: @ 831EAD0 - .4byte 13 - .4byte 9 - .4byte SaffronCity_EastWestEntrance_Layout_Border - .4byte SaffronCity_EastWestEntrance_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4E84 - .byte 2 - .byte 2 - .2byte 0 - -DiglettsCave_NorthEntrance_Layout_Border:: @ 831EAEC - .incbin "data/layouts/DiglettsCave_NorthEntrance_Layout/border.bin" - -DiglettsCave_NorthEntrance_Layout_Blockdata:: @ 831EAF4 - .incbin "data/layouts/DiglettsCave_NorthEntrance_Layout/map.bin" - - .align 2 -DiglettsCave_NorthEntrance_Layout:: @ 831EB94 - .4byte 10 - .4byte 8 - .4byte DiglettsCave_NorthEntrance_Layout_Border - .4byte DiglettsCave_NorthEntrance_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D4E0C - .byte 2 - .byte 2 - .2byte 0 - -DiglettsCave_SouthEntrance_Layout_Border:: @ 831EBB0 - .incbin "data/layouts/DiglettsCave_SouthEntrance_Layout/border.bin" - -DiglettsCave_SouthEntrance_Layout_Blockdata:: @ 831EBB8 - .incbin "data/layouts/DiglettsCave_SouthEntrance_Layout/map.bin" - - .align 2 -DiglettsCave_SouthEntrance_Layout:: @ 831EC58 - .4byte 10 - .4byte 8 - .4byte DiglettsCave_SouthEntrance_Layout_Border - .4byte DiglettsCave_SouthEntrance_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D4E0C - .byte 2 - .byte 2 - .2byte 0 - -IndigoPlateau_PokemonCenter_1F_Layout_Border:: @ 831EC74 - .incbin "data/layouts/IndigoPlateau_PokemonCenter_1F_Layout/border.bin" - -IndigoPlateau_PokemonCenter_1F_Layout_Blockdata:: @ 831EC7C - .incbin "data/layouts/IndigoPlateau_PokemonCenter_1F_Layout/map.bin" - - .align 2 -IndigoPlateau_PokemonCenter_1F_Layout:: @ 831F000 - .4byte 25 - .4byte 18 - .4byte IndigoPlateau_PokemonCenter_1F_Layout_Border - .4byte IndigoPlateau_PokemonCenter_1F_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4BE4 - .byte 2 - .byte 2 - .2byte 0 - -PokemonLeague_LoreleisRoom_Layout_Border:: @ 831F01C - .incbin "data/layouts/PokemonLeague_LoreleisRoom_Layout/border.bin" - -PokemonLeague_LoreleisRoom_Layout_Blockdata:: @ 831F024 - .incbin "data/layouts/PokemonLeague_LoreleisRoom_Layout/map.bin" - - .align 2 -PokemonLeague_LoreleisRoom_Layout:: @ 831F178 - .4byte 13 - .4byte 13 - .4byte PokemonLeague_LoreleisRoom_Layout_Border - .4byte PokemonLeague_LoreleisRoom_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D50C4 - .byte 2 - .byte 2 - .2byte 0 - -PokemonLeague_BrunosRoom_Layout_Border:: @ 831F194 - .incbin "data/layouts/PokemonLeague_BrunosRoom_Layout/border.bin" - -PokemonLeague_BrunosRoom_Layout_Blockdata:: @ 831F19C - .incbin "data/layouts/PokemonLeague_BrunosRoom_Layout/map.bin" - - .align 2 -PokemonLeague_BrunosRoom_Layout:: @ 831F2F0 - .4byte 13 - .4byte 13 - .4byte PokemonLeague_BrunosRoom_Layout_Border - .4byte PokemonLeague_BrunosRoom_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D50C4 - .byte 2 - .byte 2 - .2byte 0 - -PokemonLeague_AgathasRoom_Layout_Border:: @ 831F30C - .incbin "data/layouts/PokemonLeague_AgathasRoom_Layout/border.bin" - -PokemonLeague_AgathasRoom_Layout_Blockdata:: @ 831F314 - .incbin "data/layouts/PokemonLeague_AgathasRoom_Layout/map.bin" - - .align 2 -PokemonLeague_AgathasRoom_Layout:: @ 831F468 - .4byte 13 - .4byte 13 - .4byte PokemonLeague_AgathasRoom_Layout_Border - .4byte PokemonLeague_AgathasRoom_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D50C4 - .byte 2 - .byte 2 - .2byte 0 - -PokemonLeague_LancesRoom_Layout_Border:: @ 831F484 - .incbin "data/layouts/PokemonLeague_LancesRoom_Layout/border.bin" - -PokemonLeague_LancesRoom_Layout_Blockdata:: @ 831F48C - .incbin "data/layouts/PokemonLeague_LancesRoom_Layout/map.bin" - - .align 2 -PokemonLeague_LancesRoom_Layout:: @ 831F9CC - .4byte 28 - .4byte 24 - .4byte PokemonLeague_LancesRoom_Layout_Border - .4byte PokemonLeague_LancesRoom_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D50C4 - .byte 2 - .byte 2 - .2byte 0 - -PokemonLeague_ChampionsRoom_Layout_Border:: @ 831F9E8 - .incbin "data/layouts/PokemonLeague_ChampionsRoom_Layout/border.bin" - -PokemonLeague_ChampionsRoom_Layout_Blockdata:: @ 831F9F0 - .incbin "data/layouts/PokemonLeague_ChampionsRoom_Layout/map.bin" - - .align 2 -PokemonLeague_ChampionsRoom_Layout:: @ 831FBF8 - .4byte 13 - .4byte 20 - .4byte PokemonLeague_ChampionsRoom_Layout_Border - .4byte PokemonLeague_ChampionsRoom_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D50C4 - .byte 2 - .byte 2 - .2byte 0 - -PokemonLeague_HallOfFame_Layout_Border:: @ 831FC14 - .incbin "data/layouts/PokemonLeague_HallOfFame_Layout/border.bin" - -PokemonLeague_HallOfFame_Layout_Blockdata:: @ 831FC1C - .incbin "data/layouts/PokemonLeague_HallOfFame_Layout/map.bin" - - .align 2 -PokemonLeague_HallOfFame_Layout:: @ 831FD3C - .4byte 11 - .4byte 13 - .4byte PokemonLeague_HallOfFame_Layout_Border - .4byte PokemonLeague_HallOfFame_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D50DC - .byte 2 - .byte 2 - .2byte 0 - -Route21_South_Layout_Border:: @ 831FD58 - .incbin "data/layouts/Route21_South_Layout/border.bin" - -Route21_South_Layout_Blockdata:: @ 831FD60 - .incbin "data/layouts/Route21_South_Layout/map.bin" - - .align 2 -Route21_South_Layout:: @ 83206C0 - .4byte 24 - .4byte 50 - .4byte Route21_South_Layout_Border - .4byte Route21_South_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D4B6C - .byte 2 - .byte 2 - .2byte 0 - -Entrance_2F_Layout_Border:: @ 83206DC - .incbin "data/layouts/Entrance_2F_Layout/border.bin" - -Entrance_2F_Layout_Blockdata:: @ 83206E4 - .incbin "data/layouts/Entrance_2F_Layout/map.bin" - - .align 2 -Entrance_2F_Layout:: @ 8320804 - .4byte 13 - .4byte 11 - .4byte Entrance_2F_Layout_Border - .4byte Entrance_2F_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4E84 - .byte 2 - .byte 2 - .2byte 0 - -Route2_Entrance_Layout_Border:: @ 8320820 - .incbin "data/layouts/Route2_Entrance_Layout/border.bin" - -Route2_Entrance_Layout_Blockdata:: @ 8320828 - .incbin "data/layouts/Route2_Entrance_Layout/map.bin" - - .align 2 -Route2_Entrance_Layout:: @ 8320990 - .4byte 15 - .4byte 12 - .4byte Route2_Entrance_Layout_Border - .4byte Route2_Entrance_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4E84 - .byte 2 - .byte 2 - .2byte 0 - -Route22_NorthEntrance_Layout_Border:: @ 83209AC - .incbin "data/layouts/Route22_NorthEntrance_Layout/border.bin" - -Route22_NorthEntrance_Layout_Blockdata:: @ 83209B4 - .incbin "data/layouts/Route22_NorthEntrance_Layout/map.bin" - - .align 2 -Route22_NorthEntrance_Layout:: @ 8320B1C - .4byte 15 - .4byte 12 - .4byte Route22_NorthEntrance_Layout_Border - .4byte Route22_NorthEntrance_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4E84 - .byte 2 - .byte 2 - .2byte 0 - -Route16_NorthEntrance_1F_Layout_Border:: @ 8320B38 - .incbin "data/layouts/Route16_NorthEntrance_1F_Layout/border.bin" - -Route16_NorthEntrance_1F_Layout_Blockdata:: @ 8320B40 - .incbin "data/layouts/Route16_NorthEntrance_1F_Layout/map.bin" - - .align 2 -Route16_NorthEntrance_1F_Layout:: @ 8320D14 - .4byte 13 - .4byte 18 - .4byte Route16_NorthEntrance_1F_Layout_Border - .4byte Route16_NorthEntrance_1F_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4E84 - .byte 2 - .byte 2 - .2byte 0 - -Entrance_1F_Layout_Border:: @ 8320D30 - .incbin "data/layouts/Entrance_1F_Layout/border.bin" - -Entrance_1F_Layout_Blockdata:: @ 8320D38 - .incbin "data/layouts/Entrance_1F_Layout/map.bin" - - .align 2 -Entrance_1F_Layout:: @ 8320E70 - .4byte 13 - .4byte 12 - .4byte Entrance_1F_Layout_Border - .4byte Entrance_1F_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4E84 - .byte 2 - .byte 2 - .2byte 0 - -RocketHideout_Elevator_Layout_Border:: @ 8320E8C - .incbin "data/layouts/RocketHideout_Elevator_Layout/border.bin" - -RocketHideout_Elevator_Layout_Blockdata:: @ 8320E94 - .incbin "data/layouts/RocketHideout_Elevator_Layout/map.bin" - - .align 2 -RocketHideout_Elevator_Layout:: @ 8320EDC - .4byte 5 - .4byte 7 - .4byte RocketHideout_Elevator_Layout_Border - .4byte RocketHideout_Elevator_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4ECC - .byte 2 - .byte 2 - .2byte 0 - -SaffronCity_House1_1F_Layout_Border:: @ 8320EF8 - .incbin "data/layouts/SaffronCity_House1_1F_Layout/border.bin" - -SaffronCity_House1_1F_Layout_Blockdata:: @ 8320F00 - .incbin "data/layouts/SaffronCity_House1_1F_Layout/map.bin" - - .align 2 -SaffronCity_House1_1F_Layout:: @ 8321004 - .4byte 13 - .4byte 10 - .4byte SaffronCity_House1_1F_Layout_Border - .4byte SaffronCity_House1_1F_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4C74 - .byte 2 - .byte 2 - .2byte 0 - -SaffronCity_House1_2F_Layout_Border:: @ 8321020 - .incbin "data/layouts/SaffronCity_House1_2F_Layout/border.bin" - -SaffronCity_House1_2F_Layout_Blockdata:: @ 8321028 - .incbin "data/layouts/SaffronCity_House1_2F_Layout/map.bin" - - .align 2 -SaffronCity_House1_2F_Layout:: @ 8321100 - .4byte 12 - .4byte 9 - .4byte SaffronCity_House1_2F_Layout_Border - .4byte SaffronCity_House1_2F_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4C74 - .byte 2 - .byte 2 - .2byte 0 - -SaffronCity_Dojo_Layout_Border:: @ 832111C - .incbin "data/layouts/SaffronCity_Dojo_Layout/border.bin" - -SaffronCity_Dojo_Layout_Blockdata:: @ 8321124 - .incbin "data/layouts/SaffronCity_Dojo_Layout/map.bin" - - .align 2 -SaffronCity_Dojo_Layout:: @ 83212C4 - .4byte 13 - .4byte 16 - .4byte SaffronCity_Dojo_Layout_Border - .4byte SaffronCity_Dojo_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4D04 - .byte 2 - .byte 2 - .2byte 0 - -SilphCo_Elevator_Layout_Border:: @ 83212E0 - .incbin "data/layouts/SilphCo_Elevator_Layout/border.bin" - -SilphCo_Elevator_Layout_Blockdata:: @ 83212E8 - .incbin "data/layouts/SilphCo_Elevator_Layout/map.bin" - - .align 2 -SilphCo_Elevator_Layout:: @ 8321330 - .4byte 5 - .4byte 7 - .4byte SilphCo_Elevator_Layout_Border - .4byte SilphCo_Elevator_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4ECC - .byte 2 - .byte 2 - .2byte 0 - -OneIsland_Layout_Border:: @ 832134C - .incbin "data/layouts/OneIsland_Layout/border.bin" - -OneIsland_Layout_Blockdata:: @ 8321354 - .incbin "data/layouts/OneIsland_Layout/map.bin" - - .align 2 -OneIsland_Layout:: @ 8321714 - .4byte 24 - .4byte 20 - .4byte OneIsland_Layout_Border - .4byte OneIsland_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D504C - .byte 2 - .byte 2 - .2byte 0 - -TwoIsland_Layout_Border:: @ 8321730 - .incbin "data/layouts/TwoIsland_Layout/border.bin" - -TwoIsland_Layout_Blockdata:: @ 8321738 - .incbin "data/layouts/TwoIsland_Layout/map.bin" - - .align 2 -TwoIsland_Layout:: @ 8321EB8 - .4byte 48 - .4byte 20 - .4byte TwoIsland_Layout_Border - .4byte TwoIsland_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D504C - .byte 2 - .byte 2 - .2byte 0 - -ThreeIsland_Layout_Border:: @ 8321ED4 - .incbin "data/layouts/ThreeIsland_Layout/border.bin" - -ThreeIsland_Layout_Blockdata:: @ 8321EDC - .incbin "data/layouts/ThreeIsland_Layout/map.bin" - - .align 2 -ThreeIsland_Layout:: @ 832265C - .4byte 24 - .4byte 40 - .4byte ThreeIsland_Layout_Border - .4byte ThreeIsland_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D504C - .byte 2 - .byte 2 - .2byte 0 - -FourIsland_Layout_Border:: @ 8322678 - .incbin "data/layouts/FourIsland_Layout/border.bin" - -FourIsland_Layout_Blockdata:: @ 8322680 - .incbin "data/layouts/FourIsland_Layout/map.bin" - - .align 2 -FourIsland_Layout:: @ 8323580 - .4byte 48 - .4byte 40 - .4byte FourIsland_Layout_Border - .4byte FourIsland_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D5064 - .byte 2 - .byte 2 - .2byte 0 - -FiveIsland_Layout_Border:: @ 832359C - .incbin "data/layouts/FiveIsland_Layout/border.bin" - -FiveIsland_Layout_Blockdata:: @ 83235A4 - .incbin "data/layouts/FiveIsland_Layout/map.bin" - - .align 2 -FiveIsland_Layout:: @ 8323964 - .4byte 24 - .4byte 20 - .4byte FiveIsland_Layout_Border - .4byte FiveIsland_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D5064 - .byte 2 - .byte 2 - .2byte 0 - -SevenIsland_Layout_Border:: @ 8323980 - .incbin "data/layouts/SevenIsland_Layout/border.bin" - -SevenIsland_Layout_Blockdata:: @ 8323988 - .incbin "data/layouts/SevenIsland_Layout/map.bin" - - .align 2 -SevenIsland_Layout:: @ 8323D48 - .4byte 24 - .4byte 20 - .4byte SevenIsland_Layout_Border - .4byte SevenIsland_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D507C - .byte 2 - .byte 2 - .2byte 0 - -SixIsland_Layout_Border:: @ 8323D64 - .incbin "data/layouts/SixIsland_Layout/border.bin" - -SixIsland_Layout_Blockdata:: @ 8323D6C - .incbin "data/layouts/SixIsland_Layout/map.bin" - - .align 2 -SixIsland_Layout:: @ 832430C - .4byte 24 - .4byte 30 - .4byte SixIsland_Layout_Border - .4byte SixIsland_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D507C - .byte 2 - .byte 2 - .2byte 0 - -OneIsland_KindleRoad_Layout_Border:: @ 8324328 - .incbin "data/layouts/OneIsland_KindleRoad_Layout/border.bin" - -OneIsland_KindleRoad_Layout_Blockdata:: @ 8324330 - .incbin "data/layouts/OneIsland_KindleRoad_Layout/map.bin" - - .align 2 -OneIsland_KindleRoad_Layout:: @ 8325D70 - .4byte 24 - .4byte 140 - .4byte OneIsland_KindleRoad_Layout_Border - .4byte OneIsland_KindleRoad_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D504C - .byte 2 - .byte 2 - .2byte 0 - -OneIsland_TreasureBeach_Layout_Border:: @ 8325D8C - .incbin "data/layouts/OneIsland_TreasureBeach_Layout/border.bin" - -OneIsland_TreasureBeach_Layout_Blockdata:: @ 8325D94 - .incbin "data/layouts/OneIsland_TreasureBeach_Layout/map.bin" - - .align 2 -OneIsland_TreasureBeach_Layout:: @ 8326514 - .4byte 24 - .4byte 40 - .4byte OneIsland_TreasureBeach_Layout_Border - .4byte OneIsland_TreasureBeach_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D504C - .byte 2 - .byte 2 - .2byte 0 - -TwoIsland_CapeBrink_Layout_Border:: @ 8326530 - .incbin "data/layouts/TwoIsland_CapeBrink_Layout/border.bin" - -TwoIsland_CapeBrink_Layout_Blockdata:: @ 8326538 - .incbin "data/layouts/TwoIsland_CapeBrink_Layout/map.bin" - - .align 2 -TwoIsland_CapeBrink_Layout:: @ 8326CB8 - .4byte 24 - .4byte 40 - .4byte TwoIsland_CapeBrink_Layout_Border - .4byte TwoIsland_CapeBrink_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D504C - .byte 2 - .byte 2 - .2byte 0 - -ThreeIsland_BondBridge_Layout_Border:: @ 8326CD4 - .incbin "data/layouts/ThreeIsland_BondBridge_Layout/border.bin" - -ThreeIsland_BondBridge_Layout_Blockdata:: @ 8326CDC - .incbin "data/layouts/ThreeIsland_BondBridge_Layout/map.bin" - - .align 2 -ThreeIsland_BondBridge_Layout:: @ 8327BDC - .4byte 96 - .4byte 20 - .4byte ThreeIsland_BondBridge_Layout_Border - .4byte ThreeIsland_BondBridge_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D504C - .byte 2 - .byte 2 - .2byte 0 - -ThreeIsland_Port_Layout_Border:: @ 8327BF8 - .incbin "data/layouts/ThreeIsland_Port_Layout/border.bin" - -ThreeIsland_Port_Layout_Blockdata:: @ 8327C00 - .incbin "data/layouts/ThreeIsland_Port_Layout/map.bin" - - .align 2 -ThreeIsland_Port_Layout:: @ 8328380 - .4byte 48 - .4byte 20 - .4byte ThreeIsland_Port_Layout_Border - .4byte ThreeIsland_Port_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D504C - .byte 2 - .byte 2 - .2byte 0 - -UnknownMap_03_50_Layout_Border:: @ 832839C - .incbin "data/layouts/UnknownMap_03_50_Layout/border.bin" - -UnknownMap_03_50_Layout_Blockdata:: @ 83283A4 - .incbin "data/layouts/UnknownMap_03_50_Layout/map.bin" - - .align 2 -UnknownMap_03_50_Layout:: @ 83283A8 - .4byte 1 - .4byte 1 - .4byte UnknownMap_03_50_Layout_Border - .4byte UnknownMap_03_50_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D4B3C - .byte 2 - .byte 2 - .2byte 0 - -UnknownMap_03_51_Layout_Border:: @ 83283C4 - .incbin "data/layouts/UnknownMap_03_51_Layout/border.bin" - -UnknownMap_03_51_Layout_Blockdata:: @ 83283CC - .incbin "data/layouts/UnknownMap_03_51_Layout/map.bin" - - .align 2 -UnknownMap_03_51_Layout:: @ 83283D0 - .4byte 1 - .4byte 1 - .4byte UnknownMap_03_51_Layout_Border - .4byte UnknownMap_03_51_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D4B3C - .byte 2 - .byte 2 - .2byte 0 - -UnknownMap_03_52_Layout_Border:: @ 83283EC - .incbin "data/layouts/UnknownMap_03_52_Layout/border.bin" - -UnknownMap_03_52_Layout_Blockdata:: @ 83283F4 - .incbin "data/layouts/UnknownMap_03_52_Layout/map.bin" - - .align 2 -UnknownMap_03_52_Layout:: @ 8329114 - .4byte 84 - .4byte 20 - .4byte UnknownMap_03_52_Layout_Border - .4byte UnknownMap_03_52_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D4B3C - .byte 2 - .byte 2 - .2byte 0 - -UnknownMap_03_53_Layout_Border:: @ 8329130 - .incbin "data/layouts/UnknownMap_03_53_Layout/border.bin" - -UnknownMap_03_53_Layout_Blockdata:: @ 8329138 - .incbin "data/layouts/UnknownMap_03_53_Layout/map.bin" - - .align 2 -UnknownMap_03_53_Layout:: @ 8329C78 - .4byte 24 - .4byte 60 - .4byte UnknownMap_03_53_Layout_Border - .4byte UnknownMap_03_53_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D4B3C - .byte 2 - .byte 2 - .2byte 0 - -FiveIsland_ResortGorgeous_Layout_Border:: @ 8329C94 - .incbin "data/layouts/FiveIsland_ResortGorgeous_Layout/border.bin" - -FiveIsland_ResortGorgeous_Layout_Blockdata:: @ 8329C9C - .incbin "data/layouts/FiveIsland_ResortGorgeous_Layout/map.bin" - - .align 2 -FiveIsland_ResortGorgeous_Layout:: @ 832A7DC - .4byte 72 - .4byte 20 - .4byte FiveIsland_ResortGorgeous_Layout_Border - .4byte FiveIsland_ResortGorgeous_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D5064 - .byte 2 - .byte 2 - .2byte 0 - -FiveIsland_WaterLabyrinth_Layout_Border:: @ 832A7F8 - .incbin "data/layouts/FiveIsland_WaterLabyrinth_Layout/border.bin" - -FiveIsland_WaterLabyrinth_Layout_Blockdata:: @ 832A800 - .incbin "data/layouts/FiveIsland_WaterLabyrinth_Layout/map.bin" - - .align 2 -FiveIsland_WaterLabyrinth_Layout:: @ 832B340 - .4byte 72 - .4byte 20 - .4byte FiveIsland_WaterLabyrinth_Layout_Border - .4byte FiveIsland_WaterLabyrinth_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D5064 - .byte 2 - .byte 2 - .2byte 0 - -FiveIsland_Meadow_Layout_Border:: @ 832B35C - .incbin "data/layouts/FiveIsland_Meadow_Layout/border.bin" - -FiveIsland_Meadow_Layout_Blockdata:: @ 832B364 - .incbin "data/layouts/FiveIsland_Meadow_Layout/map.bin" - - .align 2 -FiveIsland_Meadow_Layout:: @ 832BAE4 - .4byte 24 - .4byte 40 - .4byte FiveIsland_Meadow_Layout_Border - .4byte FiveIsland_Meadow_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D5064 - .byte 2 - .byte 2 - .2byte 0 - -FiveIsland_MemorialPillar_Layout_Border:: @ 832BB00 - .incbin "data/layouts/FiveIsland_MemorialPillar_Layout/border.bin" - -FiveIsland_MemorialPillar_Layout_Blockdata:: @ 832BB08 - .incbin "data/layouts/FiveIsland_MemorialPillar_Layout/map.bin" - - .align 2 -FiveIsland_MemorialPillar_Layout:: @ 832C648 - .4byte 24 - .4byte 60 - .4byte FiveIsland_MemorialPillar_Layout_Border - .4byte FiveIsland_MemorialPillar_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D5064 - .byte 2 - .byte 2 - .2byte 0 - -SixIsland_OutcastIsland_Layout_Border:: @ 832C664 - .incbin "data/layouts/SixIsland_OutcastIsland_Layout/border.bin" - -SixIsland_OutcastIsland_Layout_Blockdata:: @ 832C66C - .incbin "data/layouts/SixIsland_OutcastIsland_Layout/map.bin" - - .align 2 -SixIsland_OutcastIsland_Layout:: @ 832D56C - .4byte 24 - .4byte 80 - .4byte SixIsland_OutcastIsland_Layout_Border - .4byte SixIsland_OutcastIsland_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D507C - .byte 2 - .byte 2 - .2byte 0 - -SixIsland_GreenPath_Layout_Border:: @ 832D588 - .incbin "data/layouts/SixIsland_GreenPath_Layout/border.bin" - -SixIsland_GreenPath_Layout_Blockdata:: @ 832D590 - .incbin "data/layouts/SixIsland_GreenPath_Layout/map.bin" - - .align 2 -SixIsland_GreenPath_Layout:: @ 832E0D0 - .4byte 72 - .4byte 20 - .4byte SixIsland_GreenPath_Layout_Border - .4byte SixIsland_GreenPath_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D507C - .byte 2 - .byte 2 - .2byte 0 - -SixIsland_WaterPath_Layout_Border:: @ 832E0EC - .incbin "data/layouts/SixIsland_WaterPath_Layout/border.bin" - -SixIsland_WaterPath_Layout_Blockdata:: @ 832E0F4 - .incbin "data/layouts/SixIsland_WaterPath_Layout/map.bin" - - .align 2 -SixIsland_WaterPath_Layout:: @ 832F3B4 - .4byte 24 - .4byte 100 - .4byte SixIsland_WaterPath_Layout_Border - .4byte SixIsland_WaterPath_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D507C - .byte 2 - .byte 2 - .2byte 0 - -SixIsland_RuinValley_Layout_Border:: @ 832F3D0 - .incbin "data/layouts/SixIsland_RuinValley_Layout/border.bin" - -SixIsland_RuinValley_Layout_Blockdata:: @ 832F3D8 - .incbin "data/layouts/SixIsland_RuinValley_Layout/map.bin" - - .align 2 -SixIsland_RuinValley_Layout:: @ 83302D8 - .4byte 48 - .4byte 40 - .4byte SixIsland_RuinValley_Layout_Border - .4byte SixIsland_RuinValley_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D507C - .byte 2 - .byte 2 - .2byte 0 - -SevenIsland_TrainerTower_Layout_Border:: @ 83302F4 - .incbin "data/layouts/SevenIsland_TrainerTower_Layout/border.bin" - -SevenIsland_TrainerTower_Layout_Blockdata:: @ 83302FC - .incbin "data/layouts/SevenIsland_TrainerTower_Layout/map.bin" - - .align 2 -SevenIsland_TrainerTower_Layout:: @ 833287C - .4byte 120 - .4byte 40 - .4byte SevenIsland_TrainerTower_Layout_Border - .4byte SevenIsland_TrainerTower_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D507C - .byte 2 - .byte 2 - .2byte 0 - -SevenIsland_SevaultCanyon_Entrance_Layout_Border:: @ 8332898 - .incbin "data/layouts/SevenIsland_SevaultCanyon_Entrance_Layout/border.bin" - -SevenIsland_SevaultCanyon_Entrance_Layout_Blockdata:: @ 83328A0 - .incbin "data/layouts/SevenIsland_SevaultCanyon_Entrance_Layout/map.bin" - - .align 2 -SevenIsland_SevaultCanyon_Entrance_Layout:: @ 8333020 - .4byte 24 - .4byte 40 - .4byte SevenIsland_SevaultCanyon_Entrance_Layout_Border - .4byte SevenIsland_SevaultCanyon_Entrance_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D507C - .byte 2 - .byte 2 - .2byte 0 - -SevenIsland_SevaultCanyon_Layout_Border:: @ 833303C - .incbin "data/layouts/SevenIsland_SevaultCanyon_Layout/border.bin" - -SevenIsland_SevaultCanyon_Layout_Blockdata:: @ 8333044 - .incbin "data/layouts/SevenIsland_SevaultCanyon_Layout/map.bin" - - .align 2 -SevenIsland_SevaultCanyon_Layout:: @ 8333F44 - .4byte 24 - .4byte 80 - .4byte SevenIsland_SevaultCanyon_Layout_Border - .4byte SevenIsland_SevaultCanyon_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D507C - .byte 2 - .byte 2 - .2byte 0 - -SevenIsland_TanobyRuins_Layout_Border:: @ 8333F60 - .incbin "data/layouts/SevenIsland_TanobyRuins_Layout/border.bin" - -SevenIsland_TanobyRuins_Layout_Blockdata:: @ 8333F68 - .incbin "data/layouts/SevenIsland_TanobyRuins_Layout/map.bin" - - .align 2 -SevenIsland_TanobyRuins_Layout:: @ 83355E8 - .4byte 144 - .4byte 20 - .4byte SevenIsland_TanobyRuins_Layout_Border - .4byte SevenIsland_TanobyRuins_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D507C - .byte 2 - .byte 2 - .2byte 0 - -UnusedLayout_833614C_Layout_Border:: @ 8335604 - .incbin "data/layouts/UnusedLayout_833614C_Layout/border.bin" - -UnusedLayout_833614C_Layout_Blockdata:: @ 833560C - .incbin "data/layouts/UnusedLayout_833614C_Layout/map.bin" - - .align 2 -UnusedLayout_833614C_Layout:: @ 833614C - .4byte 24 - .4byte 60 - .4byte UnusedLayout_833614C_Layout_Border - .4byte UnusedLayout_833614C_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D4AAC - .byte 2 - .byte 2 - .2byte 0 - -UnusedLayout_83377F0_Layout_Border:: @ 8336168 - .incbin "data/layouts/UnusedLayout_83377F0_Layout/border.bin" - -UnusedLayout_83377F0_Layout_Blockdata:: @ 8336170 - .incbin "data/layouts/UnusedLayout_83377F0_Layout/map.bin" - - .align 2 -UnusedLayout_83377F0_Layout:: @ 83377F0 - .4byte 144 - .4byte 20 - .4byte UnusedLayout_83377F0_Layout_Border - .4byte UnusedLayout_83377F0_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D4AAC - .byte 2 - .byte 2 - .2byte 0 - -UnusedLayout_8338354_Layout_Border:: @ 833780C - .incbin "data/layouts/UnusedLayout_8338354_Layout/border.bin" - -UnusedLayout_8338354_Layout_Blockdata:: @ 8337814 - .incbin "data/layouts/UnusedLayout_8338354_Layout/map.bin" - - .align 2 -UnusedLayout_8338354_Layout:: @ 8338354 - .4byte 24 - .4byte 60 - .4byte UnusedLayout_8338354_Layout_Border - .4byte UnusedLayout_8338354_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D4AAC - .byte 2 - .byte 2 - .2byte 0 - -UnusedLayout_8338738_Layout_Border:: @ 8338370 - .incbin "data/layouts/UnusedLayout_8338738_Layout/border.bin" - -UnusedLayout_8338738_Layout_Blockdata:: @ 8338378 - .incbin "data/layouts/UnusedLayout_8338738_Layout/map.bin" - - .align 2 -UnusedLayout_8338738_Layout:: @ 8338738 - .4byte 24 - .4byte 20 - .4byte UnusedLayout_8338738_Layout_Border - .4byte UnusedLayout_8338738_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D4AAC - .byte 2 - .byte 2 - .2byte 0 - -UnknownMap_00_04_Layout_Border:: @ 8338754 - .incbin "data/layouts/UnknownMap_00_04_Layout/border.bin" - -UnknownMap_00_04_Layout_Blockdata:: @ 833875C - .incbin "data/layouts/UnknownMap_00_04_Layout/map.bin" - - .align 2 -UnknownMap_00_04_Layout:: @ 83388C4 - .4byte 15 - .4byte 12 - .4byte UnknownMap_00_04_Layout_Border - .4byte UnknownMap_00_04_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D50DC - .byte 2 - .byte 2 - .2byte 0 - -SaffronCity_PokemonTrainerFanClub_Layout_Border:: @ 83388E0 - .incbin "data/layouts/SaffronCity_PokemonTrainerFanClub_Layout/border.bin" - -SaffronCity_PokemonTrainerFanClub_Layout_Blockdata:: @ 83388E8 - .incbin "data/layouts/SaffronCity_PokemonTrainerFanClub_Layout/map.bin" - - .align 2 -SaffronCity_PokemonTrainerFanClub_Layout:: @ 8338A60 - .4byte 11 - .4byte 17 - .4byte SaffronCity_PokemonTrainerFanClub_Layout_Border - .4byte SaffronCity_PokemonTrainerFanClub_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4F74 - .byte 2 - .byte 2 - .2byte 0 - -UnusedLayout_8338B4C_Layout_Border:: @ 8338A7C - .incbin "data/layouts/UnusedLayout_8338B4C_Layout/border.bin" - -UnusedLayout_8338B4C_Layout_Blockdata:: @ 8338A84 - .incbin "data/layouts/UnusedLayout_8338B4C_Layout/map.bin" - - .align 2 -UnusedLayout_8338B4C_Layout:: @ 8338B4C - .4byte 11 - .4byte 9 - .4byte UnusedLayout_8338B4C_Layout_Border - .4byte UnusedLayout_8338B4C_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4E84 - .byte 2 - .byte 2 - .2byte 0 - -SevenIsland_House_Room2_Layout_Border:: @ 8338B68 - .incbin "data/layouts/SevenIsland_House_Room2_Layout/border.bin" - -SevenIsland_House_Room2_Layout_Blockdata:: @ 8338B70 - .incbin "data/layouts/SevenIsland_House_Room2_Layout/map.bin" - - .align 2 -SevenIsland_House_Room2_Layout:: @ 8338C48 - .4byte 12 - .4byte 9 - .4byte SevenIsland_House_Room2_Layout_Border - .4byte SevenIsland_House_Room2_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4E84 - .byte 2 - .byte 2 - .2byte 0 - -ViridianCity_House2_Layout_Border:: @ 8338C64 - .incbin "data/layouts/ViridianCity_House2_Layout/border.bin" - -ViridianCity_House2_Layout_Blockdata:: @ 8338C6C - .incbin "data/layouts/ViridianCity_House2_Layout/map.bin" - - .align 2 -ViridianCity_House2_Layout:: @ 8338D20 - .4byte 10 - .4byte 9 - .4byte ViridianCity_House2_Layout_Border - .4byte ViridianCity_House2_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4F5C - .byte 2 - .byte 2 - .2byte 0 - -UnusedLayout_8338E90_Layout_Border:: @ 8338D3C - .incbin "data/layouts/UnusedLayout_8338E90_Layout/border.bin" - -UnusedLayout_8338E90_Layout_Blockdata:: @ 8338D44 - .incbin "data/layouts/UnusedLayout_8338E90_Layout/map.bin" - - .align 2 -UnusedLayout_8338E90_Layout:: @ 8338E90 - .4byte 15 - .4byte 11 - .4byte UnusedLayout_8338E90_Layout_Border - .4byte UnusedLayout_8338E90_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4F44 - .byte 2 - .byte 2 - .2byte 0 - -UnusedLayout_833902C_Layout_Border:: @ 8338EAC - .incbin "data/layouts/UnusedLayout_833902C_Layout/border.bin" - -UnusedLayout_833902C_Layout_Blockdata:: @ 8338EB4 - .incbin "data/layouts/UnusedLayout_833902C_Layout/map.bin" - - .align 2 -UnusedLayout_833902C_Layout:: @ 833902C - .4byte 17 - .4byte 11 - .4byte UnusedLayout_833902C_Layout_Border - .4byte UnusedLayout_833902C_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4F44 - .byte 2 - .byte 2 - .2byte 0 - -MtEmber_RubyPath_B4F_Layout_Border:: @ 8339048 - .incbin "data/layouts/MtEmber_RubyPath_B4F_Layout/border.bin" - -MtEmber_RubyPath_B4F_Layout_Blockdata:: @ 8339050 - .incbin "data/layouts/MtEmber_RubyPath_B4F_Layout/map.bin" - - .align 2 -MtEmber_RubyPath_B4F_Layout:: @ 8339290 - .4byte 18 - .4byte 16 - .4byte MtEmber_RubyPath_B4F_Layout_Border - .4byte MtEmber_RubyPath_B4F_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D4FEC - .byte 2 - .byte 2 - .2byte 0 - -ThreeIsland_BerryForest_Layout_Border:: @ 83392AC - .incbin "data/layouts/ThreeIsland_BerryForest_Layout/border.bin" - -ThreeIsland_BerryForest_Layout_Blockdata:: @ 83392B8 - .incbin "data/layouts/ThreeIsland_BerryForest_Layout/map.bin" - - .align 2 -ThreeIsland_BerryForest_Layout:: @ 833A7A8 - .4byte 57 - .4byte 47 - .4byte ThreeIsland_BerryForest_Layout_Border - .4byte ThreeIsland_BerryForest_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D5004 - .byte 3 - .byte 2 - .2byte 0 - -OneIsland_PokemonCenter_1F_Layout_Border:: @ 833A7C4 - .incbin "data/layouts/OneIsland_PokemonCenter_1F_Layout/border.bin" - -OneIsland_PokemonCenter_1F_Layout_Blockdata:: @ 833A7CC - .incbin "data/layouts/OneIsland_PokemonCenter_1F_Layout/map.bin" - - .align 2 -OneIsland_PokemonCenter_1F_Layout:: @ 833A970 - .4byte 19 - .4byte 11 - .4byte OneIsland_PokemonCenter_1F_Layout_Border - .4byte OneIsland_PokemonCenter_1F_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4BE4 - .byte 2 - .byte 2 - .2byte 0 - -TwoIsland_JoyfulGameCorner_Layout_Border:: @ 833A98C - .incbin "data/layouts/TwoIsland_JoyfulGameCorner_Layout/border.bin" - -TwoIsland_JoyfulGameCorner_Layout_Blockdata:: @ 833A994 - .incbin "data/layouts/TwoIsland_JoyfulGameCorner_Layout/map.bin" - - .align 2 -TwoIsland_JoyfulGameCorner_Layout:: @ 833AA84 - .4byte 12 - .4byte 10 - .4byte TwoIsland_JoyfulGameCorner_Layout_Border - .4byte TwoIsland_JoyfulGameCorner_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4CEC - .byte 2 - .byte 2 - .2byte 0 - -VermilionCity_PokemonFanClub_Layout_Border:: @ 833AAA0 - .incbin "data/layouts/VermilionCity_PokemonFanClub_Layout/border.bin" - -VermilionCity_PokemonFanClub_Layout_Blockdata:: @ 833AAA8 - .incbin "data/layouts/VermilionCity_PokemonFanClub_Layout/map.bin" - - .align 2 -VermilionCity_PokemonFanClub_Layout:: @ 833ABC8 - .4byte 12 - .4byte 12 - .4byte VermilionCity_PokemonFanClub_Layout_Border - .4byte VermilionCity_PokemonFanClub_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4F74 - .byte 2 - .byte 2 - .2byte 0 - -LavenderTown_VolunteerPokemonHouse_Layout_Border:: @ 833ABE4 - .incbin "data/layouts/LavenderTown_VolunteerPokemonHouse_Layout/border.bin" - -LavenderTown_VolunteerPokemonHouse_Layout_Blockdata:: @ 833ABEC - .incbin "data/layouts/LavenderTown_VolunteerPokemonHouse_Layout/map.bin" - - .align 2 -LavenderTown_VolunteerPokemonHouse_Layout:: @ 833ACC4 - .4byte 12 - .4byte 9 - .4byte LavenderTown_VolunteerPokemonHouse_Layout_Border - .4byte LavenderTown_VolunteerPokemonHouse_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4F74 - .byte 2 - .byte 2 - .2byte 0 - -Route5_PokemonDayCare_Layout_Border:: @ 833ACE0 - .incbin "data/layouts/Route5_PokemonDayCare_Layout/border.bin" - -Route5_PokemonDayCare_Layout_Blockdata:: @ 833ACE8 - .incbin "data/layouts/Route5_PokemonDayCare_Layout/map.bin" - - .align 2 -Route5_PokemonDayCare_Layout:: @ 833ADC0 - .4byte 12 - .4byte 9 - .4byte Route5_PokemonDayCare_Layout_Border - .4byte Route5_PokemonDayCare_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4F74 - .byte 2 - .byte 2 - .2byte 0 - -ViridianCity_House1_Layout_Border:: @ 833ADDC - .incbin "data/layouts/ViridianCity_House1_Layout/border.bin" - -ViridianCity_House1_Layout_Blockdata:: @ 833ADE4 - .incbin "data/layouts/ViridianCity_House1_Layout/map.bin" - - .align 2 -ViridianCity_House1_Layout:: @ 833AEAC - .4byte 11 - .4byte 9 - .4byte ViridianCity_House1_Layout_Border - .4byte ViridianCity_House1_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4E84 - .byte 2 - .byte 2 - .2byte 0 - -FourIsland_PokemonDayCare_Layout_Border:: @ 833AEC8 - .incbin "data/layouts/FourIsland_PokemonDayCare_Layout/border.bin" - -FourIsland_PokemonDayCare_Layout_Blockdata:: @ 833AED0 - .incbin "data/layouts/FourIsland_PokemonDayCare_Layout/map.bin" - - .align 2 -FourIsland_PokemonDayCare_Layout:: @ 833AFA8 - .4byte 12 - .4byte 9 - .4byte FourIsland_PokemonDayCare_Layout_Border - .4byte FourIsland_PokemonDayCare_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4F74 - .byte 2 - .byte 2 - .2byte 0 - -UnusedLayout_833B6EC_Layout_Border:: @ 833AFC4 - .incbin "data/layouts/UnusedLayout_833B6EC_Layout/border.bin" - -UnusedLayout_833B6EC_Layout_Blockdata:: @ 833AFCC - .incbin "data/layouts/UnusedLayout_833B6EC_Layout/map.bin" - - .align 2 -UnusedLayout_833B6EC_Layout:: @ 833B6EC - .4byte 38 - .4byte 24 - .4byte UnusedLayout_833B6EC_Layout_Border - .4byte UnusedLayout_833B6EC_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D4E24 - .byte 2 - .byte 2 - .2byte 0 - -UnusedLayout_833BE30_Layout_Border:: @ 833B708 - .incbin "data/layouts/UnusedLayout_833BE30_Layout/border.bin" - -UnusedLayout_833BE30_Layout_Blockdata:: @ 833B710 - .incbin "data/layouts/UnusedLayout_833BE30_Layout/map.bin" - - .align 2 -UnusedLayout_833BE30_Layout:: @ 833BE30 - .4byte 38 - .4byte 24 - .4byte UnusedLayout_833BE30_Layout_Border - .4byte UnusedLayout_833BE30_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D4E24 - .byte 2 - .byte 2 - .2byte 0 - -MtEmber_Exterior_Layout_Border:: @ 833BE4C - .incbin "data/layouts/MtEmber_Exterior_Layout/border.bin" - -MtEmber_Exterior_Layout_Blockdata:: @ 833BE54 - .incbin "data/layouts/MtEmber_Exterior_Layout/map.bin" - - .align 2 -MtEmber_Exterior_Layout:: @ 833D660 - .4byte 57 - .4byte 54 - .4byte MtEmber_Exterior_Layout_Border - .4byte MtEmber_Exterior_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D504C - .byte 2 - .byte 2 - .2byte 0 - -MtEmber_Summit_Layout_Border:: @ 833D67C - .incbin "data/layouts/MtEmber_Summit_Layout/border.bin" - -MtEmber_Summit_Layout_Blockdata:: @ 833D684 - .incbin "data/layouts/MtEmber_Summit_Layout/map.bin" - - .align 2 -MtEmber_Summit_Layout:: @ 833D9C8 - .4byte 19 - .4byte 22 - .4byte MtEmber_Summit_Layout_Border - .4byte MtEmber_Summit_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D504C - .byte 2 - .byte 2 - .2byte 0 - -MtEmber_SummitPath_1F_Layout_Border:: @ 833D9E4 - .incbin "data/layouts/MtEmber_SummitPath_1F_Layout/border.bin" - -MtEmber_SummitPath_1F_Layout_Blockdata:: @ 833D9EC - .incbin "data/layouts/MtEmber_SummitPath_1F_Layout/map.bin" - - .align 2 -MtEmber_SummitPath_1F_Layout:: @ 833DC08 - .4byte 15 - .4byte 18 - .4byte MtEmber_SummitPath_1F_Layout_Border - .4byte MtEmber_SummitPath_1F_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D4FEC - .byte 2 - .byte 2 - .2byte 0 - -MtEmber_SummitPath_2F_Layout_Border:: @ 833DC24 - .incbin "data/layouts/MtEmber_SummitPath_2F_Layout/border.bin" - -MtEmber_SummitPath_2F_Layout_Blockdata:: @ 833DC2C - .incbin "data/layouts/MtEmber_SummitPath_2F_Layout/map.bin" - - .align 2 -MtEmber_SummitPath_2F_Layout:: @ 833ED6C - .4byte 48 - .4byte 46 - .4byte MtEmber_SummitPath_2F_Layout_Border - .4byte MtEmber_SummitPath_2F_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D4FEC - .byte 2 - .byte 2 - .2byte 0 - -MtEmber_SummitPath_3F_Layout_Border:: @ 833ED88 - .incbin "data/layouts/MtEmber_SummitPath_3F_Layout/border.bin" - -MtEmber_SummitPath_3F_Layout_Blockdata:: @ 833ED90 - .incbin "data/layouts/MtEmber_SummitPath_3F_Layout/map.bin" - - .align 2 -MtEmber_SummitPath_3F_Layout:: @ 833EEDC - .4byte 15 - .4byte 11 - .4byte MtEmber_SummitPath_3F_Layout_Border - .4byte MtEmber_SummitPath_3F_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D4FEC - .byte 2 - .byte 2 - .2byte 0 - -SSAnne_Kitchen3_Layout_Border:: @ 833EEF8 - .incbin "data/layouts/SSAnne_Kitchen3_Layout/border.bin" - -SSAnne_Kitchen3_Layout_Blockdata:: @ 833EF00 - .incbin "data/layouts/SSAnne_Kitchen3_Layout/map.bin" - - .align 2 -SSAnne_Kitchen3_Layout:: @ 833F304 - .4byte 27 - .4byte 19 - .4byte SSAnne_Kitchen3_Layout_Border - .4byte SSAnne_Kitchen3_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D4FEC - .byte 2 - .byte 2 - .2byte 0 - -MtEmber_RubyPath_B1F_Layout_Border:: @ 833F320 - .incbin "data/layouts/MtEmber_RubyPath_B1F_Layout/border.bin" - -MtEmber_RubyPath_B1F_Layout_Blockdata:: @ 833F328 - .incbin "data/layouts/MtEmber_RubyPath_B1F_Layout/map.bin" - - .align 2 -MtEmber_RubyPath_B1F_Layout:: @ 833F524 - .4byte 11 - .4byte 23 - .4byte MtEmber_RubyPath_B1F_Layout_Border - .4byte MtEmber_RubyPath_B1F_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D4FEC - .byte 2 - .byte 2 - .2byte 0 - -MtEmber_RubyPath_B2F_Layout_Border:: @ 833F540 - .incbin "data/layouts/MtEmber_RubyPath_B2F_Layout/border.bin" - -MtEmber_RubyPath_B2F_Layout_Blockdata:: @ 833F548 - .incbin "data/layouts/MtEmber_RubyPath_B2F_Layout/map.bin" - - .align 2 -MtEmber_RubyPath_B2F_Layout:: @ 833F6A8 - .4byte 16 - .4byte 11 - .4byte MtEmber_RubyPath_B2F_Layout_Border - .4byte MtEmber_RubyPath_B2F_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D4FEC - .byte 2 - .byte 2 - .2byte 0 - -MtEmber_RubyPath_B3F_Layout_Border:: @ 833F6C4 - .incbin "data/layouts/MtEmber_RubyPath_B3F_Layout/border.bin" - -MtEmber_RubyPath_B3F_Layout_Blockdata:: @ 833F6CC - .incbin "data/layouts/MtEmber_RubyPath_B3F_Layout/map.bin" - - .align 2 -MtEmber_RubyPath_B3F_Layout:: @ 833FC60 - .4byte 31 - .4byte 23 - .4byte MtEmber_RubyPath_B3F_Layout_Border - .4byte MtEmber_RubyPath_B3F_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D4FEC - .byte 2 - .byte 2 - .2byte 0 - -MtEmber_RubyPath_B1F_Stairs_Layout_Border:: @ 833FC7C - .incbin "data/layouts/MtEmber_RubyPath_B1F_Stairs_Layout/border.bin" - -MtEmber_RubyPath_B1F_Stairs_Layout_Blockdata:: @ 833FC84 - .incbin "data/layouts/MtEmber_RubyPath_B1F_Stairs_Layout/map.bin" - - .align 2 -MtEmber_RubyPath_B1F_Stairs_Layout:: @ 833FCD8 - .4byte 6 - .4byte 7 - .4byte MtEmber_RubyPath_B1F_Stairs_Layout_Border - .4byte MtEmber_RubyPath_B1F_Stairs_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D4FEC - .byte 2 - .byte 2 - .2byte 0 - -MtEmber_RubyPath_B2F_Stairs_Layout_Border:: @ 833FCF4 - .incbin "data/layouts/MtEmber_RubyPath_B2F_Stairs_Layout/border.bin" - -MtEmber_RubyPath_B2F_Stairs_Layout_Blockdata:: @ 833FCFC - .incbin "data/layouts/MtEmber_RubyPath_B2F_Stairs_Layout/map.bin" - - .align 2 -MtEmber_RubyPath_B2F_Stairs_Layout:: @ 833FD5C - .4byte 8 - .4byte 6 - .4byte MtEmber_RubyPath_B2F_Stairs_Layout_Border - .4byte MtEmber_RubyPath_B2F_Stairs_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D4FEC - .byte 2 - .byte 2 - .2byte 0 - -MtEmber_RubyPath_B5F_Layout_Border:: @ 833FD78 - .incbin "data/layouts/MtEmber_RubyPath_B5F_Layout/border.bin" - -MtEmber_RubyPath_B5F_Layout_Blockdata:: @ 833FD80 - .incbin "data/layouts/MtEmber_RubyPath_B5F_Layout/map.bin" - - .align 2 -MtEmber_RubyPath_B5F_Layout:: @ 833FF60 - .4byte 16 - .4byte 15 - .4byte MtEmber_RubyPath_B5F_Layout_Border - .4byte MtEmber_RubyPath_B5F_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D4FEC - .byte 2 - .byte 2 - .2byte 0 - -SSAnne_CaptainsOffice4_Layout_Border:: @ 833FF7C - .incbin "data/layouts/SSAnne_CaptainsOffice4_Layout/border.bin" - -SSAnne_CaptainsOffice4_Layout_Blockdata:: @ 833FF84 - .incbin "data/layouts/SSAnne_CaptainsOffice4_Layout/map.bin" - - .align 2 -SSAnne_CaptainsOffice4_Layout:: @ 83405A4 - .4byte 29 - .4byte 27 - .4byte SSAnne_CaptainsOffice4_Layout_Border - .4byte SSAnne_CaptainsOffice4_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4ECC - .byte 2 - .byte 2 - .2byte 0 - -FourIsland_IcefallCave_Entrance_Layout_Border:: @ 83405C0 - .incbin "data/layouts/FourIsland_IcefallCave_Entrance_Layout/border.bin" - -FourIsland_IcefallCave_Entrance_Layout_Blockdata:: @ 83405C8 - .incbin "data/layouts/FourIsland_IcefallCave_Entrance_Layout/map.bin" - - .align 2 -FourIsland_IcefallCave_Entrance_Layout:: @ 8340E38 - .4byte 30 - .4byte 36 - .4byte FourIsland_IcefallCave_Entrance_Layout_Border - .4byte FourIsland_IcefallCave_Entrance_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D4E24 - .byte 2 - .byte 2 - .2byte 0 - -FourIsland_IcefallCave_1F_Layout_Border:: @ 8340E54 - .incbin "data/layouts/FourIsland_IcefallCave_1F_Layout/border.bin" - -FourIsland_IcefallCave_1F_Layout_Blockdata:: @ 8340E5C - .incbin "data/layouts/FourIsland_IcefallCave_1F_Layout/map.bin" - - .align 2 -FourIsland_IcefallCave_1F_Layout:: @ 834117C - .4byte 20 - .4byte 20 - .4byte FourIsland_IcefallCave_1F_Layout_Border - .4byte FourIsland_IcefallCave_1F_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D4E24 - .byte 2 - .byte 2 - .2byte 0 - -SSAnne_CaptainsOffice2_Layout_Border:: @ 8341198 - .incbin "data/layouts/SSAnne_CaptainsOffice2_Layout/border.bin" - -SSAnne_CaptainsOffice2_Layout_Blockdata:: @ 83411A0 - .incbin "data/layouts/SSAnne_CaptainsOffice2_Layout/map.bin" - - .align 2 -SSAnne_CaptainsOffice2_Layout:: @ 8341560 - .4byte 24 - .4byte 20 - .4byte SSAnne_CaptainsOffice2_Layout_Border - .4byte SSAnne_CaptainsOffice2_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D4E24 - .byte 2 - .byte 2 - .2byte 0 - -SSAnne_CaptainsOffice3_Layout_Border:: @ 834157C - .incbin "data/layouts/SSAnne_CaptainsOffice3_Layout/border.bin" - -SSAnne_CaptainsOffice3_Layout_Blockdata:: @ 8341584 - .incbin "data/layouts/SSAnne_CaptainsOffice3_Layout/map.bin" - - .align 2 -SSAnne_CaptainsOffice3_Layout:: @ 8341A98 - .4byte 25 - .4byte 26 - .4byte SSAnne_CaptainsOffice3_Layout_Border - .4byte SSAnne_CaptainsOffice3_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D4E24 - .byte 2 - .byte 2 - .2byte 0 - -SevenIsland_TrainerTower_Lobby_Layout_Border:: @ 8341AB4 - .incbin "data/layouts/SevenIsland_TrainerTower_Lobby_Layout/border.bin" - -SevenIsland_TrainerTower_Lobby_Layout_Blockdata:: @ 8341ABC - .incbin "data/layouts/SevenIsland_TrainerTower_Lobby_Layout/map.bin" - - .align 2 -SevenIsland_TrainerTower_Lobby_Layout:: @ 8341D44 - .4byte 19 - .4byte 17 - .4byte SevenIsland_TrainerTower_Lobby_Layout_Border - .4byte SevenIsland_TrainerTower_Lobby_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D5094 - .byte 2 - .byte 2 - .2byte 0 - -SevenIsland_TrainerTower_1F_Layout_Border:: @ 8341D60 - .incbin "data/layouts/SevenIsland_TrainerTower_1F_Layout/border.bin" - -SevenIsland_TrainerTower_1F_Layout_Blockdata:: @ 8341D68 - .incbin "data/layouts/SevenIsland_TrainerTower_1F_Layout/map.bin" - - .align 2 -SevenIsland_TrainerTower_1F_Layout:: @ 8341FCC - .4byte 18 - .4byte 17 - .4byte SevenIsland_TrainerTower_1F_Layout_Border - .4byte SevenIsland_TrainerTower_1F_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D5094 - .byte 2 - .byte 2 - .2byte 0 - -SevenIsland_TrainerTower_2F_Layout_Border:: @ 8341FE8 - .incbin "data/layouts/SevenIsland_TrainerTower_2F_Layout/border.bin" - -SevenIsland_TrainerTower_2F_Layout_Blockdata:: @ 8341FF0 - .incbin "data/layouts/SevenIsland_TrainerTower_2F_Layout/map.bin" - - .align 2 -SevenIsland_TrainerTower_2F_Layout:: @ 8342254 - .4byte 18 - .4byte 17 - .4byte SevenIsland_TrainerTower_2F_Layout_Border - .4byte SevenIsland_TrainerTower_2F_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D5094 - .byte 2 - .byte 2 - .2byte 0 - -SevenIsland_TrainerTower_3F_Layout_Border:: @ 8342270 - .incbin "data/layouts/SevenIsland_TrainerTower_3F_Layout/border.bin" - -SevenIsland_TrainerTower_3F_Layout_Blockdata:: @ 8342278 - .incbin "data/layouts/SevenIsland_TrainerTower_3F_Layout/map.bin" - - .align 2 -SevenIsland_TrainerTower_3F_Layout:: @ 83424DC - .4byte 18 - .4byte 17 - .4byte SevenIsland_TrainerTower_3F_Layout_Border - .4byte SevenIsland_TrainerTower_3F_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D5094 - .byte 2 - .byte 2 - .2byte 0 - -SevenIsland_TrainerTower_4F_Layout_Border:: @ 83424F8 - .incbin "data/layouts/SevenIsland_TrainerTower_4F_Layout/border.bin" - -SevenIsland_TrainerTower_4F_Layout_Blockdata:: @ 8342500 - .incbin "data/layouts/SevenIsland_TrainerTower_4F_Layout/map.bin" - - .align 2 -SevenIsland_TrainerTower_4F_Layout:: @ 8342764 - .4byte 18 - .4byte 17 - .4byte SevenIsland_TrainerTower_4F_Layout_Border - .4byte SevenIsland_TrainerTower_4F_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D5094 - .byte 2 - .byte 2 - .2byte 0 - -SevenIsland_TrainerTower_5F_Layout_Border:: @ 8342780 - .incbin "data/layouts/SevenIsland_TrainerTower_5F_Layout/border.bin" - -SevenIsland_TrainerTower_5F_Layout_Blockdata:: @ 8342788 - .incbin "data/layouts/SevenIsland_TrainerTower_5F_Layout/map.bin" - - .align 2 -SevenIsland_TrainerTower_5F_Layout:: @ 83429EC - .4byte 18 - .4byte 17 - .4byte SevenIsland_TrainerTower_5F_Layout_Border - .4byte SevenIsland_TrainerTower_5F_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D5094 - .byte 2 - .byte 2 - .2byte 0 - -SevenIsland_TrainerTower_6F_Layout_Border:: @ 8342A08 - .incbin "data/layouts/SevenIsland_TrainerTower_6F_Layout/border.bin" - -SevenIsland_TrainerTower_6F_Layout_Blockdata:: @ 8342A10 - .incbin "data/layouts/SevenIsland_TrainerTower_6F_Layout/map.bin" - - .align 2 -SevenIsland_TrainerTower_6F_Layout:: @ 8342C74 - .4byte 18 - .4byte 17 - .4byte SevenIsland_TrainerTower_6F_Layout_Border - .4byte SevenIsland_TrainerTower_6F_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D5094 - .byte 2 - .byte 2 - .2byte 0 - -SevenIsland_TrainerTower_7F_Layout_Border:: @ 8342C90 - .incbin "data/layouts/SevenIsland_TrainerTower_7F_Layout/border.bin" - -SevenIsland_TrainerTower_7F_Layout_Blockdata:: @ 8342C98 - .incbin "data/layouts/SevenIsland_TrainerTower_7F_Layout/map.bin" - - .align 2 -SevenIsland_TrainerTower_7F_Layout:: @ 8342EFC - .4byte 18 - .4byte 17 - .4byte SevenIsland_TrainerTower_7F_Layout_Border - .4byte SevenIsland_TrainerTower_7F_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D5094 - .byte 2 - .byte 2 - .2byte 0 - -SevenIsland_TrainerTower_8F_Layout_Border:: @ 8342F18 - .incbin "data/layouts/SevenIsland_TrainerTower_8F_Layout/border.bin" - -SevenIsland_TrainerTower_8F_Layout_Blockdata:: @ 8342F20 - .incbin "data/layouts/SevenIsland_TrainerTower_8F_Layout/map.bin" - - .align 2 -SevenIsland_TrainerTower_8F_Layout:: @ 8343184 - .4byte 18 - .4byte 17 - .4byte SevenIsland_TrainerTower_8F_Layout_Border - .4byte SevenIsland_TrainerTower_8F_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D5094 - .byte 2 - .byte 2 - .2byte 0 - -SevenIsland_TrainerTower_Roof_Layout_Border:: @ 83431A0 - .incbin "data/layouts/SevenIsland_TrainerTower_Roof_Layout/border.bin" - -SevenIsland_TrainerTower_Roof_Layout_Blockdata:: @ 83431A8 - .incbin "data/layouts/SevenIsland_TrainerTower_Roof_Layout/map.bin" - - .align 2 -SevenIsland_TrainerTower_Roof_Layout:: @ 83433E8 - .4byte 18 - .4byte 16 - .4byte SevenIsland_TrainerTower_Roof_Layout_Border - .4byte SevenIsland_TrainerTower_Roof_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D5094 - .byte 2 - .byte 2 - .2byte 0 - -SevenIsland_TrainerTower_Elevator_Layout_Border:: @ 8343404 - .incbin "data/layouts/SevenIsland_TrainerTower_Elevator_Layout/border.bin" - -SevenIsland_TrainerTower_Elevator_Layout_Blockdata:: @ 834340C - .incbin "data/layouts/SevenIsland_TrainerTower_Elevator_Layout/map.bin" - - .align 2 -SevenIsland_TrainerTower_Elevator_Layout:: @ 8343454 - .4byte 5 - .4byte 7 - .4byte SevenIsland_TrainerTower_Elevator_Layout_Border - .4byte SevenIsland_TrainerTower_Elevator_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4ECC - .byte 2 - .byte 2 - .2byte 0 - -CeruleanCity_House5_Layout_Border:: @ 8343470 - .incbin "data/layouts/CeruleanCity_House5_Layout/border.bin" - -CeruleanCity_House5_Layout_Blockdata:: @ 8343478 - .incbin "data/layouts/CeruleanCity_House5_Layout/map.bin" - - .align 2 -CeruleanCity_House5_Layout:: @ 8343540 - .4byte 11 - .4byte 9 - .4byte CeruleanCity_House5_Layout_Border - .4byte CeruleanCity_House5_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4E84 - .byte 2 - .byte 2 - .2byte 0 - -SSAnne_CaptainsOffice5_Layout_Border:: @ 834355C - .incbin "data/layouts/SSAnne_CaptainsOffice5_Layout/border.bin" - -SSAnne_CaptainsOffice5_Layout_Blockdata:: @ 8343564 - .incbin "data/layouts/SSAnne_CaptainsOffice5_Layout/map.bin" - - .align 2 -SSAnne_CaptainsOffice5_Layout:: @ 83436C4 - .4byte 16 - .4byte 11 - .4byte SSAnne_CaptainsOffice5_Layout_Border - .4byte SSAnne_CaptainsOffice5_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D501C - .byte 2 - .byte 2 - .2byte 0 - -SixIsland_DottedHole_B1F_Layout_Border:: @ 83436E0 - .incbin "data/layouts/SixIsland_DottedHole_B1F_Layout/border.bin" - -SixIsland_DottedHole_B1F_Layout_Blockdata:: @ 83436E8 - .incbin "data/layouts/SixIsland_DottedHole_B1F_Layout/map.bin" - - .align 2 -SixIsland_DottedHole_B1F_Layout:: @ 8343808 - .4byte 13 - .4byte 11 - .4byte SixIsland_DottedHole_B1F_Layout_Border - .4byte SixIsland_DottedHole_B1F_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D501C - .byte 2 - .byte 2 - .2byte 0 - -SixIsland_DottedHole_B2F_Layout_Border:: @ 8343824 - .incbin "data/layouts/SixIsland_DottedHole_B2F_Layout/border.bin" - -SixIsland_DottedHole_B2F_Layout_Blockdata:: @ 834382C - .incbin "data/layouts/SixIsland_DottedHole_B2F_Layout/map.bin" - - .align 2 -SixIsland_DottedHole_B2F_Layout:: @ 834394C - .4byte 13 - .4byte 11 - .4byte SixIsland_DottedHole_B2F_Layout_Border - .4byte SixIsland_DottedHole_B2F_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D501C - .byte 2 - .byte 2 - .2byte 0 - -SixIsland_DottedHole_B3F_Layout_Border:: @ 8343968 - .incbin "data/layouts/SixIsland_DottedHole_B3F_Layout/border.bin" - -SixIsland_DottedHole_B3F_Layout_Blockdata:: @ 8343970 - .incbin "data/layouts/SixIsland_DottedHole_B3F_Layout/map.bin" - - .align 2 -SixIsland_DottedHole_B3F_Layout:: @ 8343A90 - .4byte 13 - .4byte 11 - .4byte SixIsland_DottedHole_B3F_Layout_Border - .4byte SixIsland_DottedHole_B3F_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D501C - .byte 2 - .byte 2 - .2byte 0 - -SSAnne_CaptainsOffice9_Layout_Border:: @ 8343AAC - .incbin "data/layouts/SSAnne_CaptainsOffice9_Layout/border.bin" - -SSAnne_CaptainsOffice9_Layout_Blockdata:: @ 8343AB4 - .incbin "data/layouts/SSAnne_CaptainsOffice9_Layout/map.bin" - - .align 2 -SSAnne_CaptainsOffice9_Layout:: @ 8343BD4 - .4byte 13 - .4byte 11 - .4byte SSAnne_CaptainsOffice9_Layout_Border - .4byte SSAnne_CaptainsOffice9_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D501C - .byte 2 - .byte 2 - .2byte 0 - -SixIsland_DottedHole_SapphireRoom_Layout_Border:: @ 8343BF0 - .incbin "data/layouts/SixIsland_DottedHole_SapphireRoom_Layout/border.bin" - -SixIsland_DottedHole_SapphireRoom_Layout_Blockdata:: @ 8343BF8 - .incbin "data/layouts/SixIsland_DottedHole_SapphireRoom_Layout/map.bin" - - .align 2 -SixIsland_DottedHole_SapphireRoom_Layout:: @ 8343DD8 - .4byte 16 - .4byte 15 - .4byte SixIsland_DottedHole_SapphireRoom_Layout_Border - .4byte SixIsland_DottedHole_SapphireRoom_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D501C - .byte 2 - .byte 2 - .2byte 0 - -Island_Harbor_Layout_Border:: @ 8343DF4 - .incbin "data/layouts/Island_Harbor_Layout/border.bin" - -Island_Harbor_Layout_Blockdata:: @ 8343DFC - .incbin "data/layouts/Island_Harbor_Layout/map.bin" - - .align 2 -Island_Harbor_Layout:: @ 8343FB8 - .4byte 17 - .4byte 13 - .4byte Island_Harbor_Layout_Border - .4byte Island_Harbor_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D50AC - .byte 2 - .byte 2 - .2byte 0 - -OneIsland_PokemonCenter_2F_Layout_Border:: @ 8343FD4 - .incbin "data/layouts/OneIsland_PokemonCenter_2F_Layout/border.bin" - -OneIsland_PokemonCenter_2F_Layout_Blockdata:: @ 8343FDC - .incbin "data/layouts/OneIsland_PokemonCenter_2F_Layout/map.bin" - - .align 2 -OneIsland_PokemonCenter_2F_Layout:: @ 8344108 - .4byte 15 - .4byte 10 - .4byte OneIsland_PokemonCenter_2F_Layout_Border - .4byte OneIsland_PokemonCenter_2F_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4BE4 - .byte 2 - .byte 2 - .2byte 0 - -SSAnne_1F_Room11_Layout_Border:: @ 8344124 - .incbin "data/layouts/SSAnne_1F_Room11_Layout/border.bin" - -SSAnne_1F_Room11_Layout_Blockdata:: @ 8344130 - .incbin "data/layouts/SSAnne_1F_Room11_Layout/map.bin" - - .align 2 -SSAnne_1F_Room11_Layout:: @ 8345030 - .4byte 60 - .4byte 32 - .4byte SSAnne_1F_Room11_Layout_Border - .4byte SSAnne_1F_Room11_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D4DC4 - .byte 3 - .byte 2 - .2byte 0 - -ThreeIsland_DunsparceTunnel_Layout_Border:: @ 834504C - .incbin "data/layouts/ThreeIsland_DunsparceTunnel_Layout/border.bin" - -ThreeIsland_DunsparceTunnel_Layout_Blockdata:: @ 8345054 - .incbin "data/layouts/ThreeIsland_DunsparceTunnel_Layout/map.bin" - - .align 2 -ThreeIsland_DunsparceTunnel_Layout:: @ 83451F8 - .4byte 30 - .4byte 7 - .4byte ThreeIsland_DunsparceTunnel_Layout_Border - .4byte ThreeIsland_DunsparceTunnel_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D4BFC - .byte 2 - .byte 2 - .2byte 0 - -UnusedLayout_83453C0_Layout_Border:: @ 8345214 - .incbin "data/layouts/UnusedLayout_83453C0_Layout/border.bin" - -UnusedLayout_83453C0_Layout_Blockdata:: @ 834521C - .incbin "data/layouts/UnusedLayout_83453C0_Layout/map.bin" - - .align 2 -UnusedLayout_83453C0_Layout:: @ 83453C0 - .4byte 30 - .4byte 7 - .4byte UnusedLayout_83453C0_Layout_Border - .4byte UnusedLayout_83453C0_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D4BFC - .byte 2 - .byte 2 - .2byte 0 - -FiveIsland_LostCave_Entrance_Layout_Border:: @ 83453DC - .incbin "data/layouts/FiveIsland_LostCave_Entrance_Layout/border.bin" - -FiveIsland_LostCave_Entrance_Layout_Blockdata:: @ 83453E4 - .incbin "data/layouts/FiveIsland_LostCave_Entrance_Layout/map.bin" - - .align 2 -FiveIsland_LostCave_Entrance_Layout:: @ 83454D8 - .4byte 11 - .4byte 11 - .4byte FiveIsland_LostCave_Entrance_Layout_Border - .4byte FiveIsland_LostCave_Entrance_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D4BFC - .byte 2 - .byte 2 - .2byte 0 - -FiveIsland_LostCave_Room1_Layout_Border:: @ 83454F4 - .incbin "data/layouts/FiveIsland_LostCave_Room1_Layout/border.bin" - -FiveIsland_LostCave_Room1_Layout_Blockdata:: @ 83454FC - .incbin "data/layouts/FiveIsland_LostCave_Room1_Layout/map.bin" - - .align 2 -FiveIsland_LostCave_Room1_Layout:: @ 83455F0 - .4byte 11 - .4byte 11 - .4byte FiveIsland_LostCave_Room1_Layout_Border - .4byte FiveIsland_LostCave_Room1_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D4BFC - .byte 2 - .byte 2 - .2byte 0 - -FiveIsland_LostCave_Room2_Layout_Border:: @ 834560C - .incbin "data/layouts/FiveIsland_LostCave_Room2_Layout/border.bin" - -FiveIsland_LostCave_Room2_Layout_Blockdata:: @ 8345614 - .incbin "data/layouts/FiveIsland_LostCave_Room2_Layout/map.bin" - - .align 2 -FiveIsland_LostCave_Room2_Layout:: @ 8345708 - .4byte 11 - .4byte 11 - .4byte FiveIsland_LostCave_Room2_Layout_Border - .4byte FiveIsland_LostCave_Room2_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D4BFC - .byte 2 - .byte 2 - .2byte 0 - -FiveIsland_LostCave_Room3_Layout_Border:: @ 8345724 - .incbin "data/layouts/FiveIsland_LostCave_Room3_Layout/border.bin" - -FiveIsland_LostCave_Room3_Layout_Blockdata:: @ 834572C - .incbin "data/layouts/FiveIsland_LostCave_Room3_Layout/map.bin" - - .align 2 -FiveIsland_LostCave_Room3_Layout:: @ 8345820 - .4byte 11 - .4byte 11 - .4byte FiveIsland_LostCave_Room3_Layout_Border - .4byte FiveIsland_LostCave_Room3_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D4BFC - .byte 2 - .byte 2 - .2byte 0 - -FiveIsland_LostCave_Room4_Layout_Border:: @ 834583C - .incbin "data/layouts/FiveIsland_LostCave_Room4_Layout/border.bin" - -FiveIsland_LostCave_Room4_Layout_Blockdata:: @ 8345844 - .incbin "data/layouts/FiveIsland_LostCave_Room4_Layout/map.bin" - - .align 2 -FiveIsland_LostCave_Room4_Layout:: @ 8345938 - .4byte 11 - .4byte 11 - .4byte FiveIsland_LostCave_Room4_Layout_Border - .4byte FiveIsland_LostCave_Room4_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D4BFC - .byte 2 - .byte 2 - .2byte 0 - -FiveIsland_LostCave_Room5_Layout_Border:: @ 8345954 - .incbin "data/layouts/FiveIsland_LostCave_Room5_Layout/border.bin" - -FiveIsland_LostCave_Room5_Layout_Blockdata:: @ 834595C - .incbin "data/layouts/FiveIsland_LostCave_Room5_Layout/map.bin" - - .align 2 -FiveIsland_LostCave_Room5_Layout:: @ 8345A50 - .4byte 11 - .4byte 11 - .4byte FiveIsland_LostCave_Room5_Layout_Border - .4byte FiveIsland_LostCave_Room5_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D4BFC - .byte 2 - .byte 2 - .2byte 0 - -FiveIsland_LostCave_Room6_Layout_Border:: @ 8345A6C - .incbin "data/layouts/FiveIsland_LostCave_Room6_Layout/border.bin" - -FiveIsland_LostCave_Room6_Layout_Blockdata:: @ 8345A74 - .incbin "data/layouts/FiveIsland_LostCave_Room6_Layout/map.bin" - - .align 2 -FiveIsland_LostCave_Room6_Layout:: @ 8345B68 - .4byte 11 - .4byte 11 - .4byte FiveIsland_LostCave_Room6_Layout_Border - .4byte FiveIsland_LostCave_Room6_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D4BFC - .byte 2 - .byte 2 - .2byte 0 - -FiveIsland_LostCave_Room7_Layout_Border:: @ 8345B84 - .incbin "data/layouts/FiveIsland_LostCave_Room7_Layout/border.bin" - -FiveIsland_LostCave_Room7_Layout_Blockdata:: @ 8345B8C - .incbin "data/layouts/FiveIsland_LostCave_Room7_Layout/map.bin" - - .align 2 -FiveIsland_LostCave_Room7_Layout:: @ 8345C80 - .4byte 11 - .4byte 11 - .4byte FiveIsland_LostCave_Room7_Layout_Border - .4byte FiveIsland_LostCave_Room7_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D4BFC - .byte 2 - .byte 2 - .2byte 0 - -FiveIsland_LostCave_Room8_Layout_Border:: @ 8345C9C - .incbin "data/layouts/FiveIsland_LostCave_Room8_Layout/border.bin" - -FiveIsland_LostCave_Room8_Layout_Blockdata:: @ 8345CA4 - .incbin "data/layouts/FiveIsland_LostCave_Room8_Layout/map.bin" - - .align 2 -FiveIsland_LostCave_Room8_Layout:: @ 8345D98 - .4byte 11 - .4byte 11 - .4byte FiveIsland_LostCave_Room8_Layout_Border - .4byte FiveIsland_LostCave_Room8_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D4BFC - .byte 2 - .byte 2 - .2byte 0 - -FiveIsland_LostCave_Room9_Layout_Border:: @ 8345DB4 - .incbin "data/layouts/FiveIsland_LostCave_Room9_Layout/border.bin" - -FiveIsland_LostCave_Room9_Layout_Blockdata:: @ 8345DBC - .incbin "data/layouts/FiveIsland_LostCave_Room9_Layout/map.bin" - - .align 2 -FiveIsland_LostCave_Room9_Layout:: @ 8345EB0 - .4byte 11 - .4byte 11 - .4byte FiveIsland_LostCave_Room9_Layout_Border - .4byte FiveIsland_LostCave_Room9_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D4BFC - .byte 2 - .byte 2 - .2byte 0 - -FiveIsland_LostCave_Room10_Layout_Border:: @ 8345ECC - .incbin "data/layouts/FiveIsland_LostCave_Room10_Layout/border.bin" - -FiveIsland_LostCave_Room10_Layout_Blockdata:: @ 8345ED4 - .incbin "data/layouts/FiveIsland_LostCave_Room10_Layout/map.bin" - - .align 2 -FiveIsland_LostCave_Room10_Layout:: @ 8345FC8 - .4byte 11 - .4byte 11 - .4byte FiveIsland_LostCave_Room10_Layout_Border - .4byte FiveIsland_LostCave_Room10_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D4BFC - .byte 2 - .byte 2 - .2byte 0 - -FiveIsland_LostCave_Room11_Layout_Border:: @ 8345FE4 - .incbin "data/layouts/FiveIsland_LostCave_Room11_Layout/border.bin" - -FiveIsland_LostCave_Room11_Layout_Blockdata:: @ 8345FEC - .incbin "data/layouts/FiveIsland_LostCave_Room11_Layout/map.bin" - - .align 2 -FiveIsland_LostCave_Room11_Layout:: @ 83460E0 - .4byte 11 - .4byte 11 - .4byte FiveIsland_LostCave_Room11_Layout_Border - .4byte FiveIsland_LostCave_Room11_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D4BFC - .byte 2 - .byte 2 - .2byte 0 - -FiveIsland_LostCave_Room12_Layout_Border:: @ 83460FC - .incbin "data/layouts/FiveIsland_LostCave_Room12_Layout/border.bin" - -FiveIsland_LostCave_Room12_Layout_Blockdata:: @ 8346104 - .incbin "data/layouts/FiveIsland_LostCave_Room12_Layout/map.bin" - - .align 2 -FiveIsland_LostCave_Room12_Layout:: @ 83461F8 - .4byte 11 - .4byte 11 - .4byte FiveIsland_LostCave_Room12_Layout_Border - .4byte FiveIsland_LostCave_Room12_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D4BFC - .byte 2 - .byte 2 - .2byte 0 - -FiveIsland_LostCave_Room13_Layout_Border:: @ 8346214 - .incbin "data/layouts/FiveIsland_LostCave_Room13_Layout/border.bin" - -FiveIsland_LostCave_Room13_Layout_Blockdata:: @ 834621C - .incbin "data/layouts/FiveIsland_LostCave_Room13_Layout/map.bin" - - .align 2 -FiveIsland_LostCave_Room13_Layout:: @ 8346310 - .4byte 11 - .4byte 11 - .4byte FiveIsland_LostCave_Room13_Layout_Border - .4byte FiveIsland_LostCave_Room13_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D4BFC - .byte 2 - .byte 2 - .2byte 0 - -FiveIsland_LostCave_Room14_Layout_Border:: @ 834632C - .incbin "data/layouts/FiveIsland_LostCave_Room14_Layout/border.bin" - -FiveIsland_LostCave_Room14_Layout_Blockdata:: @ 8346334 - .incbin "data/layouts/FiveIsland_LostCave_Room14_Layout/map.bin" - - .align 2 -FiveIsland_LostCave_Room14_Layout:: @ 8346428 - .4byte 11 - .4byte 11 - .4byte FiveIsland_LostCave_Room14_Layout_Border - .4byte FiveIsland_LostCave_Room14_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D4BFC - .byte 2 - .byte 2 - .2byte 0 - -SevenIsland_TanobyRuins_MoneanChamber_Layout_Border:: @ 8346444 - .incbin "data/layouts/SevenIsland_TanobyRuins_MoneanChamber_Layout/border.bin" - -SevenIsland_TanobyRuins_MoneanChamber_Layout_Blockdata:: @ 834644C - .incbin "data/layouts/SevenIsland_TanobyRuins_MoneanChamber_Layout/map.bin" - - .align 2 -SevenIsland_TanobyRuins_MoneanChamber_Layout:: @ 834675C - .4byte 23 - .4byte 17 - .4byte SevenIsland_TanobyRuins_MoneanChamber_Layout_Border - .4byte SevenIsland_TanobyRuins_MoneanChamber_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D5034 - .byte 2 - .byte 2 - .2byte 0 - -SevenIsland_TanobyRuins_LiptooChamber_Layout_Border:: @ 8346778 - .incbin "data/layouts/SevenIsland_TanobyRuins_LiptooChamber_Layout/border.bin" - -SevenIsland_TanobyRuins_LiptooChamber_Layout_Blockdata:: @ 8346780 - .incbin "data/layouts/SevenIsland_TanobyRuins_LiptooChamber_Layout/map.bin" - - .align 2 -SevenIsland_TanobyRuins_LiptooChamber_Layout:: @ 8346A90 - .4byte 23 - .4byte 17 - .4byte SevenIsland_TanobyRuins_LiptooChamber_Layout_Border - .4byte SevenIsland_TanobyRuins_LiptooChamber_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D5034 - .byte 2 - .byte 2 - .2byte 0 - -SevenIsland_TanobyRuins_WeepthChamber_Layout_Border:: @ 8346AAC - .incbin "data/layouts/SevenIsland_TanobyRuins_WeepthChamber_Layout/border.bin" - -SevenIsland_TanobyRuins_WeepthChamber_Layout_Blockdata:: @ 8346AB4 - .incbin "data/layouts/SevenIsland_TanobyRuins_WeepthChamber_Layout/map.bin" - - .align 2 -SevenIsland_TanobyRuins_WeepthChamber_Layout:: @ 8346DC4 - .4byte 23 - .4byte 17 - .4byte SevenIsland_TanobyRuins_WeepthChamber_Layout_Border - .4byte SevenIsland_TanobyRuins_WeepthChamber_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D5034 - .byte 2 - .byte 2 - .2byte 0 - -SevenIsland_TanobyRuins_DilfordChamber_Layout_Border:: @ 8346DE0 - .incbin "data/layouts/SevenIsland_TanobyRuins_DilfordChamber_Layout/border.bin" - -SevenIsland_TanobyRuins_DilfordChamber_Layout_Blockdata:: @ 8346DE8 - .incbin "data/layouts/SevenIsland_TanobyRuins_DilfordChamber_Layout/map.bin" - - .align 2 -SevenIsland_TanobyRuins_DilfordChamber_Layout:: @ 83470F8 - .4byte 23 - .4byte 17 - .4byte SevenIsland_TanobyRuins_DilfordChamber_Layout_Border - .4byte SevenIsland_TanobyRuins_DilfordChamber_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D5034 - .byte 2 - .byte 2 - .2byte 0 - -SevenIsland_TanobyRuins_ScufibChamber_Layout_Border:: @ 8347114 - .incbin "data/layouts/SevenIsland_TanobyRuins_ScufibChamber_Layout/border.bin" - -SevenIsland_TanobyRuins_ScufibChamber_Layout_Blockdata:: @ 834711C - .incbin "data/layouts/SevenIsland_TanobyRuins_ScufibChamber_Layout/map.bin" - - .align 2 -SevenIsland_TanobyRuins_ScufibChamber_Layout:: @ 834742C - .4byte 23 - .4byte 17 - .4byte SevenIsland_TanobyRuins_ScufibChamber_Layout_Border - .4byte SevenIsland_TanobyRuins_ScufibChamber_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D5034 - .byte 2 - .byte 2 - .2byte 0 - -SSAnne_1F_Room12_Layout_Border:: @ 8347448 - .incbin "data/layouts/SSAnne_1F_Room12_Layout/border.bin" - -SSAnne_1F_Room12_Layout_Blockdata:: @ 8347450 - .incbin "data/layouts/SSAnne_1F_Room12_Layout/map.bin" - - .align 2 -SSAnne_1F_Room12_Layout:: @ 8347A50 - .4byte 32 - .4byte 24 - .4byte SSAnne_1F_Room12_Layout_Border - .4byte SSAnne_1F_Room12_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D4DF4 - .byte 2 - .byte 2 - .2byte 0 - -SevenIsland_SeavaultCanyon_TanobyKey_Layout_Border:: @ 8347A6C - .incbin "data/layouts/SevenIsland_SeavaultCanyon_TanobyKey_Layout/border.bin" - -SevenIsland_SeavaultCanyon_TanobyKey_Layout_Blockdata:: @ 8347A74 - .incbin "data/layouts/SevenIsland_SeavaultCanyon_TanobyKey_Layout/map.bin" - - .align 2 -SevenIsland_SeavaultCanyon_TanobyKey_Layout:: @ 8347C54 - .4byte 15 - .4byte 16 - .4byte SevenIsland_SeavaultCanyon_TanobyKey_Layout_Border - .4byte SevenIsland_SeavaultCanyon_TanobyKey_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D4E0C - .byte 2 - .byte 2 - .2byte 0 - -BirthIsland_Exterior_Layout_Border:: @ 8347C70 - .incbin "data/layouts/BirthIsland_Exterior_Layout/border.bin" - -BirthIsland_Exterior_Layout_Blockdata:: @ 8347C78 - .incbin "data/layouts/BirthIsland_Exterior_Layout/map.bin" - - .align 2 -BirthIsland_Exterior_Layout:: @ 8348380 - .4byte 30 - .4byte 30 - .4byte BirthIsland_Exterior_Layout_Border - .4byte BirthIsland_Exterior_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D507C - .byte 2 - .byte 2 - .2byte 0 - -NavelRock_Exterior_Layout_Border:: @ 834839C - .incbin "data/layouts/NavelRock_Exterior_Layout/border.bin" - -NavelRock_Exterior_Layout_Blockdata:: @ 83483A4 - .incbin "data/layouts/NavelRock_Exterior_Layout/map.bin" - - .align 2 -NavelRock_Exterior_Layout:: @ 834873C - .4byte 20 - .4byte 23 - .4byte NavelRock_Exterior_Layout_Border - .4byte NavelRock_Exterior_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D504C - .byte 2 - .byte 2 - .2byte 0 - -NavelRock_1F_Layout_Border:: @ 8348758 - .incbin "data/layouts/NavelRock_1F_Layout/border.bin" - -NavelRock_1F_Layout_Blockdata:: @ 8348760 - .incbin "data/layouts/NavelRock_1F_Layout/map.bin" - - .align 2 -NavelRock_1F_Layout:: @ 8348AD4 - .4byte 17 - .4byte 26 - .4byte NavelRock_1F_Layout_Border - .4byte NavelRock_1F_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D501C - .byte 2 - .byte 2 - .2byte 0 - -NavelRock_Summit_Layout_Border:: @ 8348AF0 - .incbin "data/layouts/NavelRock_Summit_Layout/border.bin" - -NavelRock_Summit_Layout_Blockdata:: @ 8348AF8 - .incbin "data/layouts/NavelRock_Summit_Layout/map.bin" - - .align 2 -NavelRock_Summit_Layout:: @ 8348EB0 - .4byte 19 - .4byte 25 - .4byte NavelRock_Summit_Layout_Border - .4byte NavelRock_Summit_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D501C - .byte 2 - .byte 2 - .2byte 0 - -NavelRock_Base_Layout_Border:: @ 8348ECC - .incbin "data/layouts/NavelRock_Base_Layout/border.bin" - -NavelRock_Base_Layout_Blockdata:: @ 8348ED4 - .incbin "data/layouts/NavelRock_Base_Layout/map.bin" - - .align 2 -NavelRock_Base_Layout:: @ 834929C - .4byte 21 - .4byte 23 - .4byte NavelRock_Base_Layout_Border - .4byte NavelRock_Base_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D501C - .byte 2 - .byte 2 - .2byte 0 - -NavelRock_SummitPath_2F_Layout_Border:: @ 83492B8 - .incbin "data/layouts/NavelRock_SummitPath_2F_Layout/border.bin" - -NavelRock_SummitPath_2F_Layout_Blockdata:: @ 83492C0 - .incbin "data/layouts/NavelRock_SummitPath_2F_Layout/map.bin" - - .align 2 -NavelRock_SummitPath_2F_Layout:: @ 8349324 - .4byte 7 - .4byte 7 - .4byte NavelRock_SummitPath_2F_Layout_Border - .4byte NavelRock_SummitPath_2F_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D501C - .byte 2 - .byte 2 - .2byte 0 - -NavelRock_SummitPath_3F_Layout_Border:: @ 8349340 - .incbin "data/layouts/NavelRock_SummitPath_3F_Layout/border.bin" - -NavelRock_SummitPath_3F_Layout_Blockdata:: @ 8349348 - .incbin "data/layouts/NavelRock_SummitPath_3F_Layout/map.bin" - - .align 2 -NavelRock_SummitPath_3F_Layout:: @ 83493AC - .4byte 7 - .4byte 7 - .4byte NavelRock_SummitPath_3F_Layout_Border - .4byte NavelRock_SummitPath_3F_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D501C - .byte 2 - .byte 2 - .2byte 0 - -NavelRock_SummitPath_4F_Layout_Border:: @ 83493C8 - .incbin "data/layouts/NavelRock_SummitPath_4F_Layout/border.bin" - -NavelRock_SummitPath_4F_Layout_Blockdata:: @ 83493D0 - .incbin "data/layouts/NavelRock_SummitPath_4F_Layout/map.bin" - - .align 2 -NavelRock_SummitPath_4F_Layout:: @ 8349434 - .4byte 7 - .4byte 7 - .4byte NavelRock_SummitPath_4F_Layout_Border - .4byte NavelRock_SummitPath_4F_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D501C - .byte 2 - .byte 2 - .2byte 0 - -NavelRock_SummitPath_5F_Layout_Border:: @ 8349450 - .incbin "data/layouts/NavelRock_SummitPath_5F_Layout/border.bin" - -NavelRock_SummitPath_5F_Layout_Blockdata:: @ 8349458 - .incbin "data/layouts/NavelRock_SummitPath_5F_Layout/map.bin" - - .align 2 -NavelRock_SummitPath_5F_Layout:: @ 83494BC - .4byte 7 - .4byte 7 - .4byte NavelRock_SummitPath_5F_Layout_Border - .4byte NavelRock_SummitPath_5F_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D501C - .byte 2 - .byte 2 - .2byte 0 - -NavelRock_BasePath_B1F_Layout_Border:: @ 83494D8 - .incbin "data/layouts/NavelRock_BasePath_B1F_Layout/border.bin" - -NavelRock_BasePath_B1F_Layout_Blockdata:: @ 83494E0 - .incbin "data/layouts/NavelRock_BasePath_B1F_Layout/map.bin" - - .align 2 -NavelRock_BasePath_B1F_Layout:: @ 8349544 - .4byte 7 - .4byte 7 - .4byte NavelRock_BasePath_B1F_Layout_Border - .4byte NavelRock_BasePath_B1F_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D501C - .byte 2 - .byte 2 - .2byte 0 - -NavelRock_BasePath_B2F_Layout_Border:: @ 8349560 - .incbin "data/layouts/NavelRock_BasePath_B2F_Layout/border.bin" - -NavelRock_BasePath_B2F_Layout_Blockdata:: @ 8349568 - .incbin "data/layouts/NavelRock_BasePath_B2F_Layout/map.bin" - - .align 2 -NavelRock_BasePath_B2F_Layout:: @ 83495CC - .4byte 7 - .4byte 7 - .4byte NavelRock_BasePath_B2F_Layout_Border - .4byte NavelRock_BasePath_B2F_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D501C - .byte 2 - .byte 2 - .2byte 0 - -NavelRock_BasePath_B3F_Layout_Border:: @ 83495E8 - .incbin "data/layouts/NavelRock_BasePath_B3F_Layout/border.bin" - -NavelRock_BasePath_B3F_Layout_Blockdata:: @ 83495F0 - .incbin "data/layouts/NavelRock_BasePath_B3F_Layout/map.bin" - - .align 2 -NavelRock_BasePath_B3F_Layout:: @ 8349654 - .4byte 7 - .4byte 7 - .4byte NavelRock_BasePath_B3F_Layout_Border - .4byte NavelRock_BasePath_B3F_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D501C - .byte 2 - .byte 2 - .2byte 0 - -NavelRock_BasePath_B4F_Layout_Border:: @ 8349670 - .incbin "data/layouts/NavelRock_BasePath_B4F_Layout/border.bin" - -NavelRock_BasePath_B4F_Layout_Blockdata:: @ 8349678 - .incbin "data/layouts/NavelRock_BasePath_B4F_Layout/map.bin" - - .align 2 -NavelRock_BasePath_B4F_Layout:: @ 83496DC - .4byte 7 - .4byte 7 - .4byte NavelRock_BasePath_B4F_Layout_Border - .4byte NavelRock_BasePath_B4F_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D501C - .byte 2 - .byte 2 - .2byte 0 - -NavelRock_BasePath_B5F_Layout_Border:: @ 83496F8 - .incbin "data/layouts/NavelRock_BasePath_B5F_Layout/border.bin" - -NavelRock_BasePath_B5F_Layout_Blockdata:: @ 8349700 - .incbin "data/layouts/NavelRock_BasePath_B5F_Layout/map.bin" - - .align 2 -NavelRock_BasePath_B5F_Layout:: @ 8349764 - .4byte 7 - .4byte 7 - .4byte NavelRock_BasePath_B5F_Layout_Border - .4byte NavelRock_BasePath_B5F_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D501C - .byte 2 - .byte 2 - .2byte 0 - -NavelRock_BasePath_B6F_Layout_Border:: @ 8349780 - .incbin "data/layouts/NavelRock_BasePath_B6F_Layout/border.bin" - -NavelRock_BasePath_B6F_Layout_Blockdata:: @ 8349788 - .incbin "data/layouts/NavelRock_BasePath_B6F_Layout/map.bin" - - .align 2 -NavelRock_BasePath_B6F_Layout:: @ 83497EC - .4byte 7 - .4byte 7 - .4byte NavelRock_BasePath_B6F_Layout_Border - .4byte NavelRock_BasePath_B6F_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D501C - .byte 2 - .byte 2 - .2byte 0 - -NavelRock_BasePath_B7F_Layout_Border:: @ 8349808 - .incbin "data/layouts/NavelRock_BasePath_B7F_Layout/border.bin" - -NavelRock_BasePath_B7F_Layout_Blockdata:: @ 8349810 - .incbin "data/layouts/NavelRock_BasePath_B7F_Layout/map.bin" - - .align 2 -NavelRock_BasePath_B7F_Layout:: @ 8349874 - .4byte 7 - .4byte 7 - .4byte NavelRock_BasePath_B7F_Layout_Border - .4byte NavelRock_BasePath_B7F_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D501C - .byte 2 - .byte 2 - .2byte 0 - -NavelRock_BasePath_B8F_Layout_Border:: @ 8349890 - .incbin "data/layouts/NavelRock_BasePath_B8F_Layout/border.bin" - -NavelRock_BasePath_B8F_Layout_Blockdata:: @ 8349898 - .incbin "data/layouts/NavelRock_BasePath_B8F_Layout/map.bin" - - .align 2 -NavelRock_BasePath_B8F_Layout:: @ 83498FC - .4byte 7 - .4byte 7 - .4byte NavelRock_BasePath_B8F_Layout_Border - .4byte NavelRock_BasePath_B8F_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D501C - .byte 2 - .byte 2 - .2byte 0 - -NavelRock_BasePath_B9F_Layout_Border:: @ 8349918 - .incbin "data/layouts/NavelRock_BasePath_B9F_Layout/border.bin" - -NavelRock_BasePath_B9F_Layout_Blockdata:: @ 8349920 - .incbin "data/layouts/NavelRock_BasePath_B9F_Layout/map.bin" - - .align 2 -NavelRock_BasePath_B9F_Layout:: @ 8349984 - .4byte 7 - .4byte 7 - .4byte NavelRock_BasePath_B9F_Layout_Border - .4byte NavelRock_BasePath_B9F_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D501C - .byte 2 - .byte 2 - .2byte 0 - -NavelRock_BasePath_B10F_Layout_Border:: @ 83499A0 - .incbin "data/layouts/NavelRock_BasePath_B10F_Layout/border.bin" - -NavelRock_BasePath_B10F_Layout_Blockdata:: @ 83499A8 - .incbin "data/layouts/NavelRock_BasePath_B10F_Layout/map.bin" - - .align 2 -NavelRock_BasePath_B10F_Layout:: @ 8349A0C - .4byte 7 - .4byte 7 - .4byte NavelRock_BasePath_B10F_Layout_Border - .4byte NavelRock_BasePath_B10F_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D501C - .byte 2 - .byte 2 - .2byte 0 - -NavelRock_BasePath_B11F_Layout_Border:: @ 8349A28 - .incbin "data/layouts/NavelRock_BasePath_B11F_Layout/border.bin" - -NavelRock_BasePath_B11F_Layout_Blockdata:: @ 8349A30 - .incbin "data/layouts/NavelRock_BasePath_B11F_Layout/map.bin" - - .align 2 -NavelRock_BasePath_B11F_Layout:: @ 8349A94 - .4byte 7 - .4byte 7 - .4byte NavelRock_BasePath_B11F_Layout_Border - .4byte NavelRock_BasePath_B11F_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D501C - .byte 2 - .byte 2 - .2byte 0 - -SevenIsland_TanobyRuins_RixyChamber_Layout_Border:: @ 8349AB0 - .incbin "data/layouts/SevenIsland_TanobyRuins_RixyChamber_Layout/border.bin" - -SevenIsland_TanobyRuins_RixyChamber_Layout_Blockdata:: @ 8349AB8 - .incbin "data/layouts/SevenIsland_TanobyRuins_RixyChamber_Layout/map.bin" - - .align 2 -SevenIsland_TanobyRuins_RixyChamber_Layout:: @ 8349DC8 - .4byte 23 - .4byte 17 - .4byte SevenIsland_TanobyRuins_RixyChamber_Layout_Border - .4byte SevenIsland_TanobyRuins_RixyChamber_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D5034 - .byte 2 - .byte 2 - .2byte 0 - -SevenIsland_TanobyRuins_ViapoisChamber_Layout_Border:: @ 8349DE4 - .incbin "data/layouts/SevenIsland_TanobyRuins_ViapoisChamber_Layout/border.bin" - -SevenIsland_TanobyRuins_ViapoisChamber_Layout_Blockdata:: @ 8349DEC - .incbin "data/layouts/SevenIsland_TanobyRuins_ViapoisChamber_Layout/map.bin" - - .align 2 -SevenIsland_TanobyRuins_ViapoisChamber_Layout:: @ 834A0FC - .4byte 23 - .4byte 17 - .4byte SevenIsland_TanobyRuins_ViapoisChamber_Layout_Border - .4byte SevenIsland_TanobyRuins_ViapoisChamber_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D5034 - .byte 2 - .byte 2 - .2byte 0 - -NavelRock_B1F_Layout_Border:: @ 834A118 - .incbin "data/layouts/NavelRock_B1F_Layout/border.bin" - -NavelRock_B1F_Layout_Blockdata:: @ 834A120 - .incbin "data/layouts/NavelRock_B1F_Layout/map.bin" - - .align 2 -NavelRock_B1F_Layout:: @ 834A210 - .4byte 17 - .4byte 7 - .4byte NavelRock_B1F_Layout_Border - .4byte NavelRock_B1F_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D501C - .byte 2 - .byte 2 - .2byte 0 - -NavelRock_Fork_Layout_Border:: @ 834A22C - .incbin "data/layouts/NavelRock_Fork_Layout/border.bin" - -NavelRock_Fork_Layout_Blockdata:: @ 834A234 - .incbin "data/layouts/NavelRock_Fork_Layout/map.bin" - - .align 2 -NavelRock_Fork_Layout:: @ 834B9A4 - .4byte 30 - .4byte 100 - .4byte NavelRock_Fork_Layout_Border - .4byte NavelRock_Fork_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D501C - .byte 2 - .byte 2 - .2byte 0 - -UnusedLayout_834BC2C_Layout_Border:: @ 834B9C0 - .incbin "data/layouts/UnusedLayout_834BC2C_Layout/border.bin" - -UnusedLayout_834BC2C_Layout_Blockdata:: @ 834B9C8 - .incbin "data/layouts/UnusedLayout_834BC2C_Layout/map.bin" - - .align 2 -UnusedLayout_834BC2C_Layout:: @ 834BC2C - .4byte 18 - .4byte 17 - .4byte UnusedLayout_834BC2C_Layout_Border - .4byte UnusedLayout_834BC2C_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D5094 - .byte 2 - .byte 2 - .2byte 0 - -UnusedLayout_834BEB4_Layout_Border:: @ 834BC48 - .incbin "data/layouts/UnusedLayout_834BEB4_Layout/border.bin" - -UnusedLayout_834BEB4_Layout_Blockdata:: @ 834BC50 - .incbin "data/layouts/UnusedLayout_834BEB4_Layout/map.bin" - - .align 2 -UnusedLayout_834BEB4_Layout:: @ 834BEB4 - .4byte 18 - .4byte 17 - .4byte UnusedLayout_834BEB4_Layout_Border - .4byte UnusedLayout_834BEB4_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D5094 - .byte 2 - .byte 2 - .2byte 0 - -UnusedLayout_834C13C_Layout_Border:: @ 834BED0 - .incbin "data/layouts/UnusedLayout_834C13C_Layout/border.bin" - -UnusedLayout_834C13C_Layout_Blockdata:: @ 834BED8 - .incbin "data/layouts/UnusedLayout_834C13C_Layout/map.bin" - - .align 2 -UnusedLayout_834C13C_Layout:: @ 834C13C - .4byte 18 - .4byte 17 - .4byte UnusedLayout_834C13C_Layout_Border - .4byte UnusedLayout_834C13C_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D5094 - .byte 2 - .byte 2 - .2byte 0 - -UnusedLayout_834C3C4_Layout_Border:: @ 834C158 - .incbin "data/layouts/UnusedLayout_834C3C4_Layout/border.bin" - -UnusedLayout_834C3C4_Layout_Blockdata:: @ 834C160 - .incbin "data/layouts/UnusedLayout_834C3C4_Layout/map.bin" - - .align 2 -UnusedLayout_834C3C4_Layout:: @ 834C3C4 - .4byte 18 - .4byte 17 - .4byte UnusedLayout_834C3C4_Layout_Border - .4byte UnusedLayout_834C3C4_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D5094 - .byte 2 - .byte 2 - .2byte 0 - -UnusedLayout_834C64C_Layout_Border:: @ 834C3E0 - .incbin "data/layouts/UnusedLayout_834C64C_Layout/border.bin" - -UnusedLayout_834C64C_Layout_Blockdata:: @ 834C3E8 - .incbin "data/layouts/UnusedLayout_834C64C_Layout/map.bin" - - .align 2 -UnusedLayout_834C64C_Layout:: @ 834C64C - .4byte 18 - .4byte 17 - .4byte UnusedLayout_834C64C_Layout_Border - .4byte UnusedLayout_834C64C_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D5094 - .byte 2 - .byte 2 - .2byte 0 - -UnusedLayout_834C8D4_Layout_Border:: @ 834C668 - .incbin "data/layouts/UnusedLayout_834C8D4_Layout/border.bin" - -UnusedLayout_834C8D4_Layout_Blockdata:: @ 834C670 - .incbin "data/layouts/UnusedLayout_834C8D4_Layout/map.bin" - - .align 2 -UnusedLayout_834C8D4_Layout:: @ 834C8D4 - .4byte 18 - .4byte 17 - .4byte UnusedLayout_834C8D4_Layout_Border - .4byte UnusedLayout_834C8D4_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D5094 - .byte 2 - .byte 2 - .2byte 0 - -UnusedLayout_834CB5C_Layout_Border:: @ 834C8F0 - .incbin "data/layouts/UnusedLayout_834CB5C_Layout/border.bin" - -UnusedLayout_834CB5C_Layout_Blockdata:: @ 834C8F8 - .incbin "data/layouts/UnusedLayout_834CB5C_Layout/map.bin" - - .align 2 -UnusedLayout_834CB5C_Layout:: @ 834CB5C - .4byte 18 - .4byte 17 - .4byte UnusedLayout_834CB5C_Layout_Border - .4byte UnusedLayout_834CB5C_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D5094 - .byte 2 - .byte 2 - .2byte 0 - -UnusedLayout_834CDE4_Layout_Border:: @ 834CB78 - .incbin "data/layouts/UnusedLayout_834CDE4_Layout/border.bin" - -UnusedLayout_834CDE4_Layout_Blockdata:: @ 834CB80 - .incbin "data/layouts/UnusedLayout_834CDE4_Layout/map.bin" - - .align 2 -UnusedLayout_834CDE4_Layout:: @ 834CDE4 - .4byte 18 - .4byte 17 - .4byte UnusedLayout_834CDE4_Layout_Border - .4byte UnusedLayout_834CDE4_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D5094 - .byte 2 - .byte 2 - .2byte 0 - -UnusedLayout_834D06C_Layout_Border:: @ 834CE00 - .incbin "data/layouts/UnusedLayout_834D06C_Layout/border.bin" - -UnusedLayout_834D06C_Layout_Blockdata:: @ 834CE08 - .incbin "data/layouts/UnusedLayout_834D06C_Layout/map.bin" - - .align 2 -UnusedLayout_834D06C_Layout:: @ 834D06C - .4byte 18 - .4byte 17 - .4byte UnusedLayout_834D06C_Layout_Border - .4byte UnusedLayout_834D06C_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D5094 - .byte 2 - .byte 2 - .2byte 0 - -UnusedLayout_834D2F4_Layout_Border:: @ 834D088 - .incbin "data/layouts/UnusedLayout_834D2F4_Layout/border.bin" - -UnusedLayout_834D2F4_Layout_Blockdata:: @ 834D090 - .incbin "data/layouts/UnusedLayout_834D2F4_Layout/map.bin" - - .align 2 -UnusedLayout_834D2F4_Layout:: @ 834D2F4 - .4byte 18 - .4byte 17 - .4byte UnusedLayout_834D2F4_Layout_Border - .4byte UnusedLayout_834D2F4_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D5094 - .byte 2 - .byte 2 - .2byte 0 - -UnusedLayout_834D57C_Layout_Border:: @ 834D310 - .incbin "data/layouts/UnusedLayout_834D57C_Layout/border.bin" - -UnusedLayout_834D57C_Layout_Blockdata:: @ 834D318 - .incbin "data/layouts/UnusedLayout_834D57C_Layout/map.bin" - - .align 2 -UnusedLayout_834D57C_Layout:: @ 834D57C - .4byte 18 - .4byte 17 - .4byte UnusedLayout_834D57C_Layout_Border - .4byte UnusedLayout_834D57C_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D5094 - .byte 2 - .byte 2 - .2byte 0 - -UnusedLayout_834D804_Layout_Border:: @ 834D598 - .incbin "data/layouts/UnusedLayout_834D804_Layout/border.bin" - -UnusedLayout_834D804_Layout_Blockdata:: @ 834D5A0 - .incbin "data/layouts/UnusedLayout_834D804_Layout/map.bin" - - .align 2 -UnusedLayout_834D804_Layout:: @ 834D804 - .4byte 18 - .4byte 17 - .4byte UnusedLayout_834D804_Layout_Border - .4byte UnusedLayout_834D804_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D5094 - .byte 2 - .byte 2 - .2byte 0 - -UnusedLayout_834DA8C_Layout_Border:: @ 834D820 - .incbin "data/layouts/UnusedLayout_834DA8C_Layout/border.bin" - -UnusedLayout_834DA8C_Layout_Blockdata:: @ 834D828 - .incbin "data/layouts/UnusedLayout_834DA8C_Layout/map.bin" - - .align 2 -UnusedLayout_834DA8C_Layout:: @ 834DA8C - .4byte 18 - .4byte 17 - .4byte UnusedLayout_834DA8C_Layout_Border - .4byte UnusedLayout_834DA8C_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D5094 - .byte 2 - .byte 2 - .2byte 0 - -UnusedLayout_834DD14_Layout_Border:: @ 834DAA8 - .incbin "data/layouts/UnusedLayout_834DD14_Layout/border.bin" - -UnusedLayout_834DD14_Layout_Blockdata:: @ 834DAB0 - .incbin "data/layouts/UnusedLayout_834DD14_Layout/map.bin" - - .align 2 -UnusedLayout_834DD14_Layout:: @ 834DD14 - .4byte 18 - .4byte 17 - .4byte UnusedLayout_834DD14_Layout_Border - .4byte UnusedLayout_834DD14_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D5094 - .byte 2 - .byte 2 - .2byte 0 - -UnusedLayout_834DF9C_Layout_Border:: @ 834DD30 - .incbin "data/layouts/UnusedLayout_834DF9C_Layout/border.bin" - -UnusedLayout_834DF9C_Layout_Blockdata:: @ 834DD38 - .incbin "data/layouts/UnusedLayout_834DF9C_Layout/map.bin" - - .align 2 -UnusedLayout_834DF9C_Layout:: @ 834DF9C - .4byte 18 - .4byte 17 - .4byte UnusedLayout_834DF9C_Layout_Border - .4byte UnusedLayout_834DF9C_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D5094 - .byte 2 - .byte 2 - .2byte 0 - -UnusedLayout_834E224_Layout_Border:: @ 834DFB8 - .incbin "data/layouts/UnusedLayout_834E224_Layout/border.bin" - -UnusedLayout_834E224_Layout_Blockdata:: @ 834DFC0 - .incbin "data/layouts/UnusedLayout_834E224_Layout/map.bin" - - .align 2 -UnusedLayout_834E224_Layout:: @ 834E224 - .4byte 18 - .4byte 17 - .4byte UnusedLayout_834E224_Layout_Border - .4byte UnusedLayout_834E224_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D5094 - .byte 2 - .byte 2 - .2byte 0 - -SevenIsland_House_Room1_Layout_Border:: @ 834E240 - .incbin "data/layouts/SevenIsland_House_Room1_Layout/border.bin" - -SevenIsland_House_Room1_Layout_Blockdata:: @ 834E248 - .incbin "data/layouts/SevenIsland_House_Room1_Layout/map.bin" - - .align 2 -SevenIsland_House_Room1_Layout:: @ 834E310 - .4byte 11 - .4byte 9 - .4byte SevenIsland_House_Room1_Layout_Border - .4byte SevenIsland_House_Room1_Layout_Blockdata - .4byte gTileset_82D4BB4 - .4byte gTileset_82D4E24 - .byte 2 - .byte 2 - .2byte 0 - -OneIsland_KindleRoad_EmberSpa_Layout_Border:: @ 834E32C - .incbin "data/layouts/OneIsland_KindleRoad_EmberSpa_Layout/border.bin" - -OneIsland_KindleRoad_EmberSpa_Layout_Blockdata:: @ 834E334 - .incbin "data/layouts/OneIsland_KindleRoad_EmberSpa_Layout/map.bin" - - .align 2 -OneIsland_KindleRoad_EmberSpa_Layout:: @ 834EB70 - .4byte 27 - .4byte 39 - .4byte OneIsland_KindleRoad_EmberSpa_Layout_Border - .4byte OneIsland_KindleRoad_EmberSpa_Layout_Blockdata - .4byte gTileset_82D4A94 - .4byte gTileset_82D4FEC - .byte 2 - .byte 2 - .2byte 0 diff --git a/data/layouts/layouts.json b/data/layouts/layouts.json new file mode 100644 index 000000000..3675b33c0 --- /dev/null +++ b/data/layouts/layouts.json @@ -0,0 +1,4403 @@ +{ + "layouts_table_label": "gMapLayouts", + "layouts": [ + { + "id": "LAYOUT_PALLET_TOWN_PLAYERS_HOUSE_1F", + "name": "PalletTown_PlayersHouse_1F_Layout", + "width": 13, + "height": 10, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4C74", + "border_filepath": "data/layouts/PalletTown_PlayersHouse_1F/border.bin", + "blockdata_filepath": "data/layouts/PalletTown_PlayersHouse_1F/map.bin" + }, + { + "id": "LAYOUT_PALLET_TOWN_PLAYERS_HOUSE_2F", + "name": "PalletTown_PlayersHouse_2F_Layout", + "width": 12, + "height": 9, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4C74", + "border_filepath": "data/layouts/PalletTown_PlayersHouse_2F/border.bin", + "blockdata_filepath": "data/layouts/PalletTown_PlayersHouse_2F/map.bin" + }, + { + "id": "LAYOUT_PALLET_TOWN_GARYS_HOUSE", + "name": "PalletTown_GarysHouse_Layout", + "width": 13, + "height": 10, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4E84", + "border_filepath": "data/layouts/PalletTown_GarysHouse/border.bin", + "blockdata_filepath": "data/layouts/PalletTown_GarysHouse/map.bin" + }, + { + "id": "LAYOUT_UNUSED_LAYOUT_82D54D8", + "name": "UnusedLayout_82D54D8_Layout", + "width": 9, + "height": 8, + "border_width": 0, + "border_height": 0, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4C74", + "border_filepath": "data/layouts/UnusedLayout_82D54D8/border.bin", + "blockdata_filepath": "data/layouts/UnusedLayout_82D54D8/map.bin" + }, + { + "id": "LAYOUT_PALLET_TOWN_PROFESSOR_OAKS_LAB", + "name": "PalletTown_ProfessorOaksLab_Layout", + "width": 13, + "height": 14, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4C8C", + "border_filepath": "data/layouts/PalletTown_ProfessorOaksLab/border.bin", + "blockdata_filepath": "data/layouts/PalletTown_ProfessorOaksLab/map.bin" + }, + { + "id": "LAYOUT_HOUSE1", + "name": "House1_Layout", + "width": 11, + "height": 9, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4C74", + "border_filepath": "data/layouts/House1/border.bin", + "blockdata_filepath": "data/layouts/House1/map.bin" + }, + { + "id": "LAYOUT_HOUSE2", + "name": "House2_Layout", + "width": 11, + "height": 9, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4E84", + "border_filepath": "data/layouts/House2/border.bin", + "blockdata_filepath": "data/layouts/House2/map.bin" + }, + { + "id": "LAYOUT_POKEMON_CENTER_1F", + "name": "PokemonCenter_1F_Layout", + "width": 15, + "height": 10, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4BE4", + "border_filepath": "data/layouts/PokemonCenter_1F/border.bin", + "blockdata_filepath": "data/layouts/PokemonCenter_1F/map.bin" + }, + { + "id": "LAYOUT_POKEMON_CENTER_2F", + "name": "PokemonCenter_2F_Layout", + "width": 15, + "height": 10, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4BE4", + "border_filepath": "data/layouts/PokemonCenter_2F/border.bin", + "blockdata_filepath": "data/layouts/PokemonCenter_2F/map.bin" + }, + { + "id": "LAYOUT_MART", + "name": "Mart_Layout", + "width": 11, + "height": 9, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4BCC", + "border_filepath": "data/layouts/Mart/border.bin", + "blockdata_filepath": "data/layouts/Mart/map.bin" + }, + { + "id": "LAYOUT_HOUSE3", + "name": "House3_Layout", + "width": 11, + "height": 9, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4E84", + "border_filepath": "data/layouts/House3/border.bin", + "blockdata_filepath": "data/layouts/House3/map.bin" + }, + { + "id": "LAYOUT_CERULEAN_CITY_GYM", + "name": "CeruleanCity_Gym_Layout", + "width": 17, + "height": 20, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4D1C", + "border_filepath": "data/layouts/CeruleanCity_Gym/border.bin", + "blockdata_filepath": "data/layouts/CeruleanCity_Gym/map.bin" + }, + { + "id": "LAYOUT_HOUSE4", + "name": "House4_Layout", + "width": 11, + "height": 9, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4E84", + "border_filepath": "data/layouts/House4/border.bin", + "blockdata_filepath": "data/layouts/House4/map.bin" + }, + { + "id": "LAYOUT_UNUSED_LAYOUT_82D6144", + "name": "UnusedLayout_82D6144_Layout", + "width": 11, + "height": 8, + "border_width": 0, + "border_height": 0, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4BCC", + "border_filepath": "data/layouts/UnusedLayout_82D6144/border.bin", + "blockdata_filepath": "data/layouts/UnusedLayout_82D6144/map.bin" + }, + { + "id": "LAYOUT_CELADON_CITY_GYM", + "name": "CeladonCity_Gym_Layout", + "width": 13, + "height": 20, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4D4C", + "border_filepath": "data/layouts/CeladonCity_Gym/border.bin", + "blockdata_filepath": "data/layouts/CeladonCity_Gym/map.bin" + }, + { + "id": "LAYOUT_UNUSED_LAYOUT_82D6490", + "name": "UnusedLayout_82D6490_Layout", + "width": 14, + "height": 9, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4BE4", + "border_filepath": "data/layouts/UnusedLayout_82D6490/border.bin", + "blockdata_filepath": "data/layouts/UnusedLayout_82D6490/map.bin" + }, + { + "id": "LAYOUT_FIVE_ISLAND_RESORT_GORGEOUS_HOUSE", + "name": "FiveIsland_ResortGorgeous_House_Layout", + "width": 11, + "height": 9, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4C2C", + "border_filepath": "data/layouts/FiveIsland_ResortGorgeous_House/border.bin", + "blockdata_filepath": "data/layouts/FiveIsland_ResortGorgeous_House/map.bin" + }, + { + "id": "LAYOUT_UNUSED_LAYOUT_82D6654", + "name": "UnusedLayout_82D6654_Layout", + "width": 10, + "height": 9, + "border_width": 0, + "border_height": 0, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4CD4", + "border_filepath": "data/layouts/UnusedLayout_82D6654/border.bin", + "blockdata_filepath": "data/layouts/UnusedLayout_82D6654/map.bin" + }, + { + "id": "LAYOUT_UNUSED_LAYOUT_82D672C", + "name": "UnusedLayout_82D672C_Layout", + "width": 10, + "height": 9, + "border_width": 0, + "border_height": 0, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4CD4", + "border_filepath": "data/layouts/UnusedLayout_82D672C/border.bin", + "blockdata_filepath": "data/layouts/UnusedLayout_82D672C/map.bin" + }, + { + "id": "LAYOUT_FUCHSIA_CITY_GYM", + "name": "FuchsiaCity_Gym_Layout", + "width": 15, + "height": 23, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4CA4", + "border_filepath": "data/layouts/FuchsiaCity_Gym/border.bin", + "blockdata_filepath": "data/layouts/FuchsiaCity_Gym/map.bin" + }, + { + "id": "LAYOUT_HOUSE5", + "name": "House5_Layout", + "width": 11, + "height": 9, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4C74", + "border_filepath": "data/layouts/House5/border.bin", + "blockdata_filepath": "data/layouts/House5/map.bin" + }, + {}, + {}, + { + "id": "LAYOUT_UNUSED_LAYOUT_82D6C34", + "name": "UnusedLayout_82D6C34_Layout", + "width": 12, + "height": 12, + "border_width": 2, + "border_height": 2, + "primary_tileset": "NULL", + "secondary_tileset": "gTileset_82D4C14", + "border_filepath": "data/layouts/UnusedLayout_82D6C34/border.bin", + "blockdata_filepath": "data/layouts/UnusedLayout_82D6C34/map.bin" + }, + { + "id": "LAYOUT_VERMILION_CITY_GYM", + "name": "VermilionCity_Gym_Layout", + "width": 11, + "height": 21, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4D34", + "border_filepath": "data/layouts/VermilionCity_Gym/border.bin", + "blockdata_filepath": "data/layouts/VermilionCity_Gym/map.bin" + }, + { + "id": "LAYOUT_CERULEAN_CITY_BIKE_SHOP", + "name": "CeruleanCity_BikeShop_Layout", + "width": 11, + "height": 10, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4C5C", + "border_filepath": "data/layouts/CeruleanCity_BikeShop/border.bin", + "blockdata_filepath": "data/layouts/CeruleanCity_BikeShop/map.bin" + }, + { + "id": "LAYOUT_CELADON_CITY_GAME_CORNER", + "name": "CeladonCity_GameCorner_Layout", + "width": 18, + "height": 15, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4CEC", + "border_filepath": "data/layouts/CeladonCity_GameCorner/border.bin", + "blockdata_filepath": "data/layouts/CeladonCity_GameCorner/map.bin" + }, + { + "id": "LAYOUT_PEWTER_CITY_GYM", + "name": "PewterCity_Gym_Layout", + "width": 13, + "height": 16, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4D04", + "border_filepath": "data/layouts/PewterCity_Gym/border.bin", + "blockdata_filepath": "data/layouts/PewterCity_Gym/map.bin" + }, + {}, + { + "id": "LAYOUT_FOUR_ISLAND_LORELEIS_HOUSE", + "name": "FourIsland_LoreleisHouse_Layout", + "width": 11, + "height": 9, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4F14", + "border_filepath": "data/layouts/FourIsland_LoreleisHouse/border.bin", + "blockdata_filepath": "data/layouts/FourIsland_LoreleisHouse/map.bin" + }, + { + "id": "LAYOUT_THREE_ISLAND_HOUSE1", + "name": "ThreeIsland_House1_Layout", + "width": 11, + "height": 9, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4C8C", + "border_filepath": "data/layouts/ThreeIsland_House1/border.bin", + "blockdata_filepath": "data/layouts/ThreeIsland_House1/map.bin" + }, + { + "id": "LAYOUT_UNUSED_LAYOUT_82D75F0", + "name": "UnusedLayout_82D75F0_Layout", + "width": 11, + "height": 9, + "border_width": 0, + "border_height": 0, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4CD4", + "border_filepath": "data/layouts/UnusedLayout_82D75F0/border.bin", + "blockdata_filepath": "data/layouts/UnusedLayout_82D75F0/map.bin" + }, + { + "id": "LAYOUT_UNUSED_LAYOUT_82D7674", + "name": "UnusedLayout_82D7674_Layout", + "width": 8, + "height": 6, + "border_width": 0, + "border_height": 0, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4CD4", + "border_filepath": "data/layouts/UnusedLayout_82D7674/border.bin", + "blockdata_filepath": "data/layouts/UnusedLayout_82D7674/map.bin" + }, + { + "id": "LAYOUT_SAFFRON_CITY_GYM", + "name": "SaffronCity_Gym_Layout", + "width": 29, + "height": 25, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4D64", + "border_filepath": "data/layouts/SaffronCity_Gym/border.bin", + "blockdata_filepath": "data/layouts/SaffronCity_Gym/map.bin" + }, + { + "id": "LAYOUT_UNUSED_LAYOUT_82D7CC8", + "name": "UnusedLayout_82D7CC8_Layout", + "width": 8, + "height": 6, + "border_width": 0, + "border_height": 0, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4CD4", + "border_filepath": "data/layouts/UnusedLayout_82D7CC8/border.bin", + "blockdata_filepath": "data/layouts/UnusedLayout_82D7CC8/map.bin" + }, + { + "id": "LAYOUT_CINNABAR_ISLAND_GYM", + "name": "CinnabarIsland_Gym_Layout", + "width": 30, + "height": 25, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4D7C", + "border_filepath": "data/layouts/CinnabarIsland_Gym/border.bin", + "blockdata_filepath": "data/layouts/CinnabarIsland_Gym/map.bin" + }, + { + "id": "LAYOUT_VIRIDIAN_CITY_GYM", + "name": "ViridianCity_Gym_Layout", + "width": 20, + "height": 24, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4CBC", + "border_filepath": "data/layouts/ViridianCity_Gym/border.bin", + "blockdata_filepath": "data/layouts/ViridianCity_Gym/map.bin" + }, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + { + "id": "LAYOUT_UNUSED_LAYOUT_82D88C8", + "name": "UnusedLayout_82D88C8_Layout", + "width": 18, + "height": 14, + "border_width": 0, + "border_height": 0, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4BCC", + "border_filepath": "data/layouts/UnusedLayout_82D88C8/border.bin", + "blockdata_filepath": "data/layouts/UnusedLayout_82D88C8/map.bin" + }, + { + "id": "LAYOUT_UNKNOWN_MAP_00_00", + "name": "UnknownMap_00_00_Layout", + "width": 14, + "height": 9, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4C44", + "border_filepath": "data/layouts/UnknownMap_00_00/border.bin", + "blockdata_filepath": "data/layouts/UnknownMap_00_00/map.bin" + }, + { + "id": "LAYOUT_UNKNOWN_MAP_00_01", + "name": "UnknownMap_00_01_Layout", + "width": 12, + "height": 9, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4C44", + "border_filepath": "data/layouts/UnknownMap_00_01/border.bin", + "blockdata_filepath": "data/layouts/UnknownMap_00_01/map.bin" + }, + { + "id": "LAYOUT_UNKNOWN_MAP_00_02", + "name": "UnknownMap_00_02_Layout", + "width": 20, + "height": 10, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4C44", + "border_filepath": "data/layouts/UnknownMap_00_02/border.bin", + "blockdata_filepath": "data/layouts/UnknownMap_00_02/map.bin" + }, + { + "id": "LAYOUT_UNKNOWN_MAP_00_03", + "name": "UnknownMap_00_03_Layout", + "width": 14, + "height": 9, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4C44", + "border_filepath": "data/layouts/UnknownMap_00_03/border.bin", + "blockdata_filepath": "data/layouts/UnknownMap_00_03/map.bin" + }, + { + "id": "LAYOUT_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE", + "name": "FuchsiaCity_SafariZone_Entrance_Layout", + "width": 9, + "height": 9, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4F14", + "border_filepath": "data/layouts/FuchsiaCity_SafariZone_Entrance/border.bin", + "blockdata_filepath": "data/layouts/FuchsiaCity_SafariZone_Entrance/map.bin" + }, + { + "id": "LAYOUT_UNUSED_LAYOUT_82D9B24", + "name": "UnusedLayout_82D9B24_Layout", + "width": 40, + "height": 40, + "border_width": 0, + "border_height": 0, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D4B6C", + "border_filepath": "data/layouts/UnusedLayout_82D9B24/border.bin", + "blockdata_filepath": "data/layouts/UnusedLayout_82D9B24/map.bin" + }, + { + "id": "LAYOUT_UNUSED_LAYOUT_82DA7C8", + "name": "UnusedLayout_82DA7C8_Layout", + "width": 40, + "height": 40, + "border_width": 0, + "border_height": 0, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D4B6C", + "border_filepath": "data/layouts/UnusedLayout_82DA7C8/border.bin", + "blockdata_filepath": "data/layouts/UnusedLayout_82DA7C8/map.bin" + }, + { + "id": "LAYOUT_UNUSED_LAYOUT_82DB46C", + "name": "UnusedLayout_82DB46C_Layout", + "width": 40, + "height": 40, + "border_width": 0, + "border_height": 0, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D4B6C", + "border_filepath": "data/layouts/UnusedLayout_82DB46C/border.bin", + "blockdata_filepath": "data/layouts/UnusedLayout_82DB46C/map.bin" + }, + { + "id": "LAYOUT_UNUSED_LAYOUT_82DB4F0", + "name": "UnusedLayout_82DB4F0_Layout", + "width": 8, + "height": 6, + "border_width": 0, + "border_height": 0, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4CD4", + "border_filepath": "data/layouts/UnusedLayout_82DB4F0/border.bin", + "blockdata_filepath": "data/layouts/UnusedLayout_82DB4F0/map.bin" + }, + {}, + { + "id": "LAYOUT_UNUSED_LAYOUT_82DBBE0", + "name": "UnusedLayout_82DBBE0_Layout", + "width": 29, + "height": 30, + "border_width": 0, + "border_height": 0, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D4ADC", + "border_filepath": "data/layouts/UnusedLayout_82DBBE0/border.bin", + "blockdata_filepath": "data/layouts/UnusedLayout_82DBBE0/map.bin" + }, + {}, + {}, + {}, + {}, + { + "id": "LAYOUT_UNUSED_LAYOUT_82DBDD8", + "name": "UnusedLayout_82DBDD8_Layout", + "width": 18, + "height": 13, + "border_width": 0, + "border_height": 0, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D4D94", + "border_filepath": "data/layouts/UnusedLayout_82DBDD8/border.bin", + "blockdata_filepath": "data/layouts/UnusedLayout_82DBDD8/map.bin" + }, + { + "id": "LAYOUT_UNUSED_LAYOUT_82DBFB8", + "name": "UnusedLayout_82DBFB8_Layout", + "width": 17, + "height": 13, + "border_width": 0, + "border_height": 0, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D4D94", + "border_filepath": "data/layouts/UnusedLayout_82DBFB8/border.bin", + "blockdata_filepath": "data/layouts/UnusedLayout_82DBFB8/map.bin" + }, + { + "id": "LAYOUT_UNUSED_LAYOUT_82DC4EC", + "name": "UnusedLayout_82DC4EC_Layout", + "width": 36, + "height": 18, + "border_width": 0, + "border_height": 0, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D4D94", + "border_filepath": "data/layouts/UnusedLayout_82DC4EC/border.bin", + "blockdata_filepath": "data/layouts/UnusedLayout_82DC4EC/map.bin" + }, + { + "id": "LAYOUT_UNUSED_LAYOUT_82DC60C", + "name": "UnusedLayout_82DC60C_Layout", + "width": 14, + "height": 9, + "border_width": 0, + "border_height": 0, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4CD4", + "border_filepath": "data/layouts/UnusedLayout_82DC60C/border.bin", + "blockdata_filepath": "data/layouts/UnusedLayout_82DC60C/map.bin" + }, + { + "id": "LAYOUT_UNUSED_LAYOUT_82DC72C", + "name": "UnusedLayout_82DC72C_Layout", + "width": 14, + "height": 9, + "border_width": 0, + "border_height": 0, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4CD4", + "border_filepath": "data/layouts/UnusedLayout_82DC72C/border.bin", + "blockdata_filepath": "data/layouts/UnusedLayout_82DC72C/map.bin" + }, + { + "id": "LAYOUT_UNUSED_LAYOUT_82DC84C", + "name": "UnusedLayout_82DC84C_Layout", + "width": 14, + "height": 9, + "border_width": 0, + "border_height": 0, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4CD4", + "border_filepath": "data/layouts/UnusedLayout_82DC84C/border.bin", + "blockdata_filepath": "data/layouts/UnusedLayout_82DC84C/map.bin" + }, + { + "id": "LAYOUT_UNUSED_LAYOUT_82DCA70", + "name": "UnusedLayout_82DCA70_Layout", + "width": 15, + "height": 17, + "border_width": 0, + "border_height": 0, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4C44", + "border_filepath": "data/layouts/UnusedLayout_82DCA70/border.bin", + "blockdata_filepath": "data/layouts/UnusedLayout_82DCA70/map.bin" + }, + { + "id": "LAYOUT_UNUSED_LAYOUT_82DCB44", + "name": "UnusedLayout_82DCB44_Layout", + "width": 11, + "height": 8, + "border_width": 0, + "border_height": 0, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4CD4", + "border_filepath": "data/layouts/UnusedLayout_82DCB44/border.bin", + "blockdata_filepath": "data/layouts/UnusedLayout_82DCB44/map.bin" + }, + { + "id": "LAYOUT_UNUSED_LAYOUT_82DCC40", + "name": "UnusedLayout_82DCC40_Layout", + "width": 12, + "height": 9, + "border_width": 0, + "border_height": 0, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4CD4", + "border_filepath": "data/layouts/UnusedLayout_82DCC40/border.bin", + "blockdata_filepath": "data/layouts/UnusedLayout_82DCC40/map.bin" + }, + { + "id": "LAYOUT_UNUSED_LAYOUT_82DCCD4", + "name": "UnusedLayout_82DCCD4_Layout", + "width": 8, + "height": 7, + "border_width": 0, + "border_height": 0, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4CD4", + "border_filepath": "data/layouts/UnusedLayout_82DCCD4/border.bin", + "blockdata_filepath": "data/layouts/UnusedLayout_82DCCD4/map.bin" + }, + { + "id": "LAYOUT_UNUSED_LAYOUT_82DCD68", + "name": "UnusedLayout_82DCD68_Layout", + "width": 8, + "height": 7, + "border_width": 0, + "border_height": 0, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4CD4", + "border_filepath": "data/layouts/UnusedLayout_82DCD68/border.bin", + "blockdata_filepath": "data/layouts/UnusedLayout_82DCD68/map.bin" + }, + { + "id": "LAYOUT_UNUSED_LAYOUT_82DCDFC", + "name": "UnusedLayout_82DCDFC_Layout", + "width": 8, + "height": 7, + "border_width": 0, + "border_height": 0, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4CD4", + "border_filepath": "data/layouts/UnusedLayout_82DCDFC/border.bin", + "blockdata_filepath": "data/layouts/UnusedLayout_82DCDFC/map.bin" + }, + { + "id": "LAYOUT_UNUSED_LAYOUT_82DCF00", + "name": "UnusedLayout_82DCF00_Layout", + "width": 14, + "height": 8, + "border_width": 0, + "border_height": 0, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4CD4", + "border_filepath": "data/layouts/UnusedLayout_82DCF00/border.bin", + "blockdata_filepath": "data/layouts/UnusedLayout_82DCF00/map.bin" + }, + { + "id": "LAYOUT_UNUSED_LAYOUT_82DD004", + "name": "UnusedLayout_82DD004_Layout", + "width": 14, + "height": 8, + "border_width": 0, + "border_height": 0, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4CD4", + "border_filepath": "data/layouts/UnusedLayout_82DD004/border.bin", + "blockdata_filepath": "data/layouts/UnusedLayout_82DD004/map.bin" + }, + {}, + { + "id": "LAYOUT_UNUSED_LAYOUT_82DD0DC", + "name": "UnusedLayout_82DD0DC_Layout", + "width": 10, + "height": 9, + "border_width": 0, + "border_height": 0, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4CD4", + "border_filepath": "data/layouts/UnusedLayout_82DD0DC/border.bin", + "blockdata_filepath": "data/layouts/UnusedLayout_82DD0DC/map.bin" + }, + { + "id": "LAYOUT_PALLET_TOWN", + "name": "PalletTown_Layout", + "width": 24, + "height": 20, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D4AAC", + "border_filepath": "data/layouts/PalletTown/border.bin", + "blockdata_filepath": "data/layouts/PalletTown/map.bin" + }, + { + "id": "LAYOUT_VIRIDIAN_CITY", + "name": "ViridianCity_Layout", + "width": 48, + "height": 40, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D4AC4", + "border_filepath": "data/layouts/ViridianCity/border.bin", + "blockdata_filepath": "data/layouts/ViridianCity/map.bin" + }, + { + "id": "LAYOUT_PEWTER_CITY", + "name": "PewterCity_Layout", + "width": 48, + "height": 40, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D4ADC", + "border_filepath": "data/layouts/PewterCity/border.bin", + "blockdata_filepath": "data/layouts/PewterCity/map.bin" + }, + { + "id": "LAYOUT_CERULEAN_CITY", + "name": "CeruleanCity_Layout", + "width": 48, + "height": 40, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D4AF4", + "border_filepath": "data/layouts/CeruleanCity/border.bin", + "blockdata_filepath": "data/layouts/CeruleanCity/map.bin" + }, + { + "id": "LAYOUT_LAVENDER_TOWN", + "name": "LavenderTown_Layout", + "width": 24, + "height": 20, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D4B0C", + "border_filepath": "data/layouts/LavenderTown/border.bin", + "blockdata_filepath": "data/layouts/LavenderTown/map.bin" + }, + { + "id": "LAYOUT_VERMILION_CITY", + "name": "VermilionCity_Layout", + "width": 48, + "height": 40, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D4B24", + "border_filepath": "data/layouts/VermilionCity/border.bin", + "blockdata_filepath": "data/layouts/VermilionCity/map.bin" + }, + { + "id": "LAYOUT_CELADON_CITY", + "name": "CeladonCity_Layout", + "width": 60, + "height": 40, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D4B3C", + "border_filepath": "data/layouts/CeladonCity/border.bin", + "blockdata_filepath": "data/layouts/CeladonCity/map.bin" + }, + { + "id": "LAYOUT_FUCHSIA_CITY", + "name": "FuchsiaCity_Layout", + "width": 48, + "height": 40, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D4B54", + "border_filepath": "data/layouts/FuchsiaCity/border.bin", + "blockdata_filepath": "data/layouts/FuchsiaCity/map.bin" + }, + { + "id": "LAYOUT_CINNABAR_ISLAND", + "name": "CinnabarIsland_Layout", + "width": 24, + "height": 20, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D4B6C", + "border_filepath": "data/layouts/CinnabarIsland/border.bin", + "blockdata_filepath": "data/layouts/CinnabarIsland/map.bin" + }, + { + "id": "LAYOUT_INDIGO_PLATEAU_EXTERIOR", + "name": "IndigoPlateau_Exterior_Layout", + "width": 24, + "height": 20, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D4B84", + "border_filepath": "data/layouts/IndigoPlateau_Exterior/border.bin", + "blockdata_filepath": "data/layouts/IndigoPlateau_Exterior/map.bin" + }, + { + "id": "LAYOUT_SAFFRON_CITY", + "name": "SaffronCity_Layout", + "width": 48, + "height": 40, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D4B9C", + "border_filepath": "data/layouts/SaffronCity/border.bin", + "blockdata_filepath": "data/layouts/SaffronCity/map.bin" + }, + { + "id": "LAYOUT_ROUTE1", + "name": "Route1_Layout", + "width": 24, + "height": 40, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D4AAC", + "border_filepath": "data/layouts/Route1/border.bin", + "blockdata_filepath": "data/layouts/Route1/map.bin" + }, + { + "id": "LAYOUT_ROUTE2", + "name": "Route2_Layout", + "width": 24, + "height": 80, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D4AC4", + "border_filepath": "data/layouts/Route2/border.bin", + "blockdata_filepath": "data/layouts/Route2/map.bin" + }, + { + "id": "LAYOUT_ROUTE3", + "name": "Route3_Layout", + "width": 84, + "height": 20, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D4ADC", + "border_filepath": "data/layouts/Route3/border.bin", + "blockdata_filepath": "data/layouts/Route3/map.bin" + }, + { + "id": "LAYOUT_ROUTE4", + "name": "Route4_Layout", + "width": 108, + "height": 20, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D4AF4", + "border_filepath": "data/layouts/Route4/border.bin", + "blockdata_filepath": "data/layouts/Route4/map.bin" + }, + { + "id": "LAYOUT_ROUTE5", + "name": "Route5_Layout", + "width": 48, + "height": 40, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D4AF4", + "border_filepath": "data/layouts/Route5/border.bin", + "blockdata_filepath": "data/layouts/Route5/map.bin" + }, + { + "id": "LAYOUT_ROUTE6", + "name": "Route6_Layout", + "width": 24, + "height": 40, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D4B24", + "border_filepath": "data/layouts/Route6/border.bin", + "blockdata_filepath": "data/layouts/Route6/map.bin" + }, + { + "id": "LAYOUT_ROUTE7", + "name": "Route7_Layout", + "width": 24, + "height": 20, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D4B3C", + "border_filepath": "data/layouts/Route7/border.bin", + "blockdata_filepath": "data/layouts/Route7/map.bin" + }, + { + "id": "LAYOUT_ROUTE8", + "name": "Route8_Layout", + "width": 72, + "height": 20, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D4B0C", + "border_filepath": "data/layouts/Route8/border.bin", + "blockdata_filepath": "data/layouts/Route8/map.bin" + }, + { + "id": "LAYOUT_ROUTE9", + "name": "Route9_Layout", + "width": 72, + "height": 20, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D4AF4", + "border_filepath": "data/layouts/Route9/border.bin", + "blockdata_filepath": "data/layouts/Route9/map.bin" + }, + { + "id": "LAYOUT_ROUTE10", + "name": "Route10_Layout", + "width": 24, + "height": 80, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D4B0C", + "border_filepath": "data/layouts/Route10/border.bin", + "blockdata_filepath": "data/layouts/Route10/map.bin" + }, + { + "id": "LAYOUT_ROUTE11", + "name": "Route11_Layout", + "width": 72, + "height": 20, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D4B24", + "border_filepath": "data/layouts/Route11/border.bin", + "blockdata_filepath": "data/layouts/Route11/map.bin" + }, + { + "id": "LAYOUT_ROUTE12", + "name": "Route12_Layout", + "width": 24, + "height": 120, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D4B0C", + "border_filepath": "data/layouts/Route12/border.bin", + "blockdata_filepath": "data/layouts/Route12/map.bin" + }, + { + "id": "LAYOUT_ROUTE13", + "name": "Route13_Layout", + "width": 72, + "height": 20, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D4B0C", + "border_filepath": "data/layouts/Route13/border.bin", + "blockdata_filepath": "data/layouts/Route13/map.bin" + }, + { + "id": "LAYOUT_ROUTE14", + "name": "Route14_Layout", + "width": 24, + "height": 60, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D4B0C", + "border_filepath": "data/layouts/Route14/border.bin", + "blockdata_filepath": "data/layouts/Route14/map.bin" + }, + { + "id": "LAYOUT_ROUTE15", + "name": "Route15_Layout", + "width": 72, + "height": 20, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D4B54", + "border_filepath": "data/layouts/Route15/border.bin", + "blockdata_filepath": "data/layouts/Route15/map.bin" + }, + { + "id": "LAYOUT_ROUTE16", + "name": "Route16_Layout", + "width": 48, + "height": 20, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D4B3C", + "border_filepath": "data/layouts/Route16/border.bin", + "blockdata_filepath": "data/layouts/Route16/map.bin" + }, + { + "id": "LAYOUT_ROUTE17", + "name": "Route17_Layout", + "width": 24, + "height": 160, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D4B3C", + "border_filepath": "data/layouts/Route17/border.bin", + "blockdata_filepath": "data/layouts/Route17/map.bin" + }, + { + "id": "LAYOUT_ROUTE18", + "name": "Route18_Layout", + "width": 60, + "height": 20, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D4B3C", + "border_filepath": "data/layouts/Route18/border.bin", + "blockdata_filepath": "data/layouts/Route18/map.bin" + }, + { + "id": "LAYOUT_ROUTE19", + "name": "Route19_Layout", + "width": 24, + "height": 60, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D4B54", + "border_filepath": "data/layouts/Route19/border.bin", + "blockdata_filepath": "data/layouts/Route19/map.bin" + }, + { + "id": "LAYOUT_ROUTE20", + "name": "Route20_Layout", + "width": 120, + "height": 20, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D4B6C", + "border_filepath": "data/layouts/Route20/border.bin", + "blockdata_filepath": "data/layouts/Route20/map.bin" + }, + { + "id": "LAYOUT_ROUTE21_NORTH", + "name": "Route21_North_Layout", + "width": 24, + "height": 50, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D4AAC", + "border_filepath": "data/layouts/Route21_North/border.bin", + "blockdata_filepath": "data/layouts/Route21_North/map.bin" + }, + { + "id": "LAYOUT_ROUTE22", + "name": "Route22_Layout", + "width": 48, + "height": 24, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D4AC4", + "border_filepath": "data/layouts/Route22/border.bin", + "blockdata_filepath": "data/layouts/Route22/map.bin" + }, + { + "id": "LAYOUT_ROUTE23", + "name": "Route23_Layout", + "width": 24, + "height": 160, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D4B84", + "border_filepath": "data/layouts/Route23/border.bin", + "blockdata_filepath": "data/layouts/Route23/map.bin" + }, + { + "id": "LAYOUT_ROUTE24", + "name": "Route24_Layout", + "width": 24, + "height": 40, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D4AF4", + "border_filepath": "data/layouts/Route24/border.bin", + "blockdata_filepath": "data/layouts/Route24/map.bin" + }, + { + "id": "LAYOUT_ROUTE25", + "name": "Route25_Layout", + "width": 72, + "height": 20, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D4AF4", + "border_filepath": "data/layouts/Route25/border.bin", + "blockdata_filepath": "data/layouts/Route25/map.bin" + }, + { + "id": "LAYOUT_MT_MOON_1F", + "name": "MtMoon_1F_Layout", + "width": 48, + "height": 40, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D4BFC", + "border_filepath": "data/layouts/MtMoon_1F/border.bin", + "blockdata_filepath": "data/layouts/MtMoon_1F/map.bin" + }, + { + "id": "LAYOUT_MT_MOON_B1F", + "name": "MtMoon_B1F_Layout", + "width": 49, + "height": 40, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D4BFC", + "border_filepath": "data/layouts/MtMoon_B1F/border.bin", + "blockdata_filepath": "data/layouts/MtMoon_B1F/map.bin" + }, + { + "id": "LAYOUT_MT_MOON_B2F", + "name": "MtMoon_B2F_Layout", + "width": 48, + "height": 40, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D4BFC", + "border_filepath": "data/layouts/MtMoon_B2F/border.bin", + "blockdata_filepath": "data/layouts/MtMoon_B2F/map.bin" + }, + { + "id": "LAYOUT_VIRIDIAN_FOREST", + "name": "ViridianForest_Layout", + "width": 54, + "height": 69, + "border_width": 3, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D4DC4", + "border_filepath": "data/layouts/ViridianForest/border.bin", + "blockdata_filepath": "data/layouts/ViridianForest/map.bin" + }, + { + "id": "LAYOUT_SSANNE_EXTERIOR", + "name": "SSAnne_Exterior_Layout", + "width": 70, + "height": 32, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D4B24", + "border_filepath": "data/layouts/SSAnne_Exterior/border.bin", + "blockdata_filepath": "data/layouts/SSAnne_Exterior/map.bin" + }, + { + "id": "LAYOUT_SSANNE_1F_CORRIDOR", + "name": "SSAnne_1F_Corridor_Layout", + "width": 31, + "height": 21, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D4D94", + "border_filepath": "data/layouts/SSAnne_1F_Corridor/border.bin", + "blockdata_filepath": "data/layouts/SSAnne_1F_Corridor/map.bin" + }, + { + "id": "LAYOUT_SSANNE_2F_CORRIDOR", + "name": "SSAnne_2F_Corridor_Layout", + "width": 34, + "height": 16, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D4D94", + "border_filepath": "data/layouts/SSAnne_2F_Corridor/border.bin", + "blockdata_filepath": "data/layouts/SSAnne_2F_Corridor/map.bin" + }, + { + "id": "LAYOUT_SSANNE_3F_CORRIDOR", + "name": "SSAnne_3F_Corridor_Layout", + "width": 22, + "height": 7, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D4D94", + "border_filepath": "data/layouts/SSAnne_3F_Corridor/border.bin", + "blockdata_filepath": "data/layouts/SSAnne_3F_Corridor/map.bin" + }, + { + "id": "LAYOUT_SSANNE_B1F_CORRIDOR", + "name": "SSAnne_B1F_Corridor_Layout", + "width": 23, + "height": 7, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D4D94", + "border_filepath": "data/layouts/SSAnne_B1F_Corridor/border.bin", + "blockdata_filepath": "data/layouts/SSAnne_B1F_Corridor/map.bin" + }, + { + "id": "LAYOUT_SSANNE_DECK", + "name": "SSAnne_Deck_Layout", + "width": 24, + "height": 19, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D4D94", + "border_filepath": "data/layouts/SSAnne_Deck/border.bin", + "blockdata_filepath": "data/layouts/SSAnne_Deck/map.bin" + }, + { + "id": "LAYOUT_DIGLETTS_CAVE_B1F", + "name": "DiglettsCave_B1F_Layout", + "width": 85, + "height": 80, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D4E0C", + "border_filepath": "data/layouts/DiglettsCave_B1F/border.bin", + "blockdata_filepath": "data/layouts/DiglettsCave_B1F/map.bin" + }, + { + "id": "LAYOUT_VICTORY_ROAD_1F", + "name": "VictoryRoad_1F_Layout", + "width": 48, + "height": 22, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D4BFC", + "border_filepath": "data/layouts/VictoryRoad_1F/border.bin", + "blockdata_filepath": "data/layouts/VictoryRoad_1F/map.bin" + }, + { + "id": "LAYOUT_VICTORY_ROAD_2F", + "name": "VictoryRoad_2F_Layout", + "width": 51, + "height": 22, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D4BFC", + "border_filepath": "data/layouts/VictoryRoad_2F/border.bin", + "blockdata_filepath": "data/layouts/VictoryRoad_2F/map.bin" + }, + { + "id": "LAYOUT_VICTORY_ROAD_3F", + "name": "VictoryRoad_3F_Layout", + "width": 45, + "height": 22, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D4BFC", + "border_filepath": "data/layouts/VictoryRoad_3F/border.bin", + "blockdata_filepath": "data/layouts/VictoryRoad_3F/map.bin" + }, + { + "id": "LAYOUT_ROCKET_HIDEOUT_B1F", + "name": "RocketHideout_B1F_Layout", + "width": 28, + "height": 34, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4ECC", + "border_filepath": "data/layouts/RocketHideout_B1F/border.bin", + "blockdata_filepath": "data/layouts/RocketHideout_B1F/map.bin" + }, + { + "id": "LAYOUT_ROCKET_HIDEOUT_B2F", + "name": "RocketHideout_B2F_Layout", + "width": 32, + "height": 22, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4ECC", + "border_filepath": "data/layouts/RocketHideout_B2F/border.bin", + "blockdata_filepath": "data/layouts/RocketHideout_B2F/map.bin" + }, + { + "id": "LAYOUT_ROCKET_HIDEOUT_B3F", + "name": "RocketHideout_B3F_Layout", + "width": 22, + "height": 27, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4ECC", + "border_filepath": "data/layouts/RocketHideout_B3F/border.bin", + "blockdata_filepath": "data/layouts/RocketHideout_B3F/map.bin" + }, + { + "id": "LAYOUT_ROCKET_HIDEOUT_B4F", + "name": "RocketHideout_B4F_Layout", + "width": 24, + "height": 26, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4ECC", + "border_filepath": "data/layouts/RocketHideout_B4F/border.bin", + "blockdata_filepath": "data/layouts/RocketHideout_B4F/map.bin" + }, + { + "id": "LAYOUT_SILPH_CO_1F", + "name": "SilphCo_1F_Layout", + "width": 36, + "height": 22, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4ECC", + "border_filepath": "data/layouts/SilphCo_1F/border.bin", + "blockdata_filepath": "data/layouts/SilphCo_1F/map.bin" + }, + { + "id": "LAYOUT_SILPH_CO_2F", + "name": "SilphCo_2F_Layout", + "width": 36, + "height": 22, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4ECC", + "border_filepath": "data/layouts/SilphCo_2F/border.bin", + "blockdata_filepath": "data/layouts/SilphCo_2F/map.bin" + }, + { + "id": "LAYOUT_SILPH_CO_3F", + "name": "SilphCo_3F_Layout", + "width": 36, + "height": 22, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4ECC", + "border_filepath": "data/layouts/SilphCo_3F/border.bin", + "blockdata_filepath": "data/layouts/SilphCo_3F/map.bin" + }, + { + "id": "LAYOUT_SILPH_CO_4F", + "name": "SilphCo_4F_Layout", + "width": 36, + "height": 22, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4ECC", + "border_filepath": "data/layouts/SilphCo_4F/border.bin", + "blockdata_filepath": "data/layouts/SilphCo_4F/map.bin" + }, + { + "id": "LAYOUT_SILPH_CO_5F", + "name": "SilphCo_5F_Layout", + "width": 36, + "height": 22, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4ECC", + "border_filepath": "data/layouts/SilphCo_5F/border.bin", + "blockdata_filepath": "data/layouts/SilphCo_5F/map.bin" + }, + { + "id": "LAYOUT_SILPH_CO_6F", + "name": "SilphCo_6F_Layout", + "width": 31, + "height": 19, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4ECC", + "border_filepath": "data/layouts/SilphCo_6F/border.bin", + "blockdata_filepath": "data/layouts/SilphCo_6F/map.bin" + }, + { + "id": "LAYOUT_SILPH_CO_7F", + "name": "SilphCo_7F_Layout", + "width": 31, + "height": 19, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4ECC", + "border_filepath": "data/layouts/SilphCo_7F/border.bin", + "blockdata_filepath": "data/layouts/SilphCo_7F/map.bin" + }, + { + "id": "LAYOUT_SILPH_CO_8F", + "name": "SilphCo_8F_Layout", + "width": 31, + "height": 19, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4ECC", + "border_filepath": "data/layouts/SilphCo_8F/border.bin", + "blockdata_filepath": "data/layouts/SilphCo_8F/map.bin" + }, + { + "id": "LAYOUT_SILPH_CO_9F", + "name": "SilphCo_9F_Layout", + "width": 31, + "height": 19, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4ECC", + "border_filepath": "data/layouts/SilphCo_9F/border.bin", + "blockdata_filepath": "data/layouts/SilphCo_9F/map.bin" + }, + { + "id": "LAYOUT_SILPH_CO_10F", + "name": "SilphCo_10F_Layout", + "width": 17, + "height": 19, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4ECC", + "border_filepath": "data/layouts/SilphCo_10F/border.bin", + "blockdata_filepath": "data/layouts/SilphCo_10F/map.bin" + }, + { + "id": "LAYOUT_SILPH_CO_11F", + "name": "SilphCo_11F_Layout", + "width": 17, + "height": 20, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4ECC", + "border_filepath": "data/layouts/SilphCo_11F/border.bin", + "blockdata_filepath": "data/layouts/SilphCo_11F/map.bin" + }, + { + "id": "LAYOUT_POKEMON_MANSION_1F", + "name": "PokemonMansion_1F_Layout", + "width": 38, + "height": 35, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4F2C", + "border_filepath": "data/layouts/PokemonMansion_1F/border.bin", + "blockdata_filepath": "data/layouts/PokemonMansion_1F/map.bin" + }, + { + "id": "LAYOUT_POKEMON_MANSION_2F", + "name": "PokemonMansion_2F_Layout", + "width": 38, + "height": 38, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4F2C", + "border_filepath": "data/layouts/PokemonMansion_2F/border.bin", + "blockdata_filepath": "data/layouts/PokemonMansion_2F/map.bin" + }, + { + "id": "LAYOUT_POKEMON_MANSION_3F", + "name": "PokemonMansion_3F_Layout", + "width": 38, + "height": 35, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4F2C", + "border_filepath": "data/layouts/PokemonMansion_3F/border.bin", + "blockdata_filepath": "data/layouts/PokemonMansion_3F/map.bin" + }, + { + "id": "LAYOUT_POKEMON_MANSION_B1F", + "name": "PokemonMansion_B1F_Layout", + "width": 38, + "height": 35, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4F2C", + "border_filepath": "data/layouts/PokemonMansion_B1F/border.bin", + "blockdata_filepath": "data/layouts/PokemonMansion_B1F/map.bin" + }, + { + "id": "LAYOUT_SAFARI_ZONE_CENTER", + "name": "SafariZone_Center_Layout", + "width": 51, + "height": 36, + "border_width": 3, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D4B54", + "border_filepath": "data/layouts/SafariZone_Center/border.bin", + "blockdata_filepath": "data/layouts/SafariZone_Center/map.bin" + }, + { + "id": "LAYOUT_SAFARI_ZONE_EAST", + "name": "SafariZone_East_Layout", + "width": 54, + "height": 35, + "border_width": 3, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D4B54", + "border_filepath": "data/layouts/SafariZone_East/border.bin", + "blockdata_filepath": "data/layouts/SafariZone_East/map.bin" + }, + { + "id": "LAYOUT_SAFARI_ZONE_NORTH", + "name": "SafariZone_North_Layout", + "width": 57, + "height": 40, + "border_width": 3, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D4B54", + "border_filepath": "data/layouts/SafariZone_North/border.bin", + "blockdata_filepath": "data/layouts/SafariZone_North/map.bin" + }, + { + "id": "LAYOUT_SAFARI_ZONE_WEST", + "name": "SafariZone_West_Layout", + "width": 48, + "height": 36, + "border_width": 3, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D4B54", + "border_filepath": "data/layouts/SafariZone_West/border.bin", + "blockdata_filepath": "data/layouts/SafariZone_West/map.bin" + }, + { + "id": "LAYOUT_CERULEAN_CAVE_1F", + "name": "CeruleanCave_1F_Layout", + "width": 40, + "height": 23, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D4E54", + "border_filepath": "data/layouts/CeruleanCave_1F/border.bin", + "blockdata_filepath": "data/layouts/CeruleanCave_1F/map.bin" + }, + { + "id": "LAYOUT_CERULEAN_CAVE_2F", + "name": "CeruleanCave_2F_Layout", + "width": 40, + "height": 23, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D4E54", + "border_filepath": "data/layouts/CeruleanCave_2F/border.bin", + "blockdata_filepath": "data/layouts/CeruleanCave_2F/map.bin" + }, + { + "id": "LAYOUT_CERULEAN_CAVE_B1F", + "name": "CeruleanCave_B1F_Layout", + "width": 40, + "height": 23, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D4E54", + "border_filepath": "data/layouts/CeruleanCave_B1F/border.bin", + "blockdata_filepath": "data/layouts/CeruleanCave_B1F/map.bin" + }, + { + "id": "LAYOUT_ROCK_TUNNEL_1F", + "name": "RockTunnel_1F_Layout", + "width": 48, + "height": 40, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D4DF4", + "border_filepath": "data/layouts/RockTunnel_1F/border.bin", + "blockdata_filepath": "data/layouts/RockTunnel_1F/map.bin" + }, + { + "id": "LAYOUT_ROCK_TUNNEL_B1F", + "name": "RockTunnel_B1F_Layout", + "width": 48, + "height": 40, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D4DF4", + "border_filepath": "data/layouts/RockTunnel_B1F/border.bin", + "blockdata_filepath": "data/layouts/RockTunnel_B1F/map.bin" + }, + { + "id": "LAYOUT_SEAFOAM_ISLANDS_1F", + "name": "SeafoamIslands_1F_Layout", + "width": 38, + "height": 24, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D4E24", + "border_filepath": "data/layouts/SeafoamIslands_1F/border.bin", + "blockdata_filepath": "data/layouts/SeafoamIslands_1F/map.bin" + }, + { + "id": "LAYOUT_SEAFOAM_ISLANDS_B1F", + "name": "SeafoamIslands_B1F_Layout", + "width": 38, + "height": 23, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D4E24", + "border_filepath": "data/layouts/SeafoamIslands_B1F/border.bin", + "blockdata_filepath": "data/layouts/SeafoamIslands_B1F/map.bin" + }, + { + "id": "LAYOUT_SEAFOAM_ISLANDS_B2F", + "name": "SeafoamIslands_B2F_Layout", + "width": 38, + "height": 24, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D4E24", + "border_filepath": "data/layouts/SeafoamIslands_B2F/border.bin", + "blockdata_filepath": "data/layouts/SeafoamIslands_B2F/map.bin" + }, + { + "id": "LAYOUT_SEAFOAM_ISLANDS_B3F", + "name": "SeafoamIslands_B3F_Layout", + "width": 38, + "height": 24, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D4E24", + "border_filepath": "data/layouts/SeafoamIslands_B3F/border.bin", + "blockdata_filepath": "data/layouts/SeafoamIslands_B3F/map.bin" + }, + { + "id": "LAYOUT_SEAFOAM_ISLANDS_B4F", + "name": "SeafoamIslands_B4F_Layout", + "width": 38, + "height": 24, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D4E24", + "border_filepath": "data/layouts/SeafoamIslands_B4F/border.bin", + "blockdata_filepath": "data/layouts/SeafoamIslands_B4F/map.bin" + }, + { + "id": "LAYOUT_POKEMON_TOWER_1F", + "name": "PokemonTower_1F_Layout", + "width": 24, + "height": 20, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4EFC", + "border_filepath": "data/layouts/PokemonTower_1F/border.bin", + "blockdata_filepath": "data/layouts/PokemonTower_1F/map.bin" + }, + { + "id": "LAYOUT_POKEMON_TOWER_2F", + "name": "PokemonTower_2F_Layout", + "width": 24, + "height": 20, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4EFC", + "border_filepath": "data/layouts/PokemonTower_2F/border.bin", + "blockdata_filepath": "data/layouts/PokemonTower_2F/map.bin" + }, + { + "id": "LAYOUT_POKEMON_TOWER_3F", + "name": "PokemonTower_3F_Layout", + "width": 24, + "height": 20, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4EFC", + "border_filepath": "data/layouts/PokemonTower_3F/border.bin", + "blockdata_filepath": "data/layouts/PokemonTower_3F/map.bin" + }, + { + "id": "LAYOUT_POKEMON_TOWER_4F", + "name": "PokemonTower_4F_Layout", + "width": 24, + "height": 20, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4EFC", + "border_filepath": "data/layouts/PokemonTower_4F/border.bin", + "blockdata_filepath": "data/layouts/PokemonTower_4F/map.bin" + }, + { + "id": "LAYOUT_POKEMON_TOWER_5F", + "name": "PokemonTower_5F_Layout", + "width": 24, + "height": 20, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4EFC", + "border_filepath": "data/layouts/PokemonTower_5F/border.bin", + "blockdata_filepath": "data/layouts/PokemonTower_5F/map.bin" + }, + { + "id": "LAYOUT_POKEMON_TOWER_6F", + "name": "PokemonTower_6F_Layout", + "width": 24, + "height": 20, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4EFC", + "border_filepath": "data/layouts/PokemonTower_6F/border.bin", + "blockdata_filepath": "data/layouts/PokemonTower_6F/map.bin" + }, + { + "id": "LAYOUT_POKEMON_TOWER_7F", + "name": "PokemonTower_7F_Layout", + "width": 24, + "height": 20, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4EFC", + "border_filepath": "data/layouts/PokemonTower_7F/border.bin", + "blockdata_filepath": "data/layouts/PokemonTower_7F/map.bin" + }, + { + "id": "LAYOUT_POWER_PLANT", + "name": "PowerPlant_Layout", + "width": 49, + "height": 40, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4E9C", + "border_filepath": "data/layouts/PowerPlant/border.bin", + "blockdata_filepath": "data/layouts/PowerPlant/map.bin" + }, + { + "id": "LAYOUT_ROUTE25_SEA_COTTAGE", + "name": "Route25_SeaCottage_Layout", + "width": 15, + "height": 11, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4EB4", + "border_filepath": "data/layouts/Route25_SeaCottage/border.bin", + "blockdata_filepath": "data/layouts/Route25_SeaCottage/map.bin" + }, + { + "id": "LAYOUT_SSANNE_KITCHEN", + "name": "SSAnne_Kitchen_Layout", + "width": 16, + "height": 14, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D4D94", + "border_filepath": "data/layouts/SSAnne_Kitchen/border.bin", + "blockdata_filepath": "data/layouts/SSAnne_Kitchen/map.bin" + }, + { + "id": "LAYOUT_SSANNE_CAPTAINS_OFFICE", + "name": "SSAnne_CaptainsOffice_Layout", + "width": 9, + "height": 10, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D4D94", + "border_filepath": "data/layouts/SSAnne_CaptainsOffice/border.bin", + "blockdata_filepath": "data/layouts/SSAnne_CaptainsOffice/map.bin" + }, + { + "id": "LAYOUT_UNDERGROUND_PATH_ENTRANCE", + "name": "UndergroundPath_Entrance_Layout", + "width": 13, + "height": 10, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4E84", + "border_filepath": "data/layouts/UndergroundPath_Entrance/border.bin", + "blockdata_filepath": "data/layouts/UndergroundPath_Entrance/map.bin" + }, + { + "id": "LAYOUT_UNDERGROUND_PATH_EAST_WEST_TUNNEL", + "name": "UndergroundPath_EastWestTunnel_Layout", + "width": 80, + "height": 7, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4EE4", + "border_filepath": "data/layouts/UndergroundPath_EastWestTunnel/border.bin", + "blockdata_filepath": "data/layouts/UndergroundPath_EastWestTunnel/map.bin" + }, + { + "id": "LAYOUT_UNDERGROUND_PATH_NORTH_SOUTH_TUNNEL", + "name": "UndergroundPath_NorthSouthTunnel_Layout", + "width": 8, + "height": 63, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4EE4", + "border_filepath": "data/layouts/UndergroundPath_NorthSouthTunnel/border.bin", + "blockdata_filepath": "data/layouts/UndergroundPath_NorthSouthTunnel/map.bin" + }, + {}, + { + "id": "LAYOUT_ROUTE12_NORTH_ENTRANCE_1F", + "name": "Route12_NorthEntrance_1F_Layout", + "width": 11, + "height": 13, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4E84", + "border_filepath": "data/layouts/Route12_NorthEntrance_1F/border.bin", + "blockdata_filepath": "data/layouts/Route12_NorthEntrance_1F/map.bin" + }, + { + "id": "LAYOUT_SSANNE_ROOM1", + "name": "SSAnne_Room1_Layout", + "width": 6, + "height": 8, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D4D94", + "border_filepath": "data/layouts/SSAnne_Room1/border.bin", + "blockdata_filepath": "data/layouts/SSAnne_Room1/map.bin" + }, + { + "id": "LAYOUT_SSANNE_ROOM2", + "name": "SSAnne_Room2_Layout", + "width": 6, + "height": 9, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D4D94", + "border_filepath": "data/layouts/SSAnne_Room2/border.bin", + "blockdata_filepath": "data/layouts/SSAnne_Room2/map.bin" + }, + { + "id": "LAYOUT_CELADON_CITY_DEPARTMENT_STORE_ELEVATOR", + "name": "CeladonCity_DepartmentStore_Elevator_Layout", + "width": 5, + "height": 7, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4ECC", + "border_filepath": "data/layouts/CeladonCity_DepartmentStore_Elevator/border.bin", + "blockdata_filepath": "data/layouts/CeladonCity_DepartmentStore_Elevator/map.bin" + }, + { + "id": "LAYOUT_PEWTER_CITY_MUSEUM_1F", + "name": "PewterCity_Museum_1F_Layout", + "width": 28, + "height": 11, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4C2C", + "border_filepath": "data/layouts/PewterCity_Museum_1F/border.bin", + "blockdata_filepath": "data/layouts/PewterCity_Museum_1F/map.bin" + }, + { + "id": "LAYOUT_PEWTER_CITY_MUSEUM_2F", + "name": "PewterCity_Museum_2F_Layout", + "width": 19, + "height": 10, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4C2C", + "border_filepath": "data/layouts/PewterCity_Museum_2F/border.bin", + "blockdata_filepath": "data/layouts/PewterCity_Museum_2F/map.bin" + }, + { + "id": "LAYOUT_CERULEAN_CITY_HOUSE2", + "name": "CeruleanCity_House2_Layout", + "width": 10, + "height": 9, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4FA4", + "border_filepath": "data/layouts/CeruleanCity_House2/border.bin", + "blockdata_filepath": "data/layouts/CeruleanCity_House2/map.bin" + }, + { + "id": "LAYOUT_CERULEAN_CITY_HOUSE1", + "name": "CeruleanCity_House1_Layout", + "width": 10, + "height": 10, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4E84", + "border_filepath": "data/layouts/CeruleanCity_House1/border.bin", + "blockdata_filepath": "data/layouts/CeruleanCity_House1/map.bin" + }, + { + "id": "LAYOUT_CELADON_CITY_CONDOMINIUMS_1F", + "name": "CeladonCity_Condominiums_1F_Layout", + "width": 15, + "height": 20, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4F8C", + "border_filepath": "data/layouts/CeladonCity_Condominiums_1F/border.bin", + "blockdata_filepath": "data/layouts/CeladonCity_Condominiums_1F/map.bin" + }, + { + "id": "LAYOUT_CELADON_CITY_CONDOMINIUMS_2F", + "name": "CeladonCity_Condominiums_2F_Layout", + "width": 15, + "height": 20, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4F8C", + "border_filepath": "data/layouts/CeladonCity_Condominiums_2F/border.bin", + "blockdata_filepath": "data/layouts/CeladonCity_Condominiums_2F/map.bin" + }, + { + "id": "LAYOUT_CELADON_CITY_CONDOMINIUMS_3F", + "name": "CeladonCity_Condominiums_3F_Layout", + "width": 15, + "height": 20, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4F8C", + "border_filepath": "data/layouts/CeladonCity_Condominiums_3F/border.bin", + "blockdata_filepath": "data/layouts/CeladonCity_Condominiums_3F/map.bin" + }, + { + "id": "LAYOUT_CELADON_CITY_CONDOMINIUMS_ROOF", + "name": "CeladonCity_Condominiums_Roof_Layout", + "width": 14, + "height": 23, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4F8C", + "border_filepath": "data/layouts/CeladonCity_Condominiums_Roof/border.bin", + "blockdata_filepath": "data/layouts/CeladonCity_Condominiums_Roof/map.bin" + }, + { + "id": "LAYOUT_CELADON_CITY_CONDOMINIUMS_ROOF_ROOM", + "name": "CeladonCity_Condominiums_RoofRoom_Layout", + "width": 10, + "height": 9, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4F5C", + "border_filepath": "data/layouts/CeladonCity_Condominiums_RoofRoom/border.bin", + "blockdata_filepath": "data/layouts/CeladonCity_Condominiums_RoofRoom/map.bin" + }, + { + "id": "LAYOUT_CELADON_CITY_GAME_CORNER_PRIZE_ROOM", + "name": "CeladonCity_GameCorner_PrizeRoom_Layout", + "width": 9, + "height": 10, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4CEC", + "border_filepath": "data/layouts/CeladonCity_GameCorner_PrizeRoom/border.bin", + "blockdata_filepath": "data/layouts/CeladonCity_GameCorner_PrizeRoom/map.bin" + }, + { + "id": "LAYOUT_CELADON_CITY_RESTAURANT", + "name": "CeladonCity_Restaurant_Layout", + "width": 15, + "height": 11, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4F44", + "border_filepath": "data/layouts/CeladonCity_Restaurant/border.bin", + "blockdata_filepath": "data/layouts/CeladonCity_Restaurant/map.bin" + }, + { + "id": "LAYOUT_CELADON_CITY_HOTEL", + "name": "CeladonCity_Hotel_Layout", + "width": 17, + "height": 11, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4F44", + "border_filepath": "data/layouts/CeladonCity_Hotel/border.bin", + "blockdata_filepath": "data/layouts/CeladonCity_Hotel/map.bin" + }, + { + "id": "LAYOUT_CELADON_CITY_DEPARTMENT_STORE_1F", + "name": "CeladonCity_DepartmentStore_1F_Layout", + "width": 13, + "height": 16, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4E6C", + "border_filepath": "data/layouts/CeladonCity_DepartmentStore_1F/border.bin", + "blockdata_filepath": "data/layouts/CeladonCity_DepartmentStore_1F/map.bin" + }, + { + "id": "LAYOUT_CELADON_CITY_DEPARTMENT_STORE_2F", + "name": "CeladonCity_DepartmentStore_2F_Layout", + "width": 13, + "height": 15, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4E6C", + "border_filepath": "data/layouts/CeladonCity_DepartmentStore_2F/border.bin", + "blockdata_filepath": "data/layouts/CeladonCity_DepartmentStore_2F/map.bin" + }, + { + "id": "LAYOUT_CELADON_CITY_DEPARTMENT_STORE_3F", + "name": "CeladonCity_DepartmentStore_3F_Layout", + "width": 13, + "height": 15, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4E6C", + "border_filepath": "data/layouts/CeladonCity_DepartmentStore_3F/border.bin", + "blockdata_filepath": "data/layouts/CeladonCity_DepartmentStore_3F/map.bin" + }, + { + "id": "LAYOUT_CELADON_CITY_DEPARTMENT_STORE_4F", + "name": "CeladonCity_DepartmentStore_4F_Layout", + "width": 13, + "height": 15, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4E6C", + "border_filepath": "data/layouts/CeladonCity_DepartmentStore_4F/border.bin", + "blockdata_filepath": "data/layouts/CeladonCity_DepartmentStore_4F/map.bin" + }, + { + "id": "LAYOUT_CELADON_CITY_DEPARTMENT_STORE_5F", + "name": "CeladonCity_DepartmentStore_5F_Layout", + "width": 13, + "height": 15, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4E6C", + "border_filepath": "data/layouts/CeladonCity_DepartmentStore_5F/border.bin", + "blockdata_filepath": "data/layouts/CeladonCity_DepartmentStore_5F/map.bin" + }, + { + "id": "LAYOUT_CELADON_CITY_DEPARTMENT_STORE_ROOF", + "name": "CeladonCity_DepartmentStore_Roof_Layout", + "width": 19, + "height": 14, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4E6C", + "border_filepath": "data/layouts/CeladonCity_DepartmentStore_Roof/border.bin", + "blockdata_filepath": "data/layouts/CeladonCity_DepartmentStore_Roof/map.bin" + }, + { + "id": "LAYOUT_SAFARI_ZONE_BUILDING", + "name": "SafariZone_Building_Layout", + "width": 13, + "height": 11, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4F14", + "border_filepath": "data/layouts/SafariZone_Building/border.bin", + "blockdata_filepath": "data/layouts/SafariZone_Building/map.bin" + }, + { + "id": "LAYOUT_SAFARI_ZONE_SECRET_HOUSE", + "name": "SafariZone_SecretHouse_Layout", + "width": 13, + "height": 11, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4F14", + "border_filepath": "data/layouts/SafariZone_SecretHouse/border.bin", + "blockdata_filepath": "data/layouts/SafariZone_SecretHouse/map.bin" + }, + { + "id": "LAYOUT_FUCHSIA_CITY_ZOO_BUILDING", + "name": "FuchsiaCity_ZooBuilding_Layout", + "width": 20, + "height": 11, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4F14", + "border_filepath": "data/layouts/FuchsiaCity_ZooBuilding/border.bin", + "blockdata_filepath": "data/layouts/FuchsiaCity_ZooBuilding/map.bin" + }, + { + "id": "LAYOUT_FUCHSIA_CITY_BUILDING1", + "name": "FuchsiaCity_Building1_Layout", + "width": 13, + "height": 11, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4C2C", + "border_filepath": "data/layouts/FuchsiaCity_Building1/border.bin", + "blockdata_filepath": "data/layouts/FuchsiaCity_Building1/map.bin" + }, + { + "id": "LAYOUT_FUCHSIA_CITY_HOUSE2", + "name": "FuchsiaCity_House2_Layout", + "width": 10, + "height": 10, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4C2C", + "border_filepath": "data/layouts/FuchsiaCity_House2/border.bin", + "blockdata_filepath": "data/layouts/FuchsiaCity_House2/map.bin" + }, + { + "id": "LAYOUT_CINNABAR_ISLAND_POKEMON_LAB_ENTRANCE", + "name": "CinnabarIsland_PokemonLab_Entrance_Layout", + "width": 28, + "height": 11, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4C8C", + "border_filepath": "data/layouts/CinnabarIsland_PokemonLab_Entrance/border.bin", + "blockdata_filepath": "data/layouts/CinnabarIsland_PokemonLab_Entrance/map.bin" + }, + { + "id": "LAYOUT_CINNABAR_ISLAND_POKEMON_LAB_LOUNGE", + "name": "CinnabarIsland_PokemonLab_Lounge_Layout", + "width": 15, + "height": 11, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4C8C", + "border_filepath": "data/layouts/CinnabarIsland_PokemonLab_Lounge/border.bin", + "blockdata_filepath": "data/layouts/CinnabarIsland_PokemonLab_Lounge/map.bin" + }, + { + "id": "LAYOUT_CINNABAR_ISLAND_POKEMON_LAB_RESEARCH_ROOM", + "name": "CinnabarIsland_PokemonLab_ResearchRoom_Layout", + "width": 15, + "height": 11, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4C8C", + "border_filepath": "data/layouts/CinnabarIsland_PokemonLab_ResearchRoom/border.bin", + "blockdata_filepath": "data/layouts/CinnabarIsland_PokemonLab_ResearchRoom/map.bin" + }, + { + "id": "LAYOUT_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM", + "name": "CinnabarIsland_PokemonLab_ExperimentRoom_Layout", + "width": 15, + "height": 11, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4C8C", + "border_filepath": "data/layouts/CinnabarIsland_PokemonLab_ExperimentRoom/border.bin", + "blockdata_filepath": "data/layouts/CinnabarIsland_PokemonLab_ExperimentRoom/map.bin" + }, + { + "id": "LAYOUT_SAFFRON_CITY_DUPLICATE", + "name": "SaffronCity_Duplicate_Layout", + "width": 66, + "height": 55, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D4B9C", + "border_filepath": "data/layouts/SaffronCity_Duplicate/border.bin", + "blockdata_filepath": "data/layouts/SaffronCity_Duplicate/map.bin" + }, + { + "id": "LAYOUT_SAFFRON_CITY_NORTH_SOUTH_ENTRANCE", + "name": "SaffronCity_NorthSouthEntrance_Layout", + "width": 9, + "height": 11, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4E84", + "border_filepath": "data/layouts/SaffronCity_NorthSouthEntrance/border.bin", + "blockdata_filepath": "data/layouts/SaffronCity_NorthSouthEntrance/map.bin" + }, + { + "id": "LAYOUT_SAFFRON_CITY_EAST_WEST_ENTRANCE", + "name": "SaffronCity_EastWestEntrance_Layout", + "width": 13, + "height": 9, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4E84", + "border_filepath": "data/layouts/SaffronCity_EastWestEntrance/border.bin", + "blockdata_filepath": "data/layouts/SaffronCity_EastWestEntrance/map.bin" + }, + { + "id": "LAYOUT_DIGLETTS_CAVE_NORTH_ENTRANCE", + "name": "DiglettsCave_NorthEntrance_Layout", + "width": 10, + "height": 8, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D4E0C", + "border_filepath": "data/layouts/DiglettsCave_NorthEntrance/border.bin", + "blockdata_filepath": "data/layouts/DiglettsCave_NorthEntrance/map.bin" + }, + { + "id": "LAYOUT_DIGLETTS_CAVE_SOUTH_ENTRANCE", + "name": "DiglettsCave_SouthEntrance_Layout", + "width": 10, + "height": 8, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D4E0C", + "border_filepath": "data/layouts/DiglettsCave_SouthEntrance/border.bin", + "blockdata_filepath": "data/layouts/DiglettsCave_SouthEntrance/map.bin" + }, + { + "id": "LAYOUT_INDIGO_PLATEAU_POKEMON_CENTER_1F", + "name": "IndigoPlateau_PokemonCenter_1F_Layout", + "width": 25, + "height": 18, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4BE4", + "border_filepath": "data/layouts/IndigoPlateau_PokemonCenter_1F/border.bin", + "blockdata_filepath": "data/layouts/IndigoPlateau_PokemonCenter_1F/map.bin" + }, + { + "id": "LAYOUT_POKEMON_LEAGUE_LORELEIS_ROOM", + "name": "PokemonLeague_LoreleisRoom_Layout", + "width": 13, + "height": 13, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D50C4", + "border_filepath": "data/layouts/PokemonLeague_LoreleisRoom/border.bin", + "blockdata_filepath": "data/layouts/PokemonLeague_LoreleisRoom/map.bin" + }, + { + "id": "LAYOUT_POKEMON_LEAGUE_BRUNOS_ROOM", + "name": "PokemonLeague_BrunosRoom_Layout", + "width": 13, + "height": 13, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D50C4", + "border_filepath": "data/layouts/PokemonLeague_BrunosRoom/border.bin", + "blockdata_filepath": "data/layouts/PokemonLeague_BrunosRoom/map.bin" + }, + { + "id": "LAYOUT_POKEMON_LEAGUE_AGATHAS_ROOM", + "name": "PokemonLeague_AgathasRoom_Layout", + "width": 13, + "height": 13, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D50C4", + "border_filepath": "data/layouts/PokemonLeague_AgathasRoom/border.bin", + "blockdata_filepath": "data/layouts/PokemonLeague_AgathasRoom/map.bin" + }, + { + "id": "LAYOUT_POKEMON_LEAGUE_LANCES_ROOM", + "name": "PokemonLeague_LancesRoom_Layout", + "width": 28, + "height": 24, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D50C4", + "border_filepath": "data/layouts/PokemonLeague_LancesRoom/border.bin", + "blockdata_filepath": "data/layouts/PokemonLeague_LancesRoom/map.bin" + }, + { + "id": "LAYOUT_POKEMON_LEAGUE_CHAMPIONS_ROOM", + "name": "PokemonLeague_ChampionsRoom_Layout", + "width": 13, + "height": 20, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D50C4", + "border_filepath": "data/layouts/PokemonLeague_ChampionsRoom/border.bin", + "blockdata_filepath": "data/layouts/PokemonLeague_ChampionsRoom/map.bin" + }, + { + "id": "LAYOUT_POKEMON_LEAGUE_HALL_OF_FAME", + "name": "PokemonLeague_HallOfFame_Layout", + "width": 11, + "height": 13, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D50DC", + "border_filepath": "data/layouts/PokemonLeague_HallOfFame/border.bin", + "blockdata_filepath": "data/layouts/PokemonLeague_HallOfFame/map.bin" + }, + { + "id": "LAYOUT_ROUTE21_SOUTH", + "name": "Route21_South_Layout", + "width": 24, + "height": 50, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D4B6C", + "border_filepath": "data/layouts/Route21_South/border.bin", + "blockdata_filepath": "data/layouts/Route21_South/map.bin" + }, + { + "id": "LAYOUT_ENTRANCE_2F", + "name": "Entrance_2F_Layout", + "width": 13, + "height": 11, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4E84", + "border_filepath": "data/layouts/Entrance_2F/border.bin", + "blockdata_filepath": "data/layouts/Entrance_2F/map.bin" + }, + { + "id": "LAYOUT_ROUTE2_ENTRANCE", + "name": "Route2_Entrance_Layout", + "width": 15, + "height": 12, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4E84", + "border_filepath": "data/layouts/Route2_Entrance/border.bin", + "blockdata_filepath": "data/layouts/Route2_Entrance/map.bin" + }, + { + "id": "LAYOUT_ROUTE22_NORTH_ENTRANCE", + "name": "Route22_NorthEntrance_Layout", + "width": 15, + "height": 12, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4E84", + "border_filepath": "data/layouts/Route22_NorthEntrance/border.bin", + "blockdata_filepath": "data/layouts/Route22_NorthEntrance/map.bin" + }, + { + "id": "LAYOUT_ROUTE16_NORTH_ENTRANCE_1F", + "name": "Route16_NorthEntrance_1F_Layout", + "width": 13, + "height": 18, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4E84", + "border_filepath": "data/layouts/Route16_NorthEntrance_1F/border.bin", + "blockdata_filepath": "data/layouts/Route16_NorthEntrance_1F/map.bin" + }, + { + "id": "LAYOUT_ENTRANCE_1F", + "name": "Entrance_1F_Layout", + "width": 13, + "height": 12, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4E84", + "border_filepath": "data/layouts/Entrance_1F/border.bin", + "blockdata_filepath": "data/layouts/Entrance_1F/map.bin" + }, + { + "id": "LAYOUT_ROCKET_HIDEOUT_ELEVATOR", + "name": "RocketHideout_Elevator_Layout", + "width": 5, + "height": 7, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4ECC", + "border_filepath": "data/layouts/RocketHideout_Elevator/border.bin", + "blockdata_filepath": "data/layouts/RocketHideout_Elevator/map.bin" + }, + { + "id": "LAYOUT_SAFFRON_CITY_HOUSE1_1F", + "name": "SaffronCity_House1_1F_Layout", + "width": 13, + "height": 10, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4C74", + "border_filepath": "data/layouts/SaffronCity_House1_1F/border.bin", + "blockdata_filepath": "data/layouts/SaffronCity_House1_1F/map.bin" + }, + { + "id": "LAYOUT_SAFFRON_CITY_HOUSE1_2F", + "name": "SaffronCity_House1_2F_Layout", + "width": 12, + "height": 9, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4C74", + "border_filepath": "data/layouts/SaffronCity_House1_2F/border.bin", + "blockdata_filepath": "data/layouts/SaffronCity_House1_2F/map.bin" + }, + { + "id": "LAYOUT_SAFFRON_CITY_DOJO", + "name": "SaffronCity_Dojo_Layout", + "width": 13, + "height": 16, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4D04", + "border_filepath": "data/layouts/SaffronCity_Dojo/border.bin", + "blockdata_filepath": "data/layouts/SaffronCity_Dojo/map.bin" + }, + { + "id": "LAYOUT_SILPH_CO_ELEVATOR", + "name": "SilphCo_Elevator_Layout", + "width": 5, + "height": 7, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4ECC", + "border_filepath": "data/layouts/SilphCo_Elevator/border.bin", + "blockdata_filepath": "data/layouts/SilphCo_Elevator/map.bin" + }, + { + "id": "LAYOUT_ONE_ISLAND", + "name": "OneIsland_Layout", + "width": 24, + "height": 20, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D504C", + "border_filepath": "data/layouts/OneIsland/border.bin", + "blockdata_filepath": "data/layouts/OneIsland/map.bin" + }, + { + "id": "LAYOUT_TWO_ISLAND", + "name": "TwoIsland_Layout", + "width": 48, + "height": 20, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D504C", + "border_filepath": "data/layouts/TwoIsland/border.bin", + "blockdata_filepath": "data/layouts/TwoIsland/map.bin" + }, + { + "id": "LAYOUT_THREE_ISLAND", + "name": "ThreeIsland_Layout", + "width": 24, + "height": 40, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D504C", + "border_filepath": "data/layouts/ThreeIsland/border.bin", + "blockdata_filepath": "data/layouts/ThreeIsland/map.bin" + }, + { + "id": "LAYOUT_FOUR_ISLAND", + "name": "FourIsland_Layout", + "width": 48, + "height": 40, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D5064", + "border_filepath": "data/layouts/FourIsland/border.bin", + "blockdata_filepath": "data/layouts/FourIsland/map.bin" + }, + { + "id": "LAYOUT_FIVE_ISLAND", + "name": "FiveIsland_Layout", + "width": 24, + "height": 20, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D5064", + "border_filepath": "data/layouts/FiveIsland/border.bin", + "blockdata_filepath": "data/layouts/FiveIsland/map.bin" + }, + { + "id": "LAYOUT_SEVEN_ISLAND", + "name": "SevenIsland_Layout", + "width": 24, + "height": 20, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D507C", + "border_filepath": "data/layouts/SevenIsland/border.bin", + "blockdata_filepath": "data/layouts/SevenIsland/map.bin" + }, + { + "id": "LAYOUT_SIX_ISLAND", + "name": "SixIsland_Layout", + "width": 24, + "height": 30, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D507C", + "border_filepath": "data/layouts/SixIsland/border.bin", + "blockdata_filepath": "data/layouts/SixIsland/map.bin" + }, + { + "id": "LAYOUT_ONE_ISLAND_KINDLE_ROAD", + "name": "OneIsland_KindleRoad_Layout", + "width": 24, + "height": 140, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D504C", + "border_filepath": "data/layouts/OneIsland_KindleRoad/border.bin", + "blockdata_filepath": "data/layouts/OneIsland_KindleRoad/map.bin" + }, + { + "id": "LAYOUT_ONE_ISLAND_TREASURE_BEACH", + "name": "OneIsland_TreasureBeach_Layout", + "width": 24, + "height": 40, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D504C", + "border_filepath": "data/layouts/OneIsland_TreasureBeach/border.bin", + "blockdata_filepath": "data/layouts/OneIsland_TreasureBeach/map.bin" + }, + { + "id": "LAYOUT_TWO_ISLAND_CAPE_BRINK", + "name": "TwoIsland_CapeBrink_Layout", + "width": 24, + "height": 40, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D504C", + "border_filepath": "data/layouts/TwoIsland_CapeBrink/border.bin", + "blockdata_filepath": "data/layouts/TwoIsland_CapeBrink/map.bin" + }, + { + "id": "LAYOUT_THREE_ISLAND_BOND_BRIDGE", + "name": "ThreeIsland_BondBridge_Layout", + "width": 96, + "height": 20, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D504C", + "border_filepath": "data/layouts/ThreeIsland_BondBridge/border.bin", + "blockdata_filepath": "data/layouts/ThreeIsland_BondBridge/map.bin" + }, + { + "id": "LAYOUT_THREE_ISLAND_PORT", + "name": "ThreeIsland_Port_Layout", + "width": 48, + "height": 20, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D504C", + "border_filepath": "data/layouts/ThreeIsland_Port/border.bin", + "blockdata_filepath": "data/layouts/ThreeIsland_Port/map.bin" + }, + { + "id": "LAYOUT_UNKNOWN_MAP_03_50", + "name": "UnknownMap_03_50_Layout", + "width": 1, + "height": 1, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D4B3C", + "border_filepath": "data/layouts/UnknownMap_03_50/border.bin", + "blockdata_filepath": "data/layouts/UnknownMap_03_50/map.bin" + }, + { + "id": "LAYOUT_UNKNOWN_MAP_03_51", + "name": "UnknownMap_03_51_Layout", + "width": 1, + "height": 1, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D4B3C", + "border_filepath": "data/layouts/UnknownMap_03_51/border.bin", + "blockdata_filepath": "data/layouts/UnknownMap_03_51/map.bin" + }, + { + "id": "LAYOUT_UNKNOWN_MAP_03_52", + "name": "UnknownMap_03_52_Layout", + "width": 84, + "height": 20, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D4B3C", + "border_filepath": "data/layouts/UnknownMap_03_52/border.bin", + "blockdata_filepath": "data/layouts/UnknownMap_03_52/map.bin" + }, + { + "id": "LAYOUT_UNKNOWN_MAP_03_53", + "name": "UnknownMap_03_53_Layout", + "width": 24, + "height": 60, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D4B3C", + "border_filepath": "data/layouts/UnknownMap_03_53/border.bin", + "blockdata_filepath": "data/layouts/UnknownMap_03_53/map.bin" + }, + { + "id": "LAYOUT_FIVE_ISLAND_RESORT_GORGEOUS", + "name": "FiveIsland_ResortGorgeous_Layout", + "width": 72, + "height": 20, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D5064", + "border_filepath": "data/layouts/FiveIsland_ResortGorgeous/border.bin", + "blockdata_filepath": "data/layouts/FiveIsland_ResortGorgeous/map.bin" + }, + { + "id": "LAYOUT_FIVE_ISLAND_WATER_LABYRINTH", + "name": "FiveIsland_WaterLabyrinth_Layout", + "width": 72, + "height": 20, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D5064", + "border_filepath": "data/layouts/FiveIsland_WaterLabyrinth/border.bin", + "blockdata_filepath": "data/layouts/FiveIsland_WaterLabyrinth/map.bin" + }, + { + "id": "LAYOUT_FIVE_ISLAND_MEADOW", + "name": "FiveIsland_Meadow_Layout", + "width": 24, + "height": 40, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D5064", + "border_filepath": "data/layouts/FiveIsland_Meadow/border.bin", + "blockdata_filepath": "data/layouts/FiveIsland_Meadow/map.bin" + }, + { + "id": "LAYOUT_FIVE_ISLAND_MEMORIAL_PILLAR", + "name": "FiveIsland_MemorialPillar_Layout", + "width": 24, + "height": 60, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D5064", + "border_filepath": "data/layouts/FiveIsland_MemorialPillar/border.bin", + "blockdata_filepath": "data/layouts/FiveIsland_MemorialPillar/map.bin" + }, + { + "id": "LAYOUT_SIX_ISLAND_OUTCAST_ISLAND", + "name": "SixIsland_OutcastIsland_Layout", + "width": 24, + "height": 80, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D507C", + "border_filepath": "data/layouts/SixIsland_OutcastIsland/border.bin", + "blockdata_filepath": "data/layouts/SixIsland_OutcastIsland/map.bin" + }, + { + "id": "LAYOUT_SIX_ISLAND_GREEN_PATH", + "name": "SixIsland_GreenPath_Layout", + "width": 72, + "height": 20, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D507C", + "border_filepath": "data/layouts/SixIsland_GreenPath/border.bin", + "blockdata_filepath": "data/layouts/SixIsland_GreenPath/map.bin" + }, + { + "id": "LAYOUT_SIX_ISLAND_WATER_PATH", + "name": "SixIsland_WaterPath_Layout", + "width": 24, + "height": 100, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D507C", + "border_filepath": "data/layouts/SixIsland_WaterPath/border.bin", + "blockdata_filepath": "data/layouts/SixIsland_WaterPath/map.bin" + }, + { + "id": "LAYOUT_SIX_ISLAND_RUIN_VALLEY", + "name": "SixIsland_RuinValley_Layout", + "width": 48, + "height": 40, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D507C", + "border_filepath": "data/layouts/SixIsland_RuinValley/border.bin", + "blockdata_filepath": "data/layouts/SixIsland_RuinValley/map.bin" + }, + { + "id": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER", + "name": "SevenIsland_TrainerTower_Layout", + "width": 120, + "height": 40, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D507C", + "border_filepath": "data/layouts/SevenIsland_TrainerTower/border.bin", + "blockdata_filepath": "data/layouts/SevenIsland_TrainerTower/map.bin" + }, + { + "id": "LAYOUT_SEVEN_ISLAND_SEVAULT_CANYON_ENTRANCE", + "name": "SevenIsland_SevaultCanyon_Entrance_Layout", + "width": 24, + "height": 40, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D507C", + "border_filepath": "data/layouts/SevenIsland_SevaultCanyon_Entrance/border.bin", + "blockdata_filepath": "data/layouts/SevenIsland_SevaultCanyon_Entrance/map.bin" + }, + { + "id": "LAYOUT_SEVEN_ISLAND_SEVAULT_CANYON", + "name": "SevenIsland_SevaultCanyon_Layout", + "width": 24, + "height": 80, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D507C", + "border_filepath": "data/layouts/SevenIsland_SevaultCanyon/border.bin", + "blockdata_filepath": "data/layouts/SevenIsland_SevaultCanyon/map.bin" + }, + { + "id": "LAYOUT_SEVEN_ISLAND_TANOBY_RUINS", + "name": "SevenIsland_TanobyRuins_Layout", + "width": 144, + "height": 20, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D507C", + "border_filepath": "data/layouts/SevenIsland_TanobyRuins/border.bin", + "blockdata_filepath": "data/layouts/SevenIsland_TanobyRuins/map.bin" + }, + { + "id": "LAYOUT_UNUSED_LAYOUT_833614C", + "name": "UnusedLayout_833614C_Layout", + "width": 24, + "height": 60, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D4AAC", + "border_filepath": "data/layouts/UnusedLayout_833614C/border.bin", + "blockdata_filepath": "data/layouts/UnusedLayout_833614C/map.bin" + }, + { + "id": "LAYOUT_UNUSED_LAYOUT_83377F0", + "name": "UnusedLayout_83377F0_Layout", + "width": 144, + "height": 20, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D4AAC", + "border_filepath": "data/layouts/UnusedLayout_83377F0/border.bin", + "blockdata_filepath": "data/layouts/UnusedLayout_83377F0/map.bin" + }, + { + "id": "LAYOUT_UNUSED_LAYOUT_8338354", + "name": "UnusedLayout_8338354_Layout", + "width": 24, + "height": 60, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D4AAC", + "border_filepath": "data/layouts/UnusedLayout_8338354/border.bin", + "blockdata_filepath": "data/layouts/UnusedLayout_8338354/map.bin" + }, + { + "id": "LAYOUT_UNUSED_LAYOUT_8338738", + "name": "UnusedLayout_8338738_Layout", + "width": 24, + "height": 20, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D4AAC", + "border_filepath": "data/layouts/UnusedLayout_8338738/border.bin", + "blockdata_filepath": "data/layouts/UnusedLayout_8338738/map.bin" + }, + { + "id": "LAYOUT_UNKNOWN_MAP_00_04", + "name": "UnknownMap_00_04_Layout", + "width": 15, + "height": 12, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D50DC", + "border_filepath": "data/layouts/UnknownMap_00_04/border.bin", + "blockdata_filepath": "data/layouts/UnknownMap_00_04/map.bin" + }, + { + "id": "LAYOUT_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB", + "name": "SaffronCity_PokemonTrainerFanClub_Layout", + "width": 11, + "height": 17, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4F74", + "border_filepath": "data/layouts/SaffronCity_PokemonTrainerFanClub/border.bin", + "blockdata_filepath": "data/layouts/SaffronCity_PokemonTrainerFanClub/map.bin" + }, + { + "id": "LAYOUT_UNUSED_LAYOUT_8338B4C", + "name": "UnusedLayout_8338B4C_Layout", + "width": 11, + "height": 9, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4E84", + "border_filepath": "data/layouts/UnusedLayout_8338B4C/border.bin", + "blockdata_filepath": "data/layouts/UnusedLayout_8338B4C/map.bin" + }, + { + "id": "LAYOUT_SEVEN_ISLAND_HOUSE_ROOM2", + "name": "SevenIsland_House_Room2_Layout", + "width": 12, + "height": 9, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4E84", + "border_filepath": "data/layouts/SevenIsland_House_Room2/border.bin", + "blockdata_filepath": "data/layouts/SevenIsland_House_Room2/map.bin" + }, + { + "id": "LAYOUT_VIRIDIAN_CITY_HOUSE2", + "name": "ViridianCity_House2_Layout", + "width": 10, + "height": 9, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4F5C", + "border_filepath": "data/layouts/ViridianCity_House2/border.bin", + "blockdata_filepath": "data/layouts/ViridianCity_House2/map.bin" + }, + { + "id": "LAYOUT_UNUSED_LAYOUT_8338E90", + "name": "UnusedLayout_8338E90_Layout", + "width": 15, + "height": 11, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4F44", + "border_filepath": "data/layouts/UnusedLayout_8338E90/border.bin", + "blockdata_filepath": "data/layouts/UnusedLayout_8338E90/map.bin" + }, + { + "id": "LAYOUT_UNUSED_LAYOUT_833902C", + "name": "UnusedLayout_833902C_Layout", + "width": 17, + "height": 11, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4F44", + "border_filepath": "data/layouts/UnusedLayout_833902C/border.bin", + "blockdata_filepath": "data/layouts/UnusedLayout_833902C/map.bin" + }, + { + "id": "LAYOUT_MT_EMBER_RUBY_PATH_B4F", + "name": "MtEmber_RubyPath_B4F_Layout", + "width": 18, + "height": 16, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D4FEC", + "border_filepath": "data/layouts/MtEmber_RubyPath_B4F/border.bin", + "blockdata_filepath": "data/layouts/MtEmber_RubyPath_B4F/map.bin" + }, + { + "id": "LAYOUT_THREE_ISLAND_BERRY_FOREST", + "name": "ThreeIsland_BerryForest_Layout", + "width": 57, + "height": 47, + "border_width": 3, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D5004", + "border_filepath": "data/layouts/ThreeIsland_BerryForest/border.bin", + "blockdata_filepath": "data/layouts/ThreeIsland_BerryForest/map.bin" + }, + { + "id": "LAYOUT_ONE_ISLAND_POKEMON_CENTER_1F", + "name": "OneIsland_PokemonCenter_1F_Layout", + "width": 19, + "height": 11, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4BE4", + "border_filepath": "data/layouts/OneIsland_PokemonCenter_1F/border.bin", + "blockdata_filepath": "data/layouts/OneIsland_PokemonCenter_1F/map.bin" + }, + { + "id": "LAYOUT_TWO_ISLAND_JOYFUL_GAME_CORNER", + "name": "TwoIsland_JoyfulGameCorner_Layout", + "width": 12, + "height": 10, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4CEC", + "border_filepath": "data/layouts/TwoIsland_JoyfulGameCorner/border.bin", + "blockdata_filepath": "data/layouts/TwoIsland_JoyfulGameCorner/map.bin" + }, + { + "id": "LAYOUT_VERMILION_CITY_POKEMON_FAN_CLUB", + "name": "VermilionCity_PokemonFanClub_Layout", + "width": 12, + "height": 12, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4F74", + "border_filepath": "data/layouts/VermilionCity_PokemonFanClub/border.bin", + "blockdata_filepath": "data/layouts/VermilionCity_PokemonFanClub/map.bin" + }, + { + "id": "LAYOUT_LAVENDER_TOWN_VOLUNTEER_POKEMON_HOUSE", + "name": "LavenderTown_VolunteerPokemonHouse_Layout", + "width": 12, + "height": 9, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4F74", + "border_filepath": "data/layouts/LavenderTown_VolunteerPokemonHouse/border.bin", + "blockdata_filepath": "data/layouts/LavenderTown_VolunteerPokemonHouse/map.bin" + }, + { + "id": "LAYOUT_ROUTE5_POKEMON_DAY_CARE", + "name": "Route5_PokemonDayCare_Layout", + "width": 12, + "height": 9, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4F74", + "border_filepath": "data/layouts/Route5_PokemonDayCare/border.bin", + "blockdata_filepath": "data/layouts/Route5_PokemonDayCare/map.bin" + }, + { + "id": "LAYOUT_VIRIDIAN_CITY_HOUSE1", + "name": "ViridianCity_House1_Layout", + "width": 11, + "height": 9, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4E84", + "border_filepath": "data/layouts/ViridianCity_House1/border.bin", + "blockdata_filepath": "data/layouts/ViridianCity_House1/map.bin" + }, + { + "id": "LAYOUT_FOUR_ISLAND_POKEMON_DAY_CARE", + "name": "FourIsland_PokemonDayCare_Layout", + "width": 12, + "height": 9, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4F74", + "border_filepath": "data/layouts/FourIsland_PokemonDayCare/border.bin", + "blockdata_filepath": "data/layouts/FourIsland_PokemonDayCare/map.bin" + }, + { + "id": "LAYOUT_UNUSED_LAYOUT_833B6EC", + "name": "UnusedLayout_833B6EC_Layout", + "width": 38, + "height": 24, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D4E24", + "border_filepath": "data/layouts/UnusedLayout_833B6EC/border.bin", + "blockdata_filepath": "data/layouts/UnusedLayout_833B6EC/map.bin" + }, + { + "id": "LAYOUT_UNUSED_LAYOUT_833BE30", + "name": "UnusedLayout_833BE30_Layout", + "width": 38, + "height": 24, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D4E24", + "border_filepath": "data/layouts/UnusedLayout_833BE30/border.bin", + "blockdata_filepath": "data/layouts/UnusedLayout_833BE30/map.bin" + }, + { + "id": "LAYOUT_MT_EMBER_EXTERIOR", + "name": "MtEmber_Exterior_Layout", + "width": 57, + "height": 54, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D504C", + "border_filepath": "data/layouts/MtEmber_Exterior/border.bin", + "blockdata_filepath": "data/layouts/MtEmber_Exterior/map.bin" + }, + { + "id": "LAYOUT_MT_EMBER_SUMMIT", + "name": "MtEmber_Summit_Layout", + "width": 19, + "height": 22, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D504C", + "border_filepath": "data/layouts/MtEmber_Summit/border.bin", + "blockdata_filepath": "data/layouts/MtEmber_Summit/map.bin" + }, + { + "id": "LAYOUT_MT_EMBER_SUMMIT_PATH_1F", + "name": "MtEmber_SummitPath_1F_Layout", + "width": 15, + "height": 18, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D4FEC", + "border_filepath": "data/layouts/MtEmber_SummitPath_1F/border.bin", + "blockdata_filepath": "data/layouts/MtEmber_SummitPath_1F/map.bin" + }, + { + "id": "LAYOUT_MT_EMBER_SUMMIT_PATH_2F", + "name": "MtEmber_SummitPath_2F_Layout", + "width": 48, + "height": 46, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D4FEC", + "border_filepath": "data/layouts/MtEmber_SummitPath_2F/border.bin", + "blockdata_filepath": "data/layouts/MtEmber_SummitPath_2F/map.bin" + }, + { + "id": "LAYOUT_MT_EMBER_SUMMIT_PATH_3F", + "name": "MtEmber_SummitPath_3F_Layout", + "width": 15, + "height": 11, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D4FEC", + "border_filepath": "data/layouts/MtEmber_SummitPath_3F/border.bin", + "blockdata_filepath": "data/layouts/MtEmber_SummitPath_3F/map.bin" + }, + { + "id": "LAYOUT_MT_EMBER_RUBY_PATH_1F", + "name": "MtEmber_RubyPath_1F_Layout", + "width": 27, + "height": 19, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D4FEC", + "border_filepath": "data/layouts/MtEmber_RubyPath_1F/border.bin", + "blockdata_filepath": "data/layouts/MtEmber_RubyPath_1F/map.bin" + }, + { + "id": "LAYOUT_MT_EMBER_RUBY_PATH_B1F", + "name": "MtEmber_RubyPath_B1F_Layout", + "width": 11, + "height": 23, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D4FEC", + "border_filepath": "data/layouts/MtEmber_RubyPath_B1F/border.bin", + "blockdata_filepath": "data/layouts/MtEmber_RubyPath_B1F/map.bin" + }, + { + "id": "LAYOUT_MT_EMBER_RUBY_PATH_B2F", + "name": "MtEmber_RubyPath_B2F_Layout", + "width": 16, + "height": 11, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D4FEC", + "border_filepath": "data/layouts/MtEmber_RubyPath_B2F/border.bin", + "blockdata_filepath": "data/layouts/MtEmber_RubyPath_B2F/map.bin" + }, + { + "id": "LAYOUT_MT_EMBER_RUBY_PATH_B3F", + "name": "MtEmber_RubyPath_B3F_Layout", + "width": 31, + "height": 23, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D4FEC", + "border_filepath": "data/layouts/MtEmber_RubyPath_B3F/border.bin", + "blockdata_filepath": "data/layouts/MtEmber_RubyPath_B3F/map.bin" + }, + { + "id": "LAYOUT_MT_EMBER_RUBY_PATH_B1F_STAIRS", + "name": "MtEmber_RubyPath_B1F_Stairs_Layout", + "width": 6, + "height": 7, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D4FEC", + "border_filepath": "data/layouts/MtEmber_RubyPath_B1F_Stairs/border.bin", + "blockdata_filepath": "data/layouts/MtEmber_RubyPath_B1F_Stairs/map.bin" + }, + { + "id": "LAYOUT_MT_EMBER_RUBY_PATH_B2F_STAIRS", + "name": "MtEmber_RubyPath_B2F_Stairs_Layout", + "width": 8, + "height": 6, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D4FEC", + "border_filepath": "data/layouts/MtEmber_RubyPath_B2F_Stairs/border.bin", + "blockdata_filepath": "data/layouts/MtEmber_RubyPath_B2F_Stairs/map.bin" + }, + { + "id": "LAYOUT_MT_EMBER_RUBY_PATH_B5F", + "name": "MtEmber_RubyPath_B5F_Layout", + "width": 16, + "height": 15, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D4FEC", + "border_filepath": "data/layouts/MtEmber_RubyPath_B5F/border.bin", + "blockdata_filepath": "data/layouts/MtEmber_RubyPath_B5F/map.bin" + }, + { + "id": "LAYOUT_FIVE_ISLAND_ROCKET_WAREHOUSE", + "name": "FiveIsland_RocketWarehouse_Layout", + "width": 29, + "height": 27, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4ECC", + "border_filepath": "data/layouts/FiveIsland_RocketWarehouse/border.bin", + "blockdata_filepath": "data/layouts/FiveIsland_RocketWarehouse/map.bin" + }, + { + "id": "LAYOUT_FOUR_ISLAND_ICEFALL_CAVE_ENTRANCE", + "name": "FourIsland_IcefallCave_Entrance_Layout", + "width": 30, + "height": 36, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D4E24", + "border_filepath": "data/layouts/FourIsland_IcefallCave_Entrance/border.bin", + "blockdata_filepath": "data/layouts/FourIsland_IcefallCave_Entrance/map.bin" + }, + { + "id": "LAYOUT_FOUR_ISLAND_ICEFALL_CAVE_1F", + "name": "FourIsland_IcefallCave_1F_Layout", + "width": 20, + "height": 20, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D4E24", + "border_filepath": "data/layouts/FourIsland_IcefallCave_1F/border.bin", + "blockdata_filepath": "data/layouts/FourIsland_IcefallCave_1F/map.bin" + }, + { + "id": "LAYOUT_FOUR_ISLAND_ICEFALL_CAVE_B1F", + "name": "FourIsland_IcefallCave_B1F_Layout", + "width": 24, + "height": 20, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D4E24", + "border_filepath": "data/layouts/FourIsland_IcefallCave_B1F/border.bin", + "blockdata_filepath": "data/layouts/FourIsland_IcefallCave_B1F/map.bin" + }, + { + "id": "LAYOUT_FOUR_ISLAND_ICEFALL_CAVE_BACK", + "name": "FourIsland_IcefallCave_Back_Layout", + "width": 25, + "height": 26, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D4E24", + "border_filepath": "data/layouts/FourIsland_IcefallCave_Back/border.bin", + "blockdata_filepath": "data/layouts/FourIsland_IcefallCave_Back/map.bin" + }, + { + "id": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_LOBBY", + "name": "SevenIsland_TrainerTower_Lobby_Layout", + "width": 19, + "height": 17, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D5094", + "border_filepath": "data/layouts/SevenIsland_TrainerTower_Lobby/border.bin", + "blockdata_filepath": "data/layouts/SevenIsland_TrainerTower_Lobby/map.bin" + }, + { + "id": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_1F", + "name": "SevenIsland_TrainerTower_1F_Layout", + "width": 18, + "height": 17, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D5094", + "border_filepath": "data/layouts/SevenIsland_TrainerTower_1F/border.bin", + "blockdata_filepath": "data/layouts/SevenIsland_TrainerTower_1F/map.bin" + }, + { + "id": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_2F", + "name": "SevenIsland_TrainerTower_2F_Layout", + "width": 18, + "height": 17, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D5094", + "border_filepath": "data/layouts/SevenIsland_TrainerTower_2F/border.bin", + "blockdata_filepath": "data/layouts/SevenIsland_TrainerTower_2F/map.bin" + }, + { + "id": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_3F", + "name": "SevenIsland_TrainerTower_3F_Layout", + "width": 18, + "height": 17, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D5094", + "border_filepath": "data/layouts/SevenIsland_TrainerTower_3F/border.bin", + "blockdata_filepath": "data/layouts/SevenIsland_TrainerTower_3F/map.bin" + }, + { + "id": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_4F", + "name": "SevenIsland_TrainerTower_4F_Layout", + "width": 18, + "height": 17, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D5094", + "border_filepath": "data/layouts/SevenIsland_TrainerTower_4F/border.bin", + "blockdata_filepath": "data/layouts/SevenIsland_TrainerTower_4F/map.bin" + }, + { + "id": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_5F", + "name": "SevenIsland_TrainerTower_5F_Layout", + "width": 18, + "height": 17, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D5094", + "border_filepath": "data/layouts/SevenIsland_TrainerTower_5F/border.bin", + "blockdata_filepath": "data/layouts/SevenIsland_TrainerTower_5F/map.bin" + }, + { + "id": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_6F", + "name": "SevenIsland_TrainerTower_6F_Layout", + "width": 18, + "height": 17, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D5094", + "border_filepath": "data/layouts/SevenIsland_TrainerTower_6F/border.bin", + "blockdata_filepath": "data/layouts/SevenIsland_TrainerTower_6F/map.bin" + }, + { + "id": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_7F", + "name": "SevenIsland_TrainerTower_7F_Layout", + "width": 18, + "height": 17, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D5094", + "border_filepath": "data/layouts/SevenIsland_TrainerTower_7F/border.bin", + "blockdata_filepath": "data/layouts/SevenIsland_TrainerTower_7F/map.bin" + }, + { + "id": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_8F", + "name": "SevenIsland_TrainerTower_8F_Layout", + "width": 18, + "height": 17, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D5094", + "border_filepath": "data/layouts/SevenIsland_TrainerTower_8F/border.bin", + "blockdata_filepath": "data/layouts/SevenIsland_TrainerTower_8F/map.bin" + }, + { + "id": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_ROOF", + "name": "SevenIsland_TrainerTower_Roof_Layout", + "width": 18, + "height": 16, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D5094", + "border_filepath": "data/layouts/SevenIsland_TrainerTower_Roof/border.bin", + "blockdata_filepath": "data/layouts/SevenIsland_TrainerTower_Roof/map.bin" + }, + { + "id": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_ELEVATOR", + "name": "SevenIsland_TrainerTower_Elevator_Layout", + "width": 5, + "height": 7, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4ECC", + "border_filepath": "data/layouts/SevenIsland_TrainerTower_Elevator/border.bin", + "blockdata_filepath": "data/layouts/SevenIsland_TrainerTower_Elevator/map.bin" + }, + { + "id": "LAYOUT_CERULEAN_CITY_HOUSE5", + "name": "CeruleanCity_House5_Layout", + "width": 11, + "height": 9, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4E84", + "border_filepath": "data/layouts/CeruleanCity_House5/border.bin", + "blockdata_filepath": "data/layouts/CeruleanCity_House5/map.bin" + }, + { + "id": "LAYOUT_SIX_ISLAND_DOTTED_HOLE_1F", + "name": "SixIsland_DottedHole_1F_Layout", + "width": 16, + "height": 11, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D501C", + "border_filepath": "data/layouts/SixIsland_DottedHole_1F/border.bin", + "blockdata_filepath": "data/layouts/SixIsland_DottedHole_1F/map.bin" + }, + { + "id": "LAYOUT_SIX_ISLAND_DOTTED_HOLE_B1F", + "name": "SixIsland_DottedHole_B1F_Layout", + "width": 13, + "height": 11, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D501C", + "border_filepath": "data/layouts/SixIsland_DottedHole_B1F/border.bin", + "blockdata_filepath": "data/layouts/SixIsland_DottedHole_B1F/map.bin" + }, + { + "id": "LAYOUT_SIX_ISLAND_DOTTED_HOLE_B2F", + "name": "SixIsland_DottedHole_B2F_Layout", + "width": 13, + "height": 11, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D501C", + "border_filepath": "data/layouts/SixIsland_DottedHole_B2F/border.bin", + "blockdata_filepath": "data/layouts/SixIsland_DottedHole_B2F/map.bin" + }, + { + "id": "LAYOUT_SIX_ISLAND_DOTTED_HOLE_B3F", + "name": "SixIsland_DottedHole_B3F_Layout", + "width": 13, + "height": 11, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D501C", + "border_filepath": "data/layouts/SixIsland_DottedHole_B3F/border.bin", + "blockdata_filepath": "data/layouts/SixIsland_DottedHole_B3F/map.bin" + }, + { + "id": "LAYOUT_SIX_ISLAND_DOTTED_HOLE_B4F", + "name": "SixIsland_DottedHole_B4F_Layout", + "width": 13, + "height": 11, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D501C", + "border_filepath": "data/layouts/SixIsland_DottedHole_B4F/border.bin", + "blockdata_filepath": "data/layouts/SixIsland_DottedHole_B4F/map.bin" + }, + { + "id": "LAYOUT_SIX_ISLAND_DOTTED_HOLE_SAPPHIRE_ROOM", + "name": "SixIsland_DottedHole_SapphireRoom_Layout", + "width": 16, + "height": 15, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D501C", + "border_filepath": "data/layouts/SixIsland_DottedHole_SapphireRoom/border.bin", + "blockdata_filepath": "data/layouts/SixIsland_DottedHole_SapphireRoom/map.bin" + }, + { + "id": "LAYOUT_ISLAND_HARBOR", + "name": "Island_Harbor_Layout", + "width": 17, + "height": 13, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D50AC", + "border_filepath": "data/layouts/Island_Harbor/border.bin", + "blockdata_filepath": "data/layouts/Island_Harbor/map.bin" + }, + { + "id": "LAYOUT_ONE_ISLAND_POKEMON_CENTER_2F", + "name": "OneIsland_PokemonCenter_2F_Layout", + "width": 15, + "height": 10, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4BE4", + "border_filepath": "data/layouts/OneIsland_PokemonCenter_2F/border.bin", + "blockdata_filepath": "data/layouts/OneIsland_PokemonCenter_2F/map.bin" + }, + { + "id": "LAYOUT_SIX_ISLAND_PATTERN_BUSH", + "name": "SixIsland_PatternBush_Layout", + "width": 60, + "height": 32, + "border_width": 3, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D4DC4", + "border_filepath": "data/layouts/SixIsland_PatternBush/border.bin", + "blockdata_filepath": "data/layouts/SixIsland_PatternBush/map.bin" + }, + { + "id": "LAYOUT_THREE_ISLAND_DUNSPARCE_TUNNEL", + "name": "ThreeIsland_DunsparceTunnel_Layout", + "width": 30, + "height": 7, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D4BFC", + "border_filepath": "data/layouts/ThreeIsland_DunsparceTunnel/border.bin", + "blockdata_filepath": "data/layouts/ThreeIsland_DunsparceTunnel/map.bin" + }, + { + "id": "LAYOUT_UNUSED_LAYOUT_83453C0", + "name": "UnusedLayout_83453C0_Layout", + "width": 30, + "height": 7, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D4BFC", + "border_filepath": "data/layouts/UnusedLayout_83453C0/border.bin", + "blockdata_filepath": "data/layouts/UnusedLayout_83453C0/map.bin" + }, + { + "id": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ENTRANCE", + "name": "FiveIsland_LostCave_Entrance_Layout", + "width": 11, + "height": 11, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D4BFC", + "border_filepath": "data/layouts/FiveIsland_LostCave_Entrance/border.bin", + "blockdata_filepath": "data/layouts/FiveIsland_LostCave_Entrance/map.bin" + }, + { + "id": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM1", + "name": "FiveIsland_LostCave_Room1_Layout", + "width": 11, + "height": 11, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D4BFC", + "border_filepath": "data/layouts/FiveIsland_LostCave_Room1/border.bin", + "blockdata_filepath": "data/layouts/FiveIsland_LostCave_Room1/map.bin" + }, + { + "id": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM2", + "name": "FiveIsland_LostCave_Room2_Layout", + "width": 11, + "height": 11, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D4BFC", + "border_filepath": "data/layouts/FiveIsland_LostCave_Room2/border.bin", + "blockdata_filepath": "data/layouts/FiveIsland_LostCave_Room2/map.bin" + }, + { + "id": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM3", + "name": "FiveIsland_LostCave_Room3_Layout", + "width": 11, + "height": 11, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D4BFC", + "border_filepath": "data/layouts/FiveIsland_LostCave_Room3/border.bin", + "blockdata_filepath": "data/layouts/FiveIsland_LostCave_Room3/map.bin" + }, + { + "id": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM4", + "name": "FiveIsland_LostCave_Room4_Layout", + "width": 11, + "height": 11, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D4BFC", + "border_filepath": "data/layouts/FiveIsland_LostCave_Room4/border.bin", + "blockdata_filepath": "data/layouts/FiveIsland_LostCave_Room4/map.bin" + }, + { + "id": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM5", + "name": "FiveIsland_LostCave_Room5_Layout", + "width": 11, + "height": 11, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D4BFC", + "border_filepath": "data/layouts/FiveIsland_LostCave_Room5/border.bin", + "blockdata_filepath": "data/layouts/FiveIsland_LostCave_Room5/map.bin" + }, + { + "id": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM6", + "name": "FiveIsland_LostCave_Room6_Layout", + "width": 11, + "height": 11, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D4BFC", + "border_filepath": "data/layouts/FiveIsland_LostCave_Room6/border.bin", + "blockdata_filepath": "data/layouts/FiveIsland_LostCave_Room6/map.bin" + }, + { + "id": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM7", + "name": "FiveIsland_LostCave_Room7_Layout", + "width": 11, + "height": 11, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D4BFC", + "border_filepath": "data/layouts/FiveIsland_LostCave_Room7/border.bin", + "blockdata_filepath": "data/layouts/FiveIsland_LostCave_Room7/map.bin" + }, + { + "id": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM8", + "name": "FiveIsland_LostCave_Room8_Layout", + "width": 11, + "height": 11, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D4BFC", + "border_filepath": "data/layouts/FiveIsland_LostCave_Room8/border.bin", + "blockdata_filepath": "data/layouts/FiveIsland_LostCave_Room8/map.bin" + }, + { + "id": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM9", + "name": "FiveIsland_LostCave_Room9_Layout", + "width": 11, + "height": 11, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D4BFC", + "border_filepath": "data/layouts/FiveIsland_LostCave_Room9/border.bin", + "blockdata_filepath": "data/layouts/FiveIsland_LostCave_Room9/map.bin" + }, + { + "id": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM10", + "name": "FiveIsland_LostCave_Room10_Layout", + "width": 11, + "height": 11, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D4BFC", + "border_filepath": "data/layouts/FiveIsland_LostCave_Room10/border.bin", + "blockdata_filepath": "data/layouts/FiveIsland_LostCave_Room10/map.bin" + }, + { + "id": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM11", + "name": "FiveIsland_LostCave_Room11_Layout", + "width": 11, + "height": 11, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D4BFC", + "border_filepath": "data/layouts/FiveIsland_LostCave_Room11/border.bin", + "blockdata_filepath": "data/layouts/FiveIsland_LostCave_Room11/map.bin" + }, + { + "id": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM12", + "name": "FiveIsland_LostCave_Room12_Layout", + "width": 11, + "height": 11, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D4BFC", + "border_filepath": "data/layouts/FiveIsland_LostCave_Room12/border.bin", + "blockdata_filepath": "data/layouts/FiveIsland_LostCave_Room12/map.bin" + }, + { + "id": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM13", + "name": "FiveIsland_LostCave_Room13_Layout", + "width": 11, + "height": 11, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D4BFC", + "border_filepath": "data/layouts/FiveIsland_LostCave_Room13/border.bin", + "blockdata_filepath": "data/layouts/FiveIsland_LostCave_Room13/map.bin" + }, + { + "id": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM14", + "name": "FiveIsland_LostCave_Room14_Layout", + "width": 11, + "height": 11, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D4BFC", + "border_filepath": "data/layouts/FiveIsland_LostCave_Room14/border.bin", + "blockdata_filepath": "data/layouts/FiveIsland_LostCave_Room14/map.bin" + }, + { + "id": "LAYOUT_SEVEN_ISLAND_TANOBY_RUINS_MONEAN_CHAMBER", + "name": "SevenIsland_TanobyRuins_MoneanChamber_Layout", + "width": 23, + "height": 17, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D5034", + "border_filepath": "data/layouts/SevenIsland_TanobyRuins_MoneanChamber/border.bin", + "blockdata_filepath": "data/layouts/SevenIsland_TanobyRuins_MoneanChamber/map.bin" + }, + { + "id": "LAYOUT_SEVEN_ISLAND_TANOBY_RUINS_LIPTOO_CHAMBER", + "name": "SevenIsland_TanobyRuins_LiptooChamber_Layout", + "width": 23, + "height": 17, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D5034", + "border_filepath": "data/layouts/SevenIsland_TanobyRuins_LiptooChamber/border.bin", + "blockdata_filepath": "data/layouts/SevenIsland_TanobyRuins_LiptooChamber/map.bin" + }, + { + "id": "LAYOUT_SEVEN_ISLAND_TANOBY_RUINS_WEEPTH_CHAMBER", + "name": "SevenIsland_TanobyRuins_WeepthChamber_Layout", + "width": 23, + "height": 17, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D5034", + "border_filepath": "data/layouts/SevenIsland_TanobyRuins_WeepthChamber/border.bin", + "blockdata_filepath": "data/layouts/SevenIsland_TanobyRuins_WeepthChamber/map.bin" + }, + { + "id": "LAYOUT_SEVEN_ISLAND_TANOBY_RUINS_DILFORD_CHAMBER", + "name": "SevenIsland_TanobyRuins_DilfordChamber_Layout", + "width": 23, + "height": 17, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D5034", + "border_filepath": "data/layouts/SevenIsland_TanobyRuins_DilfordChamber/border.bin", + "blockdata_filepath": "data/layouts/SevenIsland_TanobyRuins_DilfordChamber/map.bin" + }, + { + "id": "LAYOUT_SEVEN_ISLAND_TANOBY_RUINS_SCUFIB_CHAMBER", + "name": "SevenIsland_TanobyRuins_ScufibChamber_Layout", + "width": 23, + "height": 17, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D5034", + "border_filepath": "data/layouts/SevenIsland_TanobyRuins_ScufibChamber/border.bin", + "blockdata_filepath": "data/layouts/SevenIsland_TanobyRuins_ScufibChamber/map.bin" + }, + { + "id": "LAYOUT_SIX_ISLAND_ALTERING_CAVE", + "name": "SixIsland_AlteringCave_Layout", + "width": 32, + "height": 24, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D4DF4", + "border_filepath": "data/layouts/SixIsland_AlteringCave/border.bin", + "blockdata_filepath": "data/layouts/SixIsland_AlteringCave/map.bin" + }, + { + "id": "LAYOUT_SEVEN_ISLAND_SEAVAULT_CANYON_TANOBY_KEY", + "name": "SevenIsland_SeavaultCanyon_TanobyKey_Layout", + "width": 15, + "height": 16, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D4E0C", + "border_filepath": "data/layouts/SevenIsland_SeavaultCanyon_TanobyKey/border.bin", + "blockdata_filepath": "data/layouts/SevenIsland_SeavaultCanyon_TanobyKey/map.bin" + }, + { + "id": "LAYOUT_BIRTH_ISLAND_EXTERIOR", + "name": "BirthIsland_Exterior_Layout", + "width": 30, + "height": 30, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D507C", + "border_filepath": "data/layouts/BirthIsland_Exterior/border.bin", + "blockdata_filepath": "data/layouts/BirthIsland_Exterior/map.bin" + }, + { + "id": "LAYOUT_NAVEL_ROCK_EXTERIOR", + "name": "NavelRock_Exterior_Layout", + "width": 20, + "height": 23, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D504C", + "border_filepath": "data/layouts/NavelRock_Exterior/border.bin", + "blockdata_filepath": "data/layouts/NavelRock_Exterior/map.bin" + }, + { + "id": "LAYOUT_NAVEL_ROCK_1F", + "name": "NavelRock_1F_Layout", + "width": 17, + "height": 26, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D501C", + "border_filepath": "data/layouts/NavelRock_1F/border.bin", + "blockdata_filepath": "data/layouts/NavelRock_1F/map.bin" + }, + { + "id": "LAYOUT_NAVEL_ROCK_SUMMIT", + "name": "NavelRock_Summit_Layout", + "width": 19, + "height": 25, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D501C", + "border_filepath": "data/layouts/NavelRock_Summit/border.bin", + "blockdata_filepath": "data/layouts/NavelRock_Summit/map.bin" + }, + { + "id": "LAYOUT_NAVEL_ROCK_BASE", + "name": "NavelRock_Base_Layout", + "width": 21, + "height": 23, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D501C", + "border_filepath": "data/layouts/NavelRock_Base/border.bin", + "blockdata_filepath": "data/layouts/NavelRock_Base/map.bin" + }, + { + "id": "LAYOUT_NAVEL_ROCK_SUMMIT_PATH_2F", + "name": "NavelRock_SummitPath_2F_Layout", + "width": 7, + "height": 7, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D501C", + "border_filepath": "data/layouts/NavelRock_SummitPath_2F/border.bin", + "blockdata_filepath": "data/layouts/NavelRock_SummitPath_2F/map.bin" + }, + { + "id": "LAYOUT_NAVEL_ROCK_SUMMIT_PATH_3F", + "name": "NavelRock_SummitPath_3F_Layout", + "width": 7, + "height": 7, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D501C", + "border_filepath": "data/layouts/NavelRock_SummitPath_3F/border.bin", + "blockdata_filepath": "data/layouts/NavelRock_SummitPath_3F/map.bin" + }, + { + "id": "LAYOUT_NAVEL_ROCK_SUMMIT_PATH_4F", + "name": "NavelRock_SummitPath_4F_Layout", + "width": 7, + "height": 7, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D501C", + "border_filepath": "data/layouts/NavelRock_SummitPath_4F/border.bin", + "blockdata_filepath": "data/layouts/NavelRock_SummitPath_4F/map.bin" + }, + { + "id": "LAYOUT_NAVEL_ROCK_SUMMIT_PATH_5F", + "name": "NavelRock_SummitPath_5F_Layout", + "width": 7, + "height": 7, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D501C", + "border_filepath": "data/layouts/NavelRock_SummitPath_5F/border.bin", + "blockdata_filepath": "data/layouts/NavelRock_SummitPath_5F/map.bin" + }, + { + "id": "LAYOUT_NAVEL_ROCK_BASE_PATH_B1F", + "name": "NavelRock_BasePath_B1F_Layout", + "width": 7, + "height": 7, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D501C", + "border_filepath": "data/layouts/NavelRock_BasePath_B1F/border.bin", + "blockdata_filepath": "data/layouts/NavelRock_BasePath_B1F/map.bin" + }, + { + "id": "LAYOUT_NAVEL_ROCK_BASE_PATH_B2F", + "name": "NavelRock_BasePath_B2F_Layout", + "width": 7, + "height": 7, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D501C", + "border_filepath": "data/layouts/NavelRock_BasePath_B2F/border.bin", + "blockdata_filepath": "data/layouts/NavelRock_BasePath_B2F/map.bin" + }, + { + "id": "LAYOUT_NAVEL_ROCK_BASE_PATH_B3F", + "name": "NavelRock_BasePath_B3F_Layout", + "width": 7, + "height": 7, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D501C", + "border_filepath": "data/layouts/NavelRock_BasePath_B3F/border.bin", + "blockdata_filepath": "data/layouts/NavelRock_BasePath_B3F/map.bin" + }, + { + "id": "LAYOUT_NAVEL_ROCK_BASE_PATH_B4F", + "name": "NavelRock_BasePath_B4F_Layout", + "width": 7, + "height": 7, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D501C", + "border_filepath": "data/layouts/NavelRock_BasePath_B4F/border.bin", + "blockdata_filepath": "data/layouts/NavelRock_BasePath_B4F/map.bin" + }, + { + "id": "LAYOUT_NAVEL_ROCK_BASE_PATH_B5F", + "name": "NavelRock_BasePath_B5F_Layout", + "width": 7, + "height": 7, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D501C", + "border_filepath": "data/layouts/NavelRock_BasePath_B5F/border.bin", + "blockdata_filepath": "data/layouts/NavelRock_BasePath_B5F/map.bin" + }, + { + "id": "LAYOUT_NAVEL_ROCK_BASE_PATH_B6F", + "name": "NavelRock_BasePath_B6F_Layout", + "width": 7, + "height": 7, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D501C", + "border_filepath": "data/layouts/NavelRock_BasePath_B6F/border.bin", + "blockdata_filepath": "data/layouts/NavelRock_BasePath_B6F/map.bin" + }, + { + "id": "LAYOUT_NAVEL_ROCK_BASE_PATH_B7F", + "name": "NavelRock_BasePath_B7F_Layout", + "width": 7, + "height": 7, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D501C", + "border_filepath": "data/layouts/NavelRock_BasePath_B7F/border.bin", + "blockdata_filepath": "data/layouts/NavelRock_BasePath_B7F/map.bin" + }, + { + "id": "LAYOUT_NAVEL_ROCK_BASE_PATH_B8F", + "name": "NavelRock_BasePath_B8F_Layout", + "width": 7, + "height": 7, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D501C", + "border_filepath": "data/layouts/NavelRock_BasePath_B8F/border.bin", + "blockdata_filepath": "data/layouts/NavelRock_BasePath_B8F/map.bin" + }, + { + "id": "LAYOUT_NAVEL_ROCK_BASE_PATH_B9F", + "name": "NavelRock_BasePath_B9F_Layout", + "width": 7, + "height": 7, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D501C", + "border_filepath": "data/layouts/NavelRock_BasePath_B9F/border.bin", + "blockdata_filepath": "data/layouts/NavelRock_BasePath_B9F/map.bin" + }, + { + "id": "LAYOUT_NAVEL_ROCK_BASE_PATH_B10F", + "name": "NavelRock_BasePath_B10F_Layout", + "width": 7, + "height": 7, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D501C", + "border_filepath": "data/layouts/NavelRock_BasePath_B10F/border.bin", + "blockdata_filepath": "data/layouts/NavelRock_BasePath_B10F/map.bin" + }, + { + "id": "LAYOUT_NAVEL_ROCK_BASE_PATH_B11F", + "name": "NavelRock_BasePath_B11F_Layout", + "width": 7, + "height": 7, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D501C", + "border_filepath": "data/layouts/NavelRock_BasePath_B11F/border.bin", + "blockdata_filepath": "data/layouts/NavelRock_BasePath_B11F/map.bin" + }, + { + "id": "LAYOUT_SEVEN_ISLAND_TANOBY_RUINS_RIXY_CHAMBER", + "name": "SevenIsland_TanobyRuins_RixyChamber_Layout", + "width": 23, + "height": 17, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D5034", + "border_filepath": "data/layouts/SevenIsland_TanobyRuins_RixyChamber/border.bin", + "blockdata_filepath": "data/layouts/SevenIsland_TanobyRuins_RixyChamber/map.bin" + }, + { + "id": "LAYOUT_SEVEN_ISLAND_TANOBY_RUINS_VIAPOIS_CHAMBER", + "name": "SevenIsland_TanobyRuins_ViapoisChamber_Layout", + "width": 23, + "height": 17, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D5034", + "border_filepath": "data/layouts/SevenIsland_TanobyRuins_ViapoisChamber/border.bin", + "blockdata_filepath": "data/layouts/SevenIsland_TanobyRuins_ViapoisChamber/map.bin" + }, + { + "id": "LAYOUT_NAVEL_ROCK_B1F", + "name": "NavelRock_B1F_Layout", + "width": 17, + "height": 7, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D501C", + "border_filepath": "data/layouts/NavelRock_B1F/border.bin", + "blockdata_filepath": "data/layouts/NavelRock_B1F/map.bin" + }, + { + "id": "LAYOUT_NAVEL_ROCK_FORK", + "name": "NavelRock_Fork_Layout", + "width": 30, + "height": 100, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D501C", + "border_filepath": "data/layouts/NavelRock_Fork/border.bin", + "blockdata_filepath": "data/layouts/NavelRock_Fork/map.bin" + }, + { + "id": "LAYOUT_UNUSED_LAYOUT_834BC2C", + "name": "UnusedLayout_834BC2C_Layout", + "width": 18, + "height": 17, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D5094", + "border_filepath": "data/layouts/UnusedLayout_834BC2C/border.bin", + "blockdata_filepath": "data/layouts/UnusedLayout_834BC2C/map.bin" + }, + { + "id": "LAYOUT_UNUSED_LAYOUT_834BEB4", + "name": "UnusedLayout_834BEB4_Layout", + "width": 18, + "height": 17, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D5094", + "border_filepath": "data/layouts/UnusedLayout_834BEB4/border.bin", + "blockdata_filepath": "data/layouts/UnusedLayout_834BEB4/map.bin" + }, + { + "id": "LAYOUT_UNUSED_LAYOUT_834C13C", + "name": "UnusedLayout_834C13C_Layout", + "width": 18, + "height": 17, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D5094", + "border_filepath": "data/layouts/UnusedLayout_834C13C/border.bin", + "blockdata_filepath": "data/layouts/UnusedLayout_834C13C/map.bin" + }, + { + "id": "LAYOUT_UNUSED_LAYOUT_834C3C4", + "name": "UnusedLayout_834C3C4_Layout", + "width": 18, + "height": 17, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D5094", + "border_filepath": "data/layouts/UnusedLayout_834C3C4/border.bin", + "blockdata_filepath": "data/layouts/UnusedLayout_834C3C4/map.bin" + }, + { + "id": "LAYOUT_UNUSED_LAYOUT_834C64C", + "name": "UnusedLayout_834C64C_Layout", + "width": 18, + "height": 17, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D5094", + "border_filepath": "data/layouts/UnusedLayout_834C64C/border.bin", + "blockdata_filepath": "data/layouts/UnusedLayout_834C64C/map.bin" + }, + { + "id": "LAYOUT_UNUSED_LAYOUT_834C8D4", + "name": "UnusedLayout_834C8D4_Layout", + "width": 18, + "height": 17, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D5094", + "border_filepath": "data/layouts/UnusedLayout_834C8D4/border.bin", + "blockdata_filepath": "data/layouts/UnusedLayout_834C8D4/map.bin" + }, + { + "id": "LAYOUT_UNUSED_LAYOUT_834CB5C", + "name": "UnusedLayout_834CB5C_Layout", + "width": 18, + "height": 17, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D5094", + "border_filepath": "data/layouts/UnusedLayout_834CB5C/border.bin", + "blockdata_filepath": "data/layouts/UnusedLayout_834CB5C/map.bin" + }, + { + "id": "LAYOUT_UNUSED_LAYOUT_834CDE4", + "name": "UnusedLayout_834CDE4_Layout", + "width": 18, + "height": 17, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D5094", + "border_filepath": "data/layouts/UnusedLayout_834CDE4/border.bin", + "blockdata_filepath": "data/layouts/UnusedLayout_834CDE4/map.bin" + }, + { + "id": "LAYOUT_UNUSED_LAYOUT_834D06C", + "name": "UnusedLayout_834D06C_Layout", + "width": 18, + "height": 17, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D5094", + "border_filepath": "data/layouts/UnusedLayout_834D06C/border.bin", + "blockdata_filepath": "data/layouts/UnusedLayout_834D06C/map.bin" + }, + { + "id": "LAYOUT_UNUSED_LAYOUT_834D2F4", + "name": "UnusedLayout_834D2F4_Layout", + "width": 18, + "height": 17, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D5094", + "border_filepath": "data/layouts/UnusedLayout_834D2F4/border.bin", + "blockdata_filepath": "data/layouts/UnusedLayout_834D2F4/map.bin" + }, + { + "id": "LAYOUT_UNUSED_LAYOUT_834D57C", + "name": "UnusedLayout_834D57C_Layout", + "width": 18, + "height": 17, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D5094", + "border_filepath": "data/layouts/UnusedLayout_834D57C/border.bin", + "blockdata_filepath": "data/layouts/UnusedLayout_834D57C/map.bin" + }, + { + "id": "LAYOUT_UNUSED_LAYOUT_834D804", + "name": "UnusedLayout_834D804_Layout", + "width": 18, + "height": 17, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D5094", + "border_filepath": "data/layouts/UnusedLayout_834D804/border.bin", + "blockdata_filepath": "data/layouts/UnusedLayout_834D804/map.bin" + }, + { + "id": "LAYOUT_UNUSED_LAYOUT_834DA8C", + "name": "UnusedLayout_834DA8C_Layout", + "width": 18, + "height": 17, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D5094", + "border_filepath": "data/layouts/UnusedLayout_834DA8C/border.bin", + "blockdata_filepath": "data/layouts/UnusedLayout_834DA8C/map.bin" + }, + { + "id": "LAYOUT_UNUSED_LAYOUT_834DD14", + "name": "UnusedLayout_834DD14_Layout", + "width": 18, + "height": 17, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D5094", + "border_filepath": "data/layouts/UnusedLayout_834DD14/border.bin", + "blockdata_filepath": "data/layouts/UnusedLayout_834DD14/map.bin" + }, + { + "id": "LAYOUT_UNUSED_LAYOUT_834DF9C", + "name": "UnusedLayout_834DF9C_Layout", + "width": 18, + "height": 17, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D5094", + "border_filepath": "data/layouts/UnusedLayout_834DF9C/border.bin", + "blockdata_filepath": "data/layouts/UnusedLayout_834DF9C/map.bin" + }, + { + "id": "LAYOUT_UNUSED_LAYOUT_834E224", + "name": "UnusedLayout_834E224_Layout", + "width": 18, + "height": 17, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D5094", + "border_filepath": "data/layouts/UnusedLayout_834E224/border.bin", + "blockdata_filepath": "data/layouts/UnusedLayout_834E224/map.bin" + }, + { + "id": "LAYOUT_SEVEN_ISLAND_HOUSE_ROOM1", + "name": "SevenIsland_House_Room1_Layout", + "width": 11, + "height": 9, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4BB4", + "secondary_tileset": "gTileset_82D4E24", + "border_filepath": "data/layouts/SevenIsland_House_Room1/border.bin", + "blockdata_filepath": "data/layouts/SevenIsland_House_Room1/map.bin" + }, + { + "id": "LAYOUT_ONE_ISLAND_KINDLE_ROAD_EMBER_SPA", + "name": "OneIsland_KindleRoad_EmberSpa_Layout", + "width": 27, + "height": 39, + "border_width": 2, + "border_height": 2, + "primary_tileset": "gTileset_82D4A94", + "secondary_tileset": "gTileset_82D4FEC", + "border_filepath": "data/layouts/OneIsland_KindleRoad_EmberSpa/border.bin", + "blockdata_filepath": "data/layouts/OneIsland_KindleRoad_EmberSpa/map.bin" + } + ] +}
\ No newline at end of file diff --git a/data/layouts/layouts_table.inc b/data/layouts/layouts_table.inc deleted file mode 100644 index f622d56dd..000000000 --- a/data/layouts/layouts_table.inc +++ /dev/null @@ -1,385 +0,0 @@ - .align 2 -gMapLayouts:: @ 834EB8C - .4byte PalletTown_PlayersHouse_1F_Layout - .4byte PalletTown_PlayersHouse_2F_Layout - .4byte PalletTown_GarysHouse_Layout - .4byte UnusedLayout_82D54D8_Layout - .4byte PalletTown_ProfessorOaksLab_Layout - .4byte House1_Layout - .4byte House2_Layout - .4byte PokemonCenter_1F_Layout - .4byte PokemonCenter_2F_Layout - .4byte Mart_Layout - .4byte House3_Layout - .4byte CeruleanCity_Gym_Layout - .4byte House4_Layout - .4byte UnusedLayout_82D6144_Layout - .4byte CeladonCity_Gym_Layout - .4byte UnusedLayout_82D6490_Layout - .4byte FiveIsland_ResortGorgeous_House_Layout - .4byte UnusedLayout_82D6654_Layout - .4byte UnusedLayout_82D672C_Layout - .4byte FuchsiaCity_Gym_Layout - .4byte House5_Layout - .4byte NULL - .4byte NULL - .4byte UnusedLayout_82D6C34_Layout - .4byte VermilionCity_Gym_Layout - .4byte CeruleanCity_BikeShop_Layout - .4byte CeladonCity_GameCorner_Layout - .4byte PewterCity_Gym_Layout - .4byte NULL - .4byte FourIsland_LoreleisHouse_Layout - .4byte ThreeIsland_House1_Layout - .4byte UnusedLayout_82D75F0_Layout - .4byte UnusedLayout_82D7674_Layout - .4byte SaffronCity_Gym_Layout - .4byte UnusedLayout_82D7CC8_Layout - .4byte CinnabarIsland_Gym_Layout - .4byte ViridianCity_Gym_Layout - .4byte NULL - .4byte NULL - .4byte NULL - .4byte NULL - .4byte NULL - .4byte NULL - .4byte NULL - .4byte NULL - .4byte UnusedLayout_82D88C8_Layout - .4byte UnknownMap_00_00_Layout - .4byte UnknownMap_00_01_Layout - .4byte UnknownMap_00_02_Layout - .4byte UnknownMap_00_03_Layout - .4byte FuchsiaCity_SafariZone_Entrance_Layout - .4byte UnusedLayout_82D9B24_Layout - .4byte UnusedLayout_82DA7C8_Layout - .4byte UnusedLayout_82DB46C_Layout - .4byte UnusedLayout_82DB4F0_Layout - .4byte NULL - .4byte UnusedLayout_82DBBE0_Layout - .4byte NULL - .4byte NULL - .4byte NULL - .4byte NULL - .4byte UnusedLayout_82DBDD8_Layout - .4byte UnusedLayout_82DBFB8_Layout - .4byte UnusedLayout_82DC4EC_Layout - .4byte UnusedLayout_82DC60C_Layout - .4byte UnusedLayout_82DC72C_Layout - .4byte UnusedLayout_82DC84C_Layout - .4byte UnusedLayout_82DCA70_Layout - .4byte UnusedLayout_82DCB44_Layout - .4byte UnusedLayout_82DCC40_Layout - .4byte UnusedLayout_82DCCD4_Layout - .4byte UnusedLayout_82DCD68_Layout - .4byte UnusedLayout_82DCDFC_Layout - .4byte UnusedLayout_82DCF00_Layout - .4byte UnusedLayout_82DD004_Layout - .4byte NULL - .4byte UnusedLayout_82DD0DC_Layout - .4byte PalletTown_Layout - .4byte ViridianCity_Layout - .4byte PewterCity_Layout - .4byte CeruleanCity_Layout - .4byte LavenderTown_Layout - .4byte VermilionCity_Layout - .4byte CeladonCity_Layout - .4byte FuchsiaCity_Layout - .4byte CinnabarIsland_Layout - .4byte IndigoPlateau_Exterior_Layout - .4byte SaffronCity_Layout - .4byte Route1_Layout - .4byte Route2_Layout - .4byte Route3_Layout - .4byte Route4_Layout - .4byte Route5_Layout - .4byte Route6_Layout - .4byte Route7_Layout - .4byte Route8_Layout - .4byte Route9_Layout - .4byte Route10_Layout - .4byte Route11_Layout - .4byte Route12_Layout - .4byte Route13_Layout - .4byte Route14_Layout - .4byte Route15_Layout - .4byte Route16_Layout - .4byte Route17_Layout - .4byte Route18_Layout - .4byte Route19_Layout - .4byte Route20_Layout - .4byte Route21_North_Layout - .4byte Route22_Layout - .4byte Route23_Layout - .4byte Route24_Layout - .4byte Route25_Layout - .4byte MtMoon_1F_Layout - .4byte MtMoon_B1F_Layout - .4byte MtMoon_B2F_Layout - .4byte ViridianForest_Layout - .4byte SSAnne_Exterior_Layout - .4byte SSAnne_1F_Corridor_Layout - .4byte SSAnne_2F_Corridor_Layout - .4byte SSAnne_3F_Corridor_Layout - .4byte SSAnne_B1F_Corridor_Layout - .4byte SSAnne_Deck_Layout - .4byte DiglettsCave_B1F_Layout - .4byte VictoryRoad_1F_Layout - .4byte VictoryRoad_2F_Layout - .4byte VictoryRoad_3F_Layout - .4byte RocketHideout_B1F_Layout - .4byte RocketHideout_B2F_Layout - .4byte RocketHideout_B3F_Layout - .4byte RocketHideout_B4F_Layout - .4byte SilphCo_1F_Layout - .4byte SilphCo_2F_Layout - .4byte SilphCo_3F_Layout - .4byte SilphCo_4F_Layout - .4byte SilphCo_5F_Layout - .4byte SilphCo_6F_Layout - .4byte SilphCo_7F_Layout - .4byte SilphCo_8F_Layout - .4byte SilphCo_9F_Layout - .4byte SilphCo_10F_Layout - .4byte SilphCo_11F_Layout - .4byte PokemonMansion_1F_Layout - .4byte PokemonMansion_2F_Layout - .4byte PokemonMansion_3F_Layout - .4byte PokemonMansion_B1F_Layout - .4byte SafariZone_Center_Layout - .4byte SafariZone_East_Layout - .4byte SafariZone_North_Layout - .4byte SafariZone_West_Layout - .4byte CeruleanCave_1F_Layout - .4byte CeruleanCave_2F_Layout - .4byte CeruleanCave_B1F_Layout - .4byte RockTunnel_1F_Layout - .4byte RockTunnel_B1F_Layout - .4byte SeafoamIslands_1F_Layout - .4byte SeafoamIslands_B1F_Layout - .4byte SeafoamIslands_B2F_Layout - .4byte SeafoamIslands_B3F_Layout - .4byte SeafoamIslands_B4F_Layout - .4byte PokemonTower_1F_Layout - .4byte PokemonTower_2F_Layout - .4byte PokemonTower_3F_Layout - .4byte PokemonTower_4F_Layout - .4byte PokemonTower_5F_Layout - .4byte PokemonTower_6F_Layout - .4byte PokemonTower_7F_Layout - .4byte PowerPlant_Layout - .4byte Route25_SeaCottage_Layout - .4byte SSAnne_Kitchen_Layout - .4byte SSAnne_CaptainsOffice_Layout - .4byte UndergroundPath_Entrance_Layout - .4byte UndergroundPath_EastWestTunnel_Layout - .4byte UndergroundPath_NorthSouthTunnel_Layout - .4byte NULL - .4byte Route12_NorthEntrance_1F_Layout - .4byte SSAnne_Room1_Layout - .4byte SSAnne_Room2_Layout - .4byte CeladonCity_DepartmentStore_Elevator_Layout - .4byte PewterCity_Museum_1F_Layout - .4byte PewterCity_Museum_2F_Layout - .4byte CeruleanCity_House2_Layout - .4byte CeruleanCity_House1_Layout - .4byte CeladonCity_Condominiums_1F_Layout - .4byte CeladonCity_Condominiums_2F_Layout - .4byte CeladonCity_Condominiums_3F_Layout - .4byte CeladonCity_Condominiums_Roof_Layout - .4byte CeladonCity_Condominiums_RoofRoom_Layout - .4byte CeladonCity_GameCorner_PrizeRoom_Layout - .4byte CeladonCity_Restaurant_Layout - .4byte CeladonCity_Hotel_Layout - .4byte CeladonCity_DepartmentStore_1F_Layout - .4byte CeladonCity_DepartmentStore_2F_Layout - .4byte CeladonCity_DepartmentStore_3F_Layout - .4byte CeladonCity_DepartmentStore_4F_Layout - .4byte CeladonCity_DepartmentStore_5F_Layout - .4byte CeladonCity_DepartmentStore_Roof_Layout - .4byte SafariZone_Building_Layout - .4byte SafariZone_SecretHouse_Layout - .4byte FuchsiaCity_ZooBuilding_Layout - .4byte FuchsiaCity_Building1_Layout - .4byte FuchsiaCity_House2_Layout - .4byte CinnabarIsland_PokemonLab_Entrance_Layout - .4byte CinnabarIsland_PokemonLab_Lounge_Layout - .4byte CinnabarIsland_PokemonLab_ResearchRoom_Layout - .4byte CinnabarIsland_PokemonLab_ExperimentRoom_Layout - .4byte SaffronCity_Duplicate_Layout - .4byte SaffronCity_NorthSouthEntrance_Layout - .4byte SaffronCity_EastWestEntrance_Layout - .4byte DiglettsCave_NorthEntrance_Layout - .4byte DiglettsCave_SouthEntrance_Layout - .4byte IndigoPlateau_PokemonCenter_1F_Layout - .4byte PokemonLeague_LoreleisRoom_Layout - .4byte PokemonLeague_BrunosRoom_Layout - .4byte PokemonLeague_AgathasRoom_Layout - .4byte PokemonLeague_LancesRoom_Layout - .4byte PokemonLeague_ChampionsRoom_Layout - .4byte PokemonLeague_HallOfFame_Layout - .4byte Route21_South_Layout - .4byte Entrance_2F_Layout - .4byte Route2_Entrance_Layout - .4byte Route22_NorthEntrance_Layout - .4byte Route16_NorthEntrance_1F_Layout - .4byte Entrance_1F_Layout - .4byte RocketHideout_Elevator_Layout - .4byte SaffronCity_House1_1F_Layout - .4byte SaffronCity_House1_2F_Layout - .4byte SaffronCity_Dojo_Layout - .4byte SilphCo_Elevator_Layout - .4byte OneIsland_Layout - .4byte TwoIsland_Layout - .4byte ThreeIsland_Layout - .4byte FourIsland_Layout - .4byte FiveIsland_Layout - .4byte SevenIsland_Layout - .4byte SixIsland_Layout - .4byte OneIsland_KindleRoad_Layout - .4byte OneIsland_TreasureBeach_Layout - .4byte TwoIsland_CapeBrink_Layout - .4byte ThreeIsland_BondBridge_Layout - .4byte ThreeIsland_Port_Layout - .4byte UnknownMap_03_50_Layout - .4byte UnknownMap_03_51_Layout - .4byte UnknownMap_03_52_Layout - .4byte UnknownMap_03_53_Layout - .4byte FiveIsland_ResortGorgeous_Layout - .4byte FiveIsland_WaterLabyrinth_Layout - .4byte FiveIsland_Meadow_Layout - .4byte FiveIsland_MemorialPillar_Layout - .4byte SixIsland_OutcastIsland_Layout - .4byte SixIsland_GreenPath_Layout - .4byte SixIsland_WaterPath_Layout - .4byte SixIsland_RuinValley_Layout - .4byte SevenIsland_TrainerTower_Layout - .4byte SevenIsland_SevaultCanyon_Entrance_Layout - .4byte SevenIsland_SevaultCanyon_Layout - .4byte SevenIsland_TanobyRuins_Layout - .4byte UnusedLayout_833614C_Layout - .4byte UnusedLayout_83377F0_Layout - .4byte UnusedLayout_8338354_Layout - .4byte UnusedLayout_8338738_Layout - .4byte UnknownMap_00_04_Layout - .4byte SaffronCity_PokemonTrainerFanClub_Layout - .4byte UnusedLayout_8338B4C_Layout - .4byte SevenIsland_House_Room2_Layout - .4byte ViridianCity_House2_Layout - .4byte UnusedLayout_8338E90_Layout - .4byte UnusedLayout_833902C_Layout - .4byte MtEmber_RubyPath_B4F_Layout - .4byte ThreeIsland_BerryForest_Layout - .4byte OneIsland_PokemonCenter_1F_Layout - .4byte TwoIsland_JoyfulGameCorner_Layout - .4byte VermilionCity_PokemonFanClub_Layout - .4byte LavenderTown_VolunteerPokemonHouse_Layout - .4byte Route5_PokemonDayCare_Layout - .4byte ViridianCity_House1_Layout - .4byte FourIsland_PokemonDayCare_Layout - .4byte UnusedLayout_833B6EC_Layout - .4byte UnusedLayout_833BE30_Layout - .4byte MtEmber_Exterior_Layout - .4byte MtEmber_Summit_Layout - .4byte MtEmber_SummitPath_1F_Layout - .4byte MtEmber_SummitPath_2F_Layout - .4byte MtEmber_SummitPath_3F_Layout - .4byte SSAnne_Kitchen3_Layout - .4byte MtEmber_RubyPath_B1F_Layout - .4byte MtEmber_RubyPath_B2F_Layout - .4byte MtEmber_RubyPath_B3F_Layout - .4byte MtEmber_RubyPath_B1F_Stairs_Layout - .4byte MtEmber_RubyPath_B2F_Stairs_Layout - .4byte MtEmber_RubyPath_B5F_Layout - .4byte SSAnne_CaptainsOffice4_Layout - .4byte FourIsland_IcefallCave_Entrance_Layout - .4byte FourIsland_IcefallCave_1F_Layout - .4byte SSAnne_CaptainsOffice2_Layout - .4byte SSAnne_CaptainsOffice3_Layout - .4byte SevenIsland_TrainerTower_Lobby_Layout - .4byte SevenIsland_TrainerTower_1F_Layout - .4byte SevenIsland_TrainerTower_2F_Layout - .4byte SevenIsland_TrainerTower_3F_Layout - .4byte SevenIsland_TrainerTower_4F_Layout - .4byte SevenIsland_TrainerTower_5F_Layout - .4byte SevenIsland_TrainerTower_6F_Layout - .4byte SevenIsland_TrainerTower_7F_Layout - .4byte SevenIsland_TrainerTower_8F_Layout - .4byte SevenIsland_TrainerTower_Roof_Layout - .4byte SevenIsland_TrainerTower_Elevator_Layout - .4byte CeruleanCity_House5_Layout - .4byte SSAnne_CaptainsOffice5_Layout - .4byte SixIsland_DottedHole_B1F_Layout - .4byte SixIsland_DottedHole_B2F_Layout - .4byte SixIsland_DottedHole_B3F_Layout - .4byte SSAnne_CaptainsOffice9_Layout - .4byte SixIsland_DottedHole_SapphireRoom_Layout - .4byte Island_Harbor_Layout - .4byte OneIsland_PokemonCenter_2F_Layout - .4byte SSAnne_1F_Room11_Layout - .4byte ThreeIsland_DunsparceTunnel_Layout - .4byte UnusedLayout_83453C0_Layout - .4byte FiveIsland_LostCave_Entrance_Layout - .4byte FiveIsland_LostCave_Room1_Layout - .4byte FiveIsland_LostCave_Room2_Layout - .4byte FiveIsland_LostCave_Room3_Layout - .4byte FiveIsland_LostCave_Room4_Layout - .4byte FiveIsland_LostCave_Room5_Layout - .4byte FiveIsland_LostCave_Room6_Layout - .4byte FiveIsland_LostCave_Room7_Layout - .4byte FiveIsland_LostCave_Room8_Layout - .4byte FiveIsland_LostCave_Room9_Layout - .4byte FiveIsland_LostCave_Room10_Layout - .4byte FiveIsland_LostCave_Room11_Layout - .4byte FiveIsland_LostCave_Room12_Layout - .4byte FiveIsland_LostCave_Room13_Layout - .4byte FiveIsland_LostCave_Room14_Layout - .4byte SevenIsland_TanobyRuins_MoneanChamber_Layout - .4byte SevenIsland_TanobyRuins_LiptooChamber_Layout - .4byte SevenIsland_TanobyRuins_WeepthChamber_Layout - .4byte SevenIsland_TanobyRuins_DilfordChamber_Layout - .4byte SevenIsland_TanobyRuins_ScufibChamber_Layout - .4byte SSAnne_1F_Room12_Layout - .4byte SevenIsland_SeavaultCanyon_TanobyKey_Layout - .4byte BirthIsland_Exterior_Layout - .4byte NavelRock_Exterior_Layout - .4byte NavelRock_1F_Layout - .4byte NavelRock_Summit_Layout - .4byte NavelRock_Base_Layout - .4byte NavelRock_SummitPath_2F_Layout - .4byte NavelRock_SummitPath_3F_Layout - .4byte NavelRock_SummitPath_4F_Layout - .4byte NavelRock_SummitPath_5F_Layout - .4byte NavelRock_BasePath_B1F_Layout - .4byte NavelRock_BasePath_B2F_Layout - .4byte NavelRock_BasePath_B3F_Layout - .4byte NavelRock_BasePath_B4F_Layout - .4byte NavelRock_BasePath_B5F_Layout - .4byte NavelRock_BasePath_B6F_Layout - .4byte NavelRock_BasePath_B7F_Layout - .4byte NavelRock_BasePath_B8F_Layout - .4byte NavelRock_BasePath_B9F_Layout - .4byte NavelRock_BasePath_B10F_Layout - .4byte NavelRock_BasePath_B11F_Layout - .4byte SevenIsland_TanobyRuins_RixyChamber_Layout - .4byte SevenIsland_TanobyRuins_ViapoisChamber_Layout - .4byte NavelRock_B1F_Layout - .4byte NavelRock_Fork_Layout - .4byte UnusedLayout_834BC2C_Layout - .4byte UnusedLayout_834BEB4_Layout - .4byte UnusedLayout_834C13C_Layout - .4byte UnusedLayout_834C3C4_Layout - .4byte UnusedLayout_834C64C_Layout - .4byte UnusedLayout_834C8D4_Layout - .4byte UnusedLayout_834CB5C_Layout - .4byte UnusedLayout_834CDE4_Layout - .4byte UnusedLayout_834D06C_Layout - .4byte UnusedLayout_834D2F4_Layout - .4byte UnusedLayout_834D57C_Layout - .4byte UnusedLayout_834D804_Layout - .4byte UnusedLayout_834DA8C_Layout - .4byte UnusedLayout_834DD14_Layout - .4byte UnusedLayout_834DF9C_Layout - .4byte UnusedLayout_834E224_Layout - .4byte SevenIsland_House_Room1_Layout - .4byte OneIsland_KindleRoad_EmberSpa_Layout diff --git a/data/map_event_scripts.inc b/data/map_event_scripts.inc index 9b9af59df..6c1e5ca4c 100644 --- a/data/map_event_scripts.inc +++ b/data/map_event_scripts.inc @@ -107,7 +107,7 @@ .include "data/maps/MtEmber_SummitPath_3F/scripts.inc" .include "data/maps/MtEmber_Summit/scripts.inc" .include "data/maps/MtEmber_RubyPath_B5F/scripts.inc" - .include "data/maps/SSAnne_Kitchen3/scripts.inc" + .include "data/maps/MtEmber_RubyPath_1F/scripts.inc" .include "data/maps/MtEmber_RubyPath_B1F/scripts.inc" .include "data/maps/MtEmber_RubyPath_B2F/scripts.inc" .include "data/maps/MtEmber_RubyPath_B3F/scripts.inc" @@ -116,17 +116,17 @@ .include "data/maps/ThreeIsland_BerryForest/scripts.inc" .include "data/maps/FourIsland_IcefallCave_Entrance/scripts.inc" .include "data/maps/FourIsland_IcefallCave_1F/scripts.inc" - .include "data/maps/SSAnne_CaptainsOffice2/scripts.inc" - .include "data/maps/SSAnne_CaptainsOffice3/scripts.inc" - .include "data/maps/SSAnne_CaptainsOffice4/scripts.inc" - .include "data/maps/SSAnne_CaptainsOffice5/scripts.inc" + .include "data/maps/FourIsland_IcefallCave_B1F/scripts.inc" + .include "data/maps/FourIsland_IcefallCave_Back/scripts.inc" + .include "data/maps/FiveIsland_RocketWarehouse/scripts.inc" + .include "data/maps/SixIsland_DottedHole_1F/scripts.inc" .include "data/maps/SixIsland_DottedHole_B1F/scripts.inc" .include "data/maps/SixIsland_DottedHole_B2F/scripts.inc" .include "data/maps/SixIsland_DottedHole_B3F/scripts.inc" - .include "data/maps/SSAnne_CaptainsOffice9/scripts.inc" + .include "data/maps/SixIsland_DottedHole_B4F/scripts.inc" .include "data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc" - .include "data/maps/SSAnne_1F_Room11/scripts.inc" - .include "data/maps/SSAnne_1F_Room12/scripts.inc" + .include "data/maps/SixIsland_PatternBush/scripts.inc" + .include "data/maps/SixIsland_AlteringCave/scripts.inc" .include "data/maps/NavelRock_Exterior/scripts.inc" .include "data/maps/SevenIsland_TrainerTower_1F/scripts.inc" .include "data/maps/SevenIsland_TrainerTower_2F/scripts.inc" diff --git a/data/map_events.s b/data/map_events.s index 6e84475b9..aabafa21f 100644 --- a/data/map_events.s +++ b/data/map_events.s @@ -1,12 +1,13 @@ @#include "constants/bg_event_constants.h" @#include "constants/event_object_movement_constants.h" @#include "constants/event_objects.h" -@#include "constants/flags.h" -@#include "constants/items.h" +#include "constants/flags.h" +#include "constants/items.h" @#include "constants/map_scripts.h" +#include "constants/layouts.h" #include "constants/maps.h" @#include "constants/secret_bases.h" -@#include "constants/vars.h" +#include "constants/vars.h" @#include "constants/weather.h" @#include "constants/trainer_hill.h" .include "asm/macros.inc" diff --git a/data/maps.s b/data/maps.s index c530fc693..9cb61ccb4 100644 --- a/data/maps.s +++ b/data/maps.s @@ -1,19 +1,16 @@ -@#include "constants/layouts.h" +#include "constants/layouts.h" @#include "constants/map_types.h" #include "constants/maps.h" @#include "constants/weather.h" -@#include "constants/region_map_sections.h" +#include "constants/region_map.h" #include "constants/songs.h" +#include "constants/items.h" @#include "constants/weather.h" .include "asm/macros.inc" .include "constants/constants.inc" .section .rodata - .include "data/tilesets/graphics.inc" - .include "data/tilesets/metatiles.inc" - .include "data/tilesets/headers.inc" - .include "data/layouts/layouts.inc" .include "data/layouts/layouts_table.inc" .include "data/maps/headers.inc" diff --git a/data/maps/.gitignore b/data/maps/.gitignore new file mode 100644 index 000000000..59405b176 --- /dev/null +++ b/data/maps/.gitignore @@ -0,0 +1,7 @@ +connections.inc +events.inc +groups.inc +headers.inc +**/connections.inc +**/events.inc +**/header.inc diff --git a/data/maps/BirthIsland_Exterior/events.inc b/data/maps/BirthIsland_Exterior/events.inc deleted file mode 100644 index 92489f6ba..000000000 --- a/data/maps/BirthIsland_Exterior/events.inc +++ /dev/null @@ -1,9 +0,0 @@ -BirthIsland_Exterior_EventObjects: - object_event 1, 106, 0, 15, 0, 12, 0, 3, 8, 17, 0, 0, 0, 0, 0, BirthIsland_Exterior_EventScript_165271, 154, 0, 0 - object_event 2, 240, 0, 15, 0, 3, 0, 3, 8, 17, 0, 0, 0, 0, 0, 0x0, 153, 0, 0 - -BirthIsland_Exterior_MapWarps: - warp_def 15, 24, 3, 0, 570 - -BirthIsland_Exterior_MapEvents:: - map_events BirthIsland_Exterior_EventObjects, BirthIsland_Exterior_MapWarps, 0x0, 0x0 diff --git a/data/maps/BirthIsland_Exterior/header.inc b/data/maps/BirthIsland_Exterior/header.inc deleted file mode 100644 index 2634948be..000000000 --- a/data/maps/BirthIsland_Exterior/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -BirthIsland_Exterior:: @ 83505A8 - .4byte BirthIsland_Exterior_Layout @ 0x8348380 - .4byte BirthIsland_Exterior_MapEvents @ 0x83B4C1C - .4byte BirthIsland_Exterior_MapScripts @ 0x8165203 - .4byte NULL - .2byte 0xFFFF - .2byte 342 - .byte 0xbb, 0x00, 0x00, 0x03, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/BirthIsland_Exterior/map.json b/data/maps/BirthIsland_Exterior/map.json new file mode 100644 index 000000000..521d191fa --- /dev/null +++ b/data/maps/BirthIsland_Exterior/map.json @@ -0,0 +1,54 @@ +{ + "id": "MAP_BIRTH_ISLAND_EXTERIOR", + "name": "BirthIsland_Exterior", + "layout": "LAYOUT_BIRTH_ISLAND_EXTERIOR", + "music": "0xFFFF", + "region_map_section": "MAPSEC_BIRTH_ISLAND", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_3", + "unknown_18": 0, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "106", + "x": 15, + "y": 12, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BirthIsland_Exterior_EventScript_165271", + "flag": "154" + }, + { + "graphics_id": "240", + "x": 15, + "y": 3, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "153" + } + ], + "warp_events": [ + { + "x": 15, + "y": 24, + "elevation": 3, + "dest_map": "MAP_BIRTH_ISLAND_HARBOR", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/BirthIsland_Harbor/events.inc b/data/maps/BirthIsland_Harbor/events.inc deleted file mode 100644 index 90ee12799..000000000 --- a/data/maps/BirthIsland_Harbor/events.inc +++ /dev/null @@ -1,9 +0,0 @@ -BirthIsland_Harbor_EventObjects: - object_event 1, 108, 0, 8, 0, 9, 0, 0, 8, 17, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 - object_event 2, 62, 0, 8, 0, 6, 0, 3, 7, 17, 0, 0, 0, 0, 0, BirthIsland_Harbor_EventScript_1653E7, 0, 0, 0 - -BirthIsland_Harbor_MapWarps: - warp_def 8, 2, 3, 0, 568 - -BirthIsland_Harbor_MapEvents:: - map_events BirthIsland_Harbor_EventObjects, BirthIsland_Harbor_MapWarps, 0x0, 0x0 diff --git a/data/maps/BirthIsland_Harbor/header.inc b/data/maps/BirthIsland_Harbor/header.inc deleted file mode 100644 index 68253d8df..000000000 --- a/data/maps/BirthIsland_Harbor/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -BirthIsland_Harbor:: @ 83505E0 - .4byte Island_Harbor_Layout @ 0x8343FB8 - .4byte BirthIsland_Harbor_MapEvents @ 0x83B4D24 - .4byte BirthIsland_Harbor_MapScripts @ 0x81653E6 - .4byte NULL - .2byte 0xFFFF - .2byte 315 - .byte 0xbb, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/BirthIsland_Harbor/map.json b/data/maps/BirthIsland_Harbor/map.json new file mode 100644 index 000000000..4efbb12a4 --- /dev/null +++ b/data/maps/BirthIsland_Harbor/map.json @@ -0,0 +1,54 @@ +{ + "id": "MAP_BIRTH_ISLAND_HARBOR", + "name": "BirthIsland_Harbor", + "layout": "LAYOUT_ISLAND_HARBOR", + "music": "0xFFFF", + "region_map_section": "MAPSEC_BIRTH_ISLAND", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "108", + "x": 8, + "y": 9, + "elevation": 0, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "62", + "x": 8, + "y": 6, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BirthIsland_Harbor_EventScript_1653E7", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 8, + "y": 2, + "elevation": 3, + "dest_map": "MAP_BIRTH_ISLAND_EXTERIOR", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/CeladonCity/connections.inc b/data/maps/CeladonCity/connections.inc deleted file mode 100644 index 6ed150ca1..000000000 --- a/data/maps/CeladonCity/connections.inc +++ /dev/null @@ -1,7 +0,0 @@ -CeladonCity_MapConnectionsList: @ 8352844 - connection left, 10, MAP_ROUTE16 - connection right, 10, MAP_ROUTE7 - -CeladonCity_MapConnections:: @ 835285C - .4byte 2 - .4byte CeladonCity_MapConnectionsList diff --git a/data/maps/CeladonCity/events.inc b/data/maps/CeladonCity/events.inc deleted file mode 100644 index ebf7a29aa..000000000 --- a/data/maps/CeladonCity/events.inc +++ /dev/null @@ -1,45 +0,0 @@ -CeladonCity_EventObjects: - object_event 1, 49, 0, 48, 0, 15, 0, 3, 5, 20, 0, 0, 0, 0, 0, CeladonCity_EventScript_166CFA, 95, 0, 0 - object_event 2, 27, 0, 38, 0, 14, 0, 3, 9, 17, 0, 0, 0, 0, 0, CeladonCity_EventScript_166CC5, 0, 0, 0 - object_event 3, 112, 0, 36, 0, 14, 0, 3, 10, 17, 0, 0, 0, 0, 0, CeladonCity_EventScript_166CDC, 0, 0, 0 - object_event 4, 17, 0, 11, 0, 18, 0, 3, 52, 68, 0, 0, 0, 0, 0, CeladonCity_EventScript_166C99, 0, 0, 0 - object_event 5, 28, 0, 18, 0, 22, 0, 3, 2, 82, 0, 0, 0, 0, 0, CeladonCity_EventScript_166CAD, 0, 0, 0 - object_event 6, 32, 0, 30, 0, 24, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeladonCity_EventScript_166CB6, 0, 0, 0 - object_event 7, 33, 0, 26, 0, 19, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeladonCity_EventScript_166CBF, 0, 0, 0 - object_event 8, 49, 0, 38, 0, 31, 0, 3, 5, 21, 0, 0, 0, 0, 0, CeladonCity_EventScript_166D03, 95, 0, 0 - object_event 9, 32, 0, 9, 0, 30, 0, 3, 7, 17, 0, 0, 0, 0, 0, CeladonCity_EventScript_166CA2, 0, 0, 0 - object_event 10, 95, 0, 52, 0, 22, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeladonCity_EventScript_1BDF13, 20, 0, 0 - object_event 11, 95, 0, 40, 0, 35, 0, 0, 8, 17, 0, 0, 0, 0, 0, CeladonCity_EventScript_1BDF13, 19, 0, 0 - object_event 12, 19, 0, 25, 0, 10, 0, 3, 7, 17, 0, 0, 0, 0, 0, CeladonCity_EventScript_166D0C, 0, 0, 0 - object_event 13, 65375, 0, 249, 255, 21, 0, 7, 0, 0, 0, 34, 0, 3, 0, 0x0, 0, 0, 0 - object_event 14, 92, 0, 5, 0, 3, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeladonCity_EventScript_1BEBC0, 465, 0, 0 - object_event 15, 55, 0, 47, 0, 24, 0, 3, 1, 17, 0, 0, 0, 0, 0, CeladonCity_EventScript_166D15, 95, 0, 0 - -CeladonCity_MapWarps: - warp_def 34, 21, 0, 0, 2574 - warp_def 11, 14, 0, 1, 2560 - warp_def 15, 14, 0, 4, 2560 - warp_def 30, 11, 0, 1, 2567 - warp_def 48, 11, 0, 1, 2572 - warp_def 39, 20, 0, 1, 2575 - warp_def 11, 30, 0, 1, 2576 - warp_def 37, 29, 0, 1, 2577 - warp_def 41, 29, 0, 1, 2578 - warp_def 49, 29, 0, 1, 2579 - warp_def 29, 5, 0, 5, 2567 - warp_def 30, 4, 3, 5, 2567 - warp_def 31, 5, 0, 5, 2567 - -CeladonCity_MapBGEvents: - bg_event 45, 23, 0, 0, 0, CeladonCity_EventScript_166D5A - bg_event 38, 23, 0, 0, 0, CeladonCity_EventScript_166D63 - bg_event 33, 23, 0, 0, 0, CeladonCity_EventScript_166D6C - bg_event 22, 18, 3, 0, 0, CeladonCity_EventScript_166D27 - bg_event 26, 11, 0, 0, 0, CeladonCity_EventScript_166D48 - bg_event 33, 16, 0, 0, 0, CeladonCity_EventScript_166D1E - bg_event 18, 14, 3, 0, 0, CeladonCity_EventScript_166D51 - bg_event 16, 31, 0, 0, 0, CeladonCity_EventScript_166D30 - bg_event 55, 20, 3, 7, 0, 69, 47, 1 - -CeladonCity_MapEvents:: - map_events CeladonCity_EventObjects, CeladonCity_MapWarps, 0x0, CeladonCity_MapBGEvents diff --git a/data/maps/CeladonCity/header.inc b/data/maps/CeladonCity/header.inc deleted file mode 100644 index 2ec3fc62c..000000000 --- a/data/maps/CeladonCity/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -CeladonCity:: @ 83506C0 - .4byte CeladonCity_Layout @ 0x82E2818 - .4byte CeladonCity_MapEvents @ 0x83B5898 - .4byte CeladonCity_MapScripts @ 0x8166C8F - .4byte CeladonCity_MapConnections @ 0x835285C - .2byte BGM_FRLG_CELADON_CITY - .2byte 84 - .byte 0x5e, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/CeladonCity/map.json b/data/maps/CeladonCity/map.json new file mode 100644 index 000000000..0bf834686 --- /dev/null +++ b/data/maps/CeladonCity/map.json @@ -0,0 +1,384 @@ +{ + "id": "MAP_CELADON_CITY", + "name": "CeladonCity", + "layout": "LAYOUT_CELADON_CITY", + "music": "BGM_FRLG_CELADON_CITY", + "region_map_section": "MAPSEC_CELADON_CITY", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_1", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_ROUTE16", + "offset": 10, + "direction": "left" + }, + { + "map": "MAP_ROUTE7", + "offset": 10, + "direction": "right" + } + ], + "object_events": [ + { + "graphics_id": "49", + "x": 48, + "y": 15, + "elevation": 3, + "movement_type": "5", + "movement_range_x": 4, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_EventScript_166CFA", + "flag": "95" + }, + { + "graphics_id": "27", + "x": 38, + "y": 14, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_EventScript_166CC5", + "flag": "0" + }, + { + "graphics_id": "112", + "x": 36, + "y": 14, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_EventScript_166CDC", + "flag": "0" + }, + { + "graphics_id": "17", + "x": 11, + "y": 18, + "elevation": 3, + "movement_type": "52", + "movement_range_x": 4, + "movement_range_y": 4, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_EventScript_166C99", + "flag": "0" + }, + { + "graphics_id": "28", + "x": 18, + "y": 22, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 2, + "movement_range_y": 5, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_EventScript_166CAD", + "flag": "0" + }, + { + "graphics_id": "32", + "x": 30, + "y": 24, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_EventScript_166CB6", + "flag": "0" + }, + { + "graphics_id": "33", + "x": 26, + "y": 19, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_EventScript_166CBF", + "flag": "0" + }, + { + "graphics_id": "49", + "x": 38, + "y": 31, + "elevation": 3, + "movement_type": "5", + "movement_range_x": 5, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_EventScript_166D03", + "flag": "95" + }, + { + "graphics_id": "32", + "x": 9, + "y": 30, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_EventScript_166CA2", + "flag": "0" + }, + { + "graphics_id": "95", + "x": 52, + "y": 22, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_EventScript_1BDF13", + "flag": "20" + }, + { + "graphics_id": "95", + "x": 40, + "y": 35, + "elevation": 0, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_EventScript_1BDF13", + "flag": "19" + }, + { + "graphics_id": "19", + "x": 25, + "y": 10, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_EventScript_166D0C", + "flag": "0" + }, + { + "graphics_id": "65375", + "x": 65529, + "y": 21, + "elevation": 7, + "movement_type": "0", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 34, + "trainer_sight_or_berry_tree_id": 3, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "92", + "x": 5, + "y": 3, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_EventScript_1BEBC0", + "flag": "465" + }, + { + "graphics_id": "55", + "x": 47, + "y": 24, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_EventScript_166D15", + "flag": "95" + } + ], + "warp_events": [ + { + "x": 34, + "y": 21, + "elevation": 0, + "dest_map": "MAP_CELADON_CITY_GAME_CORNER", + "dest_warp_id": 0 + }, + { + "x": 11, + "y": 14, + "elevation": 0, + "dest_map": "MAP_CELADON_CITY_DEPARTMENT_STORE_1F", + "dest_warp_id": 1 + }, + { + "x": 15, + "y": 14, + "elevation": 0, + "dest_map": "MAP_CELADON_CITY_DEPARTMENT_STORE_1F", + "dest_warp_id": 4 + }, + { + "x": 30, + "y": 11, + "elevation": 0, + "dest_map": "MAP_CELADON_CITY_CONDOMINIUMS_1F", + "dest_warp_id": 1 + }, + { + "x": 48, + "y": 11, + "elevation": 0, + "dest_map": "MAP_CELADON_CITY_POKEMON_CENTER_1F", + "dest_warp_id": 1 + }, + { + "x": 39, + "y": 20, + "elevation": 0, + "dest_map": "MAP_CELADON_CITY_GAME_CORNER_PRIZE_ROOM", + "dest_warp_id": 1 + }, + { + "x": 11, + "y": 30, + "elevation": 0, + "dest_map": "MAP_CELADON_CITY_GYM", + "dest_warp_id": 1 + }, + { + "x": 37, + "y": 29, + "elevation": 0, + "dest_map": "MAP_CELADON_CITY_RESTAURANT", + "dest_warp_id": 1 + }, + { + "x": 41, + "y": 29, + "elevation": 0, + "dest_map": "MAP_CELADON_CITY_HOUSE1", + "dest_warp_id": 1 + }, + { + "x": 49, + "y": 29, + "elevation": 0, + "dest_map": "MAP_CELADON_CITY_HOTEL", + "dest_warp_id": 1 + }, + { + "x": 29, + "y": 5, + "elevation": 0, + "dest_map": "MAP_CELADON_CITY_CONDOMINIUMS_1F", + "dest_warp_id": 5 + }, + { + "x": 30, + "y": 4, + "elevation": 3, + "dest_map": "MAP_CELADON_CITY_CONDOMINIUMS_1F", + "dest_warp_id": 5 + }, + { + "x": 31, + "y": 5, + "elevation": 0, + "dest_map": "MAP_CELADON_CITY_CONDOMINIUMS_1F", + "dest_warp_id": 5 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 45, + "y": 23, + "elevation": 0, + "script": "CeladonCity_EventScript_166D5A" + }, + { + "type": "bg_event_type_0", + "x": 38, + "y": 23, + "elevation": 0, + "script": "CeladonCity_EventScript_166D63" + }, + { + "type": "bg_event_type_0", + "x": 33, + "y": 23, + "elevation": 0, + "script": "CeladonCity_EventScript_166D6C" + }, + { + "type": "bg_event_type_0", + "x": 22, + "y": 18, + "elevation": 3, + "script": "CeladonCity_EventScript_166D27" + }, + { + "type": "bg_event_type_0", + "x": 26, + "y": 11, + "elevation": 0, + "script": "CeladonCity_EventScript_166D48" + }, + { + "type": "bg_event_type_0", + "x": 33, + "y": 16, + "elevation": 0, + "script": "CeladonCity_EventScript_166D1E" + }, + { + "type": "bg_event_type_0", + "x": 18, + "y": 14, + "elevation": 3, + "script": "CeladonCity_EventScript_166D51" + }, + { + "type": "bg_event_type_0", + "x": 16, + "y": 31, + "elevation": 0, + "script": "CeladonCity_EventScript_166D30" + }, + { + "type": "hidden_item", + "x": 55, + "y": 20, + "elevation": 3, + "item": "ITEM_PP_UP", + "flag": "47", + "unknown": 1 + } + ] +}
\ No newline at end of file diff --git a/data/maps/CeladonCity_Condominiums_1F/events.inc b/data/maps/CeladonCity_Condominiums_1F/events.inc deleted file mode 100644 index d229b29fe..000000000 --- a/data/maps/CeladonCity_Condominiums_1F/events.inc +++ /dev/null @@ -1,20 +0,0 @@ -CeladonCity_Condominiums_1F_EventObjects: - object_event 1, 125, 0, 1, 0, 9, 0, 3, 10, 17, 0, 0, 0, 0, 0, CeladonCity_Condominiums_1F_EventScript_16C38E, 0, 0, 0 - object_event 2, 113, 0, 5, 0, 13, 0, 3, 5, 17, 0, 0, 0, 0, 0, CeladonCity_Condominiums_1F_EventScript_16C3A1, 0, 0, 0 - object_event 3, 122, 0, 5, 0, 8, 0, 3, 2, 18, 0, 0, 0, 0, 0, CeladonCity_Condominiums_1F_EventScript_16C3B4, 0, 0, 0 - object_event 4, 35, 0, 2, 0, 9, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeladonCity_Condominiums_1F_EventScript_16C321, 0, 0, 0 - -CeladonCity_Condominiums_1F_MapWarps: - warp_def 11, 19, 0, 3, 774 - warp_def 12, 18, 3, 3, 774 - warp_def 13, 19, 0, 3, 774 - warp_def 4, 2, 3, 0, 2568 - warp_def 12, 2, 3, 3, 2568 - warp_def 2, 1, 3, 11, 774 - -CeladonCity_Condominiums_1F_MapBGEvents: - bg_event 8, 12, 0, 0, 0, CeladonCity_Condominiums_1F_EventScript_16C3C7 - bg_event 7, 12, 0, 0, 0, CeladonCity_Condominiums_1F_EventScript_16C3C7 - -CeladonCity_Condominiums_1F_MapEvents:: - map_events CeladonCity_Condominiums_1F_EventObjects, CeladonCity_Condominiums_1F_MapWarps, 0x0, CeladonCity_Condominiums_1F_MapBGEvents diff --git a/data/maps/CeladonCity_Condominiums_1F/header.inc b/data/maps/CeladonCity_Condominiums_1F/header.inc deleted file mode 100644 index b059b11fd..000000000 --- a/data/maps/CeladonCity_Condominiums_1F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -CeladonCity_Condominiums_1F:: @ 83512AC - .4byte CeladonCity_Condominiums_1F_Layout @ 0x831A7DC - .4byte CeladonCity_Condominiums_1F_MapEvents @ 0x83BB538 - .4byte CeladonCity_Condominiums_1F_MapScripts @ 0x816C320 - .4byte NULL - .2byte BGM_FRLG_CELADON_CITY - .2byte 184 - .byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/CeladonCity_Condominiums_1F/map.json b/data/maps/CeladonCity_Condominiums_1F/map.json new file mode 100644 index 000000000..443e9acd6 --- /dev/null +++ b/data/maps/CeladonCity_Condominiums_1F/map.json @@ -0,0 +1,130 @@ +{ + "id": "MAP_CELADON_CITY_CONDOMINIUMS_1F", + "name": "CeladonCity_Condominiums_1F", + "layout": "LAYOUT_CELADON_CITY_CONDOMINIUMS_1F", + "music": "BGM_FRLG_CELADON_CITY", + "region_map_section": "MAPSEC_CELADON_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "125", + "x": 1, + "y": 9, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_Condominiums_1F_EventScript_16C38E", + "flag": "0" + }, + { + "graphics_id": "113", + "x": 5, + "y": 13, + "elevation": 3, + "movement_type": "5", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_Condominiums_1F_EventScript_16C3A1", + "flag": "0" + }, + { + "graphics_id": "122", + "x": 5, + "y": 8, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 2, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_Condominiums_1F_EventScript_16C3B4", + "flag": "0" + }, + { + "graphics_id": "35", + "x": 2, + "y": 9, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_Condominiums_1F_EventScript_16C321", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 11, + "y": 19, + "elevation": 0, + "dest_map": "MAP_CELADON_CITY", + "dest_warp_id": 3 + }, + { + "x": 12, + "y": 18, + "elevation": 3, + "dest_map": "MAP_CELADON_CITY", + "dest_warp_id": 3 + }, + { + "x": 13, + "y": 19, + "elevation": 0, + "dest_map": "MAP_CELADON_CITY", + "dest_warp_id": 3 + }, + { + "x": 4, + "y": 2, + "elevation": 3, + "dest_map": "MAP_CELADON_CITY_CONDOMINIUMS_2F", + "dest_warp_id": 0 + }, + { + "x": 12, + "y": 2, + "elevation": 3, + "dest_map": "MAP_CELADON_CITY_CONDOMINIUMS_2F", + "dest_warp_id": 3 + }, + { + "x": 2, + "y": 1, + "elevation": 3, + "dest_map": "MAP_CELADON_CITY", + "dest_warp_id": 11 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 8, + "y": 12, + "elevation": 0, + "script": "CeladonCity_Condominiums_1F_EventScript_16C3C7" + }, + { + "type": "bg_event_type_0", + "x": 7, + "y": 12, + "elevation": 0, + "script": "CeladonCity_Condominiums_1F_EventScript_16C3C7" + } + ] +}
\ No newline at end of file diff --git a/data/maps/CeladonCity_Condominiums_2F/events.inc b/data/maps/CeladonCity_Condominiums_2F/events.inc deleted file mode 100644 index 98cf9a52e..000000000 --- a/data/maps/CeladonCity_Condominiums_2F/events.inc +++ /dev/null @@ -1,16 +0,0 @@ -CeladonCity_Condominiums_2F_EventObjects: - object_event 1, 0, 0, 6, 0, 6, 0, 0, 76, 17, 0, 0, 0, 0, 0, CeladonCity_Condominiums_2F_EventScript_1ACE9D, 158, 0, 0 - object_event 2, 0, 0, 5, 0, 6, 0, 0, 76, 17, 0, 0, 0, 0, 0, CeladonCity_Condominiums_2F_EventScript_1ACE9D, 158, 0, 0 - -CeladonCity_Condominiums_2F_MapWarps: - warp_def 4, 2, 3, 3, 2567 - warp_def 2, 2, 3, 0, 2569 - warp_def 11, 2, 3, 3, 2569 - warp_def 12, 2, 3, 4, 2567 - -CeladonCity_Condominiums_2F_MapBGEvents: - bg_event 8, 12, 0, 0, 0, CeladonCity_Condominiums_2F_EventScript_16C3D1 - bg_event 7, 12, 0, 0, 0, CeladonCity_Condominiums_2F_EventScript_16C3D1 - -CeladonCity_Condominiums_2F_MapEvents:: - map_events CeladonCity_Condominiums_2F_EventObjects, CeladonCity_Condominiums_2F_MapWarps, 0x0, CeladonCity_Condominiums_2F_MapBGEvents diff --git a/data/maps/CeladonCity_Condominiums_2F/header.inc b/data/maps/CeladonCity_Condominiums_2F/header.inc deleted file mode 100644 index 2a380d25d..000000000 --- a/data/maps/CeladonCity_Condominiums_2F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -CeladonCity_Condominiums_2F:: @ 83512C8 - .4byte CeladonCity_Condominiums_2F_Layout @ 0x831AA58 - .4byte CeladonCity_Condominiums_2F_MapEvents @ 0x83BB5B4 - .4byte CeladonCity_Condominiums_2F_MapScripts @ 0x816C3D0 - .4byte NULL - .2byte BGM_FRLG_CELADON_CITY - .2byte 185 - .byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/CeladonCity_Condominiums_2F/map.json b/data/maps/CeladonCity_Condominiums_2F/map.json new file mode 100644 index 000000000..48559628c --- /dev/null +++ b/data/maps/CeladonCity_Condominiums_2F/map.json @@ -0,0 +1,90 @@ +{ + "id": "MAP_CELADON_CITY_CONDOMINIUMS_2F", + "name": "CeladonCity_Condominiums_2F", + "layout": "LAYOUT_CELADON_CITY_CONDOMINIUMS_2F", + "music": "BGM_FRLG_CELADON_CITY", + "region_map_section": "MAPSEC_CELADON_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "0", + "x": 6, + "y": 6, + "elevation": 0, + "movement_type": "76", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_Condominiums_2F_EventScript_1ACE9D", + "flag": "158" + }, + { + "graphics_id": "0", + "x": 5, + "y": 6, + "elevation": 0, + "movement_type": "76", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_Condominiums_2F_EventScript_1ACE9D", + "flag": "158" + } + ], + "warp_events": [ + { + "x": 4, + "y": 2, + "elevation": 3, + "dest_map": "MAP_CELADON_CITY_CONDOMINIUMS_1F", + "dest_warp_id": 3 + }, + { + "x": 2, + "y": 2, + "elevation": 3, + "dest_map": "MAP_CELADON_CITY_CONDOMINIUMS_3F", + "dest_warp_id": 0 + }, + { + "x": 11, + "y": 2, + "elevation": 3, + "dest_map": "MAP_CELADON_CITY_CONDOMINIUMS_3F", + "dest_warp_id": 3 + }, + { + "x": 12, + "y": 2, + "elevation": 3, + "dest_map": "MAP_CELADON_CITY_CONDOMINIUMS_1F", + "dest_warp_id": 4 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 8, + "y": 12, + "elevation": 0, + "script": "CeladonCity_Condominiums_2F_EventScript_16C3D1" + }, + { + "type": "bg_event_type_0", + "x": 7, + "y": 12, + "elevation": 0, + "script": "CeladonCity_Condominiums_2F_EventScript_16C3D1" + } + ] +}
\ No newline at end of file diff --git a/data/maps/CeladonCity_Condominiums_3F/events.inc b/data/maps/CeladonCity_Condominiums_3F/events.inc deleted file mode 100644 index 1c6d9c947..000000000 --- a/data/maps/CeladonCity_Condominiums_3F/events.inc +++ /dev/null @@ -1,24 +0,0 @@ -CeladonCity_Condominiums_3F_EventObjects: - object_event 1, 26, 0, 0, 0, 10, 0, 3, 7, 17, 0, 0, 0, 0, 0, CeladonCity_Condominiums_3F_EventScript_16C3DB, 0, 0, 0 - object_event 2, 25, 0, 3, 0, 8, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeladonCity_Condominiums_3F_EventScript_16C3F6, 0, 0, 0 - object_event 3, 52, 0, 4, 0, 10, 0, 3, 7, 17, 0, 0, 0, 0, 0, CeladonCity_Condominiums_3F_EventScript_16C3E4, 0, 0, 0 - object_event 4, 27, 0, 0, 0, 13, 0, 3, 10, 17, 0, 0, 0, 0, 0, CeladonCity_Condominiums_3F_EventScript_16C3ED, 0, 0, 0 - -CeladonCity_Condominiums_3F_MapWarps: - warp_def 2, 2, 3, 1, 2568 - warp_def 4, 2, 3, 0, 2570 - warp_def 12, 2, 3, 1, 2570 - warp_def 11, 2, 3, 2, 2568 - -CeladonCity_Condominiums_3F_MapBGEvents: - bg_event 8, 12, 0, 0, 0, CeladonCity_Condominiums_3F_EventScript_16C435 - bg_event 1, 9, 0, 1, 0, CeladonCity_Condominiums_3F_EventScript_16C43E - bg_event 5, 9, 0, 1, 0, CeladonCity_Condominiums_3F_EventScript_16C447 - bg_event 1, 12, 0, 1, 0, CeladonCity_Condominiums_3F_EventScript_16C450 - bg_event 7, 12, 0, 0, 0, CeladonCity_Condominiums_3F_EventScript_16C435 - bg_event 0, 12, 0, 1, 0, CeladonCity_Condominiums_3F_EventScript_16C450 - bg_event 0, 9, 0, 1, 0, CeladonCity_Condominiums_3F_EventScript_16C43E - bg_event 4, 9, 0, 1, 0, CeladonCity_Condominiums_3F_EventScript_16C447 - -CeladonCity_Condominiums_3F_MapEvents:: - map_events CeladonCity_Condominiums_3F_EventObjects, CeladonCity_Condominiums_3F_MapWarps, 0x0, CeladonCity_Condominiums_3F_MapBGEvents diff --git a/data/maps/CeladonCity_Condominiums_3F/header.inc b/data/maps/CeladonCity_Condominiums_3F/header.inc deleted file mode 100644 index e945a6abe..000000000 --- a/data/maps/CeladonCity_Condominiums_3F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -CeladonCity_Condominiums_3F:: @ 83512E4 - .4byte CeladonCity_Condominiums_3F_Layout @ 0x831ACD4 - .4byte CeladonCity_Condominiums_3F_MapEvents @ 0x83BB6A8 - .4byte CeladonCity_Condominiums_3F_MapScripts @ 0x816C3DA - .4byte NULL - .2byte BGM_FRLG_CELADON_CITY - .2byte 186 - .byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/CeladonCity_Condominiums_3F/map.json b/data/maps/CeladonCity_Condominiums_3F/map.json new file mode 100644 index 000000000..c804ec6e7 --- /dev/null +++ b/data/maps/CeladonCity_Condominiums_3F/map.json @@ -0,0 +1,158 @@ +{ + "id": "MAP_CELADON_CITY_CONDOMINIUMS_3F", + "name": "CeladonCity_Condominiums_3F", + "layout": "LAYOUT_CELADON_CITY_CONDOMINIUMS_3F", + "music": "BGM_FRLG_CELADON_CITY", + "region_map_section": "MAPSEC_CELADON_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "26", + "x": 0, + "y": 10, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_Condominiums_3F_EventScript_16C3DB", + "flag": "0" + }, + { + "graphics_id": "25", + "x": 3, + "y": 8, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_Condominiums_3F_EventScript_16C3F6", + "flag": "0" + }, + { + "graphics_id": "52", + "x": 4, + "y": 10, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_Condominiums_3F_EventScript_16C3E4", + "flag": "0" + }, + { + "graphics_id": "27", + "x": 0, + "y": 13, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_Condominiums_3F_EventScript_16C3ED", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 2, + "y": 2, + "elevation": 3, + "dest_map": "MAP_CELADON_CITY_CONDOMINIUMS_2F", + "dest_warp_id": 1 + }, + { + "x": 4, + "y": 2, + "elevation": 3, + "dest_map": "MAP_CELADON_CITY_CONDOMINIUMS_ROOF", + "dest_warp_id": 0 + }, + { + "x": 12, + "y": 2, + "elevation": 3, + "dest_map": "MAP_CELADON_CITY_CONDOMINIUMS_ROOF", + "dest_warp_id": 1 + }, + { + "x": 11, + "y": 2, + "elevation": 3, + "dest_map": "MAP_CELADON_CITY_CONDOMINIUMS_2F", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 8, + "y": 12, + "elevation": 0, + "script": "CeladonCity_Condominiums_3F_EventScript_16C435" + }, + { + "type": "bg_event_type_1", + "x": 1, + "y": 9, + "elevation": 0, + "script": "CeladonCity_Condominiums_3F_EventScript_16C43E" + }, + { + "type": "bg_event_type_1", + "x": 5, + "y": 9, + "elevation": 0, + "script": "CeladonCity_Condominiums_3F_EventScript_16C447" + }, + { + "type": "bg_event_type_1", + "x": 1, + "y": 12, + "elevation": 0, + "script": "CeladonCity_Condominiums_3F_EventScript_16C450" + }, + { + "type": "bg_event_type_0", + "x": 7, + "y": 12, + "elevation": 0, + "script": "CeladonCity_Condominiums_3F_EventScript_16C435" + }, + { + "type": "bg_event_type_1", + "x": 0, + "y": 12, + "elevation": 0, + "script": "CeladonCity_Condominiums_3F_EventScript_16C450" + }, + { + "type": "bg_event_type_1", + "x": 0, + "y": 9, + "elevation": 0, + "script": "CeladonCity_Condominiums_3F_EventScript_16C43E" + }, + { + "type": "bg_event_type_1", + "x": 4, + "y": 9, + "elevation": 0, + "script": "CeladonCity_Condominiums_3F_EventScript_16C447" + } + ] +}
\ No newline at end of file diff --git a/data/maps/CeladonCity_Condominiums_Roof/events.inc b/data/maps/CeladonCity_Condominiums_Roof/events.inc deleted file mode 100644 index b228d7b14..000000000 --- a/data/maps/CeladonCity_Condominiums_Roof/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -CeladonCity_Condominiums_Roof_MapWarps: - warp_def 4, 2, 3, 1, 2569 - warp_def 10, 2, 3, 2, 2569 - warp_def 2, 12, 3, 1, 2571 - -CeladonCity_Condominiums_Roof_MapBGEvents: - bg_event 4, 12, 0, 0, 0, CeladonCity_Condominiums_Roof_EventScript_16C45A - bg_event 3, 12, 0, 0, 0, CeladonCity_Condominiums_Roof_EventScript_16C45A - -CeladonCity_Condominiums_Roof_MapEvents:: - map_events 0x0, CeladonCity_Condominiums_Roof_MapWarps, 0x0, CeladonCity_Condominiums_Roof_MapBGEvents diff --git a/data/maps/CeladonCity_Condominiums_Roof/header.inc b/data/maps/CeladonCity_Condominiums_Roof/header.inc deleted file mode 100644 index e858a73f0..000000000 --- a/data/maps/CeladonCity_Condominiums_Roof/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -CeladonCity_Condominiums_Roof:: @ 8351300 - .4byte CeladonCity_Condominiums_Roof_Layout @ 0x831AF7C - .4byte CeladonCity_Condominiums_Roof_MapEvents @ 0x83BB6EC - .4byte CeladonCity_Condominiums_Roof_MapScripts @ 0x816C459 - .4byte NULL - .2byte BGM_FRLG_CELADON_CITY - .2byte 187 - .byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/CeladonCity_Condominiums_Roof/map.json b/data/maps/CeladonCity_Condominiums_Roof/map.json new file mode 100644 index 000000000..8e3cfdba6 --- /dev/null +++ b/data/maps/CeladonCity_Condominiums_Roof/map.json @@ -0,0 +1,56 @@ +{ + "id": "MAP_CELADON_CITY_CONDOMINIUMS_ROOF", + "name": "CeladonCity_Condominiums_Roof", + "layout": "LAYOUT_CELADON_CITY_CONDOMINIUMS_ROOF", + "music": "BGM_FRLG_CELADON_CITY", + "region_map_section": "MAPSEC_CELADON_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 4, + "y": 2, + "elevation": 3, + "dest_map": "MAP_CELADON_CITY_CONDOMINIUMS_3F", + "dest_warp_id": 1 + }, + { + "x": 10, + "y": 2, + "elevation": 3, + "dest_map": "MAP_CELADON_CITY_CONDOMINIUMS_3F", + "dest_warp_id": 2 + }, + { + "x": 2, + "y": 12, + "elevation": 3, + "dest_map": "MAP_CELADON_CITY_CONDOMINIUMS_ROOF_ROOM", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 4, + "y": 12, + "elevation": 0, + "script": "CeladonCity_Condominiums_Roof_EventScript_16C45A" + }, + { + "type": "bg_event_type_0", + "x": 3, + "y": 12, + "elevation": 0, + "script": "CeladonCity_Condominiums_Roof_EventScript_16C45A" + } + ] +}
\ No newline at end of file diff --git a/data/maps/CeladonCity_Condominiums_RoofRoom/events.inc b/data/maps/CeladonCity_Condominiums_RoofRoom/events.inc deleted file mode 100644 index 6e72d86d7..000000000 --- a/data/maps/CeladonCity_Condominiums_RoofRoom/events.inc +++ /dev/null @@ -1,16 +0,0 @@ -CeladonCity_Condominiums_RoofRoom_EventObjects: - object_event 1, 54, 0, 3, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeladonCity_Condominiums_RoofRoom_EventScript_16C464, 0, 0, 0 - object_event 2, 92, 0, 7, 0, 3, 0, 0, 8, 17, 0, 0, 0, 0, 0, CeladonCity_Condominiums_RoofRoom_EventScript_16C46D, 87, 0, 0 - -CeladonCity_Condominiums_RoofRoom_MapWarps: - warp_def 3, 8, 0, 2, 2570 - warp_def 4, 7, 3, 2, 2570 - warp_def 5, 8, 0, 2, 2570 - -CeladonCity_Condominiums_RoofRoom_MapBGEvents: - bg_event 4, 1, 0, 0, 0, CeladonCity_Condominiums_RoofRoom_EventScript_16C522 - bg_event 5, 1, 0, 0, 0, CeladonCity_Condominiums_RoofRoom_EventScript_16C522 - bg_event 4, 4, 0, 0, 0, CeladonCity_Condominiums_RoofRoom_EventScript_16C519 - -CeladonCity_Condominiums_RoofRoom_MapEvents:: - map_events CeladonCity_Condominiums_RoofRoom_EventObjects, CeladonCity_Condominiums_RoofRoom_MapWarps, 0x0, CeladonCity_Condominiums_RoofRoom_MapBGEvents diff --git a/data/maps/CeladonCity_Condominiums_RoofRoom/header.inc b/data/maps/CeladonCity_Condominiums_RoofRoom/header.inc deleted file mode 100644 index 23c2ed330..000000000 --- a/data/maps/CeladonCity_Condominiums_RoofRoom/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -CeladonCity_Condominiums_RoofRoom:: @ 835131C - .4byte CeladonCity_Condominiums_RoofRoom_Layout @ 0x831B054 - .4byte CeladonCity_Condominiums_RoofRoom_MapEvents @ 0x83BB76C - .4byte CeladonCity_Condominiums_RoofRoom_MapScripts @ 0x816C463 - .4byte NULL - .2byte BGM_FRLG_CELADON_CITY - .2byte 188 - .byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/CeladonCity_Condominiums_RoofRoom/map.json b/data/maps/CeladonCity_Condominiums_RoofRoom/map.json new file mode 100644 index 000000000..9b34fffdd --- /dev/null +++ b/data/maps/CeladonCity_Condominiums_RoofRoom/map.json @@ -0,0 +1,90 @@ +{ + "id": "MAP_CELADON_CITY_CONDOMINIUMS_ROOF_ROOM", + "name": "CeladonCity_Condominiums_RoofRoom", + "layout": "LAYOUT_CELADON_CITY_CONDOMINIUMS_ROOF_ROOM", + "music": "BGM_FRLG_CELADON_CITY", + "region_map_section": "MAPSEC_CELADON_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "54", + "x": 3, + "y": 5, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_Condominiums_RoofRoom_EventScript_16C464", + "flag": "0" + }, + { + "graphics_id": "92", + "x": 7, + "y": 3, + "elevation": 0, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_Condominiums_RoofRoom_EventScript_16C46D", + "flag": "87" + } + ], + "warp_events": [ + { + "x": 3, + "y": 8, + "elevation": 0, + "dest_map": "MAP_CELADON_CITY_CONDOMINIUMS_ROOF", + "dest_warp_id": 2 + }, + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_CELADON_CITY_CONDOMINIUMS_ROOF", + "dest_warp_id": 2 + }, + { + "x": 5, + "y": 8, + "elevation": 0, + "dest_map": "MAP_CELADON_CITY_CONDOMINIUMS_ROOF", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 4, + "y": 1, + "elevation": 0, + "script": "CeladonCity_Condominiums_RoofRoom_EventScript_16C522" + }, + { + "type": "bg_event_type_0", + "x": 5, + "y": 1, + "elevation": 0, + "script": "CeladonCity_Condominiums_RoofRoom_EventScript_16C522" + }, + { + "type": "bg_event_type_0", + "x": 4, + "y": 4, + "elevation": 0, + "script": "CeladonCity_Condominiums_RoofRoom_EventScript_16C519" + } + ] +}
\ No newline at end of file diff --git a/data/maps/CeladonCity_DepartmentStore_1F/events.inc b/data/maps/CeladonCity_DepartmentStore_1F/events.inc deleted file mode 100644 index d9b549694..000000000 --- a/data/maps/CeladonCity_DepartmentStore_1F/events.inc +++ /dev/null @@ -1,19 +0,0 @@ -CeladonCity_DepartmentStore_1F_EventObjects: - object_event 1, 48, 0, 6, 0, 10, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeladonCity_DepartmentStore_1F_EventScript_16BAD9, 0, 0, 0 - -CeladonCity_DepartmentStore_1F_MapWarps: - warp_def 1, 15, 0, 1, 774 - warp_def 2, 14, 3, 1, 774 - warp_def 3, 15, 0, 1, 774 - warp_def 9, 15, 0, 2, 774 - warp_def 10, 14, 3, 2, 774 - warp_def 11, 15, 0, 2, 774 - warp_def 6, 1, 0, 0, 2566 - warp_def 4, 2, 3, 1, 2561 - -CeladonCity_DepartmentStore_1F_MapBGEvents: - bg_event 9, 11, 0, 0, 0, CeladonCity_DepartmentStore_1F_EventScript_16BAE2 - bg_event 8, 1, 0, 0, 0, CeladonCity_DepartmentStore_1F_EventScript_16BAEB - -CeladonCity_DepartmentStore_1F_MapEvents:: - map_events CeladonCity_DepartmentStore_1F_EventObjects, CeladonCity_DepartmentStore_1F_MapWarps, 0x0, CeladonCity_DepartmentStore_1F_MapBGEvents diff --git a/data/maps/CeladonCity_DepartmentStore_1F/header.inc b/data/maps/CeladonCity_DepartmentStore_1F/header.inc deleted file mode 100644 index 07b027ede..000000000 --- a/data/maps/CeladonCity_DepartmentStore_1F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -CeladonCity_DepartmentStore_1F:: @ 83511E8 - .4byte CeladonCity_DepartmentStore_1F_Layout @ 0x831B5FC - .4byte CeladonCity_DepartmentStore_1F_MapEvents @ 0x83BB0EC - .4byte CeladonCity_DepartmentStore_1F_MapScripts @ 0x816BAD8 - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 192 - .byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x04, 0x01, 0x00 diff --git a/data/maps/CeladonCity_DepartmentStore_1F/map.json b/data/maps/CeladonCity_DepartmentStore_1F/map.json new file mode 100644 index 000000000..1318f0173 --- /dev/null +++ b/data/maps/CeladonCity_DepartmentStore_1F/map.json @@ -0,0 +1,105 @@ +{ + "id": "MAP_CELADON_CITY_DEPARTMENT_STORE_1F", + "name": "CeladonCity_DepartmentStore_1F", + "layout": "LAYOUT_CELADON_CITY_DEPARTMENT_STORE_1F", + "music": "BGM_FRLG_POKEMON_CENTER", + "region_map_section": "MAPSEC_CELADON_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 4, + "elevator_flag": 1, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "48", + "x": 6, + "y": 10, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_DepartmentStore_1F_EventScript_16BAD9", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 1, + "y": 15, + "elevation": 0, + "dest_map": "MAP_CELADON_CITY", + "dest_warp_id": 1 + }, + { + "x": 2, + "y": 14, + "elevation": 3, + "dest_map": "MAP_CELADON_CITY", + "dest_warp_id": 1 + }, + { + "x": 3, + "y": 15, + "elevation": 0, + "dest_map": "MAP_CELADON_CITY", + "dest_warp_id": 1 + }, + { + "x": 9, + "y": 15, + "elevation": 0, + "dest_map": "MAP_CELADON_CITY", + "dest_warp_id": 2 + }, + { + "x": 10, + "y": 14, + "elevation": 3, + "dest_map": "MAP_CELADON_CITY", + "dest_warp_id": 2 + }, + { + "x": 11, + "y": 15, + "elevation": 0, + "dest_map": "MAP_CELADON_CITY", + "dest_warp_id": 2 + }, + { + "x": 6, + "y": 1, + "elevation": 0, + "dest_map": "MAP_CELADON_CITY_DEPARTMENT_STORE_ELEVATOR", + "dest_warp_id": 0 + }, + { + "x": 4, + "y": 2, + "elevation": 3, + "dest_map": "MAP_CELADON_CITY_DEPARTMENT_STORE_2F", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 9, + "y": 11, + "elevation": 0, + "script": "CeladonCity_DepartmentStore_1F_EventScript_16BAE2" + }, + { + "type": "bg_event_type_0", + "x": 8, + "y": 1, + "elevation": 0, + "script": "CeladonCity_DepartmentStore_1F_EventScript_16BAEB" + } + ] +}
\ No newline at end of file diff --git a/data/maps/CeladonCity_DepartmentStore_2F/events.inc b/data/maps/CeladonCity_DepartmentStore_2F/events.inc deleted file mode 100644 index b54ec637a..000000000 --- a/data/maps/CeladonCity_DepartmentStore_2F/events.inc +++ /dev/null @@ -1,16 +0,0 @@ -CeladonCity_DepartmentStore_2F_EventObjects: - object_event 1, 22, 0, 5, 0, 10, 0, 3, 3, 18, 0, 0, 0, 0, 0, CeladonCity_DepartmentStore_2F_EventScript_16BAFE, 0, 0, 0 - object_event 2, 68, 0, 1, 0, 8, 0, 0, 8, 19, 0, 0, 0, 0, 0, CeladonCity_DepartmentStore_2F_EventScript_16BB10, 0, 0, 0 - object_event 3, 68, 0, 1, 0, 6, 0, 3, 10, 19, 0, 0, 0, 0, 0, CeladonCity_DepartmentStore_2F_EventScript_16BB4E, 0, 0, 0 - object_event 4, 23, 0, 11, 0, 6, 0, 3, 5, 17, 0, 0, 0, 0, 0, CeladonCity_DepartmentStore_2F_EventScript_1AD053, 157, 0, 0 - -CeladonCity_DepartmentStore_2F_MapWarps: - warp_def 6, 1, 0, 0, 2566 - warp_def 3, 2, 3, 7, 2560 - warp_def 9, 2, 3, 1, 2562 - -CeladonCity_DepartmentStore_2F_MapBGEvents: - bg_event 4, 1, 0, 0, 0, CeladonCity_DepartmentStore_2F_EventScript_16BB07 - -CeladonCity_DepartmentStore_2F_MapEvents:: - map_events CeladonCity_DepartmentStore_2F_EventObjects, CeladonCity_DepartmentStore_2F_MapWarps, 0x0, CeladonCity_DepartmentStore_2F_MapBGEvents diff --git a/data/maps/CeladonCity_DepartmentStore_2F/header.inc b/data/maps/CeladonCity_DepartmentStore_2F/header.inc deleted file mode 100644 index 48afe690e..000000000 --- a/data/maps/CeladonCity_DepartmentStore_2F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -CeladonCity_DepartmentStore_2F:: @ 8351204 - .4byte CeladonCity_DepartmentStore_2F_Layout @ 0x831B7A8 - .4byte CeladonCity_DepartmentStore_2F_MapEvents @ 0x83BB184 - .4byte CeladonCity_DepartmentStore_2F_MapScripts @ 0x816BAF4 - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 193 - .byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x04, 0x02, 0x00 diff --git a/data/maps/CeladonCity_DepartmentStore_2F/map.json b/data/maps/CeladonCity_DepartmentStore_2F/map.json new file mode 100644 index 000000000..9765467e4 --- /dev/null +++ b/data/maps/CeladonCity_DepartmentStore_2F/map.json @@ -0,0 +1,102 @@ +{ + "id": "MAP_CELADON_CITY_DEPARTMENT_STORE_2F", + "name": "CeladonCity_DepartmentStore_2F", + "layout": "LAYOUT_CELADON_CITY_DEPARTMENT_STORE_2F", + "music": "BGM_FRLG_POKEMON_CENTER", + "region_map_section": "MAPSEC_CELADON_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 4, + "elevator_flag": 2, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "22", + "x": 5, + "y": 10, + "elevation": 3, + "movement_type": "3", + "movement_range_x": 2, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_DepartmentStore_2F_EventScript_16BAFE", + "flag": "0" + }, + { + "graphics_id": "68", + "x": 1, + "y": 8, + "elevation": 0, + "movement_type": "8", + "movement_range_x": 3, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_DepartmentStore_2F_EventScript_16BB10", + "flag": "0" + }, + { + "graphics_id": "68", + "x": 1, + "y": 6, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 3, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_DepartmentStore_2F_EventScript_16BB4E", + "flag": "0" + }, + { + "graphics_id": "23", + "x": 11, + "y": 6, + "elevation": 3, + "movement_type": "5", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_DepartmentStore_2F_EventScript_1AD053", + "flag": "157" + } + ], + "warp_events": [ + { + "x": 6, + "y": 1, + "elevation": 0, + "dest_map": "MAP_CELADON_CITY_DEPARTMENT_STORE_ELEVATOR", + "dest_warp_id": 0 + }, + { + "x": 3, + "y": 2, + "elevation": 3, + "dest_map": "MAP_CELADON_CITY_DEPARTMENT_STORE_1F", + "dest_warp_id": 7 + }, + { + "x": 9, + "y": 2, + "elevation": 3, + "dest_map": "MAP_CELADON_CITY_DEPARTMENT_STORE_3F", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 4, + "y": 1, + "elevation": 0, + "script": "CeladonCity_DepartmentStore_2F_EventScript_16BB07" + } + ] +}
\ No newline at end of file diff --git a/data/maps/CeladonCity_DepartmentStore_3F/events.inc b/data/maps/CeladonCity_DepartmentStore_3F/events.inc deleted file mode 100644 index 6d2b546ab..000000000 --- a/data/maps/CeladonCity_DepartmentStore_3F/events.inc +++ /dev/null @@ -1,27 +0,0 @@ -CeladonCity_DepartmentStore_3F_EventObjects: - object_event 1, 68, 0, 10, 0, 9, 0, 3, 7, 17, 0, 0, 0, 0, 0, CeladonCity_DepartmentStore_3F_EventScript_16BB85, 0, 0, 0 - object_event 2, 51, 0, 11, 0, 6, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeladonCity_DepartmentStore_3F_EventScript_16BB8B, 0, 0, 0 - object_event 3, 51, 0, 4, 0, 9, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeladonCity_DepartmentStore_3F_EventScript_16BB9D, 0, 0, 0 - object_event 4, 51, 0, 1, 0, 9, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeladonCity_DepartmentStore_3F_EventScript_16BB94, 0, 0, 0 - object_event 5, 17, 0, 9, 0, 14, 0, 3, 14, 17, 0, 0, 0, 0, 0, CeladonCity_DepartmentStore_3F_EventScript_16BBA6, 0, 0, 0 - -CeladonCity_DepartmentStore_3F_MapWarps: - warp_def 6, 1, 0, 0, 2566 - warp_def 9, 2, 0, 2, 2561 - warp_def 3, 2, 0, 1, 2563 - -CeladonCity_DepartmentStore_3F_MapBGEvents: - bg_event 8, 1, 0, 0, 0, CeladonCity_DepartmentStore_3F_EventScript_16BBDC - bg_event 2, 8, 0, 1, 0, CeladonCity_DepartmentStore_3F_EventScript_16BBB8 - bg_event 5, 8, 0, 1, 0, CeladonCity_DepartmentStore_3F_EventScript_16BBC1 - bg_event 2, 11, 0, 1, 0, CeladonCity_DepartmentStore_3F_EventScript_16BBCA - bg_event 5, 11, 0, 1, 0, CeladonCity_DepartmentStore_3F_EventScript_16BBD3 - bg_event 1, 8, 0, 0, 0, CeladonCity_DepartmentStore_3F_EventScript_16BBAF - bg_event 1, 11, 0, 0, 0, CeladonCity_DepartmentStore_3F_EventScript_16BBAF - bg_event 4, 8, 0, 0, 0, CeladonCity_DepartmentStore_3F_EventScript_16BBAF - bg_event 4, 11, 0, 0, 0, CeladonCity_DepartmentStore_3F_EventScript_16BBAF - bg_event 2, 4, 0, 1, 0, CeladonCity_DepartmentStore_3F_EventScript_16BBE5 - bg_event 0, 4, 0, 1, 0, CeladonCity_DepartmentStore_3F_EventScript_16BBE5 - -CeladonCity_DepartmentStore_3F_MapEvents:: - map_events CeladonCity_DepartmentStore_3F_EventObjects, CeladonCity_DepartmentStore_3F_MapWarps, 0x0, CeladonCity_DepartmentStore_3F_MapBGEvents diff --git a/data/maps/CeladonCity_DepartmentStore_3F/header.inc b/data/maps/CeladonCity_DepartmentStore_3F/header.inc deleted file mode 100644 index 9bfb8d3c4..000000000 --- a/data/maps/CeladonCity_DepartmentStore_3F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -CeladonCity_DepartmentStore_3F:: @ 8351220 - .4byte CeladonCity_DepartmentStore_3F_Layout @ 0x831B954 - .4byte CeladonCity_DepartmentStore_3F_MapEvents @ 0x83BB2AC - .4byte CeladonCity_DepartmentStore_3F_MapScripts @ 0x816BB84 - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 194 - .byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x04, 0x03, 0x00 diff --git a/data/maps/CeladonCity_DepartmentStore_3F/map.json b/data/maps/CeladonCity_DepartmentStore_3F/map.json new file mode 100644 index 000000000..c6a314cc9 --- /dev/null +++ b/data/maps/CeladonCity_DepartmentStore_3F/map.json @@ -0,0 +1,185 @@ +{ + "id": "MAP_CELADON_CITY_DEPARTMENT_STORE_3F", + "name": "CeladonCity_DepartmentStore_3F", + "layout": "LAYOUT_CELADON_CITY_DEPARTMENT_STORE_3F", + "music": "BGM_FRLG_POKEMON_CENTER", + "region_map_section": "MAPSEC_CELADON_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 4, + "elevator_flag": 3, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "68", + "x": 10, + "y": 9, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_DepartmentStore_3F_EventScript_16BB85", + "flag": "0" + }, + { + "graphics_id": "51", + "x": 11, + "y": 6, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_DepartmentStore_3F_EventScript_16BB8B", + "flag": "0" + }, + { + "graphics_id": "51", + "x": 4, + "y": 9, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_DepartmentStore_3F_EventScript_16BB9D", + "flag": "0" + }, + { + "graphics_id": "51", + "x": 1, + "y": 9, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_DepartmentStore_3F_EventScript_16BB94", + "flag": "0" + }, + { + "graphics_id": "17", + "x": 9, + "y": 14, + "elevation": 3, + "movement_type": "14", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_DepartmentStore_3F_EventScript_16BBA6", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 6, + "y": 1, + "elevation": 0, + "dest_map": "MAP_CELADON_CITY_DEPARTMENT_STORE_ELEVATOR", + "dest_warp_id": 0 + }, + { + "x": 9, + "y": 2, + "elevation": 0, + "dest_map": "MAP_CELADON_CITY_DEPARTMENT_STORE_2F", + "dest_warp_id": 2 + }, + { + "x": 3, + "y": 2, + "elevation": 0, + "dest_map": "MAP_CELADON_CITY_DEPARTMENT_STORE_4F", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 8, + "y": 1, + "elevation": 0, + "script": "CeladonCity_DepartmentStore_3F_EventScript_16BBDC" + }, + { + "type": "bg_event_type_1", + "x": 2, + "y": 8, + "elevation": 0, + "script": "CeladonCity_DepartmentStore_3F_EventScript_16BBB8" + }, + { + "type": "bg_event_type_1", + "x": 5, + "y": 8, + "elevation": 0, + "script": "CeladonCity_DepartmentStore_3F_EventScript_16BBC1" + }, + { + "type": "bg_event_type_1", + "x": 2, + "y": 11, + "elevation": 0, + "script": "CeladonCity_DepartmentStore_3F_EventScript_16BBCA" + }, + { + "type": "bg_event_type_1", + "x": 5, + "y": 11, + "elevation": 0, + "script": "CeladonCity_DepartmentStore_3F_EventScript_16BBD3" + }, + { + "type": "bg_event_type_0", + "x": 1, + "y": 8, + "elevation": 0, + "script": "CeladonCity_DepartmentStore_3F_EventScript_16BBAF" + }, + { + "type": "bg_event_type_0", + "x": 1, + "y": 11, + "elevation": 0, + "script": "CeladonCity_DepartmentStore_3F_EventScript_16BBAF" + }, + { + "type": "bg_event_type_0", + "x": 4, + "y": 8, + "elevation": 0, + "script": "CeladonCity_DepartmentStore_3F_EventScript_16BBAF" + }, + { + "type": "bg_event_type_0", + "x": 4, + "y": 11, + "elevation": 0, + "script": "CeladonCity_DepartmentStore_3F_EventScript_16BBAF" + }, + { + "type": "bg_event_type_1", + "x": 2, + "y": 4, + "elevation": 0, + "script": "CeladonCity_DepartmentStore_3F_EventScript_16BBE5" + }, + { + "type": "bg_event_type_1", + "x": 0, + "y": 4, + "elevation": 0, + "script": "CeladonCity_DepartmentStore_3F_EventScript_16BBE5" + } + ] +}
\ No newline at end of file diff --git a/data/maps/CeladonCity_DepartmentStore_4F/events.inc b/data/maps/CeladonCity_DepartmentStore_4F/events.inc deleted file mode 100644 index d38604872..000000000 --- a/data/maps/CeladonCity_DepartmentStore_4F/events.inc +++ /dev/null @@ -1,15 +0,0 @@ -CeladonCity_DepartmentStore_4F_EventObjects: - object_event 1, 25, 0, 6, 0, 6, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeladonCity_DepartmentStore_4F_EventScript_16BBEF, 0, 0, 0 - object_event 2, 18, 0, 10, 0, 11, 0, 3, 2, 17, 0, 0, 0, 0, 0, CeladonCity_DepartmentStore_4F_EventScript_16BBF8, 0, 0, 0 - object_event 3, 68, 0, 3, 0, 13, 0, 0, 7, 19, 0, 0, 0, 0, 0, CeladonCity_DepartmentStore_4F_EventScript_16BC0A, 0, 0, 0 - -CeladonCity_DepartmentStore_4F_MapWarps: - warp_def 6, 1, 0, 0, 2566 - warp_def 3, 2, 0, 2, 2562 - warp_def 9, 2, 0, 1, 2564 - -CeladonCity_DepartmentStore_4F_MapBGEvents: - bg_event 4, 1, 0, 0, 0, CeladonCity_DepartmentStore_4F_EventScript_16BC01 - -CeladonCity_DepartmentStore_4F_MapEvents:: - map_events CeladonCity_DepartmentStore_4F_EventObjects, CeladonCity_DepartmentStore_4F_MapWarps, 0x0, CeladonCity_DepartmentStore_4F_MapBGEvents diff --git a/data/maps/CeladonCity_DepartmentStore_4F/header.inc b/data/maps/CeladonCity_DepartmentStore_4F/header.inc deleted file mode 100644 index e25a983da..000000000 --- a/data/maps/CeladonCity_DepartmentStore_4F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -CeladonCity_DepartmentStore_4F:: @ 835123C - .4byte CeladonCity_DepartmentStore_4F_Layout @ 0x831BB00 - .4byte CeladonCity_DepartmentStore_4F_MapEvents @ 0x83BB32C - .4byte CeladonCity_DepartmentStore_4F_MapScripts @ 0x816BBEE - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 195 - .byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x04, 0x04, 0x00 diff --git a/data/maps/CeladonCity_DepartmentStore_4F/map.json b/data/maps/CeladonCity_DepartmentStore_4F/map.json new file mode 100644 index 000000000..8fc5e4f09 --- /dev/null +++ b/data/maps/CeladonCity_DepartmentStore_4F/map.json @@ -0,0 +1,89 @@ +{ + "id": "MAP_CELADON_CITY_DEPARTMENT_STORE_4F", + "name": "CeladonCity_DepartmentStore_4F", + "layout": "LAYOUT_CELADON_CITY_DEPARTMENT_STORE_4F", + "music": "BGM_FRLG_POKEMON_CENTER", + "region_map_section": "MAPSEC_CELADON_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 4, + "elevator_flag": 4, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "25", + "x": 6, + "y": 6, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_DepartmentStore_4F_EventScript_16BBEF", + "flag": "0" + }, + { + "graphics_id": "18", + "x": 10, + "y": 11, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_DepartmentStore_4F_EventScript_16BBF8", + "flag": "0" + }, + { + "graphics_id": "68", + "x": 3, + "y": 13, + "elevation": 0, + "movement_type": "7", + "movement_range_x": 3, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_DepartmentStore_4F_EventScript_16BC0A", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 6, + "y": 1, + "elevation": 0, + "dest_map": "MAP_CELADON_CITY_DEPARTMENT_STORE_ELEVATOR", + "dest_warp_id": 0 + }, + { + "x": 3, + "y": 2, + "elevation": 0, + "dest_map": "MAP_CELADON_CITY_DEPARTMENT_STORE_3F", + "dest_warp_id": 2 + }, + { + "x": 9, + "y": 2, + "elevation": 0, + "dest_map": "MAP_CELADON_CITY_DEPARTMENT_STORE_5F", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 4, + "y": 1, + "elevation": 0, + "script": "CeladonCity_DepartmentStore_4F_EventScript_16BC01" + } + ] +}
\ No newline at end of file diff --git a/data/maps/CeladonCity_DepartmentStore_5F/events.inc b/data/maps/CeladonCity_DepartmentStore_5F/events.inc deleted file mode 100644 index c9c61f94e..000000000 --- a/data/maps/CeladonCity_DepartmentStore_5F/events.inc +++ /dev/null @@ -1,16 +0,0 @@ -CeladonCity_DepartmentStore_5F_EventObjects: - object_event 1, 61, 0, 11, 0, 6, 0, 3, 5, 17, 0, 0, 0, 0, 0, CeladonCity_DepartmentStore_5F_EventScript_16BC41, 0, 0, 0 - object_event 2, 62, 0, 6, 0, 8, 0, 3, 2, 17, 0, 0, 0, 0, 0, CeladonCity_DepartmentStore_5F_EventScript_16BC4A, 0, 0, 0 - object_event 3, 68, 0, 1, 0, 7, 0, 3, 8, 18, 0, 0, 0, 0, 0, CeladonCity_DepartmentStore_5F_EventScript_16BC5C, 0, 0, 0 - object_event 4, 68, 0, 1, 0, 6, 0, 3, 10, 18, 0, 0, 0, 0, 0, CeladonCity_DepartmentStore_5F_EventScript_16BC96, 0, 0, 0 - -CeladonCity_DepartmentStore_5F_MapWarps: - warp_def 6, 1, 0, 0, 2566 - warp_def 9, 2, 3, 2, 2563 - warp_def 3, 2, 3, 0, 2565 - -CeladonCity_DepartmentStore_5F_MapBGEvents: - bg_event 8, 1, 0, 0, 0, CeladonCity_DepartmentStore_5F_EventScript_16BC53 - -CeladonCity_DepartmentStore_5F_MapEvents:: - map_events CeladonCity_DepartmentStore_5F_EventObjects, CeladonCity_DepartmentStore_5F_MapWarps, 0x0, CeladonCity_DepartmentStore_5F_MapBGEvents diff --git a/data/maps/CeladonCity_DepartmentStore_5F/header.inc b/data/maps/CeladonCity_DepartmentStore_5F/header.inc deleted file mode 100644 index 321174026..000000000 --- a/data/maps/CeladonCity_DepartmentStore_5F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -CeladonCity_DepartmentStore_5F:: @ 8351258 - .4byte CeladonCity_DepartmentStore_5F_Layout @ 0x831BCAC - .4byte CeladonCity_DepartmentStore_5F_MapEvents @ 0x83BB3C4 - .4byte CeladonCity_DepartmentStore_5F_MapScripts @ 0x816BC40 - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 196 - .byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x04, 0x05, 0x00 diff --git a/data/maps/CeladonCity_DepartmentStore_5F/map.json b/data/maps/CeladonCity_DepartmentStore_5F/map.json new file mode 100644 index 000000000..063d36602 --- /dev/null +++ b/data/maps/CeladonCity_DepartmentStore_5F/map.json @@ -0,0 +1,102 @@ +{ + "id": "MAP_CELADON_CITY_DEPARTMENT_STORE_5F", + "name": "CeladonCity_DepartmentStore_5F", + "layout": "LAYOUT_CELADON_CITY_DEPARTMENT_STORE_5F", + "music": "BGM_FRLG_POKEMON_CENTER", + "region_map_section": "MAPSEC_CELADON_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 4, + "elevator_flag": 5, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "61", + "x": 11, + "y": 6, + "elevation": 3, + "movement_type": "5", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_DepartmentStore_5F_EventScript_16BC41", + "flag": "0" + }, + { + "graphics_id": "62", + "x": 6, + "y": 8, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_DepartmentStore_5F_EventScript_16BC4A", + "flag": "0" + }, + { + "graphics_id": "68", + "x": 1, + "y": 7, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 2, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_DepartmentStore_5F_EventScript_16BC5C", + "flag": "0" + }, + { + "graphics_id": "68", + "x": 1, + "y": 6, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 2, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_DepartmentStore_5F_EventScript_16BC96", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 6, + "y": 1, + "elevation": 0, + "dest_map": "MAP_CELADON_CITY_DEPARTMENT_STORE_ELEVATOR", + "dest_warp_id": 0 + }, + { + "x": 9, + "y": 2, + "elevation": 3, + "dest_map": "MAP_CELADON_CITY_DEPARTMENT_STORE_4F", + "dest_warp_id": 2 + }, + { + "x": 3, + "y": 2, + "elevation": 3, + "dest_map": "MAP_CELADON_CITY_DEPARTMENT_STORE_ROOF", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 8, + "y": 1, + "elevation": 0, + "script": "CeladonCity_DepartmentStore_5F_EventScript_16BC53" + } + ] +}
\ No newline at end of file diff --git a/data/maps/CeladonCity_DepartmentStore_Elevator/events.inc b/data/maps/CeladonCity_DepartmentStore_Elevator/events.inc deleted file mode 100644 index 1a7da8ab1..000000000 --- a/data/maps/CeladonCity_DepartmentStore_Elevator/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -CeladonCity_DepartmentStore_Elevator_MapWarps: - warp_def 2, 5, 3, 127, 32639 - warp_def 2, 6, 0, 127, 32639 - -CeladonCity_DepartmentStore_Elevator_MapBGEvents: - bg_event 0, 2, 0, 0, 0, CeladonCity_DepartmentStore_Elevator_EventScript_16C153 - bg_event 4, 1, 0, 0, 0, CeladonCity_DepartmentStore_Elevator_EventScript_16C153 - -CeladonCity_DepartmentStore_Elevator_MapEvents:: - map_events 0x0, CeladonCity_DepartmentStore_Elevator_MapWarps, 0x0, CeladonCity_DepartmentStore_Elevator_MapBGEvents diff --git a/data/maps/CeladonCity_DepartmentStore_Elevator/header.inc b/data/maps/CeladonCity_DepartmentStore_Elevator/header.inc deleted file mode 100644 index e7086ace2..000000000 --- a/data/maps/CeladonCity_DepartmentStore_Elevator/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -CeladonCity_DepartmentStore_Elevator:: @ 8351290 - .4byte CeladonCity_DepartmentStore_Elevator_Layout @ 0x8319F70 - .4byte CeladonCity_DepartmentStore_Elevator_MapEvents @ 0x83BB47C - .4byte CeladonCity_DepartmentStore_Elevator_MapScripts @ 0x816C152 - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 179 - .byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/CeladonCity_DepartmentStore_Elevator/map.json b/data/maps/CeladonCity_DepartmentStore_Elevator/map.json new file mode 100644 index 000000000..150bd1605 --- /dev/null +++ b/data/maps/CeladonCity_DepartmentStore_Elevator/map.json @@ -0,0 +1,49 @@ +{ + "id": "MAP_CELADON_CITY_DEPARTMENT_STORE_ELEVATOR", + "name": "CeladonCity_DepartmentStore_Elevator", + "layout": "LAYOUT_CELADON_CITY_DEPARTMENT_STORE_ELEVATOR", + "music": "BGM_FRLG_POKEMON_CENTER", + "region_map_section": "MAPSEC_CELADON_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 2, + "y": 5, + "elevation": 3, + "dest_map": "MAP_NONE", + "dest_warp_id": 127 + }, + { + "x": 2, + "y": 6, + "elevation": 0, + "dest_map": "MAP_NONE", + "dest_warp_id": 127 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 0, + "y": 2, + "elevation": 0, + "script": "CeladonCity_DepartmentStore_Elevator_EventScript_16C153" + }, + { + "type": "bg_event_type_0", + "x": 4, + "y": 1, + "elevation": 0, + "script": "CeladonCity_DepartmentStore_Elevator_EventScript_16C153" + } + ] +}
\ No newline at end of file diff --git a/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc b/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc index d682f3d7a..ed342274f 100644 --- a/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc @@ -72,7 +72,7 @@ EventScript_16C1F3:: @ 816C1F3 EventScript_16C246:: @ 816C246 setvar VAR_0x8006, 4 - setdynamicwarp MAP_CELADON_CITY_DEPARTMENTSTORE_1F, 255, 6, 1 + setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_1F, 255, 6, 1 compare_var_to_value VAR_0x403A, 4 goto_if 1, EventScript_16C30E call EventScript_16C313 @@ -82,7 +82,7 @@ EventScript_16C246:: @ 816C246 EventScript_16C26E:: @ 816C26E setvar VAR_0x8006, 5 - setdynamicwarp MAP_CELADON_CITY_DEPARTMENTSTORE_2F, 255, 6, 1 + setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_2F, 255, 6, 1 compare_var_to_value VAR_0x403A, 5 goto_if 1, EventScript_16C30E call EventScript_16C313 @@ -92,7 +92,7 @@ EventScript_16C26E:: @ 816C26E EventScript_16C296:: @ 816C296 setvar VAR_0x8006, 6 - setdynamicwarp MAP_CELADON_CITY_DEPARTMENTSTORE_3F, 255, 6, 1 + setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_3F, 255, 6, 1 compare_var_to_value VAR_0x403A, 6 goto_if 1, EventScript_16C30E call EventScript_16C313 @@ -102,7 +102,7 @@ EventScript_16C296:: @ 816C296 EventScript_16C2BE:: @ 816C2BE setvar VAR_0x8006, 7 - setdynamicwarp MAP_CELADON_CITY_DEPARTMENTSTORE_4F, 255, 6, 1 + setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_4F, 255, 6, 1 compare_var_to_value VAR_0x403A, 7 goto_if 1, EventScript_16C30E call EventScript_16C313 @@ -112,7 +112,7 @@ EventScript_16C2BE:: @ 816C2BE EventScript_16C2E6:: @ 816C2E6 setvar VAR_0x8006, 8 - setdynamicwarp MAP_CELADON_CITY_DEPARTMENTSTORE_5F, 255, 6, 1 + setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_5F, 255, 6, 1 compare_var_to_value VAR_0x403A, 8 goto_if 1, EventScript_16C30E call EventScript_16C313 diff --git a/data/maps/CeladonCity_DepartmentStore_Roof/events.inc b/data/maps/CeladonCity_DepartmentStore_Roof/events.inc deleted file mode 100644 index 6f6fc6da1..000000000 --- a/data/maps/CeladonCity_DepartmentStore_Roof/events.inc +++ /dev/null @@ -1,15 +0,0 @@ -CeladonCity_DepartmentStore_Roof_EventObjects: - object_event 1, 41, 0, 9, 0, 5, 0, 3, 9, 17, 0, 0, 0, 0, 0, CeladonCity_DepartmentStore_Roof_EventScript_16C022, 0, 0, 0 - object_event 2, 17, 0, 5, 0, 4, 0, 3, 2, 18, 0, 0, 0, 0, 0, CeladonCity_DepartmentStore_Roof_EventScript_16BCCD, 0, 0, 0 - -CeladonCity_DepartmentStore_Roof_MapWarps: - warp_def 15, 6, 3, 2, 2564 - -CeladonCity_DepartmentStore_Roof_MapBGEvents: - bg_event 14, 3, 0, 0, 0, CeladonCity_DepartmentStore_Roof_EventScript_16C02B - bg_event 10, 3, 0, 0, 0, CeladonCity_DepartmentStore_Roof_EventScript_16C034 - bg_event 11, 3, 0, 0, 0, CeladonCity_DepartmentStore_Roof_EventScript_16C034 - bg_event 12, 3, 0, 0, 0, CeladonCity_DepartmentStore_Roof_EventScript_16C034 - -CeladonCity_DepartmentStore_Roof_MapEvents:: - map_events CeladonCity_DepartmentStore_Roof_EventObjects, CeladonCity_DepartmentStore_Roof_MapWarps, 0x0, CeladonCity_DepartmentStore_Roof_MapBGEvents diff --git a/data/maps/CeladonCity_DepartmentStore_Roof/header.inc b/data/maps/CeladonCity_DepartmentStore_Roof/header.inc deleted file mode 100644 index bed42ffb5..000000000 --- a/data/maps/CeladonCity_DepartmentStore_Roof/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -CeladonCity_DepartmentStore_Roof:: @ 8351274 - .4byte CeladonCity_DepartmentStore_Roof_Layout @ 0x831BEE4 - .4byte CeladonCity_DepartmentStore_Roof_MapEvents @ 0x83BB440 - .4byte CeladonCity_DepartmentStore_Roof_MapScripts @ 0x816BCCC - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 197 - .byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x04, 0x7f, 0x00 diff --git a/data/maps/CeladonCity_DepartmentStore_Roof/map.json b/data/maps/CeladonCity_DepartmentStore_Roof/map.json new file mode 100644 index 000000000..461da4fcc --- /dev/null +++ b/data/maps/CeladonCity_DepartmentStore_Roof/map.json @@ -0,0 +1,83 @@ +{ + "id": "MAP_CELADON_CITY_DEPARTMENT_STORE_ROOF", + "name": "CeladonCity_DepartmentStore_Roof", + "layout": "LAYOUT_CELADON_CITY_DEPARTMENT_STORE_ROOF", + "music": "BGM_FRLG_POKEMON_CENTER", + "region_map_section": "MAPSEC_CELADON_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 4, + "elevator_flag": 127, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "41", + "x": 9, + "y": 5, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_DepartmentStore_Roof_EventScript_16C022", + "flag": "0" + }, + { + "graphics_id": "17", + "x": 5, + "y": 4, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 2, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_DepartmentStore_Roof_EventScript_16BCCD", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 15, + "y": 6, + "elevation": 3, + "dest_map": "MAP_CELADON_CITY_DEPARTMENT_STORE_5F", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 14, + "y": 3, + "elevation": 0, + "script": "CeladonCity_DepartmentStore_Roof_EventScript_16C02B" + }, + { + "type": "bg_event_type_0", + "x": 10, + "y": 3, + "elevation": 0, + "script": "CeladonCity_DepartmentStore_Roof_EventScript_16C034" + }, + { + "type": "bg_event_type_0", + "x": 11, + "y": 3, + "elevation": 0, + "script": "CeladonCity_DepartmentStore_Roof_EventScript_16C034" + }, + { + "type": "bg_event_type_0", + "x": 12, + "y": 3, + "elevation": 0, + "script": "CeladonCity_DepartmentStore_Roof_EventScript_16C034" + } + ] +}
\ No newline at end of file diff --git a/data/maps/CeladonCity_GameCorner/events.inc b/data/maps/CeladonCity_GameCorner/events.inc deleted file mode 100644 index 9a2a1e5c1..000000000 --- a/data/maps/CeladonCity_GameCorner/events.inc +++ /dev/null @@ -1,59 +0,0 @@ -CeladonCity_GameCorner_EventObjects: - object_event 1, 48, 0, 4, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeladonCity_GameCorner_EventScript_16C684, 0, 0, 0 - object_event 2, 47, 0, 6, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeladonCity_GameCorner_EventScript_16C68D, 0, 0, 0 - object_event 3, 30, 0, 1, 0, 6, 0, 3, 9, 17, 0, 0, 0, 0, 0, CeladonCity_GameCorner_EventScript_16C7BA, 0, 0, 0 - object_event 4, 28, 0, 1, 0, 8, 0, 3, 9, 17, 0, 0, 0, 0, 0, CeladonCity_GameCorner_EventScript_16C7D7, 0, 0, 0 - object_event 5, 57, 0, 4, 0, 7, 0, 3, 10, 17, 0, 0, 0, 0, 0, CeladonCity_GameCorner_EventScript_16C7E7, 0, 0, 0 - object_event 6, 91, 0, 7, 0, 10, 0, 3, 9, 17, 0, 0, 0, 0, 0, CeladonCity_GameCorner_EventScript_16C857, 0, 0, 0 - object_event 7, 23, 0, 7, 0, 8, 0, 3, 9, 17, 0, 0, 0, 0, 0, CeladonCity_GameCorner_EventScript_16C87E, 0, 0, 0 - object_event 8, 33, 0, 10, 0, 9, 0, 3, 10, 17, 0, 0, 0, 0, 0, CeladonCity_GameCorner_EventScript_16C88E, 0, 0, 0 - object_event 9, 55, 0, 13, 0, 7, 0, 3, 9, 17, 0, 0, 0, 0, 0, CeladonCity_GameCorner_EventScript_16C89E, 0, 0, 0 - object_event 10, 61, 0, 16, 0, 10, 0, 3, 10, 17, 0, 0, 0, 0, 0, CeladonCity_GameCorner_EventScript_16C8FE, 0, 0, 0 - object_event 11, 49, 0, 11, 0, 2, 0, 3, 7, 17, 0, 1, 0, 0, 0, CeladonCity_GameCorner_EventScript_16CAF5, 91, 0, 0 - -CeladonCity_GameCorner_MapWarps: - warp_def 9, 13, 0, 0, 774 - warp_def 10, 13, 0, 0, 774 - warp_def 11, 13, 0, 0, 774 - warp_def 15, 2, 3, 0, 298 - -CeladonCity_GameCorner_MapBGEvents: - bg_event 2, 4, 3, 7, 0, 0, 51, 10 - bg_event 3, 8, 3, 7, 0, 0, 52, 10 - bg_event 2, 11, 3, 7, 0, 0, 53, 20 - bg_event 6, 12, 3, 7, 0, 0, 54, 10 - bg_event 9, 9, 3, 7, 0, 0, 55, 10 - bg_event 8, 5, 3, 7, 0, 0, 56, 20 - bg_event 10, 4, 3, 7, 0, 0, 57, 10 - bg_event 13, 3, 3, 7, 0, 0, 58, 10 - bg_event 15, 5, 3, 7, 0, 0, 59, 10 - bg_event 17, 5, 3, 7, 0, 0, 60, 40 - bg_event 15, 13, 3, 7, 0, 0, 61, 100 - bg_event 12, 12, 3, 7, 0, 0, 62, 10 - bg_event 0, 7, 0, 4, 0, CeladonCity_GameCorner_EventScript_16C95E - bg_event 0, 9, 0, 4, 0, CeladonCity_GameCorner_EventScript_16C9A4 - bg_event 0, 10, 0, 4, 0, CeladonCity_GameCorner_EventScript_16C9B0 - bg_event 5, 6, 0, 3, 0, CeladonCity_GameCorner_EventScript_16C9BC - bg_event 5, 8, 0, 3, 0, CeladonCity_GameCorner_EventScript_16CB5A - bg_event 5, 9, 0, 3, 0, CeladonCity_GameCorner_EventScript_16C9D4 - bg_event 5, 10, 0, 3, 0, CeladonCity_GameCorner_EventScript_16C9E0 - bg_event 6, 6, 0, 4, 0, CeladonCity_GameCorner_EventScript_16C9EC - bg_event 6, 7, 0, 4, 0, CeladonCity_GameCorner_EventScript_16C9F8 - bg_event 6, 9, 0, 4, 0, CeladonCity_GameCorner_EventScript_16CA04 - bg_event 11, 6, 0, 3, 0, CeladonCity_GameCorner_EventScript_16CA10 - bg_event 11, 7, 0, 3, 0, CeladonCity_GameCorner_EventScript_16CA1C - bg_event 11, 8, 0, 3, 0, CeladonCity_GameCorner_EventScript_16CA28 - bg_event 11, 10, 0, 3, 0, CeladonCity_GameCorner_EventScript_16CA34 - bg_event 12, 6, 0, 4, 0, CeladonCity_GameCorner_EventScript_16CA40 - bg_event 12, 8, 0, 4, 0, CeladonCity_GameCorner_EventScript_16CB63 - bg_event 12, 9, 0, 4, 0, CeladonCity_GameCorner_EventScript_16CA58 - bg_event 12, 10, 0, 4, 0, CeladonCity_GameCorner_EventScript_16CA64 - bg_event 17, 6, 0, 3, 0, CeladonCity_GameCorner_EventScript_16CB6C - bg_event 17, 7, 0, 3, 0, CeladonCity_GameCorner_EventScript_16CA7C - bg_event 17, 8, 0, 3, 0, CeladonCity_GameCorner_EventScript_16CA88 - bg_event 17, 9, 0, 3, 0, CeladonCity_GameCorner_EventScript_16CA94 - bg_event 11, 1, 0, 0, 0, CeladonCity_GameCorner_EventScript_16CAAA - bg_event 17, 13, 0, 3, 0, CeladonCity_GameCorner_EventScript_1B2867 - -CeladonCity_GameCorner_MapEvents:: - map_events CeladonCity_GameCorner_EventObjects, CeladonCity_GameCorner_MapWarps, 0x0, CeladonCity_GameCorner_MapBGEvents diff --git a/data/maps/CeladonCity_GameCorner/header.inc b/data/maps/CeladonCity_GameCorner/header.inc deleted file mode 100644 index dde1f5a6d..000000000 --- a/data/maps/CeladonCity_GameCorner/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -CeladonCity_GameCorner:: @ 8351370 - .4byte CeladonCity_GameCorner_Layout @ 0x82D7168 - .4byte CeladonCity_GameCorner_MapEvents @ 0x83BBB78 - .4byte CeladonCity_GameCorner_MapScripts @ 0x816C646 - .4byte NULL - .2byte BGM_FRLG_GAMECORNER - .2byte 27 - .byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/CeladonCity_GameCorner/map.json b/data/maps/CeladonCity_GameCorner/map.json new file mode 100644 index 000000000..fa2b1186a --- /dev/null +++ b/data/maps/CeladonCity_GameCorner/map.json @@ -0,0 +1,469 @@ +{ + "id": "MAP_CELADON_CITY_GAME_CORNER", + "name": "CeladonCity_GameCorner", + "layout": "LAYOUT_CELADON_CITY_GAME_CORNER", + "music": "BGM_FRLG_GAMECORNER", + "region_map_section": "MAPSEC_CELADON_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "48", + "x": 4, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_GameCorner_EventScript_16C684", + "flag": "0" + }, + { + "graphics_id": "47", + "x": 6, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_GameCorner_EventScript_16C68D", + "flag": "0" + }, + { + "graphics_id": "30", + "x": 1, + "y": 6, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_GameCorner_EventScript_16C7BA", + "flag": "0" + }, + { + "graphics_id": "28", + "x": 1, + "y": 8, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_GameCorner_EventScript_16C7D7", + "flag": "0" + }, + { + "graphics_id": "57", + "x": 4, + "y": 7, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_GameCorner_EventScript_16C7E7", + "flag": "0" + }, + { + "graphics_id": "91", + "x": 7, + "y": 10, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_GameCorner_EventScript_16C857", + "flag": "0" + }, + { + "graphics_id": "23", + "x": 7, + "y": 8, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_GameCorner_EventScript_16C87E", + "flag": "0" + }, + { + "graphics_id": "33", + "x": 10, + "y": 9, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_GameCorner_EventScript_16C88E", + "flag": "0" + }, + { + "graphics_id": "55", + "x": 13, + "y": 7, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_GameCorner_EventScript_16C89E", + "flag": "0" + }, + { + "graphics_id": "61", + "x": 16, + "y": 10, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_GameCorner_EventScript_16C8FE", + "flag": "0" + }, + { + "graphics_id": "49", + "x": 11, + "y": 2, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_GameCorner_EventScript_16CAF5", + "flag": "91" + } + ], + "warp_events": [ + { + "x": 9, + "y": 13, + "elevation": 0, + "dest_map": "MAP_CELADON_CITY", + "dest_warp_id": 0 + }, + { + "x": 10, + "y": 13, + "elevation": 0, + "dest_map": "MAP_CELADON_CITY", + "dest_warp_id": 0 + }, + { + "x": 11, + "y": 13, + "elevation": 0, + "dest_map": "MAP_CELADON_CITY", + "dest_warp_id": 0 + }, + { + "x": 15, + "y": 2, + "elevation": 3, + "dest_map": "MAP_ROCKET_HIDEOUT_B1F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "hidden_item", + "x": 2, + "y": 4, + "elevation": 3, + "item": "ITEM_NONE", + "flag": "51", + "unknown": 10 + }, + { + "type": "hidden_item", + "x": 3, + "y": 8, + "elevation": 3, + "item": "ITEM_NONE", + "flag": "52", + "unknown": 10 + }, + { + "type": "hidden_item", + "x": 2, + "y": 11, + "elevation": 3, + "item": "ITEM_NONE", + "flag": "53", + "unknown": 20 + }, + { + "type": "hidden_item", + "x": 6, + "y": 12, + "elevation": 3, + "item": "ITEM_NONE", + "flag": "54", + "unknown": 10 + }, + { + "type": "hidden_item", + "x": 9, + "y": 9, + "elevation": 3, + "item": "ITEM_NONE", + "flag": "55", + "unknown": 10 + }, + { + "type": "hidden_item", + "x": 8, + "y": 5, + "elevation": 3, + "item": "ITEM_NONE", + "flag": "56", + "unknown": 20 + }, + { + "type": "hidden_item", + "x": 10, + "y": 4, + "elevation": 3, + "item": "ITEM_NONE", + "flag": "57", + "unknown": 10 + }, + { + "type": "hidden_item", + "x": 13, + "y": 3, + "elevation": 3, + "item": "ITEM_NONE", + "flag": "58", + "unknown": 10 + }, + { + "type": "hidden_item", + "x": 15, + "y": 5, + "elevation": 3, + "item": "ITEM_NONE", + "flag": "59", + "unknown": 10 + }, + { + "type": "hidden_item", + "x": 17, + "y": 5, + "elevation": 3, + "item": "ITEM_NONE", + "flag": "60", + "unknown": 40 + }, + { + "type": "hidden_item", + "x": 15, + "y": 13, + "elevation": 3, + "item": "ITEM_NONE", + "flag": "61", + "unknown": 100 + }, + { + "type": "hidden_item", + "x": 12, + "y": 12, + "elevation": 3, + "item": "ITEM_NONE", + "flag": "62", + "unknown": 10 + }, + { + "type": "bg_event_type_4", + "x": 0, + "y": 7, + "elevation": 0, + "script": "CeladonCity_GameCorner_EventScript_16C95E" + }, + { + "type": "bg_event_type_4", + "x": 0, + "y": 9, + "elevation": 0, + "script": "CeladonCity_GameCorner_EventScript_16C9A4" + }, + { + "type": "bg_event_type_4", + "x": 0, + "y": 10, + "elevation": 0, + "script": "CeladonCity_GameCorner_EventScript_16C9B0" + }, + { + "type": "bg_event_type_3", + "x": 5, + "y": 6, + "elevation": 0, + "script": "CeladonCity_GameCorner_EventScript_16C9BC" + }, + { + "type": "bg_event_type_3", + "x": 5, + "y": 8, + "elevation": 0, + "script": "CeladonCity_GameCorner_EventScript_16CB5A" + }, + { + "type": "bg_event_type_3", + "x": 5, + "y": 9, + "elevation": 0, + "script": "CeladonCity_GameCorner_EventScript_16C9D4" + }, + { + "type": "bg_event_type_3", + "x": 5, + "y": 10, + "elevation": 0, + "script": "CeladonCity_GameCorner_EventScript_16C9E0" + }, + { + "type": "bg_event_type_4", + "x": 6, + "y": 6, + "elevation": 0, + "script": "CeladonCity_GameCorner_EventScript_16C9EC" + }, + { + "type": "bg_event_type_4", + "x": 6, + "y": 7, + "elevation": 0, + "script": "CeladonCity_GameCorner_EventScript_16C9F8" + }, + { + "type": "bg_event_type_4", + "x": 6, + "y": 9, + "elevation": 0, + "script": "CeladonCity_GameCorner_EventScript_16CA04" + }, + { + "type": "bg_event_type_3", + "x": 11, + "y": 6, + "elevation": 0, + "script": "CeladonCity_GameCorner_EventScript_16CA10" + }, + { + "type": "bg_event_type_3", + "x": 11, + "y": 7, + "elevation": 0, + "script": "CeladonCity_GameCorner_EventScript_16CA1C" + }, + { + "type": "bg_event_type_3", + "x": 11, + "y": 8, + "elevation": 0, + "script": "CeladonCity_GameCorner_EventScript_16CA28" + }, + { + "type": "bg_event_type_3", + "x": 11, + "y": 10, + "elevation": 0, + "script": "CeladonCity_GameCorner_EventScript_16CA34" + }, + { + "type": "bg_event_type_4", + "x": 12, + "y": 6, + "elevation": 0, + "script": "CeladonCity_GameCorner_EventScript_16CA40" + }, + { + "type": "bg_event_type_4", + "x": 12, + "y": 8, + "elevation": 0, + "script": "CeladonCity_GameCorner_EventScript_16CB63" + }, + { + "type": "bg_event_type_4", + "x": 12, + "y": 9, + "elevation": 0, + "script": "CeladonCity_GameCorner_EventScript_16CA58" + }, + { + "type": "bg_event_type_4", + "x": 12, + "y": 10, + "elevation": 0, + "script": "CeladonCity_GameCorner_EventScript_16CA64" + }, + { + "type": "bg_event_type_3", + "x": 17, + "y": 6, + "elevation": 0, + "script": "CeladonCity_GameCorner_EventScript_16CB6C" + }, + { + "type": "bg_event_type_3", + "x": 17, + "y": 7, + "elevation": 0, + "script": "CeladonCity_GameCorner_EventScript_16CA7C" + }, + { + "type": "bg_event_type_3", + "x": 17, + "y": 8, + "elevation": 0, + "script": "CeladonCity_GameCorner_EventScript_16CA88" + }, + { + "type": "bg_event_type_3", + "x": 17, + "y": 9, + "elevation": 0, + "script": "CeladonCity_GameCorner_EventScript_16CA94" + }, + { + "type": "bg_event_type_0", + "x": 11, + "y": 1, + "elevation": 0, + "script": "CeladonCity_GameCorner_EventScript_16CAAA" + }, + { + "type": "bg_event_type_3", + "x": 17, + "y": 13, + "elevation": 0, + "script": "CeladonCity_GameCorner_EventScript_1B2867" + } + ] +}
\ No newline at end of file diff --git a/data/maps/CeladonCity_GameCorner_PrizeRoom/events.inc b/data/maps/CeladonCity_GameCorner_PrizeRoom/events.inc deleted file mode 100644 index 21ec1b097..000000000 --- a/data/maps/CeladonCity_GameCorner_PrizeRoom/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -CeladonCity_GameCorner_PrizeRoom_EventObjects: - object_event 1, 30, 0, 2, 0, 6, 0, 3, 2, 17, 0, 0, 0, 0, 0, CeladonCity_GameCorner_PrizeRoom_EventScript_16CB76, 0, 0, 0 - object_event 2, 33, 0, 6, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, CeladonCity_GameCorner_PrizeRoom_EventScript_16CB7F, 0, 0, 0 - object_event 3, 47, 0, 4, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeladonCity_GameCorner_PrizeRoom_EventScript_16CB88, 0, 0, 0 - object_event 4, 47, 0, 6, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeladonCity_GameCorner_PrizeRoom_EventScript_16CE1D, 0, 0, 0 - object_event 5, 47, 0, 2, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeladonCity_GameCorner_PrizeRoom_EventScript_16CF88, 0, 0, 0 - -CeladonCity_GameCorner_PrizeRoom_MapWarps: - warp_def 3, 9, 0, 5, 774 - warp_def 4, 8, 3, 5, 774 - warp_def 5, 9, 0, 5, 774 - -CeladonCity_GameCorner_PrizeRoom_MapEvents:: - map_events CeladonCity_GameCorner_PrizeRoom_EventObjects, CeladonCity_GameCorner_PrizeRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/CeladonCity_GameCorner_PrizeRoom/header.inc b/data/maps/CeladonCity_GameCorner_PrizeRoom/header.inc deleted file mode 100644 index 4db3fedfb..000000000 --- a/data/maps/CeladonCity_GameCorner_PrizeRoom/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -CeladonCity_GameCorner_PrizeRoom:: @ 835138C - .4byte CeladonCity_GameCorner_PrizeRoom_Layout @ 0x831B12C - .4byte CeladonCity_GameCorner_PrizeRoom_MapEvents @ 0x83BBC1C - .4byte CeladonCity_GameCorner_PrizeRoom_MapScripts @ 0x816CB75 - .4byte NULL - .2byte BGM_FRLG_CELADON_CITY - .2byte 189 - .byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/CeladonCity_GameCorner_PrizeRoom/map.json b/data/maps/CeladonCity_GameCorner_PrizeRoom/map.json new file mode 100644 index 000000000..b9247574a --- /dev/null +++ b/data/maps/CeladonCity_GameCorner_PrizeRoom/map.json @@ -0,0 +1,107 @@ +{ + "id": "MAP_CELADON_CITY_GAME_CORNER_PRIZE_ROOM", + "name": "CeladonCity_GameCorner_PrizeRoom", + "layout": "LAYOUT_CELADON_CITY_GAME_CORNER_PRIZE_ROOM", + "music": "BGM_FRLG_CELADON_CITY", + "region_map_section": "MAPSEC_CELADON_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "30", + "x": 2, + "y": 6, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_GameCorner_PrizeRoom_EventScript_16CB76", + "flag": "0" + }, + { + "graphics_id": "33", + "x": 6, + "y": 7, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_GameCorner_PrizeRoom_EventScript_16CB7F", + "flag": "0" + }, + { + "graphics_id": "47", + "x": 4, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_GameCorner_PrizeRoom_EventScript_16CB88", + "flag": "0" + }, + { + "graphics_id": "47", + "x": 6, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_GameCorner_PrizeRoom_EventScript_16CE1D", + "flag": "0" + }, + { + "graphics_id": "47", + "x": 2, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_GameCorner_PrizeRoom_EventScript_16CF88", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 9, + "elevation": 0, + "dest_map": "MAP_CELADON_CITY", + "dest_warp_id": 5 + }, + { + "x": 4, + "y": 8, + "elevation": 3, + "dest_map": "MAP_CELADON_CITY", + "dest_warp_id": 5 + }, + { + "x": 5, + "y": 9, + "elevation": 0, + "dest_map": "MAP_CELADON_CITY", + "dest_warp_id": 5 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/CeladonCity_Gym/events.inc b/data/maps/CeladonCity_Gym/events.inc deleted file mode 100644 index d0ce2f383..000000000 --- a/data/maps/CeladonCity_Gym/events.inc +++ /dev/null @@ -1,24 +0,0 @@ -CeladonCity_Gym_EventObjects: - object_event 1, 22, 0, 3, 0, 11, 0, 3, 10, 17, 0, 1, 0, 3, 0, CeladonCity_Gym_EventScript_16D111, 0, 0, 0 - object_event 2, 29, 0, 9, 0, 10, 0, 3, 9, 17, 0, 1, 0, 3, 0, CeladonCity_Gym_EventScript_16D163, 0, 0, 0 - object_event 3, 40, 0, 10, 0, 7, 0, 3, 8, 17, 0, 1, 0, 2, 0, CeladonCity_Gym_EventScript_16D14C, 0, 0, 0 - object_event 4, 29, 0, 2, 0, 6, 0, 3, 8, 17, 0, 1, 0, 4, 0, CeladonCity_Gym_EventScript_16D17A, 0, 0, 0 - object_event 5, 29, 0, 5, 0, 4, 0, 3, 8, 17, 0, 1, 0, 3, 0, CeladonCity_Gym_EventScript_16D19E, 0, 0, 0 - object_event 6, 22, 0, 7, 0, 4, 0, 3, 8, 17, 0, 1, 0, 2, 0, CeladonCity_Gym_EventScript_16D128, 0, 0, 0 - object_event 7, 83, 0, 6, 0, 4, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeladonCity_Gym_EventScript_16D061, 0, 0, 0 - object_event 8, 42, 0, 8, 0, 7, 0, 3, 9, 17, 0, 1, 0, 2, 0, CeladonCity_Gym_EventScript_16D1B5, 0, 0, 0 - object_event 9, 95, 0, 6, 0, 8, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeladonCity_Gym_EventScript_1BDF13, 18, 0, 0 - object_event 10, 95, 0, 3, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeladonCity_Gym_EventScript_1BDF13, 19, 0, 0 - object_event 11, 95, 0, 9, 0, 6, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeladonCity_Gym_EventScript_1BDF13, 20, 0, 0 - -CeladonCity_Gym_MapWarps: - warp_def 5, 18, 3, 6, 774 - warp_def 6, 18, 3, 6, 774 - warp_def 7, 18, 3, 6, 774 - -CeladonCity_Gym_MapBGEvents: - bg_event 4, 16, 0, 0, 0, CeladonCity_Gym_EventScript_16D1CC - bg_event 8, 16, 0, 0, 0, CeladonCity_Gym_EventScript_16D1CC - -CeladonCity_Gym_MapEvents:: - map_events CeladonCity_Gym_EventObjects, CeladonCity_Gym_MapWarps, 0x0, CeladonCity_Gym_MapBGEvents diff --git a/data/maps/CeladonCity_Gym/header.inc b/data/maps/CeladonCity_Gym/header.inc deleted file mode 100644 index 59ca7c533..000000000 --- a/data/maps/CeladonCity_Gym/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -CeladonCity_Gym:: @ 83513A8 - .4byte CeladonCity_Gym_Layout @ 0x82D6370 - .4byte CeladonCity_Gym_MapEvents @ 0x83BBD68 - .4byte CeladonCity_Gym_MapScripts @ 0x816D060 - .4byte NULL - .2byte BGM_FRLG_GYM - .2byte 15 - .byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x01 diff --git a/data/maps/CeladonCity_Gym/map.json b/data/maps/CeladonCity_Gym/map.json new file mode 100644 index 000000000..ae83a1571 --- /dev/null +++ b/data/maps/CeladonCity_Gym/map.json @@ -0,0 +1,200 @@ +{ + "id": "MAP_CELADON_CITY_GYM", + "name": "CeladonCity_Gym", + "layout": "LAYOUT_CELADON_CITY_GYM", + "music": "BGM_FRLG_GYM", + "region_map_section": "MAPSEC_CELADON_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_1", + "connections": null, + "object_events": [ + { + "graphics_id": "22", + "x": 3, + "y": 11, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "CeladonCity_Gym_EventScript_16D111", + "flag": "0" + }, + { + "graphics_id": "29", + "x": 9, + "y": 10, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "CeladonCity_Gym_EventScript_16D163", + "flag": "0" + }, + { + "graphics_id": "40", + "x": 10, + "y": 7, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "CeladonCity_Gym_EventScript_16D14C", + "flag": "0" + }, + { + "graphics_id": "29", + "x": 2, + "y": 6, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "CeladonCity_Gym_EventScript_16D17A", + "flag": "0" + }, + { + "graphics_id": "29", + "x": 5, + "y": 4, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "CeladonCity_Gym_EventScript_16D19E", + "flag": "0" + }, + { + "graphics_id": "22", + "x": 7, + "y": 4, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "CeladonCity_Gym_EventScript_16D128", + "flag": "0" + }, + { + "graphics_id": "83", + "x": 6, + "y": 4, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_Gym_EventScript_16D061", + "flag": "0" + }, + { + "graphics_id": "42", + "x": 8, + "y": 7, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "CeladonCity_Gym_EventScript_16D1B5", + "flag": "0" + }, + { + "graphics_id": "95", + "x": 6, + "y": 8, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_Gym_EventScript_1BDF13", + "flag": "18" + }, + { + "graphics_id": "95", + "x": 3, + "y": 5, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_Gym_EventScript_1BDF13", + "flag": "19" + }, + { + "graphics_id": "95", + "x": 9, + "y": 6, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_Gym_EventScript_1BDF13", + "flag": "20" + } + ], + "warp_events": [ + { + "x": 5, + "y": 18, + "elevation": 3, + "dest_map": "MAP_CELADON_CITY", + "dest_warp_id": 6 + }, + { + "x": 6, + "y": 18, + "elevation": 3, + "dest_map": "MAP_CELADON_CITY", + "dest_warp_id": 6 + }, + { + "x": 7, + "y": 18, + "elevation": 3, + "dest_map": "MAP_CELADON_CITY", + "dest_warp_id": 6 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 4, + "y": 16, + "elevation": 0, + "script": "CeladonCity_Gym_EventScript_16D1CC" + }, + { + "type": "bg_event_type_0", + "x": 8, + "y": 16, + "elevation": 0, + "script": "CeladonCity_Gym_EventScript_16D1CC" + } + ] +}
\ No newline at end of file diff --git a/data/maps/CeladonCity_Hotel/events.inc b/data/maps/CeladonCity_Hotel/events.inc deleted file mode 100644 index f1b778a97..000000000 --- a/data/maps/CeladonCity_Hotel/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -CeladonCity_Hotel_EventObjects: - object_event 1, 35, 0, 5, 0, 4, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeladonCity_Hotel_EventScript_16D284, 0, 0, 0 - object_event 2, 29, 0, 3, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, CeladonCity_Hotel_EventScript_16D28D, 0, 0, 0 - object_event 3, 25, 0, 9, 0, 7, 0, 3, 5, 17, 0, 0, 0, 0, 0, CeladonCity_Hotel_EventScript_16D296, 0, 0, 0 - object_event 4, 16, 0, 2, 0, 6, 0, 3, 10, 17, 0, 0, 0, 0, 0, CeladonCity_Hotel_EventScript_16D29F, 0, 0, 0 - -CeladonCity_Hotel_MapWarps: - warp_def 3, 10, 0, 9, 774 - warp_def 4, 9, 0, 9, 774 - warp_def 5, 10, 0, 9, 774 - -CeladonCity_Hotel_MapEvents:: - map_events CeladonCity_Hotel_EventObjects, CeladonCity_Hotel_MapWarps, 0x0, 0x0 diff --git a/data/maps/CeladonCity_Hotel/header.inc b/data/maps/CeladonCity_Hotel/header.inc deleted file mode 100644 index b9aecb9a8..000000000 --- a/data/maps/CeladonCity_Hotel/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -CeladonCity_Hotel:: @ 83513FC - .4byte CeladonCity_Hotel_Layout @ 0x831B438 - .4byte CeladonCity_Hotel_MapEvents @ 0x83BBF0C - .4byte CeladonCity_Hotel_MapScripts @ 0x816D283 - .4byte NULL - .2byte BGM_FRLG_CELADON_CITY - .2byte 191 - .byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/CeladonCity_Hotel/map.json b/data/maps/CeladonCity_Hotel/map.json new file mode 100644 index 000000000..85d79e8bc --- /dev/null +++ b/data/maps/CeladonCity_Hotel/map.json @@ -0,0 +1,94 @@ +{ + "id": "MAP_CELADON_CITY_HOTEL", + "name": "CeladonCity_Hotel", + "layout": "LAYOUT_CELADON_CITY_HOTEL", + "music": "BGM_FRLG_CELADON_CITY", + "region_map_section": "MAPSEC_CELADON_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "35", + "x": 5, + "y": 4, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_Hotel_EventScript_16D284", + "flag": "0" + }, + { + "graphics_id": "29", + "x": 3, + "y": 6, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_Hotel_EventScript_16D28D", + "flag": "0" + }, + { + "graphics_id": "25", + "x": 9, + "y": 7, + "elevation": 3, + "movement_type": "5", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_Hotel_EventScript_16D296", + "flag": "0" + }, + { + "graphics_id": "16", + "x": 2, + "y": 6, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_Hotel_EventScript_16D29F", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 10, + "elevation": 0, + "dest_map": "MAP_CELADON_CITY", + "dest_warp_id": 9 + }, + { + "x": 4, + "y": 9, + "elevation": 0, + "dest_map": "MAP_CELADON_CITY", + "dest_warp_id": 9 + }, + { + "x": 5, + "y": 10, + "elevation": 0, + "dest_map": "MAP_CELADON_CITY", + "dest_warp_id": 9 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/CeladonCity_House1/events.inc b/data/maps/CeladonCity_House1/events.inc deleted file mode 100644 index 16b10fbfe..000000000 --- a/data/maps/CeladonCity_House1/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -CeladonCity_House1_EventObjects: - object_event 1, 33, 0, 5, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeladonCity_House1_EventScript_16D268, 0, 0, 0 - object_event 2, 49, 0, 2, 0, 4, 0, 3, 3, 81, 0, 0, 0, 0, 0, CeladonCity_House1_EventScript_16D271, 0, 0, 0 - object_event 3, 49, 0, 8, 0, 4, 0, 3, 3, 81, 0, 0, 0, 0, 0, CeladonCity_House1_EventScript_16D27A, 0, 0, 0 - -CeladonCity_House1_MapWarps: - warp_def 3, 7, 3, 8, 774 - warp_def 4, 7, 3, 8, 774 - warp_def 5, 7, 3, 8, 774 - -CeladonCity_House1_MapEvents:: - map_events CeladonCity_House1_EventObjects, CeladonCity_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/CeladonCity_House1/header.inc b/data/maps/CeladonCity_House1/header.inc deleted file mode 100644 index 6b0b740f1..000000000 --- a/data/maps/CeladonCity_House1/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -CeladonCity_House1:: @ 83513E0 - .4byte House5_Layout @ 0x82D6AF0 - .4byte CeladonCity_House1_MapEvents @ 0x83BBE80 - .4byte CeladonCity_House1_MapScripts @ 0x816D267 - .4byte NULL - .2byte BGM_FRLG_CELADON_CITY - .2byte 21 - .byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/CeladonCity_House1/map.json b/data/maps/CeladonCity_House1/map.json new file mode 100644 index 000000000..58d6ee590 --- /dev/null +++ b/data/maps/CeladonCity_House1/map.json @@ -0,0 +1,81 @@ +{ + "id": "MAP_CELADON_CITY_HOUSE1", + "name": "CeladonCity_House1", + "layout": "LAYOUT_HOUSE5", + "music": "BGM_FRLG_CELADON_CITY", + "region_map_section": "MAPSEC_CELADON_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "33", + "x": 5, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_House1_EventScript_16D268", + "flag": "0" + }, + { + "graphics_id": "49", + "x": 2, + "y": 4, + "elevation": 3, + "movement_type": "3", + "movement_range_x": 1, + "movement_range_y": 5, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_House1_EventScript_16D271", + "flag": "0" + }, + { + "graphics_id": "49", + "x": 8, + "y": 4, + "elevation": 3, + "movement_type": "3", + "movement_range_x": 1, + "movement_range_y": 5, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_House1_EventScript_16D27A", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 3, + "dest_map": "MAP_CELADON_CITY", + "dest_warp_id": 8 + }, + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_CELADON_CITY", + "dest_warp_id": 8 + }, + { + "x": 5, + "y": 7, + "elevation": 3, + "dest_map": "MAP_CELADON_CITY", + "dest_warp_id": 8 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/CeladonCity_PokemonCenter_1F/events.inc b/data/maps/CeladonCity_PokemonCenter_1F/events.inc deleted file mode 100644 index 5817e704e..000000000 --- a/data/maps/CeladonCity_PokemonCenter_1F/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -CeladonCity_PokemonCenter_1F_EventObjects: - object_event 1, 64, 0, 7, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeladonCity_PokemonCenter_1F_EventScript_16C5FB, 0, 0, 0 - object_event 2, 61, 0, 4, 0, 4, 0, 3, 1, 17, 0, 0, 0, 0, 0, CeladonCity_PokemonCenter_1F_EventScript_16C604, 0, 0, 0 - object_event 3, 42, 0, 10, 0, 6, 0, 3, 5, 18, 0, 0, 0, 0, 0, CeladonCity_PokemonCenter_1F_EventScript_16C60D, 0, 0, 0 - object_event 4, 18, 0, 12, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeladonCity_PokemonCenter_1F_EventScript_16C616, 0, 0, 0 - -CeladonCity_PokemonCenter_1F_MapWarps: - warp_def 6, 8, 3, 4, 774 - warp_def 7, 8, 3, 4, 774 - warp_def 8, 8, 3, 4, 774 - warp_def 1, 6, 4, 0, 2573 - -CeladonCity_PokemonCenter_1F_MapEvents:: - map_events CeladonCity_PokemonCenter_1F_EventObjects, CeladonCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/CeladonCity_PokemonCenter_1F/header.inc b/data/maps/CeladonCity_PokemonCenter_1F/header.inc deleted file mode 100644 index 5875a816d..000000000 --- a/data/maps/CeladonCity_PokemonCenter_1F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -CeladonCity_PokemonCenter_1F:: @ 8351338 - .4byte PokemonCenter_1F_Layout @ 0x82D5990 - .4byte CeladonCity_PokemonCenter_1F_MapEvents @ 0x83BB800 - .4byte CeladonCity_PokemonCenter_1F_MapScripts @ 0x816C5EC - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 8 - .byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/CeladonCity_PokemonCenter_1F/map.json b/data/maps/CeladonCity_PokemonCenter_1F/map.json new file mode 100644 index 000000000..717206847 --- /dev/null +++ b/data/maps/CeladonCity_PokemonCenter_1F/map.json @@ -0,0 +1,101 @@ +{ + "id": "MAP_CELADON_CITY_POKEMON_CENTER_1F", + "name": "CeladonCity_PokemonCenter_1F", + "layout": "LAYOUT_POKEMON_CENTER_1F", + "music": "BGM_FRLG_POKEMON_CENTER", + "region_map_section": "MAPSEC_CELADON_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "64", + "x": 7, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_PokemonCenter_1F_EventScript_16C5FB", + "flag": "0" + }, + { + "graphics_id": "61", + "x": 4, + "y": 4, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_PokemonCenter_1F_EventScript_16C604", + "flag": "0" + }, + { + "graphics_id": "42", + "x": 10, + "y": 6, + "elevation": 3, + "movement_type": "5", + "movement_range_x": 2, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_PokemonCenter_1F_EventScript_16C60D", + "flag": "0" + }, + { + "graphics_id": "18", + "x": 12, + "y": 5, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_PokemonCenter_1F_EventScript_16C616", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 6, + "y": 8, + "elevation": 3, + "dest_map": "MAP_CELADON_CITY", + "dest_warp_id": 4 + }, + { + "x": 7, + "y": 8, + "elevation": 3, + "dest_map": "MAP_CELADON_CITY", + "dest_warp_id": 4 + }, + { + "x": 8, + "y": 8, + "elevation": 3, + "dest_map": "MAP_CELADON_CITY", + "dest_warp_id": 4 + }, + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_CELADON_CITY_POKEMON_CENTER_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/CeladonCity_PokemonCenter_2F/events.inc b/data/maps/CeladonCity_PokemonCenter_2F/events.inc deleted file mode 100644 index 9bed66116..000000000 --- a/data/maps/CeladonCity_PokemonCenter_2F/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -CeladonCity_PokemonCenter_2F_EventObjects: - object_event 1, 65, 0, 6, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, CeladonCity_PokemonCenter_2F_EventScript_1A8CF6, 0, 0, 0 - object_event 2, 65, 0, 2, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, CeladonCity_PokemonCenter_2F_EventScript_1A8CFC, 0, 0, 0 - object_event 3, 65, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, CeladonCity_PokemonCenter_2F_EventScript_1A8D02, 0, 0, 0 - object_event 4, 69, 0, 1, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeladonCity_PokemonCenter_2F_EventScript_1BB1D2, 112, 0, 0 - -CeladonCity_PokemonCenter_2F_MapWarps: - warp_def 1, 6, 4, 3, 2572 - warp_def 5, 1, 0, 0, 4 - warp_def 9, 1, 0, 0, 1 - -CeladonCity_PokemonCenter_2F_MapEvents:: - map_events CeladonCity_PokemonCenter_2F_EventObjects, CeladonCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/CeladonCity_PokemonCenter_2F/header.inc b/data/maps/CeladonCity_PokemonCenter_2F/header.inc deleted file mode 100644 index 217db66f2..000000000 --- a/data/maps/CeladonCity_PokemonCenter_2F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -CeladonCity_PokemonCenter_2F:: @ 8351354 - .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 - .4byte CeladonCity_PokemonCenter_2F_MapEvents @ 0x83BB88C - .4byte CeladonCity_PokemonCenter_2F_MapScripts @ 0x816C61F - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 9 - .byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/CeladonCity_PokemonCenter_2F/map.json b/data/maps/CeladonCity_PokemonCenter_2F/map.json new file mode 100644 index 000000000..89358eaa6 --- /dev/null +++ b/data/maps/CeladonCity_PokemonCenter_2F/map.json @@ -0,0 +1,94 @@ +{ + "id": "MAP_CELADON_CITY_POKEMON_CENTER_2F", + "name": "CeladonCity_PokemonCenter_2F", + "layout": "LAYOUT_POKEMON_CENTER_2F", + "music": "BGM_FRLG_POKEMON_CENTER", + "region_map_section": "MAPSEC_CELADON_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "65", + "x": 6, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_PokemonCenter_2F_EventScript_1A8CF6", + "flag": "0" + }, + { + "graphics_id": "65", + "x": 2, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_PokemonCenter_2F_EventScript_1A8CFC", + "flag": "0" + }, + { + "graphics_id": "65", + "x": 10, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_PokemonCenter_2F_EventScript_1A8D02", + "flag": "0" + }, + { + "graphics_id": "69", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_PokemonCenter_2F_EventScript_1BB1D2", + "flag": "112" + } + ], + "warp_events": [ + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_CELADON_CITY_POKEMON_CENTER_1F", + "dest_warp_id": 3 + }, + { + "x": 5, + "y": 1, + "elevation": 0, + "dest_map": "MAP_UNKNOWN_MAP_00_04", + "dest_warp_id": 0 + }, + { + "x": 9, + "y": 1, + "elevation": 0, + "dest_map": "MAP_UNKNOWN_MAP_00_01", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/CeladonCity_Restaurant/events.inc b/data/maps/CeladonCity_Restaurant/events.inc deleted file mode 100644 index 02a232d32..000000000 --- a/data/maps/CeladonCity_Restaurant/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -CeladonCity_Restaurant_EventObjects: - object_event 1, 59, 0, 12, 0, 7, 0, 3, 5, 18, 0, 0, 0, 0, 0, CeladonCity_Restaurant_EventScript_16D1EB, 0, 0, 0 - object_event 2, 28, 0, 11, 0, 4, 0, 3, 3, 33, 0, 0, 0, 0, 0, CeladonCity_Restaurant_EventScript_16D1F4, 0, 0, 0 - object_event 3, 27, 0, 9, 0, 4, 0, 3, 10, 17, 0, 0, 0, 0, 0, CeladonCity_Restaurant_EventScript_16D25E, 0, 0, 0 - object_event 4, 30, 0, 1, 0, 2, 0, 0, 8, 17, 0, 0, 0, 0, 0, CeladonCity_Restaurant_EventScript_16D1FD, 0, 0, 0 - object_event 5, 47, 0, 3, 0, 7, 0, 0, 9, 17, 0, 0, 0, 0, 0, CeladonCity_Restaurant_EventScript_16D255, 0, 0, 0 - -CeladonCity_Restaurant_MapWarps: - warp_def 5, 9, 0, 7, 774 - warp_def 6, 9, 0, 7, 774 - warp_def 7, 9, 0, 7, 774 - -CeladonCity_Restaurant_MapEvents:: - map_events CeladonCity_Restaurant_EventObjects, CeladonCity_Restaurant_MapWarps, 0x0, 0x0 diff --git a/data/maps/CeladonCity_Restaurant/header.inc b/data/maps/CeladonCity_Restaurant/header.inc deleted file mode 100644 index 2bd3f3867..000000000 --- a/data/maps/CeladonCity_Restaurant/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -CeladonCity_Restaurant:: @ 83513C4 - .4byte CeladonCity_Restaurant_Layout @ 0x831B29C - .4byte CeladonCity_Restaurant_MapEvents @ 0x83BBE0C - .4byte CeladonCity_Restaurant_MapScripts @ 0x816D1EA - .4byte NULL - .2byte BGM_FRLG_CELADON_CITY - .2byte 190 - .byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/CeladonCity_Restaurant/map.json b/data/maps/CeladonCity_Restaurant/map.json new file mode 100644 index 000000000..284856350 --- /dev/null +++ b/data/maps/CeladonCity_Restaurant/map.json @@ -0,0 +1,107 @@ +{ + "id": "MAP_CELADON_CITY_RESTAURANT", + "name": "CeladonCity_Restaurant", + "layout": "LAYOUT_CELADON_CITY_RESTAURANT", + "music": "BGM_FRLG_CELADON_CITY", + "region_map_section": "MAPSEC_CELADON_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "59", + "x": 12, + "y": 7, + "elevation": 3, + "movement_type": "5", + "movement_range_x": 2, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_Restaurant_EventScript_16D1EB", + "flag": "0" + }, + { + "graphics_id": "28", + "x": 11, + "y": 4, + "elevation": 3, + "movement_type": "3", + "movement_range_x": 1, + "movement_range_y": 2, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_Restaurant_EventScript_16D1F4", + "flag": "0" + }, + { + "graphics_id": "27", + "x": 9, + "y": 4, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_Restaurant_EventScript_16D25E", + "flag": "0" + }, + { + "graphics_id": "30", + "x": 1, + "y": 2, + "elevation": 0, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_Restaurant_EventScript_16D1FD", + "flag": "0" + }, + { + "graphics_id": "47", + "x": 3, + "y": 7, + "elevation": 0, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_Restaurant_EventScript_16D255", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 5, + "y": 9, + "elevation": 0, + "dest_map": "MAP_CELADON_CITY", + "dest_warp_id": 7 + }, + { + "x": 6, + "y": 9, + "elevation": 0, + "dest_map": "MAP_CELADON_CITY", + "dest_warp_id": 7 + }, + { + "x": 7, + "y": 9, + "elevation": 0, + "dest_map": "MAP_CELADON_CITY", + "dest_warp_id": 7 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/CeruleanCave_1F/events.inc b/data/maps/CeruleanCave_1F/events.inc deleted file mode 100644 index 82c1c55e7..000000000 --- a/data/maps/CeruleanCave_1F/events.inc +++ /dev/null @@ -1,26 +0,0 @@ -CeruleanCave_1F_EventObjects: - object_event 1, 92, 0, 7, 0, 3, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeruleanCave_1F_EventScript_1BEA47, 434, 0, 0 - object_event 2, 92, 0, 11, 0, 16, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeruleanCave_1F_EventScript_1BEA54, 435, 0, 0 - object_event 3, 92, 0, 25, 0, 5, 0, 4, 8, 17, 0, 0, 0, 0, 0, CeruleanCave_1F_EventScript_1BEA3A, 433, 0, 0 - object_event 4, 96, 0, 7, 0, 21, 0, 3, 1, 17, 0, 0, 0, 0, 0, CeruleanCave_1F_EventScript_1BE00C, 18, 0, 0 - object_event 5, 96, 0, 13, 0, 21, 0, 3, 1, 17, 0, 0, 0, 0, 0, CeruleanCave_1F_EventScript_1BE00C, 19, 0, 0 - object_event 6, 96, 0, 5, 0, 20, 0, 3, 1, 17, 0, 0, 0, 0, 0, CeruleanCave_1F_EventScript_1BE00C, 20, 0, 0 - object_event 7, 96, 0, 14, 0, 20, 0, 3, 1, 17, 0, 0, 0, 0, 0, CeruleanCave_1F_EventScript_1BE00C, 21, 0, 0 - object_event 8, 96, 0, 11, 0, 21, 0, 3, 1, 17, 0, 0, 0, 0, 0, CeruleanCave_1F_EventScript_1BE00C, 22, 0, 0 - object_event 9, 96, 0, 9, 0, 18, 0, 3, 1, 17, 0, 0, 0, 0, 0, CeruleanCave_1F_EventScript_1BE00C, 23, 0, 0 - -CeruleanCave_1F_MapWarps: - warp_def 33, 21, 3, 7, 771 - warp_def 34, 2, 3, 0, 329 - warp_def 1, 7, 3, 0, 330 - warp_def 10, 2, 3, 1, 329 - warp_def 5, 15, 3, 2, 329 - warp_def 30, 10, 4, 3, 329 - warp_def 24, 11, 3, 4, 329 - warp_def 2, 4, 3, 5, 329 - -CeruleanCave_1F_MapBGEvents: - bg_event 12, 2, 3, 7, 0, 2, 39, 1 - -CeruleanCave_1F_MapEvents:: - map_events CeruleanCave_1F_EventObjects, CeruleanCave_1F_MapWarps, 0x0, CeruleanCave_1F_MapBGEvents diff --git a/data/maps/CeruleanCave_1F/header.inc b/data/maps/CeruleanCave_1F/header.inc deleted file mode 100644 index 9bedd6dd6..000000000 --- a/data/maps/CeruleanCave_1F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -CeruleanCave_1F:: @ 834F9F4 - .4byte CeruleanCave_1F_Layout @ 0x8311318 - .4byte CeruleanCave_1F_MapEvents @ 0x83B15BC - .4byte CeruleanCave_1F_MapScripts @ 0x81624B3 - .4byte NULL - .2byte BGM_FRLG_ROCKET_HIDEOUT - .2byte 151 - .byte 0x8d, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/CeruleanCave_1F/map.json b/data/maps/CeruleanCave_1F/map.json new file mode 100644 index 000000000..36bd0b680 --- /dev/null +++ b/data/maps/CeruleanCave_1F/map.json @@ -0,0 +1,204 @@ +{ + "id": "MAP_CERULEAN_CAVE_1F", + "name": "CeruleanCave_1F", + "layout": "LAYOUT_CERULEAN_CAVE_1F", + "music": "BGM_FRLG_ROCKET_HIDEOUT", + "region_map_section": "MAPSEC_CERULEAN_CAVE", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "92", + "x": 7, + "y": 3, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCave_1F_EventScript_1BEA47", + "flag": "434" + }, + { + "graphics_id": "92", + "x": 11, + "y": 16, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCave_1F_EventScript_1BEA54", + "flag": "435" + }, + { + "graphics_id": "92", + "x": 25, + "y": 5, + "elevation": 4, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCave_1F_EventScript_1BEA3A", + "flag": "433" + }, + { + "graphics_id": "96", + "x": 7, + "y": 21, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCave_1F_EventScript_1BE00C", + "flag": "18" + }, + { + "graphics_id": "96", + "x": 13, + "y": 21, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCave_1F_EventScript_1BE00C", + "flag": "19" + }, + { + "graphics_id": "96", + "x": 5, + "y": 20, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCave_1F_EventScript_1BE00C", + "flag": "20" + }, + { + "graphics_id": "96", + "x": 14, + "y": 20, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCave_1F_EventScript_1BE00C", + "flag": "21" + }, + { + "graphics_id": "96", + "x": 11, + "y": 21, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCave_1F_EventScript_1BE00C", + "flag": "22" + }, + { + "graphics_id": "96", + "x": 9, + "y": 18, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCave_1F_EventScript_1BE00C", + "flag": "23" + } + ], + "warp_events": [ + { + "x": 33, + "y": 21, + "elevation": 3, + "dest_map": "MAP_CERULEAN_CITY", + "dest_warp_id": 7 + }, + { + "x": 34, + "y": 2, + "elevation": 3, + "dest_map": "MAP_CERULEAN_CAVE_2F", + "dest_warp_id": 0 + }, + { + "x": 1, + "y": 7, + "elevation": 3, + "dest_map": "MAP_CERULEAN_CAVE_B1F", + "dest_warp_id": 0 + }, + { + "x": 10, + "y": 2, + "elevation": 3, + "dest_map": "MAP_CERULEAN_CAVE_2F", + "dest_warp_id": 1 + }, + { + "x": 5, + "y": 15, + "elevation": 3, + "dest_map": "MAP_CERULEAN_CAVE_2F", + "dest_warp_id": 2 + }, + { + "x": 30, + "y": 10, + "elevation": 4, + "dest_map": "MAP_CERULEAN_CAVE_2F", + "dest_warp_id": 3 + }, + { + "x": 24, + "y": 11, + "elevation": 3, + "dest_map": "MAP_CERULEAN_CAVE_2F", + "dest_warp_id": 4 + }, + { + "x": 2, + "y": 4, + "elevation": 3, + "dest_map": "MAP_CERULEAN_CAVE_2F", + "dest_warp_id": 5 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "hidden_item", + "x": 12, + "y": 2, + "elevation": 3, + "item": "POCKET_KEY_ITEMS", + "flag": "39", + "unknown": 1 + } + ] +}
\ No newline at end of file diff --git a/data/maps/CeruleanCave_2F/events.inc b/data/maps/CeruleanCave_2F/events.inc deleted file mode 100644 index c1218da0a..000000000 --- a/data/maps/CeruleanCave_2F/events.inc +++ /dev/null @@ -1,25 +0,0 @@ -CeruleanCave_2F_EventObjects: - object_event 1, 92, 0, 9, 0, 18, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeruleanCave_2F_EventScript_1BEA6E, 437, 0, 0 - object_event 2, 92, 0, 29, 0, 16, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeruleanCave_2F_EventScript_1BEA7B, 438, 0, 0 - object_event 3, 92, 0, 33, 0, 12, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeruleanCave_2F_EventScript_1BEA61, 436, 0, 0 - object_event 4, 96, 0, 33, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, CeruleanCave_2F_EventScript_1BE00C, 18, 0, 0 - object_event 5, 96, 0, 33, 0, 9, 0, 3, 1, 17, 0, 0, 0, 0, 0, CeruleanCave_2F_EventScript_1BE00C, 19, 0, 0 - object_event 6, 96, 0, 25, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, CeruleanCave_2F_EventScript_1BE00C, 20, 0, 0 - object_event 7, 96, 0, 28, 0, 20, 0, 3, 1, 17, 0, 0, 0, 0, 0, CeruleanCave_2F_EventScript_1BE00C, 21, 0, 0 - object_event 8, 96, 0, 30, 0, 20, 0, 3, 1, 17, 0, 0, 0, 0, 0, CeruleanCave_2F_EventScript_1BE00C, 22, 0, 0 - object_event 9, 96, 0, 9, 0, 13, 0, 3, 1, 17, 0, 0, 0, 0, 0, CeruleanCave_2F_EventScript_1BE00C, 23, 0, 0 - object_event 10, 96, 0, 23, 0, 16, 0, 3, 1, 17, 0, 0, 0, 0, 0, CeruleanCave_2F_EventScript_1BE00C, 24, 0, 0 - object_event 11, 96, 0, 13, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, CeruleanCave_2F_EventScript_1BE00C, 25, 0, 0 - object_event 12, 96, 0, 4, 0, 12, 0, 3, 1, 17, 0, 0, 0, 0, 0, CeruleanCave_2F_EventScript_1BE00C, 26, 0, 0 - object_event 13, 96, 0, 10, 0, 20, 0, 3, 1, 17, 0, 0, 0, 0, 0, CeruleanCave_2F_EventScript_1BE00C, 27, 0, 0 - -CeruleanCave_2F_MapWarps: - warp_def 33, 4, 3, 1, 328 - warp_def 13, 4, 3, 3, 328 - warp_def 7, 14, 3, 4, 328 - warp_def 26, 9, 3, 5, 328 - warp_def 23, 10, 3, 6, 328 - warp_def 5, 6, 3, 7, 328 - -CeruleanCave_2F_MapEvents:: - map_events CeruleanCave_2F_EventObjects, CeruleanCave_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/CeruleanCave_2F/header.inc b/data/maps/CeruleanCave_2F/header.inc deleted file mode 100644 index 37e25ef1b..000000000 --- a/data/maps/CeruleanCave_2F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -CeruleanCave_2F:: @ 834FA10 - .4byte CeruleanCave_2F_Layout @ 0x8311A6C - .4byte CeruleanCave_2F_MapEvents @ 0x83B1738 - .4byte CeruleanCave_2F_MapScripts @ 0x81624BD - .4byte NULL - .2byte BGM_FRLG_ROCKET_HIDEOUT - .2byte 152 - .byte 0x8d, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/CeruleanCave_2F/map.json b/data/maps/CeruleanCave_2F/map.json new file mode 100644 index 000000000..061e13cc3 --- /dev/null +++ b/data/maps/CeruleanCave_2F/map.json @@ -0,0 +1,232 @@ +{ + "id": "MAP_CERULEAN_CAVE_2F", + "name": "CeruleanCave_2F", + "layout": "LAYOUT_CERULEAN_CAVE_2F", + "music": "BGM_FRLG_ROCKET_HIDEOUT", + "region_map_section": "MAPSEC_CERULEAN_CAVE", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "92", + "x": 9, + "y": 18, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCave_2F_EventScript_1BEA6E", + "flag": "437" + }, + { + "graphics_id": "92", + "x": 29, + "y": 16, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCave_2F_EventScript_1BEA7B", + "flag": "438" + }, + { + "graphics_id": "92", + "x": 33, + "y": 12, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCave_2F_EventScript_1BEA61", + "flag": "436" + }, + { + "graphics_id": "96", + "x": 33, + "y": 10, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCave_2F_EventScript_1BE00C", + "flag": "18" + }, + { + "graphics_id": "96", + "x": 33, + "y": 9, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCave_2F_EventScript_1BE00C", + "flag": "19" + }, + { + "graphics_id": "96", + "x": 25, + "y": 11, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCave_2F_EventScript_1BE00C", + "flag": "20" + }, + { + "graphics_id": "96", + "x": 28, + "y": 20, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCave_2F_EventScript_1BE00C", + "flag": "21" + }, + { + "graphics_id": "96", + "x": 30, + "y": 20, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCave_2F_EventScript_1BE00C", + "flag": "22" + }, + { + "graphics_id": "96", + "x": 9, + "y": 13, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCave_2F_EventScript_1BE00C", + "flag": "23" + }, + { + "graphics_id": "96", + "x": 23, + "y": 16, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCave_2F_EventScript_1BE00C", + "flag": "24" + }, + { + "graphics_id": "96", + "x": 13, + "y": 6, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCave_2F_EventScript_1BE00C", + "flag": "25" + }, + { + "graphics_id": "96", + "x": 4, + "y": 12, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCave_2F_EventScript_1BE00C", + "flag": "26" + }, + { + "graphics_id": "96", + "x": 10, + "y": 20, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCave_2F_EventScript_1BE00C", + "flag": "27" + } + ], + "warp_events": [ + { + "x": 33, + "y": 4, + "elevation": 3, + "dest_map": "MAP_CERULEAN_CAVE_1F", + "dest_warp_id": 1 + }, + { + "x": 13, + "y": 4, + "elevation": 3, + "dest_map": "MAP_CERULEAN_CAVE_1F", + "dest_warp_id": 3 + }, + { + "x": 7, + "y": 14, + "elevation": 3, + "dest_map": "MAP_CERULEAN_CAVE_1F", + "dest_warp_id": 4 + }, + { + "x": 26, + "y": 9, + "elevation": 3, + "dest_map": "MAP_CERULEAN_CAVE_1F", + "dest_warp_id": 5 + }, + { + "x": 23, + "y": 10, + "elevation": 3, + "dest_map": "MAP_CERULEAN_CAVE_1F", + "dest_warp_id": 6 + }, + { + "x": 5, + "y": 6, + "elevation": 3, + "dest_map": "MAP_CERULEAN_CAVE_1F", + "dest_warp_id": 7 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/CeruleanCave_B1F/events.inc b/data/maps/CeruleanCave_B1F/events.inc deleted file mode 100644 index 0febe9996..000000000 --- a/data/maps/CeruleanCave_B1F/events.inc +++ /dev/null @@ -1,19 +0,0 @@ -CeruleanCave_B1F_EventObjects: - object_event 1, 92, 0, 31, 0, 9, 0, 4, 8, 17, 0, 0, 0, 0, 0, CeruleanCave_B1F_EventScript_1BEA95, 440, 0, 0 - object_event 2, 92, 0, 32, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeruleanCave_B1F_EventScript_1BEA88, 439, 0, 0 - object_event 3, 139, 0, 7, 0, 12, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeruleanCave_B1F_EventScript_1624F5, 129, 0, 0 - object_event 4, 96, 0, 37, 0, 1, 0, 3, 1, 17, 0, 0, 0, 0, 0, CeruleanCave_B1F_EventScript_1BE00C, 18, 0, 0 - object_event 5, 96, 0, 38, 0, 2, 0, 3, 1, 17, 0, 0, 0, 0, 0, CeruleanCave_B1F_EventScript_1BE00C, 19, 0, 0 - object_event 6, 96, 0, 35, 0, 1, 0, 3, 1, 17, 0, 0, 0, 0, 0, CeruleanCave_B1F_EventScript_1BE00C, 20, 0, 0 - object_event 7, 96, 0, 37, 0, 4, 0, 3, 1, 17, 0, 0, 0, 0, 0, CeruleanCave_B1F_EventScript_1BE00C, 21, 0, 0 - object_event 8, 96, 0, 35, 0, 5, 0, 3, 1, 17, 0, 0, 0, 0, 0, CeruleanCave_B1F_EventScript_1BE00C, 22, 0, 0 - object_event 9, 96, 0, 2, 0, 2, 0, 3, 1, 17, 0, 0, 0, 0, 0, CeruleanCave_B1F_EventScript_1BE00C, 23, 0, 0 - object_event 10, 96, 0, 4, 0, 1, 0, 3, 1, 17, 0, 0, 0, 0, 0, CeruleanCave_B1F_EventScript_1BE00C, 24, 0, 0 - object_event 11, 96, 0, 6, 0, 1, 0, 3, 1, 17, 0, 0, 0, 0, 0, CeruleanCave_B1F_EventScript_1BE00C, 25, 0, 0 - object_event 12, 96, 0, 3, 0, 4, 0, 3, 1, 17, 0, 0, 0, 0, 0, CeruleanCave_B1F_EventScript_1BE00C, 26, 0, 0 - -CeruleanCave_B1F_MapWarps: - warp_def 5, 7, 3, 2, 328 - -CeruleanCave_B1F_MapEvents:: - map_events CeruleanCave_B1F_EventObjects, CeruleanCave_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/CeruleanCave_B1F/header.inc b/data/maps/CeruleanCave_B1F/header.inc deleted file mode 100644 index 88608f654..000000000 --- a/data/maps/CeruleanCave_B1F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -CeruleanCave_B1F:: @ 834FA2C - .4byte CeruleanCave_B1F_Layout @ 0x83121C0 - .4byte CeruleanCave_B1F_MapEvents @ 0x83B1874 - .4byte CeruleanCave_B1F_MapScripts @ 0x81624BE - .4byte NULL - .2byte BGM_FRLG_ROCKET_HIDEOUT - .2byte 153 - .byte 0x8d, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/CeruleanCave_B1F/map.json b/data/maps/CeruleanCave_B1F/map.json new file mode 100644 index 000000000..44447c387 --- /dev/null +++ b/data/maps/CeruleanCave_B1F/map.json @@ -0,0 +1,184 @@ +{ + "id": "MAP_CERULEAN_CAVE_B1F", + "name": "CeruleanCave_B1F", + "layout": "LAYOUT_CERULEAN_CAVE_B1F", + "music": "BGM_FRLG_ROCKET_HIDEOUT", + "region_map_section": "MAPSEC_CERULEAN_CAVE", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "92", + "x": 31, + "y": 9, + "elevation": 4, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCave_B1F_EventScript_1BEA95", + "flag": "440" + }, + { + "graphics_id": "92", + "x": 32, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCave_B1F_EventScript_1BEA88", + "flag": "439" + }, + { + "graphics_id": "139", + "x": 7, + "y": 12, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCave_B1F_EventScript_1624F5", + "flag": "129" + }, + { + "graphics_id": "96", + "x": 37, + "y": 1, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCave_B1F_EventScript_1BE00C", + "flag": "18" + }, + { + "graphics_id": "96", + "x": 38, + "y": 2, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCave_B1F_EventScript_1BE00C", + "flag": "19" + }, + { + "graphics_id": "96", + "x": 35, + "y": 1, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCave_B1F_EventScript_1BE00C", + "flag": "20" + }, + { + "graphics_id": "96", + "x": 37, + "y": 4, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCave_B1F_EventScript_1BE00C", + "flag": "21" + }, + { + "graphics_id": "96", + "x": 35, + "y": 5, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCave_B1F_EventScript_1BE00C", + "flag": "22" + }, + { + "graphics_id": "96", + "x": 2, + "y": 2, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCave_B1F_EventScript_1BE00C", + "flag": "23" + }, + { + "graphics_id": "96", + "x": 4, + "y": 1, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCave_B1F_EventScript_1BE00C", + "flag": "24" + }, + { + "graphics_id": "96", + "x": 6, + "y": 1, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCave_B1F_EventScript_1BE00C", + "flag": "25" + }, + { + "graphics_id": "96", + "x": 3, + "y": 4, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCave_B1F_EventScript_1BE00C", + "flag": "26" + } + ], + "warp_events": [ + { + "x": 5, + "y": 7, + "elevation": 3, + "dest_map": "MAP_CERULEAN_CAVE_1F", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/CeruleanCity/connections.inc b/data/maps/CeruleanCity/connections.inc deleted file mode 100644 index 2372d32c0..000000000 --- a/data/maps/CeruleanCity/connections.inc +++ /dev/null @@ -1,9 +0,0 @@ -CeruleanCity_MapConnectionsList: @ 83527C0 - connection up, 12, MAP_ROUTE24 - connection down, 0, MAP_ROUTE5 - connection left, 10, MAP_ROUTE4 - connection right, 10, MAP_ROUTE9 - -CeruleanCity_MapConnections:: @ 83527F0 - .4byte 4 - .4byte CeruleanCity_MapConnectionsList diff --git a/data/maps/CeruleanCity/events.inc b/data/maps/CeruleanCity/events.inc deleted file mode 100644 index 276ba2a9b..000000000 --- a/data/maps/CeruleanCity/events.inc +++ /dev/null @@ -1,49 +0,0 @@ -CeruleanCity_EventObjects: - object_event 1, 60, 0, 31, 0, 12, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeruleanCity_EventScript_1666E7, 0, 0, 0 - object_event 2, 49, 0, 33, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, CeruleanCity_EventScript_166603, 59, 0, 0 - object_event 3, 16, 0, 16, 0, 21, 0, 3, 3, 49, 0, 0, 0, 0, 0, CeruleanCity_EventScript_1666FE, 0, 0, 0 - object_event 4, 30, 0, 9, 0, 23, 0, 3, 2, 17, 0, 0, 0, 0, 0, CeruleanCity_EventScript_16671D, 0, 0, 0 - object_event 5, 129, 0, 32, 0, 29, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeruleanCity_EventScript_1667DD, 0, 0, 0 - object_event 6, 22, 0, 33, 0, 29, 0, 3, 9, 17, 0, 0, 0, 0, 0, CeruleanCity_EventScript_16674F, 0, 0, 0 - object_event 7, 18, 0, 34, 0, 22, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeruleanCity_EventScript_166726, 0, 0, 0 - object_event 8, 72, 0, 22, 0, 0, 0, 3, 8, 17, 0, 0, 0, 0, 0, 0x0, 60, 0, 0 - object_event 9, 95, 0, 26, 0, 32, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeruleanCity_EventScript_1BDF13, 19, 0, 0 - object_event 10, 65375, 0, 50, 0, 18, 0, 10, 0, 0, 0, 27, 0, 3, 0, 0x0, 0, 0, 0 - object_event 11, 23, 0, 12, 0, 30, 0, 3, 7, 17, 0, 0, 0, 0, 0, CeruleanCity_EventScript_166738, 0, 0, 0 - object_event 12, 41, 0, 1, 0, 13, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeruleanCity_EventScript_16672F, 92, 0, 0 - -CeruleanCity_MapWarps: - warp_def 10, 11, 0, 1, 1792 - warp_def 30, 11, 0, 1, 1793 - warp_def 15, 17, 0, 1, 1794 - warp_def 22, 19, 0, 1, 1795 - warp_def 31, 21, 0, 1, 1797 - warp_def 13, 28, 3, 1, 1798 - warp_def 29, 28, 0, 1, 1799 - warp_def 1, 12, 0, 0, 328 - warp_def 10, 8, 3, 3, 1792 - warp_def 31, 8, 3, 3, 1793 - warp_def 31, 9, 3, 3, 1793 - warp_def 14, 28, 3, 1, 1798 - warp_def 23, 28, 0, 0, 1800 - warp_def 17, 11, 0, 0, 1801 - -CeruleanCity_MapCoordEvents: - coord_event 22, 6, 3, 0, 16466, 0, 0, CeruleanCity_EventScript_16649A - coord_event 23, 6, 3, 0, 16466, 0, 0, CeruleanCity_EventScript_1664A6 - coord_event 24, 6, 3, 0, 16466, 0, 0, CeruleanCity_EventScript_1664B9 - coord_event 33, 5, 3, 0, 16509, 0, 0, CeruleanCity_EventScript_166683 - coord_event 33, 7, 3, 0, 16509, 0, 0, CeruleanCity_EventScript_1666A3 - -CeruleanCity_MapBGEvents: - bg_event 20, 25, 0, 0, 0, CeruleanCity_EventScript_166838 - bg_event 27, 21, 0, 0, 0, CeruleanCity_EventScript_166853 - bg_event 11, 28, 0, 0, 0, CeruleanCity_EventScript_16684A - bg_event 19, 32, 0, 0, 0, CeruleanCity_EventScript_166841 - bg_event 18, 7, 3, 7, 0, 68, 49, 1 - bg_event 11, 25, 0, 0, 0, CeruleanCity_EventScript_16AC94 - bg_event 11, 27, 0, 0, 0, CeruleanCity_EventScript_16AC94 - bg_event 11, 26, 0, 0, 0, CeruleanCity_EventScript_16AC94 - -CeruleanCity_MapEvents:: - map_events CeruleanCity_EventObjects, CeruleanCity_MapWarps, CeruleanCity_MapCoordEvents, CeruleanCity_MapBGEvents diff --git a/data/maps/CeruleanCity/events_bad.inc b/data/maps/CeruleanCity/events_bad.inc new file mode 100644 index 000000000..1598a51ff --- /dev/null +++ b/data/maps/CeruleanCity/events_bad.inc @@ -0,0 +1,43 @@ +CeruleanCity_EventObjects: + object_event 1, 60, 0, 31, 0, 12, 0, 3, 8, 17, 0, 0, 0 + object_event 2, 49, 0, 33, 0, 6, 0, 3, 1, 17, 0, 0, 0 + object_event 3, 16, 0, 16, 0, 21, 0, 3, 3, 49, 0, 0, 0 + object_event 4, 30, 0, 9, 0, 23, 0, 3, 2, 17, 0, 0, 0 + object_event 5, 129, 0, 32, 0, 29, 0, 3, 8, 17, 0, 0, 0 + object_event 6, 22, 0, 33, 0, 29, 0, 3, 9, 17, 0, 0, 0 + object_event 7, 18, 0, 34, 0, 22, 0, 3, 8, 17, 0, 0, 0 + object_event 8, 72, 0, 22, 0, 0, 0, 3, 8, 17, 0, 0, 0 + object_event 9, 95, 0, 26, 0, 32, 0, 3, 8, 17, 0, 0, 0 + object_event 10, 65375, 0, 50, 0, 18, 0, 10, 0, 0, 0, 27, 0 + object_event 11, 23, 0, 12, 0, 30, 0, 3, 7, 17, 0, 0, 0 + object_event 12, 41, 0, 1, 0, 13, 0, 3, 8, 17, 0, 0, 0 + +CeruleanCity_MapWarps: + warp_def 10, 11, 0, 1, MAP_CERULEAN_CITY_HOUSE1 + warp_def 30, 11, 0, 1, MAP_CERULEAN_CITY_HOUSE2 + warp_def 15, 17, 0, 1, MAP_CERULEAN_CITY_HOUSE3 + warp_def 22, 19, 0, 1, MAP_CERULEAN_CITY_POKEMONCENTER_1F + warp_def 31, 21, 0, 1, MAP_CERULEAN_CITY_GYM + warp_def 13, 28, 3, 1, MAP_CERULEAN_CITY_BIKESHOP + warp_def 29, 28, 0, 1, MAP_CERULEAN_CITY_MART + warp_def 1, 12, 0, 0, MAP_CERULEAN_CAVE_1F + warp_def 10, 8, 3, 3, MAP_CERULEAN_CITY_HOUSE1 + warp_def 31, 8, 3, 3, MAP_CERULEAN_CITY_HOUSE2 + warp_def 31, 9, 3, 3, MAP_CERULEAN_CITY_HOUSE2 + warp_def 14, 28, 3, 1, MAP_CERULEAN_CITY_BIKESHOP + warp_def 23, 28, 0, 0, MAP_CERULEAN_CITY_HOUSE4 + warp_def 17, 11, 0, 0, MAP_CERULEAN_CITY_HOUSE5 + +CeruleanCity_MapCoordEvents: + coord_event 22, 6, 3, VAR_0x4052, , CeruleanCity_EventScript_16649A + coord_event 23, 6, 3, VAR_0x4052, , CeruleanCity_EventScript_1664A6 + coord_event 24, 6, 3, VAR_0x4052, , CeruleanCity_EventScript_1664B9 + coord_event 33, 5, 3, VAR_0x407D, , CeruleanCity_EventScript_166683 + coord_event 33, 7, 3, VAR_0x407D, , CeruleanCity_EventScript_1666A3 + +CeruleanCity_MapBGEvents: + bg_hidden_item_event 18, 7, 3, ITEM_RARE_CANDY, + +CeruleanCity_MapEvents:: + map_events CeruleanCity_EventObjects, CeruleanCity_MapWarps, CeruleanCity_MapCoordEvents, CeruleanCity_MapBGEvents + diff --git a/data/maps/CeruleanCity/header.inc b/data/maps/CeruleanCity/header.inc deleted file mode 100644 index 720840bf0..000000000 --- a/data/maps/CeruleanCity/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -CeruleanCity:: @ 835066C - .4byte CeruleanCity_Layout @ 0x82E022C - .4byte CeruleanCity_MapEvents @ 0x83B53E0 - .4byte CeruleanCity_MapScripts @ 0x8166471 - .4byte CeruleanCity_MapConnections @ 0x83527F0 - .2byte BGM_FRLG_CERULEAN_CITY - .2byte 81 - .byte 0x5b, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/CeruleanCity/map.json b/data/maps/CeruleanCity/map.json new file mode 100644 index 000000000..602f84df8 --- /dev/null +++ b/data/maps/CeruleanCity/map.json @@ -0,0 +1,401 @@ +{ + "id": "MAP_CERULEAN_CITY", + "name": "CeruleanCity", + "layout": "LAYOUT_CERULEAN_CITY", + "music": "BGM_FRLG_CERULEAN_CITY", + "region_map_section": "MAPSEC_CERULEAN_CITY", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_1", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_ROUTE24", + "offset": 12, + "direction": "up" + }, + { + "map": "MAP_ROUTE5", + "offset": 0, + "direction": "down" + }, + { + "map": "MAP_ROUTE4", + "offset": 10, + "direction": "left" + }, + { + "map": "MAP_ROUTE9", + "offset": 10, + "direction": "right" + } + ], + "object_events": [ + { + "graphics_id": "60", + "x": 31, + "y": 12, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCity_EventScript_1666E7", + "flag": "0" + }, + { + "graphics_id": "49", + "x": 33, + "y": 6, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCity_EventScript_166603", + "flag": "59" + }, + { + "graphics_id": "16", + "x": 16, + "y": 21, + "elevation": 3, + "movement_type": "3", + "movement_range_x": 1, + "movement_range_y": 3, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCity_EventScript_1666FE", + "flag": "0" + }, + { + "graphics_id": "30", + "x": 9, + "y": 23, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCity_EventScript_16671D", + "flag": "0" + }, + { + "graphics_id": "129", + "x": 32, + "y": 29, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCity_EventScript_1667DD", + "flag": "0" + }, + { + "graphics_id": "22", + "x": 33, + "y": 29, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCity_EventScript_16674F", + "flag": "0" + }, + { + "graphics_id": "18", + "x": 34, + "y": 22, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCity_EventScript_166726", + "flag": "0" + }, + { + "graphics_id": "72", + "x": 22, + "y": 0, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "60" + }, + { + "graphics_id": "95", + "x": 26, + "y": 32, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCity_EventScript_1BDF13", + "flag": "19" + }, + { + "graphics_id": "65375", + "x": 50, + "y": 18, + "elevation": 10, + "movement_type": "0", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 27, + "trainer_sight_or_berry_tree_id": 3, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "23", + "x": 12, + "y": 30, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCity_EventScript_166738", + "flag": "0" + }, + { + "graphics_id": "41", + "x": 1, + "y": 13, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCity_EventScript_16672F", + "flag": "92" + } + ], + "warp_events": [ + { + "x": 10, + "y": 11, + "elevation": 0, + "dest_map": "MAP_CERULEAN_CITY_HOUSE1", + "dest_warp_id": 1 + }, + { + "x": 30, + "y": 11, + "elevation": 0, + "dest_map": "MAP_CERULEAN_CITY_HOUSE2", + "dest_warp_id": 1 + }, + { + "x": 15, + "y": 17, + "elevation": 0, + "dest_map": "MAP_CERULEAN_CITY_HOUSE3", + "dest_warp_id": 1 + }, + { + "x": 22, + "y": 19, + "elevation": 0, + "dest_map": "MAP_CERULEAN_CITY_POKEMON_CENTER_1F", + "dest_warp_id": 1 + }, + { + "x": 31, + "y": 21, + "elevation": 0, + "dest_map": "MAP_CERULEAN_CITY_GYM", + "dest_warp_id": 1 + }, + { + "x": 13, + "y": 28, + "elevation": 3, + "dest_map": "MAP_CERULEAN_CITY_BIKE_SHOP", + "dest_warp_id": 1 + }, + { + "x": 29, + "y": 28, + "elevation": 0, + "dest_map": "MAP_CERULEAN_CITY_MART", + "dest_warp_id": 1 + }, + { + "x": 1, + "y": 12, + "elevation": 0, + "dest_map": "MAP_CERULEAN_CAVE_1F", + "dest_warp_id": 0 + }, + { + "x": 10, + "y": 8, + "elevation": 3, + "dest_map": "MAP_CERULEAN_CITY_HOUSE1", + "dest_warp_id": 3 + }, + { + "x": 31, + "y": 8, + "elevation": 3, + "dest_map": "MAP_CERULEAN_CITY_HOUSE2", + "dest_warp_id": 3 + }, + { + "x": 31, + "y": 9, + "elevation": 3, + "dest_map": "MAP_CERULEAN_CITY_HOUSE2", + "dest_warp_id": 3 + }, + { + "x": 14, + "y": 28, + "elevation": 3, + "dest_map": "MAP_CERULEAN_CITY_BIKE_SHOP", + "dest_warp_id": 1 + }, + { + "x": 23, + "y": 28, + "elevation": 0, + "dest_map": "MAP_CERULEAN_CITY_HOUSE4", + "dest_warp_id": 0 + }, + { + "x": 17, + "y": 11, + "elevation": 0, + "dest_map": "MAP_CERULEAN_CITY_HOUSE5", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 22, + "y": 6, + "elevation": 3, + "var": "VAR_0x4052", + "var_value": 0, + "script": "CeruleanCity_EventScript_16649A" + }, + { + "type": "trigger", + "x": 23, + "y": 6, + "elevation": 3, + "var": "VAR_0x4052", + "var_value": 0, + "script": "CeruleanCity_EventScript_1664A6" + }, + { + "type": "trigger", + "x": 24, + "y": 6, + "elevation": 3, + "var": "VAR_0x4052", + "var_value": 0, + "script": "CeruleanCity_EventScript_1664B9" + }, + { + "type": "trigger", + "x": 33, + "y": 5, + "elevation": 3, + "var": "VAR_0x407D", + "var_value": 0, + "script": "CeruleanCity_EventScript_166683" + }, + { + "type": "trigger", + "x": 33, + "y": 7, + "elevation": 3, + "var": "VAR_0x407D", + "var_value": 0, + "script": "CeruleanCity_EventScript_1666A3" + } + ], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 20, + "y": 25, + "elevation": 0, + "script": "CeruleanCity_EventScript_166838" + }, + { + "type": "bg_event_type_0", + "x": 27, + "y": 21, + "elevation": 0, + "script": "CeruleanCity_EventScript_166853" + }, + { + "type": "bg_event_type_0", + "x": 11, + "y": 28, + "elevation": 0, + "script": "CeruleanCity_EventScript_16684A" + }, + { + "type": "bg_event_type_0", + "x": 19, + "y": 32, + "elevation": 0, + "script": "CeruleanCity_EventScript_166841" + }, + { + "type": "hidden_item", + "x": 18, + "y": 7, + "elevation": 3, + "item": "ITEM_RARE_CANDY", + "flag": "49", + "unknown": 1 + }, + { + "type": "bg_event_type_0", + "x": 11, + "y": 25, + "elevation": 0, + "script": "CeruleanCity_EventScript_16AC94" + }, + { + "type": "bg_event_type_0", + "x": 11, + "y": 27, + "elevation": 0, + "script": "CeruleanCity_EventScript_16AC94" + }, + { + "type": "bg_event_type_0", + "x": 11, + "y": 26, + "elevation": 0, + "script": "CeruleanCity_EventScript_16AC94" + } + ] +}
\ No newline at end of file diff --git a/data/maps/CeruleanCity_BikeShop/events.inc b/data/maps/CeruleanCity_BikeShop/events.inc deleted file mode 100644 index affb34087..000000000 --- a/data/maps/CeruleanCity_BikeShop/events.inc +++ /dev/null @@ -1,22 +0,0 @@ -CeruleanCity_BikeShop_EventObjects: - object_event 1, 25, 0, 9, 0, 3, 0, 3, 9, 17, 0, 0, 0, 0, 0, CeruleanCity_BikeShop_EventScript_16ABBD, 0, 0, 0 - object_event 2, 18, 0, 9, 0, 7, 0, 3, 2, 17, 0, 0, 0, 0, 0, CeruleanCity_BikeShop_EventScript_16AC75, 0, 0, 0 - object_event 3, 28, 0, 5, 0, 5, 0, 3, 1, 17, 0, 0, 0, 0, 0, CeruleanCity_BikeShop_EventScript_16AC6C, 0, 0, 0 - -CeruleanCity_BikeShop_MapWarps: - warp_def 4, 9, 0, 5, 771 - warp_def 5, 8, 3, 5, 771 - warp_def 6, 9, 0, 5, 771 - -CeruleanCity_BikeShop_MapBGEvents: - bg_event 4, 3, 0, 0, 0, CeruleanCity_BikeShop_EventScript_16AC94 - bg_event 4, 4, 0, 0, 0, CeruleanCity_BikeShop_EventScript_16AC94 - bg_event 4, 5, 0, 0, 0, CeruleanCity_BikeShop_EventScript_16AC94 - bg_event 2, 3, 0, 0, 0, CeruleanCity_BikeShop_EventScript_16AC94 - bg_event 1, 4, 0, 0, 0, CeruleanCity_BikeShop_EventScript_16AC94 - bg_event 2, 5, 0, 0, 0, CeruleanCity_BikeShop_EventScript_16AC94 - bg_event 2, 7, 0, 0, 0, CeruleanCity_BikeShop_EventScript_16AC94 - bg_event 2, 8, 0, 0, 0, CeruleanCity_BikeShop_EventScript_16AC94 - -CeruleanCity_BikeShop_MapEvents:: - map_events CeruleanCity_BikeShop_EventObjects, CeruleanCity_BikeShop_MapWarps, 0x0, CeruleanCity_BikeShop_MapBGEvents diff --git a/data/maps/CeruleanCity_BikeShop/header.inc b/data/maps/CeruleanCity_BikeShop/header.inc deleted file mode 100644 index 3f2bd4de1..000000000 --- a/data/maps/CeruleanCity_BikeShop/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -CeruleanCity_BikeShop:: @ 8350FF0 - .4byte CeruleanCity_BikeShop_Layout @ 0x82D6F28 - .4byte CeruleanCity_BikeShop_MapEvents @ 0x83BA6FC - .4byte CeruleanCity_BikeShop_MapScripts @ 0x816ABBC - .4byte NULL - .2byte BGM_FRLG_CERULEAN_CITY - .2byte 26 - .byte 0x5b, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/CeruleanCity_BikeShop/map.json b/data/maps/CeruleanCity_BikeShop/map.json new file mode 100644 index 000000000..f94bc3e7e --- /dev/null +++ b/data/maps/CeruleanCity_BikeShop/map.json @@ -0,0 +1,138 @@ +{ + "id": "MAP_CERULEAN_CITY_BIKE_SHOP", + "name": "CeruleanCity_BikeShop", + "layout": "LAYOUT_CERULEAN_CITY_BIKE_SHOP", + "music": "BGM_FRLG_CERULEAN_CITY", + "region_map_section": "MAPSEC_CERULEAN_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "25", + "x": 9, + "y": 3, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCity_BikeShop_EventScript_16ABBD", + "flag": "0" + }, + { + "graphics_id": "18", + "x": 9, + "y": 7, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCity_BikeShop_EventScript_16AC75", + "flag": "0" + }, + { + "graphics_id": "28", + "x": 5, + "y": 5, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCity_BikeShop_EventScript_16AC6C", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 4, + "y": 9, + "elevation": 0, + "dest_map": "MAP_CERULEAN_CITY", + "dest_warp_id": 5 + }, + { + "x": 5, + "y": 8, + "elevation": 3, + "dest_map": "MAP_CERULEAN_CITY", + "dest_warp_id": 5 + }, + { + "x": 6, + "y": 9, + "elevation": 0, + "dest_map": "MAP_CERULEAN_CITY", + "dest_warp_id": 5 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 4, + "y": 3, + "elevation": 0, + "script": "CeruleanCity_BikeShop_EventScript_16AC94" + }, + { + "type": "bg_event_type_0", + "x": 4, + "y": 4, + "elevation": 0, + "script": "CeruleanCity_BikeShop_EventScript_16AC94" + }, + { + "type": "bg_event_type_0", + "x": 4, + "y": 5, + "elevation": 0, + "script": "CeruleanCity_BikeShop_EventScript_16AC94" + }, + { + "type": "bg_event_type_0", + "x": 2, + "y": 3, + "elevation": 0, + "script": "CeruleanCity_BikeShop_EventScript_16AC94" + }, + { + "type": "bg_event_type_0", + "x": 1, + "y": 4, + "elevation": 0, + "script": "CeruleanCity_BikeShop_EventScript_16AC94" + }, + { + "type": "bg_event_type_0", + "x": 2, + "y": 5, + "elevation": 0, + "script": "CeruleanCity_BikeShop_EventScript_16AC94" + }, + { + "type": "bg_event_type_0", + "x": 2, + "y": 7, + "elevation": 0, + "script": "CeruleanCity_BikeShop_EventScript_16AC94" + }, + { + "type": "bg_event_type_0", + "x": 2, + "y": 8, + "elevation": 0, + "script": "CeruleanCity_BikeShop_EventScript_16AC94" + } + ] +}
\ No newline at end of file diff --git a/data/maps/CeruleanCity_Gym/events.inc b/data/maps/CeruleanCity_Gym/events.inc deleted file mode 100644 index 3c3fae4d3..000000000 --- a/data/maps/CeruleanCity_Gym/events.inc +++ /dev/null @@ -1,17 +0,0 @@ -CeruleanCity_Gym_EventObjects: - object_event 1, 43, 0, 10, 0, 12, 0, 0, 9, 17, 0, 1, 0, 1, 0, CeruleanCity_Gym_EventScript_16AB5B, 0, 0, 0 - object_event 2, 40, 0, 4, 0, 7, 0, 3, 10, 17, 0, 1, 0, 4, 0, CeruleanCity_Gym_EventScript_16AB44, 0, 0, 0 - object_event 3, 81, 0, 8, 0, 6, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeruleanCity_Gym_EventScript_16AAA1, 0, 0, 0 - object_event 4, 91, 0, 7, 0, 16, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeruleanCity_Gym_EventScript_16AB7F, 0, 0, 0 - -CeruleanCity_Gym_MapWarps: - warp_def 7, 18, 3, 4, 771 - warp_def 8, 18, 3, 4, 771 - warp_def 9, 18, 3, 4, 771 - -CeruleanCity_Gym_MapBGEvents: - bg_event 6, 17, 0, 0, 0, CeruleanCity_Gym_EventScript_16AB9E - bg_event 10, 17, 0, 0, 0, CeruleanCity_Gym_EventScript_16AB9E - -CeruleanCity_Gym_MapEvents:: - map_events CeruleanCity_Gym_EventObjects, CeruleanCity_Gym_MapWarps, 0x0, CeruleanCity_Gym_MapBGEvents diff --git a/data/maps/CeruleanCity_Gym/header.inc b/data/maps/CeruleanCity_Gym/header.inc deleted file mode 100644 index 3b3b044e4..000000000 --- a/data/maps/CeruleanCity_Gym/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -CeruleanCity_Gym:: @ 8350FD4 - .4byte CeruleanCity_Gym_Layout @ 0x82D5F84 - .4byte CeruleanCity_Gym_MapEvents @ 0x83BA628 - .4byte CeruleanCity_Gym_MapScripts @ 0x816AAA0 - .4byte NULL - .2byte BGM_FRLG_GYM - .2byte 12 - .byte 0x5b, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x01 diff --git a/data/maps/CeruleanCity_Gym/map.json b/data/maps/CeruleanCity_Gym/map.json new file mode 100644 index 000000000..715fbd067 --- /dev/null +++ b/data/maps/CeruleanCity_Gym/map.json @@ -0,0 +1,109 @@ +{ + "id": "MAP_CERULEAN_CITY_GYM", + "name": "CeruleanCity_Gym", + "layout": "LAYOUT_CERULEAN_CITY_GYM", + "music": "BGM_FRLG_GYM", + "region_map_section": "MAPSEC_CERULEAN_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_1", + "connections": null, + "object_events": [ + { + "graphics_id": "43", + "x": 10, + "y": 12, + "elevation": 0, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "CeruleanCity_Gym_EventScript_16AB5B", + "flag": "0" + }, + { + "graphics_id": "40", + "x": 4, + "y": 7, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "CeruleanCity_Gym_EventScript_16AB44", + "flag": "0" + }, + { + "graphics_id": "81", + "x": 8, + "y": 6, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCity_Gym_EventScript_16AAA1", + "flag": "0" + }, + { + "graphics_id": "91", + "x": 7, + "y": 16, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCity_Gym_EventScript_16AB7F", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 7, + "y": 18, + "elevation": 3, + "dest_map": "MAP_CERULEAN_CITY", + "dest_warp_id": 4 + }, + { + "x": 8, + "y": 18, + "elevation": 3, + "dest_map": "MAP_CERULEAN_CITY", + "dest_warp_id": 4 + }, + { + "x": 9, + "y": 18, + "elevation": 3, + "dest_map": "MAP_CERULEAN_CITY", + "dest_warp_id": 4 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 6, + "y": 17, + "elevation": 0, + "script": "CeruleanCity_Gym_EventScript_16AB9E" + }, + { + "type": "bg_event_type_0", + "x": 10, + "y": 17, + "elevation": 0, + "script": "CeruleanCity_Gym_EventScript_16AB9E" + } + ] +}
\ No newline at end of file diff --git a/data/maps/CeruleanCity_House1/events.inc b/data/maps/CeruleanCity_House1/events.inc deleted file mode 100644 index 9771589cf..000000000 --- a/data/maps/CeruleanCity_House1/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -CeruleanCity_House1_EventObjects: - object_event 1, 61, 0, 6, 0, 5, 0, 3, 10, 17, 0, 0, 0, 0, 0, CeruleanCity_House1_EventScript_16A7F0, 0, 0, 0 - -CeruleanCity_House1_MapWarps: - warp_def 2, 9, 0, 0, 771 - warp_def 3, 8, 3, 0, 771 - warp_def 4, 9, 0, 0, 771 - warp_def 3, 1, 3, 8, 771 - -CeruleanCity_House1_MapEvents:: - map_events CeruleanCity_House1_EventObjects, CeruleanCity_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/CeruleanCity_House1/header.inc b/data/maps/CeruleanCity_House1/header.inc deleted file mode 100644 index 092348c5b..000000000 --- a/data/maps/CeruleanCity_House1/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -CeruleanCity_House1:: @ 8350F48 - .4byte CeruleanCity_House1_Layout @ 0x831A560 - .4byte CeruleanCity_House1_MapEvents @ 0x83BA350 - .4byte CeruleanCity_House1_MapScripts @ 0x816A7EF - .4byte NULL - .2byte BGM_FRLG_CERULEAN_CITY - .2byte 183 - .byte 0x5b, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/CeruleanCity_House1/map.json b/data/maps/CeruleanCity_House1/map.json new file mode 100644 index 000000000..ad770bb63 --- /dev/null +++ b/data/maps/CeruleanCity_House1/map.json @@ -0,0 +1,62 @@ +{ + "id": "MAP_CERULEAN_CITY_HOUSE1", + "name": "CeruleanCity_House1", + "layout": "LAYOUT_CERULEAN_CITY_HOUSE1", + "music": "BGM_FRLG_CERULEAN_CITY", + "region_map_section": "MAPSEC_CERULEAN_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "61", + "x": 6, + "y": 5, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCity_House1_EventScript_16A7F0", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 2, + "y": 9, + "elevation": 0, + "dest_map": "MAP_CERULEAN_CITY", + "dest_warp_id": 0 + }, + { + "x": 3, + "y": 8, + "elevation": 3, + "dest_map": "MAP_CERULEAN_CITY", + "dest_warp_id": 0 + }, + { + "x": 4, + "y": 9, + "elevation": 0, + "dest_map": "MAP_CERULEAN_CITY", + "dest_warp_id": 0 + }, + { + "x": 3, + "y": 1, + "elevation": 3, + "dest_map": "MAP_CERULEAN_CITY", + "dest_warp_id": 8 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/CeruleanCity_House2/events.inc b/data/maps/CeruleanCity_House2/events.inc deleted file mode 100644 index d1e7b71db..000000000 --- a/data/maps/CeruleanCity_House2/events.inc +++ /dev/null @@ -1,15 +0,0 @@ -CeruleanCity_House2_EventObjects: - object_event 1, 56, 0, 1, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeruleanCity_House2_EventScript_16A976, 0, 0, 0 - object_event 2, 22, 0, 7, 0, 6, 0, 3, 2, 17, 0, 0, 0, 0, 0, CeruleanCity_House2_EventScript_16A995, 0, 0, 0 - -CeruleanCity_House2_MapWarps: - warp_def 2, 7, 0, 1, 771 - warp_def 3, 7, 0, 1, 771 - warp_def 4, 7, 1, 1, 771 - warp_def 4, 1, 0, 9, 771 - -CeruleanCity_House2_MapBGEvents: - bg_event 4, 1, 0, 0, 0, CeruleanCity_House2_EventScript_16A99E - -CeruleanCity_House2_MapEvents:: - map_events CeruleanCity_House2_EventObjects, CeruleanCity_House2_MapWarps, 0x0, CeruleanCity_House2_MapBGEvents diff --git a/data/maps/CeruleanCity_House2/header.inc b/data/maps/CeruleanCity_House2/header.inc deleted file mode 100644 index 66b02a6a6..000000000 --- a/data/maps/CeruleanCity_House2/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -CeruleanCity_House2:: @ 8350F64 - .4byte CeruleanCity_House2_Layout @ 0x831A474 - .4byte CeruleanCity_House2_MapEvents @ 0x83BA3C0 - .4byte CeruleanCity_House2_MapScripts @ 0x816A975 - .4byte NULL - .2byte BGM_FRLG_CERULEAN_CITY - .2byte 182 - .byte 0x5b, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/CeruleanCity_House2/map.json b/data/maps/CeruleanCity_House2/map.json new file mode 100644 index 000000000..0c2d2e4cb --- /dev/null +++ b/data/maps/CeruleanCity_House2/map.json @@ -0,0 +1,83 @@ +{ + "id": "MAP_CERULEAN_CITY_HOUSE2", + "name": "CeruleanCity_House2", + "layout": "LAYOUT_CERULEAN_CITY_HOUSE2", + "music": "BGM_FRLG_CERULEAN_CITY", + "region_map_section": "MAPSEC_CERULEAN_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "56", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCity_House2_EventScript_16A976", + "flag": "0" + }, + { + "graphics_id": "22", + "x": 7, + "y": 6, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCity_House2_EventScript_16A995", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 2, + "y": 7, + "elevation": 0, + "dest_map": "MAP_CERULEAN_CITY", + "dest_warp_id": 1 + }, + { + "x": 3, + "y": 7, + "elevation": 0, + "dest_map": "MAP_CERULEAN_CITY", + "dest_warp_id": 1 + }, + { + "x": 4, + "y": 7, + "elevation": 1, + "dest_map": "MAP_CERULEAN_CITY", + "dest_warp_id": 1 + }, + { + "x": 4, + "y": 1, + "elevation": 0, + "dest_map": "MAP_CERULEAN_CITY", + "dest_warp_id": 9 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 4, + "y": 1, + "elevation": 0, + "script": "CeruleanCity_House2_EventScript_16A99E" + } + ] +}
\ No newline at end of file diff --git a/data/maps/CeruleanCity_House3/events.inc b/data/maps/CeruleanCity_House3/events.inc deleted file mode 100644 index 7c3b4a954..000000000 --- a/data/maps/CeruleanCity_House3/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -CeruleanCity_House3_EventObjects: - object_event 1, 32, 0, 2, 0, 2, 0, 3, 7, 17, 0, 0, 0, 0, 0, CeruleanCity_House3_EventScript_16A9B1, 0, 0, 0 - object_event 2, 35, 0, 7, 0, 5, 0, 3, 9, 17, 0, 0, 0, 0, 0, CeruleanCity_House3_EventScript_16A9A8, 0, 0, 0 - -CeruleanCity_House3_MapWarps: - warp_def 3, 7, 0, 2, 771 - warp_def 4, 7, 0, 2, 771 - warp_def 5, 7, 0, 2, 771 - -CeruleanCity_House3_MapEvents:: - map_events CeruleanCity_House3_EventObjects, CeruleanCity_House3_MapWarps, 0x0, 0x0 diff --git a/data/maps/CeruleanCity_House3/header.inc b/data/maps/CeruleanCity_House3/header.inc deleted file mode 100644 index 6e5885015..000000000 --- a/data/maps/CeruleanCity_House3/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -CeruleanCity_House3:: @ 8350F80 - .4byte House1_Layout @ 0x82D5754 - .4byte CeruleanCity_House3_MapEvents @ 0x83BA41C - .4byte CeruleanCity_House3_MapScripts @ 0x816A9A7 - .4byte NULL - .2byte BGM_FRLG_CERULEAN_CITY - .2byte 6 - .byte 0x5b, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/CeruleanCity_House3/map.json b/data/maps/CeruleanCity_House3/map.json new file mode 100644 index 000000000..748aac0e2 --- /dev/null +++ b/data/maps/CeruleanCity_House3/map.json @@ -0,0 +1,68 @@ +{ + "id": "MAP_CERULEAN_CITY_HOUSE3", + "name": "CeruleanCity_House3", + "layout": "LAYOUT_HOUSE1", + "music": "BGM_FRLG_CERULEAN_CITY", + "region_map_section": "MAPSEC_CERULEAN_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "32", + "x": 2, + "y": 2, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCity_House3_EventScript_16A9B1", + "flag": "0" + }, + { + "graphics_id": "35", + "x": 7, + "y": 5, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCity_House3_EventScript_16A9A8", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 0, + "dest_map": "MAP_CERULEAN_CITY", + "dest_warp_id": 2 + }, + { + "x": 4, + "y": 7, + "elevation": 0, + "dest_map": "MAP_CERULEAN_CITY", + "dest_warp_id": 2 + }, + { + "x": 5, + "y": 7, + "elevation": 0, + "dest_map": "MAP_CERULEAN_CITY", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/CeruleanCity_House4/events.inc b/data/maps/CeruleanCity_House4/events.inc deleted file mode 100644 index 35200dd3c..000000000 --- a/data/maps/CeruleanCity_House4/events.inc +++ /dev/null @@ -1,8 +0,0 @@ -CeruleanCity_House4_EventObjects: - object_event 1, 32, 0, 5, 0, 3, 0, 3, 7, 17, 0, 0, 0, 0, 0, CeruleanCity_House4_EventScript_16ACEF, 0, 0, 0 - -CeruleanCity_House4_MapWarps: - warp_def 4, 7, 3, 12, 771 - -CeruleanCity_House4_MapEvents:: - map_events CeruleanCity_House4_EventObjects, CeruleanCity_House4_MapWarps, 0x0, 0x0 diff --git a/data/maps/CeruleanCity_House4/header.inc b/data/maps/CeruleanCity_House4/header.inc deleted file mode 100644 index 979bc788e..000000000 --- a/data/maps/CeruleanCity_House4/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -CeruleanCity_House4:: @ 8351028 - .4byte House1_Layout @ 0x82D5754 - .4byte CeruleanCity_House4_MapEvents @ 0x83BA7A4 - .4byte CeruleanCity_House4_MapScripts @ 0x816ACEE - .4byte NULL - .2byte BGM_FRLG_CERULEAN_CITY - .2byte 6 - .byte 0x5b, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/CeruleanCity_House4/map.json b/data/maps/CeruleanCity_House4/map.json new file mode 100644 index 000000000..c07927a27 --- /dev/null +++ b/data/maps/CeruleanCity_House4/map.json @@ -0,0 +1,41 @@ +{ + "id": "MAP_CERULEAN_CITY_HOUSE4", + "name": "CeruleanCity_House4", + "layout": "LAYOUT_HOUSE1", + "music": "BGM_FRLG_CERULEAN_CITY", + "region_map_section": "MAPSEC_CERULEAN_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "32", + "x": 5, + "y": 3, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCity_House4_EventScript_16ACEF", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_CERULEAN_CITY", + "dest_warp_id": 12 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/CeruleanCity_House5/events.inc b/data/maps/CeruleanCity_House5/events.inc deleted file mode 100644 index d494639d8..000000000 --- a/data/maps/CeruleanCity_House5/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -CeruleanCity_House5_EventObjects: - object_event 1, 33, 0, 7, 0, 4, 0, 3, 10, 17, 0, 0, 0, 0, 0, CeruleanCity_House5_EventScript_16AE50, 0, 0, 0 - -CeruleanCity_House5_MapWarps: - warp_def 4, 7, 3, 13, 771 - -CeruleanCity_House5_MapBGEvents: - bg_event 3, 1, 0, 0, 0, CeruleanCity_House5_EventScript_16B0DA - -CeruleanCity_House5_MapEvents:: - map_events CeruleanCity_House5_EventObjects, CeruleanCity_House5_MapWarps, 0x0, CeruleanCity_House5_MapBGEvents diff --git a/data/maps/CeruleanCity_House5/header.inc b/data/maps/CeruleanCity_House5/header.inc deleted file mode 100644 index 1c11eb58a..000000000 --- a/data/maps/CeruleanCity_House5/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -CeruleanCity_House5:: @ 8351044 - .4byte CeruleanCity_House5_Layout @ 0x8343540 - .4byte CeruleanCity_House5_MapEvents @ 0x83BA7E4 - .4byte CeruleanCity_House5_MapScripts @ 0x816AE4F - .4byte NULL - .2byte BGM_FRLG_CERULEAN_CITY - .2byte 308 - .byte 0x5b, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/CeruleanCity_House5/map.json b/data/maps/CeruleanCity_House5/map.json new file mode 100644 index 000000000..6619a1fb4 --- /dev/null +++ b/data/maps/CeruleanCity_House5/map.json @@ -0,0 +1,49 @@ +{ + "id": "MAP_CERULEAN_CITY_HOUSE5", + "name": "CeruleanCity_House5", + "layout": "LAYOUT_CERULEAN_CITY_HOUSE5", + "music": "BGM_FRLG_CERULEAN_CITY", + "region_map_section": "MAPSEC_CERULEAN_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "33", + "x": 7, + "y": 4, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCity_House5_EventScript_16AE50", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_CERULEAN_CITY", + "dest_warp_id": 13 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 3, + "y": 1, + "elevation": 0, + "script": "CeruleanCity_House5_EventScript_16B0DA" + } + ] +}
\ No newline at end of file diff --git a/data/maps/CeruleanCity_Mart/events.inc b/data/maps/CeruleanCity_Mart/events.inc deleted file mode 100644 index e38d991fb..000000000 --- a/data/maps/CeruleanCity_Mart/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -CeruleanCity_Mart_EventObjects: - object_event 1, 68, 0, 2, 0, 3, 0, 0, 10, 17, 0, 0, 0, 0, 0, CeruleanCity_Mart_EventScript_16ACB0, 0, 0, 0 - object_event 2, 23, 0, 9, 0, 2, 0, 3, 5, 20, 0, 0, 0, 0, 0, CeruleanCity_Mart_EventScript_16ACA7, 0, 0, 0 - object_event 3, 18, 0, 1, 0, 7, 0, 3, 7, 17, 0, 0, 0, 0, 0, CeruleanCity_Mart_EventScript_16AC9E, 0, 0, 0 - -CeruleanCity_Mart_MapWarps: - warp_def 3, 7, 3, 6, 771 - warp_def 4, 7, 3, 6, 771 - warp_def 5, 7, 3, 6, 771 - -CeruleanCity_Mart_MapEvents:: - map_events CeruleanCity_Mart_EventObjects, CeruleanCity_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/CeruleanCity_Mart/header.inc b/data/maps/CeruleanCity_Mart/header.inc deleted file mode 100644 index 592847fdf..000000000 --- a/data/maps/CeruleanCity_Mart/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -CeruleanCity_Mart:: @ 835100C - .4byte Mart_Layout @ 0x82D5BCC - .4byte CeruleanCity_Mart_MapEvents @ 0x83BA770 - .4byte CeruleanCity_Mart_MapScripts @ 0x816AC9D - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 10 - .byte 0x5b, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/CeruleanCity_Mart/map.json b/data/maps/CeruleanCity_Mart/map.json new file mode 100644 index 000000000..f0f95490c --- /dev/null +++ b/data/maps/CeruleanCity_Mart/map.json @@ -0,0 +1,81 @@ +{ + "id": "MAP_CERULEAN_CITY_MART", + "name": "CeruleanCity_Mart", + "layout": "LAYOUT_MART", + "music": "BGM_FRLG_POKEMON_CENTER", + "region_map_section": "MAPSEC_CERULEAN_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "68", + "x": 2, + "y": 3, + "elevation": 0, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCity_Mart_EventScript_16ACB0", + "flag": "0" + }, + { + "graphics_id": "23", + "x": 9, + "y": 2, + "elevation": 3, + "movement_type": "5", + "movement_range_x": 4, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCity_Mart_EventScript_16ACA7", + "flag": "0" + }, + { + "graphics_id": "18", + "x": 1, + "y": 7, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCity_Mart_EventScript_16AC9E", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 3, + "dest_map": "MAP_CERULEAN_CITY", + "dest_warp_id": 6 + }, + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_CERULEAN_CITY", + "dest_warp_id": 6 + }, + { + "x": 5, + "y": 7, + "elevation": 3, + "dest_map": "MAP_CERULEAN_CITY", + "dest_warp_id": 6 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/CeruleanCity_PokemonCenter_1F/events.inc b/data/maps/CeruleanCity_PokemonCenter_1F/events.inc deleted file mode 100644 index 624c743dd..000000000 --- a/data/maps/CeruleanCity_PokemonCenter_1F/events.inc +++ /dev/null @@ -1,17 +0,0 @@ -CeruleanCity_PokemonCenter_1F_EventObjects: - object_event 1, 64, 0, 7, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeruleanCity_PokemonCenter_1F_EventScript_16AA3C, 0, 0, 0 - object_event 2, 61, 0, 12, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeruleanCity_PokemonCenter_1F_EventScript_16AA45, 0, 0, 0 - object_event 3, 26, 0, 5, 0, 4, 0, 3, 5, 17, 0, 0, 0, 0, 0, CeruleanCity_PokemonCenter_1F_EventScript_16AA4E, 0, 0, 0 - object_event 4, 18, 0, 4, 0, 8, 0, 3, 5, 17, 0, 0, 0, 0, 0, CeruleanCity_PokemonCenter_1F_EventScript_16AA57, 0, 0, 0 - object_event 5, 22, 0, 3, 0, 3, 0, 3, 10, 17, 0, 0, 0, 0, 0, CeruleanCity_PokemonCenter_1F_EventScript_16AA70, 0, 0, 0 - object_event 6, 0, 0, 2, 0, 1, 0, 0, 76, 17, 0, 0, 0, 0, 0, CeruleanCity_PokemonCenter_1F_EventScript_1ACE68, 157, 0, 0 - object_event 7, 0, 0, 3, 0, 1, 0, 0, 76, 17, 0, 0, 0, 0, 0, CeruleanCity_PokemonCenter_1F_EventScript_1ACE68, 157, 0, 0 - -CeruleanCity_PokemonCenter_1F_MapWarps: - warp_def 6, 8, 0, 3, 771 - warp_def 7, 8, 0, 3, 771 - warp_def 8, 8, 0, 3, 771 - warp_def 1, 6, 4, 0, 1796 - -CeruleanCity_PokemonCenter_1F_MapEvents:: - map_events CeruleanCity_PokemonCenter_1F_EventObjects, CeruleanCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/CeruleanCity_PokemonCenter_1F/header.inc b/data/maps/CeruleanCity_PokemonCenter_1F/header.inc deleted file mode 100644 index 9978c2508..000000000 --- a/data/maps/CeruleanCity_PokemonCenter_1F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -CeruleanCity_PokemonCenter_1F:: @ 8350F9C - .4byte PokemonCenter_1F_Layout @ 0x82D5990 - .4byte CeruleanCity_PokemonCenter_1F_MapEvents @ 0x83BA4F8 - .4byte CeruleanCity_PokemonCenter_1F_MapScripts @ 0x816AA2D - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 8 - .byte 0x5b, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/CeruleanCity_PokemonCenter_1F/map.json b/data/maps/CeruleanCity_PokemonCenter_1F/map.json new file mode 100644 index 000000000..f85c99a58 --- /dev/null +++ b/data/maps/CeruleanCity_PokemonCenter_1F/map.json @@ -0,0 +1,140 @@ +{ + "id": "MAP_CERULEAN_CITY_POKEMON_CENTER_1F", + "name": "CeruleanCity_PokemonCenter_1F", + "layout": "LAYOUT_POKEMON_CENTER_1F", + "music": "BGM_FRLG_POKEMON_CENTER", + "region_map_section": "MAPSEC_CERULEAN_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "64", + "x": 7, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCity_PokemonCenter_1F_EventScript_16AA3C", + "flag": "0" + }, + { + "graphics_id": "61", + "x": 12, + "y": 5, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCity_PokemonCenter_1F_EventScript_16AA45", + "flag": "0" + }, + { + "graphics_id": "26", + "x": 5, + "y": 4, + "elevation": 3, + "movement_type": "5", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCity_PokemonCenter_1F_EventScript_16AA4E", + "flag": "0" + }, + { + "graphics_id": "18", + "x": 4, + "y": 8, + "elevation": 3, + "movement_type": "5", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCity_PokemonCenter_1F_EventScript_16AA57", + "flag": "0" + }, + { + "graphics_id": "22", + "x": 3, + "y": 3, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCity_PokemonCenter_1F_EventScript_16AA70", + "flag": "0" + }, + { + "graphics_id": "0", + "x": 2, + "y": 1, + "elevation": 0, + "movement_type": "76", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCity_PokemonCenter_1F_EventScript_1ACE68", + "flag": "157" + }, + { + "graphics_id": "0", + "x": 3, + "y": 1, + "elevation": 0, + "movement_type": "76", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCity_PokemonCenter_1F_EventScript_1ACE68", + "flag": "157" + } + ], + "warp_events": [ + { + "x": 6, + "y": 8, + "elevation": 0, + "dest_map": "MAP_CERULEAN_CITY", + "dest_warp_id": 3 + }, + { + "x": 7, + "y": 8, + "elevation": 0, + "dest_map": "MAP_CERULEAN_CITY", + "dest_warp_id": 3 + }, + { + "x": 8, + "y": 8, + "elevation": 0, + "dest_map": "MAP_CERULEAN_CITY", + "dest_warp_id": 3 + }, + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_CERULEAN_CITY_POKEMON_CENTER_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/CeruleanCity_PokemonCenter_2F/events.inc b/data/maps/CeruleanCity_PokemonCenter_2F/events.inc deleted file mode 100644 index 6a0aeb560..000000000 --- a/data/maps/CeruleanCity_PokemonCenter_2F/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -CeruleanCity_PokemonCenter_2F_EventObjects: - object_event 1, 65, 0, 6, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, CeruleanCity_PokemonCenter_2F_EventScript_1A8CF6, 0, 0, 0 - object_event 2, 65, 0, 2, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, CeruleanCity_PokemonCenter_2F_EventScript_1A8CFC, 0, 0, 0 - object_event 3, 65, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, CeruleanCity_PokemonCenter_2F_EventScript_1A8D02, 0, 0, 0 - object_event 4, 69, 0, 1, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeruleanCity_PokemonCenter_2F_EventScript_1BB1D2, 112, 0, 0 - -CeruleanCity_PokemonCenter_2F_MapWarps: - warp_def 1, 6, 4, 3, 1795 - warp_def 5, 1, 0, 0, 4 - warp_def 9, 1, 0, 0, 1 - -CeruleanCity_PokemonCenter_2F_MapEvents:: - map_events CeruleanCity_PokemonCenter_2F_EventObjects, CeruleanCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/CeruleanCity_PokemonCenter_2F/header.inc b/data/maps/CeruleanCity_PokemonCenter_2F/header.inc deleted file mode 100644 index 6a650315e..000000000 --- a/data/maps/CeruleanCity_PokemonCenter_2F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -CeruleanCity_PokemonCenter_2F:: @ 8350FB8 - .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 - .4byte CeruleanCity_PokemonCenter_2F_MapEvents @ 0x83BA584 - .4byte CeruleanCity_PokemonCenter_2F_MapScripts @ 0x816AA79 - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 9 - .byte 0x5b, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/CeruleanCity_PokemonCenter_2F/map.json b/data/maps/CeruleanCity_PokemonCenter_2F/map.json new file mode 100644 index 000000000..c231d2b99 --- /dev/null +++ b/data/maps/CeruleanCity_PokemonCenter_2F/map.json @@ -0,0 +1,94 @@ +{ + "id": "MAP_CERULEAN_CITY_POKEMON_CENTER_2F", + "name": "CeruleanCity_PokemonCenter_2F", + "layout": "LAYOUT_POKEMON_CENTER_2F", + "music": "BGM_FRLG_POKEMON_CENTER", + "region_map_section": "MAPSEC_CERULEAN_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "65", + "x": 6, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCity_PokemonCenter_2F_EventScript_1A8CF6", + "flag": "0" + }, + { + "graphics_id": "65", + "x": 2, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCity_PokemonCenter_2F_EventScript_1A8CFC", + "flag": "0" + }, + { + "graphics_id": "65", + "x": 10, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCity_PokemonCenter_2F_EventScript_1A8D02", + "flag": "0" + }, + { + "graphics_id": "69", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCity_PokemonCenter_2F_EventScript_1BB1D2", + "flag": "112" + } + ], + "warp_events": [ + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_CERULEAN_CITY_POKEMON_CENTER_1F", + "dest_warp_id": 3 + }, + { + "x": 5, + "y": 1, + "elevation": 0, + "dest_map": "MAP_UNKNOWN_MAP_00_04", + "dest_warp_id": 0 + }, + { + "x": 9, + "y": 1, + "elevation": 0, + "dest_map": "MAP_UNKNOWN_MAP_00_01", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/CinnabarIsland/connections.inc b/data/maps/CinnabarIsland/connections.inc deleted file mode 100644 index e7955f388..000000000 --- a/data/maps/CinnabarIsland/connections.inc +++ /dev/null @@ -1,7 +0,0 @@ -CinnabarIsland_MapConnectionsList: @ 8352890 - connection up, 0, MAP_ROUTE21_SOUTH - connection right, 0, MAP_ROUTE20 - -CinnabarIsland_MapConnections:: @ 83528A8 - .4byte 2 - .4byte CinnabarIsland_MapConnectionsList diff --git a/data/maps/CinnabarIsland/events.inc b/data/maps/CinnabarIsland/events.inc deleted file mode 100644 index 6b267cd37..000000000 --- a/data/maps/CinnabarIsland/events.inc +++ /dev/null @@ -1,24 +0,0 @@ -CinnabarIsland_EventObjects: - object_event 1, 28, 0, 14, 0, 6, 0, 3, 5, 17, 0, 0, 0, 0, 0, CinnabarIsland_EventScript_1671EF, 0, 0, 0 - object_event 2, 32, 0, 11, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, CinnabarIsland_EventScript_167208, 0, 0, 0 - object_event 3, 73, 0, 20, 0, 7, 0, 3, 10, 17, 0, 0, 0, 0, 0, 0x0, 98, 0, 0 - object_event 4, 108, 0, 23, 0, 7, 0, 1, 9, 17, 0, 0, 0, 0, 0, 0x0, 107, 0, 0 - -CinnabarIsland_MapWarps: - warp_def 8, 3, 0, 1, 315 - warp_def 20, 4, 0, 1, 3072 - warp_def 8, 9, 0, 1, 3073 - warp_def 14, 11, 0, 0, 3077 - warp_def 19, 11, 0, 1, 3079 - -CinnabarIsland_MapCoordEvents: - coord_event 20, 5, 3, 0, 16385, 0, 0, CinnabarIsland_EventScript_1671CA - -CinnabarIsland_MapBGEvents: - bg_event 12, 3, 0, 0, 0, CinnabarIsland_EventScript_167211 - bg_event 9, 9, 0, 0, 0, CinnabarIsland_EventScript_16721A - bg_event 22, 5, 0, 0, 0, CinnabarIsland_EventScript_167223 - bg_event 10, 9, 0, 0, 0, CinnabarIsland_EventScript_16721A - -CinnabarIsland_MapEvents:: - map_events CinnabarIsland_EventObjects, CinnabarIsland_MapWarps, CinnabarIsland_MapCoordEvents, CinnabarIsland_MapBGEvents diff --git a/data/maps/CinnabarIsland/header.inc b/data/maps/CinnabarIsland/header.inc deleted file mode 100644 index 49ec94a3b..000000000 --- a/data/maps/CinnabarIsland/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -CinnabarIsland:: @ 83506F8 - .4byte CinnabarIsland_Layout @ 0x82E3B20 - .4byte CinnabarIsland_MapEvents @ 0x83B5BF0 - .4byte CinnabarIsland_MapScripts @ 0x8166ED6 - .4byte CinnabarIsland_MapConnections @ 0x83528A8 - .2byte BGM_FRLG_CINNABAR_ISLAND - .2byte 86 - .byte 0x60, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/CinnabarIsland/map.json b/data/maps/CinnabarIsland/map.json new file mode 100644 index 000000000..395daeb62 --- /dev/null +++ b/data/maps/CinnabarIsland/map.json @@ -0,0 +1,158 @@ +{ + "id": "MAP_CINNABAR_ISLAND", + "name": "CinnabarIsland", + "layout": "LAYOUT_CINNABAR_ISLAND", + "music": "BGM_FRLG_CINNABAR_ISLAND", + "region_map_section": "MAPSEC_CINNABAR_ISLAND", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_1", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_ROUTE21_SOUTH", + "offset": 0, + "direction": "up" + }, + { + "map": "MAP_ROUTE20", + "offset": 0, + "direction": "right" + } + ], + "object_events": [ + { + "graphics_id": "28", + "x": 14, + "y": 6, + "elevation": 3, + "movement_type": "5", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CinnabarIsland_EventScript_1671EF", + "flag": "0" + }, + { + "graphics_id": "32", + "x": 11, + "y": 11, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CinnabarIsland_EventScript_167208", + "flag": "0" + }, + { + "graphics_id": "73", + "x": 20, + "y": 7, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "98" + }, + { + "graphics_id": "108", + "x": 23, + "y": 7, + "elevation": 1, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "107" + } + ], + "warp_events": [ + { + "x": 8, + "y": 3, + "elevation": 0, + "dest_map": "MAP_POKEMON_MANSION_1F", + "dest_warp_id": 1 + }, + { + "x": 20, + "y": 4, + "elevation": 0, + "dest_map": "MAP_CINNABAR_ISLAND_GYM", + "dest_warp_id": 1 + }, + { + "x": 8, + "y": 9, + "elevation": 0, + "dest_map": "MAP_CINNABAR_ISLAND_POKEMON_LAB_ENTRANCE", + "dest_warp_id": 1 + }, + { + "x": 14, + "y": 11, + "elevation": 0, + "dest_map": "MAP_CINNABAR_ISLAND_POKEMON_CENTER_1F", + "dest_warp_id": 0 + }, + { + "x": 19, + "y": 11, + "elevation": 0, + "dest_map": "MAP_CINNABAR_ISLAND_MART", + "dest_warp_id": 1 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 20, + "y": 5, + "elevation": 3, + "var": "VAR_0x4001", + "var_value": 0, + "script": "CinnabarIsland_EventScript_1671CA" + } + ], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 12, + "y": 3, + "elevation": 0, + "script": "CinnabarIsland_EventScript_167211" + }, + { + "type": "bg_event_type_0", + "x": 9, + "y": 9, + "elevation": 0, + "script": "CinnabarIsland_EventScript_16721A" + }, + { + "type": "bg_event_type_0", + "x": 22, + "y": 5, + "elevation": 0, + "script": "CinnabarIsland_EventScript_167223" + }, + { + "type": "bg_event_type_0", + "x": 10, + "y": 9, + "elevation": 0, + "script": "CinnabarIsland_EventScript_16721A" + } + ] +}
\ No newline at end of file diff --git a/data/maps/CinnabarIsland_Gym/events.inc b/data/maps/CinnabarIsland_Gym/events.inc deleted file mode 100644 index b5f8e63bf..000000000 --- a/data/maps/CinnabarIsland_Gym/events.inc +++ /dev/null @@ -1,35 +0,0 @@ -CinnabarIsland_Gym_EventObjects: - object_event 1, 52, 0, 25, 0, 11, 0, 3, 8, 17, 0, 1, 0, 0, 0, CinnabarIsland_Gym_EventScript_16DB27, 0, 0, 0 - object_event 2, 55, 0, 25, 0, 4, 0, 3, 8, 17, 0, 1, 0, 0, 0, CinnabarIsland_Gym_EventScript_16DA7F, 0, 0, 0 - object_event 3, 55, 0, 17, 0, 5, 0, 3, 8, 17, 0, 1, 0, 0, 0, CinnabarIsland_Gym_EventScript_16DA96, 0, 0, 0 - object_event 4, 52, 0, 16, 0, 11, 0, 3, 8, 17, 0, 1, 0, 0, 0, CinnabarIsland_Gym_EventScript_16DB53, 0, 0, 0 - object_event 5, 55, 0, 16, 0, 18, 0, 3, 8, 17, 0, 1, 0, 0, 0, CinnabarIsland_Gym_EventScript_16DAC2, 0, 0, 0 - object_event 6, 52, 0, 4, 0, 19, 0, 3, 8, 17, 0, 1, 0, 0, 0, CinnabarIsland_Gym_EventScript_16DB7F, 0, 0, 0 - object_event 7, 55, 0, 4, 0, 11, 0, 3, 8, 17, 0, 1, 0, 0, 0, CinnabarIsland_Gym_EventScript_16DAFB, 0, 0, 0 - object_event 8, 86, 0, 5, 0, 4, 0, 3, 8, 17, 0, 0, 0, 0, 0, CinnabarIsland_Gym_EventScript_16D9D4, 0, 0, 0 - object_event 9, 91, 0, 24, 0, 20, 0, 3, 8, 17, 0, 0, 0, 0, 0, CinnabarIsland_Gym_EventScript_16DBAB, 0, 0, 0 - -CinnabarIsland_Gym_MapWarps: - warp_def 24, 23, 3, 1, 776 - warp_def 25, 23, 3, 1, 776 - warp_def 26, 23, 3, 1, 776 - -CinnabarIsland_Gym_MapBGEvents: - bg_event 23, 20, 0, 0, 0, CinnabarIsland_Gym_EventScript_16DBCA - bg_event 27, 20, 0, 0, 0, CinnabarIsland_Gym_EventScript_16DBCA - bg_event 22, 10, 0, 1, 0, CinnabarIsland_Gym_EventScript_16DBE8 - bg_event 23, 10, 0, 1, 0, CinnabarIsland_Gym_EventScript_16DBF4 - bg_event 15, 2, 0, 1, 0, CinnabarIsland_Gym_EventScript_16DCDD - bg_event 16, 2, 0, 1, 0, CinnabarIsland_Gym_EventScript_16DCE9 - bg_event 13, 10, 0, 1, 0, CinnabarIsland_Gym_EventScript_16DDBB - bg_event 14, 10, 0, 1, 0, CinnabarIsland_Gym_EventScript_16DDC7 - bg_event 13, 17, 0, 1, 0, CinnabarIsland_Gym_EventScript_16DE92 - bg_event 14, 17, 0, 1, 0, CinnabarIsland_Gym_EventScript_16DE9E - bg_event 1, 18, 0, 1, 0, CinnabarIsland_Gym_EventScript_16DF69 - bg_event 2, 18, 0, 1, 0, CinnabarIsland_Gym_EventScript_16DF75 - bg_event 1, 10, 0, 1, 0, CinnabarIsland_Gym_EventScript_16E040 - bg_event 2, 10, 0, 1, 0, CinnabarIsland_Gym_EventScript_16E04C - bg_event 3, 1, 0, 1, 0, CinnabarIsland_Gym_EventScript_1ACF07 - -CinnabarIsland_Gym_MapEvents:: - map_events CinnabarIsland_Gym_EventObjects, CinnabarIsland_Gym_MapWarps, 0x0, CinnabarIsland_Gym_MapBGEvents diff --git a/data/maps/CinnabarIsland_Gym/header.inc b/data/maps/CinnabarIsland_Gym/header.inc deleted file mode 100644 index 902408c88..000000000 --- a/data/maps/CinnabarIsland_Gym/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -CinnabarIsland_Gym:: @ 8351530 - .4byte CinnabarIsland_Gym_Layout @ 0x82D82C8 - .4byte CinnabarIsland_Gym_MapEvents @ 0x83BC62C - .4byte CinnabarIsland_Gym_MapScripts @ 0x816D94B - .4byte NULL - .2byte BGM_FRLG_GYM - .2byte 36 - .byte 0x60, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x01 diff --git a/data/maps/CinnabarIsland_Gym/map.json b/data/maps/CinnabarIsland_Gym/map.json new file mode 100644 index 000000000..cb22dda7d --- /dev/null +++ b/data/maps/CinnabarIsland_Gym/map.json @@ -0,0 +1,265 @@ +{ + "id": "MAP_CINNABAR_ISLAND_GYM", + "name": "CinnabarIsland_Gym", + "layout": "LAYOUT_CINNABAR_ISLAND_GYM", + "music": "BGM_FRLG_GYM", + "region_map_section": "MAPSEC_CINNABAR_ISLAND", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_1", + "connections": null, + "object_events": [ + { + "graphics_id": "52", + "x": 25, + "y": 11, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 0, + "script": "CinnabarIsland_Gym_EventScript_16DB27", + "flag": "0" + }, + { + "graphics_id": "55", + "x": 25, + "y": 4, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 0, + "script": "CinnabarIsland_Gym_EventScript_16DA7F", + "flag": "0" + }, + { + "graphics_id": "55", + "x": 17, + "y": 5, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 0, + "script": "CinnabarIsland_Gym_EventScript_16DA96", + "flag": "0" + }, + { + "graphics_id": "52", + "x": 16, + "y": 11, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 0, + "script": "CinnabarIsland_Gym_EventScript_16DB53", + "flag": "0" + }, + { + "graphics_id": "55", + "x": 16, + "y": 18, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 0, + "script": "CinnabarIsland_Gym_EventScript_16DAC2", + "flag": "0" + }, + { + "graphics_id": "52", + "x": 4, + "y": 19, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 0, + "script": "CinnabarIsland_Gym_EventScript_16DB7F", + "flag": "0" + }, + { + "graphics_id": "55", + "x": 4, + "y": 11, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 0, + "script": "CinnabarIsland_Gym_EventScript_16DAFB", + "flag": "0" + }, + { + "graphics_id": "86", + "x": 5, + "y": 4, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CinnabarIsland_Gym_EventScript_16D9D4", + "flag": "0" + }, + { + "graphics_id": "91", + "x": 24, + "y": 20, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CinnabarIsland_Gym_EventScript_16DBAB", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 24, + "y": 23, + "elevation": 3, + "dest_map": "MAP_CINNABAR_ISLAND", + "dest_warp_id": 1 + }, + { + "x": 25, + "y": 23, + "elevation": 3, + "dest_map": "MAP_CINNABAR_ISLAND", + "dest_warp_id": 1 + }, + { + "x": 26, + "y": 23, + "elevation": 3, + "dest_map": "MAP_CINNABAR_ISLAND", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 23, + "y": 20, + "elevation": 0, + "script": "CinnabarIsland_Gym_EventScript_16DBCA" + }, + { + "type": "bg_event_type_0", + "x": 27, + "y": 20, + "elevation": 0, + "script": "CinnabarIsland_Gym_EventScript_16DBCA" + }, + { + "type": "bg_event_type_1", + "x": 22, + "y": 10, + "elevation": 0, + "script": "CinnabarIsland_Gym_EventScript_16DBE8" + }, + { + "type": "bg_event_type_1", + "x": 23, + "y": 10, + "elevation": 0, + "script": "CinnabarIsland_Gym_EventScript_16DBF4" + }, + { + "type": "bg_event_type_1", + "x": 15, + "y": 2, + "elevation": 0, + "script": "CinnabarIsland_Gym_EventScript_16DCDD" + }, + { + "type": "bg_event_type_1", + "x": 16, + "y": 2, + "elevation": 0, + "script": "CinnabarIsland_Gym_EventScript_16DCE9" + }, + { + "type": "bg_event_type_1", + "x": 13, + "y": 10, + "elevation": 0, + "script": "CinnabarIsland_Gym_EventScript_16DDBB" + }, + { + "type": "bg_event_type_1", + "x": 14, + "y": 10, + "elevation": 0, + "script": "CinnabarIsland_Gym_EventScript_16DDC7" + }, + { + "type": "bg_event_type_1", + "x": 13, + "y": 17, + "elevation": 0, + "script": "CinnabarIsland_Gym_EventScript_16DE92" + }, + { + "type": "bg_event_type_1", + "x": 14, + "y": 17, + "elevation": 0, + "script": "CinnabarIsland_Gym_EventScript_16DE9E" + }, + { + "type": "bg_event_type_1", + "x": 1, + "y": 18, + "elevation": 0, + "script": "CinnabarIsland_Gym_EventScript_16DF69" + }, + { + "type": "bg_event_type_1", + "x": 2, + "y": 18, + "elevation": 0, + "script": "CinnabarIsland_Gym_EventScript_16DF75" + }, + { + "type": "bg_event_type_1", + "x": 1, + "y": 10, + "elevation": 0, + "script": "CinnabarIsland_Gym_EventScript_16E040" + }, + { + "type": "bg_event_type_1", + "x": 2, + "y": 10, + "elevation": 0, + "script": "CinnabarIsland_Gym_EventScript_16E04C" + }, + { + "type": "bg_event_type_1", + "x": 3, + "y": 1, + "elevation": 0, + "script": "CinnabarIsland_Gym_EventScript_1ACF07" + } + ] +}
\ No newline at end of file diff --git a/data/maps/CinnabarIsland_Mart/events.inc b/data/maps/CinnabarIsland_Mart/events.inc deleted file mode 100644 index 9d582e374..000000000 --- a/data/maps/CinnabarIsland_Mart/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -CinnabarIsland_Mart_EventObjects: - object_event 1, 68, 0, 2, 0, 3, 0, 0, 10, 17, 0, 0, 0, 0, 0, CinnabarIsland_Mart_EventScript_16EA22, 0, 0, 0 - object_event 2, 28, 0, 6, 0, 2, 0, 3, 7, 17, 0, 0, 0, 0, 0, CinnabarIsland_Mart_EventScript_16EA10, 0, 0, 0 - object_event 3, 55, 0, 8, 0, 2, 0, 3, 7, 17, 0, 0, 0, 0, 0, CinnabarIsland_Mart_EventScript_16EA19, 0, 0, 0 - -CinnabarIsland_Mart_MapWarps: - warp_def 3, 7, 3, 4, 776 - warp_def 4, 7, 3, 4, 776 - warp_def 5, 7, 3, 4, 776 - -CinnabarIsland_Mart_MapEvents:: - map_events CinnabarIsland_Mart_EventObjects, CinnabarIsland_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/CinnabarIsland_Mart/header.inc b/data/maps/CinnabarIsland_Mart/header.inc deleted file mode 100644 index db46f06e4..000000000 --- a/data/maps/CinnabarIsland_Mart/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -CinnabarIsland_Mart:: @ 83515F4 - .4byte Mart_Layout @ 0x82D5BCC - .4byte CinnabarIsland_Mart_MapEvents @ 0x83BC9A8 - .4byte CinnabarIsland_Mart_MapScripts @ 0x816EA0F - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 10 - .byte 0x60, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/CinnabarIsland_Mart/map.json b/data/maps/CinnabarIsland_Mart/map.json new file mode 100644 index 000000000..5904c5e98 --- /dev/null +++ b/data/maps/CinnabarIsland_Mart/map.json @@ -0,0 +1,81 @@ +{ + "id": "MAP_CINNABAR_ISLAND_MART", + "name": "CinnabarIsland_Mart", + "layout": "LAYOUT_MART", + "music": "BGM_FRLG_POKEMON_CENTER", + "region_map_section": "MAPSEC_CINNABAR_ISLAND", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "68", + "x": 2, + "y": 3, + "elevation": 0, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CinnabarIsland_Mart_EventScript_16EA22", + "flag": "0" + }, + { + "graphics_id": "28", + "x": 6, + "y": 2, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CinnabarIsland_Mart_EventScript_16EA10", + "flag": "0" + }, + { + "graphics_id": "55", + "x": 8, + "y": 2, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CinnabarIsland_Mart_EventScript_16EA19", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 3, + "dest_map": "MAP_CINNABAR_ISLAND", + "dest_warp_id": 4 + }, + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_CINNABAR_ISLAND", + "dest_warp_id": 4 + }, + { + "x": 5, + "y": 7, + "elevation": 3, + "dest_map": "MAP_CINNABAR_ISLAND", + "dest_warp_id": 4 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/CinnabarIsland_PokemonCenter_1F/events.inc b/data/maps/CinnabarIsland_PokemonCenter_1F/events.inc deleted file mode 100644 index 50f4c6566..000000000 --- a/data/maps/CinnabarIsland_PokemonCenter_1F/events.inc +++ /dev/null @@ -1,17 +0,0 @@ -CinnabarIsland_PokemonCenter_1F_EventObjects: - object_event 1, 64, 0, 7, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, CinnabarIsland_PokemonCenter_1F_EventScript_16E8E6, 0, 0, 0 - object_event 2, 42, 0, 2, 0, 4, 0, 3, 5, 17, 0, 0, 0, 0, 0, CinnabarIsland_PokemonCenter_1F_EventScript_16E8F8, 0, 0, 0 - object_event 3, 61, 0, 9, 0, 7, 0, 3, 2, 17, 0, 0, 0, 0, 0, CinnabarIsland_PokemonCenter_1F_EventScript_16E8EF, 0, 0, 0 - object_event 4, 18, 0, 14, 0, 6, 0, 3, 9, 17, 0, 0, 0, 0, 0, CinnabarIsland_PokemonCenter_1F_EventScript_16E901, 0, 0, 0 - object_event 5, 0, 0, 2, 0, 1, 0, 0, 76, 17, 0, 0, 0, 0, 0, CinnabarIsland_PokemonCenter_1F_EventScript_1AD0B9, 157, 0, 0 - object_event 6, 0, 0, 3, 0, 1, 0, 0, 76, 17, 0, 0, 0, 0, 0, CinnabarIsland_PokemonCenter_1F_EventScript_1AD0B9, 157, 0, 0 - object_event 7, 73, 0, 11, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, CinnabarIsland_PokemonCenter_1F_EventScript_16E90A, 162, 0, 0 - -CinnabarIsland_PokemonCenter_1F_MapWarps: - warp_def 7, 8, 0, 3, 776 - warp_def 6, 8, 3, 3, 776 - warp_def 8, 8, 0, 3, 776 - warp_def 1, 6, 4, 0, 3078 - -CinnabarIsland_PokemonCenter_1F_MapEvents:: - map_events CinnabarIsland_PokemonCenter_1F_EventObjects, CinnabarIsland_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/CinnabarIsland_PokemonCenter_1F/header.inc b/data/maps/CinnabarIsland_PokemonCenter_1F/header.inc deleted file mode 100644 index 61259eee7..000000000 --- a/data/maps/CinnabarIsland_PokemonCenter_1F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -CinnabarIsland_PokemonCenter_1F:: @ 83515BC - .4byte PokemonCenter_1F_Layout @ 0x82D5990 - .4byte CinnabarIsland_PokemonCenter_1F_MapEvents @ 0x83BC8A8 - .4byte CinnabarIsland_PokemonCenter_1F_MapScripts @ 0x816E8D7 - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 8 - .byte 0x60, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/CinnabarIsland_PokemonCenter_1F/map.json b/data/maps/CinnabarIsland_PokemonCenter_1F/map.json new file mode 100644 index 000000000..b325d8e96 --- /dev/null +++ b/data/maps/CinnabarIsland_PokemonCenter_1F/map.json @@ -0,0 +1,140 @@ +{ + "id": "MAP_CINNABAR_ISLAND_POKEMON_CENTER_1F", + "name": "CinnabarIsland_PokemonCenter_1F", + "layout": "LAYOUT_POKEMON_CENTER_1F", + "music": "BGM_FRLG_POKEMON_CENTER", + "region_map_section": "MAPSEC_CINNABAR_ISLAND", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "64", + "x": 7, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CinnabarIsland_PokemonCenter_1F_EventScript_16E8E6", + "flag": "0" + }, + { + "graphics_id": "42", + "x": 2, + "y": 4, + "elevation": 3, + "movement_type": "5", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CinnabarIsland_PokemonCenter_1F_EventScript_16E8F8", + "flag": "0" + }, + { + "graphics_id": "61", + "x": 9, + "y": 7, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CinnabarIsland_PokemonCenter_1F_EventScript_16E8EF", + "flag": "0" + }, + { + "graphics_id": "18", + "x": 14, + "y": 6, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CinnabarIsland_PokemonCenter_1F_EventScript_16E901", + "flag": "0" + }, + { + "graphics_id": "0", + "x": 2, + "y": 1, + "elevation": 0, + "movement_type": "76", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CinnabarIsland_PokemonCenter_1F_EventScript_1AD0B9", + "flag": "157" + }, + { + "graphics_id": "0", + "x": 3, + "y": 1, + "elevation": 0, + "movement_type": "76", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CinnabarIsland_PokemonCenter_1F_EventScript_1AD0B9", + "flag": "157" + }, + { + "graphics_id": "73", + "x": 11, + "y": 5, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CinnabarIsland_PokemonCenter_1F_EventScript_16E90A", + "flag": "162" + } + ], + "warp_events": [ + { + "x": 7, + "y": 8, + "elevation": 0, + "dest_map": "MAP_CINNABAR_ISLAND", + "dest_warp_id": 3 + }, + { + "x": 6, + "y": 8, + "elevation": 3, + "dest_map": "MAP_CINNABAR_ISLAND", + "dest_warp_id": 3 + }, + { + "x": 8, + "y": 8, + "elevation": 0, + "dest_map": "MAP_CINNABAR_ISLAND", + "dest_warp_id": 3 + }, + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_CINNABAR_ISLAND_POKEMON_CENTER_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/CinnabarIsland_PokemonCenter_2F/events.inc b/data/maps/CinnabarIsland_PokemonCenter_2F/events.inc deleted file mode 100644 index 4d375567e..000000000 --- a/data/maps/CinnabarIsland_PokemonCenter_2F/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -CinnabarIsland_PokemonCenter_2F_EventObjects: - object_event 1, 65, 0, 6, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, CinnabarIsland_PokemonCenter_2F_EventScript_1A8CF6, 0, 0, 0 - object_event 2, 65, 0, 2, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, CinnabarIsland_PokemonCenter_2F_EventScript_1A8CFC, 0, 0, 0 - object_event 3, 65, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, CinnabarIsland_PokemonCenter_2F_EventScript_1A8D02, 0, 0, 0 - object_event 4, 69, 0, 1, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, CinnabarIsland_PokemonCenter_2F_EventScript_1BB1D2, 112, 0, 0 - -CinnabarIsland_PokemonCenter_2F_MapWarps: - warp_def 1, 6, 4, 3, 3077 - warp_def 5, 1, 0, 0, 4 - warp_def 9, 1, 0, 0, 1 - -CinnabarIsland_PokemonCenter_2F_MapEvents:: - map_events CinnabarIsland_PokemonCenter_2F_EventObjects, CinnabarIsland_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/CinnabarIsland_PokemonCenter_2F/header.inc b/data/maps/CinnabarIsland_PokemonCenter_2F/header.inc deleted file mode 100644 index 462076704..000000000 --- a/data/maps/CinnabarIsland_PokemonCenter_2F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -CinnabarIsland_PokemonCenter_2F:: @ 83515D8 - .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 - .4byte CinnabarIsland_PokemonCenter_2F_MapEvents @ 0x83BC934 - .4byte CinnabarIsland_PokemonCenter_2F_MapScripts @ 0x816E9E8 - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 9 - .byte 0x60, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/CinnabarIsland_PokemonCenter_2F/map.json b/data/maps/CinnabarIsland_PokemonCenter_2F/map.json new file mode 100644 index 000000000..8eab88cd1 --- /dev/null +++ b/data/maps/CinnabarIsland_PokemonCenter_2F/map.json @@ -0,0 +1,94 @@ +{ + "id": "MAP_CINNABAR_ISLAND_POKEMON_CENTER_2F", + "name": "CinnabarIsland_PokemonCenter_2F", + "layout": "LAYOUT_POKEMON_CENTER_2F", + "music": "BGM_FRLG_POKEMON_CENTER", + "region_map_section": "MAPSEC_CINNABAR_ISLAND", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "65", + "x": 6, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CinnabarIsland_PokemonCenter_2F_EventScript_1A8CF6", + "flag": "0" + }, + { + "graphics_id": "65", + "x": 2, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CinnabarIsland_PokemonCenter_2F_EventScript_1A8CFC", + "flag": "0" + }, + { + "graphics_id": "65", + "x": 10, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CinnabarIsland_PokemonCenter_2F_EventScript_1A8D02", + "flag": "0" + }, + { + "graphics_id": "69", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CinnabarIsland_PokemonCenter_2F_EventScript_1BB1D2", + "flag": "112" + } + ], + "warp_events": [ + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_CINNABAR_ISLAND_POKEMON_CENTER_1F", + "dest_warp_id": 3 + }, + { + "x": 5, + "y": 1, + "elevation": 0, + "dest_map": "MAP_UNKNOWN_MAP_00_04", + "dest_warp_id": 0 + }, + { + "x": 9, + "y": 1, + "elevation": 0, + "dest_map": "MAP_UNKNOWN_MAP_00_01", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/CinnabarIsland_PokemonLab_Entrance/events.inc b/data/maps/CinnabarIsland_PokemonLab_Entrance/events.inc deleted file mode 100644 index bb6eaa996..000000000 --- a/data/maps/CinnabarIsland_PokemonLab_Entrance/events.inc +++ /dev/null @@ -1,19 +0,0 @@ -CinnabarIsland_PokemonLab_Entrance_EventObjects: - object_event 1, 55, 0, 2, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, CinnabarIsland_PokemonLab_Entrance_EventScript_16E28B, 0, 0, 0 - -CinnabarIsland_PokemonLab_Entrance_MapWarps: - warp_def 3, 9, 3, 2, 776 - warp_def 4, 9, 3, 2, 776 - warp_def 5, 9, 3, 2, 776 - warp_def 13, 5, 0, 0, 3074 - warp_def 19, 5, 0, 0, 3075 - warp_def 25, 5, 0, 0, 3076 - -CinnabarIsland_PokemonLab_Entrance_MapBGEvents: - bg_event 4, 1, 0, 0, 0, CinnabarIsland_PokemonLab_Entrance_EventScript_16E294 - bg_event 12, 5, 0, 0, 0, CinnabarIsland_PokemonLab_Entrance_EventScript_16E29D - bg_event 18, 5, 0, 0, 0, CinnabarIsland_PokemonLab_Entrance_EventScript_16E2A6 - bg_event 24, 5, 0, 0, 0, CinnabarIsland_PokemonLab_Entrance_EventScript_16E2AF - -CinnabarIsland_PokemonLab_Entrance_MapEvents:: - map_events CinnabarIsland_PokemonLab_Entrance_EventObjects, CinnabarIsland_PokemonLab_Entrance_MapWarps, 0x0, CinnabarIsland_PokemonLab_Entrance_MapBGEvents diff --git a/data/maps/CinnabarIsland_PokemonLab_Entrance/header.inc b/data/maps/CinnabarIsland_PokemonLab_Entrance/header.inc deleted file mode 100644 index 8f1b3ce10..000000000 --- a/data/maps/CinnabarIsland_PokemonLab_Entrance/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -CinnabarIsland_PokemonLab_Entrance:: @ 835154C - .4byte CinnabarIsland_PokemonLab_Entrance_Layout @ 0x831C804 - .4byte CinnabarIsland_PokemonLab_Entrance_MapEvents @ 0x83BC6B8 - .4byte CinnabarIsland_PokemonLab_Entrance_MapScripts @ 0x816E273 - .4byte NULL - .2byte BGM_FRLG_CINNABAR_ISLAND - .2byte 203 - .byte 0x60, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/CinnabarIsland_PokemonLab_Entrance/map.json b/data/maps/CinnabarIsland_PokemonLab_Entrance/map.json new file mode 100644 index 000000000..51bba9ff3 --- /dev/null +++ b/data/maps/CinnabarIsland_PokemonLab_Entrance/map.json @@ -0,0 +1,105 @@ +{ + "id": "MAP_CINNABAR_ISLAND_POKEMON_LAB_ENTRANCE", + "name": "CinnabarIsland_PokemonLab_Entrance", + "layout": "LAYOUT_CINNABAR_ISLAND_POKEMON_LAB_ENTRANCE", + "music": "BGM_FRLG_CINNABAR_ISLAND", + "region_map_section": "MAPSEC_CINNABAR_ISLAND", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "55", + "x": 2, + "y": 4, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CinnabarIsland_PokemonLab_Entrance_EventScript_16E28B", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 9, + "elevation": 3, + "dest_map": "MAP_CINNABAR_ISLAND", + "dest_warp_id": 2 + }, + { + "x": 4, + "y": 9, + "elevation": 3, + "dest_map": "MAP_CINNABAR_ISLAND", + "dest_warp_id": 2 + }, + { + "x": 5, + "y": 9, + "elevation": 3, + "dest_map": "MAP_CINNABAR_ISLAND", + "dest_warp_id": 2 + }, + { + "x": 13, + "y": 5, + "elevation": 0, + "dest_map": "MAP_CINNABAR_ISLAND_POKEMON_LAB_LOUNGE", + "dest_warp_id": 0 + }, + { + "x": 19, + "y": 5, + "elevation": 0, + "dest_map": "MAP_CINNABAR_ISLAND_POKEMON_LAB_RESEARCH_ROOM", + "dest_warp_id": 0 + }, + { + "x": 25, + "y": 5, + "elevation": 0, + "dest_map": "MAP_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 4, + "y": 1, + "elevation": 0, + "script": "CinnabarIsland_PokemonLab_Entrance_EventScript_16E294" + }, + { + "type": "bg_event_type_0", + "x": 12, + "y": 5, + "elevation": 0, + "script": "CinnabarIsland_PokemonLab_Entrance_EventScript_16E29D" + }, + { + "type": "bg_event_type_0", + "x": 18, + "y": 5, + "elevation": 0, + "script": "CinnabarIsland_PokemonLab_Entrance_EventScript_16E2A6" + }, + { + "type": "bg_event_type_0", + "x": 24, + "y": 5, + "elevation": 0, + "script": "CinnabarIsland_PokemonLab_Entrance_EventScript_16E2AF" + } + ] +}
\ No newline at end of file diff --git a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/events.inc b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/events.inc deleted file mode 100644 index 75a21aaca..000000000 --- a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/events.inc +++ /dev/null @@ -1,9 +0,0 @@ -CinnabarIsland_PokemonLab_ExperimentRoom_EventObjects: - object_event 1, 19, 0, 11, 0, 8, 0, 3, 7, 17, 0, 0, 0, 0, 0, CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_16E401, 0, 0, 0 - object_event 2, 55, 0, 12, 0, 3, 0, 3, 2, 17, 0, 0, 0, 0, 0, CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_16E47D, 0, 0, 0 - -CinnabarIsland_PokemonLab_ExperimentRoom_MapWarps: - warp_def 7, 9, 3, 5, 3073 - -CinnabarIsland_PokemonLab_ExperimentRoom_MapEvents:: - map_events CinnabarIsland_PokemonLab_ExperimentRoom_EventObjects, CinnabarIsland_PokemonLab_ExperimentRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/header.inc b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/header.inc deleted file mode 100644 index f3dca36f6..000000000 --- a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -CinnabarIsland_PokemonLab_ExperimentRoom:: @ 83515A0 - .4byte CinnabarIsland_PokemonLab_ExperimentRoom_Layout @ 0x831CC54 - .4byte CinnabarIsland_PokemonLab_ExperimentRoom_MapEvents @ 0x83BC7CC - .4byte CinnabarIsland_PokemonLab_ExperimentRoom_MapScripts @ 0x816E400 - .4byte NULL - .2byte BGM_FRLG_CINNABAR_ISLAND - .2byte 206 - .byte 0x60, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/map.json b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/map.json new file mode 100644 index 000000000..8a12c33c7 --- /dev/null +++ b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/map.json @@ -0,0 +1,54 @@ +{ + "id": "MAP_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM", + "name": "CinnabarIsland_PokemonLab_ExperimentRoom", + "layout": "LAYOUT_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM", + "music": "BGM_FRLG_CINNABAR_ISLAND", + "region_map_section": "MAPSEC_CINNABAR_ISLAND", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "19", + "x": 11, + "y": 8, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_16E401", + "flag": "0" + }, + { + "graphics_id": "55", + "x": 12, + "y": 3, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_16E47D", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 7, + "y": 9, + "elevation": 3, + "dest_map": "MAP_CINNABAR_ISLAND_POKEMON_LAB_ENTRANCE", + "dest_warp_id": 5 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/CinnabarIsland_PokemonLab_Lounge/events.inc b/data/maps/CinnabarIsland_PokemonLab_Lounge/events.inc deleted file mode 100644 index 5a507173c..000000000 --- a/data/maps/CinnabarIsland_PokemonLab_Lounge/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -CinnabarIsland_PokemonLab_Lounge_EventObjects: - object_event 1, 55, 0, 5, 0, 3, 0, 3, 2, 17, 0, 0, 0, 0, 0, CinnabarIsland_PokemonLab_Lounge_EventScript_16E2B9, 0, 0, 0 - object_event 2, 33, 0, 4, 0, 6, 0, 3, 8, 17, 0, 0, 0, 0, 0, CinnabarIsland_PokemonLab_Lounge_EventScript_16E2C2, 0, 0, 0 - object_event 3, 28, 0, 10, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, CinnabarIsland_PokemonLab_Lounge_EventScript_16E33E, 0, 0, 0 - -CinnabarIsland_PokemonLab_Lounge_MapWarps: - warp_def 7, 9, 3, 3, 3073 - -CinnabarIsland_PokemonLab_Lounge_MapEvents:: - map_events CinnabarIsland_PokemonLab_Lounge_EventObjects, CinnabarIsland_PokemonLab_Lounge_MapWarps, 0x0, 0x0 diff --git a/data/maps/CinnabarIsland_PokemonLab_Lounge/header.inc b/data/maps/CinnabarIsland_PokemonLab_Lounge/header.inc deleted file mode 100644 index ae3a567d7..000000000 --- a/data/maps/CinnabarIsland_PokemonLab_Lounge/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -CinnabarIsland_PokemonLab_Lounge:: @ 8351568 - .4byte CinnabarIsland_PokemonLab_Lounge_Layout @ 0x831C974 - .4byte CinnabarIsland_PokemonLab_Lounge_MapEvents @ 0x83BC71C - .4byte CinnabarIsland_PokemonLab_Lounge_MapScripts @ 0x816E2B8 - .4byte NULL - .2byte BGM_FRLG_CINNABAR_ISLAND - .2byte 204 - .byte 0x60, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/CinnabarIsland_PokemonLab_Lounge/map.json b/data/maps/CinnabarIsland_PokemonLab_Lounge/map.json new file mode 100644 index 000000000..6fb33bc66 --- /dev/null +++ b/data/maps/CinnabarIsland_PokemonLab_Lounge/map.json @@ -0,0 +1,67 @@ +{ + "id": "MAP_CINNABAR_ISLAND_POKEMON_LAB_LOUNGE", + "name": "CinnabarIsland_PokemonLab_Lounge", + "layout": "LAYOUT_CINNABAR_ISLAND_POKEMON_LAB_LOUNGE", + "music": "BGM_FRLG_CINNABAR_ISLAND", + "region_map_section": "MAPSEC_CINNABAR_ISLAND", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "55", + "x": 5, + "y": 3, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CinnabarIsland_PokemonLab_Lounge_EventScript_16E2B9", + "flag": "0" + }, + { + "graphics_id": "33", + "x": 4, + "y": 6, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CinnabarIsland_PokemonLab_Lounge_EventScript_16E2C2", + "flag": "0" + }, + { + "graphics_id": "28", + "x": 10, + "y": 5, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CinnabarIsland_PokemonLab_Lounge_EventScript_16E33E", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 7, + "y": 9, + "elevation": 3, + "dest_map": "MAP_CINNABAR_ISLAND_POKEMON_LAB_ENTRANCE", + "dest_warp_id": 3 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/events.inc b/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/events.inc deleted file mode 100644 index 5d42ba425..000000000 --- a/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -CinnabarIsland_PokemonLab_ResearchRoom_EventObjects: - object_event 1, 52, 0, 5, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, CinnabarIsland_PokemonLab_ResearchRoom_EventScript_16E3DF, 0, 0, 0 - object_event 2, 55, 0, 10, 0, 3, 0, 3, 2, 17, 0, 0, 0, 0, 0, CinnabarIsland_PokemonLab_ResearchRoom_EventScript_16E3E5, 0, 0, 0 - -CinnabarIsland_PokemonLab_ResearchRoom_MapWarps: - warp_def 7, 9, 3, 4, 3073 - -CinnabarIsland_PokemonLab_ResearchRoom_MapBGEvents: - bg_event 6, 1, 0, 0, 0, CinnabarIsland_PokemonLab_ResearchRoom_EventScript_16E3F7 - bg_event 3, 1, 0, 0, 0, CinnabarIsland_PokemonLab_ResearchRoom_EventScript_16E3EE - -CinnabarIsland_PokemonLab_ResearchRoom_MapEvents:: - map_events CinnabarIsland_PokemonLab_ResearchRoom_EventObjects, CinnabarIsland_PokemonLab_ResearchRoom_MapWarps, 0x0, CinnabarIsland_PokemonLab_ResearchRoom_MapBGEvents diff --git a/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/header.inc b/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/header.inc deleted file mode 100644 index 34e60e452..000000000 --- a/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -CinnabarIsland_PokemonLab_ResearchRoom:: @ 8351584 - .4byte CinnabarIsland_PokemonLab_ResearchRoom_Layout @ 0x831CAE4 - .4byte CinnabarIsland_PokemonLab_ResearchRoom_MapEvents @ 0x83BC780 - .4byte CinnabarIsland_PokemonLab_ResearchRoom_MapScripts @ 0x816E3DE - .4byte NULL - .2byte BGM_FRLG_CINNABAR_ISLAND - .2byte 205 - .byte 0x60, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json b/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json new file mode 100644 index 000000000..f1d049604 --- /dev/null +++ b/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json @@ -0,0 +1,69 @@ +{ + "id": "MAP_CINNABAR_ISLAND_POKEMON_LAB_RESEARCH_ROOM", + "name": "CinnabarIsland_PokemonLab_ResearchRoom", + "layout": "LAYOUT_CINNABAR_ISLAND_POKEMON_LAB_RESEARCH_ROOM", + "music": "BGM_FRLG_CINNABAR_ISLAND", + "region_map_section": "MAPSEC_CINNABAR_ISLAND", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "52", + "x": 5, + "y": 4, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CinnabarIsland_PokemonLab_ResearchRoom_EventScript_16E3DF", + "flag": "0" + }, + { + "graphics_id": "55", + "x": 10, + "y": 3, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CinnabarIsland_PokemonLab_ResearchRoom_EventScript_16E3E5", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 7, + "y": 9, + "elevation": 3, + "dest_map": "MAP_CINNABAR_ISLAND_POKEMON_LAB_ENTRANCE", + "dest_warp_id": 4 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 6, + "y": 1, + "elevation": 0, + "script": "CinnabarIsland_PokemonLab_ResearchRoom_EventScript_16E3F7" + }, + { + "type": "bg_event_type_0", + "x": 3, + "y": 1, + "elevation": 0, + "script": "CinnabarIsland_PokemonLab_ResearchRoom_EventScript_16E3EE" + } + ] +}
\ No newline at end of file diff --git a/data/maps/DiglettsCave_B1F/events.inc b/data/maps/DiglettsCave_B1F/events.inc deleted file mode 100644 index 28fc71f2e..000000000 --- a/data/maps/DiglettsCave_B1F/events.inc +++ /dev/null @@ -1,6 +0,0 @@ -DiglettsCave_B1F_MapWarps: - warp_def 3, 3, 3, 0, 292 - warp_def 82, 71, 3, 1, 294 - -DiglettsCave_B1F_MapEvents:: - map_events 0x0, DiglettsCave_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/DiglettsCave_B1F/header.inc b/data/maps/DiglettsCave_B1F/header.inc deleted file mode 100644 index c72ae342e..000000000 --- a/data/maps/DiglettsCave_B1F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -DiglettsCave_B1F:: @ 834F620 - .4byte DiglettsCave_B1F_Layout @ 0x8303B68 - .4byte DiglettsCave_B1F_MapEvents @ 0x83AF490 - .4byte DiglettsCave_B1F_MapScripts @ 0x8160EF1 - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_FOREST - .2byte 124 - .byte 0x83, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/DiglettsCave_B1F/map.json b/data/maps/DiglettsCave_B1F/map.json new file mode 100644 index 000000000..0494960fb --- /dev/null +++ b/data/maps/DiglettsCave_B1F/map.json @@ -0,0 +1,34 @@ +{ + "id": "MAP_DIGLETTS_CAVE_B1F", + "name": "DiglettsCave_B1F", + "layout": "LAYOUT_DIGLETTS_CAVE_B1F", + "music": "BGM_FRLG_VIRIDIAN_FOREST", + "region_map_section": "MAPSEC_DIGLETTS_CAVE", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 3, + "y": 3, + "elevation": 3, + "dest_map": "MAP_DIGLETTS_CAVE_NORTH_ENTRANCE", + "dest_warp_id": 0 + }, + { + "x": 82, + "y": 71, + "elevation": 3, + "dest_map": "MAP_DIGLETTS_CAVE_SOUTH_ENTRANCE", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/DiglettsCave_NorthEntrance/events.inc b/data/maps/DiglettsCave_NorthEntrance/events.inc deleted file mode 100644 index 6f209ac58..000000000 --- a/data/maps/DiglettsCave_NorthEntrance/events.inc +++ /dev/null @@ -1,9 +0,0 @@ -DiglettsCave_NorthEntrance_EventObjects: - object_event 1, 56, 0, 4, 0, 4, 0, 3, 1, 17, 0, 0, 0, 0, 0, DiglettsCave_NorthEntrance_EventScript_160EE8, 0, 0, 0 - -DiglettsCave_NorthEntrance_MapWarps: - warp_def 6, 4, 3, 0, 293 - warp_def 4, 6, 3, 3, 788 - -DiglettsCave_NorthEntrance_MapEvents:: - map_events DiglettsCave_NorthEntrance_EventObjects, DiglettsCave_NorthEntrance_MapWarps, 0x0, 0x0 diff --git a/data/maps/DiglettsCave_NorthEntrance/header.inc b/data/maps/DiglettsCave_NorthEntrance/header.inc deleted file mode 100644 index ecdeaba44..000000000 --- a/data/maps/DiglettsCave_NorthEntrance/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -DiglettsCave_NorthEntrance:: @ 834F604 - .4byte DiglettsCave_NorthEntrance_Layout @ 0x831EB94 - .4byte DiglettsCave_NorthEntrance_MapEvents @ 0x83AF46C - .4byte DiglettsCave_NorthEntrance_MapScripts @ 0x8160EE7 - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_FOREST - .2byte 210 - .byte 0x83, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/DiglettsCave_NorthEntrance/map.json b/data/maps/DiglettsCave_NorthEntrance/map.json new file mode 100644 index 000000000..77947f6db --- /dev/null +++ b/data/maps/DiglettsCave_NorthEntrance/map.json @@ -0,0 +1,48 @@ +{ + "id": "MAP_DIGLETTS_CAVE_NORTH_ENTRANCE", + "name": "DiglettsCave_NorthEntrance", + "layout": "LAYOUT_DIGLETTS_CAVE_NORTH_ENTRANCE", + "music": "BGM_FRLG_VIRIDIAN_FOREST", + "region_map_section": "MAPSEC_DIGLETTS_CAVE", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "56", + "x": 4, + "y": 4, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "DiglettsCave_NorthEntrance_EventScript_160EE8", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 6, + "y": 4, + "elevation": 3, + "dest_map": "MAP_DIGLETTS_CAVE_B1F", + "dest_warp_id": 0 + }, + { + "x": 4, + "y": 6, + "elevation": 3, + "dest_map": "MAP_ROUTE2", + "dest_warp_id": 3 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/DiglettsCave_SouthEntrance/events.inc b/data/maps/DiglettsCave_SouthEntrance/events.inc deleted file mode 100644 index 3fcda108c..000000000 --- a/data/maps/DiglettsCave_SouthEntrance/events.inc +++ /dev/null @@ -1,9 +0,0 @@ -DiglettsCave_SouthEntrance_EventObjects: - object_event 1, 32, 0, 4, 0, 4, 0, 3, 1, 17, 0, 0, 0, 0, 0, DiglettsCave_SouthEntrance_EventScript_160EFC, 0, 0, 0 - -DiglettsCave_SouthEntrance_MapWarps: - warp_def 4, 6, 3, 0, 797 - warp_def 6, 4, 3, 1, 293 - -DiglettsCave_SouthEntrance_MapEvents:: - map_events DiglettsCave_SouthEntrance_EventObjects, DiglettsCave_SouthEntrance_MapWarps, 0x0, 0x0 diff --git a/data/maps/DiglettsCave_SouthEntrance/header.inc b/data/maps/DiglettsCave_SouthEntrance/header.inc deleted file mode 100644 index 5c84c5307..000000000 --- a/data/maps/DiglettsCave_SouthEntrance/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -DiglettsCave_SouthEntrance:: @ 834F63C - .4byte DiglettsCave_SouthEntrance_Layout @ 0x831EC58 - .4byte DiglettsCave_SouthEntrance_MapEvents @ 0x83AF4CC - .4byte DiglettsCave_SouthEntrance_MapScripts @ 0x8160EFB - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_FOREST - .2byte 211 - .byte 0x83, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/DiglettsCave_SouthEntrance/map.json b/data/maps/DiglettsCave_SouthEntrance/map.json new file mode 100644 index 000000000..2cbe9c6e0 --- /dev/null +++ b/data/maps/DiglettsCave_SouthEntrance/map.json @@ -0,0 +1,48 @@ +{ + "id": "MAP_DIGLETTS_CAVE_SOUTH_ENTRANCE", + "name": "DiglettsCave_SouthEntrance", + "layout": "LAYOUT_DIGLETTS_CAVE_SOUTH_ENTRANCE", + "music": "BGM_FRLG_VIRIDIAN_FOREST", + "region_map_section": "MAPSEC_DIGLETTS_CAVE", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "32", + "x": 4, + "y": 4, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "DiglettsCave_SouthEntrance_EventScript_160EFC", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 4, + "y": 6, + "elevation": 3, + "dest_map": "MAP_ROUTE11", + "dest_warp_id": 0 + }, + { + "x": 6, + "y": 4, + "elevation": 3, + "dest_map": "MAP_DIGLETTS_CAVE_B1F", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/FiveIsland/connections.inc b/data/maps/FiveIsland/connections.inc deleted file mode 100644 index 358b5e899..000000000 --- a/data/maps/FiveIsland/connections.inc +++ /dev/null @@ -1,7 +0,0 @@ -FiveIsland_MapConnectionsList: @ 8352988 - connection up, -48, MAP_FIVE_ISLAND_WATERLABYRINTH - connection right, 0, MAP_FIVE_ISLAND_MEADOW - -FiveIsland_MapConnections:: @ 83529A0 - .4byte 2 - .4byte FiveIsland_MapConnectionsList diff --git a/data/maps/FiveIsland/events.inc b/data/maps/FiveIsland/events.inc deleted file mode 100644 index 251987b17..000000000 --- a/data/maps/FiveIsland/events.inc +++ /dev/null @@ -1,16 +0,0 @@ -FiveIsland_EventObjects: - object_event 1, 57, 0, 8, 0, 5, 0, 3, 9, 17, 0, 0, 0, 0, 0, FiveIsland_EventScript_167EAA, 0, 0, 0 - object_event 2, 20, 0, 16, 0, 10, 0, 3, 2, 17, 0, 0, 0, 0, 0, FiveIsland_EventScript_167EA1, 0, 0, 0 - object_event 3, 65375, 0, 32, 0, 9, 0, 4, 0, 0, 0, 56, 0, 3, 0, 0x0, 0, 0, 0 - -FiveIsland_MapWarps: - warp_def 12, 14, 3, 0, 9218 - warp_def 18, 6, 0, 0, 9216 - warp_def 12, 6, 0, 0, 9219 - warp_def 22, 9, 0, 0, 9220 - -FiveIsland_MapBGEvents: - bg_event 20, 8, 0, 0, 0, FiveIsland_EventScript_167E98 - -FiveIsland_MapEvents:: - map_events FiveIsland_EventObjects, FiveIsland_MapWarps, 0x0, FiveIsland_MapBGEvents diff --git a/data/maps/FiveIsland/header.inc b/data/maps/FiveIsland/header.inc deleted file mode 100644 index b38c6fa44..000000000 --- a/data/maps/FiveIsland/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -FiveIsland:: @ 83507D8 - .4byte FiveIsland_Layout @ 0x8323964 - .4byte FiveIsland_MapEvents @ 0x83B64F4 - .4byte FiveIsland_MapScripts @ 0x8167E8E - .4byte FiveIsland_MapConnections @ 0x83529A0 - .2byte BGM_FRLG_ISLAND_FOUR - .2byte 234 - .byte 0x93, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/FiveIsland/map.json b/data/maps/FiveIsland/map.json new file mode 100644 index 000000000..b34f0aaf0 --- /dev/null +++ b/data/maps/FiveIsland/map.json @@ -0,0 +1,107 @@ +{ + "id": "MAP_FIVE_ISLAND", + "name": "FiveIsland", + "layout": "LAYOUT_FIVE_ISLAND", + "music": "BGM_FRLG_ISLAND_FOUR", + "region_map_section": "MAPSEC_FIVE_ISLAND", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_1", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_FIVE_ISLAND_WATER_LABYRINTH", + "offset": -48, + "direction": "up" + }, + { + "map": "MAP_FIVE_ISLAND_MEADOW", + "offset": 0, + "direction": "right" + } + ], + "object_events": [ + { + "graphics_id": "57", + "x": 8, + "y": 5, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FiveIsland_EventScript_167EAA", + "flag": "0" + }, + { + "graphics_id": "20", + "x": 16, + "y": 10, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FiveIsland_EventScript_167EA1", + "flag": "0" + }, + { + "graphics_id": "65375", + "x": 32, + "y": 9, + "elevation": 4, + "movement_type": "0", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 56, + "trainer_sight_or_berry_tree_id": 3, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 12, + "y": 14, + "elevation": 3, + "dest_map": "MAP_FIVE_ISLAND_HARBOR", + "dest_warp_id": 0 + }, + { + "x": 18, + "y": 6, + "elevation": 0, + "dest_map": "MAP_FIVE_ISLAND_POKEMON_CENTER_1F", + "dest_warp_id": 0 + }, + { + "x": 12, + "y": 6, + "elevation": 0, + "dest_map": "MAP_FIVE_ISLAND_HOUSE1", + "dest_warp_id": 0 + }, + { + "x": 22, + "y": 9, + "elevation": 0, + "dest_map": "MAP_FIVE_ISLAND_HOUSE2", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 20, + "y": 8, + "elevation": 0, + "script": "FiveIsland_EventScript_167E98" + } + ] +}
\ No newline at end of file diff --git a/data/maps/FiveIsland_Harbor/events.inc b/data/maps/FiveIsland_Harbor/events.inc deleted file mode 100644 index 6417e1ee7..000000000 --- a/data/maps/FiveIsland_Harbor/events.inc +++ /dev/null @@ -1,9 +0,0 @@ -FiveIsland_Harbor_EventObjects: - object_event 1, 108, 0, 8, 0, 9, 0, 0, 8, 17, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 - object_event 2, 62, 0, 8, 0, 6, 0, 3, 7, 17, 0, 0, 0, 0, 0, FiveIsland_Harbor_EventScript_171D43, 0, 0, 0 - -FiveIsland_Harbor_MapWarps: - warp_def 8, 2, 3, 0, 784 - -FiveIsland_Harbor_MapEvents:: - map_events FiveIsland_Harbor_EventObjects, FiveIsland_Harbor_MapWarps, 0x0, 0x0 diff --git a/data/maps/FiveIsland_Harbor/header.inc b/data/maps/FiveIsland_Harbor/header.inc deleted file mode 100644 index 1f7a96309..000000000 --- a/data/maps/FiveIsland_Harbor/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -FiveIsland_Harbor:: @ 8351E7C - .4byte Island_Harbor_Layout @ 0x8343FB8 - .4byte FiveIsland_Harbor_MapEvents @ 0x83BEFB4 - .4byte FiveIsland_Harbor_MapScripts @ 0x8171D42 - .4byte NULL - .2byte BGM_FRLG_ISLAND_FOUR - .2byte 315 - .byte 0x93, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/FiveIsland_Harbor/map.json b/data/maps/FiveIsland_Harbor/map.json new file mode 100644 index 000000000..96b4c12b2 --- /dev/null +++ b/data/maps/FiveIsland_Harbor/map.json @@ -0,0 +1,54 @@ +{ + "id": "MAP_FIVE_ISLAND_HARBOR", + "name": "FiveIsland_Harbor", + "layout": "LAYOUT_ISLAND_HARBOR", + "music": "BGM_FRLG_ISLAND_FOUR", + "region_map_section": "MAPSEC_FIVE_ISLAND", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "108", + "x": 8, + "y": 9, + "elevation": 0, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "62", + "x": 8, + "y": 6, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FiveIsland_Harbor_EventScript_171D43", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 8, + "y": 2, + "elevation": 3, + "dest_map": "MAP_FIVE_ISLAND", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/FiveIsland_House1/events.inc b/data/maps/FiveIsland_House1/events.inc deleted file mode 100644 index 8c965a738..000000000 --- a/data/maps/FiveIsland_House1/events.inc +++ /dev/null @@ -1,8 +0,0 @@ -FiveIsland_House1_EventObjects: - object_event 1, 31, 0, 10, 0, 2, 0, 3, 7, 17, 0, 0, 0, 0, 0, FiveIsland_House1_EventScript_171D57, 0, 0, 0 - -FiveIsland_House1_MapWarps: - warp_def 4, 7, 3, 2, 784 - -FiveIsland_House1_MapEvents:: - map_events FiveIsland_House1_EventObjects, FiveIsland_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/FiveIsland_House1/header.inc b/data/maps/FiveIsland_House1/header.inc deleted file mode 100644 index 11d3865ff..000000000 --- a/data/maps/FiveIsland_House1/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -FiveIsland_House1:: @ 8351E98 - .4byte House3_Layout @ 0x82D5CB8 - .4byte FiveIsland_House1_MapEvents @ 0x83BEFE8 - .4byte FiveIsland_House1_MapScripts @ 0x8171D56 - .4byte NULL - .2byte BGM_FRLG_ISLAND_FOUR - .2byte 11 - .byte 0x93, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/FiveIsland_House1/map.json b/data/maps/FiveIsland_House1/map.json new file mode 100644 index 000000000..ffd475b42 --- /dev/null +++ b/data/maps/FiveIsland_House1/map.json @@ -0,0 +1,41 @@ +{ + "id": "MAP_FIVE_ISLAND_HOUSE1", + "name": "FiveIsland_House1", + "layout": "LAYOUT_HOUSE3", + "music": "BGM_FRLG_ISLAND_FOUR", + "region_map_section": "MAPSEC_FIVE_ISLAND", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "31", + "x": 10, + "y": 2, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FiveIsland_House1_EventScript_171D57", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_FIVE_ISLAND", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/FiveIsland_House2/events.inc b/data/maps/FiveIsland_House2/events.inc deleted file mode 100644 index 6884a009e..000000000 --- a/data/maps/FiveIsland_House2/events.inc +++ /dev/null @@ -1,8 +0,0 @@ -FiveIsland_House2_EventObjects: - object_event 1, 32, 0, 2, 0, 3, 0, 3, 2, 33, 0, 0, 0, 0, 0, FiveIsland_House2_EventScript_171D61, 0, 0, 0 - -FiveIsland_House2_MapWarps: - warp_def 4, 7, 3, 3, 784 - -FiveIsland_House2_MapEvents:: - map_events FiveIsland_House2_EventObjects, FiveIsland_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/FiveIsland_House2/header.inc b/data/maps/FiveIsland_House2/header.inc deleted file mode 100644 index 09a7f015f..000000000 --- a/data/maps/FiveIsland_House2/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -FiveIsland_House2:: @ 8351EB4 - .4byte House3_Layout @ 0x82D5CB8 - .4byte FiveIsland_House2_MapEvents @ 0x83BF01C - .4byte FiveIsland_House2_MapScripts @ 0x8171D60 - .4byte NULL - .2byte BGM_FRLG_ISLAND_FOUR - .2byte 11 - .byte 0x93, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/FiveIsland_House2/map.json b/data/maps/FiveIsland_House2/map.json new file mode 100644 index 000000000..bc3d2853c --- /dev/null +++ b/data/maps/FiveIsland_House2/map.json @@ -0,0 +1,41 @@ +{ + "id": "MAP_FIVE_ISLAND_HOUSE2", + "name": "FiveIsland_House2", + "layout": "LAYOUT_HOUSE3", + "music": "BGM_FRLG_ISLAND_FOUR", + "region_map_section": "MAPSEC_FIVE_ISLAND", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "32", + "x": 2, + "y": 3, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 2, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FiveIsland_House2_EventScript_171D61", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_FIVE_ISLAND", + "dest_warp_id": 3 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/FiveIsland_LostCave_Entrance/events.inc b/data/maps/FiveIsland_LostCave_Entrance/events.inc deleted file mode 100644 index 663c7163d..000000000 --- a/data/maps/FiveIsland_LostCave_Entrance/events.inc +++ /dev/null @@ -1,6 +0,0 @@ -FiveIsland_LostCave_Entrance_MapWarps: - warp_def 5, 8, 3, 0, 822 - warp_def 5, 5, 3, 0, 525 - -FiveIsland_LostCave_Entrance_MapEvents:: - map_events 0x0, FiveIsland_LostCave_Entrance_MapWarps, 0x0, 0x0 diff --git a/data/maps/FiveIsland_LostCave_Entrance/header.inc b/data/maps/FiveIsland_LostCave_Entrance/header.inc deleted file mode 100644 index 937061b53..000000000 --- a/data/maps/FiveIsland_LostCave_Entrance/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -FiveIsland_LostCave_Entrance:: @ 83500D8 - .4byte FiveIsland_LostCave_Entrance_Layout @ 0x83454D8 - .4byte FiveIsland_LostCave_Entrance_MapEvents @ 0x83B4354 - .4byte FiveIsland_LostCave_Entrance_MapScripts @ 0x8164BEC - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 320 - .byte 0xb5, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/FiveIsland_LostCave_Entrance/map.json b/data/maps/FiveIsland_LostCave_Entrance/map.json new file mode 100644 index 000000000..c70a0558f --- /dev/null +++ b/data/maps/FiveIsland_LostCave_Entrance/map.json @@ -0,0 +1,34 @@ +{ + "id": "MAP_FIVE_ISLAND_LOST_CAVE_ENTRANCE", + "name": "FiveIsland_LostCave_Entrance", + "layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ENTRANCE", + "music": "BGM_FRLG_MT_EMBER", + "region_map_section": "MAPSEC_LOST_CAVE", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 5, + "y": 8, + "elevation": 3, + "dest_map": "MAP_FIVE_ISLAND_RESORT_GORGEOUS", + "dest_warp_id": 0 + }, + { + "x": 5, + "y": 5, + "elevation": 3, + "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/FiveIsland_LostCave_Room1/events.inc b/data/maps/FiveIsland_LostCave_Room1/events.inc deleted file mode 100644 index b9184c4d1..000000000 --- a/data/maps/FiveIsland_LostCave_Room1/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -FiveIsland_LostCave_Room1_EventObjects: - object_event 1, 56, 0, 5, 0, 4, 0, 3, 2, 17, 0, 1, 0, 1, 0, FiveIsland_LostCave_Room1_EventScript_164BF7, 0, 0, 0 - -FiveIsland_LostCave_Room1_MapWarps: - warp_def 8, 2, 3, 1, 524 - warp_def 5, 1, 3, 3, 525 - warp_def 8, 5, 3, 3, 526 - warp_def 5, 8, 3, 1, 525 - warp_def 2, 5, 3, 2, 525 - -FiveIsland_LostCave_Room1_MapEvents:: - map_events FiveIsland_LostCave_Room1_EventObjects, FiveIsland_LostCave_Room1_MapWarps, 0x0, 0x0 diff --git a/data/maps/FiveIsland_LostCave_Room1/header.inc b/data/maps/FiveIsland_LostCave_Room1/header.inc deleted file mode 100644 index c251be2c2..000000000 --- a/data/maps/FiveIsland_LostCave_Room1/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -FiveIsland_LostCave_Room1:: @ 83500F4 - .4byte FiveIsland_LostCave_Room1_Layout @ 0x83455F0 - .4byte FiveIsland_LostCave_Room1_MapEvents @ 0x83B43A8 - .4byte FiveIsland_LostCave_Room1_MapScripts @ 0x8164BF6 - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 321 - .byte 0xb5, 0x00, 0x06, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/FiveIsland_LostCave_Room1/map.json b/data/maps/FiveIsland_LostCave_Room1/map.json new file mode 100644 index 000000000..195e53dcb --- /dev/null +++ b/data/maps/FiveIsland_LostCave_Room1/map.json @@ -0,0 +1,69 @@ +{ + "id": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1", + "name": "FiveIsland_LostCave_Room1", + "layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM1", + "music": "BGM_FRLG_MT_EMBER", + "region_map_section": "MAPSEC_LOST_CAVE", + "requires_flash": false, + "weather": "WEATHER_6", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "56", + "x": 5, + "y": 4, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "FiveIsland_LostCave_Room1_EventScript_164BF7", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 8, + "y": 2, + "elevation": 3, + "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ENTRANCE", + "dest_warp_id": 1 + }, + { + "x": 5, + "y": 1, + "elevation": 3, + "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1", + "dest_warp_id": 3 + }, + { + "x": 8, + "y": 5, + "elevation": 3, + "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM2", + "dest_warp_id": 3 + }, + { + "x": 5, + "y": 8, + "elevation": 3, + "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1", + "dest_warp_id": 1 + }, + { + "x": 2, + "y": 5, + "elevation": 3, + "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/FiveIsland_LostCave_Room10/events.inc b/data/maps/FiveIsland_LostCave_Room10/events.inc deleted file mode 100644 index 49d050fc3..000000000 --- a/data/maps/FiveIsland_LostCave_Room10/events.inc +++ /dev/null @@ -1,9 +0,0 @@ -FiveIsland_LostCave_Room10_EventObjects: - object_event 1, 28, 0, 5, 0, 5, 0, 3, 7, 17, 0, 0, 0, 0, 0, 0x0, 147, 0, 0 - object_event 2, 92, 0, 5, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, FiveIsland_LostCave_Room10_EventScript_1BEDBB, 504, 0, 0 - -FiveIsland_LostCave_Room10_MapWarps: - warp_def 5, 8, 3, 1, 525 - -FiveIsland_LostCave_Room10_MapEvents:: - map_events FiveIsland_LostCave_Room10_EventObjects, FiveIsland_LostCave_Room10_MapWarps, 0x0, 0x0 diff --git a/data/maps/FiveIsland_LostCave_Room10/header.inc b/data/maps/FiveIsland_LostCave_Room10/header.inc deleted file mode 100644 index e27634f92..000000000 --- a/data/maps/FiveIsland_LostCave_Room10/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -FiveIsland_LostCave_Room10:: @ 83501F0 - .4byte FiveIsland_LostCave_Room10_Layout @ 0x8345FC8 - .4byte FiveIsland_LostCave_Room10_MapEvents @ 0x83B45AC - .4byte FiveIsland_LostCave_Room10_MapScripts @ 0x8164C2D - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 330 - .byte 0xb5, 0x00, 0x06, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/FiveIsland_LostCave_Room10/map.json b/data/maps/FiveIsland_LostCave_Room10/map.json new file mode 100644 index 000000000..42e7f0179 --- /dev/null +++ b/data/maps/FiveIsland_LostCave_Room10/map.json @@ -0,0 +1,54 @@ +{ + "id": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM10", + "name": "FiveIsland_LostCave_Room10", + "layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM10", + "music": "BGM_FRLG_MT_EMBER", + "region_map_section": "MAPSEC_LOST_CAVE", + "requires_flash": false, + "weather": "WEATHER_6", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "28", + "x": 5, + "y": 5, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "147" + }, + { + "graphics_id": "92", + "x": 5, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FiveIsland_LostCave_Room10_EventScript_1BEDBB", + "flag": "504" + } + ], + "warp_events": [ + { + "x": 5, + "y": 8, + "elevation": 3, + "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/FiveIsland_LostCave_Room10/scripts.inc b/data/maps/FiveIsland_LostCave_Room10/scripts.inc index f44edc660..4a8283959 100644 --- a/data/maps/FiveIsland_LostCave_Room10/scripts.inc +++ b/data/maps/FiveIsland_LostCave_Room10/scripts.inc @@ -34,7 +34,7 @@ EventScript_164C52:: @ 8164C52 callstd 4 closemessage call EventScript_164CA5 - warp MAP_FIVE_ISLAND_RESORTGORGEOUS, 255, 39, 10 + warp MAP_FIVE_ISLAND_RESORT_GORGEOUS, 255, 39, 10 waitstate releaseall end diff --git a/data/maps/FiveIsland_LostCave_Room11/events.inc b/data/maps/FiveIsland_LostCave_Room11/events.inc deleted file mode 100644 index caa37b4a1..000000000 --- a/data/maps/FiveIsland_LostCave_Room11/events.inc +++ /dev/null @@ -1,8 +0,0 @@ -FiveIsland_LostCave_Room11_EventObjects: - object_event 1, 92, 0, 5, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, FiveIsland_LostCave_Room11_EventScript_1BEDC8, 505, 0, 0 - -FiveIsland_LostCave_Room11_MapWarps: - warp_def 5, 1, 3, 3, 525 - -FiveIsland_LostCave_Room11_MapEvents:: - map_events FiveIsland_LostCave_Room11_EventObjects, FiveIsland_LostCave_Room11_MapWarps, 0x0, 0x0 diff --git a/data/maps/FiveIsland_LostCave_Room11/header.inc b/data/maps/FiveIsland_LostCave_Room11/header.inc deleted file mode 100644 index 56457b055..000000000 --- a/data/maps/FiveIsland_LostCave_Room11/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -FiveIsland_LostCave_Room11:: @ 835020C - .4byte FiveIsland_LostCave_Room11_Layout @ 0x83460E0 - .4byte FiveIsland_LostCave_Room11_MapEvents @ 0x83B45E0 - .4byte FiveIsland_LostCave_Room11_MapScripts @ 0x8164CCB - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 331 - .byte 0xb5, 0x00, 0x06, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/FiveIsland_LostCave_Room11/map.json b/data/maps/FiveIsland_LostCave_Room11/map.json new file mode 100644 index 000000000..47155c19d --- /dev/null +++ b/data/maps/FiveIsland_LostCave_Room11/map.json @@ -0,0 +1,41 @@ +{ + "id": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM11", + "name": "FiveIsland_LostCave_Room11", + "layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM11", + "music": "BGM_FRLG_MT_EMBER", + "region_map_section": "MAPSEC_LOST_CAVE", + "requires_flash": false, + "weather": "WEATHER_6", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "92", + "x": 5, + "y": 5, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FiveIsland_LostCave_Room11_EventScript_1BEDC8", + "flag": "505" + } + ], + "warp_events": [ + { + "x": 5, + "y": 1, + "elevation": 3, + "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1", + "dest_warp_id": 3 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/FiveIsland_LostCave_Room12/events.inc b/data/maps/FiveIsland_LostCave_Room12/events.inc deleted file mode 100644 index fc54c26b6..000000000 --- a/data/maps/FiveIsland_LostCave_Room12/events.inc +++ /dev/null @@ -1,8 +0,0 @@ -FiveIsland_LostCave_Room12_EventObjects: - object_event 1, 92, 0, 5, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, FiveIsland_LostCave_Room12_EventScript_1BEDD5, 506, 0, 0 - -FiveIsland_LostCave_Room12_MapWarps: - warp_def 5, 8, 3, 1, 525 - -FiveIsland_LostCave_Room12_MapEvents:: - map_events FiveIsland_LostCave_Room12_EventObjects, FiveIsland_LostCave_Room12_MapWarps, 0x0, 0x0 diff --git a/data/maps/FiveIsland_LostCave_Room12/header.inc b/data/maps/FiveIsland_LostCave_Room12/header.inc deleted file mode 100644 index 8629a364d..000000000 --- a/data/maps/FiveIsland_LostCave_Room12/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -FiveIsland_LostCave_Room12:: @ 8350228 - .4byte FiveIsland_LostCave_Room12_Layout @ 0x83461F8 - .4byte FiveIsland_LostCave_Room12_MapEvents @ 0x83B4614 - .4byte FiveIsland_LostCave_Room12_MapScripts @ 0x8164CCC - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 332 - .byte 0xb5, 0x00, 0x06, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/FiveIsland_LostCave_Room12/map.json b/data/maps/FiveIsland_LostCave_Room12/map.json new file mode 100644 index 000000000..cbe79bf74 --- /dev/null +++ b/data/maps/FiveIsland_LostCave_Room12/map.json @@ -0,0 +1,41 @@ +{ + "id": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM12", + "name": "FiveIsland_LostCave_Room12", + "layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM12", + "music": "BGM_FRLG_MT_EMBER", + "region_map_section": "MAPSEC_LOST_CAVE", + "requires_flash": false, + "weather": "WEATHER_6", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "92", + "x": 5, + "y": 5, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FiveIsland_LostCave_Room12_EventScript_1BEDD5", + "flag": "506" + } + ], + "warp_events": [ + { + "x": 5, + "y": 8, + "elevation": 3, + "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/FiveIsland_LostCave_Room13/events.inc b/data/maps/FiveIsland_LostCave_Room13/events.inc deleted file mode 100644 index 0802e023c..000000000 --- a/data/maps/FiveIsland_LostCave_Room13/events.inc +++ /dev/null @@ -1,8 +0,0 @@ -FiveIsland_LostCave_Room13_EventObjects: - object_event 1, 92, 0, 5, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, FiveIsland_LostCave_Room13_EventScript_1BEDE2, 507, 0, 0 - -FiveIsland_LostCave_Room13_MapWarps: - warp_def 2, 5, 3, 2, 525 - -FiveIsland_LostCave_Room13_MapEvents:: - map_events FiveIsland_LostCave_Room13_EventObjects, FiveIsland_LostCave_Room13_MapWarps, 0x0, 0x0 diff --git a/data/maps/FiveIsland_LostCave_Room13/header.inc b/data/maps/FiveIsland_LostCave_Room13/header.inc deleted file mode 100644 index cda5b3670..000000000 --- a/data/maps/FiveIsland_LostCave_Room13/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -FiveIsland_LostCave_Room13:: @ 8350244 - .4byte FiveIsland_LostCave_Room13_Layout @ 0x8346310 - .4byte FiveIsland_LostCave_Room13_MapEvents @ 0x83B4648 - .4byte FiveIsland_LostCave_Room13_MapScripts @ 0x8164CCD - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 333 - .byte 0xb5, 0x00, 0x06, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/FiveIsland_LostCave_Room13/map.json b/data/maps/FiveIsland_LostCave_Room13/map.json new file mode 100644 index 000000000..b39a12fd3 --- /dev/null +++ b/data/maps/FiveIsland_LostCave_Room13/map.json @@ -0,0 +1,41 @@ +{ + "id": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM13", + "name": "FiveIsland_LostCave_Room13", + "layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM13", + "music": "BGM_FRLG_MT_EMBER", + "region_map_section": "MAPSEC_LOST_CAVE", + "requires_flash": false, + "weather": "WEATHER_6", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "92", + "x": 5, + "y": 5, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FiveIsland_LostCave_Room13_EventScript_1BEDE2", + "flag": "507" + } + ], + "warp_events": [ + { + "x": 2, + "y": 5, + "elevation": 3, + "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/FiveIsland_LostCave_Room14/events.inc b/data/maps/FiveIsland_LostCave_Room14/events.inc deleted file mode 100644 index a591f0c1e..000000000 --- a/data/maps/FiveIsland_LostCave_Room14/events.inc +++ /dev/null @@ -1,8 +0,0 @@ -FiveIsland_LostCave_Room14_EventObjects: - object_event 1, 92, 0, 5, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, FiveIsland_LostCave_Room14_EventScript_1BEDEF, 508, 0, 0 - -FiveIsland_LostCave_Room14_MapWarps: - warp_def 8, 5, 3, 4, 525 - -FiveIsland_LostCave_Room14_MapEvents:: - map_events FiveIsland_LostCave_Room14_EventObjects, FiveIsland_LostCave_Room14_MapWarps, 0x0, 0x0 diff --git a/data/maps/FiveIsland_LostCave_Room14/header.inc b/data/maps/FiveIsland_LostCave_Room14/header.inc deleted file mode 100644 index 6470895b4..000000000 --- a/data/maps/FiveIsland_LostCave_Room14/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -FiveIsland_LostCave_Room14:: @ 8350260 - .4byte FiveIsland_LostCave_Room14_Layout @ 0x8346428 - .4byte FiveIsland_LostCave_Room14_MapEvents @ 0x83B467C - .4byte FiveIsland_LostCave_Room14_MapScripts @ 0x8164CCE - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 334 - .byte 0xb5, 0x00, 0x06, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/FiveIsland_LostCave_Room14/map.json b/data/maps/FiveIsland_LostCave_Room14/map.json new file mode 100644 index 000000000..5e4f7aa07 --- /dev/null +++ b/data/maps/FiveIsland_LostCave_Room14/map.json @@ -0,0 +1,41 @@ +{ + "id": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM14", + "name": "FiveIsland_LostCave_Room14", + "layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM14", + "music": "BGM_FRLG_MT_EMBER", + "region_map_section": "MAPSEC_LOST_CAVE", + "requires_flash": false, + "weather": "WEATHER_6", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "92", + "x": 5, + "y": 5, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FiveIsland_LostCave_Room14_EventScript_1BEDEF", + "flag": "508" + } + ], + "warp_events": [ + { + "x": 8, + "y": 5, + "elevation": 3, + "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1", + "dest_warp_id": 4 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/FiveIsland_LostCave_Room2/events.inc b/data/maps/FiveIsland_LostCave_Room2/events.inc deleted file mode 100644 index 30d44861d..000000000 --- a/data/maps/FiveIsland_LostCave_Room2/events.inc +++ /dev/null @@ -1,8 +0,0 @@ -FiveIsland_LostCave_Room2_MapWarps: - warp_def 5, 1, 3, 2, 527 - warp_def 8, 5, 3, 4, 525 - warp_def 5, 8, 3, 0, 535 - warp_def 2, 5, 3, 2, 525 - -FiveIsland_LostCave_Room2_MapEvents:: - map_events 0x0, FiveIsland_LostCave_Room2_MapWarps, 0x0, 0x0 diff --git a/data/maps/FiveIsland_LostCave_Room2/header.inc b/data/maps/FiveIsland_LostCave_Room2/header.inc deleted file mode 100644 index 2861812a2..000000000 --- a/data/maps/FiveIsland_LostCave_Room2/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -FiveIsland_LostCave_Room2:: @ 8350110 - .4byte FiveIsland_LostCave_Room2_Layout @ 0x8345708 - .4byte FiveIsland_LostCave_Room2_MapEvents @ 0x83B43DC - .4byte FiveIsland_LostCave_Room2_MapScripts @ 0x8164C0E - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 322 - .byte 0xb5, 0x00, 0x06, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/FiveIsland_LostCave_Room2/map.json b/data/maps/FiveIsland_LostCave_Room2/map.json new file mode 100644 index 000000000..df991bd96 --- /dev/null +++ b/data/maps/FiveIsland_LostCave_Room2/map.json @@ -0,0 +1,48 @@ +{ + "id": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM2", + "name": "FiveIsland_LostCave_Room2", + "layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM2", + "music": "BGM_FRLG_MT_EMBER", + "region_map_section": "MAPSEC_LOST_CAVE", + "requires_flash": false, + "weather": "WEATHER_6", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 5, + "y": 1, + "elevation": 3, + "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM3", + "dest_warp_id": 2 + }, + { + "x": 8, + "y": 5, + "elevation": 3, + "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1", + "dest_warp_id": 4 + }, + { + "x": 5, + "y": 8, + "elevation": 3, + "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM11", + "dest_warp_id": 0 + }, + { + "x": 2, + "y": 5, + "elevation": 3, + "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/FiveIsland_LostCave_Room3/events.inc b/data/maps/FiveIsland_LostCave_Room3/events.inc deleted file mode 100644 index 04e50762a..000000000 --- a/data/maps/FiveIsland_LostCave_Room3/events.inc +++ /dev/null @@ -1,8 +0,0 @@ -FiveIsland_LostCave_Room3_MapWarps: - warp_def 5, 1, 3, 3, 525 - warp_def 8, 5, 3, 4, 525 - warp_def 5, 8, 3, 0, 528 - warp_def 2, 5, 3, 2, 525 - -FiveIsland_LostCave_Room3_MapEvents:: - map_events 0x0, FiveIsland_LostCave_Room3_MapWarps, 0x0, 0x0 diff --git a/data/maps/FiveIsland_LostCave_Room3/header.inc b/data/maps/FiveIsland_LostCave_Room3/header.inc deleted file mode 100644 index 33c5484e0..000000000 --- a/data/maps/FiveIsland_LostCave_Room3/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -FiveIsland_LostCave_Room3:: @ 835012C - .4byte FiveIsland_LostCave_Room3_Layout @ 0x8345820 - .4byte FiveIsland_LostCave_Room3_MapEvents @ 0x83B4410 - .4byte FiveIsland_LostCave_Room3_MapScripts @ 0x8164C0F - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 323 - .byte 0xb5, 0x00, 0x06, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/FiveIsland_LostCave_Room3/map.json b/data/maps/FiveIsland_LostCave_Room3/map.json new file mode 100644 index 000000000..0fc5622ff --- /dev/null +++ b/data/maps/FiveIsland_LostCave_Room3/map.json @@ -0,0 +1,48 @@ +{ + "id": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM3", + "name": "FiveIsland_LostCave_Room3", + "layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM3", + "music": "BGM_FRLG_MT_EMBER", + "region_map_section": "MAPSEC_LOST_CAVE", + "requires_flash": false, + "weather": "WEATHER_6", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 5, + "y": 1, + "elevation": 3, + "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1", + "dest_warp_id": 3 + }, + { + "x": 8, + "y": 5, + "elevation": 3, + "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1", + "dest_warp_id": 4 + }, + { + "x": 5, + "y": 8, + "elevation": 3, + "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM4", + "dest_warp_id": 0 + }, + { + "x": 2, + "y": 5, + "elevation": 3, + "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/FiveIsland_LostCave_Room4/events.inc b/data/maps/FiveIsland_LostCave_Room4/events.inc deleted file mode 100644 index 6c7ec30b0..000000000 --- a/data/maps/FiveIsland_LostCave_Room4/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -FiveIsland_LostCave_Room4_EventObjects: - object_event 1, 23, 0, 6, 0, 4, 0, 3, 8, 17, 0, 1, 0, 1, 0, FiveIsland_LostCave_Room4_EventScript_164C11, 0, 0, 0 - -FiveIsland_LostCave_Room4_MapWarps: - warp_def 5, 1, 3, 0, 536 - warp_def 8, 5, 3, 4, 525 - warp_def 5, 8, 3, 0, 529 - warp_def 2, 5, 3, 2, 525 - -FiveIsland_LostCave_Room4_MapEvents:: - map_events FiveIsland_LostCave_Room4_EventObjects, FiveIsland_LostCave_Room4_MapWarps, 0x0, 0x0 diff --git a/data/maps/FiveIsland_LostCave_Room4/header.inc b/data/maps/FiveIsland_LostCave_Room4/header.inc deleted file mode 100644 index 966532b31..000000000 --- a/data/maps/FiveIsland_LostCave_Room4/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -FiveIsland_LostCave_Room4:: @ 8350148 - .4byte FiveIsland_LostCave_Room4_Layout @ 0x8345938 - .4byte FiveIsland_LostCave_Room4_MapEvents @ 0x83B445C - .4byte FiveIsland_LostCave_Room4_MapScripts @ 0x8164C10 - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 324 - .byte 0xb5, 0x00, 0x06, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/FiveIsland_LostCave_Room4/map.json b/data/maps/FiveIsland_LostCave_Room4/map.json new file mode 100644 index 000000000..b4d7633ac --- /dev/null +++ b/data/maps/FiveIsland_LostCave_Room4/map.json @@ -0,0 +1,62 @@ +{ + "id": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM4", + "name": "FiveIsland_LostCave_Room4", + "layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM4", + "music": "BGM_FRLG_MT_EMBER", + "region_map_section": "MAPSEC_LOST_CAVE", + "requires_flash": false, + "weather": "WEATHER_6", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "23", + "x": 6, + "y": 4, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "FiveIsland_LostCave_Room4_EventScript_164C11", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 5, + "y": 1, + "elevation": 3, + "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM12", + "dest_warp_id": 0 + }, + { + "x": 8, + "y": 5, + "elevation": 3, + "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1", + "dest_warp_id": 4 + }, + { + "x": 5, + "y": 8, + "elevation": 3, + "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM5", + "dest_warp_id": 0 + }, + { + "x": 2, + "y": 5, + "elevation": 3, + "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/FiveIsland_LostCave_Room5/events.inc b/data/maps/FiveIsland_LostCave_Room5/events.inc deleted file mode 100644 index d16df207c..000000000 --- a/data/maps/FiveIsland_LostCave_Room5/events.inc +++ /dev/null @@ -1,8 +0,0 @@ -FiveIsland_LostCave_Room5_MapWarps: - warp_def 5, 1, 3, 3, 525 - warp_def 8, 5, 3, 3, 530 - warp_def 5, 8, 3, 1, 525 - warp_def 2, 5, 3, 2, 525 - -FiveIsland_LostCave_Room5_MapEvents:: - map_events 0x0, FiveIsland_LostCave_Room5_MapWarps, 0x0, 0x0 diff --git a/data/maps/FiveIsland_LostCave_Room5/header.inc b/data/maps/FiveIsland_LostCave_Room5/header.inc deleted file mode 100644 index 6ec15156f..000000000 --- a/data/maps/FiveIsland_LostCave_Room5/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -FiveIsland_LostCave_Room5:: @ 8350164 - .4byte FiveIsland_LostCave_Room5_Layout @ 0x8345A50 - .4byte FiveIsland_LostCave_Room5_MapEvents @ 0x83B4490 - .4byte FiveIsland_LostCave_Room5_MapScripts @ 0x8164C28 - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 325 - .byte 0xb5, 0x00, 0x06, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/FiveIsland_LostCave_Room5/map.json b/data/maps/FiveIsland_LostCave_Room5/map.json new file mode 100644 index 000000000..dca189071 --- /dev/null +++ b/data/maps/FiveIsland_LostCave_Room5/map.json @@ -0,0 +1,48 @@ +{ + "id": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM5", + "name": "FiveIsland_LostCave_Room5", + "layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM5", + "music": "BGM_FRLG_MT_EMBER", + "region_map_section": "MAPSEC_LOST_CAVE", + "requires_flash": false, + "weather": "WEATHER_6", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 5, + "y": 1, + "elevation": 3, + "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1", + "dest_warp_id": 3 + }, + { + "x": 8, + "y": 5, + "elevation": 3, + "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM6", + "dest_warp_id": 3 + }, + { + "x": 5, + "y": 8, + "elevation": 3, + "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1", + "dest_warp_id": 1 + }, + { + "x": 2, + "y": 5, + "elevation": 3, + "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/FiveIsland_LostCave_Room6/events.inc b/data/maps/FiveIsland_LostCave_Room6/events.inc deleted file mode 100644 index 675db376a..000000000 --- a/data/maps/FiveIsland_LostCave_Room6/events.inc +++ /dev/null @@ -1,8 +0,0 @@ -FiveIsland_LostCave_Room6_MapWarps: - warp_def 5, 1, 3, 3, 525 - warp_def 8, 5, 3, 0, 537 - warp_def 5, 8, 3, 1, 525 - warp_def 2, 5, 3, 1, 531 - -FiveIsland_LostCave_Room6_MapEvents:: - map_events 0x0, FiveIsland_LostCave_Room6_MapWarps, 0x0, 0x0 diff --git a/data/maps/FiveIsland_LostCave_Room6/header.inc b/data/maps/FiveIsland_LostCave_Room6/header.inc deleted file mode 100644 index c45b08d1e..000000000 --- a/data/maps/FiveIsland_LostCave_Room6/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -FiveIsland_LostCave_Room6:: @ 8350180 - .4byte FiveIsland_LostCave_Room6_Layout @ 0x8345B68 - .4byte FiveIsland_LostCave_Room6_MapEvents @ 0x83B44C4 - .4byte FiveIsland_LostCave_Room6_MapScripts @ 0x8164C29 - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 326 - .byte 0xb5, 0x00, 0x06, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/FiveIsland_LostCave_Room6/map.json b/data/maps/FiveIsland_LostCave_Room6/map.json new file mode 100644 index 000000000..e70d5d5cb --- /dev/null +++ b/data/maps/FiveIsland_LostCave_Room6/map.json @@ -0,0 +1,48 @@ +{ + "id": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM6", + "name": "FiveIsland_LostCave_Room6", + "layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM6", + "music": "BGM_FRLG_MT_EMBER", + "region_map_section": "MAPSEC_LOST_CAVE", + "requires_flash": false, + "weather": "WEATHER_6", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 5, + "y": 1, + "elevation": 3, + "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1", + "dest_warp_id": 3 + }, + { + "x": 8, + "y": 5, + "elevation": 3, + "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM13", + "dest_warp_id": 0 + }, + { + "x": 5, + "y": 8, + "elevation": 3, + "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1", + "dest_warp_id": 1 + }, + { + "x": 2, + "y": 5, + "elevation": 3, + "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM7", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/FiveIsland_LostCave_Room7/events.inc b/data/maps/FiveIsland_LostCave_Room7/events.inc deleted file mode 100644 index 72dd3255b..000000000 --- a/data/maps/FiveIsland_LostCave_Room7/events.inc +++ /dev/null @@ -1,8 +0,0 @@ -FiveIsland_LostCave_Room7_MapWarps: - warp_def 5, 1, 3, 3, 525 - warp_def 8, 5, 3, 4, 525 - warp_def 5, 8, 3, 0, 532 - warp_def 2, 5, 3, 2, 525 - -FiveIsland_LostCave_Room7_MapEvents:: - map_events 0x0, FiveIsland_LostCave_Room7_MapWarps, 0x0, 0x0 diff --git a/data/maps/FiveIsland_LostCave_Room7/header.inc b/data/maps/FiveIsland_LostCave_Room7/header.inc deleted file mode 100644 index 17a168e1d..000000000 --- a/data/maps/FiveIsland_LostCave_Room7/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -FiveIsland_LostCave_Room7:: @ 835019C - .4byte FiveIsland_LostCave_Room7_Layout @ 0x8345C80 - .4byte FiveIsland_LostCave_Room7_MapEvents @ 0x83B44F8 - .4byte FiveIsland_LostCave_Room7_MapScripts @ 0x8164C2A - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 327 - .byte 0xb5, 0x00, 0x06, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/FiveIsland_LostCave_Room7/map.json b/data/maps/FiveIsland_LostCave_Room7/map.json new file mode 100644 index 000000000..90b129cb9 --- /dev/null +++ b/data/maps/FiveIsland_LostCave_Room7/map.json @@ -0,0 +1,48 @@ +{ + "id": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM7", + "name": "FiveIsland_LostCave_Room7", + "layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM7", + "music": "BGM_FRLG_MT_EMBER", + "region_map_section": "MAPSEC_LOST_CAVE", + "requires_flash": false, + "weather": "WEATHER_6", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 5, + "y": 1, + "elevation": 3, + "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1", + "dest_warp_id": 3 + }, + { + "x": 8, + "y": 5, + "elevation": 3, + "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1", + "dest_warp_id": 4 + }, + { + "x": 5, + "y": 8, + "elevation": 3, + "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM8", + "dest_warp_id": 0 + }, + { + "x": 2, + "y": 5, + "elevation": 3, + "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/FiveIsland_LostCave_Room8/events.inc b/data/maps/FiveIsland_LostCave_Room8/events.inc deleted file mode 100644 index c7d86e0d8..000000000 --- a/data/maps/FiveIsland_LostCave_Room8/events.inc +++ /dev/null @@ -1,8 +0,0 @@ -FiveIsland_LostCave_Room8_MapWarps: - warp_def 5, 1, 3, 3, 525 - warp_def 8, 5, 3, 3, 533 - warp_def 5, 8, 3, 1, 525 - warp_def 2, 5, 3, 0, 538 - -FiveIsland_LostCave_Room8_MapEvents:: - map_events 0x0, FiveIsland_LostCave_Room8_MapWarps, 0x0, 0x0 diff --git a/data/maps/FiveIsland_LostCave_Room8/header.inc b/data/maps/FiveIsland_LostCave_Room8/header.inc deleted file mode 100644 index 21fa63267..000000000 --- a/data/maps/FiveIsland_LostCave_Room8/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -FiveIsland_LostCave_Room8:: @ 83501B8 - .4byte FiveIsland_LostCave_Room8_Layout @ 0x8345D98 - .4byte FiveIsland_LostCave_Room8_MapEvents @ 0x83B452C - .4byte FiveIsland_LostCave_Room8_MapScripts @ 0x8164C2B - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 328 - .byte 0xb5, 0x00, 0x06, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/FiveIsland_LostCave_Room8/map.json b/data/maps/FiveIsland_LostCave_Room8/map.json new file mode 100644 index 000000000..7dd8dc00d --- /dev/null +++ b/data/maps/FiveIsland_LostCave_Room8/map.json @@ -0,0 +1,48 @@ +{ + "id": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM8", + "name": "FiveIsland_LostCave_Room8", + "layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM8", + "music": "BGM_FRLG_MT_EMBER", + "region_map_section": "MAPSEC_LOST_CAVE", + "requires_flash": false, + "weather": "WEATHER_6", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 5, + "y": 1, + "elevation": 3, + "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1", + "dest_warp_id": 3 + }, + { + "x": 8, + "y": 5, + "elevation": 3, + "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM9", + "dest_warp_id": 3 + }, + { + "x": 5, + "y": 8, + "elevation": 3, + "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1", + "dest_warp_id": 1 + }, + { + "x": 2, + "y": 5, + "elevation": 3, + "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM14", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/FiveIsland_LostCave_Room9/events.inc b/data/maps/FiveIsland_LostCave_Room9/events.inc deleted file mode 100644 index 37bca157c..000000000 --- a/data/maps/FiveIsland_LostCave_Room9/events.inc +++ /dev/null @@ -1,8 +0,0 @@ -FiveIsland_LostCave_Room9_MapWarps: - warp_def 5, 1, 3, 0, 534 - warp_def 8, 5, 3, 4, 525 - warp_def 5, 8, 3, 1, 525 - warp_def 2, 5, 3, 2, 525 - -FiveIsland_LostCave_Room9_MapEvents:: - map_events 0x0, FiveIsland_LostCave_Room9_MapWarps, 0x0, 0x0 diff --git a/data/maps/FiveIsland_LostCave_Room9/header.inc b/data/maps/FiveIsland_LostCave_Room9/header.inc deleted file mode 100644 index 53ef0c34e..000000000 --- a/data/maps/FiveIsland_LostCave_Room9/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -FiveIsland_LostCave_Room9:: @ 83501D4 - .4byte FiveIsland_LostCave_Room9_Layout @ 0x8345EB0 - .4byte FiveIsland_LostCave_Room9_MapEvents @ 0x83B4560 - .4byte FiveIsland_LostCave_Room9_MapScripts @ 0x8164C2C - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 329 - .byte 0xb5, 0x00, 0x06, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/FiveIsland_LostCave_Room9/map.json b/data/maps/FiveIsland_LostCave_Room9/map.json new file mode 100644 index 000000000..857ef6332 --- /dev/null +++ b/data/maps/FiveIsland_LostCave_Room9/map.json @@ -0,0 +1,48 @@ +{ + "id": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM9", + "name": "FiveIsland_LostCave_Room9", + "layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM9", + "music": "BGM_FRLG_MT_EMBER", + "region_map_section": "MAPSEC_LOST_CAVE", + "requires_flash": false, + "weather": "WEATHER_6", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 5, + "y": 1, + "elevation": 3, + "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM10", + "dest_warp_id": 0 + }, + { + "x": 8, + "y": 5, + "elevation": 3, + "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1", + "dest_warp_id": 4 + }, + { + "x": 5, + "y": 8, + "elevation": 3, + "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1", + "dest_warp_id": 1 + }, + { + "x": 2, + "y": 5, + "elevation": 3, + "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/FiveIsland_Meadow/connections.inc b/data/maps/FiveIsland_Meadow/connections.inc deleted file mode 100644 index e6a63a6e1..000000000 --- a/data/maps/FiveIsland_Meadow/connections.inc +++ /dev/null @@ -1,7 +0,0 @@ -FiveIsland_Meadow_MapConnectionsList: @ 8352DDC - connection left, 0, MAP_FIVE_ISLAND - connection right, 20, MAP_FIVE_ISLAND_MEMORIALPILLAR - -FiveIsland_Meadow_MapConnections:: @ 8352DF4 - .4byte 2 - .4byte FiveIsland_Meadow_MapConnectionsList diff --git a/data/maps/FiveIsland_Meadow/events.inc b/data/maps/FiveIsland_Meadow/events.inc deleted file mode 100644 index ec4f57c41..000000000 --- a/data/maps/FiveIsland_Meadow/events.inc +++ /dev/null @@ -1,17 +0,0 @@ -FiveIsland_Meadow_EventObjects: - object_event 1, 50, 0, 18, 0, 18, 0, 3, 2, 17, 0, 1, 0, 1, 0, FiveIsland_Meadow_EventScript_1689BB, 136, 0, 0 - object_event 2, 49, 0, 17, 0, 5, 0, 3, 17, 17, 0, 1, 0, 5, 0, FiveIsland_Meadow_EventScript_16898D, 136, 0, 0 - object_event 3, 49, 0, 11, 0, 27, 0, 3, 10, 17, 0, 1, 0, 3, 0, FiveIsland_Meadow_EventScript_1689A4, 136, 0, 0 - object_event 4, 95, 0, 8, 0, 9, 0, 3, 1, 17, 0, 0, 0, 0, 0, FiveIsland_Meadow_EventScript_1BDF13, 18, 0, 0 - object_event 5, 95, 0, 19, 0, 12, 0, 3, 1, 17, 0, 0, 0, 0, 0, FiveIsland_Meadow_EventScript_1BDF13, 19, 0, 0 - object_event 6, 92, 0, 12, 0, 11, 0, 3, 8, 17, 0, 0, 0, 0, 0, FiveIsland_Meadow_EventScript_1BEC69, 478, 0, 0 - object_event 7, 92, 0, 3, 0, 22, 0, 3, 8, 17, 0, 0, 0, 0, 0, FiveIsland_Meadow_EventScript_1BEC76, 479, 0, 0 - -FiveIsland_Meadow_MapWarps: - warp_def 12, 21, 0, 0, 370 - -FiveIsland_Meadow_MapBGEvents: - bg_event 12, 21, 0, 0, 0, FiveIsland_Meadow_EventScript_168942 - -FiveIsland_Meadow_MapEvents:: - map_events FiveIsland_Meadow_EventObjects, FiveIsland_Meadow_MapWarps, 0x0, FiveIsland_Meadow_MapBGEvents diff --git a/data/maps/FiveIsland_Meadow/header.inc b/data/maps/FiveIsland_Meadow/header.inc deleted file mode 100644 index 4f30d8ae1..000000000 --- a/data/maps/FiveIsland_Meadow/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -FiveIsland_Meadow:: @ 8350C38 - .4byte FiveIsland_Meadow_Layout @ 0x832BAE4 - .4byte FiveIsland_Meadow_MapEvents @ 0x83B8D94 - .4byte FiveIsland_Meadow_MapScripts @ 0x8168932 - .4byte FiveIsland_Meadow_MapConnections @ 0x8352DF4 - .2byte BGM_FRLG_SEVII_ISLANDS - .2byte 248 - .byte 0xa1, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/FiveIsland_Meadow/map.json b/data/maps/FiveIsland_Meadow/map.json new file mode 100644 index 000000000..b2c8232c8 --- /dev/null +++ b/data/maps/FiveIsland_Meadow/map.json @@ -0,0 +1,138 @@ +{ + "id": "MAP_FIVE_ISLAND_MEADOW", + "name": "FiveIsland_Meadow", + "layout": "LAYOUT_FIVE_ISLAND_MEADOW", + "music": "BGM_FRLG_SEVII_ISLANDS", + "region_map_section": "MAPSEC_FIVE_ISLE_MEADOW", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_3", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_FIVE_ISLAND", + "offset": 0, + "direction": "left" + }, + { + "map": "MAP_FIVE_ISLAND_MEMORIAL_PILLAR", + "offset": 20, + "direction": "right" + } + ], + "object_events": [ + { + "graphics_id": "50", + "x": 18, + "y": 18, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "FiveIsland_Meadow_EventScript_1689BB", + "flag": "136" + }, + { + "graphics_id": "49", + "x": 17, + "y": 5, + "elevation": 3, + "movement_type": "17", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "FiveIsland_Meadow_EventScript_16898D", + "flag": "136" + }, + { + "graphics_id": "49", + "x": 11, + "y": 27, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "FiveIsland_Meadow_EventScript_1689A4", + "flag": "136" + }, + { + "graphics_id": "95", + "x": 8, + "y": 9, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FiveIsland_Meadow_EventScript_1BDF13", + "flag": "18" + }, + { + "graphics_id": "95", + "x": 19, + "y": 12, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FiveIsland_Meadow_EventScript_1BDF13", + "flag": "19" + }, + { + "graphics_id": "92", + "x": 12, + "y": 11, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FiveIsland_Meadow_EventScript_1BEC69", + "flag": "478" + }, + { + "graphics_id": "92", + "x": 3, + "y": 22, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FiveIsland_Meadow_EventScript_1BEC76", + "flag": "479" + } + ], + "warp_events": [ + { + "x": 12, + "y": 21, + "elevation": 0, + "dest_map": "MAP_FIVE_ISLAND_ROCKET_WAREHOUSE", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 12, + "y": 21, + "elevation": 0, + "script": "FiveIsland_Meadow_EventScript_168942" + } + ] +}
\ No newline at end of file diff --git a/data/maps/FiveIsland_MemorialPillar/connections.inc b/data/maps/FiveIsland_MemorialPillar/connections.inc deleted file mode 100644 index 24624b004..000000000 --- a/data/maps/FiveIsland_MemorialPillar/connections.inc +++ /dev/null @@ -1,6 +0,0 @@ -FiveIsland_MemorialPillar_MapConnectionsList: @ 8352DFC - connection left, -20, MAP_FIVE_ISLAND_MEADOW - -FiveIsland_MemorialPillar_MapConnections:: @ 8352E08 - .4byte 1 - .4byte FiveIsland_MemorialPillar_MapConnectionsList diff --git a/data/maps/FiveIsland_MemorialPillar/events.inc b/data/maps/FiveIsland_MemorialPillar/events.inc deleted file mode 100644 index 567b8c789..000000000 --- a/data/maps/FiveIsland_MemorialPillar/events.inc +++ /dev/null @@ -1,16 +0,0 @@ -FiveIsland_MemorialPillar_EventObjects: - object_event 1, 25, 0, 8, 0, 44, 0, 4, 15, 17, 0, 0, 0, 0, 0, FiveIsland_MemorialPillar_EventScript_1689D3, 0, 0, 0 - object_event 2, 26, 0, 12, 0, 6, 0, 3, 21, 17, 0, 1, 0, 3, 0, FiveIsland_MemorialPillar_EventScript_1AC317, 0, 0, 0 - object_event 3, 26, 0, 14, 0, 17, 0, 3, 19, 17, 0, 1, 0, 2, 0, FiveIsland_MemorialPillar_EventScript_1AC355, 0, 0, 0 - object_event 4, 26, 0, 17, 0, 31, 0, 3, 2, 17, 0, 1, 0, 3, 0, FiveIsland_MemorialPillar_EventScript_1AC393, 0, 0, 0 - object_event 5, 92, 0, 4, 0, 47, 0, 3, 8, 17, 0, 0, 0, 0, 0, FiveIsland_MemorialPillar_EventScript_1BEC83, 480, 0, 0 - -FiveIsland_MemorialPillar_MapBGEvents: - bg_event 9, 43, 0, 1, 0, FiveIsland_MemorialPillar_EventScript_168A48 - bg_event 8, 52, 3, 7, 0, 107, 170, 1 - bg_event 15, 7, 3, 7, 0, 148, 171, 1 - bg_event 17, 22, 3, 7, 0, 142, 172, 1 - bg_event 14, 25, 3, 7, 0, 149, 173, 1 - -FiveIsland_MemorialPillar_MapEvents:: - map_events FiveIsland_MemorialPillar_EventObjects, 0x0, 0x0, FiveIsland_MemorialPillar_MapBGEvents diff --git a/data/maps/FiveIsland_MemorialPillar/header.inc b/data/maps/FiveIsland_MemorialPillar/header.inc deleted file mode 100644 index 39944fcdf..000000000 --- a/data/maps/FiveIsland_MemorialPillar/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -FiveIsland_MemorialPillar:: @ 8350C54 - .4byte FiveIsland_MemorialPillar_Layout @ 0x832C648 - .4byte FiveIsland_MemorialPillar_MapEvents @ 0x83B8E5C - .4byte FiveIsland_MemorialPillar_MapScripts @ 0x81689D2 - .4byte FiveIsland_MemorialPillar_MapConnections @ 0x8352E08 - .2byte BGM_FRLG_SEVII_ISLANDS - .2byte 249 - .byte 0xa2, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/FiveIsland_MemorialPillar/map.json b/data/maps/FiveIsland_MemorialPillar/map.json new file mode 100644 index 000000000..c8a7325db --- /dev/null +++ b/data/maps/FiveIsland_MemorialPillar/map.json @@ -0,0 +1,135 @@ +{ + "id": "MAP_FIVE_ISLAND_MEMORIAL_PILLAR", + "name": "FiveIsland_MemorialPillar", + "layout": "LAYOUT_FIVE_ISLAND_MEMORIAL_PILLAR", + "music": "BGM_FRLG_SEVII_ISLANDS", + "region_map_section": "MAPSEC_MEMORIAL_PILLAR", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_3", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_FIVE_ISLAND_MEADOW", + "offset": -20, + "direction": "left" + } + ], + "object_events": [ + { + "graphics_id": "25", + "x": 8, + "y": 44, + "elevation": 4, + "movement_type": "15", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FiveIsland_MemorialPillar_EventScript_1689D3", + "flag": "0" + }, + { + "graphics_id": "26", + "x": 12, + "y": 6, + "elevation": 3, + "movement_type": "21", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "FiveIsland_MemorialPillar_EventScript_1AC317", + "flag": "0" + }, + { + "graphics_id": "26", + "x": 14, + "y": 17, + "elevation": 3, + "movement_type": "19", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "FiveIsland_MemorialPillar_EventScript_1AC355", + "flag": "0" + }, + { + "graphics_id": "26", + "x": 17, + "y": 31, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "FiveIsland_MemorialPillar_EventScript_1AC393", + "flag": "0" + }, + { + "graphics_id": "92", + "x": 4, + "y": 47, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FiveIsland_MemorialPillar_EventScript_1BEC83", + "flag": "480" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_1", + "x": 9, + "y": 43, + "elevation": 0, + "script": "FiveIsland_MemorialPillar_EventScript_168A48" + }, + { + "type": "hidden_item", + "x": 8, + "y": 52, + "elevation": 3, + "item": "ITEM_BIG_PEARL", + "flag": "170", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 15, + "y": 7, + "elevation": 3, + "item": "ITEM_RAZZ_BERRY", + "flag": "171", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 17, + "y": 22, + "elevation": 3, + "item": "ITEM_SITRUS_BERRY", + "flag": "172", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 14, + "y": 25, + "elevation": 3, + "item": "ITEM_BLUK_BERRY", + "flag": "173", + "unknown": 1 + } + ] +}
\ No newline at end of file diff --git a/data/maps/FiveIsland_PokemonCenter_1F/events.inc b/data/maps/FiveIsland_PokemonCenter_1F/events.inc deleted file mode 100644 index 3e7db2299..000000000 --- a/data/maps/FiveIsland_PokemonCenter_1F/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -FiveIsland_PokemonCenter_1F_EventObjects: - object_event 1, 64, 0, 7, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, FiveIsland_PokemonCenter_1F_EventScript_171D00, 0, 0, 0 - object_event 2, 42, 0, 9, 0, 4, 0, 3, 7, 17, 0, 0, 0, 0, 0, FiveIsland_PokemonCenter_1F_EventScript_171D12, 0, 0, 0 - object_event 3, 59, 0, 4, 0, 8, 0, 3, 5, 17, 0, 0, 0, 0, 0, FiveIsland_PokemonCenter_1F_EventScript_171D09, 0, 0, 0 - object_event 4, 0, 0, 2, 0, 1, 0, 0, 76, 17, 0, 0, 0, 0, 0, FiveIsland_PokemonCenter_1F_EventScript_1ACF5F, 157, 0, 0 - object_event 5, 0, 0, 3, 0, 1, 0, 0, 76, 17, 0, 0, 0, 0, 0, FiveIsland_PokemonCenter_1F_EventScript_1ACF5F, 157, 0, 0 - -FiveIsland_PokemonCenter_1F_MapWarps: - warp_def 7, 8, 3, 1, 784 - warp_def 1, 6, 4, 0, 9217 - -FiveIsland_PokemonCenter_1F_MapEvents:: - map_events FiveIsland_PokemonCenter_1F_EventObjects, FiveIsland_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/FiveIsland_PokemonCenter_1F/header.inc b/data/maps/FiveIsland_PokemonCenter_1F/header.inc deleted file mode 100644 index ed32a33e9..000000000 --- a/data/maps/FiveIsland_PokemonCenter_1F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -FiveIsland_PokemonCenter_1F:: @ 8351E44 - .4byte PokemonCenter_1F_Layout @ 0x82D5990 - .4byte FiveIsland_PokemonCenter_1F_MapEvents @ 0x83BEEDC - .4byte FiveIsland_PokemonCenter_1F_MapScripts @ 0x8171CF1 - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 8 - .byte 0x93, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/FiveIsland_PokemonCenter_1F/map.json b/data/maps/FiveIsland_PokemonCenter_1F/map.json new file mode 100644 index 000000000..d5fffc7a9 --- /dev/null +++ b/data/maps/FiveIsland_PokemonCenter_1F/map.json @@ -0,0 +1,100 @@ +{ + "id": "MAP_FIVE_ISLAND_POKEMON_CENTER_1F", + "name": "FiveIsland_PokemonCenter_1F", + "layout": "LAYOUT_POKEMON_CENTER_1F", + "music": "BGM_FRLG_POKEMON_CENTER", + "region_map_section": "MAPSEC_FIVE_ISLAND", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "64", + "x": 7, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FiveIsland_PokemonCenter_1F_EventScript_171D00", + "flag": "0" + }, + { + "graphics_id": "42", + "x": 9, + "y": 4, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FiveIsland_PokemonCenter_1F_EventScript_171D12", + "flag": "0" + }, + { + "graphics_id": "59", + "x": 4, + "y": 8, + "elevation": 3, + "movement_type": "5", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FiveIsland_PokemonCenter_1F_EventScript_171D09", + "flag": "0" + }, + { + "graphics_id": "0", + "x": 2, + "y": 1, + "elevation": 0, + "movement_type": "76", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FiveIsland_PokemonCenter_1F_EventScript_1ACF5F", + "flag": "157" + }, + { + "graphics_id": "0", + "x": 3, + "y": 1, + "elevation": 0, + "movement_type": "76", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FiveIsland_PokemonCenter_1F_EventScript_1ACF5F", + "flag": "157" + } + ], + "warp_events": [ + { + "x": 7, + "y": 8, + "elevation": 3, + "dest_map": "MAP_FIVE_ISLAND", + "dest_warp_id": 1 + }, + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_FIVE_ISLAND_POKEMON_CENTER_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/FiveIsland_PokemonCenter_2F/events.inc b/data/maps/FiveIsland_PokemonCenter_2F/events.inc deleted file mode 100644 index 13819a9a9..000000000 --- a/data/maps/FiveIsland_PokemonCenter_2F/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -FiveIsland_PokemonCenter_2F_EventObjects: - object_event 1, 65, 0, 6, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, FiveIsland_PokemonCenter_2F_EventScript_1A8CF6, 0, 0, 0 - object_event 2, 65, 0, 2, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, FiveIsland_PokemonCenter_2F_EventScript_1A8CFC, 0, 0, 0 - object_event 3, 65, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, FiveIsland_PokemonCenter_2F_EventScript_1A8D02, 0, 0, 0 - object_event 4, 69, 0, 1, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, FiveIsland_PokemonCenter_2F_EventScript_1BB1D2, 112, 0, 0 - -FiveIsland_PokemonCenter_2F_MapWarps: - warp_def 1, 6, 4, 1, 9216 - warp_def 5, 1, 0, 0, 4 - warp_def 9, 1, 0, 0, 1 - -FiveIsland_PokemonCenter_2F_MapEvents:: - map_events FiveIsland_PokemonCenter_2F_EventObjects, FiveIsland_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/FiveIsland_PokemonCenter_2F/header.inc b/data/maps/FiveIsland_PokemonCenter_2F/header.inc deleted file mode 100644 index fd00cabd4..000000000 --- a/data/maps/FiveIsland_PokemonCenter_2F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -FiveIsland_PokemonCenter_2F:: @ 8351E60 - .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 - .4byte FiveIsland_PokemonCenter_2F_MapEvents @ 0x83BEF68 - .4byte FiveIsland_PokemonCenter_2F_MapScripts @ 0x8171D1B - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 9 - .byte 0x93, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/FiveIsland_PokemonCenter_2F/map.json b/data/maps/FiveIsland_PokemonCenter_2F/map.json new file mode 100644 index 000000000..2efdd61d5 --- /dev/null +++ b/data/maps/FiveIsland_PokemonCenter_2F/map.json @@ -0,0 +1,94 @@ +{ + "id": "MAP_FIVE_ISLAND_POKEMON_CENTER_2F", + "name": "FiveIsland_PokemonCenter_2F", + "layout": "LAYOUT_POKEMON_CENTER_2F", + "music": "BGM_FRLG_POKEMON_CENTER", + "region_map_section": "MAPSEC_FIVE_ISLAND", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "65", + "x": 6, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FiveIsland_PokemonCenter_2F_EventScript_1A8CF6", + "flag": "0" + }, + { + "graphics_id": "65", + "x": 2, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FiveIsland_PokemonCenter_2F_EventScript_1A8CFC", + "flag": "0" + }, + { + "graphics_id": "65", + "x": 10, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FiveIsland_PokemonCenter_2F_EventScript_1A8D02", + "flag": "0" + }, + { + "graphics_id": "69", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FiveIsland_PokemonCenter_2F_EventScript_1BB1D2", + "flag": "112" + } + ], + "warp_events": [ + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_FIVE_ISLAND_POKEMON_CENTER_1F", + "dest_warp_id": 1 + }, + { + "x": 5, + "y": 1, + "elevation": 0, + "dest_map": "MAP_UNKNOWN_MAP_00_04", + "dest_warp_id": 0 + }, + { + "x": 9, + "y": 1, + "elevation": 0, + "dest_map": "MAP_UNKNOWN_MAP_00_01", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/FiveIsland_ResortGorgeous/connections.inc b/data/maps/FiveIsland_ResortGorgeous/connections.inc deleted file mode 100644 index a7f2f02dc..000000000 --- a/data/maps/FiveIsland_ResortGorgeous/connections.inc +++ /dev/null @@ -1,6 +0,0 @@ -FiveIsland_ResortGorgeous_MapConnectionsList: @ 8352DA8 - connection down, -48, MAP_FIVE_ISLAND_WATERLABYRINTH - -FiveIsland_ResortGorgeous_MapConnections:: @ 8352DB4 - .4byte 1 - .4byte FiveIsland_ResortGorgeous_MapConnectionsList diff --git a/data/maps/FiveIsland_ResortGorgeous/events.inc b/data/maps/FiveIsland_ResortGorgeous/events.inc deleted file mode 100644 index a9f1df1db..000000000 --- a/data/maps/FiveIsland_ResortGorgeous/events.inc +++ /dev/null @@ -1,23 +0,0 @@ -FiveIsland_ResortGorgeous_EventObjects: - object_event 1, 22, 0, 44, 0, 10, 0, 3, 18, 17, 0, 1, 0, 3, 0, FiveIsland_ResortGorgeous_EventScript_1AC127, 0, 0, 0 - object_event 2, 22, 0, 33, 0, 12, 0, 3, 7, 17, 0, 1, 0, 4, 0, FiveIsland_ResortGorgeous_EventScript_1AC165, 0, 0, 0 - object_event 3, 22, 0, 12, 0, 10, 0, 3, 8, 17, 0, 1, 0, 1, 0, FiveIsland_ResortGorgeous_EventScript_1AC1A3, 0, 0, 0 - object_event 4, 28, 0, 23, 0, 9, 0, 3, 2, 18, 0, 1, 0, 1, 0, FiveIsland_ResortGorgeous_EventScript_1AC1E1, 0, 0, 0 - object_event 5, 28, 0, 33, 0, 8, 0, 3, 8, 17, 0, 1, 0, 1, 0, FiveIsland_ResortGorgeous_EventScript_1AC21F, 0, 0, 0 - object_event 6, 18, 0, 33, 0, 3, 0, 3, 46, 26, 0, 1, 0, 1, 0, FiveIsland_ResortGorgeous_EventScript_1AC25D, 0, 0, 0 - object_event 7, 43, 0, 56, 0, 7, 0, 1, 1, 17, 0, 1, 0, 1, 0, FiveIsland_ResortGorgeous_EventScript_1AC29B, 0, 0, 0 - object_event 8, 28, 0, 39, 0, 9, 0, 3, 8, 17, 0, 0, 0, 0, 0, 0x0, 148, 0, 0 - -FiveIsland_ResortGorgeous_MapWarps: - warp_def 64, 13, 3, 0, 524 - warp_def 39, 8, 0, 0, 9984 - -FiveIsland_ResortGorgeous_MapBGEvents: - bg_event 10, 7, 3, 7, 0, 8, 174, 1 - bg_event 27, 11, 3, 7, 0, 108, 175, 1 - bg_event 40, 12, 3, 7, 0, 109, 176, 1 - bg_event 27, 5, 3, 7, 0, 108, 177, 1 - bg_event 42, 9, 0, 0, 0, FiveIsland_ResortGorgeous_EventScript_168844 - -FiveIsland_ResortGorgeous_MapEvents:: - map_events FiveIsland_ResortGorgeous_EventObjects, FiveIsland_ResortGorgeous_MapWarps, 0x0, FiveIsland_ResortGorgeous_MapBGEvents diff --git a/data/maps/FiveIsland_ResortGorgeous/header.inc b/data/maps/FiveIsland_ResortGorgeous/header.inc deleted file mode 100644 index ecbc20c6d..000000000 --- a/data/maps/FiveIsland_ResortGorgeous/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -FiveIsland_ResortGorgeous:: @ 8350C00 - .4byte FiveIsland_ResortGorgeous_Layout @ 0x832A7DC - .4byte FiveIsland_ResortGorgeous_MapEvents @ 0x83B8C80 - .4byte FiveIsland_ResortGorgeous_MapScripts @ 0x81687E4 - .4byte FiveIsland_ResortGorgeous_MapConnections @ 0x8352DB4 - .2byte BGM_FRLG_SEVII_ISLANDS - .2byte 246 - .byte 0x9f, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/FiveIsland_ResortGorgeous/map.json b/data/maps/FiveIsland_ResortGorgeous/map.json new file mode 100644 index 000000000..dfb2407d0 --- /dev/null +++ b/data/maps/FiveIsland_ResortGorgeous/map.json @@ -0,0 +1,189 @@ +{ + "id": "MAP_FIVE_ISLAND_RESORT_GORGEOUS", + "name": "FiveIsland_ResortGorgeous", + "layout": "LAYOUT_FIVE_ISLAND_RESORT_GORGEOUS", + "music": "BGM_FRLG_SEVII_ISLANDS", + "region_map_section": "MAPSEC_RESORT_GORGEOUS", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_3", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_FIVE_ISLAND_WATER_LABYRINTH", + "offset": -48, + "direction": "down" + } + ], + "object_events": [ + { + "graphics_id": "22", + "x": 44, + "y": 10, + "elevation": 3, + "movement_type": "18", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "FiveIsland_ResortGorgeous_EventScript_1AC127", + "flag": "0" + }, + { + "graphics_id": "22", + "x": 33, + "y": 12, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "FiveIsland_ResortGorgeous_EventScript_1AC165", + "flag": "0" + }, + { + "graphics_id": "22", + "x": 12, + "y": 10, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "FiveIsland_ResortGorgeous_EventScript_1AC1A3", + "flag": "0" + }, + { + "graphics_id": "28", + "x": 23, + "y": 9, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 2, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "FiveIsland_ResortGorgeous_EventScript_1AC1E1", + "flag": "0" + }, + { + "graphics_id": "28", + "x": 33, + "y": 8, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "FiveIsland_ResortGorgeous_EventScript_1AC21F", + "flag": "0" + }, + { + "graphics_id": "18", + "x": 33, + "y": 3, + "elevation": 3, + "movement_type": "46", + "movement_range_x": 10, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "FiveIsland_ResortGorgeous_EventScript_1AC25D", + "flag": "0" + }, + { + "graphics_id": "43", + "x": 56, + "y": 7, + "elevation": 1, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "FiveIsland_ResortGorgeous_EventScript_1AC29B", + "flag": "0" + }, + { + "graphics_id": "28", + "x": 39, + "y": 9, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "148" + } + ], + "warp_events": [ + { + "x": 64, + "y": 13, + "elevation": 3, + "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ENTRANCE", + "dest_warp_id": 0 + }, + { + "x": 39, + "y": 8, + "elevation": 0, + "dest_map": "MAP_FIVE_ISLAND_RESORT_GORGEOUS_HOUSE", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "hidden_item", + "x": 10, + "y": 7, + "elevation": 3, + "item": "ITEM_NEST_BALL", + "flag": "174", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 27, + "y": 11, + "elevation": 3, + "item": "ITEM_STARDUST", + "flag": "175", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 40, + "y": 12, + "elevation": 3, + "item": "ITEM_STAR_PIECE", + "flag": "176", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 27, + "y": 5, + "elevation": 3, + "item": "ITEM_STARDUST", + "flag": "177", + "unknown": 1 + }, + { + "type": "bg_event_type_0", + "x": 42, + "y": 9, + "elevation": 0, + "script": "FiveIsland_ResortGorgeous_EventScript_168844" + } + ] +}
\ No newline at end of file diff --git a/data/maps/FiveIsland_ResortGorgeous_House/events.inc b/data/maps/FiveIsland_ResortGorgeous_House/events.inc deleted file mode 100644 index ea5ba7114..000000000 --- a/data/maps/FiveIsland_ResortGorgeous_House/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -FiveIsland_ResortGorgeous_House_EventObjects: - object_event 1, 28, 0, 4, 0, 4, 0, 3, 10, 17, 0, 0, 0, 0, 0, FiveIsland_ResortGorgeous_House_EventScript_171EBE, 149, 0, 0 - object_event 2, 61, 0, 6, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, FiveIsland_ResortGorgeous_House_EventScript_172062, 150, 0, 0 - -FiveIsland_ResortGorgeous_House_MapWarps: - warp_def 4, 7, 3, 1, 822 - -FiveIsland_ResortGorgeous_House_MapBGEvents: - bg_event 9, 1, 0, 1, 0, FiveIsland_ResortGorgeous_House_EventScript_1ACF2C - bg_event 8, 1, 0, 1, 0, FiveIsland_ResortGorgeous_House_EventScript_1ACF2C - -FiveIsland_ResortGorgeous_House_MapEvents:: - map_events FiveIsland_ResortGorgeous_House_EventObjects, FiveIsland_ResortGorgeous_House_MapWarps, 0x0, FiveIsland_ResortGorgeous_House_MapBGEvents diff --git a/data/maps/FiveIsland_ResortGorgeous_House/header.inc b/data/maps/FiveIsland_ResortGorgeous_House/header.inc deleted file mode 100644 index 9ef744a47..000000000 --- a/data/maps/FiveIsland_ResortGorgeous_House/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -FiveIsland_ResortGorgeous_House:: @ 8351F78 - .4byte FiveIsland_ResortGorgeous_House_Layout @ 0x82D657C - .4byte FiveIsland_ResortGorgeous_House_MapEvents @ 0x83BF2C0 - .4byte FiveIsland_ResortGorgeous_House_MapScripts @ 0x8171EBD - .4byte NULL - .2byte BGM_FRLG_ISLAND_FOUR - .2byte 17 - .byte 0x9f, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/FiveIsland_ResortGorgeous_House/map.json b/data/maps/FiveIsland_ResortGorgeous_House/map.json new file mode 100644 index 000000000..ec97e8cf0 --- /dev/null +++ b/data/maps/FiveIsland_ResortGorgeous_House/map.json @@ -0,0 +1,69 @@ +{ + "id": "MAP_FIVE_ISLAND_RESORT_GORGEOUS_HOUSE", + "name": "FiveIsland_ResortGorgeous_House", + "layout": "LAYOUT_FIVE_ISLAND_RESORT_GORGEOUS_HOUSE", + "music": "BGM_FRLG_ISLAND_FOUR", + "region_map_section": "MAPSEC_RESORT_GORGEOUS", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "28", + "x": 4, + "y": 4, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FiveIsland_ResortGorgeous_House_EventScript_171EBE", + "flag": "149" + }, + { + "graphics_id": "61", + "x": 6, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FiveIsland_ResortGorgeous_House_EventScript_172062", + "flag": "150" + } + ], + "warp_events": [ + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_FIVE_ISLAND_RESORT_GORGEOUS", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_1", + "x": 9, + "y": 1, + "elevation": 0, + "script": "FiveIsland_ResortGorgeous_House_EventScript_1ACF2C" + }, + { + "type": "bg_event_type_1", + "x": 8, + "y": 1, + "elevation": 0, + "script": "FiveIsland_ResortGorgeous_House_EventScript_1ACF2C" + } + ] +}
\ No newline at end of file diff --git a/data/maps/FiveIsland_RocketWarehouse/map.json b/data/maps/FiveIsland_RocketWarehouse/map.json new file mode 100644 index 000000000..96b5b0286 --- /dev/null +++ b/data/maps/FiveIsland_RocketWarehouse/map.json @@ -0,0 +1,366 @@ +{ + "id": "MAP_FIVE_ISLAND_ROCKET_WAREHOUSE", + "name": "FiveIsland_RocketWarehouse", + "layout": "LAYOUT_FIVE_ISLAND_ROCKET_WAREHOUSE", + "music": "BGM_FRLG_ROCKET_HIDEOUT", + "region_map_section": "MAPSEC_ROCKET_WAREHOUSE", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 5, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_3", + "connections": null, + "object_events": [ + { + "graphics_id": "49", + "x": 15, + "y": 11, + "elevation": 3, + "movement_type": "17", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "SSAnne_CaptainsOffice4_EventScript_163FE6", + "flag": "136" + }, + { + "graphics_id": "49", + "x": 17, + "y": 15, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "SSAnne_CaptainsOffice4_EventScript_163FFD", + "flag": "136" + }, + { + "graphics_id": "50", + "x": 27, + "y": 16, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "SSAnne_CaptainsOffice4_EventScript_164087", + "flag": "136" + }, + { + "graphics_id": "49", + "x": 25, + "y": 11, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "SSAnne_CaptainsOffice4_EventScript_164014", + "flag": "136" + }, + { + "graphics_id": "50", + "x": 6, + "y": 6, + "elevation": 3, + "movement_type": "16", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "SSAnne_CaptainsOffice4_EventScript_164070", + "flag": "136" + }, + { + "graphics_id": "55", + "x": 27, + "y": 4, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 0, + "script": "SSAnne_CaptainsOffice4_EventScript_163F93", + "flag": "0" + }, + { + "graphics_id": "92", + "x": 8, + "y": 25, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SSAnne_CaptainsOffice4_EventScript_1BED87", + "flag": "500" + }, + { + "graphics_id": "92", + "x": 17, + "y": 3, + "elevation": 0, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SSAnne_CaptainsOffice4_EventScript_1BED94", + "flag": "501" + }, + { + "graphics_id": "92", + "x": 1, + "y": 16, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SSAnne_CaptainsOffice4_EventScript_1BEDA1", + "flag": "502" + }, + { + "graphics_id": "92", + "x": 4, + "y": 5, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SSAnne_CaptainsOffice4_EventScript_1BEDAE", + "flag": "503" + } + ], + "warp_events": [ + { + "x": 24, + "y": 25, + "elevation": 3, + "dest_map": "MAP_FIVE_ISLAND_MEADOW", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 22, + "y": 11, + "elevation": 3, + "var": "VAR_0x4088", + "var_value": 0, + "script": "SSAnne_CaptainsOffice4_EventScript_163F81" + }, + { + "type": "trigger", + "x": 23, + "y": 11, + "elevation": 3, + "var": "VAR_0x4088", + "var_value": 0, + "script": "SSAnne_CaptainsOffice4_EventScript_163F81" + }, + { + "type": "trigger", + "x": 24, + "y": 11, + "elevation": 3, + "var": "VAR_0x4088", + "var_value": 0, + "script": "SSAnne_CaptainsOffice4_EventScript_163F81" + } + ], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 11, + "y": 2, + "elevation": 0, + "script": "SSAnne_CaptainsOffice4_EventScript_163F5A" + }, + { + "type": "bg_event_type_3", + "x": 26, + "y": 11, + "elevation": 0, + "script": "SSAnne_CaptainsOffice4_EventScript_163F78" + }, + { + "type": "hidden_item", + "x": 27, + "y": 2, + "elevation": 0, + "item": "ITEM_NEST_BALL", + "flag": "68", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 7, + "y": 16, + "elevation": 0, + "item": "ITEM_NET_BALL", + "flag": "69", + "unknown": 1 + }, + { + "type": "bg_event_type_0", + "x": 12, + "y": 2, + "elevation": 0, + "script": "SSAnne_CaptainsOffice4_EventScript_163F5A" + }, + { + "type": "bg_event_type_0", + "x": 10, + "y": 2, + "elevation": 0, + "script": "SSAnne_CaptainsOffice4_EventScript_163F5A" + }, + { + "type": "bg_event_type_0", + "x": 9, + "y": 2, + "elevation": 0, + "script": "SSAnne_CaptainsOffice4_EventScript_163F5A" + }, + { + "type": "bg_event_type_0", + "x": 8, + "y": 2, + "elevation": 0, + "script": "SSAnne_CaptainsOffice4_EventScript_163F5A" + }, + { + "type": "bg_event_type_0", + "x": 7, + "y": 2, + "elevation": 0, + "script": "SSAnne_CaptainsOffice4_EventScript_163F5A" + }, + { + "type": "bg_event_type_0", + "x": 11, + "y": 5, + "elevation": 0, + "script": "SSAnne_CaptainsOffice4_EventScript_163F5A" + }, + { + "type": "bg_event_type_0", + "x": 10, + "y": 5, + "elevation": 0, + "script": "SSAnne_CaptainsOffice4_EventScript_163F5A" + }, + { + "type": "bg_event_type_0", + "x": 11, + "y": 4, + "elevation": 0, + "script": "SSAnne_CaptainsOffice4_EventScript_163F5A" + }, + { + "type": "bg_event_type_0", + "x": 10, + "y": 4, + "elevation": 0, + "script": "SSAnne_CaptainsOffice4_EventScript_163F5A" + }, + { + "type": "bg_event_type_0", + "x": 8, + "y": 4, + "elevation": 0, + "script": "SSAnne_CaptainsOffice4_EventScript_163F5A" + }, + { + "type": "bg_event_type_0", + "x": 7, + "y": 4, + "elevation": 0, + "script": "SSAnne_CaptainsOffice4_EventScript_163F5A" + }, + { + "type": "bg_event_type_0", + "x": 8, + "y": 5, + "elevation": 0, + "script": "SSAnne_CaptainsOffice4_EventScript_163F5A" + }, + { + "type": "bg_event_type_0", + "x": 7, + "y": 5, + "elevation": 0, + "script": "SSAnne_CaptainsOffice4_EventScript_163F5A" + }, + { + "type": "bg_event_type_0", + "x": 5, + "y": 3, + "elevation": 0, + "script": "SSAnne_CaptainsOffice4_EventScript_163F5A" + }, + { + "type": "bg_event_type_0", + "x": 4, + "y": 3, + "elevation": 0, + "script": "SSAnne_CaptainsOffice4_EventScript_163F5A" + }, + { + "type": "bg_event_type_0", + "x": 5, + "y": 4, + "elevation": 0, + "script": "SSAnne_CaptainsOffice4_EventScript_163F5A" + }, + { + "type": "bg_event_type_0", + "x": 4, + "y": 4, + "elevation": 0, + "script": "SSAnne_CaptainsOffice4_EventScript_163F5A" + }, + { + "type": "bg_event_type_0", + "x": 3, + "y": 4, + "elevation": 0, + "script": "SSAnne_CaptainsOffice4_EventScript_163F5A" + }, + { + "type": "bg_event_type_0", + "x": 2, + "y": 4, + "elevation": 0, + "script": "SSAnne_CaptainsOffice4_EventScript_163F5A" + }, + { + "type": "bg_event_type_0", + "x": 2, + "y": 5, + "elevation": 0, + "script": "SSAnne_CaptainsOffice4_EventScript_163F5A" + }, + { + "type": "bg_event_type_0", + "x": 3, + "y": 5, + "elevation": 0, + "script": "SSAnne_CaptainsOffice4_EventScript_163F5A" + } + ] +}
\ No newline at end of file diff --git a/data/maps/FiveIsland_RocketWarehouse/scripts.inc b/data/maps/FiveIsland_RocketWarehouse/scripts.inc new file mode 100644 index 000000000..c90174e86 --- /dev/null +++ b/data/maps/FiveIsland_RocketWarehouse/scripts.inc @@ -0,0 +1,202 @@ +FiveIsland_RocketWarehouse_MapScripts:: @ 8163F2E + map_script 1, SSAnne_CaptainsOffice4_MapScript1_163F3D + map_script 3, SSAnne_CaptainsOffice4_MapScript2_163F39 + .byte 0 + +SSAnne_CaptainsOffice4_MapScript2_163F39:: @ 8163F39 + setworldmapflag 2233 + end + +SSAnne_CaptainsOffice4_MapScript1_163F3D:: @ 8163F3D + checktrainerflag 543 + call_if 1, EventScript_163F47 + end + +EventScript_163F47:: @ 8163F47 + setmetatile 26, 20, 672, 0 + setmetatile 27, 20, 672, 0 + return + +SSAnne_CaptainsOffice4_EventScript_163F5A:: @ 8163F5A + lockall + checkflag FLAG_0x2D5 + goto_if 1, EventScript_163F6E + loadword 0, gUnknown_817B4E3 + callstd 4 + releaseall + end + +EventScript_163F6E:: @ 8163F6E + loadword 0, gUnknown_817B512 + callstd 4 + releaseall + end + +SSAnne_CaptainsOffice4_EventScript_163F78:: @ 8163F78 + loadword 0, gUnknown_817BB15 + callstd 3 + end + +SSAnne_CaptainsOffice4_EventScript_163F81:: @ 8163F81 + lockall + applymovement 4, Movement_1A75E7 + waitmovement 0 + setvar VAR_0x4088, 1 + releaseall + end + +SSAnne_CaptainsOffice4_EventScript_163F93:: @ 8163F93 + trainerbattle 2, 545, 0, Text_17BBAF, Text_17BC55, EventScript_163FCD + checkflag 2116 + goto_if 1, EventScript_163FB7 + loadword 0, gUnknown_817BCA3 + callstd 6 + end + +EventScript_163FB7:: @ 8163FB7 + setvar VAR_0x8004, 15 + setvar VAR_0x8005, 5 + special SetFlavorTextFlagFromSpecialVars + loadword 0, gUnknown_817BCD7 + callstd 6 + end + +EventScript_163FCD:: @ 8163FCD + loadword 0, gUnknown_817BC6C + callstd 4 + setflag FLAG_0x2DC + setorcopyvar VAR_0x8000, 374 + setorcopyvar VAR_0x8001, 1 + callstd 0 + release + end + +SSAnne_CaptainsOffice4_EventScript_163FE6:: @ 8163FE6 + trainerbattle 0, 541, 0, Text_17B54D, Text_17B585 + loadword 0, gUnknown_817B5A6 + callstd 6 + end + +SSAnne_CaptainsOffice4_EventScript_163FFD:: @ 8163FFD + trainerbattle 0, 542, 0, Text_17B677, Text_17B6D9 + loadword 0, gUnknown_817B6EF + callstd 6 + end + +SSAnne_CaptainsOffice4_EventScript_164014:: @ 8164014 + trainerbattle 2, 544, 0, Text_17B8DA, Text_17B9FB, EventScript_16402F + loadword 0, gUnknown_817BA64 + callstd 6 + end + +EventScript_16402F:: @ 816402F + getplayerxy VAR_0x8004, VAR_0x8005 + compare_var_to_value VAR_0x8004, 24 + call_if 3, EventScript_164065 + loadword 0, gUnknown_817BA64 + callstd 4 + closemessage + fadescreen 1 + removeobject 1 + removeobject 2 + removeobject 4 + removeobject 3 + setflag FLAG_0x088 + fadescreen 0 + setvar VAR_0x4088, 1 + setflag FLAG_0x2D5 + release + end + +EventScript_164065:: @ 8164065 + applymovement 255, Movement_1A75EB + waitmovement 0 + return + +SSAnne_CaptainsOffice4_EventScript_164070:: @ 8164070 + trainerbattle 0, 516, 0, Text_17B5D6, Text_17B62F + loadword 0, gUnknown_817B642 + callstd 6 + end + +SSAnne_CaptainsOffice4_EventScript_164087:: @ 8164087 + trainerbattle 2, 543, 0, Text_17B72D, Text_17B79C, EventScript_1640A2 + loadword 0, gUnknown_817B7FA + callstd 6 + end + +EventScript_1640A2:: @ 81640A2 + getplayerxy VAR_0x8004, VAR_0x8005 + specialvar VAR_RESULT, player_get_direction_lower_nybble + compare_var_to_value VAR_RESULT, 2 + call_if 1, EventScript_16412E + loadword 0, gUnknown_817B7AE + callstd 4 + closemessage + compare_var_to_value VAR_0x8004, 24 + call_if 3, EventScript_164144 + compare_var_to_value VAR_0x8004, 25 + call_if 1, EventScript_16414F + compare_var_to_value VAR_0x8004, 26 + call_if 1, EventScript_16415A + compare_var_to_value VAR_0x8004, 27 + call_if 1, EventScript_16415A + playse SE_PIN + call EventScript_163F47 + special DrawWholeMapView + waitse + compare_var_to_value VAR_0x8004, 24 + call_if 3, EventScript_164165 + compare_var_to_value VAR_0x8004, 25 + call_if 1, EventScript_164165 + compare_var_to_value VAR_0x8004, 26 + call_if 1, EventScript_164165 + compare_var_to_value VAR_0x8004, 27 + call_if 1, EventScript_164170 + loadword 0, gUnknown_817B7FA + callstd 4 + release + end + +EventScript_16412E:: @ 816412E + compare_var_to_value VAR_0x8004, 27 + goto_if 1, EventScript_1A77A9 + applymovement 255, Movement_1A75EB + waitmovement 0 + return + +EventScript_164144:: @ 8164144 + applymovement 3, Movement_16417B + waitmovement 0 + return + +EventScript_16414F:: @ 816414F + applymovement 3, Movement_16417F + waitmovement 0 + return + +EventScript_16415A:: @ 816415A + applymovement 3, Movement_1A75E9 + waitmovement 0 + return + +EventScript_164165:: @ 8164165 + applymovement 3, Movement_1A75E7 + waitmovement 0 + return + +EventScript_164170:: @ 8164170 + applymovement 3, Movement_1A75ED + waitmovement 0 + return + +Movement_16417B:: @ 816417B + step_13 + step_13 + step_2e + step_end + +Movement_16417F:: @ 816417F + step_13 + step_2e + step_end diff --git a/data/maps/FiveIsland_WaterLabyrinth/connections.inc b/data/maps/FiveIsland_WaterLabyrinth/connections.inc deleted file mode 100644 index 8c0351ad5..000000000 --- a/data/maps/FiveIsland_WaterLabyrinth/connections.inc +++ /dev/null @@ -1,7 +0,0 @@ -FiveIsland_WaterLabyrinth_MapConnectionsList: @ 8352DBC - connection up, 48, MAP_FIVE_ISLAND_RESORTGORGEOUS - connection down, 48, MAP_FIVE_ISLAND - -FiveIsland_WaterLabyrinth_MapConnections:: @ 8352DD4 - .4byte 2 - .4byte FiveIsland_WaterLabyrinth_MapConnectionsList diff --git a/data/maps/FiveIsland_WaterLabyrinth/events.inc b/data/maps/FiveIsland_WaterLabyrinth/events.inc deleted file mode 100644 index 400b22c61..000000000 --- a/data/maps/FiveIsland_WaterLabyrinth/events.inc +++ /dev/null @@ -1,6 +0,0 @@ -FiveIsland_WaterLabyrinth_EventObjects: - object_event 1, 61, 0, 14, 0, 11, 0, 3, 8, 17, 0, 0, 0, 0, 0, FiveIsland_WaterLabyrinth_EventScript_16884E, 0, 0, 0 - object_event 2, 28, 0, 9, 0, 7, 0, 3, 2, 17, 0, 1, 0, 1, 0, FiveIsland_WaterLabyrinth_EventScript_1AC2D9, 0, 0, 0 - -FiveIsland_WaterLabyrinth_MapEvents:: - map_events FiveIsland_WaterLabyrinth_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/FiveIsland_WaterLabyrinth/header.inc b/data/maps/FiveIsland_WaterLabyrinth/header.inc deleted file mode 100644 index 9516eb6f8..000000000 --- a/data/maps/FiveIsland_WaterLabyrinth/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -FiveIsland_WaterLabyrinth:: @ 8350C1C - .4byte FiveIsland_WaterLabyrinth_Layout @ 0x832B340 - .4byte FiveIsland_WaterLabyrinth_MapEvents @ 0x83B8CC4 - .4byte FiveIsland_WaterLabyrinth_MapScripts @ 0x816884D - .4byte FiveIsland_WaterLabyrinth_MapConnections @ 0x8352DD4 - .2byte BGM_FRLG_SEVII_ISLANDS - .2byte 247 - .byte 0xa0, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/FiveIsland_WaterLabyrinth/map.json b/data/maps/FiveIsland_WaterLabyrinth/map.json new file mode 100644 index 000000000..f4ed982f2 --- /dev/null +++ b/data/maps/FiveIsland_WaterLabyrinth/map.json @@ -0,0 +1,57 @@ +{ + "id": "MAP_FIVE_ISLAND_WATER_LABYRINTH", + "name": "FiveIsland_WaterLabyrinth", + "layout": "LAYOUT_FIVE_ISLAND_WATER_LABYRINTH", + "music": "BGM_FRLG_SEVII_ISLANDS", + "region_map_section": "MAPSEC_WATER_LABYRINTH", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_3", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_FIVE_ISLAND_RESORT_GORGEOUS", + "offset": 48, + "direction": "up" + }, + { + "map": "MAP_FIVE_ISLAND", + "offset": 48, + "direction": "down" + } + ], + "object_events": [ + { + "graphics_id": "61", + "x": 14, + "y": 11, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FiveIsland_WaterLabyrinth_EventScript_16884E", + "flag": "0" + }, + { + "graphics_id": "28", + "x": 9, + "y": 7, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "FiveIsland_WaterLabyrinth_EventScript_1AC2D9", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/FourIsland/events.inc b/data/maps/FourIsland/events.inc deleted file mode 100644 index 5e34db60d..000000000 --- a/data/maps/FourIsland/events.inc +++ /dev/null @@ -1,32 +0,0 @@ -FourIsland_EventObjects: - object_event 1, 32, 0, 16, 0, 13, 0, 3, 8, 17, 0, 0, 0, 0, 0, FourIsland_EventScript_167D55, 0, 0, 0 - object_event 2, 132, 0, 12, 0, 9, 0, 3, 1, 17, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 - object_event 3, 122, 0, 13, 0, 7, 0, 3, 10, 17, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 - object_event 4, 123, 0, 14, 0, 7, 0, 3, 9, 17, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 - object_event 5, 121, 0, 17, 0, 9, 0, 3, 1, 17, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 - object_event 6, 35, 0, 26, 0, 19, 0, 3, 9, 17, 0, 0, 0, 0, 0, FourIsland_EventScript_167E2E, 0, 0, 0 - object_event 7, 96, 0, 5, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, FourIsland_EventScript_1BE00C, 18, 0, 0 - object_event 8, 92, 0, 5, 0, 6, 0, 3, 8, 17, 0, 0, 0, 0, 0, FourIsland_EventScript_1BEC28, 473, 0, 0 - object_event 9, 92, 0, 32, 0, 19, 0, 3, 8, 17, 0, 0, 0, 0, 0, FourIsland_EventScript_1BEC35, 474, 0, 0 - object_event 10, 72, 0, 8, 0, 25, 0, 3, 9, 17, 0, 0, 0, 0, 0, 0x0, 151, 0, 0 - object_event 11, 27, 0, 36, 0, 13, 0, 3, 8, 17, 0, 0, 0, 0, 0, FourIsland_EventScript_167E73, 0, 0, 0 - object_event 12, 17, 0, 31, 0, 21, 0, 3, 10, 17, 0, 0, 0, 0, 0, FourIsland_EventScript_167E5A, 0, 0, 0 - -FourIsland_MapWarps: - warp_def 18, 20, 0, 0, 8961 - warp_def 12, 13, 0, 0, 8960 - warp_def 25, 14, 0, 0, 8963 - warp_def 38, 12, 0, 0, 366 - warp_def 33, 23, 0, 0, 8964 - warp_def 25, 26, 0, 0, 8966 - warp_def 10, 28, 3, 0, 8965 - warp_def 22, 26, 0, 0, 8967 - -FourIsland_MapBGEvents: - bg_event 13, 19, 0, 0, 0, FourIsland_EventScript_167E7C - bg_event 22, 34, 3, 7, 0, 106, 168, 1 - bg_event 6, 21, 3, 7, 0, 2, 169, 1 - bg_event 31, 23, 0, 0, 0, FourIsland_EventScript_167E85 - -FourIsland_MapEvents:: - map_events FourIsland_EventObjects, FourIsland_MapWarps, 0x0, FourIsland_MapBGEvents diff --git a/data/maps/FourIsland/header.inc b/data/maps/FourIsland/header.inc deleted file mode 100644 index 7efe4469f..000000000 --- a/data/maps/FourIsland/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -FourIsland:: @ 83507BC - .4byte FourIsland_Layout @ 0x8323580 - .4byte FourIsland_MapEvents @ 0x83B646C - .4byte FourIsland_MapScripts @ 0x8167CAE - .4byte NULL - .2byte BGM_FRLG_ISLAND_FOUR - .2byte 233 - .byte 0x92, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/FourIsland/map.json b/data/maps/FourIsland/map.json new file mode 100644 index 000000000..fdc2e8607 --- /dev/null +++ b/data/maps/FourIsland/map.json @@ -0,0 +1,266 @@ +{ + "id": "MAP_FOUR_ISLAND", + "name": "FourIsland", + "layout": "LAYOUT_FOUR_ISLAND", + "music": "BGM_FRLG_ISLAND_FOUR", + "region_map_section": "MAPSEC_FOUR_ISLAND", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_1", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "32", + "x": 16, + "y": 13, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FourIsland_EventScript_167D55", + "flag": "0" + }, + { + "graphics_id": "132", + "x": 12, + "y": 9, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "122", + "x": 13, + "y": 7, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "123", + "x": 14, + "y": 7, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "121", + "x": 17, + "y": 9, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "35", + "x": 26, + "y": 19, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FourIsland_EventScript_167E2E", + "flag": "0" + }, + { + "graphics_id": "96", + "x": 5, + "y": 11, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FourIsland_EventScript_1BE00C", + "flag": "18" + }, + { + "graphics_id": "92", + "x": 5, + "y": 6, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FourIsland_EventScript_1BEC28", + "flag": "473" + }, + { + "graphics_id": "92", + "x": 32, + "y": 19, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FourIsland_EventScript_1BEC35", + "flag": "474" + }, + { + "graphics_id": "72", + "x": 8, + "y": 25, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "151" + }, + { + "graphics_id": "27", + "x": 36, + "y": 13, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FourIsland_EventScript_167E73", + "flag": "0" + }, + { + "graphics_id": "17", + "x": 31, + "y": 21, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FourIsland_EventScript_167E5A", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 18, + "y": 20, + "elevation": 0, + "dest_map": "MAP_FOUR_ISLAND_POKEMON_CENTER_1F", + "dest_warp_id": 0 + }, + { + "x": 12, + "y": 13, + "elevation": 0, + "dest_map": "MAP_FOUR_ISLAND_POKEMON_DAY_CARE", + "dest_warp_id": 0 + }, + { + "x": 25, + "y": 14, + "elevation": 0, + "dest_map": "MAP_FOUR_ISLAND_HOUSE1", + "dest_warp_id": 0 + }, + { + "x": 38, + "y": 12, + "elevation": 0, + "dest_map": "MAP_FOUR_ISLAND_ICEFALL_CAVE_ENTRANCE", + "dest_warp_id": 0 + }, + { + "x": 33, + "y": 23, + "elevation": 0, + "dest_map": "MAP_FOUR_ISLAND_LORELEIS_HOUSE", + "dest_warp_id": 0 + }, + { + "x": 25, + "y": 26, + "elevation": 0, + "dest_map": "MAP_FOUR_ISLAND_HOUSE2", + "dest_warp_id": 0 + }, + { + "x": 10, + "y": 28, + "elevation": 3, + "dest_map": "MAP_FOUR_ISLAND_HARBOR", + "dest_warp_id": 0 + }, + { + "x": 22, + "y": 26, + "elevation": 0, + "dest_map": "MAP_FOUR_ISLAND_MART", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 13, + "y": 19, + "elevation": 0, + "script": "FourIsland_EventScript_167E7C" + }, + { + "type": "hidden_item", + "x": 22, + "y": 34, + "elevation": 3, + "item": "ITEM_PEARL", + "flag": "168", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 6, + "y": 21, + "elevation": 3, + "item": "POCKET_KEY_ITEMS", + "flag": "169", + "unknown": 1 + }, + { + "type": "bg_event_type_0", + "x": 31, + "y": 23, + "elevation": 0, + "script": "FourIsland_EventScript_167E85" + } + ] +}
\ No newline at end of file diff --git a/data/maps/FourIsland_Harbor/events.inc b/data/maps/FourIsland_Harbor/events.inc deleted file mode 100644 index 34b82cbe5..000000000 --- a/data/maps/FourIsland_Harbor/events.inc +++ /dev/null @@ -1,9 +0,0 @@ -FourIsland_Harbor_EventObjects: - object_event 1, 108, 0, 8, 0, 9, 0, 0, 8, 17, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 - object_event 2, 62, 0, 8, 0, 6, 0, 3, 7, 17, 0, 0, 0, 0, 0, FourIsland_Harbor_EventScript_171C99, 0, 0, 0 - -FourIsland_Harbor_MapWarps: - warp_def 8, 2, 3, 6, 783 - -FourIsland_Harbor_MapEvents:: - map_events FourIsland_Harbor_EventObjects, FourIsland_Harbor_MapWarps, 0x0, 0x0 diff --git a/data/maps/FourIsland_Harbor/header.inc b/data/maps/FourIsland_Harbor/header.inc deleted file mode 100644 index af0f40483..000000000 --- a/data/maps/FourIsland_Harbor/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -FourIsland_Harbor:: @ 8351DF0 - .4byte Island_Harbor_Layout @ 0x8343FB8 - .4byte FourIsland_Harbor_MapEvents @ 0x83BEDA8 - .4byte FourIsland_Harbor_MapScripts @ 0x8171C98 - .4byte NULL - .2byte BGM_FRLG_ISLAND_FOUR - .2byte 315 - .byte 0x92, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/FourIsland_Harbor/map.json b/data/maps/FourIsland_Harbor/map.json new file mode 100644 index 000000000..9786e2b1f --- /dev/null +++ b/data/maps/FourIsland_Harbor/map.json @@ -0,0 +1,54 @@ +{ + "id": "MAP_FOUR_ISLAND_HARBOR", + "name": "FourIsland_Harbor", + "layout": "LAYOUT_ISLAND_HARBOR", + "music": "BGM_FRLG_ISLAND_FOUR", + "region_map_section": "MAPSEC_FOUR_ISLAND", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "108", + "x": 8, + "y": 9, + "elevation": 0, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "62", + "x": 8, + "y": 6, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FourIsland_Harbor_EventScript_171C99", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 8, + "y": 2, + "elevation": 3, + "dest_map": "MAP_FOUR_ISLAND", + "dest_warp_id": 6 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/FourIsland_House1/events.inc b/data/maps/FourIsland_House1/events.inc deleted file mode 100644 index 16874c5ca..000000000 --- a/data/maps/FourIsland_House1/events.inc +++ /dev/null @@ -1,9 +0,0 @@ -FourIsland_House1_EventObjects: - object_event 1, 27, 0, 8, 0, 3, 0, 3, 10, 17, 0, 0, 0, 0, 0, FourIsland_House1_EventScript_1C4D84, 0, 0, 0 - object_event 2, 27, 0, 9, 0, 3, 0, 3, 9, 17, 0, 0, 0, 0, 0, FourIsland_House1_EventScript_171C45, 0, 0, 0 - -FourIsland_House1_MapWarps: - warp_def 4, 7, 3, 2, 783 - -FourIsland_House1_MapEvents:: - map_events FourIsland_House1_EventObjects, FourIsland_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/FourIsland_House1/header.inc b/data/maps/FourIsland_House1/header.inc deleted file mode 100644 index 6f2cf1099..000000000 --- a/data/maps/FourIsland_House1/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -FourIsland_House1:: @ 8351DB8 - .4byte House3_Layout @ 0x82D5CB8 - .4byte FourIsland_House1_MapEvents @ 0x83BEBD8 - .4byte FourIsland_House1_MapScripts @ 0x8171C44 - .4byte NULL - .2byte BGM_FRLG_ISLAND_FOUR - .2byte 11 - .byte 0x92, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/FourIsland_House1/map.json b/data/maps/FourIsland_House1/map.json new file mode 100644 index 000000000..46c98ee57 --- /dev/null +++ b/data/maps/FourIsland_House1/map.json @@ -0,0 +1,54 @@ +{ + "id": "MAP_FOUR_ISLAND_HOUSE1", + "name": "FourIsland_House1", + "layout": "LAYOUT_HOUSE3", + "music": "BGM_FRLG_ISLAND_FOUR", + "region_map_section": "MAPSEC_FOUR_ISLAND", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "27", + "x": 8, + "y": 3, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FourIsland_House1_EventScript_1C4D84", + "flag": "0" + }, + { + "graphics_id": "27", + "x": 9, + "y": 3, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FourIsland_House1_EventScript_171C45", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_FOUR_ISLAND", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/FourIsland_House2/events.inc b/data/maps/FourIsland_House2/events.inc deleted file mode 100644 index 07985cb74..000000000 --- a/data/maps/FourIsland_House2/events.inc +++ /dev/null @@ -1,8 +0,0 @@ -FourIsland_House2_EventObjects: - object_event 1, 25, 0, 4, 0, 4, 0, 3, 8, 17, 0, 0, 0, 0, 0, FourIsland_House2_EventScript_1B2938, 0, 0, 0 - -FourIsland_House2_MapWarps: - warp_def 4, 7, 3, 5, 783 - -FourIsland_House2_MapEvents:: - map_events FourIsland_House2_EventObjects, FourIsland_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/FourIsland_House2/header.inc b/data/maps/FourIsland_House2/header.inc deleted file mode 100644 index 699623002..000000000 --- a/data/maps/FourIsland_House2/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -FourIsland_House2:: @ 8351E0C - .4byte House3_Layout @ 0x82D5CB8 - .4byte FourIsland_House2_MapEvents @ 0x83BEDDC - .4byte FourIsland_House2_MapScripts @ 0x8171CAC - .4byte NULL - .2byte BGM_FRLG_ISLAND_FOUR - .2byte 11 - .byte 0x92, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/FourIsland_House2/map.json b/data/maps/FourIsland_House2/map.json new file mode 100644 index 000000000..9419ba2c6 --- /dev/null +++ b/data/maps/FourIsland_House2/map.json @@ -0,0 +1,41 @@ +{ + "id": "MAP_FOUR_ISLAND_HOUSE2", + "name": "FourIsland_House2", + "layout": "LAYOUT_HOUSE3", + "music": "BGM_FRLG_ISLAND_FOUR", + "region_map_section": "MAPSEC_FOUR_ISLAND", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "25", + "x": 4, + "y": 4, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FourIsland_House2_EventScript_1B2938", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_FOUR_ISLAND", + "dest_warp_id": 5 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/FourIsland_IcefallCave_1F/events.inc b/data/maps/FourIsland_IcefallCave_1F/events.inc deleted file mode 100644 index f4b81511d..000000000 --- a/data/maps/FourIsland_IcefallCave_1F/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -FourIsland_IcefallCave_1F_EventObjects: - object_event 1, 92, 0, 11, 0, 7, 0, 3, 8, 17, 0, 0, 0, 0, 0, FourIsland_IcefallCave_1F_EventScript_1BED53, 496, 0, 0 - object_event 2, 92, 0, 12, 0, 16, 0, 3, 8, 17, 0, 0, 0, 0, 0, FourIsland_IcefallCave_1F_EventScript_1BED60, 497, 0, 0 - -FourIsland_IcefallCave_1F_MapWarps: - warp_def 3, 17, 0, 1, 366 - warp_def 2, 8, 3, 2, 366 - warp_def 12, 12, 3, 0, 368 - warp_def 12, 3, 3, 1, 368 - warp_def 15, 16, 3, 2, 368 - warp_def 3, 6, 3, 0, 369 - -FourIsland_IcefallCave_1F_MapEvents:: - map_events FourIsland_IcefallCave_1F_EventObjects, FourIsland_IcefallCave_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/FourIsland_IcefallCave_1F/header.inc b/data/maps/FourIsland_IcefallCave_1F/header.inc deleted file mode 100644 index a77f235f9..000000000 --- a/data/maps/FourIsland_IcefallCave_1F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -FourIsland_IcefallCave_1F:: @ 834FE38 - .4byte FourIsland_IcefallCave_1F_Layout @ 0x834117C - .4byte FourIsland_IcefallCave_1F_MapEvents @ 0x83B34AC - .4byte FourIsland_IcefallCave_1F_MapScripts @ 0x8163D44 - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 294 - .byte 0xb1, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/FourIsland_IcefallCave_1F/map.json b/data/maps/FourIsland_IcefallCave_1F/map.json new file mode 100644 index 000000000..57207c4e5 --- /dev/null +++ b/data/maps/FourIsland_IcefallCave_1F/map.json @@ -0,0 +1,89 @@ +{ + "id": "MAP_FOUR_ISLAND_ICEFALL_CAVE_1F", + "name": "FourIsland_IcefallCave_1F", + "layout": "LAYOUT_FOUR_ISLAND_ICEFALL_CAVE_1F", + "music": "BGM_FRLG_MT_EMBER", + "region_map_section": "MAPSEC_ICEFALL_CAVE", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "92", + "x": 11, + "y": 7, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FourIsland_IcefallCave_1F_EventScript_1BED53", + "flag": "496" + }, + { + "graphics_id": "92", + "x": 12, + "y": 16, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FourIsland_IcefallCave_1F_EventScript_1BED60", + "flag": "497" + } + ], + "warp_events": [ + { + "x": 3, + "y": 17, + "elevation": 0, + "dest_map": "MAP_FOUR_ISLAND_ICEFALL_CAVE_ENTRANCE", + "dest_warp_id": 1 + }, + { + "x": 2, + "y": 8, + "elevation": 3, + "dest_map": "MAP_FOUR_ISLAND_ICEFALL_CAVE_ENTRANCE", + "dest_warp_id": 2 + }, + { + "x": 12, + "y": 12, + "elevation": 3, + "dest_map": "MAP_FOUR_ISLAND_ICEFALL_CAVE_B1F", + "dest_warp_id": 0 + }, + { + "x": 12, + "y": 3, + "elevation": 3, + "dest_map": "MAP_FOUR_ISLAND_ICEFALL_CAVE_B1F", + "dest_warp_id": 1 + }, + { + "x": 15, + "y": 16, + "elevation": 3, + "dest_map": "MAP_FOUR_ISLAND_ICEFALL_CAVE_B1F", + "dest_warp_id": 2 + }, + { + "x": 3, + "y": 6, + "elevation": 3, + "dest_map": "MAP_FOUR_ISLAND_ICEFALL_CAVE_BACK", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/FourIsland_IcefallCave_1F/scripts.inc b/data/maps/FourIsland_IcefallCave_1F/scripts.inc index 0698ff061..c73ec85fd 100644 --- a/data/maps/FourIsland_IcefallCave_1F/scripts.inc +++ b/data/maps/FourIsland_IcefallCave_1F/scripts.inc @@ -23,7 +23,7 @@ EventScript_163D65:: @ 8163D65 waitmovement 0 playse SE_FU_ZAKU delay 60 - warphole MAP_FOUR_ISLAND_ICEFALLCAVE_B1F + warphole MAP_FOUR_ISLAND_ICEFALL_CAVE_B1F waitstate releaseall end diff --git a/data/maps/FourIsland_IcefallCave_B1F/map.json b/data/maps/FourIsland_IcefallCave_B1F/map.json new file mode 100644 index 000000000..976318747 --- /dev/null +++ b/data/maps/FourIsland_IcefallCave_B1F/map.json @@ -0,0 +1,68 @@ +{ + "id": "MAP_FOUR_ISLAND_ICEFALL_CAVE_B1F", + "name": "FourIsland_IcefallCave_B1F", + "layout": "LAYOUT_FOUR_ISLAND_ICEFALL_CAVE_B1F", + "music": "BGM_FRLG_MT_EMBER", + "region_map_section": "MAPSEC_ICEFALL_CAVE", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "92", + "x": 10, + "y": 14, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SSAnne_CaptainsOffice2_EventScript_1BED6D", + "flag": "498" + }, + { + "graphics_id": "92", + "x": 21, + "y": 7, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SSAnne_CaptainsOffice2_EventScript_1BED7A", + "flag": "499" + } + ], + "warp_events": [ + { + "x": 12, + "y": 12, + "elevation": 3, + "dest_map": "MAP_FOUR_ISLAND_ICEFALL_CAVE_1F", + "dest_warp_id": 2 + }, + { + "x": 12, + "y": 3, + "elevation": 3, + "dest_map": "MAP_FOUR_ISLAND_ICEFALL_CAVE_1F", + "dest_warp_id": 3 + }, + { + "x": 15, + "y": 16, + "elevation": 3, + "dest_map": "MAP_FOUR_ISLAND_ICEFALL_CAVE_1F", + "dest_warp_id": 4 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/FourIsland_IcefallCave_B1F/scripts.inc b/data/maps/FourIsland_IcefallCave_B1F/scripts.inc new file mode 100644 index 000000000..a3ec3cf54 --- /dev/null +++ b/data/maps/FourIsland_IcefallCave_B1F/scripts.inc @@ -0,0 +1,2 @@ +FourIsland_IcefallCave_B1F_MapScripts:: @ 8163D81 + .byte 0 diff --git a/data/maps/FourIsland_IcefallCave_Back/map.json b/data/maps/FourIsland_IcefallCave_Back/map.json new file mode 100644 index 000000000..2641a3f94 --- /dev/null +++ b/data/maps/FourIsland_IcefallCave_Back/map.json @@ -0,0 +1,108 @@ +{ + "id": "MAP_FOUR_ISLAND_ICEFALL_CAVE_BACK", + "name": "FourIsland_IcefallCave_Back", + "layout": "LAYOUT_FOUR_ISLAND_ICEFALL_CAVE_BACK", + "music": "BGM_FRLG_MT_EMBER", + "region_map_section": "MAPSEC_ICEFALL_CAVE", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "49", + "x": 11, + "y": 14, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "141" + }, + { + "graphics_id": "49", + "x": 13, + "y": 14, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "141" + }, + { + "graphics_id": "77", + "x": 12, + "y": 16, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SSAnne_CaptainsOffice3_EventScript_163F25", + "flag": "139" + }, + { + "graphics_id": "49", + "x": 10, + "y": 15, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "141" + } + ], + "warp_events": [ + { + "x": 12, + "y": 23, + "elevation": 0, + "dest_map": "MAP_FOUR_ISLAND_ICEFALL_CAVE_1F", + "dest_warp_id": 5 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 11, + "y": 18, + "elevation": 3, + "var": "VAR_0x4080", + "var_value": 0, + "script": "SSAnne_CaptainsOffice3_EventScript_163D98" + }, + { + "type": "trigger", + "x": 12, + "y": 18, + "elevation": 3, + "var": "VAR_0x4080", + "var_value": 0, + "script": "SSAnne_CaptainsOffice3_EventScript_163D98" + }, + { + "type": "trigger", + "x": 13, + "y": 18, + "elevation": 3, + "var": "VAR_0x4080", + "var_value": 0, + "script": "SSAnne_CaptainsOffice3_EventScript_163D98" + } + ], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/FourIsland_IcefallCave_Back/scripts.inc b/data/maps/FourIsland_IcefallCave_Back/scripts.inc new file mode 100644 index 000000000..6b762c06b --- /dev/null +++ b/data/maps/FourIsland_IcefallCave_Back/scripts.inc @@ -0,0 +1,201 @@ +FourIsland_IcefallCave_Back_MapScripts:: @ 8163D82 + map_script 3, SSAnne_CaptainsOffice3_MapScript1_163D88 + .byte 0 + +SSAnne_CaptainsOffice3_MapScript1_163D88:: @ 8163D88 + compare_var_to_value VAR_0x4080, 1 + call_if 1, EventScript_163D94 + end + +EventScript_163D94:: @ 8163D94 + setflag FLAG_0x08B + return + +SSAnne_CaptainsOffice3_EventScript_163D98:: @ 8163D98 + lockall + textcolor 1 + loadword 0, gUnknown_817B04F + callstd 4 + applymovement 1, Movement_163EE8 + waitmovement 0 + textcolor 0 + loadword 0, gUnknown_817B0B9 + callstd 4 + closemessage + playse SE_PIN + applymovement 3, Movement_1A75DB + waitmovement 0 + applymovement 3, Movement_1A75ED + waitmovement 0 + applymovement 3, Movement_1A75DD + waitmovement 0 + textcolor 1 + loadword 0, gUnknown_817B109 + callstd 4 + closemessage + applymovement 3, Movement_1A75EB + waitmovement 0 + delay 18 + applymovement 3, Movement_1A75ED + waitmovement 0 + delay 35 + applymovement 4, Movement_163F11 + applymovement 3, Movement_163F18 + applymovement 255, Movement_163EDD + waitmovement 0 + applymovement 2, Movement_163EE8 + waitmovement 0 + playbgm BGM_FRLG_SUSPICIOUS_EYE, 0 + textcolor 0 + loadword 0, gUnknown_817B20B + callstd 4 + setvar VAR_LAST_TALKED, 4 + trainerbattle 3, 539, 0, Text_17B251 + applymovement 3, Movement_163F1B + waitmovement 0 + textcolor 1 + loadword 0, gUnknown_817B269 + callstd 4 + textcolor 0 + loadword 0, gUnknown_817B2EF + callstd 4 + textcolor 1 + message Text_17B313 + waitmessage + waitse + playmoncry SPECIES_LAPRAS, 2 + waitbuttonpress + waitmoncry + applymovement 1, Movement_163EEE + waitmovement 0 + textcolor 0 + loadword 0, gUnknown_817B399 + callstd 4 + closemessage + applymovement 3, Movement_163F1D + applymovement 255, Movement_163EE2 + applymovement 1, Movement_163EF0 + applymovement 2, Movement_163EFA + applymovement 4, Movement_163F05 + waitmovement 0 + removeobject 1 + removeobject 2 + removeobject 4 + delay 50 + applymovement 3, Movement_163F23 + waitmovement 0 + applymovement 255, Movement_1A75E7 + waitmovement 0 + textcolor 1 + loadword 0, gUnknown_817B457 + callstd 4 + setflag FLAG_0x08E + clearflag FLAG_0x08C + setvar VAR_0x4080, 1 + releaseall + end + +Movement_163EDD:: @ 8163EDD + step_11 + step_11 + step_13 + step_11 + step_end + +Movement_163EE2:: @ 8163EE2 + step_1c + step_2f + step_1c + step_1c + step_2d + step_end + +Movement_163EE8:: @ 8163EE8 + step_25 + step_end + +gUnknown_163EEA:: @ 8163EEA + step_4c + step_13 + step_4d + step_end + +Movement_163EEE:: @ 8163EEE + step_29 + step_end + +Movement_163EF0:: @ 8163EF0 + step_13 + step_10 + step_1d + step_1d + step_1d + step_1d + step_1d + step_1d + step_1d + step_end + +Movement_163EFA:: @ 8163EFA + step_1c + step_12 + step_10 + step_1d + step_1d + step_1d + step_1d + step_1d + step_1d + step_1d + step_end + +Movement_163F05:: @ 8163F05 + step_1c + step_10 + step_1c + step_10 + step_20 + step_20 + step_1d + step_1d + step_1d + step_1d + step_1d + step_end + +Movement_163F11:: @ 8163F11 + step_1c + step_1b + step_30 + step_end + +Movement_163F15:: @ 8163F15 + step_12 + step_12 + step_end + +Movement_163F18:: @ 8163F18 + step_12 + step_11 + step_end + +Movement_163F1B:: @ 8163F1B + step_26 + step_end + +Movement_163F1D:: @ 8163F1D + step_1b + step_30 + step_1c + step_1c + step_2d + step_end + +Movement_163F23:: @ 8163F23 + step_13 + step_end + +SSAnne_CaptainsOffice3_EventScript_163F25:: @ 8163F25 + loadword 0, gUnknown_817B457 + callstd 2 + end diff --git a/data/maps/FourIsland_IcefallCave_Entrance/events.inc b/data/maps/FourIsland_IcefallCave_Entrance/events.inc deleted file mode 100644 index fc6ec6e8b..000000000 --- a/data/maps/FourIsland_IcefallCave_Entrance/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -FourIsland_IcefallCave_Entrance_MapWarps: - warp_def 17, 30, 3, 3, 783 - warp_def 10, 21, 3, 0, 367 - warp_def 9, 7, 3, 1, 367 - -FourIsland_IcefallCave_Entrance_MapEvents:: - map_events 0x0, FourIsland_IcefallCave_Entrance_MapWarps, 0x0, 0x0 diff --git a/data/maps/FourIsland_IcefallCave_Entrance/header.inc b/data/maps/FourIsland_IcefallCave_Entrance/header.inc deleted file mode 100644 index 758df55d9..000000000 --- a/data/maps/FourIsland_IcefallCave_Entrance/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -FourIsland_IcefallCave_Entrance:: @ 834FE1C - .4byte FourIsland_IcefallCave_Entrance_Layout @ 0x8340E38 - .4byte FourIsland_IcefallCave_Entrance_MapEvents @ 0x83B3438 - .4byte FourIsland_IcefallCave_Entrance_MapScripts @ 0x8163D3A - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 293 - .byte 0xb1, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/FourIsland_IcefallCave_Entrance/map.json b/data/maps/FourIsland_IcefallCave_Entrance/map.json new file mode 100644 index 000000000..4214932de --- /dev/null +++ b/data/maps/FourIsland_IcefallCave_Entrance/map.json @@ -0,0 +1,41 @@ +{ + "id": "MAP_FOUR_ISLAND_ICEFALL_CAVE_ENTRANCE", + "name": "FourIsland_IcefallCave_Entrance", + "layout": "LAYOUT_FOUR_ISLAND_ICEFALL_CAVE_ENTRANCE", + "music": "BGM_FRLG_MT_EMBER", + "region_map_section": "MAPSEC_ICEFALL_CAVE", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 17, + "y": 30, + "elevation": 3, + "dest_map": "MAP_FOUR_ISLAND", + "dest_warp_id": 3 + }, + { + "x": 10, + "y": 21, + "elevation": 3, + "dest_map": "MAP_FOUR_ISLAND_ICEFALL_CAVE_1F", + "dest_warp_id": 0 + }, + { + "x": 9, + "y": 7, + "elevation": 3, + "dest_map": "MAP_FOUR_ISLAND_ICEFALL_CAVE_1F", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/FourIsland_LoreleisHouse/events.inc b/data/maps/FourIsland_LoreleisHouse/events.inc deleted file mode 100644 index 3861ecf62..000000000 --- a/data/maps/FourIsland_LoreleisHouse/events.inc +++ /dev/null @@ -1,22 +0,0 @@ -FourIsland_LoreleisHouse_EventObjects: - object_event 1, 77, 0, 7, 0, 4, 0, 3, 9, 17, 0, 0, 0, 0, 0, FourIsland_LoreleisHouse_EventScript_171C58, 140, 0, 0 - object_event 2, 131, 0, 0, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, FourIsland_LoreleisHouse_EventScript_171C8D, 0, 0, 0 - object_event 3, 126, 0, 10, 0, 3, 0, 0, 8, 17, 0, 0, 0, 0, 0, FourIsland_LoreleisHouse_EventScript_171C8D, 0, 0, 0 - object_event 4, 120, 0, 9, 0, 3, 0, 0, 8, 17, 0, 0, 0, 0, 0, FourIsland_LoreleisHouse_EventScript_171C8D, 0, 0, 0 - object_event 5, 128, 0, 7, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, FourIsland_LoreleisHouse_EventScript_171C8D, 0, 0, 0 - object_event 6, 129, 0, 6, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, FourIsland_LoreleisHouse_EventScript_171C8D, 0, 0, 0 - object_event 7, 121, 0, 6, 0, 4, 0, 0, 8, 17, 0, 0, 0, 0, 0, FourIsland_LoreleisHouse_EventScript_171C8D, 0, 0, 0 - object_event 8, 125, 0, 9, 0, 4, 0, 0, 8, 17, 0, 0, 0, 0, 0, FourIsland_LoreleisHouse_EventScript_171C8D, 165, 0, 0 - object_event 9, 117, 0, 10, 0, 4, 0, 0, 8, 17, 0, 0, 0, 0, 0, FourIsland_LoreleisHouse_EventScript_171C8D, 166, 0, 0 - object_event 10, 115, 0, 0, 0, 3, 0, 3, 8, 17, 0, 0, 0, 0, 0, FourIsland_LoreleisHouse_EventScript_171C8D, 168, 0, 0 - object_event 11, 122, 0, 0, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, FourIsland_LoreleisHouse_EventScript_171C8D, 167, 0, 0 - object_event 12, 123, 0, 1, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, FourIsland_LoreleisHouse_EventScript_171C8D, 169, 0, 0 - object_event 13, 114, 0, 9, 0, 0, 0, 3, 8, 17, 0, 0, 0, 0, 0, FourIsland_LoreleisHouse_EventScript_171C8D, 171, 0, 0 - object_event 14, 133, 0, 10, 0, 0, 0, 3, 8, 17, 0, 0, 0, 0, 0, FourIsland_LoreleisHouse_EventScript_171C8D, 170, 0, 0 - object_event 15, 107, 0, 9, 0, 6, 0, 3, 8, 17, 0, 0, 0, 0, 0, FourIsland_LoreleisHouse_EventScript_171C8D, 172, 0, 0 - -FourIsland_LoreleisHouse_MapWarps: - warp_def 4, 7, 3, 4, 783 - -FourIsland_LoreleisHouse_MapEvents:: - map_events FourIsland_LoreleisHouse_EventObjects, FourIsland_LoreleisHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/FourIsland_LoreleisHouse/header.inc b/data/maps/FourIsland_LoreleisHouse/header.inc deleted file mode 100644 index 70bb32a5d..000000000 --- a/data/maps/FourIsland_LoreleisHouse/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -FourIsland_LoreleisHouse:: @ 8351DD4 - .4byte FourIsland_LoreleisHouse_Layout @ 0x82D7418 - .4byte FourIsland_LoreleisHouse_MapEvents @ 0x83BED5C - .4byte FourIsland_LoreleisHouse_MapScripts @ 0x8171C4E - .4byte NULL - .2byte BGM_FRLG_ISLAND_FOUR - .2byte 30 - .byte 0x92, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/FourIsland_LoreleisHouse/map.json b/data/maps/FourIsland_LoreleisHouse/map.json new file mode 100644 index 000000000..ccf6352d0 --- /dev/null +++ b/data/maps/FourIsland_LoreleisHouse/map.json @@ -0,0 +1,223 @@ +{ + "id": "MAP_FOUR_ISLAND_LORELEIS_HOUSE", + "name": "FourIsland_LoreleisHouse", + "layout": "LAYOUT_FOUR_ISLAND_LORELEIS_HOUSE", + "music": "BGM_FRLG_ISLAND_FOUR", + "region_map_section": "MAPSEC_FOUR_ISLAND", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "77", + "x": 7, + "y": 4, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FourIsland_LoreleisHouse_EventScript_171C58", + "flag": "140" + }, + { + "graphics_id": "131", + "x": 0, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FourIsland_LoreleisHouse_EventScript_171C8D", + "flag": "0" + }, + { + "graphics_id": "126", + "x": 10, + "y": 3, + "elevation": 0, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FourIsland_LoreleisHouse_EventScript_171C8D", + "flag": "0" + }, + { + "graphics_id": "120", + "x": 9, + "y": 3, + "elevation": 0, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FourIsland_LoreleisHouse_EventScript_171C8D", + "flag": "0" + }, + { + "graphics_id": "128", + "x": 7, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FourIsland_LoreleisHouse_EventScript_171C8D", + "flag": "0" + }, + { + "graphics_id": "129", + "x": 6, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FourIsland_LoreleisHouse_EventScript_171C8D", + "flag": "0" + }, + { + "graphics_id": "121", + "x": 6, + "y": 4, + "elevation": 0, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FourIsland_LoreleisHouse_EventScript_171C8D", + "flag": "0" + }, + { + "graphics_id": "125", + "x": 9, + "y": 4, + "elevation": 0, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FourIsland_LoreleisHouse_EventScript_171C8D", + "flag": "165" + }, + { + "graphics_id": "117", + "x": 10, + "y": 4, + "elevation": 0, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FourIsland_LoreleisHouse_EventScript_171C8D", + "flag": "166" + }, + { + "graphics_id": "115", + "x": 0, + "y": 3, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FourIsland_LoreleisHouse_EventScript_171C8D", + "flag": "168" + }, + { + "graphics_id": "122", + "x": 0, + "y": 5, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FourIsland_LoreleisHouse_EventScript_171C8D", + "flag": "167" + }, + { + "graphics_id": "123", + "x": 1, + "y": 5, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FourIsland_LoreleisHouse_EventScript_171C8D", + "flag": "169" + }, + { + "graphics_id": "114", + "x": 9, + "y": 0, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FourIsland_LoreleisHouse_EventScript_171C8D", + "flag": "171" + }, + { + "graphics_id": "133", + "x": 10, + "y": 0, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FourIsland_LoreleisHouse_EventScript_171C8D", + "flag": "170" + }, + { + "graphics_id": "107", + "x": 9, + "y": 6, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FourIsland_LoreleisHouse_EventScript_171C8D", + "flag": "172" + } + ], + "warp_events": [ + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_FOUR_ISLAND", + "dest_warp_id": 4 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/FourIsland_Mart/events.inc b/data/maps/FourIsland_Mart/events.inc deleted file mode 100644 index 1a90c86f5..000000000 --- a/data/maps/FourIsland_Mart/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -FourIsland_Mart_EventObjects: - object_event 1, 68, 0, 2, 0, 3, 0, 0, 10, 17, 0, 0, 0, 0, 0, FourIsland_Mart_EventScript_171CAE, 0, 0, 0 - object_event 2, 32, 0, 6, 0, 5, 0, 3, 10, 17, 0, 0, 0, 0, 0, FourIsland_Mart_EventScript_1ACF46, 0, 0, 0 - object_event 3, 39, 0, 8, 0, 3, 0, 3, 2, 18, 0, 0, 0, 0, 0, FourIsland_Mart_EventScript_171CE8, 0, 0, 0 - -FourIsland_Mart_MapWarps: - warp_def 4, 7, 3, 7, 783 - -FourIsland_Mart_MapEvents:: - map_events FourIsland_Mart_EventObjects, FourIsland_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/FourIsland_Mart/header.inc b/data/maps/FourIsland_Mart/header.inc deleted file mode 100644 index 95c316e9a..000000000 --- a/data/maps/FourIsland_Mart/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -FourIsland_Mart:: @ 8351E28 - .4byte Mart_Layout @ 0x82D5BCC - .4byte FourIsland_Mart_MapEvents @ 0x83BEE40 - .4byte FourIsland_Mart_MapScripts @ 0x8171CAD - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 10 - .byte 0x92, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/FourIsland_Mart/map.json b/data/maps/FourIsland_Mart/map.json new file mode 100644 index 000000000..999dad6c7 --- /dev/null +++ b/data/maps/FourIsland_Mart/map.json @@ -0,0 +1,67 @@ +{ + "id": "MAP_FOUR_ISLAND_MART", + "name": "FourIsland_Mart", + "layout": "LAYOUT_MART", + "music": "BGM_FRLG_POKEMON_CENTER", + "region_map_section": "MAPSEC_FOUR_ISLAND", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "68", + "x": 2, + "y": 3, + "elevation": 0, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FourIsland_Mart_EventScript_171CAE", + "flag": "0" + }, + { + "graphics_id": "32", + "x": 6, + "y": 5, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FourIsland_Mart_EventScript_1ACF46", + "flag": "0" + }, + { + "graphics_id": "39", + "x": 8, + "y": 3, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 2, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FourIsland_Mart_EventScript_171CE8", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_FOUR_ISLAND", + "dest_warp_id": 7 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/FourIsland_PokemonCenter_1F/events.inc b/data/maps/FourIsland_PokemonCenter_1F/events.inc deleted file mode 100644 index 4f9608cd0..000000000 --- a/data/maps/FourIsland_PokemonCenter_1F/events.inc +++ /dev/null @@ -1,16 +0,0 @@ -FourIsland_PokemonCenter_1F_EventObjects: - object_event 1, 64, 0, 7, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, FourIsland_PokemonCenter_1F_EventScript_171BF9, 0, 0, 0 - object_event 2, 25, 0, 10, 0, 6, 0, 3, 2, 17, 0, 0, 0, 0, 0, FourIsland_PokemonCenter_1F_EventScript_171C02, 0, 0, 0 - object_event 3, 31, 0, 5, 0, 5, 0, 3, 13, 17, 0, 0, 0, 0, 0, FourIsland_PokemonCenter_1F_EventScript_171C0B, 0, 0, 0 - object_event 4, 61, 0, 2, 0, 2, 0, 3, 7, 17, 0, 0, 0, 0, 0, FourIsland_PokemonCenter_1F_EventScript_171C14, 0, 0, 0 - -FourIsland_PokemonCenter_1F_MapWarps: - warp_def 7, 8, 3, 0, 783 - warp_def 1, 6, 4, 0, 8962 - -FourIsland_PokemonCenter_1F_MapBGEvents: - bg_event 3, 1, 0, 1, 0, FourIsland_PokemonCenter_1F_EventScript_1ACDD0 - bg_event 2, 1, 0, 1, 0, FourIsland_PokemonCenter_1F_EventScript_1ACDD0 - -FourIsland_PokemonCenter_1F_MapEvents:: - map_events FourIsland_PokemonCenter_1F_EventObjects, FourIsland_PokemonCenter_1F_MapWarps, 0x0, FourIsland_PokemonCenter_1F_MapBGEvents diff --git a/data/maps/FourIsland_PokemonCenter_1F/header.inc b/data/maps/FourIsland_PokemonCenter_1F/header.inc deleted file mode 100644 index 917d92aaf..000000000 --- a/data/maps/FourIsland_PokemonCenter_1F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -FourIsland_PokemonCenter_1F:: @ 8351D80 - .4byte PokemonCenter_1F_Layout @ 0x82D5990 - .4byte FourIsland_PokemonCenter_1F_MapEvents @ 0x83BEB00 - .4byte FourIsland_PokemonCenter_1F_MapScripts @ 0x8171BEA - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 8 - .byte 0x92, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/FourIsland_PokemonCenter_1F/map.json b/data/maps/FourIsland_PokemonCenter_1F/map.json new file mode 100644 index 000000000..1df35b78b --- /dev/null +++ b/data/maps/FourIsland_PokemonCenter_1F/map.json @@ -0,0 +1,102 @@ +{ + "id": "MAP_FOUR_ISLAND_POKEMON_CENTER_1F", + "name": "FourIsland_PokemonCenter_1F", + "layout": "LAYOUT_POKEMON_CENTER_1F", + "music": "BGM_FRLG_POKEMON_CENTER", + "region_map_section": "MAPSEC_FOUR_ISLAND", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "64", + "x": 7, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FourIsland_PokemonCenter_1F_EventScript_171BF9", + "flag": "0" + }, + { + "graphics_id": "25", + "x": 10, + "y": 6, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FourIsland_PokemonCenter_1F_EventScript_171C02", + "flag": "0" + }, + { + "graphics_id": "31", + "x": 5, + "y": 5, + "elevation": 3, + "movement_type": "13", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FourIsland_PokemonCenter_1F_EventScript_171C0B", + "flag": "0" + }, + { + "graphics_id": "61", + "x": 2, + "y": 2, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FourIsland_PokemonCenter_1F_EventScript_171C14", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 7, + "y": 8, + "elevation": 3, + "dest_map": "MAP_FOUR_ISLAND", + "dest_warp_id": 0 + }, + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_FOUR_ISLAND_POKEMON_CENTER_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_1", + "x": 3, + "y": 1, + "elevation": 0, + "script": "FourIsland_PokemonCenter_1F_EventScript_1ACDD0" + }, + { + "type": "bg_event_type_1", + "x": 2, + "y": 1, + "elevation": 0, + "script": "FourIsland_PokemonCenter_1F_EventScript_1ACDD0" + } + ] +}
\ No newline at end of file diff --git a/data/maps/FourIsland_PokemonCenter_2F/events.inc b/data/maps/FourIsland_PokemonCenter_2F/events.inc deleted file mode 100644 index 53415e4f7..000000000 --- a/data/maps/FourIsland_PokemonCenter_2F/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -FourIsland_PokemonCenter_2F_EventObjects: - object_event 1, 65, 0, 6, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, FourIsland_PokemonCenter_2F_EventScript_1A8CF6, 0, 0, 0 - object_event 2, 65, 0, 2, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, FourIsland_PokemonCenter_2F_EventScript_1A8CFC, 0, 0, 0 - object_event 3, 65, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, FourIsland_PokemonCenter_2F_EventScript_1A8D02, 0, 0, 0 - object_event 4, 69, 0, 1, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, FourIsland_PokemonCenter_2F_EventScript_1BB1D2, 112, 0, 0 - -FourIsland_PokemonCenter_2F_MapWarps: - warp_def 1, 6, 4, 1, 8961 - warp_def 5, 1, 0, 0, 4 - warp_def 9, 1, 0, 0, 1 - -FourIsland_PokemonCenter_2F_MapEvents:: - map_events FourIsland_PokemonCenter_2F_EventObjects, FourIsland_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/FourIsland_PokemonCenter_2F/header.inc b/data/maps/FourIsland_PokemonCenter_2F/header.inc deleted file mode 100644 index 839d75196..000000000 --- a/data/maps/FourIsland_PokemonCenter_2F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -FourIsland_PokemonCenter_2F:: @ 8351D9C - .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 - .4byte FourIsland_PokemonCenter_2F_MapEvents @ 0x83BEB8C - .4byte FourIsland_PokemonCenter_2F_MapScripts @ 0x8171C1D - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 9 - .byte 0x92, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/FourIsland_PokemonCenter_2F/map.json b/data/maps/FourIsland_PokemonCenter_2F/map.json new file mode 100644 index 000000000..ef54040ea --- /dev/null +++ b/data/maps/FourIsland_PokemonCenter_2F/map.json @@ -0,0 +1,94 @@ +{ + "id": "MAP_FOUR_ISLAND_POKEMON_CENTER_2F", + "name": "FourIsland_PokemonCenter_2F", + "layout": "LAYOUT_POKEMON_CENTER_2F", + "music": "BGM_FRLG_POKEMON_CENTER", + "region_map_section": "MAPSEC_FOUR_ISLAND", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "65", + "x": 6, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FourIsland_PokemonCenter_2F_EventScript_1A8CF6", + "flag": "0" + }, + { + "graphics_id": "65", + "x": 2, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FourIsland_PokemonCenter_2F_EventScript_1A8CFC", + "flag": "0" + }, + { + "graphics_id": "65", + "x": 10, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FourIsland_PokemonCenter_2F_EventScript_1A8D02", + "flag": "0" + }, + { + "graphics_id": "69", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FourIsland_PokemonCenter_2F_EventScript_1BB1D2", + "flag": "112" + } + ], + "warp_events": [ + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_FOUR_ISLAND_POKEMON_CENTER_1F", + "dest_warp_id": 1 + }, + { + "x": 5, + "y": 1, + "elevation": 0, + "dest_map": "MAP_UNKNOWN_MAP_00_04", + "dest_warp_id": 0 + }, + { + "x": 9, + "y": 1, + "elevation": 0, + "dest_map": "MAP_UNKNOWN_MAP_00_01", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/FourIsland_PokemonDayCare/events.inc b/data/maps/FourIsland_PokemonDayCare/events.inc deleted file mode 100644 index e2022383b..000000000 --- a/data/maps/FourIsland_PokemonDayCare/events.inc +++ /dev/null @@ -1,8 +0,0 @@ -FourIsland_PokemonDayCare_EventObjects: - object_event 1, 35, 0, 2, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, FourIsland_PokemonDayCare_EventScript_171940, 0, 0, 0 - -FourIsland_PokemonDayCare_MapWarps: - warp_def 4, 7, 3, 1, 783 - -FourIsland_PokemonDayCare_MapEvents:: - map_events FourIsland_PokemonDayCare_EventObjects, FourIsland_PokemonDayCare_MapWarps, 0x0, 0x0 diff --git a/data/maps/FourIsland_PokemonDayCare/header.inc b/data/maps/FourIsland_PokemonDayCare/header.inc deleted file mode 100644 index 7cea7eaa5..000000000 --- a/data/maps/FourIsland_PokemonDayCare/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -FourIsland_PokemonDayCare:: @ 8351D64 - .4byte FourIsland_PokemonDayCare_Layout @ 0x833AFA8 - .4byte FourIsland_PokemonDayCare_MapEvents @ 0x83BEA64 - .4byte FourIsland_PokemonDayCare_MapScripts @ 0x817193F - .4byte NULL - .2byte BGM_FRLG_ISLAND_FOUR - .2byte 277 - .byte 0x92, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/FourIsland_PokemonDayCare/map.json b/data/maps/FourIsland_PokemonDayCare/map.json new file mode 100644 index 000000000..580fcc1c0 --- /dev/null +++ b/data/maps/FourIsland_PokemonDayCare/map.json @@ -0,0 +1,41 @@ +{ + "id": "MAP_FOUR_ISLAND_POKEMON_DAY_CARE", + "name": "FourIsland_PokemonDayCare", + "layout": "LAYOUT_FOUR_ISLAND_POKEMON_DAY_CARE", + "music": "BGM_FRLG_ISLAND_FOUR", + "region_map_section": "MAPSEC_FOUR_ISLAND", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "35", + "x": 2, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FourIsland_PokemonDayCare_EventScript_171940", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_FOUR_ISLAND", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/FuchsiaCity/connections.inc b/data/maps/FuchsiaCity/connections.inc deleted file mode 100644 index 58c41fdcc..000000000 --- a/data/maps/FuchsiaCity/connections.inc +++ /dev/null @@ -1,8 +0,0 @@ -FuchsiaCity_MapConnectionsList: @ 8352864 - connection down, 12, MAP_ROUTE19 - connection left, 10, MAP_ROUTE18 - connection right, 10, MAP_ROUTE15 - -FuchsiaCity_MapConnections:: @ 8352888 - .4byte 3 - .4byte FuchsiaCity_MapConnectionsList diff --git a/data/maps/FuchsiaCity/events.inc b/data/maps/FuchsiaCity/events.inc deleted file mode 100644 index 29dae023d..000000000 --- a/data/maps/FuchsiaCity/events.inc +++ /dev/null @@ -1,47 +0,0 @@ -FuchsiaCity_EventObjects: - object_event 1, 27, 0, 37, 0, 17, 0, 3, 8, 17, 0, 0, 0, 0, 0, FuchsiaCity_EventScript_166DAF, 0, 0, 0 - object_event 2, 128, 0, 36, 0, 15, 0, 3, 80, 20, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 - object_event 3, 127, 0, 33, 0, 8, 0, 3, 8, 17, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 - object_event 4, 18, 0, 33, 0, 11, 0, 3, 7, 17, 0, 0, 0, 0, 0, FuchsiaCity_EventScript_166DB8, 0, 0, 0 - object_event 5, 117, 0, 39, 0, 8, 0, 3, 2, 19, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 - object_event 6, 16, 0, 14, 0, 15, 0, 3, 5, 19, 0, 0, 0, 0, 0, FuchsiaCity_EventScript_166D9D, 0, 0, 0 - object_event 7, 135, 0, 12, 0, 20, 0, 1, 2, 18, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 - object_event 8, 32, 0, 36, 0, 20, 0, 3, 5, 20, 0, 0, 0, 0, 0, FuchsiaCity_EventScript_166DA6, 0, 0, 0 - object_event 9, 240, 0, 8, 0, 8, 0, 1, 8, 17, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 - object_event 10, 119, 0, 16, 0, 9, 0, 3, 2, 20, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 - object_event 11, 95, 0, 30, 0, 10, 0, 3, 8, 17, 0, 0, 0, 0, 0, FuchsiaCity_EventScript_1BDF13, 18, 0, 0 - object_event 12, 95, 0, 21, 0, 13, 0, 3, 8, 17, 0, 0, 0, 0, 0, FuchsiaCity_EventScript_1BDF13, 19, 0, 0 - object_event 13, 95, 0, 32, 0, 16, 0, 3, 8, 17, 0, 0, 0, 0, 0, FuchsiaCity_EventScript_1BDF13, 20, 0, 0 - object_event 14, 95, 0, 24, 0, 22, 0, 3, 8, 17, 0, 0, 0, 0, 0, FuchsiaCity_EventScript_1BDF13, 21, 0, 0 - object_event 15, 20, 0, 15, 0, 11, 0, 3, 7, 17, 0, 0, 0, 0, 0, FuchsiaCity_EventScript_1C4AEE, 0, 0, 0 - object_event 16, 22, 0, 40, 0, 6, 0, 3, 8, 17, 0, 0, 0, 0, 0, FuchsiaCity_EventScript_166DC1, 157, 0, 0 - -FuchsiaCity_MapWarps: - warp_def 24, 5, 0, 2, 2816 - warp_def 33, 31, 0, 1, 2823 - warp_def 11, 15, 0, 1, 2817 - warp_def 28, 16, 0, 1, 2818 - warp_def 9, 32, 0, 1, 2819 - warp_def 14, 31, 0, 1, 2820 - warp_def 25, 31, 3, 1, 2821 - warp_def 38, 31, 0, 1, 2824 - warp_def 39, 28, 3, 3, 2824 - warp_def 39, 29, 3, 3, 2824 - warp_def 19, 31, 0, 0, 2825 - -FuchsiaCity_MapBGEvents: - bg_event 31, 18, 3, 0, 0, FuchsiaCity_EventScript_166DDA - bg_event 26, 18, 0, 0, 0, FuchsiaCity_EventScript_166DE3 - bg_event 5, 32, 0, 0, 0, FuchsiaCity_EventScript_166E07 - bg_event 31, 31, 0, 0, 0, FuchsiaCity_EventScript_166DF5 - bg_event 35, 10, 0, 0, 0, FuchsiaCity_EventScript_166E38 - bg_event 38, 16, 3, 0, 0, FuchsiaCity_EventScript_166E6A - bg_event 41, 10, 0, 0, 0, FuchsiaCity_EventScript_166E1F - bg_event 17, 10, 0, 0, 0, FuchsiaCity_EventScript_166E51 - bg_event 11, 10, 0, 0, 0, FuchsiaCity_EventScript_166E9C - bg_event 17, 18, 3, 0, 0, FuchsiaCity_EventScript_166E83 - bg_event 22, 7, 0, 0, 0, FuchsiaCity_EventScript_166DEC - bg_event 33, 26, 3, 7, 0, 25, 133, 1 - -FuchsiaCity_MapEvents:: - map_events FuchsiaCity_EventObjects, FuchsiaCity_MapWarps, 0x0, FuchsiaCity_MapBGEvents diff --git a/data/maps/FuchsiaCity/header.inc b/data/maps/FuchsiaCity/header.inc deleted file mode 100644 index b4a33e9c5..000000000 --- a/data/maps/FuchsiaCity/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -FuchsiaCity:: @ 83506DC - .4byte FuchsiaCity_Layout @ 0x82E373C - .4byte FuchsiaCity_MapEvents @ 0x83B5B14 - .4byte FuchsiaCity_MapScripts @ 0x8166D75 - .4byte FuchsiaCity_MapConnections @ 0x8352888 - .2byte BGM_FRLG_CERULEAN_CITY - .2byte 85 - .byte 0x5f, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/FuchsiaCity/map.json b/data/maps/FuchsiaCity/map.json new file mode 100644 index 000000000..1bc5c6621 --- /dev/null +++ b/data/maps/FuchsiaCity/map.json @@ -0,0 +1,409 @@ +{ + "id": "MAP_FUCHSIA_CITY", + "name": "FuchsiaCity", + "layout": "LAYOUT_FUCHSIA_CITY", + "music": "BGM_FRLG_CERULEAN_CITY", + "region_map_section": "MAPSEC_FUCHSIA_CITY", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_1", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_ROUTE19", + "offset": 12, + "direction": "down" + }, + { + "map": "MAP_ROUTE18", + "offset": 10, + "direction": "left" + }, + { + "map": "MAP_ROUTE15", + "offset": 10, + "direction": "right" + } + ], + "object_events": [ + { + "graphics_id": "27", + "x": 37, + "y": 17, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FuchsiaCity_EventScript_166DAF", + "flag": "0" + }, + { + "graphics_id": "128", + "x": 36, + "y": 15, + "elevation": 3, + "movement_type": "80", + "movement_range_x": 4, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "127", + "x": 33, + "y": 8, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "18", + "x": 33, + "y": 11, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FuchsiaCity_EventScript_166DB8", + "flag": "0" + }, + { + "graphics_id": "117", + "x": 39, + "y": 8, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 3, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "16", + "x": 14, + "y": 15, + "elevation": 3, + "movement_type": "5", + "movement_range_x": 3, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FuchsiaCity_EventScript_166D9D", + "flag": "0" + }, + { + "graphics_id": "135", + "x": 12, + "y": 20, + "elevation": 1, + "movement_type": "2", + "movement_range_x": 2, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "32", + "x": 36, + "y": 20, + "elevation": 3, + "movement_type": "5", + "movement_range_x": 4, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FuchsiaCity_EventScript_166DA6", + "flag": "0" + }, + { + "graphics_id": "240", + "x": 8, + "y": 8, + "elevation": 1, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "119", + "x": 16, + "y": 9, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 4, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "95", + "x": 30, + "y": 10, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FuchsiaCity_EventScript_1BDF13", + "flag": "18" + }, + { + "graphics_id": "95", + "x": 21, + "y": 13, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FuchsiaCity_EventScript_1BDF13", + "flag": "19" + }, + { + "graphics_id": "95", + "x": 32, + "y": 16, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FuchsiaCity_EventScript_1BDF13", + "flag": "20" + }, + { + "graphics_id": "95", + "x": 24, + "y": 22, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FuchsiaCity_EventScript_1BDF13", + "flag": "21" + }, + { + "graphics_id": "20", + "x": 15, + "y": 11, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FuchsiaCity_EventScript_1C4AEE", + "flag": "0" + }, + { + "graphics_id": "22", + "x": 40, + "y": 6, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FuchsiaCity_EventScript_166DC1", + "flag": "157" + } + ], + "warp_events": [ + { + "x": 24, + "y": 5, + "elevation": 0, + "dest_map": "MAP_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE", + "dest_warp_id": 2 + }, + { + "x": 33, + "y": 31, + "elevation": 0, + "dest_map": "MAP_FUCHSIA_CITY_BUILDING1", + "dest_warp_id": 1 + }, + { + "x": 11, + "y": 15, + "elevation": 0, + "dest_map": "MAP_FUCHSIA_CITY_MART", + "dest_warp_id": 1 + }, + { + "x": 28, + "y": 16, + "elevation": 0, + "dest_map": "MAP_FUCHSIA_CITY_ZOO_BUILDING", + "dest_warp_id": 1 + }, + { + "x": 9, + "y": 32, + "elevation": 0, + "dest_map": "MAP_FUCHSIA_CITY_GYM", + "dest_warp_id": 1 + }, + { + "x": 14, + "y": 31, + "elevation": 0, + "dest_map": "MAP_FUCHSIA_CITY_HOUSE1", + "dest_warp_id": 1 + }, + { + "x": 25, + "y": 31, + "elevation": 3, + "dest_map": "MAP_FUCHSIA_CITY_POKEMON_CENTER_1F", + "dest_warp_id": 1 + }, + { + "x": 38, + "y": 31, + "elevation": 0, + "dest_map": "MAP_FUCHSIA_CITY_HOUSE2", + "dest_warp_id": 1 + }, + { + "x": 39, + "y": 28, + "elevation": 3, + "dest_map": "MAP_FUCHSIA_CITY_HOUSE2", + "dest_warp_id": 3 + }, + { + "x": 39, + "y": 29, + "elevation": 3, + "dest_map": "MAP_FUCHSIA_CITY_HOUSE2", + "dest_warp_id": 3 + }, + { + "x": 19, + "y": 31, + "elevation": 0, + "dest_map": "MAP_FUCHSIA_CITY_HOUSE3", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 31, + "y": 18, + "elevation": 3, + "script": "FuchsiaCity_EventScript_166DDA" + }, + { + "type": "bg_event_type_0", + "x": 26, + "y": 18, + "elevation": 0, + "script": "FuchsiaCity_EventScript_166DE3" + }, + { + "type": "bg_event_type_0", + "x": 5, + "y": 32, + "elevation": 0, + "script": "FuchsiaCity_EventScript_166E07" + }, + { + "type": "bg_event_type_0", + "x": 31, + "y": 31, + "elevation": 0, + "script": "FuchsiaCity_EventScript_166DF5" + }, + { + "type": "bg_event_type_0", + "x": 35, + "y": 10, + "elevation": 0, + "script": "FuchsiaCity_EventScript_166E38" + }, + { + "type": "bg_event_type_0", + "x": 38, + "y": 16, + "elevation": 3, + "script": "FuchsiaCity_EventScript_166E6A" + }, + { + "type": "bg_event_type_0", + "x": 41, + "y": 10, + "elevation": 0, + "script": "FuchsiaCity_EventScript_166E1F" + }, + { + "type": "bg_event_type_0", + "x": 17, + "y": 10, + "elevation": 0, + "script": "FuchsiaCity_EventScript_166E51" + }, + { + "type": "bg_event_type_0", + "x": 11, + "y": 10, + "elevation": 0, + "script": "FuchsiaCity_EventScript_166E9C" + }, + { + "type": "bg_event_type_0", + "x": 17, + "y": 18, + "elevation": 3, + "script": "FuchsiaCity_EventScript_166E83" + }, + { + "type": "bg_event_type_0", + "x": 22, + "y": 7, + "elevation": 0, + "script": "FuchsiaCity_EventScript_166DEC" + }, + { + "type": "hidden_item", + "x": 33, + "y": 26, + "elevation": 3, + "item": "ITEM_MAX_REVIVE", + "flag": "133", + "unknown": 1 + } + ] +}
\ No newline at end of file diff --git a/data/maps/FuchsiaCity_Building1/events.inc b/data/maps/FuchsiaCity_Building1/events.inc deleted file mode 100644 index bf912ccb4..000000000 --- a/data/maps/FuchsiaCity_Building1/events.inc +++ /dev/null @@ -1,19 +0,0 @@ -FuchsiaCity_Building1_EventObjects: - object_event 1, 33, 0, 3, 0, 5, 0, 3, 1, 17, 0, 0, 0, 0, 0, FuchsiaCity_Building1_EventScript_16D74C, 0, 0, 0 - object_event 2, 97, 0, 11, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, FuchsiaCity_Building1_EventScript_1BE11D, 0, 0, 0 - object_event 3, 92, 0, 11, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, FuchsiaCity_Building1_EventScript_1BEAA2, 441, 0, 0 - object_event 4, 0, 0, 4, 0, 1, 0, 0, 76, 17, 0, 0, 0, 0, 0, FuchsiaCity_Building1_EventScript_1ACEB8, 159, 0, 0 - -FuchsiaCity_Building1_MapWarps: - warp_def 5, 10, 0, 1, 775 - warp_def 6, 9, 3, 1, 775 - warp_def 7, 10, 0, 1, 775 - -FuchsiaCity_Building1_MapBGEvents: - bg_event 7, 4, 0, 0, 0, FuchsiaCity_Building1_EventScript_16D80D - bg_event 4, 4, 0, 0, 0, FuchsiaCity_Building1_EventScript_16D804 - bg_event 5, 4, 0, 0, 0, FuchsiaCity_Building1_EventScript_16D804 - bg_event 6, 4, 0, 0, 0, FuchsiaCity_Building1_EventScript_16D80D - -FuchsiaCity_Building1_MapEvents:: - map_events FuchsiaCity_Building1_EventObjects, FuchsiaCity_Building1_MapWarps, 0x0, FuchsiaCity_Building1_MapBGEvents diff --git a/data/maps/FuchsiaCity_Building1/header.inc b/data/maps/FuchsiaCity_Building1/header.inc deleted file mode 100644 index f598da548..000000000 --- a/data/maps/FuchsiaCity_Building1/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -FuchsiaCity_Building1:: @ 83514DC - .4byte FuchsiaCity_Building1_Layout @ 0x831C48C - .4byte FuchsiaCity_Building1_MapEvents @ 0x83BC3F4 - .4byte FuchsiaCity_Building1_MapScripts @ 0x816D74B - .4byte NULL - .2byte BGM_FRLG_CERULEAN_CITY - .2byte 201 - .byte 0x5f, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/FuchsiaCity_Building1/map.json b/data/maps/FuchsiaCity_Building1/map.json new file mode 100644 index 000000000..694e7bc51 --- /dev/null +++ b/data/maps/FuchsiaCity_Building1/map.json @@ -0,0 +1,123 @@ +{ + "id": "MAP_FUCHSIA_CITY_BUILDING1", + "name": "FuchsiaCity_Building1", + "layout": "LAYOUT_FUCHSIA_CITY_BUILDING1", + "music": "BGM_FRLG_CERULEAN_CITY", + "region_map_section": "MAPSEC_FUCHSIA_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "33", + "x": 3, + "y": 5, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FuchsiaCity_Building1_EventScript_16D74C", + "flag": "0" + }, + { + "graphics_id": "97", + "x": 11, + "y": 6, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FuchsiaCity_Building1_EventScript_1BE11D", + "flag": "0" + }, + { + "graphics_id": "92", + "x": 11, + "y": 5, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FuchsiaCity_Building1_EventScript_1BEAA2", + "flag": "441" + }, + { + "graphics_id": "0", + "x": 4, + "y": 1, + "elevation": 0, + "movement_type": "76", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FuchsiaCity_Building1_EventScript_1ACEB8", + "flag": "159" + } + ], + "warp_events": [ + { + "x": 5, + "y": 10, + "elevation": 0, + "dest_map": "MAP_FUCHSIA_CITY", + "dest_warp_id": 1 + }, + { + "x": 6, + "y": 9, + "elevation": 3, + "dest_map": "MAP_FUCHSIA_CITY", + "dest_warp_id": 1 + }, + { + "x": 7, + "y": 10, + "elevation": 0, + "dest_map": "MAP_FUCHSIA_CITY", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 7, + "y": 4, + "elevation": 0, + "script": "FuchsiaCity_Building1_EventScript_16D80D" + }, + { + "type": "bg_event_type_0", + "x": 4, + "y": 4, + "elevation": 0, + "script": "FuchsiaCity_Building1_EventScript_16D804" + }, + { + "type": "bg_event_type_0", + "x": 5, + "y": 4, + "elevation": 0, + "script": "FuchsiaCity_Building1_EventScript_16D804" + }, + { + "type": "bg_event_type_0", + "x": 6, + "y": 4, + "elevation": 0, + "script": "FuchsiaCity_Building1_EventScript_16D80D" + } + ] +}
\ No newline at end of file diff --git a/data/maps/FuchsiaCity_Gym/events.inc b/data/maps/FuchsiaCity_Gym/events.inc deleted file mode 100644 index 96ffb0d3e..000000000 --- a/data/maps/FuchsiaCity_Gym/events.inc +++ /dev/null @@ -1,21 +0,0 @@ -FuchsiaCity_Gym_EventObjects: - object_event 1, 26, 0, 12, 0, 16, 0, 3, 18, 17, 0, 1, 0, 4, 0, FuchsiaCity_Gym_EventScript_16D65A, 0, 0, 0 - object_event 2, 26, 0, 2, 0, 9, 0, 3, 9, 17, 0, 1, 0, 1, 0, FuchsiaCity_Gym_EventScript_16D643, 0, 0, 0 - object_event 3, 26, 0, 11, 0, 11, 0, 3, 10, 17, 0, 1, 0, 3, 0, FuchsiaCity_Gym_EventScript_16D61F, 0, 0, 0 - object_event 4, 25, 0, 13, 0, 4, 0, 3, 1, 17, 0, 1, 0, 2, 0, FuchsiaCity_Gym_EventScript_16D608, 0, 0, 0 - object_event 5, 25, 0, 4, 0, 6, 0, 3, 1, 17, 0, 1, 0, 2, 0, FuchsiaCity_Gym_EventScript_16D5F1, 0, 0, 0 - object_event 6, 26, 0, 2, 0, 16, 0, 3, 8, 17, 0, 1, 0, 4, 0, FuchsiaCity_Gym_EventScript_16D671, 0, 0, 0 - object_event 7, 84, 0, 7, 0, 13, 0, 3, 8, 17, 0, 0, 0, 0, 0, FuchsiaCity_Gym_EventScript_16D54E, 0, 0, 0 - object_event 8, 91, 0, 11, 0, 19, 0, 3, 8, 17, 0, 0, 0, 0, 0, FuchsiaCity_Gym_EventScript_16D688, 0, 0, 0 - -FuchsiaCity_Gym_MapWarps: - warp_def 6, 21, 3, 4, 775 - warp_def 7, 21, 3, 4, 775 - warp_def 8, 21, 3, 4, 775 - -FuchsiaCity_Gym_MapBGEvents: - bg_event 4, 19, 0, 0, 0, FuchsiaCity_Gym_EventScript_16D6A7 - bg_event 10, 19, 0, 0, 0, FuchsiaCity_Gym_EventScript_16D6A7 - -FuchsiaCity_Gym_MapEvents:: - map_events FuchsiaCity_Gym_EventObjects, FuchsiaCity_Gym_MapWarps, 0x0, FuchsiaCity_Gym_MapBGEvents diff --git a/data/maps/FuchsiaCity_Gym/header.inc b/data/maps/FuchsiaCity_Gym/header.inc deleted file mode 100644 index 16aeeb007..000000000 --- a/data/maps/FuchsiaCity_Gym/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -FuchsiaCity_Gym:: @ 835146C - .4byte FuchsiaCity_Gym_Layout @ 0x82D6A04 - .4byte FuchsiaCity_Gym_MapEvents @ 0x83BC1A4 - .4byte FuchsiaCity_Gym_MapScripts @ 0x816D54D - .4byte NULL - .2byte BGM_FRLG_GYM - .2byte 20 - .byte 0x5f, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x01 diff --git a/data/maps/FuchsiaCity_Gym/map.json b/data/maps/FuchsiaCity_Gym/map.json new file mode 100644 index 000000000..775797674 --- /dev/null +++ b/data/maps/FuchsiaCity_Gym/map.json @@ -0,0 +1,161 @@ +{ + "id": "MAP_FUCHSIA_CITY_GYM", + "name": "FuchsiaCity_Gym", + "layout": "LAYOUT_FUCHSIA_CITY_GYM", + "music": "BGM_FRLG_GYM", + "region_map_section": "MAPSEC_FUCHSIA_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_1", + "connections": null, + "object_events": [ + { + "graphics_id": "26", + "x": 12, + "y": 16, + "elevation": 3, + "movement_type": "18", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "FuchsiaCity_Gym_EventScript_16D65A", + "flag": "0" + }, + { + "graphics_id": "26", + "x": 2, + "y": 9, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "FuchsiaCity_Gym_EventScript_16D643", + "flag": "0" + }, + { + "graphics_id": "26", + "x": 11, + "y": 11, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "FuchsiaCity_Gym_EventScript_16D61F", + "flag": "0" + }, + { + "graphics_id": "25", + "x": 13, + "y": 4, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "FuchsiaCity_Gym_EventScript_16D608", + "flag": "0" + }, + { + "graphics_id": "25", + "x": 4, + "y": 6, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "FuchsiaCity_Gym_EventScript_16D5F1", + "flag": "0" + }, + { + "graphics_id": "26", + "x": 2, + "y": 16, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "FuchsiaCity_Gym_EventScript_16D671", + "flag": "0" + }, + { + "graphics_id": "84", + "x": 7, + "y": 13, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FuchsiaCity_Gym_EventScript_16D54E", + "flag": "0" + }, + { + "graphics_id": "91", + "x": 11, + "y": 19, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FuchsiaCity_Gym_EventScript_16D688", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 6, + "y": 21, + "elevation": 3, + "dest_map": "MAP_FUCHSIA_CITY", + "dest_warp_id": 4 + }, + { + "x": 7, + "y": 21, + "elevation": 3, + "dest_map": "MAP_FUCHSIA_CITY", + "dest_warp_id": 4 + }, + { + "x": 8, + "y": 21, + "elevation": 3, + "dest_map": "MAP_FUCHSIA_CITY", + "dest_warp_id": 4 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 4, + "y": 19, + "elevation": 0, + "script": "FuchsiaCity_Gym_EventScript_16D6A7" + }, + { + "type": "bg_event_type_0", + "x": 10, + "y": 19, + "elevation": 0, + "script": "FuchsiaCity_Gym_EventScript_16D6A7" + } + ] +}
\ No newline at end of file diff --git a/data/maps/FuchsiaCity_House1/events.inc b/data/maps/FuchsiaCity_House1/events.inc deleted file mode 100644 index a91390530..000000000 --- a/data/maps/FuchsiaCity_House1/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -FuchsiaCity_House1_EventObjects: - object_event 1, 32, 0, 7, 0, 4, 0, 3, 9, 17, 0, 0, 0, 0, 0, FuchsiaCity_House1_EventScript_16D6CF, 0, 0, 0 - object_event 2, 28, 0, 1, 0, 2, 0, 3, 7, 17, 0, 0, 0, 0, 0, FuchsiaCity_House1_EventScript_16D6C6, 0, 0, 0 - object_event 3, 16, 0, 2, 0, 5, 0, 3, 2, 17, 0, 0, 0, 0, 0, FuchsiaCity_House1_EventScript_16D6E8, 0, 0, 0 - -FuchsiaCity_House1_MapWarps: - warp_def 3, 7, 3, 5, 775 - warp_def 4, 7, 3, 5, 775 - warp_def 5, 7, 3, 5, 775 - -FuchsiaCity_House1_MapEvents:: - map_events FuchsiaCity_House1_EventObjects, FuchsiaCity_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/FuchsiaCity_House1/header.inc b/data/maps/FuchsiaCity_House1/header.inc deleted file mode 100644 index 018383387..000000000 --- a/data/maps/FuchsiaCity_House1/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -FuchsiaCity_House1:: @ 8351488 - .4byte House1_Layout @ 0x82D5754 - .4byte FuchsiaCity_House1_MapEvents @ 0x83BC218 - .4byte FuchsiaCity_House1_MapScripts @ 0x816D6C5 - .4byte NULL - .2byte BGM_FRLG_CERULEAN_CITY - .2byte 6 - .byte 0x5f, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/FuchsiaCity_House1/map.json b/data/maps/FuchsiaCity_House1/map.json new file mode 100644 index 000000000..2686c6c25 --- /dev/null +++ b/data/maps/FuchsiaCity_House1/map.json @@ -0,0 +1,81 @@ +{ + "id": "MAP_FUCHSIA_CITY_HOUSE1", + "name": "FuchsiaCity_House1", + "layout": "LAYOUT_HOUSE1", + "music": "BGM_FRLG_CERULEAN_CITY", + "region_map_section": "MAPSEC_FUCHSIA_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "32", + "x": 7, + "y": 4, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FuchsiaCity_House1_EventScript_16D6CF", + "flag": "0" + }, + { + "graphics_id": "28", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FuchsiaCity_House1_EventScript_16D6C6", + "flag": "0" + }, + { + "graphics_id": "16", + "x": 2, + "y": 5, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FuchsiaCity_House1_EventScript_16D6E8", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 3, + "dest_map": "MAP_FUCHSIA_CITY", + "dest_warp_id": 5 + }, + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_FUCHSIA_CITY", + "dest_warp_id": 5 + }, + { + "x": 5, + "y": 7, + "elevation": 3, + "dest_map": "MAP_FUCHSIA_CITY", + "dest_warp_id": 5 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/FuchsiaCity_House2/events.inc b/data/maps/FuchsiaCity_House2/events.inc deleted file mode 100644 index 41dfb4f21..000000000 --- a/data/maps/FuchsiaCity_House2/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -FuchsiaCity_House2_EventObjects: - object_event 1, 57, 0, 6, 0, 5, 0, 3, 10, 17, 0, 0, 0, 0, 0, FuchsiaCity_House2_EventScript_16D817, 0, 0, 0 - -FuchsiaCity_House2_MapWarps: - warp_def 2, 9, 0, 7, 775 - warp_def 3, 8, 3, 7, 775 - warp_def 4, 9, 0, 7, 775 - warp_def 3, 1, 3, 8, 775 - -FuchsiaCity_House2_MapEvents:: - map_events FuchsiaCity_House2_EventObjects, FuchsiaCity_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/FuchsiaCity_House2/header.inc b/data/maps/FuchsiaCity_House2/header.inc deleted file mode 100644 index 6bedf2ac0..000000000 --- a/data/maps/FuchsiaCity_House2/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -FuchsiaCity_House2:: @ 83514F8 - .4byte FuchsiaCity_House2_Layout @ 0x831C578 - .4byte FuchsiaCity_House2_MapEvents @ 0x83BC440 - .4byte FuchsiaCity_House2_MapScripts @ 0x816D816 - .4byte NULL - .2byte BGM_FRLG_CERULEAN_CITY - .2byte 202 - .byte 0x5f, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/FuchsiaCity_House2/map.json b/data/maps/FuchsiaCity_House2/map.json new file mode 100644 index 000000000..d18088c38 --- /dev/null +++ b/data/maps/FuchsiaCity_House2/map.json @@ -0,0 +1,62 @@ +{ + "id": "MAP_FUCHSIA_CITY_HOUSE2", + "name": "FuchsiaCity_House2", + "layout": "LAYOUT_FUCHSIA_CITY_HOUSE2", + "music": "BGM_FRLG_CERULEAN_CITY", + "region_map_section": "MAPSEC_FUCHSIA_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "57", + "x": 6, + "y": 5, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FuchsiaCity_House2_EventScript_16D817", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 2, + "y": 9, + "elevation": 0, + "dest_map": "MAP_FUCHSIA_CITY", + "dest_warp_id": 7 + }, + { + "x": 3, + "y": 8, + "elevation": 3, + "dest_map": "MAP_FUCHSIA_CITY", + "dest_warp_id": 7 + }, + { + "x": 4, + "y": 9, + "elevation": 0, + "dest_map": "MAP_FUCHSIA_CITY", + "dest_warp_id": 7 + }, + { + "x": 3, + "y": 1, + "elevation": 3, + "dest_map": "MAP_FUCHSIA_CITY", + "dest_warp_id": 8 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/FuchsiaCity_House3/events.inc b/data/maps/FuchsiaCity_House3/events.inc deleted file mode 100644 index e5c0b9550..000000000 --- a/data/maps/FuchsiaCity_House3/events.inc +++ /dev/null @@ -1,8 +0,0 @@ -FuchsiaCity_House3_EventObjects: - object_event 1, 30, 0, 4, 0, 4, 0, 3, 10, 17, 0, 0, 0, 0, 0, FuchsiaCity_House3_EventScript_16D895, 0, 0, 0 - -FuchsiaCity_House3_MapWarps: - warp_def 4, 7, 3, 10, 775 - -FuchsiaCity_House3_MapEvents:: - map_events FuchsiaCity_House3_EventObjects, FuchsiaCity_House3_MapWarps, 0x0, 0x0 diff --git a/data/maps/FuchsiaCity_House3/header.inc b/data/maps/FuchsiaCity_House3/header.inc deleted file mode 100644 index 3b4f76d09..000000000 --- a/data/maps/FuchsiaCity_House3/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -FuchsiaCity_House3:: @ 8351514 - .4byte House1_Layout @ 0x82D5754 - .4byte FuchsiaCity_House3_MapEvents @ 0x83BC474 - .4byte FuchsiaCity_House3_MapScripts @ 0x816D894 - .4byte NULL - .2byte BGM_FRLG_CERULEAN_CITY - .2byte 6 - .byte 0x5f, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/FuchsiaCity_House3/map.json b/data/maps/FuchsiaCity_House3/map.json new file mode 100644 index 000000000..a3445dd83 --- /dev/null +++ b/data/maps/FuchsiaCity_House3/map.json @@ -0,0 +1,41 @@ +{ + "id": "MAP_FUCHSIA_CITY_HOUSE3", + "name": "FuchsiaCity_House3", + "layout": "LAYOUT_HOUSE1", + "music": "BGM_FRLG_CERULEAN_CITY", + "region_map_section": "MAPSEC_FUCHSIA_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "30", + "x": 4, + "y": 4, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FuchsiaCity_House3_EventScript_16D895", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_FUCHSIA_CITY", + "dest_warp_id": 10 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/FuchsiaCity_Mart/events.inc b/data/maps/FuchsiaCity_Mart/events.inc deleted file mode 100644 index d2c3f8a97..000000000 --- a/data/maps/FuchsiaCity_Mart/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -FuchsiaCity_Mart_EventObjects: - object_event 1, 68, 0, 2, 0, 3, 0, 0, 10, 17, 0, 0, 0, 0, 0, FuchsiaCity_Mart_EventScript_16D4F3, 0, 0, 0 - object_event 2, 61, 0, 6, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, FuchsiaCity_Mart_EventScript_16D4EA, 0, 0, 0 - object_event 3, 42, 0, 9, 0, 5, 0, 3, 2, 17, 0, 0, 0, 0, 0, FuchsiaCity_Mart_EventScript_16D4E1, 0, 0, 0 - -FuchsiaCity_Mart_MapWarps: - warp_def 3, 7, 3, 2, 775 - warp_def 4, 7, 3, 2, 775 - warp_def 5, 7, 3, 2, 775 - -FuchsiaCity_Mart_MapEvents:: - map_events FuchsiaCity_Mart_EventObjects, FuchsiaCity_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/FuchsiaCity_Mart/header.inc b/data/maps/FuchsiaCity_Mart/header.inc deleted file mode 100644 index 705b0f301..000000000 --- a/data/maps/FuchsiaCity_Mart/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -FuchsiaCity_Mart:: @ 8351434 - .4byte Mart_Layout @ 0x82D5BCC - .4byte FuchsiaCity_Mart_MapEvents @ 0x83BC014 - .4byte FuchsiaCity_Mart_MapScripts @ 0x816D4E0 - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 10 - .byte 0x5f, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/FuchsiaCity_Mart/map.json b/data/maps/FuchsiaCity_Mart/map.json new file mode 100644 index 000000000..24dc3ba36 --- /dev/null +++ b/data/maps/FuchsiaCity_Mart/map.json @@ -0,0 +1,81 @@ +{ + "id": "MAP_FUCHSIA_CITY_MART", + "name": "FuchsiaCity_Mart", + "layout": "LAYOUT_MART", + "music": "BGM_FRLG_POKEMON_CENTER", + "region_map_section": "MAPSEC_FUCHSIA_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "68", + "x": 2, + "y": 3, + "elevation": 0, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FuchsiaCity_Mart_EventScript_16D4F3", + "flag": "0" + }, + { + "graphics_id": "61", + "x": 6, + "y": 3, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FuchsiaCity_Mart_EventScript_16D4EA", + "flag": "0" + }, + { + "graphics_id": "42", + "x": 9, + "y": 5, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FuchsiaCity_Mart_EventScript_16D4E1", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 3, + "dest_map": "MAP_FUCHSIA_CITY", + "dest_warp_id": 2 + }, + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_FUCHSIA_CITY", + "dest_warp_id": 2 + }, + { + "x": 5, + "y": 7, + "elevation": 3, + "dest_map": "MAP_FUCHSIA_CITY", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/FuchsiaCity_PokemonCenter_1F/events.inc b/data/maps/FuchsiaCity_PokemonCenter_1F/events.inc deleted file mode 100644 index 789937055..000000000 --- a/data/maps/FuchsiaCity_PokemonCenter_1F/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -FuchsiaCity_PokemonCenter_1F_EventObjects: - object_event 1, 64, 0, 7, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, FuchsiaCity_PokemonCenter_1F_EventScript_16D700, 0, 0, 0 - object_event 2, 25, 0, 12, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, FuchsiaCity_PokemonCenter_1F_EventScript_16D709, 0, 0, 0 - object_event 3, 42, 0, 13, 0, 3, 0, 3, 7, 17, 0, 0, 0, 0, 0, FuchsiaCity_PokemonCenter_1F_EventScript_16D712, 0, 0, 0 - object_event 4, 18, 0, 4, 0, 8, 0, 3, 5, 17, 0, 0, 0, 0, 0, FuchsiaCity_PokemonCenter_1F_EventScript_16D71B, 0, 0, 0 - -FuchsiaCity_PokemonCenter_1F_MapWarps: - warp_def 6, 8, 3, 6, 775 - warp_def 7, 8, 3, 6, 775 - warp_def 8, 8, 3, 6, 775 - warp_def 1, 6, 4, 0, 2822 - -FuchsiaCity_PokemonCenter_1F_MapEvents:: - map_events FuchsiaCity_PokemonCenter_1F_EventObjects, FuchsiaCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/FuchsiaCity_PokemonCenter_1F/header.inc b/data/maps/FuchsiaCity_PokemonCenter_1F/header.inc deleted file mode 100644 index 2d88508c4..000000000 --- a/data/maps/FuchsiaCity_PokemonCenter_1F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -FuchsiaCity_PokemonCenter_1F:: @ 83514A4 - .4byte PokemonCenter_1F_Layout @ 0x82D5990 - .4byte FuchsiaCity_PokemonCenter_1F_MapEvents @ 0x83BC2AC - .4byte FuchsiaCity_PokemonCenter_1F_MapScripts @ 0x816D6F1 - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 8 - .byte 0x5f, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/FuchsiaCity_PokemonCenter_1F/map.json b/data/maps/FuchsiaCity_PokemonCenter_1F/map.json new file mode 100644 index 000000000..04a1a80b3 --- /dev/null +++ b/data/maps/FuchsiaCity_PokemonCenter_1F/map.json @@ -0,0 +1,101 @@ +{ + "id": "MAP_FUCHSIA_CITY_POKEMON_CENTER_1F", + "name": "FuchsiaCity_PokemonCenter_1F", + "layout": "LAYOUT_POKEMON_CENTER_1F", + "music": "BGM_FRLG_POKEMON_CENTER", + "region_map_section": "MAPSEC_FUCHSIA_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "64", + "x": 7, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FuchsiaCity_PokemonCenter_1F_EventScript_16D700", + "flag": "0" + }, + { + "graphics_id": "25", + "x": 12, + "y": 5, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FuchsiaCity_PokemonCenter_1F_EventScript_16D709", + "flag": "0" + }, + { + "graphics_id": "42", + "x": 13, + "y": 3, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FuchsiaCity_PokemonCenter_1F_EventScript_16D712", + "flag": "0" + }, + { + "graphics_id": "18", + "x": 4, + "y": 8, + "elevation": 3, + "movement_type": "5", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FuchsiaCity_PokemonCenter_1F_EventScript_16D71B", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 6, + "y": 8, + "elevation": 3, + "dest_map": "MAP_FUCHSIA_CITY", + "dest_warp_id": 6 + }, + { + "x": 7, + "y": 8, + "elevation": 3, + "dest_map": "MAP_FUCHSIA_CITY", + "dest_warp_id": 6 + }, + { + "x": 8, + "y": 8, + "elevation": 3, + "dest_map": "MAP_FUCHSIA_CITY", + "dest_warp_id": 6 + }, + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_FUCHSIA_CITY_POKEMON_CENTER_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/FuchsiaCity_PokemonCenter_2F/events.inc b/data/maps/FuchsiaCity_PokemonCenter_2F/events.inc deleted file mode 100644 index 2baf36957..000000000 --- a/data/maps/FuchsiaCity_PokemonCenter_2F/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -FuchsiaCity_PokemonCenter_2F_EventObjects: - object_event 1, 65, 0, 6, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, FuchsiaCity_PokemonCenter_2F_EventScript_1A8CF6, 0, 0, 0 - object_event 2, 65, 0, 2, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, FuchsiaCity_PokemonCenter_2F_EventScript_1A8CFC, 0, 0, 0 - object_event 3, 65, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, FuchsiaCity_PokemonCenter_2F_EventScript_1A8D02, 0, 0, 0 - object_event 4, 69, 0, 1, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, FuchsiaCity_PokemonCenter_2F_EventScript_1BB1D2, 112, 0, 0 - -FuchsiaCity_PokemonCenter_2F_MapWarps: - warp_def 1, 6, 4, 3, 2821 - warp_def 5, 1, 0, 0, 4 - warp_def 9, 1, 0, 0, 1 - -FuchsiaCity_PokemonCenter_2F_MapEvents:: - map_events FuchsiaCity_PokemonCenter_2F_EventObjects, FuchsiaCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/FuchsiaCity_PokemonCenter_2F/header.inc b/data/maps/FuchsiaCity_PokemonCenter_2F/header.inc deleted file mode 100644 index 6beffe603..000000000 --- a/data/maps/FuchsiaCity_PokemonCenter_2F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -FuchsiaCity_PokemonCenter_2F:: @ 83514C0 - .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 - .4byte FuchsiaCity_PokemonCenter_2F_MapEvents @ 0x83BC338 - .4byte FuchsiaCity_PokemonCenter_2F_MapScripts @ 0x816D724 - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 9 - .byte 0x5f, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/FuchsiaCity_PokemonCenter_2F/map.json b/data/maps/FuchsiaCity_PokemonCenter_2F/map.json new file mode 100644 index 000000000..ce72c9b33 --- /dev/null +++ b/data/maps/FuchsiaCity_PokemonCenter_2F/map.json @@ -0,0 +1,94 @@ +{ + "id": "MAP_FUCHSIA_CITY_POKEMON_CENTER_2F", + "name": "FuchsiaCity_PokemonCenter_2F", + "layout": "LAYOUT_POKEMON_CENTER_2F", + "music": "BGM_FRLG_POKEMON_CENTER", + "region_map_section": "MAPSEC_FUCHSIA_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "65", + "x": 6, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FuchsiaCity_PokemonCenter_2F_EventScript_1A8CF6", + "flag": "0" + }, + { + "graphics_id": "65", + "x": 2, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FuchsiaCity_PokemonCenter_2F_EventScript_1A8CFC", + "flag": "0" + }, + { + "graphics_id": "65", + "x": 10, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FuchsiaCity_PokemonCenter_2F_EventScript_1A8D02", + "flag": "0" + }, + { + "graphics_id": "69", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FuchsiaCity_PokemonCenter_2F_EventScript_1BB1D2", + "flag": "112" + } + ], + "warp_events": [ + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_FUCHSIA_CITY_POKEMON_CENTER_1F", + "dest_warp_id": 3 + }, + { + "x": 5, + "y": 1, + "elevation": 0, + "dest_map": "MAP_UNKNOWN_MAP_00_04", + "dest_warp_id": 0 + }, + { + "x": 9, + "y": 1, + "elevation": 0, + "dest_map": "MAP_UNKNOWN_MAP_00_01", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/FuchsiaCity_SafariZone_Entrance/events.inc b/data/maps/FuchsiaCity_SafariZone_Entrance/events.inc deleted file mode 100644 index ab9d88a00..000000000 --- a/data/maps/FuchsiaCity_SafariZone_Entrance/events.inc +++ /dev/null @@ -1,17 +0,0 @@ -FuchsiaCity_SafariZone_Entrance_EventObjects: - object_event 1, 47, 0, 7, 0, 3, 0, 3, 9, 17, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 - object_event 2, 47, 0, 1, 0, 6, 0, 3, 10, 17, 0, 0, 0, 0, 0, FuchsiaCity_SafariZone_Entrance_EventScript_16D4B7, 0, 0, 0 - -FuchsiaCity_SafariZone_Entrance_MapWarps: - warp_def 4, 1, 3, 1, 319 - warp_def 5, 7, 3, 0, 775 - warp_def 4, 7, 3, 0, 775 - warp_def 3, 7, 3, 0, 775 - -FuchsiaCity_SafariZone_Entrance_MapCoordEvents: - coord_event 4, 3, 3, 0, 16385, 0, 0, FuchsiaCity_SafariZone_Entrance_EventScript_16D36D - coord_event 5, 3, 3, 0, 16385, 0, 0, FuchsiaCity_SafariZone_Entrance_EventScript_16D379 - coord_event 3, 3, 3, 0, 16385, 0, 0, FuchsiaCity_SafariZone_Entrance_EventScript_16D385 - -FuchsiaCity_SafariZone_Entrance_MapEvents:: - map_events FuchsiaCity_SafariZone_Entrance_EventObjects, FuchsiaCity_SafariZone_Entrance_MapWarps, FuchsiaCity_SafariZone_Entrance_MapCoordEvents, 0x0 diff --git a/data/maps/FuchsiaCity_SafariZone_Entrance/header.inc b/data/maps/FuchsiaCity_SafariZone_Entrance/header.inc deleted file mode 100644 index 7bfaeb1ec..000000000 --- a/data/maps/FuchsiaCity_SafariZone_Entrance/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -FuchsiaCity_SafariZone_Entrance:: @ 8351418 - .4byte FuchsiaCity_SafariZone_Entrance_Layout @ 0x82D8E80 - .4byte FuchsiaCity_SafariZone_Entrance_MapEvents @ 0x83BBFA0 - .4byte FuchsiaCity_SafariZone_Entrance_MapScripts @ 0x816D2A8 - .4byte NULL - .2byte BGM_FRLG_CERULEAN_CITY - .2byte 51 - .byte 0x5f, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/FuchsiaCity_SafariZone_Entrance/map.json b/data/maps/FuchsiaCity_SafariZone_Entrance/map.json new file mode 100644 index 000000000..b6fbd9ec6 --- /dev/null +++ b/data/maps/FuchsiaCity_SafariZone_Entrance/map.json @@ -0,0 +1,103 @@ +{ + "id": "MAP_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE", + "name": "FuchsiaCity_SafariZone_Entrance", + "layout": "LAYOUT_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE", + "music": "BGM_FRLG_CERULEAN_CITY", + "region_map_section": "MAPSEC_FUCHSIA_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "47", + "x": 7, + "y": 3, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "47", + "x": 1, + "y": 6, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FuchsiaCity_SafariZone_Entrance_EventScript_16D4B7", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 4, + "y": 1, + "elevation": 3, + "dest_map": "MAP_SAFARI_ZONE_CENTER", + "dest_warp_id": 1 + }, + { + "x": 5, + "y": 7, + "elevation": 3, + "dest_map": "MAP_FUCHSIA_CITY", + "dest_warp_id": 0 + }, + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_FUCHSIA_CITY", + "dest_warp_id": 0 + }, + { + "x": 3, + "y": 7, + "elevation": 3, + "dest_map": "MAP_FUCHSIA_CITY", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 4, + "y": 3, + "elevation": 3, + "var": "VAR_0x4001", + "var_value": 0, + "script": "FuchsiaCity_SafariZone_Entrance_EventScript_16D36D" + }, + { + "type": "trigger", + "x": 5, + "y": 3, + "elevation": 3, + "var": "VAR_0x4001", + "var_value": 0, + "script": "FuchsiaCity_SafariZone_Entrance_EventScript_16D379" + }, + { + "type": "trigger", + "x": 3, + "y": 3, + "elevation": 3, + "var": "VAR_0x4001", + "var_value": 0, + "script": "FuchsiaCity_SafariZone_Entrance_EventScript_16D385" + } + ], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/FuchsiaCity_ZooBuilding/events.inc b/data/maps/FuchsiaCity_ZooBuilding/events.inc deleted file mode 100644 index 344b95e6f..000000000 --- a/data/maps/FuchsiaCity_ZooBuilding/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -FuchsiaCity_ZooBuilding_EventObjects: - object_event 1, 47, 0, 2, 0, 2, 0, 3, 7, 17, 0, 0, 0, 0, 0, FuchsiaCity_ZooBuilding_EventScript_16D532, 0, 0, 0 - object_event 2, 47, 0, 12, 0, 3, 0, 3, 2, 17, 0, 0, 0, 0, 0, FuchsiaCity_ZooBuilding_EventScript_16D53B, 0, 0, 0 - object_event 3, 47, 0, 6, 0, 4, 0, 3, 10, 17, 0, 0, 0, 0, 0, FuchsiaCity_ZooBuilding_EventScript_16D529, 0, 0, 0 - object_event 4, 47, 0, 10, 0, 8, 0, 3, 9, 18, 0, 0, 0, 0, 0, FuchsiaCity_ZooBuilding_EventScript_16D544, 0, 0, 0 - -FuchsiaCity_ZooBuilding_MapWarps: - warp_def 5, 9, 0, 3, 775 - warp_def 6, 9, 0, 3, 775 - warp_def 7, 9, 3, 3, 775 - -FuchsiaCity_ZooBuilding_MapEvents:: - map_events FuchsiaCity_ZooBuilding_EventObjects, FuchsiaCity_ZooBuilding_MapWarps, 0x0, 0x0 diff --git a/data/maps/FuchsiaCity_ZooBuilding/header.inc b/data/maps/FuchsiaCity_ZooBuilding/header.inc deleted file mode 100644 index e5ad3ae0c..000000000 --- a/data/maps/FuchsiaCity_ZooBuilding/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -FuchsiaCity_ZooBuilding:: @ 8351450 - .4byte FuchsiaCity_ZooBuilding_Layout @ 0x831C348 - .4byte FuchsiaCity_ZooBuilding_MapEvents @ 0x83BC0A0 - .4byte FuchsiaCity_ZooBuilding_MapScripts @ 0x816D528 - .4byte NULL - .2byte BGM_FRLG_CERULEAN_CITY - .2byte 200 - .byte 0x5f, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/FuchsiaCity_ZooBuilding/map.json b/data/maps/FuchsiaCity_ZooBuilding/map.json new file mode 100644 index 000000000..0448b9984 --- /dev/null +++ b/data/maps/FuchsiaCity_ZooBuilding/map.json @@ -0,0 +1,94 @@ +{ + "id": "MAP_FUCHSIA_CITY_ZOO_BUILDING", + "name": "FuchsiaCity_ZooBuilding", + "layout": "LAYOUT_FUCHSIA_CITY_ZOO_BUILDING", + "music": "BGM_FRLG_CERULEAN_CITY", + "region_map_section": "MAPSEC_FUCHSIA_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "47", + "x": 2, + "y": 2, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FuchsiaCity_ZooBuilding_EventScript_16D532", + "flag": "0" + }, + { + "graphics_id": "47", + "x": 12, + "y": 3, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FuchsiaCity_ZooBuilding_EventScript_16D53B", + "flag": "0" + }, + { + "graphics_id": "47", + "x": 6, + "y": 4, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FuchsiaCity_ZooBuilding_EventScript_16D529", + "flag": "0" + }, + { + "graphics_id": "47", + "x": 10, + "y": 8, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 2, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FuchsiaCity_ZooBuilding_EventScript_16D544", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 5, + "y": 9, + "elevation": 0, + "dest_map": "MAP_FUCHSIA_CITY", + "dest_warp_id": 3 + }, + { + "x": 6, + "y": 9, + "elevation": 0, + "dest_map": "MAP_FUCHSIA_CITY", + "dest_warp_id": 3 + }, + { + "x": 7, + "y": 9, + "elevation": 3, + "dest_map": "MAP_FUCHSIA_CITY", + "dest_warp_id": 3 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/IndigoPlateau_Exterior/connections.inc b/data/maps/IndigoPlateau_Exterior/connections.inc deleted file mode 100644 index e218b5480..000000000 --- a/data/maps/IndigoPlateau_Exterior/connections.inc +++ /dev/null @@ -1,6 +0,0 @@ -IndigoPlateau_Exterior_MapConnectionsList: @ 83528B0 - connection down, 0, MAP_ROUTE23 - -IndigoPlateau_Exterior_MapConnections:: @ 83528BC - .4byte 1 - .4byte IndigoPlateau_Exterior_MapConnectionsList diff --git a/data/maps/IndigoPlateau_Exterior/events.inc b/data/maps/IndigoPlateau_Exterior/events.inc deleted file mode 100644 index 1a29fa392..000000000 --- a/data/maps/IndigoPlateau_Exterior/events.inc +++ /dev/null @@ -1,9 +0,0 @@ -IndigoPlateau_Exterior_EventObjects: - object_event 1, 72, 0, 11, 0, 6, 0, 0, 8, 17, 0, 0, 0, 0, 0, 0x0, 163, 0, 0 - object_event 2, 71, 0, 11, 0, 6, 0, 0, 8, 17, 0, 0, 0, 0, 0, 0x0, 164, 0, 0 - -IndigoPlateau_Exterior_MapWarps: - warp_def 11, 6, 0, 0, 3328 - -IndigoPlateau_Exterior_MapEvents:: - map_events IndigoPlateau_Exterior_EventObjects, IndigoPlateau_Exterior_MapWarps, 0x0, 0x0 diff --git a/data/maps/IndigoPlateau_Exterior/header.inc b/data/maps/IndigoPlateau_Exterior/header.inc deleted file mode 100644 index c40993e89..000000000 --- a/data/maps/IndigoPlateau_Exterior/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -IndigoPlateau_Exterior:: @ 8350714 - .4byte IndigoPlateau_Exterior_Layout @ 0x82E3F04 - .4byte IndigoPlateau_Exterior_MapEvents @ 0x83B5C3C - .4byte IndigoPlateau_Exterior_MapScripts @ 0x816723B - .4byte IndigoPlateau_Exterior_MapConnections @ 0x83528BC - .2byte BGM_FRLG_INDIGO_PLATEAU - .2byte 87 - .byte 0x61, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/IndigoPlateau_Exterior/map.json b/data/maps/IndigoPlateau_Exterior/map.json new file mode 100644 index 000000000..29c62a76c --- /dev/null +++ b/data/maps/IndigoPlateau_Exterior/map.json @@ -0,0 +1,60 @@ +{ + "id": "MAP_INDIGO_PLATEAU_EXTERIOR", + "name": "IndigoPlateau_Exterior", + "layout": "LAYOUT_INDIGO_PLATEAU_EXTERIOR", + "music": "BGM_FRLG_INDIGO_PLATEAU", + "region_map_section": "MAPSEC_INDIGO_PLATEAU", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_1", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_ROUTE23", + "offset": 0, + "direction": "down" + } + ], + "object_events": [ + { + "graphics_id": "72", + "x": 11, + "y": 6, + "elevation": 0, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "163" + }, + { + "graphics_id": "71", + "x": 11, + "y": 6, + "elevation": 0, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "164" + } + ], + "warp_events": [ + { + "x": 11, + "y": 6, + "elevation": 0, + "dest_map": "MAP_INDIGO_PLATEAU_POKEMON_CENTER_1F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/IndigoPlateau_PokemonCenter_1F/events.inc b/data/maps/IndigoPlateau_PokemonCenter_1F/events.inc deleted file mode 100644 index 0f6cfcfb5..000000000 --- a/data/maps/IndigoPlateau_PokemonCenter_1F/events.inc +++ /dev/null @@ -1,17 +0,0 @@ -IndigoPlateau_PokemonCenter_1F_EventObjects: - object_event 1, 68, 0, 0, 0, 7, 0, 3, 10, 17, 0, 0, 0, 0, 0, IndigoPlateau_PokemonCenter_1F_EventScript_16EACC, 0, 0, 0 - object_event 2, 64, 0, 13, 0, 10, 0, 3, 8, 17, 0, 0, 0, 0, 0, IndigoPlateau_PokemonCenter_1F_EventScript_16EB06, 0, 0, 0 - object_event 3, 91, 0, 7, 0, 14, 0, 3, 10, 17, 0, 0, 0, 0, 0, IndigoPlateau_PokemonCenter_1F_EventScript_16EAC3, 0, 0, 0 - object_event 4, 42, 0, 5, 0, 3, 0, 3, 8, 17, 0, 0, 0, 0, 0, IndigoPlateau_PokemonCenter_1F_EventScript_16EA8A, 0, 0, 0 - object_event 5, 54, 0, 23, 0, 13, 0, 3, 10, 17, 0, 0, 0, 0, 0, IndigoPlateau_PokemonCenter_1F_EventScript_1ACFAE, 157, 0, 0 - object_event 6, 0, 0, 22, 0, 9, 0, 0, 76, 17, 0, 0, 0, 0, 0, IndigoPlateau_PokemonCenter_1F_EventScript_1AD06C, 157, 0, 0 - object_event 7, 41, 0, 16, 0, 15, 0, 3, 2, 17, 0, 0, 0, 0, 0, IndigoPlateau_PokemonCenter_1F_EventScript_1AD087, 157, 0, 0 - object_event 8, 0, 0, 23, 0, 9, 0, 0, 76, 17, 0, 0, 0, 0, 0, IndigoPlateau_PokemonCenter_1F_EventScript_1AD06C, 157, 0, 0 - -IndigoPlateau_PokemonCenter_1F_MapWarps: - warp_def 11, 16, 3, 0, 777 - warp_def 4, 1, 3, 0, 331 - warp_def 1, 14, 4, 0, 3329 - -IndigoPlateau_PokemonCenter_1F_MapEvents:: - map_events IndigoPlateau_PokemonCenter_1F_EventObjects, IndigoPlateau_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/IndigoPlateau_PokemonCenter_1F/header.inc b/data/maps/IndigoPlateau_PokemonCenter_1F/header.inc deleted file mode 100644 index bb16f0475..000000000 --- a/data/maps/IndigoPlateau_PokemonCenter_1F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -IndigoPlateau_PokemonCenter_1F:: @ 8351610 - .4byte IndigoPlateau_PokemonCenter_1F_Layout @ 0x831F000 - .4byte IndigoPlateau_PokemonCenter_1F_MapEvents @ 0x83BCA94 - .4byte IndigoPlateau_PokemonCenter_1F_MapScripts @ 0x816EA5A - .4byte NULL - .2byte BGM_FRLG_GYM - .2byte 212 - .byte 0x61, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x01 diff --git a/data/maps/IndigoPlateau_PokemonCenter_1F/map.json b/data/maps/IndigoPlateau_PokemonCenter_1F/map.json new file mode 100644 index 000000000..89ba4f048 --- /dev/null +++ b/data/maps/IndigoPlateau_PokemonCenter_1F/map.json @@ -0,0 +1,146 @@ +{ + "id": "MAP_INDIGO_PLATEAU_POKEMON_CENTER_1F", + "name": "IndigoPlateau_PokemonCenter_1F", + "layout": "LAYOUT_INDIGO_PLATEAU_POKEMON_CENTER_1F", + "music": "BGM_FRLG_GYM", + "region_map_section": "MAPSEC_INDIGO_PLATEAU", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_1", + "connections": null, + "object_events": [ + { + "graphics_id": "68", + "x": 0, + "y": 7, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "IndigoPlateau_PokemonCenter_1F_EventScript_16EACC", + "flag": "0" + }, + { + "graphics_id": "64", + "x": 13, + "y": 10, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "IndigoPlateau_PokemonCenter_1F_EventScript_16EB06", + "flag": "0" + }, + { + "graphics_id": "91", + "x": 7, + "y": 14, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "IndigoPlateau_PokemonCenter_1F_EventScript_16EAC3", + "flag": "0" + }, + { + "graphics_id": "42", + "x": 5, + "y": 3, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "IndigoPlateau_PokemonCenter_1F_EventScript_16EA8A", + "flag": "0" + }, + { + "graphics_id": "54", + "x": 23, + "y": 13, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "IndigoPlateau_PokemonCenter_1F_EventScript_1ACFAE", + "flag": "157" + }, + { + "graphics_id": "0", + "x": 22, + "y": 9, + "elevation": 0, + "movement_type": "76", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "IndigoPlateau_PokemonCenter_1F_EventScript_1AD06C", + "flag": "157" + }, + { + "graphics_id": "41", + "x": 16, + "y": 15, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "IndigoPlateau_PokemonCenter_1F_EventScript_1AD087", + "flag": "157" + }, + { + "graphics_id": "0", + "x": 23, + "y": 9, + "elevation": 0, + "movement_type": "76", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "IndigoPlateau_PokemonCenter_1F_EventScript_1AD06C", + "flag": "157" + } + ], + "warp_events": [ + { + "x": 11, + "y": 16, + "elevation": 3, + "dest_map": "MAP_INDIGO_PLATEAU_EXTERIOR", + "dest_warp_id": 0 + }, + { + "x": 4, + "y": 1, + "elevation": 3, + "dest_map": "MAP_POKEMON_LEAGUE_LORELEIS_ROOM", + "dest_warp_id": 0 + }, + { + "x": 1, + "y": 14, + "elevation": 4, + "dest_map": "MAP_INDIGO_PLATEAU_POKEMON_CENTER_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/IndigoPlateau_PokemonCenter_2F/events.inc b/data/maps/IndigoPlateau_PokemonCenter_2F/events.inc deleted file mode 100644 index f0061ff98..000000000 --- a/data/maps/IndigoPlateau_PokemonCenter_2F/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -IndigoPlateau_PokemonCenter_2F_EventObjects: - object_event 1, 65, 0, 6, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, IndigoPlateau_PokemonCenter_2F_EventScript_1A8CF6, 0, 0, 0 - object_event 2, 65, 0, 2, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, IndigoPlateau_PokemonCenter_2F_EventScript_1A8CFC, 0, 0, 0 - object_event 3, 65, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, IndigoPlateau_PokemonCenter_2F_EventScript_1A8D02, 0, 0, 0 - object_event 4, 69, 0, 1, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, IndigoPlateau_PokemonCenter_2F_EventScript_1BB1D2, 112, 0, 0 - -IndigoPlateau_PokemonCenter_2F_MapWarps: - warp_def 1, 6, 4, 2, 3328 - warp_def 5, 1, 0, 0, 4 - warp_def 9, 1, 0, 0, 1 - -IndigoPlateau_PokemonCenter_2F_MapEvents:: - map_events IndigoPlateau_PokemonCenter_2F_EventObjects, IndigoPlateau_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/IndigoPlateau_PokemonCenter_2F/header.inc b/data/maps/IndigoPlateau_PokemonCenter_2F/header.inc deleted file mode 100644 index 604c361d8..000000000 --- a/data/maps/IndigoPlateau_PokemonCenter_2F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -IndigoPlateau_PokemonCenter_2F:: @ 835162C - .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 - .4byte IndigoPlateau_PokemonCenter_2F_MapEvents @ 0x83BCB20 - .4byte IndigoPlateau_PokemonCenter_2F_MapScripts @ 0x816EB0F - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 9 - .byte 0x61, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x01 diff --git a/data/maps/IndigoPlateau_PokemonCenter_2F/map.json b/data/maps/IndigoPlateau_PokemonCenter_2F/map.json new file mode 100644 index 000000000..3003616f3 --- /dev/null +++ b/data/maps/IndigoPlateau_PokemonCenter_2F/map.json @@ -0,0 +1,94 @@ +{ + "id": "MAP_INDIGO_PLATEAU_POKEMON_CENTER_2F", + "name": "IndigoPlateau_PokemonCenter_2F", + "layout": "LAYOUT_POKEMON_CENTER_2F", + "music": "BGM_FRLG_POKEMON_CENTER", + "region_map_section": "MAPSEC_INDIGO_PLATEAU", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_1", + "connections": null, + "object_events": [ + { + "graphics_id": "65", + "x": 6, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "IndigoPlateau_PokemonCenter_2F_EventScript_1A8CF6", + "flag": "0" + }, + { + "graphics_id": "65", + "x": 2, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "IndigoPlateau_PokemonCenter_2F_EventScript_1A8CFC", + "flag": "0" + }, + { + "graphics_id": "65", + "x": 10, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "IndigoPlateau_PokemonCenter_2F_EventScript_1A8D02", + "flag": "0" + }, + { + "graphics_id": "69", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "IndigoPlateau_PokemonCenter_2F_EventScript_1BB1D2", + "flag": "112" + } + ], + "warp_events": [ + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_INDIGO_PLATEAU_POKEMON_CENTER_1F", + "dest_warp_id": 2 + }, + { + "x": 5, + "y": 1, + "elevation": 0, + "dest_map": "MAP_UNKNOWN_MAP_00_04", + "dest_warp_id": 0 + }, + { + "x": 9, + "y": 1, + "elevation": 0, + "dest_map": "MAP_UNKNOWN_MAP_00_01", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/LavenderTown/connections.inc b/data/maps/LavenderTown/connections.inc deleted file mode 100644 index 8b1950468..000000000 --- a/data/maps/LavenderTown/connections.inc +++ /dev/null @@ -1,8 +0,0 @@ -LavenderTown_MapConnectionsList: @ 83527F8 - connection up, 0, MAP_ROUTE10 - connection down, 0, MAP_ROUTE12 - connection left, 0, MAP_ROUTE8 - -LavenderTown_MapConnections:: @ 835281C - .4byte 3 - .4byte LavenderTown_MapConnectionsList diff --git a/data/maps/LavenderTown/events.inc b/data/maps/LavenderTown/events.inc deleted file mode 100644 index db3a3cc3e..000000000 --- a/data/maps/LavenderTown/events.inc +++ /dev/null @@ -1,21 +0,0 @@ -LavenderTown_EventObjects: - object_event 1, 17, 0, 19, 0, 10, 0, 3, 2, 18, 0, 0, 0, 0, 0, LavenderTown_EventScript_16687D, 0, 0, 0 - object_event 2, 47, 0, 12, 0, 12, 0, 3, 8, 17, 0, 0, 0, 0, 0, LavenderTown_EventScript_1668A6, 0, 0, 0 - object_event 3, 19, 0, 10, 0, 7, 0, 3, 14, 17, 0, 0, 0, 0, 0, LavenderTown_EventScript_1668AF, 0, 0, 0 - -LavenderTown_MapWarps: - warp_def 18, 6, 0, 1, 344 - warp_def 6, 5, 0, 1, 2048 - warp_def 10, 11, 0, 1, 2050 - warp_def 5, 16, 0, 1, 2051 - warp_def 10, 16, 0, 1, 2052 - warp_def 20, 15, 0, 1, 2053 - -LavenderTown_MapBGEvents: - bg_event 12, 4, 0, 0, 0, LavenderTown_EventScript_1668C1 - bg_event 15, 11, 0, 0, 0, LavenderTown_EventScript_1668B8 - bg_event 21, 7, 0, 0, 0, LavenderTown_EventScript_1668D3 - bg_event 7, 11, 0, 0, 0, LavenderTown_EventScript_1668CA - -LavenderTown_MapEvents:: - map_events LavenderTown_EventObjects, LavenderTown_MapWarps, 0x0, LavenderTown_MapBGEvents diff --git a/data/maps/LavenderTown/header.inc b/data/maps/LavenderTown/header.inc deleted file mode 100644 index 24913dc46..000000000 --- a/data/maps/LavenderTown/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -LavenderTown:: @ 8350688 - .4byte LavenderTown_Layout @ 0x82E0610 - .4byte LavenderTown_MapEvents @ 0x83B549C - .4byte LavenderTown_MapScripts @ 0x816686B - .4byte LavenderTown_MapConnections @ 0x835281C - .2byte BGM_FRLG_LAVENDER_TOWN - .2byte 82 - .byte 0x5c, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/LavenderTown/map.json b/data/maps/LavenderTown/map.json new file mode 100644 index 000000000..6231d9469 --- /dev/null +++ b/data/maps/LavenderTown/map.json @@ -0,0 +1,147 @@ +{ + "id": "MAP_LAVENDER_TOWN", + "name": "LavenderTown", + "layout": "LAYOUT_LAVENDER_TOWN", + "music": "BGM_FRLG_LAVENDER_TOWN", + "region_map_section": "MAPSEC_LAVENDER_TOWN", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_1", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_ROUTE10", + "offset": 0, + "direction": "up" + }, + { + "map": "MAP_ROUTE12", + "offset": 0, + "direction": "down" + }, + { + "map": "MAP_ROUTE8", + "offset": 0, + "direction": "left" + } + ], + "object_events": [ + { + "graphics_id": "17", + "x": 19, + "y": 10, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 2, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LavenderTown_EventScript_16687D", + "flag": "0" + }, + { + "graphics_id": "47", + "x": 12, + "y": 12, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LavenderTown_EventScript_1668A6", + "flag": "0" + }, + { + "graphics_id": "19", + "x": 10, + "y": 7, + "elevation": 3, + "movement_type": "14", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LavenderTown_EventScript_1668AF", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 18, + "y": 6, + "elevation": 0, + "dest_map": "MAP_POKEMON_TOWER_1F", + "dest_warp_id": 1 + }, + { + "x": 6, + "y": 5, + "elevation": 0, + "dest_map": "MAP_LAVENDER_TOWN_POKEMON_CENTER_1F", + "dest_warp_id": 1 + }, + { + "x": 10, + "y": 11, + "elevation": 0, + "dest_map": "MAP_LAVENDER_TOWN_VOLUNTEER_POKEMON_HOUSE", + "dest_warp_id": 1 + }, + { + "x": 5, + "y": 16, + "elevation": 0, + "dest_map": "MAP_LAVENDER_TOWN_HOUSE1", + "dest_warp_id": 1 + }, + { + "x": 10, + "y": 16, + "elevation": 0, + "dest_map": "MAP_LAVENDER_TOWN_HOUSE2", + "dest_warp_id": 1 + }, + { + "x": 20, + "y": 15, + "elevation": 0, + "dest_map": "MAP_LAVENDER_TOWN_MART", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 12, + "y": 4, + "elevation": 0, + "script": "LavenderTown_EventScript_1668C1" + }, + { + "type": "bg_event_type_0", + "x": 15, + "y": 11, + "elevation": 0, + "script": "LavenderTown_EventScript_1668B8" + }, + { + "type": "bg_event_type_0", + "x": 21, + "y": 7, + "elevation": 0, + "script": "LavenderTown_EventScript_1668D3" + }, + { + "type": "bg_event_type_0", + "x": 7, + "y": 11, + "elevation": 0, + "script": "LavenderTown_EventScript_1668CA" + } + ] +}
\ No newline at end of file diff --git a/data/maps/LavenderTown_House1/events.inc b/data/maps/LavenderTown_House1/events.inc deleted file mode 100644 index 6cfc603da..000000000 --- a/data/maps/LavenderTown_House1/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -LavenderTown_House1_EventObjects: - object_event 1, 42, 0, 4, 0, 4, 0, 3, 8, 17, 0, 0, 0, 0, 0, LavenderTown_House1_EventScript_16B233, 0, 0, 0 - object_event 2, 111, 0, 8, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, LavenderTown_House1_EventScript_16B252, 0, 0, 0 - -LavenderTown_House1_MapWarps: - warp_def 3, 7, 3, 3, 772 - warp_def 4, 7, 3, 3, 772 - warp_def 5, 7, 3, 3, 772 - -LavenderTown_House1_MapEvents:: - map_events LavenderTown_House1_EventObjects, LavenderTown_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/LavenderTown_House1/header.inc b/data/maps/LavenderTown_House1/header.inc deleted file mode 100644 index 5c11f9ff5..000000000 --- a/data/maps/LavenderTown_House1/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -LavenderTown_House1:: @ 83510B4 - .4byte House5_Layout @ 0x82D6AF0 - .4byte LavenderTown_House1_MapEvents @ 0x83BAA58 - .4byte LavenderTown_House1_MapScripts @ 0x816B232 - .4byte NULL - .2byte BGM_FRLG_LAVENDER_TOWN - .2byte 21 - .byte 0x5c, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/LavenderTown_House1/map.json b/data/maps/LavenderTown_House1/map.json new file mode 100644 index 000000000..5674da210 --- /dev/null +++ b/data/maps/LavenderTown_House1/map.json @@ -0,0 +1,68 @@ +{ + "id": "MAP_LAVENDER_TOWN_HOUSE1", + "name": "LavenderTown_House1", + "layout": "LAYOUT_HOUSE5", + "music": "BGM_FRLG_LAVENDER_TOWN", + "region_map_section": "MAPSEC_LAVENDER_TOWN", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "42", + "x": 4, + "y": 4, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LavenderTown_House1_EventScript_16B233", + "flag": "0" + }, + { + "graphics_id": "111", + "x": 8, + "y": 6, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LavenderTown_House1_EventScript_16B252", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 3, + "dest_map": "MAP_LAVENDER_TOWN", + "dest_warp_id": 3 + }, + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_LAVENDER_TOWN", + "dest_warp_id": 3 + }, + { + "x": 5, + "y": 7, + "elevation": 3, + "dest_map": "MAP_LAVENDER_TOWN", + "dest_warp_id": 3 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/LavenderTown_House2/events.inc b/data/maps/LavenderTown_House2/events.inc deleted file mode 100644 index df507a60f..000000000 --- a/data/maps/LavenderTown_House2/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -LavenderTown_House2_EventObjects: - object_event 1, 61, 0, 4, 0, 4, 0, 3, 8, 17, 0, 0, 0, 0, 0, LavenderTown_House2_EventScript_16B266, 0, 0, 0 - -LavenderTown_House2_MapWarps: - warp_def 3, 7, 3, 4, 772 - warp_def 4, 7, 3, 4, 772 - warp_def 5, 7, 3, 4, 772 - -LavenderTown_House2_MapEvents:: - map_events LavenderTown_House2_EventObjects, LavenderTown_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/LavenderTown_House2/header.inc b/data/maps/LavenderTown_House2/header.inc deleted file mode 100644 index 30f103a05..000000000 --- a/data/maps/LavenderTown_House2/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -LavenderTown_House2:: @ 83510D0 - .4byte House5_Layout @ 0x82D6AF0 - .4byte LavenderTown_House2_MapEvents @ 0x83BAA9C - .4byte LavenderTown_House2_MapScripts @ 0x816B265 - .4byte NULL - .2byte BGM_FRLG_CERULEAN_CITY - .2byte 21 - .byte 0x5c, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/LavenderTown_House2/map.json b/data/maps/LavenderTown_House2/map.json new file mode 100644 index 000000000..8617d5d03 --- /dev/null +++ b/data/maps/LavenderTown_House2/map.json @@ -0,0 +1,55 @@ +{ + "id": "MAP_LAVENDER_TOWN_HOUSE2", + "name": "LavenderTown_House2", + "layout": "LAYOUT_HOUSE5", + "music": "BGM_FRLG_CERULEAN_CITY", + "region_map_section": "MAPSEC_LAVENDER_TOWN", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "61", + "x": 4, + "y": 4, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LavenderTown_House2_EventScript_16B266", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 3, + "dest_map": "MAP_LAVENDER_TOWN", + "dest_warp_id": 4 + }, + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_LAVENDER_TOWN", + "dest_warp_id": 4 + }, + { + "x": 5, + "y": 7, + "elevation": 3, + "dest_map": "MAP_LAVENDER_TOWN", + "dest_warp_id": 4 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/LavenderTown_Mart/events.inc b/data/maps/LavenderTown_Mart/events.inc deleted file mode 100644 index 8bd84d44a..000000000 --- a/data/maps/LavenderTown_Mart/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -LavenderTown_Mart_EventObjects: - object_event 1, 68, 0, 2, 0, 3, 0, 0, 10, 17, 0, 0, 0, 0, 0, LavenderTown_Mart_EventScript_16B36B, 0, 0, 0 - object_event 2, 30, 0, 6, 0, 2, 0, 3, 1, 17, 0, 0, 0, 0, 0, LavenderTown_Mart_EventScript_16B350, 0, 0, 0 - object_event 3, 26, 0, 9, 0, 2, 0, 3, 1, 17, 0, 0, 0, 0, 0, LavenderTown_Mart_EventScript_16B359, 0, 0, 0 - object_event 4, 18, 0, 9, 0, 5, 0, 3, 14, 17, 0, 0, 0, 0, 0, LavenderTown_Mart_EventScript_16B362, 0, 0, 0 - -LavenderTown_Mart_MapWarps: - warp_def 3, 7, 3, 5, 772 - warp_def 4, 7, 3, 5, 772 - warp_def 5, 7, 3, 5, 772 - -LavenderTown_Mart_MapEvents:: - map_events LavenderTown_Mart_EventObjects, LavenderTown_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/LavenderTown_Mart/header.inc b/data/maps/LavenderTown_Mart/header.inc deleted file mode 100644 index 848c25d72..000000000 --- a/data/maps/LavenderTown_Mart/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -LavenderTown_Mart:: @ 83510EC - .4byte Mart_Layout @ 0x82D5BCC - .4byte LavenderTown_Mart_MapEvents @ 0x83BAB28 - .4byte LavenderTown_Mart_MapScripts @ 0x816B34F - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 10 - .byte 0x5c, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/LavenderTown_Mart/map.json b/data/maps/LavenderTown_Mart/map.json new file mode 100644 index 000000000..017950cb6 --- /dev/null +++ b/data/maps/LavenderTown_Mart/map.json @@ -0,0 +1,94 @@ +{ + "id": "MAP_LAVENDER_TOWN_MART", + "name": "LavenderTown_Mart", + "layout": "LAYOUT_MART", + "music": "BGM_FRLG_POKEMON_CENTER", + "region_map_section": "MAPSEC_LAVENDER_TOWN", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "68", + "x": 2, + "y": 3, + "elevation": 0, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LavenderTown_Mart_EventScript_16B36B", + "flag": "0" + }, + { + "graphics_id": "30", + "x": 6, + "y": 2, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LavenderTown_Mart_EventScript_16B350", + "flag": "0" + }, + { + "graphics_id": "26", + "x": 9, + "y": 2, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LavenderTown_Mart_EventScript_16B359", + "flag": "0" + }, + { + "graphics_id": "18", + "x": 9, + "y": 5, + "elevation": 3, + "movement_type": "14", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LavenderTown_Mart_EventScript_16B362", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 3, + "dest_map": "MAP_LAVENDER_TOWN", + "dest_warp_id": 5 + }, + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_LAVENDER_TOWN", + "dest_warp_id": 5 + }, + { + "x": 5, + "y": 7, + "elevation": 3, + "dest_map": "MAP_LAVENDER_TOWN", + "dest_warp_id": 5 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/LavenderTown_PokemonCenter_1F/events.inc b/data/maps/LavenderTown_PokemonCenter_1F/events.inc deleted file mode 100644 index aa5197cd3..000000000 --- a/data/maps/LavenderTown_PokemonCenter_1F/events.inc +++ /dev/null @@ -1,15 +0,0 @@ -LavenderTown_PokemonCenter_1F_EventObjects: - object_event 1, 64, 0, 7, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, LavenderTown_PokemonCenter_1F_EventScript_16B0FE, 0, 0, 0 - object_event 2, 61, 0, 9, 0, 4, 0, 3, 8, 17, 0, 0, 0, 0, 0, LavenderTown_PokemonCenter_1F_EventScript_16B107, 0, 0, 0 - object_event 3, 22, 0, 5, 0, 6, 0, 3, 3, 33, 0, 0, 0, 0, 0, LavenderTown_PokemonCenter_1F_EventScript_16B110, 0, 0, 0 - object_event 4, 18, 0, 2, 0, 2, 0, 3, 2, 17, 0, 0, 0, 0, 0, LavenderTown_PokemonCenter_1F_EventScript_16B119, 0, 0, 0 - object_event 5, 30, 0, 14, 0, 6, 0, 3, 9, 17, 0, 0, 0, 0, 0, LavenderTown_PokemonCenter_1F_EventScript_1AD0A0, 157, 0, 0 - -LavenderTown_PokemonCenter_1F_MapWarps: - warp_def 6, 8, 3, 1, 772 - warp_def 7, 8, 3, 1, 772 - warp_def 8, 8, 3, 1, 772 - warp_def 1, 6, 4, 0, 2049 - -LavenderTown_PokemonCenter_1F_MapEvents:: - map_events LavenderTown_PokemonCenter_1F_EventObjects, LavenderTown_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/LavenderTown_PokemonCenter_1F/header.inc b/data/maps/LavenderTown_PokemonCenter_1F/header.inc deleted file mode 100644 index ecf848112..000000000 --- a/data/maps/LavenderTown_PokemonCenter_1F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -LavenderTown_PokemonCenter_1F:: @ 8351060 - .4byte PokemonCenter_1F_Layout @ 0x82D5990 - .4byte LavenderTown_PokemonCenter_1F_MapEvents @ 0x83BA890 - .4byte LavenderTown_PokemonCenter_1F_MapScripts @ 0x816B0EF - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 8 - .byte 0x5c, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/LavenderTown_PokemonCenter_1F/map.json b/data/maps/LavenderTown_PokemonCenter_1F/map.json new file mode 100644 index 000000000..db62073d3 --- /dev/null +++ b/data/maps/LavenderTown_PokemonCenter_1F/map.json @@ -0,0 +1,114 @@ +{ + "id": "MAP_LAVENDER_TOWN_POKEMON_CENTER_1F", + "name": "LavenderTown_PokemonCenter_1F", + "layout": "LAYOUT_POKEMON_CENTER_1F", + "music": "BGM_FRLG_POKEMON_CENTER", + "region_map_section": "MAPSEC_LAVENDER_TOWN", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "64", + "x": 7, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LavenderTown_PokemonCenter_1F_EventScript_16B0FE", + "flag": "0" + }, + { + "graphics_id": "61", + "x": 9, + "y": 4, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LavenderTown_PokemonCenter_1F_EventScript_16B107", + "flag": "0" + }, + { + "graphics_id": "22", + "x": 5, + "y": 6, + "elevation": 3, + "movement_type": "3", + "movement_range_x": 1, + "movement_range_y": 2, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LavenderTown_PokemonCenter_1F_EventScript_16B110", + "flag": "0" + }, + { + "graphics_id": "18", + "x": 2, + "y": 2, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LavenderTown_PokemonCenter_1F_EventScript_16B119", + "flag": "0" + }, + { + "graphics_id": "30", + "x": 14, + "y": 6, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LavenderTown_PokemonCenter_1F_EventScript_1AD0A0", + "flag": "157" + } + ], + "warp_events": [ + { + "x": 6, + "y": 8, + "elevation": 3, + "dest_map": "MAP_LAVENDER_TOWN", + "dest_warp_id": 1 + }, + { + "x": 7, + "y": 8, + "elevation": 3, + "dest_map": "MAP_LAVENDER_TOWN", + "dest_warp_id": 1 + }, + { + "x": 8, + "y": 8, + "elevation": 3, + "dest_map": "MAP_LAVENDER_TOWN", + "dest_warp_id": 1 + }, + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_LAVENDER_TOWN_POKEMON_CENTER_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/LavenderTown_PokemonCenter_2F/events.inc b/data/maps/LavenderTown_PokemonCenter_2F/events.inc deleted file mode 100644 index 69295dbe9..000000000 --- a/data/maps/LavenderTown_PokemonCenter_2F/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -LavenderTown_PokemonCenter_2F_EventObjects: - object_event 1, 65, 0, 6, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, LavenderTown_PokemonCenter_2F_EventScript_1A8CF6, 0, 0, 0 - object_event 2, 65, 0, 2, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, LavenderTown_PokemonCenter_2F_EventScript_1A8CFC, 0, 0, 0 - object_event 3, 65, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, LavenderTown_PokemonCenter_2F_EventScript_1A8D02, 0, 0, 0 - object_event 4, 69, 0, 1, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, LavenderTown_PokemonCenter_2F_EventScript_1BB1D2, 112, 0, 0 - -LavenderTown_PokemonCenter_2F_MapWarps: - warp_def 1, 6, 4, 3, 2048 - warp_def 5, 1, 0, 0, 4 - warp_def 9, 1, 0, 0, 1 - -LavenderTown_PokemonCenter_2F_MapEvents:: - map_events LavenderTown_PokemonCenter_2F_EventObjects, LavenderTown_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/LavenderTown_PokemonCenter_2F/header.inc b/data/maps/LavenderTown_PokemonCenter_2F/header.inc deleted file mode 100644 index 99713d4c8..000000000 --- a/data/maps/LavenderTown_PokemonCenter_2F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -LavenderTown_PokemonCenter_2F:: @ 835107C - .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 - .4byte LavenderTown_PokemonCenter_2F_MapEvents @ 0x83BA91C - .4byte LavenderTown_PokemonCenter_2F_MapScripts @ 0x816B122 - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 9 - .byte 0x5c, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/LavenderTown_PokemonCenter_2F/map.json b/data/maps/LavenderTown_PokemonCenter_2F/map.json new file mode 100644 index 000000000..8b88b91ce --- /dev/null +++ b/data/maps/LavenderTown_PokemonCenter_2F/map.json @@ -0,0 +1,94 @@ +{ + "id": "MAP_LAVENDER_TOWN_POKEMON_CENTER_2F", + "name": "LavenderTown_PokemonCenter_2F", + "layout": "LAYOUT_POKEMON_CENTER_2F", + "music": "BGM_FRLG_POKEMON_CENTER", + "region_map_section": "MAPSEC_LAVENDER_TOWN", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "65", + "x": 6, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LavenderTown_PokemonCenter_2F_EventScript_1A8CF6", + "flag": "0" + }, + { + "graphics_id": "65", + "x": 2, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LavenderTown_PokemonCenter_2F_EventScript_1A8CFC", + "flag": "0" + }, + { + "graphics_id": "65", + "x": 10, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LavenderTown_PokemonCenter_2F_EventScript_1A8D02", + "flag": "0" + }, + { + "graphics_id": "69", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LavenderTown_PokemonCenter_2F_EventScript_1BB1D2", + "flag": "112" + } + ], + "warp_events": [ + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_LAVENDER_TOWN_POKEMON_CENTER_1F", + "dest_warp_id": 3 + }, + { + "x": 5, + "y": 1, + "elevation": 0, + "dest_map": "MAP_UNKNOWN_MAP_00_04", + "dest_warp_id": 0 + }, + { + "x": 9, + "y": 1, + "elevation": 0, + "dest_map": "MAP_UNKNOWN_MAP_00_01", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/LavenderTown_VolunteerPokemonHouse/events.inc b/data/maps/LavenderTown_VolunteerPokemonHouse/events.inc deleted file mode 100644 index 8d3a472af..000000000 --- a/data/maps/LavenderTown_VolunteerPokemonHouse/events.inc +++ /dev/null @@ -1,20 +0,0 @@ -LavenderTown_VolunteerPokemonHouse_EventObjects: - object_event 1, 78, 0, 3, 0, 3, 0, 3, 8, 17, 0, 0, 0, 0, 0, LavenderTown_VolunteerPokemonHouse_EventScript_16B14A, 53, 0, 0 - object_event 2, 124, 0, 1, 0, 4, 0, 3, 1, 17, 0, 0, 0, 0, 0, LavenderTown_VolunteerPokemonHouse_EventScript_16B1EB, 0, 0, 0 - object_event 3, 121, 0, 9, 0, 6, 0, 3, 7, 17, 0, 0, 0, 0, 0, LavenderTown_VolunteerPokemonHouse_EventScript_16B1FE, 0, 0, 0 - object_event 4, 16, 0, 9, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, LavenderTown_VolunteerPokemonHouse_EventScript_16B1C3, 0, 0, 0 - object_event 5, 18, 0, 3, 0, 5, 0, 3, 1, 17, 0, 0, 0, 0, 0, LavenderTown_VolunteerPokemonHouse_EventScript_16B1CC, 0, 0, 0 - object_event 6, 17, 0, 7, 0, 2, 0, 3, 1, 17, 0, 0, 0, 0, 0, LavenderTown_VolunteerPokemonHouse_EventScript_16B1AA, 0, 0, 0 - -LavenderTown_VolunteerPokemonHouse_MapWarps: - warp_def 3, 7, 3, 2, 772 - warp_def 4, 7, 3, 2, 772 - warp_def 5, 7, 3, 2, 772 - -LavenderTown_VolunteerPokemonHouse_MapBGEvents: - bg_event 5, 4, 0, 0, 0, LavenderTown_VolunteerPokemonHouse_EventScript_16B211 - bg_event 3, 1, 0, 0, 0, LavenderTown_VolunteerPokemonHouse_EventScript_16B229 - bg_event 4, 1, 0, 0, 0, LavenderTown_VolunteerPokemonHouse_EventScript_16B229 - -LavenderTown_VolunteerPokemonHouse_MapEvents:: - map_events LavenderTown_VolunteerPokemonHouse_EventObjects, LavenderTown_VolunteerPokemonHouse_MapWarps, 0x0, LavenderTown_VolunteerPokemonHouse_MapBGEvents diff --git a/data/maps/LavenderTown_VolunteerPokemonHouse/header.inc b/data/maps/LavenderTown_VolunteerPokemonHouse/header.inc deleted file mode 100644 index b10a4798f..000000000 --- a/data/maps/LavenderTown_VolunteerPokemonHouse/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -LavenderTown_VolunteerPokemonHouse:: @ 8351098 - .4byte LavenderTown_VolunteerPokemonHouse_Layout @ 0x833ACC4 - .4byte LavenderTown_VolunteerPokemonHouse_MapEvents @ 0x83BA9FC - .4byte LavenderTown_VolunteerPokemonHouse_MapScripts @ 0x816B149 - .4byte NULL - .2byte BGM_FRLG_LAVENDER_TOWN - .2byte 274 - .byte 0x5c, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/LavenderTown_VolunteerPokemonHouse/map.json b/data/maps/LavenderTown_VolunteerPokemonHouse/map.json new file mode 100644 index 000000000..a9646e5e6 --- /dev/null +++ b/data/maps/LavenderTown_VolunteerPokemonHouse/map.json @@ -0,0 +1,142 @@ +{ + "id": "MAP_LAVENDER_TOWN_VOLUNTEER_POKEMON_HOUSE", + "name": "LavenderTown_VolunteerPokemonHouse", + "layout": "LAYOUT_LAVENDER_TOWN_VOLUNTEER_POKEMON_HOUSE", + "music": "BGM_FRLG_LAVENDER_TOWN", + "region_map_section": "MAPSEC_LAVENDER_TOWN", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "78", + "x": 3, + "y": 3, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LavenderTown_VolunteerPokemonHouse_EventScript_16B14A", + "flag": "53" + }, + { + "graphics_id": "124", + "x": 1, + "y": 4, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LavenderTown_VolunteerPokemonHouse_EventScript_16B1EB", + "flag": "0" + }, + { + "graphics_id": "121", + "x": 9, + "y": 6, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LavenderTown_VolunteerPokemonHouse_EventScript_16B1FE", + "flag": "0" + }, + { + "graphics_id": "16", + "x": 9, + "y": 5, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LavenderTown_VolunteerPokemonHouse_EventScript_16B1C3", + "flag": "0" + }, + { + "graphics_id": "18", + "x": 3, + "y": 5, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LavenderTown_VolunteerPokemonHouse_EventScript_16B1CC", + "flag": "0" + }, + { + "graphics_id": "17", + "x": 7, + "y": 2, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LavenderTown_VolunteerPokemonHouse_EventScript_16B1AA", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 3, + "dest_map": "MAP_LAVENDER_TOWN", + "dest_warp_id": 2 + }, + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_LAVENDER_TOWN", + "dest_warp_id": 2 + }, + { + "x": 5, + "y": 7, + "elevation": 3, + "dest_map": "MAP_LAVENDER_TOWN", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 5, + "y": 4, + "elevation": 0, + "script": "LavenderTown_VolunteerPokemonHouse_EventScript_16B211" + }, + { + "type": "bg_event_type_0", + "x": 3, + "y": 1, + "elevation": 0, + "script": "LavenderTown_VolunteerPokemonHouse_EventScript_16B229" + }, + { + "type": "bg_event_type_0", + "x": 4, + "y": 1, + "elevation": 0, + "script": "LavenderTown_VolunteerPokemonHouse_EventScript_16B229" + } + ] +}
\ No newline at end of file diff --git a/data/maps/MtEmber_Exterior/events.inc b/data/maps/MtEmber_Exterior/events.inc deleted file mode 100644 index 1e821866e..000000000 --- a/data/maps/MtEmber_Exterior/events.inc +++ /dev/null @@ -1,41 +0,0 @@ -MtEmber_Exterior_EventObjects: - object_event 1, 56, 0, 29, 0, 45, 0, 3, 7, 17, 0, 0, 0, 0, 0, MtEmber_Exterior_EventScript_1C48E6, 0, 0, 0 - object_event 2, 49, 0, 41, 0, 40, 0, 3, 10, 17, 0, 0, 0, 0, 0, MtEmber_Exterior_EventScript_16397F, 137, 0, 0 - object_event 3, 49, 0, 42, 0, 40, 0, 3, 9, 17, 0, 0, 0, 0, 0, MtEmber_Exterior_EventScript_1639F0, 137, 0, 0 - object_event 4, 24, 0, 22, 0, 35, 0, 3, 46, 53, 0, 1, 0, 1, 0, MtEmber_Exterior_EventScript_163AE2, 0, 0, 0 - object_event 5, 39, 0, 15, 0, 28, 0, 3, 8, 17, 0, 1, 0, 5, 0, MtEmber_Exterior_EventScript_163AB4, 0, 0, 0 - object_event 6, 40, 0, 14, 0, 42, 0, 3, 17, 17, 0, 1, 0, 3, 0, MtEmber_Exterior_EventScript_163ACB, 0, 0, 0 - object_event 7, 96, 0, 29, 0, 41, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtEmber_Exterior_EventScript_1BE00C, 18, 0, 0 - object_event 8, 96, 0, 30, 0, 42, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtEmber_Exterior_EventScript_1BE00C, 19, 0, 0 - object_event 9, 97, 0, 22, 0, 45, 0, 3, 1, 0, 0, 0, 0, 0, 0, MtEmber_Exterior_EventScript_1BE11D, 0, 0, 0 - object_event 10, 97, 0, 17, 0, 46, 0, 3, 1, 0, 0, 0, 0, 0, 0, MtEmber_Exterior_EventScript_1BE11D, 0, 0, 0 - object_event 11, 97, 0, 36, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, MtEmber_Exterior_EventScript_1BE11D, 0, 0, 0 - object_event 12, 96, 0, 34, 0, 14, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtEmber_Exterior_EventScript_1BE00C, 20, 0, 0 - object_event 13, 96, 0, 36, 0, 15, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtEmber_Exterior_EventScript_1BE00C, 21, 0, 0 - object_event 14, 97, 0, 35, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, MtEmber_Exterior_EventScript_1BE11D, 0, 0, 0 - object_event 15, 97, 0, 35, 0, 17, 0, 3, 1, 0, 0, 0, 0, 0, 0, MtEmber_Exterior_EventScript_1BE11D, 0, 0, 0 - object_event 16, 96, 0, 18, 0, 39, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtEmber_Exterior_EventScript_1BE00C, 22, 0, 0 - object_event 17, 96, 0, 19, 0, 40, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtEmber_Exterior_EventScript_1BE00C, 23, 0, 0 - object_event 18, 92, 0, 13, 0, 6, 0, 3, 8, 17, 0, 0, 0, 0, 0, MtEmber_Exterior_EventScript_1BED2C, 493, 0, 0 - object_event 19, 92, 0, 38, 0, 10, 0, 3, 8, 17, 0, 0, 0, 0, 0, MtEmber_Exterior_EventScript_1BED39, 494, 0, 0 - object_event 20, 92, 0, 48, 0, 20, 0, 3, 8, 17, 0, 0, 0, 0, 0, MtEmber_Exterior_EventScript_1BED46, 495, 0, 0 - -MtEmber_Exterior_MapWarps: - warp_def 28, 48, 3, 0, 813 - warp_def 29, 48, 3, 1, 813 - warp_def 14, 24, 3, 0, 354 - warp_def 39, 19, 3, 1, 356 - warp_def 29, 7, 3, 0, 357 - warp_def 42, 39, 0, 0, 359 - -MtEmber_Exterior_MapCoordEvents: - coord_event 37, 43, 0, 0, 16511, 1, 0, MtEmber_Exterior_EventScript_163A4E - coord_event 38, 43, 0, 0, 16511, 1, 0, MtEmber_Exterior_EventScript_163A4E - coord_event 39, 43, 0, 0, 16511, 1, 0, MtEmber_Exterior_EventScript_163A4E - -MtEmber_Exterior_MapBGEvents: - bg_event 18, 17, 0, 7, 0, 95, 158, 1 - bg_event 8, 30, 3, 7, 0, 2, 162, 1 - -MtEmber_Exterior_MapEvents:: - map_events MtEmber_Exterior_EventObjects, MtEmber_Exterior_MapWarps, MtEmber_Exterior_MapCoordEvents, MtEmber_Exterior_MapBGEvents diff --git a/data/maps/MtEmber_Exterior/header.inc b/data/maps/MtEmber_Exterior/header.inc deleted file mode 100644 index 8d43c8d97..000000000 --- a/data/maps/MtEmber_Exterior/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -MtEmber_Exterior:: @ 834FCB0 - .4byte MtEmber_Exterior_Layout @ 0x833D660 - .4byte MtEmber_Exterior_MapEvents @ 0x83B2C24 - .4byte MtEmber_Exterior_MapScripts @ 0x8163946 - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 280 - .byte 0xaf, 0x00, 0x00, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/MtEmber_Exterior/map.json b/data/maps/MtEmber_Exterior/map.json new file mode 100644 index 000000000..bae55d1c3 --- /dev/null +++ b/data/maps/MtEmber_Exterior/map.json @@ -0,0 +1,370 @@ +{ + "id": "MAP_MT_EMBER_EXTERIOR", + "name": "MtEmber_Exterior", + "layout": "LAYOUT_MT_EMBER_EXTERIOR", + "music": "BGM_FRLG_MT_EMBER", + "region_map_section": "MAPSEC_MT_EMBER", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_3", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "56", + "x": 29, + "y": 45, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtEmber_Exterior_EventScript_1C48E6", + "flag": "0" + }, + { + "graphics_id": "49", + "x": 41, + "y": 40, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtEmber_Exterior_EventScript_16397F", + "flag": "137" + }, + { + "graphics_id": "49", + "x": 42, + "y": 40, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtEmber_Exterior_EventScript_1639F0", + "flag": "137" + }, + { + "graphics_id": "24", + "x": 22, + "y": 35, + "elevation": 3, + "movement_type": "46", + "movement_range_x": 5, + "movement_range_y": 3, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "MtEmber_Exterior_EventScript_163AE2", + "flag": "0" + }, + { + "graphics_id": "39", + "x": 15, + "y": 28, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "MtEmber_Exterior_EventScript_163AB4", + "flag": "0" + }, + { + "graphics_id": "40", + "x": 14, + "y": 42, + "elevation": 3, + "movement_type": "17", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "MtEmber_Exterior_EventScript_163ACB", + "flag": "0" + }, + { + "graphics_id": "96", + "x": 29, + "y": 41, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtEmber_Exterior_EventScript_1BE00C", + "flag": "18" + }, + { + "graphics_id": "96", + "x": 30, + "y": 42, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtEmber_Exterior_EventScript_1BE00C", + "flag": "19" + }, + { + "graphics_id": "97", + "x": 22, + "y": 45, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtEmber_Exterior_EventScript_1BE11D", + "flag": "0" + }, + { + "graphics_id": "97", + "x": 17, + "y": 46, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtEmber_Exterior_EventScript_1BE11D", + "flag": "0" + }, + { + "graphics_id": "97", + "x": 36, + "y": 14, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtEmber_Exterior_EventScript_1BE11D", + "flag": "0" + }, + { + "graphics_id": "96", + "x": 34, + "y": 14, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtEmber_Exterior_EventScript_1BE00C", + "flag": "20" + }, + { + "graphics_id": "96", + "x": 36, + "y": 15, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtEmber_Exterior_EventScript_1BE00C", + "flag": "21" + }, + { + "graphics_id": "97", + "x": 35, + "y": 14, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtEmber_Exterior_EventScript_1BE11D", + "flag": "0" + }, + { + "graphics_id": "97", + "x": 35, + "y": 17, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtEmber_Exterior_EventScript_1BE11D", + "flag": "0" + }, + { + "graphics_id": "96", + "x": 18, + "y": 39, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtEmber_Exterior_EventScript_1BE00C", + "flag": "22" + }, + { + "graphics_id": "96", + "x": 19, + "y": 40, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtEmber_Exterior_EventScript_1BE00C", + "flag": "23" + }, + { + "graphics_id": "92", + "x": 13, + "y": 6, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtEmber_Exterior_EventScript_1BED2C", + "flag": "493" + }, + { + "graphics_id": "92", + "x": 38, + "y": 10, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtEmber_Exterior_EventScript_1BED39", + "flag": "494" + }, + { + "graphics_id": "92", + "x": 48, + "y": 20, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtEmber_Exterior_EventScript_1BED46", + "flag": "495" + } + ], + "warp_events": [ + { + "x": 28, + "y": 48, + "elevation": 3, + "dest_map": "MAP_ONE_ISLAND_KINDLE_ROAD", + "dest_warp_id": 0 + }, + { + "x": 29, + "y": 48, + "elevation": 3, + "dest_map": "MAP_ONE_ISLAND_KINDLE_ROAD", + "dest_warp_id": 1 + }, + { + "x": 14, + "y": 24, + "elevation": 3, + "dest_map": "MAP_MT_EMBER_SUMMIT_PATH_1F", + "dest_warp_id": 0 + }, + { + "x": 39, + "y": 19, + "elevation": 3, + "dest_map": "MAP_MT_EMBER_SUMMIT_PATH_3F", + "dest_warp_id": 1 + }, + { + "x": 29, + "y": 7, + "elevation": 3, + "dest_map": "MAP_MT_EMBER_SUMMIT", + "dest_warp_id": 0 + }, + { + "x": 42, + "y": 39, + "elevation": 0, + "dest_map": "MAP_MT_EMBER_RUBY_PATH_1F", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 37, + "y": 43, + "elevation": 0, + "var": "VAR_0x407F", + "var_value": 1, + "script": "MtEmber_Exterior_EventScript_163A4E" + }, + { + "type": "trigger", + "x": 38, + "y": 43, + "elevation": 0, + "var": "VAR_0x407F", + "var_value": 1, + "script": "MtEmber_Exterior_EventScript_163A4E" + }, + { + "type": "trigger", + "x": 39, + "y": 43, + "elevation": 0, + "var": "VAR_0x407F", + "var_value": 1, + "script": "MtEmber_Exterior_EventScript_163A4E" + } + ], + "bg_events": [ + { + "type": "hidden_item", + "x": 18, + "y": 17, + "elevation": 0, + "item": "ITEM_FIRE_STONE", + "flag": "158", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 8, + "y": 30, + "elevation": 3, + "item": "POCKET_KEY_ITEMS", + "flag": "162", + "unknown": 1 + } + ] +}
\ No newline at end of file diff --git a/data/maps/MtEmber_RubyPath_1F/map.json b/data/maps/MtEmber_RubyPath_1F/map.json new file mode 100644 index 000000000..37ac0435c --- /dev/null +++ b/data/maps/MtEmber_RubyPath_1F/map.json @@ -0,0 +1,107 @@ +{ + "id": "MAP_MT_EMBER_RUBY_PATH_1F", + "name": "MtEmber_RubyPath_1F", + "layout": "LAYOUT_MT_EMBER_RUBY_PATH_1F", + "music": "BGM_FRLG_MT_EMBER", + "region_map_section": "MAPSEC_MT_EMBER", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "96", + "x": 18, + "y": 11, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SSAnne_Kitchen3_EventScript_1BE00C", + "flag": "18" + }, + { + "graphics_id": "96", + "x": 23, + "y": 16, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SSAnne_Kitchen3_EventScript_1BE00C", + "flag": "19" + }, + { + "graphics_id": "96", + "x": 20, + "y": 12, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SSAnne_Kitchen3_EventScript_1BE00C", + "flag": "20" + }, + { + "graphics_id": "96", + "x": 19, + "y": 7, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SSAnne_Kitchen3_EventScript_1BE00C", + "flag": "21" + }, + { + "graphics_id": "96", + "x": 21, + "y": 15, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SSAnne_Kitchen3_EventScript_1BE00C", + "flag": "22" + } + ], + "warp_events": [ + { + "x": 22, + "y": 17, + "elevation": 3, + "dest_map": "MAP_MT_EMBER_EXTERIOR", + "dest_warp_id": 5 + }, + { + "x": 1, + "y": 1, + "elevation": 0, + "dest_map": "MAP_MT_EMBER_RUBY_PATH_B1F", + "dest_warp_id": 0 + }, + { + "x": 24, + "y": 5, + "elevation": 0, + "dest_map": "MAP_MT_EMBER_RUBY_PATH_B2F_STAIRS", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/MtEmber_RubyPath_1F/scripts.inc b/data/maps/MtEmber_RubyPath_1F/scripts.inc new file mode 100644 index 000000000..27cd09df7 --- /dev/null +++ b/data/maps/MtEmber_RubyPath_1F/scripts.inc @@ -0,0 +1,2 @@ +MtEmber_RubyPath_1F_MapScripts:: @ 8163C45 + .byte 0 diff --git a/data/maps/MtEmber_RubyPath_B1F/events.inc b/data/maps/MtEmber_RubyPath_B1F/events.inc deleted file mode 100644 index 73d8954bc..000000000 --- a/data/maps/MtEmber_RubyPath_B1F/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -MtEmber_RubyPath_B1F_EventObjects: - object_event 1, 96, 0, 1, 0, 8, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtEmber_RubyPath_B1F_EventScript_1BE00C, 18, 0, 0 - object_event 2, 96, 0, 1, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtEmber_RubyPath_B1F_EventScript_1BE00C, 19, 0, 0 - object_event 3, 96, 0, 3, 0, 12, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtEmber_RubyPath_B1F_EventScript_1BE00C, 20, 0, 0 - object_event 4, 96, 0, 5, 0, 14, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtEmber_RubyPath_B1F_EventScript_1BE00C, 21, 0, 0 - -MtEmber_RubyPath_B1F_MapWarps: - warp_def 9, 21, 0, 1, 359 - warp_def 6, 1, 0, 0, 361 - -MtEmber_RubyPath_B1F_MapEvents:: - map_events MtEmber_RubyPath_B1F_EventObjects, MtEmber_RubyPath_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/MtEmber_RubyPath_B1F/header.inc b/data/maps/MtEmber_RubyPath_B1F/header.inc deleted file mode 100644 index 659721b8b..000000000 --- a/data/maps/MtEmber_RubyPath_B1F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -MtEmber_RubyPath_B1F:: @ 834FD74 - .4byte MtEmber_RubyPath_B1F_Layout @ 0x833F524 - .4byte MtEmber_RubyPath_B1F_MapEvents @ 0x83B2F64 - .4byte MtEmber_RubyPath_B1F_MapScripts @ 0x8163C46 - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 286 - .byte 0xaf, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/MtEmber_RubyPath_B1F/map.json b/data/maps/MtEmber_RubyPath_B1F/map.json new file mode 100644 index 000000000..df6b4fcb5 --- /dev/null +++ b/data/maps/MtEmber_RubyPath_B1F/map.json @@ -0,0 +1,87 @@ +{ + "id": "MAP_MT_EMBER_RUBY_PATH_B1F", + "name": "MtEmber_RubyPath_B1F", + "layout": "LAYOUT_MT_EMBER_RUBY_PATH_B1F", + "music": "BGM_FRLG_MT_EMBER", + "region_map_section": "MAPSEC_MT_EMBER", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "96", + "x": 1, + "y": 8, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtEmber_RubyPath_B1F_EventScript_1BE00C", + "flag": "18" + }, + { + "graphics_id": "96", + "x": 1, + "y": 11, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtEmber_RubyPath_B1F_EventScript_1BE00C", + "flag": "19" + }, + { + "graphics_id": "96", + "x": 3, + "y": 12, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtEmber_RubyPath_B1F_EventScript_1BE00C", + "flag": "20" + }, + { + "graphics_id": "96", + "x": 5, + "y": 14, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtEmber_RubyPath_B1F_EventScript_1BE00C", + "flag": "21" + } + ], + "warp_events": [ + { + "x": 9, + "y": 21, + "elevation": 0, + "dest_map": "MAP_MT_EMBER_RUBY_PATH_1F", + "dest_warp_id": 1 + }, + { + "x": 6, + "y": 1, + "elevation": 0, + "dest_map": "MAP_MT_EMBER_RUBY_PATH_B2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/MtEmber_RubyPath_B1F_Stairs/events.inc b/data/maps/MtEmber_RubyPath_B1F_Stairs/events.inc deleted file mode 100644 index 023110a70..000000000 --- a/data/maps/MtEmber_RubyPath_B1F_Stairs/events.inc +++ /dev/null @@ -1,9 +0,0 @@ -MtEmber_RubyPath_B1F_Stairs_EventObjects: - object_event 1, 96, 0, 4, 0, 2, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtEmber_RubyPath_B1F_Stairs_EventScript_1BE00C, 18, 0, 0 - -MtEmber_RubyPath_B1F_Stairs_MapWarps: - warp_def 4, 1, 0, 1, 362 - warp_def 1, 5, 0, 0, 364 - -MtEmber_RubyPath_B1F_Stairs_MapEvents:: - map_events MtEmber_RubyPath_B1F_Stairs_EventObjects, MtEmber_RubyPath_B1F_Stairs_MapWarps, 0x0, 0x0 diff --git a/data/maps/MtEmber_RubyPath_B1F_Stairs/header.inc b/data/maps/MtEmber_RubyPath_B1F_Stairs/header.inc deleted file mode 100644 index 605a4c539..000000000 --- a/data/maps/MtEmber_RubyPath_B1F_Stairs/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -MtEmber_RubyPath_B1F_Stairs:: @ 834FDC8 - .4byte MtEmber_RubyPath_B1F_Stairs_Layout @ 0x833FCD8 - .4byte MtEmber_RubyPath_B1F_Stairs_MapEvents @ 0x83B3188 - .4byte MtEmber_RubyPath_B1F_Stairs_MapScripts @ 0x8163C6F - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 289 - .byte 0xaf, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/MtEmber_RubyPath_B1F_Stairs/map.json b/data/maps/MtEmber_RubyPath_B1F_Stairs/map.json new file mode 100644 index 000000000..61c0cae51 --- /dev/null +++ b/data/maps/MtEmber_RubyPath_B1F_Stairs/map.json @@ -0,0 +1,48 @@ +{ + "id": "MAP_MT_EMBER_RUBY_PATH_B1F_STAIRS", + "name": "MtEmber_RubyPath_B1F_Stairs", + "layout": "LAYOUT_MT_EMBER_RUBY_PATH_B1F_STAIRS", + "music": "BGM_FRLG_MT_EMBER", + "region_map_section": "MAPSEC_MT_EMBER", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "96", + "x": 4, + "y": 2, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtEmber_RubyPath_B1F_Stairs_EventScript_1BE00C", + "flag": "18" + } + ], + "warp_events": [ + { + "x": 4, + "y": 1, + "elevation": 0, + "dest_map": "MAP_MT_EMBER_RUBY_PATH_B3F", + "dest_warp_id": 1 + }, + { + "x": 1, + "y": 5, + "elevation": 0, + "dest_map": "MAP_MT_EMBER_RUBY_PATH_B2F_STAIRS", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/MtEmber_RubyPath_B2F/events.inc b/data/maps/MtEmber_RubyPath_B2F/events.inc deleted file mode 100644 index 2ad1c1b0e..000000000 --- a/data/maps/MtEmber_RubyPath_B2F/events.inc +++ /dev/null @@ -1,15 +0,0 @@ -MtEmber_RubyPath_B2F_EventObjects: - object_event 1, 97, 0, 9, 0, 3, 0, 3, 1, 0, 0, 0, 0, 0, 0, MtEmber_RubyPath_B2F_EventScript_1BE11D, 0, 0, 0 - object_event 2, 97, 0, 12, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, MtEmber_RubyPath_B2F_EventScript_1BE11D, 0, 0, 0 - object_event 3, 97, 0, 12, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, MtEmber_RubyPath_B2F_EventScript_1BE11D, 0, 0, 0 - object_event 4, 96, 0, 4, 0, 8, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtEmber_RubyPath_B2F_EventScript_1BE00C, 18, 0, 0 - object_event 5, 96, 0, 1, 0, 8, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtEmber_RubyPath_B2F_EventScript_1BE00C, 19, 0, 0 - object_event 6, 96, 0, 4, 0, 5, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtEmber_RubyPath_B2F_EventScript_1BE00C, 20, 0, 0 - object_event 7, 96, 0, 5, 0, 5, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtEmber_RubyPath_B2F_EventScript_1BE00C, 21, 0, 0 - -MtEmber_RubyPath_B2F_MapWarps: - warp_def 1, 7, 3, 1, 360 - warp_def 13, 9, 3, 0, 362 - -MtEmber_RubyPath_B2F_MapEvents:: - map_events MtEmber_RubyPath_B2F_EventObjects, MtEmber_RubyPath_B2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/MtEmber_RubyPath_B2F/header.inc b/data/maps/MtEmber_RubyPath_B2F/header.inc deleted file mode 100644 index 817cf2e47..000000000 --- a/data/maps/MtEmber_RubyPath_B2F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -MtEmber_RubyPath_B2F:: @ 834FD90 - .4byte MtEmber_RubyPath_B2F_Layout @ 0x833F6A8 - .4byte MtEmber_RubyPath_B2F_MapEvents @ 0x83B3030 - .4byte MtEmber_RubyPath_B2F_MapScripts @ 0x8163C47 - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 287 - .byte 0xaf, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/MtEmber_RubyPath_B2F/map.json b/data/maps/MtEmber_RubyPath_B2F/map.json new file mode 100644 index 000000000..e10a1762c --- /dev/null +++ b/data/maps/MtEmber_RubyPath_B2F/map.json @@ -0,0 +1,126 @@ +{ + "id": "MAP_MT_EMBER_RUBY_PATH_B2F", + "name": "MtEmber_RubyPath_B2F", + "layout": "LAYOUT_MT_EMBER_RUBY_PATH_B2F", + "music": "BGM_FRLG_MT_EMBER", + "region_map_section": "MAPSEC_MT_EMBER", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "97", + "x": 9, + "y": 3, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtEmber_RubyPath_B2F_EventScript_1BE11D", + "flag": "0" + }, + { + "graphics_id": "97", + "x": 12, + "y": 5, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtEmber_RubyPath_B2F_EventScript_1BE11D", + "flag": "0" + }, + { + "graphics_id": "97", + "x": 12, + "y": 2, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtEmber_RubyPath_B2F_EventScript_1BE11D", + "flag": "0" + }, + { + "graphics_id": "96", + "x": 4, + "y": 8, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtEmber_RubyPath_B2F_EventScript_1BE00C", + "flag": "18" + }, + { + "graphics_id": "96", + "x": 1, + "y": 8, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtEmber_RubyPath_B2F_EventScript_1BE00C", + "flag": "19" + }, + { + "graphics_id": "96", + "x": 4, + "y": 5, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtEmber_RubyPath_B2F_EventScript_1BE00C", + "flag": "20" + }, + { + "graphics_id": "96", + "x": 5, + "y": 5, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtEmber_RubyPath_B2F_EventScript_1BE00C", + "flag": "21" + } + ], + "warp_events": [ + { + "x": 1, + "y": 7, + "elevation": 3, + "dest_map": "MAP_MT_EMBER_RUBY_PATH_B1F", + "dest_warp_id": 1 + }, + { + "x": 13, + "y": 9, + "elevation": 3, + "dest_map": "MAP_MT_EMBER_RUBY_PATH_B3F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/MtEmber_RubyPath_B2F_Stairs/events.inc b/data/maps/MtEmber_RubyPath_B2F_Stairs/events.inc deleted file mode 100644 index 60013f627..000000000 --- a/data/maps/MtEmber_RubyPath_B2F_Stairs/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -MtEmber_RubyPath_B2F_Stairs_EventObjects: - object_event 1, 96, 0, 4, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtEmber_RubyPath_B2F_Stairs_EventScript_1BE00C, 18, 0, 0 - object_event 2, 96, 0, 6, 0, 2, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtEmber_RubyPath_B2F_Stairs_EventScript_1BE00C, 19, 0, 0 - -MtEmber_RubyPath_B2F_Stairs_MapWarps: - warp_def 6, 1, 0, 1, 363 - warp_def 1, 4, 0, 2, 359 - -MtEmber_RubyPath_B2F_Stairs_MapEvents:: - map_events MtEmber_RubyPath_B2F_Stairs_EventObjects, MtEmber_RubyPath_B2F_Stairs_MapWarps, 0x0, 0x0 diff --git a/data/maps/MtEmber_RubyPath_B2F_Stairs/header.inc b/data/maps/MtEmber_RubyPath_B2F_Stairs/header.inc deleted file mode 100644 index 875d1f224..000000000 --- a/data/maps/MtEmber_RubyPath_B2F_Stairs/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -MtEmber_RubyPath_B2F_Stairs:: @ 834FDE4 - .4byte MtEmber_RubyPath_B2F_Stairs_Layout @ 0x833FD5C - .4byte MtEmber_RubyPath_B2F_Stairs_MapEvents @ 0x83B31DC - .4byte MtEmber_RubyPath_B2F_Stairs_MapScripts @ 0x8163C70 - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 290 - .byte 0xaf, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/MtEmber_RubyPath_B2F_Stairs/map.json b/data/maps/MtEmber_RubyPath_B2F_Stairs/map.json new file mode 100644 index 000000000..5d494f5a4 --- /dev/null +++ b/data/maps/MtEmber_RubyPath_B2F_Stairs/map.json @@ -0,0 +1,61 @@ +{ + "id": "MAP_MT_EMBER_RUBY_PATH_B2F_STAIRS", + "name": "MtEmber_RubyPath_B2F_Stairs", + "layout": "LAYOUT_MT_EMBER_RUBY_PATH_B2F_STAIRS", + "music": "BGM_FRLG_MT_EMBER", + "region_map_section": "MAPSEC_MT_EMBER", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "96", + "x": 4, + "y": 3, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtEmber_RubyPath_B2F_Stairs_EventScript_1BE00C", + "flag": "18" + }, + { + "graphics_id": "96", + "x": 6, + "y": 2, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtEmber_RubyPath_B2F_Stairs_EventScript_1BE00C", + "flag": "19" + } + ], + "warp_events": [ + { + "x": 6, + "y": 1, + "elevation": 0, + "dest_map": "MAP_MT_EMBER_RUBY_PATH_B1F_STAIRS", + "dest_warp_id": 1 + }, + { + "x": 1, + "y": 4, + "elevation": 0, + "dest_map": "MAP_MT_EMBER_RUBY_PATH_1F", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/MtEmber_RubyPath_B3F/events.inc b/data/maps/MtEmber_RubyPath_B3F/events.inc deleted file mode 100644 index 0bab7c507..000000000 --- a/data/maps/MtEmber_RubyPath_B3F/events.inc +++ /dev/null @@ -1,19 +0,0 @@ -MtEmber_RubyPath_B3F_EventObjects: - object_event 1, 97, 0, 10, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, MtEmber_RubyPath_B3F_EventScript_1BE11D, 0, 0, 0 - object_event 2, 97, 0, 26, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, MtEmber_RubyPath_B3F_EventScript_1BE11D, 0, 0, 0 - object_event 3, 97, 0, 28, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, MtEmber_RubyPath_B3F_EventScript_1BE11D, 0, 0, 0 - object_event 4, 96, 0, 7, 0, 2, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtEmber_RubyPath_B3F_EventScript_1BE00C, 18, 0, 0 - object_event 5, 96, 0, 4, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtEmber_RubyPath_B3F_EventScript_1BE00C, 19, 0, 0 - object_event 6, 96, 0, 6, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtEmber_RubyPath_B3F_EventScript_1BE00C, 20, 0, 0 - object_event 7, 96, 0, 7, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtEmber_RubyPath_B3F_EventScript_1BE00C, 21, 0, 0 - object_event 8, 96, 0, 4, 0, 5, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtEmber_RubyPath_B3F_EventScript_1BE00C, 22, 0, 0 - object_event 9, 96, 0, 5, 0, 2, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtEmber_RubyPath_B3F_EventScript_1BE00C, 23, 0, 0 - object_event 10, 97, 0, 15, 0, 13, 0, 3, 1, 0, 0, 0, 0, 0, 0, MtEmber_RubyPath_B3F_EventScript_1BE11D, 0, 0, 0 - -MtEmber_RubyPath_B3F_MapWarps: - warp_def 1, 4, 0, 1, 361 - warp_def 19, 19, 3, 0, 363 - warp_def 5, 19, 3, 1, 352 - -MtEmber_RubyPath_B3F_MapEvents:: - map_events MtEmber_RubyPath_B3F_EventObjects, MtEmber_RubyPath_B3F_MapWarps, 0x0, 0x0 diff --git a/data/maps/MtEmber_RubyPath_B3F/header.inc b/data/maps/MtEmber_RubyPath_B3F/header.inc deleted file mode 100644 index bcf17a29f..000000000 --- a/data/maps/MtEmber_RubyPath_B3F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -MtEmber_RubyPath_B3F:: @ 834FDAC - .4byte MtEmber_RubyPath_B3F_Layout @ 0x833FC60 - .4byte MtEmber_RubyPath_B3F_MapEvents @ 0x83B314C - .4byte MtEmber_RubyPath_B3F_MapScripts @ 0x8163C48 - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 288 - .byte 0xaf, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/MtEmber_RubyPath_B3F/map.json b/data/maps/MtEmber_RubyPath_B3F/map.json new file mode 100644 index 000000000..3b681233c --- /dev/null +++ b/data/maps/MtEmber_RubyPath_B3F/map.json @@ -0,0 +1,172 @@ +{ + "id": "MAP_MT_EMBER_RUBY_PATH_B3F", + "name": "MtEmber_RubyPath_B3F", + "layout": "LAYOUT_MT_EMBER_RUBY_PATH_B3F", + "music": "BGM_FRLG_MT_EMBER", + "region_map_section": "MAPSEC_MT_EMBER", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "97", + "x": 10, + "y": 4, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtEmber_RubyPath_B3F_EventScript_1BE11D", + "flag": "0" + }, + { + "graphics_id": "97", + "x": 26, + "y": 12, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtEmber_RubyPath_B3F_EventScript_1BE11D", + "flag": "0" + }, + { + "graphics_id": "97", + "x": 28, + "y": 8, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtEmber_RubyPath_B3F_EventScript_1BE11D", + "flag": "0" + }, + { + "graphics_id": "96", + "x": 7, + "y": 2, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtEmber_RubyPath_B3F_EventScript_1BE00C", + "flag": "18" + }, + { + "graphics_id": "96", + "x": 4, + "y": 3, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtEmber_RubyPath_B3F_EventScript_1BE00C", + "flag": "19" + }, + { + "graphics_id": "96", + "x": 6, + "y": 6, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtEmber_RubyPath_B3F_EventScript_1BE00C", + "flag": "20" + }, + { + "graphics_id": "96", + "x": 7, + "y": 6, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtEmber_RubyPath_B3F_EventScript_1BE00C", + "flag": "21" + }, + { + "graphics_id": "96", + "x": 4, + "y": 5, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtEmber_RubyPath_B3F_EventScript_1BE00C", + "flag": "22" + }, + { + "graphics_id": "96", + "x": 5, + "y": 2, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtEmber_RubyPath_B3F_EventScript_1BE00C", + "flag": "23" + }, + { + "graphics_id": "97", + "x": 15, + "y": 13, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtEmber_RubyPath_B3F_EventScript_1BE11D", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 1, + "y": 4, + "elevation": 0, + "dest_map": "MAP_MT_EMBER_RUBY_PATH_B2F", + "dest_warp_id": 1 + }, + { + "x": 19, + "y": 19, + "elevation": 3, + "dest_map": "MAP_MT_EMBER_RUBY_PATH_B1F_STAIRS", + "dest_warp_id": 0 + }, + { + "x": 5, + "y": 19, + "elevation": 3, + "dest_map": "MAP_MT_EMBER_RUBY_PATH_B4F", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/MtEmber_RubyPath_B4F/events.inc b/data/maps/MtEmber_RubyPath_B4F/events.inc deleted file mode 100644 index f14a83237..000000000 --- a/data/maps/MtEmber_RubyPath_B4F/events.inc +++ /dev/null @@ -1,34 +0,0 @@ -MtEmber_RubyPath_B4F_MapWarps: - warp_def 14, 14, 3, 0, 358 - warp_def 4, 2, 3, 2, 362 - -MtEmber_RubyPath_B4F_MapBGEvents: - bg_event 3, 7, 0, 1, 0, MtEmber_RubyPath_B4F_EventScript_1638EC - bg_event 4, 7, 0, 1, 0, MtEmber_RubyPath_B4F_EventScript_1638EC - bg_event 5, 7, 0, 1, 0, MtEmber_RubyPath_B4F_EventScript_1638EC - bg_event 4, 9, 0, 1, 0, MtEmber_RubyPath_B4F_EventScript_1638F5 - bg_event 3, 9, 0, 1, 0, MtEmber_RubyPath_B4F_EventScript_1638F5 - bg_event 5, 9, 0, 1, 0, MtEmber_RubyPath_B4F_EventScript_1638F5 - bg_event 3, 11, 0, 1, 0, MtEmber_RubyPath_B4F_EventScript_1638FE - bg_event 4, 11, 0, 1, 0, MtEmber_RubyPath_B4F_EventScript_1638FE - bg_event 5, 11, 0, 1, 0, MtEmber_RubyPath_B4F_EventScript_1638FE - bg_event 3, 13, 0, 1, 0, MtEmber_RubyPath_B4F_EventScript_163907 - bg_event 4, 13, 0, 1, 0, MtEmber_RubyPath_B4F_EventScript_163907 - bg_event 5, 13, 0, 1, 0, MtEmber_RubyPath_B4F_EventScript_163907 - bg_event 7, 7, 0, 1, 0, MtEmber_RubyPath_B4F_EventScript_163910 - bg_event 8, 7, 0, 1, 0, MtEmber_RubyPath_B4F_EventScript_163910 - bg_event 9, 7, 0, 1, 0, MtEmber_RubyPath_B4F_EventScript_163910 - bg_event 7, 9, 0, 1, 0, MtEmber_RubyPath_B4F_EventScript_163919 - bg_event 8, 9, 0, 1, 0, MtEmber_RubyPath_B4F_EventScript_163919 - bg_event 9, 9, 0, 1, 0, MtEmber_RubyPath_B4F_EventScript_163919 - bg_event 7, 11, 0, 1, 0, MtEmber_RubyPath_B4F_EventScript_163922 - bg_event 11, 7, 0, 1, 0, MtEmber_RubyPath_B4F_EventScript_163934 - bg_event 11, 9, 0, 1, 0, MtEmber_RubyPath_B4F_EventScript_16393D - bg_event 8, 11, 0, 1, 0, MtEmber_RubyPath_B4F_EventScript_163922 - bg_event 9, 11, 0, 1, 0, MtEmber_RubyPath_B4F_EventScript_163922 - bg_event 7, 13, 0, 1, 0, MtEmber_RubyPath_B4F_EventScript_16392B - bg_event 9, 13, 0, 1, 0, MtEmber_RubyPath_B4F_EventScript_16392B - bg_event 8, 13, 0, 1, 0, MtEmber_RubyPath_B4F_EventScript_16392B - -MtEmber_RubyPath_B4F_MapEvents:: - map_events 0x0, MtEmber_RubyPath_B4F_MapWarps, 0x0, MtEmber_RubyPath_B4F_MapBGEvents diff --git a/data/maps/MtEmber_RubyPath_B4F/header.inc b/data/maps/MtEmber_RubyPath_B4F/header.inc deleted file mode 100644 index e6c316632..000000000 --- a/data/maps/MtEmber_RubyPath_B4F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -MtEmber_RubyPath_B4F:: @ 834FC94 - .4byte MtEmber_RubyPath_B4F_Layout @ 0x8339290 - .4byte MtEmber_RubyPath_B4F_MapEvents @ 0x83B29B8 - .4byte MtEmber_RubyPath_B4F_MapScripts @ 0x81638EB - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 269 - .byte 0xaf, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/MtEmber_RubyPath_B4F/map.json b/data/maps/MtEmber_RubyPath_B4F/map.json new file mode 100644 index 000000000..339c5e653 --- /dev/null +++ b/data/maps/MtEmber_RubyPath_B4F/map.json @@ -0,0 +1,217 @@ +{ + "id": "MAP_MT_EMBER_RUBY_PATH_B4F", + "name": "MtEmber_RubyPath_B4F", + "layout": "LAYOUT_MT_EMBER_RUBY_PATH_B4F", + "music": "BGM_FRLG_MT_EMBER", + "region_map_section": "MAPSEC_MT_EMBER", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 14, + "y": 14, + "elevation": 3, + "dest_map": "MAP_MT_EMBER_RUBY_PATH_B5F", + "dest_warp_id": 0 + }, + { + "x": 4, + "y": 2, + "elevation": 3, + "dest_map": "MAP_MT_EMBER_RUBY_PATH_B3F", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_1", + "x": 3, + "y": 7, + "elevation": 0, + "script": "MtEmber_RubyPath_B4F_EventScript_1638EC" + }, + { + "type": "bg_event_type_1", + "x": 4, + "y": 7, + "elevation": 0, + "script": "MtEmber_RubyPath_B4F_EventScript_1638EC" + }, + { + "type": "bg_event_type_1", + "x": 5, + "y": 7, + "elevation": 0, + "script": "MtEmber_RubyPath_B4F_EventScript_1638EC" + }, + { + "type": "bg_event_type_1", + "x": 4, + "y": 9, + "elevation": 0, + "script": "MtEmber_RubyPath_B4F_EventScript_1638F5" + }, + { + "type": "bg_event_type_1", + "x": 3, + "y": 9, + "elevation": 0, + "script": "MtEmber_RubyPath_B4F_EventScript_1638F5" + }, + { + "type": "bg_event_type_1", + "x": 5, + "y": 9, + "elevation": 0, + "script": "MtEmber_RubyPath_B4F_EventScript_1638F5" + }, + { + "type": "bg_event_type_1", + "x": 3, + "y": 11, + "elevation": 0, + "script": "MtEmber_RubyPath_B4F_EventScript_1638FE" + }, + { + "type": "bg_event_type_1", + "x": 4, + "y": 11, + "elevation": 0, + "script": "MtEmber_RubyPath_B4F_EventScript_1638FE" + }, + { + "type": "bg_event_type_1", + "x": 5, + "y": 11, + "elevation": 0, + "script": "MtEmber_RubyPath_B4F_EventScript_1638FE" + }, + { + "type": "bg_event_type_1", + "x": 3, + "y": 13, + "elevation": 0, + "script": "MtEmber_RubyPath_B4F_EventScript_163907" + }, + { + "type": "bg_event_type_1", + "x": 4, + "y": 13, + "elevation": 0, + "script": "MtEmber_RubyPath_B4F_EventScript_163907" + }, + { + "type": "bg_event_type_1", + "x": 5, + "y": 13, + "elevation": 0, + "script": "MtEmber_RubyPath_B4F_EventScript_163907" + }, + { + "type": "bg_event_type_1", + "x": 7, + "y": 7, + "elevation": 0, + "script": "MtEmber_RubyPath_B4F_EventScript_163910" + }, + { + "type": "bg_event_type_1", + "x": 8, + "y": 7, + "elevation": 0, + "script": "MtEmber_RubyPath_B4F_EventScript_163910" + }, + { + "type": "bg_event_type_1", + "x": 9, + "y": 7, + "elevation": 0, + "script": "MtEmber_RubyPath_B4F_EventScript_163910" + }, + { + "type": "bg_event_type_1", + "x": 7, + "y": 9, + "elevation": 0, + "script": "MtEmber_RubyPath_B4F_EventScript_163919" + }, + { + "type": "bg_event_type_1", + "x": 8, + "y": 9, + "elevation": 0, + "script": "MtEmber_RubyPath_B4F_EventScript_163919" + }, + { + "type": "bg_event_type_1", + "x": 9, + "y": 9, + "elevation": 0, + "script": "MtEmber_RubyPath_B4F_EventScript_163919" + }, + { + "type": "bg_event_type_1", + "x": 7, + "y": 11, + "elevation": 0, + "script": "MtEmber_RubyPath_B4F_EventScript_163922" + }, + { + "type": "bg_event_type_1", + "x": 11, + "y": 7, + "elevation": 0, + "script": "MtEmber_RubyPath_B4F_EventScript_163934" + }, + { + "type": "bg_event_type_1", + "x": 11, + "y": 9, + "elevation": 0, + "script": "MtEmber_RubyPath_B4F_EventScript_16393D" + }, + { + "type": "bg_event_type_1", + "x": 8, + "y": 11, + "elevation": 0, + "script": "MtEmber_RubyPath_B4F_EventScript_163922" + }, + { + "type": "bg_event_type_1", + "x": 9, + "y": 11, + "elevation": 0, + "script": "MtEmber_RubyPath_B4F_EventScript_163922" + }, + { + "type": "bg_event_type_1", + "x": 7, + "y": 13, + "elevation": 0, + "script": "MtEmber_RubyPath_B4F_EventScript_16392B" + }, + { + "type": "bg_event_type_1", + "x": 9, + "y": 13, + "elevation": 0, + "script": "MtEmber_RubyPath_B4F_EventScript_16392B" + }, + { + "type": "bg_event_type_1", + "x": 8, + "y": 13, + "elevation": 0, + "script": "MtEmber_RubyPath_B4F_EventScript_16392B" + } + ] +}
\ No newline at end of file diff --git a/data/maps/MtEmber_RubyPath_B5F/events.inc b/data/maps/MtEmber_RubyPath_B5F/events.inc deleted file mode 100644 index a9f1890eb..000000000 --- a/data/maps/MtEmber_RubyPath_B5F/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -MtEmber_RubyPath_B5F_EventObjects: - object_event 1, 99, 0, 7, 0, 7, 0, 0, 8, 0, 0, 0, 0, 0, 0, MtEmber_RubyPath_B5F_EventScript_163C49, 138, 0, 0 - -MtEmber_RubyPath_B5F_MapWarps: - warp_def 11, 7, 3, 0, 352 - -MtEmber_RubyPath_B5F_MapBGEvents: - bg_event 7, 2, 0, 1, 0, MtEmber_RubyPath_B5F_EventScript_163BAB - -MtEmber_RubyPath_B5F_MapEvents:: - map_events MtEmber_RubyPath_B5F_EventObjects, MtEmber_RubyPath_B5F_MapWarps, 0x0, MtEmber_RubyPath_B5F_MapBGEvents diff --git a/data/maps/MtEmber_RubyPath_B5F/header.inc b/data/maps/MtEmber_RubyPath_B5F/header.inc deleted file mode 100644 index 8fbb65498..000000000 --- a/data/maps/MtEmber_RubyPath_B5F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -MtEmber_RubyPath_B5F:: @ 834FD3C - .4byte MtEmber_RubyPath_B5F_Layout @ 0x833FF60 - .4byte MtEmber_RubyPath_B5F_MapEvents @ 0x83B2E3C - .4byte MtEmber_RubyPath_B5F_MapScripts @ 0x8163BAA - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 291 - .byte 0xaf, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/MtEmber_RubyPath_B5F/map.json b/data/maps/MtEmber_RubyPath_B5F/map.json new file mode 100644 index 000000000..320bff06d --- /dev/null +++ b/data/maps/MtEmber_RubyPath_B5F/map.json @@ -0,0 +1,49 @@ +{ + "id": "MAP_MT_EMBER_RUBY_PATH_B5F", + "name": "MtEmber_RubyPath_B5F", + "layout": "LAYOUT_MT_EMBER_RUBY_PATH_B5F", + "music": "BGM_FRLG_MT_EMBER", + "region_map_section": "MAPSEC_MT_EMBER", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "99", + "x": 7, + "y": 7, + "elevation": 0, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtEmber_RubyPath_B5F_EventScript_163C49", + "flag": "138" + } + ], + "warp_events": [ + { + "x": 11, + "y": 7, + "elevation": 3, + "dest_map": "MAP_MT_EMBER_RUBY_PATH_B4F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_1", + "x": 7, + "y": 2, + "elevation": 0, + "script": "MtEmber_RubyPath_B5F_EventScript_163BAB" + } + ] +}
\ No newline at end of file diff --git a/data/maps/MtEmber_Summit/events.inc b/data/maps/MtEmber_Summit/events.inc deleted file mode 100644 index c821765e0..000000000 --- a/data/maps/MtEmber_Summit/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -MtEmber_Summit_EventObjects: - object_event 1, 137, 0, 9, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, MtEmber_Summit_EventScript_163B33, 82, 0, 0 - object_event 2, 97, 0, 10, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, MtEmber_Summit_EventScript_1BE11D, 0, 0, 0 - object_event 3, 97, 0, 9, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, MtEmber_Summit_EventScript_1BE11D, 0, 0, 0 - object_event 4, 97, 0, 8, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, MtEmber_Summit_EventScript_1BE11D, 0, 0, 0 - object_event 5, 97, 0, 8, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, MtEmber_Summit_EventScript_1BE11D, 0, 0, 0 - -MtEmber_Summit_MapWarps: - warp_def 9, 15, 0, 4, 353 - -MtEmber_Summit_MapEvents:: - map_events MtEmber_Summit_EventObjects, MtEmber_Summit_MapWarps, 0x0, 0x0 diff --git a/data/maps/MtEmber_Summit/header.inc b/data/maps/MtEmber_Summit/header.inc deleted file mode 100644 index 64c30d948..000000000 --- a/data/maps/MtEmber_Summit/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -MtEmber_Summit:: @ 834FD20 - .4byte MtEmber_Summit_Layout @ 0x833D9C8 - .4byte MtEmber_Summit_MapEvents @ 0x83B2DFC - .4byte MtEmber_Summit_MapScripts @ 0x8163AFC - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 281 - .byte 0xaf, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/MtEmber_Summit/map.json b/data/maps/MtEmber_Summit/map.json new file mode 100644 index 000000000..eab46ccae --- /dev/null +++ b/data/maps/MtEmber_Summit/map.json @@ -0,0 +1,93 @@ +{ + "id": "MAP_MT_EMBER_SUMMIT", + "name": "MtEmber_Summit", + "layout": "LAYOUT_MT_EMBER_SUMMIT", + "music": "BGM_FRLG_MT_EMBER", + "region_map_section": "MAPSEC_MT_EMBER", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "137", + "x": 9, + "y": 6, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtEmber_Summit_EventScript_163B33", + "flag": "82" + }, + { + "graphics_id": "97", + "x": 10, + "y": 12, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtEmber_Summit_EventScript_1BE11D", + "flag": "0" + }, + { + "graphics_id": "97", + "x": 9, + "y": 12, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtEmber_Summit_EventScript_1BE11D", + "flag": "0" + }, + { + "graphics_id": "97", + "x": 8, + "y": 11, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtEmber_Summit_EventScript_1BE11D", + "flag": "0" + }, + { + "graphics_id": "97", + "x": 8, + "y": 10, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtEmber_Summit_EventScript_1BE11D", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 9, + "y": 15, + "elevation": 0, + "dest_map": "MAP_MT_EMBER_EXTERIOR", + "dest_warp_id": 4 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/MtEmber_SummitPath_1F/events.inc b/data/maps/MtEmber_SummitPath_1F/events.inc deleted file mode 100644 index 715d9ba7a..000000000 --- a/data/maps/MtEmber_SummitPath_1F/events.inc +++ /dev/null @@ -1,6 +0,0 @@ -MtEmber_SummitPath_1F_MapWarps: - warp_def 2, 15, 0, 2, 353 - warp_def 11, 1, 0, 0, 355 - -MtEmber_SummitPath_1F_MapEvents:: - map_events 0x0, MtEmber_SummitPath_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/MtEmber_SummitPath_1F/header.inc b/data/maps/MtEmber_SummitPath_1F/header.inc deleted file mode 100644 index 380374d2d..000000000 --- a/data/maps/MtEmber_SummitPath_1F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -MtEmber_SummitPath_1F:: @ 834FCCC - .4byte MtEmber_SummitPath_1F_Layout @ 0x833DC08 - .4byte MtEmber_SummitPath_1F_MapEvents @ 0x83B2C48 - .4byte MtEmber_SummitPath_1F_MapScripts @ 0x8163AF9 - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 282 - .byte 0xaf, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/MtEmber_SummitPath_1F/map.json b/data/maps/MtEmber_SummitPath_1F/map.json new file mode 100644 index 000000000..8e7ccc047 --- /dev/null +++ b/data/maps/MtEmber_SummitPath_1F/map.json @@ -0,0 +1,34 @@ +{ + "id": "MAP_MT_EMBER_SUMMIT_PATH_1F", + "name": "MtEmber_SummitPath_1F", + "layout": "LAYOUT_MT_EMBER_SUMMIT_PATH_1F", + "music": "BGM_FRLG_MT_EMBER", + "region_map_section": "MAPSEC_MT_EMBER", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 2, + "y": 15, + "elevation": 0, + "dest_map": "MAP_MT_EMBER_EXTERIOR", + "dest_warp_id": 2 + }, + { + "x": 11, + "y": 1, + "elevation": 0, + "dest_map": "MAP_MT_EMBER_SUMMIT_PATH_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/MtEmber_SummitPath_2F/events.inc b/data/maps/MtEmber_SummitPath_2F/events.inc deleted file mode 100644 index 92a3d062f..000000000 --- a/data/maps/MtEmber_SummitPath_2F/events.inc +++ /dev/null @@ -1,17 +0,0 @@ -MtEmber_SummitPath_2F_EventObjects: - object_event 1, 96, 0, 40, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtEmber_SummitPath_2F_EventScript_1BE00C, 18, 0, 0 - object_event 2, 96, 0, 33, 0, 5, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtEmber_SummitPath_2F_EventScript_1BE00C, 19, 0, 0 - object_event 3, 96, 0, 15, 0, 19, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtEmber_SummitPath_2F_EventScript_1BE00C, 20, 0, 0 - object_event 4, 96, 0, 13, 0, 23, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtEmber_SummitPath_2F_EventScript_1BE00C, 21, 0, 0 - object_event 5, 96, 0, 13, 0, 21, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtEmber_SummitPath_2F_EventScript_1BE00C, 22, 0, 0 - object_event 6, 96, 0, 7, 0, 38, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtEmber_SummitPath_2F_EventScript_1BE00C, 23, 0, 0 - object_event 7, 96, 0, 9, 0, 35, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtEmber_SummitPath_2F_EventScript_1BE00C, 24, 0, 0 - object_event 8, 96, 0, 7, 0, 34, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtEmber_SummitPath_2F_EventScript_1BE00C, 25, 0, 0 - object_event 9, 96, 0, 15, 0, 26, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtEmber_SummitPath_2F_EventScript_1BE00C, 26, 0, 0 - -MtEmber_SummitPath_2F_MapWarps: - warp_def 8, 39, 0, 1, 354 - warp_def 39, 6, 3, 0, 356 - -MtEmber_SummitPath_2F_MapEvents:: - map_events MtEmber_SummitPath_2F_EventObjects, MtEmber_SummitPath_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/MtEmber_SummitPath_2F/header.inc b/data/maps/MtEmber_SummitPath_2F/header.inc deleted file mode 100644 index b53170ef8..000000000 --- a/data/maps/MtEmber_SummitPath_2F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -MtEmber_SummitPath_2F:: @ 834FCE8 - .4byte MtEmber_SummitPath_2F_Layout @ 0x833ED6C - .4byte MtEmber_SummitPath_2F_MapEvents @ 0x83B2D44 - .4byte MtEmber_SummitPath_2F_MapScripts @ 0x8163AFA - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 283 - .byte 0xaf, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/MtEmber_SummitPath_2F/map.json b/data/maps/MtEmber_SummitPath_2F/map.json new file mode 100644 index 000000000..69067bbcc --- /dev/null +++ b/data/maps/MtEmber_SummitPath_2F/map.json @@ -0,0 +1,152 @@ +{ + "id": "MAP_MT_EMBER_SUMMIT_PATH_2F", + "name": "MtEmber_SummitPath_2F", + "layout": "LAYOUT_MT_EMBER_SUMMIT_PATH_2F", + "music": "BGM_FRLG_MT_EMBER", + "region_map_section": "MAPSEC_MT_EMBER", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "96", + "x": 40, + "y": 7, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtEmber_SummitPath_2F_EventScript_1BE00C", + "flag": "18" + }, + { + "graphics_id": "96", + "x": 33, + "y": 5, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtEmber_SummitPath_2F_EventScript_1BE00C", + "flag": "19" + }, + { + "graphics_id": "96", + "x": 15, + "y": 19, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtEmber_SummitPath_2F_EventScript_1BE00C", + "flag": "20" + }, + { + "graphics_id": "96", + "x": 13, + "y": 23, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtEmber_SummitPath_2F_EventScript_1BE00C", + "flag": "21" + }, + { + "graphics_id": "96", + "x": 13, + "y": 21, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtEmber_SummitPath_2F_EventScript_1BE00C", + "flag": "22" + }, + { + "graphics_id": "96", + "x": 7, + "y": 38, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtEmber_SummitPath_2F_EventScript_1BE00C", + "flag": "23" + }, + { + "graphics_id": "96", + "x": 9, + "y": 35, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtEmber_SummitPath_2F_EventScript_1BE00C", + "flag": "24" + }, + { + "graphics_id": "96", + "x": 7, + "y": 34, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtEmber_SummitPath_2F_EventScript_1BE00C", + "flag": "25" + }, + { + "graphics_id": "96", + "x": 15, + "y": 26, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtEmber_SummitPath_2F_EventScript_1BE00C", + "flag": "26" + } + ], + "warp_events": [ + { + "x": 8, + "y": 39, + "elevation": 0, + "dest_map": "MAP_MT_EMBER_SUMMIT_PATH_1F", + "dest_warp_id": 1 + }, + { + "x": 39, + "y": 6, + "elevation": 3, + "dest_map": "MAP_MT_EMBER_SUMMIT_PATH_3F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/MtEmber_SummitPath_3F/events.inc b/data/maps/MtEmber_SummitPath_3F/events.inc deleted file mode 100644 index b05d6e6de..000000000 --- a/data/maps/MtEmber_SummitPath_3F/events.inc +++ /dev/null @@ -1,6 +0,0 @@ -MtEmber_SummitPath_3F_MapWarps: - warp_def 2, 4, 0, 1, 355 - warp_def 11, 8, 0, 3, 353 - -MtEmber_SummitPath_3F_MapEvents:: - map_events 0x0, MtEmber_SummitPath_3F_MapWarps, 0x0, 0x0 diff --git a/data/maps/MtEmber_SummitPath_3F/header.inc b/data/maps/MtEmber_SummitPath_3F/header.inc deleted file mode 100644 index 0d6829bab..000000000 --- a/data/maps/MtEmber_SummitPath_3F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -MtEmber_SummitPath_3F:: @ 834FD04 - .4byte MtEmber_SummitPath_3F_Layout @ 0x833EEDC - .4byte MtEmber_SummitPath_3F_MapEvents @ 0x83B2D68 - .4byte MtEmber_SummitPath_3F_MapScripts @ 0x8163AFB - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 284 - .byte 0xaf, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/MtEmber_SummitPath_3F/map.json b/data/maps/MtEmber_SummitPath_3F/map.json new file mode 100644 index 000000000..b30309a12 --- /dev/null +++ b/data/maps/MtEmber_SummitPath_3F/map.json @@ -0,0 +1,34 @@ +{ + "id": "MAP_MT_EMBER_SUMMIT_PATH_3F", + "name": "MtEmber_SummitPath_3F", + "layout": "LAYOUT_MT_EMBER_SUMMIT_PATH_3F", + "music": "BGM_FRLG_MT_EMBER", + "region_map_section": "MAPSEC_MT_EMBER", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 2, + "y": 4, + "elevation": 0, + "dest_map": "MAP_MT_EMBER_SUMMIT_PATH_2F", + "dest_warp_id": 1 + }, + { + "x": 11, + "y": 8, + "elevation": 0, + "dest_map": "MAP_MT_EMBER_EXTERIOR", + "dest_warp_id": 3 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/MtMoon_1F/events.inc b/data/maps/MtMoon_1F/events.inc deleted file mode 100644 index 9c0ffa77e..000000000 --- a/data/maps/MtMoon_1F/events.inc +++ /dev/null @@ -1,27 +0,0 @@ -MtMoon_1F_EventObjects: - object_event 1, 22, 0, 20, 0, 26, 0, 3, 8, 17, 0, 1, 0, 2, 0, MtMoon_1F_EventScript_16063C, 0, 0, 0 - object_event 2, 20, 0, 36, 0, 30, 0, 3, 10, 17, 0, 1, 0, 2, 0, MtMoon_1F_EventScript_160681, 0, 0, 0 - object_event 3, 55, 0, 30, 0, 35, 0, 3, 1, 17, 0, 1, 0, 4, 0, MtMoon_1F_EventScript_160653, 0, 0, 0 - object_event 4, 22, 0, 33, 0, 4, 0, 3, 47, 53, 0, 1, 0, 2, 0, MtMoon_1F_EventScript_160625, 0, 0, 0 - object_event 5, 20, 0, 7, 0, 26, 0, 3, 8, 17, 0, 1, 0, 4, 0, MtMoon_1F_EventScript_16066A, 0, 0, 0 - object_event 6, 18, 0, 13, 0, 17, 0, 3, 10, 17, 0, 1, 0, 4, 0, MtMoon_1F_EventScript_16060E, 0, 0, 0 - object_event 7, 56, 0, 7, 0, 10, 0, 3, 2, 34, 0, 1, 0, 1, 0, MtMoon_1F_EventScript_1605F7, 0, 0, 0 - object_event 8, 92, 0, 2, 0, 22, 0, 3, 8, 17, 0, 0, 0, 0, 0, MtMoon_1F_EventScript_1BE5CF, 345, 0, 0 - object_event 9, 92, 0, 11, 0, 35, 0, 3, 8, 17, 0, 0, 0, 0, 0, MtMoon_1F_EventScript_1BE5DC, 346, 0, 0 - object_event 10, 92, 0, 26, 0, 32, 0, 3, 8, 17, 0, 0, 0, 0, 0, MtMoon_1F_EventScript_1BE5E9, 347, 0, 0 - object_event 11, 92, 0, 42, 0, 35, 0, 3, 8, 17, 0, 0, 0, 0, 0, MtMoon_1F_EventScript_1BE5F6, 348, 0, 0 - object_event 12, 92, 0, 44, 0, 21, 0, 3, 8, 17, 0, 0, 0, 0, 0, MtMoon_1F_EventScript_1BE603, 349, 0, 0 - object_event 13, 92, 0, 3, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, MtMoon_1F_EventScript_1BE610, 350, 0, 0 - object_event 14, 30, 0, 42, 0, 7, 0, 3, 17, 17, 0, 0, 0, 0, 0, MtMoon_1F_EventScript_1ACE03, 0, 0, 0 - -MtMoon_1F_MapWarps: - warp_def 5, 6, 3, 0, 258 - warp_def 19, 14, 3, 1, 258 - warp_def 31, 16, 3, 2, 258 - warp_def 18, 37, 3, 0, 790 - -MtMoon_1F_MapBGEvents: - bg_event 19, 26, 0, 0, 0, MtMoon_1F_EventScript_1605EE - -MtMoon_1F_MapEvents:: - map_events MtMoon_1F_EventObjects, MtMoon_1F_MapWarps, 0x0, MtMoon_1F_MapBGEvents diff --git a/data/maps/MtMoon_1F/header.inc b/data/maps/MtMoon_1F/header.inc deleted file mode 100644 index 13f9175f3..000000000 --- a/data/maps/MtMoon_1F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -MtMoon_1F:: @ 834F230 - .4byte MtMoon_1F_Layout @ 0x82FA890 - .4byte MtMoon_1F_MapEvents @ 0x83AE668 - .4byte MtMoon_1F_MapScripts @ 0x81605E4 - .4byte NULL - .2byte BGM_FRLG_MT_MOON - .2byte 114 - .byte 0x7f, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/MtMoon_1F/map.json b/data/maps/MtMoon_1F/map.json new file mode 100644 index 000000000..39138d94e --- /dev/null +++ b/data/maps/MtMoon_1F/map.json @@ -0,0 +1,239 @@ +{ + "id": "MAP_MT_MOON_1F", + "name": "MtMoon_1F", + "layout": "LAYOUT_MT_MOON_1F", + "music": "BGM_FRLG_MT_MOON", + "region_map_section": "MAPSEC_MT_MOON", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "22", + "x": 20, + "y": 26, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "MtMoon_1F_EventScript_16063C", + "flag": "0" + }, + { + "graphics_id": "20", + "x": 36, + "y": 30, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "MtMoon_1F_EventScript_160681", + "flag": "0" + }, + { + "graphics_id": "55", + "x": 30, + "y": 35, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "MtMoon_1F_EventScript_160653", + "flag": "0" + }, + { + "graphics_id": "22", + "x": 33, + "y": 4, + "elevation": 3, + "movement_type": "47", + "movement_range_x": 5, + "movement_range_y": 3, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "MtMoon_1F_EventScript_160625", + "flag": "0" + }, + { + "graphics_id": "20", + "x": 7, + "y": 26, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "MtMoon_1F_EventScript_16066A", + "flag": "0" + }, + { + "graphics_id": "18", + "x": 13, + "y": 17, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "MtMoon_1F_EventScript_16060E", + "flag": "0" + }, + { + "graphics_id": "56", + "x": 7, + "y": 10, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 2, + "movement_range_y": 2, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "MtMoon_1F_EventScript_1605F7", + "flag": "0" + }, + { + "graphics_id": "92", + "x": 2, + "y": 22, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtMoon_1F_EventScript_1BE5CF", + "flag": "345" + }, + { + "graphics_id": "92", + "x": 11, + "y": 35, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtMoon_1F_EventScript_1BE5DC", + "flag": "346" + }, + { + "graphics_id": "92", + "x": 26, + "y": 32, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtMoon_1F_EventScript_1BE5E9", + "flag": "347" + }, + { + "graphics_id": "92", + "x": 42, + "y": 35, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtMoon_1F_EventScript_1BE5F6", + "flag": "348" + }, + { + "graphics_id": "92", + "x": 44, + "y": 21, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtMoon_1F_EventScript_1BE603", + "flag": "349" + }, + { + "graphics_id": "92", + "x": 3, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtMoon_1F_EventScript_1BE610", + "flag": "350" + }, + { + "graphics_id": "30", + "x": 42, + "y": 7, + "elevation": 3, + "movement_type": "17", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtMoon_1F_EventScript_1ACE03", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 5, + "y": 6, + "elevation": 3, + "dest_map": "MAP_MT_MOON_B1F", + "dest_warp_id": 0 + }, + { + "x": 19, + "y": 14, + "elevation": 3, + "dest_map": "MAP_MT_MOON_B1F", + "dest_warp_id": 1 + }, + { + "x": 31, + "y": 16, + "elevation": 3, + "dest_map": "MAP_MT_MOON_B1F", + "dest_warp_id": 2 + }, + { + "x": 18, + "y": 37, + "elevation": 3, + "dest_map": "MAP_ROUTE4", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 19, + "y": 26, + "elevation": 0, + "script": "MtMoon_1F_EventScript_1605EE" + } + ] +}
\ No newline at end of file diff --git a/data/maps/MtMoon_B1F/events.inc b/data/maps/MtMoon_B1F/events.inc deleted file mode 100644 index 966f371bc..000000000 --- a/data/maps/MtMoon_B1F/events.inc +++ /dev/null @@ -1,20 +0,0 @@ -MtMoon_B1F_MapWarps: - warp_def 3, 3, 3, 0, 257 - warp_def 25, 4, 3, 1, 257 - warp_def 43, 21, 3, 2, 257 - warp_def 22, 18, 3, 0, 259 - warp_def 17, 5, 3, 1, 259 - warp_def 26, 36, 3, 2, 259 - warp_def 39, 4, 3, 3, 259 - warp_def 45, 4, 3, 1, 790 - -MtMoon_B1F_MapBGEvents: - bg_event 46, 2, 0, 7, 0, 103, 84, 1 - bg_event 26, 2, 0, 7, 0, 103, 85, 1 - bg_event 39, 34, 0, 7, 0, 103, 86, 1 - bg_event 24, 35, 0, 7, 0, 104, 87, 1 - bg_event 6, 12, 0, 7, 0, 104, 88, 1 - bg_event 25, 34, 0, 7, 0, 104, 89, 1 - -MtMoon_B1F_MapEvents:: - map_events 0x0, MtMoon_B1F_MapWarps, 0x0, MtMoon_B1F_MapBGEvents diff --git a/data/maps/MtMoon_B1F/header.inc b/data/maps/MtMoon_B1F/header.inc deleted file mode 100644 index 83f710180..000000000 --- a/data/maps/MtMoon_B1F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -MtMoon_B1F:: @ 834F24C - .4byte MtMoon_B1F_Layout @ 0x82FB804 - .4byte MtMoon_B1F_MapEvents @ 0x83AE704 - .4byte MtMoon_B1F_MapScripts @ 0x8160698 - .4byte NULL - .2byte BGM_FRLG_MT_MOON - .2byte 115 - .byte 0x7f, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/MtMoon_B1F/map.json b/data/maps/MtMoon_B1F/map.json new file mode 100644 index 000000000..64e316565 --- /dev/null +++ b/data/maps/MtMoon_B1F/map.json @@ -0,0 +1,131 @@ +{ + "id": "MAP_MT_MOON_B1F", + "name": "MtMoon_B1F", + "layout": "LAYOUT_MT_MOON_B1F", + "music": "BGM_FRLG_MT_MOON", + "region_map_section": "MAPSEC_MT_MOON", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 3, + "y": 3, + "elevation": 3, + "dest_map": "MAP_MT_MOON_1F", + "dest_warp_id": 0 + }, + { + "x": 25, + "y": 4, + "elevation": 3, + "dest_map": "MAP_MT_MOON_1F", + "dest_warp_id": 1 + }, + { + "x": 43, + "y": 21, + "elevation": 3, + "dest_map": "MAP_MT_MOON_1F", + "dest_warp_id": 2 + }, + { + "x": 22, + "y": 18, + "elevation": 3, + "dest_map": "MAP_MT_MOON_B2F", + "dest_warp_id": 0 + }, + { + "x": 17, + "y": 5, + "elevation": 3, + "dest_map": "MAP_MT_MOON_B2F", + "dest_warp_id": 1 + }, + { + "x": 26, + "y": 36, + "elevation": 3, + "dest_map": "MAP_MT_MOON_B2F", + "dest_warp_id": 2 + }, + { + "x": 39, + "y": 4, + "elevation": 3, + "dest_map": "MAP_MT_MOON_B2F", + "dest_warp_id": 3 + }, + { + "x": 45, + "y": 4, + "elevation": 3, + "dest_map": "MAP_ROUTE4", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "hidden_item", + "x": 46, + "y": 2, + "elevation": 0, + "item": "ITEM_TINY_MUSHROOM", + "flag": "84", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 26, + "y": 2, + "elevation": 0, + "item": "ITEM_TINY_MUSHROOM", + "flag": "85", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 39, + "y": 34, + "elevation": 0, + "item": "ITEM_TINY_MUSHROOM", + "flag": "86", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 24, + "y": 35, + "elevation": 0, + "item": "ITEM_BIG_MUSHROOM", + "flag": "87", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 6, + "y": 12, + "elevation": 0, + "item": "ITEM_BIG_MUSHROOM", + "flag": "88", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 25, + "y": 34, + "elevation": 0, + "item": "ITEM_BIG_MUSHROOM", + "flag": "89", + "unknown": 1 + } + ] +}
\ No newline at end of file diff --git a/data/maps/MtMoon_B2F/events.inc b/data/maps/MtMoon_B2F/events.inc deleted file mode 100644 index e2bea66aa..000000000 --- a/data/maps/MtMoon_B2F/events.inc +++ /dev/null @@ -1,28 +0,0 @@ -MtMoon_B2F_EventObjects: - object_event 1, 98, 0, 13, 0, 7, 0, 3, 8, 17, 0, 0, 0, 0, 0, MtMoon_B2F_EventScript_16071B, 47, 0, 0 - object_event 2, 98, 0, 14, 0, 7, 0, 3, 8, 17, 0, 0, 0, 0, 0, MtMoon_B2F_EventScript_16077F, 48, 0, 0 - object_event 3, 55, 0, 13, 0, 11, 0, 3, 10, 17, 0, 0, 0, 0, 0, MtMoon_B2F_EventScript_1606C2, 0, 0, 0 - object_event 4, 49, 0, 37, 0, 21, 0, 3, 1, 17, 0, 1, 0, 3, 0, MtMoon_B2F_EventScript_160829, 173, 0, 0 - object_event 5, 49, 0, 12, 0, 20, 0, 3, 8, 17, 0, 1, 0, 2, 0, MtMoon_B2F_EventScript_1607E4, 173, 0, 0 - object_event 6, 49, 0, 35, 0, 12, 0, 3, 7, 17, 0, 1, 0, 4, 0, MtMoon_B2F_EventScript_160812, 173, 0, 0 - object_event 7, 49, 0, 18, 0, 27, 0, 3, 8, 17, 0, 1, 0, 4, 0, MtMoon_B2F_EventScript_1607FB, 173, 0, 0 - object_event 8, 92, 0, 30, 0, 26, 0, 3, 8, 17, 0, 0, 0, 0, 0, MtMoon_B2F_EventScript_1BE61D, 351, 0, 0 - object_event 9, 92, 0, 35, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, MtMoon_B2F_EventScript_1BE62A, 352, 0, 0 - object_event 10, 92, 0, 24, 0, 6, 0, 3, 8, 17, 0, 0, 0, 0, 0, MtMoon_B2F_EventScript_1BEAD6, 447, 0, 0 - object_event 11, 92, 0, 3, 0, 11, 0, 3, 8, 17, 0, 0, 0, 0, 0, MtMoon_B2F_EventScript_1BEAE3, 448, 0, 0 - -MtMoon_B2F_MapWarps: - warp_def 25, 21, 3, 3, 258 - warp_def 31, 11, 3, 4, 258 - warp_def 17, 31, 3, 5, 258 - warp_def 5, 10, 3, 6, 258 - -MtMoon_B2F_MapCoordEvents: - coord_event 14, 11, 3, 0, 16523, 0, 0, MtMoon_B2F_EventScript_1606B0 - -MtMoon_B2F_MapBGEvents: - bg_event 20, 16, 3, 7, 0, 94, 2, 1 - bg_event 39, 11, 3, 7, 0, 34, 3, 1 - -MtMoon_B2F_MapEvents:: - map_events MtMoon_B2F_EventObjects, MtMoon_B2F_MapWarps, MtMoon_B2F_MapCoordEvents, MtMoon_B2F_MapBGEvents diff --git a/data/maps/MtMoon_B2F/header.inc b/data/maps/MtMoon_B2F/header.inc deleted file mode 100644 index d84f5a668..000000000 --- a/data/maps/MtMoon_B2F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -MtMoon_B2F:: @ 834F268 - .4byte MtMoon_B2F_Layout @ 0x82FC728 - .4byte MtMoon_B2F_MapEvents @ 0x83AE868 - .4byte MtMoon_B2F_MapScripts @ 0x8160699 - .4byte NULL - .2byte BGM_FRLG_MT_MOON - .2byte 116 - .byte 0x7f, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/MtMoon_B2F/map.json b/data/maps/MtMoon_B2F/map.json new file mode 100644 index 000000000..9b3fa3658 --- /dev/null +++ b/data/maps/MtMoon_B2F/map.json @@ -0,0 +1,221 @@ +{ + "id": "MAP_MT_MOON_B2F", + "name": "MtMoon_B2F", + "layout": "LAYOUT_MT_MOON_B2F", + "music": "BGM_FRLG_MT_MOON", + "region_map_section": "MAPSEC_MT_MOON", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "98", + "x": 13, + "y": 7, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtMoon_B2F_EventScript_16071B", + "flag": "47" + }, + { + "graphics_id": "98", + "x": 14, + "y": 7, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtMoon_B2F_EventScript_16077F", + "flag": "48" + }, + { + "graphics_id": "55", + "x": 13, + "y": 11, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtMoon_B2F_EventScript_1606C2", + "flag": "0" + }, + { + "graphics_id": "49", + "x": 37, + "y": 21, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "MtMoon_B2F_EventScript_160829", + "flag": "173" + }, + { + "graphics_id": "49", + "x": 12, + "y": 20, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "MtMoon_B2F_EventScript_1607E4", + "flag": "173" + }, + { + "graphics_id": "49", + "x": 35, + "y": 12, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "MtMoon_B2F_EventScript_160812", + "flag": "173" + }, + { + "graphics_id": "49", + "x": 18, + "y": 27, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "MtMoon_B2F_EventScript_1607FB", + "flag": "173" + }, + { + "graphics_id": "92", + "x": 30, + "y": 26, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtMoon_B2F_EventScript_1BE61D", + "flag": "351" + }, + { + "graphics_id": "92", + "x": 35, + "y": 5, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtMoon_B2F_EventScript_1BE62A", + "flag": "352" + }, + { + "graphics_id": "92", + "x": 24, + "y": 6, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtMoon_B2F_EventScript_1BEAD6", + "flag": "447" + }, + { + "graphics_id": "92", + "x": 3, + "y": 11, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtMoon_B2F_EventScript_1BEAE3", + "flag": "448" + } + ], + "warp_events": [ + { + "x": 25, + "y": 21, + "elevation": 3, + "dest_map": "MAP_MT_MOON_B1F", + "dest_warp_id": 3 + }, + { + "x": 31, + "y": 11, + "elevation": 3, + "dest_map": "MAP_MT_MOON_B1F", + "dest_warp_id": 4 + }, + { + "x": 17, + "y": 31, + "elevation": 3, + "dest_map": "MAP_MT_MOON_B1F", + "dest_warp_id": 5 + }, + { + "x": 5, + "y": 10, + "elevation": 3, + "dest_map": "MAP_MT_MOON_B1F", + "dest_warp_id": 6 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 14, + "y": 11, + "elevation": 3, + "var": "VAR_0x408B", + "var_value": 0, + "script": "MtMoon_B2F_EventScript_1606B0" + } + ], + "bg_events": [ + { + "type": "hidden_item", + "x": 20, + "y": 16, + "elevation": 3, + "item": "ITEM_MOON_STONE", + "flag": "2", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 39, + "y": 11, + "elevation": 3, + "item": "ITEM_ETHER", + "flag": "3", + "unknown": 1 + } + ] +}
\ No newline at end of file diff --git a/data/maps/NavelRock_1F/events.inc b/data/maps/NavelRock_1F/events.inc deleted file mode 100644 index 935817429..000000000 --- a/data/maps/NavelRock_1F/events.inc +++ /dev/null @@ -1,6 +0,0 @@ -NavelRock_1F_MapWarps: - warp_def 8, 4, 3, 0, 566 - warp_def 8, 23, 3, 0, 512 - -NavelRock_1F_MapEvents:: - map_events 0x0, NavelRock_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/NavelRock_1F/header.inc b/data/maps/NavelRock_1F/header.inc deleted file mode 100644 index 770c47ebc..000000000 --- a/data/maps/NavelRock_1F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -NavelRock_1F:: @ 8350378 - .4byte NavelRock_1F_Layout @ 0x8348AD4 - .4byte NavelRock_1F_MapEvents @ 0x83B48E0 - .4byte NavelRock_1F_MapScripts @ 0x8164F9E - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 344 - .byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/NavelRock_1F/map.json b/data/maps/NavelRock_1F/map.json new file mode 100644 index 000000000..586d2c9b6 --- /dev/null +++ b/data/maps/NavelRock_1F/map.json @@ -0,0 +1,34 @@ +{ + "id": "MAP_NAVEL_ROCK_1F", + "name": "NavelRock_1F", + "layout": "LAYOUT_NAVEL_ROCK_1F", + "music": "BGM_FRLG_MT_EMBER", + "region_map_section": "MAPSEC_NAVEL_ROCK", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 0, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 8, + "y": 4, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_B1F", + "dest_warp_id": 0 + }, + { + "x": 8, + "y": 23, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_EXTERIOR", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/NavelRock_B1F/events.inc b/data/maps/NavelRock_B1F/events.inc deleted file mode 100644 index bed605cad..000000000 --- a/data/maps/NavelRock_B1F/events.inc +++ /dev/null @@ -1,6 +0,0 @@ -NavelRock_B1F_MapWarps: - warp_def 4, 2, 3, 0, 548 - warp_def 11, 5, 3, 0, 567 - -NavelRock_B1F_MapEvents:: - map_events 0x0, NavelRock_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/NavelRock_B1F/header.inc b/data/maps/NavelRock_B1F/header.inc deleted file mode 100644 index b9d2192a8..000000000 --- a/data/maps/NavelRock_B1F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -NavelRock_B1F:: @ 8350570 - .4byte NavelRock_B1F_Layout @ 0x834A210 - .4byte NavelRock_B1F_MapEvents @ 0x83B4BA4 - .4byte NavelRock_B1F_MapScripts @ 0x8165201 - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 364 - .byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/NavelRock_B1F/map.json b/data/maps/NavelRock_B1F/map.json new file mode 100644 index 000000000..074a3e41f --- /dev/null +++ b/data/maps/NavelRock_B1F/map.json @@ -0,0 +1,34 @@ +{ + "id": "MAP_NAVEL_ROCK_B1F", + "name": "NavelRock_B1F", + "layout": "LAYOUT_NAVEL_ROCK_B1F", + "music": "BGM_FRLG_MT_EMBER", + "region_map_section": "MAPSEC_NAVEL_ROCK", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 0, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 4, + "y": 2, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_1F", + "dest_warp_id": 0 + }, + { + "x": 11, + "y": 5, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_FORK", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/NavelRock_Base/events.inc b/data/maps/NavelRock_Base/events.inc deleted file mode 100644 index cf94327da..000000000 --- a/data/maps/NavelRock_Base/events.inc +++ /dev/null @@ -1,8 +0,0 @@ -NavelRock_Base_EventObjects: - object_event 1, 144, 0, 10, 0, 15, 0, 3, 8, 17, 0, 0, 0, 0, 0, NavelRock_Base_EventScript_165134, 155, 0, 0 - -NavelRock_Base_MapWarps: - warp_def 13, 20, 3, 1, 565 - -NavelRock_Base_MapEvents:: - map_events NavelRock_Base_EventObjects, NavelRock_Base_MapWarps, 0x0, 0x0 diff --git a/data/maps/NavelRock_Base/header.inc b/data/maps/NavelRock_Base/header.inc deleted file mode 100644 index e452edef9..000000000 --- a/data/maps/NavelRock_Base/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -NavelRock_Base:: @ 83503B0 - .4byte NavelRock_Base_Layout @ 0x834929C - .4byte NavelRock_Base_MapEvents @ 0x83B4964 - .4byte NavelRock_Base_MapScripts @ 0x81650E7 - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 346 - .byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/NavelRock_Base/map.json b/data/maps/NavelRock_Base/map.json new file mode 100644 index 000000000..5e515e7e9 --- /dev/null +++ b/data/maps/NavelRock_Base/map.json @@ -0,0 +1,41 @@ +{ + "id": "MAP_NAVEL_ROCK_BASE", + "name": "NavelRock_Base", + "layout": "LAYOUT_NAVEL_ROCK_BASE", + "music": "BGM_FRLG_MT_EMBER", + "region_map_section": "MAPSEC_NAVEL_ROCK", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 0, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "144", + "x": 10, + "y": 15, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "NavelRock_Base_EventScript_165134", + "flag": "155" + } + ], + "warp_events": [ + { + "x": 13, + "y": 20, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_BASE_PATH_B11F", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/NavelRock_BasePath_B10F/events.inc b/data/maps/NavelRock_BasePath_B10F/events.inc deleted file mode 100644 index cdbc551a0..000000000 --- a/data/maps/NavelRock_BasePath_B10F/events.inc +++ /dev/null @@ -1,6 +0,0 @@ -NavelRock_BasePath_B10F_MapWarps: - warp_def 4, 4, 3, 1, 563 - warp_def 2, 2, 3, 0, 565 - -NavelRock_BasePath_B10F_MapEvents:: - map_events 0x0, NavelRock_BasePath_B10F_MapWarps, 0x0, 0x0 diff --git a/data/maps/NavelRock_BasePath_B10F/header.inc b/data/maps/NavelRock_BasePath_B10F/header.inc deleted file mode 100644 index 5354c6f9f..000000000 --- a/data/maps/NavelRock_BasePath_B10F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -NavelRock_BasePath_B10F:: @ 8350538 - .4byte NavelRock_BasePath_B10F_Layout @ 0x8349A0C - .4byte NavelRock_BasePath_B10F_MapEvents @ 0x83B4B5C - .4byte NavelRock_BasePath_B10F_MapScripts @ 0x81651FF - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 360 - .byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/NavelRock_BasePath_B10F/map.json b/data/maps/NavelRock_BasePath_B10F/map.json new file mode 100644 index 000000000..c578caf34 --- /dev/null +++ b/data/maps/NavelRock_BasePath_B10F/map.json @@ -0,0 +1,34 @@ +{ + "id": "MAP_NAVEL_ROCK_BASE_PATH_B10F", + "name": "NavelRock_BasePath_B10F", + "layout": "LAYOUT_NAVEL_ROCK_BASE_PATH_B10F", + "music": "BGM_FRLG_MT_EMBER", + "region_map_section": "MAPSEC_NAVEL_ROCK", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 0, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 4, + "y": 4, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_BASE_PATH_B9F", + "dest_warp_id": 1 + }, + { + "x": 2, + "y": 2, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_BASE_PATH_B11F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/NavelRock_BasePath_B11F/events.inc b/data/maps/NavelRock_BasePath_B11F/events.inc deleted file mode 100644 index 4d1fe74d7..000000000 --- a/data/maps/NavelRock_BasePath_B11F/events.inc +++ /dev/null @@ -1,6 +0,0 @@ -NavelRock_BasePath_B11F_MapWarps: - warp_def 2, 2, 3, 1, 564 - warp_def 4, 4, 3, 0, 550 - -NavelRock_BasePath_B11F_MapEvents:: - map_events 0x0, NavelRock_BasePath_B11F_MapWarps, 0x0, 0x0 diff --git a/data/maps/NavelRock_BasePath_B11F/header.inc b/data/maps/NavelRock_BasePath_B11F/header.inc deleted file mode 100644 index 395f9d82a..000000000 --- a/data/maps/NavelRock_BasePath_B11F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -NavelRock_BasePath_B11F:: @ 8350554 - .4byte NavelRock_BasePath_B11F_Layout @ 0x8349A94 - .4byte NavelRock_BasePath_B11F_MapEvents @ 0x83B4B80 - .4byte NavelRock_BasePath_B11F_MapScripts @ 0x8165200 - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 361 - .byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/NavelRock_BasePath_B11F/map.json b/data/maps/NavelRock_BasePath_B11F/map.json new file mode 100644 index 000000000..a25f66a8d --- /dev/null +++ b/data/maps/NavelRock_BasePath_B11F/map.json @@ -0,0 +1,34 @@ +{ + "id": "MAP_NAVEL_ROCK_BASE_PATH_B11F", + "name": "NavelRock_BasePath_B11F", + "layout": "LAYOUT_NAVEL_ROCK_BASE_PATH_B11F", + "music": "BGM_FRLG_MT_EMBER", + "region_map_section": "MAPSEC_NAVEL_ROCK", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 0, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 2, + "y": 2, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_BASE_PATH_B10F", + "dest_warp_id": 1 + }, + { + "x": 4, + "y": 4, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_BASE", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/NavelRock_BasePath_B1F/events.inc b/data/maps/NavelRock_BasePath_B1F/events.inc deleted file mode 100644 index a380bde04..000000000 --- a/data/maps/NavelRock_BasePath_B1F/events.inc +++ /dev/null @@ -1,6 +0,0 @@ -NavelRock_BasePath_B1F_MapWarps: - warp_def 2, 2, 3, 2, 567 - warp_def 4, 4, 3, 0, 556 - -NavelRock_BasePath_B1F_MapEvents:: - map_events 0x0, NavelRock_BasePath_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/NavelRock_BasePath_B1F/header.inc b/data/maps/NavelRock_BasePath_B1F/header.inc deleted file mode 100644 index b7f59616a..000000000 --- a/data/maps/NavelRock_BasePath_B1F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -NavelRock_BasePath_B1F:: @ 835043C - .4byte NavelRock_BasePath_B1F_Layout @ 0x8349544 - .4byte NavelRock_BasePath_B1F_MapEvents @ 0x83B4A18 - .4byte NavelRock_BasePath_B1F_MapScripts @ 0x81651F6 - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 351 - .byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/NavelRock_BasePath_B1F/map.json b/data/maps/NavelRock_BasePath_B1F/map.json new file mode 100644 index 000000000..9127135f3 --- /dev/null +++ b/data/maps/NavelRock_BasePath_B1F/map.json @@ -0,0 +1,34 @@ +{ + "id": "MAP_NAVEL_ROCK_BASE_PATH_B1F", + "name": "NavelRock_BasePath_B1F", + "layout": "LAYOUT_NAVEL_ROCK_BASE_PATH_B1F", + "music": "BGM_FRLG_MT_EMBER", + "region_map_section": "MAPSEC_NAVEL_ROCK", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 0, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 2, + "y": 2, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_FORK", + "dest_warp_id": 2 + }, + { + "x": 4, + "y": 4, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_BASE_PATH_B2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/NavelRock_BasePath_B2F/events.inc b/data/maps/NavelRock_BasePath_B2F/events.inc deleted file mode 100644 index ecd9fb93b..000000000 --- a/data/maps/NavelRock_BasePath_B2F/events.inc +++ /dev/null @@ -1,6 +0,0 @@ -NavelRock_BasePath_B2F_MapWarps: - warp_def 4, 4, 3, 1, 555 - warp_def 2, 2, 3, 0, 557 - -NavelRock_BasePath_B2F_MapEvents:: - map_events 0x0, NavelRock_BasePath_B2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/NavelRock_BasePath_B2F/header.inc b/data/maps/NavelRock_BasePath_B2F/header.inc deleted file mode 100644 index 55a55d2ab..000000000 --- a/data/maps/NavelRock_BasePath_B2F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -NavelRock_BasePath_B2F:: @ 8350458 - .4byte NavelRock_BasePath_B2F_Layout @ 0x83495CC - .4byte NavelRock_BasePath_B2F_MapEvents @ 0x83B4A3C - .4byte NavelRock_BasePath_B2F_MapScripts @ 0x81651F7 - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 352 - .byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/NavelRock_BasePath_B2F/map.json b/data/maps/NavelRock_BasePath_B2F/map.json new file mode 100644 index 000000000..4ec9d4faf --- /dev/null +++ b/data/maps/NavelRock_BasePath_B2F/map.json @@ -0,0 +1,34 @@ +{ + "id": "MAP_NAVEL_ROCK_BASE_PATH_B2F", + "name": "NavelRock_BasePath_B2F", + "layout": "LAYOUT_NAVEL_ROCK_BASE_PATH_B2F", + "music": "BGM_FRLG_MT_EMBER", + "region_map_section": "MAPSEC_NAVEL_ROCK", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 0, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 4, + "y": 4, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_BASE_PATH_B1F", + "dest_warp_id": 1 + }, + { + "x": 2, + "y": 2, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_BASE_PATH_B3F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/NavelRock_BasePath_B3F/events.inc b/data/maps/NavelRock_BasePath_B3F/events.inc deleted file mode 100644 index 729c045eb..000000000 --- a/data/maps/NavelRock_BasePath_B3F/events.inc +++ /dev/null @@ -1,6 +0,0 @@ -NavelRock_BasePath_B3F_MapWarps: - warp_def 2, 2, 3, 1, 556 - warp_def 4, 4, 3, 0, 558 - -NavelRock_BasePath_B3F_MapEvents:: - map_events 0x0, NavelRock_BasePath_B3F_MapWarps, 0x0, 0x0 diff --git a/data/maps/NavelRock_BasePath_B3F/header.inc b/data/maps/NavelRock_BasePath_B3F/header.inc deleted file mode 100644 index a2c0a7871..000000000 --- a/data/maps/NavelRock_BasePath_B3F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -NavelRock_BasePath_B3F:: @ 8350474 - .4byte NavelRock_BasePath_B3F_Layout @ 0x8349654 - .4byte NavelRock_BasePath_B3F_MapEvents @ 0x83B4A60 - .4byte NavelRock_BasePath_B3F_MapScripts @ 0x81651F8 - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 353 - .byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/NavelRock_BasePath_B3F/map.json b/data/maps/NavelRock_BasePath_B3F/map.json new file mode 100644 index 000000000..c0a482b47 --- /dev/null +++ b/data/maps/NavelRock_BasePath_B3F/map.json @@ -0,0 +1,34 @@ +{ + "id": "MAP_NAVEL_ROCK_BASE_PATH_B3F", + "name": "NavelRock_BasePath_B3F", + "layout": "LAYOUT_NAVEL_ROCK_BASE_PATH_B3F", + "music": "BGM_FRLG_MT_EMBER", + "region_map_section": "MAPSEC_NAVEL_ROCK", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 0, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 2, + "y": 2, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_BASE_PATH_B2F", + "dest_warp_id": 1 + }, + { + "x": 4, + "y": 4, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_BASE_PATH_B4F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/NavelRock_BasePath_B4F/events.inc b/data/maps/NavelRock_BasePath_B4F/events.inc deleted file mode 100644 index 359d4cf56..000000000 --- a/data/maps/NavelRock_BasePath_B4F/events.inc +++ /dev/null @@ -1,6 +0,0 @@ -NavelRock_BasePath_B4F_MapWarps: - warp_def 4, 4, 3, 1, 557 - warp_def 2, 2, 3, 0, 559 - -NavelRock_BasePath_B4F_MapEvents:: - map_events 0x0, NavelRock_BasePath_B4F_MapWarps, 0x0, 0x0 diff --git a/data/maps/NavelRock_BasePath_B4F/header.inc b/data/maps/NavelRock_BasePath_B4F/header.inc deleted file mode 100644 index 8ea714e88..000000000 --- a/data/maps/NavelRock_BasePath_B4F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -NavelRock_BasePath_B4F:: @ 8350490 - .4byte NavelRock_BasePath_B4F_Layout @ 0x83496DC - .4byte NavelRock_BasePath_B4F_MapEvents @ 0x83B4A84 - .4byte NavelRock_BasePath_B4F_MapScripts @ 0x81651F9 - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 354 - .byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/NavelRock_BasePath_B4F/map.json b/data/maps/NavelRock_BasePath_B4F/map.json new file mode 100644 index 000000000..c8ed7aa33 --- /dev/null +++ b/data/maps/NavelRock_BasePath_B4F/map.json @@ -0,0 +1,34 @@ +{ + "id": "MAP_NAVEL_ROCK_BASE_PATH_B4F", + "name": "NavelRock_BasePath_B4F", + "layout": "LAYOUT_NAVEL_ROCK_BASE_PATH_B4F", + "music": "BGM_FRLG_MT_EMBER", + "region_map_section": "MAPSEC_NAVEL_ROCK", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 0, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 4, + "y": 4, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_BASE_PATH_B3F", + "dest_warp_id": 1 + }, + { + "x": 2, + "y": 2, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_BASE_PATH_B5F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/NavelRock_BasePath_B5F/events.inc b/data/maps/NavelRock_BasePath_B5F/events.inc deleted file mode 100644 index 1dd28d72e..000000000 --- a/data/maps/NavelRock_BasePath_B5F/events.inc +++ /dev/null @@ -1,6 +0,0 @@ -NavelRock_BasePath_B5F_MapWarps: - warp_def 2, 2, 3, 1, 558 - warp_def 4, 4, 3, 0, 560 - -NavelRock_BasePath_B5F_MapEvents:: - map_events 0x0, NavelRock_BasePath_B5F_MapWarps, 0x0, 0x0 diff --git a/data/maps/NavelRock_BasePath_B5F/header.inc b/data/maps/NavelRock_BasePath_B5F/header.inc deleted file mode 100644 index cceabefd2..000000000 --- a/data/maps/NavelRock_BasePath_B5F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -NavelRock_BasePath_B5F:: @ 83504AC - .4byte NavelRock_BasePath_B5F_Layout @ 0x8349764 - .4byte NavelRock_BasePath_B5F_MapEvents @ 0x83B4AA8 - .4byte NavelRock_BasePath_B5F_MapScripts @ 0x81651FA - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 355 - .byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/NavelRock_BasePath_B5F/map.json b/data/maps/NavelRock_BasePath_B5F/map.json new file mode 100644 index 000000000..55c22da08 --- /dev/null +++ b/data/maps/NavelRock_BasePath_B5F/map.json @@ -0,0 +1,34 @@ +{ + "id": "MAP_NAVEL_ROCK_BASE_PATH_B5F", + "name": "NavelRock_BasePath_B5F", + "layout": "LAYOUT_NAVEL_ROCK_BASE_PATH_B5F", + "music": "BGM_FRLG_MT_EMBER", + "region_map_section": "MAPSEC_NAVEL_ROCK", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 0, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 2, + "y": 2, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_BASE_PATH_B4F", + "dest_warp_id": 1 + }, + { + "x": 4, + "y": 4, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_BASE_PATH_B6F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/NavelRock_BasePath_B6F/events.inc b/data/maps/NavelRock_BasePath_B6F/events.inc deleted file mode 100644 index 310eae42d..000000000 --- a/data/maps/NavelRock_BasePath_B6F/events.inc +++ /dev/null @@ -1,6 +0,0 @@ -NavelRock_BasePath_B6F_MapWarps: - warp_def 4, 4, 3, 1, 559 - warp_def 2, 2, 3, 0, 561 - -NavelRock_BasePath_B6F_MapEvents:: - map_events 0x0, NavelRock_BasePath_B6F_MapWarps, 0x0, 0x0 diff --git a/data/maps/NavelRock_BasePath_B6F/header.inc b/data/maps/NavelRock_BasePath_B6F/header.inc deleted file mode 100644 index e2c1d0fa6..000000000 --- a/data/maps/NavelRock_BasePath_B6F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -NavelRock_BasePath_B6F:: @ 83504C8 - .4byte NavelRock_BasePath_B6F_Layout @ 0x83497EC - .4byte NavelRock_BasePath_B6F_MapEvents @ 0x83B4ACC - .4byte NavelRock_BasePath_B6F_MapScripts @ 0x81651FB - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 356 - .byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/NavelRock_BasePath_B6F/map.json b/data/maps/NavelRock_BasePath_B6F/map.json new file mode 100644 index 000000000..ad441261b --- /dev/null +++ b/data/maps/NavelRock_BasePath_B6F/map.json @@ -0,0 +1,34 @@ +{ + "id": "MAP_NAVEL_ROCK_BASE_PATH_B6F", + "name": "NavelRock_BasePath_B6F", + "layout": "LAYOUT_NAVEL_ROCK_BASE_PATH_B6F", + "music": "BGM_FRLG_MT_EMBER", + "region_map_section": "MAPSEC_NAVEL_ROCK", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 0, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 4, + "y": 4, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_BASE_PATH_B5F", + "dest_warp_id": 1 + }, + { + "x": 2, + "y": 2, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_BASE_PATH_B7F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/NavelRock_BasePath_B7F/events.inc b/data/maps/NavelRock_BasePath_B7F/events.inc deleted file mode 100644 index 7d6af60b8..000000000 --- a/data/maps/NavelRock_BasePath_B7F/events.inc +++ /dev/null @@ -1,6 +0,0 @@ -NavelRock_BasePath_B7F_MapWarps: - warp_def 2, 2, 3, 1, 560 - warp_def 4, 4, 3, 0, 562 - -NavelRock_BasePath_B7F_MapEvents:: - map_events 0x0, NavelRock_BasePath_B7F_MapWarps, 0x0, 0x0 diff --git a/data/maps/NavelRock_BasePath_B7F/header.inc b/data/maps/NavelRock_BasePath_B7F/header.inc deleted file mode 100644 index cfcafafb7..000000000 --- a/data/maps/NavelRock_BasePath_B7F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -NavelRock_BasePath_B7F:: @ 83504E4 - .4byte NavelRock_BasePath_B7F_Layout @ 0x8349874 - .4byte NavelRock_BasePath_B7F_MapEvents @ 0x83B4AF0 - .4byte NavelRock_BasePath_B7F_MapScripts @ 0x81651FC - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 357 - .byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/NavelRock_BasePath_B7F/map.json b/data/maps/NavelRock_BasePath_B7F/map.json new file mode 100644 index 000000000..ea16d9bd0 --- /dev/null +++ b/data/maps/NavelRock_BasePath_B7F/map.json @@ -0,0 +1,34 @@ +{ + "id": "MAP_NAVEL_ROCK_BASE_PATH_B7F", + "name": "NavelRock_BasePath_B7F", + "layout": "LAYOUT_NAVEL_ROCK_BASE_PATH_B7F", + "music": "BGM_FRLG_MT_EMBER", + "region_map_section": "MAPSEC_NAVEL_ROCK", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 0, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 2, + "y": 2, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_BASE_PATH_B6F", + "dest_warp_id": 1 + }, + { + "x": 4, + "y": 4, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_BASE_PATH_B8F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/NavelRock_BasePath_B8F/events.inc b/data/maps/NavelRock_BasePath_B8F/events.inc deleted file mode 100644 index 00004438d..000000000 --- a/data/maps/NavelRock_BasePath_B8F/events.inc +++ /dev/null @@ -1,6 +0,0 @@ -NavelRock_BasePath_B8F_MapWarps: - warp_def 4, 4, 3, 1, 561 - warp_def 2, 2, 3, 0, 563 - -NavelRock_BasePath_B8F_MapEvents:: - map_events 0x0, NavelRock_BasePath_B8F_MapWarps, 0x0, 0x0 diff --git a/data/maps/NavelRock_BasePath_B8F/header.inc b/data/maps/NavelRock_BasePath_B8F/header.inc deleted file mode 100644 index 5849c2805..000000000 --- a/data/maps/NavelRock_BasePath_B8F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -NavelRock_BasePath_B8F:: @ 8350500 - .4byte NavelRock_BasePath_B8F_Layout @ 0x83498FC - .4byte NavelRock_BasePath_B8F_MapEvents @ 0x83B4B14 - .4byte NavelRock_BasePath_B8F_MapScripts @ 0x81651FD - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 358 - .byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/NavelRock_BasePath_B8F/map.json b/data/maps/NavelRock_BasePath_B8F/map.json new file mode 100644 index 000000000..27d4253f8 --- /dev/null +++ b/data/maps/NavelRock_BasePath_B8F/map.json @@ -0,0 +1,34 @@ +{ + "id": "MAP_NAVEL_ROCK_BASE_PATH_B8F", + "name": "NavelRock_BasePath_B8F", + "layout": "LAYOUT_NAVEL_ROCK_BASE_PATH_B8F", + "music": "BGM_FRLG_MT_EMBER", + "region_map_section": "MAPSEC_NAVEL_ROCK", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 0, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 4, + "y": 4, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_BASE_PATH_B7F", + "dest_warp_id": 1 + }, + { + "x": 2, + "y": 2, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_BASE_PATH_B9F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/NavelRock_BasePath_B9F/events.inc b/data/maps/NavelRock_BasePath_B9F/events.inc deleted file mode 100644 index a17fa1c9e..000000000 --- a/data/maps/NavelRock_BasePath_B9F/events.inc +++ /dev/null @@ -1,6 +0,0 @@ -NavelRock_BasePath_B9F_MapWarps: - warp_def 2, 2, 3, 1, 562 - warp_def 4, 4, 3, 0, 564 - -NavelRock_BasePath_B9F_MapEvents:: - map_events 0x0, NavelRock_BasePath_B9F_MapWarps, 0x0, 0x0 diff --git a/data/maps/NavelRock_BasePath_B9F/header.inc b/data/maps/NavelRock_BasePath_B9F/header.inc deleted file mode 100644 index d8b3d5364..000000000 --- a/data/maps/NavelRock_BasePath_B9F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -NavelRock_BasePath_B9F:: @ 835051C - .4byte NavelRock_BasePath_B9F_Layout @ 0x8349984 - .4byte NavelRock_BasePath_B9F_MapEvents @ 0x83B4B38 - .4byte NavelRock_BasePath_B9F_MapScripts @ 0x81651FE - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 359 - .byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/NavelRock_BasePath_B9F/map.json b/data/maps/NavelRock_BasePath_B9F/map.json new file mode 100644 index 000000000..fd4b0e4eb --- /dev/null +++ b/data/maps/NavelRock_BasePath_B9F/map.json @@ -0,0 +1,34 @@ +{ + "id": "MAP_NAVEL_ROCK_BASE_PATH_B9F", + "name": "NavelRock_BasePath_B9F", + "layout": "LAYOUT_NAVEL_ROCK_BASE_PATH_B9F", + "music": "BGM_FRLG_MT_EMBER", + "region_map_section": "MAPSEC_NAVEL_ROCK", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 0, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 2, + "y": 2, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_BASE_PATH_B8F", + "dest_warp_id": 1 + }, + { + "x": 4, + "y": 4, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_BASE_PATH_B10F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/NavelRock_Exterior/events.inc b/data/maps/NavelRock_Exterior/events.inc deleted file mode 100644 index 57f0baacd..000000000 --- a/data/maps/NavelRock_Exterior/events.inc +++ /dev/null @@ -1,6 +0,0 @@ -NavelRock_Exterior_MapWarps: - warp_def 9, 8, 3, 1, 548 - warp_def 9, 16, 3, 0, 571 - -NavelRock_Exterior_MapEvents:: - map_events 0x0, NavelRock_Exterior_MapWarps, 0x0, 0x0 diff --git a/data/maps/NavelRock_Exterior/header.inc b/data/maps/NavelRock_Exterior/header.inc deleted file mode 100644 index 0d62b0618..000000000 --- a/data/maps/NavelRock_Exterior/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -NavelRock_Exterior:: @ 834FF88 - .4byte NavelRock_Exterior_Layout @ 0x834873C - .4byte NavelRock_Exterior_MapEvents @ 0x83B3B74 - .4byte NavelRock_Exterior_MapScripts @ 0x81646AE - .4byte NULL - .2byte BGM_FRLG_SEVII_ISLANDS - .2byte 343 - .byte 0xae, 0x00, 0x00, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/NavelRock_Exterior/map.json b/data/maps/NavelRock_Exterior/map.json new file mode 100644 index 000000000..2caf50cac --- /dev/null +++ b/data/maps/NavelRock_Exterior/map.json @@ -0,0 +1,34 @@ +{ + "id": "MAP_NAVEL_ROCK_EXTERIOR", + "name": "NavelRock_Exterior", + "layout": "LAYOUT_NAVEL_ROCK_EXTERIOR", + "music": "BGM_FRLG_SEVII_ISLANDS", + "region_map_section": "MAPSEC_NAVEL_ROCK", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_3", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 9, + "y": 8, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_1F", + "dest_warp_id": 1 + }, + { + "x": 9, + "y": 16, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_HARBOR", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/NavelRock_Fork/events.inc b/data/maps/NavelRock_Fork/events.inc deleted file mode 100644 index 15b6ad4ab..000000000 --- a/data/maps/NavelRock_Fork/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -NavelRock_Fork_MapWarps: - warp_def 13, 95, 3, 1, 566 - warp_def 3, 1, 3, 0, 551 - warp_def 26, 1, 3, 0, 555 - -NavelRock_Fork_MapEvents:: - map_events 0x0, NavelRock_Fork_MapWarps, 0x0, 0x0 diff --git a/data/maps/NavelRock_Fork/header.inc b/data/maps/NavelRock_Fork/header.inc deleted file mode 100644 index 93ab89de4..000000000 --- a/data/maps/NavelRock_Fork/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -NavelRock_Fork:: @ 835058C - .4byte NavelRock_Fork_Layout @ 0x834B9A4 - .4byte NavelRock_Fork_MapEvents @ 0x83B4BD0 - .4byte NavelRock_Fork_MapScripts @ 0x8165202 - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 365 - .byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/NavelRock_Fork/map.json b/data/maps/NavelRock_Fork/map.json new file mode 100644 index 000000000..8f58e4edc --- /dev/null +++ b/data/maps/NavelRock_Fork/map.json @@ -0,0 +1,41 @@ +{ + "id": "MAP_NAVEL_ROCK_FORK", + "name": "NavelRock_Fork", + "layout": "LAYOUT_NAVEL_ROCK_FORK", + "music": "BGM_FRLG_MT_EMBER", + "region_map_section": "MAPSEC_NAVEL_ROCK", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 0, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 13, + "y": 95, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_B1F", + "dest_warp_id": 1 + }, + { + "x": 3, + "y": 1, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_SUMMIT_PATH_2F", + "dest_warp_id": 0 + }, + { + "x": 26, + "y": 1, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_BASE_PATH_B1F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/NavelRock_Harbor/events.inc b/data/maps/NavelRock_Harbor/events.inc deleted file mode 100644 index 83b6e9b34..000000000 --- a/data/maps/NavelRock_Harbor/events.inc +++ /dev/null @@ -1,9 +0,0 @@ -NavelRock_Harbor_EventObjects: - object_event 1, 108, 0, 8, 0, 9, 0, 0, 8, 17, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 - object_event 2, 62, 0, 8, 0, 6, 0, 3, 7, 17, 0, 0, 0, 0, 0, NavelRock_Harbor_EventScript_165421, 0, 0, 0 - -NavelRock_Harbor_MapWarps: - warp_def 8, 2, 3, 1, 512 - -NavelRock_Harbor_MapEvents:: - map_events NavelRock_Harbor_EventObjects, NavelRock_Harbor_MapWarps, 0x0, 0x0 diff --git a/data/maps/NavelRock_Harbor/header.inc b/data/maps/NavelRock_Harbor/header.inc deleted file mode 100644 index 39261ab96..000000000 --- a/data/maps/NavelRock_Harbor/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -NavelRock_Harbor:: @ 83505FC - .4byte Island_Harbor_Layout @ 0x8343FB8 - .4byte NavelRock_Harbor_MapEvents @ 0x83B4D70 - .4byte NavelRock_Harbor_MapScripts @ 0x8165420 - .4byte NULL - .2byte BGM_FRLG_SEVII_ISLANDS - .2byte 315 - .byte 0xae, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/NavelRock_Harbor/map.json b/data/maps/NavelRock_Harbor/map.json new file mode 100644 index 000000000..575542128 --- /dev/null +++ b/data/maps/NavelRock_Harbor/map.json @@ -0,0 +1,54 @@ +{ + "id": "MAP_NAVEL_ROCK_HARBOR", + "name": "NavelRock_Harbor", + "layout": "LAYOUT_ISLAND_HARBOR", + "music": "BGM_FRLG_SEVII_ISLANDS", + "region_map_section": "MAPSEC_NAVEL_ROCK", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "108", + "x": 8, + "y": 9, + "elevation": 0, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "62", + "x": 8, + "y": 6, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "NavelRock_Harbor_EventScript_165421", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 8, + "y": 2, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_EXTERIOR", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/NavelRock_Summit/events.inc b/data/maps/NavelRock_Summit/events.inc deleted file mode 100644 index c9092ab54..000000000 --- a/data/maps/NavelRock_Summit/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -NavelRock_Summit_EventObjects: - object_event 1, 145, 0, 9, 0, 6, 0, 0, 8, 17, 0, 0, 0, 0, 0, 0x0, 156, 0, 0 - -NavelRock_Summit_MapWarps: - warp_def 10, 18, 3, 1, 554 - -NavelRock_Summit_MapCoordEvents: - coord_event 9, 12, 3, 0, 16385, 0, 0, NavelRock_Summit_EventScript_164FFB - -NavelRock_Summit_MapBGEvents: - bg_event 9, 11, 3, 7, 0, 45, 160, 129 - -NavelRock_Summit_MapEvents:: - map_events NavelRock_Summit_EventObjects, NavelRock_Summit_MapWarps, NavelRock_Summit_MapCoordEvents, NavelRock_Summit_MapBGEvents diff --git a/data/maps/NavelRock_Summit/header.inc b/data/maps/NavelRock_Summit/header.inc deleted file mode 100644 index d49b0dc14..000000000 --- a/data/maps/NavelRock_Summit/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -NavelRock_Summit:: @ 8350394 - .4byte NavelRock_Summit_Layout @ 0x8348EB0 - .4byte NavelRock_Summit_MapEvents @ 0x83B4930 - .4byte NavelRock_Summit_MapScripts @ 0x8164F9F - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 345 - .byte 0xae, 0x00, 0x0b, 0x04, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/NavelRock_Summit/map.json b/data/maps/NavelRock_Summit/map.json new file mode 100644 index 000000000..ec65f3a26 --- /dev/null +++ b/data/maps/NavelRock_Summit/map.json @@ -0,0 +1,61 @@ +{ + "id": "MAP_NAVEL_ROCK_SUMMIT", + "name": "NavelRock_Summit", + "layout": "LAYOUT_NAVEL_ROCK_SUMMIT", + "music": "BGM_FRLG_MT_EMBER", + "region_map_section": "MAPSEC_NAVEL_ROCK", + "requires_flash": false, + "weather": "WEATHER_11", + "map_type": "MAP_TYPE_4", + "unknown_18": 0, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "145", + "x": 9, + "y": 6, + "elevation": 0, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "156" + } + ], + "warp_events": [ + { + "x": 10, + "y": 18, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_SUMMIT_PATH_5F", + "dest_warp_id": 1 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 9, + "y": 12, + "elevation": 3, + "var": "VAR_0x4001", + "var_value": 0, + "script": "NavelRock_Summit_EventScript_164FFB" + } + ], + "bg_events": [ + { + "type": "hidden_item", + "x": 9, + "y": 11, + "elevation": 3, + "item": "ITEM_SACRED_ASH", + "flag": "160", + "unknown": 129 + } + ] +}
\ No newline at end of file diff --git a/data/maps/NavelRock_SummitPath_2F/events.inc b/data/maps/NavelRock_SummitPath_2F/events.inc deleted file mode 100644 index 04d5d4651..000000000 --- a/data/maps/NavelRock_SummitPath_2F/events.inc +++ /dev/null @@ -1,6 +0,0 @@ -NavelRock_SummitPath_2F_MapWarps: - warp_def 4, 4, 3, 1, 567 - warp_def 2, 2, 3, 0, 552 - -NavelRock_SummitPath_2F_MapEvents:: - map_events 0x0, NavelRock_SummitPath_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/NavelRock_SummitPath_2F/header.inc b/data/maps/NavelRock_SummitPath_2F/header.inc deleted file mode 100644 index 9ae52b8ca..000000000 --- a/data/maps/NavelRock_SummitPath_2F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -NavelRock_SummitPath_2F:: @ 83503CC - .4byte NavelRock_SummitPath_2F_Layout @ 0x8349324 - .4byte NavelRock_SummitPath_2F_MapEvents @ 0x83B4988 - .4byte NavelRock_SummitPath_2F_MapScripts @ 0x81651F2 - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 347 - .byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/NavelRock_SummitPath_2F/map.json b/data/maps/NavelRock_SummitPath_2F/map.json new file mode 100644 index 000000000..ac1dfaeee --- /dev/null +++ b/data/maps/NavelRock_SummitPath_2F/map.json @@ -0,0 +1,34 @@ +{ + "id": "MAP_NAVEL_ROCK_SUMMIT_PATH_2F", + "name": "NavelRock_SummitPath_2F", + "layout": "LAYOUT_NAVEL_ROCK_SUMMIT_PATH_2F", + "music": "BGM_FRLG_MT_EMBER", + "region_map_section": "MAPSEC_NAVEL_ROCK", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 0, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 4, + "y": 4, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_FORK", + "dest_warp_id": 1 + }, + { + "x": 2, + "y": 2, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_SUMMIT_PATH_3F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/NavelRock_SummitPath_3F/events.inc b/data/maps/NavelRock_SummitPath_3F/events.inc deleted file mode 100644 index 7af26c9fa..000000000 --- a/data/maps/NavelRock_SummitPath_3F/events.inc +++ /dev/null @@ -1,6 +0,0 @@ -NavelRock_SummitPath_3F_MapWarps: - warp_def 2, 2, 3, 1, 551 - warp_def 4, 4, 3, 0, 553 - -NavelRock_SummitPath_3F_MapEvents:: - map_events 0x0, NavelRock_SummitPath_3F_MapWarps, 0x0, 0x0 diff --git a/data/maps/NavelRock_SummitPath_3F/header.inc b/data/maps/NavelRock_SummitPath_3F/header.inc deleted file mode 100644 index 2eb984a8a..000000000 --- a/data/maps/NavelRock_SummitPath_3F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -NavelRock_SummitPath_3F:: @ 83503E8 - .4byte NavelRock_SummitPath_3F_Layout @ 0x83493AC - .4byte NavelRock_SummitPath_3F_MapEvents @ 0x83B49AC - .4byte NavelRock_SummitPath_3F_MapScripts @ 0x81651F3 - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 348 - .byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/NavelRock_SummitPath_3F/map.json b/data/maps/NavelRock_SummitPath_3F/map.json new file mode 100644 index 000000000..5964d839a --- /dev/null +++ b/data/maps/NavelRock_SummitPath_3F/map.json @@ -0,0 +1,34 @@ +{ + "id": "MAP_NAVEL_ROCK_SUMMIT_PATH_3F", + "name": "NavelRock_SummitPath_3F", + "layout": "LAYOUT_NAVEL_ROCK_SUMMIT_PATH_3F", + "music": "BGM_FRLG_MT_EMBER", + "region_map_section": "MAPSEC_NAVEL_ROCK", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 0, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 2, + "y": 2, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_SUMMIT_PATH_2F", + "dest_warp_id": 1 + }, + { + "x": 4, + "y": 4, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_SUMMIT_PATH_4F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/NavelRock_SummitPath_4F/events.inc b/data/maps/NavelRock_SummitPath_4F/events.inc deleted file mode 100644 index 7ed7e09f4..000000000 --- a/data/maps/NavelRock_SummitPath_4F/events.inc +++ /dev/null @@ -1,6 +0,0 @@ -NavelRock_SummitPath_4F_MapWarps: - warp_def 4, 4, 3, 1, 552 - warp_def 2, 2, 3, 0, 554 - -NavelRock_SummitPath_4F_MapEvents:: - map_events 0x0, NavelRock_SummitPath_4F_MapWarps, 0x0, 0x0 diff --git a/data/maps/NavelRock_SummitPath_4F/header.inc b/data/maps/NavelRock_SummitPath_4F/header.inc deleted file mode 100644 index 37baa8cf6..000000000 --- a/data/maps/NavelRock_SummitPath_4F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -NavelRock_SummitPath_4F:: @ 8350404 - .4byte NavelRock_SummitPath_4F_Layout @ 0x8349434 - .4byte NavelRock_SummitPath_4F_MapEvents @ 0x83B49D0 - .4byte NavelRock_SummitPath_4F_MapScripts @ 0x81651F4 - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 349 - .byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/NavelRock_SummitPath_4F/map.json b/data/maps/NavelRock_SummitPath_4F/map.json new file mode 100644 index 000000000..525326a31 --- /dev/null +++ b/data/maps/NavelRock_SummitPath_4F/map.json @@ -0,0 +1,34 @@ +{ + "id": "MAP_NAVEL_ROCK_SUMMIT_PATH_4F", + "name": "NavelRock_SummitPath_4F", + "layout": "LAYOUT_NAVEL_ROCK_SUMMIT_PATH_4F", + "music": "BGM_FRLG_MT_EMBER", + "region_map_section": "MAPSEC_NAVEL_ROCK", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 0, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 4, + "y": 4, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_SUMMIT_PATH_3F", + "dest_warp_id": 1 + }, + { + "x": 2, + "y": 2, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_SUMMIT_PATH_5F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/NavelRock_SummitPath_5F/events.inc b/data/maps/NavelRock_SummitPath_5F/events.inc deleted file mode 100644 index 96882960f..000000000 --- a/data/maps/NavelRock_SummitPath_5F/events.inc +++ /dev/null @@ -1,6 +0,0 @@ -NavelRock_SummitPath_5F_MapWarps: - warp_def 2, 2, 3, 1, 553 - warp_def 4, 4, 3, 0, 549 - -NavelRock_SummitPath_5F_MapEvents:: - map_events 0x0, NavelRock_SummitPath_5F_MapWarps, 0x0, 0x0 diff --git a/data/maps/NavelRock_SummitPath_5F/header.inc b/data/maps/NavelRock_SummitPath_5F/header.inc deleted file mode 100644 index 88a1d0a8d..000000000 --- a/data/maps/NavelRock_SummitPath_5F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -NavelRock_SummitPath_5F:: @ 8350420 - .4byte NavelRock_SummitPath_5F_Layout @ 0x83494BC - .4byte NavelRock_SummitPath_5F_MapEvents @ 0x83B49F4 - .4byte NavelRock_SummitPath_5F_MapScripts @ 0x81651F5 - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 350 - .byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/NavelRock_SummitPath_5F/map.json b/data/maps/NavelRock_SummitPath_5F/map.json new file mode 100644 index 000000000..5aeb1faa8 --- /dev/null +++ b/data/maps/NavelRock_SummitPath_5F/map.json @@ -0,0 +1,34 @@ +{ + "id": "MAP_NAVEL_ROCK_SUMMIT_PATH_5F", + "name": "NavelRock_SummitPath_5F", + "layout": "LAYOUT_NAVEL_ROCK_SUMMIT_PATH_5F", + "music": "BGM_FRLG_MT_EMBER", + "region_map_section": "MAPSEC_NAVEL_ROCK", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 0, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 2, + "y": 2, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_SUMMIT_PATH_4F", + "dest_warp_id": 1 + }, + { + "x": 4, + "y": 4, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_SUMMIT", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/OneIsland/connections.inc b/data/maps/OneIsland/connections.inc deleted file mode 100644 index edc8a5047..000000000 --- a/data/maps/OneIsland/connections.inc +++ /dev/null @@ -1,7 +0,0 @@ -OneIsland_MapConnectionsList: @ 8352934 - connection down, 0, MAP_ONE_ISLAND_TREASUREBEACH - connection right, -120, MAP_ONE_ISLAND_KINDLEROAD - -OneIsland_MapConnections:: @ 835294C - .4byte 2 - .4byte OneIsland_MapConnectionsList diff --git a/data/maps/OneIsland/events.inc b/data/maps/OneIsland/events.inc deleted file mode 100644 index 802ec6794..000000000 --- a/data/maps/OneIsland/events.inc +++ /dev/null @@ -1,17 +0,0 @@ -OneIsland_EventObjects: - object_event 1, 73, 0, 12, 0, 16, 0, 3, 8, 17, 0, 0, 0, 0, 0, 0x0, 113, 0, 0 - object_event 2, 32, 0, 16, 0, 12, 0, 3, 2, 17, 0, 0, 0, 0, 0, OneIsland_EventScript_167517, 0, 0, 0 - object_event 3, 30, 0, 13, 0, 9, 0, 3, 13, 17, 0, 0, 0, 0, 0, OneIsland_EventScript_167549, 0, 0, 0 - -OneIsland_MapWarps: - warp_def 14, 5, 0, 0, 8192 - warp_def 19, 9, 0, 0, 8194 - warp_def 8, 11, 0, 0, 8195 - warp_def 12, 18, 3, 0, 8196 - -OneIsland_MapBGEvents: - bg_event 14, 13, 0, 0, 0, OneIsland_EventScript_167552 - bg_event 15, 6, 0, 0, 0, OneIsland_EventScript_16755B - -OneIsland_MapEvents:: - map_events OneIsland_EventObjects, OneIsland_MapWarps, 0x0, OneIsland_MapBGEvents diff --git a/data/maps/OneIsland/header.inc b/data/maps/OneIsland/header.inc deleted file mode 100644 index a2d521727..000000000 --- a/data/maps/OneIsland/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -OneIsland:: @ 8350768 - .4byte OneIsland_Layout @ 0x8321714 - .4byte OneIsland_MapEvents @ 0x83B5F44 - .4byte OneIsland_MapScripts @ 0x8167484 - .4byte OneIsland_MapConnections @ 0x835294C - .2byte BGM_FRLG_ISLAND_ONE - .2byte 230 - .byte 0x8f, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/OneIsland/map.json b/data/maps/OneIsland/map.json new file mode 100644 index 000000000..fd8c53409 --- /dev/null +++ b/data/maps/OneIsland/map.json @@ -0,0 +1,114 @@ +{ + "id": "MAP_ONE_ISLAND", + "name": "OneIsland", + "layout": "LAYOUT_ONE_ISLAND", + "music": "BGM_FRLG_ISLAND_ONE", + "region_map_section": "MAPSEC_ONE_ISLAND", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_1", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_ONE_ISLAND_TREASURE_BEACH", + "offset": 0, + "direction": "down" + }, + { + "map": "MAP_ONE_ISLAND_KINDLE_ROAD", + "offset": -120, + "direction": "right" + } + ], + "object_events": [ + { + "graphics_id": "73", + "x": 12, + "y": 16, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "113" + }, + { + "graphics_id": "32", + "x": 16, + "y": 12, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OneIsland_EventScript_167517", + "flag": "0" + }, + { + "graphics_id": "30", + "x": 13, + "y": 9, + "elevation": 3, + "movement_type": "13", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OneIsland_EventScript_167549", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 14, + "y": 5, + "elevation": 0, + "dest_map": "MAP_ONE_ISLAND_POKEMON_CENTER_1F", + "dest_warp_id": 0 + }, + { + "x": 19, + "y": 9, + "elevation": 0, + "dest_map": "MAP_ONE_ISLAND_HOUSE1", + "dest_warp_id": 0 + }, + { + "x": 8, + "y": 11, + "elevation": 0, + "dest_map": "MAP_ONE_ISLAND_HOUSE2", + "dest_warp_id": 0 + }, + { + "x": 12, + "y": 18, + "elevation": 3, + "dest_map": "MAP_ONE_ISLAND_HARBOR", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 14, + "y": 13, + "elevation": 0, + "script": "OneIsland_EventScript_167552" + }, + { + "type": "bg_event_type_0", + "x": 15, + "y": 6, + "elevation": 0, + "script": "OneIsland_EventScript_16755B" + } + ] +}
\ No newline at end of file diff --git a/data/maps/OneIsland/scripts.inc b/data/maps/OneIsland/scripts.inc index 2735d7481..70ab4ff03 100644 --- a/data/maps/OneIsland/scripts.inc +++ b/data/maps/OneIsland/scripts.inc @@ -31,7 +31,7 @@ EventScript_16749D:: @ 816749D waitdooranim removeobject 1 setvar VAR_0x4075, 3 - warp MAP_ONE_ISLAND_POKEMONCENTER_1F, 255, 9, 9 + warp MAP_ONE_ISLAND_POKEMON_CENTER_1F, 255, 9, 9 waitstate releaseall end diff --git a/data/maps/OneIsland_Harbor/events.inc b/data/maps/OneIsland_Harbor/events.inc deleted file mode 100644 index 18ac28587..000000000 --- a/data/maps/OneIsland_Harbor/events.inc +++ /dev/null @@ -1,9 +0,0 @@ -OneIsland_Harbor_EventObjects: - object_event 1, 108, 0, 8, 0, 9, 0, 0, 8, 17, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 - object_event 2, 62, 0, 8, 0, 6, 0, 3, 7, 17, 0, 0, 0, 0, 0, OneIsland_Harbor_EventScript_1713BD, 0, 0, 0 - -OneIsland_Harbor_MapWarps: - warp_def 8, 2, 3, 3, 780 - -OneIsland_Harbor_MapEvents:: - map_events OneIsland_Harbor_EventObjects, OneIsland_Harbor_MapWarps, 0x0, 0x0 diff --git a/data/maps/OneIsland_Harbor/header.inc b/data/maps/OneIsland_Harbor/header.inc deleted file mode 100644 index d98fcca3a..000000000 --- a/data/maps/OneIsland_Harbor/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -OneIsland_Harbor:: @ 8351BDC - .4byte Island_Harbor_Layout @ 0x8343FB8 - .4byte OneIsland_Harbor_MapEvents @ 0x83BE558 - .4byte OneIsland_Harbor_MapScripts @ 0x8171378 - .4byte NULL - .2byte BGM_FRLG_ISLAND_ONE - .2byte 315 - .byte 0x8f, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/OneIsland_Harbor/map.json b/data/maps/OneIsland_Harbor/map.json new file mode 100644 index 000000000..3bf9f7876 --- /dev/null +++ b/data/maps/OneIsland_Harbor/map.json @@ -0,0 +1,54 @@ +{ + "id": "MAP_ONE_ISLAND_HARBOR", + "name": "OneIsland_Harbor", + "layout": "LAYOUT_ISLAND_HARBOR", + "music": "BGM_FRLG_ISLAND_ONE", + "region_map_section": "MAPSEC_ONE_ISLAND", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "108", + "x": 8, + "y": 9, + "elevation": 0, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "62", + "x": 8, + "y": 6, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OneIsland_Harbor_EventScript_1713BD", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 8, + "y": 2, + "elevation": 3, + "dest_map": "MAP_ONE_ISLAND", + "dest_warp_id": 3 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/OneIsland_House1/events.inc b/data/maps/OneIsland_House1/events.inc deleted file mode 100644 index 070680038..000000000 --- a/data/maps/OneIsland_House1/events.inc +++ /dev/null @@ -1,9 +0,0 @@ -OneIsland_House1_EventObjects: - object_event 1, 32, 0, 4, 0, 5, 0, 3, 10, 17, 0, 0, 0, 0, 0, OneIsland_House1_EventScript_17135C, 0, 0, 0 - object_event 2, 35, 0, 7, 0, 5, 0, 3, 9, 17, 0, 0, 0, 0, 0, OneIsland_House1_EventScript_171365, 0, 0, 0 - -OneIsland_House1_MapWarps: - warp_def 4, 7, 3, 1, 780 - -OneIsland_House1_MapEvents:: - map_events OneIsland_House1_EventObjects, OneIsland_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/OneIsland_House1/header.inc b/data/maps/OneIsland_House1/header.inc deleted file mode 100644 index 7d60ff6d5..000000000 --- a/data/maps/OneIsland_House1/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -OneIsland_House1:: @ 8351BA4 - .4byte House3_Layout @ 0x82D5CB8 - .4byte OneIsland_House1_MapEvents @ 0x83BE4D8 - .4byte OneIsland_House1_MapScripts @ 0x817135B - .4byte NULL - .2byte BGM_FRLG_ISLAND_ONE - .2byte 11 - .byte 0x8f, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/OneIsland_House1/map.json b/data/maps/OneIsland_House1/map.json new file mode 100644 index 000000000..dd815fcd5 --- /dev/null +++ b/data/maps/OneIsland_House1/map.json @@ -0,0 +1,54 @@ +{ + "id": "MAP_ONE_ISLAND_HOUSE1", + "name": "OneIsland_House1", + "layout": "LAYOUT_HOUSE3", + "music": "BGM_FRLG_ISLAND_ONE", + "region_map_section": "MAPSEC_ONE_ISLAND", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "32", + "x": 4, + "y": 5, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OneIsland_House1_EventScript_17135C", + "flag": "0" + }, + { + "graphics_id": "35", + "x": 7, + "y": 5, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OneIsland_House1_EventScript_171365", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_ONE_ISLAND", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/OneIsland_House2/events.inc b/data/maps/OneIsland_House2/events.inc deleted file mode 100644 index 948e63339..000000000 --- a/data/maps/OneIsland_House2/events.inc +++ /dev/null @@ -1,8 +0,0 @@ -OneIsland_House2_EventObjects: - object_event 1, 22, 0, 9, 0, 4, 0, 3, 1, 17, 0, 0, 0, 0, 0, OneIsland_House2_EventScript_17136F, 0, 0, 0 - -OneIsland_House2_MapWarps: - warp_def 4, 7, 3, 2, 780 - -OneIsland_House2_MapEvents:: - map_events OneIsland_House2_EventObjects, OneIsland_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/OneIsland_House2/header.inc b/data/maps/OneIsland_House2/header.inc deleted file mode 100644 index 0048e308d..000000000 --- a/data/maps/OneIsland_House2/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -OneIsland_House2:: @ 8351BC0 - .4byte House3_Layout @ 0x82D5CB8 - .4byte OneIsland_House2_MapEvents @ 0x83BE50C - .4byte OneIsland_House2_MapScripts @ 0x817136E - .4byte NULL - .2byte BGM_FRLG_ISLAND_ONE - .2byte 11 - .byte 0x8f, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/OneIsland_House2/map.json b/data/maps/OneIsland_House2/map.json new file mode 100644 index 000000000..0013b0de3 --- /dev/null +++ b/data/maps/OneIsland_House2/map.json @@ -0,0 +1,41 @@ +{ + "id": "MAP_ONE_ISLAND_HOUSE2", + "name": "OneIsland_House2", + "layout": "LAYOUT_HOUSE3", + "music": "BGM_FRLG_ISLAND_ONE", + "region_map_section": "MAPSEC_ONE_ISLAND", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "22", + "x": 9, + "y": 4, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OneIsland_House2_EventScript_17136F", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_ONE_ISLAND", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/OneIsland_KindleRoad/connections.inc b/data/maps/OneIsland_KindleRoad/connections.inc deleted file mode 100644 index c4f7e4073..000000000 --- a/data/maps/OneIsland_KindleRoad/connections.inc +++ /dev/null @@ -1,6 +0,0 @@ -OneIsland_KindleRoad_MapConnectionsList: @ 8352D1C - connection left, 120, MAP_ONE_ISLAND - -OneIsland_KindleRoad_MapConnections:: @ 8352D28 - .4byte 1 - .4byte OneIsland_KindleRoad_MapConnectionsList diff --git a/data/maps/OneIsland_KindleRoad/events.inc b/data/maps/OneIsland_KindleRoad/events.inc deleted file mode 100644 index e2f7aabea..000000000 --- a/data/maps/OneIsland_KindleRoad/events.inc +++ /dev/null @@ -1,42 +0,0 @@ -OneIsland_KindleRoad_EventObjects: - object_event 1, 44, 0, 11, 0, 32, 0, 1, 14, 17, 0, 1, 0, 4, 0, OneIsland_KindleRoad_EventScript_1ABBF1, 0, 0, 0 - object_event 2, 46, 0, 17, 0, 132, 0, 3, 8, 17, 0, 1, 0, 2, 0, OneIsland_KindleRoad_EventScript_1ABC2F, 0, 0, 0 - object_event 3, 43, 0, 7, 0, 39, 0, 1, 52, 54, 0, 1, 0, 1, 0, OneIsland_KindleRoad_EventScript_1ABC6D, 0, 0, 0 - object_event 4, 45, 0, 19, 0, 79, 0, 3, 8, 17, 0, 1, 0, 1, 0, OneIsland_KindleRoad_EventScript_1ABCAB, 0, 0, 0 - object_event 5, 57, 0, 15, 0, 25, 0, 3, 9, 17, 0, 1, 0, 0, 0, OneIsland_KindleRoad_EventScript_1ABCE9, 0, 0, 0 - object_event 6, 24, 0, 9, 0, 53, 0, 3, 26, 113, 0, 1, 0, 1, 0, OneIsland_KindleRoad_EventScript_1ABD27, 0, 0, 0 - object_event 7, 24, 0, 18, 0, 105, 0, 4, 50, 65, 0, 1, 0, 1, 0, OneIsland_KindleRoad_EventScript_1ABD65, 0, 0, 0 - object_event 8, 54, 0, 16, 0, 64, 0, 3, 27, 18, 0, 1, 0, 1, 0, OneIsland_KindleRoad_EventScript_1ABDA3, 0, 0, 0 - object_event 9, 54, 0, 11, 0, 64, 0, 3, 28, 18, 0, 1, 0, 1, 0, OneIsland_KindleRoad_EventScript_1ABDE1, 0, 0, 0 - object_event 10, 39, 0, 11, 0, 89, 0, 3, 14, 17, 0, 1, 0, 3, 0, OneIsland_KindleRoad_EventScript_1ABE1F, 0, 0, 0 - object_event 11, 40, 0, 9, 0, 108, 0, 3, 1, 17, 0, 1, 0, 1, 0, OneIsland_KindleRoad_EventScript_1ABE5D, 0, 0, 0 - object_event 12, 54, 0, 8, 0, 68, 0, 3, 8, 17, 0, 1, 0, 1, 0, OneIsland_KindleRoad_EventScript_1ABEE1, 0, 0, 0 - object_event 13, 24, 0, 9, 0, 68, 0, 3, 8, 17, 0, 1, 0, 1, 0, OneIsland_KindleRoad_EventScript_1ABE9B, 0, 0, 0 - object_event 14, 96, 0, 8, 0, 104, 0, 3, 1, 17, 0, 0, 0, 0, 0, OneIsland_KindleRoad_EventScript_1BE00C, 19, 0, 0 - object_event 15, 96, 0, 11, 0, 95, 0, 3, 1, 17, 0, 0, 0, 0, 0, OneIsland_KindleRoad_EventScript_1BE00C, 21, 0, 0 - object_event 16, 96, 0, 12, 0, 96, 0, 3, 1, 17, 0, 0, 0, 0, 0, OneIsland_KindleRoad_EventScript_1BE00C, 22, 0, 0 - object_event 17, 96, 0, 10, 0, 95, 0, 3, 1, 17, 0, 0, 0, 0, 0, OneIsland_KindleRoad_EventScript_1BE00C, 23, 0, 0 - object_event 18, 96, 0, 9, 0, 105, 0, 3, 1, 17, 0, 0, 0, 0, 0, OneIsland_KindleRoad_EventScript_1BE00C, 24, 0, 0 - object_event 19, 96, 0, 15, 0, 75, 0, 3, 1, 17, 0, 0, 0, 0, 0, OneIsland_KindleRoad_EventScript_1BE00C, 25, 0, 0 - object_event 20, 96, 0, 9, 0, 84, 0, 3, 1, 17, 0, 0, 0, 0, 0, OneIsland_KindleRoad_EventScript_1BE00C, 26, 0, 0 - object_event 21, 96, 0, 15, 0, 74, 0, 3, 1, 17, 0, 0, 0, 0, 0, OneIsland_KindleRoad_EventScript_1BE00C, 27, 0, 0 - object_event 22, 96, 0, 15, 0, 73, 0, 3, 1, 17, 0, 0, 0, 0, 0, OneIsland_KindleRoad_EventScript_1BE00C, 28, 0, 0 - object_event 23, 96, 0, 18, 0, 111, 0, 4, 1, 17, 0, 0, 0, 0, 0, OneIsland_KindleRoad_EventScript_1BE00C, 29, 0, 0 - object_event 24, 96, 0, 10, 0, 86, 0, 3, 1, 17, 0, 0, 0, 0, 0, OneIsland_KindleRoad_EventScript_1BE00C, 30, 0, 0 - object_event 25, 96, 0, 9, 0, 110, 0, 3, 1, 17, 0, 0, 0, 0, 0, OneIsland_KindleRoad_EventScript_1BE00C, 31, 0, 0 - object_event 26, 96, 0, 18, 0, 112, 0, 4, 1, 17, 0, 0, 0, 0, 0, OneIsland_KindleRoad_EventScript_1BE00C, 17, 0, 0 - object_event 27, 92, 0, 15, 0, 70, 0, 3, 8, 17, 0, 0, 0, 0, 0, OneIsland_KindleRoad_EventScript_1BEC42, 475, 0, 0 - object_event 28, 92, 0, 17, 0, 103, 0, 3, 8, 17, 0, 0, 0, 0, 0, OneIsland_KindleRoad_EventScript_1BEC4F, 476, 0, 0 - object_event 29, 92, 0, 18, 0, 114, 0, 4, 8, 17, 0, 0, 0, 0, 0, OneIsland_KindleRoad_EventScript_1BEC5C, 477, 0, 0 - -OneIsland_KindleRoad_MapWarps: - warp_def 11, 6, 3, 0, 353 - warp_def 12, 6, 3, 1, 353 - warp_def 15, 58, 3, 0, 569 - -OneIsland_KindleRoad_MapBGEvents: - bg_event 13, 59, 0, 0, 0, OneIsland_KindleRoad_EventScript_168762 - bg_event 8, 115, 0, 0, 0, OneIsland_KindleRoad_EventScript_168759 - -OneIsland_KindleRoad_MapEvents:: - map_events OneIsland_KindleRoad_EventObjects, OneIsland_KindleRoad_MapWarps, 0x0, OneIsland_KindleRoad_MapBGEvents diff --git a/data/maps/OneIsland_KindleRoad/header.inc b/data/maps/OneIsland_KindleRoad/header.inc deleted file mode 100644 index 1c540ae87..000000000 --- a/data/maps/OneIsland_KindleRoad/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -OneIsland_KindleRoad:: @ 8350B04 - .4byte OneIsland_KindleRoad_Layout @ 0x8325D70 - .4byte OneIsland_KindleRoad_MapEvents @ 0x83B888C - .4byte OneIsland_KindleRoad_MapScripts @ 0x8168758 - .4byte OneIsland_KindleRoad_MapConnections @ 0x8352D28 - .2byte BGM_FRLG_ROUTE_3 - .2byte 237 - .byte 0x96, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/OneIsland_KindleRoad/map.json b/data/maps/OneIsland_KindleRoad/map.json new file mode 100644 index 000000000..375dabd15 --- /dev/null +++ b/data/maps/OneIsland_KindleRoad/map.json @@ -0,0 +1,440 @@ +{ + "id": "MAP_ONE_ISLAND_KINDLE_ROAD", + "name": "OneIsland_KindleRoad", + "layout": "LAYOUT_ONE_ISLAND_KINDLE_ROAD", + "music": "BGM_FRLG_ROUTE_3", + "region_map_section": "MAPSEC_KINDLE_ROAD", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_3", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_ONE_ISLAND", + "offset": 120, + "direction": "left" + } + ], + "object_events": [ + { + "graphics_id": "44", + "x": 11, + "y": 32, + "elevation": 1, + "movement_type": "14", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "OneIsland_KindleRoad_EventScript_1ABBF1", + "flag": "0" + }, + { + "graphics_id": "46", + "x": 17, + "y": 132, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "OneIsland_KindleRoad_EventScript_1ABC2F", + "flag": "0" + }, + { + "graphics_id": "43", + "x": 7, + "y": 39, + "elevation": 1, + "movement_type": "52", + "movement_range_x": 6, + "movement_range_y": 3, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "OneIsland_KindleRoad_EventScript_1ABC6D", + "flag": "0" + }, + { + "graphics_id": "45", + "x": 19, + "y": 79, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "OneIsland_KindleRoad_EventScript_1ABCAB", + "flag": "0" + }, + { + "graphics_id": "57", + "x": 15, + "y": 25, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 0, + "script": "OneIsland_KindleRoad_EventScript_1ABCE9", + "flag": "0" + }, + { + "graphics_id": "24", + "x": 9, + "y": 53, + "elevation": 3, + "movement_type": "26", + "movement_range_x": 1, + "movement_range_y": 7, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "OneIsland_KindleRoad_EventScript_1ABD27", + "flag": "0" + }, + { + "graphics_id": "24", + "x": 18, + "y": 105, + "elevation": 4, + "movement_type": "50", + "movement_range_x": 1, + "movement_range_y": 4, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "OneIsland_KindleRoad_EventScript_1ABD65", + "flag": "0" + }, + { + "graphics_id": "54", + "x": 16, + "y": 64, + "elevation": 3, + "movement_type": "27", + "movement_range_x": 2, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "OneIsland_KindleRoad_EventScript_1ABDA3", + "flag": "0" + }, + { + "graphics_id": "54", + "x": 11, + "y": 64, + "elevation": 3, + "movement_type": "28", + "movement_range_x": 2, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "OneIsland_KindleRoad_EventScript_1ABDE1", + "flag": "0" + }, + { + "graphics_id": "39", + "x": 11, + "y": 89, + "elevation": 3, + "movement_type": "14", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "OneIsland_KindleRoad_EventScript_1ABE1F", + "flag": "0" + }, + { + "graphics_id": "40", + "x": 9, + "y": 108, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "OneIsland_KindleRoad_EventScript_1ABE5D", + "flag": "0" + }, + { + "graphics_id": "54", + "x": 8, + "y": 68, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "OneIsland_KindleRoad_EventScript_1ABEE1", + "flag": "0" + }, + { + "graphics_id": "24", + "x": 9, + "y": 68, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "OneIsland_KindleRoad_EventScript_1ABE9B", + "flag": "0" + }, + { + "graphics_id": "96", + "x": 8, + "y": 104, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OneIsland_KindleRoad_EventScript_1BE00C", + "flag": "19" + }, + { + "graphics_id": "96", + "x": 11, + "y": 95, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OneIsland_KindleRoad_EventScript_1BE00C", + "flag": "21" + }, + { + "graphics_id": "96", + "x": 12, + "y": 96, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OneIsland_KindleRoad_EventScript_1BE00C", + "flag": "22" + }, + { + "graphics_id": "96", + "x": 10, + "y": 95, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OneIsland_KindleRoad_EventScript_1BE00C", + "flag": "23" + }, + { + "graphics_id": "96", + "x": 9, + "y": 105, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OneIsland_KindleRoad_EventScript_1BE00C", + "flag": "24" + }, + { + "graphics_id": "96", + "x": 15, + "y": 75, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OneIsland_KindleRoad_EventScript_1BE00C", + "flag": "25" + }, + { + "graphics_id": "96", + "x": 9, + "y": 84, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OneIsland_KindleRoad_EventScript_1BE00C", + "flag": "26" + }, + { + "graphics_id": "96", + "x": 15, + "y": 74, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OneIsland_KindleRoad_EventScript_1BE00C", + "flag": "27" + }, + { + "graphics_id": "96", + "x": 15, + "y": 73, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OneIsland_KindleRoad_EventScript_1BE00C", + "flag": "28" + }, + { + "graphics_id": "96", + "x": 18, + "y": 111, + "elevation": 4, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OneIsland_KindleRoad_EventScript_1BE00C", + "flag": "29" + }, + { + "graphics_id": "96", + "x": 10, + "y": 86, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OneIsland_KindleRoad_EventScript_1BE00C", + "flag": "30" + }, + { + "graphics_id": "96", + "x": 9, + "y": 110, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OneIsland_KindleRoad_EventScript_1BE00C", + "flag": "31" + }, + { + "graphics_id": "96", + "x": 18, + "y": 112, + "elevation": 4, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OneIsland_KindleRoad_EventScript_1BE00C", + "flag": "17" + }, + { + "graphics_id": "92", + "x": 15, + "y": 70, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OneIsland_KindleRoad_EventScript_1BEC42", + "flag": "475" + }, + { + "graphics_id": "92", + "x": 17, + "y": 103, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OneIsland_KindleRoad_EventScript_1BEC4F", + "flag": "476" + }, + { + "graphics_id": "92", + "x": 18, + "y": 114, + "elevation": 4, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OneIsland_KindleRoad_EventScript_1BEC5C", + "flag": "477" + } + ], + "warp_events": [ + { + "x": 11, + "y": 6, + "elevation": 3, + "dest_map": "MAP_MT_EMBER_EXTERIOR", + "dest_warp_id": 0 + }, + { + "x": 12, + "y": 6, + "elevation": 3, + "dest_map": "MAP_MT_EMBER_EXTERIOR", + "dest_warp_id": 1 + }, + { + "x": 15, + "y": 58, + "elevation": 3, + "dest_map": "MAP_ONE_ISLAND_KINDLE_ROAD_EMBER_SPA", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 13, + "y": 59, + "elevation": 0, + "script": "OneIsland_KindleRoad_EventScript_168762" + }, + { + "type": "bg_event_type_0", + "x": 8, + "y": 115, + "elevation": 0, + "script": "OneIsland_KindleRoad_EventScript_168759" + } + ] +}
\ No newline at end of file diff --git a/data/maps/OneIsland_KindleRoad_EmberSpa/events.inc b/data/maps/OneIsland_KindleRoad_EmberSpa/events.inc deleted file mode 100644 index 14906a2a9..000000000 --- a/data/maps/OneIsland_KindleRoad_EmberSpa/events.inc +++ /dev/null @@ -1,16 +0,0 @@ -OneIsland_KindleRoad_EmberSpa_EventObjects: - object_event 1, 32, 0, 11, 0, 13, 0, 3, 8, 17, 0, 0, 0, 0, 0, OneIsland_KindleRoad_EmberSpa_EventScript_16535C, 0, 0, 0 - object_event 2, 30, 0, 15, 0, 11, 0, 3, 18, 17, 0, 0, 0, 0, 0, OneIsland_KindleRoad_EmberSpa_EventScript_165365, 0, 0, 0 - object_event 3, 54, 0, 6, 0, 8, 0, 3, 5, 18, 0, 0, 0, 0, 0, OneIsland_KindleRoad_EmberSpa_EventScript_165380, 157, 0, 0 - object_event 4, 35, 0, 20, 0, 7, 0, 3, 8, 17, 0, 0, 0, 0, 0, OneIsland_KindleRoad_EmberSpa_EventScript_165377, 0, 0, 0 - object_event 5, 32, 0, 10, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, OneIsland_KindleRoad_EmberSpa_EventScript_165399, 0, 0, 0 - object_event 6, 30, 0, 11, 0, 20, 0, 3, 5, 17, 0, 0, 0, 0, 0, OneIsland_KindleRoad_EmberSpa_EventScript_16536E, 0, 0, 0 - -OneIsland_KindleRoad_EmberSpa_MapWarps: - warp_def 13, 36, 3, 2, 813 - -OneIsland_KindleRoad_EmberSpa_MapCoordEvents: - coord_event 13, 13, 3, 0, 16385, 0, 0, OneIsland_KindleRoad_EmberSpa_EventScript_1653CF - -OneIsland_KindleRoad_EmberSpa_MapEvents:: - map_events OneIsland_KindleRoad_EmberSpa_EventObjects, OneIsland_KindleRoad_EmberSpa_MapWarps, OneIsland_KindleRoad_EmberSpa_MapCoordEvents, 0x0 diff --git a/data/maps/OneIsland_KindleRoad_EmberSpa/header.inc b/data/maps/OneIsland_KindleRoad_EmberSpa/header.inc deleted file mode 100644 index ca4afdec0..000000000 --- a/data/maps/OneIsland_KindleRoad_EmberSpa/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -OneIsland_KindleRoad_EmberSpa:: @ 83505C4 - .4byte OneIsland_KindleRoad_EmberSpa_Layout @ 0x834EB70 - .4byte OneIsland_KindleRoad_EmberSpa_MapEvents @ 0x83B4CD8 - .4byte OneIsland_KindleRoad_EmberSpa_MapScripts @ 0x816535B - .4byte NULL - .2byte BGM_FRLG_CERULEAN_CITY - .2byte 383 - .byte 0xc3, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/OneIsland_KindleRoad_EmberSpa/map.json b/data/maps/OneIsland_KindleRoad_EmberSpa/map.json new file mode 100644 index 000000000..3045795db --- /dev/null +++ b/data/maps/OneIsland_KindleRoad_EmberSpa/map.json @@ -0,0 +1,116 @@ +{ + "id": "MAP_ONE_ISLAND_KINDLE_ROAD_EMBER_SPA", + "name": "OneIsland_KindleRoad_EmberSpa", + "layout": "LAYOUT_ONE_ISLAND_KINDLE_ROAD_EMBER_SPA", + "music": "BGM_FRLG_CERULEAN_CITY", + "region_map_section": "MAPSEC_EMBER_SPA", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 0, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "32", + "x": 11, + "y": 13, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OneIsland_KindleRoad_EmberSpa_EventScript_16535C", + "flag": "0" + }, + { + "graphics_id": "30", + "x": 15, + "y": 11, + "elevation": 3, + "movement_type": "18", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OneIsland_KindleRoad_EmberSpa_EventScript_165365", + "flag": "0" + }, + { + "graphics_id": "54", + "x": 6, + "y": 8, + "elevation": 3, + "movement_type": "5", + "movement_range_x": 2, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OneIsland_KindleRoad_EmberSpa_EventScript_165380", + "flag": "157" + }, + { + "graphics_id": "35", + "x": 20, + "y": 7, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OneIsland_KindleRoad_EmberSpa_EventScript_165377", + "flag": "0" + }, + { + "graphics_id": "32", + "x": 10, + "y": 5, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OneIsland_KindleRoad_EmberSpa_EventScript_165399", + "flag": "0" + }, + { + "graphics_id": "30", + "x": 11, + "y": 20, + "elevation": 3, + "movement_type": "5", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OneIsland_KindleRoad_EmberSpa_EventScript_16536E", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 13, + "y": 36, + "elevation": 3, + "dest_map": "MAP_ONE_ISLAND_KINDLE_ROAD", + "dest_warp_id": 2 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 13, + "y": 13, + "elevation": 3, + "var": "VAR_0x4001", + "var_value": 0, + "script": "OneIsland_KindleRoad_EmberSpa_EventScript_1653CF" + } + ], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/OneIsland_PokemonCenter_1F/events.inc b/data/maps/OneIsland_PokemonCenter_1F/events.inc deleted file mode 100644 index b82526e6f..000000000 --- a/data/maps/OneIsland_PokemonCenter_1F/events.inc +++ /dev/null @@ -1,31 +0,0 @@ -OneIsland_PokemonCenter_1F_EventObjects: - object_event 1, 64, 0, 5, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, OneIsland_PokemonCenter_1F_EventScript_170E94, 0, 0, 0 - object_event 2, 73, 0, 14, 0, 6, 0, 3, 7, 17, 0, 0, 0, 0, 0, OneIsland_PokemonCenter_1F_EventScript_170E9D, 114, 0, 0 - object_event 3, 89, 0, 15, 0, 6, 0, 3, 7, 17, 0, 0, 0, 0, 0, OneIsland_PokemonCenter_1F_EventScript_170EC5, 115, 0, 0 - object_event 4, 16, 0, 6, 0, 8, 0, 3, 2, 17, 0, 0, 0, 0, 0, OneIsland_PokemonCenter_1F_EventScript_171148, 0, 0, 0 - object_event 5, 56, 0, 3, 0, 7, 0, 3, 8, 17, 0, 0, 0, 0, 0, OneIsland_PokemonCenter_1F_EventScript_171151, 0, 0, 0 - object_event 6, 24, 0, 7, 0, 4, 0, 3, 10, 17, 0, 0, 0, 0, 0, OneIsland_PokemonCenter_1F_EventScript_17115A, 0, 0, 0 - -OneIsland_PokemonCenter_1F_MapWarps: - warp_def 9, 9, 3, 0, 780 - warp_def 1, 5, 4, 0, 8193 - -OneIsland_PokemonCenter_1F_MapCoordEvents: - coord_event 12, 6, 3, 0, 16502, 2, 0, OneIsland_PokemonCenter_1F_EventScript_1711AA - coord_event 12, 7, 3, 0, 16502, 2, 0, OneIsland_PokemonCenter_1F_EventScript_1711B6 - coord_event 12, 8, 3, 0, 16502, 2, 0, OneIsland_PokemonCenter_1F_EventScript_1711C2 - coord_event 12, 9, 3, 0, 16502, 2, 0, OneIsland_PokemonCenter_1F_EventScript_1711CE - -OneIsland_PokemonCenter_1F_MapBGEvents: - bg_event 12, 2, 0, 0, 0, OneIsland_PokemonCenter_1F_EventScript_171179 - bg_event 12, 3, 0, 0, 0, OneIsland_PokemonCenter_1F_EventScript_171179 - bg_event 12, 4, 0, 0, 0, OneIsland_PokemonCenter_1F_EventScript_171179 - bg_event 12, 5, 0, 0, 0, OneIsland_PokemonCenter_1F_EventScript_171179 - bg_event 13, 5, 0, 0, 0, OneIsland_PokemonCenter_1F_EventScript_171179 - bg_event 15, 5, 0, 0, 0, OneIsland_PokemonCenter_1F_EventScript_171179 - bg_event 14, 5, 0, 0, 0, OneIsland_PokemonCenter_1F_EventScript_171179 - bg_event 16, 5, 0, 0, 0, OneIsland_PokemonCenter_1F_EventScript_171179 - bg_event 17, 5, 0, 0, 0, OneIsland_PokemonCenter_1F_EventScript_171179 - -OneIsland_PokemonCenter_1F_MapEvents:: - map_events OneIsland_PokemonCenter_1F_EventObjects, OneIsland_PokemonCenter_1F_MapWarps, OneIsland_PokemonCenter_1F_MapCoordEvents, OneIsland_PokemonCenter_1F_MapBGEvents diff --git a/data/maps/OneIsland_PokemonCenter_1F/header.inc b/data/maps/OneIsland_PokemonCenter_1F/header.inc deleted file mode 100644 index 815f1fc82..000000000 --- a/data/maps/OneIsland_PokemonCenter_1F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -OneIsland_PokemonCenter_1F:: @ 8351B6C - .4byte OneIsland_PokemonCenter_1F_Layout @ 0x833A970 - .4byte OneIsland_PokemonCenter_1F_MapEvents @ 0x83BE400 - .4byte OneIsland_PokemonCenter_1F_MapScripts @ 0x8170BF8 - .4byte NULL - .2byte BGM_FRLG_POKEMON_NETWORK_CENTER - .2byte 271 - .byte 0x8f, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/OneIsland_PokemonCenter_1F/map.json b/data/maps/OneIsland_PokemonCenter_1F/map.json new file mode 100644 index 000000000..ec515417d --- /dev/null +++ b/data/maps/OneIsland_PokemonCenter_1F/map.json @@ -0,0 +1,214 @@ +{ + "id": "MAP_ONE_ISLAND_POKEMON_CENTER_1F", + "name": "OneIsland_PokemonCenter_1F", + "layout": "LAYOUT_ONE_ISLAND_POKEMON_CENTER_1F", + "music": "BGM_FRLG_POKEMON_NETWORK_CENTER", + "region_map_section": "MAPSEC_ONE_ISLAND", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "64", + "x": 5, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OneIsland_PokemonCenter_1F_EventScript_170E94", + "flag": "0" + }, + { + "graphics_id": "73", + "x": 14, + "y": 6, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OneIsland_PokemonCenter_1F_EventScript_170E9D", + "flag": "114" + }, + { + "graphics_id": "89", + "x": 15, + "y": 6, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OneIsland_PokemonCenter_1F_EventScript_170EC5", + "flag": "115" + }, + { + "graphics_id": "16", + "x": 6, + "y": 8, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OneIsland_PokemonCenter_1F_EventScript_171148", + "flag": "0" + }, + { + "graphics_id": "56", + "x": 3, + "y": 7, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OneIsland_PokemonCenter_1F_EventScript_171151", + "flag": "0" + }, + { + "graphics_id": "24", + "x": 7, + "y": 4, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OneIsland_PokemonCenter_1F_EventScript_17115A", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 9, + "y": 9, + "elevation": 3, + "dest_map": "MAP_ONE_ISLAND", + "dest_warp_id": 0 + }, + { + "x": 1, + "y": 5, + "elevation": 4, + "dest_map": "MAP_ONE_ISLAND_POKEMON_CENTER_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 12, + "y": 6, + "elevation": 3, + "var": "VAR_0x4076", + "var_value": 2, + "script": "OneIsland_PokemonCenter_1F_EventScript_1711AA" + }, + { + "type": "trigger", + "x": 12, + "y": 7, + "elevation": 3, + "var": "VAR_0x4076", + "var_value": 2, + "script": "OneIsland_PokemonCenter_1F_EventScript_1711B6" + }, + { + "type": "trigger", + "x": 12, + "y": 8, + "elevation": 3, + "var": "VAR_0x4076", + "var_value": 2, + "script": "OneIsland_PokemonCenter_1F_EventScript_1711C2" + }, + { + "type": "trigger", + "x": 12, + "y": 9, + "elevation": 3, + "var": "VAR_0x4076", + "var_value": 2, + "script": "OneIsland_PokemonCenter_1F_EventScript_1711CE" + } + ], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 12, + "y": 2, + "elevation": 0, + "script": "OneIsland_PokemonCenter_1F_EventScript_171179" + }, + { + "type": "bg_event_type_0", + "x": 12, + "y": 3, + "elevation": 0, + "script": "OneIsland_PokemonCenter_1F_EventScript_171179" + }, + { + "type": "bg_event_type_0", + "x": 12, + "y": 4, + "elevation": 0, + "script": "OneIsland_PokemonCenter_1F_EventScript_171179" + }, + { + "type": "bg_event_type_0", + "x": 12, + "y": 5, + "elevation": 0, + "script": "OneIsland_PokemonCenter_1F_EventScript_171179" + }, + { + "type": "bg_event_type_0", + "x": 13, + "y": 5, + "elevation": 0, + "script": "OneIsland_PokemonCenter_1F_EventScript_171179" + }, + { + "type": "bg_event_type_0", + "x": 15, + "y": 5, + "elevation": 0, + "script": "OneIsland_PokemonCenter_1F_EventScript_171179" + }, + { + "type": "bg_event_type_0", + "x": 14, + "y": 5, + "elevation": 0, + "script": "OneIsland_PokemonCenter_1F_EventScript_171179" + }, + { + "type": "bg_event_type_0", + "x": 16, + "y": 5, + "elevation": 0, + "script": "OneIsland_PokemonCenter_1F_EventScript_171179" + }, + { + "type": "bg_event_type_0", + "x": 17, + "y": 5, + "elevation": 0, + "script": "OneIsland_PokemonCenter_1F_EventScript_171179" + } + ] +}
\ No newline at end of file diff --git a/data/maps/OneIsland_PokemonCenter_2F/events.inc b/data/maps/OneIsland_PokemonCenter_2F/events.inc deleted file mode 100644 index 2e285716f..000000000 --- a/data/maps/OneIsland_PokemonCenter_2F/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -OneIsland_PokemonCenter_2F_EventObjects: - object_event 1, 65, 0, 6, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, OneIsland_PokemonCenter_2F_EventScript_1A8CF6, 0, 0, 0 - object_event 2, 65, 0, 2, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, OneIsland_PokemonCenter_2F_EventScript_1A8CFC, 0, 0, 0 - object_event 3, 65, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, OneIsland_PokemonCenter_2F_EventScript_1A8D02, 0, 0, 0 - object_event 4, 69, 0, 1, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, OneIsland_PokemonCenter_2F_EventScript_1BB1D2, 112, 0, 0 - -OneIsland_PokemonCenter_2F_MapWarps: - warp_def 1, 6, 4, 1, 8192 - warp_def 5, 1, 0, 0, 4 - warp_def 9, 1, 0, 0, 1 - -OneIsland_PokemonCenter_2F_MapEvents:: - map_events OneIsland_PokemonCenter_2F_EventObjects, OneIsland_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/OneIsland_PokemonCenter_2F/header.inc b/data/maps/OneIsland_PokemonCenter_2F/header.inc deleted file mode 100644 index d0a077901..000000000 --- a/data/maps/OneIsland_PokemonCenter_2F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -OneIsland_PokemonCenter_2F:: @ 8351B88 - .4byte OneIsland_PokemonCenter_2F_Layout @ 0x8344108 - .4byte OneIsland_PokemonCenter_2F_MapEvents @ 0x83BE48C - .4byte OneIsland_PokemonCenter_2F_MapScripts @ 0x8171334 - .4byte NULL - .2byte BGM_FRLG_POKEMON_NETWORK_CENTER - .2byte 316 - .byte 0x8f, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/OneIsland_PokemonCenter_2F/map.json b/data/maps/OneIsland_PokemonCenter_2F/map.json new file mode 100644 index 000000000..f9f5e5c81 --- /dev/null +++ b/data/maps/OneIsland_PokemonCenter_2F/map.json @@ -0,0 +1,94 @@ +{ + "id": "MAP_ONE_ISLAND_POKEMON_CENTER_2F", + "name": "OneIsland_PokemonCenter_2F", + "layout": "LAYOUT_ONE_ISLAND_POKEMON_CENTER_2F", + "music": "BGM_FRLG_POKEMON_NETWORK_CENTER", + "region_map_section": "MAPSEC_ONE_ISLAND", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "65", + "x": 6, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OneIsland_PokemonCenter_2F_EventScript_1A8CF6", + "flag": "0" + }, + { + "graphics_id": "65", + "x": 2, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OneIsland_PokemonCenter_2F_EventScript_1A8CFC", + "flag": "0" + }, + { + "graphics_id": "65", + "x": 10, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OneIsland_PokemonCenter_2F_EventScript_1A8D02", + "flag": "0" + }, + { + "graphics_id": "69", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OneIsland_PokemonCenter_2F_EventScript_1BB1D2", + "flag": "112" + } + ], + "warp_events": [ + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_ONE_ISLAND_POKEMON_CENTER_1F", + "dest_warp_id": 1 + }, + { + "x": 5, + "y": 1, + "elevation": 0, + "dest_map": "MAP_UNKNOWN_MAP_00_04", + "dest_warp_id": 0 + }, + { + "x": 9, + "y": 1, + "elevation": 0, + "dest_map": "MAP_UNKNOWN_MAP_00_01", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/OneIsland_TreasureBeach/connections.inc b/data/maps/OneIsland_TreasureBeach/connections.inc deleted file mode 100644 index 606768f6d..000000000 --- a/data/maps/OneIsland_TreasureBeach/connections.inc +++ /dev/null @@ -1,6 +0,0 @@ -OneIsland_TreasureBeach_MapConnectionsList: @ 8352D30 - connection up, 0, MAP_ONE_ISLAND - -OneIsland_TreasureBeach_MapConnections:: @ 8352D3C - .4byte 1 - .4byte OneIsland_TreasureBeach_MapConnectionsList diff --git a/data/maps/OneIsland_TreasureBeach/events.inc b/data/maps/OneIsland_TreasureBeach/events.inc deleted file mode 100644 index 78ca6a94b..000000000 --- a/data/maps/OneIsland_TreasureBeach/events.inc +++ /dev/null @@ -1,16 +0,0 @@ -OneIsland_TreasureBeach_EventObjects: - object_event 1, 44, 0, 8, 0, 11, 0, 1, 2, 18, 0, 1, 0, 1, 0, OneIsland_TreasureBeach_EventScript_1ABF27, 0, 0, 0 - object_event 2, 19, 0, 13, 0, 20, 0, 3, 2, 17, 0, 0, 0, 0, 0, OneIsland_TreasureBeach_EventScript_16876C, 0, 0, 0 - -OneIsland_TreasureBeach_MapBGEvents: - bg_event 8, 20, 3, 7, 0, 108, 103, 1 - bg_event 13, 27, 3, 7, 0, 108, 104, 1 - bg_event 11, 31, 3, 7, 0, 106, 105, 1 - bg_event 9, 34, 3, 7, 0, 106, 106, 1 - bg_event 15, 22, 3, 7, 0, 2, 107, 1 - bg_event 16, 33, 3, 7, 0, 2, 108, 1 - bg_event 15, 29, 3, 7, 0, 109, 109, 1 - bg_event 8, 27, 3, 7, 0, 107, 110, 1 - -OneIsland_TreasureBeach_MapEvents:: - map_events OneIsland_TreasureBeach_EventObjects, 0x0, 0x0, OneIsland_TreasureBeach_MapBGEvents diff --git a/data/maps/OneIsland_TreasureBeach/header.inc b/data/maps/OneIsland_TreasureBeach/header.inc deleted file mode 100644 index 419a99ea7..000000000 --- a/data/maps/OneIsland_TreasureBeach/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -OneIsland_TreasureBeach:: @ 8350B20 - .4byte OneIsland_TreasureBeach_Layout @ 0x8326514 - .4byte OneIsland_TreasureBeach_MapEvents @ 0x83B8930 - .4byte OneIsland_TreasureBeach_MapScripts @ 0x816876B - .4byte OneIsland_TreasureBeach_MapConnections @ 0x8352D3C - .2byte BGM_FRLG_ROUTE_3 - .2byte 238 - .byte 0x97, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/OneIsland_TreasureBeach/map.json b/data/maps/OneIsland_TreasureBeach/map.json new file mode 100644 index 000000000..4dbcb7a74 --- /dev/null +++ b/data/maps/OneIsland_TreasureBeach/map.json @@ -0,0 +1,125 @@ +{ + "id": "MAP_ONE_ISLAND_TREASURE_BEACH", + "name": "OneIsland_TreasureBeach", + "layout": "LAYOUT_ONE_ISLAND_TREASURE_BEACH", + "music": "BGM_FRLG_ROUTE_3", + "region_map_section": "MAPSEC_TREASURE_BEACH", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_3", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_ONE_ISLAND", + "offset": 0, + "direction": "up" + } + ], + "object_events": [ + { + "graphics_id": "44", + "x": 8, + "y": 11, + "elevation": 1, + "movement_type": "2", + "movement_range_x": 2, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "OneIsland_TreasureBeach_EventScript_1ABF27", + "flag": "0" + }, + { + "graphics_id": "19", + "x": 13, + "y": 20, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OneIsland_TreasureBeach_EventScript_16876C", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [ + { + "type": "hidden_item", + "x": 8, + "y": 20, + "elevation": 3, + "item": "ITEM_STARDUST", + "flag": "103", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 13, + "y": 27, + "elevation": 3, + "item": "ITEM_STARDUST", + "flag": "104", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 11, + "y": 31, + "elevation": 3, + "item": "ITEM_PEARL", + "flag": "105", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 9, + "y": 34, + "elevation": 3, + "item": "ITEM_PEARL", + "flag": "106", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 15, + "y": 22, + "elevation": 3, + "item": "POCKET_KEY_ITEMS", + "flag": "107", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 16, + "y": 33, + "elevation": 3, + "item": "POCKET_KEY_ITEMS", + "flag": "108", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 15, + "y": 29, + "elevation": 3, + "item": "ITEM_STAR_PIECE", + "flag": "109", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 8, + "y": 27, + "elevation": 3, + "item": "ITEM_BIG_PEARL", + "flag": "110", + "unknown": 1 + } + ] +}
\ No newline at end of file diff --git a/data/maps/PalletTown/connections.inc b/data/maps/PalletTown/connections.inc deleted file mode 100644 index 2a539818b..000000000 --- a/data/maps/PalletTown/connections.inc +++ /dev/null @@ -1,7 +0,0 @@ -PalletTown_MapConnectionsList: @ 8352754 - connection up, 0, MAP_ROUTE1 - connection down, 0, MAP_ROUTE21_NORTH - -PalletTown_MapConnections:: @ 835276C - .4byte 2 - .4byte PalletTown_MapConnectionsList diff --git a/data/maps/PalletTown/events.inc b/data/maps/PalletTown/events.inc deleted file mode 100644 index 9fb85293c..000000000 --- a/data/maps/PalletTown/events.inc +++ /dev/null @@ -1,24 +0,0 @@ -PalletTown_EventObjects: - object_event 1, 23, 0, 3, 0, 10, 0, 3, 2, 65, 0, 0, 0, 0, 0, PalletTown_EventScript_16575C, 0, 0, 0 - object_event 2, 27, 0, 13, 0, 17, 0, 3, 2, 38, 0, 0, 0, 0, 0, PalletTown_EventScript_16582F, 0, 0, 0 - object_event 3, 71, 0, 10, 0, 8, 0, 3, 7, 17, 0, 0, 0, 0, 0, 0x0, 44, 0, 0 - -PalletTown_MapWarps: - warp_def 6, 7, 0, 1, 1024 - warp_def 15, 7, 0, 0, 1026 - warp_def 16, 13, 0, 0, 1027 - -PalletTown_MapCoordEvents: - coord_event 12, 1, 3, 0, 16464, 0, 0, PalletTown_EventScript_1655ED - coord_event 13, 1, 3, 0, 16464, 0, 0, PalletTown_EventScript_1655F9 - coord_event 13, 2, 3, 0, 16386, 1, 0, PalletTown_EventScript_16587B - -PalletTown_MapBGEvents: - bg_event 16, 16, 0, 0, 0, PalletTown_EventScript_165838 - bg_event 4, 7, 0, 0, 0, PalletTown_EventScript_165850 - bg_event 13, 7, 0, 0, 0, PalletTown_EventScript_165859 - bg_event 9, 11, 0, 0, 0, PalletTown_EventScript_165862 - bg_event 5, 14, 0, 0, 0, PalletTown_EventScript_16586B - -PalletTown_MapEvents:: - map_events PalletTown_EventObjects, PalletTown_MapWarps, PalletTown_MapCoordEvents, PalletTown_MapBGEvents diff --git a/data/maps/PalletTown/header.inc b/data/maps/PalletTown/header.inc deleted file mode 100644 index 8d9104896..000000000 --- a/data/maps/PalletTown/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -PalletTown:: @ 8350618 - .4byte PalletTown_Layout @ 0x82DD4C0 - .4byte PalletTown_MapEvents @ 0x83B4E50 - .4byte PalletTown_MapScripts @ 0x816545A - .4byte PalletTown_MapConnections @ 0x835276C - .2byte BGM_FRLG_PALLET_TOWN - .2byte 78 - .byte 0x58, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/PalletTown/map.json b/data/maps/PalletTown/map.json new file mode 100644 index 000000000..076af662f --- /dev/null +++ b/data/maps/PalletTown/map.json @@ -0,0 +1,156 @@ +{ + "id": "MAP_PALLET_TOWN", + "name": "PalletTown", + "layout": "LAYOUT_PALLET_TOWN", + "music": "BGM_FRLG_PALLET_TOWN", + "region_map_section": "MAPSEC_PALLET_TOWN", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_1", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_ROUTE1", + "offset": 0, + "direction": "up" + }, + { + "map": "MAP_ROUTE21_NORTH", + "offset": 0, + "direction": "down" + } + ], + "object_events": [ + { + "graphics_id": "23", + "x": 3, + "y": 10, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 4, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PalletTown_EventScript_16575C", + "flag": "0" + }, + { + "graphics_id": "27", + "x": 13, + "y": 17, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 6, + "movement_range_y": 2, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PalletTown_EventScript_16582F", + "flag": "0" + }, + { + "graphics_id": "71", + "x": 10, + "y": 8, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "44" + } + ], + "warp_events": [ + { + "x": 6, + "y": 7, + "elevation": 0, + "dest_map": "MAP_PALLET_TOWN_PLAYERS_HOUSE_1F", + "dest_warp_id": 1 + }, + { + "x": 15, + "y": 7, + "elevation": 0, + "dest_map": "MAP_PALLET_TOWN_GARYS_HOUSE", + "dest_warp_id": 0 + }, + { + "x": 16, + "y": 13, + "elevation": 0, + "dest_map": "MAP_PALLET_TOWN_PROFESSOR_OAKS_LAB", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 12, + "y": 1, + "elevation": 3, + "var": "VAR_0x4050", + "var_value": 0, + "script": "PalletTown_EventScript_1655ED" + }, + { + "type": "trigger", + "x": 13, + "y": 1, + "elevation": 3, + "var": "VAR_0x4050", + "var_value": 0, + "script": "PalletTown_EventScript_1655F9" + }, + { + "type": "trigger", + "x": 13, + "y": 2, + "elevation": 3, + "var": "VAR_0x4002", + "var_value": 1, + "script": "PalletTown_EventScript_16587B" + } + ], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 16, + "y": 16, + "elevation": 0, + "script": "PalletTown_EventScript_165838" + }, + { + "type": "bg_event_type_0", + "x": 4, + "y": 7, + "elevation": 0, + "script": "PalletTown_EventScript_165850" + }, + { + "type": "bg_event_type_0", + "x": 13, + "y": 7, + "elevation": 0, + "script": "PalletTown_EventScript_165859" + }, + { + "type": "bg_event_type_0", + "x": 9, + "y": 11, + "elevation": 0, + "script": "PalletTown_EventScript_165862" + }, + { + "type": "bg_event_type_0", + "x": 5, + "y": 14, + "elevation": 0, + "script": "PalletTown_EventScript_16586B" + } + ] +}
\ No newline at end of file diff --git a/data/maps/PalletTown/scripts.inc b/data/maps/PalletTown/scripts.inc index 31b4208ec..d0d4fc155 100644 --- a/data/maps/PalletTown/scripts.inc +++ b/data/maps/PalletTown/scripts.inc @@ -79,7 +79,7 @@ EventScript_1654D8:: @ 81654D8 setvar VAR_0x4055, 7 setvar VAR_0x4050, 3 setflag FLAG_0x02C - warp MAP_PALLET_TOWN_PROFESSOROAKSLAB, 255, 6, 12 + warp MAP_PALLET_TOWN_PROFESSOR_OAKS_LAB, 255, 6, 12 waitstate releaseall end @@ -230,7 +230,7 @@ EventScript_165605:: @ 8165605 setvar VAR_0x4050, 1 setflag FLAG_0x02C setflag FLAG_SPECIAL_FLAG_0x4001 - warp MAP_PALLET_TOWN_PROFESSOROAKSLAB, 255, 6, 12 + warp MAP_PALLET_TOWN_PROFESSOR_OAKS_LAB, 255, 6, 12 waitstate releaseall end diff --git a/data/maps/PalletTown_GarysHouse/events.inc b/data/maps/PalletTown_GarysHouse/events.inc deleted file mode 100644 index b6f3fdbde..000000000 --- a/data/maps/PalletTown_GarysHouse/events.inc +++ /dev/null @@ -1,16 +0,0 @@ -PalletTown_GarysHouse_EventObjects: - object_event 1, 76, 0, 10, 0, 6, 0, 3, 2, 49, 0, 0, 0, 0, 0, PalletTown_GarysHouse_EventScript_168D56, 0, 0, 0 - object_event 2, 93, 0, 6, 0, 4, 0, 3, 8, 17, 0, 0, 0, 0, 0, PalletTown_GarysHouse_EventScript_168F63, 57, 0, 0 - -PalletTown_GarysHouse_MapWarps: - warp_def 4, 8, 3, 1, 768 - warp_def 5, 8, 3, 1, 768 - warp_def 3, 8, 3, 1, 768 - -PalletTown_GarysHouse_MapBGEvents: - bg_event 12, 1, 0, 0, 0, PalletTown_GarysHouse_EventScript_168F6C - bg_event 11, 1, 0, 0, 0, PalletTown_GarysHouse_EventScript_168F6C - bg_event 9, 1, 0, 0, 0, PalletTown_GarysHouse_EventScript_168F75 - -PalletTown_GarysHouse_MapEvents:: - map_events PalletTown_GarysHouse_EventObjects, PalletTown_GarysHouse_MapWarps, 0x0, PalletTown_GarysHouse_MapBGEvents diff --git a/data/maps/PalletTown_GarysHouse/header.inc b/data/maps/PalletTown_GarysHouse/header.inc deleted file mode 100644 index da1b1bd3e..000000000 --- a/data/maps/PalletTown_GarysHouse/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -PalletTown_GarysHouse:: @ 8350D88 - .4byte PalletTown_GarysHouse_Layout @ 0x82D5424 - .4byte PalletTown_GarysHouse_MapEvents @ 0x83B980C - .4byte PalletTown_GarysHouse_MapScripts @ 0x8168D27 - .4byte NULL - .2byte BGM_FRLG_PALLET_TOWN - .2byte 3 - .byte 0x58, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/PalletTown_GarysHouse/map.json b/data/maps/PalletTown_GarysHouse/map.json new file mode 100644 index 000000000..71b380a90 --- /dev/null +++ b/data/maps/PalletTown_GarysHouse/map.json @@ -0,0 +1,90 @@ +{ + "id": "MAP_PALLET_TOWN_GARYS_HOUSE", + "name": "PalletTown_GarysHouse", + "layout": "LAYOUT_PALLET_TOWN_GARYS_HOUSE", + "music": "BGM_FRLG_PALLET_TOWN", + "region_map_section": "MAPSEC_PALLET_TOWN", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "76", + "x": 10, + "y": 6, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 3, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PalletTown_GarysHouse_EventScript_168D56", + "flag": "0" + }, + { + "graphics_id": "93", + "x": 6, + "y": 4, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PalletTown_GarysHouse_EventScript_168F63", + "flag": "57" + } + ], + "warp_events": [ + { + "x": 4, + "y": 8, + "elevation": 3, + "dest_map": "MAP_PALLET_TOWN", + "dest_warp_id": 1 + }, + { + "x": 5, + "y": 8, + "elevation": 3, + "dest_map": "MAP_PALLET_TOWN", + "dest_warp_id": 1 + }, + { + "x": 3, + "y": 8, + "elevation": 3, + "dest_map": "MAP_PALLET_TOWN", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 12, + "y": 1, + "elevation": 0, + "script": "PalletTown_GarysHouse_EventScript_168F6C" + }, + { + "type": "bg_event_type_0", + "x": 11, + "y": 1, + "elevation": 0, + "script": "PalletTown_GarysHouse_EventScript_168F6C" + }, + { + "type": "bg_event_type_0", + "x": 9, + "y": 1, + "elevation": 0, + "script": "PalletTown_GarysHouse_EventScript_168F75" + } + ] +}
\ No newline at end of file diff --git a/data/maps/PalletTown_PlayersHouse_1F/events.inc b/data/maps/PalletTown_PlayersHouse_1F/events.inc deleted file mode 100644 index 1b9cc714e..000000000 --- a/data/maps/PalletTown_PlayersHouse_1F/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -PalletTown_PlayersHouse_1F_EventObjects: - object_event 1, 88, 0, 8, 0, 4, 0, 3, 9, 0, 0, 0, 0, 0, 0, PalletTown_PlayersHouse_1F_EventScript_168C09, 0, 0, 0 - -PalletTown_PlayersHouse_1F_MapWarps: - warp_def 5, 8, 3, 0, 768 - warp_def 4, 8, 3, 0, 768 - warp_def 10, 2, 3, 0, 1025 - warp_def 3, 9, 0, 0, 768 - -PalletTown_PlayersHouse_1F_MapBGEvents: - bg_event 6, 1, 0, 0, 0, PalletTown_PlayersHouse_1F_EventScript_168C62 - -PalletTown_PlayersHouse_1F_MapEvents:: - map_events PalletTown_PlayersHouse_1F_EventObjects, PalletTown_PlayersHouse_1F_MapWarps, 0x0, PalletTown_PlayersHouse_1F_MapBGEvents diff --git a/data/maps/PalletTown_PlayersHouse_1F/header.inc b/data/maps/PalletTown_PlayersHouse_1F/header.inc deleted file mode 100644 index 16a3b2627..000000000 --- a/data/maps/PalletTown_PlayersHouse_1F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -PalletTown_PlayersHouse_1F:: @ 8350D50 - .4byte PalletTown_PlayersHouse_1F_Layout @ 0x82D5200 - .4byte PalletTown_PlayersHouse_1F_MapEvents @ 0x83B974C - .4byte PalletTown_PlayersHouse_1F_MapScripts @ 0x8168C08 - .4byte NULL - .2byte BGM_FRLG_PALLET_TOWN - .2byte 1 - .byte 0x58, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/PalletTown_PlayersHouse_1F/map.json b/data/maps/PalletTown_PlayersHouse_1F/map.json new file mode 100644 index 000000000..a573f0526 --- /dev/null +++ b/data/maps/PalletTown_PlayersHouse_1F/map.json @@ -0,0 +1,70 @@ +{ + "id": "MAP_PALLET_TOWN_PLAYERS_HOUSE_1F", + "name": "PalletTown_PlayersHouse_1F", + "layout": "LAYOUT_PALLET_TOWN_PLAYERS_HOUSE_1F", + "music": "BGM_FRLG_PALLET_TOWN", + "region_map_section": "MAPSEC_PALLET_TOWN", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "88", + "x": 8, + "y": 4, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PalletTown_PlayersHouse_1F_EventScript_168C09", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 5, + "y": 8, + "elevation": 3, + "dest_map": "MAP_PALLET_TOWN", + "dest_warp_id": 0 + }, + { + "x": 4, + "y": 8, + "elevation": 3, + "dest_map": "MAP_PALLET_TOWN", + "dest_warp_id": 0 + }, + { + "x": 10, + "y": 2, + "elevation": 3, + "dest_map": "MAP_PALLET_TOWN_PLAYERS_HOUSE_2F", + "dest_warp_id": 0 + }, + { + "x": 3, + "y": 9, + "elevation": 0, + "dest_map": "MAP_PALLET_TOWN", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 6, + "y": 1, + "elevation": 0, + "script": "PalletTown_PlayersHouse_1F_EventScript_168C62" + } + ] +}
\ No newline at end of file diff --git a/data/maps/PalletTown_PlayersHouse_2F/events.inc b/data/maps/PalletTown_PlayersHouse_2F/events.inc deleted file mode 100644 index 7695ec797..000000000 --- a/data/maps/PalletTown_PlayersHouse_2F/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -PalletTown_PlayersHouse_2F_MapWarps: - warp_def 10, 2, 3, 2, 1024 - -PalletTown_PlayersHouse_2F_MapBGEvents: - bg_event 6, 5, 3, 0, 0, PalletTown_PlayersHouse_2F_EventScript_168CD2 - bg_event 1, 1, 0, 0, 0, PalletTown_PlayersHouse_2F_EventScript_168CE4 - bg_event 11, 1, 0, 0, 0, PalletTown_PlayersHouse_2F_EventScript_168CDB - -PalletTown_PlayersHouse_2F_MapEvents:: - map_events 0x0, PalletTown_PlayersHouse_2F_MapWarps, 0x0, PalletTown_PlayersHouse_2F_MapBGEvents diff --git a/data/maps/PalletTown_PlayersHouse_2F/header.inc b/data/maps/PalletTown_PlayersHouse_2F/header.inc deleted file mode 100644 index 8f886a89c..000000000 --- a/data/maps/PalletTown_PlayersHouse_2F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -PalletTown_PlayersHouse_2F:: @ 8350D6C - .4byte PalletTown_PlayersHouse_2F_Layout @ 0x82D52FC - .4byte PalletTown_PlayersHouse_2F_MapEvents @ 0x83B978C - .4byte PalletTown_PlayersHouse_2F_MapScripts @ 0x8168CA3 - .4byte NULL - .2byte BGM_FRLG_PALLET_TOWN - .2byte 2 - .byte 0x58, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/PalletTown_PlayersHouse_2F/map.json b/data/maps/PalletTown_PlayersHouse_2F/map.json new file mode 100644 index 000000000..c9c62b631 --- /dev/null +++ b/data/maps/PalletTown_PlayersHouse_2F/map.json @@ -0,0 +1,49 @@ +{ + "id": "MAP_PALLET_TOWN_PLAYERS_HOUSE_2F", + "name": "PalletTown_PlayersHouse_2F", + "layout": "LAYOUT_PALLET_TOWN_PLAYERS_HOUSE_2F", + "music": "BGM_FRLG_PALLET_TOWN", + "region_map_section": "MAPSEC_PALLET_TOWN", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 10, + "y": 2, + "elevation": 3, + "dest_map": "MAP_PALLET_TOWN_PLAYERS_HOUSE_1F", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 6, + "y": 5, + "elevation": 3, + "script": "PalletTown_PlayersHouse_2F_EventScript_168CD2" + }, + { + "type": "bg_event_type_0", + "x": 1, + "y": 1, + "elevation": 0, + "script": "PalletTown_PlayersHouse_2F_EventScript_168CE4" + }, + { + "type": "bg_event_type_0", + "x": 11, + "y": 1, + "elevation": 0, + "script": "PalletTown_PlayersHouse_2F_EventScript_168CDB" + } + ] +}
\ No newline at end of file diff --git a/data/maps/PalletTown_ProfessorOaksLab/events.inc b/data/maps/PalletTown_ProfessorOaksLab/events.inc deleted file mode 100644 index 9941e265f..000000000 --- a/data/maps/PalletTown_ProfessorOaksLab/events.inc +++ /dev/null @@ -1,33 +0,0 @@ -PalletTown_ProfessorOaksLab_EventObjects: - object_event 1, 55, 0, 3, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, PalletTown_ProfessorOaksLab_EventScript_169DEE, 0, 0, 0 - object_event 2, 48, 0, 2, 0, 10, 0, 3, 3, 64, 0, 0, 0, 0, 0, PalletTown_ProfessorOaksLab_EventScript_169E46, 0, 0, 0 - object_event 3, 55, 0, 11, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, PalletTown_ProfessorOaksLab_EventScript_169E1A, 0, 0, 0 - object_event 4, 71, 0, 6, 0, 3, 0, 3, 8, 17, 0, 0, 0, 0, 0, PalletTown_ProfessorOaksLab_EventScript_169595, 43, 0, 0 - object_event 5, 92, 0, 8, 0, 4, 0, 0, 8, 17, 0, 0, 0, 0, 0, PalletTown_ProfessorOaksLab_EventScript_169BAB, 40, 0, 0 - object_event 6, 92, 0, 9, 0, 4, 0, 0, 8, 17, 0, 0, 0, 0, 0, PalletTown_ProfessorOaksLab_EventScript_169D78, 41, 0, 0 - object_event 7, 92, 0, 10, 0, 4, 0, 0, 8, 17, 0, 0, 0, 0, 0, PalletTown_ProfessorOaksLab_EventScript_169DAE, 42, 0, 0 - object_event 8, 72, 0, 5, 0, 4, 0, 3, 8, 17, 0, 0, 0, 0, 0, PalletTown_ProfessorOaksLab_EventScript_16955F, 45, 0, 0 - object_event 9, 94, 0, 4, 0, 1, 0, 0, 8, 17, 0, 0, 0, 0, 0, PalletTown_ProfessorOaksLab_EventScript_169E5F, 58, 0, 0 - object_event 10, 94, 0, 5, 0, 1, 0, 0, 8, 17, 0, 0, 0, 0, 0, PalletTown_ProfessorOaksLab_EventScript_169E5F, 58, 0, 0 - -PalletTown_ProfessorOaksLab_MapWarps: - warp_def 6, 12, 3, 2, 768 - warp_def 7, 12, 3, 2, 768 - warp_def 5, 12, 3, 2, 768 - -PalletTown_ProfessorOaksLab_MapCoordEvents: - coord_event 5, 8, 3, 0, 16469, 2, 0, PalletTown_ProfessorOaksLab_EventScript_1692C3 - coord_event 6, 8, 3, 0, 16469, 2, 0, PalletTown_ProfessorOaksLab_EventScript_1692C3 - coord_event 7, 8, 3, 0, 16469, 2, 0, PalletTown_ProfessorOaksLab_EventScript_1692C3 - coord_event 5, 8, 3, 0, 16469, 3, 0, PalletTown_ProfessorOaksLab_EventScript_1692E7 - coord_event 6, 8, 3, 0, 16469, 3, 0, PalletTown_ProfessorOaksLab_EventScript_1692F3 - coord_event 7, 8, 3, 0, 16469, 3, 0, PalletTown_ProfessorOaksLab_EventScript_1692FF - -PalletTown_ProfessorOaksLab_MapBGEvents: - bg_event 2, 1, 0, 0, 0, PalletTown_ProfessorOaksLab_EventScript_169E68 - bg_event 3, 1, 0, 0, 0, PalletTown_ProfessorOaksLab_EventScript_169E68 - bg_event 6, 1, 0, 0, 0, PalletTown_ProfessorOaksLab_EventScript_169E71 - bg_event 7, 1, 0, 0, 0, PalletTown_ProfessorOaksLab_EventScript_169E7A - -PalletTown_ProfessorOaksLab_MapEvents:: - map_events PalletTown_ProfessorOaksLab_EventObjects, PalletTown_ProfessorOaksLab_MapWarps, PalletTown_ProfessorOaksLab_MapCoordEvents, PalletTown_ProfessorOaksLab_MapBGEvents diff --git a/data/maps/PalletTown_ProfessorOaksLab/header.inc b/data/maps/PalletTown_ProfessorOaksLab/header.inc deleted file mode 100644 index 2d2667998..000000000 --- a/data/maps/PalletTown_ProfessorOaksLab/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -PalletTown_ProfessorOaksLab:: @ 8350DA4 - .4byte PalletTown_ProfessorOaksLab_Layout @ 0x82D5668 - .4byte PalletTown_ProfessorOaksLab_MapEvents @ 0x83B99B8 - .4byte PalletTown_ProfessorOaksLab_MapScripts @ 0x8168F7E - .4byte NULL - .2byte BGM_FRLG_OAK_LAB - .2byte 5 - .byte 0x58, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/PalletTown_ProfessorOaksLab/map.json b/data/maps/PalletTown_ProfessorOaksLab/map.json new file mode 100644 index 000000000..f974f7ac0 --- /dev/null +++ b/data/maps/PalletTown_ProfessorOaksLab/map.json @@ -0,0 +1,256 @@ +{ + "id": "MAP_PALLET_TOWN_PROFESSOR_OAKS_LAB", + "name": "PalletTown_ProfessorOaksLab", + "layout": "LAYOUT_PALLET_TOWN_PROFESSOR_OAKS_LAB", + "music": "BGM_FRLG_OAK_LAB", + "region_map_section": "MAPSEC_PALLET_TOWN", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "55", + "x": 3, + "y": 11, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PalletTown_ProfessorOaksLab_EventScript_169DEE", + "flag": "0" + }, + { + "graphics_id": "48", + "x": 2, + "y": 10, + "elevation": 3, + "movement_type": "3", + "movement_range_x": 0, + "movement_range_y": 4, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PalletTown_ProfessorOaksLab_EventScript_169E46", + "flag": "0" + }, + { + "graphics_id": "55", + "x": 11, + "y": 10, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PalletTown_ProfessorOaksLab_EventScript_169E1A", + "flag": "0" + }, + { + "graphics_id": "71", + "x": 6, + "y": 3, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PalletTown_ProfessorOaksLab_EventScript_169595", + "flag": "43" + }, + { + "graphics_id": "92", + "x": 8, + "y": 4, + "elevation": 0, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PalletTown_ProfessorOaksLab_EventScript_169BAB", + "flag": "40" + }, + { + "graphics_id": "92", + "x": 9, + "y": 4, + "elevation": 0, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PalletTown_ProfessorOaksLab_EventScript_169D78", + "flag": "41" + }, + { + "graphics_id": "92", + "x": 10, + "y": 4, + "elevation": 0, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PalletTown_ProfessorOaksLab_EventScript_169DAE", + "flag": "42" + }, + { + "graphics_id": "72", + "x": 5, + "y": 4, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PalletTown_ProfessorOaksLab_EventScript_16955F", + "flag": "45" + }, + { + "graphics_id": "94", + "x": 4, + "y": 1, + "elevation": 0, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PalletTown_ProfessorOaksLab_EventScript_169E5F", + "flag": "58" + }, + { + "graphics_id": "94", + "x": 5, + "y": 1, + "elevation": 0, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PalletTown_ProfessorOaksLab_EventScript_169E5F", + "flag": "58" + } + ], + "warp_events": [ + { + "x": 6, + "y": 12, + "elevation": 3, + "dest_map": "MAP_PALLET_TOWN", + "dest_warp_id": 2 + }, + { + "x": 7, + "y": 12, + "elevation": 3, + "dest_map": "MAP_PALLET_TOWN", + "dest_warp_id": 2 + }, + { + "x": 5, + "y": 12, + "elevation": 3, + "dest_map": "MAP_PALLET_TOWN", + "dest_warp_id": 2 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 5, + "y": 8, + "elevation": 3, + "var": "VAR_0x4055", + "var_value": 2, + "script": "PalletTown_ProfessorOaksLab_EventScript_1692C3" + }, + { + "type": "trigger", + "x": 6, + "y": 8, + "elevation": 3, + "var": "VAR_0x4055", + "var_value": 2, + "script": "PalletTown_ProfessorOaksLab_EventScript_1692C3" + }, + { + "type": "trigger", + "x": 7, + "y": 8, + "elevation": 3, + "var": "VAR_0x4055", + "var_value": 2, + "script": "PalletTown_ProfessorOaksLab_EventScript_1692C3" + }, + { + "type": "trigger", + "x": 5, + "y": 8, + "elevation": 3, + "var": "VAR_0x4055", + "var_value": 3, + "script": "PalletTown_ProfessorOaksLab_EventScript_1692E7" + }, + { + "type": "trigger", + "x": 6, + "y": 8, + "elevation": 3, + "var": "VAR_0x4055", + "var_value": 3, + "script": "PalletTown_ProfessorOaksLab_EventScript_1692F3" + }, + { + "type": "trigger", + "x": 7, + "y": 8, + "elevation": 3, + "var": "VAR_0x4055", + "var_value": 3, + "script": "PalletTown_ProfessorOaksLab_EventScript_1692FF" + } + ], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 2, + "y": 1, + "elevation": 0, + "script": "PalletTown_ProfessorOaksLab_EventScript_169E68" + }, + { + "type": "bg_event_type_0", + "x": 3, + "y": 1, + "elevation": 0, + "script": "PalletTown_ProfessorOaksLab_EventScript_169E68" + }, + { + "type": "bg_event_type_0", + "x": 6, + "y": 1, + "elevation": 0, + "script": "PalletTown_ProfessorOaksLab_EventScript_169E71" + }, + { + "type": "bg_event_type_0", + "x": 7, + "y": 1, + "elevation": 0, + "script": "PalletTown_ProfessorOaksLab_EventScript_169E7A" + } + ] +}
\ No newline at end of file diff --git a/data/maps/PewterCity/connections.inc b/data/maps/PewterCity/connections.inc deleted file mode 100644 index 52933c5ff..000000000 --- a/data/maps/PewterCity/connections.inc +++ /dev/null @@ -1,7 +0,0 @@ -PewterCity_MapConnectionsList: @ 83527A0 - connection down, 12, MAP_ROUTE2 - connection right, 10, MAP_ROUTE3 - -PewterCity_MapConnections:: @ 83527B8 - .4byte 2 - .4byte PewterCity_MapConnectionsList diff --git a/data/maps/PewterCity/events.inc b/data/maps/PewterCity/events.inc deleted file mode 100644 index c059dc865..000000000 --- a/data/maps/PewterCity/events.inc +++ /dev/null @@ -1,37 +0,0 @@ -PewterCity_EventObjects: - object_event 1, 22, 0, 6, 0, 15, 0, 3, 1, 17, 0, 0, 0, 0, 0, PewterCity_EventScript_166075, 0, 0, 0 - object_event 2, 25, 0, 33, 0, 17, 0, 3, 1, 17, 0, 0, 0, 0, 0, PewterCity_EventScript_16607E, 80, 0, 0 - object_event 3, 27, 0, 21, 0, 28, 0, 3, 8, 17, 0, 0, 0, 0, 0, PewterCity_EventScript_16622B, 0, 0, 0 - object_event 4, 20, 0, 33, 0, 27, 0, 3, 5, 18, 0, 0, 0, 0, 0, PewterCity_EventScript_166244, 0, 0, 0 - object_event 5, 19, 0, 42, 0, 20, 0, 3, 8, 17, 0, 0, 0, 0, 0, PewterCity_EventScript_165B9D, 46, 0, 0 - object_event 6, 95, 0, 30, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, PewterCity_EventScript_1BDF13, 18, 0, 0 - object_event 7, 55, 0, 46, 0, 20, 0, 3, 10, 17, 0, 0, 0, 0, 0, PewterCity_EventScript_1662A9, 146, 0, 0 - -PewterCity_MapWarps: - warp_def 17, 6, 0, 1, 1536 - warp_def 25, 4, 0, 3, 1536 - warp_def 15, 16, 0, 1, 1538 - warp_def 28, 18, 0, 1, 1539 - warp_def 33, 11, 0, 1, 1540 - warp_def 17, 25, 0, 1, 1541 - warp_def 9, 30, 0, 1, 1543 - -PewterCity_MapCoordEvents: - coord_event 42, 21, 3, 0, 16492, 0, 0, PewterCity_EventScript_165D8E - coord_event 42, 22, 3, 0, 16492, 0, 0, PewterCity_EventScript_165D9A - coord_event 42, 23, 3, 0, 16492, 0, 0, PewterCity_EventScript_165DA6 - coord_event 43, 23, 3, 0, 16492, 0, 0, PewterCity_EventScript_165DB2 - coord_event 46, 21, 3, 0, 16492, 1, 0, PewterCity_EventScript_1662B7 - coord_event 46, 22, 3, 0, 16492, 1, 0, PewterCity_EventScript_1662C4 - coord_event 46, 23, 3, 0, 16492, 1, 0, PewterCity_EventScript_1662D1 - -PewterCity_MapBGEvents: - bg_event 19, 7, 0, 0, 0, PewterCity_EventScript_16627F - bg_event 39, 19, 0, 0, 0, PewterCity_EventScript_166276 - bg_event 11, 16, 0, 0, 0, PewterCity_EventScript_166288 - bg_event 20, 30, 0, 0, 0, PewterCity_EventScript_16626D - bg_event 31, 25, 0, 0, 0, PewterCity_EventScript_1662A0 - bg_event 6, 3, 3, 7, 0, 4, 112, 1 - -PewterCity_MapEvents:: - map_events PewterCity_EventObjects, PewterCity_MapWarps, PewterCity_MapCoordEvents, PewterCity_MapBGEvents diff --git a/data/maps/PewterCity/header.inc b/data/maps/PewterCity/header.inc deleted file mode 100644 index f6f16be53..000000000 --- a/data/maps/PewterCity/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -PewterCity:: @ 8350650 - .4byte PewterCity_Layout @ 0x82DF308 - .4byte PewterCity_MapEvents @ 0x83B518C - .4byte PewterCity_MapScripts @ 0x8165B8E - .4byte PewterCity_MapConnections @ 0x83527B8 - .2byte BGM_FRLG_VIRIDIAN_CITY - .2byte 80 - .byte 0x5a, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/PewterCity/map.json b/data/maps/PewterCity/map.json new file mode 100644 index 000000000..4ac852cdc --- /dev/null +++ b/data/maps/PewterCity/map.json @@ -0,0 +1,281 @@ +{ + "id": "MAP_PEWTER_CITY", + "name": "PewterCity", + "layout": "LAYOUT_PEWTER_CITY", + "music": "BGM_FRLG_VIRIDIAN_CITY", + "region_map_section": "MAPSEC_PEWTER_CITY", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_1", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_ROUTE2", + "offset": 12, + "direction": "down" + }, + { + "map": "MAP_ROUTE3", + "offset": 10, + "direction": "right" + } + ], + "object_events": [ + { + "graphics_id": "22", + "x": 6, + "y": 15, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PewterCity_EventScript_166075", + "flag": "0" + }, + { + "graphics_id": "25", + "x": 33, + "y": 17, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PewterCity_EventScript_16607E", + "flag": "80" + }, + { + "graphics_id": "27", + "x": 21, + "y": 28, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PewterCity_EventScript_16622B", + "flag": "0" + }, + { + "graphics_id": "20", + "x": 33, + "y": 27, + "elevation": 3, + "movement_type": "5", + "movement_range_x": 2, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PewterCity_EventScript_166244", + "flag": "0" + }, + { + "graphics_id": "19", + "x": 42, + "y": 20, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PewterCity_EventScript_165B9D", + "flag": "46" + }, + { + "graphics_id": "95", + "x": 30, + "y": 5, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PewterCity_EventScript_1BDF13", + "flag": "18" + }, + { + "graphics_id": "55", + "x": 46, + "y": 20, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PewterCity_EventScript_1662A9", + "flag": "146" + } + ], + "warp_events": [ + { + "x": 17, + "y": 6, + "elevation": 0, + "dest_map": "MAP_PEWTER_CITY_MUSEUM_1F", + "dest_warp_id": 1 + }, + { + "x": 25, + "y": 4, + "elevation": 0, + "dest_map": "MAP_PEWTER_CITY_MUSEUM_1F", + "dest_warp_id": 3 + }, + { + "x": 15, + "y": 16, + "elevation": 0, + "dest_map": "MAP_PEWTER_CITY_GYM", + "dest_warp_id": 1 + }, + { + "x": 28, + "y": 18, + "elevation": 0, + "dest_map": "MAP_PEWTER_CITY_MART", + "dest_warp_id": 1 + }, + { + "x": 33, + "y": 11, + "elevation": 0, + "dest_map": "MAP_PEWTER_CITY_HOUSE1", + "dest_warp_id": 1 + }, + { + "x": 17, + "y": 25, + "elevation": 0, + "dest_map": "MAP_PEWTER_CITY_POKEMON_CENTER_1F", + "dest_warp_id": 1 + }, + { + "x": 9, + "y": 30, + "elevation": 0, + "dest_map": "MAP_PEWTER_CITY_HOUSE2", + "dest_warp_id": 1 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 42, + "y": 21, + "elevation": 3, + "var": "VAR_0x406C", + "var_value": 0, + "script": "PewterCity_EventScript_165D8E" + }, + { + "type": "trigger", + "x": 42, + "y": 22, + "elevation": 3, + "var": "VAR_0x406C", + "var_value": 0, + "script": "PewterCity_EventScript_165D9A" + }, + { + "type": "trigger", + "x": 42, + "y": 23, + "elevation": 3, + "var": "VAR_0x406C", + "var_value": 0, + "script": "PewterCity_EventScript_165DA6" + }, + { + "type": "trigger", + "x": 43, + "y": 23, + "elevation": 3, + "var": "VAR_0x406C", + "var_value": 0, + "script": "PewterCity_EventScript_165DB2" + }, + { + "type": "trigger", + "x": 46, + "y": 21, + "elevation": 3, + "var": "VAR_0x406C", + "var_value": 1, + "script": "PewterCity_EventScript_1662B7" + }, + { + "type": "trigger", + "x": 46, + "y": 22, + "elevation": 3, + "var": "VAR_0x406C", + "var_value": 1, + "script": "PewterCity_EventScript_1662C4" + }, + { + "type": "trigger", + "x": 46, + "y": 23, + "elevation": 3, + "var": "VAR_0x406C", + "var_value": 1, + "script": "PewterCity_EventScript_1662D1" + } + ], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 19, + "y": 7, + "elevation": 0, + "script": "PewterCity_EventScript_16627F" + }, + { + "type": "bg_event_type_0", + "x": 39, + "y": 19, + "elevation": 0, + "script": "PewterCity_EventScript_166276" + }, + { + "type": "bg_event_type_0", + "x": 11, + "y": 16, + "elevation": 0, + "script": "PewterCity_EventScript_166288" + }, + { + "type": "bg_event_type_0", + "x": 20, + "y": 30, + "elevation": 0, + "script": "PewterCity_EventScript_16626D" + }, + { + "type": "bg_event_type_0", + "x": 31, + "y": 25, + "elevation": 0, + "script": "PewterCity_EventScript_1662A0" + }, + { + "type": "hidden_item", + "x": 6, + "y": 3, + "elevation": 3, + "item": "POCKET_TM_CASE", + "flag": "112", + "unknown": 1 + } + ] +}
\ No newline at end of file diff --git a/data/maps/PewterCity_Gym/events.inc b/data/maps/PewterCity_Gym/events.inc deleted file mode 100644 index 72a587cd1..000000000 --- a/data/maps/PewterCity_Gym/events.inc +++ /dev/null @@ -1,16 +0,0 @@ -PewterCity_Gym_EventObjects: - object_event 1, 80, 0, 6, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, PewterCity_Gym_EventScript_16A593, 0, 0, 0 - object_event 2, 39, 0, 3, 0, 8, 0, 3, 10, 17, 0, 1, 0, 4, 0, PewterCity_Gym_EventScript_16A63E, 0, 0, 0 - object_event 3, 91, 0, 7, 0, 12, 0, 3, 8, 17, 0, 0, 0, 0, 0, PewterCity_Gym_EventScript_16A655, 0, 0, 0 - -PewterCity_Gym_MapWarps: - warp_def 5, 14, 3, 2, 770 - warp_def 6, 14, 3, 2, 770 - warp_def 7, 14, 3, 2, 770 - -PewterCity_Gym_MapBGEvents: - bg_event 4, 12, 0, 0, 0, PewterCity_Gym_EventScript_16A6AF - bg_event 8, 12, 0, 0, 0, PewterCity_Gym_EventScript_16A6AF - -PewterCity_Gym_MapEvents:: - map_events PewterCity_Gym_EventObjects, PewterCity_Gym_MapWarps, 0x0, PewterCity_Gym_MapBGEvents diff --git a/data/maps/PewterCity_Gym/header.inc b/data/maps/PewterCity_Gym/header.inc deleted file mode 100644 index 088aa1ab1..000000000 --- a/data/maps/PewterCity_Gym/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -PewterCity_Gym:: @ 8350EA0 - .4byte PewterCity_Gym_Layout @ 0x82D732C - .4byte PewterCity_Gym_MapEvents @ 0x83BA058 - .4byte PewterCity_Gym_MapScripts @ 0x816A592 - .4byte NULL - .2byte BGM_FRLG_GYM - .2byte 28 - .byte 0x5a, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x01 diff --git a/data/maps/PewterCity_Gym/map.json b/data/maps/PewterCity_Gym/map.json new file mode 100644 index 000000000..81a12e91f --- /dev/null +++ b/data/maps/PewterCity_Gym/map.json @@ -0,0 +1,96 @@ +{ + "id": "MAP_PEWTER_CITY_GYM", + "name": "PewterCity_Gym", + "layout": "LAYOUT_PEWTER_CITY_GYM", + "music": "BGM_FRLG_GYM", + "region_map_section": "MAPSEC_PEWTER_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_1", + "connections": null, + "object_events": [ + { + "graphics_id": "80", + "x": 6, + "y": 5, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PewterCity_Gym_EventScript_16A593", + "flag": "0" + }, + { + "graphics_id": "39", + "x": 3, + "y": 8, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "PewterCity_Gym_EventScript_16A63E", + "flag": "0" + }, + { + "graphics_id": "91", + "x": 7, + "y": 12, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PewterCity_Gym_EventScript_16A655", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 5, + "y": 14, + "elevation": 3, + "dest_map": "MAP_PEWTER_CITY", + "dest_warp_id": 2 + }, + { + "x": 6, + "y": 14, + "elevation": 3, + "dest_map": "MAP_PEWTER_CITY", + "dest_warp_id": 2 + }, + { + "x": 7, + "y": 14, + "elevation": 3, + "dest_map": "MAP_PEWTER_CITY", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 4, + "y": 12, + "elevation": 0, + "script": "PewterCity_Gym_EventScript_16A6AF" + }, + { + "type": "bg_event_type_0", + "x": 8, + "y": 12, + "elevation": 0, + "script": "PewterCity_Gym_EventScript_16A6AF" + } + ] +}
\ No newline at end of file diff --git a/data/maps/PewterCity_House1/events.inc b/data/maps/PewterCity_House1/events.inc deleted file mode 100644 index 04f6bff20..000000000 --- a/data/maps/PewterCity_House1/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -PewterCity_House1_EventObjects: - object_event 1, 30, 0, 1, 0, 2, 0, 3, 7, 17, 0, 0, 0, 0, 0, PewterCity_House1_EventScript_16A71D, 0, 0, 0 - object_event 2, 16, 0, 5, 0, 3, 0, 3, 10, 17, 0, 0, 0, 0, 0, PewterCity_House1_EventScript_16A726, 0, 0, 0 - object_event 3, 123, 0, 6, 0, 3, 0, 3, 9, 17, 0, 0, 0, 0, 0, PewterCity_House1_EventScript_16A736, 0, 0, 0 - -PewterCity_House1_MapWarps: - warp_def 3, 7, 0, 4, 770 - warp_def 4, 7, 0, 4, 770 - warp_def 5, 7, 0, 4, 770 - -PewterCity_House1_MapEvents:: - map_events PewterCity_House1_EventObjects, PewterCity_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/PewterCity_House1/header.inc b/data/maps/PewterCity_House1/header.inc deleted file mode 100644 index 933c38e45..000000000 --- a/data/maps/PewterCity_House1/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -PewterCity_House1:: @ 8350ED8 - .4byte House2_Layout @ 0x82D5840 - .4byte PewterCity_House1_MapEvents @ 0x83BA140 - .4byte PewterCity_House1_MapScripts @ 0x816A71C - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_CITY - .2byte 7 - .byte 0x5a, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/PewterCity_House1/map.json b/data/maps/PewterCity_House1/map.json new file mode 100644 index 000000000..941fb3805 --- /dev/null +++ b/data/maps/PewterCity_House1/map.json @@ -0,0 +1,81 @@ +{ + "id": "MAP_PEWTER_CITY_HOUSE1", + "name": "PewterCity_House1", + "layout": "LAYOUT_HOUSE2", + "music": "BGM_FRLG_VIRIDIAN_CITY", + "region_map_section": "MAPSEC_PEWTER_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "30", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PewterCity_House1_EventScript_16A71D", + "flag": "0" + }, + { + "graphics_id": "16", + "x": 5, + "y": 3, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PewterCity_House1_EventScript_16A726", + "flag": "0" + }, + { + "graphics_id": "123", + "x": 6, + "y": 3, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PewterCity_House1_EventScript_16A736", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 0, + "dest_map": "MAP_PEWTER_CITY", + "dest_warp_id": 4 + }, + { + "x": 4, + "y": 7, + "elevation": 0, + "dest_map": "MAP_PEWTER_CITY", + "dest_warp_id": 4 + }, + { + "x": 5, + "y": 7, + "elevation": 0, + "dest_map": "MAP_PEWTER_CITY", + "dest_warp_id": 4 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/PewterCity_House2/events.inc b/data/maps/PewterCity_House2/events.inc deleted file mode 100644 index 1c02eceb8..000000000 --- a/data/maps/PewterCity_House2/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -PewterCity_House2_EventObjects: - object_event 1, 32, 0, 3, 0, 3, 0, 3, 10, 17, 0, 0, 0, 0, 0, PewterCity_House2_EventScript_16A7DD, 0, 0, 0 - object_event 2, 16, 0, 5, 0, 3, 0, 3, 13, 17, 0, 0, 0, 0, 0, PewterCity_House2_EventScript_16A7E6, 0, 0, 0 - -PewterCity_House2_MapWarps: - warp_def 3, 7, 0, 6, 770 - warp_def 4, 7, 0, 6, 770 - warp_def 5, 7, 0, 6, 770 - -PewterCity_House2_MapEvents:: - map_events PewterCity_House2_EventObjects, PewterCity_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/PewterCity_House2/header.inc b/data/maps/PewterCity_House2/header.inc deleted file mode 100644 index af76d49ff..000000000 --- a/data/maps/PewterCity_House2/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -PewterCity_House2:: @ 8350F2C - .4byte House2_Layout @ 0x82D5840 - .4byte PewterCity_House2_MapEvents @ 0x83BA304 - .4byte PewterCity_House2_MapScripts @ 0x816A7DC - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_CITY - .2byte 7 - .byte 0x5a, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/PewterCity_House2/map.json b/data/maps/PewterCity_House2/map.json new file mode 100644 index 000000000..8b60f9557 --- /dev/null +++ b/data/maps/PewterCity_House2/map.json @@ -0,0 +1,68 @@ +{ + "id": "MAP_PEWTER_CITY_HOUSE2", + "name": "PewterCity_House2", + "layout": "LAYOUT_HOUSE2", + "music": "BGM_FRLG_VIRIDIAN_CITY", + "region_map_section": "MAPSEC_PEWTER_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "32", + "x": 3, + "y": 3, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PewterCity_House2_EventScript_16A7DD", + "flag": "0" + }, + { + "graphics_id": "16", + "x": 5, + "y": 3, + "elevation": 3, + "movement_type": "13", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PewterCity_House2_EventScript_16A7E6", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 0, + "dest_map": "MAP_PEWTER_CITY", + "dest_warp_id": 6 + }, + { + "x": 4, + "y": 7, + "elevation": 0, + "dest_map": "MAP_PEWTER_CITY", + "dest_warp_id": 6 + }, + { + "x": 5, + "y": 7, + "elevation": 0, + "dest_map": "MAP_PEWTER_CITY", + "dest_warp_id": 6 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/PewterCity_Mart/events.inc b/data/maps/PewterCity_Mart/events.inc deleted file mode 100644 index 4d39a67d9..000000000 --- a/data/maps/PewterCity_Mart/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -PewterCity_Mart_EventObjects: - object_event 1, 18, 0, 8, 0, 2, 0, 3, 1, 17, 0, 0, 0, 0, 0, PewterCity_Mart_EventScript_16A6CE, 0, 0, 0 - object_event 2, 19, 0, 6, 0, 4, 0, 3, 1, 17, 0, 0, 0, 0, 0, PewterCity_Mart_EventScript_16A6D7, 0, 0, 0 - object_event 3, 68, 0, 2, 0, 3, 0, 0, 10, 17, 0, 0, 0, 0, 0, PewterCity_Mart_EventScript_16A6E0, 0, 0, 0 - -PewterCity_Mart_MapWarps: - warp_def 3, 7, 3, 3, 770 - warp_def 4, 7, 3, 3, 770 - warp_def 5, 7, 3, 3, 770 - -PewterCity_Mart_MapEvents:: - map_events PewterCity_Mart_EventObjects, PewterCity_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/PewterCity_Mart/header.inc b/data/maps/PewterCity_Mart/header.inc deleted file mode 100644 index 2cd4eccad..000000000 --- a/data/maps/PewterCity_Mart/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -PewterCity_Mart:: @ 8350EBC - .4byte Mart_Layout @ 0x82D5BCC - .4byte PewterCity_Mart_MapEvents @ 0x83BA0CC - .4byte PewterCity_Mart_MapScripts @ 0x816A6CD - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 10 - .byte 0x5a, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/PewterCity_Mart/map.json b/data/maps/PewterCity_Mart/map.json new file mode 100644 index 000000000..7c7f2a616 --- /dev/null +++ b/data/maps/PewterCity_Mart/map.json @@ -0,0 +1,81 @@ +{ + "id": "MAP_PEWTER_CITY_MART", + "name": "PewterCity_Mart", + "layout": "LAYOUT_MART", + "music": "BGM_FRLG_POKEMON_CENTER", + "region_map_section": "MAPSEC_PEWTER_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "18", + "x": 8, + "y": 2, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PewterCity_Mart_EventScript_16A6CE", + "flag": "0" + }, + { + "graphics_id": "19", + "x": 6, + "y": 4, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PewterCity_Mart_EventScript_16A6D7", + "flag": "0" + }, + { + "graphics_id": "68", + "x": 2, + "y": 3, + "elevation": 0, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PewterCity_Mart_EventScript_16A6E0", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 3, + "dest_map": "MAP_PEWTER_CITY", + "dest_warp_id": 3 + }, + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_PEWTER_CITY", + "dest_warp_id": 3 + }, + { + "x": 5, + "y": 7, + "elevation": 3, + "dest_map": "MAP_PEWTER_CITY", + "dest_warp_id": 3 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/PewterCity_Museum_1F/events.inc b/data/maps/PewterCity_Museum_1F/events.inc deleted file mode 100644 index ff58a1c0c..000000000 --- a/data/maps/PewterCity_Museum_1F/events.inc +++ /dev/null @@ -1,29 +0,0 @@ -PewterCity_Museum_1F_EventObjects: - object_event 1, 47, 0, 16, 0, 5, 0, 3, 9, 17, 0, 0, 0, 0, 0, PewterCity_Museum_1F_EventScript_16A31B, 0, 0, 0 - object_event 2, 32, 0, 2, 0, 4, 0, 3, 10, 17, 0, 0, 0, 0, 0, PewterCity_Museum_1F_EventScript_16A4A5, 0, 0, 0 - object_event 3, 55, 0, 21, 0, 3, 0, 3, 8, 17, 0, 0, 0, 0, 0, PewterCity_Museum_1F_EventScript_16A4AE, 0, 0, 0 - object_event 4, 101, 0, 22, 0, 3, 0, 0, 8, 17, 0, 0, 0, 0, 0, PewterCity_Museum_1F_EventScript_16A509, 86, 0, 0 - object_event 5, 55, 0, 26, 0, 4, 0, 3, 10, 17, 0, 0, 0, 0, 0, PewterCity_Museum_1F_EventScript_16A49C, 0, 0, 0 - object_event 6, 55, 0, 26, 0, 7, 0, 3, 10, 17, 0, 0, 0, 0, 0, PewterCity_Museum_1F_EventScript_1C4BBE, 0, 0, 0 - -PewterCity_Museum_1F_MapWarps: - warp_def 13, 9, 3, 0, 770 - warp_def 14, 9, 3, 0, 770 - warp_def 15, 9, 3, 0, 770 - warp_def 21, 9, 3, 1, 770 - warp_def 22, 9, 3, 1, 770 - warp_def 8, 8, 3, 0, 1537 - -PewterCity_Museum_1F_MapCoordEvents: - coord_event 12, 5, 3, 0, 16481, 0, 0, PewterCity_Museum_1F_EventScript_16A38F - coord_event 13, 5, 3, 0, 16481, 0, 0, PewterCity_Museum_1F_EventScript_16A3A5 - coord_event 14, 5, 3, 0, 16481, 0, 0, PewterCity_Museum_1F_EventScript_16A3BB - -PewterCity_Museum_1F_MapBGEvents: - bg_event 4, 4, 0, 0, 0, PewterCity_Museum_1F_EventScript_16A512 - bg_event 4, 7, 0, 0, 0, PewterCity_Museum_1F_EventScript_16A532 - bg_event 27, 1, 0, 1, 0, PewterCity_Museum_1F_EventScript_1ACE1C - bg_event 26, 1, 0, 1, 0, PewterCity_Museum_1F_EventScript_1ACE1C - -PewterCity_Museum_1F_MapEvents:: - map_events PewterCity_Museum_1F_EventObjects, PewterCity_Museum_1F_MapWarps, PewterCity_Museum_1F_MapCoordEvents, PewterCity_Museum_1F_MapBGEvents diff --git a/data/maps/PewterCity_Museum_1F/header.inc b/data/maps/PewterCity_Museum_1F/header.inc deleted file mode 100644 index b2ae946ec..000000000 --- a/data/maps/PewterCity_Museum_1F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -PewterCity_Museum_1F:: @ 8350E68 - .4byte PewterCity_Museum_1F_Layout @ 0x831A1FC - .4byte PewterCity_Museum_1F_MapEvents @ 0x83B9ED8 - .4byte PewterCity_Museum_1F_MapScripts @ 0x816A31A - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_CITY - .2byte 180 - .byte 0x5a, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/PewterCity_Museum_1F/map.json b/data/maps/PewterCity_Museum_1F/map.json new file mode 100644 index 000000000..bfa941559 --- /dev/null +++ b/data/maps/PewterCity_Museum_1F/map.json @@ -0,0 +1,198 @@ +{ + "id": "MAP_PEWTER_CITY_MUSEUM_1F", + "name": "PewterCity_Museum_1F", + "layout": "LAYOUT_PEWTER_CITY_MUSEUM_1F", + "music": "BGM_FRLG_VIRIDIAN_CITY", + "region_map_section": "MAPSEC_PEWTER_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "47", + "x": 16, + "y": 5, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PewterCity_Museum_1F_EventScript_16A31B", + "flag": "0" + }, + { + "graphics_id": "32", + "x": 2, + "y": 4, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PewterCity_Museum_1F_EventScript_16A4A5", + "flag": "0" + }, + { + "graphics_id": "55", + "x": 21, + "y": 3, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PewterCity_Museum_1F_EventScript_16A4AE", + "flag": "0" + }, + { + "graphics_id": "101", + "x": 22, + "y": 3, + "elevation": 0, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PewterCity_Museum_1F_EventScript_16A509", + "flag": "86" + }, + { + "graphics_id": "55", + "x": 26, + "y": 4, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PewterCity_Museum_1F_EventScript_16A49C", + "flag": "0" + }, + { + "graphics_id": "55", + "x": 26, + "y": 7, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PewterCity_Museum_1F_EventScript_1C4BBE", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 13, + "y": 9, + "elevation": 3, + "dest_map": "MAP_PEWTER_CITY", + "dest_warp_id": 0 + }, + { + "x": 14, + "y": 9, + "elevation": 3, + "dest_map": "MAP_PEWTER_CITY", + "dest_warp_id": 0 + }, + { + "x": 15, + "y": 9, + "elevation": 3, + "dest_map": "MAP_PEWTER_CITY", + "dest_warp_id": 0 + }, + { + "x": 21, + "y": 9, + "elevation": 3, + "dest_map": "MAP_PEWTER_CITY", + "dest_warp_id": 1 + }, + { + "x": 22, + "y": 9, + "elevation": 3, + "dest_map": "MAP_PEWTER_CITY", + "dest_warp_id": 1 + }, + { + "x": 8, + "y": 8, + "elevation": 3, + "dest_map": "MAP_PEWTER_CITY_MUSEUM_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 12, + "y": 5, + "elevation": 3, + "var": "VAR_0x4061", + "var_value": 0, + "script": "PewterCity_Museum_1F_EventScript_16A38F" + }, + { + "type": "trigger", + "x": 13, + "y": 5, + "elevation": 3, + "var": "VAR_0x4061", + "var_value": 0, + "script": "PewterCity_Museum_1F_EventScript_16A3A5" + }, + { + "type": "trigger", + "x": 14, + "y": 5, + "elevation": 3, + "var": "VAR_0x4061", + "var_value": 0, + "script": "PewterCity_Museum_1F_EventScript_16A3BB" + } + ], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 4, + "y": 4, + "elevation": 0, + "script": "PewterCity_Museum_1F_EventScript_16A512" + }, + { + "type": "bg_event_type_0", + "x": 4, + "y": 7, + "elevation": 0, + "script": "PewterCity_Museum_1F_EventScript_16A532" + }, + { + "type": "bg_event_type_1", + "x": 27, + "y": 1, + "elevation": 0, + "script": "PewterCity_Museum_1F_EventScript_1ACE1C" + }, + { + "type": "bg_event_type_1", + "x": 26, + "y": 1, + "elevation": 0, + "script": "PewterCity_Museum_1F_EventScript_1ACE1C" + } + ] +}
\ No newline at end of file diff --git a/data/maps/PewterCity_Museum_2F/events.inc b/data/maps/PewterCity_Museum_2F/events.inc deleted file mode 100644 index 45bc62846..000000000 --- a/data/maps/PewterCity_Museum_2F/events.inc +++ /dev/null @@ -1,22 +0,0 @@ -PewterCity_Museum_2F_EventObjects: - object_event 1, 55, 0, 10, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, PewterCity_Museum_2F_EventScript_16A565, 0, 0, 0 - object_event 2, 25, 0, 4, 0, 9, 0, 3, 5, 19, 0, 0, 0, 0, 0, PewterCity_Museum_2F_EventScript_16A553, 0, 0, 0 - object_event 3, 33, 0, 0, 0, 6, 0, 3, 1, 19, 0, 0, 0, 0, 0, PewterCity_Museum_2F_EventScript_16A55C, 0, 0, 0 - object_event 4, 17, 0, 15, 0, 8, 0, 3, 10, 17, 0, 0, 0, 0, 0, PewterCity_Museum_2F_EventScript_16A56E, 0, 0, 0 - object_event 5, 30, 0, 16, 0, 8, 0, 3, 8, 17, 0, 0, 0, 0, 0, PewterCity_Museum_2F_EventScript_16A577, 0, 0, 0 - -PewterCity_Museum_2F_MapWarps: - warp_def 11, 8, 3, 5, 1536 - -PewterCity_Museum_2F_MapBGEvents: - bg_event 3, 6, 0, 0, 0, PewterCity_Museum_2F_EventScript_16A589 - bg_event 15, 5, 0, 0, 0, PewterCity_Museum_2F_EventScript_16A580 - bg_event 14, 5, 0, 0, 0, PewterCity_Museum_2F_EventScript_16A580 - bg_event 16, 5, 0, 0, 0, PewterCity_Museum_2F_EventScript_16A580 - bg_event 14, 4, 0, 0, 0, PewterCity_Museum_2F_EventScript_16A580 - bg_event 15, 4, 0, 0, 0, PewterCity_Museum_2F_EventScript_16A580 - bg_event 16, 4, 0, 0, 0, PewterCity_Museum_2F_EventScript_16A580 - bg_event 3, 5, 0, 0, 0, PewterCity_Museum_2F_EventScript_16A589 - -PewterCity_Museum_2F_MapEvents:: - map_events PewterCity_Museum_2F_EventObjects, PewterCity_Museum_2F_MapWarps, 0x0, PewterCity_Museum_2F_MapBGEvents diff --git a/data/maps/PewterCity_Museum_2F/header.inc b/data/maps/PewterCity_Museum_2F/header.inc deleted file mode 100644 index d62dc30e1..000000000 --- a/data/maps/PewterCity_Museum_2F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -PewterCity_Museum_2F:: @ 8350E84 - .4byte PewterCity_Museum_2F_Layout @ 0x831A39C - .4byte PewterCity_Museum_2F_MapEvents @ 0x83B9FCC - .4byte PewterCity_Museum_2F_MapScripts @ 0x816A552 - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_CITY - .2byte 181 - .byte 0x5a, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/PewterCity_Museum_2F/map.json b/data/maps/PewterCity_Museum_2F/map.json new file mode 100644 index 000000000..fc75fdbd7 --- /dev/null +++ b/data/maps/PewterCity_Museum_2F/map.json @@ -0,0 +1,150 @@ +{ + "id": "MAP_PEWTER_CITY_MUSEUM_2F", + "name": "PewterCity_Museum_2F", + "layout": "LAYOUT_PEWTER_CITY_MUSEUM_2F", + "music": "BGM_FRLG_VIRIDIAN_CITY", + "region_map_section": "MAPSEC_PEWTER_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "55", + "x": 10, + "y": 5, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PewterCity_Museum_2F_EventScript_16A565", + "flag": "0" + }, + { + "graphics_id": "25", + "x": 4, + "y": 9, + "elevation": 3, + "movement_type": "5", + "movement_range_x": 3, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PewterCity_Museum_2F_EventScript_16A553", + "flag": "0" + }, + { + "graphics_id": "33", + "x": 0, + "y": 6, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 3, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PewterCity_Museum_2F_EventScript_16A55C", + "flag": "0" + }, + { + "graphics_id": "17", + "x": 15, + "y": 8, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PewterCity_Museum_2F_EventScript_16A56E", + "flag": "0" + }, + { + "graphics_id": "30", + "x": 16, + "y": 8, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PewterCity_Museum_2F_EventScript_16A577", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 11, + "y": 8, + "elevation": 3, + "dest_map": "MAP_PEWTER_CITY_MUSEUM_1F", + "dest_warp_id": 5 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 3, + "y": 6, + "elevation": 0, + "script": "PewterCity_Museum_2F_EventScript_16A589" + }, + { + "type": "bg_event_type_0", + "x": 15, + "y": 5, + "elevation": 0, + "script": "PewterCity_Museum_2F_EventScript_16A580" + }, + { + "type": "bg_event_type_0", + "x": 14, + "y": 5, + "elevation": 0, + "script": "PewterCity_Museum_2F_EventScript_16A580" + }, + { + "type": "bg_event_type_0", + "x": 16, + "y": 5, + "elevation": 0, + "script": "PewterCity_Museum_2F_EventScript_16A580" + }, + { + "type": "bg_event_type_0", + "x": 14, + "y": 4, + "elevation": 0, + "script": "PewterCity_Museum_2F_EventScript_16A580" + }, + { + "type": "bg_event_type_0", + "x": 15, + "y": 4, + "elevation": 0, + "script": "PewterCity_Museum_2F_EventScript_16A580" + }, + { + "type": "bg_event_type_0", + "x": 16, + "y": 4, + "elevation": 0, + "script": "PewterCity_Museum_2F_EventScript_16A580" + }, + { + "type": "bg_event_type_0", + "x": 3, + "y": 5, + "elevation": 0, + "script": "PewterCity_Museum_2F_EventScript_16A589" + } + ] +}
\ No newline at end of file diff --git a/data/maps/PewterCity_PokemonCenter_1F/events.inc b/data/maps/PewterCity_PokemonCenter_1F/events.inc deleted file mode 100644 index efeff4714..000000000 --- a/data/maps/PewterCity_PokemonCenter_1F/events.inc +++ /dev/null @@ -1,17 +0,0 @@ -PewterCity_PokemonCenter_1F_EventObjects: - object_event 1, 115, 0, 2, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, PewterCity_PokemonCenter_1F_EventScript_16A781, 0, 0, 0 - object_event 2, 61, 0, 4, 0, 8, 0, 3, 14, 17, 0, 0, 0, 0, 0, PewterCity_PokemonCenter_1F_EventScript_16A778, 0, 0, 0 - object_event 3, 64, 0, 7, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, PewterCity_PokemonCenter_1F_EventScript_16A76F, 0, 0, 0 - object_event 4, 18, 0, 1, 0, 2, 0, 3, 10, 17, 0, 0, 0, 0, 0, PewterCity_PokemonCenter_1F_EventScript_16A798, 0, 0, 0 - object_event 5, 23, 0, 13, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, PewterCity_PokemonCenter_1F_EventScript_1BEE16, 0, 0, 0 - object_event 6, 51, 0, 10, 0, 7, 0, 3, 10, 17, 0, 0, 0, 0, 0, PewterCity_PokemonCenter_1F_EventScript_16A7A1, 0, 0, 0 - object_event 7, 51, 0, 14, 0, 6, 0, 3, 9, 17, 0, 0, 0, 0, 0, PewterCity_PokemonCenter_1F_EventScript_16A7AC, 0, 0, 0 - -PewterCity_PokemonCenter_1F_MapWarps: - warp_def 6, 8, 0, 5, 770 - warp_def 7, 8, 3, 5, 770 - warp_def 8, 8, 0, 5, 770 - warp_def 1, 6, 4, 0, 1542 - -PewterCity_PokemonCenter_1F_MapEvents:: - map_events PewterCity_PokemonCenter_1F_EventObjects, PewterCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/PewterCity_PokemonCenter_1F/header.inc b/data/maps/PewterCity_PokemonCenter_1F/header.inc deleted file mode 100644 index 9270308b7..000000000 --- a/data/maps/PewterCity_PokemonCenter_1F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -PewterCity_PokemonCenter_1F:: @ 8350EF4 - .4byte PokemonCenter_1F_Layout @ 0x82D5990 - .4byte PewterCity_PokemonCenter_1F_MapEvents @ 0x83BA21C - .4byte PewterCity_PokemonCenter_1F_MapScripts @ 0x816A760 - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 8 - .byte 0x5a, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/PewterCity_PokemonCenter_1F/map.json b/data/maps/PewterCity_PokemonCenter_1F/map.json new file mode 100644 index 000000000..fd244b488 --- /dev/null +++ b/data/maps/PewterCity_PokemonCenter_1F/map.json @@ -0,0 +1,140 @@ +{ + "id": "MAP_PEWTER_CITY_POKEMON_CENTER_1F", + "name": "PewterCity_PokemonCenter_1F", + "layout": "LAYOUT_POKEMON_CENTER_1F", + "music": "BGM_FRLG_POKEMON_CENTER", + "region_map_section": "MAPSEC_PEWTER_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "115", + "x": 2, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PewterCity_PokemonCenter_1F_EventScript_16A781", + "flag": "0" + }, + { + "graphics_id": "61", + "x": 4, + "y": 8, + "elevation": 3, + "movement_type": "14", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PewterCity_PokemonCenter_1F_EventScript_16A778", + "flag": "0" + }, + { + "graphics_id": "64", + "x": 7, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PewterCity_PokemonCenter_1F_EventScript_16A76F", + "flag": "0" + }, + { + "graphics_id": "18", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PewterCity_PokemonCenter_1F_EventScript_16A798", + "flag": "0" + }, + { + "graphics_id": "23", + "x": 13, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PewterCity_PokemonCenter_1F_EventScript_1BEE16", + "flag": "0" + }, + { + "graphics_id": "51", + "x": 10, + "y": 7, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PewterCity_PokemonCenter_1F_EventScript_16A7A1", + "flag": "0" + }, + { + "graphics_id": "51", + "x": 14, + "y": 6, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PewterCity_PokemonCenter_1F_EventScript_16A7AC", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 6, + "y": 8, + "elevation": 0, + "dest_map": "MAP_PEWTER_CITY", + "dest_warp_id": 5 + }, + { + "x": 7, + "y": 8, + "elevation": 3, + "dest_map": "MAP_PEWTER_CITY", + "dest_warp_id": 5 + }, + { + "x": 8, + "y": 8, + "elevation": 0, + "dest_map": "MAP_PEWTER_CITY", + "dest_warp_id": 5 + }, + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_PEWTER_CITY_POKEMON_CENTER_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/PewterCity_PokemonCenter_2F/events.inc b/data/maps/PewterCity_PokemonCenter_2F/events.inc deleted file mode 100644 index fee2be7d2..000000000 --- a/data/maps/PewterCity_PokemonCenter_2F/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -PewterCity_PokemonCenter_2F_EventObjects: - object_event 1, 65, 0, 6, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, PewterCity_PokemonCenter_2F_EventScript_1A8CF6, 0, 0, 0 - object_event 2, 65, 0, 2, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, PewterCity_PokemonCenter_2F_EventScript_1A8CFC, 0, 0, 0 - object_event 3, 65, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, PewterCity_PokemonCenter_2F_EventScript_1A8D02, 0, 0, 0 - object_event 4, 69, 0, 1, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, PewterCity_PokemonCenter_2F_EventScript_1BB1D2, 112, 0, 0 - -PewterCity_PokemonCenter_2F_MapWarps: - warp_def 1, 6, 4, 3, 1541 - warp_def 5, 1, 0, 0, 4 - warp_def 9, 1, 0, 0, 1 - -PewterCity_PokemonCenter_2F_MapEvents:: - map_events PewterCity_PokemonCenter_2F_EventObjects, PewterCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/PewterCity_PokemonCenter_2F/header.inc b/data/maps/PewterCity_PokemonCenter_2F/header.inc deleted file mode 100644 index c050eb5fb..000000000 --- a/data/maps/PewterCity_PokemonCenter_2F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -PewterCity_PokemonCenter_2F:: @ 8350F10 - .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 - .4byte PewterCity_PokemonCenter_2F_MapEvents @ 0x83BA2A8 - .4byte PewterCity_PokemonCenter_2F_MapScripts @ 0x816A7B5 - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 9 - .byte 0x5a, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/PewterCity_PokemonCenter_2F/map.json b/data/maps/PewterCity_PokemonCenter_2F/map.json new file mode 100644 index 000000000..0b6b59689 --- /dev/null +++ b/data/maps/PewterCity_PokemonCenter_2F/map.json @@ -0,0 +1,94 @@ +{ + "id": "MAP_PEWTER_CITY_POKEMON_CENTER_2F", + "name": "PewterCity_PokemonCenter_2F", + "layout": "LAYOUT_POKEMON_CENTER_2F", + "music": "BGM_FRLG_POKEMON_CENTER", + "region_map_section": "MAPSEC_PEWTER_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "65", + "x": 6, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PewterCity_PokemonCenter_2F_EventScript_1A8CF6", + "flag": "0" + }, + { + "graphics_id": "65", + "x": 2, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PewterCity_PokemonCenter_2F_EventScript_1A8CFC", + "flag": "0" + }, + { + "graphics_id": "65", + "x": 10, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PewterCity_PokemonCenter_2F_EventScript_1A8D02", + "flag": "0" + }, + { + "graphics_id": "69", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PewterCity_PokemonCenter_2F_EventScript_1BB1D2", + "flag": "112" + } + ], + "warp_events": [ + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_PEWTER_CITY_POKEMON_CENTER_1F", + "dest_warp_id": 3 + }, + { + "x": 5, + "y": 1, + "elevation": 0, + "dest_map": "MAP_UNKNOWN_MAP_00_04", + "dest_warp_id": 0 + }, + { + "x": 9, + "y": 1, + "elevation": 0, + "dest_map": "MAP_UNKNOWN_MAP_00_01", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/PokemonLeague_AgathasRoom/events.inc b/data/maps/PokemonLeague_AgathasRoom/events.inc deleted file mode 100644 index 0b6a8136a..000000000 --- a/data/maps/PokemonLeague_AgathasRoom/events.inc +++ /dev/null @@ -1,9 +0,0 @@ -PokemonLeague_AgathasRoom_EventObjects: - object_event 1, 75, 0, 6, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, PokemonLeague_AgathasRoom_EventScript_162877, 0, 0, 0 - -PokemonLeague_AgathasRoom_MapWarps: - warp_def 6, 12, 0, 1, 332 - warp_def 6, 2, 0, 0, 334 - -PokemonLeague_AgathasRoom_MapEvents:: - map_events PokemonLeague_AgathasRoom_EventObjects, PokemonLeague_AgathasRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/PokemonLeague_AgathasRoom/header.inc b/data/maps/PokemonLeague_AgathasRoom/header.inc deleted file mode 100644 index 1e253cb1c..000000000 --- a/data/maps/PokemonLeague_AgathasRoom/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -PokemonLeague_AgathasRoom:: @ 834FA80 - .4byte PokemonLeague_AgathasRoom_Layout @ 0x831F468 - .4byte PokemonLeague_AgathasRoom_MapEvents @ 0x83B1928 - .4byte PokemonLeague_AgathasRoom_MapScripts @ 0x8162810 - .4byte NULL - .2byte BGM_FRLG_POKEMON_TOWER - .2byte 215 - .byte 0x89, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x06 diff --git a/data/maps/PokemonLeague_AgathasRoom/map.json b/data/maps/PokemonLeague_AgathasRoom/map.json new file mode 100644 index 000000000..2f349ed52 --- /dev/null +++ b/data/maps/PokemonLeague_AgathasRoom/map.json @@ -0,0 +1,48 @@ +{ + "id": "MAP_POKEMON_LEAGUE_AGATHAS_ROOM", + "name": "PokemonLeague_AgathasRoom", + "layout": "LAYOUT_POKEMON_LEAGUE_AGATHAS_ROOM", + "music": "BGM_FRLG_POKEMON_TOWER", + "region_map_section": "MAPSEC_POKEMON_LEAGUE", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_6", + "connections": null, + "object_events": [ + { + "graphics_id": "75", + "x": 6, + "y": 5, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PokemonLeague_AgathasRoom_EventScript_162877", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 6, + "y": 12, + "elevation": 0, + "dest_map": "MAP_POKEMON_LEAGUE_BRUNOS_ROOM", + "dest_warp_id": 1 + }, + { + "x": 6, + "y": 2, + "elevation": 0, + "dest_map": "MAP_POKEMON_LEAGUE_LANCES_ROOM", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/PokemonLeague_BrunosRoom/events.inc b/data/maps/PokemonLeague_BrunosRoom/events.inc deleted file mode 100644 index 940c91903..000000000 --- a/data/maps/PokemonLeague_BrunosRoom/events.inc +++ /dev/null @@ -1,9 +0,0 @@ -PokemonLeague_BrunosRoom_EventObjects: - object_event 1, 79, 0, 6, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, PokemonLeague_BrunosRoom_EventScript_1626EC, 0, 0, 0 - -PokemonLeague_BrunosRoom_MapWarps: - warp_def 6, 12, 0, 1, 331 - warp_def 6, 2, 0, 0, 333 - -PokemonLeague_BrunosRoom_MapEvents:: - map_events PokemonLeague_BrunosRoom_EventObjects, PokemonLeague_BrunosRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/PokemonLeague_BrunosRoom/header.inc b/data/maps/PokemonLeague_BrunosRoom/header.inc deleted file mode 100644 index 4a0db477d..000000000 --- a/data/maps/PokemonLeague_BrunosRoom/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -PokemonLeague_BrunosRoom:: @ 834FA64 - .4byte PokemonLeague_BrunosRoom_Layout @ 0x831F2F0 - .4byte PokemonLeague_BrunosRoom_MapEvents @ 0x83B18EC - .4byte PokemonLeague_BrunosRoom_MapScripts @ 0x8162685 - .4byte NULL - .2byte BGM_FRLG_ROCKET_HIDEOUT - .2byte 214 - .byte 0x89, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x05 diff --git a/data/maps/PokemonLeague_BrunosRoom/map.json b/data/maps/PokemonLeague_BrunosRoom/map.json new file mode 100644 index 000000000..c2e0209a5 --- /dev/null +++ b/data/maps/PokemonLeague_BrunosRoom/map.json @@ -0,0 +1,48 @@ +{ + "id": "MAP_POKEMON_LEAGUE_BRUNOS_ROOM", + "name": "PokemonLeague_BrunosRoom", + "layout": "LAYOUT_POKEMON_LEAGUE_BRUNOS_ROOM", + "music": "BGM_FRLG_ROCKET_HIDEOUT", + "region_map_section": "MAPSEC_POKEMON_LEAGUE", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_5", + "connections": null, + "object_events": [ + { + "graphics_id": "79", + "x": 6, + "y": 5, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PokemonLeague_BrunosRoom_EventScript_1626EC", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 6, + "y": 12, + "elevation": 0, + "dest_map": "MAP_POKEMON_LEAGUE_LORELEIS_ROOM", + "dest_warp_id": 1 + }, + { + "x": 6, + "y": 2, + "elevation": 0, + "dest_map": "MAP_POKEMON_LEAGUE_AGATHAS_ROOM", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/PokemonLeague_ChampionsRoom/events.inc b/data/maps/PokemonLeague_ChampionsRoom/events.inc deleted file mode 100644 index bd581b352..000000000 --- a/data/maps/PokemonLeague_ChampionsRoom/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -PokemonLeague_ChampionsRoom_EventObjects: - object_event 1, 72, 0, 6, 0, 8, 0, 3, 8, 17, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 - object_event 2, 71, 0, 6, 0, 15, 0, 0, 7, 17, 0, 0, 0, 0, 0, 0x0, 90, 0, 0 - -PokemonLeague_ChampionsRoom_MapWarps: - warp_def 6, 19, 3, 1, 334 - warp_def 6, 2, 3, 0, 336 - -PokemonLeague_ChampionsRoom_MapEvents:: - map_events PokemonLeague_ChampionsRoom_EventObjects, PokemonLeague_ChampionsRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/PokemonLeague_ChampionsRoom/header.inc b/data/maps/PokemonLeague_ChampionsRoom/header.inc deleted file mode 100644 index 8dd19508d..000000000 --- a/data/maps/PokemonLeague_ChampionsRoom/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -PokemonLeague_ChampionsRoom:: @ 834FAB8 - .4byte PokemonLeague_ChampionsRoom_Layout @ 0x831FBF8 - .4byte PokemonLeague_ChampionsRoom_MapEvents @ 0x83B19B8 - .4byte PokemonLeague_ChampionsRoom_MapScripts @ 0x8162AE2 - .4byte NULL - .2byte BGM_FRLG_INDIGO_PLATEAU - .2byte 217 - .byte 0x89, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/PokemonLeague_ChampionsRoom/map.json b/data/maps/PokemonLeague_ChampionsRoom/map.json new file mode 100644 index 000000000..5c4da669c --- /dev/null +++ b/data/maps/PokemonLeague_ChampionsRoom/map.json @@ -0,0 +1,61 @@ +{ + "id": "MAP_POKEMON_LEAGUE_CHAMPIONS_ROOM", + "name": "PokemonLeague_ChampionsRoom", + "layout": "LAYOUT_POKEMON_LEAGUE_CHAMPIONS_ROOM", + "music": "BGM_FRLG_INDIGO_PLATEAU", + "region_map_section": "MAPSEC_POKEMON_LEAGUE", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "72", + "x": 6, + "y": 8, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "71", + "x": 6, + "y": 15, + "elevation": 0, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "90" + } + ], + "warp_events": [ + { + "x": 6, + "y": 19, + "elevation": 3, + "dest_map": "MAP_POKEMON_LEAGUE_LANCES_ROOM", + "dest_warp_id": 1 + }, + { + "x": 6, + "y": 2, + "elevation": 3, + "dest_map": "MAP_POKEMON_LEAGUE_HALL_OF_FAME", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/PokemonLeague_HallOfFame/events.inc b/data/maps/PokemonLeague_HallOfFame/events.inc deleted file mode 100644 index efc8efd4a..000000000 --- a/data/maps/PokemonLeague_HallOfFame/events.inc +++ /dev/null @@ -1,8 +0,0 @@ -PokemonLeague_HallOfFame_EventObjects: - object_event 1, 71, 0, 6, 0, 4, 0, 3, 8, 17, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 - -PokemonLeague_HallOfFame_MapWarps: - warp_def 5, 12, 3, 1, 335 - -PokemonLeague_HallOfFame_MapEvents:: - map_events PokemonLeague_HallOfFame_EventObjects, PokemonLeague_HallOfFame_MapWarps, 0x0, 0x0 diff --git a/data/maps/PokemonLeague_HallOfFame/header.inc b/data/maps/PokemonLeague_HallOfFame/header.inc deleted file mode 100644 index aa3d6c3b9..000000000 --- a/data/maps/PokemonLeague_HallOfFame/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -PokemonLeague_HallOfFame:: @ 834FAD4 - .4byte PokemonLeague_HallOfFame_Layout @ 0x831FD3C - .4byte PokemonLeague_HallOfFame_MapEvents @ 0x83B19EC - .4byte PokemonLeague_HallOfFame_MapScripts @ 0x8162D4C - .4byte NULL - .2byte BGM_FRLG_HALL_OF_FAME_PALLET_TOWN - .2byte 218 - .byte 0x89, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/PokemonLeague_HallOfFame/map.json b/data/maps/PokemonLeague_HallOfFame/map.json new file mode 100644 index 000000000..c7529d73f --- /dev/null +++ b/data/maps/PokemonLeague_HallOfFame/map.json @@ -0,0 +1,41 @@ +{ + "id": "MAP_POKEMON_LEAGUE_HALL_OF_FAME", + "name": "PokemonLeague_HallOfFame", + "layout": "LAYOUT_POKEMON_LEAGUE_HALL_OF_FAME", + "music": "BGM_FRLG_HALL_OF_FAME_PALLET_TOWN", + "region_map_section": "MAPSEC_POKEMON_LEAGUE", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "71", + "x": 6, + "y": 4, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 5, + "y": 12, + "elevation": 3, + "dest_map": "MAP_POKEMON_LEAGUE_CHAMPIONS_ROOM", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/PokemonLeague_LancesRoom/events.inc b/data/maps/PokemonLeague_LancesRoom/events.inc deleted file mode 100644 index 9d5fcca8e..000000000 --- a/data/maps/PokemonLeague_LancesRoom/events.inc +++ /dev/null @@ -1,9 +0,0 @@ -PokemonLeague_LancesRoom_EventObjects: - object_event 1, 74, 0, 6, 0, 8, 0, 3, 8, 17, 0, 0, 0, 0, 0, PokemonLeague_LancesRoom_EventScript_162A14, 0, 0, 0 - -PokemonLeague_LancesRoom_MapWarps: - warp_def 23, 13, 3, 1, 333 - warp_def 6, 5, 0, 0, 335 - -PokemonLeague_LancesRoom_MapEvents:: - map_events PokemonLeague_LancesRoom_EventObjects, PokemonLeague_LancesRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/PokemonLeague_LancesRoom/header.inc b/data/maps/PokemonLeague_LancesRoom/header.inc deleted file mode 100644 index d37a1c254..000000000 --- a/data/maps/PokemonLeague_LancesRoom/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -PokemonLeague_LancesRoom:: @ 834FA9C - .4byte PokemonLeague_LancesRoom_Layout @ 0x831F9CC - .4byte PokemonLeague_LancesRoom_MapEvents @ 0x83B1964 - .4byte PokemonLeague_LancesRoom_MapScripts @ 0x816292D - .4byte NULL - .2byte BGM_FRLG_INDIGO_PLATEAU - .2byte 216 - .byte 0x89, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x07 diff --git a/data/maps/PokemonLeague_LancesRoom/map.json b/data/maps/PokemonLeague_LancesRoom/map.json new file mode 100644 index 000000000..f1f1a4dc8 --- /dev/null +++ b/data/maps/PokemonLeague_LancesRoom/map.json @@ -0,0 +1,48 @@ +{ + "id": "MAP_POKEMON_LEAGUE_LANCES_ROOM", + "name": "PokemonLeague_LancesRoom", + "layout": "LAYOUT_POKEMON_LEAGUE_LANCES_ROOM", + "music": "BGM_FRLG_INDIGO_PLATEAU", + "region_map_section": "MAPSEC_POKEMON_LEAGUE", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_7", + "connections": null, + "object_events": [ + { + "graphics_id": "74", + "x": 6, + "y": 8, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PokemonLeague_LancesRoom_EventScript_162A14", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 23, + "y": 13, + "elevation": 3, + "dest_map": "MAP_POKEMON_LEAGUE_AGATHAS_ROOM", + "dest_warp_id": 1 + }, + { + "x": 6, + "y": 5, + "elevation": 0, + "dest_map": "MAP_POKEMON_LEAGUE_CHAMPIONS_ROOM", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/PokemonLeague_LoreleisRoom/events.inc b/data/maps/PokemonLeague_LoreleisRoom/events.inc deleted file mode 100644 index 9f763ac45..000000000 --- a/data/maps/PokemonLeague_LoreleisRoom/events.inc +++ /dev/null @@ -1,9 +0,0 @@ -PokemonLeague_LoreleisRoom_EventObjects: - object_event 1, 77, 0, 6, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, PokemonLeague_LoreleisRoom_EventScript_1625DC, 0, 0, 0 - -PokemonLeague_LoreleisRoom_MapWarps: - warp_def 6, 12, 0, 1, 3328 - warp_def 6, 2, 0, 0, 332 - -PokemonLeague_LoreleisRoom_MapEvents:: - map_events PokemonLeague_LoreleisRoom_EventObjects, PokemonLeague_LoreleisRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/PokemonLeague_LoreleisRoom/header.inc b/data/maps/PokemonLeague_LoreleisRoom/header.inc deleted file mode 100644 index c72d978f6..000000000 --- a/data/maps/PokemonLeague_LoreleisRoom/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -PokemonLeague_LoreleisRoom:: @ 834FA48 - .4byte PokemonLeague_LoreleisRoom_Layout @ 0x831F178 - .4byte PokemonLeague_LoreleisRoom_MapEvents @ 0x83B18B0 - .4byte PokemonLeague_LoreleisRoom_MapScripts @ 0x816256C - .4byte NULL - .2byte BGM_FRLG_GYM - .2byte 213 - .byte 0x89, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x04 diff --git a/data/maps/PokemonLeague_LoreleisRoom/map.json b/data/maps/PokemonLeague_LoreleisRoom/map.json new file mode 100644 index 000000000..f853b99ba --- /dev/null +++ b/data/maps/PokemonLeague_LoreleisRoom/map.json @@ -0,0 +1,48 @@ +{ + "id": "MAP_POKEMON_LEAGUE_LORELEIS_ROOM", + "name": "PokemonLeague_LoreleisRoom", + "layout": "LAYOUT_POKEMON_LEAGUE_LORELEIS_ROOM", + "music": "BGM_FRLG_GYM", + "region_map_section": "MAPSEC_POKEMON_LEAGUE", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_4", + "connections": null, + "object_events": [ + { + "graphics_id": "77", + "x": 6, + "y": 5, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PokemonLeague_LoreleisRoom_EventScript_1625DC", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 6, + "y": 12, + "elevation": 0, + "dest_map": "MAP_INDIGO_PLATEAU_POKEMON_CENTER_1F", + "dest_warp_id": 1 + }, + { + "x": 6, + "y": 2, + "elevation": 0, + "dest_map": "MAP_POKEMON_LEAGUE_BRUNOS_ROOM", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/PokemonMansion_1F/events.inc b/data/maps/PokemonMansion_1F/events.inc deleted file mode 100644 index 88470ec39..000000000 --- a/data/maps/PokemonMansion_1F/events.inc +++ /dev/null @@ -1,25 +0,0 @@ -PokemonMansion_1F_EventObjects: - object_event 1, 55, 0, 22, 0, 24, 0, 3, 9, 17, 0, 1, 0, 4, 0, PokemonMansion_1F_EventScript_162226, 0, 0, 0 - object_event 2, 92, 0, 29, 0, 32, 0, 3, 8, 17, 0, 0, 0, 0, 0, PokemonMansion_1F_EventScript_1BE95D, 415, 0, 0 - object_event 3, 92, 0, 22, 0, 6, 0, 3, 8, 17, 0, 0, 0, 0, 0, PokemonMansion_1F_EventScript_1BE96A, 416, 0, 0 - object_event 4, 92, 0, 27, 0, 15, 0, 3, 8, 17, 0, 0, 0, 0, 0, PokemonMansion_1F_EventScript_1BEB65, 458, 0, 0 - object_event 5, 18, 0, 8, 0, 8, 0, 3, 5, 18, 0, 1, 0, 1, 0, PokemonMansion_1F_EventScript_16223D, 0, 0, 0 - -PokemonMansion_1F_MapWarps: - warp_def 7, 33, 3, 0, 776 - warp_def 8, 33, 3, 0, 776 - warp_def 9, 33, 3, 0, 776 - warp_def 10, 13, 3, 2, 316 - warp_def 25, 27, 3, 0, 318 - warp_def 34, 33, 3, 0, 776 - warp_def 35, 34, 0, 0, 776 - warp_def 19, 22, 3, 3, 317 - warp_def 20, 22, 3, 4, 317 - warp_def 11, 13, 0, 2, 316 - -PokemonMansion_1F_MapBGEvents: - bg_event 5, 5, 0, 1, 0, PokemonMansion_1F_EventScript_162212 - bg_event 2, 21, 0, 7, 0, 94, 31, 1 - -PokemonMansion_1F_MapEvents:: - map_events PokemonMansion_1F_EventObjects, PokemonMansion_1F_MapWarps, 0x0, PokemonMansion_1F_MapBGEvents diff --git a/data/maps/PokemonMansion_1F/header.inc b/data/maps/PokemonMansion_1F/header.inc deleted file mode 100644 index b3e59a63c..000000000 --- a/data/maps/PokemonMansion_1F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -PokemonMansion_1F:: @ 834F888 - .4byte PokemonMansion_1F_Layout @ 0x830AE3C - .4byte PokemonMansion_1F_MapEvents @ 0x83B0C60 - .4byte PokemonMansion_1F_MapScripts @ 0x81621F9 - .4byte NULL - .2byte BGM_FRLG_POKEMON_MANSION - .2byte 143 - .byte 0x87, 0x00, 0x0b, 0x08, 0x00, 0x07, 0x00, 0x03 diff --git a/data/maps/PokemonMansion_1F/map.json b/data/maps/PokemonMansion_1F/map.json new file mode 100644 index 000000000..a1de1c947 --- /dev/null +++ b/data/maps/PokemonMansion_1F/map.json @@ -0,0 +1,173 @@ +{ + "id": "MAP_POKEMON_MANSION_1F", + "name": "PokemonMansion_1F", + "layout": "LAYOUT_POKEMON_MANSION_1F", + "music": "BGM_FRLG_POKEMON_MANSION", + "region_map_section": "MAPSEC_POKEMON_MANSION", + "requires_flash": false, + "weather": "WEATHER_11", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_3", + "connections": null, + "object_events": [ + { + "graphics_id": "55", + "x": 22, + "y": 24, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "PokemonMansion_1F_EventScript_162226", + "flag": "0" + }, + { + "graphics_id": "92", + "x": 29, + "y": 32, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PokemonMansion_1F_EventScript_1BE95D", + "flag": "415" + }, + { + "graphics_id": "92", + "x": 22, + "y": 6, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PokemonMansion_1F_EventScript_1BE96A", + "flag": "416" + }, + { + "graphics_id": "92", + "x": 27, + "y": 15, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PokemonMansion_1F_EventScript_1BEB65", + "flag": "458" + }, + { + "graphics_id": "18", + "x": 8, + "y": 8, + "elevation": 3, + "movement_type": "5", + "movement_range_x": 2, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "PokemonMansion_1F_EventScript_16223D", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 7, + "y": 33, + "elevation": 3, + "dest_map": "MAP_CINNABAR_ISLAND", + "dest_warp_id": 0 + }, + { + "x": 8, + "y": 33, + "elevation": 3, + "dest_map": "MAP_CINNABAR_ISLAND", + "dest_warp_id": 0 + }, + { + "x": 9, + "y": 33, + "elevation": 3, + "dest_map": "MAP_CINNABAR_ISLAND", + "dest_warp_id": 0 + }, + { + "x": 10, + "y": 13, + "elevation": 3, + "dest_map": "MAP_POKEMON_MANSION_2F", + "dest_warp_id": 2 + }, + { + "x": 25, + "y": 27, + "elevation": 3, + "dest_map": "MAP_POKEMON_MANSION_B1F", + "dest_warp_id": 0 + }, + { + "x": 34, + "y": 33, + "elevation": 3, + "dest_map": "MAP_CINNABAR_ISLAND", + "dest_warp_id": 0 + }, + { + "x": 35, + "y": 34, + "elevation": 0, + "dest_map": "MAP_CINNABAR_ISLAND", + "dest_warp_id": 0 + }, + { + "x": 19, + "y": 22, + "elevation": 3, + "dest_map": "MAP_POKEMON_MANSION_3F", + "dest_warp_id": 3 + }, + { + "x": 20, + "y": 22, + "elevation": 3, + "dest_map": "MAP_POKEMON_MANSION_3F", + "dest_warp_id": 4 + }, + { + "x": 11, + "y": 13, + "elevation": 0, + "dest_map": "MAP_POKEMON_MANSION_2F", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_1", + "x": 5, + "y": 5, + "elevation": 0, + "script": "PokemonMansion_1F_EventScript_162212" + }, + { + "type": "hidden_item", + "x": 2, + "y": 21, + "elevation": 0, + "item": "ITEM_MOON_STONE", + "flag": "31", + "unknown": 1 + } + ] +}
\ No newline at end of file diff --git a/data/maps/PokemonMansion_2F/events.inc b/data/maps/PokemonMansion_2F/events.inc deleted file mode 100644 index e71547b95..000000000 --- a/data/maps/PokemonMansion_2F/events.inc +++ /dev/null @@ -1,20 +0,0 @@ -PokemonMansion_2F_EventObjects: - object_event 1, 52, 0, 5, 0, 23, 0, 3, 1, 17, 0, 1, 0, 1, 0, PokemonMansion_2F_EventScript_16228A, 0, 0, 0 - object_event 2, 92, 0, 36, 0, 8, 0, 3, 8, 17, 0, 0, 0, 0, 0, PokemonMansion_2F_EventScript_1BE977, 417, 0, 0 - object_event 3, 92, 0, 18, 0, 23, 0, 3, 8, 17, 0, 0, 0, 0, 0, PokemonMansion_2F_EventScript_1BEB72, 459, 0, 0 - object_event 4, 92, 0, 35, 0, 17, 0, 3, 8, 17, 0, 0, 0, 0, 0, PokemonMansion_2F_EventScript_1BEB7F, 460, 0, 0 - -PokemonMansion_2F_MapWarps: - warp_def 9, 3, 3, 0, 317 - warp_def 34, 22, 3, 1, 317 - warp_def 6, 14, 3, 3, 315 - warp_def 9, 14, 3, 2, 317 - warp_def 27, 17, 3, 5, 317 - -PokemonMansion_2F_MapBGEvents: - bg_event 2, 16, 0, 1, 0, PokemonMansion_2F_EventScript_162264 - bg_event 6, 31, 0, 0, 0, PokemonMansion_2F_EventScript_162281 - bg_event 25, 4, 0, 0, 0, PokemonMansion_2F_EventScript_162278 - -PokemonMansion_2F_MapEvents:: - map_events PokemonMansion_2F_EventObjects, PokemonMansion_2F_MapWarps, 0x0, PokemonMansion_2F_MapBGEvents diff --git a/data/maps/PokemonMansion_2F/header.inc b/data/maps/PokemonMansion_2F/header.inc deleted file mode 100644 index f3b161fdd..000000000 --- a/data/maps/PokemonMansion_2F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -PokemonMansion_2F:: @ 834F8A4 - .4byte PokemonMansion_2F_Layout @ 0x830B9A8 - .4byte PokemonMansion_2F_MapEvents @ 0x83B0D20 - .4byte PokemonMansion_2F_MapScripts @ 0x8162254 - .4byte NULL - .2byte BGM_FRLG_POKEMON_MANSION - .2byte 144 - .byte 0x87, 0x00, 0x0b, 0x08, 0x00, 0x07, 0x00, 0x03 diff --git a/data/maps/PokemonMansion_2F/map.json b/data/maps/PokemonMansion_2F/map.json new file mode 100644 index 000000000..edfc69272 --- /dev/null +++ b/data/maps/PokemonMansion_2F/map.json @@ -0,0 +1,130 @@ +{ + "id": "MAP_POKEMON_MANSION_2F", + "name": "PokemonMansion_2F", + "layout": "LAYOUT_POKEMON_MANSION_2F", + "music": "BGM_FRLG_POKEMON_MANSION", + "region_map_section": "MAPSEC_POKEMON_MANSION", + "requires_flash": false, + "weather": "WEATHER_11", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_3", + "connections": null, + "object_events": [ + { + "graphics_id": "52", + "x": 5, + "y": 23, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "PokemonMansion_2F_EventScript_16228A", + "flag": "0" + }, + { + "graphics_id": "92", + "x": 36, + "y": 8, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PokemonMansion_2F_EventScript_1BE977", + "flag": "417" + }, + { + "graphics_id": "92", + "x": 18, + "y": 23, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PokemonMansion_2F_EventScript_1BEB72", + "flag": "459" + }, + { + "graphics_id": "92", + "x": 35, + "y": 17, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PokemonMansion_2F_EventScript_1BEB7F", + "flag": "460" + } + ], + "warp_events": [ + { + "x": 9, + "y": 3, + "elevation": 3, + "dest_map": "MAP_POKEMON_MANSION_3F", + "dest_warp_id": 0 + }, + { + "x": 34, + "y": 22, + "elevation": 3, + "dest_map": "MAP_POKEMON_MANSION_3F", + "dest_warp_id": 1 + }, + { + "x": 6, + "y": 14, + "elevation": 3, + "dest_map": "MAP_POKEMON_MANSION_1F", + "dest_warp_id": 3 + }, + { + "x": 9, + "y": 14, + "elevation": 3, + "dest_map": "MAP_POKEMON_MANSION_3F", + "dest_warp_id": 2 + }, + { + "x": 27, + "y": 17, + "elevation": 3, + "dest_map": "MAP_POKEMON_MANSION_3F", + "dest_warp_id": 5 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_1", + "x": 2, + "y": 16, + "elevation": 0, + "script": "PokemonMansion_2F_EventScript_162264" + }, + { + "type": "bg_event_type_0", + "x": 6, + "y": 31, + "elevation": 0, + "script": "PokemonMansion_2F_EventScript_162281" + }, + { + "type": "bg_event_type_0", + "x": 25, + "y": 4, + "elevation": 0, + "script": "PokemonMansion_2F_EventScript_162278" + } + ] +}
\ No newline at end of file diff --git a/data/maps/PokemonMansion_3F/events.inc b/data/maps/PokemonMansion_3F/events.inc deleted file mode 100644 index 8ceb850c8..000000000 --- a/data/maps/PokemonMansion_3F/events.inc +++ /dev/null @@ -1,23 +0,0 @@ -PokemonMansion_3F_EventObjects: - object_event 1, 52, 0, 7, 0, 13, 0, 3, 2, 17, 0, 1, 0, 1, 0, PokemonMansion_3F_EventScript_1622CE, 0, 0, 0 - object_event 2, 55, 0, 22, 0, 13, 0, 3, 8, 17, 0, 1, 0, 1, 0, PokemonMansion_3F_EventScript_1622E5, 0, 0, 0 - object_event 3, 92, 0, 9, 0, 19, 0, 3, 8, 17, 0, 0, 0, 0, 0, PokemonMansion_3F_EventScript_1BE984, 418, 0, 0 - object_event 4, 92, 0, 32, 0, 6, 0, 3, 8, 17, 0, 0, 0, 0, 0, PokemonMansion_3F_EventScript_1BE991, 419, 0, 0 - -PokemonMansion_3F_MapWarps: - warp_def 8, 3, 3, 0, 316 - warp_def 34, 18, 3, 1, 316 - warp_def 11, 11, 3, 3, 316 - warp_def 18, 18, 3, 7, 315 - warp_def 19, 18, 3, 8, 315 - warp_def 23, 18, 3, 4, 316 - warp_def 20, 18, 3, 8, 315 - warp_def 24, 18, 3, 4, 316 - -PokemonMansion_3F_MapBGEvents: - bg_event 8, 16, 0, 0, 0, PokemonMansion_3F_EventScript_1622C5 - bg_event 12, 5, 0, 1, 0, PokemonMansion_3F_EventScript_1622B1 - bg_event 36, 13, 3, 7, 0, 68, 32, 1 - -PokemonMansion_3F_MapEvents:: - map_events PokemonMansion_3F_EventObjects, PokemonMansion_3F_MapWarps, 0x0, PokemonMansion_3F_MapBGEvents diff --git a/data/maps/PokemonMansion_3F/header.inc b/data/maps/PokemonMansion_3F/header.inc deleted file mode 100644 index e86dc4f3b..000000000 --- a/data/maps/PokemonMansion_3F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -PokemonMansion_3F:: @ 834F8C0 - .4byte PokemonMansion_3F_Layout @ 0x830C430 - .4byte PokemonMansion_3F_MapEvents @ 0x83B0DF8 - .4byte PokemonMansion_3F_MapScripts @ 0x81622A1 - .4byte NULL - .2byte BGM_FRLG_POKEMON_MANSION - .2byte 145 - .byte 0x87, 0x00, 0x0b, 0x08, 0x00, 0x07, 0x00, 0x03 diff --git a/data/maps/PokemonMansion_3F/map.json b/data/maps/PokemonMansion_3F/map.json new file mode 100644 index 000000000..cabb1dae5 --- /dev/null +++ b/data/maps/PokemonMansion_3F/map.json @@ -0,0 +1,153 @@ +{ + "id": "MAP_POKEMON_MANSION_3F", + "name": "PokemonMansion_3F", + "layout": "LAYOUT_POKEMON_MANSION_3F", + "music": "BGM_FRLG_POKEMON_MANSION", + "region_map_section": "MAPSEC_POKEMON_MANSION", + "requires_flash": false, + "weather": "WEATHER_11", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_3", + "connections": null, + "object_events": [ + { + "graphics_id": "52", + "x": 7, + "y": 13, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "PokemonMansion_3F_EventScript_1622CE", + "flag": "0" + }, + { + "graphics_id": "55", + "x": 22, + "y": 13, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "PokemonMansion_3F_EventScript_1622E5", + "flag": "0" + }, + { + "graphics_id": "92", + "x": 9, + "y": 19, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PokemonMansion_3F_EventScript_1BE984", + "flag": "418" + }, + { + "graphics_id": "92", + "x": 32, + "y": 6, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PokemonMansion_3F_EventScript_1BE991", + "flag": "419" + } + ], + "warp_events": [ + { + "x": 8, + "y": 3, + "elevation": 3, + "dest_map": "MAP_POKEMON_MANSION_2F", + "dest_warp_id": 0 + }, + { + "x": 34, + "y": 18, + "elevation": 3, + "dest_map": "MAP_POKEMON_MANSION_2F", + "dest_warp_id": 1 + }, + { + "x": 11, + "y": 11, + "elevation": 3, + "dest_map": "MAP_POKEMON_MANSION_2F", + "dest_warp_id": 3 + }, + { + "x": 18, + "y": 18, + "elevation": 3, + "dest_map": "MAP_POKEMON_MANSION_1F", + "dest_warp_id": 7 + }, + { + "x": 19, + "y": 18, + "elevation": 3, + "dest_map": "MAP_POKEMON_MANSION_1F", + "dest_warp_id": 8 + }, + { + "x": 23, + "y": 18, + "elevation": 3, + "dest_map": "MAP_POKEMON_MANSION_2F", + "dest_warp_id": 4 + }, + { + "x": 20, + "y": 18, + "elevation": 3, + "dest_map": "MAP_POKEMON_MANSION_1F", + "dest_warp_id": 8 + }, + { + "x": 24, + "y": 18, + "elevation": 3, + "dest_map": "MAP_POKEMON_MANSION_2F", + "dest_warp_id": 4 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 8, + "y": 16, + "elevation": 0, + "script": "PokemonMansion_3F_EventScript_1622C5" + }, + { + "type": "bg_event_type_1", + "x": 12, + "y": 5, + "elevation": 0, + "script": "PokemonMansion_3F_EventScript_1622B1" + }, + { + "type": "hidden_item", + "x": 36, + "y": 13, + "elevation": 3, + "item": "ITEM_RARE_CANDY", + "flag": "32", + "unknown": 1 + } + ] +}
\ No newline at end of file diff --git a/data/maps/PokemonMansion_B1F/events.inc b/data/maps/PokemonMansion_B1F/events.inc deleted file mode 100644 index 26dc5dd4f..000000000 --- a/data/maps/PokemonMansion_B1F/events.inc +++ /dev/null @@ -1,19 +0,0 @@ -PokemonMansion_B1F_EventObjects: - object_event 1, 92, 0, 6, 0, 21, 0, 3, 8, 17, 0, 0, 0, 0, 0, PokemonMansion_B1F_EventScript_1BE9B8, 423, 0, 0 - object_event 2, 52, 0, 20, 0, 25, 0, 3, 2, 17, 0, 1, 0, 1, 0, PokemonMansion_B1F_EventScript_162329, 0, 0, 0 - object_event 3, 55, 0, 34, 0, 13, 0, 3, 8, 17, 0, 1, 0, 6, 0, PokemonMansion_B1F_EventScript_162340, 0, 0, 0 - object_event 4, 92, 0, 23, 0, 4, 0, 3, 8, 17, 0, 0, 0, 0, 0, PokemonMansion_B1F_EventScript_1BE99E, 420, 0, 0 - object_event 5, 92, 0, 2, 0, 29, 0, 3, 8, 17, 0, 0, 0, 0, 0, PokemonMansion_B1F_EventScript_1BE9AB, 421, 0, 0 - object_event 6, 92, 0, 5, 0, 7, 0, 3, 8, 17, 0, 0, 0, 0, 0, PokemonMansion_B1F_EventScript_1BE9C5, 424, 0, 0 - -PokemonMansion_B1F_MapWarps: - warp_def 34, 29, 3, 4, 315 - -PokemonMansion_B1F_MapBGEvents: - bg_event 21, 27, 0, 0, 0, PokemonMansion_B1F_EventScript_162320 - bg_event 24, 29, 0, 1, 0, PokemonMansion_B1F_EventScript_16230C - bg_event 27, 5, 0, 1, 0, PokemonMansion_B1F_EventScript_16230C - bg_event 35, 5, 3, 7, 0, 36, 33, 1 - -PokemonMansion_B1F_MapEvents:: - map_events PokemonMansion_B1F_EventObjects, PokemonMansion_B1F_MapWarps, 0x0, PokemonMansion_B1F_MapBGEvents diff --git a/data/maps/PokemonMansion_B1F/header.inc b/data/maps/PokemonMansion_B1F/header.inc deleted file mode 100644 index a5d64c3bf..000000000 --- a/data/maps/PokemonMansion_B1F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -PokemonMansion_B1F:: @ 834F8DC - .4byte PokemonMansion_B1F_Layout @ 0x830CEB8 - .4byte PokemonMansion_B1F_MapEvents @ 0x83B0ED4 - .4byte PokemonMansion_B1F_MapScripts @ 0x81622FC - .4byte NULL - .2byte BGM_FRLG_POKEMON_MANSION - .2byte 146 - .byte 0x87, 0x00, 0x0b, 0x08, 0x00, 0x07, 0x00, 0x03 diff --git a/data/maps/PokemonMansion_B1F/map.json b/data/maps/PokemonMansion_B1F/map.json new file mode 100644 index 000000000..b12b4fc61 --- /dev/null +++ b/data/maps/PokemonMansion_B1F/map.json @@ -0,0 +1,137 @@ +{ + "id": "MAP_POKEMON_MANSION_B1F", + "name": "PokemonMansion_B1F", + "layout": "LAYOUT_POKEMON_MANSION_B1F", + "music": "BGM_FRLG_POKEMON_MANSION", + "region_map_section": "MAPSEC_POKEMON_MANSION", + "requires_flash": false, + "weather": "WEATHER_11", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_3", + "connections": null, + "object_events": [ + { + "graphics_id": "92", + "x": 6, + "y": 21, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PokemonMansion_B1F_EventScript_1BE9B8", + "flag": "423" + }, + { + "graphics_id": "52", + "x": 20, + "y": 25, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "PokemonMansion_B1F_EventScript_162329", + "flag": "0" + }, + { + "graphics_id": "55", + "x": 34, + "y": 13, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 6, + "script": "PokemonMansion_B1F_EventScript_162340", + "flag": "0" + }, + { + "graphics_id": "92", + "x": 23, + "y": 4, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PokemonMansion_B1F_EventScript_1BE99E", + "flag": "420" + }, + { + "graphics_id": "92", + "x": 2, + "y": 29, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PokemonMansion_B1F_EventScript_1BE9AB", + "flag": "421" + }, + { + "graphics_id": "92", + "x": 5, + "y": 7, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PokemonMansion_B1F_EventScript_1BE9C5", + "flag": "424" + } + ], + "warp_events": [ + { + "x": 34, + "y": 29, + "elevation": 3, + "dest_map": "MAP_POKEMON_MANSION_1F", + "dest_warp_id": 4 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 21, + "y": 27, + "elevation": 0, + "script": "PokemonMansion_B1F_EventScript_162320" + }, + { + "type": "bg_event_type_1", + "x": 24, + "y": 29, + "elevation": 0, + "script": "PokemonMansion_B1F_EventScript_16230C" + }, + { + "type": "bg_event_type_1", + "x": 27, + "y": 5, + "elevation": 0, + "script": "PokemonMansion_B1F_EventScript_16230C" + }, + { + "type": "hidden_item", + "x": 35, + "y": 5, + "elevation": 3, + "item": "ITEM_ELIXIR", + "flag": "33", + "unknown": 1 + } + ] +}
\ No newline at end of file diff --git a/data/maps/PokemonTower_1F/events.inc b/data/maps/PokemonTower_1F/events.inc deleted file mode 100644 index 26c172711..000000000 --- a/data/maps/PokemonTower_1F/events.inc +++ /dev/null @@ -1,15 +0,0 @@ -PokemonTower_1F_EventObjects: - object_event 1, 48, 0, 18, 0, 13, 0, 3, 7, 17, 0, 0, 0, 0, 0, PokemonTower_1F_EventScript_16327C, 0, 0, 0 - object_event 2, 58, 0, 18, 0, 7, 0, 3, 9, 17, 0, 0, 0, 0, 0, PokemonTower_1F_EventScript_16323F, 0, 0, 0 - object_event 3, 28, 0, 15, 0, 6, 0, 3, 7, 17, 0, 0, 0, 0, 0, PokemonTower_1F_EventScript_163248, 0, 0, 0 - object_event 4, 31, 0, 7, 0, 8, 0, 3, 2, 17, 0, 0, 0, 0, 0, PokemonTower_1F_EventScript_16325A, 0, 0, 0 - object_event 5, 30, 0, 8, 0, 12, 0, 3, 2, 34, 0, 0, 0, 0, 0, PokemonTower_1F_EventScript_163251, 0, 0, 0 - -PokemonTower_1F_MapWarps: - warp_def 10, 19, 3, 0, 772 - warp_def 11, 18, 3, 0, 772 - warp_def 12, 19, 3, 0, 772 - warp_def 18, 9, 3, 1, 345 - -PokemonTower_1F_MapEvents:: - map_events PokemonTower_1F_EventObjects, PokemonTower_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/PokemonTower_1F/header.inc b/data/maps/PokemonTower_1F/header.inc deleted file mode 100644 index 61a8cd0fb..000000000 --- a/data/maps/PokemonTower_1F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -PokemonTower_1F:: @ 834FBB4 - .4byte PokemonTower_1F_Layout @ 0x83167F4 - .4byte PokemonTower_1F_MapEvents @ 0x83B2270 - .4byte PokemonTower_1F_MapScripts @ 0x8163235 - .4byte NULL - .2byte BGM_FRLG_POKEMON_TOWER - .2byte 161 - .byte 0x8c, 0x00, 0x00, 0x08, 0x00, 0x05, 0x00, 0x02 diff --git a/data/maps/PokemonTower_1F/map.json b/data/maps/PokemonTower_1F/map.json new file mode 100644 index 000000000..0a7c0726f --- /dev/null +++ b/data/maps/PokemonTower_1F/map.json @@ -0,0 +1,114 @@ +{ + "id": "MAP_POKEMON_TOWER_1F", + "name": "PokemonTower_1F", + "layout": "LAYOUT_POKEMON_TOWER_1F", + "music": "BGM_FRLG_POKEMON_TOWER", + "region_map_section": "MAPSEC_POKEMON_TOWER", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 5, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_2", + "connections": null, + "object_events": [ + { + "graphics_id": "48", + "x": 18, + "y": 13, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PokemonTower_1F_EventScript_16327C", + "flag": "0" + }, + { + "graphics_id": "58", + "x": 18, + "y": 7, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PokemonTower_1F_EventScript_16323F", + "flag": "0" + }, + { + "graphics_id": "28", + "x": 15, + "y": 6, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PokemonTower_1F_EventScript_163248", + "flag": "0" + }, + { + "graphics_id": "31", + "x": 7, + "y": 8, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PokemonTower_1F_EventScript_16325A", + "flag": "0" + }, + { + "graphics_id": "30", + "x": 8, + "y": 12, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 2, + "movement_range_y": 2, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PokemonTower_1F_EventScript_163251", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 10, + "y": 19, + "elevation": 3, + "dest_map": "MAP_LAVENDER_TOWN", + "dest_warp_id": 0 + }, + { + "x": 11, + "y": 18, + "elevation": 3, + "dest_map": "MAP_LAVENDER_TOWN", + "dest_warp_id": 0 + }, + { + "x": 12, + "y": 19, + "elevation": 3, + "dest_map": "MAP_LAVENDER_TOWN", + "dest_warp_id": 0 + }, + { + "x": 18, + "y": 9, + "elevation": 3, + "dest_map": "MAP_POKEMON_TOWER_2F", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/PokemonTower_2F/events.inc b/data/maps/PokemonTower_2F/events.inc deleted file mode 100644 index 332b2cedc..000000000 --- a/data/maps/PokemonTower_2F/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -PokemonTower_2F_EventObjects: - object_event 1, 72, 0, 16, 0, 5, 0, 3, 7, 17, 0, 0, 0, 0, 0, 0x0, 81, 0, 0 - object_event 2, 58, 0, 3, 0, 7, 0, 0, 10, 17, 0, 0, 0, 0, 0, PokemonTower_2F_EventScript_163286, 0, 0, 0 - -PokemonTower_2F_MapWarps: - warp_def 4, 10, 3, 0, 346 - warp_def 18, 10, 3, 3, 344 - -PokemonTower_2F_MapCoordEvents: - coord_event 17, 5, 3, 0, 16477, 0, 0, PokemonTower_2F_EventScript_16328F - coord_event 16, 6, 3, 0, 16477, 0, 0, PokemonTower_2F_EventScript_16329B - -PokemonTower_2F_MapEvents:: - map_events PokemonTower_2F_EventObjects, PokemonTower_2F_MapWarps, PokemonTower_2F_MapCoordEvents, 0x0 diff --git a/data/maps/PokemonTower_2F/header.inc b/data/maps/PokemonTower_2F/header.inc deleted file mode 100644 index ee7c892ce..000000000 --- a/data/maps/PokemonTower_2F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -PokemonTower_2F:: @ 834FBD0 - .4byte PokemonTower_2F_Layout @ 0x8316BD8 - .4byte PokemonTower_2F_MapEvents @ 0x83B22E4 - .4byte PokemonTower_2F_MapScripts @ 0x8163285 - .4byte NULL - .2byte BGM_FRLG_POKEMON_TOWER - .2byte 162 - .byte 0x8c, 0x00, 0x00, 0x08, 0x00, 0x05, 0x00, 0x02 diff --git a/data/maps/PokemonTower_2F/map.json b/data/maps/PokemonTower_2F/map.json new file mode 100644 index 000000000..1d83dc368 --- /dev/null +++ b/data/maps/PokemonTower_2F/map.json @@ -0,0 +1,80 @@ +{ + "id": "MAP_POKEMON_TOWER_2F", + "name": "PokemonTower_2F", + "layout": "LAYOUT_POKEMON_TOWER_2F", + "music": "BGM_FRLG_POKEMON_TOWER", + "region_map_section": "MAPSEC_POKEMON_TOWER", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 5, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_2", + "connections": null, + "object_events": [ + { + "graphics_id": "72", + "x": 16, + "y": 5, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "81" + }, + { + "graphics_id": "58", + "x": 3, + "y": 7, + "elevation": 0, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PokemonTower_2F_EventScript_163286", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 4, + "y": 10, + "elevation": 3, + "dest_map": "MAP_POKEMON_TOWER_3F", + "dest_warp_id": 0 + }, + { + "x": 18, + "y": 10, + "elevation": 3, + "dest_map": "MAP_POKEMON_TOWER_1F", + "dest_warp_id": 3 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 17, + "y": 5, + "elevation": 3, + "var": "VAR_0x405D", + "var_value": 0, + "script": "PokemonTower_2F_EventScript_16328F" + }, + { + "type": "trigger", + "x": 16, + "y": 6, + "elevation": 3, + "var": "VAR_0x405D", + "var_value": 0, + "script": "PokemonTower_2F_EventScript_16329B" + } + ], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/PokemonTower_3F/events.inc b/data/maps/PokemonTower_3F/events.inc deleted file mode 100644 index 487e99cc5..000000000 --- a/data/maps/PokemonTower_3F/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -PokemonTower_3F_EventObjects: - object_event 1, 58, 0, 10, 0, 14, 0, 3, 8, 17, 0, 1, 0, 3, 0, PokemonTower_3F_EventScript_1633A7, 0, 0, 0 - object_event 2, 58, 0, 9, 0, 9, 0, 3, 8, 17, 0, 1, 0, 3, 0, PokemonTower_3F_EventScript_1633BE, 0, 0, 0 - object_event 3, 58, 0, 12, 0, 4, 0, 3, 13, 17, 0, 1, 0, 2, 0, PokemonTower_3F_EventScript_1633D5, 0, 0, 0 - object_event 4, 92, 0, 13, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, PokemonTower_3F_EventScript_1BE755, 375, 0, 0 - -PokemonTower_3F_MapWarps: - warp_def 4, 10, 3, 0, 345 - warp_def 18, 10, 3, 1, 347 - -PokemonTower_3F_MapEvents:: - map_events PokemonTower_3F_EventObjects, PokemonTower_3F_MapWarps, 0x0, 0x0 diff --git a/data/maps/PokemonTower_3F/header.inc b/data/maps/PokemonTower_3F/header.inc deleted file mode 100644 index 9d972f0a1..000000000 --- a/data/maps/PokemonTower_3F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -PokemonTower_3F:: @ 834FBEC - .4byte PokemonTower_3F_Layout @ 0x8316FBC - .4byte PokemonTower_3F_MapEvents @ 0x83B2368 - .4byte PokemonTower_3F_MapScripts @ 0x81633A6 - .4byte NULL - .2byte BGM_FRLG_POKEMON_TOWER - .2byte 163 - .byte 0x8c, 0x00, 0x06, 0x08, 0x00, 0x05, 0x00, 0x02 diff --git a/data/maps/PokemonTower_3F/map.json b/data/maps/PokemonTower_3F/map.json new file mode 100644 index 000000000..e4109d22a --- /dev/null +++ b/data/maps/PokemonTower_3F/map.json @@ -0,0 +1,87 @@ +{ + "id": "MAP_POKEMON_TOWER_3F", + "name": "PokemonTower_3F", + "layout": "LAYOUT_POKEMON_TOWER_3F", + "music": "BGM_FRLG_POKEMON_TOWER", + "region_map_section": "MAPSEC_POKEMON_TOWER", + "requires_flash": false, + "weather": "WEATHER_6", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 5, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_2", + "connections": null, + "object_events": [ + { + "graphics_id": "58", + "x": 10, + "y": 14, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "PokemonTower_3F_EventScript_1633A7", + "flag": "0" + }, + { + "graphics_id": "58", + "x": 9, + "y": 9, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "PokemonTower_3F_EventScript_1633BE", + "flag": "0" + }, + { + "graphics_id": "58", + "x": 12, + "y": 4, + "elevation": 3, + "movement_type": "13", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "PokemonTower_3F_EventScript_1633D5", + "flag": "0" + }, + { + "graphics_id": "92", + "x": 13, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PokemonTower_3F_EventScript_1BE755", + "flag": "375" + } + ], + "warp_events": [ + { + "x": 4, + "y": 10, + "elevation": 3, + "dest_map": "MAP_POKEMON_TOWER_2F", + "dest_warp_id": 0 + }, + { + "x": 18, + "y": 10, + "elevation": 3, + "dest_map": "MAP_POKEMON_TOWER_4F", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/PokemonTower_4F/events.inc b/data/maps/PokemonTower_4F/events.inc deleted file mode 100644 index 9dd2cb2aa..000000000 --- a/data/maps/PokemonTower_4F/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -PokemonTower_4F_EventObjects: - object_event 1, 58, 0, 17, 0, 7, 0, 3, 8, 17, 0, 1, 0, 3, 0, PokemonTower_4F_EventScript_163404, 0, 0, 0 - object_event 2, 58, 0, 15, 0, 13, 0, 3, 9, 17, 0, 1, 0, 5, 0, PokemonTower_4F_EventScript_16341B, 0, 0, 0 - object_event 3, 58, 0, 4, 0, 12, 0, 3, 10, 17, 0, 1, 0, 2, 0, PokemonTower_4F_EventScript_1633ED, 0, 0, 0 - object_event 4, 92, 0, 12, 0, 11, 0, 3, 8, 17, 0, 0, 0, 0, 0, PokemonTower_4F_EventScript_1BE762, 376, 0, 0 - object_event 5, 92, 0, 8, 0, 11, 0, 3, 8, 17, 0, 0, 0, 0, 0, PokemonTower_4F_EventScript_1BE76F, 377, 0, 0 - object_event 6, 92, 0, 11, 0, 16, 0, 3, 8, 17, 0, 0, 0, 0, 0, PokemonTower_4F_EventScript_1BE77C, 378, 0, 0 - -PokemonTower_4F_MapWarps: - warp_def 4, 10, 3, 0, 348 - warp_def 18, 10, 3, 1, 346 - -PokemonTower_4F_MapEvents:: - map_events PokemonTower_4F_EventObjects, PokemonTower_4F_MapWarps, 0x0, 0x0 diff --git a/data/maps/PokemonTower_4F/header.inc b/data/maps/PokemonTower_4F/header.inc deleted file mode 100644 index fe31ef96b..000000000 --- a/data/maps/PokemonTower_4F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -PokemonTower_4F:: @ 834FC08 - .4byte PokemonTower_4F_Layout @ 0x83173A0 - .4byte PokemonTower_4F_MapEvents @ 0x83B241C - .4byte PokemonTower_4F_MapScripts @ 0x81633EC - .4byte NULL - .2byte BGM_FRLG_POKEMON_TOWER - .2byte 164 - .byte 0x8c, 0x00, 0x06, 0x08, 0x00, 0x05, 0x00, 0x02 diff --git a/data/maps/PokemonTower_4F/map.json b/data/maps/PokemonTower_4F/map.json new file mode 100644 index 000000000..e9262ecba --- /dev/null +++ b/data/maps/PokemonTower_4F/map.json @@ -0,0 +1,113 @@ +{ + "id": "MAP_POKEMON_TOWER_4F", + "name": "PokemonTower_4F", + "layout": "LAYOUT_POKEMON_TOWER_4F", + "music": "BGM_FRLG_POKEMON_TOWER", + "region_map_section": "MAPSEC_POKEMON_TOWER", + "requires_flash": false, + "weather": "WEATHER_6", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 5, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_2", + "connections": null, + "object_events": [ + { + "graphics_id": "58", + "x": 17, + "y": 7, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "PokemonTower_4F_EventScript_163404", + "flag": "0" + }, + { + "graphics_id": "58", + "x": 15, + "y": 13, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "PokemonTower_4F_EventScript_16341B", + "flag": "0" + }, + { + "graphics_id": "58", + "x": 4, + "y": 12, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "PokemonTower_4F_EventScript_1633ED", + "flag": "0" + }, + { + "graphics_id": "92", + "x": 12, + "y": 11, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PokemonTower_4F_EventScript_1BE762", + "flag": "376" + }, + { + "graphics_id": "92", + "x": 8, + "y": 11, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PokemonTower_4F_EventScript_1BE76F", + "flag": "377" + }, + { + "graphics_id": "92", + "x": 11, + "y": 16, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PokemonTower_4F_EventScript_1BE77C", + "flag": "378" + } + ], + "warp_events": [ + { + "x": 4, + "y": 10, + "elevation": 3, + "dest_map": "MAP_POKEMON_TOWER_5F", + "dest_warp_id": 0 + }, + { + "x": 18, + "y": 10, + "elevation": 3, + "dest_map": "MAP_POKEMON_TOWER_3F", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/PokemonTower_5F/events.inc b/data/maps/PokemonTower_5F/events.inc deleted file mode 100644 index 88e67476b..000000000 --- a/data/maps/PokemonTower_5F/events.inc +++ /dev/null @@ -1,37 +0,0 @@ -PokemonTower_5F_EventObjects: - object_event 1, 58, 0, 11, 0, 4, 0, 3, 1, 17, 0, 1, 0, 2, 0, PokemonTower_5F_EventScript_163472, 0, 0, 0 - object_event 2, 58, 0, 19, 0, 7, 0, 3, 9, 17, 0, 1, 0, 3, 0, PokemonTower_5F_EventScript_16345B, 0, 0, 0 - object_event 3, 58, 0, 7, 0, 12, 0, 3, 10, 17, 0, 1, 0, 2, 0, PokemonTower_5F_EventScript_163489, 0, 0, 0 - object_event 4, 58, 0, 11, 0, 16, 0, 3, 1, 17, 0, 1, 0, 2, 0, PokemonTower_5F_EventScript_1634A0, 0, 0, 0 - object_event 5, 58, 0, 12, 0, 8, 0, 3, 10, 17, 0, 0, 0, 0, 0, PokemonTower_5F_EventScript_163433, 0, 0, 0 - object_event 6, 92, 0, 6, 0, 16, 0, 3, 8, 17, 0, 0, 0, 0, 0, PokemonTower_5F_EventScript_1BE789, 379, 0, 0 - object_event 7, 92, 0, 11, 0, 9, 0, 3, 8, 17, 0, 0, 0, 0, 0, PokemonTower_5F_EventScript_1BEBB3, 464, 0, 0 - -PokemonTower_5F_MapWarps: - warp_def 4, 10, 3, 0, 347 - warp_def 18, 10, 3, 1, 349 - -PokemonTower_5F_MapCoordEvents: - coord_event 10, 8, 3, 0, 16385, 0, 0, PokemonTower_5F_EventScript_16343C - coord_event 11, 8, 3, 0, 16385, 0, 0, PokemonTower_5F_EventScript_16343C - coord_event 12, 8, 3, 0, 16385, 0, 0, PokemonTower_5F_EventScript_16343C - coord_event 10, 9, 3, 0, 16385, 0, 0, PokemonTower_5F_EventScript_16343C - coord_event 9, 8, 3, 0, 16385, 1, 0, PokemonTower_5F_EventScript_163453 - coord_event 12, 9, 3, 0, 16385, 0, 0, PokemonTower_5F_EventScript_16343C - coord_event 10, 10, 3, 0, 16385, 0, 0, PokemonTower_5F_EventScript_16343C - coord_event 11, 10, 3, 0, 16385, 0, 0, PokemonTower_5F_EventScript_16343C - coord_event 12, 10, 0, 0, 16385, 0, 0, PokemonTower_5F_EventScript_16343C - coord_event 9, 9, 3, 0, 16385, 1, 0, PokemonTower_5F_EventScript_163453 - coord_event 9, 10, 3, 0, 16385, 1, 0, PokemonTower_5F_EventScript_163453 - coord_event 10, 11, 3, 0, 16385, 1, 0, PokemonTower_5F_EventScript_163453 - coord_event 11, 11, 3, 0, 16385, 1, 0, PokemonTower_5F_EventScript_163453 - coord_event 12, 11, 0, 0, 16385, 1, 0, PokemonTower_5F_EventScript_163453 - coord_event 13, 8, 0, 0, 16385, 1, 0, PokemonTower_5F_EventScript_163453 - coord_event 13, 9, 0, 0, 16385, 1, 0, PokemonTower_5F_EventScript_163453 - coord_event 13, 10, 0, 0, 16385, 1, 0, PokemonTower_5F_EventScript_163453 - -PokemonTower_5F_MapBGEvents: - bg_event 7, 3, 3, 7, 0, 104, 14, 1 - -PokemonTower_5F_MapEvents:: - map_events PokemonTower_5F_EventObjects, PokemonTower_5F_MapWarps, PokemonTower_5F_MapCoordEvents, PokemonTower_5F_MapBGEvents diff --git a/data/maps/PokemonTower_5F/header.inc b/data/maps/PokemonTower_5F/header.inc deleted file mode 100644 index f2e38b1b6..000000000 --- a/data/maps/PokemonTower_5F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -PokemonTower_5F:: @ 834FC24 - .4byte PokemonTower_5F_Layout @ 0x8317784 - .4byte PokemonTower_5F_MapEvents @ 0x83B2604 - .4byte PokemonTower_5F_MapScripts @ 0x8163432 - .4byte NULL - .2byte BGM_FRLG_POKEMON_TOWER - .2byte 165 - .byte 0x8c, 0x00, 0x06, 0x08, 0x00, 0x05, 0x00, 0x02 diff --git a/data/maps/PokemonTower_5F/map.json b/data/maps/PokemonTower_5F/map.json new file mode 100644 index 000000000..e44ded9f5 --- /dev/null +++ b/data/maps/PokemonTower_5F/map.json @@ -0,0 +1,290 @@ +{ + "id": "MAP_POKEMON_TOWER_5F", + "name": "PokemonTower_5F", + "layout": "LAYOUT_POKEMON_TOWER_5F", + "music": "BGM_FRLG_POKEMON_TOWER", + "region_map_section": "MAPSEC_POKEMON_TOWER", + "requires_flash": false, + "weather": "WEATHER_6", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 5, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_2", + "connections": null, + "object_events": [ + { + "graphics_id": "58", + "x": 11, + "y": 4, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "PokemonTower_5F_EventScript_163472", + "flag": "0" + }, + { + "graphics_id": "58", + "x": 19, + "y": 7, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "PokemonTower_5F_EventScript_16345B", + "flag": "0" + }, + { + "graphics_id": "58", + "x": 7, + "y": 12, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "PokemonTower_5F_EventScript_163489", + "flag": "0" + }, + { + "graphics_id": "58", + "x": 11, + "y": 16, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "PokemonTower_5F_EventScript_1634A0", + "flag": "0" + }, + { + "graphics_id": "58", + "x": 12, + "y": 8, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PokemonTower_5F_EventScript_163433", + "flag": "0" + }, + { + "graphics_id": "92", + "x": 6, + "y": 16, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PokemonTower_5F_EventScript_1BE789", + "flag": "379" + }, + { + "graphics_id": "92", + "x": 11, + "y": 9, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PokemonTower_5F_EventScript_1BEBB3", + "flag": "464" + } + ], + "warp_events": [ + { + "x": 4, + "y": 10, + "elevation": 3, + "dest_map": "MAP_POKEMON_TOWER_4F", + "dest_warp_id": 0 + }, + { + "x": 18, + "y": 10, + "elevation": 3, + "dest_map": "MAP_POKEMON_TOWER_6F", + "dest_warp_id": 1 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 10, + "y": 8, + "elevation": 3, + "var": "VAR_0x4001", + "var_value": 0, + "script": "PokemonTower_5F_EventScript_16343C" + }, + { + "type": "trigger", + "x": 11, + "y": 8, + "elevation": 3, + "var": "VAR_0x4001", + "var_value": 0, + "script": "PokemonTower_5F_EventScript_16343C" + }, + { + "type": "trigger", + "x": 12, + "y": 8, + "elevation": 3, + "var": "VAR_0x4001", + "var_value": 0, + "script": "PokemonTower_5F_EventScript_16343C" + }, + { + "type": "trigger", + "x": 10, + "y": 9, + "elevation": 3, + "var": "VAR_0x4001", + "var_value": 0, + "script": "PokemonTower_5F_EventScript_16343C" + }, + { + "type": "trigger", + "x": 9, + "y": 8, + "elevation": 3, + "var": "VAR_0x4001", + "var_value": 1, + "script": "PokemonTower_5F_EventScript_163453" + }, + { + "type": "trigger", + "x": 12, + "y": 9, + "elevation": 3, + "var": "VAR_0x4001", + "var_value": 0, + "script": "PokemonTower_5F_EventScript_16343C" + }, + { + "type": "trigger", + "x": 10, + "y": 10, + "elevation": 3, + "var": "VAR_0x4001", + "var_value": 0, + "script": "PokemonTower_5F_EventScript_16343C" + }, + { + "type": "trigger", + "x": 11, + "y": 10, + "elevation": 3, + "var": "VAR_0x4001", + "var_value": 0, + "script": "PokemonTower_5F_EventScript_16343C" + }, + { + "type": "trigger", + "x": 12, + "y": 10, + "elevation": 0, + "var": "VAR_0x4001", + "var_value": 0, + "script": "PokemonTower_5F_EventScript_16343C" + }, + { + "type": "trigger", + "x": 9, + "y": 9, + "elevation": 3, + "var": "VAR_0x4001", + "var_value": 1, + "script": "PokemonTower_5F_EventScript_163453" + }, + { + "type": "trigger", + "x": 9, + "y": 10, + "elevation": 3, + "var": "VAR_0x4001", + "var_value": 1, + "script": "PokemonTower_5F_EventScript_163453" + }, + { + "type": "trigger", + "x": 10, + "y": 11, + "elevation": 3, + "var": "VAR_0x4001", + "var_value": 1, + "script": "PokemonTower_5F_EventScript_163453" + }, + { + "type": "trigger", + "x": 11, + "y": 11, + "elevation": 3, + "var": "VAR_0x4001", + "var_value": 1, + "script": "PokemonTower_5F_EventScript_163453" + }, + { + "type": "trigger", + "x": 12, + "y": 11, + "elevation": 0, + "var": "VAR_0x4001", + "var_value": 1, + "script": "PokemonTower_5F_EventScript_163453" + }, + { + "type": "trigger", + "x": 13, + "y": 8, + "elevation": 0, + "var": "VAR_0x4001", + "var_value": 1, + "script": "PokemonTower_5F_EventScript_163453" + }, + { + "type": "trigger", + "x": 13, + "y": 9, + "elevation": 0, + "var": "VAR_0x4001", + "var_value": 1, + "script": "PokemonTower_5F_EventScript_163453" + }, + { + "type": "trigger", + "x": 13, + "y": 10, + "elevation": 0, + "var": "VAR_0x4001", + "var_value": 1, + "script": "PokemonTower_5F_EventScript_163453" + } + ], + "bg_events": [ + { + "type": "hidden_item", + "x": 7, + "y": 3, + "elevation": 3, + "item": "ITEM_BIG_MUSHROOM", + "flag": "14", + "unknown": 1 + } + ] +}
\ No newline at end of file diff --git a/data/maps/PokemonTower_6F/events.inc b/data/maps/PokemonTower_6F/events.inc deleted file mode 100644 index 71638ab67..000000000 --- a/data/maps/PokemonTower_6F/events.inc +++ /dev/null @@ -1,17 +0,0 @@ -PokemonTower_6F_EventObjects: - object_event 1, 58, 0, 13, 0, 10, 0, 3, 10, 17, 0, 1, 0, 3, 0, PokemonTower_6F_EventScript_163514, 0, 0, 0 - object_event 2, 58, 0, 18, 0, 6, 0, 3, 9, 17, 0, 1, 0, 3, 0, PokemonTower_6F_EventScript_163542, 0, 0, 0 - object_event 3, 58, 0, 9, 0, 6, 0, 3, 8, 17, 0, 1, 0, 3, 0, PokemonTower_6F_EventScript_16352B, 0, 0, 0 - object_event 4, 92, 0, 5, 0, 15, 0, 3, 8, 17, 0, 0, 0, 0, 0, PokemonTower_6F_EventScript_1BE796, 380, 0, 0 - object_event 5, 92, 0, 15, 0, 15, 0, 3, 8, 17, 0, 0, 0, 0, 0, PokemonTower_6F_EventScript_1BE7A3, 381, 0, 0 - -PokemonTower_6F_MapWarps: - warp_def 11, 16, 3, 0, 350 - warp_def 18, 10, 3, 1, 348 - -PokemonTower_6F_MapCoordEvents: - coord_event 11, 15, 3, 0, 16473, 0, 0, PokemonTower_6F_EventScript_1634B8 - coord_event 12, 16, 3, 0, 16473, 0, 0, PokemonTower_6F_EventScript_1634B8 - -PokemonTower_6F_MapEvents:: - map_events PokemonTower_6F_EventObjects, PokemonTower_6F_MapWarps, PokemonTower_6F_MapCoordEvents, 0x0 diff --git a/data/maps/PokemonTower_6F/header.inc b/data/maps/PokemonTower_6F/header.inc deleted file mode 100644 index 6bafef55e..000000000 --- a/data/maps/PokemonTower_6F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -PokemonTower_6F:: @ 834FC40 - .4byte PokemonTower_6F_Layout @ 0x8317B68 - .4byte PokemonTower_6F_MapEvents @ 0x83B26C0 - .4byte PokemonTower_6F_MapScripts @ 0x81634B7 - .4byte NULL - .2byte BGM_FRLG_POKEMON_TOWER - .2byte 166 - .byte 0x8c, 0x00, 0x06, 0x08, 0x00, 0x05, 0x00, 0x02 diff --git a/data/maps/PokemonTower_6F/map.json b/data/maps/PokemonTower_6F/map.json new file mode 100644 index 000000000..8243176bb --- /dev/null +++ b/data/maps/PokemonTower_6F/map.json @@ -0,0 +1,119 @@ +{ + "id": "MAP_POKEMON_TOWER_6F", + "name": "PokemonTower_6F", + "layout": "LAYOUT_POKEMON_TOWER_6F", + "music": "BGM_FRLG_POKEMON_TOWER", + "region_map_section": "MAPSEC_POKEMON_TOWER", + "requires_flash": false, + "weather": "WEATHER_6", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 5, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_2", + "connections": null, + "object_events": [ + { + "graphics_id": "58", + "x": 13, + "y": 10, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "PokemonTower_6F_EventScript_163514", + "flag": "0" + }, + { + "graphics_id": "58", + "x": 18, + "y": 6, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "PokemonTower_6F_EventScript_163542", + "flag": "0" + }, + { + "graphics_id": "58", + "x": 9, + "y": 6, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "PokemonTower_6F_EventScript_16352B", + "flag": "0" + }, + { + "graphics_id": "92", + "x": 5, + "y": 15, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PokemonTower_6F_EventScript_1BE796", + "flag": "380" + }, + { + "graphics_id": "92", + "x": 15, + "y": 15, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PokemonTower_6F_EventScript_1BE7A3", + "flag": "381" + } + ], + "warp_events": [ + { + "x": 11, + "y": 16, + "elevation": 3, + "dest_map": "MAP_POKEMON_TOWER_7F", + "dest_warp_id": 0 + }, + { + "x": 18, + "y": 10, + "elevation": 3, + "dest_map": "MAP_POKEMON_TOWER_5F", + "dest_warp_id": 1 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 11, + "y": 15, + "elevation": 3, + "var": "VAR_0x4059", + "var_value": 0, + "script": "PokemonTower_6F_EventScript_1634B8" + }, + { + "type": "trigger", + "x": 12, + "y": 16, + "elevation": 3, + "var": "VAR_0x4059", + "var_value": 0, + "script": "PokemonTower_6F_EventScript_1634B8" + } + ], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/PokemonTower_7F/events.inc b/data/maps/PokemonTower_7F/events.inc deleted file mode 100644 index a665515ff..000000000 --- a/data/maps/PokemonTower_7F/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -PokemonTower_7F_EventObjects: - object_event 1, 78, 0, 11, 0, 4, 0, 3, 8, 17, 0, 0, 0, 0, 0, PokemonTower_7F_EventScript_16355A, 52, 0, 0 - object_event 2, 49, 0, 9, 0, 10, 0, 3, 10, 17, 0, 1, 0, 4, 0, PokemonTower_7F_EventScript_163586, 94, 0, 0 - object_event 3, 49, 0, 13, 0, 8, 0, 3, 9, 17, 0, 1, 0, 4, 0, PokemonTower_7F_EventScript_16363D, 131, 0, 0 - object_event 4, 49, 0, 9, 0, 6, 0, 3, 10, 17, 0, 1, 0, 4, 0, PokemonTower_7F_EventScript_1636D6, 132, 0, 0 - -PokemonTower_7F_MapWarps: - warp_def 11, 16, 3, 0, 349 - -PokemonTower_7F_MapBGEvents: - bg_event 11, 4, 3, 7, 0, 184, 159, 129 - -PokemonTower_7F_MapEvents:: - map_events PokemonTower_7F_EventObjects, PokemonTower_7F_MapWarps, 0x0, PokemonTower_7F_MapBGEvents diff --git a/data/maps/PokemonTower_7F/header.inc b/data/maps/PokemonTower_7F/header.inc deleted file mode 100644 index 4125a4d9f..000000000 --- a/data/maps/PokemonTower_7F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -PokemonTower_7F:: @ 834FC5C - .4byte PokemonTower_7F_Layout @ 0x8317F4C - .4byte PokemonTower_7F_MapEvents @ 0x83B2748 - .4byte PokemonTower_7F_MapScripts @ 0x8163559 - .4byte NULL - .2byte BGM_FRLG_POKEMON_TOWER - .2byte 167 - .byte 0x8c, 0x00, 0x06, 0x08, 0x00, 0x05, 0x00, 0x02 diff --git a/data/maps/PokemonTower_7F/map.json b/data/maps/PokemonTower_7F/map.json new file mode 100644 index 000000000..71ca0d08e --- /dev/null +++ b/data/maps/PokemonTower_7F/map.json @@ -0,0 +1,90 @@ +{ + "id": "MAP_POKEMON_TOWER_7F", + "name": "PokemonTower_7F", + "layout": "LAYOUT_POKEMON_TOWER_7F", + "music": "BGM_FRLG_POKEMON_TOWER", + "region_map_section": "MAPSEC_POKEMON_TOWER", + "requires_flash": false, + "weather": "WEATHER_6", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 5, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_2", + "connections": null, + "object_events": [ + { + "graphics_id": "78", + "x": 11, + "y": 4, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PokemonTower_7F_EventScript_16355A", + "flag": "52" + }, + { + "graphics_id": "49", + "x": 9, + "y": 10, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "PokemonTower_7F_EventScript_163586", + "flag": "94" + }, + { + "graphics_id": "49", + "x": 13, + "y": 8, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "PokemonTower_7F_EventScript_16363D", + "flag": "131" + }, + { + "graphics_id": "49", + "x": 9, + "y": 6, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "PokemonTower_7F_EventScript_1636D6", + "flag": "132" + } + ], + "warp_events": [ + { + "x": 11, + "y": 16, + "elevation": 3, + "dest_map": "MAP_POKEMON_TOWER_6F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "hidden_item", + "x": 11, + "y": 4, + "elevation": 3, + "item": "ITEM_SOOTHE_BELL", + "flag": "159", + "unknown": 129 + } + ] +}
\ No newline at end of file diff --git a/data/maps/PokemonTower_7F/scripts.inc b/data/maps/PokemonTower_7F/scripts.inc index 963251b49..29b281222 100644 --- a/data/maps/PokemonTower_7F/scripts.inc +++ b/data/maps/PokemonTower_7F/scripts.inc @@ -13,7 +13,7 @@ PokemonTower_7F_EventScript_16355A:: @ 816355A loadword 0, gUnknown_817A529 callstd 4 closemessage - warp MAP_LAVENDER_TOWN_VOLUNTEERPOKEMONHOUSE, 255, 4, 7 + warp MAP_LAVENDER_TOWN_VOLUNTEER_POKEMON_HOUSE, 255, 4, 7 waitstate release end diff --git a/data/maps/PowerPlant/events.inc b/data/maps/PowerPlant/events.inc deleted file mode 100644 index fcdaab532..000000000 --- a/data/maps/PowerPlant/events.inc +++ /dev/null @@ -1,23 +0,0 @@ -PowerPlant_EventObjects: - object_event 1, 92, 0, 7, 0, 27, 0, 3, 8, 17, 0, 0, 0, 0, 0, PowerPlant_EventScript_1BE91C, 410, 0, 0 - object_event 2, 92, 0, 40, 0, 22, 0, 3, 8, 17, 0, 0, 0, 0, 0, PowerPlant_EventScript_1BE929, 411, 0, 0 - object_event 3, 92, 0, 46, 0, 37, 0, 3, 8, 17, 0, 0, 0, 0, 0, PowerPlant_EventScript_1BE936, 412, 0, 0 - object_event 4, 92, 0, 45, 0, 4, 0, 3, 8, 17, 0, 0, 0, 0, 0, PowerPlant_EventScript_1BE943, 413, 0, 0 - object_event 5, 92, 0, 26, 0, 22, 0, 3, 8, 17, 0, 0, 0, 0, 0, PowerPlant_EventScript_1BE950, 414, 0, 0 - object_event 6, 136, 0, 5, 0, 11, 0, 3, 8, 17, 0, 0, 0, 0, 0, PowerPlant_EventScript_1637B8, 93, 0, 0 - object_event 7, 92, 0, 36, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, PowerPlant_EventScript_16388D, 134, 0, 0 - object_event 8, 92, 0, 30, 0, 38, 0, 3, 8, 17, 0, 0, 0, 0, 0, PowerPlant_EventScript_16382F, 133, 0, 0 - -PowerPlant_MapWarps: - warp_def 4, 39, 3, 2, 796 - warp_def 5, 38, 3, 2, 796 - warp_def 6, 39, 3, 2, 796 - warp_def 1, 11, 3, 4, 796 - warp_def 0, 13, 3, 2, 796 - -PowerPlant_MapBGEvents: - bg_event 29, 16, 3, 7, 0, 37, 27, 1 - bg_event 8, 12, 3, 7, 0, 96, 28, 1 - -PowerPlant_MapEvents:: - map_events PowerPlant_EventObjects, PowerPlant_MapWarps, 0x0, PowerPlant_MapBGEvents diff --git a/data/maps/PowerPlant/header.inc b/data/maps/PowerPlant/header.inc deleted file mode 100644 index 530e24a98..000000000 --- a/data/maps/PowerPlant/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -PowerPlant:: @ 834FC78 - .4byte PowerPlant_Layout @ 0x8318EC0 - .4byte PowerPlant_MapEvents @ 0x83B285C - .4byte PowerPlant_MapScripts @ 0x8163764 - .4byte NULL - .2byte BGM_FRLG_POKEMON_MANSION - .2byte 168 - .byte 0x8e, 0x00, 0x00, 0x08, 0x00, 0x07, 0x00, 0x03 diff --git a/data/maps/PowerPlant/map.json b/data/maps/PowerPlant/map.json new file mode 100644 index 000000000..bc65392c2 --- /dev/null +++ b/data/maps/PowerPlant/map.json @@ -0,0 +1,179 @@ +{ + "id": "MAP_POWER_PLANT", + "name": "PowerPlant", + "layout": "LAYOUT_POWER_PLANT", + "music": "BGM_FRLG_POKEMON_MANSION", + "region_map_section": "MAPSEC_POWER_PLANT", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_3", + "connections": null, + "object_events": [ + { + "graphics_id": "92", + "x": 7, + "y": 27, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PowerPlant_EventScript_1BE91C", + "flag": "410" + }, + { + "graphics_id": "92", + "x": 40, + "y": 22, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PowerPlant_EventScript_1BE929", + "flag": "411" + }, + { + "graphics_id": "92", + "x": 46, + "y": 37, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PowerPlant_EventScript_1BE936", + "flag": "412" + }, + { + "graphics_id": "92", + "x": 45, + "y": 4, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PowerPlant_EventScript_1BE943", + "flag": "413" + }, + { + "graphics_id": "92", + "x": 26, + "y": 22, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PowerPlant_EventScript_1BE950", + "flag": "414" + }, + { + "graphics_id": "136", + "x": 5, + "y": 11, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PowerPlant_EventScript_1637B8", + "flag": "93" + }, + { + "graphics_id": "92", + "x": 36, + "y": 5, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PowerPlant_EventScript_16388D", + "flag": "134" + }, + { + "graphics_id": "92", + "x": 30, + "y": 38, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PowerPlant_EventScript_16382F", + "flag": "133" + } + ], + "warp_events": [ + { + "x": 4, + "y": 39, + "elevation": 3, + "dest_map": "MAP_ROUTE10", + "dest_warp_id": 2 + }, + { + "x": 5, + "y": 38, + "elevation": 3, + "dest_map": "MAP_ROUTE10", + "dest_warp_id": 2 + }, + { + "x": 6, + "y": 39, + "elevation": 3, + "dest_map": "MAP_ROUTE10", + "dest_warp_id": 2 + }, + { + "x": 1, + "y": 11, + "elevation": 3, + "dest_map": "MAP_ROUTE10", + "dest_warp_id": 4 + }, + { + "x": 0, + "y": 13, + "elevation": 3, + "dest_map": "MAP_ROUTE10", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "hidden_item", + "x": 29, + "y": 16, + "elevation": 3, + "item": "ITEM_MAX_ELIXIR", + "flag": "27", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 8, + "y": 12, + "elevation": 3, + "item": "ITEM_THUNDER_STONE", + "flag": "28", + "unknown": 1 + } + ] +}
\ No newline at end of file diff --git a/data/maps/RockTunnel_1F/events.inc b/data/maps/RockTunnel_1F/events.inc deleted file mode 100644 index e9166bed9..000000000 --- a/data/maps/RockTunnel_1F/events.inc +++ /dev/null @@ -1,25 +0,0 @@ -RockTunnel_1F_EventObjects: - object_event 1, 40, 0, 26, 0, 28, 0, 3, 8, 17, 0, 1, 0, 3, 0, RockTunnel_1F_EventScript_162E73, 0, 0, 0 - object_event 2, 40, 0, 39, 0, 27, 0, 3, 10, 17, 0, 1, 0, 4, 0, RockTunnel_1F_EventScript_162E5C, 0, 0, 0 - object_event 3, 40, 0, 45, 0, 24, 0, 3, 9, 17, 0, 1, 0, 5, 0, RockTunnel_1F_EventScript_162E45, 0, 0, 0 - object_event 4, 56, 0, 20, 0, 17, 0, 3, 9, 17, 0, 1, 0, 4, 0, RockTunnel_1F_EventScript_162E17, 0, 0, 0 - object_event 5, 56, 0, 5, 0, 20, 0, 3, 8, 17, 0, 1, 0, 4, 0, RockTunnel_1F_EventScript_162E00, 0, 0, 0 - object_event 6, 56, 0, 7, 0, 5, 0, 3, 8, 17, 0, 1, 0, 4, 0, RockTunnel_1F_EventScript_162DE9, 0, 0, 0 - object_event 7, 52, 0, 27, 0, 10, 0, 3, 9, 17, 0, 1, 0, 3, 0, RockTunnel_1F_EventScript_162E2E, 0, 0, 0 - object_event 8, 92, 0, 37, 0, 5, 0, 3, 1, 17, 0, 0, 0, 0, 0, RockTunnel_1F_EventScript_1BEB0A, 451, 0, 0 - object_event 9, 92, 0, 33, 0, 22, 0, 3, 1, 17, 0, 0, 0, 0, 0, RockTunnel_1F_EventScript_1BEB17, 452, 0, 0 - object_event 10, 92, 0, 22, 0, 22, 0, 3, 1, 17, 0, 0, 0, 0, 0, RockTunnel_1F_EventScript_1BEB24, 453, 0, 0 - -RockTunnel_1F_MapWarps: - warp_def 17, 2, 3, 0, 796 - warp_def 45, 2, 3, 0, 338 - warp_def 4, 2, 3, 1, 338 - warp_def 20, 13, 3, 2, 338 - warp_def 45, 21, 3, 3, 338 - warp_def 18, 37, 3, 1, 796 - -RockTunnel_1F_MapBGEvents: - bg_event 14, 33, 3, 0, 0, RockTunnel_1F_EventScript_162DE0 - -RockTunnel_1F_MapEvents:: - map_events RockTunnel_1F_EventObjects, RockTunnel_1F_MapWarps, 0x0, RockTunnel_1F_MapBGEvents diff --git a/data/maps/RockTunnel_1F/header.inc b/data/maps/RockTunnel_1F/header.inc deleted file mode 100644 index 5a9e6fac6..000000000 --- a/data/maps/RockTunnel_1F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -RockTunnel_1F:: @ 834FAF0 - .4byte RockTunnel_1F_Layout @ 0x83130E4 - .4byte RockTunnel_1F_MapEvents @ 0x83B1B2C - .4byte RockTunnel_1F_MapScripts @ 0x8162DD6 - .4byte NULL - .2byte BGM_FRLG_MT_MOON - .2byte 154 - .byte 0x8a, 0x01, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/RockTunnel_1F/map.json b/data/maps/RockTunnel_1F/map.json new file mode 100644 index 000000000..d1e0c78f6 --- /dev/null +++ b/data/maps/RockTunnel_1F/map.json @@ -0,0 +1,201 @@ +{ + "id": "MAP_ROCK_TUNNEL_1F", + "name": "RockTunnel_1F", + "layout": "LAYOUT_ROCK_TUNNEL_1F", + "music": "BGM_FRLG_MT_MOON", + "region_map_section": "MAPSEC_ROCK_TUNNEL", + "requires_flash": true, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "40", + "x": 26, + "y": 28, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "RockTunnel_1F_EventScript_162E73", + "flag": "0" + }, + { + "graphics_id": "40", + "x": 39, + "y": 27, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "RockTunnel_1F_EventScript_162E5C", + "flag": "0" + }, + { + "graphics_id": "40", + "x": 45, + "y": 24, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "RockTunnel_1F_EventScript_162E45", + "flag": "0" + }, + { + "graphics_id": "56", + "x": 20, + "y": 17, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "RockTunnel_1F_EventScript_162E17", + "flag": "0" + }, + { + "graphics_id": "56", + "x": 5, + "y": 20, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "RockTunnel_1F_EventScript_162E00", + "flag": "0" + }, + { + "graphics_id": "56", + "x": 7, + "y": 5, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "RockTunnel_1F_EventScript_162DE9", + "flag": "0" + }, + { + "graphics_id": "52", + "x": 27, + "y": 10, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "RockTunnel_1F_EventScript_162E2E", + "flag": "0" + }, + { + "graphics_id": "92", + "x": 37, + "y": 5, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RockTunnel_1F_EventScript_1BEB0A", + "flag": "451" + }, + { + "graphics_id": "92", + "x": 33, + "y": 22, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RockTunnel_1F_EventScript_1BEB17", + "flag": "452" + }, + { + "graphics_id": "92", + "x": 22, + "y": 22, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RockTunnel_1F_EventScript_1BEB24", + "flag": "453" + } + ], + "warp_events": [ + { + "x": 17, + "y": 2, + "elevation": 3, + "dest_map": "MAP_ROUTE10", + "dest_warp_id": 0 + }, + { + "x": 45, + "y": 2, + "elevation": 3, + "dest_map": "MAP_ROCK_TUNNEL_B1F", + "dest_warp_id": 0 + }, + { + "x": 4, + "y": 2, + "elevation": 3, + "dest_map": "MAP_ROCK_TUNNEL_B1F", + "dest_warp_id": 1 + }, + { + "x": 20, + "y": 13, + "elevation": 3, + "dest_map": "MAP_ROCK_TUNNEL_B1F", + "dest_warp_id": 2 + }, + { + "x": 45, + "y": 21, + "elevation": 3, + "dest_map": "MAP_ROCK_TUNNEL_B1F", + "dest_warp_id": 3 + }, + { + "x": 18, + "y": 37, + "elevation": 3, + "dest_map": "MAP_ROUTE10", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 14, + "y": 33, + "elevation": 3, + "script": "RockTunnel_1F_EventScript_162DE0" + } + ] +}
\ No newline at end of file diff --git a/data/maps/RockTunnel_B1F/events.inc b/data/maps/RockTunnel_B1F/events.inc deleted file mode 100644 index f0f2ad914..000000000 --- a/data/maps/RockTunnel_B1F/events.inc +++ /dev/null @@ -1,36 +0,0 @@ -RockTunnel_B1F_EventObjects: - object_event 1, 52, 0, 2, 0, 6, 0, 3, 1, 17, 0, 1, 0, 2, 0, RockTunnel_B1F_EventScript_162EFE, 0, 0, 0 - object_event 2, 56, 0, 5, 0, 11, 0, 3, 8, 17, 0, 1, 0, 4, 0, RockTunnel_B1F_EventScript_162EB9, 0, 0, 0 - object_event 3, 40, 0, 11, 0, 15, 0, 3, 8, 17, 0, 1, 0, 4, 0, RockTunnel_B1F_EventScript_162E8B, 0, 0, 0 - object_event 4, 56, 0, 36, 0, 11, 0, 3, 8, 17, 0, 1, 0, 3, 0, RockTunnel_B1F_EventScript_162ED0, 0, 0, 0 - object_event 5, 56, 0, 41, 0, 5, 0, 3, 10, 17, 0, 1, 0, 3, 0, RockTunnel_B1F_EventScript_162EE7, 0, 0, 0 - object_event 6, 52, 0, 23, 0, 23, 0, 3, 10, 17, 0, 1, 0, 4, 0, RockTunnel_B1F_EventScript_162F15, 0, 0, 0 - object_event 7, 40, 0, 15, 0, 33, 0, 3, 10, 17, 0, 1, 0, 2, 0, RockTunnel_B1F_EventScript_162EA2, 0, 0, 0 - object_event 8, 52, 0, 29, 0, 35, 0, 3, 8, 17, 0, 1, 0, 3, 0, RockTunnel_B1F_EventScript_162F2C, 0, 0, 0 - object_event 9, 18, 0, 2, 0, 29, 0, 3, 10, 17, 0, 0, 0, 0, 0, RockTunnel_B1F_EventScript_1C487E, 0, 0, 0 - object_event 10, 92, 0, 2, 0, 37, 0, 3, 8, 17, 0, 0, 0, 0, 0, RockTunnel_B1F_EventScript_1BEB31, 454, 0, 0 - object_event 11, 92, 0, 9, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, RockTunnel_B1F_EventScript_1BEB3E, 455, 0, 0 - object_event 12, 96, 0, 1, 0, 20, 0, 3, 1, 17, 0, 0, 0, 0, 0, RockTunnel_B1F_EventScript_1BE00C, 18, 0, 0 - object_event 13, 96, 0, 1, 0, 22, 0, 3, 1, 17, 0, 0, 0, 0, 0, RockTunnel_B1F_EventScript_1BE00C, 19, 0, 0 - object_event 14, 96, 0, 4, 0, 23, 0, 3, 1, 17, 0, 0, 0, 0, 0, RockTunnel_B1F_EventScript_1BE00C, 20, 0, 0 - object_event 15, 96, 0, 2, 0, 23, 0, 3, 1, 17, 0, 0, 0, 0, 0, RockTunnel_B1F_EventScript_1BE00C, 21, 0, 0 - object_event 16, 96, 0, 39, 0, 26, 0, 3, 1, 17, 0, 0, 0, 0, 0, RockTunnel_B1F_EventScript_1BE00C, 22, 0, 0 - object_event 17, 96, 0, 42, 0, 26, 0, 3, 1, 17, 0, 0, 0, 0, 0, RockTunnel_B1F_EventScript_1BE00C, 23, 0, 0 - object_event 18, 96, 0, 43, 0, 28, 0, 3, 1, 17, 0, 0, 0, 0, 0, RockTunnel_B1F_EventScript_1BE00C, 24, 0, 0 - object_event 19, 96, 0, 45, 0, 30, 0, 3, 1, 17, 0, 0, 0, 0, 0, RockTunnel_B1F_EventScript_1BE00C, 25, 0, 0 - object_event 20, 96, 0, 45, 0, 33, 0, 3, 1, 17, 0, 0, 0, 0, 0, RockTunnel_B1F_EventScript_1BE00C, 26, 0, 0 - object_event 21, 96, 0, 25, 0, 1, 0, 3, 1, 17, 0, 0, 0, 0, 0, RockTunnel_B1F_EventScript_1BE00C, 27, 0, 0 - object_event 22, 96, 0, 27, 0, 4, 0, 3, 1, 17, 0, 0, 0, 0, 0, RockTunnel_B1F_EventScript_1BE00C, 28, 0, 0 - object_event 23, 96, 0, 23, 0, 2, 0, 3, 1, 17, 0, 0, 0, 0, 0, RockTunnel_B1F_EventScript_1BE00C, 29, 0, 0 - object_event 24, 96, 0, 26, 0, 2, 0, 3, 1, 17, 0, 0, 0, 0, 0, RockTunnel_B1F_EventScript_1BE00C, 30, 0, 0 - object_event 25, 96, 0, 24, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, RockTunnel_B1F_EventScript_1BE00C, 31, 0, 0 - object_event 26, 96, 0, 27, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, RockTunnel_B1F_EventScript_1BE00C, 17, 0, 0 - -RockTunnel_B1F_MapWarps: - warp_def 38, 28, 3, 1, 337 - warp_def 33, 3, 3, 2, 337 - warp_def 27, 12, 3, 3, 337 - warp_def 2, 3, 3, 4, 337 - -RockTunnel_B1F_MapEvents:: - map_events RockTunnel_B1F_EventObjects, RockTunnel_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/RockTunnel_B1F/header.inc b/data/maps/RockTunnel_B1F/header.inc deleted file mode 100644 index 7ee412e7b..000000000 --- a/data/maps/RockTunnel_B1F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -RockTunnel_B1F:: @ 834FB0C - .4byte RockTunnel_B1F_Layout @ 0x8314008 - .4byte RockTunnel_B1F_MapEvents @ 0x83B1DD0 - .4byte RockTunnel_B1F_MapScripts @ 0x8162E8A - .4byte NULL - .2byte BGM_FRLG_MT_MOON - .2byte 155 - .byte 0x8a, 0x01, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/RockTunnel_B1F/map.json b/data/maps/RockTunnel_B1F/map.json new file mode 100644 index 000000000..474efd82f --- /dev/null +++ b/data/maps/RockTunnel_B1F/map.json @@ -0,0 +1,387 @@ +{ + "id": "MAP_ROCK_TUNNEL_B1F", + "name": "RockTunnel_B1F", + "layout": "LAYOUT_ROCK_TUNNEL_B1F", + "music": "BGM_FRLG_MT_MOON", + "region_map_section": "MAPSEC_ROCK_TUNNEL", + "requires_flash": true, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "52", + "x": 2, + "y": 6, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "RockTunnel_B1F_EventScript_162EFE", + "flag": "0" + }, + { + "graphics_id": "56", + "x": 5, + "y": 11, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "RockTunnel_B1F_EventScript_162EB9", + "flag": "0" + }, + { + "graphics_id": "40", + "x": 11, + "y": 15, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "RockTunnel_B1F_EventScript_162E8B", + "flag": "0" + }, + { + "graphics_id": "56", + "x": 36, + "y": 11, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "RockTunnel_B1F_EventScript_162ED0", + "flag": "0" + }, + { + "graphics_id": "56", + "x": 41, + "y": 5, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "RockTunnel_B1F_EventScript_162EE7", + "flag": "0" + }, + { + "graphics_id": "52", + "x": 23, + "y": 23, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "RockTunnel_B1F_EventScript_162F15", + "flag": "0" + }, + { + "graphics_id": "40", + "x": 15, + "y": 33, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "RockTunnel_B1F_EventScript_162EA2", + "flag": "0" + }, + { + "graphics_id": "52", + "x": 29, + "y": 35, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "RockTunnel_B1F_EventScript_162F2C", + "flag": "0" + }, + { + "graphics_id": "18", + "x": 2, + "y": 29, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RockTunnel_B1F_EventScript_1C487E", + "flag": "0" + }, + { + "graphics_id": "92", + "x": 2, + "y": 37, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RockTunnel_B1F_EventScript_1BEB31", + "flag": "454" + }, + { + "graphics_id": "92", + "x": 9, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RockTunnel_B1F_EventScript_1BEB3E", + "flag": "455" + }, + { + "graphics_id": "96", + "x": 1, + "y": 20, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RockTunnel_B1F_EventScript_1BE00C", + "flag": "18" + }, + { + "graphics_id": "96", + "x": 1, + "y": 22, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RockTunnel_B1F_EventScript_1BE00C", + "flag": "19" + }, + { + "graphics_id": "96", + "x": 4, + "y": 23, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RockTunnel_B1F_EventScript_1BE00C", + "flag": "20" + }, + { + "graphics_id": "96", + "x": 2, + "y": 23, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RockTunnel_B1F_EventScript_1BE00C", + "flag": "21" + }, + { + "graphics_id": "96", + "x": 39, + "y": 26, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RockTunnel_B1F_EventScript_1BE00C", + "flag": "22" + }, + { + "graphics_id": "96", + "x": 42, + "y": 26, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RockTunnel_B1F_EventScript_1BE00C", + "flag": "23" + }, + { + "graphics_id": "96", + "x": 43, + "y": 28, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RockTunnel_B1F_EventScript_1BE00C", + "flag": "24" + }, + { + "graphics_id": "96", + "x": 45, + "y": 30, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RockTunnel_B1F_EventScript_1BE00C", + "flag": "25" + }, + { + "graphics_id": "96", + "x": 45, + "y": 33, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RockTunnel_B1F_EventScript_1BE00C", + "flag": "26" + }, + { + "graphics_id": "96", + "x": 25, + "y": 1, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RockTunnel_B1F_EventScript_1BE00C", + "flag": "27" + }, + { + "graphics_id": "96", + "x": 27, + "y": 4, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RockTunnel_B1F_EventScript_1BE00C", + "flag": "28" + }, + { + "graphics_id": "96", + "x": 23, + "y": 2, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RockTunnel_B1F_EventScript_1BE00C", + "flag": "29" + }, + { + "graphics_id": "96", + "x": 26, + "y": 2, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RockTunnel_B1F_EventScript_1BE00C", + "flag": "30" + }, + { + "graphics_id": "96", + "x": 24, + "y": 7, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RockTunnel_B1F_EventScript_1BE00C", + "flag": "31" + }, + { + "graphics_id": "96", + "x": 27, + "y": 6, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RockTunnel_B1F_EventScript_1BE00C", + "flag": "17" + } + ], + "warp_events": [ + { + "x": 38, + "y": 28, + "elevation": 3, + "dest_map": "MAP_ROCK_TUNNEL_1F", + "dest_warp_id": 1 + }, + { + "x": 33, + "y": 3, + "elevation": 3, + "dest_map": "MAP_ROCK_TUNNEL_1F", + "dest_warp_id": 2 + }, + { + "x": 27, + "y": 12, + "elevation": 3, + "dest_map": "MAP_ROCK_TUNNEL_1F", + "dest_warp_id": 3 + }, + { + "x": 2, + "y": 3, + "elevation": 3, + "dest_map": "MAP_ROCK_TUNNEL_1F", + "dest_warp_id": 4 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/RocketHideout_B1F/events.inc b/data/maps/RocketHideout_B1F/events.inc deleted file mode 100644 index d70fd2b8a..000000000 --- a/data/maps/RocketHideout_B1F/events.inc +++ /dev/null @@ -1,22 +0,0 @@ -RocketHideout_B1F_EventObjects: - object_event 1, 49, 0, 4, 0, 9, 0, 3, 10, 17, 0, 1, 0, 5, 0, RocketHideout_B1F_EventScript_1611C5, 173, 0, 0 - object_event 2, 49, 0, 24, 0, 12, 0, 3, 9, 17, 0, 1, 0, 2, 0, RocketHideout_B1F_EventScript_1611AE, 173, 0, 0 - object_event 3, 49, 0, 6, 0, 32, 0, 3, 10, 17, 0, 1, 0, 4, 0, RocketHideout_B1F_EventScript_1611F3, 173, 0, 0 - object_event 4, 49, 0, 10, 0, 22, 0, 3, 8, 17, 0, 1, 0, 3, 0, RocketHideout_B1F_EventScript_1611DC, 173, 0, 0 - object_event 5, 49, 0, 21, 0, 27, 0, 3, 16, 17, 0, 1, 0, 3, 0, RocketHideout_B1F_EventScript_16120A, 173, 0, 0 - object_event 6, 92, 0, 5, 0, 16, 0, 0, 8, 17, 0, 0, 0, 0, 0, RocketHideout_B1F_EventScript_1BE6C6, 364, 0, 0 - object_event 7, 92, 0, 1, 0, 22, 0, 3, 8, 17, 0, 0, 0, 0, 0, RocketHideout_B1F_EventScript_1BE6D3, 365, 0, 0 - -RocketHideout_B1F_MapWarps: - warp_def 12, 2, 3, 3, 2574 - warp_def 17, 2, 3, 1, 299 - warp_def 15, 30, 3, 2, 299 - warp_def 23, 25, 0, 1, 302 - warp_def 24, 25, 0, 1, 302 - warp_def 25, 25, 0, 1, 302 - -RocketHideout_B1F_MapBGEvents: - bg_event 16, 17, 0, 7, 0, 69, 11, 1 - -RocketHideout_B1F_MapEvents:: - map_events RocketHideout_B1F_EventObjects, RocketHideout_B1F_MapWarps, 0x0, RocketHideout_B1F_MapBGEvents diff --git a/data/maps/RocketHideout_B1F/header.inc b/data/maps/RocketHideout_B1F/header.inc deleted file mode 100644 index 76da1d708..000000000 --- a/data/maps/RocketHideout_B1F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -RocketHideout_B1F:: @ 834F6AC - .4byte RocketHideout_B1F_Layout @ 0x8305C28 - .4byte RocketHideout_B1F_MapEvents @ 0x83AF9D8 - .4byte RocketHideout_B1F_MapScripts @ 0x8161195 - .4byte NULL - .2byte BGM_FRLG_ROCKET_HIDEOUT - .2byte 128 - .byte 0x85, 0x00, 0x00, 0x08, 0x00, 0x07, 0xff, 0x03 diff --git a/data/maps/RocketHideout_B1F/map.json b/data/maps/RocketHideout_B1F/map.json new file mode 100644 index 000000000..6bcfd6dcb --- /dev/null +++ b/data/maps/RocketHideout_B1F/map.json @@ -0,0 +1,164 @@ +{ + "id": "MAP_ROCKET_HIDEOUT_B1F", + "name": "RocketHideout_B1F", + "layout": "LAYOUT_ROCKET_HIDEOUT_B1F", + "music": "BGM_FRLG_ROCKET_HIDEOUT", + "region_map_section": "MAPSEC_ROCKET_HIDEOUT", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 7, + "elevator_flag": -1, + "battle_scene": "BATTLE_SCENE_3", + "connections": null, + "object_events": [ + { + "graphics_id": "49", + "x": 4, + "y": 9, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "RocketHideout_B1F_EventScript_1611C5", + "flag": "173" + }, + { + "graphics_id": "49", + "x": 24, + "y": 12, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "RocketHideout_B1F_EventScript_1611AE", + "flag": "173" + }, + { + "graphics_id": "49", + "x": 6, + "y": 32, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "RocketHideout_B1F_EventScript_1611F3", + "flag": "173" + }, + { + "graphics_id": "49", + "x": 10, + "y": 22, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "RocketHideout_B1F_EventScript_1611DC", + "flag": "173" + }, + { + "graphics_id": "49", + "x": 21, + "y": 27, + "elevation": 3, + "movement_type": "16", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "RocketHideout_B1F_EventScript_16120A", + "flag": "173" + }, + { + "graphics_id": "92", + "x": 5, + "y": 16, + "elevation": 0, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RocketHideout_B1F_EventScript_1BE6C6", + "flag": "364" + }, + { + "graphics_id": "92", + "x": 1, + "y": 22, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RocketHideout_B1F_EventScript_1BE6D3", + "flag": "365" + } + ], + "warp_events": [ + { + "x": 12, + "y": 2, + "elevation": 3, + "dest_map": "MAP_CELADON_CITY_GAME_CORNER", + "dest_warp_id": 3 + }, + { + "x": 17, + "y": 2, + "elevation": 3, + "dest_map": "MAP_ROCKET_HIDEOUT_B2F", + "dest_warp_id": 1 + }, + { + "x": 15, + "y": 30, + "elevation": 3, + "dest_map": "MAP_ROCKET_HIDEOUT_B2F", + "dest_warp_id": 2 + }, + { + "x": 23, + "y": 25, + "elevation": 0, + "dest_map": "MAP_ROCKET_HIDEOUT_ELEVATOR", + "dest_warp_id": 1 + }, + { + "x": 24, + "y": 25, + "elevation": 0, + "dest_map": "MAP_ROCKET_HIDEOUT_ELEVATOR", + "dest_warp_id": 1 + }, + { + "x": 25, + "y": 25, + "elevation": 0, + "dest_map": "MAP_ROCKET_HIDEOUT_ELEVATOR", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "hidden_item", + "x": 16, + "y": 17, + "elevation": 0, + "item": "ITEM_PP_UP", + "flag": "11", + "unknown": 1 + } + ] +}
\ No newline at end of file diff --git a/data/maps/RocketHideout_B2F/events.inc b/data/maps/RocketHideout_B2F/events.inc deleted file mode 100644 index a28f1b8b2..000000000 --- a/data/maps/RocketHideout_B2F/events.inc +++ /dev/null @@ -1,16 +0,0 @@ -RocketHideout_B2F_EventObjects: - object_event 1, 49, 0, 20, 0, 6, 0, 3, 1, 17, 0, 1, 0, 2, 0, RocketHideout_B2F_EventScript_1612A2, 173, 0, 0 - object_event 2, 92, 0, 15, 0, 3, 0, 3, 8, 17, 0, 0, 0, 0, 0, RocketHideout_B2F_EventScript_1BE6E0, 366, 0, 0 - object_event 3, 92, 0, 2, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, RocketHideout_B2F_EventScript_1BE6ED, 367, 0, 0 - object_event 4, 92, 0, 5, 0, 7, 0, 3, 8, 17, 0, 0, 0, 0, 0, RocketHideout_B2F_EventScript_1BE6FA, 368, 0, 0 - object_event 5, 92, 0, 0, 0, 14, 0, 3, 8, 17, 0, 0, 0, 0, 0, RocketHideout_B2F_EventScript_1BE707, 369, 0, 0 - -RocketHideout_B2F_MapWarps: - warp_def 21, 2, 3, 0, 300 - warp_def 28, 2, 3, 1, 298 - warp_def 23, 12, 3, 2, 298 - warp_def 28, 16, 0, 1, 302 - warp_def 29, 16, 0, 1, 302 - -RocketHideout_B2F_MapEvents:: - map_events RocketHideout_B2F_EventObjects, RocketHideout_B2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/RocketHideout_B2F/header.inc b/data/maps/RocketHideout_B2F/header.inc deleted file mode 100644 index 6f3624422..000000000 --- a/data/maps/RocketHideout_B2F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -RocketHideout_B2F:: @ 834F6C8 - .4byte RocketHideout_B2F_Layout @ 0x83061CC - .4byte RocketHideout_B2F_MapEvents @ 0x83AFA8C - .4byte RocketHideout_B2F_MapScripts @ 0x81612A1 - .4byte NULL - .2byte BGM_FRLG_ROCKET_HIDEOUT - .2byte 129 - .byte 0x85, 0x00, 0x00, 0x08, 0x00, 0x07, 0xfe, 0x03 diff --git a/data/maps/RocketHideout_B2F/map.json b/data/maps/RocketHideout_B2F/map.json new file mode 100644 index 000000000..a5b3bbe4b --- /dev/null +++ b/data/maps/RocketHideout_B2F/map.json @@ -0,0 +1,121 @@ +{ + "id": "MAP_ROCKET_HIDEOUT_B2F", + "name": "RocketHideout_B2F", + "layout": "LAYOUT_ROCKET_HIDEOUT_B2F", + "music": "BGM_FRLG_ROCKET_HIDEOUT", + "region_map_section": "MAPSEC_ROCKET_HIDEOUT", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 7, + "elevator_flag": -2, + "battle_scene": "BATTLE_SCENE_3", + "connections": null, + "object_events": [ + { + "graphics_id": "49", + "x": 20, + "y": 6, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "RocketHideout_B2F_EventScript_1612A2", + "flag": "173" + }, + { + "graphics_id": "92", + "x": 15, + "y": 3, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RocketHideout_B2F_EventScript_1BE6E0", + "flag": "366" + }, + { + "graphics_id": "92", + "x": 2, + "y": 5, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RocketHideout_B2F_EventScript_1BE6ED", + "flag": "367" + }, + { + "graphics_id": "92", + "x": 5, + "y": 7, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RocketHideout_B2F_EventScript_1BE6FA", + "flag": "368" + }, + { + "graphics_id": "92", + "x": 0, + "y": 14, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RocketHideout_B2F_EventScript_1BE707", + "flag": "369" + } + ], + "warp_events": [ + { + "x": 21, + "y": 2, + "elevation": 3, + "dest_map": "MAP_ROCKET_HIDEOUT_B3F", + "dest_warp_id": 0 + }, + { + "x": 28, + "y": 2, + "elevation": 3, + "dest_map": "MAP_ROCKET_HIDEOUT_B1F", + "dest_warp_id": 1 + }, + { + "x": 23, + "y": 12, + "elevation": 3, + "dest_map": "MAP_ROCKET_HIDEOUT_B1F", + "dest_warp_id": 2 + }, + { + "x": 28, + "y": 16, + "elevation": 0, + "dest_map": "MAP_ROCKET_HIDEOUT_ELEVATOR", + "dest_warp_id": 1 + }, + { + "x": 29, + "y": 16, + "elevation": 0, + "dest_map": "MAP_ROCKET_HIDEOUT_ELEVATOR", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/RocketHideout_B3F/events.inc b/data/maps/RocketHideout_B3F/events.inc deleted file mode 100644 index a04b9cdc4..000000000 --- a/data/maps/RocketHideout_B3F/events.inc +++ /dev/null @@ -1,16 +0,0 @@ -RocketHideout_B3F_EventObjects: - object_event 1, 49, 0, 19, 0, 9, 0, 3, 7, 17, 0, 1, 0, 4, 0, RocketHideout_B3F_EventScript_1612D1, 173, 0, 0 - object_event 2, 49, 0, 2, 0, 20, 0, 3, 10, 17, 0, 1, 0, 2, 0, RocketHideout_B3F_EventScript_1612BA, 173, 0, 0 - object_event 3, 92, 0, 12, 0, 12, 0, 3, 8, 17, 0, 0, 0, 0, 0, RocketHideout_B3F_EventScript_1BE714, 370, 0, 0 - object_event 4, 92, 0, 19, 0, 14, 0, 3, 8, 17, 0, 0, 0, 0, 0, RocketHideout_B3F_EventScript_1BE721, 371, 0, 0 - object_event 5, 92, 0, 14, 0, 24, 0, 3, 8, 17, 0, 0, 0, 0, 0, RocketHideout_B3F_EventScript_1BEBCD, 466, 0, 0 - -RocketHideout_B3F_MapWarps: - warp_def 18, 2, 3, 0, 299 - warp_def 15, 18, 3, 0, 301 - -RocketHideout_B3F_MapBGEvents: - bg_event 1, 3, 3, 7, 0, 110, 12, 1 - -RocketHideout_B3F_MapEvents:: - map_events RocketHideout_B3F_EventObjects, RocketHideout_B3F_MapWarps, 0x0, RocketHideout_B3F_MapBGEvents diff --git a/data/maps/RocketHideout_B3F/header.inc b/data/maps/RocketHideout_B3F/header.inc deleted file mode 100644 index 82aff9271..000000000 --- a/data/maps/RocketHideout_B3F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -RocketHideout_B3F:: @ 834F6E4 - .4byte RocketHideout_B3F_Layout @ 0x8306694 - .4byte RocketHideout_B3F_MapEvents @ 0x83AFB34 - .4byte RocketHideout_B3F_MapScripts @ 0x81612B9 - .4byte NULL - .2byte BGM_FRLG_ROCKET_HIDEOUT - .2byte 130 - .byte 0x85, 0x00, 0x00, 0x08, 0x00, 0x07, 0xfd, 0x03 diff --git a/data/maps/RocketHideout_B3F/map.json b/data/maps/RocketHideout_B3F/map.json new file mode 100644 index 000000000..46a504ca0 --- /dev/null +++ b/data/maps/RocketHideout_B3F/map.json @@ -0,0 +1,110 @@ +{ + "id": "MAP_ROCKET_HIDEOUT_B3F", + "name": "RocketHideout_B3F", + "layout": "LAYOUT_ROCKET_HIDEOUT_B3F", + "music": "BGM_FRLG_ROCKET_HIDEOUT", + "region_map_section": "MAPSEC_ROCKET_HIDEOUT", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 7, + "elevator_flag": -3, + "battle_scene": "BATTLE_SCENE_3", + "connections": null, + "object_events": [ + { + "graphics_id": "49", + "x": 19, + "y": 9, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "RocketHideout_B3F_EventScript_1612D1", + "flag": "173" + }, + { + "graphics_id": "49", + "x": 2, + "y": 20, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "RocketHideout_B3F_EventScript_1612BA", + "flag": "173" + }, + { + "graphics_id": "92", + "x": 12, + "y": 12, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RocketHideout_B3F_EventScript_1BE714", + "flag": "370" + }, + { + "graphics_id": "92", + "x": 19, + "y": 14, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RocketHideout_B3F_EventScript_1BE721", + "flag": "371" + }, + { + "graphics_id": "92", + "x": 14, + "y": 24, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RocketHideout_B3F_EventScript_1BEBCD", + "flag": "466" + } + ], + "warp_events": [ + { + "x": 18, + "y": 2, + "elevation": 3, + "dest_map": "MAP_ROCKET_HIDEOUT_B2F", + "dest_warp_id": 0 + }, + { + "x": 15, + "y": 18, + "elevation": 3, + "dest_map": "MAP_ROCKET_HIDEOUT_B4F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "hidden_item", + "x": 1, + "y": 3, + "elevation": 3, + "item": "ITEM_NUGGET", + "flag": "12", + "unknown": 1 + } + ] +}
\ No newline at end of file diff --git a/data/maps/RocketHideout_B4F/events.inc b/data/maps/RocketHideout_B4F/events.inc deleted file mode 100644 index 1f2d1013a..000000000 --- a/data/maps/RocketHideout_B4F/events.inc +++ /dev/null @@ -1,22 +0,0 @@ -RocketHideout_B4F_EventObjects: - object_event 1, 87, 0, 19, 0, 4, 0, 3, 8, 17, 0, 0, 0, 0, 0, RocketHideout_B4F_EventScript_161317, 56, 0, 0 - object_event 2, 92, 0, 20, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, RocketHideout_B4F_EventScript_161363, 55, 0, 0 - object_event 3, 49, 0, 4, 0, 2, 0, 3, 8, 17, 0, 1, 0, 1, 0, RocketHideout_B4F_EventScript_161381, 173, 0, 0 - object_event 4, 92, 0, 3, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, RocketHideout_B4F_EventScript_1613AD, 54, 0, 0 - object_event 5, 49, 0, 19, 0, 14, 0, 3, 8, 17, 0, 1, 0, 0, 0, RocketHideout_B4F_EventScript_161418, 173, 0, 0 - object_event 6, 49, 0, 16, 0, 14, 0, 3, 8, 17, 0, 1, 0, 0, 0, RocketHideout_B4F_EventScript_1613CE, 173, 0, 0 - object_event 7, 92, 0, 1, 0, 6, 0, 3, 8, 17, 0, 0, 0, 0, 0, RocketHideout_B4F_EventScript_1BE72E, 372, 0, 0 - object_event 8, 92, 0, 4, 0, 14, 0, 0, 8, 17, 0, 0, 0, 0, 0, RocketHideout_B4F_EventScript_1BE73B, 373, 0, 0 - object_event 9, 92, 0, 6, 0, 23, 0, 0, 8, 17, 0, 0, 0, 0, 0, RocketHideout_B4F_EventScript_1BE748, 374, 0, 0 - -RocketHideout_B4F_MapWarps: - warp_def 11, 15, 3, 1, 300 - warp_def 20, 23, 0, 1, 302 - warp_def 21, 23, 0, 1, 302 - -RocketHideout_B4F_MapBGEvents: - bg_event 22, 6, 3, 7, 0, 8, 13, 1 - bg_event 16, 6, 3, 7, 0, 6, 134, 1 - -RocketHideout_B4F_MapEvents:: - map_events RocketHideout_B4F_EventObjects, RocketHideout_B4F_MapWarps, 0x0, RocketHideout_B4F_MapBGEvents diff --git a/data/maps/RocketHideout_B4F/header.inc b/data/maps/RocketHideout_B4F/header.inc deleted file mode 100644 index 1d37c165d..000000000 --- a/data/maps/RocketHideout_B4F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -RocketHideout_B4F:: @ 834F700 - .4byte RocketHideout_B4F_Layout @ 0x8306B98 - .4byte RocketHideout_B4F_MapEvents @ 0x83AFC50 - .4byte RocketHideout_B4F_MapScripts @ 0x81612E8 - .4byte NULL - .2byte BGM_FRLG_ROCKET_HIDEOUT - .2byte 131 - .byte 0x85, 0x00, 0x00, 0x08, 0x00, 0x07, 0xfc, 0x03 diff --git a/data/maps/RocketHideout_B4F/map.json b/data/maps/RocketHideout_B4F/map.json new file mode 100644 index 000000000..8f28dd94e --- /dev/null +++ b/data/maps/RocketHideout_B4F/map.json @@ -0,0 +1,178 @@ +{ + "id": "MAP_ROCKET_HIDEOUT_B4F", + "name": "RocketHideout_B4F", + "layout": "LAYOUT_ROCKET_HIDEOUT_B4F", + "music": "BGM_FRLG_ROCKET_HIDEOUT", + "region_map_section": "MAPSEC_ROCKET_HIDEOUT", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 7, + "elevator_flag": -4, + "battle_scene": "BATTLE_SCENE_3", + "connections": null, + "object_events": [ + { + "graphics_id": "87", + "x": 19, + "y": 4, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RocketHideout_B4F_EventScript_161317", + "flag": "56" + }, + { + "graphics_id": "92", + "x": 20, + "y": 5, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RocketHideout_B4F_EventScript_161363", + "flag": "55" + }, + { + "graphics_id": "49", + "x": 4, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "RocketHideout_B4F_EventScript_161381", + "flag": "173" + }, + { + "graphics_id": "92", + "x": 3, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RocketHideout_B4F_EventScript_1613AD", + "flag": "54" + }, + { + "graphics_id": "49", + "x": 19, + "y": 14, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 0, + "script": "RocketHideout_B4F_EventScript_161418", + "flag": "173" + }, + { + "graphics_id": "49", + "x": 16, + "y": 14, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 0, + "script": "RocketHideout_B4F_EventScript_1613CE", + "flag": "173" + }, + { + "graphics_id": "92", + "x": 1, + "y": 6, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RocketHideout_B4F_EventScript_1BE72E", + "flag": "372" + }, + { + "graphics_id": "92", + "x": 4, + "y": 14, + "elevation": 0, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RocketHideout_B4F_EventScript_1BE73B", + "flag": "373" + }, + { + "graphics_id": "92", + "x": 6, + "y": 23, + "elevation": 0, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RocketHideout_B4F_EventScript_1BE748", + "flag": "374" + } + ], + "warp_events": [ + { + "x": 11, + "y": 15, + "elevation": 3, + "dest_map": "MAP_ROCKET_HIDEOUT_B3F", + "dest_warp_id": 1 + }, + { + "x": 20, + "y": 23, + "elevation": 0, + "dest_map": "MAP_ROCKET_HIDEOUT_ELEVATOR", + "dest_warp_id": 1 + }, + { + "x": 21, + "y": 23, + "elevation": 0, + "dest_map": "MAP_ROCKET_HIDEOUT_ELEVATOR", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "hidden_item", + "x": 22, + "y": 6, + "elevation": 3, + "item": "ITEM_NEST_BALL", + "flag": "13", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 16, + "y": 6, + "elevation": 3, + "item": "ITEM_NET_BALL", + "flag": "134", + "unknown": 1 + } + ] +}
\ No newline at end of file diff --git a/data/maps/RocketHideout_Elevator/events.inc b/data/maps/RocketHideout_Elevator/events.inc deleted file mode 100644 index d60afa41d..000000000 --- a/data/maps/RocketHideout_Elevator/events.inc +++ /dev/null @@ -1,9 +0,0 @@ -RocketHideout_Elevator_MapWarps: - warp_def 1, 5, 3, 127, 32639 - warp_def 2, 5, 3, 127, 32639 - -RocketHideout_Elevator_MapBGEvents: - bg_event 0, 2, 0, 0, 0, RocketHideout_Elevator_EventScript_1614D9 - -RocketHideout_Elevator_MapEvents:: - map_events 0x0, RocketHideout_Elevator_MapWarps, 0x0, RocketHideout_Elevator_MapBGEvents diff --git a/data/maps/RocketHideout_Elevator/header.inc b/data/maps/RocketHideout_Elevator/header.inc deleted file mode 100644 index 321b9829d..000000000 --- a/data/maps/RocketHideout_Elevator/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -RocketHideout_Elevator:: @ 834F71C - .4byte RocketHideout_Elevator_Layout @ 0x8320EDC - .4byte RocketHideout_Elevator_MapEvents @ 0x83AFC80 - .4byte RocketHideout_Elevator_MapScripts @ 0x81614D8 - .4byte NULL - .2byte BGM_FRLG_ROCKET_HIDEOUT - .2byte 225 - .byte 0x85, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x03 diff --git a/data/maps/RocketHideout_Elevator/map.json b/data/maps/RocketHideout_Elevator/map.json new file mode 100644 index 000000000..6b16ec8eb --- /dev/null +++ b/data/maps/RocketHideout_Elevator/map.json @@ -0,0 +1,42 @@ +{ + "id": "MAP_ROCKET_HIDEOUT_ELEVATOR", + "name": "RocketHideout_Elevator", + "layout": "LAYOUT_ROCKET_HIDEOUT_ELEVATOR", + "music": "BGM_FRLG_ROCKET_HIDEOUT", + "region_map_section": "MAPSEC_ROCKET_HIDEOUT", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_3", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 1, + "y": 5, + "elevation": 3, + "dest_map": "MAP_NONE", + "dest_warp_id": 127 + }, + { + "x": 2, + "y": 5, + "elevation": 3, + "dest_map": "MAP_NONE", + "dest_warp_id": 127 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 0, + "y": 2, + "elevation": 0, + "script": "RocketHideout_Elevator_EventScript_1614D9" + } + ] +}
\ No newline at end of file diff --git a/data/maps/Route1/connections.inc b/data/maps/Route1/connections.inc deleted file mode 100644 index 76b5b6814..000000000 --- a/data/maps/Route1/connections.inc +++ /dev/null @@ -1,7 +0,0 @@ -Route1_MapConnectionsList: @ 83529DC - connection up, -12, MAP_VIRIDIAN_CITY - connection down, 0, MAP_PALLET_TOWN - -Route1_MapConnections:: @ 83529F4 - .4byte 2 - .4byte Route1_MapConnectionsList diff --git a/data/maps/Route1/events.inc b/data/maps/Route1/events.inc deleted file mode 100644 index a485d4951..000000000 --- a/data/maps/Route1/events.inc +++ /dev/null @@ -1,9 +0,0 @@ -Route1_EventObjects: - object_event 1, 68, 0, 6, 0, 28, 0, 3, 3, 17, 0, 0, 0, 0, 0, Route1_EventScript_167EFE, 0, 0, 0 - object_event 2, 19, 0, 19, 0, 16, 0, 3, 5, 49, 0, 0, 0, 0, 0, Route1_EventScript_167F52, 0, 0, 0 - -Route1_MapBGEvents: - bg_event 9, 31, 0, 0, 0, Route1_EventScript_167F5B - -Route1_MapEvents:: - map_events Route1_EventObjects, 0x0, 0x0, Route1_MapBGEvents diff --git a/data/maps/Route1/header.inc b/data/maps/Route1/header.inc deleted file mode 100644 index 900563a23..000000000 --- a/data/maps/Route1/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route1:: @ 835082C - .4byte Route1_Layout @ 0x82E55CC - .4byte Route1_MapEvents @ 0x83B6648 - .4byte Route1_MapScripts @ 0x8167EFD - .4byte Route1_MapConnections @ 0x83529F4 - .2byte BGM_FRLG_ROUTE_1 - .2byte 89 - .byte 0x65, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/Route1/map.json b/data/maps/Route1/map.json new file mode 100644 index 000000000..8996e5b45 --- /dev/null +++ b/data/maps/Route1/map.json @@ -0,0 +1,65 @@ +{ + "id": "MAP_ROUTE1", + "name": "Route1", + "layout": "LAYOUT_ROUTE1", + "music": "BGM_FRLG_ROUTE_1", + "region_map_section": "MAPSEC_ROUTE_1", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_3", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_VIRIDIAN_CITY", + "offset": -12, + "direction": "up" + }, + { + "map": "MAP_PALLET_TOWN", + "offset": 0, + "direction": "down" + } + ], + "object_events": [ + { + "graphics_id": "68", + "x": 6, + "y": 28, + "elevation": 3, + "movement_type": "3", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route1_EventScript_167EFE", + "flag": "0" + }, + { + "graphics_id": "19", + "x": 19, + "y": 16, + "elevation": 3, + "movement_type": "5", + "movement_range_x": 1, + "movement_range_y": 3, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route1_EventScript_167F52", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 9, + "y": 31, + "elevation": 0, + "script": "Route1_EventScript_167F5B" + } + ] +}
\ No newline at end of file diff --git a/data/maps/Route10/connections.inc b/data/maps/Route10/connections.inc deleted file mode 100644 index bd7b4787f..000000000 --- a/data/maps/Route10/connections.inc +++ /dev/null @@ -1,7 +0,0 @@ -Route10_MapConnectionsList: @ 8352AFC - connection down, 0, MAP_LAVENDER_TOWN - connection left, 0, MAP_ROUTE9 - -Route10_MapConnections:: @ 8352B14 - .4byte 2 - .4byte Route10_MapConnectionsList diff --git a/data/maps/Route10/events.inc b/data/maps/Route10/events.inc deleted file mode 100644 index 3f1ba88db..000000000 --- a/data/maps/Route10/events.inc +++ /dev/null @@ -1,31 +0,0 @@ -Route10_EventObjects: - object_event 1, 40, 0, 7, 0, 60, 0, 3, 1, 17, 0, 1, 0, 2, 0, Route10_EventScript_1A9FE5, 0, 0, 0 - object_event 2, 56, 0, 4, 0, 62, 0, 3, 1, 17, 0, 1, 0, 1, 0, Route10_EventScript_1AA09F, 0, 0, 0 - object_event 3, 52, 0, 15, 0, 70, 0, 3, 5, 18, 0, 1, 0, 2, 0, Route10_EventScript_1AA061, 0, 0, 0 - object_event 4, 56, 0, 4, 0, 68, 0, 3, 9, 17, 0, 1, 0, 2, 0, Route10_EventScript_1AA0DD, 0, 0, 0 - object_event 5, 52, 0, 13, 0, 44, 0, 3, 9, 17, 0, 1, 0, 5, 0, Route10_EventScript_1AA023, 0, 0, 0 - object_event 6, 40, 0, 9, 0, 27, 0, 3, 8, 17, 0, 1, 0, 2, 0, Route10_EventScript_1A9FA7, 0, 0, 0 - object_event 7, 95, 0, 10, 0, 20, 0, 0, 8, 17, 0, 0, 0, 0, 0, Route10_EventScript_1BDF13, 18, 0, 0 - object_event 8, 95, 0, 10, 0, 22, 0, 0, 8, 17, 0, 0, 0, 0, 0, Route10_EventScript_1BDF13, 19, 0, 0 - object_event 9, 95, 0, 10, 0, 24, 0, 0, 8, 17, 0, 0, 0, 0, 0, Route10_EventScript_1BDF13, 20, 0, 0 - object_event 10, 95, 0, 10, 0, 26, 0, 0, 8, 17, 0, 0, 0, 0, 0, Route10_EventScript_1BDF13, 21, 0, 0 - -Route10_MapWarps: - warp_def 8, 19, 3, 0, 337 - warp_def 8, 57, 3, 5, 337 - warp_def 7, 40, 3, 1, 351 - warp_def 13, 20, 0, 1, 5376 - warp_def 2, 37, 3, 3, 351 - -Route10_MapBGEvents: - bg_event 15, 59, 0, 0, 0, Route10_EventScript_167FE4 - bg_event 6, 42, 0, 0, 0, Route10_EventScript_167FED - bg_event 7, 21, 0, 0, 0, Route10_EventScript_167FDB - bg_event 10, 19, 0, 7, 0, 22, 9, 1 - bg_event 12, 40, 3, 7, 0, 35, 10, 1 - bg_event 6, 26, 3, 7, 0, 133, 126, 1 - bg_event 17, 29, 3, 7, 0, 140, 125, 1 - bg_event 20, 57, 3, 7, 0, 150, 151, 1 - -Route10_MapEvents:: - map_events Route10_EventObjects, Route10_MapWarps, 0x0, Route10_MapBGEvents diff --git a/data/maps/Route10/header.inc b/data/maps/Route10/header.inc deleted file mode 100644 index 3557919fb..000000000 --- a/data/maps/Route10/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route10:: @ 8350928 - .4byte Route10_Layout @ 0x82EC3D0 - .4byte Route10_MapEvents @ 0x83B6FA0 - .4byte Route10_MapScripts @ 0x8167FD9 - .4byte Route10_MapConnections @ 0x8352B14 - .2byte BGM_FRLG_ROUTE_3 - .2byte 98 - .byte 0x6e, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/Route10/map.json b/data/maps/Route10/map.json new file mode 100644 index 000000000..4314e572c --- /dev/null +++ b/data/maps/Route10/map.json @@ -0,0 +1,264 @@ +{ + "id": "MAP_ROUTE10", + "name": "Route10", + "layout": "LAYOUT_ROUTE10", + "music": "BGM_FRLG_ROUTE_3", + "region_map_section": "MAPSEC_ROUTE_10", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_3", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_LAVENDER_TOWN", + "offset": 0, + "direction": "down" + }, + { + "map": "MAP_ROUTE9", + "offset": 0, + "direction": "left" + } + ], + "object_events": [ + { + "graphics_id": "40", + "x": 7, + "y": 60, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route10_EventScript_1A9FE5", + "flag": "0" + }, + { + "graphics_id": "56", + "x": 4, + "y": 62, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route10_EventScript_1AA09F", + "flag": "0" + }, + { + "graphics_id": "52", + "x": 15, + "y": 70, + "elevation": 3, + "movement_type": "5", + "movement_range_x": 2, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route10_EventScript_1AA061", + "flag": "0" + }, + { + "graphics_id": "56", + "x": 4, + "y": 68, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route10_EventScript_1AA0DD", + "flag": "0" + }, + { + "graphics_id": "52", + "x": 13, + "y": 44, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "Route10_EventScript_1AA023", + "flag": "0" + }, + { + "graphics_id": "40", + "x": 9, + "y": 27, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route10_EventScript_1A9FA7", + "flag": "0" + }, + { + "graphics_id": "95", + "x": 10, + "y": 20, + "elevation": 0, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route10_EventScript_1BDF13", + "flag": "18" + }, + { + "graphics_id": "95", + "x": 10, + "y": 22, + "elevation": 0, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route10_EventScript_1BDF13", + "flag": "19" + }, + { + "graphics_id": "95", + "x": 10, + "y": 24, + "elevation": 0, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route10_EventScript_1BDF13", + "flag": "20" + }, + { + "graphics_id": "95", + "x": 10, + "y": 26, + "elevation": 0, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route10_EventScript_1BDF13", + "flag": "21" + } + ], + "warp_events": [ + { + "x": 8, + "y": 19, + "elevation": 3, + "dest_map": "MAP_ROCK_TUNNEL_1F", + "dest_warp_id": 0 + }, + { + "x": 8, + "y": 57, + "elevation": 3, + "dest_map": "MAP_ROCK_TUNNEL_1F", + "dest_warp_id": 5 + }, + { + "x": 7, + "y": 40, + "elevation": 3, + "dest_map": "MAP_POWER_PLANT", + "dest_warp_id": 1 + }, + { + "x": 13, + "y": 20, + "elevation": 0, + "dest_map": "MAP_ROUTE10_POKEMON_CENTER_1F", + "dest_warp_id": 1 + }, + { + "x": 2, + "y": 37, + "elevation": 3, + "dest_map": "MAP_POWER_PLANT", + "dest_warp_id": 3 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 15, + "y": 59, + "elevation": 0, + "script": "Route10_EventScript_167FE4" + }, + { + "type": "bg_event_type_0", + "x": 6, + "y": 42, + "elevation": 0, + "script": "Route10_EventScript_167FED" + }, + { + "type": "bg_event_type_0", + "x": 7, + "y": 21, + "elevation": 0, + "script": "Route10_EventScript_167FDB" + }, + { + "type": "hidden_item", + "x": 10, + "y": 19, + "elevation": 0, + "item": "ITEM_SUPER_POTION", + "flag": "9", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 12, + "y": 40, + "elevation": 3, + "item": "ITEM_MAX_ETHER", + "flag": "10", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 6, + "y": 26, + "elevation": 3, + "item": "ITEM_CHERI_BERRY", + "flag": "126", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 17, + "y": 29, + "elevation": 3, + "item": "ITEM_PERSIM_BERRY", + "flag": "125", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 20, + "y": 57, + "elevation": 3, + "item": "ITEM_NANAB_BERRY", + "flag": "151", + "unknown": 1 + } + ] +}
\ No newline at end of file diff --git a/data/maps/Route10_PokemonCenter_1F/events.inc b/data/maps/Route10_PokemonCenter_1F/events.inc deleted file mode 100644 index bcfe02b9c..000000000 --- a/data/maps/Route10_PokemonCenter_1F/events.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route10_PokemonCenter_1F_EventObjects: - object_event 1, 64, 0, 7, 0, 2, 0, 0, 8, 17, 0, 0, 0, 0, 0, Route10_PokemonCenter_1F_EventScript_16FC41, 0, 0, 0 - object_event 2, 61, 0, 9, 0, 4, 0, 3, 5, 17, 0, 0, 0, 0, 0, Route10_PokemonCenter_1F_EventScript_16FC53, 0, 0, 0 - object_event 3, 27, 0, 2, 0, 3, 0, 3, 5, 17, 0, 0, 0, 0, 0, Route10_PokemonCenter_1F_EventScript_16FC4A, 0, 0, 0 - object_event 4, 18, 0, 14, 0, 6, 0, 3, 9, 17, 0, 0, 0, 0, 0, Route10_PokemonCenter_1F_EventScript_16FC5C, 0, 0, 0 - object_event 5, 55, 0, 12, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route10_PokemonCenter_1F_EventScript_16FC65, 0, 0, 0 - -Route10_PokemonCenter_1F_MapWarps: - warp_def 6, 8, 3, 3, 796 - warp_def 7, 8, 3, 3, 796 - warp_def 8, 8, 3, 3, 796 - warp_def 1, 6, 4, 0, 5377 - -Route10_PokemonCenter_1F_MapEvents:: - map_events Route10_PokemonCenter_1F_EventObjects, Route10_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/Route10_PokemonCenter_1F/header.inc b/data/maps/Route10_PokemonCenter_1F/header.inc deleted file mode 100644 index 2f7bd05cc..000000000 --- a/data/maps/Route10_PokemonCenter_1F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route10_PokemonCenter_1F:: @ 83518B0 - .4byte PokemonCenter_1F_Layout @ 0x82D5990 - .4byte Route10_PokemonCenter_1F_MapEvents @ 0x83BD8FC - .4byte Route10_PokemonCenter_1F_MapScripts @ 0x816FC2F - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 8 - .byte 0x6e, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/Route10_PokemonCenter_1F/map.json b/data/maps/Route10_PokemonCenter_1F/map.json new file mode 100644 index 000000000..868607faf --- /dev/null +++ b/data/maps/Route10_PokemonCenter_1F/map.json @@ -0,0 +1,114 @@ +{ + "id": "MAP_ROUTE10_POKEMON_CENTER_1F", + "name": "Route10_PokemonCenter_1F", + "layout": "LAYOUT_POKEMON_CENTER_1F", + "music": "BGM_FRLG_POKEMON_CENTER", + "region_map_section": "MAPSEC_ROUTE_10", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "64", + "x": 7, + "y": 2, + "elevation": 0, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route10_PokemonCenter_1F_EventScript_16FC41", + "flag": "0" + }, + { + "graphics_id": "61", + "x": 9, + "y": 4, + "elevation": 3, + "movement_type": "5", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route10_PokemonCenter_1F_EventScript_16FC53", + "flag": "0" + }, + { + "graphics_id": "27", + "x": 2, + "y": 3, + "elevation": 3, + "movement_type": "5", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route10_PokemonCenter_1F_EventScript_16FC4A", + "flag": "0" + }, + { + "graphics_id": "18", + "x": 14, + "y": 6, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route10_PokemonCenter_1F_EventScript_16FC5C", + "flag": "0" + }, + { + "graphics_id": "55", + "x": 12, + "y": 5, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route10_PokemonCenter_1F_EventScript_16FC65", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 6, + "y": 8, + "elevation": 3, + "dest_map": "MAP_ROUTE10", + "dest_warp_id": 3 + }, + { + "x": 7, + "y": 8, + "elevation": 3, + "dest_map": "MAP_ROUTE10", + "dest_warp_id": 3 + }, + { + "x": 8, + "y": 8, + "elevation": 3, + "dest_map": "MAP_ROUTE10", + "dest_warp_id": 3 + }, + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_ROUTE10_POKEMON_CENTER_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/Route10_PokemonCenter_2F/events.inc b/data/maps/Route10_PokemonCenter_2F/events.inc deleted file mode 100644 index b3cdd3e38..000000000 --- a/data/maps/Route10_PokemonCenter_2F/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -Route10_PokemonCenter_2F_EventObjects: - object_event 1, 65, 0, 6, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route10_PokemonCenter_2F_EventScript_1A8CF6, 0, 0, 0 - object_event 2, 65, 0, 2, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route10_PokemonCenter_2F_EventScript_1A8CFC, 0, 0, 0 - object_event 3, 65, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route10_PokemonCenter_2F_EventScript_1A8D02, 0, 0, 0 - object_event 4, 69, 0, 1, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route10_PokemonCenter_2F_EventScript_1BB1D2, 112, 0, 0 - -Route10_PokemonCenter_2F_MapWarps: - warp_def 1, 6, 4, 3, 5376 - warp_def 5, 1, 0, 0, 4 - warp_def 9, 1, 0, 0, 1 - -Route10_PokemonCenter_2F_MapEvents:: - map_events Route10_PokemonCenter_2F_EventObjects, Route10_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/Route10_PokemonCenter_2F/header.inc b/data/maps/Route10_PokemonCenter_2F/header.inc deleted file mode 100644 index 5ed083920..000000000 --- a/data/maps/Route10_PokemonCenter_2F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route10_PokemonCenter_2F:: @ 83518CC - .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 - .4byte Route10_PokemonCenter_2F_MapEvents @ 0x83BD988 - .4byte Route10_PokemonCenter_2F_MapScripts @ 0x816FCFA - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 9 - .byte 0x6e, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/Route10_PokemonCenter_2F/map.json b/data/maps/Route10_PokemonCenter_2F/map.json new file mode 100644 index 000000000..1f185774b --- /dev/null +++ b/data/maps/Route10_PokemonCenter_2F/map.json @@ -0,0 +1,94 @@ +{ + "id": "MAP_ROUTE10_POKEMON_CENTER_2F", + "name": "Route10_PokemonCenter_2F", + "layout": "LAYOUT_POKEMON_CENTER_2F", + "music": "BGM_FRLG_POKEMON_CENTER", + "region_map_section": "MAPSEC_ROUTE_10", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "65", + "x": 6, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route10_PokemonCenter_2F_EventScript_1A8CF6", + "flag": "0" + }, + { + "graphics_id": "65", + "x": 2, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route10_PokemonCenter_2F_EventScript_1A8CFC", + "flag": "0" + }, + { + "graphics_id": "65", + "x": 10, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route10_PokemonCenter_2F_EventScript_1A8D02", + "flag": "0" + }, + { + "graphics_id": "69", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route10_PokemonCenter_2F_EventScript_1BB1D2", + "flag": "112" + } + ], + "warp_events": [ + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_ROUTE10_POKEMON_CENTER_1F", + "dest_warp_id": 3 + }, + { + "x": 5, + "y": 1, + "elevation": 0, + "dest_map": "MAP_UNKNOWN_MAP_00_04", + "dest_warp_id": 0 + }, + { + "x": 9, + "y": 1, + "elevation": 0, + "dest_map": "MAP_UNKNOWN_MAP_00_01", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/Route11/connections.inc b/data/maps/Route11/connections.inc deleted file mode 100644 index d250bb844..000000000 --- a/data/maps/Route11/connections.inc +++ /dev/null @@ -1,7 +0,0 @@ -Route11_MapConnectionsList: @ 8352B1C - connection left, -10, MAP_VERMILION_CITY - connection right, -60, MAP_ROUTE12 - -Route11_MapConnections:: @ 8352B34 - .4byte 2 - .4byte Route11_MapConnectionsList diff --git a/data/maps/Route11/events.inc b/data/maps/Route11/events.inc deleted file mode 100644 index 4e32954ea..000000000 --- a/data/maps/Route11/events.inc +++ /dev/null @@ -1,26 +0,0 @@ -Route11_EventObjects: - object_event 1, 18, 0, 19, 0, 8, 0, 3, 17, 17, 0, 1, 0, 4, 0, Route11_EventScript_1A9B0D, 0, 0, 0 - object_event 2, 32, 0, 16, 0, 17, 0, 3, 1, 17, 0, 1, 0, 1, 0, Route11_EventScript_1A9C81, 0, 0, 0 - object_event 3, 18, 0, 31, 0, 8, 0, 3, 15, 17, 0, 1, 0, 4, 0, Route11_EventScript_1A9B4B, 0, 0, 0 - object_event 4, 18, 0, 28, 0, 10, 0, 3, 40, 72, 0, 1, 0, 1, 0, Route11_EventScript_1A9BC7, 0, 0, 0 - object_event 5, 32, 0, 38, 0, 15, 0, 3, 1, 17, 0, 1, 0, 1, 0, Route11_EventScript_1A9CBF, 0, 0, 0 - object_event 6, 32, 0, 50, 0, 4, 0, 3, 1, 17, 0, 1, 0, 1, 0, Route11_EventScript_1A9D3B, 0, 0, 0 - object_event 7, 30, 0, 42, 0, 8, 0, 3, 14, 17, 0, 1, 0, 4, 0, Route11_EventScript_1A9C05, 0, 0, 0 - object_event 8, 18, 0, 50, 0, 14, 0, 3, 25, 65, 0, 1, 0, 1, 0, Route11_EventScript_1A9B89, 0, 0, 0 - object_event 9, 32, 0, 57, 0, 16, 0, 3, 1, 17, 0, 1, 0, 1, 0, Route11_EventScript_1A9CFD, 0, 0, 0 - object_event 10, 30, 0, 32, 0, 18, 0, 3, 14, 17, 0, 1, 0, 6, 0, Route11_EventScript_1A9C43, 0, 0, 0 - object_event 11, 92, 0, 42, 0, 12, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route11_EventScript_1BEAF0, 449, 0, 0 - object_event 12, 92, 0, 63, 0, 13, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route11_EventScript_1BEB99, 462, 0, 0 - object_event 13, 92, 0, 13, 0, 3, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route11_EventScript_1BEBA6, 463, 0, 0 - -Route11_MapWarps: - warp_def 6, 7, 0, 0, 294 - warp_def 58, 10, 3, 0, 5632 - warp_def 65, 10, 3, 2, 5632 - -Route11_MapBGEvents: - bg_event 3, 7, 3, 0, 0, Route11_EventScript_167FF7 - bg_event 58, 5, 0, 7, 0, 85, 41, 1 - -Route11_MapEvents:: - map_events Route11_EventObjects, Route11_MapWarps, 0x0, Route11_MapBGEvents diff --git a/data/maps/Route11/header.inc b/data/maps/Route11/header.inc deleted file mode 100644 index 92ea71fdb..000000000 --- a/data/maps/Route11/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route11:: @ 8350944 - .4byte Route11_Layout @ 0x82ECF34 - .4byte Route11_MapEvents @ 0x83B711C - .4byte Route11_MapScripts @ 0x8167FF6 - .4byte Route11_MapConnections @ 0x8352B34 - .2byte BGM_FRLG_ROUTE_11 - .2byte 99 - .byte 0x6f, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/Route11/map.json b/data/maps/Route11/map.json new file mode 100644 index 000000000..6800fad19 --- /dev/null +++ b/data/maps/Route11/map.json @@ -0,0 +1,239 @@ +{ + "id": "MAP_ROUTE11", + "name": "Route11", + "layout": "LAYOUT_ROUTE11", + "music": "BGM_FRLG_ROUTE_11", + "region_map_section": "MAPSEC_ROUTE_11", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_3", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_VERMILION_CITY", + "offset": -10, + "direction": "left" + }, + { + "map": "MAP_ROUTE12", + "offset": -60, + "direction": "right" + } + ], + "object_events": [ + { + "graphics_id": "18", + "x": 19, + "y": 8, + "elevation": 3, + "movement_type": "17", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route11_EventScript_1A9B0D", + "flag": "0" + }, + { + "graphics_id": "32", + "x": 16, + "y": 17, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route11_EventScript_1A9C81", + "flag": "0" + }, + { + "graphics_id": "18", + "x": 31, + "y": 8, + "elevation": 3, + "movement_type": "15", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route11_EventScript_1A9B4B", + "flag": "0" + }, + { + "graphics_id": "18", + "x": 28, + "y": 10, + "elevation": 3, + "movement_type": "40", + "movement_range_x": 8, + "movement_range_y": 4, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route11_EventScript_1A9BC7", + "flag": "0" + }, + { + "graphics_id": "32", + "x": 38, + "y": 15, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route11_EventScript_1A9CBF", + "flag": "0" + }, + { + "graphics_id": "32", + "x": 50, + "y": 4, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route11_EventScript_1A9D3B", + "flag": "0" + }, + { + "graphics_id": "30", + "x": 42, + "y": 8, + "elevation": 3, + "movement_type": "14", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route11_EventScript_1A9C05", + "flag": "0" + }, + { + "graphics_id": "18", + "x": 50, + "y": 14, + "elevation": 3, + "movement_type": "25", + "movement_range_x": 1, + "movement_range_y": 4, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route11_EventScript_1A9B89", + "flag": "0" + }, + { + "graphics_id": "32", + "x": 57, + "y": 16, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route11_EventScript_1A9CFD", + "flag": "0" + }, + { + "graphics_id": "30", + "x": 32, + "y": 18, + "elevation": 3, + "movement_type": "14", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 6, + "script": "Route11_EventScript_1A9C43", + "flag": "0" + }, + { + "graphics_id": "92", + "x": 42, + "y": 12, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route11_EventScript_1BEAF0", + "flag": "449" + }, + { + "graphics_id": "92", + "x": 63, + "y": 13, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route11_EventScript_1BEB99", + "flag": "462" + }, + { + "graphics_id": "92", + "x": 13, + "y": 3, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route11_EventScript_1BEBA6", + "flag": "463" + } + ], + "warp_events": [ + { + "x": 6, + "y": 7, + "elevation": 0, + "dest_map": "MAP_DIGLETTS_CAVE_SOUTH_ENTRANCE", + "dest_warp_id": 0 + }, + { + "x": 58, + "y": 10, + "elevation": 3, + "dest_map": "MAP_ROUTE11_EAST_ENTRANCE_1F", + "dest_warp_id": 0 + }, + { + "x": 65, + "y": 10, + "elevation": 3, + "dest_map": "MAP_ROUTE11_EAST_ENTRANCE_1F", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 3, + "y": 7, + "elevation": 3, + "script": "Route11_EventScript_167FF7" + }, + { + "type": "hidden_item", + "x": 58, + "y": 5, + "elevation": 0, + "item": "ITEM_ESCAPE_ROPE", + "flag": "41", + "unknown": 1 + } + ] +}
\ No newline at end of file diff --git a/data/maps/Route11_EastEntrance_1F/events.inc b/data/maps/Route11_EastEntrance_1F/events.inc deleted file mode 100644 index db740f2b5..000000000 --- a/data/maps/Route11_EastEntrance_1F/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -Route11_EastEntrance_1F_EventObjects: - object_event 1, 60, 0, 6, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route11_EastEntrance_1F_EventScript_16FD22, 0, 0, 0 - object_event 2, 60, 0, 4, 0, 10, 0, 0, 7, 17, 0, 0, 0, 0, 0, Route11_EastEntrance_1F_EventScript_16FD2B, 0, 0, 0 - -Route11_EastEntrance_1F_MapWarps: - warp_def 1, 6, 3, 1, 797 - warp_def 1, 7, 3, 1, 797 - warp_def 11, 6, 3, 2, 797 - warp_def 11, 7, 3, 2, 797 - warp_def 9, 10, 3, 0, 5633 - -Route11_EastEntrance_1F_MapEvents:: - map_events Route11_EastEntrance_1F_EventObjects, Route11_EastEntrance_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/Route11_EastEntrance_1F/header.inc b/data/maps/Route11_EastEntrance_1F/header.inc deleted file mode 100644 index 8c54bc523..000000000 --- a/data/maps/Route11_EastEntrance_1F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route11_EastEntrance_1F:: @ 83518E8 - .4byte Entrance_1F_Layout @ 0x8320E70 - .4byte Route11_EastEntrance_1F_MapEvents @ 0x83BD9F4 - .4byte Route11_EastEntrance_1F_MapScripts @ 0x816FD21 - .4byte NULL - .2byte BGM_FRLG_VERMILION_CITY - .2byte 224 - .byte 0x6f, 0x00, 0x00, 0x08, 0x01, 0x02, 0x00, 0x00 diff --git a/data/maps/Route11_EastEntrance_1F/map.json b/data/maps/Route11_EastEntrance_1F/map.json new file mode 100644 index 000000000..701eef973 --- /dev/null +++ b/data/maps/Route11_EastEntrance_1F/map.json @@ -0,0 +1,82 @@ +{ + "id": "MAP_ROUTE11_EAST_ENTRANCE_1F", + "name": "Route11_EastEntrance_1F", + "layout": "LAYOUT_ENTRANCE_1F", + "music": "BGM_FRLG_VERMILION_CITY", + "region_map_section": "MAPSEC_ROUTE_11", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 1, + "unknown_19": 2, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "60", + "x": 6, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route11_EastEntrance_1F_EventScript_16FD22", + "flag": "0" + }, + { + "graphics_id": "60", + "x": 4, + "y": 10, + "elevation": 0, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route11_EastEntrance_1F_EventScript_16FD2B", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 1, + "y": 6, + "elevation": 3, + "dest_map": "MAP_ROUTE11", + "dest_warp_id": 1 + }, + { + "x": 1, + "y": 7, + "elevation": 3, + "dest_map": "MAP_ROUTE11", + "dest_warp_id": 1 + }, + { + "x": 11, + "y": 6, + "elevation": 3, + "dest_map": "MAP_ROUTE11", + "dest_warp_id": 2 + }, + { + "x": 11, + "y": 7, + "elevation": 3, + "dest_map": "MAP_ROUTE11", + "dest_warp_id": 2 + }, + { + "x": 9, + "y": 10, + "elevation": 3, + "dest_map": "MAP_ROUTE11_EAST_ENTRANCE_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/Route11_EastEntrance_2F/events.inc b/data/maps/Route11_EastEntrance_2F/events.inc deleted file mode 100644 index 66cfc6c89..000000000 --- a/data/maps/Route11_EastEntrance_2F/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -Route11_EastEntrance_2F_EventObjects: - object_event 1, 18, 0, 7, 0, 3, 0, 3, 5, 18, 0, 0, 0, 0, 0, Route11_EastEntrance_2F_EventScript_16FD5C, 0, 0, 0 - object_event 2, 55, 0, 2, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route11_EastEntrance_2F_EventScript_16FDD8, 0, 0, 0 - -Route11_EastEntrance_2F_MapWarps: - warp_def 10, 9, 3, 4, 5632 - -Route11_EastEntrance_2F_MapBGEvents: - bg_event 4, 1, 0, 0, 0, Route11_EastEntrance_2F_EventScript_16FD35 - bg_event 8, 1, 0, 0, 0, Route11_EastEntrance_2F_EventScript_16FD53 - -Route11_EastEntrance_2F_MapEvents:: - map_events Route11_EastEntrance_2F_EventObjects, Route11_EastEntrance_2F_MapWarps, 0x0, Route11_EastEntrance_2F_MapBGEvents diff --git a/data/maps/Route11_EastEntrance_2F/header.inc b/data/maps/Route11_EastEntrance_2F/header.inc deleted file mode 100644 index 4b3611c21..000000000 --- a/data/maps/Route11_EastEntrance_2F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route11_EastEntrance_2F:: @ 8351904 - .4byte Entrance_2F_Layout @ 0x8320804 - .4byte Route11_EastEntrance_2F_MapEvents @ 0x83BDA58 - .4byte Route11_EastEntrance_2F_MapScripts @ 0x816FD34 - .4byte NULL - .2byte BGM_FRLG_VERMILION_CITY - .2byte 220 - .byte 0x6f, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/Route11_EastEntrance_2F/map.json b/data/maps/Route11_EastEntrance_2F/map.json new file mode 100644 index 000000000..d8867ca6b --- /dev/null +++ b/data/maps/Route11_EastEntrance_2F/map.json @@ -0,0 +1,69 @@ +{ + "id": "MAP_ROUTE11_EAST_ENTRANCE_2F", + "name": "Route11_EastEntrance_2F", + "layout": "LAYOUT_ENTRANCE_2F", + "music": "BGM_FRLG_VERMILION_CITY", + "region_map_section": "MAPSEC_ROUTE_11", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "18", + "x": 7, + "y": 3, + "elevation": 3, + "movement_type": "5", + "movement_range_x": 2, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route11_EastEntrance_2F_EventScript_16FD5C", + "flag": "0" + }, + { + "graphics_id": "55", + "x": 2, + "y": 6, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route11_EastEntrance_2F_EventScript_16FDD8", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 10, + "y": 9, + "elevation": 3, + "dest_map": "MAP_ROUTE11_EAST_ENTRANCE_1F", + "dest_warp_id": 4 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 4, + "y": 1, + "elevation": 0, + "script": "Route11_EastEntrance_2F_EventScript_16FD35" + }, + { + "type": "bg_event_type_0", + "x": 8, + "y": 1, + "elevation": 0, + "script": "Route11_EastEntrance_2F_EventScript_16FD53" + } + ] +}
\ No newline at end of file diff --git a/data/maps/Route12/connections.inc b/data/maps/Route12/connections.inc deleted file mode 100644 index ec99ba53b..000000000 --- a/data/maps/Route12/connections.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route12_MapConnectionsList: @ 8352B3C - connection up, 0, MAP_LAVENDER_TOWN - connection down, -48, MAP_ROUTE13 - connection left, 60, MAP_ROUTE11 - -Route12_MapConnections:: @ 8352B60 - .4byte 3 - .4byte Route12_MapConnectionsList diff --git a/data/maps/Route12/events.inc b/data/maps/Route12/events.inc deleted file mode 100644 index bfb2acbbf..000000000 --- a/data/maps/Route12/events.inc +++ /dev/null @@ -1,31 +0,0 @@ -Route12_EventObjects: - object_event 1, 57, 0, 17, 0, 32, 0, 3, 13, 17, 0, 1, 0, 1, 0, Route12_EventScript_1AA451, 0, 0, 0 - object_event 2, 57, 0, 9, 0, 40, 0, 3, 14, 17, 0, 1, 0, 1, 0, Route12_EventScript_1AA48F, 0, 0, 0 - object_event 3, 57, 0, 16, 0, 47, 0, 3, 17, 17, 0, 1, 0, 4, 0, Route12_EventScript_1AA4CD, 0, 0, 0 - object_event 4, 57, 0, 13, 0, 59, 0, 3, 13, 17, 0, 1, 0, 1, 0, Route12_EventScript_1AA50B, 0, 0, 0 - object_event 5, 109, 0, 14, 0, 70, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route12_EventScript_168014, 84, 0, 0 - object_event 6, 26, 0, 13, 0, 92, 0, 3, 37, 68, 0, 1, 0, 1, 0, Route12_EventScript_1AA587, 0, 0, 0 - object_event 7, 39, 0, 10, 0, 99, 0, 3, 8, 17, 0, 1, 0, 1, 0, Route12_EventScript_1AA5C5, 0, 0, 0 - object_event 8, 57, 0, 18, 0, 108, 0, 3, 14, 17, 0, 1, 0, 1, 0, Route12_EventScript_1AA549, 0, 0, 0 - object_event 9, 95, 0, 11, 0, 100, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route12_EventScript_1BDF13, 18, 0, 0 - object_event 10, 92, 0, 18, 0, 36, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route12_EventScript_1BE7B0, 382, 0, 0 - object_event 11, 92, 0, 9, 0, 101, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route12_EventScript_1BE7BD, 383, 0, 0 - object_event 12, 29, 0, 19, 0, 64, 0, 3, 10, 17, 0, 1, 0, 0, 0, Route12_EventScript_1AA649, 0, 0, 0 - object_event 13, 25, 0, 19, 0, 63, 0, 3, 10, 17, 0, 1, 0, 0, 0, Route12_EventScript_1AA603, 0, 0, 0 - object_event 14, 95, 0, 12, 0, 111, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route12_EventScript_1BDF13, 19, 0, 0 - -Route12_MapWarps: - warp_def 12, 86, 0, 1, 5890 - warp_def 14, 15, 3, 0, 5888 - warp_def 15, 15, 3, 1, 5888 - warp_def 14, 21, 3, 2, 5888 - -Route12_MapBGEvents: - bg_event 17, 13, 0, 0, 0, Route12_EventScript_1680A3 - bg_event 15, 69, 0, 0, 0, Route12_EventScript_1680AC - bg_event 18, 57, 3, 7, 0, 21, 42, 1 - bg_event 14, 70, 3, 7, 0, 200, 131, 129 - bg_event 9, 116, 3, 7, 0, 68, 130, 1 - -Route12_MapEvents:: - map_events Route12_EventObjects, Route12_MapWarps, 0x0, Route12_MapBGEvents diff --git a/data/maps/Route12/header.inc b/data/maps/Route12/header.inc deleted file mode 100644 index 882794915..000000000 --- a/data/maps/Route12/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route12:: @ 8350960 - .4byte Route12_Layout @ 0x82EE5D8 - .4byte Route12_MapEvents @ 0x83B72DC - .4byte Route12_MapScripts @ 0x8168000 - .4byte Route12_MapConnections @ 0x8352B60 - .2byte BGM_FRLG_ROUTE_11 - .2byte 100 - .byte 0x70, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/Route12/map.json b/data/maps/Route12/map.json new file mode 100644 index 000000000..2b4da6469 --- /dev/null +++ b/data/maps/Route12/map.json @@ -0,0 +1,289 @@ +{ + "id": "MAP_ROUTE12", + "name": "Route12", + "layout": "LAYOUT_ROUTE12", + "music": "BGM_FRLG_ROUTE_11", + "region_map_section": "MAPSEC_ROUTE_12", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_3", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_LAVENDER_TOWN", + "offset": 0, + "direction": "up" + }, + { + "map": "MAP_ROUTE13", + "offset": -48, + "direction": "down" + }, + { + "map": "MAP_ROUTE11", + "offset": 60, + "direction": "left" + } + ], + "object_events": [ + { + "graphics_id": "57", + "x": 17, + "y": 32, + "elevation": 3, + "movement_type": "13", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route12_EventScript_1AA451", + "flag": "0" + }, + { + "graphics_id": "57", + "x": 9, + "y": 40, + "elevation": 3, + "movement_type": "14", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route12_EventScript_1AA48F", + "flag": "0" + }, + { + "graphics_id": "57", + "x": 16, + "y": 47, + "elevation": 3, + "movement_type": "17", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route12_EventScript_1AA4CD", + "flag": "0" + }, + { + "graphics_id": "57", + "x": 13, + "y": 59, + "elevation": 3, + "movement_type": "13", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route12_EventScript_1AA50B", + "flag": "0" + }, + { + "graphics_id": "109", + "x": 14, + "y": 70, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route12_EventScript_168014", + "flag": "84" + }, + { + "graphics_id": "26", + "x": 13, + "y": 92, + "elevation": 3, + "movement_type": "37", + "movement_range_x": 4, + "movement_range_y": 4, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route12_EventScript_1AA587", + "flag": "0" + }, + { + "graphics_id": "39", + "x": 10, + "y": 99, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route12_EventScript_1AA5C5", + "flag": "0" + }, + { + "graphics_id": "57", + "x": 18, + "y": 108, + "elevation": 3, + "movement_type": "14", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route12_EventScript_1AA549", + "flag": "0" + }, + { + "graphics_id": "95", + "x": 11, + "y": 100, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route12_EventScript_1BDF13", + "flag": "18" + }, + { + "graphics_id": "92", + "x": 18, + "y": 36, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route12_EventScript_1BE7B0", + "flag": "382" + }, + { + "graphics_id": "92", + "x": 9, + "y": 101, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route12_EventScript_1BE7BD", + "flag": "383" + }, + { + "graphics_id": "29", + "x": 19, + "y": 64, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route12_EventScript_1AA649", + "flag": "0" + }, + { + "graphics_id": "25", + "x": 19, + "y": 63, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route12_EventScript_1AA603", + "flag": "0" + }, + { + "graphics_id": "95", + "x": 12, + "y": 111, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route12_EventScript_1BDF13", + "flag": "19" + } + ], + "warp_events": [ + { + "x": 12, + "y": 86, + "elevation": 0, + "dest_map": "MAP_ROUTE12_FISHING_HOUSE", + "dest_warp_id": 1 + }, + { + "x": 14, + "y": 15, + "elevation": 3, + "dest_map": "MAP_ROUTE12_NORTH_ENTRANCE_1F", + "dest_warp_id": 0 + }, + { + "x": 15, + "y": 15, + "elevation": 3, + "dest_map": "MAP_ROUTE12_NORTH_ENTRANCE_1F", + "dest_warp_id": 1 + }, + { + "x": 14, + "y": 21, + "elevation": 3, + "dest_map": "MAP_ROUTE12_NORTH_ENTRANCE_1F", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 17, + "y": 13, + "elevation": 0, + "script": "Route12_EventScript_1680A3" + }, + { + "type": "bg_event_type_0", + "x": 15, + "y": 69, + "elevation": 0, + "script": "Route12_EventScript_1680AC" + }, + { + "type": "hidden_item", + "x": 18, + "y": 57, + "elevation": 3, + "item": "ITEM_HYPER_POTION", + "flag": "42", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 14, + "y": 70, + "elevation": 3, + "item": "ITEM_LEFTOVERS", + "flag": "131", + "unknown": 129 + }, + { + "type": "hidden_item", + "x": 9, + "y": 116, + "elevation": 3, + "item": "ITEM_RARE_CANDY", + "flag": "130", + "unknown": 1 + } + ] +}
\ No newline at end of file diff --git a/data/maps/Route12_FishingHouse/events.inc b/data/maps/Route12_FishingHouse/events.inc deleted file mode 100644 index 158407b87..000000000 --- a/data/maps/Route12_FishingHouse/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -Route12_FishingHouse_EventObjects: - object_event 1, 57, 0, 4, 0, 4, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route12_FishingHouse_EventScript_16FF0C, 0, 0, 0 - -Route12_FishingHouse_MapWarps: - warp_def 2, 8, 0, 0, 798 - warp_def 3, 7, 3, 0, 798 - warp_def 4, 8, 0, 0, 798 - -Route12_FishingHouse_MapBGEvents: - bg_event 9, 1, 0, 0, 0, Route12_FishingHouse_EventScript_170067 - -Route12_FishingHouse_MapEvents:: - map_events Route12_FishingHouse_EventObjects, Route12_FishingHouse_MapWarps, 0x0, Route12_FishingHouse_MapBGEvents diff --git a/data/maps/Route12_FishingHouse/header.inc b/data/maps/Route12_FishingHouse/header.inc deleted file mode 100644 index 31fa7f94d..000000000 --- a/data/maps/Route12_FishingHouse/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route12_FishingHouse:: @ 8351958 - .4byte House4_Layout @ 0x82D6070 - .4byte Route12_FishingHouse_MapEvents @ 0x83BDB48 - .4byte Route12_FishingHouse_MapScripts @ 0x816FF0B - .4byte NULL - .2byte BGM_FRLG_CELADON_CITY - .2byte 13 - .byte 0x70, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/Route12_FishingHouse/map.json b/data/maps/Route12_FishingHouse/map.json new file mode 100644 index 000000000..016bd3f4f --- /dev/null +++ b/data/maps/Route12_FishingHouse/map.json @@ -0,0 +1,63 @@ +{ + "id": "MAP_ROUTE12_FISHING_HOUSE", + "name": "Route12_FishingHouse", + "layout": "LAYOUT_HOUSE4", + "music": "BGM_FRLG_CELADON_CITY", + "region_map_section": "MAPSEC_ROUTE_12", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "57", + "x": 4, + "y": 4, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route12_FishingHouse_EventScript_16FF0C", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 2, + "y": 8, + "elevation": 0, + "dest_map": "MAP_ROUTE12", + "dest_warp_id": 0 + }, + { + "x": 3, + "y": 7, + "elevation": 3, + "dest_map": "MAP_ROUTE12", + "dest_warp_id": 0 + }, + { + "x": 4, + "y": 8, + "elevation": 0, + "dest_map": "MAP_ROUTE12", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 9, + "y": 1, + "elevation": 0, + "script": "Route12_FishingHouse_EventScript_170067" + } + ] +}
\ No newline at end of file diff --git a/data/maps/Route12_NorthEntrance_1F/events.inc b/data/maps/Route12_NorthEntrance_1F/events.inc deleted file mode 100644 index 3fb1b1b13..000000000 --- a/data/maps/Route12_NorthEntrance_1F/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -Route12_NorthEntrance_1F_EventObjects: - object_event 1, 60, 0, 1, 0, 5, 0, 3, 10, 17, 0, 0, 0, 0, 0, Route12_NorthEntrance_1F_EventScript_16FE6E, 0, 0, 0 - -Route12_NorthEntrance_1F_MapWarps: - warp_def 5, 1, 3, 1, 798 - warp_def 6, 1, 0, 2, 798 - warp_def 5, 11, 3, 3, 798 - warp_def 6, 11, 3, 3, 798 - warp_def 8, 10, 3, 0, 5889 - -Route12_NorthEntrance_1F_MapEvents:: - map_events Route12_NorthEntrance_1F_EventObjects, Route12_NorthEntrance_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/Route12_NorthEntrance_1F/header.inc b/data/maps/Route12_NorthEntrance_1F/header.inc deleted file mode 100644 index 60a2f30e5..000000000 --- a/data/maps/Route12_NorthEntrance_1F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route12_NorthEntrance_1F:: @ 8351920 - .4byte Route12_NorthEntrance_1F_Layout @ 0x8319DF0 - .4byte Route12_NorthEntrance_1F_MapEvents @ 0x83BDAAC - .4byte Route12_NorthEntrance_1F_MapScripts @ 0x816FE6D - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_CITY - .2byte 176 - .byte 0x70, 0x00, 0x00, 0x08, 0x01, 0x02, 0x00, 0x00 diff --git a/data/maps/Route12_NorthEntrance_1F/map.json b/data/maps/Route12_NorthEntrance_1F/map.json new file mode 100644 index 000000000..e712f5608 --- /dev/null +++ b/data/maps/Route12_NorthEntrance_1F/map.json @@ -0,0 +1,69 @@ +{ + "id": "MAP_ROUTE12_NORTH_ENTRANCE_1F", + "name": "Route12_NorthEntrance_1F", + "layout": "LAYOUT_ROUTE12_NORTH_ENTRANCE_1F", + "music": "BGM_FRLG_VIRIDIAN_CITY", + "region_map_section": "MAPSEC_ROUTE_12", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 1, + "unknown_19": 2, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "60", + "x": 1, + "y": 5, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route12_NorthEntrance_1F_EventScript_16FE6E", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 5, + "y": 1, + "elevation": 3, + "dest_map": "MAP_ROUTE12", + "dest_warp_id": 1 + }, + { + "x": 6, + "y": 1, + "elevation": 0, + "dest_map": "MAP_ROUTE12", + "dest_warp_id": 2 + }, + { + "x": 5, + "y": 11, + "elevation": 3, + "dest_map": "MAP_ROUTE12", + "dest_warp_id": 3 + }, + { + "x": 6, + "y": 11, + "elevation": 3, + "dest_map": "MAP_ROUTE12", + "dest_warp_id": 3 + }, + { + "x": 8, + "y": 10, + "elevation": 3, + "dest_map": "MAP_ROUTE12_NORTH_ENTRANCE_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/Route12_NorthEntrance_2F/events.inc b/data/maps/Route12_NorthEntrance_2F/events.inc deleted file mode 100644 index 798f5ac97..000000000 --- a/data/maps/Route12_NorthEntrance_2F/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -Route12_NorthEntrance_2F_EventObjects: - object_event 1, 22, 0, 7, 0, 5, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route12_NorthEntrance_2F_EventScript_16FE8A, 0, 0, 0 - -Route12_NorthEntrance_2F_MapWarps: - warp_def 10, 9, 3, 4, 5888 - -Route12_NorthEntrance_2F_MapBGEvents: - bg_event 4, 1, 0, 0, 0, Route12_NorthEntrance_2F_EventScript_16FE78 - bg_event 8, 1, 0, 0, 0, Route12_NorthEntrance_2F_EventScript_16FE81 - -Route12_NorthEntrance_2F_MapEvents:: - map_events Route12_NorthEntrance_2F_EventObjects, Route12_NorthEntrance_2F_MapWarps, 0x0, Route12_NorthEntrance_2F_MapBGEvents diff --git a/data/maps/Route12_NorthEntrance_2F/header.inc b/data/maps/Route12_NorthEntrance_2F/header.inc deleted file mode 100644 index 00a195bd2..000000000 --- a/data/maps/Route12_NorthEntrance_2F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route12_NorthEntrance_2F:: @ 835193C - .4byte Entrance_2F_Layout @ 0x8320804 - .4byte Route12_NorthEntrance_2F_MapEvents @ 0x83BDAF8 - .4byte Route12_NorthEntrance_2F_MapScripts @ 0x816FE77 - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_CITY - .2byte 220 - .byte 0x70, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/Route12_NorthEntrance_2F/map.json b/data/maps/Route12_NorthEntrance_2F/map.json new file mode 100644 index 000000000..8dd3a5404 --- /dev/null +++ b/data/maps/Route12_NorthEntrance_2F/map.json @@ -0,0 +1,56 @@ +{ + "id": "MAP_ROUTE12_NORTH_ENTRANCE_2F", + "name": "Route12_NorthEntrance_2F", + "layout": "LAYOUT_ENTRANCE_2F", + "music": "BGM_FRLG_VIRIDIAN_CITY", + "region_map_section": "MAPSEC_ROUTE_12", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "22", + "x": 7, + "y": 5, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route12_NorthEntrance_2F_EventScript_16FE8A", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 10, + "y": 9, + "elevation": 3, + "dest_map": "MAP_ROUTE12_NORTH_ENTRANCE_1F", + "dest_warp_id": 4 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 4, + "y": 1, + "elevation": 0, + "script": "Route12_NorthEntrance_2F_EventScript_16FE78" + }, + { + "type": "bg_event_type_0", + "x": 8, + "y": 1, + "elevation": 0, + "script": "Route12_NorthEntrance_2F_EventScript_16FE81" + } + ] +}
\ No newline at end of file diff --git a/data/maps/Route13/connections.inc b/data/maps/Route13/connections.inc deleted file mode 100644 index 2a201358e..000000000 --- a/data/maps/Route13/connections.inc +++ /dev/null @@ -1,7 +0,0 @@ -Route13_MapConnectionsList: @ 8352B68 - connection up, 48, MAP_ROUTE12 - connection left, 0, MAP_ROUTE14 - -Route13_MapConnections:: @ 8352B80 - .4byte 2 - .4byte Route13_MapConnectionsList diff --git a/data/maps/Route13/events.inc b/data/maps/Route13/events.inc deleted file mode 100644 index b02655643..000000000 --- a/data/maps/Route13/events.inc +++ /dev/null @@ -1,21 +0,0 @@ -Route13_EventObjects: - object_event 1, 40, 0, 62, 0, 6, 0, 3, 2, 17, 0, 1, 0, 1, 0, Route13_EventScript_1AA803, 0, 0, 0 - object_event 2, 26, 0, 63, 0, 12, 0, 3, 2, 17, 0, 1, 0, 1, 0, Route13_EventScript_1AA749, 0, 0, 0 - object_event 3, 40, 0, 54, 0, 11, 0, 3, 2, 17, 0, 1, 0, 1, 0, Route13_EventScript_1AA841, 0, 0, 0 - object_event 4, 29, 0, 42, 0, 7, 0, 3, 8, 17, 0, 1, 0, 3, 0, Route13_EventScript_1AA70B, 0, 0, 0 - object_event 5, 29, 0, 43, 0, 7, 0, 3, 8, 17, 0, 1, 0, 3, 0, Route13_EventScript_1AA6CD, 0, 0, 0 - object_event 6, 40, 0, 35, 0, 10, 0, 3, 8, 17, 0, 1, 0, 1, 0, Route13_EventScript_1AA87F, 0, 0, 0 - object_event 7, 40, 0, 29, 0, 11, 0, 3, 9, 17, 0, 1, 0, 3, 0, Route13_EventScript_1AA8BD, 0, 0, 0 - object_event 8, 26, 0, 9, 0, 14, 0, 3, 7, 17, 0, 1, 0, 3, 0, Route13_EventScript_1AA7C5, 0, 0, 0 - object_event 9, 26, 0, 16, 0, 5, 0, 3, 10, 17, 0, 1, 0, 3, 0, Route13_EventScript_1AA787, 0, 0, 0 - object_event 10, 53, 0, 14, 0, 8, 0, 3, 1, 17, 0, 1, 0, 1, 0, Route13_EventScript_1AA68F, 0, 0, 0 - object_event 11, 95, 0, 44, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route13_EventScript_1BDF13, 18, 0, 0 - -Route13_MapBGEvents: - bg_event 41, 12, 0, 0, 0, Route13_EventScript_1680C8 - bg_event 37, 6, 0, 0, 0, Route13_EventScript_1680BF - bg_event 21, 14, 0, 0, 0, Route13_EventScript_1680B6 - bg_event 23, 14, 3, 7, 0, 69, 15, 1 - -Route13_MapEvents:: - map_events Route13_EventObjects, 0x0, 0x0, Route13_MapBGEvents diff --git a/data/maps/Route13/header.inc b/data/maps/Route13/header.inc deleted file mode 100644 index 854f41328..000000000 --- a/data/maps/Route13/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route13:: @ 835097C - .4byte Route13_Layout @ 0x82EF13C - .4byte Route13_MapEvents @ 0x83B7428 - .4byte Route13_MapScripts @ 0x81680B5 - .4byte Route13_MapConnections @ 0x8352B80 - .2byte BGM_FRLG_ROUTE_11 - .2byte 101 - .byte 0x71, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/Route13/map.json b/data/maps/Route13/map.json new file mode 100644 index 000000000..0417505f5 --- /dev/null +++ b/data/maps/Route13/map.json @@ -0,0 +1,205 @@ +{ + "id": "MAP_ROUTE13", + "name": "Route13", + "layout": "LAYOUT_ROUTE13", + "music": "BGM_FRLG_ROUTE_11", + "region_map_section": "MAPSEC_ROUTE_13", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_3", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_ROUTE12", + "offset": 48, + "direction": "up" + }, + { + "map": "MAP_ROUTE14", + "offset": 0, + "direction": "left" + } + ], + "object_events": [ + { + "graphics_id": "40", + "x": 62, + "y": 6, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route13_EventScript_1AA803", + "flag": "0" + }, + { + "graphics_id": "26", + "x": 63, + "y": 12, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route13_EventScript_1AA749", + "flag": "0" + }, + { + "graphics_id": "40", + "x": 54, + "y": 11, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route13_EventScript_1AA841", + "flag": "0" + }, + { + "graphics_id": "29", + "x": 42, + "y": 7, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route13_EventScript_1AA70B", + "flag": "0" + }, + { + "graphics_id": "29", + "x": 43, + "y": 7, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route13_EventScript_1AA6CD", + "flag": "0" + }, + { + "graphics_id": "40", + "x": 35, + "y": 10, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route13_EventScript_1AA87F", + "flag": "0" + }, + { + "graphics_id": "40", + "x": 29, + "y": 11, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route13_EventScript_1AA8BD", + "flag": "0" + }, + { + "graphics_id": "26", + "x": 9, + "y": 14, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route13_EventScript_1AA7C5", + "flag": "0" + }, + { + "graphics_id": "26", + "x": 16, + "y": 5, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route13_EventScript_1AA787", + "flag": "0" + }, + { + "graphics_id": "53", + "x": 14, + "y": 8, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route13_EventScript_1AA68F", + "flag": "0" + }, + { + "graphics_id": "95", + "x": 44, + "y": 5, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route13_EventScript_1BDF13", + "flag": "18" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 41, + "y": 12, + "elevation": 0, + "script": "Route13_EventScript_1680C8" + }, + { + "type": "bg_event_type_0", + "x": 37, + "y": 6, + "elevation": 0, + "script": "Route13_EventScript_1680BF" + }, + { + "type": "bg_event_type_0", + "x": 21, + "y": 14, + "elevation": 0, + "script": "Route13_EventScript_1680B6" + }, + { + "type": "hidden_item", + "x": 23, + "y": 14, + "elevation": 3, + "item": "ITEM_PP_UP", + "flag": "15", + "unknown": 1 + } + ] +}
\ No newline at end of file diff --git a/data/maps/Route14/connections.inc b/data/maps/Route14/connections.inc deleted file mode 100644 index f10ba89fd..000000000 --- a/data/maps/Route14/connections.inc +++ /dev/null @@ -1,7 +0,0 @@ -Route14_MapConnectionsList: @ 8352B88 - connection left, 40, MAP_ROUTE15 - connection right, 0, MAP_ROUTE13 - -Route14_MapConnections:: @ 8352BA0 - .4byte 2 - .4byte Route14_MapConnectionsList diff --git a/data/maps/Route14/events.inc b/data/maps/Route14/events.inc deleted file mode 100644 index 90606e7d4..000000000 --- a/data/maps/Route14/events.inc +++ /dev/null @@ -1,24 +0,0 @@ -Route14_EventObjects: - object_event 1, 53, 0, 7, 0, 37, 0, 3, 10, 17, 0, 1, 0, 2, 0, Route14_EventScript_1AA9B5, 0, 0, 0 - object_event 2, 26, 0, 18, 0, 35, 0, 3, 2, 34, 0, 1, 0, 1, 0, Route14_EventScript_1AA9F3, 0, 0, 0 - object_event 3, 26, 0, 10, 0, 14, 0, 3, 10, 17, 0, 1, 0, 4, 0, Route14_EventScript_1AAAEB, 0, 0, 0 - object_event 4, 26, 0, 16, 0, 16, 0, 3, 7, 17, 0, 1, 0, 3, 0, Route14_EventScript_1AAB29, 0, 0, 0 - object_event 5, 53, 0, 7, 0, 31, 0, 3, 10, 17, 0, 1, 0, 2, 0, Route14_EventScript_1AA977, 0, 0, 0 - object_event 6, 53, 0, 7, 0, 34, 0, 3, 10, 17, 0, 1, 0, 2, 0, Route14_EventScript_1AA8FB, 0, 0, 0 - object_event 7, 26, 0, 8, 0, 9, 0, 3, 5, 17, 0, 1, 0, 1, 0, Route14_EventScript_1AAAAD, 0, 0, 0 - object_event 8, 26, 0, 7, 0, 6, 0, 3, 10, 17, 0, 1, 0, 1, 0, Route14_EventScript_1AAA6F, 0, 0, 0 - object_event 9, 53, 0, 10, 0, 37, 0, 3, 25, 97, 0, 1, 0, 1, 0, Route14_EventScript_1AA939, 0, 0, 0 - object_event 10, 26, 0, 18, 0, 47, 0, 3, 2, 34, 0, 1, 0, 1, 0, Route14_EventScript_1AAA31, 0, 0, 0 - object_event 11, 95, 0, 7, 0, 26, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route14_EventScript_1BDF13, 18, 0, 0 - object_event 12, 95, 0, 12, 0, 35, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route14_EventScript_1BDF13, 19, 0, 0 - object_event 13, 95, 0, 1, 0, 47, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route14_EventScript_1BDF13, 20, 0, 0 - object_event 14, 17, 0, 13, 0, 51, 0, 3, 8, 17, 0, 1, 0, 1, 0, Route14_EventScript_1AABAD, 0, 0, 0 - object_event 15, 17, 0, 12, 0, 51, 0, 3, 8, 17, 0, 1, 0, 1, 0, Route14_EventScript_1AAB67, 0, 0, 0 - -Route14_MapBGEvents: - bg_event 17, 12, 0, 0, 0, Route14_EventScript_1680D2 - bg_event 9, 20, 3, 7, 0, 70, 149, 1 - bg_event 19, 53, 3, 7, 0, 152, 157, 1 - -Route14_MapEvents:: - map_events Route14_EventObjects, 0x0, 0x0, Route14_MapBGEvents diff --git a/data/maps/Route14/header.inc b/data/maps/Route14/header.inc deleted file mode 100644 index 4dc8ad571..000000000 --- a/data/maps/Route14/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route14:: @ 8350998 - .4byte Route14_Layout @ 0x82EFCA0 - .4byte Route14_MapEvents @ 0x83B75C8 - .4byte Route14_MapScripts @ 0x81680D1 - .4byte Route14_MapConnections @ 0x8352BA0 - .2byte BGM_FRLG_ROUTE_11 - .2byte 102 - .byte 0x72, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/Route14/map.json b/data/maps/Route14/map.json new file mode 100644 index 000000000..cdfb7882e --- /dev/null +++ b/data/maps/Route14/map.json @@ -0,0 +1,252 @@ +{ + "id": "MAP_ROUTE14", + "name": "Route14", + "layout": "LAYOUT_ROUTE14", + "music": "BGM_FRLG_ROUTE_11", + "region_map_section": "MAPSEC_ROUTE_14", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_3", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_ROUTE15", + "offset": 40, + "direction": "left" + }, + { + "map": "MAP_ROUTE13", + "offset": 0, + "direction": "right" + } + ], + "object_events": [ + { + "graphics_id": "53", + "x": 7, + "y": 37, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route14_EventScript_1AA9B5", + "flag": "0" + }, + { + "graphics_id": "26", + "x": 18, + "y": 35, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 2, + "movement_range_y": 2, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route14_EventScript_1AA9F3", + "flag": "0" + }, + { + "graphics_id": "26", + "x": 10, + "y": 14, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route14_EventScript_1AAAEB", + "flag": "0" + }, + { + "graphics_id": "26", + "x": 16, + "y": 16, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route14_EventScript_1AAB29", + "flag": "0" + }, + { + "graphics_id": "53", + "x": 7, + "y": 31, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route14_EventScript_1AA977", + "flag": "0" + }, + { + "graphics_id": "53", + "x": 7, + "y": 34, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route14_EventScript_1AA8FB", + "flag": "0" + }, + { + "graphics_id": "26", + "x": 8, + "y": 9, + "elevation": 3, + "movement_type": "5", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route14_EventScript_1AAAAD", + "flag": "0" + }, + { + "graphics_id": "26", + "x": 7, + "y": 6, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route14_EventScript_1AAA6F", + "flag": "0" + }, + { + "graphics_id": "53", + "x": 10, + "y": 37, + "elevation": 3, + "movement_type": "25", + "movement_range_x": 1, + "movement_range_y": 6, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route14_EventScript_1AA939", + "flag": "0" + }, + { + "graphics_id": "26", + "x": 18, + "y": 47, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 2, + "movement_range_y": 2, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route14_EventScript_1AAA31", + "flag": "0" + }, + { + "graphics_id": "95", + "x": 7, + "y": 26, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route14_EventScript_1BDF13", + "flag": "18" + }, + { + "graphics_id": "95", + "x": 12, + "y": 35, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route14_EventScript_1BDF13", + "flag": "19" + }, + { + "graphics_id": "95", + "x": 1, + "y": 47, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route14_EventScript_1BDF13", + "flag": "20" + }, + { + "graphics_id": "17", + "x": 13, + "y": 51, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route14_EventScript_1AABAD", + "flag": "0" + }, + { + "graphics_id": "17", + "x": 12, + "y": 51, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route14_EventScript_1AAB67", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 17, + "y": 12, + "elevation": 0, + "script": "Route14_EventScript_1680D2" + }, + { + "type": "hidden_item", + "x": 9, + "y": 20, + "elevation": 3, + "item": "ITEM_ZINC", + "flag": "149", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 19, + "y": 53, + "elevation": 3, + "item": "ITEM_PINAP_BERRY", + "flag": "157", + "unknown": 1 + } + ] +}
\ No newline at end of file diff --git a/data/maps/Route15/connections.inc b/data/maps/Route15/connections.inc deleted file mode 100644 index 3706a64ed..000000000 --- a/data/maps/Route15/connections.inc +++ /dev/null @@ -1,7 +0,0 @@ -Route15_MapConnectionsList: @ 8352BA8 - connection left, -10, MAP_FUCHSIA_CITY - connection right, -40, MAP_ROUTE14 - -Route15_MapConnections:: @ 8352BC0 - .4byte 2 - .4byte Route15_MapConnectionsList diff --git a/data/maps/Route15/events.inc b/data/maps/Route15/events.inc deleted file mode 100644 index ecb7f3069..000000000 --- a/data/maps/Route15/events.inc +++ /dev/null @@ -1,25 +0,0 @@ -Route15_EventObjects: - object_event 1, 40, 0, 22, 0, 13, 0, 3, 2, 17, 0, 1, 0, 1, 0, Route15_EventScript_1AAD67, 0, 0, 0 - object_event 2, 26, 0, 31, 0, 12, 0, 3, 9, 17, 0, 1, 0, 5, 0, Route15_EventScript_1AACEB, 0, 0, 0 - object_event 3, 26, 0, 37, 0, 14, 0, 3, 7, 17, 0, 1, 0, 2, 0, Route15_EventScript_1AAD29, 0, 0, 0 - object_event 4, 40, 0, 44, 0, 13, 0, 3, 2, 17, 0, 1, 0, 1, 0, Route15_EventScript_1AADA5, 0, 0, 0 - object_event 5, 29, 0, 50, 0, 12, 0, 3, 8, 17, 0, 1, 0, 2, 0, Route15_EventScript_1AACAD, 0, 0, 0 - object_event 6, 53, 0, 59, 0, 12, 0, 3, 18, 17, 0, 1, 0, 2, 0, Route15_EventScript_1AAC31, 0, 0, 0 - object_event 7, 53, 0, 63, 0, 13, 0, 3, 13, 17, 0, 1, 0, 1, 0, Route15_EventScript_1AABF3, 0, 0, 0 - object_event 8, 40, 0, 52, 0, 8, 0, 3, 2, 66, 0, 1, 0, 1, 0, Route15_EventScript_1AADE3, 0, 0, 0 - object_event 9, 29, 0, 54, 0, 12, 0, 3, 8, 17, 0, 1, 0, 2, 0, Route15_EventScript_1AAC6F, 0, 0, 0 - object_event 10, 40, 0, 28, 0, 6, 0, 3, 2, 66, 0, 1, 0, 1, 0, Route15_EventScript_1AAE21, 0, 0, 0 - object_event 11, 92, 0, 20, 0, 6, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route15_EventScript_1BE7CA, 384, 0, 0 - object_event 12, 54, 0, 39, 0, 7, 0, 3, 8, 17, 0, 1, 0, 1, 0, Route15_EventScript_1AAEA5, 0, 0, 0 - object_event 13, 24, 0, 40, 0, 7, 0, 3, 8, 17, 0, 1, 0, 1, 0, Route15_EventScript_1AAE5F, 0, 0, 0 - object_event 14, 65375, 0, 73, 0, 7, 0, 13, 0, 0, 0, 32, 0, 3, 0, 0x0, 0, 0, 0 - -Route15_MapWarps: - warp_def 9, 11, 3, 0, 6144 - warp_def 16, 11, 3, 2, 6144 - -Route15_MapBGEvents: - bg_event 41, 11, 0, 0, 0, Route15_EventScript_1680DC - -Route15_MapEvents:: - map_events Route15_EventObjects, Route15_MapWarps, 0x0, Route15_MapBGEvents diff --git a/data/maps/Route15/header.inc b/data/maps/Route15/header.inc deleted file mode 100644 index c1fc1f9cd..000000000 --- a/data/maps/Route15/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route15:: @ 83509B4 - .4byte Route15_Layout @ 0x82F0804 - .4byte Route15_MapEvents @ 0x83B7748 - .4byte Route15_MapScripts @ 0x81680DB - .4byte Route15_MapConnections @ 0x8352BC0 - .2byte BGM_FRLG_ROUTE_11 - .2byte 103 - .byte 0x73, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/Route15/map.json b/data/maps/Route15/map.json new file mode 100644 index 000000000..213b89fdc --- /dev/null +++ b/data/maps/Route15/map.json @@ -0,0 +1,236 @@ +{ + "id": "MAP_ROUTE15", + "name": "Route15", + "layout": "LAYOUT_ROUTE15", + "music": "BGM_FRLG_ROUTE_11", + "region_map_section": "MAPSEC_ROUTE_15", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_3", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_FUCHSIA_CITY", + "offset": -10, + "direction": "left" + }, + { + "map": "MAP_ROUTE14", + "offset": -40, + "direction": "right" + } + ], + "object_events": [ + { + "graphics_id": "40", + "x": 22, + "y": 13, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route15_EventScript_1AAD67", + "flag": "0" + }, + { + "graphics_id": "26", + "x": 31, + "y": 12, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "Route15_EventScript_1AACEB", + "flag": "0" + }, + { + "graphics_id": "26", + "x": 37, + "y": 14, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route15_EventScript_1AAD29", + "flag": "0" + }, + { + "graphics_id": "40", + "x": 44, + "y": 13, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route15_EventScript_1AADA5", + "flag": "0" + }, + { + "graphics_id": "29", + "x": 50, + "y": 12, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route15_EventScript_1AACAD", + "flag": "0" + }, + { + "graphics_id": "53", + "x": 59, + "y": 12, + "elevation": 3, + "movement_type": "18", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route15_EventScript_1AAC31", + "flag": "0" + }, + { + "graphics_id": "53", + "x": 63, + "y": 13, + "elevation": 3, + "movement_type": "13", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route15_EventScript_1AABF3", + "flag": "0" + }, + { + "graphics_id": "40", + "x": 52, + "y": 8, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 2, + "movement_range_y": 4, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route15_EventScript_1AADE3", + "flag": "0" + }, + { + "graphics_id": "29", + "x": 54, + "y": 12, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route15_EventScript_1AAC6F", + "flag": "0" + }, + { + "graphics_id": "40", + "x": 28, + "y": 6, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 2, + "movement_range_y": 4, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route15_EventScript_1AAE21", + "flag": "0" + }, + { + "graphics_id": "92", + "x": 20, + "y": 6, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route15_EventScript_1BE7CA", + "flag": "384" + }, + { + "graphics_id": "54", + "x": 39, + "y": 7, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route15_EventScript_1AAEA5", + "flag": "0" + }, + { + "graphics_id": "24", + "x": 40, + "y": 7, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route15_EventScript_1AAE5F", + "flag": "0" + }, + { + "graphics_id": "65375", + "x": 73, + "y": 7, + "elevation": 13, + "movement_type": "0", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 32, + "trainer_sight_or_berry_tree_id": 3, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 9, + "y": 11, + "elevation": 3, + "dest_map": "MAP_ROUTE15_WEST_ENTRANCE_1F", + "dest_warp_id": 0 + }, + { + "x": 16, + "y": 11, + "elevation": 3, + "dest_map": "MAP_ROUTE15_WEST_ENTRANCE_1F", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 41, + "y": 11, + "elevation": 0, + "script": "Route15_EventScript_1680DC" + } + ] +}
\ No newline at end of file diff --git a/data/maps/Route15_WestEntrance_1F/events.inc b/data/maps/Route15_WestEntrance_1F/events.inc deleted file mode 100644 index 6eed70559..000000000 --- a/data/maps/Route15_WestEntrance_1F/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -Route15_WestEntrance_1F_EventObjects: - object_event 1, 60, 0, 6, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route15_WestEntrance_1F_EventScript_170089, 0, 0, 0 - -Route15_WestEntrance_1F_MapWarps: - warp_def 1, 6, 3, 0, 801 - warp_def 1, 7, 3, 0, 801 - warp_def 11, 6, 3, 1, 801 - warp_def 11, 7, 3, 1, 801 - warp_def 9, 10, 3, 0, 6145 - -Route15_WestEntrance_1F_MapEvents:: - map_events Route15_WestEntrance_1F_EventObjects, Route15_WestEntrance_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/Route15_WestEntrance_1F/header.inc b/data/maps/Route15_WestEntrance_1F/header.inc deleted file mode 100644 index 7e3573609..000000000 --- a/data/maps/Route15_WestEntrance_1F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route15_WestEntrance_1F:: @ 8351974 - .4byte Entrance_1F_Layout @ 0x8320E70 - .4byte Route15_WestEntrance_1F_MapEvents @ 0x83BDB9C - .4byte Route15_WestEntrance_1F_MapScripts @ 0x8170088 - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_CITY - .2byte 224 - .byte 0x73, 0x00, 0x00, 0x08, 0x01, 0x02, 0x00, 0x00 diff --git a/data/maps/Route15_WestEntrance_1F/map.json b/data/maps/Route15_WestEntrance_1F/map.json new file mode 100644 index 000000000..d39ee196e --- /dev/null +++ b/data/maps/Route15_WestEntrance_1F/map.json @@ -0,0 +1,69 @@ +{ + "id": "MAP_ROUTE15_WEST_ENTRANCE_1F", + "name": "Route15_WestEntrance_1F", + "layout": "LAYOUT_ENTRANCE_1F", + "music": "BGM_FRLG_VIRIDIAN_CITY", + "region_map_section": "MAPSEC_ROUTE_15", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 1, + "unknown_19": 2, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "60", + "x": 6, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route15_WestEntrance_1F_EventScript_170089", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 1, + "y": 6, + "elevation": 3, + "dest_map": "MAP_ROUTE15", + "dest_warp_id": 0 + }, + { + "x": 1, + "y": 7, + "elevation": 3, + "dest_map": "MAP_ROUTE15", + "dest_warp_id": 0 + }, + { + "x": 11, + "y": 6, + "elevation": 3, + "dest_map": "MAP_ROUTE15", + "dest_warp_id": 1 + }, + { + "x": 11, + "y": 7, + "elevation": 3, + "dest_map": "MAP_ROUTE15", + "dest_warp_id": 1 + }, + { + "x": 9, + "y": 10, + "elevation": 3, + "dest_map": "MAP_ROUTE15_WEST_ENTRANCE_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/Route15_WestEntrance_2F/events.inc b/data/maps/Route15_WestEntrance_2F/events.inc deleted file mode 100644 index 538d744f4..000000000 --- a/data/maps/Route15_WestEntrance_2F/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -Route15_WestEntrance_2F_EventObjects: - object_event 1, 55, 0, 5, 0, 5, 0, 3, 7, 17, 0, 0, 0, 0, 0, Route15_WestEntrance_2F_EventScript_1700B9, 0, 0, 0 - -Route15_WestEntrance_2F_MapWarps: - warp_def 10, 9, 3, 4, 6144 - -Route15_WestEntrance_2F_MapBGEvents: - bg_event 4, 1, 0, 0, 0, Route15_WestEntrance_2F_EventScript_170093 - bg_event 8, 1, 0, 0, 0, Route15_WestEntrance_2F_EventScript_1700B0 - -Route15_WestEntrance_2F_MapEvents:: - map_events Route15_WestEntrance_2F_EventObjects, Route15_WestEntrance_2F_MapWarps, 0x0, Route15_WestEntrance_2F_MapBGEvents diff --git a/data/maps/Route15_WestEntrance_2F/header.inc b/data/maps/Route15_WestEntrance_2F/header.inc deleted file mode 100644 index 7bd72a5b8..000000000 --- a/data/maps/Route15_WestEntrance_2F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route15_WestEntrance_2F:: @ 8351990 - .4byte Entrance_2F_Layout @ 0x8320804 - .4byte Route15_WestEntrance_2F_MapEvents @ 0x83BDBE8 - .4byte Route15_WestEntrance_2F_MapScripts @ 0x8170092 - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_CITY - .2byte 220 - .byte 0x73, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/Route15_WestEntrance_2F/map.json b/data/maps/Route15_WestEntrance_2F/map.json new file mode 100644 index 000000000..6be75b750 --- /dev/null +++ b/data/maps/Route15_WestEntrance_2F/map.json @@ -0,0 +1,56 @@ +{ + "id": "MAP_ROUTE15_WEST_ENTRANCE_2F", + "name": "Route15_WestEntrance_2F", + "layout": "LAYOUT_ENTRANCE_2F", + "music": "BGM_FRLG_VIRIDIAN_CITY", + "region_map_section": "MAPSEC_ROUTE_15", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "55", + "x": 5, + "y": 5, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route15_WestEntrance_2F_EventScript_1700B9", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 10, + "y": 9, + "elevation": 3, + "dest_map": "MAP_ROUTE15_WEST_ENTRANCE_1F", + "dest_warp_id": 4 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 4, + "y": 1, + "elevation": 0, + "script": "Route15_WestEntrance_2F_EventScript_170093" + }, + { + "type": "bg_event_type_0", + "x": 8, + "y": 1, + "elevation": 0, + "script": "Route15_WestEntrance_2F_EventScript_1700B0" + } + ] +}
\ No newline at end of file diff --git a/data/maps/Route16/connections.inc b/data/maps/Route16/connections.inc deleted file mode 100644 index c48d0b461..000000000 --- a/data/maps/Route16/connections.inc +++ /dev/null @@ -1,7 +0,0 @@ -Route16_MapConnectionsList: @ 8352BC8 - connection down, 0, MAP_ROUTE17 - connection right, -10, MAP_CELADON_CITY - -Route16_MapConnections:: @ 8352BE0 - .4byte 2 - .4byte Route16_MapConnectionsList diff --git a/data/maps/Route16/events.inc b/data/maps/Route16/events.inc deleted file mode 100644 index 316615eab..000000000 --- a/data/maps/Route16/events.inc +++ /dev/null @@ -1,26 +0,0 @@ -Route16_EventObjects: - object_event 1, 53, 0, 16, 0, 12, 0, 3, 1, 17, 0, 1, 0, 1, 0, Route16_EventScript_1AAEEB, 0, 0, 0 - object_event 2, 53, 0, 14, 0, 14, 0, 3, 1, 17, 0, 1, 0, 1, 0, Route16_EventScript_1AAFA5, 0, 0, 0 - object_event 3, 53, 0, 12, 0, 12, 0, 3, 1, 17, 0, 1, 0, 1, 0, Route16_EventScript_1AAFE3, 0, 0, 0 - object_event 4, 53, 0, 8, 0, 12, 0, 3, 1, 17, 0, 1, 0, 1, 0, Route16_EventScript_1AAF67, 0, 0, 0 - object_event 5, 53, 0, 10, 0, 14, 0, 3, 1, 17, 0, 1, 0, 1, 0, Route16_EventScript_1AAF29, 0, 0, 0 - object_event 6, 53, 0, 6, 0, 14, 0, 3, 1, 17, 0, 1, 0, 1, 0, Route16_EventScript_1AB021, 0, 0, 0 - object_event 7, 95, 0, 41, 0, 11, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route16_EventScript_1BDF13, 18, 0, 0 - object_event 8, 29, 0, 30, 0, 5, 0, 3, 8, 17, 0, 1, 0, 1, 0, Route16_EventScript_1AB0A5, 0, 0, 0 - object_event 9, 25, 0, 31, 0, 5, 0, 3, 8, 17, 0, 1, 0, 1, 0, Route16_EventScript_1AB05F, 0, 0, 0 - object_event 10, 109, 0, 31, 0, 13, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route16_EventScript_168121, 128, 0, 0 - -Route16_MapWarps: - warp_def 10, 5, 0, 1, 6400 - warp_def 20, 6, 3, 0, 6401 - warp_def 27, 6, 3, 1, 6401 - warp_def 20, 13, 3, 2, 6401 - warp_def 27, 13, 3, 3, 6401 - -Route16_MapBGEvents: - bg_event 6, 17, 0, 0, 0, Route16_EventScript_1681B6 - bg_event 33, 11, 0, 0, 0, Route16_EventScript_1681AD - bg_event 31, 13, 3, 7, 0, 200, 132, 129 - -Route16_MapEvents:: - map_events Route16_EventObjects, Route16_MapWarps, 0x0, Route16_MapBGEvents diff --git a/data/maps/Route16/header.inc b/data/maps/Route16/header.inc deleted file mode 100644 index 71785a7a5..000000000 --- a/data/maps/Route16/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route16:: @ 83509D0 - .4byte Route16_Layout @ 0x82F0FA8 - .4byte Route16_MapEvents @ 0x83B7898 - .4byte Route16_MapScripts @ 0x81680E5 - .4byte Route16_MapConnections @ 0x8352BE0 - .2byte BGM_FRLG_ROUTE_3 - .2byte 104 - .byte 0x74, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/Route16/map.json b/data/maps/Route16/map.json new file mode 100644 index 000000000..a8dd02f92 --- /dev/null +++ b/data/maps/Route16/map.json @@ -0,0 +1,221 @@ +{ + "id": "MAP_ROUTE16", + "name": "Route16", + "layout": "LAYOUT_ROUTE16", + "music": "BGM_FRLG_ROUTE_3", + "region_map_section": "MAPSEC_ROUTE_16", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_3", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_ROUTE17", + "offset": 0, + "direction": "down" + }, + { + "map": "MAP_CELADON_CITY", + "offset": -10, + "direction": "right" + } + ], + "object_events": [ + { + "graphics_id": "53", + "x": 16, + "y": 12, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route16_EventScript_1AAEEB", + "flag": "0" + }, + { + "graphics_id": "53", + "x": 14, + "y": 14, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route16_EventScript_1AAFA5", + "flag": "0" + }, + { + "graphics_id": "53", + "x": 12, + "y": 12, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route16_EventScript_1AAFE3", + "flag": "0" + }, + { + "graphics_id": "53", + "x": 8, + "y": 12, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route16_EventScript_1AAF67", + "flag": "0" + }, + { + "graphics_id": "53", + "x": 10, + "y": 14, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route16_EventScript_1AAF29", + "flag": "0" + }, + { + "graphics_id": "53", + "x": 6, + "y": 14, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route16_EventScript_1AB021", + "flag": "0" + }, + { + "graphics_id": "95", + "x": 41, + "y": 11, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route16_EventScript_1BDF13", + "flag": "18" + }, + { + "graphics_id": "29", + "x": 30, + "y": 5, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route16_EventScript_1AB0A5", + "flag": "0" + }, + { + "graphics_id": "25", + "x": 31, + "y": 5, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route16_EventScript_1AB05F", + "flag": "0" + }, + { + "graphics_id": "109", + "x": 31, + "y": 13, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route16_EventScript_168121", + "flag": "128" + } + ], + "warp_events": [ + { + "x": 10, + "y": 5, + "elevation": 0, + "dest_map": "MAP_ROUTE16_HOUSE", + "dest_warp_id": 1 + }, + { + "x": 20, + "y": 6, + "elevation": 3, + "dest_map": "MAP_ROUTE16_NORTH_ENTRANCE_1F", + "dest_warp_id": 0 + }, + { + "x": 27, + "y": 6, + "elevation": 3, + "dest_map": "MAP_ROUTE16_NORTH_ENTRANCE_1F", + "dest_warp_id": 1 + }, + { + "x": 20, + "y": 13, + "elevation": 3, + "dest_map": "MAP_ROUTE16_NORTH_ENTRANCE_1F", + "dest_warp_id": 2 + }, + { + "x": 27, + "y": 13, + "elevation": 3, + "dest_map": "MAP_ROUTE16_NORTH_ENTRANCE_1F", + "dest_warp_id": 3 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 6, + "y": 17, + "elevation": 0, + "script": "Route16_EventScript_1681B6" + }, + { + "type": "bg_event_type_0", + "x": 33, + "y": 11, + "elevation": 0, + "script": "Route16_EventScript_1681AD" + }, + { + "type": "hidden_item", + "x": 31, + "y": 13, + "elevation": 3, + "item": "ITEM_LEFTOVERS", + "flag": "132", + "unknown": 129 + } + ] +}
\ No newline at end of file diff --git a/data/maps/Route16_House/events.inc b/data/maps/Route16_House/events.inc deleted file mode 100644 index 0983be77b..000000000 --- a/data/maps/Route16_House/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -Route16_House_EventObjects: - object_event 1, 23, 0, 4, 0, 2, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route16_House_EventScript_17014F, 0, 0, 0 - object_event 2, 133, 0, 9, 0, 3, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route16_House_EventScript_1701AF, 0, 0, 0 - -Route16_House_MapWarps: - warp_def 3, 7, 3, 0, 802 - warp_def 4, 7, 3, 0, 802 - warp_def 5, 7, 3, 0, 802 - -Route16_House_MapEvents:: - map_events Route16_House_EventObjects, Route16_House_MapWarps, 0x0, 0x0 diff --git a/data/maps/Route16_House/header.inc b/data/maps/Route16_House/header.inc deleted file mode 100644 index 3fd158b04..000000000 --- a/data/maps/Route16_House/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route16_House:: @ 83519AC - .4byte House1_Layout @ 0x82D5754 - .4byte Route16_House_MapEvents @ 0x83BDC44 - .4byte Route16_House_MapScripts @ 0x817014E - .4byte NULL - .2byte BGM_FRLG_CELADON_CITY - .2byte 6 - .byte 0x74, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/Route16_House/map.json b/data/maps/Route16_House/map.json new file mode 100644 index 000000000..890b5d9f4 --- /dev/null +++ b/data/maps/Route16_House/map.json @@ -0,0 +1,68 @@ +{ + "id": "MAP_ROUTE16_HOUSE", + "name": "Route16_House", + "layout": "LAYOUT_HOUSE1", + "music": "BGM_FRLG_CELADON_CITY", + "region_map_section": "MAPSEC_ROUTE_16", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "23", + "x": 4, + "y": 2, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route16_House_EventScript_17014F", + "flag": "0" + }, + { + "graphics_id": "133", + "x": 9, + "y": 3, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route16_House_EventScript_1701AF", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 3, + "dest_map": "MAP_ROUTE16", + "dest_warp_id": 0 + }, + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_ROUTE16", + "dest_warp_id": 0 + }, + { + "x": 5, + "y": 7, + "elevation": 3, + "dest_map": "MAP_ROUTE16", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/Route16_NorthEntrance_1F/events.inc b/data/maps/Route16_NorthEntrance_1F/events.inc deleted file mode 100644 index 151d6a858..000000000 --- a/data/maps/Route16_NorthEntrance_1F/events.inc +++ /dev/null @@ -1,26 +0,0 @@ -Route16_NorthEntrance_1F_EventObjects: - object_event 1, 60, 0, 6, 0, 8, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route16_NorthEntrance_1F_EventScript_1701DB, 0, 0, 0 - object_event 2, 32, 0, 7, 0, 4, 0, 3, 5, 17, 0, 0, 0, 0, 0, Route16_NorthEntrance_1F_EventScript_1702B5, 0, 0, 0 - -Route16_NorthEntrance_1F_MapWarps: - warp_def 1, 3, 3, 1, 802 - warp_def 11, 3, 3, 2, 802 - warp_def 1, 12, 3, 3, 802 - warp_def 11, 12, 3, 4, 802 - warp_def 9, 16, 3, 0, 6402 - -Route16_NorthEntrance_1F_MapCoordEvents: - coord_event 10, 12, 3, 0, 16478, 1, 0, Route16_NorthEntrance_1F_EventScript_1A77B6 - coord_event 2, 12, 3, 0, 16478, 0, 0, Route16_NorthEntrance_1F_EventScript_1A77C1 - coord_event 6, 10, 3, 0, 16385, 0, 0, Route16_NorthEntrance_1F_EventScript_1701E4 - coord_event 6, 11, 3, 0, 16385, 0, 0, Route16_NorthEntrance_1F_EventScript_1701F0 - coord_event 1, 13, 3, 0, 16478, 0, 0, Route16_NorthEntrance_1F_EventScript_1A77C1 - coord_event 1, 11, 3, 0, 16478, 0, 0, Route16_NorthEntrance_1F_EventScript_1A77C1 - coord_event 11, 11, 3, 0, 16478, 1, 0, Route16_NorthEntrance_1F_EventScript_1A77B6 - coord_event 11, 13, 3, 0, 16478, 1, 0, Route16_NorthEntrance_1F_EventScript_1A77B6 - coord_event 6, 12, 3, 0, 16385, 0, 0, Route16_NorthEntrance_1F_EventScript_1701FC - coord_event 6, 13, 3, 0, 16385, 0, 0, Route16_NorthEntrance_1F_EventScript_170208 - coord_event 6, 14, 3, 0, 16385, 0, 0, Route16_NorthEntrance_1F_EventScript_170214 - -Route16_NorthEntrance_1F_MapEvents:: - map_events Route16_NorthEntrance_1F_EventObjects, Route16_NorthEntrance_1F_MapWarps, Route16_NorthEntrance_1F_MapCoordEvents, 0x0 diff --git a/data/maps/Route16_NorthEntrance_1F/header.inc b/data/maps/Route16_NorthEntrance_1F/header.inc deleted file mode 100644 index fffac64b8..000000000 --- a/data/maps/Route16_NorthEntrance_1F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route16_NorthEntrance_1F:: @ 83519C8 - .4byte Route16_NorthEntrance_1F_Layout @ 0x8320D14 - .4byte Route16_NorthEntrance_1F_MapEvents @ 0x83BDD60 - .4byte Route16_NorthEntrance_1F_MapScripts @ 0x81701C2 - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_CITY - .2byte 223 - .byte 0x74, 0x00, 0x00, 0x08, 0x01, 0x02, 0x00, 0x00 diff --git a/data/maps/Route16_NorthEntrance_1F/map.json b/data/maps/Route16_NorthEntrance_1F/map.json new file mode 100644 index 000000000..586be196d --- /dev/null +++ b/data/maps/Route16_NorthEntrance_1F/map.json @@ -0,0 +1,182 @@ +{ + "id": "MAP_ROUTE16_NORTH_ENTRANCE_1F", + "name": "Route16_NorthEntrance_1F", + "layout": "LAYOUT_ROUTE16_NORTH_ENTRANCE_1F", + "music": "BGM_FRLG_VIRIDIAN_CITY", + "region_map_section": "MAPSEC_ROUTE_16", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 1, + "unknown_19": 2, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "60", + "x": 6, + "y": 8, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route16_NorthEntrance_1F_EventScript_1701DB", + "flag": "0" + }, + { + "graphics_id": "32", + "x": 7, + "y": 4, + "elevation": 3, + "movement_type": "5", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route16_NorthEntrance_1F_EventScript_1702B5", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 1, + "y": 3, + "elevation": 3, + "dest_map": "MAP_ROUTE16", + "dest_warp_id": 1 + }, + { + "x": 11, + "y": 3, + "elevation": 3, + "dest_map": "MAP_ROUTE16", + "dest_warp_id": 2 + }, + { + "x": 1, + "y": 12, + "elevation": 3, + "dest_map": "MAP_ROUTE16", + "dest_warp_id": 3 + }, + { + "x": 11, + "y": 12, + "elevation": 3, + "dest_map": "MAP_ROUTE16", + "dest_warp_id": 4 + }, + { + "x": 9, + "y": 16, + "elevation": 3, + "dest_map": "MAP_ROUTE16_NORTH_ENTRANCE_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 10, + "y": 12, + "elevation": 3, + "var": "VAR_0x405E", + "var_value": 1, + "script": "Route16_NorthEntrance_1F_EventScript_1A77B6" + }, + { + "type": "trigger", + "x": 2, + "y": 12, + "elevation": 3, + "var": "VAR_0x405E", + "var_value": 0, + "script": "Route16_NorthEntrance_1F_EventScript_1A77C1" + }, + { + "type": "trigger", + "x": 6, + "y": 10, + "elevation": 3, + "var": "VAR_0x4001", + "var_value": 0, + "script": "Route16_NorthEntrance_1F_EventScript_1701E4" + }, + { + "type": "trigger", + "x": 6, + "y": 11, + "elevation": 3, + "var": "VAR_0x4001", + "var_value": 0, + "script": "Route16_NorthEntrance_1F_EventScript_1701F0" + }, + { + "type": "trigger", + "x": 1, + "y": 13, + "elevation": 3, + "var": "VAR_0x405E", + "var_value": 0, + "script": "Route16_NorthEntrance_1F_EventScript_1A77C1" + }, + { + "type": "trigger", + "x": 1, + "y": 11, + "elevation": 3, + "var": "VAR_0x405E", + "var_value": 0, + "script": "Route16_NorthEntrance_1F_EventScript_1A77C1" + }, + { + "type": "trigger", + "x": 11, + "y": 11, + "elevation": 3, + "var": "VAR_0x405E", + "var_value": 1, + "script": "Route16_NorthEntrance_1F_EventScript_1A77B6" + }, + { + "type": "trigger", + "x": 11, + "y": 13, + "elevation": 3, + "var": "VAR_0x405E", + "var_value": 1, + "script": "Route16_NorthEntrance_1F_EventScript_1A77B6" + }, + { + "type": "trigger", + "x": 6, + "y": 12, + "elevation": 3, + "var": "VAR_0x4001", + "var_value": 0, + "script": "Route16_NorthEntrance_1F_EventScript_1701FC" + }, + { + "type": "trigger", + "x": 6, + "y": 13, + "elevation": 3, + "var": "VAR_0x4001", + "var_value": 0, + "script": "Route16_NorthEntrance_1F_EventScript_170208" + }, + { + "type": "trigger", + "x": 6, + "y": 14, + "elevation": 3, + "var": "VAR_0x4001", + "var_value": 0, + "script": "Route16_NorthEntrance_1F_EventScript_170214" + } + ], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/Route16_NorthEntrance_2F/events.inc b/data/maps/Route16_NorthEntrance_2F/events.inc deleted file mode 100644 index 5a163e96f..000000000 --- a/data/maps/Route16_NorthEntrance_2F/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -Route16_NorthEntrance_2F_EventObjects: - object_event 1, 16, 0, 6, 0, 3, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route16_NorthEntrance_2F_EventScript_1702BF, 0, 0, 0 - object_event 2, 17, 0, 4, 0, 8, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route16_NorthEntrance_2F_EventScript_1702C8, 0, 0, 0 - object_event 3, 55, 0, 10, 0, 6, 0, 0, 9, 17, 0, 0, 0, 0, 0, Route16_NorthEntrance_2F_EventScript_1702E3, 0, 0, 0 - -Route16_NorthEntrance_2F_MapWarps: - warp_def 10, 9, 3, 4, 6401 - -Route16_NorthEntrance_2F_MapBGEvents: - bg_event 4, 1, 0, 0, 0, Route16_NorthEntrance_2F_EventScript_1702D1 - bg_event 8, 1, 0, 0, 0, Route16_NorthEntrance_2F_EventScript_1702DA - -Route16_NorthEntrance_2F_MapEvents:: - map_events Route16_NorthEntrance_2F_EventObjects, Route16_NorthEntrance_2F_MapWarps, 0x0, Route16_NorthEntrance_2F_MapBGEvents diff --git a/data/maps/Route16_NorthEntrance_2F/header.inc b/data/maps/Route16_NorthEntrance_2F/header.inc deleted file mode 100644 index ea494e816..000000000 --- a/data/maps/Route16_NorthEntrance_2F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route16_NorthEntrance_2F:: @ 83519E4 - .4byte Entrance_2F_Layout @ 0x8320804 - .4byte Route16_NorthEntrance_2F_MapEvents @ 0x83BDDDC - .4byte Route16_NorthEntrance_2F_MapScripts @ 0x81702BE - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_CITY - .2byte 220 - .byte 0x74, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/Route16_NorthEntrance_2F/map.json b/data/maps/Route16_NorthEntrance_2F/map.json new file mode 100644 index 000000000..e4cdf8626 --- /dev/null +++ b/data/maps/Route16_NorthEntrance_2F/map.json @@ -0,0 +1,82 @@ +{ + "id": "MAP_ROUTE16_NORTH_ENTRANCE_2F", + "name": "Route16_NorthEntrance_2F", + "layout": "LAYOUT_ENTRANCE_2F", + "music": "BGM_FRLG_VIRIDIAN_CITY", + "region_map_section": "MAPSEC_ROUTE_16", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "16", + "x": 6, + "y": 3, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route16_NorthEntrance_2F_EventScript_1702BF", + "flag": "0" + }, + { + "graphics_id": "17", + "x": 4, + "y": 8, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route16_NorthEntrance_2F_EventScript_1702C8", + "flag": "0" + }, + { + "graphics_id": "55", + "x": 10, + "y": 6, + "elevation": 0, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route16_NorthEntrance_2F_EventScript_1702E3", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 10, + "y": 9, + "elevation": 3, + "dest_map": "MAP_ROUTE16_NORTH_ENTRANCE_1F", + "dest_warp_id": 4 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 4, + "y": 1, + "elevation": 0, + "script": "Route16_NorthEntrance_2F_EventScript_1702D1" + }, + { + "type": "bg_event_type_0", + "x": 8, + "y": 1, + "elevation": 0, + "script": "Route16_NorthEntrance_2F_EventScript_1702DA" + } + ] +}
\ No newline at end of file diff --git a/data/maps/Route17/connections.inc b/data/maps/Route17/connections.inc deleted file mode 100644 index e3db083c2..000000000 --- a/data/maps/Route17/connections.inc +++ /dev/null @@ -1,7 +0,0 @@ -Route17_MapConnectionsList: @ 8352BE8 - connection up, 0, MAP_ROUTE16 - connection down, 0, MAP_ROUTE18 - -Route17_MapConnections:: @ 8352C00 - .4byte 2 - .4byte Route17_MapConnectionsList diff --git a/data/maps/Route17/events.inc b/data/maps/Route17/events.inc deleted file mode 100644 index a0fc66d38..000000000 --- a/data/maps/Route17/events.inc +++ /dev/null @@ -1,27 +0,0 @@ -Route17_EventObjects: - object_event 1, 53, 0, 4, 0, 18, 0, 3, 26, 97, 0, 1, 0, 1, 0, Route17_EventScript_1AB319, 0, 0, 0 - object_event 2, 53, 0, 11, 0, 15, 0, 3, 26, 81, 0, 1, 0, 1, 0, Route17_EventScript_1AB221, 0, 0, 0 - object_event 3, 53, 0, 15, 0, 24, 0, 3, 52, 36, 0, 1, 0, 1, 0, Route17_EventScript_1AB1E3, 0, 0, 0 - object_event 4, 53, 0, 18, 0, 41, 0, 3, 26, 81, 0, 1, 0, 1, 0, Route17_EventScript_1AB129, 0, 0, 0 - object_event 5, 53, 0, 7, 0, 38, 0, 3, 14, 17, 0, 1, 0, 5, 0, Route17_EventScript_1AB0EB, 0, 0, 0 - object_event 6, 53, 0, 2, 0, 61, 0, 3, 10, 17, 0, 1, 0, 4, 0, Route17_EventScript_1AB29D, 0, 0, 0 - object_event 7, 53, 0, 21, 0, 61, 0, 3, 9, 17, 0, 1, 0, 3, 0, Route17_EventScript_1AB25F, 0, 0, 0 - object_event 8, 53, 0, 18, 0, 94, 0, 3, 26, 81, 0, 1, 0, 1, 0, Route17_EventScript_1AB2DB, 0, 0, 0 - object_event 9, 53, 0, 16, 0, 134, 0, 3, 47, 24, 0, 1, 0, 1, 0, Route17_EventScript_1AB1A5, 0, 0, 0 - object_event 10, 53, 0, 4, 0, 116, 0, 3, 26, 81, 0, 1, 0, 1, 0, Route17_EventScript_1AB167, 0, 0, 0 - -Route17_MapBGEvents: - bg_event 12, 97, 0, 0, 0, Route17_EventScript_1681DB - bg_event 12, 83, 0, 0, 0, Route17_EventScript_1681D2 - bg_event 12, 68, 0, 0, 0, Route17_EventScript_1681C9 - bg_event 12, 53, 0, 0, 0, Route17_EventScript_1681C0 - bg_event 12, 125, 3, 0, 0, Route17_EventScript_1681E4 - bg_event 11, 157, 0, 0, 0, Route17_EventScript_1681ED - bg_event 18, 83, 3, 7, 0, 68, 17, 1 - bg_event 10, 53, 3, 7, 0, 19, 18, 1 - bg_event 4, 68, 3, 7, 0, 69, 19, 1 - bg_event 4, 125, 3, 7, 0, 25, 20, 1 - bg_event 14, 157, 3, 7, 0, 37, 21, 1 - -Route17_MapEvents:: - map_events Route17_EventObjects, 0x0, 0x0, Route17_MapBGEvents diff --git a/data/maps/Route17/header.inc b/data/maps/Route17/header.inc deleted file mode 100644 index ae76e440e..000000000 --- a/data/maps/Route17/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route17:: @ 83509EC - .4byte Route17_Layout @ 0x82F2DCC - .4byte Route17_MapEvents @ 0x83B7A20 - .4byte Route17_MapScripts @ 0x81681BF - .4byte Route17_MapConnections @ 0x8352C00 - .2byte BGM_FRLG_ROUTE_3 - .2byte 105 - .byte 0x75, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/Route17/map.json b/data/maps/Route17/map.json new file mode 100644 index 000000000..3e2049c31 --- /dev/null +++ b/data/maps/Route17/map.json @@ -0,0 +1,249 @@ +{ + "id": "MAP_ROUTE17", + "name": "Route17", + "layout": "LAYOUT_ROUTE17", + "music": "BGM_FRLG_ROUTE_3", + "region_map_section": "MAPSEC_ROUTE_17", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_3", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_ROUTE16", + "offset": 0, + "direction": "up" + }, + { + "map": "MAP_ROUTE18", + "offset": 0, + "direction": "down" + } + ], + "object_events": [ + { + "graphics_id": "53", + "x": 4, + "y": 18, + "elevation": 3, + "movement_type": "26", + "movement_range_x": 1, + "movement_range_y": 6, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route17_EventScript_1AB319", + "flag": "0" + }, + { + "graphics_id": "53", + "x": 11, + "y": 15, + "elevation": 3, + "movement_type": "26", + "movement_range_x": 1, + "movement_range_y": 5, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route17_EventScript_1AB221", + "flag": "0" + }, + { + "graphics_id": "53", + "x": 15, + "y": 24, + "elevation": 3, + "movement_type": "52", + "movement_range_x": 4, + "movement_range_y": 2, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route17_EventScript_1AB1E3", + "flag": "0" + }, + { + "graphics_id": "53", + "x": 18, + "y": 41, + "elevation": 3, + "movement_type": "26", + "movement_range_x": 1, + "movement_range_y": 5, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route17_EventScript_1AB129", + "flag": "0" + }, + { + "graphics_id": "53", + "x": 7, + "y": 38, + "elevation": 3, + "movement_type": "14", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "Route17_EventScript_1AB0EB", + "flag": "0" + }, + { + "graphics_id": "53", + "x": 2, + "y": 61, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route17_EventScript_1AB29D", + "flag": "0" + }, + { + "graphics_id": "53", + "x": 21, + "y": 61, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route17_EventScript_1AB25F", + "flag": "0" + }, + { + "graphics_id": "53", + "x": 18, + "y": 94, + "elevation": 3, + "movement_type": "26", + "movement_range_x": 1, + "movement_range_y": 5, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route17_EventScript_1AB2DB", + "flag": "0" + }, + { + "graphics_id": "53", + "x": 16, + "y": 134, + "elevation": 3, + "movement_type": "47", + "movement_range_x": 8, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route17_EventScript_1AB1A5", + "flag": "0" + }, + { + "graphics_id": "53", + "x": 4, + "y": 116, + "elevation": 3, + "movement_type": "26", + "movement_range_x": 1, + "movement_range_y": 5, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route17_EventScript_1AB167", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 12, + "y": 97, + "elevation": 0, + "script": "Route17_EventScript_1681DB" + }, + { + "type": "bg_event_type_0", + "x": 12, + "y": 83, + "elevation": 0, + "script": "Route17_EventScript_1681D2" + }, + { + "type": "bg_event_type_0", + "x": 12, + "y": 68, + "elevation": 0, + "script": "Route17_EventScript_1681C9" + }, + { + "type": "bg_event_type_0", + "x": 12, + "y": 53, + "elevation": 0, + "script": "Route17_EventScript_1681C0" + }, + { + "type": "bg_event_type_0", + "x": 12, + "y": 125, + "elevation": 3, + "script": "Route17_EventScript_1681E4" + }, + { + "type": "bg_event_type_0", + "x": 11, + "y": 157, + "elevation": 0, + "script": "Route17_EventScript_1681ED" + }, + { + "type": "hidden_item", + "x": 18, + "y": 83, + "elevation": 3, + "item": "ITEM_RARE_CANDY", + "flag": "17", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 10, + "y": 53, + "elevation": 3, + "item": "ITEM_FULL_RESTORE", + "flag": "18", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 4, + "y": 68, + "elevation": 3, + "item": "ITEM_PP_UP", + "flag": "19", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 4, + "y": 125, + "elevation": 3, + "item": "ITEM_MAX_REVIVE", + "flag": "20", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 14, + "y": 157, + "elevation": 3, + "item": "ITEM_MAX_ELIXIR", + "flag": "21", + "unknown": 1 + } + ] +}
\ No newline at end of file diff --git a/data/maps/Route18/connections.inc b/data/maps/Route18/connections.inc deleted file mode 100644 index dd721edac..000000000 --- a/data/maps/Route18/connections.inc +++ /dev/null @@ -1,7 +0,0 @@ -Route18_MapConnectionsList: @ 8352C08 - connection up, 0, MAP_ROUTE17 - connection right, -10, MAP_FUCHSIA_CITY - -Route18_MapConnections:: @ 8352C20 - .4byte 2 - .4byte Route18_MapConnectionsList diff --git a/data/maps/Route18/events.inc b/data/maps/Route18/events.inc deleted file mode 100644 index a07028aa1..000000000 --- a/data/maps/Route18/events.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route18_EventObjects: - object_event 1, 26, 0, 46, 0, 14, 0, 3, 9, 17, 0, 1, 0, 4, 0, Route18_EventScript_1AB3D3, 0, 0, 0 - object_event 2, 26, 0, 41, 0, 15, 0, 3, 1, 17, 0, 1, 0, 1, 0, Route18_EventScript_1AB395, 0, 0, 0 - object_event 3, 26, 0, 39, 0, 12, 0, 3, 10, 17, 0, 1, 0, 6, 0, Route18_EventScript_1AB357, 0, 0, 0 - -Route18_MapWarps: - warp_def 41, 9, 3, 0, 6656 - warp_def 48, 9, 3, 1, 6656 - -Route18_MapBGEvents: - bg_event 37, 7, 0, 0, 0, Route18_EventScript_168228 - bg_event 52, 7, 0, 0, 0, Route18_EventScript_16821F - -Route18_MapEvents:: - map_events Route18_EventObjects, Route18_MapWarps, 0x0, Route18_MapBGEvents diff --git a/data/maps/Route18/header.inc b/data/maps/Route18/header.inc deleted file mode 100644 index b4861fdf1..000000000 --- a/data/maps/Route18/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route18:: @ 8350A08 - .4byte Route18_Layout @ 0x82F3750 - .4byte Route18_MapEvents @ 0x83B7AA4 - .4byte Route18_MapScripts @ 0x81681F6 - .4byte Route18_MapConnections @ 0x8352C20 - .2byte BGM_FRLG_ROUTE_3 - .2byte 106 - .byte 0x76, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/Route18/map.json b/data/maps/Route18/map.json new file mode 100644 index 000000000..760f31bad --- /dev/null +++ b/data/maps/Route18/map.json @@ -0,0 +1,100 @@ +{ + "id": "MAP_ROUTE18", + "name": "Route18", + "layout": "LAYOUT_ROUTE18", + "music": "BGM_FRLG_ROUTE_3", + "region_map_section": "MAPSEC_ROUTE_18", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_3", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_ROUTE17", + "offset": 0, + "direction": "up" + }, + { + "map": "MAP_FUCHSIA_CITY", + "offset": -10, + "direction": "right" + } + ], + "object_events": [ + { + "graphics_id": "26", + "x": 46, + "y": 14, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route18_EventScript_1AB3D3", + "flag": "0" + }, + { + "graphics_id": "26", + "x": 41, + "y": 15, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route18_EventScript_1AB395", + "flag": "0" + }, + { + "graphics_id": "26", + "x": 39, + "y": 12, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 6, + "script": "Route18_EventScript_1AB357", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 41, + "y": 9, + "elevation": 3, + "dest_map": "MAP_ROUTE18_EAST_ENTRANCE_1F", + "dest_warp_id": 0 + }, + { + "x": 48, + "y": 9, + "elevation": 3, + "dest_map": "MAP_ROUTE18_EAST_ENTRANCE_1F", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 37, + "y": 7, + "elevation": 0, + "script": "Route18_EventScript_168228" + }, + { + "type": "bg_event_type_0", + "x": 52, + "y": 7, + "elevation": 0, + "script": "Route18_EventScript_16821F" + } + ] +}
\ No newline at end of file diff --git a/data/maps/Route18_EastEntrance_1F/events.inc b/data/maps/Route18_EastEntrance_1F/events.inc deleted file mode 100644 index 1e7e8795c..000000000 --- a/data/maps/Route18_EastEntrance_1F/events.inc +++ /dev/null @@ -1,23 +0,0 @@ -Route18_EastEntrance_1F_EventObjects: - object_event 1, 60, 0, 6, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route18_EastEntrance_1F_EventScript_170391, 0, 0, 0 - -Route18_EastEntrance_1F_MapWarps: - warp_def 1, 6, 3, 0, 804 - warp_def 11, 6, 3, 1, 804 - warp_def 9, 10, 3, 0, 6657 - -Route18_EastEntrance_1F_MapCoordEvents: - coord_event 2, 6, 3, 0, 16478, 0, 0, Route18_EastEntrance_1F_EventScript_1A77C1 - coord_event 6, 4, 3, 0, 16385, 0, 0, Route18_EastEntrance_1F_EventScript_17039A - coord_event 6, 5, 3, 0, 16385, 0, 0, Route18_EastEntrance_1F_EventScript_1703A6 - coord_event 6, 6, 3, 0, 16385, 0, 0, Route18_EastEntrance_1F_EventScript_1703B2 - coord_event 6, 7, 3, 0, 16385, 0, 0, Route18_EastEntrance_1F_EventScript_1703BE - coord_event 6, 8, 3, 0, 16385, 0, 0, Route18_EastEntrance_1F_EventScript_1703CA - coord_event 10, 6, 3, 0, 16478, 1, 0, Route18_EastEntrance_1F_EventScript_1A77B6 - coord_event 11, 5, 3, 0, 16478, 1, 0, Route18_EastEntrance_1F_EventScript_1A77B6 - coord_event 11, 7, 3, 0, 16478, 1, 0, Route18_EastEntrance_1F_EventScript_1A77B6 - coord_event 1, 5, 3, 0, 16478, 0, 0, Route18_EastEntrance_1F_EventScript_1A77C1 - coord_event 1, 7, 3, 0, 16478, 0, 0, Route18_EastEntrance_1F_EventScript_1A77C1 - -Route18_EastEntrance_1F_MapEvents:: - map_events Route18_EastEntrance_1F_EventObjects, Route18_EastEntrance_1F_MapWarps, Route18_EastEntrance_1F_MapCoordEvents, 0x0 diff --git a/data/maps/Route18_EastEntrance_1F/header.inc b/data/maps/Route18_EastEntrance_1F/header.inc deleted file mode 100644 index 87cf71cf7..000000000 --- a/data/maps/Route18_EastEntrance_1F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route18_EastEntrance_1F:: @ 8351A00 - .4byte Entrance_1F_Layout @ 0x8320E70 - .4byte Route18_EastEntrance_1F_MapEvents @ 0x83BDED0 - .4byte Route18_EastEntrance_1F_MapScripts @ 0x8170378 - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_CITY - .2byte 224 - .byte 0x76, 0x00, 0x00, 0x08, 0x01, 0x02, 0x00, 0x00 diff --git a/data/maps/Route18_EastEntrance_1F/map.json b/data/maps/Route18_EastEntrance_1F/map.json new file mode 100644 index 000000000..6e85ecee0 --- /dev/null +++ b/data/maps/Route18_EastEntrance_1F/map.json @@ -0,0 +1,155 @@ +{ + "id": "MAP_ROUTE18_EAST_ENTRANCE_1F", + "name": "Route18_EastEntrance_1F", + "layout": "LAYOUT_ENTRANCE_1F", + "music": "BGM_FRLG_VIRIDIAN_CITY", + "region_map_section": "MAPSEC_ROUTE_18", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 1, + "unknown_19": 2, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "60", + "x": 6, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route18_EastEntrance_1F_EventScript_170391", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 1, + "y": 6, + "elevation": 3, + "dest_map": "MAP_ROUTE18", + "dest_warp_id": 0 + }, + { + "x": 11, + "y": 6, + "elevation": 3, + "dest_map": "MAP_ROUTE18", + "dest_warp_id": 1 + }, + { + "x": 9, + "y": 10, + "elevation": 3, + "dest_map": "MAP_ROUTE18_EAST_ENTRANCE_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 2, + "y": 6, + "elevation": 3, + "var": "VAR_0x405E", + "var_value": 0, + "script": "Route18_EastEntrance_1F_EventScript_1A77C1" + }, + { + "type": "trigger", + "x": 6, + "y": 4, + "elevation": 3, + "var": "VAR_0x4001", + "var_value": 0, + "script": "Route18_EastEntrance_1F_EventScript_17039A" + }, + { + "type": "trigger", + "x": 6, + "y": 5, + "elevation": 3, + "var": "VAR_0x4001", + "var_value": 0, + "script": "Route18_EastEntrance_1F_EventScript_1703A6" + }, + { + "type": "trigger", + "x": 6, + "y": 6, + "elevation": 3, + "var": "VAR_0x4001", + "var_value": 0, + "script": "Route18_EastEntrance_1F_EventScript_1703B2" + }, + { + "type": "trigger", + "x": 6, + "y": 7, + "elevation": 3, + "var": "VAR_0x4001", + "var_value": 0, + "script": "Route18_EastEntrance_1F_EventScript_1703BE" + }, + { + "type": "trigger", + "x": 6, + "y": 8, + "elevation": 3, + "var": "VAR_0x4001", + "var_value": 0, + "script": "Route18_EastEntrance_1F_EventScript_1703CA" + }, + { + "type": "trigger", + "x": 10, + "y": 6, + "elevation": 3, + "var": "VAR_0x405E", + "var_value": 1, + "script": "Route18_EastEntrance_1F_EventScript_1A77B6" + }, + { + "type": "trigger", + "x": 11, + "y": 5, + "elevation": 3, + "var": "VAR_0x405E", + "var_value": 1, + "script": "Route18_EastEntrance_1F_EventScript_1A77B6" + }, + { + "type": "trigger", + "x": 11, + "y": 7, + "elevation": 3, + "var": "VAR_0x405E", + "var_value": 1, + "script": "Route18_EastEntrance_1F_EventScript_1A77B6" + }, + { + "type": "trigger", + "x": 1, + "y": 5, + "elevation": 3, + "var": "VAR_0x405E", + "var_value": 0, + "script": "Route18_EastEntrance_1F_EventScript_1A77C1" + }, + { + "type": "trigger", + "x": 1, + "y": 7, + "elevation": 3, + "var": "VAR_0x405E", + "var_value": 0, + "script": "Route18_EastEntrance_1F_EventScript_1A77C1" + } + ], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/Route18_EastEntrance_2F/events.inc b/data/maps/Route18_EastEntrance_2F/events.inc deleted file mode 100644 index 4b156befa..000000000 --- a/data/maps/Route18_EastEntrance_2F/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -Route18_EastEntrance_2F_EventObjects: - object_event 1, 19, 0, 5, 0, 3, 0, 3, 9, 17, 0, 0, 0, 0, 0, Route18_EastEntrance_2F_EventScript_17047E, 0, 0, 0 - -Route18_EastEntrance_2F_MapWarps: - warp_def 10, 9, 3, 2, 6656 - -Route18_EastEntrance_2F_MapBGEvents: - bg_event 4, 1, 0, 0, 0, Route18_EastEntrance_2F_EventScript_17046C - bg_event 8, 1, 0, 0, 0, Route18_EastEntrance_2F_EventScript_170475 - -Route18_EastEntrance_2F_MapEvents:: - map_events Route18_EastEntrance_2F_EventObjects, Route18_EastEntrance_2F_MapWarps, 0x0, Route18_EastEntrance_2F_MapBGEvents diff --git a/data/maps/Route18_EastEntrance_2F/header.inc b/data/maps/Route18_EastEntrance_2F/header.inc deleted file mode 100644 index 56ed2a2a9..000000000 --- a/data/maps/Route18_EastEntrance_2F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route18_EastEntrance_2F:: @ 8351A1C - .4byte Entrance_2F_Layout @ 0x8320804 - .4byte Route18_EastEntrance_2F_MapEvents @ 0x83BDF1C - .4byte Route18_EastEntrance_2F_MapScripts @ 0x817046B - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_CITY - .2byte 220 - .byte 0x76, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/Route18_EastEntrance_2F/map.json b/data/maps/Route18_EastEntrance_2F/map.json new file mode 100644 index 000000000..e304e53f9 --- /dev/null +++ b/data/maps/Route18_EastEntrance_2F/map.json @@ -0,0 +1,56 @@ +{ + "id": "MAP_ROUTE18_EAST_ENTRANCE_2F", + "name": "Route18_EastEntrance_2F", + "layout": "LAYOUT_ENTRANCE_2F", + "music": "BGM_FRLG_VIRIDIAN_CITY", + "region_map_section": "MAPSEC_ROUTE_18", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "19", + "x": 5, + "y": 3, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route18_EastEntrance_2F_EventScript_17047E", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 10, + "y": 9, + "elevation": 3, + "dest_map": "MAP_ROUTE18_EAST_ENTRANCE_1F", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 4, + "y": 1, + "elevation": 0, + "script": "Route18_EastEntrance_2F_EventScript_17046C" + }, + { + "type": "bg_event_type_0", + "x": 8, + "y": 1, + "elevation": 0, + "script": "Route18_EastEntrance_2F_EventScript_170475" + } + ] +}
\ No newline at end of file diff --git a/data/maps/Route19/connections.inc b/data/maps/Route19/connections.inc deleted file mode 100644 index c93520d52..000000000 --- a/data/maps/Route19/connections.inc +++ /dev/null @@ -1,7 +0,0 @@ -Route19_MapConnectionsList: @ 8352C28 - connection up, -12, MAP_FUCHSIA_CITY - connection left, 40, MAP_ROUTE20 - -Route19_MapConnections:: @ 8352C40 - .4byte 2 - .4byte Route19_MapConnectionsList diff --git a/data/maps/Route19/events.inc b/data/maps/Route19/events.inc deleted file mode 100644 index d1d6dcdeb..000000000 --- a/data/maps/Route19/events.inc +++ /dev/null @@ -1,19 +0,0 @@ -Route19_EventObjects: - object_event 1, 45, 0, 15, 0, 10, 0, 3, 9, 54, 0, 1, 0, 3, 0, Route19_EventScript_1AB44F, 0, 0, 0 - object_event 2, 45, 0, 10, 0, 9, 0, 3, 10, 17, 0, 1, 0, 3, 0, Route19_EventScript_1AB411, 0, 0, 0 - object_event 3, 43, 0, 12, 0, 17, 0, 1, 1, 17, 0, 1, 0, 3, 0, Route19_EventScript_1AB547, 0, 0, 0 - object_event 4, 43, 0, 18, 0, 33, 0, 1, 51, 53, 0, 1, 0, 1, 0, Route19_EventScript_1AB48D, 0, 0, 0 - object_event 5, 43, 0, 8, 0, 27, 0, 1, 2, 34, 0, 1, 0, 1, 0, Route19_EventScript_1AB4CB, 0, 0, 0 - object_event 6, 43, 0, 16, 0, 22, 0, 1, 14, 17, 0, 1, 0, 6, 0, Route19_EventScript_1AB509, 0, 0, 0 - object_event 7, 43, 0, 11, 0, 47, 0, 1, 1, 17, 0, 1, 0, 1, 0, Route19_EventScript_1AB585, 0, 0, 0 - object_event 8, 44, 0, 14, 0, 48, 0, 1, 1, 17, 0, 1, 0, 1, 0, Route19_EventScript_1AB601, 0, 0, 0 - object_event 9, 44, 0, 12, 0, 49, 0, 1, 1, 17, 0, 1, 0, 1, 0, Route19_EventScript_1AB63F, 0, 0, 0 - object_event 10, 44, 0, 9, 0, 48, 0, 1, 1, 17, 0, 1, 0, 1, 0, Route19_EventScript_1AB5C3, 0, 0, 0 - object_event 11, 44, 0, 8, 0, 41, 0, 1, 8, 17, 0, 1, 0, 1, 0, Route19_EventScript_1AB67D, 0, 0, 0 - object_event 12, 36, 0, 9, 0, 41, 0, 1, 8, 17, 0, 1, 0, 1, 0, Route19_EventScript_1AB6C3, 0, 0, 0 - -Route19_MapBGEvents: - bg_event 13, 12, 0, 0, 0, Route19_EventScript_168232 - -Route19_MapEvents:: - map_events Route19_EventObjects, 0x0, 0x0, Route19_MapBGEvents diff --git a/data/maps/Route19/header.inc b/data/maps/Route19/header.inc deleted file mode 100644 index a141f1f92..000000000 --- a/data/maps/Route19/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route19:: @ 8350A24 - .4byte Route19_Layout @ 0x82F42B4 - .4byte Route19_MapEvents @ 0x83B7BE4 - .4byte Route19_MapScripts @ 0x8168231 - .4byte Route19_MapConnections @ 0x8352C40 - .2byte BGM_FRLG_ROUTE_3 - .2byte 107 - .byte 0x77, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/Route19/map.json b/data/maps/Route19/map.json new file mode 100644 index 000000000..055c49371 --- /dev/null +++ b/data/maps/Route19/map.json @@ -0,0 +1,195 @@ +{ + "id": "MAP_ROUTE19", + "name": "Route19", + "layout": "LAYOUT_ROUTE19", + "music": "BGM_FRLG_ROUTE_3", + "region_map_section": "MAPSEC_ROUTE_19", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_3", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_FUCHSIA_CITY", + "offset": -12, + "direction": "up" + }, + { + "map": "MAP_ROUTE20", + "offset": 40, + "direction": "left" + } + ], + "object_events": [ + { + "graphics_id": "45", + "x": 15, + "y": 10, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 6, + "movement_range_y": 3, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route19_EventScript_1AB44F", + "flag": "0" + }, + { + "graphics_id": "45", + "x": 10, + "y": 9, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route19_EventScript_1AB411", + "flag": "0" + }, + { + "graphics_id": "43", + "x": 12, + "y": 17, + "elevation": 1, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route19_EventScript_1AB547", + "flag": "0" + }, + { + "graphics_id": "43", + "x": 18, + "y": 33, + "elevation": 1, + "movement_type": "51", + "movement_range_x": 5, + "movement_range_y": 3, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route19_EventScript_1AB48D", + "flag": "0" + }, + { + "graphics_id": "43", + "x": 8, + "y": 27, + "elevation": 1, + "movement_type": "2", + "movement_range_x": 2, + "movement_range_y": 2, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route19_EventScript_1AB4CB", + "flag": "0" + }, + { + "graphics_id": "43", + "x": 16, + "y": 22, + "elevation": 1, + "movement_type": "14", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 6, + "script": "Route19_EventScript_1AB509", + "flag": "0" + }, + { + "graphics_id": "43", + "x": 11, + "y": 47, + "elevation": 1, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route19_EventScript_1AB585", + "flag": "0" + }, + { + "graphics_id": "44", + "x": 14, + "y": 48, + "elevation": 1, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route19_EventScript_1AB601", + "flag": "0" + }, + { + "graphics_id": "44", + "x": 12, + "y": 49, + "elevation": 1, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route19_EventScript_1AB63F", + "flag": "0" + }, + { + "graphics_id": "44", + "x": 9, + "y": 48, + "elevation": 1, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route19_EventScript_1AB5C3", + "flag": "0" + }, + { + "graphics_id": "44", + "x": 8, + "y": 41, + "elevation": 1, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route19_EventScript_1AB67D", + "flag": "0" + }, + { + "graphics_id": "36", + "x": 9, + "y": 41, + "elevation": 1, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route19_EventScript_1AB6C3", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 13, + "y": 12, + "elevation": 0, + "script": "Route19_EventScript_168232" + } + ] +}
\ No newline at end of file diff --git a/data/maps/Route2/connections.inc b/data/maps/Route2/connections.inc deleted file mode 100644 index d37b77d96..000000000 --- a/data/maps/Route2/connections.inc +++ /dev/null @@ -1,7 +0,0 @@ -Route2_MapConnectionsList: @ 83529FC - connection up, -12, MAP_PEWTER_CITY - connection down, -12, MAP_VIRIDIAN_CITY - -Route2_MapConnections:: @ 8352A14 - .4byte 2 - .4byte Route2_MapConnectionsList diff --git a/data/maps/Route2/events.inc b/data/maps/Route2/events.inc deleted file mode 100644 index 316893612..000000000 --- a/data/maps/Route2/events.inc +++ /dev/null @@ -1,27 +0,0 @@ -Route2_EventObjects: - object_event 1, 95, 0, 16, 0, 62, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route2_EventScript_1BDF13, 20, 0, 0 - object_event 2, 95, 0, 15, 0, 69, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route2_EventScript_1BDF13, 19, 0, 0 - object_event 3, 95, 0, 11, 0, 13, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route2_EventScript_1BDF13, 21, 0, 0 - object_event 4, 95, 0, 18, 0, 26, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route2_EventScript_1BDF13, 22, 0, 0 - object_event 5, 92, 0, 17, 0, 54, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route2_EventScript_1BE58E, 340, 0, 0 - object_event 6, 92, 0, 17, 0, 64, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route2_EventScript_1BE59B, 341, 0, 0 - object_event 7, 65375, 0, 6, 0, 85, 0, 8, 0, 0, 0, 1, 0, 3, 0, 0x0, 0, 0, 0 - -Route2_MapWarps: - warp_def 5, 13, 3, 3, 3843 - warp_def 6, 13, 3, 3, 3843 - warp_def 5, 51, 3, 1, 3840 - warp_def 17, 11, 3, 1, 292 - warp_def 17, 22, 0, 1, 3841 - warp_def 18, 46, 3, 1, 3842 - warp_def 18, 41, 3, 3, 3842 - warp_def 19, 41, 3, 3, 3842 - warp_def 19, 46, 3, 1, 3842 - warp_def 6, 51, 3, 1, 3840 - -Route2_MapBGEvents: - bg_event 14, 12, 0, 0, 0, Route2_EventScript_167F6E - bg_event 7, 73, 0, 0, 0, Route2_EventScript_167F65 - -Route2_MapEvents:: - map_events Route2_EventObjects, Route2_MapWarps, 0x0, Route2_MapBGEvents diff --git a/data/maps/Route2/header.inc b/data/maps/Route2/header.inc deleted file mode 100644 index 985fe6d72..000000000 --- a/data/maps/Route2/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route2:: @ 8350848 - .4byte Route2_Layout @ 0x82E64F0 - .4byte Route2_MapEvents @ 0x83B676C - .4byte Route2_MapScripts @ 0x8167F64 - .4byte Route2_MapConnections @ 0x8352A14 - .2byte BGM_FRLG_ROUTE_1 - .2byte 90 - .byte 0x66, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/Route2/map.json b/data/maps/Route2/map.json new file mode 100644 index 000000000..a8fde02a1 --- /dev/null +++ b/data/maps/Route2/map.json @@ -0,0 +1,208 @@ +{ + "id": "MAP_ROUTE2", + "name": "Route2", + "layout": "LAYOUT_ROUTE2", + "music": "BGM_FRLG_ROUTE_1", + "region_map_section": "MAPSEC_ROUTE_2", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_3", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_PEWTER_CITY", + "offset": -12, + "direction": "up" + }, + { + "map": "MAP_VIRIDIAN_CITY", + "offset": -12, + "direction": "down" + } + ], + "object_events": [ + { + "graphics_id": "95", + "x": 16, + "y": 62, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route2_EventScript_1BDF13", + "flag": "20" + }, + { + "graphics_id": "95", + "x": 15, + "y": 69, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route2_EventScript_1BDF13", + "flag": "19" + }, + { + "graphics_id": "95", + "x": 11, + "y": 13, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route2_EventScript_1BDF13", + "flag": "21" + }, + { + "graphics_id": "95", + "x": 18, + "y": 26, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route2_EventScript_1BDF13", + "flag": "22" + }, + { + "graphics_id": "92", + "x": 17, + "y": 54, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route2_EventScript_1BE58E", + "flag": "340" + }, + { + "graphics_id": "92", + "x": 17, + "y": 64, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route2_EventScript_1BE59B", + "flag": "341" + }, + { + "graphics_id": "65375", + "x": 6, + "y": 85, + "elevation": 8, + "movement_type": "0", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 5, + "y": 13, + "elevation": 3, + "dest_map": "MAP_ROUTE2_VIRIDIAN_FOREST_NORTH_ENTRANCE", + "dest_warp_id": 3 + }, + { + "x": 6, + "y": 13, + "elevation": 3, + "dest_map": "MAP_ROUTE2_VIRIDIAN_FOREST_NORTH_ENTRANCE", + "dest_warp_id": 3 + }, + { + "x": 5, + "y": 51, + "elevation": 3, + "dest_map": "MAP_ROUTE2_VIRIDIAN_FOREST_SOUTH_ENTRANCE", + "dest_warp_id": 1 + }, + { + "x": 17, + "y": 11, + "elevation": 3, + "dest_map": "MAP_DIGLETTS_CAVE_NORTH_ENTRANCE", + "dest_warp_id": 1 + }, + { + "x": 17, + "y": 22, + "elevation": 0, + "dest_map": "MAP_ROUTE2_HOUSE", + "dest_warp_id": 1 + }, + { + "x": 18, + "y": 46, + "elevation": 3, + "dest_map": "MAP_ROUTE2_EAST_BUILDING", + "dest_warp_id": 1 + }, + { + "x": 18, + "y": 41, + "elevation": 3, + "dest_map": "MAP_ROUTE2_EAST_BUILDING", + "dest_warp_id": 3 + }, + { + "x": 19, + "y": 41, + "elevation": 3, + "dest_map": "MAP_ROUTE2_EAST_BUILDING", + "dest_warp_id": 3 + }, + { + "x": 19, + "y": 46, + "elevation": 3, + "dest_map": "MAP_ROUTE2_EAST_BUILDING", + "dest_warp_id": 1 + }, + { + "x": 6, + "y": 51, + "elevation": 3, + "dest_map": "MAP_ROUTE2_VIRIDIAN_FOREST_SOUTH_ENTRANCE", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 14, + "y": 12, + "elevation": 0, + "script": "Route2_EventScript_167F6E" + }, + { + "type": "bg_event_type_0", + "x": 7, + "y": 73, + "elevation": 0, + "script": "Route2_EventScript_167F65" + } + ] +}
\ No newline at end of file diff --git a/data/maps/Route20/connections.inc b/data/maps/Route20/connections.inc deleted file mode 100644 index 36d679ff9..000000000 --- a/data/maps/Route20/connections.inc +++ /dev/null @@ -1,7 +0,0 @@ -Route20_MapConnectionsList: @ 8352C48 - connection left, 0, MAP_CINNABAR_ISLAND - connection right, -40, MAP_ROUTE19 - -Route20_MapConnections:: @ 8352C60 - .4byte 2 - .4byte Route20_MapConnectionsList diff --git a/data/maps/Route20/events.inc b/data/maps/Route20/events.inc deleted file mode 100644 index 468c7d951..000000000 --- a/data/maps/Route20/events.inc +++ /dev/null @@ -1,24 +0,0 @@ -Route20_EventObjects: - object_event 1, 44, 0, 8, 0, 11, 0, 1, 13, 17, 0, 1, 0, 3, 0, Route20_EventScript_1AB83F, 0, 0, 0 - object_event 2, 40, 0, 16, 0, 14, 0, 3, 8, 17, 0, 1, 0, 1, 0, Route20_EventScript_1AB8F9, 0, 0, 0 - object_event 3, 44, 0, 34, 0, 7, 0, 1, 8, 17, 0, 1, 0, 4, 0, Route20_EventScript_1AB801, 0, 0, 0 - object_event 4, 26, 0, 43, 0, 9, 0, 3, 2, 17, 0, 1, 0, 1, 0, Route20_EventScript_1AB8BB, 0, 0, 0 - object_event 5, 43, 0, 23, 0, 10, 0, 1, 52, 69, 0, 1, 0, 1, 0, Route20_EventScript_1AB747, 0, 0, 0 - object_event 6, 40, 0, 73, 0, 16, 0, 3, 9, 17, 0, 1, 0, 2, 0, Route20_EventScript_1AB937, 0, 0, 0 - object_event 7, 43, 0, 111, 0, 9, 0, 1, 45, 53, 0, 1, 0, 1, 0, Route20_EventScript_1AB709, 0, 0, 0 - object_event 8, 43, 0, 106, 0, 11, 0, 1, 50, 53, 0, 1, 0, 1, 0, Route20_EventScript_1AB785, 0, 0, 0 - object_event 9, 44, 0, 93, 0, 10, 0, 1, 1, 17, 0, 1, 0, 5, 0, Route20_EventScript_1AB87D, 0, 0, 0 - object_event 10, 44, 0, 54, 0, 11, 0, 1, 1, 17, 0, 1, 0, 1, 0, Route20_EventScript_1AB7C3, 0, 0, 0 - object_event 11, 39, 0, 69, 0, 3, 0, 3, 5, 18, 0, 0, 0, 0, 0, Route20_EventScript_1ACE36, 0, 0, 0 - -Route20_MapWarps: - warp_def 60, 8, 3, 3, 339 - warp_def 72, 14, 3, 4, 339 - -Route20_MapBGEvents: - bg_event 68, 14, 0, 0, 0, Route20_EventScript_168280 - bg_event 64, 8, 0, 0, 0, Route20_EventScript_168280 - bg_event 23, 6, 3, 7, 0, 108, 153, 1 - -Route20_MapEvents:: - map_events Route20_EventObjects, Route20_MapWarps, 0x0, Route20_MapBGEvents diff --git a/data/maps/Route20/header.inc b/data/maps/Route20/header.inc deleted file mode 100644 index 1b832f0cd..000000000 --- a/data/maps/Route20/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route20:: @ 8350A40 - .4byte Route20_Layout @ 0x82F5598 - .4byte Route20_MapEvents @ 0x83B7D34 - .4byte Route20_MapScripts @ 0x816823B - .4byte Route20_MapConnections @ 0x8352C60 - .2byte BGM_FRLG_ROUTE_3 - .2byte 108 - .byte 0x78, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/Route20/map.json b/data/maps/Route20/map.json new file mode 100644 index 000000000..80213fc07 --- /dev/null +++ b/data/maps/Route20/map.json @@ -0,0 +1,213 @@ +{ + "id": "MAP_ROUTE20", + "name": "Route20", + "layout": "LAYOUT_ROUTE20", + "music": "BGM_FRLG_ROUTE_3", + "region_map_section": "MAPSEC_ROUTE_20", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_3", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_CINNABAR_ISLAND", + "offset": 0, + "direction": "left" + }, + { + "map": "MAP_ROUTE19", + "offset": -40, + "direction": "right" + } + ], + "object_events": [ + { + "graphics_id": "44", + "x": 8, + "y": 11, + "elevation": 1, + "movement_type": "13", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route20_EventScript_1AB83F", + "flag": "0" + }, + { + "graphics_id": "40", + "x": 16, + "y": 14, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route20_EventScript_1AB8F9", + "flag": "0" + }, + { + "graphics_id": "44", + "x": 34, + "y": 7, + "elevation": 1, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route20_EventScript_1AB801", + "flag": "0" + }, + { + "graphics_id": "26", + "x": 43, + "y": 9, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route20_EventScript_1AB8BB", + "flag": "0" + }, + { + "graphics_id": "43", + "x": 23, + "y": 10, + "elevation": 1, + "movement_type": "52", + "movement_range_x": 5, + "movement_range_y": 4, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route20_EventScript_1AB747", + "flag": "0" + }, + { + "graphics_id": "40", + "x": 73, + "y": 16, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route20_EventScript_1AB937", + "flag": "0" + }, + { + "graphics_id": "43", + "x": 111, + "y": 9, + "elevation": 1, + "movement_type": "45", + "movement_range_x": 5, + "movement_range_y": 3, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route20_EventScript_1AB709", + "flag": "0" + }, + { + "graphics_id": "43", + "x": 106, + "y": 11, + "elevation": 1, + "movement_type": "50", + "movement_range_x": 5, + "movement_range_y": 3, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route20_EventScript_1AB785", + "flag": "0" + }, + { + "graphics_id": "44", + "x": 93, + "y": 10, + "elevation": 1, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "Route20_EventScript_1AB87D", + "flag": "0" + }, + { + "graphics_id": "44", + "x": 54, + "y": 11, + "elevation": 1, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route20_EventScript_1AB7C3", + "flag": "0" + }, + { + "graphics_id": "39", + "x": 69, + "y": 3, + "elevation": 3, + "movement_type": "5", + "movement_range_x": 2, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route20_EventScript_1ACE36", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 60, + "y": 8, + "elevation": 3, + "dest_map": "MAP_SEAFOAM_ISLANDS_1F", + "dest_warp_id": 3 + }, + { + "x": 72, + "y": 14, + "elevation": 3, + "dest_map": "MAP_SEAFOAM_ISLANDS_1F", + "dest_warp_id": 4 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 68, + "y": 14, + "elevation": 0, + "script": "Route20_EventScript_168280" + }, + { + "type": "bg_event_type_0", + "x": 64, + "y": 8, + "elevation": 0, + "script": "Route20_EventScript_168280" + }, + { + "type": "hidden_item", + "x": 23, + "y": 6, + "elevation": 3, + "item": "ITEM_STARDUST", + "flag": "153", + "unknown": 1 + } + ] +}
\ No newline at end of file diff --git a/data/maps/Route21_North/connections.inc b/data/maps/Route21_North/connections.inc deleted file mode 100644 index b272c4b9a..000000000 --- a/data/maps/Route21_North/connections.inc +++ /dev/null @@ -1,7 +0,0 @@ -Route21_North_MapConnectionsList: @ 8352C68 - connection up, 0, MAP_PALLET_TOWN - connection down, 0, MAP_ROUTE21_SOUTH - -Route21_North_MapConnections:: @ 8352C80 - .4byte 2 - .4byte Route21_North_MapConnectionsList diff --git a/data/maps/Route21_North/events.inc b/data/maps/Route21_North/events.inc deleted file mode 100644 index b4ab54566..000000000 --- a/data/maps/Route21_North/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -Route21_North_EventObjects: - object_event 1, 57, 0, 7, 0, 27, 0, 3, 7, 17, 0, 1, 0, 0, 0, Route21_North_EventScript_1AB975, 0, 0, 0 - object_event 2, 57, 0, 16, 0, 26, 0, 3, 8, 17, 0, 1, 0, 0, 0, Route21_North_EventScript_1AB9F1, 0, 0, 0 - object_event 3, 43, 0, 12, 0, 44, 0, 1, 51, 36, 0, 1, 0, 1, 0, Route21_North_EventScript_1ABA6D, 0, 0, 0 - object_event 4, 44, 0, 14, 0, 35, 0, 1, 8, 17, 0, 1, 0, 1, 0, Route21_North_EventScript_1ABB65, 0, 0, 0 - object_event 5, 36, 0, 15, 0, 35, 0, 1, 8, 17, 0, 1, 0, 1, 0, Route21_North_EventScript_1ABBAB, 0, 0, 0 - object_event 6, 65307, 0, 13, 0, 253, 255, 2, 0, 0, 0, 0, 0, 3, 0, 0x0, 0, 0, 0 - -Route21_North_MapBGEvents: - bg_event 17, 42, 3, 7, 0, 106, 154, 1 - -Route21_North_MapEvents:: - map_events Route21_North_EventObjects, 0x0, 0x0, Route21_North_MapBGEvents diff --git a/data/maps/Route21_North/header.inc b/data/maps/Route21_North/header.inc deleted file mode 100644 index cf0397e8a..000000000 --- a/data/maps/Route21_North/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route21_North:: @ 8350A5C - .4byte Route21_North_Layout @ 0x82F5F1C - .4byte Route21_North_MapEvents @ 0x83B7DE4 - .4byte Route21_North_MapScripts @ 0x8168289 - .4byte Route21_North_MapConnections @ 0x8352C80 - .2byte BGM_FRLG_ROUTE_3 - .2byte 109 - .byte 0x79, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/Route21_North/map.json b/data/maps/Route21_North/map.json new file mode 100644 index 000000000..42b87c9bc --- /dev/null +++ b/data/maps/Route21_North/map.json @@ -0,0 +1,119 @@ +{ + "id": "MAP_ROUTE21_NORTH", + "name": "Route21_North", + "layout": "LAYOUT_ROUTE21_NORTH", + "music": "BGM_FRLG_ROUTE_3", + "region_map_section": "MAPSEC_ROUTE_21", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_3", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_PALLET_TOWN", + "offset": 0, + "direction": "up" + }, + { + "map": "MAP_ROUTE21_SOUTH", + "offset": 0, + "direction": "down" + } + ], + "object_events": [ + { + "graphics_id": "57", + "x": 7, + "y": 27, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route21_North_EventScript_1AB975", + "flag": "0" + }, + { + "graphics_id": "57", + "x": 16, + "y": 26, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route21_North_EventScript_1AB9F1", + "flag": "0" + }, + { + "graphics_id": "43", + "x": 12, + "y": 44, + "elevation": 1, + "movement_type": "51", + "movement_range_x": 4, + "movement_range_y": 2, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route21_North_EventScript_1ABA6D", + "flag": "0" + }, + { + "graphics_id": "44", + "x": 14, + "y": 35, + "elevation": 1, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route21_North_EventScript_1ABB65", + "flag": "0" + }, + { + "graphics_id": "36", + "x": 15, + "y": 35, + "elevation": 1, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route21_North_EventScript_1ABBAB", + "flag": "0" + }, + { + "graphics_id": "65307", + "x": 13, + "y": 65533, + "elevation": 2, + "movement_type": "0", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 3, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [ + { + "type": "hidden_item", + "x": 17, + "y": 42, + "elevation": 3, + "item": "ITEM_PEARL", + "flag": "154", + "unknown": 1 + } + ] +}
\ No newline at end of file diff --git a/data/maps/Route21_South/connections.inc b/data/maps/Route21_South/connections.inc deleted file mode 100644 index 13204e356..000000000 --- a/data/maps/Route21_South/connections.inc +++ /dev/null @@ -1,7 +0,0 @@ -Route21_South_MapConnectionsList: @ 8352C88 - connection up, 0, MAP_ROUTE21_NORTH - connection down, 0, MAP_CINNABAR_ISLAND - -Route21_South_MapConnections:: @ 8352CA0 - .4byte 2 - .4byte Route21_South_MapConnectionsList diff --git a/data/maps/Route21_South/events.inc b/data/maps/Route21_South/events.inc deleted file mode 100644 index 558743026..000000000 --- a/data/maps/Route21_South/events.inc +++ /dev/null @@ -1,9 +0,0 @@ -Route21_South_EventObjects: - object_event 1, 57, 0, 11, 0, 8, 0, 3, 10, 17, 0, 1, 0, 0, 0, Route21_South_EventScript_1AB9B3, 0, 0, 0 - object_event 2, 57, 0, 14, 0, 15, 0, 3, 9, 17, 0, 1, 0, 0, 0, Route21_South_EventScript_1ABA2F, 0, 0, 0 - object_event 3, 43, 0, 15, 0, 24, 0, 1, 14, 17, 0, 1, 0, 3, 0, Route21_South_EventScript_1ABAAB, 0, 0, 0 - object_event 4, 43, 0, 15, 0, 38, 0, 1, 9, 17, 0, 1, 0, 3, 0, Route21_South_EventScript_1ABAE9, 0, 0, 0 - object_event 5, 43, 0, 10, 0, 29, 0, 1, 2, 34, 0, 1, 0, 4, 0, Route21_South_EventScript_1ABB27, 0, 0, 0 - -Route21_South_MapEvents:: - map_events Route21_South_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/Route21_South/header.inc b/data/maps/Route21_South/header.inc deleted file mode 100644 index b81f0ec6a..000000000 --- a/data/maps/Route21_South/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route21_South:: @ 8350A78 - .4byte Route21_South_Layout @ 0x83206C0 - .4byte Route21_South_MapEvents @ 0x83B7E70 - .4byte Route21_South_MapScripts @ 0x816828A - .4byte Route21_South_MapConnections @ 0x8352CA0 - .2byte BGM_FRLG_ROUTE_3 - .2byte 219 - .byte 0x79, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/Route21_South/map.json b/data/maps/Route21_South/map.json new file mode 100644 index 000000000..125dc88fc --- /dev/null +++ b/data/maps/Route21_South/map.json @@ -0,0 +1,96 @@ +{ + "id": "MAP_ROUTE21_SOUTH", + "name": "Route21_South", + "layout": "LAYOUT_ROUTE21_SOUTH", + "music": "BGM_FRLG_ROUTE_3", + "region_map_section": "MAPSEC_ROUTE_21", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_3", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_ROUTE21_NORTH", + "offset": 0, + "direction": "up" + }, + { + "map": "MAP_CINNABAR_ISLAND", + "offset": 0, + "direction": "down" + } + ], + "object_events": [ + { + "graphics_id": "57", + "x": 11, + "y": 8, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route21_South_EventScript_1AB9B3", + "flag": "0" + }, + { + "graphics_id": "57", + "x": 14, + "y": 15, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route21_South_EventScript_1ABA2F", + "flag": "0" + }, + { + "graphics_id": "43", + "x": 15, + "y": 24, + "elevation": 1, + "movement_type": "14", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route21_South_EventScript_1ABAAB", + "flag": "0" + }, + { + "graphics_id": "43", + "x": 15, + "y": 38, + "elevation": 1, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route21_South_EventScript_1ABAE9", + "flag": "0" + }, + { + "graphics_id": "43", + "x": 10, + "y": 29, + "elevation": 1, + "movement_type": "2", + "movement_range_x": 2, + "movement_range_y": 2, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route21_South_EventScript_1ABB27", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/Route22/connections.inc b/data/maps/Route22/connections.inc deleted file mode 100644 index f9c5a939b..000000000 --- a/data/maps/Route22/connections.inc +++ /dev/null @@ -1,7 +0,0 @@ -Route22_MapConnectionsList: @ 8352CA8 - connection up, 0, MAP_ROUTE23 - connection right, -10, MAP_VIRIDIAN_CITY - -Route22_MapConnections:: @ 8352CC0 - .4byte 2 - .4byte Route22_MapConnectionsList diff --git a/data/maps/Route22/events.inc b/data/maps/Route22/events.inc deleted file mode 100644 index 76c259321..000000000 --- a/data/maps/Route22/events.inc +++ /dev/null @@ -1,20 +0,0 @@ -Route22_EventObjects: - object_event 1, 72, 0, 25, 0, 4, 0, 3, 10, 17, 0, 0, 0, 0, 0, 0x0, 79, 0, 0 - -Route22_MapWarps: - warp_def 8, 5, 0, 2, 7168 - warp_def 9, 5, 0, 2, 7168 - -Route22_MapCoordEvents: - coord_event 33, 4, 3, 0, 16468, 1, 0, Route22_EventScript_16828C - coord_event 33, 5, 3, 0, 16468, 1, 0, Route22_EventScript_168298 - coord_event 33, 6, 0, 0, 16468, 1, 0, Route22_EventScript_1682AB - coord_event 33, 4, 3, 0, 16468, 3, 0, Route22_EventScript_1683ED - coord_event 33, 5, 3, 0, 16468, 3, 0, Route22_EventScript_1683F9 - coord_event 33, 6, 0, 0, 16468, 3, 0, Route22_EventScript_16840C - -Route22_MapBGEvents: - bg_event 7, 12, 0, 0, 0, Route22_EventScript_1684E2 - -Route22_MapEvents:: - map_events Route22_EventObjects, Route22_MapWarps, Route22_MapCoordEvents, Route22_MapBGEvents diff --git a/data/maps/Route22/header.inc b/data/maps/Route22/header.inc deleted file mode 100644 index 70942583f..000000000 --- a/data/maps/Route22/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route22:: @ 8350A94 - .4byte Route22_Layout @ 0x82F6840 - .4byte Route22_MapEvents @ 0x83B7F18 - .4byte Route22_MapScripts @ 0x816828B - .4byte Route22_MapConnections @ 0x8352CC0 - .2byte BGM_FRLG_ROUTE_3 - .2byte 110 - .byte 0x7a, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/Route22/map.json b/data/maps/Route22/map.json new file mode 100644 index 000000000..2acb37549 --- /dev/null +++ b/data/maps/Route22/map.json @@ -0,0 +1,122 @@ +{ + "id": "MAP_ROUTE22", + "name": "Route22", + "layout": "LAYOUT_ROUTE22", + "music": "BGM_FRLG_ROUTE_3", + "region_map_section": "MAPSEC_ROUTE_22", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_3", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_ROUTE23", + "offset": 0, + "direction": "up" + }, + { + "map": "MAP_VIRIDIAN_CITY", + "offset": -10, + "direction": "right" + } + ], + "object_events": [ + { + "graphics_id": "72", + "x": 25, + "y": 4, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "79" + } + ], + "warp_events": [ + { + "x": 8, + "y": 5, + "elevation": 0, + "dest_map": "MAP_ROUTE22_NORTH_ENTRANCE", + "dest_warp_id": 2 + }, + { + "x": 9, + "y": 5, + "elevation": 0, + "dest_map": "MAP_ROUTE22_NORTH_ENTRANCE", + "dest_warp_id": 2 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 33, + "y": 4, + "elevation": 3, + "var": "VAR_0x4054", + "var_value": 1, + "script": "Route22_EventScript_16828C" + }, + { + "type": "trigger", + "x": 33, + "y": 5, + "elevation": 3, + "var": "VAR_0x4054", + "var_value": 1, + "script": "Route22_EventScript_168298" + }, + { + "type": "trigger", + "x": 33, + "y": 6, + "elevation": 0, + "var": "VAR_0x4054", + "var_value": 1, + "script": "Route22_EventScript_1682AB" + }, + { + "type": "trigger", + "x": 33, + "y": 4, + "elevation": 3, + "var": "VAR_0x4054", + "var_value": 3, + "script": "Route22_EventScript_1683ED" + }, + { + "type": "trigger", + "x": 33, + "y": 5, + "elevation": 3, + "var": "VAR_0x4054", + "var_value": 3, + "script": "Route22_EventScript_1683F9" + }, + { + "type": "trigger", + "x": 33, + "y": 6, + "elevation": 0, + "var": "VAR_0x4054", + "var_value": 3, + "script": "Route22_EventScript_16840C" + } + ], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 7, + "y": 12, + "elevation": 0, + "script": "Route22_EventScript_1684E2" + } + ] +}
\ No newline at end of file diff --git a/data/maps/Route22_NorthEntrance/events.inc b/data/maps/Route22_NorthEntrance/events.inc deleted file mode 100644 index 1e37f8e7c..000000000 --- a/data/maps/Route22_NorthEntrance/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -Route22_NorthEntrance_EventObjects: - object_event 1, 60, 0, 8, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route22_NorthEntrance_EventScript_1704FC, 0, 0, 0 - -Route22_NorthEntrance_MapWarps: - warp_def 7, 1, 3, 2, 810 - warp_def 6, 10, 3, 0, 809 - warp_def 7, 10, 3, 0, 809 - warp_def 8, 10, 3, 0, 809 - -Route22_NorthEntrance_MapCoordEvents: - coord_event 7, 2, 3, 0, 16479, 0, 0, Route22_NorthEntrance_EventScript_17050D - -Route22_NorthEntrance_MapEvents:: - map_events Route22_NorthEntrance_EventObjects, Route22_NorthEntrance_MapWarps, Route22_NorthEntrance_MapCoordEvents, 0x0 diff --git a/data/maps/Route22_NorthEntrance/header.inc b/data/maps/Route22_NorthEntrance/header.inc deleted file mode 100644 index 3f7b86142..000000000 --- a/data/maps/Route22_NorthEntrance/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route22_NorthEntrance:: @ 8351A54 - .4byte Route22_NorthEntrance_Layout @ 0x8320B1C - .4byte Route22_NorthEntrance_MapEvents @ 0x83BDF8C - .4byte Route22_NorthEntrance_MapScripts @ 0x81704FB - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_FOREST - .2byte 222 - .byte 0x7a, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/Route22_NorthEntrance/map.json b/data/maps/Route22_NorthEntrance/map.json new file mode 100644 index 000000000..e68b94f7c --- /dev/null +++ b/data/maps/Route22_NorthEntrance/map.json @@ -0,0 +1,72 @@ +{ + "id": "MAP_ROUTE22_NORTH_ENTRANCE", + "name": "Route22_NorthEntrance", + "layout": "LAYOUT_ROUTE22_NORTH_ENTRANCE", + "music": "BGM_FRLG_VIRIDIAN_FOREST", + "region_map_section": "MAPSEC_ROUTE_22", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "60", + "x": 8, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route22_NorthEntrance_EventScript_1704FC", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 7, + "y": 1, + "elevation": 3, + "dest_map": "MAP_ROUTE23", + "dest_warp_id": 2 + }, + { + "x": 6, + "y": 10, + "elevation": 3, + "dest_map": "MAP_ROUTE22", + "dest_warp_id": 0 + }, + { + "x": 7, + "y": 10, + "elevation": 3, + "dest_map": "MAP_ROUTE22", + "dest_warp_id": 0 + }, + { + "x": 8, + "y": 10, + "elevation": 3, + "dest_map": "MAP_ROUTE22", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 7, + "y": 2, + "elevation": 3, + "var": "VAR_0x405F", + "var_value": 0, + "script": "Route22_NorthEntrance_EventScript_17050D" + } + ], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/Route23/connections.inc b/data/maps/Route23/connections.inc deleted file mode 100644 index 9b052d1c7..000000000 --- a/data/maps/Route23/connections.inc +++ /dev/null @@ -1,7 +0,0 @@ -Route23_MapConnectionsList: @ 8352CC8 - connection up, 0, MAP_INDIGO_PLATEAU_EXTERIOR - connection down, 0, MAP_ROUTE22 - -Route23_MapConnections:: @ 8352CE0 - .4byte 2 - .4byte Route23_MapConnectionsList diff --git a/data/maps/Route23/events.inc b/data/maps/Route23/events.inc deleted file mode 100644 index 1ae156d8f..000000000 --- a/data/maps/Route23/events.inc +++ /dev/null @@ -1,72 +0,0 @@ -Route23_EventObjects: - object_event 1, 60, 0, 15, 0, 149, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route23_EventScript_16850C, 0, 0, 0 - object_event 2, 60, 0, 8, 0, 140, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route23_EventScript_16851D, 0, 0, 0 - object_event 3, 60, 0, 14, 0, 123, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route23_EventScript_16852E, 0, 0, 0 - object_event 4, 60, 0, 16, 0, 112, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route23_EventScript_16853F, 0, 0, 0 - object_event 5, 60, 0, 10, 0, 94, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route23_EventScript_168550, 0, 0, 0 - object_event 6, 60, 0, 14, 0, 61, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route23_EventScript_168561, 0, 0, 0 - object_event 7, 60, 0, 6, 0, 35, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route23_EventScript_168572, 0, 0, 0 - -Route23_MapWarps: - warp_def 5, 28, 3, 1, 295 - warp_def 18, 28, 3, 6, 296 - warp_def 8, 153, 3, 0, 7168 - warp_def 9, 154, 0, 0, 7168 - -Route23_MapCoordEvents: - coord_event 13, 149, 3, 0, 16479, 1, 0, Route23_EventScript_168583 - coord_event 7, 140, 3, 0, 16479, 2, 0, Route23_EventScript_168598 - coord_event 12, 123, 3, 0, 16479, 3, 0, Route23_EventScript_1685AD - coord_event 11, 111, 0, 0, 16479, 4, 0, Route23_EventScript_1685C2 - coord_event 9, 94, 1, 0, 16479, 5, 0, Route23_EventScript_1685D7 - coord_event 12, 61, 3, 0, 16479, 6, 0, Route23_EventScript_1685EC - coord_event 1, 35, 0, 0, 16479, 7, 0, Route23_EventScript_168601 - coord_event 1, 34, 0, 0, 16479, 7, 0, Route23_EventScript_168601 - coord_event 1, 32, 3, 0, 16479, 7, 0, Route23_EventScript_168601 - coord_event 1, 33, 0, 0, 16479, 7, 0, Route23_EventScript_168601 - coord_event 1, 31, 0, 0, 16479, 7, 0, Route23_EventScript_168601 - coord_event 1, 36, 0, 0, 16479, 7, 0, Route23_EventScript_168601 - coord_event 5, 35, 3, 0, 16479, 7, 0, Route23_EventScript_168601 - coord_event 4, 35, 3, 0, 16479, 7, 0, Route23_EventScript_168601 - coord_event 10, 60, 0, 0, 16479, 6, 0, Route23_EventScript_1685EC - coord_event 13, 61, 3, 0, 16479, 6, 0, Route23_EventScript_1685EC - coord_event 11, 60, 0, 0, 16479, 6, 0, Route23_EventScript_1685EC - coord_event 8, 94, 1, 0, 16479, 5, 0, Route23_EventScript_1685D7 - coord_event 5, 92, 1, 0, 16479, 5, 0, Route23_EventScript_1685D7 - coord_event 7, 94, 1, 0, 16479, 5, 0, Route23_EventScript_1685D7 - coord_event 4, 92, 1, 0, 16479, 5, 0, Route23_EventScript_1685D7 - coord_event 3, 92, 1, 0, 16479, 5, 0, Route23_EventScript_1685D7 - coord_event 2, 92, 1, 0, 16479, 5, 0, Route23_EventScript_1685D7 - coord_event 4, 139, 0, 0, 16479, 2, 0, Route23_EventScript_168598 - coord_event 5, 139, 0, 0, 16479, 2, 0, Route23_EventScript_168598 - coord_event 6, 140, 3, 0, 16479, 2, 0, Route23_EventScript_168598 - coord_event 10, 122, 0, 0, 16479, 3, 0, Route23_EventScript_1685AD - coord_event 11, 122, 0, 0, 16479, 3, 0, Route23_EventScript_1685AD - coord_event 13, 123, 3, 0, 16479, 3, 0, Route23_EventScript_1685AD - coord_event 8, 109, 1, 0, 16479, 4, 0, Route23_EventScript_1685C2 - coord_event 9, 109, 1, 0, 16479, 4, 0, Route23_EventScript_1685C2 - coord_event 10, 109, 1, 0, 16479, 4, 0, Route23_EventScript_1685C2 - coord_event 11, 109, 1, 0, 16479, 4, 0, Route23_EventScript_1685C2 - coord_event 12, 109, 1, 0, 16479, 4, 0, Route23_EventScript_1685C2 - coord_event 12, 111, 0, 0, 16479, 4, 0, Route23_EventScript_1685C2 - coord_event 14, 112, 1, 0, 16479, 4, 0, Route23_EventScript_1685C2 - coord_event 13, 112, 1, 0, 16479, 4, 0, Route23_EventScript_1685C2 - coord_event 15, 112, 1, 0, 16479, 4, 0, Route23_EventScript_1685C2 - coord_event 12, 148, 0, 0, 16479, 1, 0, Route23_EventScript_168583 - coord_event 11, 148, 0, 0, 16479, 1, 0, Route23_EventScript_168583 - coord_event 14, 149, 3, 0, 16479, 1, 0, Route23_EventScript_168583 - coord_event 10, 148, 0, 0, 16479, 1, 0, Route23_EventScript_168583 - -Route23_MapBGEvents: - bg_event 19, 42, 0, 7, 0, 19, 34, 1 - bg_event 20, 72, 0, 7, 0, 2, 35, 1 - bg_event 11, 101, 3, 7, 0, 35, 36, 1 - bg_event 3, 18, 3, 7, 0, 141, 145, 1 - bg_event 2, 29, 3, 7, 0, 142, 146, 1 - bg_event 10, 67, 3, 7, 0, 137, 147, 1 - bg_event 3, 128, 3, 7, 0, 138, 148, 1 - bg_event 9, 8, 3, 7, 0, 37, 155, 1 - bg_event 3, 31, 0, 0, 0, Route23_EventScript_168616 - -Route23_MapEvents:: - map_events Route23_EventObjects, Route23_MapWarps, Route23_MapCoordEvents, Route23_MapBGEvents diff --git a/data/maps/Route23/header.inc b/data/maps/Route23/header.inc deleted file mode 100644 index 2a6fa4b27..000000000 --- a/data/maps/Route23/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route23:: @ 8350AB0 - .4byte Route23_Layout @ 0x82F8664 - .4byte Route23_MapEvents @ 0x83B8300 - .4byte Route23_MapScripts @ 0x81684EB - .4byte Route23_MapConnections @ 0x8352CE0 - .2byte BGM_FRLG_INDIGO_PLATEAU - .2byte 111 - .byte 0x7b, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/Route23/map.json b/data/maps/Route23/map.json new file mode 100644 index 000000000..924371f26 --- /dev/null +++ b/data/maps/Route23/map.json @@ -0,0 +1,610 @@ +{ + "id": "MAP_ROUTE23", + "name": "Route23", + "layout": "LAYOUT_ROUTE23", + "music": "BGM_FRLG_INDIGO_PLATEAU", + "region_map_section": "MAPSEC_ROUTE_23", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_3", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_INDIGO_PLATEAU_EXTERIOR", + "offset": 0, + "direction": "up" + }, + { + "map": "MAP_ROUTE22", + "offset": 0, + "direction": "down" + } + ], + "object_events": [ + { + "graphics_id": "60", + "x": 15, + "y": 149, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route23_EventScript_16850C", + "flag": "0" + }, + { + "graphics_id": "60", + "x": 8, + "y": 140, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route23_EventScript_16851D", + "flag": "0" + }, + { + "graphics_id": "60", + "x": 14, + "y": 123, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route23_EventScript_16852E", + "flag": "0" + }, + { + "graphics_id": "60", + "x": 16, + "y": 112, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route23_EventScript_16853F", + "flag": "0" + }, + { + "graphics_id": "60", + "x": 10, + "y": 94, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route23_EventScript_168550", + "flag": "0" + }, + { + "graphics_id": "60", + "x": 14, + "y": 61, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route23_EventScript_168561", + "flag": "0" + }, + { + "graphics_id": "60", + "x": 6, + "y": 35, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route23_EventScript_168572", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 5, + "y": 28, + "elevation": 3, + "dest_map": "MAP_VICTORY_ROAD_1F", + "dest_warp_id": 1 + }, + { + "x": 18, + "y": 28, + "elevation": 3, + "dest_map": "MAP_VICTORY_ROAD_2F", + "dest_warp_id": 6 + }, + { + "x": 8, + "y": 153, + "elevation": 3, + "dest_map": "MAP_ROUTE22_NORTH_ENTRANCE", + "dest_warp_id": 0 + }, + { + "x": 9, + "y": 154, + "elevation": 0, + "dest_map": "MAP_ROUTE22_NORTH_ENTRANCE", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 13, + "y": 149, + "elevation": 3, + "var": "VAR_0x405F", + "var_value": 1, + "script": "Route23_EventScript_168583" + }, + { + "type": "trigger", + "x": 7, + "y": 140, + "elevation": 3, + "var": "VAR_0x405F", + "var_value": 2, + "script": "Route23_EventScript_168598" + }, + { + "type": "trigger", + "x": 12, + "y": 123, + "elevation": 3, + "var": "VAR_0x405F", + "var_value": 3, + "script": "Route23_EventScript_1685AD" + }, + { + "type": "trigger", + "x": 11, + "y": 111, + "elevation": 0, + "var": "VAR_0x405F", + "var_value": 4, + "script": "Route23_EventScript_1685C2" + }, + { + "type": "trigger", + "x": 9, + "y": 94, + "elevation": 1, + "var": "VAR_0x405F", + "var_value": 5, + "script": "Route23_EventScript_1685D7" + }, + { + "type": "trigger", + "x": 12, + "y": 61, + "elevation": 3, + "var": "VAR_0x405F", + "var_value": 6, + "script": "Route23_EventScript_1685EC" + }, + { + "type": "trigger", + "x": 1, + "y": 35, + "elevation": 0, + "var": "VAR_0x405F", + "var_value": 7, + "script": "Route23_EventScript_168601" + }, + { + "type": "trigger", + "x": 1, + "y": 34, + "elevation": 0, + "var": "VAR_0x405F", + "var_value": 7, + "script": "Route23_EventScript_168601" + }, + { + "type": "trigger", + "x": 1, + "y": 32, + "elevation": 3, + "var": "VAR_0x405F", + "var_value": 7, + "script": "Route23_EventScript_168601" + }, + { + "type": "trigger", + "x": 1, + "y": 33, + "elevation": 0, + "var": "VAR_0x405F", + "var_value": 7, + "script": "Route23_EventScript_168601" + }, + { + "type": "trigger", + "x": 1, + "y": 31, + "elevation": 0, + "var": "VAR_0x405F", + "var_value": 7, + "script": "Route23_EventScript_168601" + }, + { + "type": "trigger", + "x": 1, + "y": 36, + "elevation": 0, + "var": "VAR_0x405F", + "var_value": 7, + "script": "Route23_EventScript_168601" + }, + { + "type": "trigger", + "x": 5, + "y": 35, + "elevation": 3, + "var": "VAR_0x405F", + "var_value": 7, + "script": "Route23_EventScript_168601" + }, + { + "type": "trigger", + "x": 4, + "y": 35, + "elevation": 3, + "var": "VAR_0x405F", + "var_value": 7, + "script": "Route23_EventScript_168601" + }, + { + "type": "trigger", + "x": 10, + "y": 60, + "elevation": 0, + "var": "VAR_0x405F", + "var_value": 6, + "script": "Route23_EventScript_1685EC" + }, + { + "type": "trigger", + "x": 13, + "y": 61, + "elevation": 3, + "var": "VAR_0x405F", + "var_value": 6, + "script": "Route23_EventScript_1685EC" + }, + { + "type": "trigger", + "x": 11, + "y": 60, + "elevation": 0, + "var": "VAR_0x405F", + "var_value": 6, + "script": "Route23_EventScript_1685EC" + }, + { + "type": "trigger", + "x": 8, + "y": 94, + "elevation": 1, + "var": "VAR_0x405F", + "var_value": 5, + "script": "Route23_EventScript_1685D7" + }, + { + "type": "trigger", + "x": 5, + "y": 92, + "elevation": 1, + "var": "VAR_0x405F", + "var_value": 5, + "script": "Route23_EventScript_1685D7" + }, + { + "type": "trigger", + "x": 7, + "y": 94, + "elevation": 1, + "var": "VAR_0x405F", + "var_value": 5, + "script": "Route23_EventScript_1685D7" + }, + { + "type": "trigger", + "x": 4, + "y": 92, + "elevation": 1, + "var": "VAR_0x405F", + "var_value": 5, + "script": "Route23_EventScript_1685D7" + }, + { + "type": "trigger", + "x": 3, + "y": 92, + "elevation": 1, + "var": "VAR_0x405F", + "var_value": 5, + "script": "Route23_EventScript_1685D7" + }, + { + "type": "trigger", + "x": 2, + "y": 92, + "elevation": 1, + "var": "VAR_0x405F", + "var_value": 5, + "script": "Route23_EventScript_1685D7" + }, + { + "type": "trigger", + "x": 4, + "y": 139, + "elevation": 0, + "var": "VAR_0x405F", + "var_value": 2, + "script": "Route23_EventScript_168598" + }, + { + "type": "trigger", + "x": 5, + "y": 139, + "elevation": 0, + "var": "VAR_0x405F", + "var_value": 2, + "script": "Route23_EventScript_168598" + }, + { + "type": "trigger", + "x": 6, + "y": 140, + "elevation": 3, + "var": "VAR_0x405F", + "var_value": 2, + "script": "Route23_EventScript_168598" + }, + { + "type": "trigger", + "x": 10, + "y": 122, + "elevation": 0, + "var": "VAR_0x405F", + "var_value": 3, + "script": "Route23_EventScript_1685AD" + }, + { + "type": "trigger", + "x": 11, + "y": 122, + "elevation": 0, + "var": "VAR_0x405F", + "var_value": 3, + "script": "Route23_EventScript_1685AD" + }, + { + "type": "trigger", + "x": 13, + "y": 123, + "elevation": 3, + "var": "VAR_0x405F", + "var_value": 3, + "script": "Route23_EventScript_1685AD" + }, + { + "type": "trigger", + "x": 8, + "y": 109, + "elevation": 1, + "var": "VAR_0x405F", + "var_value": 4, + "script": "Route23_EventScript_1685C2" + }, + { + "type": "trigger", + "x": 9, + "y": 109, + "elevation": 1, + "var": "VAR_0x405F", + "var_value": 4, + "script": "Route23_EventScript_1685C2" + }, + { + "type": "trigger", + "x": 10, + "y": 109, + "elevation": 1, + "var": "VAR_0x405F", + "var_value": 4, + "script": "Route23_EventScript_1685C2" + }, + { + "type": "trigger", + "x": 11, + "y": 109, + "elevation": 1, + "var": "VAR_0x405F", + "var_value": 4, + "script": "Route23_EventScript_1685C2" + }, + { + "type": "trigger", + "x": 12, + "y": 109, + "elevation": 1, + "var": "VAR_0x405F", + "var_value": 4, + "script": "Route23_EventScript_1685C2" + }, + { + "type": "trigger", + "x": 12, + "y": 111, + "elevation": 0, + "var": "VAR_0x405F", + "var_value": 4, + "script": "Route23_EventScript_1685C2" + }, + { + "type": "trigger", + "x": 14, + "y": 112, + "elevation": 1, + "var": "VAR_0x405F", + "var_value": 4, + "script": "Route23_EventScript_1685C2" + }, + { + "type": "trigger", + "x": 13, + "y": 112, + "elevation": 1, + "var": "VAR_0x405F", + "var_value": 4, + "script": "Route23_EventScript_1685C2" + }, + { + "type": "trigger", + "x": 15, + "y": 112, + "elevation": 1, + "var": "VAR_0x405F", + "var_value": 4, + "script": "Route23_EventScript_1685C2" + }, + { + "type": "trigger", + "x": 12, + "y": 148, + "elevation": 0, + "var": "VAR_0x405F", + "var_value": 1, + "script": "Route23_EventScript_168583" + }, + { + "type": "trigger", + "x": 11, + "y": 148, + "elevation": 0, + "var": "VAR_0x405F", + "var_value": 1, + "script": "Route23_EventScript_168583" + }, + { + "type": "trigger", + "x": 14, + "y": 149, + "elevation": 3, + "var": "VAR_0x405F", + "var_value": 1, + "script": "Route23_EventScript_168583" + }, + { + "type": "trigger", + "x": 10, + "y": 148, + "elevation": 0, + "var": "VAR_0x405F", + "var_value": 1, + "script": "Route23_EventScript_168583" + } + ], + "bg_events": [ + { + "type": "hidden_item", + "x": 19, + "y": 42, + "elevation": 0, + "item": "ITEM_FULL_RESTORE", + "flag": "34", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 20, + "y": 72, + "elevation": 0, + "item": "POCKET_KEY_ITEMS", + "flag": "35", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 11, + "y": 101, + "elevation": 3, + "item": "ITEM_MAX_ETHER", + "flag": "36", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 3, + "y": 18, + "elevation": 3, + "item": "ITEM_LUM_BERRY", + "flag": "145", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 2, + "y": 29, + "elevation": 3, + "item": "ITEM_SITRUS_BERRY", + "flag": "146", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 10, + "y": 67, + "elevation": 3, + "item": "ITEM_ASPEAR_BERRY", + "flag": "147", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 3, + "y": 128, + "elevation": 3, + "item": "ITEM_LEPPA_BERRY", + "flag": "148", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 9, + "y": 8, + "elevation": 3, + "item": "ITEM_MAX_ELIXIR", + "flag": "155", + "unknown": 1 + }, + { + "type": "bg_event_type_0", + "x": 3, + "y": 31, + "elevation": 0, + "script": "Route23_EventScript_168616" + } + ] +}
\ No newline at end of file diff --git a/data/maps/Route24/connections.inc b/data/maps/Route24/connections.inc deleted file mode 100644 index a255e904a..000000000 --- a/data/maps/Route24/connections.inc +++ /dev/null @@ -1,7 +0,0 @@ -Route24_MapConnectionsList: @ 8352CE8 - connection down, -12, MAP_CERULEAN_CITY - connection right, 0, MAP_ROUTE25 - -Route24_MapConnections:: @ 8352D00 - .4byte 2 - .4byte Route24_MapConnectionsList diff --git a/data/maps/Route24/events.inc b/data/maps/Route24/events.inc deleted file mode 100644 index 701cc2b25..000000000 --- a/data/maps/Route24/events.inc +++ /dev/null @@ -1,19 +0,0 @@ -Route24_EventObjects: - object_event 1, 25, 0, 12, 0, 15, 0, 3, 9, 17, 0, 0, 0, 0, 0, Route24_EventScript_168620, 49, 0, 0 - object_event 2, 39, 0, 12, 0, 19, 0, 3, 9, 17, 0, 1, 0, 2, 0, Route24_EventScript_1A972D, 0, 0, 0 - object_event 3, 22, 0, 10, 0, 22, 0, 3, 10, 17, 0, 1, 0, 2, 0, Route24_EventScript_1A9673, 0, 0, 0 - object_event 4, 18, 0, 12, 0, 25, 0, 3, 9, 17, 0, 1, 0, 2, 0, Route24_EventScript_1A95F7, 0, 0, 0 - object_event 5, 22, 0, 10, 0, 28, 0, 3, 10, 17, 0, 1, 0, 2, 0, Route24_EventScript_1A96B1, 0, 0, 0 - object_event 6, 20, 0, 12, 0, 31, 0, 3, 9, 17, 0, 1, 0, 2, 0, Route24_EventScript_1A9635, 0, 0, 0 - object_event 7, 39, 0, 5, 0, 21, 0, 3, 7, 17, 0, 1, 0, 5, 0, Route24_EventScript_1A96EF, 0, 0, 0 - object_event 8, 92, 0, 11, 0, 4, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route24_EventScript_1BE644, 354, 0, 0 - -Route24_MapCoordEvents: - coord_event 10, 15, 3, 0, 16491, 0, 0, Route24_EventScript_168660 - coord_event 11, 15, 3, 0, 16491, 0, 0, Route24_EventScript_16866C - -Route24_MapBGEvents: - bg_event 19, 4, 3, 7, 0, 135, 115, 1 - -Route24_MapEvents:: - map_events Route24_EventObjects, 0x0, Route24_MapCoordEvents, Route24_MapBGEvents diff --git a/data/maps/Route24/header.inc b/data/maps/Route24/header.inc deleted file mode 100644 index 298826eef..000000000 --- a/data/maps/Route24/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route24:: @ 8350ACC - .4byte Route24_Layout @ 0x82F8E08 - .4byte Route24_MapEvents @ 0x83B8400 - .4byte Route24_MapScripts @ 0x816861F - .4byte Route24_MapConnections @ 0x8352D00 - .2byte BGM_FRLG_ROUTE_24 - .2byte 112 - .byte 0x7c, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/Route24/map.json b/data/maps/Route24/map.json new file mode 100644 index 000000000..edc86edb8 --- /dev/null +++ b/data/maps/Route24/map.json @@ -0,0 +1,164 @@ +{ + "id": "MAP_ROUTE24", + "name": "Route24", + "layout": "LAYOUT_ROUTE24", + "music": "BGM_FRLG_ROUTE_24", + "region_map_section": "MAPSEC_ROUTE_24", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_3", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_CERULEAN_CITY", + "offset": -12, + "direction": "down" + }, + { + "map": "MAP_ROUTE25", + "offset": 0, + "direction": "right" + } + ], + "object_events": [ + { + "graphics_id": "25", + "x": 12, + "y": 15, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route24_EventScript_168620", + "flag": "49" + }, + { + "graphics_id": "39", + "x": 12, + "y": 19, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route24_EventScript_1A972D", + "flag": "0" + }, + { + "graphics_id": "22", + "x": 10, + "y": 22, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route24_EventScript_1A9673", + "flag": "0" + }, + { + "graphics_id": "18", + "x": 12, + "y": 25, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route24_EventScript_1A95F7", + "flag": "0" + }, + { + "graphics_id": "22", + "x": 10, + "y": 28, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route24_EventScript_1A96B1", + "flag": "0" + }, + { + "graphics_id": "20", + "x": 12, + "y": 31, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route24_EventScript_1A9635", + "flag": "0" + }, + { + "graphics_id": "39", + "x": 5, + "y": 21, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "Route24_EventScript_1A96EF", + "flag": "0" + }, + { + "graphics_id": "92", + "x": 11, + "y": 4, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route24_EventScript_1BE644", + "flag": "354" + } + ], + "warp_events": [], + "coord_events": [ + { + "type": "trigger", + "x": 10, + "y": 15, + "elevation": 3, + "var": "VAR_0x406B", + "var_value": 0, + "script": "Route24_EventScript_168660" + }, + { + "type": "trigger", + "x": 11, + "y": 15, + "elevation": 3, + "var": "VAR_0x406B", + "var_value": 0, + "script": "Route24_EventScript_16866C" + } + ], + "bg_events": [ + { + "type": "hidden_item", + "x": 19, + "y": 4, + "elevation": 3, + "item": "ITEM_PECHA_BERRY", + "flag": "115", + "unknown": 1 + } + ] +}
\ No newline at end of file diff --git a/data/maps/Route25/connections.inc b/data/maps/Route25/connections.inc deleted file mode 100644 index b7b963790..000000000 --- a/data/maps/Route25/connections.inc +++ /dev/null @@ -1,6 +0,0 @@ -Route25_MapConnectionsList: @ 8352D08 - connection left, 0, MAP_ROUTE24 - -Route25_MapConnections:: @ 8352D14 - .4byte 1 - .4byte Route25_MapConnectionsList diff --git a/data/maps/Route25/events.inc b/data/maps/Route25/events.inc deleted file mode 100644 index e4085c154..000000000 --- a/data/maps/Route25/events.inc +++ /dev/null @@ -1,27 +0,0 @@ -Route25_EventObjects: - object_event 1, 56, 0, 11, 0, 4, 0, 3, 10, 17, 0, 1, 0, 4, 0, Route25_EventScript_1A98A1, 0, 0, 0 - object_event 2, 18, 0, 18, 0, 2, 0, 3, 8, 17, 0, 1, 0, 2, 0, Route25_EventScript_1A976B, 0, 0, 0 - object_event 3, 56, 0, 17, 0, 7, 0, 3, 10, 17, 0, 1, 0, 2, 0, Route25_EventScript_1A991D, 0, 0, 0 - object_event 4, 18, 0, 22, 0, 4, 0, 3, 1, 17, 0, 1, 0, 2, 0, Route25_EventScript_1A97A9, 0, 0, 0 - object_event 5, 40, 0, 22, 0, 8, 0, 3, 10, 17, 0, 1, 0, 2, 0, Route25_EventScript_1A9825, 0, 0, 0 - object_event 6, 56, 0, 27, 0, 9, 0, 3, 7, 17, 0, 1, 0, 3, 0, Route25_EventScript_1A98DF, 0, 0, 0 - object_event 7, 39, 0, 28, 0, 4, 0, 3, 8, 17, 0, 1, 0, 3, 0, Route25_EventScript_1A995B, 0, 0, 0 - object_event 8, 18, 0, 36, 0, 4, 0, 3, 26, 49, 0, 1, 0, 2, 0, Route25_EventScript_1A97E7, 0, 0, 0 - object_event 9, 22, 0, 42, 0, 5, 0, 3, 8, 17, 0, 1, 0, 3, 0, Route25_EventScript_1A9863, 0, 0, 0 - object_event 10, 92, 0, 26, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route25_EventScript_1BE651, 355, 0, 0 - object_event 11, 95, 0, 30, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route25_EventScript_1BDF13, 18, 0, 0 - object_event 12, 29, 0, 49, 0, 10, 0, 3, 9, 17, 0, 0, 0, 0, 0, Route25_EventScript_1ACE4F, 0, 0, 0 - object_event 13, 25, 0, 49, 0, 11, 0, 3, 9, 17, 0, 0, 0, 0, 0, Route25_EventScript_16874F, 0, 0, 0 - -Route25_MapWarps: - warp_def 51, 4, 0, 1, 7680 - -Route25_MapBGEvents: - bg_event 48, 4, 0, 0, 0, Route25_EventScript_168746 - bg_event 14, 2, 3, 7, 0, 36, 4, 1 - bg_event 58, 6, 3, 7, 0, 34, 5, 1 - bg_event 33, 8, 3, 7, 0, 139, 116, 1 - bg_event 40, 3, 3, 7, 0, 149, 117, 1 - -Route25_MapEvents:: - map_events Route25_EventObjects, Route25_MapWarps, 0x0, Route25_MapBGEvents diff --git a/data/maps/Route25/header.inc b/data/maps/Route25/header.inc deleted file mode 100644 index f4525d40e..000000000 --- a/data/maps/Route25/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route25:: @ 8350AE8 - .4byte Route25_Layout @ 0x82F996C - .4byte Route25_MapEvents @ 0x83B8590 - .4byte Route25_MapScripts @ 0x8168745 - .4byte Route25_MapConnections @ 0x8352D14 - .2byte BGM_FRLG_ROUTE_24 - .2byte 113 - .byte 0x7d, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/Route25/map.json b/data/maps/Route25/map.json new file mode 100644 index 000000000..4e6baf2be --- /dev/null +++ b/data/maps/Route25/map.json @@ -0,0 +1,247 @@ +{ + "id": "MAP_ROUTE25", + "name": "Route25", + "layout": "LAYOUT_ROUTE25", + "music": "BGM_FRLG_ROUTE_24", + "region_map_section": "MAPSEC_ROUTE_25", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_3", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_ROUTE24", + "offset": 0, + "direction": "left" + } + ], + "object_events": [ + { + "graphics_id": "56", + "x": 11, + "y": 4, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route25_EventScript_1A98A1", + "flag": "0" + }, + { + "graphics_id": "18", + "x": 18, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route25_EventScript_1A976B", + "flag": "0" + }, + { + "graphics_id": "56", + "x": 17, + "y": 7, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route25_EventScript_1A991D", + "flag": "0" + }, + { + "graphics_id": "18", + "x": 22, + "y": 4, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route25_EventScript_1A97A9", + "flag": "0" + }, + { + "graphics_id": "40", + "x": 22, + "y": 8, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route25_EventScript_1A9825", + "flag": "0" + }, + { + "graphics_id": "56", + "x": 27, + "y": 9, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route25_EventScript_1A98DF", + "flag": "0" + }, + { + "graphics_id": "39", + "x": 28, + "y": 4, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route25_EventScript_1A995B", + "flag": "0" + }, + { + "graphics_id": "18", + "x": 36, + "y": 4, + "elevation": 3, + "movement_type": "26", + "movement_range_x": 1, + "movement_range_y": 3, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route25_EventScript_1A97E7", + "flag": "0" + }, + { + "graphics_id": "22", + "x": 42, + "y": 5, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route25_EventScript_1A9863", + "flag": "0" + }, + { + "graphics_id": "92", + "x": 26, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route25_EventScript_1BE651", + "flag": "355" + }, + { + "graphics_id": "95", + "x": 30, + "y": 3, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route25_EventScript_1BDF13", + "flag": "18" + }, + { + "graphics_id": "29", + "x": 49, + "y": 10, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route25_EventScript_1ACE4F", + "flag": "0" + }, + { + "graphics_id": "25", + "x": 49, + "y": 11, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route25_EventScript_16874F", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 51, + "y": 4, + "elevation": 0, + "dest_map": "MAP_ROUTE25_SEA_COTTAGE", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 48, + "y": 4, + "elevation": 0, + "script": "Route25_EventScript_168746" + }, + { + "type": "hidden_item", + "x": 14, + "y": 2, + "elevation": 3, + "item": "ITEM_ELIXIR", + "flag": "4", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 58, + "y": 6, + "elevation": 3, + "item": "ITEM_ETHER", + "flag": "5", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 33, + "y": 8, + "elevation": 3, + "item": "ITEM_ORAN_BERRY", + "flag": "116", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 40, + "y": 3, + "elevation": 3, + "item": "ITEM_BLUK_BERRY", + "flag": "117", + "unknown": 1 + } + ] +}
\ No newline at end of file diff --git a/data/maps/Route25_SeaCottage/events.inc b/data/maps/Route25_SeaCottage/events.inc deleted file mode 100644 index e7a6f4a9c..000000000 --- a/data/maps/Route25_SeaCottage/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -Route25_SeaCottage_EventObjects: - object_event 1, 73, 0, 7, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route25_SeaCottage_EventScript_17054B, 51, 0, 0 - object_event 2, 113, 0, 10, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route25_SeaCottage_EventScript_17054B, 50, 0, 0 - -Route25_SeaCottage_MapWarps: - warp_def 6, 9, 3, 0, 812 - warp_def 7, 9, 3, 0, 812 - warp_def 8, 9, 3, 0, 812 - -Route25_SeaCottage_MapBGEvents: - bg_event 4, 5, 0, 1, 0, Route25_SeaCottage_EventScript_1706DD - -Route25_SeaCottage_MapEvents:: - map_events Route25_SeaCottage_EventObjects, Route25_SeaCottage_MapWarps, 0x0, Route25_SeaCottage_MapBGEvents diff --git a/data/maps/Route25_SeaCottage/header.inc b/data/maps/Route25_SeaCottage/header.inc deleted file mode 100644 index 268e6e59c..000000000 --- a/data/maps/Route25_SeaCottage/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route25_SeaCottage:: @ 8351A8C - .4byte Route25_SeaCottage_Layout @ 0x8319030 - .4byte Route25_SeaCottage_MapEvents @ 0x83BE008 - .4byte Route25_SeaCottage_MapScripts @ 0x8170523 - .4byte NULL - .2byte BGM_FRLG_CERULEAN_CITY - .2byte 169 - .byte 0x7d, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/Route25_SeaCottage/map.json b/data/maps/Route25_SeaCottage/map.json new file mode 100644 index 000000000..62edc1927 --- /dev/null +++ b/data/maps/Route25_SeaCottage/map.json @@ -0,0 +1,76 @@ +{ + "id": "MAP_ROUTE25_SEA_COTTAGE", + "name": "Route25_SeaCottage", + "layout": "LAYOUT_ROUTE25_SEA_COTTAGE", + "music": "BGM_FRLG_CERULEAN_CITY", + "region_map_section": "MAPSEC_ROUTE_25", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "73", + "x": 7, + "y": 5, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route25_SeaCottage_EventScript_17054B", + "flag": "51" + }, + { + "graphics_id": "113", + "x": 10, + "y": 6, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route25_SeaCottage_EventScript_17054B", + "flag": "50" + } + ], + "warp_events": [ + { + "x": 6, + "y": 9, + "elevation": 3, + "dest_map": "MAP_ROUTE25", + "dest_warp_id": 0 + }, + { + "x": 7, + "y": 9, + "elevation": 3, + "dest_map": "MAP_ROUTE25", + "dest_warp_id": 0 + }, + { + "x": 8, + "y": 9, + "elevation": 3, + "dest_map": "MAP_ROUTE25", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_1", + "x": 4, + "y": 5, + "elevation": 0, + "script": "Route25_SeaCottage_EventScript_1706DD" + } + ] +}
\ No newline at end of file diff --git a/data/maps/Route2_EastBuilding/events.inc b/data/maps/Route2_EastBuilding/events.inc deleted file mode 100644 index c50a03aad..000000000 --- a/data/maps/Route2_EastBuilding/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -Route2_EastBuilding_EventObjects: - object_event 1, 55, 0, 4, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route2_EastBuilding_EventScript_16F67F, 0, 0, 0 - object_event 2, 26, 0, 10, 0, 3, 0, 3, 5, 18, 0, 0, 0, 0, 0, Route2_EastBuilding_EventScript_16F714, 0, 0, 0 - -Route2_EastBuilding_MapWarps: - warp_def 6, 10, 0, 5, 788 - warp_def 7, 10, 3, 5, 788 - warp_def 8, 10, 3, 5, 788 - warp_def 7, 1, 3, 6, 788 - -Route2_EastBuilding_MapEvents:: - map_events Route2_EastBuilding_EventObjects, Route2_EastBuilding_MapWarps, 0x0, 0x0 diff --git a/data/maps/Route2_EastBuilding/header.inc b/data/maps/Route2_EastBuilding/header.inc deleted file mode 100644 index 02b30b483..000000000 --- a/data/maps/Route2_EastBuilding/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route2_EastBuilding:: @ 8351798 - .4byte Route2_Entrance_Layout @ 0x8320990 - .4byte Route2_EastBuilding_MapEvents @ 0x83BD43C - .4byte Route2_EastBuilding_MapScripts @ 0x816F67E - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_CITY - .2byte 221 - .byte 0x66, 0x00, 0x00, 0x08, 0x01, 0x02, 0x00, 0x00 diff --git a/data/maps/Route2_EastBuilding/map.json b/data/maps/Route2_EastBuilding/map.json new file mode 100644 index 000000000..97931c051 --- /dev/null +++ b/data/maps/Route2_EastBuilding/map.json @@ -0,0 +1,75 @@ +{ + "id": "MAP_ROUTE2_EAST_BUILDING", + "name": "Route2_EastBuilding", + "layout": "LAYOUT_ROUTE2_ENTRANCE", + "music": "BGM_FRLG_VIRIDIAN_CITY", + "region_map_section": "MAPSEC_ROUTE_2", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 1, + "unknown_19": 2, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "55", + "x": 4, + "y": 6, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route2_EastBuilding_EventScript_16F67F", + "flag": "0" + }, + { + "graphics_id": "26", + "x": 10, + "y": 3, + "elevation": 3, + "movement_type": "5", + "movement_range_x": 2, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route2_EastBuilding_EventScript_16F714", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 6, + "y": 10, + "elevation": 0, + "dest_map": "MAP_ROUTE2", + "dest_warp_id": 5 + }, + { + "x": 7, + "y": 10, + "elevation": 3, + "dest_map": "MAP_ROUTE2", + "dest_warp_id": 5 + }, + { + "x": 8, + "y": 10, + "elevation": 3, + "dest_map": "MAP_ROUTE2", + "dest_warp_id": 5 + }, + { + "x": 7, + "y": 1, + "elevation": 3, + "dest_map": "MAP_ROUTE2", + "dest_warp_id": 6 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/Route2_House/events.inc b/data/maps/Route2_House/events.inc deleted file mode 100644 index e6f06bc09..000000000 --- a/data/maps/Route2_House/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -Route2_House_EventObjects: - object_event 1, 55, 0, 4, 0, 5, 0, 3, 10, 17, 0, 0, 0, 0, 0, Route2_House_EventScript_16F5F9, 0, 0, 0 - object_event 2, 51, 0, 7, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route2_House_EventScript_16F602, 0, 0, 0 - -Route2_House_MapWarps: - warp_def 3, 7, 0, 4, 788 - warp_def 4, 7, 0, 4, 788 - warp_def 5, 7, 0, 4, 788 - -Route2_House_MapEvents:: - map_events Route2_House_EventObjects, Route2_House_MapWarps, 0x0, 0x0 diff --git a/data/maps/Route2_House/header.inc b/data/maps/Route2_House/header.inc deleted file mode 100644 index c04a3439c..000000000 --- a/data/maps/Route2_House/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route2_House:: @ 835177C - .4byte House2_Layout @ 0x82D5840 - .4byte Route2_House_MapEvents @ 0x83BD3D8 - .4byte Route2_House_MapScripts @ 0x816F5F8 - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_CITY - .2byte 7 - .byte 0x66, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/Route2_House/map.json b/data/maps/Route2_House/map.json new file mode 100644 index 000000000..cbb0eb947 --- /dev/null +++ b/data/maps/Route2_House/map.json @@ -0,0 +1,68 @@ +{ + "id": "MAP_ROUTE2_HOUSE", + "name": "Route2_House", + "layout": "LAYOUT_HOUSE2", + "music": "BGM_FRLG_VIRIDIAN_CITY", + "region_map_section": "MAPSEC_ROUTE_2", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "55", + "x": 4, + "y": 5, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route2_House_EventScript_16F5F9", + "flag": "0" + }, + { + "graphics_id": "51", + "x": 7, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route2_House_EventScript_16F602", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 0, + "dest_map": "MAP_ROUTE2", + "dest_warp_id": 4 + }, + { + "x": 4, + "y": 7, + "elevation": 0, + "dest_map": "MAP_ROUTE2", + "dest_warp_id": 4 + }, + { + "x": 5, + "y": 7, + "elevation": 0, + "dest_map": "MAP_ROUTE2", + "dest_warp_id": 4 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/Route2_ViridianForest_NorthEntrance/events.inc b/data/maps/Route2_ViridianForest_NorthEntrance/events.inc deleted file mode 100644 index f7baf4e08..000000000 --- a/data/maps/Route2_ViridianForest_NorthEntrance/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -Route2_ViridianForest_NorthEntrance_EventObjects: - object_event 1, 18, 0, 5, 0, 4, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route2_ViridianForest_NorthEntrance_EventScript_16F71E, 0, 0, 0 - object_event 2, 32, 0, 4, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route2_ViridianForest_NorthEntrance_EventScript_16F727, 0, 0, 0 - object_event 3, 42, 0, 10, 0, 5, 0, 3, 10, 17, 0, 0, 0, 0, 0, Route2_ViridianForest_NorthEntrance_EventScript_16F730, 0, 0, 0 - -Route2_ViridianForest_NorthEntrance_MapWarps: - warp_def 6, 10, 3, 2, 256 - warp_def 7, 10, 3, 2, 256 - warp_def 8, 10, 3, 2, 256 - warp_def 7, 1, 3, 0, 788 - -Route2_ViridianForest_NorthEntrance_MapEvents:: - map_events Route2_ViridianForest_NorthEntrance_EventObjects, Route2_ViridianForest_NorthEntrance_MapWarps, 0x0, 0x0 diff --git a/data/maps/Route2_ViridianForest_NorthEntrance/header.inc b/data/maps/Route2_ViridianForest_NorthEntrance/header.inc deleted file mode 100644 index c460e0cca..000000000 --- a/data/maps/Route2_ViridianForest_NorthEntrance/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route2_ViridianForest_NorthEntrance:: @ 83517B4 - .4byte Route2_Entrance_Layout @ 0x8320990 - .4byte Route2_ViridianForest_NorthEntrance_MapEvents @ 0x83BD4B8 - .4byte Route2_ViridianForest_NorthEntrance_MapScripts @ 0x816F71D - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_CITY - .2byte 221 - .byte 0x66, 0x00, 0x00, 0x08, 0x01, 0x02, 0x00, 0x00 diff --git a/data/maps/Route2_ViridianForest_NorthEntrance/map.json b/data/maps/Route2_ViridianForest_NorthEntrance/map.json new file mode 100644 index 000000000..271446b94 --- /dev/null +++ b/data/maps/Route2_ViridianForest_NorthEntrance/map.json @@ -0,0 +1,88 @@ +{ + "id": "MAP_ROUTE2_VIRIDIAN_FOREST_NORTH_ENTRANCE", + "name": "Route2_ViridianForest_NorthEntrance", + "layout": "LAYOUT_ROUTE2_ENTRANCE", + "music": "BGM_FRLG_VIRIDIAN_CITY", + "region_map_section": "MAPSEC_ROUTE_2", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 1, + "unknown_19": 2, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "18", + "x": 5, + "y": 4, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route2_ViridianForest_NorthEntrance_EventScript_16F71E", + "flag": "0" + }, + { + "graphics_id": "32", + "x": 4, + "y": 7, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route2_ViridianForest_NorthEntrance_EventScript_16F727", + "flag": "0" + }, + { + "graphics_id": "42", + "x": 10, + "y": 5, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route2_ViridianForest_NorthEntrance_EventScript_16F730", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 6, + "y": 10, + "elevation": 3, + "dest_map": "MAP_VIRIDIAN_FOREST", + "dest_warp_id": 2 + }, + { + "x": 7, + "y": 10, + "elevation": 3, + "dest_map": "MAP_VIRIDIAN_FOREST", + "dest_warp_id": 2 + }, + { + "x": 8, + "y": 10, + "elevation": 3, + "dest_map": "MAP_VIRIDIAN_FOREST", + "dest_warp_id": 2 + }, + { + "x": 7, + "y": 1, + "elevation": 3, + "dest_map": "MAP_ROUTE2", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/Route2_ViridianForest_SouthEntrance/events.inc b/data/maps/Route2_ViridianForest_SouthEntrance/events.inc deleted file mode 100644 index 1011b52a7..000000000 --- a/data/maps/Route2_ViridianForest_SouthEntrance/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -Route2_ViridianForest_SouthEntrance_EventObjects: - object_event 1, 28, 0, 10, 0, 6, 0, 3, 9, 17, 0, 0, 0, 0, 0, Route2_ViridianForest_SouthEntrance_EventScript_16F5E6, 0, 0, 0 - object_event 2, 23, 0, 4, 0, 7, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route2_ViridianForest_SouthEntrance_EventScript_16F5EF, 0, 0, 0 - -Route2_ViridianForest_SouthEntrance_MapWarps: - warp_def 6, 10, 3, 2, 788 - warp_def 7, 10, 3, 2, 788 - warp_def 8, 10, 3, 2, 788 - warp_def 7, 1, 3, 0, 256 - -Route2_ViridianForest_SouthEntrance_MapEvents:: - map_events Route2_ViridianForest_SouthEntrance_EventObjects, Route2_ViridianForest_SouthEntrance_MapWarps, 0x0, 0x0 diff --git a/data/maps/Route2_ViridianForest_SouthEntrance/header.inc b/data/maps/Route2_ViridianForest_SouthEntrance/header.inc deleted file mode 100644 index 936b17158..000000000 --- a/data/maps/Route2_ViridianForest_SouthEntrance/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route2_ViridianForest_SouthEntrance:: @ 8351760 - .4byte Route2_Entrance_Layout @ 0x8320990 - .4byte Route2_ViridianForest_SouthEntrance_MapEvents @ 0x83BD37C - .4byte Route2_ViridianForest_SouthEntrance_MapScripts @ 0x816F5E5 - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_CITY - .2byte 221 - .byte 0x66, 0x00, 0x00, 0x08, 0x01, 0x02, 0x00, 0x00 diff --git a/data/maps/Route2_ViridianForest_SouthEntrance/map.json b/data/maps/Route2_ViridianForest_SouthEntrance/map.json new file mode 100644 index 000000000..8dc14d62f --- /dev/null +++ b/data/maps/Route2_ViridianForest_SouthEntrance/map.json @@ -0,0 +1,75 @@ +{ + "id": "MAP_ROUTE2_VIRIDIAN_FOREST_SOUTH_ENTRANCE", + "name": "Route2_ViridianForest_SouthEntrance", + "layout": "LAYOUT_ROUTE2_ENTRANCE", + "music": "BGM_FRLG_VIRIDIAN_CITY", + "region_map_section": "MAPSEC_ROUTE_2", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 1, + "unknown_19": 2, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "28", + "x": 10, + "y": 6, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route2_ViridianForest_SouthEntrance_EventScript_16F5E6", + "flag": "0" + }, + { + "graphics_id": "23", + "x": 4, + "y": 7, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route2_ViridianForest_SouthEntrance_EventScript_16F5EF", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 6, + "y": 10, + "elevation": 3, + "dest_map": "MAP_ROUTE2", + "dest_warp_id": 2 + }, + { + "x": 7, + "y": 10, + "elevation": 3, + "dest_map": "MAP_ROUTE2", + "dest_warp_id": 2 + }, + { + "x": 8, + "y": 10, + "elevation": 3, + "dest_map": "MAP_ROUTE2", + "dest_warp_id": 2 + }, + { + "x": 7, + "y": 1, + "elevation": 3, + "dest_map": "MAP_VIRIDIAN_FOREST", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/Route3/connections.inc b/data/maps/Route3/connections.inc deleted file mode 100644 index 77fc58c67..000000000 --- a/data/maps/Route3/connections.inc +++ /dev/null @@ -1,7 +0,0 @@ -Route3_MapConnectionsList: @ 8352A1C - connection up, 60, MAP_ROUTE4 - connection left, -10, MAP_PEWTER_CITY - -Route3_MapConnections:: @ 8352A34 - .4byte 2 - .4byte Route3_MapConnectionsList diff --git a/data/maps/Route3/events.inc b/data/maps/Route3/events.inc deleted file mode 100644 index 9328d0926..000000000 --- a/data/maps/Route3/events.inc +++ /dev/null @@ -1,17 +0,0 @@ -Route3_EventObjects: - object_event 1, 18, 0, 70, 0, 13, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route3_EventScript_167F78, 0, 0, 0 - object_event 2, 22, 0, 40, 0, 11, 0, 3, 3, 17, 0, 1, 0, 3, 0, Route3_EventScript_1A957B, 0, 0, 0 - object_event 3, 20, 0, 32, 0, 6, 0, 3, 10, 17, 0, 1, 0, 4, 0, Route3_EventScript_1A94C1, 0, 0, 0 - object_event 4, 22, 0, 30, 0, 3, 0, 3, 9, 17, 0, 1, 0, 5, 0, Route3_EventScript_1A953D, 0, 0, 0 - object_event 5, 20, 0, 25, 0, 4, 0, 3, 8, 17, 0, 1, 0, 2, 0, Route3_EventScript_1A9483, 0, 0, 0 - object_event 6, 18, 0, 29, 0, 10, 0, 3, 9, 17, 0, 1, 0, 5, 0, Route3_EventScript_1A9407, 0, 0, 0 - object_event 7, 22, 0, 19, 0, 9, 0, 3, 9, 17, 0, 1, 0, 5, 0, Route3_EventScript_1A94FF, 0, 0, 0 - object_event 8, 20, 0, 12, 0, 6, 0, 3, 10, 17, 0, 1, 0, 3, 0, Route3_EventScript_1A9445, 0, 0, 0 - object_event 9, 18, 0, 17, 0, 4, 0, 3, 8, 17, 0, 1, 0, 2, 0, Route3_EventScript_1A93C9, 0, 0, 0 - -Route3_MapBGEvents: - bg_event 72, 11, 0, 0, 0, Route3_EventScript_167F81 - bg_event 26, 9, 3, 7, 0, 139, 113, 1 - -Route3_MapEvents:: - map_events Route3_EventObjects, 0x0, 0x0, Route3_MapBGEvents diff --git a/data/maps/Route3/header.inc b/data/maps/Route3/header.inc deleted file mode 100644 index ae86378c2..000000000 --- a/data/maps/Route3/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route3:: @ 8350864 - .4byte Route3_Layout @ 0x82E7234 - .4byte Route3_MapEvents @ 0x83B6870 - .4byte Route3_MapScripts @ 0x8167F77 - .4byte Route3_MapConnections @ 0x8352A34 - .2byte BGM_FRLG_ROUTE_3 - .2byte 91 - .byte 0x67, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/Route3/map.json b/data/maps/Route3/map.json new file mode 100644 index 000000000..01e64cf74 --- /dev/null +++ b/data/maps/Route3/map.json @@ -0,0 +1,165 @@ +{ + "id": "MAP_ROUTE3", + "name": "Route3", + "layout": "LAYOUT_ROUTE3", + "music": "BGM_FRLG_ROUTE_3", + "region_map_section": "MAPSEC_ROUTE_3", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_3", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_ROUTE4", + "offset": 60, + "direction": "up" + }, + { + "map": "MAP_PEWTER_CITY", + "offset": -10, + "direction": "left" + } + ], + "object_events": [ + { + "graphics_id": "18", + "x": 70, + "y": 13, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route3_EventScript_167F78", + "flag": "0" + }, + { + "graphics_id": "22", + "x": 40, + "y": 11, + "elevation": 3, + "movement_type": "3", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route3_EventScript_1A957B", + "flag": "0" + }, + { + "graphics_id": "20", + "x": 32, + "y": 6, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route3_EventScript_1A94C1", + "flag": "0" + }, + { + "graphics_id": "22", + "x": 30, + "y": 3, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "Route3_EventScript_1A953D", + "flag": "0" + }, + { + "graphics_id": "20", + "x": 25, + "y": 4, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route3_EventScript_1A9483", + "flag": "0" + }, + { + "graphics_id": "18", + "x": 29, + "y": 10, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "Route3_EventScript_1A9407", + "flag": "0" + }, + { + "graphics_id": "22", + "x": 19, + "y": 9, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "Route3_EventScript_1A94FF", + "flag": "0" + }, + { + "graphics_id": "20", + "x": 12, + "y": 6, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route3_EventScript_1A9445", + "flag": "0" + }, + { + "graphics_id": "18", + "x": 17, + "y": 4, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route3_EventScript_1A93C9", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 72, + "y": 11, + "elevation": 0, + "script": "Route3_EventScript_167F81" + }, + { + "type": "hidden_item", + "x": 26, + "y": 9, + "elevation": 3, + "item": "ITEM_ORAN_BERRY", + "flag": "113", + "unknown": 1 + } + ] +}
\ No newline at end of file diff --git a/data/maps/Route4/connections.inc b/data/maps/Route4/connections.inc deleted file mode 100644 index 7886e6c30..000000000 --- a/data/maps/Route4/connections.inc +++ /dev/null @@ -1,7 +0,0 @@ -Route4_MapConnectionsList: @ 8352A3C - connection down, -60, MAP_ROUTE3 - connection right, -10, MAP_CERULEAN_CITY - -Route4_MapConnections:: @ 8352A54 - .4byte 2 - .4byte Route4_MapConnectionsList diff --git a/data/maps/Route4/events.inc b/data/maps/Route4/events.inc deleted file mode 100644 index 812193ff7..000000000 --- a/data/maps/Route4/events.inc +++ /dev/null @@ -1,23 +0,0 @@ -Route4_EventObjects: - object_event 1, 23, 0, 9, 0, 8, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route4_EventScript_167F8C, 0, 0, 0 - object_event 2, 22, 0, 75, 0, 3, 0, 3, 10, 17, 0, 1, 0, 4, 0, Route4_EventScript_1A95B9, 0, 0, 0 - object_event 3, 92, 0, 67, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route4_EventScript_1BE637, 353, 0, 0 - object_event 4, 19, 0, 15, 0, 14, 0, 3, 5, 17, 0, 0, 0, 0, 0, Route4_EventScript_1ACDEA, 0, 0, 0 - object_event 5, 54, 0, 47, 0, 3, 0, 3, 10, 17, 0, 0, 0, 0, 0, Route4_EventScript_1C494E, 0, 0, 0 - object_event 6, 54, 0, 50, 0, 3, 0, 3, 9, 17, 0, 0, 0, 0, 0, Route4_EventScript_1C49B6, 0, 0, 0 - object_event 7, 65321, 0, 109, 0, 3, 0, 12, 0, 0, 0, 3, 0, 3, 0, 0x0, 0, 0, 0 - -Route4_MapWarps: - warp_def 19, 5, 3, 3, 257 - warp_def 32, 5, 0, 7, 258 - warp_def 12, 5, 0, 1, 4096 - -Route4_MapBGEvents: - bg_event 18, 7, 0, 0, 0, Route4_EventScript_167F95 - bg_event 34, 7, 0, 0, 0, Route4_EventScript_167F9E - bg_event 43, 2, 3, 7, 0, 3, 50, 1 - bg_event 5, 4, 3, 7, 0, 140, 114, 1 - bg_event 67, 17, 3, 7, 0, 148, 156, 1 - -Route4_MapEvents:: - map_events Route4_EventObjects, Route4_MapWarps, 0x0, Route4_MapBGEvents diff --git a/data/maps/Route4/header.inc b/data/maps/Route4/header.inc deleted file mode 100644 index 7156cf616..000000000 --- a/data/maps/Route4/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route4:: @ 8350880 - .4byte Route4_Layout @ 0x82E8338 - .4byte Route4_MapEvents @ 0x83B6980 - .4byte Route4_MapScripts @ 0x8167F8A - .4byte Route4_MapConnections @ 0x8352A54 - .2byte BGM_FRLG_ROUTE_3 - .2byte 92 - .byte 0x68, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/Route4/map.json b/data/maps/Route4/map.json new file mode 100644 index 000000000..d7c4363a4 --- /dev/null +++ b/data/maps/Route4/map.json @@ -0,0 +1,186 @@ +{ + "id": "MAP_ROUTE4", + "name": "Route4", + "layout": "LAYOUT_ROUTE4", + "music": "BGM_FRLG_ROUTE_3", + "region_map_section": "MAPSEC_ROUTE_4", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_3", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_ROUTE3", + "offset": -60, + "direction": "down" + }, + { + "map": "MAP_CERULEAN_CITY", + "offset": -10, + "direction": "right" + } + ], + "object_events": [ + { + "graphics_id": "23", + "x": 9, + "y": 8, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route4_EventScript_167F8C", + "flag": "0" + }, + { + "graphics_id": "22", + "x": 75, + "y": 3, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route4_EventScript_1A95B9", + "flag": "0" + }, + { + "graphics_id": "92", + "x": 67, + "y": 5, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route4_EventScript_1BE637", + "flag": "353" + }, + { + "graphics_id": "19", + "x": 15, + "y": 14, + "elevation": 3, + "movement_type": "5", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route4_EventScript_1ACDEA", + "flag": "0" + }, + { + "graphics_id": "54", + "x": 47, + "y": 3, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route4_EventScript_1C494E", + "flag": "0" + }, + { + "graphics_id": "54", + "x": 50, + "y": 3, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route4_EventScript_1C49B6", + "flag": "0" + }, + { + "graphics_id": "65321", + "x": 109, + "y": 3, + "elevation": 12, + "movement_type": "0", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 3, + "trainer_sight_or_berry_tree_id": 3, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 19, + "y": 5, + "elevation": 3, + "dest_map": "MAP_MT_MOON_1F", + "dest_warp_id": 3 + }, + { + "x": 32, + "y": 5, + "elevation": 0, + "dest_map": "MAP_MT_MOON_B1F", + "dest_warp_id": 7 + }, + { + "x": 12, + "y": 5, + "elevation": 0, + "dest_map": "MAP_ROUTE4_POKEMON_CENTER_1F", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 18, + "y": 7, + "elevation": 0, + "script": "Route4_EventScript_167F95" + }, + { + "type": "bg_event_type_0", + "x": 34, + "y": 7, + "elevation": 0, + "script": "Route4_EventScript_167F9E" + }, + { + "type": "hidden_item", + "x": 43, + "y": 2, + "elevation": 3, + "item": "POCKET_POKE_BALLS", + "flag": "50", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 5, + "y": 4, + "elevation": 3, + "item": "ITEM_PERSIM_BERRY", + "flag": "114", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 67, + "y": 17, + "elevation": 3, + "item": "ITEM_RAZZ_BERRY", + "flag": "156", + "unknown": 1 + } + ] +}
\ No newline at end of file diff --git a/data/maps/Route4_PokemonCenter_1F/events.inc b/data/maps/Route4_PokemonCenter_1F/events.inc deleted file mode 100644 index 8e00de94c..000000000 --- a/data/maps/Route4_PokemonCenter_1F/events.inc +++ /dev/null @@ -1,16 +0,0 @@ -Route4_PokemonCenter_1F_EventObjects: - object_event 1, 64, 0, 7, 0, 2, 0, 0, 8, 17, 0, 0, 0, 0, 0, Route4_PokemonCenter_1F_EventScript_16F8BB, 0, 0, 0 - object_event 2, 30, 0, 1, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route4_PokemonCenter_1F_EventScript_16F75F, 0, 0, 0 - object_event 3, 61, 0, 12, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route4_PokemonCenter_1F_EventScript_16F754, 0, 0, 0 - object_event 4, 19, 0, 5, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route4_PokemonCenter_1F_EventScript_16F74B, 0, 0, 0 - object_event 5, 18, 0, 14, 0, 4, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route4_PokemonCenter_1F_EventScript_16F8C4, 0, 0, 0 - object_event 6, 105, 0, 12, 0, 6, 0, 0, 8, 17, 0, 0, 0, 0, 0, Route4_PokemonCenter_1F_EventScript_16F8CD, 0, 0, 0 - -Route4_PokemonCenter_1F_MapWarps: - warp_def 6, 8, 3, 2, 790 - warp_def 7, 8, 3, 2, 790 - warp_def 8, 8, 3, 2, 790 - warp_def 1, 6, 4, 0, 4097 - -Route4_PokemonCenter_1F_MapEvents:: - map_events Route4_PokemonCenter_1F_EventObjects, Route4_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/Route4_PokemonCenter_1F/header.inc b/data/maps/Route4_PokemonCenter_1F/header.inc deleted file mode 100644 index fc36624b4..000000000 --- a/data/maps/Route4_PokemonCenter_1F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route4_PokemonCenter_1F:: @ 83517D0 - .4byte PokemonCenter_1F_Layout @ 0x82D5990 - .4byte Route4_PokemonCenter_1F_MapEvents @ 0x83BD57C - .4byte Route4_PokemonCenter_1F_MapScripts @ 0x816F739 - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 8 - .byte 0x68, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/Route4_PokemonCenter_1F/map.json b/data/maps/Route4_PokemonCenter_1F/map.json new file mode 100644 index 000000000..51492a5b3 --- /dev/null +++ b/data/maps/Route4_PokemonCenter_1F/map.json @@ -0,0 +1,127 @@ +{ + "id": "MAP_ROUTE4_POKEMON_CENTER_1F", + "name": "Route4_PokemonCenter_1F", + "layout": "LAYOUT_POKEMON_CENTER_1F", + "music": "BGM_FRLG_POKEMON_CENTER", + "region_map_section": "MAPSEC_ROUTE_4", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "64", + "x": 7, + "y": 2, + "elevation": 0, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route4_PokemonCenter_1F_EventScript_16F8BB", + "flag": "0" + }, + { + "graphics_id": "30", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route4_PokemonCenter_1F_EventScript_16F75F", + "flag": "0" + }, + { + "graphics_id": "61", + "x": 12, + "y": 5, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route4_PokemonCenter_1F_EventScript_16F754", + "flag": "0" + }, + { + "graphics_id": "19", + "x": 5, + "y": 4, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route4_PokemonCenter_1F_EventScript_16F74B", + "flag": "0" + }, + { + "graphics_id": "18", + "x": 14, + "y": 4, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route4_PokemonCenter_1F_EventScript_16F8C4", + "flag": "0" + }, + { + "graphics_id": "105", + "x": 12, + "y": 6, + "elevation": 0, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route4_PokemonCenter_1F_EventScript_16F8CD", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 6, + "y": 8, + "elevation": 3, + "dest_map": "MAP_ROUTE4", + "dest_warp_id": 2 + }, + { + "x": 7, + "y": 8, + "elevation": 3, + "dest_map": "MAP_ROUTE4", + "dest_warp_id": 2 + }, + { + "x": 8, + "y": 8, + "elevation": 3, + "dest_map": "MAP_ROUTE4", + "dest_warp_id": 2 + }, + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_ROUTE4_POKEMON_CENTER_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/Route4_PokemonCenter_2F/events.inc b/data/maps/Route4_PokemonCenter_2F/events.inc deleted file mode 100644 index 0a78cdf65..000000000 --- a/data/maps/Route4_PokemonCenter_2F/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -Route4_PokemonCenter_2F_EventObjects: - object_event 1, 65, 0, 6, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route4_PokemonCenter_2F_EventScript_1A8CF6, 0, 0, 0 - object_event 2, 65, 0, 2, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route4_PokemonCenter_2F_EventScript_1A8CFC, 0, 0, 0 - object_event 3, 65, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route4_PokemonCenter_2F_EventScript_1A8D02, 0, 0, 0 - object_event 4, 69, 0, 1, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route4_PokemonCenter_2F_EventScript_1BB1D2, 112, 0, 0 - -Route4_PokemonCenter_2F_MapWarps: - warp_def 1, 6, 4, 3, 4096 - warp_def 5, 1, 0, 0, 4 - warp_def 9, 1, 0, 0, 1 - -Route4_PokemonCenter_2F_MapEvents:: - map_events Route4_PokemonCenter_2F_EventObjects, Route4_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/Route4_PokemonCenter_2F/header.inc b/data/maps/Route4_PokemonCenter_2F/header.inc deleted file mode 100644 index eb9d2796d..000000000 --- a/data/maps/Route4_PokemonCenter_2F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route4_PokemonCenter_2F:: @ 83517EC - .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 - .4byte Route4_PokemonCenter_2F_MapEvents @ 0x83BD608 - .4byte Route4_PokemonCenter_2F_MapScripts @ 0x816F8D8 - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 9 - .byte 0x68, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/Route4_PokemonCenter_2F/map.json b/data/maps/Route4_PokemonCenter_2F/map.json new file mode 100644 index 000000000..a601bf6fc --- /dev/null +++ b/data/maps/Route4_PokemonCenter_2F/map.json @@ -0,0 +1,94 @@ +{ + "id": "MAP_ROUTE4_POKEMON_CENTER_2F", + "name": "Route4_PokemonCenter_2F", + "layout": "LAYOUT_POKEMON_CENTER_2F", + "music": "BGM_FRLG_POKEMON_CENTER", + "region_map_section": "MAPSEC_ROUTE_4", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "65", + "x": 6, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route4_PokemonCenter_2F_EventScript_1A8CF6", + "flag": "0" + }, + { + "graphics_id": "65", + "x": 2, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route4_PokemonCenter_2F_EventScript_1A8CFC", + "flag": "0" + }, + { + "graphics_id": "65", + "x": 10, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route4_PokemonCenter_2F_EventScript_1A8D02", + "flag": "0" + }, + { + "graphics_id": "69", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route4_PokemonCenter_2F_EventScript_1BB1D2", + "flag": "112" + } + ], + "warp_events": [ + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_ROUTE4_POKEMON_CENTER_1F", + "dest_warp_id": 3 + }, + { + "x": 5, + "y": 1, + "elevation": 0, + "dest_map": "MAP_UNKNOWN_MAP_00_04", + "dest_warp_id": 0 + }, + { + "x": 9, + "y": 1, + "elevation": 0, + "dest_map": "MAP_UNKNOWN_MAP_00_01", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/Route5/connections.inc b/data/maps/Route5/connections.inc deleted file mode 100644 index bf4730e02..000000000 --- a/data/maps/Route5/connections.inc +++ /dev/null @@ -1,7 +0,0 @@ -Route5_MapConnectionsList: @ 8352A5C - connection up, 0, MAP_CERULEAN_CITY - connection down, 0, MAP_SAFFRON_CITY - -Route5_MapConnections:: @ 8352A74 - .4byte 2 - .4byte Route5_MapConnectionsList diff --git a/data/maps/Route5/events.inc b/data/maps/Route5/events.inc deleted file mode 100644 index 3b136630c..000000000 --- a/data/maps/Route5/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -Route5_MapWarps: - warp_def 31, 31, 0, 1, 286 - warp_def 23, 25, 0, 1, 4352 - warp_def 24, 32, 3, 1, 4353 - warp_def 25, 32, 3, 1, 4353 - -Route5_MapBGEvents: - bg_event 32, 32, 0, 0, 0, Route5_EventScript_167FA8 - -Route5_MapEvents:: - map_events 0x0, Route5_MapWarps, 0x0, Route5_MapBGEvents diff --git a/data/maps/Route5/header.inc b/data/maps/Route5/header.inc deleted file mode 100644 index 7092ca60b..000000000 --- a/data/maps/Route5/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route5:: @ 835089C - .4byte Route5_Layout @ 0x82E925C - .4byte Route5_MapEvents @ 0x83B69C0 - .4byte Route5_MapScripts @ 0x8167FA7 - .4byte Route5_MapConnections @ 0x8352A74 - .2byte BGM_FRLG_ROUTE_3 - .2byte 93 - .byte 0x69, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/Route5/map.json b/data/maps/Route5/map.json new file mode 100644 index 000000000..b6f8cadef --- /dev/null +++ b/data/maps/Route5/map.json @@ -0,0 +1,67 @@ +{ + "id": "MAP_ROUTE5", + "name": "Route5", + "layout": "LAYOUT_ROUTE5", + "music": "BGM_FRLG_ROUTE_3", + "region_map_section": "MAPSEC_ROUTE_5", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_3", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_CERULEAN_CITY", + "offset": 0, + "direction": "up" + }, + { + "map": "MAP_SAFFRON_CITY", + "offset": 0, + "direction": "down" + } + ], + "object_events": [], + "warp_events": [ + { + "x": 31, + "y": 31, + "elevation": 0, + "dest_map": "MAP_UNDERGROUND_PATH_NORTH_ENTRANCE", + "dest_warp_id": 1 + }, + { + "x": 23, + "y": 25, + "elevation": 0, + "dest_map": "MAP_ROUTE5_POKEMON_DAY_CARE", + "dest_warp_id": 1 + }, + { + "x": 24, + "y": 32, + "elevation": 3, + "dest_map": "MAP_ROUTE5_SOUTH_ENTRANCE", + "dest_warp_id": 1 + }, + { + "x": 25, + "y": 32, + "elevation": 3, + "dest_map": "MAP_ROUTE5_SOUTH_ENTRANCE", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 32, + "y": 32, + "elevation": 0, + "script": "Route5_EventScript_167FA8" + } + ] +}
\ No newline at end of file diff --git a/data/maps/Route5_PokemonDayCare/events.inc b/data/maps/Route5_PokemonDayCare/events.inc deleted file mode 100644 index ac1bce238..000000000 --- a/data/maps/Route5_PokemonDayCare/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -Route5_PokemonDayCare_EventObjects: - object_event 1, 61, 0, 4, 0, 4, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route5_PokemonDayCare_EventScript_1BF398, 0, 0, 0 - -Route5_PokemonDayCare_MapWarps: - warp_def 3, 7, 0, 1, 791 - warp_def 4, 7, 0, 1, 791 - warp_def 5, 7, 0, 1, 791 - -Route5_PokemonDayCare_MapEvents:: - map_events Route5_PokemonDayCare_EventObjects, Route5_PokemonDayCare_MapWarps, 0x0, 0x0 diff --git a/data/maps/Route5_PokemonDayCare/header.inc b/data/maps/Route5_PokemonDayCare/header.inc deleted file mode 100644 index 3fef23ccb..000000000 --- a/data/maps/Route5_PokemonDayCare/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route5_PokemonDayCare:: @ 8351808 - .4byte Route5_PokemonDayCare_Layout @ 0x833ADC0 - .4byte Route5_PokemonDayCare_MapEvents @ 0x83BD64C - .4byte Route5_PokemonDayCare_MapScripts @ 0x816F8FF - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_CITY - .2byte 275 - .byte 0x69, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/Route5_PokemonDayCare/map.json b/data/maps/Route5_PokemonDayCare/map.json new file mode 100644 index 000000000..6ea473e4f --- /dev/null +++ b/data/maps/Route5_PokemonDayCare/map.json @@ -0,0 +1,55 @@ +{ + "id": "MAP_ROUTE5_POKEMON_DAY_CARE", + "name": "Route5_PokemonDayCare", + "layout": "LAYOUT_ROUTE5_POKEMON_DAY_CARE", + "music": "BGM_FRLG_VIRIDIAN_CITY", + "region_map_section": "MAPSEC_ROUTE_5", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "61", + "x": 4, + "y": 4, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route5_PokemonDayCare_EventScript_1BF398", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 0, + "dest_map": "MAP_ROUTE5", + "dest_warp_id": 1 + }, + { + "x": 4, + "y": 7, + "elevation": 0, + "dest_map": "MAP_ROUTE5", + "dest_warp_id": 1 + }, + { + "x": 5, + "y": 7, + "elevation": 0, + "dest_map": "MAP_ROUTE5", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/Route5_SouthEntrance/events.inc b/data/maps/Route5_SouthEntrance/events.inc deleted file mode 100644 index a1ef1e12f..000000000 --- a/data/maps/Route5_SouthEntrance/events.inc +++ /dev/null @@ -1,16 +0,0 @@ -Route5_SouthEntrance_EventObjects: - object_event 1, 60, 0, 1, 0, 5, 0, 3, 10, 17, 0, 0, 0, 0, 0, Route5_SouthEntrance_EventScript_16F901, 0, 0, 0 - -Route5_SouthEntrance_MapWarps: - warp_def 3, 9, 3, 9, 778 - warp_def 4, 1, 3, 2, 791 - warp_def 4, 9, 3, 9, 778 - warp_def 5, 1, 0, 3, 791 - -Route5_SouthEntrance_MapCoordEvents: - coord_event 3, 5, 3, 0, 16482, 0, 0, Route5_SouthEntrance_EventScript_16F90A - coord_event 4, 5, 3, 0, 16482, 0, 0, Route5_SouthEntrance_EventScript_16F916 - coord_event 5, 5, 3, 0, 16482, 0, 0, Route5_SouthEntrance_EventScript_16F922 - -Route5_SouthEntrance_MapEvents:: - map_events Route5_SouthEntrance_EventObjects, Route5_SouthEntrance_MapWarps, Route5_SouthEntrance_MapCoordEvents, 0x0 diff --git a/data/maps/Route5_SouthEntrance/header.inc b/data/maps/Route5_SouthEntrance/header.inc deleted file mode 100644 index c918b3b50..000000000 --- a/data/maps/Route5_SouthEntrance/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route5_SouthEntrance:: @ 8351824 - .4byte SaffronCity_NorthSouthEntrance_Layout @ 0x831E9C0 - .4byte Route5_SouthEntrance_MapEvents @ 0x83BD6C8 - .4byte Route5_SouthEntrance_MapScripts @ 0x816F900 - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_CITY - .2byte 208 - .byte 0x69, 0x00, 0x00, 0x08, 0x01, 0x02, 0x00, 0x00 diff --git a/data/maps/Route5_SouthEntrance/map.json b/data/maps/Route5_SouthEntrance/map.json new file mode 100644 index 000000000..b153ebe11 --- /dev/null +++ b/data/maps/Route5_SouthEntrance/map.json @@ -0,0 +1,90 @@ +{ + "id": "MAP_ROUTE5_SOUTH_ENTRANCE", + "name": "Route5_SouthEntrance", + "layout": "LAYOUT_SAFFRON_CITY_NORTH_SOUTH_ENTRANCE", + "music": "BGM_FRLG_VIRIDIAN_CITY", + "region_map_section": "MAPSEC_ROUTE_5", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 1, + "unknown_19": 2, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "60", + "x": 1, + "y": 5, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route5_SouthEntrance_EventScript_16F901", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 9, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY_DUPLICATE", + "dest_warp_id": 9 + }, + { + "x": 4, + "y": 1, + "elevation": 3, + "dest_map": "MAP_ROUTE5", + "dest_warp_id": 2 + }, + { + "x": 4, + "y": 9, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY_DUPLICATE", + "dest_warp_id": 9 + }, + { + "x": 5, + "y": 1, + "elevation": 0, + "dest_map": "MAP_ROUTE5", + "dest_warp_id": 3 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 3, + "y": 5, + "elevation": 3, + "var": "VAR_0x4062", + "var_value": 0, + "script": "Route5_SouthEntrance_EventScript_16F90A" + }, + { + "type": "trigger", + "x": 4, + "y": 5, + "elevation": 3, + "var": "VAR_0x4062", + "var_value": 0, + "script": "Route5_SouthEntrance_EventScript_16F916" + }, + { + "type": "trigger", + "x": 5, + "y": 5, + "elevation": 3, + "var": "VAR_0x4062", + "var_value": 0, + "script": "Route5_SouthEntrance_EventScript_16F922" + } + ], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/Route6/connections.inc b/data/maps/Route6/connections.inc deleted file mode 100644 index 7f0a3d191..000000000 --- a/data/maps/Route6/connections.inc +++ /dev/null @@ -1,7 +0,0 @@ -Route6_MapConnectionsList: @ 8352A7C - connection up, 0, MAP_SAFFRON_CITY - connection down, -12, MAP_VERMILION_CITY - -Route6_MapConnections:: @ 8352A94 - .4byte 2 - .4byte Route6_MapConnectionsList diff --git a/data/maps/Route6/events.inc b/data/maps/Route6/events.inc deleted file mode 100644 index a6ff2b010..000000000 --- a/data/maps/Route6/events.inc +++ /dev/null @@ -1,20 +0,0 @@ -Route6_EventObjects: - object_event 1, 20, 0, 3, 0, 16, 0, 3, 10, 17, 0, 1, 0, 5, 0, Route6_EventScript_1A9999, 0, 0, 0 - object_event 2, 39, 0, 12, 0, 21, 0, 3, 10, 17, 0, 1, 0, 0, 0, Route6_EventScript_1A9A15, 0, 0, 0 - object_event 3, 40, 0, 13, 0, 21, 0, 3, 9, 17, 0, 1, 0, 0, 0, Route6_EventScript_1A9A91, 0, 0, 0 - object_event 4, 20, 0, 20, 0, 25, 0, 3, 9, 17, 0, 1, 0, 3, 0, Route6_EventScript_1A99D7, 0, 0, 0 - object_event 5, 40, 0, 13, 0, 32, 0, 3, 9, 17, 0, 1, 0, 3, 0, Route6_EventScript_1A9ACF, 0, 0, 0 - object_event 6, 39, 0, 13, 0, 33, 0, 3, 9, 17, 0, 1, 0, 3, 0, Route6_EventScript_1A9A53, 0, 0, 0 - -Route6_MapWarps: - warp_def 19, 13, 0, 1, 288 - warp_def 12, 5, 3, 2, 4608 - warp_def 13, 5, 3, 2, 4608 - -Route6_MapBGEvents: - bg_event 21, 15, 0, 0, 0, Route6_EventScript_167FB2 - bg_event 5, 5, 3, 7, 0, 142, 118, 1 - bg_event 19, 5, 3, 7, 0, 68, 119, 1 - -Route6_MapEvents:: - map_events Route6_EventObjects, Route6_MapWarps, 0x0, Route6_MapBGEvents diff --git a/data/maps/Route6/header.inc b/data/maps/Route6/header.inc deleted file mode 100644 index 8e2668411..000000000 --- a/data/maps/Route6/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route6:: @ 83508B8 - .4byte Route6_Layout @ 0x82E9A00 - .4byte Route6_MapEvents @ 0x83B6AA0 - .4byte Route6_MapScripts @ 0x8167FB1 - .4byte Route6_MapConnections @ 0x8352A94 - .2byte BGM_FRLG_ROUTE_3 - .2byte 94 - .byte 0x6a, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/Route6/map.json b/data/maps/Route6/map.json new file mode 100644 index 000000000..13dc779ef --- /dev/null +++ b/data/maps/Route6/map.json @@ -0,0 +1,157 @@ +{ + "id": "MAP_ROUTE6", + "name": "Route6", + "layout": "LAYOUT_ROUTE6", + "music": "BGM_FRLG_ROUTE_3", + "region_map_section": "MAPSEC_ROUTE_6", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_3", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_SAFFRON_CITY", + "offset": 0, + "direction": "up" + }, + { + "map": "MAP_VERMILION_CITY", + "offset": -12, + "direction": "down" + } + ], + "object_events": [ + { + "graphics_id": "20", + "x": 3, + "y": 16, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "Route6_EventScript_1A9999", + "flag": "0" + }, + { + "graphics_id": "39", + "x": 12, + "y": 21, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route6_EventScript_1A9A15", + "flag": "0" + }, + { + "graphics_id": "40", + "x": 13, + "y": 21, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route6_EventScript_1A9A91", + "flag": "0" + }, + { + "graphics_id": "20", + "x": 20, + "y": 25, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route6_EventScript_1A99D7", + "flag": "0" + }, + { + "graphics_id": "40", + "x": 13, + "y": 32, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route6_EventScript_1A9ACF", + "flag": "0" + }, + { + "graphics_id": "39", + "x": 13, + "y": 33, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route6_EventScript_1A9A53", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 19, + "y": 13, + "elevation": 0, + "dest_map": "MAP_UNDERGROUND_PATH_SOUTH_ENTRANCE", + "dest_warp_id": 1 + }, + { + "x": 12, + "y": 5, + "elevation": 3, + "dest_map": "MAP_ROUTE6_NORTH_ENTRANCE", + "dest_warp_id": 2 + }, + { + "x": 13, + "y": 5, + "elevation": 3, + "dest_map": "MAP_ROUTE6_NORTH_ENTRANCE", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 21, + "y": 15, + "elevation": 0, + "script": "Route6_EventScript_167FB2" + }, + { + "type": "hidden_item", + "x": 5, + "y": 5, + "elevation": 3, + "item": "ITEM_SITRUS_BERRY", + "flag": "118", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 19, + "y": 5, + "elevation": 3, + "item": "ITEM_RARE_CANDY", + "flag": "119", + "unknown": 1 + } + ] +}
\ No newline at end of file diff --git a/data/maps/Route6_NorthEntrance/events.inc b/data/maps/Route6_NorthEntrance/events.inc deleted file mode 100644 index c6b34841e..000000000 --- a/data/maps/Route6_NorthEntrance/events.inc +++ /dev/null @@ -1,16 +0,0 @@ -Route6_NorthEntrance_EventObjects: - object_event 1, 60, 0, 7, 0, 5, 0, 3, 9, 17, 0, 0, 0, 0, 0, Route6_NorthEntrance_EventScript_16F9C7, 0, 0, 0 - -Route6_NorthEntrance_MapWarps: - warp_def 4, 1, 0, 11, 778 - warp_def 5, 1, 0, 11, 778 - warp_def 4, 9, 3, 1, 792 - warp_def 5, 9, 3, 1, 792 - -Route6_NorthEntrance_MapCoordEvents: - coord_event 3, 5, 3, 0, 16482, 0, 0, Route6_NorthEntrance_EventScript_16F9D0 - coord_event 4, 5, 3, 0, 16482, 0, 0, Route6_NorthEntrance_EventScript_16F9DC - coord_event 5, 5, 3, 0, 16482, 0, 0, Route6_NorthEntrance_EventScript_16F9E8 - -Route6_NorthEntrance_MapEvents:: - map_events Route6_NorthEntrance_EventObjects, Route6_NorthEntrance_MapWarps, Route6_NorthEntrance_MapCoordEvents, 0x0 diff --git a/data/maps/Route6_NorthEntrance/header.inc b/data/maps/Route6_NorthEntrance/header.inc deleted file mode 100644 index 6ef93a401..000000000 --- a/data/maps/Route6_NorthEntrance/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route6_NorthEntrance:: @ 8351840 - .4byte SaffronCity_NorthSouthEntrance_Layout @ 0x831E9C0 - .4byte Route6_NorthEntrance_MapEvents @ 0x83BD744 - .4byte Route6_NorthEntrance_MapScripts @ 0x816F9C6 - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_CITY - .2byte 208 - .byte 0x6a, 0x00, 0x00, 0x08, 0x01, 0x02, 0x00, 0x00 diff --git a/data/maps/Route6_NorthEntrance/map.json b/data/maps/Route6_NorthEntrance/map.json new file mode 100644 index 000000000..99fb33e28 --- /dev/null +++ b/data/maps/Route6_NorthEntrance/map.json @@ -0,0 +1,90 @@ +{ + "id": "MAP_ROUTE6_NORTH_ENTRANCE", + "name": "Route6_NorthEntrance", + "layout": "LAYOUT_SAFFRON_CITY_NORTH_SOUTH_ENTRANCE", + "music": "BGM_FRLG_VIRIDIAN_CITY", + "region_map_section": "MAPSEC_ROUTE_6", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 1, + "unknown_19": 2, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "60", + "x": 7, + "y": 5, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route6_NorthEntrance_EventScript_16F9C7", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 4, + "y": 1, + "elevation": 0, + "dest_map": "MAP_SAFFRON_CITY_DUPLICATE", + "dest_warp_id": 11 + }, + { + "x": 5, + "y": 1, + "elevation": 0, + "dest_map": "MAP_SAFFRON_CITY_DUPLICATE", + "dest_warp_id": 11 + }, + { + "x": 4, + "y": 9, + "elevation": 3, + "dest_map": "MAP_ROUTE6", + "dest_warp_id": 1 + }, + { + "x": 5, + "y": 9, + "elevation": 3, + "dest_map": "MAP_ROUTE6", + "dest_warp_id": 1 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 3, + "y": 5, + "elevation": 3, + "var": "VAR_0x4062", + "var_value": 0, + "script": "Route6_NorthEntrance_EventScript_16F9D0" + }, + { + "type": "trigger", + "x": 4, + "y": 5, + "elevation": 3, + "var": "VAR_0x4062", + "var_value": 0, + "script": "Route6_NorthEntrance_EventScript_16F9DC" + }, + { + "type": "trigger", + "x": 5, + "y": 5, + "elevation": 3, + "var": "VAR_0x4062", + "var_value": 0, + "script": "Route6_NorthEntrance_EventScript_16F9E8" + } + ], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/Route7/connections.inc b/data/maps/Route7/connections.inc deleted file mode 100644 index dec257fa1..000000000 --- a/data/maps/Route7/connections.inc +++ /dev/null @@ -1,7 +0,0 @@ -Route7_MapConnectionsList: @ 8352A9C - connection left, -10, MAP_CELADON_CITY - connection right, -10, MAP_SAFFRON_CITY - -Route7_MapConnections:: @ 8352AB4 - .4byte 2 - .4byte Route7_MapConnectionsList diff --git a/data/maps/Route7/events.inc b/data/maps/Route7/events.inc deleted file mode 100644 index a394e8394..000000000 --- a/data/maps/Route7/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -Route7_EventObjects: - object_event 1, 65375, 0, 248, 255, 12, 0, 10, 0, 0, 0, 6, 0, 3, 0, 0x0, 0, 0, 0 - -Route7_MapWarps: - warp_def 7, 14, 0, 1, 289 - warp_def 15, 10, 3, 0, 4864 - -Route7_MapBGEvents: - bg_event 5, 14, 0, 0, 0, Route7_EventScript_167FBC - bg_event 16, 15, 3, 7, 0, 151, 152, 1 - -Route7_MapEvents:: - map_events Route7_EventObjects, Route7_MapWarps, 0x0, Route7_MapBGEvents diff --git a/data/maps/Route7/header.inc b/data/maps/Route7/header.inc deleted file mode 100644 index b7c432750..000000000 --- a/data/maps/Route7/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route7:: @ 83508D4 - .4byte Route7_Layout @ 0x82E9DE4 - .4byte Route7_MapEvents @ 0x83B6AF4 - .4byte Route7_MapScripts @ 0x8167FBB - .4byte Route7_MapConnections @ 0x8352AB4 - .2byte BGM_FRLG_ROUTE_3 - .2byte 95 - .byte 0x6b, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/Route7/map.json b/data/maps/Route7/map.json new file mode 100644 index 000000000..2974e7ba8 --- /dev/null +++ b/data/maps/Route7/map.json @@ -0,0 +1,76 @@ +{ + "id": "MAP_ROUTE7", + "name": "Route7", + "layout": "LAYOUT_ROUTE7", + "music": "BGM_FRLG_ROUTE_3", + "region_map_section": "MAPSEC_ROUTE_7", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_3", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_CELADON_CITY", + "offset": -10, + "direction": "left" + }, + { + "map": "MAP_SAFFRON_CITY", + "offset": -10, + "direction": "right" + } + ], + "object_events": [ + { + "graphics_id": "65375", + "x": 65528, + "y": 12, + "elevation": 10, + "movement_type": "0", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 6, + "trainer_sight_or_berry_tree_id": 3, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 7, + "y": 14, + "elevation": 0, + "dest_map": "MAP_UNDERGROUND_PATH_WEST_ENTRANCE", + "dest_warp_id": 1 + }, + { + "x": 15, + "y": 10, + "elevation": 3, + "dest_map": "MAP_ROUTE7_EAST_ENTRANCE", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 5, + "y": 14, + "elevation": 0, + "script": "Route7_EventScript_167FBC" + }, + { + "type": "hidden_item", + "x": 16, + "y": 15, + "elevation": 3, + "item": "ITEM_WEPEAR_BERRY", + "flag": "152", + "unknown": 1 + } + ] +}
\ No newline at end of file diff --git a/data/maps/Route7_EastEntrance/events.inc b/data/maps/Route7_EastEntrance/events.inc deleted file mode 100644 index 8c7b7a30f..000000000 --- a/data/maps/Route7_EastEntrance/events.inc +++ /dev/null @@ -1,16 +0,0 @@ -Route7_EastEntrance_EventObjects: - object_event 1, 60, 0, 6, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route7_EastEntrance_EventScript_16FA8E, 0, 0, 0 - -Route7_EastEntrance_MapWarps: - warp_def 1, 5, 3, 1, 793 - warp_def 1, 6, 3, 1, 793 - warp_def 11, 5, 3, 8, 778 - warp_def 11, 6, 3, 8, 778 - -Route7_EastEntrance_MapCoordEvents: - coord_event 6, 4, 3, 0, 16482, 0, 0, Route7_EastEntrance_EventScript_16FA97 - coord_event 6, 5, 3, 0, 16482, 0, 0, Route7_EastEntrance_EventScript_16FAA3 - coord_event 6, 6, 3, 0, 16482, 0, 0, Route7_EastEntrance_EventScript_16FAAF - -Route7_EastEntrance_MapEvents:: - map_events Route7_EastEntrance_EventObjects, Route7_EastEntrance_MapWarps, Route7_EastEntrance_MapCoordEvents, 0x0 diff --git a/data/maps/Route7_EastEntrance/header.inc b/data/maps/Route7_EastEntrance/header.inc deleted file mode 100644 index 6ceaa940e..000000000 --- a/data/maps/Route7_EastEntrance/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route7_EastEntrance:: @ 8351878 - .4byte SaffronCity_EastWestEntrance_Layout @ 0x831EAD0 - .4byte Route7_EastEntrance_MapEvents @ 0x83BD7D4 - .4byte Route7_EastEntrance_MapScripts @ 0x816FA8D - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_CITY - .2byte 209 - .byte 0x6b, 0x00, 0x00, 0x08, 0x01, 0x02, 0x00, 0x00 diff --git a/data/maps/Route7_EastEntrance/map.json b/data/maps/Route7_EastEntrance/map.json new file mode 100644 index 000000000..618183024 --- /dev/null +++ b/data/maps/Route7_EastEntrance/map.json @@ -0,0 +1,90 @@ +{ + "id": "MAP_ROUTE7_EAST_ENTRANCE", + "name": "Route7_EastEntrance", + "layout": "LAYOUT_SAFFRON_CITY_EAST_WEST_ENTRANCE", + "music": "BGM_FRLG_VIRIDIAN_CITY", + "region_map_section": "MAPSEC_ROUTE_7", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 1, + "unknown_19": 2, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "60", + "x": 6, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route7_EastEntrance_EventScript_16FA8E", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 1, + "y": 5, + "elevation": 3, + "dest_map": "MAP_ROUTE7", + "dest_warp_id": 1 + }, + { + "x": 1, + "y": 6, + "elevation": 3, + "dest_map": "MAP_ROUTE7", + "dest_warp_id": 1 + }, + { + "x": 11, + "y": 5, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY_DUPLICATE", + "dest_warp_id": 8 + }, + { + "x": 11, + "y": 6, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY_DUPLICATE", + "dest_warp_id": 8 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 6, + "y": 4, + "elevation": 3, + "var": "VAR_0x4062", + "var_value": 0, + "script": "Route7_EastEntrance_EventScript_16FA97" + }, + { + "type": "trigger", + "x": 6, + "y": 5, + "elevation": 3, + "var": "VAR_0x4062", + "var_value": 0, + "script": "Route7_EastEntrance_EventScript_16FAA3" + }, + { + "type": "trigger", + "x": 6, + "y": 6, + "elevation": 3, + "var": "VAR_0x4062", + "var_value": 0, + "script": "Route7_EastEntrance_EventScript_16FAAF" + } + ], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/Route8/connections.inc b/data/maps/Route8/connections.inc deleted file mode 100644 index 864cc0831..000000000 --- a/data/maps/Route8/connections.inc +++ /dev/null @@ -1,7 +0,0 @@ -Route8_MapConnectionsList: @ 8352ABC - connection left, -10, MAP_SAFFRON_CITY - connection right, 0, MAP_LAVENDER_TOWN - -Route8_MapConnections:: @ 8352AD4 - .4byte 2 - .4byte Route8_MapConnectionsList diff --git a/data/maps/Route8/events.inc b/data/maps/Route8/events.inc deleted file mode 100644 index 7492f0cda..000000000 --- a/data/maps/Route8/events.inc +++ /dev/null @@ -1,29 +0,0 @@ -Route8_EventObjects: - object_event 1, 22, 0, 62, 0, 14, 0, 3, 9, 17, 0, 1, 0, 6, 0, Route8_EventScript_1AA1D5, 0, 0, 0 - object_event 2, 32, 0, 55, 0, 15, 0, 3, 8, 17, 0, 1, 0, 3, 0, Route8_EventScript_1AA30B, 0, 0, 0 - object_event 3, 55, 0, 51, 0, 6, 0, 3, 1, 17, 0, 1, 0, 4, 0, Route8_EventScript_1AA251, 0, 0, 0 - object_event 4, 22, 0, 29, 0, 3, 0, 3, 9, 17, 0, 1, 0, 3, 0, Route8_EventScript_1AA11B, 0, 0, 0 - object_event 5, 55, 0, 29, 0, 4, 0, 3, 10, 17, 0, 1, 0, 6, 0, Route8_EventScript_1AA28F, 0, 0, 0 - object_event 6, 22, 0, 29, 0, 5, 0, 3, 9, 17, 0, 1, 0, 3, 0, Route8_EventScript_1AA159, 0, 0, 0 - object_event 7, 22, 0, 29, 0, 6, 0, 3, 10, 17, 0, 1, 0, 6, 0, Route8_EventScript_1AA197, 0, 0, 0 - object_event 8, 32, 0, 21, 0, 3, 0, 3, 1, 17, 0, 1, 0, 1, 0, Route8_EventScript_1AA2CD, 0, 0, 0 - object_event 9, 55, 0, 9, 0, 6, 0, 3, 10, 17, 0, 1, 0, 4, 0, Route8_EventScript_1AA213, 0, 0, 0 - object_event 10, 95, 0, 33, 0, 15, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route8_EventScript_1BDF13, 18, 0, 0 - object_event 11, 95, 0, 47, 0, 12, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route8_EventScript_1BDF13, 19, 0, 0 - object_event 12, 17, 0, 40, 0, 3, 0, 3, 8, 17, 0, 1, 0, 1, 0, Route8_EventScript_1AA349, 0, 0, 0 - object_event 13, 17, 0, 41, 0, 3, 0, 3, 8, 17, 0, 1, 0, 1, 0, Route8_EventScript_1AA38F, 0, 0, 0 - object_event 14, 53, 0, 14, 0, 16, 0, 3, 52, 37, 0, 1, 0, 1, 0, Route8_EventScript_1AA3D5, 0, 0, 0 - object_event 15, 53, 0, 24, 0, 17, 0, 3, 41, 85, 0, 1, 0, 1, 0, Route8_EventScript_1AA413, 0, 0, 0 - -Route8_MapWarps: - warp_def 13, 4, 0, 1, 291 - warp_def 7, 10, 3, 2, 5120 - -Route8_MapBGEvents: - bg_event 16, 5, 0, 0, 0, Route8_EventScript_167FC6 - bg_event 42, 10, 3, 7, 0, 136, 127, 1 - bg_event 38, 11, 3, 7, 0, 141, 128, 1 - bg_event 42, 15, 3, 7, 0, 138, 129, 1 - -Route8_MapEvents:: - map_events Route8_EventObjects, Route8_MapWarps, 0x0, Route8_MapBGEvents diff --git a/data/maps/Route8/header.inc b/data/maps/Route8/header.inc deleted file mode 100644 index b4b9bec8d..000000000 --- a/data/maps/Route8/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route8:: @ 83508F0 - .4byte Route8_Layout @ 0x82EA948 - .4byte Route8_MapEvents @ 0x83B6CB0 - .4byte Route8_MapScripts @ 0x8167FC5 - .4byte Route8_MapConnections @ 0x8352AD4 - .2byte BGM_FRLG_ROUTE_3 - .2byte 96 - .byte 0x6c, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/Route8/map.json b/data/maps/Route8/map.json new file mode 100644 index 000000000..cec23d53d --- /dev/null +++ b/data/maps/Route8/map.json @@ -0,0 +1,276 @@ +{ + "id": "MAP_ROUTE8", + "name": "Route8", + "layout": "LAYOUT_ROUTE8", + "music": "BGM_FRLG_ROUTE_3", + "region_map_section": "MAPSEC_ROUTE_8", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_3", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_SAFFRON_CITY", + "offset": -10, + "direction": "left" + }, + { + "map": "MAP_LAVENDER_TOWN", + "offset": 0, + "direction": "right" + } + ], + "object_events": [ + { + "graphics_id": "22", + "x": 62, + "y": 14, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 6, + "script": "Route8_EventScript_1AA1D5", + "flag": "0" + }, + { + "graphics_id": "32", + "x": 55, + "y": 15, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route8_EventScript_1AA30B", + "flag": "0" + }, + { + "graphics_id": "55", + "x": 51, + "y": 6, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route8_EventScript_1AA251", + "flag": "0" + }, + { + "graphics_id": "22", + "x": 29, + "y": 3, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route8_EventScript_1AA11B", + "flag": "0" + }, + { + "graphics_id": "55", + "x": 29, + "y": 4, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 6, + "script": "Route8_EventScript_1AA28F", + "flag": "0" + }, + { + "graphics_id": "22", + "x": 29, + "y": 5, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route8_EventScript_1AA159", + "flag": "0" + }, + { + "graphics_id": "22", + "x": 29, + "y": 6, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 6, + "script": "Route8_EventScript_1AA197", + "flag": "0" + }, + { + "graphics_id": "32", + "x": 21, + "y": 3, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route8_EventScript_1AA2CD", + "flag": "0" + }, + { + "graphics_id": "55", + "x": 9, + "y": 6, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route8_EventScript_1AA213", + "flag": "0" + }, + { + "graphics_id": "95", + "x": 33, + "y": 15, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route8_EventScript_1BDF13", + "flag": "18" + }, + { + "graphics_id": "95", + "x": 47, + "y": 12, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route8_EventScript_1BDF13", + "flag": "19" + }, + { + "graphics_id": "17", + "x": 40, + "y": 3, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route8_EventScript_1AA349", + "flag": "0" + }, + { + "graphics_id": "17", + "x": 41, + "y": 3, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route8_EventScript_1AA38F", + "flag": "0" + }, + { + "graphics_id": "53", + "x": 14, + "y": 16, + "elevation": 3, + "movement_type": "52", + "movement_range_x": 5, + "movement_range_y": 2, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route8_EventScript_1AA3D5", + "flag": "0" + }, + { + "graphics_id": "53", + "x": 24, + "y": 17, + "elevation": 3, + "movement_type": "41", + "movement_range_x": 5, + "movement_range_y": 5, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route8_EventScript_1AA413", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 13, + "y": 4, + "elevation": 0, + "dest_map": "MAP_UNDERGROUND_PATH_EAST_ENTRANCE", + "dest_warp_id": 1 + }, + { + "x": 7, + "y": 10, + "elevation": 3, + "dest_map": "MAP_ROUTE8_WEST_ENTRANCE", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 16, + "y": 5, + "elevation": 0, + "script": "Route8_EventScript_167FC6" + }, + { + "type": "hidden_item", + "x": 42, + "y": 10, + "elevation": 3, + "item": "ITEM_RAWST_BERRY", + "flag": "127", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 38, + "y": 11, + "elevation": 3, + "item": "ITEM_LUM_BERRY", + "flag": "128", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 42, + "y": 15, + "elevation": 3, + "item": "ITEM_LEPPA_BERRY", + "flag": "129", + "unknown": 1 + } + ] +}
\ No newline at end of file diff --git a/data/maps/Route8_WestEntrance/events.inc b/data/maps/Route8_WestEntrance/events.inc deleted file mode 100644 index 1352ddb0c..000000000 --- a/data/maps/Route8_WestEntrance/events.inc +++ /dev/null @@ -1,16 +0,0 @@ -Route8_WestEntrance_EventObjects: - object_event 1, 60, 0, 6, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route8_WestEntrance_EventScript_16FB54, 0, 0, 0 - -Route8_WestEntrance_MapWarps: - warp_def 1, 4, 3, 10, 778 - warp_def 1, 5, 3, 10, 778 - warp_def 11, 5, 3, 1, 794 - warp_def 11, 6, 3, 1, 794 - -Route8_WestEntrance_MapCoordEvents: - coord_event 6, 4, 3, 0, 16482, 0, 0, Route8_WestEntrance_EventScript_16FB5D - coord_event 6, 5, 3, 0, 16482, 0, 0, Route8_WestEntrance_EventScript_16FB69 - coord_event 6, 6, 3, 0, 16482, 0, 0, Route8_WestEntrance_EventScript_16FB75 - -Route8_WestEntrance_MapEvents:: - map_events Route8_WestEntrance_EventObjects, Route8_WestEntrance_MapWarps, Route8_WestEntrance_MapCoordEvents, 0x0 diff --git a/data/maps/Route8_WestEntrance/header.inc b/data/maps/Route8_WestEntrance/header.inc deleted file mode 100644 index 400f52c1c..000000000 --- a/data/maps/Route8_WestEntrance/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route8_WestEntrance:: @ 8351894 - .4byte SaffronCity_EastWestEntrance_Layout @ 0x831EAD0 - .4byte Route8_WestEntrance_MapEvents @ 0x83BD850 - .4byte Route8_WestEntrance_MapScripts @ 0x816FB53 - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_CITY - .2byte 209 - .byte 0x6c, 0x00, 0x00, 0x08, 0x01, 0x02, 0x00, 0x00 diff --git a/data/maps/Route8_WestEntrance/map.json b/data/maps/Route8_WestEntrance/map.json new file mode 100644 index 000000000..d46acda0f --- /dev/null +++ b/data/maps/Route8_WestEntrance/map.json @@ -0,0 +1,90 @@ +{ + "id": "MAP_ROUTE8_WEST_ENTRANCE", + "name": "Route8_WestEntrance", + "layout": "LAYOUT_SAFFRON_CITY_EAST_WEST_ENTRANCE", + "music": "BGM_FRLG_VIRIDIAN_CITY", + "region_map_section": "MAPSEC_ROUTE_8", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 1, + "unknown_19": 2, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "60", + "x": 6, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route8_WestEntrance_EventScript_16FB54", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 1, + "y": 4, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY_DUPLICATE", + "dest_warp_id": 10 + }, + { + "x": 1, + "y": 5, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY_DUPLICATE", + "dest_warp_id": 10 + }, + { + "x": 11, + "y": 5, + "elevation": 3, + "dest_map": "MAP_ROUTE8", + "dest_warp_id": 1 + }, + { + "x": 11, + "y": 6, + "elevation": 3, + "dest_map": "MAP_ROUTE8", + "dest_warp_id": 1 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 6, + "y": 4, + "elevation": 3, + "var": "VAR_0x4062", + "var_value": 0, + "script": "Route8_WestEntrance_EventScript_16FB5D" + }, + { + "type": "trigger", + "x": 6, + "y": 5, + "elevation": 3, + "var": "VAR_0x4062", + "var_value": 0, + "script": "Route8_WestEntrance_EventScript_16FB69" + }, + { + "type": "trigger", + "x": 6, + "y": 6, + "elevation": 3, + "var": "VAR_0x4062", + "var_value": 0, + "script": "Route8_WestEntrance_EventScript_16FB75" + } + ], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/Route9/connections.inc b/data/maps/Route9/connections.inc deleted file mode 100644 index 6e4cb62e2..000000000 --- a/data/maps/Route9/connections.inc +++ /dev/null @@ -1,7 +0,0 @@ -Route9_MapConnectionsList: @ 8352ADC - connection left, -10, MAP_CERULEAN_CITY - connection right, 0, MAP_ROUTE10 - -Route9_MapConnections:: @ 8352AF4 - .4byte 2 - .4byte Route9_MapConnectionsList diff --git a/data/maps/Route9/events.inc b/data/maps/Route9/events.inc deleted file mode 100644 index 3e027e71b..000000000 --- a/data/maps/Route9/events.inc +++ /dev/null @@ -1,22 +0,0 @@ -Route9_EventObjects: - object_event 1, 40, 0, 14, 0, 10, 0, 3, 9, 17, 0, 1, 0, 3, 0, Route9_EventScript_1A9E71, 0, 0, 0 - object_event 2, 56, 0, 20, 0, 17, 0, 3, 15, 17, 0, 1, 0, 4, 0, Route9_EventScript_1A9F69, 0, 0, 0 - object_event 3, 56, 0, 61, 0, 16, 0, 3, 8, 17, 0, 1, 0, 1, 0, Route9_EventScript_1A9EED, 0, 0, 0 - object_event 4, 39, 0, 26, 0, 7, 0, 3, 1, 17, 0, 1, 0, 3, 0, Route9_EventScript_1A9DF5, 0, 0, 0 - object_event 5, 20, 0, 26, 0, 1, 0, 3, 8, 17, 0, 1, 0, 2, 0, Route9_EventScript_1A9D79, 0, 0, 0 - object_event 6, 20, 0, 49, 0, 7, 0, 3, 10, 17, 0, 1, 0, 3, 0, Route9_EventScript_1A9DB7, 0, 0, 0 - object_event 7, 56, 0, 53, 0, 2, 0, 3, 5, 19, 0, 1, 0, 1, 0, Route9_EventScript_1A9F2B, 0, 0, 0 - object_event 8, 40, 0, 60, 0, 9, 0, 3, 10, 17, 0, 1, 0, 4, 0, Route9_EventScript_1A9EAF, 0, 0, 0 - object_event 9, 39, 0, 36, 0, 6, 0, 3, 10, 17, 0, 1, 0, 5, 0, Route9_EventScript_1A9E33, 0, 0, 0 - object_event 10, 95, 0, 2, 0, 8, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route9_EventScript_1BDF13, 18, 0, 0 - object_event 11, 92, 0, 12, 0, 17, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route9_EventScript_1BE6B9, 363, 0, 0 - object_event 12, 92, 0, 65, 0, 17, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route9_EventScript_1BEAFD, 450, 0, 0 - -Route9_MapBGEvents: - bg_event 29, 7, 0, 0, 0, Route9_EventScript_167FD0 - bg_event 15, 7, 0, 7, 0, 34, 6, 1 - bg_event 63, 2, 3, 7, 0, 68, 123, 1 - bg_event 48, 2, 3, 7, 0, 134, 150, 1 - -Route9_MapEvents:: - map_events Route9_EventObjects, 0x0, 0x0, Route9_MapBGEvents diff --git a/data/maps/Route9/header.inc b/data/maps/Route9/header.inc deleted file mode 100644 index 0066c2e2f..000000000 --- a/data/maps/Route9/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route9:: @ 835090C - .4byte Route9_Layout @ 0x82EB4AC - .4byte Route9_MapEvents @ 0x83B6E14 - .4byte Route9_MapScripts @ 0x8167FCF - .4byte Route9_MapConnections @ 0x8352AF4 - .2byte BGM_FRLG_ROUTE_3 - .2byte 97 - .byte 0x6d, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/Route9/map.json b/data/maps/Route9/map.json new file mode 100644 index 000000000..72877fc69 --- /dev/null +++ b/data/maps/Route9/map.json @@ -0,0 +1,222 @@ +{ + "id": "MAP_ROUTE9", + "name": "Route9", + "layout": "LAYOUT_ROUTE9", + "music": "BGM_FRLG_ROUTE_3", + "region_map_section": "MAPSEC_ROUTE_9", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_3", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_CERULEAN_CITY", + "offset": -10, + "direction": "left" + }, + { + "map": "MAP_ROUTE10", + "offset": 0, + "direction": "right" + } + ], + "object_events": [ + { + "graphics_id": "40", + "x": 14, + "y": 10, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route9_EventScript_1A9E71", + "flag": "0" + }, + { + "graphics_id": "56", + "x": 20, + "y": 17, + "elevation": 3, + "movement_type": "15", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route9_EventScript_1A9F69", + "flag": "0" + }, + { + "graphics_id": "56", + "x": 61, + "y": 16, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route9_EventScript_1A9EED", + "flag": "0" + }, + { + "graphics_id": "39", + "x": 26, + "y": 7, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route9_EventScript_1A9DF5", + "flag": "0" + }, + { + "graphics_id": "20", + "x": 26, + "y": 1, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route9_EventScript_1A9D79", + "flag": "0" + }, + { + "graphics_id": "20", + "x": 49, + "y": 7, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route9_EventScript_1A9DB7", + "flag": "0" + }, + { + "graphics_id": "56", + "x": 53, + "y": 2, + "elevation": 3, + "movement_type": "5", + "movement_range_x": 3, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route9_EventScript_1A9F2B", + "flag": "0" + }, + { + "graphics_id": "40", + "x": 60, + "y": 9, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route9_EventScript_1A9EAF", + "flag": "0" + }, + { + "graphics_id": "39", + "x": 36, + "y": 6, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "Route9_EventScript_1A9E33", + "flag": "0" + }, + { + "graphics_id": "95", + "x": 2, + "y": 8, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route9_EventScript_1BDF13", + "flag": "18" + }, + { + "graphics_id": "92", + "x": 12, + "y": 17, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route9_EventScript_1BE6B9", + "flag": "363" + }, + { + "graphics_id": "92", + "x": 65, + "y": 17, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route9_EventScript_1BEAFD", + "flag": "450" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 29, + "y": 7, + "elevation": 0, + "script": "Route9_EventScript_167FD0" + }, + { + "type": "hidden_item", + "x": 15, + "y": 7, + "elevation": 0, + "item": "ITEM_ETHER", + "flag": "6", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 63, + "y": 2, + "elevation": 3, + "item": "ITEM_RARE_CANDY", + "flag": "123", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 48, + "y": 2, + "elevation": 3, + "item": "ITEM_CHESTO_BERRY", + "flag": "150", + "unknown": 1 + } + ] +}
\ No newline at end of file diff --git a/data/maps/SSAnne_1F_Corridor/events.inc b/data/maps/SSAnne_1F_Corridor/events.inc deleted file mode 100644 index b14b6eb29..000000000 --- a/data/maps/SSAnne_1F_Corridor/events.inc +++ /dev/null @@ -1,21 +0,0 @@ -SSAnne_1F_Corridor_EventObjects: - object_event 1, 62, 0, 18, 0, 8, 0, 3, 7, 17, 0, 0, 0, 0, 0, SSAnne_1F_Corridor_EventScript_1608D5, 0, 0, 0 - object_event 2, 47, 0, 12, 0, 9, 0, 3, 8, 17, 0, 0, 0, 0, 0, SSAnne_1F_Corridor_EventScript_1608CC, 0, 0, 0 - -SSAnne_1F_Corridor_MapWarps: - warp_def 3, 8, 3, 0, 262 - warp_def 2, 18, 3, 0, 266 - warp_def 19, 1, 3, 2, 260 - warp_def 20, 0, 0, 3, 260 - warp_def 3, 20, 0, 0, 266 - warp_def 28, 17, 3, 0, 264 - warp_def 5, 10, 3, 0, 268 - warp_def 8, 10, 3, 0, 269 - warp_def 11, 10, 3, 0, 270 - warp_def 14, 10, 3, 0, 271 - warp_def 17, 10, 3, 0, 272 - warp_def 23, 10, 3, 0, 273 - warp_def 20, 10, 3, 0, 285 - -SSAnne_1F_Corridor_MapEvents:: - map_events SSAnne_1F_Corridor_EventObjects, SSAnne_1F_Corridor_MapWarps, 0x0, 0x0 diff --git a/data/maps/SSAnne_1F_Corridor/header.inc b/data/maps/SSAnne_1F_Corridor/header.inc deleted file mode 100644 index 120c6e9b0..000000000 --- a/data/maps/SSAnne_1F_Corridor/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SSAnne_1F_Corridor:: @ 834F2A0 - .4byte SSAnne_1F_Corridor_Layout @ 0x82FFB4C - .4byte SSAnne_1F_Corridor_MapEvents @ 0x83AE974 - .4byte SSAnne_1F_Corridor_MapScripts @ 0x81608CB - .4byte NULL - .2byte BGM_FRLG_SS_ANNE - .2byte 119 - .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/SSAnne_1F_Corridor/map.json b/data/maps/SSAnne_1F_Corridor/map.json new file mode 100644 index 000000000..864ebe0dd --- /dev/null +++ b/data/maps/SSAnne_1F_Corridor/map.json @@ -0,0 +1,138 @@ +{ + "id": "MAP_SSANNE_1F_CORRIDOR", + "name": "SSAnne_1F_Corridor", + "layout": "LAYOUT_SSANNE_1F_CORRIDOR", + "music": "BGM_FRLG_SS_ANNE", + "region_map_section": "MAPSEC_S_S_ANNE", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "62", + "x": 18, + "y": 8, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SSAnne_1F_Corridor_EventScript_1608D5", + "flag": "0" + }, + { + "graphics_id": "47", + "x": 12, + "y": 9, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SSAnne_1F_Corridor_EventScript_1608CC", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 8, + "elevation": 3, + "dest_map": "MAP_SSANNE_2F_CORRIDOR", + "dest_warp_id": 0 + }, + { + "x": 2, + "y": 18, + "elevation": 3, + "dest_map": "MAP_SSANNE_KITCHEN", + "dest_warp_id": 0 + }, + { + "x": 19, + "y": 1, + "elevation": 3, + "dest_map": "MAP_SSANNE_EXTERIOR", + "dest_warp_id": 2 + }, + { + "x": 20, + "y": 0, + "elevation": 0, + "dest_map": "MAP_SSANNE_EXTERIOR", + "dest_warp_id": 3 + }, + { + "x": 3, + "y": 20, + "elevation": 0, + "dest_map": "MAP_SSANNE_KITCHEN", + "dest_warp_id": 0 + }, + { + "x": 28, + "y": 17, + "elevation": 3, + "dest_map": "MAP_SSANNE_B1F_CORRIDOR", + "dest_warp_id": 0 + }, + { + "x": 5, + "y": 10, + "elevation": 3, + "dest_map": "MAP_SSANNE_1F_ROOM1", + "dest_warp_id": 0 + }, + { + "x": 8, + "y": 10, + "elevation": 3, + "dest_map": "MAP_SSANNE_1F_ROOM2", + "dest_warp_id": 0 + }, + { + "x": 11, + "y": 10, + "elevation": 3, + "dest_map": "MAP_SSANNE_1F_ROOM3", + "dest_warp_id": 0 + }, + { + "x": 14, + "y": 10, + "elevation": 3, + "dest_map": "MAP_SSANNE_1F_ROOM4", + "dest_warp_id": 0 + }, + { + "x": 17, + "y": 10, + "elevation": 3, + "dest_map": "MAP_SSANNE_1F_ROOM5", + "dest_warp_id": 0 + }, + { + "x": 23, + "y": 10, + "elevation": 3, + "dest_map": "MAP_SSANNE_1F_ROOM7", + "dest_warp_id": 0 + }, + { + "x": 20, + "y": 10, + "elevation": 3, + "dest_map": "MAP_SSANNE_1F_ROOM6", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/SSAnne_1F_Room1/events.inc b/data/maps/SSAnne_1F_Room1/events.inc deleted file mode 100644 index d4a52f794..000000000 --- a/data/maps/SSAnne_1F_Room1/events.inc +++ /dev/null @@ -1,8 +0,0 @@ -SSAnne_1F_Room1_EventObjects: - object_event 1, 61, 0, 2, 0, 5, 0, 3, 5, 18, 0, 0, 0, 0, 0, SSAnne_1F_Room1_EventScript_160BDC, 0, 0, 0 - -SSAnne_1F_Room1_MapWarps: - warp_def 2, 1, 0, 6, 261 - -SSAnne_1F_Room1_MapEvents:: - map_events SSAnne_1F_Room1_EventObjects, SSAnne_1F_Room1_MapWarps, 0x0, 0x0 diff --git a/data/maps/SSAnne_1F_Room1/header.inc b/data/maps/SSAnne_1F_Room1/header.inc deleted file mode 100644 index dfe367802..000000000 --- a/data/maps/SSAnne_1F_Room1/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SSAnne_1F_Room1:: @ 834F364 - .4byte SSAnne_Room1_Layout @ 0x8319E74 - .4byte SSAnne_1F_Room1_MapEvents @ 0x83AECEC - .4byte SSAnne_1F_Room1_MapScripts @ 0x8160BDB - .4byte NULL - .2byte BGM_FRLG_SS_ANNE - .2byte 177 - .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/SSAnne_1F_Room1/map.json b/data/maps/SSAnne_1F_Room1/map.json new file mode 100644 index 000000000..e83821225 --- /dev/null +++ b/data/maps/SSAnne_1F_Room1/map.json @@ -0,0 +1,41 @@ +{ + "id": "MAP_SSANNE_1F_ROOM1", + "name": "SSAnne_1F_Room1", + "layout": "LAYOUT_SSANNE_ROOM1", + "music": "BGM_FRLG_SS_ANNE", + "region_map_section": "MAPSEC_S_S_ANNE", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "61", + "x": 2, + "y": 5, + "elevation": 3, + "movement_type": "5", + "movement_range_x": 2, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SSAnne_1F_Room1_EventScript_160BDC", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 2, + "y": 1, + "elevation": 0, + "dest_map": "MAP_SSANNE_1F_CORRIDOR", + "dest_warp_id": 6 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/SSAnne_1F_Room11/events.inc b/data/maps/SSAnne_1F_Room11/events.inc deleted file mode 100644 index eb4cf4b37..000000000 --- a/data/maps/SSAnne_1F_Room11/events.inc +++ /dev/null @@ -1,24 +0,0 @@ -SSAnne_1F_Room11_EventObjects: - object_event 1, 28, 0, 48, 0, 15, 0, 3, 20, 17, 0, 1, 0, 3, 0, SSAnne_1F_Room11_EventScript_164590, 0, 0, 0 - object_event 2, 28, 0, 10, 0, 5, 0, 3, 18, 17, 0, 1, 0, 2, 0, SSAnne_1F_Room11_EventScript_1645A7, 0, 0, 0 - object_event 3, 20, 0, 51, 0, 6, 0, 3, 8, 17, 0, 1, 0, 2, 0, SSAnne_1F_Room11_EventScript_1645BE, 0, 0, 0 - object_event 4, 20, 0, 12, 0, 13, 0, 3, 2, 33, 0, 1, 0, 2, 0, SSAnne_1F_Room11_EventScript_1645D5, 0, 0, 0 - object_event 5, 20, 0, 37, 0, 23, 0, 3, 51, 82, 0, 1, 0, 1, 0, SSAnne_1F_Room11_EventScript_1645EC, 0, 0, 0 - object_event 6, 18, 0, 32, 0, 5, 0, 3, 8, 17, 0, 1, 0, 2, 0, SSAnne_1F_Room11_EventScript_164603, 0, 0, 0 - object_event 7, 18, 0, 52, 0, 20, 0, 3, 10, 17, 0, 1, 0, 4, 0, SSAnne_1F_Room11_EventScript_16461A, 0, 0, 0 - object_event 8, 22, 0, 8, 0, 21, 0, 3, 17, 17, 0, 1, 0, 5, 0, SSAnne_1F_Room11_EventScript_164631, 0, 0, 0 - object_event 9, 22, 0, 39, 0, 6, 0, 3, 2, 17, 0, 1, 0, 3, 0, SSAnne_1F_Room11_EventScript_164648, 0, 0, 0 - object_event 10, 39, 0, 3, 0, 9, 0, 3, 3, 33, 0, 1, 0, 3, 0, SSAnne_1F_Room11_EventScript_16465F, 0, 0, 0 - object_event 11, 40, 0, 19, 0, 24, 0, 3, 28, 21, 0, 1, 0, 1, 0, SSAnne_1F_Room11_EventScript_164676, 0, 0, 0 - object_event 12, 56, 0, 30, 0, 19, 0, 3, 7, 17, 0, 1, 0, 3, 0, SSAnne_1F_Room11_EventScript_16468D, 0, 0, 0 - -SSAnne_1F_Room11_MapWarps: - warp_def 54, 26, 3, 0, 827 - warp_def 55, 26, 3, 0, 827 - warp_def 56, 26, 3, 1, 827 - warp_def 3, 26, 3, 2, 827 - warp_def 4, 26, 3, 2, 827 - warp_def 5, 26, 3, 3, 827 - -SSAnne_1F_Room11_MapEvents:: - map_events SSAnne_1F_Room11_EventObjects, SSAnne_1F_Room11_MapWarps, 0x0, 0x0 diff --git a/data/maps/SSAnne_1F_Room11/header.inc b/data/maps/SSAnne_1F_Room11/header.inc deleted file mode 100644 index b7daaaf24..000000000 --- a/data/maps/SSAnne_1F_Room11/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SSAnne_1F_Room11:: @ 834FF50 - .4byte SSAnne_1F_Room11_Layout @ 0x8345030 - .4byte SSAnne_1F_Room11_MapEvents @ 0x83B3B34 - .4byte SSAnne_1F_Room11_MapScripts @ 0x8164559 - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_FOREST - .2byte 317 - .byte 0xb6, 0x00, 0x00, 0x03, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/SSAnne_1F_Room11/scripts.inc b/data/maps/SSAnne_1F_Room11/scripts.inc deleted file mode 100644 index 35696cb68..000000000 --- a/data/maps/SSAnne_1F_Room11/scripts.inc +++ /dev/null @@ -1,92 +0,0 @@ -SSAnne_1F_Room11_MapScripts:: @ 8164559 - map_script 3, SSAnne_1F_Room11_MapScript1_16455F - .byte 0 - -SSAnne_1F_Room11_MapScript1_16455F:: @ 816455F - setworldmapflag 2237 - getplayerxy VAR_0x4001, VAR_0x4002 - compare_var_to_value VAR_0x4001, 50 - call_if 4, EventScript_16457E - compare_var_to_value VAR_0x4001, 49 - call_if 3, EventScript_164587 - end - -EventScript_16457E:: @ 816457E - setescapewarp MAP_SIX_ISLAND_GREENPATH, 255, 64, 10 - return - -EventScript_164587:: @ 8164587 - setescapewarp MAP_SIX_ISLAND_GREENPATH, 255, 45, 10 - return - -SSAnne_1F_Room11_EventScript_164590:: @ 8164590 - trainerbattle 0, 609, 0, Text_17BF3A, Text_17BF66 - loadword 0, gUnknown_817BF97 - callstd 6 - end - -SSAnne_1F_Room11_EventScript_1645A7:: @ 81645A7 - trainerbattle 0, 610, 0, Text_17BFEB, Text_17C028 - loadword 0, gUnknown_817C056 - callstd 6 - end - -SSAnne_1F_Room11_EventScript_1645BE:: @ 81645BE - trainerbattle 0, 611, 0, Text_17C0BE, Text_17C0F2 - loadword 0, gUnknown_817C113 - callstd 6 - end - -SSAnne_1F_Room11_EventScript_1645D5:: @ 81645D5 - trainerbattle 0, 612, 0, Text_17C155, Text_17C196 - loadword 0, gUnknown_817C1D0 - callstd 6 - end - -SSAnne_1F_Room11_EventScript_1645EC:: @ 81645EC - trainerbattle 0, 613, 0, Text_17C246, Text_17C275 - loadword 0, gUnknown_817C2A4 - callstd 6 - end - -SSAnne_1F_Room11_EventScript_164603:: @ 8164603 - trainerbattle 0, 614, 0, Text_17C2D9, Text_17C30D - loadword 0, gUnknown_817C31C - callstd 6 - end - -SSAnne_1F_Room11_EventScript_16461A:: @ 816461A - trainerbattle 0, 615, 0, Text_17C373, Text_17C3A5 - loadword 0, gUnknown_817C3CE - callstd 6 - end - -SSAnne_1F_Room11_EventScript_164631:: @ 8164631 - trainerbattle 0, 616, 0, Text_17C42B, Text_17C458 - loadword 0, gUnknown_817C490 - callstd 6 - end - -SSAnne_1F_Room11_EventScript_164648:: @ 8164648 - trainerbattle 0, 617, 0, Text_17C4FE, Text_17C552 - loadword 0, gUnknown_817C590 - callstd 6 - end - -SSAnne_1F_Room11_EventScript_16465F:: @ 816465F - trainerbattle 0, 618, 0, Text_17C5DB, Text_17C609 - loadword 0, gUnknown_817C615 - callstd 6 - end - -SSAnne_1F_Room11_EventScript_164676:: @ 8164676 - trainerbattle 0, 619, 0, Text_17C63E, Text_17C660 - loadword 0, gUnknown_817C68E - callstd 6 - end - -SSAnne_1F_Room11_EventScript_16468D:: @ 816468D - trainerbattle 0, 620, 0, Text_17C6C9, Text_17C6FB - loadword 0, gUnknown_817C728 - callstd 6 - end diff --git a/data/maps/SSAnne_1F_Room12/events.inc b/data/maps/SSAnne_1F_Room12/events.inc deleted file mode 100644 index b6bafe7e3..000000000 --- a/data/maps/SSAnne_1F_Room12/events.inc +++ /dev/null @@ -1,5 +0,0 @@ -SSAnne_1F_Room12_MapWarps: - warp_def 18, 22, 3, 0, 826 - -SSAnne_1F_Room12_MapEvents:: - map_events 0x0, SSAnne_1F_Room12_MapWarps, 0x0, 0x0 diff --git a/data/maps/SSAnne_1F_Room12/header.inc b/data/maps/SSAnne_1F_Room12/header.inc deleted file mode 100644 index 067d21360..000000000 --- a/data/maps/SSAnne_1F_Room12/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SSAnne_1F_Room12:: @ 834FF6C - .4byte SSAnne_1F_Room12_Layout @ 0x8347A50 - .4byte SSAnne_1F_Room12_MapEvents @ 0x83B3B50 - .4byte SSAnne_1F_Room12_MapScripts @ 0x81646A4 - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 340 - .byte 0xb7, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/SSAnne_1F_Room12/scripts.inc b/data/maps/SSAnne_1F_Room12/scripts.inc deleted file mode 100644 index 5f52018d8..000000000 --- a/data/maps/SSAnne_1F_Room12/scripts.inc +++ /dev/null @@ -1,7 +0,0 @@ -SSAnne_1F_Room12_MapScripts:: @ 81646A4 - map_script 3, SSAnne_1F_Room12_MapScript1_1646AA - .byte 0 - -SSAnne_1F_Room12_MapScript1_1646AA:: @ 81646AA - setworldmapflag 2238 - end diff --git a/data/maps/SSAnne_1F_Room2/events.inc b/data/maps/SSAnne_1F_Room2/events.inc deleted file mode 100644 index 72afcb7d2..000000000 --- a/data/maps/SSAnne_1F_Room2/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -SSAnne_1F_Room2_EventObjects: - object_event 1, 22, 0, 5, 0, 3, 0, 3, 17, 17, 0, 1, 0, 2, 0, SSAnne_1F_Room2_EventScript_160BEF, 0, 0, 0 - object_event 2, 18, 0, 0, 0, 4, 0, 3, 10, 17, 0, 1, 0, 3, 0, SSAnne_1F_Room2_EventScript_160C06, 0, 0, 0 - object_event 3, 28, 0, 2, 0, 6, 0, 3, 9, 17, 0, 0, 0, 1, 0, SSAnne_1F_Room2_EventScript_160BE6, 0, 0, 0 - object_event 4, 92, 0, 5, 0, 7, 0, 3, 8, 17, 0, 0, 0, 0, 0, SSAnne_1F_Room2_EventScript_1BE65E, 356, 0, 0 - -SSAnne_1F_Room2_MapWarps: - warp_def 2, 1, 0, 7, 261 - -SSAnne_1F_Room2_MapEvents:: - map_events SSAnne_1F_Room2_EventObjects, SSAnne_1F_Room2_MapWarps, 0x0, 0x0 diff --git a/data/maps/SSAnne_1F_Room2/header.inc b/data/maps/SSAnne_1F_Room2/header.inc deleted file mode 100644 index 051f27424..000000000 --- a/data/maps/SSAnne_1F_Room2/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SSAnne_1F_Room2:: @ 834F380 - .4byte SSAnne_Room1_Layout @ 0x8319E74 - .4byte SSAnne_1F_Room2_MapEvents @ 0x83AED68 - .4byte SSAnne_1F_Room2_MapScripts @ 0x8160BE5 - .4byte NULL - .2byte BGM_FRLG_SS_ANNE - .2byte 177 - .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/SSAnne_1F_Room2/map.json b/data/maps/SSAnne_1F_Room2/map.json new file mode 100644 index 000000000..4649e12ca --- /dev/null +++ b/data/maps/SSAnne_1F_Room2/map.json @@ -0,0 +1,80 @@ +{ + "id": "MAP_SSANNE_1F_ROOM2", + "name": "SSAnne_1F_Room2", + "layout": "LAYOUT_SSANNE_ROOM1", + "music": "BGM_FRLG_SS_ANNE", + "region_map_section": "MAPSEC_S_S_ANNE", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "22", + "x": 5, + "y": 3, + "elevation": 3, + "movement_type": "17", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "SSAnne_1F_Room2_EventScript_160BEF", + "flag": "0" + }, + { + "graphics_id": "18", + "x": 0, + "y": 4, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "SSAnne_1F_Room2_EventScript_160C06", + "flag": "0" + }, + { + "graphics_id": "28", + "x": 2, + "y": 6, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 1, + "script": "SSAnne_1F_Room2_EventScript_160BE6", + "flag": "0" + }, + { + "graphics_id": "92", + "x": 5, + "y": 7, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SSAnne_1F_Room2_EventScript_1BE65E", + "flag": "356" + } + ], + "warp_events": [ + { + "x": 2, + "y": 1, + "elevation": 0, + "dest_map": "MAP_SSANNE_1F_CORRIDOR", + "dest_warp_id": 7 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/SSAnne_1F_Room3/events.inc b/data/maps/SSAnne_1F_Room3/events.inc deleted file mode 100644 index 47565243b..000000000 --- a/data/maps/SSAnne_1F_Room3/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -SSAnne_1F_Room3_EventObjects: - object_event 1, 17, 0, 3, 0, 4, 0, 3, 52, 50, 0, 0, 0, 0, 0, SSAnne_1F_Room3_EventScript_160C1E, 0, 0, 0 - object_event 2, 131, 0, 4, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, SSAnne_1F_Room3_EventScript_160C30, 0, 0, 0 - object_event 3, 30, 0, 0, 0, 4, 0, 3, 10, 17, 0, 0, 0, 0, 0, SSAnne_1F_Room3_EventScript_160C27, 0, 0, 0 - -SSAnne_1F_Room3_MapWarps: - warp_def 2, 1, 0, 8, 261 - -SSAnne_1F_Room3_MapEvents:: - map_events SSAnne_1F_Room3_EventObjects, SSAnne_1F_Room3_MapWarps, 0x0, 0x0 diff --git a/data/maps/SSAnne_1F_Room3/header.inc b/data/maps/SSAnne_1F_Room3/header.inc deleted file mode 100644 index 0240062db..000000000 --- a/data/maps/SSAnne_1F_Room3/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SSAnne_1F_Room3:: @ 834F39C - .4byte SSAnne_Room1_Layout @ 0x8319E74 - .4byte SSAnne_1F_Room3_MapEvents @ 0x83AEDCC - .4byte SSAnne_1F_Room3_MapScripts @ 0x8160C1D - .4byte NULL - .2byte BGM_FRLG_SS_ANNE - .2byte 177 - .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/SSAnne_1F_Room3/map.json b/data/maps/SSAnne_1F_Room3/map.json new file mode 100644 index 000000000..b47bf6ddd --- /dev/null +++ b/data/maps/SSAnne_1F_Room3/map.json @@ -0,0 +1,67 @@ +{ + "id": "MAP_SSANNE_1F_ROOM3", + "name": "SSAnne_1F_Room3", + "layout": "LAYOUT_SSANNE_ROOM1", + "music": "BGM_FRLG_SS_ANNE", + "region_map_section": "MAPSEC_S_S_ANNE", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "17", + "x": 3, + "y": 4, + "elevation": 3, + "movement_type": "52", + "movement_range_x": 2, + "movement_range_y": 3, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SSAnne_1F_Room3_EventScript_160C1E", + "flag": "0" + }, + { + "graphics_id": "131", + "x": 4, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SSAnne_1F_Room3_EventScript_160C30", + "flag": "0" + }, + { + "graphics_id": "30", + "x": 0, + "y": 4, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SSAnne_1F_Room3_EventScript_160C27", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 2, + "y": 1, + "elevation": 0, + "dest_map": "MAP_SSANNE_1F_CORRIDOR", + "dest_warp_id": 8 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/SSAnne_1F_Room4/events.inc b/data/maps/SSAnne_1F_Room4/events.inc deleted file mode 100644 index 45969a0a8..000000000 --- a/data/maps/SSAnne_1F_Room4/events.inc +++ /dev/null @@ -1,8 +0,0 @@ -SSAnne_1F_Room4_EventObjects: - object_event 1, 23, 0, 2, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, SSAnne_1F_Room4_EventScript_160C44, 0, 0, 0 - -SSAnne_1F_Room4_MapWarps: - warp_def 2, 1, 0, 9, 261 - -SSAnne_1F_Room4_MapEvents:: - map_events SSAnne_1F_Room4_EventObjects, SSAnne_1F_Room4_MapWarps, 0x0, 0x0 diff --git a/data/maps/SSAnne_1F_Room4/header.inc b/data/maps/SSAnne_1F_Room4/header.inc deleted file mode 100644 index 18b679d2c..000000000 --- a/data/maps/SSAnne_1F_Room4/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SSAnne_1F_Room4:: @ 834F3B8 - .4byte SSAnne_Room1_Layout @ 0x8319E74 - .4byte SSAnne_1F_Room4_MapEvents @ 0x83AEE00 - .4byte SSAnne_1F_Room4_MapScripts @ 0x8160C43 - .4byte NULL - .2byte BGM_FRLG_SS_ANNE - .2byte 177 - .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/SSAnne_1F_Room4/map.json b/data/maps/SSAnne_1F_Room4/map.json new file mode 100644 index 000000000..4a4c62769 --- /dev/null +++ b/data/maps/SSAnne_1F_Room4/map.json @@ -0,0 +1,41 @@ +{ + "id": "MAP_SSANNE_1F_ROOM4", + "name": "SSAnne_1F_Room4", + "layout": "LAYOUT_SSANNE_ROOM1", + "music": "BGM_FRLG_SS_ANNE", + "region_map_section": "MAPSEC_S_S_ANNE", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "23", + "x": 2, + "y": 4, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SSAnne_1F_Room4_EventScript_160C44", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 2, + "y": 1, + "elevation": 0, + "dest_map": "MAP_SSANNE_1F_CORRIDOR", + "dest_warp_id": 9 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/SSAnne_1F_Room5/events.inc b/data/maps/SSAnne_1F_Room5/events.inc deleted file mode 100644 index 214544b3c..000000000 --- a/data/maps/SSAnne_1F_Room5/events.inc +++ /dev/null @@ -1,8 +0,0 @@ -SSAnne_1F_Room5_EventObjects: - object_event 1, 61, 0, 2, 0, 6, 0, 3, 7, 17, 0, 1, 0, 4, 0, SSAnne_1F_Room5_EventScript_160C67, 0, 0, 0 - -SSAnne_1F_Room5_MapWarps: - warp_def 2, 1, 0, 10, 261 - -SSAnne_1F_Room5_MapEvents:: - map_events SSAnne_1F_Room5_EventObjects, SSAnne_1F_Room5_MapWarps, 0x0, 0x0 diff --git a/data/maps/SSAnne_1F_Room5/header.inc b/data/maps/SSAnne_1F_Room5/header.inc deleted file mode 100644 index c9e14fcab..000000000 --- a/data/maps/SSAnne_1F_Room5/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SSAnne_1F_Room5:: @ 834F3D4 - .4byte SSAnne_Room1_Layout @ 0x8319E74 - .4byte SSAnne_1F_Room5_MapEvents @ 0x83AEE34 - .4byte SSAnne_1F_Room5_MapScripts @ 0x8160C66 - .4byte NULL - .2byte BGM_FRLG_SS_ANNE - .2byte 177 - .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/SSAnne_1F_Room5/map.json b/data/maps/SSAnne_1F_Room5/map.json new file mode 100644 index 000000000..d7d2eb16f --- /dev/null +++ b/data/maps/SSAnne_1F_Room5/map.json @@ -0,0 +1,41 @@ +{ + "id": "MAP_SSANNE_1F_ROOM5", + "name": "SSAnne_1F_Room5", + "layout": "LAYOUT_SSANNE_ROOM1", + "music": "BGM_FRLG_SS_ANNE", + "region_map_section": "MAPSEC_S_S_ANNE", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "61", + "x": 2, + "y": 6, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "SSAnne_1F_Room5_EventScript_160C67", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 2, + "y": 1, + "elevation": 0, + "dest_map": "MAP_SSANNE_1F_CORRIDOR", + "dest_warp_id": 10 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/SSAnne_1F_Room6/events.inc b/data/maps/SSAnne_1F_Room6/events.inc deleted file mode 100644 index bbbd7b8f8..000000000 --- a/data/maps/SSAnne_1F_Room6/events.inc +++ /dev/null @@ -1,8 +0,0 @@ -SSAnne_1F_Room6_EventObjects: - object_event 1, 28, 0, 3, 0, 5, 0, 3, 7, 17, 0, 0, 0, 0, 0, SSAnne_1F_Room6_EventScript_160DF3, 0, 0, 0 - -SSAnne_1F_Room6_MapWarps: - warp_def 2, 1, 0, 12, 261 - -SSAnne_1F_Room6_MapEvents:: - map_events SSAnne_1F_Room6_EventObjects, SSAnne_1F_Room6_MapWarps, 0x0, 0x0 diff --git a/data/maps/SSAnne_1F_Room6/header.inc b/data/maps/SSAnne_1F_Room6/header.inc deleted file mode 100644 index 689a053ef..000000000 --- a/data/maps/SSAnne_1F_Room6/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SSAnne_1F_Room6:: @ 834F540 - .4byte SSAnne_Room1_Layout @ 0x8319E74 - .4byte SSAnne_1F_Room6_MapEvents @ 0x83AF210 - .4byte SSAnne_1F_Room6_MapScripts @ 0x8160DF2 - .4byte NULL - .2byte BGM_FRLG_SS_ANNE - .2byte 177 - .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/SSAnne_1F_Room6/map.json b/data/maps/SSAnne_1F_Room6/map.json new file mode 100644 index 000000000..75cc7b348 --- /dev/null +++ b/data/maps/SSAnne_1F_Room6/map.json @@ -0,0 +1,41 @@ +{ + "id": "MAP_SSANNE_1F_ROOM6", + "name": "SSAnne_1F_Room6", + "layout": "LAYOUT_SSANNE_ROOM1", + "music": "BGM_FRLG_SS_ANNE", + "region_map_section": "MAPSEC_S_S_ANNE", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "28", + "x": 3, + "y": 5, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SSAnne_1F_Room6_EventScript_160DF3", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 2, + "y": 1, + "elevation": 0, + "dest_map": "MAP_SSANNE_1F_CORRIDOR", + "dest_warp_id": 12 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/SSAnne_1F_Room7/events.inc b/data/maps/SSAnne_1F_Room7/events.inc deleted file mode 100644 index e8ea182ed..000000000 --- a/data/maps/SSAnne_1F_Room7/events.inc +++ /dev/null @@ -1,8 +0,0 @@ -SSAnne_1F_Room7_EventObjects: - object_event 1, 61, 0, 4, 0, 3, 0, 3, 9, 17, 0, 1, 0, 3, 0, SSAnne_1F_Room7_EventScript_160C7F, 0, 0, 0 - -SSAnne_1F_Room7_MapWarps: - warp_def 2, 1, 0, 11, 261 - -SSAnne_1F_Room7_MapEvents:: - map_events SSAnne_1F_Room7_EventObjects, SSAnne_1F_Room7_MapWarps, 0x0, 0x0 diff --git a/data/maps/SSAnne_1F_Room7/header.inc b/data/maps/SSAnne_1F_Room7/header.inc deleted file mode 100644 index 218ed0557..000000000 --- a/data/maps/SSAnne_1F_Room7/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SSAnne_1F_Room7:: @ 834F3F0 - .4byte SSAnne_Room1_Layout @ 0x8319E74 - .4byte SSAnne_1F_Room7_MapEvents @ 0x83AEE68 - .4byte SSAnne_1F_Room7_MapScripts @ 0x8160C7E - .4byte NULL - .2byte BGM_FRLG_SS_ANNE - .2byte 177 - .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/SSAnne_1F_Room7/map.json b/data/maps/SSAnne_1F_Room7/map.json new file mode 100644 index 000000000..0dffef5c4 --- /dev/null +++ b/data/maps/SSAnne_1F_Room7/map.json @@ -0,0 +1,41 @@ +{ + "id": "MAP_SSANNE_1F_ROOM7", + "name": "SSAnne_1F_Room7", + "layout": "LAYOUT_SSANNE_ROOM1", + "music": "BGM_FRLG_SS_ANNE", + "region_map_section": "MAPSEC_S_S_ANNE", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "61", + "x": 4, + "y": 3, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "SSAnne_1F_Room7_EventScript_160C7F", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 2, + "y": 1, + "elevation": 0, + "dest_map": "MAP_SSANNE_1F_CORRIDOR", + "dest_warp_id": 11 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/SSAnne_2F_Corridor/events.inc b/data/maps/SSAnne_2F_Corridor/events.inc deleted file mode 100644 index 040240ef5..000000000 --- a/data/maps/SSAnne_2F_Corridor/events.inc +++ /dev/null @@ -1,22 +0,0 @@ -SSAnne_2F_Corridor_EventObjects: - object_event 1, 72, 0, 30, 0, 2, 0, 3, 9, 17, 0, 0, 0, 0, 0, 0x0, 61, 0, 0 - object_event 2, 62, 0, 2, 0, 7, 0, 3, 3, 33, 0, 0, 0, 0, 0, SSAnne_2F_Corridor_EventScript_160A54, 0, 0, 0 - -SSAnne_2F_Corridor_MapWarps: - warp_def 2, 2, 3, 0, 261 - warp_def 3, 12, 3, 1, 263 - warp_def 30, 2, 3, 0, 267 - warp_def 6, 10, 0, 0, 274 - warp_def 10, 10, 0, 0, 275 - warp_def 14, 10, 0, 0, 276 - warp_def 18, 10, 0, 0, 277 - warp_def 22, 10, 0, 0, 278 - warp_def 26, 10, 0, 0, 279 - -SSAnne_2F_Corridor_MapCoordEvents: - coord_event 30, 6, 3, 0, 16475, 0, 0, SSAnne_2F_Corridor_EventScript_1608DF - coord_event 31, 6, 3, 0, 16475, 0, 0, SSAnne_2F_Corridor_EventScript_1608EB - coord_event 32, 6, 3, 0, 16475, 0, 0, SSAnne_2F_Corridor_EventScript_1608F7 - -SSAnne_2F_Corridor_MapEvents:: - map_events SSAnne_2F_Corridor_EventObjects, SSAnne_2F_Corridor_MapWarps, SSAnne_2F_Corridor_MapCoordEvents, 0x0 diff --git a/data/maps/SSAnne_2F_Corridor/header.inc b/data/maps/SSAnne_2F_Corridor/header.inc deleted file mode 100644 index 6321b0246..000000000 --- a/data/maps/SSAnne_2F_Corridor/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SSAnne_2F_Corridor:: @ 834F2BC - .4byte SSAnne_2F_Corridor_Layout @ 0x82FFFB0 - .4byte SSAnne_2F_Corridor_MapEvents @ 0x83AEA30 - .4byte SSAnne_2F_Corridor_MapScripts @ 0x81608DE - .4byte NULL - .2byte BGM_FRLG_SS_ANNE - .2byte 120 - .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/SSAnne_2F_Corridor/map.json b/data/maps/SSAnne_2F_Corridor/map.json new file mode 100644 index 000000000..d634f353e --- /dev/null +++ b/data/maps/SSAnne_2F_Corridor/map.json @@ -0,0 +1,138 @@ +{ + "id": "MAP_SSANNE_2F_CORRIDOR", + "name": "SSAnne_2F_Corridor", + "layout": "LAYOUT_SSANNE_2F_CORRIDOR", + "music": "BGM_FRLG_SS_ANNE", + "region_map_section": "MAPSEC_S_S_ANNE", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "72", + "x": 30, + "y": 2, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "61" + }, + { + "graphics_id": "62", + "x": 2, + "y": 7, + "elevation": 3, + "movement_type": "3", + "movement_range_x": 1, + "movement_range_y": 2, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SSAnne_2F_Corridor_EventScript_160A54", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 2, + "y": 2, + "elevation": 3, + "dest_map": "MAP_SSANNE_1F_CORRIDOR", + "dest_warp_id": 0 + }, + { + "x": 3, + "y": 12, + "elevation": 3, + "dest_map": "MAP_SSANNE_3F_CORRIDOR", + "dest_warp_id": 1 + }, + { + "x": 30, + "y": 2, + "elevation": 3, + "dest_map": "MAP_SSANNE_CAPTAINS_OFFICE", + "dest_warp_id": 0 + }, + { + "x": 6, + "y": 10, + "elevation": 0, + "dest_map": "MAP_SSANNE_2F_ROOM1", + "dest_warp_id": 0 + }, + { + "x": 10, + "y": 10, + "elevation": 0, + "dest_map": "MAP_SSANNE_2F_ROOM2", + "dest_warp_id": 0 + }, + { + "x": 14, + "y": 10, + "elevation": 0, + "dest_map": "MAP_SSANNE_2F_ROOM3", + "dest_warp_id": 0 + }, + { + "x": 18, + "y": 10, + "elevation": 0, + "dest_map": "MAP_SSANNE_2F_ROOM4", + "dest_warp_id": 0 + }, + { + "x": 22, + "y": 10, + "elevation": 0, + "dest_map": "MAP_SSANNE_2F_ROOM5", + "dest_warp_id": 0 + }, + { + "x": 26, + "y": 10, + "elevation": 0, + "dest_map": "MAP_SSANNE_2F_ROOM6", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 30, + "y": 6, + "elevation": 3, + "var": "VAR_0x405B", + "var_value": 0, + "script": "SSAnne_2F_Corridor_EventScript_1608DF" + }, + { + "type": "trigger", + "x": 31, + "y": 6, + "elevation": 3, + "var": "VAR_0x405B", + "var_value": 0, + "script": "SSAnne_2F_Corridor_EventScript_1608EB" + }, + { + "type": "trigger", + "x": 32, + "y": 6, + "elevation": 3, + "var": "VAR_0x405B", + "var_value": 0, + "script": "SSAnne_2F_Corridor_EventScript_1608F7" + } + ], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/SSAnne_2F_Room1/events.inc b/data/maps/SSAnne_2F_Room1/events.inc deleted file mode 100644 index 0faf232db..000000000 --- a/data/maps/SSAnne_2F_Room1/events.inc +++ /dev/null @@ -1,8 +0,0 @@ -SSAnne_2F_Room1_EventObjects: - object_event 1, 61, 0, 1, 0, 4, 0, 3, 9, 17, 0, 0, 0, 0, 0, SSAnne_2F_Room1_EventScript_160C97, 0, 0, 0 - -SSAnne_2F_Room1_MapWarps: - warp_def 4, 7, 3, 3, 262 - -SSAnne_2F_Room1_MapEvents:: - map_events SSAnne_2F_Room1_EventObjects, SSAnne_2F_Room1_MapWarps, 0x0, 0x0 diff --git a/data/maps/SSAnne_2F_Room1/header.inc b/data/maps/SSAnne_2F_Room1/header.inc deleted file mode 100644 index 4960880c9..000000000 --- a/data/maps/SSAnne_2F_Room1/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SSAnne_2F_Room1:: @ 834F40C - .4byte SSAnne_Room2_Layout @ 0x8319F04 - .4byte SSAnne_2F_Room1_MapEvents @ 0x83AEE9C - .4byte SSAnne_2F_Room1_MapScripts @ 0x8160C96 - .4byte NULL - .2byte BGM_FRLG_SS_ANNE - .2byte 178 - .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/SSAnne_2F_Room1/map.json b/data/maps/SSAnne_2F_Room1/map.json new file mode 100644 index 000000000..2094f497b --- /dev/null +++ b/data/maps/SSAnne_2F_Room1/map.json @@ -0,0 +1,41 @@ +{ + "id": "MAP_SSANNE_2F_ROOM1", + "name": "SSAnne_2F_Room1", + "layout": "LAYOUT_SSANNE_ROOM2", + "music": "BGM_FRLG_SS_ANNE", + "region_map_section": "MAPSEC_S_S_ANNE", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "61", + "x": 1, + "y": 4, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SSAnne_2F_Room1_EventScript_160C97", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_SSANNE_2F_CORRIDOR", + "dest_warp_id": 3 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/SSAnne_2F_Room2/events.inc b/data/maps/SSAnne_2F_Room2/events.inc deleted file mode 100644 index a7df1228a..000000000 --- a/data/maps/SSAnne_2F_Room2/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -SSAnne_2F_Room2_EventObjects: - object_event 1, 57, 0, 5, 0, 5, 0, 3, 9, 17, 0, 1, 0, 3, 0, SSAnne_2F_Room2_EventScript_160CB1, 0, 0, 0 - object_event 2, 61, 0, 1, 0, 4, 0, 3, 10, 17, 0, 1, 0, 2, 0, SSAnne_2F_Room2_EventScript_160CC8, 0, 0, 0 - object_event 3, 92, 0, 3, 0, 3, 0, 0, 8, 17, 0, 0, 0, 0, 0, SSAnne_2F_Room2_EventScript_1BE66B, 357, 0, 0 - -SSAnne_2F_Room2_MapWarps: - warp_def 4, 7, 3, 4, 262 - -SSAnne_2F_Room2_MapEvents:: - map_events SSAnne_2F_Room2_EventObjects, SSAnne_2F_Room2_MapWarps, 0x0, 0x0 diff --git a/data/maps/SSAnne_2F_Room2/header.inc b/data/maps/SSAnne_2F_Room2/header.inc deleted file mode 100644 index df8bd334f..000000000 --- a/data/maps/SSAnne_2F_Room2/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SSAnne_2F_Room2:: @ 834F428 - .4byte SSAnne_Room2_Layout @ 0x8319F04 - .4byte SSAnne_2F_Room2_MapEvents @ 0x83AEF00 - .4byte SSAnne_2F_Room2_MapScripts @ 0x8160CB0 - .4byte NULL - .2byte BGM_FRLG_SS_ANNE - .2byte 178 - .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/SSAnne_2F_Room2/map.json b/data/maps/SSAnne_2F_Room2/map.json new file mode 100644 index 000000000..c4c95231a --- /dev/null +++ b/data/maps/SSAnne_2F_Room2/map.json @@ -0,0 +1,67 @@ +{ + "id": "MAP_SSANNE_2F_ROOM2", + "name": "SSAnne_2F_Room2", + "layout": "LAYOUT_SSANNE_ROOM2", + "music": "BGM_FRLG_SS_ANNE", + "region_map_section": "MAPSEC_S_S_ANNE", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "57", + "x": 5, + "y": 5, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "SSAnne_2F_Room2_EventScript_160CB1", + "flag": "0" + }, + { + "graphics_id": "61", + "x": 1, + "y": 4, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "SSAnne_2F_Room2_EventScript_160CC8", + "flag": "0" + }, + { + "graphics_id": "92", + "x": 3, + "y": 3, + "elevation": 0, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SSAnne_2F_Room2_EventScript_1BE66B", + "flag": "357" + } + ], + "warp_events": [ + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_SSANNE_2F_CORRIDOR", + "dest_warp_id": 4 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/SSAnne_2F_Room3/events.inc b/data/maps/SSAnne_2F_Room3/events.inc deleted file mode 100644 index 82a89c51f..000000000 --- a/data/maps/SSAnne_2F_Room3/events.inc +++ /dev/null @@ -1,9 +0,0 @@ -SSAnne_2F_Room3_EventObjects: - object_event 1, 61, 0, 2, 0, 5, 0, 3, 5, 17, 0, 0, 0, 0, 0, SSAnne_2F_Room3_EventScript_160CE0, 0, 0, 0 - object_event 2, 32, 0, 3, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, SSAnne_2F_Room3_EventScript_160CE9, 0, 0, 0 - -SSAnne_2F_Room3_MapWarps: - warp_def 4, 7, 3, 5, 262 - -SSAnne_2F_Room3_MapEvents:: - map_events SSAnne_2F_Room3_EventObjects, SSAnne_2F_Room3_MapWarps, 0x0, 0x0 diff --git a/data/maps/SSAnne_2F_Room3/header.inc b/data/maps/SSAnne_2F_Room3/header.inc deleted file mode 100644 index 9d3cb6e63..000000000 --- a/data/maps/SSAnne_2F_Room3/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SSAnne_2F_Room3:: @ 834F444 - .4byte SSAnne_Room2_Layout @ 0x8319F04 - .4byte SSAnne_2F_Room3_MapEvents @ 0x83AEF4C - .4byte SSAnne_2F_Room3_MapScripts @ 0x8160CDF - .4byte NULL - .2byte BGM_FRLG_SS_ANNE - .2byte 178 - .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/SSAnne_2F_Room3/map.json b/data/maps/SSAnne_2F_Room3/map.json new file mode 100644 index 000000000..266e87a29 --- /dev/null +++ b/data/maps/SSAnne_2F_Room3/map.json @@ -0,0 +1,54 @@ +{ + "id": "MAP_SSANNE_2F_ROOM3", + "name": "SSAnne_2F_Room3", + "layout": "LAYOUT_SSANNE_ROOM2", + "music": "BGM_FRLG_SS_ANNE", + "region_map_section": "MAPSEC_S_S_ANNE", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "61", + "x": 2, + "y": 5, + "elevation": 3, + "movement_type": "5", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SSAnne_2F_Room3_EventScript_160CE0", + "flag": "0" + }, + { + "graphics_id": "32", + "x": 3, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SSAnne_2F_Room3_EventScript_160CE9", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_SSANNE_2F_CORRIDOR", + "dest_warp_id": 5 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/SSAnne_2F_Room4/events.inc b/data/maps/SSAnne_2F_Room4/events.inc deleted file mode 100644 index 2a9d4f9f5..000000000 --- a/data/maps/SSAnne_2F_Room4/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -SSAnne_2F_Room4_EventObjects: - object_event 1, 61, 0, 0, 0, 5, 0, 3, 10, 17, 0, 1, 0, 3, 0, SSAnne_2F_Room4_EventScript_160CF3, 0, 0, 0 - object_event 2, 22, 0, 3, 0, 3, 0, 3, 8, 17, 0, 1, 0, 3, 0, SSAnne_2F_Room4_EventScript_160D0A, 0, 0, 0 - object_event 3, 92, 0, 2, 0, 4, 0, 3, 8, 17, 0, 0, 0, 0, 0, SSAnne_2F_Room4_EventScript_1BE678, 358, 0, 0 - -SSAnne_2F_Room4_MapWarps: - warp_def 4, 7, 3, 6, 262 - -SSAnne_2F_Room4_MapEvents:: - map_events SSAnne_2F_Room4_EventObjects, SSAnne_2F_Room4_MapWarps, 0x0, 0x0 diff --git a/data/maps/SSAnne_2F_Room4/header.inc b/data/maps/SSAnne_2F_Room4/header.inc deleted file mode 100644 index d71a41336..000000000 --- a/data/maps/SSAnne_2F_Room4/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SSAnne_2F_Room4:: @ 834F460 - .4byte SSAnne_Room2_Layout @ 0x8319F04 - .4byte SSAnne_2F_Room4_MapEvents @ 0x83AEFB0 - .4byte SSAnne_2F_Room4_MapScripts @ 0x8160CF2 - .4byte NULL - .2byte BGM_FRLG_SS_ANNE - .2byte 178 - .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/SSAnne_2F_Room4/map.json b/data/maps/SSAnne_2F_Room4/map.json new file mode 100644 index 000000000..9e3a3c62c --- /dev/null +++ b/data/maps/SSAnne_2F_Room4/map.json @@ -0,0 +1,67 @@ +{ + "id": "MAP_SSANNE_2F_ROOM4", + "name": "SSAnne_2F_Room4", + "layout": "LAYOUT_SSANNE_ROOM2", + "music": "BGM_FRLG_SS_ANNE", + "region_map_section": "MAPSEC_S_S_ANNE", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "61", + "x": 0, + "y": 5, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "SSAnne_2F_Room4_EventScript_160CF3", + "flag": "0" + }, + { + "graphics_id": "22", + "x": 3, + "y": 3, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "SSAnne_2F_Room4_EventScript_160D0A", + "flag": "0" + }, + { + "graphics_id": "92", + "x": 2, + "y": 4, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SSAnne_2F_Room4_EventScript_1BE678", + "flag": "358" + } + ], + "warp_events": [ + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_SSANNE_2F_CORRIDOR", + "dest_warp_id": 6 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/SSAnne_2F_Room5/events.inc b/data/maps/SSAnne_2F_Room5/events.inc deleted file mode 100644 index ee7fdaee9..000000000 --- a/data/maps/SSAnne_2F_Room5/events.inc +++ /dev/null @@ -1,9 +0,0 @@ -SSAnne_2F_Room5_EventObjects: - object_event 1, 61, 0, 5, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, SSAnne_2F_Room5_EventScript_160D22, 0, 0, 0 - object_event 2, 16, 0, 3, 0, 5, 0, 3, 1, 17, 0, 0, 0, 0, 0, SSAnne_2F_Room5_EventScript_160D2B, 0, 0, 0 - -SSAnne_2F_Room5_MapWarps: - warp_def 4, 7, 3, 7, 262 - -SSAnne_2F_Room5_MapEvents:: - map_events SSAnne_2F_Room5_EventObjects, SSAnne_2F_Room5_MapWarps, 0x0, 0x0 diff --git a/data/maps/SSAnne_2F_Room5/header.inc b/data/maps/SSAnne_2F_Room5/header.inc deleted file mode 100644 index 76b09d983..000000000 --- a/data/maps/SSAnne_2F_Room5/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SSAnne_2F_Room5:: @ 834F47C - .4byte SSAnne_Room2_Layout @ 0x8319F04 - .4byte SSAnne_2F_Room5_MapEvents @ 0x83AEFFC - .4byte SSAnne_2F_Room5_MapScripts @ 0x8160D21 - .4byte NULL - .2byte BGM_FRLG_SS_ANNE - .2byte 178 - .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/SSAnne_2F_Room5/map.json b/data/maps/SSAnne_2F_Room5/map.json new file mode 100644 index 000000000..64e5cdac3 --- /dev/null +++ b/data/maps/SSAnne_2F_Room5/map.json @@ -0,0 +1,54 @@ +{ + "id": "MAP_SSANNE_2F_ROOM5", + "name": "SSAnne_2F_Room5", + "layout": "LAYOUT_SSANNE_ROOM2", + "music": "BGM_FRLG_SS_ANNE", + "region_map_section": "MAPSEC_S_S_ANNE", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "61", + "x": 5, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SSAnne_2F_Room5_EventScript_160D22", + "flag": "0" + }, + { + "graphics_id": "16", + "x": 3, + "y": 5, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SSAnne_2F_Room5_EventScript_160D2B", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_SSANNE_2F_CORRIDOR", + "dest_warp_id": 7 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/SSAnne_2F_Room6/events.inc b/data/maps/SSAnne_2F_Room6/events.inc deleted file mode 100644 index a531dacaf..000000000 --- a/data/maps/SSAnne_2F_Room6/events.inc +++ /dev/null @@ -1,9 +0,0 @@ -SSAnne_2F_Room6_EventObjects: - object_event 1, 31, 0, 1, 0, 4, 0, 3, 10, 17, 0, 0, 0, 0, 0, SSAnne_2F_Room6_EventScript_160D3E, 0, 0, 0 - object_event 2, 23, 0, 4, 0, 4, 0, 3, 9, 17, 0, 0, 0, 0, 0, SSAnne_2F_Room6_EventScript_160D35, 0, 0, 0 - -SSAnne_2F_Room6_MapWarps: - warp_def 4, 7, 3, 8, 262 - -SSAnne_2F_Room6_MapEvents:: - map_events SSAnne_2F_Room6_EventObjects, SSAnne_2F_Room6_MapWarps, 0x0, 0x0 diff --git a/data/maps/SSAnne_2F_Room6/header.inc b/data/maps/SSAnne_2F_Room6/header.inc deleted file mode 100644 index 29cb434c7..000000000 --- a/data/maps/SSAnne_2F_Room6/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SSAnne_2F_Room6:: @ 834F498 - .4byte SSAnne_Room2_Layout @ 0x8319F04 - .4byte SSAnne_2F_Room6_MapEvents @ 0x83AF048 - .4byte SSAnne_2F_Room6_MapScripts @ 0x8160D34 - .4byte NULL - .2byte BGM_FRLG_SS_ANNE - .2byte 178 - .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/SSAnne_2F_Room6/map.json b/data/maps/SSAnne_2F_Room6/map.json new file mode 100644 index 000000000..c64e8a018 --- /dev/null +++ b/data/maps/SSAnne_2F_Room6/map.json @@ -0,0 +1,54 @@ +{ + "id": "MAP_SSANNE_2F_ROOM6", + "name": "SSAnne_2F_Room6", + "layout": "LAYOUT_SSANNE_ROOM2", + "music": "BGM_FRLG_SS_ANNE", + "region_map_section": "MAPSEC_S_S_ANNE", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "31", + "x": 1, + "y": 4, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SSAnne_2F_Room6_EventScript_160D3E", + "flag": "0" + }, + { + "graphics_id": "23", + "x": 4, + "y": 4, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SSAnne_2F_Room6_EventScript_160D35", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_SSANNE_2F_CORRIDOR", + "dest_warp_id": 8 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/SSAnne_3F_Corridor/events.inc b/data/maps/SSAnne_3F_Corridor/events.inc deleted file mode 100644 index 73c712193..000000000 --- a/data/maps/SSAnne_3F_Corridor/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -SSAnne_3F_Corridor_EventObjects: - object_event 1, 62, 0, 10, 0, 4, 0, 3, 5, 19, 0, 0, 0, 0, 0, SSAnne_3F_Corridor_EventScript_160A5E, 0, 0, 0 - -SSAnne_3F_Corridor_MapWarps: - warp_def 1, 4, 3, 0, 265 - warp_def 18, 2, 3, 1, 262 - warp_def 0, 5, 0, 0, 265 - -SSAnne_3F_Corridor_MapEvents:: - map_events SSAnne_3F_Corridor_EventObjects, SSAnne_3F_Corridor_MapWarps, 0x0, 0x0 diff --git a/data/maps/SSAnne_3F_Corridor/header.inc b/data/maps/SSAnne_3F_Corridor/header.inc deleted file mode 100644 index e5285ffe9..000000000 --- a/data/maps/SSAnne_3F_Corridor/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SSAnne_3F_Corridor:: @ 834F2D8 - .4byte SSAnne_3F_Corridor_Layout @ 0x8300108 - .4byte SSAnne_3F_Corridor_MapEvents @ 0x83AEA74 - .4byte SSAnne_3F_Corridor_MapScripts @ 0x8160A5D - .4byte NULL - .2byte BGM_FRLG_SS_ANNE - .2byte 121 - .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/SSAnne_3F_Corridor/map.json b/data/maps/SSAnne_3F_Corridor/map.json new file mode 100644 index 000000000..e60513ea2 --- /dev/null +++ b/data/maps/SSAnne_3F_Corridor/map.json @@ -0,0 +1,55 @@ +{ + "id": "MAP_SSANNE_3F_CORRIDOR", + "name": "SSAnne_3F_Corridor", + "layout": "LAYOUT_SSANNE_3F_CORRIDOR", + "music": "BGM_FRLG_SS_ANNE", + "region_map_section": "MAPSEC_S_S_ANNE", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "62", + "x": 10, + "y": 4, + "elevation": 3, + "movement_type": "5", + "movement_range_x": 3, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SSAnne_3F_Corridor_EventScript_160A5E", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 1, + "y": 4, + "elevation": 3, + "dest_map": "MAP_SSANNE_DECK", + "dest_warp_id": 0 + }, + { + "x": 18, + "y": 2, + "elevation": 3, + "dest_map": "MAP_SSANNE_2F_CORRIDOR", + "dest_warp_id": 1 + }, + { + "x": 0, + "y": 5, + "elevation": 0, + "dest_map": "MAP_SSANNE_DECK", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/SSAnne_B1F_Corridor/events.inc b/data/maps/SSAnne_B1F_Corridor/events.inc deleted file mode 100644 index 09ca9c4a3..000000000 --- a/data/maps/SSAnne_B1F_Corridor/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -SSAnne_B1F_Corridor_MapWarps: - warp_def 19, 3, 3, 5, 261 - warp_def 2, 2, 0, 0, 280 - warp_def 6, 2, 0, 0, 281 - warp_def 10, 2, 0, 0, 282 - warp_def 14, 2, 0, 0, 283 - warp_def 18, 2, 0, 0, 284 - -SSAnne_B1F_Corridor_MapBGEvents: - bg_event 21, 5, 3, 7, 0, 21, 8, 1 - -SSAnne_B1F_Corridor_MapEvents:: - map_events 0x0, SSAnne_B1F_Corridor_MapWarps, 0x0, SSAnne_B1F_Corridor_MapBGEvents diff --git a/data/maps/SSAnne_B1F_Corridor/header.inc b/data/maps/SSAnne_B1F_Corridor/header.inc deleted file mode 100644 index 020aa1ad4..000000000 --- a/data/maps/SSAnne_B1F_Corridor/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SSAnne_B1F_Corridor:: @ 834F2F4 - .4byte SSAnne_B1F_Corridor_Layout @ 0x8300270 - .4byte SSAnne_B1F_Corridor_MapEvents @ 0x83AEAC4 - .4byte SSAnne_B1F_Corridor_MapScripts @ 0x8160A67 - .4byte NULL - .2byte BGM_FRLG_SS_ANNE - .2byte 122 - .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/SSAnne_B1F_Corridor/map.json b/data/maps/SSAnne_B1F_Corridor/map.json new file mode 100644 index 000000000..a0c76bf1d --- /dev/null +++ b/data/maps/SSAnne_B1F_Corridor/map.json @@ -0,0 +1,72 @@ +{ + "id": "MAP_SSANNE_B1F_CORRIDOR", + "name": "SSAnne_B1F_Corridor", + "layout": "LAYOUT_SSANNE_B1F_CORRIDOR", + "music": "BGM_FRLG_SS_ANNE", + "region_map_section": "MAPSEC_S_S_ANNE", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 19, + "y": 3, + "elevation": 3, + "dest_map": "MAP_SSANNE_1F_CORRIDOR", + "dest_warp_id": 5 + }, + { + "x": 2, + "y": 2, + "elevation": 0, + "dest_map": "MAP_SSANNE_B1F_ROOM1", + "dest_warp_id": 0 + }, + { + "x": 6, + "y": 2, + "elevation": 0, + "dest_map": "MAP_SSANNE_B1F_ROOM2", + "dest_warp_id": 0 + }, + { + "x": 10, + "y": 2, + "elevation": 0, + "dest_map": "MAP_SSANNE_B1F_ROOM3", + "dest_warp_id": 0 + }, + { + "x": 14, + "y": 2, + "elevation": 0, + "dest_map": "MAP_SSANNE_B1F_ROOM4", + "dest_warp_id": 0 + }, + { + "x": 18, + "y": 2, + "elevation": 0, + "dest_map": "MAP_SSANNE_B1F_ROOM5", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "hidden_item", + "x": 21, + "y": 5, + "elevation": 3, + "item": "ITEM_HYPER_POTION", + "flag": "8", + "unknown": 1 + } + ] +}
\ No newline at end of file diff --git a/data/maps/SSAnne_B1F_Room1/events.inc b/data/maps/SSAnne_B1F_Room1/events.inc deleted file mode 100644 index ef1e2b945..000000000 --- a/data/maps/SSAnne_B1F_Room1/events.inc +++ /dev/null @@ -1,9 +0,0 @@ -SSAnne_B1F_Room1_EventObjects: - object_event 1, 57, 0, 5, 0, 2, 0, 3, 8, 17, 0, 1, 0, 2, 0, SSAnne_B1F_Room1_EventScript_160D48, 0, 0, 0 - object_event 2, 62, 0, 3, 0, 2, 0, 3, 8, 17, 0, 1, 0, 2, 0, SSAnne_B1F_Room1_EventScript_160D5F, 0, 0, 0 - -SSAnne_B1F_Room1_MapWarps: - warp_def 4, 7, 3, 1, 264 - -SSAnne_B1F_Room1_MapEvents:: - map_events SSAnne_B1F_Room1_EventObjects, SSAnne_B1F_Room1_MapWarps, 0x0, 0x0 diff --git a/data/maps/SSAnne_B1F_Room1/header.inc b/data/maps/SSAnne_B1F_Room1/header.inc deleted file mode 100644 index 609acf59e..000000000 --- a/data/maps/SSAnne_B1F_Room1/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SSAnne_B1F_Room1:: @ 834F4B4 - .4byte SSAnne_Room2_Layout @ 0x8319F04 - .4byte SSAnne_B1F_Room1_MapEvents @ 0x83AF094 - .4byte SSAnne_B1F_Room1_MapScripts @ 0x8160D47 - .4byte NULL - .2byte BGM_FRLG_SS_ANNE - .2byte 178 - .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/SSAnne_B1F_Room1/map.json b/data/maps/SSAnne_B1F_Room1/map.json new file mode 100644 index 000000000..673c16c67 --- /dev/null +++ b/data/maps/SSAnne_B1F_Room1/map.json @@ -0,0 +1,54 @@ +{ + "id": "MAP_SSANNE_B1F_ROOM1", + "name": "SSAnne_B1F_Room1", + "layout": "LAYOUT_SSANNE_ROOM2", + "music": "BGM_FRLG_SS_ANNE", + "region_map_section": "MAPSEC_S_S_ANNE", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "57", + "x": 5, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "SSAnne_B1F_Room1_EventScript_160D48", + "flag": "0" + }, + { + "graphics_id": "62", + "x": 3, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "SSAnne_B1F_Room1_EventScript_160D5F", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_SSANNE_B1F_CORRIDOR", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/SSAnne_B1F_Room2/events.inc b/data/maps/SSAnne_B1F_Room2/events.inc deleted file mode 100644 index 21419a175..000000000 --- a/data/maps/SSAnne_B1F_Room2/events.inc +++ /dev/null @@ -1,9 +0,0 @@ -SSAnne_B1F_Room2_EventObjects: - object_event 1, 62, 0, 3, 0, 5, 0, 3, 1, 17, 0, 1, 0, 1, 0, SSAnne_B1F_Room2_EventScript_160D77, 0, 0, 0 - object_event 2, 92, 0, 3, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, SSAnne_B1F_Room2_EventScript_1BE685, 359, 0, 0 - -SSAnne_B1F_Room2_MapWarps: - warp_def 4, 7, 3, 2, 264 - -SSAnne_B1F_Room2_MapEvents:: - map_events SSAnne_B1F_Room2_EventObjects, SSAnne_B1F_Room2_MapWarps, 0x0, 0x0 diff --git a/data/maps/SSAnne_B1F_Room2/header.inc b/data/maps/SSAnne_B1F_Room2/header.inc deleted file mode 100644 index d7a4a9e7f..000000000 --- a/data/maps/SSAnne_B1F_Room2/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SSAnne_B1F_Room2:: @ 834F4D0 - .4byte SSAnne_Room2_Layout @ 0x8319F04 - .4byte SSAnne_B1F_Room2_MapEvents @ 0x83AF0E0 - .4byte SSAnne_B1F_Room2_MapScripts @ 0x8160D76 - .4byte NULL - .2byte BGM_FRLG_SS_ANNE - .2byte 178 - .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/SSAnne_B1F_Room2/map.json b/data/maps/SSAnne_B1F_Room2/map.json new file mode 100644 index 000000000..2557bf329 --- /dev/null +++ b/data/maps/SSAnne_B1F_Room2/map.json @@ -0,0 +1,54 @@ +{ + "id": "MAP_SSANNE_B1F_ROOM2", + "name": "SSAnne_B1F_Room2", + "layout": "LAYOUT_SSANNE_ROOM2", + "music": "BGM_FRLG_SS_ANNE", + "region_map_section": "MAPSEC_S_S_ANNE", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "62", + "x": 3, + "y": 5, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "SSAnne_B1F_Room2_EventScript_160D77", + "flag": "0" + }, + { + "graphics_id": "92", + "x": 3, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SSAnne_B1F_Room2_EventScript_1BE685", + "flag": "359" + } + ], + "warp_events": [ + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_SSANNE_B1F_CORRIDOR", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/SSAnne_B1F_Room3/events.inc b/data/maps/SSAnne_B1F_Room3/events.inc deleted file mode 100644 index b2c057b00..000000000 --- a/data/maps/SSAnne_B1F_Room3/events.inc +++ /dev/null @@ -1,9 +0,0 @@ -SSAnne_B1F_Room3_EventObjects: - object_event 1, 62, 0, 4, 0, 4, 0, 3, 8, 17, 0, 1, 0, 3, 0, SSAnne_B1F_Room3_EventScript_160D8F, 0, 0, 0 - object_event 2, 92, 0, 1, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, SSAnne_B1F_Room3_EventScript_1BE692, 360, 0, 0 - -SSAnne_B1F_Room3_MapWarps: - warp_def 4, 7, 3, 3, 264 - -SSAnne_B1F_Room3_MapEvents:: - map_events SSAnne_B1F_Room3_EventObjects, SSAnne_B1F_Room3_MapWarps, 0x0, 0x0 diff --git a/data/maps/SSAnne_B1F_Room3/header.inc b/data/maps/SSAnne_B1F_Room3/header.inc deleted file mode 100644 index 67e43de94..000000000 --- a/data/maps/SSAnne_B1F_Room3/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SSAnne_B1F_Room3:: @ 834F4EC - .4byte SSAnne_Room2_Layout @ 0x8319F04 - .4byte SSAnne_B1F_Room3_MapEvents @ 0x83AF12C - .4byte SSAnne_B1F_Room3_MapScripts @ 0x8160D8E - .4byte NULL - .2byte BGM_FRLG_SS_ANNE - .2byte 178 - .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/SSAnne_B1F_Room3/map.json b/data/maps/SSAnne_B1F_Room3/map.json new file mode 100644 index 000000000..9c6634dd1 --- /dev/null +++ b/data/maps/SSAnne_B1F_Room3/map.json @@ -0,0 +1,54 @@ +{ + "id": "MAP_SSANNE_B1F_ROOM3", + "name": "SSAnne_B1F_Room3", + "layout": "LAYOUT_SSANNE_ROOM2", + "music": "BGM_FRLG_SS_ANNE", + "region_map_section": "MAPSEC_S_S_ANNE", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "62", + "x": 4, + "y": 4, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "SSAnne_B1F_Room3_EventScript_160D8F", + "flag": "0" + }, + { + "graphics_id": "92", + "x": 1, + "y": 5, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SSAnne_B1F_Room3_EventScript_1BE692", + "flag": "360" + } + ], + "warp_events": [ + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_SSANNE_B1F_CORRIDOR", + "dest_warp_id": 3 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/SSAnne_B1F_Room4/events.inc b/data/maps/SSAnne_B1F_Room4/events.inc deleted file mode 100644 index 19eb044d2..000000000 --- a/data/maps/SSAnne_B1F_Room4/events.inc +++ /dev/null @@ -1,9 +0,0 @@ -SSAnne_B1F_Room4_EventObjects: - object_event 1, 62, 0, 3, 0, 3, 0, 3, 8, 17, 0, 1, 0, 3, 0, SSAnne_B1F_Room4_EventScript_160DBE, 0, 0, 0 - object_event 2, 62, 0, 2, 0, 6, 0, 3, 1, 17, 0, 1, 0, 1, 0, SSAnne_B1F_Room4_EventScript_160DA7, 0, 0, 0 - -SSAnne_B1F_Room4_MapWarps: - warp_def 4, 7, 3, 4, 264 - -SSAnne_B1F_Room4_MapEvents:: - map_events SSAnne_B1F_Room4_EventObjects, SSAnne_B1F_Room4_MapWarps, 0x0, 0x0 diff --git a/data/maps/SSAnne_B1F_Room4/header.inc b/data/maps/SSAnne_B1F_Room4/header.inc deleted file mode 100644 index 8a23b71f2..000000000 --- a/data/maps/SSAnne_B1F_Room4/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SSAnne_B1F_Room4:: @ 834F508 - .4byte SSAnne_Room2_Layout @ 0x8319F04 - .4byte SSAnne_B1F_Room4_MapEvents @ 0x83AF178 - .4byte SSAnne_B1F_Room4_MapScripts @ 0x8160DA6 - .4byte NULL - .2byte BGM_FRLG_SS_ANNE - .2byte 178 - .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/SSAnne_B1F_Room4/map.json b/data/maps/SSAnne_B1F_Room4/map.json new file mode 100644 index 000000000..f8802f3bb --- /dev/null +++ b/data/maps/SSAnne_B1F_Room4/map.json @@ -0,0 +1,54 @@ +{ + "id": "MAP_SSANNE_B1F_ROOM4", + "name": "SSAnne_B1F_Room4", + "layout": "LAYOUT_SSANNE_ROOM2", + "music": "BGM_FRLG_SS_ANNE", + "region_map_section": "MAPSEC_S_S_ANNE", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "62", + "x": 3, + "y": 3, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "SSAnne_B1F_Room4_EventScript_160DBE", + "flag": "0" + }, + { + "graphics_id": "62", + "x": 2, + "y": 6, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "SSAnne_B1F_Room4_EventScript_160DA7", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_SSANNE_B1F_CORRIDOR", + "dest_warp_id": 4 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/SSAnne_B1F_Room5/events.inc b/data/maps/SSAnne_B1F_Room5/events.inc deleted file mode 100644 index 4f8fe1f69..000000000 --- a/data/maps/SSAnne_B1F_Room5/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -SSAnne_B1F_Room5_EventObjects: - object_event 1, 19, 0, 3, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, SSAnne_B1F_Room5_EventScript_160DD6, 0, 0, 0 - object_event 2, 134, 0, 2, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, SSAnne_B1F_Room5_EventScript_160DDF, 0, 0, 0 - object_event 3, 92, 0, 2, 0, 2, 0, 0, 8, 17, 0, 0, 0, 0, 0, SSAnne_B1F_Room5_EventScript_1BE69F, 361, 0, 0 - -SSAnne_B1F_Room5_MapWarps: - warp_def 4, 7, 3, 5, 264 - -SSAnne_B1F_Room5_MapEvents:: - map_events SSAnne_B1F_Room5_EventObjects, SSAnne_B1F_Room5_MapWarps, 0x0, 0x0 diff --git a/data/maps/SSAnne_B1F_Room5/header.inc b/data/maps/SSAnne_B1F_Room5/header.inc deleted file mode 100644 index 86c82dabe..000000000 --- a/data/maps/SSAnne_B1F_Room5/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SSAnne_B1F_Room5:: @ 834F524 - .4byte SSAnne_Room2_Layout @ 0x8319F04 - .4byte SSAnne_B1F_Room5_MapEvents @ 0x83AF1DC - .4byte SSAnne_B1F_Room5_MapScripts @ 0x8160DD5 - .4byte NULL - .2byte BGM_FRLG_SS_ANNE - .2byte 178 - .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/SSAnne_B1F_Room5/map.json b/data/maps/SSAnne_B1F_Room5/map.json new file mode 100644 index 000000000..0d3ad10c8 --- /dev/null +++ b/data/maps/SSAnne_B1F_Room5/map.json @@ -0,0 +1,67 @@ +{ + "id": "MAP_SSANNE_B1F_ROOM5", + "name": "SSAnne_B1F_Room5", + "layout": "LAYOUT_SSANNE_ROOM2", + "music": "BGM_FRLG_SS_ANNE", + "region_map_section": "MAPSEC_S_S_ANNE", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "19", + "x": 3, + "y": 5, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SSAnne_B1F_Room5_EventScript_160DD6", + "flag": "0" + }, + { + "graphics_id": "134", + "x": 2, + "y": 5, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SSAnne_B1F_Room5_EventScript_160DDF", + "flag": "0" + }, + { + "graphics_id": "92", + "x": 2, + "y": 2, + "elevation": 0, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SSAnne_B1F_Room5_EventScript_1BE69F", + "flag": "361" + } + ], + "warp_events": [ + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_SSANNE_B1F_CORRIDOR", + "dest_warp_id": 5 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/SSAnne_CaptainsOffice/events.inc b/data/maps/SSAnne_CaptainsOffice/events.inc deleted file mode 100644 index a8c88a0a7..000000000 --- a/data/maps/SSAnne_CaptainsOffice/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -SSAnne_CaptainsOffice_EventObjects: - object_event 1, 63, 0, 5, 0, 4, 0, 3, 7, 17, 0, 0, 0, 0, 0, SSAnne_CaptainsOffice_EventScript_160B3A, 0, 0, 0 - -SSAnne_CaptainsOffice_MapWarps: - warp_def 3, 7, 3, 2, 262 - -SSAnne_CaptainsOffice_MapBGEvents: - bg_event 2, 4, 0, 0, 0, SSAnne_CaptainsOffice_EventScript_160BD2 - bg_event 5, 3, 0, 0, 0, SSAnne_CaptainsOffice_EventScript_160BC9 - bg_event 2, 3, 0, 0, 0, SSAnne_CaptainsOffice_EventScript_160BD2 - -SSAnne_CaptainsOffice_MapEvents:: - map_events SSAnne_CaptainsOffice_EventObjects, SSAnne_CaptainsOffice_MapWarps, 0x0, SSAnne_CaptainsOffice_MapBGEvents diff --git a/data/maps/SSAnne_CaptainsOffice/header.inc b/data/maps/SSAnne_CaptainsOffice/header.inc deleted file mode 100644 index b9f3fba89..000000000 --- a/data/maps/SSAnne_CaptainsOffice/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SSAnne_CaptainsOffice:: @ 834F348 - .4byte SSAnne_CaptainsOffice_Layout @ 0x83192EC - .4byte SSAnne_CaptainsOffice_MapEvents @ 0x83AECB8 - .4byte SSAnne_CaptainsOffice_MapScripts @ 0x8160B39 - .4byte NULL - .2byte BGM_FRLG_SS_ANNE - .2byte 171 - .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/SSAnne_CaptainsOffice/map.json b/data/maps/SSAnne_CaptainsOffice/map.json new file mode 100644 index 000000000..204ab5a18 --- /dev/null +++ b/data/maps/SSAnne_CaptainsOffice/map.json @@ -0,0 +1,63 @@ +{ + "id": "MAP_SSANNE_CAPTAINS_OFFICE", + "name": "SSAnne_CaptainsOffice", + "layout": "LAYOUT_SSANNE_CAPTAINS_OFFICE", + "music": "BGM_FRLG_SS_ANNE", + "region_map_section": "MAPSEC_S_S_ANNE", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "63", + "x": 5, + "y": 4, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SSAnne_CaptainsOffice_EventScript_160B3A", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 3, + "dest_map": "MAP_SSANNE_2F_CORRIDOR", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 2, + "y": 4, + "elevation": 0, + "script": "SSAnne_CaptainsOffice_EventScript_160BD2" + }, + { + "type": "bg_event_type_0", + "x": 5, + "y": 3, + "elevation": 0, + "script": "SSAnne_CaptainsOffice_EventScript_160BC9" + }, + { + "type": "bg_event_type_0", + "x": 2, + "y": 3, + "elevation": 0, + "script": "SSAnne_CaptainsOffice_EventScript_160BD2" + } + ] +}
\ No newline at end of file diff --git a/data/maps/SSAnne_CaptainsOffice2/events.inc b/data/maps/SSAnne_CaptainsOffice2/events.inc deleted file mode 100644 index dd11ae294..000000000 --- a/data/maps/SSAnne_CaptainsOffice2/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -SSAnne_CaptainsOffice2_EventObjects: - object_event 1, 92, 0, 10, 0, 14, 0, 3, 8, 17, 0, 0, 0, 0, 0, SSAnne_CaptainsOffice2_EventScript_1BED6D, 498, 0, 0 - object_event 2, 92, 0, 21, 0, 7, 0, 3, 8, 17, 0, 0, 0, 0, 0, SSAnne_CaptainsOffice2_EventScript_1BED7A, 499, 0, 0 - -SSAnne_CaptainsOffice2_MapWarps: - warp_def 12, 12, 3, 2, 367 - warp_def 12, 3, 3, 3, 367 - warp_def 15, 16, 3, 4, 367 - -SSAnne_CaptainsOffice2_MapEvents:: - map_events SSAnne_CaptainsOffice2_EventObjects, SSAnne_CaptainsOffice2_MapWarps, 0x0, 0x0 diff --git a/data/maps/SSAnne_CaptainsOffice2/header.inc b/data/maps/SSAnne_CaptainsOffice2/header.inc deleted file mode 100644 index 9d29a439b..000000000 --- a/data/maps/SSAnne_CaptainsOffice2/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SSAnne_CaptainsOffice2:: @ 834FE54 - .4byte SSAnne_CaptainsOffice2_Layout @ 0x8341560 - .4byte SSAnne_CaptainsOffice2_MapEvents @ 0x83B3508 - .4byte SSAnne_CaptainsOffice2_MapScripts @ 0x8163D81 - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 295 - .byte 0xb1, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/SSAnne_CaptainsOffice2/scripts.inc b/data/maps/SSAnne_CaptainsOffice2/scripts.inc deleted file mode 100644 index fb9065ad4..000000000 --- a/data/maps/SSAnne_CaptainsOffice2/scripts.inc +++ /dev/null @@ -1,2 +0,0 @@ -SSAnne_CaptainsOffice2_MapScripts:: @ 8163D81 - .byte 0 diff --git a/data/maps/SSAnne_CaptainsOffice3/events.inc b/data/maps/SSAnne_CaptainsOffice3/events.inc deleted file mode 100644 index 23f6df9a6..000000000 --- a/data/maps/SSAnne_CaptainsOffice3/events.inc +++ /dev/null @@ -1,16 +0,0 @@ -SSAnne_CaptainsOffice3_EventObjects: - object_event 1, 49, 0, 11, 0, 14, 0, 3, 8, 17, 0, 0, 0, 0, 0, 0x0, 141, 0, 0 - object_event 2, 49, 0, 13, 0, 14, 0, 3, 8, 17, 0, 0, 0, 0, 0, 0x0, 141, 0, 0 - object_event 3, 77, 0, 12, 0, 16, 0, 3, 7, 17, 0, 0, 0, 0, 0, SSAnne_CaptainsOffice3_EventScript_163F25, 139, 0, 0 - object_event 4, 49, 0, 10, 0, 15, 0, 3, 8, 17, 0, 0, 0, 0, 0, 0x0, 141, 0, 0 - -SSAnne_CaptainsOffice3_MapWarps: - warp_def 12, 23, 0, 5, 367 - -SSAnne_CaptainsOffice3_MapCoordEvents: - coord_event 11, 18, 3, 0, 16512, 0, 0, SSAnne_CaptainsOffice3_EventScript_163D98 - coord_event 12, 18, 3, 0, 16512, 0, 0, SSAnne_CaptainsOffice3_EventScript_163D98 - coord_event 13, 18, 3, 0, 16512, 0, 0, SSAnne_CaptainsOffice3_EventScript_163D98 - -SSAnne_CaptainsOffice3_MapEvents:: - map_events SSAnne_CaptainsOffice3_EventObjects, SSAnne_CaptainsOffice3_MapWarps, SSAnne_CaptainsOffice3_MapCoordEvents, 0x0 diff --git a/data/maps/SSAnne_CaptainsOffice3/header.inc b/data/maps/SSAnne_CaptainsOffice3/header.inc deleted file mode 100644 index 47d48f1ec..000000000 --- a/data/maps/SSAnne_CaptainsOffice3/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SSAnne_CaptainsOffice3:: @ 834FE70 - .4byte SSAnne_CaptainsOffice3_Layout @ 0x8341A98 - .4byte SSAnne_CaptainsOffice3_MapEvents @ 0x83B35B4 - .4byte SSAnne_CaptainsOffice3_MapScripts @ 0x8163D82 - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 296 - .byte 0xb1, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/SSAnne_CaptainsOffice3/scripts.inc b/data/maps/SSAnne_CaptainsOffice3/scripts.inc deleted file mode 100644 index 350845084..000000000 --- a/data/maps/SSAnne_CaptainsOffice3/scripts.inc +++ /dev/null @@ -1,201 +0,0 @@ -SSAnne_CaptainsOffice3_MapScripts:: @ 8163D82 - map_script 3, SSAnne_CaptainsOffice3_MapScript1_163D88 - .byte 0 - -SSAnne_CaptainsOffice3_MapScript1_163D88:: @ 8163D88 - compare_var_to_value VAR_0x4080, 1 - call_if 1, EventScript_163D94 - end - -EventScript_163D94:: @ 8163D94 - setflag FLAG_0x08B - return - -SSAnne_CaptainsOffice3_EventScript_163D98:: @ 8163D98 - lockall - textcolor 1 - loadword 0, gUnknown_817B04F - callstd 4 - applymovement 1, Movement_163EE8 - waitmovement 0 - textcolor 0 - loadword 0, gUnknown_817B0B9 - callstd 4 - closemessage - playse SE_PIN - applymovement 3, Movement_1A75DB - waitmovement 0 - applymovement 3, Movement_1A75ED - waitmovement 0 - applymovement 3, Movement_1A75DD - waitmovement 0 - textcolor 1 - loadword 0, gUnknown_817B109 - callstd 4 - closemessage - applymovement 3, Movement_1A75EB - waitmovement 0 - delay 18 - applymovement 3, Movement_1A75ED - waitmovement 0 - delay 35 - applymovement 4, Movement_163F11 - applymovement 3, Movement_163F18 - applymovement 255, Movement_163EDD - waitmovement 0 - applymovement 2, Movement_163EE8 - waitmovement 0 - playbgm BGM_FRLG_SUSPICIOUS_EYE, 0 - textcolor 0 - loadword 0, gUnknown_817B20B - callstd 4 - setvar VAR_LAST_TALKED, 4 - trainerbattle 3, 539, 0, Text_17B251 - applymovement 3, Movement_163F1B - waitmovement 0 - textcolor 1 - loadword 0, gUnknown_817B269 - callstd 4 - textcolor 0 - loadword 0, gUnknown_817B2EF - callstd 4 - textcolor 1 - message Text_17B313 - waitmessage - waitse - playmoncry SPECIES_LAPRAS, 2 - waitbuttonpress - waitmoncry - applymovement 1, Movement_163EEE - waitmovement 0 - textcolor 0 - loadword 0, gUnknown_817B399 - callstd 4 - closemessage - applymovement 3, Movement_163F1D - applymovement 255, Movement_163EE2 - applymovement 1, Movement_163EF0 - applymovement 2, Movement_163EFA - applymovement 4, Movement_163F05 - waitmovement 0 - removeobject 1 - removeobject 2 - removeobject 4 - delay 50 - applymovement 3, Movement_163F23 - waitmovement 0 - applymovement 255, Movement_1A75E7 - waitmovement 0 - textcolor 1 - loadword 0, gUnknown_817B457 - callstd 4 - setflag FLAG_0x08E - clearflag FLAG_0x08C - setvar VAR_0x4080, 1 - releaseall - end - -Movement_163EDD:: @ 8163EDD - step_11 - step_11 - step_13 - step_11 - step_end - -Movement_163EE2:: @ 8163EE2 - step_1c - step_2f - step_1c - step_1c - step_2d - step_end - -Movement_163EE8:: @ 8163EE8 - step_25 - step_end - -gUnknown_163EEA:: @ 8163EEA - step_4c - step_13 - step_4d - step_end - -Movement_163EEE:: @ 8163EEE - step_29 - step_end - -Movement_163EF0:: @ 8163EF0 - step_13 - step_10 - step_1d - step_1d - step_1d - step_1d - step_1d - step_1d - step_1d - step_end - -Movement_163EFA:: @ 8163EFA - step_1c - step_12 - step_10 - step_1d - step_1d - step_1d - step_1d - step_1d - step_1d - step_1d - step_end - -Movement_163F05:: @ 8163F05 - step_1c - step_10 - step_1c - step_10 - step_20 - step_20 - step_1d - step_1d - step_1d - step_1d - step_1d - step_end - -Movement_163F11:: @ 8163F11 - step_1c - step_1b - step_30 - step_end - -Movement_163F15:: @ 8163F15 - step_12 - step_12 - step_end - -Movement_163F18:: @ 8163F18 - step_12 - step_11 - step_end - -Movement_163F1B:: @ 8163F1B - step_26 - step_end - -Movement_163F1D:: @ 8163F1D - step_1b - step_30 - step_1c - step_1c - step_2d - step_end - -Movement_163F23:: @ 8163F23 - step_13 - step_end - -SSAnne_CaptainsOffice3_EventScript_163F25:: @ 8163F25 - loadword 0, gUnknown_817B457 - callstd 2 - end diff --git a/data/maps/SSAnne_CaptainsOffice4/events.inc b/data/maps/SSAnne_CaptainsOffice4/events.inc deleted file mode 100644 index 6aa2900e4..000000000 --- a/data/maps/SSAnne_CaptainsOffice4/events.inc +++ /dev/null @@ -1,49 +0,0 @@ -SSAnne_CaptainsOffice4_EventObjects: - object_event 1, 49, 0, 15, 0, 11, 0, 3, 17, 17, 0, 1, 0, 1, 0, SSAnne_CaptainsOffice4_EventScript_163FE6, 136, 0, 0 - object_event 2, 49, 0, 17, 0, 15, 0, 3, 10, 17, 0, 1, 0, 1, 0, SSAnne_CaptainsOffice4_EventScript_163FFD, 136, 0, 0 - object_event 3, 50, 0, 27, 0, 16, 0, 3, 9, 17, 0, 1, 0, 3, 0, SSAnne_CaptainsOffice4_EventScript_164087, 136, 0, 0 - object_event 4, 49, 0, 25, 0, 11, 0, 3, 10, 17, 0, 1, 0, 3, 0, SSAnne_CaptainsOffice4_EventScript_164014, 136, 0, 0 - object_event 5, 50, 0, 6, 0, 6, 0, 3, 16, 17, 0, 1, 0, 3, 0, SSAnne_CaptainsOffice4_EventScript_164070, 136, 0, 0 - object_event 6, 55, 0, 27, 0, 4, 0, 3, 9, 17, 0, 1, 0, 0, 0, SSAnne_CaptainsOffice4_EventScript_163F93, 0, 0, 0 - object_event 7, 92, 0, 8, 0, 25, 0, 3, 8, 17, 0, 0, 0, 0, 0, SSAnne_CaptainsOffice4_EventScript_1BED87, 500, 0, 0 - object_event 8, 92, 0, 17, 0, 3, 0, 0, 8, 17, 0, 0, 0, 0, 0, SSAnne_CaptainsOffice4_EventScript_1BED94, 501, 0, 0 - object_event 9, 92, 0, 1, 0, 16, 0, 3, 8, 17, 0, 0, 0, 0, 0, SSAnne_CaptainsOffice4_EventScript_1BEDA1, 502, 0, 0 - object_event 10, 92, 0, 4, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, SSAnne_CaptainsOffice4_EventScript_1BEDAE, 503, 0, 0 - -SSAnne_CaptainsOffice4_MapWarps: - warp_def 24, 25, 3, 0, 824 - -SSAnne_CaptainsOffice4_MapCoordEvents: - coord_event 22, 11, 3, 0, 16520, 0, 0, SSAnne_CaptainsOffice4_EventScript_163F81 - coord_event 23, 11, 3, 0, 16520, 0, 0, SSAnne_CaptainsOffice4_EventScript_163F81 - coord_event 24, 11, 3, 0, 16520, 0, 0, SSAnne_CaptainsOffice4_EventScript_163F81 - -SSAnne_CaptainsOffice4_MapBGEvents: - bg_event 11, 2, 0, 0, 0, SSAnne_CaptainsOffice4_EventScript_163F5A - bg_event 26, 11, 0, 3, 0, SSAnne_CaptainsOffice4_EventScript_163F78 - bg_event 27, 2, 0, 7, 0, 8, 68, 1 - bg_event 7, 16, 0, 7, 0, 6, 69, 1 - bg_event 12, 2, 0, 0, 0, SSAnne_CaptainsOffice4_EventScript_163F5A - bg_event 10, 2, 0, 0, 0, SSAnne_CaptainsOffice4_EventScript_163F5A - bg_event 9, 2, 0, 0, 0, SSAnne_CaptainsOffice4_EventScript_163F5A - bg_event 8, 2, 0, 0, 0, SSAnne_CaptainsOffice4_EventScript_163F5A - bg_event 7, 2, 0, 0, 0, SSAnne_CaptainsOffice4_EventScript_163F5A - bg_event 11, 5, 0, 0, 0, SSAnne_CaptainsOffice4_EventScript_163F5A - bg_event 10, 5, 0, 0, 0, SSAnne_CaptainsOffice4_EventScript_163F5A - bg_event 11, 4, 0, 0, 0, SSAnne_CaptainsOffice4_EventScript_163F5A - bg_event 10, 4, 0, 0, 0, SSAnne_CaptainsOffice4_EventScript_163F5A - bg_event 8, 4, 0, 0, 0, SSAnne_CaptainsOffice4_EventScript_163F5A - bg_event 7, 4, 0, 0, 0, SSAnne_CaptainsOffice4_EventScript_163F5A - bg_event 8, 5, 0, 0, 0, SSAnne_CaptainsOffice4_EventScript_163F5A - bg_event 7, 5, 0, 0, 0, SSAnne_CaptainsOffice4_EventScript_163F5A - bg_event 5, 3, 0, 0, 0, SSAnne_CaptainsOffice4_EventScript_163F5A - bg_event 4, 3, 0, 0, 0, SSAnne_CaptainsOffice4_EventScript_163F5A - bg_event 5, 4, 0, 0, 0, SSAnne_CaptainsOffice4_EventScript_163F5A - bg_event 4, 4, 0, 0, 0, SSAnne_CaptainsOffice4_EventScript_163F5A - bg_event 3, 4, 0, 0, 0, SSAnne_CaptainsOffice4_EventScript_163F5A - bg_event 2, 4, 0, 0, 0, SSAnne_CaptainsOffice4_EventScript_163F5A - bg_event 2, 5, 0, 0, 0, SSAnne_CaptainsOffice4_EventScript_163F5A - bg_event 3, 5, 0, 0, 0, SSAnne_CaptainsOffice4_EventScript_163F5A - -SSAnne_CaptainsOffice4_MapEvents:: - map_events SSAnne_CaptainsOffice4_EventObjects, SSAnne_CaptainsOffice4_MapWarps, SSAnne_CaptainsOffice4_MapCoordEvents, SSAnne_CaptainsOffice4_MapBGEvents diff --git a/data/maps/SSAnne_CaptainsOffice4/header.inc b/data/maps/SSAnne_CaptainsOffice4/header.inc deleted file mode 100644 index 933c78555..000000000 --- a/data/maps/SSAnne_CaptainsOffice4/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SSAnne_CaptainsOffice4:: @ 834FE8C - .4byte SSAnne_CaptainsOffice4_Layout @ 0x83405A4 - .4byte SSAnne_CaptainsOffice4_MapEvents @ 0x83B381C - .4byte SSAnne_CaptainsOffice4_MapScripts @ 0x8163F2E - .4byte NULL - .2byte BGM_FRLG_ROCKET_HIDEOUT - .2byte 292 - .byte 0xb2, 0x00, 0x00, 0x08, 0x00, 0x05, 0x00, 0x03 diff --git a/data/maps/SSAnne_CaptainsOffice4/scripts.inc b/data/maps/SSAnne_CaptainsOffice4/scripts.inc deleted file mode 100644 index ac4d141be..000000000 --- a/data/maps/SSAnne_CaptainsOffice4/scripts.inc +++ /dev/null @@ -1,202 +0,0 @@ -SSAnne_CaptainsOffice4_MapScripts:: @ 8163F2E - map_script 1, SSAnne_CaptainsOffice4_MapScript1_163F3D - map_script 3, SSAnne_CaptainsOffice4_MapScript2_163F39 - .byte 0 - -SSAnne_CaptainsOffice4_MapScript2_163F39:: @ 8163F39 - setworldmapflag 2233 - end - -SSAnne_CaptainsOffice4_MapScript1_163F3D:: @ 8163F3D - checktrainerflag 543 - call_if 1, EventScript_163F47 - end - -EventScript_163F47:: @ 8163F47 - setmetatile 26, 20, 672, 0 - setmetatile 27, 20, 672, 0 - return - -SSAnne_CaptainsOffice4_EventScript_163F5A:: @ 8163F5A - lockall - checkflag FLAG_0x2D5 - goto_if 1, EventScript_163F6E - loadword 0, gUnknown_817B4E3 - callstd 4 - releaseall - end - -EventScript_163F6E:: @ 8163F6E - loadword 0, gUnknown_817B512 - callstd 4 - releaseall - end - -SSAnne_CaptainsOffice4_EventScript_163F78:: @ 8163F78 - loadword 0, gUnknown_817BB15 - callstd 3 - end - -SSAnne_CaptainsOffice4_EventScript_163F81:: @ 8163F81 - lockall - applymovement 4, Movement_1A75E7 - waitmovement 0 - setvar VAR_0x4088, 1 - releaseall - end - -SSAnne_CaptainsOffice4_EventScript_163F93:: @ 8163F93 - trainerbattle 2, 545, 0, Text_17BBAF, Text_17BC55, EventScript_163FCD - checkflag 2116 - goto_if 1, EventScript_163FB7 - loadword 0, gUnknown_817BCA3 - callstd 6 - end - -EventScript_163FB7:: @ 8163FB7 - setvar VAR_0x8004, 15 - setvar VAR_0x8005, 5 - special SetFlavorTextFlagFromSpecialVars - loadword 0, gUnknown_817BCD7 - callstd 6 - end - -EventScript_163FCD:: @ 8163FCD - loadword 0, gUnknown_817BC6C - callstd 4 - setflag FLAG_0x2DC - setorcopyvar VAR_0x8000, 374 - setorcopyvar VAR_0x8001, 1 - callstd 0 - release - end - -SSAnne_CaptainsOffice4_EventScript_163FE6:: @ 8163FE6 - trainerbattle 0, 541, 0, Text_17B54D, Text_17B585 - loadword 0, gUnknown_817B5A6 - callstd 6 - end - -SSAnne_CaptainsOffice4_EventScript_163FFD:: @ 8163FFD - trainerbattle 0, 542, 0, Text_17B677, Text_17B6D9 - loadword 0, gUnknown_817B6EF - callstd 6 - end - -SSAnne_CaptainsOffice4_EventScript_164014:: @ 8164014 - trainerbattle 2, 544, 0, Text_17B8DA, Text_17B9FB, EventScript_16402F - loadword 0, gUnknown_817BA64 - callstd 6 - end - -EventScript_16402F:: @ 816402F - getplayerxy VAR_0x8004, VAR_0x8005 - compare_var_to_value VAR_0x8004, 24 - call_if 3, EventScript_164065 - loadword 0, gUnknown_817BA64 - callstd 4 - closemessage - fadescreen 1 - removeobject 1 - removeobject 2 - removeobject 4 - removeobject 3 - setflag FLAG_0x088 - fadescreen 0 - setvar VAR_0x4088, 1 - setflag FLAG_0x2D5 - release - end - -EventScript_164065:: @ 8164065 - applymovement 255, Movement_1A75EB - waitmovement 0 - return - -SSAnne_CaptainsOffice4_EventScript_164070:: @ 8164070 - trainerbattle 0, 516, 0, Text_17B5D6, Text_17B62F - loadword 0, gUnknown_817B642 - callstd 6 - end - -SSAnne_CaptainsOffice4_EventScript_164087:: @ 8164087 - trainerbattle 2, 543, 0, Text_17B72D, Text_17B79C, EventScript_1640A2 - loadword 0, gUnknown_817B7FA - callstd 6 - end - -EventScript_1640A2:: @ 81640A2 - getplayerxy VAR_0x8004, VAR_0x8005 - specialvar VAR_RESULT, player_get_direction_lower_nybble - compare_var_to_value VAR_RESULT, 2 - call_if 1, EventScript_16412E - loadword 0, gUnknown_817B7AE - callstd 4 - closemessage - compare_var_to_value VAR_0x8004, 24 - call_if 3, EventScript_164144 - compare_var_to_value VAR_0x8004, 25 - call_if 1, EventScript_16414F - compare_var_to_value VAR_0x8004, 26 - call_if 1, EventScript_16415A - compare_var_to_value VAR_0x8004, 27 - call_if 1, EventScript_16415A - playse SE_PIN - call EventScript_163F47 - special DrawWholeMapView - waitse - compare_var_to_value VAR_0x8004, 24 - call_if 3, EventScript_164165 - compare_var_to_value VAR_0x8004, 25 - call_if 1, EventScript_164165 - compare_var_to_value VAR_0x8004, 26 - call_if 1, EventScript_164165 - compare_var_to_value VAR_0x8004, 27 - call_if 1, EventScript_164170 - loadword 0, gUnknown_817B7FA - callstd 4 - release - end - -EventScript_16412E:: @ 816412E - compare_var_to_value VAR_0x8004, 27 - goto_if 1, EventScript_1A77A9 - applymovement 255, Movement_1A75EB - waitmovement 0 - return - -EventScript_164144:: @ 8164144 - applymovement 3, Movement_16417B - waitmovement 0 - return - -EventScript_16414F:: @ 816414F - applymovement 3, Movement_16417F - waitmovement 0 - return - -EventScript_16415A:: @ 816415A - applymovement 3, Movement_1A75E9 - waitmovement 0 - return - -EventScript_164165:: @ 8164165 - applymovement 3, Movement_1A75E7 - waitmovement 0 - return - -EventScript_164170:: @ 8164170 - applymovement 3, Movement_1A75ED - waitmovement 0 - return - -Movement_16417B:: @ 816417B - step_13 - step_13 - step_2e - step_end - -Movement_16417F:: @ 816417F - step_13 - step_2e - step_end diff --git a/data/maps/SSAnne_CaptainsOffice5/events.inc b/data/maps/SSAnne_CaptainsOffice5/events.inc deleted file mode 100644 index 6939d5902..000000000 --- a/data/maps/SSAnne_CaptainsOffice5/events.inc +++ /dev/null @@ -1,8 +0,0 @@ -SSAnne_CaptainsOffice5_MapWarps: - warp_def 6, 9, 3, 0, 829 - warp_def 6, 5, 3, 0, 372 - warp_def 13, 5, 3, 0, 376 - warp_def 6, 7, 3, 2, 372 - -SSAnne_CaptainsOffice5_MapEvents:: - map_events 0x0, SSAnne_CaptainsOffice5_MapWarps, 0x0, 0x0 diff --git a/data/maps/SSAnne_CaptainsOffice5/header.inc b/data/maps/SSAnne_CaptainsOffice5/header.inc deleted file mode 100644 index c735393a0..000000000 --- a/data/maps/SSAnne_CaptainsOffice5/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SSAnne_CaptainsOffice5:: @ 834FEA8 - .4byte SSAnne_CaptainsOffice5_Layout @ 0x83436C4 - .4byte SSAnne_CaptainsOffice5_MapEvents @ 0x83B3850 - .4byte SSAnne_CaptainsOffice5_MapScripts @ 0x8164182 - .4byte NULL - .2byte BGM_FRLG_TANOBY_RUINS - .2byte 309 - .byte 0xb4, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/SSAnne_CaptainsOffice5/scripts.inc b/data/maps/SSAnne_CaptainsOffice5/scripts.inc deleted file mode 100644 index 7effe1b4a..000000000 --- a/data/maps/SSAnne_CaptainsOffice5/scripts.inc +++ /dev/null @@ -1,35 +0,0 @@ -SSAnne_CaptainsOffice5_MapScripts:: @ 8164182 - map_script 3, SSAnne_CaptainsOffice5_MapScript1_164188 - .byte 0 - -SSAnne_CaptainsOffice5_MapScript1_164188:: @ 8164188 - setworldmapflag 2235 - end - -SixIsland_DottedHole_B1F_EventScript_16418C:: @ 816418C - lockall - braillemessage gUnknown_81A9288 - waitbuttonpress - releaseall - end - -SSAnne_CaptainsOffice9_EventScript_164195:: @ 8164195 - lockall - braillemessage gUnknown_81A928B - waitbuttonpress - releaseall - end - -SixIsland_DottedHole_B3F_EventScript_16419E:: @ 816419E - lockall - braillemessage gUnknown_81A9290 - waitbuttonpress - releaseall - end - -SixIsland_DottedHole_B2F_EventScript_1641A7:: @ 81641A7 - lockall - braillemessage gUnknown_81A9296 - waitbuttonpress - releaseall - end diff --git a/data/maps/SSAnne_CaptainsOffice9/events.inc b/data/maps/SSAnne_CaptainsOffice9/events.inc deleted file mode 100644 index aeaa11fa8..000000000 --- a/data/maps/SSAnne_CaptainsOffice9/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -SSAnne_CaptainsOffice9_MapWarps: - warp_def 6, 7, 3, 2, 374 - warp_def 6, 1, 3, 3, 371 - warp_def 11, 5, 3, 3, 371 - warp_def 6, 9, 3, 1, 376 - warp_def 1, 5, 3, 3, 371 - -SSAnne_CaptainsOffice9_MapBGEvents: - bg_event 6, 5, 0, 1, 0, SSAnne_CaptainsOffice9_EventScript_164195 - -SSAnne_CaptainsOffice9_MapEvents:: - map_events 0x0, SSAnne_CaptainsOffice9_MapWarps, 0x0, SSAnne_CaptainsOffice9_MapBGEvents diff --git a/data/maps/SSAnne_CaptainsOffice9/header.inc b/data/maps/SSAnne_CaptainsOffice9/header.inc deleted file mode 100644 index 5d4aad26b..000000000 --- a/data/maps/SSAnne_CaptainsOffice9/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SSAnne_CaptainsOffice9:: @ 834FF18 - .4byte SSAnne_CaptainsOffice9_Layout @ 0x8343BD4 - .4byte SSAnne_CaptainsOffice9_MapEvents @ 0x83B3970 - .4byte SSAnne_CaptainsOffice9_MapScripts @ 0x81641B3 - .4byte NULL - .2byte BGM_FRLG_TANOBY_RUINS - .2byte 313 - .byte 0xb4, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/SSAnne_CaptainsOffice9/scripts.inc b/data/maps/SSAnne_CaptainsOffice9/scripts.inc deleted file mode 100644 index 5ce3448b5..000000000 --- a/data/maps/SSAnne_CaptainsOffice9/scripts.inc +++ /dev/null @@ -1,2 +0,0 @@ -SSAnne_CaptainsOffice9_MapScripts:: @ 81641B3 - .byte 0 diff --git a/data/maps/SSAnne_Deck/events.inc b/data/maps/SSAnne_Deck/events.inc deleted file mode 100644 index 9e18e8087..000000000 --- a/data/maps/SSAnne_Deck/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -SSAnne_Deck_EventObjects: - object_event 1, 62, 0, 12, 0, 10, 0, 3, 7, 17, 0, 1, 0, 2, 0, SSAnne_Deck_EventScript_160A9B, 0, 0, 0 - object_event 2, 30, 0, 14, 0, 11, 0, 3, 8, 17, 0, 0, 0, 0, 0, SSAnne_Deck_EventScript_160A72, 0, 0, 0 - object_event 3, 62, 0, 13, 0, 13, 0, 3, 27, 20, 0, 0, 0, 0, 0, SSAnne_Deck_EventScript_160A7B, 0, 0, 0 - object_event 4, 62, 0, 6, 0, 9, 0, 3, 2, 17, 0, 1, 0, 1, 0, SSAnne_Deck_EventScript_160A84, 0, 0, 0 - object_event 5, 18, 0, 11, 0, 5, 0, 3, 9, 17, 0, 0, 0, 0, 0, SSAnne_Deck_EventScript_160A69, 0, 0, 0 - -SSAnne_Deck_MapWarps: - warp_def 16, 8, 3, 0, 263 - warp_def 16, 9, 3, 0, 263 - -SSAnne_Deck_MapEvents:: - map_events SSAnne_Deck_EventObjects, SSAnne_Deck_MapWarps, 0x0, 0x0 diff --git a/data/maps/SSAnne_Deck/header.inc b/data/maps/SSAnne_Deck/header.inc deleted file mode 100644 index ae12f7727..000000000 --- a/data/maps/SSAnne_Deck/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SSAnne_Deck:: @ 834F310 - .4byte SSAnne_Deck_Layout @ 0x8300624 - .4byte SSAnne_Deck_MapEvents @ 0x83AEB60 - .4byte SSAnne_Deck_MapScripts @ 0x8160A68 - .4byte NULL - .2byte BGM_FRLG_SS_ANNE - .2byte 123 - .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/SSAnne_Deck/map.json b/data/maps/SSAnne_Deck/map.json new file mode 100644 index 000000000..1ed41546e --- /dev/null +++ b/data/maps/SSAnne_Deck/map.json @@ -0,0 +1,100 @@ +{ + "id": "MAP_SSANNE_DECK", + "name": "SSAnne_Deck", + "layout": "LAYOUT_SSANNE_DECK", + "music": "BGM_FRLG_SS_ANNE", + "region_map_section": "MAPSEC_S_S_ANNE", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "62", + "x": 12, + "y": 10, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "SSAnne_Deck_EventScript_160A9B", + "flag": "0" + }, + { + "graphics_id": "30", + "x": 14, + "y": 11, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SSAnne_Deck_EventScript_160A72", + "flag": "0" + }, + { + "graphics_id": "62", + "x": 13, + "y": 13, + "elevation": 3, + "movement_type": "27", + "movement_range_x": 4, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SSAnne_Deck_EventScript_160A7B", + "flag": "0" + }, + { + "graphics_id": "62", + "x": 6, + "y": 9, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "SSAnne_Deck_EventScript_160A84", + "flag": "0" + }, + { + "graphics_id": "18", + "x": 11, + "y": 5, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SSAnne_Deck_EventScript_160A69", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 16, + "y": 8, + "elevation": 3, + "dest_map": "MAP_SSANNE_3F_CORRIDOR", + "dest_warp_id": 0 + }, + { + "x": 16, + "y": 9, + "elevation": 3, + "dest_map": "MAP_SSANNE_3F_CORRIDOR", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/SSAnne_Exterior/events.inc b/data/maps/SSAnne_Exterior/events.inc deleted file mode 100644 index 06c219134..000000000 --- a/data/maps/SSAnne_Exterior/events.inc +++ /dev/null @@ -1,15 +0,0 @@ -SSAnne_Exterior_EventObjects: - object_event 1, 151, 0, 30, 0, 16, 0, 1, 8, 17, 0, 0, 0, 0, 0, 0x0, 135, 0, 0 - -SSAnne_Exterior_MapWarps: - warp_def 31, 5, 0, 0, 773 - warp_def 32, 5, 3, 1, 773 - warp_def 32, 14, 3, 2, 261 - warp_def 33, 15, 0, 3, 261 - warp_def 33, 5, 0, 2, 773 - -SSAnne_Exterior_MapBGEvents: - bg_event 58, 28, 3, 7, 0, 38, 190, 1 - -SSAnne_Exterior_MapEvents:: - map_events SSAnne_Exterior_EventObjects, SSAnne_Exterior_MapWarps, 0x0, SSAnne_Exterior_MapBGEvents diff --git a/data/maps/SSAnne_Exterior/header.inc b/data/maps/SSAnne_Exterior/header.inc deleted file mode 100644 index a16473ca7..000000000 --- a/data/maps/SSAnne_Exterior/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SSAnne_Exterior:: @ 834F284 - .4byte SSAnne_Exterior_Layout @ 0x82FF610 - .4byte SSAnne_Exterior_MapEvents @ 0x83AE8C8 - .4byte SSAnne_Exterior_MapScripts @ 0x8160840 - .4byte NULL - .2byte BGM_FRLG_SS_ANNE - .2byte 118 - .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/SSAnne_Exterior/map.json b/data/maps/SSAnne_Exterior/map.json new file mode 100644 index 000000000..8ef5cbc5a --- /dev/null +++ b/data/maps/SSAnne_Exterior/map.json @@ -0,0 +1,79 @@ +{ + "id": "MAP_SSANNE_EXTERIOR", + "name": "SSAnne_Exterior", + "layout": "LAYOUT_SSANNE_EXTERIOR", + "music": "BGM_FRLG_SS_ANNE", + "region_map_section": "MAPSEC_S_S_ANNE", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "151", + "x": 30, + "y": 16, + "elevation": 1, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "135" + } + ], + "warp_events": [ + { + "x": 31, + "y": 5, + "elevation": 0, + "dest_map": "MAP_VERMILION_CITY", + "dest_warp_id": 0 + }, + { + "x": 32, + "y": 5, + "elevation": 3, + "dest_map": "MAP_VERMILION_CITY", + "dest_warp_id": 1 + }, + { + "x": 32, + "y": 14, + "elevation": 3, + "dest_map": "MAP_SSANNE_1F_CORRIDOR", + "dest_warp_id": 2 + }, + { + "x": 33, + "y": 15, + "elevation": 0, + "dest_map": "MAP_SSANNE_1F_CORRIDOR", + "dest_warp_id": 3 + }, + { + "x": 33, + "y": 5, + "elevation": 0, + "dest_map": "MAP_VERMILION_CITY", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "hidden_item", + "x": 58, + "y": 28, + "elevation": 3, + "item": "ITEM_LAVA_COOKIE", + "flag": "190", + "unknown": 1 + } + ] +}
\ No newline at end of file diff --git a/data/maps/SSAnne_Kitchen/events.inc b/data/maps/SSAnne_Kitchen/events.inc deleted file mode 100644 index d5034af53..000000000 --- a/data/maps/SSAnne_Kitchen/events.inc +++ /dev/null @@ -1,20 +0,0 @@ -SSAnne_Kitchen_EventObjects: - object_event 1, 59, 0, 1, 0, 5, 0, 3, 3, 17, 0, 0, 0, 0, 0, SSAnne_Kitchen_EventScript_160AB3, 0, 0, 0 - object_event 2, 59, 0, 6, 0, 6, 0, 3, 3, 33, 0, 0, 0, 0, 0, SSAnne_Kitchen_EventScript_160ABC, 0, 0, 0 - object_event 3, 59, 0, 10, 0, 4, 0, 3, 18, 17, 0, 0, 0, 0, 0, SSAnne_Kitchen_EventScript_160AC5, 0, 0, 0 - object_event 4, 59, 0, 8, 0, 9, 0, 3, 7, 17, 0, 0, 0, 0, 0, SSAnne_Kitchen_EventScript_160ACE, 0, 0, 0 - object_event 5, 59, 0, 14, 0, 5, 0, 3, 7, 17, 0, 0, 0, 0, 0, SSAnne_Kitchen_EventScript_160B1E, 0, 0, 0 - object_event 6, 59, 0, 14, 0, 7, 0, 3, 9, 17, 0, 0, 0, 0, 0, SSAnne_Kitchen_EventScript_160B27, 0, 0, 0 - object_event 7, 59, 0, 14, 0, 9, 0, 3, 7, 17, 0, 0, 0, 0, 0, SSAnne_Kitchen_EventScript_160B30, 0, 0, 0 - object_event 8, 92, 0, 1, 0, 10, 0, 3, 8, 17, 0, 0, 0, 0, 0, SSAnne_Kitchen_EventScript_1BE6AC, 362, 0, 0 - -SSAnne_Kitchen_MapWarps: - warp_def 7, 1, 0, 1, 261 - -SSAnne_Kitchen_MapBGEvents: - bg_event 14, 8, 0, 7, 0, 134, 122, 1 - bg_event 14, 4, 0, 7, 0, 135, 120, 1 - bg_event 14, 6, 0, 7, 0, 133, 121, 1 - -SSAnne_Kitchen_MapEvents:: - map_events SSAnne_Kitchen_EventObjects, SSAnne_Kitchen_MapWarps, 0x0, SSAnne_Kitchen_MapBGEvents diff --git a/data/maps/SSAnne_Kitchen/header.inc b/data/maps/SSAnne_Kitchen/header.inc deleted file mode 100644 index a2128fe93..000000000 --- a/data/maps/SSAnne_Kitchen/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SSAnne_Kitchen:: @ 834F32C - .4byte SSAnne_Kitchen_Layout @ 0x8319214 - .4byte SSAnne_Kitchen_MapEvents @ 0x83AEC60 - .4byte SSAnne_Kitchen_MapScripts @ 0x8160AB2 - .4byte NULL - .2byte BGM_FRLG_SS_ANNE - .2byte 170 - .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/SSAnne_Kitchen/map.json b/data/maps/SSAnne_Kitchen/map.json new file mode 100644 index 000000000..bb094e87c --- /dev/null +++ b/data/maps/SSAnne_Kitchen/map.json @@ -0,0 +1,160 @@ +{ + "id": "MAP_SSANNE_KITCHEN", + "name": "SSAnne_Kitchen", + "layout": "LAYOUT_SSANNE_KITCHEN", + "music": "BGM_FRLG_SS_ANNE", + "region_map_section": "MAPSEC_S_S_ANNE", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "59", + "x": 1, + "y": 5, + "elevation": 3, + "movement_type": "3", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SSAnne_Kitchen_EventScript_160AB3", + "flag": "0" + }, + { + "graphics_id": "59", + "x": 6, + "y": 6, + "elevation": 3, + "movement_type": "3", + "movement_range_x": 1, + "movement_range_y": 2, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SSAnne_Kitchen_EventScript_160ABC", + "flag": "0" + }, + { + "graphics_id": "59", + "x": 10, + "y": 4, + "elevation": 3, + "movement_type": "18", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SSAnne_Kitchen_EventScript_160AC5", + "flag": "0" + }, + { + "graphics_id": "59", + "x": 8, + "y": 9, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SSAnne_Kitchen_EventScript_160ACE", + "flag": "0" + }, + { + "graphics_id": "59", + "x": 14, + "y": 5, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SSAnne_Kitchen_EventScript_160B1E", + "flag": "0" + }, + { + "graphics_id": "59", + "x": 14, + "y": 7, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SSAnne_Kitchen_EventScript_160B27", + "flag": "0" + }, + { + "graphics_id": "59", + "x": 14, + "y": 9, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SSAnne_Kitchen_EventScript_160B30", + "flag": "0" + }, + { + "graphics_id": "92", + "x": 1, + "y": 10, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SSAnne_Kitchen_EventScript_1BE6AC", + "flag": "362" + } + ], + "warp_events": [ + { + "x": 7, + "y": 1, + "elevation": 0, + "dest_map": "MAP_SSANNE_1F_CORRIDOR", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "hidden_item", + "x": 14, + "y": 8, + "elevation": 0, + "item": "ITEM_CHESTO_BERRY", + "flag": "122", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 14, + "y": 4, + "elevation": 0, + "item": "ITEM_PECHA_BERRY", + "flag": "120", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 14, + "y": 6, + "elevation": 0, + "item": "ITEM_CHERI_BERRY", + "flag": "121", + "unknown": 1 + } + ] +}
\ No newline at end of file diff --git a/data/maps/SSAnne_Kitchen3/events.inc b/data/maps/SSAnne_Kitchen3/events.inc deleted file mode 100644 index 0c7152178..000000000 --- a/data/maps/SSAnne_Kitchen3/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -SSAnne_Kitchen3_EventObjects: - object_event 1, 96, 0, 18, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, SSAnne_Kitchen3_EventScript_1BE00C, 18, 0, 0 - object_event 2, 96, 0, 23, 0, 16, 0, 3, 1, 17, 0, 0, 0, 0, 0, SSAnne_Kitchen3_EventScript_1BE00C, 19, 0, 0 - object_event 3, 96, 0, 20, 0, 12, 0, 3, 1, 17, 0, 0, 0, 0, 0, SSAnne_Kitchen3_EventScript_1BE00C, 20, 0, 0 - object_event 4, 96, 0, 19, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, SSAnne_Kitchen3_EventScript_1BE00C, 21, 0, 0 - object_event 5, 96, 0, 21, 0, 15, 0, 3, 1, 17, 0, 0, 0, 0, 0, SSAnne_Kitchen3_EventScript_1BE00C, 22, 0, 0 - -SSAnne_Kitchen3_MapWarps: - warp_def 22, 17, 3, 5, 353 - warp_def 1, 1, 0, 0, 360 - warp_def 24, 5, 0, 1, 364 - -SSAnne_Kitchen3_MapEvents:: - map_events SSAnne_Kitchen3_EventObjects, SSAnne_Kitchen3_MapWarps, 0x0, 0x0 diff --git a/data/maps/SSAnne_Kitchen3/header.inc b/data/maps/SSAnne_Kitchen3/header.inc deleted file mode 100644 index de8d49593..000000000 --- a/data/maps/SSAnne_Kitchen3/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SSAnne_Kitchen3:: @ 834FD58 - .4byte SSAnne_Kitchen3_Layout @ 0x833F304 - .4byte SSAnne_Kitchen3_MapEvents @ 0x83B2EE0 - .4byte SSAnne_Kitchen3_MapScripts @ 0x8163C45 - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 285 - .byte 0xaf, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/SSAnne_Kitchen3/scripts.inc b/data/maps/SSAnne_Kitchen3/scripts.inc deleted file mode 100644 index a6a4664e3..000000000 --- a/data/maps/SSAnne_Kitchen3/scripts.inc +++ /dev/null @@ -1,2 +0,0 @@ -SSAnne_Kitchen3_MapScripts:: @ 8163C45 - .byte 0 diff --git a/data/maps/SafariZone_Building1/events.inc b/data/maps/SafariZone_Building1/events.inc deleted file mode 100644 index afd3d4575..000000000 --- a/data/maps/SafariZone_Building1/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -SafariZone_Building1_EventObjects: - object_event 1, 55, 0, 3, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, SafariZone_Building1_EventScript_1623F5, 0, 0, 0 - object_event 2, 23, 0, 7, 0, 3, 0, 3, 8, 17, 0, 0, 0, 0, 0, SafariZone_Building1_EventScript_1623EC, 0, 0, 0 - -SafariZone_Building1_MapWarps: - warp_def 3, 9, 3, 12, 319 - warp_def 4, 9, 3, 12, 319 - warp_def 5, 9, 3, 12, 319 - -SafariZone_Building1_MapEvents:: - map_events SafariZone_Building1_EventObjects, SafariZone_Building1_MapWarps, 0x0, 0x0 diff --git a/data/maps/SafariZone_Building1/header.inc b/data/maps/SafariZone_Building1/header.inc deleted file mode 100644 index e65a0ceb1..000000000 --- a/data/maps/SafariZone_Building1/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SafariZone_Building1:: @ 834F968 - .4byte SafariZone_Building_Layout @ 0x831C028 - .4byte SafariZone_Building1_MapEvents @ 0x83B12CC - .4byte SafariZone_Building1_MapScripts @ 0x81623EB - .4byte NULL - .2byte BGM_FRLG_SAFARI_ZONE - .2byte 198 - .byte 0x88, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/SafariZone_Building1/map.json b/data/maps/SafariZone_Building1/map.json new file mode 100644 index 000000000..09b84bb5b --- /dev/null +++ b/data/maps/SafariZone_Building1/map.json @@ -0,0 +1,68 @@ +{ + "id": "MAP_SAFARI_ZONE_BUILDING1", + "name": "SafariZone_Building1", + "layout": "LAYOUT_SAFARI_ZONE_BUILDING", + "music": "BGM_FRLG_SAFARI_ZONE", + "region_map_section": "MAPSEC_KANTO_SAFARI_ZONE", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "55", + "x": 3, + "y": 4, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_Building1_EventScript_1623F5", + "flag": "0" + }, + { + "graphics_id": "23", + "x": 7, + "y": 3, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_Building1_EventScript_1623EC", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 9, + "elevation": 3, + "dest_map": "MAP_SAFARI_ZONE_CENTER", + "dest_warp_id": 12 + }, + { + "x": 4, + "y": 9, + "elevation": 3, + "dest_map": "MAP_SAFARI_ZONE_CENTER", + "dest_warp_id": 12 + }, + { + "x": 5, + "y": 9, + "elevation": 3, + "dest_map": "MAP_SAFARI_ZONE_CENTER", + "dest_warp_id": 12 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/SafariZone_Building2/events.inc b/data/maps/SafariZone_Building2/events.inc deleted file mode 100644 index fadf6acc5..000000000 --- a/data/maps/SafariZone_Building2/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -SafariZone_Building2_EventObjects: - object_event 1, 55, 0, 3, 0, 5, 0, 3, 1, 17, 0, 0, 0, 0, 0, SafariZone_Building2_EventScript_162408, 0, 0, 0 - object_event 2, 26, 0, 6, 0, 3, 0, 3, 8, 17, 0, 0, 0, 0, 0, SafariZone_Building2_EventScript_1623FF, 0, 0, 0 - object_event 3, 30, 0, 7, 0, 3, 0, 3, 8, 17, 0, 0, 0, 0, 0, SafariZone_Building2_EventScript_162411, 0, 0, 0 - -SafariZone_Building2_MapWarps: - warp_def 3, 9, 3, 6, 320 - warp_def 4, 9, 3, 6, 320 - warp_def 5, 9, 3, 6, 320 - -SafariZone_Building2_MapEvents:: - map_events SafariZone_Building2_EventObjects, SafariZone_Building2_MapWarps, 0x0, 0x0 diff --git a/data/maps/SafariZone_Building2/header.inc b/data/maps/SafariZone_Building2/header.inc deleted file mode 100644 index 706671bbb..000000000 --- a/data/maps/SafariZone_Building2/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SafariZone_Building2:: @ 834F984 - .4byte SafariZone_Building_Layout @ 0x831C028 - .4byte SafariZone_Building2_MapEvents @ 0x83B1340 - .4byte SafariZone_Building2_MapScripts @ 0x81623FE - .4byte NULL - .2byte BGM_FRLG_SAFARI_ZONE - .2byte 198 - .byte 0x88, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/SafariZone_Building2/map.json b/data/maps/SafariZone_Building2/map.json new file mode 100644 index 000000000..96282855f --- /dev/null +++ b/data/maps/SafariZone_Building2/map.json @@ -0,0 +1,81 @@ +{ + "id": "MAP_SAFARI_ZONE_BUILDING2", + "name": "SafariZone_Building2", + "layout": "LAYOUT_SAFARI_ZONE_BUILDING", + "music": "BGM_FRLG_SAFARI_ZONE", + "region_map_section": "MAPSEC_KANTO_SAFARI_ZONE", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "55", + "x": 3, + "y": 5, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_Building2_EventScript_162408", + "flag": "0" + }, + { + "graphics_id": "26", + "x": 6, + "y": 3, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_Building2_EventScript_1623FF", + "flag": "0" + }, + { + "graphics_id": "30", + "x": 7, + "y": 3, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_Building2_EventScript_162411", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 9, + "elevation": 3, + "dest_map": "MAP_SAFARI_ZONE_EAST", + "dest_warp_id": 6 + }, + { + "x": 4, + "y": 9, + "elevation": 3, + "dest_map": "MAP_SAFARI_ZONE_EAST", + "dest_warp_id": 6 + }, + { + "x": 5, + "y": 9, + "elevation": 3, + "dest_map": "MAP_SAFARI_ZONE_EAST", + "dest_warp_id": 6 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/SafariZone_Building3/events.inc b/data/maps/SafariZone_Building3/events.inc deleted file mode 100644 index ec99802bb..000000000 --- a/data/maps/SafariZone_Building3/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -SafariZone_Building3_EventObjects: - object_event 1, 61, 0, 3, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, SafariZone_Building3_EventScript_16242D, 0, 0, 0 - object_event 2, 55, 0, 7, 0, 5, 0, 3, 2, 17, 0, 0, 0, 0, 0, SafariZone_Building3_EventScript_162424, 0, 0, 0 - object_event 3, 57, 0, 6, 0, 2, 0, 3, 1, 17, 0, 0, 0, 0, 0, SafariZone_Building3_EventScript_16241B, 0, 0, 0 - object_event 4, 30, 0, 11, 0, 2, 0, 3, 7, 17, 0, 0, 0, 0, 0, SafariZone_Building3_EventScript_1ACED3, 0, 0, 0 - -SafariZone_Building3_MapWarps: - warp_def 3, 9, 3, 12, 321 - warp_def 4, 9, 3, 12, 321 - warp_def 5, 9, 3, 12, 321 - -SafariZone_Building3_MapEvents:: - map_events SafariZone_Building3_EventObjects, SafariZone_Building3_MapWarps, 0x0, 0x0 diff --git a/data/maps/SafariZone_Building3/header.inc b/data/maps/SafariZone_Building3/header.inc deleted file mode 100644 index 219c3a1a4..000000000 --- a/data/maps/SafariZone_Building3/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SafariZone_Building3:: @ 834F9A0 - .4byte SafariZone_Building_Layout @ 0x831C028 - .4byte SafariZone_Building3_MapEvents @ 0x83B13CC - .4byte SafariZone_Building3_MapScripts @ 0x816241A - .4byte NULL - .2byte BGM_FRLG_SAFARI_ZONE - .2byte 198 - .byte 0x88, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/SafariZone_Building3/map.json b/data/maps/SafariZone_Building3/map.json new file mode 100644 index 000000000..47480065a --- /dev/null +++ b/data/maps/SafariZone_Building3/map.json @@ -0,0 +1,94 @@ +{ + "id": "MAP_SAFARI_ZONE_BUILDING3", + "name": "SafariZone_Building3", + "layout": "LAYOUT_SAFARI_ZONE_BUILDING", + "music": "BGM_FRLG_SAFARI_ZONE", + "region_map_section": "MAPSEC_KANTO_SAFARI_ZONE", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "61", + "x": 3, + "y": 4, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_Building3_EventScript_16242D", + "flag": "0" + }, + { + "graphics_id": "55", + "x": 7, + "y": 5, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_Building3_EventScript_162424", + "flag": "0" + }, + { + "graphics_id": "57", + "x": 6, + "y": 2, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_Building3_EventScript_16241B", + "flag": "0" + }, + { + "graphics_id": "30", + "x": 11, + "y": 2, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_Building3_EventScript_1ACED3", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 9, + "elevation": 3, + "dest_map": "MAP_SAFARI_ZONE_NORTH", + "dest_warp_id": 12 + }, + { + "x": 4, + "y": 9, + "elevation": 3, + "dest_map": "MAP_SAFARI_ZONE_NORTH", + "dest_warp_id": 12 + }, + { + "x": 5, + "y": 9, + "elevation": 3, + "dest_map": "MAP_SAFARI_ZONE_NORTH", + "dest_warp_id": 12 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/SafariZone_Building4/events.inc b/data/maps/SafariZone_Building4/events.inc deleted file mode 100644 index e22f4251e..000000000 --- a/data/maps/SafariZone_Building4/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -SafariZone_Building4_EventObjects: - object_event 1, 55, 0, 3, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, SafariZone_Building4_EventScript_162440, 0, 0, 0 - object_event 2, 25, 0, 2, 0, 2, 0, 0, 1, 17, 0, 0, 0, 0, 0, SafariZone_Building4_EventScript_162437, 0, 0, 0 - object_event 3, 42, 0, 7, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, SafariZone_Building4_EventScript_162449, 0, 0, 0 - -SafariZone_Building4_MapWarps: - warp_def 3, 9, 3, 10, 322 - warp_def 4, 9, 3, 10, 322 - warp_def 5, 9, 3, 10, 322 - -SafariZone_Building4_MapEvents:: - map_events SafariZone_Building4_EventObjects, SafariZone_Building4_MapWarps, 0x0, 0x0 diff --git a/data/maps/SafariZone_Building4/header.inc b/data/maps/SafariZone_Building4/header.inc deleted file mode 100644 index 60fa37573..000000000 --- a/data/maps/SafariZone_Building4/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SafariZone_Building4:: @ 834F9BC - .4byte SafariZone_Building_Layout @ 0x831C028 - .4byte SafariZone_Building4_MapEvents @ 0x83B1440 - .4byte SafariZone_Building4_MapScripts @ 0x8162436 - .4byte NULL - .2byte BGM_FRLG_SAFARI_ZONE - .2byte 198 - .byte 0x88, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/SafariZone_Building4/map.json b/data/maps/SafariZone_Building4/map.json new file mode 100644 index 000000000..2cfc647cd --- /dev/null +++ b/data/maps/SafariZone_Building4/map.json @@ -0,0 +1,81 @@ +{ + "id": "MAP_SAFARI_ZONE_BUILDING4", + "name": "SafariZone_Building4", + "layout": "LAYOUT_SAFARI_ZONE_BUILDING", + "music": "BGM_FRLG_SAFARI_ZONE", + "region_map_section": "MAPSEC_KANTO_SAFARI_ZONE", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "55", + "x": 3, + "y": 4, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_Building4_EventScript_162440", + "flag": "0" + }, + { + "graphics_id": "25", + "x": 2, + "y": 2, + "elevation": 0, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_Building4_EventScript_162437", + "flag": "0" + }, + { + "graphics_id": "42", + "x": 7, + "y": 3, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_Building4_EventScript_162449", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 9, + "elevation": 3, + "dest_map": "MAP_SAFARI_ZONE_WEST", + "dest_warp_id": 10 + }, + { + "x": 4, + "y": 9, + "elevation": 3, + "dest_map": "MAP_SAFARI_ZONE_WEST", + "dest_warp_id": 10 + }, + { + "x": 5, + "y": 9, + "elevation": 3, + "dest_map": "MAP_SAFARI_ZONE_WEST", + "dest_warp_id": 10 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/SafariZone_Center/events.inc b/data/maps/SafariZone_Center/events.inc deleted file mode 100644 index d77cae266..000000000 --- a/data/maps/SafariZone_Center/events.inc +++ /dev/null @@ -1,26 +0,0 @@ -SafariZone_Center_EventObjects: - object_event 1, 92, 0, 24, 0, 15, 0, 3, 8, 17, 0, 0, 0, 0, 0, SafariZone_Center_EventScript_1BE7D7, 385, 0, 0 - -SafariZone_Center_MapWarps: - warp_def 25, 30, 3, 0, 2816 - warp_def 26, 30, 3, 0, 2816 - warp_def 27, 30, 3, 0, 2816 - warp_def 25, 5, 3, 9, 321 - warp_def 26, 5, 3, 10, 321 - warp_def 27, 5, 0, 11, 321 - warp_def 8, 17, 3, 6, 322 - warp_def 8, 18, 3, 7, 322 - warp_def 8, 19, 0, 8, 322 - warp_def 43, 15, 3, 3, 320 - warp_def 43, 16, 3, 4, 320 - warp_def 43, 17, 0, 5, 320 - warp_def 29, 25, 0, 1, 323 - -SafariZone_Center_MapBGEvents: - bg_event 30, 26, 0, 0, 0, SafariZone_Center_EventScript_162361 - bg_event 25, 27, 0, 0, 0, SafariZone_Center_EventScript_16236A - bg_event 27, 15, 3, 7, 0, 98, 22, 1 - bg_event 33, 20, 0, 0, 0, SafariZone_Center_EventScript_162373 - -SafariZone_Center_MapEvents:: - map_events SafariZone_Center_EventObjects, SafariZone_Center_MapWarps, 0x0, SafariZone_Center_MapBGEvents diff --git a/data/maps/SafariZone_Center/header.inc b/data/maps/SafariZone_Center/header.inc deleted file mode 100644 index 9a2b3f5cc..000000000 --- a/data/maps/SafariZone_Center/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SafariZone_Center:: @ 834F8F8 - .4byte SafariZone_Center_Layout @ 0x830DD38 - .4byte SafariZone_Center_MapEvents @ 0x83B0F98 - .4byte SafariZone_Center_MapScripts @ 0x8162357 - .4byte NULL - .2byte BGM_FRLG_SAFARI_ZONE - .2byte 147 - .byte 0x88, 0x00, 0x00, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/SafariZone_Center/map.json b/data/maps/SafariZone_Center/map.json new file mode 100644 index 000000000..0ef1fd180 --- /dev/null +++ b/data/maps/SafariZone_Center/map.json @@ -0,0 +1,156 @@ +{ + "id": "MAP_SAFARI_ZONE_CENTER", + "name": "SafariZone_Center", + "layout": "LAYOUT_SAFARI_ZONE_CENTER", + "music": "BGM_FRLG_SAFARI_ZONE", + "region_map_section": "MAPSEC_KANTO_SAFARI_ZONE", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_3", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "92", + "x": 24, + "y": 15, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_Center_EventScript_1BE7D7", + "flag": "385" + } + ], + "warp_events": [ + { + "x": 25, + "y": 30, + "elevation": 3, + "dest_map": "MAP_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE", + "dest_warp_id": 0 + }, + { + "x": 26, + "y": 30, + "elevation": 3, + "dest_map": "MAP_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE", + "dest_warp_id": 0 + }, + { + "x": 27, + "y": 30, + "elevation": 3, + "dest_map": "MAP_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE", + "dest_warp_id": 0 + }, + { + "x": 25, + "y": 5, + "elevation": 3, + "dest_map": "MAP_SAFARI_ZONE_NORTH", + "dest_warp_id": 9 + }, + { + "x": 26, + "y": 5, + "elevation": 3, + "dest_map": "MAP_SAFARI_ZONE_NORTH", + "dest_warp_id": 10 + }, + { + "x": 27, + "y": 5, + "elevation": 0, + "dest_map": "MAP_SAFARI_ZONE_NORTH", + "dest_warp_id": 11 + }, + { + "x": 8, + "y": 17, + "elevation": 3, + "dest_map": "MAP_SAFARI_ZONE_WEST", + "dest_warp_id": 6 + }, + { + "x": 8, + "y": 18, + "elevation": 3, + "dest_map": "MAP_SAFARI_ZONE_WEST", + "dest_warp_id": 7 + }, + { + "x": 8, + "y": 19, + "elevation": 0, + "dest_map": "MAP_SAFARI_ZONE_WEST", + "dest_warp_id": 8 + }, + { + "x": 43, + "y": 15, + "elevation": 3, + "dest_map": "MAP_SAFARI_ZONE_EAST", + "dest_warp_id": 3 + }, + { + "x": 43, + "y": 16, + "elevation": 3, + "dest_map": "MAP_SAFARI_ZONE_EAST", + "dest_warp_id": 4 + }, + { + "x": 43, + "y": 17, + "elevation": 0, + "dest_map": "MAP_SAFARI_ZONE_EAST", + "dest_warp_id": 5 + }, + { + "x": 29, + "y": 25, + "elevation": 0, + "dest_map": "MAP_SAFARI_ZONE_BUILDING1", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 30, + "y": 26, + "elevation": 0, + "script": "SafariZone_Center_EventScript_162361" + }, + { + "type": "bg_event_type_0", + "x": 25, + "y": 27, + "elevation": 0, + "script": "SafariZone_Center_EventScript_16236A" + }, + { + "type": "hidden_item", + "x": 27, + "y": 15, + "elevation": 3, + "item": "ITEM_LEAF_STONE", + "flag": "22", + "unknown": 1 + }, + { + "type": "bg_event_type_0", + "x": 33, + "y": 20, + "elevation": 0, + "script": "SafariZone_Center_EventScript_162373" + } + ] +}
\ No newline at end of file diff --git a/data/maps/SafariZone_East/events.inc b/data/maps/SafariZone_East/events.inc deleted file mode 100644 index f273e32f9..000000000 --- a/data/maps/SafariZone_East/events.inc +++ /dev/null @@ -1,22 +0,0 @@ -SafariZone_East_EventObjects: - object_event 1, 92, 0, 13, 0, 12, 0, 3, 8, 17, 0, 0, 0, 0, 0, SafariZone_East_EventScript_1BE7E4, 386, 0, 0 - object_event 2, 92, 0, 37, 0, 15, 0, 3, 8, 17, 0, 0, 0, 0, 0, SafariZone_East_EventScript_1BE7F1, 387, 0, 0 - object_event 3, 92, 0, 31, 0, 18, 0, 3, 8, 17, 0, 0, 0, 0, 0, SafariZone_East_EventScript_1BE7FE, 388, 0, 0 - object_event 4, 92, 0, 36, 0, 17, 0, 4, 8, 17, 0, 0, 0, 0, 0, SafariZone_East_EventScript_1BE80B, 389, 0, 0 - -SafariZone_East_MapWarps: - warp_def 8, 9, 3, 6, 321 - warp_def 8, 10, 3, 7, 321 - warp_def 8, 11, 0, 8, 321 - warp_def 8, 26, 3, 9, 319 - warp_def 8, 27, 3, 10, 319 - warp_def 8, 28, 0, 11, 319 - warp_def 40, 14, 0, 1, 324 - -SafariZone_East_MapBGEvents: - bg_event 18, 27, 0, 0, 0, SafariZone_East_EventScript_16238F - bg_event 43, 15, 0, 0, 0, SafariZone_East_EventScript_16237D - bg_event 17, 8, 0, 0, 0, SafariZone_East_EventScript_162386 - -SafariZone_East_MapEvents:: - map_events SafariZone_East_EventObjects, SafariZone_East_MapWarps, 0x0, SafariZone_East_MapBGEvents diff --git a/data/maps/SafariZone_East/header.inc b/data/maps/SafariZone_East/header.inc deleted file mode 100644 index 63835d624..000000000 --- a/data/maps/SafariZone_East/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SafariZone_East:: @ 834F914 - .4byte SafariZone_East_Layout @ 0x830EC24 - .4byte SafariZone_East_MapEvents @ 0x83B1068 - .4byte SafariZone_East_MapScripts @ 0x816237C - .4byte NULL - .2byte BGM_FRLG_SAFARI_ZONE - .2byte 148 - .byte 0x88, 0x00, 0x00, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/SafariZone_East/map.json b/data/maps/SafariZone_East/map.json new file mode 100644 index 000000000..6f7c8eeb7 --- /dev/null +++ b/data/maps/SafariZone_East/map.json @@ -0,0 +1,144 @@ +{ + "id": "MAP_SAFARI_ZONE_EAST", + "name": "SafariZone_East", + "layout": "LAYOUT_SAFARI_ZONE_EAST", + "music": "BGM_FRLG_SAFARI_ZONE", + "region_map_section": "MAPSEC_KANTO_SAFARI_ZONE", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_3", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "92", + "x": 13, + "y": 12, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_East_EventScript_1BE7E4", + "flag": "386" + }, + { + "graphics_id": "92", + "x": 37, + "y": 15, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_East_EventScript_1BE7F1", + "flag": "387" + }, + { + "graphics_id": "92", + "x": 31, + "y": 18, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_East_EventScript_1BE7FE", + "flag": "388" + }, + { + "graphics_id": "92", + "x": 36, + "y": 17, + "elevation": 4, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_East_EventScript_1BE80B", + "flag": "389" + } + ], + "warp_events": [ + { + "x": 8, + "y": 9, + "elevation": 3, + "dest_map": "MAP_SAFARI_ZONE_NORTH", + "dest_warp_id": 6 + }, + { + "x": 8, + "y": 10, + "elevation": 3, + "dest_map": "MAP_SAFARI_ZONE_NORTH", + "dest_warp_id": 7 + }, + { + "x": 8, + "y": 11, + "elevation": 0, + "dest_map": "MAP_SAFARI_ZONE_NORTH", + "dest_warp_id": 8 + }, + { + "x": 8, + "y": 26, + "elevation": 3, + "dest_map": "MAP_SAFARI_ZONE_CENTER", + "dest_warp_id": 9 + }, + { + "x": 8, + "y": 27, + "elevation": 3, + "dest_map": "MAP_SAFARI_ZONE_CENTER", + "dest_warp_id": 10 + }, + { + "x": 8, + "y": 28, + "elevation": 0, + "dest_map": "MAP_SAFARI_ZONE_CENTER", + "dest_warp_id": 11 + }, + { + "x": 40, + "y": 14, + "elevation": 0, + "dest_map": "MAP_SAFARI_ZONE_BUILDING2", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 18, + "y": 27, + "elevation": 0, + "script": "SafariZone_East_EventScript_16238F" + }, + { + "type": "bg_event_type_0", + "x": 43, + "y": 15, + "elevation": 0, + "script": "SafariZone_East_EventScript_16237D" + }, + { + "type": "bg_event_type_0", + "x": 17, + "y": 8, + "elevation": 0, + "script": "SafariZone_East_EventScript_162386" + } + ] +}
\ No newline at end of file diff --git a/data/maps/SafariZone_North/events.inc b/data/maps/SafariZone_North/events.inc deleted file mode 100644 index 8894652dd..000000000 --- a/data/maps/SafariZone_North/events.inc +++ /dev/null @@ -1,29 +0,0 @@ -SafariZone_North_EventObjects: - object_event 1, 92, 0, 33, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, SafariZone_North_EventScript_1BE818, 390, 0, 0 - object_event 2, 92, 0, 28, 0, 9, 0, 3, 8, 17, 0, 0, 0, 0, 0, SafariZone_North_EventScript_1BE825, 391, 0, 0 - object_event 3, 92, 0, 29, 0, 17, 0, 3, 8, 17, 0, 0, 0, 0, 0, SafariZone_North_EventScript_1BEBDA, 467, 0, 0 - -SafariZone_North_MapWarps: - warp_def 10, 34, 3, 0, 322 - warp_def 11, 34, 3, 1, 322 - warp_def 12, 34, 0, 2, 322 - warp_def 20, 34, 3, 3, 322 - warp_def 21, 34, 3, 4, 322 - warp_def 22, 34, 0, 5, 322 - warp_def 48, 31, 3, 0, 320 - warp_def 48, 32, 3, 1, 320 - warp_def 48, 33, 0, 2, 320 - warp_def 30, 34, 3, 3, 319 - warp_def 31, 34, 3, 4, 319 - warp_def 32, 34, 0, 5, 319 - warp_def 43, 8, 0, 1, 325 - -SafariZone_North_MapBGEvents: - bg_event 13, 27, 0, 0, 0, SafariZone_North_EventScript_1623A2 - bg_event 23, 31, 0, 0, 0, SafariZone_North_EventScript_1623AB - bg_event 29, 32, 0, 0, 0, SafariZone_North_EventScript_1623B4 - bg_event 34, 28, 0, 0, 0, SafariZone_North_EventScript_1623BD - bg_event 44, 9, 0, 0, 0, SafariZone_North_EventScript_162399 - -SafariZone_North_MapEvents:: - map_events SafariZone_North_EventObjects, SafariZone_North_MapWarps, 0x0, SafariZone_North_MapBGEvents diff --git a/data/maps/SafariZone_North/header.inc b/data/maps/SafariZone_North/header.inc deleted file mode 100644 index 35ceb0989..000000000 --- a/data/maps/SafariZone_North/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SafariZone_North:: @ 834F930 - .4byte SafariZone_North_Layout @ 0x830FE1C - .4byte SafariZone_North_MapEvents @ 0x83B1168 - .4byte SafariZone_North_MapScripts @ 0x8162398 - .4byte NULL - .2byte BGM_FRLG_SAFARI_ZONE - .2byte 149 - .byte 0x88, 0x00, 0x00, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/SafariZone_North/map.json b/data/maps/SafariZone_North/map.json new file mode 100644 index 000000000..4462b8485 --- /dev/null +++ b/data/maps/SafariZone_North/map.json @@ -0,0 +1,187 @@ +{ + "id": "MAP_SAFARI_ZONE_NORTH", + "name": "SafariZone_North", + "layout": "LAYOUT_SAFARI_ZONE_NORTH", + "music": "BGM_FRLG_SAFARI_ZONE", + "region_map_section": "MAPSEC_KANTO_SAFARI_ZONE", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_3", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "92", + "x": 33, + "y": 5, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_North_EventScript_1BE818", + "flag": "390" + }, + { + "graphics_id": "92", + "x": 28, + "y": 9, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_North_EventScript_1BE825", + "flag": "391" + }, + { + "graphics_id": "92", + "x": 29, + "y": 17, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_North_EventScript_1BEBDA", + "flag": "467" + } + ], + "warp_events": [ + { + "x": 10, + "y": 34, + "elevation": 3, + "dest_map": "MAP_SAFARI_ZONE_WEST", + "dest_warp_id": 0 + }, + { + "x": 11, + "y": 34, + "elevation": 3, + "dest_map": "MAP_SAFARI_ZONE_WEST", + "dest_warp_id": 1 + }, + { + "x": 12, + "y": 34, + "elevation": 0, + "dest_map": "MAP_SAFARI_ZONE_WEST", + "dest_warp_id": 2 + }, + { + "x": 20, + "y": 34, + "elevation": 3, + "dest_map": "MAP_SAFARI_ZONE_WEST", + "dest_warp_id": 3 + }, + { + "x": 21, + "y": 34, + "elevation": 3, + "dest_map": "MAP_SAFARI_ZONE_WEST", + "dest_warp_id": 4 + }, + { + "x": 22, + "y": 34, + "elevation": 0, + "dest_map": "MAP_SAFARI_ZONE_WEST", + "dest_warp_id": 5 + }, + { + "x": 48, + "y": 31, + "elevation": 3, + "dest_map": "MAP_SAFARI_ZONE_EAST", + "dest_warp_id": 0 + }, + { + "x": 48, + "y": 32, + "elevation": 3, + "dest_map": "MAP_SAFARI_ZONE_EAST", + "dest_warp_id": 1 + }, + { + "x": 48, + "y": 33, + "elevation": 0, + "dest_map": "MAP_SAFARI_ZONE_EAST", + "dest_warp_id": 2 + }, + { + "x": 30, + "y": 34, + "elevation": 3, + "dest_map": "MAP_SAFARI_ZONE_CENTER", + "dest_warp_id": 3 + }, + { + "x": 31, + "y": 34, + "elevation": 3, + "dest_map": "MAP_SAFARI_ZONE_CENTER", + "dest_warp_id": 4 + }, + { + "x": 32, + "y": 34, + "elevation": 0, + "dest_map": "MAP_SAFARI_ZONE_CENTER", + "dest_warp_id": 5 + }, + { + "x": 43, + "y": 8, + "elevation": 0, + "dest_map": "MAP_SAFARI_ZONE_BUILDING3", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 13, + "y": 27, + "elevation": 0, + "script": "SafariZone_North_EventScript_1623A2" + }, + { + "type": "bg_event_type_0", + "x": 23, + "y": 31, + "elevation": 0, + "script": "SafariZone_North_EventScript_1623AB" + }, + { + "type": "bg_event_type_0", + "x": 29, + "y": 32, + "elevation": 0, + "script": "SafariZone_North_EventScript_1623B4" + }, + { + "type": "bg_event_type_0", + "x": 34, + "y": 28, + "elevation": 0, + "script": "SafariZone_North_EventScript_1623BD" + }, + { + "type": "bg_event_type_0", + "x": 44, + "y": 9, + "elevation": 0, + "script": "SafariZone_North_EventScript_162399" + } + ] +}
\ No newline at end of file diff --git a/data/maps/SafariZone_SecretHouse/events.inc b/data/maps/SafariZone_SecretHouse/events.inc deleted file mode 100644 index eb746f4c5..000000000 --- a/data/maps/SafariZone_SecretHouse/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -SafariZone_SecretHouse_EventObjects: - object_event 1, 47, 0, 6, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, SafariZone_SecretHouse_EventScript_162453, 0, 0, 0 - -SafariZone_SecretHouse_MapWarps: - warp_def 3, 9, 3, 9, 322 - warp_def 4, 9, 3, 9, 322 - warp_def 5, 9, 3, 9, 322 - -SafariZone_SecretHouse_MapEvents:: - map_events SafariZone_SecretHouse_EventObjects, SafariZone_SecretHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/SafariZone_SecretHouse/header.inc b/data/maps/SafariZone_SecretHouse/header.inc deleted file mode 100644 index f91bc7a7b..000000000 --- a/data/maps/SafariZone_SecretHouse/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SafariZone_SecretHouse:: @ 834F9D8 - .4byte SafariZone_SecretHouse_Layout @ 0x831C16C - .4byte SafariZone_SecretHouse_MapEvents @ 0x83B1484 - .4byte SafariZone_SecretHouse_MapScripts @ 0x8162452 - .4byte NULL - .2byte BGM_FRLG_SAFARI_ZONE - .2byte 199 - .byte 0x88, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/SafariZone_SecretHouse/map.json b/data/maps/SafariZone_SecretHouse/map.json new file mode 100644 index 000000000..83c1c7c34 --- /dev/null +++ b/data/maps/SafariZone_SecretHouse/map.json @@ -0,0 +1,55 @@ +{ + "id": "MAP_SAFARI_ZONE_SECRET_HOUSE", + "name": "SafariZone_SecretHouse", + "layout": "LAYOUT_SAFARI_ZONE_SECRET_HOUSE", + "music": "BGM_FRLG_SAFARI_ZONE", + "region_map_section": "MAPSEC_KANTO_SAFARI_ZONE", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "47", + "x": 6, + "y": 5, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_SecretHouse_EventScript_162453", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 9, + "elevation": 3, + "dest_map": "MAP_SAFARI_ZONE_WEST", + "dest_warp_id": 9 + }, + { + "x": 4, + "y": 9, + "elevation": 3, + "dest_map": "MAP_SAFARI_ZONE_WEST", + "dest_warp_id": 9 + }, + { + "x": 5, + "y": 9, + "elevation": 3, + "dest_map": "MAP_SAFARI_ZONE_WEST", + "dest_warp_id": 9 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/SafariZone_West/events.inc b/data/maps/SafariZone_West/events.inc deleted file mode 100644 index a41c7a187..000000000 --- a/data/maps/SafariZone_West/events.inc +++ /dev/null @@ -1,28 +0,0 @@ -SafariZone_West_EventObjects: - object_event 1, 92, 0, 28, 0, 14, 0, 3, 8, 17, 0, 0, 0, 0, 0, SafariZone_West_EventScript_1BE83F, 393, 0, 0 - object_event 2, 92, 0, 17, 0, 13, 0, 3, 8, 17, 0, 0, 0, 0, 0, SafariZone_West_EventScript_1BE832, 392, 0, 0 - object_event 3, 92, 0, 16, 0, 27, 0, 3, 8, 17, 0, 0, 0, 0, 0, SafariZone_West_EventScript_1BE84C, 394, 0, 0 - object_event 4, 92, 0, 27, 0, 24, 0, 3, 8, 17, 0, 0, 0, 0, 0, SafariZone_West_EventScript_1BE859, 395, 0, 0 - -SafariZone_West_MapWarps: - warp_def 30, 5, 3, 0, 321 - warp_def 31, 5, 3, 1, 321 - warp_def 32, 5, 0, 2, 321 - warp_def 37, 5, 3, 3, 321 - warp_def 38, 5, 3, 4, 321 - warp_def 39, 5, 0, 5, 321 - warp_def 40, 26, 3, 6, 319 - warp_def 40, 27, 3, 7, 319 - warp_def 40, 28, 0, 8, 319 - warp_def 12, 7, 0, 1, 327 - warp_def 19, 18, 0, 1, 326 - -SafariZone_West_MapBGEvents: - bg_event 27, 9, 0, 0, 0, SafariZone_West_EventScript_1623D0 - bg_event 36, 10, 0, 0, 0, SafariZone_West_EventScript_1623D9 - bg_event 35, 26, 0, 0, 0, SafariZone_West_EventScript_1623E2 - bg_event 22, 19, 0, 0, 0, SafariZone_West_EventScript_1623C7 - bg_event 13, 11, 3, 7, 0, 24, 23, 1 - -SafariZone_West_MapEvents:: - map_events SafariZone_West_EventObjects, SafariZone_West_MapWarps, 0x0, SafariZone_West_MapBGEvents diff --git a/data/maps/SafariZone_West/header.inc b/data/maps/SafariZone_West/header.inc deleted file mode 100644 index 69547c067..000000000 --- a/data/maps/SafariZone_West/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SafariZone_West:: @ 834F94C - .4byte SafariZone_West_Layout @ 0x8310BC4 - .4byte SafariZone_West_MapEvents @ 0x83B1270 - .4byte SafariZone_West_MapScripts @ 0x81623C6 - .4byte NULL - .2byte BGM_FRLG_SAFARI_ZONE - .2byte 150 - .byte 0x88, 0x00, 0x00, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/SafariZone_West/map.json b/data/maps/SafariZone_West/map.json new file mode 100644 index 000000000..9945f2516 --- /dev/null +++ b/data/maps/SafariZone_West/map.json @@ -0,0 +1,188 @@ +{ + "id": "MAP_SAFARI_ZONE_WEST", + "name": "SafariZone_West", + "layout": "LAYOUT_SAFARI_ZONE_WEST", + "music": "BGM_FRLG_SAFARI_ZONE", + "region_map_section": "MAPSEC_KANTO_SAFARI_ZONE", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_3", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "92", + "x": 28, + "y": 14, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_West_EventScript_1BE83F", + "flag": "393" + }, + { + "graphics_id": "92", + "x": 17, + "y": 13, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_West_EventScript_1BE832", + "flag": "392" + }, + { + "graphics_id": "92", + "x": 16, + "y": 27, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_West_EventScript_1BE84C", + "flag": "394" + }, + { + "graphics_id": "92", + "x": 27, + "y": 24, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_West_EventScript_1BE859", + "flag": "395" + } + ], + "warp_events": [ + { + "x": 30, + "y": 5, + "elevation": 3, + "dest_map": "MAP_SAFARI_ZONE_NORTH", + "dest_warp_id": 0 + }, + { + "x": 31, + "y": 5, + "elevation": 3, + "dest_map": "MAP_SAFARI_ZONE_NORTH", + "dest_warp_id": 1 + }, + { + "x": 32, + "y": 5, + "elevation": 0, + "dest_map": "MAP_SAFARI_ZONE_NORTH", + "dest_warp_id": 2 + }, + { + "x": 37, + "y": 5, + "elevation": 3, + "dest_map": "MAP_SAFARI_ZONE_NORTH", + "dest_warp_id": 3 + }, + { + "x": 38, + "y": 5, + "elevation": 3, + "dest_map": "MAP_SAFARI_ZONE_NORTH", + "dest_warp_id": 4 + }, + { + "x": 39, + "y": 5, + "elevation": 0, + "dest_map": "MAP_SAFARI_ZONE_NORTH", + "dest_warp_id": 5 + }, + { + "x": 40, + "y": 26, + "elevation": 3, + "dest_map": "MAP_SAFARI_ZONE_CENTER", + "dest_warp_id": 6 + }, + { + "x": 40, + "y": 27, + "elevation": 3, + "dest_map": "MAP_SAFARI_ZONE_CENTER", + "dest_warp_id": 7 + }, + { + "x": 40, + "y": 28, + "elevation": 0, + "dest_map": "MAP_SAFARI_ZONE_CENTER", + "dest_warp_id": 8 + }, + { + "x": 12, + "y": 7, + "elevation": 0, + "dest_map": "MAP_SAFARI_ZONE_SECRET_HOUSE", + "dest_warp_id": 1 + }, + { + "x": 19, + "y": 18, + "elevation": 0, + "dest_map": "MAP_SAFARI_ZONE_BUILDING4", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 27, + "y": 9, + "elevation": 0, + "script": "SafariZone_West_EventScript_1623D0" + }, + { + "type": "bg_event_type_0", + "x": 36, + "y": 10, + "elevation": 0, + "script": "SafariZone_West_EventScript_1623D9" + }, + { + "type": "bg_event_type_0", + "x": 35, + "y": 26, + "elevation": 0, + "script": "SafariZone_West_EventScript_1623E2" + }, + { + "type": "bg_event_type_0", + "x": 22, + "y": 19, + "elevation": 0, + "script": "SafariZone_West_EventScript_1623C7" + }, + { + "type": "hidden_item", + "x": 13, + "y": 11, + "elevation": 3, + "item": "ITEM_REVIVE", + "flag": "23", + "unknown": 1 + } + ] +}
\ No newline at end of file diff --git a/data/maps/SaffronCity/connections.inc b/data/maps/SaffronCity/connections.inc deleted file mode 100644 index 6b2b2b3ff..000000000 --- a/data/maps/SaffronCity/connections.inc +++ /dev/null @@ -1,9 +0,0 @@ -SaffronCity_MapConnectionsList: @ 83528FC - connection up, 0, MAP_ROUTE5 - connection down, 12, MAP_ROUTE6 - connection left, 10, MAP_ROUTE7 - connection right, 10, MAP_ROUTE8 - -SaffronCity_MapConnections:: @ 835292C - .4byte 4 - .4byte SaffronCity_MapConnectionsList diff --git a/data/maps/SaffronCity/events.inc b/data/maps/SaffronCity/events.inc deleted file mode 100644 index 969d5a74f..000000000 --- a/data/maps/SaffronCity/events.inc +++ /dev/null @@ -1,2 +0,0 @@ -SaffronCity_MapEvents:: - map_events 0x0, 0x0, 0x0, 0x0 diff --git a/data/maps/SaffronCity/header.inc b/data/maps/SaffronCity/header.inc deleted file mode 100644 index 79a6bb684..000000000 --- a/data/maps/SaffronCity/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SaffronCity:: @ 835074C - .4byte SaffronCity_Layout @ 0x82E4E28 - .4byte SaffronCity_MapEvents @ 0x83B5EB0 - .4byte SaffronCity_MapScripts @ 0x8167483 - .4byte SaffronCity_MapConnections @ 0x835292C - .2byte BGM_FRLG_VIRIDIAN_CITY - .2byte 88 - .byte 0x62, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/SaffronCity/map.json b/data/maps/SaffronCity/map.json new file mode 100644 index 000000000..b705126ff --- /dev/null +++ b/data/maps/SaffronCity/map.json @@ -0,0 +1,40 @@ +{ + "id": "MAP_SAFFRON_CITY", + "name": "SaffronCity", + "layout": "LAYOUT_SAFFRON_CITY", + "music": "BGM_FRLG_VIRIDIAN_CITY", + "region_map_section": "MAPSEC_SAFFRON_CITY", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_1", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_ROUTE5", + "offset": 0, + "direction": "up" + }, + { + "map": "MAP_ROUTE6", + "offset": 12, + "direction": "down" + }, + { + "map": "MAP_ROUTE7", + "offset": 10, + "direction": "left" + }, + { + "map": "MAP_ROUTE8", + "offset": 10, + "direction": "right" + } + ], + "object_events": [], + "warp_events": [], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/SaffronCity_Dojo/events.inc b/data/maps/SaffronCity_Dojo/events.inc deleted file mode 100644 index fab821072..000000000 --- a/data/maps/SaffronCity_Dojo/events.inc +++ /dev/null @@ -1,26 +0,0 @@ -SaffronCity_Dojo_EventObjects: - object_event 1, 54, 0, 11, 0, 10, 0, 3, 9, 17, 0, 1, 0, 7, 0, SaffronCity_Dojo_EventScript_16ED46, 0, 0, 0 - object_event 2, 54, 0, 1, 0, 10, 0, 3, 10, 17, 0, 1, 0, 7, 0, SaffronCity_Dojo_EventScript_16ED5D, 0, 0, 0 - object_event 3, 54, 0, 11, 0, 8, 0, 3, 9, 17, 0, 1, 0, 7, 0, SaffronCity_Dojo_EventScript_16ED74, 0, 0, 0 - object_event 4, 54, 0, 1, 0, 8, 0, 3, 10, 17, 0, 1, 0, 7, 0, SaffronCity_Dojo_EventScript_16ED8B, 0, 0, 0 - object_event 5, 54, 0, 6, 0, 5, 0, 3, 8, 17, 0, 1, 0, 2, 0, SaffronCity_Dojo_EventScript_16EDA2, 0, 0, 0 - object_event 6, 92, 0, 5, 0, 3, 0, 3, 8, 17, 0, 0, 0, 0, 0, SaffronCity_Dojo_EventScript_16EC00, 96, 0, 0 - object_event 7, 92, 0, 7, 0, 3, 0, 3, 8, 17, 0, 0, 0, 0, 0, SaffronCity_Dojo_EventScript_16EC46, 97, 0, 0 - -SaffronCity_Dojo_MapWarps: - warp_def 5, 14, 3, 2, 778 - warp_def 6, 14, 3, 2, 778 - warp_def 7, 14, 3, 2, 778 - -SaffronCity_Dojo_MapCoordEvents: - coord_event 5, 5, 3, 0, 16513, 0, 0, SaffronCity_Dojo_EventScript_16EBDC - coord_event 7, 5, 3, 0, 16513, 0, 0, SaffronCity_Dojo_EventScript_16EBEE - -SaffronCity_Dojo_MapBGEvents: - bg_event 3, 13, 0, 0, 0, SaffronCity_Dojo_EventScript_16ED2B - bg_event 9, 13, 0, 0, 0, SaffronCity_Dojo_EventScript_16ED2B - bg_event 5, 2, 0, 0, 0, SaffronCity_Dojo_EventScript_16ED34 - bg_event 7, 2, 0, 0, 0, SaffronCity_Dojo_EventScript_16ED3D - -SaffronCity_Dojo_MapEvents:: - map_events SaffronCity_Dojo_EventObjects, SaffronCity_Dojo_MapWarps, SaffronCity_Dojo_MapCoordEvents, SaffronCity_Dojo_MapBGEvents diff --git a/data/maps/SaffronCity_Dojo/header.inc b/data/maps/SaffronCity_Dojo/header.inc deleted file mode 100644 index a56af7e4a..000000000 --- a/data/maps/SaffronCity_Dojo/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SaffronCity_Dojo:: @ 8351680 - .4byte SaffronCity_Dojo_Layout @ 0x83212C4 - .4byte SaffronCity_Dojo_MapEvents @ 0x83BCD60 - .4byte SaffronCity_Dojo_MapScripts @ 0x816EBDB - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_CITY - .2byte 228 - .byte 0x62, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/SaffronCity_Dojo/map.json b/data/maps/SaffronCity_Dojo/map.json new file mode 100644 index 000000000..bbbbcaa96 --- /dev/null +++ b/data/maps/SaffronCity_Dojo/map.json @@ -0,0 +1,181 @@ +{ + "id": "MAP_SAFFRON_CITY_DOJO", + "name": "SaffronCity_Dojo", + "layout": "LAYOUT_SAFFRON_CITY_DOJO", + "music": "BGM_FRLG_VIRIDIAN_CITY", + "region_map_section": "MAPSEC_SAFFRON_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "54", + "x": 11, + "y": 10, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 7, + "script": "SaffronCity_Dojo_EventScript_16ED46", + "flag": "0" + }, + { + "graphics_id": "54", + "x": 1, + "y": 10, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 7, + "script": "SaffronCity_Dojo_EventScript_16ED5D", + "flag": "0" + }, + { + "graphics_id": "54", + "x": 11, + "y": 8, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 7, + "script": "SaffronCity_Dojo_EventScript_16ED74", + "flag": "0" + }, + { + "graphics_id": "54", + "x": 1, + "y": 8, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 7, + "script": "SaffronCity_Dojo_EventScript_16ED8B", + "flag": "0" + }, + { + "graphics_id": "54", + "x": 6, + "y": 5, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "SaffronCity_Dojo_EventScript_16EDA2", + "flag": "0" + }, + { + "graphics_id": "92", + "x": 5, + "y": 3, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_Dojo_EventScript_16EC00", + "flag": "96" + }, + { + "graphics_id": "92", + "x": 7, + "y": 3, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_Dojo_EventScript_16EC46", + "flag": "97" + } + ], + "warp_events": [ + { + "x": 5, + "y": 14, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY_DUPLICATE", + "dest_warp_id": 2 + }, + { + "x": 6, + "y": 14, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY_DUPLICATE", + "dest_warp_id": 2 + }, + { + "x": 7, + "y": 14, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY_DUPLICATE", + "dest_warp_id": 2 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 5, + "y": 5, + "elevation": 3, + "var": "VAR_0x4081", + "var_value": 0, + "script": "SaffronCity_Dojo_EventScript_16EBDC" + }, + { + "type": "trigger", + "x": 7, + "y": 5, + "elevation": 3, + "var": "VAR_0x4081", + "var_value": 0, + "script": "SaffronCity_Dojo_EventScript_16EBEE" + } + ], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 3, + "y": 13, + "elevation": 0, + "script": "SaffronCity_Dojo_EventScript_16ED2B" + }, + { + "type": "bg_event_type_0", + "x": 9, + "y": 13, + "elevation": 0, + "script": "SaffronCity_Dojo_EventScript_16ED2B" + }, + { + "type": "bg_event_type_0", + "x": 5, + "y": 2, + "elevation": 0, + "script": "SaffronCity_Dojo_EventScript_16ED34" + }, + { + "type": "bg_event_type_0", + "x": 7, + "y": 2, + "elevation": 0, + "script": "SaffronCity_Dojo_EventScript_16ED3D" + } + ] +}
\ No newline at end of file diff --git a/data/maps/SaffronCity_Duplicate/connections.inc b/data/maps/SaffronCity_Duplicate/connections.inc deleted file mode 100644 index 8c6f84d02..000000000 --- a/data/maps/SaffronCity_Duplicate/connections.inc +++ /dev/null @@ -1,9 +0,0 @@ -SaffronCity_Duplicate_MapConnectionsList: @ 83528C4 - connection up, 0, MAP_ROUTE5 - connection down, 12, MAP_ROUTE6 - connection left, 10, MAP_ROUTE7 - connection right, 10, MAP_ROUTE8 - -SaffronCity_Duplicate_MapConnections:: @ 83528F4 - .4byte 4 - .4byte SaffronCity_Duplicate_MapConnectionsList diff --git a/data/maps/SaffronCity_Duplicate/events.inc b/data/maps/SaffronCity_Duplicate/events.inc deleted file mode 100644 index f81e26f92..000000000 --- a/data/maps/SaffronCity_Duplicate/events.inc +++ /dev/null @@ -1,47 +0,0 @@ -SaffronCity_Duplicate_EventObjects: - object_event 1, 49, 0, 22, 0, 15, 0, 3, 8, 17, 0, 0, 0, 0, 0, SaffronCity_Duplicate_EventScript_16737A, 62, 0, 0 - object_event 2, 49, 0, 26, 0, 16, 0, 3, 5, 20, 0, 0, 0, 0, 0, SaffronCity_Duplicate_EventScript_167383, 62, 0, 0 - object_event 3, 49, 0, 46, 0, 13, 0, 3, 8, 17, 0, 0, 0, 0, 0, SaffronCity_Duplicate_EventScript_16738C, 62, 0, 0 - object_event 4, 49, 0, 27, 0, 22, 0, 3, 8, 17, 0, 0, 0, 0, 0, SaffronCity_Duplicate_EventScript_167395, 62, 0, 0 - object_event 5, 49, 0, 25, 0, 33, 0, 3, 5, 23, 0, 0, 0, 0, 0, SaffronCity_Duplicate_EventScript_16739E, 62, 0, 0 - object_event 6, 49, 0, 34, 0, 31, 0, 3, 8, 17, 0, 0, 0, 0, 0, SaffronCity_Duplicate_EventScript_1673B9, 62, 0, 0 - object_event 7, 49, 0, 30, 0, 39, 0, 3, 5, 21, 0, 0, 0, 0, 0, SaffronCity_Duplicate_EventScript_1673B0, 62, 0, 0 - object_event 8, 49, 0, 48, 0, 24, 0, 3, 5, 20, 0, 0, 0, 0, 0, SaffronCity_Duplicate_EventScript_1673A7, 62, 0, 0 - object_event 9, 18, 0, 37, 0, 32, 0, 3, 1, 17, 0, 0, 0, 0, 0, SaffronCity_Duplicate_EventScript_1673EC, 63, 0, 0 - object_event 10, 47, 0, 21, 0, 23, 0, 3, 2, 17, 0, 0, 0, 0, 0, SaffronCity_Duplicate_EventScript_1673E3, 63, 0, 0 - object_event 11, 25, 0, 39, 0, 16, 0, 3, 7, 17, 0, 0, 0, 0, 0, SaffronCity_Duplicate_EventScript_16741A, 63, 0, 0 - object_event 12, 19, 0, 44, 0, 22, 0, 3, 8, 17, 0, 0, 0, 0, 0, SaffronCity_Duplicate_EventScript_1673FE, 63, 0, 0 - object_event 13, 114, 0, 45, 0, 22, 0, 3, 8, 17, 0, 0, 0, 0, 0, SaffronCity_Duplicate_EventScript_167407, 63, 0, 0 - object_event 14, 22, 0, 32, 0, 39, 0, 3, 5, 21, 0, 0, 0, 0, 0, SaffronCity_Duplicate_EventScript_1673F5, 63, 0, 0 - object_event 15, 24, 0, 47, 0, 24, 0, 3, 5, 17, 0, 0, 0, 0, 0, SaffronCity_Duplicate_EventScript_1AD03A, 157, 0, 0 - -SaffronCity_Duplicate_MapWarps: - warp_def 33, 30, 0, 1, 303 - warp_def 22, 14, 0, 1, 3584 - warp_def 40, 12, 0, 1, 3586 - warp_def 46, 12, 0, 1, 3587 - warp_def 27, 21, 0, 1, 3588 - warp_def 40, 21, 0, 1, 3589 - warp_def 24, 38, 0, 1, 3590 - warp_def 43, 38, 0, 1, 3592 - warp_def 8, 27, 3, 2, 4864 - warp_def 34, 5, 3, 2, 4353 - warp_def 58, 27, 3, 1, 5120 - warp_def 34, 46, 3, 0, 4608 - warp_def 35, 46, 3, 0, 4608 - warp_def 35, 5, 3, 2, 4353 - warp_def 47, 21, 0, 0, 3593 - -SaffronCity_Duplicate_MapBGEvents: - bg_event 29, 14, 0, 0, 0, SaffronCity_Duplicate_EventScript_167423 - bg_event 42, 14, 0, 0, 0, SaffronCity_Duplicate_EventScript_16742C - bg_event 13, 25, 0, 0, 0, SaffronCity_Duplicate_EventScript_167471 - bg_event 18, 30, 0, 0, 0, SaffronCity_Duplicate_EventScript_167456 - bg_event 29, 31, 0, 0, 0, SaffronCity_Duplicate_EventScript_16745F - bg_event 54, 25, 0, 0, 0, SaffronCity_Duplicate_EventScript_16744D - bg_event 50, 14, 0, 0, 0, SaffronCity_Duplicate_EventScript_167435 - bg_event 40, 38, 0, 0, 0, SaffronCity_Duplicate_EventScript_167468 - bg_event 49, 22, 0, 0, 0, SaffronCity_Duplicate_EventScript_16747A - -SaffronCity_Duplicate_MapEvents:: - map_events SaffronCity_Duplicate_EventObjects, SaffronCity_Duplicate_MapWarps, 0x0, SaffronCity_Duplicate_MapBGEvents diff --git a/data/maps/SaffronCity_Duplicate/header.inc b/data/maps/SaffronCity_Duplicate/header.inc deleted file mode 100644 index 071683449..000000000 --- a/data/maps/SaffronCity_Duplicate/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SaffronCity_Duplicate:: @ 8350730 - .4byte SaffronCity_Duplicate_Layout @ 0x831E8D4 - .4byte SaffronCity_Duplicate_MapEvents @ 0x83B5E9C - .4byte SaffronCity_Duplicate_MapScripts @ 0x816735F - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_CITY - .2byte 207 - .byte 0x62, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/SaffronCity_Duplicate/map.json b/data/maps/SaffronCity_Duplicate/map.json new file mode 100644 index 000000000..0dc64583f --- /dev/null +++ b/data/maps/SaffronCity_Duplicate/map.json @@ -0,0 +1,407 @@ +{ + "id": "MAP_SAFFRON_CITY_DUPLICATE", + "name": "SaffronCity_Duplicate", + "layout": "LAYOUT_SAFFRON_CITY_DUPLICATE", + "music": "BGM_FRLG_VIRIDIAN_CITY", + "region_map_section": "MAPSEC_SAFFRON_CITY", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_1", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_ROUTE5", + "offset": 0, + "direction": "up" + }, + { + "map": "MAP_ROUTE6", + "offset": 12, + "direction": "down" + }, + { + "map": "MAP_ROUTE7", + "offset": 10, + "direction": "left" + }, + { + "map": "MAP_ROUTE8", + "offset": 10, + "direction": "right" + } + ], + "connections_no_include": true, + "object_events": [ + { + "graphics_id": "49", + "x": 22, + "y": 15, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_Duplicate_EventScript_16737A", + "flag": "62" + }, + { + "graphics_id": "49", + "x": 26, + "y": 16, + "elevation": 3, + "movement_type": "5", + "movement_range_x": 4, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_Duplicate_EventScript_167383", + "flag": "62" + }, + { + "graphics_id": "49", + "x": 46, + "y": 13, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_Duplicate_EventScript_16738C", + "flag": "62" + }, + { + "graphics_id": "49", + "x": 27, + "y": 22, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_Duplicate_EventScript_167395", + "flag": "62" + }, + { + "graphics_id": "49", + "x": 25, + "y": 33, + "elevation": 3, + "movement_type": "5", + "movement_range_x": 7, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_Duplicate_EventScript_16739E", + "flag": "62" + }, + { + "graphics_id": "49", + "x": 34, + "y": 31, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_Duplicate_EventScript_1673B9", + "flag": "62" + }, + { + "graphics_id": "49", + "x": 30, + "y": 39, + "elevation": 3, + "movement_type": "5", + "movement_range_x": 5, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_Duplicate_EventScript_1673B0", + "flag": "62" + }, + { + "graphics_id": "49", + "x": 48, + "y": 24, + "elevation": 3, + "movement_type": "5", + "movement_range_x": 4, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_Duplicate_EventScript_1673A7", + "flag": "62" + }, + { + "graphics_id": "18", + "x": 37, + "y": 32, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_Duplicate_EventScript_1673EC", + "flag": "63" + }, + { + "graphics_id": "47", + "x": 21, + "y": 23, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_Duplicate_EventScript_1673E3", + "flag": "63" + }, + { + "graphics_id": "25", + "x": 39, + "y": 16, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_Duplicate_EventScript_16741A", + "flag": "63" + }, + { + "graphics_id": "19", + "x": 44, + "y": 22, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_Duplicate_EventScript_1673FE", + "flag": "63" + }, + { + "graphics_id": "114", + "x": 45, + "y": 22, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_Duplicate_EventScript_167407", + "flag": "63" + }, + { + "graphics_id": "22", + "x": 32, + "y": 39, + "elevation": 3, + "movement_type": "5", + "movement_range_x": 5, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_Duplicate_EventScript_1673F5", + "flag": "63" + }, + { + "graphics_id": "24", + "x": 47, + "y": 24, + "elevation": 3, + "movement_type": "5", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_Duplicate_EventScript_1AD03A", + "flag": "157" + } + ], + "warp_events": [ + { + "x": 33, + "y": 30, + "elevation": 0, + "dest_map": "MAP_SILPH_CO_1F", + "dest_warp_id": 1 + }, + { + "x": 22, + "y": 14, + "elevation": 0, + "dest_map": "MAP_SAFFRON_CITY_HOUSE1_1F", + "dest_warp_id": 1 + }, + { + "x": 40, + "y": 12, + "elevation": 0, + "dest_map": "MAP_SAFFRON_CITY_DOJO", + "dest_warp_id": 1 + }, + { + "x": 46, + "y": 12, + "elevation": 0, + "dest_map": "MAP_SAFFRON_CITY_GYM", + "dest_warp_id": 1 + }, + { + "x": 27, + "y": 21, + "elevation": 0, + "dest_map": "MAP_SAFFRON_CITY_HOUSE2", + "dest_warp_id": 1 + }, + { + "x": 40, + "y": 21, + "elevation": 0, + "dest_map": "MAP_SAFFRON_CITY_MART", + "dest_warp_id": 1 + }, + { + "x": 24, + "y": 38, + "elevation": 0, + "dest_map": "MAP_SAFFRON_CITY_POKEMON_CENTER_1F", + "dest_warp_id": 1 + }, + { + "x": 43, + "y": 38, + "elevation": 0, + "dest_map": "MAP_SAFFRON_CITY_HOUSE3", + "dest_warp_id": 1 + }, + { + "x": 8, + "y": 27, + "elevation": 3, + "dest_map": "MAP_ROUTE7_EAST_ENTRANCE", + "dest_warp_id": 2 + }, + { + "x": 34, + "y": 5, + "elevation": 3, + "dest_map": "MAP_ROUTE5_SOUTH_ENTRANCE", + "dest_warp_id": 2 + }, + { + "x": 58, + "y": 27, + "elevation": 3, + "dest_map": "MAP_ROUTE8_WEST_ENTRANCE", + "dest_warp_id": 1 + }, + { + "x": 34, + "y": 46, + "elevation": 3, + "dest_map": "MAP_ROUTE6_NORTH_ENTRANCE", + "dest_warp_id": 0 + }, + { + "x": 35, + "y": 46, + "elevation": 3, + "dest_map": "MAP_ROUTE6_NORTH_ENTRANCE", + "dest_warp_id": 0 + }, + { + "x": 35, + "y": 5, + "elevation": 3, + "dest_map": "MAP_ROUTE5_SOUTH_ENTRANCE", + "dest_warp_id": 2 + }, + { + "x": 47, + "y": 21, + "elevation": 0, + "dest_map": "MAP_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 29, + "y": 14, + "elevation": 0, + "script": "SaffronCity_Duplicate_EventScript_167423" + }, + { + "type": "bg_event_type_0", + "x": 42, + "y": 14, + "elevation": 0, + "script": "SaffronCity_Duplicate_EventScript_16742C" + }, + { + "type": "bg_event_type_0", + "x": 13, + "y": 25, + "elevation": 0, + "script": "SaffronCity_Duplicate_EventScript_167471" + }, + { + "type": "bg_event_type_0", + "x": 18, + "y": 30, + "elevation": 0, + "script": "SaffronCity_Duplicate_EventScript_167456" + }, + { + "type": "bg_event_type_0", + "x": 29, + "y": 31, + "elevation": 0, + "script": "SaffronCity_Duplicate_EventScript_16745F" + }, + { + "type": "bg_event_type_0", + "x": 54, + "y": 25, + "elevation": 0, + "script": "SaffronCity_Duplicate_EventScript_16744D" + }, + { + "type": "bg_event_type_0", + "x": 50, + "y": 14, + "elevation": 0, + "script": "SaffronCity_Duplicate_EventScript_167435" + }, + { + "type": "bg_event_type_0", + "x": 40, + "y": 38, + "elevation": 0, + "script": "SaffronCity_Duplicate_EventScript_167468" + }, + { + "type": "bg_event_type_0", + "x": 49, + "y": 22, + "elevation": 0, + "script": "SaffronCity_Duplicate_EventScript_16747A" + } + ] +}
\ No newline at end of file diff --git a/data/maps/SaffronCity_Gym/events.inc b/data/maps/SaffronCity_Gym/events.inc deleted file mode 100644 index 99ebd74d5..000000000 --- a/data/maps/SaffronCity_Gym/events.inc +++ /dev/null @@ -1,52 +0,0 @@ -SaffronCity_Gym_EventObjects: - object_event 1, 41, 0, 24, 0, 18, 0, 3, 8, 17, 0, 1, 0, 3, 0, SaffronCity_Gym_EventScript_16EEC3, 0, 0, 0 - object_event 2, 41, 0, 24, 0, 2, 0, 3, 8, 17, 0, 1, 0, 3, 0, SaffronCity_Gym_EventScript_16EE88, 0, 0, 0 - object_event 3, 41, 0, 4, 0, 2, 0, 3, 8, 17, 0, 1, 0, 3, 0, SaffronCity_Gym_EventScript_16EEDA, 0, 0, 0 - object_event 4, 58, 0, 14, 0, 2, 0, 3, 8, 17, 0, 1, 0, 3, 0, SaffronCity_Gym_EventScript_16EEF1, 0, 0, 0 - object_event 5, 58, 0, 4, 0, 10, 0, 3, 8, 17, 0, 1, 0, 3, 0, SaffronCity_Gym_EventScript_16EF08, 0, 0, 0 - object_event 6, 58, 0, 4, 0, 18, 0, 3, 8, 17, 0, 1, 0, 3, 0, SaffronCity_Gym_EventScript_16EF1F, 0, 0, 0 - object_event 7, 85, 0, 14, 0, 11, 0, 3, 8, 17, 0, 0, 0, 0, 0, SaffronCity_Gym_EventScript_16EDD8, 0, 0, 0 - object_event 8, 41, 0, 24, 0, 10, 0, 3, 8, 17, 0, 1, 0, 3, 0, SaffronCity_Gym_EventScript_16EE9F, 0, 0, 0 - object_event 9, 91, 0, 15, 0, 20, 0, 3, 8, 17, 0, 0, 0, 0, 0, SaffronCity_Gym_EventScript_16EF36, 0, 0, 0 - -SaffronCity_Gym_MapWarps: - warp_def 13, 23, 3, 3, 778 - warp_def 14, 23, 3, 3, 778 - warp_def 15, 23, 3, 3, 778 - warp_def 18, 20, 3, 32, 3587 - warp_def 0, 4, 3, 22, 3587 - warp_def 0, 7, 3, 20, 3587 - warp_def 0, 12, 3, 30, 3587 - warp_def 0, 15, 3, 11, 3587 - warp_def 0, 20, 3, 28, 3587 - warp_def 0, 23, 3, 19, 3587 - warp_def 8, 4, 3, 18, 3587 - warp_def 8, 7, 3, 7, 3587 - warp_def 8, 12, 3, 17, 3587 - warp_def 8, 15, 3, 15, 3587 - warp_def 8, 20, 3, 26, 3587 - warp_def 8, 23, 3, 13, 3587 - warp_def 12, 4, 3, 24, 3587 - warp_def 12, 7, 3, 12, 3587 - warp_def 16, 4, 3, 10, 3587 - warp_def 16, 7, 3, 9, 3587 - warp_def 18, 15, 3, 5, 3587 - warp_def 20, 4, 3, 23, 3587 - warp_def 20, 7, 3, 4, 3587 - warp_def 20, 12, 3, 21, 3587 - warp_def 20, 15, 3, 16, 3587 - warp_def 20, 20, 3, 27, 3587 - warp_def 20, 23, 3, 14, 3587 - warp_def 28, 4, 3, 25, 3587 - warp_def 28, 7, 3, 8, 3587 - warp_def 28, 12, 3, 31, 3587 - warp_def 28, 15, 3, 6, 3587 - warp_def 28, 20, 3, 29, 3587 - warp_def 28, 23, 3, 3, 3587 - -SaffronCity_Gym_MapBGEvents: - bg_event 12, 20, 0, 0, 0, SaffronCity_Gym_EventScript_16EF55 - bg_event 16, 20, 0, 0, 0, SaffronCity_Gym_EventScript_16EF55 - -SaffronCity_Gym_MapEvents:: - map_events SaffronCity_Gym_EventObjects, SaffronCity_Gym_MapWarps, 0x0, SaffronCity_Gym_MapBGEvents diff --git a/data/maps/SaffronCity_Gym/header.inc b/data/maps/SaffronCity_Gym/header.inc deleted file mode 100644 index 98450bd26..000000000 --- a/data/maps/SaffronCity_Gym/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SaffronCity_Gym:: @ 835169C - .4byte SaffronCity_Gym_Layout @ 0x82D7C44 - .4byte SaffronCity_Gym_MapEvents @ 0x83BCF6C - .4byte SaffronCity_Gym_MapScripts @ 0x816EDD7 - .4byte NULL - .2byte BGM_FRLG_GYM - .2byte 34 - .byte 0x62, 0x00, 0x00, 0x08, 0x00, 0x01, 0x00, 0x01 diff --git a/data/maps/SaffronCity_Gym/map.json b/data/maps/SaffronCity_Gym/map.json new file mode 100644 index 000000000..96f9f5ee3 --- /dev/null +++ b/data/maps/SaffronCity_Gym/map.json @@ -0,0 +1,384 @@ +{ + "id": "MAP_SAFFRON_CITY_GYM", + "name": "SaffronCity_Gym", + "layout": "LAYOUT_SAFFRON_CITY_GYM", + "music": "BGM_FRLG_GYM", + "region_map_section": "MAPSEC_SAFFRON_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 1, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_1", + "connections": null, + "object_events": [ + { + "graphics_id": "41", + "x": 24, + "y": 18, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "SaffronCity_Gym_EventScript_16EEC3", + "flag": "0" + }, + { + "graphics_id": "41", + "x": 24, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "SaffronCity_Gym_EventScript_16EE88", + "flag": "0" + }, + { + "graphics_id": "41", + "x": 4, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "SaffronCity_Gym_EventScript_16EEDA", + "flag": "0" + }, + { + "graphics_id": "58", + "x": 14, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "SaffronCity_Gym_EventScript_16EEF1", + "flag": "0" + }, + { + "graphics_id": "58", + "x": 4, + "y": 10, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "SaffronCity_Gym_EventScript_16EF08", + "flag": "0" + }, + { + "graphics_id": "58", + "x": 4, + "y": 18, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "SaffronCity_Gym_EventScript_16EF1F", + "flag": "0" + }, + { + "graphics_id": "85", + "x": 14, + "y": 11, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_Gym_EventScript_16EDD8", + "flag": "0" + }, + { + "graphics_id": "41", + "x": 24, + "y": 10, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "SaffronCity_Gym_EventScript_16EE9F", + "flag": "0" + }, + { + "graphics_id": "91", + "x": 15, + "y": 20, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_Gym_EventScript_16EF36", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 13, + "y": 23, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY_DUPLICATE", + "dest_warp_id": 3 + }, + { + "x": 14, + "y": 23, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY_DUPLICATE", + "dest_warp_id": 3 + }, + { + "x": 15, + "y": 23, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY_DUPLICATE", + "dest_warp_id": 3 + }, + { + "x": 18, + "y": 20, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY_GYM", + "dest_warp_id": 32 + }, + { + "x": 0, + "y": 4, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY_GYM", + "dest_warp_id": 22 + }, + { + "x": 0, + "y": 7, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY_GYM", + "dest_warp_id": 20 + }, + { + "x": 0, + "y": 12, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY_GYM", + "dest_warp_id": 30 + }, + { + "x": 0, + "y": 15, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY_GYM", + "dest_warp_id": 11 + }, + { + "x": 0, + "y": 20, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY_GYM", + "dest_warp_id": 28 + }, + { + "x": 0, + "y": 23, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY_GYM", + "dest_warp_id": 19 + }, + { + "x": 8, + "y": 4, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY_GYM", + "dest_warp_id": 18 + }, + { + "x": 8, + "y": 7, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY_GYM", + "dest_warp_id": 7 + }, + { + "x": 8, + "y": 12, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY_GYM", + "dest_warp_id": 17 + }, + { + "x": 8, + "y": 15, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY_GYM", + "dest_warp_id": 15 + }, + { + "x": 8, + "y": 20, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY_GYM", + "dest_warp_id": 26 + }, + { + "x": 8, + "y": 23, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY_GYM", + "dest_warp_id": 13 + }, + { + "x": 12, + "y": 4, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY_GYM", + "dest_warp_id": 24 + }, + { + "x": 12, + "y": 7, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY_GYM", + "dest_warp_id": 12 + }, + { + "x": 16, + "y": 4, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY_GYM", + "dest_warp_id": 10 + }, + { + "x": 16, + "y": 7, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY_GYM", + "dest_warp_id": 9 + }, + { + "x": 18, + "y": 15, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY_GYM", + "dest_warp_id": 5 + }, + { + "x": 20, + "y": 4, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY_GYM", + "dest_warp_id": 23 + }, + { + "x": 20, + "y": 7, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY_GYM", + "dest_warp_id": 4 + }, + { + "x": 20, + "y": 12, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY_GYM", + "dest_warp_id": 21 + }, + { + "x": 20, + "y": 15, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY_GYM", + "dest_warp_id": 16 + }, + { + "x": 20, + "y": 20, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY_GYM", + "dest_warp_id": 27 + }, + { + "x": 20, + "y": 23, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY_GYM", + "dest_warp_id": 14 + }, + { + "x": 28, + "y": 4, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY_GYM", + "dest_warp_id": 25 + }, + { + "x": 28, + "y": 7, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY_GYM", + "dest_warp_id": 8 + }, + { + "x": 28, + "y": 12, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY_GYM", + "dest_warp_id": 31 + }, + { + "x": 28, + "y": 15, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY_GYM", + "dest_warp_id": 6 + }, + { + "x": 28, + "y": 20, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY_GYM", + "dest_warp_id": 29 + }, + { + "x": 28, + "y": 23, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY_GYM", + "dest_warp_id": 3 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 12, + "y": 20, + "elevation": 0, + "script": "SaffronCity_Gym_EventScript_16EF55" + }, + { + "type": "bg_event_type_0", + "x": 16, + "y": 20, + "elevation": 0, + "script": "SaffronCity_Gym_EventScript_16EF55" + } + ] +}
\ No newline at end of file diff --git a/data/maps/SaffronCity_House1_1F/events.inc b/data/maps/SaffronCity_House1_1F/events.inc deleted file mode 100644 index 8cf2bd177..000000000 --- a/data/maps/SaffronCity_House1_1F/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -SaffronCity_House1_1F_EventObjects: - object_event 1, 30, 0, 8, 0, 4, 0, 3, 9, 17, 0, 0, 0, 0, 0, SaffronCity_House1_1F_EventScript_16EB40, 0, 0, 0 - object_event 2, 31, 0, 3, 0, 3, 0, 3, 8, 17, 0, 0, 0, 0, 0, SaffronCity_House1_1F_EventScript_16EB37, 0, 0, 0 - object_event 3, 117, 0, 4, 0, 4, 0, 3, 3, 33, 0, 0, 0, 0, 0, SaffronCity_House1_1F_EventScript_16EB49, 0, 0, 0 - -SaffronCity_House1_1F_MapWarps: - warp_def 3, 8, 3, 1, 778 - warp_def 4, 8, 3, 1, 778 - warp_def 5, 8, 3, 1, 778 - warp_def 10, 2, 3, 0, 3585 - -SaffronCity_House1_1F_MapEvents:: - map_events SaffronCity_House1_1F_EventObjects, SaffronCity_House1_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/SaffronCity_House1_1F/header.inc b/data/maps/SaffronCity_House1_1F/header.inc deleted file mode 100644 index a2d14cf5d..000000000 --- a/data/maps/SaffronCity_House1_1F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SaffronCity_House1_1F:: @ 8351648 - .4byte SaffronCity_House1_1F_Layout @ 0x8321004 - .4byte SaffronCity_House1_1F_MapEvents @ 0x83BCB9C - .4byte SaffronCity_House1_1F_MapScripts @ 0x816EB36 - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_CITY - .2byte 226 - .byte 0x62, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/SaffronCity_House1_1F/map.json b/data/maps/SaffronCity_House1_1F/map.json new file mode 100644 index 000000000..b48e123b6 --- /dev/null +++ b/data/maps/SaffronCity_House1_1F/map.json @@ -0,0 +1,88 @@ +{ + "id": "MAP_SAFFRON_CITY_HOUSE1_1F", + "name": "SaffronCity_House1_1F", + "layout": "LAYOUT_SAFFRON_CITY_HOUSE1_1F", + "music": "BGM_FRLG_VIRIDIAN_CITY", + "region_map_section": "MAPSEC_SAFFRON_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "30", + "x": 8, + "y": 4, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_House1_1F_EventScript_16EB40", + "flag": "0" + }, + { + "graphics_id": "31", + "x": 3, + "y": 3, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_House1_1F_EventScript_16EB37", + "flag": "0" + }, + { + "graphics_id": "117", + "x": 4, + "y": 4, + "elevation": 3, + "movement_type": "3", + "movement_range_x": 1, + "movement_range_y": 2, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_House1_1F_EventScript_16EB49", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 8, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY_DUPLICATE", + "dest_warp_id": 1 + }, + { + "x": 4, + "y": 8, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY_DUPLICATE", + "dest_warp_id": 1 + }, + { + "x": 5, + "y": 8, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY_DUPLICATE", + "dest_warp_id": 1 + }, + { + "x": 10, + "y": 2, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY_HOUSE1_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/SaffronCity_House1_2F/events.inc b/data/maps/SaffronCity_House1_2F/events.inc deleted file mode 100644 index 40e137d0f..000000000 --- a/data/maps/SaffronCity_House1_2F/events.inc +++ /dev/null @@ -1,16 +0,0 @@ -SaffronCity_House1_2F_EventObjects: - object_event 1, 132, 0, 6, 0, 8, 0, 3, 2, 17, 0, 0, 0, 0, 0, SaffronCity_House1_2F_EventScript_16EB5D, 0, 0, 0 - object_event 2, 120, 0, 4, 0, 6, 0, 3, 8, 17, 0, 0, 0, 0, 0, SaffronCity_House1_2F_EventScript_16EB70, 0, 0, 0 - object_event 3, 115, 0, 7, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, SaffronCity_House1_2F_EventScript_16EB70, 0, 0, 0 - object_event 4, 17, 0, 9, 0, 6, 0, 3, 2, 17, 0, 0, 0, 0, 0, SaffronCity_House1_2F_EventScript_16EB7B, 0, 0, 0 - -SaffronCity_House1_2F_MapWarps: - warp_def 10, 2, 3, 3, 3584 - -SaffronCity_House1_2F_MapBGEvents: - bg_event 1, 1, 0, 0, 0, SaffronCity_House1_2F_EventScript_16EBC9 - bg_event 3, 5, 0, 0, 0, SaffronCity_House1_2F_EventScript_16EBD2 - bg_event 2, 1, 0, 7, 0, 110, 26, 1 - -SaffronCity_House1_2F_MapEvents:: - map_events SaffronCity_House1_2F_EventObjects, SaffronCity_House1_2F_MapWarps, 0x0, SaffronCity_House1_2F_MapBGEvents diff --git a/data/maps/SaffronCity_House1_2F/header.inc b/data/maps/SaffronCity_House1_2F/header.inc deleted file mode 100644 index ceb4cf6c4..000000000 --- a/data/maps/SaffronCity_House1_2F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SaffronCity_House1_2F:: @ 8351664 - .4byte SaffronCity_House1_2F_Layout @ 0x8321100 - .4byte SaffronCity_House1_2F_MapEvents @ 0x83BCC3C - .4byte SaffronCity_House1_2F_MapScripts @ 0x816EB5C - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_CITY - .2byte 227 - .byte 0x62, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/SaffronCity_House1_2F/map.json b/data/maps/SaffronCity_House1_2F/map.json new file mode 100644 index 000000000..ab0e164f9 --- /dev/null +++ b/data/maps/SaffronCity_House1_2F/map.json @@ -0,0 +1,104 @@ +{ + "id": "MAP_SAFFRON_CITY_HOUSE1_2F", + "name": "SaffronCity_House1_2F", + "layout": "LAYOUT_SAFFRON_CITY_HOUSE1_2F", + "music": "BGM_FRLG_VIRIDIAN_CITY", + "region_map_section": "MAPSEC_SAFFRON_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "132", + "x": 6, + "y": 8, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_House1_2F_EventScript_16EB5D", + "flag": "0" + }, + { + "graphics_id": "120", + "x": 4, + "y": 6, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_House1_2F_EventScript_16EB70", + "flag": "0" + }, + { + "graphics_id": "115", + "x": 7, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_House1_2F_EventScript_16EB70", + "flag": "0" + }, + { + "graphics_id": "17", + "x": 9, + "y": 6, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_House1_2F_EventScript_16EB7B", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 10, + "y": 2, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY_HOUSE1_1F", + "dest_warp_id": 3 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 1, + "y": 1, + "elevation": 0, + "script": "SaffronCity_House1_2F_EventScript_16EBC9" + }, + { + "type": "bg_event_type_0", + "x": 3, + "y": 5, + "elevation": 0, + "script": "SaffronCity_House1_2F_EventScript_16EBD2" + }, + { + "type": "hidden_item", + "x": 2, + "y": 1, + "elevation": 0, + "item": "ITEM_NUGGET", + "flag": "26", + "unknown": 1 + } + ] +}
\ No newline at end of file diff --git a/data/maps/SaffronCity_House2/events.inc b/data/maps/SaffronCity_House2/events.inc deleted file mode 100644 index 6859d12b6..000000000 --- a/data/maps/SaffronCity_House2/events.inc +++ /dev/null @@ -1,16 +0,0 @@ -SaffronCity_House2_EventObjects: - object_event 1, 116, 0, 0, 0, 5, 0, 3, 3, 65, 0, 0, 0, 0, 0, SaffronCity_House2_EventScript_16EF86, 0, 0, 0 - object_event 2, 22, 0, 4, 0, 4, 0, 3, 10, 17, 0, 0, 0, 0, 0, SaffronCity_House2_EventScript_16EF74, 0, 0, 0 - object_event 3, 18, 0, 6, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, SaffronCity_House2_EventScript_16EF7D, 0, 0, 0 - object_event 4, 105, 0, 5, 0, 4, 0, 0, 7, 17, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 - -SaffronCity_House2_MapWarps: - warp_def 3, 7, 3, 4, 778 - warp_def 4, 7, 3, 4, 778 - warp_def 5, 7, 3, 4, 778 - -SaffronCity_House2_MapBGEvents: - bg_event 5, 4, 3, 0, 0, SaffronCity_House2_EventScript_16EF99 - -SaffronCity_House2_MapEvents:: - map_events SaffronCity_House2_EventObjects, SaffronCity_House2_MapWarps, 0x0, SaffronCity_House2_MapBGEvents diff --git a/data/maps/SaffronCity_House2/header.inc b/data/maps/SaffronCity_House2/header.inc deleted file mode 100644 index 06c30be07..000000000 --- a/data/maps/SaffronCity_House2/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SaffronCity_House2:: @ 83516B8 - .4byte House5_Layout @ 0x82D6AF0 - .4byte SaffronCity_House2_MapEvents @ 0x83BD004 - .4byte SaffronCity_House2_MapScripts @ 0x816EF73 - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_CITY - .2byte 21 - .byte 0x62, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/SaffronCity_House2/map.json b/data/maps/SaffronCity_House2/map.json new file mode 100644 index 000000000..de11d7982 --- /dev/null +++ b/data/maps/SaffronCity_House2/map.json @@ -0,0 +1,102 @@ +{ + "id": "MAP_SAFFRON_CITY_HOUSE2", + "name": "SaffronCity_House2", + "layout": "LAYOUT_HOUSE5", + "music": "BGM_FRLG_VIRIDIAN_CITY", + "region_map_section": "MAPSEC_SAFFRON_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "116", + "x": 0, + "y": 5, + "elevation": 3, + "movement_type": "3", + "movement_range_x": 1, + "movement_range_y": 4, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_House2_EventScript_16EF86", + "flag": "0" + }, + { + "graphics_id": "22", + "x": 4, + "y": 4, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_House2_EventScript_16EF74", + "flag": "0" + }, + { + "graphics_id": "18", + "x": 6, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_House2_EventScript_16EF7D", + "flag": "0" + }, + { + "graphics_id": "105", + "x": 5, + "y": 4, + "elevation": 0, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY_DUPLICATE", + "dest_warp_id": 4 + }, + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY_DUPLICATE", + "dest_warp_id": 4 + }, + { + "x": 5, + "y": 7, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY_DUPLICATE", + "dest_warp_id": 4 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 5, + "y": 4, + "elevation": 3, + "script": "SaffronCity_House2_EventScript_16EF99" + } + ] +}
\ No newline at end of file diff --git a/data/maps/SaffronCity_House3/events.inc b/data/maps/SaffronCity_House3/events.inc deleted file mode 100644 index dea32514e..000000000 --- a/data/maps/SaffronCity_House3/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -SaffronCity_House3_EventObjects: - object_event 1, 30, 0, 7, 0, 4, 0, 3, 9, 17, 0, 0, 0, 0, 0, SaffronCity_House3_EventScript_16F05F, 0, 0, 0 - -SaffronCity_House3_MapWarps: - warp_def 3, 7, 3, 7, 778 - warp_def 4, 7, 3, 7, 778 - warp_def 5, 7, 3, 7, 778 - -SaffronCity_House3_MapEvents:: - map_events SaffronCity_House3_EventObjects, SaffronCity_House3_MapWarps, 0x0, 0x0 diff --git a/data/maps/SaffronCity_House3/header.inc b/data/maps/SaffronCity_House3/header.inc deleted file mode 100644 index 94193549c..000000000 --- a/data/maps/SaffronCity_House3/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SaffronCity_House3:: @ 8351728 - .4byte House5_Layout @ 0x82D6AF0 - .4byte SaffronCity_House3_MapEvents @ 0x83BD20C - .4byte SaffronCity_House3_MapScripts @ 0x816F05E - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_CITY - .2byte 21 - .byte 0x62, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/SaffronCity_House3/map.json b/data/maps/SaffronCity_House3/map.json new file mode 100644 index 000000000..eda6fe9fc --- /dev/null +++ b/data/maps/SaffronCity_House3/map.json @@ -0,0 +1,55 @@ +{ + "id": "MAP_SAFFRON_CITY_HOUSE3", + "name": "SaffronCity_House3", + "layout": "LAYOUT_HOUSE5", + "music": "BGM_FRLG_VIRIDIAN_CITY", + "region_map_section": "MAPSEC_SAFFRON_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "30", + "x": 7, + "y": 4, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_House3_EventScript_16F05F", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY_DUPLICATE", + "dest_warp_id": 7 + }, + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY_DUPLICATE", + "dest_warp_id": 7 + }, + { + "x": 5, + "y": 7, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY_DUPLICATE", + "dest_warp_id": 7 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/SaffronCity_Mart/events.inc b/data/maps/SaffronCity_Mart/events.inc deleted file mode 100644 index 62dcd60e8..000000000 --- a/data/maps/SaffronCity_Mart/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -SaffronCity_Mart_EventObjects: - object_event 1, 68, 0, 2, 0, 3, 0, 0, 10, 17, 0, 0, 0, 0, 0, SaffronCity_Mart_EventScript_16EFB5, 0, 0, 0 - object_event 2, 18, 0, 1, 0, 7, 0, 3, 10, 17, 0, 0, 0, 0, 0, SaffronCity_Mart_EventScript_16EFAC, 0, 0, 0 - object_event 3, 22, 0, 9, 0, 5, 0, 3, 3, 17, 0, 0, 0, 0, 0, SaffronCity_Mart_EventScript_16EFA3, 0, 0, 0 - -SaffronCity_Mart_MapWarps: - warp_def 3, 7, 3, 5, 778 - warp_def 4, 7, 3, 5, 778 - warp_def 5, 7, 3, 5, 778 - -SaffronCity_Mart_MapEvents:: - map_events SaffronCity_Mart_EventObjects, SaffronCity_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/SaffronCity_Mart/header.inc b/data/maps/SaffronCity_Mart/header.inc deleted file mode 100644 index 77c8555ec..000000000 --- a/data/maps/SaffronCity_Mart/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SaffronCity_Mart:: @ 83516D4 - .4byte Mart_Layout @ 0x82D5BCC - .4byte SaffronCity_Mart_MapEvents @ 0x83BD078 - .4byte SaffronCity_Mart_MapScripts @ 0x816EFA2 - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 10 - .byte 0x62, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/SaffronCity_Mart/map.json b/data/maps/SaffronCity_Mart/map.json new file mode 100644 index 000000000..00e191a94 --- /dev/null +++ b/data/maps/SaffronCity_Mart/map.json @@ -0,0 +1,81 @@ +{ + "id": "MAP_SAFFRON_CITY_MART", + "name": "SaffronCity_Mart", + "layout": "LAYOUT_MART", + "music": "BGM_FRLG_POKEMON_CENTER", + "region_map_section": "MAPSEC_SAFFRON_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "68", + "x": 2, + "y": 3, + "elevation": 0, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_Mart_EventScript_16EFB5", + "flag": "0" + }, + { + "graphics_id": "18", + "x": 1, + "y": 7, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_Mart_EventScript_16EFAC", + "flag": "0" + }, + { + "graphics_id": "22", + "x": 9, + "y": 5, + "elevation": 3, + "movement_type": "3", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_Mart_EventScript_16EFA3", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY_DUPLICATE", + "dest_warp_id": 5 + }, + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY_DUPLICATE", + "dest_warp_id": 5 + }, + { + "x": 5, + "y": 7, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY_DUPLICATE", + "dest_warp_id": 5 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/SaffronCity_PokemonCenter_1F/events.inc b/data/maps/SaffronCity_PokemonCenter_1F/events.inc deleted file mode 100644 index 478989842..000000000 --- a/data/maps/SaffronCity_PokemonCenter_1F/events.inc +++ /dev/null @@ -1,16 +0,0 @@ -SaffronCity_PokemonCenter_1F_EventObjects: - object_event 1, 64, 0, 7, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, SaffronCity_PokemonCenter_1F_EventScript_16EFFB, 0, 0, 0 - object_event 2, 61, 0, 14, 0, 6, 0, 3, 9, 17, 0, 0, 0, 0, 0, SaffronCity_PokemonCenter_1F_EventScript_16F004, 0, 0, 0 - object_event 3, 31, 0, 4, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, SaffronCity_PokemonCenter_1F_EventScript_16F00D, 0, 0, 0 - object_event 4, 18, 0, 9, 0, 6, 0, 3, 3, 17, 0, 0, 0, 0, 0, SaffronCity_PokemonCenter_1F_EventScript_16F016, 0, 0, 0 - object_event 5, 0, 0, 2, 0, 1, 0, 0, 76, 17, 0, 0, 0, 0, 0, SaffronCity_PokemonCenter_1F_EventScript_1ACEEC, 174, 0, 0 - object_event 6, 0, 0, 3, 0, 1, 0, 0, 76, 17, 0, 0, 0, 0, 0, SaffronCity_PokemonCenter_1F_EventScript_1ACEEC, 174, 0, 0 - -SaffronCity_PokemonCenter_1F_MapWarps: - warp_def 6, 8, 3, 6, 778 - warp_def 7, 8, 3, 6, 778 - warp_def 8, 8, 3, 6, 778 - warp_def 1, 6, 4, 0, 3591 - -SaffronCity_PokemonCenter_1F_MapEvents:: - map_events SaffronCity_PokemonCenter_1F_EventObjects, SaffronCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/SaffronCity_PokemonCenter_1F/header.inc b/data/maps/SaffronCity_PokemonCenter_1F/header.inc deleted file mode 100644 index 1e2198879..000000000 --- a/data/maps/SaffronCity_PokemonCenter_1F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SaffronCity_PokemonCenter_1F:: @ 83516F0 - .4byte PokemonCenter_1F_Layout @ 0x82D5990 - .4byte SaffronCity_PokemonCenter_1F_MapEvents @ 0x83BD13C - .4byte SaffronCity_PokemonCenter_1F_MapScripts @ 0x816EFEC - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 8 - .byte 0x62, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/SaffronCity_PokemonCenter_1F/map.json b/data/maps/SaffronCity_PokemonCenter_1F/map.json new file mode 100644 index 000000000..46de82e0c --- /dev/null +++ b/data/maps/SaffronCity_PokemonCenter_1F/map.json @@ -0,0 +1,127 @@ +{ + "id": "MAP_SAFFRON_CITY_POKEMON_CENTER_1F", + "name": "SaffronCity_PokemonCenter_1F", + "layout": "LAYOUT_POKEMON_CENTER_1F", + "music": "BGM_FRLG_POKEMON_CENTER", + "region_map_section": "MAPSEC_SAFFRON_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "64", + "x": 7, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_PokemonCenter_1F_EventScript_16EFFB", + "flag": "0" + }, + { + "graphics_id": "61", + "x": 14, + "y": 6, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_PokemonCenter_1F_EventScript_16F004", + "flag": "0" + }, + { + "graphics_id": "31", + "x": 4, + "y": 4, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_PokemonCenter_1F_EventScript_16F00D", + "flag": "0" + }, + { + "graphics_id": "18", + "x": 9, + "y": 6, + "elevation": 3, + "movement_type": "3", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_PokemonCenter_1F_EventScript_16F016", + "flag": "0" + }, + { + "graphics_id": "0", + "x": 2, + "y": 1, + "elevation": 0, + "movement_type": "76", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_PokemonCenter_1F_EventScript_1ACEEC", + "flag": "174" + }, + { + "graphics_id": "0", + "x": 3, + "y": 1, + "elevation": 0, + "movement_type": "76", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_PokemonCenter_1F_EventScript_1ACEEC", + "flag": "174" + } + ], + "warp_events": [ + { + "x": 6, + "y": 8, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY_DUPLICATE", + "dest_warp_id": 6 + }, + { + "x": 7, + "y": 8, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY_DUPLICATE", + "dest_warp_id": 6 + }, + { + "x": 8, + "y": 8, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY_DUPLICATE", + "dest_warp_id": 6 + }, + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_SAFFRON_CITY_POKEMON_CENTER_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/SaffronCity_PokemonCenter_2F/events.inc b/data/maps/SaffronCity_PokemonCenter_2F/events.inc deleted file mode 100644 index 9d740b6d7..000000000 --- a/data/maps/SaffronCity_PokemonCenter_2F/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -SaffronCity_PokemonCenter_2F_EventObjects: - object_event 1, 65, 0, 6, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SaffronCity_PokemonCenter_2F_EventScript_1A8CF6, 0, 0, 0 - object_event 2, 65, 0, 2, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SaffronCity_PokemonCenter_2F_EventScript_1A8CFC, 0, 0, 0 - object_event 3, 65, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SaffronCity_PokemonCenter_2F_EventScript_1A8D02, 0, 0, 0 - object_event 4, 69, 0, 1, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, SaffronCity_PokemonCenter_2F_EventScript_1BB1D2, 112, 0, 0 - -SaffronCity_PokemonCenter_2F_MapWarps: - warp_def 1, 6, 4, 3, 3590 - warp_def 5, 1, 0, 0, 4 - warp_def 9, 1, 0, 0, 1 - -SaffronCity_PokemonCenter_2F_MapEvents:: - map_events SaffronCity_PokemonCenter_2F_EventObjects, SaffronCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/SaffronCity_PokemonCenter_2F/header.inc b/data/maps/SaffronCity_PokemonCenter_2F/header.inc deleted file mode 100644 index 8c649319e..000000000 --- a/data/maps/SaffronCity_PokemonCenter_2F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SaffronCity_PokemonCenter_2F:: @ 835170C - .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 - .4byte SaffronCity_PokemonCenter_2F_MapEvents @ 0x83BD1C8 - .4byte SaffronCity_PokemonCenter_2F_MapScripts @ 0x816F037 - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 9 - .byte 0x62, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/SaffronCity_PokemonCenter_2F/map.json b/data/maps/SaffronCity_PokemonCenter_2F/map.json new file mode 100644 index 000000000..a79fb8efd --- /dev/null +++ b/data/maps/SaffronCity_PokemonCenter_2F/map.json @@ -0,0 +1,94 @@ +{ + "id": "MAP_SAFFRON_CITY_POKEMON_CENTER_2F", + "name": "SaffronCity_PokemonCenter_2F", + "layout": "LAYOUT_POKEMON_CENTER_2F", + "music": "BGM_FRLG_POKEMON_CENTER", + "region_map_section": "MAPSEC_SAFFRON_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "65", + "x": 6, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_PokemonCenter_2F_EventScript_1A8CF6", + "flag": "0" + }, + { + "graphics_id": "65", + "x": 2, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_PokemonCenter_2F_EventScript_1A8CFC", + "flag": "0" + }, + { + "graphics_id": "65", + "x": 10, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_PokemonCenter_2F_EventScript_1A8D02", + "flag": "0" + }, + { + "graphics_id": "69", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_PokemonCenter_2F_EventScript_1BB1D2", + "flag": "112" + } + ], + "warp_events": [ + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_SAFFRON_CITY_POKEMON_CENTER_1F", + "dest_warp_id": 3 + }, + { + "x": 5, + "y": 1, + "elevation": 0, + "dest_map": "MAP_UNKNOWN_MAP_00_04", + "dest_warp_id": 0 + }, + { + "x": 9, + "y": 1, + "elevation": 0, + "dest_map": "MAP_UNKNOWN_MAP_00_01", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/SaffronCity_PokemonTrainerFanClub/events.inc b/data/maps/SaffronCity_PokemonTrainerFanClub/events.inc deleted file mode 100644 index a1139c312..000000000 --- a/data/maps/SaffronCity_PokemonTrainerFanClub/events.inc +++ /dev/null @@ -1,17 +0,0 @@ -SaffronCity_PokemonTrainerFanClub_EventObjects: - object_event 1, 24, 0, 7, 0, 13, 0, 3, 9, 17, 0, 0, 0, 0, 0, SaffronCity_PokemonTrainerFanClub_EventScript_16F281, 0, 0, 0 - object_event 2, 17, 0, 6, 0, 11, 0, 3, 8, 17, 0, 0, 0, 0, 0, SaffronCity_PokemonTrainerFanClub_EventScript_16F2F8, 0, 0, 0 - object_event 3, 18, 0, 3, 0, 13, 0, 3, 10, 17, 0, 0, 0, 0, 0, SaffronCity_PokemonTrainerFanClub_EventScript_16F36F, 0, 0, 0 - object_event 4, 61, 0, 3, 0, 12, 0, 3, 10, 17, 0, 0, 0, 0, 0, SaffronCity_PokemonTrainerFanClub_EventScript_16F3E6, 0, 0, 0 - object_event 5, 31, 0, 9, 0, 11, 0, 3, 8, 17, 0, 0, 0, 0, 0, SaffronCity_PokemonTrainerFanClub_EventScript_16F45D, 110, 0, 0 - object_event 6, 26, 0, 7, 0, 12, 0, 3, 9, 17, 0, 0, 0, 0, 0, SaffronCity_PokemonTrainerFanClub_EventScript_16F4BF, 109, 0, 0 - object_event 7, 29, 0, 9, 0, 12, 0, 3, 7, 17, 0, 0, 0, 0, 0, SaffronCity_PokemonTrainerFanClub_EventScript_16F521, 111, 0, 0 - object_event 8, 54, 0, 5, 0, 11, 0, 3, 8, 17, 0, 0, 0, 0, 0, SaffronCity_PokemonTrainerFanClub_EventScript_16F583, 108, 0, 0 - object_event 9, 0, 0, 2, 0, 1, 0, 0, 76, 17, 0, 0, 0, 0, 0, SaffronCity_PokemonTrainerFanClub_EventScript_1ACF7A, 157, 0, 0 - object_event 10, 0, 0, 3, 0, 1, 0, 0, 76, 17, 0, 0, 0, 0, 0, SaffronCity_PokemonTrainerFanClub_EventScript_1ACF7A, 157, 0, 0 - -SaffronCity_PokemonTrainerFanClub_MapWarps: - warp_def 5, 15, 3, 14, 778 - -SaffronCity_PokemonTrainerFanClub_MapEvents:: - map_events SaffronCity_PokemonTrainerFanClub_EventObjects, SaffronCity_PokemonTrainerFanClub_MapWarps, 0x0, 0x0 diff --git a/data/maps/SaffronCity_PokemonTrainerFanClub/header.inc b/data/maps/SaffronCity_PokemonTrainerFanClub/header.inc deleted file mode 100644 index 9adb9fbb0..000000000 --- a/data/maps/SaffronCity_PokemonTrainerFanClub/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SaffronCity_PokemonTrainerFanClub:: @ 8351744 - .4byte SaffronCity_PokemonTrainerFanClub_Layout @ 0x8338A60 - .4byte SaffronCity_PokemonTrainerFanClub_MapEvents @ 0x83BD318 - .4byte SaffronCity_PokemonTrainerFanClub_MapScripts @ 0x816F0BF - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_CITY - .2byte 263 - .byte 0x62, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/SaffronCity_PokemonTrainerFanClub/map.json b/data/maps/SaffronCity_PokemonTrainerFanClub/map.json new file mode 100644 index 000000000..0403a7806 --- /dev/null +++ b/data/maps/SaffronCity_PokemonTrainerFanClub/map.json @@ -0,0 +1,158 @@ +{ + "id": "MAP_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB", + "name": "SaffronCity_PokemonTrainerFanClub", + "layout": "LAYOUT_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB", + "music": "BGM_FRLG_VIRIDIAN_CITY", + "region_map_section": "MAPSEC_SAFFRON_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "24", + "x": 7, + "y": 13, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_PokemonTrainerFanClub_EventScript_16F281", + "flag": "0" + }, + { + "graphics_id": "17", + "x": 6, + "y": 11, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_PokemonTrainerFanClub_EventScript_16F2F8", + "flag": "0" + }, + { + "graphics_id": "18", + "x": 3, + "y": 13, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_PokemonTrainerFanClub_EventScript_16F36F", + "flag": "0" + }, + { + "graphics_id": "61", + "x": 3, + "y": 12, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_PokemonTrainerFanClub_EventScript_16F3E6", + "flag": "0" + }, + { + "graphics_id": "31", + "x": 9, + "y": 11, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_PokemonTrainerFanClub_EventScript_16F45D", + "flag": "110" + }, + { + "graphics_id": "26", + "x": 7, + "y": 12, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_PokemonTrainerFanClub_EventScript_16F4BF", + "flag": "109" + }, + { + "graphics_id": "29", + "x": 9, + "y": 12, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_PokemonTrainerFanClub_EventScript_16F521", + "flag": "111" + }, + { + "graphics_id": "54", + "x": 5, + "y": 11, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_PokemonTrainerFanClub_EventScript_16F583", + "flag": "108" + }, + { + "graphics_id": "0", + "x": 2, + "y": 1, + "elevation": 0, + "movement_type": "76", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_PokemonTrainerFanClub_EventScript_1ACF7A", + "flag": "157" + }, + { + "graphics_id": "0", + "x": 3, + "y": 1, + "elevation": 0, + "movement_type": "76", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_PokemonTrainerFanClub_EventScript_1ACF7A", + "flag": "157" + } + ], + "warp_events": [ + { + "x": 5, + "y": 15, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY_DUPLICATE", + "dest_warp_id": 14 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/SeafoamIslands_1F/events.inc b/data/maps/SeafoamIslands_1F/events.inc deleted file mode 100644 index ad0e8a938..000000000 --- a/data/maps/SeafoamIslands_1F/events.inc +++ /dev/null @@ -1,16 +0,0 @@ -SeafoamIslands_1F_EventObjects: - object_event 1, 97, 0, 22, 0, 12, 0, 3, 8, 0, 0, 66, 0, 0, 0, SeafoamIslands_1F_EventScript_1BE11D, 64, 0, 0 - object_event 2, 97, 0, 32, 0, 9, 0, 3, 8, 0, 0, 67, 0, 0, 0, SeafoamIslands_1F_EventScript_1BE11D, 65, 0, 0 - object_event 3, 92, 0, 11, 0, 8, 0, 3, 8, 17, 0, 0, 0, 0, 0, SeafoamIslands_1F_EventScript_1BEBE7, 468, 0, 0 - -SeafoamIslands_1F_MapWarps: - warp_def 10, 6, 3, 0, 340 - warp_def 31, 4, 3, 1, 340 - warp_def 28, 19, 3, 2, 340 - warp_def 6, 21, 3, 0, 806 - warp_def 32, 21, 3, 1, 806 - warp_def 21, 8, 3, 9, 340 - warp_def 30, 8, 3, 10, 340 - -SeafoamIslands_1F_MapEvents:: - map_events SeafoamIslands_1F_EventObjects, SeafoamIslands_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/SeafoamIslands_1F/header.inc b/data/maps/SeafoamIslands_1F/header.inc deleted file mode 100644 index f95429a3f..000000000 --- a/data/maps/SeafoamIslands_1F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SeafoamIslands_1F:: @ 834FB28 - .4byte SeafoamIslands_1F_Layout @ 0x831474C - .4byte SeafoamIslands_1F_MapEvents @ 0x83B1E64 - .4byte SeafoamIslands_1F_MapScripts @ 0x8162F43 - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_FOREST - .2byte 156 - .byte 0x8b, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/SeafoamIslands_1F/map.json b/data/maps/SeafoamIslands_1F/map.json new file mode 100644 index 000000000..cdf4bcd0a --- /dev/null +++ b/data/maps/SeafoamIslands_1F/map.json @@ -0,0 +1,109 @@ +{ + "id": "MAP_SEAFOAM_ISLANDS_1F", + "name": "SeafoamIslands_1F", + "layout": "LAYOUT_SEAFOAM_ISLANDS_1F", + "music": "BGM_FRLG_VIRIDIAN_FOREST", + "region_map_section": "MAPSEC_SEAFOAM_ISLANDS", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "97", + "x": 22, + "y": 12, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 66, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafoamIslands_1F_EventScript_1BE11D", + "flag": "64" + }, + { + "graphics_id": "97", + "x": 32, + "y": 9, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 67, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafoamIslands_1F_EventScript_1BE11D", + "flag": "65" + }, + { + "graphics_id": "92", + "x": 11, + "y": 8, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafoamIslands_1F_EventScript_1BEBE7", + "flag": "468" + } + ], + "warp_events": [ + { + "x": 10, + "y": 6, + "elevation": 3, + "dest_map": "MAP_SEAFOAM_ISLANDS_B1F", + "dest_warp_id": 0 + }, + { + "x": 31, + "y": 4, + "elevation": 3, + "dest_map": "MAP_SEAFOAM_ISLANDS_B1F", + "dest_warp_id": 1 + }, + { + "x": 28, + "y": 19, + "elevation": 3, + "dest_map": "MAP_SEAFOAM_ISLANDS_B1F", + "dest_warp_id": 2 + }, + { + "x": 6, + "y": 21, + "elevation": 3, + "dest_map": "MAP_ROUTE20", + "dest_warp_id": 0 + }, + { + "x": 32, + "y": 21, + "elevation": 3, + "dest_map": "MAP_ROUTE20", + "dest_warp_id": 1 + }, + { + "x": 21, + "y": 8, + "elevation": 3, + "dest_map": "MAP_SEAFOAM_ISLANDS_B1F", + "dest_warp_id": 9 + }, + { + "x": 30, + "y": 8, + "elevation": 3, + "dest_map": "MAP_SEAFOAM_ISLANDS_B1F", + "dest_warp_id": 10 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/SeafoamIslands_B1F/events.inc b/data/maps/SeafoamIslands_B1F/events.inc deleted file mode 100644 index b8f166929..000000000 --- a/data/maps/SeafoamIslands_B1F/events.inc +++ /dev/null @@ -1,21 +0,0 @@ -SeafoamIslands_B1F_EventObjects: - object_event 1, 97, 0, 22, 0, 8, 0, 3, 8, 0, 0, 68, 0, 0, 0, SeafoamIslands_B1F_EventScript_1BE11D, 66, 0, 0 - object_event 2, 97, 0, 30, 0, 8, 0, 3, 8, 0, 0, 69, 0, 0, 0, SeafoamIslands_B1F_EventScript_1BE11D, 67, 0, 0 - object_event 3, 92, 0, 19, 0, 18, 0, 3, 8, 17, 0, 0, 0, 0, 0, SeafoamIslands_B1F_EventScript_1BEBF4, 469, 0, 0 - object_event 4, 92, 0, 24, 0, 14, 0, 4, 8, 17, 0, 0, 0, 0, 0, SeafoamIslands_B1F_EventScript_1BEC01, 470, 0, 0 - -SeafoamIslands_B1F_MapWarps: - warp_def 10, 6, 4, 0, 339 - warp_def 31, 4, 3, 1, 339 - warp_def 28, 19, 3, 2, 339 - warp_def 7, 3, 3, 3, 341 - warp_def 17, 9, 4, 4, 341 - warp_def 25, 19, 3, 5, 341 - warp_def 32, 14, 3, 6, 341 - warp_def 23, 8, 3, 7, 341 - warp_def 28, 8, 3, 8, 341 - warp_def 21, 8, 3, 5, 339 - warp_def 29, 8, 3, 6, 339 - -SeafoamIslands_B1F_MapEvents:: - map_events SeafoamIslands_B1F_EventObjects, SeafoamIslands_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/SeafoamIslands_B1F/header.inc b/data/maps/SeafoamIslands_B1F/header.inc deleted file mode 100644 index b81544b6f..000000000 --- a/data/maps/SeafoamIslands_B1F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SeafoamIslands_B1F:: @ 834FB44 - .4byte SeafoamIslands_B1F_Layout @ 0x8314E44 - .4byte SeafoamIslands_B1F_MapEvents @ 0x83B1F30 - .4byte SeafoamIslands_B1F_MapScripts @ 0x8162F4D - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_FOREST - .2byte 157 - .byte 0x8b, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/SeafoamIslands_B1F/map.json b/data/maps/SeafoamIslands_B1F/map.json new file mode 100644 index 000000000..94c850eb0 --- /dev/null +++ b/data/maps/SeafoamIslands_B1F/map.json @@ -0,0 +1,150 @@ +{ + "id": "MAP_SEAFOAM_ISLANDS_B1F", + "name": "SeafoamIslands_B1F", + "layout": "LAYOUT_SEAFOAM_ISLANDS_B1F", + "music": "BGM_FRLG_VIRIDIAN_FOREST", + "region_map_section": "MAPSEC_SEAFOAM_ISLANDS", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "97", + "x": 22, + "y": 8, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 68, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafoamIslands_B1F_EventScript_1BE11D", + "flag": "66" + }, + { + "graphics_id": "97", + "x": 30, + "y": 8, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 69, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafoamIslands_B1F_EventScript_1BE11D", + "flag": "67" + }, + { + "graphics_id": "92", + "x": 19, + "y": 18, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafoamIslands_B1F_EventScript_1BEBF4", + "flag": "469" + }, + { + "graphics_id": "92", + "x": 24, + "y": 14, + "elevation": 4, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafoamIslands_B1F_EventScript_1BEC01", + "flag": "470" + } + ], + "warp_events": [ + { + "x": 10, + "y": 6, + "elevation": 4, + "dest_map": "MAP_SEAFOAM_ISLANDS_1F", + "dest_warp_id": 0 + }, + { + "x": 31, + "y": 4, + "elevation": 3, + "dest_map": "MAP_SEAFOAM_ISLANDS_1F", + "dest_warp_id": 1 + }, + { + "x": 28, + "y": 19, + "elevation": 3, + "dest_map": "MAP_SEAFOAM_ISLANDS_1F", + "dest_warp_id": 2 + }, + { + "x": 7, + "y": 3, + "elevation": 3, + "dest_map": "MAP_SEAFOAM_ISLANDS_B2F", + "dest_warp_id": 3 + }, + { + "x": 17, + "y": 9, + "elevation": 4, + "dest_map": "MAP_SEAFOAM_ISLANDS_B2F", + "dest_warp_id": 4 + }, + { + "x": 25, + "y": 19, + "elevation": 3, + "dest_map": "MAP_SEAFOAM_ISLANDS_B2F", + "dest_warp_id": 5 + }, + { + "x": 32, + "y": 14, + "elevation": 3, + "dest_map": "MAP_SEAFOAM_ISLANDS_B2F", + "dest_warp_id": 6 + }, + { + "x": 23, + "y": 8, + "elevation": 3, + "dest_map": "MAP_SEAFOAM_ISLANDS_B2F", + "dest_warp_id": 7 + }, + { + "x": 28, + "y": 8, + "elevation": 3, + "dest_map": "MAP_SEAFOAM_ISLANDS_B2F", + "dest_warp_id": 8 + }, + { + "x": 21, + "y": 8, + "elevation": 3, + "dest_map": "MAP_SEAFOAM_ISLANDS_1F", + "dest_warp_id": 5 + }, + { + "x": 29, + "y": 8, + "elevation": 3, + "dest_map": "MAP_SEAFOAM_ISLANDS_1F", + "dest_warp_id": 6 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/SeafoamIslands_B2F/events.inc b/data/maps/SeafoamIslands_B2F/events.inc deleted file mode 100644 index 11165d646..000000000 --- a/data/maps/SeafoamIslands_B2F/events.inc +++ /dev/null @@ -1,20 +0,0 @@ -SeafoamIslands_B2F_EventObjects: - object_event 1, 97, 0, 22, 0, 8, 0, 3, 8, 0, 0, 70, 0, 0, 0, SeafoamIslands_B2F_EventScript_1BE11D, 68, 0, 0 - object_event 2, 97, 0, 30, 0, 8, 0, 3, 8, 0, 0, 71, 0, 0, 0, SeafoamIslands_B2F_EventScript_1BE11D, 69, 0, 0 - object_event 3, 92, 0, 18, 0, 15, 0, 3, 8, 17, 0, 0, 0, 0, 0, SeafoamIslands_B2F_EventScript_1BEC0E, 471, 0, 0 - -SeafoamIslands_B2F_MapWarps: - warp_def 7, 17, 3, 0, 342 - warp_def 32, 4, 3, 1, 342 - warp_def 31, 17, 4, 2, 342 - warp_def 7, 4, 3, 3, 340 - warp_def 17, 9, 4, 4, 340 - warp_def 25, 19, 3, 5, 340 - warp_def 32, 14, 4, 6, 340 - warp_def 22, 7, 3, 7, 340 - warp_def 29, 8, 3, 8, 340 - warp_def 24, 8, 3, 5, 342 - warp_def 27, 8, 3, 6, 342 - -SeafoamIslands_B2F_MapEvents:: - map_events SeafoamIslands_B2F_EventObjects, SeafoamIslands_B2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/SeafoamIslands_B2F/header.inc b/data/maps/SeafoamIslands_B2F/header.inc deleted file mode 100644 index 320d37873..000000000 --- a/data/maps/SeafoamIslands_B2F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SeafoamIslands_B2F:: @ 834FB60 - .4byte SeafoamIslands_B2F_Layout @ 0x8315588 - .4byte SeafoamIslands_B2F_MapEvents @ 0x83B1FE4 - .4byte SeafoamIslands_B2F_MapScripts @ 0x8162F4E - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_FOREST - .2byte 158 - .byte 0x8b, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/SeafoamIslands_B2F/map.json b/data/maps/SeafoamIslands_B2F/map.json new file mode 100644 index 000000000..bb614f803 --- /dev/null +++ b/data/maps/SeafoamIslands_B2F/map.json @@ -0,0 +1,137 @@ +{ + "id": "MAP_SEAFOAM_ISLANDS_B2F", + "name": "SeafoamIslands_B2F", + "layout": "LAYOUT_SEAFOAM_ISLANDS_B2F", + "music": "BGM_FRLG_VIRIDIAN_FOREST", + "region_map_section": "MAPSEC_SEAFOAM_ISLANDS", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "97", + "x": 22, + "y": 8, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 70, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafoamIslands_B2F_EventScript_1BE11D", + "flag": "68" + }, + { + "graphics_id": "97", + "x": 30, + "y": 8, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 71, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafoamIslands_B2F_EventScript_1BE11D", + "flag": "69" + }, + { + "graphics_id": "92", + "x": 18, + "y": 15, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafoamIslands_B2F_EventScript_1BEC0E", + "flag": "471" + } + ], + "warp_events": [ + { + "x": 7, + "y": 17, + "elevation": 3, + "dest_map": "MAP_SEAFOAM_ISLANDS_B3F", + "dest_warp_id": 0 + }, + { + "x": 32, + "y": 4, + "elevation": 3, + "dest_map": "MAP_SEAFOAM_ISLANDS_B3F", + "dest_warp_id": 1 + }, + { + "x": 31, + "y": 17, + "elevation": 4, + "dest_map": "MAP_SEAFOAM_ISLANDS_B3F", + "dest_warp_id": 2 + }, + { + "x": 7, + "y": 4, + "elevation": 3, + "dest_map": "MAP_SEAFOAM_ISLANDS_B1F", + "dest_warp_id": 3 + }, + { + "x": 17, + "y": 9, + "elevation": 4, + "dest_map": "MAP_SEAFOAM_ISLANDS_B1F", + "dest_warp_id": 4 + }, + { + "x": 25, + "y": 19, + "elevation": 3, + "dest_map": "MAP_SEAFOAM_ISLANDS_B1F", + "dest_warp_id": 5 + }, + { + "x": 32, + "y": 14, + "elevation": 4, + "dest_map": "MAP_SEAFOAM_ISLANDS_B1F", + "dest_warp_id": 6 + }, + { + "x": 22, + "y": 7, + "elevation": 3, + "dest_map": "MAP_SEAFOAM_ISLANDS_B1F", + "dest_warp_id": 7 + }, + { + "x": 29, + "y": 8, + "elevation": 3, + "dest_map": "MAP_SEAFOAM_ISLANDS_B1F", + "dest_warp_id": 8 + }, + { + "x": 24, + "y": 8, + "elevation": 3, + "dest_map": "MAP_SEAFOAM_ISLANDS_B3F", + "dest_warp_id": 5 + }, + { + "x": 27, + "y": 8, + "elevation": 3, + "dest_map": "MAP_SEAFOAM_ISLANDS_B3F", + "dest_warp_id": 6 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/SeafoamIslands_B3F/events.inc b/data/maps/SeafoamIslands_B3F/events.inc deleted file mode 100644 index 144502290..000000000 --- a/data/maps/SeafoamIslands_B3F/events.inc +++ /dev/null @@ -1,24 +0,0 @@ -SeafoamIslands_B3F_EventObjects: - object_event 1, 97, 0, 23, 0, 8, 0, 1, 8, 17, 0, 0, 0, 0, 0, 0x0, 70, 0, 0 - object_event 2, 97, 0, 24, 0, 8, 0, 1, 8, 17, 0, 0, 0, 0, 0, 0x0, 71, 0, 0 - object_event 3, 97, 0, 12, 0, 16, 0, 3, 8, 0, 0, 77, 0, 0, 0, SeafoamIslands_B3F_EventScript_1BE11D, 74, 0, 0 - object_event 4, 97, 0, 13, 0, 16, 0, 3, 8, 0, 0, 0, 0, 0, 0, SeafoamIslands_B3F_EventScript_1BE11D, 75, 0, 0 - object_event 5, 97, 0, 9, 0, 16, 0, 3, 8, 0, 0, 0, 0, 0, 0, SeafoamIslands_B3F_EventScript_1BE11D, 73, 0, 0 - object_event 6, 97, 0, 6, 0, 17, 0, 3, 8, 0, 0, 76, 0, 0, 0, SeafoamIslands_B3F_EventScript_1BE11D, 72, 0, 0 - -SeafoamIslands_B3F_MapWarps: - warp_def 8, 14, 4, 0, 341 - warp_def 31, 4, 3, 1, 341 - warp_def 31, 16, 4, 2, 341 - warp_def 12, 9, 3, 0, 343 - warp_def 29, 5, 3, 1, 343 - warp_def 23, 9, 1, 7, 341 - warp_def 24, 9, 1, 8, 341 - warp_def 6, 18, 3, 2, 343 - warp_def 9, 18, 3, 3, 343 - -SeafoamIslands_B3F_MapBGEvents: - bg_event 5, 12, 0, 7, 0, 110, 29, 1 - -SeafoamIslands_B3F_MapEvents:: - map_events SeafoamIslands_B3F_EventObjects, SeafoamIslands_B3F_MapWarps, 0x0, SeafoamIslands_B3F_MapBGEvents diff --git a/data/maps/SeafoamIslands_B3F/header.inc b/data/maps/SeafoamIslands_B3F/header.inc deleted file mode 100644 index 9b61d401a..000000000 --- a/data/maps/SeafoamIslands_B3F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SeafoamIslands_B3F:: @ 834FB7C - .4byte SeafoamIslands_B3F_Layout @ 0x8315CCC - .4byte SeafoamIslands_B3F_MapEvents @ 0x83B20DC - .4byte SeafoamIslands_B3F_MapScripts @ 0x8162F4F - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_FOREST - .2byte 159 - .byte 0x8b, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/SeafoamIslands_B3F/map.json b/data/maps/SeafoamIslands_B3F/map.json new file mode 100644 index 000000000..b9e12e16b --- /dev/null +++ b/data/maps/SeafoamIslands_B3F/map.json @@ -0,0 +1,172 @@ +{ + "id": "MAP_SEAFOAM_ISLANDS_B3F", + "name": "SeafoamIslands_B3F", + "layout": "LAYOUT_SEAFOAM_ISLANDS_B3F", + "music": "BGM_FRLG_VIRIDIAN_FOREST", + "region_map_section": "MAPSEC_SEAFOAM_ISLANDS", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "97", + "x": 23, + "y": 8, + "elevation": 1, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "70" + }, + { + "graphics_id": "97", + "x": 24, + "y": 8, + "elevation": 1, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "71" + }, + { + "graphics_id": "97", + "x": 12, + "y": 16, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 77, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafoamIslands_B3F_EventScript_1BE11D", + "flag": "74" + }, + { + "graphics_id": "97", + "x": 13, + "y": 16, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafoamIslands_B3F_EventScript_1BE11D", + "flag": "75" + }, + { + "graphics_id": "97", + "x": 9, + "y": 16, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafoamIslands_B3F_EventScript_1BE11D", + "flag": "73" + }, + { + "graphics_id": "97", + "x": 6, + "y": 17, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 76, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafoamIslands_B3F_EventScript_1BE11D", + "flag": "72" + } + ], + "warp_events": [ + { + "x": 8, + "y": 14, + "elevation": 4, + "dest_map": "MAP_SEAFOAM_ISLANDS_B2F", + "dest_warp_id": 0 + }, + { + "x": 31, + "y": 4, + "elevation": 3, + "dest_map": "MAP_SEAFOAM_ISLANDS_B2F", + "dest_warp_id": 1 + }, + { + "x": 31, + "y": 16, + "elevation": 4, + "dest_map": "MAP_SEAFOAM_ISLANDS_B2F", + "dest_warp_id": 2 + }, + { + "x": 12, + "y": 9, + "elevation": 3, + "dest_map": "MAP_SEAFOAM_ISLANDS_B4F", + "dest_warp_id": 0 + }, + { + "x": 29, + "y": 5, + "elevation": 3, + "dest_map": "MAP_SEAFOAM_ISLANDS_B4F", + "dest_warp_id": 1 + }, + { + "x": 23, + "y": 9, + "elevation": 1, + "dest_map": "MAP_SEAFOAM_ISLANDS_B2F", + "dest_warp_id": 7 + }, + { + "x": 24, + "y": 9, + "elevation": 1, + "dest_map": "MAP_SEAFOAM_ISLANDS_B2F", + "dest_warp_id": 8 + }, + { + "x": 6, + "y": 18, + "elevation": 3, + "dest_map": "MAP_SEAFOAM_ISLANDS_B4F", + "dest_warp_id": 2 + }, + { + "x": 9, + "y": 18, + "elevation": 3, + "dest_map": "MAP_SEAFOAM_ISLANDS_B4F", + "dest_warp_id": 3 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "hidden_item", + "x": 5, + "y": 12, + "elevation": 0, + "item": "ITEM_NUGGET", + "flag": "29", + "unknown": 1 + } + ] +}
\ No newline at end of file diff --git a/data/maps/SeafoamIslands_B4F/events.inc b/data/maps/SeafoamIslands_B4F/events.inc deleted file mode 100644 index fc894489e..000000000 --- a/data/maps/SeafoamIslands_B4F/events.inc +++ /dev/null @@ -1,24 +0,0 @@ -SeafoamIslands_B4F_EventObjects: - object_event 1, 97, 0, 8, 0, 18, 0, 1, 8, 17, 0, 0, 0, 0, 0, 0x0, 76, 0, 0 - object_event 2, 97, 0, 9, 0, 18, 0, 1, 8, 17, 0, 0, 0, 0, 0, 0x0, 77, 0, 0 - object_event 3, 138, 0, 9, 0, 2, 0, 4, 8, 17, 0, 0, 0, 0, 0, SeafoamIslands_B4F_EventScript_1631AC, 130, 0, 0 - object_event 4, 92, 0, 22, 0, 19, 0, 4, 8, 17, 0, 0, 0, 0, 0, SeafoamIslands_B4F_EventScript_1BEC1B, 472, 0, 0 - -SeafoamIslands_B4F_MapWarps: - warp_def 15, 9, 4, 3, 342 - warp_def 32, 5, 4, 4, 342 - warp_def 8, 17, 1, 7, 342 - warp_def 9, 17, 1, 8, 342 - -SeafoamIslands_B4F_MapCoordEvents: - coord_event 26, 19, 1, 0, 16483, 0, 0, SeafoamIslands_B4F_EventScript_16319D - coord_event 27, 19, 1, 0, 16483, 0, 0, SeafoamIslands_B4F_EventScript_16319D - coord_event 28, 19, 1, 0, 16483, 0, 0, SeafoamIslands_B4F_EventScript_16319D - -SeafoamIslands_B4F_MapBGEvents: - bg_event 13, 8, 0, 7, 0, 97, 30, 1 - bg_event 30, 2, 0, 0, 0, SeafoamIslands_B4F_EventScript_16322C - bg_event 14, 18, 0, 0, 0, SeafoamIslands_B4F_EventScript_163223 - -SeafoamIslands_B4F_MapEvents:: - map_events SeafoamIslands_B4F_EventObjects, SeafoamIslands_B4F_MapWarps, SeafoamIslands_B4F_MapCoordEvents, SeafoamIslands_B4F_MapBGEvents diff --git a/data/maps/SeafoamIslands_B4F/header.inc b/data/maps/SeafoamIslands_B4F/header.inc deleted file mode 100644 index 67c545838..000000000 --- a/data/maps/SeafoamIslands_B4F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SeafoamIslands_B4F:: @ 834FB98 - .4byte SeafoamIslands_B4F_Layout @ 0x8316410 - .4byte SeafoamIslands_B4F_MapEvents @ 0x83B21C4 - .4byte SeafoamIslands_B4F_MapScripts @ 0x816302E - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_FOREST - .2byte 160 - .byte 0x8b, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/SeafoamIslands_B4F/map.json b/data/maps/SeafoamIslands_B4F/map.json new file mode 100644 index 000000000..283120f81 --- /dev/null +++ b/data/maps/SeafoamIslands_B4F/map.json @@ -0,0 +1,153 @@ +{ + "id": "MAP_SEAFOAM_ISLANDS_B4F", + "name": "SeafoamIslands_B4F", + "layout": "LAYOUT_SEAFOAM_ISLANDS_B4F", + "music": "BGM_FRLG_VIRIDIAN_FOREST", + "region_map_section": "MAPSEC_SEAFOAM_ISLANDS", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "97", + "x": 8, + "y": 18, + "elevation": 1, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "76" + }, + { + "graphics_id": "97", + "x": 9, + "y": 18, + "elevation": 1, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "77" + }, + { + "graphics_id": "138", + "x": 9, + "y": 2, + "elevation": 4, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafoamIslands_B4F_EventScript_1631AC", + "flag": "130" + }, + { + "graphics_id": "92", + "x": 22, + "y": 19, + "elevation": 4, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafoamIslands_B4F_EventScript_1BEC1B", + "flag": "472" + } + ], + "warp_events": [ + { + "x": 15, + "y": 9, + "elevation": 4, + "dest_map": "MAP_SEAFOAM_ISLANDS_B3F", + "dest_warp_id": 3 + }, + { + "x": 32, + "y": 5, + "elevation": 4, + "dest_map": "MAP_SEAFOAM_ISLANDS_B3F", + "dest_warp_id": 4 + }, + { + "x": 8, + "y": 17, + "elevation": 1, + "dest_map": "MAP_SEAFOAM_ISLANDS_B3F", + "dest_warp_id": 7 + }, + { + "x": 9, + "y": 17, + "elevation": 1, + "dest_map": "MAP_SEAFOAM_ISLANDS_B3F", + "dest_warp_id": 8 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 26, + "y": 19, + "elevation": 1, + "var": "VAR_0x4063", + "var_value": 0, + "script": "SeafoamIslands_B4F_EventScript_16319D" + }, + { + "type": "trigger", + "x": 27, + "y": 19, + "elevation": 1, + "var": "VAR_0x4063", + "var_value": 0, + "script": "SeafoamIslands_B4F_EventScript_16319D" + }, + { + "type": "trigger", + "x": 28, + "y": 19, + "elevation": 1, + "var": "VAR_0x4063", + "var_value": 0, + "script": "SeafoamIslands_B4F_EventScript_16319D" + } + ], + "bg_events": [ + { + "type": "hidden_item", + "x": 13, + "y": 8, + "elevation": 0, + "item": "ITEM_WATER_STONE", + "flag": "30", + "unknown": 1 + }, + { + "type": "bg_event_type_0", + "x": 30, + "y": 2, + "elevation": 0, + "script": "SeafoamIslands_B4F_EventScript_16322C" + }, + { + "type": "bg_event_type_0", + "x": 14, + "y": 18, + "elevation": 0, + "script": "SeafoamIslands_B4F_EventScript_163223" + } + ] +}
\ No newline at end of file diff --git a/data/maps/SevenIsland/connections.inc b/data/maps/SevenIsland/connections.inc deleted file mode 100644 index 37634bef6..000000000 --- a/data/maps/SevenIsland/connections.inc +++ /dev/null @@ -1,7 +0,0 @@ -SevenIsland_MapConnectionsList: @ 83529A8 - connection up, -48, MAP_SEVEN_ISLAND_TRAINERTOWER - connection down, 0, MAP_SEVEN_ISLAND_SEVAULTCANYON_ENTRANCE - -SevenIsland_MapConnections:: @ 83529C0 - .4byte 2 - .4byte SevenIsland_MapConnectionsList diff --git a/data/maps/SevenIsland/events.inc b/data/maps/SevenIsland/events.inc deleted file mode 100644 index ec2915745..000000000 --- a/data/maps/SevenIsland/events.inc +++ /dev/null @@ -1,16 +0,0 @@ -SevenIsland_EventObjects: - object_event 1, 41, 0, 7, 0, 18, 0, 3, 9, 17, 0, 0, 0, 0, 0, SevenIsland_EventScript_1C4B56, 0, 0, 0 - object_event 2, 35, 0, 9, 0, 7, 0, 3, 13, 17, 0, 0, 0, 0, 0, SevenIsland_EventScript_167EC6, 0, 0, 0 - object_event 3, 55, 0, 15, 0, 5, 0, 3, 2, 17, 0, 0, 0, 0, 0, SevenIsland_EventScript_167ECF, 0, 0, 0 - -SevenIsland_MapWarps: - warp_def 11, 9, 0, 0, 7936 - warp_def 5, 9, 0, 0, 7938 - warp_def 12, 3, 0, 0, 7939 - warp_def 16, 13, 3, 0, 7942 - -SevenIsland_MapBGEvents: - bg_event 17, 9, 0, 0, 0, SevenIsland_EventScript_167EBD - -SevenIsland_MapEvents:: - map_events SevenIsland_EventObjects, SevenIsland_MapWarps, 0x0, SevenIsland_MapBGEvents diff --git a/data/maps/SevenIsland/header.inc b/data/maps/SevenIsland/header.inc deleted file mode 100644 index e9e478fd1..000000000 --- a/data/maps/SevenIsland/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SevenIsland:: @ 83507F4 - .4byte SevenIsland_Layout @ 0x8323D48 - .4byte SevenIsland_MapEvents @ 0x83B657C - .4byte SevenIsland_MapScripts @ 0x8167EB3 - .4byte SevenIsland_MapConnections @ 0x83529C0 - .2byte BGM_FRLG_ISLAND_SIX - .2byte 235 - .byte 0x94, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/SevenIsland/map.json b/data/maps/SevenIsland/map.json new file mode 100644 index 000000000..dd9a59fa6 --- /dev/null +++ b/data/maps/SevenIsland/map.json @@ -0,0 +1,107 @@ +{ + "id": "MAP_SEVEN_ISLAND", + "name": "SevenIsland", + "layout": "LAYOUT_SEVEN_ISLAND", + "music": "BGM_FRLG_ISLAND_SIX", + "region_map_section": "MAPSEC_SEVEN_ISLAND", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_1", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_SEVEN_ISLAND_TRAINER_TOWER", + "offset": -48, + "direction": "up" + }, + { + "map": "MAP_SEVEN_ISLAND_SEVAULT_CANYON_ENTRANCE", + "offset": 0, + "direction": "down" + } + ], + "object_events": [ + { + "graphics_id": "41", + "x": 7, + "y": 18, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_EventScript_1C4B56", + "flag": "0" + }, + { + "graphics_id": "35", + "x": 9, + "y": 7, + "elevation": 3, + "movement_type": "13", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_EventScript_167EC6", + "flag": "0" + }, + { + "graphics_id": "55", + "x": 15, + "y": 5, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_EventScript_167ECF", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 11, + "y": 9, + "elevation": 0, + "dest_map": "MAP_SEVEN_ISLAND_HOUSE_ROOM1", + "dest_warp_id": 0 + }, + { + "x": 5, + "y": 9, + "elevation": 0, + "dest_map": "MAP_SEVEN_ISLAND_MART", + "dest_warp_id": 0 + }, + { + "x": 12, + "y": 3, + "elevation": 0, + "dest_map": "MAP_SEVEN_ISLAND_POKEMON_CENTER_1F", + "dest_warp_id": 0 + }, + { + "x": 16, + "y": 13, + "elevation": 3, + "dest_map": "MAP_SEVEN_ISLAND_HARBOR", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 17, + "y": 9, + "elevation": 0, + "script": "SevenIsland_EventScript_167EBD" + } + ] +}
\ No newline at end of file diff --git a/data/maps/SevenIsland_Harbor/events.inc b/data/maps/SevenIsland_Harbor/events.inc deleted file mode 100644 index 29a248be5..000000000 --- a/data/maps/SevenIsland_Harbor/events.inc +++ /dev/null @@ -1,9 +0,0 @@ -SevenIsland_Harbor_EventObjects: - object_event 1, 108, 0, 8, 0, 9, 0, 0, 8, 17, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 - object_event 2, 62, 0, 8, 0, 6, 0, 3, 7, 17, 0, 0, 0, 0, 0, SevenIsland_Harbor_EventScript_170BE5, 0, 0, 0 - -SevenIsland_Harbor_MapWarps: - warp_def 8, 2, 3, 3, 785 - -SevenIsland_Harbor_MapEvents:: - map_events SevenIsland_Harbor_EventObjects, SevenIsland_Harbor_MapWarps, 0x0, 0x0 diff --git a/data/maps/SevenIsland_Harbor/header.inc b/data/maps/SevenIsland_Harbor/header.inc deleted file mode 100644 index fe1165d84..000000000 --- a/data/maps/SevenIsland_Harbor/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SevenIsland_Harbor:: @ 8351B50 - .4byte Island_Harbor_Layout @ 0x8343FB8 - .4byte SevenIsland_Harbor_MapEvents @ 0x83BE2A0 - .4byte SevenIsland_Harbor_MapScripts @ 0x8170BE4 - .4byte NULL - .2byte BGM_FRLG_ISLAND_SIX - .2byte 315 - .byte 0x94, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/SevenIsland_Harbor/map.json b/data/maps/SevenIsland_Harbor/map.json new file mode 100644 index 000000000..af0fce3fb --- /dev/null +++ b/data/maps/SevenIsland_Harbor/map.json @@ -0,0 +1,54 @@ +{ + "id": "MAP_SEVEN_ISLAND_HARBOR", + "name": "SevenIsland_Harbor", + "layout": "LAYOUT_ISLAND_HARBOR", + "music": "BGM_FRLG_ISLAND_SIX", + "region_map_section": "MAPSEC_SEVEN_ISLAND", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "108", + "x": 8, + "y": 9, + "elevation": 0, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "62", + "x": 8, + "y": 6, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_Harbor_EventScript_170BE5", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 8, + "y": 2, + "elevation": 3, + "dest_map": "MAP_SEVEN_ISLAND", + "dest_warp_id": 3 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/SevenIsland_House_Room1/events.inc b/data/maps/SevenIsland_House_Room1/events.inc deleted file mode 100644 index 7acc86cca..000000000 --- a/data/maps/SevenIsland_House_Room1/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -SevenIsland_House_Room1_EventObjects: - object_event 1, 35, 0, 4, 0, 4, 0, 3, 10, 17, 0, 0, 0, 0, 0, SevenIsland_House_Room1_EventScript_170958, 0, 0, 0 - -SevenIsland_House_Room1_MapWarps: - warp_def 4, 7, 3, 0, 785 - warp_def 4, 1, 0, 0, 7937 - -SevenIsland_House_Room1_MapBGEvents: - bg_event 4, 1, 0, 0, 0, SevenIsland_House_Room1_EventScript_170A75 - -SevenIsland_House_Room1_MapEvents:: - map_events SevenIsland_House_Room1_EventObjects, SevenIsland_House_Room1_MapWarps, 0x0, SevenIsland_House_Room1_MapBGEvents diff --git a/data/maps/SevenIsland_House_Room1/header.inc b/data/maps/SevenIsland_House_Room1/header.inc deleted file mode 100644 index 0eeb9bc0f..000000000 --- a/data/maps/SevenIsland_House_Room1/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SevenIsland_House_Room1:: @ 8351AA8 - .4byte SevenIsland_House_Room1_Layout @ 0x834E310 - .4byte SevenIsland_House_Room1_MapEvents @ 0x83BE050 - .4byte SevenIsland_House_Room1_MapScripts @ 0x817088A - .4byte NULL - .2byte BGM_FRLG_ISLAND_SIX - .2byte 382 - .byte 0x94, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x01 diff --git a/data/maps/SevenIsland_House_Room1/map.json b/data/maps/SevenIsland_House_Room1/map.json new file mode 100644 index 000000000..50b67816d --- /dev/null +++ b/data/maps/SevenIsland_House_Room1/map.json @@ -0,0 +1,56 @@ +{ + "id": "MAP_SEVEN_ISLAND_HOUSE_ROOM1", + "name": "SevenIsland_House_Room1", + "layout": "LAYOUT_SEVEN_ISLAND_HOUSE_ROOM1", + "music": "BGM_FRLG_ISLAND_SIX", + "region_map_section": "MAPSEC_SEVEN_ISLAND", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_1", + "connections": null, + "object_events": [ + { + "graphics_id": "35", + "x": 4, + "y": 4, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_House_Room1_EventScript_170958", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_SEVEN_ISLAND", + "dest_warp_id": 0 + }, + { + "x": 4, + "y": 1, + "elevation": 0, + "dest_map": "MAP_SEVEN_ISLAND_HOUSE_ROOM2", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 4, + "y": 1, + "elevation": 0, + "script": "SevenIsland_House_Room1_EventScript_170A75" + } + ] +}
\ No newline at end of file diff --git a/data/maps/SevenIsland_House_Room2/events.inc b/data/maps/SevenIsland_House_Room2/events.inc deleted file mode 100644 index 509ebebeb..000000000 --- a/data/maps/SevenIsland_House_Room2/events.inc +++ /dev/null @@ -1,8 +0,0 @@ -SevenIsland_House_Room2_EventObjects: - object_event 1, 240, 0, 6, 0, 5, 0, 0, 9, 17, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 - -SevenIsland_House_Room2_MapWarps: - warp_def 3, 1, 0, 1, 7936 - -SevenIsland_House_Room2_MapEvents:: - map_events SevenIsland_House_Room2_EventObjects, SevenIsland_House_Room2_MapWarps, 0x0, 0x0 diff --git a/data/maps/SevenIsland_House_Room2/header.inc b/data/maps/SevenIsland_House_Room2/header.inc deleted file mode 100644 index 90d980166..000000000 --- a/data/maps/SevenIsland_House_Room2/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SevenIsland_House_Room2:: @ 8351AC4 - .4byte SevenIsland_House_Room2_Layout @ 0x8338C48 - .4byte SevenIsland_House_Room2_MapEvents @ 0x83BE084 - .4byte SevenIsland_House_Room2_MapScripts @ 0x8170A7E - .4byte NULL - .2byte BGM_FRLG_ISLAND_SIX - .2byte 265 - .byte 0x94, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x01 diff --git a/data/maps/SevenIsland_House_Room2/map.json b/data/maps/SevenIsland_House_Room2/map.json new file mode 100644 index 000000000..890afc5e4 --- /dev/null +++ b/data/maps/SevenIsland_House_Room2/map.json @@ -0,0 +1,41 @@ +{ + "id": "MAP_SEVEN_ISLAND_HOUSE_ROOM2", + "name": "SevenIsland_House_Room2", + "layout": "LAYOUT_SEVEN_ISLAND_HOUSE_ROOM2", + "music": "BGM_FRLG_ISLAND_SIX", + "region_map_section": "MAPSEC_SEVEN_ISLAND", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_1", + "connections": null, + "object_events": [ + { + "graphics_id": "240", + "x": 6, + "y": 5, + "elevation": 0, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 1, + "elevation": 0, + "dest_map": "MAP_SEVEN_ISLAND_HOUSE_ROOM1", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/SevenIsland_Mart/events.inc b/data/maps/SevenIsland_Mart/events.inc deleted file mode 100644 index 4ab092243..000000000 --- a/data/maps/SevenIsland_Mart/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -SevenIsland_Mart_EventObjects: - object_event 1, 68, 0, 2, 0, 3, 0, 0, 10, 17, 0, 0, 0, 0, 0, SevenIsland_Mart_EventScript_170B31, 0, 0, 0 - object_event 2, 22, 0, 6, 0, 2, 0, 3, 16, 17, 0, 0, 0, 0, 0, SevenIsland_Mart_EventScript_170B6E, 0, 0, 0 - object_event 3, 57, 0, 9, 0, 5, 0, 3, 3, 17, 0, 0, 0, 0, 0, SevenIsland_Mart_EventScript_170B80, 0, 0, 0 - object_event 4, 56, 0, 5, 0, 4, 0, 3, 8, 17, 0, 0, 0, 0, 0, SevenIsland_Mart_EventScript_170B77, 0, 0, 0 - -SevenIsland_Mart_MapWarps: - warp_def 4, 7, 3, 1, 785 - -SevenIsland_Mart_MapEvents:: - map_events SevenIsland_Mart_EventObjects, SevenIsland_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/SevenIsland_Mart/header.inc b/data/maps/SevenIsland_Mart/header.inc deleted file mode 100644 index 9f2aa5ca1..000000000 --- a/data/maps/SevenIsland_Mart/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SevenIsland_Mart:: @ 8351AE0 - .4byte Mart_Layout @ 0x82D5BCC - .4byte SevenIsland_Mart_MapEvents @ 0x83BE100 - .4byte SevenIsland_Mart_MapScripts @ 0x8170B30 - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 10 - .byte 0x94, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/SevenIsland_Mart/map.json b/data/maps/SevenIsland_Mart/map.json new file mode 100644 index 000000000..452e6e8b4 --- /dev/null +++ b/data/maps/SevenIsland_Mart/map.json @@ -0,0 +1,80 @@ +{ + "id": "MAP_SEVEN_ISLAND_MART", + "name": "SevenIsland_Mart", + "layout": "LAYOUT_MART", + "music": "BGM_FRLG_POKEMON_CENTER", + "region_map_section": "MAPSEC_SEVEN_ISLAND", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "68", + "x": 2, + "y": 3, + "elevation": 0, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_Mart_EventScript_170B31", + "flag": "0" + }, + { + "graphics_id": "22", + "x": 6, + "y": 2, + "elevation": 3, + "movement_type": "16", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_Mart_EventScript_170B6E", + "flag": "0" + }, + { + "graphics_id": "57", + "x": 9, + "y": 5, + "elevation": 3, + "movement_type": "3", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_Mart_EventScript_170B80", + "flag": "0" + }, + { + "graphics_id": "56", + "x": 5, + "y": 4, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_Mart_EventScript_170B77", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_SEVEN_ISLAND", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/SevenIsland_PokemonCenter_1F/events.inc b/data/maps/SevenIsland_PokemonCenter_1F/events.inc deleted file mode 100644 index 59ada2640..000000000 --- a/data/maps/SevenIsland_PokemonCenter_1F/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -SevenIsland_PokemonCenter_1F_EventObjects: - object_event 1, 64, 0, 7, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, SevenIsland_PokemonCenter_1F_EventScript_170B98, 0, 0, 0 - object_event 2, 32, 0, 11, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, SevenIsland_PokemonCenter_1F_EventScript_170BA1, 0, 0, 0 - object_event 3, 62, 0, 14, 0, 6, 0, 3, 9, 17, 0, 0, 0, 0, 0, SevenIsland_PokemonCenter_1F_EventScript_170BAA, 0, 0, 0 - object_event 4, 29, 0, 4, 0, 4, 0, 3, 10, 17, 0, 0, 0, 0, 0, SevenIsland_PokemonCenter_1F_EventScript_170BB3, 0, 0, 0 - object_event 5, 0, 0, 3, 0, 1, 0, 0, 76, 17, 0, 0, 0, 0, 0, SevenIsland_PokemonCenter_1F_EventScript_1ACFD4, 157, 0, 0 - object_event 6, 0, 0, 2, 0, 1, 0, 0, 76, 17, 0, 0, 0, 0, 0, SevenIsland_PokemonCenter_1F_EventScript_1ACFD4, 157, 0, 0 - -SevenIsland_PokemonCenter_1F_MapWarps: - warp_def 7, 8, 3, 2, 785 - warp_def 1, 6, 4, 0, 7940 - -SevenIsland_PokemonCenter_1F_MapEvents:: - map_events SevenIsland_PokemonCenter_1F_EventObjects, SevenIsland_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/SevenIsland_PokemonCenter_1F/header.inc b/data/maps/SevenIsland_PokemonCenter_1F/header.inc deleted file mode 100644 index feef23d0e..000000000 --- a/data/maps/SevenIsland_PokemonCenter_1F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SevenIsland_PokemonCenter_1F:: @ 8351AFC - .4byte PokemonCenter_1F_Layout @ 0x82D5990 - .4byte SevenIsland_PokemonCenter_1F_MapEvents @ 0x83BE1B4 - .4byte SevenIsland_PokemonCenter_1F_MapScripts @ 0x8170B89 - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 8 - .byte 0x94, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/SevenIsland_PokemonCenter_1F/map.json b/data/maps/SevenIsland_PokemonCenter_1F/map.json new file mode 100644 index 000000000..4dfee823f --- /dev/null +++ b/data/maps/SevenIsland_PokemonCenter_1F/map.json @@ -0,0 +1,113 @@ +{ + "id": "MAP_SEVEN_ISLAND_POKEMON_CENTER_1F", + "name": "SevenIsland_PokemonCenter_1F", + "layout": "LAYOUT_POKEMON_CENTER_1F", + "music": "BGM_FRLG_POKEMON_CENTER", + "region_map_section": "MAPSEC_SEVEN_ISLAND", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "64", + "x": 7, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_PokemonCenter_1F_EventScript_170B98", + "flag": "0" + }, + { + "graphics_id": "32", + "x": 11, + "y": 5, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_PokemonCenter_1F_EventScript_170BA1", + "flag": "0" + }, + { + "graphics_id": "62", + "x": 14, + "y": 6, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_PokemonCenter_1F_EventScript_170BAA", + "flag": "0" + }, + { + "graphics_id": "29", + "x": 4, + "y": 4, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_PokemonCenter_1F_EventScript_170BB3", + "flag": "0" + }, + { + "graphics_id": "0", + "x": 3, + "y": 1, + "elevation": 0, + "movement_type": "76", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_PokemonCenter_1F_EventScript_1ACFD4", + "flag": "157" + }, + { + "graphics_id": "0", + "x": 2, + "y": 1, + "elevation": 0, + "movement_type": "76", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_PokemonCenter_1F_EventScript_1ACFD4", + "flag": "157" + } + ], + "warp_events": [ + { + "x": 7, + "y": 8, + "elevation": 3, + "dest_map": "MAP_SEVEN_ISLAND", + "dest_warp_id": 2 + }, + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_SEVEN_ISLAND_POKEMON_CENTER_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/SevenIsland_PokemonCenter_2F/events.inc b/data/maps/SevenIsland_PokemonCenter_2F/events.inc deleted file mode 100644 index e7b0a0dcb..000000000 --- a/data/maps/SevenIsland_PokemonCenter_2F/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -SevenIsland_PokemonCenter_2F_EventObjects: - object_event 1, 65, 0, 6, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SevenIsland_PokemonCenter_2F_EventScript_1A8CF6, 0, 0, 0 - object_event 2, 65, 0, 2, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SevenIsland_PokemonCenter_2F_EventScript_1A8CFC, 0, 0, 0 - object_event 3, 65, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SevenIsland_PokemonCenter_2F_EventScript_1A8D02, 0, 0, 0 - object_event 4, 69, 0, 1, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, SevenIsland_PokemonCenter_2F_EventScript_1BB1D2, 112, 0, 0 - -SevenIsland_PokemonCenter_2F_MapWarps: - warp_def 1, 6, 4, 1, 7939 - warp_def 5, 1, 0, 0, 4 - warp_def 9, 1, 0, 0, 1 - -SevenIsland_PokemonCenter_2F_MapEvents:: - map_events SevenIsland_PokemonCenter_2F_EventObjects, SevenIsland_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/SevenIsland_PokemonCenter_2F/header.inc b/data/maps/SevenIsland_PokemonCenter_2F/header.inc deleted file mode 100644 index 523401267..000000000 --- a/data/maps/SevenIsland_PokemonCenter_2F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SevenIsland_PokemonCenter_2F:: @ 8351B18 - .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 - .4byte SevenIsland_PokemonCenter_2F_MapEvents @ 0x83BE240 - .4byte SevenIsland_PokemonCenter_2F_MapScripts @ 0x8170BBC - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 9 - .byte 0x94, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/SevenIsland_PokemonCenter_2F/map.json b/data/maps/SevenIsland_PokemonCenter_2F/map.json new file mode 100644 index 000000000..baca4a4c0 --- /dev/null +++ b/data/maps/SevenIsland_PokemonCenter_2F/map.json @@ -0,0 +1,94 @@ +{ + "id": "MAP_SEVEN_ISLAND_POKEMON_CENTER_2F", + "name": "SevenIsland_PokemonCenter_2F", + "layout": "LAYOUT_POKEMON_CENTER_2F", + "music": "BGM_FRLG_POKEMON_CENTER", + "region_map_section": "MAPSEC_SEVEN_ISLAND", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "65", + "x": 6, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_PokemonCenter_2F_EventScript_1A8CF6", + "flag": "0" + }, + { + "graphics_id": "65", + "x": 2, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_PokemonCenter_2F_EventScript_1A8CFC", + "flag": "0" + }, + { + "graphics_id": "65", + "x": 10, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_PokemonCenter_2F_EventScript_1A8D02", + "flag": "0" + }, + { + "graphics_id": "69", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_PokemonCenter_2F_EventScript_1BB1D2", + "flag": "112" + } + ], + "warp_events": [ + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_SEVEN_ISLAND_POKEMON_CENTER_1F", + "dest_warp_id": 1 + }, + { + "x": 5, + "y": 1, + "elevation": 0, + "dest_map": "MAP_UNKNOWN_MAP_00_04", + "dest_warp_id": 0 + }, + { + "x": 9, + "y": 1, + "elevation": 0, + "dest_map": "MAP_UNKNOWN_MAP_00_01", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/events.inc b/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/events.inc deleted file mode 100644 index bf869b229..000000000 --- a/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/events.inc +++ /dev/null @@ -1,23 +0,0 @@ -SevenIsland_SeavaultCanyon_TanobyKey_EventObjects: - object_event 1, 97, 0, 7, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, SevenIsland_SeavaultCanyon_TanobyKey_EventScript_1BE11D, 0, 0, 0 - object_event 2, 97, 0, 8, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, SevenIsland_SeavaultCanyon_TanobyKey_EventScript_1BE11D, 0, 0, 0 - object_event 3, 97, 0, 8, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, SevenIsland_SeavaultCanyon_TanobyKey_EventScript_1BE11D, 0, 0, 0 - object_event 4, 97, 0, 6, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, SevenIsland_SeavaultCanyon_TanobyKey_EventScript_1BE11D, 0, 0, 0 - object_event 5, 97, 0, 8, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, SevenIsland_SeavaultCanyon_TanobyKey_EventScript_1BE11D, 0, 0, 0 - object_event 6, 97, 0, 6, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, SevenIsland_SeavaultCanyon_TanobyKey_EventScript_1BE11D, 0, 0, 0 - object_event 7, 97, 0, 6, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, SevenIsland_SeavaultCanyon_TanobyKey_EventScript_1BE11D, 0, 0, 0 - -SevenIsland_SeavaultCanyon_TanobyKey_MapWarps: - warp_def 7, 13, 3, 0, 832 - -SevenIsland_SeavaultCanyon_TanobyKey_MapCoordEvents: - coord_event 7, 2, 3, 0, 16385, 99, 0, SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164E39 - coord_event 9, 8, 3, 0, 16391, 99, 0, SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164F0B - coord_event 5, 8, 3, 0, 16390, 99, 0, SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164EE8 - coord_event 9, 6, 3, 0, 16389, 99, 0, SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164EC5 - coord_event 5, 6, 3, 0, 16388, 99, 0, SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164EA2 - coord_event 10, 4, 3, 0, 16387, 99, 0, SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164E7F - coord_event 4, 4, 3, 0, 16386, 99, 0, SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164E5C - -SevenIsland_SeavaultCanyon_TanobyKey_MapEvents:: - map_events SevenIsland_SeavaultCanyon_TanobyKey_EventObjects, SevenIsland_SeavaultCanyon_TanobyKey_MapWarps, SevenIsland_SeavaultCanyon_TanobyKey_MapCoordEvents, 0x0 diff --git a/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/header.inc b/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/header.inc deleted file mode 100644 index dc6bc05ff..000000000 --- a/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SevenIsland_SeavaultCanyon_TanobyKey:: @ 835035C - .4byte SevenIsland_SeavaultCanyon_TanobyKey_Layout @ 0x8347C54 - .4byte SevenIsland_SeavaultCanyon_TanobyKey_MapEvents @ 0x83B48BC - .4byte SevenIsland_SeavaultCanyon_TanobyKey_MapScripts @ 0x8164DCC - .4byte NULL - .2byte BGM_FRLG_TANOBY_RUINS - .2byte 341 - .byte 0xba, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x02 diff --git a/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/map.json b/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/map.json new file mode 100644 index 000000000..ba4e6386b --- /dev/null +++ b/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/map.json @@ -0,0 +1,183 @@ +{ + "id": "MAP_SEVEN_ISLAND_SEAVAULT_CANYON_TANOBY_KEY", + "name": "SevenIsland_SeavaultCanyon_TanobyKey", + "layout": "LAYOUT_SEVEN_ISLAND_SEAVAULT_CANYON_TANOBY_KEY", + "music": "BGM_FRLG_TANOBY_RUINS", + "region_map_section": "MAPSEC_TANOBY_KEY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_2", + "connections": null, + "object_events": [ + { + "graphics_id": "97", + "x": 7, + "y": 6, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_SeavaultCanyon_TanobyKey_EventScript_1BE11D", + "flag": "0" + }, + { + "graphics_id": "97", + "x": 8, + "y": 6, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_SeavaultCanyon_TanobyKey_EventScript_1BE11D", + "flag": "0" + }, + { + "graphics_id": "97", + "x": 8, + "y": 9, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_SeavaultCanyon_TanobyKey_EventScript_1BE11D", + "flag": "0" + }, + { + "graphics_id": "97", + "x": 6, + "y": 10, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_SeavaultCanyon_TanobyKey_EventScript_1BE11D", + "flag": "0" + }, + { + "graphics_id": "97", + "x": 8, + "y": 10, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_SeavaultCanyon_TanobyKey_EventScript_1BE11D", + "flag": "0" + }, + { + "graphics_id": "97", + "x": 6, + "y": 9, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_SeavaultCanyon_TanobyKey_EventScript_1BE11D", + "flag": "0" + }, + { + "graphics_id": "97", + "x": 6, + "y": 6, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_SeavaultCanyon_TanobyKey_EventScript_1BE11D", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 7, + "y": 13, + "elevation": 3, + "dest_map": "MAP_SEVEN_ISLAND_SEVAULT_CANYON", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 7, + "y": 2, + "elevation": 3, + "var": "VAR_0x4001", + "var_value": 99, + "script": "SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164E39" + }, + { + "type": "trigger", + "x": 9, + "y": 8, + "elevation": 3, + "var": "VAR_0x4007", + "var_value": 99, + "script": "SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164F0B" + }, + { + "type": "trigger", + "x": 5, + "y": 8, + "elevation": 3, + "var": "VAR_0x4006", + "var_value": 99, + "script": "SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164EE8" + }, + { + "type": "trigger", + "x": 9, + "y": 6, + "elevation": 3, + "var": "VAR_0x4005", + "var_value": 99, + "script": "SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164EC5" + }, + { + "type": "trigger", + "x": 5, + "y": 6, + "elevation": 3, + "var": "VAR_0x4004", + "var_value": 99, + "script": "SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164EA2" + }, + { + "type": "trigger", + "x": 10, + "y": 4, + "elevation": 3, + "var": "VAR_0x4003", + "var_value": 99, + "script": "SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164E7F" + }, + { + "type": "trigger", + "x": 4, + "y": 4, + "elevation": 3, + "var": "VAR_0x4002", + "var_value": 99, + "script": "SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164E5C" + } + ], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/SevenIsland_SevaultCanyon/connections.inc b/data/maps/SevenIsland_SevaultCanyon/connections.inc deleted file mode 100644 index a721d7165..000000000 --- a/data/maps/SevenIsland_SevaultCanyon/connections.inc +++ /dev/null @@ -1,7 +0,0 @@ -SevenIsland_SevaultCanyon_MapConnectionsList: @ 8352EB8 - connection down, -48, MAP_SEVEN_ISLAND_TANOBYRUINS - connection left, -20, MAP_SEVEN_ISLAND_SEVAULTCANYON_ENTRANCE - -SevenIsland_SevaultCanyon_MapConnections:: @ 8352ED0 - .4byte 2 - .4byte SevenIsland_SevaultCanyon_MapConnectionsList diff --git a/data/maps/SevenIsland_SevaultCanyon/events.inc b/data/maps/SevenIsland_SevaultCanyon/events.inc deleted file mode 100644 index 02dc62ccb..000000000 --- a/data/maps/SevenIsland_SevaultCanyon/events.inc +++ /dev/null @@ -1,32 +0,0 @@ -SevenIsland_SevaultCanyon_EventObjects: - object_event 1, 24, 0, 13, 0, 43, 0, 3, 7, 17, 0, 1, 0, 2, 0, SevenIsland_SevaultCanyon_EventScript_1ACA4D, 0, 0, 0 - object_event 2, 25, 0, 13, 0, 36, 0, 3, 18, 17, 0, 1, 0, 2, 0, SevenIsland_SevaultCanyon_EventScript_1ACA8B, 0, 0, 0 - object_event 3, 39, 0, 3, 0, 35, 0, 3, 21, 17, 0, 1, 0, 3, 0, SevenIsland_SevaultCanyon_EventScript_1ACAC9, 0, 0, 0 - object_event 4, 40, 0, 3, 0, 36, 0, 3, 22, 17, 0, 1, 0, 3, 0, SevenIsland_SevaultCanyon_EventScript_1ACB07, 0, 0, 0 - object_event 5, 41, 0, 7, 0, 56, 0, 3, 2, 17, 0, 1, 0, 1, 0, SevenIsland_SevaultCanyon_EventScript_1ACB45, 0, 0, 0 - object_event 6, 42, 0, 11, 0, 63, 0, 3, 2, 17, 0, 1, 0, 1, 0, SevenIsland_SevaultCanyon_EventScript_1ACB83, 0, 0, 0 - object_event 7, 41, 0, 14, 0, 13, 0, 3, 10, 17, 0, 1, 0, 1, 0, SevenIsland_SevaultCanyon_EventScript_1ACBC1, 0, 0, 0 - object_event 8, 42, 0, 14, 0, 14, 0, 3, 10, 17, 0, 1, 0, 1, 0, SevenIsland_SevaultCanyon_EventScript_1ACC07, 0, 0, 0 - object_event 9, 96, 0, 3, 0, 41, 0, 3, 1, 17, 0, 0, 0, 0, 0, SevenIsland_SevaultCanyon_EventScript_1BE00C, 18, 0, 0 - object_event 10, 97, 0, 13, 0, 47, 0, 3, 1, 0, 0, 0, 0, 0, 0, SevenIsland_SevaultCanyon_EventScript_1BE11D, 0, 0, 0 - object_event 11, 96, 0, 7, 0, 44, 0, 3, 1, 17, 0, 0, 0, 0, 0, SevenIsland_SevaultCanyon_EventScript_1BE00C, 19, 0, 0 - object_event 12, 96, 0, 12, 0, 47, 0, 3, 1, 17, 0, 0, 0, 0, 0, SevenIsland_SevaultCanyon_EventScript_1BE00C, 21, 0, 0 - object_event 13, 96, 0, 15, 0, 46, 0, 3, 1, 17, 0, 0, 0, 0, 0, SevenIsland_SevaultCanyon_EventScript_1BE00C, 22, 0, 0 - object_event 14, 96, 0, 16, 0, 47, 0, 3, 1, 17, 0, 0, 0, 0, 0, SevenIsland_SevaultCanyon_EventScript_1BE00C, 23, 0, 0 - object_event 15, 97, 0, 17, 0, 47, 0, 3, 1, 0, 0, 0, 0, 0, 0, SevenIsland_SevaultCanyon_EventScript_1BE11D, 0, 0, 0 - object_event 16, 96, 0, 11, 0, 31, 0, 3, 1, 17, 0, 0, 0, 0, 0, SevenIsland_SevaultCanyon_EventScript_1BE00C, 27, 0, 0 - object_event 17, 92, 0, 18, 0, 45, 0, 3, 8, 17, 0, 0, 0, 0, 0, SevenIsland_SevaultCanyon_EventScript_1BECDE, 487, 0, 0 - object_event 18, 92, 0, 7, 0, 38, 0, 3, 8, 17, 0, 0, 0, 0, 0, SevenIsland_SevaultCanyon_EventScript_1BECEB, 488, 0, 0 - object_event 19, 92, 0, 17, 0, 23, 0, 3, 8, 17, 0, 0, 0, 0, 0, SevenIsland_SevaultCanyon_EventScript_1BECF8, 489, 0, 0 - object_event 20, 54, 0, 8, 0, 26, 0, 3, 7, 17, 0, 0, 0, 0, 0, SevenIsland_SevaultCanyon_EventScript_1ACF95, 0, 0, 0 - -SevenIsland_SevaultCanyon_MapWarps: - warp_def 7, 17, 5, 0, 547 - warp_def 14, 61, 0, 0, 10752 - -SevenIsland_SevaultCanyon_MapBGEvents: - bg_event 15, 66, 3, 7, 0, 133, 63, 1 - bg_event 16, 71, 0, 0, 0, SevenIsland_SevaultCanyon_EventScript_168BFE - -SevenIsland_SevaultCanyon_MapEvents:: - map_events SevenIsland_SevaultCanyon_EventObjects, SevenIsland_SevaultCanyon_MapWarps, 0x0, SevenIsland_SevaultCanyon_MapBGEvents diff --git a/data/maps/SevenIsland_SevaultCanyon/header.inc b/data/maps/SevenIsland_SevaultCanyon/header.inc deleted file mode 100644 index 52ca532e5..000000000 --- a/data/maps/SevenIsland_SevaultCanyon/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SevenIsland_SevaultCanyon:: @ 8350D18 - .4byte SevenIsland_SevaultCanyon_Layout @ 0x8333F44 - .4byte SevenIsland_SevaultCanyon_MapEvents @ 0x83B9618 - .4byte SevenIsland_SevaultCanyon_MapScripts @ 0x8168BFD - .4byte SevenIsland_SevaultCanyon_MapConnections @ 0x8352ED0 - .2byte BGM_FRLG_SEVII_ISLANDS - .2byte 256 - .byte 0xa9, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/SevenIsland_SevaultCanyon/map.json b/data/maps/SevenIsland_SevaultCanyon/map.json new file mode 100644 index 000000000..a896d334d --- /dev/null +++ b/data/maps/SevenIsland_SevaultCanyon/map.json @@ -0,0 +1,323 @@ +{ + "id": "MAP_SEVEN_ISLAND_SEVAULT_CANYON", + "name": "SevenIsland_SevaultCanyon", + "layout": "LAYOUT_SEVEN_ISLAND_SEVAULT_CANYON", + "music": "BGM_FRLG_SEVII_ISLANDS", + "region_map_section": "MAPSEC_SEVAULT_CANYON", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_3", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_SEVEN_ISLAND_TANOBY_RUINS", + "offset": -48, + "direction": "down" + }, + { + "map": "MAP_SEVEN_ISLAND_SEVAULT_CANYON_ENTRANCE", + "offset": -20, + "direction": "left" + } + ], + "object_events": [ + { + "graphics_id": "24", + "x": 13, + "y": 43, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "SevenIsland_SevaultCanyon_EventScript_1ACA4D", + "flag": "0" + }, + { + "graphics_id": "25", + "x": 13, + "y": 36, + "elevation": 3, + "movement_type": "18", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "SevenIsland_SevaultCanyon_EventScript_1ACA8B", + "flag": "0" + }, + { + "graphics_id": "39", + "x": 3, + "y": 35, + "elevation": 3, + "movement_type": "21", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "SevenIsland_SevaultCanyon_EventScript_1ACAC9", + "flag": "0" + }, + { + "graphics_id": "40", + "x": 3, + "y": 36, + "elevation": 3, + "movement_type": "22", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "SevenIsland_SevaultCanyon_EventScript_1ACB07", + "flag": "0" + }, + { + "graphics_id": "41", + "x": 7, + "y": 56, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "SevenIsland_SevaultCanyon_EventScript_1ACB45", + "flag": "0" + }, + { + "graphics_id": "42", + "x": 11, + "y": 63, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "SevenIsland_SevaultCanyon_EventScript_1ACB83", + "flag": "0" + }, + { + "graphics_id": "41", + "x": 14, + "y": 13, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "SevenIsland_SevaultCanyon_EventScript_1ACBC1", + "flag": "0" + }, + { + "graphics_id": "42", + "x": 14, + "y": 14, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "SevenIsland_SevaultCanyon_EventScript_1ACC07", + "flag": "0" + }, + { + "graphics_id": "96", + "x": 3, + "y": 41, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_SevaultCanyon_EventScript_1BE00C", + "flag": "18" + }, + { + "graphics_id": "97", + "x": 13, + "y": 47, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_SevaultCanyon_EventScript_1BE11D", + "flag": "0" + }, + { + "graphics_id": "96", + "x": 7, + "y": 44, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_SevaultCanyon_EventScript_1BE00C", + "flag": "19" + }, + { + "graphics_id": "96", + "x": 12, + "y": 47, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_SevaultCanyon_EventScript_1BE00C", + "flag": "21" + }, + { + "graphics_id": "96", + "x": 15, + "y": 46, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_SevaultCanyon_EventScript_1BE00C", + "flag": "22" + }, + { + "graphics_id": "96", + "x": 16, + "y": 47, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_SevaultCanyon_EventScript_1BE00C", + "flag": "23" + }, + { + "graphics_id": "97", + "x": 17, + "y": 47, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_SevaultCanyon_EventScript_1BE11D", + "flag": "0" + }, + { + "graphics_id": "96", + "x": 11, + "y": 31, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_SevaultCanyon_EventScript_1BE00C", + "flag": "27" + }, + { + "graphics_id": "92", + "x": 18, + "y": 45, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_SevaultCanyon_EventScript_1BECDE", + "flag": "487" + }, + { + "graphics_id": "92", + "x": 7, + "y": 38, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_SevaultCanyon_EventScript_1BECEB", + "flag": "488" + }, + { + "graphics_id": "92", + "x": 17, + "y": 23, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_SevaultCanyon_EventScript_1BECF8", + "flag": "489" + }, + { + "graphics_id": "54", + "x": 8, + "y": 26, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_SevaultCanyon_EventScript_1ACF95", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 7, + "y": 17, + "elevation": 5, + "dest_map": "MAP_SEVEN_ISLAND_SEAVAULT_CANYON_TANOBY_KEY", + "dest_warp_id": 0 + }, + { + "x": 14, + "y": 61, + "elevation": 0, + "dest_map": "MAP_SEVEN_ISLAND_SEVAULT_CANYON_HOUSE", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "hidden_item", + "x": 15, + "y": 66, + "elevation": 3, + "item": "ITEM_CHERI_BERRY", + "flag": "63", + "unknown": 1 + }, + { + "type": "bg_event_type_0", + "x": 16, + "y": 71, + "elevation": 0, + "script": "SevenIsland_SevaultCanyon_EventScript_168BFE" + } + ] +}
\ No newline at end of file diff --git a/data/maps/SevenIsland_SevaultCanyon_Entrance/connections.inc b/data/maps/SevenIsland_SevaultCanyon_Entrance/connections.inc deleted file mode 100644 index f2f113fcd..000000000 --- a/data/maps/SevenIsland_SevaultCanyon_Entrance/connections.inc +++ /dev/null @@ -1,7 +0,0 @@ -SevenIsland_SevaultCanyon_Entrance_MapConnectionsList: @ 8352E98 - connection up, 0, MAP_SEVEN_ISLAND - connection right, 20, MAP_SEVEN_ISLAND_SEVAULTCANYON - -SevenIsland_SevaultCanyon_Entrance_MapConnections:: @ 8352EB0 - .4byte 2 - .4byte SevenIsland_SevaultCanyon_Entrance_MapConnectionsList diff --git a/data/maps/SevenIsland_SevaultCanyon_Entrance/events.inc b/data/maps/SevenIsland_SevaultCanyon_Entrance/events.inc deleted file mode 100644 index 17c105a28..000000000 --- a/data/maps/SevenIsland_SevaultCanyon_Entrance/events.inc +++ /dev/null @@ -1,15 +0,0 @@ -SevenIsland_SevaultCanyon_Entrance_EventObjects: - object_event 1, 28, 0, 12, 0, 6, 0, 3, 9, 17, 0, 1, 0, 5, 0, SevenIsland_SevaultCanyon_Entrance_EventScript_1AC8C9, 0, 0, 0 - object_event 2, 29, 0, 3, 0, 34, 0, 3, 10, 17, 0, 1, 0, 1, 0, SevenIsland_SevaultCanyon_Entrance_EventScript_1AC907, 0, 0, 0 - object_event 3, 25, 0, 4, 0, 34, 0, 3, 9, 17, 0, 1, 0, 1, 0, SevenIsland_SevaultCanyon_Entrance_EventScript_1AC94D, 0, 0, 0 - object_event 4, 39, 0, 11, 0, 26, 0, 3, 20, 17, 0, 1, 0, 2, 0, SevenIsland_SevaultCanyon_Entrance_EventScript_1AC9D1, 0, 0, 0 - object_event 5, 40, 0, 10, 0, 26, 0, 3, 19, 17, 0, 1, 0, 2, 0, SevenIsland_SevaultCanyon_Entrance_EventScript_1ACA0F, 0, 0, 0 - object_event 6, 26, 0, 11, 0, 17, 0, 5, 23, 17, 0, 1, 0, 1, 0, SevenIsland_SevaultCanyon_Entrance_EventScript_1AC993, 0, 0, 0 - object_event 7, 65321, 0, 7, 0, 254, 255, 1, 0, 0, 0, 17, 0, 3, 0, 0x0, 0, 0, 0 - -SevenIsland_SevaultCanyon_Entrance_MapBGEvents: - bg_event 8, 29, 5, 7, 0, 136, 188, 1 - bg_event 14, 26, 0, 0, 0, SevenIsland_SevaultCanyon_Entrance_EventScript_168BF4 - -SevenIsland_SevaultCanyon_Entrance_MapEvents:: - map_events SevenIsland_SevaultCanyon_Entrance_EventObjects, 0x0, 0x0, SevenIsland_SevaultCanyon_Entrance_MapBGEvents diff --git a/data/maps/SevenIsland_SevaultCanyon_Entrance/header.inc b/data/maps/SevenIsland_SevaultCanyon_Entrance/header.inc deleted file mode 100644 index 5564b0943..000000000 --- a/data/maps/SevenIsland_SevaultCanyon_Entrance/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SevenIsland_SevaultCanyon_Entrance:: @ 8350CFC - .4byte SevenIsland_SevaultCanyon_Entrance_Layout @ 0x8333020 - .4byte SevenIsland_SevaultCanyon_Entrance_MapEvents @ 0x83B93FC - .4byte SevenIsland_SevaultCanyon_Entrance_MapScripts @ 0x8168BF3 - .4byte SevenIsland_SevaultCanyon_Entrance_MapConnections @ 0x8352EB0 - .2byte BGM_FRLG_SEVII_ISLANDS - .2byte 255 - .byte 0xa8, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json b/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json new file mode 100644 index 000000000..4975264fe --- /dev/null +++ b/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json @@ -0,0 +1,139 @@ +{ + "id": "MAP_SEVEN_ISLAND_SEVAULT_CANYON_ENTRANCE", + "name": "SevenIsland_SevaultCanyon_Entrance", + "layout": "LAYOUT_SEVEN_ISLAND_SEVAULT_CANYON_ENTRANCE", + "music": "BGM_FRLG_SEVII_ISLANDS", + "region_map_section": "MAPSEC_CANYON_ENTRANCE", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_3", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_SEVEN_ISLAND", + "offset": 0, + "direction": "up" + }, + { + "map": "MAP_SEVEN_ISLAND_SEVAULT_CANYON", + "offset": 20, + "direction": "right" + } + ], + "object_events": [ + { + "graphics_id": "28", + "x": 12, + "y": 6, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "SevenIsland_SevaultCanyon_Entrance_EventScript_1AC8C9", + "flag": "0" + }, + { + "graphics_id": "29", + "x": 3, + "y": 34, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "SevenIsland_SevaultCanyon_Entrance_EventScript_1AC907", + "flag": "0" + }, + { + "graphics_id": "25", + "x": 4, + "y": 34, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "SevenIsland_SevaultCanyon_Entrance_EventScript_1AC94D", + "flag": "0" + }, + { + "graphics_id": "39", + "x": 11, + "y": 26, + "elevation": 3, + "movement_type": "20", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "SevenIsland_SevaultCanyon_Entrance_EventScript_1AC9D1", + "flag": "0" + }, + { + "graphics_id": "40", + "x": 10, + "y": 26, + "elevation": 3, + "movement_type": "19", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "SevenIsland_SevaultCanyon_Entrance_EventScript_1ACA0F", + "flag": "0" + }, + { + "graphics_id": "26", + "x": 11, + "y": 17, + "elevation": 5, + "movement_type": "23", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "SevenIsland_SevaultCanyon_Entrance_EventScript_1AC993", + "flag": "0" + }, + { + "graphics_id": "65321", + "x": 7, + "y": 65534, + "elevation": 1, + "movement_type": "0", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 17, + "trainer_sight_or_berry_tree_id": 3, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [ + { + "type": "hidden_item", + "x": 8, + "y": 29, + "elevation": 5, + "item": "ITEM_RAWST_BERRY", + "flag": "188", + "unknown": 1 + }, + { + "type": "bg_event_type_0", + "x": 14, + "y": 26, + "elevation": 0, + "script": "SevenIsland_SevaultCanyon_Entrance_EventScript_168BF4" + } + ] +}
\ No newline at end of file diff --git a/data/maps/SevenIsland_SevaultCanyon_House/events.inc b/data/maps/SevenIsland_SevaultCanyon_House/events.inc deleted file mode 100644 index 3cc9f5bfc..000000000 --- a/data/maps/SevenIsland_SevaultCanyon_House/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -SevenIsland_SevaultCanyon_House_EventObjects: - object_event 1, 30, 0, 2, 0, 4, 0, 3, 8, 17, 0, 0, 0, 0, 0, SevenIsland_SevaultCanyon_House_EventScript_172183, 0, 0, 0 - object_event 2, 117, 0, 4, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, SevenIsland_SevaultCanyon_House_EventScript_172242, 0, 0, 0 - object_event 3, 92, 0, 6, 0, 4, 0, 0, 8, 17, 0, 0, 0, 0, 0, SevenIsland_SevaultCanyon_House_EventScript_1BEDFC, 509, 0, 0 - -SevenIsland_SevaultCanyon_House_MapWarps: - warp_def 4, 7, 3, 1, 832 - -SevenIsland_SevaultCanyon_House_MapEvents:: - map_events SevenIsland_SevaultCanyon_House_EventObjects, SevenIsland_SevaultCanyon_House_MapWarps, 0x0, 0x0 diff --git a/data/maps/SevenIsland_SevaultCanyon_House/header.inc b/data/maps/SevenIsland_SevaultCanyon_House/header.inc deleted file mode 100644 index 2adfd6a6e..000000000 --- a/data/maps/SevenIsland_SevaultCanyon_House/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SevenIsland_SevaultCanyon_House:: @ 8351FE8 - .4byte House3_Layout @ 0x82D5CB8 - .4byte SevenIsland_SevaultCanyon_House_MapEvents @ 0x83BF3CC - .4byte SevenIsland_SevaultCanyon_House_MapScripts @ 0x8172182 - .4byte NULL - .2byte BGM_FRLG_ISLAND_SIX - .2byte 11 - .byte 0xa9, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/SevenIsland_SevaultCanyon_House/map.json b/data/maps/SevenIsland_SevaultCanyon_House/map.json new file mode 100644 index 000000000..21f0ae7fe --- /dev/null +++ b/data/maps/SevenIsland_SevaultCanyon_House/map.json @@ -0,0 +1,67 @@ +{ + "id": "MAP_SEVEN_ISLAND_SEVAULT_CANYON_HOUSE", + "name": "SevenIsland_SevaultCanyon_House", + "layout": "LAYOUT_HOUSE3", + "music": "BGM_FRLG_ISLAND_SIX", + "region_map_section": "MAPSEC_SEVAULT_CANYON", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "30", + "x": 2, + "y": 4, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_SevaultCanyon_House_EventScript_172183", + "flag": "0" + }, + { + "graphics_id": "117", + "x": 4, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_SevaultCanyon_House_EventScript_172242", + "flag": "0" + }, + { + "graphics_id": "92", + "x": 6, + "y": 4, + "elevation": 0, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_SevaultCanyon_House_EventScript_1BEDFC", + "flag": "509" + } + ], + "warp_events": [ + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_SEVEN_ISLAND_SEVAULT_CANYON", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/SevenIsland_TanobyRuins/connections.inc b/data/maps/SevenIsland_TanobyRuins/connections.inc deleted file mode 100644 index 988852ae9..000000000 --- a/data/maps/SevenIsland_TanobyRuins/connections.inc +++ /dev/null @@ -1,6 +0,0 @@ -SevenIsland_TanobyRuins_MapConnectionsList: @ 8352ED8 - connection up, 48, MAP_SEVEN_ISLAND_SEVAULTCANYON - -SevenIsland_TanobyRuins_MapConnections:: @ 8352EE4 - .4byte 1 - .4byte SevenIsland_TanobyRuins_MapConnectionsList diff --git a/data/maps/SevenIsland_TanobyRuins/events.inc b/data/maps/SevenIsland_TanobyRuins/events.inc deleted file mode 100644 index 32176aeda..000000000 --- a/data/maps/SevenIsland_TanobyRuins/events.inc +++ /dev/null @@ -1,23 +0,0 @@ -SevenIsland_TanobyRuins_EventObjects: - object_event 1, 56, 0, 35, 0, 7, 0, 3, 2, 17, 0, 1, 0, 1, 0, SevenIsland_TanobyRuins_EventScript_1ACC4D, 0, 0, 0 - object_event 2, 56, 0, 121, 0, 11, 0, 3, 1, 17, 0, 1, 0, 1, 0, SevenIsland_TanobyRuins_EventScript_1ACC8B, 0, 0, 0 - object_event 3, 22, 0, 85, 0, 8, 0, 3, 10, 17, 0, 1, 0, 1, 0, SevenIsland_TanobyRuins_EventScript_1ACCC9, 0, 0, 0 - object_event 4, 61, 0, 85, 0, 5, 0, 3, 2, 17, 0, 1, 0, 1, 0, SevenIsland_TanobyRuins_EventScript_1ACD07, 0, 0, 0 - -SevenIsland_TanobyRuins_MapWarps: - warp_def 120, 10, 3, 0, 539 - warp_def 103, 10, 3, 0, 540 - warp_def 88, 8, 3, 0, 541 - warp_def 44, 11, 3, 0, 542 - warp_def 32, 9, 3, 0, 543 - warp_def 12, 15, 3, 0, 544 - warp_def 11, 6, 3, 0, 545 - -SevenIsland_TanobyRuins_MapBGEvents: - bg_event 33, 10, 3, 7, 0, 111, 65, 1 - bg_event 86, 9, 3, 7, 0, 111, 66, 1 - bg_event 125, 5, 3, 7, 0, 111, 67, 1 - bg_event 8, 2, 3, 7, 0, 111, 64, 1 - -SevenIsland_TanobyRuins_MapEvents:: - map_events SevenIsland_TanobyRuins_EventObjects, SevenIsland_TanobyRuins_MapWarps, 0x0, SevenIsland_TanobyRuins_MapBGEvents diff --git a/data/maps/SevenIsland_TanobyRuins/header.inc b/data/maps/SevenIsland_TanobyRuins/header.inc deleted file mode 100644 index 1af4d7470..000000000 --- a/data/maps/SevenIsland_TanobyRuins/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SevenIsland_TanobyRuins:: @ 8350D34 - .4byte SevenIsland_TanobyRuins_Layout @ 0x83355E8 - .4byte SevenIsland_TanobyRuins_MapEvents @ 0x83B96F4 - .4byte SevenIsland_TanobyRuins_MapScripts @ 0x8168C07 - .4byte SevenIsland_TanobyRuins_MapConnections @ 0x8352EE4 - .2byte BGM_FRLG_SEVII_ISLANDS - .2byte 257 - .byte 0xaa, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/SevenIsland_TanobyRuins/map.json b/data/maps/SevenIsland_TanobyRuins/map.json new file mode 100644 index 000000000..33c2fb842 --- /dev/null +++ b/data/maps/SevenIsland_TanobyRuins/map.json @@ -0,0 +1,165 @@ +{ + "id": "MAP_SEVEN_ISLAND_TANOBY_RUINS", + "name": "SevenIsland_TanobyRuins", + "layout": "LAYOUT_SEVEN_ISLAND_TANOBY_RUINS", + "music": "BGM_FRLG_SEVII_ISLANDS", + "region_map_section": "MAPSEC_TANOBY_RUINS", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_3", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_SEVEN_ISLAND_SEVAULT_CANYON", + "offset": 48, + "direction": "up" + } + ], + "object_events": [ + { + "graphics_id": "56", + "x": 35, + "y": 7, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "SevenIsland_TanobyRuins_EventScript_1ACC4D", + "flag": "0" + }, + { + "graphics_id": "56", + "x": 121, + "y": 11, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "SevenIsland_TanobyRuins_EventScript_1ACC8B", + "flag": "0" + }, + { + "graphics_id": "22", + "x": 85, + "y": 8, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "SevenIsland_TanobyRuins_EventScript_1ACCC9", + "flag": "0" + }, + { + "graphics_id": "61", + "x": 85, + "y": 5, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "SevenIsland_TanobyRuins_EventScript_1ACD07", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 120, + "y": 10, + "elevation": 3, + "dest_map": "MAP_SEVEN_ISLAND_TANOBY_RUINS_MONEAN_CHAMBER", + "dest_warp_id": 0 + }, + { + "x": 103, + "y": 10, + "elevation": 3, + "dest_map": "MAP_SEVEN_ISLAND_TANOBY_RUINS_LIPTOO_CHAMBER", + "dest_warp_id": 0 + }, + { + "x": 88, + "y": 8, + "elevation": 3, + "dest_map": "MAP_SEVEN_ISLAND_TANOBY_RUINS_WEEPTH_CHAMBER", + "dest_warp_id": 0 + }, + { + "x": 44, + "y": 11, + "elevation": 3, + "dest_map": "MAP_SEVEN_ISLAND_TANOBY_RUINS_DILFORD_CHAMBER", + "dest_warp_id": 0 + }, + { + "x": 32, + "y": 9, + "elevation": 3, + "dest_map": "MAP_SEVEN_ISLAND_TANOBY_RUINS_SCUFIB_CHAMBER", + "dest_warp_id": 0 + }, + { + "x": 12, + "y": 15, + "elevation": 3, + "dest_map": "MAP_SEVEN_ISLAND_TANOBY_RUINS_RIXY_CHAMBER", + "dest_warp_id": 0 + }, + { + "x": 11, + "y": 6, + "elevation": 3, + "dest_map": "MAP_SEVEN_ISLAND_TANOBY_RUINS_VIAPOIS_CHAMBER", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "hidden_item", + "x": 33, + "y": 10, + "elevation": 3, + "item": "ITEM_HEART_SCALE", + "flag": "65", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 86, + "y": 9, + "elevation": 3, + "item": "ITEM_HEART_SCALE", + "flag": "66", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 125, + "y": 5, + "elevation": 3, + "item": "ITEM_HEART_SCALE", + "flag": "67", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 8, + "y": 2, + "elevation": 3, + "item": "ITEM_HEART_SCALE", + "flag": "64", + "unknown": 1 + } + ] +}
\ No newline at end of file diff --git a/data/maps/SevenIsland_TanobyRuins_DilfordChamber/events.inc b/data/maps/SevenIsland_TanobyRuins_DilfordChamber/events.inc deleted file mode 100644 index 2d94f2129..000000000 --- a/data/maps/SevenIsland_TanobyRuins_DilfordChamber/events.inc +++ /dev/null @@ -1,5 +0,0 @@ -SevenIsland_TanobyRuins_DilfordChamber_MapWarps: - warp_def 11, 15, 3, 3, 833 - -SevenIsland_TanobyRuins_DilfordChamber_MapEvents:: - map_events 0x0, SevenIsland_TanobyRuins_DilfordChamber_MapWarps, 0x0, 0x0 diff --git a/data/maps/SevenIsland_TanobyRuins_DilfordChamber/header.inc b/data/maps/SevenIsland_TanobyRuins_DilfordChamber/header.inc deleted file mode 100644 index ff5d89664..000000000 --- a/data/maps/SevenIsland_TanobyRuins_DilfordChamber/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SevenIsland_TanobyRuins_DilfordChamber:: @ 83502D0 - .4byte SevenIsland_TanobyRuins_DilfordChamber_Layout @ 0x83470F8 - .4byte SevenIsland_TanobyRuins_DilfordChamber_MapEvents @ 0x83B46EC - .4byte SevenIsland_TanobyRuins_DilfordChamber_MapScripts @ 0x8164CF6 - .4byte NULL - .2byte BGM_FRLG_TANOBY_RUINS - .2byte 338 - .byte 0xbf, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x02 diff --git a/data/maps/SevenIsland_TanobyRuins_DilfordChamber/map.json b/data/maps/SevenIsland_TanobyRuins_DilfordChamber/map.json new file mode 100644 index 000000000..3b00c0be4 --- /dev/null +++ b/data/maps/SevenIsland_TanobyRuins_DilfordChamber/map.json @@ -0,0 +1,27 @@ +{ + "id": "MAP_SEVEN_ISLAND_TANOBY_RUINS_DILFORD_CHAMBER", + "name": "SevenIsland_TanobyRuins_DilfordChamber", + "layout": "LAYOUT_SEVEN_ISLAND_TANOBY_RUINS_DILFORD_CHAMBER", + "music": "BGM_FRLG_TANOBY_RUINS", + "region_map_section": "MAPSEC_DILFORD_CHAMBER", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_2", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 11, + "y": 15, + "elevation": 3, + "dest_map": "MAP_SEVEN_ISLAND_TANOBY_RUINS", + "dest_warp_id": 3 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/SevenIsland_TanobyRuins_LiptooChamber/events.inc b/data/maps/SevenIsland_TanobyRuins_LiptooChamber/events.inc deleted file mode 100644 index 6529a346b..000000000 --- a/data/maps/SevenIsland_TanobyRuins_LiptooChamber/events.inc +++ /dev/null @@ -1,5 +0,0 @@ -SevenIsland_TanobyRuins_LiptooChamber_MapWarps: - warp_def 11, 15, 3, 1, 833 - -SevenIsland_TanobyRuins_LiptooChamber_MapEvents:: - map_events 0x0, SevenIsland_TanobyRuins_LiptooChamber_MapWarps, 0x0, 0x0 diff --git a/data/maps/SevenIsland_TanobyRuins_LiptooChamber/header.inc b/data/maps/SevenIsland_TanobyRuins_LiptooChamber/header.inc deleted file mode 100644 index f25b6c7b4..000000000 --- a/data/maps/SevenIsland_TanobyRuins_LiptooChamber/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SevenIsland_TanobyRuins_LiptooChamber:: @ 8350298 - .4byte SevenIsland_TanobyRuins_LiptooChamber_Layout @ 0x8346A90 - .4byte SevenIsland_TanobyRuins_LiptooChamber_MapEvents @ 0x83B46B4 - .4byte SevenIsland_TanobyRuins_LiptooChamber_MapScripts @ 0x8164CDE - .4byte NULL - .2byte BGM_FRLG_TANOBY_RUINS - .2byte 336 - .byte 0xbd, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x02 diff --git a/data/maps/SevenIsland_TanobyRuins_LiptooChamber/map.json b/data/maps/SevenIsland_TanobyRuins_LiptooChamber/map.json new file mode 100644 index 000000000..9bb534692 --- /dev/null +++ b/data/maps/SevenIsland_TanobyRuins_LiptooChamber/map.json @@ -0,0 +1,27 @@ +{ + "id": "MAP_SEVEN_ISLAND_TANOBY_RUINS_LIPTOO_CHAMBER", + "name": "SevenIsland_TanobyRuins_LiptooChamber", + "layout": "LAYOUT_SEVEN_ISLAND_TANOBY_RUINS_LIPTOO_CHAMBER", + "music": "BGM_FRLG_TANOBY_RUINS", + "region_map_section": "MAPSEC_LIPTOO_CHAMBER", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_2", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 11, + "y": 15, + "elevation": 3, + "dest_map": "MAP_SEVEN_ISLAND_TANOBY_RUINS", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/SevenIsland_TanobyRuins_MoneanChamber/events.inc b/data/maps/SevenIsland_TanobyRuins_MoneanChamber/events.inc deleted file mode 100644 index 938602a70..000000000 --- a/data/maps/SevenIsland_TanobyRuins_MoneanChamber/events.inc +++ /dev/null @@ -1,5 +0,0 @@ -SevenIsland_TanobyRuins_MoneanChamber_MapWarps: - warp_def 11, 15, 3, 0, 833 - -SevenIsland_TanobyRuins_MoneanChamber_MapEvents:: - map_events 0x0, SevenIsland_TanobyRuins_MoneanChamber_MapWarps, 0x0, 0x0 diff --git a/data/maps/SevenIsland_TanobyRuins_MoneanChamber/header.inc b/data/maps/SevenIsland_TanobyRuins_MoneanChamber/header.inc deleted file mode 100644 index b193feafc..000000000 --- a/data/maps/SevenIsland_TanobyRuins_MoneanChamber/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SevenIsland_TanobyRuins_MoneanChamber:: @ 835027C - .4byte SevenIsland_TanobyRuins_MoneanChamber_Layout @ 0x834675C - .4byte SevenIsland_TanobyRuins_MoneanChamber_MapEvents @ 0x83B4698 - .4byte SevenIsland_TanobyRuins_MoneanChamber_MapScripts @ 0x8164CCF - .4byte NULL - .2byte BGM_FRLG_TANOBY_RUINS - .2byte 335 - .byte 0xbc, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x02 diff --git a/data/maps/SevenIsland_TanobyRuins_MoneanChamber/map.json b/data/maps/SevenIsland_TanobyRuins_MoneanChamber/map.json new file mode 100644 index 000000000..706cf4907 --- /dev/null +++ b/data/maps/SevenIsland_TanobyRuins_MoneanChamber/map.json @@ -0,0 +1,27 @@ +{ + "id": "MAP_SEVEN_ISLAND_TANOBY_RUINS_MONEAN_CHAMBER", + "name": "SevenIsland_TanobyRuins_MoneanChamber", + "layout": "LAYOUT_SEVEN_ISLAND_TANOBY_RUINS_MONEAN_CHAMBER", + "music": "BGM_FRLG_TANOBY_RUINS", + "region_map_section": "MAPSEC_MONEAN_CHAMBER", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_2", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 11, + "y": 15, + "elevation": 3, + "dest_map": "MAP_SEVEN_ISLAND_TANOBY_RUINS", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/SevenIsland_TanobyRuins_RixyChamber/events.inc b/data/maps/SevenIsland_TanobyRuins_RixyChamber/events.inc deleted file mode 100644 index 8becb5f72..000000000 --- a/data/maps/SevenIsland_TanobyRuins_RixyChamber/events.inc +++ /dev/null @@ -1,5 +0,0 @@ -SevenIsland_TanobyRuins_RixyChamber_MapWarps: - warp_def 11, 15, 3, 5, 833 - -SevenIsland_TanobyRuins_RixyChamber_MapEvents:: - map_events 0x0, SevenIsland_TanobyRuins_RixyChamber_MapWarps, 0x0, 0x0 diff --git a/data/maps/SevenIsland_TanobyRuins_RixyChamber/header.inc b/data/maps/SevenIsland_TanobyRuins_RixyChamber/header.inc deleted file mode 100644 index 815c894ee..000000000 --- a/data/maps/SevenIsland_TanobyRuins_RixyChamber/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SevenIsland_TanobyRuins_RixyChamber:: @ 8350308 - .4byte SevenIsland_TanobyRuins_RixyChamber_Layout @ 0x8349DC8 - .4byte SevenIsland_TanobyRuins_RixyChamber_MapEvents @ 0x83B4724 - .4byte SevenIsland_TanobyRuins_RixyChamber_MapScripts @ 0x8164D0E - .4byte NULL - .2byte BGM_FRLG_TANOBY_RUINS - .2byte 362 - .byte 0xc1, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x02 diff --git a/data/maps/SevenIsland_TanobyRuins_RixyChamber/map.json b/data/maps/SevenIsland_TanobyRuins_RixyChamber/map.json new file mode 100644 index 000000000..e92f18cba --- /dev/null +++ b/data/maps/SevenIsland_TanobyRuins_RixyChamber/map.json @@ -0,0 +1,27 @@ +{ + "id": "MAP_SEVEN_ISLAND_TANOBY_RUINS_RIXY_CHAMBER", + "name": "SevenIsland_TanobyRuins_RixyChamber", + "layout": "LAYOUT_SEVEN_ISLAND_TANOBY_RUINS_RIXY_CHAMBER", + "music": "BGM_FRLG_TANOBY_RUINS", + "region_map_section": "MAPSEC_RIXY_CHAMBER", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_2", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 11, + "y": 15, + "elevation": 3, + "dest_map": "MAP_SEVEN_ISLAND_TANOBY_RUINS", + "dest_warp_id": 5 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/SevenIsland_TanobyRuins_ScufibChamber/events.inc b/data/maps/SevenIsland_TanobyRuins_ScufibChamber/events.inc deleted file mode 100644 index 6a2c9f679..000000000 --- a/data/maps/SevenIsland_TanobyRuins_ScufibChamber/events.inc +++ /dev/null @@ -1,5 +0,0 @@ -SevenIsland_TanobyRuins_ScufibChamber_MapWarps: - warp_def 11, 15, 3, 4, 833 - -SevenIsland_TanobyRuins_ScufibChamber_MapEvents:: - map_events 0x0, SevenIsland_TanobyRuins_ScufibChamber_MapWarps, 0x0, 0x0 diff --git a/data/maps/SevenIsland_TanobyRuins_ScufibChamber/header.inc b/data/maps/SevenIsland_TanobyRuins_ScufibChamber/header.inc deleted file mode 100644 index 66680e148..000000000 --- a/data/maps/SevenIsland_TanobyRuins_ScufibChamber/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SevenIsland_TanobyRuins_ScufibChamber:: @ 83502EC - .4byte SevenIsland_TanobyRuins_ScufibChamber_Layout @ 0x834742C - .4byte SevenIsland_TanobyRuins_ScufibChamber_MapEvents @ 0x83B4708 - .4byte SevenIsland_TanobyRuins_ScufibChamber_MapScripts @ 0x8164D02 - .4byte NULL - .2byte BGM_FRLG_TANOBY_RUINS - .2byte 339 - .byte 0xc0, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x02 diff --git a/data/maps/SevenIsland_TanobyRuins_ScufibChamber/map.json b/data/maps/SevenIsland_TanobyRuins_ScufibChamber/map.json new file mode 100644 index 000000000..03ca8f69a --- /dev/null +++ b/data/maps/SevenIsland_TanobyRuins_ScufibChamber/map.json @@ -0,0 +1,27 @@ +{ + "id": "MAP_SEVEN_ISLAND_TANOBY_RUINS_SCUFIB_CHAMBER", + "name": "SevenIsland_TanobyRuins_ScufibChamber", + "layout": "LAYOUT_SEVEN_ISLAND_TANOBY_RUINS_SCUFIB_CHAMBER", + "music": "BGM_FRLG_TANOBY_RUINS", + "region_map_section": "MAPSEC_SCUFIB_CHAMBER", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_2", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 11, + "y": 15, + "elevation": 3, + "dest_map": "MAP_SEVEN_ISLAND_TANOBY_RUINS", + "dest_warp_id": 4 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/events.inc b/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/events.inc deleted file mode 100644 index fa4434348..000000000 --- a/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/events.inc +++ /dev/null @@ -1,5 +0,0 @@ -SevenIsland_TanobyRuins_ViapoisChamber_MapWarps: - warp_def 11, 15, 3, 6, 833 - -SevenIsland_TanobyRuins_ViapoisChamber_MapEvents:: - map_events 0x0, SevenIsland_TanobyRuins_ViapoisChamber_MapWarps, 0x0, 0x0 diff --git a/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/header.inc b/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/header.inc deleted file mode 100644 index 1f29dbb8f..000000000 --- a/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SevenIsland_TanobyRuins_ViapoisChamber:: @ 8350324 - .4byte SevenIsland_TanobyRuins_ViapoisChamber_Layout @ 0x834A0FC - .4byte SevenIsland_TanobyRuins_ViapoisChamber_MapEvents @ 0x83B4740 - .4byte SevenIsland_TanobyRuins_ViapoisChamber_MapScripts @ 0x8164D1A - .4byte NULL - .2byte BGM_FRLG_TANOBY_RUINS - .2byte 363 - .byte 0xc2, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x02 diff --git a/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/map.json b/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/map.json new file mode 100644 index 000000000..9f99b7b99 --- /dev/null +++ b/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/map.json @@ -0,0 +1,27 @@ +{ + "id": "MAP_SEVEN_ISLAND_TANOBY_RUINS_VIAPOIS_CHAMBER", + "name": "SevenIsland_TanobyRuins_ViapoisChamber", + "layout": "LAYOUT_SEVEN_ISLAND_TANOBY_RUINS_VIAPOIS_CHAMBER", + "music": "BGM_FRLG_TANOBY_RUINS", + "region_map_section": "MAPSEC_VIAPOIS_CHAMBER", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_2", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 11, + "y": 15, + "elevation": 3, + "dest_map": "MAP_SEVEN_ISLAND_TANOBY_RUINS", + "dest_warp_id": 6 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/SevenIsland_TanobyRuins_WeepthChamber/events.inc b/data/maps/SevenIsland_TanobyRuins_WeepthChamber/events.inc deleted file mode 100644 index 57cea380b..000000000 --- a/data/maps/SevenIsland_TanobyRuins_WeepthChamber/events.inc +++ /dev/null @@ -1,5 +0,0 @@ -SevenIsland_TanobyRuins_WeepthChamber_MapWarps: - warp_def 11, 15, 3, 2, 833 - -SevenIsland_TanobyRuins_WeepthChamber_MapEvents:: - map_events 0x0, SevenIsland_TanobyRuins_WeepthChamber_MapWarps, 0x0, 0x0 diff --git a/data/maps/SevenIsland_TanobyRuins_WeepthChamber/header.inc b/data/maps/SevenIsland_TanobyRuins_WeepthChamber/header.inc deleted file mode 100644 index a6ad1c938..000000000 --- a/data/maps/SevenIsland_TanobyRuins_WeepthChamber/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SevenIsland_TanobyRuins_WeepthChamber:: @ 83502B4 - .4byte SevenIsland_TanobyRuins_WeepthChamber_Layout @ 0x8346DC4 - .4byte SevenIsland_TanobyRuins_WeepthChamber_MapEvents @ 0x83B46D0 - .4byte SevenIsland_TanobyRuins_WeepthChamber_MapScripts @ 0x8164CEA - .4byte NULL - .2byte BGM_FRLG_TANOBY_RUINS - .2byte 337 - .byte 0xbe, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x02 diff --git a/data/maps/SevenIsland_TanobyRuins_WeepthChamber/map.json b/data/maps/SevenIsland_TanobyRuins_WeepthChamber/map.json new file mode 100644 index 000000000..85294ca41 --- /dev/null +++ b/data/maps/SevenIsland_TanobyRuins_WeepthChamber/map.json @@ -0,0 +1,27 @@ +{ + "id": "MAP_SEVEN_ISLAND_TANOBY_RUINS_WEEPTH_CHAMBER", + "name": "SevenIsland_TanobyRuins_WeepthChamber", + "layout": "LAYOUT_SEVEN_ISLAND_TANOBY_RUINS_WEEPTH_CHAMBER", + "music": "BGM_FRLG_TANOBY_RUINS", + "region_map_section": "MAPSEC_WEEPTH_CHAMBER", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_2", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 11, + "y": 15, + "elevation": 3, + "dest_map": "MAP_SEVEN_ISLAND_TANOBY_RUINS", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/SevenIsland_TrainerTower/connections.inc b/data/maps/SevenIsland_TrainerTower/connections.inc deleted file mode 100644 index 4c55ced6e..000000000 --- a/data/maps/SevenIsland_TrainerTower/connections.inc +++ /dev/null @@ -1,6 +0,0 @@ -SevenIsland_TrainerTower_MapConnectionsList: @ 8352E84 - connection down, 48, MAP_SEVEN_ISLAND - -SevenIsland_TrainerTower_MapConnections:: @ 8352E90 - .4byte 1 - .4byte SevenIsland_TrainerTower_MapConnectionsList diff --git a/data/maps/SevenIsland_TrainerTower/events.inc b/data/maps/SevenIsland_TrainerTower/events.inc deleted file mode 100644 index 45aa2f532..000000000 --- a/data/maps/SevenIsland_TrainerTower/events.inc +++ /dev/null @@ -1,16 +0,0 @@ -SevenIsland_TrainerTower_EventObjects: - object_event 1, 19, 0, 56, 0, 26, 0, 3, 7, 17, 0, 1, 0, 1, 0, SevenIsland_TrainerTower_EventScript_1AC84D, 0, 0, 0 - object_event 2, 23, 0, 56, 0, 29, 0, 3, 8, 17, 0, 1, 0, 1, 0, SevenIsland_TrainerTower_EventScript_1AC88B, 0, 0, 0 - -SevenIsland_TrainerTower_MapWarps: - warp_def 58, 7, 3, 1, 522 - -SevenIsland_TrainerTower_MapBGEvents: - bg_event 49, 27, 3, 7, 0, 107, 185, 1 - bg_event 47, 30, 3, 7, 0, 106, 186, 1 - bg_event 59, 32, 3, 7, 0, 150, 187, 1 - bg_event 56, 8, 0, 0, 0, SevenIsland_TrainerTower_EventScript_168BE1 - bg_event 50, 30, 0, 0, 0, SevenIsland_TrainerTower_EventScript_168BEA - -SevenIsland_TrainerTower_MapEvents:: - map_events SevenIsland_TrainerTower_EventObjects, SevenIsland_TrainerTower_MapWarps, 0x0, SevenIsland_TrainerTower_MapBGEvents diff --git a/data/maps/SevenIsland_TrainerTower/header.inc b/data/maps/SevenIsland_TrainerTower/header.inc deleted file mode 100644 index 70ebb690e..000000000 --- a/data/maps/SevenIsland_TrainerTower/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SevenIsland_TrainerTower:: @ 8350CE0 - .4byte SevenIsland_TrainerTower_Layout @ 0x833287C - .4byte SevenIsland_TrainerTower_MapEvents @ 0x83B9328 - .4byte SevenIsland_TrainerTower_MapScripts @ 0x8168BD5 - .4byte SevenIsland_TrainerTower_MapConnections @ 0x8352E90 - .2byte BGM_FRLG_SEVII_ISLANDS - .2byte 254 - .byte 0xa7, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/SevenIsland_TrainerTower/map.json b/data/maps/SevenIsland_TrainerTower/map.json new file mode 100644 index 000000000..3b7aa0b8a --- /dev/null +++ b/data/maps/SevenIsland_TrainerTower/map.json @@ -0,0 +1,102 @@ +{ + "id": "MAP_SEVEN_ISLAND_TRAINER_TOWER", + "name": "SevenIsland_TrainerTower", + "layout": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER", + "music": "BGM_FRLG_SEVII_ISLANDS", + "region_map_section": "MAPSEC_TRAINER_TOWER", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_3", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_SEVEN_ISLAND", + "offset": 48, + "direction": "down" + } + ], + "object_events": [ + { + "graphics_id": "19", + "x": 56, + "y": 26, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "SevenIsland_TrainerTower_EventScript_1AC84D", + "flag": "0" + }, + { + "graphics_id": "23", + "x": 56, + "y": 29, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "SevenIsland_TrainerTower_EventScript_1AC88B", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 58, + "y": 7, + "elevation": 3, + "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_LOBBY", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "hidden_item", + "x": 49, + "y": 27, + "elevation": 3, + "item": "ITEM_BIG_PEARL", + "flag": "185", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 47, + "y": 30, + "elevation": 3, + "item": "ITEM_PEARL", + "flag": "186", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 59, + "y": 32, + "elevation": 3, + "item": "ITEM_NANAB_BERRY", + "flag": "187", + "unknown": 1 + }, + { + "type": "bg_event_type_0", + "x": 56, + "y": 8, + "elevation": 0, + "script": "SevenIsland_TrainerTower_EventScript_168BE1" + }, + { + "type": "bg_event_type_0", + "x": 50, + "y": 30, + "elevation": 0, + "script": "SevenIsland_TrainerTower_EventScript_168BEA" + } + ] +}
\ No newline at end of file diff --git a/data/maps/SevenIsland_TrainerTower_1F/events.inc b/data/maps/SevenIsland_TrainerTower_1F/events.inc deleted file mode 100644 index c46a41bc8..000000000 --- a/data/maps/SevenIsland_TrainerTower_1F/events.inc +++ /dev/null @@ -1,18 +0,0 @@ -SevenIsland_TrainerTower_1F_EventObjects: - object_event 1, 70, 0, 9, 0, 7, 0, 3, 8, 17, 0, 0, 0, 0, 0, 0x0, 6, 0, 0 - object_event 2, 240, 0, 11, 0, 10, 0, 3, 8, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_1F_EventScript_1646C8, 2, 0, 0 - object_event 3, 241, 0, 15, 0, 13, 0, 3, 9, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_1F_EventScript_1646CE, 3, 0, 0 - object_event 4, 242, 0, 10, 0, 16, 0, 3, 7, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_1F_EventScript_1646D4, 4, 0, 0 - object_event 5, 243, 0, 10, 0, 10, 0, 3, 8, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_1F_EventScript_1646DA, 5, 0, 0 - -SevenIsland_TrainerTower_1F_MapWarps: - warp_def 15, 6, 3, 1, 514 - warp_def 4, 6, 3, 0, 522 - -SevenIsland_TrainerTower_1F_MapCoordEvents: - coord_event 10, 13, 3, 0, 16398, 0, 0, SevenIsland_TrainerTower_1F_EventScript_1C54AF - coord_event 9, 12, 0, 0, 16399, 0, 0, SevenIsland_TrainerTower_1F_EventScript_1C54B4 - coord_event 9, 13, 3, 0, 16399, 0, 0, SevenIsland_TrainerTower_1F_EventScript_1C54EA - -SevenIsland_TrainerTower_1F_MapEvents:: - map_events SevenIsland_TrainerTower_1F_EventObjects, SevenIsland_TrainerTower_1F_MapWarps, SevenIsland_TrainerTower_1F_MapCoordEvents, 0x0 diff --git a/data/maps/SevenIsland_TrainerTower_1F/header.inc b/data/maps/SevenIsland_TrainerTower_1F/header.inc deleted file mode 100644 index 5e7e742ab..000000000 --- a/data/maps/SevenIsland_TrainerTower_1F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SevenIsland_TrainerTower_1F:: @ 834FFA4 - .4byte SevenIsland_TrainerTower_1F_Layout @ 0x8341FCC - .4byte SevenIsland_TrainerTower_1F_MapEvents @ 0x83B3C40 - .4byte SevenIsland_TrainerTower_1F_MapScripts @ 0x81646B8 - .4byte NULL - .2byte BGM_FRLG_TRAINER_TOWER - .2byte 298 - .byte 0xb3, 0x00, 0x00, 0x08, 0x00, 0x02, 0x00, 0x00 diff --git a/data/maps/SevenIsland_TrainerTower_1F/map.json b/data/maps/SevenIsland_TrainerTower_1F/map.json new file mode 100644 index 000000000..85be6d070 --- /dev/null +++ b/data/maps/SevenIsland_TrainerTower_1F/map.json @@ -0,0 +1,128 @@ +{ + "id": "MAP_SEVEN_ISLAND_TRAINER_TOWER_1F", + "name": "SevenIsland_TrainerTower_1F", + "layout": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_1F", + "music": "BGM_FRLG_TRAINER_TOWER", + "region_map_section": "MAPSEC_TRAINER_TOWER_2", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 2, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "70", + "x": 9, + "y": 7, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "6" + }, + { + "graphics_id": "240", + "x": 11, + "y": 10, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_TrainerTower_1F_EventScript_1646C8", + "flag": "2" + }, + { + "graphics_id": "241", + "x": 15, + "y": 13, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_TrainerTower_1F_EventScript_1646CE", + "flag": "3" + }, + { + "graphics_id": "242", + "x": 10, + "y": 16, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_TrainerTower_1F_EventScript_1646D4", + "flag": "4" + }, + { + "graphics_id": "243", + "x": 10, + "y": 10, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_TrainerTower_1F_EventScript_1646DA", + "flag": "5" + } + ], + "warp_events": [ + { + "x": 15, + "y": 6, + "elevation": 3, + "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_2F", + "dest_warp_id": 1 + }, + { + "x": 4, + "y": 6, + "elevation": 3, + "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_LOBBY", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 10, + "y": 13, + "elevation": 3, + "var": "VAR_0x400E", + "var_value": 0, + "script": "SevenIsland_TrainerTower_1F_EventScript_1C54AF" + }, + { + "type": "trigger", + "x": 9, + "y": 12, + "elevation": 0, + "var": "VAR_0x400F", + "var_value": 0, + "script": "SevenIsland_TrainerTower_1F_EventScript_1C54B4" + }, + { + "type": "trigger", + "x": 9, + "y": 13, + "elevation": 3, + "var": "VAR_0x400F", + "var_value": 0, + "script": "SevenIsland_TrainerTower_1F_EventScript_1C54EA" + } + ], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/SevenIsland_TrainerTower_2F/events.inc b/data/maps/SevenIsland_TrainerTower_2F/events.inc deleted file mode 100644 index e26da5628..000000000 --- a/data/maps/SevenIsland_TrainerTower_2F/events.inc +++ /dev/null @@ -1,19 +0,0 @@ -SevenIsland_TrainerTower_2F_EventObjects: - object_event 1, 70, 0, 9, 0, 7, 0, 3, 8, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_2F_EventScript_1646E0, 6, 0, 0 - object_event 2, 240, 0, 10, 0, 10, 0, 3, 8, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_2F_EventScript_1646C8, 2, 0, 0 - object_event 3, 241, 0, 15, 0, 13, 0, 3, 9, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_2F_EventScript_1646CE, 3, 0, 0 - object_event 4, 242, 0, 10, 0, 16, 0, 3, 7, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_2F_EventScript_1646D4, 4, 0, 0 - object_event 5, 243, 0, 11, 0, 10, 0, 3, 8, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_2F_EventScript_1646DA, 5, 0, 0 - -SevenIsland_TrainerTower_2F_MapWarps: - warp_def 15, 6, 3, 1, 515 - warp_def 4, 6, 3, 0, 513 - warp_def 13, 5, 0, 0, 523 - -SevenIsland_TrainerTower_2F_MapCoordEvents: - coord_event 10, 13, 3, 0, 16398, 0, 0, SevenIsland_TrainerTower_2F_EventScript_1C54AF - coord_event 9, 12, 3, 0, 16399, 0, 0, SevenIsland_TrainerTower_2F_EventScript_1C54B4 - coord_event 9, 13, 3, 0, 16399, 0, 0, SevenIsland_TrainerTower_2F_EventScript_1C54EA - -SevenIsland_TrainerTower_2F_MapEvents:: - map_events SevenIsland_TrainerTower_2F_EventObjects, SevenIsland_TrainerTower_2F_MapWarps, SevenIsland_TrainerTower_2F_MapCoordEvents, 0x0 diff --git a/data/maps/SevenIsland_TrainerTower_2F/header.inc b/data/maps/SevenIsland_TrainerTower_2F/header.inc deleted file mode 100644 index b5289b39a..000000000 --- a/data/maps/SevenIsland_TrainerTower_2F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SevenIsland_TrainerTower_2F:: @ 834FFC0 - .4byte SevenIsland_TrainerTower_2F_Layout @ 0x8342254 - .4byte SevenIsland_TrainerTower_2F_MapEvents @ 0x83B3D14 - .4byte SevenIsland_TrainerTower_2F_MapScripts @ 0x81646E6 - .4byte NULL - .2byte BGM_FRLG_TRAINER_TOWER - .2byte 299 - .byte 0xb3, 0x00, 0x00, 0x08, 0x00, 0x02, 0x00, 0x00 diff --git a/data/maps/SevenIsland_TrainerTower_2F/map.json b/data/maps/SevenIsland_TrainerTower_2F/map.json new file mode 100644 index 000000000..8df192771 --- /dev/null +++ b/data/maps/SevenIsland_TrainerTower_2F/map.json @@ -0,0 +1,135 @@ +{ + "id": "MAP_SEVEN_ISLAND_TRAINER_TOWER_2F", + "name": "SevenIsland_TrainerTower_2F", + "layout": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_2F", + "music": "BGM_FRLG_TRAINER_TOWER", + "region_map_section": "MAPSEC_TRAINER_TOWER_2", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 2, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "70", + "x": 9, + "y": 7, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_TrainerTower_2F_EventScript_1646E0", + "flag": "6" + }, + { + "graphics_id": "240", + "x": 10, + "y": 10, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_TrainerTower_2F_EventScript_1646C8", + "flag": "2" + }, + { + "graphics_id": "241", + "x": 15, + "y": 13, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_TrainerTower_2F_EventScript_1646CE", + "flag": "3" + }, + { + "graphics_id": "242", + "x": 10, + "y": 16, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_TrainerTower_2F_EventScript_1646D4", + "flag": "4" + }, + { + "graphics_id": "243", + "x": 11, + "y": 10, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_TrainerTower_2F_EventScript_1646DA", + "flag": "5" + } + ], + "warp_events": [ + { + "x": 15, + "y": 6, + "elevation": 3, + "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_3F", + "dest_warp_id": 1 + }, + { + "x": 4, + "y": 6, + "elevation": 3, + "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_1F", + "dest_warp_id": 0 + }, + { + "x": 13, + "y": 5, + "elevation": 0, + "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_ELEVATOR", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 10, + "y": 13, + "elevation": 3, + "var": "VAR_0x400E", + "var_value": 0, + "script": "SevenIsland_TrainerTower_2F_EventScript_1C54AF" + }, + { + "type": "trigger", + "x": 9, + "y": 12, + "elevation": 3, + "var": "VAR_0x400F", + "var_value": 0, + "script": "SevenIsland_TrainerTower_2F_EventScript_1C54B4" + }, + { + "type": "trigger", + "x": 9, + "y": 13, + "elevation": 3, + "var": "VAR_0x400F", + "var_value": 0, + "script": "SevenIsland_TrainerTower_2F_EventScript_1C54EA" + } + ], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/SevenIsland_TrainerTower_3F/events.inc b/data/maps/SevenIsland_TrainerTower_3F/events.inc deleted file mode 100644 index 534660edd..000000000 --- a/data/maps/SevenIsland_TrainerTower_3F/events.inc +++ /dev/null @@ -1,19 +0,0 @@ -SevenIsland_TrainerTower_3F_EventObjects: - object_event 1, 70, 0, 9, 0, 7, 0, 3, 8, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_3F_EventScript_1646E0, 6, 0, 0 - object_event 2, 240, 0, 10, 0, 10, 0, 3, 8, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_3F_EventScript_1646C8, 2, 0, 0 - object_event 3, 241, 0, 15, 0, 13, 0, 3, 9, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_3F_EventScript_1646CE, 3, 0, 0 - object_event 4, 242, 0, 10, 0, 16, 0, 3, 7, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_3F_EventScript_1646D4, 4, 0, 0 - object_event 5, 243, 0, 11, 0, 10, 0, 3, 8, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_3F_EventScript_1646DA, 5, 0, 0 - -SevenIsland_TrainerTower_3F_MapWarps: - warp_def 15, 6, 3, 1, 516 - warp_def 4, 6, 3, 0, 514 - warp_def 13, 5, 0, 0, 523 - -SevenIsland_TrainerTower_3F_MapCoordEvents: - coord_event 10, 13, 3, 0, 16398, 0, 0, SevenIsland_TrainerTower_3F_EventScript_1C54AF - coord_event 9, 12, 3, 0, 16399, 0, 0, SevenIsland_TrainerTower_3F_EventScript_1C54B4 - coord_event 9, 13, 3, 0, 16399, 0, 0, SevenIsland_TrainerTower_3F_EventScript_1C54EA - -SevenIsland_TrainerTower_3F_MapEvents:: - map_events SevenIsland_TrainerTower_3F_EventObjects, SevenIsland_TrainerTower_3F_MapWarps, SevenIsland_TrainerTower_3F_MapCoordEvents, 0x0 diff --git a/data/maps/SevenIsland_TrainerTower_3F/header.inc b/data/maps/SevenIsland_TrainerTower_3F/header.inc deleted file mode 100644 index 022a5c1d1..000000000 --- a/data/maps/SevenIsland_TrainerTower_3F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SevenIsland_TrainerTower_3F:: @ 834FFDC - .4byte SevenIsland_TrainerTower_3F_Layout @ 0x83424DC - .4byte SevenIsland_TrainerTower_3F_MapEvents @ 0x83B3DE8 - .4byte SevenIsland_TrainerTower_3F_MapScripts @ 0x8164714 - .4byte NULL - .2byte BGM_FRLG_TRAINER_TOWER - .2byte 300 - .byte 0xb3, 0x00, 0x00, 0x08, 0x00, 0x02, 0x00, 0x00 diff --git a/data/maps/SevenIsland_TrainerTower_3F/map.json b/data/maps/SevenIsland_TrainerTower_3F/map.json new file mode 100644 index 000000000..4e4b1c06b --- /dev/null +++ b/data/maps/SevenIsland_TrainerTower_3F/map.json @@ -0,0 +1,135 @@ +{ + "id": "MAP_SEVEN_ISLAND_TRAINER_TOWER_3F", + "name": "SevenIsland_TrainerTower_3F", + "layout": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_3F", + "music": "BGM_FRLG_TRAINER_TOWER", + "region_map_section": "MAPSEC_TRAINER_TOWER_2", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 2, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "70", + "x": 9, + "y": 7, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_TrainerTower_3F_EventScript_1646E0", + "flag": "6" + }, + { + "graphics_id": "240", + "x": 10, + "y": 10, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_TrainerTower_3F_EventScript_1646C8", + "flag": "2" + }, + { + "graphics_id": "241", + "x": 15, + "y": 13, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_TrainerTower_3F_EventScript_1646CE", + "flag": "3" + }, + { + "graphics_id": "242", + "x": 10, + "y": 16, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_TrainerTower_3F_EventScript_1646D4", + "flag": "4" + }, + { + "graphics_id": "243", + "x": 11, + "y": 10, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_TrainerTower_3F_EventScript_1646DA", + "flag": "5" + } + ], + "warp_events": [ + { + "x": 15, + "y": 6, + "elevation": 3, + "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_4F", + "dest_warp_id": 1 + }, + { + "x": 4, + "y": 6, + "elevation": 3, + "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_2F", + "dest_warp_id": 0 + }, + { + "x": 13, + "y": 5, + "elevation": 0, + "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_ELEVATOR", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 10, + "y": 13, + "elevation": 3, + "var": "VAR_0x400E", + "var_value": 0, + "script": "SevenIsland_TrainerTower_3F_EventScript_1C54AF" + }, + { + "type": "trigger", + "x": 9, + "y": 12, + "elevation": 3, + "var": "VAR_0x400F", + "var_value": 0, + "script": "SevenIsland_TrainerTower_3F_EventScript_1C54B4" + }, + { + "type": "trigger", + "x": 9, + "y": 13, + "elevation": 3, + "var": "VAR_0x400F", + "var_value": 0, + "script": "SevenIsland_TrainerTower_3F_EventScript_1C54EA" + } + ], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/SevenIsland_TrainerTower_4F/events.inc b/data/maps/SevenIsland_TrainerTower_4F/events.inc deleted file mode 100644 index 90ee6424c..000000000 --- a/data/maps/SevenIsland_TrainerTower_4F/events.inc +++ /dev/null @@ -1,19 +0,0 @@ -SevenIsland_TrainerTower_4F_EventObjects: - object_event 1, 70, 0, 9, 0, 7, 0, 3, 8, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_4F_EventScript_1646E0, 6, 0, 0 - object_event 2, 240, 0, 10, 0, 10, 0, 3, 8, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_4F_EventScript_1646C8, 2, 0, 0 - object_event 3, 241, 0, 15, 0, 13, 0, 3, 9, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_4F_EventScript_1646CE, 3, 0, 0 - object_event 4, 242, 0, 10, 0, 16, 0, 3, 7, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_4F_EventScript_1646D4, 4, 0, 0 - object_event 5, 243, 0, 11, 0, 10, 0, 3, 8, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_4F_EventScript_1646DA, 5, 0, 0 - -SevenIsland_TrainerTower_4F_MapWarps: - warp_def 15, 6, 3, 1, 517 - warp_def 4, 6, 3, 0, 515 - warp_def 13, 5, 0, 0, 523 - -SevenIsland_TrainerTower_4F_MapCoordEvents: - coord_event 10, 13, 3, 0, 16398, 0, 0, SevenIsland_TrainerTower_4F_EventScript_1C54AF - coord_event 9, 12, 3, 0, 16399, 0, 0, SevenIsland_TrainerTower_4F_EventScript_1C54B4 - coord_event 9, 13, 3, 0, 16399, 0, 0, SevenIsland_TrainerTower_4F_EventScript_1C54EA - -SevenIsland_TrainerTower_4F_MapEvents:: - map_events SevenIsland_TrainerTower_4F_EventObjects, SevenIsland_TrainerTower_4F_MapWarps, SevenIsland_TrainerTower_4F_MapCoordEvents, 0x0 diff --git a/data/maps/SevenIsland_TrainerTower_4F/header.inc b/data/maps/SevenIsland_TrainerTower_4F/header.inc deleted file mode 100644 index cdcedee7f..000000000 --- a/data/maps/SevenIsland_TrainerTower_4F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SevenIsland_TrainerTower_4F:: @ 834FFF8 - .4byte SevenIsland_TrainerTower_4F_Layout @ 0x8342764 - .4byte SevenIsland_TrainerTower_4F_MapEvents @ 0x83B3EBC - .4byte SevenIsland_TrainerTower_4F_MapScripts @ 0x8164742 - .4byte NULL - .2byte BGM_FRLG_TRAINER_TOWER - .2byte 301 - .byte 0xb3, 0x00, 0x00, 0x08, 0x00, 0x02, 0x00, 0x00 diff --git a/data/maps/SevenIsland_TrainerTower_4F/map.json b/data/maps/SevenIsland_TrainerTower_4F/map.json new file mode 100644 index 000000000..59aca5b37 --- /dev/null +++ b/data/maps/SevenIsland_TrainerTower_4F/map.json @@ -0,0 +1,135 @@ +{ + "id": "MAP_SEVEN_ISLAND_TRAINER_TOWER_4F", + "name": "SevenIsland_TrainerTower_4F", + "layout": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_4F", + "music": "BGM_FRLG_TRAINER_TOWER", + "region_map_section": "MAPSEC_TRAINER_TOWER_2", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 2, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "70", + "x": 9, + "y": 7, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_TrainerTower_4F_EventScript_1646E0", + "flag": "6" + }, + { + "graphics_id": "240", + "x": 10, + "y": 10, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_TrainerTower_4F_EventScript_1646C8", + "flag": "2" + }, + { + "graphics_id": "241", + "x": 15, + "y": 13, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_TrainerTower_4F_EventScript_1646CE", + "flag": "3" + }, + { + "graphics_id": "242", + "x": 10, + "y": 16, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_TrainerTower_4F_EventScript_1646D4", + "flag": "4" + }, + { + "graphics_id": "243", + "x": 11, + "y": 10, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_TrainerTower_4F_EventScript_1646DA", + "flag": "5" + } + ], + "warp_events": [ + { + "x": 15, + "y": 6, + "elevation": 3, + "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_5F", + "dest_warp_id": 1 + }, + { + "x": 4, + "y": 6, + "elevation": 3, + "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_3F", + "dest_warp_id": 0 + }, + { + "x": 13, + "y": 5, + "elevation": 0, + "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_ELEVATOR", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 10, + "y": 13, + "elevation": 3, + "var": "VAR_0x400E", + "var_value": 0, + "script": "SevenIsland_TrainerTower_4F_EventScript_1C54AF" + }, + { + "type": "trigger", + "x": 9, + "y": 12, + "elevation": 3, + "var": "VAR_0x400F", + "var_value": 0, + "script": "SevenIsland_TrainerTower_4F_EventScript_1C54B4" + }, + { + "type": "trigger", + "x": 9, + "y": 13, + "elevation": 3, + "var": "VAR_0x400F", + "var_value": 0, + "script": "SevenIsland_TrainerTower_4F_EventScript_1C54EA" + } + ], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/SevenIsland_TrainerTower_5F/events.inc b/data/maps/SevenIsland_TrainerTower_5F/events.inc deleted file mode 100644 index 05f34de05..000000000 --- a/data/maps/SevenIsland_TrainerTower_5F/events.inc +++ /dev/null @@ -1,19 +0,0 @@ -SevenIsland_TrainerTower_5F_EventObjects: - object_event 1, 70, 0, 9, 0, 7, 0, 3, 8, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_5F_EventScript_1646E0, 6, 0, 0 - object_event 2, 240, 0, 10, 0, 10, 0, 3, 8, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_5F_EventScript_1646C8, 2, 0, 0 - object_event 3, 241, 0, 15, 0, 13, 0, 3, 9, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_5F_EventScript_1646CE, 3, 0, 0 - object_event 4, 242, 0, 10, 0, 16, 0, 3, 7, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_5F_EventScript_1646D4, 4, 0, 0 - object_event 5, 243, 0, 11, 0, 10, 0, 3, 8, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_5F_EventScript_1646DA, 5, 0, 0 - -SevenIsland_TrainerTower_5F_MapWarps: - warp_def 15, 6, 3, 1, 518 - warp_def 4, 6, 3, 0, 516 - warp_def 13, 5, 0, 0, 523 - -SevenIsland_TrainerTower_5F_MapCoordEvents: - coord_event 10, 13, 3, 0, 16398, 0, 0, SevenIsland_TrainerTower_5F_EventScript_1C54AF - coord_event 9, 12, 3, 0, 16399, 0, 0, SevenIsland_TrainerTower_5F_EventScript_1C54B4 - coord_event 9, 13, 3, 0, 16399, 0, 0, SevenIsland_TrainerTower_5F_EventScript_1C54EA - -SevenIsland_TrainerTower_5F_MapEvents:: - map_events SevenIsland_TrainerTower_5F_EventObjects, SevenIsland_TrainerTower_5F_MapWarps, SevenIsland_TrainerTower_5F_MapCoordEvents, 0x0 diff --git a/data/maps/SevenIsland_TrainerTower_5F/header.inc b/data/maps/SevenIsland_TrainerTower_5F/header.inc deleted file mode 100644 index 0192b30be..000000000 --- a/data/maps/SevenIsland_TrainerTower_5F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SevenIsland_TrainerTower_5F:: @ 8350014 - .4byte SevenIsland_TrainerTower_5F_Layout @ 0x83429EC - .4byte SevenIsland_TrainerTower_5F_MapEvents @ 0x83B3F90 - .4byte SevenIsland_TrainerTower_5F_MapScripts @ 0x8164770 - .4byte NULL - .2byte BGM_FRLG_TRAINER_TOWER - .2byte 302 - .byte 0xb3, 0x00, 0x00, 0x08, 0x00, 0x02, 0x00, 0x00 diff --git a/data/maps/SevenIsland_TrainerTower_5F/map.json b/data/maps/SevenIsland_TrainerTower_5F/map.json new file mode 100644 index 000000000..4e08a33b4 --- /dev/null +++ b/data/maps/SevenIsland_TrainerTower_5F/map.json @@ -0,0 +1,135 @@ +{ + "id": "MAP_SEVEN_ISLAND_TRAINER_TOWER_5F", + "name": "SevenIsland_TrainerTower_5F", + "layout": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_5F", + "music": "BGM_FRLG_TRAINER_TOWER", + "region_map_section": "MAPSEC_TRAINER_TOWER_2", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 2, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "70", + "x": 9, + "y": 7, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_TrainerTower_5F_EventScript_1646E0", + "flag": "6" + }, + { + "graphics_id": "240", + "x": 10, + "y": 10, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_TrainerTower_5F_EventScript_1646C8", + "flag": "2" + }, + { + "graphics_id": "241", + "x": 15, + "y": 13, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_TrainerTower_5F_EventScript_1646CE", + "flag": "3" + }, + { + "graphics_id": "242", + "x": 10, + "y": 16, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_TrainerTower_5F_EventScript_1646D4", + "flag": "4" + }, + { + "graphics_id": "243", + "x": 11, + "y": 10, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_TrainerTower_5F_EventScript_1646DA", + "flag": "5" + } + ], + "warp_events": [ + { + "x": 15, + "y": 6, + "elevation": 3, + "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_6F", + "dest_warp_id": 1 + }, + { + "x": 4, + "y": 6, + "elevation": 3, + "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_4F", + "dest_warp_id": 0 + }, + { + "x": 13, + "y": 5, + "elevation": 0, + "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_ELEVATOR", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 10, + "y": 13, + "elevation": 3, + "var": "VAR_0x400E", + "var_value": 0, + "script": "SevenIsland_TrainerTower_5F_EventScript_1C54AF" + }, + { + "type": "trigger", + "x": 9, + "y": 12, + "elevation": 3, + "var": "VAR_0x400F", + "var_value": 0, + "script": "SevenIsland_TrainerTower_5F_EventScript_1C54B4" + }, + { + "type": "trigger", + "x": 9, + "y": 13, + "elevation": 3, + "var": "VAR_0x400F", + "var_value": 0, + "script": "SevenIsland_TrainerTower_5F_EventScript_1C54EA" + } + ], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/SevenIsland_TrainerTower_6F/events.inc b/data/maps/SevenIsland_TrainerTower_6F/events.inc deleted file mode 100644 index 19d7c16d0..000000000 --- a/data/maps/SevenIsland_TrainerTower_6F/events.inc +++ /dev/null @@ -1,19 +0,0 @@ -SevenIsland_TrainerTower_6F_EventObjects: - object_event 1, 70, 0, 9, 0, 7, 0, 3, 8, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_6F_EventScript_1646E0, 6, 0, 0 - object_event 2, 240, 0, 10, 0, 10, 0, 3, 8, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_6F_EventScript_1646C8, 2, 0, 0 - object_event 3, 241, 0, 15, 0, 13, 0, 3, 9, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_6F_EventScript_1646CE, 3, 0, 0 - object_event 4, 242, 0, 10, 0, 16, 0, 3, 7, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_6F_EventScript_1646D4, 4, 0, 0 - object_event 5, 243, 0, 11, 0, 10, 0, 3, 8, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_6F_EventScript_1646DA, 5, 0, 0 - -SevenIsland_TrainerTower_6F_MapWarps: - warp_def 15, 6, 3, 1, 519 - warp_def 4, 6, 3, 0, 517 - warp_def 13, 5, 0, 0, 523 - -SevenIsland_TrainerTower_6F_MapCoordEvents: - coord_event 10, 13, 3, 0, 16398, 0, 0, SevenIsland_TrainerTower_6F_EventScript_1C54AF - coord_event 9, 12, 3, 0, 16399, 0, 0, SevenIsland_TrainerTower_6F_EventScript_1C54B4 - coord_event 9, 13, 3, 0, 16399, 0, 0, SevenIsland_TrainerTower_6F_EventScript_1C54EA - -SevenIsland_TrainerTower_6F_MapEvents:: - map_events SevenIsland_TrainerTower_6F_EventObjects, SevenIsland_TrainerTower_6F_MapWarps, SevenIsland_TrainerTower_6F_MapCoordEvents, 0x0 diff --git a/data/maps/SevenIsland_TrainerTower_6F/header.inc b/data/maps/SevenIsland_TrainerTower_6F/header.inc deleted file mode 100644 index 3835015a0..000000000 --- a/data/maps/SevenIsland_TrainerTower_6F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SevenIsland_TrainerTower_6F:: @ 8350030 - .4byte SevenIsland_TrainerTower_6F_Layout @ 0x8342C74 - .4byte SevenIsland_TrainerTower_6F_MapEvents @ 0x83B4064 - .4byte SevenIsland_TrainerTower_6F_MapScripts @ 0x816479E - .4byte NULL - .2byte BGM_FRLG_TRAINER_TOWER - .2byte 303 - .byte 0xb3, 0x00, 0x00, 0x08, 0x00, 0x02, 0x00, 0x00 diff --git a/data/maps/SevenIsland_TrainerTower_6F/map.json b/data/maps/SevenIsland_TrainerTower_6F/map.json new file mode 100644 index 000000000..c548fa61a --- /dev/null +++ b/data/maps/SevenIsland_TrainerTower_6F/map.json @@ -0,0 +1,135 @@ +{ + "id": "MAP_SEVEN_ISLAND_TRAINER_TOWER_6F", + "name": "SevenIsland_TrainerTower_6F", + "layout": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_6F", + "music": "BGM_FRLG_TRAINER_TOWER", + "region_map_section": "MAPSEC_TRAINER_TOWER_2", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 2, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "70", + "x": 9, + "y": 7, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_TrainerTower_6F_EventScript_1646E0", + "flag": "6" + }, + { + "graphics_id": "240", + "x": 10, + "y": 10, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_TrainerTower_6F_EventScript_1646C8", + "flag": "2" + }, + { + "graphics_id": "241", + "x": 15, + "y": 13, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_TrainerTower_6F_EventScript_1646CE", + "flag": "3" + }, + { + "graphics_id": "242", + "x": 10, + "y": 16, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_TrainerTower_6F_EventScript_1646D4", + "flag": "4" + }, + { + "graphics_id": "243", + "x": 11, + "y": 10, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_TrainerTower_6F_EventScript_1646DA", + "flag": "5" + } + ], + "warp_events": [ + { + "x": 15, + "y": 6, + "elevation": 3, + "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_7F", + "dest_warp_id": 1 + }, + { + "x": 4, + "y": 6, + "elevation": 3, + "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_5F", + "dest_warp_id": 0 + }, + { + "x": 13, + "y": 5, + "elevation": 0, + "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_ELEVATOR", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 10, + "y": 13, + "elevation": 3, + "var": "VAR_0x400E", + "var_value": 0, + "script": "SevenIsland_TrainerTower_6F_EventScript_1C54AF" + }, + { + "type": "trigger", + "x": 9, + "y": 12, + "elevation": 3, + "var": "VAR_0x400F", + "var_value": 0, + "script": "SevenIsland_TrainerTower_6F_EventScript_1C54B4" + }, + { + "type": "trigger", + "x": 9, + "y": 13, + "elevation": 3, + "var": "VAR_0x400F", + "var_value": 0, + "script": "SevenIsland_TrainerTower_6F_EventScript_1C54EA" + } + ], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/SevenIsland_TrainerTower_7F/events.inc b/data/maps/SevenIsland_TrainerTower_7F/events.inc deleted file mode 100644 index 7a79976e2..000000000 --- a/data/maps/SevenIsland_TrainerTower_7F/events.inc +++ /dev/null @@ -1,19 +0,0 @@ -SevenIsland_TrainerTower_7F_EventObjects: - object_event 1, 70, 0, 9, 0, 7, 0, 3, 8, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_7F_EventScript_1646E0, 6, 0, 0 - object_event 2, 240, 0, 10, 0, 10, 0, 3, 8, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_7F_EventScript_1646C8, 2, 0, 0 - object_event 3, 241, 0, 15, 0, 13, 0, 3, 9, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_7F_EventScript_1646CE, 3, 0, 0 - object_event 4, 242, 0, 10, 0, 16, 0, 3, 7, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_7F_EventScript_1646D4, 4, 0, 0 - object_event 5, 243, 0, 11, 0, 10, 0, 3, 8, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_7F_EventScript_1646DA, 5, 0, 0 - -SevenIsland_TrainerTower_7F_MapWarps: - warp_def 15, 6, 3, 1, 520 - warp_def 4, 6, 3, 0, 518 - warp_def 13, 5, 0, 0, 523 - -SevenIsland_TrainerTower_7F_MapCoordEvents: - coord_event 10, 13, 3, 0, 16398, 0, 0, SevenIsland_TrainerTower_7F_EventScript_1C54AF - coord_event 9, 12, 3, 0, 16399, 0, 0, SevenIsland_TrainerTower_7F_EventScript_1C54B4 - coord_event 9, 13, 3, 0, 16399, 0, 0, SevenIsland_TrainerTower_7F_EventScript_1C54EA - -SevenIsland_TrainerTower_7F_MapEvents:: - map_events SevenIsland_TrainerTower_7F_EventObjects, SevenIsland_TrainerTower_7F_MapWarps, SevenIsland_TrainerTower_7F_MapCoordEvents, 0x0 diff --git a/data/maps/SevenIsland_TrainerTower_7F/header.inc b/data/maps/SevenIsland_TrainerTower_7F/header.inc deleted file mode 100644 index 2c0d405a9..000000000 --- a/data/maps/SevenIsland_TrainerTower_7F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SevenIsland_TrainerTower_7F:: @ 835004C - .4byte SevenIsland_TrainerTower_7F_Layout @ 0x8342EFC - .4byte SevenIsland_TrainerTower_7F_MapEvents @ 0x83B4138 - .4byte SevenIsland_TrainerTower_7F_MapScripts @ 0x81647CC - .4byte NULL - .2byte BGM_FRLG_TRAINER_TOWER - .2byte 304 - .byte 0xb3, 0x00, 0x00, 0x08, 0x00, 0x02, 0x00, 0x00 diff --git a/data/maps/SevenIsland_TrainerTower_7F/map.json b/data/maps/SevenIsland_TrainerTower_7F/map.json new file mode 100644 index 000000000..90eb22605 --- /dev/null +++ b/data/maps/SevenIsland_TrainerTower_7F/map.json @@ -0,0 +1,135 @@ +{ + "id": "MAP_SEVEN_ISLAND_TRAINER_TOWER_7F", + "name": "SevenIsland_TrainerTower_7F", + "layout": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_7F", + "music": "BGM_FRLG_TRAINER_TOWER", + "region_map_section": "MAPSEC_TRAINER_TOWER_2", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 2, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "70", + "x": 9, + "y": 7, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_TrainerTower_7F_EventScript_1646E0", + "flag": "6" + }, + { + "graphics_id": "240", + "x": 10, + "y": 10, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_TrainerTower_7F_EventScript_1646C8", + "flag": "2" + }, + { + "graphics_id": "241", + "x": 15, + "y": 13, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_TrainerTower_7F_EventScript_1646CE", + "flag": "3" + }, + { + "graphics_id": "242", + "x": 10, + "y": 16, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_TrainerTower_7F_EventScript_1646D4", + "flag": "4" + }, + { + "graphics_id": "243", + "x": 11, + "y": 10, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_TrainerTower_7F_EventScript_1646DA", + "flag": "5" + } + ], + "warp_events": [ + { + "x": 15, + "y": 6, + "elevation": 3, + "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_8F", + "dest_warp_id": 1 + }, + { + "x": 4, + "y": 6, + "elevation": 3, + "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_6F", + "dest_warp_id": 0 + }, + { + "x": 13, + "y": 5, + "elevation": 0, + "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_ELEVATOR", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 10, + "y": 13, + "elevation": 3, + "var": "VAR_0x400E", + "var_value": 0, + "script": "SevenIsland_TrainerTower_7F_EventScript_1C54AF" + }, + { + "type": "trigger", + "x": 9, + "y": 12, + "elevation": 3, + "var": "VAR_0x400F", + "var_value": 0, + "script": "SevenIsland_TrainerTower_7F_EventScript_1C54B4" + }, + { + "type": "trigger", + "x": 9, + "y": 13, + "elevation": 3, + "var": "VAR_0x400F", + "var_value": 0, + "script": "SevenIsland_TrainerTower_7F_EventScript_1C54EA" + } + ], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/SevenIsland_TrainerTower_8F/events.inc b/data/maps/SevenIsland_TrainerTower_8F/events.inc deleted file mode 100644 index 954156501..000000000 --- a/data/maps/SevenIsland_TrainerTower_8F/events.inc +++ /dev/null @@ -1,19 +0,0 @@ -SevenIsland_TrainerTower_8F_EventObjects: - object_event 1, 70, 0, 9, 0, 7, 0, 3, 8, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_8F_EventScript_1646E0, 6, 0, 0 - object_event 2, 240, 0, 10, 0, 10, 0, 3, 8, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_8F_EventScript_1646C8, 2, 0, 0 - object_event 3, 241, 0, 15, 0, 13, 0, 3, 9, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_8F_EventScript_1646CE, 3, 0, 0 - object_event 4, 242, 0, 10, 0, 16, 0, 3, 7, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_8F_EventScript_1646D4, 4, 0, 0 - object_event 5, 243, 0, 11, 0, 10, 0, 3, 8, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_8F_EventScript_1646DA, 5, 0, 0 - -SevenIsland_TrainerTower_8F_MapWarps: - warp_def 15, 6, 3, 1, 521 - warp_def 4, 6, 3, 0, 519 - warp_def 13, 5, 0, 0, 523 - -SevenIsland_TrainerTower_8F_MapCoordEvents: - coord_event 10, 13, 3, 0, 16398, 0, 0, SevenIsland_TrainerTower_8F_EventScript_1C54AF - coord_event 9, 12, 3, 0, 16399, 0, 0, SevenIsland_TrainerTower_8F_EventScript_1C54B4 - coord_event 9, 13, 3, 0, 16399, 0, 0, SevenIsland_TrainerTower_8F_EventScript_1C54EA - -SevenIsland_TrainerTower_8F_MapEvents:: - map_events SevenIsland_TrainerTower_8F_EventObjects, SevenIsland_TrainerTower_8F_MapWarps, SevenIsland_TrainerTower_8F_MapCoordEvents, 0x0 diff --git a/data/maps/SevenIsland_TrainerTower_8F/header.inc b/data/maps/SevenIsland_TrainerTower_8F/header.inc deleted file mode 100644 index 31ff1d39b..000000000 --- a/data/maps/SevenIsland_TrainerTower_8F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SevenIsland_TrainerTower_8F:: @ 8350068 - .4byte SevenIsland_TrainerTower_8F_Layout @ 0x8343184 - .4byte SevenIsland_TrainerTower_8F_MapEvents @ 0x83B420C - .4byte SevenIsland_TrainerTower_8F_MapScripts @ 0x81647FA - .4byte NULL - .2byte BGM_FRLG_TRAINER_TOWER - .2byte 305 - .byte 0xb3, 0x00, 0x00, 0x08, 0x00, 0x02, 0x00, 0x00 diff --git a/data/maps/SevenIsland_TrainerTower_8F/map.json b/data/maps/SevenIsland_TrainerTower_8F/map.json new file mode 100644 index 000000000..cac6bbb6c --- /dev/null +++ b/data/maps/SevenIsland_TrainerTower_8F/map.json @@ -0,0 +1,135 @@ +{ + "id": "MAP_SEVEN_ISLAND_TRAINER_TOWER_8F", + "name": "SevenIsland_TrainerTower_8F", + "layout": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_8F", + "music": "BGM_FRLG_TRAINER_TOWER", + "region_map_section": "MAPSEC_TRAINER_TOWER_2", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 2, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "70", + "x": 9, + "y": 7, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_TrainerTower_8F_EventScript_1646E0", + "flag": "6" + }, + { + "graphics_id": "240", + "x": 10, + "y": 10, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_TrainerTower_8F_EventScript_1646C8", + "flag": "2" + }, + { + "graphics_id": "241", + "x": 15, + "y": 13, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_TrainerTower_8F_EventScript_1646CE", + "flag": "3" + }, + { + "graphics_id": "242", + "x": 10, + "y": 16, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_TrainerTower_8F_EventScript_1646D4", + "flag": "4" + }, + { + "graphics_id": "243", + "x": 11, + "y": 10, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_TrainerTower_8F_EventScript_1646DA", + "flag": "5" + } + ], + "warp_events": [ + { + "x": 15, + "y": 6, + "elevation": 3, + "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_ROOF", + "dest_warp_id": 1 + }, + { + "x": 4, + "y": 6, + "elevation": 3, + "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_7F", + "dest_warp_id": 0 + }, + { + "x": 13, + "y": 5, + "elevation": 0, + "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_ELEVATOR", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 10, + "y": 13, + "elevation": 3, + "var": "VAR_0x400E", + "var_value": 0, + "script": "SevenIsland_TrainerTower_8F_EventScript_1C54AF" + }, + { + "type": "trigger", + "x": 9, + "y": 12, + "elevation": 3, + "var": "VAR_0x400F", + "var_value": 0, + "script": "SevenIsland_TrainerTower_8F_EventScript_1C54B4" + }, + { + "type": "trigger", + "x": 9, + "y": 13, + "elevation": 3, + "var": "VAR_0x400F", + "var_value": 0, + "script": "SevenIsland_TrainerTower_8F_EventScript_1C54EA" + } + ], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/SevenIsland_TrainerTower_Elevator/events.inc b/data/maps/SevenIsland_TrainerTower_Elevator/events.inc deleted file mode 100644 index 4bbf2d788..000000000 --- a/data/maps/SevenIsland_TrainerTower_Elevator/events.inc +++ /dev/null @@ -1,8 +0,0 @@ -SevenIsland_TrainerTower_Elevator_MapWarps: - warp_def 2, 5, 3, 127, 32639 - -SevenIsland_TrainerTower_Elevator_MapBGEvents: - bg_event 0, 2, 0, 0, 0, SevenIsland_TrainerTower_Elevator_EventScript_164B03 - -SevenIsland_TrainerTower_Elevator_MapEvents:: - map_events 0x0, SevenIsland_TrainerTower_Elevator_MapWarps, 0x0, SevenIsland_TrainerTower_Elevator_MapBGEvents diff --git a/data/maps/SevenIsland_TrainerTower_Elevator/header.inc b/data/maps/SevenIsland_TrainerTower_Elevator/header.inc deleted file mode 100644 index 024a3656b..000000000 --- a/data/maps/SevenIsland_TrainerTower_Elevator/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SevenIsland_TrainerTower_Elevator:: @ 83500BC - .4byte SevenIsland_TrainerTower_Elevator_Layout @ 0x8343454 - .4byte SevenIsland_TrainerTower_Elevator_MapEvents @ 0x83B4330 - .4byte SevenIsland_TrainerTower_Elevator_MapScripts @ 0x8164AF8 - .4byte NULL - .2byte BGM_FRLG_TRAINER_TOWER - .2byte 307 - .byte 0xb3, 0x00, 0x00, 0x08, 0x00, 0x02, 0x00, 0x00 diff --git a/data/maps/SevenIsland_TrainerTower_Elevator/map.json b/data/maps/SevenIsland_TrainerTower_Elevator/map.json new file mode 100644 index 000000000..0525e1da2 --- /dev/null +++ b/data/maps/SevenIsland_TrainerTower_Elevator/map.json @@ -0,0 +1,35 @@ +{ + "id": "MAP_SEVEN_ISLAND_TRAINER_TOWER_ELEVATOR", + "name": "SevenIsland_TrainerTower_Elevator", + "layout": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_ELEVATOR", + "music": "BGM_FRLG_TRAINER_TOWER", + "region_map_section": "MAPSEC_TRAINER_TOWER_2", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 2, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 2, + "y": 5, + "elevation": 3, + "dest_map": "MAP_NONE", + "dest_warp_id": 127 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 0, + "y": 2, + "elevation": 0, + "script": "SevenIsland_TrainerTower_Elevator_EventScript_164B03" + } + ] +}
\ No newline at end of file diff --git a/data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc b/data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc index 725b043e5..b956d3aca 100644 --- a/data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc +++ b/data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc @@ -45,7 +45,7 @@ EventScript_164B5E:: @ 8164B5E EventScript_164B90:: @ 8164B90 setvar VAR_0x8006, 3 - setdynamicwarp MAP_SEVEN_ISLAND_TRAINERTOWER_LOBBY, 255, 17, 8 + setdynamicwarp MAP_SEVEN_ISLAND_TRAINER_TOWER_LOBBY, 255, 17, 8 compare_var_to_value VAR_0x403A, 3 goto_if 1, EventScript_164BD3 call EventScript_164BD8 @@ -54,7 +54,7 @@ EventScript_164B90:: @ 8164B90 delay 25 applymovement 255, Movement_164BE5 waitmovement 0 - warp MAP_SEVEN_ISLAND_TRAINERTOWER_LOBBY, 255, 17, 8 + warp MAP_SEVEN_ISLAND_TRAINER_TOWER_LOBBY, 255, 17, 8 waitstate releaseall end diff --git a/data/maps/SevenIsland_TrainerTower_Lobby/events.inc b/data/maps/SevenIsland_TrainerTower_Lobby/events.inc deleted file mode 100644 index 6a4caa607..000000000 --- a/data/maps/SevenIsland_TrainerTower_Lobby/events.inc +++ /dev/null @@ -1,20 +0,0 @@ -SevenIsland_TrainerTower_Lobby_EventObjects: - object_event 1, 64, 0, 4, 0, 9, 0, 3, 8, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_Lobby_EventScript_16495D, 0, 0, 0 - object_event 2, 66, 0, 14, 0, 9, 0, 3, 8, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_Lobby_EventScript_164992, 0, 0, 0 - object_event 3, 66, 0, 11, 0, 7, 0, 3, 9, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_Lobby_EventScript_164966, 0, 0, 0 - object_event 4, 42, 0, 12, 0, 13, 0, 3, 2, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_Lobby_EventScript_164AE6, 0, 0, 0 - object_event 5, 30, 0, 2, 0, 12, 0, 3, 1, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_Lobby_EventScript_164AEF, 0, 0, 0 - -SevenIsland_TrainerTower_Lobby_MapWarps: - warp_def 9, 2, 3, 1, 513 - warp_def 9, 15, 3, 0, 830 - warp_def 17, 8, 0, 0, 523 - -SevenIsland_TrainerTower_Lobby_MapCoordEvents: - coord_event 9, 7, 3, 0, 16514, 0, 0, SevenIsland_TrainerTower_Lobby_EventScript_1649CE - -SevenIsland_TrainerTower_Lobby_MapBGEvents: - bg_event 8, 10, 0, 1, 0, SevenIsland_TrainerTower_Lobby_EventScript_164AD8 - -SevenIsland_TrainerTower_Lobby_MapEvents:: - map_events SevenIsland_TrainerTower_Lobby_EventObjects, SevenIsland_TrainerTower_Lobby_MapWarps, SevenIsland_TrainerTower_Lobby_MapCoordEvents, SevenIsland_TrainerTower_Lobby_MapBGEvents diff --git a/data/maps/SevenIsland_TrainerTower_Lobby/header.inc b/data/maps/SevenIsland_TrainerTower_Lobby/header.inc deleted file mode 100644 index 243fe1a15..000000000 --- a/data/maps/SevenIsland_TrainerTower_Lobby/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SevenIsland_TrainerTower_Lobby:: @ 83500A0 - .4byte SevenIsland_TrainerTower_Lobby_Layout @ 0x8341D44 - .4byte SevenIsland_TrainerTower_Lobby_MapEvents @ 0x83B4308 - .4byte SevenIsland_TrainerTower_Lobby_MapScripts @ 0x8164839 - .4byte NULL - .2byte BGM_FRLG_TRAINER_TOWER - .2byte 297 - .byte 0xb3, 0x00, 0x00, 0x08, 0x00, 0x02, 0x00, 0x00 diff --git a/data/maps/SevenIsland_TrainerTower_Lobby/map.json b/data/maps/SevenIsland_TrainerTower_Lobby/map.json new file mode 100644 index 000000000..fcda1fb2e --- /dev/null +++ b/data/maps/SevenIsland_TrainerTower_Lobby/map.json @@ -0,0 +1,125 @@ +{ + "id": "MAP_SEVEN_ISLAND_TRAINER_TOWER_LOBBY", + "name": "SevenIsland_TrainerTower_Lobby", + "layout": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_LOBBY", + "music": "BGM_FRLG_TRAINER_TOWER", + "region_map_section": "MAPSEC_TRAINER_TOWER_2", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 2, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "64", + "x": 4, + "y": 9, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_TrainerTower_Lobby_EventScript_16495D", + "flag": "0" + }, + { + "graphics_id": "66", + "x": 14, + "y": 9, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_TrainerTower_Lobby_EventScript_164992", + "flag": "0" + }, + { + "graphics_id": "66", + "x": 11, + "y": 7, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_TrainerTower_Lobby_EventScript_164966", + "flag": "0" + }, + { + "graphics_id": "42", + "x": 12, + "y": 13, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_TrainerTower_Lobby_EventScript_164AE6", + "flag": "0" + }, + { + "graphics_id": "30", + "x": 2, + "y": 12, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_TrainerTower_Lobby_EventScript_164AEF", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 9, + "y": 2, + "elevation": 3, + "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_1F", + "dest_warp_id": 1 + }, + { + "x": 9, + "y": 15, + "elevation": 3, + "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER", + "dest_warp_id": 0 + }, + { + "x": 17, + "y": 8, + "elevation": 0, + "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_ELEVATOR", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 9, + "y": 7, + "elevation": 3, + "var": "VAR_0x4082", + "var_value": 0, + "script": "SevenIsland_TrainerTower_Lobby_EventScript_1649CE" + } + ], + "bg_events": [ + { + "type": "bg_event_type_1", + "x": 8, + "y": 10, + "elevation": 0, + "script": "SevenIsland_TrainerTower_Lobby_EventScript_164AD8" + } + ] +}
\ No newline at end of file diff --git a/data/maps/SevenIsland_TrainerTower_Roof/events.inc b/data/maps/SevenIsland_TrainerTower_Roof/events.inc deleted file mode 100644 index c4453519c..000000000 --- a/data/maps/SevenIsland_TrainerTower_Roof/events.inc +++ /dev/null @@ -1,9 +0,0 @@ -SevenIsland_TrainerTower_Roof_EventObjects: - object_event 1, 70, 0, 9, 0, 7, 0, 3, 8, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_Roof_EventScript_1646E0, 6, 0, 0 - -SevenIsland_TrainerTower_Roof_MapWarps: - warp_def 13, 5, 0, 0, 523 - warp_def 4, 6, 3, 0, 520 - -SevenIsland_TrainerTower_Roof_MapEvents:: - map_events SevenIsland_TrainerTower_Roof_EventObjects, SevenIsland_TrainerTower_Roof_MapWarps, 0x0, 0x0 diff --git a/data/maps/SevenIsland_TrainerTower_Roof/header.inc b/data/maps/SevenIsland_TrainerTower_Roof/header.inc deleted file mode 100644 index da106ecba..000000000 --- a/data/maps/SevenIsland_TrainerTower_Roof/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SevenIsland_TrainerTower_Roof:: @ 8350084 - .4byte SevenIsland_TrainerTower_Roof_Layout @ 0x83433E8 - .4byte SevenIsland_TrainerTower_Roof_MapEvents @ 0x83B4248 - .4byte SevenIsland_TrainerTower_Roof_MapScripts @ 0x8164828 - .4byte NULL - .2byte BGM_FRLG_TRAINER_TOWER - .2byte 306 - .byte 0xb3, 0x00, 0x00, 0x08, 0x00, 0x02, 0x00, 0x00 diff --git a/data/maps/SevenIsland_TrainerTower_Roof/map.json b/data/maps/SevenIsland_TrainerTower_Roof/map.json new file mode 100644 index 000000000..23e94c0be --- /dev/null +++ b/data/maps/SevenIsland_TrainerTower_Roof/map.json @@ -0,0 +1,48 @@ +{ + "id": "MAP_SEVEN_ISLAND_TRAINER_TOWER_ROOF", + "name": "SevenIsland_TrainerTower_Roof", + "layout": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_ROOF", + "music": "BGM_FRLG_TRAINER_TOWER", + "region_map_section": "MAPSEC_TRAINER_TOWER_2", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 2, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "70", + "x": 9, + "y": 7, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_TrainerTower_Roof_EventScript_1646E0", + "flag": "6" + } + ], + "warp_events": [ + { + "x": 13, + "y": 5, + "elevation": 0, + "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_ELEVATOR", + "dest_warp_id": 0 + }, + { + "x": 4, + "y": 6, + "elevation": 3, + "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_8F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/SilphCo_10F/events.inc b/data/maps/SilphCo_10F/events.inc deleted file mode 100644 index fac92e748..000000000 --- a/data/maps/SilphCo_10F/events.inc +++ /dev/null @@ -1,26 +0,0 @@ -SilphCo_10F_EventObjects: - object_event 1, 55, 0, 2, 0, 7, 0, 3, 2, 34, 0, 1, 0, 1, 0, SilphCo_10F_EventScript_161DC0, 83, 0, 0 - object_event 2, 48, 0, 10, 0, 17, 0, 3, 8, 17, 0, 0, 0, 0, 0, SilphCo_10F_EventScript_161D96, 0, 0, 0 - object_event 3, 49, 0, 0, 0, 13, 0, 3, 10, 17, 0, 1, 0, 4, 0, SilphCo_10F_EventScript_161DD7, 83, 0, 0 - object_event 4, 92, 0, 5, 0, 15, 0, 3, 8, 17, 0, 0, 0, 0, 0, SilphCo_10F_EventScript_1BE8F5, 407, 0, 0 - object_event 5, 92, 0, 2, 0, 15, 0, 3, 8, 17, 0, 0, 0, 0, 0, SilphCo_10F_EventScript_1BE902, 408, 0, 0 - object_event 6, 92, 0, 3, 0, 17, 0, 3, 8, 17, 0, 0, 0, 0, 0, SilphCo_10F_EventScript_1BE90F, 409, 0, 0 - -SilphCo_10F_MapWarps: - warp_def 6, 2, 3, 0, 313 - warp_def 10, 14, 3, 3, 306 - warp_def 14, 9, 3, 5, 306 - warp_def 8, 2, 3, 3, 311 - warp_def 14, 17, 3, 4, 306 - warp_def 13, 3, 0, 0, 314 - -SilphCo_10F_MapBGEvents: - bg_event 12, 11, 0, 0, 0, SilphCo_10F_EventScript_1A8AEF - bg_event 13, 11, 0, 0, 0, SilphCo_10F_EventScript_1A8AEF - bg_event 12, 12, 0, 0, 0, SilphCo_10F_EventScript_1A8AEF - bg_event 13, 12, 0, 0, 0, SilphCo_10F_EventScript_1A8AEF - bg_event 9, 9, 0, 7, 0, 63, 143, 1 - bg_event 7, 1, 0, 0, 0, SilphCo_10F_EventScript_161DB7 - -SilphCo_10F_MapEvents:: - map_events SilphCo_10F_EventObjects, SilphCo_10F_MapWarps, 0x0, SilphCo_10F_MapBGEvents diff --git a/data/maps/SilphCo_10F/header.inc b/data/maps/SilphCo_10F/header.inc deleted file mode 100644 index 32d229ed3..000000000 --- a/data/maps/SilphCo_10F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SilphCo_10F:: @ 834F834 - .4byte SilphCo_10F_Layout @ 0x830A0E8 - .4byte SilphCo_10F_MapEvents @ 0x83B0A20 - .4byte SilphCo_10F_MapScripts @ 0x8161D86 - .4byte NULL - .2byte BGM_FRLG_SILPH - .2byte 141 - .byte 0x86, 0x00, 0x00, 0x08, 0x00, 0x07, 0x0a, 0x00 diff --git a/data/maps/SilphCo_10F/map.json b/data/maps/SilphCo_10F/map.json new file mode 100644 index 000000000..d921ece8a --- /dev/null +++ b/data/maps/SilphCo_10F/map.json @@ -0,0 +1,186 @@ +{ + "id": "MAP_SILPH_CO_10F", + "name": "SilphCo_10F", + "layout": "LAYOUT_SILPH_CO_10F", + "music": "BGM_FRLG_SILPH", + "region_map_section": "MAPSEC_SILPH_CO", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 7, + "elevator_flag": 10, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "55", + "x": 2, + "y": 7, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 2, + "movement_range_y": 2, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "SilphCo_10F_EventScript_161DC0", + "flag": "83" + }, + { + "graphics_id": "48", + "x": 10, + "y": 17, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SilphCo_10F_EventScript_161D96", + "flag": "0" + }, + { + "graphics_id": "49", + "x": 0, + "y": 13, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "SilphCo_10F_EventScript_161DD7", + "flag": "83" + }, + { + "graphics_id": "92", + "x": 5, + "y": 15, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SilphCo_10F_EventScript_1BE8F5", + "flag": "407" + }, + { + "graphics_id": "92", + "x": 2, + "y": 15, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SilphCo_10F_EventScript_1BE902", + "flag": "408" + }, + { + "graphics_id": "92", + "x": 3, + "y": 17, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SilphCo_10F_EventScript_1BE90F", + "flag": "409" + } + ], + "warp_events": [ + { + "x": 6, + "y": 2, + "elevation": 3, + "dest_map": "MAP_SILPH_CO_11F", + "dest_warp_id": 0 + }, + { + "x": 10, + "y": 14, + "elevation": 3, + "dest_map": "MAP_SILPH_CO_4F", + "dest_warp_id": 3 + }, + { + "x": 14, + "y": 9, + "elevation": 3, + "dest_map": "MAP_SILPH_CO_4F", + "dest_warp_id": 5 + }, + { + "x": 8, + "y": 2, + "elevation": 3, + "dest_map": "MAP_SILPH_CO_9F", + "dest_warp_id": 3 + }, + { + "x": 14, + "y": 17, + "elevation": 3, + "dest_map": "MAP_SILPH_CO_4F", + "dest_warp_id": 4 + }, + { + "x": 13, + "y": 3, + "elevation": 0, + "dest_map": "MAP_SILPH_CO_ELEVATOR", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 12, + "y": 11, + "elevation": 0, + "script": "SilphCo_10F_EventScript_1A8AEF" + }, + { + "type": "bg_event_type_0", + "x": 13, + "y": 11, + "elevation": 0, + "script": "SilphCo_10F_EventScript_1A8AEF" + }, + { + "type": "bg_event_type_0", + "x": 12, + "y": 12, + "elevation": 0, + "script": "SilphCo_10F_EventScript_1A8AEF" + }, + { + "type": "bg_event_type_0", + "x": 13, + "y": 12, + "elevation": 0, + "script": "SilphCo_10F_EventScript_1A8AEF" + }, + { + "type": "hidden_item", + "x": 9, + "y": 9, + "elevation": 0, + "item": "ITEM_HP_UP", + "flag": "143", + "unknown": 1 + }, + { + "type": "bg_event_type_0", + "x": 7, + "y": 1, + "elevation": 0, + "script": "SilphCo_10F_EventScript_161DB7" + } + ] +}
\ No newline at end of file diff --git a/data/maps/SilphCo_11F/events.inc b/data/maps/SilphCo_11F/events.inc deleted file mode 100644 index 1621f58ec..000000000 --- a/data/maps/SilphCo_11F/events.inc +++ /dev/null @@ -1,27 +0,0 @@ -SilphCo_11F_EventObjects: - object_event 1, 33, 0, 9, 0, 9, 0, 3, 8, 17, 0, 0, 0, 0, 0, SilphCo_11F_EventScript_161DFE, 0, 0, 0 - object_event 2, 48, 0, 11, 0, 9, 0, 3, 8, 17, 0, 0, 0, 0, 0, SilphCo_11F_EventScript_161E7F, 0, 0, 0 - object_event 3, 87, 0, 6, 0, 11, 0, 3, 10, 17, 0, 0, 0, 0, 0, 0x0, 83, 0, 0 - object_event 4, 49, 0, 16, 0, 12, 0, 3, 7, 17, 0, 1, 0, 5, 0, SilphCo_11F_EventScript_161F40, 83, 0, 0 - object_event 5, 92, 0, 16, 0, 18, 0, 3, 8, 17, 0, 0, 0, 0, 0, SilphCo_11F_EventScript_1BEB58, 457, 0, 0 - object_event 6, 49, 0, 2, 0, 19, 0, 3, 7, 17, 0, 1, 0, 5, 0, SilphCo_11F_EventScript_161F57, 83, 0, 0 - -SilphCo_11F_MapWarps: - warp_def 7, 2, 3, 0, 312 - warp_def 2, 5, 3, 1, 309 - warp_def 13, 3, 0, 0, 314 - -SilphCo_11F_MapCoordEvents: - coord_event 5, 15, 3, 0, 16480, 0, 0, SilphCo_11F_EventScript_161E88 - coord_event 6, 15, 3, 0, 16480, 0, 0, SilphCo_11F_EventScript_161E94 - -SilphCo_11F_MapBGEvents: - bg_event 5, 16, 3, 0, 0, SilphCo_11F_EventScript_1A8B09 - bg_event 5, 17, 3, 0, 0, SilphCo_11F_EventScript_1A8B09 - bg_event 6, 16, 3, 0, 0, SilphCo_11F_EventScript_1A8B09 - bg_event 6, 17, 3, 0, 0, SilphCo_11F_EventScript_1A8B09 - bg_event 10, 18, 0, 7, 0, 24, 144, 1 - bg_event 8, 1, 0, 0, 0, SilphCo_11F_EventScript_161F37 - -SilphCo_11F_MapEvents:: - map_events SilphCo_11F_EventObjects, SilphCo_11F_MapWarps, SilphCo_11F_MapCoordEvents, SilphCo_11F_MapBGEvents diff --git a/data/maps/SilphCo_11F/header.inc b/data/maps/SilphCo_11F/header.inc deleted file mode 100644 index d451aa3bf..000000000 --- a/data/maps/SilphCo_11F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SilphCo_11F:: @ 834F850 - .4byte SilphCo_11F_Layout @ 0x830A3B4 - .4byte SilphCo_11F_MapEvents @ 0x83B0B44 - .4byte SilphCo_11F_MapScripts @ 0x8161DEE - .4byte NULL - .2byte BGM_FRLG_SILPH - .2byte 142 - .byte 0x86, 0x00, 0x00, 0x08, 0x00, 0x07, 0x0b, 0x00 diff --git a/data/maps/SilphCo_11F/map.json b/data/maps/SilphCo_11F/map.json new file mode 100644 index 000000000..5f9090f8b --- /dev/null +++ b/data/maps/SilphCo_11F/map.json @@ -0,0 +1,184 @@ +{ + "id": "MAP_SILPH_CO_11F", + "name": "SilphCo_11F", + "layout": "LAYOUT_SILPH_CO_11F", + "music": "BGM_FRLG_SILPH", + "region_map_section": "MAPSEC_SILPH_CO", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 7, + "elevator_flag": 11, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "33", + "x": 9, + "y": 9, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SilphCo_11F_EventScript_161DFE", + "flag": "0" + }, + { + "graphics_id": "48", + "x": 11, + "y": 9, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SilphCo_11F_EventScript_161E7F", + "flag": "0" + }, + { + "graphics_id": "87", + "x": 6, + "y": 11, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "83" + }, + { + "graphics_id": "49", + "x": 16, + "y": 12, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "SilphCo_11F_EventScript_161F40", + "flag": "83" + }, + { + "graphics_id": "92", + "x": 16, + "y": 18, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SilphCo_11F_EventScript_1BEB58", + "flag": "457" + }, + { + "graphics_id": "49", + "x": 2, + "y": 19, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "SilphCo_11F_EventScript_161F57", + "flag": "83" + } + ], + "warp_events": [ + { + "x": 7, + "y": 2, + "elevation": 3, + "dest_map": "MAP_SILPH_CO_10F", + "dest_warp_id": 0 + }, + { + "x": 2, + "y": 5, + "elevation": 3, + "dest_map": "MAP_SILPH_CO_7F", + "dest_warp_id": 1 + }, + { + "x": 13, + "y": 3, + "elevation": 0, + "dest_map": "MAP_SILPH_CO_ELEVATOR", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 5, + "y": 15, + "elevation": 3, + "var": "VAR_0x4060", + "var_value": 0, + "script": "SilphCo_11F_EventScript_161E88" + }, + { + "type": "trigger", + "x": 6, + "y": 15, + "elevation": 3, + "var": "VAR_0x4060", + "var_value": 0, + "script": "SilphCo_11F_EventScript_161E94" + } + ], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 5, + "y": 16, + "elevation": 3, + "script": "SilphCo_11F_EventScript_1A8B09" + }, + { + "type": "bg_event_type_0", + "x": 5, + "y": 17, + "elevation": 3, + "script": "SilphCo_11F_EventScript_1A8B09" + }, + { + "type": "bg_event_type_0", + "x": 6, + "y": 16, + "elevation": 3, + "script": "SilphCo_11F_EventScript_1A8B09" + }, + { + "type": "bg_event_type_0", + "x": 6, + "y": 17, + "elevation": 3, + "script": "SilphCo_11F_EventScript_1A8B09" + }, + { + "type": "hidden_item", + "x": 10, + "y": 18, + "elevation": 0, + "item": "ITEM_REVIVE", + "flag": "144", + "unknown": 1 + }, + { + "type": "bg_event_type_0", + "x": 8, + "y": 1, + "elevation": 0, + "script": "SilphCo_11F_EventScript_161F37" + } + ] +}
\ No newline at end of file diff --git a/data/maps/SilphCo_1F/events.inc b/data/maps/SilphCo_1F/events.inc deleted file mode 100644 index 2b23153f7..000000000 --- a/data/maps/SilphCo_1F/events.inc +++ /dev/null @@ -1,15 +0,0 @@ -SilphCo_1F_EventObjects: - object_event 1, 48, 0, 3, 0, 7, 0, 3, 8, 17, 0, 0, 0, 0, 0, SilphCo_1F_EventScript_16162F, 63, 0, 0 - -SilphCo_1F_MapWarps: - warp_def 7, 21, 0, 0, 778 - warp_def 8, 20, 3, 0, 778 - warp_def 9, 20, 3, 0, 778 - warp_def 31, 2, 3, 3, 304 - warp_def 22, 3, 0, 0, 314 - -SilphCo_1F_MapBGEvents: - bg_event 30, 1, 0, 0, 0, SilphCo_1F_EventScript_161638 - -SilphCo_1F_MapEvents:: - map_events SilphCo_1F_EventObjects, SilphCo_1F_MapWarps, 0x0, SilphCo_1F_MapBGEvents diff --git a/data/maps/SilphCo_1F/header.inc b/data/maps/SilphCo_1F/header.inc deleted file mode 100644 index e1dca1251..000000000 --- a/data/maps/SilphCo_1F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SilphCo_1F:: @ 834F738 - .4byte SilphCo_1F_Layout @ 0x83071EC - .4byte SilphCo_1F_MapEvents @ 0x83AFCE0 - .4byte SilphCo_1F_MapScripts @ 0x8161625 - .4byte NULL - .2byte BGM_FRLG_SILPH - .2byte 132 - .byte 0x86, 0x00, 0x00, 0x08, 0x00, 0x07, 0x01, 0x00 diff --git a/data/maps/SilphCo_1F/map.json b/data/maps/SilphCo_1F/map.json new file mode 100644 index 000000000..5cf3e4082 --- /dev/null +++ b/data/maps/SilphCo_1F/map.json @@ -0,0 +1,77 @@ +{ + "id": "MAP_SILPH_CO_1F", + "name": "SilphCo_1F", + "layout": "LAYOUT_SILPH_CO_1F", + "music": "BGM_FRLG_SILPH", + "region_map_section": "MAPSEC_SILPH_CO", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 7, + "elevator_flag": 1, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "48", + "x": 3, + "y": 7, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SilphCo_1F_EventScript_16162F", + "flag": "63" + } + ], + "warp_events": [ + { + "x": 7, + "y": 21, + "elevation": 0, + "dest_map": "MAP_SAFFRON_CITY_DUPLICATE", + "dest_warp_id": 0 + }, + { + "x": 8, + "y": 20, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY_DUPLICATE", + "dest_warp_id": 0 + }, + { + "x": 9, + "y": 20, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY_DUPLICATE", + "dest_warp_id": 0 + }, + { + "x": 31, + "y": 2, + "elevation": 3, + "dest_map": "MAP_SILPH_CO_2F", + "dest_warp_id": 3 + }, + { + "x": 22, + "y": 3, + "elevation": 0, + "dest_map": "MAP_SILPH_CO_ELEVATOR", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 30, + "y": 1, + "elevation": 0, + "script": "SilphCo_1F_EventScript_161638" + } + ] +}
\ No newline at end of file diff --git a/data/maps/SilphCo_2F/events.inc b/data/maps/SilphCo_2F/events.inc deleted file mode 100644 index 166629955..000000000 --- a/data/maps/SilphCo_2F/events.inc +++ /dev/null @@ -1,30 +0,0 @@ -SilphCo_2F_EventObjects: - object_event 1, 49, 0, 29, 0, 12, 0, 3, 7, 17, 0, 1, 0, 5, 0, SilphCo_2F_EventScript_1616AE, 83, 0, 0 - object_event 2, 55, 0, 28, 0, 18, 0, 3, 15, 17, 0, 1, 0, 4, 0, SilphCo_2F_EventScript_161680, 83, 0, 0 - object_event 3, 49, 0, 20, 0, 14, 0, 3, 13, 17, 0, 1, 0, 3, 0, SilphCo_2F_EventScript_161697, 83, 0, 0 - object_event 4, 55, 0, 5, 0, 19, 0, 3, 1, 17, 0, 1, 0, 0, 0, SilphCo_2F_EventScript_161669, 83, 0, 0 - object_event 5, 28, 0, 10, 0, 4, 0, 0, 7, 17, 0, 0, 0, 0, 0, SilphCo_2F_EventScript_16165A, 0, 0, 0 - -SilphCo_2F_MapWarps: - warp_def 28, 2, 3, 0, 305 - warp_def 2, 6, 3, 8, 305 - warp_def 15, 6, 3, 5, 310 - warp_def 30, 2, 3, 3, 303 - warp_def 7, 19, 3, 1, 308 - warp_def 33, 19, 3, 2, 310 - warp_def 22, 3, 0, 0, 314 - -SilphCo_2F_MapBGEvents: - bg_event 5, 8, 0, 0, 0, SilphCo_2F_EventScript_1A891B - bg_event 6, 8, 0, 0, 0, SilphCo_2F_EventScript_1A891B - bg_event 5, 9, 0, 0, 0, SilphCo_2F_EventScript_1A891B - bg_event 6, 9, 0, 0, 0, SilphCo_2F_EventScript_1A891B - bg_event 5, 15, 0, 0, 0, SilphCo_2F_EventScript_1A8935 - bg_event 6, 15, 0, 0, 0, SilphCo_2F_EventScript_1A8935 - bg_event 5, 16, 0, 0, 0, SilphCo_2F_EventScript_1A8935 - bg_event 6, 16, 0, 0, 0, SilphCo_2F_EventScript_1A8935 - bg_event 11, 21, 0, 7, 0, 2, 135, 1 - bg_event 29, 1, 0, 0, 0, SilphCo_2F_EventScript_161660 - -SilphCo_2F_MapEvents:: - map_events SilphCo_2F_EventObjects, SilphCo_2F_MapWarps, 0x0, SilphCo_2F_MapBGEvents diff --git a/data/maps/SilphCo_2F/header.inc b/data/maps/SilphCo_2F/header.inc deleted file mode 100644 index 17274ac84..000000000 --- a/data/maps/SilphCo_2F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SilphCo_2F:: @ 834F754 - .4byte SilphCo_2F_Layout @ 0x8307840 - .4byte SilphCo_2F_MapEvents @ 0x83AFE1C - .4byte SilphCo_2F_MapScripts @ 0x8161641 - .4byte NULL - .2byte BGM_FRLG_SILPH - .2byte 133 - .byte 0x86, 0x00, 0x00, 0x08, 0x00, 0x07, 0x02, 0x00 diff --git a/data/maps/SilphCo_2F/map.json b/data/maps/SilphCo_2F/map.json new file mode 100644 index 000000000..5e1d73414 --- /dev/null +++ b/data/maps/SilphCo_2F/map.json @@ -0,0 +1,208 @@ +{ + "id": "MAP_SILPH_CO_2F", + "name": "SilphCo_2F", + "layout": "LAYOUT_SILPH_CO_2F", + "music": "BGM_FRLG_SILPH", + "region_map_section": "MAPSEC_SILPH_CO", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 7, + "elevator_flag": 2, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "49", + "x": 29, + "y": 12, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "SilphCo_2F_EventScript_1616AE", + "flag": "83" + }, + { + "graphics_id": "55", + "x": 28, + "y": 18, + "elevation": 3, + "movement_type": "15", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "SilphCo_2F_EventScript_161680", + "flag": "83" + }, + { + "graphics_id": "49", + "x": 20, + "y": 14, + "elevation": 3, + "movement_type": "13", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "SilphCo_2F_EventScript_161697", + "flag": "83" + }, + { + "graphics_id": "55", + "x": 5, + "y": 19, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 0, + "script": "SilphCo_2F_EventScript_161669", + "flag": "83" + }, + { + "graphics_id": "28", + "x": 10, + "y": 4, + "elevation": 0, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SilphCo_2F_EventScript_16165A", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 28, + "y": 2, + "elevation": 3, + "dest_map": "MAP_SILPH_CO_3F", + "dest_warp_id": 0 + }, + { + "x": 2, + "y": 6, + "elevation": 3, + "dest_map": "MAP_SILPH_CO_3F", + "dest_warp_id": 8 + }, + { + "x": 15, + "y": 6, + "elevation": 3, + "dest_map": "MAP_SILPH_CO_8F", + "dest_warp_id": 5 + }, + { + "x": 30, + "y": 2, + "elevation": 3, + "dest_map": "MAP_SILPH_CO_1F", + "dest_warp_id": 3 + }, + { + "x": 7, + "y": 19, + "elevation": 3, + "dest_map": "MAP_SILPH_CO_6F", + "dest_warp_id": 1 + }, + { + "x": 33, + "y": 19, + "elevation": 3, + "dest_map": "MAP_SILPH_CO_8F", + "dest_warp_id": 2 + }, + { + "x": 22, + "y": 3, + "elevation": 0, + "dest_map": "MAP_SILPH_CO_ELEVATOR", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 5, + "y": 8, + "elevation": 0, + "script": "SilphCo_2F_EventScript_1A891B" + }, + { + "type": "bg_event_type_0", + "x": 6, + "y": 8, + "elevation": 0, + "script": "SilphCo_2F_EventScript_1A891B" + }, + { + "type": "bg_event_type_0", + "x": 5, + "y": 9, + "elevation": 0, + "script": "SilphCo_2F_EventScript_1A891B" + }, + { + "type": "bg_event_type_0", + "x": 6, + "y": 9, + "elevation": 0, + "script": "SilphCo_2F_EventScript_1A891B" + }, + { + "type": "bg_event_type_0", + "x": 5, + "y": 15, + "elevation": 0, + "script": "SilphCo_2F_EventScript_1A8935" + }, + { + "type": "bg_event_type_0", + "x": 6, + "y": 15, + "elevation": 0, + "script": "SilphCo_2F_EventScript_1A8935" + }, + { + "type": "bg_event_type_0", + "x": 5, + "y": 16, + "elevation": 0, + "script": "SilphCo_2F_EventScript_1A8935" + }, + { + "type": "bg_event_type_0", + "x": 6, + "y": 16, + "elevation": 0, + "script": "SilphCo_2F_EventScript_1A8935" + }, + { + "type": "hidden_item", + "x": 11, + "y": 21, + "elevation": 0, + "item": "POCKET_KEY_ITEMS", + "flag": "135", + "unknown": 1 + }, + { + "type": "bg_event_type_0", + "x": 29, + "y": 1, + "elevation": 0, + "script": "SilphCo_2F_EventScript_161660" + } + ] +}
\ No newline at end of file diff --git a/data/maps/SilphCo_3F/events.inc b/data/maps/SilphCo_3F/events.inc deleted file mode 100644 index 7db296662..000000000 --- a/data/maps/SilphCo_3F/events.inc +++ /dev/null @@ -1,32 +0,0 @@ -SilphCo_3F_EventObjects: - object_event 1, 49, 0, 25, 0, 9, 0, 3, 9, 17, 0, 1, 0, 3, 0, SilphCo_3F_EventScript_16171F, 83, 0, 0 - object_event 2, 47, 0, 31, 0, 13, 0, 3, 1, 17, 0, 0, 0, 0, 0, SilphCo_3F_EventScript_1616DE, 0, 0, 0 - object_event 3, 55, 0, 4, 0, 12, 0, 3, 1, 17, 0, 1, 0, 0, 0, SilphCo_3F_EventScript_161708, 83, 0, 0 - object_event 4, 92, 0, 8, 0, 10, 0, 3, 8, 17, 0, 0, 0, 0, 0, SilphCo_3F_EventScript_1BE866, 396, 0, 0 - -SilphCo_3F_MapWarps: - warp_def 28, 2, 3, 0, 304 - warp_def 4, 6, 3, 1, 307 - warp_def 13, 14, 3, 4, 309 - warp_def 30, 2, 3, 2, 306 - warp_def 2, 14, 3, 2, 311 - warp_def 3, 20, 3, 4, 307 - warp_def 29, 14, 3, 7, 305 - warp_def 32, 20, 3, 6, 305 - warp_def 33, 5, 3, 1, 304 - warp_def 22, 3, 0, 0, 314 - -SilphCo_3F_MapBGEvents: - bg_event 10, 12, 3, 0, 0, SilphCo_3F_EventScript_1A894F - bg_event 10, 13, 3, 0, 0, SilphCo_3F_EventScript_1A894F - bg_event 21, 12, 3, 0, 0, SilphCo_3F_EventScript_1A8969 - bg_event 21, 13, 3, 0, 0, SilphCo_3F_EventScript_1A8969 - bg_event 9, 12, 3, 0, 0, SilphCo_3F_EventScript_1A894F - bg_event 9, 13, 3, 0, 0, SilphCo_3F_EventScript_1A894F - bg_event 20, 12, 3, 0, 0, SilphCo_3F_EventScript_1A8969 - bg_event 20, 13, 3, 0, 0, SilphCo_3F_EventScript_1A8969 - bg_event 34, 18, 0, 7, 0, 64, 136, 1 - bg_event 29, 1, 0, 0, 0, SilphCo_3F_EventScript_1616FF - -SilphCo_3F_MapEvents:: - map_events SilphCo_3F_EventObjects, SilphCo_3F_MapWarps, 0x0, SilphCo_3F_MapBGEvents diff --git a/data/maps/SilphCo_3F/header.inc b/data/maps/SilphCo_3F/header.inc deleted file mode 100644 index 823d84c46..000000000 --- a/data/maps/SilphCo_3F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SilphCo_3F:: @ 834F770 - .4byte SilphCo_3F_Layout @ 0x8307E94 - .4byte SilphCo_3F_MapEvents @ 0x83AFF58 - .4byte SilphCo_3F_MapScripts @ 0x81616C5 - .4byte NULL - .2byte BGM_FRLG_SILPH - .2byte 134 - .byte 0x86, 0x00, 0x00, 0x08, 0x00, 0x07, 0x03, 0x00 diff --git a/data/maps/SilphCo_3F/map.json b/data/maps/SilphCo_3F/map.json new file mode 100644 index 000000000..e1466fec7 --- /dev/null +++ b/data/maps/SilphCo_3F/map.json @@ -0,0 +1,216 @@ +{ + "id": "MAP_SILPH_CO_3F", + "name": "SilphCo_3F", + "layout": "LAYOUT_SILPH_CO_3F", + "music": "BGM_FRLG_SILPH", + "region_map_section": "MAPSEC_SILPH_CO", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 7, + "elevator_flag": 3, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "49", + "x": 25, + "y": 9, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "SilphCo_3F_EventScript_16171F", + "flag": "83" + }, + { + "graphics_id": "47", + "x": 31, + "y": 13, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SilphCo_3F_EventScript_1616DE", + "flag": "0" + }, + { + "graphics_id": "55", + "x": 4, + "y": 12, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 0, + "script": "SilphCo_3F_EventScript_161708", + "flag": "83" + }, + { + "graphics_id": "92", + "x": 8, + "y": 10, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SilphCo_3F_EventScript_1BE866", + "flag": "396" + } + ], + "warp_events": [ + { + "x": 28, + "y": 2, + "elevation": 3, + "dest_map": "MAP_SILPH_CO_2F", + "dest_warp_id": 0 + }, + { + "x": 4, + "y": 6, + "elevation": 3, + "dest_map": "MAP_SILPH_CO_5F", + "dest_warp_id": 1 + }, + { + "x": 13, + "y": 14, + "elevation": 3, + "dest_map": "MAP_SILPH_CO_7F", + "dest_warp_id": 4 + }, + { + "x": 30, + "y": 2, + "elevation": 3, + "dest_map": "MAP_SILPH_CO_4F", + "dest_warp_id": 2 + }, + { + "x": 2, + "y": 14, + "elevation": 3, + "dest_map": "MAP_SILPH_CO_9F", + "dest_warp_id": 2 + }, + { + "x": 3, + "y": 20, + "elevation": 3, + "dest_map": "MAP_SILPH_CO_5F", + "dest_warp_id": 4 + }, + { + "x": 29, + "y": 14, + "elevation": 3, + "dest_map": "MAP_SILPH_CO_3F", + "dest_warp_id": 7 + }, + { + "x": 32, + "y": 20, + "elevation": 3, + "dest_map": "MAP_SILPH_CO_3F", + "dest_warp_id": 6 + }, + { + "x": 33, + "y": 5, + "elevation": 3, + "dest_map": "MAP_SILPH_CO_2F", + "dest_warp_id": 1 + }, + { + "x": 22, + "y": 3, + "elevation": 0, + "dest_map": "MAP_SILPH_CO_ELEVATOR", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 10, + "y": 12, + "elevation": 3, + "script": "SilphCo_3F_EventScript_1A894F" + }, + { + "type": "bg_event_type_0", + "x": 10, + "y": 13, + "elevation": 3, + "script": "SilphCo_3F_EventScript_1A894F" + }, + { + "type": "bg_event_type_0", + "x": 21, + "y": 12, + "elevation": 3, + "script": "SilphCo_3F_EventScript_1A8969" + }, + { + "type": "bg_event_type_0", + "x": 21, + "y": 13, + "elevation": 3, + "script": "SilphCo_3F_EventScript_1A8969" + }, + { + "type": "bg_event_type_0", + "x": 9, + "y": 12, + "elevation": 3, + "script": "SilphCo_3F_EventScript_1A894F" + }, + { + "type": "bg_event_type_0", + "x": 9, + "y": 13, + "elevation": 3, + "script": "SilphCo_3F_EventScript_1A894F" + }, + { + "type": "bg_event_type_0", + "x": 20, + "y": 12, + "elevation": 3, + "script": "SilphCo_3F_EventScript_1A8969" + }, + { + "type": "bg_event_type_0", + "x": 20, + "y": 13, + "elevation": 3, + "script": "SilphCo_3F_EventScript_1A8969" + }, + { + "type": "hidden_item", + "x": 34, + "y": 18, + "elevation": 0, + "item": "ITEM_PROTEIN", + "flag": "136", + "unknown": 1 + }, + { + "type": "bg_event_type_0", + "x": 29, + "y": 1, + "elevation": 0, + "script": "SilphCo_3F_EventScript_1616FF" + } + ] +}
\ No newline at end of file diff --git a/data/maps/SilphCo_4F/events.inc b/data/maps/SilphCo_4F/events.inc deleted file mode 100644 index 175e147b8..000000000 --- a/data/maps/SilphCo_4F/events.inc +++ /dev/null @@ -1,33 +0,0 @@ -SilphCo_4F_EventObjects: - object_event 1, 49, 0, 33, 0, 16, 0, 3, 2, 17, 0, 1, 0, 1, 0, SilphCo_4F_EventScript_1617A7, 83, 0, 0 - object_event 2, 49, 0, 10, 0, 19, 0, 3, 10, 17, 0, 1, 0, 5, 0, SilphCo_4F_EventScript_161790, 83, 0, 0 - object_event 3, 55, 0, 14, 0, 8, 0, 3, 17, 17, 0, 1, 0, 2, 0, SilphCo_4F_EventScript_161779, 83, 0, 0 - object_event 4, 47, 0, 5, 0, 5, 0, 3, 1, 17, 0, 0, 0, 0, 0, SilphCo_4F_EventScript_16174F, 0, 0, 0 - object_event 5, 92, 0, 3, 0, 11, 0, 3, 8, 17, 0, 0, 0, 0, 0, SilphCo_4F_EventScript_1BE873, 397, 0, 0 - object_event 6, 92, 0, 4, 0, 12, 0, 3, 8, 17, 0, 0, 0, 0, 0, SilphCo_4F_EventScript_1BE880, 398, 0, 0 - object_event 7, 92, 0, 2, 0, 13, 0, 3, 8, 17, 0, 0, 0, 0, 0, SilphCo_4F_EventScript_1BE88D, 399, 0, 0 - object_event 8, 92, 0, 30, 0, 18, 0, 0, 8, 17, 0, 0, 0, 0, 0, SilphCo_4F_EventScript_1BEE09, 510, 0, 0 - -SilphCo_4F_MapWarps: - warp_def 28, 2, 3, 0, 307 - warp_def 18, 6, 3, 3, 308 - warp_def 30, 2, 3, 3, 305 - warp_def 12, 9, 3, 1, 312 - warp_def 2, 20, 3, 4, 312 - warp_def 18, 14, 3, 2, 312 - warp_def 22, 3, 0, 0, 314 - -SilphCo_4F_MapBGEvents: - bg_event 3, 16, 0, 0, 0, SilphCo_4F_EventScript_1A8983 - bg_event 4, 16, 0, 0, 0, SilphCo_4F_EventScript_1A8983 - bg_event 3, 17, 0, 0, 0, SilphCo_4F_EventScript_1A8983 - bg_event 4, 17, 0, 0, 0, SilphCo_4F_EventScript_1A8983 - bg_event 15, 11, 0, 0, 0, SilphCo_4F_EventScript_1A899D - bg_event 14, 11, 0, 0, 0, SilphCo_4F_EventScript_1A899D - bg_event 14, 12, 0, 0, 0, SilphCo_4F_EventScript_1A899D - bg_event 15, 12, 0, 0, 0, SilphCo_4F_EventScript_1A899D - bg_event 35, 20, 0, 7, 0, 65, 137, 1 - bg_event 29, 1, 0, 0, 0, SilphCo_4F_EventScript_161770 - -SilphCo_4F_MapEvents:: - map_events SilphCo_4F_EventObjects, SilphCo_4F_MapWarps, 0x0, SilphCo_4F_MapBGEvents diff --git a/data/maps/SilphCo_4F/header.inc b/data/maps/SilphCo_4F/header.inc deleted file mode 100644 index a59872690..000000000 --- a/data/maps/SilphCo_4F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SilphCo_4F:: @ 834F78C - .4byte SilphCo_4F_Layout @ 0x83084E8 - .4byte SilphCo_4F_MapEvents @ 0x83B00DC - .4byte SilphCo_4F_MapScripts @ 0x8161736 - .4byte NULL - .2byte BGM_FRLG_SILPH - .2byte 135 - .byte 0x86, 0x00, 0x00, 0x08, 0x00, 0x07, 0x04, 0x00 diff --git a/data/maps/SilphCo_4F/map.json b/data/maps/SilphCo_4F/map.json new file mode 100644 index 000000000..080c7162a --- /dev/null +++ b/data/maps/SilphCo_4F/map.json @@ -0,0 +1,247 @@ +{ + "id": "MAP_SILPH_CO_4F", + "name": "SilphCo_4F", + "layout": "LAYOUT_SILPH_CO_4F", + "music": "BGM_FRLG_SILPH", + "region_map_section": "MAPSEC_SILPH_CO", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 7, + "elevator_flag": 4, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "49", + "x": 33, + "y": 16, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "SilphCo_4F_EventScript_1617A7", + "flag": "83" + }, + { + "graphics_id": "49", + "x": 10, + "y": 19, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "SilphCo_4F_EventScript_161790", + "flag": "83" + }, + { + "graphics_id": "55", + "x": 14, + "y": 8, + "elevation": 3, + "movement_type": "17", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "SilphCo_4F_EventScript_161779", + "flag": "83" + }, + { + "graphics_id": "47", + "x": 5, + "y": 5, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SilphCo_4F_EventScript_16174F", + "flag": "0" + }, + { + "graphics_id": "92", + "x": 3, + "y": 11, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SilphCo_4F_EventScript_1BE873", + "flag": "397" + }, + { + "graphics_id": "92", + "x": 4, + "y": 12, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SilphCo_4F_EventScript_1BE880", + "flag": "398" + }, + { + "graphics_id": "92", + "x": 2, + "y": 13, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SilphCo_4F_EventScript_1BE88D", + "flag": "399" + }, + { + "graphics_id": "92", + "x": 30, + "y": 18, + "elevation": 0, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SilphCo_4F_EventScript_1BEE09", + "flag": "510" + } + ], + "warp_events": [ + { + "x": 28, + "y": 2, + "elevation": 3, + "dest_map": "MAP_SILPH_CO_5F", + "dest_warp_id": 0 + }, + { + "x": 18, + "y": 6, + "elevation": 3, + "dest_map": "MAP_SILPH_CO_6F", + "dest_warp_id": 3 + }, + { + "x": 30, + "y": 2, + "elevation": 3, + "dest_map": "MAP_SILPH_CO_3F", + "dest_warp_id": 3 + }, + { + "x": 12, + "y": 9, + "elevation": 3, + "dest_map": "MAP_SILPH_CO_10F", + "dest_warp_id": 1 + }, + { + "x": 2, + "y": 20, + "elevation": 3, + "dest_map": "MAP_SILPH_CO_10F", + "dest_warp_id": 4 + }, + { + "x": 18, + "y": 14, + "elevation": 3, + "dest_map": "MAP_SILPH_CO_10F", + "dest_warp_id": 2 + }, + { + "x": 22, + "y": 3, + "elevation": 0, + "dest_map": "MAP_SILPH_CO_ELEVATOR", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 3, + "y": 16, + "elevation": 0, + "script": "SilphCo_4F_EventScript_1A8983" + }, + { + "type": "bg_event_type_0", + "x": 4, + "y": 16, + "elevation": 0, + "script": "SilphCo_4F_EventScript_1A8983" + }, + { + "type": "bg_event_type_0", + "x": 3, + "y": 17, + "elevation": 0, + "script": "SilphCo_4F_EventScript_1A8983" + }, + { + "type": "bg_event_type_0", + "x": 4, + "y": 17, + "elevation": 0, + "script": "SilphCo_4F_EventScript_1A8983" + }, + { + "type": "bg_event_type_0", + "x": 15, + "y": 11, + "elevation": 0, + "script": "SilphCo_4F_EventScript_1A899D" + }, + { + "type": "bg_event_type_0", + "x": 14, + "y": 11, + "elevation": 0, + "script": "SilphCo_4F_EventScript_1A899D" + }, + { + "type": "bg_event_type_0", + "x": 14, + "y": 12, + "elevation": 0, + "script": "SilphCo_4F_EventScript_1A899D" + }, + { + "type": "bg_event_type_0", + "x": 15, + "y": 12, + "elevation": 0, + "script": "SilphCo_4F_EventScript_1A899D" + }, + { + "type": "hidden_item", + "x": 35, + "y": 20, + "elevation": 0, + "item": "ITEM_IRON", + "flag": "137", + "unknown": 1 + }, + { + "type": "bg_event_type_0", + "x": 29, + "y": 1, + "elevation": 0, + "script": "SilphCo_4F_EventScript_161770" + } + ] +}
\ No newline at end of file diff --git a/data/maps/SilphCo_5F/events.inc b/data/maps/SilphCo_5F/events.inc deleted file mode 100644 index 86c9cc92b..000000000 --- a/data/maps/SilphCo_5F/events.inc +++ /dev/null @@ -1,42 +0,0 @@ -SilphCo_5F_EventObjects: - object_event 1, 49, 0, 35, 0, 7, 0, 3, 7, 17, 0, 1, 0, 2, 0, SilphCo_5F_EventScript_161853, 83, 0, 0 - object_event 2, 26, 0, 23, 0, 13, 0, 3, 13, 17, 0, 1, 0, 4, 0, SilphCo_5F_EventScript_16186A, 83, 0, 0 - object_event 3, 47, 0, 16, 0, 13, 0, 3, 1, 17, 0, 0, 0, 0, 0, SilphCo_5F_EventScript_1617E0, 0, 0, 0 - object_event 4, 55, 0, 11, 0, 6, 0, 3, 2, 17, 0, 1, 0, 1, 0, SilphCo_5F_EventScript_161825, 83, 0, 0 - object_event 5, 49, 0, 9, 0, 21, 0, 3, 16, 17, 0, 1, 0, 3, 0, SilphCo_5F_EventScript_16183C, 83, 0, 0 - object_event 6, 92, 0, 4, 0, 9, 0, 3, 8, 17, 0, 0, 0, 0, 0, SilphCo_5F_EventScript_1BE89A, 400, 0, 0 - object_event 7, 92, 0, 1, 0, 18, 0, 3, 8, 17, 0, 0, 0, 0, 0, SilphCo_5F_EventScript_1BE8A7, 401, 0, 0 - object_event 8, 92, 0, 22, 0, 21, 0, 3, 8, 17, 0, 0, 0, 0, 0, SilphCo_5F_EventScript_1BE8B4, 402, 0, 0 - object_event 9, 55, 0, 2, 0, 7, 0, 3, 28, 18, 0, 0, 0, 0, 0, SilphCo_5F_EventScript_1AD0D4, 0, 0, 0 - -SilphCo_5F_MapWarps: - warp_def 28, 2, 3, 0, 306 - warp_def 15, 7, 3, 1, 305 - warp_def 30, 2, 3, 2, 308 - warp_def 10, 20, 3, 1, 311 - warp_def 2, 20, 3, 5, 305 - warp_def 33, 5, 3, 2, 309 - warp_def 22, 3, 0, 0, 314 - -SilphCo_5F_MapBGEvents: - bg_event 13, 16, 0, 7, 0, 36, 24, 1 - bg_event 8, 9, 0, 0, 0, SilphCo_5F_EventScript_1A89B7 - bg_event 8, 10, 0, 0, 0, SilphCo_5F_EventScript_1A89B7 - bg_event 8, 18, 0, 0, 0, SilphCo_5F_EventScript_1A89D1 - bg_event 8, 19, 0, 0, 0, SilphCo_5F_EventScript_1A89D1 - bg_event 19, 13, 0, 0, 0, SilphCo_5F_EventScript_1A89EB - bg_event 19, 14, 0, 0, 0, SilphCo_5F_EventScript_1A89EB - bg_event 7, 9, 0, 0, 0, SilphCo_5F_EventScript_1A89B7 - bg_event 7, 10, 0, 0, 0, SilphCo_5F_EventScript_1A89B7 - bg_event 7, 19, 0, 0, 0, SilphCo_5F_EventScript_1A89D1 - bg_event 7, 18, 0, 0, 0, SilphCo_5F_EventScript_1A89D1 - bg_event 18, 13, 0, 0, 0, SilphCo_5F_EventScript_1A89EB - bg_event 18, 14, 0, 0, 0, SilphCo_5F_EventScript_1A89EB - bg_event 28, 11, 0, 0, 0, SilphCo_5F_EventScript_161813 - bg_event 30, 13, 0, 0, 0, SilphCo_5F_EventScript_16180A - bg_event 25, 15, 0, 0, 0, SilphCo_5F_EventScript_161801 - bg_event 32, 9, 0, 7, 0, 69, 138, 1 - bg_event 29, 1, 0, 0, 0, SilphCo_5F_EventScript_16181C - -SilphCo_5F_MapEvents:: - map_events SilphCo_5F_EventObjects, SilphCo_5F_MapWarps, 0x0, SilphCo_5F_MapBGEvents diff --git a/data/maps/SilphCo_5F/header.inc b/data/maps/SilphCo_5F/header.inc deleted file mode 100644 index 2c0d61a47..000000000 --- a/data/maps/SilphCo_5F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SilphCo_5F:: @ 834F7A8 - .4byte SilphCo_5F_Layout @ 0x8308B3C - .4byte SilphCo_5F_MapEvents @ 0x83B02D8 - .4byte SilphCo_5F_MapScripts @ 0x81617BE - .4byte NULL - .2byte BGM_FRLG_SILPH - .2byte 136 - .byte 0x86, 0x00, 0x00, 0x08, 0x00, 0x07, 0x05, 0x00 diff --git a/data/maps/SilphCo_5F/map.json b/data/maps/SilphCo_5F/map.json new file mode 100644 index 000000000..3ad8ee8df --- /dev/null +++ b/data/maps/SilphCo_5F/map.json @@ -0,0 +1,318 @@ +{ + "id": "MAP_SILPH_CO_5F", + "name": "SilphCo_5F", + "layout": "LAYOUT_SILPH_CO_5F", + "music": "BGM_FRLG_SILPH", + "region_map_section": "MAPSEC_SILPH_CO", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 7, + "elevator_flag": 5, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "49", + "x": 35, + "y": 7, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "SilphCo_5F_EventScript_161853", + "flag": "83" + }, + { + "graphics_id": "26", + "x": 23, + "y": 13, + "elevation": 3, + "movement_type": "13", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "SilphCo_5F_EventScript_16186A", + "flag": "83" + }, + { + "graphics_id": "47", + "x": 16, + "y": 13, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SilphCo_5F_EventScript_1617E0", + "flag": "0" + }, + { + "graphics_id": "55", + "x": 11, + "y": 6, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "SilphCo_5F_EventScript_161825", + "flag": "83" + }, + { + "graphics_id": "49", + "x": 9, + "y": 21, + "elevation": 3, + "movement_type": "16", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "SilphCo_5F_EventScript_16183C", + "flag": "83" + }, + { + "graphics_id": "92", + "x": 4, + "y": 9, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SilphCo_5F_EventScript_1BE89A", + "flag": "400" + }, + { + "graphics_id": "92", + "x": 1, + "y": 18, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SilphCo_5F_EventScript_1BE8A7", + "flag": "401" + }, + { + "graphics_id": "92", + "x": 22, + "y": 21, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SilphCo_5F_EventScript_1BE8B4", + "flag": "402" + }, + { + "graphics_id": "55", + "x": 2, + "y": 7, + "elevation": 3, + "movement_type": "28", + "movement_range_x": 2, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SilphCo_5F_EventScript_1AD0D4", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 28, + "y": 2, + "elevation": 3, + "dest_map": "MAP_SILPH_CO_4F", + "dest_warp_id": 0 + }, + { + "x": 15, + "y": 7, + "elevation": 3, + "dest_map": "MAP_SILPH_CO_3F", + "dest_warp_id": 1 + }, + { + "x": 30, + "y": 2, + "elevation": 3, + "dest_map": "MAP_SILPH_CO_6F", + "dest_warp_id": 2 + }, + { + "x": 10, + "y": 20, + "elevation": 3, + "dest_map": "MAP_SILPH_CO_9F", + "dest_warp_id": 1 + }, + { + "x": 2, + "y": 20, + "elevation": 3, + "dest_map": "MAP_SILPH_CO_3F", + "dest_warp_id": 5 + }, + { + "x": 33, + "y": 5, + "elevation": 3, + "dest_map": "MAP_SILPH_CO_7F", + "dest_warp_id": 2 + }, + { + "x": 22, + "y": 3, + "elevation": 0, + "dest_map": "MAP_SILPH_CO_ELEVATOR", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "hidden_item", + "x": 13, + "y": 16, + "elevation": 0, + "item": "ITEM_ELIXIR", + "flag": "24", + "unknown": 1 + }, + { + "type": "bg_event_type_0", + "x": 8, + "y": 9, + "elevation": 0, + "script": "SilphCo_5F_EventScript_1A89B7" + }, + { + "type": "bg_event_type_0", + "x": 8, + "y": 10, + "elevation": 0, + "script": "SilphCo_5F_EventScript_1A89B7" + }, + { + "type": "bg_event_type_0", + "x": 8, + "y": 18, + "elevation": 0, + "script": "SilphCo_5F_EventScript_1A89D1" + }, + { + "type": "bg_event_type_0", + "x": 8, + "y": 19, + "elevation": 0, + "script": "SilphCo_5F_EventScript_1A89D1" + }, + { + "type": "bg_event_type_0", + "x": 19, + "y": 13, + "elevation": 0, + "script": "SilphCo_5F_EventScript_1A89EB" + }, + { + "type": "bg_event_type_0", + "x": 19, + "y": 14, + "elevation": 0, + "script": "SilphCo_5F_EventScript_1A89EB" + }, + { + "type": "bg_event_type_0", + "x": 7, + "y": 9, + "elevation": 0, + "script": "SilphCo_5F_EventScript_1A89B7" + }, + { + "type": "bg_event_type_0", + "x": 7, + "y": 10, + "elevation": 0, + "script": "SilphCo_5F_EventScript_1A89B7" + }, + { + "type": "bg_event_type_0", + "x": 7, + "y": 19, + "elevation": 0, + "script": "SilphCo_5F_EventScript_1A89D1" + }, + { + "type": "bg_event_type_0", + "x": 7, + "y": 18, + "elevation": 0, + "script": "SilphCo_5F_EventScript_1A89D1" + }, + { + "type": "bg_event_type_0", + "x": 18, + "y": 13, + "elevation": 0, + "script": "SilphCo_5F_EventScript_1A89EB" + }, + { + "type": "bg_event_type_0", + "x": 18, + "y": 14, + "elevation": 0, + "script": "SilphCo_5F_EventScript_1A89EB" + }, + { + "type": "bg_event_type_0", + "x": 28, + "y": 11, + "elevation": 0, + "script": "SilphCo_5F_EventScript_161813" + }, + { + "type": "bg_event_type_0", + "x": 30, + "y": 13, + "elevation": 0, + "script": "SilphCo_5F_EventScript_16180A" + }, + { + "type": "bg_event_type_0", + "x": 25, + "y": 15, + "elevation": 0, + "script": "SilphCo_5F_EventScript_161801" + }, + { + "type": "hidden_item", + "x": 32, + "y": 9, + "elevation": 0, + "item": "ITEM_PP_UP", + "flag": "138", + "unknown": 1 + }, + { + "type": "bg_event_type_0", + "x": 29, + "y": 1, + "elevation": 0, + "script": "SilphCo_5F_EventScript_16181C" + } + ] +}
\ No newline at end of file diff --git a/data/maps/SilphCo_6F/events.inc b/data/maps/SilphCo_6F/events.inc deleted file mode 100644 index e83088be8..000000000 --- a/data/maps/SilphCo_6F/events.inc +++ /dev/null @@ -1,29 +0,0 @@ -SilphCo_6F_EventObjects: - object_event 1, 49, 0, 21, 0, 5, 0, 3, 10, 17, 0, 1, 0, 2, 0, SilphCo_6F_EventScript_161956, 83, 0, 0 - object_event 2, 47, 0, 23, 0, 9, 0, 3, 8, 17, 0, 0, 0, 0, 0, SilphCo_6F_EventScript_1618D3, 0, 0, 0 - object_event 3, 48, 0, 24, 0, 9, 0, 3, 8, 17, 0, 0, 0, 0, 0, SilphCo_6F_EventScript_1618F4, 0, 0, 0 - object_event 4, 47, 0, 22, 0, 13, 0, 3, 7, 17, 0, 0, 0, 0, 0, SilphCo_6F_EventScript_161891, 0, 0, 0 - object_event 5, 47, 0, 14, 0, 9, 0, 3, 1, 17, 0, 0, 0, 0, 0, SilphCo_6F_EventScript_1618B2, 0, 0, 0 - object_event 6, 48, 0, 16, 0, 12, 0, 3, 10, 17, 0, 0, 0, 0, 0, SilphCo_6F_EventScript_161915, 0, 0, 0 - object_event 7, 55, 0, 9, 0, 11, 0, 3, 8, 17, 0, 1, 0, 4, 0, SilphCo_6F_EventScript_16193F, 83, 0, 0 - object_event 8, 92, 0, 2, 0, 14, 0, 3, 8, 17, 0, 0, 0, 0, 0, SilphCo_6F_EventScript_1BE8C1, 403, 0, 0 - object_event 9, 92, 0, 1, 0, 17, 0, 3, 8, 17, 0, 0, 0, 0, 0, SilphCo_6F_EventScript_1BE8CE, 404, 0, 0 - object_event 10, 49, 0, 18, 0, 17, 0, 3, 9, 17, 0, 1, 0, 2, 0, SilphCo_6F_EventScript_16196D, 83, 0, 0 - -SilphCo_6F_MapWarps: - warp_def 14, 2, 3, 0, 309 - warp_def 29, 5, 3, 4, 304 - warp_def 26, 2, 3, 2, 307 - warp_def 2, 6, 3, 1, 306 - warp_def 20, 3, 0, 0, 314 - -SilphCo_6F_MapBGEvents: - bg_event 6, 15, 0, 0, 0, SilphCo_6F_EventScript_1A8A05 - bg_event 6, 16, 0, 0, 0, SilphCo_6F_EventScript_1A8A05 - bg_event 5, 15, 0, 0, 0, SilphCo_6F_EventScript_1A8A05 - bg_event 5, 16, 0, 0, 0, SilphCo_6F_EventScript_1A8A05 - bg_event 1, 8, 0, 7, 0, 66, 139, 1 - bg_event 25, 1, 0, 0, 0, SilphCo_6F_EventScript_161936 - -SilphCo_6F_MapEvents:: - map_events SilphCo_6F_EventObjects, SilphCo_6F_MapWarps, 0x0, SilphCo_6F_MapBGEvents diff --git a/data/maps/SilphCo_6F/header.inc b/data/maps/SilphCo_6F/header.inc deleted file mode 100644 index d9c522f9c..000000000 --- a/data/maps/SilphCo_6F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SilphCo_6F:: @ 834F7C4 - .4byte SilphCo_6F_Layout @ 0x8308FFC - .4byte SilphCo_6F_MapEvents @ 0x83B044C - .4byte SilphCo_6F_MapScripts @ 0x8161881 - .4byte NULL - .2byte BGM_FRLG_SILPH - .2byte 137 - .byte 0x86, 0x00, 0x00, 0x08, 0x00, 0x07, 0x06, 0x00 diff --git a/data/maps/SilphCo_6F/map.json b/data/maps/SilphCo_6F/map.json new file mode 100644 index 000000000..c1db9b3c1 --- /dev/null +++ b/data/maps/SilphCo_6F/map.json @@ -0,0 +1,231 @@ +{ + "id": "MAP_SILPH_CO_6F", + "name": "SilphCo_6F", + "layout": "LAYOUT_SILPH_CO_6F", + "music": "BGM_FRLG_SILPH", + "region_map_section": "MAPSEC_SILPH_CO", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 7, + "elevator_flag": 6, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "49", + "x": 21, + "y": 5, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "SilphCo_6F_EventScript_161956", + "flag": "83" + }, + { + "graphics_id": "47", + "x": 23, + "y": 9, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SilphCo_6F_EventScript_1618D3", + "flag": "0" + }, + { + "graphics_id": "48", + "x": 24, + "y": 9, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SilphCo_6F_EventScript_1618F4", + "flag": "0" + }, + { + "graphics_id": "47", + "x": 22, + "y": 13, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SilphCo_6F_EventScript_161891", + "flag": "0" + }, + { + "graphics_id": "47", + "x": 14, + "y": 9, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SilphCo_6F_EventScript_1618B2", + "flag": "0" + }, + { + "graphics_id": "48", + "x": 16, + "y": 12, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SilphCo_6F_EventScript_161915", + "flag": "0" + }, + { + "graphics_id": "55", + "x": 9, + "y": 11, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "SilphCo_6F_EventScript_16193F", + "flag": "83" + }, + { + "graphics_id": "92", + "x": 2, + "y": 14, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SilphCo_6F_EventScript_1BE8C1", + "flag": "403" + }, + { + "graphics_id": "92", + "x": 1, + "y": 17, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SilphCo_6F_EventScript_1BE8CE", + "flag": "404" + }, + { + "graphics_id": "49", + "x": 18, + "y": 17, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "SilphCo_6F_EventScript_16196D", + "flag": "83" + } + ], + "warp_events": [ + { + "x": 14, + "y": 2, + "elevation": 3, + "dest_map": "MAP_SILPH_CO_7F", + "dest_warp_id": 0 + }, + { + "x": 29, + "y": 5, + "elevation": 3, + "dest_map": "MAP_SILPH_CO_2F", + "dest_warp_id": 4 + }, + { + "x": 26, + "y": 2, + "elevation": 3, + "dest_map": "MAP_SILPH_CO_5F", + "dest_warp_id": 2 + }, + { + "x": 2, + "y": 6, + "elevation": 3, + "dest_map": "MAP_SILPH_CO_4F", + "dest_warp_id": 1 + }, + { + "x": 20, + "y": 3, + "elevation": 0, + "dest_map": "MAP_SILPH_CO_ELEVATOR", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 6, + "y": 15, + "elevation": 0, + "script": "SilphCo_6F_EventScript_1A8A05" + }, + { + "type": "bg_event_type_0", + "x": 6, + "y": 16, + "elevation": 0, + "script": "SilphCo_6F_EventScript_1A8A05" + }, + { + "type": "bg_event_type_0", + "x": 5, + "y": 15, + "elevation": 0, + "script": "SilphCo_6F_EventScript_1A8A05" + }, + { + "type": "bg_event_type_0", + "x": 5, + "y": 16, + "elevation": 0, + "script": "SilphCo_6F_EventScript_1A8A05" + }, + { + "type": "hidden_item", + "x": 1, + "y": 8, + "elevation": 0, + "item": "ITEM_CARBOS", + "flag": "139", + "unknown": 1 + }, + { + "type": "bg_event_type_0", + "x": 25, + "y": 1, + "elevation": 0, + "script": "SilphCo_6F_EventScript_161936" + } + ] +}
\ No newline at end of file diff --git a/data/maps/SilphCo_7F/events.inc b/data/maps/SilphCo_7F/events.inc deleted file mode 100644 index 8373b3a57..000000000 --- a/data/maps/SilphCo_7F/events.inc +++ /dev/null @@ -1,43 +0,0 @@ -SilphCo_7F_EventObjects: - object_event 1, 72, 0, 2, 0, 6, 0, 3, 7, 17, 0, 0, 0, 0, 0, 0x0, 78, 0, 0 - object_event 2, 47, 0, 0, 0, 7, 0, 3, 10, 17, 0, 0, 0, 0, 0, SilphCo_7F_EventScript_161AC8, 0, 0, 0 - object_event 3, 49, 0, 24, 0, 5, 0, 3, 9, 17, 0, 1, 0, 4, 0, SilphCo_7F_EventScript_161C1A, 83, 0, 0 - object_event 4, 49, 0, 24, 0, 15, 0, 3, 10, 17, 0, 1, 0, 2, 0, SilphCo_7F_EventScript_161C31, 83, 0, 0 - object_event 5, 49, 0, 13, 0, 4, 0, 3, 8, 17, 0, 1, 0, 3, 0, SilphCo_7F_EventScript_161C48, 83, 0, 0 - object_event 6, 48, 0, 10, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, SilphCo_7F_EventScript_161BD9, 0, 0, 0 - object_event 7, 47, 0, 13, 0, 14, 0, 3, 9, 17, 0, 0, 0, 0, 0, SilphCo_7F_EventScript_161B97, 0, 0, 0 - object_event 8, 47, 0, 9, 0, 14, 0, 3, 27, 17, 0, 0, 0, 0, 0, SilphCo_7F_EventScript_161BB8, 0, 0, 0 - object_event 9, 55, 0, 3, 0, 13, 0, 3, 5, 18, 0, 1, 0, 1, 0, SilphCo_7F_EventScript_161C03, 83, 0, 0 - object_event 10, 92, 0, 0, 0, 12, 0, 3, 8, 17, 0, 0, 0, 0, 0, SilphCo_7F_EventScript_1BE8DB, 405, 0, 0 - object_event 11, 92, 0, 30, 0, 11, 0, 3, 8, 17, 0, 0, 0, 0, 0, SilphCo_7F_EventScript_1BE8E8, 406, 0, 0 - -SilphCo_7F_MapWarps: - warp_def 19, 2, 3, 0, 308 - warp_def 5, 8, 3, 1, 313 - warp_def 25, 17, 3, 5, 307 - warp_def 27, 2, 3, 3, 310 - warp_def 5, 4, 3, 2, 305 - warp_def 23, 3, 0, 0, 314 - -SilphCo_7F_MapCoordEvents: - coord_event 2, 4, 3, 0, 16476, 0, 0, SilphCo_7F_EventScript_1619BC - coord_event 2, 5, 3, 0, 16476, 0, 0, SilphCo_7F_EventScript_1619C8 - -SilphCo_7F_MapBGEvents: - bg_event 11, 8, 0, 0, 0, SilphCo_7F_EventScript_1A8A1F - bg_event 12, 8, 0, 0, 0, SilphCo_7F_EventScript_1A8A1F - bg_event 11, 9, 0, 0, 0, SilphCo_7F_EventScript_1A8A1F - bg_event 12, 9, 0, 0, 0, SilphCo_7F_EventScript_1A8A1F - bg_event 24, 7, 0, 0, 0, SilphCo_7F_EventScript_1A8A39 - bg_event 25, 7, 0, 0, 0, SilphCo_7F_EventScript_1A8A39 - bg_event 25, 8, 0, 0, 0, SilphCo_7F_EventScript_1A8A39 - bg_event 24, 8, 0, 0, 0, SilphCo_7F_EventScript_1A8A39 - bg_event 25, 13, 0, 0, 0, SilphCo_7F_EventScript_1A8A53 - bg_event 26, 13, 0, 0, 0, SilphCo_7F_EventScript_1A8A53 - bg_event 25, 14, 0, 0, 0, SilphCo_7F_EventScript_1A8A53 - bg_event 26, 14, 0, 0, 0, SilphCo_7F_EventScript_1A8A53 - bg_event 22, 11, 0, 7, 0, 70, 140, 1 - bg_event 20, 1, 0, 0, 0, SilphCo_7F_EventScript_161BFA - -SilphCo_7F_MapEvents:: - map_events SilphCo_7F_EventObjects, SilphCo_7F_MapWarps, SilphCo_7F_MapCoordEvents, SilphCo_7F_MapBGEvents diff --git a/data/maps/SilphCo_7F/header.inc b/data/maps/SilphCo_7F/header.inc deleted file mode 100644 index 8208b4ad1..000000000 --- a/data/maps/SilphCo_7F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SilphCo_7F:: @ 834F7E0 - .4byte SilphCo_7F_Layout @ 0x83094BC - .4byte SilphCo_7F_MapEvents @ 0x83B0660 - .4byte SilphCo_7F_MapScripts @ 0x8161984 - .4byte NULL - .2byte BGM_FRLG_SILPH - .2byte 138 - .byte 0x86, 0x00, 0x00, 0x08, 0x00, 0x07, 0x07, 0x00 diff --git a/data/maps/SilphCo_7F/map.json b/data/maps/SilphCo_7F/map.json new file mode 100644 index 000000000..575558327 --- /dev/null +++ b/data/maps/SilphCo_7F/map.json @@ -0,0 +1,326 @@ +{ + "id": "MAP_SILPH_CO_7F", + "name": "SilphCo_7F", + "layout": "LAYOUT_SILPH_CO_7F", + "music": "BGM_FRLG_SILPH", + "region_map_section": "MAPSEC_SILPH_CO", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 7, + "elevator_flag": 7, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "72", + "x": 2, + "y": 6, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "78" + }, + { + "graphics_id": "47", + "x": 0, + "y": 7, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SilphCo_7F_EventScript_161AC8", + "flag": "0" + }, + { + "graphics_id": "49", + "x": 24, + "y": 5, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "SilphCo_7F_EventScript_161C1A", + "flag": "83" + }, + { + "graphics_id": "49", + "x": 24, + "y": 15, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "SilphCo_7F_EventScript_161C31", + "flag": "83" + }, + { + "graphics_id": "49", + "x": 13, + "y": 4, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "SilphCo_7F_EventScript_161C48", + "flag": "83" + }, + { + "graphics_id": "48", + "x": 10, + "y": 10, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SilphCo_7F_EventScript_161BD9", + "flag": "0" + }, + { + "graphics_id": "47", + "x": 13, + "y": 14, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SilphCo_7F_EventScript_161B97", + "flag": "0" + }, + { + "graphics_id": "47", + "x": 9, + "y": 14, + "elevation": 3, + "movement_type": "27", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SilphCo_7F_EventScript_161BB8", + "flag": "0" + }, + { + "graphics_id": "55", + "x": 3, + "y": 13, + "elevation": 3, + "movement_type": "5", + "movement_range_x": 2, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "SilphCo_7F_EventScript_161C03", + "flag": "83" + }, + { + "graphics_id": "92", + "x": 0, + "y": 12, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SilphCo_7F_EventScript_1BE8DB", + "flag": "405" + }, + { + "graphics_id": "92", + "x": 30, + "y": 11, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SilphCo_7F_EventScript_1BE8E8", + "flag": "406" + } + ], + "warp_events": [ + { + "x": 19, + "y": 2, + "elevation": 3, + "dest_map": "MAP_SILPH_CO_6F", + "dest_warp_id": 0 + }, + { + "x": 5, + "y": 8, + "elevation": 3, + "dest_map": "MAP_SILPH_CO_11F", + "dest_warp_id": 1 + }, + { + "x": 25, + "y": 17, + "elevation": 3, + "dest_map": "MAP_SILPH_CO_5F", + "dest_warp_id": 5 + }, + { + "x": 27, + "y": 2, + "elevation": 3, + "dest_map": "MAP_SILPH_CO_8F", + "dest_warp_id": 3 + }, + { + "x": 5, + "y": 4, + "elevation": 3, + "dest_map": "MAP_SILPH_CO_3F", + "dest_warp_id": 2 + }, + { + "x": 23, + "y": 3, + "elevation": 0, + "dest_map": "MAP_SILPH_CO_ELEVATOR", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 2, + "y": 4, + "elevation": 3, + "var": "VAR_0x405C", + "var_value": 0, + "script": "SilphCo_7F_EventScript_1619BC" + }, + { + "type": "trigger", + "x": 2, + "y": 5, + "elevation": 3, + "var": "VAR_0x405C", + "var_value": 0, + "script": "SilphCo_7F_EventScript_1619C8" + } + ], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 11, + "y": 8, + "elevation": 0, + "script": "SilphCo_7F_EventScript_1A8A1F" + }, + { + "type": "bg_event_type_0", + "x": 12, + "y": 8, + "elevation": 0, + "script": "SilphCo_7F_EventScript_1A8A1F" + }, + { + "type": "bg_event_type_0", + "x": 11, + "y": 9, + "elevation": 0, + "script": "SilphCo_7F_EventScript_1A8A1F" + }, + { + "type": "bg_event_type_0", + "x": 12, + "y": 9, + "elevation": 0, + "script": "SilphCo_7F_EventScript_1A8A1F" + }, + { + "type": "bg_event_type_0", + "x": 24, + "y": 7, + "elevation": 0, + "script": "SilphCo_7F_EventScript_1A8A39" + }, + { + "type": "bg_event_type_0", + "x": 25, + "y": 7, + "elevation": 0, + "script": "SilphCo_7F_EventScript_1A8A39" + }, + { + "type": "bg_event_type_0", + "x": 25, + "y": 8, + "elevation": 0, + "script": "SilphCo_7F_EventScript_1A8A39" + }, + { + "type": "bg_event_type_0", + "x": 24, + "y": 8, + "elevation": 0, + "script": "SilphCo_7F_EventScript_1A8A39" + }, + { + "type": "bg_event_type_0", + "x": 25, + "y": 13, + "elevation": 0, + "script": "SilphCo_7F_EventScript_1A8A53" + }, + { + "type": "bg_event_type_0", + "x": 26, + "y": 13, + "elevation": 0, + "script": "SilphCo_7F_EventScript_1A8A53" + }, + { + "type": "bg_event_type_0", + "x": 25, + "y": 14, + "elevation": 0, + "script": "SilphCo_7F_EventScript_1A8A53" + }, + { + "type": "bg_event_type_0", + "x": 26, + "y": 14, + "elevation": 0, + "script": "SilphCo_7F_EventScript_1A8A53" + }, + { + "type": "hidden_item", + "x": 22, + "y": 11, + "elevation": 0, + "item": "ITEM_ZINC", + "flag": "140", + "unknown": 1 + }, + { + "type": "bg_event_type_0", + "x": 20, + "y": 1, + "elevation": 0, + "script": "SilphCo_7F_EventScript_161BFA" + } + ] +}
\ No newline at end of file diff --git a/data/maps/SilphCo_8F/events.inc b/data/maps/SilphCo_8F/events.inc deleted file mode 100644 index 31ffa6f67..000000000 --- a/data/maps/SilphCo_8F/events.inc +++ /dev/null @@ -1,27 +0,0 @@ -SilphCo_8F_EventObjects: - object_event 1, 49, 0, 28, 0, 5, 0, 3, 9, 17, 0, 1, 0, 4, 0, SilphCo_8F_EventScript_161CB0, 83, 0, 0 - object_event 2, 49, 0, 10, 0, 17, 0, 3, 10, 17, 0, 1, 0, 5, 0, SilphCo_8F_EventScript_161CC7, 83, 0, 0 - object_event 3, 55, 0, 9, 0, 4, 0, 3, 8, 17, 0, 1, 0, 2, 0, SilphCo_8F_EventScript_161C99, 83, 0, 0 - object_event 4, 47, 0, 2, 0, 5, 0, 3, 5, 17, 0, 0, 0, 0, 0, SilphCo_8F_EventScript_161C6F, 0, 0, 0 - object_event 5, 92, 0, 24, 0, 8, 0, 3, 8, 17, 0, 0, 0, 0, 0, SilphCo_8F_EventScript_1BEB4B, 456, 0, 0 - object_event 6, 55, 0, 29, 0, 9, 0, 3, 8, 17, 0, 0, 0, 0, 0, SilphCo_8F_EventScript_1AD0ED, 0, 0, 0 - -SilphCo_8F_MapWarps: - warp_def 16, 2, 3, 0, 311 - warp_def 11, 10, 3, 4, 310 - warp_def 10, 6, 3, 5, 304 - warp_def 28, 2, 3, 3, 309 - warp_def 2, 12, 3, 1, 310 - warp_def 2, 17, 3, 2, 304 - warp_def 22, 3, 0, 0, 314 - -SilphCo_8F_MapBGEvents: - bg_event 6, 10, 0, 0, 0, SilphCo_8F_EventScript_1A8A6D - bg_event 6, 11, 0, 0, 0, SilphCo_8F_EventScript_1A8A6D - bg_event 5, 11, 0, 0, 0, SilphCo_8F_EventScript_1A8A6D - bg_event 5, 10, 0, 0, 0, SilphCo_8F_EventScript_1A8A6D - bg_event 29, 10, 0, 7, 0, 110, 141, 1 - bg_event 27, 1, 0, 0, 0, SilphCo_8F_EventScript_161C90 - -SilphCo_8F_MapEvents:: - map_events SilphCo_8F_EventObjects, SilphCo_8F_MapWarps, 0x0, SilphCo_8F_MapBGEvents diff --git a/data/maps/SilphCo_8F/header.inc b/data/maps/SilphCo_8F/header.inc deleted file mode 100644 index 5614c0a35..000000000 --- a/data/maps/SilphCo_8F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SilphCo_8F:: @ 834F7FC - .4byte SilphCo_8F_Layout @ 0x830997C - .4byte SilphCo_8F_MapEvents @ 0x83B0784 - .4byte SilphCo_8F_MapScripts @ 0x8161C5F - .4byte NULL - .2byte BGM_FRLG_SILPH - .2byte 139 - .byte 0x86, 0x00, 0x00, 0x08, 0x00, 0x07, 0x08, 0x00 diff --git a/data/maps/SilphCo_8F/map.json b/data/maps/SilphCo_8F/map.json new file mode 100644 index 000000000..763c9284b --- /dev/null +++ b/data/maps/SilphCo_8F/map.json @@ -0,0 +1,193 @@ +{ + "id": "MAP_SILPH_CO_8F", + "name": "SilphCo_8F", + "layout": "LAYOUT_SILPH_CO_8F", + "music": "BGM_FRLG_SILPH", + "region_map_section": "MAPSEC_SILPH_CO", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 7, + "elevator_flag": 8, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "49", + "x": 28, + "y": 5, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "SilphCo_8F_EventScript_161CB0", + "flag": "83" + }, + { + "graphics_id": "49", + "x": 10, + "y": 17, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "SilphCo_8F_EventScript_161CC7", + "flag": "83" + }, + { + "graphics_id": "55", + "x": 9, + "y": 4, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "SilphCo_8F_EventScript_161C99", + "flag": "83" + }, + { + "graphics_id": "47", + "x": 2, + "y": 5, + "elevation": 3, + "movement_type": "5", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SilphCo_8F_EventScript_161C6F", + "flag": "0" + }, + { + "graphics_id": "92", + "x": 24, + "y": 8, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SilphCo_8F_EventScript_1BEB4B", + "flag": "456" + }, + { + "graphics_id": "55", + "x": 29, + "y": 9, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SilphCo_8F_EventScript_1AD0ED", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 16, + "y": 2, + "elevation": 3, + "dest_map": "MAP_SILPH_CO_9F", + "dest_warp_id": 0 + }, + { + "x": 11, + "y": 10, + "elevation": 3, + "dest_map": "MAP_SILPH_CO_8F", + "dest_warp_id": 4 + }, + { + "x": 10, + "y": 6, + "elevation": 3, + "dest_map": "MAP_SILPH_CO_2F", + "dest_warp_id": 5 + }, + { + "x": 28, + "y": 2, + "elevation": 3, + "dest_map": "MAP_SILPH_CO_7F", + "dest_warp_id": 3 + }, + { + "x": 2, + "y": 12, + "elevation": 3, + "dest_map": "MAP_SILPH_CO_8F", + "dest_warp_id": 1 + }, + { + "x": 2, + "y": 17, + "elevation": 3, + "dest_map": "MAP_SILPH_CO_2F", + "dest_warp_id": 2 + }, + { + "x": 22, + "y": 3, + "elevation": 0, + "dest_map": "MAP_SILPH_CO_ELEVATOR", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 6, + "y": 10, + "elevation": 0, + "script": "SilphCo_8F_EventScript_1A8A6D" + }, + { + "type": "bg_event_type_0", + "x": 6, + "y": 11, + "elevation": 0, + "script": "SilphCo_8F_EventScript_1A8A6D" + }, + { + "type": "bg_event_type_0", + "x": 5, + "y": 11, + "elevation": 0, + "script": "SilphCo_8F_EventScript_1A8A6D" + }, + { + "type": "bg_event_type_0", + "x": 5, + "y": 10, + "elevation": 0, + "script": "SilphCo_8F_EventScript_1A8A6D" + }, + { + "type": "hidden_item", + "x": 29, + "y": 10, + "elevation": 0, + "item": "ITEM_NUGGET", + "flag": "141", + "unknown": 1 + }, + { + "type": "bg_event_type_0", + "x": 27, + "y": 1, + "elevation": 0, + "script": "SilphCo_8F_EventScript_161C90" + } + ] +}
\ No newline at end of file diff --git a/data/maps/SilphCo_9F/events.inc b/data/maps/SilphCo_9F/events.inc deleted file mode 100644 index 0b93cb550..000000000 --- a/data/maps/SilphCo_9F/events.inc +++ /dev/null @@ -1,36 +0,0 @@ -SilphCo_9F_EventObjects: - object_event 1, 55, 0, 26, 0, 16, 0, 3, 3, 17, 0, 1, 0, 2, 0, SilphCo_9F_EventScript_161D41, 83, 0, 0 - object_event 2, 49, 0, 15, 0, 18, 0, 3, 7, 17, 0, 1, 0, 3, 0, SilphCo_9F_EventScript_161D6F, 83, 0, 0 - object_event 3, 28, 0, 2, 0, 16, 0, 0, 8, 17, 0, 0, 0, 0, 0, SilphCo_9F_EventScript_161D09, 0, 0, 0 - object_event 4, 49, 0, 1, 0, 6, 0, 3, 8, 17, 0, 1, 0, 5, 0, SilphCo_9F_EventScript_161D58, 83, 0, 0 - -SilphCo_9F_MapWarps: - warp_def 16, 2, 0, 0, 310 - warp_def 22, 18, 3, 3, 307 - warp_def 9, 4, 3, 4, 305 - warp_def 18, 2, 3, 3, 312 - warp_def 24, 3, 0, 0, 314 - -SilphCo_9F_MapBGEvents: - bg_event 11, 14, 3, 7, 0, 20, 25, 1 - bg_event 3, 10, 0, 0, 0, SilphCo_9F_EventScript_1A8A87 - bg_event 3, 11, 0, 0, 0, SilphCo_9F_EventScript_1A8A87 - bg_event 13, 16, 0, 0, 0, SilphCo_9F_EventScript_1A8AA1 - bg_event 13, 17, 0, 0, 0, SilphCo_9F_EventScript_1A8AA1 - bg_event 21, 6, 0, 0, 0, SilphCo_9F_EventScript_1A8ABB - bg_event 22, 6, 0, 0, 0, SilphCo_9F_EventScript_1A8ABB - bg_event 22, 7, 0, 0, 0, SilphCo_9F_EventScript_1A8ABB - bg_event 21, 7, 0, 0, 0, SilphCo_9F_EventScript_1A8ABB - bg_event 21, 13, 0, 0, 0, SilphCo_9F_EventScript_1A8AD5 - bg_event 21, 12, 0, 0, 0, SilphCo_9F_EventScript_1A8AD5 - bg_event 22, 12, 0, 0, 0, SilphCo_9F_EventScript_1A8AD5 - bg_event 22, 13, 0, 0, 0, SilphCo_9F_EventScript_1A8AD5 - bg_event 2, 11, 0, 0, 0, SilphCo_9F_EventScript_1A8A87 - bg_event 2, 10, 0, 0, 0, SilphCo_9F_EventScript_1A8A87 - bg_event 12, 16, 0, 0, 0, SilphCo_9F_EventScript_1A8AA1 - bg_event 12, 17, 0, 0, 0, SilphCo_9F_EventScript_1A8AA1 - bg_event 5, 8, 0, 7, 0, 67, 142, 1 - bg_event 17, 1, 0, 0, 0, SilphCo_9F_EventScript_161D38 - -SilphCo_9F_MapEvents:: - map_events SilphCo_9F_EventObjects, SilphCo_9F_MapWarps, 0x0, SilphCo_9F_MapBGEvents diff --git a/data/maps/SilphCo_9F/header.inc b/data/maps/SilphCo_9F/header.inc deleted file mode 100644 index a89767234..000000000 --- a/data/maps/SilphCo_9F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SilphCo_9F:: @ 834F818 - .4byte SilphCo_9F_Layout @ 0x8309E3C - .4byte SilphCo_9F_MapEvents @ 0x83B0904 - .4byte SilphCo_9F_MapScripts @ 0x8161CDE - .4byte NULL - .2byte BGM_FRLG_SILPH - .2byte 140 - .byte 0x86, 0x00, 0x00, 0x08, 0x00, 0x07, 0x09, 0x00 diff --git a/data/maps/SilphCo_9F/map.json b/data/maps/SilphCo_9F/map.json new file mode 100644 index 000000000..5e50d24ca --- /dev/null +++ b/data/maps/SilphCo_9F/map.json @@ -0,0 +1,246 @@ +{ + "id": "MAP_SILPH_CO_9F", + "name": "SilphCo_9F", + "layout": "LAYOUT_SILPH_CO_9F", + "music": "BGM_FRLG_SILPH", + "region_map_section": "MAPSEC_SILPH_CO", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 7, + "elevator_flag": 9, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "55", + "x": 26, + "y": 16, + "elevation": 3, + "movement_type": "3", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "SilphCo_9F_EventScript_161D41", + "flag": "83" + }, + { + "graphics_id": "49", + "x": 15, + "y": 18, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "SilphCo_9F_EventScript_161D6F", + "flag": "83" + }, + { + "graphics_id": "28", + "x": 2, + "y": 16, + "elevation": 0, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SilphCo_9F_EventScript_161D09", + "flag": "0" + }, + { + "graphics_id": "49", + "x": 1, + "y": 6, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "SilphCo_9F_EventScript_161D58", + "flag": "83" + } + ], + "warp_events": [ + { + "x": 16, + "y": 2, + "elevation": 0, + "dest_map": "MAP_SILPH_CO_8F", + "dest_warp_id": 0 + }, + { + "x": 22, + "y": 18, + "elevation": 3, + "dest_map": "MAP_SILPH_CO_5F", + "dest_warp_id": 3 + }, + { + "x": 9, + "y": 4, + "elevation": 3, + "dest_map": "MAP_SILPH_CO_3F", + "dest_warp_id": 4 + }, + { + "x": 18, + "y": 2, + "elevation": 3, + "dest_map": "MAP_SILPH_CO_10F", + "dest_warp_id": 3 + }, + { + "x": 24, + "y": 3, + "elevation": 0, + "dest_map": "MAP_SILPH_CO_ELEVATOR", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "hidden_item", + "x": 11, + "y": 14, + "elevation": 3, + "item": "ITEM_MAX_POTION", + "flag": "25", + "unknown": 1 + }, + { + "type": "bg_event_type_0", + "x": 3, + "y": 10, + "elevation": 0, + "script": "SilphCo_9F_EventScript_1A8A87" + }, + { + "type": "bg_event_type_0", + "x": 3, + "y": 11, + "elevation": 0, + "script": "SilphCo_9F_EventScript_1A8A87" + }, + { + "type": "bg_event_type_0", + "x": 13, + "y": 16, + "elevation": 0, + "script": "SilphCo_9F_EventScript_1A8AA1" + }, + { + "type": "bg_event_type_0", + "x": 13, + "y": 17, + "elevation": 0, + "script": "SilphCo_9F_EventScript_1A8AA1" + }, + { + "type": "bg_event_type_0", + "x": 21, + "y": 6, + "elevation": 0, + "script": "SilphCo_9F_EventScript_1A8ABB" + }, + { + "type": "bg_event_type_0", + "x": 22, + "y": 6, + "elevation": 0, + "script": "SilphCo_9F_EventScript_1A8ABB" + }, + { + "type": "bg_event_type_0", + "x": 22, + "y": 7, + "elevation": 0, + "script": "SilphCo_9F_EventScript_1A8ABB" + }, + { + "type": "bg_event_type_0", + "x": 21, + "y": 7, + "elevation": 0, + "script": "SilphCo_9F_EventScript_1A8ABB" + }, + { + "type": "bg_event_type_0", + "x": 21, + "y": 13, + "elevation": 0, + "script": "SilphCo_9F_EventScript_1A8AD5" + }, + { + "type": "bg_event_type_0", + "x": 21, + "y": 12, + "elevation": 0, + "script": "SilphCo_9F_EventScript_1A8AD5" + }, + { + "type": "bg_event_type_0", + "x": 22, + "y": 12, + "elevation": 0, + "script": "SilphCo_9F_EventScript_1A8AD5" + }, + { + "type": "bg_event_type_0", + "x": 22, + "y": 13, + "elevation": 0, + "script": "SilphCo_9F_EventScript_1A8AD5" + }, + { + "type": "bg_event_type_0", + "x": 2, + "y": 11, + "elevation": 0, + "script": "SilphCo_9F_EventScript_1A8A87" + }, + { + "type": "bg_event_type_0", + "x": 2, + "y": 10, + "elevation": 0, + "script": "SilphCo_9F_EventScript_1A8A87" + }, + { + "type": "bg_event_type_0", + "x": 12, + "y": 16, + "elevation": 0, + "script": "SilphCo_9F_EventScript_1A8AA1" + }, + { + "type": "bg_event_type_0", + "x": 12, + "y": 17, + "elevation": 0, + "script": "SilphCo_9F_EventScript_1A8AA1" + }, + { + "type": "hidden_item", + "x": 5, + "y": 8, + "elevation": 0, + "item": "ITEM_CALCIUM", + "flag": "142", + "unknown": 1 + }, + { + "type": "bg_event_type_0", + "x": 17, + "y": 1, + "elevation": 0, + "script": "SilphCo_9F_EventScript_161D38" + } + ] +}
\ No newline at end of file diff --git a/data/maps/SilphCo_Elevator/events.inc b/data/maps/SilphCo_Elevator/events.inc deleted file mode 100644 index 90faa28a2..000000000 --- a/data/maps/SilphCo_Elevator/events.inc +++ /dev/null @@ -1,8 +0,0 @@ -SilphCo_Elevator_MapWarps: - warp_def 2, 5, 3, 127, 32639 - -SilphCo_Elevator_MapBGEvents: - bg_event 0, 2, 3, 0, 0, SilphCo_Elevator_EventScript_161F6F - -SilphCo_Elevator_MapEvents:: - map_events 0x0, SilphCo_Elevator_MapWarps, 0x0, SilphCo_Elevator_MapBGEvents diff --git a/data/maps/SilphCo_Elevator/header.inc b/data/maps/SilphCo_Elevator/header.inc deleted file mode 100644 index abfebcfd4..000000000 --- a/data/maps/SilphCo_Elevator/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SilphCo_Elevator:: @ 834F86C - .4byte SilphCo_Elevator_Layout @ 0x8321330 - .4byte SilphCo_Elevator_MapEvents @ 0x83B0B6C - .4byte SilphCo_Elevator_MapScripts @ 0x8161F6E - .4byte NULL - .2byte BGM_FRLG_SILPH - .2byte 229 - .byte 0x86, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/SilphCo_Elevator/map.json b/data/maps/SilphCo_Elevator/map.json new file mode 100644 index 000000000..a1208a5d8 --- /dev/null +++ b/data/maps/SilphCo_Elevator/map.json @@ -0,0 +1,35 @@ +{ + "id": "MAP_SILPH_CO_ELEVATOR", + "name": "SilphCo_Elevator", + "layout": "LAYOUT_SILPH_CO_ELEVATOR", + "music": "BGM_FRLG_SILPH", + "region_map_section": "MAPSEC_SILPH_CO", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 2, + "y": 5, + "elevation": 3, + "dest_map": "MAP_NONE", + "dest_warp_id": 127 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 0, + "y": 2, + "elevation": 3, + "script": "SilphCo_Elevator_EventScript_161F6F" + } + ] +}
\ No newline at end of file diff --git a/data/maps/SixIsland/connections.inc b/data/maps/SixIsland/connections.inc deleted file mode 100644 index 712c8e2cf..000000000 --- a/data/maps/SixIsland/connections.inc +++ /dev/null @@ -1,6 +0,0 @@ -SixIsland_MapConnectionsList: @ 83529C8 - connection right, -40, MAP_SIX_ISLAND_WATERPATH - -SixIsland_MapConnections:: @ 83529D4 - .4byte 1 - .4byte SixIsland_MapConnectionsList diff --git a/data/maps/SixIsland/events.inc b/data/maps/SixIsland/events.inc deleted file mode 100644 index 71688d896..000000000 --- a/data/maps/SixIsland/events.inc +++ /dev/null @@ -1,16 +0,0 @@ -SixIsland_EventObjects: - object_event 1, 19, 0, 10, 0, 15, 0, 3, 9, 17, 0, 0, 0, 0, 0, SixIsland_EventScript_167EEB, 0, 0, 0 - object_event 2, 56, 0, 15, 0, 13, 0, 3, 18, 17, 0, 0, 0, 0, 0, SixIsland_EventScript_167EE2, 0, 0, 0 - -SixIsland_MapWarps: - warp_def 11, 23, 3, 0, 9474 - warp_def 11, 11, 0, 0, 9472 - warp_def 16, 17, 0, 0, 9475 - warp_def 20, 11, 0, 0, 9476 - -SixIsland_MapBGEvents: - bg_event 9, 17, 0, 0, 0, SixIsland_EventScript_167EF4 - bg_event 9, 7, 3, 7, 0, 138, 184, 1 - -SixIsland_MapEvents:: - map_events SixIsland_EventObjects, SixIsland_MapWarps, 0x0, SixIsland_MapBGEvents diff --git a/data/maps/SixIsland/header.inc b/data/maps/SixIsland/header.inc deleted file mode 100644 index 3c6a68277..000000000 --- a/data/maps/SixIsland/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SixIsland:: @ 8350810 - .4byte SixIsland_Layout @ 0x832430C - .4byte SixIsland_MapEvents @ 0x83B65F8 - .4byte SixIsland_MapScripts @ 0x8167ED8 - .4byte SixIsland_MapConnections @ 0x83529D4 - .2byte BGM_FRLG_ISLAND_SIX - .2byte 236 - .byte 0x95, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/SixIsland/map.json b/data/maps/SixIsland/map.json new file mode 100644 index 000000000..0f5344713 --- /dev/null +++ b/data/maps/SixIsland/map.json @@ -0,0 +1,98 @@ +{ + "id": "MAP_SIX_ISLAND", + "name": "SixIsland", + "layout": "LAYOUT_SIX_ISLAND", + "music": "BGM_FRLG_ISLAND_SIX", + "region_map_section": "MAPSEC_SIX_ISLAND", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_1", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_SIX_ISLAND_WATER_PATH", + "offset": -40, + "direction": "right" + } + ], + "object_events": [ + { + "graphics_id": "19", + "x": 10, + "y": 15, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SixIsland_EventScript_167EEB", + "flag": "0" + }, + { + "graphics_id": "56", + "x": 15, + "y": 13, + "elevation": 3, + "movement_type": "18", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SixIsland_EventScript_167EE2", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 11, + "y": 23, + "elevation": 3, + "dest_map": "MAP_SIX_ISLAND_HARBOR", + "dest_warp_id": 0 + }, + { + "x": 11, + "y": 11, + "elevation": 0, + "dest_map": "MAP_SIX_ISLAND_POKEMON_CENTER_1F", + "dest_warp_id": 0 + }, + { + "x": 16, + "y": 17, + "elevation": 0, + "dest_map": "MAP_SIX_ISLAND_HOUSE", + "dest_warp_id": 0 + }, + { + "x": 20, + "y": 11, + "elevation": 0, + "dest_map": "MAP_SIX_ISLAND_MART", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 9, + "y": 17, + "elevation": 0, + "script": "SixIsland_EventScript_167EF4" + }, + { + "type": "hidden_item", + "x": 9, + "y": 7, + "elevation": 3, + "item": "ITEM_LEPPA_BERRY", + "flag": "184", + "unknown": 1 + } + ] +}
\ No newline at end of file diff --git a/data/maps/SixIsland_AlteringCave/map.json b/data/maps/SixIsland_AlteringCave/map.json new file mode 100644 index 000000000..123c8e6bb --- /dev/null +++ b/data/maps/SixIsland_AlteringCave/map.json @@ -0,0 +1,27 @@ +{ + "id": "MAP_SIX_ISLAND_ALTERING_CAVE", + "name": "SixIsland_AlteringCave", + "layout": "LAYOUT_SIX_ISLAND_ALTERING_CAVE", + "music": "BGM_FRLG_MT_EMBER", + "region_map_section": "MAPSEC_ALTERING_CAVE", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 18, + "y": 22, + "elevation": 3, + "dest_map": "MAP_SIX_ISLAND_OUTCAST_ISLAND", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/SixIsland_AlteringCave/scripts.inc b/data/maps/SixIsland_AlteringCave/scripts.inc new file mode 100644 index 000000000..f88377e5f --- /dev/null +++ b/data/maps/SixIsland_AlteringCave/scripts.inc @@ -0,0 +1,7 @@ +SixIsland_AlteringCave_MapScripts:: @ 81646A4 + map_script 3, SSAnne_1F_Room12_MapScript1_1646AA + .byte 0 + +SSAnne_1F_Room12_MapScript1_1646AA:: @ 81646AA + setworldmapflag 2238 + end diff --git a/data/maps/SixIsland_DottedHole_1F/map.json b/data/maps/SixIsland_DottedHole_1F/map.json new file mode 100644 index 000000000..3edfe625f --- /dev/null +++ b/data/maps/SixIsland_DottedHole_1F/map.json @@ -0,0 +1,48 @@ +{ + "id": "MAP_SIX_ISLAND_DOTTED_HOLE_1F", + "name": "SixIsland_DottedHole_1F", + "layout": "LAYOUT_SIX_ISLAND_DOTTED_HOLE_1F", + "music": "BGM_FRLG_TANOBY_RUINS", + "region_map_section": "MAPSEC_DOTTED_HOLE", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 6, + "y": 9, + "elevation": 3, + "dest_map": "MAP_SIX_ISLAND_RUIN_VALLEY", + "dest_warp_id": 0 + }, + { + "x": 6, + "y": 5, + "elevation": 3, + "dest_map": "MAP_SIX_ISLAND_DOTTED_HOLE_B1F", + "dest_warp_id": 0 + }, + { + "x": 13, + "y": 5, + "elevation": 3, + "dest_map": "MAP_SIX_ISLAND_DOTTED_HOLE_SAPPHIRE_ROOM", + "dest_warp_id": 0 + }, + { + "x": 6, + "y": 7, + "elevation": 3, + "dest_map": "MAP_SIX_ISLAND_DOTTED_HOLE_B1F", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/SixIsland_DottedHole_1F/scripts.inc b/data/maps/SixIsland_DottedHole_1F/scripts.inc new file mode 100644 index 000000000..df572ad4d --- /dev/null +++ b/data/maps/SixIsland_DottedHole_1F/scripts.inc @@ -0,0 +1,35 @@ +SixIsland_DottedHole_1F_MapScripts:: @ 8164182 + map_script 3, SSAnne_CaptainsOffice5_MapScript1_164188 + .byte 0 + +SSAnne_CaptainsOffice5_MapScript1_164188:: @ 8164188 + setworldmapflag 2235 + end + +SixIsland_DottedHole_B1F_EventScript_16418C:: @ 816418C + lockall + braillemessage gUnknown_81A9288 + waitbuttonpress + releaseall + end + +SSAnne_CaptainsOffice9_EventScript_164195:: @ 8164195 + lockall + braillemessage gUnknown_81A928B + waitbuttonpress + releaseall + end + +SixIsland_DottedHole_B3F_EventScript_16419E:: @ 816419E + lockall + braillemessage gUnknown_81A9290 + waitbuttonpress + releaseall + end + +SixIsland_DottedHole_B2F_EventScript_1641A7:: @ 81641A7 + lockall + braillemessage gUnknown_81A9296 + waitbuttonpress + releaseall + end diff --git a/data/maps/SixIsland_DottedHole_B1F/events.inc b/data/maps/SixIsland_DottedHole_B1F/events.inc deleted file mode 100644 index c871cb9b3..000000000 --- a/data/maps/SixIsland_DottedHole_B1F/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -SixIsland_DottedHole_B1F_MapWarps: - warp_def 6, 7, 3, 1, 371 - warp_def 6, 1, 3, 0, 373 - warp_def 11, 5, 3, 3, 371 - warp_def 6, 9, 3, 3, 371 - warp_def 1, 5, 3, 3, 371 - -SixIsland_DottedHole_B1F_MapBGEvents: - bg_event 6, 5, 0, 1, 0, SixIsland_DottedHole_B1F_EventScript_16418C - -SixIsland_DottedHole_B1F_MapEvents:: - map_events 0x0, SixIsland_DottedHole_B1F_MapWarps, 0x0, SixIsland_DottedHole_B1F_MapBGEvents diff --git a/data/maps/SixIsland_DottedHole_B1F/header.inc b/data/maps/SixIsland_DottedHole_B1F/header.inc deleted file mode 100644 index e6781f0e2..000000000 --- a/data/maps/SixIsland_DottedHole_B1F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SixIsland_DottedHole_B1F:: @ 834FEC4 - .4byte SixIsland_DottedHole_B1F_Layout @ 0x8343808 - .4byte SixIsland_DottedHole_B1F_MapEvents @ 0x83B3898 - .4byte SixIsland_DottedHole_B1F_MapScripts @ 0x81641B0 - .4byte NULL - .2byte BGM_FRLG_TANOBY_RUINS - .2byte 310 - .byte 0xb4, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/SixIsland_DottedHole_B1F/map.json b/data/maps/SixIsland_DottedHole_B1F/map.json new file mode 100644 index 000000000..221b7f31a --- /dev/null +++ b/data/maps/SixIsland_DottedHole_B1F/map.json @@ -0,0 +1,63 @@ +{ + "id": "MAP_SIX_ISLAND_DOTTED_HOLE_B1F", + "name": "SixIsland_DottedHole_B1F", + "layout": "LAYOUT_SIX_ISLAND_DOTTED_HOLE_B1F", + "music": "BGM_FRLG_TANOBY_RUINS", + "region_map_section": "MAPSEC_DOTTED_HOLE", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 6, + "y": 7, + "elevation": 3, + "dest_map": "MAP_SIX_ISLAND_DOTTED_HOLE_1F", + "dest_warp_id": 1 + }, + { + "x": 6, + "y": 1, + "elevation": 3, + "dest_map": "MAP_SIX_ISLAND_DOTTED_HOLE_B2F", + "dest_warp_id": 0 + }, + { + "x": 11, + "y": 5, + "elevation": 3, + "dest_map": "MAP_SIX_ISLAND_DOTTED_HOLE_1F", + "dest_warp_id": 3 + }, + { + "x": 6, + "y": 9, + "elevation": 3, + "dest_map": "MAP_SIX_ISLAND_DOTTED_HOLE_1F", + "dest_warp_id": 3 + }, + { + "x": 1, + "y": 5, + "elevation": 3, + "dest_map": "MAP_SIX_ISLAND_DOTTED_HOLE_1F", + "dest_warp_id": 3 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_1", + "x": 6, + "y": 5, + "elevation": 0, + "script": "SixIsland_DottedHole_B1F_EventScript_16418C" + } + ] +}
\ No newline at end of file diff --git a/data/maps/SixIsland_DottedHole_B2F/events.inc b/data/maps/SixIsland_DottedHole_B2F/events.inc deleted file mode 100644 index 14b3b3f1e..000000000 --- a/data/maps/SixIsland_DottedHole_B2F/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -SixIsland_DottedHole_B2F_MapWarps: - warp_def 6, 7, 3, 1, 372 - warp_def 6, 1, 3, 3, 371 - warp_def 11, 5, 3, 3, 371 - warp_def 6, 9, 3, 3, 371 - warp_def 1, 5, 3, 0, 374 - -SixIsland_DottedHole_B2F_MapBGEvents: - bg_event 6, 5, 0, 1, 0, SixIsland_DottedHole_B2F_EventScript_1641A7 - -SixIsland_DottedHole_B2F_MapEvents:: - map_events 0x0, SixIsland_DottedHole_B2F_MapWarps, 0x0, SixIsland_DottedHole_B2F_MapBGEvents diff --git a/data/maps/SixIsland_DottedHole_B2F/header.inc b/data/maps/SixIsland_DottedHole_B2F/header.inc deleted file mode 100644 index 5b02b306b..000000000 --- a/data/maps/SixIsland_DottedHole_B2F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SixIsland_DottedHole_B2F:: @ 834FEE0 - .4byte SixIsland_DottedHole_B2F_Layout @ 0x834394C - .4byte SixIsland_DottedHole_B2F_MapEvents @ 0x83B38E0 - .4byte SixIsland_DottedHole_B2F_MapScripts @ 0x81641B1 - .4byte NULL - .2byte BGM_FRLG_TANOBY_RUINS - .2byte 311 - .byte 0xb4, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/SixIsland_DottedHole_B2F/map.json b/data/maps/SixIsland_DottedHole_B2F/map.json new file mode 100644 index 000000000..7c43b1177 --- /dev/null +++ b/data/maps/SixIsland_DottedHole_B2F/map.json @@ -0,0 +1,63 @@ +{ + "id": "MAP_SIX_ISLAND_DOTTED_HOLE_B2F", + "name": "SixIsland_DottedHole_B2F", + "layout": "LAYOUT_SIX_ISLAND_DOTTED_HOLE_B2F", + "music": "BGM_FRLG_TANOBY_RUINS", + "region_map_section": "MAPSEC_DOTTED_HOLE", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 6, + "y": 7, + "elevation": 3, + "dest_map": "MAP_SIX_ISLAND_DOTTED_HOLE_B1F", + "dest_warp_id": 1 + }, + { + "x": 6, + "y": 1, + "elevation": 3, + "dest_map": "MAP_SIX_ISLAND_DOTTED_HOLE_1F", + "dest_warp_id": 3 + }, + { + "x": 11, + "y": 5, + "elevation": 3, + "dest_map": "MAP_SIX_ISLAND_DOTTED_HOLE_1F", + "dest_warp_id": 3 + }, + { + "x": 6, + "y": 9, + "elevation": 3, + "dest_map": "MAP_SIX_ISLAND_DOTTED_HOLE_1F", + "dest_warp_id": 3 + }, + { + "x": 1, + "y": 5, + "elevation": 3, + "dest_map": "MAP_SIX_ISLAND_DOTTED_HOLE_B3F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_1", + "x": 6, + "y": 5, + "elevation": 0, + "script": "SixIsland_DottedHole_B2F_EventScript_1641A7" + } + ] +}
\ No newline at end of file diff --git a/data/maps/SixIsland_DottedHole_B3F/events.inc b/data/maps/SixIsland_DottedHole_B3F/events.inc deleted file mode 100644 index 684924658..000000000 --- a/data/maps/SixIsland_DottedHole_B3F/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -SixIsland_DottedHole_B3F_MapWarps: - warp_def 6, 7, 3, 4, 373 - warp_def 6, 1, 3, 3, 371 - warp_def 11, 5, 3, 0, 375 - warp_def 6, 9, 3, 3, 371 - warp_def 1, 5, 3, 3, 371 - -SixIsland_DottedHole_B3F_MapBGEvents: - bg_event 6, 5, 0, 1, 0, SixIsland_DottedHole_B3F_EventScript_16419E - -SixIsland_DottedHole_B3F_MapEvents:: - map_events 0x0, SixIsland_DottedHole_B3F_MapWarps, 0x0, SixIsland_DottedHole_B3F_MapBGEvents diff --git a/data/maps/SixIsland_DottedHole_B3F/header.inc b/data/maps/SixIsland_DottedHole_B3F/header.inc deleted file mode 100644 index 0484d6fb4..000000000 --- a/data/maps/SixIsland_DottedHole_B3F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SixIsland_DottedHole_B3F:: @ 834FEFC - .4byte SixIsland_DottedHole_B3F_Layout @ 0x8343A90 - .4byte SixIsland_DottedHole_B3F_MapEvents @ 0x83B3928 - .4byte SixIsland_DottedHole_B3F_MapScripts @ 0x81641B2 - .4byte NULL - .2byte BGM_FRLG_TANOBY_RUINS - .2byte 312 - .byte 0xb4, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/SixIsland_DottedHole_B3F/map.json b/data/maps/SixIsland_DottedHole_B3F/map.json new file mode 100644 index 000000000..dddb7b32c --- /dev/null +++ b/data/maps/SixIsland_DottedHole_B3F/map.json @@ -0,0 +1,63 @@ +{ + "id": "MAP_SIX_ISLAND_DOTTED_HOLE_B3F", + "name": "SixIsland_DottedHole_B3F", + "layout": "LAYOUT_SIX_ISLAND_DOTTED_HOLE_B3F", + "music": "BGM_FRLG_TANOBY_RUINS", + "region_map_section": "MAPSEC_DOTTED_HOLE", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 6, + "y": 7, + "elevation": 3, + "dest_map": "MAP_SIX_ISLAND_DOTTED_HOLE_B2F", + "dest_warp_id": 4 + }, + { + "x": 6, + "y": 1, + "elevation": 3, + "dest_map": "MAP_SIX_ISLAND_DOTTED_HOLE_1F", + "dest_warp_id": 3 + }, + { + "x": 11, + "y": 5, + "elevation": 3, + "dest_map": "MAP_SIX_ISLAND_DOTTED_HOLE_B4F", + "dest_warp_id": 0 + }, + { + "x": 6, + "y": 9, + "elevation": 3, + "dest_map": "MAP_SIX_ISLAND_DOTTED_HOLE_1F", + "dest_warp_id": 3 + }, + { + "x": 1, + "y": 5, + "elevation": 3, + "dest_map": "MAP_SIX_ISLAND_DOTTED_HOLE_1F", + "dest_warp_id": 3 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_1", + "x": 6, + "y": 5, + "elevation": 0, + "script": "SixIsland_DottedHole_B3F_EventScript_16419E" + } + ] +}
\ No newline at end of file diff --git a/data/maps/SixIsland_DottedHole_B4F/map.json b/data/maps/SixIsland_DottedHole_B4F/map.json new file mode 100644 index 000000000..40080b501 --- /dev/null +++ b/data/maps/SixIsland_DottedHole_B4F/map.json @@ -0,0 +1,63 @@ +{ + "id": "MAP_SIX_ISLAND_DOTTED_HOLE_B4F", + "name": "SixIsland_DottedHole_B4F", + "layout": "LAYOUT_SIX_ISLAND_DOTTED_HOLE_B4F", + "music": "BGM_FRLG_TANOBY_RUINS", + "region_map_section": "MAPSEC_DOTTED_HOLE", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 6, + "y": 7, + "elevation": 3, + "dest_map": "MAP_SIX_ISLAND_DOTTED_HOLE_B3F", + "dest_warp_id": 2 + }, + { + "x": 6, + "y": 1, + "elevation": 3, + "dest_map": "MAP_SIX_ISLAND_DOTTED_HOLE_1F", + "dest_warp_id": 3 + }, + { + "x": 11, + "y": 5, + "elevation": 3, + "dest_map": "MAP_SIX_ISLAND_DOTTED_HOLE_1F", + "dest_warp_id": 3 + }, + { + "x": 6, + "y": 9, + "elevation": 3, + "dest_map": "MAP_SIX_ISLAND_DOTTED_HOLE_SAPPHIRE_ROOM", + "dest_warp_id": 1 + }, + { + "x": 1, + "y": 5, + "elevation": 3, + "dest_map": "MAP_SIX_ISLAND_DOTTED_HOLE_1F", + "dest_warp_id": 3 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_1", + "x": 6, + "y": 5, + "elevation": 0, + "script": "SSAnne_CaptainsOffice9_EventScript_164195" + } + ] +}
\ No newline at end of file diff --git a/data/maps/SixIsland_DottedHole_B4F/scripts.inc b/data/maps/SixIsland_DottedHole_B4F/scripts.inc new file mode 100644 index 000000000..d265594c7 --- /dev/null +++ b/data/maps/SixIsland_DottedHole_B4F/scripts.inc @@ -0,0 +1,2 @@ +SixIsland_DottedHole_B4F_MapScripts:: @ 81641B3 + .byte 0 diff --git a/data/maps/SixIsland_DottedHole_SapphireRoom/events.inc b/data/maps/SixIsland_DottedHole_SapphireRoom/events.inc deleted file mode 100644 index 2d8531934..000000000 --- a/data/maps/SixIsland_DottedHole_SapphireRoom/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -SixIsland_DottedHole_SapphireRoom_EventObjects: - object_event 1, 100, 0, 7, 0, 7, 0, 0, 8, 17, 0, 0, 0, 0, 0, SixIsland_DottedHole_SapphireRoom_EventScript_1641B5, 143, 0, 0 - object_event 2, 55, 0, 5, 0, 9, 0, 3, 8, 17, 0, 0, 0, 0, 0, 0x0, 144, 0, 0 - -SixIsland_DottedHole_SapphireRoom_MapWarps: - warp_def 11, 7, 3, 2, 371 - warp_def 5, 9, 3, 3, 375 - -SixIsland_DottedHole_SapphireRoom_MapBGEvents: - bg_event 7, 2, 0, 1, 0, SixIsland_DottedHole_SapphireRoom_EventScript_16441F - -SixIsland_DottedHole_SapphireRoom_MapEvents:: - map_events SixIsland_DottedHole_SapphireRoom_EventObjects, SixIsland_DottedHole_SapphireRoom_MapWarps, 0x0, SixIsland_DottedHole_SapphireRoom_MapBGEvents diff --git a/data/maps/SixIsland_DottedHole_SapphireRoom/header.inc b/data/maps/SixIsland_DottedHole_SapphireRoom/header.inc deleted file mode 100644 index cb34017a5..000000000 --- a/data/maps/SixIsland_DottedHole_SapphireRoom/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SixIsland_DottedHole_SapphireRoom:: @ 834FF34 - .4byte SixIsland_DottedHole_SapphireRoom_Layout @ 0x8343DD8 - .4byte SixIsland_DottedHole_SapphireRoom_MapEvents @ 0x83B39D0 - .4byte SixIsland_DottedHole_SapphireRoom_MapScripts @ 0x81641B4 - .4byte NULL - .2byte BGM_FRLG_TANOBY_RUINS - .2byte 314 - .byte 0xb4, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/SixIsland_DottedHole_SapphireRoom/map.json b/data/maps/SixIsland_DottedHole_SapphireRoom/map.json new file mode 100644 index 000000000..08894ae8c --- /dev/null +++ b/data/maps/SixIsland_DottedHole_SapphireRoom/map.json @@ -0,0 +1,69 @@ +{ + "id": "MAP_SIX_ISLAND_DOTTED_HOLE_SAPPHIRE_ROOM", + "name": "SixIsland_DottedHole_SapphireRoom", + "layout": "LAYOUT_SIX_ISLAND_DOTTED_HOLE_SAPPHIRE_ROOM", + "music": "BGM_FRLG_TANOBY_RUINS", + "region_map_section": "MAPSEC_DOTTED_HOLE", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "100", + "x": 7, + "y": 7, + "elevation": 0, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SixIsland_DottedHole_SapphireRoom_EventScript_1641B5", + "flag": "143" + }, + { + "graphics_id": "55", + "x": 5, + "y": 9, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "144" + } + ], + "warp_events": [ + { + "x": 11, + "y": 7, + "elevation": 3, + "dest_map": "MAP_SIX_ISLAND_DOTTED_HOLE_1F", + "dest_warp_id": 2 + }, + { + "x": 5, + "y": 9, + "elevation": 3, + "dest_map": "MAP_SIX_ISLAND_DOTTED_HOLE_B4F", + "dest_warp_id": 3 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_1", + "x": 7, + "y": 2, + "elevation": 0, + "script": "SixIsland_DottedHole_SapphireRoom_EventScript_16441F" + } + ] +}
\ No newline at end of file diff --git a/data/maps/SixIsland_GreenPath/connections.inc b/data/maps/SixIsland_GreenPath/connections.inc deleted file mode 100644 index d79db04f9..000000000 --- a/data/maps/SixIsland_GreenPath/connections.inc +++ /dev/null @@ -1,7 +0,0 @@ -SixIsland_GreenPath_MapConnectionsList: @ 8352E24 - connection up, 0, MAP_SIX_ISLAND_OUTCASTISLAND - connection right, 0, MAP_SIX_ISLAND_WATERPATH - -SixIsland_GreenPath_MapConnections:: @ 8352E3C - .4byte 2 - .4byte SixIsland_GreenPath_MapConnectionsList diff --git a/data/maps/SixIsland_GreenPath/events.inc b/data/maps/SixIsland_GreenPath/events.inc deleted file mode 100644 index 025b2dba6..000000000 --- a/data/maps/SixIsland_GreenPath/events.inc +++ /dev/null @@ -1,16 +0,0 @@ -SixIsland_GreenPath_EventObjects: - object_event 1, 23, 0, 11, 0, 8, 0, 3, 20, 17, 0, 1, 0, 2, 0, SixIsland_GreenPath_EventScript_1AC517, 0, 0, 0 - -SixIsland_GreenPath_MapWarps: - warp_def 63, 10, 3, 1, 377 - warp_def 64, 10, 3, 1, 377 - warp_def 45, 10, 3, 4, 377 - warp_def 46, 10, 3, 4, 377 - -SixIsland_GreenPath_MapBGEvents: - bg_event 40, 10, 0, 0, 0, SixIsland_GreenPath_EventScript_168B37 - bg_event 69, 10, 0, 0, 0, SixIsland_GreenPath_EventScript_168B2E - bg_event 12, 9, 3, 7, 0, 2, 180, 1 - -SixIsland_GreenPath_MapEvents:: - map_events SixIsland_GreenPath_EventObjects, SixIsland_GreenPath_MapWarps, 0x0, SixIsland_GreenPath_MapBGEvents diff --git a/data/maps/SixIsland_GreenPath/header.inc b/data/maps/SixIsland_GreenPath/header.inc deleted file mode 100644 index 7e378de71..000000000 --- a/data/maps/SixIsland_GreenPath/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SixIsland_GreenPath:: @ 8350C8C - .4byte SixIsland_GreenPath_Layout @ 0x832E0D0 - .4byte SixIsland_GreenPath_MapEvents @ 0x83B8FA8 - .4byte SixIsland_GreenPath_MapScripts @ 0x8168B2D - .4byte SixIsland_GreenPath_MapConnections @ 0x8352E3C - .2byte BGM_FRLG_SEVII_ISLANDS - .2byte 251 - .byte 0xa4, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/SixIsland_GreenPath/map.json b/data/maps/SixIsland_GreenPath/map.json new file mode 100644 index 000000000..cbc6b6784 --- /dev/null +++ b/data/maps/SixIsland_GreenPath/map.json @@ -0,0 +1,97 @@ +{ + "id": "MAP_SIX_ISLAND_GREEN_PATH", + "name": "SixIsland_GreenPath", + "layout": "LAYOUT_SIX_ISLAND_GREEN_PATH", + "music": "BGM_FRLG_SEVII_ISLANDS", + "region_map_section": "MAPSEC_GREEN_PATH", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_3", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_SIX_ISLAND_OUTCAST_ISLAND", + "offset": 0, + "direction": "up" + }, + { + "map": "MAP_SIX_ISLAND_WATER_PATH", + "offset": 0, + "direction": "right" + } + ], + "object_events": [ + { + "graphics_id": "23", + "x": 11, + "y": 8, + "elevation": 3, + "movement_type": "20", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "SixIsland_GreenPath_EventScript_1AC517", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 63, + "y": 10, + "elevation": 3, + "dest_map": "MAP_SIX_ISLAND_PATTERN_BUSH", + "dest_warp_id": 1 + }, + { + "x": 64, + "y": 10, + "elevation": 3, + "dest_map": "MAP_SIX_ISLAND_PATTERN_BUSH", + "dest_warp_id": 1 + }, + { + "x": 45, + "y": 10, + "elevation": 3, + "dest_map": "MAP_SIX_ISLAND_PATTERN_BUSH", + "dest_warp_id": 4 + }, + { + "x": 46, + "y": 10, + "elevation": 3, + "dest_map": "MAP_SIX_ISLAND_PATTERN_BUSH", + "dest_warp_id": 4 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 40, + "y": 10, + "elevation": 0, + "script": "SixIsland_GreenPath_EventScript_168B37" + }, + { + "type": "bg_event_type_0", + "x": 69, + "y": 10, + "elevation": 0, + "script": "SixIsland_GreenPath_EventScript_168B2E" + }, + { + "type": "hidden_item", + "x": 12, + "y": 9, + "elevation": 3, + "item": "POCKET_KEY_ITEMS", + "flag": "180", + "unknown": 1 + } + ] +}
\ No newline at end of file diff --git a/data/maps/SixIsland_Harbor/events.inc b/data/maps/SixIsland_Harbor/events.inc deleted file mode 100644 index 7ef15357c..000000000 --- a/data/maps/SixIsland_Harbor/events.inc +++ /dev/null @@ -1,9 +0,0 @@ -SixIsland_Harbor_EventObjects: - object_event 1, 108, 0, 8, 0, 9, 0, 0, 8, 17, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 - object_event 2, 62, 0, 8, 0, 6, 0, 3, 7, 17, 0, 0, 0, 0, 0, SixIsland_Harbor_EventScript_171E48, 0, 0, 0 - -SixIsland_Harbor_MapWarps: - warp_def 8, 2, 3, 0, 786 - -SixIsland_Harbor_MapEvents:: - map_events SixIsland_Harbor_EventObjects, SixIsland_Harbor_MapWarps, 0x0, 0x0 diff --git a/data/maps/SixIsland_Harbor/header.inc b/data/maps/SixIsland_Harbor/header.inc deleted file mode 100644 index edbb428b0..000000000 --- a/data/maps/SixIsland_Harbor/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SixIsland_Harbor:: @ 8351F08 - .4byte Island_Harbor_Layout @ 0x8343FB8 - .4byte SixIsland_Harbor_MapEvents @ 0x83BF178 - .4byte SixIsland_Harbor_MapScripts @ 0x8171E47 - .4byte NULL - .2byte BGM_FRLG_ISLAND_SIX - .2byte 315 - .byte 0x95, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/SixIsland_Harbor/map.json b/data/maps/SixIsland_Harbor/map.json new file mode 100644 index 000000000..3e5254f71 --- /dev/null +++ b/data/maps/SixIsland_Harbor/map.json @@ -0,0 +1,54 @@ +{ + "id": "MAP_SIX_ISLAND_HARBOR", + "name": "SixIsland_Harbor", + "layout": "LAYOUT_ISLAND_HARBOR", + "music": "BGM_FRLG_ISLAND_SIX", + "region_map_section": "MAPSEC_SIX_ISLAND", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "108", + "x": 8, + "y": 9, + "elevation": 0, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "62", + "x": 8, + "y": 6, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SixIsland_Harbor_EventScript_171E48", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 8, + "y": 2, + "elevation": 3, + "dest_map": "MAP_SIX_ISLAND", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/SixIsland_House/events.inc b/data/maps/SixIsland_House/events.inc deleted file mode 100644 index 583a8c1e8..000000000 --- a/data/maps/SixIsland_House/events.inc +++ /dev/null @@ -1,8 +0,0 @@ -SixIsland_House_EventObjects: - object_event 1, 32, 0, 7, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, SixIsland_House_EventScript_171E5C, 0, 0, 0 - -SixIsland_House_MapWarps: - warp_def 4, 7, 3, 2, 786 - -SixIsland_House_MapEvents:: - map_events SixIsland_House_EventObjects, SixIsland_House_MapWarps, 0x0, 0x0 diff --git a/data/maps/SixIsland_House/header.inc b/data/maps/SixIsland_House/header.inc deleted file mode 100644 index a98057971..000000000 --- a/data/maps/SixIsland_House/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SixIsland_House:: @ 8351F24 - .4byte House3_Layout @ 0x82D5CB8 - .4byte SixIsland_House_MapEvents @ 0x83BF1AC - .4byte SixIsland_House_MapScripts @ 0x8171E5B - .4byte NULL - .2byte BGM_FRLG_ISLAND_SIX - .2byte 11 - .byte 0x95, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/SixIsland_House/map.json b/data/maps/SixIsland_House/map.json new file mode 100644 index 000000000..3f50160d3 --- /dev/null +++ b/data/maps/SixIsland_House/map.json @@ -0,0 +1,41 @@ +{ + "id": "MAP_SIX_ISLAND_HOUSE", + "name": "SixIsland_House", + "layout": "LAYOUT_HOUSE3", + "music": "BGM_FRLG_ISLAND_SIX", + "region_map_section": "MAPSEC_SIX_ISLAND", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "32", + "x": 7, + "y": 5, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SixIsland_House_EventScript_171E5C", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_SIX_ISLAND", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/SixIsland_Mart/events.inc b/data/maps/SixIsland_Mart/events.inc deleted file mode 100644 index a2dd4ff20..000000000 --- a/data/maps/SixIsland_Mart/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -SixIsland_Mart_EventObjects: - object_event 1, 68, 0, 2, 0, 3, 0, 0, 10, 17, 0, 0, 0, 0, 0, SixIsland_Mart_EventScript_171E66, 0, 0, 0 - object_event 2, 35, 0, 8, 0, 3, 0, 3, 2, 17, 0, 0, 0, 0, 0, SixIsland_Mart_EventScript_1ACFEF, 0, 0, 0 - object_event 3, 40, 0, 7, 0, 7, 0, 3, 2, 17, 0, 0, 0, 0, 0, SixIsland_Mart_EventScript_171EA0, 0, 0, 0 - -SixIsland_Mart_MapWarps: - warp_def 4, 7, 3, 3, 786 - -SixIsland_Mart_MapEvents:: - map_events SixIsland_Mart_EventObjects, SixIsland_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/SixIsland_Mart/header.inc b/data/maps/SixIsland_Mart/header.inc deleted file mode 100644 index d7483ec18..000000000 --- a/data/maps/SixIsland_Mart/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SixIsland_Mart:: @ 8351F40 - .4byte Mart_Layout @ 0x82D5BCC - .4byte SixIsland_Mart_MapEvents @ 0x83BF210 - .4byte SixIsland_Mart_MapScripts @ 0x8171E65 - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 10 - .byte 0x95, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/SixIsland_Mart/map.json b/data/maps/SixIsland_Mart/map.json new file mode 100644 index 000000000..a30466efb --- /dev/null +++ b/data/maps/SixIsland_Mart/map.json @@ -0,0 +1,67 @@ +{ + "id": "MAP_SIX_ISLAND_MART", + "name": "SixIsland_Mart", + "layout": "LAYOUT_MART", + "music": "BGM_FRLG_POKEMON_CENTER", + "region_map_section": "MAPSEC_SIX_ISLAND", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "68", + "x": 2, + "y": 3, + "elevation": 0, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SixIsland_Mart_EventScript_171E66", + "flag": "0" + }, + { + "graphics_id": "35", + "x": 8, + "y": 3, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SixIsland_Mart_EventScript_1ACFEF", + "flag": "0" + }, + { + "graphics_id": "40", + "x": 7, + "y": 7, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SixIsland_Mart_EventScript_171EA0", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_SIX_ISLAND", + "dest_warp_id": 3 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/SixIsland_OutcastIsland/connections.inc b/data/maps/SixIsland_OutcastIsland/connections.inc deleted file mode 100644 index 90a67ec97..000000000 --- a/data/maps/SixIsland_OutcastIsland/connections.inc +++ /dev/null @@ -1,6 +0,0 @@ -SixIsland_OutcastIsland_MapConnectionsList: @ 8352E10 - connection down, 0, MAP_SIX_ISLAND_GREENPATH - -SixIsland_OutcastIsland_MapConnections:: @ 8352E1C - .4byte 1 - .4byte SixIsland_OutcastIsland_MapConnectionsList diff --git a/data/maps/SixIsland_OutcastIsland/events.inc b/data/maps/SixIsland_OutcastIsland/events.inc deleted file mode 100644 index 4c7dd1b88..000000000 --- a/data/maps/SixIsland_OutcastIsland/events.inc +++ /dev/null @@ -1,18 +0,0 @@ -SixIsland_OutcastIsland_EventObjects: - object_event 1, 49, 0, 9, 0, 24, 0, 3, 1, 17, 0, 1, 0, 1, 0, SixIsland_OutcastIsland_EventScript_168B16, 136, 0, 0 - object_event 2, 57, 0, 12, 0, 15, 0, 3, 7, 17, 0, 1, 0, 1, 0, SixIsland_OutcastIsland_EventScript_1AC3D1, 0, 0, 0 - object_event 3, 43, 0, 13, 0, 34, 0, 1, 1, 17, 0, 1, 0, 1, 0, SixIsland_OutcastIsland_EventScript_1AC40F, 0, 0, 0 - object_event 4, 44, 0, 14, 0, 61, 0, 1, 50, 66, 0, 1, 0, 1, 0, SixIsland_OutcastIsland_EventScript_1AC44D, 0, 0, 0 - object_event 5, 44, 0, 10, 0, 44, 0, 1, 7, 17, 0, 1, 0, 1, 0, SixIsland_OutcastIsland_EventScript_1AC48B, 0, 0, 0 - object_event 6, 36, 0, 11, 0, 44, 0, 1, 7, 17, 0, 1, 0, 1, 0, SixIsland_OutcastIsland_EventScript_1AC4D1, 0, 0, 0 - object_event 7, 92, 0, 11, 0, 16, 0, 3, 8, 17, 0, 0, 0, 0, 0, SixIsland_OutcastIsland_EventScript_1BEC90, 481, 0, 0 - -SixIsland_OutcastIsland_MapWarps: - warp_def 7, 21, 3, 0, 378 - -SixIsland_OutcastIsland_MapBGEvents: - bg_event 16, 23, 3, 7, 0, 109, 178, 1 - bg_event 6, 24, 3, 7, 0, 6, 179, 1 - -SixIsland_OutcastIsland_MapEvents:: - map_events SixIsland_OutcastIsland_EventObjects, SixIsland_OutcastIsland_MapWarps, 0x0, SixIsland_OutcastIsland_MapBGEvents diff --git a/data/maps/SixIsland_OutcastIsland/header.inc b/data/maps/SixIsland_OutcastIsland/header.inc deleted file mode 100644 index e6cc6186d..000000000 --- a/data/maps/SixIsland_OutcastIsland/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SixIsland_OutcastIsland:: @ 8350C70 - .4byte SixIsland_OutcastIsland_Layout @ 0x832D56C - .4byte SixIsland_OutcastIsland_MapEvents @ 0x83B8F38 - .4byte SixIsland_OutcastIsland_MapScripts @ 0x8168B15 - .4byte SixIsland_OutcastIsland_MapConnections @ 0x8352E1C - .2byte BGM_FRLG_SEVII_ISLANDS - .2byte 250 - .byte 0xa3, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/SixIsland_OutcastIsland/map.json b/data/maps/SixIsland_OutcastIsland/map.json new file mode 100644 index 000000000..dd19cb543 --- /dev/null +++ b/data/maps/SixIsland_OutcastIsland/map.json @@ -0,0 +1,144 @@ +{ + "id": "MAP_SIX_ISLAND_OUTCAST_ISLAND", + "name": "SixIsland_OutcastIsland", + "layout": "LAYOUT_SIX_ISLAND_OUTCAST_ISLAND", + "music": "BGM_FRLG_SEVII_ISLANDS", + "region_map_section": "MAPSEC_OUTCAST_ISLAND", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_3", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_SIX_ISLAND_GREEN_PATH", + "offset": 0, + "direction": "down" + } + ], + "object_events": [ + { + "graphics_id": "49", + "x": 9, + "y": 24, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "SixIsland_OutcastIsland_EventScript_168B16", + "flag": "136" + }, + { + "graphics_id": "57", + "x": 12, + "y": 15, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "SixIsland_OutcastIsland_EventScript_1AC3D1", + "flag": "0" + }, + { + "graphics_id": "43", + "x": 13, + "y": 34, + "elevation": 1, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "SixIsland_OutcastIsland_EventScript_1AC40F", + "flag": "0" + }, + { + "graphics_id": "44", + "x": 14, + "y": 61, + "elevation": 1, + "movement_type": "50", + "movement_range_x": 2, + "movement_range_y": 4, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "SixIsland_OutcastIsland_EventScript_1AC44D", + "flag": "0" + }, + { + "graphics_id": "44", + "x": 10, + "y": 44, + "elevation": 1, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "SixIsland_OutcastIsland_EventScript_1AC48B", + "flag": "0" + }, + { + "graphics_id": "36", + "x": 11, + "y": 44, + "elevation": 1, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "SixIsland_OutcastIsland_EventScript_1AC4D1", + "flag": "0" + }, + { + "graphics_id": "92", + "x": 11, + "y": 16, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SixIsland_OutcastIsland_EventScript_1BEC90", + "flag": "481" + } + ], + "warp_events": [ + { + "x": 7, + "y": 21, + "elevation": 3, + "dest_map": "MAP_SIX_ISLAND_ALTERING_CAVE", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "hidden_item", + "x": 16, + "y": 23, + "elevation": 3, + "item": "ITEM_STAR_PIECE", + "flag": "178", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 6, + "y": 24, + "elevation": 3, + "item": "ITEM_NET_BALL", + "flag": "179", + "unknown": 1 + } + ] +}
\ No newline at end of file diff --git a/data/maps/SixIsland_PatternBush/map.json b/data/maps/SixIsland_PatternBush/map.json new file mode 100644 index 000000000..95f3b63d5 --- /dev/null +++ b/data/maps/SixIsland_PatternBush/map.json @@ -0,0 +1,219 @@ +{ + "id": "MAP_SIX_ISLAND_PATTERN_BUSH", + "name": "SixIsland_PatternBush", + "layout": "LAYOUT_SIX_ISLAND_PATTERN_BUSH", + "music": "BGM_FRLG_VIRIDIAN_FOREST", + "region_map_section": "MAPSEC_PATTERN_BUSH", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_3", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "28", + "x": 48, + "y": 15, + "elevation": 3, + "movement_type": "20", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "SSAnne_1F_Room11_EventScript_164590", + "flag": "0" + }, + { + "graphics_id": "28", + "x": 10, + "y": 5, + "elevation": 3, + "movement_type": "18", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "SSAnne_1F_Room11_EventScript_1645A7", + "flag": "0" + }, + { + "graphics_id": "20", + "x": 51, + "y": 6, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "SSAnne_1F_Room11_EventScript_1645BE", + "flag": "0" + }, + { + "graphics_id": "20", + "x": 12, + "y": 13, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 2, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "SSAnne_1F_Room11_EventScript_1645D5", + "flag": "0" + }, + { + "graphics_id": "20", + "x": 37, + "y": 23, + "elevation": 3, + "movement_type": "51", + "movement_range_x": 2, + "movement_range_y": 5, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "SSAnne_1F_Room11_EventScript_1645EC", + "flag": "0" + }, + { + "graphics_id": "18", + "x": 32, + "y": 5, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "SSAnne_1F_Room11_EventScript_164603", + "flag": "0" + }, + { + "graphics_id": "18", + "x": 52, + "y": 20, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "SSAnne_1F_Room11_EventScript_16461A", + "flag": "0" + }, + { + "graphics_id": "22", + "x": 8, + "y": 21, + "elevation": 3, + "movement_type": "17", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "SSAnne_1F_Room11_EventScript_164631", + "flag": "0" + }, + { + "graphics_id": "22", + "x": 39, + "y": 6, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "SSAnne_1F_Room11_EventScript_164648", + "flag": "0" + }, + { + "graphics_id": "39", + "x": 3, + "y": 9, + "elevation": 3, + "movement_type": "3", + "movement_range_x": 1, + "movement_range_y": 2, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "SSAnne_1F_Room11_EventScript_16465F", + "flag": "0" + }, + { + "graphics_id": "40", + "x": 19, + "y": 24, + "elevation": 3, + "movement_type": "28", + "movement_range_x": 5, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "SSAnne_1F_Room11_EventScript_164676", + "flag": "0" + }, + { + "graphics_id": "56", + "x": 30, + "y": 19, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "SSAnne_1F_Room11_EventScript_16468D", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 54, + "y": 26, + "elevation": 3, + "dest_map": "MAP_SIX_ISLAND_GREEN_PATH", + "dest_warp_id": 0 + }, + { + "x": 55, + "y": 26, + "elevation": 3, + "dest_map": "MAP_SIX_ISLAND_GREEN_PATH", + "dest_warp_id": 0 + }, + { + "x": 56, + "y": 26, + "elevation": 3, + "dest_map": "MAP_SIX_ISLAND_GREEN_PATH", + "dest_warp_id": 1 + }, + { + "x": 3, + "y": 26, + "elevation": 3, + "dest_map": "MAP_SIX_ISLAND_GREEN_PATH", + "dest_warp_id": 2 + }, + { + "x": 4, + "y": 26, + "elevation": 3, + "dest_map": "MAP_SIX_ISLAND_GREEN_PATH", + "dest_warp_id": 2 + }, + { + "x": 5, + "y": 26, + "elevation": 3, + "dest_map": "MAP_SIX_ISLAND_GREEN_PATH", + "dest_warp_id": 3 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/SixIsland_PatternBush/scripts.inc b/data/maps/SixIsland_PatternBush/scripts.inc new file mode 100644 index 000000000..a4f5e1b85 --- /dev/null +++ b/data/maps/SixIsland_PatternBush/scripts.inc @@ -0,0 +1,92 @@ +SixIsland_PatternBush_MapScripts:: @ 8164559 + map_script 3, SSAnne_1F_Room11_MapScript1_16455F + .byte 0 + +SSAnne_1F_Room11_MapScript1_16455F:: @ 816455F + setworldmapflag 2237 + getplayerxy VAR_0x4001, VAR_0x4002 + compare_var_to_value VAR_0x4001, 50 + call_if 4, EventScript_16457E + compare_var_to_value VAR_0x4001, 49 + call_if 3, EventScript_164587 + end + +EventScript_16457E:: @ 816457E + setescapewarp MAP_SIX_ISLAND_GREEN_PATH, 255, 64, 10 + return + +EventScript_164587:: @ 8164587 + setescapewarp MAP_SIX_ISLAND_GREEN_PATH, 255, 45, 10 + return + +SSAnne_1F_Room11_EventScript_164590:: @ 8164590 + trainerbattle 0, 609, 0, Text_17BF3A, Text_17BF66 + loadword 0, gUnknown_817BF97 + callstd 6 + end + +SSAnne_1F_Room11_EventScript_1645A7:: @ 81645A7 + trainerbattle 0, 610, 0, Text_17BFEB, Text_17C028 + loadword 0, gUnknown_817C056 + callstd 6 + end + +SSAnne_1F_Room11_EventScript_1645BE:: @ 81645BE + trainerbattle 0, 611, 0, Text_17C0BE, Text_17C0F2 + loadword 0, gUnknown_817C113 + callstd 6 + end + +SSAnne_1F_Room11_EventScript_1645D5:: @ 81645D5 + trainerbattle 0, 612, 0, Text_17C155, Text_17C196 + loadword 0, gUnknown_817C1D0 + callstd 6 + end + +SSAnne_1F_Room11_EventScript_1645EC:: @ 81645EC + trainerbattle 0, 613, 0, Text_17C246, Text_17C275 + loadword 0, gUnknown_817C2A4 + callstd 6 + end + +SSAnne_1F_Room11_EventScript_164603:: @ 8164603 + trainerbattle 0, 614, 0, Text_17C2D9, Text_17C30D + loadword 0, gUnknown_817C31C + callstd 6 + end + +SSAnne_1F_Room11_EventScript_16461A:: @ 816461A + trainerbattle 0, 615, 0, Text_17C373, Text_17C3A5 + loadword 0, gUnknown_817C3CE + callstd 6 + end + +SSAnne_1F_Room11_EventScript_164631:: @ 8164631 + trainerbattle 0, 616, 0, Text_17C42B, Text_17C458 + loadword 0, gUnknown_817C490 + callstd 6 + end + +SSAnne_1F_Room11_EventScript_164648:: @ 8164648 + trainerbattle 0, 617, 0, Text_17C4FE, Text_17C552 + loadword 0, gUnknown_817C590 + callstd 6 + end + +SSAnne_1F_Room11_EventScript_16465F:: @ 816465F + trainerbattle 0, 618, 0, Text_17C5DB, Text_17C609 + loadword 0, gUnknown_817C615 + callstd 6 + end + +SSAnne_1F_Room11_EventScript_164676:: @ 8164676 + trainerbattle 0, 619, 0, Text_17C63E, Text_17C660 + loadword 0, gUnknown_817C68E + callstd 6 + end + +SSAnne_1F_Room11_EventScript_16468D:: @ 816468D + trainerbattle 0, 620, 0, Text_17C6C9, Text_17C6FB + loadword 0, gUnknown_817C728 + callstd 6 + end diff --git a/data/maps/SixIsland_PokemonCenter_1F/events.inc b/data/maps/SixIsland_PokemonCenter_1F/events.inc deleted file mode 100644 index ffbd1be14..000000000 --- a/data/maps/SixIsland_PokemonCenter_1F/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -SixIsland_PokemonCenter_1F_EventObjects: - object_event 1, 64, 0, 7, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, SixIsland_PokemonCenter_1F_EventScript_171E05, 0, 0, 0 - object_event 2, 72, 0, 5, 0, 5, 0, 3, 9, 17, 0, 0, 0, 0, 0, 0x0, 152, 0, 0 - object_event 3, 56, 0, 13, 0, 3, 0, 3, 7, 17, 0, 0, 0, 0, 0, SixIsland_PokemonCenter_1F_EventScript_171E0E, 0, 0, 0 - object_event 4, 33, 0, 12, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, SixIsland_PokemonCenter_1F_EventScript_171E17, 0, 0, 0 - -SixIsland_PokemonCenter_1F_MapWarps: - warp_def 7, 8, 3, 1, 786 - warp_def 1, 6, 4, 0, 9473 - -SixIsland_PokemonCenter_1F_MapEvents:: - map_events SixIsland_PokemonCenter_1F_EventObjects, SixIsland_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/SixIsland_PokemonCenter_1F/header.inc b/data/maps/SixIsland_PokemonCenter_1F/header.inc deleted file mode 100644 index e2d7f3aa9..000000000 --- a/data/maps/SixIsland_PokemonCenter_1F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SixIsland_PokemonCenter_1F:: @ 8351ED0 - .4byte PokemonCenter_1F_Layout @ 0x82D5990 - .4byte SixIsland_PokemonCenter_1F_MapEvents @ 0x83BF0A0 - .4byte SixIsland_PokemonCenter_1F_MapScripts @ 0x8171D6A - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 8 - .byte 0x95, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/SixIsland_PokemonCenter_1F/map.json b/data/maps/SixIsland_PokemonCenter_1F/map.json new file mode 100644 index 000000000..d58082f97 --- /dev/null +++ b/data/maps/SixIsland_PokemonCenter_1F/map.json @@ -0,0 +1,87 @@ +{ + "id": "MAP_SIX_ISLAND_POKEMON_CENTER_1F", + "name": "SixIsland_PokemonCenter_1F", + "layout": "LAYOUT_POKEMON_CENTER_1F", + "music": "BGM_FRLG_POKEMON_CENTER", + "region_map_section": "MAPSEC_SIX_ISLAND", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "64", + "x": 7, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SixIsland_PokemonCenter_1F_EventScript_171E05", + "flag": "0" + }, + { + "graphics_id": "72", + "x": 5, + "y": 5, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "152" + }, + { + "graphics_id": "56", + "x": 13, + "y": 3, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SixIsland_PokemonCenter_1F_EventScript_171E0E", + "flag": "0" + }, + { + "graphics_id": "33", + "x": 12, + "y": 5, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SixIsland_PokemonCenter_1F_EventScript_171E17", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 7, + "y": 8, + "elevation": 3, + "dest_map": "MAP_SIX_ISLAND", + "dest_warp_id": 1 + }, + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_SIX_ISLAND_POKEMON_CENTER_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/SixIsland_PokemonCenter_2F/events.inc b/data/maps/SixIsland_PokemonCenter_2F/events.inc deleted file mode 100644 index c26511927..000000000 --- a/data/maps/SixIsland_PokemonCenter_2F/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -SixIsland_PokemonCenter_2F_EventObjects: - object_event 1, 65, 0, 6, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SixIsland_PokemonCenter_2F_EventScript_1A8CF6, 0, 0, 0 - object_event 2, 65, 0, 2, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SixIsland_PokemonCenter_2F_EventScript_1A8CFC, 0, 0, 0 - object_event 3, 65, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SixIsland_PokemonCenter_2F_EventScript_1A8D02, 0, 0, 0 - object_event 4, 69, 0, 1, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, SixIsland_PokemonCenter_2F_EventScript_1BB1D2, 112, 0, 0 - -SixIsland_PokemonCenter_2F_MapWarps: - warp_def 1, 6, 4, 1, 9472 - warp_def 5, 1, 0, 0, 4 - warp_def 9, 1, 0, 0, 1 - -SixIsland_PokemonCenter_2F_MapEvents:: - map_events SixIsland_PokemonCenter_2F_EventObjects, SixIsland_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/SixIsland_PokemonCenter_2F/header.inc b/data/maps/SixIsland_PokemonCenter_2F/header.inc deleted file mode 100644 index f11114273..000000000 --- a/data/maps/SixIsland_PokemonCenter_2F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SixIsland_PokemonCenter_2F:: @ 8351EEC - .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 - .4byte SixIsland_PokemonCenter_2F_MapEvents @ 0x83BF12C - .4byte SixIsland_PokemonCenter_2F_MapScripts @ 0x8171E20 - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 9 - .byte 0x95, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/SixIsland_PokemonCenter_2F/map.json b/data/maps/SixIsland_PokemonCenter_2F/map.json new file mode 100644 index 000000000..3ba0ff43a --- /dev/null +++ b/data/maps/SixIsland_PokemonCenter_2F/map.json @@ -0,0 +1,94 @@ +{ + "id": "MAP_SIX_ISLAND_POKEMON_CENTER_2F", + "name": "SixIsland_PokemonCenter_2F", + "layout": "LAYOUT_POKEMON_CENTER_2F", + "music": "BGM_FRLG_POKEMON_CENTER", + "region_map_section": "MAPSEC_SIX_ISLAND", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "65", + "x": 6, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SixIsland_PokemonCenter_2F_EventScript_1A8CF6", + "flag": "0" + }, + { + "graphics_id": "65", + "x": 2, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SixIsland_PokemonCenter_2F_EventScript_1A8CFC", + "flag": "0" + }, + { + "graphics_id": "65", + "x": 10, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SixIsland_PokemonCenter_2F_EventScript_1A8D02", + "flag": "0" + }, + { + "graphics_id": "69", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SixIsland_PokemonCenter_2F_EventScript_1BB1D2", + "flag": "112" + } + ], + "warp_events": [ + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_SIX_ISLAND_POKEMON_CENTER_1F", + "dest_warp_id": 1 + }, + { + "x": 5, + "y": 1, + "elevation": 0, + "dest_map": "MAP_UNKNOWN_MAP_00_04", + "dest_warp_id": 0 + }, + { + "x": 9, + "y": 1, + "elevation": 0, + "dest_map": "MAP_UNKNOWN_MAP_00_01", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/SixIsland_RuinValley/connections.inc b/data/maps/SixIsland_RuinValley/connections.inc deleted file mode 100644 index 0ac741f5e..000000000 --- a/data/maps/SixIsland_RuinValley/connections.inc +++ /dev/null @@ -1,6 +0,0 @@ -SixIsland_RuinValley_MapConnectionsList: @ 8352E70 - connection right, -80, MAP_SIX_ISLAND_WATERPATH - -SixIsland_RuinValley_MapConnections:: @ 8352E7C - .4byte 1 - .4byte SixIsland_RuinValley_MapConnectionsList diff --git a/data/maps/SixIsland_RuinValley/events.inc b/data/maps/SixIsland_RuinValley/events.inc deleted file mode 100644 index 381543e3b..000000000 --- a/data/maps/SixIsland_RuinValley/events.inc +++ /dev/null @@ -1,27 +0,0 @@ -SixIsland_RuinValley_EventObjects: - object_event 1, 55, 0, 24, 0, 25, 0, 3, 7, 17, 0, 0, 0, 0, 0, SixIsland_RuinValley_EventScript_168B6D, 142, 0, 0 - object_event 2, 56, 0, 32, 0, 11, 0, 5, 17, 17, 0, 1, 0, 4, 0, SixIsland_RuinValley_EventScript_1AC717, 0, 0, 0 - object_event 3, 56, 0, 33, 0, 16, 0, 5, 14, 17, 0, 1, 0, 2, 0, SixIsland_RuinValley_EventScript_1AC755, 0, 0, 0 - object_event 4, 56, 0, 31, 0, 24, 0, 5, 9, 17, 0, 1, 0, 1, 0, SixIsland_RuinValley_EventScript_1AC793, 0, 0, 0 - object_event 5, 56, 0, 14, 0, 10, 0, 5, 8, 17, 0, 1, 0, 2, 0, SixIsland_RuinValley_EventScript_1AC7D1, 0, 0, 0 - object_event 6, 52, 0, 21, 0, 29, 0, 5, 2, 50, 0, 1, 0, 1, 0, SixIsland_RuinValley_EventScript_1AC80F, 0, 0, 0 - object_event 7, 97, 0, 17, 0, 10, 0, 5, 1, 0, 0, 0, 0, 0, 0, SixIsland_RuinValley_EventScript_1BE11D, 0, 0, 0 - object_event 8, 97, 0, 17, 0, 12, 0, 5, 1, 0, 0, 0, 0, 0, 0, SixIsland_RuinValley_EventScript_1BE11D, 0, 0, 0 - object_event 9, 97, 0, 18, 0, 11, 0, 5, 1, 0, 0, 0, 0, 0, 0, SixIsland_RuinValley_EventScript_1BE11D, 0, 0, 0 - object_event 10, 97, 0, 6, 0, 33, 0, 3, 1, 0, 0, 0, 0, 0, 0, SixIsland_RuinValley_EventScript_1BE11D, 0, 0, 0 - object_event 11, 97, 0, 6, 0, 34, 0, 3, 1, 0, 0, 0, 0, 0, 0, SixIsland_RuinValley_EventScript_1BE11D, 0, 0, 0 - object_event 12, 97, 0, 41, 0, 32, 0, 3, 1, 0, 0, 0, 0, 0, 0, SixIsland_RuinValley_EventScript_1BE11D, 0, 0, 0 - object_event 13, 97, 0, 41, 0, 33, 0, 3, 1, 0, 0, 0, 0, 0, 0, SixIsland_RuinValley_EventScript_1BE11D, 0, 0, 0 - object_event 14, 97, 0, 42, 0, 33, 0, 3, 1, 0, 0, 0, 0, 0, 0, SixIsland_RuinValley_EventScript_1BE11D, 0, 0, 0 - object_event 15, 92, 0, 5, 0, 33, 0, 3, 8, 17, 0, 0, 0, 0, 0, SixIsland_RuinValley_EventScript_1BECC4, 485, 0, 0 - object_event 16, 92, 0, 19, 0, 11, 0, 5, 8, 17, 0, 0, 0, 0, 0, SixIsland_RuinValley_EventScript_1BECB7, 484, 0, 0 - object_event 17, 92, 0, 43, 0, 32, 0, 3, 8, 17, 0, 0, 0, 0, 0, SixIsland_RuinValley_EventScript_1BECD1, 486, 0, 0 - -SixIsland_RuinValley_MapWarps: - warp_def 24, 24, 3, 0, 371 - -SixIsland_RuinValley_MapBGEvents: - bg_event 24, 24, 3, 0, 0, SixIsland_RuinValley_EventScript_168B94 - -SixIsland_RuinValley_MapEvents:: - map_events SixIsland_RuinValley_EventObjects, SixIsland_RuinValley_MapWarps, 0x0, SixIsland_RuinValley_MapBGEvents diff --git a/data/maps/SixIsland_RuinValley/header.inc b/data/maps/SixIsland_RuinValley/header.inc deleted file mode 100644 index 31ec9bc84..000000000 --- a/data/maps/SixIsland_RuinValley/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SixIsland_RuinValley:: @ 8350CC4 - .4byte SixIsland_RuinValley_Layout @ 0x83302D8 - .4byte SixIsland_RuinValley_MapEvents @ 0x83B92A0 - .4byte SixIsland_RuinValley_MapScripts @ 0x8168B53 - .4byte SixIsland_RuinValley_MapConnections @ 0x8352E7C - .2byte BGM_FRLG_SEVII_ISLANDS - .2byte 253 - .byte 0xa6, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/SixIsland_RuinValley/map.json b/data/maps/SixIsland_RuinValley/map.json new file mode 100644 index 000000000..1262705c6 --- /dev/null +++ b/data/maps/SixIsland_RuinValley/map.json @@ -0,0 +1,263 @@ +{ + "id": "MAP_SIX_ISLAND_RUIN_VALLEY", + "name": "SixIsland_RuinValley", + "layout": "LAYOUT_SIX_ISLAND_RUIN_VALLEY", + "music": "BGM_FRLG_SEVII_ISLANDS", + "region_map_section": "MAPSEC_RUIN_VALLEY", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_3", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_SIX_ISLAND_WATER_PATH", + "offset": -80, + "direction": "right" + } + ], + "object_events": [ + { + "graphics_id": "55", + "x": 24, + "y": 25, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SixIsland_RuinValley_EventScript_168B6D", + "flag": "142" + }, + { + "graphics_id": "56", + "x": 32, + "y": 11, + "elevation": 5, + "movement_type": "17", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "SixIsland_RuinValley_EventScript_1AC717", + "flag": "0" + }, + { + "graphics_id": "56", + "x": 33, + "y": 16, + "elevation": 5, + "movement_type": "14", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "SixIsland_RuinValley_EventScript_1AC755", + "flag": "0" + }, + { + "graphics_id": "56", + "x": 31, + "y": 24, + "elevation": 5, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "SixIsland_RuinValley_EventScript_1AC793", + "flag": "0" + }, + { + "graphics_id": "56", + "x": 14, + "y": 10, + "elevation": 5, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "SixIsland_RuinValley_EventScript_1AC7D1", + "flag": "0" + }, + { + "graphics_id": "52", + "x": 21, + "y": 29, + "elevation": 5, + "movement_type": "2", + "movement_range_x": 2, + "movement_range_y": 3, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "SixIsland_RuinValley_EventScript_1AC80F", + "flag": "0" + }, + { + "graphics_id": "97", + "x": 17, + "y": 10, + "elevation": 5, + "movement_type": "1", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SixIsland_RuinValley_EventScript_1BE11D", + "flag": "0" + }, + { + "graphics_id": "97", + "x": 17, + "y": 12, + "elevation": 5, + "movement_type": "1", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SixIsland_RuinValley_EventScript_1BE11D", + "flag": "0" + }, + { + "graphics_id": "97", + "x": 18, + "y": 11, + "elevation": 5, + "movement_type": "1", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SixIsland_RuinValley_EventScript_1BE11D", + "flag": "0" + }, + { + "graphics_id": "97", + "x": 6, + "y": 33, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SixIsland_RuinValley_EventScript_1BE11D", + "flag": "0" + }, + { + "graphics_id": "97", + "x": 6, + "y": 34, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SixIsland_RuinValley_EventScript_1BE11D", + "flag": "0" + }, + { + "graphics_id": "97", + "x": 41, + "y": 32, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SixIsland_RuinValley_EventScript_1BE11D", + "flag": "0" + }, + { + "graphics_id": "97", + "x": 41, + "y": 33, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SixIsland_RuinValley_EventScript_1BE11D", + "flag": "0" + }, + { + "graphics_id": "97", + "x": 42, + "y": 33, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SixIsland_RuinValley_EventScript_1BE11D", + "flag": "0" + }, + { + "graphics_id": "92", + "x": 5, + "y": 33, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SixIsland_RuinValley_EventScript_1BECC4", + "flag": "485" + }, + { + "graphics_id": "92", + "x": 19, + "y": 11, + "elevation": 5, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SixIsland_RuinValley_EventScript_1BECB7", + "flag": "484" + }, + { + "graphics_id": "92", + "x": 43, + "y": 32, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SixIsland_RuinValley_EventScript_1BECD1", + "flag": "486" + } + ], + "warp_events": [ + { + "x": 24, + "y": 24, + "elevation": 3, + "dest_map": "MAP_SIX_ISLAND_DOTTED_HOLE_1F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 24, + "y": 24, + "elevation": 3, + "script": "SixIsland_RuinValley_EventScript_168B94" + } + ] +}
\ No newline at end of file diff --git a/data/maps/SixIsland_WaterPath/connections.inc b/data/maps/SixIsland_WaterPath/connections.inc deleted file mode 100644 index d6849fbb2..000000000 --- a/data/maps/SixIsland_WaterPath/connections.inc +++ /dev/null @@ -1,8 +0,0 @@ -SixIsland_WaterPath_MapConnectionsList: @ 8352E44 - connection left, 0, MAP_SIX_ISLAND_GREENPATH - connection left, 40, MAP_SIX_ISLAND - connection left, 80, MAP_SIX_ISLAND_RUINVALLEY - -SixIsland_WaterPath_MapConnections:: @ 8352E68 - .4byte 3 - .4byte SixIsland_WaterPath_MapConnectionsList diff --git a/data/maps/SixIsland_WaterPath/events.inc b/data/maps/SixIsland_WaterPath/events.inc deleted file mode 100644 index f40c157b9..000000000 --- a/data/maps/SixIsland_WaterPath/events.inc +++ /dev/null @@ -1,24 +0,0 @@ -SixIsland_WaterPath_EventObjects: - object_event 1, 28, 0, 12, 0, 13, 0, 3, 19, 17, 0, 1, 0, 3, 0, SixIsland_WaterPath_EventScript_1AC555, 0, 0, 0 - object_event 2, 26, 0, 11, 0, 52, 0, 3, 7, 17, 0, 1, 0, 3, 0, SixIsland_WaterPath_EventScript_1AC593, 0, 0, 0 - object_event 3, 43, 0, 13, 0, 35, 0, 1, 1, 17, 0, 1, 0, 4, 0, SixIsland_WaterPath_EventScript_1AC5D1, 0, 0, 0 - object_event 4, 44, 0, 15, 0, 45, 0, 1, 2, 17, 0, 1, 0, 1, 0, SixIsland_WaterPath_EventScript_1AC60F, 0, 0, 0 - object_event 5, 17, 0, 6, 0, 21, 0, 3, 8, 17, 0, 1, 0, 1, 0, SixIsland_WaterPath_EventScript_1AC64D, 0, 0, 0 - object_event 6, 17, 0, 7, 0, 21, 0, 3, 8, 17, 0, 1, 0, 1, 0, SixIsland_WaterPath_EventScript_1AC693, 0, 0, 0 - object_event 7, 56, 0, 11, 0, 76, 0, 3, 15, 17, 0, 1, 0, 4, 0, SixIsland_WaterPath_EventScript_1AC6D9, 0, 0, 0 - object_event 8, 92, 0, 17, 0, 19, 0, 0, 8, 17, 0, 0, 0, 0, 0, SixIsland_WaterPath_EventScript_1BEC9D, 482, 0, 0 - object_event 9, 92, 0, 17, 0, 87, 0, 3, 8, 17, 0, 0, 0, 0, 0, SixIsland_WaterPath_EventScript_1BECAA, 483, 0, 0 - -SixIsland_WaterPath_MapWarps: - warp_def 5, 13, 0, 0, 10496 - warp_def 11, 19, 0, 0, 10497 - -SixIsland_WaterPath_MapBGEvents: - bg_event 8, 14, 0, 0, 0, SixIsland_WaterPath_EventScript_168B41 - bg_event 15, 76, 3, 7, 0, 137, 181, 1 - bg_event 3, 8, 3, 7, 0, 139, 182, 1 - bg_event 13, 63, 3, 7, 0, 152, 183, 1 - bg_event 12, 54, 0, 0, 0, SixIsland_WaterPath_EventScript_168B4A - -SixIsland_WaterPath_MapEvents:: - map_events SixIsland_WaterPath_EventObjects, SixIsland_WaterPath_MapWarps, 0x0, SixIsland_WaterPath_MapBGEvents diff --git a/data/maps/SixIsland_WaterPath/header.inc b/data/maps/SixIsland_WaterPath/header.inc deleted file mode 100644 index 4538a40a2..000000000 --- a/data/maps/SixIsland_WaterPath/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SixIsland_WaterPath:: @ 8350CA8 - .4byte SixIsland_WaterPath_Layout @ 0x832F3B4 - .4byte SixIsland_WaterPath_MapEvents @ 0x83B90E0 - .4byte SixIsland_WaterPath_MapScripts @ 0x8168B40 - .4byte SixIsland_WaterPath_MapConnections @ 0x8352E68 - .2byte BGM_FRLG_SEVII_ISLANDS - .2byte 252 - .byte 0xa5, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/SixIsland_WaterPath/map.json b/data/maps/SixIsland_WaterPath/map.json new file mode 100644 index 000000000..86bbb290b --- /dev/null +++ b/data/maps/SixIsland_WaterPath/map.json @@ -0,0 +1,210 @@ +{ + "id": "MAP_SIX_ISLAND_WATER_PATH", + "name": "SixIsland_WaterPath", + "layout": "LAYOUT_SIX_ISLAND_WATER_PATH", + "music": "BGM_FRLG_SEVII_ISLANDS", + "region_map_section": "MAPSEC_WATER_PATH", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_3", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_SIX_ISLAND_GREEN_PATH", + "offset": 0, + "direction": "left" + }, + { + "map": "MAP_SIX_ISLAND", + "offset": 40, + "direction": "left" + }, + { + "map": "MAP_SIX_ISLAND_RUIN_VALLEY", + "offset": 80, + "direction": "left" + } + ], + "object_events": [ + { + "graphics_id": "28", + "x": 12, + "y": 13, + "elevation": 3, + "movement_type": "19", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "SixIsland_WaterPath_EventScript_1AC555", + "flag": "0" + }, + { + "graphics_id": "26", + "x": 11, + "y": 52, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "SixIsland_WaterPath_EventScript_1AC593", + "flag": "0" + }, + { + "graphics_id": "43", + "x": 13, + "y": 35, + "elevation": 1, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "SixIsland_WaterPath_EventScript_1AC5D1", + "flag": "0" + }, + { + "graphics_id": "44", + "x": 15, + "y": 45, + "elevation": 1, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "SixIsland_WaterPath_EventScript_1AC60F", + "flag": "0" + }, + { + "graphics_id": "17", + "x": 6, + "y": 21, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "SixIsland_WaterPath_EventScript_1AC64D", + "flag": "0" + }, + { + "graphics_id": "17", + "x": 7, + "y": 21, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "SixIsland_WaterPath_EventScript_1AC693", + "flag": "0" + }, + { + "graphics_id": "56", + "x": 11, + "y": 76, + "elevation": 3, + "movement_type": "15", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "SixIsland_WaterPath_EventScript_1AC6D9", + "flag": "0" + }, + { + "graphics_id": "92", + "x": 17, + "y": 19, + "elevation": 0, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SixIsland_WaterPath_EventScript_1BEC9D", + "flag": "482" + }, + { + "graphics_id": "92", + "x": 17, + "y": 87, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SixIsland_WaterPath_EventScript_1BECAA", + "flag": "483" + } + ], + "warp_events": [ + { + "x": 5, + "y": 13, + "elevation": 0, + "dest_map": "MAP_SIX_ISLAND_WATER_PATH_HOUSE1", + "dest_warp_id": 0 + }, + { + "x": 11, + "y": 19, + "elevation": 0, + "dest_map": "MAP_SIX_ISLAND_WATER_PATH_HOUSE2", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 8, + "y": 14, + "elevation": 0, + "script": "SixIsland_WaterPath_EventScript_168B41" + }, + { + "type": "hidden_item", + "x": 15, + "y": 76, + "elevation": 3, + "item": "ITEM_ASPEAR_BERRY", + "flag": "181", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 3, + "y": 8, + "elevation": 3, + "item": "ITEM_ORAN_BERRY", + "flag": "182", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 13, + "y": 63, + "elevation": 3, + "item": "ITEM_PINAP_BERRY", + "flag": "183", + "unknown": 1 + }, + { + "type": "bg_event_type_0", + "x": 12, + "y": 54, + "elevation": 0, + "script": "SixIsland_WaterPath_EventScript_168B4A" + } + ] +}
\ No newline at end of file diff --git a/data/maps/SixIsland_WaterPath_House1/events.inc b/data/maps/SixIsland_WaterPath_House1/events.inc deleted file mode 100644 index 72b19c6e5..000000000 --- a/data/maps/SixIsland_WaterPath_House1/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -SixIsland_WaterPath_House1_EventObjects: - object_event 1, 29, 0, 3, 0, 4, 0, 3, 8, 17, 0, 0, 0, 0, 0, SixIsland_WaterPath_House1_EventScript_17206D, 0, 0, 0 - -SixIsland_WaterPath_House1_MapWarps: - warp_def 3, 7, 3, 0, 828 - -SixIsland_WaterPath_House1_MapBGEvents: - bg_event 9, 1, 0, 0, 0, SixIsland_WaterPath_House1_EventScript_172157 - -SixIsland_WaterPath_House1_MapEvents:: - map_events SixIsland_WaterPath_House1_EventObjects, SixIsland_WaterPath_House1_MapWarps, 0x0, SixIsland_WaterPath_House1_MapBGEvents diff --git a/data/maps/SixIsland_WaterPath_House1/header.inc b/data/maps/SixIsland_WaterPath_House1/header.inc deleted file mode 100644 index dbd7e3ece..000000000 --- a/data/maps/SixIsland_WaterPath_House1/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SixIsland_WaterPath_House1:: @ 8351FB0 - .4byte House4_Layout @ 0x82D6070 - .4byte SixIsland_WaterPath_House1_MapEvents @ 0x83BF334 - .4byte SixIsland_WaterPath_House1_MapScripts @ 0x817206C - .4byte NULL - .2byte BGM_FRLG_CERULEAN_CITY - .2byte 13 - .byte 0xa5, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/SixIsland_WaterPath_House1/map.json b/data/maps/SixIsland_WaterPath_House1/map.json new file mode 100644 index 000000000..84b136633 --- /dev/null +++ b/data/maps/SixIsland_WaterPath_House1/map.json @@ -0,0 +1,49 @@ +{ + "id": "MAP_SIX_ISLAND_WATER_PATH_HOUSE1", + "name": "SixIsland_WaterPath_House1", + "layout": "LAYOUT_HOUSE4", + "music": "BGM_FRLG_CERULEAN_CITY", + "region_map_section": "MAPSEC_WATER_PATH", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "29", + "x": 3, + "y": 4, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SixIsland_WaterPath_House1_EventScript_17206D", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 3, + "dest_map": "MAP_SIX_ISLAND_WATER_PATH", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 9, + "y": 1, + "elevation": 0, + "script": "SixIsland_WaterPath_House1_EventScript_172157" + } + ] +}
\ No newline at end of file diff --git a/data/maps/SixIsland_WaterPath_House2/events.inc b/data/maps/SixIsland_WaterPath_House2/events.inc deleted file mode 100644 index 09ee22d31..000000000 --- a/data/maps/SixIsland_WaterPath_House2/events.inc +++ /dev/null @@ -1,8 +0,0 @@ -SixIsland_WaterPath_House2_EventObjects: - object_event 1, 25, 0, 7, 0, 4, 0, 3, 15, 17, 0, 0, 0, 0, 0, SixIsland_WaterPath_House2_EventScript_172179, 0, 0, 0 - -SixIsland_WaterPath_House2_MapWarps: - warp_def 4, 7, 3, 1, 828 - -SixIsland_WaterPath_House2_MapEvents:: - map_events SixIsland_WaterPath_House2_EventObjects, SixIsland_WaterPath_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/SixIsland_WaterPath_House2/header.inc b/data/maps/SixIsland_WaterPath_House2/header.inc deleted file mode 100644 index e0d5408a6..000000000 --- a/data/maps/SixIsland_WaterPath_House2/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SixIsland_WaterPath_House2:: @ 8351FCC - .4byte House3_Layout @ 0x82D5CB8 - .4byte SixIsland_WaterPath_House2_MapEvents @ 0x83BF368 - .4byte SixIsland_WaterPath_House2_MapScripts @ 0x8172178 - .4byte NULL - .2byte BGM_FRLG_CERULEAN_CITY - .2byte 11 - .byte 0xa5, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/SixIsland_WaterPath_House2/map.json b/data/maps/SixIsland_WaterPath_House2/map.json new file mode 100644 index 000000000..c671d9f29 --- /dev/null +++ b/data/maps/SixIsland_WaterPath_House2/map.json @@ -0,0 +1,41 @@ +{ + "id": "MAP_SIX_ISLAND_WATER_PATH_HOUSE2", + "name": "SixIsland_WaterPath_House2", + "layout": "LAYOUT_HOUSE3", + "music": "BGM_FRLG_CERULEAN_CITY", + "region_map_section": "MAPSEC_WATER_PATH", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "25", + "x": 7, + "y": 4, + "elevation": 3, + "movement_type": "15", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SixIsland_WaterPath_House2_EventScript_172179", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_SIX_ISLAND_WATER_PATH", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/ThreeIsland/connections.inc b/data/maps/ThreeIsland/connections.inc deleted file mode 100644 index 2f2d49e94..000000000 --- a/data/maps/ThreeIsland/connections.inc +++ /dev/null @@ -1,7 +0,0 @@ -ThreeIsland_MapConnectionsList: @ 8352968 - connection down, 0, MAP_THREE_ISLAND_PORT - connection left, 0, MAP_THREE_ISLAND_BONDBRIDGE - -ThreeIsland_MapConnections:: @ 8352980 - .4byte 2 - .4byte ThreeIsland_MapConnectionsList diff --git a/data/maps/ThreeIsland/events.inc b/data/maps/ThreeIsland/events.inc deleted file mode 100644 index d72c40b6c..000000000 --- a/data/maps/ThreeIsland/events.inc +++ /dev/null @@ -1,43 +0,0 @@ -ThreeIsland_EventObjects: - object_event 1, 25, 0, 7, 0, 24, 0, 3, 10, 17, 0, 0, 0, 0, 0, ThreeIsland_EventScript_1677E5, 126, 0, 0 - object_event 2, 25, 0, 8, 0, 23, 0, 3, 10, 17, 0, 0, 0, 0, 0, ThreeIsland_EventScript_167989, 126, 0, 0 - object_event 3, 53, 0, 8, 0, 24, 0, 3, 9, 17, 0, 0, 0, 0, 0, ThreeIsland_EventScript_1677D8, 145, 0, 0 - object_event 4, 53, 0, 9, 0, 23, 0, 3, 9, 17, 0, 0, 0, 0, 0, ThreeIsland_EventScript_1677D8, 121, 0, 0 - object_event 5, 53, 0, 9, 0, 24, 0, 3, 9, 17, 0, 0, 0, 0, 0, ThreeIsland_EventScript_1677D8, 121, 0, 0 - object_event 6, 53, 0, 10, 0, 22, 0, 3, 9, 17, 0, 0, 0, 0, 0, ThreeIsland_EventScript_1677D8, 121, 0, 0 - object_event 7, 53, 0, 10, 0, 24, 0, 3, 9, 17, 0, 0, 0, 0, 0, ThreeIsland_EventScript_1677D8, 121, 0, 0 - object_event 8, 53, 0, 11, 0, 23, 0, 3, 9, 17, 0, 0, 0, 0, 0, ThreeIsland_EventScript_1677D8, 121, 0, 0 - object_event 9, 95, 0, 20, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, ThreeIsland_EventScript_1BDF13, 18, 0, 0 - object_event 10, 92, 0, 18, 0, 17, 0, 3, 8, 17, 0, 0, 0, 0, 0, ThreeIsland_EventScript_1BEABC, 443, 0, 0 - object_event 11, 23, 0, 15, 0, 7, 0, 3, 5, 17, 0, 0, 0, 0, 0, ThreeIsland_EventScript_167C77, 0, 0, 0 - object_event 12, 16, 0, 14, 0, 14, 0, 3, 10, 17, 0, 0, 0, 0, 0, ThreeIsland_EventScript_167C80, 0, 0, 0 - object_event 13, 132, 0, 15, 0, 14, 0, 3, 9, 17, 0, 0, 0, 0, 0, ThreeIsland_EventScript_167C89, 0, 0, 0 - object_event 14, 53, 0, 15, 0, 31, 0, 3, 5, 17, 0, 0, 0, 0, 0, ThreeIsland_EventScript_167CA5, 121, 0, 0 - -ThreeIsland_MapWarps: - warp_def 3, 31, 0, 0, 8704 - warp_def 14, 27, 0, 0, 8705 - warp_def 18, 12, 0, 0, 8707 - warp_def 4, 6, 0, 0, 8708 - warp_def 12, 6, 0, 0, 8709 - warp_def 12, 12, 0, 0, 8710 - warp_def 13, 19, 0, 0, 8711 - -ThreeIsland_MapCoordEvents: - coord_event 7, 27, 3, 0, 16507, 2, 0, ThreeIsland_EventScript_1679B5 - coord_event 8, 27, 3, 0, 16507, 2, 0, ThreeIsland_EventScript_1679B5 - coord_event 9, 27, 3, 0, 16507, 2, 0, ThreeIsland_EventScript_1679B5 - coord_event 10, 27, 3, 0, 16507, 2, 0, ThreeIsland_EventScript_1679B5 - coord_event 7, 26, 3, 0, 16507, 3, 0, ThreeIsland_EventScript_167A1D - coord_event 8, 26, 3, 0, 16507, 3, 0, ThreeIsland_EventScript_167A29 - coord_event 9, 26, 3, 0, 16507, 3, 0, ThreeIsland_EventScript_167A35 - coord_event 11, 27, 3, 0, 16507, 2, 0, ThreeIsland_EventScript_1679B5 - coord_event 10, 26, 3, 0, 16507, 3, 0, ThreeIsland_EventScript_167A41 - coord_event 11, 26, 3, 0, 16507, 3, 0, ThreeIsland_EventScript_167A4D - -ThreeIsland_MapBGEvents: - bg_event 12, 31, 0, 0, 0, ThreeIsland_EventScript_167C9C - bg_event 5, 13, 3, 7, 0, 69, 164, 1 - -ThreeIsland_MapEvents:: - map_events ThreeIsland_EventObjects, ThreeIsland_MapWarps, ThreeIsland_MapCoordEvents, ThreeIsland_MapBGEvents diff --git a/data/maps/ThreeIsland/header.inc b/data/maps/ThreeIsland/header.inc deleted file mode 100644 index e49570fa4..000000000 --- a/data/maps/ThreeIsland/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -ThreeIsland:: @ 83507A0 - .4byte ThreeIsland_Layout @ 0x832265C - .4byte ThreeIsland_MapEvents @ 0x83B62C8 - .4byte ThreeIsland_MapScripts @ 0x81677AD - .4byte ThreeIsland_MapConnections @ 0x8352980 - .2byte BGM_FRLG_ISLAND_ONE - .2byte 232 - .byte 0x91, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/ThreeIsland/map.json b/data/maps/ThreeIsland/map.json new file mode 100644 index 000000000..0b11d5bf2 --- /dev/null +++ b/data/maps/ThreeIsland/map.json @@ -0,0 +1,371 @@ +{ + "id": "MAP_THREE_ISLAND", + "name": "ThreeIsland", + "layout": "LAYOUT_THREE_ISLAND", + "music": "BGM_FRLG_ISLAND_ONE", + "region_map_section": "MAPSEC_THREE_ISLAND", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_1", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_THREE_ISLAND_PORT", + "offset": 0, + "direction": "down" + }, + { + "map": "MAP_THREE_ISLAND_BOND_BRIDGE", + "offset": 0, + "direction": "left" + } + ], + "object_events": [ + { + "graphics_id": "25", + "x": 7, + "y": 24, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ThreeIsland_EventScript_1677E5", + "flag": "126" + }, + { + "graphics_id": "25", + "x": 8, + "y": 23, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ThreeIsland_EventScript_167989", + "flag": "126" + }, + { + "graphics_id": "53", + "x": 8, + "y": 24, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ThreeIsland_EventScript_1677D8", + "flag": "145" + }, + { + "graphics_id": "53", + "x": 9, + "y": 23, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ThreeIsland_EventScript_1677D8", + "flag": "121" + }, + { + "graphics_id": "53", + "x": 9, + "y": 24, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ThreeIsland_EventScript_1677D8", + "flag": "121" + }, + { + "graphics_id": "53", + "x": 10, + "y": 22, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ThreeIsland_EventScript_1677D8", + "flag": "121" + }, + { + "graphics_id": "53", + "x": 10, + "y": 24, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ThreeIsland_EventScript_1677D8", + "flag": "121" + }, + { + "graphics_id": "53", + "x": 11, + "y": 23, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ThreeIsland_EventScript_1677D8", + "flag": "121" + }, + { + "graphics_id": "95", + "x": 20, + "y": 7, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ThreeIsland_EventScript_1BDF13", + "flag": "18" + }, + { + "graphics_id": "92", + "x": 18, + "y": 17, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ThreeIsland_EventScript_1BEABC", + "flag": "443" + }, + { + "graphics_id": "23", + "x": 15, + "y": 7, + "elevation": 3, + "movement_type": "5", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ThreeIsland_EventScript_167C77", + "flag": "0" + }, + { + "graphics_id": "16", + "x": 14, + "y": 14, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ThreeIsland_EventScript_167C80", + "flag": "0" + }, + { + "graphics_id": "132", + "x": 15, + "y": 14, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ThreeIsland_EventScript_167C89", + "flag": "0" + }, + { + "graphics_id": "53", + "x": 15, + "y": 31, + "elevation": 3, + "movement_type": "5", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ThreeIsland_EventScript_167CA5", + "flag": "121" + } + ], + "warp_events": [ + { + "x": 3, + "y": 31, + "elevation": 0, + "dest_map": "MAP_THREE_ISLAND_HOUSE1", + "dest_warp_id": 0 + }, + { + "x": 14, + "y": 27, + "elevation": 0, + "dest_map": "MAP_THREE_ISLAND_POKEMON_CENTER_1F", + "dest_warp_id": 0 + }, + { + "x": 18, + "y": 12, + "elevation": 0, + "dest_map": "MAP_THREE_ISLAND_MART", + "dest_warp_id": 0 + }, + { + "x": 4, + "y": 6, + "elevation": 0, + "dest_map": "MAP_THREE_ISLAND_HOUSE2", + "dest_warp_id": 0 + }, + { + "x": 12, + "y": 6, + "elevation": 0, + "dest_map": "MAP_THREE_ISLAND_HOUSE3", + "dest_warp_id": 0 + }, + { + "x": 12, + "y": 12, + "elevation": 0, + "dest_map": "MAP_THREE_ISLAND_HOUSE4", + "dest_warp_id": 0 + }, + { + "x": 13, + "y": 19, + "elevation": 0, + "dest_map": "MAP_THREE_ISLAND_HOUSE5", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 7, + "y": 27, + "elevation": 3, + "var": "VAR_0x407B", + "var_value": 2, + "script": "ThreeIsland_EventScript_1679B5" + }, + { + "type": "trigger", + "x": 8, + "y": 27, + "elevation": 3, + "var": "VAR_0x407B", + "var_value": 2, + "script": "ThreeIsland_EventScript_1679B5" + }, + { + "type": "trigger", + "x": 9, + "y": 27, + "elevation": 3, + "var": "VAR_0x407B", + "var_value": 2, + "script": "ThreeIsland_EventScript_1679B5" + }, + { + "type": "trigger", + "x": 10, + "y": 27, + "elevation": 3, + "var": "VAR_0x407B", + "var_value": 2, + "script": "ThreeIsland_EventScript_1679B5" + }, + { + "type": "trigger", + "x": 7, + "y": 26, + "elevation": 3, + "var": "VAR_0x407B", + "var_value": 3, + "script": "ThreeIsland_EventScript_167A1D" + }, + { + "type": "trigger", + "x": 8, + "y": 26, + "elevation": 3, + "var": "VAR_0x407B", + "var_value": 3, + "script": "ThreeIsland_EventScript_167A29" + }, + { + "type": "trigger", + "x": 9, + "y": 26, + "elevation": 3, + "var": "VAR_0x407B", + "var_value": 3, + "script": "ThreeIsland_EventScript_167A35" + }, + { + "type": "trigger", + "x": 11, + "y": 27, + "elevation": 3, + "var": "VAR_0x407B", + "var_value": 2, + "script": "ThreeIsland_EventScript_1679B5" + }, + { + "type": "trigger", + "x": 10, + "y": 26, + "elevation": 3, + "var": "VAR_0x407B", + "var_value": 3, + "script": "ThreeIsland_EventScript_167A41" + }, + { + "type": "trigger", + "x": 11, + "y": 26, + "elevation": 3, + "var": "VAR_0x407B", + "var_value": 3, + "script": "ThreeIsland_EventScript_167A4D" + } + ], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 12, + "y": 31, + "elevation": 0, + "script": "ThreeIsland_EventScript_167C9C" + }, + { + "type": "hidden_item", + "x": 5, + "y": 13, + "elevation": 3, + "item": "ITEM_PP_UP", + "flag": "164", + "unknown": 1 + } + ] +}
\ No newline at end of file diff --git a/data/maps/ThreeIsland_BerryForest/events.inc b/data/maps/ThreeIsland_BerryForest/events.inc deleted file mode 100644 index 0ae949e3f..000000000 --- a/data/maps/ThreeIsland_BerryForest/events.inc +++ /dev/null @@ -1,40 +0,0 @@ -ThreeIsland_BerryForest_EventObjects: - object_event 1, 17, 0, 4, 0, 8, 0, 3, 1, 17, 0, 0, 0, 0, 0, ThreeIsland_BerryForest_EventScript_163C83, 122, 0, 0 - object_event 2, 95, 0, 12, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, ThreeIsland_BerryForest_EventScript_1BDF13, 18, 0, 0 - object_event 3, 95, 0, 19, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, ThreeIsland_BerryForest_EventScript_1BDF13, 19, 0, 0 - object_event 4, 95, 0, 23, 0, 17, 0, 3, 1, 17, 0, 0, 0, 0, 0, ThreeIsland_BerryForest_EventScript_1BDF13, 20, 0, 0 - object_event 5, 95, 0, 38, 0, 23, 0, 3, 1, 17, 0, 0, 0, 0, 0, ThreeIsland_BerryForest_EventScript_1BDF13, 21, 0, 0 - object_event 6, 95, 0, 44, 0, 23, 0, 3, 1, 17, 0, 0, 0, 0, 0, ThreeIsland_BerryForest_EventScript_1BDF13, 22, 0, 0 - object_event 7, 95, 0, 44, 0, 29, 0, 3, 1, 17, 0, 0, 0, 0, 0, ThreeIsland_BerryForest_EventScript_1BDF13, 23, 0, 0 - object_event 8, 95, 0, 16, 0, 43, 0, 3, 1, 17, 0, 0, 0, 0, 0, ThreeIsland_BerryForest_EventScript_1BDF13, 24, 0, 0 - object_event 9, 95, 0, 17, 0, 39, 0, 3, 1, 17, 0, 0, 0, 0, 0, ThreeIsland_BerryForest_EventScript_1BDF13, 25, 0, 0 - object_event 10, 95, 0, 14, 0, 39, 0, 3, 1, 17, 0, 0, 0, 0, 0, ThreeIsland_BerryForest_EventScript_1BDF13, 26, 0, 0 - object_event 11, 95, 0, 11, 0, 39, 0, 3, 1, 17, 0, 0, 0, 0, 0, ThreeIsland_BerryForest_EventScript_1BDF13, 27, 0, 0 - object_event 12, 92, 0, 12, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, ThreeIsland_BerryForest_EventScript_1BED05, 490, 0, 0 - object_event 13, 92, 0, 27, 0, 11, 0, 3, 8, 17, 0, 0, 0, 0, 0, ThreeIsland_BerryForest_EventScript_1BED12, 491, 0, 0 - object_event 14, 92, 0, 12, 0, 43, 0, 3, 8, 17, 0, 0, 0, 0, 0, ThreeIsland_BerryForest_EventScript_1BED1F, 492, 0, 0 - -ThreeIsland_BerryForest_MapWarps: - warp_def 43, 41, 3, 0, 816 - warp_def 42, 41, 3, 0, 816 - warp_def 44, 41, 3, 1, 816 - -ThreeIsland_BerryForest_MapBGEvents: - bg_event 7, 27, 0, 0, 0, ThreeIsland_BerryForest_EventScript_163D31 - bg_event 39, 35, 0, 0, 0, ThreeIsland_BerryForest_EventScript_163D28 - bg_event 31, 25, 3, 7, 0, 148, 90, 1 - bg_event 15, 15, 3, 7, 0, 149, 91, 1 - bg_event 25, 24, 3, 7, 0, 150, 92, 1 - bg_event 11, 24, 3, 7, 0, 151, 93, 1 - bg_event 37, 18, 3, 7, 0, 139, 94, 1 - bg_event 14, 23, 3, 7, 0, 133, 95, 1 - bg_event 47, 5, 3, 7, 0, 134, 96, 1 - bg_event 7, 30, 3, 7, 0, 135, 97, 1 - bg_event 16, 5, 3, 7, 0, 136, 98, 1 - bg_event 25, 6, 3, 7, 0, 137, 99, 1 - bg_event 46, 32, 3, 7, 0, 140, 100, 1 - bg_event 43, 16, 3, 7, 0, 152, 101, 1 - bg_event 8, 5, 3, 7, 0, 141, 102, 1 - -ThreeIsland_BerryForest_MapEvents:: - map_events ThreeIsland_BerryForest_EventObjects, ThreeIsland_BerryForest_MapWarps, 0x0, ThreeIsland_BerryForest_MapBGEvents diff --git a/data/maps/ThreeIsland_BerryForest/header.inc b/data/maps/ThreeIsland_BerryForest/header.inc deleted file mode 100644 index 928ba8d4a..000000000 --- a/data/maps/ThreeIsland_BerryForest/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -ThreeIsland_BerryForest:: @ 834FE00 - .4byte ThreeIsland_BerryForest_Layout @ 0x833A7A8 - .4byte ThreeIsland_BerryForest_MapEvents @ 0x83B340C - .4byte ThreeIsland_BerryForest_MapScripts @ 0x8163C71 - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_FOREST - .2byte 270 - .byte 0xb0, 0x00, 0x0b, 0x03, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/ThreeIsland_BerryForest/map.json b/data/maps/ThreeIsland_BerryForest/map.json new file mode 100644 index 000000000..542a70dc9 --- /dev/null +++ b/data/maps/ThreeIsland_BerryForest/map.json @@ -0,0 +1,356 @@ +{ + "id": "MAP_THREE_ISLAND_BERRY_FOREST", + "name": "ThreeIsland_BerryForest", + "layout": "LAYOUT_THREE_ISLAND_BERRY_FOREST", + "music": "BGM_FRLG_VIRIDIAN_FOREST", + "region_map_section": "MAPSEC_BERRY_FOREST", + "requires_flash": false, + "weather": "WEATHER_11", + "map_type": "MAP_TYPE_3", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "17", + "x": 4, + "y": 8, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ThreeIsland_BerryForest_EventScript_163C83", + "flag": "122" + }, + { + "graphics_id": "95", + "x": 12, + "y": 11, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ThreeIsland_BerryForest_EventScript_1BDF13", + "flag": "18" + }, + { + "graphics_id": "95", + "x": 19, + "y": 7, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ThreeIsland_BerryForest_EventScript_1BDF13", + "flag": "19" + }, + { + "graphics_id": "95", + "x": 23, + "y": 17, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ThreeIsland_BerryForest_EventScript_1BDF13", + "flag": "20" + }, + { + "graphics_id": "95", + "x": 38, + "y": 23, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ThreeIsland_BerryForest_EventScript_1BDF13", + "flag": "21" + }, + { + "graphics_id": "95", + "x": 44, + "y": 23, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ThreeIsland_BerryForest_EventScript_1BDF13", + "flag": "22" + }, + { + "graphics_id": "95", + "x": 44, + "y": 29, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ThreeIsland_BerryForest_EventScript_1BDF13", + "flag": "23" + }, + { + "graphics_id": "95", + "x": 16, + "y": 43, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ThreeIsland_BerryForest_EventScript_1BDF13", + "flag": "24" + }, + { + "graphics_id": "95", + "x": 17, + "y": 39, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ThreeIsland_BerryForest_EventScript_1BDF13", + "flag": "25" + }, + { + "graphics_id": "95", + "x": 14, + "y": 39, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ThreeIsland_BerryForest_EventScript_1BDF13", + "flag": "26" + }, + { + "graphics_id": "95", + "x": 11, + "y": 39, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ThreeIsland_BerryForest_EventScript_1BDF13", + "flag": "27" + }, + { + "graphics_id": "92", + "x": 12, + "y": 5, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ThreeIsland_BerryForest_EventScript_1BED05", + "flag": "490" + }, + { + "graphics_id": "92", + "x": 27, + "y": 11, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ThreeIsland_BerryForest_EventScript_1BED12", + "flag": "491" + }, + { + "graphics_id": "92", + "x": 12, + "y": 43, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ThreeIsland_BerryForest_EventScript_1BED1F", + "flag": "492" + } + ], + "warp_events": [ + { + "x": 43, + "y": 41, + "elevation": 3, + "dest_map": "MAP_THREE_ISLAND_BOND_BRIDGE", + "dest_warp_id": 0 + }, + { + "x": 42, + "y": 41, + "elevation": 3, + "dest_map": "MAP_THREE_ISLAND_BOND_BRIDGE", + "dest_warp_id": 0 + }, + { + "x": 44, + "y": 41, + "elevation": 3, + "dest_map": "MAP_THREE_ISLAND_BOND_BRIDGE", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 7, + "y": 27, + "elevation": 0, + "script": "ThreeIsland_BerryForest_EventScript_163D31" + }, + { + "type": "bg_event_type_0", + "x": 39, + "y": 35, + "elevation": 0, + "script": "ThreeIsland_BerryForest_EventScript_163D28" + }, + { + "type": "hidden_item", + "x": 31, + "y": 25, + "elevation": 3, + "item": "ITEM_RAZZ_BERRY", + "flag": "90", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 15, + "y": 15, + "elevation": 3, + "item": "ITEM_BLUK_BERRY", + "flag": "91", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 25, + "y": 24, + "elevation": 3, + "item": "ITEM_NANAB_BERRY", + "flag": "92", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 11, + "y": 24, + "elevation": 3, + "item": "ITEM_WEPEAR_BERRY", + "flag": "93", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 37, + "y": 18, + "elevation": 3, + "item": "ITEM_ORAN_BERRY", + "flag": "94", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 14, + "y": 23, + "elevation": 3, + "item": "ITEM_CHERI_BERRY", + "flag": "95", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 47, + "y": 5, + "elevation": 3, + "item": "ITEM_CHESTO_BERRY", + "flag": "96", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 7, + "y": 30, + "elevation": 3, + "item": "ITEM_PECHA_BERRY", + "flag": "97", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 16, + "y": 5, + "elevation": 3, + "item": "ITEM_RAWST_BERRY", + "flag": "98", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 25, + "y": 6, + "elevation": 3, + "item": "ITEM_ASPEAR_BERRY", + "flag": "99", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 46, + "y": 32, + "elevation": 3, + "item": "ITEM_PERSIM_BERRY", + "flag": "100", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 43, + "y": 16, + "elevation": 3, + "item": "ITEM_PINAP_BERRY", + "flag": "101", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 8, + "y": 5, + "elevation": 3, + "item": "ITEM_LUM_BERRY", + "flag": "102", + "unknown": 1 + } + ] +}
\ No newline at end of file diff --git a/data/maps/ThreeIsland_BerryForest/scripts.inc b/data/maps/ThreeIsland_BerryForest/scripts.inc index 84eb22b43..42446a6d7 100644 --- a/data/maps/ThreeIsland_BerryForest/scripts.inc +++ b/data/maps/ThreeIsland_BerryForest/scripts.inc @@ -4,7 +4,7 @@ ThreeIsland_BerryForest_MapScripts:: @ 8163C71 ThreeIsland_BerryForest_MapScript1_163C77:: @ 8163C77 setworldmapflag 2231 - setescapewarp MAP_THREE_ISLAND_BONDBRIDGE, 255, 12, 6 + setescapewarp MAP_THREE_ISLAND_BOND_BRIDGE, 255, 12, 6 end ThreeIsland_BerryForest_EventScript_163C83:: @ 8163C83 @@ -45,7 +45,7 @@ ThreeIsland_BerryForest_EventScript_163C83:: @ 8163C83 setflag FLAG_0x07A setvar VAR_0x4079, 2 clearflag FLAG_0x075 - warp MAP_TWO_ISLAND_JOYFULGAMECORNER, 255, 6, 6 + warp MAP_TWO_ISLAND_JOYFUL_GAME_CORNER, 255, 6, 6 waitstate release end diff --git a/data/maps/ThreeIsland_BondBridge/connections.inc b/data/maps/ThreeIsland_BondBridge/connections.inc deleted file mode 100644 index ccbb788ec..000000000 --- a/data/maps/ThreeIsland_BondBridge/connections.inc +++ /dev/null @@ -1,6 +0,0 @@ -ThreeIsland_BondBridge_MapConnectionsList: @ 8352D58 - connection right, 0, MAP_THREE_ISLAND - -ThreeIsland_BondBridge_MapConnections:: @ 8352D64 - .4byte 1 - .4byte ThreeIsland_BondBridge_MapConnectionsList diff --git a/data/maps/ThreeIsland_BondBridge/events.inc b/data/maps/ThreeIsland_BondBridge/events.inc deleted file mode 100644 index 015d463ac..000000000 --- a/data/maps/ThreeIsland_BondBridge/events.inc +++ /dev/null @@ -1,24 +0,0 @@ -ThreeIsland_BondBridge_EventObjects: - object_event 1, 28, 0, 27, 0, 10, 0, 3, 2, 17, 0, 1, 0, 5, 0, ThreeIsland_BondBridge_EventScript_1ABF65, 0, 0, 0 - object_event 2, 28, 0, 68, 0, 10, 0, 3, 9, 17, 0, 1, 0, 2, 0, ThreeIsland_BondBridge_EventScript_1ABFA3, 0, 0, 0 - object_event 3, 37, 0, 33, 0, 13, 0, 3, 10, 17, 0, 1, 0, 1, 0, ThreeIsland_BondBridge_EventScript_1ABFE1, 0, 0, 0 - object_event 4, 37, 0, 50, 0, 11, 0, 3, 27, 18, 0, 1, 0, 1, 0, ThreeIsland_BondBridge_EventScript_1AC01F, 0, 0, 0 - object_event 5, 44, 0, 36, 0, 4, 0, 1, 1, 17, 0, 1, 0, 1, 0, ThreeIsland_BondBridge_EventScript_1AC05D, 0, 0, 0 - object_event 6, 17, 0, 77, 0, 5, 0, 3, 8, 17, 0, 1, 0, 1, 0, ThreeIsland_BondBridge_EventScript_1AC09B, 0, 0, 0 - object_event 7, 17, 0, 78, 0, 5, 0, 3, 8, 17, 0, 1, 0, 1, 0, ThreeIsland_BondBridge_EventScript_1AC0E1, 0, 0, 0 - object_event 8, 95, 0, 72, 0, 8, 0, 3, 1, 17, 0, 0, 0, 0, 0, ThreeIsland_BondBridge_EventScript_1BDF13, 18, 0, 0 - object_event 9, 95, 0, 86, 0, 13, 0, 3, 1, 17, 0, 0, 0, 0, 0, ThreeIsland_BondBridge_EventScript_1BDF13, 19, 0, 0 - -ThreeIsland_BondBridge_MapWarps: - warp_def 12, 6, 3, 0, 365 - warp_def 13, 6, 3, 0, 365 - -ThreeIsland_BondBridge_MapBGEvents: - bg_event 14, 7, 0, 0, 0, ThreeIsland_BondBridge_EventScript_168777 - bg_event 61, 5, 0, 7, 0, 84, 165, 1 - bg_event 44, 12, 3, 7, 0, 106, 166, 1 - bg_event 33, 7, 3, 7, 0, 108, 167, 1 - bg_event 91, 9, 0, 0, 0, ThreeIsland_BondBridge_EventScript_168780 - -ThreeIsland_BondBridge_MapEvents:: - map_events ThreeIsland_BondBridge_EventObjects, ThreeIsland_BondBridge_MapWarps, 0x0, ThreeIsland_BondBridge_MapBGEvents diff --git a/data/maps/ThreeIsland_BondBridge/header.inc b/data/maps/ThreeIsland_BondBridge/header.inc deleted file mode 100644 index 43c5f0c30..000000000 --- a/data/maps/ThreeIsland_BondBridge/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -ThreeIsland_BondBridge:: @ 8350B58 - .4byte ThreeIsland_BondBridge_Layout @ 0x8327BDC - .4byte ThreeIsland_BondBridge_MapEvents @ 0x83B8A9C - .4byte ThreeIsland_BondBridge_MapScripts @ 0x8168776 - .4byte ThreeIsland_BondBridge_MapConnections @ 0x8352D64 - .2byte BGM_FRLG_ROUTE_3 - .2byte 240 - .byte 0x99, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/ThreeIsland_BondBridge/map.json b/data/maps/ThreeIsland_BondBridge/map.json new file mode 100644 index 000000000..2afa51258 --- /dev/null +++ b/data/maps/ThreeIsland_BondBridge/map.json @@ -0,0 +1,200 @@ +{ + "id": "MAP_THREE_ISLAND_BOND_BRIDGE", + "name": "ThreeIsland_BondBridge", + "layout": "LAYOUT_THREE_ISLAND_BOND_BRIDGE", + "music": "BGM_FRLG_ROUTE_3", + "region_map_section": "MAPSEC_BOND_BRIDGE", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_3", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_THREE_ISLAND", + "offset": 0, + "direction": "right" + } + ], + "object_events": [ + { + "graphics_id": "28", + "x": 27, + "y": 10, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "ThreeIsland_BondBridge_EventScript_1ABF65", + "flag": "0" + }, + { + "graphics_id": "28", + "x": 68, + "y": 10, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "ThreeIsland_BondBridge_EventScript_1ABFA3", + "flag": "0" + }, + { + "graphics_id": "37", + "x": 33, + "y": 13, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "ThreeIsland_BondBridge_EventScript_1ABFE1", + "flag": "0" + }, + { + "graphics_id": "37", + "x": 50, + "y": 11, + "elevation": 3, + "movement_type": "27", + "movement_range_x": 2, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "ThreeIsland_BondBridge_EventScript_1AC01F", + "flag": "0" + }, + { + "graphics_id": "44", + "x": 36, + "y": 4, + "elevation": 1, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "ThreeIsland_BondBridge_EventScript_1AC05D", + "flag": "0" + }, + { + "graphics_id": "17", + "x": 77, + "y": 5, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "ThreeIsland_BondBridge_EventScript_1AC09B", + "flag": "0" + }, + { + "graphics_id": "17", + "x": 78, + "y": 5, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "ThreeIsland_BondBridge_EventScript_1AC0E1", + "flag": "0" + }, + { + "graphics_id": "95", + "x": 72, + "y": 8, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ThreeIsland_BondBridge_EventScript_1BDF13", + "flag": "18" + }, + { + "graphics_id": "95", + "x": 86, + "y": 13, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ThreeIsland_BondBridge_EventScript_1BDF13", + "flag": "19" + } + ], + "warp_events": [ + { + "x": 12, + "y": 6, + "elevation": 3, + "dest_map": "MAP_THREE_ISLAND_BERRY_FOREST", + "dest_warp_id": 0 + }, + { + "x": 13, + "y": 6, + "elevation": 3, + "dest_map": "MAP_THREE_ISLAND_BERRY_FOREST", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 14, + "y": 7, + "elevation": 0, + "script": "ThreeIsland_BondBridge_EventScript_168777" + }, + { + "type": "hidden_item", + "x": 61, + "y": 5, + "elevation": 0, + "item": "ITEM_MAX_REPEL", + "flag": "165", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 44, + "y": 12, + "elevation": 3, + "item": "ITEM_PEARL", + "flag": "166", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 33, + "y": 7, + "elevation": 3, + "item": "ITEM_STARDUST", + "flag": "167", + "unknown": 1 + }, + { + "type": "bg_event_type_0", + "x": 91, + "y": 9, + "elevation": 0, + "script": "ThreeIsland_BondBridge_EventScript_168780" + } + ] +}
\ No newline at end of file diff --git a/data/maps/ThreeIsland_DunsparceTunnel/events.inc b/data/maps/ThreeIsland_DunsparceTunnel/events.inc deleted file mode 100644 index ed3dd51d8..000000000 --- a/data/maps/ThreeIsland_DunsparceTunnel/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -ThreeIsland_DunsparceTunnel_EventObjects: - object_event 1, 27, 0, 23, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, ThreeIsland_DunsparceTunnel_EventScript_164D60, 0, 0, 0 - -ThreeIsland_DunsparceTunnel_MapWarps: - warp_def 3, 4, 3, 0, 817 - warp_def 25, 5, 3, 1, 817 - -ThreeIsland_DunsparceTunnel_MapBGEvents: - bg_event 21, 3, 0, 7, 0, 110, 163, 1 - -ThreeIsland_DunsparceTunnel_MapEvents:: - map_events ThreeIsland_DunsparceTunnel_EventObjects, ThreeIsland_DunsparceTunnel_MapWarps, 0x0, ThreeIsland_DunsparceTunnel_MapBGEvents diff --git a/data/maps/ThreeIsland_DunsparceTunnel/header.inc b/data/maps/ThreeIsland_DunsparceTunnel/header.inc deleted file mode 100644 index 4f870e33d..000000000 --- a/data/maps/ThreeIsland_DunsparceTunnel/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -ThreeIsland_DunsparceTunnel:: @ 8350340 - .4byte ThreeIsland_DunsparceTunnel_Layout @ 0x83451F8 - .4byte ThreeIsland_DunsparceTunnel_MapEvents @ 0x83B4788 - .4byte ThreeIsland_DunsparceTunnel_MapScripts @ 0x8164D26 - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_FOREST - .2byte 318 - .byte 0xb9, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/ThreeIsland_DunsparceTunnel/map.json b/data/maps/ThreeIsland_DunsparceTunnel/map.json new file mode 100644 index 000000000..624dd99f2 --- /dev/null +++ b/data/maps/ThreeIsland_DunsparceTunnel/map.json @@ -0,0 +1,58 @@ +{ + "id": "MAP_THREE_ISLAND_DUNSPARCE_TUNNEL", + "name": "ThreeIsland_DunsparceTunnel", + "layout": "LAYOUT_THREE_ISLAND_DUNSPARCE_TUNNEL", + "music": "BGM_FRLG_VIRIDIAN_FOREST", + "region_map_section": "MAPSEC_THREE_ISLE_PATH", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "27", + "x": 23, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ThreeIsland_DunsparceTunnel_EventScript_164D60", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 4, + "elevation": 3, + "dest_map": "MAP_THREE_ISLAND_PORT", + "dest_warp_id": 0 + }, + { + "x": 25, + "y": 5, + "elevation": 3, + "dest_map": "MAP_THREE_ISLAND_PORT", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "hidden_item", + "x": 21, + "y": 3, + "elevation": 0, + "item": "ITEM_NUGGET", + "flag": "163", + "unknown": 1 + } + ] +}
\ No newline at end of file diff --git a/data/maps/ThreeIsland_Harbor/events.inc b/data/maps/ThreeIsland_Harbor/events.inc deleted file mode 100644 index be18b4dc7..000000000 --- a/data/maps/ThreeIsland_Harbor/events.inc +++ /dev/null @@ -1,9 +0,0 @@ -ThreeIsland_Harbor_EventObjects: - object_event 1, 108, 0, 8, 0, 9, 0, 0, 8, 17, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 - object_event 2, 62, 0, 8, 0, 6, 0, 3, 7, 17, 0, 0, 0, 0, 0, ThreeIsland_Harbor_EventScript_171EAA, 0, 0, 0 - -ThreeIsland_Harbor_MapWarps: - warp_def 8, 2, 3, 2, 817 - -ThreeIsland_Harbor_MapEvents:: - map_events ThreeIsland_Harbor_EventObjects, ThreeIsland_Harbor_MapWarps, 0x0, 0x0 diff --git a/data/maps/ThreeIsland_Harbor/header.inc b/data/maps/ThreeIsland_Harbor/header.inc deleted file mode 100644 index 296d4889a..000000000 --- a/data/maps/ThreeIsland_Harbor/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -ThreeIsland_Harbor:: @ 8351F5C - .4byte Island_Harbor_Layout @ 0x8343FB8 - .4byte ThreeIsland_Harbor_MapEvents @ 0x83BF25C - .4byte ThreeIsland_Harbor_MapScripts @ 0x8171EA9 - .4byte NULL - .2byte BGM_FRLG_ISLAND_ONE - .2byte 315 - .byte 0x9a, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/ThreeIsland_Harbor/map.json b/data/maps/ThreeIsland_Harbor/map.json new file mode 100644 index 000000000..4348bde2f --- /dev/null +++ b/data/maps/ThreeIsland_Harbor/map.json @@ -0,0 +1,54 @@ +{ + "id": "MAP_THREE_ISLAND_HARBOR", + "name": "ThreeIsland_Harbor", + "layout": "LAYOUT_ISLAND_HARBOR", + "music": "BGM_FRLG_ISLAND_ONE", + "region_map_section": "MAPSEC_THREE_ISLE_PORT", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "108", + "x": 8, + "y": 9, + "elevation": 0, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "62", + "x": 8, + "y": 6, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ThreeIsland_Harbor_EventScript_171EAA", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 8, + "y": 2, + "elevation": 3, + "dest_map": "MAP_THREE_ISLAND_PORT", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/ThreeIsland_House1/events.inc b/data/maps/ThreeIsland_House1/events.inc deleted file mode 100644 index 1b252b532..000000000 --- a/data/maps/ThreeIsland_House1/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -ThreeIsland_House1_EventObjects: - object_event 1, 17, 0, 3, 0, 4, 0, 0, 10, 17, 0, 0, 0, 0, 0, ThreeIsland_House1_EventScript_17181A, 118, 0, 0 - -ThreeIsland_House1_MapWarps: - warp_def 4, 7, 3, 0, 782 - -ThreeIsland_House1_MapBGEvents: - bg_event 2, 1, 0, 0, 0, ThreeIsland_House1_EventScript_171829 - -ThreeIsland_House1_MapEvents:: - map_events ThreeIsland_House1_EventObjects, ThreeIsland_House1_MapWarps, 0x0, ThreeIsland_House1_MapBGEvents diff --git a/data/maps/ThreeIsland_House1/header.inc b/data/maps/ThreeIsland_House1/header.inc deleted file mode 100644 index 1be2f87cf..000000000 --- a/data/maps/ThreeIsland_House1/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -ThreeIsland_House1:: @ 8351C84 - .4byte ThreeIsland_House1_Layout @ 0x82D7504 - .4byte ThreeIsland_House1_MapEvents @ 0x83BE7A4 - .4byte ThreeIsland_House1_MapScripts @ 0x8171819 - .4byte NULL - .2byte BGM_FRLG_ISLAND_ONE - .2byte 31 - .byte 0x91, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/ThreeIsland_House1/map.json b/data/maps/ThreeIsland_House1/map.json new file mode 100644 index 000000000..b7d96db3c --- /dev/null +++ b/data/maps/ThreeIsland_House1/map.json @@ -0,0 +1,49 @@ +{ + "id": "MAP_THREE_ISLAND_HOUSE1", + "name": "ThreeIsland_House1", + "layout": "LAYOUT_THREE_ISLAND_HOUSE1", + "music": "BGM_FRLG_ISLAND_ONE", + "region_map_section": "MAPSEC_THREE_ISLAND", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "17", + "x": 3, + "y": 4, + "elevation": 0, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ThreeIsland_House1_EventScript_17181A", + "flag": "118" + } + ], + "warp_events": [ + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_THREE_ISLAND", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 2, + "y": 1, + "elevation": 0, + "script": "ThreeIsland_House1_EventScript_171829" + } + ] +}
\ No newline at end of file diff --git a/data/maps/ThreeIsland_House2/events.inc b/data/maps/ThreeIsland_House2/events.inc deleted file mode 100644 index 911e78290..000000000 --- a/data/maps/ThreeIsland_House2/events.inc +++ /dev/null @@ -1,9 +0,0 @@ -ThreeIsland_House2_EventObjects: - object_event 1, 26, 0, 4, 0, 4, 0, 3, 10, 17, 0, 0, 0, 0, 0, ThreeIsland_House2_EventScript_1718F9, 0, 0, 0 - object_event 2, 25, 0, 7, 0, 4, 0, 3, 9, 17, 0, 0, 0, 0, 0, ThreeIsland_House2_EventScript_1718E0, 0, 0, 0 - -ThreeIsland_House2_MapWarps: - warp_def 4, 7, 3, 3, 782 - -ThreeIsland_House2_MapEvents:: - map_events ThreeIsland_House2_EventObjects, ThreeIsland_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/ThreeIsland_House2/header.inc b/data/maps/ThreeIsland_House2/header.inc deleted file mode 100644 index e0f113fff..000000000 --- a/data/maps/ThreeIsland_House2/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -ThreeIsland_House2:: @ 8351CF4 - .4byte House3_Layout @ 0x82D5CB8 - .4byte ThreeIsland_House2_MapEvents @ 0x83BE97C - .4byte ThreeIsland_House2_MapScripts @ 0x81718DF - .4byte NULL - .2byte BGM_FRLG_ISLAND_ONE - .2byte 11 - .byte 0x91, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/ThreeIsland_House2/map.json b/data/maps/ThreeIsland_House2/map.json new file mode 100644 index 000000000..ca21bcb96 --- /dev/null +++ b/data/maps/ThreeIsland_House2/map.json @@ -0,0 +1,54 @@ +{ + "id": "MAP_THREE_ISLAND_HOUSE2", + "name": "ThreeIsland_House2", + "layout": "LAYOUT_HOUSE3", + "music": "BGM_FRLG_ISLAND_ONE", + "region_map_section": "MAPSEC_THREE_ISLAND", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "26", + "x": 4, + "y": 4, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ThreeIsland_House2_EventScript_1718F9", + "flag": "0" + }, + { + "graphics_id": "25", + "x": 7, + "y": 4, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ThreeIsland_House2_EventScript_1718E0", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_THREE_ISLAND", + "dest_warp_id": 3 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/ThreeIsland_House3/events.inc b/data/maps/ThreeIsland_House3/events.inc deleted file mode 100644 index 5635e1472..000000000 --- a/data/maps/ThreeIsland_House3/events.inc +++ /dev/null @@ -1,8 +0,0 @@ -ThreeIsland_House3_EventObjects: - object_event 1, 29, 0, 8, 0, 2, 0, 3, 7, 17, 0, 0, 0, 0, 0, ThreeIsland_House3_EventScript_171903, 0, 0, 0 - -ThreeIsland_House3_MapWarps: - warp_def 4, 7, 3, 4, 782 - -ThreeIsland_House3_MapEvents:: - map_events ThreeIsland_House3_EventObjects, ThreeIsland_House3_MapWarps, 0x0, 0x0 diff --git a/data/maps/ThreeIsland_House3/header.inc b/data/maps/ThreeIsland_House3/header.inc deleted file mode 100644 index 63799a6dc..000000000 --- a/data/maps/ThreeIsland_House3/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -ThreeIsland_House3:: @ 8351D10 - .4byte House3_Layout @ 0x82D5CB8 - .4byte ThreeIsland_House3_MapEvents @ 0x83BE9B0 - .4byte ThreeIsland_House3_MapScripts @ 0x8171902 - .4byte NULL - .2byte BGM_FRLG_ISLAND_ONE - .2byte 11 - .byte 0x91, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/ThreeIsland_House3/map.json b/data/maps/ThreeIsland_House3/map.json new file mode 100644 index 000000000..87b46b302 --- /dev/null +++ b/data/maps/ThreeIsland_House3/map.json @@ -0,0 +1,41 @@ +{ + "id": "MAP_THREE_ISLAND_HOUSE3", + "name": "ThreeIsland_House3", + "layout": "LAYOUT_HOUSE3", + "music": "BGM_FRLG_ISLAND_ONE", + "region_map_section": "MAPSEC_THREE_ISLAND", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "29", + "x": 8, + "y": 2, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ThreeIsland_House3_EventScript_171903", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_THREE_ISLAND", + "dest_warp_id": 4 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/ThreeIsland_House4/events.inc b/data/maps/ThreeIsland_House4/events.inc deleted file mode 100644 index 650f0d0ad..000000000 --- a/data/maps/ThreeIsland_House4/events.inc +++ /dev/null @@ -1,9 +0,0 @@ -ThreeIsland_House4_EventObjects: - object_event 1, 30, 0, 7, 0, 4, 0, 3, 9, 17, 0, 0, 0, 0, 0, ThreeIsland_House4_EventScript_17190D, 0, 0, 0 - object_event 2, 16, 0, 6, 0, 3, 0, 3, 2, 18, 0, 0, 0, 0, 0, ThreeIsland_House4_EventScript_171916, 0, 0, 0 - -ThreeIsland_House4_MapWarps: - warp_def 4, 7, 3, 5, 782 - -ThreeIsland_House4_MapEvents:: - map_events ThreeIsland_House4_EventObjects, ThreeIsland_House4_MapWarps, 0x0, 0x0 diff --git a/data/maps/ThreeIsland_House4/header.inc b/data/maps/ThreeIsland_House4/header.inc deleted file mode 100644 index 9a270c499..000000000 --- a/data/maps/ThreeIsland_House4/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -ThreeIsland_House4:: @ 8351D2C - .4byte House3_Layout @ 0x82D5CB8 - .4byte ThreeIsland_House4_MapEvents @ 0x83BE9FC - .4byte ThreeIsland_House4_MapScripts @ 0x817190C - .4byte NULL - .2byte BGM_FRLG_ISLAND_ONE - .2byte 11 - .byte 0x91, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/ThreeIsland_House4/map.json b/data/maps/ThreeIsland_House4/map.json new file mode 100644 index 000000000..42e328dbc --- /dev/null +++ b/data/maps/ThreeIsland_House4/map.json @@ -0,0 +1,54 @@ +{ + "id": "MAP_THREE_ISLAND_HOUSE4", + "name": "ThreeIsland_House4", + "layout": "LAYOUT_HOUSE3", + "music": "BGM_FRLG_ISLAND_ONE", + "region_map_section": "MAPSEC_THREE_ISLAND", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "30", + "x": 7, + "y": 4, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ThreeIsland_House4_EventScript_17190D", + "flag": "0" + }, + { + "graphics_id": "16", + "x": 6, + "y": 3, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 2, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ThreeIsland_House4_EventScript_171916", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_THREE_ISLAND", + "dest_warp_id": 5 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/ThreeIsland_House5/events.inc b/data/maps/ThreeIsland_House5/events.inc deleted file mode 100644 index 2c7fe7072..000000000 --- a/data/maps/ThreeIsland_House5/events.inc +++ /dev/null @@ -1,8 +0,0 @@ -ThreeIsland_House5_EventObjects: - object_event 1, 17, 0, 2, 0, 5, 0, 3, 2, 17, 0, 0, 0, 0, 0, ThreeIsland_House5_EventScript_171920, 0, 0, 0 - -ThreeIsland_House5_MapWarps: - warp_def 4, 7, 3, 6, 782 - -ThreeIsland_House5_MapEvents:: - map_events ThreeIsland_House5_EventObjects, ThreeIsland_House5_MapWarps, 0x0, 0x0 diff --git a/data/maps/ThreeIsland_House5/header.inc b/data/maps/ThreeIsland_House5/header.inc deleted file mode 100644 index 0579cbe99..000000000 --- a/data/maps/ThreeIsland_House5/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -ThreeIsland_House5:: @ 8351D48 - .4byte House3_Layout @ 0x82D5CB8 - .4byte ThreeIsland_House5_MapEvents @ 0x83BEA30 - .4byte ThreeIsland_House5_MapScripts @ 0x817191F - .4byte NULL - .2byte BGM_FRLG_ISLAND_ONE - .2byte 11 - .byte 0x91, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/ThreeIsland_House5/map.json b/data/maps/ThreeIsland_House5/map.json new file mode 100644 index 000000000..ccc509b37 --- /dev/null +++ b/data/maps/ThreeIsland_House5/map.json @@ -0,0 +1,41 @@ +{ + "id": "MAP_THREE_ISLAND_HOUSE5", + "name": "ThreeIsland_House5", + "layout": "LAYOUT_HOUSE3", + "music": "BGM_FRLG_ISLAND_ONE", + "region_map_section": "MAPSEC_THREE_ISLAND", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "17", + "x": 2, + "y": 5, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ThreeIsland_House5_EventScript_171920", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_THREE_ISLAND", + "dest_warp_id": 6 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/ThreeIsland_Mart/events.inc b/data/maps/ThreeIsland_Mart/events.inc deleted file mode 100644 index 1bbd353ad..000000000 --- a/data/maps/ThreeIsland_Mart/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -ThreeIsland_Mart_EventObjects: - object_event 1, 68, 0, 2, 0, 3, 0, 0, 10, 17, 0, 0, 0, 0, 0, ThreeIsland_Mart_EventScript_17188D, 0, 0, 0 - object_event 2, 40, 0, 2, 0, 7, 0, 3, 7, 17, 0, 0, 0, 0, 0, ThreeIsland_Mart_EventScript_1718C4, 0, 0, 0 - object_event 3, 20, 0, 7, 0, 2, 0, 3, 7, 17, 0, 0, 0, 0, 0, ThreeIsland_Mart_EventScript_1718CD, 0, 0, 0 - object_event 4, 18, 0, 6, 0, 5, 0, 3, 2, 17, 0, 0, 0, 0, 0, ThreeIsland_Mart_EventScript_1718D6, 0, 0, 0 - -ThreeIsland_Mart_MapWarps: - warp_def 4, 7, 3, 2, 782 - -ThreeIsland_Mart_MapEvents:: - map_events ThreeIsland_Mart_EventObjects, ThreeIsland_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/ThreeIsland_Mart/header.inc b/data/maps/ThreeIsland_Mart/header.inc deleted file mode 100644 index 1bf63765e..000000000 --- a/data/maps/ThreeIsland_Mart/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -ThreeIsland_Mart:: @ 8351CD8 - .4byte Mart_Layout @ 0x82D5BCC - .4byte ThreeIsland_Mart_MapEvents @ 0x83BE930 - .4byte ThreeIsland_Mart_MapScripts @ 0x817188C - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 10 - .byte 0x91, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/ThreeIsland_Mart/map.json b/data/maps/ThreeIsland_Mart/map.json new file mode 100644 index 000000000..ed3bb6395 --- /dev/null +++ b/data/maps/ThreeIsland_Mart/map.json @@ -0,0 +1,80 @@ +{ + "id": "MAP_THREE_ISLAND_MART", + "name": "ThreeIsland_Mart", + "layout": "LAYOUT_MART", + "music": "BGM_FRLG_POKEMON_CENTER", + "region_map_section": "MAPSEC_THREE_ISLAND", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "68", + "x": 2, + "y": 3, + "elevation": 0, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ThreeIsland_Mart_EventScript_17188D", + "flag": "0" + }, + { + "graphics_id": "40", + "x": 2, + "y": 7, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ThreeIsland_Mart_EventScript_1718C4", + "flag": "0" + }, + { + "graphics_id": "20", + "x": 7, + "y": 2, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ThreeIsland_Mart_EventScript_1718CD", + "flag": "0" + }, + { + "graphics_id": "18", + "x": 6, + "y": 5, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ThreeIsland_Mart_EventScript_1718D6", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_THREE_ISLAND", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/ThreeIsland_PokemonCenter_1F/events.inc b/data/maps/ThreeIsland_PokemonCenter_1F/events.inc deleted file mode 100644 index 2e48a021b..000000000 --- a/data/maps/ThreeIsland_PokemonCenter_1F/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -ThreeIsland_PokemonCenter_1F_EventObjects: - object_event 1, 64, 0, 7, 0, 2, 0, 0, 8, 17, 0, 0, 0, 0, 0, ThreeIsland_PokemonCenter_1F_EventScript_171841, 0, 0, 0 - object_event 2, 26, 0, 12, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, ThreeIsland_PokemonCenter_1F_EventScript_17185C, 0, 0, 0 - object_event 3, 22, 0, 3, 0, 4, 0, 3, 5, 17, 0, 0, 0, 0, 0, ThreeIsland_PokemonCenter_1F_EventScript_171853, 0, 0, 0 - object_event 4, 62, 0, 11, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, ThreeIsland_PokemonCenter_1F_EventScript_17184A, 0, 0, 0 - -ThreeIsland_PokemonCenter_1F_MapWarps: - warp_def 7, 8, 3, 1, 782 - warp_def 1, 6, 4, 0, 8706 - -ThreeIsland_PokemonCenter_1F_MapEvents:: - map_events ThreeIsland_PokemonCenter_1F_EventObjects, ThreeIsland_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/ThreeIsland_PokemonCenter_1F/header.inc b/data/maps/ThreeIsland_PokemonCenter_1F/header.inc deleted file mode 100644 index d65a7ef6a..000000000 --- a/data/maps/ThreeIsland_PokemonCenter_1F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -ThreeIsland_PokemonCenter_1F:: @ 8351CA0 - .4byte PokemonCenter_1F_Layout @ 0x82D5990 - .4byte ThreeIsland_PokemonCenter_1F_MapEvents @ 0x83BE828 - .4byte ThreeIsland_PokemonCenter_1F_MapScripts @ 0x8171832 - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 8 - .byte 0x91, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/ThreeIsland_PokemonCenter_1F/map.json b/data/maps/ThreeIsland_PokemonCenter_1F/map.json new file mode 100644 index 000000000..3292e5409 --- /dev/null +++ b/data/maps/ThreeIsland_PokemonCenter_1F/map.json @@ -0,0 +1,87 @@ +{ + "id": "MAP_THREE_ISLAND_POKEMON_CENTER_1F", + "name": "ThreeIsland_PokemonCenter_1F", + "layout": "LAYOUT_POKEMON_CENTER_1F", + "music": "BGM_FRLG_POKEMON_CENTER", + "region_map_section": "MAPSEC_THREE_ISLAND", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "64", + "x": 7, + "y": 2, + "elevation": 0, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ThreeIsland_PokemonCenter_1F_EventScript_171841", + "flag": "0" + }, + { + "graphics_id": "26", + "x": 12, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ThreeIsland_PokemonCenter_1F_EventScript_17185C", + "flag": "0" + }, + { + "graphics_id": "22", + "x": 3, + "y": 4, + "elevation": 3, + "movement_type": "5", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ThreeIsland_PokemonCenter_1F_EventScript_171853", + "flag": "0" + }, + { + "graphics_id": "62", + "x": 11, + "y": 5, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ThreeIsland_PokemonCenter_1F_EventScript_17184A", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 7, + "y": 8, + "elevation": 3, + "dest_map": "MAP_THREE_ISLAND", + "dest_warp_id": 1 + }, + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_THREE_ISLAND_POKEMON_CENTER_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/ThreeIsland_PokemonCenter_2F/events.inc b/data/maps/ThreeIsland_PokemonCenter_2F/events.inc deleted file mode 100644 index 1498826df..000000000 --- a/data/maps/ThreeIsland_PokemonCenter_2F/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -ThreeIsland_PokemonCenter_2F_EventObjects: - object_event 1, 65, 0, 6, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, ThreeIsland_PokemonCenter_2F_EventScript_1A8CF6, 0, 0, 0 - object_event 2, 65, 0, 2, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, ThreeIsland_PokemonCenter_2F_EventScript_1A8CFC, 0, 0, 0 - object_event 3, 65, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, ThreeIsland_PokemonCenter_2F_EventScript_1A8D02, 0, 0, 0 - object_event 4, 69, 0, 1, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, ThreeIsland_PokemonCenter_2F_EventScript_1BB1D2, 112, 0, 0 - -ThreeIsland_PokemonCenter_2F_MapWarps: - warp_def 1, 6, 4, 1, 8705 - warp_def 5, 1, 0, 0, 4 - warp_def 9, 1, 0, 0, 1 - -ThreeIsland_PokemonCenter_2F_MapEvents:: - map_events ThreeIsland_PokemonCenter_2F_EventObjects, ThreeIsland_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/ThreeIsland_PokemonCenter_2F/header.inc b/data/maps/ThreeIsland_PokemonCenter_2F/header.inc deleted file mode 100644 index 83ab3678c..000000000 --- a/data/maps/ThreeIsland_PokemonCenter_2F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -ThreeIsland_PokemonCenter_2F:: @ 8351CBC - .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 - .4byte ThreeIsland_PokemonCenter_2F_MapEvents @ 0x83BE8B4 - .4byte ThreeIsland_PokemonCenter_2F_MapScripts @ 0x8171865 - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 9 - .byte 0x91, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/ThreeIsland_PokemonCenter_2F/map.json b/data/maps/ThreeIsland_PokemonCenter_2F/map.json new file mode 100644 index 000000000..b396f5897 --- /dev/null +++ b/data/maps/ThreeIsland_PokemonCenter_2F/map.json @@ -0,0 +1,94 @@ +{ + "id": "MAP_THREE_ISLAND_POKEMON_CENTER_2F", + "name": "ThreeIsland_PokemonCenter_2F", + "layout": "LAYOUT_POKEMON_CENTER_2F", + "music": "BGM_FRLG_POKEMON_CENTER", + "region_map_section": "MAPSEC_THREE_ISLAND", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "65", + "x": 6, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ThreeIsland_PokemonCenter_2F_EventScript_1A8CF6", + "flag": "0" + }, + { + "graphics_id": "65", + "x": 2, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ThreeIsland_PokemonCenter_2F_EventScript_1A8CFC", + "flag": "0" + }, + { + "graphics_id": "65", + "x": 10, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ThreeIsland_PokemonCenter_2F_EventScript_1A8D02", + "flag": "0" + }, + { + "graphics_id": "69", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ThreeIsland_PokemonCenter_2F_EventScript_1BB1D2", + "flag": "112" + } + ], + "warp_events": [ + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_THREE_ISLAND_POKEMON_CENTER_1F", + "dest_warp_id": 1 + }, + { + "x": 5, + "y": 1, + "elevation": 0, + "dest_map": "MAP_UNKNOWN_MAP_00_04", + "dest_warp_id": 0 + }, + { + "x": 9, + "y": 1, + "elevation": 0, + "dest_map": "MAP_UNKNOWN_MAP_00_01", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/ThreeIsland_Port/connections.inc b/data/maps/ThreeIsland_Port/connections.inc deleted file mode 100644 index 0c166e50d..000000000 --- a/data/maps/ThreeIsland_Port/connections.inc +++ /dev/null @@ -1,6 +0,0 @@ -ThreeIsland_Port_MapConnectionsList: @ 8352D6C - connection up, 0, MAP_THREE_ISLAND - -ThreeIsland_Port_MapConnections:: @ 8352D78 - .4byte 1 - .4byte ThreeIsland_Port_MapConnectionsList diff --git a/data/maps/ThreeIsland_Port/events.inc b/data/maps/ThreeIsland_Port/events.inc deleted file mode 100644 index 8a6894ed1..000000000 --- a/data/maps/ThreeIsland_Port/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -ThreeIsland_Port_EventObjects: - object_event 1, 31, 0, 14, 0, 9, 0, 3, 1, 17, 0, 0, 0, 0, 0, ThreeIsland_Port_EventScript_168796, 0, 0, 0 - object_event 2, 53, 0, 8, 0, 8, 0, 3, 28, 19, 0, 0, 0, 0, 0, ThreeIsland_Port_EventScript_1687CC, 121, 0, 0 - object_event 3, 53, 0, 13, 0, 10, 0, 3, 49, 34, 0, 0, 0, 0, 0, ThreeIsland_Port_EventScript_1687D5, 121, 0, 0 - -ThreeIsland_Port_MapWarps: - warp_def 16, 4, 0, 0, 546 - warp_def 38, 5, 3, 1, 546 - warp_def 12, 13, 3, 0, 9728 - -ThreeIsland_Port_MapEvents:: - map_events ThreeIsland_Port_EventObjects, ThreeIsland_Port_MapWarps, 0x0, 0x0 diff --git a/data/maps/ThreeIsland_Port/header.inc b/data/maps/ThreeIsland_Port/header.inc deleted file mode 100644 index 7fac5fe54..000000000 --- a/data/maps/ThreeIsland_Port/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -ThreeIsland_Port:: @ 8350B74 - .4byte ThreeIsland_Port_Layout @ 0x8328380 - .4byte ThreeIsland_Port_MapEvents @ 0x83B8B10 - .4byte ThreeIsland_Port_MapScripts @ 0x8168789 - .4byte ThreeIsland_Port_MapConnections @ 0x8352D78 - .2byte BGM_FRLG_ROUTE_3 - .2byte 241 - .byte 0x9a, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/ThreeIsland_Port/map.json b/data/maps/ThreeIsland_Port/map.json new file mode 100644 index 000000000..dcc447fbb --- /dev/null +++ b/data/maps/ThreeIsland_Port/map.json @@ -0,0 +1,87 @@ +{ + "id": "MAP_THREE_ISLAND_PORT", + "name": "ThreeIsland_Port", + "layout": "LAYOUT_THREE_ISLAND_PORT", + "music": "BGM_FRLG_ROUTE_3", + "region_map_section": "MAPSEC_THREE_ISLE_PORT", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_3", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_THREE_ISLAND", + "offset": 0, + "direction": "up" + } + ], + "object_events": [ + { + "graphics_id": "31", + "x": 14, + "y": 9, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ThreeIsland_Port_EventScript_168796", + "flag": "0" + }, + { + "graphics_id": "53", + "x": 8, + "y": 8, + "elevation": 3, + "movement_type": "28", + "movement_range_x": 3, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ThreeIsland_Port_EventScript_1687CC", + "flag": "121" + }, + { + "graphics_id": "53", + "x": 13, + "y": 10, + "elevation": 3, + "movement_type": "49", + "movement_range_x": 2, + "movement_range_y": 2, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ThreeIsland_Port_EventScript_1687D5", + "flag": "121" + } + ], + "warp_events": [ + { + "x": 16, + "y": 4, + "elevation": 0, + "dest_map": "MAP_THREE_ISLAND_DUNSPARCE_TUNNEL", + "dest_warp_id": 0 + }, + { + "x": 38, + "y": 5, + "elevation": 3, + "dest_map": "MAP_THREE_ISLAND_DUNSPARCE_TUNNEL", + "dest_warp_id": 1 + }, + { + "x": 12, + "y": 13, + "elevation": 3, + "dest_map": "MAP_THREE_ISLAND_HARBOR", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/TwoIsland/connections.inc b/data/maps/TwoIsland/connections.inc deleted file mode 100644 index 3cd53b58f..000000000 --- a/data/maps/TwoIsland/connections.inc +++ /dev/null @@ -1,6 +0,0 @@ -TwoIsland_MapConnectionsList: @ 8352954 - connection up, 24, MAP_TWO_ISLAND_CAPEBRINK - -TwoIsland_MapConnections:: @ 8352960 - .4byte 1 - .4byte TwoIsland_MapConnectionsList diff --git a/data/maps/TwoIsland/events.inc b/data/maps/TwoIsland/events.inc deleted file mode 100644 index 5ae72f9ed..000000000 --- a/data/maps/TwoIsland/events.inc +++ /dev/null @@ -1,24 +0,0 @@ -TwoIsland_EventObjects: - object_event 1, 68, 0, 28, 0, 4, 0, 3, 8, 33, 0, 0, 0, 0, 0, TwoIsland_EventScript_16760F, 0, 0, 0 - object_event 2, 23, 0, 31, 0, 6, 0, 3, 7, 17, 0, 0, 0, 0, 0, TwoIsland_EventScript_167755, 123, 0, 0 - object_event 3, 29, 0, 30, 0, 11, 0, 3, 7, 17, 0, 0, 0, 0, 0, TwoIsland_EventScript_16775E, 124, 0, 0 - object_event 4, 62, 0, 26, 0, 5, 0, 3, 10, 17, 0, 0, 0, 0, 0, TwoIsland_EventScript_16774C, 0, 0, 0 - object_event 5, 52, 0, 27, 0, 6, 0, 3, 10, 17, 0, 0, 0, 0, 0, TwoIsland_EventScript_167777, 125, 0, 0 - object_event 6, 95, 0, 30, 0, 16, 0, 3, 1, 17, 0, 0, 0, 0, 0, TwoIsland_EventScript_1BDF13, 18, 0, 0 - object_event 7, 92, 0, 39, 0, 16, 0, 3, 8, 17, 0, 0, 0, 0, 0, TwoIsland_EventScript_1BEAAF, 442, 0, 0 - object_event 8, 16, 0, 37, 0, 12, 0, 3, 8, 17, 0, 0, 0, 0, 0, TwoIsland_EventScript_167789, 0, 0, 0 - object_event 9, 19, 0, 24, 0, 12, 0, 3, 2, 17, 0, 0, 0, 0, 0, TwoIsland_EventScript_167780, 0, 0, 0 - -TwoIsland_MapWarps: - warp_def 39, 9, 0, 0, 8448 - warp_def 33, 9, 0, 0, 8449 - warp_def 21, 7, 0, 0, 8450 - warp_def 10, 8, 3, 0, 8452 - -TwoIsland_MapBGEvents: - bg_event 29, 8, 0, 0, 0, TwoIsland_EventScript_167792 - bg_event 40, 10, 0, 0, 0, TwoIsland_EventScript_16779B - bg_event 8, 3, 0, 0, 0, TwoIsland_EventScript_1677A4 - -TwoIsland_MapEvents:: - map_events TwoIsland_EventObjects, TwoIsland_MapWarps, 0x0, TwoIsland_MapBGEvents diff --git a/data/maps/TwoIsland/header.inc b/data/maps/TwoIsland/header.inc deleted file mode 100644 index 698e7544b..000000000 --- a/data/maps/TwoIsland/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -TwoIsland:: @ 8350784 - .4byte TwoIsland_Layout @ 0x8321EB8 - .4byte TwoIsland_MapEvents @ 0x83B6074 - .4byte TwoIsland_MapScripts @ 0x8167564 - .4byte TwoIsland_MapConnections @ 0x8352960 - .2byte BGM_FRLG_ISLAND_ONE - .2byte 231 - .byte 0x90, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/TwoIsland/map.json b/data/maps/TwoIsland/map.json new file mode 100644 index 000000000..42e6a428e --- /dev/null +++ b/data/maps/TwoIsland/map.json @@ -0,0 +1,194 @@ +{ + "id": "MAP_TWO_ISLAND", + "name": "TwoIsland", + "layout": "LAYOUT_TWO_ISLAND", + "music": "BGM_FRLG_ISLAND_ONE", + "region_map_section": "MAPSEC_TWO_ISLAND", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_1", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_TWO_ISLAND_CAPE_BRINK", + "offset": 24, + "direction": "up" + } + ], + "object_events": [ + { + "graphics_id": "68", + "x": 28, + "y": 4, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 2, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TwoIsland_EventScript_16760F", + "flag": "0" + }, + { + "graphics_id": "23", + "x": 31, + "y": 6, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TwoIsland_EventScript_167755", + "flag": "123" + }, + { + "graphics_id": "29", + "x": 30, + "y": 11, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TwoIsland_EventScript_16775E", + "flag": "124" + }, + { + "graphics_id": "62", + "x": 26, + "y": 5, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TwoIsland_EventScript_16774C", + "flag": "0" + }, + { + "graphics_id": "52", + "x": 27, + "y": 6, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TwoIsland_EventScript_167777", + "flag": "125" + }, + { + "graphics_id": "95", + "x": 30, + "y": 16, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TwoIsland_EventScript_1BDF13", + "flag": "18" + }, + { + "graphics_id": "92", + "x": 39, + "y": 16, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TwoIsland_EventScript_1BEAAF", + "flag": "442" + }, + { + "graphics_id": "16", + "x": 37, + "y": 12, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TwoIsland_EventScript_167789", + "flag": "0" + }, + { + "graphics_id": "19", + "x": 24, + "y": 12, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TwoIsland_EventScript_167780", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 39, + "y": 9, + "elevation": 0, + "dest_map": "MAP_TWO_ISLAND_JOYFUL_GAME_CORNER", + "dest_warp_id": 0 + }, + { + "x": 33, + "y": 9, + "elevation": 0, + "dest_map": "MAP_TWO_ISLAND_HOUSE", + "dest_warp_id": 0 + }, + { + "x": 21, + "y": 7, + "elevation": 0, + "dest_map": "MAP_TWO_ISLAND_POKEMON_CENTER_1F", + "dest_warp_id": 0 + }, + { + "x": 10, + "y": 8, + "elevation": 3, + "dest_map": "MAP_TWO_ISLAND_HARBOR", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 29, + "y": 8, + "elevation": 0, + "script": "TwoIsland_EventScript_167792" + }, + { + "type": "bg_event_type_0", + "x": 40, + "y": 10, + "elevation": 0, + "script": "TwoIsland_EventScript_16779B" + }, + { + "type": "bg_event_type_0", + "x": 8, + "y": 3, + "elevation": 0, + "script": "TwoIsland_EventScript_1677A4" + } + ] +}
\ No newline at end of file diff --git a/data/maps/TwoIsland_CapeBrink/connections.inc b/data/maps/TwoIsland_CapeBrink/connections.inc deleted file mode 100644 index 0257526a9..000000000 --- a/data/maps/TwoIsland_CapeBrink/connections.inc +++ /dev/null @@ -1,6 +0,0 @@ -TwoIsland_CapeBrink_MapConnectionsList: @ 8352D44 - connection down, -24, MAP_TWO_ISLAND - -TwoIsland_CapeBrink_MapConnections:: @ 8352D50 - .4byte 1 - .4byte TwoIsland_CapeBrink_MapConnectionsList diff --git a/data/maps/TwoIsland_CapeBrink/events.inc b/data/maps/TwoIsland_CapeBrink/events.inc deleted file mode 100644 index 6892de68a..000000000 --- a/data/maps/TwoIsland_CapeBrink/events.inc +++ /dev/null @@ -1,9 +0,0 @@ -TwoIsland_CapeBrink_MapWarps: - warp_def 12, 16, 0, 0, 10240 - -TwoIsland_CapeBrink_MapBGEvents: - bg_event 16, 28, 3, 7, 0, 71, 161, 129 - bg_event 15, 13, 3, 7, 0, 68, 111, 1 - -TwoIsland_CapeBrink_MapEvents:: - map_events 0x0, TwoIsland_CapeBrink_MapWarps, 0x0, TwoIsland_CapeBrink_MapBGEvents diff --git a/data/maps/TwoIsland_CapeBrink/header.inc b/data/maps/TwoIsland_CapeBrink/header.inc deleted file mode 100644 index d97cc38a1..000000000 --- a/data/maps/TwoIsland_CapeBrink/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -TwoIsland_CapeBrink:: @ 8350B3C - .4byte TwoIsland_CapeBrink_Layout @ 0x8326CB8 - .4byte TwoIsland_CapeBrink_MapEvents @ 0x83B8964 - .4byte TwoIsland_CapeBrink_MapScripts @ 0x8168775 - .4byte TwoIsland_CapeBrink_MapConnections @ 0x8352D50 - .2byte BGM_FRLG_ROUTE_3 - .2byte 239 - .byte 0x98, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/TwoIsland_CapeBrink/map.json b/data/maps/TwoIsland_CapeBrink/map.json new file mode 100644 index 000000000..b5981e934 --- /dev/null +++ b/data/maps/TwoIsland_CapeBrink/map.json @@ -0,0 +1,52 @@ +{ + "id": "MAP_TWO_ISLAND_CAPE_BRINK", + "name": "TwoIsland_CapeBrink", + "layout": "LAYOUT_TWO_ISLAND_CAPE_BRINK", + "music": "BGM_FRLG_ROUTE_3", + "region_map_section": "MAPSEC_CAPE_BRINK", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_3", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_TWO_ISLAND", + "offset": -24, + "direction": "down" + } + ], + "object_events": [], + "warp_events": [ + { + "x": 12, + "y": 16, + "elevation": 0, + "dest_map": "MAP_TWO_ISLAND_CAPE_BRINK_HOUSE", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "hidden_item", + "x": 16, + "y": 28, + "elevation": 3, + "item": "ITEM_PP_MAX", + "flag": "161", + "unknown": 129 + }, + { + "type": "hidden_item", + "x": 15, + "y": 13, + "elevation": 3, + "item": "ITEM_RARE_CANDY", + "flag": "111", + "unknown": 1 + } + ] +}
\ No newline at end of file diff --git a/data/maps/TwoIsland_CapeBrink_House/events.inc b/data/maps/TwoIsland_CapeBrink_House/events.inc deleted file mode 100644 index 0c656e121..000000000 --- a/data/maps/TwoIsland_CapeBrink_House/events.inc +++ /dev/null @@ -1,8 +0,0 @@ -TwoIsland_CapeBrink_House_EventObjects: - object_event 1, 58, 0, 4, 0, 4, 0, 3, 8, 17, 0, 0, 0, 0, 0, TwoIsland_CapeBrink_House_EventScript_1C4DEC, 0, 0, 0 - -TwoIsland_CapeBrink_House_MapWarps: - warp_def 4, 7, 3, 0, 815 - -TwoIsland_CapeBrink_House_MapEvents:: - map_events TwoIsland_CapeBrink_House_EventObjects, TwoIsland_CapeBrink_House_MapWarps, 0x0, 0x0 diff --git a/data/maps/TwoIsland_CapeBrink_House/header.inc b/data/maps/TwoIsland_CapeBrink_House/header.inc deleted file mode 100644 index a5cb71beb..000000000 --- a/data/maps/TwoIsland_CapeBrink_House/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -TwoIsland_CapeBrink_House:: @ 8351F94 - .4byte House3_Layout @ 0x82D5CB8 - .4byte TwoIsland_CapeBrink_House_MapEvents @ 0x83BF2F4 - .4byte TwoIsland_CapeBrink_House_MapScripts @ 0x817206B - .4byte NULL - .2byte BGM_FRLG_ISLAND_ONE - .2byte 11 - .byte 0x98, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/TwoIsland_CapeBrink_House/map.json b/data/maps/TwoIsland_CapeBrink_House/map.json new file mode 100644 index 000000000..e974ef1f0 --- /dev/null +++ b/data/maps/TwoIsland_CapeBrink_House/map.json @@ -0,0 +1,41 @@ +{ + "id": "MAP_TWO_ISLAND_CAPE_BRINK_HOUSE", + "name": "TwoIsland_CapeBrink_House", + "layout": "LAYOUT_HOUSE3", + "music": "BGM_FRLG_ISLAND_ONE", + "region_map_section": "MAPSEC_CAPE_BRINK", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "58", + "x": 4, + "y": 4, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TwoIsland_CapeBrink_House_EventScript_1C4DEC", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_TWO_ISLAND_CAPE_BRINK", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/TwoIsland_Harbor/events.inc b/data/maps/TwoIsland_Harbor/events.inc deleted file mode 100644 index bcc123c41..000000000 --- a/data/maps/TwoIsland_Harbor/events.inc +++ /dev/null @@ -1,9 +0,0 @@ -TwoIsland_Harbor_EventObjects: - object_event 1, 108, 0, 8, 0, 9, 0, 0, 8, 17, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 - object_event 2, 62, 0, 8, 0, 6, 0, 3, 7, 17, 0, 0, 0, 0, 0, TwoIsland_Harbor_EventScript_171806, 0, 0, 0 - -TwoIsland_Harbor_MapWarps: - warp_def 8, 2, 3, 3, 781 - -TwoIsland_Harbor_MapEvents:: - map_events TwoIsland_Harbor_EventObjects, TwoIsland_Harbor_MapWarps, 0x0, 0x0 diff --git a/data/maps/TwoIsland_Harbor/header.inc b/data/maps/TwoIsland_Harbor/header.inc deleted file mode 100644 index a7f4b3c97..000000000 --- a/data/maps/TwoIsland_Harbor/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -TwoIsland_Harbor:: @ 8351C68 - .4byte Island_Harbor_Layout @ 0x8343FB8 - .4byte TwoIsland_Harbor_MapEvents @ 0x83BE764 - .4byte TwoIsland_Harbor_MapScripts @ 0x8171805 - .4byte NULL - .2byte BGM_FRLG_ISLAND_ONE - .2byte 315 - .byte 0x90, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/TwoIsland_Harbor/map.json b/data/maps/TwoIsland_Harbor/map.json new file mode 100644 index 000000000..9a715d4b0 --- /dev/null +++ b/data/maps/TwoIsland_Harbor/map.json @@ -0,0 +1,54 @@ +{ + "id": "MAP_TWO_ISLAND_HARBOR", + "name": "TwoIsland_Harbor", + "layout": "LAYOUT_ISLAND_HARBOR", + "music": "BGM_FRLG_ISLAND_ONE", + "region_map_section": "MAPSEC_TWO_ISLAND", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "108", + "x": 8, + "y": 9, + "elevation": 0, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "62", + "x": 8, + "y": 6, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TwoIsland_Harbor_EventScript_171806", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 8, + "y": 2, + "elevation": 3, + "dest_map": "MAP_TWO_ISLAND", + "dest_warp_id": 3 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/TwoIsland_House/events.inc b/data/maps/TwoIsland_House/events.inc deleted file mode 100644 index 44f34a69b..000000000 --- a/data/maps/TwoIsland_House/events.inc +++ /dev/null @@ -1,8 +0,0 @@ -TwoIsland_House_EventObjects: - object_event 1, 27, 0, 7, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, TwoIsland_House_EventScript_171619, 0, 0, 0 - -TwoIsland_House_MapWarps: - warp_def 4, 7, 3, 1, 781 - -TwoIsland_House_MapEvents:: - map_events TwoIsland_House_EventObjects, TwoIsland_House_MapWarps, 0x0, 0x0 diff --git a/data/maps/TwoIsland_House/header.inc b/data/maps/TwoIsland_House/header.inc deleted file mode 100644 index ef308156d..000000000 --- a/data/maps/TwoIsland_House/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -TwoIsland_House:: @ 8351C14 - .4byte House3_Layout @ 0x82D5CB8 - .4byte TwoIsland_House_MapEvents @ 0x83BE620 - .4byte TwoIsland_House_MapScripts @ 0x8171618 - .4byte NULL - .2byte BGM_FRLG_ISLAND_ONE - .2byte 11 - .byte 0x90, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/TwoIsland_House/map.json b/data/maps/TwoIsland_House/map.json new file mode 100644 index 000000000..04a3d1b43 --- /dev/null +++ b/data/maps/TwoIsland_House/map.json @@ -0,0 +1,41 @@ +{ + "id": "MAP_TWO_ISLAND_HOUSE", + "name": "TwoIsland_House", + "layout": "LAYOUT_HOUSE3", + "music": "BGM_FRLG_ISLAND_ONE", + "region_map_section": "MAPSEC_TWO_ISLAND", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "27", + "x": 7, + "y": 5, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TwoIsland_House_EventScript_171619", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_TWO_ISLAND", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/TwoIsland_JoyfulGameCorner/events.inc b/data/maps/TwoIsland_JoyfulGameCorner/events.inc deleted file mode 100644 index 152c9e001..000000000 --- a/data/maps/TwoIsland_JoyfulGameCorner/events.inc +++ /dev/null @@ -1,15 +0,0 @@ -TwoIsland_JoyfulGameCorner_EventObjects: - object_event 1, 30, 0, 5, 0, 5, 0, 1, 10, 17, 0, 0, 0, 0, 0, TwoIsland_JoyfulGameCorner_EventScript_17155F, 0, 0, 0 - object_event 2, 53, 0, 5, 0, 8, 0, 3, 7, 17, 0, 0, 0, 0, 0, 0x0, 116, 0, 0 - object_event 3, 17, 0, 6, 0, 5, 0, 1, 9, 17, 0, 0, 0, 0, 0, TwoIsland_JoyfulGameCorner_EventScript_17160C, 117, 0, 0 - object_event 4, 25, 0, 4, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, TwoIsland_JoyfulGameCorner_EventScript_171535, 0, 0, 0 - -TwoIsland_JoyfulGameCorner_MapWarps: - warp_def 5, 8, 3, 0, 781 - -TwoIsland_JoyfulGameCorner_MapBGEvents: - bg_event 1, 1, 0, 0, 0, TwoIsland_JoyfulGameCorner_EventScript_1BC2E7 - bg_event 0, 1, 0, 0, 0, TwoIsland_JoyfulGameCorner_EventScript_1BC2FC - -TwoIsland_JoyfulGameCorner_MapEvents:: - map_events TwoIsland_JoyfulGameCorner_EventObjects, TwoIsland_JoyfulGameCorner_MapWarps, 0x0, TwoIsland_JoyfulGameCorner_MapBGEvents diff --git a/data/maps/TwoIsland_JoyfulGameCorner/header.inc b/data/maps/TwoIsland_JoyfulGameCorner/header.inc deleted file mode 100644 index 35934a5f6..000000000 --- a/data/maps/TwoIsland_JoyfulGameCorner/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -TwoIsland_JoyfulGameCorner:: @ 8351BF8 - .4byte TwoIsland_JoyfulGameCorner_Layout @ 0x833AA84 - .4byte TwoIsland_JoyfulGameCorner_MapEvents @ 0x83BE5EC - .4byte TwoIsland_JoyfulGameCorner_MapScripts @ 0x81713D0 - .4byte NULL - .2byte BGM_FRLG_GAMECORNER - .2byte 272 - .byte 0x90, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/TwoIsland_JoyfulGameCorner/map.json b/data/maps/TwoIsland_JoyfulGameCorner/map.json new file mode 100644 index 000000000..40015e536 --- /dev/null +++ b/data/maps/TwoIsland_JoyfulGameCorner/map.json @@ -0,0 +1,95 @@ +{ + "id": "MAP_TWO_ISLAND_JOYFUL_GAME_CORNER", + "name": "TwoIsland_JoyfulGameCorner", + "layout": "LAYOUT_TWO_ISLAND_JOYFUL_GAME_CORNER", + "music": "BGM_FRLG_GAMECORNER", + "region_map_section": "MAPSEC_TWO_ISLAND", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "30", + "x": 5, + "y": 5, + "elevation": 1, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TwoIsland_JoyfulGameCorner_EventScript_17155F", + "flag": "0" + }, + { + "graphics_id": "53", + "x": 5, + "y": 8, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "116" + }, + { + "graphics_id": "17", + "x": 6, + "y": 5, + "elevation": 1, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TwoIsland_JoyfulGameCorner_EventScript_17160C", + "flag": "117" + }, + { + "graphics_id": "25", + "x": 4, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TwoIsland_JoyfulGameCorner_EventScript_171535", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 5, + "y": 8, + "elevation": 3, + "dest_map": "MAP_TWO_ISLAND", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 1, + "y": 1, + "elevation": 0, + "script": "TwoIsland_JoyfulGameCorner_EventScript_1BC2E7" + }, + { + "type": "bg_event_type_0", + "x": 0, + "y": 1, + "elevation": 0, + "script": "TwoIsland_JoyfulGameCorner_EventScript_1BC2FC" + } + ] +}
\ No newline at end of file diff --git a/data/maps/TwoIsland_PokemonCenter_1F/events.inc b/data/maps/TwoIsland_PokemonCenter_1F/events.inc deleted file mode 100644 index 01d9c8105..000000000 --- a/data/maps/TwoIsland_PokemonCenter_1F/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -TwoIsland_PokemonCenter_1F_EventObjects: - object_event 1, 64, 0, 7, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, TwoIsland_PokemonCenter_1F_EventScript_1717C3, 0, 0, 0 - object_event 2, 51, 0, 11, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, TwoIsland_PokemonCenter_1F_EventScript_1717CC, 0, 0, 0 - object_event 3, 20, 0, 4, 0, 4, 0, 3, 5, 17, 0, 0, 0, 0, 0, TwoIsland_PokemonCenter_1F_EventScript_1717D5, 0, 0, 0 - -TwoIsland_PokemonCenter_1F_MapWarps: - warp_def 7, 8, 3, 2, 781 - warp_def 1, 6, 4, 0, 8451 - -TwoIsland_PokemonCenter_1F_MapEvents:: - map_events TwoIsland_PokemonCenter_1F_EventObjects, TwoIsland_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/TwoIsland_PokemonCenter_1F/header.inc b/data/maps/TwoIsland_PokemonCenter_1F/header.inc deleted file mode 100644 index 8999f1fae..000000000 --- a/data/maps/TwoIsland_PokemonCenter_1F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -TwoIsland_PokemonCenter_1F:: @ 8351C30 - .4byte PokemonCenter_1F_Layout @ 0x82D5990 - .4byte TwoIsland_PokemonCenter_1F_MapEvents @ 0x83BE68C - .4byte TwoIsland_PokemonCenter_1F_MapScripts @ 0x81717B4 - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 8 - .byte 0x90, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/TwoIsland_PokemonCenter_1F/map.json b/data/maps/TwoIsland_PokemonCenter_1F/map.json new file mode 100644 index 000000000..b1987bbd4 --- /dev/null +++ b/data/maps/TwoIsland_PokemonCenter_1F/map.json @@ -0,0 +1,74 @@ +{ + "id": "MAP_TWO_ISLAND_POKEMON_CENTER_1F", + "name": "TwoIsland_PokemonCenter_1F", + "layout": "LAYOUT_POKEMON_CENTER_1F", + "music": "BGM_FRLG_POKEMON_CENTER", + "region_map_section": "MAPSEC_TWO_ISLAND", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "64", + "x": 7, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TwoIsland_PokemonCenter_1F_EventScript_1717C3", + "flag": "0" + }, + { + "graphics_id": "51", + "x": 11, + "y": 5, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TwoIsland_PokemonCenter_1F_EventScript_1717CC", + "flag": "0" + }, + { + "graphics_id": "20", + "x": 4, + "y": 4, + "elevation": 3, + "movement_type": "5", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TwoIsland_PokemonCenter_1F_EventScript_1717D5", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 7, + "y": 8, + "elevation": 3, + "dest_map": "MAP_TWO_ISLAND", + "dest_warp_id": 2 + }, + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_TWO_ISLAND_POKEMON_CENTER_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/TwoIsland_PokemonCenter_2F/events.inc b/data/maps/TwoIsland_PokemonCenter_2F/events.inc deleted file mode 100644 index f8aff41d4..000000000 --- a/data/maps/TwoIsland_PokemonCenter_2F/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -TwoIsland_PokemonCenter_2F_EventObjects: - object_event 1, 65, 0, 6, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, TwoIsland_PokemonCenter_2F_EventScript_1A8CF6, 0, 0, 0 - object_event 2, 65, 0, 2, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, TwoIsland_PokemonCenter_2F_EventScript_1A8CFC, 0, 0, 0 - object_event 3, 65, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, TwoIsland_PokemonCenter_2F_EventScript_1A8D02, 0, 0, 0 - object_event 4, 69, 0, 1, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, TwoIsland_PokemonCenter_2F_EventScript_1BB1D2, 112, 0, 0 - -TwoIsland_PokemonCenter_2F_MapWarps: - warp_def 1, 6, 4, 1, 8450 - warp_def 5, 1, 0, 0, 4 - warp_def 9, 1, 0, 0, 1 - -TwoIsland_PokemonCenter_2F_MapEvents:: - map_events TwoIsland_PokemonCenter_2F_EventObjects, TwoIsland_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/TwoIsland_PokemonCenter_2F/header.inc b/data/maps/TwoIsland_PokemonCenter_2F/header.inc deleted file mode 100644 index 4c690b5ac..000000000 --- a/data/maps/TwoIsland_PokemonCenter_2F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -TwoIsland_PokemonCenter_2F:: @ 8351C4C - .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 - .4byte TwoIsland_PokemonCenter_2F_MapEvents @ 0x83BE718 - .4byte TwoIsland_PokemonCenter_2F_MapScripts @ 0x81717DE - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 9 - .byte 0x90, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/TwoIsland_PokemonCenter_2F/map.json b/data/maps/TwoIsland_PokemonCenter_2F/map.json new file mode 100644 index 000000000..acb0edbd2 --- /dev/null +++ b/data/maps/TwoIsland_PokemonCenter_2F/map.json @@ -0,0 +1,94 @@ +{ + "id": "MAP_TWO_ISLAND_POKEMON_CENTER_2F", + "name": "TwoIsland_PokemonCenter_2F", + "layout": "LAYOUT_POKEMON_CENTER_2F", + "music": "BGM_FRLG_POKEMON_CENTER", + "region_map_section": "MAPSEC_TWO_ISLAND", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "65", + "x": 6, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TwoIsland_PokemonCenter_2F_EventScript_1A8CF6", + "flag": "0" + }, + { + "graphics_id": "65", + "x": 2, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TwoIsland_PokemonCenter_2F_EventScript_1A8CFC", + "flag": "0" + }, + { + "graphics_id": "65", + "x": 10, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TwoIsland_PokemonCenter_2F_EventScript_1A8D02", + "flag": "0" + }, + { + "graphics_id": "69", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TwoIsland_PokemonCenter_2F_EventScript_1BB1D2", + "flag": "112" + } + ], + "warp_events": [ + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_TWO_ISLAND_POKEMON_CENTER_1F", + "dest_warp_id": 1 + }, + { + "x": 5, + "y": 1, + "elevation": 0, + "dest_map": "MAP_UNKNOWN_MAP_00_04", + "dest_warp_id": 0 + }, + { + "x": 9, + "y": 1, + "elevation": 0, + "dest_map": "MAP_UNKNOWN_MAP_00_01", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/UndergroundPath_EastEntrance/events.inc b/data/maps/UndergroundPath_EastEntrance/events.inc deleted file mode 100644 index d94ffd53f..000000000 --- a/data/maps/UndergroundPath_EastEntrance/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -UndergroundPath_EastEntrance_EventObjects: - object_event 1, 28, 0, 5, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, UndergroundPath_EastEntrance_EventScript_160EDE, 0, 0, 0 - -UndergroundPath_EastEntrance_MapWarps: - warp_def 5, 8, 3, 0, 794 - warp_def 6, 8, 3, 0, 794 - warp_def 7, 8, 3, 0, 794 - warp_def 7, 4, 3, 0, 290 - -UndergroundPath_EastEntrance_MapEvents:: - map_events UndergroundPath_EastEntrance_EventObjects, UndergroundPath_EastEntrance_MapWarps, 0x0, 0x0 diff --git a/data/maps/UndergroundPath_EastEntrance/header.inc b/data/maps/UndergroundPath_EastEntrance/header.inc deleted file mode 100644 index 298cbfe9d..000000000 --- a/data/maps/UndergroundPath_EastEntrance/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -UndergroundPath_EastEntrance:: @ 834F5E8 - .4byte UndergroundPath_Entrance_Layout @ 0x8319414 - .4byte UndergroundPath_EastEntrance_MapEvents @ 0x83AF430 - .4byte UndergroundPath_EastEntrance_MapScripts @ 0x8160EDD - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_CITY - .2byte 172 - .byte 0x82, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/UndergroundPath_EastEntrance/map.json b/data/maps/UndergroundPath_EastEntrance/map.json new file mode 100644 index 000000000..f443b0f6f --- /dev/null +++ b/data/maps/UndergroundPath_EastEntrance/map.json @@ -0,0 +1,62 @@ +{ + "id": "MAP_UNDERGROUND_PATH_EAST_ENTRANCE", + "name": "UndergroundPath_EastEntrance", + "layout": "LAYOUT_UNDERGROUND_PATH_ENTRANCE", + "music": "BGM_FRLG_VIRIDIAN_CITY", + "region_map_section": "MAPSEC_UNDERGROUND_PATH_2", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "28", + "x": 5, + "y": 6, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "UndergroundPath_EastEntrance_EventScript_160EDE", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 5, + "y": 8, + "elevation": 3, + "dest_map": "MAP_ROUTE8", + "dest_warp_id": 0 + }, + { + "x": 6, + "y": 8, + "elevation": 3, + "dest_map": "MAP_ROUTE8", + "dest_warp_id": 0 + }, + { + "x": 7, + "y": 8, + "elevation": 3, + "dest_map": "MAP_ROUTE8", + "dest_warp_id": 0 + }, + { + "x": 7, + "y": 4, + "elevation": 3, + "dest_map": "MAP_UNDERGROUND_PATH_EAST_WEST_TUNNEL", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/UndergroundPath_EastWestTunnel/events.inc b/data/maps/UndergroundPath_EastWestTunnel/events.inc deleted file mode 100644 index acbabe99f..000000000 --- a/data/maps/UndergroundPath_EastWestTunnel/events.inc +++ /dev/null @@ -1,15 +0,0 @@ -UndergroundPath_EastWestTunnel_MapWarps: - warp_def 76, 3, 3, 3, 291 - warp_def 3, 4, 3, 3, 289 - -UndergroundPath_EastWestTunnel_MapBGEvents: - bg_event 7, 3, 3, 7, 0, 13, 77, 1 - bg_event 17, 5, 3, 7, 0, 18, 79, 1 - bg_event 31, 4, 3, 7, 0, 17, 80, 1 - bg_event 45, 3, 3, 7, 0, 15, 81, 1 - bg_event 70, 3, 3, 7, 0, 16, 82, 1 - bg_event 55, 2, 3, 7, 0, 34, 83, 1 - bg_event 62, 5, 3, 7, 0, 14, 78, 1 - -UndergroundPath_EastWestTunnel_MapEvents:: - map_events 0x0, UndergroundPath_EastWestTunnel_MapWarps, 0x0, UndergroundPath_EastWestTunnel_MapBGEvents diff --git a/data/maps/UndergroundPath_EastWestTunnel/header.inc b/data/maps/UndergroundPath_EastWestTunnel/header.inc deleted file mode 100644 index bd5afdf6d..000000000 --- a/data/maps/UndergroundPath_EastWestTunnel/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -UndergroundPath_EastWestTunnel:: @ 834F5CC - .4byte UndergroundPath_EastWestTunnel_Layout @ 0x8319898 - .4byte UndergroundPath_EastWestTunnel_MapEvents @ 0x83AF3E4 - .4byte UndergroundPath_EastWestTunnel_MapScripts @ 0x8160ED3 - .4byte NULL - .2byte BGM_FRLG_ROUTE_1 - .2byte 173 - .byte 0x82, 0x00, 0x00, 0x08, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/UndergroundPath_EastWestTunnel/map.json b/data/maps/UndergroundPath_EastWestTunnel/map.json new file mode 100644 index 000000000..1a015a69f --- /dev/null +++ b/data/maps/UndergroundPath_EastWestTunnel/map.json @@ -0,0 +1,98 @@ +{ + "id": "MAP_UNDERGROUND_PATH_EAST_WEST_TUNNEL", + "name": "UndergroundPath_EastWestTunnel", + "layout": "LAYOUT_UNDERGROUND_PATH_EAST_WEST_TUNNEL", + "music": "BGM_FRLG_ROUTE_1", + "region_map_section": "MAPSEC_UNDERGROUND_PATH_2", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 76, + "y": 3, + "elevation": 3, + "dest_map": "MAP_UNDERGROUND_PATH_EAST_ENTRANCE", + "dest_warp_id": 3 + }, + { + "x": 3, + "y": 4, + "elevation": 3, + "dest_map": "MAP_UNDERGROUND_PATH_WEST_ENTRANCE", + "dest_warp_id": 3 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "hidden_item", + "x": 7, + "y": 3, + "elevation": 3, + "item": "ITEM_POTION", + "flag": "77", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 17, + "y": 5, + "elevation": 3, + "item": "ITEM_PARALYZE_HEAL", + "flag": "79", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 31, + "y": 4, + "elevation": 3, + "item": "ITEM_AWAKENING", + "flag": "80", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 45, + "y": 3, + "elevation": 3, + "item": "ITEM_BURN_HEAL", + "flag": "81", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 70, + "y": 3, + "elevation": 3, + "item": "ITEM_ICE_HEAL", + "flag": "82", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 55, + "y": 2, + "elevation": 3, + "item": "ITEM_ETHER", + "flag": "83", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 62, + "y": 5, + "elevation": 3, + "item": "ITEM_ANTIDOTE", + "flag": "78", + "unknown": 1 + } + ] +}
\ No newline at end of file diff --git a/data/maps/UndergroundPath_NorthEntrance/events.inc b/data/maps/UndergroundPath_NorthEntrance/events.inc deleted file mode 100644 index ae884375b..000000000 --- a/data/maps/UndergroundPath_NorthEntrance/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -UndergroundPath_NorthEntrance_EventObjects: - object_event 1, 17, 0, 5, 0, 6, 0, 3, 8, 17, 0, 0, 0, 0, 0, UndergroundPath_NorthEntrance_EventScript_160E39, 0, 0, 0 - -UndergroundPath_NorthEntrance_MapWarps: - warp_def 5, 8, 3, 0, 791 - warp_def 6, 8, 3, 0, 791 - warp_def 7, 8, 3, 0, 791 - warp_def 7, 4, 3, 0, 287 - -UndergroundPath_NorthEntrance_MapEvents:: - map_events UndergroundPath_NorthEntrance_EventObjects, UndergroundPath_NorthEntrance_MapWarps, 0x0, 0x0 diff --git a/data/maps/UndergroundPath_NorthEntrance/header.inc b/data/maps/UndergroundPath_NorthEntrance/header.inc deleted file mode 100644 index 242d5ece9..000000000 --- a/data/maps/UndergroundPath_NorthEntrance/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -UndergroundPath_NorthEntrance:: @ 834F55C - .4byte UndergroundPath_Entrance_Layout @ 0x8319414 - .4byte UndergroundPath_NorthEntrance_MapEvents @ 0x83AF25C - .4byte UndergroundPath_NorthEntrance_MapScripts @ 0x8160E38 - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_CITY - .2byte 172 - .byte 0x81, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/UndergroundPath_NorthEntrance/map.json b/data/maps/UndergroundPath_NorthEntrance/map.json new file mode 100644 index 000000000..7ef24dda9 --- /dev/null +++ b/data/maps/UndergroundPath_NorthEntrance/map.json @@ -0,0 +1,62 @@ +{ + "id": "MAP_UNDERGROUND_PATH_NORTH_ENTRANCE", + "name": "UndergroundPath_NorthEntrance", + "layout": "LAYOUT_UNDERGROUND_PATH_ENTRANCE", + "music": "BGM_FRLG_VIRIDIAN_CITY", + "region_map_section": "MAPSEC_UNDERGROUND_PATH", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "17", + "x": 5, + "y": 6, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "UndergroundPath_NorthEntrance_EventScript_160E39", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 5, + "y": 8, + "elevation": 3, + "dest_map": "MAP_ROUTE5", + "dest_warp_id": 0 + }, + { + "x": 6, + "y": 8, + "elevation": 3, + "dest_map": "MAP_ROUTE5", + "dest_warp_id": 0 + }, + { + "x": 7, + "y": 8, + "elevation": 3, + "dest_map": "MAP_ROUTE5", + "dest_warp_id": 0 + }, + { + "x": 7, + "y": 4, + "elevation": 3, + "dest_map": "MAP_UNDERGROUND_PATH_NORTH_SOUTH_TUNNEL", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/UndergroundPath_NorthSouthTunnel/events.inc b/data/maps/UndergroundPath_NorthSouthTunnel/events.inc deleted file mode 100644 index 488c80de0..000000000 --- a/data/maps/UndergroundPath_NorthSouthTunnel/events.inc +++ /dev/null @@ -1,15 +0,0 @@ -UndergroundPath_NorthSouthTunnel_MapWarps: - warp_def 4, 3, 3, 3, 286 - warp_def 3, 60, 3, 3, 288 - -UndergroundPath_NorthSouthTunnel_MapBGEvents: - bg_event 5, 30, 3, 7, 0, 13, 70, 1 - bg_event 5, 6, 3, 7, 0, 14, 71, 1 - bg_event 2, 57, 3, 7, 0, 15, 74, 1 - bg_event 1, 24, 3, 7, 0, 17, 73, 1 - bg_event 6, 53, 3, 7, 0, 16, 75, 1 - bg_event 3, 15, 3, 7, 0, 18, 72, 1 - bg_event 3, 39, 3, 7, 0, 34, 76, 1 - -UndergroundPath_NorthSouthTunnel_MapEvents:: - map_events 0x0, UndergroundPath_NorthSouthTunnel_MapWarps, 0x0, UndergroundPath_NorthSouthTunnel_MapBGEvents diff --git a/data/maps/UndergroundPath_NorthSouthTunnel/header.inc b/data/maps/UndergroundPath_NorthSouthTunnel/header.inc deleted file mode 100644 index 9ffc1d01b..000000000 --- a/data/maps/UndergroundPath_NorthSouthTunnel/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -UndergroundPath_NorthSouthTunnel:: @ 834F578 - .4byte UndergroundPath_NorthSouthTunnel_Layout @ 0x8319CAC - .4byte UndergroundPath_NorthSouthTunnel_MapEvents @ 0x83AF2D4 - .4byte UndergroundPath_NorthSouthTunnel_MapScripts @ 0x8160EB5 - .4byte NULL - .2byte BGM_FRLG_ROUTE_1 - .2byte 174 - .byte 0x81, 0x00, 0x00, 0x08, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/UndergroundPath_NorthSouthTunnel/map.json b/data/maps/UndergroundPath_NorthSouthTunnel/map.json new file mode 100644 index 000000000..2d049212a --- /dev/null +++ b/data/maps/UndergroundPath_NorthSouthTunnel/map.json @@ -0,0 +1,98 @@ +{ + "id": "MAP_UNDERGROUND_PATH_NORTH_SOUTH_TUNNEL", + "name": "UndergroundPath_NorthSouthTunnel", + "layout": "LAYOUT_UNDERGROUND_PATH_NORTH_SOUTH_TUNNEL", + "music": "BGM_FRLG_ROUTE_1", + "region_map_section": "MAPSEC_UNDERGROUND_PATH", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 4, + "y": 3, + "elevation": 3, + "dest_map": "MAP_UNDERGROUND_PATH_NORTH_ENTRANCE", + "dest_warp_id": 3 + }, + { + "x": 3, + "y": 60, + "elevation": 3, + "dest_map": "MAP_UNDERGROUND_PATH_SOUTH_ENTRANCE", + "dest_warp_id": 3 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "hidden_item", + "x": 5, + "y": 30, + "elevation": 3, + "item": "ITEM_POTION", + "flag": "70", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 5, + "y": 6, + "elevation": 3, + "item": "ITEM_ANTIDOTE", + "flag": "71", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 2, + "y": 57, + "elevation": 3, + "item": "ITEM_BURN_HEAL", + "flag": "74", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 1, + "y": 24, + "elevation": 3, + "item": "ITEM_AWAKENING", + "flag": "73", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 6, + "y": 53, + "elevation": 3, + "item": "ITEM_ICE_HEAL", + "flag": "75", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 3, + "y": 15, + "elevation": 3, + "item": "ITEM_PARALYZE_HEAL", + "flag": "72", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 3, + "y": 39, + "elevation": 3, + "item": "ITEM_ETHER", + "flag": "76", + "unknown": 1 + } + ] +}
\ No newline at end of file diff --git a/data/maps/UndergroundPath_SouthEntrance/events.inc b/data/maps/UndergroundPath_SouthEntrance/events.inc deleted file mode 100644 index 19020f601..000000000 --- a/data/maps/UndergroundPath_SouthEntrance/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -UndergroundPath_SouthEntrance_EventObjects: - object_event 1, 28, 0, 5, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, UndergroundPath_SouthEntrance_EventScript_160EC0, 0, 0, 0 - -UndergroundPath_SouthEntrance_MapWarps: - warp_def 5, 8, 3, 0, 792 - warp_def 6, 8, 3, 0, 792 - warp_def 7, 8, 3, 0, 792 - warp_def 7, 4, 3, 1, 287 - -UndergroundPath_SouthEntrance_MapEvents:: - map_events UndergroundPath_SouthEntrance_EventObjects, UndergroundPath_SouthEntrance_MapWarps, 0x0, 0x0 diff --git a/data/maps/UndergroundPath_SouthEntrance/header.inc b/data/maps/UndergroundPath_SouthEntrance/header.inc deleted file mode 100644 index 4e0ef3d33..000000000 --- a/data/maps/UndergroundPath_SouthEntrance/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -UndergroundPath_SouthEntrance:: @ 834F594 - .4byte UndergroundPath_Entrance_Layout @ 0x8319414 - .4byte UndergroundPath_SouthEntrance_MapEvents @ 0x83AF320 - .4byte UndergroundPath_SouthEntrance_MapScripts @ 0x8160EBF - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_CITY - .2byte 172 - .byte 0x81, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/UndergroundPath_SouthEntrance/map.json b/data/maps/UndergroundPath_SouthEntrance/map.json new file mode 100644 index 000000000..e6e3ee5f3 --- /dev/null +++ b/data/maps/UndergroundPath_SouthEntrance/map.json @@ -0,0 +1,62 @@ +{ + "id": "MAP_UNDERGROUND_PATH_SOUTH_ENTRANCE", + "name": "UndergroundPath_SouthEntrance", + "layout": "LAYOUT_UNDERGROUND_PATH_ENTRANCE", + "music": "BGM_FRLG_VIRIDIAN_CITY", + "region_map_section": "MAPSEC_UNDERGROUND_PATH", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "28", + "x": 5, + "y": 6, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "UndergroundPath_SouthEntrance_EventScript_160EC0", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 5, + "y": 8, + "elevation": 3, + "dest_map": "MAP_ROUTE6", + "dest_warp_id": 0 + }, + { + "x": 6, + "y": 8, + "elevation": 3, + "dest_map": "MAP_ROUTE6", + "dest_warp_id": 0 + }, + { + "x": 7, + "y": 8, + "elevation": 3, + "dest_map": "MAP_ROUTE6", + "dest_warp_id": 0 + }, + { + "x": 7, + "y": 4, + "elevation": 3, + "dest_map": "MAP_UNDERGROUND_PATH_NORTH_SOUTH_TUNNEL", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/UndergroundPath_WestEntrance/events.inc b/data/maps/UndergroundPath_WestEntrance/events.inc deleted file mode 100644 index a5797c577..000000000 --- a/data/maps/UndergroundPath_WestEntrance/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -UndergroundPath_WestEntrance_EventObjects: - object_event 1, 30, 0, 5, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, UndergroundPath_WestEntrance_EventScript_160ECA, 0, 0, 0 - -UndergroundPath_WestEntrance_MapWarps: - warp_def 5, 8, 3, 0, 793 - warp_def 6, 8, 3, 0, 793 - warp_def 7, 8, 3, 0, 793 - warp_def 7, 4, 3, 1, 290 - -UndergroundPath_WestEntrance_MapEvents:: - map_events UndergroundPath_WestEntrance_EventObjects, UndergroundPath_WestEntrance_MapWarps, 0x0, 0x0 diff --git a/data/maps/UndergroundPath_WestEntrance/header.inc b/data/maps/UndergroundPath_WestEntrance/header.inc deleted file mode 100644 index 9ebfd9946..000000000 --- a/data/maps/UndergroundPath_WestEntrance/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -UndergroundPath_WestEntrance:: @ 834F5B0 - .4byte UndergroundPath_Entrance_Layout @ 0x8319414 - .4byte UndergroundPath_WestEntrance_MapEvents @ 0x83AF36C - .4byte UndergroundPath_WestEntrance_MapScripts @ 0x8160EC9 - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_CITY - .2byte 172 - .byte 0x82, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/UndergroundPath_WestEntrance/map.json b/data/maps/UndergroundPath_WestEntrance/map.json new file mode 100644 index 000000000..e824381d4 --- /dev/null +++ b/data/maps/UndergroundPath_WestEntrance/map.json @@ -0,0 +1,62 @@ +{ + "id": "MAP_UNDERGROUND_PATH_WEST_ENTRANCE", + "name": "UndergroundPath_WestEntrance", + "layout": "LAYOUT_UNDERGROUND_PATH_ENTRANCE", + "music": "BGM_FRLG_VIRIDIAN_CITY", + "region_map_section": "MAPSEC_UNDERGROUND_PATH_2", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "30", + "x": 5, + "y": 6, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "UndergroundPath_WestEntrance_EventScript_160ECA", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 5, + "y": 8, + "elevation": 3, + "dest_map": "MAP_ROUTE7", + "dest_warp_id": 0 + }, + { + "x": 6, + "y": 8, + "elevation": 3, + "dest_map": "MAP_ROUTE7", + "dest_warp_id": 0 + }, + { + "x": 7, + "y": 8, + "elevation": 3, + "dest_map": "MAP_ROUTE7", + "dest_warp_id": 0 + }, + { + "x": 7, + "y": 4, + "elevation": 3, + "dest_map": "MAP_UNDERGROUND_PATH_EAST_WEST_TUNNEL", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/UnknownMap_00_00/events.inc b/data/maps/UnknownMap_00_00/events.inc deleted file mode 100644 index 4781c2e87..000000000 --- a/data/maps/UnknownMap_00_00/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -UnknownMap_00_00_EventObjects: - object_event 1, 66, 0, 9, 0, 3, 0, 3, 9, 0, 0, 0, 0, 0, 0, UnknownMap_00_00_EventScript_1BB9AF, 0, 0, 0 - -UnknownMap_00_00_MapWarps: - warp_def 6, 8, 3, 127, 32639 - warp_def 7, 8, 3, 127, 32639 - -UnknownMap_00_00_MapCoordEvents: - coord_event 3, 5, 3, 0, 16384, 0, 0, UnknownMap_00_00_EventScript_1BB8C3 - coord_event 10, 5, 3, 0, 16384, 0, 0, UnknownMap_00_00_EventScript_1BB8CF - -UnknownMap_00_00_MapEvents:: - map_events UnknownMap_00_00_EventObjects, UnknownMap_00_00_MapWarps, UnknownMap_00_00_MapCoordEvents, 0x0 diff --git a/data/maps/UnknownMap_00_00/header.inc b/data/maps/UnknownMap_00_00/header.inc deleted file mode 100644 index a43fc1ec3..000000000 --- a/data/maps/UnknownMap_00_00/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -UnknownMap_00_00:: @ 834F188 - .4byte UnknownMap_00_00_Layout @ 0x82D89E8 - .4byte UnknownMap_00_00_MapEvents @ 0x83AE0DC - .4byte UnknownMap_00_00_MapScripts @ 0x8160478 - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 47 - .byte 0xc4, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x08 diff --git a/data/maps/UnknownMap_00_00/map.json b/data/maps/UnknownMap_00_00/map.json new file mode 100644 index 000000000..74edf8a09 --- /dev/null +++ b/data/maps/UnknownMap_00_00/map.json @@ -0,0 +1,67 @@ +{ + "id": "MAP_UNKNOWN_MAP_00_00", + "name": "UnknownMap_00_00", + "layout": "LAYOUT_UNKNOWN_MAP_00_00", + "music": "BGM_FRLG_POKEMON_CENTER", + "region_map_section": "MAPSEC_SPECIAL_AREA", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_8", + "connections": null, + "object_events": [ + { + "graphics_id": "66", + "x": 9, + "y": 3, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "UnknownMap_00_00_EventScript_1BB9AF", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 6, + "y": 8, + "elevation": 3, + "dest_map": "MAP_NONE", + "dest_warp_id": 127 + }, + { + "x": 7, + "y": 8, + "elevation": 3, + "dest_map": "MAP_NONE", + "dest_warp_id": 127 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 3, + "y": 5, + "elevation": 3, + "var": "VAR_0x4000", + "var_value": 0, + "script": "UnknownMap_00_00_EventScript_1BB8C3" + }, + { + "type": "trigger", + "x": 10, + "y": 5, + "elevation": 3, + "var": "VAR_0x4000", + "var_value": 0, + "script": "UnknownMap_00_00_EventScript_1BB8CF" + } + ], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/UnknownMap_00_01/events.inc b/data/maps/UnknownMap_00_01/events.inc deleted file mode 100644 index 023a95c07..000000000 --- a/data/maps/UnknownMap_00_01/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -UnknownMap_00_01_EventObjects: - object_event 1, 66, 0, 9, 0, 6, 0, 3, 9, 0, 0, 0, 0, 0, 0, UnknownMap_00_01_EventScript_1BB9C1, 0, 0, 0 - -UnknownMap_00_01_MapWarps: - warp_def 5, 8, 3, 127, 32639 - warp_def 6, 8, 3, 127, 32639 - -UnknownMap_00_01_MapCoordEvents: - coord_event 4, 5, 3, 0, 16384, 0, 0, UnknownMap_00_01_EventScript_1BB950 - coord_event 7, 5, 3, 0, 16384, 0, 0, UnknownMap_00_01_EventScript_1BB95C - -UnknownMap_00_01_MapEvents:: - map_events UnknownMap_00_01_EventObjects, UnknownMap_00_01_MapWarps, UnknownMap_00_01_MapCoordEvents, 0x0 diff --git a/data/maps/UnknownMap_00_01/header.inc b/data/maps/UnknownMap_00_01/header.inc deleted file mode 100644 index 2e012f5d3..000000000 --- a/data/maps/UnknownMap_00_01/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -UnknownMap_00_01:: @ 834F1A4 - .4byte UnknownMap_00_01_Layout @ 0x82D8AE4 - .4byte UnknownMap_00_01_MapEvents @ 0x83AE138 - .4byte UnknownMap_00_01_MapScripts @ 0x8160479 - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 48 - .byte 0xc4, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/UnknownMap_00_01/map.json b/data/maps/UnknownMap_00_01/map.json new file mode 100644 index 000000000..a8136a755 --- /dev/null +++ b/data/maps/UnknownMap_00_01/map.json @@ -0,0 +1,67 @@ +{ + "id": "MAP_UNKNOWN_MAP_00_01", + "name": "UnknownMap_00_01", + "layout": "LAYOUT_UNKNOWN_MAP_00_01", + "music": "BGM_FRLG_POKEMON_CENTER", + "region_map_section": "MAPSEC_SPECIAL_AREA", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "66", + "x": 9, + "y": 6, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "UnknownMap_00_01_EventScript_1BB9C1", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 5, + "y": 8, + "elevation": 3, + "dest_map": "MAP_NONE", + "dest_warp_id": 127 + }, + { + "x": 6, + "y": 8, + "elevation": 3, + "dest_map": "MAP_NONE", + "dest_warp_id": 127 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 4, + "y": 5, + "elevation": 3, + "var": "VAR_0x4000", + "var_value": 0, + "script": "UnknownMap_00_01_EventScript_1BB950" + }, + { + "type": "trigger", + "x": 7, + "y": 5, + "elevation": 3, + "var": "VAR_0x4000", + "var_value": 0, + "script": "UnknownMap_00_01_EventScript_1BB95C" + } + ], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/UnknownMap_00_02/events.inc b/data/maps/UnknownMap_00_02/events.inc deleted file mode 100644 index 26a2fcee1..000000000 --- a/data/maps/UnknownMap_00_02/events.inc +++ /dev/null @@ -1,17 +0,0 @@ -UnknownMap_00_02_EventObjects: - object_event 1, 66, 0, 10, 0, 5, 0, 0, 8, 0, 0, 0, 0, 0, 0, UnknownMap_00_02_EventScript_1BB9D3, 0, 0, 0 - -UnknownMap_00_02_MapWarps: - warp_def 8, 9, 3, 127, 32639 - warp_def 9, 9, 3, 127, 32639 - warp_def 11, 9, 3, 127, 32639 - warp_def 10, 9, 3, 127, 32639 - -UnknownMap_00_02_MapCoordEvents: - coord_event 6, 4, 3, 0, 16384, 0, 0, UnknownMap_00_02_EventScript_1BB980 - coord_event 6, 6, 3, 0, 16384, 0, 0, UnknownMap_00_02_EventScript_1BB980 - coord_event 13, 4, 3, 0, 16384, 0, 0, UnknownMap_00_02_EventScript_1BB980 - coord_event 13, 6, 3, 0, 16384, 0, 0, UnknownMap_00_02_EventScript_1BB980 - -UnknownMap_00_02_MapEvents:: - map_events UnknownMap_00_02_EventObjects, UnknownMap_00_02_MapWarps, UnknownMap_00_02_MapCoordEvents, 0x0 diff --git a/data/maps/UnknownMap_00_02/header.inc b/data/maps/UnknownMap_00_02/header.inc deleted file mode 100644 index 39a06131d..000000000 --- a/data/maps/UnknownMap_00_02/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -UnknownMap_00_02:: @ 834F1C0 - .4byte UnknownMap_00_02_Layout @ 0x82D8C98 - .4byte UnknownMap_00_02_MapEvents @ 0x83AE1C4 - .4byte UnknownMap_00_02_MapScripts @ 0x816047A - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 49 - .byte 0xc4, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/UnknownMap_00_02/map.json b/data/maps/UnknownMap_00_02/map.json new file mode 100644 index 000000000..8a90d86ff --- /dev/null +++ b/data/maps/UnknownMap_00_02/map.json @@ -0,0 +1,99 @@ +{ + "id": "MAP_UNKNOWN_MAP_00_02", + "name": "UnknownMap_00_02", + "layout": "LAYOUT_UNKNOWN_MAP_00_02", + "music": "BGM_FRLG_POKEMON_CENTER", + "region_map_section": "MAPSEC_SPECIAL_AREA", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "66", + "x": 10, + "y": 5, + "elevation": 0, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "UnknownMap_00_02_EventScript_1BB9D3", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 8, + "y": 9, + "elevation": 3, + "dest_map": "MAP_NONE", + "dest_warp_id": 127 + }, + { + "x": 9, + "y": 9, + "elevation": 3, + "dest_map": "MAP_NONE", + "dest_warp_id": 127 + }, + { + "x": 11, + "y": 9, + "elevation": 3, + "dest_map": "MAP_NONE", + "dest_warp_id": 127 + }, + { + "x": 10, + "y": 9, + "elevation": 3, + "dest_map": "MAP_NONE", + "dest_warp_id": 127 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 6, + "y": 4, + "elevation": 3, + "var": "VAR_0x4000", + "var_value": 0, + "script": "UnknownMap_00_02_EventScript_1BB980" + }, + { + "type": "trigger", + "x": 6, + "y": 6, + "elevation": 3, + "var": "VAR_0x4000", + "var_value": 0, + "script": "UnknownMap_00_02_EventScript_1BB980" + }, + { + "type": "trigger", + "x": 13, + "y": 4, + "elevation": 3, + "var": "VAR_0x4000", + "var_value": 0, + "script": "UnknownMap_00_02_EventScript_1BB980" + }, + { + "type": "trigger", + "x": 13, + "y": 6, + "elevation": 3, + "var": "VAR_0x4000", + "var_value": 0, + "script": "UnknownMap_00_02_EventScript_1BB980" + } + ], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/UnknownMap_00_03/events.inc b/data/maps/UnknownMap_00_03/events.inc deleted file mode 100644 index c8e9b630a..000000000 --- a/data/maps/UnknownMap_00_03/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -UnknownMap_00_03_MapWarps: - warp_def 5, 8, 3, 127, 32639 - warp_def 6, 8, 3, 127, 32639 - warp_def 7, 8, 3, 127, 32639 - warp_def 8, 8, 3, 127, 32639 - -UnknownMap_00_03_MapCoordEvents: - coord_event 3, 4, 3, 0, 16384, 0, 0, UnknownMap_00_03_EventScript_1BB8DB - coord_event 3, 6, 3, 0, 16384, 0, 0, UnknownMap_00_03_EventScript_1BB915 - coord_event 10, 4, 3, 0, 16384, 0, 0, UnknownMap_00_03_EventScript_1BB8F8 - coord_event 10, 6, 3, 0, 16384, 0, 0, UnknownMap_00_03_EventScript_1BB932 - -UnknownMap_00_03_MapEvents:: - map_events 0x0, UnknownMap_00_03_MapWarps, UnknownMap_00_03_MapCoordEvents, 0x0 diff --git a/data/maps/UnknownMap_00_03/header.inc b/data/maps/UnknownMap_00_03/header.inc deleted file mode 100644 index df701c238..000000000 --- a/data/maps/UnknownMap_00_03/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -UnknownMap_00_03:: @ 834F1DC - .4byte UnknownMap_00_03_Layout @ 0x82D8DB8 - .4byte UnknownMap_00_03_MapEvents @ 0x83AE238 - .4byte UnknownMap_00_03_MapScripts @ 0x816047B - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 50 - .byte 0xc4, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x08 diff --git a/data/maps/UnknownMap_00_03/map.json b/data/maps/UnknownMap_00_03/map.json new file mode 100644 index 000000000..6ef7c2d04 --- /dev/null +++ b/data/maps/UnknownMap_00_03/map.json @@ -0,0 +1,85 @@ +{ + "id": "MAP_UNKNOWN_MAP_00_03", + "name": "UnknownMap_00_03", + "layout": "LAYOUT_UNKNOWN_MAP_00_03", + "music": "BGM_FRLG_POKEMON_CENTER", + "region_map_section": "MAPSEC_SPECIAL_AREA", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_8", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 5, + "y": 8, + "elevation": 3, + "dest_map": "MAP_NONE", + "dest_warp_id": 127 + }, + { + "x": 6, + "y": 8, + "elevation": 3, + "dest_map": "MAP_NONE", + "dest_warp_id": 127 + }, + { + "x": 7, + "y": 8, + "elevation": 3, + "dest_map": "MAP_NONE", + "dest_warp_id": 127 + }, + { + "x": 8, + "y": 8, + "elevation": 3, + "dest_map": "MAP_NONE", + "dest_warp_id": 127 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 3, + "y": 4, + "elevation": 3, + "var": "VAR_0x4000", + "var_value": 0, + "script": "UnknownMap_00_03_EventScript_1BB8DB" + }, + { + "type": "trigger", + "x": 3, + "y": 6, + "elevation": 3, + "var": "VAR_0x4000", + "var_value": 0, + "script": "UnknownMap_00_03_EventScript_1BB915" + }, + { + "type": "trigger", + "x": 10, + "y": 4, + "elevation": 3, + "var": "VAR_0x4000", + "var_value": 0, + "script": "UnknownMap_00_03_EventScript_1BB8F8" + }, + { + "type": "trigger", + "x": 10, + "y": 6, + "elevation": 3, + "var": "VAR_0x4000", + "var_value": 0, + "script": "UnknownMap_00_03_EventScript_1BB932" + } + ], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/UnknownMap_00_04/events.inc b/data/maps/UnknownMap_00_04/events.inc deleted file mode 100644 index b456138b1..000000000 --- a/data/maps/UnknownMap_00_04/events.inc +++ /dev/null @@ -1,16 +0,0 @@ -UnknownMap_00_04_EventObjects: - object_event 1, 66, 0, 3, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, UnknownMap_00_04_EventScript_16050C, 0, 0, 0 - object_event 2, 243, 0, 1, 0, 8, 0, 3, 2, 17, 0, 0, 0, 0, 0, UnknownMap_00_04_EventScript_1604DA, 102, 0, 0 - object_event 3, 247, 0, 7, 0, 8, 0, 3, 2, 17, 0, 0, 0, 0, 0, UnknownMap_00_04_EventScript_160502, 106, 0, 0 - object_event 4, 246, 0, 1, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, UnknownMap_00_04_EventScript_1604F8, 105, 0, 0 - object_event 5, 245, 0, 7, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, UnknownMap_00_04_EventScript_1604EE, 104, 0, 0 - object_event 6, 244, 0, 13, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, UnknownMap_00_04_EventScript_1604E4, 103, 0, 0 - object_event 7, 242, 0, 10, 0, 6, 0, 3, 2, 17, 0, 0, 0, 0, 0, UnknownMap_00_04_EventScript_1604D0, 101, 0, 0 - object_event 8, 241, 0, 13, 0, 8, 0, 3, 2, 17, 0, 0, 0, 0, 0, UnknownMap_00_04_EventScript_1604C6, 100, 0, 0 - object_event 9, 240, 0, 4, 0, 6, 0, 3, 2, 17, 0, 0, 0, 0, 0, UnknownMap_00_04_EventScript_1604BC, 99, 0, 0 - -UnknownMap_00_04_MapWarps: - warp_def 7, 11, 3, 127, 32639 - -UnknownMap_00_04_MapEvents:: - map_events UnknownMap_00_04_EventObjects, UnknownMap_00_04_MapWarps, 0x0, 0x0 diff --git a/data/maps/UnknownMap_00_04/header.inc b/data/maps/UnknownMap_00_04/header.inc deleted file mode 100644 index 585175a4d..000000000 --- a/data/maps/UnknownMap_00_04/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -UnknownMap_00_04:: @ 834F1F8 - .4byte UnknownMap_00_04_Layout @ 0x83388C4 - .4byte UnknownMap_00_04_MapEvents @ 0x83AE32C - .4byte UnknownMap_00_04_MapScripts @ 0x816047C - .4byte NULL - .2byte BGM_FRLG_UNION_ROOM - .2byte 262 - .byte 0xc4, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x08 diff --git a/data/maps/UnknownMap_00_04/map.json b/data/maps/UnknownMap_00_04/map.json new file mode 100644 index 000000000..10edd9838 --- /dev/null +++ b/data/maps/UnknownMap_00_04/map.json @@ -0,0 +1,145 @@ +{ + "id": "MAP_UNKNOWN_MAP_00_04", + "name": "UnknownMap_00_04", + "layout": "LAYOUT_UNKNOWN_MAP_00_04", + "music": "BGM_FRLG_UNION_ROOM", + "region_map_section": "MAPSEC_SPECIAL_AREA", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_8", + "connections": null, + "object_events": [ + { + "graphics_id": "66", + "x": 3, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "UnknownMap_00_04_EventScript_16050C", + "flag": "0" + }, + { + "graphics_id": "243", + "x": 1, + "y": 8, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "UnknownMap_00_04_EventScript_1604DA", + "flag": "102" + }, + { + "graphics_id": "247", + "x": 7, + "y": 8, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "UnknownMap_00_04_EventScript_160502", + "flag": "106" + }, + { + "graphics_id": "246", + "x": 1, + "y": 4, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "UnknownMap_00_04_EventScript_1604F8", + "flag": "105" + }, + { + "graphics_id": "245", + "x": 7, + "y": 4, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "UnknownMap_00_04_EventScript_1604EE", + "flag": "104" + }, + { + "graphics_id": "244", + "x": 13, + "y": 4, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "UnknownMap_00_04_EventScript_1604E4", + "flag": "103" + }, + { + "graphics_id": "242", + "x": 10, + "y": 6, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "UnknownMap_00_04_EventScript_1604D0", + "flag": "101" + }, + { + "graphics_id": "241", + "x": 13, + "y": 8, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "UnknownMap_00_04_EventScript_1604C6", + "flag": "100" + }, + { + "graphics_id": "240", + "x": 4, + "y": 6, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "UnknownMap_00_04_EventScript_1604BC", + "flag": "99" + } + ], + "warp_events": [ + { + "x": 7, + "y": 11, + "elevation": 3, + "dest_map": "MAP_NONE", + "dest_warp_id": 127 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/UnknownMap_03_50/connections.inc b/data/maps/UnknownMap_03_50/connections.inc deleted file mode 100644 index e975befbc..000000000 --- a/data/maps/UnknownMap_03_50/connections.inc +++ /dev/null @@ -1,6 +0,0 @@ -UnknownMap_03_50_MapConnectionsList: @ 8352D80 - connection up, 0, MAP_THREE_ISLAND - -UnknownMap_03_50_MapConnections:: @ 8352D8C - .4byte 1 - .4byte UnknownMap_03_50_MapConnectionsList diff --git a/data/maps/UnknownMap_03_50/events.inc b/data/maps/UnknownMap_03_50/events.inc deleted file mode 100644 index 6cc1b9f0c..000000000 --- a/data/maps/UnknownMap_03_50/events.inc +++ /dev/null @@ -1,2 +0,0 @@ -UnknownMap_03_50_MapEvents:: - map_events 0x0, 0x0, 0x0, 0x0 diff --git a/data/maps/UnknownMap_03_50/header.inc b/data/maps/UnknownMap_03_50/header.inc deleted file mode 100644 index f58894d13..000000000 --- a/data/maps/UnknownMap_03_50/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -UnknownMap_03_50:: @ 8350B90 - .4byte UnknownMap_03_50_Layout @ 0x83283A8 - .4byte UnknownMap_03_50_MapEvents @ 0x83B8B24 - .4byte UnknownMap_03_50_MapScripts @ 0x81687E0 - .4byte UnknownMap_03_50_MapConnections @ 0x8352D8C - .2byte BGM_FRLG_SEVII_ISLANDS - .2byte 242 - .byte 0x9b, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/UnknownMap_03_50/map.json b/data/maps/UnknownMap_03_50/map.json new file mode 100644 index 000000000..1a166cfc8 --- /dev/null +++ b/data/maps/UnknownMap_03_50/map.json @@ -0,0 +1,25 @@ +{ + "id": "MAP_UNKNOWN_MAP_03_50", + "name": "UnknownMap_03_50", + "layout": "LAYOUT_UNKNOWN_MAP_03_50", + "music": "BGM_FRLG_SEVII_ISLANDS", + "region_map_section": "MAPSEC_SEVII_ISLE_6", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_3", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_THREE_ISLAND", + "offset": 0, + "direction": "up" + } + ], + "object_events": [], + "warp_events": [], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/UnknownMap_03_51/connections.inc b/data/maps/UnknownMap_03_51/connections.inc deleted file mode 100644 index a742682c4..000000000 --- a/data/maps/UnknownMap_03_51/connections.inc +++ /dev/null @@ -1,6 +0,0 @@ -UnknownMap_03_51_MapConnectionsList: @ 8352D94 - connection up, 0, MAP_THREE_ISLAND - -UnknownMap_03_51_MapConnections:: @ 8352DA0 - .4byte 1 - .4byte UnknownMap_03_51_MapConnectionsList diff --git a/data/maps/UnknownMap_03_51/events.inc b/data/maps/UnknownMap_03_51/events.inc deleted file mode 100644 index 7da7d5a75..000000000 --- a/data/maps/UnknownMap_03_51/events.inc +++ /dev/null @@ -1,2 +0,0 @@ -UnknownMap_03_51_MapEvents:: - map_events 0x0, 0x0, 0x0, 0x0 diff --git a/data/maps/UnknownMap_03_51/header.inc b/data/maps/UnknownMap_03_51/header.inc deleted file mode 100644 index e7defa615..000000000 --- a/data/maps/UnknownMap_03_51/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -UnknownMap_03_51:: @ 8350BAC - .4byte UnknownMap_03_51_Layout @ 0x83283D0 - .4byte UnknownMap_03_51_MapEvents @ 0x83B8B38 - .4byte UnknownMap_03_51_MapScripts @ 0x81687E1 - .4byte UnknownMap_03_51_MapConnections @ 0x8352DA0 - .2byte BGM_FRLG_SEVII_ISLANDS - .2byte 243 - .byte 0x9c, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/UnknownMap_03_51/map.json b/data/maps/UnknownMap_03_51/map.json new file mode 100644 index 000000000..c96dcbb8a --- /dev/null +++ b/data/maps/UnknownMap_03_51/map.json @@ -0,0 +1,25 @@ +{ + "id": "MAP_UNKNOWN_MAP_03_51", + "name": "UnknownMap_03_51", + "layout": "LAYOUT_UNKNOWN_MAP_03_51", + "music": "BGM_FRLG_SEVII_ISLANDS", + "region_map_section": "MAPSEC_SEVII_ISLE_7", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_3", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_THREE_ISLAND", + "offset": 0, + "direction": "up" + } + ], + "object_events": [], + "warp_events": [], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/UnknownMap_03_52/events.inc b/data/maps/UnknownMap_03_52/events.inc deleted file mode 100644 index afded324a..000000000 --- a/data/maps/UnknownMap_03_52/events.inc +++ /dev/null @@ -1,2 +0,0 @@ -UnknownMap_03_52_MapEvents:: - map_events 0x0, 0x0, 0x0, 0x0 diff --git a/data/maps/UnknownMap_03_52/header.inc b/data/maps/UnknownMap_03_52/header.inc deleted file mode 100644 index 097de23cb..000000000 --- a/data/maps/UnknownMap_03_52/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -UnknownMap_03_52:: @ 8350BC8 - .4byte UnknownMap_03_52_Layout @ 0x8329114 - .4byte UnknownMap_03_52_MapEvents @ 0x83B8B4C - .4byte UnknownMap_03_52_MapScripts @ 0x81687E2 - .4byte NULL - .2byte BGM_FRLG_SEVII_ISLANDS - .2byte 244 - .byte 0x9d, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/UnknownMap_03_52/map.json b/data/maps/UnknownMap_03_52/map.json new file mode 100644 index 000000000..5141b16dc --- /dev/null +++ b/data/maps/UnknownMap_03_52/map.json @@ -0,0 +1,19 @@ +{ + "id": "MAP_UNKNOWN_MAP_03_52", + "name": "UnknownMap_03_52", + "layout": "LAYOUT_UNKNOWN_MAP_03_52", + "music": "BGM_FRLG_SEVII_ISLANDS", + "region_map_section": "MAPSEC_SEVII_ISLE_8", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_3", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [], + "warp_events": [], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/UnknownMap_03_53/events.inc b/data/maps/UnknownMap_03_53/events.inc deleted file mode 100644 index b3f4c34f1..000000000 --- a/data/maps/UnknownMap_03_53/events.inc +++ /dev/null @@ -1,2 +0,0 @@ -UnknownMap_03_53_MapEvents:: - map_events 0x0, 0x0, 0x0, 0x0 diff --git a/data/maps/UnknownMap_03_53/header.inc b/data/maps/UnknownMap_03_53/header.inc deleted file mode 100644 index 22e8c0e98..000000000 --- a/data/maps/UnknownMap_03_53/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -UnknownMap_03_53:: @ 8350BE4 - .4byte UnknownMap_03_53_Layout @ 0x8329C78 - .4byte UnknownMap_03_53_MapEvents @ 0x83B8B60 - .4byte UnknownMap_03_53_MapScripts @ 0x81687E3 - .4byte NULL - .2byte BGM_FRLG_SEVII_ISLANDS - .2byte 245 - .byte 0x9e, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/UnknownMap_03_53/map.json b/data/maps/UnknownMap_03_53/map.json new file mode 100644 index 000000000..6c57c230e --- /dev/null +++ b/data/maps/UnknownMap_03_53/map.json @@ -0,0 +1,19 @@ +{ + "id": "MAP_UNKNOWN_MAP_03_53", + "name": "UnknownMap_03_53", + "layout": "LAYOUT_UNKNOWN_MAP_03_53", + "music": "BGM_FRLG_SEVII_ISLANDS", + "region_map_section": "MAPSEC_SEVII_ISLE_9", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_3", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [], + "warp_events": [], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/UnknownMap_18_01/events.inc b/data/maps/UnknownMap_18_01/events.inc deleted file mode 100644 index 95c4daa1c..000000000 --- a/data/maps/UnknownMap_18_01/events.inc +++ /dev/null @@ -1,2 +0,0 @@ -UnknownMap_18_01_MapEvents:: - map_events 0x0, 0x0, 0x0, 0x0 diff --git a/data/maps/UnknownMap_18_01/header.inc b/data/maps/UnknownMap_18_01/header.inc deleted file mode 100644 index 02fb72d6f..000000000 --- a/data/maps/UnknownMap_18_01/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -UnknownMap_18_01:: @ 835185C - .4byte House2_Layout @ 0x82D5840 - .4byte UnknownMap_18_01_MapEvents @ 0x83BD758 - .4byte UnknownMap_18_01_MapScripts @ 0x816FA8C - .4byte NULL - .2byte BGM_FRLG_ROUTE_3 - .2byte 7 - .byte 0x6a, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/UnknownMap_18_01/map.json b/data/maps/UnknownMap_18_01/map.json new file mode 100644 index 000000000..5a592a7e0 --- /dev/null +++ b/data/maps/UnknownMap_18_01/map.json @@ -0,0 +1,19 @@ +{ + "id": "MAP_UNKNOWN_MAP_18_01", + "name": "UnknownMap_18_01", + "layout": "LAYOUT_HOUSE2", + "music": "BGM_FRLG_ROUTE_3", + "region_map_section": "MAPSEC_ROUTE_6", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [], + "warp_events": [], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/UnusedHouse_27_00/events.inc b/data/maps/UnusedHouse_27_00/events.inc deleted file mode 100644 index 086aa89d7..000000000 --- a/data/maps/UnusedHouse_27_00/events.inc +++ /dev/null @@ -1,2 +0,0 @@ -UnusedHouse_27_00_MapEvents:: - map_events 0x0, 0x0, 0x0, 0x0 diff --git a/data/maps/UnusedHouse_27_00/header.inc b/data/maps/UnusedHouse_27_00/header.inc deleted file mode 100644 index 27571a106..000000000 --- a/data/maps/UnusedHouse_27_00/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -UnusedHouse_27_00:: @ 8351A38 - .4byte House2_Layout @ 0x82D5840 - .4byte UnusedHouse_27_00_MapEvents @ 0x83BDF30 - .4byte UnusedHouse_27_00_MapScripts @ 0x81704FA - .4byte NULL - .2byte BGM_FRLG_ROUTE_3 - .2byte 7 - .byte 0x77, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/UnusedHouse_27_00/map.json b/data/maps/UnusedHouse_27_00/map.json new file mode 100644 index 000000000..a1b37a7f0 --- /dev/null +++ b/data/maps/UnusedHouse_27_00/map.json @@ -0,0 +1,19 @@ +{ + "id": "MAP_UNUSED_HOUSE_27_00", + "name": "UnusedHouse_27_00", + "layout": "LAYOUT_HOUSE2", + "music": "BGM_FRLG_ROUTE_3", + "region_map_section": "MAPSEC_ROUTE_19", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [], + "warp_events": [], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/UnusedHouse_29_00/events.inc b/data/maps/UnusedHouse_29_00/events.inc deleted file mode 100644 index be21c75df..000000000 --- a/data/maps/UnusedHouse_29_00/events.inc +++ /dev/null @@ -1,2 +0,0 @@ -UnusedHouse_29_00_MapEvents:: - map_events 0x0, 0x0, 0x0, 0x0 diff --git a/data/maps/UnusedHouse_29_00/header.inc b/data/maps/UnusedHouse_29_00/header.inc deleted file mode 100644 index 79c745105..000000000 --- a/data/maps/UnusedHouse_29_00/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -UnusedHouse_29_00:: @ 8351A70 - .4byte House2_Layout @ 0x82D5840 - .4byte UnusedHouse_29_00_MapEvents @ 0x83BDFA0 - .4byte UnusedHouse_29_00_MapScripts @ 0x8170522 - .4byte NULL - .2byte BGM_FRLG_INDIGO_PLATEAU - .2byte 7 - .byte 0x7b, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/UnusedHouse_29_00/map.json b/data/maps/UnusedHouse_29_00/map.json new file mode 100644 index 000000000..685feaa61 --- /dev/null +++ b/data/maps/UnusedHouse_29_00/map.json @@ -0,0 +1,19 @@ +{ + "id": "MAP_UNUSED_HOUSE_29_00", + "name": "UnusedHouse_29_00", + "layout": "LAYOUT_HOUSE2", + "music": "BGM_FRLG_INDIGO_PLATEAU", + "region_map_section": "MAPSEC_ROUTE_23", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [], + "warp_events": [], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/UnusedHouse_31_05/events.inc b/data/maps/UnusedHouse_31_05/events.inc deleted file mode 100644 index f367b0911..000000000 --- a/data/maps/UnusedHouse_31_05/events.inc +++ /dev/null @@ -1,2 +0,0 @@ -UnusedHouse_31_05_MapEvents:: - map_events 0x0, 0x0, 0x0, 0x0 diff --git a/data/maps/UnusedHouse_31_05/header.inc b/data/maps/UnusedHouse_31_05/header.inc deleted file mode 100644 index ad4098e09..000000000 --- a/data/maps/UnusedHouse_31_05/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -UnusedHouse_31_05:: @ 8351B34 - .4byte House4_Layout @ 0x82D6070 - .4byte UnusedHouse_31_05_MapEvents @ 0x83BE254 - .4byte UnusedHouse_31_05_MapScripts @ 0x8170BE3 - .4byte NULL - .2byte BGM_FRLG_ISLAND_SIX - .2byte 13 - .byte 0x94, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/UnusedHouse_31_05/map.json b/data/maps/UnusedHouse_31_05/map.json new file mode 100644 index 000000000..97996c85d --- /dev/null +++ b/data/maps/UnusedHouse_31_05/map.json @@ -0,0 +1,19 @@ +{ + "id": "MAP_UNUSED_HOUSE_31_05", + "name": "UnusedHouse_31_05", + "layout": "LAYOUT_HOUSE4", + "music": "BGM_FRLG_ISLAND_SIX", + "region_map_section": "MAPSEC_SEVEN_ISLAND", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [], + "warp_events": [], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/VermilionCity/connections.inc b/data/maps/VermilionCity/connections.inc deleted file mode 100644 index b90cfc5a9..000000000 --- a/data/maps/VermilionCity/connections.inc +++ /dev/null @@ -1,7 +0,0 @@ -VermilionCity_MapConnectionsList: @ 8352824 - connection up, 12, MAP_ROUTE6 - connection right, 10, MAP_ROUTE11 - -VermilionCity_MapConnections:: @ 835283C - .4byte 2 - .4byte VermilionCity_MapConnectionsList diff --git a/data/maps/VermilionCity/events.inc b/data/maps/VermilionCity/events.inc deleted file mode 100644 index 2178a9d13..000000000 --- a/data/maps/VermilionCity/events.inc +++ /dev/null @@ -1,38 +0,0 @@ -VermilionCity_EventObjects: - object_event 1, 23, 0, 22, 0, 11, 0, 3, 5, 20, 0, 0, 0, 0, 0, VermilionCity_EventScript_166917, 0, 0, 0 - object_event 2, 32, 0, 17, 0, 9, 0, 3, 1, 17, 0, 0, 0, 0, 0, VermilionCity_EventScript_166920, 0, 0, 0 - object_event 3, 33, 0, 36, 0, 10, 0, 0, 17, 17, 0, 0, 0, 0, 0, VermilionCity_EventScript_166C2F, 0, 0, 0 - object_event 4, 130, 0, 35, 0, 11, 0, 3, 2, 34, 0, 0, 0, 0, 0, VermilionCity_EventScript_166C38, 0, 0, 0 - object_event 5, 62, 0, 31, 0, 30, 0, 3, 5, 20, 0, 0, 0, 0, 0, VermilionCity_EventScript_166C17, 0, 0, 0 - object_event 6, 62, 0, 24, 0, 33, 0, 3, 7, 17, 0, 0, 0, 0, 0, VermilionCity_EventScript_166941, 0, 0, 0 - object_event 7, 95, 0, 19, 0, 24, 0, 3, 8, 17, 0, 0, 0, 0, 0, VermilionCity_EventScript_1BDF13, 18, 0, 0 - object_event 8, 55, 0, 25, 0, 7, 0, 3, 1, 20, 0, 0, 0, 0, 0, VermilionCity_EventScript_166C20, 161, 0, 0 - -VermilionCity_MapWarps: - warp_def 22, 34, 3, 1, 260 - warp_def 23, 34, 3, 1, 260 - warp_def 24, 34, 3, 1, 260 - warp_def 9, 6, 0, 1, 2304 - warp_def 15, 6, 3, 1, 2305 - warp_def 12, 17, 0, 1, 2307 - warp_def 19, 17, 0, 1, 2308 - warp_def 29, 17, 0, 1, 2309 - warp_def 28, 24, 0, 1, 2311 - warp_def 14, 25, 0, 1, 2310 - -VermilionCity_MapCoordEvents: - coord_event 22, 33, 0, 0, 16467, 0, 0, VermilionCity_EventScript_166B8A - coord_event 23, 33, 0, 0, 16467, 0, 0, VermilionCity_EventScript_166B91 - coord_event 22, 32, 0, 0, 16385, 0, 0, VermilionCity_EventScript_166B98 - coord_event 23, 32, 0, 0, 16385, 0, 0, VermilionCity_EventScript_166B98 - -VermilionCity_MapBGEvents: - bg_event 33, 6, 0, 0, 0, VermilionCity_EventScript_166C53 - bg_event 10, 17, 3, 0, 0, VermilionCity_EventScript_166C65 - bg_event 10, 24, 0, 0, 0, VermilionCity_EventScript_166C6E - bg_event 34, 18, 0, 0, 0, VermilionCity_EventScript_166C86 - bg_event 45, 17, 3, 0, 0, VermilionCity_EventScript_166C5C - bg_event 14, 11, 3, 7, 0, 35, 48, 1 - -VermilionCity_MapEvents:: - map_events VermilionCity_EventObjects, VermilionCity_MapWarps, VermilionCity_MapCoordEvents, VermilionCity_MapBGEvents diff --git a/data/maps/VermilionCity/header.inc b/data/maps/VermilionCity/header.inc deleted file mode 100644 index efc42750d..000000000 --- a/data/maps/VermilionCity/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -VermilionCity:: @ 83506A4 - .4byte VermilionCity_Layout @ 0x82E1534 - .4byte VermilionCity_MapEvents @ 0x83B5648 - .4byte VermilionCity_MapScripts @ 0x81668DC - .4byte VermilionCity_MapConnections @ 0x835283C - .2byte BGM_FRLG_VERMILION_CITY - .2byte 83 - .byte 0x5d, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/VermilionCity/map.json b/data/maps/VermilionCity/map.json new file mode 100644 index 000000000..eb3112c5c --- /dev/null +++ b/data/maps/VermilionCity/map.json @@ -0,0 +1,288 @@ +{ + "id": "MAP_VERMILION_CITY", + "name": "VermilionCity", + "layout": "LAYOUT_VERMILION_CITY", + "music": "BGM_FRLG_VERMILION_CITY", + "region_map_section": "MAPSEC_VERMILION_CITY", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_1", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_ROUTE6", + "offset": 12, + "direction": "up" + }, + { + "map": "MAP_ROUTE11", + "offset": 10, + "direction": "right" + } + ], + "object_events": [ + { + "graphics_id": "23", + "x": 22, + "y": 11, + "elevation": 3, + "movement_type": "5", + "movement_range_x": 4, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VermilionCity_EventScript_166917", + "flag": "0" + }, + { + "graphics_id": "32", + "x": 17, + "y": 9, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VermilionCity_EventScript_166920", + "flag": "0" + }, + { + "graphics_id": "33", + "x": 36, + "y": 10, + "elevation": 0, + "movement_type": "17", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VermilionCity_EventScript_166C2F", + "flag": "0" + }, + { + "graphics_id": "130", + "x": 35, + "y": 11, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 2, + "movement_range_y": 2, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VermilionCity_EventScript_166C38", + "flag": "0" + }, + { + "graphics_id": "62", + "x": 31, + "y": 30, + "elevation": 3, + "movement_type": "5", + "movement_range_x": 4, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VermilionCity_EventScript_166C17", + "flag": "0" + }, + { + "graphics_id": "62", + "x": 24, + "y": 33, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VermilionCity_EventScript_166941", + "flag": "0" + }, + { + "graphics_id": "95", + "x": 19, + "y": 24, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VermilionCity_EventScript_1BDF13", + "flag": "18" + }, + { + "graphics_id": "55", + "x": 25, + "y": 7, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 4, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VermilionCity_EventScript_166C20", + "flag": "161" + } + ], + "warp_events": [ + { + "x": 22, + "y": 34, + "elevation": 3, + "dest_map": "MAP_SSANNE_EXTERIOR", + "dest_warp_id": 1 + }, + { + "x": 23, + "y": 34, + "elevation": 3, + "dest_map": "MAP_SSANNE_EXTERIOR", + "dest_warp_id": 1 + }, + { + "x": 24, + "y": 34, + "elevation": 3, + "dest_map": "MAP_SSANNE_EXTERIOR", + "dest_warp_id": 1 + }, + { + "x": 9, + "y": 6, + "elevation": 0, + "dest_map": "MAP_VERMILION_CITY_HOUSE1", + "dest_warp_id": 1 + }, + { + "x": 15, + "y": 6, + "elevation": 3, + "dest_map": "MAP_VERMILION_CITY_POKEMON_CENTER_1F", + "dest_warp_id": 1 + }, + { + "x": 12, + "y": 17, + "elevation": 0, + "dest_map": "MAP_VERMILION_CITY_POKEMON_FAN_CLUB", + "dest_warp_id": 1 + }, + { + "x": 19, + "y": 17, + "elevation": 0, + "dest_map": "MAP_VERMILION_CITY_HOUSE2", + "dest_warp_id": 1 + }, + { + "x": 29, + "y": 17, + "elevation": 0, + "dest_map": "MAP_VERMILION_CITY_MART", + "dest_warp_id": 1 + }, + { + "x": 28, + "y": 24, + "elevation": 0, + "dest_map": "MAP_VERMILION_CITY_HOUSE3", + "dest_warp_id": 1 + }, + { + "x": 14, + "y": 25, + "elevation": 0, + "dest_map": "MAP_VERMILION_CITY_GYM", + "dest_warp_id": 1 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 22, + "y": 33, + "elevation": 0, + "var": "VAR_0x4053", + "var_value": 0, + "script": "VermilionCity_EventScript_166B8A" + }, + { + "type": "trigger", + "x": 23, + "y": 33, + "elevation": 0, + "var": "VAR_0x4053", + "var_value": 0, + "script": "VermilionCity_EventScript_166B91" + }, + { + "type": "trigger", + "x": 22, + "y": 32, + "elevation": 0, + "var": "VAR_0x4001", + "var_value": 0, + "script": "VermilionCity_EventScript_166B98" + }, + { + "type": "trigger", + "x": 23, + "y": 32, + "elevation": 0, + "var": "VAR_0x4001", + "var_value": 0, + "script": "VermilionCity_EventScript_166B98" + } + ], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 33, + "y": 6, + "elevation": 0, + "script": "VermilionCity_EventScript_166C53" + }, + { + "type": "bg_event_type_0", + "x": 10, + "y": 17, + "elevation": 3, + "script": "VermilionCity_EventScript_166C65" + }, + { + "type": "bg_event_type_0", + "x": 10, + "y": 24, + "elevation": 0, + "script": "VermilionCity_EventScript_166C6E" + }, + { + "type": "bg_event_type_0", + "x": 34, + "y": 18, + "elevation": 0, + "script": "VermilionCity_EventScript_166C86" + }, + { + "type": "bg_event_type_0", + "x": 45, + "y": 17, + "elevation": 3, + "script": "VermilionCity_EventScript_166C5C" + }, + { + "type": "hidden_item", + "x": 14, + "y": 11, + "elevation": 3, + "item": "ITEM_MAX_ETHER", + "flag": "48", + "unknown": 1 + } + ] +}
\ No newline at end of file diff --git a/data/maps/VermilionCity_Gym/events.inc b/data/maps/VermilionCity_Gym/events.inc deleted file mode 100644 index 94ce9dbdb..000000000 --- a/data/maps/VermilionCity_Gym/events.inc +++ /dev/null @@ -1,33 +0,0 @@ -VermilionCity_Gym_EventObjects: - object_event 1, 82, 0, 5, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, VermilionCity_Gym_EventScript_16B94A, 0, 0, 0 - object_event 2, 30, 0, 2, 0, 11, 0, 3, 1, 17, 0, 1, 0, 3, 0, VermilionCity_Gym_EventScript_16BA1E, 0, 0, 0 - object_event 3, 62, 0, 8, 0, 13, 0, 3, 1, 17, 0, 1, 0, 3, 0, VermilionCity_Gym_EventScript_16B9FA, 0, 0, 0 - object_event 4, 91, 0, 4, 0, 17, 0, 3, 8, 17, 0, 0, 0, 0, 0, VermilionCity_Gym_EventScript_16BA6C, 0, 0, 0 - object_event 5, 61, 0, 7, 0, 8, 0, 3, 9, 17, 0, 1, 0, 3, 0, VermilionCity_Gym_EventScript_16BA35, 0, 0, 0 - -VermilionCity_Gym_MapWarps: - warp_def 4, 19, 3, 9, 773 - warp_def 5, 19, 3, 9, 773 - warp_def 6, 19, 3, 9, 773 - -VermilionCity_Gym_MapBGEvents: - bg_event 3, 17, 0, 0, 0, VermilionCity_Gym_EventScript_16BA8B - bg_event 7, 17, 0, 0, 0, VermilionCity_Gym_EventScript_16BA8B - bg_event 1, 10, 0, 0, 0, VermilionCity_Gym_EventScript_16B78F - bg_event 3, 10, 0, 0, 0, VermilionCity_Gym_EventScript_16B79B - bg_event 5, 10, 0, 0, 0, VermilionCity_Gym_EventScript_16B7A7 - bg_event 7, 10, 0, 0, 0, VermilionCity_Gym_EventScript_16B7B3 - bg_event 9, 10, 0, 0, 0, VermilionCity_Gym_EventScript_16B7BF - bg_event 1, 12, 0, 0, 0, VermilionCity_Gym_EventScript_16B7CB - bg_event 3, 12, 0, 0, 0, VermilionCity_Gym_EventScript_16B7D7 - bg_event 5, 12, 0, 0, 0, VermilionCity_Gym_EventScript_16B7E3 - bg_event 7, 12, 0, 0, 0, VermilionCity_Gym_EventScript_16B7EF - bg_event 9, 12, 0, 0, 0, VermilionCity_Gym_EventScript_16B7FB - bg_event 1, 14, 0, 0, 0, VermilionCity_Gym_EventScript_16B807 - bg_event 3, 14, 0, 0, 0, VermilionCity_Gym_EventScript_16B813 - bg_event 5, 14, 0, 0, 0, VermilionCity_Gym_EventScript_16B81F - bg_event 7, 14, 0, 0, 0, VermilionCity_Gym_EventScript_16B82B - bg_event 9, 14, 0, 0, 0, VermilionCity_Gym_EventScript_16B837 - -VermilionCity_Gym_MapEvents:: - map_events VermilionCity_Gym_EventObjects, VermilionCity_Gym_MapWarps, 0x0, VermilionCity_Gym_MapBGEvents diff --git a/data/maps/VermilionCity_Gym/header.inc b/data/maps/VermilionCity_Gym/header.inc deleted file mode 100644 index d80a1d2f1..000000000 --- a/data/maps/VermilionCity_Gym/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -VermilionCity_Gym:: @ 83511B0 - .4byte VermilionCity_Gym_Layout @ 0x82D6E28 - .4byte VermilionCity_Gym_MapEvents @ 0x83BAFD0 - .4byte VermilionCity_Gym_MapScripts @ 0x816B69E - .4byte NULL - .2byte BGM_FRLG_GYM - .2byte 25 - .byte 0x5d, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x01 diff --git a/data/maps/VermilionCity_Gym/map.json b/data/maps/VermilionCity_Gym/map.json new file mode 100644 index 000000000..cc98e944b --- /dev/null +++ b/data/maps/VermilionCity_Gym/map.json @@ -0,0 +1,227 @@ +{ + "id": "MAP_VERMILION_CITY_GYM", + "name": "VermilionCity_Gym", + "layout": "LAYOUT_VERMILION_CITY_GYM", + "music": "BGM_FRLG_GYM", + "region_map_section": "MAPSEC_VERMILION_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_1", + "connections": null, + "object_events": [ + { + "graphics_id": "82", + "x": 5, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VermilionCity_Gym_EventScript_16B94A", + "flag": "0" + }, + { + "graphics_id": "30", + "x": 2, + "y": 11, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "VermilionCity_Gym_EventScript_16BA1E", + "flag": "0" + }, + { + "graphics_id": "62", + "x": 8, + "y": 13, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "VermilionCity_Gym_EventScript_16B9FA", + "flag": "0" + }, + { + "graphics_id": "91", + "x": 4, + "y": 17, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VermilionCity_Gym_EventScript_16BA6C", + "flag": "0" + }, + { + "graphics_id": "61", + "x": 7, + "y": 8, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "VermilionCity_Gym_EventScript_16BA35", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 4, + "y": 19, + "elevation": 3, + "dest_map": "MAP_VERMILION_CITY", + "dest_warp_id": 9 + }, + { + "x": 5, + "y": 19, + "elevation": 3, + "dest_map": "MAP_VERMILION_CITY", + "dest_warp_id": 9 + }, + { + "x": 6, + "y": 19, + "elevation": 3, + "dest_map": "MAP_VERMILION_CITY", + "dest_warp_id": 9 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 3, + "y": 17, + "elevation": 0, + "script": "VermilionCity_Gym_EventScript_16BA8B" + }, + { + "type": "bg_event_type_0", + "x": 7, + "y": 17, + "elevation": 0, + "script": "VermilionCity_Gym_EventScript_16BA8B" + }, + { + "type": "bg_event_type_0", + "x": 1, + "y": 10, + "elevation": 0, + "script": "VermilionCity_Gym_EventScript_16B78F" + }, + { + "type": "bg_event_type_0", + "x": 3, + "y": 10, + "elevation": 0, + "script": "VermilionCity_Gym_EventScript_16B79B" + }, + { + "type": "bg_event_type_0", + "x": 5, + "y": 10, + "elevation": 0, + "script": "VermilionCity_Gym_EventScript_16B7A7" + }, + { + "type": "bg_event_type_0", + "x": 7, + "y": 10, + "elevation": 0, + "script": "VermilionCity_Gym_EventScript_16B7B3" + }, + { + "type": "bg_event_type_0", + "x": 9, + "y": 10, + "elevation": 0, + "script": "VermilionCity_Gym_EventScript_16B7BF" + }, + { + "type": "bg_event_type_0", + "x": 1, + "y": 12, + "elevation": 0, + "script": "VermilionCity_Gym_EventScript_16B7CB" + }, + { + "type": "bg_event_type_0", + "x": 3, + "y": 12, + "elevation": 0, + "script": "VermilionCity_Gym_EventScript_16B7D7" + }, + { + "type": "bg_event_type_0", + "x": 5, + "y": 12, + "elevation": 0, + "script": "VermilionCity_Gym_EventScript_16B7E3" + }, + { + "type": "bg_event_type_0", + "x": 7, + "y": 12, + "elevation": 0, + "script": "VermilionCity_Gym_EventScript_16B7EF" + }, + { + "type": "bg_event_type_0", + "x": 9, + "y": 12, + "elevation": 0, + "script": "VermilionCity_Gym_EventScript_16B7FB" + }, + { + "type": "bg_event_type_0", + "x": 1, + "y": 14, + "elevation": 0, + "script": "VermilionCity_Gym_EventScript_16B807" + }, + { + "type": "bg_event_type_0", + "x": 3, + "y": 14, + "elevation": 0, + "script": "VermilionCity_Gym_EventScript_16B813" + }, + { + "type": "bg_event_type_0", + "x": 5, + "y": 14, + "elevation": 0, + "script": "VermilionCity_Gym_EventScript_16B81F" + }, + { + "type": "bg_event_type_0", + "x": 7, + "y": 14, + "elevation": 0, + "script": "VermilionCity_Gym_EventScript_16B82B" + }, + { + "type": "bg_event_type_0", + "x": 9, + "y": 14, + "elevation": 0, + "script": "VermilionCity_Gym_EventScript_16B837" + } + ] +}
\ No newline at end of file diff --git a/data/maps/VermilionCity_House1/events.inc b/data/maps/VermilionCity_House1/events.inc deleted file mode 100644 index e5f44384b..000000000 --- a/data/maps/VermilionCity_House1/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -VermilionCity_House1_EventObjects: - object_event 1, 57, 0, 4, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, VermilionCity_House1_EventScript_16B3A7, 0, 0, 0 - -VermilionCity_House1_MapWarps: - warp_def 3, 7, 3, 3, 773 - warp_def 4, 7, 3, 3, 773 - warp_def 5, 7, 3, 3, 773 - -VermilionCity_House1_MapEvents:: - map_events VermilionCity_House1_EventObjects, VermilionCity_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/VermilionCity_House1/header.inc b/data/maps/VermilionCity_House1/header.inc deleted file mode 100644 index 789b28501..000000000 --- a/data/maps/VermilionCity_House1/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -VermilionCity_House1:: @ 8351108 - .4byte House1_Layout @ 0x82D5754 - .4byte VermilionCity_House1_MapEvents @ 0x83BAB6C - .4byte VermilionCity_House1_MapScripts @ 0x816B3A6 - .4byte NULL - .2byte BGM_FRLG_CERULEAN_CITY - .2byte 6 - .byte 0x5d, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/VermilionCity_House1/map.json b/data/maps/VermilionCity_House1/map.json new file mode 100644 index 000000000..8195bf6ac --- /dev/null +++ b/data/maps/VermilionCity_House1/map.json @@ -0,0 +1,55 @@ +{ + "id": "MAP_VERMILION_CITY_HOUSE1", + "name": "VermilionCity_House1", + "layout": "LAYOUT_HOUSE1", + "music": "BGM_FRLG_CERULEAN_CITY", + "region_map_section": "MAPSEC_VERMILION_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "57", + "x": 4, + "y": 5, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VermilionCity_House1_EventScript_16B3A7", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 3, + "dest_map": "MAP_VERMILION_CITY", + "dest_warp_id": 3 + }, + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_VERMILION_CITY", + "dest_warp_id": 3 + }, + { + "x": 5, + "y": 7, + "elevation": 3, + "dest_map": "MAP_VERMILION_CITY", + "dest_warp_id": 3 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/VermilionCity_House2/events.inc b/data/maps/VermilionCity_House2/events.inc deleted file mode 100644 index 8e8eb781c..000000000 --- a/data/maps/VermilionCity_House2/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -VermilionCity_House2_EventObjects: - object_event 1, 17, 0, 4, 0, 4, 0, 3, 7, 17, 0, 0, 0, 0, 0, VermilionCity_House2_EventScript_16B5D7, 0, 0, 0 - -VermilionCity_House2_MapWarps: - warp_def 3, 7, 3, 6, 773 - warp_def 4, 7, 3, 6, 773 - warp_def 5, 7, 3, 6, 773 - -VermilionCity_House2_MapEvents:: - map_events VermilionCity_House2_EventObjects, VermilionCity_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/VermilionCity_House2/header.inc b/data/maps/VermilionCity_House2/header.inc deleted file mode 100644 index a536abeb6..000000000 --- a/data/maps/VermilionCity_House2/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -VermilionCity_House2:: @ 8351178 - .4byte House1_Layout @ 0x82D5754 - .4byte VermilionCity_House2_MapEvents @ 0x83BADEC - .4byte VermilionCity_House2_MapScripts @ 0x816B5D6 - .4byte NULL - .2byte BGM_FRLG_VERMILION_CITY - .2byte 6 - .byte 0x5d, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/VermilionCity_House2/map.json b/data/maps/VermilionCity_House2/map.json new file mode 100644 index 000000000..0e218b3d1 --- /dev/null +++ b/data/maps/VermilionCity_House2/map.json @@ -0,0 +1,55 @@ +{ + "id": "MAP_VERMILION_CITY_HOUSE2", + "name": "VermilionCity_House2", + "layout": "LAYOUT_HOUSE1", + "music": "BGM_FRLG_VERMILION_CITY", + "region_map_section": "MAPSEC_VERMILION_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "17", + "x": 4, + "y": 4, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VermilionCity_House2_EventScript_16B5D7", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 3, + "dest_map": "MAP_VERMILION_CITY", + "dest_warp_id": 6 + }, + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_VERMILION_CITY", + "dest_warp_id": 6 + }, + { + "x": 5, + "y": 7, + "elevation": 3, + "dest_map": "MAP_VERMILION_CITY", + "dest_warp_id": 6 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/VermilionCity_House3/events.inc b/data/maps/VermilionCity_House3/events.inc deleted file mode 100644 index 746a1b637..000000000 --- a/data/maps/VermilionCity_House3/events.inc +++ /dev/null @@ -1,16 +0,0 @@ -VermilionCity_House3_EventObjects: - object_event 1, 19, 0, 7, 0, 4, 0, 3, 9, 17, 0, 0, 0, 0, 0, VermilionCity_House3_EventScript_16BAAA, 0, 0, 0 - object_event 2, 116, 0, 2, 0, 5, 0, 3, 5, 18, 0, 0, 0, 0, 0, VermilionCity_House3_EventScript_16BABC, 0, 0, 0 - object_event 3, 105, 0, 6, 0, 4, 0, 0, 1, 17, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 - object_event 4, 22, 0, 2, 0, 4, 0, 3, 8, 17, 0, 0, 0, 0, 0, VermilionCity_House3_EventScript_16BAB3, 0, 0, 0 - -VermilionCity_House3_MapWarps: - warp_def 3, 7, 3, 8, 773 - warp_def 4, 7, 3, 8, 773 - warp_def 5, 7, 3, 8, 773 - -VermilionCity_House3_MapBGEvents: - bg_event 6, 4, 3, 0, 0, VermilionCity_House3_EventScript_16BACF - -VermilionCity_House3_MapEvents:: - map_events VermilionCity_House3_EventObjects, VermilionCity_House3_MapWarps, 0x0, VermilionCity_House3_MapBGEvents diff --git a/data/maps/VermilionCity_House3/header.inc b/data/maps/VermilionCity_House3/header.inc deleted file mode 100644 index 2ab2f1ee8..000000000 --- a/data/maps/VermilionCity_House3/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -VermilionCity_House3:: @ 83511CC - .4byte House1_Layout @ 0x82D5754 - .4byte VermilionCity_House3_MapEvents @ 0x83BB068 - .4byte VermilionCity_House3_MapScripts @ 0x816BAA9 - .4byte NULL - .2byte BGM_FRLG_VERMILION_CITY - .2byte 6 - .byte 0x5d, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/VermilionCity_House3/map.json b/data/maps/VermilionCity_House3/map.json new file mode 100644 index 000000000..2108ec768 --- /dev/null +++ b/data/maps/VermilionCity_House3/map.json @@ -0,0 +1,102 @@ +{ + "id": "MAP_VERMILION_CITY_HOUSE3", + "name": "VermilionCity_House3", + "layout": "LAYOUT_HOUSE1", + "music": "BGM_FRLG_VERMILION_CITY", + "region_map_section": "MAPSEC_VERMILION_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "19", + "x": 7, + "y": 4, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VermilionCity_House3_EventScript_16BAAA", + "flag": "0" + }, + { + "graphics_id": "116", + "x": 2, + "y": 5, + "elevation": 3, + "movement_type": "5", + "movement_range_x": 2, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VermilionCity_House3_EventScript_16BABC", + "flag": "0" + }, + { + "graphics_id": "105", + "x": 6, + "y": 4, + "elevation": 0, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "22", + "x": 2, + "y": 4, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VermilionCity_House3_EventScript_16BAB3", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 3, + "dest_map": "MAP_VERMILION_CITY", + "dest_warp_id": 8 + }, + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_VERMILION_CITY", + "dest_warp_id": 8 + }, + { + "x": 5, + "y": 7, + "elevation": 3, + "dest_map": "MAP_VERMILION_CITY", + "dest_warp_id": 8 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 6, + "y": 4, + "elevation": 3, + "script": "VermilionCity_House3_EventScript_16BACF" + } + ] +}
\ No newline at end of file diff --git a/data/maps/VermilionCity_Mart/events.inc b/data/maps/VermilionCity_Mart/events.inc deleted file mode 100644 index 2a659bf50..000000000 --- a/data/maps/VermilionCity_Mart/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -VermilionCity_Mart_EventObjects: - object_event 1, 68, 0, 2, 0, 3, 0, 0, 10, 17, 0, 0, 0, 0, 0, VermilionCity_Mart_EventScript_16B666, 0, 0, 0 - object_event 2, 42, 0, 4, 0, 2, 0, 3, 9, 17, 0, 0, 0, 0, 0, VermilionCity_Mart_EventScript_16B654, 0, 0, 0 - object_event 3, 30, 0, 9, 0, 4, 0, 3, 2, 33, 0, 0, 0, 0, 0, VermilionCity_Mart_EventScript_16B65D, 0, 0, 0 - -VermilionCity_Mart_MapWarps: - warp_def 3, 7, 3, 7, 773 - warp_def 4, 7, 3, 7, 773 - warp_def 5, 7, 3, 7, 773 - -VermilionCity_Mart_MapEvents:: - map_events VermilionCity_Mart_EventObjects, VermilionCity_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/VermilionCity_Mart/header.inc b/data/maps/VermilionCity_Mart/header.inc deleted file mode 100644 index d82ee87a5..000000000 --- a/data/maps/VermilionCity_Mart/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -VermilionCity_Mart:: @ 8351194 - .4byte Mart_Layout @ 0x82D5BCC - .4byte VermilionCity_Mart_MapEvents @ 0x83BAE60 - .4byte VermilionCity_Mart_MapScripts @ 0x816B653 - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 10 - .byte 0x5d, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/VermilionCity_Mart/map.json b/data/maps/VermilionCity_Mart/map.json new file mode 100644 index 000000000..9b014e0de --- /dev/null +++ b/data/maps/VermilionCity_Mart/map.json @@ -0,0 +1,81 @@ +{ + "id": "MAP_VERMILION_CITY_MART", + "name": "VermilionCity_Mart", + "layout": "LAYOUT_MART", + "music": "BGM_FRLG_POKEMON_CENTER", + "region_map_section": "MAPSEC_VERMILION_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "68", + "x": 2, + "y": 3, + "elevation": 0, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VermilionCity_Mart_EventScript_16B666", + "flag": "0" + }, + { + "graphics_id": "42", + "x": 4, + "y": 2, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VermilionCity_Mart_EventScript_16B654", + "flag": "0" + }, + { + "graphics_id": "30", + "x": 9, + "y": 4, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 2, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VermilionCity_Mart_EventScript_16B65D", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 3, + "dest_map": "MAP_VERMILION_CITY", + "dest_warp_id": 7 + }, + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_VERMILION_CITY", + "dest_warp_id": 7 + }, + { + "x": 5, + "y": 7, + "elevation": 3, + "dest_map": "MAP_VERMILION_CITY", + "dest_warp_id": 7 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/VermilionCity_PokemonCenter_1F/events.inc b/data/maps/VermilionCity_PokemonCenter_1F/events.inc deleted file mode 100644 index 6db98e763..000000000 --- a/data/maps/VermilionCity_PokemonCenter_1F/events.inc +++ /dev/null @@ -1,17 +0,0 @@ -VermilionCity_PokemonCenter_1F_EventObjects: - object_event 1, 64, 0, 7, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, VermilionCity_PokemonCenter_1F_EventScript_16B433, 0, 0, 0 - object_event 2, 25, 0, 4, 0, 8, 0, 3, 5, 17, 0, 0, 0, 0, 0, VermilionCity_PokemonCenter_1F_EventScript_16B43C, 0, 0, 0 - object_event 3, 56, 0, 12, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, VermilionCity_PokemonCenter_1F_EventScript_16B445, 0, 0, 0 - object_event 4, 18, 0, 14, 0, 4, 0, 3, 3, 17, 0, 0, 0, 0, 0, VermilionCity_PokemonCenter_1F_EventScript_16B44E, 0, 0, 0 - object_event 5, 42, 0, 6, 0, 4, 0, 3, 8, 17, 0, 0, 0, 0, 0, VermilionCity_PokemonCenter_1F_EventScript_1A8D08, 0, 0, 0 - object_event 6, 0, 0, 2, 0, 1, 0, 0, 76, 17, 0, 0, 0, 0, 0, VermilionCity_PokemonCenter_1F_EventScript_1ACE83, 160, 0, 0 - object_event 7, 0, 0, 3, 0, 1, 0, 0, 76, 17, 0, 0, 0, 0, 0, VermilionCity_PokemonCenter_1F_EventScript_1ACE83, 160, 0, 0 - -VermilionCity_PokemonCenter_1F_MapWarps: - warp_def 6, 8, 3, 4, 773 - warp_def 7, 8, 3, 4, 773 - warp_def 8, 8, 3, 4, 773 - warp_def 1, 6, 4, 0, 2306 - -VermilionCity_PokemonCenter_1F_MapEvents:: - map_events VermilionCity_PokemonCenter_1F_EventObjects, VermilionCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/VermilionCity_PokemonCenter_1F/header.inc b/data/maps/VermilionCity_PokemonCenter_1F/header.inc deleted file mode 100644 index 4f6333c60..000000000 --- a/data/maps/VermilionCity_PokemonCenter_1F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -VermilionCity_PokemonCenter_1F:: @ 8351124 - .4byte PokemonCenter_1F_Layout @ 0x82D5990 - .4byte VermilionCity_PokemonCenter_1F_MapEvents @ 0x83BAC48 - .4byte VermilionCity_PokemonCenter_1F_MapScripts @ 0x816B424 - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 8 - .byte 0x5d, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/VermilionCity_PokemonCenter_1F/map.json b/data/maps/VermilionCity_PokemonCenter_1F/map.json new file mode 100644 index 000000000..c1f76237e --- /dev/null +++ b/data/maps/VermilionCity_PokemonCenter_1F/map.json @@ -0,0 +1,140 @@ +{ + "id": "MAP_VERMILION_CITY_POKEMON_CENTER_1F", + "name": "VermilionCity_PokemonCenter_1F", + "layout": "LAYOUT_POKEMON_CENTER_1F", + "music": "BGM_FRLG_POKEMON_CENTER", + "region_map_section": "MAPSEC_VERMILION_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "64", + "x": 7, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VermilionCity_PokemonCenter_1F_EventScript_16B433", + "flag": "0" + }, + { + "graphics_id": "25", + "x": 4, + "y": 8, + "elevation": 3, + "movement_type": "5", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VermilionCity_PokemonCenter_1F_EventScript_16B43C", + "flag": "0" + }, + { + "graphics_id": "56", + "x": 12, + "y": 5, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VermilionCity_PokemonCenter_1F_EventScript_16B445", + "flag": "0" + }, + { + "graphics_id": "18", + "x": 14, + "y": 4, + "elevation": 3, + "movement_type": "3", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VermilionCity_PokemonCenter_1F_EventScript_16B44E", + "flag": "0" + }, + { + "graphics_id": "42", + "x": 6, + "y": 4, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VermilionCity_PokemonCenter_1F_EventScript_1A8D08", + "flag": "0" + }, + { + "graphics_id": "0", + "x": 2, + "y": 1, + "elevation": 0, + "movement_type": "76", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VermilionCity_PokemonCenter_1F_EventScript_1ACE83", + "flag": "160" + }, + { + "graphics_id": "0", + "x": 3, + "y": 1, + "elevation": 0, + "movement_type": "76", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VermilionCity_PokemonCenter_1F_EventScript_1ACE83", + "flag": "160" + } + ], + "warp_events": [ + { + "x": 6, + "y": 8, + "elevation": 3, + "dest_map": "MAP_VERMILION_CITY", + "dest_warp_id": 4 + }, + { + "x": 7, + "y": 8, + "elevation": 3, + "dest_map": "MAP_VERMILION_CITY", + "dest_warp_id": 4 + }, + { + "x": 8, + "y": 8, + "elevation": 3, + "dest_map": "MAP_VERMILION_CITY", + "dest_warp_id": 4 + }, + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_VERMILION_CITY_POKEMON_CENTER_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/VermilionCity_PokemonCenter_2F/events.inc b/data/maps/VermilionCity_PokemonCenter_2F/events.inc deleted file mode 100644 index eca0aaf89..000000000 --- a/data/maps/VermilionCity_PokemonCenter_2F/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -VermilionCity_PokemonCenter_2F_EventObjects: - object_event 1, 65, 0, 6, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, VermilionCity_PokemonCenter_2F_EventScript_1A8CF6, 0, 0, 0 - object_event 2, 65, 0, 2, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, VermilionCity_PokemonCenter_2F_EventScript_1A8CFC, 0, 0, 0 - object_event 3, 65, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, VermilionCity_PokemonCenter_2F_EventScript_1A8D02, 0, 0, 0 - object_event 4, 69, 0, 1, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, VermilionCity_PokemonCenter_2F_EventScript_1BB1D2, 112, 0, 0 - -VermilionCity_PokemonCenter_2F_MapWarps: - warp_def 1, 6, 4, 3, 2305 - warp_def 5, 1, 0, 0, 4 - warp_def 9, 1, 0, 0, 1 - -VermilionCity_PokemonCenter_2F_MapEvents:: - map_events VermilionCity_PokemonCenter_2F_EventObjects, VermilionCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/VermilionCity_PokemonCenter_2F/header.inc b/data/maps/VermilionCity_PokemonCenter_2F/header.inc deleted file mode 100644 index 7cb7acc59..000000000 --- a/data/maps/VermilionCity_PokemonCenter_2F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -VermilionCity_PokemonCenter_2F:: @ 8351140 - .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 - .4byte VermilionCity_PokemonCenter_2F_MapEvents @ 0x83BACD4 - .4byte VermilionCity_PokemonCenter_2F_MapScripts @ 0x816B457 - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 9 - .byte 0x5d, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/VermilionCity_PokemonCenter_2F/map.json b/data/maps/VermilionCity_PokemonCenter_2F/map.json new file mode 100644 index 000000000..942ef3885 --- /dev/null +++ b/data/maps/VermilionCity_PokemonCenter_2F/map.json @@ -0,0 +1,94 @@ +{ + "id": "MAP_VERMILION_CITY_POKEMON_CENTER_2F", + "name": "VermilionCity_PokemonCenter_2F", + "layout": "LAYOUT_POKEMON_CENTER_2F", + "music": "BGM_FRLG_POKEMON_CENTER", + "region_map_section": "MAPSEC_VERMILION_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "65", + "x": 6, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VermilionCity_PokemonCenter_2F_EventScript_1A8CF6", + "flag": "0" + }, + { + "graphics_id": "65", + "x": 2, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VermilionCity_PokemonCenter_2F_EventScript_1A8CFC", + "flag": "0" + }, + { + "graphics_id": "65", + "x": 10, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VermilionCity_PokemonCenter_2F_EventScript_1A8D02", + "flag": "0" + }, + { + "graphics_id": "69", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VermilionCity_PokemonCenter_2F_EventScript_1BB1D2", + "flag": "112" + } + ], + "warp_events": [ + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_VERMILION_CITY_POKEMON_CENTER_1F", + "dest_warp_id": 3 + }, + { + "x": 5, + "y": 1, + "elevation": 0, + "dest_map": "MAP_UNKNOWN_MAP_00_04", + "dest_warp_id": 0 + }, + { + "x": 9, + "y": 1, + "elevation": 0, + "dest_map": "MAP_UNKNOWN_MAP_00_01", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/VermilionCity_PokemonFanClub/events.inc b/data/maps/VermilionCity_PokemonFanClub/events.inc deleted file mode 100644 index 6f4a7f4b1..000000000 --- a/data/maps/VermilionCity_PokemonFanClub/events.inc +++ /dev/null @@ -1,19 +0,0 @@ -VermilionCity_PokemonFanClub_EventObjects: - object_event 1, 61, 0, 5, 0, 4, 0, 4, 8, 17, 0, 0, 0, 0, 0, VermilionCity_PokemonFanClub_EventScript_16B47F, 0, 0, 0 - object_event 2, 48, 0, 6, 0, 4, 0, 4, 8, 17, 0, 0, 0, 0, 0, VermilionCity_PokemonFanClub_EventScript_16B4FC, 0, 0, 0 - object_event 3, 120, 0, 7, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, VermilionCity_PokemonFanClub_EventScript_16B59E, 0, 0, 0 - object_event 4, 126, 0, 4, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, VermilionCity_PokemonFanClub_EventScript_16B5B1, 0, 0, 0 - object_event 5, 23, 0, 4, 0, 5, 0, 0, 8, 17, 0, 0, 0, 0, 0, VermilionCity_PokemonFanClub_EventScript_16B528, 0, 0, 0 - object_event 6, 27, 0, 7, 0, 5, 0, 0, 8, 17, 0, 0, 0, 0, 0, VermilionCity_PokemonFanClub_EventScript_16B563, 0, 0, 0 - -VermilionCity_PokemonFanClub_MapWarps: - warp_def 4, 10, 3, 5, 773 - warp_def 5, 10, 3, 5, 773 - warp_def 6, 10, 3, 5, 773 - -VermilionCity_PokemonFanClub_MapBGEvents: - bg_event 2, 1, 0, 0, 0, VermilionCity_PokemonFanClub_EventScript_16B5C4 - bg_event 9, 1, 0, 0, 0, VermilionCity_PokemonFanClub_EventScript_16B5CD - -VermilionCity_PokemonFanClub_MapEvents:: - map_events VermilionCity_PokemonFanClub_EventObjects, VermilionCity_PokemonFanClub_MapWarps, 0x0, VermilionCity_PokemonFanClub_MapBGEvents diff --git a/data/maps/VermilionCity_PokemonFanClub/header.inc b/data/maps/VermilionCity_PokemonFanClub/header.inc deleted file mode 100644 index 930f0d08f..000000000 --- a/data/maps/VermilionCity_PokemonFanClub/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -VermilionCity_PokemonFanClub:: @ 835115C - .4byte VermilionCity_PokemonFanClub_Layout @ 0x833ABC8 - .4byte VermilionCity_PokemonFanClub_MapEvents @ 0x83BADA8 - .4byte VermilionCity_PokemonFanClub_MapScripts @ 0x816B47E - .4byte NULL - .2byte BGM_FRLG_VERMILION_CITY - .2byte 273 - .byte 0x5d, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/VermilionCity_PokemonFanClub/map.json b/data/maps/VermilionCity_PokemonFanClub/map.json new file mode 100644 index 000000000..4be1c66f0 --- /dev/null +++ b/data/maps/VermilionCity_PokemonFanClub/map.json @@ -0,0 +1,135 @@ +{ + "id": "MAP_VERMILION_CITY_POKEMON_FAN_CLUB", + "name": "VermilionCity_PokemonFanClub", + "layout": "LAYOUT_VERMILION_CITY_POKEMON_FAN_CLUB", + "music": "BGM_FRLG_VERMILION_CITY", + "region_map_section": "MAPSEC_VERMILION_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "61", + "x": 5, + "y": 4, + "elevation": 4, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VermilionCity_PokemonFanClub_EventScript_16B47F", + "flag": "0" + }, + { + "graphics_id": "48", + "x": 6, + "y": 4, + "elevation": 4, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VermilionCity_PokemonFanClub_EventScript_16B4FC", + "flag": "0" + }, + { + "graphics_id": "120", + "x": 7, + "y": 6, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VermilionCity_PokemonFanClub_EventScript_16B59E", + "flag": "0" + }, + { + "graphics_id": "126", + "x": 4, + "y": 6, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VermilionCity_PokemonFanClub_EventScript_16B5B1", + "flag": "0" + }, + { + "graphics_id": "23", + "x": 4, + "y": 5, + "elevation": 0, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VermilionCity_PokemonFanClub_EventScript_16B528", + "flag": "0" + }, + { + "graphics_id": "27", + "x": 7, + "y": 5, + "elevation": 0, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VermilionCity_PokemonFanClub_EventScript_16B563", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 4, + "y": 10, + "elevation": 3, + "dest_map": "MAP_VERMILION_CITY", + "dest_warp_id": 5 + }, + { + "x": 5, + "y": 10, + "elevation": 3, + "dest_map": "MAP_VERMILION_CITY", + "dest_warp_id": 5 + }, + { + "x": 6, + "y": 10, + "elevation": 3, + "dest_map": "MAP_VERMILION_CITY", + "dest_warp_id": 5 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 2, + "y": 1, + "elevation": 0, + "script": "VermilionCity_PokemonFanClub_EventScript_16B5C4" + }, + { + "type": "bg_event_type_0", + "x": 9, + "y": 1, + "elevation": 0, + "script": "VermilionCity_PokemonFanClub_EventScript_16B5CD" + } + ] +}
\ No newline at end of file diff --git a/data/maps/VictoryRoad_1F/events.inc b/data/maps/VictoryRoad_1F/events.inc deleted file mode 100644 index 1c5c17cb1..000000000 --- a/data/maps/VictoryRoad_1F/events.inc +++ /dev/null @@ -1,22 +0,0 @@ -VictoryRoad_1F_EventObjects: - object_event 1, 41, 0, 5, 0, 2, 0, 3, 8, 17, 0, 1, 0, 4, 0, VictoryRoad_1F_EventScript_160F7B, 0, 0, 0 - object_event 2, 42, 0, 14, 0, 6, 0, 4, 8, 17, 0, 1, 0, 4, 0, VictoryRoad_1F_EventScript_160F64, 0, 0, 0 - object_event 3, 92, 0, 12, 0, 3, 0, 3, 8, 17, 0, 0, 0, 0, 0, VictoryRoad_1F_EventScript_1BE9D2, 425, 0, 0 - object_event 4, 92, 0, 14, 0, 1, 0, 3, 8, 17, 0, 0, 0, 0, 0, VictoryRoad_1F_EventScript_1BE9DF, 426, 0, 0 - object_event 5, 97, 0, 7, 0, 18, 0, 3, 8, 0, 0, 0, 0, 0, 0, VictoryRoad_1F_EventScript_1BE11D, 0, 0, 0 - object_event 6, 97, 0, 4, 0, 12, 0, 3, 8, 0, 0, 0, 0, 0, 0, VictoryRoad_1F_EventScript_1BE11D, 0, 0, 0 - object_event 7, 97, 0, 16, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, VictoryRoad_1F_EventScript_1BE11D, 0, 0, 0 - -VictoryRoad_1F_MapWarps: - warp_def 3, 2, 3, 0, 296 - warp_def 11, 20, 3, 0, 810 - -VictoryRoad_1F_MapCoordEvents: - coord_event 20, 16, 3, 0, 16484, 99, 0, VictoryRoad_1F_EventScript_160F33 - -VictoryRoad_1F_MapBGEvents: - bg_event 12, 12, 0, 7, 0, 2, 37, 1 - bg_event 16, 1, 0, 7, 0, 19, 38, 1 - -VictoryRoad_1F_MapEvents:: - map_events VictoryRoad_1F_EventObjects, VictoryRoad_1F_MapWarps, VictoryRoad_1F_MapCoordEvents, VictoryRoad_1F_MapBGEvents diff --git a/data/maps/VictoryRoad_1F/header.inc b/data/maps/VictoryRoad_1F/header.inc deleted file mode 100644 index 8c6c1c85c..000000000 --- a/data/maps/VictoryRoad_1F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -VictoryRoad_1F:: @ 834F658 - .4byte VictoryRoad_1F_Layout @ 0x83043CC - .4byte VictoryRoad_1F_MapEvents @ 0x83AF5C0 - .4byte VictoryRoad_1F_MapScripts @ 0x8160F05 - .4byte NULL - .2byte BGM_FRLG_MT_MOON - .2byte 125 - .byte 0x84, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/VictoryRoad_1F/map.json b/data/maps/VictoryRoad_1F/map.json new file mode 100644 index 000000000..fae861a3e --- /dev/null +++ b/data/maps/VictoryRoad_1F/map.json @@ -0,0 +1,155 @@ +{ + "id": "MAP_VICTORY_ROAD_1F", + "name": "VictoryRoad_1F", + "layout": "LAYOUT_VICTORY_ROAD_1F", + "music": "BGM_FRLG_MT_MOON", + "region_map_section": "MAPSEC_KANTO_VICTORY_ROAD", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "41", + "x": 5, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "VictoryRoad_1F_EventScript_160F7B", + "flag": "0" + }, + { + "graphics_id": "42", + "x": 14, + "y": 6, + "elevation": 4, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "VictoryRoad_1F_EventScript_160F64", + "flag": "0" + }, + { + "graphics_id": "92", + "x": 12, + "y": 3, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VictoryRoad_1F_EventScript_1BE9D2", + "flag": "425" + }, + { + "graphics_id": "92", + "x": 14, + "y": 1, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VictoryRoad_1F_EventScript_1BE9DF", + "flag": "426" + }, + { + "graphics_id": "97", + "x": 7, + "y": 18, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VictoryRoad_1F_EventScript_1BE11D", + "flag": "0" + }, + { + "graphics_id": "97", + "x": 4, + "y": 12, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VictoryRoad_1F_EventScript_1BE11D", + "flag": "0" + }, + { + "graphics_id": "97", + "x": 16, + "y": 3, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VictoryRoad_1F_EventScript_1BE11D", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 2, + "elevation": 3, + "dest_map": "MAP_VICTORY_ROAD_2F", + "dest_warp_id": 0 + }, + { + "x": 11, + "y": 20, + "elevation": 3, + "dest_map": "MAP_ROUTE23", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 20, + "y": 16, + "elevation": 3, + "var": "VAR_0x4064", + "var_value": 99, + "script": "VictoryRoad_1F_EventScript_160F33" + } + ], + "bg_events": [ + { + "type": "hidden_item", + "x": 12, + "y": 12, + "elevation": 0, + "item": "POCKET_KEY_ITEMS", + "flag": "37", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 16, + "y": 1, + "elevation": 0, + "item": "ITEM_FULL_RESTORE", + "flag": "38", + "unknown": 1 + } + ] +}
\ No newline at end of file diff --git a/data/maps/VictoryRoad_2F/events.inc b/data/maps/VictoryRoad_2F/events.inc deleted file mode 100644 index 67e5fa5f5..000000000 --- a/data/maps/VictoryRoad_2F/events.inc +++ /dev/null @@ -1,32 +0,0 @@ -VictoryRoad_2F_EventObjects: - object_event 1, 52, 0, 7, 0, 4, 0, 3, 8, 17, 0, 1, 0, 1, 0, VictoryRoad_2F_EventScript_161037, 0, 0, 0 - object_event 2, 54, 0, 20, 0, 11, 0, 4, 17, 17, 0, 1, 0, 4, 0, VictoryRoad_2F_EventScript_16104E, 0, 0, 0 - object_event 3, 26, 0, 31, 0, 16, 0, 4, 9, 17, 0, 1, 0, 4, 0, VictoryRoad_2F_EventScript_161065, 0, 0, 0 - object_event 4, 25, 0, 26, 0, 6, 0, 3, 40, 68, 0, 1, 0, 1, 0, VictoryRoad_2F_EventScript_161093, 0, 0, 0 - object_event 5, 26, 0, 36, 0, 5, 0, 3, 7, 17, 0, 1, 0, 3, 0, VictoryRoad_2F_EventScript_16107C, 0, 0, 0 - object_event 6, 92, 0, 17, 0, 6, 0, 3, 8, 17, 0, 0, 0, 0, 0, VictoryRoad_2F_EventScript_1BE9EC, 427, 0, 0 - object_event 7, 92, 0, 40, 0, 7, 0, 3, 8, 17, 0, 0, 0, 0, 0, VictoryRoad_2F_EventScript_1BE9F9, 428, 0, 0 - object_event 8, 92, 0, 25, 0, 13, 0, 3, 8, 17, 0, 0, 0, 0, 0, VictoryRoad_2F_EventScript_1BEA06, 429, 0, 0 - object_event 9, 92, 0, 14, 0, 13, 0, 3, 8, 17, 0, 0, 0, 0, 0, VictoryRoad_2F_EventScript_1BEA13, 430, 0, 0 - object_event 10, 97, 0, 8, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, VictoryRoad_2F_EventScript_1BE11D, 0, 0, 0 - object_event 11, 97, 0, 6, 0, 17, 0, 3, 8, 0, 0, 0, 0, 0, 0, VictoryRoad_2F_EventScript_1BE11D, 0, 0, 0 - object_event 12, 97, 0, 33, 0, 19, 0, 3, 8, 0, 0, 0, 0, 0, 0, VictoryRoad_2F_EventScript_1BE11D, 88, 0, 0 - object_event 13, 41, 0, 40, 0, 9, 0, 3, 8, 17, 0, 0, 0, 0, 0, VictoryRoad_2F_EventScript_1C47AE, 0, 0, 0 - -VictoryRoad_2F_MapWarps: - warp_def 1, 9, 3, 0, 295 - warp_def 3, 3, 3, 0, 297 - warp_def 34, 9, 3, 1, 297 - warp_def 38, 9, 3, 2, 297 - warp_def 36, 17, 4, 3, 297 - warp_def 49, 13, 0, 1, 810 - warp_def 48, 12, 3, 1, 810 - warp_def 47, 13, 0, 1, 810 - warp_def 34, 19, 3, 4, 297 - -VictoryRoad_2F_MapCoordEvents: - coord_event 2, 19, 3, 0, 16485, 99, 0, VictoryRoad_2F_EventScript_160FD5 - coord_event 14, 19, 3, 0, 16486, 99, 0, VictoryRoad_2F_EventScript_161006 - -VictoryRoad_2F_MapEvents:: - map_events VictoryRoad_2F_EventObjects, VictoryRoad_2F_MapWarps, VictoryRoad_2F_MapCoordEvents, 0x0 diff --git a/data/maps/VictoryRoad_2F/header.inc b/data/maps/VictoryRoad_2F/header.inc deleted file mode 100644 index 5c1c06256..000000000 --- a/data/maps/VictoryRoad_2F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -VictoryRoad_2F:: @ 834F674 - .4byte VictoryRoad_2F_Layout @ 0x8304CB4 - .4byte VictoryRoad_2F_MapEvents @ 0x83AF774 - .4byte VictoryRoad_2F_MapScripts @ 0x8160F92 - .4byte NULL - .2byte BGM_FRLG_MT_MOON - .2byte 126 - .byte 0x84, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/VictoryRoad_2F/map.json b/data/maps/VictoryRoad_2F/map.json new file mode 100644 index 000000000..6a0ba1819 --- /dev/null +++ b/data/maps/VictoryRoad_2F/map.json @@ -0,0 +1,272 @@ +{ + "id": "MAP_VICTORY_ROAD_2F", + "name": "VictoryRoad_2F", + "layout": "LAYOUT_VICTORY_ROAD_2F", + "music": "BGM_FRLG_MT_MOON", + "region_map_section": "MAPSEC_KANTO_VICTORY_ROAD", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "52", + "x": 7, + "y": 4, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "VictoryRoad_2F_EventScript_161037", + "flag": "0" + }, + { + "graphics_id": "54", + "x": 20, + "y": 11, + "elevation": 4, + "movement_type": "17", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "VictoryRoad_2F_EventScript_16104E", + "flag": "0" + }, + { + "graphics_id": "26", + "x": 31, + "y": 16, + "elevation": 4, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "VictoryRoad_2F_EventScript_161065", + "flag": "0" + }, + { + "graphics_id": "25", + "x": 26, + "y": 6, + "elevation": 3, + "movement_type": "40", + "movement_range_x": 4, + "movement_range_y": 4, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "VictoryRoad_2F_EventScript_161093", + "flag": "0" + }, + { + "graphics_id": "26", + "x": 36, + "y": 5, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "VictoryRoad_2F_EventScript_16107C", + "flag": "0" + }, + { + "graphics_id": "92", + "x": 17, + "y": 6, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VictoryRoad_2F_EventScript_1BE9EC", + "flag": "427" + }, + { + "graphics_id": "92", + "x": 40, + "y": 7, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VictoryRoad_2F_EventScript_1BE9F9", + "flag": "428" + }, + { + "graphics_id": "92", + "x": 25, + "y": 13, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VictoryRoad_2F_EventScript_1BEA06", + "flag": "429" + }, + { + "graphics_id": "92", + "x": 14, + "y": 13, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VictoryRoad_2F_EventScript_1BEA13", + "flag": "430" + }, + { + "graphics_id": "97", + "x": 8, + "y": 7, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VictoryRoad_2F_EventScript_1BE11D", + "flag": "0" + }, + { + "graphics_id": "97", + "x": 6, + "y": 17, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VictoryRoad_2F_EventScript_1BE11D", + "flag": "0" + }, + { + "graphics_id": "97", + "x": 33, + "y": 19, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VictoryRoad_2F_EventScript_1BE11D", + "flag": "88" + }, + { + "graphics_id": "41", + "x": 40, + "y": 9, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VictoryRoad_2F_EventScript_1C47AE", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 1, + "y": 9, + "elevation": 3, + "dest_map": "MAP_VICTORY_ROAD_1F", + "dest_warp_id": 0 + }, + { + "x": 3, + "y": 3, + "elevation": 3, + "dest_map": "MAP_VICTORY_ROAD_3F", + "dest_warp_id": 0 + }, + { + "x": 34, + "y": 9, + "elevation": 3, + "dest_map": "MAP_VICTORY_ROAD_3F", + "dest_warp_id": 1 + }, + { + "x": 38, + "y": 9, + "elevation": 3, + "dest_map": "MAP_VICTORY_ROAD_3F", + "dest_warp_id": 2 + }, + { + "x": 36, + "y": 17, + "elevation": 4, + "dest_map": "MAP_VICTORY_ROAD_3F", + "dest_warp_id": 3 + }, + { + "x": 49, + "y": 13, + "elevation": 0, + "dest_map": "MAP_ROUTE23", + "dest_warp_id": 1 + }, + { + "x": 48, + "y": 12, + "elevation": 3, + "dest_map": "MAP_ROUTE23", + "dest_warp_id": 1 + }, + { + "x": 47, + "y": 13, + "elevation": 0, + "dest_map": "MAP_ROUTE23", + "dest_warp_id": 1 + }, + { + "x": 34, + "y": 19, + "elevation": 3, + "dest_map": "MAP_VICTORY_ROAD_3F", + "dest_warp_id": 4 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 2, + "y": 19, + "elevation": 3, + "var": "VAR_0x4065", + "var_value": 99, + "script": "VictoryRoad_2F_EventScript_160FD5" + }, + { + "type": "trigger", + "x": 14, + "y": 19, + "elevation": 3, + "var": "VAR_0x4066", + "var_value": 99, + "script": "VictoryRoad_2F_EventScript_161006" + } + ], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/VictoryRoad_3F/events.inc b/data/maps/VictoryRoad_3F/events.inc deleted file mode 100644 index dfac9f3ce..000000000 --- a/data/maps/VictoryRoad_3F/events.inc +++ /dev/null @@ -1,26 +0,0 @@ -VictoryRoad_3F_EventObjects: - object_event 1, 41, 0, 40, 0, 7, 0, 3, 9, 17, 0, 1, 0, 1, 0, VictoryRoad_3F_EventScript_161103, 0, 0, 0 - object_event 2, 42, 0, 21, 0, 5, 0, 4, 10, 17, 0, 1, 0, 4, 0, VictoryRoad_3F_EventScript_161148, 0, 0, 0 - object_event 3, 41, 0, 10, 0, 17, 0, 3, 9, 17, 0, 1, 0, 5, 0, VictoryRoad_3F_EventScript_16111A, 0, 0, 0 - object_event 4, 42, 0, 11, 0, 16, 0, 3, 10, 17, 0, 1, 0, 5, 0, VictoryRoad_3F_EventScript_161131, 0, 0, 0 - object_event 5, 92, 0, 38, 0, 7, 0, 3, 8, 17, 0, 0, 0, 0, 0, VictoryRoad_3F_EventScript_1BEA20, 431, 0, 0 - object_event 6, 92, 0, 12, 0, 9, 0, 3, 8, 17, 0, 0, 0, 0, 0, VictoryRoad_3F_EventScript_1BEA2D, 432, 0, 0 - object_event 7, 97, 0, 19, 0, 15, 0, 3, 8, 0, 0, 0, 0, 0, 0, VictoryRoad_3F_EventScript_1BE11D, 0, 0, 0 - object_event 8, 97, 0, 33, 0, 18, 0, 0, 8, 0, 0, 88, 0, 0, 0, VictoryRoad_3F_EventScript_1BE11D, 89, 0, 0 - object_event 9, 97, 0, 35, 0, 13, 0, 3, 8, 0, 0, 0, 0, 0, 0, VictoryRoad_3F_EventScript_1BE11D, 0, 0, 0 - object_event 10, 97, 0, 32, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, VictoryRoad_3F_EventScript_1BE11D, 0, 0, 0 - object_event 11, 41, 0, 38, 0, 13, 0, 3, 8, 17, 0, 1, 0, 1, 0, VictoryRoad_3F_EventScript_16115F, 0, 0, 0 - object_event 12, 42, 0, 39, 0, 13, 0, 3, 8, 17, 0, 1, 0, 1, 0, VictoryRoad_3F_EventScript_16117A, 0, 0, 0 - -VictoryRoad_3F_MapWarps: - warp_def 5, 2, 3, 1, 296 - warp_def 34, 9, 3, 2, 296 - warp_def 37, 10, 3, 3, 296 - warp_def 39, 17, 3, 4, 296 - warp_def 34, 18, 3, 8, 296 - -VictoryRoad_3F_MapCoordEvents: - coord_event 7, 7, 3, 0, 16487, 99, 0, VictoryRoad_3F_EventScript_1610CF - -VictoryRoad_3F_MapEvents:: - map_events VictoryRoad_3F_EventObjects, VictoryRoad_3F_MapWarps, VictoryRoad_3F_MapCoordEvents, 0x0 diff --git a/data/maps/VictoryRoad_3F/header.inc b/data/maps/VictoryRoad_3F/header.inc deleted file mode 100644 index 85fb25b59..000000000 --- a/data/maps/VictoryRoad_3F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -VictoryRoad_3F:: @ 834F690 - .4byte VictoryRoad_3F_Layout @ 0x8305494 - .4byte VictoryRoad_3F_MapEvents @ 0x83AF8E0 - .4byte VictoryRoad_3F_MapScripts @ 0x81610AA - .4byte NULL - .2byte BGM_FRLG_MT_MOON - .2byte 127 - .byte 0x84, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/VictoryRoad_3F/map.json b/data/maps/VictoryRoad_3F/map.json new file mode 100644 index 000000000..78a5c1b4e --- /dev/null +++ b/data/maps/VictoryRoad_3F/map.json @@ -0,0 +1,222 @@ +{ + "id": "MAP_VICTORY_ROAD_3F", + "name": "VictoryRoad_3F", + "layout": "LAYOUT_VICTORY_ROAD_3F", + "music": "BGM_FRLG_MT_MOON", + "region_map_section": "MAPSEC_KANTO_VICTORY_ROAD", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "41", + "x": 40, + "y": 7, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "VictoryRoad_3F_EventScript_161103", + "flag": "0" + }, + { + "graphics_id": "42", + "x": 21, + "y": 5, + "elevation": 4, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "VictoryRoad_3F_EventScript_161148", + "flag": "0" + }, + { + "graphics_id": "41", + "x": 10, + "y": 17, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "VictoryRoad_3F_EventScript_16111A", + "flag": "0" + }, + { + "graphics_id": "42", + "x": 11, + "y": 16, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "VictoryRoad_3F_EventScript_161131", + "flag": "0" + }, + { + "graphics_id": "92", + "x": 38, + "y": 7, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VictoryRoad_3F_EventScript_1BEA20", + "flag": "431" + }, + { + "graphics_id": "92", + "x": 12, + "y": 9, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VictoryRoad_3F_EventScript_1BEA2D", + "flag": "432" + }, + { + "graphics_id": "97", + "x": 19, + "y": 15, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VictoryRoad_3F_EventScript_1BE11D", + "flag": "0" + }, + { + "graphics_id": "97", + "x": 33, + "y": 18, + "elevation": 0, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 88, + "trainer_sight_or_berry_tree_id": 0, + "script": "VictoryRoad_3F_EventScript_1BE11D", + "flag": "89" + }, + { + "graphics_id": "97", + "x": 35, + "y": 13, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VictoryRoad_3F_EventScript_1BE11D", + "flag": "0" + }, + { + "graphics_id": "97", + "x": 32, + "y": 5, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VictoryRoad_3F_EventScript_1BE11D", + "flag": "0" + }, + { + "graphics_id": "41", + "x": 38, + "y": 13, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "VictoryRoad_3F_EventScript_16115F", + "flag": "0" + }, + { + "graphics_id": "42", + "x": 39, + "y": 13, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "VictoryRoad_3F_EventScript_16117A", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 5, + "y": 2, + "elevation": 3, + "dest_map": "MAP_VICTORY_ROAD_2F", + "dest_warp_id": 1 + }, + { + "x": 34, + "y": 9, + "elevation": 3, + "dest_map": "MAP_VICTORY_ROAD_2F", + "dest_warp_id": 2 + }, + { + "x": 37, + "y": 10, + "elevation": 3, + "dest_map": "MAP_VICTORY_ROAD_2F", + "dest_warp_id": 3 + }, + { + "x": 39, + "y": 17, + "elevation": 3, + "dest_map": "MAP_VICTORY_ROAD_2F", + "dest_warp_id": 4 + }, + { + "x": 34, + "y": 18, + "elevation": 3, + "dest_map": "MAP_VICTORY_ROAD_2F", + "dest_warp_id": 8 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 7, + "y": 7, + "elevation": 3, + "var": "VAR_0x4067", + "var_value": 99, + "script": "VictoryRoad_3F_EventScript_1610CF" + } + ], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/ViridianCity/connections.inc b/data/maps/ViridianCity/connections.inc deleted file mode 100644 index 580e6a4bd..000000000 --- a/data/maps/ViridianCity/connections.inc +++ /dev/null @@ -1,8 +0,0 @@ -ViridianCity_MapConnectionsList: @ 8352774 - connection up, 12, MAP_ROUTE2 - connection down, 12, MAP_ROUTE1 - connection left, 10, MAP_ROUTE22 - -ViridianCity_MapConnections:: @ 8352798 - .4byte 3 - .4byte ViridianCity_MapConnectionsList diff --git a/data/maps/ViridianCity/events.inc b/data/maps/ViridianCity/events.inc deleted file mode 100644 index ec87ad511..000000000 --- a/data/maps/ViridianCity/events.inc +++ /dev/null @@ -1,33 +0,0 @@ -ViridianCity_EventObjects: - object_event 1, 27, 0, 8, 0, 26, 0, 3, 8, 0, 0, 0, 0, 0, 0, ViridianCity_EventScript_165AF0, 0, 0, 0 - object_event 2, 95, 0, 11, 0, 24, 0, 3, 8, 17, 0, 0, 0, 0, 0, ViridianCity_EventScript_1BDF13, 17, 0, 0 - object_event 3, 32, 0, 34, 0, 11, 0, 3, 7, 0, 0, 0, 0, 0, 0, ViridianCity_EventScript_1659CA, 0, 0, 0 - object_event 4, 240, 0, 21, 0, 6, 0, 3, 1, 50, 0, 0, 0, 0, 0, ViridianCity_EventScript_1659F6, 0, 0, 0 - object_event 5, 31, 0, 20, 0, 12, 0, 3, 7, 49, 0, 0, 0, 0, 0, ViridianCity_EventScript_165AC4, 0, 0, 0 - object_event 6, 18, 0, 33, 0, 26, 0, 3, 3, 32, 0, 0, 0, 0, 0, ViridianCity_EventScript_165A8F, 0, 0, 0 - object_event 7, 19, 0, 16, 0, 22, 0, 3, 2, 33, 0, 0, 0, 0, 0, ViridianCity_EventScript_1659C1, 0, 0, 0 - object_event 8, 95, 0, 18, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, ViridianCity_EventScript_1BDF13, 18, 0, 0 - object_event 9, 92, 0, 17, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, ViridianCity_EventScript_1BEB8C, 461, 0, 0 - -ViridianCity_MapWarps: - warp_def 26, 26, 0, 1, 1284 - warp_def 25, 11, 3, 1, 1280 - warp_def 36, 10, 0, 1, 1281 - warp_def 25, 18, 0, 1, 1282 - warp_def 36, 19, 0, 1, 1283 - -ViridianCity_MapCoordEvents: - coord_event 22, 11, 3, 0, 16465, 0, 0, ViridianCity_EventScript_165AF6 - coord_event 36, 11, 3, 0, 16474, 0, 0, ViridianCity_EventScript_16596D - coord_event 20, 8, 3, 0, 16465, 1, 0, ViridianCity_EventScript_165B10 - coord_event 22, 8, 3, 0, 16465, 1, 0, ViridianCity_EventScript_165B2E - -ViridianCity_MapBGEvents: - bg_event 23, 1, 3, 0, 0, ViridianCity_EventScript_16599D - bg_event 32, 10, 0, 0, 0, ViridianCity_EventScript_1659AF - bg_event 20, 31, 0, 0, 0, ViridianCity_EventScript_1659A6 - bg_event 20, 16, 0, 0, 0, ViridianCity_EventScript_165994 - bg_event 36, 10, 0, 0, 0, ViridianCity_EventScript_1659B8 - -ViridianCity_MapEvents:: - map_events ViridianCity_EventObjects, ViridianCity_MapWarps, ViridianCity_MapCoordEvents, ViridianCity_MapBGEvents diff --git a/data/maps/ViridianCity/header.inc b/data/maps/ViridianCity/header.inc deleted file mode 100644 index 6c027f11f..000000000 --- a/data/maps/ViridianCity/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -ViridianCity:: @ 8350634 - .4byte ViridianCity_Layout @ 0x82DE3E4 - .4byte ViridianCity_MapEvents @ 0x83B4FE0 - .4byte ViridianCity_MapScripts @ 0x81658D3 - .4byte ViridianCity_MapConnections @ 0x8352798 - .2byte BGM_FRLG_VIRIDIAN_CITY - .2byte 79 - .byte 0x59, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/ViridianCity/map.json b/data/maps/ViridianCity/map.json new file mode 100644 index 000000000..5c15a8364 --- /dev/null +++ b/data/maps/ViridianCity/map.json @@ -0,0 +1,262 @@ +{ + "id": "MAP_VIRIDIAN_CITY", + "name": "ViridianCity", + "layout": "LAYOUT_VIRIDIAN_CITY", + "music": "BGM_FRLG_VIRIDIAN_CITY", + "region_map_section": "MAPSEC_VIRIDIAN_CITY", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_1", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_ROUTE2", + "offset": 12, + "direction": "up" + }, + { + "map": "MAP_ROUTE1", + "offset": 12, + "direction": "down" + }, + { + "map": "MAP_ROUTE22", + "offset": 10, + "direction": "left" + } + ], + "object_events": [ + { + "graphics_id": "27", + "x": 8, + "y": 26, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ViridianCity_EventScript_165AF0", + "flag": "0" + }, + { + "graphics_id": "95", + "x": 11, + "y": 24, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ViridianCity_EventScript_1BDF13", + "flag": "17" + }, + { + "graphics_id": "32", + "x": 34, + "y": 11, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ViridianCity_EventScript_1659CA", + "flag": "0" + }, + { + "graphics_id": "240", + "x": 21, + "y": 6, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 2, + "movement_range_y": 3, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ViridianCity_EventScript_1659F6", + "flag": "0" + }, + { + "graphics_id": "31", + "x": 20, + "y": 12, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 3, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ViridianCity_EventScript_165AC4", + "flag": "0" + }, + { + "graphics_id": "18", + "x": 33, + "y": 26, + "elevation": 3, + "movement_type": "3", + "movement_range_x": 0, + "movement_range_y": 2, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ViridianCity_EventScript_165A8F", + "flag": "0" + }, + { + "graphics_id": "19", + "x": 16, + "y": 22, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 2, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ViridianCity_EventScript_1659C1", + "flag": "0" + }, + { + "graphics_id": "95", + "x": 18, + "y": 5, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ViridianCity_EventScript_1BDF13", + "flag": "18" + }, + { + "graphics_id": "92", + "x": 17, + "y": 5, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ViridianCity_EventScript_1BEB8C", + "flag": "461" + } + ], + "warp_events": [ + { + "x": 26, + "y": 26, + "elevation": 0, + "dest_map": "MAP_VIRIDIAN_CITY_POKEMON_CENTER_1F", + "dest_warp_id": 1 + }, + { + "x": 25, + "y": 11, + "elevation": 3, + "dest_map": "MAP_VIRIDIAN_CITY_HOUSE1", + "dest_warp_id": 1 + }, + { + "x": 36, + "y": 10, + "elevation": 0, + "dest_map": "MAP_VIRIDIAN_CITY_GYM", + "dest_warp_id": 1 + }, + { + "x": 25, + "y": 18, + "elevation": 0, + "dest_map": "MAP_VIRIDIAN_CITY_HOUSE2", + "dest_warp_id": 1 + }, + { + "x": 36, + "y": 19, + "elevation": 0, + "dest_map": "MAP_VIRIDIAN_CITY_MART", + "dest_warp_id": 1 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 22, + "y": 11, + "elevation": 3, + "var": "VAR_0x4051", + "var_value": 0, + "script": "ViridianCity_EventScript_165AF6" + }, + { + "type": "trigger", + "x": 36, + "y": 11, + "elevation": 3, + "var": "VAR_0x405A", + "var_value": 0, + "script": "ViridianCity_EventScript_16596D" + }, + { + "type": "trigger", + "x": 20, + "y": 8, + "elevation": 3, + "var": "VAR_0x4051", + "var_value": 1, + "script": "ViridianCity_EventScript_165B10" + }, + { + "type": "trigger", + "x": 22, + "y": 8, + "elevation": 3, + "var": "VAR_0x4051", + "var_value": 1, + "script": "ViridianCity_EventScript_165B2E" + } + ], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 23, + "y": 1, + "elevation": 3, + "script": "ViridianCity_EventScript_16599D" + }, + { + "type": "bg_event_type_0", + "x": 32, + "y": 10, + "elevation": 0, + "script": "ViridianCity_EventScript_1659AF" + }, + { + "type": "bg_event_type_0", + "x": 20, + "y": 31, + "elevation": 0, + "script": "ViridianCity_EventScript_1659A6" + }, + { + "type": "bg_event_type_0", + "x": 20, + "y": 16, + "elevation": 0, + "script": "ViridianCity_EventScript_165994" + }, + { + "type": "bg_event_type_0", + "x": 36, + "y": 10, + "elevation": 0, + "script": "ViridianCity_EventScript_1659B8" + } + ] +}
\ No newline at end of file diff --git a/data/maps/ViridianCity_Gym/events.inc b/data/maps/ViridianCity_Gym/events.inc deleted file mode 100644 index b2469c9b7..000000000 --- a/data/maps/ViridianCity_Gym/events.inc +++ /dev/null @@ -1,24 +0,0 @@ -ViridianCity_Gym_EventObjects: - object_event 1, 54, 0, 10, 0, 2, 0, 3, 8, 17, 0, 1, 0, 3, 0, ViridianCity_Gym_EventScript_169FD6, 0, 0, 0 - object_event 2, 41, 0, 12, 0, 10, 0, 3, 8, 17, 0, 1, 0, 3, 0, ViridianCity_Gym_EventScript_16A004, 0, 0, 0 - object_event 3, 54, 0, 11, 0, 14, 0, 3, 7, 17, 0, 1, 0, 3, 0, ViridianCity_Gym_EventScript_169FA8, 0, 0, 0 - object_event 4, 25, 0, 10, 0, 10, 0, 3, 8, 17, 0, 1, 0, 3, 0, ViridianCity_Gym_EventScript_169F7A, 0, 0, 0 - object_event 5, 25, 0, 2, 0, 21, 0, 3, 10, 17, 0, 1, 0, 2, 0, ViridianCity_Gym_EventScript_169F91, 0, 0, 0 - object_event 6, 54, 0, 3, 0, 11, 0, 3, 9, 17, 0, 1, 0, 2, 0, ViridianCity_Gym_EventScript_169FBF, 0, 0, 0 - object_event 7, 41, 0, 6, 0, 8, 0, 3, 8, 17, 0, 1, 0, 3, 0, ViridianCity_Gym_EventScript_169FED, 0, 0, 0 - object_event 8, 87, 0, 2, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, ViridianCity_Gym_EventScript_169ECA, 85, 0, 0 - object_event 9, 41, 0, 13, 0, 7, 0, 3, 10, 17, 0, 1, 0, 3, 0, ViridianCity_Gym_EventScript_16A01B, 0, 0, 0 - object_event 10, 91, 0, 16, 0, 20, 0, 3, 8, 17, 0, 0, 0, 0, 0, ViridianCity_Gym_EventScript_16A032, 0, 0, 0 - -ViridianCity_Gym_MapWarps: - warp_def 16, 22, 3, 2, 769 - warp_def 17, 22, 3, 2, 769 - warp_def 18, 22, 3, 2, 769 - -ViridianCity_Gym_MapBGEvents: - bg_event 15, 20, 0, 0, 0, ViridianCity_Gym_EventScript_16A05E - bg_event 19, 20, 0, 0, 0, ViridianCity_Gym_EventScript_16A05E - bg_event 2, 2, 3, 7, 0, 181, 189, 129 - -ViridianCity_Gym_MapEvents:: - map_events ViridianCity_Gym_EventObjects, ViridianCity_Gym_MapWarps, 0x0, ViridianCity_Gym_MapBGEvents diff --git a/data/maps/ViridianCity_Gym/header.inc b/data/maps/ViridianCity_Gym/header.inc deleted file mode 100644 index 5edc31d15..000000000 --- a/data/maps/ViridianCity_Gym/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -ViridianCity_Gym:: @ 8350DDC - .4byte ViridianCity_Gym_Layout @ 0x82D86AC - .4byte ViridianCity_Gym_MapEvents @ 0x83B9B78 - .4byte ViridianCity_Gym_MapScripts @ 0x8169EC9 - .4byte NULL - .2byte BGM_FRLG_GYM - .2byte 37 - .byte 0x59, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x01 diff --git a/data/maps/ViridianCity_Gym/map.json b/data/maps/ViridianCity_Gym/map.json new file mode 100644 index 000000000..accf4290d --- /dev/null +++ b/data/maps/ViridianCity_Gym/map.json @@ -0,0 +1,196 @@ +{ + "id": "MAP_VIRIDIAN_CITY_GYM", + "name": "ViridianCity_Gym", + "layout": "LAYOUT_VIRIDIAN_CITY_GYM", + "music": "BGM_FRLG_GYM", + "region_map_section": "MAPSEC_VIRIDIAN_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_1", + "connections": null, + "object_events": [ + { + "graphics_id": "54", + "x": 10, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "ViridianCity_Gym_EventScript_169FD6", + "flag": "0" + }, + { + "graphics_id": "41", + "x": 12, + "y": 10, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "ViridianCity_Gym_EventScript_16A004", + "flag": "0" + }, + { + "graphics_id": "54", + "x": 11, + "y": 14, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "ViridianCity_Gym_EventScript_169FA8", + "flag": "0" + }, + { + "graphics_id": "25", + "x": 10, + "y": 10, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "ViridianCity_Gym_EventScript_169F7A", + "flag": "0" + }, + { + "graphics_id": "25", + "x": 2, + "y": 21, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "ViridianCity_Gym_EventScript_169F91", + "flag": "0" + }, + { + "graphics_id": "54", + "x": 3, + "y": 11, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "ViridianCity_Gym_EventScript_169FBF", + "flag": "0" + }, + { + "graphics_id": "41", + "x": 6, + "y": 8, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "ViridianCity_Gym_EventScript_169FED", + "flag": "0" + }, + { + "graphics_id": "87", + "x": 2, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ViridianCity_Gym_EventScript_169ECA", + "flag": "85" + }, + { + "graphics_id": "41", + "x": 13, + "y": 7, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "ViridianCity_Gym_EventScript_16A01B", + "flag": "0" + }, + { + "graphics_id": "91", + "x": 16, + "y": 20, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ViridianCity_Gym_EventScript_16A032", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 16, + "y": 22, + "elevation": 3, + "dest_map": "MAP_VIRIDIAN_CITY", + "dest_warp_id": 2 + }, + { + "x": 17, + "y": 22, + "elevation": 3, + "dest_map": "MAP_VIRIDIAN_CITY", + "dest_warp_id": 2 + }, + { + "x": 18, + "y": 22, + "elevation": 3, + "dest_map": "MAP_VIRIDIAN_CITY", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 15, + "y": 20, + "elevation": 0, + "script": "ViridianCity_Gym_EventScript_16A05E" + }, + { + "type": "bg_event_type_0", + "x": 19, + "y": 20, + "elevation": 0, + "script": "ViridianCity_Gym_EventScript_16A05E" + }, + { + "type": "hidden_item", + "x": 2, + "y": 2, + "elevation": 3, + "item": "ITEM_MACHO_BRACE", + "flag": "189", + "unknown": 129 + } + ] +}
\ No newline at end of file diff --git a/data/maps/ViridianCity_House1/events.inc b/data/maps/ViridianCity_House1/events.inc deleted file mode 100644 index 138574c82..000000000 --- a/data/maps/ViridianCity_House1/events.inc +++ /dev/null @@ -1,15 +0,0 @@ -ViridianCity_House1_EventObjects: - object_event 1, 30, 0, 7, 0, 4, 0, 3, 9, 17, 0, 0, 0, 0, 0, ViridianCity_House1_EventScript_169E9B, 0, 0, 0 - object_event 2, 17, 0, 2, 0, 5, 0, 3, 3, 33, 0, 0, 0, 0, 0, ViridianCity_House1_EventScript_169EA4, 0, 0, 0 - object_event 3, 110, 0, 6, 0, 6, 0, 3, 5, 20, 0, 0, 0, 0, 0, ViridianCity_House1_EventScript_169EAD, 0, 0, 0 - -ViridianCity_House1_MapWarps: - warp_def 3, 7, 0, 1, 769 - warp_def 4, 7, 0, 1, 769 - warp_def 5, 7, 3, 1, 769 - -ViridianCity_House1_MapBGEvents: - bg_event 7, 1, 0, 0, 0, ViridianCity_House1_EventScript_169EC0 - -ViridianCity_House1_MapEvents:: - map_events ViridianCity_House1_EventObjects, ViridianCity_House1_MapWarps, 0x0, ViridianCity_House1_MapBGEvents diff --git a/data/maps/ViridianCity_House1/header.inc b/data/maps/ViridianCity_House1/header.inc deleted file mode 100644 index e29f218c9..000000000 --- a/data/maps/ViridianCity_House1/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -ViridianCity_House1:: @ 8350DC0 - .4byte ViridianCity_House1_Layout @ 0x833AEAC - .4byte ViridianCity_House1_MapEvents @ 0x83B9A38 - .4byte ViridianCity_House1_MapScripts @ 0x8169E9A - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_CITY - .2byte 276 - .byte 0x59, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/ViridianCity_House1/map.json b/data/maps/ViridianCity_House1/map.json new file mode 100644 index 000000000..bbb006933 --- /dev/null +++ b/data/maps/ViridianCity_House1/map.json @@ -0,0 +1,89 @@ +{ + "id": "MAP_VIRIDIAN_CITY_HOUSE1", + "name": "ViridianCity_House1", + "layout": "LAYOUT_VIRIDIAN_CITY_HOUSE1", + "music": "BGM_FRLG_VIRIDIAN_CITY", + "region_map_section": "MAPSEC_VIRIDIAN_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "30", + "x": 7, + "y": 4, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ViridianCity_House1_EventScript_169E9B", + "flag": "0" + }, + { + "graphics_id": "17", + "x": 2, + "y": 5, + "elevation": 3, + "movement_type": "3", + "movement_range_x": 1, + "movement_range_y": 2, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ViridianCity_House1_EventScript_169EA4", + "flag": "0" + }, + { + "graphics_id": "110", + "x": 6, + "y": 6, + "elevation": 3, + "movement_type": "5", + "movement_range_x": 4, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ViridianCity_House1_EventScript_169EAD", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 0, + "dest_map": "MAP_VIRIDIAN_CITY", + "dest_warp_id": 1 + }, + { + "x": 4, + "y": 7, + "elevation": 0, + "dest_map": "MAP_VIRIDIAN_CITY", + "dest_warp_id": 1 + }, + { + "x": 5, + "y": 7, + "elevation": 3, + "dest_map": "MAP_VIRIDIAN_CITY", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 7, + "y": 1, + "elevation": 0, + "script": "ViridianCity_House1_EventScript_169EC0" + } + ] +}
\ No newline at end of file diff --git a/data/maps/ViridianCity_House2/events.inc b/data/maps/ViridianCity_House2/events.inc deleted file mode 100644 index 4d2ac979a..000000000 --- a/data/maps/ViridianCity_House2/events.inc +++ /dev/null @@ -1,18 +0,0 @@ -ViridianCity_House2_EventObjects: - object_event 1, 28, 0, 6, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, ViridianCity_House2_EventScript_16A094, 0, 0, 0 - object_event 2, 22, 0, 4, 0, 5, 0, 3, 7, 17, 0, 0, 0, 0, 0, ViridianCity_House2_EventScript_16A07D, 0, 0, 0 - -ViridianCity_House2_MapWarps: - warp_def 3, 7, 0, 3, 769 - warp_def 4, 7, 0, 3, 769 - warp_def 5, 7, 3, 3, 769 - -ViridianCity_House2_MapBGEvents: - bg_event 4, 4, 0, 0, 0, ViridianCity_House2_EventScript_16A0AB - bg_event 5, 1, 0, 0, 0, ViridianCity_House2_EventScript_16A11D - bg_event 4, 1, 0, 0, 0, ViridianCity_House2_EventScript_16A11D - bg_event 9, 2, 0, 1, 0, ViridianCity_House2_EventScript_1ACD65 - bg_event 8, 2, 0, 1, 0, ViridianCity_House2_EventScript_1ACD65 - -ViridianCity_House2_MapEvents:: - map_events ViridianCity_House2_EventObjects, ViridianCity_House2_MapWarps, 0x0, ViridianCity_House2_MapBGEvents diff --git a/data/maps/ViridianCity_House2/header.inc b/data/maps/ViridianCity_House2/header.inc deleted file mode 100644 index c45bfff14..000000000 --- a/data/maps/ViridianCity_House2/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -ViridianCity_House2:: @ 8350DF8 - .4byte ViridianCity_House2_Layout @ 0x8338D20 - .4byte ViridianCity_House2_MapEvents @ 0x83B9C10 - .4byte ViridianCity_House2_MapScripts @ 0x816A07C - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_CITY - .2byte 266 - .byte 0x59, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/ViridianCity_House2/map.json b/data/maps/ViridianCity_House2/map.json new file mode 100644 index 000000000..021a26f6a --- /dev/null +++ b/data/maps/ViridianCity_House2/map.json @@ -0,0 +1,104 @@ +{ + "id": "MAP_VIRIDIAN_CITY_HOUSE2", + "name": "ViridianCity_House2", + "layout": "LAYOUT_VIRIDIAN_CITY_HOUSE2", + "music": "BGM_FRLG_VIRIDIAN_CITY", + "region_map_section": "MAPSEC_VIRIDIAN_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "28", + "x": 6, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ViridianCity_House2_EventScript_16A094", + "flag": "0" + }, + { + "graphics_id": "22", + "x": 4, + "y": 5, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ViridianCity_House2_EventScript_16A07D", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 0, + "dest_map": "MAP_VIRIDIAN_CITY", + "dest_warp_id": 3 + }, + { + "x": 4, + "y": 7, + "elevation": 0, + "dest_map": "MAP_VIRIDIAN_CITY", + "dest_warp_id": 3 + }, + { + "x": 5, + "y": 7, + "elevation": 3, + "dest_map": "MAP_VIRIDIAN_CITY", + "dest_warp_id": 3 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 4, + "y": 4, + "elevation": 0, + "script": "ViridianCity_House2_EventScript_16A0AB" + }, + { + "type": "bg_event_type_0", + "x": 5, + "y": 1, + "elevation": 0, + "script": "ViridianCity_House2_EventScript_16A11D" + }, + { + "type": "bg_event_type_0", + "x": 4, + "y": 1, + "elevation": 0, + "script": "ViridianCity_House2_EventScript_16A11D" + }, + { + "type": "bg_event_type_1", + "x": 9, + "y": 2, + "elevation": 0, + "script": "ViridianCity_House2_EventScript_1ACD65" + }, + { + "type": "bg_event_type_1", + "x": 8, + "y": 2, + "elevation": 0, + "script": "ViridianCity_House2_EventScript_1ACD65" + } + ] +}
\ No newline at end of file diff --git a/data/maps/ViridianCity_Mart/events.inc b/data/maps/ViridianCity_Mart/events.inc deleted file mode 100644 index 5900a7f39..000000000 --- a/data/maps/ViridianCity_Mart/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -ViridianCity_Mart_EventObjects: - object_event 1, 68, 0, 2, 0, 3, 0, 0, 10, 17, 0, 0, 0, 0, 0, ViridianCity_Mart_EventScript_16A268, 0, 0, 0 - object_event 2, 18, 0, 6, 0, 2, 0, 3, 2, 17, 0, 0, 0, 0, 0, ViridianCity_Mart_EventScript_16A2B7, 0, 0, 0 - object_event 3, 23, 0, 9, 0, 5, 0, 3, 3, 17, 0, 0, 0, 0, 0, ViridianCity_Mart_EventScript_16A2AE, 0, 0, 0 - -ViridianCity_Mart_MapWarps: - warp_def 3, 7, 3, 4, 769 - warp_def 4, 7, 3, 4, 769 - warp_def 5, 7, 3, 4, 769 - -ViridianCity_Mart_MapEvents:: - map_events ViridianCity_Mart_EventObjects, ViridianCity_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/ViridianCity_Mart/header.inc b/data/maps/ViridianCity_Mart/header.inc deleted file mode 100644 index 29cfbf0d0..000000000 --- a/data/maps/ViridianCity_Mart/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -ViridianCity_Mart:: @ 8350E14 - .4byte Mart_Layout @ 0x82D5BCC - .4byte ViridianCity_Mart_MapEvents @ 0x83B9C84 - .4byte ViridianCity_Mart_MapScripts @ 0x816A1D3 - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 10 - .byte 0x59, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/ViridianCity_Mart/map.json b/data/maps/ViridianCity_Mart/map.json new file mode 100644 index 000000000..3b0216fde --- /dev/null +++ b/data/maps/ViridianCity_Mart/map.json @@ -0,0 +1,81 @@ +{ + "id": "MAP_VIRIDIAN_CITY_MART", + "name": "ViridianCity_Mart", + "layout": "LAYOUT_MART", + "music": "BGM_FRLG_POKEMON_CENTER", + "region_map_section": "MAPSEC_VIRIDIAN_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "68", + "x": 2, + "y": 3, + "elevation": 0, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ViridianCity_Mart_EventScript_16A268", + "flag": "0" + }, + { + "graphics_id": "18", + "x": 6, + "y": 2, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ViridianCity_Mart_EventScript_16A2B7", + "flag": "0" + }, + { + "graphics_id": "23", + "x": 9, + "y": 5, + "elevation": 3, + "movement_type": "3", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ViridianCity_Mart_EventScript_16A2AE", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 3, + "dest_map": "MAP_VIRIDIAN_CITY", + "dest_warp_id": 4 + }, + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_VIRIDIAN_CITY", + "dest_warp_id": 4 + }, + { + "x": 5, + "y": 7, + "elevation": 3, + "dest_map": "MAP_VIRIDIAN_CITY", + "dest_warp_id": 4 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/ViridianCity_PokemonCenter_1F/events.inc b/data/maps/ViridianCity_PokemonCenter_1F/events.inc deleted file mode 100644 index 1e2b40a28..000000000 --- a/data/maps/ViridianCity_PokemonCenter_1F/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -ViridianCity_PokemonCenter_1F_EventObjects: - object_event 1, 64, 0, 7, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, ViridianCity_PokemonCenter_1F_EventScript_16A2CF, 0, 0, 0 - object_event 2, 61, 0, 12, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, ViridianCity_PokemonCenter_1F_EventScript_16A2E1, 0, 0, 0 - object_event 3, 19, 0, 4, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, ViridianCity_PokemonCenter_1F_EventScript_16A2D8, 0, 0, 0 - object_event 4, 18, 0, 2, 0, 3, 0, 3, 2, 17, 0, 0, 0, 0, 0, ViridianCity_PokemonCenter_1F_EventScript_16A2EA, 0, 0, 0 - -ViridianCity_PokemonCenter_1F_MapWarps: - warp_def 6, 8, 3, 0, 769 - warp_def 7, 8, 3, 0, 769 - warp_def 8, 8, 3, 0, 769 - warp_def 1, 6, 4, 0, 1285 - -ViridianCity_PokemonCenter_1F_MapEvents:: - map_events ViridianCity_PokemonCenter_1F_EventObjects, ViridianCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/ViridianCity_PokemonCenter_1F/header.inc b/data/maps/ViridianCity_PokemonCenter_1F/header.inc deleted file mode 100644 index 6e26020eb..000000000 --- a/data/maps/ViridianCity_PokemonCenter_1F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -ViridianCity_PokemonCenter_1F:: @ 8350E30 - .4byte PokemonCenter_1F_Layout @ 0x82D5990 - .4byte ViridianCity_PokemonCenter_1F_MapEvents @ 0x83B9D18 - .4byte ViridianCity_PokemonCenter_1F_MapScripts @ 0x816A2C0 - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 8 - .byte 0x59, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/ViridianCity_PokemonCenter_1F/map.json b/data/maps/ViridianCity_PokemonCenter_1F/map.json new file mode 100644 index 000000000..bed78482f --- /dev/null +++ b/data/maps/ViridianCity_PokemonCenter_1F/map.json @@ -0,0 +1,101 @@ +{ + "id": "MAP_VIRIDIAN_CITY_POKEMON_CENTER_1F", + "name": "ViridianCity_PokemonCenter_1F", + "layout": "LAYOUT_POKEMON_CENTER_1F", + "music": "BGM_FRLG_POKEMON_CENTER", + "region_map_section": "MAPSEC_VIRIDIAN_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "64", + "x": 7, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ViridianCity_PokemonCenter_1F_EventScript_16A2CF", + "flag": "0" + }, + { + "graphics_id": "61", + "x": 12, + "y": 5, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ViridianCity_PokemonCenter_1F_EventScript_16A2E1", + "flag": "0" + }, + { + "graphics_id": "19", + "x": 4, + "y": 7, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ViridianCity_PokemonCenter_1F_EventScript_16A2D8", + "flag": "0" + }, + { + "graphics_id": "18", + "x": 2, + "y": 3, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ViridianCity_PokemonCenter_1F_EventScript_16A2EA", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 6, + "y": 8, + "elevation": 3, + "dest_map": "MAP_VIRIDIAN_CITY", + "dest_warp_id": 0 + }, + { + "x": 7, + "y": 8, + "elevation": 3, + "dest_map": "MAP_VIRIDIAN_CITY", + "dest_warp_id": 0 + }, + { + "x": 8, + "y": 8, + "elevation": 3, + "dest_map": "MAP_VIRIDIAN_CITY", + "dest_warp_id": 0 + }, + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_VIRIDIAN_CITY_POKEMON_CENTER_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/ViridianCity_PokemonCenter_2F/events.inc b/data/maps/ViridianCity_PokemonCenter_2F/events.inc deleted file mode 100644 index d30b58656..000000000 --- a/data/maps/ViridianCity_PokemonCenter_2F/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -ViridianCity_PokemonCenter_2F_EventObjects: - object_event 1, 65, 0, 6, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, ViridianCity_PokemonCenter_2F_EventScript_1A8CF6, 0, 0, 0 - object_event 2, 65, 0, 2, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, ViridianCity_PokemonCenter_2F_EventScript_1A8CFC, 0, 0, 0 - object_event 3, 65, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, ViridianCity_PokemonCenter_2F_EventScript_1A8D02, 0, 0, 0 - object_event 4, 69, 0, 1, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, ViridianCity_PokemonCenter_2F_EventScript_1BB1D2, 112, 0, 0 - -ViridianCity_PokemonCenter_2F_MapWarps: - warp_def 1, 6, 4, 3, 1284 - warp_def 5, 1, 0, 0, 4 - warp_def 9, 1, 0, 0, 1 - -ViridianCity_PokemonCenter_2F_MapEvents:: - map_events ViridianCity_PokemonCenter_2F_EventObjects, ViridianCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/ViridianCity_PokemonCenter_2F/header.inc b/data/maps/ViridianCity_PokemonCenter_2F/header.inc deleted file mode 100644 index 0b1cdbcf7..000000000 --- a/data/maps/ViridianCity_PokemonCenter_2F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -ViridianCity_PokemonCenter_2F:: @ 8350E4C - .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 - .4byte ViridianCity_PokemonCenter_2F_MapEvents @ 0x83B9DA4 - .4byte ViridianCity_PokemonCenter_2F_MapScripts @ 0x816A2F3 - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 9 - .byte 0x59, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/ViridianCity_PokemonCenter_2F/map.json b/data/maps/ViridianCity_PokemonCenter_2F/map.json new file mode 100644 index 000000000..20f2abea7 --- /dev/null +++ b/data/maps/ViridianCity_PokemonCenter_2F/map.json @@ -0,0 +1,94 @@ +{ + "id": "MAP_VIRIDIAN_CITY_POKEMON_CENTER_2F", + "name": "ViridianCity_PokemonCenter_2F", + "layout": "LAYOUT_POKEMON_CENTER_2F", + "music": "BGM_FRLG_POKEMON_CENTER", + "region_map_section": "MAPSEC_VIRIDIAN_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "65", + "x": 6, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ViridianCity_PokemonCenter_2F_EventScript_1A8CF6", + "flag": "0" + }, + { + "graphics_id": "65", + "x": 2, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ViridianCity_PokemonCenter_2F_EventScript_1A8CFC", + "flag": "0" + }, + { + "graphics_id": "65", + "x": 10, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ViridianCity_PokemonCenter_2F_EventScript_1A8D02", + "flag": "0" + }, + { + "graphics_id": "69", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ViridianCity_PokemonCenter_2F_EventScript_1BB1D2", + "flag": "112" + } + ], + "warp_events": [ + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_VIRIDIAN_CITY_POKEMON_CENTER_1F", + "dest_warp_id": 3 + }, + { + "x": 5, + "y": 1, + "elevation": 0, + "dest_map": "MAP_UNKNOWN_MAP_00_04", + "dest_warp_id": 0 + }, + { + "x": 9, + "y": 1, + "elevation": 0, + "dest_map": "MAP_UNKNOWN_MAP_00_01", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/ViridianForest/events.inc b/data/maps/ViridianForest/events.inc deleted file mode 100644 index f0f5b8855..000000000 --- a/data/maps/ViridianForest/events.inc +++ /dev/null @@ -1,33 +0,0 @@ -ViridianForest_EventObjects: - object_event 1, 18, 0, 29, 0, 58, 0, 3, 7, 17, 0, 0, 0, 0, 0, ViridianForest_EventScript_160529, 0, 0, 0 - object_event 2, 19, 0, 45, 0, 58, 0, 3, 9, 17, 0, 0, 0, 0, 0, ViridianForest_EventScript_160532, 0, 0, 0 - object_event 3, 20, 0, 47, 0, 45, 0, 3, 9, 17, 0, 1, 0, 5, 0, ViridianForest_EventScript_160571, 0, 0, 0 - object_event 4, 20, 0, 47, 0, 29, 0, 3, 9, 17, 0, 1, 0, 4, 0, ViridianForest_EventScript_160588, 0, 0, 0 - object_event 5, 20, 0, 7, 0, 22, 0, 3, 9, 17, 0, 1, 0, 4, 0, ViridianForest_EventScript_16059F, 0, 0, 0 - object_event 6, 92, 0, 5, 0, 41, 0, 3, 8, 17, 0, 0, 0, 0, 0, ViridianForest_EventScript_1BE5A8, 342, 0, 0 - object_event 7, 92, 0, 40, 0, 21, 0, 3, 8, 17, 0, 0, 0, 0, 0, ViridianForest_EventScript_1BE5B5, 343, 0, 0 - object_event 8, 92, 0, 21, 0, 34, 0, 3, 8, 17, 0, 0, 0, 0, 0, ViridianForest_EventScript_1BE5C2, 344, 0, 0 - object_event 9, 20, 0, 43, 0, 6, 0, 3, 13, 17, 0, 1, 0, 1, 0, ViridianForest_EventScript_1605B6, 0, 0, 0 - object_event 10, 20, 0, 16, 0, 5, 0, 3, 7, 17, 0, 1, 0, 1, 0, ViridianForest_EventScript_1605CD, 0, 0, 0 - object_event 11, 92, 0, 49, 0, 60, 0, 3, 8, 17, 0, 0, 0, 0, 0, ViridianForest_EventScript_1BEAC9, 446, 0, 0 - -ViridianForest_MapWarps: - warp_def 29, 62, 3, 3, 3840 - warp_def 28, 62, 3, 3, 3840 - warp_def 5, 9, 3, 1, 3843 - warp_def 6, 9, 3, 1, 3843 - warp_def 30, 62, 3, 3, 3840 - warp_def 4, 9, 3, 1, 3843 - -ViridianForest_MapBGEvents: - bg_event 39, 59, 3, 0, 0, ViridianForest_EventScript_16053B - bg_event 43, 26, 0, 0, 0, ViridianForest_EventScript_16054D - bg_event 9, 29, 0, 0, 0, ViridianForest_EventScript_160556 - bg_event 6, 12, 0, 0, 0, ViridianForest_EventScript_160568 - bg_event 28, 44, 0, 0, 0, ViridianForest_EventScript_160544 - bg_event 31, 60, 0, 0, 0, ViridianForest_EventScript_16055F - bg_event 3, 22, 3, 7, 0, 13, 0, 1 - bg_event 28, 57, 0, 7, 0, 14, 1, 1 - -ViridianForest_MapEvents:: - map_events ViridianForest_EventObjects, ViridianForest_MapWarps, 0x0, ViridianForest_MapBGEvents diff --git a/data/maps/ViridianForest/header.inc b/data/maps/ViridianForest/header.inc deleted file mode 100644 index db9e41ad1..000000000 --- a/data/maps/ViridianForest/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -ViridianForest:: @ 834F214 - .4byte ViridianForest_Layout @ 0x82FE46C - .4byte ViridianForest_MapEvents @ 0x83AE4D8 - .4byte ViridianForest_MapScripts @ 0x816051F - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_FOREST - .2byte 117 - .byte 0x7e, 0x00, 0x0b, 0x03, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/ViridianForest/map.json b/data/maps/ViridianForest/map.json new file mode 100644 index 000000000..5034e3afa --- /dev/null +++ b/data/maps/ViridianForest/map.json @@ -0,0 +1,267 @@ +{ + "id": "MAP_VIRIDIAN_FOREST", + "name": "ViridianForest", + "layout": "LAYOUT_VIRIDIAN_FOREST", + "music": "BGM_FRLG_VIRIDIAN_FOREST", + "region_map_section": "MAPSEC_VIRIDIAN_FOREST", + "requires_flash": false, + "weather": "WEATHER_11", + "map_type": "MAP_TYPE_3", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "18", + "x": 29, + "y": 58, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ViridianForest_EventScript_160529", + "flag": "0" + }, + { + "graphics_id": "19", + "x": 45, + "y": 58, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ViridianForest_EventScript_160532", + "flag": "0" + }, + { + "graphics_id": "20", + "x": 47, + "y": 45, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "ViridianForest_EventScript_160571", + "flag": "0" + }, + { + "graphics_id": "20", + "x": 47, + "y": 29, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "ViridianForest_EventScript_160588", + "flag": "0" + }, + { + "graphics_id": "20", + "x": 7, + "y": 22, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "ViridianForest_EventScript_16059F", + "flag": "0" + }, + { + "graphics_id": "92", + "x": 5, + "y": 41, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ViridianForest_EventScript_1BE5A8", + "flag": "342" + }, + { + "graphics_id": "92", + "x": 40, + "y": 21, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ViridianForest_EventScript_1BE5B5", + "flag": "343" + }, + { + "graphics_id": "92", + "x": 21, + "y": 34, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ViridianForest_EventScript_1BE5C2", + "flag": "344" + }, + { + "graphics_id": "20", + "x": 43, + "y": 6, + "elevation": 3, + "movement_type": "13", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "ViridianForest_EventScript_1605B6", + "flag": "0" + }, + { + "graphics_id": "20", + "x": 16, + "y": 5, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "ViridianForest_EventScript_1605CD", + "flag": "0" + }, + { + "graphics_id": "92", + "x": 49, + "y": 60, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ViridianForest_EventScript_1BEAC9", + "flag": "446" + } + ], + "warp_events": [ + { + "x": 29, + "y": 62, + "elevation": 3, + "dest_map": "MAP_ROUTE2_VIRIDIAN_FOREST_SOUTH_ENTRANCE", + "dest_warp_id": 3 + }, + { + "x": 28, + "y": 62, + "elevation": 3, + "dest_map": "MAP_ROUTE2_VIRIDIAN_FOREST_SOUTH_ENTRANCE", + "dest_warp_id": 3 + }, + { + "x": 5, + "y": 9, + "elevation": 3, + "dest_map": "MAP_ROUTE2_VIRIDIAN_FOREST_NORTH_ENTRANCE", + "dest_warp_id": 1 + }, + { + "x": 6, + "y": 9, + "elevation": 3, + "dest_map": "MAP_ROUTE2_VIRIDIAN_FOREST_NORTH_ENTRANCE", + "dest_warp_id": 1 + }, + { + "x": 30, + "y": 62, + "elevation": 3, + "dest_map": "MAP_ROUTE2_VIRIDIAN_FOREST_SOUTH_ENTRANCE", + "dest_warp_id": 3 + }, + { + "x": 4, + "y": 9, + "elevation": 3, + "dest_map": "MAP_ROUTE2_VIRIDIAN_FOREST_NORTH_ENTRANCE", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 39, + "y": 59, + "elevation": 3, + "script": "ViridianForest_EventScript_16053B" + }, + { + "type": "bg_event_type_0", + "x": 43, + "y": 26, + "elevation": 0, + "script": "ViridianForest_EventScript_16054D" + }, + { + "type": "bg_event_type_0", + "x": 9, + "y": 29, + "elevation": 0, + "script": "ViridianForest_EventScript_160556" + }, + { + "type": "bg_event_type_0", + "x": 6, + "y": 12, + "elevation": 0, + "script": "ViridianForest_EventScript_160568" + }, + { + "type": "bg_event_type_0", + "x": 28, + "y": 44, + "elevation": 0, + "script": "ViridianForest_EventScript_160544" + }, + { + "type": "bg_event_type_0", + "x": 31, + "y": 60, + "elevation": 0, + "script": "ViridianForest_EventScript_16055F" + }, + { + "type": "hidden_item", + "x": 3, + "y": 22, + "elevation": 3, + "item": "ITEM_POTION", + "flag": "0", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 28, + "y": 57, + "elevation": 0, + "item": "ITEM_ANTIDOTE", + "flag": "1", + "unknown": 1 + } + ] +}
\ No newline at end of file diff --git a/data/maps/connections.inc b/data/maps/connections.inc deleted file mode 100644 index ac4608002..000000000 --- a/data/maps/connections.inc +++ /dev/null @@ -1,63 +0,0 @@ - .include "data/maps/PalletTown/connections.inc" - .include "data/maps/ViridianCity/connections.inc" - .include "data/maps/PewterCity/connections.inc" - .include "data/maps/CeruleanCity/connections.inc" - .include "data/maps/LavenderTown/connections.inc" - .include "data/maps/VermilionCity/connections.inc" - .include "data/maps/CeladonCity/connections.inc" - .include "data/maps/FuchsiaCity/connections.inc" - .include "data/maps/CinnabarIsland/connections.inc" - .include "data/maps/IndigoPlateau_Exterior/connections.inc" - .include "data/maps/SaffronCity_Duplicate/connections.inc" - .include "data/maps/SaffronCity/connections.inc" - .include "data/maps/OneIsland/connections.inc" - .include "data/maps/TwoIsland/connections.inc" - .include "data/maps/ThreeIsland/connections.inc" - .include "data/maps/FiveIsland/connections.inc" - .include "data/maps/SevenIsland/connections.inc" - .include "data/maps/SixIsland/connections.inc" - .include "data/maps/Route1/connections.inc" - .include "data/maps/Route2/connections.inc" - .include "data/maps/Route3/connections.inc" - .include "data/maps/Route4/connections.inc" - .include "data/maps/Route5/connections.inc" - .include "data/maps/Route6/connections.inc" - .include "data/maps/Route7/connections.inc" - .include "data/maps/Route8/connections.inc" - .include "data/maps/Route9/connections.inc" - .include "data/maps/Route10/connections.inc" - .include "data/maps/Route11/connections.inc" - .include "data/maps/Route12/connections.inc" - .include "data/maps/Route13/connections.inc" - .include "data/maps/Route14/connections.inc" - .include "data/maps/Route15/connections.inc" - .include "data/maps/Route16/connections.inc" - .include "data/maps/Route17/connections.inc" - .include "data/maps/Route18/connections.inc" - .include "data/maps/Route19/connections.inc" - .include "data/maps/Route20/connections.inc" - .include "data/maps/Route21_North/connections.inc" - .include "data/maps/Route21_South/connections.inc" - .include "data/maps/Route22/connections.inc" - .include "data/maps/Route23/connections.inc" - .include "data/maps/Route24/connections.inc" - .include "data/maps/Route25/connections.inc" - .include "data/maps/OneIsland_KindleRoad/connections.inc" - .include "data/maps/OneIsland_TreasureBeach/connections.inc" - .include "data/maps/TwoIsland_CapeBrink/connections.inc" - .include "data/maps/ThreeIsland_BondBridge/connections.inc" - .include "data/maps/ThreeIsland_Port/connections.inc" - .include "data/maps/UnknownMap_03_50/connections.inc" - .include "data/maps/UnknownMap_03_51/connections.inc" - .include "data/maps/FiveIsland_ResortGorgeous/connections.inc" - .include "data/maps/FiveIsland_WaterLabyrinth/connections.inc" - .include "data/maps/FiveIsland_Meadow/connections.inc" - .include "data/maps/FiveIsland_MemorialPillar/connections.inc" - .include "data/maps/SixIsland_OutcastIsland/connections.inc" - .include "data/maps/SixIsland_GreenPath/connections.inc" - .include "data/maps/SixIsland_WaterPath/connections.inc" - .include "data/maps/SixIsland_RuinValley/connections.inc" - .include "data/maps/SevenIsland_TrainerTower/connections.inc" - .include "data/maps/SevenIsland_SevaultCanyon_Entrance/connections.inc" - .include "data/maps/SevenIsland_SevaultCanyon/connections.inc" - .include "data/maps/SevenIsland_TanobyRuins/connections.inc" diff --git a/data/maps/events.inc b/data/maps/events.inc deleted file mode 100644 index 56619a28f..000000000 --- a/data/maps/events.inc +++ /dev/null @@ -1,425 +0,0 @@ - .include "data/maps/UnknownMap_00_00/events.inc" - .include "data/maps/UnknownMap_00_01/events.inc" - .include "data/maps/UnknownMap_00_02/events.inc" - .include "data/maps/UnknownMap_00_03/events.inc" - .include "data/maps/UnknownMap_00_04/events.inc" - .include "data/maps/ViridianForest/events.inc" - .include "data/maps/MtMoon_1F/events.inc" - .include "data/maps/MtMoon_B1F/events.inc" - .include "data/maps/MtMoon_B2F/events.inc" - .include "data/maps/SSAnne_Exterior/events.inc" - .include "data/maps/SSAnne_1F_Corridor/events.inc" - .include "data/maps/SSAnne_2F_Corridor/events.inc" - .include "data/maps/SSAnne_3F_Corridor/events.inc" - .include "data/maps/SSAnne_B1F_Corridor/events.inc" - .include "data/maps/SSAnne_Deck/events.inc" - .include "data/maps/SSAnne_Kitchen/events.inc" - .include "data/maps/SSAnne_CaptainsOffice/events.inc" - .include "data/maps/SSAnne_1F_Room1/events.inc" - .include "data/maps/SSAnne_1F_Room2/events.inc" - .include "data/maps/SSAnne_1F_Room3/events.inc" - .include "data/maps/SSAnne_1F_Room4/events.inc" - .include "data/maps/SSAnne_1F_Room5/events.inc" - .include "data/maps/SSAnne_1F_Room7/events.inc" - .include "data/maps/SSAnne_2F_Room1/events.inc" - .include "data/maps/SSAnne_2F_Room2/events.inc" - .include "data/maps/SSAnne_2F_Room3/events.inc" - .include "data/maps/SSAnne_2F_Room4/events.inc" - .include "data/maps/SSAnne_2F_Room5/events.inc" - .include "data/maps/SSAnne_2F_Room6/events.inc" - .include "data/maps/SSAnne_B1F_Room1/events.inc" - .include "data/maps/SSAnne_B1F_Room2/events.inc" - .include "data/maps/SSAnne_B1F_Room3/events.inc" - .include "data/maps/SSAnne_B1F_Room4/events.inc" - .include "data/maps/SSAnne_B1F_Room5/events.inc" - .include "data/maps/SSAnne_1F_Room6/events.inc" - .include "data/maps/UndergroundPath_NorthEntrance/events.inc" - .include "data/maps/UndergroundPath_NorthSouthTunnel/events.inc" - .include "data/maps/UndergroundPath_SouthEntrance/events.inc" - .include "data/maps/UndergroundPath_WestEntrance/events.inc" - .include "data/maps/UndergroundPath_EastWestTunnel/events.inc" - .include "data/maps/UndergroundPath_EastEntrance/events.inc" - .include "data/maps/DiglettsCave_NorthEntrance/events.inc" - .include "data/maps/DiglettsCave_B1F/events.inc" - .include "data/maps/DiglettsCave_SouthEntrance/events.inc" - .include "data/maps/VictoryRoad_1F/events.inc" - .include "data/maps/VictoryRoad_2F/events.inc" - .include "data/maps/VictoryRoad_3F/events.inc" - .include "data/maps/RocketHideout_B1F/events.inc" - .include "data/maps/RocketHideout_B2F/events.inc" - .include "data/maps/RocketHideout_B3F/events.inc" - .include "data/maps/RocketHideout_B4F/events.inc" - .include "data/maps/RocketHideout_Elevator/events.inc" - .include "data/maps/SilphCo_1F/events.inc" - .include "data/maps/SilphCo_2F/events.inc" - .include "data/maps/SilphCo_3F/events.inc" - .include "data/maps/SilphCo_4F/events.inc" - .include "data/maps/SilphCo_5F/events.inc" - .include "data/maps/SilphCo_6F/events.inc" - .include "data/maps/SilphCo_7F/events.inc" - .include "data/maps/SilphCo_8F/events.inc" - .include "data/maps/SilphCo_9F/events.inc" - .include "data/maps/SilphCo_10F/events.inc" - .include "data/maps/SilphCo_11F/events.inc" - .include "data/maps/SilphCo_Elevator/events.inc" - .include "data/maps/PokemonMansion_1F/events.inc" - .include "data/maps/PokemonMansion_2F/events.inc" - .include "data/maps/PokemonMansion_3F/events.inc" - .include "data/maps/PokemonMansion_B1F/events.inc" - .include "data/maps/SafariZone_Center/events.inc" - .include "data/maps/SafariZone_East/events.inc" - .include "data/maps/SafariZone_North/events.inc" - .include "data/maps/SafariZone_West/events.inc" - .include "data/maps/SafariZone_Building1/events.inc" - .include "data/maps/SafariZone_Building2/events.inc" - .include "data/maps/SafariZone_Building3/events.inc" - .include "data/maps/SafariZone_Building4/events.inc" - .include "data/maps/SafariZone_SecretHouse/events.inc" - .include "data/maps/CeruleanCave_1F/events.inc" - .include "data/maps/CeruleanCave_2F/events.inc" - .include "data/maps/CeruleanCave_B1F/events.inc" - .include "data/maps/PokemonLeague_LoreleisRoom/events.inc" - .include "data/maps/PokemonLeague_BrunosRoom/events.inc" - .include "data/maps/PokemonLeague_AgathasRoom/events.inc" - .include "data/maps/PokemonLeague_LancesRoom/events.inc" - .include "data/maps/PokemonLeague_ChampionsRoom/events.inc" - .include "data/maps/PokemonLeague_HallOfFame/events.inc" - .include "data/maps/RockTunnel_1F/events.inc" - .include "data/maps/RockTunnel_B1F/events.inc" - .include "data/maps/SeafoamIslands_1F/events.inc" - .include "data/maps/SeafoamIslands_B1F/events.inc" - .include "data/maps/SeafoamIslands_B2F/events.inc" - .include "data/maps/SeafoamIslands_B3F/events.inc" - .include "data/maps/SeafoamIslands_B4F/events.inc" - .include "data/maps/PokemonTower_1F/events.inc" - .include "data/maps/PokemonTower_2F/events.inc" - .include "data/maps/PokemonTower_3F/events.inc" - .include "data/maps/PokemonTower_4F/events.inc" - .include "data/maps/PokemonTower_5F/events.inc" - .include "data/maps/PokemonTower_6F/events.inc" - .include "data/maps/PokemonTower_7F/events.inc" - .include "data/maps/PowerPlant/events.inc" - .include "data/maps/MtEmber_RubyPath_B4F/events.inc" - .include "data/maps/MtEmber_Exterior/events.inc" - .include "data/maps/MtEmber_SummitPath_1F/events.inc" - .include "data/maps/MtEmber_SummitPath_2F/events.inc" - .include "data/maps/MtEmber_SummitPath_3F/events.inc" - .include "data/maps/MtEmber_Summit/events.inc" - .include "data/maps/MtEmber_RubyPath_B5F/events.inc" - .include "data/maps/SSAnne_Kitchen3/events.inc" - .include "data/maps/MtEmber_RubyPath_B1F/events.inc" - .include "data/maps/MtEmber_RubyPath_B2F/events.inc" - .include "data/maps/MtEmber_RubyPath_B3F/events.inc" - .include "data/maps/MtEmber_RubyPath_B1F_Stairs/events.inc" - .include "data/maps/MtEmber_RubyPath_B2F_Stairs/events.inc" - .include "data/maps/ThreeIsland_BerryForest/events.inc" - .include "data/maps/FourIsland_IcefallCave_Entrance/events.inc" - .include "data/maps/FourIsland_IcefallCave_1F/events.inc" - .include "data/maps/SSAnne_CaptainsOffice2/events.inc" - .include "data/maps/SSAnne_CaptainsOffice3/events.inc" - .include "data/maps/SSAnne_CaptainsOffice4/events.inc" - .include "data/maps/SSAnne_CaptainsOffice5/events.inc" - .include "data/maps/SixIsland_DottedHole_B1F/events.inc" - .include "data/maps/SixIsland_DottedHole_B2F/events.inc" - .include "data/maps/SixIsland_DottedHole_B3F/events.inc" - .include "data/maps/SSAnne_CaptainsOffice9/events.inc" - .include "data/maps/SixIsland_DottedHole_SapphireRoom/events.inc" - .include "data/maps/SSAnne_1F_Room11/events.inc" - .include "data/maps/SSAnne_1F_Room12/events.inc" - .include "data/maps/NavelRock_Exterior/events.inc" - .include "data/maps/SevenIsland_TrainerTower_1F/events.inc" - .include "data/maps/SevenIsland_TrainerTower_2F/events.inc" - .include "data/maps/SevenIsland_TrainerTower_3F/events.inc" - .include "data/maps/SevenIsland_TrainerTower_4F/events.inc" - .include "data/maps/SevenIsland_TrainerTower_5F/events.inc" - .include "data/maps/SevenIsland_TrainerTower_6F/events.inc" - .include "data/maps/SevenIsland_TrainerTower_7F/events.inc" - .include "data/maps/SevenIsland_TrainerTower_8F/events.inc" - .include "data/maps/SevenIsland_TrainerTower_Roof/events.inc" - .include "data/maps/SevenIsland_TrainerTower_Lobby/events.inc" - .include "data/maps/SevenIsland_TrainerTower_Elevator/events.inc" - .include "data/maps/FiveIsland_LostCave_Entrance/events.inc" - .include "data/maps/FiveIsland_LostCave_Room1/events.inc" - .include "data/maps/FiveIsland_LostCave_Room2/events.inc" - .include "data/maps/FiveIsland_LostCave_Room3/events.inc" - .include "data/maps/FiveIsland_LostCave_Room4/events.inc" - .include "data/maps/FiveIsland_LostCave_Room5/events.inc" - .include "data/maps/FiveIsland_LostCave_Room6/events.inc" - .include "data/maps/FiveIsland_LostCave_Room7/events.inc" - .include "data/maps/FiveIsland_LostCave_Room8/events.inc" - .include "data/maps/FiveIsland_LostCave_Room9/events.inc" - .include "data/maps/FiveIsland_LostCave_Room10/events.inc" - .include "data/maps/FiveIsland_LostCave_Room11/events.inc" - .include "data/maps/FiveIsland_LostCave_Room12/events.inc" - .include "data/maps/FiveIsland_LostCave_Room13/events.inc" - .include "data/maps/FiveIsland_LostCave_Room14/events.inc" - .include "data/maps/SevenIsland_TanobyRuins_MoneanChamber/events.inc" - .include "data/maps/SevenIsland_TanobyRuins_LiptooChamber/events.inc" - .include "data/maps/SevenIsland_TanobyRuins_WeepthChamber/events.inc" - .include "data/maps/SevenIsland_TanobyRuins_DilfordChamber/events.inc" - .include "data/maps/SevenIsland_TanobyRuins_ScufibChamber/events.inc" - .include "data/maps/SevenIsland_TanobyRuins_RixyChamber/events.inc" - .include "data/maps/SevenIsland_TanobyRuins_ViapoisChamber/events.inc" - .include "data/maps/ThreeIsland_DunsparceTunnel/events.inc" - .include "data/maps/SevenIsland_SeavaultCanyon_TanobyKey/events.inc" - .include "data/maps/NavelRock_1F/events.inc" - .include "data/maps/NavelRock_Summit/events.inc" - .include "data/maps/NavelRock_Base/events.inc" - .include "data/maps/NavelRock_SummitPath_2F/events.inc" - .include "data/maps/NavelRock_SummitPath_3F/events.inc" - .include "data/maps/NavelRock_SummitPath_4F/events.inc" - .include "data/maps/NavelRock_SummitPath_5F/events.inc" - .include "data/maps/NavelRock_BasePath_B1F/events.inc" - .include "data/maps/NavelRock_BasePath_B2F/events.inc" - .include "data/maps/NavelRock_BasePath_B3F/events.inc" - .include "data/maps/NavelRock_BasePath_B4F/events.inc" - .include "data/maps/NavelRock_BasePath_B5F/events.inc" - .include "data/maps/NavelRock_BasePath_B6F/events.inc" - .include "data/maps/NavelRock_BasePath_B7F/events.inc" - .include "data/maps/NavelRock_BasePath_B8F/events.inc" - .include "data/maps/NavelRock_BasePath_B9F/events.inc" - .include "data/maps/NavelRock_BasePath_B10F/events.inc" - .include "data/maps/NavelRock_BasePath_B11F/events.inc" - .include "data/maps/NavelRock_B1F/events.inc" - .include "data/maps/NavelRock_Fork/events.inc" - .include "data/maps/BirthIsland_Exterior/events.inc" - .include "data/maps/OneIsland_KindleRoad_EmberSpa/events.inc" - .include "data/maps/BirthIsland_Harbor/events.inc" - .include "data/maps/NavelRock_Harbor/events.inc" - .include "data/maps/PalletTown/events.inc" - .include "data/maps/ViridianCity/events.inc" - .include "data/maps/PewterCity/events.inc" - .include "data/maps/CeruleanCity/events.inc" - .include "data/maps/LavenderTown/events.inc" - .include "data/maps/VermilionCity/events.inc" - .include "data/maps/CeladonCity/events.inc" - .include "data/maps/FuchsiaCity/events.inc" - .include "data/maps/CinnabarIsland/events.inc" - .include "data/maps/IndigoPlateau_Exterior/events.inc" - .include "data/maps/SaffronCity_Duplicate/events.inc" - .include "data/maps/SaffronCity/events.inc" - .include "data/maps/OneIsland/events.inc" - .include "data/maps/TwoIsland/events.inc" - .include "data/maps/ThreeIsland/events.inc" - .include "data/maps/FourIsland/events.inc" - .include "data/maps/FiveIsland/events.inc" - .include "data/maps/SevenIsland/events.inc" - .include "data/maps/SixIsland/events.inc" - .include "data/maps/Route1/events.inc" - .include "data/maps/Route2/events.inc" - .include "data/maps/Route3/events.inc" - .include "data/maps/Route4/events.inc" - .include "data/maps/Route5/events.inc" - .include "data/maps/Route6/events.inc" - .include "data/maps/Route7/events.inc" - .include "data/maps/Route8/events.inc" - .include "data/maps/Route9/events.inc" - .include "data/maps/Route10/events.inc" - .include "data/maps/Route11/events.inc" - .include "data/maps/Route12/events.inc" - .include "data/maps/Route13/events.inc" - .include "data/maps/Route14/events.inc" - .include "data/maps/Route15/events.inc" - .include "data/maps/Route16/events.inc" - .include "data/maps/Route17/events.inc" - .include "data/maps/Route18/events.inc" - .include "data/maps/Route19/events.inc" - .include "data/maps/Route20/events.inc" - .include "data/maps/Route21_North/events.inc" - .include "data/maps/Route21_South/events.inc" - .include "data/maps/Route22/events.inc" - .include "data/maps/Route23/events.inc" - .include "data/maps/Route24/events.inc" - .include "data/maps/Route25/events.inc" - .include "data/maps/OneIsland_KindleRoad/events.inc" - .include "data/maps/OneIsland_TreasureBeach/events.inc" - .include "data/maps/TwoIsland_CapeBrink/events.inc" - .include "data/maps/ThreeIsland_BondBridge/events.inc" - .include "data/maps/ThreeIsland_Port/events.inc" - .include "data/maps/UnknownMap_03_50/events.inc" - .include "data/maps/UnknownMap_03_51/events.inc" - .include "data/maps/UnknownMap_03_52/events.inc" - .include "data/maps/UnknownMap_03_53/events.inc" - .include "data/maps/FiveIsland_ResortGorgeous/events.inc" - .include "data/maps/FiveIsland_WaterLabyrinth/events.inc" - .include "data/maps/FiveIsland_Meadow/events.inc" - .include "data/maps/FiveIsland_MemorialPillar/events.inc" - .include "data/maps/SixIsland_OutcastIsland/events.inc" - .include "data/maps/SixIsland_GreenPath/events.inc" - .include "data/maps/SixIsland_WaterPath/events.inc" - .include "data/maps/SixIsland_RuinValley/events.inc" - .include "data/maps/SevenIsland_TrainerTower/events.inc" - .include "data/maps/SevenIsland_SevaultCanyon_Entrance/events.inc" - .include "data/maps/SevenIsland_SevaultCanyon/events.inc" - .include "data/maps/SevenIsland_TanobyRuins/events.inc" - .include "data/maps/PalletTown_PlayersHouse_1F/events.inc" - .include "data/maps/PalletTown_PlayersHouse_2F/events.inc" - .include "data/maps/PalletTown_GarysHouse/events.inc" - .include "data/maps/PalletTown_ProfessorOaksLab/events.inc" - .include "data/maps/ViridianCity_House1/events.inc" - .include "data/maps/ViridianCity_Gym/events.inc" - .include "data/maps/ViridianCity_House2/events.inc" - .include "data/maps/ViridianCity_Mart/events.inc" - .include "data/maps/ViridianCity_PokemonCenter_1F/events.inc" - .include "data/maps/ViridianCity_PokemonCenter_2F/events.inc" - .include "data/maps/PewterCity_Museum_1F/events.inc" - .include "data/maps/PewterCity_Museum_2F/events.inc" - .include "data/maps/PewterCity_Gym/events.inc" - .include "data/maps/PewterCity_Mart/events.inc" - .include "data/maps/PewterCity_House1/events.inc" - .include "data/maps/PewterCity_PokemonCenter_1F/events.inc" - .include "data/maps/PewterCity_PokemonCenter_2F/events.inc" - .include "data/maps/PewterCity_House2/events.inc" - .include "data/maps/CeruleanCity_House1/events.inc" - .include "data/maps/CeruleanCity_House2/events.inc" - .include "data/maps/CeruleanCity_House3/events.inc" - .include "data/maps/CeruleanCity_PokemonCenter_1F/events.inc" - .include "data/maps/CeruleanCity_PokemonCenter_2F/events.inc" - .include "data/maps/CeruleanCity_Gym/events.inc" - .include "data/maps/CeruleanCity_BikeShop/events.inc" - .include "data/maps/CeruleanCity_Mart/events.inc" - .include "data/maps/CeruleanCity_House4/events.inc" - .include "data/maps/CeruleanCity_House5/events.inc" - .include "data/maps/LavenderTown_PokemonCenter_1F/events.inc" - .include "data/maps/LavenderTown_PokemonCenter_2F/events.inc" - .include "data/maps/LavenderTown_VolunteerPokemonHouse/events.inc" - .include "data/maps/LavenderTown_House1/events.inc" - .include "data/maps/LavenderTown_House2/events.inc" - .include "data/maps/LavenderTown_Mart/events.inc" - .include "data/maps/VermilionCity_House1/events.inc" - .include "data/maps/VermilionCity_PokemonCenter_1F/events.inc" - .include "data/maps/VermilionCity_PokemonCenter_2F/events.inc" - .include "data/maps/VermilionCity_PokemonFanClub/events.inc" - .include "data/maps/VermilionCity_House2/events.inc" - .include "data/maps/VermilionCity_Mart/events.inc" - .include "data/maps/VermilionCity_Gym/events.inc" - .include "data/maps/VermilionCity_House3/events.inc" - .include "data/maps/CeladonCity_DepartmentStore_1F/events.inc" - .include "data/maps/CeladonCity_DepartmentStore_2F/events.inc" - .include "data/maps/CeladonCity_DepartmentStore_3F/events.inc" - .include "data/maps/CeladonCity_DepartmentStore_4F/events.inc" - .include "data/maps/CeladonCity_DepartmentStore_5F/events.inc" - .include "data/maps/CeladonCity_DepartmentStore_Roof/events.inc" - .include "data/maps/CeladonCity_DepartmentStore_Elevator/events.inc" - .include "data/maps/CeladonCity_Condominiums_1F/events.inc" - .include "data/maps/CeladonCity_Condominiums_2F/events.inc" - .include "data/maps/CeladonCity_Condominiums_3F/events.inc" - .include "data/maps/CeladonCity_Condominiums_Roof/events.inc" - .include "data/maps/CeladonCity_Condominiums_RoofRoom/events.inc" - .include "data/maps/CeladonCity_PokemonCenter_1F/events.inc" - .include "data/maps/CeladonCity_PokemonCenter_2F/events.inc" - .include "data/maps/CeladonCity_GameCorner/events.inc" - .include "data/maps/CeladonCity_GameCorner_PrizeRoom/events.inc" - .include "data/maps/CeladonCity_Gym/events.inc" - .include "data/maps/CeladonCity_Restaurant/events.inc" - .include "data/maps/CeladonCity_House1/events.inc" - .include "data/maps/CeladonCity_Hotel/events.inc" - .include "data/maps/FuchsiaCity_SafariZone_Entrance/events.inc" - .include "data/maps/FuchsiaCity_Mart/events.inc" - .include "data/maps/FuchsiaCity_ZooBuilding/events.inc" - .include "data/maps/FuchsiaCity_Gym/events.inc" - .include "data/maps/FuchsiaCity_House1/events.inc" - .include "data/maps/FuchsiaCity_PokemonCenter_1F/events.inc" - .include "data/maps/FuchsiaCity_PokemonCenter_2F/events.inc" - .include "data/maps/FuchsiaCity_Building1/events.inc" - .include "data/maps/FuchsiaCity_House2/events.inc" - .include "data/maps/FuchsiaCity_House3/events.inc" - .include "data/maps/CinnabarIsland_Gym/events.inc" - .include "data/maps/CinnabarIsland_PokemonLab_Entrance/events.inc" - .include "data/maps/CinnabarIsland_PokemonLab_Lounge/events.inc" - .include "data/maps/CinnabarIsland_PokemonLab_ResearchRoom/events.inc" - .include "data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/events.inc" - .include "data/maps/CinnabarIsland_PokemonCenter_1F/events.inc" - .include "data/maps/CinnabarIsland_PokemonCenter_2F/events.inc" - .include "data/maps/CinnabarIsland_Mart/events.inc" - .include "data/maps/IndigoPlateau_PokemonCenter_1F/events.inc" - .include "data/maps/IndigoPlateau_PokemonCenter_2F/events.inc" - .include "data/maps/SaffronCity_House1_1F/events.inc" - .include "data/maps/SaffronCity_House1_2F/events.inc" - .include "data/maps/SaffronCity_Dojo/events.inc" - .include "data/maps/SaffronCity_Gym/events.inc" - .include "data/maps/SaffronCity_House2/events.inc" - .include "data/maps/SaffronCity_Mart/events.inc" - .include "data/maps/SaffronCity_PokemonCenter_1F/events.inc" - .include "data/maps/SaffronCity_PokemonCenter_2F/events.inc" - .include "data/maps/SaffronCity_House3/events.inc" - .include "data/maps/SaffronCity_PokemonTrainerFanClub/events.inc" - .include "data/maps/Route2_ViridianForest_SouthEntrance/events.inc" - .include "data/maps/Route2_House/events.inc" - .include "data/maps/Route2_EastBuilding/events.inc" - .include "data/maps/Route2_ViridianForest_NorthEntrance/events.inc" - .include "data/maps/Route4_PokemonCenter_1F/events.inc" - .include "data/maps/Route4_PokemonCenter_2F/events.inc" - .include "data/maps/Route5_PokemonDayCare/events.inc" - .include "data/maps/Route5_SouthEntrance/events.inc" - .include "data/maps/Route6_NorthEntrance/events.inc" - .include "data/maps/UnknownMap_18_01/events.inc" - .include "data/maps/Route7_EastEntrance/events.inc" - .include "data/maps/Route8_WestEntrance/events.inc" - .include "data/maps/Route10_PokemonCenter_1F/events.inc" - .include "data/maps/Route10_PokemonCenter_2F/events.inc" - .include "data/maps/Route11_EastEntrance_1F/events.inc" - .include "data/maps/Route11_EastEntrance_2F/events.inc" - .include "data/maps/Route12_NorthEntrance_1F/events.inc" - .include "data/maps/Route12_NorthEntrance_2F/events.inc" - .include "data/maps/Route12_FishingHouse/events.inc" - .include "data/maps/Route15_WestEntrance_1F/events.inc" - .include "data/maps/Route15_WestEntrance_2F/events.inc" - .include "data/maps/Route16_House/events.inc" - .include "data/maps/Route16_NorthEntrance_1F/events.inc" - .include "data/maps/Route16_NorthEntrance_2F/events.inc" - .include "data/maps/Route18_EastEntrance_1F/events.inc" - .include "data/maps/Route18_EastEntrance_2F/events.inc" - .include "data/maps/UnusedHouse_27_00/events.inc" - .include "data/maps/Route22_NorthEntrance/events.inc" - .include "data/maps/UnusedHouse_29_00/events.inc" - .include "data/maps/Route25_SeaCottage/events.inc" - .include "data/maps/SevenIsland_House_Room1/events.inc" - .include "data/maps/SevenIsland_House_Room2/events.inc" - .include "data/maps/SevenIsland_Mart/events.inc" - .include "data/maps/SevenIsland_PokemonCenter_1F/events.inc" - .include "data/maps/SevenIsland_PokemonCenter_2F/events.inc" - .include "data/maps/UnusedHouse_31_05/events.inc" - .include "data/maps/SevenIsland_Harbor/events.inc" - .include "data/maps/OneIsland_PokemonCenter_1F/events.inc" - .include "data/maps/OneIsland_PokemonCenter_2F/events.inc" - .include "data/maps/OneIsland_House1/events.inc" - .include "data/maps/OneIsland_House2/events.inc" - .include "data/maps/OneIsland_Harbor/events.inc" - .include "data/maps/TwoIsland_JoyfulGameCorner/events.inc" - .include "data/maps/TwoIsland_House/events.inc" - .include "data/maps/TwoIsland_PokemonCenter_1F/events.inc" - .include "data/maps/TwoIsland_PokemonCenter_2F/events.inc" - .include "data/maps/TwoIsland_Harbor/events.inc" - .include "data/maps/ThreeIsland_House1/events.inc" - .include "data/maps/ThreeIsland_PokemonCenter_1F/events.inc" - .include "data/maps/ThreeIsland_PokemonCenter_2F/events.inc" - .include "data/maps/ThreeIsland_Mart/events.inc" - .include "data/maps/ThreeIsland_House2/events.inc" - .include "data/maps/ThreeIsland_House3/events.inc" - .include "data/maps/ThreeIsland_House4/events.inc" - .include "data/maps/ThreeIsland_House5/events.inc" - .include "data/maps/FourIsland_PokemonDayCare/events.inc" - .include "data/maps/FourIsland_PokemonCenter_1F/events.inc" - .include "data/maps/FourIsland_PokemonCenter_2F/events.inc" - .include "data/maps/FourIsland_House1/events.inc" - .include "data/maps/FourIsland_LoreleisHouse/events.inc" - .include "data/maps/FourIsland_Harbor/events.inc" - .include "data/maps/FourIsland_House2/events.inc" - .include "data/maps/FourIsland_Mart/events.inc" - .include "data/maps/FiveIsland_PokemonCenter_1F/events.inc" - .include "data/maps/FiveIsland_PokemonCenter_2F/events.inc" - .include "data/maps/FiveIsland_Harbor/events.inc" - .include "data/maps/FiveIsland_House1/events.inc" - .include "data/maps/FiveIsland_House2/events.inc" - .include "data/maps/SixIsland_PokemonCenter_1F/events.inc" - .include "data/maps/SixIsland_PokemonCenter_2F/events.inc" - .include "data/maps/SixIsland_Harbor/events.inc" - .include "data/maps/SixIsland_House/events.inc" - .include "data/maps/SixIsland_Mart/events.inc" - .include "data/maps/ThreeIsland_Harbor/events.inc" - .include "data/maps/FiveIsland_ResortGorgeous_House/events.inc" - .include "data/maps/TwoIsland_CapeBrink_House/events.inc" - .include "data/maps/SixIsland_WaterPath_House1/events.inc" - .include "data/maps/SixIsland_WaterPath_House2/events.inc" - .include "data/maps/SevenIsland_SevaultCanyon_House/events.inc" diff --git a/data/maps/groups.inc b/data/maps/groups.inc deleted file mode 100644 index 8e180eafd..000000000 --- a/data/maps/groups.inc +++ /dev/null @@ -1,555 +0,0 @@ -gMapGroup_00:: @ 8352004 - .4byte UnknownMap_00_00 - .4byte UnknownMap_00_01 - .4byte UnknownMap_00_02 - .4byte UnknownMap_00_03 - .4byte UnknownMap_00_04 - -gMapGroup_01:: @ 8352018 - .4byte ViridianForest - .4byte MtMoon_1F - .4byte MtMoon_B1F - .4byte MtMoon_B2F - .4byte SSAnne_Exterior - .4byte SSAnne_1F_Corridor - .4byte SSAnne_2F_Corridor - .4byte SSAnne_3F_Corridor - .4byte SSAnne_B1F_Corridor - .4byte SSAnne_Deck - .4byte SSAnne_Kitchen - .4byte SSAnne_CaptainsOffice - .4byte SSAnne_1F_Room1 - .4byte SSAnne_1F_Room2 - .4byte SSAnne_1F_Room3 - .4byte SSAnne_1F_Room4 - .4byte SSAnne_1F_Room5 - .4byte SSAnne_1F_Room7 - .4byte SSAnne_2F_Room1 - .4byte SSAnne_2F_Room2 - .4byte SSAnne_2F_Room3 - .4byte SSAnne_2F_Room4 - .4byte SSAnne_2F_Room5 - .4byte SSAnne_2F_Room6 - .4byte SSAnne_B1F_Room1 - .4byte SSAnne_B1F_Room2 - .4byte SSAnne_B1F_Room3 - .4byte SSAnne_B1F_Room4 - .4byte SSAnne_B1F_Room5 - .4byte SSAnne_1F_Room6 - .4byte UndergroundPath_NorthEntrance - .4byte UndergroundPath_NorthSouthTunnel - .4byte UndergroundPath_SouthEntrance - .4byte UndergroundPath_WestEntrance - .4byte UndergroundPath_EastWestTunnel - .4byte UndergroundPath_EastEntrance - .4byte DiglettsCave_NorthEntrance - .4byte DiglettsCave_B1F - .4byte DiglettsCave_SouthEntrance - .4byte VictoryRoad_1F - .4byte VictoryRoad_2F - .4byte VictoryRoad_3F - .4byte RocketHideout_B1F - .4byte RocketHideout_B2F - .4byte RocketHideout_B3F - .4byte RocketHideout_B4F - .4byte RocketHideout_Elevator - .4byte SilphCo_1F - .4byte SilphCo_2F - .4byte SilphCo_3F - .4byte SilphCo_4F - .4byte SilphCo_5F - .4byte SilphCo_6F - .4byte SilphCo_7F - .4byte SilphCo_8F - .4byte SilphCo_9F - .4byte SilphCo_10F - .4byte SilphCo_11F - .4byte SilphCo_Elevator - .4byte PokemonMansion_1F - .4byte PokemonMansion_2F - .4byte PokemonMansion_3F - .4byte PokemonMansion_B1F - .4byte SafariZone_Center - .4byte SafariZone_East - .4byte SafariZone_North - .4byte SafariZone_West - .4byte SafariZone_Building1 - .4byte SafariZone_Building2 - .4byte SafariZone_Building3 - .4byte SafariZone_Building4 - .4byte SafariZone_SecretHouse - .4byte CeruleanCave_1F - .4byte CeruleanCave_2F - .4byte CeruleanCave_B1F - .4byte PokemonLeague_LoreleisRoom - .4byte PokemonLeague_BrunosRoom - .4byte PokemonLeague_AgathasRoom - .4byte PokemonLeague_LancesRoom - .4byte PokemonLeague_ChampionsRoom - .4byte PokemonLeague_HallOfFame - .4byte RockTunnel_1F - .4byte RockTunnel_B1F - .4byte SeafoamIslands_1F - .4byte SeafoamIslands_B1F - .4byte SeafoamIslands_B2F - .4byte SeafoamIslands_B3F - .4byte SeafoamIslands_B4F - .4byte PokemonTower_1F - .4byte PokemonTower_2F - .4byte PokemonTower_3F - .4byte PokemonTower_4F - .4byte PokemonTower_5F - .4byte PokemonTower_6F - .4byte PokemonTower_7F - .4byte PowerPlant - .4byte MtEmber_RubyPath_B4F - .4byte MtEmber_Exterior - .4byte MtEmber_SummitPath_1F - .4byte MtEmber_SummitPath_2F - .4byte MtEmber_SummitPath_3F - .4byte MtEmber_Summit - .4byte MtEmber_RubyPath_B5F - .4byte SSAnne_Kitchen3 - .4byte MtEmber_RubyPath_B1F - .4byte MtEmber_RubyPath_B2F - .4byte MtEmber_RubyPath_B3F - .4byte MtEmber_RubyPath_B1F_Stairs - .4byte MtEmber_RubyPath_B2F_Stairs - .4byte ThreeIsland_BerryForest - .4byte FourIsland_IcefallCave_Entrance - .4byte FourIsland_IcefallCave_1F - .4byte SSAnne_CaptainsOffice2 - .4byte SSAnne_CaptainsOffice3 - .4byte SSAnne_CaptainsOffice4 - .4byte SSAnne_CaptainsOffice5 - .4byte SixIsland_DottedHole_B1F - .4byte SixIsland_DottedHole_B2F - .4byte SixIsland_DottedHole_B3F - .4byte SSAnne_CaptainsOffice9 - .4byte SixIsland_DottedHole_SapphireRoom - .4byte SSAnne_1F_Room11 - .4byte SSAnne_1F_Room12 - -gMapGroup_02:: @ 8352204 - .4byte NavelRock_Exterior - .4byte SevenIsland_TrainerTower_1F - .4byte SevenIsland_TrainerTower_2F - .4byte SevenIsland_TrainerTower_3F - .4byte SevenIsland_TrainerTower_4F - .4byte SevenIsland_TrainerTower_5F - .4byte SevenIsland_TrainerTower_6F - .4byte SevenIsland_TrainerTower_7F - .4byte SevenIsland_TrainerTower_8F - .4byte SevenIsland_TrainerTower_Roof - .4byte SevenIsland_TrainerTower_Lobby - .4byte SevenIsland_TrainerTower_Elevator - .4byte FiveIsland_LostCave_Entrance - .4byte FiveIsland_LostCave_Room1 - .4byte FiveIsland_LostCave_Room2 - .4byte FiveIsland_LostCave_Room3 - .4byte FiveIsland_LostCave_Room4 - .4byte FiveIsland_LostCave_Room5 - .4byte FiveIsland_LostCave_Room6 - .4byte FiveIsland_LostCave_Room7 - .4byte FiveIsland_LostCave_Room8 - .4byte FiveIsland_LostCave_Room9 - .4byte FiveIsland_LostCave_Room10 - .4byte FiveIsland_LostCave_Room11 - .4byte FiveIsland_LostCave_Room12 - .4byte FiveIsland_LostCave_Room13 - .4byte FiveIsland_LostCave_Room14 - .4byte SevenIsland_TanobyRuins_MoneanChamber - .4byte SevenIsland_TanobyRuins_LiptooChamber - .4byte SevenIsland_TanobyRuins_WeepthChamber - .4byte SevenIsland_TanobyRuins_DilfordChamber - .4byte SevenIsland_TanobyRuins_ScufibChamber - .4byte SevenIsland_TanobyRuins_RixyChamber - .4byte SevenIsland_TanobyRuins_ViapoisChamber - .4byte ThreeIsland_DunsparceTunnel - .4byte SevenIsland_SeavaultCanyon_TanobyKey - .4byte NavelRock_1F - .4byte NavelRock_Summit - .4byte NavelRock_Base - .4byte NavelRock_SummitPath_2F - .4byte NavelRock_SummitPath_3F - .4byte NavelRock_SummitPath_4F - .4byte NavelRock_SummitPath_5F - .4byte NavelRock_BasePath_B1F - .4byte NavelRock_BasePath_B2F - .4byte NavelRock_BasePath_B3F - .4byte NavelRock_BasePath_B4F - .4byte NavelRock_BasePath_B5F - .4byte NavelRock_BasePath_B6F - .4byte NavelRock_BasePath_B7F - .4byte NavelRock_BasePath_B8F - .4byte NavelRock_BasePath_B9F - .4byte NavelRock_BasePath_B10F - .4byte NavelRock_BasePath_B11F - .4byte NavelRock_B1F - .4byte NavelRock_Fork - .4byte BirthIsland_Exterior - .4byte OneIsland_KindleRoad_EmberSpa - .4byte BirthIsland_Harbor - .4byte NavelRock_Harbor - -gMapGroup_03:: @ 83522F4 - .4byte PalletTown - .4byte ViridianCity - .4byte PewterCity - .4byte CeruleanCity - .4byte LavenderTown - .4byte VermilionCity - .4byte CeladonCity - .4byte FuchsiaCity - .4byte CinnabarIsland - .4byte IndigoPlateau_Exterior - .4byte SaffronCity_Duplicate - .4byte SaffronCity - .4byte OneIsland - .4byte TwoIsland - .4byte ThreeIsland - .4byte FourIsland - .4byte FiveIsland - .4byte SevenIsland - .4byte SixIsland - .4byte Route1 - .4byte Route2 - .4byte Route3 - .4byte Route4 - .4byte Route5 - .4byte Route6 - .4byte Route7 - .4byte Route8 - .4byte Route9 - .4byte Route10 - .4byte Route11 - .4byte Route12 - .4byte Route13 - .4byte Route14 - .4byte Route15 - .4byte Route16 - .4byte Route17 - .4byte Route18 - .4byte Route19 - .4byte Route20 - .4byte Route21_North - .4byte Route21_South - .4byte Route22 - .4byte Route23 - .4byte Route24 - .4byte Route25 - .4byte OneIsland_KindleRoad - .4byte OneIsland_TreasureBeach - .4byte TwoIsland_CapeBrink - .4byte ThreeIsland_BondBridge - .4byte ThreeIsland_Port - .4byte UnknownMap_03_50 - .4byte UnknownMap_03_51 - .4byte UnknownMap_03_52 - .4byte UnknownMap_03_53 - .4byte FiveIsland_ResortGorgeous - .4byte FiveIsland_WaterLabyrinth - .4byte FiveIsland_Meadow - .4byte FiveIsland_MemorialPillar - .4byte SixIsland_OutcastIsland - .4byte SixIsland_GreenPath - .4byte SixIsland_WaterPath - .4byte SixIsland_RuinValley - .4byte SevenIsland_TrainerTower - .4byte SevenIsland_SevaultCanyon_Entrance - .4byte SevenIsland_SevaultCanyon - .4byte SevenIsland_TanobyRuins - -gMapGroup_04:: @ 83523FC - .4byte PalletTown_PlayersHouse_1F - .4byte PalletTown_PlayersHouse_2F - .4byte PalletTown_GarysHouse - .4byte PalletTown_ProfessorOaksLab - -gMapGroup_05:: @ 835240C - .4byte ViridianCity_House1 - .4byte ViridianCity_Gym - .4byte ViridianCity_House2 - .4byte ViridianCity_Mart - .4byte ViridianCity_PokemonCenter_1F - .4byte ViridianCity_PokemonCenter_2F - -gMapGroup_06:: @ 8352424 - .4byte PewterCity_Museum_1F - .4byte PewterCity_Museum_2F - .4byte PewterCity_Gym - .4byte PewterCity_Mart - .4byte PewterCity_House1 - .4byte PewterCity_PokemonCenter_1F - .4byte PewterCity_PokemonCenter_2F - .4byte PewterCity_House2 - -gMapGroup_07:: @ 8352444 - .4byte CeruleanCity_House1 - .4byte CeruleanCity_House2 - .4byte CeruleanCity_House3 - .4byte CeruleanCity_PokemonCenter_1F - .4byte CeruleanCity_PokemonCenter_2F - .4byte CeruleanCity_Gym - .4byte CeruleanCity_BikeShop - .4byte CeruleanCity_Mart - .4byte CeruleanCity_House4 - .4byte CeruleanCity_House5 - -gMapGroup_08:: @ 835246C - .4byte LavenderTown_PokemonCenter_1F - .4byte LavenderTown_PokemonCenter_2F - .4byte LavenderTown_VolunteerPokemonHouse - .4byte LavenderTown_House1 - .4byte LavenderTown_House2 - .4byte LavenderTown_Mart - -gMapGroup_09:: @ 8352484 - .4byte VermilionCity_House1 - .4byte VermilionCity_PokemonCenter_1F - .4byte VermilionCity_PokemonCenter_2F - .4byte VermilionCity_PokemonFanClub - .4byte VermilionCity_House2 - .4byte VermilionCity_Mart - .4byte VermilionCity_Gym - .4byte VermilionCity_House3 - -gMapGroup_10:: @ 83524A4 - .4byte CeladonCity_DepartmentStore_1F - .4byte CeladonCity_DepartmentStore_2F - .4byte CeladonCity_DepartmentStore_3F - .4byte CeladonCity_DepartmentStore_4F - .4byte CeladonCity_DepartmentStore_5F - .4byte CeladonCity_DepartmentStore_Roof - .4byte CeladonCity_DepartmentStore_Elevator - .4byte CeladonCity_Condominiums_1F - .4byte CeladonCity_Condominiums_2F - .4byte CeladonCity_Condominiums_3F - .4byte CeladonCity_Condominiums_Roof - .4byte CeladonCity_Condominiums_RoofRoom - .4byte CeladonCity_PokemonCenter_1F - .4byte CeladonCity_PokemonCenter_2F - .4byte CeladonCity_GameCorner - .4byte CeladonCity_GameCorner_PrizeRoom - .4byte CeladonCity_Gym - .4byte CeladonCity_Restaurant - .4byte CeladonCity_House1 - .4byte CeladonCity_Hotel - -gMapGroup_11:: @ 83524F4 - .4byte FuchsiaCity_SafariZone_Entrance - .4byte FuchsiaCity_Mart - .4byte FuchsiaCity_ZooBuilding - .4byte FuchsiaCity_Gym - .4byte FuchsiaCity_House1 - .4byte FuchsiaCity_PokemonCenter_1F - .4byte FuchsiaCity_PokemonCenter_2F - .4byte FuchsiaCity_Building1 - .4byte FuchsiaCity_House2 - .4byte FuchsiaCity_House3 - -gMapGroup_12:: @ 835251C - .4byte CinnabarIsland_Gym - .4byte CinnabarIsland_PokemonLab_Entrance - .4byte CinnabarIsland_PokemonLab_Lounge - .4byte CinnabarIsland_PokemonLab_ResearchRoom - .4byte CinnabarIsland_PokemonLab_ExperimentRoom - .4byte CinnabarIsland_PokemonCenter_1F - .4byte CinnabarIsland_PokemonCenter_2F - .4byte CinnabarIsland_Mart - -gMapGroup_13:: @ 835253C - .4byte IndigoPlateau_PokemonCenter_1F - .4byte IndigoPlateau_PokemonCenter_2F - -gMapGroup_14:: @ 8352544 - .4byte SaffronCity_House1_1F - .4byte SaffronCity_House1_2F - .4byte SaffronCity_Dojo - .4byte SaffronCity_Gym - .4byte SaffronCity_House2 - .4byte SaffronCity_Mart - .4byte SaffronCity_PokemonCenter_1F - .4byte SaffronCity_PokemonCenter_2F - .4byte SaffronCity_House3 - .4byte SaffronCity_PokemonTrainerFanClub - -gMapGroup_15:: @ 835256C - .4byte Route2_ViridianForest_SouthEntrance - .4byte Route2_House - .4byte Route2_EastBuilding - .4byte Route2_ViridianForest_NorthEntrance - -gMapGroup_16:: @ 835257C - .4byte Route4_PokemonCenter_1F - .4byte Route4_PokemonCenter_2F - -gMapGroup_17:: @ 8352584 - .4byte Route5_PokemonDayCare - .4byte Route5_SouthEntrance - -gMapGroup_18:: @ 835258C - .4byte Route6_NorthEntrance - .4byte UnknownMap_18_01 - -gMapGroup_19:: @ 8352594 - .4byte Route7_EastEntrance - -gMapGroup_20:: @ 8352598 - .4byte Route8_WestEntrance - -gMapGroup_21:: @ 835259C - .4byte Route10_PokemonCenter_1F - .4byte Route10_PokemonCenter_2F - -gMapGroup_22:: @ 83525A4 - .4byte Route11_EastEntrance_1F - .4byte Route11_EastEntrance_2F - -gMapGroup_23:: @ 83525AC - .4byte Route12_NorthEntrance_1F - .4byte Route12_NorthEntrance_2F - .4byte Route12_FishingHouse - -gMapGroup_24:: @ 83525B8 - .4byte Route15_WestEntrance_1F - .4byte Route15_WestEntrance_2F - -gMapGroup_25:: @ 83525C0 - .4byte Route16_House - .4byte Route16_NorthEntrance_1F - .4byte Route16_NorthEntrance_2F - -gMapGroup_26:: @ 83525CC - .4byte Route18_EastEntrance_1F - .4byte Route18_EastEntrance_2F - -gMapGroup_27:: @ 83525D4 - .4byte UnusedHouse_27_00 - -gMapGroup_28:: @ 83525D8 - .4byte Route22_NorthEntrance - -gMapGroup_29:: @ 83525DC - .4byte UnusedHouse_29_00 - -gMapGroup_30:: @ 83525E0 - .4byte Route25_SeaCottage - -gMapGroup_31:: @ 83525E4 - .4byte SevenIsland_House_Room1 - .4byte SevenIsland_House_Room2 - .4byte SevenIsland_Mart - .4byte SevenIsland_PokemonCenter_1F - .4byte SevenIsland_PokemonCenter_2F - .4byte UnusedHouse_31_05 - .4byte SevenIsland_Harbor - -gMapGroup_32:: @ 8352600 - .4byte OneIsland_PokemonCenter_1F - .4byte OneIsland_PokemonCenter_2F - .4byte OneIsland_House1 - .4byte OneIsland_House2 - .4byte OneIsland_Harbor - -gMapGroup_33:: @ 8352614 - .4byte TwoIsland_JoyfulGameCorner - .4byte TwoIsland_House - .4byte TwoIsland_PokemonCenter_1F - .4byte TwoIsland_PokemonCenter_2F - .4byte TwoIsland_Harbor - -gMapGroup_34:: @ 8352628 - .4byte ThreeIsland_House1 - .4byte ThreeIsland_PokemonCenter_1F - .4byte ThreeIsland_PokemonCenter_2F - .4byte ThreeIsland_Mart - .4byte ThreeIsland_House2 - .4byte ThreeIsland_House3 - .4byte ThreeIsland_House4 - .4byte ThreeIsland_House5 - -gMapGroup_35:: @ 8352648 - .4byte FourIsland_PokemonDayCare - .4byte FourIsland_PokemonCenter_1F - .4byte FourIsland_PokemonCenter_2F - .4byte FourIsland_House1 - .4byte FourIsland_LoreleisHouse - .4byte FourIsland_Harbor - .4byte FourIsland_House2 - .4byte FourIsland_Mart - -gMapGroup_36:: @ 8352668 - .4byte FiveIsland_PokemonCenter_1F - .4byte FiveIsland_PokemonCenter_2F - .4byte FiveIsland_Harbor - .4byte FiveIsland_House1 - .4byte FiveIsland_House2 - -gMapGroup_37:: @ 835267C - .4byte SixIsland_PokemonCenter_1F - .4byte SixIsland_PokemonCenter_2F - .4byte SixIsland_Harbor - .4byte SixIsland_House - .4byte SixIsland_Mart - -gMapGroup_38:: @ 8352690 - .4byte ThreeIsland_Harbor - -gMapGroup_39:: @ 8352694 - .4byte FiveIsland_ResortGorgeous_House - -gMapGroup_40:: @ 8352698 - .4byte TwoIsland_CapeBrink_House - -gMapGroup_41:: @ 835269C - .4byte SixIsland_WaterPath_House1 - .4byte SixIsland_WaterPath_House2 - -gMapGroup_42:: @ 83526A4 - .4byte SevenIsland_SevaultCanyon_House - -gMapGroups:: @ 0x83526A8 - .4byte gMapGroup_00 - .4byte gMapGroup_01 - .4byte gMapGroup_02 - .4byte gMapGroup_03 - .4byte gMapGroup_04 - .4byte gMapGroup_05 - .4byte gMapGroup_06 - .4byte gMapGroup_07 - .4byte gMapGroup_08 - .4byte gMapGroup_09 - .4byte gMapGroup_10 - .4byte gMapGroup_11 - .4byte gMapGroup_12 - .4byte gMapGroup_13 - .4byte gMapGroup_14 - .4byte gMapGroup_15 - .4byte gMapGroup_16 - .4byte gMapGroup_17 - .4byte gMapGroup_18 - .4byte gMapGroup_19 - .4byte gMapGroup_20 - .4byte gMapGroup_21 - .4byte gMapGroup_22 - .4byte gMapGroup_23 - .4byte gMapGroup_24 - .4byte gMapGroup_25 - .4byte gMapGroup_26 - .4byte gMapGroup_27 - .4byte gMapGroup_28 - .4byte gMapGroup_29 - .4byte gMapGroup_30 - .4byte gMapGroup_31 - .4byte gMapGroup_32 - .4byte gMapGroup_33 - .4byte gMapGroup_34 - .4byte gMapGroup_35 - .4byte gMapGroup_36 - .4byte gMapGroup_37 - .4byte gMapGroup_38 - .4byte gMapGroup_39 - .4byte gMapGroup_40 - .4byte gMapGroup_41 - .4byte gMapGroup_42 diff --git a/data/maps/headers.inc b/data/maps/headers.inc deleted file mode 100644 index 7edb2d4d5..000000000 --- a/data/maps/headers.inc +++ /dev/null @@ -1,425 +0,0 @@ - .include "data/maps/UnknownMap_00_00/header.inc" - .include "data/maps/UnknownMap_00_01/header.inc" - .include "data/maps/UnknownMap_00_02/header.inc" - .include "data/maps/UnknownMap_00_03/header.inc" - .include "data/maps/UnknownMap_00_04/header.inc" - .include "data/maps/ViridianForest/header.inc" - .include "data/maps/MtMoon_1F/header.inc" - .include "data/maps/MtMoon_B1F/header.inc" - .include "data/maps/MtMoon_B2F/header.inc" - .include "data/maps/SSAnne_Exterior/header.inc" - .include "data/maps/SSAnne_1F_Corridor/header.inc" - .include "data/maps/SSAnne_2F_Corridor/header.inc" - .include "data/maps/SSAnne_3F_Corridor/header.inc" - .include "data/maps/SSAnne_B1F_Corridor/header.inc" - .include "data/maps/SSAnne_Deck/header.inc" - .include "data/maps/SSAnne_Kitchen/header.inc" - .include "data/maps/SSAnne_CaptainsOffice/header.inc" - .include "data/maps/SSAnne_1F_Room1/header.inc" - .include "data/maps/SSAnne_1F_Room2/header.inc" - .include "data/maps/SSAnne_1F_Room3/header.inc" - .include "data/maps/SSAnne_1F_Room4/header.inc" - .include "data/maps/SSAnne_1F_Room5/header.inc" - .include "data/maps/SSAnne_1F_Room7/header.inc" - .include "data/maps/SSAnne_2F_Room1/header.inc" - .include "data/maps/SSAnne_2F_Room2/header.inc" - .include "data/maps/SSAnne_2F_Room3/header.inc" - .include "data/maps/SSAnne_2F_Room4/header.inc" - .include "data/maps/SSAnne_2F_Room5/header.inc" - .include "data/maps/SSAnne_2F_Room6/header.inc" - .include "data/maps/SSAnne_B1F_Room1/header.inc" - .include "data/maps/SSAnne_B1F_Room2/header.inc" - .include "data/maps/SSAnne_B1F_Room3/header.inc" - .include "data/maps/SSAnne_B1F_Room4/header.inc" - .include "data/maps/SSAnne_B1F_Room5/header.inc" - .include "data/maps/SSAnne_1F_Room6/header.inc" - .include "data/maps/UndergroundPath_NorthEntrance/header.inc" - .include "data/maps/UndergroundPath_NorthSouthTunnel/header.inc" - .include "data/maps/UndergroundPath_SouthEntrance/header.inc" - .include "data/maps/UndergroundPath_WestEntrance/header.inc" - .include "data/maps/UndergroundPath_EastWestTunnel/header.inc" - .include "data/maps/UndergroundPath_EastEntrance/header.inc" - .include "data/maps/DiglettsCave_NorthEntrance/header.inc" - .include "data/maps/DiglettsCave_B1F/header.inc" - .include "data/maps/DiglettsCave_SouthEntrance/header.inc" - .include "data/maps/VictoryRoad_1F/header.inc" - .include "data/maps/VictoryRoad_2F/header.inc" - .include "data/maps/VictoryRoad_3F/header.inc" - .include "data/maps/RocketHideout_B1F/header.inc" - .include "data/maps/RocketHideout_B2F/header.inc" - .include "data/maps/RocketHideout_B3F/header.inc" - .include "data/maps/RocketHideout_B4F/header.inc" - .include "data/maps/RocketHideout_Elevator/header.inc" - .include "data/maps/SilphCo_1F/header.inc" - .include "data/maps/SilphCo_2F/header.inc" - .include "data/maps/SilphCo_3F/header.inc" - .include "data/maps/SilphCo_4F/header.inc" - .include "data/maps/SilphCo_5F/header.inc" - .include "data/maps/SilphCo_6F/header.inc" - .include "data/maps/SilphCo_7F/header.inc" - .include "data/maps/SilphCo_8F/header.inc" - .include "data/maps/SilphCo_9F/header.inc" - .include "data/maps/SilphCo_10F/header.inc" - .include "data/maps/SilphCo_11F/header.inc" - .include "data/maps/SilphCo_Elevator/header.inc" - .include "data/maps/PokemonMansion_1F/header.inc" - .include "data/maps/PokemonMansion_2F/header.inc" - .include "data/maps/PokemonMansion_3F/header.inc" - .include "data/maps/PokemonMansion_B1F/header.inc" - .include "data/maps/SafariZone_Center/header.inc" - .include "data/maps/SafariZone_East/header.inc" - .include "data/maps/SafariZone_North/header.inc" - .include "data/maps/SafariZone_West/header.inc" - .include "data/maps/SafariZone_Building1/header.inc" - .include "data/maps/SafariZone_Building2/header.inc" - .include "data/maps/SafariZone_Building3/header.inc" - .include "data/maps/SafariZone_Building4/header.inc" - .include "data/maps/SafariZone_SecretHouse/header.inc" - .include "data/maps/CeruleanCave_1F/header.inc" - .include "data/maps/CeruleanCave_2F/header.inc" - .include "data/maps/CeruleanCave_B1F/header.inc" - .include "data/maps/PokemonLeague_LoreleisRoom/header.inc" - .include "data/maps/PokemonLeague_BrunosRoom/header.inc" - .include "data/maps/PokemonLeague_AgathasRoom/header.inc" - .include "data/maps/PokemonLeague_LancesRoom/header.inc" - .include "data/maps/PokemonLeague_ChampionsRoom/header.inc" - .include "data/maps/PokemonLeague_HallOfFame/header.inc" - .include "data/maps/RockTunnel_1F/header.inc" - .include "data/maps/RockTunnel_B1F/header.inc" - .include "data/maps/SeafoamIslands_1F/header.inc" - .include "data/maps/SeafoamIslands_B1F/header.inc" - .include "data/maps/SeafoamIslands_B2F/header.inc" - .include "data/maps/SeafoamIslands_B3F/header.inc" - .include "data/maps/SeafoamIslands_B4F/header.inc" - .include "data/maps/PokemonTower_1F/header.inc" - .include "data/maps/PokemonTower_2F/header.inc" - .include "data/maps/PokemonTower_3F/header.inc" - .include "data/maps/PokemonTower_4F/header.inc" - .include "data/maps/PokemonTower_5F/header.inc" - .include "data/maps/PokemonTower_6F/header.inc" - .include "data/maps/PokemonTower_7F/header.inc" - .include "data/maps/PowerPlant/header.inc" - .include "data/maps/MtEmber_RubyPath_B4F/header.inc" - .include "data/maps/MtEmber_Exterior/header.inc" - .include "data/maps/MtEmber_SummitPath_1F/header.inc" - .include "data/maps/MtEmber_SummitPath_2F/header.inc" - .include "data/maps/MtEmber_SummitPath_3F/header.inc" - .include "data/maps/MtEmber_Summit/header.inc" - .include "data/maps/MtEmber_RubyPath_B5F/header.inc" - .include "data/maps/SSAnne_Kitchen3/header.inc" - .include "data/maps/MtEmber_RubyPath_B1F/header.inc" - .include "data/maps/MtEmber_RubyPath_B2F/header.inc" - .include "data/maps/MtEmber_RubyPath_B3F/header.inc" - .include "data/maps/MtEmber_RubyPath_B1F_Stairs/header.inc" - .include "data/maps/MtEmber_RubyPath_B2F_Stairs/header.inc" - .include "data/maps/ThreeIsland_BerryForest/header.inc" - .include "data/maps/FourIsland_IcefallCave_Entrance/header.inc" - .include "data/maps/FourIsland_IcefallCave_1F/header.inc" - .include "data/maps/SSAnne_CaptainsOffice2/header.inc" - .include "data/maps/SSAnne_CaptainsOffice3/header.inc" - .include "data/maps/SSAnne_CaptainsOffice4/header.inc" - .include "data/maps/SSAnne_CaptainsOffice5/header.inc" - .include "data/maps/SixIsland_DottedHole_B1F/header.inc" - .include "data/maps/SixIsland_DottedHole_B2F/header.inc" - .include "data/maps/SixIsland_DottedHole_B3F/header.inc" - .include "data/maps/SSAnne_CaptainsOffice9/header.inc" - .include "data/maps/SixIsland_DottedHole_SapphireRoom/header.inc" - .include "data/maps/SSAnne_1F_Room11/header.inc" - .include "data/maps/SSAnne_1F_Room12/header.inc" - .include "data/maps/NavelRock_Exterior/header.inc" - .include "data/maps/SevenIsland_TrainerTower_1F/header.inc" - .include "data/maps/SevenIsland_TrainerTower_2F/header.inc" - .include "data/maps/SevenIsland_TrainerTower_3F/header.inc" - .include "data/maps/SevenIsland_TrainerTower_4F/header.inc" - .include "data/maps/SevenIsland_TrainerTower_5F/header.inc" - .include "data/maps/SevenIsland_TrainerTower_6F/header.inc" - .include "data/maps/SevenIsland_TrainerTower_7F/header.inc" - .include "data/maps/SevenIsland_TrainerTower_8F/header.inc" - .include "data/maps/SevenIsland_TrainerTower_Roof/header.inc" - .include "data/maps/SevenIsland_TrainerTower_Lobby/header.inc" - .include "data/maps/SevenIsland_TrainerTower_Elevator/header.inc" - .include "data/maps/FiveIsland_LostCave_Entrance/header.inc" - .include "data/maps/FiveIsland_LostCave_Room1/header.inc" - .include "data/maps/FiveIsland_LostCave_Room2/header.inc" - .include "data/maps/FiveIsland_LostCave_Room3/header.inc" - .include "data/maps/FiveIsland_LostCave_Room4/header.inc" - .include "data/maps/FiveIsland_LostCave_Room5/header.inc" - .include "data/maps/FiveIsland_LostCave_Room6/header.inc" - .include "data/maps/FiveIsland_LostCave_Room7/header.inc" - .include "data/maps/FiveIsland_LostCave_Room8/header.inc" - .include "data/maps/FiveIsland_LostCave_Room9/header.inc" - .include "data/maps/FiveIsland_LostCave_Room10/header.inc" - .include "data/maps/FiveIsland_LostCave_Room11/header.inc" - .include "data/maps/FiveIsland_LostCave_Room12/header.inc" - .include "data/maps/FiveIsland_LostCave_Room13/header.inc" - .include "data/maps/FiveIsland_LostCave_Room14/header.inc" - .include "data/maps/SevenIsland_TanobyRuins_MoneanChamber/header.inc" - .include "data/maps/SevenIsland_TanobyRuins_LiptooChamber/header.inc" - .include "data/maps/SevenIsland_TanobyRuins_WeepthChamber/header.inc" - .include "data/maps/SevenIsland_TanobyRuins_DilfordChamber/header.inc" - .include "data/maps/SevenIsland_TanobyRuins_ScufibChamber/header.inc" - .include "data/maps/SevenIsland_TanobyRuins_RixyChamber/header.inc" - .include "data/maps/SevenIsland_TanobyRuins_ViapoisChamber/header.inc" - .include "data/maps/ThreeIsland_DunsparceTunnel/header.inc" - .include "data/maps/SevenIsland_SeavaultCanyon_TanobyKey/header.inc" - .include "data/maps/NavelRock_1F/header.inc" - .include "data/maps/NavelRock_Summit/header.inc" - .include "data/maps/NavelRock_Base/header.inc" - .include "data/maps/NavelRock_SummitPath_2F/header.inc" - .include "data/maps/NavelRock_SummitPath_3F/header.inc" - .include "data/maps/NavelRock_SummitPath_4F/header.inc" - .include "data/maps/NavelRock_SummitPath_5F/header.inc" - .include "data/maps/NavelRock_BasePath_B1F/header.inc" - .include "data/maps/NavelRock_BasePath_B2F/header.inc" - .include "data/maps/NavelRock_BasePath_B3F/header.inc" - .include "data/maps/NavelRock_BasePath_B4F/header.inc" - .include "data/maps/NavelRock_BasePath_B5F/header.inc" - .include "data/maps/NavelRock_BasePath_B6F/header.inc" - .include "data/maps/NavelRock_BasePath_B7F/header.inc" - .include "data/maps/NavelRock_BasePath_B8F/header.inc" - .include "data/maps/NavelRock_BasePath_B9F/header.inc" - .include "data/maps/NavelRock_BasePath_B10F/header.inc" - .include "data/maps/NavelRock_BasePath_B11F/header.inc" - .include "data/maps/NavelRock_B1F/header.inc" - .include "data/maps/NavelRock_Fork/header.inc" - .include "data/maps/BirthIsland_Exterior/header.inc" - .include "data/maps/OneIsland_KindleRoad_EmberSpa/header.inc" - .include "data/maps/BirthIsland_Harbor/header.inc" - .include "data/maps/NavelRock_Harbor/header.inc" - .include "data/maps/PalletTown/header.inc" - .include "data/maps/ViridianCity/header.inc" - .include "data/maps/PewterCity/header.inc" - .include "data/maps/CeruleanCity/header.inc" - .include "data/maps/LavenderTown/header.inc" - .include "data/maps/VermilionCity/header.inc" - .include "data/maps/CeladonCity/header.inc" - .include "data/maps/FuchsiaCity/header.inc" - .include "data/maps/CinnabarIsland/header.inc" - .include "data/maps/IndigoPlateau_Exterior/header.inc" - .include "data/maps/SaffronCity_Duplicate/header.inc" - .include "data/maps/SaffronCity/header.inc" - .include "data/maps/OneIsland/header.inc" - .include "data/maps/TwoIsland/header.inc" - .include "data/maps/ThreeIsland/header.inc" - .include "data/maps/FourIsland/header.inc" - .include "data/maps/FiveIsland/header.inc" - .include "data/maps/SevenIsland/header.inc" - .include "data/maps/SixIsland/header.inc" - .include "data/maps/Route1/header.inc" - .include "data/maps/Route2/header.inc" - .include "data/maps/Route3/header.inc" - .include "data/maps/Route4/header.inc" - .include "data/maps/Route5/header.inc" - .include "data/maps/Route6/header.inc" - .include "data/maps/Route7/header.inc" - .include "data/maps/Route8/header.inc" - .include "data/maps/Route9/header.inc" - .include "data/maps/Route10/header.inc" - .include "data/maps/Route11/header.inc" - .include "data/maps/Route12/header.inc" - .include "data/maps/Route13/header.inc" - .include "data/maps/Route14/header.inc" - .include "data/maps/Route15/header.inc" - .include "data/maps/Route16/header.inc" - .include "data/maps/Route17/header.inc" - .include "data/maps/Route18/header.inc" - .include "data/maps/Route19/header.inc" - .include "data/maps/Route20/header.inc" - .include "data/maps/Route21_North/header.inc" - .include "data/maps/Route21_South/header.inc" - .include "data/maps/Route22/header.inc" - .include "data/maps/Route23/header.inc" - .include "data/maps/Route24/header.inc" - .include "data/maps/Route25/header.inc" - .include "data/maps/OneIsland_KindleRoad/header.inc" - .include "data/maps/OneIsland_TreasureBeach/header.inc" - .include "data/maps/TwoIsland_CapeBrink/header.inc" - .include "data/maps/ThreeIsland_BondBridge/header.inc" - .include "data/maps/ThreeIsland_Port/header.inc" - .include "data/maps/UnknownMap_03_50/header.inc" - .include "data/maps/UnknownMap_03_51/header.inc" - .include "data/maps/UnknownMap_03_52/header.inc" - .include "data/maps/UnknownMap_03_53/header.inc" - .include "data/maps/FiveIsland_ResortGorgeous/header.inc" - .include "data/maps/FiveIsland_WaterLabyrinth/header.inc" - .include "data/maps/FiveIsland_Meadow/header.inc" - .include "data/maps/FiveIsland_MemorialPillar/header.inc" - .include "data/maps/SixIsland_OutcastIsland/header.inc" - .include "data/maps/SixIsland_GreenPath/header.inc" - .include "data/maps/SixIsland_WaterPath/header.inc" - .include "data/maps/SixIsland_RuinValley/header.inc" - .include "data/maps/SevenIsland_TrainerTower/header.inc" - .include "data/maps/SevenIsland_SevaultCanyon_Entrance/header.inc" - .include "data/maps/SevenIsland_SevaultCanyon/header.inc" - .include "data/maps/SevenIsland_TanobyRuins/header.inc" - .include "data/maps/PalletTown_PlayersHouse_1F/header.inc" - .include "data/maps/PalletTown_PlayersHouse_2F/header.inc" - .include "data/maps/PalletTown_GarysHouse/header.inc" - .include "data/maps/PalletTown_ProfessorOaksLab/header.inc" - .include "data/maps/ViridianCity_House1/header.inc" - .include "data/maps/ViridianCity_Gym/header.inc" - .include "data/maps/ViridianCity_House2/header.inc" - .include "data/maps/ViridianCity_Mart/header.inc" - .include "data/maps/ViridianCity_PokemonCenter_1F/header.inc" - .include "data/maps/ViridianCity_PokemonCenter_2F/header.inc" - .include "data/maps/PewterCity_Museum_1F/header.inc" - .include "data/maps/PewterCity_Museum_2F/header.inc" - .include "data/maps/PewterCity_Gym/header.inc" - .include "data/maps/PewterCity_Mart/header.inc" - .include "data/maps/PewterCity_House1/header.inc" - .include "data/maps/PewterCity_PokemonCenter_1F/header.inc" - .include "data/maps/PewterCity_PokemonCenter_2F/header.inc" - .include "data/maps/PewterCity_House2/header.inc" - .include "data/maps/CeruleanCity_House1/header.inc" - .include "data/maps/CeruleanCity_House2/header.inc" - .include "data/maps/CeruleanCity_House3/header.inc" - .include "data/maps/CeruleanCity_PokemonCenter_1F/header.inc" - .include "data/maps/CeruleanCity_PokemonCenter_2F/header.inc" - .include "data/maps/CeruleanCity_Gym/header.inc" - .include "data/maps/CeruleanCity_BikeShop/header.inc" - .include "data/maps/CeruleanCity_Mart/header.inc" - .include "data/maps/CeruleanCity_House4/header.inc" - .include "data/maps/CeruleanCity_House5/header.inc" - .include "data/maps/LavenderTown_PokemonCenter_1F/header.inc" - .include "data/maps/LavenderTown_PokemonCenter_2F/header.inc" - .include "data/maps/LavenderTown_VolunteerPokemonHouse/header.inc" - .include "data/maps/LavenderTown_House1/header.inc" - .include "data/maps/LavenderTown_House2/header.inc" - .include "data/maps/LavenderTown_Mart/header.inc" - .include "data/maps/VermilionCity_House1/header.inc" - .include "data/maps/VermilionCity_PokemonCenter_1F/header.inc" - .include "data/maps/VermilionCity_PokemonCenter_2F/header.inc" - .include "data/maps/VermilionCity_PokemonFanClub/header.inc" - .include "data/maps/VermilionCity_House2/header.inc" - .include "data/maps/VermilionCity_Mart/header.inc" - .include "data/maps/VermilionCity_Gym/header.inc" - .include "data/maps/VermilionCity_House3/header.inc" - .include "data/maps/CeladonCity_DepartmentStore_1F/header.inc" - .include "data/maps/CeladonCity_DepartmentStore_2F/header.inc" - .include "data/maps/CeladonCity_DepartmentStore_3F/header.inc" - .include "data/maps/CeladonCity_DepartmentStore_4F/header.inc" - .include "data/maps/CeladonCity_DepartmentStore_5F/header.inc" - .include "data/maps/CeladonCity_DepartmentStore_Roof/header.inc" - .include "data/maps/CeladonCity_DepartmentStore_Elevator/header.inc" - .include "data/maps/CeladonCity_Condominiums_1F/header.inc" - .include "data/maps/CeladonCity_Condominiums_2F/header.inc" - .include "data/maps/CeladonCity_Condominiums_3F/header.inc" - .include "data/maps/CeladonCity_Condominiums_Roof/header.inc" - .include "data/maps/CeladonCity_Condominiums_RoofRoom/header.inc" - .include "data/maps/CeladonCity_PokemonCenter_1F/header.inc" - .include "data/maps/CeladonCity_PokemonCenter_2F/header.inc" - .include "data/maps/CeladonCity_GameCorner/header.inc" - .include "data/maps/CeladonCity_GameCorner_PrizeRoom/header.inc" - .include "data/maps/CeladonCity_Gym/header.inc" - .include "data/maps/CeladonCity_Restaurant/header.inc" - .include "data/maps/CeladonCity_House1/header.inc" - .include "data/maps/CeladonCity_Hotel/header.inc" - .include "data/maps/FuchsiaCity_SafariZone_Entrance/header.inc" - .include "data/maps/FuchsiaCity_Mart/header.inc" - .include "data/maps/FuchsiaCity_ZooBuilding/header.inc" - .include "data/maps/FuchsiaCity_Gym/header.inc" - .include "data/maps/FuchsiaCity_House1/header.inc" - .include "data/maps/FuchsiaCity_PokemonCenter_1F/header.inc" - .include "data/maps/FuchsiaCity_PokemonCenter_2F/header.inc" - .include "data/maps/FuchsiaCity_Building1/header.inc" - .include "data/maps/FuchsiaCity_House2/header.inc" - .include "data/maps/FuchsiaCity_House3/header.inc" - .include "data/maps/CinnabarIsland_Gym/header.inc" - .include "data/maps/CinnabarIsland_PokemonLab_Entrance/header.inc" - .include "data/maps/CinnabarIsland_PokemonLab_Lounge/header.inc" - .include "data/maps/CinnabarIsland_PokemonLab_ResearchRoom/header.inc" - .include "data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/header.inc" - .include "data/maps/CinnabarIsland_PokemonCenter_1F/header.inc" - .include "data/maps/CinnabarIsland_PokemonCenter_2F/header.inc" - .include "data/maps/CinnabarIsland_Mart/header.inc" - .include "data/maps/IndigoPlateau_PokemonCenter_1F/header.inc" - .include "data/maps/IndigoPlateau_PokemonCenter_2F/header.inc" - .include "data/maps/SaffronCity_House1_1F/header.inc" - .include "data/maps/SaffronCity_House1_2F/header.inc" - .include "data/maps/SaffronCity_Dojo/header.inc" - .include "data/maps/SaffronCity_Gym/header.inc" - .include "data/maps/SaffronCity_House2/header.inc" - .include "data/maps/SaffronCity_Mart/header.inc" - .include "data/maps/SaffronCity_PokemonCenter_1F/header.inc" - .include "data/maps/SaffronCity_PokemonCenter_2F/header.inc" - .include "data/maps/SaffronCity_House3/header.inc" - .include "data/maps/SaffronCity_PokemonTrainerFanClub/header.inc" - .include "data/maps/Route2_ViridianForest_SouthEntrance/header.inc" - .include "data/maps/Route2_House/header.inc" - .include "data/maps/Route2_EastBuilding/header.inc" - .include "data/maps/Route2_ViridianForest_NorthEntrance/header.inc" - .include "data/maps/Route4_PokemonCenter_1F/header.inc" - .include "data/maps/Route4_PokemonCenter_2F/header.inc" - .include "data/maps/Route5_PokemonDayCare/header.inc" - .include "data/maps/Route5_SouthEntrance/header.inc" - .include "data/maps/Route6_NorthEntrance/header.inc" - .include "data/maps/UnknownMap_18_01/header.inc" - .include "data/maps/Route7_EastEntrance/header.inc" - .include "data/maps/Route8_WestEntrance/header.inc" - .include "data/maps/Route10_PokemonCenter_1F/header.inc" - .include "data/maps/Route10_PokemonCenter_2F/header.inc" - .include "data/maps/Route11_EastEntrance_1F/header.inc" - .include "data/maps/Route11_EastEntrance_2F/header.inc" - .include "data/maps/Route12_NorthEntrance_1F/header.inc" - .include "data/maps/Route12_NorthEntrance_2F/header.inc" - .include "data/maps/Route12_FishingHouse/header.inc" - .include "data/maps/Route15_WestEntrance_1F/header.inc" - .include "data/maps/Route15_WestEntrance_2F/header.inc" - .include "data/maps/Route16_House/header.inc" - .include "data/maps/Route16_NorthEntrance_1F/header.inc" - .include "data/maps/Route16_NorthEntrance_2F/header.inc" - .include "data/maps/Route18_EastEntrance_1F/header.inc" - .include "data/maps/Route18_EastEntrance_2F/header.inc" - .include "data/maps/UnusedHouse_27_00/header.inc" - .include "data/maps/Route22_NorthEntrance/header.inc" - .include "data/maps/UnusedHouse_29_00/header.inc" - .include "data/maps/Route25_SeaCottage/header.inc" - .include "data/maps/SevenIsland_House_Room1/header.inc" - .include "data/maps/SevenIsland_House_Room2/header.inc" - .include "data/maps/SevenIsland_Mart/header.inc" - .include "data/maps/SevenIsland_PokemonCenter_1F/header.inc" - .include "data/maps/SevenIsland_PokemonCenter_2F/header.inc" - .include "data/maps/UnusedHouse_31_05/header.inc" - .include "data/maps/SevenIsland_Harbor/header.inc" - .include "data/maps/OneIsland_PokemonCenter_1F/header.inc" - .include "data/maps/OneIsland_PokemonCenter_2F/header.inc" - .include "data/maps/OneIsland_House1/header.inc" - .include "data/maps/OneIsland_House2/header.inc" - .include "data/maps/OneIsland_Harbor/header.inc" - .include "data/maps/TwoIsland_JoyfulGameCorner/header.inc" - .include "data/maps/TwoIsland_House/header.inc" - .include "data/maps/TwoIsland_PokemonCenter_1F/header.inc" - .include "data/maps/TwoIsland_PokemonCenter_2F/header.inc" - .include "data/maps/TwoIsland_Harbor/header.inc" - .include "data/maps/ThreeIsland_House1/header.inc" - .include "data/maps/ThreeIsland_PokemonCenter_1F/header.inc" - .include "data/maps/ThreeIsland_PokemonCenter_2F/header.inc" - .include "data/maps/ThreeIsland_Mart/header.inc" - .include "data/maps/ThreeIsland_House2/header.inc" - .include "data/maps/ThreeIsland_House3/header.inc" - .include "data/maps/ThreeIsland_House4/header.inc" - .include "data/maps/ThreeIsland_House5/header.inc" - .include "data/maps/FourIsland_PokemonDayCare/header.inc" - .include "data/maps/FourIsland_PokemonCenter_1F/header.inc" - .include "data/maps/FourIsland_PokemonCenter_2F/header.inc" - .include "data/maps/FourIsland_House1/header.inc" - .include "data/maps/FourIsland_LoreleisHouse/header.inc" - .include "data/maps/FourIsland_Harbor/header.inc" - .include "data/maps/FourIsland_House2/header.inc" - .include "data/maps/FourIsland_Mart/header.inc" - .include "data/maps/FiveIsland_PokemonCenter_1F/header.inc" - .include "data/maps/FiveIsland_PokemonCenter_2F/header.inc" - .include "data/maps/FiveIsland_Harbor/header.inc" - .include "data/maps/FiveIsland_House1/header.inc" - .include "data/maps/FiveIsland_House2/header.inc" - .include "data/maps/SixIsland_PokemonCenter_1F/header.inc" - .include "data/maps/SixIsland_PokemonCenter_2F/header.inc" - .include "data/maps/SixIsland_Harbor/header.inc" - .include "data/maps/SixIsland_House/header.inc" - .include "data/maps/SixIsland_Mart/header.inc" - .include "data/maps/ThreeIsland_Harbor/header.inc" - .include "data/maps/FiveIsland_ResortGorgeous_House/header.inc" - .include "data/maps/TwoIsland_CapeBrink_House/header.inc" - .include "data/maps/SixIsland_WaterPath_House1/header.inc" - .include "data/maps/SixIsland_WaterPath_House2/header.inc" - .include "data/maps/SevenIsland_SevaultCanyon_House/header.inc" diff --git a/data/maps/map_groups.json b/data/maps/map_groups.json new file mode 100644 index 000000000..3f4e458ca --- /dev/null +++ b/data/maps/map_groups.json @@ -0,0 +1,623 @@ +{ + "group_order": [ + "gMapGroup0", + "gMapGroup1", + "gMapGroup2", + "gMapGroup3", + "gMapGroup4", + "gMapGroup5", + "gMapGroup6", + "gMapGroup7", + "gMapGroup8", + "gMapGroup9", + "gMapGroup10", + "gMapGroup11", + "gMapGroup12", + "gMapGroup13", + "gMapGroup14", + "gMapGroup15", + "gMapGroup16", + "gMapGroup17", + "gMapGroup18", + "gMapGroup19", + "gMapGroup20", + "gMapGroup21", + "gMapGroup22", + "gMapGroup23", + "gMapGroup24", + "gMapGroup25", + "gMapGroup26", + "gMapGroup27", + "gMapGroup28", + "gMapGroup29", + "gMapGroup30", + "gMapGroup31", + "gMapGroup32", + "gMapGroup33", + "gMapGroup34", + "gMapGroup35", + "gMapGroup36", + "gMapGroup37", + "gMapGroup38", + "gMapGroup39", + "gMapGroup40", + "gMapGroup41", + "gMapGroup42" + ], + "gMapGroup0": [ + "UnknownMap_00_00", + "UnknownMap_00_01", + "UnknownMap_00_02", + "UnknownMap_00_03", + "UnknownMap_00_04" + ], + "gMapGroup1": [ + "ViridianForest", + "MtMoon_1F", + "MtMoon_B1F", + "MtMoon_B2F", + "SSAnne_Exterior", + "SSAnne_1F_Corridor", + "SSAnne_2F_Corridor", + "SSAnne_3F_Corridor", + "SSAnne_B1F_Corridor", + "SSAnne_Deck", + "SSAnne_Kitchen", + "SSAnne_CaptainsOffice", + "SSAnne_1F_Room1", + "SSAnne_1F_Room2", + "SSAnne_1F_Room3", + "SSAnne_1F_Room4", + "SSAnne_1F_Room5", + "SSAnne_1F_Room7", + "SSAnne_2F_Room1", + "SSAnne_2F_Room2", + "SSAnne_2F_Room3", + "SSAnne_2F_Room4", + "SSAnne_2F_Room5", + "SSAnne_2F_Room6", + "SSAnne_B1F_Room1", + "SSAnne_B1F_Room2", + "SSAnne_B1F_Room3", + "SSAnne_B1F_Room4", + "SSAnne_B1F_Room5", + "SSAnne_1F_Room6", + "UndergroundPath_NorthEntrance", + "UndergroundPath_NorthSouthTunnel", + "UndergroundPath_SouthEntrance", + "UndergroundPath_WestEntrance", + "UndergroundPath_EastWestTunnel", + "UndergroundPath_EastEntrance", + "DiglettsCave_NorthEntrance", + "DiglettsCave_B1F", + "DiglettsCave_SouthEntrance", + "VictoryRoad_1F", + "VictoryRoad_2F", + "VictoryRoad_3F", + "RocketHideout_B1F", + "RocketHideout_B2F", + "RocketHideout_B3F", + "RocketHideout_B4F", + "RocketHideout_Elevator", + "SilphCo_1F", + "SilphCo_2F", + "SilphCo_3F", + "SilphCo_4F", + "SilphCo_5F", + "SilphCo_6F", + "SilphCo_7F", + "SilphCo_8F", + "SilphCo_9F", + "SilphCo_10F", + "SilphCo_11F", + "SilphCo_Elevator", + "PokemonMansion_1F", + "PokemonMansion_2F", + "PokemonMansion_3F", + "PokemonMansion_B1F", + "SafariZone_Center", + "SafariZone_East", + "SafariZone_North", + "SafariZone_West", + "SafariZone_Building1", + "SafariZone_Building2", + "SafariZone_Building3", + "SafariZone_Building4", + "SafariZone_SecretHouse", + "CeruleanCave_1F", + "CeruleanCave_2F", + "CeruleanCave_B1F", + "PokemonLeague_LoreleisRoom", + "PokemonLeague_BrunosRoom", + "PokemonLeague_AgathasRoom", + "PokemonLeague_LancesRoom", + "PokemonLeague_ChampionsRoom", + "PokemonLeague_HallOfFame", + "RockTunnel_1F", + "RockTunnel_B1F", + "SeafoamIslands_1F", + "SeafoamIslands_B1F", + "SeafoamIslands_B2F", + "SeafoamIslands_B3F", + "SeafoamIslands_B4F", + "PokemonTower_1F", + "PokemonTower_2F", + "PokemonTower_3F", + "PokemonTower_4F", + "PokemonTower_5F", + "PokemonTower_6F", + "PokemonTower_7F", + "PowerPlant", + "MtEmber_RubyPath_B4F", + "MtEmber_Exterior", + "MtEmber_SummitPath_1F", + "MtEmber_SummitPath_2F", + "MtEmber_SummitPath_3F", + "MtEmber_Summit", + "MtEmber_RubyPath_B5F", + "MtEmber_RubyPath_1F", + "MtEmber_RubyPath_B1F", + "MtEmber_RubyPath_B2F", + "MtEmber_RubyPath_B3F", + "MtEmber_RubyPath_B1F_Stairs", + "MtEmber_RubyPath_B2F_Stairs", + "ThreeIsland_BerryForest", + "FourIsland_IcefallCave_Entrance", + "FourIsland_IcefallCave_1F", + "FourIsland_IcefallCave_B1F", + "FourIsland_IcefallCave_Back", + "FiveIsland_RocketWarehouse", + "SixIsland_DottedHole_1F", + "SixIsland_DottedHole_B1F", + "SixIsland_DottedHole_B2F", + "SixIsland_DottedHole_B3F", + "SixIsland_DottedHole_B4F", + "SixIsland_DottedHole_SapphireRoom", + "SixIsland_PatternBush", + "SixIsland_AlteringCave" + ], + "gMapGroup2": [ + "NavelRock_Exterior", + "SevenIsland_TrainerTower_1F", + "SevenIsland_TrainerTower_2F", + "SevenIsland_TrainerTower_3F", + "SevenIsland_TrainerTower_4F", + "SevenIsland_TrainerTower_5F", + "SevenIsland_TrainerTower_6F", + "SevenIsland_TrainerTower_7F", + "SevenIsland_TrainerTower_8F", + "SevenIsland_TrainerTower_Roof", + "SevenIsland_TrainerTower_Lobby", + "SevenIsland_TrainerTower_Elevator", + "FiveIsland_LostCave_Entrance", + "FiveIsland_LostCave_Room1", + "FiveIsland_LostCave_Room2", + "FiveIsland_LostCave_Room3", + "FiveIsland_LostCave_Room4", + "FiveIsland_LostCave_Room5", + "FiveIsland_LostCave_Room6", + "FiveIsland_LostCave_Room7", + "FiveIsland_LostCave_Room8", + "FiveIsland_LostCave_Room9", + "FiveIsland_LostCave_Room10", + "FiveIsland_LostCave_Room11", + "FiveIsland_LostCave_Room12", + "FiveIsland_LostCave_Room13", + "FiveIsland_LostCave_Room14", + "SevenIsland_TanobyRuins_MoneanChamber", + "SevenIsland_TanobyRuins_LiptooChamber", + "SevenIsland_TanobyRuins_WeepthChamber", + "SevenIsland_TanobyRuins_DilfordChamber", + "SevenIsland_TanobyRuins_ScufibChamber", + "SevenIsland_TanobyRuins_RixyChamber", + "SevenIsland_TanobyRuins_ViapoisChamber", + "ThreeIsland_DunsparceTunnel", + "SevenIsland_SeavaultCanyon_TanobyKey", + "NavelRock_1F", + "NavelRock_Summit", + "NavelRock_Base", + "NavelRock_SummitPath_2F", + "NavelRock_SummitPath_3F", + "NavelRock_SummitPath_4F", + "NavelRock_SummitPath_5F", + "NavelRock_BasePath_B1F", + "NavelRock_BasePath_B2F", + "NavelRock_BasePath_B3F", + "NavelRock_BasePath_B4F", + "NavelRock_BasePath_B5F", + "NavelRock_BasePath_B6F", + "NavelRock_BasePath_B7F", + "NavelRock_BasePath_B8F", + "NavelRock_BasePath_B9F", + "NavelRock_BasePath_B10F", + "NavelRock_BasePath_B11F", + "NavelRock_B1F", + "NavelRock_Fork", + "BirthIsland_Exterior", + "OneIsland_KindleRoad_EmberSpa", + "BirthIsland_Harbor", + "NavelRock_Harbor" + ], + "gMapGroup3": [ + "PalletTown", + "ViridianCity", + "PewterCity", + "CeruleanCity", + "LavenderTown", + "VermilionCity", + "CeladonCity", + "FuchsiaCity", + "CinnabarIsland", + "IndigoPlateau_Exterior", + "SaffronCity_Duplicate", + "SaffronCity", + "OneIsland", + "TwoIsland", + "ThreeIsland", + "FourIsland", + "FiveIsland", + "SevenIsland", + "SixIsland", + "Route1", + "Route2", + "Route3", + "Route4", + "Route5", + "Route6", + "Route7", + "Route8", + "Route9", + "Route10", + "Route11", + "Route12", + "Route13", + "Route14", + "Route15", + "Route16", + "Route17", + "Route18", + "Route19", + "Route20", + "Route21_North", + "Route21_South", + "Route22", + "Route23", + "Route24", + "Route25", + "OneIsland_KindleRoad", + "OneIsland_TreasureBeach", + "TwoIsland_CapeBrink", + "ThreeIsland_BondBridge", + "ThreeIsland_Port", + "UnknownMap_03_50", + "UnknownMap_03_51", + "UnknownMap_03_52", + "UnknownMap_03_53", + "FiveIsland_ResortGorgeous", + "FiveIsland_WaterLabyrinth", + "FiveIsland_Meadow", + "FiveIsland_MemorialPillar", + "SixIsland_OutcastIsland", + "SixIsland_GreenPath", + "SixIsland_WaterPath", + "SixIsland_RuinValley", + "SevenIsland_TrainerTower", + "SevenIsland_SevaultCanyon_Entrance", + "SevenIsland_SevaultCanyon", + "SevenIsland_TanobyRuins" + ], + "gMapGroup4": [ + "PalletTown_PlayersHouse_1F", + "PalletTown_PlayersHouse_2F", + "PalletTown_GarysHouse", + "PalletTown_ProfessorOaksLab" + ], + "gMapGroup5": [ + "ViridianCity_House1", + "ViridianCity_Gym", + "ViridianCity_House2", + "ViridianCity_Mart", + "ViridianCity_PokemonCenter_1F", + "ViridianCity_PokemonCenter_2F" + ], + "gMapGroup6": [ + "PewterCity_Museum_1F", + "PewterCity_Museum_2F", + "PewterCity_Gym", + "PewterCity_Mart", + "PewterCity_House1", + "PewterCity_PokemonCenter_1F", + "PewterCity_PokemonCenter_2F", + "PewterCity_House2" + ], + "gMapGroup7": [ + "CeruleanCity_House1", + "CeruleanCity_House2", + "CeruleanCity_House3", + "CeruleanCity_PokemonCenter_1F", + "CeruleanCity_PokemonCenter_2F", + "CeruleanCity_Gym", + "CeruleanCity_BikeShop", + "CeruleanCity_Mart", + "CeruleanCity_House4", + "CeruleanCity_House5" + ], + "gMapGroup8": [ + "LavenderTown_PokemonCenter_1F", + "LavenderTown_PokemonCenter_2F", + "LavenderTown_VolunteerPokemonHouse", + "LavenderTown_House1", + "LavenderTown_House2", + "LavenderTown_Mart" + ], + "gMapGroup9": [ + "VermilionCity_House1", + "VermilionCity_PokemonCenter_1F", + "VermilionCity_PokemonCenter_2F", + "VermilionCity_PokemonFanClub", + "VermilionCity_House2", + "VermilionCity_Mart", + "VermilionCity_Gym", + "VermilionCity_House3" + ], + "gMapGroup10": [ + "CeladonCity_DepartmentStore_1F", + "CeladonCity_DepartmentStore_2F", + "CeladonCity_DepartmentStore_3F", + "CeladonCity_DepartmentStore_4F", + "CeladonCity_DepartmentStore_5F", + "CeladonCity_DepartmentStore_Roof", + "CeladonCity_DepartmentStore_Elevator", + "CeladonCity_Condominiums_1F", + "CeladonCity_Condominiums_2F", + "CeladonCity_Condominiums_3F", + "CeladonCity_Condominiums_Roof", + "CeladonCity_Condominiums_RoofRoom", + "CeladonCity_PokemonCenter_1F", + "CeladonCity_PokemonCenter_2F", + "CeladonCity_GameCorner", + "CeladonCity_GameCorner_PrizeRoom", + "CeladonCity_Gym", + "CeladonCity_Restaurant", + "CeladonCity_House1", + "CeladonCity_Hotel" + ], + "gMapGroup11": [ + "FuchsiaCity_SafariZone_Entrance", + "FuchsiaCity_Mart", + "FuchsiaCity_ZooBuilding", + "FuchsiaCity_Gym", + "FuchsiaCity_House1", + "FuchsiaCity_PokemonCenter_1F", + "FuchsiaCity_PokemonCenter_2F", + "FuchsiaCity_Building1", + "FuchsiaCity_House2", + "FuchsiaCity_House3" + ], + "gMapGroup12": [ + "CinnabarIsland_Gym", + "CinnabarIsland_PokemonLab_Entrance", + "CinnabarIsland_PokemonLab_Lounge", + "CinnabarIsland_PokemonLab_ResearchRoom", + "CinnabarIsland_PokemonLab_ExperimentRoom", + "CinnabarIsland_PokemonCenter_1F", + "CinnabarIsland_PokemonCenter_2F", + "CinnabarIsland_Mart" + ], + "gMapGroup13": [ + "IndigoPlateau_PokemonCenter_1F", + "IndigoPlateau_PokemonCenter_2F" + ], + "gMapGroup14": [ + "SaffronCity_House1_1F", + "SaffronCity_House1_2F", + "SaffronCity_Dojo", + "SaffronCity_Gym", + "SaffronCity_House2", + "SaffronCity_Mart", + "SaffronCity_PokemonCenter_1F", + "SaffronCity_PokemonCenter_2F", + "SaffronCity_House3", + "SaffronCity_PokemonTrainerFanClub" + ], + "gMapGroup15": [ + "Route2_ViridianForest_SouthEntrance", + "Route2_House", + "Route2_EastBuilding", + "Route2_ViridianForest_NorthEntrance" + ], + "gMapGroup16": [ + "Route4_PokemonCenter_1F", + "Route4_PokemonCenter_2F" + ], + "gMapGroup17": [ + "Route5_PokemonDayCare", + "Route5_SouthEntrance" + ], + "gMapGroup18": [ + "Route6_NorthEntrance", + "UnknownMap_18_01" + ], + "gMapGroup19": [ + "Route7_EastEntrance" + ], + "gMapGroup20": [ + "Route8_WestEntrance" + ], + "gMapGroup21": [ + "Route10_PokemonCenter_1F", + "Route10_PokemonCenter_2F" + ], + "gMapGroup22": [ + "Route11_EastEntrance_1F", + "Route11_EastEntrance_2F" + ], + "gMapGroup23": [ + "Route12_NorthEntrance_1F", + "Route12_NorthEntrance_2F", + "Route12_FishingHouse" + ], + "gMapGroup24": [ + "Route15_WestEntrance_1F", + "Route15_WestEntrance_2F" + ], + "gMapGroup25": [ + "Route16_House", + "Route16_NorthEntrance_1F", + "Route16_NorthEntrance_2F" + ], + "gMapGroup26": [ + "Route18_EastEntrance_1F", + "Route18_EastEntrance_2F" + ], + "gMapGroup27": [ + "UnusedHouse_27_00" + ], + "gMapGroup28": [ + "Route22_NorthEntrance" + ], + "gMapGroup29": [ + "UnusedHouse_29_00" + ], + "gMapGroup30": [ + "Route25_SeaCottage" + ], + "gMapGroup31": [ + "SevenIsland_House_Room1", + "SevenIsland_House_Room2", + "SevenIsland_Mart", + "SevenIsland_PokemonCenter_1F", + "SevenIsland_PokemonCenter_2F", + "UnusedHouse_31_05", + "SevenIsland_Harbor" + ], + "gMapGroup32": [ + "OneIsland_PokemonCenter_1F", + "OneIsland_PokemonCenter_2F", + "OneIsland_House1", + "OneIsland_House2", + "OneIsland_Harbor" + ], + "gMapGroup33": [ + "TwoIsland_JoyfulGameCorner", + "TwoIsland_House", + "TwoIsland_PokemonCenter_1F", + "TwoIsland_PokemonCenter_2F", + "TwoIsland_Harbor" + ], + "gMapGroup34": [ + "ThreeIsland_House1", + "ThreeIsland_PokemonCenter_1F", + "ThreeIsland_PokemonCenter_2F", + "ThreeIsland_Mart", + "ThreeIsland_House2", + "ThreeIsland_House3", + "ThreeIsland_House4", + "ThreeIsland_House5" + ], + "gMapGroup35": [ + "FourIsland_PokemonDayCare", + "FourIsland_PokemonCenter_1F", + "FourIsland_PokemonCenter_2F", + "FourIsland_House1", + "FourIsland_LoreleisHouse", + "FourIsland_Harbor", + "FourIsland_House2", + "FourIsland_Mart" + ], + "gMapGroup36": [ + "FiveIsland_PokemonCenter_1F", + "FiveIsland_PokemonCenter_2F", + "FiveIsland_Harbor", + "FiveIsland_House1", + "FiveIsland_House2" + ], + "gMapGroup37": [ + "SixIsland_PokemonCenter_1F", + "SixIsland_PokemonCenter_2F", + "SixIsland_Harbor", + "SixIsland_House", + "SixIsland_Mart" + ], + "gMapGroup38": [ + "ThreeIsland_Harbor" + ], + "gMapGroup39": [ + "FiveIsland_ResortGorgeous_House" + ], + "gMapGroup40": [ + "TwoIsland_CapeBrink_House" + ], + "gMapGroup41": [ + "SixIsland_WaterPath_House1", + "SixIsland_WaterPath_House2" + ], + "gMapGroup42": [ + "SevenIsland_SevaultCanyon_House" + ], + "connections_include_order": [ + "PalletTown", + "ViridianCity", + "PewterCity", + "CeruleanCity", + "LavenderTown", + "VermilionCity", + "CeladonCity", + "FuchsiaCity", + "CinnabarIsland", + "IndigoPlateau_Exterior", + "SaffronCity_Duplicate", + "SaffronCity", + "OneIsland", + "TwoIsland", + "ThreeIsland", + "FiveIsland", + "SevenIsland", + "SixIsland", + "Route1", + "Route2", + "Route3", + "Route4", + "Route5", + "Route6", + "Route7", + "Route8", + "Route9", + "Route10", + "Route11", + "Route12", + "Route13", + "Route14", + "Route15", + "Route16", + "Route17", + "Route18", + "Route19", + "Route20", + "Route21_North", + "Route21_South", + "Route22", + "Route23", + "Route24", + "Route25", + "OneIsland_KindleRoad", + "OneIsland_TreasureBeach", + "TwoIsland_CapeBrink", + "ThreeIsland_BondBridge", + "ThreeIsland_Port", + "UnknownMap_03_50", + "UnknownMap_03_51", + "FiveIsland_ResortGorgeous", + "FiveIsland_WaterLabyrinth", + "FiveIsland_Meadow", + "FiveIsland_MemorialPillar", + "SixIsland_OutcastIsland", + "SixIsland_GreenPath", + "SixIsland_WaterPath", + "SixIsland_RuinValley", + "SevenIsland_TrainerTower", + "SevenIsland_SevaultCanyon_Entrance", + "SevenIsland_SevaultCanyon", + "SevenIsland_TanobyRuins" + ] +}
\ No newline at end of file diff --git a/data/tilesets.s b/data/tilesets.s new file mode 100644 index 000000000..b8b50e652 --- /dev/null +++ b/data/tilesets.s @@ -0,0 +1,8 @@ + .include "asm/macros.inc" + .include "constants/constants.inc" + + .section .rodata + + .include "data/tilesets/graphics.inc" + .include "data/tilesets/metatiles.inc" + .include "data/tilesets/headers.inc" diff --git a/include/constants/layouts.h b/include/constants/layouts.h index b7568ee7c..b97ef69cb 100644 --- a/include/constants/layouts.h +++ b/include/constants/layouts.h @@ -267,18 +267,18 @@ #define LAYOUT_MT_EMBER_SUMMIT_PATH_1F 282 #define LAYOUT_MT_EMBER_SUMMIT_PATH_2F 283 #define LAYOUT_MT_EMBER_SUMMIT_PATH_3F 284 -#define LAYOUT_SSANNE_KITCHEN3 285 +#define LAYOUT_MT_EMBER_RUBY_PATH_1F 285 #define LAYOUT_MT_EMBER_RUBY_PATH_B1F 286 #define LAYOUT_MT_EMBER_RUBY_PATH_B2F 287 #define LAYOUT_MT_EMBER_RUBY_PATH_B3F 288 #define LAYOUT_MT_EMBER_RUBY_PATH_B1F_STAIRS 289 #define LAYOUT_MT_EMBER_RUBY_PATH_B2F_STAIRS 290 #define LAYOUT_MT_EMBER_RUBY_PATH_B5F 291 -#define LAYOUT_SSANNE_CAPTAINS_OFFICE4 292 +#define LAYOUT_FIVE_ISLAND_ROCKET_WAREHOUSE 292 #define LAYOUT_FOUR_ISLAND_ICEFALL_CAVE_ENTRANCE 293 #define LAYOUT_FOUR_ISLAND_ICEFALL_CAVE_1F 294 -#define LAYOUT_SSANNE_CAPTAINS_OFFICE2 295 -#define LAYOUT_SSANNE_CAPTAINS_OFFICE3 296 +#define LAYOUT_FOUR_ISLAND_ICEFALL_CAVE_B1F 295 +#define LAYOUT_FOUR_ISLAND_ICEFALL_CAVE_BACK 296 #define LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_LOBBY 297 #define LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_1F 298 #define LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_2F 299 @@ -291,15 +291,15 @@ #define LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_ROOF 306 #define LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_ELEVATOR 307 #define LAYOUT_CERULEAN_CITY_HOUSE5 308 -#define LAYOUT_SSANNE_CAPTAINS_OFFICE5 309 +#define LAYOUT_SIX_ISLAND_DOTTED_HOLE_1F 309 #define LAYOUT_SIX_ISLAND_DOTTED_HOLE_B1F 310 #define LAYOUT_SIX_ISLAND_DOTTED_HOLE_B2F 311 #define LAYOUT_SIX_ISLAND_DOTTED_HOLE_B3F 312 -#define LAYOUT_SSANNE_CAPTAINS_OFFICE9 313 +#define LAYOUT_SIX_ISLAND_DOTTED_HOLE_B4F 313 #define LAYOUT_SIX_ISLAND_DOTTED_HOLE_SAPPHIRE_ROOM 314 #define LAYOUT_ISLAND_HARBOR 315 #define LAYOUT_ONE_ISLAND_POKEMON_CENTER_2F 316 -#define LAYOUT_SSANNE_1F_ROOM11 317 +#define LAYOUT_SIX_ISLAND_PATTERN_BUSH 317 #define LAYOUT_THREE_ISLAND_DUNSPARCE_TUNNEL 318 #define LAYOUT_UNUSED_LAYOUT_83453C0 319 #define LAYOUT_FIVE_ISLAND_LOST_CAVE_ENTRANCE 320 @@ -322,7 +322,7 @@ #define LAYOUT_SEVEN_ISLAND_TANOBY_RUINS_WEEPTH_CHAMBER 337 #define LAYOUT_SEVEN_ISLAND_TANOBY_RUINS_DILFORD_CHAMBER 338 #define LAYOUT_SEVEN_ISLAND_TANOBY_RUINS_SCUFIB_CHAMBER 339 -#define LAYOUT_SSANNE_1F_ROOM12 340 +#define LAYOUT_SIX_ISLAND_ALTERING_CAVE 340 #define LAYOUT_SEVEN_ISLAND_SEAVAULT_CANYON_TANOBY_KEY 341 #define LAYOUT_BIRTH_ISLAND_EXTERIOR 342 #define LAYOUT_NAVEL_ROCK_EXTERIOR 343 diff --git a/include/constants/map_groups.h b/include/constants/map_groups.h index ee83799c9..d769520ca 100644 --- a/include/constants/map_groups.h +++ b/include/constants/map_groups.h @@ -9,378 +9,378 @@ #define MAP_UNKNOWN_MAP_00_04 (4 | (0 << 8)) // Map Group 1 -#define MAP_VIRIDIAN_FOREST (0 | (1 << 8)) -#define MAP_MT_MOON_1F (1 | (1 << 8)) -#define MAP_MT_MOON_B1F (2 | (1 << 8)) -#define MAP_MT_MOON_B2F (3 | (1 << 8)) -#define MAP_SSANNE_EXTERIOR (4 | (1 << 8)) -#define MAP_SSANNE_1F_CORRIDOR (5 | (1 << 8)) -#define MAP_SSANNE_2F_CORRIDOR (6 | (1 << 8)) -#define MAP_SSANNE_3F_CORRIDOR (7 | (1 << 8)) -#define MAP_SSANNE_B1F_CORRIDOR (8 | (1 << 8)) -#define MAP_SSANNE_DECK (9 | (1 << 8)) -#define MAP_SSANNE_KITCHEN (10 | (1 << 8)) -#define MAP_SSANNE_CAPTAINS_OFFICE (11 | (1 << 8)) -#define MAP_SSANNE_1F_ROOM1 (12 | (1 << 8)) -#define MAP_SSANNE_1F_ROOM2 (13 | (1 << 8)) -#define MAP_SSANNE_1F_ROOM3 (14 | (1 << 8)) -#define MAP_SSANNE_1F_ROOM4 (15 | (1 << 8)) -#define MAP_SSANNE_1F_ROOM5 (16 | (1 << 8)) -#define MAP_SSANNE_1F_ROOM7 (17 | (1 << 8)) -#define MAP_SSANNE_2F_ROOM1 (18 | (1 << 8)) -#define MAP_SSANNE_2F_ROOM2 (19 | (1 << 8)) -#define MAP_SSANNE_2F_ROOM3 (20 | (1 << 8)) -#define MAP_SSANNE_2F_ROOM4 (21 | (1 << 8)) -#define MAP_SSANNE_2F_ROOM5 (22 | (1 << 8)) -#define MAP_SSANNE_2F_ROOM6 (23 | (1 << 8)) -#define MAP_SSANNE_B1F_ROOM1 (24 | (1 << 8)) -#define MAP_SSANNE_B1F_ROOM2 (25 | (1 << 8)) -#define MAP_SSANNE_B1F_ROOM3 (26 | (1 << 8)) -#define MAP_SSANNE_B1F_ROOM4 (27 | (1 << 8)) -#define MAP_SSANNE_B1F_ROOM5 (28 | (1 << 8)) -#define MAP_SSANNE_1F_ROOM6 (29 | (1 << 8)) -#define MAP_UNDERGROUND_PATH_NORTH_ENTRANCE (30 | (1 << 8)) -#define MAP_UNDERGROUND_PATH_NORTH_SOUTH_TUNNEL (31 | (1 << 8)) -#define MAP_UNDERGROUND_PATH_SOUTH_ENTRANCE (32 | (1 << 8)) -#define MAP_UNDERGROUND_PATH_WEST_ENTRANCE (33 | (1 << 8)) -#define MAP_UNDERGROUND_PATH_EAST_WEST_TUNNEL (34 | (1 << 8)) -#define MAP_UNDERGROUND_PATH_EAST_ENTRANCE (35 | (1 << 8)) -#define MAP_DIGLETTS_CAVE_NORTH_ENTRANCE (36 | (1 << 8)) -#define MAP_DIGLETTS_CAVE_B1F (37 | (1 << 8)) -#define MAP_DIGLETTS_CAVE_SOUTH_ENTRANCE (38 | (1 << 8)) -#define MAP_VICTORY_ROAD_1F (39 | (1 << 8)) -#define MAP_VICTORY_ROAD_2F (40 | (1 << 8)) -#define MAP_VICTORY_ROAD_3F (41 | (1 << 8)) -#define MAP_ROCKET_HIDEOUT_B1F (42 | (1 << 8)) -#define MAP_ROCKET_HIDEOUT_B2F (43 | (1 << 8)) -#define MAP_ROCKET_HIDEOUT_B3F (44 | (1 << 8)) -#define MAP_ROCKET_HIDEOUT_B4F (45 | (1 << 8)) -#define MAP_ROCKET_HIDEOUT_ELEVATOR (46 | (1 << 8)) -#define MAP_SILPH_CO_1F (47 | (1 << 8)) -#define MAP_SILPH_CO_2F (48 | (1 << 8)) -#define MAP_SILPH_CO_3F (49 | (1 << 8)) -#define MAP_SILPH_CO_4F (50 | (1 << 8)) -#define MAP_SILPH_CO_5F (51 | (1 << 8)) -#define MAP_SILPH_CO_6F (52 | (1 << 8)) -#define MAP_SILPH_CO_7F (53 | (1 << 8)) -#define MAP_SILPH_CO_8F (54 | (1 << 8)) -#define MAP_SILPH_CO_9F (55 | (1 << 8)) -#define MAP_SILPH_CO_10F (56 | (1 << 8)) -#define MAP_SILPH_CO_11F (57 | (1 << 8)) -#define MAP_SILPH_CO_ELEVATOR (58 | (1 << 8)) -#define MAP_POKEMON_MANSION_1F (59 | (1 << 8)) -#define MAP_POKEMON_MANSION_2F (60 | (1 << 8)) -#define MAP_POKEMON_MANSION_3F (61 | (1 << 8)) -#define MAP_POKEMON_MANSION_B1F (62 | (1 << 8)) -#define MAP_SAFARI_ZONE_CENTER (63 | (1 << 8)) -#define MAP_SAFARI_ZONE_EAST (64 | (1 << 8)) -#define MAP_SAFARI_ZONE_NORTH (65 | (1 << 8)) -#define MAP_SAFARI_ZONE_WEST (66 | (1 << 8)) -#define MAP_SAFARI_ZONE_BUILDING1 (67 | (1 << 8)) -#define MAP_SAFARI_ZONE_BUILDING2 (68 | (1 << 8)) -#define MAP_SAFARI_ZONE_BUILDING3 (69 | (1 << 8)) -#define MAP_SAFARI_ZONE_BUILDING4 (70 | (1 << 8)) -#define MAP_SAFARI_ZONE_SECRET_HOUSE (71 | (1 << 8)) -#define MAP_CERULEAN_CAVE_1F (72 | (1 << 8)) -#define MAP_CERULEAN_CAVE_2F (73 | (1 << 8)) -#define MAP_CERULEAN_CAVE_B1F (74 | (1 << 8)) -#define MAP_POKEMON_LEAGUE_LORELEIS_ROOM (75 | (1 << 8)) -#define MAP_POKEMON_LEAGUE_BRUNOS_ROOM (76 | (1 << 8)) -#define MAP_POKEMON_LEAGUE_AGATHAS_ROOM (77 | (1 << 8)) -#define MAP_POKEMON_LEAGUE_LANCES_ROOM (78 | (1 << 8)) -#define MAP_POKEMON_LEAGUE_CHAMPIONS_ROOM (79 | (1 << 8)) -#define MAP_POKEMON_LEAGUE_HALL_OF_FAME (80 | (1 << 8)) -#define MAP_ROCK_TUNNEL_1F (81 | (1 << 8)) -#define MAP_ROCK_TUNNEL_B1F (82 | (1 << 8)) -#define MAP_SEAFOAM_ISLANDS_1F (83 | (1 << 8)) -#define MAP_SEAFOAM_ISLANDS_B1F (84 | (1 << 8)) -#define MAP_SEAFOAM_ISLANDS_B2F (85 | (1 << 8)) -#define MAP_SEAFOAM_ISLANDS_B3F (86 | (1 << 8)) -#define MAP_SEAFOAM_ISLANDS_B4F (87 | (1 << 8)) -#define MAP_POKEMON_TOWER_1F (88 | (1 << 8)) -#define MAP_POKEMON_TOWER_2F (89 | (1 << 8)) -#define MAP_POKEMON_TOWER_3F (90 | (1 << 8)) -#define MAP_POKEMON_TOWER_4F (91 | (1 << 8)) -#define MAP_POKEMON_TOWER_5F (92 | (1 << 8)) -#define MAP_POKEMON_TOWER_6F (93 | (1 << 8)) -#define MAP_POKEMON_TOWER_7F (94 | (1 << 8)) -#define MAP_POWER_PLANT (95 | (1 << 8)) -#define MAP_MT_EMBER_RUBY_PATH_B4F (96 | (1 << 8)) -#define MAP_MT_EMBER_EXTERIOR (97 | (1 << 8)) -#define MAP_MT_EMBER_SUMMITPATH_1F (98 | (1 << 8)) -#define MAP_MT_EMBER_SUMMITPATH_2F (99 | (1 << 8)) -#define MAP_MT_EMBER_SUMMITPATH_3F (100 | (1 << 8)) -#define MAP_MT_EMBER_SUMMIT (101 | (1 << 8)) -#define MAP_MT_EMBER_RUBY_PATH_B5F (102 | (1 << 8)) -#define MAP_MTEMBER_RUBYPATH_1F (103 | (1 << 8)) -#define MAP_MT_EMBER_RUBY_PATH_B1F (104 | (1 << 8)) -#define MAP_MT_EMBER_RUBY_PATH_B2F (105 | (1 << 8)) -#define MAP_MT_EMBER_RUBY_PATH_B3F (106 | (1 << 8)) -#define MAP_MT_EMBER_RUBY_PATH_B1F_STAIRS (107 | (1 << 8)) -#define MAP_MT_EMBER_RUBY_PATH_B2F_STAIRS (108 | (1 << 8)) -#define MAP_THREE_ISLAND_BERRYFOREST (109 | (1 << 8)) -#define MAP_FOUR_ISLAND_ICEFALLCAVE_ENTRANCE (110 | (1 << 8)) -#define MAP_FOUR_ISLAND_ICEFALLCAVE_1F (111 | (1 << 8)) -#define MAP_FOUR_ISLAND_ICEFALLCAVE_B1F (112 | (1 << 8)) -#define MAP_FOUR_ISLAND_ICEFALLCAVE_BACK (113 | (1 << 8)) -#define MAP_FIVE_ISLAND_ROCKETWAREHOUSE (114 | (1 << 8)) -#define MAP_SIX_ISLAND_DOTTEDHOLE_1F (115 | (1 << 8)) -#define MAP_SIX_ISLAND_DOTTEDHOLE_B1F (116 | (1 << 8)) -#define MAP_SIX_ISLAND_DOTTEDHOLE_B2F (117 | (1 << 8)) -#define MAP_SIX_ISLAND_DOTTEDHOLE_B3F (118 | (1 << 8)) -#define MAP_SIX_ISLAND_DOTTEDHOLE_B4F (119 | (1 << 8)) -#define MAP_SIX_ISLAND_DOTTEDHOLE_SAPPHIREROOM (120 | (1 << 8)) -#define MAP_SIX_ISLAND_PATTERNBUSH (121 | (1 << 8)) -#define MAP_SIX_ISLAND_ALTERINGCAVE (122 | (1 << 8)) +#define MAP_VIRIDIAN_FOREST (0 | (1 << 8)) +#define MAP_MT_MOON_1F (1 | (1 << 8)) +#define MAP_MT_MOON_B1F (2 | (1 << 8)) +#define MAP_MT_MOON_B2F (3 | (1 << 8)) +#define MAP_SSANNE_EXTERIOR (4 | (1 << 8)) +#define MAP_SSANNE_1F_CORRIDOR (5 | (1 << 8)) +#define MAP_SSANNE_2F_CORRIDOR (6 | (1 << 8)) +#define MAP_SSANNE_3F_CORRIDOR (7 | (1 << 8)) +#define MAP_SSANNE_B1F_CORRIDOR (8 | (1 << 8)) +#define MAP_SSANNE_DECK (9 | (1 << 8)) +#define MAP_SSANNE_KITCHEN (10 | (1 << 8)) +#define MAP_SSANNE_CAPTAINS_OFFICE (11 | (1 << 8)) +#define MAP_SSANNE_1F_ROOM1 (12 | (1 << 8)) +#define MAP_SSANNE_1F_ROOM2 (13 | (1 << 8)) +#define MAP_SSANNE_1F_ROOM3 (14 | (1 << 8)) +#define MAP_SSANNE_1F_ROOM4 (15 | (1 << 8)) +#define MAP_SSANNE_1F_ROOM5 (16 | (1 << 8)) +#define MAP_SSANNE_1F_ROOM7 (17 | (1 << 8)) +#define MAP_SSANNE_2F_ROOM1 (18 | (1 << 8)) +#define MAP_SSANNE_2F_ROOM2 (19 | (1 << 8)) +#define MAP_SSANNE_2F_ROOM3 (20 | (1 << 8)) +#define MAP_SSANNE_2F_ROOM4 (21 | (1 << 8)) +#define MAP_SSANNE_2F_ROOM5 (22 | (1 << 8)) +#define MAP_SSANNE_2F_ROOM6 (23 | (1 << 8)) +#define MAP_SSANNE_B1F_ROOM1 (24 | (1 << 8)) +#define MAP_SSANNE_B1F_ROOM2 (25 | (1 << 8)) +#define MAP_SSANNE_B1F_ROOM3 (26 | (1 << 8)) +#define MAP_SSANNE_B1F_ROOM4 (27 | (1 << 8)) +#define MAP_SSANNE_B1F_ROOM5 (28 | (1 << 8)) +#define MAP_SSANNE_1F_ROOM6 (29 | (1 << 8)) +#define MAP_UNDERGROUND_PATH_NORTH_ENTRANCE (30 | (1 << 8)) +#define MAP_UNDERGROUND_PATH_NORTH_SOUTH_TUNNEL (31 | (1 << 8)) +#define MAP_UNDERGROUND_PATH_SOUTH_ENTRANCE (32 | (1 << 8)) +#define MAP_UNDERGROUND_PATH_WEST_ENTRANCE (33 | (1 << 8)) +#define MAP_UNDERGROUND_PATH_EAST_WEST_TUNNEL (34 | (1 << 8)) +#define MAP_UNDERGROUND_PATH_EAST_ENTRANCE (35 | (1 << 8)) +#define MAP_DIGLETTS_CAVE_NORTH_ENTRANCE (36 | (1 << 8)) +#define MAP_DIGLETTS_CAVE_B1F (37 | (1 << 8)) +#define MAP_DIGLETTS_CAVE_SOUTH_ENTRANCE (38 | (1 << 8)) +#define MAP_VICTORY_ROAD_1F (39 | (1 << 8)) +#define MAP_VICTORY_ROAD_2F (40 | (1 << 8)) +#define MAP_VICTORY_ROAD_3F (41 | (1 << 8)) +#define MAP_ROCKET_HIDEOUT_B1F (42 | (1 << 8)) +#define MAP_ROCKET_HIDEOUT_B2F (43 | (1 << 8)) +#define MAP_ROCKET_HIDEOUT_B3F (44 | (1 << 8)) +#define MAP_ROCKET_HIDEOUT_B4F (45 | (1 << 8)) +#define MAP_ROCKET_HIDEOUT_ELEVATOR (46 | (1 << 8)) +#define MAP_SILPH_CO_1F (47 | (1 << 8)) +#define MAP_SILPH_CO_2F (48 | (1 << 8)) +#define MAP_SILPH_CO_3F (49 | (1 << 8)) +#define MAP_SILPH_CO_4F (50 | (1 << 8)) +#define MAP_SILPH_CO_5F (51 | (1 << 8)) +#define MAP_SILPH_CO_6F (52 | (1 << 8)) +#define MAP_SILPH_CO_7F (53 | (1 << 8)) +#define MAP_SILPH_CO_8F (54 | (1 << 8)) +#define MAP_SILPH_CO_9F (55 | (1 << 8)) +#define MAP_SILPH_CO_10F (56 | (1 << 8)) +#define MAP_SILPH_CO_11F (57 | (1 << 8)) +#define MAP_SILPH_CO_ELEVATOR (58 | (1 << 8)) +#define MAP_POKEMON_MANSION_1F (59 | (1 << 8)) +#define MAP_POKEMON_MANSION_2F (60 | (1 << 8)) +#define MAP_POKEMON_MANSION_3F (61 | (1 << 8)) +#define MAP_POKEMON_MANSION_B1F (62 | (1 << 8)) +#define MAP_SAFARI_ZONE_CENTER (63 | (1 << 8)) +#define MAP_SAFARI_ZONE_EAST (64 | (1 << 8)) +#define MAP_SAFARI_ZONE_NORTH (65 | (1 << 8)) +#define MAP_SAFARI_ZONE_WEST (66 | (1 << 8)) +#define MAP_SAFARI_ZONE_BUILDING1 (67 | (1 << 8)) +#define MAP_SAFARI_ZONE_BUILDING2 (68 | (1 << 8)) +#define MAP_SAFARI_ZONE_BUILDING3 (69 | (1 << 8)) +#define MAP_SAFARI_ZONE_BUILDING4 (70 | (1 << 8)) +#define MAP_SAFARI_ZONE_SECRET_HOUSE (71 | (1 << 8)) +#define MAP_CERULEAN_CAVE_1F (72 | (1 << 8)) +#define MAP_CERULEAN_CAVE_2F (73 | (1 << 8)) +#define MAP_CERULEAN_CAVE_B1F (74 | (1 << 8)) +#define MAP_POKEMON_LEAGUE_LORELEIS_ROOM (75 | (1 << 8)) +#define MAP_POKEMON_LEAGUE_BRUNOS_ROOM (76 | (1 << 8)) +#define MAP_POKEMON_LEAGUE_AGATHAS_ROOM (77 | (1 << 8)) +#define MAP_POKEMON_LEAGUE_LANCES_ROOM (78 | (1 << 8)) +#define MAP_POKEMON_LEAGUE_CHAMPIONS_ROOM (79 | (1 << 8)) +#define MAP_POKEMON_LEAGUE_HALL_OF_FAME (80 | (1 << 8)) +#define MAP_ROCK_TUNNEL_1F (81 | (1 << 8)) +#define MAP_ROCK_TUNNEL_B1F (82 | (1 << 8)) +#define MAP_SEAFOAM_ISLANDS_1F (83 | (1 << 8)) +#define MAP_SEAFOAM_ISLANDS_B1F (84 | (1 << 8)) +#define MAP_SEAFOAM_ISLANDS_B2F (85 | (1 << 8)) +#define MAP_SEAFOAM_ISLANDS_B3F (86 | (1 << 8)) +#define MAP_SEAFOAM_ISLANDS_B4F (87 | (1 << 8)) +#define MAP_POKEMON_TOWER_1F (88 | (1 << 8)) +#define MAP_POKEMON_TOWER_2F (89 | (1 << 8)) +#define MAP_POKEMON_TOWER_3F (90 | (1 << 8)) +#define MAP_POKEMON_TOWER_4F (91 | (1 << 8)) +#define MAP_POKEMON_TOWER_5F (92 | (1 << 8)) +#define MAP_POKEMON_TOWER_6F (93 | (1 << 8)) +#define MAP_POKEMON_TOWER_7F (94 | (1 << 8)) +#define MAP_POWER_PLANT (95 | (1 << 8)) +#define MAP_MT_EMBER_RUBY_PATH_B4F (96 | (1 << 8)) +#define MAP_MT_EMBER_EXTERIOR (97 | (1 << 8)) +#define MAP_MT_EMBER_SUMMIT_PATH_1F (98 | (1 << 8)) +#define MAP_MT_EMBER_SUMMIT_PATH_2F (99 | (1 << 8)) +#define MAP_MT_EMBER_SUMMIT_PATH_3F (100 | (1 << 8)) +#define MAP_MT_EMBER_SUMMIT (101 | (1 << 8)) +#define MAP_MT_EMBER_RUBY_PATH_B5F (102 | (1 << 8)) +#define MAP_MT_EMBER_RUBY_PATH_1F (103 | (1 << 8)) +#define MAP_MT_EMBER_RUBY_PATH_B1F (104 | (1 << 8)) +#define MAP_MT_EMBER_RUBY_PATH_B2F (105 | (1 << 8)) +#define MAP_MT_EMBER_RUBY_PATH_B3F (106 | (1 << 8)) +#define MAP_MT_EMBER_RUBY_PATH_B1F_STAIRS (107 | (1 << 8)) +#define MAP_MT_EMBER_RUBY_PATH_B2F_STAIRS (108 | (1 << 8)) +#define MAP_THREE_ISLAND_BERRY_FOREST (109 | (1 << 8)) +#define MAP_FOUR_ISLAND_ICEFALL_CAVE_ENTRANCE (110 | (1 << 8)) +#define MAP_FOUR_ISLAND_ICEFALL_CAVE_1F (111 | (1 << 8)) +#define MAP_FOUR_ISLAND_ICEFALL_CAVE_B1F (112 | (1 << 8)) +#define MAP_FOUR_ISLAND_ICEFALL_CAVE_BACK (113 | (1 << 8)) +#define MAP_FIVE_ISLAND_ROCKET_WAREHOUSE (114 | (1 << 8)) +#define MAP_SIX_ISLAND_DOTTED_HOLE_1F (115 | (1 << 8)) +#define MAP_SIX_ISLAND_DOTTED_HOLE_B1F (116 | (1 << 8)) +#define MAP_SIX_ISLAND_DOTTED_HOLE_B2F (117 | (1 << 8)) +#define MAP_SIX_ISLAND_DOTTED_HOLE_B3F (118 | (1 << 8)) +#define MAP_SIX_ISLAND_DOTTED_HOLE_B4F (119 | (1 << 8)) +#define MAP_SIX_ISLAND_DOTTED_HOLE_SAPPHIRE_ROOM (120 | (1 << 8)) +#define MAP_SIX_ISLAND_PATTERN_BUSH (121 | (1 << 8)) +#define MAP_SIX_ISLAND_ALTERING_CAVE (122 | (1 << 8)) // Map Group 2 -#define MAP_NAVEL_ROCK_EXTERIOR (0 | (2 << 8)) -#define MAP_SEVEN_ISLAND_TRAINERTOWER_1F (1 | (2 << 8)) -#define MAP_SEVEN_ISLAND_TRAINERTOWER_2F (2 | (2 << 8)) -#define MAP_SEVEN_ISLAND_TRAINERTOWER_3F (3 | (2 << 8)) -#define MAP_SEVEN_ISLAND_TRAINERTOWER_4F (4 | (2 << 8)) -#define MAP_SEVEN_ISLAND_TRAINERTOWER_5F (5 | (2 << 8)) -#define MAP_SEVEN_ISLAND_TRAINERTOWER_6F (6 | (2 << 8)) -#define MAP_SEVEN_ISLAND_TRAINERTOWER_7F (7 | (2 << 8)) -#define MAP_SEVEN_ISLAND_TRAINERTOWER_8F (8 | (2 << 8)) -#define MAP_SEVEN_ISLAND_TRAINERTOWER_ROOF (9 | (2 << 8)) -#define MAP_SEVEN_ISLAND_TRAINERTOWER_LOBBY (10 | (2 << 8)) -#define MAP_SEVEN_ISLAND_TRAINERTOWER_ELEVATOR (11 | (2 << 8)) -#define MAP_FIVE_ISLAND_LOSTCAVE_ENTRANCE (12 | (2 << 8)) -#define MAP_FIVE_ISLAND_LOSTCAVE_ROOM1 (13 | (2 << 8)) -#define MAP_FIVE_ISLAND_LOSTCAVE_ROOM2 (14 | (2 << 8)) -#define MAP_FIVE_ISLAND_LOSTCAVE_ROOM3 (15 | (2 << 8)) -#define MAP_FIVE_ISLAND_LOSTCAVE_ROOM4 (16 | (2 << 8)) -#define MAP_FIVE_ISLAND_LOSTCAVE_ROOM5 (17 | (2 << 8)) -#define MAP_FIVE_ISLAND_LOSTCAVE_ROOM6 (18 | (2 << 8)) -#define MAP_FIVE_ISLAND_LOSTCAVE_ROOM7 (19 | (2 << 8)) -#define MAP_FIVE_ISLAND_LOSTCAVE_ROOM8 (20 | (2 << 8)) -#define MAP_FIVE_ISLAND_LOSTCAVE_ROOM9 (21 | (2 << 8)) -#define MAP_FIVE_ISLAND_LOSTCAVE_ROOM10 (22 | (2 << 8)) -#define MAP_FIVE_ISLAND_LOSTCAVE_ROOM11 (23 | (2 << 8)) -#define MAP_FIVE_ISLAND_LOSTCAVE_ROOM12 (24 | (2 << 8)) -#define MAP_FIVE_ISLAND_LOSTCAVE_ROOM13 (25 | (2 << 8)) -#define MAP_FIVE_ISLAND_LOSTCAVE_ROOM14 (26 | (2 << 8)) -#define MAP_SEVEN_ISLAND_TANOBYRUINS_MONEANCHAMBER (27 | (2 << 8)) -#define MAP_SEVEN_ISLAND_TANOBYRUINS_LIPTOOCHAMBER (28 | (2 << 8)) -#define MAP_SEVEN_ISLAND_TANOBYRUINS_WEEPTHCHAMBER (29 | (2 << 8)) -#define MAP_SEVEN_ISLAND_TANOBYRUINS_DILFORDCHAMBER (30 | (2 << 8)) -#define MAP_SEVEN_ISLAND_TANOBYRUINS_SCUFIBCHAMBER (31 | (2 << 8)) -#define MAP_SEVEN_ISLAND_TANOBYRUINS_RIXYCHAMBER (32 | (2 << 8)) -#define MAP_SEVEN_ISLAND_TANOBYRUINS_VIAPOISCHAMBER (33 | (2 << 8)) -#define MAP_THREE_ISLAND_DUNSPARCETUNNEL (34 | (2 << 8)) -#define MAP_SEVEN_ISLAND_SEAVAULTCANYON_TANOBYKEY (35 | (2 << 8)) -#define MAP_NAVEL_ROCK_1F (36 | (2 << 8)) -#define MAP_NAVEL_ROCK_SUMMIT (37 | (2 << 8)) -#define MAP_NAVEL_ROCK_BASE (38 | (2 << 8)) -#define MAP_NAVEL_ROCK_SUMMITPATH_2F (39 | (2 << 8)) -#define MAP_NAVEL_ROCK_SUMMITPATH_3F (40 | (2 << 8)) -#define MAP_NAVEL_ROCK_SUMMITPATH_4F (41 | (2 << 8)) -#define MAP_NAVEL_ROCK_SUMMITPATH_5F (42 | (2 << 8)) -#define MAP_NAVEL_ROCK_BASEPATH_B1F (43 | (2 << 8)) -#define MAP_NAVEL_ROCK_BASEPATH_B2F (44 | (2 << 8)) -#define MAP_NAVEL_ROCK_BASEPATH_B3F (45 | (2 << 8)) -#define MAP_NAVEL_ROCK_BASEPATH_B4F (46 | (2 << 8)) -#define MAP_NAVEL_ROCK_BASEPATH_B5F (47 | (2 << 8)) -#define MAP_NAVEL_ROCK_BASEPATH_B6F (48 | (2 << 8)) -#define MAP_NAVEL_ROCK_BASEPATH_B7F (49 | (2 << 8)) -#define MAP_NAVEL_ROCK_BASEPATH_B8F (50 | (2 << 8)) -#define MAP_NAVEL_ROCK_BASEPATH_B9F (51 | (2 << 8)) -#define MAP_NAVEL_ROCK_BASEPATH_B10F (52 | (2 << 8)) -#define MAP_NAVEL_ROCK_BASEPATH_B11F (53 | (2 << 8)) -#define MAP_NAVEL_ROCK_B1F (54 | (2 << 8)) -#define MAP_NAVEL_ROCK_FORK (55 | (2 << 8)) -#define MAP_BIRTH_ISLAND_EXTERIOR (56 | (2 << 8)) -#define MAP_ONE_ISLAND_KINDLEROAD_EMBERSPA (57 | (2 << 8)) -#define MAP_BIRTH_ISLAND_HARBOR (58 | (2 << 8)) -#define MAP_NAVEL_ROCK_HARBOR (59 | (2 << 8)) +#define MAP_NAVEL_ROCK_EXTERIOR (0 | (2 << 8)) +#define MAP_SEVEN_ISLAND_TRAINER_TOWER_1F (1 | (2 << 8)) +#define MAP_SEVEN_ISLAND_TRAINER_TOWER_2F (2 | (2 << 8)) +#define MAP_SEVEN_ISLAND_TRAINER_TOWER_3F (3 | (2 << 8)) +#define MAP_SEVEN_ISLAND_TRAINER_TOWER_4F (4 | (2 << 8)) +#define MAP_SEVEN_ISLAND_TRAINER_TOWER_5F (5 | (2 << 8)) +#define MAP_SEVEN_ISLAND_TRAINER_TOWER_6F (6 | (2 << 8)) +#define MAP_SEVEN_ISLAND_TRAINER_TOWER_7F (7 | (2 << 8)) +#define MAP_SEVEN_ISLAND_TRAINER_TOWER_8F (8 | (2 << 8)) +#define MAP_SEVEN_ISLAND_TRAINER_TOWER_ROOF (9 | (2 << 8)) +#define MAP_SEVEN_ISLAND_TRAINER_TOWER_LOBBY (10 | (2 << 8)) +#define MAP_SEVEN_ISLAND_TRAINER_TOWER_ELEVATOR (11 | (2 << 8)) +#define MAP_FIVE_ISLAND_LOST_CAVE_ENTRANCE (12 | (2 << 8)) +#define MAP_FIVE_ISLAND_LOST_CAVE_ROOM1 (13 | (2 << 8)) +#define MAP_FIVE_ISLAND_LOST_CAVE_ROOM2 (14 | (2 << 8)) +#define MAP_FIVE_ISLAND_LOST_CAVE_ROOM3 (15 | (2 << 8)) +#define MAP_FIVE_ISLAND_LOST_CAVE_ROOM4 (16 | (2 << 8)) +#define MAP_FIVE_ISLAND_LOST_CAVE_ROOM5 (17 | (2 << 8)) +#define MAP_FIVE_ISLAND_LOST_CAVE_ROOM6 (18 | (2 << 8)) +#define MAP_FIVE_ISLAND_LOST_CAVE_ROOM7 (19 | (2 << 8)) +#define MAP_FIVE_ISLAND_LOST_CAVE_ROOM8 (20 | (2 << 8)) +#define MAP_FIVE_ISLAND_LOST_CAVE_ROOM9 (21 | (2 << 8)) +#define MAP_FIVE_ISLAND_LOST_CAVE_ROOM10 (22 | (2 << 8)) +#define MAP_FIVE_ISLAND_LOST_CAVE_ROOM11 (23 | (2 << 8)) +#define MAP_FIVE_ISLAND_LOST_CAVE_ROOM12 (24 | (2 << 8)) +#define MAP_FIVE_ISLAND_LOST_CAVE_ROOM13 (25 | (2 << 8)) +#define MAP_FIVE_ISLAND_LOST_CAVE_ROOM14 (26 | (2 << 8)) +#define MAP_SEVEN_ISLAND_TANOBY_RUINS_MONEAN_CHAMBER (27 | (2 << 8)) +#define MAP_SEVEN_ISLAND_TANOBY_RUINS_LIPTOO_CHAMBER (28 | (2 << 8)) +#define MAP_SEVEN_ISLAND_TANOBY_RUINS_WEEPTH_CHAMBER (29 | (2 << 8)) +#define MAP_SEVEN_ISLAND_TANOBY_RUINS_DILFORD_CHAMBER (30 | (2 << 8)) +#define MAP_SEVEN_ISLAND_TANOBY_RUINS_SCUFIB_CHAMBER (31 | (2 << 8)) +#define MAP_SEVEN_ISLAND_TANOBY_RUINS_RIXY_CHAMBER (32 | (2 << 8)) +#define MAP_SEVEN_ISLAND_TANOBY_RUINS_VIAPOIS_CHAMBER (33 | (2 << 8)) +#define MAP_THREE_ISLAND_DUNSPARCE_TUNNEL (34 | (2 << 8)) +#define MAP_SEVEN_ISLAND_SEAVAULT_CANYON_TANOBY_KEY (35 | (2 << 8)) +#define MAP_NAVEL_ROCK_1F (36 | (2 << 8)) +#define MAP_NAVEL_ROCK_SUMMIT (37 | (2 << 8)) +#define MAP_NAVEL_ROCK_BASE (38 | (2 << 8)) +#define MAP_NAVEL_ROCK_SUMMIT_PATH_2F (39 | (2 << 8)) +#define MAP_NAVEL_ROCK_SUMMIT_PATH_3F (40 | (2 << 8)) +#define MAP_NAVEL_ROCK_SUMMIT_PATH_4F (41 | (2 << 8)) +#define MAP_NAVEL_ROCK_SUMMIT_PATH_5F (42 | (2 << 8)) +#define MAP_NAVEL_ROCK_BASE_PATH_B1F (43 | (2 << 8)) +#define MAP_NAVEL_ROCK_BASE_PATH_B2F (44 | (2 << 8)) +#define MAP_NAVEL_ROCK_BASE_PATH_B3F (45 | (2 << 8)) +#define MAP_NAVEL_ROCK_BASE_PATH_B4F (46 | (2 << 8)) +#define MAP_NAVEL_ROCK_BASE_PATH_B5F (47 | (2 << 8)) +#define MAP_NAVEL_ROCK_BASE_PATH_B6F (48 | (2 << 8)) +#define MAP_NAVEL_ROCK_BASE_PATH_B7F (49 | (2 << 8)) +#define MAP_NAVEL_ROCK_BASE_PATH_B8F (50 | (2 << 8)) +#define MAP_NAVEL_ROCK_BASE_PATH_B9F (51 | (2 << 8)) +#define MAP_NAVEL_ROCK_BASE_PATH_B10F (52 | (2 << 8)) +#define MAP_NAVEL_ROCK_BASE_PATH_B11F (53 | (2 << 8)) +#define MAP_NAVEL_ROCK_B1F (54 | (2 << 8)) +#define MAP_NAVEL_ROCK_FORK (55 | (2 << 8)) +#define MAP_BIRTH_ISLAND_EXTERIOR (56 | (2 << 8)) +#define MAP_ONE_ISLAND_KINDLE_ROAD_EMBER_SPA (57 | (2 << 8)) +#define MAP_BIRTH_ISLAND_HARBOR (58 | (2 << 8)) +#define MAP_NAVEL_ROCK_HARBOR (59 | (2 << 8)) // Map Group 3 -#define MAP_PALLET_TOWN (0 | (3 << 8)) -#define MAP_VIRIDIAN_CITY (1 | (3 << 8)) -#define MAP_PEWTER_CITY (2 | (3 << 8)) -#define MAP_CERULEAN_CITY (3 | (3 << 8)) -#define MAP_LAVENDER_TOWN (4 | (3 << 8)) -#define MAP_VERMILION_CITY (5 | (3 << 8)) -#define MAP_CELADON_CITY (6 | (3 << 8)) -#define MAP_FUCHSIA_CITY (7 | (3 << 8)) -#define MAP_CINNABAR_ISLAND (8 | (3 << 8)) -#define MAP_INDIGO_PLATEAU_EXTERIOR (9 | (3 << 8)) -#define MAP_SAFFRON_CITY_DUPLICATE (10 | (3 << 8)) -#define MAP_SAFFRON_CITY (11 | (3 << 8)) -#define MAP_ONE_ISLAND (12 | (3 << 8)) -#define MAP_TWO_ISLAND (13 | (3 << 8)) -#define MAP_THREE_ISLAND (14 | (3 << 8)) -#define MAP_FOUR_ISLAND (15 | (3 << 8)) -#define MAP_FIVE_ISLAND (16 | (3 << 8)) -#define MAP_SEVEN_ISLAND (17 | (3 << 8)) -#define MAP_SIX_ISLAND (18 | (3 << 8)) -#define MAP_ROUTE1 (19 | (3 << 8)) -#define MAP_ROUTE2 (20 | (3 << 8)) -#define MAP_ROUTE3 (21 | (3 << 8)) -#define MAP_ROUTE4 (22 | (3 << 8)) -#define MAP_ROUTE5 (23 | (3 << 8)) -#define MAP_ROUTE6 (24 | (3 << 8)) -#define MAP_ROUTE7 (25 | (3 << 8)) -#define MAP_ROUTE8 (26 | (3 << 8)) -#define MAP_ROUTE9 (27 | (3 << 8)) -#define MAP_ROUTE10 (28 | (3 << 8)) -#define MAP_ROUTE11 (29 | (3 << 8)) -#define MAP_ROUTE12 (30 | (3 << 8)) -#define MAP_ROUTE13 (31 | (3 << 8)) -#define MAP_ROUTE14 (32 | (3 << 8)) -#define MAP_ROUTE15 (33 | (3 << 8)) -#define MAP_ROUTE16 (34 | (3 << 8)) -#define MAP_ROUTE17 (35 | (3 << 8)) -#define MAP_ROUTE18 (36 | (3 << 8)) -#define MAP_ROUTE19 (37 | (3 << 8)) -#define MAP_ROUTE20 (38 | (3 << 8)) -#define MAP_ROUTE21_NORTH (39 | (3 << 8)) -#define MAP_ROUTE21_SOUTH (40 | (3 << 8)) -#define MAP_ROUTE22 (41 | (3 << 8)) -#define MAP_ROUTE23 (42 | (3 << 8)) -#define MAP_ROUTE24 (43 | (3 << 8)) -#define MAP_ROUTE25 (44 | (3 << 8)) -#define MAP_ONE_ISLAND_KINDLEROAD (45 | (3 << 8)) -#define MAP_ONE_ISLAND_TREASUREBEACH (46 | (3 << 8)) -#define MAP_TWO_ISLAND_CAPEBRINK (47 | (3 << 8)) -#define MAP_THREE_ISLAND_BONDBRIDGE (48 | (3 << 8)) -#define MAP_THREE_ISLAND_PORT (49 | (3 << 8)) -#define MAP_UNKNOWN_MAP_03_50 (50 | (3 << 8)) -#define MAP_UNKNOWN_MAP_03_51 (51 | (3 << 8)) -#define MAP_UNKNOWN_MAP_03_52 (52 | (3 << 8)) -#define MAP_UNKNOWN_MAP_03_53 (53 | (3 << 8)) -#define MAP_FIVE_ISLAND_RESORTGORGEOUS (54 | (3 << 8)) -#define MAP_FIVE_ISLAND_WATERLABYRINTH (55 | (3 << 8)) -#define MAP_FIVE_ISLAND_MEADOW (56 | (3 << 8)) -#define MAP_FIVE_ISLAND_MEMORIALPILLAR (57 | (3 << 8)) -#define MAP_SIX_ISLAND_OUTCASTISLAND (58 | (3 << 8)) -#define MAP_SIX_ISLAND_GREENPATH (59 | (3 << 8)) -#define MAP_SIX_ISLAND_WATERPATH (60 | (3 << 8)) -#define MAP_SIX_ISLAND_RUINVALLEY (61 | (3 << 8)) -#define MAP_SEVEN_ISLAND_TRAINERTOWER (62 | (3 << 8)) -#define MAP_SEVEN_ISLAND_SEVAULTCANYON_ENTRANCE (63 | (3 << 8)) -#define MAP_SEVEN_ISLAND_SEVAULTCANYON (64 | (3 << 8)) -#define MAP_SEVEN_ISLAND_TANOBYRUINS (65 | (3 << 8)) +#define MAP_PALLET_TOWN (0 | (3 << 8)) +#define MAP_VIRIDIAN_CITY (1 | (3 << 8)) +#define MAP_PEWTER_CITY (2 | (3 << 8)) +#define MAP_CERULEAN_CITY (3 | (3 << 8)) +#define MAP_LAVENDER_TOWN (4 | (3 << 8)) +#define MAP_VERMILION_CITY (5 | (3 << 8)) +#define MAP_CELADON_CITY (6 | (3 << 8)) +#define MAP_FUCHSIA_CITY (7 | (3 << 8)) +#define MAP_CINNABAR_ISLAND (8 | (3 << 8)) +#define MAP_INDIGO_PLATEAU_EXTERIOR (9 | (3 << 8)) +#define MAP_SAFFRON_CITY_DUPLICATE (10 | (3 << 8)) +#define MAP_SAFFRON_CITY (11 | (3 << 8)) +#define MAP_ONE_ISLAND (12 | (3 << 8)) +#define MAP_TWO_ISLAND (13 | (3 << 8)) +#define MAP_THREE_ISLAND (14 | (3 << 8)) +#define MAP_FOUR_ISLAND (15 | (3 << 8)) +#define MAP_FIVE_ISLAND (16 | (3 << 8)) +#define MAP_SEVEN_ISLAND (17 | (3 << 8)) +#define MAP_SIX_ISLAND (18 | (3 << 8)) +#define MAP_ROUTE1 (19 | (3 << 8)) +#define MAP_ROUTE2 (20 | (3 << 8)) +#define MAP_ROUTE3 (21 | (3 << 8)) +#define MAP_ROUTE4 (22 | (3 << 8)) +#define MAP_ROUTE5 (23 | (3 << 8)) +#define MAP_ROUTE6 (24 | (3 << 8)) +#define MAP_ROUTE7 (25 | (3 << 8)) +#define MAP_ROUTE8 (26 | (3 << 8)) +#define MAP_ROUTE9 (27 | (3 << 8)) +#define MAP_ROUTE10 (28 | (3 << 8)) +#define MAP_ROUTE11 (29 | (3 << 8)) +#define MAP_ROUTE12 (30 | (3 << 8)) +#define MAP_ROUTE13 (31 | (3 << 8)) +#define MAP_ROUTE14 (32 | (3 << 8)) +#define MAP_ROUTE15 (33 | (3 << 8)) +#define MAP_ROUTE16 (34 | (3 << 8)) +#define MAP_ROUTE17 (35 | (3 << 8)) +#define MAP_ROUTE18 (36 | (3 << 8)) +#define MAP_ROUTE19 (37 | (3 << 8)) +#define MAP_ROUTE20 (38 | (3 << 8)) +#define MAP_ROUTE21_NORTH (39 | (3 << 8)) +#define MAP_ROUTE21_SOUTH (40 | (3 << 8)) +#define MAP_ROUTE22 (41 | (3 << 8)) +#define MAP_ROUTE23 (42 | (3 << 8)) +#define MAP_ROUTE24 (43 | (3 << 8)) +#define MAP_ROUTE25 (44 | (3 << 8)) +#define MAP_ONE_ISLAND_KINDLE_ROAD (45 | (3 << 8)) +#define MAP_ONE_ISLAND_TREASURE_BEACH (46 | (3 << 8)) +#define MAP_TWO_ISLAND_CAPE_BRINK (47 | (3 << 8)) +#define MAP_THREE_ISLAND_BOND_BRIDGE (48 | (3 << 8)) +#define MAP_THREE_ISLAND_PORT (49 | (3 << 8)) +#define MAP_UNKNOWN_MAP_03_50 (50 | (3 << 8)) +#define MAP_UNKNOWN_MAP_03_51 (51 | (3 << 8)) +#define MAP_UNKNOWN_MAP_03_52 (52 | (3 << 8)) +#define MAP_UNKNOWN_MAP_03_53 (53 | (3 << 8)) +#define MAP_FIVE_ISLAND_RESORT_GORGEOUS (54 | (3 << 8)) +#define MAP_FIVE_ISLAND_WATER_LABYRINTH (55 | (3 << 8)) +#define MAP_FIVE_ISLAND_MEADOW (56 | (3 << 8)) +#define MAP_FIVE_ISLAND_MEMORIAL_PILLAR (57 | (3 << 8)) +#define MAP_SIX_ISLAND_OUTCAST_ISLAND (58 | (3 << 8)) +#define MAP_SIX_ISLAND_GREEN_PATH (59 | (3 << 8)) +#define MAP_SIX_ISLAND_WATER_PATH (60 | (3 << 8)) +#define MAP_SIX_ISLAND_RUIN_VALLEY (61 | (3 << 8)) +#define MAP_SEVEN_ISLAND_TRAINER_TOWER (62 | (3 << 8)) +#define MAP_SEVEN_ISLAND_SEVAULT_CANYON_ENTRANCE (63 | (3 << 8)) +#define MAP_SEVEN_ISLAND_SEVAULT_CANYON (64 | (3 << 8)) +#define MAP_SEVEN_ISLAND_TANOBY_RUINS (65 | (3 << 8)) // Map Group 4 -#define MAP_PALLET_TOWN_PLAYERSHOUSE_1F (0 | (4 << 8)) -#define MAP_PALLET_TOWN_PLAYERSHOUSE_2F (1 | (4 << 8)) -#define MAP_PALLET_TOWN_GARYSHOUSE (2 | (4 << 8)) -#define MAP_PALLET_TOWN_PROFESSOROAKSLAB (3 | (4 << 8)) +#define MAP_PALLET_TOWN_PLAYERS_HOUSE_1F (0 | (4 << 8)) +#define MAP_PALLET_TOWN_PLAYERS_HOUSE_2F (1 | (4 << 8)) +#define MAP_PALLET_TOWN_GARYS_HOUSE (2 | (4 << 8)) +#define MAP_PALLET_TOWN_PROFESSOR_OAKS_LAB (3 | (4 << 8)) // Map Group 5 -#define MAP_VIRIDIAN_CITY_HOUSE1 (0 | (5 << 8)) -#define MAP_VIRIDIAN_CITY_GYM (1 | (5 << 8)) -#define MAP_VIRIDIAN_CITY_HOUSE2 (2 | (5 << 8)) -#define MAP_VIRIDIAN_CITY_MART (3 | (5 << 8)) -#define MAP_VIRIDIAN_CITY_POKEMONCENTER_1F (4 | (5 << 8)) -#define MAP_VIRIDIAN_CITY_POKEMONCENTER_2F (5 | (5 << 8)) +#define MAP_VIRIDIAN_CITY_HOUSE1 (0 | (5 << 8)) +#define MAP_VIRIDIAN_CITY_GYM (1 | (5 << 8)) +#define MAP_VIRIDIAN_CITY_HOUSE2 (2 | (5 << 8)) +#define MAP_VIRIDIAN_CITY_MART (3 | (5 << 8)) +#define MAP_VIRIDIAN_CITY_POKEMON_CENTER_1F (4 | (5 << 8)) +#define MAP_VIRIDIAN_CITY_POKEMON_CENTER_2F (5 | (5 << 8)) // Map Group 6 -#define MAP_PEWTER_CITY_MUSEUM_1F (0 | (6 << 8)) -#define MAP_PEWTER_CITY_MUSEUM_2F (1 | (6 << 8)) -#define MAP_PEWTER_CITY_GYM (2 | (6 << 8)) -#define MAP_PEWTER_CITY_MART (3 | (6 << 8)) -#define MAP_PEWTER_CITY_HOUSE1 (4 | (6 << 8)) -#define MAP_PEWTER_CITY_POKEMONCENTER_1F (5 | (6 << 8)) -#define MAP_PEWTER_CITY_POKEMONCENTER_2F (6 | (6 << 8)) -#define MAP_PEWTER_CITY_HOUSE2 (7 | (6 << 8)) +#define MAP_PEWTER_CITY_MUSEUM_1F (0 | (6 << 8)) +#define MAP_PEWTER_CITY_MUSEUM_2F (1 | (6 << 8)) +#define MAP_PEWTER_CITY_GYM (2 | (6 << 8)) +#define MAP_PEWTER_CITY_MART (3 | (6 << 8)) +#define MAP_PEWTER_CITY_HOUSE1 (4 | (6 << 8)) +#define MAP_PEWTER_CITY_POKEMON_CENTER_1F (5 | (6 << 8)) +#define MAP_PEWTER_CITY_POKEMON_CENTER_2F (6 | (6 << 8)) +#define MAP_PEWTER_CITY_HOUSE2 (7 | (6 << 8)) // Map Group 7 -#define MAP_CERULEAN_CITY_HOUSE1 (0 | (7 << 8)) -#define MAP_CERULEAN_CITY_HOUSE2 (1 | (7 << 8)) -#define MAP_CERULEAN_CITY_HOUSE3 (2 | (7 << 8)) -#define MAP_CERULEAN_CITY_POKEMONCENTER_1F (3 | (7 << 8)) -#define MAP_CERULEAN_CITY_POKEMONCENTER_2F (4 | (7 << 8)) -#define MAP_CERULEAN_CITY_GYM (5 | (7 << 8)) -#define MAP_CERULEAN_CITY_BIKESHOP (6 | (7 << 8)) -#define MAP_CERULEAN_CITY_MART (7 | (7 << 8)) -#define MAP_CERULEAN_CITY_HOUSE4 (8 | (7 << 8)) -#define MAP_CERULEAN_CITY_HOUSE5 (9 | (7 << 8)) +#define MAP_CERULEAN_CITY_HOUSE1 (0 | (7 << 8)) +#define MAP_CERULEAN_CITY_HOUSE2 (1 | (7 << 8)) +#define MAP_CERULEAN_CITY_HOUSE3 (2 | (7 << 8)) +#define MAP_CERULEAN_CITY_POKEMON_CENTER_1F (3 | (7 << 8)) +#define MAP_CERULEAN_CITY_POKEMON_CENTER_2F (4 | (7 << 8)) +#define MAP_CERULEAN_CITY_GYM (5 | (7 << 8)) +#define MAP_CERULEAN_CITY_BIKE_SHOP (6 | (7 << 8)) +#define MAP_CERULEAN_CITY_MART (7 | (7 << 8)) +#define MAP_CERULEAN_CITY_HOUSE4 (8 | (7 << 8)) +#define MAP_CERULEAN_CITY_HOUSE5 (9 | (7 << 8)) // Map Group 8 -#define MAP_LAVENDER_TOWN_POKEMONCENTER_1F (0 | (8 << 8)) -#define MAP_LAVENDER_TOWN_POKEMONCENTER_2F (1 | (8 << 8)) -#define MAP_LAVENDER_TOWN_VOLUNTEERPOKEMONHOUSE (2 | (8 << 8)) -#define MAP_LAVENDER_TOWN_HOUSE1 (3 | (8 << 8)) -#define MAP_LAVENDER_TOWN_HOUSE2 (4 | (8 << 8)) -#define MAP_LAVENDER_TOWN_MART (5 | (8 << 8)) +#define MAP_LAVENDER_TOWN_POKEMON_CENTER_1F (0 | (8 << 8)) +#define MAP_LAVENDER_TOWN_POKEMON_CENTER_2F (1 | (8 << 8)) +#define MAP_LAVENDER_TOWN_VOLUNTEER_POKEMON_HOUSE (2 | (8 << 8)) +#define MAP_LAVENDER_TOWN_HOUSE1 (3 | (8 << 8)) +#define MAP_LAVENDER_TOWN_HOUSE2 (4 | (8 << 8)) +#define MAP_LAVENDER_TOWN_MART (5 | (8 << 8)) // Map Group 9 -#define MAP_VERMILION_CITY_HOUSE1 (0 | (9 << 8)) -#define MAP_VERMILION_CITY_POKEMONCENTER_1F (1 | (9 << 8)) -#define MAP_VERMILION_CITY_POKEMONCENTER_2F (2 | (9 << 8)) -#define MAP_VERMILION_CITY_POKEMONFANCLUB (3 | (9 << 8)) -#define MAP_VERMILION_CITY_HOUSE2 (4 | (9 << 8)) -#define MAP_VERMILION_CITY_MART (5 | (9 << 8)) -#define MAP_VERMILION_CITY_GYM (6 | (9 << 8)) -#define MAP_VERMILION_CITY_HOUSE3 (7 | (9 << 8)) +#define MAP_VERMILION_CITY_HOUSE1 (0 | (9 << 8)) +#define MAP_VERMILION_CITY_POKEMON_CENTER_1F (1 | (9 << 8)) +#define MAP_VERMILION_CITY_POKEMON_CENTER_2F (2 | (9 << 8)) +#define MAP_VERMILION_CITY_POKEMON_FAN_CLUB (3 | (9 << 8)) +#define MAP_VERMILION_CITY_HOUSE2 (4 | (9 << 8)) +#define MAP_VERMILION_CITY_MART (5 | (9 << 8)) +#define MAP_VERMILION_CITY_GYM (6 | (9 << 8)) +#define MAP_VERMILION_CITY_HOUSE3 (7 | (9 << 8)) // Map Group 10 -#define MAP_CELADON_CITY_DEPARTMENTSTORE_1F (0 | (10 << 8)) -#define MAP_CELADON_CITY_DEPARTMENTSTORE_2F (1 | (10 << 8)) -#define MAP_CELADON_CITY_DEPARTMENTSTORE_3F (2 | (10 << 8)) -#define MAP_CELADON_CITY_DEPARTMENTSTORE_4F (3 | (10 << 8)) -#define MAP_CELADON_CITY_DEPARTMENTSTORE_5F (4 | (10 << 8)) -#define MAP_CELADON_CITY_DEPARTMENTSTORE_ROOF (5 | (10 << 8)) -#define MAP_CELADON_CITY_DEPARTMENTSTORE_ELEVATOR (6 | (10 << 8)) -#define MAP_CELADON_CITY_CONDOMINIUMS_1F (7 | (10 << 8)) -#define MAP_CELADON_CITY_CONDOMINIUMS_2F (8 | (10 << 8)) -#define MAP_CELADON_CITY_CONDOMINIUMS_3F (9 | (10 << 8)) -#define MAP_CELADON_CITY_CONDOMINIUMS_ROOF (10 | (10 << 8)) -#define MAP_CELADON_CITY_CONDOMINIUMS_ROOFROOM (11 | (10 << 8)) -#define MAP_CELADON_CITY_POKEMONCENTER_1F (12 | (10 << 8)) -#define MAP_CELADON_CITY_POKEMONCENTER_2F (13 | (10 << 8)) -#define MAP_CELADON_CITY_GAMECORNER (14 | (10 << 8)) -#define MAP_CELADON_CITY_GAMECORNER_PRIZEROOM (15 | (10 << 8)) -#define MAP_CELADON_CITY_GYM (16 | (10 << 8)) -#define MAP_CELADON_CITY_RESTAURANT (17 | (10 << 8)) -#define MAP_CELADON_CITY_HOUSE1 (18 | (10 << 8)) -#define MAP_CELADON_CITY_HOTEL (19 | (10 << 8)) +#define MAP_CELADON_CITY_DEPARTMENT_STORE_1F (0 | (10 << 8)) +#define MAP_CELADON_CITY_DEPARTMENT_STORE_2F (1 | (10 << 8)) +#define MAP_CELADON_CITY_DEPARTMENT_STORE_3F (2 | (10 << 8)) +#define MAP_CELADON_CITY_DEPARTMENT_STORE_4F (3 | (10 << 8)) +#define MAP_CELADON_CITY_DEPARTMENT_STORE_5F (4 | (10 << 8)) +#define MAP_CELADON_CITY_DEPARTMENT_STORE_ROOF (5 | (10 << 8)) +#define MAP_CELADON_CITY_DEPARTMENT_STORE_ELEVATOR (6 | (10 << 8)) +#define MAP_CELADON_CITY_CONDOMINIUMS_1F (7 | (10 << 8)) +#define MAP_CELADON_CITY_CONDOMINIUMS_2F (8 | (10 << 8)) +#define MAP_CELADON_CITY_CONDOMINIUMS_3F (9 | (10 << 8)) +#define MAP_CELADON_CITY_CONDOMINIUMS_ROOF (10 | (10 << 8)) +#define MAP_CELADON_CITY_CONDOMINIUMS_ROOF_ROOM (11 | (10 << 8)) +#define MAP_CELADON_CITY_POKEMON_CENTER_1F (12 | (10 << 8)) +#define MAP_CELADON_CITY_POKEMON_CENTER_2F (13 | (10 << 8)) +#define MAP_CELADON_CITY_GAME_CORNER (14 | (10 << 8)) +#define MAP_CELADON_CITY_GAME_CORNER_PRIZE_ROOM (15 | (10 << 8)) +#define MAP_CELADON_CITY_GYM (16 | (10 << 8)) +#define MAP_CELADON_CITY_RESTAURANT (17 | (10 << 8)) +#define MAP_CELADON_CITY_HOUSE1 (18 | (10 << 8)) +#define MAP_CELADON_CITY_HOTEL (19 | (10 << 8)) // Map Group 11 -#define MAP_FUCHSIA_CITY_SAFARIZONE_ENTRANCE (0 | (11 << 8)) -#define MAP_FUCHSIA_CITY_MART (1 | (11 << 8)) -#define MAP_FUCHSIA_CITY_ZOOBUILDING (2 | (11 << 8)) -#define MAP_FUCHSIA_CITY_GYM (3 | (11 << 8)) -#define MAP_FUCHSIA_CITY_HOUSE1 (4 | (11 << 8)) -#define MAP_FUCHSIA_CITY_POKEMONCENTER_1F (5 | (11 << 8)) -#define MAP_FUCHSIA_CITY_POKEMONCENTER_2F (6 | (11 << 8)) -#define MAP_FUCHSIA_CITY_BUILDING1 (7 | (11 << 8)) -#define MAP_FUCHSIA_CITY_HOUSE2 (8 | (11 << 8)) -#define MAP_FUCHSIA_CITY_HOUSE3 (9 | (11 << 8)) +#define MAP_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE (0 | (11 << 8)) +#define MAP_FUCHSIA_CITY_MART (1 | (11 << 8)) +#define MAP_FUCHSIA_CITY_ZOO_BUILDING (2 | (11 << 8)) +#define MAP_FUCHSIA_CITY_GYM (3 | (11 << 8)) +#define MAP_FUCHSIA_CITY_HOUSE1 (4 | (11 << 8)) +#define MAP_FUCHSIA_CITY_POKEMON_CENTER_1F (5 | (11 << 8)) +#define MAP_FUCHSIA_CITY_POKEMON_CENTER_2F (6 | (11 << 8)) +#define MAP_FUCHSIA_CITY_BUILDING1 (7 | (11 << 8)) +#define MAP_FUCHSIA_CITY_HOUSE2 (8 | (11 << 8)) +#define MAP_FUCHSIA_CITY_HOUSE3 (9 | (11 << 8)) // Map Group 12 -#define MAP_CINNABAR_ISLAND_GYM (0 | (12 << 8)) -#define MAP_CINNABAR_ISLAND_POKEMONLAB_ENTRANCE (1 | (12 << 8)) -#define MAP_CINNABAR_ISLAND_POKEMONLAB_LOUNGE (2 | (12 << 8)) -#define MAP_CINNABAR_ISLAND_POKEMONLAB_RESEARCHROOM (3 | (12 << 8)) -#define MAP_CINNABAR_ISLAND_POKEMONLAB_EXPERIMENTROOM (4 | (12 << 8)) -#define MAP_CINNABAR_ISLAND_POKEMONCENTER_1F (5 | (12 << 8)) -#define MAP_CINNABAR_ISLAND_POKEMONCENTER_2F (6 | (12 << 8)) -#define MAP_CINNABAR_ISLAND_MART (7 | (12 << 8)) +#define MAP_CINNABAR_ISLAND_GYM (0 | (12 << 8)) +#define MAP_CINNABAR_ISLAND_POKEMON_LAB_ENTRANCE (1 | (12 << 8)) +#define MAP_CINNABAR_ISLAND_POKEMON_LAB_LOUNGE (2 | (12 << 8)) +#define MAP_CINNABAR_ISLAND_POKEMON_LAB_RESEARCH_ROOM (3 | (12 << 8)) +#define MAP_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM (4 | (12 << 8)) +#define MAP_CINNABAR_ISLAND_POKEMON_CENTER_1F (5 | (12 << 8)) +#define MAP_CINNABAR_ISLAND_POKEMON_CENTER_2F (6 | (12 << 8)) +#define MAP_CINNABAR_ISLAND_MART (7 | (12 << 8)) // Map Group 13 #define MAP_INDIGO_PLATEAU_POKEMON_CENTER_1F (0 | (13 << 8)) #define MAP_INDIGO_PLATEAU_POKEMON_CENTER_2F (1 | (13 << 8)) // Map Group 14 -#define MAP_SAFFRON_CITY_HOUSE1_1F (0 | (14 << 8)) -#define MAP_SAFFRON_CITY_HOUSE1_2F (1 | (14 << 8)) -#define MAP_SAFFRON_CITY_DOJO (2 | (14 << 8)) -#define MAP_SAFFRON_CITY_GYM (3 | (14 << 8)) -#define MAP_SAFFRON_CITY_HOUSE2 (4 | (14 << 8)) -#define MAP_SAFFRON_CITY_MART (5 | (14 << 8)) -#define MAP_SAFFRON_CITY_POKEMONCENTER_1F (6 | (14 << 8)) -#define MAP_SAFFRON_CITY_POKEMONCENTER_2F (7 | (14 << 8)) -#define MAP_SAFFRON_CITY_HOUSE3 (8 | (14 << 8)) -#define MAP_SAFFRON_CITY_POKEMONTRAINERFANCLUB (9 | (14 << 8)) +#define MAP_SAFFRON_CITY_HOUSE1_1F (0 | (14 << 8)) +#define MAP_SAFFRON_CITY_HOUSE1_2F (1 | (14 << 8)) +#define MAP_SAFFRON_CITY_DOJO (2 | (14 << 8)) +#define MAP_SAFFRON_CITY_GYM (3 | (14 << 8)) +#define MAP_SAFFRON_CITY_HOUSE2 (4 | (14 << 8)) +#define MAP_SAFFRON_CITY_MART (5 | (14 << 8)) +#define MAP_SAFFRON_CITY_POKEMON_CENTER_1F (6 | (14 << 8)) +#define MAP_SAFFRON_CITY_POKEMON_CENTER_2F (7 | (14 << 8)) +#define MAP_SAFFRON_CITY_HOUSE3 (8 | (14 << 8)) +#define MAP_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB (9 | (14 << 8)) // Map Group 15 #define MAP_ROUTE2_VIRIDIAN_FOREST_SOUTH_ENTRANCE (0 | (15 << 8)) -#define MAP_ROUTE2_HOUSE (1 | (15 << 8)) -#define MAP_ROUTE2_EAST_BUILDING (2 | (15 << 8)) +#define MAP_ROUTE2_HOUSE (1 | (15 << 8)) +#define MAP_ROUTE2_EAST_BUILDING (2 | (15 << 8)) #define MAP_ROUTE2_VIRIDIAN_FOREST_NORTH_ENTRANCE (3 | (15 << 8)) // Map Group 16 @@ -389,11 +389,11 @@ // Map Group 17 #define MAP_ROUTE5_POKEMON_DAY_CARE (0 | (17 << 8)) -#define MAP_ROUTE5_SOUTH_ENTRANCE (1 | (17 << 8)) +#define MAP_ROUTE5_SOUTH_ENTRANCE (1 | (17 << 8)) // Map Group 18 #define MAP_ROUTE6_NORTH_ENTRANCE (0 | (18 << 8)) -#define MAP_UNKNOWN_MAP_18_01 (1 | (18 << 8)) +#define MAP_UNKNOWN_MAP_18_01 (1 | (18 << 8)) // Map Group 19 #define MAP_ROUTE7_EAST_ENTRANCE (0 | (19 << 8)) @@ -412,14 +412,14 @@ // Map Group 23 #define MAP_ROUTE12_NORTH_ENTRANCE_1F (0 | (23 << 8)) #define MAP_ROUTE12_NORTH_ENTRANCE_2F (1 | (23 << 8)) -#define MAP_ROUTE12_FISHING_HOUSE (2 | (23 << 8)) +#define MAP_ROUTE12_FISHING_HOUSE (2 | (23 << 8)) // Map Group 24 #define MAP_ROUTE15_WEST_ENTRANCE_1F (0 | (24 << 8)) #define MAP_ROUTE15_WEST_ENTRANCE_2F (1 | (24 << 8)) // Map Group 25 -#define MAP_ROUTE16_HOUSE (0 | (25 << 8)) +#define MAP_ROUTE16_HOUSE (0 | (25 << 8)) #define MAP_ROUTE16_NORTH_ENTRANCE_1F (1 | (25 << 8)) #define MAP_ROUTE16_NORTH_ENTRANCE_2F (2 | (25 << 8)) @@ -440,76 +440,78 @@ #define MAP_ROUTE25_SEA_COTTAGE (0 | (30 << 8)) // Map Group 31 -#define MAP_SEVEN_ISLAND_HOUSE_ROOM1 (0 | (31 << 8)) -#define MAP_SEVEN_ISLAND_HOUSE_ROOM2 (1 | (31 << 8)) -#define MAP_SEVEN_ISLAND_MART (2 | (31 << 8)) -#define MAP_SEVEN_ISLAND_POKEMONCENTER_1F (3 | (31 << 8)) -#define MAP_SEVEN_ISLAND_POKEMONCENTER_2F (4 | (31 << 8)) -#define MAP_UNUSED_HOUSE_31_05 (5 | (31 << 8)) -#define MAP_SEVEN_ISLAND_HARBOR (6 | (31 << 8)) +#define MAP_SEVEN_ISLAND_HOUSE_ROOM1 (0 | (31 << 8)) +#define MAP_SEVEN_ISLAND_HOUSE_ROOM2 (1 | (31 << 8)) +#define MAP_SEVEN_ISLAND_MART (2 | (31 << 8)) +#define MAP_SEVEN_ISLAND_POKEMON_CENTER_1F (3 | (31 << 8)) +#define MAP_SEVEN_ISLAND_POKEMON_CENTER_2F (4 | (31 << 8)) +#define MAP_UNUSED_HOUSE_31_05 (5 | (31 << 8)) +#define MAP_SEVEN_ISLAND_HARBOR (6 | (31 << 8)) // Map Group 32 -#define MAP_ONE_ISLAND_POKEMONCENTER_1F (0 | (32 << 8)) -#define MAP_ONE_ISLAND_POKEMONCENTER_2F (1 | (32 << 8)) -#define MAP_ONE_ISLAND_HOUSE1 (2 | (32 << 8)) -#define MAP_ONE_ISLAND_HOUSE2 (3 | (32 << 8)) -#define MAP_ONE_ISLAND_HARBOR (4 | (32 << 8)) +#define MAP_ONE_ISLAND_POKEMON_CENTER_1F (0 | (32 << 8)) +#define MAP_ONE_ISLAND_POKEMON_CENTER_2F (1 | (32 << 8)) +#define MAP_ONE_ISLAND_HOUSE1 (2 | (32 << 8)) +#define MAP_ONE_ISLAND_HOUSE2 (3 | (32 << 8)) +#define MAP_ONE_ISLAND_HARBOR (4 | (32 << 8)) // Map Group 33 -#define MAP_TWO_ISLAND_JOYFULGAMECORNER (0 | (33 << 8)) -#define MAP_TWO_ISLAND_HOUSE (1 | (33 << 8)) -#define MAP_TWO_ISLAND_POKEMONCENTER_1F (2 | (33 << 8)) -#define MAP_TWO_ISLAND_POKEMONCENTER_2F (3 | (33 << 8)) -#define MAP_TWO_ISLAND_HARBOR (4 | (33 << 8)) +#define MAP_TWO_ISLAND_JOYFUL_GAME_CORNER (0 | (33 << 8)) +#define MAP_TWO_ISLAND_HOUSE (1 | (33 << 8)) +#define MAP_TWO_ISLAND_POKEMON_CENTER_1F (2 | (33 << 8)) +#define MAP_TWO_ISLAND_POKEMON_CENTER_2F (3 | (33 << 8)) +#define MAP_TWO_ISLAND_HARBOR (4 | (33 << 8)) // Map Group 34 -#define MAP_THREE_ISLAND_HOUSE1 (0 | (34 << 8)) -#define MAP_THREE_ISLAND_POKEMONCENTER_1F (1 | (34 << 8)) -#define MAP_THREE_ISLAND_POKEMONCENTER_2F (2 | (34 << 8)) -#define MAP_THREE_ISLAND_MART (3 | (34 << 8)) -#define MAP_THREE_ISLAND_HOUSE2 (4 | (34 << 8)) -#define MAP_THREE_ISLAND_HOUSE3 (5 | (34 << 8)) -#define MAP_THREE_ISLAND_HOUSE4 (6 | (34 << 8)) -#define MAP_THREE_ISLAND_HOUSE5 (7 | (34 << 8)) +#define MAP_THREE_ISLAND_HOUSE1 (0 | (34 << 8)) +#define MAP_THREE_ISLAND_POKEMON_CENTER_1F (1 | (34 << 8)) +#define MAP_THREE_ISLAND_POKEMON_CENTER_2F (2 | (34 << 8)) +#define MAP_THREE_ISLAND_MART (3 | (34 << 8)) +#define MAP_THREE_ISLAND_HOUSE2 (4 | (34 << 8)) +#define MAP_THREE_ISLAND_HOUSE3 (5 | (34 << 8)) +#define MAP_THREE_ISLAND_HOUSE4 (6 | (34 << 8)) +#define MAP_THREE_ISLAND_HOUSE5 (7 | (34 << 8)) // Map Group 35 -#define MAP_FOUR_ISLAND_POKEMONDAYCARE (0 | (35 << 8)) -#define MAP_FOUR_ISLAND_POKEMONCENTER_1F (1 | (35 << 8)) -#define MAP_FOUR_ISLAND_POKEMONCENTER_2F (2 | (35 << 8)) -#define MAP_FOUR_ISLAND_HOUSE1 (3 | (35 << 8)) -#define MAP_FOUR_ISLAND_LORELEISHOUSE (4 | (35 << 8)) -#define MAP_FOUR_ISLAND_HARBOR (5 | (35 << 8)) -#define MAP_FOUR_ISLAND_HOUSE2 (6 | (35 << 8)) -#define MAP_FOUR_ISLAND_MART (7 | (35 << 8)) +#define MAP_FOUR_ISLAND_POKEMON_DAY_CARE (0 | (35 << 8)) +#define MAP_FOUR_ISLAND_POKEMON_CENTER_1F (1 | (35 << 8)) +#define MAP_FOUR_ISLAND_POKEMON_CENTER_2F (2 | (35 << 8)) +#define MAP_FOUR_ISLAND_HOUSE1 (3 | (35 << 8)) +#define MAP_FOUR_ISLAND_LORELEIS_HOUSE (4 | (35 << 8)) +#define MAP_FOUR_ISLAND_HARBOR (5 | (35 << 8)) +#define MAP_FOUR_ISLAND_HOUSE2 (6 | (35 << 8)) +#define MAP_FOUR_ISLAND_MART (7 | (35 << 8)) // Map Group 36 -#define MAP_FIVE_ISLAND_POKEMONCENTER_1F (0 | (36 << 8)) -#define MAP_FIVE_ISLAND_POKEMONCENTER_2F (1 | (36 << 8)) -#define MAP_FIVE_ISLAND_HARBOR (2 | (36 << 8)) -#define MAP_FIVE_ISLAND_HOUSE1 (3 | (36 << 8)) -#define MAP_FIVE_ISLAND_HOUSE2 (4 | (36 << 8)) +#define MAP_FIVE_ISLAND_POKEMON_CENTER_1F (0 | (36 << 8)) +#define MAP_FIVE_ISLAND_POKEMON_CENTER_2F (1 | (36 << 8)) +#define MAP_FIVE_ISLAND_HARBOR (2 | (36 << 8)) +#define MAP_FIVE_ISLAND_HOUSE1 (3 | (36 << 8)) +#define MAP_FIVE_ISLAND_HOUSE2 (4 | (36 << 8)) // Map Group 37 -#define MAP_SIX_ISLAND_POKEMONCENTER_1F (0 | (37 << 8)) -#define MAP_SIX_ISLAND_POKEMONCENTER_2F (1 | (37 << 8)) -#define MAP_SIX_ISLAND_HARBOR (2 | (37 << 8)) -#define MAP_SIX_ISLAND_HOUSE (3 | (37 << 8)) -#define MAP_SIX_ISLAND_MART (4 | (37 << 8)) +#define MAP_SIX_ISLAND_POKEMON_CENTER_1F (0 | (37 << 8)) +#define MAP_SIX_ISLAND_POKEMON_CENTER_2F (1 | (37 << 8)) +#define MAP_SIX_ISLAND_HARBOR (2 | (37 << 8)) +#define MAP_SIX_ISLAND_HOUSE (3 | (37 << 8)) +#define MAP_SIX_ISLAND_MART (4 | (37 << 8)) // Map Group 38 #define MAP_THREE_ISLAND_HARBOR (0 | (38 << 8)) // Map Group 39 -#define MAP_FIVE_ISLAND_RESORTGORGEOUS_HOUSE (0 | (39 << 8)) +#define MAP_FIVE_ISLAND_RESORT_GORGEOUS_HOUSE (0 | (39 << 8)) // Map Group 40 -#define MAP_TWO_ISLAND_CAPEBRINK_HOUSE (0 | (40 << 8)) +#define MAP_TWO_ISLAND_CAPE_BRINK_HOUSE (0 | (40 << 8)) // Map Group 41 -#define MAP_SIX_ISLAND_WATERPATH_HOUSE1 (0 | (41 << 8)) -#define MAP_SIX_ISLAND_WATERPATH_HOUSE2 (1 | (41 << 8)) +#define MAP_SIX_ISLAND_WATER_PATH_HOUSE1 (0 | (41 << 8)) +#define MAP_SIX_ISLAND_WATER_PATH_HOUSE2 (1 | (41 << 8)) // Map Group 42 -#define MAP_SEVEN_ISLAND_SEVAULTCANYON_HOUSE (0 | (42 << 8)) +#define MAP_SEVEN_ISLAND_SEVAULT_CANYON_HOUSE (0 | (42 << 8)) + +#define MAP_GROUPS_COUNT 43 #endif // GUARD_CONSTANTS_MAP_GROUPS_H diff --git a/include/constants/maps.h b/include/constants/maps.h index 5fb5f88fa..fdef6ccb3 100644 --- a/include/constants/maps.h +++ b/include/constants/maps.h @@ -11,4 +11,46 @@ #define MAP(map) MAP_GROUP(map), MAP_NUM(map) +// temporary map constants +#define BATTLE_SCENE_0 0 +#define BATTLE_SCENE_1 1 +#define BATTLE_SCENE_2 2 +#define BATTLE_SCENE_3 3 +#define BATTLE_SCENE_4 4 +#define BATTLE_SCENE_5 5 +#define BATTLE_SCENE_6 6 +#define BATTLE_SCENE_7 7 +#define BATTLE_SCENE_8 8 +#define BATTLE_SCENE_9 9 +#define BATTLE_SCENE_10 10 +#define BATTLE_SCENE_11 11 +#define BATTLE_SCENE_12 12 +#define BATTLE_SCENE_13 13 +#define BATTLE_SCENE_14 14 +#define BATTLE_SCENE_15 15 + +#define MAP_TYPE_0 0 +#define MAP_TYPE_1 1 +#define MAP_TYPE_2 2 +#define MAP_TYPE_3 3 +#define MAP_TYPE_4 4 +#define MAP_TYPE_5 5 +#define MAP_TYPE_6 6 +#define MAP_TYPE_7 7 +#define MAP_TYPE_8 8 +#define MAP_TYPE_9 9 + +#define WEATHER_0 0 +#define WEATHER_1 1 +#define WEATHER_2 2 +#define WEATHER_3 3 +#define WEATHER_4 4 +#define WEATHER_5 5 +#define WEATHER_6 6 +#define WEATHER_7 7 +#define WEATHER_8 8 +#define WEATHER_9 9 +#define WEATHER_10 10 +#define WEATHER_11 11 + #endif // GUARD_CONSTANTS_MAPS_H diff --git a/ld_script.txt b/ld_script.txt index e270fcc44..6b9452054 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -367,6 +367,7 @@ SECTIONS { src/util.o(.rodata); src/daycare.o(.rodata); data/data.o(.rodata.825EF0C); + data/tilesets.o(.rodata); data/maps.o(.rodata); src/fieldmap.o(.rodata); src/metatile_behavior.o(.rodata); diff --git a/map_data_rules.mk b/map_data_rules.mk new file mode 100644 index 000000000..6325da5c6 --- /dev/null +++ b/map_data_rules.mk @@ -0,0 +1,45 @@ +# Map JSON data + +MAPS_DIR = $(DATA_ASM_SUBDIR)/maps +LAYOUTS_DIR = $(DATA_ASM_SUBDIR)/layouts + +MAP_DIRS := $(dir $(wildcard $(MAPS_DIR)/*/map.json)) +#MAP_DIRS := $(dir $(wildcard $(MAPS_DIR)/*/header.inc)) +MAP_CONNECTIONS := $(patsubst $(MAPS_DIR)/%/,$(MAPS_DIR)/%/connections.inc,$(MAP_DIRS)) +MAP_EVENTS := $(patsubst $(MAPS_DIR)/%/,$(MAPS_DIR)/%/events.inc,$(MAP_DIRS)) +MAP_HEADERS := $(patsubst $(MAPS_DIR)/%/,$(MAPS_DIR)/%/header.inc,$(MAP_DIRS)) + +#$(DATA_ASM_BUILDDIR)/maps.o: $(DATA_ASM_SUBDIR)/maps.s $(LAYOUTS_DIR)/layouts.inc $(LAYOUTS_DIR)/layouts_table.inc +# $(PREPROC) $< charmap.txt | $(CPP) -I include -nostdinc -undef -Wno-unicode - | $(AS) $(ASFLAGS) -o $@ + + + +#$(LAYOUTS_DIR)/layouts.inc: $(LAYOUTS_DIR)/layouts.json +# $(MAPJSON) layouts firered $< + +#$(LAYOUTS_DIR)/layouts_table.inc: $(LAYOUTS_DIR)/layouts.inc ; + +#include/constants/layouts.h: $(LAYOUTS_DIR)/layouts_table.inc ; + +$(MAPS_DIR)/%/header.inc: $(MAPS_DIR)/%/map.json + $(MAPJSON) map firered $< $(LAYOUTS_DIR)/layouts.json +$(MAPS_DIR)/%/events.inc: $(MAPS_DIR)/%/header.inc ; +$(MAPS_DIR)/%/connections.inc: $(MAPS_DIR)/%/events.inc ; + +$(MAPS_DIR)/groups.inc: $(MAPS_DIR)/map_groups.json + $(MAPJSON) groups firered $< +$(MAPS_DIR)/connections.inc: $(MAPS_DIR)/groups.inc ; +$(MAPS_DIR)/events.inc: $(MAPS_DIR)/connections.inc ; +$(MAPS_DIR)/headers.inc: $(MAPS_DIR)/events.inc ; +include/constants/map_groups.h: $(MAPS_DIR)/headers.inc ; + +$(LAYOUTS_DIR)/layouts.inc: $(LAYOUTS_DIR)/layouts.json + $(MAPJSON) layouts firered $< +$(LAYOUTS_DIR)/layouts_table.inc: $(LAYOUTS_DIR)/layouts.inc ; +include/constants/layouts.h: $(LAYOUTS_DIR)/layouts_table.inc ; + +$(DATA_ASM_BUILDDIR)/maps.o: $(DATA_ASM_SUBDIR)/maps.s $(LAYOUTS_DIR)/layouts.inc $(LAYOUTS_DIR)/layouts_table.inc $(MAPS_DIR)/headers.inc $(MAPS_DIR)/groups.inc $(MAPS_DIR)/connections.inc $(MAP_CONNECTIONS) $(MAP_HEADERS) + $(PREPROC) $< charmap.txt | $(CPP) -I include -nostdinc -undef -Wno-unicode - | $(AS) $(ASFLAGS) -o $@ +$(DATA_ASM_BUILDDIR)/map_events.o: $(DATA_ASM_SUBDIR)/map_events.s $(MAPS_DIR)/events.inc $(MAP_EVENTS) + $(PREPROC) $< charmap.txt | $(CPP) -I include -nostdinc -undef -Wno-unicode - | $(AS) $(ASFLAGS) -o $@ + diff --git a/tools/mapjson/mapjson.cpp b/tools/mapjson/mapjson.cpp index 1cf196fda..aa726f36a 100644 --- a/tools/mapjson/mapjson.cpp +++ b/tools/mapjson/mapjson.cpp @@ -29,6 +29,7 @@ using json11::Json; #include "mapjson.h" +string version; string read_text_file(string filepath) { ifstream in_file(filepath); @@ -60,7 +61,7 @@ void write_text_file(string filepath, string text) { out_file.close(); } -string generate_map_header_text(Json map_data, Json layouts_data, string version) { +string generate_map_header_text(Json map_data, Json layouts_data) { string map_layout_id = map_data["layout"].string_value(); vector<Json> matched; @@ -77,7 +78,7 @@ string generate_map_header_text(Json map_data, Json layouts_data, string version ostringstream text; - text << map_data["name"].string_value() << ":\n" + text << map_data["name"].string_value() << "::\n" << "\t.4byte " << layout["name"].string_value() << "\n"; if (map_data.object_items().find("shared_events_map") != map_data.object_items().end()) @@ -90,8 +91,9 @@ string generate_map_header_text(Json map_data, Json layouts_data, string version else text << "\t.4byte " << map_data["name"].string_value() << "_MapScripts\n"; + // fix this hack if (map_data.object_items().find("connections") != map_data.object_items().end() - && map_data["connections"].array_items().size() > 0) + && map_data["connections"].array_items().size() > 0 && map_data["connections_no_include"] == Json()) text << "\t.4byte " << map_data["name"].string_value() << "_MapConnections\n"; else text << "\t.4byte 0x0\n"; @@ -101,17 +103,33 @@ string generate_map_header_text(Json map_data, Json layouts_data, string version << "\t.byte " << map_data["region_map_section"].string_value() << "\n" << "\t.byte " << map_data["requires_flash"].bool_value() << "\n" << "\t.byte " << map_data["weather"].string_value() << "\n" - << "\t.byte " << map_data["map_type"].string_value() << "\n" - << "\t.2byte 0\n"; + << "\t.byte " << map_data["map_type"].string_value() << "\n"; - if (version == "ruby") + if (version == "firered") + text << "\t.byte " << map_data["unknown_18"].int_value() << "\n" + << "\t.byte " << map_data["unknown_19"].int_value() << "\n"; + else + text << "\t.2byte 0\n"; + + if (version == "ruby") { text << "\t.byte " << map_data["show_map_name"].bool_value() << "\n"; - else if (version == "emerald") + } + else if (version == "emerald") { text << "\tmap_header_flags " << "allow_bike=" << map_data["allow_bike"].bool_value() << ", " << "allow_escape_rope=" << map_data["allow_escape_rope"].bool_value() << ", " << "allow_run=" << map_data["allow_running"].bool_value() << ", " << "show_map_name=" << map_data["show_map_name"].bool_value() << "\n"; + } + // TODO: fix this! + else if (version == "firered") { + // ((\show_map_name & 1) << 3) | ((\allow_run & 1) << 2) | ((\allow_escape_rope & 1) << 1) | \allow_bike + //int flags = map_data["flag_1"].bool_value() ? 1 : 0 + // | ((map_data["flag_2"].bool_value() ? 1 : 0) << 1) + // | ((map_data["flag_3"].bool_value() ? 1 : 0) << 2) + // | ((map_data["flag_4"].bool_value() ? 1 : 0) << 3); + text << "\t.byte " << map_data["elevator_flag"].int_value() << "\n";// cultivate your hunger + } text << "\t.byte " << map_data["battle_scene"].string_value() << "\n\n"; @@ -124,7 +142,7 @@ string generate_map_connections_text(Json map_data) { ostringstream text; - text << map_data["name"].string_value() << "_MapConnectionsList:\n"; + text << map_data["name"].string_value() << "_MapConnectionsList::\n"; for (auto &connection : map_data["connections"].array_items()) { text << "\tconnection " @@ -133,7 +151,7 @@ string generate_map_connections_text(Json map_data) { << connection["map"].string_value() << "\n"; } - text << "\n" << map_data["name"].string_value() << "_MapConnections:\n" + text << "\n" << map_data["name"].string_value() << "_MapConnections::\n" << "\t.4byte " << map_data["connections"].array_items().size() << "\n" << "\t.4byte " << map_data["name"].string_value() << "_MapConnectionsList\n\n"; @@ -253,13 +271,126 @@ string generate_map_events_text(Json map_data) { return text.str(); } +string generate_firered_map_events_text(Json map_data) { + ostringstream text; + + string objects_label, warps_label, coords_label, bgs_label; + + if (map_data["object_events"].array_items().size() > 0) { + objects_label = map_data["name"].string_value() + "_EventObjects"; + text << objects_label << ":\n"; + for (unsigned int i = 0; i < map_data["object_events"].array_items().size(); i++) { + auto obj_event = map_data["object_events"].array_items()[i]; + text << "\tobject_event " << i + 1 << ", " + << obj_event["graphics_id"].string_value() << ", 0, " + << (obj_event["x"].int_value() & 0xFF) << ", " << (obj_event["x"].int_value() >> 8 & 0xFF) << ", " + << (obj_event["y"].int_value() & 0xFF) << ", " << (obj_event["y"].int_value() >> 8 & 0xFF) << ", " + //<< obj_event["x"].int_value() << ", " + //<< obj_event["y"].int_value() << ", " + << obj_event["elevation"].int_value() << ", " + << obj_event["movement_type"].string_value() << ", " + << (obj_event["movement_range_x"].int_value() | (obj_event["movement_range_y"].int_value() << 4)) << ", 0, " + //<< obj_event["movement_range_x"].int_value() << ", " + //<< obj_event["movement_range_y"].int_value() << ", " + << (obj_event["trainer_type"].int_value() & 0xFF) << ", " << (obj_event["trainer_type"].int_value() >> 8 & 0xFF) << ", " + //<< obj_event["trainer_type"].string_value() << ", " + << (obj_event["trainer_sight_or_berry_tree_id"].int_value() & 0xFF) << ", " << (obj_event["trainer_sight_or_berry_tree_id"].int_value() >> 8 & 0xFF) << ", " + //<< obj_event["trainer_sight_or_berry_tree_id"].string_value() << ", " + << obj_event["script"].string_value() << ", " + << obj_event["flag"].string_value() << ", 0, 0\n"; + } + text << "\n"; + } else { + objects_label = "0x0"; + } + + if (map_data["warp_events"].array_items().size() > 0) { + warps_label = map_data["name"].string_value() + "_MapWarps"; + text << warps_label << ":\n"; + for (auto &warp_event : map_data["warp_events"].array_items()) { + text << "\twarp_def " + << warp_event["x"].int_value() << ", " + << warp_event["y"].int_value() << ", " + << warp_event["elevation"].int_value() << ", " + << warp_event["dest_warp_id"].int_value() << ", " + << warp_event["dest_map"].string_value() << "\n"; + } + text << "\n"; + } else { + warps_label = "0x0"; + } + + if (map_data["coord_events"].array_items().size() > 0) { + coords_label = map_data["name"].string_value() + "_MapCoordEvents"; + text << coords_label << ":\n"; + for (auto &coord_event : map_data["coord_events"].array_items()) { + if (coord_event["type"].string_value() == "trigger") { + text << "\tcoord_event " + << coord_event["x"].int_value() << ", " + << coord_event["y"].int_value() << ", " + << coord_event["elevation"].int_value() << ", 0, " + << coord_event["var"].string_value() << ", " + << coord_event["var_value"].int_value() << ", 0, " + << coord_event["script"].string_value() << "\n"; + } + else if (coord_event["type"] == "weather") { + text << "\tcoord_weather_event " + << coord_event["x"].int_value() << ", " + << coord_event["y"].int_value() << ", " + << coord_event["elevation"].int_value() << ", " + << coord_event["weather"].string_value() << "\n"; + } + } + text << "\n"; + } else { + coords_label = "0x0"; + } + + if (map_data["bg_events"].array_items().size() > 0) { + bgs_label = map_data["name"].string_value() + "_MapBGEvents"; + text << bgs_label << ":\n"; + for (auto &bg_event : map_data["bg_events"].array_items()) { + if (bg_event["type"] == "hidden_item") { + text << "\tbg_hidden_item_event " + << bg_event["x"].int_value() << ", " + << bg_event["y"].int_value() << ", " + << bg_event["elevation"].int_value() << ", " + << bg_event["item"].string_value() << ", " + << bg_event["flag"].string_value() << ", " + << bg_event["unknown"].int_value() << "\n"; + //<< bg_event["unknown_2"].int_value() << "\n"; + } + else { + string type_string = bg_event["type"].string_value(); + type_string.erase(0, 14); + int type = std::stoi(type_string); + text << "\tbg_event " + << bg_event["x"].int_value() << ", " + << bg_event["y"].int_value() << ", " + << bg_event["elevation"].int_value() << ", " + << type << ", 0, " + << bg_event["script"].string_value() << "\n"; + } + } + text << "\n"; + } else { + bgs_label = "0x0"; + } + + text << map_data["name"].string_value() << "_MapEvents::\n" + << "\tmap_events " << objects_label << ", " << warps_label << ", " + << coords_label << ", " << bgs_label << "\n\n"; + + return text.str(); +} + string get_directory_name(string filename) { size_t dir_pos = filename.find_last_of("/\\"); return filename.substr(0, dir_pos + 1); } -void process_map(string map_filepath, string layouts_filepath, string version) { +void process_map(string map_filepath, string layouts_filepath) { string mapdata_err, layouts_err; string mapdata_json_text = read_text_file(map_filepath); @@ -273,8 +404,9 @@ void process_map(string map_filepath, string layouts_filepath, string version) { if (layouts_data == Json()) FATAL_ERROR("%s\n", layouts_err.c_str()); - string header_text = generate_map_header_text(map_data, layouts_data, version); - string events_text = generate_map_events_text(map_data); + string header_text = generate_map_header_text(map_data, layouts_data); + string events_text = version == "firered" ? generate_firered_map_events_text(map_data) + : generate_map_events_text(map_data); string connections_text = generate_map_connections_text(map_data); string files_dir = get_directory_name(map_filepath); @@ -295,7 +427,10 @@ string generate_groups_text(Json groups_data) { text << "\n"; } - text << "\t.align 2\n" << "gMapGroups::\n"; + if (version != "firered") + text << "\t.align 2\n"; + + text << "gMapGroups::\n"; for (auto &group : groups_data["group_order"].array_items()) text << "\t.4byte " << group.string_value() << "\n"; text << "\n"; @@ -429,6 +564,7 @@ string generate_layout_headers_text(Json layouts_data) { ostringstream text; for (auto &layout : layouts_data["layouts"].array_items()) { + if (layout == Json::object()) continue; string border_label = layout["name"].string_value() + "_Border"; string blockdata_label = layout["name"].string_value() + "_Blockdata"; text << border_label << "::\n" @@ -442,7 +578,15 @@ string generate_layout_headers_text(Json layouts_data) { << "\t.4byte " << border_label << "\n" << "\t.4byte " << blockdata_label << "\n" << "\t.4byte " << layout["primary_tileset"].string_value() << "\n" - << "\t.4byte " << layout["secondary_tileset"].string_value() << "\n\n"; + << "\t.4byte " << layout["secondary_tileset"].string_value() << "\n"; + + if (version == "firered") { + text << "\t.byte " << layout["border_width"].int_value() << "\n" + << "\t.byte " << layout["border_height"].int_value() << "\n" + << "\t.2byte 0\n"; + } + + text << "\n"; } return text.str(); @@ -454,8 +598,11 @@ string generate_layouts_table_text(Json layouts_data) { text << "\t.align 2\n" << layouts_data["layouts_table_label"].string_value() << "::\n"; - for (auto &layout : layouts_data["layouts"].array_items()) - text << "\t.4byte " << layout["name"].string_value() << "\n"; + for (auto &layout : layouts_data["layouts"].array_items()) { + string layout_name = layout["name"].string_value(); + if (layout_name.empty()) layout_name = "NULL"; + text << "\t.4byte " << layout_name << "\n"; + } return text.str(); } @@ -466,9 +613,12 @@ string generate_layouts_constants_text(Json layouts_data) { text << "#ifndef GUARD_CONSTANTS_LAYOUTS_H\n" << "#define GUARD_CONSTANTS_LAYOUTS_H\n\n"; - int i = 0; - for (auto &layout : layouts_data["layouts"].array_items()) - text << "#define " << layout["id"].string_value() << " " << ++i << "\n"; + int i = 1; + for (auto &layout : layouts_data["layouts"].array_items()) { + if (layout != Json::object()) + text << "#define " << layout["id"].string_value() << " " << i << "\n"; + i++; + } text << "\n#endif // GUARD_CONSTANTS_LAYOUTS_H\n"; @@ -498,10 +648,9 @@ int main(int argc, char *argv[]) { if (argc < 3) FATAL_ERROR("USAGE: mapjson <mode> <game-version> [options]\n"); - char *version_arg = argv[2]; - string version(version_arg); - if (version != "emerald" && version != "ruby") - FATAL_ERROR("ERROR: <game-version> must be 'emerald' or 'ruby'.\n"); + version = argv[2]; + if (version != "emerald" && version != "ruby" && version != "firered") + FATAL_ERROR("ERROR: <game-version> must be 'emerald', 'firered', or 'ruby'.\n"); char *mode_arg = argv[1]; string mode(mode_arg); @@ -515,7 +664,7 @@ int main(int argc, char *argv[]) { string filepath(argv[3]); string layouts_filepath(argv[4]); - process_map(filepath, layouts_filepath, version); + process_map(filepath, layouts_filepath); } else if (mode == "groups") { if (argc != 4) |