summaryrefslogtreecommitdiff
path: root/data/maps/SilphCo_8F
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/SilphCo_8F')
-rw-r--r--data/maps/SilphCo_8F/map.json51
-rw-r--r--data/maps/SilphCo_8F/scripts.inc32
-rw-r--r--data/maps/SilphCo_8F/text.inc31
3 files changed, 64 insertions, 50 deletions
diff --git a/data/maps/SilphCo_8F/map.json b/data/maps/SilphCo_8F/map.json
index ef04548df..da5fb3f35 100644
--- a/data/maps/SilphCo_8F/map.json
+++ b/data/maps/SilphCo_8F/map.json
@@ -6,15 +6,17 @@
"region_map_section": "MAPSEC_SILPH_CO",
"requires_flash": false,
"weather": "WEATHER_NONE",
- "map_type": "MAP_TYPE_8",
- "unknown_18": 0,
- "unknown_19": 7,
- "elevator_flag": 8,
- "battle_scene": "BATTLE_SCENE_0",
+ "map_type": "MAP_TYPE_INDOOR",
+ "allow_cycling": false,
+ "allow_escaping": true,
+ "allow_running": true,
+ "show_map_name": true,
+ "floor_number": 8,
+ "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
"connections": null,
"object_events": [
{
- "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
+ "graphics_id": "OBJ_EVENT_GFX_ROCKET_M",
"x": 28,
"y": 5,
"elevation": 3,
@@ -23,11 +25,11 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 4,
- "script": "SilphCo_8F_EventScript_161CB0",
+ "script": "SilphCo_8F_EventScript_Grunt1",
"flag": "FLAG_HIDE_SILPH_ROCKETS"
},
{
- "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
+ "graphics_id": "OBJ_EVENT_GFX_ROCKET_M",
"x": 10,
"y": 17,
"elevation": 3,
@@ -36,11 +38,11 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 5,
- "script": "SilphCo_8F_EventScript_161CC7",
+ "script": "SilphCo_8F_EventScript_Grunt2",
"flag": "FLAG_HIDE_SILPH_ROCKETS"
},
{
- "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST",
+ "graphics_id": "OBJ_EVENT_GFX_SCIENTIST",
"x": 9,
"y": 4,
"elevation": 3,
@@ -49,11 +51,11 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 2,
- "script": "SilphCo_8F_EventScript_161C99",
+ "script": "SilphCo_8F_EventScript_Parker",
"flag": "FLAG_HIDE_SILPH_ROCKETS"
},
{
- "graphics_id": "OBJECT_EVENT_GFX_WORKER_M",
+ "graphics_id": "OBJ_EVENT_GFX_WORKER_M",
"x": 2,
"y": 5,
"elevation": 3,
@@ -62,11 +64,11 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "SilphCo_8F_EventScript_161C6F",
+ "script": "SilphCo_8F_EventScript_WorkerM",
"flag": "0"
},
{
- "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+ "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
"x": 24,
"y": 8,
"elevation": 3,
@@ -79,7 +81,7 @@
"flag": "FLAG_HIDE_SILPH_CO_8F_IRON"
},
{
- "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST",
+ "graphics_id": "OBJ_EVENT_GFX_SCIENTIST",
"x": 29,
"y": 9,
"elevation": 3,
@@ -88,7 +90,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "SilphCo_8F_EventScript_1AD0ED",
+ "script": "SilphCo_8F_EventScript_Scientist",
"flag": "0"
}
],
@@ -146,31 +148,35 @@
"coord_events": [],
"bg_events": [
{
- "type": "bg_event_type_0",
+ "type": "sign",
"x": 6,
"y": 10,
"elevation": 0,
+ "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "SilphCo_8F_EventScript_Door"
},
{
- "type": "bg_event_type_0",
+ "type": "sign",
"x": 6,
"y": 11,
"elevation": 0,
+ "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "SilphCo_8F_EventScript_Door"
},
{
- "type": "bg_event_type_0",
+ "type": "sign",
"x": 5,
"y": 11,
"elevation": 0,
+ "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "SilphCo_8F_EventScript_Door"
},
{
- "type": "bg_event_type_0",
+ "type": "sign",
"x": 5,
"y": 10,
"elevation": 0,
+ "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "SilphCo_8F_EventScript_Door"
},
{
@@ -184,11 +190,12 @@
"underfoot": false
},
{
- "type": "bg_event_type_0",
+ "type": "sign",
"x": 27,
"y": 1,
"elevation": 0,
- "script": "SilphCo_8F_EventScript_161C90"
+ "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+ "script": "SilphCo_8F_EventScript_FloorSign"
}
]
}
diff --git a/data/maps/SilphCo_8F/scripts.inc b/data/maps/SilphCo_8F/scripts.inc
index f96188c3f..d888f339e 100644
--- a/data/maps/SilphCo_8F/scripts.inc
+++ b/data/maps/SilphCo_8F/scripts.inc
@@ -6,35 +6,35 @@ SilphCo_8F_OnLoad:: @ 8161C65
call_if_unset FLAG_SILPH_8F_DOOR, EventScript_Close8FDoor
end
-SilphCo_8F_EventScript_161C6F:: @ 8161C6F
+SilphCo_8F_EventScript_WorkerM:: @ 8161C6F
lock
faceplayer
compare VAR_MAP_SCENE_SILPH_CO_11F, 1
- goto_if_ge EventScript_161C86
- msgbox gUnknown_817696D
+ goto_if_ge SilphCo_8F_EventScript_WorkerMRocketsGone
+ msgbox SilphCo_8F_Text_WonderIfSilphIsFinished
release
end
-EventScript_161C86:: @ 8161C86
- msgbox gUnknown_817698C
+SilphCo_8F_EventScript_WorkerMRocketsGone:: @ 8161C86
+ msgbox SilphCo_8F_Text_ThanksForSavingUs
release
end
-SilphCo_8F_EventScript_161C90:: @ 8161C90
- msgbox gUnknown_8176AB2, MSGBOX_SIGN
+SilphCo_8F_EventScript_FloorSign:: @ 8161C90
+ msgbox SilphCo_8F_Text_FloorSign, MSGBOX_SIGN
end
-SilphCo_8F_EventScript_161C99:: @ 8161C99
- trainerbattle_single TRAINER_SCIENTIST_PARKER, Text_1769FD, Text_176A19
- msgbox gUnknown_8176A26, MSGBOX_AUTOCLOSE
+SilphCo_8F_EventScript_Parker:: @ 8161C99
+ trainerbattle_single TRAINER_SCIENTIST_PARKER, SilphCo_8F_Text_ParkerIntro, SilphCo_8F_Text_ParkerDefeat
+ msgbox SilphCo_8F_Text_ParkerPostBattle, MSGBOX_AUTOCLOSE
end
-SilphCo_8F_EventScript_161CB0:: @ 8161CB0
- trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_32, Text_1769A2, Text_1769BE
- msgbox gUnknown_81769CF, MSGBOX_AUTOCLOSE
+SilphCo_8F_EventScript_Grunt1:: @ 8161CB0
+ trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_32, SilphCo_8F_Text_Grunt1Intro, SilphCo_8F_Text_Grunt1Defeat
+ msgbox SilphCo_8F_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE
end
-SilphCo_8F_EventScript_161CC7:: @ 8161CC7
- trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_36, Text_176A56, Text_176A7C
- msgbox gUnknown_8176A90, MSGBOX_AUTOCLOSE
+SilphCo_8F_EventScript_Grunt2:: @ 8161CC7
+ trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_36, SilphCo_8F_Text_Grunt2Intro, SilphCo_8F_Text_Grunt2Defeat
+ msgbox SilphCo_8F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE
end
diff --git a/data/maps/SilphCo_8F/text.inc b/data/maps/SilphCo_8F/text.inc
index 858d5da17..9144cda4e 100644
--- a/data/maps/SilphCo_8F/text.inc
+++ b/data/maps/SilphCo_8F/text.inc
@@ -1,42 +1,49 @@
-gUnknown_817696D:: @ 817696D
+SilphCo_8F_Text_WonderIfSilphIsFinished:: @ 817696D
.string "I wonder if SILPH is finished…$"
-gUnknown_817698C:: @ 817698C
+SilphCo_8F_Text_ThanksForSavingUs:: @ 817698C
.string "Thanks for saving us!$"
-Text_1769A2:: @ 81769A2
+SilphCo_8F_Text_Grunt1Intro:: @ 81769A2
.string "That's as far as you'll go!$"
-Text_1769BE:: @ 81769BE
+SilphCo_8F_Text_Grunt1Defeat:: @ 81769BE
.string "Not enough grit!$"
-gUnknown_81769CF:: @ 81769CF
+SilphCo_8F_Text_Grunt1PostBattle:: @ 81769CF
.string "If you don't turn back…\n"
.string "I'll call for backup!$"
-Text_1769FD:: @ 81769FD
+SilphCo_8F_Text_ParkerIntro:: @ 81769FD
.string "You're causing us problems!$"
-Text_176A19:: @ 8176A19
+SilphCo_8F_Text_ParkerDefeat:: @ 8176A19
.string "Huh?\n"
.string "I lost?$"
-gUnknown_8176A26:: @ 8176A26
+SilphCo_8F_Text_ParkerPostBattle:: @ 8176A26
.string "So, what do you think of SILPH\n"
.string "BUILDING's maze?$"
-Text_176A56:: @ 8176A56
+SilphCo_8F_Text_Grunt2Intro:: @ 8176A56
.string "I am one of the four ROCKET\n"
.string "BROTHERS!$"
-Text_176A7C:: @ 8176A7C
+SilphCo_8F_Text_Grunt2Defeat:: @ 8176A7C
.string "Whoo!\n"
.string "Oh, Brothers!$"
-gUnknown_8176A90:: @ 8176A90
+SilphCo_8F_Text_Grunt2PostBattle:: @ 8176A90
.string "I'll leave you up to my brothers.$"
-gUnknown_8176AB2:: @ 8176AB2
+SilphCo_8F_Text_FloorSign:: @ 8176AB2
.string "SILPH CO. HEAD OFFICE\n"
.string "8F$"
+SilphCo_8F_Text_ToRocketBossMonsAreTools:: @ 8176ACB
+ .string "TEAM ROCKET's BOSS is terribly\n"
+ .string "cruel!\p"
+ .string "To him, POKéMON are just tools to\n"
+ .string "be used.\p"
+ .string "What will happen if that tyrant\n"
+ .string "takes over our company…$"
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-07 21:27:33 +0000