summaryrefslogtreecommitdiff
path: root/data/maps/MtPyre_Summit
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/MtPyre_Summit')
-rw-r--r--data/maps/MtPyre_Summit/events.inc30
-rw-r--r--data/maps/MtPyre_Summit/header.inc15
-rw-r--r--data/maps/MtPyre_Summit/map.json219
-rw-r--r--data/maps/MtPyre_Summit/scripts.inc30
4 files changed, 234 insertions, 60 deletions
diff --git a/data/maps/MtPyre_Summit/events.inc b/data/maps/MtPyre_Summit/events.inc
deleted file mode 100644
index b112fbcfe..000000000
--- a/data/maps/MtPyre_Summit/events.inc
+++ /dev/null
@@ -1,30 +0,0 @@
-MtPyre_Summit_EventObjects: @ 85351A0
- object_event 1, EVENT_OBJ_GFX_OLD_MAN, 0, 22, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MtPyre_Summit_EventScript_23213C, 0
- object_event 2, EVENT_OBJ_GFX_ARCHIE, 0, 23, 6, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_MT_PYRE_SUMMIT_ARCHIE
- object_event 3, EVENT_OBJ_GFX_EXPERT_F, 0, 23, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MtPyre_Summit_EventScript_2321A2, 0
- object_event 4, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 21, 15, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 3, MtPyre_Summit_EventScript_2323FD, FLAG_HIDE_MT_PYRE_SUMMIT_TEAM_AQUA
- object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 25, 18, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 3, MtPyre_Summit_EventScript_232414, FLAG_HIDE_MT_PYRE_SUMMIT_TEAM_AQUA
- object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 21, 11, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 3, MtPyre_Summit_EventScript_23242B, FLAG_HIDE_MT_PYRE_SUMMIT_TEAM_AQUA
- object_event 7, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 25, 11, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 3, MtPyre_Summit_EventScript_232442, FLAG_HIDE_MT_PYRE_SUMMIT_TEAM_AQUA
- object_event 8, EVENT_OBJ_GFX_MAXIE, 0, 23, 6, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, FLAG_HIDE_MT_PYRE_SUMMIT_MAXIE
-
-MtPyre_Summit_MapWarps: @ 8535260
- warp_def 22, 31, 3, 1, MAP_MT_PYRE_EXTERIOR
- warp_def 23, 31, 3, 1, MAP_MT_PYRE_EXTERIOR
- warp_def 24, 31, 3, 1, MAP_MT_PYRE_EXTERIOR
-
-MtPyre_Summit_MapCoordEvents: @ 8535278
- coord_event 22, 7, 3, VAR_0x40B9, 0, MtPyre_Summit_EventScript_232018
- coord_event 23, 7, 3, VAR_0x40B9, 0, MtPyre_Summit_EventScript_232024
- coord_event 24, 7, 3, VAR_0x40B9, 0, MtPyre_Summit_EventScript_232030
- coord_event 22, 9, 3, VAR_0x40B9, 2, MtPyre_Summit_EventScript_2321EC
- coord_event 23, 9, 3, VAR_0x40B9, 2, MtPyre_Summit_EventScript_2321F8
- coord_event 24, 9, 3, VAR_0x40B9, 2, MtPyre_Summit_EventScript_232204
-
-MtPyre_Summit_MapBGEvents: @ 85352D8
- bg_hidden_item_event 9, 25, 0, ITEM_ZINC, FLAG_HIDDEN_ITEM_MT_PYRE_SUMMIT_ZINC
- bg_hidden_item_event 37, 7, 3, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_MT_PYRE_SUMMIT_RARE_CANDY
-
-MtPyre_Summit_MapEvents:: @ 85352F0
- map_events MtPyre_Summit_EventObjects, MtPyre_Summit_MapWarps, MtPyre_Summit_MapCoordEvents, MtPyre_Summit_MapBGEvents
-
diff --git a/data/maps/MtPyre_Summit/header.inc b/data/maps/MtPyre_Summit/header.inc
deleted file mode 100644
index 29a28e99b..000000000
--- a/data/maps/MtPyre_Summit/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-MtPyre_Summit: @ 8484128
- .4byte MtPyre_Summit_Layout
- .4byte MtPyre_Summit_MapEvents
- .4byte MtPyre_Summit_MapScripts
- .4byte 0x0
- .2byte MUS_MACHUPI
- .2byte 303
- .byte MAPSEC_MT_PYRE
- .byte 0
- .byte WEATHER_FOG_1
- .byte MAP_TYPE_ROUTE
- .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/MtPyre_Summit/map.json b/data/maps/MtPyre_Summit/map.json
new file mode 100644
index 000000000..78780ba19
--- /dev/null
+++ b/data/maps/MtPyre_Summit/map.json
@@ -0,0 +1,219 @@
+{
+ "id": "MAP_MT_PYRE_SUMMIT",
+ "name": "MtPyre_Summit",
+ "layout": "LAYOUT_MT_PYRE_SUMMIT",
+ "music": "MUS_MACHUPI",
+ "region_map_section": "MAPSEC_MT_PYRE",
+ "requires_flash": false,
+ "weather": "WEATHER_FOG_1",
+ "map_type": "MAP_TYPE_ROUTE",
+ "allow_bike": true,
+ "allow_escape_rope": false,
+ "allow_running": true,
+ "show_map_name": true,
+ "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+ "connections": null,
+ "object_events": [
+ {
+ "graphics_id": "EVENT_OBJ_GFX_OLD_MAN",
+ "x": 22,
+ "y": 5,
+ "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": "MtPyre_Summit_EventScript_23213C",
+ "flag": "0"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_ARCHIE",
+ "x": 23,
+ "y": 6,
+ "elevation": 3,
+ "movement_type": "MOVEMENT_TYPE_FACE_UP",
+ "movement_range_x": 0,
+ "movement_range_y": 0,
+ "trainer_type": "0",
+ "trainer_sight_or_berry_tree_id": "0",
+ "script": "0x0",
+ "flag": "FLAG_HIDE_MT_PYRE_SUMMIT_ARCHIE"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_EXPERT_F",
+ "x": 23,
+ "y": 5,
+ "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": "MtPyre_Summit_EventScript_2321A2",
+ "flag": "0"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M",
+ "x": 21,
+ "y": 15,
+ "elevation": 3,
+ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+ "movement_range_x": 0,
+ "movement_range_y": 0,
+ "trainer_type": "1",
+ "trainer_sight_or_berry_tree_id": "3",
+ "script": "MtPyre_Summit_EventScript_2323FD",
+ "flag": "FLAG_HIDE_MT_PYRE_SUMMIT_TEAM_AQUA"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M",
+ "x": 25,
+ "y": 18,
+ "elevation": 3,
+ "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+ "movement_range_x": 0,
+ "movement_range_y": 0,
+ "trainer_type": "1",
+ "trainer_sight_or_berry_tree_id": "3",
+ "script": "MtPyre_Summit_EventScript_232414",
+ "flag": "FLAG_HIDE_MT_PYRE_SUMMIT_TEAM_AQUA"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M",
+ "x": 21,
+ "y": 11,
+ "elevation": 3,
+ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+ "movement_range_x": 0,
+ "movement_range_y": 0,
+ "trainer_type": "1",
+ "trainer_sight_or_berry_tree_id": "3",
+ "script": "MtPyre_Summit_EventScript_23242B",
+ "flag": "FLAG_HIDE_MT_PYRE_SUMMIT_TEAM_AQUA"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_F",
+ "x": 25,
+ "y": 11,
+ "elevation": 3,
+ "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+ "movement_range_x": 1,
+ "movement_range_y": 1,
+ "trainer_type": "1",
+ "trainer_sight_or_berry_tree_id": "3",
+ "script": "MtPyre_Summit_EventScript_232442",
+ "flag": "FLAG_HIDE_MT_PYRE_SUMMIT_TEAM_AQUA"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_MAXIE",
+ "x": 23,
+ "y": 6,
+ "elevation": 3,
+ "movement_type": "MOVEMENT_TYPE_FACE_UP",
+ "movement_range_x": 1,
+ "movement_range_y": 1,
+ "trainer_type": "0",
+ "trainer_sight_or_berry_tree_id": "0",
+ "script": "0x0",
+ "flag": "FLAG_HIDE_MT_PYRE_SUMMIT_MAXIE"
+ }
+ ],
+ "warp_events": [
+ {
+ "x": 22,
+ "y": 31,
+ "elevation": 3,
+ "dest_map": "MAP_MT_PYRE_EXTERIOR",
+ "dest_warp_id": 1
+ },
+ {
+ "x": 23,
+ "y": 31,
+ "elevation": 3,
+ "dest_map": "MAP_MT_PYRE_EXTERIOR",
+ "dest_warp_id": 1
+ },
+ {
+ "x": 24,
+ "y": 31,
+ "elevation": 3,
+ "dest_map": "MAP_MT_PYRE_EXTERIOR",
+ "dest_warp_id": 1
+ }
+ ],
+ "coord_events": [
+ {
+ "type": "trigger",
+ "x": 22,
+ "y": 7,
+ "elevation": 3,
+ "var": "VAR_MT_PYRE_STATE",
+ "var_value": "0",
+ "script": "MtPyre_Summit_EventScript_232018"
+ },
+ {
+ "type": "trigger",
+ "x": 23,
+ "y": 7,
+ "elevation": 3,
+ "var": "VAR_MT_PYRE_STATE",
+ "var_value": "0",
+ "script": "MtPyre_Summit_EventScript_232024"
+ },
+ {
+ "type": "trigger",
+ "x": 24,
+ "y": 7,
+ "elevation": 3,
+ "var": "VAR_MT_PYRE_STATE",
+ "var_value": "0",
+ "script": "MtPyre_Summit_EventScript_232030"
+ },
+ {
+ "type": "trigger",
+ "x": 22,
+ "y": 9,
+ "elevation": 3,
+ "var": "VAR_MT_PYRE_STATE",
+ "var_value": "2",
+ "script": "MtPyre_Summit_EventScript_2321EC"
+ },
+ {
+ "type": "trigger",
+ "x": 23,
+ "y": 9,
+ "elevation": 3,
+ "var": "VAR_MT_PYRE_STATE",
+ "var_value": "2",
+ "script": "MtPyre_Summit_EventScript_2321F8"
+ },
+ {
+ "type": "trigger",
+ "x": 24,
+ "y": 9,
+ "elevation": 3,
+ "var": "VAR_MT_PYRE_STATE",
+ "var_value": "2",
+ "script": "MtPyre_Summit_EventScript_232204"
+ }
+ ],
+ "bg_events": [
+ {
+ "type": "hidden_item",
+ "x": 9,
+ "y": 25,
+ "elevation": 0,
+ "item": "ITEM_ZINC",
+ "flag": "FLAG_HIDDEN_ITEM_MT_PYRE_SUMMIT_ZINC"
+ },
+ {
+ "type": "hidden_item",
+ "x": 37,
+ "y": 7,
+ "elevation": 3,
+ "item": "ITEM_RARE_CANDY",
+ "flag": "FLAG_HIDDEN_ITEM_MT_PYRE_SUMMIT_RARE_CANDY"
+ }
+ ]
+} \ No newline at end of file
diff --git a/data/maps/MtPyre_Summit/scripts.inc b/data/maps/MtPyre_Summit/scripts.inc
index 6eaf6265f..a0da7e907 100644
--- a/data/maps/MtPyre_Summit/scripts.inc
+++ b/data/maps/MtPyre_Summit/scripts.inc
@@ -1,9 +1,9 @@
MtPyre_Summit_MapScripts:: @ 8231FF7
- map_script 3, MtPyre_Summit_MapScript1_231FFD
+ map_script MAP_SCRIPT_ON_TRANSITION, MtPyre_Summit_MapScript1_231FFD
.byte 0
MtPyre_Summit_MapScript1_231FFD: @ 8231FFD
- compare VAR_0x40B9, 2
+ compare VAR_MT_PYRE_STATE, 2
call_if_eq MtPyre_Summit_EventScript_232009
end
@@ -32,9 +32,9 @@ MtPyre_Summit_EventScript_232030:: @ 8232030
MtPyre_Summit_EventScript_23203C:: @ 823203C
playbgm MUS_AQA_0, 0
- applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_2725B2
+ applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceUp
waitmovement 0
- applymovement 2, MtPyre_Summit_Movement_2725AA
+ applymovement 2, Common_Movement_WalkInPlaceDown
waitmovement 0
delay 50
compare VAR_0x8008, 0
@@ -56,7 +56,7 @@ MtPyre_Summit_EventScript_23203C:: @ 823203C
fadedefaultbgm
fadescreen 0
delay 20
- setvar VAR_0x40B9, 1
+ setvar VAR_MT_PYRE_STATE, 1
compare VAR_0x8008, 0
call_if_eq MtPyre_Summit_EventScript_2320F7
compare VAR_0x8008, 1
@@ -86,7 +86,7 @@ MtPyre_Summit_EventScript_2320EC:: @ 82320EC
MtPyre_Summit_EventScript_2320F7:: @ 82320F7
applymovement 3, MtPyre_Summit_Movement_23212C
waitmovement 0
- applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_2725A8
+ applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight
waitmovement 0
return
@@ -98,7 +98,7 @@ MtPyre_Summit_EventScript_23210C:: @ 823210C
MtPyre_Summit_EventScript_232117:: @ 8232117
applymovement 3, MtPyre_Summit_Movement_232132
waitmovement 0
- applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_2725A4
+ applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft
waitmovement 0
return
@@ -165,7 +165,7 @@ MtPyre_Summit_EventScript_2321A2:: @ 82321A2
lock
faceplayer
goto_if_set FLAG_RETURNED_RED_OR_BLUE_ORB, MtPyre_Summit_EventScript_2321E2
- compare VAR_0x40B9, 3
+ compare VAR_MT_PYRE_STATE, 3
call_if_ge MtPyre_Summit_EventScript_2321CB
goto_if_set FLAG_KYOGRE_ESCAPED_SEAFLOOR_CAVERN, MtPyre_Summit_EventScript_2321D8
msgbox MtPyre_Summit_Text_232AD8, MSGBOX_DEFAULT
@@ -207,7 +207,7 @@ MtPyre_Summit_EventScript_232204:: @ 8232204
end
MtPyre_Summit_EventScript_232210:: @ 8232210
- applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_2725A6
+ applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp
waitmovement 0
delay 60
compare VAR_0x8008, 0
@@ -217,9 +217,9 @@ MtPyre_Summit_EventScript_232210:: @ 8232210
compare VAR_0x8008, 2
call_if_eq MtPyre_Summit_EventScript_2322F6
playse SE_PIN
- applymovement 8, MtPyre_Summit_Movement_272598
+ applymovement 8, Common_Movement_ExclamationMark
waitmovement 0
- applymovement 8, MtPyre_Summit_Movement_27259A
+ applymovement 8, Common_Movement_Delay48
waitmovement 0
delay 30
compare VAR_0x8008, 0
@@ -242,7 +242,7 @@ MtPyre_Summit_EventScript_232210:: @ 8232210
waitmovement 0
removeobject 2
removeobject 8
- setvar VAR_0x40B9, 3
+ setvar VAR_MT_PYRE_STATE, 3
releaseall
end
@@ -292,7 +292,7 @@ MtPyre_Summit_EventScript_23235A:: @ 823235A
applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_2323EA
applymovement 8, MtPyre_Summit_Movement_2323ED
waitmovement 0
- applymovement 2, MtPyre_Summit_Movement_2725A8
+ applymovement 2, Common_Movement_WalkInPlaceRight
waitmovement 0
return
@@ -300,7 +300,7 @@ MtPyre_Summit_EventScript_232376:: @ 8232376
applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_2323EA
applymovement 8, MtPyre_Summit_Movement_2323F3
waitmovement 0
- applymovement 2, MtPyre_Summit_Movement_2725A8
+ applymovement 2, Common_Movement_WalkInPlaceRight
waitmovement 0
return
@@ -308,7 +308,7 @@ MtPyre_Summit_EventScript_232392:: @ 8232392
applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_2323EA
applymovement 8, MtPyre_Summit_Movement_2323F8
waitmovement 0
- applymovement 2, MtPyre_Summit_Movement_2725A8
+ applymovement 2, Common_Movement_WalkInPlaceRight
waitmovement 0
return
generated by cgit v1.2.3 (git 2.25.1) at 2026-03-27 12:16:42 +0000