summaryrefslogtreecommitdiff
path: root/data/maps/Route16
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/Route16')
-rw-r--r--data/maps/Route16/map.json56
-rw-r--r--data/maps/Route16/scripts.inc12
-rw-r--r--data/maps/Route16/text.inc102
3 files changed, 87 insertions, 83 deletions
diff --git a/data/maps/Route16/map.json b/data/maps/Route16/map.json
index bd32e6900..e9ddd5030 100644
--- a/data/maps/Route16/map.json
+++ b/data/maps/Route16/map.json
@@ -6,11 +6,13 @@
"region_map_section": "MAPSEC_ROUTE_16",
"requires_flash": false,
"weather": "WEATHER_SUNNY",
- "map_type": "MAP_TYPE_3",
- "unknown_18": 1,
- "unknown_19": 6,
- "elevator_flag": 0,
- "battle_scene": "BATTLE_SCENE_0",
+ "map_type": "MAP_TYPE_ROUTE",
+ "allow_cycling": true,
+ "allow_escaping": false,
+ "allow_running": true,
+ "show_map_name": true,
+ "floor_number": 0,
+ "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
"connections": [
{
"map": "MAP_ROUTE17",
@@ -25,7 +27,7 @@
],
"object_events": [
{
- "graphics_id": "OBJECT_EVENT_GFX_BIKER",
+ "graphics_id": "OBJ_EVENT_GFX_BIKER",
"x": 16,
"y": 12,
"elevation": 3,
@@ -34,11 +36,11 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 1,
- "script": "Route16_EventScript_1AAEEB",
+ "script": "Route16_EventScript_Lao",
"flag": "0"
},
{
- "graphics_id": "OBJECT_EVENT_GFX_BIKER",
+ "graphics_id": "OBJ_EVENT_GFX_BIKER",
"x": 14,
"y": 14,
"elevation": 3,
@@ -47,11 +49,11 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 1,
- "script": "Route16_EventScript_1AAFA5",
+ "script": "Route16_EventScript_Koji",
"flag": "0"
},
{
- "graphics_id": "OBJECT_EVENT_GFX_BIKER",
+ "graphics_id": "OBJ_EVENT_GFX_BIKER",
"x": 12,
"y": 12,
"elevation": 3,
@@ -60,11 +62,11 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 1,
- "script": "Route16_EventScript_1AAFE3",
+ "script": "Route16_EventScript_Luke",
"flag": "0"
},
{
- "graphics_id": "OBJECT_EVENT_GFX_BIKER",
+ "graphics_id": "OBJ_EVENT_GFX_BIKER",
"x": 8,
"y": 12,
"elevation": 3,
@@ -73,11 +75,11 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 1,
- "script": "Route16_EventScript_1AAF67",
+ "script": "Route16_EventScript_Ruben",
"flag": "0"
},
{
- "graphics_id": "OBJECT_EVENT_GFX_BIKER",
+ "graphics_id": "OBJ_EVENT_GFX_BIKER",
"x": 10,
"y": 14,
"elevation": 3,
@@ -86,11 +88,11 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 1,
- "script": "Route16_EventScript_1AAF29",
+ "script": "Route16_EventScript_Hideo",
"flag": "0"
},
{
- "graphics_id": "OBJECT_EVENT_GFX_BIKER",
+ "graphics_id": "OBJ_EVENT_GFX_BIKER",
"x": 6,
"y": 14,
"elevation": 3,
@@ -99,11 +101,11 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 1,
- "script": "Route16_EventScript_1AB021",
+ "script": "Route16_EventScript_Camron",
"flag": "0"
},
{
- "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
+ "graphics_id": "OBJ_EVENT_GFX_CUT_TREE",
"x": 41,
"y": 11,
"elevation": 3,
@@ -112,11 +114,11 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "EventScript_InteractWithCutTreeObject",
+ "script": "EventScript_CutTree",
"flag": "FLAG_TEMP_12"
},
{
- "graphics_id": "OBJECT_EVENT_GFX_BEAUTY",
+ "graphics_id": "OBJ_EVENT_GFX_BEAUTY",
"x": 30,
"y": 5,
"elevation": 3,
@@ -125,11 +127,11 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 1,
- "script": "Route16_EventScript_1AB0A5",
+ "script": "Route16_EventScript_Lea",
"flag": "0"
},
{
- "graphics_id": "OBJECT_EVENT_GFX_MAN",
+ "graphics_id": "OBJ_EVENT_GFX_MAN",
"x": 31,
"y": 5,
"elevation": 3,
@@ -138,11 +140,11 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 1,
- "script": "Route16_EventScript_1AB05F",
+ "script": "Route16_EventScript_Jed",
"flag": "0"
},
{
- "graphics_id": "OBJECT_EVENT_GFX_SNORLAX",
+ "graphics_id": "OBJ_EVENT_GFX_SNORLAX",
"x": 31,
"y": 13,
"elevation": 3,
@@ -195,17 +197,19 @@
"coord_events": [],
"bg_events": [
{
- "type": "bg_event_type_0",
+ "type": "sign",
"x": 6,
"y": 17,
"elevation": 0,
+ "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "Route16_EventScript_RouteSign"
},
{
- "type": "bg_event_type_0",
+ "type": "sign",
"x": 33,
"y": 11,
"elevation": 0,
+ "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "Route16_EventScript_CyclingRoadSign"
},
{
diff --git a/data/maps/Route16/scripts.inc b/data/maps/Route16/scripts.inc
index 1d7c6657c..62d47983f 100644
--- a/data/maps/Route16/scripts.inc
+++ b/data/maps/Route16/scripts.inc
@@ -14,19 +14,19 @@ Route16_EventScript_RemoveSnorlax:: @ 81680FF
Route16_OnTransition:: @ 8168103
compare VAR_MAP_SCENE_ROUTE16, 1
- call_if_eq Route16_EventScript_EnterCyclingRoad
+ call_if_eq Route16_OnTransitionCyclingRoad
end
-Route16_EventScript_EnterCyclingRoad:: @ 816810F
+Route16_OnTransitionCyclingRoad:: @ 816810F
setflag FLAG_SYS_ON_CYCLING_ROAD
return
Route16_OnWarp:: @ 8168113
- map_script_2 VAR_MAP_SCENE_ROUTE16, 1, Route16_EventScript_WarpIntoCyclingRoad
+ map_script_2 VAR_MAP_SCENE_ROUTE16, 1, Route16_OnWarpCyclingRoad
.2byte 0
-Route16_EventScript_WarpIntoCyclingRoad:: @ 816811D
- special Special_ForcePlayerOntoBike
+Route16_OnWarpCyclingRoad:: @ 816811D
+ special ForcePlayerOntoBike
end
Route16_EventScript_Snorlax:: @ 8168121
@@ -48,7 +48,7 @@ Route16_EventScript_Snorlax:: @ 8168121
setflag FLAG_SYS_SPECIAL_WILD_BATTLE
dowildbattle
clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
- specialvar VAR_RESULT, Special_GetBattleOutcome
+ specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, B_OUTCOME_WON
goto_if_eq Route16_EventScript_FoughtSnorlax
compare VAR_RESULT, B_OUTCOME_RAN
diff --git a/data/maps/Route16/text.inc b/data/maps/Route16/text.inc
index 289b80db9..ca3507cc7 100644
--- a/data/maps/Route16/text.inc
+++ b/data/maps/Route16/text.inc
@@ -1,99 +1,66 @@
-Text_186A95:: @ 8186A95
- .string "MYA: You're perfect.\n"
- .string "Help me train my little brother?$"
-
-Text_186ACB:: @ 8186ACB
- .string "MYA: RON, you have to focus!\n"
- .string "Concentrate on what you're doing!$"
-
-Text_186B0A:: @ 8186B0A
- .string "MYA: Okay, we'll turn it up.\n"
- .string "I'll add to our training menu!$"
-
-Text_186B46:: @ 8186B46
- .string "MYA: Do you want to challenge us?\n"
- .string "You'll need two POKéMON, though.$"
-
-Text_186B89:: @ 8186B89
- .string "RON: My sister gets scary when we\n"
- .string "lose.$"
-
-Text_186BB1:: @ 8186BB1
- .string "RON: Oh, no, no…\n"
- .string "Sis, I'm sorry!$"
-
-Text_186BD2:: @ 8186BD2
- .string "RON: Oh, bleah…\n"
- .string "I wish I had a nice sister…$"
-
-Text_186BFE:: @ 8186BFE
- .string "RON: Did you want to battle with\n"
- .string "my sister and me?\p"
- .string "You need two POKéMON, then.$"
-
-Text_186C4D:: @ 8186C4D
+Route16_Text_LaoIntro:: @ 8186C4D
.string "What do you want?$"
-Text_186C5F:: @ 8186C5F
+Route16_Text_LaoDefeat:: @ 8186C5F
.string "Don't you dare laugh!$"
-Text_186C75:: @ 8186C75
+Route16_Text_LaoPostBattle:: @ 8186C75
.string "We like just hanging here.\n"
.string "What's it to you?$"
-Text_186CA2:: @ 8186CA2
+Route16_Text_KojiIntro:: @ 8186CA2
.string "Nice BIKE!\n"
.string "Hand it over!$"
-Text_186CBB:: @ 8186CBB
+Route16_Text_KojiDefeat:: @ 8186CBB
.string "Knockout!$"
-Text_186CC5:: @ 8186CC5
+Route16_Text_KojiPostBattle:: @ 8186CC5
.string "Forget it, who needs your BIKE!$"
-Text_186CE5:: @ 8186CE5
+Route16_Text_LukeIntro:: @ 8186CE5
.string "Come out and play, little mouse!$"
-Text_186D06:: @ 8186D06
+Route16_Text_LukeDefeat:: @ 8186D06
.string "You little rat!$"
-Text_186D16:: @ 8186D16
+Route16_Text_LukePostBattle:: @ 8186D16
.string "I hate losing!\n"
.string "Get out of my face!$"
-Text_186D39:: @ 8186D39
+Route16_Text_HideoIntro:: @ 8186D39
.string "Hey, you just bumped me!$"
-Text_186D52:: @ 8186D52
+Route16_Text_HideoDefeat:: @ 8186D52
.string "Kaboom!$"
-Text_186D5A:: @ 8186D5A
+Route16_Text_HideoPostBattle:: @ 8186D5A
.string "We'll always be hanging around here\n"
.string "even if you don't like it.\p"
.string "You can detour to VERMILION from\n"
.string "FUCHSIA going along the coast.$"
-Text_186DD9:: @ 8186DD9
+Route16_Text_CamronIntro:: @ 8186DD9
.string "I'm feeling hungry and mean!\n"
.string "I need a punching bag!$"
-Text_186E0D:: @ 8186E0D
+Route16_Text_CamronDefeat:: @ 8186E0D
.string "Bad, bad, bad!$"
-Text_186E1C:: @ 8186E1C
+Route16_Text_CamronPostBattle:: @ 8186E1C
.string "If I'm going to have POKéMON, they\n"
.string "may as well be ferocious.\p"
.string "I'd use them to leave my enemies\n"
.string "in tatters.$"
-Text_186E86:: @ 8186E86
+Route16_Text_RubenIntro:: @ 8186E86
.string "Hey, there!\n"
.string "Let's have ourselves a good time!$"
-Text_186EB4:: @ 8186EB4
+Route16_Text_RubenDefeat:: @ 8186EB4
.string "Don't make me mad!$"
-Text_186EC7:: @ 8186EC7
+Route16_Text_RubenPostBattle:: @ 8186EC7
.string "I get my kicks by harassing people\n"
.string "with my stinking POKéMON.\p"
.string "They're great for startling people.\n"
@@ -111,3 +78,36 @@ Route16_Text_RouteSign:: @ 8186F98
.string "ROUTE 16\n"
.string "CELADON CITY - FUCHSIA CITY$"
+Route16_Text_JedIntro:: @ 8186FBD
+ .string "JED: Our love knows no bounds.\n"
+ .string "We're in love and we show it!$"
+
+Route16_Text_JedDefeat:: @ 8186FFA
+ .string "JED: Oh, no!\n"
+ .string "My love has seen me as a loser!$"
+
+Route16_Text_JedPostBattle:: @ 8187027
+ .string "JED: Listen, LEA.\n"
+ .string "You need to focus less on me.$"
+
+Route16_Text_JedNotEnoughMons:: @ 8187057
+ .string "JED: You have just one POKéMON?\n"
+ .string "Is there no love in your heart?$"
+
+Route16_Text_LeaIntro:: @ 8187097
+ .string "LEA: Sometimes, the intensity of\n"
+ .string "our love scares me.$"
+
+Route16_Text_LeaDefeat:: @ 81870CC
+ .string "LEA: Ohh! But JED looks cool\n"
+ .string "even in a loss!$"
+
+Route16_Text_LeaPostBattle:: @ 81870F9
+ .string "LEA: Ehehe, I'm sorry.\n"
+ .string "JED is so cool.$"
+
+Route16_Text_LeaNotEnoughMons:: @ 8187120
+ .string "LEA: Oh, you don't have two\n"
+ .string "POKéMON with you?\p"
+ .string "Doesn't it feel lonely for you or\n"
+ .string "your POKéMON?$"
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-09 23:25:55 +0000