summaryrefslogtreecommitdiff
path: root/data/maps/Route24
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/Route24')
-rw-r--r--data/maps/Route24/map.json46
-rw-r--r--data/maps/Route24/scripts.inc80
-rw-r--r--data/maps/Route24/text.inc77
3 files changed, 136 insertions, 67 deletions
diff --git a/data/maps/Route24/map.json b/data/maps/Route24/map.json
index d87b68895..a12005d3f 100644
--- a/data/maps/Route24/map.json
+++ b/data/maps/Route24/map.json
@@ -6,11 +6,13 @@
"region_map_section": "MAPSEC_ROUTE_24",
"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_CERULEAN_CITY",
@@ -25,7 +27,7 @@
],
"object_events": [
{
- "graphics_id": "OBJECT_EVENT_GFX_MAN",
+ "graphics_id": "OBJ_EVENT_GFX_MAN",
"x": 12,
"y": 15,
"elevation": 3,
@@ -34,11 +36,11 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "Route24_EventScript_168620",
+ "script": "Route24_EventScript_Rocket",
"flag": "FLAG_HIDE_NUGGET_BRIDGE_ROCKET"
},
{
- "graphics_id": "OBJECT_EVENT_GFX_CAMPER",
+ "graphics_id": "OBJ_EVENT_GFX_CAMPER",
"x": 12,
"y": 19,
"elevation": 3,
@@ -47,11 +49,11 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 2,
- "script": "Route24_EventScript_1A972D",
+ "script": "Route24_EventScript_Ethan",
"flag": "0"
},
{
- "graphics_id": "OBJECT_EVENT_GFX_LASS",
+ "graphics_id": "OBJ_EVENT_GFX_LASS",
"x": 10,
"y": 22,
"elevation": 3,
@@ -60,11 +62,11 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 2,
- "script": "Route24_EventScript_1A9673",
+ "script": "Route24_EventScript_Reli",
"flag": "0"
},
{
- "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER",
+ "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER",
"x": 12,
"y": 25,
"elevation": 3,
@@ -73,11 +75,11 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 2,
- "script": "Route24_EventScript_1A95F7",
+ "script": "Route24_EventScript_Timmy",
"flag": "0"
},
{
- "graphics_id": "OBJECT_EVENT_GFX_LASS",
+ "graphics_id": "OBJ_EVENT_GFX_LASS",
"x": 10,
"y": 28,
"elevation": 3,
@@ -86,11 +88,11 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 2,
- "script": "Route24_EventScript_1A96B1",
+ "script": "Route24_EventScript_Ali",
"flag": "0"
},
{
- "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER",
+ "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER",
"x": 12,
"y": 31,
"elevation": 3,
@@ -99,11 +101,11 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 2,
- "script": "Route24_EventScript_1A9635",
+ "script": "Route24_EventScript_Cale",
"flag": "0"
},
{
- "graphics_id": "OBJECT_EVENT_GFX_CAMPER",
+ "graphics_id": "OBJ_EVENT_GFX_CAMPER",
"x": 5,
"y": 21,
"elevation": 3,
@@ -112,11 +114,11 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 5,
- "script": "Route24_EventScript_1A96EF",
+ "script": "Route24_EventScript_Shane",
"flag": "0"
},
{
- "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+ "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
"x": 11,
"y": 4,
"elevation": 3,
@@ -138,7 +140,7 @@
"elevation": 3,
"var": "VAR_MAP_SCENE_ROUTE24",
"var_value": 0,
- "script": "Route24_EventScript_168660"
+ "script": "Route24_EventScript_RocketTriggerLeft"
},
{
"type": "trigger",
@@ -147,7 +149,7 @@
"elevation": 3,
"var": "VAR_MAP_SCENE_ROUTE24",
"var_value": 0,
- "script": "Route24_EventScript_16866C"
+ "script": "Route24_EventScript_RocketTriggerRight"
}
],
"bg_events": [
diff --git a/data/maps/Route24/scripts.inc b/data/maps/Route24/scripts.inc
index e30913e52..7a22f64e8 100644
--- a/data/maps/Route24/scripts.inc
+++ b/data/maps/Route24/scripts.inc
@@ -1,103 +1,105 @@
+.equ LOCALID_ROCKET, 1
+
Route24_MapScripts:: @ 816861F
.byte 0
-Route24_EventScript_168620:: @ 8168620
+Route24_EventScript_Rocket:: @ 8168620
lock
faceplayer
compare VAR_MAP_SCENE_ROUTE24, 1
- goto_if_eq EventScript_168656
- msgbox gUnknown_8188C3C
+ goto_if_eq Route24_EventScript_RocketPostBattle
+ msgbox Route24_Text_JustEarnedFabulousPrize
checkitemspace ITEM_NUGGET, 1
compare VAR_RESULT, FALSE
- goto_if_eq EventScript_16864C
- call EventScript_1686B9
+ goto_if_eq Route24_EventScript_NoRoomForNugget
+ call Route24_EventScript_BattleRocket
release
end
-EventScript_16864C:: @ 816864C
- msgbox gUnknown_8188CC2
+Route24_EventScript_NoRoomForNugget:: @ 816864C
+ msgbox Route24_Text_YouDontHaveAnyRoom
release
end
-EventScript_168656:: @ 8168656
- msgbox gUnknown_8188DF1
+Route24_EventScript_RocketPostBattle:: @ 8168656
+ msgbox Route24_Text_YoudBecomeTopRocketLeader
release
end
-Route24_EventScript_168660:: @ 8168660
+Route24_EventScript_RocketTriggerLeft:: @ 8168660
lockall
setvar VAR_TEMP_1, 0
- goto EventScript_168678
+ goto Route24_EventScript_RocketTrigger
end
-Route24_EventScript_16866C:: @ 816866C
+Route24_EventScript_RocketTriggerRight:: @ 816866C
lockall
setvar VAR_TEMP_1, 1
- goto EventScript_168678
+ goto Route24_EventScript_RocketTrigger
end
-EventScript_168678:: @ 8168678
+Route24_EventScript_RocketTrigger:: @ 8168678
textcolor 0
compare VAR_TEMP_1, 0
- call_if_eq EventScript_1686FD
+ call_if_eq Route24_EventScript_RocketApproachPlayer
compare VAR_TEMP_1, 1
- call_if_eq EventScript_168708
+ call_if_eq Route24_EventScript_RocketMotionToPlayer
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
waitmovement 0
- msgbox gUnknown_8188C3C
+ msgbox Route24_Text_JustEarnedFabulousPrize
checkitemspace ITEM_NUGGET, 1
- compare VAR_RESULT, 0
- goto_if_eq EventScript_168713
- call EventScript_1686B9
+ compare VAR_RESULT, FALSE
+ goto_if_eq Route24_EventScript_NoRoomForNuggetTrigger
+ call Route24_EventScript_BattleRocket
releaseall
end
-EventScript_1686B9:: @ 81686B9
- giveitem_msg gUnknown_8188C93, ITEM_NUGGET
- message Text_188CDB
+Route24_EventScript_BattleRocket:: @ 81686B9
+ giveitem_msg Route24_Text_ReceivedNuggetFromMysteryTrainer, ITEM_NUGGET
+ message Route24_Text_JoinTeamRocket
waitmessage
playbgm MUS_ROCKET, 0
waitbuttonpress
- setvar VAR_LAST_TALKED, 1
- trainerbattle_no_intro TRAINER_TEAM_ROCKET_GRUNT_6, Text_188DDC
- msgbox gUnknown_8188DF1
+ setvar VAR_LAST_TALKED, LOCALID_ROCKET
+ trainerbattle_no_intro TRAINER_TEAM_ROCKET_GRUNT_6, Route24_Text_RocketDefeat
+ msgbox Route24_Text_YoudBecomeTopRocketLeader
setvar VAR_MAP_SCENE_ROUTE24, 1
return
-EventScript_1686FD:: @ 81686FD
- applymovement 1, Movement_16873E
+Route24_EventScript_RocketApproachPlayer:: @ 81686FD
+ applymovement LOCALID_ROCKET, Route24_Movement_RocketApproachPlayer
waitmovement 0
return
-EventScript_168708:: @ 8168708
- applymovement 1, Movement_WalkInPlaceFastestLeft
+Route24_EventScript_RocketMotionToPlayer:: @ 8168708
+ applymovement LOCALID_ROCKET, Movement_WalkInPlaceFastestLeft
waitmovement 0
return
-EventScript_168713:: @ 8168713
- msgbox gUnknown_8188CC2
+Route24_EventScript_NoRoomForNuggetTrigger:: @ 8168713
+ msgbox Route24_Text_YouDontHaveAnyRoom
closemessage
- applymovement OBJ_EVENT_ID_PLAYER, Movement_168743
+ applymovement OBJ_EVENT_ID_PLAYER, Route24_Movement_WalkDown
waitmovement 0
compare VAR_TEMP_1, 0
- call_if_eq EventScript_168733
+ call_if_eq Route24_EventScript_RocketWalkBackToPos
release
end
-EventScript_168733:: @ 8168733
- applymovement 1, Movement_168740
+Route24_EventScript_RocketWalkBackToPos:: @ 8168733
+ applymovement LOCALID_ROCKET, Route24_Movement_RocketWalkBackToPos
waitmovement 0
return
-Movement_16873E:: @ 816873E
+Route24_Movement_RocketApproachPlayer:: @ 816873E
walk_left
step_end
-Movement_168740:: @ 8168740
+Route24_Movement_RocketWalkBackToPos:: @ 8168740
walk_right
walk_in_place_fastest_left
step_end
-Movement_168743:: @ 8168743
+Route24_Movement_WalkDown:: @ 8168743
walk_down
step_end
diff --git a/data/maps/Route24/text.inc b/data/maps/Route24/text.inc
index 04ef64ea5..7b9d09e6f 100644
--- a/data/maps/Route24/text.inc
+++ b/data/maps/Route24/text.inc
@@ -1,16 +1,16 @@
-gUnknown_8188C3C:: @ 8188C3C
+Route24_Text_JustEarnedFabulousPrize:: @ 8188C3C
.string "Congratulations! You beat our\n"
.string "five contest TRAINERS!\p"
.string "You just earned a fabulous prize!$"
-gUnknown_8188C93:: @ 8188C93
+Route24_Text_ReceivedNuggetFromMysteryTrainer:: @ 8188C93
.string "{PLAYER} received a NUGGET\n"
.string "from the mystery TRAINER!$"
-gUnknown_8188CC2:: @ 8188CC2
+Route24_Text_YouDontHaveAnyRoom:: @ 8188CC2
.string "You don't have any room!$"
-Text_188CDB:: @ 8188CDB
+Route24_Text_JoinTeamRocket:: @ 8188CDB
.string "By the way, how would you like to\n"
.string "join TEAM ROCKET?\p"
.string "We're a group of professional\n"
@@ -23,13 +23,78 @@ Text_188CDB:: @ 8188CDB
.string "I'll make you an offer you can't\n"
.string "refuse!$"
-Text_188DDC:: @ 8188DDC
+Route24_Text_RocketDefeat:: @ 8188DDC
.string "Arrgh!\n"
.string "You are good!$"
-gUnknown_8188DF1:: @ 8188DF1
+Route24_Text_YoudBecomeTopRocketLeader:: @ 8188DF1
.string "With your ability, you'd become\n"
.string "a top leader in TEAM ROCKET.\p"
.string "Come on, think of the opportunity!\n"
.string "Don't let this chance go to waste.$"
+Route24_Text_ShaneIntro:: @ 8188E74
+ .string "I saw your feat from the grass!$"
+
+Route24_Text_ShaneDefeat:: @ 8188E94
+ .string "I thought not!$"
+
+Route24_Text_ShanePostBattle:: @ 8188EA3
+ .string "I hid because the people on the\n"
+ .string "bridge frightened me.$"
+
+Route24_Text_EthanIntro:: @ 8188ED9
+ .string "Okay! I'm No. 5!\n"
+ .string "I'll stomp you!$"
+
+Route24_Text_EthanDefeat:: @ 8188EFA
+ .string "Whoa!\n"
+ .string "Too much!$"
+
+Route24_Text_EthanPostBattle:: @ 8188F0A
+ .string "I did my best. I have no regrets!$"
+
+Route24_Text_ReliIntro:: @ 8188F2C
+ .string "I'm No. 4!\n"
+ .string "Getting tired?$"
+
+Route24_Text_ReliDefeat:: @ 8188F46
+ .string "I lost, too!$"
+
+Route24_Text_ReliPostBattle:: @ 8188F53
+ .string "I did my best, so I've no regrets!$"
+
+Route24_Text_TimmyIntro:: @ 8188F76
+ .string "Here's No. 3!\n"
+ .string "I won't be easy!$"
+
+Route24_Text_TimmyDefeat:: @ 8188F95
+ .string "Ow!\n"
+ .string "Stomped flat!$"
+
+Route24_Text_TimmyPostBattle:: @ 8188FA7
+ .string "I did my best. I have no regrets!$"
+
+Route24_Text_AliIntro:: @ 8188FC9
+ .string "I'm second!\n"
+ .string "Now it's serious!$"
+
+Route24_Text_AliDefeat:: @ 8188FE7
+ .string "How could I lose?$"
+
+Route24_Text_AliPostBattle:: @ 8188FF9
+ .string "I did my best. I have no regrets!$"
+
+Route24_Text_CaleIntro:: @ 818901B
+ .string "People call this the NUGGET\n"
+ .string "BRIDGE!\p"
+ .string "Beat us five TRAINERS and win\n"
+ .string "a fabulous prize!\p"
+ .string "Think you got what it takes?$"
+
+Route24_Text_CaleDefeat:: @ 818908C
+ .string "Whoo!\n"
+ .string "Good stuff!$"
+
+Route24_Text_CalePostBattle:: @ 818909E
+ .string "I did my best. I have no regrets!$"
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-08 17:10:50 +0000