diff options
author | PikalaxALT <pikalaxalt@gmail.com> | 2018-11-08 14:20:36 -0500 |
---|---|---|
committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-11-08 14:20:36 -0500 |
commit | 3e418d7a7be44631f33d4e05bc54c495aa181ecb (patch) | |
tree | e59d50a8d536a10fc94b0b634ddd040253c02c9e | |
parent | 50709682c7b1db4a1fcdfcf8080910bde2f969a1 (diff) |
Finish disming quest_log strings
-rw-r--r-- | asm/quest_log.s | 62 | ||||
-rw-r--r-- | data/data_83FECCC.s | 439 | ||||
-rw-r--r-- | data/text/quest_log.inc | 481 | ||||
-rw-r--r-- | src/quest_log.c | 10 |
4 files changed, 527 insertions, 465 deletions
diff --git a/asm/quest_log.s b/asm/quest_log.s index be4e55ce8..cd3812b47 100644 --- a/asm/quest_log.s +++ b/asm/quest_log.s @@ -51,7 +51,7 @@ sub_8114188: @ 8114188 ldrh r0, [r4, 0x2] ldr r1, _081141C0 @ =gStringVar1 movs r2, 0 - bl QuestLog_AutoGetSpeciesname + bl QuestLog_AutoGetSpeciesName ldr r5, _081141C4 @ =gStringVar2 ldrh r0, [r4] bl ItemId_GetItem @@ -95,7 +95,7 @@ sub_81141E4: @ 81141E4 ldrh r0, [r4, 0x2] ldr r1, _0811421C @ =gStringVar1 movs r2, 0 - bl QuestLog_AutoGetSpeciesname + bl QuestLog_AutoGetSpeciesName ldr r5, _08114220 @ =gStringVar2 ldrh r0, [r4] bl ItemId_GetItem @@ -139,7 +139,7 @@ sub_8114240: @ 8114240 ldrh r0, [r4, 0x2] ldr r1, _08114278 @ =gStringVar2 movs r2, 0 - bl QuestLog_AutoGetSpeciesname + bl QuestLog_AutoGetSpeciesName ldr r5, _0811427C @ =gStringVar1 ldrh r0, [r4] bl ItemId_GetItem @@ -183,7 +183,7 @@ sub_811429C: @ 811429C ldrh r0, [r4, 0x2] ldr r1, _081142D4 @ =gStringVar1 movs r2, 0 - bl QuestLog_AutoGetSpeciesname + bl QuestLog_AutoGetSpeciesName ldr r5, _081142D8 @ =gStringVar2 ldrh r0, [r4] bl ItemId_GetItem @@ -253,7 +253,7 @@ sub_8114324: @ 8114324 ldrh r0, [r4, 0x4] ldr r1, _0811436C @ =gStringVar1 movs r2, 0 - bl QuestLog_AutoGetSpeciesname + bl QuestLog_AutoGetSpeciesName ldr r5, _08114370 @ =gStringVar2 ldrh r0, [r4] bl ItemId_GetItem @@ -304,7 +304,7 @@ sub_8114394: @ 8114394 ldrh r0, [r4, 0x4] ldr r1, _081143DC @ =gStringVar2 movs r2, 0 - bl QuestLog_AutoGetSpeciesname + bl QuestLog_AutoGetSpeciesName ldr r5, _081143E0 @ =gStringVar3 ldrh r0, [r4] bl ItemId_GetItem @@ -439,11 +439,11 @@ sub_811448C: @ 811448C ldrh r0, [r5, 0x6] ldr r1, _081144DC @ =gStringVar2 movs r2, 0 - bl QuestLog_AutoGetSpeciesname + bl QuestLog_AutoGetSpeciesName ldrh r0, [r5, 0x4] ldr r1, _081144E0 @ =gStringVar3 movs r2, 0 - bl QuestLog_AutoGetSpeciesname + bl QuestLog_AutoGetSpeciesName ldr r0, _081144E4 @ =gStringVar4 ldr r1, _081144E8 @ =gUnknown_841A3FF bl StringExpandPlaceholders @@ -813,11 +813,11 @@ sub_81147A8: @ 81147A8 ldrh r0, [r5, 0x6] ldr r1, _081147F8 @ =gStringVar2 movs r2, 0 - bl QuestLog_AutoGetSpeciesname + bl QuestLog_AutoGetSpeciesName ldrh r0, [r5, 0x4] ldr r1, _081147FC @ =gStringVar3 movs r2, 0 - bl QuestLog_AutoGetSpeciesname + bl QuestLog_AutoGetSpeciesName ldr r0, _08114800 @ =gStringVar4 ldr r1, _08114804 @ =gUnknown_841A76A bl StringExpandPlaceholders @@ -942,7 +942,7 @@ sub_81148BC: @ 81148BC ldrh r0, [r4] movs r1, 0 movs r2, 0x1 - bl QuestLog_AutoGetSpeciesname + bl QuestLog_AutoGetSpeciesName ldrb r0, [r5, 0x1] bl GetBoxNamePtr adds r1, r0, 0 @@ -951,7 +951,7 @@ sub_81148BC: @ 81148BC ldrh r0, [r4, 0x2] movs r1, 0 movs r2, 0x3 - bl QuestLog_AutoGetSpeciesname + bl QuestLog_AutoGetSpeciesName ldr r0, _08114910 @ =gStringVar4 ldr r1, _08114914 @ =gUnknown_841A566 bl UnkTextUtil_StringExpandPlaceholders @@ -1008,11 +1008,11 @@ sub_8114944: @ 8114944 ldrh r0, [r4] movs r1, 0 movs r2, 0x1 - bl QuestLog_AutoGetSpeciesname + bl QuestLog_AutoGetSpeciesName ldrh r0, [r4, 0x2] movs r1, 0 movs r2, 0x2 - bl QuestLog_AutoGetSpeciesname + bl QuestLog_AutoGetSpeciesName ldr r0, _08114988 @ =gStringVar4 ldr r1, _0811498C @ =gUnknown_841A5D9 bl UnkTextUtil_StringExpandPlaceholders @@ -1081,11 +1081,11 @@ sub_81149D0: @ 81149D0 ldrh r0, [r4] movs r1, 0 movs r2, 0x1 - bl QuestLog_AutoGetSpeciesname + bl QuestLog_AutoGetSpeciesName ldrh r0, [r4, 0x2] movs r1, 0 movs r2, 0x2 - bl QuestLog_AutoGetSpeciesname + bl QuestLog_AutoGetSpeciesName ldr r0, _08114A14 @ =gStringVar4 ldr r1, _08114A18 @ =gUnknown_841A60A bl UnkTextUtil_StringExpandPlaceholders @@ -1144,7 +1144,7 @@ sub_8114A4C: @ 8114A4C ldrh r0, [r4] movs r1, 0 movs r2, 0x1 - bl QuestLog_AutoGetSpeciesname + bl QuestLog_AutoGetSpeciesName ldrb r0, [r5, 0x1] bl GetBoxNamePtr adds r1, r0, 0 @@ -1205,7 +1205,7 @@ sub_8114AC8: @ 8114AC8 ldrh r0, [r4] movs r1, 0 movs r2, 0x1 - bl QuestLog_AutoGetSpeciesname + bl QuestLog_AutoGetSpeciesName ldr r0, _08114B04 @ =gStringVar4 ldr r1, _08114B08 @ =gUnknown_841A5FA bl UnkTextUtil_StringExpandPlaceholders @@ -1261,7 +1261,7 @@ sub_8114B34: @ 8114B34 ldrh r0, [r4] movs r1, 0 movs r2, 0x1 - bl QuestLog_AutoGetSpeciesname + bl QuestLog_AutoGetSpeciesName ldr r0, _08114B70 @ =gStringVar4 ldr r1, _08114B74 @ =gUnknown_841A632 bl UnkTextUtil_StringExpandPlaceholders @@ -1312,7 +1312,7 @@ sub_8114BA0: @ 8114BA0 ldrh r0, [r4] movs r1, 0 movs r2, 0 - bl QuestLog_AutoGetSpeciesname + bl QuestLog_AutoGetSpeciesName ldrb r0, [r4, 0x2] bl GetBoxNamePtr adds r1, r0, 0 @@ -1567,11 +1567,11 @@ sub_8114D68: @ 8114D68 ldrh r0, [r4] movs r1, 0 movs r2, 0x2 - bl QuestLog_AutoGetSpeciesname + bl QuestLog_AutoGetSpeciesName ldrh r0, [r4, 0x2] movs r1, 0 movs r2, 0x3 - bl QuestLog_AutoGetSpeciesname + bl QuestLog_AutoGetSpeciesName ldr r1, _08114DDC @ =gUnknown_8456ACC ldrb r0, [r6, 0x1] lsls r0, 2 @@ -1697,7 +1697,7 @@ _08114E84: ldrh r0, [r5, 0x4] movs r1, 0 movs r2, 0x1 - bl QuestLog_AutoGetSpeciesname + bl QuestLog_AutoGetSpeciesName ldr r4, _08114F04 @ =gStringVar2 ldrb r1, [r5, 0x8] adds r0, r4, 0 @@ -1710,7 +1710,7 @@ _08114E84: ldrh r0, [r5, 0x6] movs r1, 0 movs r2, 0x3 - bl QuestLog_AutoGetSpeciesname + bl QuestLog_AutoGetSpeciesName ldr r4, _08114F08 @ =gStringVar3 ldrb r1, [r6, 0x1] adds r0, r4, 0 @@ -1886,11 +1886,11 @@ sub_811500C: @ 811500C ldrh r0, [r4] movs r1, 0 movs r2, 0x1 - bl QuestLog_AutoGetSpeciesname + bl QuestLog_AutoGetSpeciesName ldrh r0, [r4, 0x2] movs r1, 0 movs r2, 0x2 - bl QuestLog_AutoGetSpeciesname + bl QuestLog_AutoGetSpeciesName ldr r1, _0811506C @ =gUnknown_8456ACC ldrb r0, [r5, 0x1] lsls r0, 2 @@ -2023,7 +2023,7 @@ _08115148: ldrh r0, [r4, 0x4] movs r1, 0 movs r2, 0x1 - bl QuestLog_AutoGetSpeciesname + bl QuestLog_AutoGetSpeciesName ldr r0, _08115188 @ =gSaveBlock2Ptr ldr r1, [r0] movs r0, 0x2 @@ -2031,7 +2031,7 @@ _08115148: ldrh r0, [r4, 0x6] movs r1, 0 movs r2, 0x3 - bl QuestLog_AutoGetSpeciesname + bl QuestLog_AutoGetSpeciesName ldr r0, _0811518C @ =gStringVar4 ldr r1, _08115190 @ =gUnknown_841A312 bl UnkTextUtil_StringExpandPlaceholders @@ -2130,11 +2130,11 @@ _0811523E: ldrh r0, [r5] movs r1, 0 movs r2, 0x2 - bl QuestLog_AutoGetSpeciesname + bl QuestLog_AutoGetSpeciesName ldrh r0, [r5, 0x2] movs r1, 0 movs r2, 0x3 - bl QuestLog_AutoGetSpeciesname + bl QuestLog_AutoGetSpeciesName ldr r1, _08115274 @ =gUnknown_8456ACC ldrb r0, [r6, 0x1] lsls r0, 2 @@ -2420,7 +2420,7 @@ sub_8115460: @ 8115460 ldrh r0, [r4] ldr r1, _0811549C @ =gStringVar1 movs r2, 0 - bl QuestLog_AutoGetSpeciesname + bl QuestLog_AutoGetSpeciesName ldrb r0, [r5, 0x1] cmp r0, 0xFF beq _08115486 diff --git a/data/data_83FECCC.s b/data/data_83FECCC.s index da553d83e..bdcf0a201 100644 --- a/data/data_83FECCC.s +++ b/data/data_83FECCC.s @@ -1628,457 +1628,38 @@ gUnknown_8419F54:: @ 8419F54 .string "SAVING…\n" .string "DON’T TURN OFF THE POWER.$" -gUnknown_8419F76:: @ 8419F76 +// Start menu option descriptions +gUnknown_8419F76:: @ 8419F76 // Pokedex .string "A device that records POKéMON secrets\n" .string "upon meeting or catching them.$" -gUnknown_8419FBB:: @ 8419FBB +gUnknown_8419FBB:: @ 8419FBB // Pokemon .string "Check and organize POKéMON that are\n" .string "traveling with you in your party.$" -gUnknown_841A001:: @ 841A001 +gUnknown_841A001:: @ 841A001 // Bag .string "Equipped with pockets for storing items\n" .string "you bought, received, or found.$" -gUnknown_841A049:: @ 841A049 +gUnknown_841A049:: @ 841A049 // {PLAYER} .string "Check your money and other game data.$" -gUnknown_841A06F:: @ 841A06F +gUnknown_841A06F:: @ 841A06F // Save .string "Save your game with a complete record\n" .string "of your progress to take a break.$" -gUnknown_841A0B7:: @ 841A0B7 +gUnknown_841A0B7:: @ 841A0B7 // Options .string "Adjust various game settings such as text\n" .string "speed, game rules, etc.$" -gUnknown_841A0F9:: @ 841A0F9 +gUnknown_841A0F9:: @ 841A0F9 // Quit .string "Close this MENU window.$" -gUnknown_841A111:: @ 841A111 +gUnknown_841A111:: @ 841A111 // Retire .string "Retire from the SAFARI GAME and return to\n" .string "the registration counter.$" -gUnknown_841A155:: @ 841A155 - .string "Previously on your quest…$" - -gUnknown_841A16F:: @ 841A16F - .string "{PLAYER} switched the POKéMON\n{STR_VAR_1} with {STR_VAR_2}.$" - -gUnknown_841A193:: @ 841A193 - .string "Took the item {STR_VAR_2} from\n{STR_VAR_1} and gave it the item\n{STR_VAR_3} to hold.$" - -gUnknown_841A1CD:: @ 841A1CD - .string "Took the item {STR_VAR_2} from\n{STR_VAR_1}.$" - -gUnknown_841A1E7:: @ 841A1E7 - .string "Used the item {STR_VAR_1} on {STR_VAR_2}\nat this location.$" - -gUnknown_841A210:: @ 841A210 - .string "{PLAYER} used the\n{STR_VAR_1}.$" - -gUnknown_841A220:: @ 841A220 - .string "Used the item {STR_VAR_1}, which was\nin the KEY ITEMS POCKET.$" - -gUnknown_841A255:: @ 841A255 - .string "{STR_VAR_1} learned the move\n{STR_VAR_2} from a TM.$" - -gUnknown_841A277:: @ 841A277 - .string "{STR_VAR_1} learned the move\n{STR_VAR_2} from a TM and forgot\nthe move {STR_VAR_3}.$" - -gUnknown_841A2B0:: @ 841A2B0 - .string "POKéMON were fully restored\nat a POKéMON CENTER.$" - -gUnknown_841A2E1:: @ 841A2E1 - .string "{UNKNOWN_F7 0x00} had a marvelous battle\nwith the CHAMPION, {UNKNOWN_F7 0x01}.$" - -gUnknown_841A312:: @ 841A312 - .string "In the end, {UNKNOWN_F7 0x00} sent out {UNKNOWN_F7 0x01}\nwhile {UNKNOWN_F7 0x02} countered with\n{UNKNOWN_F7 0x03}.$" - -gUnknown_841A349:: @ 841A349 - .string "And, as a result of battling with every\nbit of power, {UNKNOWN_F7 0x00} won\nthe match.$" - -gUnknown_841A391:: @ 841A391 - .string "Removed the item {STR_VAR_1} from\nthe BAG’s ITEMS POCKET and stored it\non the PC.$" - -gUnknown_841A3DA:: @ 841A3DA - .string "{PLAYER} withdrew the item {STR_VAR_1}\nfrom the PC.$" - -gUnknown_841A3FF:: @ 841A3FF - .string "Traded {STR_VAR_3} in exchange for\n{STR_VAR_1}’s {STR_VAR_2}.$" - -gUnknown_841A422:: @ 841A422 - .string "Took on {UNKNOWN_F7 0x00} in a SINGLE BATTLE.\nIt was a hotly contested match that\nresulted in a {UNKNOWN_F7 0x01}.$" - -gUnknown_841A477:: @ 841A477 - .string "Took on {UNKNOWN_F7 0x00} in a DOUBLE BATTLE.\nIt was an extended match that resulted\nin a {UNKNOWN_F7 0x01}.$" - -gUnknown_841A4C6:: @ 841A4C6 - .string "{UNKNOWN_F7 0x00} and {UNKNOWN_F7 0x01} took on\n{UNKNOWN_F7 0x02} and {UNKNOWN_F7 0x03} in a\nMULTI BATTLE and got a {UNKNOWN_F7 0x04}.$" - -gUnknown_841A502:: - .string "win$" - -gUnknown_841A506:: - .string "loss$" - -gUnknown_841A50B:: @ 841A50B - .string "Mingled with other TRAINERS in\n" - .string "the UNION ROOM.$" - -gUnknown_841A53A:: - .string "Departed {STR_VAR_2}\n" - .string "in {STR_VAR_1} for the next\n" - .string "destination.$" - -gUnknown_841A566:: @ 841A566 - .string "After consideration, switched\n" - .string "{UNKNOWN_F7 0x01} in {UNKNOWN_F7 0x00} with\n" - .string "{UNKNOWN_F7 0x03} in {UNKNOWN_F7 0x02}.$" - -gUnknown_841A59C:: @ 841A59C - .string "After deep thought, switched\n" - .string "{UNKNOWN_F7 0x01} in BOX “{UNKNOWN_F7 0x00}” to\n" - .string "the BOX “{UNKNOWN_F7 0x02}.”$" - -gUnknown_841A5D9:: @ 841A5D9 - .string "Switched around {UNKNOWN_F7 0x01} and\n" - .string "{UNKNOWN_F7 0x02} in {UNKNOWN_F7 0x00}.$" - -gUnknown_841A5FA:: @ 841A5FA - .string "Moved {UNKNOWN_F7 0x01} in {UNKNOWN_F7 0x00}.$" - -gUnknown_841A60A:: @ 841A60A - .string "Switched {UNKNOWN_F7 0x01} in {UNKNOWN_F7 0x00}\n" - .string "with {UNKNOWN_F7 0x02} in the party.$" - -gUnknown_841A632:: @ 841A632 - .string "Added {UNKNOWN_F7 0x01} in {UNKNOWN_F7 0x00}\n" - .string "to the party.$" - -gUnknown_841A64F:: @ 841A64F - .string "Moved {UNKNOWN_F7 0x00} from the party\n" - .string "to {UNKNOWN_F7 0x01}.$" - -gUnknown_841A66E:: @ 841A66E - .string "Moved a group of POKéMON in\n" - .string "{UNKNOWN_F7 0x00} to {UNKNOWN_F7 0x01}.$" - -gUnknown_841A694:: @ 841A694 - .string "a different spot$" - -gUnknown_841A6A5:: @ 841A6A5 - .string "Removed the item {STR_VAR_1} from\n" - .string "{PLAYER}’s PC and gave it to {STR_VAR_2}\n" - .string "to hold.$" - -gUnknown_841A6E1:: @ 841A6E1 - .string "Removed the item {STR_VAR_1} from\n" - .string "a PC, gave it to {STR_VAR_2}, and put\n" - .string "the {STR_VAR_3} it held in the BAG.$" - -gUnknown_841A732:: @ 841A732 - .string "Chatted with many TRAINERS.$" - -gUnknown_841A74E:: - .string "handily$" - -gUnknown_841A756:: - .string "tenaciously$" - -gUnknown_841A762:: - .string "somehow$" - -gUnknown_841A76A:: @ 841A76A - .incbin "baserom.gba", 0x41A76A, 0x46 - -gUnknown_841A7B0:: @ 841A7B0 - .incbin "baserom.gba", 0x41A7B0, 0x2D - -gUnknown_841A7DD:: @ 841A7DD - .incbin "baserom.gba", 0x41A7DD, 0x33 - -gUnknown_841A810:: @ 841A810 - .incbin "baserom.gba", 0x41A810, 0x48 - -gUnknown_841A858:: @ 841A858 - .incbin "baserom.gba", 0x41A858, 0x3E - -gUnknown_841A896:: @ 841A896 - .incbin "baserom.gba", 0x41A896, 0x3E - -gUnknown_841A8D4:: @ 841A8D4 - .incbin "baserom.gba", 0x41A8D4, 0x9 - -gUnknown_841A8DD:: @ 841A8DD - .string "{UNKNOWN_F7 0x04}$" - -gUnknown_841A8E0:: @ 841A8E0 - .string "{STR_VAR_1} shared its HP using the move\n" - .string "SOFTBOILED.$" - -gUnknown_841A90C:: @ 841A90C - .string "{STR_VAR_1} shared its HP using the move\n" - .string "MILK DRINK.$" - -gUnknown_841A938:: @ 841A938 - .incbin "baserom.gba", 0x41A938, 0x2D - -gUnknown_841A965:: @ 841A965 - .incbin "baserom.gba", 0x41A965, 0x44 - -gUnknown_841A9A9:: @ 841A9A9 - .incbin "baserom.gba", 0x41A9A9, 0x2B - -gUnknown_841A9D4:: @ 841A9D4 - .incbin "baserom.gba", 0x41A9D4, 0x2D - -gUnknown_841AA01:: @ 841AA01 - .incbin "baserom.gba", 0x41AA01, 0x2A - -gUnknown_841AA2B:: @ 841AA2B - .incbin "baserom.gba", 0x41AA2B, 0x4B - -gUnknown_841AA76:: @ 841AA76 - .incbin "baserom.gba", 0x41AA76, 0x34 - -gUnknown_841AAAA:: @ 841AAAA - .incbin "baserom.gba", 0x41AAAA, 0x42 - -gUnknown_841AAEC:: @ 841AAEC - .incbin "baserom.gba", 0x41AAEC, 0x3D - -gUnknown_841AB29:: @ 841AB29 - .incbin "baserom.gba", 0x41AB29, 0x4B - -gUnknown_841AB74:: @ 841AB74 - .incbin "baserom.gba", 0x41AB74, 0x1A - -gUnknown_841AB8E:: @ 841AB8E - .string "{PLAYER} made {STR_VAR_1} hold the item\n" - .string "{STR_VAR_2}.$" - -gUnknown_841ABAB:: @ 841ABAB - .string "{STR_VAR_1} used the Hidden Move\n" - .string "CUT here.$" - -gUnknown_841ABCD:: @ 841ABCD - .string "{STR_VAR_1} used the Hidden Move\n" - .string "FLY and flew to {STR_VAR_2}.$" - -gUnknown_841ABF9:: @ 841ABF9 - .string "{STR_VAR_1} used the Hidden Move\n" - .string "SURF and rode the waves.$" - -gUnknown_841AC2A:: @ 841AC2A - .string "{STR_VAR_1} used the Hidden Move\n" - .string "STRENGTH here.$" - -gUnknown_841AC51:: @ 841AC51 - .string "{STR_VAR_1} used the Hidden Move\n" - .string "FLASH and illuminated a pitch-black\n" - .string "cave.$" - -gUnknown_841AC93:: @ 841AC93 - .string "{STR_VAR_1} used the Hidden Move\n" - .string "ROCK SMASH here.$" - -gUnknown_841ACBC:: @ 841ACBC - .string "{STR_VAR_1} used the Hidden Move\n" - .string "WATERFALL to scale a raging torrent.$" - -gUnknown_841ACF9:: @ 841ACF9 - .string "{STR_VAR_1}è êÉÁ Ñこª& òざÏ\n" - .string "éで+わざ\n" - .string "ダ¡ビング& ÚÉっŒ!$" - -gUnknown_841AD1D:: @ 841AD1D - .string "{STR_VAR_1} used DIG to escape from\n" - .string "{STR_VAR_2}.$" - -gUnknown_841AD3C:: @ 841AD3C - .string "{STR_VAR_1} used SWEET SCENT to attract\n" - .string "wild POKéMON.$" - -gUnknown_841AD69:: @ 841AD69 - .string "{STR_VAR_1} used TELEPORT, transporting\n" - .string "the party to {STR_VAR_2}’s\n" - .string "{STR_VAR_3}.$" - -gUnknown_841AD9E:: @ 841AD9E - .string "{PLAYER} left {STR_VAR_1}’s\n" - .string "{STR_VAR_2} for the next\n" - .string "destination.$" - -gUnknown_841ADC8:: @ 841ADC8 - .string "Played a lot of games at the ROCKET\n" - .string "GAME CORNER in {STR_VAR_1}.$" - -gUnknown_841ADFF:: @ 841ADFF - .string "{PLAYER} rested comfortably at home.$" - -gUnknown_841AE1E:: @ 841AE1E - .string "{PLAYER} left PROF. OAK’s POKéMON\n" - .string "RESEARCH LAB.$" - -gUnknown_841AE48:: @ 841AE48 - .string "The GYM in {STR_VAR_1} was full of\n" - .string "tough TRAINERS…\n" - .string "Preparations had to be made.$" - -gUnknown_841AE8F:: @ 841AE8F - .string "Departed the GYM in {STR_VAR_1}.$" - -gUnknown_841AEA7:: @ 841AEA7 - .string "{PLAYER} had a great time with POKéMON\n" - .string "in the SAFARI ZONE.$" - -gUnknown_841AEDC:: @ 841AEDC - .string "Managed to get out of {STR_VAR_2}\n" - .string "after wandering about.$" - -gUnknown_841AF0C:: @ 841AF0C - .incbin "baserom.gba", 0x41AF0C, 0x32 - -gUnknown_841AF3E:: @ 841AF3E - .incbin "baserom.gba", 0x41AF3E, 0x2F - -gUnknown_841AF6D:: @ 841AF6D - .incbin "baserom.gba", 0x41AF6D, 0x2B - -gUnknown_841AF98:: @ 841AF98 - .string "coolly$" - -gUnknown_841AF9F:: @ 841AF9F - .string "barely$" - -gUnknown_841AFA6:: @ 841AFA6 - .string "{PLAYER} used an ESCAPE ROPE to get\n" - .string "out from {STR_VAR_2}.$" - -gUnknown_841AFD1:: @ 841AFD1 - .string "draw$" - -gUnknown_841AFD6:: @ 841AFD6 - .string "Departed from the {STR_VAR_2}\n" - .string "for the next destination.$" - -gUnknown_841B005:: @ 841B005 - .string "{PLAYER} departed from\n" - .string "{STR_VAR_2} and made way\n" - .string "to the next destination.$" - -gUnknown_841B03F:: @ 841B03F - .string "Here in {STR_VAR_1}, {PLAYER}\n" - .string "obtained the item {STR_VAR_2}.$" - -gUnknown_841B064:: @ 841B064 - .string "Arrived in {STR_VAR_1}.$" - -gUnknown_841B073:: @ 841B073 - .string "And {PLAYER} saved the game at this\n" - .string "location: {STR_VAR_1}.$" - -gUnknown_841B09F:: @ 841B09F - .string "HOME$" - -gUnknown_841B0A4:: @ 841B0A4 - .string "OAK RESEARCH LAB$" - -gUnknown_841B0B5:: @ 841B0B5 - .string "GYM$" - -gUnknown_841B0B9:: @ 841B0B9 - .string "POKéMON LEAGUE GATE$" - -gUnknown_841B0CD:: @ 841B0CD - .string "VIRIDIAN FOREST$" - -gUnknown_841B0DD:: @ 841B0DD - .string "PEWTER MUSEUM OF SCIENCE$" - -gUnknown_841B0F6:: @ 841B0F6 - .string "MT. MOON$" - -gUnknown_841B0FF:: @ 841B0FF - .string "BIKE SHOP$" - -gUnknown_841B109:: @ 841B109 - .string "BILL’S HOUSE$" - -gUnknown_841B116:: @ 841B116 - .string "DAY CARE$" - -gUnknown_841B11F:: @ 841B11F - .string "UNDERGROUND PATH$" - -gUnknown_841B130:: @ 841B130 - .string "POKéMON FAN CLUB$" - -gUnknown_841B141:: @ 841B141 - .string "S.S. ANNE$" - -gUnknown_841B14B:: @ 841B14B - .string "DIGLETT’S CAVE$" - -gUnknown_841B15A:: @ 841B15A - .string "ROCK TUNNEL$" - -gUnknown_841B166:: @ 841B166 - .string "POWER PLANT$" - -gUnknown_841B172:: @ 841B172 - .string "POKéMON TOWER$" - -gUnknown_841B180:: @ 841B180 - .string "VOLUNTEER HOUSE$" - -gUnknown_841B190:: @ 841B190 - .string "NAME RATER’S HOUSE$" - -gUnknown_841B1A3:: @ 841B1A3 - .string "CELADON DEPT. STORE$" - -gUnknown_841B1B7:: @ 841B1B7 - .string "CELADON MANSION$" - -gUnknown_841B1C7:: @ 841B1C7 - .string "ROCKET GAME CORNER$" - -gUnknown_841B1DA:: @ 841B1DA - .string "RESTAURANT$" - -gUnknown_841B1E5:: @ 841B1E5 - .string "ROCKET HIDEOUT$" - -gUnknown_841B1F4:: @ 841B1F4 - .string "SAFARI ZONE$" - -gUnknown_841B200:: @ 841B200 - .string "WARDEN’S HOME$" - -gUnknown_841B20E:: @ 841B20E - .string "FIGHTING DOJO$" - -gUnknown_841B21C:: @ 841B21C - .string "SILPH CO.$" - -gUnknown_841B226:: @ 841B226 - .string "SEAFOAM ISLANDS$" - -gUnknown_841B236:: @ 841B236 - .string "POKéMON MANSION$" - -gUnknown_841B246:: @ 841B246 - .string "POKéMON RESEARCH LAB$" - -gUnknown_841B25B:: @ 841B25B - .string "VICTORY ROAD$" - -gUnknown_841B268:: @ 841B268 - .string "POKéMON LEAGUE$" - -gUnknown_841B277:: @ 841B277 - .string "CERULEAN CAVE$" + .include "data/text/quest_log.inc" gUnknown_841B285:: @ 841B285 .incbin "baserom.gba", 0x41B285, 0xE diff --git a/data/text/quest_log.inc b/data/text/quest_log.inc new file mode 100644 index 000000000..58c9cf66e --- /dev/null +++ b/data/text/quest_log.inc @@ -0,0 +1,481 @@ +gUnknown_841A155:: @ 841A155 + .string "Previously on your quest…$" + +gUnknown_841A16F:: @ 841A16F + .string "{PLAYER} switched the POKéMON\n" + .string "{STR_VAR_1} with {STR_VAR_2}.$" + +gUnknown_841A193:: @ 841A193 + .string "Took the item {STR_VAR_2} from\n" + .string "{STR_VAR_1} and gave it the item\n" + .string "{STR_VAR_3} to hold.$" + +gUnknown_841A1CD:: @ 841A1CD + .string "Took the item {STR_VAR_2} from\n" + .string "{STR_VAR_1}.$" + +gUnknown_841A1E7:: @ 841A1E7 + .string "Used the item {STR_VAR_1} on {STR_VAR_2}\n" + .string "at this location.$" + +gUnknown_841A210:: @ 841A210 + .string "{PLAYER} used the\n" + .string "{STR_VAR_1}.$" + +gUnknown_841A220:: @ 841A220 + .string "Used the item {STR_VAR_1}, which was\n" + .string "in the KEY ITEMS POCKET.$" + +gUnknown_841A255:: @ 841A255 + .string "{STR_VAR_1} learned the move\n" + .string "{STR_VAR_2} from a TM.$" + +gUnknown_841A277:: @ 841A277 + .string "{STR_VAR_1} learned the move\n" + .string "{STR_VAR_2} from a TM and forgot\n" + .string "the move {STR_VAR_3}.$" + +gUnknown_841A2B0:: @ 841A2B0 + .string "POKéMON were fully restored\n" + .string "at a POKéMON CENTER.$" + +gUnknown_841A2E1:: @ 841A2E1 + .string "{UNKNOWN_F7 0x00} had a marvelous battle\n" + .string "with the CHAMPION, {UNKNOWN_F7 0x01}.$" + +gUnknown_841A312:: @ 841A312 + .string "In the end, {UNKNOWN_F7 0x00} sent out {UNKNOWN_F7 0x01}\n" + .string "while {UNKNOWN_F7 0x02} countered with\n" + .string "{UNKNOWN_F7 0x03}.$" + +gUnknown_841A349:: @ 841A349 + .string "And, as a result of battling with every\n" + .string "bit of power, {UNKNOWN_F7 0x00} won\n" + .string "the match.$" + +gUnknown_841A391:: @ 841A391 + .string "Removed the item {STR_VAR_1} from\n" + .string "the BAG’s ITEMS POCKET and stored it\n" + .string "on the PC.$" + +gUnknown_841A3DA:: @ 841A3DA + .string "{PLAYER} withdrew the item {STR_VAR_1}\n" + .string "from the PC.$" + +gUnknown_841A3FF:: @ 841A3FF + .string "Traded {STR_VAR_3} in exchange for\n" + .string "{STR_VAR_1}’s {STR_VAR_2}.$" + +gUnknown_841A422:: @ 841A422 + .string "Took on {UNKNOWN_F7 0x00} in a SINGLE BATTLE.\n" + .string "It was a hotly contested match that\n" + .string "resulted in a {UNKNOWN_F7 0x01}.$" + +gUnknown_841A477:: @ 841A477 + .string "Took on {UNKNOWN_F7 0x00} in a DOUBLE BATTLE.\n" + .string "It was an extended match that resulted\n" + .string "in a {UNKNOWN_F7 0x01}.$" + +gUnknown_841A4C6:: @ 841A4C6 + .string "{UNKNOWN_F7 0x00} and {UNKNOWN_F7 0x01} took on\n" + .string "{UNKNOWN_F7 0x02} and {UNKNOWN_F7 0x03} in a\n" + .string "MULTI BATTLE and got a {UNKNOWN_F7 0x04}.$" + +gUnknown_841A502:: + .string "win$" + +gUnknown_841A506:: + .string "loss$" + +gUnknown_841A50B:: @ 841A50B + .string "Mingled with other TRAINERS in\n" + .string "the UNION ROOM.$" + +gUnknown_841A53A:: + .string "Departed {STR_VAR_2}\n" + .string "in {STR_VAR_1} for the next\n" + .string "destination.$" + +gUnknown_841A566:: @ 841A566 + .string "After consideration, switched\n" + .string "{UNKNOWN_F7 0x01} in {UNKNOWN_F7 0x00} with\n" + .string "{UNKNOWN_F7 0x03} in {UNKNOWN_F7 0x02}.$" + +gUnknown_841A59C:: @ 841A59C + .string "After deep thought, switched\n" + .string "{UNKNOWN_F7 0x01} in BOX “{UNKNOWN_F7 0x00}” to\n" + .string "the BOX “{UNKNOWN_F7 0x02}.”$" + +gUnknown_841A5D9:: @ 841A5D9 + .string "Switched around {UNKNOWN_F7 0x01} and\n" + .string "{UNKNOWN_F7 0x02} in {UNKNOWN_F7 0x00}.$" + +gUnknown_841A5FA:: @ 841A5FA + .string "Moved {UNKNOWN_F7 0x01} in {UNKNOWN_F7 0x00}.$" + +gUnknown_841A60A:: @ 841A60A + .string "Switched {UNKNOWN_F7 0x01} in {UNKNOWN_F7 0x00}\n" + .string "with {UNKNOWN_F7 0x02} in the party.$" + +gUnknown_841A632:: @ 841A632 + .string "Added {UNKNOWN_F7 0x01} in {UNKNOWN_F7 0x00}\n" + .string "to the party.$" + +gUnknown_841A64F:: @ 841A64F + .string "Moved {UNKNOWN_F7 0x00} from the party\n" + .string "to {UNKNOWN_F7 0x01}.$" + +gUnknown_841A66E:: @ 841A66E + .string "Moved a group of POKéMON in\n" + .string "{UNKNOWN_F7 0x00} to {UNKNOWN_F7 0x01}.$" + +gUnknown_841A694:: @ 841A694 + .string "a different spot$" + +gUnknown_841A6A5:: @ 841A6A5 + .string "Removed the item {STR_VAR_1} from\n" + .string "{PLAYER}’s PC and gave it to {STR_VAR_2}\n" + .string "to hold.$" + +gUnknown_841A6E1:: @ 841A6E1 + .string "Removed the item {STR_VAR_1} from\n" + .string "a PC, gave it to {STR_VAR_2}, and put\n" + .string "the {STR_VAR_3} it held in the BAG.$" + +gUnknown_841A732:: @ 841A732 + .string "Chatted with many TRAINERS.$" + +gUnknown_841A74E:: + .string "handily$" + +gUnknown_841A756:: + .string "tenaciously$" + +gUnknown_841A762:: + .string "somehow$" + +gUnknown_841A76A:: @ 841A76A + .string "Met and traded with {STR_VAR_1}.\n" + .string "Obtained the TRAINER’s {STR_VAR_2} in\n" + .string "exchange for {STR_VAR_3}.$" + +gUnknown_841A7B0:: @ 841A7B0 + .string "Met and battled {STR_VAR_1}.\n" + .string "The match ended in a {STR_VAR_2}.$" + +gUnknown_841A7DD:: @ 841A7DD + .string "Went to the POKéMON MART in\n" + .string "{UNKNOWN_F7 0x00} and bought one \n" + .string "{UNKNOWN_F7 0x01}.$" + +gUnknown_841A810:: @ 841A810 + .string "Went to the POKéMON MART in\n" + .string "{UNKNOWN_F7 0x00} and spent ¥{UNKNOWN_F7 0x02} for\n" + .string "items including {UNKNOWN_F7 0x01}(s).$" + +gUnknown_841A858:: @ 841A858 + .string "{UNKNOWN_F7 0x00} went to the POKéMON MART in\n" + .string "{UNKNOWN_F7 0x01} and sold {UNKNOWN_F7 0x03} of\n" + .string "the item {UNKNOWN_F7 0x02}.$" + +gUnknown_841A896:: @ 841A896 + .string "Sold items including {UNKNOWN_F7 0x01} at\n" + .string "the POKéMON MART in {UNKNOWN_F7 0x00},\n" + .string "worth ¥{UNKNOWN_F7 0x02}.$" + +gUnknown_841A8D4:: @ 841A8D4 + .string "just one$" + +gUnknown_841A8DD:: @ 841A8DD + .string "{UNKNOWN_F7 0x04}$" + +gUnknown_841A8E0:: @ 841A8E0 + .string "{STR_VAR_1} shared its HP using the move\n" + .string "SOFTBOILED.$" + +gUnknown_841A90C:: @ 841A90C + .string "{STR_VAR_1} shared its HP using the move\n" + .string "MILK DRINK.$" + +gUnknown_841A938:: @ 841A938 + .string "{STR_VAR_1} securely learned the move\n" + .string "{STR_VAR_2} using an HM.$" + +gUnknown_841A965:: @ 841A965 + .string "{STR_VAR_1} securely learned the move\n" + .string "{STR_VAR_2} using an HM and forgot\n" + .string "the move {STR_VAR_3}.$" + +gUnknown_841A9A9:: @ 841A9A9 + .string "{UNKNOWN_F7 0x05} managed to defeat the POKéMON\n" + .string "{UNKNOWN_F7 0x01} in {UNKNOWN_F7 0x00}.$" + +gUnknown_841A9D4:: @ 841A9D4 + .string "Defeated {UNKNOWN_F7 0x02} wild POKéMON including\n" + .string "{UNKNOWN_F7 0x01} in {UNKNOWN_F7 0x00}.$" + +gUnknown_841AA01:: @ 841AA01 + .string "{UNKNOWN_F7 0x05} managed to catch the POKéMON\n" + .string "{UNKNOWN_F7 0x03} in {UNKNOWN_F7 0x00}.$" + +gUnknown_841AA2B:: @ 841AA2B + .string "Threw POKé BALLS in a frenzy, catching\n" + .string "{UNKNOWN_F7 0x04} POKéMON including {UNKNOWN_F7 0x03} here\n" + .string "in {UNKNOWN_F7 0x00}.$" + +gUnknown_841AA76:: @ 841AA76 + .string "{UNKNOWN_F7 0x05} defeated the POKéMON\n" + .string "{UNKNOWN_F7 0x01} and caught one {UNKNOWN_F7 0x03}\n" + .string "in {UNKNOWN_F7 0x00}.$" + +gUnknown_841AAAA:: @ 841AAAA + .string "Defeated the POKéMON {UNKNOWN_F7 0x01}\n" + .string "and caught {UNKNOWN_F7 0x04} POKéMON including\n" + .string "{UNKNOWN_F7 0x03} in {UNKNOWN_F7 0x00}.$" + +gUnknown_841AAEC:: @ 841AAEC + .string "{UNKNOWN_F7 0x05} defeated {UNKNOWN_F7 0x02} POKéMON including\n" + .string "{UNKNOWN_F7 0x01} and caught one {UNKNOWN_F7 0x03}\n" + .string "in {UNKNOWN_F7 0x00}.$" + +gUnknown_841AB29:: @ 841AB29 + .string "Defeated {UNKNOWN_F7 0x02} POKéMON including\n" + .string "{UNKNOWN_F7 0x01} and caught {UNKNOWN_F7 0x04} POKéMON\n" + .string "including {UNKNOWN_F7 0x03} in {UNKNOWN_F7 0x00}.$" + +gUnknown_841AB74:: @ 841AB74 + .string "Made {STR_VAR_1} hold the item\n" + .string "{STR_VAR_2}.$" + +gUnknown_841AB8E:: @ 841AB8E + .string "{PLAYER} made {STR_VAR_1} hold the item\n" + .string "{STR_VAR_2}.$" + +gUnknown_841ABAB:: @ 841ABAB + .string "{STR_VAR_1} used the Hidden Move\n" + .string "CUT here.$" + +gUnknown_841ABCD:: @ 841ABCD + .string "{STR_VAR_1} used the Hidden Move\n" + .string "FLY and flew to {STR_VAR_2}.$" + +gUnknown_841ABF9:: @ 841ABF9 + .string "{STR_VAR_1} used the Hidden Move\n" + .string "SURF and rode the waves.$" + +gUnknown_841AC2A:: @ 841AC2A + .string "{STR_VAR_1} used the Hidden Move\n" + .string "STRENGTH here.$" + +gUnknown_841AC51:: @ 841AC51 + .string "{STR_VAR_1} used the Hidden Move\n" + .string "FLASH and illuminated a pitch-black\n" + .string "cave.$" + +gUnknown_841AC93:: @ 841AC93 + .string "{STR_VAR_1} used the Hidden Move\n" + .string "ROCK SMASH here.$" + +gUnknown_841ACBC:: @ 841ACBC + .string "{STR_VAR_1} used the Hidden Move\n" + .string "WATERFALL to scale a raging torrent.$" + +gUnknown_841ACF9:: @ 841ACF9 + .string "{STR_VAR_1}è êÉÁ Ñこª& òざÏ\n" + .string "éで+わざ\n" + .string "ダ¡ビング& ÚÉっŒ!$" + +gUnknown_841AD1D:: @ 841AD1D + .string "{STR_VAR_1} used DIG to escape from\n" + .string "{STR_VAR_2}.$" + +gUnknown_841AD3C:: @ 841AD3C + .string "{STR_VAR_1} used SWEET SCENT to attract\n" + .string "wild POKéMON.$" + +gUnknown_841AD69:: @ 841AD69 + .string "{STR_VAR_1} used TELEPORT, transporting\n" + .string "the party to {STR_VAR_2}’s\n" + .string "{STR_VAR_3}.$" + +gUnknown_841AD9E:: @ 841AD9E + .string "{PLAYER} left {STR_VAR_1}’s\n" + .string "{STR_VAR_2} for the next\n" + .string "destination.$" + +gUnknown_841ADC8:: @ 841ADC8 + .string "Played a lot of games at the ROCKET\n" + .string "GAME CORNER in {STR_VAR_1}.$" + +gUnknown_841ADFF:: @ 841ADFF + .string "{PLAYER} rested comfortably at home.$" + +gUnknown_841AE1E:: @ 841AE1E + .string "{PLAYER} left PROF. OAK’s POKéMON\n" + .string "RESEARCH LAB.$" + +gUnknown_841AE48:: @ 841AE48 + .string "The GYM in {STR_VAR_1} was full of\n" + .string "tough TRAINERS…\n" + .string "Preparations had to be made.$" + +gUnknown_841AE8F:: @ 841AE8F + .string "Departed the GYM in {STR_VAR_1}.$" + +gUnknown_841AEA7:: @ 841AEA7 + .string "{PLAYER} had a great time with POKéMON\n" + .string "in the SAFARI ZONE.$" + +gUnknown_841AEDC:: @ 841AEDC + .string "Managed to get out of {STR_VAR_2}\n" + .string "after wandering about.$" + +gUnknown_841AF0C:: @ 841AF0C + .string "Took on {UNKNOWN_F7 0x00} GYM LEADER\n" + .string "{UNKNOWN_F7 0x01}’s {UNKNOWN_F7 0x02} with {UNKNOWN_F7 0x03}\n" + .string "and won {UNKNOWN_F7 0x04}!$" + +gUnknown_841AF3E:: @ 841AF3E + .string "Took on ELITE FOUR {UNKNOWN_F7 0x00}’s\n" + .string "{UNKNOWN_F7 0x01} with {UNKNOWN_F7 0x02} and\n" + .string "won {UNKNOWN_F7 0x03}!$" + +gUnknown_841AF6D:: @ 841AF6D + .string "In {UNKNOWN_F7 0x00}, took on\n" + .string "{UNKNOWN_F7 0x01}’s {UNKNOWN_F7 0x02} with {UNKNOWN_F7 0x03}\n" + .string "and won {UNKNOWN_F7 0x04}!$" + +gUnknown_841AF98:: @ 841AF98 + .string "coolly$" + +gUnknown_841AF9F:: @ 841AF9F + .string "barely$" + +gUnknown_841AFA6:: @ 841AFA6 + .string "{PLAYER} used an ESCAPE ROPE to get\n" + .string "out from {STR_VAR_2}.$" + +gUnknown_841AFD1:: @ 841AFD1 + .string "draw$" + +gUnknown_841AFD6:: @ 841AFD6 + .string "Departed from the {STR_VAR_2}\n" + .string "for the next destination.$" + +gUnknown_841B005:: @ 841B005 + .string "{PLAYER} departed from\n" + .string "{STR_VAR_2} and made way\n" + .string "to the next destination.$" + +gUnknown_841B03F:: @ 841B03F + .string "Here in {STR_VAR_1}, {PLAYER}\n" + .string "obtained the item {STR_VAR_2}.$" + +gUnknown_841B064:: @ 841B064 + .string "Arrived in {STR_VAR_1}.$" + +gUnknown_841B073:: @ 841B073 + .string "And {PLAYER} saved the game at this\n" + .string "location: {STR_VAR_1}.$" + +gUnknown_841B09F:: @ 841B09F + .string "HOME$" + +gUnknown_841B0A4:: @ 841B0A4 + .string "OAK RESEARCH LAB$" + +gUnknown_841B0B5:: @ 841B0B5 + .string "GYM$" + +gUnknown_841B0B9:: @ 841B0B9 + .string "POKéMON LEAGUE GATE$" + +gUnknown_841B0CD:: @ 841B0CD + .string "VIRIDIAN FOREST$" + +gUnknown_841B0DD:: @ 841B0DD + .string "PEWTER MUSEUM OF SCIENCE$" + +gUnknown_841B0F6:: @ 841B0F6 + .string "MT. MOON$" + +gUnknown_841B0FF:: @ 841B0FF + .string "BIKE SHOP$" + +gUnknown_841B109:: @ 841B109 + .string "BILL’S HOUSE$" + +gUnknown_841B116:: @ 841B116 + .string "DAY CARE$" + +gUnknown_841B11F:: @ 841B11F + .string "UNDERGROUND PATH$" + +gUnknown_841B130:: @ 841B130 + .string "POKéMON FAN CLUB$" + +gUnknown_841B141:: @ 841B141 + .string "S.S. ANNE$" + +gUnknown_841B14B:: @ 841B14B + .string "DIGLETT’S CAVE$" + +gUnknown_841B15A:: @ 841B15A + .string "ROCK TUNNEL$" + +gUnknown_841B166:: @ 841B166 + .string "POWER PLANT$" + +gUnknown_841B172:: @ 841B172 + .string "POKéMON TOWER$" + +gUnknown_841B180:: @ 841B180 + .string "VOLUNTEER HOUSE$" + +gUnknown_841B190:: @ 841B190 + .string "NAME RATER’S HOUSE$" + +gUnknown_841B1A3:: @ 841B1A3 + .string "CELADON DEPT. STORE$" + +gUnknown_841B1B7:: @ 841B1B7 + .string "CELADON MANSION$" + +gUnknown_841B1C7:: @ 841B1C7 + .string "ROCKET GAME CORNER$" + +gUnknown_841B1DA:: @ 841B1DA + .string "RESTAURANT$" + +gUnknown_841B1E5:: @ 841B1E5 + .string "ROCKET HIDEOUT$" + +gUnknown_841B1F4:: @ 841B1F4 + .string "SAFARI ZONE$" + +gUnknown_841B200:: @ 841B200 + .string "WARDEN’S HOME$" + +gUnknown_841B20E:: @ 841B20E + .string "FIGHTING DOJO$" + +gUnknown_841B21C:: @ 841B21C + .string "SILPH CO.$" + +gUnknown_841B226:: @ 841B226 + .string "SEAFOAM ISLANDS$" + +gUnknown_841B236:: @ 841B236 + .string "POKéMON MANSION$" + +gUnknown_841B246:: @ 841B246 + .string "POKéMON RESEARCH LAB$" + +gUnknown_841B25B:: @ 841B25B + .string "VICTORY ROAD$" + +gUnknown_841B268:: @ 841B268 + .string "POKéMON LEAGUE$" + +gUnknown_841B277:: @ 841B277 + .string "CERULEAN CAVE$" diff --git a/src/quest_log.c b/src/quest_log.c index 8131e1937..1b37e074c 100644 --- a/src/quest_log.c +++ b/src/quest_log.c @@ -3527,7 +3527,7 @@ u16 * sub_8113E88(u16 a0, u16 * a1) // TODO: delete this declaration once data_83FECCC.s is decompiled extern const u8 gText_EggNickname[]; -void QuestLog_AutoGetSpeciesname(u16 a0, u8 * a1, u8 a2) +void QuestLog_AutoGetSpeciesName(u16 a0, u8 * a1, u8 a2) { if (a1 != NULL) { @@ -3559,8 +3559,8 @@ u16 * sub_8113F14(u16 * a0, u16 * a1) u16 * sub_8113F3C(u16 * a0) { u16 * r4 = sub_8113E88(3, a0); - QuestLog_AutoGetSpeciesname(r4[0], gStringVar1, 0); - QuestLog_AutoGetSpeciesname(r4[1], gStringVar2, 0); + QuestLog_AutoGetSpeciesName(r4[0], gStringVar1, 0); + QuestLog_AutoGetSpeciesName(r4[1], gStringVar2, 0); StringExpandPlaceholders(gStringVar4, gUnknown_841A16F); r4 += 2; return r4; @@ -3599,7 +3599,7 @@ u16 * sub_8113FBC(u16 * a0) } else if (r5[1] != 0xFFFF) { - QuestLog_AutoGetSpeciesname(r5[1], gStringVar2, 0); + QuestLog_AutoGetSpeciesName(r5[1], gStringVar2, 0); StringExpandPlaceholders(gStringVar4, gUnknown_841A1E7); } else @@ -3612,7 +3612,7 @@ u16 * sub_8113FBC(u16 * a0) StringExpandPlaceholders(gStringVar4, gUnknown_841A220); break; case POCKET_TM_CASE: - QuestLog_AutoGetSpeciesname(r5[1], gStringVar1, 0); + QuestLog_AutoGetSpeciesName(r5[1], gStringVar1, 0); StringCopy(gStringVar2, gMoveNames[ItemIdToBattleMoveId(r5[0])]); if (r5[2] != 0xFFFF) { |