From f5683b5c46b802cf75491d931a33d2fbe52a332c Mon Sep 17 00:00:00 2001 From: garak Date: Thu, 18 Apr 2019 10:44:26 -0400 Subject: move headers and connections into map dirs --- data/maps/Route4_PokemonCenter_2F/header.inc | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 data/maps/Route4_PokemonCenter_2F/header.inc (limited to 'data/maps/Route4_PokemonCenter_2F') diff --git a/data/maps/Route4_PokemonCenter_2F/header.inc b/data/maps/Route4_PokemonCenter_2F/header.inc new file mode 100644 index 000000000..8ae29faa7 --- /dev/null +++ b/data/maps/Route4_PokemonCenter_2F/header.inc @@ -0,0 +1,8 @@ +Route4_PokemonCenter_2F:: @ 83517EC + .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 + .4byte gMapEvents_Route4_PokemonCenter_2F @ 0x83BD608 + .4byte gMapScripts_Route4_PokemonCenter_2F @ 0x816F8D8 + .4byte NULL + .2byte BGM_FRLG_POKEMON_CENTER + .2byte 9 + .byte 0x68, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 -- cgit v1.2.3 From 799e971efef15b66345b255d57e94780733f667a Mon Sep 17 00:00:00 2001 From: garak Date: Thu, 18 Apr 2019 11:03:10 -0400 Subject: fix map events names --- data/maps/Route4_PokemonCenter_2F/header.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'data/maps/Route4_PokemonCenter_2F') diff --git a/data/maps/Route4_PokemonCenter_2F/header.inc b/data/maps/Route4_PokemonCenter_2F/header.inc index 8ae29faa7..eb9d2796d 100644 --- a/data/maps/Route4_PokemonCenter_2F/header.inc +++ b/data/maps/Route4_PokemonCenter_2F/header.inc @@ -1,7 +1,7 @@ Route4_PokemonCenter_2F:: @ 83517EC .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 - .4byte gMapEvents_Route4_PokemonCenter_2F @ 0x83BD608 - .4byte gMapScripts_Route4_PokemonCenter_2F @ 0x816F8D8 + .4byte Route4_PokemonCenter_2F_MapEvents @ 0x83BD608 + .4byte Route4_PokemonCenter_2F_MapScripts @ 0x816F8D8 .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 9 -- cgit v1.2.3 From fb1ae058073d64305cb5dbae873095febdd36d74 Mon Sep 17 00:00:00 2001 From: garak Date: Thu, 18 Apr 2019 12:08:12 -0400 Subject: move map events to map directories --- data/maps/Route4_PokemonCenter_2F/events.inc | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 data/maps/Route4_PokemonCenter_2F/events.inc (limited to 'data/maps/Route4_PokemonCenter_2F') diff --git a/data/maps/Route4_PokemonCenter_2F/events.inc b/data/maps/Route4_PokemonCenter_2F/events.inc new file mode 100644 index 000000000..0a78cdf65 --- /dev/null +++ b/data/maps/Route4_PokemonCenter_2F/events.inc @@ -0,0 +1,13 @@ +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 -- cgit v1.2.3 From 4e5d818f89caae9153dd53ba321900e0d4e16c1e Mon Sep 17 00:00:00 2001 From: garak Date: Mon, 6 May 2019 22:13:57 -0400 Subject: dump event scripts --- data/maps/Route4_PokemonCenter_2F/scripts.inc | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 data/maps/Route4_PokemonCenter_2F/scripts.inc (limited to 'data/maps/Route4_PokemonCenter_2F') diff --git a/data/maps/Route4_PokemonCenter_2F/scripts.inc b/data/maps/Route4_PokemonCenter_2F/scripts.inc new file mode 100644 index 000000000..172b29972 --- /dev/null +++ b/data/maps/Route4_PokemonCenter_2F/scripts.inc @@ -0,0 +1,18 @@ +Route4_PokemonCenter_2F_MapScripts:: @ 816F8D8 + map_script 2, Route4_PokemonCenter_2F_MapScript1_1BB2A3 + map_script 4, Route4_PokemonCenter_2F_MapScript2_1BB1ED + map_script 1, Route4_PokemonCenter_2F_MapScript3_1BB237 + map_script 3, Route4_PokemonCenter_2F_MapScript4_1BB1B4 + .byte 0 + +Route4_PokemonCenter_2F_EventScript_16F8ED:: @ 816F8ED + call EventScript_1BB4A3 + end + +EventScript_16F8F3:: @ 816F8F3 + call EventScript_1BB6AB + end + +EventScript_16F8F9:: @ 816F8F9 + call EventScript_1BB7DE + end -- cgit v1.2.3 From 55d66b51770b4f657ed55822e7e76f6d6e3261d8 Mon Sep 17 00:00:00 2001 From: garak Date: Mon, 13 May 2019 19:44:24 -0400 Subject: convert map data to json --- data/maps/Route4_PokemonCenter_2F/events.inc | 13 ---- data/maps/Route4_PokemonCenter_2F/header.inc | 8 --- data/maps/Route4_PokemonCenter_2F/map.json | 94 ++++++++++++++++++++++++++++ 3 files changed, 94 insertions(+), 21 deletions(-) delete mode 100644 data/maps/Route4_PokemonCenter_2F/events.inc delete mode 100644 data/maps/Route4_PokemonCenter_2F/header.inc create mode 100644 data/maps/Route4_PokemonCenter_2F/map.json (limited to 'data/maps/Route4_PokemonCenter_2F') 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 -- cgit v1.2.3 From 7dca612936fda9254239e0e350a45c56a766053a Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 14 May 2019 16:47:07 -0400 Subject: Fix indentation in .inc files --- data/maps/Route4_PokemonCenter_2F/scripts.inc | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'data/maps/Route4_PokemonCenter_2F') diff --git a/data/maps/Route4_PokemonCenter_2F/scripts.inc b/data/maps/Route4_PokemonCenter_2F/scripts.inc index 172b29972..bff6832da 100644 --- a/data/maps/Route4_PokemonCenter_2F/scripts.inc +++ b/data/maps/Route4_PokemonCenter_2F/scripts.inc @@ -1,18 +1,18 @@ Route4_PokemonCenter_2F_MapScripts:: @ 816F8D8 - map_script 2, Route4_PokemonCenter_2F_MapScript1_1BB2A3 - map_script 4, Route4_PokemonCenter_2F_MapScript2_1BB1ED - map_script 1, Route4_PokemonCenter_2F_MapScript3_1BB237 - map_script 3, Route4_PokemonCenter_2F_MapScript4_1BB1B4 - .byte 0 + map_script 2, Route4_PokemonCenter_2F_MapScript1_1BB2A3 + map_script 4, Route4_PokemonCenter_2F_MapScript2_1BB1ED + map_script 1, Route4_PokemonCenter_2F_MapScript3_1BB237 + map_script 3, Route4_PokemonCenter_2F_MapScript4_1BB1B4 + .byte 0 Route4_PokemonCenter_2F_EventScript_16F8ED:: @ 816F8ED - call EventScript_1BB4A3 - end + call EventScript_1BB4A3 + end EventScript_16F8F3:: @ 816F8F3 - call EventScript_1BB6AB - end + call EventScript_1BB6AB + end EventScript_16F8F9:: @ 816F8F9 - call EventScript_1BB7DE - end + call EventScript_1BB7DE + end -- cgit v1.2.3 From cfc43d11115ab3258592801665caef9cfe859589 Mon Sep 17 00:00:00 2001 From: SatoMew Date: Fri, 17 May 2019 14:14:21 +0100 Subject: Label weather --- data/maps/Route4_PokemonCenter_2F/map.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'data/maps/Route4_PokemonCenter_2F') diff --git a/data/maps/Route4_PokemonCenter_2F/map.json b/data/maps/Route4_PokemonCenter_2F/map.json index a601bf6fc..0852a5537 100644 --- a/data/maps/Route4_PokemonCenter_2F/map.json +++ b/data/maps/Route4_PokemonCenter_2F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_POKEMON_CENTER", "region_map_section": "MAPSEC_ROUTE_4", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -91,4 +91,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} -- cgit v1.2.3