summaryrefslogtreecommitdiff
path: root/data/maps/FallarborTown
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/FallarborTown')
-rw-r--r--data/maps/FallarborTown/connections.inc8
-rw-r--r--data/maps/FallarborTown/events.inc26
-rw-r--r--data/maps/FallarborTown/header.inc15
-rw-r--r--data/maps/FallarborTown/map.json185
-rw-r--r--data/maps/FallarborTown/scripts.inc4
5 files changed, 187 insertions, 51 deletions
diff --git a/data/maps/FallarborTown/connections.inc b/data/maps/FallarborTown/connections.inc
deleted file mode 100644
index 3808099d8..000000000
--- a/data/maps/FallarborTown/connections.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-FallarborTown_MapConnectionsList: @ 8486674
- connection left, 0, MAP_ROUTE114
- connection right, 0, MAP_ROUTE113
-
-FallarborTown_MapConnections: @ 848668C
- .4byte 0x2
- .4byte FallarborTown_MapConnectionsList
-
diff --git a/data/maps/FallarborTown/events.inc b/data/maps/FallarborTown/events.inc
deleted file mode 100644
index 9b2f0a2de..000000000
--- a/data/maps/FallarborTown/events.inc
+++ /dev/null
@@ -1,26 +0,0 @@
-FallarborTown_EventObjects: @ 8527BE0
- object_event 1, EVENT_OBJ_GFX_GIRL_1, 0, 8, 11, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 1, 0, 0, FallarborTown_EventScript_1EB22B, 0
- object_event 2, EVENT_OBJ_GFX_EXPERT_M, 0, 11, 9, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, FallarborTown_EventScript_1EB20C, 0
- object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 11, 15, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 1, 1, 0, 0, FallarborTown_EventScript_1EB234, 0
- object_event 4, EVENT_OBJ_GFX_AZURILL, 0, 8, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 0, 0, 0, FallarborTown_EventScript_1EB23D, FLAG_HIDE_FALLARBOR_AZURILL
-
-FallarborTown_MapWarps: @ 8527C40
- warp_def 15, 15, 0, 0, MAP_FALLARBOR_TOWN_MART
- warp_def 8, 7, 0, 0, MAP_FALLARBOR_TOWN_BATTLE_TENT_LOBBY
- warp_def 14, 7, 0, 0, MAP_FALLARBOR_TOWN_POKEMON_CENTER_1F
- warp_def 6, 17, 0, 0, MAP_FALLARBOR_TOWN_HOUSE1
- warp_def 1, 6, 0, 0, MAP_FALLARBOR_TOWN_HOUSE2
-
-FallarborTown_MapBGEvents: @ 8527C68
- bg_event 16, 15, 0, BG_EVENT_PLAYER_FACING_NORTH, FallarborTown_EventScript_271E6A
- bg_event 15, 7, 0, BG_EVENT_PLAYER_FACING_NORTH, FallarborTown_EventScript_271E73
- bg_event 6, 8, 0, BG_EVENT_PLAYER_FACING_ANY, FallarborTown_EventScript_1EB250
- bg_event 16, 7, 0, BG_EVENT_PLAYER_FACING_NORTH, FallarborTown_EventScript_271E73
- bg_event 10, 11, 0, BG_EVENT_PLAYER_FACING_ANY, FallarborTown_EventScript_1EB259
- bg_event 17, 15, 0, BG_EVENT_PLAYER_FACING_NORTH, FallarborTown_EventScript_271E6A
- bg_event 3, 7, 0, BG_EVENT_PLAYER_FACING_ANY, FallarborTown_EventScript_1EB262
- bg_hidden_item_event 2, 15, 3, ITEM_NUGGET, FLAG_HIDDEN_ITEM_FALLARBOR_TOWN_NUGGET
-
-FallarborTown_MapEvents:: @ 8527CC8
- map_events FallarborTown_EventObjects, FallarborTown_MapWarps, 0x0, FallarborTown_MapBGEvents
-
diff --git a/data/maps/FallarborTown/header.inc b/data/maps/FallarborTown/header.inc
deleted file mode 100644
index f32f0c30b..000000000
--- a/data/maps/FallarborTown/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-FallarborTown: @ 8482624
- .4byte FallarborTown_Layout
- .4byte FallarborTown_MapEvents
- .4byte FallarborTown_MapScripts
- .4byte FallarborTown_MapConnections
- .2byte MUS_TONEKUSA
- .2byte 14
- .byte MAPSEC_FALLARBOR_TOWN
- .byte 0
- .byte WEATHER_SUNNY
- .byte MAP_TYPE_TOWN
- .2byte 0
- map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1
- .byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/FallarborTown/map.json b/data/maps/FallarborTown/map.json
new file mode 100644
index 000000000..863319184
--- /dev/null
+++ b/data/maps/FallarborTown/map.json
@@ -0,0 +1,185 @@
+{
+ "id": "MAP_FALLARBOR_TOWN",
+ "name": "FallarborTown",
+ "layout": "LAYOUT_FALLARBOR_TOWN",
+ "music": "MUS_TONEKUSA",
+ "region_map_section": "MAPSEC_FALLARBOR_TOWN",
+ "requires_flash": false,
+ "weather": "WEATHER_SUNNY",
+ "map_type": "MAP_TYPE_TOWN",
+ "allow_bike": true,
+ "allow_escape_rope": false,
+ "allow_running": true,
+ "show_map_name": true,
+ "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+ "connections": [
+ {
+ "direction": "left",
+ "offset": 0,
+ "map": "MAP_ROUTE114"
+ },
+ {
+ "direction": "right",
+ "offset": 0,
+ "map": "MAP_ROUTE113"
+ }
+ ],
+ "object_events": [
+ {
+ "graphics_id": "EVENT_OBJ_GFX_GIRL_1",
+ "x": 8,
+ "y": 11,
+ "elevation": 3,
+ "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+ "movement_range_x": 0,
+ "movement_range_y": 1,
+ "trainer_type": "0",
+ "trainer_sight_or_berry_tree_id": "0",
+ "script": "FallarborTown_EventScript_1EB22B",
+ "flag": "0"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_EXPERT_M",
+ "x": 11,
+ "y": 9,
+ "elevation": 3,
+ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT",
+ "movement_range_x": 1,
+ "movement_range_y": 0,
+ "trainer_type": "0",
+ "trainer_sight_or_berry_tree_id": "0",
+ "script": "FallarborTown_EventScript_1EB20C",
+ "flag": "0"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN",
+ "x": 11,
+ "y": 15,
+ "elevation": 3,
+ "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN",
+ "movement_range_x": 1,
+ "movement_range_y": 1,
+ "trainer_type": "0",
+ "trainer_sight_or_berry_tree_id": "0",
+ "script": "FallarborTown_EventScript_1EB234",
+ "flag": "0"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_AZURILL",
+ "x": 8,
+ "y": 12,
+ "elevation": 3,
+ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+ "movement_range_x": 1,
+ "movement_range_y": 0,
+ "trainer_type": "0",
+ "trainer_sight_or_berry_tree_id": "0",
+ "script": "FallarborTown_EventScript_1EB23D",
+ "flag": "FLAG_HIDE_FALLARBOR_AZURILL"
+ }
+ ],
+ "warp_events": [
+ {
+ "x": 15,
+ "y": 15,
+ "elevation": 0,
+ "dest_map": "MAP_FALLARBOR_TOWN_MART",
+ "dest_warp_id": 0
+ },
+ {
+ "x": 8,
+ "y": 7,
+ "elevation": 0,
+ "dest_map": "MAP_FALLARBOR_TOWN_BATTLE_TENT_LOBBY",
+ "dest_warp_id": 0
+ },
+ {
+ "x": 14,
+ "y": 7,
+ "elevation": 0,
+ "dest_map": "MAP_FALLARBOR_TOWN_POKEMON_CENTER_1F",
+ "dest_warp_id": 0
+ },
+ {
+ "x": 6,
+ "y": 17,
+ "elevation": 0,
+ "dest_map": "MAP_FALLARBOR_TOWN_HOUSE1",
+ "dest_warp_id": 0
+ },
+ {
+ "x": 1,
+ "y": 6,
+ "elevation": 0,
+ "dest_map": "MAP_FALLARBOR_TOWN_HOUSE2",
+ "dest_warp_id": 0
+ }
+ ],
+ "coord_events": [],
+ "bg_events": [
+ {
+ "type": "sign",
+ "x": 16,
+ "y": 15,
+ "elevation": 0,
+ "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+ "script": "Common_EventScript_ShowPokemartSign"
+ },
+ {
+ "type": "sign",
+ "x": 15,
+ "y": 7,
+ "elevation": 0,
+ "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+ "script": "Common_EventScript_ShowPokemonCenterSign"
+ },
+ {
+ "type": "sign",
+ "x": 6,
+ "y": 8,
+ "elevation": 0,
+ "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+ "script": "FallarborTown_EventScript_1EB250"
+ },
+ {
+ "type": "sign",
+ "x": 16,
+ "y": 7,
+ "elevation": 0,
+ "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+ "script": "Common_EventScript_ShowPokemonCenterSign"
+ },
+ {
+ "type": "sign",
+ "x": 10,
+ "y": 11,
+ "elevation": 0,
+ "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+ "script": "FallarborTown_EventScript_1EB259"
+ },
+ {
+ "type": "sign",
+ "x": 17,
+ "y": 15,
+ "elevation": 0,
+ "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+ "script": "Common_EventScript_ShowPokemartSign"
+ },
+ {
+ "type": "sign",
+ "x": 3,
+ "y": 7,
+ "elevation": 0,
+ "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+ "script": "FallarborTown_EventScript_1EB262"
+ },
+ {
+ "type": "hidden_item",
+ "x": 2,
+ "y": 15,
+ "elevation": 3,
+ "item": "ITEM_NUGGET",
+ "flag": "FLAG_HIDDEN_ITEM_FALLARBOR_TOWN_NUGGET"
+ }
+ ]
+} \ No newline at end of file
diff --git a/data/maps/FallarborTown/scripts.inc b/data/maps/FallarborTown/scripts.inc
index 5e06ed4cb..50e19cfe5 100644
--- a/data/maps/FallarborTown/scripts.inc
+++ b/data/maps/FallarborTown/scripts.inc
@@ -1,10 +1,10 @@
FallarborTown_MapScripts:: @ 81EB1FA
- map_script 3, FallarborTown_MapScript1_1EB200
+ map_script MAP_SCRIPT_ON_TRANSITION, FallarborTown_MapScript1_1EB200
.byte 0
FallarborTown_MapScript1_1EB200: @ 81EB200
setflag FLAG_VISITED_FALLARBOR_TOWN
- setvar VAR_0x4086, 0
+ setvar VAR_LINK_CONTEST_ROOM_STATE, 0
clearflag FLAG_CONTEST_SKETCH_CREATED
end
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-08 22:10:40 +0000