summaryrefslogtreecommitdiff
path: root/data/maps/RustboroCity
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/RustboroCity')
-rw-r--r--data/maps/RustboroCity/connections.inc9
-rw-r--r--data/maps/RustboroCity/events.inc70
-rw-r--r--data/maps/RustboroCity/header.inc15
-rw-r--r--data/maps/RustboroCity/map.json601
-rw-r--r--data/maps/RustboroCity/scripts.inc178
5 files changed, 690 insertions, 183 deletions
diff --git a/data/maps/RustboroCity/connections.inc b/data/maps/RustboroCity/connections.inc
deleted file mode 100644
index dbca1662d..000000000
--- a/data/maps/RustboroCity/connections.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-RustboroCity_MapConnectionsList: @ 8486758
- connection up, 0, MAP_ROUTE115
- connection down, 0, MAP_ROUTE104
- connection right, 0, MAP_ROUTE116
-
-RustboroCity_MapConnections: @ 848677C
- .4byte 0x3
- .4byte RustboroCity_MapConnectionsList
-
diff --git a/data/maps/RustboroCity/events.inc b/data/maps/RustboroCity/events.inc
deleted file mode 100644
index b2bcfa7ca..000000000
--- a/data/maps/RustboroCity/events.inc
+++ /dev/null
@@ -1,70 +0,0 @@
-RustboroCity_EventObjects: @ 85267E0
- object_event 1, EVENT_OBJ_GFX_WOMAN_5, 0, 22, 34, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, RustboroCity_EventScript_1E088A, 0
- object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 19, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, RustboroCity_EventScript_1E085F, 0
- object_event 3, EVENT_OBJ_GFX_NINJA_BOY, 0, 25, 37, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, RustboroCity_EventScript_1E08DA, 0
- object_event 4, EVENT_OBJ_GFX_TWIN, 0, 21, 46, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, RustboroCity_EventScript_1E08D1, 0
- object_event 5, EVENT_OBJ_GFX_BOY_2, 0, 12, 45, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, RustboroCity_EventScript_1E08B2, 0
- object_event 6, EVENT_OBJ_GFX_MAN_3, 0, 26, 23, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, RustboroCity_EventScript_1E0893, 0
- object_event 7, EVENT_OBJ_GFX_LITTLE_BOY, 0, 24, 51, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_EventScript_1E0922, 0
- object_event 8, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 25, 51, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RustboroCity_EventScript_1E0938, 0
- object_event 9, EVENT_OBJ_GFX_MAN_2, 0, 30, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, RustboroCity_EventScript_1E0ADD, FLAG_HIDE_RUSTBORO_CITY_DEVON_EMPLOYEE_1
- object_event 10, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 13, 21, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_RUSTBORO_CITY_AQUA_GRUNT
- object_event 11, EVENT_OBJ_GFX_DEVON_EMPLOYEE, 0, 13, 34, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, RustboroCity_EventScript_1E087E, 0
- object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 36, 51, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, RustboroCity_EventScript_2910DB, FLAG_ITEM_RUSTBORO_CITY_X_DEFEND
- object_event 13, EVENT_OBJ_GFX_MAN_4, 0, 19, 27, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 1, 0, 0, RustboroCity_EventScript_1E094E, 0
- object_event 14, EVENT_OBJ_GFX_VAR_0, 0, 16, 50, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, RustboroCity_EventScript_1E0DB8, FLAG_HIDE_RUSBORO_CITY_RIVAL
- object_event 15, EVENT_OBJ_GFX_SCIENTIST_1, 0, 11, 15, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, FLAG_HIDE_RUSTBORO_CITY_SCIENTIST
- object_event 16, EVENT_OBJ_GFX_BOY_1, 0, 31, 36, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 1, 0, 0, RustboroCity_EventScript_1E1236, 0
-
-RustboroCity_MapWarps: @ 8526960
- warp_def 27, 19, 0, 0, MAP_RUSTBORO_CITY_GYM
- warp_def 13, 30, 0, 0, MAP_RUSTBORO_CITY_FLAT1_1F
- warp_def 16, 45, 0, 0, MAP_RUSTBORO_CITY_MART
- warp_def 16, 38, 0, 0, MAP_RUSTBORO_CITY_POKEMON_CENTER_1F
- warp_def 27, 34, 0, 0, MAP_RUSTBORO_CITY_POKEMON_SCHOOL
- warp_def 11, 15, 0, 0, MAP_RUSTBORO_CITY_DEVON_CORP_1F
- warp_def 12, 15, 0, 1, MAP_RUSTBORO_CITY_DEVON_CORP_1F
- warp_def 33, 19, 0, 0, MAP_RUSTBORO_CITY_HOUSE1
- warp_def 9, 38, 0, 0, MAP_RUSTBORO_CITY_CUTTERS_HOUSE
- warp_def 30, 28, 0, 0, MAP_RUSTBORO_CITY_HOUSE2
- warp_def 5, 51, 0, 0, MAP_RUSTBORO_CITY_FLAT2_1F
- warp_def 26, 46, 0, 0, MAP_RUSTBORO_CITY_HOUSE3
-
-RustboroCity_MapCoordEvents: @ 85269C0
- coord_event 23, 20, 3, VAR_0x405A, 1, RustboroCity_EventScript_1E095A
- coord_event 23, 21, 3, VAR_0x405A, 1, RustboroCity_EventScript_1E0971
- coord_event 23, 22, 3, VAR_0x405A, 1, RustboroCity_EventScript_1E0988
- coord_event 23, 23, 3, VAR_0x405A, 1, RustboroCity_EventScript_1E099F
- coord_event 23, 24, 3, VAR_0x405A, 1, RustboroCity_EventScript_1E09B6
- coord_event 30, 9, 3, VAR_0x405A, 2, RustboroCity_EventScript_1E0AFE
- coord_event 29, 10, 3, VAR_0x405A, 2, RustboroCity_EventScript_1E0B0A
- coord_event 30, 11, 3, VAR_0x405A, 2, RustboroCity_EventScript_1E0B16
- coord_event 30, 12, 3, VAR_0x405A, 2, RustboroCity_EventScript_1E0B22
- coord_event 30, 9, 3, VAR_0x405A, 4, RustboroCity_EventScript_1E0C2B
- coord_event 31, 10, 3, VAR_0x405A, 4, RustboroCity_EventScript_1E0C37
- coord_event 30, 11, 3, VAR_0x405A, 4, RustboroCity_EventScript_1E0C43
- coord_event 30, 12, 3, VAR_0x405A, 4, RustboroCity_EventScript_1E0C4F
- coord_event 12, 53, 3, VAR_0x405A, 7, RustboroCity_EventScript_1E0DF3
- coord_event 13, 53, 3, VAR_0x405A, 7, RustboroCity_EventScript_1E0E33
- coord_event 14, 53, 3, VAR_0x405A, 7, RustboroCity_EventScript_1E0E73
- coord_event 15, 53, 3, VAR_0x405A, 7, RustboroCity_EventScript_1E0EB3
- coord_event 16, 53, 3, VAR_0x405A, 7, RustboroCity_EventScript_1E0EF3
- coord_event 17, 53, 3, VAR_0x405A, 7, RustboroCity_EventScript_1E0F33
- coord_event 18, 53, 3, VAR_0x405A, 7, RustboroCity_EventScript_1E0F73
- coord_event 19, 53, 3, VAR_0x405A, 7, RustboroCity_EventScript_1E0FB3
-
-RustboroCity_MapBGEvents: @ 8526B10
- bg_event 23, 19, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_EventScript_1E08F5
- bg_event 25, 35, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_EventScript_1E0910
- bg_event 17, 45, 0, BG_EVENT_PLAYER_FACING_NORTH, RustboroCity_EventScript_271E6A
- bg_event 18, 38, 0, BG_EVENT_PLAYER_FACING_NORTH, RustboroCity_EventScript_271E73
- bg_event 19, 49, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_EventScript_1E0907
- bg_event 18, 45, 0, BG_EVENT_PLAYER_FACING_NORTH, RustboroCity_EventScript_271E6A
- bg_event 17, 38, 0, BG_EVENT_PLAYER_FACING_NORTH, RustboroCity_EventScript_271E73
- bg_event 17, 20, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_EventScript_1E08EC
- bg_event 30, 8, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_EventScript_1E08E3
- bg_event 12, 38, 3, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_EventScript_1E0919
-
-RustboroCity_MapEvents:: @ 8526B88
- map_events RustboroCity_EventObjects, RustboroCity_MapWarps, RustboroCity_MapCoordEvents, RustboroCity_MapBGEvents
-
diff --git a/data/maps/RustboroCity/header.inc b/data/maps/RustboroCity/header.inc
deleted file mode 100644
index 0cbd55b24..000000000
--- a/data/maps/RustboroCity/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-RustboroCity: @ 848250C
- .4byte RustboroCity_Layout
- .4byte RustboroCity_MapEvents
- .4byte RustboroCity_MapScripts
- .4byte RustboroCity_MapConnections
- .2byte MUS_GOTOWN
- .2byte 4
- .byte MAPSEC_RUSTBORO_CITY
- .byte 0
- .byte WEATHER_SUNNY
- .byte MAP_TYPE_CITY
- .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/RustboroCity/map.json b/data/maps/RustboroCity/map.json
new file mode 100644
index 000000000..04c68baa3
--- /dev/null
+++ b/data/maps/RustboroCity/map.json
@@ -0,0 +1,601 @@
+{
+ "id": "MAP_RUSTBORO_CITY",
+ "name": "RustboroCity",
+ "layout": "LAYOUT_RUSTBORO_CITY",
+ "music": "MUS_GOTOWN",
+ "region_map_section": "MAPSEC_RUSTBORO_CITY",
+ "requires_flash": false,
+ "weather": "WEATHER_SUNNY",
+ "map_type": "MAP_TYPE_CITY",
+ "allow_bike": true,
+ "allow_escape_rope": false,
+ "allow_running": true,
+ "show_map_name": true,
+ "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+ "connections": [
+ {
+ "direction": "up",
+ "offset": 0,
+ "map": "MAP_ROUTE115"
+ },
+ {
+ "direction": "down",
+ "offset": 0,
+ "map": "MAP_ROUTE104"
+ },
+ {
+ "direction": "right",
+ "offset": 0,
+ "map": "MAP_ROUTE116"
+ }
+ ],
+ "object_events": [
+ {
+ "graphics_id": "EVENT_OBJ_GFX_WOMAN_5",
+ "x": 22,
+ "y": 34,
+ "elevation": 3,
+ "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN",
+ "movement_range_x": 0,
+ "movement_range_y": 1,
+ "trainer_type": "0",
+ "trainer_sight_or_berry_tree_id": "0",
+ "script": "RustboroCity_EventScript_1E088A",
+ "flag": "0"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_FAT_MAN",
+ "x": 19,
+ "y": 13,
+ "elevation": 3,
+ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+ "movement_range_x": 1,
+ "movement_range_y": 1,
+ "trainer_type": "0",
+ "trainer_sight_or_berry_tree_id": "0",
+ "script": "RustboroCity_EventScript_1E085F",
+ "flag": "0"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY",
+ "x": 25,
+ "y": 37,
+ "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": "RustboroCity_EventScript_1E08DA",
+ "flag": "0"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_TWIN",
+ "x": 21,
+ "y": 46,
+ "elevation": 3,
+ "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN",
+ "movement_range_x": 0,
+ "movement_range_y": 1,
+ "trainer_type": "0",
+ "trainer_sight_or_berry_tree_id": "0",
+ "script": "RustboroCity_EventScript_1E08D1",
+ "flag": "0"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_BOY_2",
+ "x": 12,
+ "y": 45,
+ "elevation": 3,
+ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+ "movement_range_x": 0,
+ "movement_range_y": 0,
+ "trainer_type": "0",
+ "trainer_sight_or_berry_tree_id": "0",
+ "script": "RustboroCity_EventScript_1E08B2",
+ "flag": "0"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_MAN_3",
+ "x": 26,
+ "y": 23,
+ "elevation": 3,
+ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+ "movement_range_x": 1,
+ "movement_range_y": 1,
+ "trainer_type": "0",
+ "trainer_sight_or_berry_tree_id": "0",
+ "script": "RustboroCity_EventScript_1E0893",
+ "flag": "0"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY",
+ "x": 24,
+ "y": 51,
+ "elevation": 3,
+ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+ "movement_range_x": 0,
+ "movement_range_y": 0,
+ "trainer_type": "0",
+ "trainer_sight_or_berry_tree_id": "0",
+ "script": "RustboroCity_EventScript_1E0922",
+ "flag": "0"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL",
+ "x": 25,
+ "y": 51,
+ "elevation": 3,
+ "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+ "movement_range_x": 0,
+ "movement_range_y": 0,
+ "trainer_type": "0",
+ "trainer_sight_or_berry_tree_id": "0",
+ "script": "RustboroCity_EventScript_1E0938",
+ "flag": "0"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_MAN_2",
+ "x": 30,
+ "y": 10,
+ "elevation": 3,
+ "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": "RustboroCity_EventScript_1E0ADD",
+ "flag": "FLAG_HIDE_RUSTBORO_CITY_DEVON_EMPLOYEE_1"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M",
+ "x": 13,
+ "y": 21,
+ "elevation": 3,
+ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+ "movement_range_x": 0,
+ "movement_range_y": 0,
+ "trainer_type": "0",
+ "trainer_sight_or_berry_tree_id": "0",
+ "script": "0x0",
+ "flag": "FLAG_HIDE_RUSTBORO_CITY_AQUA_GRUNT"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_DEVON_EMPLOYEE",
+ "x": 13,
+ "y": 34,
+ "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": "RustboroCity_EventScript_1E087E",
+ "flag": "0"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+ "x": 36,
+ "y": 51,
+ "elevation": 3,
+ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+ "movement_range_x": 0,
+ "movement_range_y": 0,
+ "trainer_type": "0",
+ "trainer_sight_or_berry_tree_id": "0",
+ "script": "RustboroCity_EventScript_2910DB",
+ "flag": "FLAG_ITEM_RUSTBORO_CITY_X_DEFEND"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_MAN_4",
+ "x": 19,
+ "y": 27,
+ "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": "RustboroCity_EventScript_1E094E",
+ "flag": "0"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_VAR_0",
+ "x": 16,
+ "y": 50,
+ "elevation": 3,
+ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+ "movement_range_x": 1,
+ "movement_range_y": 1,
+ "trainer_type": "0",
+ "trainer_sight_or_berry_tree_id": "0",
+ "script": "RustboroCity_EventScript_1E0DB8",
+ "flag": "FLAG_HIDE_RUSBORO_CITY_RIVAL"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1",
+ "x": 11,
+ "y": 15,
+ "elevation": 0,
+ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+ "movement_range_x": 1,
+ "movement_range_y": 1,
+ "trainer_type": "0",
+ "trainer_sight_or_berry_tree_id": "0",
+ "script": "0x0",
+ "flag": "FLAG_HIDE_RUSTBORO_CITY_SCIENTIST"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_BOY_1",
+ "x": 31,
+ "y": 36,
+ "elevation": 3,
+ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+ "movement_range_x": 0,
+ "movement_range_y": 1,
+ "trainer_type": "0",
+ "trainer_sight_or_berry_tree_id": "0",
+ "script": "RustboroCity_EventScript_1E1236",
+ "flag": "0"
+ }
+ ],
+ "warp_events": [
+ {
+ "x": 27,
+ "y": 19,
+ "elevation": 0,
+ "dest_map": "MAP_RUSTBORO_CITY_GYM",
+ "dest_warp_id": 0
+ },
+ {
+ "x": 13,
+ "y": 30,
+ "elevation": 0,
+ "dest_map": "MAP_RUSTBORO_CITY_FLAT1_1F",
+ "dest_warp_id": 0
+ },
+ {
+ "x": 16,
+ "y": 45,
+ "elevation": 0,
+ "dest_map": "MAP_RUSTBORO_CITY_MART",
+ "dest_warp_id": 0
+ },
+ {
+ "x": 16,
+ "y": 38,
+ "elevation": 0,
+ "dest_map": "MAP_RUSTBORO_CITY_POKEMON_CENTER_1F",
+ "dest_warp_id": 0
+ },
+ {
+ "x": 27,
+ "y": 34,
+ "elevation": 0,
+ "dest_map": "MAP_RUSTBORO_CITY_POKEMON_SCHOOL",
+ "dest_warp_id": 0
+ },
+ {
+ "x": 11,
+ "y": 15,
+ "elevation": 0,
+ "dest_map": "MAP_RUSTBORO_CITY_DEVON_CORP_1F",
+ "dest_warp_id": 0
+ },
+ {
+ "x": 12,
+ "y": 15,
+ "elevation": 0,
+ "dest_map": "MAP_RUSTBORO_CITY_DEVON_CORP_1F",
+ "dest_warp_id": 1
+ },
+ {
+ "x": 33,
+ "y": 19,
+ "elevation": 0,
+ "dest_map": "MAP_RUSTBORO_CITY_HOUSE1",
+ "dest_warp_id": 0
+ },
+ {
+ "x": 9,
+ "y": 38,
+ "elevation": 0,
+ "dest_map": "MAP_RUSTBORO_CITY_CUTTERS_HOUSE",
+ "dest_warp_id": 0
+ },
+ {
+ "x": 30,
+ "y": 28,
+ "elevation": 0,
+ "dest_map": "MAP_RUSTBORO_CITY_HOUSE2",
+ "dest_warp_id": 0
+ },
+ {
+ "x": 5,
+ "y": 51,
+ "elevation": 0,
+ "dest_map": "MAP_RUSTBORO_CITY_FLAT2_1F",
+ "dest_warp_id": 0
+ },
+ {
+ "x": 26,
+ "y": 46,
+ "elevation": 0,
+ "dest_map": "MAP_RUSTBORO_CITY_HOUSE3",
+ "dest_warp_id": 0
+ }
+ ],
+ "coord_events": [
+ {
+ "type": "trigger",
+ "x": 23,
+ "y": 20,
+ "elevation": 3,
+ "var": "VAR_RUSTBORO_STATE",
+ "var_value": "1",
+ "script": "RustboroCity_EventScript_1E095A"
+ },
+ {
+ "type": "trigger",
+ "x": 23,
+ "y": 21,
+ "elevation": 3,
+ "var": "VAR_RUSTBORO_STATE",
+ "var_value": "1",
+ "script": "RustboroCity_EventScript_1E0971"
+ },
+ {
+ "type": "trigger",
+ "x": 23,
+ "y": 22,
+ "elevation": 3,
+ "var": "VAR_RUSTBORO_STATE",
+ "var_value": "1",
+ "script": "RustboroCity_EventScript_1E0988"
+ },
+ {
+ "type": "trigger",
+ "x": 23,
+ "y": 23,
+ "elevation": 3,
+ "var": "VAR_RUSTBORO_STATE",
+ "var_value": "1",
+ "script": "RustboroCity_EventScript_1E099F"
+ },
+ {
+ "type": "trigger",
+ "x": 23,
+ "y": 24,
+ "elevation": 3,
+ "var": "VAR_RUSTBORO_STATE",
+ "var_value": "1",
+ "script": "RustboroCity_EventScript_1E09B6"
+ },
+ {
+ "type": "trigger",
+ "x": 30,
+ "y": 9,
+ "elevation": 3,
+ "var": "VAR_RUSTBORO_STATE",
+ "var_value": "2",
+ "script": "RustboroCity_EventScript_1E0AFE"
+ },
+ {
+ "type": "trigger",
+ "x": 29,
+ "y": 10,
+ "elevation": 3,
+ "var": "VAR_RUSTBORO_STATE",
+ "var_value": "2",
+ "script": "RustboroCity_EventScript_1E0B0A"
+ },
+ {
+ "type": "trigger",
+ "x": 30,
+ "y": 11,
+ "elevation": 3,
+ "var": "VAR_RUSTBORO_STATE",
+ "var_value": "2",
+ "script": "RustboroCity_EventScript_1E0B16"
+ },
+ {
+ "type": "trigger",
+ "x": 30,
+ "y": 12,
+ "elevation": 3,
+ "var": "VAR_RUSTBORO_STATE",
+ "var_value": "2",
+ "script": "RustboroCity_EventScript_1E0B22"
+ },
+ {
+ "type": "trigger",
+ "x": 30,
+ "y": 9,
+ "elevation": 3,
+ "var": "VAR_RUSTBORO_STATE",
+ "var_value": "4",
+ "script": "RustboroCity_EventScript_1E0C2B"
+ },
+ {
+ "type": "trigger",
+ "x": 31,
+ "y": 10,
+ "elevation": 3,
+ "var": "VAR_RUSTBORO_STATE",
+ "var_value": "4",
+ "script": "RustboroCity_EventScript_1E0C37"
+ },
+ {
+ "type": "trigger",
+ "x": 30,
+ "y": 11,
+ "elevation": 3,
+ "var": "VAR_RUSTBORO_STATE",
+ "var_value": "4",
+ "script": "RustboroCity_EventScript_1E0C43"
+ },
+ {
+ "type": "trigger",
+ "x": 30,
+ "y": 12,
+ "elevation": 3,
+ "var": "VAR_RUSTBORO_STATE",
+ "var_value": "4",
+ "script": "RustboroCity_EventScript_1E0C4F"
+ },
+ {
+ "type": "trigger",
+ "x": 12,
+ "y": 53,
+ "elevation": 3,
+ "var": "VAR_RUSTBORO_STATE",
+ "var_value": "7",
+ "script": "RustboroCity_EventScript_1E0DF3"
+ },
+ {
+ "type": "trigger",
+ "x": 13,
+ "y": 53,
+ "elevation": 3,
+ "var": "VAR_RUSTBORO_STATE",
+ "var_value": "7",
+ "script": "RustboroCity_EventScript_1E0E33"
+ },
+ {
+ "type": "trigger",
+ "x": 14,
+ "y": 53,
+ "elevation": 3,
+ "var": "VAR_RUSTBORO_STATE",
+ "var_value": "7",
+ "script": "RustboroCity_EventScript_1E0E73"
+ },
+ {
+ "type": "trigger",
+ "x": 15,
+ "y": 53,
+ "elevation": 3,
+ "var": "VAR_RUSTBORO_STATE",
+ "var_value": "7",
+ "script": "RustboroCity_EventScript_1E0EB3"
+ },
+ {
+ "type": "trigger",
+ "x": 16,
+ "y": 53,
+ "elevation": 3,
+ "var": "VAR_RUSTBORO_STATE",
+ "var_value": "7",
+ "script": "RustboroCity_EventScript_1E0EF3"
+ },
+ {
+ "type": "trigger",
+ "x": 17,
+ "y": 53,
+ "elevation": 3,
+ "var": "VAR_RUSTBORO_STATE",
+ "var_value": "7",
+ "script": "RustboroCity_EventScript_1E0F33"
+ },
+ {
+ "type": "trigger",
+ "x": 18,
+ "y": 53,
+ "elevation": 3,
+ "var": "VAR_RUSTBORO_STATE",
+ "var_value": "7",
+ "script": "RustboroCity_EventScript_1E0F73"
+ },
+ {
+ "type": "trigger",
+ "x": 19,
+ "y": 53,
+ "elevation": 3,
+ "var": "VAR_RUSTBORO_STATE",
+ "var_value": "7",
+ "script": "RustboroCity_EventScript_1E0FB3"
+ }
+ ],
+ "bg_events": [
+ {
+ "type": "sign",
+ "x": 23,
+ "y": 19,
+ "elevation": 0,
+ "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+ "script": "RustboroCity_EventScript_1E08F5"
+ },
+ {
+ "type": "sign",
+ "x": 25,
+ "y": 35,
+ "elevation": 0,
+ "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+ "script": "RustboroCity_EventScript_1E0910"
+ },
+ {
+ "type": "sign",
+ "x": 17,
+ "y": 45,
+ "elevation": 0,
+ "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+ "script": "Common_EventScript_ShowPokemartSign"
+ },
+ {
+ "type": "sign",
+ "x": 18,
+ "y": 38,
+ "elevation": 0,
+ "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+ "script": "Common_EventScript_ShowPokemonCenterSign"
+ },
+ {
+ "type": "sign",
+ "x": 19,
+ "y": 49,
+ "elevation": 0,
+ "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+ "script": "RustboroCity_EventScript_1E0907"
+ },
+ {
+ "type": "sign",
+ "x": 18,
+ "y": 45,
+ "elevation": 0,
+ "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+ "script": "Common_EventScript_ShowPokemartSign"
+ },
+ {
+ "type": "sign",
+ "x": 17,
+ "y": 38,
+ "elevation": 0,
+ "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+ "script": "Common_EventScript_ShowPokemonCenterSign"
+ },
+ {
+ "type": "sign",
+ "x": 17,
+ "y": 20,
+ "elevation": 0,
+ "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+ "script": "RustboroCity_EventScript_1E08EC"
+ },
+ {
+ "type": "sign",
+ "x": 30,
+ "y": 8,
+ "elevation": 0,
+ "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+ "script": "RustboroCity_EventScript_1E08E3"
+ },
+ {
+ "type": "sign",
+ "x": 12,
+ "y": 38,
+ "elevation": 3,
+ "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+ "script": "RustboroCity_EventScript_1E0919"
+ }
+ ]
+} \ No newline at end of file
diff --git a/data/maps/RustboroCity/scripts.inc b/data/maps/RustboroCity/scripts.inc
index 8ffbf8373..1ba63c959 100644
--- a/data/maps/RustboroCity/scripts.inc
+++ b/data/maps/RustboroCity/scripts.inc
@@ -1,15 +1,15 @@
RustboroCity_MapScripts:: @ 81E06BD
- map_script 3, RustboroCity_MapScript1_1E06C8
- map_script 2, RustboroCity_MapScript2_1E070B
+ map_script MAP_SCRIPT_ON_TRANSITION, RustboroCity_MapScript1_1E06C8
+ map_script MAP_SCRIPT_ON_FRAME_TABLE, RustboroCity_MapScript2_1E070B
.byte 0
RustboroCity_MapScript1_1E06C8: @ 81E06C8
setflag FLAG_VISITED_RUSTBORO_CITY
- call RustboroCity_EventScript_271ED7
- compare VAR_0x405A, 6
+ call Common_EventScript_SetupRivalGender
+ compare VAR_RUSTBORO_STATE, 6
call_if_eq RustboroCity_EventScript_1E0707
getplayerxy VAR_TEMP_0, VAR_TEMP_1
- compare VAR_0x405A, 6
+ compare VAR_RUSTBORO_STATE, 6
goto_if_eq RustboroCity_EventScript_1E06EC
end
@@ -24,11 +24,11 @@ RustboroCity_EventScript_1E06FF:: @ 81E06FF
end
RustboroCity_EventScript_1E0707:: @ 81E0707
- setflag FLAG_SPECIAL_FLAG_0x4000
+ setflag FLAG_HIDE_MAP_NAME_POPUP
return
RustboroCity_MapScript2_1E070B: @ 81E070B
- map_script_2 VAR_0x405A, 6, RustboroCity_EventScript_1E0715
+ map_script_2 VAR_RUSTBORO_STATE, 6, RustboroCity_EventScript_1E0715
.2byte 0
RustboroCity_EventScript_1E0715:: @ 81E0715
@@ -42,18 +42,18 @@ RustboroCity_EventScript_1E0715:: @ 81E0715
applymovement 15, RustboroCity_Movement_1E0852
waitmovement 0
playse SE_PIN
- applymovement 15, RustboroCity_Movement_272598
+ applymovement 15, Common_Movement_ExclamationMark
waitmovement 0
- applymovement 15, RustboroCity_Movement_27259A
+ applymovement 15, Common_Movement_Delay48
waitmovement 0
- applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725A6
+ applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp
waitmovement 0
applymovement 15, RustboroCity_Movement_1E084E
waitmovement 0
msgbox RustboroCity_Text_1E22A5, MSGBOX_DEFAULT
closemessage
setflag FLAG_HAS_MATCH_CALL
- applymovement 15, RustboroCity_Movement_2725A4
+ applymovement 15, Common_Movement_WalkInPlaceLeft
waitmovement 0
playse SE_TK_KASYA
delay 10
@@ -63,7 +63,7 @@ RustboroCity_EventScript_1E0715:: @ 81E0715
delay 10
playse SE_TK_KASYA
delay 20
- applymovement 15, RustboroCity_Movement_2725AA
+ applymovement 15, Common_Movement_WalkInPlaceDown
waitmovement 0
msgbox RustboroCity_Text_1E2331, MSGBOX_DEFAULT
closemessage
@@ -99,8 +99,8 @@ RustboroCity_EventScript_1E07BD:: @ 81E07BD
playse SE_KAIDAN
removeobject 15
setflag FLAG_HIDE_RUSTBORO_CITY_SCIENTIST
- setvar VAR_0x405A, 7
- clearflag FLAG_SPECIAL_FLAG_0x4000
+ setvar VAR_RUSTBORO_STATE, 7
+ clearflag FLAG_HIDE_MAP_NAME_POPUP
releaseall
end
@@ -221,7 +221,7 @@ RustboroCity_EventScript_1E0922:: @ 81E0922
lock
faceplayer
msgbox RustboroCity_Text_1E16F4, MSGBOX_DEFAULT
- applymovement 7, RustboroCity_Movement_2725A2
+ applymovement 7, Common_Movement_FaceOriginalDirection
waitmovement 0
release
end
@@ -230,7 +230,7 @@ RustboroCity_EventScript_1E0938:: @ 81E0938
lock
faceplayer
msgbox RustboroCity_Text_1E174B, MSGBOX_DEFAULT
- applymovement 8, RustboroCity_Movement_2725A2
+ applymovement 8, Common_Movement_FaceOriginalDirection
waitmovement 0
release
end
@@ -302,9 +302,9 @@ RustboroCity_EventScript_1E09CD:: @ 81E09CD
setobjectxyperm 9, 30, 10
clearflag FLAG_HIDE_RUSTBORO_CITY_DEVON_EMPLOYEE_1
setflag FLAG_DEVON_GOODS_STOLEN
- setvar VAR_0x405A, 2
+ setvar VAR_RUSTBORO_STATE, 2
setvar VAR_RUSTURF_TUNNEL_STATE, 2
- setvar VAR_0x406F, 1
+ setvar VAR_ROUTE116_STATE, 1
clearflag FLAG_HIDE_ROUTE_116_MR_BRINEY
clearflag FLAG_HIDE_RUSTURF_TUNNEL_PEEKO
clearflag FLAG_HIDE_RUSTURF_TUNNEL_AQUA_GRUNT
@@ -344,7 +344,7 @@ RustboroCity_EventScript_1E0A6E:: @ 81E0A6E
RustboroCity_EventScript_1E0A79:: @ 81E0A79
applymovement 9, RustboroCity_Movement_1E0AD5
waitmovement 0
- applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725A6
+ applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp
waitmovement 0
return
@@ -493,59 +493,59 @@ RustboroCity_EventScript_1E0B2E:: @ 81E0B2E
compare VAR_TEMP_1, 3
call_if_eq RustboroCity_EventScript_1E0BF3
setflag FLAG_INTERACTED_WITH_DEVON_EMPLOYEE_GOODS_STOLEN
- setvar VAR_0x405A, 3
+ setvar VAR_RUSTBORO_STATE, 3
moveobjectoffscreen 9
msgbox RustboroCity_Text_1E183E, MSGBOX_DEFAULT
releaseall
end
RustboroCity_EventScript_1E0B6F:: @ 81E0B6F
- applymovement 9, RustboroCity_Movement_2725A6
+ applymovement 9, Common_Movement_WalkInPlaceUp
waitmovement 0
playse SE_PIN
- applymovement 9, RustboroCity_Movement_272598
+ applymovement 9, Common_Movement_ExclamationMark
waitmovement 0
- applymovement 9, RustboroCity_Movement_27259A
+ applymovement 9, Common_Movement_Delay48
waitmovement 0
- applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725AA
+ applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown
waitmovement 0
return
RustboroCity_EventScript_1E0B9B:: @ 81E0B9B
- applymovement 9, RustboroCity_Movement_2725A4
+ applymovement 9, Common_Movement_WalkInPlaceLeft
waitmovement 0
playse SE_PIN
- applymovement 9, RustboroCity_Movement_272598
+ applymovement 9, Common_Movement_ExclamationMark
waitmovement 0
- applymovement 9, RustboroCity_Movement_27259A
+ applymovement 9, Common_Movement_Delay48
waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725AC
waitmovement 0
return
RustboroCity_EventScript_1E0BC7:: @ 81E0BC7
- applymovement 9, RustboroCity_Movement_2725AA
+ applymovement 9, Common_Movement_WalkInPlaceDown
waitmovement 0
playse SE_PIN
- applymovement 9, RustboroCity_Movement_272598
+ applymovement 9, Common_Movement_ExclamationMark
waitmovement 0
- applymovement 9, RustboroCity_Movement_27259A
+ applymovement 9, Common_Movement_Delay48
waitmovement 0
- applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725A6
+ applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp
waitmovement 0
return
RustboroCity_EventScript_1E0BF3:: @ 81E0BF3
- applymovement 9, RustboroCity_Movement_2725AA
+ applymovement 9, Common_Movement_WalkInPlaceDown
waitmovement 0
playse SE_PIN
- applymovement 9, RustboroCity_Movement_272598
+ applymovement 9, Common_Movement_ExclamationMark
waitmovement 0
- applymovement 9, RustboroCity_Movement_27259A
+ applymovement 9, Common_Movement_Delay48
waitmovement 0
applymovement 9, RustboroCity_Movement_1E0C29
waitmovement 0
- applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725A6
+ applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp
waitmovement 0
return
@@ -596,7 +596,7 @@ RustboroCity_EventScript_1E0C5B:: @ 81E0C5B
closemessage
setflag FLAG_RETURNED_DEVON_GOODS
setflag FLAG_HIDE_RUSTBORO_CITY_DEVON_EMPLOYEE_1
- setvar VAR_0x405A, 5
+ setvar VAR_RUSTBORO_STATE, 5
delay 30
warp MAP_RUSTBORO_CITY_DEVON_CORP_3F, 255, 2, 2
waitstate
@@ -608,69 +608,69 @@ RustboroCity_EventScript_1E0CD3:: @ 81E0CD3
return
RustboroCity_EventScript_1E0CDC:: @ 81E0CDC
- applymovement 9, RustboroCity_Movement_2725A6
+ applymovement 9, Common_Movement_WalkInPlaceUp
waitmovement 0
playse SE_PIN
- applymovement 9, RustboroCity_Movement_272598
+ applymovement 9, Common_Movement_ExclamationMark
waitmovement 0
- applymovement 9, RustboroCity_Movement_27259A
+ applymovement 9, Common_Movement_Delay48
waitmovement 0
- applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725AA
+ applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown
waitmovement 0
return
RustboroCity_EventScript_1E0D08:: @ 81E0D08
- applymovement 9, RustboroCity_Movement_2725A8
+ applymovement 9, Common_Movement_WalkInPlaceRight
waitmovement 0
playse SE_PIN
- applymovement 9, RustboroCity_Movement_272598
+ applymovement 9, Common_Movement_ExclamationMark
waitmovement 0
- applymovement 9, RustboroCity_Movement_27259A
+ applymovement 9, Common_Movement_Delay48
waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725AE
waitmovement 0
return
RustboroCity_EventScript_1E0D34:: @ 81E0D34
- applymovement 9, RustboroCity_Movement_2725AA
+ applymovement 9, Common_Movement_WalkInPlaceDown
waitmovement 0
playse SE_PIN
- applymovement 9, RustboroCity_Movement_272598
+ applymovement 9, Common_Movement_ExclamationMark
waitmovement 0
- applymovement 9, RustboroCity_Movement_27259A
+ applymovement 9, Common_Movement_Delay48
waitmovement 0
- applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725A6
+ applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp
waitmovement 0
return
RustboroCity_EventScript_1E0D60:: @ 81E0D60
- applymovement 9, RustboroCity_Movement_2725AA
+ applymovement 9, Common_Movement_WalkInPlaceDown
waitmovement 0
playse SE_PIN
- applymovement 9, RustboroCity_Movement_272598
+ applymovement 9, Common_Movement_ExclamationMark
waitmovement 0
- applymovement 9, RustboroCity_Movement_27259A
+ applymovement 9, Common_Movement_Delay48
waitmovement 0
applymovement 9, RustboroCity_Movement_1E0C29
waitmovement 0
- applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725A6
+ applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp
waitmovement 0
return
RustboroCity_EventScript_1E0D96:: @ 81E0D96
- applymovement 9, RustboroCity_Movement_2725A4
+ applymovement 9, Common_Movement_WalkInPlaceLeft
waitmovement 0
playse SE_PIN
- applymovement 9, RustboroCity_Movement_272598
+ applymovement 9, Common_Movement_ExclamationMark
waitmovement 0
- applymovement 9, RustboroCity_Movement_27259A
+ applymovement 9, Common_Movement_Delay48
waitmovement 0
return
RustboroCity_EventScript_1E0DB8:: @ 81E0DB8
lockall
call_if_unset FLAG_MET_RIVAL_RUSTBORO, RustboroCity_EventScript_1E0DD1
- applymovement 14, RustboroCity_Movement_27259E
+ applymovement 14, Common_Movement_FacePlayer
waitmovement 0
goto RustboroCity_EventScript_1E0FF3
@@ -694,128 +694,128 @@ RustboroCity_EventScript_1E0DEE:: @ 81E0DEE
RustboroCity_EventScript_1E0DF3:: @ 81E0DF3
lockall
call RustboroCity_EventScript_1E0DD1
- applymovement 14, RustboroCity_Movement_2725AA
+ applymovement 14, Common_Movement_WalkInPlaceDown
waitmovement 0
playse SE_PIN
- applymovement 14, RustboroCity_Movement_272598
+ applymovement 14, Common_Movement_ExclamationMark
waitmovement 0
- applymovement 14, RustboroCity_Movement_27259A
+ applymovement 14, Common_Movement_Delay48
waitmovement 0
applymovement 14, RustboroCity_Movement_1E120E
waitmovement 0
- applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725A6
+ applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp
waitmovement 0
goto RustboroCity_EventScript_1E0FF3
RustboroCity_EventScript_1E0E33:: @ 81E0E33
lockall
call RustboroCity_EventScript_1E0DD1
- applymovement 14, RustboroCity_Movement_2725AA
+ applymovement 14, Common_Movement_WalkInPlaceDown
waitmovement 0
playse SE_PIN
- applymovement 14, RustboroCity_Movement_272598
+ applymovement 14, Common_Movement_ExclamationMark
waitmovement 0
- applymovement 14, RustboroCity_Movement_27259A
+ applymovement 14, Common_Movement_Delay48
waitmovement 0
applymovement 14, RustboroCity_Movement_1E1215
waitmovement 0
- applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725A6
+ applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp
waitmovement 0
goto RustboroCity_EventScript_1E0FF3
RustboroCity_EventScript_1E0E73:: @ 81E0E73
lockall
call RustboroCity_EventScript_1E0DD1
- applymovement 14, RustboroCity_Movement_2725AA
+ applymovement 14, Common_Movement_WalkInPlaceDown
waitmovement 0
playse SE_PIN
- applymovement 14, RustboroCity_Movement_272598
+ applymovement 14, Common_Movement_ExclamationMark
waitmovement 0
- applymovement 14, RustboroCity_Movement_27259A
+ applymovement 14, Common_Movement_Delay48
waitmovement 0
applymovement 14, RustboroCity_Movement_1E121B
waitmovement 0
- applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725A6
+ applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp
waitmovement 0
goto RustboroCity_EventScript_1E0FF3
RustboroCity_EventScript_1E0EB3:: @ 81E0EB3
lockall
call RustboroCity_EventScript_1E0DD1
- applymovement 14, RustboroCity_Movement_2725AA
+ applymovement 14, Common_Movement_WalkInPlaceDown
waitmovement 0
playse SE_PIN
- applymovement 14, RustboroCity_Movement_272598
+ applymovement 14, Common_Movement_ExclamationMark
waitmovement 0
- applymovement 14, RustboroCity_Movement_27259A
+ applymovement 14, Common_Movement_Delay48
waitmovement 0
applymovement 14, RustboroCity_Movement_1E1220
waitmovement 0
- applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725A6
+ applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp
waitmovement 0
goto RustboroCity_EventScript_1E0FF3
RustboroCity_EventScript_1E0EF3:: @ 81E0EF3
lockall
call RustboroCity_EventScript_1E0DD1
- applymovement 14, RustboroCity_Movement_2725AA
+ applymovement 14, Common_Movement_WalkInPlaceDown
waitmovement 0
playse SE_PIN
- applymovement 14, RustboroCity_Movement_272598
+ applymovement 14, Common_Movement_ExclamationMark
waitmovement 0
- applymovement 14, RustboroCity_Movement_27259A
+ applymovement 14, Common_Movement_Delay48
waitmovement 0
applymovement 14, RustboroCity_Movement_1E1224
waitmovement 0
- applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725A6
+ applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp
waitmovement 0
goto RustboroCity_EventScript_1E0FF3
RustboroCity_EventScript_1E0F33:: @ 81E0F33
lockall
call RustboroCity_EventScript_1E0DD1
- applymovement 14, RustboroCity_Movement_2725AA
+ applymovement 14, Common_Movement_WalkInPlaceDown
waitmovement 0
playse SE_PIN
- applymovement 14, RustboroCity_Movement_272598
+ applymovement 14, Common_Movement_ExclamationMark
waitmovement 0
- applymovement 14, RustboroCity_Movement_27259A
+ applymovement 14, Common_Movement_Delay48
waitmovement 0
applymovement 14, RustboroCity_Movement_1E1227
waitmovement 0
- applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725A6
+ applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp
waitmovement 0
goto RustboroCity_EventScript_1E0FF3
RustboroCity_EventScript_1E0F73:: @ 81E0F73
lockall
call RustboroCity_EventScript_1E0DD1
- applymovement 14, RustboroCity_Movement_2725AA
+ applymovement 14, Common_Movement_WalkInPlaceDown
waitmovement 0
playse SE_PIN
- applymovement 14, RustboroCity_Movement_272598
+ applymovement 14, Common_Movement_ExclamationMark
waitmovement 0
- applymovement 14, RustboroCity_Movement_27259A
+ applymovement 14, Common_Movement_Delay48
waitmovement 0
applymovement 14, RustboroCity_Movement_1E122B
waitmovement 0
- applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725A6
+ applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp
waitmovement 0
goto RustboroCity_EventScript_1E0FF3
RustboroCity_EventScript_1E0FB3:: @ 81E0FB3
lockall
call RustboroCity_EventScript_1E0DD1
- applymovement 14, RustboroCity_Movement_2725AA
+ applymovement 14, Common_Movement_WalkInPlaceDown
waitmovement 0
playse SE_PIN
- applymovement 14, RustboroCity_Movement_272598
+ applymovement 14, Common_Movement_ExclamationMark
waitmovement 0
- applymovement 14, RustboroCity_Movement_27259A
+ applymovement 14, Common_Movement_Delay48
waitmovement 0
applymovement 14, RustboroCity_Movement_1E1230
waitmovement 0
- applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725A6
+ applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp
waitmovement 0
goto RustboroCity_EventScript_1E0FF3
@@ -840,7 +840,7 @@ RustboroCity_EventScript_1E100B:: @ 81E100B
closemessage
delay 30
setflag FLAG_ENABLE_RIVAL_MATCH_CALL
- setvar VAR_0x405A, 8
+ setvar VAR_RUSTBORO_STATE, 8
setvar VAR_0x4063, 2
setvar VAR_0x8008, 0
msgbox RustboroCity_Text_1E1AFA, MSGBOX_YESNO
@@ -911,7 +911,7 @@ RustboroCity_EventScript_1E1114:: @ 81E1114
closemessage
delay 30
setflag FLAG_ENABLE_RIVAL_MATCH_CALL
- setvar VAR_0x405A, 8
+ setvar VAR_RUSTBORO_STATE, 8
setvar VAR_0x4063, 2
msgbox RustboroCity_Text_1E1E34, MSGBOX_YESNO
compare VAR_RESULT, 1
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-09 05:41:39 +0000