summaryrefslogtreecommitdiff
path: root/data/maps/BattleFrontier_ReceptionGate
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/BattleFrontier_ReceptionGate')
-rw-r--r--data/maps/BattleFrontier_ReceptionGate/events.inc14
-rw-r--r--data/maps/BattleFrontier_ReceptionGate/header.inc15
-rw-r--r--data/maps/BattleFrontier_ReceptionGate/map.json101
-rw-r--r--data/maps/BattleFrontier_ReceptionGate/scripts.inc24
4 files changed, 113 insertions, 41 deletions
diff --git a/data/maps/BattleFrontier_ReceptionGate/events.inc b/data/maps/BattleFrontier_ReceptionGate/events.inc
deleted file mode 100644
index 551cb802f..000000000
--- a/data/maps/BattleFrontier_ReceptionGate/events.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-BattleFrontier_ReceptionGate_EventObjects: @ 853D420
- object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 11, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_ReceptionGate_EventScript_2662FC, 0
- object_event 2, EVENT_OBJ_GFX_TEALA, 0, 8, 11, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_ReceptionGate_EventScript_266310, 0
- object_event 3, EVENT_OBJ_GFX_MAN_2, 0, 8, 4, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_ReceptionGate_EventScript_266436, 0
- object_event 4, EVENT_OBJ_GFX_SCOTT, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_BATTLE_FRONTIER_RECEPTION_GATE_SCOTT
- object_event 5, EVENT_OBJ_GFX_MAN_2, 0, 0, 4, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_ReceptionGate_EventScript_2664F4, 0
-
-BattleFrontier_ReceptionGate_MapWarps: @ 853D498
- warp_def 4, 13, 0, 8, MAP_BATTLE_FRONTIER_OUTSIDE_WEST
- warp_def 4, 1, 0, 9, MAP_BATTLE_FRONTIER_OUTSIDE_WEST
-
-BattleFrontier_ReceptionGate_MapEvents:: @ 853D4A8
- map_events BattleFrontier_ReceptionGate_EventObjects, BattleFrontier_ReceptionGate_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/BattleFrontier_ReceptionGate/header.inc b/data/maps/BattleFrontier_ReceptionGate/header.inc
deleted file mode 100644
index 099ab38e1..000000000
--- a/data/maps/BattleFrontier_ReceptionGate/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-BattleFrontier_ReceptionGate: @ 84856B4
- .4byte BattleFrontier_ReceptionGate_Layout
- .4byte BattleFrontier_ReceptionGate_MapEvents
- .4byte BattleFrontier_ReceptionGate_MapScripts
- .4byte 0x0
- .2byte MUS_B_TOWER
- .2byte 399
- .byte MAPSEC_BATTLE_FRONTIER
- .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_NORMAL
-
diff --git a/data/maps/BattleFrontier_ReceptionGate/map.json b/data/maps/BattleFrontier_ReceptionGate/map.json
new file mode 100644
index 000000000..db140442e
--- /dev/null
+++ b/data/maps/BattleFrontier_ReceptionGate/map.json
@@ -0,0 +1,101 @@
+{
+ "id": "MAP_BATTLE_FRONTIER_RECEPTION_GATE",
+ "name": "BattleFrontier_ReceptionGate",
+ "layout": "LAYOUT_BATTLE_FRONTIER_RECEPTION_GATE",
+ "music": "MUS_B_TOWER",
+ "region_map_section": "MAPSEC_BATTLE_FRONTIER",
+ "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_NORMAL",
+ "connections": null,
+ "object_events": [
+ {
+ "graphics_id": "EVENT_OBJ_GFX_TEALA",
+ "x": 0,
+ "y": 11,
+ "elevation": 0,
+ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+ "movement_range_x": 1,
+ "movement_range_y": 1,
+ "trainer_type": "0",
+ "trainer_sight_or_berry_tree_id": "0",
+ "script": "BattleFrontier_ReceptionGate_EventScript_2662FC",
+ "flag": "0"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_TEALA",
+ "x": 8,
+ "y": 11,
+ "elevation": 0,
+ "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+ "movement_range_x": 1,
+ "movement_range_y": 1,
+ "trainer_type": "0",
+ "trainer_sight_or_berry_tree_id": "0",
+ "script": "BattleFrontier_ReceptionGate_EventScript_266310",
+ "flag": "0"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_MAN_2",
+ "x": 8,
+ "y": 4,
+ "elevation": 0,
+ "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+ "movement_range_x": 1,
+ "movement_range_y": 1,
+ "trainer_type": "0",
+ "trainer_sight_or_berry_tree_id": "0",
+ "script": "BattleFrontier_ReceptionGate_EventScript_266436",
+ "flag": "0"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_SCOTT",
+ "x": 4,
+ "y": 5,
+ "elevation": 3,
+ "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+ "movement_range_x": 1,
+ "movement_range_y": 1,
+ "trainer_type": "0",
+ "trainer_sight_or_berry_tree_id": "0",
+ "script": "0x0",
+ "flag": "FLAG_HIDE_BATTLE_FRONTIER_RECEPTION_GATE_SCOTT"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_MAN_2",
+ "x": 0,
+ "y": 4,
+ "elevation": 0,
+ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+ "movement_range_x": 1,
+ "movement_range_y": 1,
+ "trainer_type": "0",
+ "trainer_sight_or_berry_tree_id": "0",
+ "script": "BattleFrontier_ReceptionGate_EventScript_2664F4",
+ "flag": "0"
+ }
+ ],
+ "warp_events": [
+ {
+ "x": 4,
+ "y": 13,
+ "elevation": 0,
+ "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST",
+ "dest_warp_id": 8
+ },
+ {
+ "x": 4,
+ "y": 1,
+ "elevation": 0,
+ "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST",
+ "dest_warp_id": 9
+ }
+ ],
+ "coord_events": [],
+ "bg_events": []
+} \ No newline at end of file
diff --git a/data/maps/BattleFrontier_ReceptionGate/scripts.inc b/data/maps/BattleFrontier_ReceptionGate/scripts.inc
index 5ed97bd60..8ce438d75 100644
--- a/data/maps/BattleFrontier_ReceptionGate/scripts.inc
+++ b/data/maps/BattleFrontier_ReceptionGate/scripts.inc
@@ -1,6 +1,6 @@
BattleFrontier_ReceptionGate_MapScripts:: @ 82661DA
- map_script 2, BattleFrontier_ReceptionGate_MapScript2_2661E9
- map_script 3, BattleFrontier_ReceptionGate_MapScript1_2661E5
+ map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_ReceptionGate_MapScript2_2661E9
+ map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_ReceptionGate_MapScript1_2661E5
.byte 0
BattleFrontier_ReceptionGate_MapScript1_2661E5: @ 82661E5
@@ -8,16 +8,16 @@ BattleFrontier_ReceptionGate_MapScript1_2661E5: @ 82661E5
end
BattleFrontier_ReceptionGate_MapScript2_2661E9: @ 82661E9
- map_script_2 VAR_0x40D0, 0, BattleFrontier_ReceptionGate_EventScript_2661F3
+ map_script_2 VAR_HAS_ENTERED_BATTLE_FRONTIER, 0, BattleFrontier_ReceptionGate_EventScript_2661F3
.2byte 0
BattleFrontier_ReceptionGate_EventScript_2661F3:: @ 82661F3
lockall
- setvar VAR_0x40D0, 1
+ setvar VAR_HAS_ENTERED_BATTLE_FRONTIER, 1
playse SE_PIN
- applymovement 1, BattleFrontier_ReceptionGate_Movement_272598
+ applymovement 1, Common_Movement_ExclamationMark
waitmovement 0
- applymovement 1, BattleFrontier_ReceptionGate_Movement_27259A
+ applymovement 1, Common_Movement_Delay48
waitmovement 0
msgbox BattleFrontier_ReceptionGate_Text_266580, MSGBOX_DEFAULT
closemessage
@@ -38,14 +38,14 @@ BattleFrontier_ReceptionGate_EventScript_266229:: @ 8266229
msgbox BattleFrontier_ReceptionGate_Text_2666C6, MSGBOX_DEFAULT
msgbox BattleFrontier_ReceptionGate_Text_266703, MSGBOX_DEFAULT
closemessage
- applymovement 1, BattleFrontier_ReceptionGate_Movement_2725A6
- applymovement 2, BattleFrontier_ReceptionGate_Movement_2725A6
- applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_ReceptionGate_Movement_2725A6
+ applymovement 1, Common_Movement_WalkInPlaceUp
+ applymovement 2, Common_Movement_WalkInPlaceUp
+ applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp
waitmovement 0
playse SE_PIN
- applymovement 1, BattleFrontier_ReceptionGate_Movement_272598
- applymovement 2, BattleFrontier_ReceptionGate_Movement_272598
- applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_ReceptionGate_Movement_272598
+ applymovement 1, Common_Movement_ExclamationMark
+ applymovement 2, Common_Movement_ExclamationMark
+ applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_ExclamationMark
waitmovement 0
msgbox BattleFrontier_ReceptionGate_Text_266733, MSGBOX_DEFAULT
closemessage
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-08 17:16:52 +0000