summaryrefslogtreecommitdiff
path: root/data/maps/SilphCo_9F
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/SilphCo_9F')
-rw-r--r--data/maps/SilphCo_9F/map.json81
-rw-r--r--data/maps/SilphCo_9F/scripts.inc34
-rw-r--r--data/maps/SilphCo_9F/text.inc34
3 files changed, 80 insertions, 69 deletions
diff --git a/data/maps/SilphCo_9F/map.json b/data/maps/SilphCo_9F/map.json
index e8f39eba5..d242f5d78 100644
--- a/data/maps/SilphCo_9F/map.json
+++ b/data/maps/SilphCo_9F/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": 9,
- "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": 9,
+ "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
"connections": null,
"object_events": [
{
- "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST",
+ "graphics_id": "OBJ_EVENT_GFX_SCIENTIST",
"x": 26,
"y": 16,
"elevation": 3,
@@ -23,11 +25,11 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 2,
- "script": "SilphCo_9F_EventScript_161D41",
+ "script": "SilphCo_9F_EventScript_Ed",
"flag": "FLAG_HIDE_SILPH_ROCKETS"
},
{
- "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
+ "graphics_id": "OBJ_EVENT_GFX_ROCKET_M",
"x": 15,
"y": 18,
"elevation": 3,
@@ -36,11 +38,11 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 3,
- "script": "SilphCo_9F_EventScript_161D6F",
+ "script": "SilphCo_9F_EventScript_Grunt2",
"flag": "FLAG_HIDE_SILPH_ROCKETS"
},
{
- "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2",
+ "graphics_id": "OBJ_EVENT_GFX_WOMAN_2",
"x": 2,
"y": 16,
"elevation": 0,
@@ -49,11 +51,11 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "SilphCo_9F_EventScript_161D09",
+ "script": "SilphCo_9F_EventScript_HealWoman",
"flag": "0"
},
{
- "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
+ "graphics_id": "OBJ_EVENT_GFX_ROCKET_M",
"x": 1,
"y": 6,
"elevation": 3,
@@ -62,7 +64,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 5,
- "script": "SilphCo_9F_EventScript_161D58",
+ "script": "SilphCo_9F_EventScript_Grunt1",
"flag": "FLAG_HIDE_SILPH_ROCKETS"
}
],
@@ -116,115 +118,131 @@
"underfoot": false
},
{
- "type": "bg_event_type_0",
+ "type": "sign",
"x": 3,
"y": 10,
"elevation": 0,
+ "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "SilphCo_9F_EventScript_Door1"
},
{
- "type": "bg_event_type_0",
+ "type": "sign",
"x": 3,
"y": 11,
"elevation": 0,
+ "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "SilphCo_9F_EventScript_Door1"
},
{
- "type": "bg_event_type_0",
+ "type": "sign",
"x": 13,
"y": 16,
"elevation": 0,
+ "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "SilphCo_9F_EventScript_Door2"
},
{
- "type": "bg_event_type_0",
+ "type": "sign",
"x": 13,
"y": 17,
"elevation": 0,
+ "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "SilphCo_9F_EventScript_Door2"
},
{
- "type": "bg_event_type_0",
+ "type": "sign",
"x": 21,
"y": 6,
"elevation": 0,
+ "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "SilphCo_9F_EventScript_Door3"
},
{
- "type": "bg_event_type_0",
+ "type": "sign",
"x": 22,
"y": 6,
"elevation": 0,
+ "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "SilphCo_9F_EventScript_Door3"
},
{
- "type": "bg_event_type_0",
+ "type": "sign",
"x": 22,
"y": 7,
"elevation": 0,
+ "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "SilphCo_9F_EventScript_Door3"
},
{
- "type": "bg_event_type_0",
+ "type": "sign",
"x": 21,
"y": 7,
"elevation": 0,
+ "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "SilphCo_9F_EventScript_Door3"
},
{
- "type": "bg_event_type_0",
+ "type": "sign",
"x": 21,
"y": 13,
"elevation": 0,
+ "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "SilphCo_9F_EventScript_Door4"
},
{
- "type": "bg_event_type_0",
+ "type": "sign",
"x": 21,
"y": 12,
"elevation": 0,
+ "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "SilphCo_9F_EventScript_Door4"
},
{
- "type": "bg_event_type_0",
+ "type": "sign",
"x": 22,
"y": 12,
"elevation": 0,
+ "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "SilphCo_9F_EventScript_Door4"
},
{
- "type": "bg_event_type_0",
+ "type": "sign",
"x": 22,
"y": 13,
"elevation": 0,
+ "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "SilphCo_9F_EventScript_Door4"
},
{
- "type": "bg_event_type_0",
+ "type": "sign",
"x": 2,
"y": 11,
"elevation": 0,
+ "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "SilphCo_9F_EventScript_Door1"
},
{
- "type": "bg_event_type_0",
+ "type": "sign",
"x": 2,
"y": 10,
"elevation": 0,
+ "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "SilphCo_9F_EventScript_Door1"
},
{
- "type": "bg_event_type_0",
+ "type": "sign",
"x": 12,
"y": 16,
"elevation": 0,
+ "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "SilphCo_9F_EventScript_Door2"
},
{
- "type": "bg_event_type_0",
+ "type": "sign",
"x": 12,
"y": 17,
"elevation": 0,
+ "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "SilphCo_9F_EventScript_Door2"
},
{
@@ -238,11 +256,12 @@
"underfoot": false
},
{
- "type": "bg_event_type_0",
+ "type": "sign",
"x": 17,
"y": 1,
"elevation": 0,
- "script": "SilphCo_9F_EventScript_161D38"
+ "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+ "script": "SilphCo_9F_EventScript_FloorSign"
}
]
}
diff --git a/data/maps/SilphCo_9F/scripts.inc b/data/maps/SilphCo_9F/scripts.inc
index 7f4258b5d..5cdfc2c82 100644
--- a/data/maps/SilphCo_9F/scripts.inc
+++ b/data/maps/SilphCo_9F/scripts.inc
@@ -9,38 +9,38 @@ SilphCo_9F_OnLoad:: @ 8161CE4
call_if_unset FLAG_SILPH_9F_DOOR_4, EventScript_Close9FDoor4
end
-SilphCo_9F_EventScript_161D09:: @ 8161D09
+SilphCo_9F_EventScript_HealWoman:: @ 8161D09
lock
faceplayer
compare VAR_MAP_SCENE_SILPH_CO_11F, 1
- goto_if_ge EventScript_161D2E
- msgbox gUnknown_8176B54
+ goto_if_ge SilphCo_9F_EventScript_HealWomanRocketsGone
+ msgbox SilphCo_9F_Text_YouShouldTakeQuickNap
closemessage
call EventScript_OutOfCenterPartyHeal
- msgbox gUnknown_8176B81
+ msgbox SilphCo_9F_Text_DontGiveUp
release
end
-EventScript_161D2E:: @ 8161D2E
- msgbox gUnknown_8176B90
+SilphCo_9F_EventScript_HealWomanRocketsGone:: @ 8161D2E
+ msgbox SilphCo_9F_Text_ThankYouSoMuch
release
end
-SilphCo_9F_EventScript_161D38:: @ 8161D38
- msgbox gUnknown_8176CD4, MSGBOX_SIGN
+SilphCo_9F_EventScript_FloorSign:: @ 8161D38
+ msgbox SilphCo_9F_Text_FloorSign, MSGBOX_SIGN
end
-SilphCo_9F_EventScript_161D41:: @ 8161D41
- trainerbattle_single TRAINER_SCIENTIST_ED, Text_176BFB, Text_176C2B
- msgbox gUnknown_8176C3C, MSGBOX_AUTOCLOSE
+SilphCo_9F_EventScript_Ed:: @ 8161D41
+ trainerbattle_single TRAINER_SCIENTIST_ED, SilphCo_9F_Text_EdIntro, SilphCo_9F_Text_EdDefeat
+ msgbox SilphCo_9F_Text_EdPostBattle, MSGBOX_AUTOCLOSE
end
-SilphCo_9F_EventScript_161D58:: @ 8161D58
- trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_37, Text_176BA3, Text_176BC8
- msgbox gUnknown_8176BD0, MSGBOX_AUTOCLOSE
+SilphCo_9F_EventScript_Grunt1:: @ 8161D58
+ trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_37, SilphCo_9F_Text_Grunt1Intro, SilphCo_9F_Text_Grunt1Defeat
+ msgbox SilphCo_9F_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE
end
-SilphCo_9F_EventScript_161D6F:: @ 8161D6F
- trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_38, Text_176C7A, Text_176CA0
- msgbox gUnknown_8176CB8, MSGBOX_AUTOCLOSE
+SilphCo_9F_EventScript_Grunt2:: @ 8161D6F
+ trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_38, SilphCo_9F_Text_Grunt2Intro, SilphCo_9F_Text_Grunt2Defeat
+ msgbox SilphCo_9F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE
end
diff --git a/data/maps/SilphCo_9F/text.inc b/data/maps/SilphCo_9F/text.inc
index bf400f768..f89262090 100644
--- a/data/maps/SilphCo_9F/text.inc
+++ b/data/maps/SilphCo_9F/text.inc
@@ -1,55 +1,47 @@
-Text_176ACB:: @ 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…$"
-
-gUnknown_8176B54:: @ 8176B54
+SilphCo_9F_Text_YouShouldTakeQuickNap:: @ 8176B54
.string "You look tired.\n"
.string "You should take a quick nap.$"
-gUnknown_8176B81:: @ 8176B81
+SilphCo_9F_Text_DontGiveUp:: @ 8176B81
.string "Don't give up!$"
-gUnknown_8176B90:: @ 8176B90
+SilphCo_9F_Text_ThankYouSoMuch:: @ 8176B90
.string "Thank you so much.$"
-Text_176BA3:: @ 8176BA3
+SilphCo_9F_Text_Grunt1Intro:: @ 8176BA3
.string "Your POKéMON seem to adore you,\n"
.string "kid!$"
-Text_176BC8:: @ 8176BC8
+SilphCo_9F_Text_Grunt1Defeat:: @ 8176BC8
.string "Ghaaah!$"
-gUnknown_8176BD0:: @ 8176BD0
+SilphCo_9F_Text_Grunt1PostBattle:: @ 8176BD0
.string "If I had started as a TRAINER at\n"
.string "your age…$"
-Text_176BFB:: @ 8176BFB
+SilphCo_9F_Text_EdIntro:: @ 8176BFB
.string "Your POKéMON have weak points!\n"
.string "I can nail them!$"
-Text_176C2B:: @ 8176C2B
+SilphCo_9F_Text_EdDefeat:: @ 8176C2B
.string "You hammered me!$"
-gUnknown_8176C3C:: @ 8176C3C
+SilphCo_9F_Text_EdPostBattle:: @ 8176C3C
.string "Exploiting weak spots does work.\n"
.string "Think about type advantages.$"
-Text_176C7A:: @ 8176C7A
+SilphCo_9F_Text_Grunt2Intro:: @ 8176C7A
.string "I am one of the four ROCKET\n"
.string "BROTHERS!$"
-Text_176CA0:: @ 8176CA0
+SilphCo_9F_Text_Grunt2Defeat:: @ 8176CA0
.string "Warg!\n"
.string "Brothers, I lost!$"
-gUnknown_8176CB8:: @ 8176CB8
+SilphCo_9F_Text_Grunt2PostBattle:: @ 8176CB8
.string "My brothers will avenge me!$"
-gUnknown_8176CD4:: @ 8176CD4
+SilphCo_9F_Text_FloorSign:: @ 8176CD4
.string "SILPH CO. HEAD OFFICE\n"
.string "9F$"
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-11 11:32:32 +0000