summaryrefslogtreecommitdiff
path: root/data/maps/UnionRoom
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/UnionRoom')
-rw-r--r--data/maps/UnionRoom/events.inc18
-rw-r--r--data/maps/UnionRoom/header.inc15
-rw-r--r--data/maps/UnionRoom/map.json153
-rw-r--r--data/maps/UnionRoom/scripts.inc4
4 files changed, 155 insertions, 35 deletions
diff --git a/data/maps/UnionRoom/events.inc b/data/maps/UnionRoom/events.inc
deleted file mode 100644
index 3ab614468..000000000
--- a/data/maps/UnionRoom/events.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-UnionRoom_EventObjects: @ 853B020
- object_event 1, EVENT_OBJ_GFX_UNION_ROOM_NURSE, 0, 3, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, UnionRoom_EventScript_23D236, 0
- object_event 2, EVENT_OBJ_GFX_VAR_3, 0, 1, 8, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, UnionRoom_EventScript_23D204, FLAG_HIDE_UNION_ROOM_PLAYER_4
- object_event 3, EVENT_OBJ_GFX_VAR_7, 0, 7, 8, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, UnionRoom_EventScript_23D22C, FLAG_HIDE_UNION_ROOM_PLAYER_8
- object_event 4, EVENT_OBJ_GFX_VAR_6, 0, 1, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, UnionRoom_EventScript_23D222, FLAG_HIDE_UNION_ROOM_PLAYER_7
- object_event 5, EVENT_OBJ_GFX_VAR_5, 0, 7, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, UnionRoom_EventScript_23D218, FLAG_HIDE_UNION_ROOM_PLAYER_6
- object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 13, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, UnionRoom_EventScript_23D20E, FLAG_HIDE_UNION_ROOM_PLAYER_5
- object_event 7, EVENT_OBJ_GFX_VAR_2, 0, 10, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, UnionRoom_EventScript_23D1FA, FLAG_HIDE_UNION_ROOM_PLAYER_3
- object_event 8, EVENT_OBJ_GFX_VAR_1, 0, 13, 8, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, UnionRoom_EventScript_23D1F0, FLAG_HIDE_UNION_ROOM_PLAYER_2
- object_event 9, EVENT_OBJ_GFX_VAR_0, 0, 4, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, UnionRoom_EventScript_23D1E6, FLAG_HIDE_UNION_ROOM_PLAYER_1
-
-UnionRoom_MapWarps: @ 853B0F8
- warp_def 7, 11, 3, 127, MAP_NONE
- warp_def 8, 11, 3, 127, MAP_NONE
-
-UnionRoom_MapEvents:: @ 853B108
- map_events UnionRoom_EventObjects, UnionRoom_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/UnionRoom/header.inc b/data/maps/UnionRoom/header.inc
deleted file mode 100644
index 29fd3cc3f..000000000
--- a/data/maps/UnionRoom/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-UnionRoom: @ 8485120
- .4byte UnionRoom_Layout
- .4byte UnionRoom_MapEvents
- .4byte UnionRoom_MapScripts
- .4byte 0x0
- .2byte MUS_RAINBOW
- .2byte 393
- .byte MAPSEC_DYNAMIC
- .byte 0
- .byte WEATHER_NONE
- .byte MAP_TYPE_INDOOR
- .2byte 0
- map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
- .byte MAP_BATTLE_SCENE_FRONTIER
-
diff --git a/data/maps/UnionRoom/map.json b/data/maps/UnionRoom/map.json
new file mode 100644
index 000000000..c42cd362c
--- /dev/null
+++ b/data/maps/UnionRoom/map.json
@@ -0,0 +1,153 @@
+{
+ "id": "MAP_UNION_ROOM",
+ "name": "UnionRoom",
+ "layout": "LAYOUT_UNION_ROOM",
+ "music": "MUS_RAINBOW",
+ "region_map_section": "MAPSEC_DYNAMIC",
+ "requires_flash": false,
+ "weather": "WEATHER_NONE",
+ "map_type": "MAP_TYPE_INDOOR",
+ "allow_bike": false,
+ "allow_escape_rope": false,
+ "allow_running": false,
+ "show_map_name": false,
+ "battle_scene": "MAP_BATTLE_SCENE_FRONTIER",
+ "connections": null,
+ "object_events": [
+ {
+ "graphics_id": "EVENT_OBJ_GFX_UNION_ROOM_NURSE",
+ "x": 3,
+ "y": 2,
+ "elevation": 3,
+ "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+ "movement_range_x": 0,
+ "movement_range_y": 0,
+ "trainer_type": "0",
+ "trainer_sight_or_berry_tree_id": "0",
+ "script": "UnionRoom_EventScript_23D236",
+ "flag": "0"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_VAR_3",
+ "x": 1,
+ "y": 8,
+ "elevation": 3,
+ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+ "movement_range_x": 1,
+ "movement_range_y": 1,
+ "trainer_type": "0",
+ "trainer_sight_or_berry_tree_id": "0",
+ "script": "UnionRoom_EventScript_23D204",
+ "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_4"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_VAR_7",
+ "x": 7,
+ "y": 8,
+ "elevation": 3,
+ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+ "movement_range_x": 1,
+ "movement_range_y": 1,
+ "trainer_type": "0",
+ "trainer_sight_or_berry_tree_id": "0",
+ "script": "UnionRoom_EventScript_23D22C",
+ "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_8"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_VAR_6",
+ "x": 1,
+ "y": 4,
+ "elevation": 3,
+ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+ "movement_range_x": 1,
+ "movement_range_y": 1,
+ "trainer_type": "0",
+ "trainer_sight_or_berry_tree_id": "0",
+ "script": "UnionRoom_EventScript_23D222",
+ "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_7"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_VAR_5",
+ "x": 7,
+ "y": 4,
+ "elevation": 3,
+ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+ "movement_range_x": 1,
+ "movement_range_y": 1,
+ "trainer_type": "0",
+ "trainer_sight_or_berry_tree_id": "0",
+ "script": "UnionRoom_EventScript_23D218",
+ "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_6"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_VAR_4",
+ "x": 13,
+ "y": 4,
+ "elevation": 3,
+ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+ "movement_range_x": 1,
+ "movement_range_y": 1,
+ "trainer_type": "0",
+ "trainer_sight_or_berry_tree_id": "0",
+ "script": "UnionRoom_EventScript_23D20E",
+ "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_5"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_VAR_2",
+ "x": 10,
+ "y": 6,
+ "elevation": 3,
+ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+ "movement_range_x": 1,
+ "movement_range_y": 1,
+ "trainer_type": "0",
+ "trainer_sight_or_berry_tree_id": "0",
+ "script": "UnionRoom_EventScript_23D1FA",
+ "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_3"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_VAR_1",
+ "x": 13,
+ "y": 8,
+ "elevation": 3,
+ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+ "movement_range_x": 1,
+ "movement_range_y": 1,
+ "trainer_type": "0",
+ "trainer_sight_or_berry_tree_id": "0",
+ "script": "UnionRoom_EventScript_23D1F0",
+ "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_2"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_VAR_0",
+ "x": 4,
+ "y": 6,
+ "elevation": 3,
+ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+ "movement_range_x": 1,
+ "movement_range_y": 1,
+ "trainer_type": "0",
+ "trainer_sight_or_berry_tree_id": "0",
+ "script": "UnionRoom_EventScript_23D1E6",
+ "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_1"
+ }
+ ],
+ "warp_events": [
+ {
+ "x": 7,
+ "y": 11,
+ "elevation": 3,
+ "dest_map": "MAP_NONE",
+ "dest_warp_id": 127
+ },
+ {
+ "x": 8,
+ "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/UnionRoom/scripts.inc b/data/maps/UnionRoom/scripts.inc
index f71c40e3d..0871ae033 100644
--- a/data/maps/UnionRoom/scripts.inc
+++ b/data/maps/UnionRoom/scripts.inc
@@ -1,6 +1,6 @@
UnionRoom_MapScripts:: @ 823D1A6
- map_script 5, UnionRoom_MapScript1_23D1B1
- map_script 3, UnionRoom_MapScript1_23D1E5
+ map_script MAP_SCRIPT_ON_RESUME, UnionRoom_MapScript1_23D1B1
+ map_script MAP_SCRIPT_ON_TRANSITION, UnionRoom_MapScript1_23D1E5
.byte 0
UnionRoom_MapScript1_23D1B1: @ 823D1B1
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-07 18:56:09 +0000