summaryrefslogtreecommitdiff
path: root/data/maps
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps')
-rw-r--r--data/maps/FourIsland/map.json10
-rw-r--r--data/maps/FourIsland/scripts.inc70
-rw-r--r--data/maps/FourIsland/text.inc14
-rw-r--r--data/maps/FourIsland_Harbor/map.json2
-rw-r--r--data/maps/FourIsland_Harbor/scripts.inc2
-rw-r--r--data/maps/FourIsland_House1/map.json2
-rw-r--r--data/maps/FourIsland_House1/scripts.inc4
-rw-r--r--data/maps/FourIsland_House1/text.inc13
-rw-r--r--data/maps/FourIsland_House2/map.json2
-rw-r--r--data/maps/FourIsland_LoreleisHouse/map.json30
-rw-r--r--data/maps/FourIsland_LoreleisHouse/scripts.inc20
-rw-r--r--data/maps/FourIsland_LoreleisHouse/text.inc8
-rw-r--r--data/maps/FourIsland_Mart/map.json6
-rw-r--r--data/maps/FourIsland_Mart/scripts.inc10
-rw-r--r--data/maps/FourIsland_Mart/text.inc4
-rw-r--r--data/maps/FourIsland_PokemonCenter_1F/map.json12
-rw-r--r--data/maps/FourIsland_PokemonCenter_1F/scripts.inc14
-rw-r--r--data/maps/FourIsland_PokemonCenter_1F/text.inc9
18 files changed, 119 insertions, 113 deletions
diff --git a/data/maps/FourIsland/map.json b/data/maps/FourIsland/map.json
index ed72da60f..35dd24e8c 100644
--- a/data/maps/FourIsland/map.json
+++ b/data/maps/FourIsland/map.json
@@ -90,7 +90,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "FourIsland_EventScript_167E2E",
+ "script": "FourIsland_EventScript_OldWoman",
"flag": "0"
},
{
@@ -155,7 +155,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "FourIsland_EventScript_167E73",
+ "script": "FourIsland_EventScript_FatMan",
"flag": "0"
},
{
@@ -168,7 +168,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "FourIsland_EventScript_167E5A",
+ "script": "FourIsland_EventScript_LittleGirl",
"flag": "0"
}
],
@@ -237,7 +237,7 @@
"x": 13,
"y": 19,
"elevation": 0,
- "script": "FourIsland_EventScript_167E7C"
+ "script": "FourIsland_EventScript_IslandSign"
},
{
"type": "hidden_item",
@@ -264,7 +264,7 @@
"x": 31,
"y": 23,
"elevation": 0,
- "script": "FourIsland_EventScript_167E85"
+ "script": "FourIsland_EventScript_LoreleisHouseSign"
}
]
}
diff --git a/data/maps/FourIsland/scripts.inc b/data/maps/FourIsland/scripts.inc
index 85e1db283..8a7dfafbf 100644
--- a/data/maps/FourIsland/scripts.inc
+++ b/data/maps/FourIsland/scripts.inc
@@ -1,3 +1,6 @@
+.equ LOCALID_DAYCARE_MAN, 1
+.equ LOCALID_RIVAL, 10
+
FourIsland_MapScripts:: @ 8167CAE
map_script MAP_SCRIPT_ON_TRANSITION, FourIsland_OnTransition
map_script MAP_SCRIPT_ON_FRAME_TABLE, FourIsland_OnFrame
@@ -6,65 +9,64 @@ FourIsland_MapScripts:: @ 8167CAE
FourIsland_OnTransition:: @ 8167CB9
setworldmapflag FLAG_WORLD_MAP_FOUR_ISLAND
compare VAR_MAP_SCENE_FOUR_ISLAND, 0
- call_if_eq EventScript_167CCD
- call EventScript_167CD1
+ call_if_eq FourIsland_EventScript_ShowRival
+ call FourIsland_EventScript_TrySetDayCareManPos
end
-EventScript_167CCD:: @ 8167CCD
+FourIsland_EventScript_ShowRival:: @ 8167CCD
clearflag FLAG_HIDE_FOUR_ISLAND_RIVAL
return
-EventScript_167CD1:: @ 8167CD1
- goto_if_unset FLAG_PENDING_DAYCARE_EGG, EventScript_167CE1
- setobjectxyperm 1, 16, 14
-
-EventScript_167CE1:: @ 8167CE1
+FourIsland_EventScript_TrySetDayCareManPos:: @ 8167CD1
+ goto_if_unset FLAG_PENDING_DAYCARE_EGG, FourIsland_EventScript_EndSetDayCareManPos
+ setobjectxyperm LOCALID_DAYCARE_MAN, 16, 14
+FourIsland_EventScript_EndSetDayCareManPos:: @ 8167CE1
return
FourIsland_OnFrame:: @ 8167CE2
- map_script_2 VAR_MAP_SCENE_FOUR_ISLAND, 0, EventScript_167CEC
+ map_script_2 VAR_MAP_SCENE_FOUR_ISLAND, 0, FourIsland_EventScript_RivalScene
.2byte 0
-EventScript_167CEC:: @ 8167CEC
+FourIsland_EventScript_RivalScene:: @ 8167CEC
lockall
textcolor 0
- applymovement 10, Movement_WalkInPlaceFastestDown
+ applymovement LOCALID_RIVAL, Movement_WalkInPlaceFastestDown
waitmovement 0
playbgm MUS_RIVAL1, 0
- applymovement 10, Movement_ExclamationMark
+ applymovement LOCALID_RIVAL, Movement_ExclamationMark
waitmovement 0
- applymovement 10, Movement_Delay48
+ applymovement LOCALID_RIVAL, Movement_Delay48
waitmovement 0
delay 25
- applymovement 10, Movement_167D49
+ applymovement LOCALID_RIVAL, FourIsland_Movement_RivalApproach
waitmovement 0
- msgbox gUnknown_8182B37
+ msgbox FourIsland_Text_RivalAlreadyGotEggBeSmellingYa
closemessage
- applymovement OBJ_EVENT_ID_PLAYER, Movement_167D52
- applymovement 10, Movement_167D4E
+ applymovement OBJ_EVENT_ID_PLAYER, FourIsland_Movement_PlayerWatchRivalExit
+ applymovement LOCALID_RIVAL, FourIsland_Movement_RivalExit
waitmovement 0
fadedefaultbgm
playse SE_KAIDAN
delay 35
- removeobject 10
+ removeobject LOCALID_RIVAL
setvar VAR_MAP_SCENE_FOUR_ISLAND, 1
releaseall
end
-Movement_167D49:: @ 8167D49
+FourIsland_Movement_RivalApproach:: @ 8167D49
walk_right
walk_right
walk_down
walk_down
step_end
-Movement_167D4E:: @ 8167D4E
+FourIsland_Movement_RivalExit:: @ 8167D4E
delay_16
delay_4
walk_down
step_end
-Movement_167D52:: @ 8167D52
+FourIsland_Movement_PlayerWatchRivalExit:: @ 8167D52
walk_left
walk_in_place_fastest_right
step_end
@@ -136,36 +138,36 @@ FourIsland_EventScript_CheckOnTwoMons:: @ 8167E19
release
end
-FourIsland_EventScript_167E2E:: @ 8167E2E
+FourIsland_EventScript_OldWoman:: @ 8167E2E
lock
faceplayer
- goto_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_167E43
- msgbox gUnknown_8182A2B
+ goto_if_set FLAG_SYS_CAN_LINK_WITH_RS, FourIsland_EventScript_OldWomanLoreleiLeft
+ msgbox FourIsland_Text_LoreleiHasReturned
release
end
-EventScript_167E43:: @ 8167E43
+FourIsland_EventScript_OldWomanLoreleiLeft:: @ 8167E43
famechecker FAMECHECKER_LORELEI, 5
- msgbox gUnknown_8182A75
+ msgbox FourIsland_Text_LoreleiMetLaprasAsChild
release
end
-FourIsland_EventScript_167E5A:: @ 8167E5A
+FourIsland_EventScript_LittleGirl:: @ 8167E5A
lock
faceplayer
famechecker FAMECHECKER_LORELEI, 4
- msgbox gUnknown_8182CE3
+ msgbox FourIsland_Text_LoreleiHasLotsOfStuffedDolls
release
end
-FourIsland_EventScript_167E73:: @ 8167E73
- msgbox gUnknown_8182D8E, MSGBOX_NPC
+FourIsland_EventScript_FatMan:: @ 8167E73
+ msgbox FourIsland_Text_MadeSlushieUsingIcefallCaveIce, MSGBOX_NPC
end
-FourIsland_EventScript_167E7C:: @ 8167E7C
- msgbox gUnknown_8182A03, MSGBOX_SIGN
+FourIsland_EventScript_IslandSign:: @ 8167E7C
+ msgbox FourIsland_Text_IslandSign, MSGBOX_SIGN
end
-FourIsland_EventScript_167E85:: @ 8167E85
- msgbox gUnknown_8182DEB, MSGBOX_SIGN
+FourIsland_EventScript_LoreleisHouseSign:: @ 8167E85
+ msgbox FourIsland_Text_LoreleisHouse, MSGBOX_SIGN
end
diff --git a/data/maps/FourIsland/text.inc b/data/maps/FourIsland/text.inc
index 04845b223..e54650761 100644
--- a/data/maps/FourIsland/text.inc
+++ b/data/maps/FourIsland/text.inc
@@ -1,13 +1,13 @@
-gUnknown_8182A03:: @ 8182A03
+FourIsland_Text_IslandSign:: @ 8182A03
.string "FOUR ISLAND\n"
.string "The Warm, Blue, Floe Island$"
-gUnknown_8182A2B:: @ 8182A2B
+FourIsland_Text_LoreleiHasReturned:: @ 8182A2B
.string "LORELEI has returned.\p"
.string "Did she find the city life too\n"
.string "stressful, I wonder?$"
-gUnknown_8182A75:: @ 8182A75
+FourIsland_Text_LoreleiMetLaprasAsChild:: @ 8182A75
.string "LORELEI has gone back.\p"
.string "The LAPRAS she has, I imagine it\n"
.string "to be the one she met as a child.\p"
@@ -16,7 +16,7 @@ gUnknown_8182A75:: @ 8182A75
.string "Perhaps that POKéMON has been with\n"
.string "her ever since.$"
-gUnknown_8182B37:: @ 8182B37
+FourIsland_Text_RivalAlreadyGotEggBeSmellingYa:: @ 8182B37
.string "{RIVAL}: Hey!\n"
.string "{PLAYER}!\p"
.string "What are you doing here in the\n"
@@ -37,7 +37,7 @@ gUnknown_8182B37:: @ 8182B37
.string "waste.\p"
.string "Be smelling ya!$"
-gUnknown_8182CE3:: @ 8182CE3
+FourIsland_Text_LoreleiHasLotsOfStuffedDolls:: @ 8182CE3
.string "Oh, you found me!\n"
.string "Please don't tell LORELEI.\p"
.string "Did you know that LORELEI has lots\n"
@@ -45,12 +45,12 @@ gUnknown_8182CE3:: @ 8182CE3
.string "Every time she comes back to\n"
.string "FOUR ISLAND, her collection grows!$"
-gUnknown_8182D8E:: @ 8182D8E
+FourIsland_Text_MadeSlushieUsingIcefallCaveIce:: @ 8182D8E
.string "Ooh, chilly!\p"
.string "I made a slushie using ice I\n"
.string "shaved inside ICEFALL CAVE.\p"
.string "It's chilly and tasty!$"
-gUnknown_8182DEB:: @ 8182DEB
+FourIsland_Text_LoreleisHouse:: @ 8182DEB
.string "LORELEI'S HOUSE$"
diff --git a/data/maps/FourIsland_Harbor/map.json b/data/maps/FourIsland_Harbor/map.json
index 6cd0223da..fa23fe2cd 100644
--- a/data/maps/FourIsland_Harbor/map.json
+++ b/data/maps/FourIsland_Harbor/map.json
@@ -38,7 +38,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "FourIsland_Harbor_EventScript_171C99",
+ "script": "FourIsland_Harbor_EventScript_Sailor",
"flag": "0"
}
],
diff --git a/data/maps/FourIsland_Harbor/scripts.inc b/data/maps/FourIsland_Harbor/scripts.inc
index d8933d783..3a16cd3e3 100644
--- a/data/maps/FourIsland_Harbor/scripts.inc
+++ b/data/maps/FourIsland_Harbor/scripts.inc
@@ -1,7 +1,7 @@
FourIsland_Harbor_MapScripts:: @ 8171C98
.byte 0
-FourIsland_Harbor_EventScript_171C99:: @ 8171C99
+FourIsland_Harbor_EventScript_Sailor:: @ 8171C99
lock
faceplayer
message Text_WhereDoYouWantToSail
diff --git a/data/maps/FourIsland_House1/map.json b/data/maps/FourIsland_House1/map.json
index 3d4984879..f581ffa5a 100644
--- a/data/maps/FourIsland_House1/map.json
+++ b/data/maps/FourIsland_House1/map.json
@@ -38,7 +38,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "FourIsland_House1_EventScript_171C45",
+ "script": "FourIsland_House1_EventScript_FatMan",
"flag": "0"
}
],
diff --git a/data/maps/FourIsland_House1/scripts.inc b/data/maps/FourIsland_House1/scripts.inc
index 46ec500fe..e8e6322f5 100644
--- a/data/maps/FourIsland_House1/scripts.inc
+++ b/data/maps/FourIsland_House1/scripts.inc
@@ -1,6 +1,6 @@
FourIsland_House1_MapScripts:: @ 8171C44
.byte 0
-FourIsland_House1_EventScript_171C45:: @ 8171C45
- msgbox gUnknown_81A3802, MSGBOX_NPC
+FourIsland_House1_EventScript_FatMan:: @ 8171C45
+ msgbox FourIsland_House1_Text_YoureAwfullyHeavy, MSGBOX_NPC
end
diff --git a/data/maps/FourIsland_House1/text.inc b/data/maps/FourIsland_House1/text.inc
index 2d4f8c4bd..255b3c028 100644
--- a/data/maps/FourIsland_House1/text.inc
+++ b/data/maps/FourIsland_House1/text.inc
@@ -1,4 +1,7 @@
-Text_1A3778:: @ 81A3778
+@ Text for this file was split weirdly, and is instead in FourIsland_PokemonCenter_1F/text.inc
+@ Theres also an unused JP version of that text in this file instead
+
+JPText_BodySlamTeach:: @ 81A3778
.string "そーれ　ぼよーん！\n"
.string "どっちが　さきに　へたばるか？\l"
.string "のしかかり　しょうぶ　してるんだ\p"
@@ -7,17 +10,17 @@ Text_1A3778:: @ 81A3778
.string "かわりに　きみの　ポケモンに\l"
.string "のしかかり　おしえて　やろっか？$"
-Text_1A37DB:: @ 81A37DB
+JPText_BodySlamDeclined:: @ 81A37DB
.string "また　おいで　ぼよーん！$"
-Text_1A37E8:: @ 81A37E8
+JPText_BodySlamWhichMon:: @ 81A37E8
.string "どの　ポケモンに\n"
.string "おしえたい　かい？$"
-Text_1A37FB:: @ 81A37FB
+JPText_BodySlamTaught:: @ 81A37FB
.string "ぼよよーん！$"
-gUnknown_81A3802:: @ 81A3802
+FourIsland_House1_Text_YoureAwfullyHeavy:: @ 81A3802
.string "There! Boing!\n"
.string "You're awfully heavy!$"
diff --git a/data/maps/FourIsland_House2/map.json b/data/maps/FourIsland_House2/map.json
index b83419325..a4b926233 100644
--- a/data/maps/FourIsland_House2/map.json
+++ b/data/maps/FourIsland_House2/map.json
@@ -25,7 +25,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "FourIsland_House2_EventScript_1B2938",
+ "script": "FourIsland_House2_EventScript_StickerMan",
"flag": "0"
}
],
diff --git a/data/maps/FourIsland_LoreleisHouse/map.json b/data/maps/FourIsland_LoreleisHouse/map.json
index 7dbe72a88..1c09bc412 100644
--- a/data/maps/FourIsland_LoreleisHouse/map.json
+++ b/data/maps/FourIsland_LoreleisHouse/map.json
@@ -25,7 +25,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "FourIsland_LoreleisHouse_EventScript_171C58",
+ "script": "FourIsland_LoreleisHouse_EventScript_Lorelei",
"flag": "FLAG_HIDE_LORELEI_IN_HER_HOUSE"
},
{
@@ -38,7 +38,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "FourIsland_LoreleisHouse_EventScript_171C8D",
+ "script": "FourIsland_LoreleisHouse_EventScript_Doll",
"flag": "0"
},
{
@@ -51,7 +51,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "FourIsland_LoreleisHouse_EventScript_171C8D",
+ "script": "FourIsland_LoreleisHouse_EventScript_Doll",
"flag": "0"
},
{
@@ -64,7 +64,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "FourIsland_LoreleisHouse_EventScript_171C8D",
+ "script": "FourIsland_LoreleisHouse_EventScript_Doll",
"flag": "0"
},
{
@@ -77,7 +77,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "FourIsland_LoreleisHouse_EventScript_171C8D",
+ "script": "FourIsland_LoreleisHouse_EventScript_Doll",
"flag": "0"
},
{
@@ -90,7 +90,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "FourIsland_LoreleisHouse_EventScript_171C8D",
+ "script": "FourIsland_LoreleisHouse_EventScript_Doll",
"flag": "0"
},
{
@@ -103,7 +103,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "FourIsland_LoreleisHouse_EventScript_171C8D",
+ "script": "FourIsland_LoreleisHouse_EventScript_Doll",
"flag": "0"
},
{
@@ -116,7 +116,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "FourIsland_LoreleisHouse_EventScript_171C8D",
+ "script": "FourIsland_LoreleisHouse_EventScript_Doll",
"flag": "FLAG_HIDE_LORELEI_HOUSE_MEOWTH_DOLL"
},
{
@@ -129,7 +129,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "FourIsland_LoreleisHouse_EventScript_171C8D",
+ "script": "FourIsland_LoreleisHouse_EventScript_Doll",
"flag": "FLAG_HIDE_LORELEI_HOUSE_CHANSEY_DOLL"
},
{
@@ -142,7 +142,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "FourIsland_LoreleisHouse_EventScript_171C8D",
+ "script": "FourIsland_LoreleisHouse_EventScript_Doll",
"flag": "FLAG_HIDE_LORELEI_HOUSE_JIGGLYPUFF_DOLL"
},
{
@@ -155,7 +155,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "FourIsland_LoreleisHouse_EventScript_171C8D",
+ "script": "FourIsland_LoreleisHouse_EventScript_Doll",
"flag": "FLAG_HIDE_LORELEIS_HOUSE_NIDORAN_F_DOLL"
},
{
@@ -168,7 +168,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "FourIsland_LoreleisHouse_EventScript_171C8D",
+ "script": "FourIsland_LoreleisHouse_EventScript_Doll",
"flag": "FLAG_HIDE_LORELEIS_HOUSE_NIDORAN_M_DOLL"
},
{
@@ -181,7 +181,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "FourIsland_LoreleisHouse_EventScript_171C8D",
+ "script": "FourIsland_LoreleisHouse_EventScript_Doll",
"flag": "FLAG_HIDE_LORELEIS_HOUSE_PIDGEOT_DOLL"
},
{
@@ -194,7 +194,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "FourIsland_LoreleisHouse_EventScript_171C8D",
+ "script": "FourIsland_LoreleisHouse_EventScript_Doll",
"flag": "FLAG_HIDE_LORELEIS_HOUSE_FEAROW_DOLL"
},
{
@@ -207,7 +207,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "FourIsland_LoreleisHouse_EventScript_171C8D",
+ "script": "FourIsland_LoreleisHouse_EventScript_Doll",
"flag": "FLAG_HIDE_LORELEIS_HOUSE_LAPRAS_DOLL"
}
],
diff --git a/data/maps/FourIsland_LoreleisHouse/scripts.inc b/data/maps/FourIsland_LoreleisHouse/scripts.inc
index c39cc1da9..6259870e6 100644
--- a/data/maps/FourIsland_LoreleisHouse/scripts.inc
+++ b/data/maps/FourIsland_LoreleisHouse/scripts.inc
@@ -6,28 +6,28 @@ FourIsland_LoreleisHouse_OnTransition:: @ 8171C54
special Special_ComputeLoreleiDollCollection
end
-FourIsland_LoreleisHouse_EventScript_171C58:: @ 8171C58
+FourIsland_LoreleisHouse_EventScript_Lorelei:: @ 8171C58
lock
faceplayer
- goto_if_set FLAG_TALKED_TO_LORELEI_AFTER_WAREHOUSE, EventScript_171C83
- goto_if_set FLAG_DEFEATED_ROCKETS_IN_WAREHOUSE, EventScript_171C76
- msgbox gUnknown_81A3826
+ goto_if_set FLAG_TALKED_TO_LORELEI_AFTER_WAREHOUSE, FourIsland_LoreleisHouse_EventScript_Lorelei3
+ goto_if_set FLAG_DEFEATED_ROCKETS_IN_WAREHOUSE, FourIsland_LoreleisHouse_EventScript_Lorelei2
+ msgbox FourIsland_LoreleisHouse_Text_IfAnythingWereToHappenToIsland
release
end
-EventScript_171C76:: @ 8171C76
+FourIsland_LoreleisHouse_EventScript_Lorelei2:: @ 8171C76
setflag FLAG_TALKED_TO_LORELEI_AFTER_WAREHOUSE
- msgbox gUnknown_81A390C
+ msgbox FourIsland_LoreleisHouse_Text_IllReturnToLeagueInShortWhile
release
end
-EventScript_171C83:: @ 8171C83
- msgbox gUnknown_81A39D8
+FourIsland_LoreleisHouse_EventScript_Lorelei3:: @ 8171C83
+ msgbox FourIsland_LoreleisHouse_Text_WillDoWhatICanHereAndNow
release
end
-FourIsland_LoreleisHouse_EventScript_171C8D:: @ 8171C8D
+FourIsland_LoreleisHouse_EventScript_Doll:: @ 8171C8D
lock
- msgbox gUnknown_81A3A42
+ msgbox FourIsland_LoreleisHouse_Text_StuffedMonDollsGalore
release
end
diff --git a/data/maps/FourIsland_LoreleisHouse/text.inc b/data/maps/FourIsland_LoreleisHouse/text.inc
index 5c7d0cd81..b332cd50e 100644
--- a/data/maps/FourIsland_LoreleisHouse/text.inc
+++ b/data/maps/FourIsland_LoreleisHouse/text.inc
@@ -1,4 +1,4 @@
-gUnknown_81A3826:: @ 81A3826
+FourIsland_LoreleisHouse_Text_IfAnythingWereToHappenToIsland:: @ 81A3826
.string "LORELEI: There's something weighing\n"
.string "heavily on my mind.\p"
.string "If anything were to happen on\n"
@@ -8,7 +8,7 @@ gUnknown_81A3826:: @ 81A3826
.string "I wonder if that would make me\n"
.string "irresponsible to my home…$"
-gUnknown_81A390C:: @ 81A390C
+FourIsland_LoreleisHouse_Text_IllReturnToLeagueInShortWhile:: @ 81A390C
.string "LORELEI: So, you managed to solve\n"
.string "all the problems here?\p"
.string "That's wonderful.\p"
@@ -18,12 +18,12 @@ gUnknown_81A390C:: @ 81A390C
.string "I'll return to the POKéMON LEAGUE\n"
.string "in a short while.$"
-gUnknown_81A39D8:: @ 81A39D8
+FourIsland_LoreleisHouse_Text_WillDoWhatICanHereAndNow:: @ 81A39D8
.string "I don't know what will happen in\n"
.string "the future, but…\p"
.string "I will do what I can here and now.\n"
.string "That's all I can do.$"
-gUnknown_81A3A42:: @ 81A3A42
+FourIsland_LoreleisHouse_Text_StuffedMonDollsGalore:: @ 81A3A42
.string "Stuffed POKéMON dolls galore!$"
diff --git a/data/maps/FourIsland_Mart/map.json b/data/maps/FourIsland_Mart/map.json
index f5820fef9..5543c8c50 100644
--- a/data/maps/FourIsland_Mart/map.json
+++ b/data/maps/FourIsland_Mart/map.json
@@ -25,7 +25,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "FourIsland_Mart_EventScript_171CAE",
+ "script": "FourIsland_Mart_EventScript_Clerk",
"flag": "0"
},
{
@@ -38,7 +38,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "FourIsland_Mart_EventScript_1ACF46",
+ "script": "FourIsland_Mart_EventScript_OldMan",
"flag": "0"
},
{
@@ -51,7 +51,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "FourIsland_Mart_EventScript_171CE8",
+ "script": "FourIsland_Mart_EventScript_Camper",
"flag": "0"
}
],
diff --git a/data/maps/FourIsland_Mart/scripts.inc b/data/maps/FourIsland_Mart/scripts.inc
index 5f85eaae4..36b3a0914 100644
--- a/data/maps/FourIsland_Mart/scripts.inc
+++ b/data/maps/FourIsland_Mart/scripts.inc
@@ -1,19 +1,19 @@
FourIsland_Mart_MapScripts:: @ 8171CAD
.byte 0
-FourIsland_Mart_EventScript_171CAE:: @ 8171CAE
+FourIsland_Mart_EventScript_Clerk:: @ 8171CAE
goto_if_questlog EventScript_ReleaseEnd
lock
faceplayer
message Text_MayIHelpYou
waitmessage
- pokemart Items_171CD4
+ pokemart FourIsland_Mart_Items
msgbox Text_PleaseComeAgain
release
end
.align 2
-Items_171CD4:: @ 8171CD4
+FourIsland_Mart_Items:: @ 8171CD4
.2byte ITEM_ULTRA_BALL
.2byte ITEM_FULL_RESTORE
.2byte ITEM_MAX_POTION
@@ -26,6 +26,6 @@ Items_171CD4:: @ 8171CD4
release
end
-FourIsland_Mart_EventScript_171CE8:: @ 8171CE8
- msgbox gUnknown_81A3B14, MSGBOX_NPC
+FourIsland_Mart_EventScript_Camper:: @ 8171CE8
+ msgbox FourIsland_Mart_Text_IcefallCaveIsFrigid, MSGBOX_NPC
end
diff --git a/data/maps/FourIsland_Mart/text.inc b/data/maps/FourIsland_Mart/text.inc
index eba66dd37..afde0e79c 100644
--- a/data/maps/FourIsland_Mart/text.inc
+++ b/data/maps/FourIsland_Mart/text.inc
@@ -1,4 +1,4 @@
-Text_1A3A60:: @ 81A3A60
+FourIsland_Mart_Text_LoreleiGrewUpOnThisIsland:: @ 81A3A60
.string "We've had a great and powerful\n"
.string "TRAINER grow up on this island.\p"
.string "I bet even you'd know her.\n"
@@ -6,7 +6,7 @@ Text_1A3A60:: @ 81A3A60
.string "When LORELEI was just a tyke,\n"
.string "I taught her about POKéMON.$"
-gUnknown_81A3B14:: @ 81A3B14
+FourIsland_Mart_Text_IcefallCaveIsFrigid:: @ 81A3B14
.string "The SEVII ISLANDS are in a warm\n"
.string "region overall.\p"
.string "But there is one exception you\n"
diff --git a/data/maps/FourIsland_PokemonCenter_1F/map.json b/data/maps/FourIsland_PokemonCenter_1F/map.json
index a8bf5fa97..7757c904e 100644
--- a/data/maps/FourIsland_PokemonCenter_1F/map.json
+++ b/data/maps/FourIsland_PokemonCenter_1F/map.json
@@ -25,7 +25,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "FourIsland_PokemonCenter_1F_EventScript_171BF9",
+ "script": "FourIsland_PokemonCenter_1F_EventScript_Nurse",
"flag": "0"
},
{
@@ -38,7 +38,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "FourIsland_PokemonCenter_1F_EventScript_171C02",
+ "script": "FourIsland_PokemonCenter_1F_EventScript_Man",
"flag": "0"
},
{
@@ -51,7 +51,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "FourIsland_PokemonCenter_1F_EventScript_171C0B",
+ "script": "FourIsland_PokemonCenter_1F_EventScript_Woman",
"flag": "0"
},
{
@@ -64,7 +64,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "FourIsland_PokemonCenter_1F_EventScript_171C14",
+ "script": "FourIsland_PokemonCenter_1F_EventScript_Gentleman",
"flag": "0"
}
],
@@ -91,14 +91,14 @@
"x": 3,
"y": 1,
"elevation": 0,
- "script": "FourIsland_PokemonCenter_1F_EventScript_1ACDD0"
+ "script": "FourIsland_PokemonCenter_1F_EventScript_PokemonJournal"
},
{
"type": "bg_event_type_1",
"x": 2,
"y": 1,
"elevation": 0,
- "script": "FourIsland_PokemonCenter_1F_EventScript_1ACDD0"
+ "script": "FourIsland_PokemonCenter_1F_EventScript_PokemonJournal"
}
]
}
diff --git a/data/maps/FourIsland_PokemonCenter_1F/scripts.inc b/data/maps/FourIsland_PokemonCenter_1F/scripts.inc
index 4ee8e33c1..afb0c7582 100644
--- a/data/maps/FourIsland_PokemonCenter_1F/scripts.inc
+++ b/data/maps/FourIsland_PokemonCenter_1F/scripts.inc
@@ -7,21 +7,21 @@ FourIsland_PokemonCenter_1F_OnTransition:: @ 8171BF5
setrespawn SPAWN_FOUR_ISLAND
end
-FourIsland_PokemonCenter_1F_EventScript_171BF9:: @ 8171BF9
+FourIsland_PokemonCenter_1F_EventScript_Nurse:: @ 8171BF9
lock
faceplayer
call EventScript_PkmnCenterNurse
release
end
-FourIsland_PokemonCenter_1F_EventScript_171C02:: @ 8171C02
- msgbox gUnknown_81A3627, MSGBOX_NPC
+FourIsland_PokemonCenter_1F_EventScript_Man:: @ 8171C02
+ msgbox FourIsland_PokemonCenter_1F_Text_RareIceMonsInCave, MSGBOX_NPC
end
-FourIsland_PokemonCenter_1F_EventScript_171C0B:: @ 8171C0B
- msgbox gUnknown_81A3697, MSGBOX_NPC
+FourIsland_PokemonCenter_1F_EventScript_Woman:: @ 8171C0B
+ msgbox FourIsland_PokemonCenter_1F_Text_DayCarePeopleFoundEggBefore, MSGBOX_NPC
end
-FourIsland_PokemonCenter_1F_EventScript_171C14:: @ 8171C14
- msgbox gUnknown_81A3734, MSGBOX_NPC
+FourIsland_PokemonCenter_1F_EventScript_Gentleman:: @ 8171C14
+ msgbox FourIsland_PokemonCenter_1F_Text_NewPokemonJournalHasntArrived, MSGBOX_NPC
end
diff --git a/data/maps/FourIsland_PokemonCenter_1F/text.inc b/data/maps/FourIsland_PokemonCenter_1F/text.inc
index 954aabd96..43e6cacf6 100644
--- a/data/maps/FourIsland_PokemonCenter_1F/text.inc
+++ b/data/maps/FourIsland_PokemonCenter_1F/text.inc
@@ -1,3 +1,4 @@
+@ The 5 texts below are supposed to be in FourIsland_House1
Text_BodySlamTeach:: @ 81A3505
.string "Ready?\n"
.string "Boing!\p"
@@ -19,17 +20,17 @@ Text_BodySlamWhichMon:: @ 81A35DA
Text_BodySlamTaught:: @ 81A3609
.string "Boioing!$"
-Text_1A3612:: @ 81A3612
+FourIsland_House1_Text_FatMan:: @ 81A3612
.string "それ　ぼよーん！\n"
.string "おまえ　おもいなあー！$"
-gUnknown_81A3627:: @ 81A3627
+FourIsland_PokemonCenter_1F_Text_RareIceMonsInCave:: @ 81A3627
.string "There's a rare kind of ICE POKéMON\n"
.string "that lives in the cave.\p"
.string "We get a lot of visitors hoping to\n"
.string "see that POKéMON.$"
-gUnknown_81A3697:: @ 81A3697
+FourIsland_PokemonCenter_1F_Text_DayCarePeopleFoundEggBefore:: @ 81A3697
.string "Oh? A POKéMON EGG?\n"
.string "…I have no idea.\p"
.string "…Oh, wait. The DAY-CARE people\n"
@@ -37,7 +38,7 @@ gUnknown_81A3697:: @ 81A3697
.string "They said that they'd found EGGS\n"
.string "before on their property.$"
-gUnknown_81A3734:: @ 81A3734
+FourIsland_PokemonCenter_1F_Text_NewPokemonJournalHasntArrived:: @ 81A3734
.string "What's this?\p"
.string "The new POKéMON JOURNAL hasn't\n"
.string "arrived on this island?$"
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-13 23:31:06 +0000