summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--data/text/quest_log.inc68
-rw-r--r--src/quest_log.c334
2 files changed, 201 insertions, 201 deletions
diff --git a/data/text/quest_log.inc b/data/text/quest_log.inc
index 62315aed3..7a605b239 100644
--- a/data/text/quest_log.inc
+++ b/data/text/quest_log.inc
@@ -378,104 +378,104 @@ gUnknown_841B073:: @ 841B073
.string "And {PLAYER} saved the game at this\n"
.string "location: {STR_VAR_1}.$"
-gUnknown_841B09F:: @ 841B09F
+gQuestLogString_Home:: @ 841B09F
.string "HOME$"
-gUnknown_841B0A4:: @ 841B0A4
+gQuestLogString_OakResearchLab:: @ 841B0A4
.string "OAK RESEARCH LAB$"
-gUnknown_841B0B5:: @ 841B0B5
+gQuestLogString_Gym:: @ 841B0B5
.string "GYM$"
-gUnknown_841B0B9:: @ 841B0B9
+gQuestLogString_PokemonLeagueGate:: @ 841B0B9
.string "POKéMON LEAGUE GATE$"
-gUnknown_841B0CD:: @ 841B0CD
+gQuestLogString_ViridianForest:: @ 841B0CD
.string "VIRIDIAN FOREST$"
-gUnknown_841B0DD:: @ 841B0DD
+gQuestLogString_PewterMuseumOfScience:: @ 841B0DD
.string "PEWTER MUSEUM OF SCIENCE$"
-gUnknown_841B0F6:: @ 841B0F6
+gQuestLogString_MtMoon:: @ 841B0F6
.string "MT. MOON$"
-gUnknown_841B0FF:: @ 841B0FF
+gQuestLogString_BikeShop:: @ 841B0FF
.string "BIKE SHOP$"
-gUnknown_841B109:: @ 841B109
+gQuestLogString_BillSHouse:: @ 841B109
.string "BILL'S HOUSE$"
-gUnknown_841B116:: @ 841B116
+gQuestLogString_DayCare:: @ 841B116
.string "DAY CARE$"
-gUnknown_841B11F:: @ 841B11F
+gQuestLogString_UndergroundPath:: @ 841B11F
.string "UNDERGROUND PATH$"
-gUnknown_841B130:: @ 841B130
+gQuestLogString_PokemonFanClub:: @ 841B130
.string "POKéMON FAN CLUB$"
-gUnknown_841B141:: @ 841B141
+gQuestLogString_SSAnne:: @ 841B141
.string "S.S. ANNE$"
-gUnknown_841B14B:: @ 841B14B
+gQuestLogString_DiglettSCave:: @ 841B14B
.string "DIGLETT'S CAVE$"
-gUnknown_841B15A:: @ 841B15A
+gQuestLogString_RockTunnel:: @ 841B15A
.string "ROCK TUNNEL$"
-gUnknown_841B166:: @ 841B166
+gQuestLogString_PowerPlant:: @ 841B166
.string "POWER PLANT$"
-gUnknown_841B172:: @ 841B172
+gQuestLogString_PokemonTower:: @ 841B172
.string "POKéMON TOWER$"
-gUnknown_841B180:: @ 841B180
+gQuestLogString_VolunteerHouse:: @ 841B180
.string "VOLUNTEER HOUSE$"
-gUnknown_841B190:: @ 841B190
+gQuestLogString_NameRaterSHouse:: @ 841B190
.string "NAME RATER'S HOUSE$"
-gUnknown_841B1A3:: @ 841B1A3
+gQuestLogString_CeladonDeptStore:: @ 841B1A3
.string "CELADON DEPT. STORE$"
-gUnknown_841B1B7:: @ 841B1B7
+gQuestLogString_CeladonMansion:: @ 841B1B7
.string "CELADON MANSION$"
-gUnknown_841B1C7:: @ 841B1C7
+gQuestLogString_RocketGameCorner:: @ 841B1C7
.string "ROCKET GAME CORNER$"
-gUnknown_841B1DA:: @ 841B1DA
+gQuestLogString_Restaurant:: @ 841B1DA
.string "RESTAURANT$"
-gUnknown_841B1E5:: @ 841B1E5
+gQuestLogString_RocketHideout:: @ 841B1E5
.string "ROCKET HIDEOUT$"
-gUnknown_841B1F4:: @ 841B1F4
+gQuestLogString_SafariZone:: @ 841B1F4
.string "SAFARI ZONE$"
-gUnknown_841B200:: @ 841B200
+gQuestLogString_WardenSHome:: @ 841B200
.string "WARDEN'S HOME$"
-gUnknown_841B20E:: @ 841B20E
+gQuestLogString_FightingDojo:: @ 841B20E
.string "FIGHTING DOJO$"
-gUnknown_841B21C:: @ 841B21C
+gQuestLogString_SilphCo:: @ 841B21C
.string "SILPH CO.$"
-gUnknown_841B226:: @ 841B226
+gQuestLogString_SeafoamIslands:: @ 841B226
.string "SEAFOAM ISLANDS$"
-gUnknown_841B236:: @ 841B236
+gQuestLogString_PokemonMansion:: @ 841B236
.string "POKéMON MANSION$"
-gUnknown_841B246:: @ 841B246
+gQuestLogString_PokemonResearchLab:: @ 841B246
.string "POKéMON RESEARCH LAB$"
-gUnknown_841B25B:: @ 841B25B
+gQuestLogString_VictoryRoad:: @ 841B25B
.string "VICTORY ROAD$"
-gUnknown_841B268:: @ 841B268
+gQuestLogString_PokemonLeague:: @ 841B268
.string "POKéMON LEAGUE$"
-gUnknown_841B277:: @ 841B277
+gQuestLogString_CeruleanCave:: @ 841B277
.string "CERULEAN CAVE$"
diff --git a/src/quest_log.c b/src/quest_log.c
index b37e54071..8762d8e60 100644
--- a/src/quest_log.c
+++ b/src/quest_log.c
@@ -364,40 +364,40 @@ extern const u8 gUnknown_841B005[];
extern const u8 gUnknown_841B03F[];
extern const u8 gUnknown_841B064[];
extern const u8 gUnknown_841B073[];
-extern const u8 gUnknown_841B09F[];
-extern const u8 gUnknown_841B0A4[];
-extern const u8 gUnknown_841B0B5[];
-extern const u8 gUnknown_841B0B9[];
-extern const u8 gUnknown_841B0CD[];
-extern const u8 gUnknown_841B0DD[];
-extern const u8 gUnknown_841B0F6[];
-extern const u8 gUnknown_841B0FF[];
-extern const u8 gUnknown_841B109[];
-extern const u8 gUnknown_841B116[];
-extern const u8 gUnknown_841B11F[];
-extern const u8 gUnknown_841B130[];
-extern const u8 gUnknown_841B141[];
-extern const u8 gUnknown_841B14B[];
-extern const u8 gUnknown_841B15A[];
-extern const u8 gUnknown_841B166[];
-extern const u8 gUnknown_841B172[];
-extern const u8 gUnknown_841B180[];
-extern const u8 gUnknown_841B190[];
-extern const u8 gUnknown_841B1A3[];
-extern const u8 gUnknown_841B1B7[];
-extern const u8 gUnknown_841B1C7[];
-extern const u8 gUnknown_841B1DA[];
-extern const u8 gUnknown_841B1E5[];
-extern const u8 gUnknown_841B1F4[];
-extern const u8 gUnknown_841B200[];
-extern const u8 gUnknown_841B20E[];
-extern const u8 gUnknown_841B21C[];
-extern const u8 gUnknown_841B226[];
-extern const u8 gUnknown_841B236[];
-extern const u8 gUnknown_841B246[];
-extern const u8 gUnknown_841B25B[];
-extern const u8 gUnknown_841B268[];
-extern const u8 gUnknown_841B277[];
+extern const u8 gQuestLogString_Home[];
+extern const u8 gQuestLogString_OakResearchLab[];
+extern const u8 gQuestLogString_Gym[];
+extern const u8 gQuestLogString_PokemonLeagueGate[];
+extern const u8 gQuestLogString_ViridianForest[];
+extern const u8 gQuestLogString_PewterMuseumOfScience[];
+extern const u8 gQuestLogString_MtMoon[];
+extern const u8 gQuestLogString_BikeShop[];
+extern const u8 gQuestLogString_BillSHouse[];
+extern const u8 gQuestLogString_DayCare[];
+extern const u8 gQuestLogString_UndergroundPath[];
+extern const u8 gQuestLogString_PokemonFanClub[];
+extern const u8 gQuestLogString_SSAnne[];
+extern const u8 gQuestLogString_DiglettSCave[];
+extern const u8 gQuestLogString_RockTunnel[];
+extern const u8 gQuestLogString_PowerPlant[];
+extern const u8 gQuestLogString_PokemonTower[];
+extern const u8 gQuestLogString_VolunteerHouse[];
+extern const u8 gQuestLogString_NameRaterSHouse[];
+extern const u8 gQuestLogString_CeladonDeptStore[];
+extern const u8 gQuestLogString_CeladonMansion[];
+extern const u8 gQuestLogString_RocketGameCorner[];
+extern const u8 gQuestLogString_Restaurant[];
+extern const u8 gQuestLogString_RocketHideout[];
+extern const u8 gQuestLogString_SafariZone[];
+extern const u8 gQuestLogString_WardenSHome[];
+extern const u8 gQuestLogString_FightingDojo[];
+extern const u8 gQuestLogString_SilphCo[];
+extern const u8 gQuestLogString_SeafoamIslands[];
+extern const u8 gQuestLogString_PokemonMansion[];
+extern const u8 gQuestLogString_PokemonResearchLab[];
+extern const u8 gQuestLogString_VictoryRoad[];
+extern const u8 gQuestLogString_PokemonLeague[];
+extern const u8 gQuestLogString_CeruleanCave[];
extern const u8 gUnknown_8418C1B[];
@@ -4544,150 +4544,150 @@ static const u16 * sub_81151DC(const u16 * a0)
}
static const u8 *const gUnknown_8456AF0[] = {
- gUnknown_841B09F,
- gUnknown_841B0A4,
- gUnknown_841B0B5,
- gUnknown_841B0B9,
- gUnknown_841B0B9,
- gUnknown_841B0CD,
- gUnknown_841B0CD,
- gUnknown_841B0DD,
- gUnknown_841B0B5,
- gUnknown_841B0F6,
- gUnknown_841B0F6,
- gUnknown_841B0B5,
- gUnknown_841B0FF,
- gUnknown_841B109,
- gUnknown_841B116,
- gUnknown_841B11F,
- gUnknown_841B11F,
- gUnknown_841B130,
- gUnknown_841B0B5,
- gUnknown_841B141,
- gUnknown_841B14B,
- gUnknown_841B14B,
- gUnknown_841B15A,
- gUnknown_841B15A,
- gUnknown_841B166,
- gUnknown_841B172,
- gUnknown_841B180,
- gUnknown_841B190,
- gUnknown_841B11F,
- gUnknown_841B11F,
- gUnknown_841B1A3,
- gUnknown_841B1B7,
- gUnknown_841B1C7,
- gUnknown_841B0B5,
- gUnknown_841B1DA,
- gUnknown_841B1E5,
- gUnknown_841B1F4,
- gUnknown_841B0B5,
- gUnknown_841B200,
- gUnknown_841B20E,
- gUnknown_841B0B5,
- gUnknown_841B21C,
- gUnknown_841B226,
- gUnknown_841B226,
- gUnknown_841B236,
- gUnknown_841B0B5,
- gUnknown_841B246,
- gUnknown_841B25B,
- gUnknown_841B25B,
- gUnknown_841B268,
- gUnknown_841B277
+ gQuestLogString_Home,
+ gQuestLogString_OakResearchLab,
+ gQuestLogString_Gym,
+ gQuestLogString_PokemonLeagueGate,
+ gQuestLogString_PokemonLeagueGate,
+ gQuestLogString_ViridianForest,
+ gQuestLogString_ViridianForest,
+ gQuestLogString_PewterMuseumOfScience,
+ gQuestLogString_Gym,
+ gQuestLogString_MtMoon,
+ gQuestLogString_MtMoon,
+ gQuestLogString_Gym,
+ gQuestLogString_BikeShop,
+ gQuestLogString_BillSHouse,
+ gQuestLogString_DayCare,
+ gQuestLogString_UndergroundPath,
+ gQuestLogString_UndergroundPath,
+ gQuestLogString_PokemonFanClub,
+ gQuestLogString_Gym,
+ gQuestLogString_SSAnne,
+ gQuestLogString_DiglettSCave,
+ gQuestLogString_DiglettSCave,
+ gQuestLogString_RockTunnel,
+ gQuestLogString_RockTunnel,
+ gQuestLogString_PowerPlant,
+ gQuestLogString_PokemonTower,
+ gQuestLogString_VolunteerHouse,
+ gQuestLogString_NameRaterSHouse,
+ gQuestLogString_UndergroundPath,
+ gQuestLogString_UndergroundPath,
+ gQuestLogString_CeladonDeptStore,
+ gQuestLogString_CeladonMansion,
+ gQuestLogString_RocketGameCorner,
+ gQuestLogString_Gym,
+ gQuestLogString_Restaurant,
+ gQuestLogString_RocketHideout,
+ gQuestLogString_SafariZone,
+ gQuestLogString_Gym,
+ gQuestLogString_WardenSHome,
+ gQuestLogString_FightingDojo,
+ gQuestLogString_Gym,
+ gQuestLogString_SilphCo,
+ gQuestLogString_SeafoamIslands,
+ gQuestLogString_SeafoamIslands,
+ gQuestLogString_PokemonMansion,
+ gQuestLogString_Gym,
+ gQuestLogString_PokemonResearchLab,
+ gQuestLogString_VictoryRoad,
+ gQuestLogString_VictoryRoad,
+ gQuestLogString_PokemonLeague,
+ gQuestLogString_CeruleanCave
};
static const u8 *const gUnknown_8456BBC[] = {
- gUnknown_841A53A,
- gUnknown_841AD9E,
- gUnknown_841ADC8,
- gUnknown_841ADFF,
- gUnknown_841AE1E,
- gUnknown_841AE48,
- gUnknown_841AEA7,
- gUnknown_841AEDC,
- gUnknown_841AFD6,
- gUnknown_841B005
+ gUnknown_841A53A,
+ gUnknown_841AD9E,
+ gUnknown_841ADC8,
+ gUnknown_841ADFF,
+ gUnknown_841AE1E,
+ gUnknown_841AE48,
+ gUnknown_841AEA7,
+ gUnknown_841AEDC,
+ gUnknown_841AFD6,
+ gUnknown_841B005
};
static const u8 gUnknown_8456BE4[] = {
- 0x03,
- 0x04,
- 0x05,
- 0x08,
- 0x08,
- 0x07,
- 0x07,
- 0x01,
- 0x05,
- 0x07,
- 0x07,
- 0x05,
- 0x00,
- 0x00,
- 0x00,
- 0x08,
- 0x08,
- 0x00,
- 0x05,
- 0x08,
- 0x07,
- 0x07,
- 0x07,
- 0x07,
- 0x08,
- 0x08,
- 0x00,
- 0x00,
- 0x08,
- 0x08,
- 0x00,
- 0x00,
- 0x02,
- 0x05,
- 0x00,
- 0x08,
- 0x06,
- 0x05,
- 0x00,
- 0x00,
- 0x05,
- 0x09,
- 0x07,
- 0x07,
- 0x09,
- 0x05,
- 0x00,
- 0x07,
- 0x07,
- 0x08,
- 0x07
+ 0x03,
+ 0x04,
+ 0x05,
+ 0x08,
+ 0x08,
+ 0x07,
+ 0x07,
+ 0x01,
+ 0x05,
+ 0x07,
+ 0x07,
+ 0x05,
+ 0x00,
+ 0x00,
+ 0x00,
+ 0x08,
+ 0x08,
+ 0x00,
+ 0x05,
+ 0x08,
+ 0x07,
+ 0x07,
+ 0x07,
+ 0x07,
+ 0x08,
+ 0x08,
+ 0x00,
+ 0x00,
+ 0x08,
+ 0x08,
+ 0x00,
+ 0x00,
+ 0x02,
+ 0x05,
+ 0x00,
+ 0x08,
+ 0x06,
+ 0x05,
+ 0x00,
+ 0x00,
+ 0x05,
+ 0x09,
+ 0x07,
+ 0x07,
+ 0x09,
+ 0x05,
+ 0x00,
+ 0x07,
+ 0x07,
+ 0x08,
+ 0x07
};
static const u8 gUnknown_8456C17[] = {
- 0x5a,
- 0x5b,
- 0x5d,
- 0x5e,
- 0x5f,
- 0x62,
- 0x60,
- 0x59
+ 0x5a,
+ 0x5b,
+ 0x5d,
+ 0x5e,
+ 0x5f,
+ 0x62,
+ 0x60,
+ 0x59
};
static const u8 *const gUnknown_8456C20[] = {
- gUnknown_841AC51,
- gUnknown_841ABAB,
- gUnknown_841ABCD,
- gUnknown_841AC2A,
- gUnknown_841ABF9,
- gUnknown_841AC93,
- gUnknown_841ACBC,
- gUnknown_841AD69,
- gUnknown_841AD1D,
- gUnknown_841A90C,
- gUnknown_841A8E0,
- gUnknown_841AD3C
+ gUnknown_841AC51,
+ gUnknown_841ABAB,
+ gUnknown_841ABCD,
+ gUnknown_841AC2A,
+ gUnknown_841ABF9,
+ gUnknown_841AC93,
+ gUnknown_841ACBC,
+ gUnknown_841AD69,
+ gUnknown_841AD1D,
+ gUnknown_841A90C,
+ gUnknown_841A8E0,
+ gUnknown_841AD3C
};
static u16 * sub_8115280(u16 * a0, const u16 * a1)
@@ -4785,7 +4785,7 @@ static const u16 * sub_8115460(const u16 * a0)
if (r5[0] == 7)
{
if (r5[1] == 0x58)
- StringCopy(gStringVar3, gUnknown_841B09F);
+ StringCopy(gStringVar3, gQuestLogString_Home);
else
StringCopy(gStringVar3, gUnknown_8418C1B);
}