summaryrefslogtreecommitdiff
path: root/data/maps/Route12
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/Route12')
-rw-r--r--data/maps/Route12/map.json68
-rw-r--r--data/maps/Route12/scripts.inc2
-rw-r--r--data/maps/Route12/text.inc75
3 files changed, 91 insertions, 54 deletions
diff --git a/data/maps/Route12/map.json b/data/maps/Route12/map.json
index 09e49160b..d9baf947c 100644
--- a/data/maps/Route12/map.json
+++ b/data/maps/Route12/map.json
@@ -6,11 +6,13 @@
"region_map_section": "MAPSEC_ROUTE_12",
"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_LAVENDER_TOWN",
@@ -30,7 +32,7 @@
],
"object_events": [
{
- "graphics_id": "OBJECT_EVENT_GFX_FISHER",
+ "graphics_id": "OBJ_EVENT_GFX_FISHER",
"x": 17,
"y": 32,
"elevation": 3,
@@ -39,11 +41,11 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 1,
- "script": "Route12_EventScript_1AA451",
+ "script": "Route12_EventScript_Ned",
"flag": "0"
},
{
- "graphics_id": "OBJECT_EVENT_GFX_FISHER",
+ "graphics_id": "OBJ_EVENT_GFX_FISHER",
"x": 9,
"y": 40,
"elevation": 3,
@@ -52,11 +54,11 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 1,
- "script": "Route12_EventScript_1AA48F",
+ "script": "Route12_EventScript_Chip",
"flag": "0"
},
{
- "graphics_id": "OBJECT_EVENT_GFX_FISHER",
+ "graphics_id": "OBJ_EVENT_GFX_FISHER",
"x": 16,
"y": 47,
"elevation": 3,
@@ -65,11 +67,11 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 4,
- "script": "Route12_EventScript_1AA4CD",
+ "script": "Route12_EventScript_Hank",
"flag": "0"
},
{
- "graphics_id": "OBJECT_EVENT_GFX_FISHER",
+ "graphics_id": "OBJ_EVENT_GFX_FISHER",
"x": 13,
"y": 59,
"elevation": 3,
@@ -78,11 +80,11 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 1,
- "script": "Route12_EventScript_1AA50B",
+ "script": "Route12_EventScript_Elliot",
"flag": "0"
},
{
- "graphics_id": "OBJECT_EVENT_GFX_SNORLAX",
+ "graphics_id": "OBJ_EVENT_GFX_SNORLAX",
"x": 14,
"y": 70,
"elevation": 3,
@@ -95,7 +97,7 @@
"flag": "FLAG_HIDE_ROUTE_12_SNORLAX"
},
{
- "graphics_id": "OBJECT_EVENT_GFX_ROCKER",
+ "graphics_id": "OBJ_EVENT_GFX_ROCKER",
"x": 13,
"y": 92,
"elevation": 3,
@@ -104,11 +106,11 @@
"movement_range_y": 4,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 1,
- "script": "Route12_EventScript_1AA587",
+ "script": "Route12_EventScript_Luca",
"flag": "0"
},
{
- "graphics_id": "OBJECT_EVENT_GFX_CAMPER",
+ "graphics_id": "OBJ_EVENT_GFX_CAMPER",
"x": 10,
"y": 99,
"elevation": 3,
@@ -117,11 +119,11 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 1,
- "script": "Route12_EventScript_1AA5C5",
+ "script": "Route12_EventScript_Justin",
"flag": "0"
},
{
- "graphics_id": "OBJECT_EVENT_GFX_FISHER",
+ "graphics_id": "OBJ_EVENT_GFX_FISHER",
"x": 18,
"y": 108,
"elevation": 3,
@@ -130,11 +132,11 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 1,
- "script": "Route12_EventScript_1AA549",
+ "script": "Route12_EventScript_Andrew",
"flag": "0"
},
{
- "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
+ "graphics_id": "OBJ_EVENT_GFX_CUT_TREE",
"x": 11,
"y": 100,
"elevation": 3,
@@ -143,11 +145,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_ITEM_BALL",
+ "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
"x": 18,
"y": 36,
"elevation": 3,
@@ -160,7 +162,7 @@
"flag": "FLAG_HIDE_ROUTE12_TM48"
},
{
- "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+ "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
"x": 9,
"y": 101,
"elevation": 3,
@@ -173,7 +175,7 @@
"flag": "FLAG_HIDE_ROUTE12_IRON"
},
{
- "graphics_id": "OBJECT_EVENT_GFX_BEAUTY",
+ "graphics_id": "OBJ_EVENT_GFX_BEAUTY",
"x": 19,
"y": 64,
"elevation": 3,
@@ -182,11 +184,11 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 0,
- "script": "Route12_EventScript_1AA649",
+ "script": "Route12_EventScript_Gia",
"flag": "0"
},
{
- "graphics_id": "OBJECT_EVENT_GFX_MAN",
+ "graphics_id": "OBJ_EVENT_GFX_MAN",
"x": 19,
"y": 63,
"elevation": 3,
@@ -195,11 +197,11 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 0,
- "script": "Route12_EventScript_1AA603",
+ "script": "Route12_EventScript_Jes",
"flag": "0"
},
{
- "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
+ "graphics_id": "OBJ_EVENT_GFX_CUT_TREE",
"x": 12,
"y": 111,
"elevation": 3,
@@ -208,7 +210,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "EventScript_InteractWithCutTreeObject",
+ "script": "EventScript_CutTree",
"flag": "FLAG_TEMP_13"
}
],
@@ -245,17 +247,19 @@
"coord_events": [],
"bg_events": [
{
- "type": "bg_event_type_0",
+ "type": "sign",
"x": 17,
"y": 13,
"elevation": 0,
+ "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "Route12_EventScript_RouteSign"
},
{
- "type": "bg_event_type_0",
+ "type": "sign",
"x": 15,
"y": 69,
"elevation": 0,
+ "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "Route12_EventScript_FishingSign"
},
{
diff --git a/data/maps/Route12/scripts.inc b/data/maps/Route12/scripts.inc
index 9fe6d2e39..9ace7b7b0 100644
--- a/data/maps/Route12/scripts.inc
+++ b/data/maps/Route12/scripts.inc
@@ -30,7 +30,7 @@ Route12_EventScript_Snorlax:: @ 8168014
setflag FLAG_WOKE_UP_ROUTE_12_SNORLAX
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 Route12_EventScript_FoughtSnorlax
compare VAR_RESULT, B_OUTCOME_RAN
diff --git a/data/maps/Route12/text.inc b/data/maps/Route12/text.inc
index 06371bf5c..9c984cc47 100644
--- a/data/maps/Route12/text.inc
+++ b/data/maps/Route12/text.inc
@@ -17,87 +17,87 @@ Text_WantToUsePokeFlute:: @ 81853CC
Text_PlayedPokeFlute:: @ 81853E8
.string "{PLAYER} played the POKé FLUTE.$"
-Text_185402:: @ 8185402
+Route12_Text_NedIntro:: @ 8185402
.string "Yeah!\n"
.string "I got a bite here!$"
-Text_18541B:: @ 818541B
+Route12_Text_NedDefeat:: @ 818541B
.string "Tch!\n"
.string "Just a small fry…$"
-Text_185432:: @ 8185432
+Route12_Text_NedPostBattle:: @ 8185432
.string "Hang on!\n"
.string "My line's snagged!$"
-Text_18544E:: @ 818544E
+Route12_Text_ChipIntro:: @ 818544E
.string "Be patient.\n"
.string "Fishing is a waiting game.$"
-Text_185475:: @ 8185475
+Route12_Text_ChipDefeat:: @ 8185475
.string "That one got away!$"
-Text_185488:: @ 8185488
+Route12_Text_ChipPostBattle:: @ 8185488
.string "With a better ROD, I could catch\n"
.string "better POKéMON…$"
-Text_1854B9:: @ 81854B9
+Route12_Text_JustinIntro:: @ 81854B9
.string "I'm searching for a MOON STONE.\n"
.string "Have you found one?$"
-Text_1854ED:: @ 81854ED
+Route12_Text_JustinDefeat:: @ 81854ED
.string "Oww!$"
-Text_1854F2:: @ 81854F2
+Route12_Text_JustinPostBattle:: @ 81854F2
.string "I could have made my POKéMON\n"
.string "evolve with a MOON STONE.\p"
.string "I would have won then, I bet.$"
-Text_185547:: @ 8185547
+Route12_Text_LucaIntro:: @ 8185547
.string "Electricity is my specialty.\p"
.string "I don't know a thing about POKéMON\n"
.string "of the sea, though.$"
-Text_18559B:: @ 818559B
+Route12_Text_LucaDefeat:: @ 818559B
.string "Unplugged!$"
-Text_1855A6:: @ 81855A6
+Route12_Text_LucaPostBattle:: @ 81855A6
.string "Water conducts electricity, so you\n"
.string "should zap sea POKéMON.$"
-Text_1855E1:: @ 81855E1
+Route12_Text_HankIntro:: @ 81855E1
.string "The FISHING FOOL versus POKéMON\n"
.string "KID!$"
-Text_185606:: @ 8185606
+Route12_Text_HankDefeat:: @ 8185606
.string "Touch too much!$"
-Text_185616:: @ 8185616
+Route12_Text_HankPostBattle:: @ 8185616
.string "I guess you get to be good at\n"
.string "what you like.\p"
.string "Well, you beat me at POKéMON,\n"
.string "but you can't top me at fishing.$"
-Text_185682:: @ 8185682
+Route12_Text_ElliotIntro:: @ 8185682
.string "I love fishing, don't get me wrong.\p"
.string "But it'd be best if I also had more\n"
.string "work.$"
-Text_1856D0:: @ 81856D0
+Route12_Text_ElliotDefeat:: @ 81856D0
.string "It's not easy…$"
-Text_1856DF:: @ 81856DF
+Route12_Text_ElliotPostBattle:: @ 81856DF
.string "It's all right.\n"
.string "Losing doesn't bug me anymore.$"
-Text_18570E:: @ 818570E
+Route12_Text_AndrewIntro:: @ 818570E
.string "What's catching?\p"
.string "You never know what you could\n"
.string "catch!$"
-Text_185744:: @ 8185744
+Route12_Text_AndrewDefeat:: @ 8185744
.string "Lost it!$"
-Text_18574D:: @ 818574D
+Route12_Text_AndrewPostBattle:: @ 818574D
.string "What, MAGIKARP?\p"
.string "I catch them all the time, sure.\n"
.string "But, boy are they wimpy.$"
@@ -109,3 +109,36 @@ Route12_Text_RouteSign:: @ 8185797
Route12_Text_SportfishingArea:: @ 81857B3
.string "SPORTFISHING AREA$"
+Route12_Text_JesIntro:: @ 81857C5
+ .string "JES: If I win, I'm going to\n"
+ .string "propose to GIA.$"
+
+Route12_Text_JesDefeat:: @ 81857F1
+ .string "JES: Oh, please, why couldn't you\n"
+ .string "let us win?$"
+
+Route12_Text_JesPostBattle:: @ 818581F
+ .string "JES: Oh, GIA, forgive me,\n"
+ .string "my love!$"
+
+Route12_Text_JesNotEnoughMons:: @ 8185842
+ .string "JES: GIA and I, we'll be\n"
+ .string "together forever.\p"
+ .string "We won't battle unless you have\n"
+ .string "two POKéMON of your own.$"
+
+Route12_Text_GiaIntro:: @ 81858A6
+ .string "GIA: Hey, JES…\p"
+ .string "If we win, I'll marry you!$"
+
+Route12_Text_GiaDefeat:: @ 81858D0
+ .string "GIA: Oh, but why?$"
+
+Route12_Text_GiaPostBattle:: @ 81858E2
+ .string "GIA: JES, you silly!\n"
+ .string "You ruined this!$"
+
+Route12_Text_GiaNotEnoughMons:: @ 8185908
+ .string "GIA: I can't bear to battle\n"
+ .string "without my JES!\p"
+ .string "Don't you have one more POKéMON?$"
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-08 17:20:41 +0000